diff --git a/.gitmodules b/.gitmodules
index 42225d6e7..477e36d96 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "src/realmd"]
 	path = src/realmd
 	url = https://github.com/mangos/realmd.git
-[submodule "src/modules/Eluna"]
-	path = src/modules/Eluna
-	url = https://github.com/ElunaLuaEngine/Eluna.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e79fa3b55..1b695ab2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
 #
-# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+# Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,7 +16,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
+
+project(MaNGOS)
+set(MANGOS_VERSION 0.21)
 
 # CMake policies
 cmake_minimum_required(VERSION 2.8)
@@ -24,35 +28,33 @@ if(POLICY CMP0043)
     cmake_policy(SET CMP0043 OLD)
 endif()
 
-project(MaNGOS)
-set(MANGOS_VERSION 0.20)
+set(CMAKE_SKIP_BUILD_RPATH FALSE)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+set(CMAKE_INSTALL_RPATH "${LIBS_DIR}")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-set(CMAKE_MODULE_PATH
-  "${CMAKE_MODULE_PATH}"
-  "${CMAKE_SOURCE_DIR}/cmake"
-)
+# Set the correct macro directory path
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
-# define all options here
+# Define available cmake options below
 if(WIN32)
-  set(CONF_DIR "" CACHE STRING "Config path. Can be absolute or relative")
+    set(CONF_DIR "" CACHE STRING "Path to the configs, can be absolute or relative.")
 else()
-  set(CONF_DIR "etc/" CACHE STRING "Config path. Can be absolute or relative")
+    set(CONF_DIR "etc/" CACHE STRING "Path to the configs, can be absolute or relative.")
 endif()
-option(DEBUG                "Debug mode"                             OFF)
-option(USE_STD_MALLOC       "Use standard malloc instead of TBB"     ON)
-option(ACE_USE_EXTERNAL     "Use external ACE"                       OFF)
-option(POSTGRESQL           "Use PostgreSQL"                         OFF)
-option(BUILD_TOOLS          "Build tools (map/vmap/mmap extractors)" ON)
-#option(SCRIPT_LIB_ELUNA     "Use Eluna as the scripting engine"      ON) Temporarily disabled till more sync work is done
-option(SCRIPT_LIB_SD2       "Use ScriptDev2 as the scripting engine" ON)
-option(SOAP                 "Enable access via SOAP or not"          OFF)
-option(PCH                  "Use precompiled headers"                ON)
-# TODO: options that should be checked/created:
-#option(CLI                  "With CLI"                              ON)
-#option(RA                   "With Remote Access"                    OFF)
-#option(SQL                  "Copy SQL files"                        OFF)
+option(DEBUG                "Debug mode (strict compile, all warnings)"     OFF)
+option(ACE_USE_EXTERNAL     "Use external ACE"                              OFF)
+option(POSTGRESQL           "Use PostgreSQL instead of MySQL"               OFF)
+option(BUILD_TOOLS          "Build the map/vmap/mmap extractors"            ON)
+option(SCRIPT_LIB_ELUNA     "Compile with support for Eluna scripts"        ON)
+option(SCRIPT_LIB_SD2       "Compile with support for ScriptDev2 scripts"   ON)
+option(PLAYERBOTS           "Enable Player Bots"                            OFF)
+option(SOAP                 "Enable remote access via SOAP"                 OFF)
+# Hidden option to enable/disable PCH. DEV ONLY!
+set(PCH ON)
+set(USE_STORMLIB ON)
 
-# Output description of this script
+# Print CLI helper message
 message("")
 message(
   "This script builds the MaNGOS server.
@@ -60,16 +62,15 @@ message(
    General:
     CMAKE_INSTALL_PREFIX    Path where the server should be installed to
     CONF_DIR                Path to the configs, can be absolute or relative.
-    PCH                     Use precompiled headers
-    DEBUG                   Debug mode
-    USE_STD_MALLOC          Use standard malloc instead of TBB
+    DEBUG                   Debug mode (strict compile, all warnings)
     ACE_USE_EXTERNAL        Use external ACE
-    BUILD_TOOLS             Build map/vmap/mmap extractors
+    BUILD_TOOLS             Build the map/vmap/mmap extractors
     SOAP                    Enable remote access via SOAP
    Scripting engines:
     SCRIPT_LIB_ELUNA        Compile with support for Eluna scripts
     SCRIPT_LIB_SD2          Compile with support for ScriptDev2 scripts
-
+   Modules:
+    PLAYERBOTS              Enable Player Bots
   To set an option simply type -D<OPTION>=<VALUE> after 'cmake <srcs>'.
   Also, you can specify the generator with -G. see 'cmake --help' for more details
   For example: cmake .. -DDEBUG=1 -DCMAKE_INSTALL_PREFIX=/opt/mangos"
@@ -78,101 +79,13 @@ message(
 )
 message("")
 
-# Force out-of-source build
-if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-  message(FATAL_ERROR
-    "This project requires an out of source build. Remove the file 'CMakeCache.txt' found in this directory before continuing, create a separate build directory and run 'cmake [options] <srcs>' from there."
-  )
-endif()
+# Search for and set up the needed packages
+set(OPENSSL_EXPECTED_VERSION 1.0.0)
 
-# TODO: allow other compilers under windows in the future
-if(WIN32 AND NOT MSVC)
-  message(FATAL_ERROR
-    "Under Windows other compiler than Microsoft Visual Studio are not supported."
-  )
-endif()
-
-# TODO: remove this in the future! it has only been added to make the switch easier for end users
-if(PREFIX)
-  message(FATAL_ERROR "The parameter PREFIX has been removed. Please re-run CMake and use CMAKE_INSTALL_PREFIX instead to define your installation location!")
-endif()
-
-# TODO: use MSVC_CXX_ARCHITECTURE_ID instead to identify platform on windows (not required on other systems)
-# find platform: required to build 3rd party libraries w/o CMake files
 find_package(Platform REQUIRED)
-# Find out what system we use to include the needed libs
-if(WIN32)
-  if(PLATFORM MATCHES X86) # 32-bit
-    set(DEP_ARCH win32)
-  else() # 64-bit
-    set(DEP_ARCH x64)
-  endif()
-endif()
-
-# Used by map-extractor for now
-if(UNIX)
-  find_package(BZip2 REQUIRED)
-endif()
-
-# find Git: used to get the revision number
 find_package(Git)
-
-# check if the platform supports precomiled headers
 find_package(PCHSupport)
-
-# TODO: remove this (refactor ACE & TBB CMake code)
-# VS100 uses MSBuild.exe instead of devenv.com, so force it to use devenv.com
-if(WIN32 AND MSVC_VERSION MATCHES 1600)
-  find_package(VisualStudio2010)
-endif()
-
-# Override configuration-types - we don't use anything else than debug and release
-if(CMAKE_CONFIGURATION_TYPES)
-  set(CMAKE_CONFIGURATION_TYPES Release Debug)
-  set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING
-    "Reset the configurations to what we need"
-    FORCE)
-endif()
-
-#Force set the default install path if it is default
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/bin/" CACHE PATH "MaNGOS default install prefix" FORCE)
-endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-
-#Output the compiled exes and DLLs to build/bin directory on windows by default
-if(WIN32)
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-endif()
-
-#Set config install path correctly from given path
-string(FIND "${CONF_DIR}" ":" CONF_DIR_ABSOLUTE)
-if(${CONF_DIR_ABSOLUTE} EQUAL -1)
-  #Path was not absolute
-  set(CONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CONF_DIR}")
-  if(MSVC)
-    set(CONF_COPY_DIR "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/${CONF_DIR}")
-  endif()
-else()
-  #Path was absolute
-  set(CONF_INSTALL_DIR "${CONF_DIR}")
-  if(MSVC)
-    set(CONF_COPY_DIR "${CONF_DIR}")
-  endif()
-endif()
-
-# If win32 put binaries in root folder, else bin.
-if(WIN32)
-  set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/)
-else()
-  set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
-endif()
-
-# If win32 put libs in root folder, else bin.
-if(WIN32)
-  set(LIBS_DIR ${CMAKE_INSTALL_PREFIX}/)
-else()
-  set(LIBS_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-endif()
+find_package(OpenSSL REQUIRED)
 
 # For Unix systems set the rpath so that libraries are found
 set(CMAKE_INSTALL_RPATH "${LIBS_DIR}")
@@ -180,292 +93,108 @@ set(CMAKE_INSTALL_NAME_DIR "${LIBS_DIR}")
 # Run out of build tree
 set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
 
-# Find needed packages and if necessery abort if something important is missing
-unset(ACE_INCLUDE_DIR CACHE)
-unset(ACE_LIBRARIES CACHE)
-unset(ACE_LIBRARIES_DIR CACHE)
-unset(ACE_INCLUDE_DIR)
-unset(ACE_LIBRARIES)
-unset(ACE_LIBRARIES_DIR)
 if(ACE_USE_EXTERNAL)
-  find_package(ACE)
-  if(NOT ACE_FOUND)
-    message(FATAL_ERROR
-      "This project requires ACE installed when ACE_USE_EXTERNAL is set. Please download the ACE Micro Release Kit from http://download.dre.vanderbilt.edu/ and install it. If this script didn't find ACE and it was correctly installed please set ACE_ROOT to the correct path."
-    )
-  endif()
-  if(EXISTS ${ACE_INCLUDE_DIR}/ace/Stack_Trace.h)
-    set(HAVE_ACE_STACK_TRACE_H ON) # config.h.cmake
-  endif()
+    find_package(ACE)
+    if(NOT ACE_FOUND)
+        message(FATAL_ERROR
+            "This project requires ACE installed when ACE_USE_EXTERNAL is set. Please download the ACE Micro Release Kit from http://download.dre.vanderbilt.edu/ and install it. If this script didn't find ACE and it was correctly installed please set ACE_ROOT to the correct path."
+        )
+    endif()
+    if(EXISTS ${ACE_INCLUDE_DIR}/ace/Stack_Trace.h)
+        add_definitions(-DHAVE_ACE_STACK_TRACE_H)
+    endif()
 else()
-  include(cmake/ImportACE.cmake)
+    include(cmake/ImportACE.cmake)
 endif()
 
-# Win32 delivered packages
-if(WIN32)
-  set(MYSQL_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/dep/include/mysql")
-  set(MYSQL_LIBRARY "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/libmySQL.lib")
-  set(MYSQL_DEBUG_LIBRARY "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/libmySQL.lib")
-  set(OPENSSL_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/dep/include/openssl")
-  set(OPENSSL_LIBRARIES "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/libeay32.lib")
-  set(OPENSSL_DEBUG_LIBRARIES "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/libeay32.lib")
-  # zlib is build
-endif()
-
-# *nix-specific packages
-if(UNIX)
-  if(POSTGRESQL)
+if(POSTGRESQL)
     find_package(PostgreSQL REQUIRED)
-
-    if(POSTGRESQL_FOUND)
-      include_directories(${POSTGRESQL_INCLUDE_DIRS})
-    endif(POSTGRESQL_FOUND)
-
-  else()
+else()
     find_package(MySQL REQUIRED)
-  endif()
-
-  find_package(OpenSSL REQUIRED)
-  find_package(ZLIB REQUIRED)
 endif()
 
-# Add uninstall script and target
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY
-)
+if(UNIX)
+    find_package(ZLIB)
+    find_package(BZip2)
+endif()
 
-add_custom_target(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-)
+#Include platform/compiler-specific definitions
+include(${CMAKE_SOURCE_DIR}/cmake/SetDefinitions.cmake)
+
+# Generate revision-extractor
+set(GENREV_SRC src/tools/genrevision/genrevision.cpp)
+add_executable(genrev ${GENREV_SRC})
 
 # Find core revision
 if(GIT_EXECUTABLE)
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-    OUTPUT_VARIABLE GIT_REVISION
-    RESULT_VARIABLE GIT_RESULT
-    ERROR_QUIET
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if(GIT_RESULT)
-    set(GIT_REVISION "Git repository not found")
-  endif()
+    execute_process(
+        COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+        OUTPUT_VARIABLE GIT_REVISION
+        RESULT_VARIABLE GIT_RESULT
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if(GIT_RESULT)
+        set(GIT_REVISION "Git repository not found")
+    endif()
 else()
-  set(GIT_REVISION "Git not found")
+    set(GIT_REVISION "Git not found")
 endif()
 
 message(STATUS "MaNGOS-Core revision  : ${GIT_REVISION}")
 message(STATUS "Install server to     : ${CMAKE_INSTALL_PREFIX}")
 message(STATUS "Install configs to    : ${CONF_INSTALL_DIR}")
 if("${CONF_DIR}" STREQUAL "")
-  message(STATUS "Search configs from   : binary directory (default)")
+    message(STATUS "Search configs from   : binary directory (default)")
 else()
-  message(STATUS "Search configs from   : ${CONF_DIR}")
+    message(STATUS "Search configs from   : ${CONF_DIR}")
 endif()
 
-# if(CLI)
-#   message(STATUS "Build with CLI        : Yes (default)")
-#   add_definitions(-DENABLE_CLI)
-# else()
-#   message(STATUS "Build with CLI        : No")
-# endif()
-
-# if(RA)
-#   message(STATUS "* Build with RA         : Yes")
-#   add_definitions(-DENABLE_RA)
-# else(RA)
-#   message(STATUS "* Build with RA         : No  (default)")
-# endif(RA)
-
 if(SOAP)
-  message(STATUS "Support for SOAP      : Yes")
-  set(DEFINITIONS ${DEFINITIONS} -DENABLE_SOAP)
+    message(STATUS "Support for SOAP      : Yes")
+    add_definitions(-DENABLE_SOAP)
 else()
-  message(STATUS "Support for SOAP      : No (default)")
+    message(STATUS "Support for SOAP      : No (default)")
 endif()
 
-#Eluna temporarily disabled till more sync work can be done
-
-#if(SCRIPT_LIB_ELUNA)
-#  message(STATUS "Script engine Eluna   : Yes (default)")
-#  add_definitions(-DENABLE_ELUNA)
-#else()
-#  message(STATUS "Script engine Eluna   : No")
-#endif()
+if(SCRIPT_LIB_ELUNA)
+    message(STATUS "Script engine Eluna   : Yes (default)")
+    add_definitions(-DENABLE_ELUNA)
+else()
+    message(STATUS "Script engine Eluna   : No")
+endif()
 
 if(SCRIPT_LIB_SD2)
-  message(STATUS "Script engine SD2     : Yes (default)")
-  add_definitions(-DENABLE_SD2)
+    message(STATUS "Script engine SD2     : Yes (default)")
+    add_definitions(-DENABLE_SD2)
 else()
-  message(STATUS "Script engine SD2     : No")
+    message(STATUS "Script engine SD2     : No")
+endif()
+
+if(PLAYERBOTS)
+    message(STATUS "Enable Player Bots    : Yes (default)")
+    add_definitions(-DENABLE_PLAYERBOTS)
+else()
+    message(STATUS "Enable Player Bots    : No")
 endif()
 
 if(BUILD_TOOLS)
-  message(STATUS "Build tools           : Yes (default)")
+    message(STATUS "Build tools           : Yes (default)")
 else()
-  message(STATUS "Build tools           : No")
-endif()
-
-if(PCH)
-  message(STATUS "Use PCH               : Yes (default)")
-else()
-  message(STATUS "Use PCH               : No")
+    message(STATUS "Build tools           : No")
 endif()
 
 if(DEBUG)
-  set(CMAKE_BUILD_TYPE Debug)
-  message(STATUS "Build in debug-mode   : Yes")
+    set(CMAKE_BUILD_TYPE Debug)
+    message(STATUS "Build in debug-mode   : Yes")
 else()
-  set(CMAKE_BUILD_TYPE Release)
-  message(STATUS "Build in debug-mode   : No  (default)")
-endif()
-# Handle debugmode compiles (this will require further work for proper WIN32-setups)
-if(UNIX)
-  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
-endif()
-
-# Set warning levels for different builds
-if(UNIX)
-  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} --no-warnings")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} --no-warnings")
-  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wfatal-errors -Wextra -Winvalid-pch")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wfatal-errors -Wextra -Winvalid-pch")
-elseif(WIN32)
-  # Disable warnings in Visual Studio 8 and above and add /MP
-  if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /MP")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996 /wd4355 /wd4244 /wd4267 /MP")
-    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /MP")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /MP")
-  endif()
-endif()
-
-# if(SQL)
-#   message(STATUS "Install SQL-files     : Yes")
-# else()
-#   message(STATUS "Install SQL-files     : No  (default)")
-# endif()
-
-# Some small tweaks for Visual Studio 7 and above.
-if(MSVC)
-  # Mark 32 bit executables large address aware so they can use > 2GB address space
-  if(PLATFORM MATCHES X86)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
-  endif()
-endif()
-
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set(CMAKE_INSTALL_RPATH "${LIBS_DIR}")
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-# Generate revision-extractor
-set(GENREV_SRC
-  src/tools/genrevision/genrevision.cpp
-)
-
-add_executable(genrev
-  ${GENREV_SRC}
-)
-
-if(WIN32)
-  install(
-    FILES
-      "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/libeay32.dll"
-      "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/ssleay32.dll"
-      "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/libmySQL.dll"
-    DESTINATION ${LIBS_DIR}
-    CONFIGURATIONS Release
-  )
-  install(
-    FILES
-      "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/libeay32.dll"
-      "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/ssleay32.dll"
-      "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/libmySQL.dll"
-    DESTINATION ${LIBS_DIR}
-    CONFIGURATIONS Debug
-  )
-endif()
-
-if(XCODE)
-  if(PLATFORM MATCHES X86)
-    set(CMAKE_OSX_ARCHITECTURES i386)
-  else()
-    set(CMAKE_OSX_ARCHITECTURES x86_64)
-  endif()
-endif()
-
-# This is used by config.h.cmake
-if (SOAP)
-  set(ENABLE_SOAP ON)
-else()
-  set(ENABLE_SOAP OFF)
+    set(CMAKE_BUILD_TYPE Release)
+    message(STATUS "Build in debug-mode   : No  (default)")
 endif()
 
+# Add dependency path
 add_subdirectory(dep)
 
-# Add definitions for all build types
-# Don't place this above 'dep' subdirectory! Because of defines build will crash.
-# Remember, this overwrites global preprocessors, thus SOAP, Eluna, SD2 etc. has to be defined twice.
-# TODO: Clean this up?
-
-set(DEFINITIONS
-  HAVE_CONFIG_H
-  MANGOS
-)
-
-if(SOAP)
-  set(DEFINITIONS ${DEFINITIONS} ENABLE_SOAP)
-endif()
-
-#Temporarily disabled till more work can be done
-
-#if(SCRIPT_LIB_ELUNA)
-#   set(DEFINITIONS ${DEFINITIONS} ENABLE_ELUNA)
-#endif()
-
-if(SCRIPT_LIB_SD2)
-   set(DEFINITIONS ${DEFINITIONS} ENABLE_SD2)
-endif()
-
-if(POSTGRESQL)
-  set(DEFINITIONS ${DEFINITIONS} DO_POSTGRESQL)
-else()
-  set(DEFINITIONS ${DEFINITIONS} DO_MYSQL)
-endif()
-
-set(DEFINITIONS_RELEASE NDEBUG)
-set(DEFINITIONS_DEBUG) # _DEBUG MANGOS_DEBUG) was here..
-if(WIN32)
-  set(DEFINITIONS ${DEFINITIONS} WIN32 _WIN32)
-  set(DEFINITIONS_RELEASE ${DEFINITIONS_RELEASE} _CRT_SECURE_NO_WARNINGS)
-endif()
-
-if(USE_STD_MALLOC)
-  set(DEFINITIONS ${DEFINITIONS} USE_STANDARD_MALLOC)
-endif()
-
-# Specify the maximum PreCompiled Header memory allocation limit
-# Fixes a compiler-problem when using PCH - the /Ym flag is adjusted by the compiler in MSVC2012, hence we need to set an upper limit with /Zm to avoid discrepancies)
-# (And yes, this is a verified , unresolved bug with MSVC... *sigh*)
-# Make it MSVC specific, otherwise g++ etc pukes
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-    string(REGEX REPLACE "/Zm[0-9]+ *" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm500" CACHE STRING "" FORCE)
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
-endif()
-
-set_directory_properties(PROPERTIES COMPILE_DEFINITIONS "${DEFINITIONS}")
-#Something like this is what i've imagined with the new generator expressions in cmake 3.0 / lfx
-#set_directory_properties(PROPERTIES COMPILE_DEFINITIONS "$<$<CONFIG:Release>:"${DEFINITIONS} ${DEFINITIONS_RELEASE}">$<$<CONFIG:Debug>:"${DEFINITIONS} ${DEFINITIONS_DEBUG}">")
-set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_RELEASE "${DEFINITIONS_RELEASE}")
-set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_DEBUG "${DEFINITIONS_DEBUG}")
-
+# Add source path
 add_subdirectory(src)
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index ae7db0bb2..7cf876067 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -72,51 +72,95 @@ find_path(MYSQL_INCLUDE_DIR
     /usr/local/include
     /usr/local/include/mysql
     /usr/local/mysql/include
-    "C:/Program Files/MySQL/include"
-    "C:/Program Files/MySQL/MySQL Server 5.0/include"
+    "C:/Program Files/MySQL/MySQL Server 5.6/include"
+    "C:/Program Files/MySQL/MySQL Server 5.5/include"
     "C:/Program Files/MySQL/MySQL Server 5.1/include"
+    "C:/Program Files/MySQL/MySQL Server 5.0/include"
+    "C:/Program Files/MySQL/include"
+    "C:/Program Files (x86)/MySQL/MySQL Server 5.6/include"
+    "C:/Program Files (x86)/MySQL/MySQL Server 5.5/include"
+    "C:/Program Files (x86)/MySQL/MySQL Server 5.1/include"
+    "C:/Program Files (x86)/MySQL/MySQL Server 5.0/include"
+    "C:/Program Files (x86)/MySQL/include"
     "C:/MySQL/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/include"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/include"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/include"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/include"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/include"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/include"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/include"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/include"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/include"
+    "$ENV{ProgramFiles}/MySQL/*/include"
+    "$ENV{SystemDrive}/MySQL/*/include"
     "c:/msys/local/include"
+    "$ENV{MYSQL_ROOT}/include"
   DOC
     "Specify the directory containing mysql.h."
 )
 
 if( UNIX )
-foreach(LIB ${MYSQL_ADD_LIBRARIES})
-  find_library( MYSQL_LIBRARY
-    NAMES
-      mysql libmysql ${LIB}
-    PATHS
-      ${MYSQL_ADD_LIBRARIES_PATH}
-      /usr/lib
-      /usr/lib/mysql
-      /usr/local/lib
-      /usr/local/lib/mysql
-      /usr/local/mysql/lib
-    DOC "Specify the location of the mysql library here."
-  )
-endforeach(LIB ${MYSQL_ADD_LIBRARY})
+  foreach(LIB ${MYSQL_ADD_LIBRARIES})
+    find_library( MYSQL_LIBRARY
+      NAMES
+        mysql libmysql ${LIB}
+      PATHS
+        ${MYSQL_ADD_LIBRARIES_PATH}
+        /usr/lib
+        /usr/lib/mysql
+        /usr/local/lib
+        /usr/local/lib/mysql
+        /usr/local/mysql/lib
+      DOC "Specify the location of the mysql library here."
+    )
+  endforeach(LIB ${MYSQL_ADD_LIBRARY})
 endif( UNIX )
 
 if( WIN32 )
   find_library( MYSQL_LIBRARY
     NAMES
-      mysql libmysql ${LIB}
+      libmysql
     PATHS
       ${MYSQL_ADD_LIBRARIES_PATH}
-      "C:/Program Files/MySQL/lib"
-      "C:/Program Files/MySQL/MySQL Server 5.0/lib/opt"
+      "C:/Program Files/MySQL/MySQL Server 5.6/lib"
+      "C:/Program Files/MySQL/MySQL Server 5.6/lib/opt"
+      "C:/Program Files/MySQL/MySQL Server 5.5/lib"
+      "C:/Program Files/MySQL/MySQL Server 5.5/lib/opt"
+      "C:/Program Files/MySQL/MySQL Server 5.1/lib"
       "C:/Program Files/MySQL/MySQL Server 5.1/lib/opt"
+      "C:/Program Files/MySQL/MySQL Server 5.0/lib"
+      "C:/Program Files/MySQL/MySQL Server 5.0/lib/opt"
+      "C:/Program Files/MySQL/lib"
+      "C:/Program Files (x86)/MySQL/MySQL Server 5.6/lib"
+      "C:/Program Files (x86)/MySQL/MySQL Server 5.6/lib/opt"
+      "C:/Program Files (x86)/MySQL/MySQL Server 5.5/lib"
+      "C:/Program Files (x86)/MySQL/MySQL Server 5.5/lib/opt"
+      "C:/Program Files (x86)/MySQL/MySQL Server 5.1/lib"
+      "C:/Program Files (x86)/MySQL/MySQL Server 5.1/lib/opt"
+      "C:/Program Files (x86)/MySQL/MySQL Server 5.0/lib"
+      "C:/Program Files (x86)/MySQL/MySQL Server 5.0/lib/opt"
+      "C:/Program Files (x86)/MySQL/lib"
       "C:/MySQL/lib/debug"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib/opt"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib"
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib/opt"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib"
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
+      "$ENV{ProgramFiles}/MySQL/*/lib/opt"
+      "$ENV{SystemDrive}/MySQL/*/lib/opt"
       "c:/msys/local/include"
+      "$ENV{MYSQL_ROOT}/lib"
     DOC "Specify the location of the mysql library here."
   )
 endif( WIN32 )
@@ -144,9 +188,9 @@ if( MYSQL_LIBRARY )
     message(STATUS "Found MySQL library: ${MYSQL_LIBRARY}")
     message(STATUS "Found MySQL headers: ${MYSQL_INCLUDE_DIR}")
   else( MYSQL_INCLUDE_DIR )
-      message(FATAL_ERROR "Could not find MySQL headers! Please install the development-libraries and headers.")
+    message(FATAL_ERROR "Could not find MySQL headers! Please install the development libraries and headers")
   endif( MYSQL_INCLUDE_DIR )
   mark_as_advanced( MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIR )
 else( MYSQL_LIBRARY )
-  message(FATAL_ERROR "Could not find the MySQL libraries! Please install the development-libraries and headers.")
-endif( MYSQL_LIBRARY )
+  message(FATAL_ERROR "Could not find the MySQL libraries! Please install the development libraries and headers")
+endif( MYSQL_LIBRARY )
\ No newline at end of file
diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake
index d15f8a13d..78c3a3132 100644
--- a/cmake/FindOpenSSL.cmake
+++ b/cmake/FindOpenSSL.cmake
@@ -1,107 +1,221 @@
+# - Try to find the OpenSSL encryption library
+# Once done this will define
 #
-# Find the OpenSSL client includes and library
+#  OPENSSL_ROOT_DIR - Set this variable to the root installation of OpenSSL
 #
+# Read-Only variables:
+#  OPENSSL_FOUND - system has the OpenSSL library
+#  OPENSSL_INCLUDE_DIR - the OpenSSL include directory
+#  OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
 
-# This module defines
-# OPENSSL_INCLUDE_DIR, where to find openssl.h
-# OPENSSL_LIBRARIES, the libraries to link against to connect to MySQL
-# OPENSSL_FOUND, if false, you cannot build anything that requires MySQL.
+#=============================================================================
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
+# Copyright 2009-2010 Mathieu Malaterre <mathieu.malaterre@gmail.com>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
 
-# also defined, but not for general use are
-# OPENSSL_LIBRARY, where to find the MySQL library.
+# http://www.slproweb.com/products/Win32OpenSSL.html
 
-if( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
-  # in cache already
-  set(OPENSSL_FOUND 1)
-else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
-  set(OPENSSL_FOUND 0)
+SET(_OPENSSL_ROOT_HINTS
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
+  )
 
-  if(WIN32)
-    if(PLATFORM MATCHES X64)
-      set(TMP_OPENSSL_INCLUDE_DIR
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/include/openssl"
-      )
-      set(TMP_OPENSSL_LIBRARIES
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/lib"
+IF(PLATFORM EQUAL 64)
+  SET(_OPENSSL_ROOT_PATHS
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]"
+    "C:/OpenSSL-Win64/"
+    "C:/OpenSSL/"
+  )
+ELSE()
+  SET(_OPENSSL_ROOT_PATHS
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]"
+    "C:/OpenSSL/"
+  )
+ENDIF()
+
+FIND_PATH(OPENSSL_ROOT_DIR
+  NAMES
+    include/openssl/ssl.h
+  HINTS
+    ${_OPENSSL_ROOT_HINTS}
+  PATHS
+    ${_OPENSSL_ROOT_PATHS}
+)
+MARK_AS_ADVANCED(OPENSSL_ROOT_DIR)
+
+# Re-use the previous path:
+FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
+  ${OPENSSL_ROOT_DIR}/include
+)
+
+IF(WIN32 AND NOT CYGWIN)
+  # MINGW should go here too
+  IF(MSVC)
+    # /MD and /MDd are the standard values - if someone wants to use
+    # others, the libnames have to change here too
+    # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
+    # TODO: handle /MT and static lib
+    # In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix:
+    #   * MD for dynamic-release
+    #   * MDd for dynamic-debug
+    #   * MT for static-release
+    #   * MTd for static-debug
+
+    # Implementation details:
+    # We are using the libraries located in the VC subdir instead of the parent directory eventhough :
+    # libeay32MD.lib is identical to ../libeay32.lib, and
+    # ssleay32MD.lib is identical to ../ssleay32.lib
+
+    FIND_LIBRARY(LIB_EAY_DEBUG
+      NAMES
+        libeay32MDd libeay32
+      PATHS
+        ${OPENSSL_ROOT_DIR}/lib/VC
+    )
+
+    FIND_LIBRARY(LIB_EAY_RELEASE
+      NAMES
+        libeay32MD libeay32
+      PATHS
+        ${OPENSSL_ROOT_DIR}/lib/VC
+    )
+
+    FIND_LIBRARY(SSL_EAY_DEBUG
+      NAMES
+        ssleay32MDd ssleay32 ssl
+      PATHS
+        ${OPENSSL_ROOT_DIR}/lib/VC
+    )
+
+    FIND_LIBRARY(SSL_EAY_RELEASE
+      NAMES
+        ssleay32MD ssleay32 ssl
+      PATHS
+        ${OPENSSL_ROOT_DIR}/lib/VC
+    )
+
+    if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
+      set( OPENSSL_LIBRARIES
+        optimized ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE}
+        debug ${SSL_EAY_DEBUG} ${LIB_EAY_DEBUG}
       )
     else()
-      set(TMP_OPENSSL_INCLUDE_DIR
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl"
-      )
-      set(TMP_OPENSSL_LIBRARIES
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib"
+      set( OPENSSL_LIBRARIES
+        ${SSL_EAY_RELEASE}
+        ${LIB_EAY_RELEASE}
       )
     endif()
-  endif()
 
-  find_path(OPENSSL_INCLUDE_DIR
-    NAMES
-      ssl.h
-    PATHS
-      /usr/include
-      /usr/include/openssl
-      /usr/local/include
-      /usr/local/include/openssl
-      /usr/local/openssl/include
-      ${TMP_OPENSSL_INCLUDE_DIR}
-    DOC
-      "Specify the directory containing openssl.h."
-  )
+    MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE LIB_EAY_DEBUG LIB_EAY_RELEASE)
+  ELSEIF(MINGW)
 
-  find_library(OPENSSL_LIBRARIES
-    NAMES
-      ssleay32
-      ssl
-    PATHS
-      /usr/lib
-      /usr/lib/ssl
-      /usr/local/lib
-      /usr/local/lib/ssl
-      /usr/local/ssl/lib
-      ${TMP_OPENSSL_LIBRARIES}
-    DOC "Specify the OpenSSL library here."
-  )
-
-  if( WIN32 )
-    find_library(OPENSSL_EXTRA_LIBRARIES
-    NAMES
-      libeay32
-    PATHS
-      ${TMP_OPENSSL_LIBRARIES}
-    DOC
-      "if more libraries are necessary to link in a OpenSSL client, specify them here."
-  )
-  endif( WIN32 )
-
-  if( UNIX )
-    find_library(OPENSSL_EXTRA_LIBRARIES
+    # same player, for MingW
+    FIND_LIBRARY(LIB_EAY
       NAMES
-        crypto
+        libeay32
       PATHS
-        /usr/lib
-        /usr/lib/ssl
-        /usr/local/lib
-        /usr/local/lib/ssl
-        /usr/local/ssl/lib
-        ${TMP_OPENSSL_LIBRARIES}
-      DOC "if more libraries are necessary to link in a OpenSSL client, specify them here."
+        ${OPENSSL_ROOT_DIR}/lib/MinGW
     )
-  endif()
 
-  if( OPENSSL_LIBRARIES )
-    if( OPENSSL_INCLUDE_DIR )
-      set( OPENSSL_FOUND 1 )
-      message(STATUS "Found OpenSSL library: ${OPENSSL_LIBRARIES}")
-      message(STATUS "Found OpenSSL headers: ${OPENSSL_INCLUDE_DIR}")
-    else ( OPENSSL_INCLUDE_DIR )
-      message(FATAL_ERROR "Could not find OpenSSL headers! Please install the development-headers")
-    endif( OPENSSL_INCLUDE_DIR )
-  else( OPENSSL_LIBRARIES )
-    message(FATAL_ERROR "Could not find OpenSSL libraries! Please install the library before continuing")
-  endif( OPENSSL_LIBRARIES )
-  mark_as_advanced( OPENSSL_FOUND OPENSSL_LIBRARIES OPENSSL_EXTRA_LIBRARIES OPENSSL_INCLUDE_DIR )
-endif( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
+    FIND_LIBRARY(SSL_EAY NAMES
+      NAMES
+        ssleay32
+      PATHS
+        ${OPENSSL_ROOT_DIR}/lib/MinGW
+    )
+
+    MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
+
+    set( OPENSSL_LIBRARIES
+      ${SSL_EAY}
+      ${LIB_EAY}
+    )
+  ELSE(MSVC)
+    # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
+    FIND_LIBRARY(LIB_EAY
+      NAMES
+        libeay32
+      PATHS
+        ${OPENSSL_ROOT_DIR}/lib
+        ${OPENSSL_ROOT_DIR}/lib/VC
+    )
+
+    FIND_LIBRARY(SSL_EAY
+      NAMES
+        ssleay32
+      PATHS
+        ${OPENSSL_ROOT_DIR}/lib
+        ${OPENSSL_ROOT_DIR}/lib/VC
+    )
+    MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
+
+    SET( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+  ENDIF(MSVC)
+ELSE(WIN32 AND NOT CYGWIN)
+  FIND_LIBRARY(OPENSSL_SSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD)
+  FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES NAMES crypto)
+  MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARIES OPENSSL_SSL_LIBRARIES)
+
+  SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
+
+ENDIF(WIN32 AND NOT CYGWIN)
+
+if (NOT OPENSSL_INCLUDE_DIR)
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(OpenSSL DEFAULT_MSG
+    OPENSSL_LIBRARIES
+    OPENSSL_INCLUDE_DIR
+  )
+endif()
+
+if (OPENSSL_INCLUDE_DIR)
+  message( STATUS "Found OpenSSL library: ${OPENSSL_LIBRARIES}")
+  message( STATUS "Found OpenSSL headers: ${OPENSSL_INCLUDE_DIR}")
+  if (_OPENSSL_VERSION)
+    set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
+  else (_OPENSSL_VERSION)
+    file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+         REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9][0-9][0-9][0-9].*")
+
+    # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
+    # The status gives if this is a developer or prerelease and is ignored here.
+    # Major, minor, and fix directly translate into the version numbers shown in
+    # the string. The patch field translates to the single character suffix that
+    # indicates the bug fix state, which 00 -> nothing, 01 -> a, 02 -> b and so
+    # on.
+
+    string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f]).*$"
+           "\\1;\\2;\\3;\\4;\\5" OPENSSL_VERSION_LIST "${openssl_version_str}")
+    list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
+    list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
+    list(GET OPENSSL_VERSION_LIST 2 OPENSSL_VERSION_FIX)
+    list(GET OPENSSL_VERSION_LIST 3 OPENSSL_VERSION_PATCH)
+
+    string(REGEX REPLACE "^0(.)" "\\1" OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_MINOR}")
+    string(REGEX REPLACE "^0(.)" "\\1" OPENSSL_VERSION_FIX "${OPENSSL_VERSION_FIX}")
+
+    if (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
+      # 96 is the ASCII code of 'a' minus 1
+      math(EXPR OPENSSL_VERSION_PATCH_ASCII "${OPENSSL_VERSION_PATCH} + 96")
+      # Once anyone knows how OpenSSL would call the patch versions beyond 'z'
+      # this should be updated to handle that, too. This has not happened yet
+      # so it is simply ignored here for now.
+      string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING)
+    endif (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
+
+    set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
+  endif (_OPENSSL_VERSION)
+endif (OPENSSL_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
\ No newline at end of file
diff --git a/cmake/FindPlatform.cmake b/cmake/FindPlatform.cmake
index f58cf9e1c..24eeea22e 100644
--- a/cmake/FindPlatform.cmake
+++ b/cmake/FindPlatform.cmake
@@ -1,23 +1,21 @@
-# Already set, so only add definition
-# IF(PLATFORM)
-#   IF(PLATFORM MATCHES X64 AND WIN32)
-#     ADD_DEFINITIONS("-D_WIN64")
-#   ENDIF()
-# ELSE()
-  # default to x86 platform.  We'll check for X64 in a bit
-  SET(PLATFORM X86)
+if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+    set(PLATFORM 64)
+    MESSAGE(STATUS "Detected 64-bit platform")
+else()
+    set(PLATFORM 32)
+    MESSAGE(STATUS "Detected 32-bit platform")
+endif()
 
-  # This definition is necessary to work around a bug with Intellisense described
-  # here: http://tinyurl.com/2cb428.  Syntax highlighting is important for proper
-  # debugger functionality.
+if(PLATFORM MATCHES 32) # 32-bit
+    set(DEP_ARCH win32)
+else() # 64-bit
+    set(DEP_ARCH x64)
+endif()
 
-  IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
-      MESSAGE(STATUS "Detected 64-bit platform.")
-      IF(WIN32)
-        ADD_DEFINITIONS("-D_WIN64")
-      ENDIF()
-      SET(PLATFORM X64)
-  ELSE()
-      MESSAGE(STATUS "Detected 32-bit platform.")
-  ENDIF()
-# ENDIF()
+if(XCODE)
+  if(PLATFORM MATCHES 32)
+    set(CMAKE_OSX_ARCHITECTURES i386)
+  else()
+    set(CMAKE_OSX_ARCHITECTURES x86_64)
+  endif()
+endif()
\ No newline at end of file
diff --git a/cmake/FindPostgreSQL.cmake b/cmake/FindPostgreSQL.cmake
new file mode 100644
index 000000000..dc29181b7
--- /dev/null
+++ b/cmake/FindPostgreSQL.cmake
@@ -0,0 +1,186 @@
+#.rst:
+# FindPostgreSQL
+# --------------
+#
+# Find the PostgreSQL installation.
+#
+# In Windows, we make the assumption that, if the PostgreSQL files are
+# installed, the default directory will be C:\Program Files\PostgreSQL.
+#
+# This module defines
+#
+# ::
+#
+#   PostgreSQL_LIBRARIES - the PostgreSQL libraries needed for linking
+#   PostgreSQL_INCLUDE_DIRS - the directories of the PostgreSQL headers
+#   PostgreSQL_VERSION_STRING - the version of PostgreSQL found (since CMake 2.8.8)
+
+#=============================================================================
+# Copyright 2004-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# ----------------------------------------------------------------------------
+# History:
+# This module is derived from the module originally found in the VTK source tree.
+#
+# ----------------------------------------------------------------------------
+# Note:
+# PostgreSQL_ADDITIONAL_VERSIONS is a variable that can be used to set the
+# version mumber of the implementation of PostgreSQL.
+# In Windows the default installation of PostgreSQL uses that as part of the path.
+# E.g C:\Program Files\PostgreSQL\8.4.
+# Currently, the following version numbers are known to this module:
+# "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0"
+#
+# To use this variable just do something like this:
+# set(PostgreSQL_ADDITIONAL_VERSIONS "9.2" "8.4.4")
+# before calling find_package(PostgreSQL) in your CMakeLists.txt file.
+# This will mean that the versions you set here will be found first in the order
+# specified before the default ones are searched.
+#
+# ----------------------------------------------------------------------------
+# You may need to manually set:
+#  PostgreSQL_INCLUDE_DIR  - the path to where the PostgreSQL include files are.
+#  PostgreSQL_LIBRARY_DIR  - The path to where the PostgreSQL library files are.
+# If FindPostgreSQL.cmake cannot find the include files or the library files.
+#
+# ----------------------------------------------------------------------------
+# The following variables are set if PostgreSQL is found:
+#  PostgreSQL_FOUND         - Set to true when PostgreSQL is found.
+#  PostgreSQL_INCLUDE_DIRS  - Include directories for PostgreSQL
+#  PostgreSQL_LIBRARY_DIRS  - Link directories for PostgreSQL libraries
+#  PostgreSQL_LIBRARIES     - The PostgreSQL libraries.
+#
+# ----------------------------------------------------------------------------
+# If you have installed PostgreSQL in a non-standard location.
+# (Please note that in the following comments, it is assumed that <Your Path>
+# points to the root directory of the include directory of PostgreSQL.)
+# Then you have three options.
+# 1) After CMake runs, set PostgreSQL_INCLUDE_DIR to <Your Path>/include and
+#    PostgreSQL_LIBRARY_DIR to wherever the library pq (or libpq in windows) is
+# 2) Use CMAKE_INCLUDE_PATH to set a path to <Your Path>/PostgreSQL<-version>. This will allow find_path()
+#    to locate PostgreSQL_INCLUDE_DIR by utilizing the PATH_SUFFIXES option. e.g. In your CMakeLists.txt file
+#    set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "<Your Path>/include")
+# 3) Set an environment variable called ${PostgreSQL_ROOT} that points to the root of where you have
+#    installed PostgreSQL, e.g. <Your Path>.
+#
+# ----------------------------------------------------------------------------
+
+set(PostgreSQL_INCLUDE_PATH_DESCRIPTION "top-level directory containing the PostgreSQL include directories. E.g /usr/local/include/PostgreSQL/8.4 or C:/Program Files/PostgreSQL/8.4/include")
+set(PostgreSQL_INCLUDE_DIR_MESSAGE "Set the PostgreSQL_INCLUDE_DIR cmake cache entry to the ${PostgreSQL_INCLUDE_PATH_DESCRIPTION}")
+set(PostgreSQL_LIBRARY_PATH_DESCRIPTION "top-level directory containing the PostgreSQL libraries.")
+set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache entry to the ${PostgreSQL_LIBRARY_PATH_DESCRIPTION}")
+set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
+
+
+set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+    "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+
+# Define additional search paths for root directories.
+if ( WIN32 )
+  foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
+    set(PostgreSQL_ADDITIONAL_SEARCH_PATHS ${PostgreSQL_ADDITIONAL_SEARCH_PATHS} "C:/Program Files/PostgreSQL/${suffix}" )
+  endforeach()
+endif()
+set( PostgreSQL_ROOT_DIRECTORIES
+   ENV PostgreSQL_ROOT
+   ${PostgreSQL_ROOT}
+   ${PostgreSQL_ADDITIONAL_SEARCH_PATHS}
+)
+
+#
+# Look for an installation.
+#
+find_path(PostgreSQL_INCLUDE_DIR
+  NAMES libpq-fe.h
+  PATHS
+   # Look in other places.
+   ${PostgreSQL_ROOT_DIRECTORIES}
+  PATH_SUFFIXES
+    pgsql
+    postgresql
+    include
+  # Help the user find it if we cannot.
+  DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
+)
+
+find_path(PostgreSQL_TYPE_INCLUDE_DIR
+  NAMES catalog/pg_type.h
+  PATHS
+   # Look in other places.
+   ${PostgreSQL_ROOT_DIRECTORIES}
+  PATH_SUFFIXES
+    postgresql
+    pgsql/server
+    postgresql/server
+    include/server
+  # Help the user find it if we cannot.
+  DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
+)
+
+# The PostgreSQL library.
+set (PostgreSQL_LIBRARY_TO_FIND pq)
+# Setting some more prefixes for the library
+set (PostgreSQL_LIB_PREFIX "")
+if ( WIN32 )
+  set (PostgreSQL_LIB_PREFIX ${PostgreSQL_LIB_PREFIX} "lib")
+  set ( PostgreSQL_LIBRARY_TO_FIND ${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND})
+endif()
+
+find_library( PostgreSQL_LIBRARY
+ NAMES ${PostgreSQL_LIBRARY_TO_FIND}
+ PATHS
+   ${PostgreSQL_ROOT_DIRECTORIES}
+ PATH_SUFFIXES
+   lib
+)
+get_filename_component(PostgreSQL_LIBRARY_DIR ${PostgreSQL_LIBRARY} PATH)
+
+if (PostgreSQL_INCLUDE_DIR)
+  # Some platforms include multiple pg_config.hs for multi-lib configurations
+  # This is a temporary workaround.  A better solution would be to compile
+  # a dummy c file and extract the value of the symbol.
+  file(GLOB _PG_CONFIG_HEADERS "${PostgreSQL_INCLUDE_DIR}/pg_config*.h")
+  foreach(_PG_CONFIG_HEADER ${_PG_CONFIG_HEADERS})
+    if(EXISTS "${_PG_CONFIG_HEADER}")
+      file(STRINGS "${_PG_CONFIG_HEADER}" pgsql_version_str
+           REGEX "^#define[\t ]+PG_VERSION[\t ]+\".*\"")
+      if(pgsql_version_str)
+        string(REGEX REPLACE "^#define[\t ]+PG_VERSION[\t ]+\"([^\"]*)\".*"
+               "\\1" PostgreSQL_VERSION_STRING "${pgsql_version_str}")
+        break()
+      endif()
+    endif()
+  endforeach()
+  unset(pgsql_version_str)
+endif()
+
+# Did we find anything?
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+find_package_handle_standard_args(PostgreSQL
+                                  REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR
+                                  VERSION_VAR PostgreSQL_VERSION_STRING)
+set( PostgreSQL_FOUND  ${POSTGRESQL_FOUND})
+
+# Now try to get the include and library path.
+if(PostgreSQL_FOUND)
+
+  set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR} )
+  set(PostgreSQL_LIBRARY_DIRS ${PostgreSQL_LIBRARY_DIR} )
+  set(PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND})
+
+  #message("Final PostgreSQL include dir: ${PostgreSQL_INCLUDE_DIRS}")
+  #message("Final PostgreSQL library dir: ${PostgreSQL_LIBRARY_DIRS}")
+  #message("Final PostgreSQL libraries:   ${PostgreSQL_LIBRARIES}")
+endif()
+
+mark_as_advanced(PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR PostgreSQL_LIBRARY )
\ No newline at end of file
diff --git a/cmake/FindReadline.cmake b/cmake/FindReadline.cmake
deleted file mode 100644
index 2254bebab..000000000
--- a/cmake/FindReadline.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-# find Readline (terminal input library) includes and library
-#
-# READLINE_INCLUDE_DIR - where the directory containing the READLINE headers can be found
-# READLINE_LIBRARY     - full path to the READLINE library
-# READLINE_FOUND       - TRUE if READLINE was found
-
-MACRO(FIND_READLINE)
-
-FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h)
-FIND_LIBRARY(READLINE_LIBRARY NAMES readline)
-
-IF (READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
-    SET(READLINE_FOUND TRUE)
-    MESSAGE(STATUS "Found Readline library: ${READLINE_LIBRARY}")
-    MESSAGE(STATUS "Include dir is: ${READLINE_INCLUDE_DIR}")
-    INCLUDE_DIRECTORIES(${READLINE_INCLUDE_DIR})
-ELSE (READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
-    SET(READLINE_FOUND FALSE)
-    MESSAGE(FATAL_ERROR "** Readline library not found!\n** Your distro may provide a binary for Readline e.g. for ubuntu try apt-get install libreadline5-dev")
-ENDIF (READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
-
-ENDMACRO(FIND_READLINE)
diff --git a/cmake/FindTermcap.cmake b/cmake/FindTermcap.cmake
deleted file mode 100644
index 20edb3acb..000000000
--- a/cmake/FindTermcap.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# find Termcap (terminal input library) includes and library
-#
-# TERMCAP_INCLUDE_DIR - where the directory containing the TERMCAP headers can be found
-# TERMCAP_LIBRARY     - full path to the TERMCAP library
-# TERMCAP_FOUND       - TRUE if TERMCAP was found
-
-MACRO(FIND_TERMCAP)
-
-FIND_PATH(TERMCAP_INCLUDE_DIR termcap.h
-    /usr/include
-    /usr/local/include
-
-    /opt/local/include
-)
-
-FIND_LIBRARY(TERMCAP_LIBRARY NAMES termcap PATH
-    /usr/lib
-    /usr/local/lib
-    /opt/local/lib
-    /usr/lib64
-)
-
-IF (TERMCAP_INCLUDE_DIR AND TERMCAP_LIBRARY)
-    SET(TERMCAP_FOUND TRUE)
-    MESSAGE(STATUS "Found GNU termcap: ${TERMCAP_LIBRARY}")
-    MESSAGE(STATUS "Include dir is: ${TERMCAP_INCLUDE_DIR}")
-    INCLUDE_DIRECTORIES(${TERMCAP_INCLUDE_DIR})
-ELSE (TERMCAP_INCLUDE_DIR AND TERMCAP_LIBRARY)
-    SET(TERMCAP_FOUND FALSE)
-    MESSAGE(FATAL_ERROR "Could not find GNU termcap")
-ENDIF (TERMCAP_INCLUDE_DIR AND TERMCAP_LIBRARY)
-
-ENDMACRO(FIND_TERMCAP)
diff --git a/cmake/SetDefinitions.cmake b/cmake/SetDefinitions.cmake
new file mode 100644
index 000000000..80fa18c9c
--- /dev/null
+++ b/cmake/SetDefinitions.cmake
@@ -0,0 +1,153 @@
+#
+# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+#Force set the default install path if it is default
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/bin/" CACHE PATH "MaNGOS default install prefix" FORCE)
+endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+
+#Set config install path correctly from given path
+string(FIND "${CONF_DIR}" ":" CONF_DIR_ABSOLUTE)
+if(${CONF_DIR_ABSOLUTE} EQUAL -1)
+    #Path was not absolute
+    set(CONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CONF_DIR}")
+    if(MSVC)
+        set(CONF_COPY_DIR "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/${CONF_DIR}")
+    endif()
+else()
+    #Path was absolute
+    set(CONF_INSTALL_DIR "${CONF_DIR}")
+    if(MSVC)
+        set(CONF_COPY_DIR "${CONF_DIR}")
+    endif()
+endif()
+
+if(WIN32)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+    set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/)
+    set(LIBS_DIR ${CMAKE_INSTALL_PREFIX}/)
+    
+    if(MSVC)
+        if(PLATFORM EQUAL 64)
+            # This definition is necessary to work around a bug with Intellisense described
+            # here: http://tinyurl.com/2cb428.  Syntax highlighting is important for proper
+            # debugger functionality.
+            add_definitions("-D_WIN64")
+
+            # Enable extended object support for debug compiles on X64 (not required on X86)
+            set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
+        else()
+            # Mark 32 bit executables large address aware so they can use > 2GB address space
+            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
+
+            add_definitions(/arch:SSE2)
+        endif()
+
+        if(NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")
+            set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /MP")
+            set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996 /wd4355 /wd4244 /wd4267 /MP")
+            set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /MP")
+            set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /MP")
+        endif()
+
+        # Specify the maximum PreCompiled Header memory allocation limit
+        # Fixes a compiler-problem when using PCH - the /Ym flag is adjusted by the compiler in MSVC2012, hence we need to set an upper limit with /Zm to avoid discrepancies)
+        # (And yes, this is a verified , unresolved bug with MSVC... *sigh*)
+        string(REGEX REPLACE "/Zm[0-9]+ *" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm500" CACHE STRING "" FORCE)
+    elseif(MINGW)
+        if(PLATFORM EQUAL 32)
+            set(SSE_FLAGS "-msse2 -mfpmath=sse")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SSE_FLAGS}")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}")
+        endif()
+        add_definitions(-DHAVE_SSE2 -D__SSE2__)
+
+        if(NOT DEBUG)
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --no-warnings")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --no-warnings")
+        else()
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wall -Wextra -Winit-self -Winvalid-pch -Wfatal-errors -g3")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall -Wextra -Winit-self -Winvalid-pch -Wfatal-errors -Woverloaded-virtual -g3")
+        endif()
+    endif()
+elseif(UNIX)
+    set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
+    set(LIBS_DIR ${CMAKE_INSTALL_PREFIX}/lib)
+    
+    # For Unix systems set the rpath so that libraries are found
+    set(CMAKE_INSTALL_RPATH "${LIBS_DIR}")
+    set(CMAKE_INSTALL_NAME_DIR "${LIBS_DIR}")
+    # Run out of build tree
+    set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
+    
+    # Add uninstall script and target
+    configure_file(
+        "${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+        "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
+        IMMEDIATE @ONLY
+    )
+
+    add_custom_target(uninstall
+        "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
+    )
+    
+    if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+
+        if(PLATFORM EQUAL 32)
+            set(SSE_FLAGS "-msse2 -mfpmath=sse")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SSE_FLAGS}")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}")
+        endif()
+        add_definitions(-DHAVE_SSE2 -D__SSE2__)
+        
+        if(NOT DEBUG)
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --no-warnings")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --no-warnings")
+        else()
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wall -Wextra -Winit-self -Winvalid-pch -Wfatal-errors -g3")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall -Wextra -Winit-self -Winvalid-pch -Wfatal-errors -Woverloaded-virtual -g3")
+        endif()
+    elseif(CMAKE_C_COMPILER MATCHES "icc")
+        if(PLATFORM EQUAL 32)
+            add_definitions(-axSSE2)
+        else()
+            add_definitions(-xSSE2)
+        endif()
+
+        if(DEBUG)
+          add_definitions(-w1)
+          add_definitions(-g)
+        endif()
+    elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+        if(DEBUG)
+            set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+        endif()
+
+        # -Wno-narrowing needed to suppress a warning in g3d
+        # -Wno-deprecated-register is needed to suppress 185 gsoap warnings on Unix systems.
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register")
+    endif()
+elseif(FreeBSD)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
+endif()
\ No newline at end of file
diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
index 9121ae3ce..36ee8fff5 100644
--- a/dep/CMakeLists.txt
+++ b/dep/CMakeLists.txt
@@ -18,10 +18,22 @@ if(NOT ACE_USE_EXTERNAL)
   add_subdirectory(acelite)
 endif()
 
-add_subdirectory(recastnavigation)
-add_subdirectory(src)
-add_subdirectory(StormLib)
+if(SOAP)
+    add_subdirectory(gsoap)
+endif()
 
 if(SCRIPT_LIB_ELUNA)
     add_subdirectory(lualib)
-endif()
\ No newline at end of file
+endif()
+
+if(USE_STORMLIB)
+    add_subdirectory(StormLib)
+else()
+    add_subdirectory(libmpq)
+endif()
+
+add_subdirectory(recastnavigation)
+add_subdirectory(g3dlite)
+add_subdirectory(zlib)
+add_subdirectory(loadlib)
+add_subdirectory(bzip2)
diff --git a/dep/README.md b/dep/README.md
new file mode 100644
index 000000000..cf864bdf0
--- /dev/null
+++ b/dep/README.md
@@ -0,0 +1,63 @@
+[![](https://www.getmangos.eu/images/primus/blue/misc/logo.png)](http://www.getmangos.eu)&nbsp;
+
+[![](https://github.com/mangoszero/server/raw/master/icons/FORUM.gif)](https://www.getmangos.eu/forum.php)
+[![](https://github.com/mangoszero/server/raw/master/icons/WIKI.gif)](http://github.com/mangoswiki/wiki/wiki)
+[![](https://github.com/mangoszero/server/raw/master/icons/TOOLS.gif)](http://github.com/mangostools)
+[![](https://github.com/mangoszero/server/raw/master/icons/TRACKER.gif)](https://www.getmangos.eu/project.php)
+
+Mangos Dependencies
+------------
+*Mangos* stands on the shoulders of well-known Open Source
+libraries, and a few awesome, but less known libraries to prevent us from
+inventing the wheel again.
+
+*Please note that Linux and Mac OS X users should install packages using
+their systems package management instead of source packages.*
+
+* **MySQL** / **PostgreSQL**: to store content, and user data, we rely on
+  [MySQL][1]/[MariaDB][2] and [PostgreSQL][3] to handle data.
+* **ACE**: the [ADAPTIVE Communication Environment][4] aka. *ACE* provides us
+  with a solid cross-platform framework for abstracting operating system
+  specific details.
+* **Recast**: in order to create navigation data from the client's map files,
+  we use [Recast][5] to do the dirty work. It provides functions for
+  rendering, pathing, etc.
+* **G3D**: the [G3D][6] engine provides the basic framework for handling 3D
+  data, and is used to handle basic map data.
+* **libmpq**: [libmpq][7] provides an abstraction layer for reading from the
+  client's data files.
+* **Zlib**: [Zlib][12] ([Zlib for Windows][10]) provides compression algorithms
+  used in both MPQ archive handling and the client/server protocol.
+* **Bzip2**: [Bzip2][13] ([Bzip2 for Windows][11]) provides compression
+  algorithms used in MPQ archives.
+* **OpenSSL**: [OpenSSL][8] ([OpenSSL for Windows][14]) provides encryption
+  algorithms used when authenticating clients.
+* **Lua**: [Lua 5.2][15] ([Lua 5.2 for Windows][16]) provides a convenient, fast
+  scripting environment, which allows us to make live changes to scripted
+  content.
+
+*Recast*, *G3D* and *libmpq* are included in the *Mangos* distribution as
+we rely on specific versions. *libmpq* is to be replaced with *stormlib* shortly. 
+
+Optional dependencies
+---------------------
+
+* **Doxygen**: if you want to export HTML or PDF formatted documentation for the
+  *Mangos* API, you should install [Doxygen][9].
+
+[1]: http://www.mysql.com/ "MySQL · The world's most popular open source database"
+[2]: http://www.mariadb.org/ "MariaDB · An enhanced, drop-in replacement for MySQL"
+[3]: http://www.postgresql.org/ "PostgreSQL · The world's most advanced open source database"
+[4]: http://www.cs.wustl.edu/~schmidt/ACE.html "ACE · The ADAPTIVE Communication Environment"
+[5]: http://github.com/memononen/recastnavigation "Recast · Navigation-mesh Toolset for Games"
+[6]: http://sourceforge.net/projects/g3d/ "G3D · G3D Innovation Engine"
+[7]: http://github.com/ge0rg/libmpq "libmpq · A library for reading data from MPQ archives"
+[8]: http://www.openssl.org/ "OpenSSL · The Open Source toolkit for SSL/TLS"
+[9]: http://www.stack.nl/~dimitri/doxygen/ "Doxygen · API documentation generator"
+[10]: http://gnuwin32.sourceforge.net/packages/zlib.htm "Zlib for Windows"
+[11]: http://gnuwin32.sourceforge.net/packages/bzip2.htm "Bzip2 for Windows"
+[12]: http://www.zlib.net/ "Zlib"
+[13]: http://www.bzip.org/ "Bzip2"
+[14]: http://slproweb.com/products/Win32OpenSSL.html "OpenSSL for Windows"
+[15]: http://www.lua.org/ "Lua"
+[16]: https://code.google.com/p/luaforwindows/ "Lua for Windows"
diff --git a/dep/StormLib/CMakeLists.txt b/dep/StormLib/CMakeLists.txt
index f1b6ca6e1..4df50822b 100644
--- a/dep/StormLib/CMakeLists.txt
+++ b/dep/StormLib/CMakeLists.txt
@@ -2,115 +2,113 @@ project(StormLib)
 cmake_minimum_required(VERSION 2.6)
 
 set(SRC_FILES
-           src/adpcm/adpcm.cpp
-           src/huffman/huff.cpp
-           src/jenkins/lookup3.c
-           src/lzma/C/LzFind.c
-           src/lzma/C/LzmaDec.c
-           src/lzma/C/LzmaEnc.c
-           src/pklib/explode.c
-           src/pklib/implode.c
-           src/sparse/sparse.cpp
-           src/FileStream.cpp
-           src/SBaseCommon.cpp
-           src/SBaseDumpData.cpp
-           src/SBaseFileTable.cpp
-           src/SBaseSubTypes.cpp
-           src/SCompression.cpp
-           src/SFileAddFile.cpp
-           src/SFileAttributes.cpp
-           src/SFileCompactArchive.cpp
-           src/SFileCreateArchive.cpp
-           src/SFileExtractFile.cpp
-           src/SFileFindFile.cpp
-           src/SFileGetFileInfo.cpp
-           src/SFileListFile.cpp
-           src/SFileOpenArchive.cpp
-           src/SFileOpenFileEx.cpp
-           src/SFilePatchArchives.cpp
-           src/SFileReadFile.cpp
-           src/SFileVerify.cpp
-           src/libtomcrypt/src/pk/rsa/rsa_verify_simple.c
-           src/libtomcrypt/src/misc/crypt_libc.c
+   src/adpcm/adpcm.cpp
+   src/huffman/huff.cpp
+   src/jenkins/lookup3.c
+   src/lzma/C/LzFind.c
+   src/lzma/C/LzmaDec.c
+   src/lzma/C/LzmaEnc.c
+   src/pklib/explode.c
+   src/pklib/implode.c
+   src/sparse/sparse.cpp
+   src/FileStream.cpp
+   src/SBaseCommon.cpp
+   src/SBaseDumpData.cpp
+   src/SBaseFileTable.cpp
+   src/SCompression.cpp
+   src/SFileAddFile.cpp
+   src/SFileAttributes.cpp
+   src/SFileCompactArchive.cpp
+   src/SFileCreateArchive.cpp
+   src/SFileExtractFile.cpp
+   src/SFileFindFile.cpp
+   src/SFileListFile.cpp
+   src/SFileOpenArchive.cpp
+   src/SFileOpenFileEx.cpp
+   src/SFilePatchArchives.cpp
+   src/SFileReadFile.cpp
+   src/SFileVerify.cpp
+   src/libtomcrypt/src/pk/rsa/rsa_verify_simple.c
+   src/libtomcrypt/src/misc/crypt_libc.c
 )
 
 set(TOMCRYPT_FILES
-           src/libtomcrypt/src/hashes/hash_memory.c
-           src/libtomcrypt/src/hashes/md5.c
-           src/libtomcrypt/src/hashes/sha1.c
-           src/libtomcrypt/src/math/ltm_desc.c
-           src/libtomcrypt/src/math/multi.c
-           src/libtomcrypt/src/math/rand_prime.c
-           src/libtomcrypt/src/misc/base64_decode.c
-           src/libtomcrypt/src/misc/crypt_argchk.c
-           src/libtomcrypt/src/misc/crypt_find_hash.c
-           src/libtomcrypt/src/misc/crypt_find_prng.c
-           src/libtomcrypt/src/misc/crypt_hash_descriptor.c
-           src/libtomcrypt/src/misc/crypt_hash_is_valid.c
-           src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.c
-           src/libtomcrypt/src/misc/crypt_prng_descriptor.c
-           src/libtomcrypt/src/misc/crypt_prng_is_valid.c
-           src/libtomcrypt/src/misc/crypt_register_hash.c
-           src/libtomcrypt/src/misc/crypt_register_prng.c
-           src/libtomcrypt/src/misc/zeromem.c
-           src/libtomcrypt/src/pk/asn1/der_decode_bit_string.c
-           src/libtomcrypt/src/pk/asn1/der_decode_boolean.c
-           src/libtomcrypt/src/pk/asn1/der_decode_choice.c
-           src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.c
-           src/libtomcrypt/src/pk/asn1/der_decode_integer.c
-           src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.c
-           src/libtomcrypt/src/pk/asn1/der_decode_octet_string.c
-           src/libtomcrypt/src/pk/asn1/der_decode_printable_string.c
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.c
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.c
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.c
-           src/libtomcrypt/src/pk/asn1/der_decode_short_integer.c
-           src/libtomcrypt/src/pk/asn1/der_decode_utctime.c
-           src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.c
-           src/libtomcrypt/src/pk/asn1/der_encode_bit_string.c
-           src/libtomcrypt/src/pk/asn1/der_encode_boolean.c
-           src/libtomcrypt/src/pk/asn1/der_encode_ia5_string.c
-           src/libtomcrypt/src/pk/asn1/der_encode_integer.c
-           src/libtomcrypt/src/pk/asn1/der_encode_object_identifier.c
-           src/libtomcrypt/src/pk/asn1/der_encode_octet_string.c
-           src/libtomcrypt/src/pk/asn1/der_encode_printable_string.c
-           src/libtomcrypt/src/pk/asn1/der_encode_sequence_ex.c
-           src/libtomcrypt/src/pk/asn1/der_encode_sequence_multi.c
-           src/libtomcrypt/src/pk/asn1/der_encode_set.c
-           src/libtomcrypt/src/pk/asn1/der_encode_setof.c
-           src/libtomcrypt/src/pk/asn1/der_encode_short_integer.c
-           src/libtomcrypt/src/pk/asn1/der_encode_utctime.c
-           src/libtomcrypt/src/pk/asn1/der_encode_utf8_string.c
-           src/libtomcrypt/src/pk/asn1/der_length_bit_string.c
-           src/libtomcrypt/src/pk/asn1/der_length_boolean.c
-           src/libtomcrypt/src/pk/asn1/der_length_ia5_string.c
-           src/libtomcrypt/src/pk/asn1/der_length_integer.c
-           src/libtomcrypt/src/pk/asn1/der_length_object_identifier.c
-           src/libtomcrypt/src/pk/asn1/der_length_octet_string.c
-           src/libtomcrypt/src/pk/asn1/der_length_printable_string.c
-           src/libtomcrypt/src/pk/asn1/der_length_sequence.c
-           src/libtomcrypt/src/pk/asn1/der_length_utctime.c
-           src/libtomcrypt/src/pk/asn1/der_sequence_free.c
-           src/libtomcrypt/src/pk/asn1/der_length_utf8_string.c
-           src/libtomcrypt/src/pk/asn1/der_length_short_integer.c
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_map.c
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_points.c
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_encode.c
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_encode.c
-           src/libtomcrypt/src/pk/rsa/rsa_exptmod.c
-           src/libtomcrypt/src/pk/rsa/rsa_free.c
-           src/libtomcrypt/src/pk/rsa/rsa_import.c
-           src/libtomcrypt/src/pk/rsa/rsa_make_key.c
-           src/libtomcrypt/src/pk/rsa/rsa_sign_hash.c
-           src/libtomcrypt/src/pk/rsa/rsa_verify_hash.c
+   src/libtomcrypt/src/hashes/hash_memory.c
+   src/libtomcrypt/src/hashes/md5.c
+   src/libtomcrypt/src/hashes/sha1.c
+   src/libtomcrypt/src/math/ltm_desc.c
+   src/libtomcrypt/src/math/multi.c
+   src/libtomcrypt/src/math/rand_prime.c
+   src/libtomcrypt/src/misc/base64_decode.c
+   src/libtomcrypt/src/misc/crypt_argchk.c
+   src/libtomcrypt/src/misc/crypt_find_hash.c
+   src/libtomcrypt/src/misc/crypt_find_prng.c
+   src/libtomcrypt/src/misc/crypt_hash_descriptor.c
+   src/libtomcrypt/src/misc/crypt_hash_is_valid.c
+   src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.c
+   src/libtomcrypt/src/misc/crypt_prng_descriptor.c
+   src/libtomcrypt/src/misc/crypt_prng_is_valid.c
+   src/libtomcrypt/src/misc/crypt_register_hash.c
+   src/libtomcrypt/src/misc/crypt_register_prng.c
+   src/libtomcrypt/src/misc/zeromem.c
+   src/libtomcrypt/src/pk/asn1/der_decode_bit_string.c
+   src/libtomcrypt/src/pk/asn1/der_decode_boolean.c
+   src/libtomcrypt/src/pk/asn1/der_decode_choice.c
+   src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.c
+   src/libtomcrypt/src/pk/asn1/der_decode_integer.c
+   src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.c
+   src/libtomcrypt/src/pk/asn1/der_decode_octet_string.c
+   src/libtomcrypt/src/pk/asn1/der_decode_printable_string.c
+   src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.c
+   src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.c
+   src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.c
+   src/libtomcrypt/src/pk/asn1/der_decode_short_integer.c
+   src/libtomcrypt/src/pk/asn1/der_decode_utctime.c
+   src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.c
+   src/libtomcrypt/src/pk/asn1/der_encode_bit_string.c
+   src/libtomcrypt/src/pk/asn1/der_encode_boolean.c
+   src/libtomcrypt/src/pk/asn1/der_encode_ia5_string.c
+   src/libtomcrypt/src/pk/asn1/der_encode_integer.c
+   src/libtomcrypt/src/pk/asn1/der_encode_object_identifier.c
+   src/libtomcrypt/src/pk/asn1/der_encode_octet_string.c
+   src/libtomcrypt/src/pk/asn1/der_encode_printable_string.c
+   src/libtomcrypt/src/pk/asn1/der_encode_sequence_ex.c
+   src/libtomcrypt/src/pk/asn1/der_encode_sequence_multi.c
+   src/libtomcrypt/src/pk/asn1/der_encode_set.c
+   src/libtomcrypt/src/pk/asn1/der_encode_setof.c
+   src/libtomcrypt/src/pk/asn1/der_encode_short_integer.c
+   src/libtomcrypt/src/pk/asn1/der_encode_utctime.c
+   src/libtomcrypt/src/pk/asn1/der_encode_utf8_string.c
+   src/libtomcrypt/src/pk/asn1/der_length_bit_string.c
+   src/libtomcrypt/src/pk/asn1/der_length_boolean.c
+   src/libtomcrypt/src/pk/asn1/der_length_ia5_string.c
+   src/libtomcrypt/src/pk/asn1/der_length_integer.c
+   src/libtomcrypt/src/pk/asn1/der_length_object_identifier.c
+   src/libtomcrypt/src/pk/asn1/der_length_octet_string.c
+   src/libtomcrypt/src/pk/asn1/der_length_printable_string.c
+   src/libtomcrypt/src/pk/asn1/der_length_sequence.c
+   src/libtomcrypt/src/pk/asn1/der_length_utctime.c
+   src/libtomcrypt/src/pk/asn1/der_sequence_free.c
+   src/libtomcrypt/src/pk/asn1/der_length_utf8_string.c
+   src/libtomcrypt/src/pk/asn1/der_length_short_integer.c
+   src/libtomcrypt/src/pk/ecc/ltc_ecc_map.c
+   src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c
+   src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c
+   src/libtomcrypt/src/pk/ecc/ltc_ecc_points.c
+   src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c
+   src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c
+   src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c
+   src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c
+   src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c
+   src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_encode.c
+   src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c
+   src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_encode.c
+   src/libtomcrypt/src/pk/rsa/rsa_exptmod.c
+   src/libtomcrypt/src/pk/rsa/rsa_free.c
+   src/libtomcrypt/src/pk/rsa/rsa_import.c
+   src/libtomcrypt/src/pk/rsa/rsa_make_key.c
+   src/libtomcrypt/src/pk/rsa/rsa_sign_hash.c
+   src/libtomcrypt/src/pk/rsa/rsa_verify_hash.c
 )
 
 set(TOMMATH_FILES
diff --git a/dep/StormLib/src/FileStream.cpp b/dep/StormLib/src/FileStream.cpp
index 2f6e59943..620373d9e 100644
--- a/dep/StormLib/src/FileStream.cpp
+++ b/dep/StormLib/src/FileStream.cpp
@@ -19,8 +19,7 @@
 #include "FileStream.h"
 
 #ifdef _MSC_VER
-#pragma comment(lib, "wininet.lib")             // Internet functions for HTTP stream
-#pragma warning(disable: 4800)                  // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
+#pragma comment(lib, "wininet.lib")
 #endif
 
 //-----------------------------------------------------------------------------
@@ -30,6 +29,10 @@
 #define INVALID_HANDLE_VALUE ((HANDLE)-1)
 #endif
 
+#ifdef _MSC_VER
+#pragma warning(disable: 4800)                  // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
+#endif
+
 //-----------------------------------------------------------------------------
 // Local functions - platform-specific functions
 
@@ -47,137 +50,87 @@ void SetLastError(int nError)
 }
 #endif
 
-static DWORD StringToInt(const char * szString)
+#ifndef PLATFORM_LITTLE_ENDIAN
+void ConvertPartHeader(void * partHeader)
 {
-    DWORD dwValue = 0;
+    PPART_FILE_HEADER theHeader = (PPART_FILE_HEADER)partHeader;
 
-    while('0' <= szString[0] && szString[0] <= '9')
-    {
-        dwValue = (dwValue * 10) + (szString[0] - '9');
-        szString++;
-    }
-
-    return dwValue;
+    theHeader->PartialVersion = SwapUInt32(theHeader->PartialVersion);
+    theHeader->Flags          = SwapUInt32(theHeader->Flags);
+    theHeader->FileSizeLo     = SwapUInt32(theHeader->FileSizeLo);
+    theHeader->FileSizeHi     = SwapUInt32(theHeader->FileSizeHi);
+    theHeader->BlockSize      = SwapUInt32(theHeader->BlockSize);
 }
+#endif
 
 //-----------------------------------------------------------------------------
-// Dummy init function
+// Preparing file bitmap for a complete file of a given size
 
-static void BaseNone_Init(TFileStream *)
+#define DEFAULT_BLOCK_SIZE 0x4000
+
+static bool Dummy_GetBitmap(
+        TFileStream * pStream,
+        TFileBitmap * pBitmap,
+        DWORD Length,
+        LPDWORD LengthNeeded)
 {
-    // Nothing here
+    ULONGLONG FileSize = 0;
+    DWORD TotalLength;
+    DWORD BlockCount;
+    DWORD BitmapSize;
+    DWORD LastByte;
+    bool bResult = false;
+
+    // Get file size and calculate bitmap length
+    FileStream_GetSize(pStream, &FileSize);
+    BlockCount = (DWORD)(((FileSize - 1) / DEFAULT_BLOCK_SIZE) + 1);
+    BitmapSize = (DWORD)(((BlockCount - 1) / 8) + 1);
+
+    // Calculate and give the total length
+    TotalLength = sizeof(TFileBitmap) + BitmapSize;
+    if(LengthNeeded != NULL)
+        *LengthNeeded = TotalLength;
+
+    // Has the caller given enough space for storing the structure?
+    if(Length >= sizeof(TFileBitmap))
+    {
+        memset(pBitmap, 0, sizeof(TFileBitmap));
+        pBitmap->EndOffset  = FileSize;
+        pBitmap->IsComplete = 1;
+        pBitmap->BitmapSize = BitmapSize;
+        pBitmap->BlockSize  = DEFAULT_BLOCK_SIZE;
+        bResult = true;
+    }
+
+    // Do we have enough space to fill the bitmap as well?
+    if(Length >= TotalLength)
+    {
+        LPBYTE pbBitmap = (LPBYTE)(pBitmap + 1);
+
+        // Fill the full blocks
+        memset(pbBitmap, 0xFF, (BlockCount / 8));
+        pbBitmap += (BlockCount / 8);
+        bResult = true;
+
+        // Supply the last block
+        if(BlockCount & 7)
+        {
+            LastByte = (1 << (BlockCount & 7)) - 1;
+            pbBitmap[0] = (BYTE)LastByte;
+        }
+    }
+
+    return bResult;
 }
 
 //-----------------------------------------------------------------------------
 // Local functions - base file support
 
-static bool BaseFile_Create(TFileStream * pStream)
-{
-#ifdef PLATFORM_WINDOWS
-    {
-        DWORD dwWriteShare = (pStream->dwFlags & STREAM_FLAG_WRITE_SHARE) ? FILE_SHARE_WRITE : 0;
-
-        pStream->Base.File.hFile = CreateFile(pStream->szFileName,
-                                              GENERIC_READ | GENERIC_WRITE,
-                                              dwWriteShare | FILE_SHARE_READ,
-                                              NULL,
-                                              CREATE_ALWAYS,
-                                              0,
-                                              NULL);
-        if(pStream->Base.File.hFile == INVALID_HANDLE_VALUE)
-            return false;
-    }
-#endif
-
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-    {
-        intptr_t handle;
-        
-        handle = open(pStream->szFileName, O_RDWR | O_CREAT | O_TRUNC | O_LARGEFILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-        if(handle == -1)
-        {
-            nLastError = errno;
-            return false;
-        }
-        
-        pStream->Base.File.hFile = (HANDLE)handle;
-    }
-#endif
-
-    // Reset the file size and position
-    pStream->Base.File.FileSize = 0;
-    pStream->Base.File.FilePos = 0;
-    return true;
-}
-
-static bool BaseFile_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD dwStreamFlags)
-{
-#ifdef PLATFORM_WINDOWS
-    {
-        ULARGE_INTEGER FileSize;
-        DWORD dwWriteAccess = (dwStreamFlags & STREAM_FLAG_READ_ONLY) ? 0 : FILE_WRITE_DATA | FILE_APPEND_DATA | FILE_WRITE_ATTRIBUTES;
-        DWORD dwWriteShare = (dwStreamFlags & STREAM_FLAG_WRITE_SHARE) ? FILE_SHARE_WRITE : 0;
-
-        // Open the file
-        pStream->Base.File.hFile = CreateFile(szFileName,
-                                              FILE_READ_DATA | FILE_READ_ATTRIBUTES | dwWriteAccess,
-                                              FILE_SHARE_READ | dwWriteShare,
-                                              NULL,
-                                              OPEN_EXISTING,
-                                              0,
-                                              NULL);
-        if(pStream->Base.File.hFile == INVALID_HANDLE_VALUE)
-            return false;
-
-        // Query the file size
-        FileSize.LowPart = GetFileSize(pStream->Base.File.hFile, &FileSize.HighPart);
-        pStream->Base.File.FileSize = FileSize.QuadPart;
-
-        // Query last write time
-        GetFileTime(pStream->Base.File.hFile, NULL, NULL, (LPFILETIME)&pStream->Base.File.FileTime);
-    }
-#endif
-
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-    {
-        struct stat64 fileinfo;
-        int oflag = (dwStreamFlags & STREAM_FLAG_READ_ONLY) ? O_RDONLY : O_RDWR;
-        intptr_t handle;
-
-        // Open the file
-        handle = open(szFileName, oflag | O_LARGEFILE);
-        if(handle == -1)
-        {
-            nLastError = errno;
-            return false;
-        }
-
-        // Get the file size
-        if(fstat64(handle, &fileinfo) == -1)
-        {
-            nLastError = errno;
-            return false;
-        }
-
-        // time_t is number of seconds since 1.1.1970, UTC.
-        // 1 second = 10000000 (decimal) in FILETIME
-        // Set the start to 1.1.1970 00:00:00
-        pStream->Base.File.FileTime = 0x019DB1DED53E8000ULL + (10000000 * fileinfo.st_mtime);
-        pStream->Base.File.FileSize = (ULONGLONG)fileinfo.st_size;
-        pStream->Base.File.hFile = (HANDLE)handle;
-    }
-#endif
-
-    // Reset the file position
-    pStream->Base.File.FilePos = 0;
-    return true;
-}
-
 static bool BaseFile_Read(
-    TFileStream * pStream,                  // Pointer to an open stream
-    ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
-    void * pvBuffer,                        // Pointer to data to be read
-    DWORD dwBytesToRead)                    // Number of bytes to read from the file
+        TFileStream * pStream,                  // Pointer to an open stream
+        ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
+        void * pvBuffer,                        // Pointer to data to be read
+        DWORD dwBytesToRead)                    // Number of bytes to read from the file
 {
     ULONGLONG ByteOffset = (pByteOffset != NULL) ? *pByteOffset : pStream->Base.File.FilePos;
     DWORD dwBytesRead = 0;                  // Must be set by platform-specific code
@@ -203,6 +156,24 @@ static bool BaseFile_Read(
             if(!ReadFile(pStream->Base.File.hFile, pvBuffer, dwBytesToRead, &dwBytesRead, &Overlapped))
                 return false;
         }
+        /*
+        // If the byte offset is different from the current file position,
+        // we have to update the file position
+        if(ByteOffset != pStream->Base.File.FilePos)
+        {
+            LONG ByteOffsetHi = (LONG)(ByteOffset >> 32);
+
+            SetFilePointer(pStream->Base.File.hFile, (LONG)ByteOffset, &ByteOffsetHi, FILE_BEGIN);
+            pStream->Base.File.FilePos = ByteOffset;
+        }
+
+        // Read the data
+        if(dwBytesToRead != 0)
+        {
+            if(!ReadFile(pStream->Base.File.hFile, pvBuffer, dwBytesToRead, &dwBytesRead, NULL))
+                return false;
+        }
+*/
     }
 #endif
 
@@ -211,10 +182,10 @@ static bool BaseFile_Read(
         ssize_t bytes_read;
 
         // If the byte offset is different from the current file position,
-        // we have to update the file position   xxx
+        // we have to update the file position
         if(ByteOffset != pStream->Base.File.FilePos)
         {
-            lseek64((intptr_t)pStream->Base.File.hFile, (off64_t)(ByteOffset), SEEK_SET);
+            lseek((intptr_t)pStream->Base.File.hFile, (off_t)(ByteOffset), SEEK_SET);
             pStream->Base.File.FilePos = ByteOffset;
         }
 
@@ -227,7 +198,7 @@ static bool BaseFile_Read(
                 nLastError = errno;
                 return false;
             }
-            
+
             dwBytesRead = (DWORD)(size_t)bytes_read;
         }
     }
@@ -274,6 +245,24 @@ static bool BaseFile_Write(TFileStream * pStream, ULONGLONG * pByteOffset, const
             if(!WriteFile(pStream->Base.File.hFile, pvBuffer, dwBytesToWrite, &dwBytesWritten, &Overlapped))
                 return false;
         }
+        /*
+        // If the byte offset is different from the current file position,
+        // we have to update the file position
+        if(ByteOffset != pStream->Base.File.FilePos)
+        {
+            LONG ByteOffsetHi = (LONG)(ByteOffset >> 32);
+
+            SetFilePointer(pStream->Base.File.hFile, (LONG)ByteOffset, &ByteOffsetHi, FILE_BEGIN);
+            pStream->Base.File.FilePos = ByteOffset;
+        }
+
+        // Read the data
+        if(dwBytesToWrite != 0)
+        {
+        if(!WriteFile(pStream->Base.File.hFile, pvBuffer, dwBytesToWrite, &dwBytesWritten, NULL))
+            return false;
+    }
+*/
     }
 #endif
 
@@ -285,7 +274,7 @@ static bool BaseFile_Write(TFileStream * pStream, ULONGLONG * pByteOffset, const
         // we have to update the file position
         if(ByteOffset != pStream->Base.File.FilePos)
         {
-            lseek64((intptr_t)pStream->Base.File.hFile, (off64_t)(ByteOffset), SEEK_SET);
+            lseek((intptr_t)pStream->Base.File.hFile, (off_t)(ByteOffset), SEEK_SET);
             pStream->Base.File.FilePos = ByteOffset;
         }
 
@@ -296,7 +285,7 @@ static bool BaseFile_Write(TFileStream * pStream, ULONGLONG * pByteOffset, const
             nLastError = errno;
             return false;
         }
-        
+
         dwBytesWritten = (DWORD)(size_t)bytes_written;
     }
 #endif
@@ -313,11 +302,27 @@ static bool BaseFile_Write(TFileStream * pStream, ULONGLONG * pByteOffset, const
     return (dwBytesWritten == dwBytesToWrite);
 }
 
+static bool BaseFile_GetPos(
+        TFileStream * pStream,                  // Pointer to an open stream
+        ULONGLONG * pByteOffset)                // Pointer to file byte offset
+{
+    *pByteOffset = pStream->Base.File.FilePos;
+    return true;
+}
+
+static bool BaseFile_GetSize(
+        TFileStream * pStream,                  // Pointer to an open stream
+        ULONGLONG * pFileSize)                  // Pointer where to store file size
+{
+    *pFileSize = pStream->Base.File.FileSize;
+    return true;
+}
+
 /**
  * \a pStream Pointer to an open stream
  * \a NewFileSize New size of the file
  */
-static bool BaseFile_Resize(TFileStream * pStream, ULONGLONG NewFileSize)
+static bool BaseFile_SetSize(TFileStream * pStream, ULONGLONG NewFileSize)
 {
 #ifdef PLATFORM_WINDOWS
     {
@@ -333,8 +338,6 @@ static bool BaseFile_Resize(TFileStream * pStream, ULONGLONG NewFileSize)
 
         // Set the current file pointer as the end of the file
         bResult = (bool)SetEndOfFile(pStream->Base.File.hFile);
-        if(bResult)
-            pStream->Base.File.FileSize = NewFileSize;
 
         // Restore the file position
         FileSizeHi = (LONG)(pStream->Base.File.FilePos >> 32);
@@ -343,41 +346,28 @@ static bool BaseFile_Resize(TFileStream * pStream, ULONGLONG NewFileSize)
         return bResult;
     }
 #endif
-    
+
 #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
     {
-        if(ftruncate64((intptr_t)pStream->Base.File.hFile, (off64_t)NewFileSize) == -1)
+        if(ftruncate((intptr_t)pStream->Base.File.hFile, (off_t)NewFileSize) == -1)
         {
             nLastError = errno;
             return false;
         }
-        
-        pStream->Base.File.FileSize = NewFileSize;
+
         return true;
     }
 #endif
 }
 
-// Gives the current file size
-static bool BaseFile_GetSize(TFileStream * pStream, ULONGLONG * pFileSize)
+static bool BaseFile_GetTime(TFileStream * pStream, ULONGLONG * pFileTime)
 {
-    // Note: Used by all thre base providers.
-    // Requires the TBaseData union to have the same layout for all three base providers
-    *pFileSize = pStream->Base.File.FileSize;
-    return true;
-}
-
-// Gives the current file position
-static bool BaseFile_GetPos(TFileStream * pStream, ULONGLONG * pByteOffset)
-{
-    // Note: Used by all thre base providers.
-    // Requires the TBaseData union to have the same layout for all three base providers
-    *pByteOffset = pStream->Base.File.FilePos;
+    *pFileTime = pStream->Base.File.FileTime;
     return true;
 }
 
 // Renames the file pointed by pStream so that it contains data from pNewStream
-static bool BaseFile_Replace(TFileStream * pStream, TFileStream * pNewStream)
+static bool BaseFile_Switch(TFileStream * pStream, TFileStream * pNewStream)
 {
 #ifdef PLATFORM_WINDOWS
     // Delete the original stream file. Don't check the result value,
@@ -395,7 +385,7 @@ static bool BaseFile_Replace(TFileStream * pStream, TFileStream * pNewStream)
         nLastError = errno;
         return false;
     }
-    
+
     return true;
 #endif
 }
@@ -417,23 +407,203 @@ static void BaseFile_Close(TFileStream * pStream)
     pStream->Base.File.hFile = INVALID_HANDLE_VALUE;
 }
 
-// Initializes base functions for the disk file
-static void BaseFile_Init(TFileStream * pStream)
+static bool BaseFile_Create(
+        TFileStream * pStream,
+        const TCHAR * szFileName,
+        DWORD dwStreamFlags)
 {
-    pStream->BaseCreate  = BaseFile_Create;
-    pStream->BaseOpen    = BaseFile_Open;
+#ifdef PLATFORM_WINDOWS
+    {
+        DWORD dwWriteShare = (dwStreamFlags & STREAM_FLAG_WRITE_SHARE) ? FILE_SHARE_WRITE : 0;
+
+        pStream->Base.File.hFile = CreateFile(szFileName,
+                                              GENERIC_READ | GENERIC_WRITE,
+                                              dwWriteShare | FILE_SHARE_READ,
+                                              NULL,
+                                              CREATE_ALWAYS,
+                                              0,
+                                              NULL);
+        if(pStream->Base.File.hFile == INVALID_HANDLE_VALUE)
+            return false;
+    }
+#endif
+
+#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
+    {
+        intptr_t handle;
+
+        handle = open(szFileName, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+        if(handle == -1)
+        {
+            nLastError = errno;
+            return false;
+        }
+
+        pStream->Base.File.hFile = (HANDLE)handle;
+    }
+#endif
+
+    // Fill-in the entry points
     pStream->BaseRead    = BaseFile_Read;
     pStream->BaseWrite   = BaseFile_Write;
-    pStream->BaseResize  = BaseFile_Resize;
-    pStream->BaseGetSize = BaseFile_GetSize;
     pStream->BaseGetPos  = BaseFile_GetPos;
+    pStream->BaseGetSize = BaseFile_GetSize;
+    pStream->BaseSetSize = BaseFile_SetSize;
+    pStream->BaseSetSize = BaseFile_SetSize;
+    pStream->BaseGetTime = BaseFile_GetTime;
     pStream->BaseClose   = BaseFile_Close;
+
+    // Reset the file position
+    pStream->Base.File.FileSize = 0;
+    pStream->Base.File.FilePos = 0;
+    pStream->dwFlags = dwStreamFlags;
+    return true;
+}
+
+static bool BaseFile_Open(
+        TFileStream * pStream,
+        const TCHAR * szFileName,
+        DWORD dwStreamFlags)
+{
+#ifdef PLATFORM_WINDOWS
+    {
+        ULARGE_INTEGER FileSize;
+        DWORD dwDesiredAccess = (dwStreamFlags & STREAM_FLAG_READ_ONLY) ? GENERIC_READ : GENERIC_ALL;
+        DWORD dwWriteShare = (dwStreamFlags & STREAM_FLAG_WRITE_SHARE) ? FILE_SHARE_WRITE : 0;
+
+        // Open the file
+        pStream->Base.File.hFile = CreateFile(szFileName,
+                                              dwDesiredAccess,
+                                              dwWriteShare | FILE_SHARE_READ,
+                                              NULL,
+                                              OPEN_EXISTING,
+                                              0,
+                                              NULL);
+        if(pStream->Base.File.hFile == INVALID_HANDLE_VALUE)
+            return false;
+
+        // Query the file size
+        FileSize.LowPart = GetFileSize(pStream->Base.File.hFile, &FileSize.HighPart);
+        pStream->Base.File.FileSize = FileSize.QuadPart;
+
+        // Query last write time
+        GetFileTime(pStream->Base.File.hFile, NULL, NULL, (LPFILETIME)&pStream->Base.File.FileTime);
+    }
+#endif
+
+#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
+    {
+        struct stat fileinfo;
+        int oflag = (dwStreamFlags & STREAM_FLAG_READ_ONLY) ? O_RDONLY : O_RDWR;
+        intptr_t handle;
+
+        // Open the file
+        handle = open(szFileName, oflag);
+        if(handle == -1)
+        {
+            nLastError = errno;
+            return false;
+        }
+
+        // Get the file size
+        if(fstat(handle, &fileinfo) == -1)
+        {
+            nLastError = errno;
+            return false;
+        }
+
+        // time_t is number of seconds since 1.1.1970, UTC.
+        // 1 second = 10000000 (decimal) in FILETIME
+        // Set the start to 1.1.1970 00:00:00
+        pStream->Base.File.FileTime = 0x019DB1DED53E8000ULL + (10000000 * fileinfo.st_mtime);
+        pStream->Base.File.FileSize = (ULONGLONG)fileinfo.st_size;
+        pStream->Base.File.hFile = (HANDLE)handle;
+    }
+#endif
+
+    // Fill-in the entry points
+    pStream->BaseRead    = BaseFile_Read;
+    pStream->BaseWrite   = BaseFile_Write;
+    pStream->BaseGetPos  = BaseFile_GetPos;
+    pStream->BaseGetSize = BaseFile_GetSize;
+    pStream->BaseSetSize = BaseFile_SetSize;
+    pStream->BaseGetTime = BaseFile_GetTime;
+    pStream->BaseClose   = BaseFile_Close;
+
+    // Reset the file position
+    pStream->Base.File.FilePos = 0;
+    pStream->dwFlags = dwStreamFlags;
+    return true;
 }
 
 //-----------------------------------------------------------------------------
 // Local functions - base memory-mapped file support
 
-static bool BaseMap_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD dwStreamFlags)
+static bool BaseMap_Read(
+        TFileStream * pStream,                  // Pointer to an open stream
+        ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
+        void * pvBuffer,                        // Pointer to data to be read
+        DWORD dwBytesToRead)                    // Number of bytes to read from the file
+{
+    ULONGLONG ByteOffset = (pByteOffset != NULL) ? *pByteOffset : pStream->Base.Map.FilePos;
+
+    // Do we have to read anything at all?
+    if(dwBytesToRead != 0)
+    {
+        // Don't allow reading past file size
+        if((ByteOffset + dwBytesToRead) > pStream->Base.Map.FileSize)
+            return false;
+
+        // Copy the required data
+        memcpy(pvBuffer, pStream->Base.Map.pbFile + (size_t)ByteOffset, dwBytesToRead);
+    }
+
+    // Move the current file position
+    pStream->Base.Map.FilePos += dwBytesToRead;
+    return true;
+}
+
+static bool BaseMap_GetPos(
+        TFileStream * pStream,                  // Pointer to an open stream
+        ULONGLONG * pByteOffset)                // Pointer to file byte offset
+{
+    *pByteOffset = pStream->Base.Map.FilePos;
+    return true;
+}
+
+static bool BaseMap_GetSize(
+        TFileStream * pStream,                  // Pointer to an open stream
+        ULONGLONG * pFileSize)                  // Pointer where to store file size
+{
+    *pFileSize = pStream->Base.Map.FileSize;
+    return true;
+}
+
+static bool BaseMap_GetTime(TFileStream * pStream, ULONGLONG * pFileTime)
+{
+    *pFileTime = pStream->Base.Map.FileTime;
+    return true;
+}
+
+static void BaseMap_Close(TFileStream * pStream)
+{
+#ifdef PLATFORM_WINDOWS
+    if(pStream->Base.Map.pbFile != NULL)
+        UnmapViewOfFile(pStream->Base.Map.pbFile);
+#endif
+
+#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
+    if(pStream->Base.Map.pbFile != NULL)
+        munmap(pStream->Base.Map.pbFile, (size_t )pStream->Base.Map.FileSize);
+#endif
+
+    pStream->Base.Map.pbFile = NULL;
+}
+
+static bool BaseMap_Open(
+        TFileStream * pStream,
+        const TCHAR * szFileName,
+        DWORD dwStreamFlags)
 {
 #ifdef PLATFORM_WINDOWS
 
@@ -442,17 +612,17 @@ static bool BaseMap_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
     HANDLE hMap;
     bool bResult = false;
 
-    // Keep compiler happy
-    dwStreamFlags = dwStreamFlags;
-
     // Open the file for read access
-    hFile = CreateFile(szFileName, FILE_READ_DATA, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
-    if(hFile != INVALID_HANDLE_VALUE)
+    hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+    if(hFile != NULL)
     {
         // Retrieve file size. Don't allow mapping file of a zero size.
         FileSize.LowPart = GetFileSize(hFile, &FileSize.HighPart);
         if(FileSize.QuadPart != 0)
         {
+            // Retrieve file time
+            GetFileTime(hFile, NULL, NULL, (LPFILETIME)&pStream->Base.Map.FileTime);
+
             // Now create mapping object
             hMap = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
             if(hMap != NULL)
@@ -463,10 +633,6 @@ static bool BaseMap_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
                 pStream->Base.Map.pbFile = (LPBYTE)MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0);
                 if(pStream->Base.Map.pbFile != NULL)
                 {
-                    // Retrieve file time
-                    GetFileTime(hFile, NULL, NULL, (LPFILETIME)&pStream->Base.Map.FileTime);
-
-                    // Retrieve file size and position
                     pStream->Base.Map.FileSize = FileSize.QuadPart;
                     pStream->Base.Map.FilePos = 0;
                     bResult = true;
@@ -488,7 +654,7 @@ static bool BaseMap_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
 #endif
 
 #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-    struct stat64 fileinfo;
+    struct stat fileinfo;
     intptr_t handle;
     bool bResult = false;
 
@@ -497,7 +663,7 @@ static bool BaseMap_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
     if(handle != -1)
     {
         // Get the file size
-        if(fstat64(handle, &fileinfo) != -1)
+        if(fstat(handle, &fileinfo) != -1)
         {
             pStream->Base.Map.pbFile = (LPBYTE)mmap(NULL, (size_t)fileinfo.st_size, PROT_READ, MAP_PRIVATE, handle, 0);
             if(pStream->Base.Map.pbFile != NULL)
@@ -522,60 +688,14 @@ static bool BaseMap_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
     }
 #endif
 
-    return true;
-}
-
-static bool BaseMap_Read(
-    TFileStream * pStream,                  // Pointer to an open stream
-    ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
-    void * pvBuffer,                        // Pointer to data to be read
-    DWORD dwBytesToRead)                    // Number of bytes to read from the file
-{
-    ULONGLONG ByteOffset = (pByteOffset != NULL) ? *pByteOffset : pStream->Base.Map.FilePos;
-
-    // Do we have to read anything at all?
-    if(dwBytesToRead != 0)
-    {
-        // Don't allow reading past file size
-        if((ByteOffset + dwBytesToRead) > pStream->Base.Map.FileSize)
-            return false;
-
-        // Copy the required data
-        memcpy(pvBuffer, pStream->Base.Map.pbFile + (size_t)ByteOffset, dwBytesToRead);
-    }
-
-    // Move the current file position
-    pStream->Base.Map.FilePos += dwBytesToRead;
-    return true;
-}
-
-static void BaseMap_Close(TFileStream * pStream)
-{
-#ifdef PLATFORM_WINDOWS
-    if(pStream->Base.Map.pbFile != NULL)
-        UnmapViewOfFile(pStream->Base.Map.pbFile);
-#endif
-
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-    if(pStream->Base.Map.pbFile != NULL)
-        munmap(pStream->Base.Map.pbFile, (size_t )pStream->Base.Map.FileSize);
-#endif
-
-    pStream->Base.Map.pbFile = NULL;
-}
-
-// Initializes base functions for the mapped file
-static void BaseMap_Init(TFileStream * pStream)
-{
-    // Supply the file stream functions
-    pStream->BaseOpen    = BaseMap_Open;
+    // Fill-in entry points
     pStream->BaseRead    = BaseMap_Read;
-    pStream->BaseGetSize = BaseFile_GetSize;    // Reuse BaseFile function
-    pStream->BaseGetPos  = BaseFile_GetPos;     // Reuse BaseFile function
+    pStream->BaseGetPos  = BaseMap_GetPos;
+    pStream->BaseGetSize = BaseMap_GetSize;
+    pStream->BaseGetTime = BaseMap_GetTime;
     pStream->BaseClose   = BaseMap_Close;
-
-    // Mapped files are read-only
-    pStream->dwFlags |= STREAM_FLAG_READ_ONLY;
+    pStream->dwFlags = dwStreamFlags;
+    return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -597,14 +717,132 @@ static const TCHAR * BaseHttp_ExtractServerName(const TCHAR * szFileName, TCHAR
     else
     {
         while(szFileName[0] != 0 && szFileName[0] != _T('/'))
-            szFileName++;
+            *szFileName++;
     }
 
     // Return the remainder
     return szFileName;
 }
 
-static bool BaseHttp_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD dwStreamFlags)
+static bool BaseHttp_Read(
+        TFileStream * pStream,                  // Pointer to an open stream
+        ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
+        void * pvBuffer,                        // Pointer to data to be read
+        DWORD dwBytesToRead)                    // Number of bytes to read from the file
+{
+#ifdef PLATFORM_WINDOWS
+    ULONGLONG ByteOffset = (pByteOffset != NULL) ? *pByteOffset : pStream->Base.Http.FilePos;
+    DWORD dwTotalBytesRead = 0;
+
+    // Do we have to read anything at all?
+    if(dwBytesToRead != 0)
+    {
+        HINTERNET hRequest;
+        LPCTSTR szFileName;
+        LPBYTE pbBuffer = (LPBYTE)pvBuffer;
+        TCHAR szRangeRequest[0x80];
+        DWORD dwStartOffset = (DWORD)ByteOffset;
+        DWORD dwEndOffset = dwStartOffset + dwBytesToRead;
+        BYTE Buffer[0x200];
+
+        // Open HTTP request to the file
+        szFileName = BaseHttp_ExtractServerName(pStream->szFileName, NULL);
+        hRequest = HttpOpenRequest(pStream->Base.Http.hConnect, _T("GET"), szFileName, NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0);
+        if(hRequest != NULL)
+        {
+            // Add range request to the HTTP headers
+            // http://www.clevercomponents.com/articles/article015/resuming.asp
+            _stprintf(szRangeRequest, _T("Range: bytes=%d-%d"), dwStartOffset, dwEndOffset);
+            HttpAddRequestHeaders(hRequest, szRangeRequest, 0xFFFFFFFF, HTTP_ADDREQ_FLAG_ADD_IF_NEW);
+
+            // Send the request to the server
+            if(HttpSendRequest(hRequest, NULL, 0, NULL, 0))
+            {
+                while(dwTotalBytesRead < dwBytesToRead)
+                {
+                    DWORD dwBlockBytesToRead = dwBytesToRead - dwTotalBytesRead;
+                    DWORD dwBlockBytesRead = 0;
+
+                    // Read the block from the file
+                    if(dwBlockBytesToRead > sizeof(Buffer))
+                        dwBlockBytesToRead = sizeof(Buffer);
+                    InternetReadFile(hRequest, pbBuffer, dwBlockBytesToRead, &dwBlockBytesRead);
+
+                    // Check for end
+                    if(dwBlockBytesRead == 0)
+                        break;
+
+                    // Move buffers
+                    dwTotalBytesRead += dwBlockBytesRead;
+                    pbBuffer += dwBlockBytesRead;
+                }
+            }
+            InternetCloseHandle(hRequest);
+        }
+    }
+
+    // Increment the current file position by number of bytes read
+    pStream->Base.Http.FilePos = ByteOffset + dwTotalBytesRead;
+
+    // If the number of bytes read doesn't match the required amount, return false
+    if(dwTotalBytesRead != dwBytesToRead)
+        SetLastError(ERROR_HANDLE_EOF);
+    return (dwTotalBytesRead == dwBytesToRead);
+
+#else
+
+    // Not supported
+    pStream = pStream;
+    pByteOffset = pByteOffset;
+    pvBuffer = pvBuffer;
+    dwBytesToRead = dwBytesToRead;
+    SetLastError(ERROR_NOT_SUPPORTED);
+    return false;
+
+#endif
+}
+
+static bool BaseHttp_GetPos(
+        TFileStream * pStream,                  // Pointer to an open stream
+        ULONGLONG * pByteOffset)                // Pointer to file byte offset
+{
+    *pByteOffset = pStream->Base.Http.FilePos;
+    return true;
+}
+
+static bool BaseHttp_GetSize(
+        TFileStream * pStream,                  // Pointer to an open stream
+        ULONGLONG * pFileSize)                  // Pointer where to store file size
+{
+    *pFileSize = pStream->Base.Http.FileSize;
+    return true;
+}
+
+static bool BaseHttp_GetTime(TFileStream * pStream, ULONGLONG * pFileTime)
+{
+    *pFileTime = pStream->Base.Http.FileTime;
+    return true;
+}
+
+static void BaseHttp_Close(TFileStream * pStream)
+{
+#ifdef PLATFORM_WINDOWS
+    if(pStream->Base.Http.hConnect != NULL)
+        InternetCloseHandle(pStream->Base.Http.hConnect);
+    pStream->Base.Http.hConnect = NULL;
+
+    if(pStream->Base.Http.hInternet != NULL)
+        InternetCloseHandle(pStream->Base.Http.hInternet);
+    pStream->Base.Http.hInternet = NULL;
+#else
+    pStream = pStream;
+#endif
+}
+
+static bool BaseHttp_Open(
+        TFileStream * pStream,
+        const TCHAR * szFileName,
+        DWORD dwStreamFlags)
 {
 #ifdef PLATFORM_WINDOWS
 
@@ -613,9 +851,6 @@ static bool BaseHttp_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
     bool bFileAvailable = false;
     int nError = ERROR_SUCCESS;
 
-    // Keep compiler happy
-    dwStreamFlags = dwStreamFlags;
-
     // Don't connect to the internet
     if(!InternetGetConnectedState(&dwTemp, 0))
         nError = GetLastError();
@@ -691,736 +926,186 @@ static bool BaseHttp_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
     // report error
     if(bFileAvailable == false)
     {
-        pStream->BaseClose(pStream);
+        BaseHttp_Close(pStream);
         return false;
     }
 
+    // Fill-in entry points
+    pStream->BaseRead    = BaseHttp_Read;
+    pStream->BaseGetPos  = BaseHttp_GetPos;
+    pStream->BaseGetSize = BaseHttp_GetSize;
+    pStream->BaseGetTime = BaseHttp_GetTime;
+    pStream->BaseClose   = BaseHttp_Close;
+    pStream->dwFlags = dwStreamFlags;
     return true;
 
 #else
 
     // Not supported
-    SetLastError(ERROR_NOT_SUPPORTED);
     pStream = pStream;
-    return false;
-
-#endif
-}
-
-static bool BaseHttp_Read(
-    TFileStream * pStream,                  // Pointer to an open stream
-    ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
-    void * pvBuffer,                        // Pointer to data to be read
-    DWORD dwBytesToRead)                    // Number of bytes to read from the file
-{
-#ifdef PLATFORM_WINDOWS
-    ULONGLONG ByteOffset = (pByteOffset != NULL) ? *pByteOffset : pStream->Base.Http.FilePos;
-    DWORD dwTotalBytesRead = 0;
-
-    // Do we have to read anything at all?
-    if(dwBytesToRead != 0)
-    {
-        HINTERNET hRequest;
-        LPCTSTR szFileName;
-        LPBYTE pbBuffer = (LPBYTE)pvBuffer;
-        TCHAR szRangeRequest[0x80];
-        DWORD dwStartOffset = (DWORD)ByteOffset;
-        DWORD dwEndOffset = dwStartOffset + dwBytesToRead;
-
-        // Open HTTP request to the file
-        szFileName = BaseHttp_ExtractServerName(pStream->szFileName, NULL);
-        hRequest = HttpOpenRequest(pStream->Base.Http.hConnect, _T("GET"), szFileName, NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0);
-        if(hRequest != NULL)
-        {
-            // Add range request to the HTTP headers
-            // http://www.clevercomponents.com/articles/article015/resuming.asp
-            _stprintf(szRangeRequest, _T("Range: bytes=%u-%u"), (unsigned int)dwStartOffset, (unsigned int)dwEndOffset);
-            HttpAddRequestHeaders(hRequest, szRangeRequest, 0xFFFFFFFF, HTTP_ADDREQ_FLAG_ADD_IF_NEW); 
-
-            // Send the request to the server
-            if(HttpSendRequest(hRequest, NULL, 0, NULL, 0))
-            {
-                while(dwTotalBytesRead < dwBytesToRead)
-                {
-                    DWORD dwBlockBytesToRead = dwBytesToRead - dwTotalBytesRead;
-                    DWORD dwBlockBytesRead = 0;
-
-                    // Read the block from the file
-                    if(dwBlockBytesToRead > 0x200)
-                        dwBlockBytesToRead = 0x200;
-                    InternetReadFile(hRequest, pbBuffer, dwBlockBytesToRead, &dwBlockBytesRead);
-
-                    // Check for end
-                    if(dwBlockBytesRead == 0)
-                        break;
-
-                    // Move buffers
-                    dwTotalBytesRead += dwBlockBytesRead;
-                    pbBuffer += dwBlockBytesRead;
-                }
-            }
-            InternetCloseHandle(hRequest);
-        }
-    }
-
-    // Increment the current file position by number of bytes read
-    pStream->Base.Http.FilePos = ByteOffset + dwTotalBytesRead;
-
-    // If the number of bytes read doesn't match the required amount, return false
-    if(dwTotalBytesRead != dwBytesToRead)
-        SetLastError(ERROR_HANDLE_EOF);
-    return (dwTotalBytesRead == dwBytesToRead);
-
-#else
-
-    // Not supported
-    pStream = pStream;
-    pByteOffset = pByteOffset;
-    pvBuffer = pvBuffer;
-    dwBytesToRead = dwBytesToRead;
+    szFileName = szFileName;
     SetLastError(ERROR_NOT_SUPPORTED);
     return false;
 
 #endif
 }
 
-static void BaseHttp_Close(TFileStream * pStream)
-{
-#ifdef PLATFORM_WINDOWS
-    if(pStream->Base.Http.hConnect != NULL)
-        InternetCloseHandle(pStream->Base.Http.hConnect);
-    pStream->Base.Http.hConnect = NULL;
-
-    if(pStream->Base.Http.hInternet != NULL)
-        InternetCloseHandle(pStream->Base.Http.hInternet);
-    pStream->Base.Http.hInternet = NULL;
-#else
-    pStream = pStream;
-#endif
-}
-
-// Initializes base functions for the mapped file
-static void BaseHttp_Init(TFileStream * pStream)
-{
-    // Supply the stream functions
-    pStream->BaseOpen    = BaseHttp_Open;
-    pStream->BaseRead    = BaseHttp_Read;
-    pStream->BaseGetSize = BaseFile_GetSize;    // Reuse BaseFile function
-    pStream->BaseGetPos  = BaseFile_GetPos;     // Reuse BaseFile function
-    pStream->BaseClose   = BaseHttp_Close;
-
-    // HTTP files are read-only
-    pStream->dwFlags |= STREAM_FLAG_READ_ONLY;
-}
-
 //-----------------------------------------------------------------------------
-// Local functions - base block-based support
+// Local functions - linear stream support
 
-// Generic function that loads blocks from the file
-// The function groups the block with the same availability,
-// so the called BlockRead can finish the request in a single system call
-static bool BlockStream_Read(
-    TBlockStream * pStream,                 // Pointer to an open stream
-    ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
-    void * pvBuffer,                        // Pointer to data to be read
-    DWORD dwBytesToRead)                    // Number of bytes to read from the file
+static bool LinearStream_Read(
+        TLinearStream * pStream,                // Pointer to an open stream
+        ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
+        void * pvBuffer,                        // Pointer to data to be read
+        DWORD dwBytesToRead)                    // Number of bytes to read from the file
 {
-    ULONGLONG BlockOffset0;
-    ULONGLONG BlockOffset;
     ULONGLONG ByteOffset;
     ULONGLONG EndOffset;
-    LPBYTE TransferBuffer;
-    LPBYTE BlockBuffer;
-    DWORD BlockBufferOffset;                // Offset of the desired data in the block buffer
-    DWORD BytesNeeded;                      // Number of bytes that really need to be read
-    DWORD BlockSize = pStream->BlockSize;
-    DWORD BlockCount;
-    bool bPrevBlockAvailable;
-    bool bCallbackCalled = false;
-    bool bBlockAvailable;
-    bool bResult = true;
+    LPBYTE pbBitmap;
+    DWORD BlockIndex;
+    DWORD ByteIndex;
+    DWORD BitMask;
 
-    // The base block read function must be present
-    assert(pStream->BlockRead != NULL);
+    // At this point, we must have a bitmap set
+    assert(pStream->pBitmap != NULL);
 
-    // NOP reading of zero bytes
-    if(dwBytesToRead == 0)
-        return true;
-
-    // Get the current position in the stream
-    ByteOffset = (pByteOffset != NULL) ? pByteOffset[0] : pStream->StreamPos;
-    EndOffset = ByteOffset + dwBytesToRead;
-    if(EndOffset > pStream->StreamSize)
+    // If we have data map, we must check if the data block is present in the MPQ
+    if(dwBytesToRead != 0)
     {
-        SetLastError(ERROR_HANDLE_EOF);
-        return false;
-    }
+        DWORD BlockSize = pStream->pBitmap->BlockSize;
 
-    // Calculate the block parameters
-    BlockOffset0 = BlockOffset = ByteOffset & ~((ULONGLONG)BlockSize - 1);
-    BlockCount  = (DWORD)(((EndOffset - BlockOffset) + (BlockSize - 1)) / BlockSize);
-    BytesNeeded = (DWORD)(EndOffset - BlockOffset);
+        // Get the offset where we read it from
+        if(pByteOffset == NULL)
+            pStream->BaseGetPos(pStream, &ByteOffset);
+        else
+            ByteOffset = *pByteOffset;
+        EndOffset = ByteOffset + dwBytesToRead;
 
-    // Remember where we have our data
-    assert((BlockSize & (BlockSize - 1)) == 0);
-    BlockBufferOffset = (DWORD)(ByteOffset & (BlockSize - 1));
-
-    // Allocate buffer for reading blocks
-    TransferBuffer = BlockBuffer = STORM_ALLOC(BYTE, (BlockCount * BlockSize));
-    if(TransferBuffer == NULL)
-    {
-        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-        return false;
-    }
-
-    // If all blocks are available, just read all blocks at once
-    if(pStream->IsComplete == 0)
-    {
-        // Now parse the blocks and send the block read request
-        // to all blocks with the same availability
-        assert(pStream->BlockCheck != NULL);
-        bPrevBlockAvailable = pStream->BlockCheck(pStream, BlockOffset);
-
-        // Loop as long as we have something to read
-        while(BlockOffset < EndOffset)
+        // If the start of the area is within the region
+        // protected by data map, check each block
+        if(ByteOffset < pStream->pBitmap->EndOffset)
         {
-            // Determine availability of the next block
-            bBlockAvailable = pStream->BlockCheck(pStream, BlockOffset);
+            // Cut the end of the stream protected by the data map
+            EndOffset = STORMLIB_MIN(EndOffset, pStream->pBitmap->EndOffset);
 
-            // If the availability has changed, read all blocks up to this one
-            if(bBlockAvailable != bPrevBlockAvailable)
+            // Calculate the initial block index
+            BlockIndex = (DWORD)(ByteOffset / BlockSize);
+            pbBitmap = (LPBYTE)(pStream->pBitmap + 1);
+
+            // Parse each block
+            while(ByteOffset < EndOffset)
             {
-                // Call the file stream callback, if the block is not available
-                if(pStream->pMaster && pStream->pfnCallback && bPrevBlockAvailable == false)
+                // Prepare byte index and bit mask
+                ByteIndex = BlockIndex / 8;
+                BitMask = 1 << (BlockIndex & 0x07);
+
+                // If that bit is not set, it means that the block is not present
+                if((pbBitmap[ByteIndex] & BitMask) == 0)
                 {
-                    pStream->pfnCallback(pStream->UserData, BlockOffset0, (DWORD)(BlockOffset - BlockOffset0));
-                    bCallbackCalled = true;
+                    SetLastError(ERROR_FILE_CORRUPT);
+                    return false;
                 }
 
-                // Load the continuous blocks with the same availability
-                assert(BlockOffset > BlockOffset0);
-                bResult = pStream->BlockRead(pStream, BlockOffset0, BlockOffset, BlockBuffer, BytesNeeded, bPrevBlockAvailable);
-                if(!bResult)
-                    break;
-
-                // Move the block offset
-                BlockBuffer += (DWORD)(BlockOffset - BlockOffset0);
-                BytesNeeded -= (DWORD)(BlockOffset - BlockOffset0);
-                bPrevBlockAvailable = bBlockAvailable;
-                BlockOffset0 = BlockOffset;
+                // Move to tne next block
+                ByteOffset += BlockSize;
+                BlockIndex++;
             }
-
-            // Move to the block offset in the stream
-            BlockOffset += BlockSize;
         }
+    }
 
-        // If there is a block(s) remaining to be read, do it
-        if(BlockOffset > BlockOffset0)
+    // Now if all tests passed, we can call the base read function
+    return pStream->BaseRead(pStream, pByteOffset, pvBuffer, dwBytesToRead);
+}
+
+static bool LinearStream_Switch(TLinearStream * pStream, TLinearStream * pNewStream)
+{
+    // Sanity checks
+    assert((pNewStream->dwFlags & STREAM_PROVIDER_MASK) == STREAM_PROVIDER_LINEAR);
+    assert((pNewStream->dwFlags & BASE_PROVIDER_MASK) == BASE_PROVIDER_FILE);
+    assert((pStream->dwFlags & STREAM_PROVIDER_MASK) == STREAM_PROVIDER_LINEAR);
+    assert((pStream->dwFlags & BASE_PROVIDER_MASK) == BASE_PROVIDER_FILE);
+
+    // Close the new stream
+    pNewStream->BaseClose(pNewStream);
+
+    // Close the source stream
+    pStream->BaseClose(pStream);
+
+    // Rename the new data source file to the existing file
+    if(!BaseFile_Switch(pStream, pNewStream))
+        return false;
+
+    // Now we have to open the "pStream" again
+    if(!BaseFile_Open(pStream, pStream->szFileName, pNewStream->dwFlags))
+        return false;
+
+    // We need to cleanup the new data stream
+    FileStream_Close(pNewStream);
+    return true;
+}
+
+static bool LinearStream_GetBitmap(
+        TLinearStream * pStream,
+        TFileBitmap * pBitmap,
+        DWORD Length,
+        LPDWORD LengthNeeded)
+{
+    DWORD TotalLength;
+    bool bResult = false;
+
+    // Assumed that we have bitmap now
+    assert(pStream->pBitmap != NULL);
+
+    // Give the bitmap length
+    TotalLength = sizeof(TFileBitmap) + pStream->pBitmap->BitmapSize;
+    if(LengthNeeded != NULL)
+        *LengthNeeded = TotalLength;
+
+    // Do we have enough space to fill at least the bitmap structure?
+    if(Length >= sizeof(TFileBitmap))
+    {
+        // Enough space for complete bitmap?
+        if(Length >= TotalLength)
         {
-            // Call the file stream callback, if the block is not available
-            if(pStream->pMaster && pStream->pfnCallback && bPrevBlockAvailable == false)
-            {
-                pStream->pfnCallback(pStream->UserData, BlockOffset0, (DWORD)(BlockOffset - BlockOffset0));
-                bCallbackCalled = true;
-            }
-
-            // Read the complete blocks from the file
-            if(BlockOffset > pStream->StreamSize)
-                BlockOffset = pStream->StreamSize;
-            bResult = pStream->BlockRead(pStream, BlockOffset0, BlockOffset, BlockBuffer, BytesNeeded, bPrevBlockAvailable);
+            memcpy(pBitmap, pStream->pBitmap, TotalLength);
+            bResult = true;
+        }
+        else
+        {
+            memcpy(pBitmap, pStream->pBitmap, sizeof(TFileBitmap));
+            bResult = true;
         }
     }
-    else
-    {
-        // Read the complete blocks from the file
-        if(EndOffset > pStream->StreamSize)
-            EndOffset = pStream->StreamSize;
-        bResult = pStream->BlockRead(pStream, BlockOffset, EndOffset, BlockBuffer, BytesNeeded, true);
-    }
 
-    // Now copy the data to the user buffer
-    if(bResult)
-    {
-        memcpy(pvBuffer, TransferBuffer + BlockBufferOffset, dwBytesToRead);
-        pStream->StreamPos = ByteOffset + dwBytesToRead;
-    }
-    else
-    {
-        // If the block read failed, set the last error
-        SetLastError(ERROR_FILE_INCOMPLETE);
-    }
-
-    // Call the callback to indicate we are done
-    if(bCallbackCalled)
-        pStream->pfnCallback(pStream->UserData, 0, 0);
-
-    // Free the block buffer and return
-    STORM_FREE(TransferBuffer);
     return bResult;
 }
 
-static bool BlockStream_GetSize(TFileStream * pStream, ULONGLONG * pFileSize)
-{
-    *pFileSize = pStream->StreamSize;
-    return true;
-}
-
-static bool BlockStream_GetPos(TFileStream * pStream, ULONGLONG * pByteOffset)
-{
-    *pByteOffset = pStream->StreamPos;
-    return true;
-}
-
-static void BlockStream_Close(TBlockStream * pStream)
+static void LinearStream_Close(TLinearStream * pStream)
 {
     // Free the data map, if any
-    if(pStream->FileBitmap != NULL)
-        STORM_FREE(pStream->FileBitmap);
-    pStream->FileBitmap = NULL;
+    if(pStream->pBitmap != NULL)
+        STORM_FREE(pStream->pBitmap);
+    pStream->pBitmap = NULL;
 
     // Call the base class for closing the stream
-    pStream->BaseClose(pStream);
+    return pStream->BaseClose(pStream);
 }
 
-//-----------------------------------------------------------------------------
-// File stream allocation function
-
-static STREAM_INIT StreamBaseInit[4] =
+static bool LinearStream_Open(TLinearStream * pStream)
 {
-    BaseFile_Init,
-    BaseMap_Init, 
-    BaseHttp_Init,
-    BaseNone_Init
-};
-
-// This function allocates an empty structure for the file stream
-// The stream structure is created as flat block, variable length
-// The file name is placed after the end of the stream structure data
-static TFileStream * AllocateFileStream(
-    const TCHAR * szFileName,
-    size_t StreamSize,
-    DWORD dwStreamFlags)
-{
-    TFileStream * pMaster = NULL;
-    TFileStream * pStream;
-    const TCHAR * szNextFile = szFileName;
-    size_t FileNameSize;
-
-    // Sanity check
-    assert(StreamSize != 0);
-
-    // The caller can specify chain of files in the following form:
-    // C:\archive.MPQ*http://www.server.com/MPQs/archive-server.MPQ
-    // In that case, we use the part after "*" as master file name
-    while(szNextFile[0] != 0 && szNextFile[0] != _T('*'))
-        szNextFile++;
-    FileNameSize = (size_t)((szNextFile - szFileName) * sizeof(TCHAR));
-
-    // If we have a next file, we need to open it as master stream
-    // Note that we don't care if the master stream exists or not,
-    // If it doesn't, later attempts to read missing file block will fail
-    if(szNextFile[0] == _T('*'))
-    {
-        // Don't allow another master file in the string
-        if(_tcschr(szNextFile + 1, _T('*')) != NULL)
-        {
-            SetLastError(ERROR_INVALID_PARAMETER);
-            return NULL;
-        }
-        
-        // Open the master file
-        pMaster = FileStream_OpenFile(szNextFile + 1, STREAM_FLAG_READ_ONLY);
-    }
-
-    // Allocate the stream structure for the given stream type
-    pStream = (TFileStream *)STORM_ALLOC(BYTE, StreamSize + FileNameSize + sizeof(TCHAR));
-    if(pStream != NULL)
-    {
-        // Zero the entire structure
-        memset(pStream, 0, StreamSize);
-        pStream->pMaster = pMaster;
-        pStream->dwFlags = dwStreamFlags;
-
-        // Initialize the file name
-        pStream->szFileName = (TCHAR *)((BYTE *)pStream + StreamSize);
-        memcpy(pStream->szFileName, szFileName, FileNameSize);
-        pStream->szFileName[FileNameSize / sizeof(TCHAR)] = 0;
-
-        // Initialize the stream functions
-        StreamBaseInit[dwStreamFlags & 0x03](pStream);
-    }
-
-    return pStream;
-}
-
-//-----------------------------------------------------------------------------
-// Local functions - flat stream support
-
-static DWORD FlatStream_CheckFile(TBlockStream * pStream)
-{
-    LPBYTE FileBitmap = (LPBYTE)pStream->FileBitmap;
-    DWORD WholeByteCount = (pStream->BlockCount / 8);
-    DWORD ExtraBitsCount = (pStream->BlockCount & 7);
-    BYTE ExpectedValue;
-
-    // Verify the whole bytes - their value must be 0xFF
-    for(DWORD i = 0; i < WholeByteCount; i++)
-    {
-        if(FileBitmap[i] != 0xFF)
-            return 0;
-    }
-
-    // If there are extra bits, calculate the mask
-    if(ExtraBitsCount != 0)
-    {
-        ExpectedValue = (BYTE)((1 << ExtraBitsCount) - 1);
-        if(FileBitmap[WholeByteCount] != ExpectedValue)
-            return 0;
-    }
-
-    // Yes, the file is complete
-    return 1;
-}
-
-static bool FlatStream_LoadBitmap(TBlockStream * pStream)
-{
-    FILE_BITMAP_FOOTER Footer;
-    ULONGLONG ByteOffset; 
-    LPBYTE FileBitmap;
-    DWORD BlockCount;
-    DWORD BitmapSize;
-
-    // Do not load the bitmap if we should not have to
-    if(!(pStream->dwFlags & STREAM_FLAG_USE_BITMAP))
-        return false;
-
-    // Only if the size is greater than size of bitmap footer
-    if(pStream->Base.File.FileSize > sizeof(FILE_BITMAP_FOOTER))
-    {
-        // Load the bitmap footer
-        ByteOffset = pStream->Base.File.FileSize - sizeof(FILE_BITMAP_FOOTER);
-        if(pStream->BaseRead(pStream, &ByteOffset, &Footer, sizeof(FILE_BITMAP_FOOTER)))
-        {
-            // Make sure that the array is properly BSWAP-ed
-            BSWAP_ARRAY32_UNSIGNED((LPDWORD)(&Footer), sizeof(FILE_BITMAP_FOOTER));
-
-            // Verify if there is actually a footer
-            if(Footer.Signature == ID_FILE_BITMAP_FOOTER && Footer.Version == 0x03)
-            {
-                // Get the offset of the bitmap, number of blocks and size of the bitmap
-                ByteOffset = MAKE_OFFSET64(Footer.MapOffsetHi, Footer.MapOffsetLo);
-                BlockCount = (DWORD)(((ByteOffset - 1) / Footer.BlockSize) + 1);
-                BitmapSize = ((BlockCount + 7) / 8);
-
-                // Check if the sizes match
-                if(ByteOffset + BitmapSize + sizeof(FILE_BITMAP_FOOTER) == pStream->Base.File.FileSize)
-                {
-                    // Allocate space for the bitmap
-                    FileBitmap = STORM_ALLOC(BYTE, BitmapSize);
-                    if(FileBitmap != NULL)
-                    {
-                        // Load the bitmap bits
-                        if(!pStream->BaseRead(pStream, &ByteOffset, FileBitmap, BitmapSize))
-                        {
-                            STORM_FREE(FileBitmap);
-                            return false;
-                        }
-
-                        // Update the stream size
-                        pStream->BuildNumber = Footer.BuildNumber;
-                        pStream->StreamSize = ByteOffset;
-
-                        // Fill the bitmap information
-                        pStream->FileBitmap = FileBitmap;
-                        pStream->BitmapSize = BitmapSize;
-                        pStream->BlockSize  = Footer.BlockSize;
-                        pStream->BlockCount = BlockCount;
-                        pStream->IsComplete = FlatStream_CheckFile(pStream);
-                        return true;
-                    }
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-static void FlatStream_UpdateBitmap(
-    TBlockStream * pStream,                // Pointer to an open stream
-    ULONGLONG StartOffset,
-    ULONGLONG EndOffset)
-{
-    LPBYTE FileBitmap = (LPBYTE)pStream->FileBitmap;
-    DWORD BlockIndex;
-    DWORD BlockSize = pStream->BlockSize;
-    DWORD ByteIndex;
-    BYTE BitMask;
-
-    // Sanity checks
-    assert((StartOffset & (BlockSize - 1)) == 0);
-    assert(FileBitmap != NULL);
-
-    // Calculate the index of the block
-    BlockIndex = (DWORD)(StartOffset / BlockSize);
-    ByteIndex = (BlockIndex / 0x08);
-    BitMask = (BYTE)(1 << (BlockIndex & 0x07));
-
-    // Set all bits for the specified range
-    while(StartOffset < EndOffset)
-    {
-        // Set the bit
-        FileBitmap[ByteIndex] |= BitMask;
-
-        // Move all
-        StartOffset += BlockSize;
-        ByteIndex += (BitMask >> 0x07);
-        BitMask = (BitMask >> 0x07) | (BitMask << 0x01);
-    }
-
-    // Increment the bitmap update count
-    pStream->IsModified = 1;
-}
-
-static bool FlatStream_BlockCheck(
-    TBlockStream * pStream,                // Pointer to an open stream
-    ULONGLONG BlockOffset)
-{
-    LPBYTE FileBitmap = (LPBYTE)pStream->FileBitmap;
-    DWORD BlockIndex;
-    BYTE BitMask;
-
-    // Sanity checks
-    assert((BlockOffset & (pStream->BlockSize - 1)) == 0);
-    assert(FileBitmap != NULL);
-    
-    // Calculate the index of the block
-    BlockIndex = (DWORD)(BlockOffset / pStream->BlockSize);
-    BitMask = (BYTE)(1 << (BlockIndex & 0x07));
-
-    // Check if the bit is present
-    return (FileBitmap[BlockIndex / 0x08] & BitMask) ? true : false;
-}
-
-static bool FlatStream_BlockRead(
-    TBlockStream * pStream,                // Pointer to an open stream
-    ULONGLONG StartOffset,
-    ULONGLONG EndOffset,
-    LPBYTE BlockBuffer,
-    DWORD BytesNeeded,
-    bool bAvailable)
-{
-    DWORD BytesToRead = (DWORD)(EndOffset - StartOffset);
-
-    // The starting offset must be aligned to size of the block
-    assert(pStream->FileBitmap != NULL);
-    assert((StartOffset & (pStream->BlockSize - 1)) == 0);
-    assert(StartOffset < EndOffset);
-
-    // If the blocks are not available, we need to load them from the master
-    // and then save to the mirror
-    if(bAvailable == false)
-    {
-        // If we have no master, we cannot satisfy read request
-        if(pStream->pMaster == NULL)
-            return false;
-
-        // Load the blocks from the master stream
-        // Note that we always have to read complete blocks
-        // so they get properly stored to the mirror stream
-        if(!FileStream_Read(pStream->pMaster, &StartOffset, BlockBuffer, BytesToRead))
-            return false;
-
-        // Store the loaded blocks to the mirror file.
-        // Note that this operation is not required to succeed
-        if(pStream->BaseWrite(pStream, &StartOffset, BlockBuffer, BytesToRead))
-            FlatStream_UpdateBitmap(pStream, StartOffset, EndOffset);
-
-        return true;
-    }
-    else
-    {
-        if(BytesToRead > BytesNeeded)
-            BytesToRead = BytesNeeded;
-        return pStream->BaseRead(pStream, &StartOffset, BlockBuffer, BytesToRead);
-    }
-}
-
-static void FlatStream_Close(TBlockStream * pStream)
-{
-    FILE_BITMAP_FOOTER Footer;
-
-    if(pStream->FileBitmap && pStream->IsModified)
-    {
-        // Write the file bitmap
-        pStream->BaseWrite(pStream, &pStream->StreamSize, pStream->FileBitmap, pStream->BitmapSize);
-        
-        // Prepare and write the file footer
-        Footer.Signature   = ID_FILE_BITMAP_FOOTER;
-        Footer.Version     = 3;
-        Footer.BuildNumber = pStream->BuildNumber;
-        Footer.MapOffsetLo = (DWORD)(pStream->StreamSize & 0xFFFFFFFF);
-        Footer.MapOffsetHi = (DWORD)(pStream->StreamSize >> 0x20);
-        Footer.BlockSize   = pStream->BlockSize;
-        BSWAP_ARRAY32_UNSIGNED(&Footer, sizeof(FILE_BITMAP_FOOTER));
-        pStream->BaseWrite(pStream, NULL, &Footer, sizeof(FILE_BITMAP_FOOTER));
-    }
-
-    // Close the base class
-    BlockStream_Close(pStream);
-}
-
-static bool FlatStream_CreateMirror(TBlockStream * pStream)
-{
-    ULONGLONG MasterSize = 0;
-    ULONGLONG MirrorSize = 0;
-    LPBYTE FileBitmap = NULL;
-    DWORD dwBitmapSize;
-    DWORD dwBlockCount;
-    bool bNeedCreateMirrorStream = true;
-    bool bNeedResizeMirrorStream = true;
-
-    // Do we have master function and base creation function?
-    if(pStream->pMaster == NULL || pStream->BaseCreate == NULL)
-        return false;
-
-    // Retrieve the master file size, block count and bitmap size
-    FileStream_GetSize(pStream->pMaster, &MasterSize);
-    dwBlockCount = (DWORD)((MasterSize + DEFAULT_BLOCK_SIZE - 1) / DEFAULT_BLOCK_SIZE);
-    dwBitmapSize = (DWORD)((dwBlockCount + 7) / 8);
-
-    // Setup stream size and position
-    pStream->BuildNumber = DEFAULT_BUILD_NUMBER;        // BUGBUG: Really???
-    pStream->StreamSize = MasterSize;
-    pStream->StreamPos = 0;
-
-    // Open the base stream for write access
-    if(pStream->BaseOpen(pStream, pStream->szFileName, 0))
-    {
-        // If the file open succeeded, check if the file size matches required size
-        pStream->BaseGetSize(pStream, &MirrorSize);
-        if(MirrorSize == MasterSize + dwBitmapSize + sizeof(FILE_BITMAP_FOOTER))
-        {
-            // Attempt to load an existing file bitmap
-            if(FlatStream_LoadBitmap(pStream))
-                return true;
-
-            // We need to create new file bitmap
-            bNeedResizeMirrorStream = false;
-        }
-
-        // We need to create mirror stream
-        bNeedCreateMirrorStream = false;
-    }
-
-    // Create a new stream, if needed
-    if(bNeedCreateMirrorStream)
-    {
-        if(!pStream->BaseCreate(pStream))
-            return false;
-    }
-
-    // If we need to, then resize the mirror stream
-    if(bNeedResizeMirrorStream)
-    {
-        if(!pStream->BaseResize(pStream, MasterSize + dwBitmapSize + sizeof(FILE_BITMAP_FOOTER)))
-            return false;
-    }
-
-    // Allocate the bitmap array
-    FileBitmap = STORM_ALLOC(BYTE, dwBitmapSize);
-    if(FileBitmap == NULL)
-        return false;
-
-    // Initialize the bitmap
-    memset(FileBitmap, 0, dwBitmapSize);
-    pStream->FileBitmap = FileBitmap;
-    pStream->BitmapSize = dwBitmapSize;
-    pStream->BlockSize  = DEFAULT_BLOCK_SIZE;
-    pStream->BlockCount = dwBlockCount;
-    pStream->IsComplete = 0;
-    pStream->IsModified = 1;
-
-    // Note: Don't write the stream bitmap right away.
-    // Doing so would cause sparse file resize on NTFS,
-    // which would take long time on larger files.
+    // No extra work here really; just set entry points
+    pStream->StreamRead    = pStream->BaseRead;
+    pStream->StreamWrite   = pStream->BaseWrite;
+    pStream->StreamGetPos  = pStream->BaseGetPos;
+    pStream->StreamGetSize = pStream->BaseGetSize;
+    pStream->StreamSetSize = pStream->BaseSetSize;
+    pStream->StreamGetTime = pStream->BaseGetTime;
+    pStream->StreamGetBmp  = (STREAM_GETBMP)Dummy_GetBitmap;
+    pStream->StreamSwitch  = (STREAM_SWITCH)LinearStream_Switch;
+    pStream->StreamClose   = (STREAM_CLOSE)LinearStream_Close;
     return true;
 }
 
-static TFileStream * FlatStream_Open(const TCHAR * szFileName, DWORD dwStreamFlags)
-{
-    TBlockStream * pStream;    
-    ULONGLONG ByteOffset = 0;
-
-    // Create new empty stream
-    pStream = (TBlockStream *)AllocateFileStream(szFileName, sizeof(TBlockStream), dwStreamFlags);
-    if(pStream == NULL)
-        return NULL;
-
-    // Do we have a master stream?
-    if(pStream->pMaster != NULL)
-    {
-        if(!FlatStream_CreateMirror(pStream))
-        {
-            FileStream_Close(pStream);
-            SetLastError(ERROR_FILE_NOT_FOUND);
-            return NULL;
-        }
-    }
-    else
-    {
-        // Attempt to open the base stream
-        if(!pStream->BaseOpen(pStream, pStream->szFileName, dwStreamFlags))
-        {
-            FileStream_Close(pStream);
-            return NULL;
-        }
-
-        // Load the bitmap, if required to
-        if(dwStreamFlags & STREAM_FLAG_USE_BITMAP)
-            FlatStream_LoadBitmap(pStream);
-    }
-
-    // If we have a stream bitmap, set the reading functions
-    // which check presence of each file block
-    if(pStream->FileBitmap != NULL)
-    {
-        // Set the stream position to zero. Stream size is already set
-        assert(pStream->StreamSize != 0);
-        pStream->StreamPos = 0;
-        pStream->dwFlags |= STREAM_FLAG_READ_ONLY;
-
-        // Supply the stream functions
-        pStream->StreamRead    = (STREAM_READ)BlockStream_Read;
-        pStream->StreamGetSize = BlockStream_GetSize;
-        pStream->StreamGetPos  = BlockStream_GetPos;
-        pStream->StreamClose   = (STREAM_CLOSE)FlatStream_Close;
-
-        // Supply the block functions
-        pStream->BlockCheck    = (BLOCK_CHECK)FlatStream_BlockCheck;
-        pStream->BlockRead     = (BLOCK_READ)FlatStream_BlockRead;
-    }
-    else
-    {
-        // Reset the base position to zero
-        pStream->BaseRead(pStream, &ByteOffset, NULL, 0);
-
-        // Setup stream size and position
-        pStream->StreamSize = pStream->Base.File.FileSize;
-        pStream->StreamPos = 0;
-
-        // Set the base functions
-        pStream->StreamRead    = pStream->BaseRead;
-        pStream->StreamWrite   = pStream->BaseWrite;
-        pStream->StreamResize  = pStream->BaseResize;
-        pStream->StreamGetSize = pStream->BaseGetSize;
-        pStream->StreamGetPos  = pStream->BaseGetPos;
-        pStream->StreamClose   = pStream->BaseClose;
-    }
-
-    return pStream;
-}
-
 //-----------------------------------------------------------------------------
 // Local functions - partial stream support
 
@@ -1441,400 +1126,276 @@ static bool IsPartHeader(PPART_FILE_HEADER pPartHdr)
     return false;
 }
 
-static DWORD PartStream_CheckFile(TBlockStream * pStream)
+static bool PartialStream_Read(
+        TPartialStream * pStream,
+        ULONGLONG * pByteOffset,
+        void * pvBuffer,
+        DWORD dwBytesToRead)
 {
-    PPART_FILE_MAP_ENTRY FileBitmap = (PPART_FILE_MAP_ENTRY)pStream->FileBitmap;
-    DWORD dwBlockCount;
+    ULONGLONG RawByteOffset;
+    LPBYTE pbBuffer = (LPBYTE)pvBuffer;
+    DWORD dwBytesRemaining = dwBytesToRead;
+    DWORD dwPartOffset;
+    DWORD dwPartIndex;
+    DWORD dwBytesRead = 0;
+    DWORD dwBlockSize = pStream->BlockSize;
+    bool bResult = false;
+    int nFailReason = ERROR_HANDLE_EOF;             // Why it failed if not enough bytes was read
 
-    // Get the number of blocks
-    dwBlockCount = (DWORD)((pStream->StreamSize + pStream->BlockSize - 1) / pStream->BlockSize);
+    // If the byte offset is not entered, use the current position
+    if(pByteOffset == NULL)
+        pByteOffset = &pStream->VirtualPos;
 
-    // Check all blocks
-    for(DWORD i = 0; i < dwBlockCount; i++, FileBitmap++)
+    // Check if the file position is not at or beyond end of the file
+    if(*pByteOffset >= pStream->VirtualSize)
     {
-        // Few sanity checks
-        assert(FileBitmap->LargeValueHi == 0);
-        assert(FileBitmap->LargeValueLo == 0);
-        assert(FileBitmap->Flags == 0 || FileBitmap->Flags == 3);
-
-        // Check if this block is present
-        if(FileBitmap->Flags != 3)
-            return 0;
+        SetLastError(ERROR_HANDLE_EOF);
+        return false;
     }
 
-    // Yes, the file is complete
-    return 1;
+    // Get the part index where the read offset is
+    // Note that the part index should now be within the range,
+    // as read requests beyond-EOF are handled by the previous test
+    dwPartIndex = (DWORD)(*pByteOffset / pStream->BlockSize);
+    assert(dwPartIndex < pStream->BlockCount);
+
+    // If the number of bytes remaining goes past
+    // the end of the file, cut them
+    if((*pByteOffset + dwBytesRemaining) > pStream->VirtualSize)
+        dwBytesRemaining = (DWORD)(pStream->VirtualSize - *pByteOffset);
+
+    // Calculate the offset in the current part
+    dwPartOffset = (DWORD)(*pByteOffset) & (pStream->BlockSize - 1);
+
+    // Read all data, one part at a time
+    while(dwBytesRemaining != 0)
+    {
+        PPART_FILE_MAP_ENTRY PartMap = pStream->PartMap + dwPartIndex;
+        DWORD dwBytesInPart;
+
+        // If the part is not present in the file, we fail the read
+        if((PartMap->Flags & 3) == 0)
+        {
+            nFailReason = ERROR_FILE_CORRUPT;
+            bResult = false;
+            break;
+        }
+
+        // If we are in the last part, we have to cut the number of bytes in the last part
+        if(dwPartIndex == pStream->BlockCount - 1)
+            dwBlockSize = (DWORD)pStream->VirtualSize & (pStream->BlockSize - 1);
+
+        // Get the number of bytes reamining in the current part
+        dwBytesInPart = dwBlockSize - dwPartOffset;
+
+        // Compute the raw file offset of the file part
+        RawByteOffset = MAKE_OFFSET64(PartMap->BlockOffsHi, PartMap->BlockOffsLo);
+        if(RawByteOffset == 0)
+        {
+            nFailReason = ERROR_FILE_CORRUPT;
+            bResult = false;
+            break;
+        }
+
+        // If the number of bytes in part is too big, cut it
+        if(dwBytesInPart > dwBytesRemaining)
+            dwBytesInPart = dwBytesRemaining;
+
+        // Append the offset within the part
+        RawByteOffset += dwPartOffset;
+        if(!pStream->BaseRead(pStream, &RawByteOffset, pbBuffer, dwBytesInPart))
+        {
+            nFailReason = ERROR_FILE_CORRUPT;
+            bResult = false;
+            break;
+        }
+
+        // Increment the file position
+        dwBytesRemaining -= dwBytesInPart;
+        dwBytesRead += dwBytesInPart;
+        pbBuffer += dwBytesInPart;
+
+        // Move to the next file part
+        dwPartOffset = 0;
+        dwPartIndex++;
+    }
+
+    // Move the file position by the number of bytes read
+    pStream->VirtualPos = *pByteOffset + dwBytesRead;
+    if(dwBytesRead != dwBytesToRead)
+        SetLastError(nFailReason);
+    return (dwBytesRead == dwBytesToRead);
 }
 
-static bool PartStream_LoadBitmap(TBlockStream * pStream)
+static bool PartialStream_GetPos(
+        TPartialStream * pStream,
+        ULONGLONG & ByteOffset)
 {
-    PPART_FILE_MAP_ENTRY FileBitmap;
-    PART_FILE_HEADER PartHdr;
-    ULONGLONG ByteOffset = 0;
-    ULONGLONG StreamSize = 0;
-    DWORD BlockCount;
-    DWORD BitmapSize;
+    ByteOffset = pStream->VirtualPos;
+    return true;
+}
 
-    // Only if the size is greater than size of the bitmap header
-    if(pStream->Base.File.FileSize > sizeof(PART_FILE_HEADER))
+static bool PartialStream_GetSize(
+        TPartialStream * pStream,               // Pointer to an open stream
+        ULONGLONG & FileSize)                   // Pointer where to store file size
+{
+    FileSize = pStream->VirtualSize;
+    return true;
+}
+
+static bool PartialStream_GetBitmap(
+        TPartialStream * pStream,
+        TFileBitmap * pBitmap,
+        DWORD Length,
+        LPDWORD LengthNeeded)
+{
+    LPBYTE pbBitmap;
+    DWORD TotalLength;
+    DWORD BitmapSize = 0;
+    DWORD ByteOffset;
+    DWORD BitMask;
+    bool bResult = false;
+
+    // Do we have stream bitmap?
+    BitmapSize = ((pStream->BlockCount - 1) / 8) + 1;
+
+    // Give the bitmap length
+    TotalLength = sizeof(TFileBitmap) + BitmapSize;
+    if(LengthNeeded != NULL)
+        *LengthNeeded = TotalLength;
+
+    // Do we have enough to fill at least the header?
+    if(Length >= sizeof(TFileBitmap))
     {
-        // Attempt to read PART file header
-        if(pStream->BaseRead(pStream, &ByteOffset, &PartHdr, sizeof(PART_FILE_HEADER)))
+        // Fill the bitmap header
+        pBitmap->StartOffset = 0;
+        pBitmap->EndOffset  = pStream->VirtualSize;
+        pBitmap->IsComplete = 1;
+        pBitmap->BitmapSize = BitmapSize;
+        pBitmap->BlockSize = pStream->BlockSize;
+        pBitmap->Reserved = 0;
+
+        // Is there at least one incomplete block?
+        for(DWORD i = 0; i < pStream->BlockCount; i++)
         {
-            // We need to swap PART file header on big-endian platforms
-            BSWAP_ARRAY32_UNSIGNED(&PartHdr, sizeof(PART_FILE_HEADER));
-
-            // Verify the PART file header
-            if(IsPartHeader(&PartHdr))
+            if(pStream->PartMap[i].Flags != 3)
             {
-                // Get the number of blocks and size of one block
-                StreamSize = MAKE_OFFSET64(PartHdr.FileSizeHi, PartHdr.FileSizeLo);
-                ByteOffset = sizeof(PART_FILE_HEADER);
-                BlockCount = (DWORD)((StreamSize + PartHdr.BlockSize - 1) / PartHdr.BlockSize);
-                BitmapSize = BlockCount * sizeof(PART_FILE_MAP_ENTRY);
+                pBitmap->IsComplete = 0;
+                break;
+            }
+        }
 
-                // Check if sizes match
-                if((ByteOffset + BitmapSize) < pStream->Base.File.FileSize)
+        bResult = true;
+    }
+
+    // Do we have enough space for supplying the bitmap?
+    if(Length >= TotalLength)
+    {
+        // Fill the file bitmap
+        pbBitmap = (LPBYTE)(pBitmap + 1);
+        for(DWORD i = 0; i < pStream->BlockCount; i++)
+        {
+            // Is the block there?
+            if(pStream->PartMap[i].Flags == 3)
+            {
+                ByteOffset = i / 8;
+                BitMask = 1 << (i & 7);
+                pbBitmap[ByteOffset] |= BitMask;
+            }
+        }
+        bResult = true;
+    }
+
+    return bResult;
+}
+
+static void PartialStream_Close(TPartialStream * pStream)
+{
+    // Free the part map
+    if(pStream->PartMap != NULL)
+        STORM_FREE(pStream->PartMap);
+    pStream->PartMap = NULL;
+
+    // Clear variables
+    pStream->VirtualSize = 0;
+    pStream->VirtualPos = 0;
+
+    // Close the base stream
+    assert(pStream->BaseClose != NULL);
+    pStream->BaseClose(pStream);
+}
+
+static bool PartialStream_Open(TPartialStream * pStream)
+{
+    PART_FILE_HEADER PartHdr;
+    ULONGLONG VirtualSize;                  // Size of the file stored in part file
+    ULONGLONG ByteOffset = {0};
+    DWORD BlockCount;
+
+    // Sanity check
+    assert(pStream->BaseRead != NULL);
+
+    // Attempt to read PART file header
+    if(pStream->BaseRead(pStream, &ByteOffset, &PartHdr, sizeof(PART_FILE_HEADER)))
+    {
+        // We need to swap PART file header on big-endian platforms
+        BSWAP_PART_HEADER(&PartHdr);
+
+        // Verify the PART file header
+        if(IsPartHeader(&PartHdr))
+        {
+            // Calculate the number of parts in the file
+            VirtualSize = MAKE_OFFSET64(PartHdr.FileSizeHi, PartHdr.FileSizeLo);
+            assert(VirtualSize != 0);
+            BlockCount = (DWORD)((VirtualSize + PartHdr.BlockSize - 1) / PartHdr.BlockSize);
+
+            // Allocate the map entry array
+            pStream->PartMap = STORM_ALLOC(PART_FILE_MAP_ENTRY, BlockCount);
+            if(pStream->PartMap != NULL)
+            {
+                // Load the block map
+                if(pStream->BaseRead(pStream, NULL, pStream->PartMap, BlockCount * sizeof(PART_FILE_MAP_ENTRY)))
                 {
-                    // Allocate space for the array of PART_FILE_MAP_ENTRY
-                    FileBitmap = STORM_ALLOC(PART_FILE_MAP_ENTRY, BlockCount);
-                    if(FileBitmap != NULL)
-                    {
-                        // Load the block map
-                        if(!pStream->BaseRead(pStream, &ByteOffset, FileBitmap, BitmapSize))
-                        {
-                            STORM_FREE(FileBitmap);
-                            return false;
-                        }
+                    // Swap the array of file map entries
+                    BSWAP_ARRAY32_UNSIGNED(pStream->PartMap, BlockCount * sizeof(PART_FILE_MAP_ENTRY));
 
-                        // Make sure that the byte order is correct
-                        BSWAP_ARRAY32_UNSIGNED(FileBitmap, BitmapSize);
+                    // Fill the members of PART file stream
+                    pStream->VirtualSize   = ((ULONGLONG)PartHdr.FileSizeHi) + PartHdr.FileSizeLo;
+                    pStream->VirtualPos    = 0;
+                    pStream->BlockCount    = BlockCount;
+                    pStream->BlockSize     = PartHdr.BlockSize;
 
-                        // Update the stream size
-                        pStream->BuildNumber = StringToInt(PartHdr.GameBuildNumber);
-                        pStream->StreamSize = StreamSize;
-
-                        // Fill the bitmap information
-                        pStream->FileBitmap = FileBitmap;
-                        pStream->BitmapSize = BitmapSize;
-                        pStream->BlockSize  = PartHdr.BlockSize;
-                        pStream->BlockCount = BlockCount;
-                        pStream->IsComplete = PartStream_CheckFile(pStream);
-                        return true;
-                    }
+                    // Set new function pointers
+                    pStream->StreamRead    = (STREAM_READ)PartialStream_Read;
+                    pStream->StreamGetPos  = (STREAM_GETPOS)PartialStream_GetPos;
+                    pStream->StreamGetSize = (STREAM_GETSIZE)PartialStream_GetSize;
+                    pStream->StreamGetTime = pStream->BaseGetTime;
+                    pStream->StreamGetTime = pStream->BaseGetTime;
+                    pStream->StreamGetBmp  = (STREAM_GETBMP)PartialStream_GetBitmap;
+                    pStream->StreamClose   = (STREAM_CLOSE)PartialStream_Close;
+                    return true;
                 }
+
+                // Free the part map
+                STORM_FREE(pStream->PartMap);
+                pStream->PartMap = NULL;
             }
         }
     }
 
+    SetLastError(ERROR_BAD_FORMAT);
     return false;
 }
 
-static void PartStream_UpdateBitmap(
-    TBlockStream * pStream,                // Pointer to an open stream
-    ULONGLONG StartOffset,
-    ULONGLONG EndOffset,
-    ULONGLONG RealOffset)
-{
-    PPART_FILE_MAP_ENTRY FileBitmap;
-    DWORD BlockSize = pStream->BlockSize;
-
-    // Sanity checks
-    assert((StartOffset & (BlockSize - 1)) == 0);
-    assert(pStream->FileBitmap != NULL);
-
-    // Calculate the first entry in the block map
-    FileBitmap = (PPART_FILE_MAP_ENTRY)pStream->FileBitmap + (StartOffset / BlockSize);
-
-    // Set all bits for the specified range
-    while(StartOffset < EndOffset)
-    {
-        // Set the bit
-        FileBitmap->BlockOffsHi = (DWORD)(RealOffset >> 0x20);
-        FileBitmap->BlockOffsLo = (DWORD)(RealOffset & 0xFFFFFFFF);
-        FileBitmap->Flags = 3;
-
-        // Move all
-        StartOffset += BlockSize;
-        RealOffset += BlockSize;
-        FileBitmap++;
-    }
-
-    // Increment the bitmap update count
-    pStream->IsModified = 1;
-}
-
-static bool PartStream_BlockCheck(
-    TBlockStream * pStream,                // Pointer to an open stream
-    ULONGLONG BlockOffset)
-{
-    PPART_FILE_MAP_ENTRY FileBitmap;
-
-    // Sanity checks
-    assert((BlockOffset & (pStream->BlockSize - 1)) == 0);
-    assert(pStream->FileBitmap != NULL);
-    
-    // Calculate the block map entry
-    FileBitmap = (PPART_FILE_MAP_ENTRY)pStream->FileBitmap + (BlockOffset / pStream->BlockSize);
-
-    // Check if the flags are present
-    return (FileBitmap->Flags & 0x03) ? true : false;
-}
-
-static bool PartStream_BlockRead(
-    TBlockStream * pStream,
-    ULONGLONG StartOffset,
-    ULONGLONG EndOffset,
-    LPBYTE BlockBuffer,
-    DWORD BytesNeeded,
-    bool bAvailable)
-{
-    PPART_FILE_MAP_ENTRY FileBitmap;
-    ULONGLONG ByteOffset;
-    DWORD BytesToRead;
-    DWORD BlockIndex = (DWORD)(StartOffset / pStream->BlockSize);
-
-    // The starting offset must be aligned to size of the block
-    assert(pStream->FileBitmap != NULL);
-    assert((StartOffset & (pStream->BlockSize - 1)) == 0);
-    assert(StartOffset < EndOffset);
-
-    // If the blocks are not available, we need to load them from the master
-    // and then save to the mirror
-    if(bAvailable == false)
-    {
-        // If we have no master, we cannot satisfy read request
-        if(pStream->pMaster == NULL)
-            return false;
-
-        // Load the blocks from the master stream
-        // Note that we always have to read complete blocks
-        // so they get properly stored to the mirror stream
-        BytesToRead = (DWORD)(EndOffset - StartOffset);
-        if(!FileStream_Read(pStream->pMaster, &StartOffset, BlockBuffer, BytesToRead))
-            return false;
-
-        // The loaded blocks are going to be stored to the end of the file
-        // Note that this operation is not required to succeed
-        if(pStream->BaseGetSize(pStream, &ByteOffset))
-        {
-            // Store the loaded blocks to the mirror file.
-            if(pStream->BaseWrite(pStream, &ByteOffset, BlockBuffer, BytesToRead))
-            {
-                PartStream_UpdateBitmap(pStream, StartOffset, EndOffset, ByteOffset);
-            }
-        }
-    }
-    else
-    {
-        // Get the file map entry
-        FileBitmap = (PPART_FILE_MAP_ENTRY)pStream->FileBitmap + BlockIndex;
-
-        // Read all blocks
-        while(StartOffset < EndOffset)
-        {
-            // Get the number of bytes to be read
-            BytesToRead = (DWORD)(EndOffset - StartOffset);
-            if(BytesToRead > pStream->BlockSize)
-                BytesToRead = pStream->BlockSize;
-            if(BytesToRead > BytesNeeded)
-                BytesToRead = BytesNeeded;
-
-            // Read the block
-            ByteOffset = MAKE_OFFSET64(FileBitmap->BlockOffsHi, FileBitmap->BlockOffsLo);
-            if(!pStream->BaseRead(pStream, &ByteOffset, BlockBuffer, BytesToRead))
-                return false;
-
-            // Move the pointers
-            StartOffset += pStream->BlockSize;
-            BlockBuffer += pStream->BlockSize;
-            BytesNeeded -= pStream->BlockSize;
-            FileBitmap++;
-        }
-    }
-
-    return true;
-}
-
-static void PartStream_Close(TBlockStream * pStream)
-{
-    PART_FILE_HEADER PartHeader;
-    ULONGLONG ByteOffset = 0;
-
-    if(pStream->FileBitmap && pStream->IsModified)
-    {
-        // Prepare the part file header
-        memset(&PartHeader, 0, sizeof(PART_FILE_HEADER));
-        PartHeader.PartialVersion = 2;
-        PartHeader.FileSizeHi     = (DWORD)(pStream->StreamSize >> 0x20);
-        PartHeader.FileSizeLo     = (DWORD)(pStream->StreamSize & 0xFFFFFFFF);
-        PartHeader.BlockSize      = pStream->BlockSize;
-        
-        // Make sure that the header is properly BSWAPed
-        BSWAP_ARRAY32_UNSIGNED(&PartHeader, sizeof(PART_FILE_HEADER));
-        sprintf(PartHeader.GameBuildNumber, "%u", (unsigned int)pStream->BuildNumber);
-
-        // Write the part header
-        pStream->BaseWrite(pStream, &ByteOffset, &PartHeader, sizeof(PART_FILE_HEADER));
-
-        // Write the block bitmap
-        BSWAP_ARRAY32_UNSIGNED(pStream->FileBitmap, pStream->BitmapSize);
-        pStream->BaseWrite(pStream, NULL, pStream->FileBitmap, pStream->BitmapSize);
-    }
-
-    // Close the base class
-    BlockStream_Close(pStream);
-}
-
-static bool PartStream_CreateMirror(TBlockStream * pStream)
-{
-    ULONGLONG RemainingSize;
-    ULONGLONG MasterSize = 0;
-    ULONGLONG MirrorSize = 0;
-    LPBYTE FileBitmap = NULL;
-    DWORD dwBitmapSize;
-    DWORD dwBlockCount;
-    bool bNeedCreateMirrorStream = true;
-    bool bNeedResizeMirrorStream = true;
-
-    // Do we have master function and base creation function?
-    if(pStream->pMaster == NULL || pStream->BaseCreate == NULL)
-        return false;
-
-    // Retrieve the master file size, block count and bitmap size
-    FileStream_GetSize(pStream->pMaster, &MasterSize);
-    dwBlockCount = (DWORD)((MasterSize + DEFAULT_BLOCK_SIZE - 1) / DEFAULT_BLOCK_SIZE);
-    dwBitmapSize = (DWORD)(dwBlockCount * sizeof(PART_FILE_MAP_ENTRY));
-
-    // Setup stream size and position
-    pStream->BuildNumber = DEFAULT_BUILD_NUMBER;        // BUGBUG: Really???
-    pStream->StreamSize = MasterSize;
-    pStream->StreamPos = 0;
-
-    // Open the base stream for write access
-    if(pStream->BaseOpen(pStream, pStream->szFileName, 0))
-    {
-        // If the file open succeeded, check if the file size matches required size
-        pStream->BaseGetSize(pStream, &MirrorSize);
-        if(MirrorSize >= sizeof(PART_FILE_HEADER) + dwBitmapSize)
-        {
-            // Check if the remaining size is aligned to block
-            RemainingSize = MirrorSize - sizeof(PART_FILE_HEADER) - dwBitmapSize;
-            if((RemainingSize & (DEFAULT_BLOCK_SIZE - 1)) == 0 || RemainingSize == MasterSize)
-            {
-                // Attempt to load an existing file bitmap
-                if(PartStream_LoadBitmap(pStream))
-                    return true;
-            }
-        }
-
-        // We need to create mirror stream
-        bNeedCreateMirrorStream = false;
-    }
-
-    // Create a new stream, if needed
-    if(bNeedCreateMirrorStream)
-    {
-        if(!pStream->BaseCreate(pStream))
-            return false;
-    }
-
-    // If we need to, then resize the mirror stream
-    if(bNeedResizeMirrorStream)
-    {
-        if(!pStream->BaseResize(pStream, sizeof(PART_FILE_HEADER) + dwBitmapSize))
-            return false;
-    }
-
-    // Allocate the bitmap array
-    FileBitmap = STORM_ALLOC(BYTE, dwBitmapSize);
-    if(FileBitmap == NULL)
-        return false;
-
-    // Initialize the bitmap
-    memset(FileBitmap, 0, dwBitmapSize);
-    pStream->FileBitmap = FileBitmap;
-    pStream->BitmapSize = dwBitmapSize;
-    pStream->BlockSize  = DEFAULT_BLOCK_SIZE;
-    pStream->BlockCount = dwBlockCount;
-    pStream->IsComplete = 0;
-    pStream->IsModified = 1;
-
-    // Note: Don't write the stream bitmap right away.
-    // Doing so would cause sparse file resize on NTFS,
-    // which would take long time on larger files.
-    return true;
-}
-
-
-static TFileStream * PartStream_Open(const TCHAR * szFileName, DWORD dwStreamFlags)
-{
-    TBlockStream * pStream;
-
-    // Create new empty stream
-    pStream = (TBlockStream *)AllocateFileStream(szFileName, sizeof(TBlockStream), dwStreamFlags);
-    if(pStream == NULL)
-        return NULL;
-
-    // Do we have a master stream?
-    if(pStream->pMaster != NULL)
-    {
-        if(!PartStream_CreateMirror(pStream))
-        {
-            FileStream_Close(pStream);
-            SetLastError(ERROR_FILE_NOT_FOUND);
-            return NULL;
-        }
-    }
-    else
-    {
-        // Attempt to open the base stream
-        if(!pStream->BaseOpen(pStream, pStream->szFileName, dwStreamFlags))
-        {
-            FileStream_Close(pStream);
-            return NULL;
-        }
-
-        // Load the part stream block map
-        if(!PartStream_LoadBitmap(pStream))
-        {
-            FileStream_Close(pStream);
-            SetLastError(ERROR_BAD_FORMAT);
-            return NULL;
-        }
-    }
-
-    // Set the stream position to zero. Stream size is already set
-    assert(pStream->StreamSize != 0);
-    pStream->StreamPos = 0;
-    pStream->dwFlags |= STREAM_FLAG_READ_ONLY;
-
-    // Set new function pointers
-    pStream->StreamRead    = (STREAM_READ)BlockStream_Read;
-    pStream->StreamGetPos  = BlockStream_GetPos;
-    pStream->StreamGetSize = BlockStream_GetSize;
-    pStream->StreamClose   = (STREAM_CLOSE)PartStream_Close;
-
-    // Supply the block functions
-    pStream->BlockCheck    = (BLOCK_CHECK)PartStream_BlockCheck;
-    pStream->BlockRead     = (BLOCK_READ)PartStream_BlockRead;
-    return pStream;
-}
-
 //-----------------------------------------------------------------------------
-// Local functions - MPQE stream support
+// Local functions - encrypted stream support
 
 static const char * szKeyTemplate = "expand 32-byte k000000000000000000000000000000000000000000000000";
 
 static const char * AuthCodeArray[] =
 {
-    // Starcraft II (Heart of the Swarm)
-    // Authentication code URL: http://dist.blizzard.com/mediakey/hots-authenticationcode-bgdl.txt
-    //                                                                                          -0C-    -1C--08-    -18--04-    -14--00-    -10-
-    "S48B6CDTN5XEQAKQDJNDLJBJ73FDFM3U",         // SC2 Heart of the Swarm-all : "expand 32-byte kQAKQ0000FM3UN5XE000073FD6CDT0000LJBJS48B0000DJND"
-
     // Diablo III: Agent.exe (1.0.0.954)
-    // Address of decryption routine: 00502b00                             
+    // Address of decryption routine: 00502b00
     // Pointer to decryptor object: ECX
     // Pointer to key: ECX+0x5C
     // Authentication code URL: http://dist.blizzard.com/mediakey/d3-authenticationcode-enGB.txt
@@ -1854,7 +1415,7 @@ static const char * AuthCodeArray[] =
     "6VWCQTN8V3ZZMRUCZXV8A8CGUX2TAA8H",         // Diablo III Installer (zhTW): "expand 32-byte kMRUC0000AA8HV3ZZ0000UX2TQTN80000A8CG6VWC0000ZXV8"
 //  "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",         // Diablo III Installer (zhCN): "expand 32-byte kXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
 
-    // Starcraft II (Wings of Liberty): Installer.exe (4.1.1.4219)
+    // Note: Starcraft II (Wings of Liberty): Installer.exe (4.1.1.4219)
     // Address of decryption routine: 0053A3D0
     // Pointer to decryptor object: ECX
     // Pointer to key: ECX+0x5C
@@ -1904,10 +1465,10 @@ static void CreateKeyFromAuthCode(
 }
 
 static void DecryptFileChunk(
-    DWORD * MpqData,
-    LPBYTE pbKey,
-    ULONGLONG ByteOffset,
-    DWORD dwLength)
+        DWORD * MpqData,
+        LPBYTE pbKey,
+        ULONGLONG ByteOffset,
+        DWORD dwLength)
 {
     ULONGLONG ChunkOffset;
     DWORD KeyShuffled[0x10];
@@ -1940,7 +1501,7 @@ static void DecryptFileChunk(
         KeyShuffled[0x04] = KeyMirror[0x0D];
         KeyShuffled[0x01] = KeyMirror[0x0E];
         KeyShuffled[0x00] = KeyMirror[0x0F];
-        
+
         // Shuffle the key - part 2
         for(DWORD i = 0; i < RoundCount; i += 2)
         {
@@ -2016,315 +1577,123 @@ static void DecryptFileChunk(
     }
 }
 
-static bool MpqeStream_DetectFileKey(TEncryptedStream * pStream)
+static bool DetectFileKey(LPBYTE pbKeyBuffer, LPBYTE pbEncryptedHeader)
 {
     ULONGLONG ByteOffset = 0;
-    BYTE EncryptedHeader[MPQE_CHUNK_SIZE];
     BYTE FileHeader[MPQE_CHUNK_SIZE];
 
-    // Read the first file chunk
-    if(pStream->BaseRead(pStream, &ByteOffset, EncryptedHeader, sizeof(EncryptedHeader)))
+    // We just try all known keys one by one
+    for(int i = 0; AuthCodeArray[i] != NULL; i++)
     {
-        // We just try all known keys one by one
-        for(int i = 0; AuthCodeArray[i] != NULL; i++)
-        {
-            // Prepare they decryption key from game serial number
-            CreateKeyFromAuthCode(pStream->Key, AuthCodeArray[i]);
+        // Prepare they decryption key from game serial number
+        CreateKeyFromAuthCode(pbKeyBuffer, AuthCodeArray[i]);
 
-            // Try to decrypt with the given key 
-            memcpy(FileHeader, EncryptedHeader, MPQE_CHUNK_SIZE);
-            DecryptFileChunk((LPDWORD)FileHeader, pStream->Key, ByteOffset, MPQE_CHUNK_SIZE);
+        // Try to decrypt with the given key
+        memcpy(FileHeader, pbEncryptedHeader, MPQE_CHUNK_SIZE);
+        DecryptFileChunk((LPDWORD)FileHeader, pbKeyBuffer, ByteOffset, MPQE_CHUNK_SIZE);
 
-            // We check the decrypted data
-            // All known encrypted MPQs have header at the begin of the file,
-            // so we check for MPQ signature there.
-            if(FileHeader[0] == 'M' && FileHeader[1] == 'P' && FileHeader[2] == 'Q')
-            {
-                // Update the stream size
-                pStream->StreamSize = pStream->Base.File.FileSize;
-
-                // Fill the block information
-                pStream->BlockSize  = MPQE_CHUNK_SIZE;
-                pStream->BlockCount = (DWORD)(pStream->Base.File.FileSize + MPQE_CHUNK_SIZE - 1) / MPQE_CHUNK_SIZE;
-                pStream->IsComplete = 1;
-                return true;
-            }
-        }
+        // We check the decrypted data
+        // All known encrypted MPQs have header at the begin of the file,
+        // so we check for MPQ signature there.
+        if(FileHeader[0] == 'M' && FileHeader[1] == 'P' && FileHeader[2] == 'Q')
+            return true;
     }
 
     // Key not found, sorry
     return false;
 }
 
-static bool MpqeStream_BlockRead(
-    TEncryptedStream * pStream,
-    ULONGLONG StartOffset,
-    ULONGLONG EndOffset,
-    LPBYTE BlockBuffer,
-    DWORD BytesNeeded,
-    bool bAvailable)
+static bool EncryptedStream_Read(
+        TEncryptedStream * pStream,             // Pointer to an open stream
+        ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
+        void * pvBuffer,                        // Pointer to data to be read
+        DWORD dwBytesToRead)                    // Number of bytes to read from the file
 {
-    DWORD dwBytesToRead;
+    ULONGLONG StartOffset;                  // Offset of the first byte to be read from the file
+    ULONGLONG ByteOffset;                   // Offset that the caller wants
+    ULONGLONG EndOffset;                    // End offset that is to be read from the file
+    DWORD dwBytesToAllocate;
+    DWORD dwBytesToDecrypt;
+    DWORD dwOffsetInCache;
+    LPBYTE pbMpqData = NULL;
+    bool bResult = false;
 
-    assert((StartOffset & (pStream->BlockSize - 1)) == 0);
-    assert(StartOffset < EndOffset);
-    assert(bAvailable != false);
-    BytesNeeded = BytesNeeded;
-    bAvailable = bAvailable;
+    // Get the byte offset
+    if(pByteOffset == NULL)
+        pStream->BaseGetPos(pStream, &ByteOffset);
+    else
+        ByteOffset = *pByteOffset;
 
-    // Read the file from the stream as-is
-    // Limit the reading to number of blocks really needed
-    dwBytesToRead = (DWORD)(EndOffset - StartOffset);
-    if(!pStream->BaseRead(pStream, &StartOffset, BlockBuffer, dwBytesToRead))
-        return false;
+    // Cut it down to MPQE chunk size
+    StartOffset = ByteOffset;
+    StartOffset = StartOffset & ~(MPQE_CHUNK_SIZE - 1);
+    EndOffset = ByteOffset + dwBytesToRead;
 
-    // Decrypt the data
-    dwBytesToRead = (dwBytesToRead + MPQE_CHUNK_SIZE - 1) & ~(MPQE_CHUNK_SIZE - 1);
-    DecryptFileChunk((LPDWORD)BlockBuffer, pStream->Key, StartOffset, dwBytesToRead);
-    return true;
-}
+    // Calculate number of bytes to decrypt
+    dwBytesToDecrypt = (DWORD)(EndOffset - StartOffset);
+    dwBytesToAllocate = (dwBytesToDecrypt + (MPQE_CHUNK_SIZE - 1)) & ~(MPQE_CHUNK_SIZE - 1);
 
-static TFileStream * MpqeStream_Open(const TCHAR * szFileName, DWORD dwStreamFlags)
-{
-    TEncryptedStream * pStream;
-
-    // Create new empty stream
-    pStream = (TEncryptedStream *)AllocateFileStream(szFileName, sizeof(TEncryptedStream), dwStreamFlags);
-    if(pStream == NULL)
-        return NULL;
-
-    // Attempt to open the base stream
-    assert(pStream->BaseOpen != NULL);
-    if(!pStream->BaseOpen(pStream, pStream->szFileName, dwStreamFlags))
-        return NULL;
-
-    // Determine the encryption key for the MPQ
-    if(MpqeStream_DetectFileKey(pStream))
+    // Allocate buffers for encrypted and decrypted data
+    pbMpqData = STORM_ALLOC(BYTE, dwBytesToAllocate);
+    if(pbMpqData)
     {
-        // Set the stream position and size
-        assert(pStream->StreamSize != 0);
-        pStream->StreamPos = 0;
-        pStream->dwFlags |= STREAM_FLAG_READ_ONLY;
+        // Get the offset of the desired data in the cache
+        dwOffsetInCache = (DWORD)(ByteOffset - StartOffset);
 
-        // Set new function pointers
-        pStream->StreamRead    = (STREAM_READ)BlockStream_Read;
-        pStream->StreamGetPos  = BlockStream_GetPos;
-        pStream->StreamGetSize = BlockStream_GetSize;
-        pStream->StreamClose   = pStream->BaseClose;
-
-        // Supply the block functions
-        pStream->BlockRead     = (BLOCK_READ)MpqeStream_BlockRead;
-        return pStream;
-    }
-
-    // Cleanup the stream and return
-    FileStream_Close(pStream);
-    SetLastError(ERROR_UNKNOWN_FILE_KEY);
-    return NULL;
-}
-
-//-----------------------------------------------------------------------------
-// Local functions - Block4 stream support
-
-#define BLOCK4_BLOCK_SIZE   0x4000          // Size of one block
-#define BLOCK4_HASH_SIZE    0x20            // Size of MD5 hash that is after each block
-#define BLOCK4_MAX_BLOCKS   0x00002000      // Maximum amount of blocks per file
-#define BLOCK4_MAX_FSIZE    0x08040000      // Max size of one file
-
-static bool Block4Stream_BlockRead(
-    TBlockStream * pStream,                // Pointer to an open stream
-    ULONGLONG StartOffset,
-    ULONGLONG EndOffset,
-    LPBYTE BlockBuffer,
-    DWORD BytesNeeded,
-    bool bAvailable)
-{
-    TBaseProviderData * BaseArray = (TBaseProviderData *)pStream->FileBitmap;
-    ULONGLONG ByteOffset;
-    DWORD BytesToRead;
-    DWORD StreamIndex;
-    DWORD BlockIndex;
-    bool bResult;
-
-    // The starting offset must be aligned to size of the block
-    assert(pStream->FileBitmap != NULL);
-    assert((StartOffset & (pStream->BlockSize - 1)) == 0);
-    assert(StartOffset < EndOffset);
-    assert(bAvailable == true);
-
-    // Keep compiler happy
-    bAvailable = bAvailable;
-    EndOffset = EndOffset;
-
-    while(BytesNeeded != 0)
-    {
-        // Calculate the block index and the file index
-        StreamIndex = (DWORD)((StartOffset / pStream->BlockSize) / BLOCK4_MAX_BLOCKS);
-        BlockIndex  = (DWORD)((StartOffset / pStream->BlockSize) % BLOCK4_MAX_BLOCKS);
-        if(StreamIndex > pStream->BitmapSize)
-            return false;
-
-        // Calculate the block offset
-        ByteOffset = ((ULONGLONG)BlockIndex * (BLOCK4_BLOCK_SIZE + BLOCK4_HASH_SIZE));
-        BytesToRead = STORMLIB_MIN(BytesNeeded, BLOCK4_BLOCK_SIZE);
-
-        // Read from the base stream
-        pStream->Base = BaseArray[StreamIndex];
-        bResult = pStream->BaseRead(pStream, &ByteOffset, BlockBuffer, BytesToRead);
-        BaseArray[StreamIndex] = pStream->Base;
-
-        // Did the result succeed?
-        if(bResult == false)
-            return false;
-
-        // Move pointers
-        StartOffset += BytesToRead;
-        BlockBuffer += BytesToRead;
-        BytesNeeded -= BytesToRead;
-    }
-
-    return true;
-}
-
-
-static void Block4Stream_Close(TBlockStream * pStream)
-{
-    TBaseProviderData * BaseArray = (TBaseProviderData *)pStream->FileBitmap;
-
-    // If we have a non-zero count of base streams,
-    // we have to close them all
-    if(BaseArray != NULL)
-    {
-        // Close all base streams
-        for(DWORD i = 0; i < pStream->BitmapSize; i++)
+        // Read the file from the stream as-is
+        if(pStream->BaseRead(pStream, &StartOffset, pbMpqData, dwBytesToDecrypt))
         {
-            memcpy(&pStream->Base, BaseArray + i, sizeof(TBaseProviderData));
-            pStream->BaseClose(pStream);
+            // Decrypt the data
+            DecryptFileChunk((LPDWORD)pbMpqData, pStream->Key, StartOffset, dwBytesToAllocate);
+
+            // Copy the decrypted data
+            memcpy(pvBuffer, pbMpqData + dwOffsetInCache, dwBytesToRead);
+            bResult = true;
         }
+        else
+        {
+            assert(false);
+        }
+
+        // Free decryption buffer
+        STORM_FREE(pbMpqData);
     }
 
-    // Free the data map, if any
-    if(pStream->FileBitmap != NULL)
-        STORM_FREE(pStream->FileBitmap);
-    pStream->FileBitmap = NULL;
-
-    // Do not call the BaseClose function,
-    // we closed all handles already
-    return;
+    // Free buffers and exit
+    return bResult;
 }
 
-static TFileStream * Block4Stream_Open(const TCHAR * szFileName, DWORD dwStreamFlags)
+static bool EncryptedStream_Open(TEncryptedStream * pStream)
 {
-    TBaseProviderData * NewBaseArray = NULL;
-    ULONGLONG RemainderBlock;
-    ULONGLONG BlockCount;
-    ULONGLONG FileSize;
-    TBlockStream * pStream;
-    TCHAR * szNameBuff;
-    size_t nNameLength;
-    DWORD dwBaseFiles = 0;
-    DWORD dwBaseFlags;
-
-    // Create new empty stream
-    pStream = (TBlockStream *)AllocateFileStream(szFileName, sizeof(TBlockStream), dwStreamFlags);
-    if(pStream == NULL)
-        return NULL;
+    ULONGLONG ByteOffset = 0;
+    BYTE EncryptedHeader[MPQE_CHUNK_SIZE];
 
     // Sanity check
-    assert(pStream->BaseOpen != NULL);
+    assert(pStream->BaseRead != NULL);
 
-    // Get the length of the file name without numeric suffix
-    nNameLength = _tcslen(pStream->szFileName);
-    if(pStream->szFileName[nNameLength - 2] == '.' && pStream->szFileName[nNameLength - 1] == '0')
-        nNameLength -= 2;
-    pStream->szFileName[nNameLength] = 0;
-
-    // Supply the stream functions
-    pStream->StreamRead    = (STREAM_READ)BlockStream_Read;
-    pStream->StreamGetSize = BlockStream_GetSize;
-    pStream->StreamGetPos  = BlockStream_GetPos;
-    pStream->StreamClose   = (STREAM_CLOSE)Block4Stream_Close;
-    pStream->BlockRead     = (BLOCK_READ)Block4Stream_BlockRead;
-
-    // Allocate work space for numeric names
-    szNameBuff = STORM_ALLOC(TCHAR, nNameLength + 4);
-    if(szNameBuff != NULL)
+    // Load one MPQE chunk and try to detect the file key
+    if(pStream->BaseRead(pStream, &ByteOffset, EncryptedHeader, sizeof(EncryptedHeader)))
     {
-        // Set the base flags
-        dwBaseFlags = (dwStreamFlags & STREAM_PROVIDERS_MASK) | STREAM_FLAG_READ_ONLY;
-
-        // Go all suffixes from 0 to 30
-        for(int nSuffix = 0; nSuffix < 30; nSuffix++)
+        // Attempt to decrypt the MPQ header with all known keys
+        if(DetectFileKey(pStream->Key, EncryptedHeader))
         {
-            // Open the n-th file
-            _stprintf(szNameBuff, _T("%s.%u"), pStream->szFileName, nSuffix);
-            if(!pStream->BaseOpen(pStream, szNameBuff, dwBaseFlags))
-                break;
+            // Assign functions
+            pStream->StreamRead    = (STREAM_READ)EncryptedStream_Read;
+            pStream->StreamGetPos  = pStream->BaseGetPos;
+            pStream->StreamGetSize = pStream->BaseGetSize;
+            pStream->StreamGetTime = pStream->BaseGetTime;
+            pStream->StreamGetBmp  = (STREAM_GETBMP)Dummy_GetBitmap;
+            pStream->StreamClose   = pStream->BaseClose;
 
-            // If the open succeeded, we re-allocate the base provider array
-            NewBaseArray = STORM_ALLOC(TBaseProviderData, dwBaseFiles + 1);
-            if(NewBaseArray == NULL)
-            {
-                SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-                return NULL;
-            }
-
-            // Copy the old base data array to the new base data array
-            if(pStream->FileBitmap != NULL)
-            {
-                memcpy(NewBaseArray, pStream->FileBitmap, sizeof(TBaseProviderData) * dwBaseFiles);
-                STORM_FREE(pStream->FileBitmap);
-            }
-
-            // Also copy the opened base array
-            memcpy(NewBaseArray + dwBaseFiles, &pStream->Base, sizeof(TBaseProviderData));
-            pStream->FileBitmap = NewBaseArray;
-            dwBaseFiles++;
-
-            // Get the size of the base stream
-            pStream->BaseGetSize(pStream, &FileSize);
-            assert(FileSize <= BLOCK4_MAX_FSIZE);
-            RemainderBlock = FileSize % (BLOCK4_BLOCK_SIZE + BLOCK4_HASH_SIZE);
-            BlockCount = FileSize / (BLOCK4_BLOCK_SIZE + BLOCK4_HASH_SIZE);
-            
-            // Increment the stream size and number of blocks            
-            pStream->StreamSize += (BlockCount * BLOCK4_BLOCK_SIZE);
-            pStream->BlockCount += (DWORD)BlockCount;
-
-            // Is this the last file?
-            if(FileSize < BLOCK4_MAX_FSIZE)
-            {
-                if(RemainderBlock)
-                {
-                    pStream->StreamSize += (RemainderBlock - BLOCK4_HASH_SIZE);
-                    pStream->BlockCount++;
-                }
-                break;
-            }
+            // We need to reset the position back to the begin of the file
+            pStream->BaseRead(pStream, &ByteOffset, EncryptedHeader, 0);
+            return true;
         }
 
-        // Fill the remainining block stream variables
-        pStream->BitmapSize = dwBaseFiles;
-        pStream->BlockSize  = BLOCK4_BLOCK_SIZE;
-        pStream->IsComplete = 1;
-        pStream->IsModified = 0;
-
-        // Fill the remaining stream variables
-        pStream->StreamPos = 0;
-        pStream->dwFlags |= STREAM_FLAG_READ_ONLY;
-
-        STORM_FREE(szNameBuff);
+        // An unknown key
+        SetLastError(ERROR_UNKNOWN_FILE_KEY);
     }
-
-    // If we opened something, return success
-    if(dwBaseFiles == 0)
-    {
-        FileStream_Close(pStream);
-        SetLastError(ERROR_FILE_NOT_FOUND);
-        pStream = NULL;
-    }
-
-    return pStream;
+    return false;
 }
 
 //-----------------------------------------------------------------------------
@@ -2348,31 +1717,38 @@ static TFileStream * Block4Stream_Open(const TCHAR * szFileName, DWORD dwStreamF
  */
 
 TFileStream * FileStream_CreateFile(
-    const TCHAR * szFileName,
-    DWORD dwStreamFlags)
+        const TCHAR * szFileName,
+        DWORD dwStreamFlags)
 {
     TFileStream * pStream;
 
-    // We only support creation of flat, local file
-    if((dwStreamFlags & (STREAM_PROVIDERS_MASK)) != (STREAM_PROVIDER_FLAT | BASE_PROVIDER_FILE))
+    // We only support creation of linear, local file
+    if((dwStreamFlags & (STREAM_PROVIDER_MASK | BASE_PROVIDER_MASK)) != (STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE))
     {
         SetLastError(ERROR_NOT_SUPPORTED);
         return NULL;
     }
 
-    // Allocate file stream structure for flat stream
-    pStream = AllocateFileStream(szFileName, sizeof(TBlockStream), dwStreamFlags);
+    // Allocate file stream structure for linear stream
+    pStream = STORM_ALLOC(TFileStream, 1);
     if(pStream != NULL)
     {
+        // Reset entire structure to zero
+        memset(pStream, 0, sizeof(TFileStream));
+        _tcscpy(pStream->szFileName, szFileName);
+
         // Attempt to create the disk file
-        if(BaseFile_Create(pStream))
+        if(BaseFile_Create(pStream, szFileName, dwStreamFlags))
         {
             // Fill the stream provider functions
             pStream->StreamRead    = pStream->BaseRead;
             pStream->StreamWrite   = pStream->BaseWrite;
-            pStream->StreamResize  = pStream->BaseResize;
-            pStream->StreamGetSize = pStream->BaseGetSize;
             pStream->StreamGetPos  = pStream->BaseGetPos;
+            pStream->StreamGetSize = pStream->BaseGetSize;
+            pStream->StreamSetSize = pStream->BaseSetSize;
+            pStream->StreamGetTime = pStream->BaseGetTime;
+            pStream->StreamGetBmp  = (STREAM_GETBMP)Dummy_GetBitmap;;
+            pStream->StreamSwitch  = (STREAM_SWITCH)LinearStream_Switch;
             pStream->StreamClose   = pStream->BaseClose;
             return pStream;
         }
@@ -2394,6 +1770,8 @@ TFileStream * FileStream_CreateFile(
  * - If the file does not exist, the function must return NULL
  * - If the file exists but cannot be open, then function must return NULL
  * - The parameters of the function must be validate by the caller
+ * - The function must check if the file is a PART file,
+ *   and create TPartialStream object if so.
  * - The function must initialize all stream function pointers in TFileStream
  * - If the function fails from any reason, it must close all handles
  *   and free all memory that has been allocated in the process of stream creation,
@@ -2404,244 +1782,95 @@ TFileStream * FileStream_CreateFile(
  */
 
 TFileStream * FileStream_OpenFile(
-    const TCHAR * szFileName,
-    DWORD dwStreamFlags)
+        const TCHAR * szFileName,
+        DWORD dwStreamFlags)
 {
-    DWORD dwProvider = dwStreamFlags & STREAM_PROVIDERS_MASK;
-    size_t nPrefixLength = FileStream_Prefix(szFileName, &dwProvider);
+    TFileStream * pStream = NULL;
+    size_t StreamSize = 0;
+    bool bStreamResult = false;
+    bool bBaseResult = false;
 
-    // Re-assemble the stream flags
-    dwStreamFlags = (dwStreamFlags & STREAM_OPTIONS_MASK) | dwProvider;
-    szFileName += nPrefixLength;
-
-    // Perform provider-specific open
+    // Allocate file stream for each stream provider
     switch(dwStreamFlags & STREAM_PROVIDER_MASK)
     {
-        case STREAM_PROVIDER_FLAT:
-            return FlatStream_Open(szFileName, dwStreamFlags);
+    case STREAM_PROVIDER_LINEAR:    // Allocate structure for linear stream
+        StreamSize = sizeof(TLinearStream);
+        break;
 
-        case STREAM_PROVIDER_PARTIAL:
-            return PartStream_Open(szFileName, dwStreamFlags);
+    case STREAM_PROVIDER_PARTIAL:
+        dwStreamFlags |= STREAM_FLAG_READ_ONLY;
+        StreamSize = sizeof(TPartialStream);
+        break;
 
-        case STREAM_PROVIDER_MPQE:
-            return MpqeStream_Open(szFileName, dwStreamFlags);
+    case STREAM_PROVIDER_ENCRYPTED:
+        dwStreamFlags |= STREAM_FLAG_READ_ONLY;
+        StreamSize = sizeof(TEncryptedStream);
+        break;
 
-        case STREAM_PROVIDER_BLOCK4:
-            return Block4Stream_Open(szFileName, dwStreamFlags);
-
-        default:
-            SetLastError(ERROR_INVALID_PARAMETER);
-            return NULL;
+    default:
+        return NULL;
     }
-}
 
-/**
- * Returns the file name of the stream
- *
- * \a pStream Pointer to an open stream
- */
-const TCHAR * FileStream_GetFileName(TFileStream * pStream)
-{
-    assert(pStream != NULL);
-    return pStream->szFileName;
-}
+    // Allocate the stream for each type
+    pStream = (TFileStream *)STORM_ALLOC(BYTE, StreamSize);
+    if(pStream == NULL)
+        return NULL;
 
-/**
- * Returns the length of the provider prefix. Returns zero if no prefix
- *
- * \a szFileName Pointer to a stream name (file, mapped file, URL)
- * \a pdwStreamProvider Pointer to a DWORD variable that receives stream provider (STREAM_PROVIDER_XXX)
- */
+    // Fill the stream structure with zeros
+    memset(pStream, 0, StreamSize);
+    _tcscpy(pStream->szFileName, szFileName);
 
-size_t FileStream_Prefix(const TCHAR * szFileName, DWORD * pdwProvider)
-{
-    size_t nPrefixLength1 = 0;
-    size_t nPrefixLength2 = 0;
-    DWORD dwProvider = 0;
-
-    if(szFileName != NULL)
+    // Now initialize the respective base provider
+    switch(dwStreamFlags & BASE_PROVIDER_MASK)
     {
-        //
-        // Determine the stream provider
-        //
+    case BASE_PROVIDER_FILE:
+        bBaseResult = BaseFile_Open(pStream, szFileName, dwStreamFlags);
+        break;
 
-        if(!_tcsnicmp(szFileName, _T("flat-"), 5))
-        {
-            dwProvider |= STREAM_PROVIDER_FLAT;
-            nPrefixLength1 = 5;
-        }
+    case BASE_PROVIDER_MAP:
+        dwStreamFlags |= STREAM_FLAG_READ_ONLY;
+        bBaseResult = BaseMap_Open(pStream, szFileName, dwStreamFlags);
+        break;
 
-        else if(!_tcsnicmp(szFileName, _T("part-"), 5))
-        {
-            dwProvider |= STREAM_PROVIDER_PARTIAL;
-            nPrefixLength1 = 5;
-        }
-
-        else if(!_tcsnicmp(szFileName, _T("mpqe-"), 5))
-        {
-            dwProvider |= STREAM_PROVIDER_MPQE;
-            nPrefixLength1 = 5;
-        }
-
-        else if(!_tcsnicmp(szFileName, _T("blk4-"), 5))
-        {
-            dwProvider |= STREAM_PROVIDER_BLOCK4;
-            nPrefixLength1 = 5;
-        }
-
-        //
-        // Determine the base provider
-        //
-
-        if(!_tcsnicmp(szFileName+nPrefixLength1, _T("file:"), 5))
-        {
-            dwProvider |= BASE_PROVIDER_FILE;
-            nPrefixLength2 = 5;
-        }
-
-        else if(!_tcsnicmp(szFileName+nPrefixLength1, _T("map:"), 4))
-        {
-            dwProvider |= BASE_PROVIDER_MAP;
-            nPrefixLength2 = 4;
-        }
-        
-        else if(!_tcsnicmp(szFileName+nPrefixLength1, _T("http:"), 5))
-        {
-            dwProvider |= BASE_PROVIDER_HTTP;
-            nPrefixLength2 = 5;
-        }
-
-        // Only accept stream provider if we recognized the base provider
-        if(nPrefixLength2 != 0)
-        {
-            // It is also allowed to put "//" after the base provider, e.g. "file://", "http://"
-            if(szFileName[nPrefixLength1+nPrefixLength2] == '/' && szFileName[nPrefixLength1+nPrefixLength2+1] == '/')
-                nPrefixLength2 += 2;
-
-            if(pdwProvider != NULL)
-                *pdwProvider = dwProvider;
-            return nPrefixLength1 + nPrefixLength2;
-        }
+    case BASE_PROVIDER_HTTP:
+        dwStreamFlags |= STREAM_FLAG_READ_ONLY;
+        bBaseResult = BaseHttp_Open(pStream, szFileName, dwStreamFlags);
+        break;
     }
 
-    return 0;
-}
-
-/**
- * Sets a download callback. Whenever the stream needs to download one or more blocks
- * from the server, the callback is called
- *
- * \a pStream Pointer to an open stream
- * \a pfnCallback Pointer to callback function
- * \a pvUserData Arbitrary user pointer passed to the download callback
- */
-
-bool FileStream_SetCallback(TFileStream * pStream, SFILE_DOWNLOAD_CALLBACK pfnCallback, void * pvUserData)
-{
-    TBlockStream * pBlockStream = (TBlockStream *)pStream;
-
-    if(pStream->BlockRead == NULL)
+    // If we failed to open the base storage, fail the operation
+    if(bBaseResult == false)
     {
-        SetLastError(ERROR_NOT_SUPPORTED);
-        return false;
+        STORM_FREE(pStream);
+        return NULL;
     }
 
-    pBlockStream->pfnCallback = pfnCallback;
-    pBlockStream->UserData = pvUserData;
-    return true;
-}
-
-/**
- * This function gives the block map. The 'pvBitmap' pointer must point to a buffer
- * of at least sizeof(STREAM_BLOCK_MAP) size. It can also have size of the complete
- * block map (i.e. sizeof(STREAM_BLOCK_MAP) + BitmapSize). In that case, the function
- * also copies the bit-based block map.
- *
- * \a pStream Pointer to an open stream
- * \a pvBitmap Pointer to buffer where the block map will be stored
- * \a cbBitmap Length of the buffer, of the block map
- * \a cbLengthNeeded Length of the bitmap, in bytes
- */
-
-bool FileStream_GetBitmap(TFileStream * pStream, void * pvBitmap, DWORD cbBitmap, DWORD * pcbLengthNeeded)
-{
-    TStreamBitmap * pBitmap = (TStreamBitmap *)pvBitmap;
-    TBlockStream * pBlockStream = (TBlockStream *)pStream;
-    ULONGLONG BlockOffset;
-    LPBYTE Bitmap = (LPBYTE)(pBitmap + 1);
-    DWORD BitmapSize;
-    DWORD BlockCount;
-    DWORD BlockSize;
-    bool bResult = false;
-
-    // Retrieve the size of one block
-    if(pStream->BlockCheck != NULL)
+    // Now initialize the stream provider
+    switch(dwStreamFlags & STREAM_PROVIDER_MASK)
     {
-        BlockCount = pBlockStream->BlockCount;
-        BlockSize = pBlockStream->BlockSize;
+    case STREAM_PROVIDER_LINEAR:
+        bStreamResult = LinearStream_Open((TLinearStream *)pStream);
+        break;
+
+    case STREAM_PROVIDER_PARTIAL:
+        bStreamResult = PartialStream_Open((TPartialStream *)pStream);
+        break;
+
+    case STREAM_PROVIDER_ENCRYPTED:
+        bStreamResult = EncryptedStream_Open((TEncryptedStream *)pStream);
+        break;
     }
-    else
+
+    // If the operation failed, free the stream and set it to NULL
+    if(bStreamResult == false)
     {
-        BlockCount = (DWORD)((pStream->StreamSize + DEFAULT_BLOCK_SIZE - 1) / DEFAULT_BLOCK_SIZE);
-        BlockSize = DEFAULT_BLOCK_SIZE;
+        // Only close the base stream
+        pStream->BaseClose(pStream);
+        STORM_FREE(pStream);
+        pStream = NULL;
     }
 
-    // Fill-in the variables
-    BitmapSize = (BlockCount + 7) / 8;
-
-    // Give the number of blocks
-    if(pcbLengthNeeded != NULL)
-        pcbLengthNeeded[0] = sizeof(TStreamBitmap) + BitmapSize;
-
-    // If the length of the buffer is not enough
-    if(pvBitmap != NULL && cbBitmap != 0)
-    {
-        // Give the STREAM_BLOCK_MAP structure
-        if(cbBitmap >= sizeof(TStreamBitmap))
-        {
-            pBitmap->StreamSize = pStream->StreamSize;
-            pBitmap->BitmapSize = BitmapSize;
-            pBitmap->BlockCount = BlockCount;
-            pBitmap->BlockSize  = BlockSize;
-            pBitmap->IsComplete = (pStream->BlockCheck != NULL) ? pBlockStream->IsComplete : 1;
-            bResult = true;
-        }
-
-        // Give the block bitmap, if enough space
-        if(cbBitmap >= sizeof(TStreamBitmap) + BitmapSize)
-        {
-            // Version with bitmap present
-            if(pStream->BlockCheck != NULL)
-            {
-                DWORD ByteIndex = 0;
-                BYTE BitMask = 0x01;
-
-                // Initialize the map with zeros
-                memset(Bitmap, 0, BitmapSize);
-
-                // Fill the map
-                for(BlockOffset = 0; BlockOffset < pStream->StreamSize; BlockOffset += BlockSize)
-                {
-                    // Set the bit if the block is present
-                    if(pBlockStream->BlockCheck(pStream, BlockOffset))
-                        Bitmap[ByteIndex] |= BitMask;
-
-                    // Move bit position
-                    ByteIndex += (BitMask >> 0x07);
-                    BitMask = (BitMask >> 0x07) | (BitMask << 0x01);
-                }
-            }
-            else
-            {
-                memset(Bitmap, 0xFF, BitmapSize);
-            }
-        }
-    }
-
-    // Set last error value and return
-    if(bResult == false)
-        SetLastError(ERROR_INSUFFICIENT_BUFFER);
-    return bResult;
+    return pStream;
 }
 
 /**
@@ -2684,15 +1913,23 @@ bool FileStream_Read(TFileStream * pStream, ULONGLONG * pByteOffset, void * pvBu
 bool FileStream_Write(TFileStream * pStream, ULONGLONG * pByteOffset, const void * pvBuffer, DWORD dwBytesToWrite)
 {
     if(pStream->dwFlags & STREAM_FLAG_READ_ONLY)
-    {
-        SetLastError(ERROR_ACCESS_DENIED);
         return false;
-    }
 
     assert(pStream->StreamWrite != NULL);
     return pStream->StreamWrite(pStream, pByteOffset, pvBuffer, dwBytesToWrite);
 }
 
+/**
+ * This function returns the current file position
+ * \a pStream
+ * \a ByteOffset
+ */
+bool FileStream_GetPos(TFileStream * pStream, ULONGLONG * pByteOffset)
+{
+    assert(pStream->StreamGetPos != NULL);
+    return pStream->StreamGetPos(pStream, pByteOffset);
+}
+
 /**
  * Returns the size of a file
  *
@@ -2712,26 +1949,12 @@ bool FileStream_GetSize(TFileStream * pStream, ULONGLONG * pFileSize)
  * \a NewFileSize File size to set
  */
 bool FileStream_SetSize(TFileStream * pStream, ULONGLONG NewFileSize)
-{                                 
-    if(pStream->dwFlags & STREAM_FLAG_READ_ONLY)
-    {
-        SetLastError(ERROR_ACCESS_DENIED);
-        return false;
-    }
-
-    assert(pStream->StreamResize != NULL);
-    return pStream->StreamResize(pStream, NewFileSize);
-}
-
-/**
- * This function returns the current file position
- * \a pStream
- * \a pByteOffset
- */
-bool FileStream_GetPos(TFileStream * pStream, ULONGLONG * pByteOffset)
 {
-    assert(pStream->StreamGetPos != NULL);
-    return pStream->StreamGetPos(pStream, pByteOffset);
+    if(pStream->dwFlags & STREAM_FLAG_READ_ONLY)
+        return false;
+
+    assert(pStream->StreamSetSize != NULL);
+    return pStream->StreamSetSize(pStream, NewFileSize);
 }
 
 /**
@@ -2742,9 +1965,8 @@ bool FileStream_GetPos(TFileStream * pStream, ULONGLONG * pByteOffset)
  */
 bool FileStream_GetTime(TFileStream * pStream, ULONGLONG * pFileTime)
 {
-    // Just use the saved filetime value
-    *pFileTime = pStream->Base.File.FileTime;
-    return true;
+    assert(pStream->StreamGetTime != NULL);
+    return pStream->StreamGetTime(pStream, pFileTime);
 }
 
 /**
@@ -2768,41 +1990,87 @@ bool FileStream_GetFlags(TFileStream * pStream, LPDWORD pdwStreamFlags)
  * 3) Opens the MPQ stores the handle and stream position to the new stream structure
  *
  * \a pStream Pointer to an open stream
- * \a pNewStream Temporary ("working") stream (created during archive compacting)
+ * \a pTempStream Temporary ("working") stream (created during archive compacting)
  */
-bool FileStream_Replace(TFileStream * pStream, TFileStream * pNewStream)
+bool FileStream_Switch(TFileStream * pStream, TFileStream * pNewStream)
 {
-    // Only supported on flat files
-    if((pStream->dwFlags & STREAM_PROVIDERS_MASK) != (STREAM_PROVIDER_FLAT | BASE_PROVIDER_FILE))
-    {
-        SetLastError(ERROR_NOT_SUPPORTED);
-        return false;
-    }
-
-    // Not supported on read-only streams
     if(pStream->dwFlags & STREAM_FLAG_READ_ONLY)
-    {
-        SetLastError(ERROR_ACCESS_DENIED);
-        return false;
-    }
-
-    // Close both stream's base providers
-    pNewStream->BaseClose(pNewStream);
-    pStream->BaseClose(pStream);
-
-    // Now we have to delete the (now closed) old file and rename the new file
-    if(!BaseFile_Replace(pStream, pNewStream))
         return false;
 
-    // Now open the base file again
-    if(!BaseFile_Open(pStream, pStream->szFileName, pStream->dwFlags))
+    assert(pStream->StreamSwitch != NULL);
+    return pStream->StreamSwitch(pStream, pNewStream);
+}
+
+/**
+ * Returns the file name of the stream
+ *
+ * \a pStream Pointer to an open stream
+ */
+TCHAR * FileStream_GetFileName(TFileStream * pStream)
+{
+    assert(pStream != NULL);
+    return pStream->szFileName;
+}
+
+/**
+ * Returns true if the stream is read-only
+ *
+ * \a pStream Pointer to an open stream
+ */
+bool FileStream_IsReadOnly(TFileStream * pStream)
+{
+    return (pStream->dwFlags & STREAM_FLAG_READ_ONLY) ? true : false;
+}
+
+/**
+ * This function enabled a linear stream to include data bitmap.
+ * Used by MPQs v 4.0 from WoW. Each file block is represented by
+ * a bit in the bitmap. 1 means the block is present, 0 means it's not.
+ *
+ * \a pStream Pointer to an open stream
+ * \a pBitmap Pointer to file bitmap
+ */
+
+bool FileStream_SetBitmap(TFileStream * pStream, TFileBitmap * pBitmap)
+{
+    TLinearStream * pLinearStream;
+
+    // It must be a linear stream.
+    if((pStream->dwFlags & STREAM_PROVIDER_MASK) != STREAM_PROVIDER_LINEAR)
+        return false;
+    pLinearStream = (TLinearStream *)pStream;
+
+    // Two bitmaps are not allowed
+    if(pLinearStream->pBitmap != NULL)
         return false;
 
-    // Cleanup the new stream
-    FileStream_Close(pNewStream);
+    // We need to change some entry points
+    pLinearStream->StreamRead   = (STREAM_READ)LinearStream_Read;
+    pLinearStream->StreamGetBmp = (STREAM_GETBMP)LinearStream_GetBitmap;
+
+    // Using data bitmap renders the stream to be read only.
+    pLinearStream->dwFlags |= STREAM_FLAG_READ_ONLY;
+    pLinearStream->pBitmap = pBitmap;
     return true;
 }
 
+/**
+ * This function retrieves the file bitmap. A file bitmap is an array
+ * of bits, each bit representing one file block. A value of 1 means
+ * that the block is present in the file, a value of 0 means that the
+ * block is not present.
+ *
+ * \a pStream Pointer to an open stream
+ * \a pBitmap Pointer to buffer where to store the file bitmap
+ * \a Length  Size of buffer pointed by pBitmap, in bytes
+ * \a LengthNeeded If non-NULL, the function supplies the necessary byte size of the buffer
+ */
+bool FileStream_GetBitmap(TFileStream * pStream, TFileBitmap * pBitmap, DWORD Length, LPDWORD LengthNeeded)
+{
+    assert(pStream->StreamGetBmp != NULL);
+    return pStream->StreamGetBmp(pStream, pBitmap, Length, LengthNeeded);
+}
+
 /**
  * This function closes an archive file and frees any data buffers
  * that have been allocated for stream management. The function must also
@@ -2816,79 +2084,16 @@ void FileStream_Close(TFileStream * pStream)
     // Check if the stream structure is allocated at all
     if(pStream != NULL)
     {
-        // Free the master stream, if any
-        if(pStream->pMaster != NULL)
-            FileStream_Close(pStream->pMaster);
-        pStream->pMaster = NULL;
-
         // Close the stream provider.
-        if(pStream->StreamClose != NULL)
-            pStream->StreamClose(pStream);
-        
-        // Also close base stream, if any
-        else if(pStream->BaseClose != NULL)
-            pStream->BaseClose(pStream);
+        // This will also close the base stream
+        assert(pStream->StreamClose != NULL);
+        pStream->StreamClose(pStream);
 
         // Free the stream itself
         STORM_FREE(pStream);
     }
 }
 
-//-----------------------------------------------------------------------------
-// Utility functions (ANSI)
-
-const char * GetPlainFileName(const char * szFileName)
-{
-    const char * szPlainName = szFileName;
-
-    while(*szFileName != 0)
-    {
-        if(*szFileName == '\\' || *szFileName == '/')
-            szPlainName = szFileName + 1;
-        szFileName++;
-    }
-
-    return szPlainName;
-}
-
-void CopyFileName(char * szTarget, const char * szSource, size_t cchLength)
-{
-    memcpy(szTarget, szSource, cchLength);
-    szTarget[cchLength] = 0;
-}
-
-//-----------------------------------------------------------------------------
-// Utility functions (UNICODE) only exist in the ANSI version of the library
-// In ANSI builds, TCHAR = char, so we don't need these functions implemented
-
-#ifdef _UNICODE
-const TCHAR * GetPlainFileName(const TCHAR * szFileName)
-{
-    const TCHAR * szPlainName = szFileName;
-
-    while(*szFileName != 0)
-    {
-        if(*szFileName == '\\' || *szFileName == '/')
-            szPlainName = szFileName + 1;
-        szFileName++;
-    }
-
-    return szPlainName;
-}
-
-void CopyFileName(TCHAR * szTarget, const char * szSource, size_t cchLength)
-{
-    mbstowcs(szTarget, szSource, cchLength);
-    szTarget[cchLength] = 0;
-}
-
-void CopyFileName(char * szTarget, const TCHAR * szSource, size_t cchLength)
-{
-    wcstombs(szTarget, szSource, cchLength);
-    szTarget[cchLength] = 0;
-}
-#endif
-
 //-----------------------------------------------------------------------------
 // main - for testing purposes
 
@@ -2936,3 +2141,154 @@ int FileStream_Test(const TCHAR * szFileName, DWORD dwStreamFlags)
     return ERROR_SUCCESS;
 }
 #endif
+
+/*
+int FileStream_Test()
+{
+    TFileStream * pStream;
+
+    InitializeMpqCryptography();
+
+    //
+    // Test 1: Write to a stream
+    //
+
+    pStream = FileStream_CreateFile("E:\\Stream.bin", 0);
+    if(pStream != NULL)
+    {
+        char szString1[100] = "This is a single line\n\r";
+        DWORD dwLength = strlen(szString1);
+
+        for(int i = 0; i < 10; i++)
+        {
+            if(!FileStream_Write(pStream, NULL, szString1, dwLength))
+            {
+                printf("Failed to write to the stream\n");
+                return ERROR_CAN_NOT_COMPLETE;
+            }
+        }
+        FileStream_Close(pStream);
+    }
+
+    //
+    // Test2: Read from the stream
+    //
+
+    pStream = FileStream_OpenFile("E:\\Stream.bin", STREAM_FLAG_READ_ONLY | STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
+    if(pStream != NULL)
+    {
+        char szString1[100] = "This is a single line\n\r";
+        char szString2[100];
+        DWORD dwLength = strlen(szString1);
+
+        // This call must end with an error
+        if(FileStream_Write(pStream, NULL, "aaa", 3))
+        {
+            printf("Write succeeded while it should fail\n");
+            return -1;
+        }
+
+        for(int i = 0; i < 10; i++)
+        {
+            if(!FileStream_Read(pStream, NULL, szString2, dwLength))
+            {
+                printf("Failed to read from the stream\n");
+                return -1;
+            }
+
+            szString2[dwLength] = 0;
+            if(strcmp(szString1, szString2))
+            {
+                printf("Data read from file are different from data written\n");
+                return -1;
+            }
+        }
+        FileStream_Close(pStream);
+    }
+
+    //
+    // Test3: Open the temp stream, write some data and switch it to the original stream
+    //
+
+    pStream = FileStream_OpenFile("E:\\Stream.bin", STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
+    if(pStream != NULL)
+    {
+        TFileStream * pTempStream;
+        ULONGLONG FileSize;
+
+        pTempStream = FileStream_CreateFile("E:\\TempStream.bin", 0);
+        if(pTempStream == NULL)
+        {
+            printf("Failed to create temp stream\n");
+            return -1;
+        }
+
+        // Copy the original stream to the temp
+        if(!FileStream_GetSize(pStream, FileSize))
+        {
+            printf("Failed to get the file size\n");
+            return -1;
+        }
+
+        while(FileSize != 0)
+        {
+            DWORD dwBytesToRead = (DWORD)FileSize;
+            char Buffer[0x80];
+
+            if(dwBytesToRead > sizeof(Buffer))
+                dwBytesToRead = sizeof(Buffer);
+
+            if(!FileStream_Read(pStream, NULL, Buffer, dwBytesToRead))
+            {
+                printf("CopyStream: Read source file failed\n");
+                return -1;
+            }
+
+            if(!FileStream_Write(pTempStream, NULL, Buffer, dwBytesToRead))
+            {
+                printf("CopyStream: Write target file failed\n");
+                return -1;
+            }
+
+            FileSize -= dwBytesToRead;
+        }
+
+        // Switch the streams
+        // Note that the pTempStream is closed by the operation
+        FileStream_Switch(pStream, pTempStream);
+        FileStream_Close(pStream);
+    }
+
+    //
+    // Test4: Read from the stream again
+    //
+
+    pStream = FileStream_OpenFile("E:\\Stream.bin", STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
+    if(pStream != NULL)
+    {
+        char szString1[100] = "This is a single line\n\r";
+        char szString2[100];
+        DWORD dwLength = strlen(szString1);
+
+        for(int i = 0; i < 10; i++)
+        {
+            if(!FileStream_Read(pStream, NULL, szString2, dwLength))
+            {
+                printf("Failed to read from the stream\n");
+                return -1;
+            }
+
+            szString2[dwLength] = 0;
+            if(strcmp(szString1, szString2))
+            {
+                printf("Data read from file are different from data written\n");
+                return -1;
+            }
+        }
+        FileStream_Close(pStream);
+    }
+
+    return 0;
+}
+*/
+
diff --git a/dep/StormLib/src/FileStream.h b/dep/StormLib/src/FileStream.h
index 44beeed91..5c50a0d2a 100644
--- a/dep/StormLib/src/FileStream.h
+++ b/dep/StormLib/src/FileStream.h
@@ -14,77 +14,58 @@
 //-----------------------------------------------------------------------------
 // Function prototypes
 
-typedef void (*STREAM_INIT)(
-    struct TFileStream * pStream        // Pointer to an unopened stream
-);
-
-typedef bool (*STREAM_CREATE)(
-    struct TFileStream * pStream        // Pointer to an unopened stream
-    );
-
-typedef bool (*STREAM_OPEN)(
-    struct TFileStream * pStream,       // Pointer to an unopened stream
-    const TCHAR * szFileName,           // Pointer to file name to be open
-    DWORD dwStreamFlags                 // Stream flags
-    );
-
 typedef bool (*STREAM_READ)(
-    struct TFileStream * pStream,       // Pointer to an open stream
-    ULONGLONG * pByteOffset,            // Pointer to file byte offset. If NULL, it reads from the current position
-    void * pvBuffer,                    // Pointer to data to be read
-    DWORD dwBytesToRead                 // Number of bytes to read from the file
-    );
+        struct TFileStream * pStream,       // Pointer to an open stream
+        ULONGLONG * pByteOffset,            // Pointer to file byte offset. If NULL, it reads from the current position
+        void * pvBuffer,                    // Pointer to data to be read
+        DWORD dwBytesToRead                 // Number of bytes to read from the file
+        );
 
 typedef bool (*STREAM_WRITE)(
-    struct TFileStream * pStream,       // Pointer to an open stream
-    ULONGLONG * pByteOffset,            // Pointer to file byte offset. If NULL, it writes to the current position
-    const void * pvBuffer,              // Pointer to data to be written
-    DWORD dwBytesToWrite                // Number of bytes to read from the file
-    );
-
-typedef bool (*STREAM_RESIZE)(
-    struct TFileStream * pStream,       // Pointer to an open stream
-    ULONGLONG FileSize                  // New size for the file, in bytes
-    );
-
-typedef bool (*STREAM_GETSIZE)(
-    struct TFileStream * pStream,       // Pointer to an open stream
-    ULONGLONG * pFileSize               // Receives the file size, in bytes
-    );
+        struct TFileStream * pStream,       // Pointer to an open stream
+        ULONGLONG * pByteOffset,            // Pointer to file byte offset. If NULL, it writes to the current position
+        const void * pvBuffer,              // Pointer to data to be written
+        DWORD dwBytesToWrite                // Number of bytes to read from the file
+        );
 
 typedef bool (*STREAM_GETPOS)(
-    struct TFileStream * pStream,       // Pointer to an open stream
-    ULONGLONG * pByteOffset             // Pointer to store current file position
-    );
+        struct TFileStream * pStream,       // Pointer to an open stream
+        ULONGLONG * pByteOffset             // Pointer to store current file position
+        );
+
+typedef bool (*STREAM_GETSIZE)(
+        struct TFileStream * pStream,       // Pointer to an open stream
+        ULONGLONG * pFileSize               // Receives the file size, in bytes
+        );
+
+typedef bool (*STREAM_SETSIZE)(
+        struct TFileStream * pStream,       // Pointer to an open stream
+        ULONGLONG FileSize                  // New size for the file, in bytes
+        );
+
+typedef bool (*STREAM_GETTIME)(
+        struct TFileStream * pStream,
+        ULONGLONG * pFT
+        );
+
+typedef bool (*STREAM_SWITCH)(
+        struct TFileStream * pStream,
+        struct TFileStream * pNewStream
+        );
+
+typedef bool (*STREAM_GETBMP)(
+        TFileStream * pStream,
+        TFileBitmap * pBitmap,
+        DWORD Length,
+        LPDWORD LengthNeeded
+        );
 
 typedef void (*STREAM_CLOSE)(
-    struct TFileStream * pStream        // Pointer to an open stream
-    );
-
-typedef bool (*BLOCK_READ)(
-    struct TFileStream * pStream,       // Pointer to a block-oriented stream
-    ULONGLONG StartOffset,              // Byte offset of start of the block array
-    ULONGLONG EndOffset,                // End offset (either end of the block or end of the file)
-    LPBYTE BlockBuffer,                 // Pointer to block-aligned buffer
-    DWORD BytesNeeded,                  // Number of bytes that are really needed
-    bool bAvailable                     // true if the block is available
-    );
-
-typedef bool (*BLOCK_CHECK)(
-    struct TFileStream * pStream,       // Pointer to a block-oriented stream
-    ULONGLONG BlockOffset               // Offset of the file to check
-    );
-
-typedef void (*BLOCK_SAVEMAP)(
-    struct TFileStream * pStream        // Pointer to a block-oriented stream
-    );
+        struct TFileStream * pStream
+        );
 
 //-----------------------------------------------------------------------------
-// Local structures - partial file structure and bitmap footer
-
-#define ID_FILE_BITMAP_FOOTER   0x33767470  // Signature of the file bitmap footer ('ptv3')
-#define DEFAULT_BLOCK_SIZE      0x00004000  // Default size of the stream block
-#define DEFAULT_BUILD_NUMBER         10958  // Build number for newly created partial MPQs
+// Local structures - part file structure
 
 typedef struct _PART_FILE_HEADER
 {
@@ -108,108 +89,99 @@ typedef struct _PART_FILE_MAP_ENTRY
 
 } PART_FILE_MAP_ENTRY, *PPART_FILE_MAP_ENTRY;
 
-typedef struct _FILE_BITMAP_FOOTER
-{
-    DWORD Signature;                      // 'ptv3' (ID_FILE_BITMAP_FOOTER)
-    DWORD Version;                        // Unknown, seems to always have value of 3 (version?)
-    DWORD BuildNumber;                    // Game build number for that MPQ
-    DWORD MapOffsetLo;                    // Low 32-bits of the offset of the bit map
-    DWORD MapOffsetHi;                    // High 32-bits of the offset of the bit map
-    DWORD BlockSize;                      // Size of one block (usually 0x4000 bytes)
-
-} FILE_BITMAP_FOOTER, *PFILE_BITMAP_FOOTER;
-
 //-----------------------------------------------------------------------------
-// Structure for file stream
+// Local structures
 
-union TBaseProviderData
+union TBaseData
 {
     struct
     {
         ULONGLONG FileSize;                 // Size of the file
         ULONGLONG FilePos;                  // Current file position
-        ULONGLONG FileTime;                 // Last write time
+        ULONGLONG FileTime;                 // Date/time of last modification of the file
         HANDLE hFile;                       // File handle
     } File;
 
     struct
     {
-        ULONGLONG FileSize;                 // Size of the file
-        ULONGLONG FilePos;                  // Current file position
-        ULONGLONG FileTime;                 // Last write time
+        ULONGLONG FileSize;                 // Mapped file size
+        ULONGLONG FilePos;                  // Current stream position
+        ULONGLONG FileTime;                 // Date/time of last modification of the file
         LPBYTE pbFile;                      // Pointer to mapped view
     } Map;
 
     struct
     {
-        ULONGLONG FileSize;                 // Size of the file
-        ULONGLONG FilePos;                  // Current file position
-        ULONGLONG FileTime;                 // Last write time
+        ULONGLONG FileSize;                 // Size of the internet file
+        ULONGLONG FilePos;                  // Current position in the file
+        ULONGLONG FileTime;                 // Date/time of last modification of the file
         HANDLE hInternet;                   // Internet handle
         HANDLE hConnect;                    // Connection to the internet server
     } Http;
 };
 
+//-----------------------------------------------------------------------------
+// Structure for linear stream
+
 struct TFileStream
 {
     // Stream provider functions
     STREAM_READ    StreamRead;              // Pointer to stream read function for this archive. Do not use directly.
     STREAM_WRITE   StreamWrite;             // Pointer to stream write function for this archive. Do not use directly.
-    STREAM_RESIZE  StreamResize;            // Pointer to function changing file size
-    STREAM_GETSIZE StreamGetSize;           // Pointer to function returning file size
     STREAM_GETPOS  StreamGetPos;            // Pointer to function that returns current file position
+    STREAM_GETSIZE StreamGetSize;           // Pointer to function returning file size
+    STREAM_SETSIZE StreamSetSize;           // Pointer to function changing file size
+    STREAM_GETTIME StreamGetTime;           // Pointer to function retrieving the file time
+    STREAM_GETBMP  StreamGetBmp;            // Pointer to function that retrieves the file bitmap
+    STREAM_SWITCH  StreamSwitch;            // Pointer to function changing the stream to another file
     STREAM_CLOSE   StreamClose;             // Pointer to function closing the stream
 
-    // Block-oriented functions
-    BLOCK_READ     BlockRead;               // Pointer to function reading one or more blocks
-    BLOCK_CHECK    BlockCheck;              // Pointer to function checking whether the block is present
+    // Stream provider data members
+    TCHAR szFileName[MAX_PATH];             // File name
+    DWORD dwFlags;                          // Stream flags
 
     // Base provider functions
-    STREAM_CREATE  BaseCreate;              // Pointer to base create function
-    STREAM_OPEN    BaseOpen;                // Pointer to base open function
-    STREAM_READ    BaseRead;                // Read from the stream
-    STREAM_WRITE   BaseWrite;               // Write to the stream
-    STREAM_RESIZE  BaseResize;              // Pointer to function changing file size
-    STREAM_GETSIZE BaseGetSize;             // Pointer to function returning file size
+    STREAM_READ    BaseRead;
+    STREAM_WRITE   BaseWrite;
     STREAM_GETPOS  BaseGetPos;              // Pointer to function that returns current file position
+    STREAM_GETSIZE BaseGetSize;             // Pointer to function returning file size
+    STREAM_SETSIZE BaseSetSize;             // Pointer to function changing file size
+    STREAM_GETTIME BaseGetTime;             // Pointer to function retrieving the file time
     STREAM_CLOSE   BaseClose;               // Pointer to function closing the stream
 
-    // Base provider data (file size, file position)
-    TBaseProviderData Base;
-
-    // Stream provider data
-    TFileStream * pMaster;                  // Master stream (e.g. MPQ on a web server)
-    TCHAR * szFileName;                     // File name (self-relative pointer)
-
-    ULONGLONG StreamSize;                   // Stream size (can be less than file size)
-    ULONGLONG StreamPos;                    // Stream position
-    DWORD BuildNumber;                      // Game build number
-    DWORD dwFlags;                          // Stream flags
+    // Base provider data members
+    TBaseData Base;                         // Base provider data
 
     // Followed by stream provider data, with variable length
 };
 
 //-----------------------------------------------------------------------------
-// Structures for block-oriented stream
+// Structure for linear stream
 
-struct TBlockStream : public TFileStream
+struct TLinearStream : public TFileStream
 {
-    SFILE_DOWNLOAD_CALLBACK pfnCallback;    // Callback for downloading
-    void * FileBitmap;                      // Array of bits for file blocks
-    void * UserData;                        // User data to be passed to the download callback
-    DWORD BitmapSize;                       // Size of the file bitmap (in bytes)
-    DWORD BlockSize;                        // Size of one block, in bytes
-    DWORD BlockCount;                       // Number of data blocks in the file
-    DWORD IsComplete;                       // If nonzero, no blocks are missing
-    DWORD IsModified;                       // nonzero if the bitmap has been modified
-};        
+    TFileBitmap * pBitmap;                  // Pointer to the stream bitmap
+};
+
+//-----------------------------------------------------------------------------
+// Structure for partial stream
+
+struct TPartialStream : public TFileStream
+{
+    ULONGLONG VirtualSize;                  // Virtual size of the file
+    ULONGLONG VirtualPos;                   // Virtual position in the file
+    DWORD     BlockCount;                   // Number of file blocks. Used by partial file stream
+    DWORD     BlockSize;                    // Size of one block. Used by partial file stream
+
+    PPART_FILE_MAP_ENTRY PartMap;           // File map, variable length
+};
 
 //-----------------------------------------------------------------------------
 // Structure for encrypted stream
 
 #define MPQE_CHUNK_SIZE 0x40                // Size of one chunk to be decrypted
 
-struct TEncryptedStream : public TBlockStream
+struct TEncryptedStream : public TFileStream
 {
     BYTE Key[MPQE_CHUNK_SIZE];              // File key
 };
diff --git a/dep/StormLib/src/SBaseCommon.cpp b/dep/StormLib/src/SBaseCommon.cpp
index a3b2a383d..82a7f5d7e 100644
--- a/dep/StormLib/src/SBaseCommon.cpp
+++ b/dep/StormLib/src/SBaseCommon.cpp
@@ -15,93 +15,40 @@
 #include "StormLib.h"
 #include "StormCommon.h"
 
-char StormLibCopyright[] = "StormLib v " STORMLIB_VERSION_STRING " Copyright Ladislav Zezula 1998-2014";
+char StormLibCopyright[] = "StormLib v " STORMLIB_VERSION_STRING " Copyright Ladislav Zezula 1998-2012";
 
 //-----------------------------------------------------------------------------
-// Local variables
+// The buffer for decryption engine.
 
 LCID    lcFileLocale = LANG_NEUTRAL;            // File locale
 USHORT  wPlatform = 0;                          // File platform
 
 //-----------------------------------------------------------------------------
-// Conversion to uppercase/lowercase
-
-// Converts ASCII characters to lowercase
-// Converts slash (0x2F) to backslash (0x5C)
-unsigned char AsciiToLowerTable[256] = 
-{
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 
-    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x5C, 
-    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 
-    0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 
-    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 
-    0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 
-    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 
-    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 
-    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, 
-    0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 
-    0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 
-    0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 
-    0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 
-    0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-    0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
-};
-
-// Converts ASCII characters to uppercase
-// Converts slash (0x2F) to backslash (0x5C)
-unsigned char AsciiToUpperTable[256] = 
-{
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 
-    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x5C, 
-    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 
-    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 
-    0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 
-    0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 
-    0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 
-    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 
-    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, 
-    0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 
-    0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 
-    0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 
-    0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 
-    0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-    0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
-};
-
-// Converts ASCII characters to uppercase
-// Does NOT convert slash (0x2F) to backslash (0x5C)
-unsigned char AsciiToUpperTable_Slash[256] = 
-{
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 
-    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 
-    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 
-    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 
-    0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 
-    0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 
-    0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 
-    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 
-    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, 
-    0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 
-    0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 
-    0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 
-    0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 
-    0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-    0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
-};
-
-//-----------------------------------------------------------------------------
-// Storm hashing functions
+// Storm buffer functions
 
 #define STORM_BUFFER_SIZE       0x500
 
-#define HASH_INDEX_MASK(ha) (ha->pHeader->dwHashTableSize ? (ha->pHeader->dwHashTableSize - 1) : 0)
-
 static DWORD StormBuffer[STORM_BUFFER_SIZE];    // Buffer for the decryption engine
 static bool  bMpqCryptographyInitialized = false;
 
+DWORD HashString(const char * szFileName, DWORD dwHashType)
+{
+    LPBYTE pbKey   = (BYTE *)szFileName;
+    DWORD  dwSeed1 = 0x7FED7FED;
+    DWORD  dwSeed2 = 0xEEEEEEEE;
+    DWORD  ch;
+
+    while(*pbKey != 0)
+    {
+        ch = toupper(*pbKey++);
+
+        dwSeed1 = StormBuffer[dwHashType + ch] ^ (dwSeed1 + dwSeed2);
+        dwSeed2 = ch + dwSeed1 + dwSeed2 + (dwSeed2 << 5) + 3;
+    }
+
+    return dwSeed1;
+}
+
 void InitializeMpqCryptography()
 {
     DWORD dwSeed = 0x00100001;
@@ -134,89 +81,31 @@ void InitializeMpqCryptography()
         register_hash(&sha1_desc);
 
         // Use LibTomMath as support math library for LibTomCrypt
-        ltc_mp = ltm_desc;    
+        ltc_mp = ltm_desc;
 
         // Don't do that again
         bMpqCryptographyInitialized = true;
     }
 }
 
-DWORD HashString(const char * szFileName, DWORD dwHashType)
-{
-    LPBYTE pbKey   = (BYTE *)szFileName;
-    DWORD  dwSeed1 = 0x7FED7FED;
-    DWORD  dwSeed2 = 0xEEEEEEEE;
-    DWORD  ch;
-
-    while(*pbKey != 0)
-    {
-        // Convert the input character to uppercase
-        // Convert slash (0x2F) to backslash (0x5C)
-        ch = AsciiToUpperTable[*pbKey++];
-
-        dwSeed1 = StormBuffer[dwHashType + ch] ^ (dwSeed1 + dwSeed2);
-        dwSeed2 = ch + dwSeed1 + dwSeed2 + (dwSeed2 << 5) + 3;
-    }
-
-    return dwSeed1;
-}
-
-DWORD HashStringSlash(const char * szFileName, DWORD dwHashType)
-{
-    LPBYTE pbKey   = (BYTE *)szFileName;
-    DWORD  dwSeed1 = 0x7FED7FED;
-    DWORD  dwSeed2 = 0xEEEEEEEE;
-    DWORD  ch;
-
-    while(*pbKey != 0)
-    {
-        // Convert the input character to uppercase
-        // DON'T convert slash (0x2F) to backslash (0x5C)
-        ch = AsciiToUpperTable_Slash[*pbKey++];
-
-        dwSeed1 = StormBuffer[dwHashType + ch] ^ (dwSeed1 + dwSeed2);
-        dwSeed2 = ch + dwSeed1 + dwSeed2 + (dwSeed2 << 5) + 3;
-    }
-
-    return dwSeed1;
-}
-
-DWORD HashStringLower(const char * szFileName, DWORD dwHashType)
-{
-    LPBYTE pbKey   = (BYTE *)szFileName;
-    DWORD  dwSeed1 = 0x7FED7FED;
-    DWORD  dwSeed2 = 0xEEEEEEEE;
-    DWORD  ch;
-
-    while(*pbKey != 0)
-    {
-        // Convert the input character to lower
-        // DON'T convert slash (0x2F) to backslash (0x5C)
-        ch = AsciiToLowerTable[*pbKey++];
-
-        dwSeed1 = StormBuffer[dwHashType + ch] ^ (dwSeed1 + dwSeed2);
-        dwSeed2 = ch + dwSeed1 + dwSeed2 + (dwSeed2 << 5) + 3;
-    }
-
-    return dwSeed1;
-}
-
 //-----------------------------------------------------------------------------
 // Calculates the hash table size for a given amount of files
 
 DWORD GetHashTableSizeForFileCount(DWORD dwFileCount)
 {
-    DWORD dwPowerOfTwo = HASH_TABLE_SIZE_MIN;
-
-    // For zero files, there is no hash table needed
-    if(dwFileCount == 0)
-        return 0;
+    DWORD dwPowerOfTwo;
 
     // Round the hash table size up to the nearest power of two
+    for(dwPowerOfTwo = HASH_TABLE_SIZE_MIN; dwPowerOfTwo < HASH_TABLE_SIZE_MAX; dwPowerOfTwo <<= 1)
+    {
+        if(dwPowerOfTwo >= dwFileCount)
+        {
+            return dwPowerOfTwo;
+        }
+    }
+
     // Don't allow the hash table size go over allowed maximum
-    while(dwPowerOfTwo < HASH_TABLE_SIZE_MAX && dwPowerOfTwo < dwFileCount)
-        dwPowerOfTwo <<= 1;
-    return dwPowerOfTwo;
+    return HASH_TABLE_SIZE_MAX;
 }
 
 //-----------------------------------------------------------------------------
@@ -224,22 +113,31 @@ DWORD GetHashTableSizeForFileCount(DWORD dwFileCount)
 
 ULONGLONG HashStringJenkins(const char * szFileName)
 {
-    LPBYTE pbFileName = (LPBYTE)szFileName;
     char * szTemp;
     char szLocFileName[0x108];
+    char chOneChar;
     size_t nLength = 0;
     unsigned int primary_hash = 1;
     unsigned int secondary_hash = 2;
 
+    // This is required to produce defined results
+    assert(szFileName != NULL);
+
     // Normalize the file name - convert to uppercase, and convert "/" to "\\".
-    if(pbFileName != NULL)
+    if(szFileName != NULL)
     {
         szTemp = szLocFileName;
-        while(*pbFileName != 0)
-            *szTemp++ = (char)AsciiToLowerTable[*pbFileName++];
-        *szTemp = 0;
+        while(*szFileName != 0)
+        {
+            chOneChar = (char)tolower(*szFileName++);
+            if(chOneChar == '/')
+                chOneChar = '\\';
+
+            *szTemp++ = chOneChar;
+        }
 
         nLength = szTemp - szLocFileName;
+        *szTemp = 0;
     }
 
     // Thanks Quantam for finding out what the algorithm is.
@@ -251,13 +149,181 @@ ULONGLONG HashStringJenkins(const char * szFileName)
     return (ULONGLONG)primary_hash * (ULONGLONG)0x100000000ULL + (ULONGLONG)secondary_hash;
 }
 
+//-----------------------------------------------------------------------------
+// This function converts the MPQ header so it always looks like version 4
+
+int ConvertMpqHeaderToFormat4(
+        TMPQArchive * ha,
+        ULONGLONG FileSize,
+        DWORD dwFlags)
+{
+    ULONGLONG ByteOffset;
+    TMPQHeader * pHeader = ha->pHeader;
+    DWORD dwExpectedArchiveSize;
+    USHORT wFormatVersion = pHeader->wFormatVersion;
+    int nError = ERROR_SUCCESS;
+
+    // If version 1.0 is forced, then the format version is forced to be 1.0
+    // Reason: Storm.dll in Warcraft III ignores format version value
+    if(dwFlags & MPQ_OPEN_FORCE_MPQ_V1)
+        wFormatVersion = MPQ_FORMAT_VERSION_1;
+
+    // Format-specific fixes
+    switch(wFormatVersion)
+    {
+    case MPQ_FORMAT_VERSION_1:
+
+        // Check for malformed MPQ header version 1.0
+        if(pHeader->dwHeaderSize != MPQ_HEADER_SIZE_V1)
+        {
+            pHeader->dwHeaderSize = MPQ_HEADER_SIZE_V1;
+            ha->dwFlags |= MPQ_FLAG_PROTECTED;
+        }
+
+        //
+        // The value of "dwArchiveSize" member in the MPQ header
+        // is ignored by Storm.dll and can contain garbage value
+        // ("w3xmaster" protector).
+        //
+
+        dwExpectedArchiveSize = (DWORD)(FileSize - ha->MpqPos);
+        if(pHeader->dwArchiveSize != dwExpectedArchiveSize)
+        {
+            // Note: dwExpectedArchiveSize might be incorrect at this point.
+            // MPQs version 1.0 can have strong digital signature appended at the end,
+            // or they might just have arbitrary data there.
+            // In either case, we recalculate the archive size later when
+            // block table is loaded and positions of all files is known.
+            pHeader->dwArchiveSize = dwExpectedArchiveSize;
+            ha->dwFlags |= MPQ_FLAG_NEED_FIX_SIZE;
+        }
+
+        // Zero the fields in 2.0 part of the MPQ header
+        pHeader->HiBlockTablePos64 = 0;
+        pHeader->wHashTablePosHi = 0;
+        pHeader->wBlockTablePosHi = 0;
+        // No break here !!!
+
+    case MPQ_FORMAT_VERSION_2:
+    case MPQ_FORMAT_VERSION_3:
+
+        // In MPQ format 3.0, the entire header is optional
+        // and the size of the header can actually be identical
+        // to size of header 2.0
+        if(pHeader->dwHeaderSize < MPQ_HEADER_SIZE_V3)
+        {
+            ULONGLONG ArchiveSize64 = pHeader->dwArchiveSize;
+
+            // In format 2.0, the archive size is obsolete and is calculated
+            // as the highest offset of hash table, block table or hi-block table.
+            // However, we can still rely on it, if the size of the archive is under 4 GB
+            if((FileSize - ha->MpqPos) >> 32)
+            {
+                ByteOffset = MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos) + (pHeader->dwHashTableSize * sizeof(TMPQHash));
+                if(ByteOffset > ArchiveSize64)
+                    ArchiveSize64 = ByteOffset;
+
+                ByteOffset = MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos) + (pHeader->dwBlockTableSize * sizeof(TMPQBlock));
+                if(ByteOffset > ArchiveSize64)
+                    ArchiveSize64 = ByteOffset;
+
+                // Only if we actually have a hi-block table
+                if(pHeader->HiBlockTablePos64)
+                {
+                    ByteOffset = pHeader->HiBlockTablePos64 + (pHeader->dwBlockTableSize * sizeof(USHORT));
+                    if(ByteOffset > ArchiveSize64)
+                        ArchiveSize64 = ByteOffset;
+                }
+
+                // We need to recalculate archive size later,
+                // when block table is loaded and the position of files is known
+                ha->dwFlags |= MPQ_FLAG_NEED_FIX_SIZE;
+            }
+
+            // Initialize the rest of the 3.0 header
+            pHeader->ArchiveSize64 = ArchiveSize64;
+            pHeader->HetTablePos64 = 0;
+            pHeader->BetTablePos64 = 0;
+        }
+
+        //
+        // Calculate compressed size of each table. We assume the following order:
+        // 1) HET table
+        // 2) BET table
+        // 3) Classic hash table
+        // 4) Classic block table
+        // 5) Hi-block table
+        //
+
+        // Set all sizes to zero
+        pHeader->HetTableSize64 = 0;
+        pHeader->BetTableSize64 = 0;
+
+        // Either both HET and BET table exist or none of them does.
+        if(pHeader->HetTablePos64)
+        {
+            // Compressed size of the HET and BET tables
+            pHeader->HetTableSize64 = pHeader->BetTablePos64 - pHeader->HetTablePos64;
+            pHeader->BetTableSize64 = MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos) - pHeader->HetTablePos64;
+        }
+
+        // Compressed size of hash and block table
+        if(wFormatVersion >= MPQ_FORMAT_VERSION_2)
+        {
+            // Compressed size of the hash table
+            pHeader->HashTableSize64 = MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos) - MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos);
+
+            // Block and hi-block table
+            if(pHeader->HiBlockTablePos64)
+            {
+                pHeader->BlockTableSize64 = pHeader->HiBlockTablePos64 - MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
+                pHeader->HiBlockTableSize64 = pHeader->ArchiveSize64 - pHeader->HiBlockTablePos64;
+            }
+            else
+            {
+                pHeader->BlockTableSize64 = pHeader->ArchiveSize64 - MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
+                pHeader->HiBlockTableSize64 = 0;
+            }
+        }
+        else
+        {
+            // No known MPQ in format 1.0 has any of the tables compressed
+            pHeader->HashTableSize64 = pHeader->dwHashTableSize * sizeof(TMPQHash);
+            pHeader->BlockTableSize64 = pHeader->dwBlockTableSize * sizeof(TMPQBlock);
+            pHeader->HiBlockTableSize64 = 0;
+        }
+
+        // Set the data chunk size for MD5 to zero
+        pHeader->dwRawChunkSize = 0;
+
+        // Fill the MD5's
+        memset(pHeader->MD5_BlockTable,   0, MD5_DIGEST_SIZE);
+        memset(pHeader->MD5_HashTable,    0, MD5_DIGEST_SIZE);
+        memset(pHeader->MD5_HiBlockTable, 0, MD5_DIGEST_SIZE);
+        memset(pHeader->MD5_BetTable,     0, MD5_DIGEST_SIZE);
+        memset(pHeader->MD5_HetTable,     0, MD5_DIGEST_SIZE);
+        memset(pHeader->MD5_MpqHeader,    0, MD5_DIGEST_SIZE);
+        // No break here !!!!
+
+    case MPQ_FORMAT_VERSION_4:
+
+        // Verify header MD5. Header MD5 is calculated from the MPQ header since the 'MPQ\x1A'
+        // signature until the position of header MD5 at offset 0xC0
+        if(!VerifyDataBlockHash(ha->pHeader, MPQ_HEADER_SIZE_V4 - MD5_DIGEST_SIZE, ha->pHeader->MD5_MpqHeader))
+            nError = ERROR_FILE_CORRUPT;
+        break;
+    }
+
+    return nError;
+}
+
 //-----------------------------------------------------------------------------
 // Default flags for (attributes) and (listfile)
 
-DWORD GetDefaultSpecialFileFlags(DWORD dwFileSize, USHORT wFormatVersion)
+DWORD GetDefaultSpecialFileFlags(TMPQArchive * ha, DWORD dwFileSize)
 {
     // Fixed for format 1.0
-    if(wFormatVersion == MPQ_FORMAT_VERSION_1)
+    if(ha->pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1)
         return MPQ_FILE_COMPRESS | MPQ_FILE_ENCRYPTED | MPQ_FILE_FIX_KEY;
 
     // Size-dependent for formats 2.0-4.0
@@ -266,191 +332,186 @@ DWORD GetDefaultSpecialFileFlags(DWORD dwFileSize, USHORT wFormatVersion)
 
 
 //-----------------------------------------------------------------------------
-// Encrypting/Decrypting MPQ data block
+// Encrypting and decrypting MPQ file data
 
-void EncryptMpqBlock(void * pvDataBlock, DWORD dwLength, DWORD dwKey1)
+void EncryptMpqBlock(void * pvFileBlock, DWORD dwLength, DWORD dwSeed1)
 {
-    LPDWORD DataBlock = (LPDWORD)pvDataBlock;
-    DWORD dwValue32;
-    DWORD dwKey2 = 0xEEEEEEEE;
+    LPDWORD block = (LPDWORD)pvFileBlock;
+    DWORD dwSeed2 = 0xEEEEEEEE;
+    DWORD ch;
 
     // Round to DWORDs
     dwLength >>= 2;
 
-    // Encrypt the data block at array of DWORDs
-    for(DWORD i = 0; i < dwLength; i++)
+    while(dwLength-- > 0)
     {
-        // Modify the second key
-        dwKey2 += StormBuffer[MPQ_HASH_KEY2_MIX + (dwKey1 & 0xFF)];
+        dwSeed2 += StormBuffer[0x400 + (dwSeed1 & 0xFF)];
+        ch     = *block;
+        *block++ = ch ^ (dwSeed1 + dwSeed2);
 
-        dwValue32 = DataBlock[i];
-        DataBlock[i] = DataBlock[i] ^ (dwKey1 + dwKey2);
-
-        dwKey1 = ((~dwKey1 << 0x15) + 0x11111111) | (dwKey1 >> 0x0B);
-        dwKey2 = dwValue32 + dwKey2 + (dwKey2 << 5) + 3;
+        dwSeed1  = ((~dwSeed1 << 0x15) + 0x11111111) | (dwSeed1 >> 0x0B);
+        dwSeed2  = ch + dwSeed2 + (dwSeed2 << 5) + 3;
     }
 }
 
-void DecryptMpqBlock(void * pvDataBlock, DWORD dwLength, DWORD dwKey1)
+void DecryptMpqBlock(void * pvFileBlock, DWORD dwLength, DWORD dwSeed1)
 {
-    LPDWORD DataBlock = (LPDWORD)pvDataBlock;
-    DWORD dwValue32;
-    DWORD dwKey2 = 0xEEEEEEEE;
+    LPDWORD block = (LPDWORD)pvFileBlock;
+    DWORD dwSeed2 = 0xEEEEEEEE;
+    DWORD ch;
 
     // Round to DWORDs
     dwLength >>= 2;
 
-    // Decrypt the data block at array of DWORDs
-    for(DWORD i = 0; i < dwLength; i++)
+    while(dwLength-- > 0)
     {
-        // Modify the second key
-        dwKey2 += StormBuffer[MPQ_HASH_KEY2_MIX + (dwKey1 & 0xFF)];
-        
-        DataBlock[i] = DataBlock[i] ^ (dwKey1 + dwKey2);
-        dwValue32 = DataBlock[i];
+        dwSeed2 += StormBuffer[0x400 + (dwSeed1 & 0xFF)];
+        ch     = *block ^ (dwSeed1 + dwSeed2);
 
-        dwKey1 = ((~dwKey1 << 0x15) + 0x11111111) | (dwKey1 >> 0x0B);
-        dwKey2 = dwValue32 + dwKey2 + (dwKey2 << 5) + 3;
+        dwSeed1  = ((~dwSeed1 << 0x15) + 0x11111111) | (dwSeed1 >> 0x0B);
+        dwSeed2  = ch + dwSeed2 + (dwSeed2 << 5) + 3;
+        *block++ = ch;
     }
 }
 
+/*
+void EncryptMpqTable(void * pvMpqTable, DWORD dwLength, const char * szKey)
+{
+    EncryptMpqBlock(pvMpqTable, dwLength, HashString(szKey, MPQ_HASH_FILE_KEY));
+}
+
+void DecryptMpqTable(void * pvMpqTable, DWORD dwLength, const char * szKey)
+{
+    DecryptMpqBlock(pvMpqTable, dwLength, HashString(szKey, MPQ_HASH_FILE_KEY));
+}
+*/
+
 /**
- * Functions tries to get file decryption key. This comes from these facts
- *
- * - We know the decrypted value of the first DWORD in the encrypted data
- * - We know the decrypted value of the second DWORD (at least aproximately)
- * - There is only 256 variants of how the second key is modified
- *
- *  The first iteration of dwKey1 and dwKey2 is this:
- *
- *  dwKey2 = 0xEEEEEEEE + StormBuffer[MPQ_HASH_KEY2_MIX + (dwKey1 & 0xFF)]
- *  dwDecrypted0 = DataBlock[0] ^ (dwKey1 + dwKey2);
- *
- *  This means:
- *
- *  (dwKey1 + dwKey2) = DataBlock[0] ^ dwDecrypted0;
+ * Functions tries to get file decryption key. The trick comes from sector
+ * positions which are stored at the begin of each compressed file. We know the
+ * file size, that means we know number of sectors that means we know the first
+ * DWORD value in sector position. And if we know encrypted and decrypted value,
+ * we can find the decryption key !!!
  *
+ * hf            - MPQ file handle
+ * SectorOffsets - DWORD array of sector positions
+ * ch            - Decrypted value of the first sector pos
  */
 
-DWORD DetectFileKeyBySectorSize(LPDWORD EncryptedData, DWORD dwSectorSize, DWORD dwDecrypted0)
+DWORD DetectFileKeyBySectorSize(LPDWORD SectorOffsets, DWORD decrypted)
 {
-    DWORD dwDecrypted1Max = dwSectorSize + dwDecrypted0;
-    DWORD dwKey1PlusKey2;
-    DWORD DataBlock[2];
+    DWORD saveKey1;
+    DWORD temp = *SectorOffsets ^ decrypted;    // temp = seed1 + seed2
+    temp -= 0xEEEEEEEE;                 // temp = seed1 + StormBuffer[0x400 + (seed1 & 0xFF)]
 
-    // We must have at least 2 DWORDs there to be able to decrypt something
-    if(dwSectorSize < 0x08)
+    for(int i = 0; i < 0x100; i++)      // Try all 255 possibilities
+    {
+        DWORD seed1;
+        DWORD seed2 = 0xEEEEEEEE;
+        DWORD ch;
+
+        // Try the first DWORD (We exactly know the value)
+        seed1  = temp - StormBuffer[0x400 + i];
+        seed2 += StormBuffer[0x400 + (seed1 & 0xFF)];
+        ch     = SectorOffsets[0] ^ (seed1 + seed2);
+
+        if(ch != decrypted)
+            continue;
+
+        // Add 1 because we are decrypting sector positions
+        saveKey1 = seed1 + 1;
+
+        // If OK, continue and test the second value. We don't know exactly the value,
+        // but we know that the second one has lower 16 bits set to zero
+        // (no compressed sector is larger than 0xFFFF bytes)
+        seed1  = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
+        seed2  = ch + seed2 + (seed2 << 5) + 3;
+
+        seed2 += StormBuffer[0x400 + (seed1 & 0xFF)];
+        ch     = SectorOffsets[1] ^ (seed1 + seed2);
+
+        if((ch & 0xFFFF0000) == 0)
+            return saveKey1;
+    }
+    return 0;
+}
+
+// Function tries to detect file encryption key. It expectes at least two uncompressed bytes
+DWORD DetectFileKeyByKnownContent(void * pvFileContent, DWORD nDwords, ...)
+{
+    LPDWORD pdwContent = (LPDWORD)pvFileContent;
+    va_list argList;
+    DWORD dwDecrypted[0x10];
+    DWORD saveKey1;
+    DWORD dwTemp;
+    DWORD i, j;
+
+    // We need at least two DWORDS to detect the file key
+    if(nDwords < 0x02 || nDwords > 0x10)
         return 0;
 
-    // Get the value of the combined encryption key
-    dwKey1PlusKey2 = (EncryptedData[0] ^ dwDecrypted0) - 0xEEEEEEEE;
+    va_start(argList, nDwords);
+    for(i = 0; i < nDwords; i++)
+        dwDecrypted[i] = va_arg(argList, DWORD);
+    va_end(argList);
 
-    // Try all 256 combinations of dwKey1
-    for(DWORD i = 0; i < 0x100; i++)
+    dwTemp = (*pdwContent ^ dwDecrypted[0]) - 0xEEEEEEEE;
+    for(i = 0; i < 0x100; i++)      // Try all 256 possibilities
     {
-        DWORD dwSaveKey1;
-        DWORD dwKey1 = dwKey1PlusKey2 - StormBuffer[MPQ_HASH_KEY2_MIX + i];
-        DWORD dwKey2 = 0xEEEEEEEE;
+        DWORD seed1;
+        DWORD seed2 = 0xEEEEEEEE;
+        DWORD ch;
 
-        // Modify the second key and decrypt the first DWORD
-        dwKey2 += StormBuffer[MPQ_HASH_KEY2_MIX + (dwKey1 & 0xFF)];
-        DataBlock[0] = EncryptedData[0] ^ (dwKey1 + dwKey2);
+        // Try the first DWORD
+        seed1  = dwTemp - StormBuffer[0x400 + i];
+        seed2 += StormBuffer[0x400 + (seed1 & 0xFF)];
+        ch     = pdwContent[0] ^ (seed1 + seed2);
 
-        // Did we obtain the same value like dwDecrypted0?
-        if(DataBlock[0] == dwDecrypted0)
+        if(ch != dwDecrypted[0])
+            continue;
+
+        saveKey1 = seed1;
+
+        // If OK, continue and test all bytes.
+        for(j = 1; j < nDwords; j++)
         {
-            // Save this key value. Increment by one because
-            // we are decrypting sector offset table
-            dwSaveKey1 = dwKey1 + 1;
+            seed1  = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
+            seed2  = ch + seed2 + (seed2 << 5) + 3;
 
-            // Rotate both keys
-            dwKey1 = ((~dwKey1 << 0x15) + 0x11111111) | (dwKey1 >> 0x0B);
-            dwKey2 = DataBlock[0] + dwKey2 + (dwKey2 << 5) + 3;
+            seed2 += StormBuffer[0x400 + (seed1 & 0xFF)];
+            ch     = pdwContent[j] ^ (seed1 + seed2);
 
-            // Modify the second key again and decrypt the second DWORD
-            dwKey2 += StormBuffer[MPQ_HASH_KEY2_MIX + (dwKey1 & 0xFF)];
-            DataBlock[1] = EncryptedData[1] ^ (dwKey1 + dwKey2);
-
-            // Now compare the results
-            if(DataBlock[1] <= dwDecrypted1Max)
-                return dwSaveKey1;
+            if(ch == dwDecrypted[j] && j == nDwords - 1)
+                return saveKey1;
         }
     }
-
-    // Key not found
     return 0;
 }
 
-// Function tries to detect file encryption key based on expected file content
-// It is the same function like before, except that we know the value of the second DWORD
-DWORD DetectFileKeyByKnownContent(void * pvEncryptedData, DWORD dwDecrypted0, DWORD dwDecrypted1)
-{
-    LPDWORD EncryptedData = (LPDWORD)pvEncryptedData;
-    DWORD dwKey1PlusKey2;
-    DWORD DataBlock[2];
-
-    // Get the value of the combined encryption key
-    dwKey1PlusKey2 = (EncryptedData[0] ^ dwDecrypted0) - 0xEEEEEEEE;
-
-    // Try all 256 combinations of dwKey1
-    for(DWORD i = 0; i < 0x100; i++)
-    {
-        DWORD dwSaveKey1;
-        DWORD dwKey1 = dwKey1PlusKey2 - StormBuffer[MPQ_HASH_KEY2_MIX + i];
-        DWORD dwKey2 = 0xEEEEEEEE;
-
-        // Modify the second key and decrypt the first DWORD
-        dwKey2 += StormBuffer[MPQ_HASH_KEY2_MIX + (dwKey1 & 0xFF)];
-        DataBlock[0] = EncryptedData[0] ^ (dwKey1 + dwKey2);
-
-        // Did we obtain the same value like dwDecrypted0?
-        if(DataBlock[0] == dwDecrypted0)
-        {
-            // Save this key value
-            dwSaveKey1 = dwKey1;
-
-            // Rotate both keys
-            dwKey1 = ((~dwKey1 << 0x15) + 0x11111111) | (dwKey1 >> 0x0B);
-            dwKey2 = DataBlock[0] + dwKey2 + (dwKey2 << 5) + 3;
-
-            // Modify the second key again and decrypt the second DWORD
-            dwKey2 += StormBuffer[MPQ_HASH_KEY2_MIX + (dwKey1 & 0xFF)];
-            DataBlock[1] = EncryptedData[1] ^ (dwKey1 + dwKey2);
-
-            // Now compare the results
-            if(DataBlock[1] == dwDecrypted1)
-                return dwSaveKey1;
-        }
-    }
-
-    // Key not found
-    return 0;
-}
-
-DWORD DetectFileKeyByContent(void * pvEncryptedData, DWORD dwSectorSize, DWORD dwFileSize)
+DWORD DetectFileKeyByContent(void * pvFileContent, DWORD dwFileSize)
 {
     DWORD dwFileKey;
 
     // Try to break the file encryption key as if it was a WAVE file
-    if(dwSectorSize >= 0x0C)
+    if(dwFileSize >= 0x0C)
     {
-        dwFileKey = DetectFileKeyByKnownContent(pvEncryptedData, 0x46464952, dwFileSize - 8);
+        dwFileKey = DetectFileKeyByKnownContent(pvFileContent, 3, 0x46464952, dwFileSize - 8, 0x45564157);
         if(dwFileKey != 0)
             return dwFileKey;
     }
 
     // Try to break the encryption key as if it was an EXE file
-    if(dwSectorSize > 0x40)
+    if(dwFileSize > 0x40)
     {
-        dwFileKey = DetectFileKeyByKnownContent(pvEncryptedData, 0x00905A4D, 0x00000003);
+        dwFileKey = DetectFileKeyByKnownContent(pvFileContent, 2, 0x00905A4D, 0x00000003);
         if(dwFileKey != 0)
             return dwFileKey;
     }
 
     // Try to break the encryption key as if it was a XML file
-    if(dwSectorSize > 0x04)
+    if(dwFileSize > 0x04)
     {
-        dwFileKey = DetectFileKeyByKnownContent(pvEncryptedData, 0x6D783F3C, 0x6576206C);
+        dwFileKey = DetectFileKeyByKnownContent(pvFileContent, 2, 0x6D783F3C, 0x6576206C);
         if(dwFileKey != 0)
             return dwFileKey;
     }
@@ -460,16 +521,16 @@ DWORD DetectFileKeyByContent(void * pvEncryptedData, DWORD dwSectorSize, DWORD d
 }
 
 DWORD DecryptFileKey(
-    const char * szFileName,
-    ULONGLONG MpqPos,
-    DWORD dwFileSize,
-    DWORD dwFlags)
+        const char * szFileName,
+        ULONGLONG MpqPos,
+        DWORD dwFileSize,
+        DWORD dwFlags)
 {
     DWORD dwFileKey;
     DWORD dwMpqPos = (DWORD)MpqPos;
 
     // File key is calculated from plain name
-    szFileName = GetPlainFileName(szFileName);
+    szFileName = GetPlainFileNameA(szFileName);
     dwFileKey = HashString(szFileName, MPQ_HASH_FILE_KEY);
 
     // Fix the key, if needed
@@ -483,194 +544,160 @@ DWORD DecryptFileKey(
 //-----------------------------------------------------------------------------
 // Handle validation functions
 
-TMPQArchive * IsValidMpqHandle(HANDLE hMpq)
+bool IsValidMpqHandle(TMPQArchive * ha)
 {
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    
-    return (ha != NULL && ha->pHeader != NULL && ha->pHeader->dwID == ID_MPQ) ? ha : NULL;
+    if(ha == NULL)
+        return false;
+    if(ha->pHeader == NULL || ha->pHeader->dwID != ID_MPQ)
+        return false;
+
+    return (bool)(ha->pHeader->dwID == ID_MPQ);
 }
 
-TMPQFile * IsValidFileHandle(HANDLE hFile)
+bool IsValidFileHandle(TMPQFile * hf)
 {
-    TMPQFile * hf = (TMPQFile *)hFile;
+    if(hf == NULL)
+        return false;
 
-    // Must not be NULL
-    if(hf != NULL && hf->dwMagic == ID_MPQ_FILE)
-    {
-        // Local file handle?
-        if(hf->pStream != NULL)
-            return hf;
+    if(hf->dwMagic != ID_MPQ_FILE)
+        return false;
 
-        // Also verify the MPQ handle within the file handle
-        if(IsValidMpqHandle(hf->ha))
-            return hf;
-    }
+    if(hf->pStream != NULL)
+        return true;
 
-    return NULL;
+    return IsValidMpqHandle(hf->ha);
 }
 
 //-----------------------------------------------------------------------------
 // Hash table and block table manipulation
 
-// Attempts to search a free hash entry, or an entry whose names and locale matches
-TMPQHash * FindFreeHashEntry(TMPQArchive * ha, DWORD dwStartIndex, DWORD dwName1, DWORD dwName2, LCID lcLocale)
-{
-    TMPQHash * pDeletedEntry = NULL;            // If a deleted entry was found in the continuous hash range
-    TMPQHash * pFreeEntry = NULL;               // If a free entry was found in the continuous hash range
-    DWORD dwHashIndexMask = HASH_INDEX_MASK(ha);
-    DWORD dwIndex;
-
-    // Set the initial index
-    dwStartIndex = dwIndex = (dwStartIndex & dwHashIndexMask);
-
-    // Search the hash table and return the found entries in the following priority:
-    // 1) <MATCHING_ENTRY>
-    // 2) <DELETED-ENTRY>
-    // 3) <FREE-ENTRY>
-    // 4) NULL
-    for(;;)
-    {
-        TMPQHash * pHash = ha->pHashTable + dwIndex;
-
-        // If we found a matching entry, return that one
-        if(pHash->dwName1 == dwName1 && pHash->dwName2 == dwName2 && pHash->lcLocale == lcLocale)
-            return pHash;
-
-        // If we found a deleted entry, remember it but keep searching
-        if(pHash->dwBlockIndex == HASH_ENTRY_DELETED && pDeletedEntry == NULL)
-            pDeletedEntry = pHash;
-
-        // If we found a free entry, we need to stop searching
-        if(pHash->dwBlockIndex == HASH_ENTRY_FREE)
-        {
-            pFreeEntry = pHash;
-            break;
-        }
-
-        // Move to the next hash entry.
-        // If we reached the starting entry, it's failure.
-        dwIndex = (dwIndex + 1) & dwHashIndexMask;
-        if(dwIndex == dwStartIndex)
-            break;
-    }
-
-    // If we found a deleted entry, return that one preferentially
-    return (pDeletedEntry != NULL) ? pDeletedEntry : pFreeEntry;
-}
-
 // Retrieves the first hash entry for the given file.
 // Every locale version of a file has its own hash entry
 TMPQHash * GetFirstHashEntry(TMPQArchive * ha, const char * szFileName)
 {
-    DWORD dwHashIndexMask = HASH_INDEX_MASK(ha);
-    DWORD dwStartIndex = ha->pfnHashString(szFileName, MPQ_HASH_TABLE_INDEX);
-    DWORD dwName1 = ha->pfnHashString(szFileName, MPQ_HASH_NAME_A);
-    DWORD dwName2 = ha->pfnHashString(szFileName, MPQ_HASH_NAME_B);
-    DWORD dwIndex;
+    TMPQHash * pStartHash;                  // File hash entry (start)
+    TMPQHash * pHashEnd = ha->pHashTable + ha->pHeader->dwHashTableSize;
+    TMPQHash * pHash;                       // File hash entry (current)
+    DWORD dwHashTableSizeMask;
+    DWORD dwIndex = HashString(szFileName, MPQ_HASH_TABLE_INDEX);
+    DWORD dwName1 = HashString(szFileName, MPQ_HASH_NAME_A);
+    DWORD dwName2 = HashString(szFileName, MPQ_HASH_NAME_B);
 
-    // Set the initial index
-    dwStartIndex = dwIndex = (dwStartIndex & dwHashIndexMask);
+    // Get the first possible has entry that might be the one
+    dwHashTableSizeMask = ha->pHeader->dwHashTableSize ? (ha->pHeader->dwHashTableSize - 1) : 0;
+    pStartHash = pHash = ha->pHashTable + (dwIndex & dwHashTableSizeMask);
 
-    // Search the hash table
-    for(;;)
+    // There might be deleted entries in the hash table prior to our desired entry.
+    while(pHash->dwBlockIndex != HASH_ENTRY_FREE)
     {
-        TMPQHash * pHash = ha->pHashTable + dwIndex;
-
-        // If the entry matches, we found it.
+        // If the entry agrees, we found it.
         if(pHash->dwName1 == dwName1 && pHash->dwName2 == dwName2 && pHash->dwBlockIndex < ha->dwFileTableSize)
             return pHash;
 
-        // If that hash entry is a free entry, it means we haven't found the file
-        if(pHash->dwBlockIndex == HASH_ENTRY_FREE)
-            return NULL;
-
         // Move to the next hash entry. Stop searching
         // if we got reached the original hash entry
-        dwIndex = (dwIndex + 1) & dwHashIndexMask;
-        if(dwIndex == dwStartIndex)
-            return NULL;
+        if(++pHash >= pHashEnd)
+            pHash = ha->pHashTable;
+        if(pHash == pStartHash)
+            break;
     }
+
+    // The apropriate hash entry was not found
+    return NULL;
 }
 
-TMPQHash * GetNextHashEntry(TMPQArchive * ha, TMPQHash * pFirstHash, TMPQHash * pHash)
+TMPQHash * GetNextHashEntry(TMPQArchive * ha, TMPQHash * pFirstHash, TMPQHash * pPrevHash)
 {
-    DWORD dwHashIndexMask = HASH_INDEX_MASK(ha);
-    DWORD dwStartIndex = (DWORD)(pFirstHash - ha->pHashTable);
-    DWORD dwName1 = pHash->dwName1;
-    DWORD dwName2 = pHash->dwName2;
-    DWORD dwIndex = (DWORD)(pHash - ha->pHashTable);
+    TMPQHash * pHashEnd = ha->pHashTable + ha->pHeader->dwHashTableSize;
+    TMPQHash * pHash = pPrevHash;
+    DWORD dwName1 = pPrevHash->dwName1;
+    DWORD dwName2 = pPrevHash->dwName2;
 
-    // Now go for any next entry that follows the pHash,
+    // Now go for any next entry that follows the pPrevHash,
     // until either free hash entry was found, or the start entry was reached
     for(;;)
     {
         // Move to the next hash entry. Stop searching
         // if we got reached the original hash entry
-        dwIndex = (dwIndex + 1) & dwHashIndexMask;
-        if(dwIndex == dwStartIndex)
-            return NULL;
-        pHash = ha->pHashTable + dwIndex;
+        if(++pHash >= pHashEnd)
+            pHash = ha->pHashTable;
+        if(pHash == pFirstHash)
+            break;
 
-        // If the entry matches, we found it.
+        // If the entry is a free entry, stop search
+        if(pHash->dwBlockIndex == HASH_ENTRY_FREE)
+            break;
+
+        // If the entry is not free and the name agrees, we found it
         if(pHash->dwName1 == dwName1 && pHash->dwName2 == dwName2 && pHash->dwBlockIndex < ha->pHeader->dwBlockTableSize)
             return pHash;
-
-        // If that hash entry is a free entry, it means we haven't found the file
-        if(pHash->dwBlockIndex == HASH_ENTRY_FREE)
-            return NULL;
     }
+
+    // No next entry
+    return NULL;
 }
 
 // Allocates an entry in the hash table
-TMPQHash * AllocateHashEntry(
-    TMPQArchive * ha,
-    TFileEntry * pFileEntry)
+DWORD AllocateHashEntry(
+        TMPQArchive * ha,
+        TFileEntry * pFileEntry)
 {
-    TMPQHash * pHash;
-    DWORD dwStartIndex = ha->pfnHashString(pFileEntry->szFileName, MPQ_HASH_TABLE_INDEX);
-    DWORD dwName1 = ha->pfnHashString(pFileEntry->szFileName, MPQ_HASH_NAME_A);
-    DWORD dwName2 = ha->pfnHashString(pFileEntry->szFileName, MPQ_HASH_NAME_B);
+    TMPQHash * pStartHash;                  // File hash entry (start)
+    TMPQHash * pHashEnd = ha->pHashTable + ha->pHeader->dwHashTableSize;
+    TMPQHash * pHash;                       // File hash entry (current)
+    DWORD dwHashTableSizeMask;
+    DWORD dwIndex = HashString(pFileEntry->szFileName, MPQ_HASH_TABLE_INDEX);
+    DWORD dwName1 = HashString(pFileEntry->szFileName, MPQ_HASH_NAME_A);
+    DWORD dwName2 = HashString(pFileEntry->szFileName, MPQ_HASH_NAME_B);
 
-    // Attempt to find a free hash entry
-    pHash = FindFreeHashEntry(ha, dwStartIndex, dwName1, dwName2, pFileEntry->lcLocale);
-    if(pHash != NULL)
+    // Get the first possible has entry that might be the one
+    dwHashTableSizeMask = ha->pHeader->dwHashTableSize ? (ha->pHeader->dwHashTableSize - 1) : 0;
+    pStartHash = pHash = ha->pHashTable + (dwIndex & dwHashTableSizeMask);
+
+    // There might be deleted entries in the hash table prior to our desired entry.
+    while(pHash->dwBlockIndex < HASH_ENTRY_DELETED)
     {
-        // Fill the free hash entry
-        pHash->dwName1      = dwName1;
-        pHash->dwName2      = dwName2;
-        pHash->lcLocale     = pFileEntry->lcLocale;
-        pHash->wPlatform    = pFileEntry->wPlatform;
-        pHash->dwBlockIndex = (DWORD)(pFileEntry - ha->pFileTable);
+        // If there already is an existing entry, reuse it.
+        if(pHash->dwName1 == dwName1 && pHash->dwName2 == dwName2 && pHash->lcLocale == pFileEntry->lcLocale)
+            break;
 
-        // Fill the hash index in the file entry
-        pFileEntry->dwHashIndex = (DWORD)(pHash - ha->pHashTable);
+        // Move to the next hash entry.
+        // If we reached the starting entry, it's failure.
+        if(++pHash >= pHashEnd)
+            pHash = ha->pHashTable;
+        if(pHash == pStartHash)
+            return HASH_ENTRY_FREE;
     }
 
-    return pHash;
+    // Fill the free hash entry
+    pHash->dwName1      = dwName1;
+    pHash->dwName2      = dwName2;
+    pHash->lcLocale     = pFileEntry->lcLocale;
+    pHash->wPlatform    = pFileEntry->wPlatform;
+    pHash->dwBlockIndex = (DWORD)(pFileEntry - ha->pFileTable);
+
+    // Fill the hash index in the file entry
+    pFileEntry->dwHashIndex = (DWORD)(pHash - ha->pHashTable);
+    return pFileEntry->dwHashIndex;
 }
 
 // Finds a free space in the MPQ where to store next data
 // The free space begins beyond the file that is stored at the fuhrtest
-// position in the MPQ. (listfile), (attributes) and (signature) are ignored,
-// unless the MPQ is being flushed.
-ULONGLONG FindFreeMpqSpace(TMPQArchive * ha)
+// position in the MPQ.
+void FindFreeMpqSpace(TMPQArchive * ha, ULONGLONG * pFreeSpacePos)
 {
     TMPQHeader * pHeader = ha->pHeader;
     TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-    TFileEntry * pFileEntry;
+    TFileEntry * pFileEntry = ha->pFileTable;
     ULONGLONG FreeSpacePos = ha->pHeader->dwHeaderSize;
     DWORD dwChunkCount;
 
     // Parse the entire block table
     for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
     {
-        // Only take existing files with nonzero size
-        if((pFileEntry->dwFlags & MPQ_FILE_EXISTS) && (pFileEntry->dwCmpSize != 0))
+        // Only take existing files
+        if(pFileEntry->dwFlags & MPQ_FILE_EXISTS)
         {
-            // If we are not saving MPQ tables, ignore internal MPQ files
-            if((ha->dwFlags & MPQ_FLAG_SAVING_TABLES) == 0 && IsInternalMpqFileName(pFileEntry->szFileName))
-                continue;
-
             // If the end of the file is bigger than current MPQ table pos, update it
             if((pFileEntry->ByteOffset + pFileEntry->dwCmpSize) > FreeSpacePos)
             {
@@ -688,13 +715,14 @@ ULONGLONG FindFreeMpqSpace(TMPQArchive * ha)
     }
 
     // Give the free space position to the caller
-    return FreeSpacePos;
+    if(pFreeSpacePos != NULL)
+        *pFreeSpacePos = FreeSpacePos;
 }
 
 //-----------------------------------------------------------------------------
 // Common functions - MPQ File
 
-TMPQFile * CreateFileHandle(TMPQArchive * ha, TFileEntry * pFileEntry)
+TMPQFile * CreateMpqFile(TMPQArchive * ha)
 {
     TMPQFile * hf;
 
@@ -704,23 +732,9 @@ TMPQFile * CreateFileHandle(TMPQArchive * ha, TFileEntry * pFileEntry)
     {
         // Fill the file structure
         memset(hf, 0, sizeof(TMPQFile));
-        hf->dwMagic = ID_MPQ_FILE;
-        hf->pStream = NULL;
         hf->ha = ha;
-
-        // If the called entered a file entry, we also copy informations from the file entry
-        if(ha != NULL && pFileEntry != NULL)
-        {
-            // Set the raw position and MPQ position
-            hf->RawFilePos = ha->MpqPos + pFileEntry->ByteOffset;
-            if(ha->pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1)
-                hf->RawFilePos = (DWORD)ha->MpqPos + (DWORD)pFileEntry->ByteOffset;
-            hf->MpqFilePos = pFileEntry->ByteOffset;
-
-            // Set the data size
-            hf->dwDataSize = pFileEntry->dwFileSize;
-            hf->pFileEntry = pFileEntry;
-        }
+        hf->pStream = NULL;
+        hf->dwMagic = ID_MPQ_FILE;
     }
 
     return hf;
@@ -728,117 +742,88 @@ TMPQFile * CreateFileHandle(TMPQArchive * ha, TFileEntry * pFileEntry)
 
 // Loads a table from MPQ.
 // Can be used for hash table, block table, sector offset table or sector checksum table
-void * LoadMpqTable(
-    TMPQArchive * ha,
-    ULONGLONG ByteOffset,
-    DWORD dwCompressedSize,
-    DWORD dwTableSize,
-    DWORD dwKey)
+int LoadMpqTable(
+        TMPQArchive * ha,
+        ULONGLONG ByteOffset,
+        void * pvTable,
+        DWORD dwCompressedSize,
+        DWORD dwRealSize,
+        DWORD dwKey)
 {
     LPBYTE pbCompressed = NULL;
-    LPBYTE pbMpqTable;
-    LPBYTE pbToRead;
-    DWORD dwBytesToRead = dwCompressedSize;
+    LPBYTE pbToRead = (LPBYTE)pvTable;
     int nError = ERROR_SUCCESS;
 
-    // Allocate the MPQ table
-    pbMpqTable = pbToRead = STORM_ALLOC(BYTE, dwTableSize);
-    if(pbMpqTable != NULL)
+    // "interface.MPQ.part" in trial version of World of Warcraft
+    // has block table and hash table compressed.
+    if(dwCompressedSize < dwRealSize)
     {
-        // Check if the MPQ table is encrypted
-        if(dwCompressedSize < dwTableSize)
-        {
-            // Allocate temporary buffer for holding compressed data
-            pbCompressed = pbToRead = STORM_ALLOC(BYTE, dwCompressedSize);
-            if(pbCompressed == NULL)
-            {
-                STORM_FREE(pbMpqTable);
-                return NULL;
-            }
-        }
+        // Allocate temporary buffer for holding compressed data
+        pbCompressed = STORM_ALLOC(BYTE, dwCompressedSize);
+        if(pbCompressed == NULL)
+            return ERROR_NOT_ENOUGH_MEMORY;
 
-        // On archives v 1.0, Storm.dll does not actually check
-        // if the hash table was read entirely. Abused by Spazzler map protector
-        // which sets hash table size to 0x00100000
-        if(ha->pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1 && (ha->dwFlags & MPQ_FLAG_MALFORMED))
-        {
-            ULONGLONG FileSize = 0;
-
-            // Cut the table size
-            FileStream_GetSize(ha->pStream, &FileSize);
-            if((ByteOffset + dwBytesToRead) > FileSize)
-            {
-                dwBytesToRead = (DWORD)(FileSize - ByteOffset);
-                memset(pbMpqTable + dwBytesToRead, 0, (dwTableSize - dwBytesToRead));
-            }
-        }
-
-        // If everything succeeded, read the raw table form the MPQ
-        if(FileStream_Read(ha->pStream, &ByteOffset, pbToRead, dwBytesToRead))
-        {
-            // First of all, decrypt the table
-            if(dwKey != 0)
-            {
-                BSWAP_ARRAY32_UNSIGNED(pbToRead, dwCompressedSize);
-                DecryptMpqBlock(pbToRead, dwCompressedSize, dwKey);
-                BSWAP_ARRAY32_UNSIGNED(pbToRead, dwCompressedSize);
-            }
-
-            // If the table is compressed, decompress it
-            if(dwCompressedSize < dwTableSize)
-            {
-                int cbOutBuffer = (int)dwTableSize;
-                int cbInBuffer = (int)dwCompressedSize;
-
-                if(!SCompDecompress2(pbMpqTable, &cbOutBuffer, pbCompressed, cbInBuffer))
-                    nError = GetLastError();
-            }
-
-            // Make sure that the table is properly byte-swapped
-            BSWAP_ARRAY32_UNSIGNED(pbMpqTable, dwTableSize);
-        }
-        else
-        {
-            nError = GetLastError();
-        }
-
-        // If read failed, free the table and return
-        if(nError != ERROR_SUCCESS)
-        {
-            STORM_FREE(pbMpqTable);
-            pbMpqTable = NULL;
-        }
-
-        // Free the compression buffer, if any
-        if(pbCompressed != NULL)
-            STORM_FREE(pbCompressed);
+        // Assign the temporary buffer as target for read operation
+        pbToRead = pbCompressed;
     }
 
-    // Return the MPQ table
-    return pbMpqTable;
+    // Read the table
+    if(FileStream_Read(ha->pStream, &ByteOffset, pbToRead, dwCompressedSize))
+    {
+        // First of all, decrypt the table
+        if(dwKey != 0)
+        {
+            BSWAP_ARRAY32_UNSIGNED(pbToRead, dwCompressedSize);
+            DecryptMpqBlock(pbToRead, dwCompressedSize, dwKey);
+            BSWAP_ARRAY32_UNSIGNED(pbToRead, dwCompressedSize);
+        }
+
+        // If the table is compressed, decompress it
+        if(dwCompressedSize < dwRealSize)
+        {
+            int cbOutBuffer = (int)dwRealSize;
+            int cbInBuffer = (int)dwCompressedSize;
+
+            if(!SCompDecompress2((char *)pvTable, &cbOutBuffer, (char *)pbCompressed, cbInBuffer))
+                nError = GetLastError();
+
+            // Free the temporary buffer
+            STORM_FREE(pbCompressed);
+        }
+    }
+    else
+    {
+        nError = GetLastError();
+    }
+
+    BSWAP_ARRAY32_UNSIGNED(pvTable, dwRealSize);
+    return nError;
 }
 
 void CalculateRawSectorOffset(
-    ULONGLONG & RawFilePos, 
-    TMPQFile * hf,
-    DWORD dwSectorOffset)
+        ULONGLONG & RawFilePos,
+        TMPQFile * hf,
+        DWORD dwSectorOffset)
 {
-    // Must be used for files within a MPQ
-    assert(hf->ha != NULL);
-    assert(hf->ha->pHeader != NULL);
-    
     //
     // Some MPQ protectors place the sector offset table after the actual file data.
     // Sector offsets in the sector offset table are negative. When added
     // to MPQ file offset from the block table entry, the result is a correct
     // position of the file data in the MPQ.
     //
-    // For MPQs version 1.0, the offset is purely 32-bit
+    // The position of sector table must be always within the MPQ, however.
+    // When a negative sector offset is found, we make sure that we make the addition
+    // just in 32-bits, and then add the MPQ offset.
     //
 
-    RawFilePos = hf->RawFilePos + dwSectorOffset;
-    if(hf->ha->pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1)
-        RawFilePos = (DWORD)hf->ha->MpqPos + (DWORD)hf->pFileEntry->ByteOffset + dwSectorOffset;
+    if(dwSectorOffset & 0x80000000)
+    {
+        RawFilePos = hf->ha->MpqPos + ((DWORD)hf->pFileEntry->ByteOffset + dwSectorOffset);
+    }
+    else
+    {
+        RawFilePos = hf->RawFilePos + dwSectorOffset;
+    }
 
     // We also have to add patch header size, if patch header is present
     if(hf->pPatchInfo != NULL)
@@ -846,9 +831,9 @@ void CalculateRawSectorOffset(
 }
 
 unsigned char * AllocateMd5Buffer(
-    DWORD dwRawDataSize,
-    DWORD dwChunkSize,
-    LPDWORD pcbMd5Size)
+        DWORD dwRawDataSize,
+        DWORD dwChunkSize,
+        LPDWORD pcbMd5Size)
 {
     unsigned char * md5_array;
     DWORD cbMd5Size;
@@ -906,7 +891,7 @@ __AllocateAndLoadPatchInfo:
 
     // Allocate space for patch header. Start with default size,
     // and if its size if bigger, then we reload them
-    hf->pPatchInfo = STORM_ALLOC(TPatchInfo, 1);
+    hf->pPatchInfo = (TPatchInfo *)STORM_ALLOC(BYTE, dwLength);
     if(hf->pPatchInfo == NULL)
         return ERROR_NOT_ENOUGH_MEMORY;
 
@@ -983,7 +968,7 @@ int AllocateSectorOffsets(TMPQFile * hf, bool bLoadFromFile)
 
     // Calculate the number of file sectors
     dwSectorOffsLen = (hf->dwSectorCount + 1) * sizeof(DWORD);
-    
+
     // If MPQ_FILE_SECTOR_CRC flag is set, there will either be extra DWORD
     // or an array of MD5's. Either way, we read at least 4 bytes more
     // in order to save additional read from the file.
@@ -991,12 +976,12 @@ int AllocateSectorOffsets(TMPQFile * hf, bool bLoadFromFile)
         dwSectorOffsLen += sizeof(DWORD);
 
     // Only allocate and load the table if the file is compressed
-    if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS_MASK)
+    if(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED)
     {
-        __LoadSectorOffsets:
+__LoadSectorOffsets:
 
         // Allocate the sector offset table
-        hf->SectorOffsets = STORM_ALLOC(DWORD, (dwSectorOffsLen / sizeof(DWORD)));
+        hf->SectorOffsets = (DWORD *)STORM_ALLOC(BYTE, dwSectorOffsLen);
         if(hf->SectorOffsets == NULL)
             return ERROR_NOT_ENOUGH_MEMORY;
 
@@ -1026,7 +1011,7 @@ int AllocateSectorOffsets(TMPQFile * hf, bool bLoadFromFile)
                 // If we don't know the file key, try to find it.
                 if(hf->dwFileKey == 0)
                 {
-                    hf->dwFileKey = DetectFileKeyBySectorSize(hf->SectorOffsets, ha->dwSectorSize, dwSectorOffsLen);
+                    hf->dwFileKey = DetectFileKeyBySectorSize(hf->SectorOffsets, dwSectorOffsLen);
                     if(hf->dwFileKey == 0)
                     {
                         STORM_FREE(hf->SectorOffsets);
@@ -1059,13 +1044,11 @@ int AllocateSectorOffsets(TMPQFile * hf, bool bLoadFromFile)
                 }
 
                 // The sector size must not be bigger than compressed file size
-                // Edit: Yes, but apparently, in original Storm.dll, the compressed
-                // size is not checked anywhere
-//              if((dwSectorOffset1 - dwSectorOffset0) > pFileEntry->dwCmpSize)
-//              {
-//                  bSectorOffsetTableCorrupt = true;
-//                  break;
-//              }
+                if((dwSectorOffset1 - dwSectorOffset0) > pFileEntry->dwCmpSize)
+                {
+                    bSectorOffsetTableCorrupt = true;
+                    break;
+                }
             }
 
             // If data corruption detected, free the sector offset table
@@ -1083,7 +1066,7 @@ int AllocateSectorOffsets(TMPQFile * hf, bool bLoadFromFile)
             //
             // These extra values are, however, include in the dwCmpSize in the file
             // table. We cannot ignore them, because compacting archive would fail
-            // 
+            //
 
             if(hf->SectorOffsets[0] > dwSectorOffsLen)
             {
@@ -1126,7 +1109,7 @@ int AllocateSectorChecksums(TMPQFile * hf, bool bLoadFromFile)
     // Caller must ensure that we are only called when we have sector checksums
     assert(pFileEntry->dwFlags & MPQ_FILE_SECTOR_CRC);
 
-    // 
+    //
     // Older MPQs store an array of CRC32's after
     // the raw file data in the MPQ.
     //
@@ -1139,44 +1122,39 @@ int AllocateSectorChecksums(TMPQFile * hf, bool bLoadFromFile)
 
     // Does the size of the file table match with the CRC32-based checksums?
     dwExpectedSize = (hf->dwSectorCount + 2) * sizeof(DWORD);
-    if(hf->SectorOffsets[0] != 0 && hf->SectorOffsets[0] == dwExpectedSize)
+    if(hf->SectorOffsets[0] == dwExpectedSize)
     {
-        // If we are not loading from the MPQ file, we just allocate the sector table
-        // In that case, do not check any sizes
+        // Is there valid size of the sector checksums?
+        if(hf->SectorOffsets[hf->dwSectorCount + 1] >= hf->SectorOffsets[hf->dwSectorCount])
+            dwCompressedSize = hf->SectorOffsets[hf->dwSectorCount + 1] - hf->SectorOffsets[hf->dwSectorCount];
+
+        // Ignore cases when the length is too small or too big.
+        if(dwCompressedSize < sizeof(DWORD) || dwCompressedSize > hf->dwSectorSize)
+            return ERROR_SUCCESS;
+
+        // Allocate the array for the sector checksums
+        hf->SectorChksums = STORM_ALLOC(DWORD, hf->dwSectorCount);
+        if(hf->SectorChksums == NULL)
+            return ERROR_NOT_ENOUGH_MEMORY;
+
+        // If we are not supposed to load it from the file, allocate empty buffer
         if(bLoadFromFile == false)
         {
-            hf->SectorChksums = STORM_ALLOC(DWORD, hf->dwSectorCount);
-            if(hf->SectorChksums == NULL)
-                return ERROR_NOT_ENOUGH_MEMORY;
-
-            // Fill the checksum table with zeros
             memset(hf->SectorChksums, 0, hf->dwSectorCount * sizeof(DWORD));
             return ERROR_SUCCESS;
         }
-        else
-        {
-            // Is there valid size of the sector checksums?
-            if(hf->SectorOffsets[hf->dwSectorCount + 1] >= hf->SectorOffsets[hf->dwSectorCount])
-                dwCompressedSize = hf->SectorOffsets[hf->dwSectorCount + 1] - hf->SectorOffsets[hf->dwSectorCount];
 
-            // Ignore cases when the length is too small or too big.
-            if(dwCompressedSize < sizeof(DWORD) || dwCompressedSize > hf->dwSectorSize)
-                return ERROR_SUCCESS;
+        // Calculate offset of the CRC table
+        dwCrcSize = hf->dwSectorCount * sizeof(DWORD);
+        dwCrcOffset = hf->SectorOffsets[hf->dwSectorCount];
+        CalculateRawSectorOffset(RawFilePos, hf, dwCrcOffset);
 
-            // Calculate offset of the CRC table
-            dwCrcSize = hf->dwSectorCount * sizeof(DWORD);
-            dwCrcOffset = hf->SectorOffsets[hf->dwSectorCount];
-            CalculateRawSectorOffset(RawFilePos, hf, dwCrcOffset); 
-
-            // Now read the table from the MPQ
-            hf->SectorChksums = (DWORD *)LoadMpqTable(ha, RawFilePos, dwCompressedSize, dwCrcSize, 0);
-            if(hf->SectorChksums == NULL)
-                return ERROR_NOT_ENOUGH_MEMORY;
-        }
+        // Now read the table from the MPQ
+        return LoadMpqTable(ha, RawFilePos, hf->SectorChksums, dwCompressedSize, dwCrcSize, 0);
     }
 
     // If the size doesn't match, we ignore sector checksums
-//  assert(false);
+    //  assert(false);
     return ERROR_SUCCESS;
 }
 
@@ -1206,7 +1184,7 @@ int WriteSectorOffsets(TMPQFile * hf)
 
     // The caller must make sure that this function is only called
     // when the following is true.
-    assert(hf->pFileEntry->dwFlags & MPQ_FILE_COMPRESS_MASK);
+    assert(hf->pFileEntry->dwFlags & MPQ_FILE_COMPRESSED);
     assert(hf->SectorOffsets != NULL);
     dwSectorOffsLen = hf->SectorOffsets[0];
 
@@ -1222,10 +1200,10 @@ int WriteSectorOffsets(TMPQFile * hf)
     // Write sector offsets to the archive
     if(!FileStream_Write(ha->pStream, &RawFilePos, hf->SectorOffsets, dwSectorOffsLen))
         return GetLastError();
-    
+
     // Not necessary, as the sector checksums
     // are going to be freed when this is done.
-//  BSWAP_ARRAY32_UNSIGNED(hf->SectorOffsets, dwSectorOffsLen);
+    //  BSWAP_ARRAY32_UNSIGNED(hf->SectorOffsets, dwSectorOffsLen);
     return ERROR_SUCCESS;
 }
 
@@ -1267,7 +1245,7 @@ int WriteSectorChecksums(TMPQFile * hf)
     BSWAP_ARRAY32_UNSIGNED(hf->SectorChksums, dwCrcSize);
 
     nOutSize = (int)dwCrcSize;
-    SCompCompress(pbCompressed, &nOutSize, hf->SectorChksums, (int)dwCrcSize, MPQ_COMPRESSION_ZLIB, 0, 0);
+    SCompCompress((char *)pbCompressed, &nOutSize, (char *)hf->SectorChksums, (int)dwCrcSize, MPQ_COMPRESSION_ZLIB, 0, 0);
     dwCompressedSize = (DWORD)nOutSize;
 
     // Write the sector CRCs to the archive
@@ -1279,9 +1257,9 @@ int WriteSectorChecksums(TMPQFile * hf)
 
     // Not necessary, as the sector checksums
     // are going to be freed when this is done.
-//  BSWAP_ARRAY32_UNSIGNED(hf->SectorChksums, dwCrcSize);
+    //  BSWAP_ARRAY32_UNSIGNED(hf->SectorChksums, dwCrcSize);
 
-    // Store the sector CRCs 
+    // Store the sector CRCs
     hf->SectorOffsets[hf->dwSectorCount + 1] = hf->SectorOffsets[hf->dwSectorCount] + dwCompressedSize;
     pFileEntry->dwCmpSize += dwCompressedSize;
     STORM_FREE(pbCompressed);
@@ -1289,12 +1267,12 @@ int WriteSectorChecksums(TMPQFile * hf)
 }
 
 int WriteMemDataMD5(
-    TFileStream * pStream,
-    ULONGLONG RawDataOffs,
-    void * pvRawData,
-    DWORD dwRawDataSize,
-    DWORD dwChunkSize,
-    LPDWORD pcbTotalSize)
+        TFileStream * pStream,
+        ULONGLONG RawDataOffs,
+        void * pvRawData,
+        DWORD dwRawDataSize,
+        DWORD dwChunkSize,
+        LPDWORD pcbTotalSize)
 {
     unsigned char * md5_array;
     unsigned char * md5;
@@ -1340,10 +1318,10 @@ int WriteMemDataMD5(
 
 // Writes the MD5 for each chunk of the raw file data
 int WriteMpqDataMD5(
-    TFileStream * pStream,
-    ULONGLONG RawDataOffs,
-    DWORD dwRawDataSize,
-    DWORD dwChunkSize)
+        TFileStream * pStream,
+        ULONGLONG RawDataOffs,
+        DWORD dwRawDataSize,
+        DWORD dwChunkSize)
 {
     unsigned char * md5_array;
     unsigned char * md5;
@@ -1401,19 +1379,19 @@ int WriteMpqDataMD5(
 }
 
 // Frees the structure for MPQ file
-void FreeFileHandle(TMPQFile *& hf)
+void FreeMPQFile(TMPQFile *& hf)
 {
     if(hf != NULL)
     {
         // If we have patch file attached to this one, free it first
-        if(hf->hfPatch != NULL)
-            FreeFileHandle(hf->hfPatch);
+        if(hf->hfPatchFile != NULL)
+            FreeMPQFile(hf->hfPatchFile);
 
         // Then free all buffers allocated in the file structure
-        if(hf->pbFileData != NULL)
-            STORM_FREE(hf->pbFileData);
         if(hf->pPatchHeader != NULL)
             STORM_FREE(hf->pPatchHeader);
+        if(hf->pbFileData != NULL)
+            STORM_FREE(hf->pbFileData);
         if(hf->pPatchInfo != NULL)
             STORM_FREE(hf->pPatchInfo);
         if(hf->SectorOffsets != NULL)
@@ -1422,25 +1400,20 @@ void FreeFileHandle(TMPQFile *& hf)
             STORM_FREE(hf->SectorChksums);
         if(hf->pbFileSector != NULL)
             STORM_FREE(hf->pbFileSector);
-        if(hf->pStream != NULL)
-            FileStream_Close(hf->pStream);
+        FileStream_Close(hf->pStream);
         STORM_FREE(hf);
         hf = NULL;
     }
 }
 
 // Frees the MPQ archive
-void FreeArchiveHandle(TMPQArchive *& ha)
+void FreeMPQArchive(TMPQArchive *& ha)
 {
     if(ha != NULL)
     {
         // First of all, free the patch archive, if any
         if(ha->haPatch != NULL)
-            FreeArchiveHandle(ha->haPatch);
-
-        // Free the patch prefix, if any
-        if(ha->pPatchPrefix != NULL)
-            STORM_FREE(ha->pPatchPrefix);
+            FreeMPQArchive(ha->haPatch);
 
         // Close the file stream
         FileStream_Close(ha->pStream);
@@ -1460,6 +1433,8 @@ void FreeArchiveHandle(TMPQArchive *& ha)
             STORM_FREE(ha->pFileTable);
         }
 
+        if(ha->pBitmap != NULL)
+            STORM_FREE(ha->pBitmap);
         if(ha->pHashTable != NULL)
             STORM_FREE(ha->pHashTable);
         if(ha->pHetTable != NULL)
@@ -1469,13 +1444,41 @@ void FreeArchiveHandle(TMPQArchive *& ha)
     }
 }
 
+const char * GetPlainFileNameA(const char * szFileName)
+{
+    const char * szPlainName = szFileName;
+
+    while(*szFileName != 0)
+    {
+        if(*szFileName == '\\' || *szFileName == '/')
+            szPlainName = szFileName + 1;
+        szFileName++;
+    }
+
+    return szPlainName;
+}
+
+const TCHAR * GetPlainFileNameT(const TCHAR * szFileName)
+{
+    const TCHAR * szPlainName = szFileName;
+
+    while(*szFileName != 0)
+    {
+        if(*szFileName == '\\' || *szFileName == '/')
+            szPlainName = szFileName + 1;
+        szFileName++;
+    }
+
+    return szPlainName;
+}
+
 bool IsInternalMpqFileName(const char * szFileName)
 {
     if(szFileName != NULL && szFileName[0] == '(')
     {
         if(!_stricmp(szFileName, LISTFILE_NAME) ||
-           !_stricmp(szFileName, ATTRIBUTES_NAME) ||
-           !_stricmp(szFileName, SIGNATURE_NAME))
+                !_stricmp(szFileName, ATTRIBUTES_NAME) ||
+                !_stricmp(szFileName, SIGNATURE_NAME))
         {
             return true;
         }
@@ -1521,9 +1524,12 @@ bool IsPseudoFileName(const char * szFileName, DWORD * pdwFileIndex)
 
 bool IsValidMD5(LPBYTE pbMd5)
 {
-    LPDWORD Md5 = (LPDWORD)pbMd5;
+    BYTE BitSummary = 0;
 
-    return (Md5[0] | Md5[1] | Md5[2] | Md5[3]) ? true : false;
+    // The MD5 is considered invalid of it is zeroed
+    BitSummary |= pbMd5[0x00] | pbMd5[0x01] | pbMd5[0x02] | pbMd5[0x03] | pbMd5[0x04] | pbMd5[0x05] | pbMd5[0x06] | pbMd5[0x07];
+    BitSummary |= pbMd5[0x08] | pbMd5[0x09] | pbMd5[0x0A] | pbMd5[0x0B] | pbMd5[0x0C] | pbMd5[0x0D] | pbMd5[0x0E] | pbMd5[0x0F];
+    return (BitSummary != 0);
 }
 
 bool VerifyDataBlockHash(void * pvDataBlock, DWORD cbDataBlock, LPBYTE expected_md5)
@@ -1567,37 +1573,37 @@ void CalculateDataBlockHash(void * pvDataBlock, DWORD cbDataBlock, LPBYTE md5_ha
 // Swaps a signed 16-bit integer
 int16_t SwapInt16(uint16_t data)
 {
-	return (int16_t)CFSwapInt16(data);
+    return (int16_t)CFSwapInt16(data);
 }
 
 // Swaps an unsigned 16-bit integer
 uint16_t SwapUInt16(uint16_t data)
 {
-	return CFSwapInt16(data);
+    return CFSwapInt16(data);
 }
 
 // Swaps signed 32-bit integer
 int32_t SwapInt32(uint32_t data)
 {
-	return (int32_t)CFSwapInt32(data);
+    return (int32_t)CFSwapInt32(data);
 }
 
 // Swaps an unsigned 32-bit integer
 uint32_t SwapUInt32(uint32_t data)
 {
-	return CFSwapInt32(data);
+    return CFSwapInt32(data);
 }
 
 // Swaps signed 64-bit integer
 int64_t SwapInt64(int64_t data)
 {
-       return (int64_t)CFSwapInt64(data);
+    return (int64_t)CFSwapInt64(data);
 }
 
 // Swaps an unsigned 64-bit integer
 uint64_t SwapUInt64(uint64_t data)
 {
-       return CFSwapInt64(data);
+    return CFSwapInt64(data);
 }
 
 // Swaps array of unsigned 16-bit integers
@@ -1607,10 +1613,10 @@ void ConvertUInt16Buffer(void * ptr, size_t length)
     uint32_t nElements = (uint32_t)(length / sizeof(uint16_t));
 
     while(nElements-- > 0)
-	{
-		*buffer = SwapUInt16(*buffer);
-		buffer++;
-	}
+    {
+        *buffer = SwapUInt16(*buffer);
+        buffer++;
+    }
 }
 
 // Swaps array of unsigned 32-bit integers
@@ -1619,11 +1625,11 @@ void ConvertUInt32Buffer(void * ptr, size_t length)
     uint32_t * buffer = (uint32_t *)ptr;
     uint32_t nElements = (uint32_t)(length / sizeof(uint32_t));
 
-	while(nElements-- > 0)
-	{
-		*buffer = SwapUInt32(*buffer);
-		buffer++;
-	}
+    while(nElements-- > 0)
+    {
+        *buffer = SwapUInt32(*buffer);
+        buffer++;
+    }
 }
 
 // Swaps array of unsigned 64-bit integers
@@ -1632,53 +1638,62 @@ void ConvertUInt64Buffer(void * ptr, size_t length)
     uint64_t * buffer = (uint64_t *)ptr;
     uint32_t nElements = (uint32_t)(length / sizeof(uint64_t));
 
-	while(nElements-- > 0)
-	{
-		*buffer = SwapUInt64(*buffer);
-		buffer++;
-	}
+    while(nElements-- > 0)
+    {
+        *buffer = SwapUInt64(*buffer);
+        buffer++;
+    }
+}
+
+// Swaps the TMPQUserData structure
+void ConvertTMPQUserData(void *userData)
+{
+    TMPQUserData * theData = (TMPQUserData *)userData;
+
+    theData->dwID = SwapUInt32(theData->dwID);
+    theData->cbUserDataSize = SwapUInt32(theData->cbUserDataSize);
+    theData->dwHeaderOffs = SwapUInt32(theData->dwHeaderOffs);
+    theData->cbUserDataHeader = SwapUInt32(theData->cbUserDataHeader);
 }
 
 // Swaps the TMPQHeader structure
-void ConvertTMPQHeader(void *header, uint16_t version)
+void ConvertTMPQHeader(void *header)
 {
-	TMPQHeader * theHeader = (TMPQHeader *)header;
+    TMPQHeader * theHeader = (TMPQHeader *)header;
 
-    // Swap header part version 1
-    if(version == MPQ_FORMAT_VERSION_1)
+    theHeader->dwID = SwapUInt32(theHeader->dwID);
+    theHeader->dwHeaderSize = SwapUInt32(theHeader->dwHeaderSize);
+    theHeader->dwArchiveSize = SwapUInt32(theHeader->dwArchiveSize);
+    theHeader->wFormatVersion = SwapUInt16(theHeader->wFormatVersion);
+    theHeader->wSectorSize = SwapUInt16(theHeader->wSectorSize);
+    theHeader->dwHashTablePos = SwapUInt32(theHeader->dwHashTablePos);
+    theHeader->dwBlockTablePos = SwapUInt32(theHeader->dwBlockTablePos);
+    theHeader->dwHashTableSize = SwapUInt32(theHeader->dwHashTableSize);
+    theHeader->dwBlockTableSize = SwapUInt32(theHeader->dwBlockTableSize);
+
+    if(theHeader->wFormatVersion >= MPQ_FORMAT_VERSION_2)
     {
-	    theHeader->dwID = SwapUInt32(theHeader->dwID);
-	    theHeader->dwHeaderSize = SwapUInt32(theHeader->dwHeaderSize);
-	    theHeader->dwArchiveSize = SwapUInt32(theHeader->dwArchiveSize);
-	    theHeader->wFormatVersion = SwapUInt16(theHeader->wFormatVersion);
-	    theHeader->wSectorSize = SwapUInt16(theHeader->wSectorSize);
-	    theHeader->dwHashTablePos = SwapUInt32(theHeader->dwHashTablePos);
-	    theHeader->dwBlockTablePos = SwapUInt32(theHeader->dwBlockTablePos);
-	    theHeader->dwHashTableSize = SwapUInt32(theHeader->dwHashTableSize);
-	    theHeader->dwBlockTableSize = SwapUInt32(theHeader->dwBlockTableSize);
-    }
+        // Swap the hi-block table position
+        theHeader->HiBlockTablePos64 = SwapUInt64(theHeader->HiBlockTablePos64);
 
-	if(version == MPQ_FORMAT_VERSION_2)
-	{
-		theHeader->HiBlockTablePos64 = SwapUInt64(theHeader->HiBlockTablePos64);
         theHeader->wHashTablePosHi = SwapUInt16(theHeader->wHashTablePosHi);
-		theHeader->wBlockTablePosHi = SwapUInt16(theHeader->wBlockTablePosHi);
-    }
+        theHeader->wBlockTablePosHi = SwapUInt16(theHeader->wBlockTablePosHi);
 
-    if(version == MPQ_FORMAT_VERSION_3)
-    {
-        theHeader->ArchiveSize64 = SwapUInt64(theHeader->ArchiveSize64);
-        theHeader->BetTablePos64 = SwapUInt64(theHeader->BetTablePos64);
-        theHeader->HetTablePos64 = SwapUInt64(theHeader->HetTablePos64);
-    }
+        if(theHeader->wFormatVersion >= MPQ_FORMAT_VERSION_3)
+        {
+            theHeader->ArchiveSize64 = SwapUInt64(theHeader->ArchiveSize64);
+            theHeader->BetTablePos64 = SwapUInt64(theHeader->BetTablePos64);
+            theHeader->HetTablePos64 = SwapUInt64(theHeader->HetTablePos64);
 
-    if(version == MPQ_FORMAT_VERSION_4)
-	{
-        theHeader->HashTableSize64    = SwapUInt64(theHeader->HashTableSize64);
-        theHeader->BlockTableSize64   = SwapUInt64(theHeader->BlockTableSize64);
-        theHeader->HiBlockTableSize64 = SwapUInt64(theHeader->HiBlockTableSize64);
-        theHeader->HetTableSize64     = SwapUInt64(theHeader->HetTableSize64);
-        theHeader->BetTableSize64     = SwapUInt64(theHeader->BetTableSize64);
+            if(theHeader->wFormatVersion >= MPQ_FORMAT_VERSION_4)
+            {
+                theHeader->HashTableSize64    = SwapUInt64(theHeader->HashTableSize64);
+                theHeader->BlockTableSize64   = SwapUInt64(theHeader->BlockTableSize64);
+                theHeader->HiBlockTableSize64 = SwapUInt64(theHeader->HiBlockTableSize64);
+                theHeader->HetTableSize64     = SwapUInt64(theHeader->HetTableSize64);
+                theHeader->BetTableSize64     = SwapUInt64(theHeader->BetTableSize64);
+            }
+        }
     }
 }
 
diff --git a/dep/StormLib/src/SBaseDumpData.cpp b/dep/StormLib/src/SBaseDumpData.cpp
index 7056d8bc2..9b6537bd3 100644
--- a/dep/StormLib/src/SBaseDumpData.cpp
+++ b/dep/StormLib/src/SBaseDumpData.cpp
@@ -49,14 +49,14 @@ void DumpHetAndBetTable(TMPQHetTable * pHetTable, TMPQBetTable * pBetTable)
         return;
 
     printf("== HET Header =================================\n");
-    printf("ULONGLONG  AndMask64         = %016llX\n", pHetTable->AndMask64);       
-    printf("ULONGLONG  OrMask64          = %016llX\n", pHetTable->OrMask64);        
+    printf("ULONGLONG  AndMask64         = %016llX\n", pHetTable->AndMask64);
+    printf("ULONGLONG  OrMask64          = %016llX\n", pHetTable->OrMask64);
     printf("DWORD      dwIndexSizeTotal  = %08X\n",     pHetTable->dwIndexSizeTotal);
     printf("DWORD      dwIndexSizeExtra  = %08X\n",     pHetTable->dwIndexSizeExtra);
-    printf("DWORD      dwIndexSize       = %08X\n",     pHetTable->dwIndexSize);     
-    printf("DWORD      dwMaxFileCount    = %08X\n",     pHetTable->dwMaxFileCount);  
-    printf("DWORD      dwHashTableSize   = %08X\n",     pHetTable->dwHashTableSize); 
-    printf("DWORD      dwHashBitSize     = %08X\n",     pHetTable->dwHashBitSize);   
+    printf("DWORD      dwIndexSize       = %08X\n",     pHetTable->dwIndexSize);
+    printf("DWORD      dwMaxFileCount    = %08X\n",     pHetTable->dwMaxFileCount);
+    printf("DWORD      dwHashTableSize   = %08X\n",     pHetTable->dwHashTableSize);
+    printf("DWORD      dwHashBitSize     = %08X\n",     pHetTable->dwHashBitSize);
     printf("-----------------------------------------------\n\n");
 
     printf("== BET Header =================================\n");
@@ -69,7 +69,7 @@ void DumpHetAndBetTable(TMPQHetTable * pHetTable, TMPQBetTable * pBetTable)
     printf("DWORD dwBitCount_FilePos     = %08X\n",     pBetTable->dwBitCount_FilePos);
     printf("DWORD dwBitCount_FileSize    = %08X\n",     pBetTable->dwBitCount_FileSize);
     printf("DWORD dwBitCount_CmpSize     = %08X\n",     pBetTable->dwBitCount_CmpSize);
-    printf("DWORD dwBitCount_FlagIndex   = %08X\n",     pBetTable->dwBitCount_FlagIndex);   
+    printf("DWORD dwBitCount_FlagIndex   = %08X\n",     pBetTable->dwBitCount_FlagIndex);
     printf("DWORD dwBitCount_Unknown     = %08X\n",     pBetTable->dwBitCount_Unknown);
     printf("DWORD dwBetHashSizeTotal     = %08X\n",     pBetTable->dwBetHashSizeTotal);
     printf("DWORD dwBetHashSizeExtra     = %08X\n",     pBetTable->dwBetHashSizeExtra);
@@ -93,50 +93,50 @@ void DumpHetAndBetTable(TMPQHetTable * pHetTable, TMPQBetTable * pBetTable)
 
         GetBits(pHetTable->pBetIndexes, i * pHetTable->dwIndexSizeTotal,
                                         pHetTable->dwIndexSize,
-                                       &dwBetIndex,
+                                        &dwBetIndex,
                                         4);
-        
+
         if(dwBetIndex < pHetTable->dwMaxFileCount)
         {
             DWORD dwEntryIndex = pBetTable->dwTableEntrySize * dwBetIndex;
 
             GetBits(pBetTable->pBetHashes, dwBetIndex * pBetTable->dwBetHashSizeTotal,
                                            pBetTable->dwBetHashSize,
-                                          &BetHash,
+                                           &BetHash,
                                            8);
 
-            GetBits(pBetTable->pFileTable, dwEntryIndex + pBetTable->dwBitIndex_FilePos,
+            GetBits(dwEntryIndex + pBetTable->dwBitIndex_FilePos,
                                            pBetTable->dwBitCount_FilePos,
-                                          &ByteOffset,
+                                           &ByteOffset,
                                            8);
 
-            GetBits(pBetTable->pFileTable, dwEntryIndex + pBetTable->dwBitIndex_FileSize,
+            GetBits(dwEntryIndex + pBetTable->dwBitIndex_FileSize,
                                            pBetTable->dwBitCount_FileSize,
-                                          &dwFileSize,
+                                           &dwFileSize,
                                            4);
 
-            GetBits(pBetTable->pFileTable, dwEntryIndex + pBetTable->dwBitIndex_CmpSize,
+            GetBits(dwEntryIndex + pBetTable->dwBitIndex_CmpSize,
                                            pBetTable->dwBitCount_CmpSize,
-                                          &dwCmpSize,
+                                           &dwCmpSize,
                                            4);
 
-            GetBits(pBetTable->pFileTable, dwEntryIndex + pBetTable->dwBitIndex_FlagIndex,
+            GetBits(dwEntryIndex + pBetTable->dwBitIndex_FlagIndex,
                                            pBetTable->dwBitCount_FlagIndex,
-                                          &dwFlagIndex,
+                                           &dwFlagIndex,
                                            4);
 
             dwFlags = pBetTable->pFileFlags[dwFlagIndex];
         }
 
         printf(" %04X    %02lX     %04X  %016llX %016llX %08X %08X  %04X  %08X\n", i,
-                                                         pHetTable->pHetHashes[i],
-                                                         dwBetIndex,
-                                                         BetHash,
-                                                         ByteOffset,
-                                                         dwFileSize,
-                                                         dwCmpSize,
-                                                         dwFlagIndex,
-                                                         dwFlags);
+               pHetTable->pHetHashes[i],
+               dwBetIndex,
+               BetHash,
+               ByteOffset,
+               dwFileSize,
+               dwCmpSize,
+               dwFlagIndex,
+               dwFlags);
     }
     printf("-----------------------------------------------------------------------------------------\n");
 }
diff --git a/dep/StormLib/src/SBaseFileTable.cpp b/dep/StormLib/src/SBaseFileTable.cpp
index 68ad0d715..0e25101ed 100644
--- a/dep/StormLib/src/SBaseFileTable.cpp
+++ b/dep/StormLib/src/SBaseFileTable.cpp
@@ -18,12 +18,55 @@
 #define INVALID_FLAG_VALUE 0xCCCCCCCC
 #define MAX_FLAG_INDEX     512
 
+//-----------------------------------------------------------------------------
+// Local structures
+
+// Structure for HET table header
+typedef struct _HET_TABLE_HEADER
+{
+    DWORD dwTableSize;                      // Size of the entire HET table, including HET_TABLE_HEADER (in bytes)
+    DWORD dwMaxFileCount;                   // Maximum number of files in the MPQ
+    DWORD dwHashTableSize;                  // Size of the hash table (in bytes)
+    DWORD dwHashEntrySize;                  // Effective size of the hash entry (in bits)
+    DWORD dwIndexSizeTotal;                 // Total size of file index (in bits)
+    DWORD dwIndexSizeExtra;                 // Extra bits in the file index
+    DWORD dwIndexSize;                      // Effective size of the file index (in bits)
+    DWORD dwIndexTableSize;                 // Size of the block index subtable (in bytes)
+
+} HET_TABLE_HEADER, *PHET_TABLE_HEADER;
+
+// Structure for BET table header
+typedef struct _BET_TABLE_HEADER
+{
+    DWORD dwTableSize;                      // Size of the entire BET table, including the header (in bytes)
+    DWORD dwFileCount;                      // Number of files in the BET table
+    DWORD dwUnknown08;
+    DWORD dwTableEntrySize;                 // Size of one table entry (in bits)
+    DWORD dwBitIndex_FilePos;               // Bit index of the file position (within the entry record)
+    DWORD dwBitIndex_FileSize;              // Bit index of the file size (within the entry record)
+    DWORD dwBitIndex_CmpSize;               // Bit index of the compressed size (within the entry record)
+    DWORD dwBitIndex_FlagIndex;             // Bit index of the flag index (within the entry record)
+    DWORD dwBitIndex_Unknown;               // Bit index of the ??? (within the entry record)
+    DWORD dwBitCount_FilePos;               // Bit size of file position (in the entry record)
+    DWORD dwBitCount_FileSize;              // Bit size of file size (in the entry record)
+    DWORD dwBitCount_CmpSize;               // Bit size of compressed file size (in the entry record)
+    DWORD dwBitCount_FlagIndex;             // Bit size of flags index (in the entry record)
+    DWORD dwBitCount_Unknown;               // Bit size of ??? (in the entry record)
+    DWORD dwBetHashSizeTotal;               // Total size of the BET hash
+    DWORD dwBetHashSizeExtra;               // Extra bits in the BET hash
+    DWORD dwBetHashSize;                    // Effective size of BET hash (in bits)
+    DWORD dwBetHashArraySize;               // Size of BET hashes array, in bytes
+    DWORD dwFlagCount;                      // Number of flags in the following array
+
+} BET_TABLE_HEADER, *PBET_TABLE_HEADER;
+
 //-----------------------------------------------------------------------------
 // Support for calculating bit sizes
 
 static void InitFileFlagArray(LPDWORD FlagArray)
 {
-    memset(FlagArray, 0xCC, MAX_FLAG_INDEX * sizeof(DWORD));
+    for(DWORD dwFlagIndex = 0; dwFlagIndex < MAX_FLAG_INDEX; dwFlagIndex++)
+        FlagArray[dwFlagIndex] = INVALID_FLAG_VALUE;
 }
 
 static DWORD GetFileFlagIndex(LPDWORD FlagArray, DWORD dwFlags)
@@ -52,7 +95,7 @@ static DWORD GetNecessaryBitCount(ULONGLONG MaxValue)
         MaxValue >>= 1;
         dwBitCount++;
     }
-    
+
     return dwBitCount;
 }
 
@@ -62,8 +105,8 @@ static DWORD GetNecessaryBitCount(ULONGLONG MaxValue)
 static USHORT SetBitsMask[] = {0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF};
 
 static TBitArray * CreateBitArray(
-    DWORD NumberOfBits,
-    BYTE FillValue)
+        DWORD NumberOfBits,
+        BYTE FillValue)
 {
     TBitArray * pBitArray;
     size_t nSize = sizeof(TBitArray) + (NumberOfBits + 7) / 8;
@@ -73,7 +116,6 @@ static TBitArray * CreateBitArray(
     if(pBitArray != NULL)
     {
         memset(pBitArray, FillValue, nSize);
-        pBitArray->NumberOfBytes = (NumberOfBits + 7) / 8;
         pBitArray->NumberOfBits = NumberOfBits;
     }
 
@@ -81,11 +123,11 @@ static TBitArray * CreateBitArray(
 }
 
 void GetBits(
-    TBitArray * pArray,
-    unsigned int nBitPosition,
-    unsigned int nBitLength,
-    void * pvBuffer,
-    int nResultByteSize)
+        TBitArray * pArray,
+        unsigned int nBitPosition,
+        unsigned int nBitLength,
+        void * pvBuffer,
+        int nResultByteSize)
 {
     unsigned char * pbBuffer = (unsigned char *)pvBuffer;
     unsigned int nBytePosition0 = (nBitPosition / 8);
@@ -106,7 +148,7 @@ void GetBits(
 #ifndef PLATFORM_LITTLE_ENDIAN
     // Adjust the buffer pointer for big endian platforms
     pbBuffer += (nResultByteSize - 1);
-#endif    
+#endif
 
     // Copy whole bytes, if any
     while(nByteLength > 0)
@@ -147,11 +189,11 @@ void GetBits(
 }
 
 void SetBits(
-    TBitArray * pArray,
-    unsigned int nBitPosition,
-    unsigned int nBitLength,
-    void * pvBuffer,
-    int nResultByteSize)
+        TBitArray * pArray,
+        unsigned int nBitPosition,
+        unsigned int nBitLength,
+        void * pvBuffer,
+        int nResultByteSize)
 {
     unsigned char * pbBuffer = (unsigned char *)pvBuffer;
     unsigned int nBytePosition = (nBitPosition / 8);
@@ -166,7 +208,7 @@ void SetBits(
 #ifndef PLATFORM_LITTLE_ENDIAN
     // Adjust the buffer pointer for big endian platforms
     pbBuffer += (nResultByteSize - 1);
-#endif    
+#endif
 
     // Copy whole bytes, if any
     while(nBitLength > 8)
@@ -213,326 +255,6 @@ void SetBits(
     }
 }
 
-//-----------------------------------------------------------------------------
-// Support for MPQ header
-
-static ULONGLONG DetermineArchiveSize_V1(
-    TMPQArchive * ha,
-    TMPQHeader * pHeader,
-    ULONGLONG MpqOffset,
-    ULONGLONG FileSize)
-{
-    ULONGLONG ByteOffset;
-    ULONGLONG EndOfMpq = FileSize;
-    DWORD SignatureHeader = 0;
-    DWORD dwArchiveSize32;
-
-    // This could only be called for MPQs version 1.0
-    assert(pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1);
-
-    // Check if we can rely on the archive size in the header
-    if(pHeader->dwBlockTablePos < pHeader->dwArchiveSize)
-    {
-        // The block table cannot be compressed, so the sizes must match
-        if((pHeader->dwArchiveSize - pHeader->dwBlockTablePos) == (pHeader->dwBlockTableSize * sizeof(TMPQBlock)))
-            return pHeader->dwArchiveSize;
-
-        // If the archive size in the header is less than real file size
-        dwArchiveSize32 = (DWORD)(FileSize - MpqOffset);
-        if(pHeader->dwArchiveSize == dwArchiveSize32)
-            return pHeader->dwArchiveSize;
-    }
-
-    // Check if there is a signature header
-    if((EndOfMpq - MpqOffset) > (MPQ_STRONG_SIGNATURE_SIZE + 4))
-    {
-        ByteOffset = EndOfMpq - MPQ_STRONG_SIGNATURE_SIZE - 4;
-        FileStream_Read(ha->pStream, &ByteOffset, &SignatureHeader, sizeof(DWORD));
-        if(BSWAP_INT32_UNSIGNED(SignatureHeader) == MPQ_STRONG_SIGNATURE_ID)
-            EndOfMpq = EndOfMpq - MPQ_STRONG_SIGNATURE_SIZE - 4;
-    }
-
-    // Return the returned archive size
-    return (EndOfMpq - MpqOffset);
-}
-
-static ULONGLONG DetermineArchiveSize_V2(
-    TMPQHeader * pHeader,
-    ULONGLONG MpqOffset,
-    ULONGLONG FileSize)
-{
-    ULONGLONG EndOfMpq = FileSize;
-    DWORD dwArchiveSize32;
-
-    // This could only be called for MPQs version 2.0
-    assert(pHeader->wFormatVersion == MPQ_FORMAT_VERSION_2);
-
-    // Check if we can rely on the archive size in the header
-    if((FileSize >> 0x20) == 0)
-    {
-        if(pHeader->dwBlockTablePos < pHeader->dwArchiveSize)
-        {
-            if((pHeader->dwArchiveSize - pHeader->dwBlockTablePos) <= (pHeader->dwBlockTableSize * sizeof(TMPQBlock)))
-                return pHeader->dwArchiveSize;
-
-            // If the archive size in the header is less than real file size
-            dwArchiveSize32 = (DWORD)(FileSize - MpqOffset);
-            if(pHeader->dwArchiveSize <= dwArchiveSize32)
-                return pHeader->dwArchiveSize;
-        }
-    }
-
-    // Return the calculated archive size
-    return (EndOfMpq - MpqOffset);
-}
-
-// This function converts the MPQ header so it always looks like version 4
-int ConvertMpqHeaderToFormat4(
-    TMPQArchive * ha,
-    ULONGLONG MpqOffset,
-    ULONGLONG FileSize,
-    DWORD dwFlags)
-{
-    TMPQHeader * pHeader = (TMPQHeader *)ha->HeaderData;
-    ULONGLONG BlockTablePos64 = 0;
-    ULONGLONG HashTablePos64 = 0;
-    ULONGLONG BlockTableMask = (ULONGLONG)-1;
-    ULONGLONG ByteOffset;
-    USHORT wFormatVersion = BSWAP_INT16_UNSIGNED(pHeader->wFormatVersion);
-    int nError = ERROR_SUCCESS;
-
-    // If version 1.0 is forced, then the format version is forced to be 1.0
-    // Reason: Storm.dll in Warcraft III ignores format version value
-    if(dwFlags & MPQ_OPEN_FORCE_MPQ_V1)
-        wFormatVersion = MPQ_FORMAT_VERSION_1;
-
-    // Format-specific fixes
-    switch(wFormatVersion)
-    {
-        case MPQ_FORMAT_VERSION_1:
-
-            // Check for malformed MPQ header version 1.0
-            BSWAP_TMPQHEADER(pHeader, MPQ_FORMAT_VERSION_1);
-            if(pHeader->wFormatVersion != MPQ_FORMAT_VERSION_1 || pHeader->dwHeaderSize != MPQ_HEADER_SIZE_V1)
-            {
-                pHeader->wFormatVersion = MPQ_FORMAT_VERSION_1;
-                pHeader->dwHeaderSize = MPQ_HEADER_SIZE_V1;
-                ha->dwFlags |= MPQ_FLAG_MALFORMED;
-            }
-
-            //
-            // Note: The value of "dwArchiveSize" member in the MPQ header
-            // is ignored by Storm.dll and can contain garbage value
-            // ("w3xmaster" protector).
-            //
-
-            Label_ArchiveVersion1:
-            if(pHeader->dwHashTablePos <= pHeader->dwHeaderSize)
-                ha->dwFlags |= MPQ_FLAG_MALFORMED;
-            if(pHeader->dwBlockTablePos <= pHeader->dwHeaderSize)
-                ha->dwFlags |= MPQ_FLAG_MALFORMED;
-            if(pHeader->dwArchiveSize != pHeader->dwBlockTablePos + (pHeader->dwBlockTableSize * sizeof(TMPQBlock)))
-                ha->dwFlags |= MPQ_FLAG_MALFORMED;
-
-            // Fill the rest of the header
-            memset((LPBYTE)pHeader + MPQ_HEADER_SIZE_V1, 0, sizeof(TMPQHeader) - MPQ_HEADER_SIZE_V1);
-            pHeader->BlockTableSize64 = pHeader->dwBlockTableSize * sizeof(TMPQBlock);
-            pHeader->HashTableSize64 = pHeader->dwHashTableSize * sizeof(TMPQHash);
-            pHeader->ArchiveSize64 = pHeader->dwArchiveSize;
-            
-            // Block table position must be calculated as 32-bit value
-            // Note: BOBA protector puts block table before the MPQ header, so it is negative
-            BlockTablePos64 = (ULONGLONG)((DWORD)MpqOffset + pHeader->dwBlockTablePos);
-            BlockTableMask = 0xFFFFFFF0;
-
-            // Determine the archive size on malformed MPQs
-            if(ha->dwFlags & MPQ_FLAG_MALFORMED)
-            {
-                // Calculate the archive size
-                pHeader->ArchiveSize64 = DetermineArchiveSize_V1(ha, pHeader, MpqOffset, FileSize);
-                pHeader->dwArchiveSize = (DWORD)pHeader->ArchiveSize64;
-            }
-            break;
-
-        case MPQ_FORMAT_VERSION_2:
-
-            // Check for malformed MPQ header version 1.0
-            BSWAP_TMPQHEADER(pHeader, MPQ_FORMAT_VERSION_2);
-            if(pHeader->wFormatVersion != MPQ_FORMAT_VERSION_2 || pHeader->dwHeaderSize != MPQ_HEADER_SIZE_V2)
-            {
-                pHeader->wFormatVersion = MPQ_FORMAT_VERSION_1;
-                pHeader->dwHeaderSize = MPQ_HEADER_SIZE_V1;
-                ha->dwFlags |= MPQ_FLAG_MALFORMED;
-                goto Label_ArchiveVersion1;
-            }
-
-            // Fill the rest of the header with zeros
-            memset((LPBYTE)pHeader + MPQ_HEADER_SIZE_V2, 0, sizeof(TMPQHeader) - MPQ_HEADER_SIZE_V2);
-
-            // Calculate the expected hash table size
-            pHeader->HashTableSize64 = (pHeader->dwHashTableSize * sizeof(TMPQHash));
-            HashTablePos64 = MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos);
-
-            // Calculate the expected block table size
-            pHeader->BlockTableSize64 = (pHeader->dwBlockTableSize * sizeof(TMPQBlock));
-            BlockTablePos64 = MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
-
-            // We require the block table to follow hash table
-            if(BlockTablePos64 > HashTablePos64)
-            {
-                // HashTableSize64 may be less than TblSize * sizeof(TMPQHash).
-                // That means that the hash table is compressed.
-                pHeader->HashTableSize64 = BlockTablePos64 - HashTablePos64;
-
-                // Calculate the compressed block table size
-                if(pHeader->HiBlockTablePos64 != 0)
-                {
-                    // BlockTableSize64 may be less than TblSize * sizeof(TMPQBlock).
-                    // That means that the block table is compressed.
-                    pHeader->BlockTableSize64 = pHeader->HiBlockTablePos64 - BlockTablePos64;
-                    assert(pHeader->BlockTableSize64 <= (pHeader->dwBlockTableSize * sizeof(TMPQBlock)));
-
-                    // Determine real archive size
-                    pHeader->ArchiveSize64 = DetermineArchiveSize_V2(pHeader, MpqOffset, FileSize);
-
-                    // Calculate the size of the hi-block table
-                    pHeader->HiBlockTableSize64 = pHeader->ArchiveSize64 - pHeader->HiBlockTablePos64;
-                    assert(pHeader->HiBlockTableSize64 == (pHeader->dwBlockTableSize * sizeof(USHORT)));
-                }
-                else
-                {
-                    // Determine real archive size
-                    pHeader->ArchiveSize64 = DetermineArchiveSize_V2(pHeader, MpqOffset, FileSize);
-
-                    // Calculate size of the block table
-                    pHeader->BlockTableSize64 = pHeader->ArchiveSize64 - BlockTablePos64;
-                    assert(pHeader->BlockTableSize64 <= (pHeader->dwBlockTableSize * sizeof(TMPQBlock)));
-                }
-            }
-            else
-            {
-                pHeader->ArchiveSize64 = pHeader->dwArchiveSize;
-                ha->dwFlags |= MPQ_FLAG_MALFORMED;
-            }
-
-            // Add the MPQ Offset
-            BlockTablePos64 += MpqOffset;
-            break;
-
-        case MPQ_FORMAT_VERSION_3:
-
-            // In MPQ format 3.0, the entire header is optional
-            // and the size of the header can actually be identical
-            // to size of header 2.0
-            BSWAP_TMPQHEADER(pHeader, MPQ_FORMAT_VERSION_3);
-            if(pHeader->dwHeaderSize < MPQ_HEADER_SIZE_V3)
-            {
-                pHeader->ArchiveSize64 = pHeader->dwArchiveSize;
-                pHeader->HetTablePos64 = 0;
-                pHeader->BetTablePos64 = 0;
-            }
-
-            //
-            // We need to calculate the compressed size of each table. We assume the following order:
-            // 1) HET table
-            // 2) BET table
-            // 3) Classic hash table
-            // 4) Classic block table
-            // 5) Hi-block table
-            //
-
-            // Fill the rest of the header with zeros
-            memset((LPBYTE)pHeader + MPQ_HEADER_SIZE_V3, 0, sizeof(TMPQHeader) - MPQ_HEADER_SIZE_V3);
-            BlockTablePos64 = MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
-            HashTablePos64 = MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos);
-            ByteOffset = pHeader->ArchiveSize64;
-
-            // Size of the hi-block table
-            if(pHeader->HiBlockTablePos64)
-            {
-                pHeader->HiBlockTableSize64 = ByteOffset - pHeader->HiBlockTablePos64;
-                ByteOffset = pHeader->HiBlockTablePos64;
-            }
-
-            // Size of the block table
-            if(BlockTablePos64)
-            {
-                pHeader->BlockTableSize64 = ByteOffset - BlockTablePos64;
-                ByteOffset = BlockTablePos64;
-            }
-
-            // Size of the hash table
-            if(HashTablePos64)
-            {
-                pHeader->HashTableSize64 = ByteOffset - HashTablePos64;
-                ByteOffset = HashTablePos64;
-            }
-
-            // Size of the BET table
-            if(pHeader->BetTablePos64)
-            {
-                pHeader->BetTableSize64 = ByteOffset - pHeader->BetTablePos64;
-                ByteOffset = pHeader->BetTablePos64;
-            }
-
-            // Size of the HET table
-            if(pHeader->HetTablePos64)
-            {
-                pHeader->HetTableSize64 = ByteOffset - pHeader->HetTablePos64;
-//              ByteOffset = pHeader->HetTablePos64;
-            }
-            
-            // Add the MPQ Offset
-            BlockTablePos64 += MpqOffset;
-            break;
-
-        case MPQ_FORMAT_VERSION_4:
-
-            // Verify header MD5. Header MD5 is calculated from the MPQ header since the 'MPQ\x1A'
-            // signature until the position of header MD5 at offset 0xC0
-            BSWAP_TMPQHEADER(pHeader, MPQ_FORMAT_VERSION_4);
-            if(!VerifyDataBlockHash(pHeader, MPQ_HEADER_SIZE_V4 - MD5_DIGEST_SIZE, pHeader->MD5_MpqHeader))
-                nError = ERROR_FILE_CORRUPT;
-
-            // Calculate the block table position
-            BlockTablePos64 = MpqOffset + MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
-            break;
-
-        default:
-
-            // Check if it's a War of the Immortal data file (SQP)
-            // If not, we treat it as malformed MPQ version 1.0
-            if(ConvertSqpHeaderToFormat4(ha, FileSize, dwFlags) != ERROR_SUCCESS)
-            {
-                pHeader->wFormatVersion = MPQ_FORMAT_VERSION_1;
-                pHeader->dwHeaderSize = MPQ_HEADER_SIZE_V1;
-                ha->dwFlags |= MPQ_FLAG_MALFORMED;
-                goto Label_ArchiveVersion1;
-            }
-
-            // Calculate the block table position
-            BlockTablePos64 = MpqOffset + MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
-            break;
-    }
-
-    // Handle case when block table is placed before the MPQ header
-    // Used by BOBA protector
-    if(BlockTablePos64 < MpqOffset)
-    {
-        pHeader->BlockTableSize64 = (MpqOffset - BlockTablePos64) & BlockTableMask;
-        pHeader->dwBlockTableSize = (DWORD)(pHeader->BlockTableSize64 / sizeof(TMPQBlock));
-    }
-
-    // Handle case when either the MPQ is cut in the middle of the block table
-    // or the MPQ is malformed so that block table size is greater than should be
-    if((BlockTablePos64 + pHeader->BlockTableSize64) > FileSize)
-    {
-        pHeader->BlockTableSize64 = (FileSize - BlockTablePos64) & BlockTableMask;
-        pHeader->dwBlockTableSize = (DWORD)(pHeader->BlockTableSize64 / sizeof(TMPQBlock));
-    }
-
-    return nError;
-}
 
 //-----------------------------------------------------------------------------
 // Support for hash table
@@ -558,7 +280,7 @@ static TMPQHash * GetHashEntryAny(TMPQArchive * ha, const char * szFileName)
             pHashAny = pHash;
 
         // Get the next hash entry for that file
-        pHash = GetNextHashEntry(ha, pFirstHash, pHash); 
+        pHash = GetNextHashEntry(ha, pFirstHash, pHash);
     }
 
     // At the end, return neutral hash (if found), otherwise NULL
@@ -581,13 +303,13 @@ static TMPQHash * GetHashEntryLocale(TMPQArchive * ha, const char * szFileName,
         // If the locales match, return it
         if(pHash->lcLocale == lcLocale)
             return pHash;
-        
+
         // If we found neutral hash, remember it
         if(pHash->lcLocale == 0)
             pHashNeutral = pHash;
 
         // Get the next hash entry for that file
-        pHash = GetNextHashEntry(ha, pFirstHash, pHash); 
+        pHash = GetNextHashEntry(ha, pFirstHash, pHash);
     }
 
     // At the end, return neutral hash (if found), otherwise NULL
@@ -608,101 +330,18 @@ static TMPQHash * GetHashEntryExact(TMPQArchive * ha, const char * szFileName, L
         // If the locales match, return it
         if(pHash->lcLocale == lcLocale)
             return pHash;
-        
+
         // Get the next hash entry for that file
-        pHash = GetNextHashEntry(ha, pFirstHash, pHash); 
+        pHash = GetNextHashEntry(ha, pFirstHash, pHash);
     }
 
     // Not found
     return NULL;
 }
 
-static int BuildFileTableFromBlockTable(
-    TMPQArchive * ha,
-    TFileEntry * pFileTable,
-    TMPQBlock * pBlockTable)
-{
-    TFileEntry * pFileEntry;
-    TMPQHeader * pHeader = ha->pHeader;
-    TMPQBlock * pBlock;
-    TMPQHash * pHashEnd = ha->pHashTable + pHeader->dwHashTableSize;
-    TMPQHash * pHash;
-
-    for(pHash = ha->pHashTable; pHash < pHashEnd; pHash++)
-    {
-        if(pHash->dwBlockIndex < pHeader->dwBlockTableSize)
-        {
-            pFileEntry = pFileTable + pHash->dwBlockIndex;
-            pBlock = pBlockTable + pHash->dwBlockIndex;
-
-            //
-            // Yet another silly map protector: For each valid file,
-            // there are 4 items in the hash table, that appears to be valid:
-            //
-            //   a6d79af0 e61a0932 001e0000 0000770b <== Fake valid
-            //   a6d79af0 e61a0932 0000d761 0000dacb <== Fake valid
-            //   a6d79af0 e61a0932 00000000 0000002f <== Real file entry
-            //   a6d79af0 e61a0932 00005a4f 000093bc <== Fake valid
-            // 
-
-            if(!(pBlock->dwFlags & ~MPQ_FILE_VALID_FLAGS) && (pBlock->dwFlags & MPQ_FILE_EXISTS))
-            {
-                // ByteOffset is only valid if file size is not zero
-                pFileEntry->ByteOffset = pBlock->dwFilePos;
-                if(pFileEntry->ByteOffset == 0 && pBlock->dwCSize == 0)
-                    pFileEntry->ByteOffset = ha->pHeader->dwHeaderSize;
-
-                pFileEntry->dwHashIndex = (DWORD)(pHash - ha->pHashTable);
-                pFileEntry->dwFileSize  = pBlock->dwFSize;
-                pFileEntry->dwCmpSize   = pBlock->dwCSize;
-                pFileEntry->dwFlags     = pBlock->dwFlags;
-                pFileEntry->lcLocale    = pHash->lcLocale;
-                pFileEntry->wPlatform   = pHash->wPlatform;
-            }
-            else
-            {
-                // If the hash table entry doesn't point to the valid file item,
-                // we invalidate the hash table entry
-                pHash->dwName1      = 0xFFFFFFFF;
-                pHash->dwName2      = 0xFFFFFFFF;
-                pHash->lcLocale     = 0xFFFF;
-                pHash->wPlatform    = 0xFFFF;
-                pHash->dwBlockIndex = HASH_ENTRY_DELETED;
-            }
-        }
-    }
-
-    return ERROR_SUCCESS;
-}
-
-static int UpdateFileTableFromHashTable(
-    TMPQArchive * ha,
-    TFileEntry * pFileTable)
-{
-    TFileEntry * pFileEntry;
-    TMPQHash * pHashEnd = ha->pHashTable + ha->pHeader->dwHashTableSize;
-    TMPQHash * pHash;
-
-    for(pHash = ha->pHashTable; pHash < pHashEnd; pHash++)
-    {
-        if(pHash->dwBlockIndex < ha->dwFileTableSize)
-        {
-            pFileEntry = pFileTable + pHash->dwBlockIndex;
-            if(pFileEntry->dwFlags & MPQ_FILE_EXISTS)
-            {
-                pFileEntry->dwHashIndex = (DWORD)(pHash - ha->pHashTable);
-                pFileEntry->lcLocale    = pHash->lcLocale;
-                pFileEntry->wPlatform   = pHash->wPlatform;
-            }
-        }
-    }
-
-    return ERROR_SUCCESS;
-}
-
 static TMPQHash * TranslateHashTable(
-    TMPQArchive * ha,
-    ULONGLONG * pcbTableSize)
+        TMPQArchive * ha,
+        ULONGLONG * pcbTableSize)
 {
     TMPQHash * pHashTable;
     size_t HashTableSize;
@@ -725,17 +364,16 @@ static TMPQHash * TranslateHashTable(
     return pHashTable;
 }
 
-// Also used in SFileGetFileInfo
-TMPQBlock * TranslateBlockTable(
-    TMPQArchive * ha,
-    ULONGLONG * pcbTableSize,
-    bool * pbNeedHiBlockTable)
+static TMPQBlock * TranslateBlockTable(
+        TMPQArchive * ha,
+        ULONGLONG * pcbTableSize,
+        bool * pbNeedHiBlockTable)
 {
     TFileEntry * pFileEntry = ha->pFileTable;
     TMPQBlock * pBlockTable;
     TMPQBlock * pBlock;
-    size_t NeedHiBlockTable = 0;
     size_t BlockTableSize;
+    bool bNeedHiBlockTable = false;
 
     // Allocate copy of the hash table
     pBlockTable = pBlock = STORM_ALLOC(TMPQBlock, ha->dwFileTableSize);
@@ -745,7 +383,7 @@ TMPQBlock * TranslateBlockTable(
         BlockTableSize = sizeof(TMPQBlock) * ha->dwFileTableSize;
         for(DWORD i = 0; i < ha->dwFileTableSize; i++)
         {
-            NeedHiBlockTable |= (pFileEntry->ByteOffset >> 32);
+            bNeedHiBlockTable = (pFileEntry->ByteOffset >> 32) ? true : false;
             pBlock->dwFilePos = (DWORD)pFileEntry->ByteOffset;
             pBlock->dwFSize   = pFileEntry->dwFileSize;
             pBlock->dwCSize   = pFileEntry->dwCmpSize;
@@ -760,15 +398,15 @@ TMPQBlock * TranslateBlockTable(
             *pcbTableSize = (ULONGLONG)BlockTableSize;
 
         if(pbNeedHiBlockTable != NULL)
-            *pbNeedHiBlockTable = NeedHiBlockTable ? true : false;
+            *pbNeedHiBlockTable = bNeedHiBlockTable;
     }
 
     return pBlockTable;
 }
 
 static USHORT * TranslateHiBlockTable(
-    TMPQArchive * ha,
-    ULONGLONG * pcbTableSize)
+        TMPQArchive * ha,
+        ULONGLONG * pcbTableSize)
 {
     TFileEntry * pFileEntry = ha->pFileTable;
     USHORT * pHiBlockTable;
@@ -795,21 +433,21 @@ static USHORT * TranslateHiBlockTable(
 //-----------------------------------------------------------------------------
 // General EXT table functions
 
-TMPQExtHeader * LoadExtTable(
-    TMPQArchive * ha,
-    ULONGLONG ByteOffset,
-    size_t Size,
-    DWORD dwSignature,
-    DWORD dwKey)
+TMPQExtTable * LoadExtTable(
+        TMPQArchive * ha,
+        ULONGLONG ByteOffset,
+        size_t Size,
+        DWORD dwSignature,
+        DWORD dwKey)
 {
-    TMPQExtHeader * pCompressed = NULL;      // Compressed table
-    TMPQExtHeader * pExtTable = NULL;        // Uncompressed table
+    TMPQExtTable * pCompressed = NULL;      // Compressed table
+    TMPQExtTable * pExtTable = NULL;        // Uncompressed table
 
     // Do nothing if the size is zero
     if(ByteOffset != 0 && Size != 0)
     {
         // Allocate size for the compressed table
-        pExtTable = (TMPQExtHeader *)STORM_ALLOC(BYTE, Size);
+        pExtTable = (TMPQExtTable *)STORM_ALLOC(BYTE, Size);
         if(pExtTable != NULL)
         {
             // Load the table from the MPQ
@@ -821,7 +459,7 @@ TMPQExtHeader * LoadExtTable(
             }
 
             // Swap the ext table header
-            BSWAP_ARRAY32_UNSIGNED(pExtTable, sizeof(TMPQExtHeader));
+            BSWAP_ARRAY32_UNSIGNED(pExtTable, sizeof(TMPQExtTable));
             if(pExtTable->dwSignature != dwSignature)
             {
                 STORM_FREE(pExtTable);
@@ -830,14 +468,14 @@ TMPQExtHeader * LoadExtTable(
 
             // Decrypt the block
             BSWAP_ARRAY32_UNSIGNED(pExtTable + 1, pExtTable->dwDataSize);
-            DecryptMpqBlock(pExtTable + 1, (DWORD)(Size - sizeof(TMPQExtHeader)), dwKey);
+            DecryptMpqBlock(pExtTable + 1, (DWORD)(Size - sizeof(TMPQExtTable)), dwKey);
             BSWAP_ARRAY32_UNSIGNED(pExtTable + 1, pExtTable->dwDataSize);
 
             // If the table is compressed, decompress it
-            if((pExtTable->dwDataSize + sizeof(TMPQExtHeader)) > Size)
+            if((pExtTable->dwDataSize + sizeof(TMPQExtTable)) > Size)
             {
                 pCompressed = pExtTable;
-                pExtTable = (TMPQExtHeader *)STORM_ALLOC(BYTE, sizeof(TMPQExtHeader) + pCompressed->dwDataSize);
+                pExtTable = (TMPQExtTable *)STORM_ALLOC(BYTE, sizeof(TMPQExtTable) + pCompressed->dwDataSize);
                 if(pExtTable != NULL)
                 {
                     int cbOutBuffer = (int)pCompressed->dwDataSize;
@@ -847,7 +485,7 @@ TMPQExtHeader * LoadExtTable(
                     pExtTable->dwSignature = pCompressed->dwSignature;
                     pExtTable->dwVersion   = pCompressed->dwVersion;
                     pExtTable->dwDataSize  = pCompressed->dwDataSize;
-                    if(!SCompDecompress2(pExtTable + 1, &cbOutBuffer, pCompressed + 1, cbInBuffer))
+                    if(!SCompDecompress2((char *)(pExtTable + 1), &cbOutBuffer, (char *)(pCompressed + 1), cbInBuffer))
                     {
                         STORM_FREE(pExtTable);
                         pExtTable = NULL;
@@ -864,14 +502,20 @@ TMPQExtHeader * LoadExtTable(
     return pExtTable;
 }
 
+// Used in MPQ Editor
+void FreeMpqBuffer(void * pvBuffer)
+{
+    STORM_FREE(pvBuffer);
+}
+
 static int SaveMpqTable(
-    TMPQArchive * ha,
-    void * pMpqTable,
-    ULONGLONG ByteOffset,
-    size_t Size,
-    unsigned char * md5,
-    DWORD dwKey,
-    bool bCompress)
+        TMPQArchive * ha,
+        void * pMpqTable,
+        ULONGLONG ByteOffset,
+        size_t Size,
+        unsigned char * md5,
+        DWORD dwKey,
+        bool bCompress)
 {
     ULONGLONG FileOffset;
     void * pCompressed = NULL;
@@ -889,7 +533,7 @@ static int SaveMpqTable(
             return ERROR_NOT_ENOUGH_MEMORY;
 
         // Compress the table
-        SCompCompress(pCompressed, &cbOutBuffer, pMpqTable, cbInBuffer, MPQ_COMPRESSION_ZLIB, 0, 0);
+        SCompCompress((char *)pCompressed, &cbOutBuffer, (char *)pMpqTable, cbInBuffer, MPQ_COMPRESSION_ZLIB, 0, 0);
 
         // If the compression failed, revert it. Otherwise, swap the tables
         if(cbOutBuffer >= cbInBuffer)
@@ -930,17 +574,17 @@ static int SaveMpqTable(
 }
 
 static int SaveExtTable(
-    TMPQArchive * ha,
-    TMPQExtHeader * pExtTable,
-    ULONGLONG ByteOffset,
-    DWORD dwTableSize,
-    unsigned char * md5,
-    DWORD dwKey,
-    bool bCompress,
-    LPDWORD pcbTotalSize)
+        TMPQArchive * ha,
+        TMPQExtTable * pExtTable,
+        ULONGLONG ByteOffset,
+        DWORD dwTableSize,
+        unsigned char * md5,
+        DWORD dwKey,
+        bool bCompress,
+        LPDWORD pcbTotalSize)
 {
     ULONGLONG FileOffset;
-    TMPQExtHeader * pCompressed = NULL;
+    TMPQExtTable * pCompressed = NULL;
     DWORD cbTotalSize = 0;
     int nError = ERROR_SUCCESS;
 
@@ -951,7 +595,7 @@ static int SaveExtTable(
         int cbInBuffer = (int)dwTableSize;
 
         // Allocate extra space for compressed table
-        pCompressed = (TMPQExtHeader *)STORM_ALLOC(BYTE, dwTableSize);
+        pCompressed = (TMPQExtTable *)STORM_ALLOC(BYTE, dwTableSize);
         if(pCompressed == NULL)
             return ERROR_NOT_ENOUGH_MEMORY;
 
@@ -959,7 +603,7 @@ static int SaveExtTable(
         pCompressed->dwSignature = pExtTable->dwSignature;
         pCompressed->dwVersion   = pExtTable->dwVersion;
         pCompressed->dwDataSize  = pExtTable->dwDataSize;
-        SCompCompress((pCompressed + 1), &cbOutBuffer, (pExtTable + 1), cbInBuffer, MPQ_COMPRESSION_ZLIB, 0, 0);
+        SCompCompress((char *)(pCompressed + 1), &cbOutBuffer, (char *)(pExtTable + 1), cbInBuffer, MPQ_COMPRESSION_ZLIB, 0, 0);
 
         // If the compression failed, revert it. Otherwise, swap the tables
         if(cbOutBuffer >= cbInBuffer)
@@ -977,7 +621,7 @@ static int SaveExtTable(
     if(dwKey != 0)
     {
         BSWAP_ARRAY32_UNSIGNED(pExtTable + 1, pExtTable->dwDataSize);
-        EncryptMpqBlock(pExtTable + 1, (DWORD)(dwTableSize - sizeof(TMPQExtHeader)), dwKey);
+        EncryptMpqBlock(pExtTable + 1, (DWORD)(dwTableSize - sizeof(TMPQExtTable)), dwKey);
         BSWAP_ARRAY32_UNSIGNED(pExtTable + 1, pExtTable->dwDataSize);
     }
 
@@ -1002,7 +646,7 @@ static int SaveExtTable(
                                  pExtTable,
                                  dwTableSize,
                                  ha->pHeader->dwRawChunkSize,
-                                &cbTotalSize);
+                                 &cbTotalSize);
     }
 
     // Give the total written size, if needed
@@ -1019,176 +663,103 @@ static int SaveExtTable(
 // Support for HET table
 
 static void CreateHetHeader(
-    TMPQHetTable * pHetTable,
-    TMPQHetHeader * pHetHeader)
+        TMPQHetTable * pHetTable,
+        PHET_TABLE_HEADER pHetHeader)
 {
-    // Fill the common header
-    pHetHeader->ExtHdr.dwSignature  = HET_TABLE_SIGNATURE;
-    pHetHeader->ExtHdr.dwVersion    = 1;
-    pHetHeader->ExtHdr.dwDataSize   = 0;
-
-    // Fill the HET header
-    pHetHeader->dwEntryCount        = pHetTable->dwEntryCount;
-    pHetHeader->dwTotalCount        = pHetTable->dwTotalCount;
-    pHetHeader->dwNameHashBitSize   = pHetTable->dwNameHashBitSize;
-    pHetHeader->dwIndexSizeTotal    = pHetTable->dwIndexSizeTotal;
-    pHetHeader->dwIndexSizeExtra    = pHetTable->dwIndexSizeExtra;
-    pHetHeader->dwIndexSize         = pHetTable->dwIndexSize;
-    pHetHeader->dwIndexTableSize    = ((pHetHeader->dwIndexSizeTotal * pHetTable->dwTotalCount) + 7) / 8;
+    // Fill the BET header
+    pHetHeader->dwMaxFileCount   = pHetTable->dwMaxFileCount;
+    pHetHeader->dwHashTableSize  = pHetTable->dwHashTableSize;
+    pHetHeader->dwHashEntrySize  = pHetTable->dwHashBitSize;
+    pHetHeader->dwIndexSizeTotal = GetNecessaryBitCount(pHetTable->dwMaxFileCount);
+    pHetHeader->dwIndexSizeExtra = 0;
+    pHetHeader->dwIndexSize      = pHetHeader->dwIndexSizeTotal;
+    pHetHeader->dwIndexTableSize = ((pHetHeader->dwIndexSizeTotal * pHetTable->dwHashTableSize) + 7) / 8;
 
     // Calculate the total size needed for holding HET table
-    pHetHeader->ExtHdr.dwDataSize =
-    pHetHeader->dwTableSize = sizeof(TMPQHetHeader) - sizeof(TMPQExtHeader) +
-                              pHetHeader->dwTotalCount +
-                              pHetHeader->dwIndexTableSize;
+    pHetHeader->dwTableSize = sizeof(HET_TABLE_HEADER) +
+            pHetHeader->dwHashTableSize +
+            pHetHeader->dwIndexTableSize;
 }
 
-TMPQHetTable * CreateHetTable(DWORD dwEntryCount, DWORD dwTotalCount, DWORD dwNameHashBitSize, LPBYTE pbSrcData)
+TMPQHetTable * CreateHetTable(DWORD dwMaxFileCount, DWORD dwHashBitSize, bool bCreateEmpty)
 {
     TMPQHetTable * pHetTable;
 
     pHetTable = STORM_ALLOC(TMPQHetTable, 1);
     if(pHetTable != NULL)
     {
-        // Zero the HET table
-        memset(pHetTable, 0, sizeof(TMPQHetTable));
+        pHetTable->dwIndexSizeTotal = 0;
+        pHetTable->dwIndexSizeExtra = 0;
+        pHetTable->dwIndexSize      = pHetTable->dwIndexSizeTotal;
+        pHetTable->dwMaxFileCount   = dwMaxFileCount;
+        pHetTable->dwHashTableSize  = (dwMaxFileCount * 4 / 3);
+        pHetTable->dwHashBitSize    = dwHashBitSize;
 
-        // Hash sizes less than 0x40 bits are not tested
-        assert(dwNameHashBitSize == 0x40);
+        // Size of one index is calculated from max file count
+        pHetTable->dwIndexSizeTotal = GetNecessaryBitCount(dwMaxFileCount);
+        pHetTable->dwIndexSizeExtra = 0;
+        pHetTable->dwIndexSize      = pHetTable->dwIndexSizeTotal;
+
+        // Allocate hash table
+        pHetTable->pHetHashes = STORM_ALLOC(BYTE, pHetTable->dwHashTableSize);
+        memset(pHetTable->pHetHashes, 0, pHetTable->dwHashTableSize);
+
+        // If we shall create empty HET table, we have to allocate empty block index table as well
+        if(bCreateEmpty)
+            pHetTable->pBetIndexes = CreateBitArray(pHetTable->dwHashTableSize * pHetTable->dwIndexSizeTotal, 0xFF);
 
         // Calculate masks
-        pHetTable->AndMask64 = ((dwNameHashBitSize != 0x40) ? ((ULONGLONG)1 << dwNameHashBitSize) : 0) - 1;
-        pHetTable->OrMask64 = (ULONGLONG)1 << (dwNameHashBitSize - 1);
+        pHetTable->AndMask64 = 0;
+        if(dwHashBitSize != 0x40)
+            pHetTable->AndMask64 = (ULONGLONG)1 << dwHashBitSize;
+        pHetTable->AndMask64--;
 
-        // If the total count is not entered, use default
-        if(dwTotalCount == 0)
-            dwTotalCount = (dwEntryCount * 4) / 3;
-
-        // Store the HET table parameters
-        pHetTable->dwEntryCount        = dwEntryCount;
-        pHetTable->dwTotalCount        = dwTotalCount;
-        pHetTable->dwNameHashBitSize   = dwNameHashBitSize;
-        pHetTable->dwIndexSizeTotal    = GetNecessaryBitCount(dwEntryCount);
-        pHetTable->dwIndexSizeExtra    = 0;
-        pHetTable->dwIndexSize         = pHetTable->dwIndexSizeTotal;
-
-        // Allocate array of hashes
-        pHetTable->pNameHashes = STORM_ALLOC(BYTE, dwTotalCount);
-        if(pHetTable->pNameHashes != NULL)
-        {
-            // Make sure the data are initialized
-            memset(pHetTable->pNameHashes, 0, dwTotalCount);
-
-            // Allocate the bit array for file indexes
-            pHetTable->pBetIndexes = CreateBitArray(dwTotalCount * pHetTable->dwIndexSizeTotal, 0xFF);
-            if(pHetTable->pBetIndexes != NULL)
-            {
-                // Initialize the HET table from the source data (if given)
-                if(pbSrcData != NULL)
-                {
-                    // Copy the name hashes
-                    memcpy(pHetTable->pNameHashes, pbSrcData, dwTotalCount);
-
-                    // Copy the file indexes
-                    memcpy(pHetTable->pBetIndexes->Elements, pbSrcData + dwTotalCount, pHetTable->pBetIndexes->NumberOfBytes);
-                }
-                
-                // Return the result HET table
-                return pHetTable;
-            }
-
-            // Free the name hashes
-            STORM_FREE(pHetTable->pNameHashes);
-        }
-
-        STORM_FREE(pHetTable);
+        pHetTable->OrMask64 = (ULONGLONG)1 << (dwHashBitSize - 1);
     }
 
-    // Failed
-    return NULL;
+    return pHetTable;
 }
 
-static int InsertHetEntry(TMPQHetTable * pHetTable, ULONGLONG FileNameHash, DWORD dwFileIndex)
-{
-    DWORD StartIndex;
-    DWORD Index;
-    BYTE NameHash1;
-
-    // Get the start index and the high 8 bits of the name hash
-    StartIndex = Index = (DWORD)(FileNameHash % pHetTable->dwTotalCount);
-    NameHash1 = (BYTE)(FileNameHash >> (pHetTable->dwNameHashBitSize - 8));
-
-    // Find a place where to put it
-    for(;;)
-    {
-        // Did we find a free HET entry?
-        if(pHetTable->pNameHashes[Index] == HET_ENTRY_FREE)
-        {
-            // Set the entry in the name hash table
-            pHetTable->pNameHashes[Index] = NameHash1;
-
-            // Set the entry in the file index table
-            SetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * Index,
-                                            pHetTable->dwIndexSize,
-                                           &dwFileIndex,
-                                            4);
-            return ERROR_SUCCESS;
-        }
-
-        // Move to the next entry in the HET table
-        // If we came to the start index again, we are done
-        Index = (Index + 1) % pHetTable->dwTotalCount;
-        if(Index == StartIndex)
-            break;
-    }
-
-    // No space in the HET table. Should never happen,
-    // because the HET table is created according to the number of files
-    assert(false);
-    return ERROR_DISK_FULL;
-}
-
-static TMPQHetTable * TranslateHetTable(TMPQHetHeader * pHetHeader)
+static TMPQHetTable * TranslateHetTable(TMPQExtTable * pExtTable)
 {
+    HET_TABLE_HEADER HetHeader;
     TMPQHetTable * pHetTable = NULL;
-    LPBYTE pbSrcData = (LPBYTE)(pHetHeader + 1);
+    LPBYTE pbSrcData = (LPBYTE)(pExtTable + 1);
 
     // Sanity check
-    assert(pHetHeader->ExtHdr.dwSignature == HET_TABLE_SIGNATURE);
-    assert(pHetHeader->ExtHdr.dwVersion == 1);
+    assert(pExtTable->dwSignature == HET_TABLE_SIGNATURE);
+    assert(pExtTable->dwVersion == 1);
 
     // Verify size of the HET table
-    if(pHetHeader->ExtHdr.dwDataSize >= (sizeof(TMPQHetHeader) - sizeof(TMPQExtHeader)))
+    if(pExtTable != NULL && pExtTable->dwDataSize >= sizeof(HET_TABLE_HEADER))
     {
+        // Copy the table header in order to have it aligned and swapped
+        memcpy(&HetHeader, pbSrcData, sizeof(HET_TABLE_HEADER));
+        BSWAP_ARRAY32_UNSIGNED(&HetHeader, sizeof(HET_TABLE_HEADER));
+        pbSrcData += sizeof(HET_TABLE_HEADER);
+
         // Verify the size of the table in the header
-        if(pHetHeader->dwTableSize == pHetHeader->ExtHdr.dwDataSize)
+        if(HetHeader.dwTableSize == pExtTable->dwDataSize)
         {
-            // The size of the HET table must be sum of header, hash and index table size
-            assert((sizeof(TMPQHetHeader) - sizeof(TMPQExtHeader) + pHetHeader->dwTotalCount + pHetHeader->dwIndexTableSize) == pHetHeader->dwTableSize);
-
-            // So far, all MPQs with HET Table have had total number of entries equal to 4/3 of file count
-            // Exception: "2010 - Starcraft II\!maps\Tya's Zerg Defense (unprotected).SC2Map"
-//          assert(((pHetHeader->dwEntryCount * 4) / 3) == pHetHeader->dwTotalCount);
-
-            // The size of one index is predictable as well
-            assert(GetNecessaryBitCount(pHetHeader->dwEntryCount) == pHetHeader->dwIndexSizeTotal);
-
-            // The size of index table (in entries) is expected
-            // to be the same like the hash table size (in bytes)
-            assert(((pHetHeader->dwTotalCount * pHetHeader->dwIndexSizeTotal) + 7) / 8 == pHetHeader->dwIndexTableSize);
-            
             // Create translated table
-            pHetTable = CreateHetTable(pHetHeader->dwEntryCount, pHetHeader->dwTotalCount, pHetHeader->dwNameHashBitSize, pbSrcData);
+            pHetTable = CreateHetTable(HetHeader.dwMaxFileCount, HetHeader.dwHashEntrySize, false);
             if(pHetTable != NULL)
             {
-                // Now the sizes in the hash table should be already set
-                assert(pHetTable->dwEntryCount     == pHetHeader->dwEntryCount);
-                assert(pHetTable->dwTotalCount     == pHetHeader->dwTotalCount);
-                assert(pHetTable->dwIndexSizeTotal == pHetHeader->dwIndexSizeTotal);
+                // Copy the hash table size, index size and extra bits from the HET header
+                pHetTable->dwHashTableSize  = HetHeader.dwHashTableSize;
+                pHetTable->dwIndexSizeTotal = HetHeader.dwIndexSizeTotal;
+                pHetTable->dwIndexSizeExtra = HetHeader.dwIndexSizeExtra;
 
-                // Copy the missing variables
-                pHetTable->dwIndexSizeExtra = pHetHeader->dwIndexSizeExtra;
-                pHetTable->dwIndexSize      = pHetHeader->dwIndexSize;
+                // Fill the hash table
+                if(pHetTable->pHetHashes != NULL)
+                    memcpy(pHetTable->pHetHashes, pbSrcData, pHetTable->dwHashTableSize);
+                pbSrcData += pHetTable->dwHashTableSize;
+
+                // Copy the block index table
+                pHetTable->pBetIndexes = CreateBitArray(HetHeader.dwIndexTableSize * 8, 0xFF);
+                if(pHetTable->pBetIndexes != NULL)
+                    memcpy(pHetTable->pBetIndexes->Elements, pbSrcData, HetHeader.dwIndexTableSize);
+                pbSrcData += HetHeader.dwIndexTableSize;
             }
         }
     }
@@ -1196,97 +767,110 @@ static TMPQHetTable * TranslateHetTable(TMPQHetHeader * pHetHeader)
     return pHetTable;
 }
 
-static TMPQExtHeader * TranslateHetTable(TMPQHetTable * pHetTable, ULONGLONG * pcbHetTable)
+static TMPQExtTable * TranslateHetTable(TMPQHetTable * pHetTable, ULONGLONG * pcbHetTable)
 {
-    TMPQHetHeader * pHetHeader = NULL;
-    TMPQHetHeader HetHeader;
+    TMPQExtTable * pExtTable = NULL;
+    HET_TABLE_HEADER HetHeader;
     LPBYTE pbLinearTable = NULL;
     LPBYTE pbTrgData;
+    size_t HetTableSize;
 
     // Prepare header of the HET table
     CreateHetHeader(pHetTable, &HetHeader);
 
+    // Calculate the total size needed for holding the encrypted HET table
+    HetTableSize = HetHeader.dwTableSize;
+
     // Allocate space for the linear table
-    pbLinearTable = STORM_ALLOC(BYTE, sizeof(TMPQExtHeader) + HetHeader.dwTableSize);
+    pbLinearTable = STORM_ALLOC(BYTE, sizeof(TMPQExtTable) + HetTableSize);
     if(pbLinearTable != NULL)
     {
-        // Copy the table header
-        pHetHeader = (TMPQHetHeader *)pbLinearTable;
-        memcpy(pHetHeader, &HetHeader, sizeof(TMPQHetHeader));
-        pbTrgData = (LPBYTE)(pHetHeader + 1);
+        // Create the common ext table header
+        pExtTable = (TMPQExtTable *)pbLinearTable;
+        pExtTable->dwSignature = HET_TABLE_SIGNATURE;
+        pExtTable->dwVersion   = 1;
+        pExtTable->dwDataSize  = (DWORD)HetTableSize;
+        pbTrgData = (LPBYTE)(pExtTable + 1);
 
-        // Copy the array of name hashes
-        memcpy(pbTrgData, pHetTable->pNameHashes, pHetTable->dwTotalCount);
-        pbTrgData += pHetTable->dwTotalCount;
+        // Copy the HET table header
+        memcpy(pbTrgData, &HetHeader, sizeof(HET_TABLE_HEADER));
+        BSWAP_ARRAY32_UNSIGNED(pbTrgData, sizeof(HET_TABLE_HEADER));
+        pbTrgData += sizeof(HET_TABLE_HEADER);
+
+        // Copy the array of HET hashes
+        memcpy(pbTrgData, pHetTable->pHetHashes, pHetTable->dwHashTableSize);
+        pbTrgData += pHetTable->dwHashTableSize;
 
         // Copy the bit array of BET indexes
         memcpy(pbTrgData, pHetTable->pBetIndexes->Elements, HetHeader.dwIndexTableSize);
 
-        // Calculate the total size of the table, including the TMPQExtHeader
+        // Calculate the total size of the table, including the TMPQExtTable
         if(pcbHetTable != NULL)
         {
-            *pcbHetTable = (ULONGLONG)(sizeof(TMPQExtHeader) + HetHeader.dwTableSize);
+            *pcbHetTable = (ULONGLONG)(sizeof(TMPQExtTable) + HetTableSize);
         }
     }
 
-    return &pHetHeader->ExtHdr;
+    return pExtTable;
 }
 
 DWORD GetFileIndex_Het(TMPQArchive * ha, const char * szFileName)
 {
     TMPQHetTable * pHetTable = ha->pHetTable;
     ULONGLONG FileNameHash;
+    ULONGLONG AndMask64;
+    ULONGLONG OrMask64;
+    ULONGLONG BetHash;
     DWORD StartIndex;
     DWORD Index;
-    BYTE NameHash1;                 // Upper 8 bits of the masked file name hash
-
-    // If there are no entries in the HET table, do nothing
-    if(pHetTable->dwEntryCount == 0)
-        return HASH_ENTRY_FREE;
+    BYTE HetHash;                   // Upper 8 bits of the masked file name hash
 
     // Do nothing if the MPQ has no HET table
     assert(ha->pHetTable != NULL);
 
     // Calculate 64-bit hash of the file name
-    FileNameHash = (HashStringJenkins(szFileName) & pHetTable->AndMask64) | pHetTable->OrMask64;
+    AndMask64 = pHetTable->AndMask64;
+    OrMask64 = pHetTable->OrMask64;
+    FileNameHash = (HashStringJenkins(szFileName) & AndMask64) | OrMask64;
 
     // Split the file name hash into two parts:
-    // NameHash1: The highest 8 bits of the name hash
-    // NameHash2: File name hash limited to hash size
-    // Note: Our file table contains full name hash, no need to cut the high 8 bits before comparison
-    NameHash1 = (BYTE)(FileNameHash >> (pHetTable->dwNameHashBitSize - 8));
+    // Part 1: The highest 8 bits of the name hash
+    // Part 2: The rest of the name hash (without the highest 8 bits)
+    HetHash = (BYTE)(FileNameHash >> (pHetTable->dwHashBitSize - 8));
+    BetHash = FileNameHash & (AndMask64 >> 0x08);
 
     // Calculate the starting index to the hash table
-    StartIndex = Index = (DWORD)(FileNameHash % pHetTable->dwTotalCount);
+    StartIndex = Index = (DWORD)(FileNameHash % pHetTable->dwHashTableSize);
 
     // Go through HET table until we find a terminator
-    while(pHetTable->pNameHashes[Index] != HET_ENTRY_FREE)
+    while(pHetTable->pHetHashes[Index] != HET_ENTRY_FREE)
     {
-        // Did we find a match ?
-        if(pHetTable->pNameHashes[Index] == NameHash1)
+        // Did we find match ?
+        if(pHetTable->pHetHashes[Index] == HetHash)
         {
             DWORD dwFileIndex = 0;
 
-            // Get the file index
+            // Get the index of the BetHash
             GetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * Index,
                                             pHetTable->dwIndexSize,
-                                           &dwFileIndex,
+                                            &dwFileIndex,
                                             4);
+
             //
             // TODO: This condition only happens when we are opening a MPQ
-            // where some files were deleted by StormLib. Perhaps 
+            // where some files were deleted by StormLib. Perhaps
             // we should not allow shrinking of the file table in MPQs v 4.0?
             // assert(dwFileIndex <= ha->dwFileTableSize);
             //
 
-            // Verify the FileNameHash against the entry in the table of name hashes
-            if(dwFileIndex <= ha->dwFileTableSize && ha->pFileTable[dwFileIndex].FileNameHash == FileNameHash)
+            // Verify the BetHash against the entry in the table of BET hashes
+            if(dwFileIndex <= ha->dwFileTableSize && ha->pFileTable[dwFileIndex].BetHash == BetHash)
                 return dwFileIndex;
         }
 
-        // Move to the next entry in the HET table
+        // Move to the next entry in the primary search table
         // If we came to the start index again, we are done
-        Index = (Index + 1) % pHetTable->dwTotalCount;
+        Index = (Index + 1) % pHetTable->dwHashTableSize;
         if(Index == StartIndex)
             break;
     }
@@ -1295,12 +879,94 @@ DWORD GetFileIndex_Het(TMPQArchive * ha, const char * szFileName)
     return HASH_ENTRY_FREE;
 }
 
+DWORD AllocateHetEntry(
+        TMPQArchive * ha,
+        TFileEntry * pFileEntry)
+{
+    TMPQHetTable * pHetTable = ha->pHetTable;
+    ULONGLONG FileNameHash;
+    ULONGLONG AndMask64;
+    ULONGLONG OrMask64;
+    ULONGLONG BetHash;
+    DWORD FreeHetIndex = HASH_ENTRY_FREE;
+    DWORD dwFileIndex;
+    DWORD StartIndex;
+    DWORD Index;
+    BYTE HetHash;                   // Upper 8 bits of the masked file name hash
+
+    // Do nothing if the MPQ has no HET table
+    assert(ha->pHetTable != NULL);
+
+    // Calculate 64-bit hash of the file name
+    AndMask64 = pHetTable->AndMask64;
+    OrMask64 = pHetTable->OrMask64;
+    FileNameHash = (HashStringJenkins(pFileEntry->szFileName) & AndMask64) | OrMask64;
+
+    // Calculate the starting index to the hash table
+    StartIndex = Index = (DWORD)(FileNameHash % pHetTable->dwHashTableSize);
+
+    // Split the file name hash into two parts:
+    // Part 1: The highest 8 bits of the name hash
+    // Part 2: The rest of the name hash (without the highest 8 bits)
+    HetHash = (BYTE)(FileNameHash >> (pHetTable->dwHashBitSize - 8));
+    BetHash = FileNameHash & (AndMask64 >> 0x08);
+
+    // Go through HET table until we find a terminator
+    for(;;)
+    {
+        // Check for entries that might have been deleted
+        if(pHetTable->pHetHashes[Index] == HET_ENTRY_DELETED)
+        {
+            DWORD dwInvalidBetIndex = (1 << pHetTable->dwIndexSizeTotal) - 1;
+            DWORD dwBetIndex = 0;
+
+            // Verify the BET index. If it's really free, we can use it
+            dwFileIndex = (DWORD)(pFileEntry - ha->pFileTable);
+            GetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * Index,
+                                            pHetTable->dwIndexSize,
+                                            &dwBetIndex,
+                                            4);
+
+            if(dwBetIndex == dwInvalidBetIndex)
+            {
+                FreeHetIndex = Index;
+                break;
+            }
+        }
+
+        // Is that entry free ?
+        if(pHetTable->pHetHashes[Index] == HET_ENTRY_FREE)
+        {
+            FreeHetIndex = Index;
+            break;
+        }
+
+        // Move to the next entry in the primary search table
+        // If we came to the start index again, we are done
+        Index = (Index + 1) % pHetTable->dwHashTableSize;
+        if(Index == StartIndex)
+            return HASH_ENTRY_FREE;
+    }
+
+    // Fill the HET table entry
+    dwFileIndex = (DWORD)(pFileEntry - ha->pFileTable);
+    pHetTable->pHetHashes[FreeHetIndex] = HetHash;
+    SetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * FreeHetIndex,
+                                    pHetTable->dwIndexSize,
+                                    &dwFileIndex,
+                                    4);
+    // Fill the file entry
+    pFileEntry->BetHash    = BetHash;
+    pFileEntry->dwHetIndex = FreeHetIndex;
+    return FreeHetIndex;
+}
+
 void FreeHetTable(TMPQHetTable * pHetTable)
 {
     if(pHetTable != NULL)
     {
-        if(pHetTable->pNameHashes != NULL)
-            STORM_FREE(pHetTable->pNameHashes);
+        if(pHetTable->pHetHashes != NULL)
+            STORM_FREE(pHetTable->pHetHashes);
         if(pHetTable->pBetIndexes != NULL)
             STORM_FREE(pHetTable->pBetIndexes);
 
@@ -1312,8 +978,8 @@ void FreeHetTable(TMPQHetTable * pHetTable)
 // Support for BET table
 
 static void CreateBetHeader(
-    TMPQArchive * ha,
-    TMPQBetHeader * pBetHeader)
+        TMPQArchive * ha,
+        PBET_TABLE_HEADER pBetHeader)
 {
     TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
     TFileEntry * pFileEntry;
@@ -1327,18 +993,9 @@ static void CreateBetHeader(
     // Initialize array of flag combinations
     InitFileFlagArray(FlagArray);
 
-    // Fill the common header
-    pBetHeader->ExtHdr.dwSignature  = BET_TABLE_SIGNATURE;
-    pBetHeader->ExtHdr.dwVersion    = 1;
-    pBetHeader->ExtHdr.dwDataSize   = 0;
-
     // Get the maximum values for the BET table
     for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
     {
-        //
-        // Note: Deleted files must be counted as well
-        //
-
         // Highest file position in the MPQ
         if(pFileEntry->ByteOffset > MaxByteOffset)
             MaxByteOffset = pFileEntry->ByteOffset;
@@ -1375,31 +1032,30 @@ static void CreateBetHeader(
 
     // Calculate the total size of one entry
     pBetHeader->dwTableEntrySize     = pBetHeader->dwBitCount_FilePos +
-                                       pBetHeader->dwBitCount_FileSize +
-                                       pBetHeader->dwBitCount_CmpSize +
-                                       pBetHeader->dwBitCount_FlagIndex +
-                                       pBetHeader->dwBitCount_Unknown;
+            pBetHeader->dwBitCount_FileSize +
+            pBetHeader->dwBitCount_CmpSize +
+            pBetHeader->dwBitCount_FlagIndex +
+            pBetHeader->dwBitCount_Unknown;
 
     // Save the file count and flag count
-    pBetHeader->dwEntryCount         = ha->dwFileTableSize;
+    pBetHeader->dwFileCount          = ha->dwFileTableSize;
     pBetHeader->dwFlagCount          = dwMaxFlagIndex + 1;
     pBetHeader->dwUnknown08          = 0x10;
 
     // Save the total size of the BET hash
-    pBetHeader->dwBitTotal_NameHash2 = ha->pHetTable->dwNameHashBitSize - 0x08;
-    pBetHeader->dwBitExtra_NameHash2 = 0;
-    pBetHeader->dwBitCount_NameHash2 = pBetHeader->dwBitTotal_NameHash2;
-    pBetHeader->dwNameHashArraySize  = ((pBetHeader->dwBitTotal_NameHash2 * pBetHeader->dwEntryCount) + 7) / 8;
+    pBetHeader->dwBetHashSizeTotal   = ha->pHetTable->dwHashBitSize - 0x08;
+    pBetHeader->dwBetHashSizeExtra   = 0;
+    pBetHeader->dwBetHashSize        = pBetHeader->dwBetHashSizeTotal;
+    pBetHeader->dwBetHashArraySize   = ((pBetHeader->dwBetHashSizeTotal * pBetHeader->dwFileCount) + 7) / 8;
 
     // Save the total table size
-    pBetHeader->ExtHdr.dwDataSize    =
-    pBetHeader->dwTableSize          = sizeof(TMPQBetHeader) - sizeof(TMPQExtHeader) +
-                                       pBetHeader->dwFlagCount * sizeof(DWORD) +
-                                     ((pBetHeader->dwTableEntrySize * pBetHeader->dwEntryCount) + 7) / 8 +
-                                      pBetHeader->dwNameHashArraySize;
+    pBetHeader->dwTableSize          = sizeof(BET_TABLE_HEADER) +
+            pBetHeader->dwFlagCount * sizeof(DWORD) +
+            ((pBetHeader->dwTableEntrySize * pBetHeader->dwFileCount) + 7) / 8 +
+            pBetHeader->dwBetHashArraySize;
 }
 
-TMPQBetTable * CreateBetTable(DWORD dwEntryCount)
+TMPQBetTable * CreateBetTable(DWORD dwFileCount)
 {
     TMPQBetTable * pBetTable;
 
@@ -1408,98 +1064,101 @@ TMPQBetTable * CreateBetTable(DWORD dwEntryCount)
     if(pBetTable != NULL)
     {
         memset(pBetTable, 0, sizeof(TMPQBetTable));
-        pBetTable->dwEntryCount = dwEntryCount;
+        pBetTable->dwFileCount = dwFileCount;
     }
 
     return pBetTable;
 }
 
 static TMPQBetTable * TranslateBetTable(
-    TMPQArchive * ha,
-    TMPQBetHeader * pBetHeader)
+        TMPQArchive * ha,
+        TMPQExtTable * pExtTable)
 {
+    BET_TABLE_HEADER BetHeader;
     TMPQBetTable * pBetTable = NULL;
-    LPBYTE pbSrcData = (LPBYTE)(pBetHeader + 1);
+    LPBYTE pbSrcData = (LPBYTE)(pExtTable + 1);
     DWORD LengthInBytes;
 
     // Sanity check
-    assert(pBetHeader->ExtHdr.dwSignature == BET_TABLE_SIGNATURE);
-    assert(pBetHeader->ExtHdr.dwVersion == 1);
+    assert(pExtTable->dwSignature == BET_TABLE_SIGNATURE);
+    assert(pExtTable->dwVersion == 1);
     assert(ha->pHetTable != NULL);
     ha = ha;
 
     // Verify size of the HET table
-    if(pBetHeader->ExtHdr.dwDataSize >= (sizeof(TMPQBetHeader) - sizeof(TMPQExtHeader)))
+    if(pExtTable != NULL && pExtTable->dwDataSize >= sizeof(BET_TABLE_HEADER))
     {
+        // Copy the table header in order to have it aligned and swapped
+        memcpy(&BetHeader, pbSrcData, sizeof(BET_TABLE_HEADER));
+        BSWAP_ARRAY32_UNSIGNED(&BetHeader, sizeof(BET_TABLE_HEADER));
+        pbSrcData += sizeof(BET_TABLE_HEADER);
+
+        // Some MPQs affected by a bug in StormLib have pBetTable->dwFileCount
+        // greater than ha->dwMaxFileCount
+        if(BetHeader.dwFileCount > ha->dwMaxFileCount)
+            return NULL;
+
         // Verify the size of the table in the header
-        if(pBetHeader->dwTableSize == pBetHeader->ExtHdr.dwDataSize)
+        if(BetHeader.dwTableSize == pExtTable->dwDataSize)
         {
-            // The number of entries in the BET table must be the same like number of entries in the block table
-            assert(pBetHeader->dwEntryCount == ha->pHeader->dwBlockTableSize);
-            assert(pBetHeader->dwEntryCount <= ha->dwMaxFileCount);
-
-            // The number of entries in the BET table must be the same like number of entries in the HET table
-            // Note that if it's not, it is not a problem
-            //assert(pBetHeader->dwEntryCount == ha->pHetTable->dwEntryCount);
-
             // Create translated table
-            pBetTable = CreateBetTable(pBetHeader->dwEntryCount);
+            pBetTable = CreateBetTable(BetHeader.dwFileCount);
             if(pBetTable != NULL)
             {
                 // Copy the variables from the header to the BetTable
-                pBetTable->dwTableEntrySize     = pBetHeader->dwTableEntrySize;
-                pBetTable->dwBitIndex_FilePos   = pBetHeader->dwBitIndex_FilePos;
-                pBetTable->dwBitIndex_FileSize  = pBetHeader->dwBitIndex_FileSize;
-                pBetTable->dwBitIndex_CmpSize   = pBetHeader->dwBitIndex_CmpSize;
-                pBetTable->dwBitIndex_FlagIndex = pBetHeader->dwBitIndex_FlagIndex;
-                pBetTable->dwBitIndex_Unknown   = pBetHeader->dwBitIndex_Unknown;
-                pBetTable->dwBitCount_FilePos   = pBetHeader->dwBitCount_FilePos;
-                pBetTable->dwBitCount_FileSize  = pBetHeader->dwBitCount_FileSize;
-                pBetTable->dwBitCount_CmpSize   = pBetHeader->dwBitCount_CmpSize;
-                pBetTable->dwBitCount_FlagIndex = pBetHeader->dwBitCount_FlagIndex;
-                pBetTable->dwBitCount_Unknown   = pBetHeader->dwBitCount_Unknown;
+                pBetTable->dwTableEntrySize     = BetHeader.dwTableEntrySize;
+                pBetTable->dwBitIndex_FilePos   = BetHeader.dwBitIndex_FilePos;
+                pBetTable->dwBitIndex_FileSize  = BetHeader.dwBitIndex_FileSize;
+                pBetTable->dwBitIndex_CmpSize   = BetHeader.dwBitIndex_CmpSize;
+                pBetTable->dwBitIndex_FlagIndex = BetHeader.dwBitIndex_FlagIndex;
+                pBetTable->dwBitIndex_Unknown   = BetHeader.dwBitIndex_Unknown;
+                pBetTable->dwBitCount_FilePos   = BetHeader.dwBitCount_FilePos;
+                pBetTable->dwBitCount_FileSize  = BetHeader.dwBitCount_FileSize;
+                pBetTable->dwBitCount_CmpSize   = BetHeader.dwBitCount_CmpSize;
+                pBetTable->dwBitCount_FlagIndex = BetHeader.dwBitCount_FlagIndex;
+                pBetTable->dwBitCount_Unknown   = BetHeader.dwBitCount_Unknown;
 
-                // Since we don't know what the "unknown" is, we'll assert when it's zero
+                // Since we don't know what the "unknown" is, we'll assert when it's nonzero
                 assert(pBetTable->dwBitCount_Unknown == 0);
 
                 // Allocate array for flags
-                if(pBetHeader->dwFlagCount != 0)
+                if(BetHeader.dwFlagCount != 0)
                 {
                     // Allocate array for file flags and load it
-                    pBetTable->pFileFlags = STORM_ALLOC(DWORD, pBetHeader->dwFlagCount);
+                    pBetTable->pFileFlags = STORM_ALLOC(DWORD, BetHeader.dwFlagCount);
                     if(pBetTable->pFileFlags != NULL)
                     {
-                        LengthInBytes = pBetHeader->dwFlagCount * sizeof(DWORD);
+                        LengthInBytes = BetHeader.dwFlagCount * sizeof(DWORD);
                         memcpy(pBetTable->pFileFlags, pbSrcData, LengthInBytes);
                         BSWAP_ARRAY32_UNSIGNED(pBetTable->pFileFlags, LengthInBytes);
                         pbSrcData += LengthInBytes;
                     }
 
                     // Save the number of flags
-                    pBetTable->dwFlagCount = pBetHeader->dwFlagCount;
+                    pBetTable->dwFlagCount = BetHeader.dwFlagCount;
                 }
 
                 // Load the bit-based file table
-                pBetTable->pFileTable = CreateBitArray(pBetTable->dwTableEntrySize * pBetHeader->dwEntryCount, 0);
+                pBetTable->pFileTable = CreateBitArray(pBetTable->dwTableEntrySize * BetHeader.dwFileCount, 0);
                 LengthInBytes = (pBetTable->pFileTable->NumberOfBits + 7) / 8;
                 if(pBetTable->pFileTable != NULL)
                     memcpy(pBetTable->pFileTable->Elements, pbSrcData, LengthInBytes);
                 pbSrcData += LengthInBytes;
 
                 // Fill the sizes of BET hash
-                pBetTable->dwBitTotal_NameHash2 = pBetHeader->dwBitTotal_NameHash2;
-                pBetTable->dwBitExtra_NameHash2 = pBetHeader->dwBitExtra_NameHash2;
-                pBetTable->dwBitCount_NameHash2 = pBetHeader->dwBitCount_NameHash2;
-                
+                pBetTable->dwBetHashSizeTotal = BetHeader.dwBetHashSizeTotal;
+                pBetTable->dwBetHashSizeExtra = BetHeader.dwBetHashSizeExtra;
+                pBetTable->dwBetHashSize      = BetHeader.dwBetHashSize;
+
                 // Create and load the array of BET hashes
-                pBetTable->pNameHashes = CreateBitArray(pBetTable->dwBitTotal_NameHash2 * pBetHeader->dwEntryCount, 0);
-                LengthInBytes = (pBetTable->pNameHashes->NumberOfBits + 7) / 8;
-                if(pBetTable->pNameHashes != NULL)
-                    memcpy(pBetTable->pNameHashes->Elements, pbSrcData, LengthInBytes);
-//              pbSrcData += pBetHeader->dwNameHashArraySize;
+                pBetTable->pBetHashes = CreateBitArray(pBetTable->dwBetHashSizeTotal * BetHeader.dwFileCount, 0);
+                LengthInBytes = (pBetTable->pBetHashes->NumberOfBits + 7) / 8;
+                if(pBetTable->pBetHashes != NULL)
+                    memcpy(pBetTable->pBetHashes->Elements, pbSrcData, LengthInBytes);
+                pbSrcData += BetHeader.dwBetHashArraySize;
 
                 // Dump both tables
-//              DumpHetAndBetTable(ha->pHetTable, pBetTable);
+                //              DumpHetAndBetTable(ha->pHetTable, pBetTable);
             }
         }
     }
@@ -1507,66 +1166,82 @@ static TMPQBetTable * TranslateBetTable(
     return pBetTable;
 }
 
-TMPQExtHeader * TranslateBetTable(
-    TMPQArchive * ha,
-    ULONGLONG * pcbBetTable)
+TMPQExtTable * TranslateBetTable(
+        TMPQArchive * ha,
+        ULONGLONG * pcbBetTable)
 {
-    TMPQBetHeader * pBetHeader = NULL;
-    TMPQBetHeader BetHeader;
-    TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-    TFileEntry * pFileEntry;
+    TMPQExtTable * pExtTable = NULL;
+    BET_TABLE_HEADER BetHeader;
     TBitArray * pBitArray = NULL;
     LPBYTE pbLinearTable = NULL;
     LPBYTE pbTrgData;
+    size_t BetTableSize;
     DWORD LengthInBytes;
     DWORD FlagArray[MAX_FLAG_INDEX];
+    DWORD i;
 
     // Calculate the bit sizes of various entries
     InitFileFlagArray(FlagArray);
     CreateBetHeader(ha, &BetHeader);
 
+    // Calculate the size of the BET table
+    BetTableSize = sizeof(BET_TABLE_HEADER) +
+            BetHeader.dwFlagCount * sizeof(DWORD) +
+            ((BetHeader.dwTableEntrySize * BetHeader.dwFileCount) + 7) / 8 +
+            BetHeader.dwBetHashArraySize;
+
     // Allocate space
-    pbLinearTable = STORM_ALLOC(BYTE, sizeof(TMPQExtHeader) + BetHeader.dwTableSize);
+    pbLinearTable = STORM_ALLOC(BYTE, sizeof(TMPQExtTable) + BetTableSize);
     if(pbLinearTable != NULL)
     {
-        // Copy the BET header to the linear buffer
-        pBetHeader = (TMPQBetHeader *)pbLinearTable;
-        memcpy(pBetHeader, &BetHeader, sizeof(TMPQBetHeader));
-        pbTrgData = (LPBYTE)(pBetHeader + 1);
+        // Create the common ext table header
+        pExtTable = (TMPQExtTable *)pbLinearTable;
+        pExtTable->dwSignature = BET_TABLE_SIGNATURE;
+        pExtTable->dwVersion   = 1;
+        pExtTable->dwDataSize  = (DWORD)BetTableSize;
+        pbTrgData = (LPBYTE)(pExtTable + 1);
+
+        // Copy the BET table header
+        memcpy(pbTrgData, &BetHeader, sizeof(BET_TABLE_HEADER));
+        BSWAP_ARRAY32_UNSIGNED(pbTrgData, sizeof(BET_TABLE_HEADER));
+        pbTrgData += sizeof(BET_TABLE_HEADER);
 
         // Save the bit-based block table
-        pBitArray = CreateBitArray(BetHeader.dwEntryCount * BetHeader.dwTableEntrySize, 0);
+        pBitArray = CreateBitArray(BetHeader.dwFileCount * BetHeader.dwTableEntrySize, 0);
         if(pBitArray != NULL)
         {
+            TFileEntry * pFileEntry = ha->pFileTable;
             DWORD dwFlagIndex = 0;
             DWORD nBitOffset = 0;
 
-            // Construct the bit-based file table
-            for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
+            // Construct the array of flag values and bit-based file table
+            for(i = 0; i < BetHeader.dwFileCount; i++, pFileEntry++)
             {
                 //
-                // Note: Missing files must be included as well
+                // Note: Blizzard MPQs contain valid values even for non-existant files
+                // (FilePos, FileSize, CmpSize and FlagIndex)
+                // Note: If flags is zero, it must be in the flag table too !!!
                 //
 
                 // Save the byte offset
                 SetBits(pBitArray, nBitOffset + BetHeader.dwBitIndex_FilePos,
                                    BetHeader.dwBitCount_FilePos,
-                                  &pFileEntry->ByteOffset,
+                                   &pFileEntry->ByteOffset,
                                    8);
                 SetBits(pBitArray, nBitOffset + BetHeader.dwBitIndex_FileSize,
                                    BetHeader.dwBitCount_FileSize,
-                                  &pFileEntry->dwFileSize,
+                                   &pFileEntry->dwFileSize,
                                    4);
                 SetBits(pBitArray, nBitOffset + BetHeader.dwBitIndex_CmpSize,
                                    BetHeader.dwBitCount_CmpSize,
-                                  &pFileEntry->dwCmpSize,
+                                   &pFileEntry->dwCmpSize,
                                    4);
 
                 // Save the flag index
                 dwFlagIndex = GetFileFlagIndex(FlagArray, pFileEntry->dwFlags);
                 SetBits(pBitArray, nBitOffset + BetHeader.dwBitIndex_FlagIndex,
                                    BetHeader.dwBitCount_FlagIndex,
-                                  &dwFlagIndex,
+                                   &dwFlagIndex,
                                    4);
 
                 // Move the bit offset
@@ -1588,28 +1263,39 @@ TMPQExtHeader * TranslateBetTable(
             STORM_FREE(pBitArray);
         }
 
-        // Create bit array for name hashes
-        pBitArray = CreateBitArray(BetHeader.dwBitTotal_NameHash2 * BetHeader.dwEntryCount, 0);
+        // Create bit array for BET hashes
+        pBitArray = CreateBitArray(BetHeader.dwBetHashSizeTotal * BetHeader.dwFileCount, 0);
         if(pBitArray != NULL)
         {
-            DWORD dwFileIndex = 0;
+            TFileEntry * pFileEntry = ha->pFileTable;
+            ULONGLONG AndMask64 = ha->pHetTable->AndMask64;
+            ULONGLONG OrMask64 = ha->pHetTable->OrMask64;
 
-            for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
+            for(i = 0; i < BetHeader.dwFileCount; i++)
             {
+                ULONGLONG FileNameHash = 0;
+
+                // Calculate 64-bit hash of the file name
+                if((pFileEntry->dwFlags & MPQ_FILE_EXISTS) && pFileEntry->szFileName != NULL)
+                {
+                    FileNameHash = (HashStringJenkins(pFileEntry->szFileName) & AndMask64) | OrMask64;
+                    FileNameHash = FileNameHash & (AndMask64 >> 0x08);
+                }
+
                 // Insert the name hash to the bit array
-                SetBits(pBitArray, BetHeader.dwBitTotal_NameHash2 * dwFileIndex,
-                                   BetHeader.dwBitCount_NameHash2,
-                                  &pFileEntry->FileNameHash,
+                SetBits(pBitArray, BetHeader.dwBetHashSizeTotal * i,
+                                   BetHeader.dwBetHashSize,
+                                   &FileNameHash,
                                    8);
-                
-                assert(dwFileIndex < BetHeader.dwEntryCount);
-                dwFileIndex++;
+
+                // Move to the next file entry
+                pFileEntry++;
             }
 
             // Write the array of BET hashes
             LengthInBytes = (pBitArray->NumberOfBits + 7) / 8;
             memcpy(pbTrgData, pBitArray->Elements, LengthInBytes);
-//          pbTrgData += LengthInBytes;
+            pbTrgData += LengthInBytes;
 
             // Free the bit array
             STORM_FREE(pBitArray);
@@ -1618,11 +1304,11 @@ TMPQExtHeader * TranslateBetTable(
         // Write the size of the BET table in the MPQ
         if(pcbBetTable != NULL)
         {
-            *pcbBetTable = (ULONGLONG)(sizeof(TMPQExtHeader) + BetHeader.dwTableSize);
+            *pcbBetTable = (ULONGLONG)(sizeof(TMPQExtTable) + BetTableSize);
         }
     }
 
-    return &pBetHeader->ExtHdr;
+    return pExtTable;
 }
 
 void FreeBetTable(TMPQBetTable * pBetTable)
@@ -1633,8 +1319,8 @@ void FreeBetTable(TMPQBetTable * pBetTable)
             STORM_FREE(pBetTable->pFileTable);
         if(pBetTable->pFileFlags != NULL)
             STORM_FREE(pBetTable->pFileFlags);
-        if(pBetTable->pNameHashes != NULL)
-            STORM_FREE(pBetTable->pNameHashes);
+        if(pBetTable->pBetHashes != NULL)
+            STORM_FREE(pBetTable->pBetHashes);
 
         STORM_FREE(pBetTable);
     }
@@ -1663,7 +1349,7 @@ TFileEntry * GetFileEntryAny(TMPQArchive * ha, const char * szFileName)
         if(pHash != NULL && pHash->dwBlockIndex < ha->dwFileTableSize)
             return ha->pFileTable + pHash->dwBlockIndex;
     }
-    
+
     // Not found
     return NULL;
 }
@@ -1688,7 +1374,7 @@ TFileEntry * GetFileEntryLocale(TMPQArchive * ha, const char * szFileName, LCID
         if(pHash != NULL && pHash->dwBlockIndex < ha->dwFileTableSize)
             return ha->pFileTable + pHash->dwBlockIndex;
     }
-    
+
     // Not found
     return NULL;
 }
@@ -1713,7 +1399,7 @@ TFileEntry * GetFileEntryExact(TMPQArchive * ha, const char * szFileName, LCID l
         if(pHash != NULL && pHash->dwBlockIndex < ha->dwFileTableSize)
             return ha->pFileTable + pHash->dwBlockIndex;
     }
-    
+
     // Not found
     return NULL;
 }
@@ -1726,7 +1412,7 @@ TFileEntry * GetFileEntryByIndex(TMPQArchive * ha, DWORD dwIndex)
     return NULL;
 }
 
-void AllocateFileName(TMPQArchive * ha, TFileEntry * pFileEntry, const char * szFileName)
+void AllocateFileName(TFileEntry * pFileEntry, const char * szFileName)
 {
     // Sanity check
     assert(pFileEntry != NULL);
@@ -1746,104 +1432,129 @@ void AllocateFileName(TMPQArchive * ha, TFileEntry * pFileEntry, const char * sz
         if(pFileEntry->szFileName != NULL)
             strcpy(pFileEntry->szFileName, szFileName);
     }
-
-    // We also need to create the file name hash
-    if(ha->pHetTable != NULL)
-    {
-        ULONGLONG AndMask64 = ha->pHetTable->AndMask64;
-        ULONGLONG OrMask64 = ha->pHetTable->OrMask64;
-
-        pFileEntry->FileNameHash = (HashStringJenkins(szFileName) & AndMask64) | OrMask64;
-    }
 }
 
-TFileEntry * FindDeletedFileEntry(TMPQArchive * ha)
+
+// Finds a free file entry. Does NOT increment table size.
+TFileEntry * FindFreeFileEntry(TMPQArchive * ha)
 {
     TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
+    TFileEntry * pFreeEntry = NULL;
     TFileEntry * pFileEntry;
 
-    // Go through the entire file table and try to find a deleted entry
+    // Try to find a free entry
     for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
     {
-        // Return the entry that is within the current file table (i.e. a deleted file)
-        if(!(pFileEntry->dwFlags & MPQ_FILE_EXISTS))
-            return pFileEntry;
+        // If that entry is free, we reuse it
+        if((pFileEntry->dwFlags & MPQ_FILE_EXISTS) == 0)
+        {
+            pFreeEntry = pFileEntry;
+            break;
+        }
 
         //
         // Note: Files with "delete marker" are not deleted.
-        // Don't treat them as available
+        // Don't consider them free entries
         //
     }
 
-    // No deleted entries found
+    // Do we have a deleted entry?
+    if(pFreeEntry != NULL)
+    {
+        ClearFileEntry(ha, pFreeEntry);
+        return pFreeEntry;
+    }
+
+    // If no file entry within the existing file table is free,
+    // we try the reserve space after current file table
+    if(ha->dwFileTableSize < ha->dwMaxFileCount)
+        return ha->pFileTable + ha->dwFileTableSize;
+
+    // If we reached maximum file count, we cannot add more files to the MPQ
+    assert(ha->dwFileTableSize == ha->dwMaxFileCount);
     return NULL;
 }
 
+
 TFileEntry * AllocateFileEntry(TMPQArchive * ha, const char * szFileName, LCID lcLocale)
 {
     TFileEntry * pFileEntry = NULL;
     TMPQHash * pHash;
+    DWORD dwHashIndex;
+    DWORD dwFileIndex;
+    bool bHashEntryExists = false;
+    bool bHetEntryExists = false;
 
-    // The entry in the hash table should not be there.
-    // This case must be handled by the caller
-    assert(ha->pHashTable == NULL || GetHashEntryExact(ha, szFileName, lcLocale) == NULL);
-    assert(ha->pHetTable == NULL || GetFileIndex_Het(ha, szFileName) == HASH_ENTRY_FREE);
-
-    // If we are in the middle of saving listfile, we need to allocate
-    // the file entry at the end of the file table
-    if((ha->dwFlags & MPQ_FLAG_SAVING_TABLES) == 0)
+    // If the archive has classic hash table, we try to
+    // find the file in the hash table
+    if(ha->pHashTable != NULL)
     {
-        // Attempt to find a deleted file entry in the file table.
-        // If it suceeds, we reuse that entry
-        pFileEntry = FindDeletedFileEntry(ha);
+        // If the hash entry is already there, we reuse the file entry
+        pHash = GetHashEntryExact(ha, szFileName, lcLocale);
+        if(pHash != NULL)
+        {
+            pFileEntry = ha->pFileTable + pHash->dwBlockIndex;
+            bHashEntryExists = true;
+        }
+    }
+
+    // If the archive has HET table, try to use it for
+    // finding the file
+    if(ha->pHetTable != NULL)
+    {
+        dwFileIndex = GetFileIndex_Het(ha, szFileName);
+        if(dwFileIndex != HASH_ENTRY_FREE)
+        {
+            pFileEntry = ha->pFileTable + dwFileIndex;
+            bHetEntryExists = true;
+        }
+    }
+
+    // If still haven't found the file entry, we allocate new one
+    if(pFileEntry == NULL)
+    {
+        pFileEntry = FindFreeFileEntry(ha);
         if(pFileEntry == NULL)
-        {
-            // If there is no space in the file table, we are sorry
-            if((ha->dwFileTableSize + ha->dwReservedFiles) >= ha->dwMaxFileCount)
-                return NULL;
-
-            // Invalidate the internal files so we free
-            // their file entries.
-            InvalidateInternalFiles(ha);
-
-            // Re-check for deleted entries
-            pFileEntry = FindDeletedFileEntry(ha);
-            if(pFileEntry == NULL)
-            {
-                // If there is still no deleted entry, we allocate an entry at the end of the file table
-                assert((ha->dwFileTableSize + ha->dwReservedFiles) <= ha->dwMaxFileCount);
-                pFileEntry = ha->pFileTable + ha->dwFileTableSize++;
-            }
-        }
-        else
-        {
-            // Invalidate the internal files
-            InvalidateInternalFiles(ha);
-        }
-    }
-    else
-    {
-        // There should be at least one entry for that internal file
-        assert((ha->dwFileTableSize + ha->dwReservedFiles) <= ha->dwMaxFileCount);
-        pFileEntry = ha->pFileTable + ha->dwFileTableSize++;
+            return NULL;
     }
 
-    // Did we find an usable file entry?
-    if(pFileEntry != NULL)
-    {
-        // Make sure that the entry is properly initialized
-        memset(pFileEntry, 0, sizeof(TFileEntry));
-        pFileEntry->lcLocale = (USHORT)lcLocale;
-        AllocateFileName(ha, pFileEntry, szFileName);
+    // Fill the rest of the file entry
+    pFileEntry->ByteOffset = 0;
+    pFileEntry->FileTime   = 0;
+    pFileEntry->dwFileSize = 0;
+    pFileEntry->dwCmpSize  = 0;
+    pFileEntry->dwFlags    = 0;
+    pFileEntry->lcLocale   = (USHORT)lcLocale;
+    pFileEntry->wPlatform  = 0;
+    pFileEntry->dwCrc32    = 0;
+    memset(pFileEntry->md5, 0, MD5_DIGEST_SIZE);
 
-        // If the MPQ has hash table, we have to insert the new entry into the hash table
-        // We expect it to succeed because there must be a free hash entry if there is a free file entry
-        // Note: Don't bother with the HET table. It will be rebuilt anyway
-        if(ha->pHashTable != NULL)
-        {
-            pHash = AllocateHashEntry(ha, pFileEntry);
-            assert(pHash != NULL);
-        }
+    // Allocate space for file name, if it's not there yet
+    AllocateFileName(pFileEntry, szFileName);
+
+    // If the free file entry is at the end of the file table,
+    // we have to increment file table size
+    if(pFileEntry == ha->pFileTable + ha->dwFileTableSize)
+    {
+        assert(ha->dwFileTableSize < ha->dwMaxFileCount);
+        ha->pHeader->dwBlockTableSize++;
+        ha->dwFileTableSize++;
+    }
+
+    // If the MPQ has hash table, we have to insert the new entry into the hash table
+    if(ha->pHashTable != NULL && bHashEntryExists == false)
+    {
+        dwHashIndex = AllocateHashEntry(ha, pFileEntry);
+        assert(dwHashIndex != HASH_ENTRY_FREE);
+    }
+
+    // If the MPQ has HET table, we have to insert it to the HET table as well
+    if(ha->pHetTable != NULL && bHetEntryExists == false)
+    {
+        // TODO: Does HET table even support locales?
+        // Most probably, Blizzard gave up that silly idea long ago.
+        dwHashIndex = AllocateHetEntry(ha, pFileEntry);
+        assert(dwHashIndex != HASH_ENTRY_FREE);
     }
 
     // Return the file entry
@@ -1851,13 +1562,15 @@ TFileEntry * AllocateFileEntry(TMPQArchive * ha, const char * szFileName, LCID l
 }
 
 int RenameFileEntry(
-    TMPQArchive * ha,
-    TFileEntry * pFileEntry,
-    const char * szNewFileName)
+        TMPQArchive * ha,
+        TFileEntry * pFileEntry,
+        const char * szNewFileName)
 {
     TMPQHash * pHash;
+    DWORD dwFileIndex;
+    int nError = ERROR_SUCCESS;
 
-    // Mark the entry as deleted in the hash table
+    // If the MPQ has classic hash table, clear the entry there
     if(ha->pHashTable != NULL)
     {
         assert(pFileEntry->dwHashIndex < ha->pHeader->dwHashTableSize);
@@ -1867,10 +1580,23 @@ int RenameFileEntry(
         pHash->dwBlockIndex = HASH_ENTRY_DELETED;
     }
 
-    //
-    // Note: Don't bother with the HET table.
-    // It will be rebuilt from scratch anyway
-    //
+    // If the MPQ has HET table, clear the entry there as well
+    if(ha->pHetTable != NULL)
+    {
+        TMPQHetTable * pHetTable = ha->pHetTable;
+        DWORD dwInvalidFileIndex = (1 << pHetTable->dwIndexSizeTotal) - 1;
+
+        assert(pFileEntry->dwHetIndex < pHetTable->dwHashTableSize);
+
+        // Clear the entry in the HET hash array
+        pHetTable->pHetHashes[pFileEntry->dwHetIndex] = HET_ENTRY_DELETED;
+
+        // Set the BET index to invalid index
+        SetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * pFileEntry->dwHetIndex,
+                                        pHetTable->dwIndexSize,
+                                        &dwInvalidFileIndex,
+                                        4);
+    }
 
     // Free the old file name
     if(pFileEntry->szFileName != NULL)
@@ -1878,236 +1604,246 @@ int RenameFileEntry(
     pFileEntry->szFileName = NULL;
 
     // Allocate new file name
-    AllocateFileName(ha, pFileEntry, szNewFileName);
+    AllocateFileName(pFileEntry, szNewFileName);
 
     // Now find a hash entry for the new file name
     if(ha->pHashTable != NULL)
     {
         // Try to find the hash table entry for the new file name
-        // Note: Since we deleted one hash entry, this will always succeed
-        pHash = AllocateHashEntry(ha, pFileEntry);
-        assert(pHash != NULL);
+        // Note: If this fails, we leave the MPQ in a corrupt state
+        dwFileIndex = AllocateHashEntry(ha, pFileEntry);
+        if(dwFileIndex == HASH_ENTRY_FREE)
+            nError = ERROR_FILE_CORRUPT;
+    }
+
+    // If the archive has HET table, we have to allocate HET table for the file as well
+    // finding the file
+    if(ha->pHetTable != NULL)
+    {
+        dwFileIndex = AllocateHetEntry(ha, pFileEntry);
+        if(dwFileIndex == HASH_ENTRY_FREE)
+            nError = ERROR_FILE_CORRUPT;
     }
 
     // Invalidate the entries for (listfile) and (attributes)
     // After we are done with MPQ changes, we need to re-create them
     InvalidateInternalFiles(ha);
-    return ERROR_SUCCESS;
+    return nError;
 }
 
-void DeleteFileEntry(
-    TMPQArchive * ha,
-    TFileEntry * pFileEntry)
+void ClearFileEntry(
+        TMPQArchive * ha,
+        TFileEntry * pFileEntry)
 {
-    TMPQHash * pHash;
+    TMPQHash * pHash = NULL;
 
     // If the MPQ has classic hash table, clear the entry there
     if(ha->pHashTable != NULL)
     {
-        // Only if the file entry is still an existing one
-        if(pFileEntry->dwFlags & MPQ_FILE_EXISTS)
-        {
-            // We expect dwHashIndex to be within the hash table
-            pHash = ha->pHashTable + pFileEntry->dwHashIndex;
-            assert(pFileEntry->dwHashIndex < ha->pHeader->dwHashTableSize);
+        assert(pFileEntry->dwHashIndex < ha->pHeader->dwHashTableSize);
 
-            // Set the hash table entry as deleted
-            pHash->dwName1      = 0xFFFFFFFF;
-            pHash->dwName2      = 0xFFFFFFFF;
-            pHash->lcLocale     = 0xFFFF;
-            pHash->wPlatform    = 0xFFFF;
-            pHash->dwBlockIndex = HASH_ENTRY_DELETED;
-        }
+        pHash = ha->pHashTable + pFileEntry->dwHashIndex;
+        memset(pHash, 0xFF, sizeof(TMPQHash));
+        pHash->dwBlockIndex = HASH_ENTRY_DELETED;
+    }
+
+    // If the MPQ has HET table, clear the entry there as well
+    if(ha->pHetTable != NULL)
+    {
+        TMPQHetTable * pHetTable = ha->pHetTable;
+        DWORD dwInvalidFileIndex = (1 << pHetTable->dwIndexSizeTotal) - 1;
+
+        assert(pFileEntry->dwHetIndex < pHetTable->dwHashTableSize);
+
+        // Clear the entry in the HET hash array
+        pHetTable->pHetHashes[pFileEntry->dwHetIndex] = HET_ENTRY_DELETED;
+
+        // Set the BET index to invalid index
+        SetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * pFileEntry->dwHetIndex,
+                                        pHetTable->dwIndexSize,
+                                        &dwInvalidFileIndex,
+                                        4);
     }
 
     // Free the file name, and set the file entry as deleted
     if(pFileEntry->szFileName != NULL)
         STORM_FREE(pFileEntry->szFileName);
-    pFileEntry->szFileName = NULL;
+
+    // Invalidate the file entry
+    memset(pFileEntry, 0, sizeof(TFileEntry));
+}
+
+int FreeFileEntry(
+        TMPQArchive * ha,
+        TFileEntry * pFileEntry)
+{
+    TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
+    TFileEntry * pTempEntry;
+    int nError = ERROR_SUCCESS;
 
     //
-    // Don't modify the HET table, because it gets recreated from scratch at every modification operation
-    // Don't decrement the number of entries in the file table
-    // Keep Byte Offset, file size and compressed size in the file table
-    // Also keep the CRC32 and MD5 in the file attributes
-    // Clear the file name hash
-    // Clear the MPQ_FILE_EXISTS bit.
+    // If we have HET table, we cannot just get rid of the file
+    // Doing so would lead to empty gaps in the HET table
+    // We have to keep BET hash, hash index, HET index, locale, platform and file name
     //
 
-    pFileEntry->FileNameHash = 0;
-    pFileEntry->dwFlags &= ~MPQ_FILE_EXISTS;
+    if(ha->pHetTable == NULL)
+    {
+        TFileEntry * pLastFileEntry = ha->pFileTable + ha->dwFileTableSize - 1;
+        TFileEntry * pLastUsedEntry = pLastFileEntry;
+
+        // Zero the file entry
+        ClearFileEntry(ha, pFileEntry);
+
+        // Now there is a chance that we created a chunk of free
+        // file entries at the end of the file table. We check this
+        // and eventually free all deleted file entries at the end
+        for(pTempEntry = ha->pFileTable; pTempEntry < pFileTableEnd; pTempEntry++)
+        {
+            // Is that an occupied file entry?
+            if(pTempEntry->dwFlags & MPQ_FILE_EXISTS)
+                pLastUsedEntry = pTempEntry;
+        }
+
+        // Can we free some entries at the end?
+        if(pLastUsedEntry < pLastFileEntry)
+        {
+            // Fix the size of the file table entry
+            ha->dwFileTableSize = (DWORD)(pLastUsedEntry - ha->pFileTable) + 1;
+            ha->pHeader->dwBlockTableSize = ha->dwFileTableSize;
+        }
+    }
+    else
+    {
+        // Note: Deleted entries in Blizzard MPQs version 4.0
+        // normally contain valid byte offset and length
+        pFileEntry->dwFlags &= ~MPQ_FILE_EXISTS;
+        nError = ERROR_SUCCESS;
+    }
+
+    return nError;
 }
 
 void InvalidateInternalFiles(TMPQArchive * ha)
 {
-    TFileEntry * pFileTableEnd;
-    TFileEntry * pFileEntry1 = NULL;
-    TFileEntry * pFileEntry2 = NULL;
-    TFileEntry * pFileEntry3 = NULL;
+    TFileEntry * pFileEntry;
 
-    // Do nothing if we are in the middle of saving internal files
-    if(!(ha->dwFlags & MPQ_FLAG_SAVING_TABLES))
+    // Invalidate the (listfile), if not done yet
+    if(!(ha->dwFlags & MPQ_FLAG_INV_LISTFILE))
     {
-        //
-        // We clear the file entries of (listfile) and (attributes)
-        // For each internal file cleared, we increment the number 
-        // of reserved entries in the file table.
-        //
-
-        // Invalidate the (listfile), if not done yet
-        if(ha->dwFileFlags1 != 0 && (ha->dwFlags & MPQ_FLAG_LISTFILE_INVALID) == 0)
-        {
-            // Delete the existing entry for (listfile)
-            pFileEntry1 = GetFileEntryExact(ha, LISTFILE_NAME, LANG_NEUTRAL);
-            if(pFileEntry1 != NULL)
-                DeleteFileEntry(ha, pFileEntry1);
-
-            // Reserve one entry for (listfile)
-            ha->dwFlags |= MPQ_FLAG_LISTFILE_INVALID;
-            ha->dwReservedFiles++;
-        }
-
-        // Invalidate the (attributes), if not done yet
-        if(ha->dwFileFlags2 != 0 && (ha->dwFlags & MPQ_FLAG_ATTRIBUTES_INVALID) == 0)
-        {
-            // Delete the existing entry for (attributes)
-            pFileEntry2 = GetFileEntryExact(ha, ATTRIBUTES_NAME, LANG_NEUTRAL);
-            if(pFileEntry2 != NULL)
-                DeleteFileEntry(ha, pFileEntry2);
-
-            // Reserve one entry for (attributes)
-            ha->dwFlags |= MPQ_FLAG_ATTRIBUTES_INVALID;
-            ha->dwReservedFiles++;
-        }
-
-        // Invalidate the (signature), if not done yet
-        if(ha->dwFileFlags3 != 0 && (ha->dwFlags & MPQ_FLAG_SIGNATURE_INVALID) == 0)
-        {
-            // Delete the existing entry for (attributes)
-            pFileEntry3 = GetFileEntryExact(ha, SIGNATURE_NAME, LANG_NEUTRAL);
-            if(pFileEntry3 != NULL)
-                DeleteFileEntry(ha, pFileEntry3);
-
-            // Reserve one entry for (attributes)
-            ha->dwFlags |= MPQ_FLAG_SIGNATURE_INVALID;
-            ha->dwReservedFiles++;
-        }
-
-
-        // If the internal files are at the end of the file table (they usually are),
-        // we want to free these 3 entries, so when new files are added, they get
-        // added to the freed entries and the internal files get added after that
-        if(ha->dwFileTableSize > 0)
-        {
-            pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-
-            // Is one of the entries the last one?
-            if(pFileEntry1 == pFileTableEnd - 1 || pFileEntry2 == pFileTableEnd - 1 || pFileEntry3 == pFileTableEnd - 1)
-                pFileTableEnd--;
-            if(pFileEntry1 == pFileTableEnd - 1 || pFileEntry2 == pFileTableEnd - 1 || pFileEntry3 == pFileTableEnd - 1)
-                pFileTableEnd--;
-            if(pFileEntry1 == pFileTableEnd - 1 || pFileEntry2 == pFileTableEnd - 1 || pFileEntry3 == pFileTableEnd - 1)
-                pFileTableEnd--;
-
-            // Calculate the new file table size
-            ha->dwFileTableSize = (DWORD)(pFileTableEnd - ha->pFileTable);
-        }
-
-        // Remember that the MPQ has been changed
-        ha->dwFlags |= MPQ_FLAG_CHANGED;
+        pFileEntry = GetFileEntryExact(ha, LISTFILE_NAME, LANG_NEUTRAL);
+        if(pFileEntry != NULL)
+            FreeFileEntry(ha, pFileEntry);
+        ha->dwFlags |= MPQ_FLAG_INV_LISTFILE;
     }
+
+    // Invalidate the (attributes), if not done yet
+    if(!(ha->dwFlags & MPQ_FLAG_INV_ATTRIBUTES))
+    {
+        pFileEntry = GetFileEntryExact(ha, ATTRIBUTES_NAME, LANG_NEUTRAL);
+        if(pFileEntry != NULL)
+            FreeFileEntry(ha, pFileEntry);
+        ha->dwFlags |= MPQ_FLAG_INV_ATTRIBUTES;
+    }
+
+    // Remember that the MPQ has been changed and it will be necessary
+    // to update the tables
+    ha->dwFlags |= MPQ_FLAG_CHANGED;
+}
+
+//-----------------------------------------------------------------------------
+// Functions that loads and verify MPQ data bitmap
+
+int LoadMpqDataBitmap(TMPQArchive * ha, ULONGLONG FileSize, bool * pbFileIsComplete)
+{
+    TMPQBitmap * pBitmap = NULL;
+    TMPQBitmap DataBitmap;
+    ULONGLONG BitmapOffset;
+    ULONGLONG EndOfMpq;
+    DWORD DataBlockCount = 0;
+    DWORD BitmapByteSize;
+    DWORD WholeByteCount;
+    DWORD ExtraBitsCount;
+
+    // Is there enough space for a MPQ bitmap?
+    EndOfMpq = ha->MpqPos + ha->pHeader->ArchiveSize64;
+    FileSize = FileSize - sizeof(TMPQBitmap);
+    if(FileSize > EndOfMpq)
+    {
+        // Try to load the data bitmap from the end of the file
+        if(FileStream_Read(ha->pStream, &FileSize, &DataBitmap, sizeof(TMPQBitmap)))
+        {
+            // Is it a valid data bitmap?
+            BSWAP_ARRAY32_UNSIGNED((LPDWORD)(&DataBitmap), sizeof(TMPQBitmap));
+            if(DataBitmap.dwSignature == MPQ_DATA_BITMAP_SIGNATURE)
+            {
+                // We assume that MPQs with data bitmap begin at position 0
+                assert(ha->MpqPos == 0);
+
+                // Calculate the number of extra bytes for data bitmap
+                DataBlockCount = (DWORD)(((ha->pHeader->ArchiveSize64 - 1) / DataBitmap.dwBlockSize) + 1);
+                BitmapByteSize = ((DataBlockCount - 1) / 8) + 1;
+
+                // Verify the data block size
+                BitmapOffset = ((ULONGLONG)DataBitmap.dwMapOffsetHi << 32) | DataBitmap.dwMapOffsetLo;
+                assert((DWORD)(FileSize - BitmapOffset) == BitmapByteSize);
+
+                // Allocate space for the data bitmap
+                pBitmap = (TMPQBitmap *)STORM_ALLOC(BYTE, sizeof(TMPQBitmap) + BitmapByteSize);
+                if(pBitmap != NULL)
+                {
+                    // Copy the bitmap header
+                    memcpy(pBitmap, &DataBitmap, sizeof(TMPQBitmap));
+
+                    // Read the remaining part
+                    if(!FileStream_Read(ha->pStream, &BitmapOffset, (pBitmap + 1), BitmapByteSize))
+                    {
+                        STORM_FREE(pBitmap);
+                        pBitmap = NULL;
+                    }
+                }
+            }
+        }
+    }
+
+    // If the caller asks for file completeness, check it
+    if(pBitmap != NULL && pbFileIsComplete != NULL)
+    {
+        LPBYTE pbBitmap = (LPBYTE)(pBitmap + 1);
+        DWORD i;
+        bool bFileIsComplete = true;
+
+        // Calculate the number of whole bytes and extra bits of the bitmap
+        WholeByteCount = (DataBlockCount / 8);
+        ExtraBitsCount = (DataBlockCount & 7);
+
+        // Verify the whole bytes - their value must be 0xFF
+        for(i = 0; i < WholeByteCount; i++)
+        {
+            if(pbBitmap[i] != 0xFF)
+                bFileIsComplete = false;
+        }
+
+        // If there are extra bits, calculate the mask
+        if(ExtraBitsCount != 0)
+        {
+            BYTE ExpectedValue = (BYTE)((1 << ExtraBitsCount) - 1);
+
+            if(pbBitmap[i] != ExpectedValue)
+                bFileIsComplete = false;
+        }
+
+        // Give the result to the caller
+        *pbFileIsComplete = bFileIsComplete;
+    }
+
+    ha->pBitmap = pBitmap;
+    return ERROR_SUCCESS;
 }
 
 //-----------------------------------------------------------------------------
 // Support for file tables - hash table, block table, hi-block table
 
-// Fixes the case when hash table size is set to arbitrary long value
-static void FixHashTableSize(TMPQArchive * ha, ULONGLONG ByteOffset)
-{
-    ULONGLONG FileSize = 0;
-    DWORD dwFixedTableSize;
-    DWORD dwHashTableSize = ha->pHeader->dwHashTableSize;
-
-    // Spazzler protector abuses the fact that hash table size does not matter
-    // if the hash table is entirely filled with values different than 0xFFFFFFFF.
-    // It sets the hash table size to 0x00100000, which slows down file searching
-    // and adding a listfile.
-
-    // Only if the hash table size is correct
-    if((dwHashTableSize & (dwHashTableSize - 1)) == 0)
-    {
-        // Retrieve the file size
-        FileStream_GetSize(ha->pStream, &FileSize);
-
-        // Work as long as the size greater than file size
-        for(;;)
-        {
-            // Try the size of one half of the current
-            dwFixedTableSize = dwHashTableSize >> 1;
-            if(ByteOffset + (dwFixedTableSize * sizeof(TMPQHash)) <= FileSize)
-                break;
-
-            // Cut the hash table size to half
-            dwHashTableSize = dwFixedTableSize;
-        }
-
-        // Fix the hash table size
-        ha->pHeader->dwHashTableSize = dwHashTableSize;
-        ha->pHeader->HashTableSize64 = dwHashTableSize * sizeof(TMPQHash);
-    }
-}
-
-// This function fixes the scenario then dwBlockTableSize
-// is greater and goes into a MPQ file
-static void FixBlockTableSize(
-    TMPQArchive * ha,
-    TMPQBlock * pBlockTable)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-    ULONGLONG BlockTableStart;
-    ULONGLONG BlockTableEnd;
-    ULONGLONG FileDataStart;
-    DWORD dwFixedTableSize = pHeader->dwBlockTableSize;
-
-    // Only perform this check on MPQs version 1.0
-    assert(pHeader->dwHeaderSize == MPQ_HEADER_SIZE_V1);
-
-    // Calculate claimed block table begin and end
-    BlockTableStart = ha->MpqPos + MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
-    BlockTableEnd = BlockTableStart + (pHeader->dwBlockTableSize * sizeof(TMPQBlock));
-
-    for(DWORD i = 0; i < dwFixedTableSize; i++)
-    {
-        // If the block table end goes into that file, fix the block table end
-        FileDataStart = ha->MpqPos + pBlockTable[i].dwFilePos;
-        if(BlockTableStart < FileDataStart && BlockTableEnd > FileDataStart)
-        {
-            dwFixedTableSize = (DWORD)((FileDataStart - BlockTableStart) / sizeof(TMPQBlock));
-            BlockTableEnd = FileDataStart;
-            ha->dwFlags |= MPQ_FLAG_MALFORMED;
-        }
-    }
-
-    // If we found a mismatch in the block table size
-    if(dwFixedTableSize < pHeader->dwBlockTableSize)
-    {
-        // Fill the additional space with zeros
-        memset(pBlockTable + dwFixedTableSize, 0, (pHeader->dwBlockTableSize - dwFixedTableSize) * sizeof(TMPQBlock));
-
-        // Fix the block table size
-        pHeader->dwBlockTableSize = dwFixedTableSize;
-        pHeader->BlockTableSize64 = dwFixedTableSize * sizeof(TMPQBlock);
-
-        //
-        // Note: We should recalculate the archive size in the header,
-        // (it might be invalid as well) but we don't care about it anyway
-        //
-
-        // In theory, a MPQ could have bigger block table than hash table
-        assert(pHeader->dwBlockTableSize <= ha->dwMaxFileCount);
-    }
-}
-
 int CreateHashTable(TMPQArchive * ha, DWORD dwHashTableSize)
 {
     TMPQHash * pHashTable;
@@ -2116,10 +1852,6 @@ int CreateHashTable(TMPQArchive * ha, DWORD dwHashTableSize)
     assert((dwHashTableSize & (dwHashTableSize - 1)) == 0);
     assert(ha->pHashTable == NULL);
 
-    // If the required hash table size is zero, don't create anything
-    if(dwHashTableSize == 0)
-        dwHashTableSize = HASH_TABLE_SIZE_DEFAULT;
-
     // Create the hash table
     pHashTable = STORM_ALLOC(TMPQHash, dwHashTableSize);
     if(pHashTable == NULL)
@@ -2127,8 +1859,11 @@ int CreateHashTable(TMPQArchive * ha, DWORD dwHashTableSize)
 
     // Fill it
     memset(pHashTable, 0xFF, dwHashTableSize * sizeof(TMPQHash));
-    ha->dwMaxFileCount = dwHashTableSize;
     ha->pHashTable = pHashTable;
+
+    // Set the max file count, if needed
+    if(ha->pHetTable == NULL)
+        ha->dwMaxFileCount = dwHashTableSize;
     return ERROR_SUCCESS;
 }
 
@@ -2136,9 +1871,10 @@ TMPQHash * LoadHashTable(TMPQArchive * ha)
 {
     TMPQHeader * pHeader = ha->pHeader;
     ULONGLONG ByteOffset;
-    TMPQHash * pHashTable = NULL;
+    TMPQHash * pHashTable;
     DWORD dwTableSize;
     DWORD dwCmpSize;
+    int nError;
 
     // If the MPQ has no hash table, do nothing
     if(pHeader->dwHashTablePos == 0 && pHeader->wHashTablePosHi == 0)
@@ -2148,56 +1884,77 @@ TMPQHash * LoadHashTable(TMPQArchive * ha)
     if(pHeader->dwHashTableSize == 0)
         return NULL;
 
-    // Load the hash table for MPQ variations
-    switch(ha->dwSubType)
+    // Allocate buffer for the hash table
+    dwTableSize = pHeader->dwHashTableSize * sizeof(TMPQHash);
+    pHashTable = STORM_ALLOC(TMPQHash, pHeader->dwHashTableSize);
+    if(pHashTable == NULL)
+        return NULL;
+
+    // Compressed size of the hash table
+    dwCmpSize = (DWORD)pHeader->HashTableSize64;
+
+    //
+    // Load the table from the MPQ, with decompression
+    //
+    // Note: We will NOT check if the hash table is properly decrypted.
+    // Some MPQ protectors corrupt the hash table by rewriting part of it.
+    // Hash table, the way how it works, allows arbitrary values for unused entries.
+    //
+
+    ByteOffset = ha->MpqPos + MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos);
+    nError = LoadMpqTable(ha, ByteOffset, pHashTable, dwCmpSize, dwTableSize, MPQ_KEY_HASH_TABLE);
+    if(nError != ERROR_SUCCESS)
     {
-        case MPQ_SUBTYPE_MPQ:
-
-            ByteOffset = ha->MpqPos + MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos);
-            if((pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1) && (ha->dwFlags & MPQ_FLAG_MALFORMED))
-            {
-                // Calculate the hash table offset as 32-bit value
-                ByteOffset = (DWORD)ha->MpqPos + pHeader->dwHashTablePos;
-
-                // Defense against map protectors that set the hash table size too big
-                FixHashTableSize(ha, ByteOffset);
-            }
-
-            // Get the compressed and uncompressed hash table size
-            dwTableSize = pHeader->dwHashTableSize * sizeof(TMPQHash);
-            dwCmpSize = (DWORD)pHeader->HashTableSize64;
-
-            //
-            // Load the table from the MPQ, with decompression
-            //
-            // Note: We will NOT check if the hash table is properly decrypted.
-            // Some MPQ protectors corrupt the hash table by rewriting part of it.
-            // Hash table, the way how it works, allows arbitrary values for unused entries.
-            //
-
-            pHashTable = (TMPQHash *)LoadMpqTable(ha, ByteOffset, dwCmpSize, dwTableSize, MPQ_KEY_HASH_TABLE);
-            break;
-
-        case MPQ_SUBTYPE_SQP:
-            pHashTable = LoadSqpHashTable(ha);
-            break;
-
-        case MPQ_SUBTYPE_MPK:
-            pHashTable = LoadMpkHashTable(ha);
-            break;
+        STORM_FREE(pHashTable);
+        pHashTable = NULL;
     }
 
     // Return the hash table
     return pHashTable;
 }
 
-TMPQBlock * LoadBlockTable(TMPQArchive * ha, bool /* bDontFixEntries */)
+static void FixBlockTableSize(
+        TMPQArchive * ha,
+        TMPQBlock * pBlockTable,
+        DWORD dwClaimedSize)
 {
     TMPQHeader * pHeader = ha->pHeader;
-    TMPQBlock * pBlockTable = NULL;
+    ULONGLONG BlockTableStart;
+    ULONGLONG BlockTableEnd;
+    ULONGLONG FileDataStart;
+
+    // Only perform this check on MPQs version 1.0
+    if(pHeader->dwHeaderSize == MPQ_HEADER_SIZE_V1)
+    {
+        // Calculate claimed block table begin and end
+        BlockTableStart = ha->MpqPos + MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
+        BlockTableEnd = BlockTableStart + (pHeader->dwBlockTableSize * sizeof(TMPQBlock));
+
+        for(DWORD i = 0; i < dwClaimedSize; i++)
+        {
+            // If the block table end goes into that file, fix the block table end
+            FileDataStart = ha->MpqPos + pBlockTable[i].dwFilePos;
+            if(BlockTableStart < FileDataStart && BlockTableEnd > FileDataStart)
+            {
+                dwClaimedSize = (DWORD)((FileDataStart - BlockTableStart) / sizeof(TMPQBlock));
+                BlockTableEnd = FileDataStart;
+            }
+        }
+    }
+
+    // Fix the block table size
+    pHeader->BlockTableSize64 = dwClaimedSize * sizeof(TMPQBlock);
+    pHeader->dwBlockTableSize = dwClaimedSize;
+}
+
+TMPQBlock * LoadBlockTable(TMPQArchive * ha, ULONGLONG FileSize)
+{
+    TMPQHeader * pHeader = ha->pHeader;
+    TMPQBlock * pBlockTable;
     ULONGLONG ByteOffset;
     DWORD dwTableSize;
     DWORD dwCmpSize;
+    int nError;
 
     // Do nothing if the block table position is zero
     if(pHeader->dwBlockTablePos == 0 && pHeader->wBlockTablePosHi == 0)
@@ -2207,89 +1964,94 @@ TMPQBlock * LoadBlockTable(TMPQArchive * ha, bool /* bDontFixEntries */)
     if(pHeader->dwBlockTableSize == 0)
         return NULL;
 
-    // Load the block table for MPQ variations
-    switch(ha->dwSubType)
+    // Sanity check, enforced by LoadAnyHashTable
+    assert(ha->dwMaxFileCount >= pHeader->dwBlockTableSize);
+
+    // Calculate sizes of both tables
+    ByteOffset = ha->MpqPos + MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
+    dwTableSize = pHeader->dwBlockTableSize * sizeof(TMPQBlock);
+    dwCmpSize = (DWORD)pHeader->BlockTableSize64;
+
+    // Allocate space for the block table
+    // Note: pHeader->dwBlockTableSize can be zero !!!
+    pBlockTable = STORM_ALLOC(TMPQBlock, ha->dwMaxFileCount);
+    if(pBlockTable == NULL)
+        return NULL;
+
+    // Fill the block table with zeros
+    memset(pBlockTable, 0, dwTableSize);
+
+    // I found a MPQ which claimed 0x200 entries in the block table,
+    // but the file was cut and there was only 0x1A0 entries.
+    // We will handle this case properly.
+    if(dwTableSize == dwCmpSize && (ByteOffset + dwTableSize) > FileSize)
     {
-        case MPQ_SUBTYPE_MPQ:
-
-            // Calculate byte position of the block table
-            ByteOffset = ha->MpqPos + MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
-            if((pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1) && (ha->dwFlags & MPQ_FLAG_MALFORMED))
-                ByteOffset = (DWORD)ha->MpqPos + pHeader->dwBlockTablePos;
-            
-            // Calculate full and compressed size of the block table
-            dwTableSize = pHeader->dwBlockTableSize * sizeof(TMPQBlock);
-            dwCmpSize = (DWORD)pHeader->BlockTableSize64;
-            assert((ByteOffset + dwCmpSize) <= (ha->MpqPos + ha->pHeader->ArchiveSize64));
-
-            //
-            // One of the first cracked versions of Diablo I had block table unencrypted 
-            // StormLib does NOT support such MPQs anymore, as they are incompatible
-            // with compressed block table feature
-            //
-
-            // If failed to load the block table, delete it
-            pBlockTable = (TMPQBlock * )LoadMpqTable(ha, ByteOffset, dwCmpSize, dwTableSize, MPQ_KEY_BLOCK_TABLE);
-
-            // De-protecting maps for Warcraft III
-            if(ha->pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1)
-            {
-                // Some protectors set the block table size bigger than really is
-                if(pBlockTable != NULL)
-                    FixBlockTableSize(ha, pBlockTable);
-
-                //
-                // Note: TMPQBlock::dwCSize file size can be completely invalid
-                // for compressed files and the file can still be read.
-                // Abused by some MPQ protectors
-                //
-            }
-            break;
-
-        case MPQ_SUBTYPE_SQP:
-
-            pBlockTable = LoadSqpBlockTable(ha);
-            break;
-
-        case MPQ_SUBTYPE_MPK:
-
-            pBlockTable = LoadMpkBlockTable(ha);
-            break;
+        pHeader->dwBlockTableSize = (DWORD)((FileSize - ByteOffset) / sizeof(TMPQBlock));
+        pHeader->BlockTableSize64 = pHeader->dwBlockTableSize * sizeof(TMPQBlock);
+        dwTableSize = dwCmpSize = pHeader->dwBlockTableSize * sizeof(TMPQBlock);
     }
 
+    //
+    // One of the first cracked versions of Diablo I had block table unencrypted
+    // StormLib does NOT support such MPQs anymore, as they are incompatible
+    // with compressed block table feature
+    //
+
+    // Load the block table
+    nError = LoadMpqTable(ha, ByteOffset, pBlockTable, dwCmpSize, dwTableSize, MPQ_KEY_BLOCK_TABLE);
+    if(nError != ERROR_SUCCESS)
+    {
+        // Failed, sorry
+        STORM_FREE(pBlockTable);
+        return NULL;
+    }
+
+    // Defense against MPQs that claim block table to be bigger than it really is
+    FixBlockTableSize(ha, pBlockTable, pHeader->dwBlockTableSize);
     return pBlockTable;
 }
 
-TMPQHetTable * LoadHetTable(TMPQArchive * ha)
+int LoadHetTable(TMPQArchive * ha)
 {
-    TMPQExtHeader * pExtTable;
-    TMPQHetTable * pHetTable = NULL;
+    TMPQExtTable * pExtTable;
     TMPQHeader * pHeader = ha->pHeader;
+    int nError = ERROR_SUCCESS;
 
-    // If the HET table position is not 0, we expect the table to be present
-    if(pHeader->HetTablePos64 != 0 && pHeader->HetTableSize64 != 0)
+    // If the HET table position is not NULL, we expect
+    // both HET and BET tables to be present.
+    if(pHeader->HetTablePos64 != 0)
     {
         // Attempt to load the HET table (Hash Extended Table)
         pExtTable = LoadExtTable(ha, pHeader->HetTablePos64, (size_t)pHeader->HetTableSize64, HET_TABLE_SIGNATURE, MPQ_KEY_HASH_TABLE);
         if(pExtTable != NULL)
         {
+            // If succeeded, we have to limit the maximum file count
+            // to the values saved in the HET table
             // If loading HET table fails, we ignore the result.
-            pHetTable = TranslateHetTable((TMPQHetHeader *)pExtTable);
+            ha->pHetTable = TranslateHetTable(pExtTable);
+            if(ha->pHetTable != NULL)
+                ha->dwMaxFileCount = ha->pHetTable->dwMaxFileCount;
+
             STORM_FREE(pExtTable);
         }
+
+        // If the HET hable failed to load, it's corrupt.
+        if(ha->pHetTable == NULL)
+            nError = ERROR_FILE_CORRUPT;
     }
 
-    return pHetTable;
+    return nError;
 }
 
 TMPQBetTable * LoadBetTable(TMPQArchive * ha)
 {
-    TMPQExtHeader * pExtTable;
+    TMPQExtTable * pExtTable;
     TMPQBetTable * pBetTable = NULL;
     TMPQHeader * pHeader = ha->pHeader;
 
-    // If the BET table position is not 0, we expect the table to be present
-    if(pHeader->BetTablePos64 != 0 && pHeader->BetTableSize64 != 0)
+    // If the HET table position is not NULL, we expect
+    // both HET and BET tables to be present.
+    if(pHeader->BetTablePos64 != 0)
     {
         // Attempt to load the HET table (Hash Extended Table)
         pExtTable = LoadExtTable(ha, pHeader->BetTablePos64, (size_t)pHeader->BetTableSize64, BET_TABLE_SIGNATURE, MPQ_KEY_BLOCK_TABLE);
@@ -2297,7 +2059,7 @@ TMPQBetTable * LoadBetTable(TMPQArchive * ha)
         {
             // If succeeded, we translate the BET table
             // to more readable form
-            pBetTable = TranslateBetTable(ha, (TMPQBetHeader *)pExtTable);
+            pBetTable = TranslateBetTable(ha, pExtTable);
             STORM_FREE(pExtTable);
         }
     }
@@ -2313,54 +2075,111 @@ int LoadAnyHashTable(TMPQArchive * ha)
     if(pHeader->dwHashTableSize == 0 && pHeader->HetTableSize64 == 0)
         return CreateHashTable(ha, HASH_TABLE_SIZE_DEFAULT);
 
-    // Try to load HET table
-    if(pHeader->HetTablePos64 != 0)
-        ha->pHetTable = LoadHetTable(ha);
+    // Try to load HET and/or classic hash table
+    LoadHetTable(ha);
 
-    // Try to load the hash table
-    if(pHeader->wHashTablePosHi || pHeader->dwHashTablePos)
-        ha->pHashTable = LoadHashTable(ha);
+    // Load the HASH table
+    ha->pHashTable = LoadHashTable(ha);
 
-    // At least one of the tables must be present
+    // Set the maximum file count to the size of the hash table
+    // In case there is HET table, we have to keep the file limit
+    if(ha->pHetTable == NULL)
+        ha->dwMaxFileCount = pHeader->dwHashTableSize;
+
+    // Did at least one succeed?
     if(ha->pHetTable == NULL && ha->pHashTable == NULL)
         return ERROR_FILE_CORRUPT;
 
-    // Set the maximum file count to the size of the hash table.
-    // Note: We don't care about HET table limits, because HET table is rebuilt
-    // after each file add/rename/delete.
-    ha->dwMaxFileCount = (ha->pHashTable != NULL) ? pHeader->dwHashTableSize : HASH_TABLE_SIZE_MAX;
+    // In theory, a MPQ could have bigger block table than hash table
+    if(ha->pHeader->dwBlockTableSize > ha->dwMaxFileCount)
+    {
+        ha->dwMaxFileCount = ha->pHeader->dwBlockTableSize;
+        ha->dwFlags |= MPQ_FLAG_READ_ONLY;
+    }
+
     return ERROR_SUCCESS;
 }
 
 int BuildFileTable_Classic(
-    TMPQArchive * ha,
-    TFileEntry * pFileTable)
+        TMPQArchive * ha,
+        TFileEntry * pFileTable,
+        ULONGLONG FileSize)
 {
     TFileEntry * pFileEntry;
     TMPQHeader * pHeader = ha->pHeader;
     TMPQBlock * pBlockTable;
+    TMPQBlock * pBlock;
     int nError = ERROR_SUCCESS;
 
     // Sanity checks
     assert(ha->pHashTable != NULL);
 
-    // If the MPQ has no block table, do nothing
-    if(ha->pHeader->dwBlockTableSize == 0)
-        return ERROR_SUCCESS;
-
     // Load the block table
-    pBlockTable = (TMPQBlock *)LoadBlockTable(ha);
+    pBlockTable = LoadBlockTable(ha, FileSize);
     if(pBlockTable != NULL)
     {
+        TMPQHash * pHashEnd = ha->pHashTable + pHeader->dwHashTableSize;
+        TMPQHash * pHash;
+
         // If we don't have HET table, we build the file entries from the hash&block tables
-        // If we do, we only update it from the hash table
         if(ha->pHetTable == NULL)
         {
-            nError = BuildFileTableFromBlockTable(ha, pFileTable, pBlockTable);
+            for(pHash = ha->pHashTable; pHash < pHashEnd; pHash++)
+            {
+                if(pHash->dwBlockIndex < pHeader->dwBlockTableSize)
+                {
+                    pFileEntry = pFileTable + pHash->dwBlockIndex;
+                    pBlock = pBlockTable + pHash->dwBlockIndex;
+
+                    //
+                    // Yet another silly map protector: For each valid file,
+                    // there are 4 items in the hash table, that appears to be valid:
+                    //
+                    //   a6d79af0 e61a0932 001e0000 0000770b <== Fake valid
+                    //   a6d79af0 e61a0932 0000d761 0000dacb <== Fake valid
+                    //   a6d79af0 e61a0932 00000000 0000002f <== Real file entry
+                    //   a6d79af0 e61a0932 00005a4f 000093bc <== Fake valid
+                    //
+
+                    if(!(pBlock->dwFlags & ~MPQ_FILE_VALID_FLAGS) && (pBlock->dwFlags & MPQ_FILE_EXISTS))
+                    {
+                        // Fill the entry
+                        pFileEntry->ByteOffset  = pBlock->dwFilePos;
+                        pFileEntry->dwHashIndex = (DWORD)(pHash - ha->pHashTable);
+                        pFileEntry->dwFileSize  = pBlock->dwFSize;
+                        pFileEntry->dwCmpSize   = pBlock->dwCSize;
+                        pFileEntry->dwFlags     = pBlock->dwFlags;
+                        pFileEntry->lcLocale    = pHash->lcLocale;
+                        pFileEntry->wPlatform   = pHash->wPlatform;
+                    }
+                    else
+                    {
+                        // If the hash table entry doesn't point to the valid file item,
+                        // we invalidate the entire hash table entry
+                        pHash->dwName1      = 0xFFFFFFFF;
+                        pHash->dwName2      = 0xFFFFFFFF;
+                        pHash->lcLocale     = 0xFFFF;
+                        pHash->wPlatform    = 0xFFFF;
+                        pHash->dwBlockIndex = HASH_ENTRY_DELETED;
+                    }
+                }
+            }
         }
         else
         {
-            nError = UpdateFileTableFromHashTable(ha, pFileTable);
+            for(pHash = ha->pHashTable; pHash < pHashEnd; pHash++)
+            {
+                if(pHash->dwBlockIndex < ha->dwFileTableSize)
+                {
+                    pFileEntry = pFileTable + pHash->dwBlockIndex;
+                    if(pFileEntry->dwFlags & MPQ_FILE_EXISTS)
+                    {
+                        pFileEntry->dwHashIndex = (DWORD)(pHash - ha->pHashTable);
+                        pFileEntry->lcLocale    = pHash->lcLocale;
+                        pFileEntry->wPlatform   = pHash->wPlatform;
+                    }
+                }
+            }
         }
 
         // Free the block table
@@ -2391,13 +2210,13 @@ int BuildFileTable_Classic(
             // Now merge the hi-block table to the file table
             if(nError == ERROR_SUCCESS)
             {
-                BSWAP_ARRAY16_UNSIGNED(pHiBlockTable, dwTableSize);
                 pFileEntry = pFileTable;
 
                 // Add the high file offset to the base file offset.
+                // We also need to swap it during the process.
                 for(DWORD i = 0; i < pHeader->dwBlockTableSize; i++)
                 {
-                    pFileEntry->ByteOffset = MAKE_OFFSET64(pHiBlockTable[i], pFileEntry->ByteOffset);
+                    pFileEntry->ByteOffset |= ((ULONGLONG)BSWAP_INT16_UNSIGNED(pHiBlockTable[i]) << 32);
                     pFileEntry++;
                 }
             }
@@ -2417,8 +2236,8 @@ int BuildFileTable_Classic(
 }
 
 int BuildFileTable_HetBet(
-    TMPQArchive * ha,
-    TFileEntry * pFileTable)
+        TMPQArchive * ha,
+        TFileEntry * pFileTable)
 {
     TMPQHetTable * pHetTable = ha->pHetTable;
     TMPQBetTable * pBetTable;
@@ -2432,66 +2251,58 @@ int BuildFileTable_HetBet(
     pBetTable = LoadBetTable(ha);
     if(pBetTable != NULL)
     {
-        // Verify the size of NameHash2 in the BET table.
-        // It has to be 8 bits less than the information in HET table
-        if((pBetTable->dwBitCount_NameHash2 + 8) != pHetTable->dwNameHashBitSize)
-            return ERROR_FILE_CORRUPT;
-        
-        // Step one: Fill the name indexes
-        for(i = 0; i < pHetTable->dwTotalCount; i++)
+        // Step one: Fill the indexes to the HET table
+        for(i = 0; i < pHetTable->dwHashTableSize; i++)
         {
             DWORD dwFileIndex = 0;
 
             // Is the entry in the HET table occupied?
-            if(pHetTable->pNameHashes[i] != 0)
+            if(pHetTable->pHetHashes[i] != 0)
             {
                 // Load the index to the BET table
                 GetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * i,
                                                 pHetTable->dwIndexSize,
-                                               &dwFileIndex,
+                                                &dwFileIndex,
                                                 4);
                 // Overflow test
-                if(dwFileIndex < pBetTable->dwEntryCount)
+                if(dwFileIndex < pBetTable->dwFileCount)
                 {
-                    ULONGLONG NameHash1 = pHetTable->pNameHashes[i];
-                    ULONGLONG NameHash2 = 0;
+                    // Get the file entry and save HET index
+                    pFileEntry = pFileTable + dwFileIndex;
+                    pFileEntry->dwHetIndex = i;
 
                     // Load the BET hash
-                    GetBits(pBetTable->pNameHashes, pBetTable->dwBitTotal_NameHash2 * dwFileIndex,
-                                                    pBetTable->dwBitCount_NameHash2,
-                                                   &NameHash2,
-                                                    8);
-
-                    // Combine both part of the name hash and put it to the file table
-                    pFileEntry = pFileTable + dwFileIndex;
-                    pFileEntry->FileNameHash = (NameHash1 << pBetTable->dwBitCount_NameHash2) | NameHash2;
+                    GetBits(pBetTable->pBetHashes, pBetTable->dwBetHashSizeTotal * dwFileIndex,
+                                                   pBetTable->dwBetHashSize,
+                                                   &pFileEntry->BetHash,
+                                                   8);
                 }
             }
         }
 
         // Go through the entire BET table and convert it to the file table.
         pFileEntry = pFileTable;
-        pBitArray = pBetTable->pFileTable; 
-        for(i = 0; i < pBetTable->dwEntryCount; i++)
+        pBitArray = pBetTable->pFileTable;
+        for(i = 0; i < pBetTable->dwFileCount; i++)
         {
             DWORD dwFlagIndex = 0;
 
             // Read the file position
             GetBits(pBitArray, dwBitPosition + pBetTable->dwBitIndex_FilePos,
                                pBetTable->dwBitCount_FilePos,
-                              &pFileEntry->ByteOffset,
+                               &pFileEntry->ByteOffset,
                                8);
 
             // Read the file size
             GetBits(pBitArray, dwBitPosition + pBetTable->dwBitIndex_FileSize,
                                pBetTable->dwBitCount_FileSize,
-                              &pFileEntry->dwFileSize,
+                               &pFileEntry->dwFileSize,
                                4);
 
             // Read the compressed size
             GetBits(pBitArray, dwBitPosition + pBetTable->dwBitIndex_CmpSize,
                                pBetTable->dwBitCount_CmpSize,
-                              &pFileEntry->dwCmpSize,
+                               &pFileEntry->dwCmpSize,
                                4);
 
 
@@ -2500,8 +2311,9 @@ int BuildFileTable_HetBet(
             {
                 GetBits(pBitArray, dwBitPosition + pBetTable->dwBitIndex_FlagIndex,
                                    pBetTable->dwBitCount_FlagIndex,
-                                  &dwFlagIndex,
+                                   &dwFlagIndex,
                                    4);
+
                 pFileEntry->dwFlags = pBetTable->pFileFlags[dwFlagIndex];
             }
 
@@ -2515,7 +2327,7 @@ int BuildFileTable_HetBet(
         }
 
         // Set the current size of the file table
-        ha->dwFileTableSize = pBetTable->dwEntryCount;
+        ha->dwFileTableSize = pBetTable->dwFileCount;
         FreeBetTable(pBetTable);
         nError = ERROR_SUCCESS;
     }
@@ -2527,26 +2339,22 @@ int BuildFileTable_HetBet(
     return nError;
 }
 
-int BuildFileTable(TMPQArchive * ha)
+int BuildFileTable(TMPQArchive * ha, ULONGLONG FileSize)
 {
     TFileEntry * pFileTable;
-    DWORD dwFileTableSize;
     bool bFileTableCreated = false;
 
     // Sanity checks
     assert(ha->dwFileTableSize == 0);
     assert(ha->dwMaxFileCount != 0);
 
-    // Determine the allocation size for the file table
-    dwFileTableSize = STORMLIB_MAX(ha->pHeader->dwBlockTableSize, ha->dwMaxFileCount);
-
     // Allocate the file table with size determined before
-    pFileTable = STORM_ALLOC(TFileEntry, dwFileTableSize);
+    pFileTable = STORM_ALLOC(TFileEntry, ha->dwMaxFileCount);
     if(pFileTable == NULL)
         return ERROR_NOT_ENOUGH_MEMORY;
 
     // Fill the table with zeros
-    memset(pFileTable, 0, dwFileTableSize * sizeof(TFileEntry));
+    memset(pFileTable, 0, ha->dwMaxFileCount * sizeof(TFileEntry));
 
     // If we have HET table, we load file table from the BET table
     // Note: If BET table is corrupt or missing, we set the archive as read only
@@ -2562,12 +2370,12 @@ int BuildFileTable(TMPQArchive * ha)
     // Note: If block table is corrupt or missing, we set the archive as read only
     if(ha->pHashTable != NULL)
     {
-        if(BuildFileTable_Classic(ha, pFileTable) != ERROR_SUCCESS)
+        if(BuildFileTable_Classic(ha, pFileTable, FileSize) != ERROR_SUCCESS)
             ha->dwFlags |= MPQ_FLAG_READ_ONLY;
         else
             bFileTableCreated = true;
     }
-    
+
     // If something failed, we free the file table entry
     if(bFileTableCreated == false)
     {
@@ -2580,134 +2388,11 @@ int BuildFileTable(TMPQArchive * ha)
     return ERROR_SUCCESS;
 }
 
-// Rebuilds the HET table from scratch based on the file table
-// Used after a modifying operation (add, rename, delete)
-int RebuildHetTable(TMPQArchive * ha)
-{
-    TMPQHetTable * pOldHetTable = ha->pHetTable;
-    ULONGLONG FileNameHash;
-    DWORD i;
-    int nError = ERROR_SUCCESS;
-
-    // Create new HET table based on the total number of entries in the file table
-    // Note that if we fail to create it, we just stop using HET table
-    ha->pHetTable = CreateHetTable(ha->dwFileTableSize, 0, 0x40, NULL);
-    if(ha->pHetTable != NULL)
-    {
-        // Go through the file table again and insert all existing files
-        for(i = 0; i < ha->dwFileTableSize; i++)
-        {
-            if(ha->pFileTable[i].dwFlags & MPQ_FILE_EXISTS)
-            {
-                // Get the high
-                FileNameHash = ha->pFileTable[i].FileNameHash;
-                nError = InsertHetEntry(ha->pHetTable, FileNameHash, i);
-                if(nError != ERROR_SUCCESS)
-                    break;
-            }
-        }
-    }
-
-    // Free the old HET table
-    FreeHetTable(pOldHetTable);
-    return nError;
-}
-
-// Rebuilds the file table, removing all deleted file entries.
-// Used when compacting the archive
-int RebuildFileTable(TMPQArchive * ha, DWORD dwNewHashTableSize, DWORD dwNewMaxFileCount)
-{
-    TFileEntry * pOldFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-    TFileEntry * pOldFileTable = ha->pFileTable;
-    TFileEntry * pFileTable;
-    TFileEntry * pFileEntry;
-    TFileEntry * pOldEntry;
-    TMPQHash * pOldHashTable = ha->pHashTable;
-    TMPQHash * pHashTable = NULL;
-    TMPQHash * pHash;
-    int nError = ERROR_SUCCESS;
-
-    // The new hash table size must be greater or equal to the current hash table size
-    assert(dwNewHashTableSize >= ha->pHeader->dwHashTableSize);
-
-    // The new hash table size must be a power of two
-    assert((dwNewHashTableSize & (dwNewHashTableSize - 1)) == 0);
-
-    // Allocate the new file table
-    pFileTable = pFileEntry = STORM_ALLOC(TFileEntry, dwNewMaxFileCount);
-    if(pFileTable == NULL)
-        nError = ERROR_NOT_ENOUGH_MEMORY;
-
-    // Allocate new hash table
-    if(nError == ERROR_SUCCESS && ha->pHashTable != NULL)
-    {
-        pHashTable = STORM_ALLOC(TMPQHash, dwNewHashTableSize);
-        if(pHashTable == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // If both succeeded, we need to rebuild the file table
-    if(nError == ERROR_SUCCESS)
-    {
-        // Make sure that the hash table is properly filled
-        memset(pFileTable, 0x00, sizeof(TFileEntry) * dwNewMaxFileCount);
-        memset(pHashTable, 0xFF, sizeof(TMPQHash) * dwNewHashTableSize);
-        
-        // Set the new tables to the MPQ archive
-        ha->pFileTable = pFileTable;
-        ha->pHashTable = pHashTable;
-
-        // Set the new limits to the MPQ archive
-        ha->pHeader->dwHashTableSize = dwNewHashTableSize;
-        ha->dwMaxFileCount = dwNewMaxFileCount;
-
-        // Now copy all the file entries
-        for(pOldEntry = pOldFileTable; pOldEntry < pOldFileTableEnd; pOldEntry++)
-        {
-            // If the file entry exists, we copy it to the new table
-            // Otherwise, we skip it
-            if(pOldEntry->dwFlags & MPQ_FILE_EXISTS)
-            {
-                // Copy the file entry
-                *pFileEntry = *pOldEntry;
-
-                // Create hash entry for it
-                if(ha->pHashTable != NULL)
-                {
-                    pHash = AllocateHashEntry(ha, pFileEntry);
-                    if(pHash == NULL)
-                    {
-                        nError = ERROR_DISK_FULL;
-                        break;
-                    }
-                }
-
-                // Move the file entry by one
-                pFileEntry++;
-            }
-        }
-
-        // Update the file table size
-        ha->dwFileTableSize = (DWORD)(pFileEntry - pFileTable);
-        ha->dwFlags |= MPQ_FLAG_CHANGED;
-        pFileTable = NULL;
-    }
-
-    // Now free the remaining entries
-    if(pOldFileTable != NULL)
-        STORM_FREE(pOldFileTable);
-    if(pOldHashTable != NULL)
-        STORM_FREE(pOldHashTable);
-    if(pFileTable != NULL)
-        STORM_FREE(pFileTable);
-    return nError;
-}
-
 // Saves MPQ header, hash table, block table and hi-block table.
 int SaveMPQTables(TMPQArchive * ha)
 {
-    TMPQExtHeader * pHetTable = NULL;
-    TMPQExtHeader * pBetTable = NULL;
+    TMPQExtTable * pHetTable = NULL;
+    TMPQExtTable * pBetTable = NULL;
     TMPQHeader * pHeader = ha->pHeader;
     TMPQBlock * pBlockTable = NULL;
     TMPQHash * pHashTable = NULL;
@@ -2725,8 +2410,8 @@ int SaveMPQTables(TMPQArchive * ha)
     // We expect this function to be called only when tables have been changed
     assert(ha->dwFlags & MPQ_FLAG_CHANGED);
 
-    // Find the space where the MPQ tables will be saved 
-    TablePos = FindFreeMpqSpace(ha);
+    // Find the space where the MPQ tables will be saved
+    FindFreeMpqSpace(ha, &TablePos);
 
     // If the MPQ has HET table, we prepare a ready-to-save version
     if(nError == ERROR_SUCCESS && ha->pHetTable != NULL)
@@ -2753,7 +2438,7 @@ int SaveMPQTables(TMPQArchive * ha)
     }
 
     // Create block table
-    if(nError == ERROR_SUCCESS && ha->pFileTable != NULL)
+    if(nError == ERROR_SUCCESS && ha->pHashTable != NULL)
     {
         pBlockTable = TranslateBlockTable(ha, &BlockTableSize64, &bNeedHiBlockTable);
         if(pBlockTable == NULL)
@@ -2816,7 +2501,7 @@ int SaveMPQTables(TMPQArchive * ha)
         pHeader->HiBlockTableSize64 = HiBlockTableSize64;
         pHeader->HiBlockTablePos64 = TablePos;
         BSWAP_ARRAY16_UNSIGNED(pHiBlockTable, HiBlockTableSize64);
-        
+
         if(!FileStream_Write(ha->pStream, &ByteOffset, pHiBlockTable, (DWORD)HiBlockTableSize64))
             nError = GetLastError();
         TablePos += HiBlockTableSize64;
@@ -2834,23 +2519,18 @@ int SaveMPQTables(TMPQArchive * ha)
     // Write the MPQ header
     if(nError == ERROR_SUCCESS)
     {
-        TMPQHeader SaveMpqHeader;
-
         // Update the size of the archive
         pHeader->ArchiveSize64 = TablePos;
         pHeader->dwArchiveSize = (DWORD)TablePos;
-        
+
         // Update the MD5 of the archive header
         CalculateDataBlockHash(pHeader, MPQ_HEADER_SIZE_V4 - MD5_DIGEST_SIZE, pHeader->MD5_MpqHeader);
 
         // Write the MPQ header to the file
-        memcpy(&SaveMpqHeader, pHeader, pHeader->dwHeaderSize);
-        BSWAP_TMPQHEADER(&SaveMpqHeader, MPQ_FORMAT_VERSION_1);
-        BSWAP_TMPQHEADER(&SaveMpqHeader, MPQ_FORMAT_VERSION_2);
-        BSWAP_TMPQHEADER(&SaveMpqHeader, MPQ_FORMAT_VERSION_3);
-        BSWAP_TMPQHEADER(&SaveMpqHeader, MPQ_FORMAT_VERSION_4);
-        if(!FileStream_Write(ha->pStream, &ha->MpqPos, &SaveMpqHeader, pHeader->dwHeaderSize))
+        BSWAP_TMPQHEADER(pHeader);
+        if(!FileStream_Write(ha->pStream, &ha->MpqPos, pHeader, pHeader->dwHeaderSize))
             nError = GetLastError();
+        BSWAP_TMPQHEADER(pHeader);
     }
 
     // Clear the changed flag
diff --git a/dep/StormLib/src/SBaseSubTypes.cpp b/dep/StormLib/src/SBaseSubTypes.cpp
deleted file mode 100644
index 117221d93..000000000
--- a/dep/StormLib/src/SBaseSubTypes.cpp
+++ /dev/null
@@ -1,620 +0,0 @@
-/*****************************************************************************/
-/* SBaseSubTypes.cpp                      Copyright (c) Ladislav Zezula 2013 */
-/*---------------------------------------------------------------------------*/
-/* Conversion routines for archive formats that are similar to MPQ format    */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 02.11.11  1.00  Lad  The first version of SBaseSubTypes.cpp               */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-/*****************************************************************************/
-/*                                                                           */
-/*         Support for SQP file format (War of the Immortals)                */
-/*                                                                           */
-/*****************************************************************************/
-
-typedef struct _TSQPHeader
-{
-    // The ID_MPQ ('MPQ\x1A') signature
-    DWORD dwID;                         
-
-    // Size of the archive header
-    DWORD dwHeaderSize;                   
-
-    // 32-bit size of MPQ archive
-    DWORD dwArchiveSize;
-
-    // Offset to the beginning of the hash table, relative to the beginning of the archive.
-    DWORD dwHashTablePos;
-    
-    // Offset to the beginning of the block table, relative to the beginning of the archive.
-    DWORD dwBlockTablePos;
-    
-    // Number of entries in the hash table. Must be a power of two, and must be less than 2^16 for
-    // the original MoPaQ format, or less than 2^20 for the Burning Crusade format.
-    DWORD dwHashTableSize;
-    
-    // Number of entries in the block table
-    DWORD dwBlockTableSize;
-
-    // Must be zero for SQP files
-    USHORT wFormatVersion;
-
-    // Power of two exponent specifying the number of 512-byte disk sectors in each file sector
-    // in the archive. The size of each file sector in the archive is 512 * 2 ^ wSectorSize.
-    USHORT wSectorSize;
-
-} TSQPHeader;
-
-typedef struct _TSQPHash
-{
-    // Most likely the lcLocale+wPlatform.
-    DWORD dwAlwaysZero;
-
-    // If the hash table entry is valid, this is the index into the block table of the file.
-    // Otherwise, one of the following two values:
-    //  - FFFFFFFFh: Hash table entry is empty, and has always been empty.
-    //               Terminates searches for a given file.
-    //  - FFFFFFFEh: Hash table entry is empty, but was valid at some point (a deleted file).
-    //               Does not terminate searches for a given file.
-    DWORD dwBlockIndex;
-
-    // The hash of the file path, using method A.
-    DWORD dwName1;
-    
-    // The hash of the file path, using method B.
-    DWORD dwName2;
-
-} TSQPHash;
-
-typedef struct _TSQPBlock
-{
-    // Offset of the beginning of the file, relative to the beginning of the archive.
-    DWORD dwFilePos;
-    
-    // Flags for the file. See MPQ_FILE_XXXX constants
-    DWORD dwFlags;                      
-
-    // Compressed file size
-    DWORD dwCSize;
-    
-    // Uncompressed file size
-    DWORD dwFSize;                      
-    
-} TSQPBlock;
-
-//-----------------------------------------------------------------------------
-// Functions - SQP file format
-
-// This function converts SQP file header into MPQ file header
-int ConvertSqpHeaderToFormat4(
-    TMPQArchive * ha,
-    ULONGLONG FileSize,
-    DWORD dwFlags)
-{
-    TSQPHeader * pSqpHeader = (TSQPHeader *)ha->HeaderData;
-    TMPQHeader Header;
-
-    // SQP files from War of the Immortal use MPQ file format with slightly
-    // modified structure. These fields have different position:
-    //
-    //  Offset  TMPQHeader             TSQPHeader
-    //  ------  ----------             -----------
-    //   000C   wFormatVersion         dwHashTablePos (lo)
-    //   000E   wSectorSize            dwHashTablePos (hi)
-    //   001C   dwBlockTableSize (lo)  wBlockSize
-    //   001E   dwHashTableSize (hi)   wFormatVersion
-
-    // Can't open the archive with certain flags
-    if(dwFlags & MPQ_OPEN_FORCE_MPQ_V1)
-        return ERROR_FILE_CORRUPT;
-
-    // The file must not be greater than 4 GB
-    if((FileSize >> 0x20) != 0)
-        return ERROR_FILE_CORRUPT;
-
-    // Translate the SQP header into a MPQ header
-    memset(&Header, 0, sizeof(TMPQHeader));
-    Header.dwID = BSWAP_INT32_UNSIGNED(pSqpHeader->dwID);
-    Header.dwHeaderSize = BSWAP_INT32_UNSIGNED(pSqpHeader->dwHeaderSize);
-    Header.dwArchiveSize = BSWAP_INT32_UNSIGNED(pSqpHeader->dwArchiveSize);
-    Header.dwHashTablePos = BSWAP_INT32_UNSIGNED(pSqpHeader->dwHashTablePos);
-    Header.dwBlockTablePos = BSWAP_INT32_UNSIGNED(pSqpHeader->dwBlockTablePos);
-    Header.dwHashTableSize = BSWAP_INT32_UNSIGNED(pSqpHeader->dwHashTableSize);
-    Header.dwBlockTableSize = BSWAP_INT32_UNSIGNED(pSqpHeader->dwBlockTableSize);
-    Header.wFormatVersion = BSWAP_INT16_UNSIGNED(pSqpHeader->wFormatVersion);
-    Header.wSectorSize = BSWAP_INT16_UNSIGNED(pSqpHeader->wSectorSize);
-
-    // Verify the SQP header
-    if(Header.dwID == ID_MPQ && Header.dwHeaderSize == sizeof(TSQPHeader) && Header.dwArchiveSize == FileSize)
-    {
-        // Check for fixed values of version and sector size
-        if(Header.wFormatVersion == MPQ_FORMAT_VERSION_1 && Header.wSectorSize == 3)
-        {
-            // Initialize the fields of 3.0 header
-            Header.ArchiveSize64    = Header.dwArchiveSize;
-            Header.HashTableSize64  = Header.dwHashTableSize * sizeof(TMPQHash);
-            Header.BlockTableSize64 = Header.dwBlockTableSize * sizeof(TMPQBlock);
-
-            // Copy the converted MPQ header back
-            memcpy(ha->HeaderData, &Header, sizeof(TMPQHeader));
-            
-            // Mark this file as SQP file
-            ha->pfnHashString = HashStringSlash;
-            ha->dwFlags |= MPQ_FLAG_READ_ONLY;
-            ha->dwSubType = MPQ_SUBTYPE_SQP;
-            return ERROR_SUCCESS;
-        }
-    }
-
-    return ERROR_FILE_CORRUPT;
-}
-
-void * LoadSqpTable(TMPQArchive * ha, DWORD dwByteOffset, DWORD cbTableSize, DWORD dwKey)
-{
-    ULONGLONG ByteOffset;
-    LPBYTE pbSqpTable;
-
-    // Allocate buffer for the table
-    pbSqpTable = STORM_ALLOC(BYTE, cbTableSize);
-    if(pbSqpTable != NULL)
-    {
-        // Load the table
-        ByteOffset = ha->MpqPos + dwByteOffset;
-        if(FileStream_Read(ha->pStream, &ByteOffset, pbSqpTable, cbTableSize))
-        {
-            // Decrypt the SQP table
-            DecryptMpqBlock(pbSqpTable, cbTableSize, dwKey);
-            return pbSqpTable;
-        }
-
-        // Free the table
-        STORM_FREE(pbSqpTable);
-    }
-
-    return NULL;
-}
-
-TMPQHash * LoadSqpHashTable(TMPQArchive * ha)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-    TSQPHash * pSqpHashTable;
-    TSQPHash * pSqpHashEnd;
-    TSQPHash * pSqpHash;
-    TMPQHash * pMpqHash;
-    DWORD dwBlockIndex;
-    int nError = ERROR_SUCCESS;
-
-    // Load the hash table
-    pSqpHashTable = (TSQPHash *)LoadSqpTable(ha, pHeader->dwHashTablePos, pHeader->dwHashTableSize * sizeof(TSQPHash), MPQ_KEY_HASH_TABLE);
-    if(pSqpHashTable != NULL)
-    {
-        // Parse the entire hash table and convert it to MPQ hash table
-        pSqpHashEnd = pSqpHashTable + pHeader->dwHashTableSize;
-        pMpqHash = (TMPQHash *)pSqpHashTable;
-        for(pSqpHash = pSqpHashTable; pSqpHash < pSqpHashEnd; pSqpHash++, pMpqHash++)
-        {
-            // Ignore free entries
-            if(pSqpHash->dwBlockIndex != HASH_ENTRY_FREE)
-            {
-                // Check block index against the size of the block table
-                dwBlockIndex = pSqpHash->dwBlockIndex;
-                if(pHeader->dwBlockTableSize <= dwBlockIndex && dwBlockIndex < HASH_ENTRY_DELETED)
-                    nError = ERROR_FILE_CORRUPT;
-
-                // We do not support nonzero locale and platform ID
-                if(pSqpHash->dwAlwaysZero != 0 && pSqpHash->dwAlwaysZero != HASH_ENTRY_FREE)
-                    nError = ERROR_FILE_CORRUPT;
-
-                // Store the file name hash
-                pMpqHash->dwName1 = pSqpHash->dwName1;
-                pMpqHash->dwName2 = pSqpHash->dwName2;
-
-                // Store the rest. Note that this must be done last,
-                // because pSqpHash->dwBlockIndex corresponds to pMpqHash->dwName2
-                pMpqHash->dwBlockIndex = dwBlockIndex;
-                pMpqHash->wPlatform = 0;
-                pMpqHash->lcLocale = 0;
-            }
-        }
-
-        // If an error occured, we need to free the hash table
-        if(nError != ERROR_SUCCESS)
-        {
-            STORM_FREE(pSqpHashTable);
-            pSqpHashTable = NULL;
-        }
-    }
-
-    // Return the converted hash table (or NULL on failure)
-    return (TMPQHash *)pSqpHashTable;
-}
-
-// Loads the SQP Block table and converts it to a MPQ block table
-TMPQBlock * LoadSqpBlockTable(TMPQArchive * ha)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-    TSQPBlock * pSqpBlockTable;
-    TSQPBlock * pSqpBlockEnd;
-    TSQPBlock * pSqpBlock;
-    TMPQBlock * pMpqBlock;
-    DWORD dwFlags;
-    int nError = ERROR_SUCCESS;
-
-    // Load the hash table
-    pSqpBlockTable = (TSQPBlock *)LoadSqpTable(ha, pHeader->dwBlockTablePos, pHeader->dwBlockTableSize * sizeof(TSQPBlock), MPQ_KEY_BLOCK_TABLE);
-    if(pSqpBlockTable != NULL)
-    {
-        // Parse the entire hash table and convert it to MPQ hash table
-        pSqpBlockEnd = pSqpBlockTable + pHeader->dwBlockTableSize;
-        pMpqBlock = (TMPQBlock *)pSqpBlockTable;
-        for(pSqpBlock = pSqpBlockTable; pSqpBlock < pSqpBlockEnd; pSqpBlock++, pMpqBlock++)
-        {
-            // Check for valid flags
-            if(pSqpBlock->dwFlags & ~MPQ_FILE_VALID_FLAGS)
-                nError = ERROR_FILE_CORRUPT;
-
-            // Convert SQP block table entry to MPQ block table entry
-            dwFlags = pSqpBlock->dwFlags;
-            pMpqBlock->dwCSize = pSqpBlock->dwCSize;
-            pMpqBlock->dwFSize = pSqpBlock->dwFSize;
-            pMpqBlock->dwFlags = dwFlags;
-        }
-
-        // If an error occured, we need to free the hash table
-        if(nError != ERROR_SUCCESS)
-        {
-            STORM_FREE(pSqpBlockTable);
-            pSqpBlockTable = NULL;
-        }
-    }
-
-    // Return the converted hash table (or NULL on failure)
-    return (TMPQBlock *)pSqpBlockTable;
-}
-
-/*****************************************************************************/
-/*                                                                           */
-/*         Support for MPK file format (Longwu Online)                       */
-/*                                                                           */
-/*****************************************************************************/
-
-#define MPK_FILE_UNKNOWN_0001   0x00000001      // Seems to be always present
-#define MPK_FILE_UNKNOWN_0010   0x00000010      // Seems to be always present
-#define MPK_FILE_COMPRESSED     0x00000100      // Indicates a compressed file
-#define MPK_FILE_UNKNOWN_2000   0x00002000      // Seems to be always present
-#define MPK_FILE_EXISTS         0x01000000      // Seems to be always present
-
-typedef struct _TMPKHeader
-{
-    // The ID_MPK ('MPK\x1A') signature
-    DWORD dwID;
-    
-    // Contains '2000'
-    DWORD dwVersion;
-    
-    // 32-bit size of the archive
-    DWORD dwArchiveSize;
-    
-    // Size of the archive header
-    DWORD dwHeaderSize;
-
-    DWORD dwHashTablePos;
-    DWORD dwHashTableSize;
-    DWORD dwBlockTablePos;
-    DWORD dwBlockTableSize;
-    DWORD dwUnknownPos;
-    DWORD dwUnknownSize;
-} TMPKHeader;
-
-
-typedef struct _TMPKHash
-{
-    // The hash of the file path, using method A.
-    DWORD dwName1;
-    
-    // The hash of the file path, using method B.
-    DWORD dwName2;
-
-    // The hash of the file path, using method C.
-    DWORD dwName3;
-
-    // If the hash table entry is valid, this is the index into the block table of the file.
-    // Otherwise, one of the following two values:
-    //  - FFFFFFFFh: Hash table entry is empty, and has always been empty.
-    //               Terminates searches for a given file.
-    //  - FFFFFFFEh: Hash table entry is empty, but was valid at some point (a deleted file).
-    //               Does not terminate searches for a given file.
-    DWORD dwBlockIndex;
-
-} TMPKHash;
-
-typedef struct _TMPKBlock
-{
-    DWORD  dwFlags;         // 0x1121 - Compressed , 0x1120 - Not compressed 
-    DWORD  dwFilePos;       // Offset of the beginning of the file, relative to the beginning of the archive.
-    DWORD  dwFSize;         // Uncompressed file size
-    DWORD  dwCSize;         // Compressed file size
-    DWORD  dwUnknown;       // 0x86364E6D
-} TMPKBlock;
-
-//-----------------------------------------------------------------------------
-// Local variables - MPK file format
-
-static const unsigned char MpkDecryptionKey[512] =
-{
-    0x60, 0x20, 0x29, 0xE1, 0x01, 0xCE, 0xAA, 0xFE, 0xA3, 0xAB, 0x8E, 0x30, 0xAF, 0x02, 0xD1, 0x7D,
-    0x41, 0x24, 0x06, 0xBD, 0xAE, 0xBE, 0x43, 0xC3, 0xBA, 0xB7, 0x08, 0x13, 0x51, 0xCF, 0xF8, 0xF7,
-    0x25, 0x42, 0xA5, 0x4A, 0xDA, 0x0F, 0x52, 0x1C, 0x90, 0x3B, 0x63, 0x49, 0x36, 0xF6, 0xDD, 0x1B,
-    0xEA, 0x58, 0xD4, 0x40, 0x70, 0x61, 0x55, 0x09, 0xCD, 0x0B, 0xA2, 0x4B, 0x68, 0x2C, 0x8A, 0xF1,
-    0x3C, 0x3A, 0x65, 0xBB, 0xA1, 0xA8, 0x23, 0x97, 0xFD, 0x15, 0x00, 0x94, 0x88, 0x33, 0x59, 0xE9,
-    0xFB, 0x69, 0x21, 0xEF, 0x85, 0x5B, 0x57, 0x6C, 0xFA, 0xB5, 0xEE, 0xB8, 0x71, 0xDC, 0xB1, 0x38,
-    0x0C, 0x0A, 0x5C, 0x56, 0xC9, 0xB4, 0x84, 0x17, 0x1E, 0xE5, 0xD3, 0x5A, 0xCC, 0xFC, 0x11, 0x86,
-    0x7F, 0x45, 0x4F, 0x54, 0xC8, 0x8D, 0x73, 0x89, 0x79, 0x5D, 0xB3, 0xBF, 0xB9, 0xE3, 0x93, 0xE4,
-    0x6F, 0x35, 0x2D, 0x46, 0xF2, 0x76, 0xC5, 0x7E, 0xE2, 0xA4, 0xE6, 0xD9, 0x6E, 0x48, 0x34, 0x2B,
-    0xC6, 0x5F, 0xBC, 0xA0, 0x6D, 0x0D, 0x47, 0x6B, 0x95, 0x96, 0x92, 0x91, 0xB2, 0x27, 0xEB, 0x9E,
-    0xEC, 0x8F, 0xDF, 0x9C, 0x74, 0x99, 0x64, 0xF5, 0xFF, 0x28, 0xB6, 0x37, 0xF3, 0x7C, 0x81, 0x03,
-    0x44, 0x62, 0x1F, 0xDB, 0x04, 0x7B, 0xB0, 0x9B, 0x31, 0xA7, 0xDE, 0x78, 0x9F, 0xAD, 0x0E, 0x3F,
-    0x3E, 0x4D, 0xC7, 0xD7, 0x39, 0x19, 0x5E, 0xC2, 0xD0, 0xAC, 0xE8, 0x1A, 0x87, 0x8B, 0x07, 0x05,
-    0x22, 0xED, 0x72, 0x2E, 0x1D, 0xC1, 0xA9, 0xD6, 0xE0, 0x83, 0xD5, 0xD8, 0xCB, 0x80, 0xF0, 0x66,
-    0x7A, 0x9D, 0x50, 0xF9, 0x10, 0x4E, 0x16, 0x14, 0x77, 0x75, 0x6A, 0x67, 0xD2, 0xC0, 0xA6, 0xC4,
-    0x53, 0x8C, 0x32, 0xCA, 0x82, 0x2A, 0x18, 0x9A, 0xF4, 0x4C, 0x3D, 0x26, 0x12, 0xE7, 0x98, 0x2F,
-    0x4A, 0x04, 0x0D, 0xAF, 0xB4, 0xCF, 0x12, 0xCE, 0x1A, 0x37, 0x61, 0x39, 0x60, 0x95, 0xBE, 0x25,
-    0xE4, 0x6E, 0xFC, 0x1B, 0xE7, 0x49, 0xE6, 0x67, 0xF6, 0xC5, 0xCB, 0x2F, 0x27, 0xD4, 0x68, 0xB2,
-    0x01, 0x52, 0xD0, 0x46, 0x11, 0x20, 0xFB, 0x9D, 0xA9, 0x02, 0xF5, 0x8F, 0x3D, 0x82, 0xD3, 0xFF,
-    0x0B, 0xB8, 0xF2, 0x4D, 0x8E, 0x81, 0x2C, 0xAB, 0x5F, 0xC4, 0x41, 0x29, 0x40, 0xFA, 0xC0, 0xBF,
-    0x33, 0x10, 0x21, 0x16, 0xB0, 0x71, 0x83, 0x96, 0x8D, 0x2B, 0x23, 0x3B, 0xF9, 0xC1, 0xE5, 0x72,
-    0xE2, 0x1C, 0x26, 0xF0, 0x73, 0x36, 0x63, 0x56, 0x31, 0x4E, 0x6B, 0x55, 0x62, 0x79, 0xC6, 0x91,
-    0x00, 0x35, 0xB1, 0x2A, 0xA6, 0x42, 0xDF, 0xEB, 0x3C, 0x51, 0xEA, 0x97, 0x57, 0x94, 0x8C, 0x80,
-    0x34, 0x5C, 0xD2, 0x76, 0xA4, 0xE9, 0x85, 0xE8, 0xBB, 0x78, 0xE0, 0xB5, 0xAD, 0x0F, 0x87, 0x70,
-    0xDD, 0xAE, 0xF4, 0xD9, 0x66, 0x54, 0x6F, 0xCC, 0x4C, 0x77, 0x3E, 0xCD, 0xF1, 0x75, 0x0A, 0xA1,
-    0x28, 0x9B, 0x9A, 0x7E, 0x4B, 0x98, 0x99, 0x47, 0xFE, 0xA5, 0xF7, 0xB7, 0xA3, 0xE1, 0x9F, 0xBC,
-    0x93, 0x44, 0x3A, 0x08, 0x89, 0x22, 0xEE, 0xB9, 0x45, 0xD6, 0x06, 0x09, 0xC9, 0xBD, 0x14, 0x0C,
-    0xB6, 0x5E, 0x9C, 0x7A, 0x65, 0x59, 0xAA, 0x19, 0x5B, 0x7C, 0x18, 0x43, 0x92, 0x13, 0x15, 0x7B,
-    0xED, 0xD5, 0xC7, 0x17, 0xEF, 0x86, 0x90, 0xC2, 0x74, 0x64, 0xF3, 0xDC, 0x6C, 0x38, 0x05, 0x1D,
-    0xC8, 0x0E, 0xEC, 0x6A, 0x32, 0xDA, 0xD7, 0xC3, 0xDB, 0x8B, 0x24, 0xB3, 0x5D, 0x2E, 0xBA, 0xA2,
-    0xD8, 0x03, 0x88, 0x7D, 0x7F, 0x69, 0x8A, 0xFD, 0xCA, 0x4F, 0x30, 0x9E, 0xA0, 0xD1, 0x5A, 0x53,
-    0xDE, 0x3F, 0x84, 0xAC, 0xF8, 0xA7, 0x2D, 0x1F, 0x1E, 0xE3, 0x58, 0x50, 0x6D, 0x48, 0x07, 0xA8
-};
-
-//-----------------------------------------------------------------------------
-// Functions - MPK file format
-
-// This function converts MPK file header into MPQ file header
-int ConvertMpkHeaderToFormat4(
-    TMPQArchive * ha,
-    ULONGLONG FileSize,
-    DWORD dwFlags)
-{
-    TMPKHeader * pMpkHeader = (TMPKHeader *)ha->HeaderData;
-    TMPQHeader Header;
-
-    // Can't open the archive with certain flags
-    if(dwFlags & MPQ_OPEN_FORCE_MPQ_V1)
-        return ERROR_FILE_CORRUPT;
-
-    // Translate the MPK header into a MPQ header
-    // Note: Hash table size and block table size are in bytes, not in entries
-    memset(&Header, 0, sizeof(TMPQHeader));
-    Header.dwID = BSWAP_INT32_UNSIGNED(pMpkHeader->dwID);
-    Header.dwArchiveSize = BSWAP_INT32_UNSIGNED(pMpkHeader->dwArchiveSize);
-    Header.dwHeaderSize = BSWAP_INT32_UNSIGNED(pMpkHeader->dwHeaderSize);
-    Header.dwHashTablePos = BSWAP_INT32_UNSIGNED(pMpkHeader->dwHashTablePos);
-    Header.dwHashTableSize = BSWAP_INT32_UNSIGNED(pMpkHeader->dwHashTableSize) / sizeof(TMPKHash);
-    Header.dwBlockTablePos = BSWAP_INT32_UNSIGNED(pMpkHeader->dwBlockTablePos);
-    Header.dwBlockTableSize = BSWAP_INT32_UNSIGNED(pMpkHeader->dwBlockTableSize) / sizeof(TMPKBlock);
-//  Header.dwUnknownPos = BSWAP_INT32_UNSIGNED(pMpkHeader->dwUnknownPos);
-//  Header.dwUnknownSize = BSWAP_INT32_UNSIGNED(pMpkHeader->dwUnknownSize);
-    assert(Header.dwHeaderSize == sizeof(TMPKHeader));
-
-    // Verify the MPK header
-    if(Header.dwID == ID_MPK && Header.dwHeaderSize == sizeof(TMPKHeader) && Header.dwArchiveSize == (DWORD)FileSize)
-    {
-        // The header ID must be ID_MPQ
-        Header.dwID = ID_MPQ;
-        Header.wFormatVersion = MPQ_FORMAT_VERSION_1;
-        Header.wSectorSize = 3;
-
-        // Initialize the fields of 3.0 header
-        Header.ArchiveSize64    = Header.dwArchiveSize;
-        Header.HashTableSize64  = Header.dwHashTableSize * sizeof(TMPQHash);
-        Header.BlockTableSize64 = Header.dwBlockTableSize * sizeof(TMPQBlock);
-
-        // Copy the converted MPQ header back
-        memcpy(ha->HeaderData, &Header, sizeof(TMPQHeader));
-
-        // Mark this file as MPK file
-        ha->pfnHashString = HashStringLower;
-        ha->dwFlags |= MPQ_FLAG_READ_ONLY;
-        ha->dwSubType = MPQ_SUBTYPE_MPK;
-        return ERROR_SUCCESS;
-    }
-    return ERROR_FILE_CORRUPT;
-}
-
-// Attempts to search a free hash entry in the hash table being converted.
-// The created hash table must always be of nonzero size,
-// should have no duplicated items and no deleted entries
-TMPQHash * FindFreeHashEntry(TMPQHash * pHashTable, DWORD dwHashTableSize, DWORD dwStartIndex)
-{
-    TMPQHash * pHash;
-    DWORD dwIndex;
-
-    // Set the initial index
-    dwStartIndex = dwIndex = (dwStartIndex & (dwHashTableSize - 1));
-    assert(dwHashTableSize != 0);
-
-    // Search the hash table and return the found entries in the following priority:
-    for(;;)
-    {
-        // We are not expecting to find matching entry in the hash table being built
-        // We are not expecting to find deleted entry either
-        pHash = pHashTable + dwIndex;
-
-        // If we found a free entry, we need to stop searching
-        if(pHash->dwBlockIndex == HASH_ENTRY_FREE)
-            return pHash;
-
-        // Move to the next hash entry.
-        // If we reached the starting entry, it's failure.
-        dwIndex = (dwIndex + 1) & (dwHashTableSize - 1);
-        if(dwIndex == dwStartIndex)
-            break;
-    }
-
-    // We haven't found anything
-    assert(false);
-    return NULL;
-}
-
-void DecryptMpkTable(void * pvMpkTable, size_t cbSize)
-{
-    LPBYTE pbMpkTable = (LPBYTE)pvMpkTable;
-
-    for(size_t i = 0; i < cbSize; i++)
-        pbMpkTable[i] = MpkDecryptionKey[pbMpkTable[i]];
-}
-
-void * LoadMpkTable(TMPQArchive * ha, DWORD dwByteOffset, DWORD cbTableSize)
-{
-    ULONGLONG ByteOffset;
-    LPBYTE pbMpkTable = NULL;
-
-    // Allocate space for the table
-    pbMpkTable = STORM_ALLOC(BYTE, cbTableSize);
-    if(pbMpkTable != NULL)
-    {
-        // Load and the MPK hash table
-        ByteOffset = ha->MpqPos + dwByteOffset;
-        if(FileStream_Read(ha->pStream, &ByteOffset, pbMpkTable, cbTableSize))
-        {
-            // Decrypt the table
-            DecryptMpkTable(pbMpkTable, cbTableSize);
-            return pbMpkTable;
-        }
-
-        // Free the MPK table
-        STORM_FREE(pbMpkTable);
-        pbMpkTable = NULL;
-    }
-
-    // Return the table
-    return pbMpkTable;
-}
-
-TMPQHash * LoadMpkHashTable(TMPQArchive * ha)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-    TMPQHash * pHashTable = NULL;
-    TMPKHash * pMpkHash;
-    TMPQHash * pHash = NULL;
-    DWORD dwHashTableSize = pHeader->dwHashTableSize;
-
-    // MPKs use different hash table searching.
-    // Instead of using MPQ_HASH_TABLE_INDEX hash as index,
-    // they store the value directly in the hash table.
-    // Also for faster searching, the hash table is sorted ascending by the value
-
-    // Load and decrypt the MPK hash table.
-    pMpkHash = (TMPKHash *)LoadMpkTable(ha, pHeader->dwHashTablePos, pHeader->dwHashTableSize * sizeof(TMPKHash));
-    if(pMpkHash != NULL)
-    {
-        // Calculate the hash table size as if it was real MPQ hash table
-        pHeader->dwHashTableSize = GetHashTableSizeForFileCount(dwHashTableSize);
-        pHeader->HashTableSize64 = pHeader->dwHashTableSize * sizeof(TMPQHash);
-
-        // Now allocate table that will serve like a true MPQ hash table,
-        // so we translate the MPK hash table to MPQ hash table
-        pHashTable = STORM_ALLOC(TMPQHash, pHeader->dwHashTableSize);
-        if(pHashTable != NULL)
-        {
-            // Set the entire hash table to free
-            memset(pHashTable, 0xFF, (size_t)pHeader->HashTableSize64);
-
-            // Copy the MPK hash table into MPQ hash table
-            for(DWORD i = 0; i < dwHashTableSize; i++)
-            {
-                // Finds the free hash entry in the hash table
-                // We don't expect any errors here, because we are putting files to empty hash table
-                pHash = FindFreeHashEntry(pHashTable, pHeader->dwHashTableSize, pMpkHash[i].dwName1);
-                assert(pHash->dwBlockIndex == HASH_ENTRY_FREE);
-
-                // Copy the MPK hash entry to the hash table
-                pHash->dwBlockIndex = pMpkHash[i].dwBlockIndex;
-                pHash->wPlatform = 0;
-                pHash->lcLocale = 0;
-                pHash->dwName1 = pMpkHash[i].dwName2;
-                pHash->dwName2 = pMpkHash[i].dwName3;
-            }
-        }
-
-        // Free the temporary hash table
-        STORM_FREE(pMpkHash);
-    }
-
-    return pHashTable;
-}
-
-static DWORD ConvertMpkFlagsToMpqFlags(DWORD dwMpkFlags)
-{
-    DWORD dwMpqFlags = MPQ_FILE_EXISTS;
-
-    // Check for flags that are always present
-    assert((dwMpkFlags & MPK_FILE_UNKNOWN_0001) != 0);
-    assert((dwMpkFlags & MPK_FILE_UNKNOWN_0010) != 0);
-    assert((dwMpkFlags & MPK_FILE_UNKNOWN_2000) != 0);
-    assert((dwMpkFlags & MPK_FILE_EXISTS) != 0);
-
-    // Append the compressed flag
-    dwMpqFlags |= (dwMpkFlags & MPK_FILE_COMPRESSED) ? MPQ_FILE_COMPRESS : 0;
-
-    // All files in the MPQ seem to be single unit files
-    dwMpqFlags |= MPQ_FILE_ENCRYPTED | MPQ_FILE_SINGLE_UNIT;
-
-    return dwMpqFlags;
-}
-
-TMPQBlock * LoadMpkBlockTable(TMPQArchive * ha)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-    TMPKBlock * pMpkBlockTable;
-    TMPKBlock * pMpkBlockEnd;
-    TMPQBlock * pBlockTable = NULL;
-    TMPKBlock * pMpkBlock;
-    TMPQBlock * pMpqBlock;
-
-    // Load and decrypt the MPK block table
-    pMpkBlockTable = pMpkBlock = (TMPKBlock *)LoadMpkTable(ha, pHeader->dwBlockTablePos, pHeader->dwBlockTableSize * sizeof(TMPKBlock));
-    if(pMpkBlockTable != NULL)
-    {
-        // Allocate buffer for MPQ-like block table
-        pBlockTable = pMpqBlock = STORM_ALLOC(TMPQBlock, pHeader->dwBlockTableSize);
-        if(pBlockTable != NULL)
-        {
-            // Convert the MPK block table to MPQ block table
-            pMpkBlockEnd = pMpkBlockTable + pHeader->dwBlockTableSize;
-            while(pMpkBlock < pMpkBlockEnd)
-            {
-                // Translate the MPK block table entry to MPQ block table entry
-                pMpqBlock->dwFilePos = pMpkBlock->dwFilePos;
-                pMpqBlock->dwCSize = pMpkBlock->dwCSize;
-                pMpqBlock->dwFSize = pMpkBlock->dwFSize;
-                pMpqBlock->dwFlags = ConvertMpkFlagsToMpqFlags(pMpkBlock->dwFlags);
-
-                // Move both
-                pMpkBlock++;
-                pMpqBlock++;
-            }
-        }
-
-        // Free the MPK block table
-        STORM_FREE(pMpkBlockTable);
-    }
-
-    return pBlockTable;
-}
diff --git a/dep/StormLib/src/SCompression.cpp b/dep/StormLib/src/SCompression.cpp
index 5402771eb..19ef5940f 100644
--- a/dep/StormLib/src/SCompression.cpp
+++ b/dep/StormLib/src/SCompression.cpp
@@ -2,7 +2,7 @@
 /* SCompression.cpp                       Copyright (c) Ladislav Zezula 2003 */
 /*---------------------------------------------------------------------------*/
 /* This module serves as a bridge between StormLib code and (de)compression  */
-/* functions. All (de)compression calls go (and should only go) through this */   
+/* functions. All (de)compression calls go (and should only go) through this */
 /* module. No system headers should be included in this module to prevent    */
 /* compile-time problems.                                                    */
 /*---------------------------------------------------------------------------*/
@@ -22,34 +22,35 @@
 // Information about the input and output buffers for pklib
 typedef struct
 {
-    unsigned char * pbInBuff;           // Pointer to input data buffer
-    unsigned char * pbInBuffEnd;        // End of the input buffer
-    unsigned char * pbOutBuff;          // Pointer to output data buffer
-    unsigned char * pbOutBuffEnd;       // Pointer to output data buffer
+    char * pbInBuff;                     // Pointer to input data buffer
+    char * pbInBuffEnd;                  // End of the input buffer
+    char * pbOutBuff;                    // Pointer to output data buffer
+    char * pbOutBuffEnd;                 // Pointer to output data buffer
 } TDataInfo;
 
 // Prototype of the compression function
 // Function doesn't return an error. A success means that the size of compressed buffer
 // is lower than size of uncompressed buffer.
 typedef void (*COMPRESS)(
-    void * pvOutBuffer,                 // [out] Pointer to the buffer where the compressed data will be stored
-    int  * pcbOutBuffer,                // [in]  Pointer to length of the buffer pointed by pvOutBuffer
-    void * pvInBuffer,                  // [in]  Pointer to the buffer with data to compress
-    int cbInBuffer,                     // [in]  Length of the buffer pointer by pvInBuffer
-    int * pCmpType,                     // [in]  Compression-method specific value. ADPCM Setups this for the following Huffman compression
-    int nCmpLevel);                     // [in]  Compression specific value. ADPCM uses this. Should be set to zero.
+        char * pbOutBuffer,                 // [out] Pointer to the buffer where the compressed data will be stored
+        int * pcbOutBuffer,                 // [in]  Pointer to length of the buffer pointed by pbOutBuffer
+        // [out] Contains length of the compressed data
+        char * pbInBuffer,                  // [in]  Pointer to the buffer with data to compress
+        int cbInBuffer,                     // [in]  Length of the buffer pointer by pbInBuffer
+        int * pCmpType,                     // [in]  Compression-method specific value. ADPCM Setups this for the following Huffman compression
+        int nCmpLevel);                     // [in]  Compression specific value. ADPCM uses this. Should be set to zero.
 
 // Prototype of the decompression function
 // Returns 1 if success, 0 if failure
 typedef int (*DECOMPRESS)(
-    void * pvOutBuffer,                 // [out] Pointer to the buffer where to store decompressed data
-    int  * pcbOutBuffer,                // [in]  Pointer to total size of the buffer pointed by pvOutBuffer
-                                        // [out] Contains length of the decompressed data
-    void * pvInBuffer,                  // [in]  Pointer to data to be decompressed  
-    int cbInBuffer);                    // [in]  Length of the data to be decompressed
+        char * pbOutBuffer,                 // [out] Pointer to the buffer where to store decompressed data
+        int * pcbOutBuffer,                 // [in]  Pointer to total size of the buffer pointed by pbOutBuffer
+        // [out] Contains length of the decompressed data
+        char * pbInBuffer,                  // [in]  Pointer to data to be decompressed
+        int cbInBuffer);                    // [in]  Length of the data to be decompressed
 
 // Table of compression functions
-typedef struct  
+typedef struct
 {
     unsigned long uMask;                // Compression mask
     COMPRESS Compress;                  // Compression function
@@ -69,22 +70,59 @@ typedef struct
 /*                                                                           */
 /*****************************************************************************/
 
-void Compress_huff(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer, int * pCmpType, int nCmpLevel)
+// 1500F4C0
+void Compress_huff(
+        char * pbOutBuffer,
+        int * pcbOutBuffer,
+        char * pbInBuffer,
+        int cbInBuffer,
+        int * pCmpType,
+        int /* nCmpLevel */)
 {
-    THuffmannTree ht(true);
-    TOutputStream os(pvOutBuffer, *pcbOutBuffer);
+    THuffmannTree ht;                   // Huffmann tree for compression
+    TOutputStream os;                   // Output stream
 
-    STORMLIB_UNUSED(nCmpLevel);
-    *pcbOutBuffer = ht.Compress(&os, pvInBuffer, cbInBuffer, *pCmpType);
-}                 
+    // Initialize output stream
+    os.pbOutBuffer = (unsigned char *)pbOutBuffer;
+    os.cbOutSize   = *pcbOutBuffer;
+    os.pbOutPos    = (unsigned char *)pbOutBuffer;
+    os.dwBitBuff   = 0;
+    os.nBits       = 0;
 
-int Decompress_huff(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+    // Initialize the Huffmann tree for compression
+    ht.InitTree(true);
+
+    *pcbOutBuffer = ht.DoCompression(&os, (unsigned char *)pbInBuffer, cbInBuffer, *pCmpType);
+
+    // The following code is not necessary to run, because it has no
+    // effect on the output data. It only clears the huffmann tree, but when
+    // the tree is on the stack, who cares ?
+    //  ht.UninitTree();
+}
+
+// 1500F5F0
+int Decompress_huff(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
 {
-    THuffmannTree ht(false);
-    TInputStream is(pvInBuffer, cbInBuffer);
+    THuffmannTree ht;
+    TInputStream  is;
 
-    *pcbOutBuffer = ht.Decompress(pvOutBuffer, *pcbOutBuffer, &is);
-    return (*pcbOutBuffer == 0) ? 0 : 1;
+    // Initialize input stream
+    is.pbInBufferEnd = (unsigned char *)pbInBuffer + cbInBuffer;
+    is.pbInBuffer = (unsigned char *)pbInBuffer;
+    is.BitBuffer  = 0;
+    is.BitCount   = 0;
+
+    // Initialize the Huffmann tree for compression
+    ht.InitTree(false);
+    *pcbOutBuffer = ht.DoDecompression((unsigned char *)pbOutBuffer, *pcbOutBuffer, &is);
+    if(*pcbOutBuffer == 0)
+        return 0;
+
+    // The following code is not necessary to run, because it has no
+    // effect on the output data. It only clears the huffmann tree, but when
+    // the tree is on the stack, who cares ?
+    //  ht.UninitTree();
+    return 1;
 }
 
 /******************************************************************************/
@@ -93,21 +131,23 @@ int Decompress_huff(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, i
 /*                                                                            */
 /******************************************************************************/
 
-void Compress_ZLIB(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer, int * pCmpType, int nCmpLevel)
+void Compress_ZLIB(
+        char * pbOutBuffer,
+        int * pcbOutBuffer,
+        char * pbInBuffer,
+        int cbInBuffer,
+        int * /* pCmpType */,
+        int /* nCmpLevel */)
 {
     z_stream z;                        // Stream information for zlib
     int windowBits;
     int nResult;
 
-    // Keep compilers happy
-    STORMLIB_UNUSED(pCmpType);
-    STORMLIB_UNUSED(nCmpLevel);
-
     // Fill the stream structure for zlib
-    z.next_in   = (Bytef *)pvInBuffer;
+    z.next_in   = (Bytef *)pbInBuffer;
     z.avail_in  = (uInt)cbInBuffer;
     z.total_in  = cbInBuffer;
-    z.next_out  = (Bytef *)pvOutBuffer;
+    z.next_out  = (Bytef *)pbOutBuffer;
     z.avail_out = *pcbOutBuffer;
     z.total_out = 0;
     z.zalloc    = NULL;
@@ -135,16 +175,16 @@ void Compress_ZLIB(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, in
     // Storm.dll uses zlib version 1.1.3
     // Wow.exe uses zlib version 1.2.3
     nResult = deflateInit2(&z,
-                            6,                  // Compression level used by WoW MPQs
-                            Z_DEFLATED,
-                            windowBits,
-                            8,
-                            Z_DEFAULT_STRATEGY);
+                           6,                  // Compression level used by WoW MPQs
+                           Z_DEFLATED,
+                           windowBits,
+                           8,
+                           Z_DEFAULT_STRATEGY);
     if(nResult == Z_OK)
     {
         // Call zlib to compress the data
         nResult = deflate(&z, Z_FINISH);
-        
+
         if(nResult == Z_OK || nResult == Z_STREAM_END)
             *pcbOutBuffer = z.total_out;
 
@@ -152,16 +192,16 @@ void Compress_ZLIB(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, in
     }
 }
 
-int Decompress_ZLIB(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+int Decompress_ZLIB(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
 {
     z_stream z;                        // Stream information for zlib
     int nResult;
 
     // Fill the stream structure for zlib
-    z.next_in   = (Bytef *)pvInBuffer;
+    z.next_in   = (Bytef *)pbInBuffer;
     z.avail_in  = (uInt)cbInBuffer;
     z.total_in  = cbInBuffer;
-    z.next_out  = (Bytef *)pvOutBuffer;
+    z.next_out  = (Bytef *)pbOutBuffer;
     z.avail_out = *pcbOutBuffer;
     z.total_out = 0;
     z.zalloc    = NULL;
@@ -187,7 +227,7 @@ int Decompress_ZLIB(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, i
 // Function loads data from the input buffer. Used by Pklib's "implode"
 // and "explode" function as user-defined callback
 // Returns number of bytes loaded
-//    
+//
 //   char * buf          - Pointer to a buffer where to store loaded data
 //   unsigned int * size - Max. number of bytes to read
 //   void * param        - Custom pointer, parameter of implode/explode
@@ -201,7 +241,7 @@ static unsigned int ReadInputData(char * buf, unsigned int * size, void * param)
     // Check the case when not enough data available
     if(nToRead > nMaxAvail)
         nToRead = nMaxAvail;
-    
+
     // Load data and increment offsets
     memcpy(buf, pInfo->pbInBuff, nToRead);
     pInfo->pbInBuff += nToRead;
@@ -211,7 +251,7 @@ static unsigned int ReadInputData(char * buf, unsigned int * size, void * param)
 
 // Function for store output data. Used by Pklib's "implode" and "explode"
 // as user-defined callback
-//    
+//
 //   char * buf          - Pointer to data to be written
 //   unsigned int * size - Number of bytes to write
 //   void * param        - Custom pointer, parameter of implode/explode
@@ -232,74 +272,68 @@ static void WriteOutputData(char * buf, unsigned int * size, void * param)
     assert(pInfo->pbOutBuff <= pInfo->pbOutBuffEnd);
 }
 
-static void Compress_PKLIB(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer, int * pCmpType, int nCmpLevel)
+static void Compress_PKLIB(
+        char * pbOutBuffer,
+        int * pcbOutBuffer,
+        char * pbInBuffer,
+        int cbInBuffer,
+        int * /* pCmpType */,
+        int /* nCmpLevel */)
 {
     TDataInfo Info;                                      // Data information
     char * work_buf = STORM_ALLOC(char, CMP_BUFFER_SIZE);// Pklib's work buffer
     unsigned int dict_size;                              // Dictionary size
     unsigned int ctype = CMP_BINARY;                     // Compression type
 
-    // Keep compilers happy
-    STORMLIB_UNUSED(pCmpType);
-    STORMLIB_UNUSED(nCmpLevel);
+    // Fill data information structure
+    memset(work_buf, 0, CMP_BUFFER_SIZE);
+    Info.pbInBuff     = pbInBuffer;
+    Info.pbInBuffEnd  = pbInBuffer + cbInBuffer;
+    Info.pbOutBuff    = pbOutBuffer;
+    Info.pbOutBuffEnd = pbOutBuffer + *pcbOutBuffer;
 
-    // Handle no-memory condition
-    if(work_buf != NULL)
-    {
-        // Fill data information structure
-        memset(work_buf, 0, CMP_BUFFER_SIZE);
-        Info.pbInBuff     = (unsigned char *)pvInBuffer;
-        Info.pbInBuffEnd  = (unsigned char *)pvInBuffer + cbInBuffer;
-        Info.pbOutBuff    = (unsigned char *)pvOutBuffer;
-        Info.pbOutBuffEnd = (unsigned char *)pvOutBuffer + *pcbOutBuffer;
+    //
+    // Set the dictionary size
+    //
+    // Diablo I ues fixed dictionary size of CMP_IMPLODE_DICT_SIZE3
+    // Starcraft uses the variable dictionary size based on algorithm below
+    //
 
-        //
-        // Set the dictionary size
-        //
-        // Diablo I uses fixed dictionary size of CMP_IMPLODE_DICT_SIZE3
-        // Starcraft I uses the variable dictionary size based on algorithm below
-        //
+    if (cbInBuffer < 0x600)
+        dict_size = CMP_IMPLODE_DICT_SIZE1;
+    else if(0x600 <= cbInBuffer && cbInBuffer < 0xC00)
+        dict_size = CMP_IMPLODE_DICT_SIZE2;
+    else
+        dict_size = CMP_IMPLODE_DICT_SIZE3;
 
-        if (cbInBuffer < 0x600)
-            dict_size = CMP_IMPLODE_DICT_SIZE1;
-        else if(0x600 <= cbInBuffer && cbInBuffer < 0xC00)
-            dict_size = CMP_IMPLODE_DICT_SIZE2;
-        else
-            dict_size = CMP_IMPLODE_DICT_SIZE3;
+    // Do the compression
+    if(implode(ReadInputData, WriteOutputData, work_buf, &Info, &ctype, &dict_size) == CMP_NO_ERROR)
+        *pcbOutBuffer = (int)(Info.pbOutBuff - pbOutBuffer);
 
-        // Do the compression
-        if(implode(ReadInputData, WriteOutputData, work_buf, &Info, &ctype, &dict_size) == CMP_NO_ERROR)
-            *pcbOutBuffer = (int)(Info.pbOutBuff - (unsigned char *)pvOutBuffer);
-
-        STORM_FREE(work_buf);
-    }
+    STORM_FREE(work_buf);
 }
 
-static int Decompress_PKLIB(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+static int Decompress_PKLIB(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
 {
     TDataInfo Info;                             // Data information
     char * work_buf = STORM_ALLOC(char, EXP_BUFFER_SIZE);// Pklib's work buffer
 
-    // Handle no-memory condition
-    if(work_buf == NULL)
-        return 0;
-
     // Fill data information structure
     memset(work_buf, 0, EXP_BUFFER_SIZE);
-    Info.pbInBuff     = (unsigned char *)pvInBuffer;
-    Info.pbInBuffEnd  = (unsigned char *)pvInBuffer + cbInBuffer;
-    Info.pbOutBuff    = (unsigned char *)pvOutBuffer;
-    Info.pbOutBuffEnd = (unsigned char *)pvOutBuffer + *pcbOutBuffer;
+    Info.pbInBuff     = pbInBuffer;
+    Info.pbInBuffEnd  = pbInBuffer + cbInBuffer;
+    Info.pbOutBuff    = pbOutBuffer;
+    Info.pbOutBuffEnd = pbOutBuffer + *pcbOutBuffer;
 
     // Do the decompression
     explode(ReadInputData, WriteOutputData, work_buf, &Info);
-    
+
     // If PKLIB is unable to decompress the data, return 0;
-    if(Info.pbOutBuff == pvOutBuffer)
+    if(Info.pbOutBuff == pbOutBuffer)
         return 0;
 
     // Give away the number of decompressed bytes
-    *pcbOutBuffer = (int)(Info.pbOutBuff - (unsigned char *)pvOutBuffer);
+    *pcbOutBuffer = (int)(Info.pbOutBuff - pbOutBuffer);
     STORM_FREE(work_buf);
     return 1;
 }
@@ -310,17 +344,19 @@ static int Decompress_PKLIB(void * pvOutBuffer, int * pcbOutBuffer, void * pvInB
 /*                                                                            */
 /******************************************************************************/
 
-static void Compress_BZIP2(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer, int * pCmpType, int nCmpLevel)
+static void Compress_BZIP2(
+        char * pbOutBuffer,
+        int * pcbOutBuffer,
+        char * pbInBuffer,
+        int cbInBuffer,
+        int * /* pCmpType */,
+        int /* nCmpLevel */)
 {
     bz_stream strm;
     int blockSize100k = 9;
     int workFactor = 30;
     int bzError;
 
-    // Keep compilers happy
-    STORMLIB_UNUSED(pCmpType);
-    STORMLIB_UNUSED(nCmpLevel);
-
     // Initialize the BZIP2 compression
     strm.bzalloc = NULL;
     strm.bzfree  = NULL;
@@ -329,9 +365,9 @@ static void Compress_BZIP2(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBu
     // Last checked on Starcraft II
     if(BZ2_bzCompressInit(&strm, blockSize100k, 0, workFactor) == BZ_OK)
     {
-        strm.next_in   = (char *)pvInBuffer;
+        strm.next_in   = pbInBuffer;
         strm.avail_in  = cbInBuffer;
-        strm.next_out  = (char *)pvOutBuffer;
+        strm.next_out  = pbOutBuffer;
         strm.avail_out = *pcbOutBuffer;
 
         // Perform the compression
@@ -350,7 +386,7 @@ static void Compress_BZIP2(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBu
     }
 }
 
-static int Decompress_BZIP2(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+static int Decompress_BZIP2(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
 {
     bz_stream strm;
     int nResult = BZ_OK;
@@ -360,17 +396,17 @@ static int Decompress_BZIP2(void * pvOutBuffer, int * pcbOutBuffer, void * pvInB
     strm.bzfree  = NULL;
     if(BZ2_bzDecompressInit(&strm, 0, 0) == BZ_OK)
     {
-        strm.next_in   = (char *)pvInBuffer;
+        strm.next_in   = pbInBuffer;
         strm.avail_in  = cbInBuffer;
-        strm.next_out  = (char *)pvOutBuffer;
+        strm.next_out  = pbOutBuffer;
         strm.avail_out = *pcbOutBuffer;
 
         // Perform the decompression
         while(nResult != BZ_STREAM_END)
         {
             nResult = BZ2_bzDecompress(&strm);
-            
-            // If any error there, break the loop 
+
+            // If any error there, break the loop
             if(nResult < BZ_OK)
                 break;
         }
@@ -425,12 +461,17 @@ static void LZMA_Callback_Free(void *p, void *address)
 // the data compressed by StormLib.
 //
 
-static void Compress_LZMA(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer, int * pCmpType, int nCmpLevel)
+/*static */ void Compress_LZMA(
+        char * pbOutBuffer,
+        int * pcbOutBuffer,
+        char * pbInBuffer,
+        int cbInBuffer,
+        int * /* pCmpType */,
+        int /* nCmpLevel */)
 {
     ICompressProgress Progress;
     CLzmaEncProps props;
     ISzAlloc SzAlloc;
-    Byte * pbOutBuffer = (Byte *)pvOutBuffer;
     Byte * destBuffer;
     SizeT destLen = *pcbOutBuffer;
     SizeT srcLen = cbInBuffer;
@@ -438,10 +479,6 @@ static void Compress_LZMA(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuf
     size_t encodedPropsSize = LZMA_PROPS_SIZE;
     SRes nResult;
 
-    // Keep compilers happy
-    STORMLIB_UNUSED(pCmpType);
-    STORMLIB_UNUSED(nCmpLevel);
-
     // Fill the callbacks in structures
     Progress.Progress = LZMA_Callback_Progress;
     SzAlloc.Alloc = LZMA_Callback_Alloc;
@@ -451,19 +488,19 @@ static void Compress_LZMA(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuf
     LzmaEncProps_Init(&props);
 
     // Perform compression
-    destBuffer = (Byte *)pvOutBuffer + LZMA_HEADER_SIZE;
+    destBuffer = (Byte *)pbOutBuffer + LZMA_HEADER_SIZE;
     destLen = *pcbOutBuffer - LZMA_HEADER_SIZE;
     nResult = LzmaEncode(destBuffer,
-                        &destLen,
-                 (Byte *)pvInBuffer,
+                         &destLen,
+                         (Byte *)pbInBuffer,
                          srcLen,
-                        &props,
+                         &props,
                          encodedProps,
-                        &encodedPropsSize,
+                         &encodedPropsSize,
                          0,
-                        &Progress,
-                        &SzAlloc,
-                        &SzAlloc);
+                         &Progress,
+                         &SzAlloc,
+                         &SzAlloc);
     if(nResult != SZ_OK)
         return;
 
@@ -475,7 +512,7 @@ static void Compress_LZMA(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuf
     *pbOutBuffer++ = 0;
 
     // Copy the encoded properties to the output buffer
-    memcpy(pvOutBuffer, encodedProps, encodedPropsSize);
+    memcpy(pbOutBuffer, encodedProps, encodedPropsSize);
     pbOutBuffer += encodedPropsSize;
 
     // Copy the size of the data
@@ -492,18 +529,18 @@ static void Compress_LZMA(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuf
     *pcbOutBuffer = (unsigned int)(destLen + LZMA_HEADER_SIZE);
 }
 
-static int Decompress_LZMA(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+static int Decompress_LZMA(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
 {
     ELzmaStatus LzmaStatus;
     ISzAlloc SzAlloc;
-    Byte * destBuffer = (Byte *)pvOutBuffer;
-    Byte * srcBuffer = (Byte *)pvInBuffer;
+    Byte * destBuffer = (Byte *)pbOutBuffer;
+    Byte * srcBuffer = (Byte *)pbInBuffer;
     SizeT destLen = *pcbOutBuffer;
     SizeT srcLen = cbInBuffer;
     SRes nResult;
 
     // There must be at least 0x0E bytes in the buffer
-    if(srcLen <= LZMA_HEADER_SIZE) 
+    if(srcLen <= LZMA_HEADER_SIZE)
         return 0;
 
     // We only accept blocks that have no filter used
@@ -517,55 +554,14 @@ static int Decompress_LZMA(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBu
     // Perform compression
     srcLen = cbInBuffer - LZMA_HEADER_SIZE;
     nResult = LzmaDecode(destBuffer,
-                        &destLen,
+                         &destLen,
                          srcBuffer + LZMA_HEADER_SIZE,
-                        &srcLen,
-                         srcBuffer + 1, 
+                         &srcLen,
+                         srcBuffer + 1,
                          LZMA_PROPS_SIZE,
                          LZMA_FINISH_END,
-                        &LzmaStatus,
-                        &SzAlloc);
-    if(nResult != SZ_OK)
-        return 0;
-
-    *pcbOutBuffer = (unsigned int)destLen;
-    return 1;
-}
-
-static int Decompress_LZMA_MPK(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
-{
-    ELzmaStatus LzmaStatus;
-    ISzAlloc SzAlloc;
-    Byte * destBuffer = (Byte *)pvOutBuffer;
-    Byte * srcBuffer = (Byte *)pvInBuffer;
-    SizeT destLen = *pcbOutBuffer;
-    SizeT srcLen = cbInBuffer;
-    SRes nResult;
-    BYTE LZMA_Props[] = {0x5D, 0x00, 0x00, 0x00, 0x01};
-
-    // There must be at least 0x0E bytes in the buffer
-    if(srcLen <= sizeof(LZMA_Props))
-        return 0;
-
-    // Verify the props header
-    if(memcmp(pvInBuffer, LZMA_Props, sizeof(LZMA_Props)))
-        return 0;
-
-    // Fill the callbacks in structures
-    SzAlloc.Alloc = LZMA_Callback_Alloc;
-    SzAlloc.Free = LZMA_Callback_Free;
-
-    // Perform compression
-    srcLen = cbInBuffer - sizeof(LZMA_Props);
-    nResult = LzmaDecode(destBuffer,
-                        &destLen,
-                         srcBuffer + sizeof(LZMA_Props),
-                        &srcLen,
-                         srcBuffer, 
-                         sizeof(LZMA_Props),
-                         LZMA_FINISH_END,
-                        &LzmaStatus,
-                        &SzAlloc);
+                         &LzmaStatus,
+                         &SzAlloc);
     if(nResult != SZ_OK)
         return 0;
 
@@ -579,18 +575,20 @@ static int Decompress_LZMA_MPK(void * pvOutBuffer, int * pcbOutBuffer, void * pv
 /*                                                                            */
 /******************************************************************************/
 
-void Compress_SPARSE(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer, int * pCmpType, int nCmpLevel)
+void Compress_SPARSE(
+        char * pbOutBuffer,
+        int * pcbOutBuffer,
+        char * pbInBuffer,
+        int cbInBuffer,
+        int * /* pCmpType */,
+        int /* nCmpLevel */)
 {
-    // Keep compilers happy
-    STORMLIB_UNUSED(pCmpType);
-    STORMLIB_UNUSED(nCmpLevel);
-
-    CompressSparse(pvOutBuffer, pcbOutBuffer, pvInBuffer, cbInBuffer);
+    CompressSparse((unsigned char *)pbOutBuffer, pcbOutBuffer, (unsigned char *)pbInBuffer, cbInBuffer);
 }
 
-int Decompress_SPARSE(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+int Decompress_SPARSE(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
 {
-    return DecompressSparse(pvOutBuffer, pcbOutBuffer, pvInBuffer, cbInBuffer);
+    return DecompressSparse((unsigned char *)pbOutBuffer, pcbOutBuffer, (unsigned char *)pbInBuffer, cbInBuffer);
 }
 
 /******************************************************************************/
@@ -599,7 +597,13 @@ int Decompress_SPARSE(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer,
 /*                                                                            */
 /******************************************************************************/
 
-static void Compress_ADPCM_mono(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer, int * pCmpType, int nCmpLevel)
+static void Compress_ADPCM_mono(
+        char * pbOutBuffer,
+        int * pcbOutBuffer,
+        char * pbInBuffer,
+        int cbInBuffer,
+        int * pCmpType,
+        int nCmpLevel)
 {
     // Prepare the compression level for Huffmann compression,
     // which will be called as next step
@@ -618,12 +622,12 @@ static void Compress_ADPCM_mono(void * pvOutBuffer, int * pcbOutBuffer, void * p
         nCmpLevel = 5;
         *pCmpType = 7;
     }
-    *pcbOutBuffer = CompressADPCM(pvOutBuffer, *pcbOutBuffer, pvInBuffer, cbInBuffer, 1, nCmpLevel);
+    *pcbOutBuffer = CompressADPCM((unsigned char *)pbOutBuffer, *pcbOutBuffer, (short *)pbInBuffer, cbInBuffer, 1, nCmpLevel);
 }
 
-static int Decompress_ADPCM_mono(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+static int Decompress_ADPCM_mono(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
 {
-    *pcbOutBuffer = DecompressADPCM(pvOutBuffer, *pcbOutBuffer, pvInBuffer, cbInBuffer, 1);
+    *pcbOutBuffer = DecompressADPCM((unsigned char *)pbOutBuffer, *pcbOutBuffer, (unsigned char *)pbInBuffer, cbInBuffer, 1);
     return 1;
 }
 
@@ -633,7 +637,13 @@ static int Decompress_ADPCM_mono(void * pvOutBuffer, int * pcbOutBuffer, void *
 /*                                                                            */
 /******************************************************************************/
 
-static void Compress_ADPCM_stereo(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer, int * pCmpType, int nCmpLevel)
+static void Compress_ADPCM_stereo(
+        char * pbOutBuffer,
+        int * pcbOutBuffer,
+        char * pbInBuffer,
+        int cbInBuffer,
+        int * pCmpType,
+        int nCmpLevel)
 {
     // Prepare the compression level for Huffmann compression,
     // which will be called as next step
@@ -652,12 +662,12 @@ static void Compress_ADPCM_stereo(void * pvOutBuffer, int * pcbOutBuffer, void *
         nCmpLevel = 5;
         *pCmpType = 7;
     }
-    *pcbOutBuffer = CompressADPCM(pvOutBuffer, *pcbOutBuffer, pvInBuffer, cbInBuffer, 2, nCmpLevel);
+    *pcbOutBuffer = CompressADPCM((unsigned char *)pbOutBuffer, *pcbOutBuffer, (short *)pbInBuffer, cbInBuffer, 2, nCmpLevel);
 }
 
-static int Decompress_ADPCM_stereo(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+static int Decompress_ADPCM_stereo(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
 {
-    *pcbOutBuffer = DecompressADPCM(pvOutBuffer, *pcbOutBuffer, pvInBuffer, cbInBuffer, 2);
+    *pcbOutBuffer = DecompressADPCM((unsigned char *)pbOutBuffer, *pcbOutBuffer, (unsigned char *)pbInBuffer, cbInBuffer, 2);
     return 1;
 }
 
@@ -667,25 +677,24 @@ static int Decompress_ADPCM_stereo(void * pvOutBuffer, int * pcbOutBuffer, void
 /*                                                                           */
 /*****************************************************************************/
 
-int WINAPI SCompImplode(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+int WINAPI SCompImplode(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
 {
-    int cbOutBuffer;
+    int cbOutBuffer = *pcbOutBuffer;
 
     // Check for valid parameters
-    if(!pcbOutBuffer || *pcbOutBuffer < cbInBuffer || !pvOutBuffer || !pvInBuffer)
+    if(!pcbOutBuffer || *pcbOutBuffer < cbInBuffer || !pbOutBuffer || !pbInBuffer)
     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return 0;
     }
 
     // Perform the compression
-    cbOutBuffer = *pcbOutBuffer;
-    Compress_PKLIB(pvOutBuffer, &cbOutBuffer, pvInBuffer, cbInBuffer, NULL, 0);
+    Compress_PKLIB(pbOutBuffer, &cbOutBuffer, pbInBuffer, cbInBuffer, NULL, 0);
 
     // If the compression was unsuccessful, copy the data as-is
     if(cbOutBuffer >= *pcbOutBuffer)
     {
-        memcpy(pvOutBuffer, pvInBuffer, cbInBuffer);
+        memcpy(pbOutBuffer, pbInBuffer, cbInBuffer);
         cbOutBuffer = *pcbOutBuffer;
     }
 
@@ -699,34 +708,33 @@ int WINAPI SCompImplode(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffe
 /*                                                                           */
 /*****************************************************************************/
 
-int WINAPI SCompExplode(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+int WINAPI SCompExplode(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
 {
-    int cbOutBuffer;
+    int cbOutBuffer = *pcbOutBuffer;
 
     // Check for valid parameters
-    if(!pcbOutBuffer || *pcbOutBuffer < cbInBuffer || !pvOutBuffer || !pvInBuffer)
+    if(!pcbOutBuffer || *pcbOutBuffer < cbInBuffer || !pbOutBuffer || !pbInBuffer)
     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return 0;
     }
 
     // If the input length is the same as output length, do nothing.
-    cbOutBuffer = *pcbOutBuffer;
     if(cbInBuffer == cbOutBuffer)
     {
         // If the buffers are equal, don't copy anything.
-        if(pvInBuffer == pvOutBuffer)
+        if(pbInBuffer == pbOutBuffer)
             return 1;
 
-        memcpy(pvOutBuffer, pvInBuffer, cbInBuffer);
+        memcpy(pbOutBuffer, pbInBuffer, cbInBuffer);
         return 1;
     }
-    
+
     // Perform decompression
-    if(!Decompress_PKLIB(pvOutBuffer, &cbOutBuffer, pvInBuffer, cbInBuffer))
+    if(!Decompress_PKLIB(pbOutBuffer, &cbOutBuffer, pbInBuffer, cbInBuffer))
     {
         SetLastError(ERROR_FILE_CORRUPT);
-        return 0;
+        return false;
     }
 
     *pcbOutBuffer = cbOutBuffer;
@@ -750,23 +758,29 @@ int WINAPI SCompExplode(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffe
 
 static TCompressTable cmp_table[] =
 {
-    {MPQ_COMPRESSION_SPARSE,       Compress_SPARSE},        // Sparse compression
-    {MPQ_COMPRESSION_ADPCM_MONO,   Compress_ADPCM_mono},    // IMA ADPCM mono compression
-    {MPQ_COMPRESSION_ADPCM_STEREO, Compress_ADPCM_stereo},  // IMA ADPCM stereo compression
-    {MPQ_COMPRESSION_HUFFMANN,     Compress_huff},          // Huffmann compression
-    {MPQ_COMPRESSION_ZLIB,         Compress_ZLIB},          // Compression with the "zlib" library
-    {MPQ_COMPRESSION_PKWARE,       Compress_PKLIB},         // Compression with Pkware DCL
-    {MPQ_COMPRESSION_BZIP2,        Compress_BZIP2}          // Compression Bzip2 library
+    {MPQ_COMPRESSION_SPARSE,       Compress_SPARSE},         // Sparse compression
+    {MPQ_COMPRESSION_ADPCM_MONO,   Compress_ADPCM_mono},     // IMA ADPCM mono compression
+    {MPQ_COMPRESSION_ADPCM_STEREO, Compress_ADPCM_stereo},   // IMA ADPCM stereo compression
+    {MPQ_COMPRESSION_HUFFMANN,     Compress_huff},           // Huffmann compression
+    {MPQ_COMPRESSION_ZLIB,         Compress_ZLIB},           // Compression with the "zlib" library
+    {MPQ_COMPRESSION_PKWARE,       Compress_PKLIB},          // Compression with Pkware DCL
+    {MPQ_COMPRESSION_BZIP2,        Compress_BZIP2}           // Compression Bzip2 library
 };
 
-int WINAPI SCompCompress(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer, unsigned uCompressionMask, int nCmpType, int nCmpLevel)
+int WINAPI SCompCompress(
+        char * pbOutBuffer,
+        int * pcbOutBuffer,
+        char * pbInBuffer,
+        int cbInBuffer,
+        unsigned uCompressionMask,
+        int nCmpType,
+        int nCmpLevel)
 {
-    COMPRESS CompressFuncArray[0x10];                       // Array of compression functions, applied sequentially
-    unsigned char CompressByte[0x10];                       // CompressByte for each method in the CompressFuncArray array
-    unsigned char * pbWorkBuffer = NULL;                    // Temporary storage for decompressed data
-    unsigned char * pbOutBuffer = (unsigned char *)pvOutBuffer;
-    unsigned char * pbOutput = (unsigned char *)pvOutBuffer;// Current output buffer
-    unsigned char * pbInput = (unsigned char *)pvInBuffer;  // Current input buffer
+    COMPRESS CompressFuncArray[0x10];       // Array of compression functions, applied sequentially
+    unsigned char CompressByte[0x10];       // CompressByte for each method in the CompressFuncArray array
+    char * pbWorkBuffer = NULL;             // Temporary storage for decompressed data
+    char * pbOutput = pbOutBuffer;          // Current output buffer
+    char * pbInput = pbInBuffer;            // Current input buffer
     int nCompressCount = 0;
     int nCompressIndex = 0;
     int nAtLeastOneCompressionDone = 0;
@@ -775,7 +789,7 @@ int WINAPI SCompCompress(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuff
     int nResult = 1;
 
     // Check for valid parameters
-    if(!pcbOutBuffer || *pcbOutBuffer < cbInBuffer || !pvOutBuffer || !pvInBuffer)
+    if(!pcbOutBuffer || *pcbOutBuffer < cbInBuffer || !pbOutBuffer || !pbInBuffer)
     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return 0;
@@ -824,7 +838,7 @@ int WINAPI SCompCompress(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuff
         // If we need to do more than 1 compression, allocate intermediate buffer
         if(nCompressCount > 1)
         {
-            pbWorkBuffer = STORM_ALLOC(unsigned char, *pcbOutBuffer);
+            pbWorkBuffer = STORM_ALLOC(char, *pcbOutBuffer);
             if(pbWorkBuffer == NULL)
             {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -870,12 +884,12 @@ int WINAPI SCompCompress(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuff
         // If at least one compression succeeded, put the compression
         // mask to the begin of the output buffer
         if(nAtLeastOneCompressionDone)
-            *pbOutBuffer  = (unsigned char)uCompressionMask;
+            *pbOutBuffer  = (char)uCompressionMask;
         *pcbOutBuffer = cbOutBuffer + nAtLeastOneCompressionDone;
     }
     else
     {
-        memcpy(pvOutBuffer, pvInBuffer, cbInBuffer);
+        memcpy(pbOutBuffer, pbInBuffer, cbInBuffer);
         *pcbOutBuffer = cbInBuffer;
     }
 
@@ -905,13 +919,15 @@ static TDecompressTable dcmp_table[] =
     {MPQ_COMPRESSION_SPARSE,       Decompress_SPARSE}        // Sparse decompression
 };
 
-int WINAPI SCompDecompress(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+int WINAPI SCompDecompress(
+        char * pbOutBuffer,
+        int * pcbOutBuffer,
+        char * pbInBuffer,
+        int cbInBuffer)
 {
-    unsigned char * pbWorkBuffer = NULL;
-    unsigned char * pbOutBuffer = (unsigned char *)pvOutBuffer;
-    unsigned char * pbInBuffer = (unsigned char *)pvInBuffer;
-    unsigned char * pbOutput = (unsigned char *)pvOutBuffer;
-    unsigned char * pbInput;
+    char *   pbWorkBuffer = NULL;           // Temporary storage for decompressed data
+    char *   pbOutput = pbOutBuffer;        // Where to store decompressed data
+    char *   pbInput;                       // Where to store decompressed data
     unsigned uCompressionMask;              // Decompressions applied to the data
     unsigned uCompressionCopy;              // Decompressions applied to the data
     int      cbOutBuffer = *pcbOutBuffer;   // Current size of the output buffer
@@ -928,8 +944,8 @@ int WINAPI SCompDecompress(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBu
     if(cbOutBuffer == cbInBuffer)
     {
         // If the buffers are equal, don't copy anything.
-        if(pvInBuffer != pvOutBuffer)
-            memcpy(pvOutBuffer, pvInBuffer, cbInBuffer);
+        if(pbInBuffer != pbOutBuffer)
+            memcpy(pbOutBuffer, pbInBuffer, cbInBuffer);
         return 1;
     }
 
@@ -965,7 +981,7 @@ int WINAPI SCompDecompress(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBu
     // If there is more than one compression, we have to allocate extra buffer
     if(nCompressCount > 1)
     {
-        pbWorkBuffer = STORM_ALLOC(unsigned char, cbOutBuffer);
+        pbWorkBuffer = STORM_ALLOC(char, cbOutBuffer);
         if(pbWorkBuffer == NULL)
         {
             SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -985,7 +1001,7 @@ int WINAPI SCompDecompress(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBu
             // Get the correct output buffer
             pbOutput = (nCompressIndex & 1) ? pbWorkBuffer : pbOutBuffer;
             nCompressIndex--;
-        
+
             // Perform the decompression
             cbOutBuffer = *pcbOutBuffer;
             nResult = dcmp_table[i].Decompress(pbOutput, &cbOutBuffer, pbInput, cbInLength);
@@ -1011,12 +1027,15 @@ int WINAPI SCompDecompress(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBu
     return nResult;
 }
 
-int WINAPI SCompDecompress2(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+int WINAPI SCompDecompress2(
+        char * pbOutBuffer,
+        int * pcbOutBuffer,
+        char * pbInBuffer,
+        int cbInBuffer)
 {
     DECOMPRESS pfnDecompress1 = NULL;
     DECOMPRESS pfnDecompress2 = NULL;
-    unsigned char * pbWorkBuffer = (unsigned char *)pvOutBuffer;
-    unsigned char * pbInBuffer = (unsigned char *)pvInBuffer;
+    char * pbWorkBuffer = pbOutBuffer;
     int cbWorkBuffer = *pcbOutBuffer;
     int nResult;
     char CompressionMethod;
@@ -1028,8 +1047,8 @@ int WINAPI SCompDecompress2(void * pvOutBuffer, int * pcbOutBuffer, void * pvInB
     // If the outputbuffer is as big as input buffer, just copy the block
     if(*pcbOutBuffer == cbInBuffer)
     {
-        if(pvOutBuffer != pvInBuffer)
-            memcpy(pvOutBuffer, pvInBuffer, cbInBuffer);
+        if(pbOutBuffer != pbInBuffer)
+            memcpy(pbOutBuffer, pbInBuffer, cbInBuffer);
         return 1;
     }
 
@@ -1040,35 +1059,35 @@ int WINAPI SCompDecompress2(void * pvOutBuffer, int * pcbOutBuffer, void * pvInB
     // We only recognize a fixed set of compression methods
     switch((unsigned char)CompressionMethod)
     {
-        case MPQ_COMPRESSION_ZLIB:
-            pfnDecompress1 = Decompress_ZLIB;
-            break;
+    case MPQ_COMPRESSION_ZLIB:
+        pfnDecompress1 = Decompress_ZLIB;
+        break;
 
-        case MPQ_COMPRESSION_PKWARE:
-            pfnDecompress1 = Decompress_PKLIB;
-            break;
+    case MPQ_COMPRESSION_PKWARE:
+        pfnDecompress1 = Decompress_PKLIB;
+        break;
 
-        case MPQ_COMPRESSION_BZIP2:
-            pfnDecompress1 = Decompress_BZIP2;
-            break;
+    case MPQ_COMPRESSION_BZIP2:
+        pfnDecompress1 = Decompress_BZIP2;
+        break;
 
-        case MPQ_COMPRESSION_LZMA:
-            pfnDecompress1 = Decompress_LZMA;
-            break;
+    case MPQ_COMPRESSION_LZMA:
+        pfnDecompress1 = Decompress_LZMA;
+        break;
 
-        case MPQ_COMPRESSION_SPARSE:
-            pfnDecompress1 = Decompress_SPARSE;
-            break;
+    case MPQ_COMPRESSION_SPARSE:
+        pfnDecompress1 = Decompress_SPARSE;
+        break;
 
-        case (MPQ_COMPRESSION_SPARSE | MPQ_COMPRESSION_ZLIB):
-            pfnDecompress1 = Decompress_ZLIB;
-            pfnDecompress2 = Decompress_SPARSE;
-            break;
+    case (MPQ_COMPRESSION_SPARSE | MPQ_COMPRESSION_ZLIB):
+        pfnDecompress1 = Decompress_ZLIB;
+        pfnDecompress2 = Decompress_SPARSE;
+        break;
 
-        case (MPQ_COMPRESSION_SPARSE | MPQ_COMPRESSION_BZIP2):
-            pfnDecompress1 = Decompress_BZIP2;
-            pfnDecompress2 = Decompress_SPARSE;
-            break;
+    case (MPQ_COMPRESSION_SPARSE | MPQ_COMPRESSION_BZIP2):
+        pfnDecompress1 = Decompress_BZIP2;
+        pfnDecompress2 = Decompress_SPARSE;
+        break;
 
         //
         // Note: Any combination including MPQ_COMPRESSION_ADPCM_MONO,
@@ -1076,25 +1095,15 @@ int WINAPI SCompDecompress2(void * pvOutBuffer, int * pcbOutBuffer, void * pvInB
         // is not supported by newer MPQs.
         //
 
-        case (MPQ_COMPRESSION_ADPCM_MONO | MPQ_COMPRESSION_HUFFMANN):
-            pfnDecompress1 = Decompress_huff;
-            pfnDecompress2 = Decompress_ADPCM_mono;
-            break;
-
-        case (MPQ_COMPRESSION_ADPCM_STEREO | MPQ_COMPRESSION_HUFFMANN):
-            pfnDecompress1 = Decompress_huff;
-            pfnDecompress2 = Decompress_ADPCM_stereo;
-            break;
-
-        default:
-            SetLastError(ERROR_FILE_CORRUPT);
-            return 0;
+    default:
+        SetLastError(ERROR_FILE_CORRUPT);
+        return 0;
     }
 
     // If we have to use two decompressions, allocate temporary buffer
     if(pfnDecompress2 != NULL)
     {
-        pbWorkBuffer = STORM_ALLOC(unsigned char, *pcbOutBuffer);
+        pbWorkBuffer = STORM_ALLOC(char, *pcbOutBuffer);
         if(pbWorkBuffer == NULL)
         {
             SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -1110,29 +1119,17 @@ int WINAPI SCompDecompress2(void * pvOutBuffer, int * pcbOutBuffer, void * pvInB
     {
         cbInBuffer   = cbWorkBuffer;
         cbWorkBuffer = *pcbOutBuffer;
-        nResult = pfnDecompress2(pvOutBuffer, &cbWorkBuffer, pbWorkBuffer, cbInBuffer);
+        nResult = pfnDecompress2(pbOutBuffer, &cbWorkBuffer, pbWorkBuffer, cbInBuffer);
     }
 
     // Supply the output buffer size
     *pcbOutBuffer = cbWorkBuffer;
 
     // Free temporary buffer
-    if(pbWorkBuffer != pvOutBuffer)
+    if(pbWorkBuffer != pbOutBuffer)
         STORM_FREE(pbWorkBuffer);
 
     if(nResult == 0)
         SetLastError(ERROR_FILE_CORRUPT);
     return nResult;
 }
-
-/*****************************************************************************/
-/*                                                                           */
-/*   File decompression for MPK archives                                     */
-/*                                                                           */
-/*****************************************************************************/
-
-int SCompDecompressMpk(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
-{
-    return Decompress_LZMA_MPK(pvOutBuffer, pcbOutBuffer, pvInBuffer, cbInBuffer);    
-}
-
diff --git a/dep/StormLib/src/SFileAddFile.cpp b/dep/StormLib/src/SFileAddFile.cpp
index 524fb50c0..3f12e697f 100644
--- a/dep/StormLib/src/SFileAddFile.cpp
+++ b/dep/StormLib/src/SFileAddFile.cpp
@@ -6,7 +6,6 @@
 /*   Date    Ver   Who  Comment                                              */
 /* --------  ----  ---  -------                                              */
 /* 27.03.10  1.00  Lad  Splitted from SFileCreateArchiveEx.cpp               */
-/* 21.04.13  1.01  Dea  AddFile callback now part of TMPQArchive             */
 /*****************************************************************************/
 
 #define __STORMLIB_SELF__
@@ -14,17 +13,7 @@
 #include "StormCommon.h"
 
 //-----------------------------------------------------------------------------
-// Local variables
-
-// Mask for lossy compressions
-#define MPQ_LOSSY_COMPRESSION_MASK (MPQ_COMPRESSION_ADPCM_MONO | MPQ_COMPRESSION_ADPCM_STEREO | MPQ_COMPRESSION_HUFFMANN)
-
-// Data compression for SFileAddFile
-// Kept here for compatibility with code that was created with StormLib version < 6.50
-static DWORD DefaultDataCompression = MPQ_COMPRESSION_PKWARE;
-
-//-----------------------------------------------------------------------------
-// WAVE verification
+// Local structures
 
 #define FILE_SIGNATURE_RIFF     0x46464952
 #define FILE_SIGNATURE_WAVE     0x45564157
@@ -36,8 +25,8 @@ typedef struct _WAVE_FILE_HEADER
     DWORD dwChunkId;                        // 0x52494646 ("RIFF")
     DWORD dwChunkSize;                      // Size of that chunk, in bytes
     DWORD dwFormat;                         // Must be 0x57415645 ("WAVE")
-   
-    // Format sub-chunk 
+
+    // Format sub-chunk
     DWORD dwSubChunk1Id;                    // 0x666d7420 ("fmt ")
     DWORD dwSubChunk1Size;                  // 0x16 for PCM
     USHORT wAudioFormat;                    // 1 = PCM. Other value means some sort of compression
@@ -50,29 +39,36 @@ typedef struct _WAVE_FILE_HEADER
     // Followed by "data" sub-chunk (we don't care)
 } WAVE_FILE_HEADER, *PWAVE_FILE_HEADER;
 
-static bool IsWaveFile_16BitsPerAdpcmSample(
-    LPBYTE pbFileData,
-    DWORD cbFileData,
-    LPDWORD pdwChannels)
+//-----------------------------------------------------------------------------
+// Local variables
+
+// Data compression for SFileAddFile
+// Kept here for compatibility with code that was created with StormLib version < 6.50
+static DWORD DefaultDataCompression = MPQ_COMPRESSION_PKWARE;
+
+static SFILE_ADDFILE_CALLBACK AddFileCB = NULL;
+static void * pvUserData = NULL;
+
+//-----------------------------------------------------------------------------
+// MPQ write data functions
+
+#define LOSSY_COMPRESSION_MASK (MPQ_COMPRESSION_ADPCM_MONO | MPQ_COMPRESSION_ADPCM_STEREO | MPQ_COMPRESSION_HUFFMANN)
+
+static int IsWaveFile(
+        LPBYTE pbFileData,
+        DWORD cbFileData,
+        LPDWORD pdwChannels)
 {
     PWAVE_FILE_HEADER pWaveHdr = (PWAVE_FILE_HEADER)pbFileData;
 
-    // The amount of file data must be at least size of WAVE header
     if(cbFileData > sizeof(WAVE_FILE_HEADER))
     {
-        // Check for the RIFF header
         if(pWaveHdr->dwChunkId == FILE_SIGNATURE_RIFF && pWaveHdr->dwFormat == FILE_SIGNATURE_WAVE)
         {
-            // Check for ADPCM format
             if(pWaveHdr->dwSubChunk1Id == FILE_SIGNATURE_FMT && pWaveHdr->wAudioFormat == AUDIO_FORMAT_PCM)
             {
-                // Now the number of bits per sample must be at least 16.
-                // If not, the WAVE file gets corrupted by the ADPCM compression
-                if(pWaveHdr->wBitsPerSample >= 0x10)
-                {
-                    *pdwChannels = pWaveHdr->wChannels;
-                    return true;
-                }
+                *pdwChannels = pWaveHdr->wChannels;
+                return true;
             }
         }
     }
@@ -80,29 +76,33 @@ static bool IsWaveFile_16BitsPerAdpcmSample(
     return false;
 }
 
-//-----------------------------------------------------------------------------
-// MPQ write data functions
 
 static int WriteDataToMpqFile(
-    TMPQArchive * ha,
-    TMPQFile * hf,
-    LPBYTE pbFileData,
-    DWORD dwDataSize,
-    DWORD dwCompression)
+        TMPQArchive * ha,
+        TMPQFile * hf,
+        LPBYTE pbFileData,
+        DWORD dwDataSize,
+        DWORD dwCompression)
 {
     TFileEntry * pFileEntry = hf->pFileEntry;
     ULONGLONG ByteOffset;
-    LPBYTE pbCompressed = NULL;             // Compressed (target) data
-    LPBYTE pbToWrite = hf->pbFileSector;    // Data to write to the file
-    int nCompressionLevel;                  // ADPCM compression level (only used for wave files)
+    LPBYTE pbCompressed = NULL;         // Compressed (target) data
+    LPBYTE pbToWrite = NULL;            // Data to write to the file
+    int nCompressionLevel = -1;         // ADPCM compression level (only used for wave files)
     int nError = ERROR_SUCCESS;
 
+    // If the caller wants ADPCM compression, we will set wave compression level to 4,
+    // which corresponds to medium quality
+    if(dwCompression & LOSSY_COMPRESSION_MASK)
+        nCompressionLevel = 4;
+
     // Make sure that the caller won't overrun the previously initiated file size
     assert(hf->dwFilePos + dwDataSize <= pFileEntry->dwFileSize);
     assert(hf->dwSectorCount != 0);
     assert(hf->pbFileSector != NULL);
     if((hf->dwFilePos + dwDataSize) > pFileEntry->dwFileSize)
         return ERROR_DISK_FULL;
+    pbToWrite = hf->pbFileSector;
 
     // Now write all data to the file sector buffer
     if(nError == ERROR_SUCCESS)
@@ -111,11 +111,11 @@ static int WriteDataToMpqFile(
         DWORD dwSectorIndex = hf->dwFilePos / hf->dwSectorSize;
         DWORD dwBytesToCopy;
 
-        // Process all data. 
+        // Process all data.
         while(dwDataSize != 0)
         {
             dwBytesToCopy = dwDataSize;
-                
+
             // Check for sector overflow
             if(dwBytesToCopy > (hf->dwSectorSize - dwBytesInSector))
                 dwBytesToCopy = (hf->dwSectorSize - dwBytesInSector);
@@ -141,7 +141,7 @@ static int WriteDataToMpqFile(
                 hf->dwCrc32 = crc32(hf->dwCrc32, hf->pbFileSector, dwBytesInSector);
 
                 // Compress the file sector, if needed
-                if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS_MASK)
+                if(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED)
                 {
                     int nOutBuffer = (int)dwBytesInSector;
                     int nInBuffer = (int)dwBytesInSector;
@@ -160,33 +160,27 @@ static int WriteDataToMpqFile(
                     }
 
                     //
-                    // Note that both SCompImplode and SCompCompress copy data as-is,
-                    // if they are unable to compress the data.
+                    // Note that both SCompImplode and SCompCompress give original buffer,
+                    // if they are unable to comperss the data.
                     //
 
                     if(pFileEntry->dwFlags & MPQ_FILE_IMPLODE)
                     {
-                        SCompImplode(pbCompressed, &nOutBuffer, hf->pbFileSector, nInBuffer);
+                        SCompImplode((char *)pbCompressed,
+                                     &nOutBuffer,
+                                     (char *)hf->pbFileSector,
+                                     nInBuffer);
                     }
 
                     if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS)
                     {
-                        // If this is the first sector, we need to override the given compression
-                        // by the first sector compression. This is because the entire sector must
-                        // be compressed by the same compression.
-                        //
-                        // Test case:                        
-                        //
-                        // WRITE_FILE(hFile, pvBuffer, 0x10, MPQ_COMPRESSION_PKWARE)       // Write 0x10 bytes (sector 0)
-                        // WRITE_FILE(hFile, pvBuffer, 0x10, MPQ_COMPRESSION_ADPCM_MONO)   // Write 0x10 bytes (still sector 0)
-                        // WRITE_FILE(hFile, pvBuffer, 0x10, MPQ_COMPRESSION_ADPCM_MONO)   // Write 0x10 bytes (still sector 0)
-                        // WRITE_FILE(hFile, pvBuffer, 0x10, MPQ_COMPRESSION_ADPCM_MONO)   // Write 0x10 bytes (still sector 0)
-                        dwCompression = (dwSectorIndex == 0) ? hf->dwCompression0 : dwCompression;
-
-                        // If the caller wants ADPCM compression, we will set wave compression level to 4,
-                        // which corresponds to medium quality
-                        nCompressionLevel = (dwCompression & MPQ_LOSSY_COMPRESSION_MASK) ? 4 : -1;
-                        SCompCompress(pbCompressed, &nOutBuffer, hf->pbFileSector, nInBuffer, (unsigned)dwCompression, 0, nCompressionLevel);
+                        SCompCompress((char *)pbCompressed,
+                                      &nOutBuffer,
+                                      (char *)hf->pbFileSector,
+                                      nInBuffer,
+                                      (unsigned)dwCompression,
+                                      0,
+                                      nCompressionLevel);
                     }
 
                     // Update sector positions
@@ -197,7 +191,7 @@ static int WriteDataToMpqFile(
                     // We have to calculate sector CRC, if enabled
                     if(hf->SectorChksums != NULL)
                         hf->SectorChksums[dwSectorIndex] = adler32(0, pbCompressed, nOutBuffer);
-                }                 
+                }
 
                 // Encrypt the sector, if necessary
                 if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
@@ -215,8 +209,8 @@ static int WriteDataToMpqFile(
                 }
 
                 // Call the compact callback, if any
-                if(ha->pfnAddFileCB != NULL)
-                    ha->pfnAddFileCB(ha->pvAddFileUserData, hf->dwFilePos, hf->dwDataSize, false);
+                if(AddFileCB != NULL)
+                    AddFileCB(pvUserData, hf->dwFilePos, hf->dwDataSize, false);
 
                 // Update the compressed file size
                 pFileEntry->dwCmpSize += dwBytesInSector;
@@ -236,10 +230,10 @@ static int WriteDataToMpqFile(
 // Recrypts file data for file renaming
 
 static int RecryptFileData(
-    TMPQArchive * ha,
-    TMPQFile * hf,
-    const char * szFileName,
-    const char * szNewFileName)
+        TMPQArchive * ha,
+        TMPQFile * hf,
+        const char * szFileName,
+        const char * szNewFileName)
 {
     ULONGLONG RawFilePos;
     TFileEntry * pFileEntry = hf->pFileEntry;
@@ -252,8 +246,8 @@ static int RecryptFileData(
     assert(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED);
 
     // File decryption key is calculated from the plain name
-    szNewFileName = GetPlainFileName(szNewFileName);
-    szFileName = GetPlainFileName(szFileName);
+    szNewFileName = GetPlainFileNameA(szNewFileName);
+    szFileName = GetPlainFileNameA(szFileName);
 
     // Calculate both file keys
     dwOldKey = DecryptFileKey(szFileName,    pFileEntry->ByteOffset, pFileEntry->dwFileSize, pFileEntry->dwFlags);
@@ -283,7 +277,7 @@ static int RecryptFileData(
     if(hf->SectorOffsets != NULL)
     {
         // Allocate secondary buffer for sectors copy
-        DWORD * SectorOffsetsCopy = STORM_ALLOC(DWORD, hf->SectorOffsets[0] / sizeof(DWORD));
+        DWORD * SectorOffsetsCopy = (DWORD *)STORM_ALLOC(BYTE, hf->SectorOffsets[0]);
         DWORD dwSectorOffsLen = hf->SectorOffsets[0];
 
         if(SectorOffsetsCopy == NULL)
@@ -331,7 +325,7 @@ static int RecryptFileData(
             }
 
             // If necessary, re-encrypt the sector
-            // Note: Recompression is not necessary here. Unlike encryption, 
+            // Note: Recompression is not necessary here. Unlike encryption,
             // the compression does not depend on the position of the file in MPQ.
             BSWAP_ARRAY32_UNSIGNED(hf->pbFileSector, dwRawDataInSector);
             DecryptMpqBlock(hf->pbFileSector, dwRawDataInSector, dwOldKey + dwSector);
@@ -357,13 +351,13 @@ static int RecryptFileData(
 // Support functions for adding files to the MPQ
 
 int SFileAddFile_Init(
-    TMPQArchive * ha,
-    const char * szFileName,
-    ULONGLONG FileTime,
-    DWORD dwFileSize,
-    LCID lcLocale,
-    DWORD dwFlags,
-    TMPQFile ** phf)
+        TMPQArchive * ha,
+        const char * szFileName,
+        ULONGLONG FileTime,
+        DWORD dwFileSize,
+        LCID lcLocale,
+        DWORD dwFlags,
+        TMPQFile ** phf)
 {
     TFileEntry * pFileEntry = NULL;
     ULONGLONG TempPos;                  // For various file offset calculations
@@ -381,9 +375,9 @@ int SFileAddFile_Init(
         dwFlags &= ~MPQ_FILE_SECTOR_CRC;
 
     // Sector CRC is not allowed if the file is not compressed
-    if(!(dwFlags & MPQ_FILE_COMPRESS_MASK))
+    if(!(dwFlags & MPQ_FILE_COMPRESSED))
         dwFlags &= ~MPQ_FILE_SECTOR_CRC;
-    
+
     // Fix Key is not allowed if the file is not enrypted
     if(!(dwFlags & MPQ_FILE_ENCRYPTED))
         dwFlags &= ~MPQ_FILE_FIX_KEY;
@@ -394,18 +388,21 @@ int SFileAddFile_Init(
         lcLocale = 0;
 
     // Allocate the TMPQFile entry for newly added file
-    hf = CreateFileHandle(ha, NULL);
+    hf = CreateMpqFile(ha);
     if(hf == NULL)
         nError = ERROR_NOT_ENOUGH_MEMORY;
 
-    // Find a free space in the MPQ and verify if it's not over 4 GB on MPQs v1
+    // Find a free space in the MPQ, as well as free block table entry
     if(nError == ERROR_SUCCESS)
     {
         // Find the position where the file will be stored
-        hf->MpqFilePos = FindFreeMpqSpace(ha);
+        FindFreeMpqSpace(ha, &hf->MpqFilePos);
         hf->RawFilePos = ha->MpqPos + hf->MpqFilePos;
         hf->bIsWriteHandle = true;
 
+        // Sanity check: The MPQ must be marked as changed at this point
+        assert((ha->dwFlags & MPQ_FLAG_CHANGED) != 0);
+
         // When format V1, the size of the archive cannot exceed 4 GB
         if(ha->pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1)
         {
@@ -431,31 +428,34 @@ int SFileAddFile_Init(
         }
         else
         {
-            // If the caller didn't set MPQ_FILE_REPLACEEXISTING, fail it
+            // If the file exists and "replace existing" is not set, fail it
             if((dwFlags & MPQ_FILE_REPLACEEXISTING) == 0)
                 nError = ERROR_ALREADY_EXISTS;
 
-            // When replacing an existing file,
-            // we still need to invalidate the (attributes) file
+            // If the file entry already contains a file
+            // and it is a pseudo-name, replace it
             if(nError == ERROR_SUCCESS)
-                InvalidateInternalFiles(ha);
+            {
+                AllocateFileName(pFileEntry, szFileName);
+            }
         }
     }
 
-    // Fill the file entry and TMPQFile structure
+    //
+    // At this point, the file name in file entry must be non-NULL
+    //
+
+    // Create key for file encryption
+    if(nError == ERROR_SUCCESS && (dwFlags & MPQ_FILE_ENCRYPTED))
+    {
+        hf->dwFileKey = DecryptFileKey(szFileName, hf->MpqFilePos, dwFileSize, dwFlags);
+    }
+
     if(nError == ERROR_SUCCESS)
     {
-        // At this point, the file name in the file entry must be set
-        assert(pFileEntry->szFileName != NULL);
-        assert(_stricmp(pFileEntry->szFileName, szFileName) == 0);
-
         // Initialize the hash entry for the file
         hf->pFileEntry = pFileEntry;
         hf->dwDataSize = dwFileSize;
-        
-        // Decrypt the file key
-        if(dwFlags & MPQ_FILE_ENCRYPTED)
-            hf->dwFileKey = DecryptFileKey(szFileName, hf->MpqFilePos, dwFileSize, dwFlags);
 
         // Initialize the block table entry for the file
         pFileEntry->ByteOffset = hf->MpqFilePos;
@@ -473,20 +473,14 @@ int SFileAddFile_Init(
         // If the caller gave us a file time, use it.
         pFileEntry->FileTime = FileTime;
 
-        // Mark the archive as modified
-        ha->dwFlags |= MPQ_FLAG_CHANGED;
-
         // Call the callback, if needed
-        if(ha->pfnAddFileCB != NULL)
-            ha->pfnAddFileCB(ha->pvAddFileUserData, 0, hf->dwDataSize, false);
-        hf->nAddFileError = ERROR_SUCCESS;
+        if(AddFileCB != NULL)
+            AddFileCB(pvUserData, 0, hf->dwDataSize, false);
     }
 
-    // Fre the file handle if failed
-    if(nError != ERROR_SUCCESS && hf != NULL)
-        FreeFileHandle(hf);
-
-    // Give the handle to the caller
+    // If an error occured, remember it
+    if(nError != ERROR_SUCCESS)
+        hf->bErrorOccured = true;
     *phf = hf;
     return nError;
 }
@@ -511,9 +505,12 @@ int SFileAddFile_Write(TMPQFile * hf, const void * pvData, DWORD dwSize, DWORD d
         ULONGLONG RawFilePos = hf->RawFilePos;
 
         // Allocate buffer for file sector
-        hf->nAddFileError = nError = AllocateSectorBuffer(hf);
+        nError = AllocateSectorBuffer(hf);
         if(nError != ERROR_SUCCESS)
+        {
+            hf->bErrorOccured = true;
             return nError;
+        }
 
         // Allocate patch info, if the data is patch
         if(hf->pPatchInfo == NULL && IsIncrementalPatchFile(pvData, dwSize, &hf->dwPatchedFileSize))
@@ -522,25 +519,34 @@ int SFileAddFile_Write(TMPQFile * hf, const void * pvData, DWORD dwSize, DWORD d
             hf->pFileEntry->dwFlags |= MPQ_FILE_PATCH_FILE;
 
             // Allocate the patch info
-            hf->nAddFileError = nError = AllocatePatchInfo(hf, false);
+            nError = AllocatePatchInfo(hf, false);
             if(nError != ERROR_SUCCESS)
+            {
+                hf->bErrorOccured = true;
                 return nError;
+            }
         }
 
         // Allocate sector offsets
         if(hf->SectorOffsets == NULL)
         {
-            hf->nAddFileError = nError = AllocateSectorOffsets(hf, false);
+            nError = AllocateSectorOffsets(hf, false);
             if(nError != ERROR_SUCCESS)
+            {
+                hf->bErrorOccured = true;
                 return nError;
+            }
         }
 
         // Create array of sector checksums
         if(hf->SectorChksums == NULL && (pFileEntry->dwFlags & MPQ_FILE_SECTOR_CRC))
         {
-            hf->nAddFileError = nError = AllocateSectorChecksums(hf, false);
+            nError = AllocateSectorChecksums(hf, false);
             if(nError != ERROR_SUCCESS)
+            {
+                hf->bErrorOccured = true;
                 return nError;
+            }
         }
 
         // Pre-save the patch info, if any
@@ -548,7 +554,7 @@ int SFileAddFile_Write(TMPQFile * hf, const void * pvData, DWORD dwSize, DWORD d
         {
             if(!FileStream_Write(ha->pStream, &RawFilePos, hf->pPatchInfo, hf->pPatchInfo->dwLength))
                 nError = GetLastError();
-  
+
             pFileEntry->dwCmpSize += hf->pPatchInfo->dwLength;
             RawFilePos += hf->pPatchInfo->dwLength;
         }
@@ -568,16 +574,7 @@ int SFileAddFile_Write(TMPQFile * hf, const void * pvData, DWORD dwSize, DWORD d
 
     // Write the MPQ data to the file
     if(nError == ERROR_SUCCESS)
-    {
-        // Save the first sector compression to the file structure
-        // Note that the entire first file sector will be compressed
-        // by compression that was passed to the first call of SFileAddFile_Write
-        if(hf->dwFilePos == 0)
-            hf->dwCompression0 = dwCompression;
-
-        // Write the data to the MPQ
         nError = WriteDataToMpqFile(ha, hf, (LPBYTE)pvData, dwSize, dwCompression);
-    }
 
     // If it succeeded and we wrote all the file data,
     // we need to re-save sector offset table
@@ -595,6 +592,8 @@ int SFileAddFile_Write(TMPQFile * hf, const void * pvData, DWORD dwSize, DWORD d
             if(hf->SectorChksums != NULL)
             {
                 nError = WriteSectorChecksums(hf);
+                if(nError != ERROR_SUCCESS)
+                    hf->bErrorOccured = true;
             }
 
             // Now write patch info
@@ -604,12 +603,16 @@ int SFileAddFile_Write(TMPQFile * hf, const void * pvData, DWORD dwSize, DWORD d
                 hf->pPatchInfo->dwDataSize  = hf->pFileEntry->dwFileSize;
                 hf->pFileEntry->dwFileSize = hf->dwPatchedFileSize;
                 nError = WritePatchInfo(hf);
+                if(nError != ERROR_SUCCESS)
+                    hf->bErrorOccured = true;
             }
 
             // Now write sector offsets to the file
             if(hf->SectorOffsets != NULL)
             {
                 nError = WriteSectorOffsets(hf);
+                if(nError != ERROR_SUCCESS)
+                    hf->bErrorOccured = true;
             }
 
             // Write the MD5 hashes of each file chunk, if required
@@ -619,12 +622,16 @@ int SFileAddFile_Write(TMPQFile * hf, const void * pvData, DWORD dwSize, DWORD d
                                          ha->MpqPos + hf->pFileEntry->ByteOffset,
                                          hf->pFileEntry->dwCmpSize,
                                          ha->pHeader->dwRawChunkSize);
+                if(nError != ERROR_SUCCESS)
+                    hf->bErrorOccured = true;
             }
         }
     }
+    else
+    {
+        hf->bErrorOccured = true;
+    }
 
-    // Store the error code from the Write File operation
-    hf->nAddFileError = nError;
     return nError;
 }
 
@@ -632,87 +639,88 @@ int SFileAddFile_Finish(TMPQFile * hf)
 {
     TMPQArchive * ha = hf->ha;
     TFileEntry * pFileEntry = hf->pFileEntry;
-    int nError = hf->nAddFileError;
+    int nError = ERROR_SUCCESS;
 
     // If all previous operations succeeded, we can update the MPQ
-    if(nError == ERROR_SUCCESS)
+    if(!hf->bErrorOccured)
     {
         // Verify if the caller wrote the file properly
         if(hf->pPatchInfo == NULL)
         {
             assert(pFileEntry != NULL);
             if(hf->dwFilePos != pFileEntry->dwFileSize)
+            {
                 nError = ERROR_CAN_NOT_COMPLETE;
+                hf->bErrorOccured = true;
+            }
         }
         else
         {
             if(hf->dwFilePos != hf->pPatchInfo->dwDataSize)
+            {
                 nError = ERROR_CAN_NOT_COMPLETE;
+                hf->bErrorOccured = true;
+            }
         }
     }
 
-    // Now we need to recreate the HET table, if exists
-    if(nError == ERROR_SUCCESS && ha->pHetTable != NULL)
-    {
-        nError = RebuildHetTable(ha);
-    }
-
-    // Update the block table size
-    if(nError == ERROR_SUCCESS)
+    if(!hf->bErrorOccured)
     {
         // Call the user callback, if any
-        if(ha->pfnAddFileCB != NULL)
-            ha->pfnAddFileCB(ha->pvAddFileUserData, hf->dwDataSize, hf->dwDataSize, true);
+        if(AddFileCB != NULL)
+            AddFileCB(pvUserData, hf->dwDataSize, hf->dwDataSize, true);
+
+        // Update the size of the block table
+        ha->pHeader->dwBlockTableSize = ha->dwFileTableSize;
     }
     else
     {
         // Free the file entry in MPQ tables
         if(pFileEntry != NULL)
-            DeleteFileEntry(ha, pFileEntry);
+            FreeFileEntry(ha, pFileEntry);
     }
 
     // Clear the add file callback
-    FreeFileHandle(hf);
+    FreeMPQFile(hf);
+    pvUserData = NULL;
+    AddFileCB = NULL;
     return nError;
 }
 
 //-----------------------------------------------------------------------------
-// Adds data as file to the archive 
+// Adds data as file to the archive
 
 bool WINAPI SFileCreateFile(
-    HANDLE hMpq,
-    const char * szArchivedName,
-    ULONGLONG FileTime,
-    DWORD dwFileSize,
-    LCID lcLocale,
-    DWORD dwFlags,
-    HANDLE * phFile)
+        HANDLE hMpq,
+        const char * szArchivedName,
+        ULONGLONG FileTime,
+        DWORD dwFileSize,
+        LCID lcLocale,
+        DWORD dwFlags,
+        HANDLE * phFile)
 {
     TMPQArchive * ha = (TMPQArchive *)hMpq;
     int nError = ERROR_SUCCESS;
 
     // Check valid parameters
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
         nError = ERROR_INVALID_HANDLE;
     if(szArchivedName == NULL || *szArchivedName == 0)
         nError = ERROR_INVALID_PARAMETER;
     if(phFile == NULL)
         nError = ERROR_INVALID_PARAMETER;
-    
+
     // Don't allow to add file if the MPQ is open for read only
-    if(nError == ERROR_SUCCESS)
-    {
-        if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
-            nError = ERROR_ACCESS_DENIED;
+    if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
+        nError = ERROR_ACCESS_DENIED;
 
-        // Don't allow to add a file under pseudo-file name
-        if(IsPseudoFileName(szArchivedName, NULL))
-            nError = ERROR_INVALID_PARAMETER;
+    // Don't allow to add a file under pseudo-file name
+    if(IsPseudoFileName(szArchivedName, NULL))
+        nError = ERROR_INVALID_PARAMETER;
 
-        // Don't allow to add any of the internal files
-        if(IsInternalMpqFileName(szArchivedName))
-            nError = ERROR_INTERNAL_FILE;
-    }
+    // Don't allow to add any of the internal files
+    if(IsInternalMpqFileName(szArchivedName))
+        nError = ERROR_INTERNAL_FILE;
 
     // Perform validity check of the MPQ flags
     if(nError == ERROR_SUCCESS)
@@ -725,17 +733,16 @@ bool WINAPI SFileCreateFile(
             nError = ERROR_INVALID_PARAMETER;
     }
 
-    // Check for MPQs that have invalid block table size
-    // Example: size of block table: 0x41, size of hash table: 0x40
+    // Create the file in MPQ
     if(nError == ERROR_SUCCESS)
     {
-        if(ha->dwFileTableSize > ha->dwMaxFileCount)
-            nError = ERROR_DISK_FULL;
-    }
+        // Invalidate the entries for (listfile) and (attributes)
+        // After we are done with MPQ changes, we need to re-create them anyway
+        InvalidateInternalFiles(ha);
 
-    // Initiate the add file operation
-    if(nError == ERROR_SUCCESS)
+        // Initiate the add file operation
         nError = SFileAddFile_Init(ha, szArchivedName, FileTime, dwFileSize, lcLocale, dwFlags, (TMPQFile **)phFile);
+    }
 
     // Deal with the errors
     if(nError != ERROR_SUCCESS)
@@ -744,16 +751,16 @@ bool WINAPI SFileCreateFile(
 }
 
 bool WINAPI SFileWriteFile(
-    HANDLE hFile,
-    const void * pvData,
-    DWORD dwSize,
-    DWORD dwCompression)
+        HANDLE hFile,
+        const void * pvData,
+        DWORD dwSize,
+        DWORD dwCompression)
 {
     TMPQFile * hf = (TMPQFile *)hFile;
     int nError = ERROR_SUCCESS;
 
     // Check the proper parameters
-    if(!IsValidFileHandle(hFile))
+    if(!IsValidFileHandle(hf))
         nError = ERROR_INVALID_HANDLE;
     if(hf->bIsWriteHandle == false)
         nError = ERROR_INVALID_HANDLE;
@@ -767,14 +774,14 @@ bool WINAPI SFileWriteFile(
         // the calling application must ensure that such flag combination doesn't get here
         //
 
-//      if(dwFlags & MPQ_FILE_IMPLODE)
-//          nError = ERROR_INVALID_PARAMETER;
-//
-//      if(dwFlags & MPQ_FILE_ENCRYPTED)
-//          nError = ERROR_INVALID_PARAMETER;
-        
+        //      if(dwFlags & MPQ_FILE_IMPLODE)
+        //          nError = ERROR_INVALID_PARAMETER;
+        //
+        //      if(dwFlags & MPQ_FILE_ENCRYPTED)
+        //          nError = ERROR_INVALID_PARAMETER;
+
         // Lossy compression is not allowed on single unit files
-        if(dwCompression & MPQ_LOSSY_COMPRESSION_MASK)
+        if(dwCompression & LOSSY_COMPRESSION_MASK)
             nError = ERROR_INVALID_PARAMETER;
     }
 
@@ -782,7 +789,7 @@ bool WINAPI SFileWriteFile(
     // Write the data to the file
     if(nError == ERROR_SUCCESS)
         nError = SFileAddFile_Write(hf, pvData, dwSize, dwCompression);
-    
+
     // Deal with errors
     if(nError != ERROR_SUCCESS)
         SetLastError(nError);
@@ -795,7 +802,7 @@ bool WINAPI SFileFinishFile(HANDLE hFile)
     int nError = ERROR_SUCCESS;
 
     // Check the proper parameters
-    if(!IsValidFileHandle(hFile))
+    if(!IsValidFileHandle(hf))
         nError = ERROR_INVALID_HANDLE;
     if(hf->bIsWriteHandle == false)
         nError = ERROR_INVALID_HANDLE;
@@ -803,7 +810,7 @@ bool WINAPI SFileFinishFile(HANDLE hFile)
     // Finish the file
     if(nError == ERROR_SUCCESS)
         nError = SFileAddFile_Finish(hf);
-    
+
     // Deal with errors
     if(nError != ERROR_SUCCESS)
         SetLastError(nError);
@@ -811,15 +818,15 @@ bool WINAPI SFileFinishFile(HANDLE hFile)
 }
 
 //-----------------------------------------------------------------------------
-// Adds a file to the archive 
+// Adds a file to the archive
 
 bool WINAPI SFileAddFileEx(
-    HANDLE hMpq,
-    const TCHAR * szFileName,
-    const char * szArchivedName,
-    DWORD dwFlags,
-    DWORD dwCompression,            // Compression of the first sector
-    DWORD dwCompressionNext)        // Compression of next sectors
+        HANDLE hMpq,
+        const TCHAR * szFileName,
+        const char * szArchivedName,
+        DWORD dwFlags,
+        DWORD dwCompression,            // Compression of the first sector
+        DWORD dwCompressionNext)        // Compression of next sectors
 {
     ULONGLONG FileSize = 0;
     ULONGLONG FileTime = 0;
@@ -835,13 +842,13 @@ bool WINAPI SFileAddFileEx(
     int nError = ERROR_SUCCESS;
 
     // Check parameters
-    if(hMpq == NULL || szFileName == NULL || *szFileName == 0)
+    if(szFileName == NULL || *szFileName == 0)
         nError = ERROR_INVALID_PARAMETER;
 
     // Open added file
     if(nError == ERROR_SUCCESS)
     {
-        pStream = FileStream_OpenFile(szFileName, STREAM_FLAG_READ_ONLY | STREAM_PROVIDER_FLAT | BASE_PROVIDER_FILE);
+        pStream = FileStream_OpenFile(szFileName, STREAM_FLAG_READ_ONLY | STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
         if(pStream == NULL)
             nError = GetLastError();
     }
@@ -851,7 +858,7 @@ bool WINAPI SFileAddFileEx(
     {
         FileStream_GetTime(pStream, &FileTime);
         FileStream_GetSize(pStream, &FileSize);
-        
+
         // Files bigger than 4GB cannot be added to MPQ
         if(FileSize >> 32)
             nError = ERROR_DISK_FULL;
@@ -873,18 +880,15 @@ bool WINAPI SFileAddFileEx(
         // we will copy the compression for the first sector
         if(dwCompressionNext == MPQ_COMPRESSION_NEXT_SAME)
             dwCompressionNext = dwCompression;
-        
+
         // If the caller wants ADPCM compression, we make sure
         // that the first sector is not compressed with lossy compression
         if(dwCompressionNext & (MPQ_COMPRESSION_ADPCM_MONO | MPQ_COMPRESSION_ADPCM_STEREO))
         {
-            // The compression of the first file sector must not be ADPCM
-            // in order not to corrupt the headers
+            // The first compression must not be WAVE
             if(dwCompression & (MPQ_COMPRESSION_ADPCM_MONO | MPQ_COMPRESSION_ADPCM_STEREO))
                 dwCompression = MPQ_COMPRESSION_PKWARE;
-            
-            // Remove both flag mono and stereo flags.
-            // They will be re-added according to WAVE type
+
             dwCompressionNext &= ~(MPQ_COMPRESSION_ADPCM_MONO | MPQ_COMPRESSION_ADPCM_STEREO);
             bIsAdpcmCompression = true;
         }
@@ -912,19 +916,15 @@ bool WINAPI SFileAddFileEx(
         // If the file being added is a WAVE file, we check number of channels
         if(bIsFirstSector && bIsAdpcmCompression)
         {
-            // The file must really be a WAVE file with at least 16 bits per sample,
-            // otherwise the ADPCM compression will corrupt it
-            if(IsWaveFile_16BitsPerAdpcmSample(pbFileData, dwBytesToRead, &dwChannels))
+            // The file must really be a wave file, otherwise it's data corruption
+            if(!IsWaveFile(pbFileData, dwBytesToRead, &dwChannels))
             {
-                // Setup the compression of next sectors according to number of channels
-                dwCompressionNext |= (dwChannels == 1) ? MPQ_COMPRESSION_ADPCM_MONO : MPQ_COMPRESSION_ADPCM_STEREO;
-            }
-            else
-            {
-                // Setup the compression of next sectors to a lossless compression
-                dwCompressionNext = (dwCompression & MPQ_LOSSY_COMPRESSION_MASK) ? MPQ_COMPRESSION_PKWARE : dwCompression;
+                nError = ERROR_BAD_FORMAT;
+                break;
             }
 
+            // Setup the compression according to number of channels
+            dwCompressionNext |= (dwChannels == 1) ? MPQ_COMPRESSION_ADPCM_MONO : MPQ_COMPRESSION_ADPCM_STEREO;
             bIsFirstSector = false;
         }
 
@@ -956,7 +956,7 @@ bool WINAPI SFileAddFileEx(
         SetLastError(nError);
     return (nError == ERROR_SUCCESS);
 }
-                                                                                                                                 
+
 // Adds a data file into the archive
 bool WINAPI SFileAddFile(HANDLE hMpq, const TCHAR * szFileName, const char * szArchivedName, DWORD dwFlags)
 {
@@ -983,25 +983,25 @@ bool WINAPI SFileAddWave(HANDLE hMpq, const TCHAR * szFileName, const char * szA
     // Starcraft files are packed as Mono (0x41) on medium quality.
     // Because this compression is not used anymore, our compression functions
     // will default to WaveCompressionLevel = 4 when using ADPCM compression
-    // 
+    //
 
     // Convert quality to data compression
     switch(dwQuality)
     {
-        case MPQ_WAVE_QUALITY_HIGH:
-//          WaveCompressionLevel = -1;
-            dwCompression = MPQ_COMPRESSION_PKWARE;
-            break;
+    case MPQ_WAVE_QUALITY_HIGH:
+        //          WaveCompressionLevel = -1;
+        dwCompression = MPQ_COMPRESSION_PKWARE;
+        break;
 
-        case MPQ_WAVE_QUALITY_MEDIUM:
-//          WaveCompressionLevel = 4;
-            dwCompression = MPQ_COMPRESSION_ADPCM_STEREO | MPQ_COMPRESSION_HUFFMANN;
-            break;
+    case MPQ_WAVE_QUALITY_MEDIUM:
+        //          WaveCompressionLevel = 4;
+        dwCompression = MPQ_COMPRESSION_ADPCM_STEREO | MPQ_COMPRESSION_HUFFMANN;
+        break;
 
-        case MPQ_WAVE_QUALITY_LOW:
-//          WaveCompressionLevel = 2;
-            dwCompression = MPQ_COMPRESSION_ADPCM_STEREO | MPQ_COMPRESSION_HUFFMANN;
-            break;
+    case MPQ_WAVE_QUALITY_LOW:
+        //          WaveCompressionLevel = 2;
+        dwCompression = MPQ_COMPRESSION_ADPCM_STEREO | MPQ_COMPRESSION_HUFFMANN;
+        break;
     }
 
     return SFileAddFileEx(hMpq,
@@ -1017,7 +1017,7 @@ bool WINAPI SFileAddWave(HANDLE hMpq, const TCHAR * szFileName, const char * szA
 //
 // This function removes a file from the archive. The file content
 // remains there, only the entries in the hash table and in the block
-// table are updated. 
+// table are updated.
 
 bool WINAPI SFileRemoveFile(HANDLE hMpq, const char * szFileName, DWORD dwSearchScope)
 {
@@ -1032,7 +1032,7 @@ bool WINAPI SFileRemoveFile(HANDLE hMpq, const char * szFileName, DWORD dwSearch
     // Check the parameters
     if(nError == ERROR_SUCCESS)
     {
-        if(!IsValidMpqHandle(hMpq))
+        if(!IsValidMpqHandle(ha))
             nError = ERROR_INVALID_HANDLE;
         if(szFileName == NULL || *szFileName == 0)
             nError = ERROR_INVALID_PARAMETER;
@@ -1075,12 +1075,8 @@ bool WINAPI SFileRemoveFile(HANDLE hMpq, const char * szFileName, DWORD dwSearch
         // After we are done with MPQ changes, we need to re-create them anyway
         InvalidateInternalFiles(ha);
 
-        // Delete the file entry in the file table and defragment the file table
-        DeleteFileEntry(ha, pFileEntry);
-
-        // We also need to rebuild the HET table, if present
-        if(ha->pHetTable != NULL)
-            nError = RebuildHetTable(ha);
+        // Mark the file entry as free
+        nError = FreeFileEntry(ha, pFileEntry);
     }
 
     // Resolve error and exit
@@ -1101,7 +1097,7 @@ bool WINAPI SFileRenameFile(HANDLE hMpq, const char * szFileName, const char * s
     // Test the valid parameters
     if(nError == ERROR_SUCCESS)
     {
-        if(!IsValidMpqHandle(hMpq))
+        if(!IsValidMpqHandle(ha))
             nError = ERROR_INVALID_HANDLE;
         if(szFileName == NULL || *szFileName == 0 || szNewFileName == NULL || *szNewFileName == 0)
             nError = ERROR_INVALID_PARAMETER;
@@ -1131,7 +1127,7 @@ bool WINAPI SFileRenameFile(HANDLE hMpq, const char * szFileName, const char * s
         if(pFileEntry == NULL)
             nError = ERROR_FILE_NOT_FOUND;
     }
-        
+
     // Also try to find file entry for the new file.
     // This verifies if we are not overwriting an existing file
     // (whose name we perhaps don't know)
@@ -1148,10 +1144,6 @@ bool WINAPI SFileRenameFile(HANDLE hMpq, const char * szFileName, const char * s
         nError = RenameFileEntry(ha, pFileEntry, szNewFileName);
     }
 
-    // Now we need to recreate the HET table, if we have one
-    if(nError == ERROR_SUCCESS && ha->pHetTable != NULL)
-        nError = RebuildHetTable(ha);
-
     // Now we copy the existing file entry to the new one
     if(nError == ERROR_SUCCESS)
     {
@@ -1159,12 +1151,14 @@ bool WINAPI SFileRenameFile(HANDLE hMpq, const char * szFileName, const char * s
         // with the new decryption key
         if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
         {
-            hf = CreateFileHandle(ha, pFileEntry);
+            hf = CreateMpqFile(ha);
             if(hf != NULL)
             {
                 // Recrypt the file data in the MPQ
+                hf->pFileEntry = pFileEntry;
+                hf->dwDataSize = pFileEntry->dwFileSize;
                 nError = RecryptFileData(ha, hf, szFileName, szNewFileName);
-                
+
                 // Update the MD5
                 if(ha->pHeader->dwRawChunkSize != 0)
                 {
@@ -1174,8 +1168,8 @@ bool WINAPI SFileRenameFile(HANDLE hMpq, const char * szFileName, const char * s
                                     pFileEntry->dwCmpSize,
                                     ha->pHeader->dwRawChunkSize);
                 }
-                
-                FreeFileHandle(hf);
+
+                FreeMPQFile(hf);
             }
             else
             {
@@ -1184,8 +1178,9 @@ bool WINAPI SFileRenameFile(HANDLE hMpq, const char * szFileName, const char * s
         }
     }
 
+    //
     // Note: MPQ_FLAG_CHANGED is set by RenameFileEntry
-    // assert((ha->dwFlags & MPQ_FLAG_CHANGED) != 0);
+    //
 
     // Resolve error and return
     if(nError != ERROR_SUCCESS)
@@ -1220,7 +1215,7 @@ bool WINAPI SFileSetFileLocale(HANDLE hFile, LCID lcNewLocale)
     TMPQFile * hf = (TMPQFile *)hFile;
 
     // Invalid handle => do nothing
-    if(!IsValidFileHandle(hFile))
+    if(!IsValidFileHandle(hf))
     {
         SetLastError(ERROR_INVALID_HANDLE);
         return false;
@@ -1283,17 +1278,9 @@ bool WINAPI SFileSetFileLocale(HANDLE hFile, LCID lcNewLocale)
 //-----------------------------------------------------------------------------
 // Sets add file callback
 
-bool WINAPI SFileSetAddFileCallback(HANDLE hMpq, SFILE_ADDFILE_CALLBACK AddFileCB, void * pvUserData)
+bool WINAPI SFileSetAddFileCallback(HANDLE /* hMpq */, SFILE_ADDFILE_CALLBACK aAddFileCB, void * pvData)
 {
-    TMPQArchive * ha = (TMPQArchive *) hMpq;
-
-    if(!IsValidMpqHandle(hMpq))
-    {
-        SetLastError(ERROR_INVALID_HANDLE);
-        return false;
-    }
-
-    ha->pvAddFileUserData = pvUserData;
-    ha->pfnAddFileCB = AddFileCB;
+    pvUserData = pvData;
+    AddFileCB = aAddFileCB;
     return true;
 }
diff --git a/dep/StormLib/src/SFileAttributes.cpp b/dep/StormLib/src/SFileAttributes.cpp
index 0c5dd067d..e3659bfdc 100644
--- a/dep/StormLib/src/SFileAttributes.cpp
+++ b/dep/StormLib/src/SFileAttributes.cpp
@@ -24,450 +24,346 @@ typedef struct _MPQ_ATTRIBUTES_HEADER
     // Followed by an array of file times
     // Followed by an array of MD5
     // Followed by an array of patch bits
-
-    // Note: The MD5 in (attributes), if present, is a hash of the entire file.
-    // In case the file is an incremental patch, it contains MD5 of the file
-    // after being patched.
-
 } MPQ_ATTRIBUTES_HEADER, *PMPQ_ATTRIBUTES_HEADER;
 
-//-----------------------------------------------------------------------------
-// Local functions
-
-static DWORD GetSizeOfAttributesFile(DWORD dwAttrFlags, DWORD dwFileTableSize)
-{
-    DWORD cbAttrFile = sizeof(MPQ_ATTRIBUTES_HEADER);
-
-    // Calculate size of the (attributes) file
-    if(dwAttrFlags & MPQ_ATTRIBUTE_CRC32)
-        cbAttrFile += dwFileTableSize * sizeof(DWORD);
-    if(dwAttrFlags & MPQ_ATTRIBUTE_FILETIME)
-        cbAttrFile += dwFileTableSize * sizeof(ULONGLONG);
-    if(dwAttrFlags & MPQ_ATTRIBUTE_MD5)
-        cbAttrFile += dwFileTableSize * MD5_DIGEST_SIZE;
-
-    // The bit array has been created without the last bit belonging to (attributes)
-    // When the number of files is a multiplier of 8 plus one, then the size of (attributes)
-    // if 1 byte less than expected.
-    // Example: wow-update-13164.MPQ: BlockTableSize = 0x62E1, but there's only 0xC5C bytes
-    if(dwAttrFlags & MPQ_ATTRIBUTE_PATCH_BIT)
-        cbAttrFile += (dwFileTableSize + 6) / 8;
-
-    return cbAttrFile;
-}
-
-static DWORD CheckSizeOfAttributesFile(DWORD cbAttrFile, DWORD dwAttrFlags, DWORD dwFileTableSize)
-{
-    DWORD cbHeaderSize = sizeof(MPQ_ATTRIBUTES_HEADER);
-    DWORD cbChecksumSize1 = 0;
-    DWORD cbChecksumSize2 = 0;
-    DWORD cbFileTimeSize1 = 0;
-    DWORD cbFileTimeSize2 = 0;
-    DWORD cbFileHashSize1 = 0;
-    DWORD cbFileHashSize2 = 0;
-    DWORD cbPatchBitSize1 = 0;
-    DWORD cbPatchBitSize2 = 0;
-    DWORD cbPatchBitSize3 = 0;
-
-    //
-    // Various variants with the patch bit
-    //
-    // interface.MPQ.part from WoW build 10958 has
-    // the MPQ_ATTRIBUTE_PATCH_BIT set, but there's an array of DWORDs instead.
-    // The array is filled with zeros, so we don't know what it should contain
-    //
-    // Zenith.SC2MAP has the MPQ_ATTRIBUTE_PATCH_BIT set, but the bit array is missing
-    //
-    // Elimination Tournament 2.w3x's (attributes) have one entry less
-    //
-    // There may be two variants: Either the (attributes) file has full
-    // number of entries, or has one entry less
-    //
-
-    // Get the expected size of CRC32 array
-    if(dwAttrFlags & MPQ_ATTRIBUTE_CRC32)
-    {
-        cbChecksumSize1 += dwFileTableSize * sizeof(DWORD);
-        cbChecksumSize2 += cbChecksumSize1 - sizeof(DWORD);
-    }
-
-    // Get the expected size of FILETIME array
-    if(dwAttrFlags & MPQ_ATTRIBUTE_FILETIME)
-    {
-        cbFileTimeSize1 += dwFileTableSize * sizeof(ULONGLONG);
-        cbFileTimeSize2 += cbFileTimeSize1 - sizeof(ULONGLONG);
-    }
-
-    // Get the expected size of MD5 array
-    if(dwAttrFlags & MPQ_ATTRIBUTE_MD5)
-    {
-        cbFileHashSize1 += dwFileTableSize * MD5_DIGEST_SIZE;
-        cbFileHashSize2 += cbFileHashSize1 - MD5_DIGEST_SIZE;
-    }
-
-    // Get the expected size of patch bit array
-    if(dwAttrFlags & MPQ_ATTRIBUTE_PATCH_BIT)
-    {
-        cbPatchBitSize1 =
-        cbPatchBitSize2 = ((dwFileTableSize + 6) / 8);
-        cbPatchBitSize3 = dwFileTableSize * sizeof(DWORD);
-    }
-
-    // Check if the (attributes) file entry count is equal to our file table size
-    if(cbAttrFile == (cbHeaderSize + cbChecksumSize1 + cbFileTimeSize1 + cbFileHashSize1 + cbPatchBitSize1))
-        return dwFileTableSize;
-
-    // Check if the (attributes) file entry count is equal to our file table size minus one
-    if(cbAttrFile == (cbHeaderSize + cbChecksumSize2 + cbFileTimeSize2 + cbFileHashSize2 + cbPatchBitSize2))
-        return dwFileTableSize - 1;
-
-    // Zenith.SC2MAP has the MPQ_ATTRIBUTE_PATCH_BIT set, but the bit array is missing
-    if(cbAttrFile == (cbHeaderSize + cbChecksumSize1 + cbFileTimeSize1 + cbFileHashSize1))
-        return dwFileTableSize;
-
-    // interface.MPQ.part (WoW build 10958) has the MPQ_ATTRIBUTE_PATCH_BIT set
-    // but there's an array of DWORDs (filled with zeros) instead of array of bits
-    if(cbAttrFile == (cbHeaderSize + cbChecksumSize1 + cbFileTimeSize1 + cbFileHashSize1 + cbPatchBitSize3))
-        return dwFileTableSize;
-
-#ifdef __STORMLIB_TEST__
-    // Invalid size of the (attributes) file
-    // Note that many MPQs, especially Warcraft III maps have the size of (attributes) invalid.
-    // We only perform this check if this is the STORMLIB testprogram itself
-//  assert(false);
-#endif
-
-    return 0;
-}
-
-static int LoadAttributesFile(TMPQArchive * ha, LPBYTE pbAttrFile, DWORD cbAttrFile)
-{
-    LPBYTE pbAttrFileEnd = pbAttrFile + cbAttrFile;
-    LPBYTE pbAttrPtr = pbAttrFile;
-    DWORD dwAttributesEntries = 0;
-    DWORD i;
-
-    // Load and verify the header
-    if((pbAttrPtr + sizeof(MPQ_ATTRIBUTES_HEADER)) <= pbAttrFileEnd)
-    {
-        PMPQ_ATTRIBUTES_HEADER pAttrHeader = (PMPQ_ATTRIBUTES_HEADER)pbAttrPtr;
-        
-        // Verify the header version
-        BSWAP_ARRAY32_UNSIGNED(pAttrHeader, sizeof(MPQ_ATTRIBUTES_HEADER));
-        if(pAttrHeader->dwVersion != MPQ_ATTRIBUTES_V1)
-            return ERROR_BAD_FORMAT;
-
-        // Verify the flags
-        if(pAttrHeader->dwFlags & ~MPQ_ATTRIBUTE_ALL)
-            return ERROR_BAD_FORMAT;
-
-        // Verify whether file size of (attributes) is expected
-        dwAttributesEntries = CheckSizeOfAttributesFile(cbAttrFile, pAttrHeader->dwFlags, ha->pHeader->dwBlockTableSize);
-        if(dwAttributesEntries == 0)
-            return ERROR_BAD_FORMAT;
-
-        ha->dwAttrFlags = pAttrHeader->dwFlags;
-        pbAttrPtr = (LPBYTE)(pAttrHeader + 1);
-    }
-
-    // Load the CRC32 (if present)
-    if(ha->dwAttrFlags & MPQ_ATTRIBUTE_CRC32)
-    {
-        LPDWORD ArrayCRC32 = (LPDWORD)pbAttrPtr;
-        DWORD cbArraySize = dwAttributesEntries * sizeof(DWORD);
-
-        // Verify if there's enough data
-        if((pbAttrPtr + cbArraySize) > pbAttrFileEnd)
-            return ERROR_FILE_CORRUPT;
-
-        BSWAP_ARRAY32_UNSIGNED(ArrayCRC32, cbCRC32Size);
-        for(i = 0; i < dwAttributesEntries; i++)
-            ha->pFileTable[i].dwCrc32 = ArrayCRC32[i];
-        pbAttrPtr += cbArraySize;
-    }
-
-    // Load the FILETIME (if present)
-    if(ha->dwAttrFlags & MPQ_ATTRIBUTE_FILETIME)
-    {
-        ULONGLONG * ArrayFileTime = (ULONGLONG *)pbAttrPtr;
-        DWORD cbArraySize = dwAttributesEntries * sizeof(ULONGLONG);
-
-        // Verify if there's enough data
-        if((pbAttrPtr + cbArraySize) > pbAttrFileEnd)
-            return ERROR_FILE_CORRUPT;
-
-        BSWAP_ARRAY64_UNSIGNED(ArrayFileTime, cbFileTimeSize);
-        for(i = 0; i < dwAttributesEntries; i++)
-            ha->pFileTable[i].FileTime = ArrayFileTime[i];
-        pbAttrPtr += cbArraySize;
-    }
-
-    // Load the MD5 (if present)
-    if(ha->dwAttrFlags & MPQ_ATTRIBUTE_MD5)
-    {
-        LPBYTE ArrayMd5 = pbAttrPtr;
-        DWORD cbArraySize = dwAttributesEntries * MD5_DIGEST_SIZE;
-
-        // Verify if there's enough data
-        if((pbAttrPtr + cbArraySize) > pbAttrFileEnd)
-            return ERROR_FILE_CORRUPT;
-
-        for(i = 0; i < dwAttributesEntries; i++)
-        {
-            memcpy(ha->pFileTable[i].md5, ArrayMd5, MD5_DIGEST_SIZE);
-            ArrayMd5 += MD5_DIGEST_SIZE;
-        }
-        pbAttrPtr += cbArraySize;
-    }
-
-    // Read the patch bit for each file (if present)
-    if(ha->dwAttrFlags & MPQ_ATTRIBUTE_PATCH_BIT)
-    {
-        LPBYTE pbBitArray = pbAttrPtr;
-        DWORD cbArraySize = (dwAttributesEntries + 7) / 8;
-        DWORD dwByteIndex = 0;
-        DWORD dwBitMask = 0x80;
-
-        // Verify if there's enough data
-        if((pbAttrPtr + cbArraySize) == pbAttrFileEnd)
-        {
-            for(i = 0; i < dwAttributesEntries; i++)
-            {
-                ha->pFileTable[i].dwFlags |= (pbBitArray[dwByteIndex] & dwBitMask) ? MPQ_FILE_PATCH_FILE : 0;
-                dwByteIndex += (dwBitMask & 0x01);
-                dwBitMask = (dwBitMask << 0x07) | (dwBitMask >> 0x01);
-            }
-        }
-    }
-
-    return ERROR_SUCCESS;
-}
-
-static LPBYTE CreateAttributesFile(TMPQArchive * ha, DWORD * pcbAttrFile)
-{
-    PMPQ_ATTRIBUTES_HEADER pAttrHeader;
-    TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-    TFileEntry * pFileEntry;
-    LPBYTE pbAttrFile;
-    LPBYTE pbAttrPtr;
-    size_t cbAttrFile;
-    DWORD dwFinalEntries = ha->dwFileTableSize + ha->dwReservedFiles;
-
-    // Check if we need patch bits in the (attributes) file
-    for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-    {
-        if(pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE)
-        {
-            ha->dwAttrFlags |= MPQ_ATTRIBUTE_PATCH_BIT;
-            break;
-        }
-    }
-
-    // Allocate the buffer for holding the entire (attributes)
-    // Allodate 1 byte more (See GetSizeOfAttributesFile for more info)
-    cbAttrFile = GetSizeOfAttributesFile(ha->dwAttrFlags, dwFinalEntries);
-    pbAttrFile = pbAttrPtr = STORM_ALLOC(BYTE, cbAttrFile + 1);
-    if(pbAttrFile != NULL)
-    {
-        // Make sure it's all zeroed
-        memset(pbAttrFile, 0, cbAttrFile + 1);
-
-        // Write the header of the (attributes) file
-        pAttrHeader = (PMPQ_ATTRIBUTES_HEADER)pbAttrPtr;
-        pAttrHeader->dwVersion = BSWAP_INT32_UNSIGNED(100);
-        pAttrHeader->dwFlags   = BSWAP_INT32_UNSIGNED((ha->dwAttrFlags & MPQ_ATTRIBUTE_ALL));
-        pbAttrPtr = (LPBYTE)(pAttrHeader + 1);
-
-        // Write the array of CRC32, if present
-        if(ha->dwAttrFlags & MPQ_ATTRIBUTE_CRC32)
-        {
-            LPDWORD pArrayCRC32 = (LPDWORD)pbAttrPtr;
-
-            // Copy from file table
-            for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-                *pArrayCRC32++ = BSWAP_INT32_UNSIGNED(pFileEntry->dwCrc32);
-
-            // Skip the reserved entries
-            pbAttrPtr = (LPBYTE)(pArrayCRC32 + ha->dwReservedFiles);
-        }
-
-        // Write the array of file time
-        if(ha->dwAttrFlags & MPQ_ATTRIBUTE_FILETIME)
-        {
-            ULONGLONG * pArrayFileTime = (ULONGLONG *)pbAttrPtr;
-
-            // Copy from file table
-            for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-                *pArrayFileTime++ = BSWAP_INT64_UNSIGNED(pFileEntry->FileTime);
-
-            // Skip the reserved entries
-            pbAttrPtr = (LPBYTE)(pArrayFileTime + ha->dwReservedFiles);
-        }
-
-        // Write the array of MD5s
-        if(ha->dwAttrFlags & MPQ_ATTRIBUTE_MD5)
-        {
-            LPBYTE pbArrayMD5 = pbAttrPtr;
-
-            // Copy from file table
-            for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-            {
-                memcpy(pbArrayMD5, pFileEntry->md5, MD5_DIGEST_SIZE);
-                pbArrayMD5 += MD5_DIGEST_SIZE;
-            }
-
-            // Skip the reserved items
-            pbAttrPtr = pbArrayMD5 + (ha->dwReservedFiles * MD5_DIGEST_SIZE);
-        }
-
-        // Write the array of patch bits
-        if(ha->dwAttrFlags & MPQ_ATTRIBUTE_PATCH_BIT)
-        {
-            LPBYTE pbBitArray = pbAttrPtr;
-            DWORD dwByteIndex = 0;
-            BYTE dwBitMask = 0x80;
-
-            // Copy from file table
-            for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-            {
-                // Set the bit, if needed
-                if(pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE)
-                    pbBitArray[dwByteIndex] |= dwBitMask;
-
-                // Update bit index and bit mask
-                dwByteIndex += (dwBitMask & 0x01);
-                dwBitMask = (dwBitMask << 0x07) | (dwBitMask >> 0x01);
-            }
-
-            // Having incremented the bit array just by the number of items in the file table
-            // will create the bit array one byte less of the number of files is a multiplier of 8).
-            // Blizzard MPQs have the same feature.
-
-            // Move past the bit array
-            pbAttrPtr = (pbBitArray + dwByteIndex) + ((dwBitMask & 0x7F) ? 1 : 0);
-        }
-
-        // Now we expect that current position matches the estimated size
-        // Note that if there is 1 extra bit above the byte size,
-        // the table is actually 1 byte shorted in Blizzard MPQs. See GetSizeOfAttributesFile
-        assert((size_t)(pbAttrPtr - pbAttrFile) == cbAttrFile);
-    }
-
-    // Give away the attributes file
-    if(pcbAttrFile != NULL)
-        *pcbAttrFile = (DWORD)cbAttrFile;
-    return pbAttrFile;
-}
-
 //-----------------------------------------------------------------------------
 // Public functions (internal use by StormLib)
 
 int SAttrLoadAttributes(TMPQArchive * ha)
 {
+    MPQ_ATTRIBUTES_HEADER AttrHeader;
     HANDLE hFile = NULL;
-    LPBYTE pbAttrFile;
+    DWORD dwBlockTableSize = ha->pHeader->dwBlockTableSize;
+    DWORD dwArraySize;
     DWORD dwBytesRead;
-    DWORD cbAttrFile = 0;
-    int nError = ERROR_FILE_CORRUPT;
+    DWORD i;
+    int nError = ERROR_SUCCESS;
 
     // File table must be initialized
     assert(ha->pFileTable != NULL);
 
-    // Don't load the attributes file from malformed Warcraft III maps
-    if(ha->dwFlags & MPQ_FLAG_MALFORMED)
-        return ERROR_FILE_CORRUPT;
-
     // Attempt to open the "(attributes)" file.
+    // If it's not there, then the archive doesn't support attributes
     if(SFileOpenFileEx((HANDLE)ha, ATTRIBUTES_NAME, SFILE_OPEN_ANY_LOCALE, &hFile))
     {
-        // Retrieve and check size of the (attributes) file
-        cbAttrFile = SFileGetFileSize(hFile, NULL);
+        // Load the content of the attributes file
+        SFileReadFile(hFile, &AttrHeader, sizeof(MPQ_ATTRIBUTES_HEADER), &dwBytesRead, NULL);
+        if(dwBytesRead != sizeof(MPQ_ATTRIBUTES_HEADER))
+            nError = ERROR_FILE_CORRUPT;
 
-        // Size of the (attributes) might be 1 byte less than expected
-        // See GetSizeOfAttributesFile for more info
-        pbAttrFile = STORM_ALLOC(BYTE, cbAttrFile + 1);
-        if(pbAttrFile != NULL)
+        // Verify the header of the (attributes) file
+        if(nError == ERROR_SUCCESS)
         {
-            // Set the last byte to 0 in case the size should be 1 byte greater
-            pbAttrFile[cbAttrFile] = 0;
-
-            // Load the entire file to memory
-            SFileReadFile(hFile, pbAttrFile, cbAttrFile, &dwBytesRead, NULL);
-            if(dwBytesRead == cbAttrFile)
-                nError = LoadAttributesFile(ha, pbAttrFile, cbAttrFile);
-
-            // Free the buffer
-            STORM_FREE(pbAttrFile);
+            AttrHeader.dwVersion = BSWAP_INT32_UNSIGNED(AttrHeader.dwVersion);
+            AttrHeader.dwFlags   = BSWAP_INT32_UNSIGNED(AttrHeader.dwFlags);
+            ha->dwAttrFlags      = AttrHeader.dwFlags;
+            if(dwBytesRead != sizeof(MPQ_ATTRIBUTES_HEADER))
+                nError = ERROR_FILE_CORRUPT;
         }
 
-        // Close the attributes file
+        // Verify format of the attributes
+        if(nError == ERROR_SUCCESS)
+        {
+            if(AttrHeader.dwVersion > MPQ_ATTRIBUTES_V1)
+                nError = ERROR_BAD_FORMAT;
+        }
+
+        // Load the CRC32 (if any)
+        if(nError == ERROR_SUCCESS && (AttrHeader.dwFlags & MPQ_ATTRIBUTE_CRC32))
+        {
+            LPDWORD pArrayCRC32 = STORM_ALLOC(DWORD, dwBlockTableSize);
+
+            if(pArrayCRC32 != NULL)
+            {
+                dwArraySize = dwBlockTableSize * sizeof(DWORD);
+                SFileReadFile(hFile, pArrayCRC32, dwArraySize, &dwBytesRead, NULL);
+                if(dwBytesRead == dwArraySize)
+                {
+                    for(i = 0; i < dwBlockTableSize; i++)
+                        ha->pFileTable[i].dwCrc32 = BSWAP_INT32_UNSIGNED(pArrayCRC32[i]);
+                }
+                else
+                    nError = ERROR_FILE_CORRUPT;
+
+                STORM_FREE(pArrayCRC32);
+            }
+            else
+                nError = ERROR_NOT_ENOUGH_MEMORY;
+        }
+
+        // Read the array of file times
+        if(nError == ERROR_SUCCESS && (AttrHeader.dwFlags & MPQ_ATTRIBUTE_FILETIME))
+        {
+            ULONGLONG * pArrayFileTime = STORM_ALLOC(ULONGLONG, dwBlockTableSize);
+
+            if(pArrayFileTime != NULL)
+            {
+                dwArraySize = dwBlockTableSize * sizeof(ULONGLONG);
+                SFileReadFile(hFile, pArrayFileTime, dwArraySize, &dwBytesRead, NULL);
+                if(dwBytesRead == dwArraySize)
+                {
+                    for(i = 0; i < dwBlockTableSize; i++)
+                        ha->pFileTable[i].FileTime = BSWAP_INT64_UNSIGNED(pArrayFileTime[i]);
+                }
+                else
+                    nError = ERROR_FILE_CORRUPT;
+
+                STORM_FREE(pArrayFileTime);
+            }
+            else
+                nError = ERROR_NOT_ENOUGH_MEMORY;
+        }
+
+        // Read the MD5 (if any)
+        // Note: MD5 array can be incomplete, if it's the last array in the (attributes)
+        if(nError == ERROR_SUCCESS && (AttrHeader.dwFlags & MPQ_ATTRIBUTE_MD5))
+        {
+            unsigned char * pArrayMD5 = STORM_ALLOC(unsigned char, (dwBlockTableSize * MD5_DIGEST_SIZE));
+            unsigned char * md5;
+
+            if(pArrayMD5 != NULL)
+            {
+                dwArraySize = dwBlockTableSize * MD5_DIGEST_SIZE;
+                SFileReadFile(hFile, pArrayMD5, dwArraySize, &dwBytesRead, NULL);
+                if(dwBytesRead == dwArraySize)
+                {
+                    md5 = pArrayMD5;
+                    for(i = 0; i < dwBlockTableSize; i++)
+                    {
+                        memcpy(ha->pFileTable[i].md5, md5, MD5_DIGEST_SIZE);
+                        md5 += MD5_DIGEST_SIZE;
+                    }
+                }
+                else
+                    nError = ERROR_FILE_CORRUPT;
+
+                STORM_FREE(pArrayMD5);
+            }
+            else
+                nError = ERROR_NOT_ENOUGH_MEMORY;
+        }
+
+        // Read the patch bit for each file
+        if(nError == ERROR_SUCCESS && (AttrHeader.dwFlags & MPQ_ATTRIBUTE_PATCH_BIT))
+        {
+            LPBYTE pbBitArray;
+            DWORD dwByteSize = ((dwBlockTableSize - 1) / 8) + 1;
+
+            pbBitArray = STORM_ALLOC(BYTE, dwByteSize);
+            if(pbBitArray != NULL)
+            {
+                SFileReadFile(hFile, pbBitArray, dwByteSize, &dwBytesRead, NULL);
+                if(dwBytesRead == dwByteSize)
+                {
+                    for(i = 0; i < dwBlockTableSize; i++)
+                    {
+                        DWORD dwByteIndex = i / 8;
+                        DWORD dwBitMask = 0x80 >> (i & 7);
+
+                        // Is the appropriate bit set?
+                        if(pbBitArray[dwByteIndex] & dwBitMask)
+                        {
+                            // At the moment, we assume that the patch bit is present
+                            // in both file table and (attributes)
+                            assert((ha->pFileTable[i].dwFlags & MPQ_FILE_PATCH_FILE) != 0);
+                            ha->pFileTable[i].dwFlags |= MPQ_FILE_PATCH_FILE;
+                        }
+                    }
+                }
+                else
+                    nError = ERROR_FILE_CORRUPT;
+
+                STORM_FREE(pbBitArray);
+            }
+        }
+
+        //
+        // Note: Version 7.00 of StormLib saved the (attributes) incorrectly.
+        // Sometimes, number of entries in the (attributes) was 1 item less
+        // than block table size.
+        // If we encounter such table, we will zero all three arrays
+        //
+
+        if(nError != ERROR_SUCCESS)
+            ha->dwAttrFlags = 0;
+
+        // Cleanup & exit
         SFileCloseFile(hFile);
     }
-
     return nError;
 }
 
-// Saves the (attributes) to the MPQ
 int SAttrFileSaveToMpq(TMPQArchive * ha)
 {
+    MPQ_ATTRIBUTES_HEADER AttrHeader;
+    TFileEntry * pFileEntry;
     TMPQFile * hf = NULL;
-    LPBYTE pbAttrFile;
-    DWORD cbAttrFile = 0;
+    DWORD dwFinalBlockTableSize = ha->dwFileTableSize;
+    DWORD dwFileSize = 0;
+    DWORD dwToWrite;
+    DWORD i;
     int nError = ERROR_SUCCESS;
 
-    // Only save the attributes if we should do so
-    if(ha->dwFileFlags2 != 0)
+    // Now we have to check if we need patch bits in the (attributes)
+    if(nError == ERROR_SUCCESS)
     {
-        // At this point, we expect to have at least one reserved entry in the file table
-        assert(ha->dwFlags & MPQ_FLAG_ATTRIBUTES_INVALID);
-        assert(ha->dwReservedFiles >= 1);
-
-        // Create the raw data that is to be written to (attributes)
-        // Note: Blizzard MPQs have entries for (listfile) and (attributes),
-        // but they are filled empty
-        pbAttrFile = CreateAttributesFile(ha, &cbAttrFile);
-        if(pbAttrFile != NULL)
+        for(i = 0; i < ha->dwFileTableSize; i++)
         {
-            // We expect it to be nonzero size
-            assert(cbAttrFile != 0);
-
-            // Determine the real flags for (attributes)
-            if(ha->dwFileFlags2 == MPQ_FILE_EXISTS)
-                ha->dwFileFlags2 = GetDefaultSpecialFileFlags(cbAttrFile, ha->pHeader->wFormatVersion);
-
-            // Create the attributes file in the MPQ
-            nError = SFileAddFile_Init(ha, ATTRIBUTES_NAME,
-                                           0,
-                                           cbAttrFile,
-                                           LANG_NEUTRAL,
-                                           ha->dwFileFlags2 | MPQ_FILE_REPLACEEXISTING,
-                                          &hf);
-
-            // Write the attributes file raw data to it
-            if(nError == ERROR_SUCCESS)
+            if(ha->pFileTable[i].dwFlags & MPQ_FILE_PATCH_FILE)
             {
-                // Write the content of the attributes file to the MPQ
-                nError = SFileAddFile_Write(hf, pbAttrFile, cbAttrFile, MPQ_COMPRESSION_ZLIB);
-                SFileAddFile_Finish(hf);
+                ha->dwAttrFlags |= MPQ_ATTRIBUTE_PATCH_BIT;
+                break;
             }
-
-            // Free the attributes buffer
-            STORM_FREE(pbAttrFile);
-        }
-        else
-        {
-            // If the list file is empty, we assume ERROR_SUCCESS
-            nError = (cbAttrFile == 0) ? ERROR_SUCCESS : ERROR_NOT_ENOUGH_MEMORY;
-        }
-
-        // If the save process succeeded, we clear the MPQ_FLAG_ATTRIBUTE_INVALID flag
-        if(nError == ERROR_SUCCESS)
-        {
-            ha->dwFlags &= ~MPQ_FLAG_ATTRIBUTES_INVALID;
-            ha->dwReservedFiles--;
         }
     }
-    
+
+    // If the (attributes) is not in the file table yet,
+    // we have to increase the final block table size
+    pFileEntry = GetFileEntryExact(ha, ATTRIBUTES_NAME, LANG_NEUTRAL);
+    if(pFileEntry != NULL)
+    {
+        // If "(attributes)" file exists, and it's set to 0, then remove it
+        if(ha->dwAttrFlags == 0)
+        {
+            FreeFileEntry(ha, pFileEntry);
+            return ERROR_SUCCESS;
+        }
+    }
+    else
+    {
+        // If we don't want to create file atributes, do nothing
+        if(ha->dwAttrFlags == 0)
+            return ERROR_SUCCESS;
+
+        // Check where the file entry is going to be allocated.
+        // If at the end of the file table, we have to increment
+        // the expected size of the (attributes) file.
+        pFileEntry = FindFreeFileEntry(ha);
+        if(pFileEntry == ha->pFileTable + ha->dwFileTableSize)
+            dwFinalBlockTableSize++;
+    }
+
+    // Calculate the size of the attributes file
+    if(nError == ERROR_SUCCESS)
+    {
+        dwFileSize = sizeof(MPQ_ATTRIBUTES_HEADER);         // Header
+        if(ha->dwAttrFlags & MPQ_ATTRIBUTE_CRC32)
+            dwFileSize += dwFinalBlockTableSize * sizeof(DWORD);
+        if(ha->dwAttrFlags & MPQ_ATTRIBUTE_FILETIME)
+            dwFileSize += dwFinalBlockTableSize * sizeof(ULONGLONG);
+        if(ha->dwAttrFlags & MPQ_ATTRIBUTE_MD5)
+            dwFileSize += dwFinalBlockTableSize * MD5_DIGEST_SIZE;
+        if(ha->dwAttrFlags & MPQ_ATTRIBUTE_PATCH_BIT)
+            dwFileSize += ((dwFinalBlockTableSize - 1)) / 8 + 1;
+    }
+
+    // Determine the flags for (attributes)
+    if(ha->dwFileFlags2 == 0)
+        ha->dwFileFlags2 = GetDefaultSpecialFileFlags(ha, dwFileSize);
+
+    // Create the attributes file in the MPQ
+    nError = SFileAddFile_Init(ha, ATTRIBUTES_NAME,
+                               0,
+                               dwFileSize,
+                               LANG_NEUTRAL,
+                               ha->dwFileFlags2 | MPQ_FILE_REPLACEEXISTING,
+                               &hf);
+
+    // Write all parts of the (attributes) file
+    if(nError == ERROR_SUCCESS)
+    {
+        assert(ha->dwFileTableSize == dwFinalBlockTableSize);
+
+        // Note that we don't know what the new bit (0x08) means.
+        AttrHeader.dwVersion = BSWAP_INT32_UNSIGNED(100);
+        AttrHeader.dwFlags   = BSWAP_INT32_UNSIGNED((ha->dwAttrFlags & MPQ_ATTRIBUTE_ALL));
+        dwToWrite = sizeof(MPQ_ATTRIBUTES_HEADER);
+        nError = SFileAddFile_Write(hf, &AttrHeader, dwToWrite, MPQ_COMPRESSION_ZLIB);
+    }
+
+    // Write the array of CRC32
+    if(nError == ERROR_SUCCESS && (ha->dwAttrFlags & MPQ_ATTRIBUTE_CRC32))
+    {
+        LPDWORD pArrayCRC32 = STORM_ALLOC(DWORD, dwFinalBlockTableSize);
+
+        if(pArrayCRC32 != NULL)
+        {
+            // Copy from file table
+            for(i = 0; i < ha->dwFileTableSize; i++)
+                pArrayCRC32[i] = BSWAP_INT32_UNSIGNED(ha->pFileTable[i].dwCrc32);
+
+            dwToWrite = ha->dwFileTableSize * sizeof(DWORD);
+            nError = SFileAddFile_Write(hf, pArrayCRC32, dwToWrite, MPQ_COMPRESSION_ZLIB);
+            STORM_FREE(pArrayCRC32);
+        }
+    }
+
+    // Write the array of file time
+    if(nError == ERROR_SUCCESS && (ha->dwAttrFlags & MPQ_ATTRIBUTE_FILETIME))
+    {
+        ULONGLONG * pArrayFileTime = STORM_ALLOC(ULONGLONG, ha->dwFileTableSize);
+
+        if(pArrayFileTime != NULL)
+        {
+            // Copy from file table
+            for(i = 0; i < ha->dwFileTableSize; i++)
+                pArrayFileTime[i] = BSWAP_INT64_UNSIGNED(ha->pFileTable[i].FileTime);
+
+            dwToWrite = ha->dwFileTableSize * sizeof(ULONGLONG);
+            nError = SFileAddFile_Write(hf, pArrayFileTime, dwToWrite, MPQ_COMPRESSION_ZLIB);
+            STORM_FREE(pArrayFileTime);
+        }
+    }
+
+    // Write the array of MD5s
+    if(nError == ERROR_SUCCESS && (ha->dwAttrFlags & MPQ_ATTRIBUTE_MD5))
+    {
+        char * pArrayMD5 = STORM_ALLOC(char, ha->dwFileTableSize * MD5_DIGEST_SIZE);
+
+        if(pArrayMD5 != NULL)
+        {
+            // Copy from file table
+            for(i = 0; i < ha->dwFileTableSize; i++)
+                memcpy(&pArrayMD5[i * MD5_DIGEST_SIZE], ha->pFileTable[i].md5, MD5_DIGEST_SIZE);
+
+            dwToWrite = ha->dwFileTableSize * MD5_DIGEST_SIZE;
+            nError = SFileAddFile_Write(hf, pArrayMD5, dwToWrite, MPQ_COMPRESSION_ZLIB);
+            STORM_FREE(pArrayMD5);
+        }
+    }
+
+    // Write the array of patch bits
+    if(nError == ERROR_SUCCESS && (ha->dwAttrFlags & MPQ_ATTRIBUTE_PATCH_BIT))
+    {
+        LPBYTE pbBitArray;
+        DWORD dwByteSize = ((ha->dwFileTableSize - 1) / 8) + 1;
+
+        pbBitArray = STORM_ALLOC(BYTE, dwByteSize);
+        if(pbBitArray != NULL)
+        {
+            memset(pbBitArray, 0, dwByteSize);
+            for(i = 0; i < ha->dwFileTableSize; i++)
+            {
+                DWORD dwByteIndex = i / 8;
+                DWORD dwBitMask = 0x80 >> (i & 7);
+
+                if(ha->pFileTable[i].dwFlags & MPQ_FILE_PATCH_FILE)
+                    pbBitArray[dwByteIndex] |= dwBitMask;
+            }
+
+            nError = SFileAddFile_Write(hf, pbBitArray, dwByteSize, MPQ_COMPRESSION_ZLIB);
+            STORM_FREE(pbBitArray);
+        }
+    }
+
+    // Finalize the file in the archive
+    if(hf != NULL)
+    {
+        SFileAddFile_Finish(hf);
+    }
+
+    if(nError == ERROR_SUCCESS)
+        ha->dwFlags &= ~MPQ_FLAG_INV_ATTRIBUTES;
     return nError;
 }
 
@@ -479,7 +375,7 @@ DWORD WINAPI SFileGetAttributes(HANDLE hMpq)
     TMPQArchive * ha = (TMPQArchive *)hMpq;
 
     // Verify the parameters
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return SFILE_INVALID_ATTRIBUTES;
@@ -493,7 +389,7 @@ bool WINAPI SFileSetAttributes(HANDLE hMpq, DWORD dwFlags)
     TMPQArchive * ha = (TMPQArchive *)hMpq;
 
     // Verify the parameters
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return false;
@@ -538,12 +434,12 @@ bool WINAPI SFileUpdateFileAttributes(HANDLE hMpq, const char * szFileName)
     }
 
     // Attempt to open the file
-    if(!SFileOpenFileEx(hMpq, szFileName, SFILE_OPEN_BASE_FILE, &hFile))
+    if(!SFileOpenFileEx(hMpq, szFileName, SFILE_OPEN_FROM_MPQ, &hFile))
         return false;
 
     // Get the file size
     hf = (TMPQFile *)hFile;
-    dwTotalBytes = hf->pFileEntry->dwFileSize;
+    SFileGetFileInfo(hFile, SFILE_INFO_FILE_SIZE, &dwTotalBytes, sizeof(DWORD), NULL);
 
     // Initialize the CRC32 and MD5 contexts
     md5_init(&md5_state);
diff --git a/dep/StormLib/src/SFileCompactArchive.cpp b/dep/StormLib/src/SFileCompactArchive.cpp
index 238873cb5..46ae8be83 100644
--- a/dep/StormLib/src/SFileCompactArchive.cpp
+++ b/dep/StormLib/src/SFileCompactArchive.cpp
@@ -7,47 +7,26 @@
 /* --------  ----  ---  -------                                              */
 /* 14.04.03  1.00  Lad  Splitted from SFileCreateArchiveEx.cpp               */
 /* 19.11.03  1.01  Dan  Big endian handling                                  */
-/* 21.04.13  1.02  Dea  Compact callback now part of TMPQArchive             */
 /*****************************************************************************/
 
 #define __STORMLIB_SELF__
 #include "StormLib.h"
 #include "StormCommon.h"
 
+/*****************************************************************************/
+/* Local variables                                                           */
+/*****************************************************************************/
+
+static SFILE_COMPACT_CALLBACK CompactCB = NULL;
+static ULONGLONG CompactBytesProcessed = 0;
+static ULONGLONG CompactTotalBytes = 0;
+static void * pvUserData = NULL;
+
 /*****************************************************************************/
 /* Local functions                                                           */
 /*****************************************************************************/
 
-static int CheckIfAllFilesKnown(TMPQArchive * ha)
-{
-    TFileEntry * pFileTableEnd;
-    TFileEntry * pFileEntry;
-    DWORD dwBlockIndex = 0;
-    int nError = ERROR_SUCCESS;
-
-    // Verify the file table
-    if(nError == ERROR_SUCCESS)
-    {
-        pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-        for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++, dwBlockIndex++)
-        {
-            // If there is an existing entry in the file table, check its name
-            if(pFileEntry->dwFlags & MPQ_FILE_EXISTS)
-            {
-                // The name must be valid and must not be a pseudo-name
-                if(pFileEntry->szFileName == NULL || IsPseudoFileName(pFileEntry->szFileName, NULL))
-                {
-                    nError = ERROR_UNKNOWN_FILE_NAMES;
-                    break;
-                }
-            }
-        }
-    }
-
-    return nError;
-}
-
-static int CheckIfAllKeysKnown(TMPQArchive * ha, const char * szListFile, LPDWORD pFileKeys)
+static int CheckIfAllFilesKnown(TMPQArchive * ha, const char * szListFile, LPDWORD pFileKeys)
 {
     TFileEntry * pFileTableEnd;
     TFileEntry * pFileEntry;
@@ -55,11 +34,11 @@ static int CheckIfAllKeysKnown(TMPQArchive * ha, const char * szListFile, LPDWOR
     int nError = ERROR_SUCCESS;
 
     // Add the listfile to the MPQ
-    if(szListFile != NULL)
+    if(nError == ERROR_SUCCESS && szListFile != NULL)
     {
         // Notify the user
-        if(ha->pfnCompactCB != NULL)
-            ha->pfnCompactCB(ha->pvCompactUserData, CCB_CHECKING_FILES, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+        if(CompactCB != NULL)
+            CompactCB(pvUserData, CCB_CHECKING_FILES, CompactBytesProcessed, CompactTotalBytes);
 
         nError = SFileAddListFile((HANDLE)ha, szListFile);
     }
@@ -70,49 +49,30 @@ static int CheckIfAllKeysKnown(TMPQArchive * ha, const char * szListFile, LPDWOR
         pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
         for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++, dwBlockIndex++)
         {
-            // If the file exists and it's encrypted
             if(pFileEntry->dwFlags & MPQ_FILE_EXISTS)
             {
-                // If we know the name, we decrypt the file key from the file name
                 if(pFileEntry->szFileName != NULL && !IsPseudoFileName(pFileEntry->szFileName, NULL))
                 {
-                    // Give the key to the caller
-                    pFileKeys[dwBlockIndex] = DecryptFileKey(pFileEntry->szFileName,
-                                                             pFileEntry->ByteOffset,
-                                                             pFileEntry->dwFileSize,
-                                                             pFileEntry->dwFlags);
-                    continue;
-                }
-/*
-                // If the file has a nonzero size, we can try to read few bytes of data
-                // and force to detect the decryption key that way
-                if(pFileEntry->dwFileSize > 0x10)
-                {
-                    TMPQFile * hf = NULL;
-                    DWORD dwBytesRead = 0;
-                    DWORD FileData[4];
+                    DWORD dwFileKey = 0;
 
-                    // Create file handle where we load the sector offset table
-                    hf = CreateFileHandle(ha, pFileEntry);
-                    if(hf != NULL)
+                    // Resolve the file key. Use plain file name for it
+                    if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
                     {
-                        // Call one dummy load of the first 4 bytes.
-                        // This enforces loading all buffers and also detecting of the decryption key
-                        SFileReadFile((HANDLE)hf, FileData, sizeof(FileData), &dwBytesRead, NULL);
-                        pFileKeys[dwBlockIndex] = hf->dwFileKey;
-                        FreeFileHandle(hf);
+                        dwFileKey = DecryptFileKey(pFileEntry->szFileName,
+                                                   pFileEntry->ByteOffset,
+                                                   pFileEntry->dwFileSize,
+                                                   pFileEntry->dwFlags);
                     }
 
-                    // If we succeeded in reading 16 bytes from the file,
-                    // we also know the encryption key
-                    if(dwBytesRead == sizeof(FileData))
-                        continue;
+                    // Give the key to the caller
+                    if(pFileKeys != NULL)
+                        pFileKeys[dwBlockIndex] = dwFileKey;
+                }
+                else
+                {
+                    nError = ERROR_CAN_NOT_COMPLETE;
+                    break;
                 }
-*/
-                // We don't know the encryption key of this file,
-                // thus we cannot compact the file
-                nError = ERROR_UNKNOWN_FILE_NAMES;
-                break;
             }
         }
     }
@@ -121,11 +81,10 @@ static int CheckIfAllKeysKnown(TMPQArchive * ha, const char * szListFile, LPDWOR
 }
 
 static int CopyNonMpqData(
-    TMPQArchive * ha,
-    TFileStream * pSrcStream,
-    TFileStream * pTrgStream,
-    ULONGLONG & ByteOffset,
-    ULONGLONG & ByteCount)
+        TFileStream * pSrcStream,
+        TFileStream * pTrgStream,
+        ULONGLONG & ByteOffset,
+        ULONGLONG & ByteCount)
 {
     ULONGLONG DataSize = ByteCount;
     DWORD dwToRead;
@@ -155,10 +114,10 @@ static int CopyNonMpqData(
         }
 
         // Update the progress
-        if(ha->pfnCompactCB != NULL)
+        if(CompactCB != NULL)
         {
-            ha->CompactBytesProcessed += dwToRead;
-            ha->pfnCompactCB(ha->pvCompactUserData, CCB_COPYING_NON_MPQ_DATA, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+            CompactBytesProcessed += dwToRead;
+            CompactCB(pvUserData, CCB_COPYING_NON_MPQ_DATA, CompactBytesProcessed, CompactTotalBytes);
         }
 
         // Decrement the number of data to be copied
@@ -166,18 +125,18 @@ static int CopyNonMpqData(
         DataSize -= dwToRead;
     }
 
-    return nError;
+    return ERROR_SUCCESS;
 }
 
 // Copies all file sectors into another archive.
 static int CopyMpqFileSectors(
-    TMPQArchive * ha,
-    TMPQFile * hf,
-    TFileStream * pNewStream,
-    ULONGLONG MpqFilePos)               // MPQ file position in the new archive
+        TMPQArchive * ha,
+        TMPQFile * hf,
+        TFileStream * pNewStream)
 {
     TFileEntry * pFileEntry = hf->pFileEntry;
     ULONGLONG RawFilePos;               // Used for calculating sector offset in the old MPQ archive
+    ULONGLONG MpqFilePos;               // MPQ file position in the new archive
     DWORD dwBytesToCopy = pFileEntry->dwCmpSize;
     DWORD dwPatchSize = 0;              // Size of patch header
     DWORD dwFileKey1 = 0;               // File key used for decryption
@@ -185,7 +144,11 @@ static int CopyMpqFileSectors(
     DWORD dwCmpSize = 0;                // Compressed file size, including patch header
     int nError = ERROR_SUCCESS;
 
-    // Resolve decryption keys. Note that the file key given 
+    // Remember the position in the destination file
+    FileStream_GetPos(pNewStream, &MpqFilePos);
+    MpqFilePos -= ha->MpqPos;
+
+    // Resolve decryption keys. Note that the file key given
     // in the TMPQFile structure also includes the key adjustment
     if(nError == ERROR_SUCCESS && (pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED))
     {
@@ -211,11 +174,11 @@ static int CopyMpqFileSectors(
     // If we have to save sector offset table, do it.
     if(nError == ERROR_SUCCESS && hf->SectorOffsets != NULL)
     {
-        DWORD * SectorOffsetsCopy = STORM_ALLOC(DWORD, hf->SectorOffsets[0] / sizeof(DWORD));
+        DWORD * SectorOffsetsCopy = (DWORD *)STORM_ALLOC(BYTE, hf->SectorOffsets[0]);
         DWORD dwSectorOffsLen = hf->SectorOffsets[0];
 
         assert((pFileEntry->dwFlags & MPQ_FILE_SINGLE_UNIT) == 0);
-        assert(pFileEntry->dwFlags & MPQ_FILE_COMPRESS_MASK);
+        assert(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED);
 
         if(SectorOffsetsCopy == NULL)
             nError = ERROR_NOT_ENOUGH_MEMORY;
@@ -236,10 +199,10 @@ static int CopyMpqFileSectors(
         }
 
         // Update compact progress
-        if(ha->pfnCompactCB != NULL)
+        if(CompactCB != NULL)
         {
-            ha->CompactBytesProcessed += dwSectorOffsLen;
-            ha->pfnCompactCB(ha->pvCompactUserData, CCB_COMPACTING_FILES, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+            CompactBytesProcessed += dwSectorOffsLen;
+            CompactCB(pvUserData, CCB_COMPACTING_FILES, CompactBytesProcessed, CompactTotalBytes);
         }
 
         STORM_FREE(SectorOffsetsCopy);
@@ -267,7 +230,7 @@ static int CopyMpqFileSectors(
 
             // Calculate the raw file offset of the file sector
             CalculateRawSectorOffset(RawFilePos, hf, dwRawByteOffset);
-            
+
             // Read the file sector
             if(!FileStream_Read(ha->pStream, &RawFilePos, hf->pbFileSector, dwRawDataInSector))
             {
@@ -276,7 +239,7 @@ static int CopyMpqFileSectors(
             }
 
             // If necessary, re-encrypt the sector
-            // Note: Recompression is not necessary here. Unlike encryption, 
+            // Note: Recompression is not necessary here. Unlike encryption,
             // the compression does not depend on the position of the file in MPQ.
             if((pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED) && dwFileKey1 != dwFileKey2)
             {
@@ -294,10 +257,10 @@ static int CopyMpqFileSectors(
             }
 
             // Update compact progress
-            if(ha->pfnCompactCB != NULL)
+            if(CompactCB != NULL)
             {
-                ha->CompactBytesProcessed += dwRawDataInSector;
-                ha->pfnCompactCB(ha->pvCompactUserData, CCB_COMPACTING_FILES, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+                CompactBytesProcessed += dwRawDataInSector;
+                CompactCB(pvUserData, CCB_COMPACTING_FILES, CompactBytesProcessed, CompactTotalBytes);
             }
 
             // Adjust byte counts
@@ -322,10 +285,10 @@ static int CopyMpqFileSectors(
                 nError = GetLastError();
 
             // Update compact progress
-            if(ha->pfnCompactCB != NULL)
+            if(CompactCB != NULL)
             {
-                ha->CompactBytesProcessed += dwCrcLength;
-                ha->pfnCompactCB(ha->pvCompactUserData, CCB_COMPACTING_FILES, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+                CompactBytesProcessed += dwCrcLength;
+                CompactCB(pvUserData, CCB_COMPACTING_FILES, CompactBytesProcessed, CompactTotalBytes);
             }
 
             // Size of the CRC block is also included in the compressed file size
@@ -355,6 +318,7 @@ static int CopyMpqFileSectors(
 
             // Include these extra data in the compressed size
             dwCmpSize += dwBytesToCopy;
+            dwBytesToCopy = 0;
             STORM_FREE(pbExtraData);
         }
         else
@@ -364,30 +328,36 @@ static int CopyMpqFileSectors(
     // Write the MD5's of the raw file data, if needed
     if(nError == ERROR_SUCCESS && ha->pHeader->dwRawChunkSize != 0)
     {
-        nError = WriteMpqDataMD5(pNewStream, 
+        nError = WriteMpqDataMD5(pNewStream,
                                  ha->MpqPos + MpqFilePos,
                                  pFileEntry->dwCmpSize,
                                  ha->pHeader->dwRawChunkSize);
     }
 
-    // Verify the number of bytes written
+    // Update file position in the block table
     if(nError == ERROR_SUCCESS)
     {
         // At this point, number of bytes written should be exactly
         // the same like the compressed file size. If it isn't,
-        // there's something wrong (an unknown archive version, MPQ malformation, ...)
-        // 
+        // there's something wrong (an unknown archive version, MPQ protection, ...)
+        //
         // Note: Diablo savegames have very weird layout, and the file "hero"
         // seems to have improper compressed size. Instead of real compressed size,
         // the "dwCmpSize" member of the block table entry contains
         // uncompressed size of file data + size of the sector table.
         // If we compact the archive, Diablo will refuse to load the game
+        // Seems like some sort of protection to me.
         //
         // Note: Some patch files in WOW patches don't count the patch header
         // into compressed size
         //
 
-        if(!(dwCmpSize <= pFileEntry->dwCmpSize && pFileEntry->dwCmpSize <= dwCmpSize + dwPatchSize))
+        if(dwCmpSize <= pFileEntry->dwCmpSize && pFileEntry->dwCmpSize <= dwCmpSize + dwPatchSize)
+        {
+            // Note: DO NOT update the compressed size in the file entry, no matter how bad it is.
+            pFileEntry->ByteOffset = MpqFilePos;
+        }
+        else
         {
             nError = ERROR_FILE_CORRUPT;
             assert(false);
@@ -402,7 +372,6 @@ static int CopyMpqFiles(TMPQArchive * ha, LPDWORD pFileKeys, TFileStream * pNewS
     TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
     TFileEntry * pFileEntry;
     TMPQFile * hf = NULL;
-    ULONGLONG MpqFilePos;
     int nError = ERROR_SUCCESS;
 
     // Walk through all files and write them to the destination MPQ archive
@@ -410,66 +379,63 @@ static int CopyMpqFiles(TMPQArchive * ha, LPDWORD pFileKeys, TFileStream * pNewS
     {
         // Copy all the file sectors
         // Only do that when the file has nonzero size
-        if((pFileEntry->dwFlags & MPQ_FILE_EXISTS))
+        if((pFileEntry->dwFlags & MPQ_FILE_EXISTS) && pFileEntry->dwFileSize != 0)
         {
-            // Query the position where the destination file will be
-            FileStream_GetPos(pNewStream, &MpqFilePos);
-            MpqFilePos = MpqFilePos - ha->MpqPos;
+            // Allocate structure for the MPQ file
+            hf = CreateMpqFile(ha);
+            if(hf == NULL)
+                return ERROR_NOT_ENOUGH_MEMORY;
 
-            // Perform file copy ONLY if the file has nonzero size
-            if(pFileEntry->dwFileSize != 0)
+            // Store file entry
+            hf->pFileEntry = pFileEntry;
+
+            // Set the raw file position
+            hf->MpqFilePos = pFileEntry->ByteOffset;
+            hf->RawFilePos = ha->MpqPos + hf->MpqFilePos;
+
+            // Set the file decryption key
+            hf->dwFileKey = pFileKeys[pFileEntry - ha->pFileTable];
+            hf->dwDataSize = pFileEntry->dwFileSize;
+
+            // If the file is a patch file, load the patch header
+            if(pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE)
             {
-                // Allocate structure for the MPQ file
-                hf = CreateFileHandle(ha, pFileEntry);
-                if(hf == NULL)
-                    return ERROR_NOT_ENOUGH_MEMORY;
-
-                // Set the file decryption key
-                hf->dwFileKey = pFileKeys[pFileEntry - ha->pFileTable];
-
-                // If the file is a patch file, load the patch header
-                if(pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE)
-                {
-                    nError = AllocatePatchInfo(hf, true);
-                    if(nError != ERROR_SUCCESS)
-                        break;
-                }
-
-                // Allocate buffers for file sector and sector offset table
-                nError = AllocateSectorBuffer(hf);
+                nError = AllocatePatchInfo(hf, true);
                 if(nError != ERROR_SUCCESS)
                     break;
-
-                // Also allocate sector offset table and sector checksum table
-                nError = AllocateSectorOffsets(hf, true);
-                if(nError != ERROR_SUCCESS)
-                    break;
-
-                // Also load sector checksums, if any
-                if(pFileEntry->dwFlags & MPQ_FILE_SECTOR_CRC)
-                {
-                    nError = AllocateSectorChecksums(hf, false);
-                    if(nError != ERROR_SUCCESS)
-                        break;
-                }
-
-                // Copy all file sectors
-                nError = CopyMpqFileSectors(ha, hf, pNewStream, MpqFilePos);
-                if(nError != ERROR_SUCCESS)
-                    break;
-
-                // Free buffers. This also sets "hf" to NULL.
-                FreeFileHandle(hf);
             }
 
-            // Note: DO NOT update the compressed size in the file entry, no matter how bad it is.
-            pFileEntry->ByteOffset = MpqFilePos;
+            // Allocate buffers for file sector and sector offset table
+            nError = AllocateSectorBuffer(hf);
+            if(nError != ERROR_SUCCESS)
+                break;
+
+            // Also allocate sector offset table and sector checksum table
+            nError = AllocateSectorOffsets(hf, true);
+            if(nError != ERROR_SUCCESS)
+                break;
+
+            // Also load sector checksums, if any
+            if(pFileEntry->dwFlags & MPQ_FILE_SECTOR_CRC)
+            {
+                nError = AllocateSectorChecksums(hf, false);
+                if(nError != ERROR_SUCCESS)
+                    break;
+            }
+
+            // Copy all file sectors
+            nError = CopyMpqFileSectors(ha, hf, pNewStream);
+            if(nError != ERROR_SUCCESS)
+                break;
+
+            // Free buffers. This also sets "hf" to NULL.
+            FreeMPQFile(hf);
         }
     }
 
     // Cleanup and exit
     if(hf != NULL)
-        FreeFileHandle(hf);
+        FreeMPQFile(hf);
     return nError;
 }
 
@@ -478,18 +444,10 @@ static int CopyMpqFiles(TMPQArchive * ha, LPDWORD pFileKeys, TFileStream * pNewS
 /* Public functions                                                          */
 /*****************************************************************************/
 
-bool WINAPI SFileSetCompactCallback(HANDLE hMpq, SFILE_COMPACT_CALLBACK pfnCompactCB, void * pvUserData)
+bool WINAPI SFileSetCompactCallback(HANDLE /* hMpq */, SFILE_COMPACT_CALLBACK aCompactCB, void * pvData)
 {
-    TMPQArchive * ha = (TMPQArchive *) hMpq;
-
-    if (!IsValidMpqHandle(hMpq))
-    {
-        SetLastError(ERROR_INVALID_HANDLE);
-        return false;
-    }
-
-    ha->pfnCompactCB = pfnCompactCB;
-    ha->pvCompactUserData = pvUserData;
+    CompactCB = aCompactCB;
+    pvUserData = pvData;
     return true;
 }
 
@@ -508,7 +466,7 @@ bool WINAPI SFileCompactArchive(HANDLE hMpq, const char * szListFile, bool /* bR
     int nError = ERROR_SUCCESS;
 
     // Test the valid parameters
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
         nError = ERROR_INVALID_HANDLE;
     if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
         nError = ERROR_ACCESS_DENIED;
@@ -533,9 +491,9 @@ bool WINAPI SFileCompactArchive(HANDLE hMpq, const char * szListFile, bool /* bR
     if(nError == ERROR_SUCCESS)
     {
         // Initialize the progress variables for compact callback
-        FileStream_GetSize(ha->pStream, &(ha->CompactTotalBytes));
-        ha->CompactBytesProcessed = 0;
-        nError = CheckIfAllKeysKnown(ha, szListFile, pFileKeys);
+        FileStream_GetSize(ha->pStream, &CompactTotalBytes);
+        CompactBytesProcessed = 0;
+        nError = CheckIfAllFilesKnown(ha, szListFile, pFileKeys);
     }
 
     // Get the temporary file name and create it
@@ -547,7 +505,7 @@ bool WINAPI SFileCompactArchive(HANDLE hMpq, const char * szListFile, bool /* bR
         else
             _tcscat(szTempFile, _T("_"));
 
-        pTempStream = FileStream_CreateFile(szTempFile, STREAM_PROVIDER_FLAT | BASE_PROVIDER_FILE);
+        pTempStream = FileStream_CreateFile(szTempFile, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
         if(pTempStream == NULL)
             nError = GetLastError();
     }
@@ -556,12 +514,12 @@ bool WINAPI SFileCompactArchive(HANDLE hMpq, const char * szListFile, bool /* bR
     if(nError == ERROR_SUCCESS && ha->UserDataPos != 0)
     {
         // Inform the application about the progress
-        if(ha->pfnCompactCB != NULL)
-            ha->pfnCompactCB(ha->pvCompactUserData, CCB_COPYING_NON_MPQ_DATA, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+        if(CompactCB != NULL)
+            CompactCB(pvUserData, CCB_COPYING_NON_MPQ_DATA, CompactBytesProcessed, CompactTotalBytes);
 
         ByteOffset = 0;
         ByteCount = ha->UserDataPos;
-        nError = CopyNonMpqData(ha, ha->pStream, pTempStream, ByteOffset, ByteCount);
+        nError = CopyNonMpqData(ha->pStream, pTempStream, ByteOffset, ByteCount);
     }
 
     // Write the MPQ user data (if any)
@@ -575,50 +533,35 @@ bool WINAPI SFileCompactArchive(HANDLE hMpq, const char * szListFile, bool /* bR
 
         assert(ha->pUserData != NULL);
         assert(ha->pUserData->dwHeaderOffs == ByteCount);
-        nError = CopyNonMpqData(ha, ha->pStream, pTempStream, ByteOffset, ByteCount);
+        nError = CopyNonMpqData(ha->pStream, pTempStream, ByteOffset, ByteCount);
     }
 
     // Write the MPQ header
     if(nError == ERROR_SUCCESS)
     {
-        TMPQHeader SaveMpqHeader;
+        // Remember the header size before swapping
+        DWORD dwBytesToWrite = ha->pHeader->dwHeaderSize;
 
-        // Write the MPQ header to the file
-        memcpy(&SaveMpqHeader, ha->pHeader, ha->pHeader->dwHeaderSize);
-        BSWAP_TMPQHEADER(&SaveMpqHeader, MPQ_FORMAT_VERSION_1);
-        BSWAP_TMPQHEADER(&SaveMpqHeader, MPQ_FORMAT_VERSION_2);
-        BSWAP_TMPQHEADER(&SaveMpqHeader, MPQ_FORMAT_VERSION_3);
-        BSWAP_TMPQHEADER(&SaveMpqHeader, MPQ_FORMAT_VERSION_4);
-        if(!FileStream_Write(pTempStream, NULL, &SaveMpqHeader, ha->pHeader->dwHeaderSize))
+        BSWAP_TMPQHEADER(ha->pHeader);
+        if(!FileStream_Write(pTempStream, NULL, ha->pHeader, dwBytesToWrite))
             nError = GetLastError();
+        BSWAP_TMPQHEADER(ha->pHeader);
 
         // Update the progress
-        ha->CompactBytesProcessed += ha->pHeader->dwHeaderSize;
+        CompactBytesProcessed += ha->pHeader->dwHeaderSize;
     }
 
     // Now copy all files
-    if(nError == ERROR_SUCCESS)
-        nError = CopyMpqFiles(ha, pFileKeys, pTempStream);
-
-    // Defragment the file table
-    if(nError == ERROR_SUCCESS)
-        nError = RebuildFileTable(ha, ha->pHeader->dwHashTableSize, ha->dwMaxFileCount);
-
-    // We also need to rebuild the HET table, if any
     if(nError == ERROR_SUCCESS)
     {
-        // Invalidate (listfile) and (attributes)
-        InvalidateInternalFiles(ha);
-
-        // Rebuild the HET table, if we have any
-        if(ha->pHetTable != NULL)
-            nError = RebuildHetTable(ha);
+        nError = CopyMpqFiles(ha, pFileKeys, pTempStream);
+        ha->dwFlags |= MPQ_FLAG_CHANGED;
     }
 
     // If succeeded, switch the streams
     if(nError == ERROR_SUCCESS)
     {
-        if(FileStream_Replace(ha->pStream, pTempStream))
+        if(FileStream_Switch(ha->pStream, pTempStream))
             pTempStream = NULL;
         else
             nError = ERROR_CAN_NOT_COMPLETE;
@@ -630,17 +573,21 @@ bool WINAPI SFileCompactArchive(HANDLE hMpq, const char * szListFile, bool /* bR
         //
         // Note: We don't recalculate position of the MPQ tables at this point.
         // SaveMPQTables does it automatically.
-        // 
+        //
 
         nError = SaveMPQTables(ha);
-        if(nError == ERROR_SUCCESS && ha->pfnCompactCB != NULL)
+        if(nError == ERROR_SUCCESS && CompactCB != NULL)
         {
-            ha->CompactBytesProcessed += (ha->pHeader->dwHashTableSize * sizeof(TMPQHash));
-            ha->CompactBytesProcessed += (ha->pHeader->dwBlockTableSize * sizeof(TMPQBlock));
-            ha->pfnCompactCB(ha->pvCompactUserData, CCB_CLOSING_ARCHIVE, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+            CompactBytesProcessed += (ha->pHeader->dwHashTableSize * sizeof(TMPQHash));
+            CompactBytesProcessed += (ha->pHeader->dwBlockTableSize * sizeof(TMPQBlock));
+            CompactCB(pvUserData, CCB_CLOSING_ARCHIVE, CompactBytesProcessed, CompactTotalBytes);
         }
     }
 
+    // Invalidate the compact callback
+    pvUserData = NULL;
+    CompactCB = NULL;
+
     // Cleanup and return
     if(pTempStream != NULL)
         FileStream_Close(pTempStream);
@@ -663,48 +610,156 @@ DWORD WINAPI SFileGetMaxFileCount(HANDLE hMpq)
 
 bool WINAPI SFileSetMaxFileCount(HANDLE hMpq, DWORD dwMaxFileCount)
 {
+    TMPQHetTable * pOldHetTable = NULL;
     TMPQArchive * ha = (TMPQArchive *)hMpq;
-    DWORD dwNewHashTableSize = 0;
+    TFileEntry * pOldFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
+    TFileEntry * pOldFileTable = NULL;
+    TFileEntry * pOldFileEntry;
+    TFileEntry * pFileEntry;
+    TMPQHash * pOldHashTable = NULL;
+    DWORD dwOldHashTableSize = 0;
+    DWORD dwOldFileTableSize = 0;
     int nError = ERROR_SUCCESS;
 
     // Test the valid parameters
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
         nError = ERROR_INVALID_HANDLE;
     if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
         nError = ERROR_ACCESS_DENIED;
-    if(dwMaxFileCount < ha->dwFileTableSize)
+
+    // The new limit must not be lower than the index of the last file entry in the table
+    if(nError == ERROR_SUCCESS && ha->dwFileTableSize > dwMaxFileCount)
         nError = ERROR_DISK_FULL;
 
     // ALL file names must be known in order to be able
-    // to rebuild hash table
+    // to rebuild hash table size
     if(nError == ERROR_SUCCESS)
     {
-        nError = CheckIfAllFilesKnown(ha);
+        nError = CheckIfAllFilesKnown(ha, NULL, NULL);
     }
 
     // If the MPQ has a hash table, then we relocate the hash table
-    if(nError == ERROR_SUCCESS)
+    if(nError == ERROR_SUCCESS && ha->pHashTable != NULL)
     {
-        // Calculate the hash table size for the new file limit
-        dwNewHashTableSize = GetHashTableSizeForFileCount(dwMaxFileCount);
+        // Save parameters for the current hash table
+        dwOldHashTableSize = ha->pHeader->dwHashTableSize;
+        pOldHashTable = ha->pHashTable;
 
-        // Rebuild both file tables
-        nError = RebuildFileTable(ha, dwNewHashTableSize, dwMaxFileCount);
+        // Allocate new hash table
+        ha->pHeader->dwHashTableSize = GetHashTableSizeForFileCount(dwMaxFileCount);
+        ha->pHashTable = STORM_ALLOC(TMPQHash, ha->pHeader->dwHashTableSize);
+        if(ha->pHashTable != NULL)
+            memset(ha->pHashTable, 0xFF, ha->pHeader->dwHashTableSize * sizeof(TMPQHash));
+        else
+            nError = ERROR_NOT_ENOUGH_MEMORY;
     }
 
-    // We always have to rebuild the (attributes) file due to file table change
+    // If the MPQ has HET table, allocate new one as well
+    if(nError == ERROR_SUCCESS && ha->pHetTable != NULL)
+    {
+        // Save the original HET table
+        pOldHetTable = ha->pHetTable;
+
+        // Create new one
+        ha->pHetTable = CreateHetTable(dwMaxFileCount, 0x40, true);
+        if(ha->pHetTable == NULL)
+            nError = ERROR_NOT_ENOUGH_MEMORY;
+    }
+
+    // Now reallocate the file table
     if(nError == ERROR_SUCCESS)
     {
-        // Invalidate (listfile) and (attributes)
+        // Save the current file table
+        dwOldFileTableSize = ha->dwFileTableSize;
+        pOldFileTable = ha->pFileTable;
+
+        // Create new one
+        ha->pFileTable = STORM_ALLOC(TFileEntry, dwMaxFileCount);
+        if(ha->pFileTable != NULL)
+            memset(ha->pFileTable, 0, dwMaxFileCount * sizeof(TFileEntry));
+        else
+            nError = ERROR_NOT_ENOUGH_MEMORY;
+    }
+
+    // Now we have to build both classic hash table and HET table.
+    if(nError == ERROR_SUCCESS)
+    {
+        DWORD dwFileIndex = 0;
+        DWORD dwHashIndex = 0;
+
+        // Create new hash and HET entry for each file
+        pFileEntry = ha->pFileTable;
+        for(pOldFileEntry = pOldFileTable; pOldFileEntry < pOldFileTableEnd; pOldFileEntry++)
+        {
+            if(pOldFileEntry->dwFlags & MPQ_FILE_EXISTS)
+            {
+                // Copy the old file entry to the new one
+                memcpy(pFileEntry, pOldFileEntry, sizeof(TFileEntry));
+                assert(pFileEntry->szFileName != NULL);
+
+                // Create new entry in the hash table
+                if(ha->pHashTable != NULL)
+                {
+                    dwHashIndex = AllocateHashEntry(ha, pFileEntry);
+                    if(dwHashIndex == HASH_ENTRY_FREE)
+                    {
+                        nError = ERROR_CAN_NOT_COMPLETE;
+                        break;
+                    }
+                }
+
+                // Create new entry in the HET table, if needed
+                if(ha->pHetTable != NULL)
+                {
+                    dwHashIndex = AllocateHetEntry(ha, pFileEntry);
+                    if(dwHashIndex == HASH_ENTRY_FREE)
+                    {
+                        nError = ERROR_CAN_NOT_COMPLETE;
+                        break;
+                    }
+                }
+
+                // Move to the next file entry in the new table
+                pFileEntry++;
+                dwFileIndex++;
+            }
+        }
+    }
+
+    // Mark the archive as changed
+    // Note: We always have to rebuild the (attributes) file due to file table change
+    if(nError == ERROR_SUCCESS)
+    {
+        ha->dwMaxFileCount = dwMaxFileCount;
         InvalidateInternalFiles(ha);
+    }
+    else
+    {
+        // Revert the hash table
+        if(ha->pHashTable != NULL && pOldHashTable != NULL)
+        {
+            STORM_FREE(ha->pHashTable);
+            ha->pHeader->dwHashTableSize = dwOldHashTableSize;
+            ha->pHashTable = pOldHashTable;
+        }
 
-        // Rebuild the HET table, if we have any
-        if(ha->pHetTable != NULL)
-            nError = RebuildHetTable(ha);
+        // Revert the HET table
+        if(ha->pHetTable != NULL && pOldHetTable != NULL)
+        {
+            FreeHetTable(ha->pHetTable);
+            ha->pHetTable = pOldHetTable;
+        }
+
+        // Revert the file table
+        if(pOldFileTable != NULL)
+        {
+            STORM_FREE(ha->pFileTable);
+            ha->pFileTable = pOldFileTable;
+        }
+
+        SetLastError(nError);
     }
 
-    // Return the error
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
+    // Return the result
     return (nError == ERROR_SUCCESS);
 }
diff --git a/dep/StormLib/src/SFileCreateArchive.cpp b/dep/StormLib/src/SFileCreateArchive.cpp
index 206baffe7..3ce0c02b5 100644
--- a/dep/StormLib/src/SFileCreateArchive.cpp
+++ b/dep/StormLib/src/SFileCreateArchive.cpp
@@ -56,10 +56,7 @@ static int WriteNakedMPQHeader(TMPQArchive * ha)
     Header.wSectorSize    = pHeader->wSectorSize;
 
     // Write it to the file
-    BSWAP_TMPQHEADER(&Header, MPQ_FORMAT_VERSION_1);
-    BSWAP_TMPQHEADER(&Header, MPQ_FORMAT_VERSION_2);
-    BSWAP_TMPQHEADER(&Header, MPQ_FORMAT_VERSION_3);
-    BSWAP_TMPQHEADER(&Header, MPQ_FORMAT_VERSION_4);
+    BSWAP_TMPQHEADER(&Header);
     if(!FileStream_Write(ha->pStream, &ha->MpqPos, &Header, dwBytesToWrite))
         nError = GetLastError();
 
@@ -69,32 +66,19 @@ static int WriteNakedMPQHeader(TMPQArchive * ha)
 //-----------------------------------------------------------------------------
 // Creates a new MPQ archive.
 
-bool WINAPI SFileCreateArchive(const TCHAR * szMpqName, DWORD dwCreateFlags, DWORD dwMaxFileCount, HANDLE * phMpq)
+bool WINAPI SFileCreateArchive(const TCHAR * szMpqName, DWORD dwFlags, DWORD dwMaxFileCount, HANDLE * phMpq)
 {
     SFILE_CREATE_MPQ CreateInfo;
 
     // Fill the create structure
     memset(&CreateInfo, 0, sizeof(SFILE_CREATE_MPQ));
     CreateInfo.cbSize         = sizeof(SFILE_CREATE_MPQ);
-    CreateInfo.dwMpqVersion   = (dwCreateFlags & MPQ_CREATE_ARCHIVE_VMASK) >> FLAGS_TO_FORMAT_SHIFT;
-    CreateInfo.dwStreamFlags  = STREAM_PROVIDER_FLAT | BASE_PROVIDER_FILE;
-    CreateInfo.dwFileFlags1   = (dwCreateFlags & MPQ_CREATE_LISTFILE)   ? MPQ_FILE_EXISTS : 0;
-    CreateInfo.dwFileFlags2   = (dwCreateFlags & MPQ_CREATE_ATTRIBUTES) ? MPQ_FILE_EXISTS : 0;
-    CreateInfo.dwFileFlags3   = (dwCreateFlags & MPQ_CREATE_SIGNATURE)  ? MPQ_FILE_EXISTS : 0;
-    CreateInfo.dwAttrFlags    = (dwCreateFlags & MPQ_CREATE_ATTRIBUTES) ? (MPQ_ATTRIBUTE_CRC32 | MPQ_ATTRIBUTE_FILETIME | MPQ_ATTRIBUTE_MD5) : 0;
+    CreateInfo.dwMpqVersion   = (dwFlags & MPQ_CREATE_ARCHIVE_VMASK) >> FLAGS_TO_FORMAT_SHIFT;
+    CreateInfo.dwStreamFlags  = STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE;
+    CreateInfo.dwAttrFlags    = (dwFlags & MPQ_CREATE_ATTRIBUTES) ? MPQ_ATTRIBUTE_ALL : 0;
     CreateInfo.dwSectorSize   = (CreateInfo.dwMpqVersion >= MPQ_FORMAT_VERSION_3) ? 0x4000 : 0x1000;
     CreateInfo.dwRawChunkSize = (CreateInfo.dwMpqVersion >= MPQ_FORMAT_VERSION_4) ? 0x4000 : 0;
     CreateInfo.dwMaxFileCount = dwMaxFileCount;
-
-    // Set the proper attribute parts
-    if((CreateInfo.dwMpqVersion >= MPQ_FORMAT_VERSION_3) && (dwCreateFlags & MPQ_CREATE_ATTRIBUTES))
-        CreateInfo.dwAttrFlags |= MPQ_ATTRIBUTE_PATCH_BIT;
-
-    // Backward compatibility: SFileCreateArchive always used to add (listfile)
-    // We would break loads of applications if we change that
-    CreateInfo.dwFileFlags1 = MPQ_FILE_EXISTS;
-
-    // Let the main function create the archive
     return SFileCreateArchive2(szMpqName, &CreateInfo, phMpq);
 }
 
@@ -102,13 +86,11 @@ bool WINAPI SFileCreateArchive2(const TCHAR * szMpqName, PSFILE_CREATE_MPQ pCrea
 {
     TFileStream * pStream = NULL;           // File stream
     TMPQArchive * ha = NULL;                // MPQ archive handle
-    TMPQHeader * pHeader;
     ULONGLONG MpqPos = 0;                   // Position of MPQ header in the file
     HANDLE hMpq = NULL;
     DWORD dwBlockTableSize = 0;             // Initial block table size
     DWORD dwHashTableSize = 0;
-    DWORD dwReservedFiles = 0;              // Number of reserved file entries
-    DWORD dwMpqFlags = 0;
+    DWORD dwMaxFileCount;
     int nError = ERROR_SUCCESS;
 
     // Check the parameters, if they are valid
@@ -119,12 +101,13 @@ bool WINAPI SFileCreateArchive2(const TCHAR * szMpqName, PSFILE_CREATE_MPQ pCrea
     }
 
     // Verify if all variables in SFILE_CREATE_MPQ are correct
-    if((pCreateInfo->cbSize == 0 || pCreateInfo->cbSize > sizeof(SFILE_CREATE_MPQ))    ||
-       (pCreateInfo->dwMpqVersion > MPQ_FORMAT_VERSION_4)                              ||
-       (pCreateInfo->pvUserData != NULL || pCreateInfo->cbUserData != 0)               ||
-       (pCreateInfo->dwAttrFlags & ~MPQ_ATTRIBUTE_ALL)                                 ||
-       (pCreateInfo->dwSectorSize & (pCreateInfo->dwSectorSize - 1))                   ||
-       (pCreateInfo->dwRawChunkSize & (pCreateInfo->dwRawChunkSize - 1)))
+    if((pCreateInfo->cbSize == 0 || pCreateInfo->cbSize > sizeof(SFILE_CREATE_MPQ)) ||
+            (pCreateInfo->dwMpqVersion > MPQ_FORMAT_VERSION_4)                        ||
+            (pCreateInfo->pvUserData != NULL || pCreateInfo->cbUserData != 0)            ||
+            (pCreateInfo->dwAttrFlags & ~MPQ_ATTRIBUTE_ALL)                              ||
+            (pCreateInfo->dwSectorSize & (pCreateInfo->dwSectorSize - 1))                ||
+            (pCreateInfo->dwRawChunkSize & (pCreateInfo->dwRawChunkSize - 1))            ||
+            (pCreateInfo->dwMaxFileCount < 4))
     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return false;
@@ -135,7 +118,7 @@ bool WINAPI SFileCreateArchive2(const TCHAR * szMpqName, PSFILE_CREATE_MPQ pCrea
 
     // We verify if the file already exists and if it's a MPQ archive.
     // If yes, we won't allow to overwrite it.
-    if(SFileOpenArchive(szMpqName, 0, STREAM_PROVIDER_FLAT | BASE_PROVIDER_FILE | MPQ_OPEN_NO_ATTRIBUTES | MPQ_OPEN_NO_LISTFILE, &hMpq))
+    if(SFileOpenArchive(szMpqName, 0, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE | MPQ_OPEN_NO_ATTRIBUTES | MPQ_OPEN_NO_LISTFILE, &hMpq))
     {
         SFileCloseArchive(hMpq);
         SetLastError(ERROR_ALREADY_EXISTS);
@@ -156,29 +139,15 @@ bool WINAPI SFileCreateArchive2(const TCHAR * szMpqName, PSFILE_CREATE_MPQ pCrea
             return false;
     }
 
-    // Increment the maximum amount of files to have space for (listfile)
-    if(pCreateInfo->dwMaxFileCount && pCreateInfo->dwFileFlags1)
-    {
-        dwMpqFlags |= MPQ_FLAG_LISTFILE_INVALID;
-        dwReservedFiles++;
-    }
-
-    // Increment the maximum amount of files to have space for (attributes)
-    if(pCreateInfo->dwMaxFileCount && pCreateInfo->dwFileFlags2 && pCreateInfo->dwAttrFlags)
-    {
-        dwMpqFlags |= MPQ_FLAG_ATTRIBUTES_INVALID;
-        dwReservedFiles++;
-    }
-
-    // Increment the maximum amount of files to have space for (signature)
-    if(pCreateInfo->dwMaxFileCount && pCreateInfo->dwFileFlags3)
-    {
-        dwMpqFlags |= MPQ_FLAG_SIGNATURE_INVALID;
-        dwReservedFiles++;
-    }
+    // Increment the maximum amount of files to have space
+    // for listfile and attributes file
+    dwMaxFileCount = pCreateInfo->dwMaxFileCount;
+    if(pCreateInfo->dwAttrFlags != 0)
+        dwMaxFileCount++;
+    dwMaxFileCount++;
 
     // If file count is not zero, initialize the hash table size
-    dwHashTableSize = GetHashTableSizeForFileCount(pCreateInfo->dwMaxFileCount + dwReservedFiles);
+    dwHashTableSize = GetHashTableSizeForFileCount(dwMaxFileCount);
 
     // Retrieve the file size and round it up to 0x200 bytes
     FileStream_GetSize(pStream, &MpqPos);
@@ -186,9 +155,9 @@ bool WINAPI SFileCreateArchive2(const TCHAR * szMpqName, PSFILE_CREATE_MPQ pCrea
     if(!FileStream_SetSize(pStream, MpqPos))
         nError = GetLastError();
 
-#ifdef _DEBUG    
+#ifdef _DEBUG
     // Debug code, used for testing StormLib
-//  dwBlockTableSize = dwHashTableSize * 2;
+    //  dwBlockTableSize = dwHashTableSize * 2;
 #endif
 
     // Create the archive handle
@@ -202,21 +171,26 @@ bool WINAPI SFileCreateArchive2(const TCHAR * szMpqName, PSFILE_CREATE_MPQ pCrea
     if(nError == ERROR_SUCCESS)
     {
         memset(ha, 0, sizeof(TMPQArchive));
-        ha->pfnHashString   = HashString;
         ha->pStream         = pStream;
         ha->dwSectorSize    = pCreateInfo->dwSectorSize;
         ha->UserDataPos     = MpqPos;
         ha->MpqPos          = MpqPos;
-        ha->pHeader         = pHeader = (TMPQHeader *)ha->HeaderData;
-        ha->dwMaxFileCount  = dwHashTableSize;
+        ha->pHeader         = (TMPQHeader *)ha->HeaderData;
+        ha->dwMaxFileCount  = dwMaxFileCount;
         ha->dwFileTableSize = 0;
-        ha->dwReservedFiles = dwReservedFiles;
         ha->dwFileFlags1    = pCreateInfo->dwFileFlags1;
         ha->dwFileFlags2    = pCreateInfo->dwFileFlags2;
-        ha->dwFileFlags3    = pCreateInfo->dwFileFlags3 ? MPQ_FILE_EXISTS : 0;
+        ha->dwFlags         = 0;
+
+        // Setup the attributes
         ha->dwAttrFlags     = pCreateInfo->dwAttrFlags;
-        ha->dwFlags         = dwMpqFlags | MPQ_FLAG_CHANGED;
         pStream = NULL;
+    }
+
+    // Fill the MPQ header
+    if(nError == ERROR_SUCCESS)
+    {
+        TMPQHeader * pHeader = ha->pHeader;
 
         // Fill the MPQ header
         memset(pHeader, 0, sizeof(ha->HeaderData));
@@ -237,24 +211,27 @@ bool WINAPI SFileCreateArchive2(const TCHAR * szMpqName, PSFILE_CREATE_MPQ pCrea
 
         // Write the naked MPQ header
         nError = WriteNakedMPQHeader(ha);
+
+        // Remember that the (listfile) and (attributes) need to be saved
+        ha->dwFlags |= MPQ_FLAG_CHANGED | MPQ_FLAG_INV_LISTFILE | MPQ_FLAG_INV_ATTRIBUTES;
     }
 
     // Create initial HET table, if the caller required an MPQ format 3.0 or newer
-    if(nError == ERROR_SUCCESS && pCreateInfo->dwMpqVersion >= MPQ_FORMAT_VERSION_3 && pCreateInfo->dwMaxFileCount != 0)
+    if(nError == ERROR_SUCCESS && pCreateInfo->dwMpqVersion >= MPQ_FORMAT_VERSION_3)
     {
-        ha->pHetTable = CreateHetTable(ha->dwFileTableSize, 0, 0x40, NULL);
+        ha->pHetTable = CreateHetTable(ha->dwMaxFileCount, 0x40, true);
         if(ha->pHetTable == NULL)
             nError = ERROR_NOT_ENOUGH_MEMORY;
     }
 
     // Create initial hash table
-    if(nError == ERROR_SUCCESS && dwHashTableSize != 0)
+    if(nError == ERROR_SUCCESS)
     {
         nError = CreateHashTable(ha, dwHashTableSize);
     }
 
     // Create initial file table
-    if(nError == ERROR_SUCCESS && ha->dwMaxFileCount != 0)
+    if(nError == ERROR_SUCCESS)
     {
         ha->pFileTable = STORM_ALLOC(TFileEntry, ha->dwMaxFileCount);
         if(ha->pFileTable != NULL)
@@ -267,11 +244,11 @@ bool WINAPI SFileCreateArchive2(const TCHAR * szMpqName, PSFILE_CREATE_MPQ pCrea
     if(nError != ERROR_SUCCESS)
     {
         FileStream_Close(pStream);
-        FreeArchiveHandle(ha);
+        FreeMPQArchive(ha);
         SetLastError(nError);
         ha = NULL;
     }
-    
+
     // Return the values
     *phMpq = (HANDLE)ha;
     return (nError == ERROR_SUCCESS);
diff --git a/dep/StormLib/src/SFileExtractFile.cpp b/dep/StormLib/src/SFileExtractFile.cpp
index 314d8ff4e..c8053ed4e 100644
--- a/dep/StormLib/src/SFileExtractFile.cpp
+++ b/dep/StormLib/src/SFileExtractFile.cpp
@@ -28,7 +28,7 @@ bool WINAPI SFileExtractFile(HANDLE hMpq, const char * szToExtract, const TCHAR
     // Create the local file
     if(nError == ERROR_SUCCESS)
     {
-        pLocalFile = FileStream_CreateFile(szExtracted, 0);
+        pLocalFile = FileStream_CreateFile(szExtracted, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
         if(pLocalFile == NULL)
             nError = GetLastError();
     }
diff --git a/dep/StormLib/src/SFileFindFile.cpp b/dep/StormLib/src/SFileFindFile.cpp
index 80a9e597f..952d4d016 100644
--- a/dep/StormLib/src/SFileFindFile.cpp
+++ b/dep/StormLib/src/SFileFindFile.cpp
@@ -37,14 +37,12 @@ struct TMPQSearch
 //-----------------------------------------------------------------------------
 // Local functions
 
-static TMPQSearch * IsValidSearchHandle(HANDLE hFind)
+static bool IsValidSearchHandle(TMPQSearch * hs)
 {
-    TMPQSearch * hs = (TMPQSearch *)hFind;
+    if(hs == NULL)
+        return false;
 
-    if(hs != NULL && IsValidMpqHandle(hs->ha))
-        return hs;
-
-    return NULL;
+    return IsValidMpqHandle(hs->ha);
 }
 
 bool CheckWildCard(const char * szString, const char * szWildCard)
@@ -71,7 +69,7 @@ bool CheckWildCard(const char * szString, const char * szWildCard)
             szString++;
         }
 
-        // If there is '*', means zero or more chars. We have to 
+        // If there is '*', means zero or more chars. We have to
         // find the sequence after '*'
         if(*szWildCard == '*')
         {
@@ -97,7 +95,7 @@ bool CheckWildCard(const char * szString, const char * szWildCard)
                 // Calculate match count
                 while(nMatchCount < nSubStringLength)
                 {
-                    if(AsciiToUpperTable[(BYTE)szString[nMatchCount]] != AsciiToUpperTable[(BYTE)szWildCard[nMatchCount]])
+                    if(toupper(szString[nMatchCount]) != toupper(szWildCard[nMatchCount]))
                         break;
                     if(szString[nMatchCount] == 0)
                         break;
@@ -120,7 +118,7 @@ bool CheckWildCard(const char * szString, const char * szWildCard)
         else
         {
             // If we came to the end of the string, compare it to the wildcard
-            if(AsciiToUpperTable[(BYTE)*szString] != AsciiToUpperTable[(BYTE)*szWildCard])
+            if(toupper(*szString) != toupper(*szWildCard))
                 return false;
 
             // If we arrived to the end of the string, it's a match
@@ -142,7 +140,7 @@ static DWORD GetSearchTableItems(TMPQArchive * ha)
     while(ha != NULL)
     {
         // Append the number of files
-        dwMergeItems += (ha->pHetTable != NULL) ? ha->pHetTable->dwEntryCount
+        dwMergeItems += (ha->pHetTable != NULL) ? ha->pHetTable->dwMaxFileCount
                                                 : ha->pHeader->dwBlockTableSize;
         // Move to the patched archive
         ha = ha->haPatch;
@@ -153,9 +151,9 @@ static DWORD GetSearchTableItems(TMPQArchive * ha)
 }
 
 static bool FileWasFoundBefore(
-    TMPQArchive * ha,
-    TMPQSearch * hs,
-    TFileEntry * pFileEntry)
+        TMPQArchive * ha,
+        TMPQSearch * hs,
+        TFileEntry * pFileEntry)
 {
     TFileEntry * pEntry;
     char * szRealFileName = pFileEntry->szFileName;
@@ -167,14 +165,14 @@ static bool FileWasFoundBefore(
     {
         // If we are in patch MPQ, we check if patch prefix matches
         // and then trim the patch prefix
-        if(ha->pPatchPrefix != NULL)
+        if(ha->cchPatchPrefix != 0)
         {
             // If the patch prefix doesn't fit, we pretend that the file
             // was there before and it will be skipped
-            if(_strnicmp(szRealFileName, ha->pPatchPrefix->szPatchPrefix, ha->pPatchPrefix->nLength))
+            if(_strnicmp(szRealFileName, ha->szPatchPrefix, ha->cchPatchPrefix))
                 return true;
 
-            szRealFileName += ha->pPatchPrefix->nLength;
+            szRealFileName += ha->cchPatchPrefix;
         }
 
         // Calculate the hash to the table
@@ -213,14 +211,6 @@ static bool FileWasFoundBefore(
     return false;
 }
 
-static inline bool FileEntryIsInvalid(
-    TMPQArchive * ha,
-    TFileEntry * pFileEntry)
-{
-    // Spazzler3 protector: Some files are clearly wrong
-    return ((ha->dwFlags & MPQ_FLAG_MALFORMED) && (pFileEntry->dwCmpSize & 0xFFFF0000) >= 0x7FFF0000);
-}
-
 static TFileEntry * FindPatchEntry(TMPQArchive * ha, TFileEntry * pFileEntry)
 {
     TFileEntry * pPatchEntry = NULL;
@@ -233,11 +223,9 @@ static TFileEntry * FindPatchEntry(TMPQArchive * ha, TFileEntry * pFileEntry)
     {
         // Move to the patch archive
         ha = ha->haPatch;
-        szFileName[0] = 0;
 
         // Prepare the prefix for the file name
-        if(ha->pPatchPrefix != NULL)
-            strcpy(szFileName, ha->pPatchPrefix->szPatchPrefix);
+        strcpy(szFileName, ha->szPatchPrefix);
         strcat(szFileName, pFileEntry->szFileName);
 
         // Try to find the file there
@@ -271,7 +259,7 @@ static int DoMPQSearch(TMPQSearch * hs, SFILE_FIND_DATA * lpFindFileData)
         pFileEntry = ha->pFileTable + hs->dwNextIndex;
 
         // Get the length of the patch prefix (0 if none)
-        nPrefixLength = (ha->pPatchPrefix != NULL) ? ha->pPatchPrefix->nLength : 0;
+        nPrefixLength = strlen(ha->szPatchPrefix);
 
         // Parse the file table
         while(pFileEntry < pFileTableEnd)
@@ -279,77 +267,61 @@ static int DoMPQSearch(TMPQSearch * hs, SFILE_FIND_DATA * lpFindFileData)
             // Increment the next index for subsequent search
             hs->dwNextIndex++;
 
-            // Is it a file but not a patch file?
+            // Is it a file and not a patch file?
             if((pFileEntry->dwFlags & hs->dwFlagMask) == MPQ_FILE_EXISTS)
             {
-                // Spazzler3 protector: Some files are clearly wrong
-                if(!FileEntryIsInvalid(ha, pFileEntry))
-                {                    
-                    // Now we have to check if this file was not enumerated before
-                    if(!FileWasFoundBefore(ha, hs, pFileEntry))
+                // Now we have to check if this file was not enumerated before
+                if(!FileWasFoundBefore(ha, hs, pFileEntry))
+                {
+                    // Find a patch to this file
+                    pPatchEntry = FindPatchEntry(ha, pFileEntry);
+                    if(pPatchEntry == NULL)
+                        pPatchEntry = pFileEntry;
+
+                    // Prepare the block index
+                    dwBlockIndex = (DWORD)(pFileEntry - ha->pFileTable);
+
+                    // Get the file name. If it's not known, we will create pseudo-name
+                    szFileName = pFileEntry->szFileName;
+                    if(szFileName == NULL)
                     {
-//                      if(pFileEntry != NULL && !_stricmp(pFileEntry->szFileName, "TriggerLibs\\NativeLib.galaxy"))
-//                          DebugBreak();
-
-                        // Find a patch to this file
-                        pPatchEntry = FindPatchEntry(ha, pFileEntry);
-                        if(pPatchEntry == NULL)
-                            pPatchEntry = pFileEntry;
-
-                        // Prepare the block index
-                        dwBlockIndex = (DWORD)(pFileEntry - ha->pFileTable);
-
-                        // Get the file name. If it's not known, we will create pseudo-name
-                        szFileName = pFileEntry->szFileName;
-                        if(szFileName == NULL)
+                        // Open the file by its pseudo-name.
+                        // This also generates the file name with a proper extension
+                        sprintf(szPseudoName, "File%08u.xxx", dwBlockIndex);
+                        if(SFileOpenFileEx((HANDLE)hs->ha, szPseudoName, SFILE_OPEN_FROM_MPQ, &hFile))
                         {
-                            // Open the file by its pseudo-name.
-                            // This also generates the file name with a proper extension
-                            sprintf(szPseudoName, "File%08u.xxx", (unsigned int)dwBlockIndex);
-                            if(SFileOpenFileEx((HANDLE)hs->ha, szPseudoName, SFILE_OPEN_BASE_FILE, &hFile))
-                            {
-                                szFileName = (pFileEntry->szFileName != NULL) ? pFileEntry->szFileName : szPseudoName;
-                                SFileCloseFile(hFile);
-                            }
-                        }
-
-                        // If the file name is still NULL, we cannot include the file to search results
-                        if(szFileName != NULL)
-                        {
-                            // Check the file name against the wildcard
-                            if(CheckWildCard(szFileName + nPrefixLength, hs->szSearchMask))
-                            {
-                                // Fill the found entry. hash entry and block index are taken from the base MPQ
-                                lpFindFileData->dwHashIndex  = pFileEntry->dwHashIndex;
-                                lpFindFileData->dwBlockIndex = dwBlockIndex;
-                                lpFindFileData->dwFileSize   = pPatchEntry->dwFileSize;
-                                lpFindFileData->dwFileFlags  = pPatchEntry->dwFlags;
-                                lpFindFileData->dwCompSize   = pPatchEntry->dwCmpSize;
-                                lpFindFileData->lcLocale     = pPatchEntry->lcLocale;
-
-                                // Fill the filetime
-                                lpFindFileData->dwFileTimeHi = (DWORD)(pPatchEntry->FileTime >> 32);
-                                lpFindFileData->dwFileTimeLo = (DWORD)(pPatchEntry->FileTime);
-
-                                // Fill the file name and plain file name
-                                strcpy(lpFindFileData->cFileName, szFileName + nPrefixLength);
-                                lpFindFileData->szPlainName = (char *)GetPlainFileName(lpFindFileData->cFileName);
-                                return ERROR_SUCCESS;
-                            }
+                            szFileName = (pFileEntry->szFileName != NULL) ? pFileEntry->szFileName : szPseudoName;
+                            SFileCloseFile(hFile);
                         }
                     }
+
+                    // Check the file name against the wildcard
+                    if(CheckWildCard(szFileName + nPrefixLength, hs->szSearchMask))
+                    {
+                        // Fill the found entry
+                        lpFindFileData->dwHashIndex  = pPatchEntry->dwHashIndex;
+                        lpFindFileData->dwBlockIndex = dwBlockIndex;
+                        lpFindFileData->dwFileSize   = pPatchEntry->dwFileSize;
+                        lpFindFileData->dwFileFlags  = pPatchEntry->dwFlags;
+                        lpFindFileData->dwCompSize   = pPatchEntry->dwCmpSize;
+                        lpFindFileData->lcLocale     = pPatchEntry->lcLocale;
+
+                        // Fill the filetime
+                        lpFindFileData->dwFileTimeHi = (DWORD)(pPatchEntry->FileTime >> 32);
+                        lpFindFileData->dwFileTimeLo = (DWORD)(pPatchEntry->FileTime);
+
+                        // Fill the file name and plain file name
+                        strcpy(lpFindFileData->cFileName, szFileName + nPrefixLength);
+                        lpFindFileData->szPlainName = (char *)GetPlainFileNameA(lpFindFileData->cFileName);
+                        return ERROR_SUCCESS;
+                    }
+
                 }
             }
 
             pFileEntry++;
         }
 
-        // If there is no more patches in the chain, stop it.
-        // This also keeps hs->ha non-NULL, which is required
-        // for freeing the handle later
-        if(ha->haPatch == NULL)
-            break;
-
         // Move to the next patch in the patch chain
         hs->ha = ha = ha->haPatch;
         hs->dwNextIndex = 0;
@@ -381,7 +353,7 @@ HANDLE WINAPI SFileFindFirstFile(HANDLE hMpq, const char * szMask, SFILE_FIND_DA
     int nError = ERROR_SUCCESS;
 
     // Check for the valid parameters
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
         nError = ERROR_INVALID_HANDLE;
     if(szMask == NULL || lpFindFileData == NULL)
         nError = ERROR_INVALID_PARAMETER;
@@ -434,18 +406,18 @@ HANDLE WINAPI SFileFindFirstFile(HANDLE hMpq, const char * szMask, SFILE_FIND_DA
         FreeMPQSearch(hs);
         SetLastError(nError);
     }
-    
+
     // Return the result value
     return (HANDLE)hs;
 }
 
 bool WINAPI SFileFindNextFile(HANDLE hFind, SFILE_FIND_DATA * lpFindFileData)
 {
-    TMPQSearch * hs = IsValidSearchHandle(hFind);
+    TMPQSearch * hs = (TMPQSearch *)hFind;
     int nError = ERROR_SUCCESS;
 
     // Check the parameters
-    if(hs == NULL)
+    if(!IsValidSearchHandle(hs))
         nError = ERROR_INVALID_HANDLE;
     if(lpFindFileData == NULL)
         nError = ERROR_INVALID_PARAMETER;
@@ -460,10 +432,10 @@ bool WINAPI SFileFindNextFile(HANDLE hFind, SFILE_FIND_DATA * lpFindFileData)
 
 bool WINAPI SFileFindClose(HANDLE hFind)
 {
-    TMPQSearch * hs = IsValidSearchHandle(hFind);
+    TMPQSearch * hs = (TMPQSearch *)hFind;
 
     // Check the parameters
-    if(hs == NULL)
+    if(!IsValidSearchHandle(hs))
     {
         SetLastError(ERROR_INVALID_HANDLE);
         return false;
diff --git a/dep/StormLib/src/SFileGetFileInfo.cpp b/dep/StormLib/src/SFileGetFileInfo.cpp
deleted file mode 100644
index 52b6f0d16..000000000
--- a/dep/StormLib/src/SFileGetFileInfo.cpp
+++ /dev/null
@@ -1,1001 +0,0 @@
-/*****************************************************************************/
-/* SFileGetFileInfo.cpp                   Copyright (c) Ladislav Zezula 2013 */
-/*---------------------------------------------------------------------------*/
-/* Description:                                                              */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 30.11.13  1.00  Lad  The first version of SFileGetFileInfo.cpp            */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-//-----------------------------------------------------------------------------
-// Local defines
-
-// Information types for SFileGetFileInfo
-#define SFILE_INFO_TYPE_INVALID_HANDLE  0
-#define SFILE_INFO_TYPE_NOT_FOUND       1
-#define SFILE_INFO_TYPE_DIRECT_POINTER  2
-#define SFILE_INFO_TYPE_ALLOCATED       3
-#define SFILE_INFO_TYPE_READ_FROM_FILE  4
-#define SFILE_INFO_TYPE_TABLE_POINTER   5
-#define SFILE_INFO_TYPE_FILE_ENTRY      6
-
-//-----------------------------------------------------------------------------
-// Local functions
-
-static void ConvertFileEntryToSelfRelative(TFileEntry * pFileEntry, TFileEntry * pSrcFileEntry)
-{
-    // Copy the file entry itself
-    memcpy(pFileEntry, pSrcFileEntry, sizeof(TFileEntry));
-
-    // If source is NULL, leave it NULL
-    if(pSrcFileEntry->szFileName != NULL)
-    {
-        // Set the file name pointer after the file entry
-        pFileEntry->szFileName = (char *)(pFileEntry + 1);
-        strcpy(pFileEntry->szFileName, pSrcFileEntry->szFileName);
-    }
-}
-
-
-static DWORD GetMpqFileCount(TMPQArchive * ha)
-{
-    TFileEntry * pFileTableEnd;
-    TFileEntry * pFileEntry;
-    DWORD dwFileCount = 0;
-
-    // Go through all open MPQs, including patches
-    while(ha != NULL)
-    {
-        // Only count files that are not patch files
-        pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-        for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-        {
-            // If the file is patch file and this is not primary archive, skip it
-            // BUGBUG: This errorneously counts non-patch files that are in both
-            // base MPQ and in patches, and increases the number of files by cca 50%
-            if((pFileEntry->dwFlags & (MPQ_FILE_EXISTS | MPQ_FILE_PATCH_FILE)) == MPQ_FILE_EXISTS)
-                dwFileCount++;
-        }
-
-        // Move to the next patch archive
-        ha = ha->haPatch;
-    }
-
-    return dwFileCount;
-}
-
-static bool GetFilePatchChain(TMPQFile * hf, void * pvFileInfo, DWORD cbFileInfo, DWORD * pcbLengthNeeded)
-{
-    TMPQFile * hfTemp;
-    TCHAR * szFileInfo = (TCHAR *)pvFileInfo;
-    size_t cchCharsNeeded = 1;
-    size_t cchFileInfo = (cbFileInfo / sizeof(TCHAR));
-    size_t nLength;
-
-    // Patch chain is only supported on MPQ files.
-    if(hf->pStream != NULL)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return false;
-    }
-
-    // Calculate the necessary length of the multi-string
-    for(hfTemp = hf; hfTemp != NULL; hfTemp = hfTemp->hfPatch)
-        cchCharsNeeded += _tcslen(FileStream_GetFileName(hfTemp->ha->pStream)) + 1;
-
-    // Give the caller the needed length
-    if(pcbLengthNeeded != NULL)
-        pcbLengthNeeded[0] = (DWORD)(cchCharsNeeded * sizeof(TCHAR)); 
-
-    // If the caller gave both buffer pointer and data length,
-    // try to copy the patch chain
-    if(szFileInfo != NULL && cchFileInfo != 0)
-    {
-        // If there is enough space in the buffer, copy the patch chain
-        if(cchCharsNeeded > cchFileInfo)
-        {
-            SetLastError(ERROR_INSUFFICIENT_BUFFER);
-            return false;
-        }
-
-        // Copy each patch
-        for(hfTemp = hf; hfTemp != NULL; hfTemp = hfTemp->hfPatch)
-        {
-            // Get the file name and its length
-            const TCHAR * szFileName = FileStream_GetFileName(hfTemp->ha->pStream);
-            nLength = _tcslen(szFileName) + 1;
-
-            // Copy the file name
-            memcpy(szFileInfo, szFileName, nLength * sizeof(TCHAR));
-            szFileInfo += nLength;
-        }
-
-        // Make it multi-string
-        szFileInfo[0] = 0;
-    }
-
-    return true;
-}
-
-//-----------------------------------------------------------------------------
-// Retrieves an information about an archive or about a file within the archive
-//
-//  hMpqOrFile - Handle to an MPQ archive or to a file
-//  InfoClass  - Information to obtain
-//  pvFileInfo - Pointer to buffer to store the information
-//  cbFileInfo - Size of the buffer pointed by pvFileInfo
-//  pcbLengthNeeded - Receives number of bytes necessary to store the information
-
-bool WINAPI SFileGetFileInfo(
-    HANDLE hMpqOrFile,
-    SFileInfoClass InfoClass,
-    void * pvFileInfo,
-    DWORD cbFileInfo,
-    LPDWORD pcbLengthNeeded)
-{
-    MPQ_SIGNATURE_INFO SignatureInfo;
-    TMPQArchive * ha = NULL;
-    TFileEntry * pFileEntry = NULL;
-    ULONGLONG Int64Value = 0;
-    ULONGLONG ByteOffset = 0;
-    TMPQHash * pHash;
-    TMPQFile * hf = NULL;
-    void * pvSrcFileInfo = NULL;
-    DWORD cbSrcFileInfo = 0;
-    DWORD dwInt32Value = 0;
-    int nInfoType = SFILE_INFO_TYPE_INVALID_HANDLE;
-    int nError = ERROR_SUCCESS;
-
-    switch(InfoClass)
-    {
-        case SFileMpqFileName:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = (void *)FileStream_GetFileName(ha->pStream);
-                cbSrcFileInfo = (DWORD)(_tcslen((TCHAR *)pvSrcFileInfo) + 1) * sizeof(TCHAR);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqStreamBitmap:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-                return FileStream_GetBitmap(ha->pStream, pvFileInfo, cbFileInfo, pcbLengthNeeded);
-            break;
-
-        case SFileMpqUserDataOffset:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                if(ha->pUserData != NULL)
-                {
-                    pvSrcFileInfo = &ha->UserDataPos;
-                    cbSrcFileInfo = sizeof(ULONGLONG);
-                    nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-                }
-            }
-            break;
-
-        case SFileMpqUserDataHeader:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                if(ha->pUserData != NULL)
-                {
-                    ByteOffset = ha->UserDataPos;
-                    cbSrcFileInfo = sizeof(TMPQUserData);
-                    nInfoType = SFILE_INFO_TYPE_READ_FROM_FILE;
-                }
-            }
-            break;
-
-        case SFileMpqUserData:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                if(ha->pUserData != NULL)
-                {
-                    ByteOffset = ha->UserDataPos + sizeof(TMPQUserData);
-                    cbSrcFileInfo = ha->pUserData->dwHeaderOffs - sizeof(TMPQUserData);
-                    nInfoType = SFILE_INFO_TYPE_READ_FROM_FILE;
-                }
-            }
-            break;
-
-        case SFileMpqHeaderOffset:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->MpqPos;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqHeaderSize:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->dwHeaderSize;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqHeader:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                ByteOffset = ha->MpqPos;
-                cbSrcFileInfo = ha->pHeader->dwHeaderSize;
-                nInfoType = SFILE_INFO_TYPE_READ_FROM_FILE;
-            }
-            break;
-
-        case SFileMpqHetTableOffset:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->HetTablePos64;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqHetTableSize:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->HetTableSize64;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqHetHeader:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                pvSrcFileInfo = LoadExtTable(ha, ha->pHeader->HetTablePos64, (size_t)ha->pHeader->HetTableSize64, HET_TABLE_SIGNATURE, MPQ_KEY_HASH_TABLE);
-                if(pvSrcFileInfo != NULL)
-                {
-                    cbSrcFileInfo = sizeof(TMPQHetHeader);
-                    nInfoType = SFILE_INFO_TYPE_ALLOCATED;
-                }
-            }
-            break;
-
-        case SFileMpqHetTable:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                pvSrcFileInfo = LoadHetTable(ha);
-                if(pvSrcFileInfo != NULL)
-                {
-                    cbSrcFileInfo = sizeof(void *);
-                    nInfoType = SFILE_INFO_TYPE_TABLE_POINTER;
-                }
-            }
-            break;
-
-        case SFileMpqBetTableOffset:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->BetTablePos64;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqBetTableSize:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->BetTableSize64;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqBetHeader:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                pvSrcFileInfo = LoadExtTable(ha, ha->pHeader->BetTablePos64, (size_t)ha->pHeader->BetTableSize64, BET_TABLE_SIGNATURE, MPQ_KEY_BLOCK_TABLE);
-                if(pvSrcFileInfo != NULL)
-                {
-                    // It is allowed for the caller to only require BET header.
-                    cbSrcFileInfo = sizeof(TMPQBetHeader) + ((TMPQBetHeader *)pvSrcFileInfo)->dwFlagCount * sizeof(DWORD);
-                    if(cbFileInfo == sizeof(TMPQBetHeader))
-                        cbSrcFileInfo = sizeof(TMPQBetHeader);
-                    nInfoType = SFILE_INFO_TYPE_ALLOCATED;
-                }
-            }
-            break;
-
-        case SFileMpqBetTable:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                pvSrcFileInfo = LoadBetTable(ha);
-                if(pvSrcFileInfo != NULL)
-                {
-                    cbSrcFileInfo = sizeof(void *);
-                    nInfoType = SFILE_INFO_TYPE_TABLE_POINTER;
-                }
-            }
-            break;
-
-        case SFileMpqHashTableOffset:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                Int64Value = MAKE_OFFSET64(ha->pHeader->wHashTablePosHi, ha->pHeader->dwHashTablePos);
-                pvSrcFileInfo = &Int64Value;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqHashTableSize64:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->HashTableSize64;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqHashTableSize:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->dwHashTableSize;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqHashTable:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                if(ha->pHashTable != NULL)
-                {
-                    pvSrcFileInfo = ha->pHashTable;
-                    cbSrcFileInfo = ha->pHeader->dwHashTableSize * sizeof(TMPQHash);
-                    nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-                }
-            }
-            break;
-
-        case SFileMpqBlockTableOffset:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                Int64Value = MAKE_OFFSET64(ha->pHeader->wBlockTablePosHi, ha->pHeader->dwBlockTablePos);
-                pvSrcFileInfo = &Int64Value;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqBlockTableSize64:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->BlockTableSize64;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqBlockTableSize:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->dwBlockTableSize;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqBlockTable:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                if(MAKE_OFFSET64(ha->pHeader->wBlockTablePosHi, ha->pHeader->dwBlockTablePos) != 0)
-                {
-                    cbSrcFileInfo = ha->pHeader->dwBlockTableSize * sizeof(TMPQBlock);
-                    if(cbFileInfo >= cbSrcFileInfo)
-                        pvSrcFileInfo = LoadBlockTable(ha, true);
-                    nInfoType = SFILE_INFO_TYPE_ALLOCATED;
-                }
-            }
-            break;
-
-        case SFileMpqHiBlockTableOffset:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->HiBlockTablePos64;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqHiBlockTableSize64:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->HiBlockTableSize64;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqHiBlockTable:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                if(ha->pHeader->HiBlockTablePos64 && ha->pHeader->HiBlockTableSize64)
-                {
-                    assert(false);
-                }
-            }
-            break;
-
-        case SFileMpqSignatures:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL && QueryMpqSignatureInfo(ha, &SignatureInfo))
-            {
-                pvSrcFileInfo = &SignatureInfo.SignatureTypes;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqStrongSignatureOffset:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                if(QueryMpqSignatureInfo(ha, &SignatureInfo) && (SignatureInfo.SignatureTypes & SIGNATURE_TYPE_STRONG))
-                {
-                    pvSrcFileInfo = &SignatureInfo.EndMpqData;
-                    cbSrcFileInfo = sizeof(ULONGLONG);
-                    nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-                }
-            }
-            break;
-
-        case SFileMpqStrongSignatureSize:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                if(QueryMpqSignatureInfo(ha, &SignatureInfo) && (SignatureInfo.SignatureTypes & SIGNATURE_TYPE_STRONG))
-                {
-                    dwInt32Value = MPQ_STRONG_SIGNATURE_SIZE + 4;
-                    pvSrcFileInfo = &dwInt32Value;
-                    cbSrcFileInfo = sizeof(DWORD);
-                    nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-                }
-            }
-            break;
-
-        case SFileMpqStrongSignature:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                if(QueryMpqSignatureInfo(ha, &SignatureInfo) && (SignatureInfo.SignatureTypes & SIGNATURE_TYPE_STRONG))
-                {
-                    pvSrcFileInfo = SignatureInfo.Signature;
-                    cbSrcFileInfo = MPQ_STRONG_SIGNATURE_SIZE + 4;
-                    nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-                }
-            }
-            break;
-
-        case SFileMpqArchiveSize64:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->ArchiveSize64;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqArchiveSize:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->pHeader->dwArchiveSize;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqMaxFileCount:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->dwMaxFileCount;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqFileTableSize:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->dwFileTableSize;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqSectorSize:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &ha->dwSectorSize;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqNumberOfFiles:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                pvSrcFileInfo = &dwInt32Value;
-                cbSrcFileInfo = sizeof(DWORD);
-                dwInt32Value = GetMpqFileCount(ha);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqRawChunkSize:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                nInfoType = SFILE_INFO_TYPE_NOT_FOUND;
-                if(ha->pHeader->dwRawChunkSize != 0)
-                {
-                    pvSrcFileInfo = &ha->pHeader->dwRawChunkSize;
-                    cbSrcFileInfo = sizeof(DWORD);
-                    nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-                }
-            }
-            break;
-
-        case SFileMpqStreamFlags:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                FileStream_GetFlags(ha->pStream, &dwInt32Value);
-                pvSrcFileInfo = &dwInt32Value;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileMpqIsReadOnly:
-            ha = IsValidMpqHandle(hMpqOrFile);
-            if(ha != NULL)
-            {
-                dwInt32Value  = (ha->dwFlags & MPQ_FLAG_READ_ONLY) ? 1 : 0;
-                pvSrcFileInfo = &dwInt32Value;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoPatchChain:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL)
-                return GetFilePatchChain(hf, pvFileInfo, cbFileInfo, pcbLengthNeeded);
-            break;
-
-        case SFileInfoFileEntry:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL && hf->pFileEntry != NULL)
-            {
-                pvSrcFileInfo = pFileEntry = hf->pFileEntry;
-                cbSrcFileInfo = sizeof(TFileEntry);
-                if(pFileEntry->szFileName != NULL)
-                    cbSrcFileInfo += (DWORD)strlen(pFileEntry->szFileName) + 1;
-                nInfoType = SFILE_INFO_TYPE_FILE_ENTRY;
-            }
-            break;
-
-        case SFileInfoHashEntry:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL && hf->ha != NULL && hf->ha->pHashTable != NULL)
-            {
-                pvSrcFileInfo = hf->ha->pHashTable + hf->pFileEntry->dwHashIndex;
-                cbSrcFileInfo = sizeof(TMPQHash);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoHashIndex:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL)
-            {
-                pvSrcFileInfo = &hf->pFileEntry->dwHashIndex;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoNameHash1:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL && hf->ha != NULL && hf->ha->pHashTable != NULL)
-            {
-                pHash = hf->ha->pHashTable + hf->pFileEntry->dwHashIndex;
-                pvSrcFileInfo = &pHash->dwName1;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoNameHash2:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL && hf->ha != NULL && hf->ha->pHashTable != NULL)
-            {
-                pHash = hf->ha->pHashTable + hf->pFileEntry->dwHashIndex;
-                pvSrcFileInfo = &pHash->dwName2;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoNameHash3:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL && hf->pFileEntry != NULL)
-            {
-                pvSrcFileInfo = &hf->pFileEntry->FileNameHash;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoLocale:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL)
-            {
-                dwInt32Value = hf->pFileEntry->lcLocale;
-                pvSrcFileInfo = &dwInt32Value;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoFileIndex:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL && hf->ha != NULL)
-            {
-                dwInt32Value = (DWORD)(hf->pFileEntry - hf->ha->pFileTable);
-                pvSrcFileInfo = &dwInt32Value;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoByteOffset:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL && hf->pFileEntry != NULL)
-            {
-                pvSrcFileInfo = &hf->pFileEntry->ByteOffset;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoFileTime:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL)
-            {
-                pvSrcFileInfo = &hf->pFileEntry->FileTime;
-                cbSrcFileInfo = sizeof(ULONGLONG);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoFileSize:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL)
-            {
-                pvSrcFileInfo = &hf->pFileEntry->dwFileSize;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoCompressedSize:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL)
-            {
-                pvSrcFileInfo = &hf->pFileEntry->dwCmpSize;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoFlags:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL)
-            {
-                pvSrcFileInfo = &hf->pFileEntry->dwFlags;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoEncryptionKey:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL)
-            {
-                pvSrcFileInfo = &hf->dwFileKey;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        case SFileInfoEncryptionKeyRaw:
-            hf = IsValidFileHandle(hMpqOrFile);
-            if(hf != NULL)
-            {
-                dwInt32Value = hf->dwFileKey;
-                if(hf->pFileEntry->dwFlags & MPQ_FILE_FIX_KEY)
-                    dwInt32Value = (dwInt32Value ^ hf->pFileEntry->dwFileSize) - (DWORD)hf->MpqFilePos;
-                pvSrcFileInfo = &dwInt32Value;
-                cbSrcFileInfo = sizeof(DWORD);
-                nInfoType = SFILE_INFO_TYPE_DIRECT_POINTER;
-            }
-            break;
-
-        default:    // Invalid info class
-            SetLastError(ERROR_INVALID_PARAMETER);
-            return false;
-    }
-
-    // If we validated the handle and info class, give as much info as possible
-    if(nInfoType >= SFILE_INFO_TYPE_DIRECT_POINTER)
-    {
-        // Give the length needed, if wanted
-        if(pcbLengthNeeded != NULL)
-            pcbLengthNeeded[0] = cbSrcFileInfo;
-
-        // If the caller entered an output buffer, the output size must also be entered
-        if(pvFileInfo != NULL && cbFileInfo != 0)
-        {
-            // Check if there is enough space in the output buffer
-            if(cbSrcFileInfo <= cbFileInfo)
-            {
-                switch(nInfoType)
-                {
-                    case SFILE_INFO_TYPE_DIRECT_POINTER:
-                    case SFILE_INFO_TYPE_ALLOCATED:
-                        assert(pvSrcFileInfo != NULL);
-                        memcpy(pvFileInfo, pvSrcFileInfo, cbSrcFileInfo);
-                        break;
-
-                    case SFILE_INFO_TYPE_READ_FROM_FILE:
-                        if(!FileStream_Read(ha->pStream, &ByteOffset, pvFileInfo, cbSrcFileInfo))
-                            nError = GetLastError();
-                        break;
-
-                    case SFILE_INFO_TYPE_TABLE_POINTER:
-                        assert(pvSrcFileInfo != NULL);
-                        *(void **)pvFileInfo = pvSrcFileInfo;
-                        pvSrcFileInfo = NULL;
-                        break;
-
-                    case SFILE_INFO_TYPE_FILE_ENTRY:
-                        assert(pFileEntry != NULL);
-                        ConvertFileEntryToSelfRelative((TFileEntry *)pvFileInfo, pFileEntry);
-                        break;
-                }
-            }
-            else
-            {
-                nError = ERROR_INSUFFICIENT_BUFFER;
-            }
-        }
-
-        // Free the file info if needed
-        if(nInfoType == SFILE_INFO_TYPE_ALLOCATED && pvSrcFileInfo != NULL)
-            STORM_FREE(pvSrcFileInfo);
-        if(nInfoType == SFILE_INFO_TYPE_TABLE_POINTER && pvSrcFileInfo != NULL)
-            SFileFreeFileInfo(pvSrcFileInfo, InfoClass);
-    }
-    else
-    {
-        // Handle error cases
-        if(nInfoType == SFILE_INFO_TYPE_INVALID_HANDLE)
-            nError = ERROR_INVALID_HANDLE;
-        if(nInfoType == SFILE_INFO_TYPE_NOT_FOUND)
-            nError = ERROR_FILE_NOT_FOUND;
-    }
-
-    // Set the last error value, if needed
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
-
-bool WINAPI SFileFreeFileInfo(void * pvFileInfo, SFileInfoClass InfoClass)
-{
-    switch(InfoClass)
-    {
-        case SFileMpqHetTable:
-            FreeHetTable((TMPQHetTable *)pvFileInfo);
-            return true;
-
-        case SFileMpqBetTable:
-            FreeBetTable((TMPQBetTable *)pvFileInfo);
-            return true;
-
-        default:
-            break;
-    }
-
-    SetLastError(ERROR_INVALID_PARAMETER);
-    return false;
-}
-
-//-----------------------------------------------------------------------------
-// Tries to retrieve the file name
-
-struct TFileHeader2Ext
-{
-    DWORD dwOffset00Data;               // Required data at offset 00 (32-bits)
-    DWORD dwOffset00Mask;               // Mask for data at offset 00 (32 bits). 0 = data are ignored
-    DWORD dwOffset04Data;               // Required data at offset 04 (32-bits)
-    DWORD dwOffset04Mask;               // Mask for data at offset 04 (32 bits). 0 = data are ignored
-    const char * szExt;                 // Supplied extension, if the condition is true
-};
-
-static TFileHeader2Ext data2ext[] = 
-{
-    {0x00005A4D, 0x0000FFFF, 0x00000000, 0x00000000, "exe"},    // EXE files
-    {0x00000006, 0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, "dc6"},    // EXE files
-    {0x1A51504D, 0xFFFFFFFF, 0x00000000, 0x00000000, "mpq"},    // MPQ archive header ID ('MPQ\x1A')
-    {0x46464952, 0xFFFFFFFF, 0x00000000, 0x00000000, "wav"},    // WAVE header 'RIFF'
-    {0x324B4D53, 0xFFFFFFFF, 0x00000000, 0x00000000, "smk"},    // Old "Smacker Video" files 'SMK2'
-    {0x694B4942, 0xFFFFFFFF, 0x00000000, 0x00000000, "bik"},    // Bink video files (new)
-    {0x0801050A, 0xFFFFFFFF, 0x00000000, 0x00000000, "pcx"},    // PCX images used in Diablo I
-    {0x544E4F46, 0xFFFFFFFF, 0x00000000, 0x00000000, "fnt"},    // Font files used in Diablo II
-    {0x6D74683C, 0xFFFFFFFF, 0x00000000, 0x00000000, "html"},   // HTML '<htm'
-    {0x4D54483C, 0xFFFFFFFF, 0x00000000, 0x00000000, "html"},   // HTML '<HTM
-    {0x216F6F57, 0xFFFFFFFF, 0x00000000, 0x00000000, "tbl"},    // Table files
-    {0x31504C42, 0xFFFFFFFF, 0x00000000, 0x00000000, "blp"},    // BLP textures
-    {0x32504C42, 0xFFFFFFFF, 0x00000000, 0x00000000, "blp"},    // BLP textures (v2)
-    {0x584C444D, 0xFFFFFFFF, 0x00000000, 0x00000000, "mdx"},    // MDX files
-    {0x45505954, 0xFFFFFFFF, 0x00000000, 0x00000000, "pud"},    // Warcraft II maps
-    {0x38464947, 0xFFFFFFFF, 0x00000000, 0x00000000, "gif"},    // GIF images 'GIF8'
-    {0x3032444D, 0xFFFFFFFF, 0x00000000, 0x00000000, "m2"},     // WoW ??? .m2
-    {0x43424457, 0xFFFFFFFF, 0x00000000, 0x00000000, "dbc"},    // ??? .dbc
-    {0x47585053, 0xFFFFFFFF, 0x00000000, 0x00000000, "bls"},    // WoW pixel shaders
-    {0xE0FFD8FF, 0xFFFFFFFF, 0x00000000, 0x00000000, "jpg"},    // JPEG image
-    {0x00000000, 0x00000000, 0x00000000, 0x00000000, "xxx"},    // Default extension
-    {0, 0, 0, 0, NULL}                                          // Terminator 
-};
-
-static int CreatePseudoFileName(HANDLE hFile, TFileEntry * pFileEntry, char * szFileName)
-{
-    TMPQFile * hf = (TMPQFile *)hFile;  // MPQ File handle
-    DWORD FirstBytes[2] = {0, 0};       // The first 4 bytes of the file
-    DWORD dwBytesRead = 0;
-    DWORD dwFilePos;                    // Saved file position
-
-    // Read the first 2 DWORDs bytes from the file
-    dwFilePos = SFileSetFilePointer(hFile, 0, NULL, FILE_CURRENT);   
-    SFileReadFile(hFile, FirstBytes, sizeof(FirstBytes), &dwBytesRead, NULL);
-    SFileSetFilePointer(hFile, dwFilePos, NULL, FILE_BEGIN);
-
-    // If we read at least 8 bytes
-    if(dwBytesRead == sizeof(FirstBytes))
-    {
-        // Make sure that the array is properly BSWAP-ed
-        BSWAP_ARRAY32_UNSIGNED(FirstBytes, sizeof(FirstBytes));
-
-        // Try to guess file extension from those 2 DWORDs
-        for(size_t i = 0; data2ext[i].szExt != NULL; i++)
-        {
-            if((FirstBytes[0] & data2ext[i].dwOffset00Mask) == data2ext[i].dwOffset00Data &&
-               (FirstBytes[1] & data2ext[i].dwOffset04Mask) == data2ext[i].dwOffset04Data)
-            {
-                char szPseudoName[20] = "";    
-
-                // Format the pseudo-name
-                sprintf(szPseudoName, "File%08u.%s", (unsigned int)(pFileEntry - hf->ha->pFileTable), data2ext[i].szExt);
-
-                // Save the pseudo-name in the file entry as well
-                AllocateFileName(hf->ha, pFileEntry, szPseudoName);
-
-                // If the caller wants to copy the file name, do it
-                if(szFileName != NULL)
-                    strcpy(szFileName, szPseudoName);
-                return ERROR_SUCCESS;
-            }
-        }
-    }
-
-    return ERROR_CAN_NOT_COMPLETE;
-}
-
-bool WINAPI SFileGetFileName(HANDLE hFile, char * szFileName)
-{
-    TMPQFile * hf = (TMPQFile *)hFile;  // MPQ File handle
-    int nError = ERROR_INVALID_HANDLE;
-
-    // Pre-zero the output buffer
-    if(szFileName != NULL)
-        *szFileName = 0;
-
-    // Check valid parameters
-    if(IsValidFileHandle(hFile))
-    {
-        TFileEntry * pFileEntry = hf->pFileEntry;
-
-        // For MPQ files, retrieve the file name from the file entry
-        if(hf->pStream == NULL)
-        {
-            if(pFileEntry != NULL)
-            {
-                // If the file name is not there yet, create a pseudo name
-                if(pFileEntry->szFileName == NULL)
-                {
-                    nError = CreatePseudoFileName(hFile, pFileEntry, szFileName);
-                }
-                else
-                {
-                    if(szFileName != NULL)
-                        strcpy(szFileName, pFileEntry->szFileName);
-                    nError = ERROR_SUCCESS;
-                }
-            }
-        }
-
-        // For local files, copy the file name from the stream
-        else
-        {
-            if(szFileName != NULL)
-            {
-                const TCHAR * szStreamName = FileStream_GetFileName(hf->pStream);
-                CopyFileName(szFileName, szStreamName, _tcslen(szStreamName));
-            }
-            nError = ERROR_SUCCESS;
-        }
-    }
-
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
-
diff --git a/dep/StormLib/src/SFileListFile.cpp b/dep/StormLib/src/SFileListFile.cpp
index f4069c0ac..a575c581a 100644
--- a/dep/StormLib/src/SFileListFile.cpp
+++ b/dep/StormLib/src/SFileListFile.cpp
@@ -21,85 +21,85 @@
 struct TListFileCache
 {
     HANDLE  hFile;                      // Stormlib file handle
-    char  * szMask;                     // Self-relative pointer to file mask
+    char  * szMask;                     // File mask
     DWORD   dwFileSize;                 // Total size of the cached file
     DWORD   dwFilePos;                  // Position of the cache in the file
     BYTE  * pBegin;                     // The begin of the listfile cache
     BYTE  * pPos;
     BYTE  * pEnd;                       // The last character in the file cache
 
-    BYTE Buffer[CACHE_BUFFER_SIZE];
-//  char MaskBuff[1]                    // Followed by the name mask (if any)
+    BYTE Buffer[CACHE_BUFFER_SIZE];     // Listfile cache itself
 };
 
 //-----------------------------------------------------------------------------
 // Local functions (cache)
 
-static char * CopyListLine(char * szListLine, const char * szFileName)
-{
-    // Copy the string
-    while(szFileName[0] != 0)
-        *szListLine++ = *szFileName++;
-
-    // Append the end-of-line
-    *szListLine++ = 0x0D;
-    *szListLine++ = 0x0A;
-    return szListLine;
-}
-
 static bool FreeListFileCache(TListFileCache * pCache)
 {
     // Valid parameter check
-    if(pCache != NULL)
-        STORM_FREE(pCache);
+    if(pCache == NULL)
+        return false;
+
+    // Free all allocated buffers
+    if(pCache->hFile != NULL)
+        SFileCloseFile(pCache->hFile);
+    if(pCache->szMask != NULL)
+        STORM_FREE(pCache->szMask);
+    STORM_FREE(pCache);
     return true;
 }
 
 static TListFileCache * CreateListFileCache(HANDLE hListFile, const char * szMask)
 {
     TListFileCache * pCache = NULL;
-    size_t nMaskLength = 0;
     DWORD dwBytesRead = 0;
-    DWORD dwFileSize;
-
-    // Get the amount of bytes that need to be allocated
-    dwFileSize = SFileGetFileSize(hListFile, NULL);
-    if(dwFileSize == 0)
-        return NULL;
-
-    // Append buffer for name mask, if any
-    if(szMask != NULL)
-        nMaskLength = strlen(szMask) + 1;
+    int nError = ERROR_SUCCESS;
 
     // Allocate cache for one file block
-    pCache = (TListFileCache *)STORM_ALLOC(BYTE, sizeof(TListFileCache) + nMaskLength);
-    if(pCache != NULL)
-    {
-        // Clear the entire structure
-        memset(pCache, 0, sizeof(TListFileCache) + nMaskLength);
+    pCache = (TListFileCache *)STORM_ALLOC(TListFileCache, 1);
+    if(pCache == NULL)
+        nError = ERROR_NOT_ENOUGH_MEMORY;
 
-        // Shall we copy the mask?
+    // Clear the entire structure
+    if(nError == ERROR_SUCCESS)
+    {
+        memset(pCache, 0, sizeof(TListFileCache));
+        pCache->hFile = hListFile;
+
+        // Shall we allocate a mask?
         if(szMask != NULL)
         {
-            pCache->szMask = (char *)(pCache + 1);
-            memcpy(pCache->szMask, szMask, nMaskLength);
+            pCache->szMask = STORM_ALLOC(char, strlen(szMask) + 1);
+            if(pCache->szMask != NULL)
+                strcpy(pCache->szMask, szMask);
+            else
+                nError = ERROR_NOT_ENOUGH_MEMORY;
         }
+    }
 
-        // Load the file cache from the file
-        SFileReadFile(hListFile, pCache->Buffer, CACHE_BUFFER_SIZE, &dwBytesRead, NULL);
-        if(dwBytesRead != 0)
-        {
-            // Allocate pointers
-            pCache->pBegin = pCache->pPos = &pCache->Buffer[0];
-            pCache->pEnd   = pCache->pBegin + dwBytesRead;
-            pCache->dwFileSize = dwFileSize;
-            pCache->hFile  = hListFile;
-        }
-        else
-        {
-            FreeListFileCache(pCache);
-            pCache = NULL;
-        }
+    // Initialize the file cache
+    if(nError == ERROR_SUCCESS)
+    {
+        pCache->dwFileSize = SFileGetFileSize(pCache->hFile, NULL);
+
+        // Fill the cache
+        SFileReadFile(pCache->hFile, pCache->Buffer, CACHE_BUFFER_SIZE, &dwBytesRead, NULL);
+        if(dwBytesRead == 0)
+            nError = GetLastError();
+    }
+
+    // Allocate pointers
+    if(nError == ERROR_SUCCESS)
+    {
+        pCache->pBegin =
+                pCache->pPos = &pCache->Buffer[0];
+        pCache->pEnd = pCache->pBegin + dwBytesRead;
+    }
+    else
+    {
+        FreeListFileCache(pCache);
+        SetLastError(nError);
+        pCache = NULL;
     }
 
     // Return the cache
@@ -116,6 +116,8 @@ static DWORD ReloadListFileCache(TListFileCache * pCache)
     // Only do something if the cache is empty
     if(pCache->pPos >= pCache->pEnd)
     {
+        //      __TryReadBlock:
+
         // Move the file position forward
         pCache->dwFilePos += CACHE_BUFFER_SIZE;
         if(pCache->dwFilePos >= pCache->dwFileSize)
@@ -128,7 +130,7 @@ static DWORD ReloadListFileCache(TListFileCache * pCache)
 
         // Load the next data chunk to the cache
         SFileSetFilePointer(pCache->hFile, pCache->dwFilePos, NULL, FILE_BEGIN);
-        SFileReadFile(pCache->hFile, pCache->Buffer, dwBytesToRead, &dwBytesRead, NULL);
+        SFileReadFile(pCache->hFile, pCache->Buffer, CACHE_BUFFER_SIZE, &dwBytesRead, NULL);
 
         // If we didn't read anything, it might mean that the block
         // of the file is not available (in case of partial MPQs).
@@ -139,7 +141,7 @@ static DWORD ReloadListFileCache(TListFileCache * pCache)
 
         // Set the buffer pointers
         pCache->pBegin =
-        pCache->pPos = &pCache->Buffer[0];
+                pCache->pPos = &pCache->Buffer[0];
         pCache->pEnd = pCache->pBegin + dwBytesRead;
     }
 
@@ -151,7 +153,7 @@ static size_t ReadListFileLine(TListFileCache * pCache, char * szLine, int nMaxC
     char * szLineBegin = szLine;
     char * szLineEnd = szLine + nMaxChars - 1;
     char * szExtraString = NULL;
-    
+
     // Skip newlines, spaces, tabs and another non-printable stuff
     for(;;)
     {
@@ -189,10 +191,6 @@ static size_t ReadListFileLine(TListFileCache * pCache, char * szLine, int nMaxC
         if(*pCache->pPos == '~')
             szExtraString = szLine;
 
-        // Remember that last occurence of a slash or backslash
-//      if(*pCache->pPos == '\\' || *pCache->pPos == '/')
-//          szPlainName = szLine + 1;
-
         // Copy the character
         *szLine++ = *pCache->pPos++;
     }
@@ -214,7 +212,7 @@ static size_t ReadListFileLine(TListFileCache * pCache, char * szLine, int nMaxC
     return (szLine - szLineBegin);
 }
 
-static int CompareFileNodes(const void * p1, const void * p2) 
+static int CompareFileNodes(const void * p1, const void * p2)
 {
     char * szFileName1 = *(char **)p1;
     char * szFileName2 = *(char **)p2;
@@ -222,91 +220,19 @@ static int CompareFileNodes(const void * p1, const void * p2)
     return _stricmp(szFileName1, szFileName2);
 }
 
-static LPBYTE CreateListFile(TMPQArchive * ha, DWORD * pcbListFile)
+static int WriteListFileLine(
+        TMPQFile * hf,
+        const char * szLine)
 {
-    TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-    TFileEntry * pFileEntry;
-    char ** SortTable = NULL;
-    char * szListFile = NULL;
-    char * szListLine;
-    size_t nFileNodes = 0;
-    size_t cbListFile = 0;
-    size_t nIndex0;
-    size_t nIndex1;
+    char szNewLine[2] = {0x0D, 0x0A};
+    size_t nLength = strlen(szLine);
+    int nError;
 
-    // Allocate the table for sorting listfile
-    SortTable = STORM_ALLOC(char*, ha->dwFileTableSize);
-    if(SortTable == NULL)
-        return NULL;
+    nError = SFileAddFile_Write(hf, szLine, (DWORD)nLength, MPQ_COMPRESSION_ZLIB);
+    if(nError != ERROR_SUCCESS)
+        return nError;
 
-    // Construct the sort table
-    // Note: in MPQs with multiple locale versions of the same file,
-    // this code causes adding multiple listfile entries.
-    // They will get removed after the listfile sorting
-    for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-    {
-        // Only take existing items
-        if((pFileEntry->dwFlags & MPQ_FILE_EXISTS) && pFileEntry->szFileName != NULL)
-        {
-            // Ignore pseudo-names and internal names
-            if(!IsPseudoFileName(pFileEntry->szFileName, NULL) && !IsInternalMpqFileName(pFileEntry->szFileName))
-            {
-                SortTable[nFileNodes++] = pFileEntry->szFileName;
-            }
-        }
-    }
-
-    // Remove duplicities
-    if(nFileNodes > 0)
-    {
-        // Sort the table
-        qsort(SortTable, nFileNodes, sizeof(char *), CompareFileNodes);
-
-        // Count the 0-th item
-        cbListFile += strlen(SortTable[0]) + 2;
-
-        // Walk through the items and only use the ones that are not duplicated
-        for(nIndex0 = 0, nIndex1 = 1; nIndex1 < nFileNodes; nIndex1++)
-        {
-            // If the next file node is different, we will include it to the result listfile
-            if(_stricmp(SortTable[nIndex1], SortTable[nIndex0]) != 0)
-            {
-                cbListFile += strlen(SortTable[nIndex1]) + 2;
-                nIndex0 = nIndex1;
-            }
-        }
-
-        // Now allocate buffer for the entire listfile
-        szListFile = szListLine = STORM_ALLOC(char, cbListFile + 1);
-        if(szListFile != NULL)
-        {
-            // Copy the 0-th item
-            szListLine = CopyListLine(szListLine, SortTable[0]);
-
-            // Walk through the items and only use the ones that are not duplicated
-            for(nIndex0 = 0, nIndex1 = 1; nIndex1 < nFileNodes; nIndex1++)
-            {
-                // If the next file node is different, we will include it to the result listfile
-                if(_stricmp(SortTable[nIndex1], SortTable[nIndex0]) != 0)
-                {
-                    // Copy the listfile line
-                    szListLine = CopyListLine(szListLine, SortTable[nIndex1]);
-                    nIndex0 = nIndex1;
-                }
-            }
-
-            // Sanity check - does the size match?
-            assert((size_t)(szListLine - szListFile) == cbListFile);
-        }
-    }
-
-    // Free the sort table
-    STORM_FREE(SortTable);
-
-    // Give away the listfile
-    if(pcbListFile != NULL)
-        *pcbListFile = (DWORD)cbListFile;
-    return (LPBYTE)szListFile;
+    return SFileAddFile_Write(hf, szNewLine, sizeof(szNewLine), MPQ_COMPRESSION_ZLIB);
 }
 
 //-----------------------------------------------------------------------------
@@ -321,6 +247,7 @@ static int SListFileCreateNodeForAllLocales(TMPQArchive * ha, const char * szFil
     TFileEntry * pFileEntry;
     TMPQHash * pFirstHash;
     TMPQHash * pHash;
+    bool bNameEntryCreated = false;
 
     // If we have HET table, use that one
     if(ha->pHetTable != NULL)
@@ -329,14 +256,15 @@ static int SListFileCreateNodeForAllLocales(TMPQArchive * ha, const char * szFil
         if(pFileEntry != NULL)
         {
             // Allocate file name for the file entry
-            AllocateFileName(ha, pFileEntry, szFileName);
+            AllocateFileName(pFileEntry, szFileName);
+            bNameEntryCreated = true;
         }
 
         return ERROR_SUCCESS;
     }
 
     // If we have hash table, we use it
-    if(ha->pHashTable != NULL)
+    if(bNameEntryCreated == false && ha->pHashTable != NULL)
     {
         // Look for the first hash table entry for the file
         pFirstHash = pHash = GetFirstHashEntry(ha, szFileName);
@@ -348,7 +276,8 @@ static int SListFileCreateNodeForAllLocales(TMPQArchive * ha, const char * szFil
             if(pHash->dwBlockIndex < pHeader->dwBlockTableSize)
             {
                 // Allocate file name for the file entry
-                AllocateFileName(ha, ha->pFileTable + pHash->dwBlockIndex, szFileName);
+                AllocateFileName(ha->pFileTable + pHash->dwBlockIndex, szFileName);
+                bNameEntryCreated = true;
             }
 
             // Now find the next language version of the file
@@ -359,68 +288,123 @@ static int SListFileCreateNodeForAllLocales(TMPQArchive * ha, const char * szFil
     return ERROR_CAN_NOT_COMPLETE;
 }
 
-// Saves the whole listfile to the MPQ
+// Saves the whole listfile into the MPQ.
 int SListFileSaveToMpq(TMPQArchive * ha)
 {
+    TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
+    TFileEntry * pFileEntry;
     TMPQFile * hf = NULL;
-    LPBYTE pbListFile;
-    DWORD cbListFile = 0;
+    char * szPrevItem;
+    char ** SortTable = NULL;
+    DWORD dwFileSize = 0;
+    size_t nFileNodes = 0;
+    size_t i;
     int nError = ERROR_SUCCESS;
 
-    // Only save the listfile if we should do so
-    if(ha->dwFileFlags1 != 0)
+    // Allocate the table for sorting listfile
+    SortTable = STORM_ALLOC(char*, ha->dwFileTableSize);
+    if(SortTable == NULL)
+        return ERROR_NOT_ENOUGH_MEMORY;
+
+    // Construct the sort table
+    // Note: in MPQs with multiple locale versions of the same file,
+    // this code causes adding multiple listfile entries.
+    // Since those MPQs were last time used in Starcraft,
+    // we leave it as it is.
+    for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
     {
-        // At this point, we expect to have at least one reserved entry in the file table
-        assert(ha->dwFlags & MPQ_FLAG_LISTFILE_INVALID);
-        assert(ha->dwReservedFiles >= 1);
-
-        // Create the raw data that is to be written to (listfile)
-        // Note: Creating the raw data before the (listfile) has been created in the MPQ
-        // causes that the name of the listfile will not be included in the listfile itself.
-        // That is OK, because (listfile) in Blizzard MPQs does not contain it either.
-        pbListFile = CreateListFile(ha, &cbListFile);
-        if(pbListFile != NULL)
+        // Only take existing items
+        if((pFileEntry->dwFlags & MPQ_FILE_EXISTS) && pFileEntry->szFileName != NULL)
         {
-            // We expect it to be nonzero size
-            assert(cbListFile != 0);
-
-            // Determine the real flags for (listfile)
-            if(ha->dwFileFlags1 == MPQ_FILE_EXISTS)
-                ha->dwFileFlags1 = GetDefaultSpecialFileFlags(cbListFile, ha->pHeader->wFormatVersion);
-
-            // Create the listfile in the MPQ
-            nError = SFileAddFile_Init(ha, LISTFILE_NAME,
-                                           0,
-                                           cbListFile,
-                                           LANG_NEUTRAL,
-                                           ha->dwFileFlags1 | MPQ_FILE_REPLACEEXISTING,
-                                          &hf);
-
-            // Write the listfile raw data to it
-            if(nError == ERROR_SUCCESS)
+            // Ignore pseudo-names
+            if(!IsPseudoFileName(pFileEntry->szFileName, NULL) && !IsInternalMpqFileName(pFileEntry->szFileName))
             {
-                // Write the content of the listfile to the MPQ
-                nError = SFileAddFile_Write(hf, pbListFile, cbListFile, MPQ_COMPRESSION_ZLIB);
-                SFileAddFile_Finish(hf);
+                SortTable[nFileNodes++] = pFileEntry->szFileName;
             }
-
-            // Free the listfile buffer
-            STORM_FREE(pbListFile);
-        }
-        else
-        {
-            // If the list file is empty, we assume ERROR_SUCCESS
-            nError = (cbListFile == 0) ? ERROR_SUCCESS : ERROR_NOT_ENOUGH_MEMORY;
-        }
-
-        // If the save process succeeded, we clear the MPQ_FLAG_LISTFILE_INVALID flag
-        if(nError == ERROR_SUCCESS)
-        {
-            ha->dwFlags &= ~MPQ_FLAG_LISTFILE_INVALID;
-            ha->dwReservedFiles--;
         }
     }
 
+    // Sort the table
+    qsort(SortTable, nFileNodes, sizeof(char *), CompareFileNodes);
+
+    // Now parse the table of file names again - remove duplicates
+    // and count file size.
+    if(nFileNodes != 0)
+    {
+        // Count the 0-th item
+        dwFileSize += (DWORD)strlen(SortTable[0]) + 2;
+        szPrevItem = SortTable[0];
+
+        // Count all next items
+        for(i = 1; i < nFileNodes; i++)
+        {
+            // If the item is the same like the last one, skip it
+            if(_stricmp(SortTable[i], szPrevItem))
+            {
+                dwFileSize += (DWORD)strlen(SortTable[i]) + 2;
+                szPrevItem = SortTable[i];
+            }
+        }
+
+        // Determine the flags for (listfile)
+        if(ha->dwFileFlags1 == 0)
+            ha->dwFileFlags1 = GetDefaultSpecialFileFlags(ha, dwFileSize);
+
+        // Create the listfile in the MPQ
+        nError = SFileAddFile_Init(ha, LISTFILE_NAME,
+                                   0,
+                                   dwFileSize,
+                                   LANG_NEUTRAL,
+                                   ha->dwFileFlags1 | MPQ_FILE_REPLACEEXISTING,
+                                   &hf);
+        // Add all file names
+        if(nError == ERROR_SUCCESS)
+        {
+            // Each name is followed by newline ("\x0D\x0A")
+            szPrevItem = SortTable[0];
+            nError = WriteListFileLine(hf, SortTable[0]);
+
+            // Count all next items
+            for(i = 1; i < nFileNodes; i++)
+            {
+                // If the item is the same like the last one, skip it
+                if(_stricmp(SortTable[i], szPrevItem))
+                {
+                    WriteListFileLine(hf, SortTable[i]);
+                    szPrevItem = SortTable[i];
+                }
+            }
+        }
+    }
+    else
+    {
+        // Create the listfile in the MPQ
+        dwFileSize = (DWORD)strlen(LISTFILE_NAME) + 2;
+        nError = SFileAddFile_Init(ha, LISTFILE_NAME,
+                                   0,
+                                   dwFileSize,
+                                   LANG_NEUTRAL,
+                                   MPQ_FILE_ENCRYPTED | MPQ_FILE_COMPRESS | MPQ_FILE_REPLACEEXISTING,
+                                   &hf);
+
+        // Just add "(listfile)" there
+        if(nError == ERROR_SUCCESS)
+        {
+            WriteListFileLine(hf, LISTFILE_NAME);
+        }
+    }
+
+    // Finalize the file in the MPQ
+    if(hf != NULL)
+    {
+        SFileAddFile_Finish(hf);
+    }
+
+    // Free buffers
+    if(nError == ERROR_SUCCESS)
+        ha->dwFlags &= ~MPQ_FLAG_INV_LISTFILE;
+    if(SortTable != NULL)
+        STORM_FREE(SortTable);
     return nError;
 }
 
@@ -431,20 +415,25 @@ static int SFileAddArbitraryListFile(
     TListFileCache * pCache = NULL;
     size_t nLength;
     char szFileName[MAX_PATH];
+    int nError = ERROR_SUCCESS;
 
     // Create the listfile cache for that file
     pCache = CreateListFileCache(hListFile, NULL);
-    if(pCache != NULL)
+    if(pCache == NULL)
+        nError = GetLastError();
+
+    // Load the node list. Add the node for every locale in the archive
+    if(nError == ERROR_SUCCESS)
     {
-        // Load the node list. Add the node for every locale in the archive
         while((nLength = ReadListFileLine(pCache, szFileName, sizeof(szFileName))) > 0)
             SListFileCreateNodeForAllLocales(ha, szFileName);
-
-        // Delete the cache
-        FreeListFileCache(pCache);
+        pCache->hFile = NULL;
     }
-    
-    return (pCache != NULL) ? ERROR_SUCCESS : ERROR_FILE_CORRUPT;
+
+    // Delete the cache
+    if(pCache != NULL)
+        FreeListFileCache(pCache);
+    return nError;
 }
 
 static int SFileAddExternalListFile(
@@ -456,12 +445,12 @@ static int SFileAddExternalListFile(
     int nError = ERROR_SUCCESS;
 
     // Open the external list file
-    if(!SFileOpenFileEx(hMpq, szListFile, SFILE_OPEN_LOCAL_FILE, &hListFile))
-        return GetLastError();
-
-    // Add the data from the listfile to MPQ
-    nError = SFileAddArbitraryListFile(ha, hListFile);
-    SFileCloseFile(hListFile);
+    if(SFileOpenFileEx(hMpq, szListFile, SFILE_OPEN_LOCAL_FILE, &hListFile))
+    {
+        // Add the data from the listfile to MPQ
+        nError = SFileAddArbitraryListFile(ha, hListFile);
+        SFileCloseFile(hListFile);
+    }
     return nError;
 }
 
@@ -491,7 +480,7 @@ static int SFileAddInternalListFile(
                 nError = SFileAddArbitraryListFile(ha, hListFile);
                 SFileCloseFile(hListFile);
             }
-            
+
             // Restore the original locale
             SFileSetLocale(lcSaveLocale);
 
@@ -528,9 +517,9 @@ int WINAPI SFileAddListFile(HANDLE hMpq, const char * szListFile)
     while(ha != NULL)
     {
         if(szListFile != NULL)
-            nError = SFileAddExternalListFile(ha, hMpq, szListFile);
+            SFileAddExternalListFile(ha, hMpq, szListFile);
         else
-            nError = SFileAddInternalListFile(ha, hMpq);
+            SFileAddInternalListFile(ha, hMpq);
 
         // Also, add three special files to the listfile:
         // (listfile) itself, (attributes) and (signature)
@@ -551,7 +540,7 @@ int WINAPI SFileAddListFile(HANDLE hMpq, const char * szListFile)
 HANDLE WINAPI SListFileFindFirstFile(HANDLE hMpq, const char * szListFile, const char * szMask, SFILE_FIND_DATA * lpFindFileData)
 {
     TListFileCache * pCache = NULL;
-    HANDLE hListFile = NULL;
+    HANDLE hListFile;
     size_t nLength = 0;
     DWORD dwSearchScope = SFILE_OPEN_LOCAL_FILE;
     int nError = ERROR_SUCCESS;
@@ -577,16 +566,12 @@ HANDLE WINAPI SListFileFindFirstFile(HANDLE hMpq, const char * szListFile, const
     {
         pCache = CreateListFileCache(hListFile, szMask);
         if(pCache == NULL)
-            nError = ERROR_FILE_CORRUPT;
+            nError = GetLastError();
     }
 
     // Perform file search
     if(nError == ERROR_SUCCESS)
     {
-        // The listfile handle is in the cache now
-        hListFile = NULL;
-
-        // Iterate through the listfile
         for(;;)
         {
             // Read the (next) line
@@ -599,24 +584,19 @@ HANDLE WINAPI SListFileFindFirstFile(HANDLE hMpq, const char * szListFile, const
 
             // If some mask entered, check it
             if(CheckWildCard(lpFindFileData->cFileName, pCache->szMask))
-                break;                
+                break;
         }
     }
 
     // Cleanup & exit
     if(nError != ERROR_SUCCESS)
     {
-        if(pCache != NULL)
-            FreeListFileCache(pCache);
-        pCache = NULL;
-
         memset(lpFindFileData, 0, sizeof(SFILE_FIND_DATA));
-        SetLastError(nError);
-    }
+        FreeListFileCache(pCache);
 
-    // Close remaining unowned listfile handle
-    if(hListFile != NULL)
-        SFileCloseFile(hListFile);
+        SetLastError(nError);
+        pCache = NULL;
+    }
     return (HANDLE)pCache;
 }
 
@@ -624,44 +604,34 @@ bool WINAPI SListFileFindNextFile(HANDLE hFind, SFILE_FIND_DATA * lpFindFileData
 {
     TListFileCache * pCache = (TListFileCache *)hFind;
     size_t nLength;
-    int nError = ERROR_INVALID_PARAMETER;
+    bool bResult = false;
+    int nError = ERROR_SUCCESS;
 
-    // Check for parameters
-    if(pCache != NULL)
+    for(;;)
     {
-        for(;;)
+        // Read the (next) line
+        nLength = ReadListFileLine(pCache, lpFindFileData->cFileName, sizeof(lpFindFileData->cFileName));
+        if(nLength == 0)
         {
-            // Read the (next) line
-            nLength = ReadListFileLine(pCache, lpFindFileData->cFileName, sizeof(lpFindFileData->cFileName));
-            if(nLength == 0)
-            {
-                nError = ERROR_NO_MORE_FILES;
-                break;
-            }
+            nError = ERROR_NO_MORE_FILES;
+            break;
+        }
 
-            // If some mask entered, check it
-            if(CheckWildCard(lpFindFileData->cFileName, pCache->szMask))
-            {
-                nError = ERROR_SUCCESS;
-                break;
-            }
+        // If some mask entered, check it
+        if(CheckWildCard(lpFindFileData->cFileName, pCache->szMask))
+        {
+            bResult = true;
+            break;
         }
     }
 
     if(nError != ERROR_SUCCESS)
         SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
+    return bResult;
 }
 
 bool WINAPI SListFileFindClose(HANDLE hFind)
 {
-    TListFileCache * pCache = (TListFileCache *)hFind;
-
-    if(pCache == NULL)
-        return false;
-
-    if(pCache->hFile != NULL)
-        SFileCloseFile(pCache->hFile);
-    return FreeListFileCache(pCache);
+    return FreeListFileCache((TListFileCache *)hFind);
 }
 
diff --git a/dep/StormLib/src/SFileOpenArchive.cpp b/dep/StormLib/src/SFileOpenArchive.cpp
index 19d18c263..b44c9909c 100644
--- a/dep/StormLib/src/SFileOpenArchive.cpp
+++ b/dep/StormLib/src/SFileOpenArchive.cpp
@@ -21,41 +21,43 @@
 /* Local functions                                                           */
 /*****************************************************************************/
 
-static bool IsAviFile(DWORD * HeaderData)
+static bool IsAviFile(void * pvFileBegin)
 {
-    DWORD DwordValue0 = BSWAP_INT32_UNSIGNED(HeaderData[0]);
-    DWORD DwordValue2 = BSWAP_INT32_UNSIGNED(HeaderData[2]);
-    DWORD DwordValue3 = BSWAP_INT32_UNSIGNED(HeaderData[3]);
+    LPDWORD AviHeader = (DWORD *)pvFileBegin;
+    DWORD DwordValue0 = BSWAP_INT32_UNSIGNED(AviHeader[0]);
+    DWORD DwordValue2 = BSWAP_INT32_UNSIGNED(AviHeader[2]);
+    DWORD DwordValue3 = BSWAP_INT32_UNSIGNED(AviHeader[3]);
 
     // Test for 'RIFF', 'AVI ' or 'LIST'
     return (DwordValue0 == 0x46464952 && DwordValue2 == 0x20495641 && DwordValue3 == 0x5453494C);
 }
 
-static TMPQUserData * IsValidMpqUserData(ULONGLONG ByteOffset, ULONGLONG FileSize, void * pvUserData)
+static TFileBitmap * CreateFileBitmap(TMPQArchive * ha, TMPQBitmap * pMpqBitmap, bool bFileIsComplete)
 {
-    TMPQUserData * pUserData;
+    TFileBitmap * pBitmap;
+    size_t nLength;
 
-    // BSWAP the source data and copy them to our buffer
-    BSWAP_ARRAY32_UNSIGNED(&pvUserData, sizeof(TMPQUserData));
-    pUserData = (TMPQUserData *)pvUserData;
+    // Calculate the length of the bitmap in blocks and in bytes
+    nLength = (size_t)(((ha->pHeader->ArchiveSize64 - 1) / pMpqBitmap->dwBlockSize) + 1);
+    nLength = (size_t)(((nLength - 1) / 8) + 1);
 
-    // Check the sizes
-    if(pUserData->cbUserDataHeader <= pUserData->cbUserDataSize && pUserData->cbUserDataSize <= pUserData->dwHeaderOffs)
+    // Allocate the file bitmap
+    pBitmap = (TFileBitmap *)STORM_ALLOC(BYTE, sizeof(TFileBitmap) + nLength);
+    if(pBitmap != NULL)
     {
-        // Move to the position given by the userdata
-        ByteOffset += pUserData->dwHeaderOffs;
+        // Fill the structure
+        pBitmap->StartOffset = ha->MpqPos;
+        pBitmap->EndOffset = ha->MpqPos + ha->pHeader->ArchiveSize64;
+        pBitmap->IsComplete = bFileIsComplete ? 1 : 0;
+        pBitmap->BitmapSize = (DWORD)nLength;
+        pBitmap->BlockSize = pMpqBitmap->dwBlockSize;
+        pBitmap->Reserved = 0;
 
-        // The MPQ header should be within range of the file size
-        if((ByteOffset + MPQ_HEADER_SIZE_V1) < FileSize)
-        {
-            // Note: We should verify if there is the MPQ header.
-            // However, the header could be at any position below that
-            // that is multiplier of 0x200
-            return (TMPQUserData *)pvUserData;
-        }
+        // Copy the file bitmap
+        memcpy((pBitmap + 1), (pMpqBitmap + 1), nLength);
     }
 
-    return NULL;
+    return pBitmap;
 }
 
 // This function gets the right positions of the hash table and the block table.
@@ -84,9 +86,6 @@ static int VerifyMpqTablePositions(TMPQArchive * ha, ULONGLONG FileSize)
     if(pHeader->wHashTablePosHi || pHeader->dwHashTablePos)
     {
         ByteOffset = ha->MpqPos + MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos);
-        if((pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1) && (ha->dwFlags & MPQ_FLAG_MALFORMED))
-            ByteOffset = (DWORD)ha->MpqPos + pHeader->dwHashTablePos;
-
         if(ByteOffset > FileSize)
             return ERROR_BAD_FORMAT;
     }
@@ -95,9 +94,6 @@ static int VerifyMpqTablePositions(TMPQArchive * ha, ULONGLONG FileSize)
     if(pHeader->wBlockTablePosHi || pHeader->dwBlockTablePos)
     {
         ByteOffset = ha->MpqPos + MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
-        if((pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1) && (ha->dwFlags & MPQ_FLAG_MALFORMED))
-            ByteOffset = (DWORD)ha->MpqPos + pHeader->dwBlockTablePos;
-
         if(ByteOffset > FileSize)
             return ERROR_BAD_FORMAT;
     }
@@ -143,17 +139,16 @@ LCID WINAPI SFileSetLocale(LCID lcNewLocale)
 //   phMpq      - Pointer to store open archive handle
 
 bool WINAPI SFileOpenArchive(
-    const TCHAR * szMpqName,
-    DWORD dwPriority,
-    DWORD dwFlags,
-    HANDLE * phMpq)
+        const TCHAR * szMpqName,
+        DWORD dwPriority,
+        DWORD dwFlags,
+        HANDLE * phMpq)
 {
-    TMPQUserData * pUserData;
     TFileStream * pStream = NULL;       // Open file stream
     TMPQArchive * ha = NULL;            // Archive handle
     TFileEntry * pFileEntry;
     ULONGLONG FileSize = 0;             // Size of the file
-    int nError = ERROR_SUCCESS;   
+    int nError = ERROR_SUCCESS;
 
     // Verify the parameters
     if(szMpqName == NULL || *szMpqName == 0 || phMpq == NULL)
@@ -166,28 +161,16 @@ bool WINAPI SFileOpenArchive(
     // Open the MPQ archive file
     if(nError == ERROR_SUCCESS)
     {
-        DWORD dwStreamFlags = (dwFlags & STREAM_FLAGS_MASK);
-
-        // If not forcing MPQ v 1.0, also use file bitmap
-        dwStreamFlags |= (dwFlags & MPQ_OPEN_FORCE_MPQ_V1) ? 0 : STREAM_FLAG_USE_BITMAP;
-
         // Initialize the stream
-        pStream = FileStream_OpenFile(szMpqName, dwStreamFlags);
+        pStream = FileStream_OpenFile(szMpqName, (dwFlags & STREAM_OPTIONS_MASK));
         if(pStream == NULL)
             nError = GetLastError();
     }
 
-    // Check the file size. There must be at least 0x20 bytes
-    if(nError == ERROR_SUCCESS)
-    {
-        FileStream_GetSize(pStream, &FileSize);
-        if(FileSize < MPQ_HEADER_SIZE_V1)
-            nError = ERROR_BAD_FORMAT;
-    }
-
     // Allocate the MPQhandle
     if(nError == ERROR_SUCCESS)
     {
+        FileStream_GetSize(pStream, &FileSize);
         if((ha = STORM_ALLOC(TMPQArchive, 1)) == NULL)
             nError = ERROR_NOT_ENOUGH_MEMORY;
     }
@@ -195,129 +178,98 @@ bool WINAPI SFileOpenArchive(
     // Initialize handle structure and allocate structure for MPQ header
     if(nError == ERROR_SUCCESS)
     {
-        ULONGLONG SearchOffset = 0;
-        ULONGLONG EndOfSearch = FileSize;
-        DWORD dwStreamFlags = 0;
-        DWORD dwHeaderSize;
-        DWORD dwHeaderID;
-
         memset(ha, 0, sizeof(TMPQArchive));
-        ha->pfnHashString = HashString;
         ha->pStream = pStream;
         pStream = NULL;
 
-        // Set the archive read only if the stream is read-only
-        FileStream_GetFlags(ha->pStream, &dwStreamFlags);
-        ha->dwFlags |= (dwStreamFlags & STREAM_FLAG_READ_ONLY) ? MPQ_FLAG_READ_ONLY : 0;
+        // Remember if the archive is open for write
+        if(FileStream_IsReadOnly(ha->pStream))
+            ha->dwFlags |= MPQ_FLAG_READ_ONLY;
 
         // Also remember if we shall check sector CRCs when reading file
-        ha->dwFlags |= (dwFlags & MPQ_OPEN_CHECK_SECTOR_CRC) ? MPQ_FLAG_CHECK_SECTOR_CRC : 0;
+        if(dwFlags & MPQ_OPEN_CHECK_SECTOR_CRC)
+            ha->dwFlags |= MPQ_FLAG_CHECK_SECTOR_CRC;
+    }
 
-        // Also remember if this MPQ is a patch
-        ha->dwFlags |= (dwFlags & MPQ_OPEN_PATCH) ? MPQ_FLAG_PATCH : 0;
-       
-        // Limit the header searching to about 130 MB of data
-        if(EndOfSearch > 0x08000000)
-            EndOfSearch = 0x08000000;
+    // Find the offset of MPQ header within the file
+    if(nError == ERROR_SUCCESS)
+    {
+        ULONGLONG SearchPos = 0;
+        DWORD dwHeaderID;
 
-        // Find the offset of MPQ header within the file
-        while(SearchOffset < EndOfSearch)
+        while(SearchPos < FileSize)
         {
             DWORD dwBytesAvailable = MPQ_HEADER_SIZE_V4;
 
             // Cut the bytes available, if needed
-            if((FileSize - SearchOffset) < MPQ_HEADER_SIZE_V4)
-                dwBytesAvailable = (DWORD)(FileSize - SearchOffset);
+            if((FileSize - SearchPos) < MPQ_HEADER_SIZE_V4)
+                dwBytesAvailable = (DWORD)(FileSize - SearchPos);
 
             // Read the eventual MPQ header
-            if(!FileStream_Read(ha->pStream, &SearchOffset, ha->HeaderData, dwBytesAvailable))
+            if(!FileStream_Read(ha->pStream, &SearchPos, ha->HeaderData, dwBytesAvailable))
             {
                 nError = GetLastError();
                 break;
             }
 
             // There are AVI files from Warcraft III with 'MPQ' extension.
-            if(SearchOffset == 0 && IsAviFile(ha->HeaderData))
+            if(SearchPos == 0 && IsAviFile(ha->HeaderData))
             {
                 nError = ERROR_AVI_FILE;
                 break;
             }
 
             // If there is the MPQ user data signature, process it
-            dwHeaderID = BSWAP_INT32_UNSIGNED(ha->HeaderData[0]);
-            if(dwHeaderID == ID_MPQ_USERDATA && ha->pUserData == NULL && (dwFlags & MPQ_OPEN_FORCE_MPQ_V1) == 0)
+            dwHeaderID = BSWAP_INT32_UNSIGNED(*(LPDWORD)ha->HeaderData);
+            if(dwHeaderID == ID_MPQ_USERDATA && ha->pUserData == NULL)
             {
-                // Verify if this looks like a valid user data
-                pUserData = IsValidMpqUserData(SearchOffset, FileSize, ha->HeaderData);
-                if(pUserData != NULL)
+                // Ignore the MPQ user data completely if the caller wants to open the MPQ as V1.0
+                if((dwFlags & MPQ_OPEN_FORCE_MPQ_V1) == 0)
                 {
                     // Fill the user data header
-                    ha->UserDataPos = SearchOffset;
                     ha->pUserData = &ha->UserData;
-                    memcpy(ha->pUserData, pUserData, sizeof(TMPQUserData));
+                    memcpy(ha->pUserData, ha->HeaderData, sizeof(TMPQUserData));
+                    BSWAP_TMPQUSERDATA(ha->pUserData);
 
-                    // Continue searching from that position
-                    SearchOffset += ha->pUserData->dwHeaderOffs;
+                    // Remember the position of the user data and continue search
+                    ha->UserDataPos = SearchPos;
+                    SearchPos += ha->pUserData->dwHeaderOffs;
                     continue;
                 }
             }
 
-            // There must be MPQ header signature. Note that STORM.dll from Warcraft III actually
-            // tests the MPQ header size. It must be at least 0x20 bytes in order to load it
-            // Abused by Spazzler Map protector. Note that the size check is not present
-            // in Storm.dll v 1.00, so Diablo I code would load the MPQ anyway.
-            dwHeaderSize = BSWAP_INT32_UNSIGNED(ha->HeaderData[1]);
-            if(dwHeaderID == ID_MPQ && dwHeaderSize >= MPQ_HEADER_SIZE_V1)
+            // There must be MPQ header signature
+            if(dwHeaderID == ID_MPQ)
             {
+                // Save the position where the MPQ header has been found
+                if(ha->pUserData == NULL)
+                    ha->UserDataPos = SearchPos;
+                ha->pHeader = (TMPQHeader *)ha->HeaderData;
+                ha->MpqPos = SearchPos;
+
                 // Now convert the header to version 4
-                nError = ConvertMpqHeaderToFormat4(ha, SearchOffset, FileSize, dwFlags);
-                break;
-            }
-
-            // Check for MPK archives (Longwu Online - MPQ fork)
-            if(dwHeaderID == ID_MPK)
-            {
-                // Now convert the MPK header to MPQ Header version 4
-                nError = ConvertMpkHeaderToFormat4(ha, FileSize, dwFlags);
-                break;
-            }
-
-            // If searching for the MPQ header is disabled, return an error
-            if(dwFlags & MPQ_OPEN_NO_HEADER_SEARCH)
-            {
-                nError = ERROR_NOT_SUPPORTED;
+                BSWAP_TMPQHEADER(ha->pHeader);
+                nError = ConvertMpqHeaderToFormat4(ha, FileSize, dwFlags);
                 break;
             }
 
             // Move to the next possible offset
-            SearchOffset += 0x200;
+            SearchPos += 0x200;
         }
 
-        // Did we identify one of the supported headers?
-        if(nError == ERROR_SUCCESS)
-        {
-            // Set the user data position to the MPQ header, if none
-            if(ha->pUserData == NULL)
-                ha->UserDataPos = SearchOffset;
-
-            // Set the position of the MPQ header
-            ha->pHeader = (TMPQHeader *)ha->HeaderData;
-            ha->MpqPos = SearchOffset;
-
-            // Sector size must be nonzero.
-            if(SearchOffset >= FileSize || ha->pHeader->wSectorSize == 0)
-                nError = ERROR_BAD_FORMAT;
-        }
+        // If we haven't found MPQ header in the file, it's an error
+        if(ha->pHeader == NULL)
+            nError = ERROR_BAD_FORMAT;
     }
 
     // Fix table positions according to format
     if(nError == ERROR_SUCCESS)
     {
         // Dump the header
-//      DumpMpqHeader(ha->pHeader);
+        //      DumpMpqHeader(ha->pHeader);
 
         // W3x Map Protectors use the fact that War3's Storm.dll ignores the MPQ user data,
-        // and ignores the MPQ format version as well. The trick is to
+        // and probably ignores the MPQ format version as well. The trick is to
         // fake MPQ format 2, with an improper hi-word position of hash table and block table
         // We can overcome such protectors by forcing opening the archive as MPQ v 1.0
         if(dwFlags & MPQ_OPEN_FORCE_MPQ_V1)
@@ -339,6 +291,24 @@ bool WINAPI SFileOpenArchive(
         nError = VerifyMpqTablePositions(ha, FileSize);
     }
 
+    // Check if the MPQ has data bitmap. If yes, we can verify if the MPQ is complete
+    if(nError == ERROR_SUCCESS && ha->pHeader->wFormatVersion >= MPQ_FORMAT_VERSION_4)
+    {
+        TFileBitmap * pBitmap;
+        bool bFileIsComplete = true;
+
+        LoadMpqDataBitmap(ha, FileSize, &bFileIsComplete);
+        if(ha->pBitmap != NULL && bFileIsComplete == false)
+        {
+            // Convert the MPQ bitmap to the file bitmap
+            pBitmap = CreateFileBitmap(ha, ha->pBitmap, bFileIsComplete);
+
+            // Set the data bitmap into the file stream for additional checks
+            FileStream_SetBitmap(ha->pStream, pBitmap);
+            ha->dwFlags |= MPQ_FLAG_READ_ONLY;
+        }
+    }
+
     // Read the hash table. Ignore the result, as hash table is no longer required
     // Read HET table. Ignore the result, as HET table is no longer required
     if(nError == ERROR_SUCCESS)
@@ -350,13 +320,14 @@ bool WINAPI SFileOpenArchive(
     // the block table, BET table, hi-block table, (attributes) and (listfile).
     if(nError == ERROR_SUCCESS)
     {
-        nError = BuildFileTable(ha);
+        nError = BuildFileTable(ha, FileSize);
     }
 
-    // Verify the file table, if no kind of malformation was detected
-    if(nError == ERROR_SUCCESS && (ha->dwFlags & MPQ_FLAG_MALFORMED) == 0)
+    // Verify the file table, if no kind of protection was detected
+    if(nError == ERROR_SUCCESS && (ha->dwFlags & MPQ_FLAG_PROTECTED) == 0)
     {
-        TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
+        TFileEntry * pFileTableEnd = ha->pFileTable + ha->pHeader->dwBlockTableSize;
+//      ULONGLONG ArchiveSize = 0;
         ULONGLONG RawFilePos;
 
         // Parse all file entries
@@ -383,6 +354,10 @@ bool WINAPI SFileOpenArchive(
                     nError = ERROR_FILE_CORRUPT;
                     break;
                 }
+
+                // Also, we remember end of the file
+                //              if(RawFilePos > ArchiveSize)
+                //                  ArchiveSize = RawFilePos;
             }
         }
     }
@@ -390,47 +365,32 @@ bool WINAPI SFileOpenArchive(
     // Load the internal listfile and include it to the file table
     if(nError == ERROR_SUCCESS && (dwFlags & MPQ_OPEN_NO_LISTFILE) == 0)
     {
-        // Quick check for (listfile)
+        // Save the flags for (listfile)
         pFileEntry = GetFileEntryLocale(ha, LISTFILE_NAME, LANG_NEUTRAL);
         if(pFileEntry != NULL)
-        {
-            // Ignore result of the operation. (listfile) is optional.
-            SFileAddListFile((HANDLE)ha, NULL);
             ha->dwFileFlags1 = pFileEntry->dwFlags;
-        }
+
+        // Ignore result of the operation. (listfile) is optional.
+        SFileAddListFile((HANDLE)ha, NULL);
     }
 
     // Load the "(attributes)" file and merge it to the file table
     if(nError == ERROR_SUCCESS && (dwFlags & MPQ_OPEN_NO_ATTRIBUTES) == 0)
     {
-        // Quick check for (attributes)
+        // Save the flags for (attributes)
         pFileEntry = GetFileEntryLocale(ha, ATTRIBUTES_NAME, LANG_NEUTRAL);
         if(pFileEntry != NULL)
-        {
-            // Ignore result of the operation. (attributes) is optional.
-            SAttrLoadAttributes(ha);
             ha->dwFileFlags2 = pFileEntry->dwFlags;
-        }
-    }
 
-    // Remember whether the archive has weak signature. Only for MPQs format 1.0.
-    if(nError == ERROR_SUCCESS)
-    {
-        // Quick check for (signature)
-        pFileEntry = GetFileEntryLocale(ha, SIGNATURE_NAME, LANG_NEUTRAL);
-        if(pFileEntry != NULL)
-        {
-            // Just remember that the archive is weak-signed
-            assert(pFileEntry->dwFlags == MPQ_FILE_EXISTS);
-            ha->dwFileFlags3 = pFileEntry->dwFlags;
-        }
+        // Ignore result of the operation. (attributes) is optional.
+        SAttrLoadAttributes(ha);
     }
 
     // Cleanup and exit
     if(nError != ERROR_SUCCESS)
     {
         FileStream_Close(pStream);
-        FreeArchiveHandle(ha);
+        FreeMPQArchive(ha);
         SetLastError(nError);
         ha = NULL;
     }
@@ -440,23 +400,13 @@ bool WINAPI SFileOpenArchive(
 }
 
 //-----------------------------------------------------------------------------
-// bool WINAPI SFileSetDownloadCallback(HANDLE, SFILE_DOWNLOAD_CALLBACK, void *);
-//
-// Sets a callback that is called when content is downloaded from the master MPQ
-//
+// SFileGetArchiveBitmap
 
-bool WINAPI SFileSetDownloadCallback(HANDLE hMpq, SFILE_DOWNLOAD_CALLBACK DownloadCB, void * pvUserData)
+bool WINAPI SFileGetArchiveBitmap(HANDLE hMpq, TFileBitmap * pBitmap, DWORD Length, LPDWORD LengthNeeded)
 {
     TMPQArchive * ha = (TMPQArchive *)hMpq;
 
-    // Do nothing if 'hMpq' is bad parameter
-    if(!IsValidMpqHandle(hMpq))
-    {
-        SetLastError(ERROR_INVALID_HANDLE);
-        return false;
-    }
-
-    return FileStream_SetCallback(ha->pStream, DownloadCB, pvUserData);
+    return FileStream_GetBitmap(ha->pStream, pBitmap, Length, LengthNeeded);
 }
 
 //-----------------------------------------------------------------------------
@@ -475,25 +425,14 @@ bool WINAPI SFileFlushArchive(HANDLE hMpq)
     int nError;
 
     // Do nothing if 'hMpq' is bad parameter
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
     {
         SetLastError(ERROR_INVALID_HANDLE);
         return false;
     }
 
-    // Indicate that we are saving MPQ internal structures
-    ha->dwFlags |= MPQ_FLAG_SAVING_TABLES;
-
-    // If the (signature) has been invalidated, save it
-    if(ha->dwFlags & MPQ_FLAG_SIGNATURE_INVALID)
-    {
-        nError = SSignFileCreate(ha);
-        if(nError != ERROR_SUCCESS)
-            nResultError = nError;
-    }
-
     // If the (listfile) has been invalidated, save it
-    if(ha->dwFlags & MPQ_FLAG_LISTFILE_INVALID)
+    if(ha->dwFlags & MPQ_FLAG_INV_LISTFILE)
     {
         nError = SListFileSaveToMpq(ha);
         if(nError != ERROR_SUCCESS)
@@ -501,7 +440,7 @@ bool WINAPI SFileFlushArchive(HANDLE hMpq)
     }
 
     // If the (attributes) has been invalidated, save it
-    if(ha->dwFlags & MPQ_FLAG_ATTRIBUTES_INVALID)
+    if(ha->dwFlags & MPQ_FLAG_INV_ATTRIBUTES)
     {
         nError = SAttrFileSaveToMpq(ha);
         if(nError != ERROR_SUCCESS)
@@ -511,23 +450,11 @@ bool WINAPI SFileFlushArchive(HANDLE hMpq)
     // Save HET table, BET table, hash table, block table, hi-block table
     if(ha->dwFlags & MPQ_FLAG_CHANGED)
     {
-        // Save all MPQ tables first
         nError = SaveMPQTables(ha);
         if(nError != ERROR_SUCCESS)
             nResultError = nError;
-
-        // If the archive has weak signature, we need to finish it
-        if(ha->dwFileFlags3 != 0)
-        {
-            nError = SSignFileFinish(ha);
-            if(nError != ERROR_SUCCESS)
-                nResultError = nError;
-        }
     }
 
-    // We are no longer saving internal MPQ structures
-    ha->dwFlags &= ~MPQ_FLAG_SAVING_TABLES;
-
     // Return the error
     if(nResultError != ERROR_SUCCESS)
         SetLastError(nResultError);
@@ -543,16 +470,11 @@ bool WINAPI SFileCloseArchive(HANDLE hMpq)
     TMPQArchive * ha = (TMPQArchive *)hMpq;
     bool bResult;
 
-    // Invalidate the add file callback so it won't be called
-    // when saving (listfile) and (attributes)
-    ha->pfnAddFileCB = NULL;
-    ha->pvAddFileUserData = NULL;
-
     // Flush all unsaved data to the storage
     bResult = SFileFlushArchive(hMpq);
 
     // Free all memory used by MPQ archive
-    FreeArchiveHandle(ha);
+    FreeMPQArchive(ha);
     return bResult;
 }
 
diff --git a/dep/StormLib/src/SFileOpenFileEx.cpp b/dep/StormLib/src/SFileOpenFileEx.cpp
index 3a9976e54..4d2516af4 100644
--- a/dep/StormLib/src/SFileOpenFileEx.cpp
+++ b/dep/StormLib/src/SFileOpenFileEx.cpp
@@ -16,46 +16,29 @@
 /* Local functions                                                           */
 /*****************************************************************************/
 
-static const char * GetPatchFileName(TMPQArchive * ha, const char * szFileName, char * szBuffer)
-{
-    TMPQNamePrefix * pPrefix;
-
-    // Are there patches in the current MPQ?
-    if(ha->dwFlags & MPQ_FLAG_PATCH)
-    {
-        // The patch prefix must be already known here
-        assert(ha->pPatchPrefix != NULL);
-        pPrefix = ha->pPatchPrefix;
-
-        // The patch name for "OldWorld\\XXX\\YYY" is "Base\\XXX\YYY"
-        // We need to remove the "OldWorld\\" prefix
-        if(!_strnicmp(szFileName, "OldWorld\\", 9))
-            szFileName += 9;
-
-        // Create the file name from the known patch entry
-        memcpy(szBuffer, pPrefix->szPatchPrefix, pPrefix->nLength);
-        strcpy(szBuffer + pPrefix->nLength, szFileName);
-        szFileName = szBuffer;
-    }
-
-    return szFileName;
-}
-
 static bool OpenLocalFile(const char * szFileName, HANDLE * phFile)
 {
     TFileStream * pStream;
     TMPQFile * hf = NULL;
+
+    // We have to convert the local file name to UNICODE, if needed
+#ifdef _UNICODE
     TCHAR szFileNameT[MAX_PATH];
+    int i;
 
-    // Convert the file name to UNICODE (if needed)
-    CopyFileName(szFileNameT, szFileName, strlen(szFileName));
+    for(i = 0; szFileName[i] != 0; i++)
+        szFileNameT[i] = szFileName[i];
+    szFileNameT[i] = 0;
+    pStream = FileStream_OpenFile(szFileNameT, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
+
+#else
+    pStream = FileStream_OpenFile(szFileName, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
+#endif
 
-    // Open the file and create the TMPQFile structure
-    pStream = FileStream_OpenFile(szFileNameT, STREAM_FLAG_READ_ONLY);
     if(pStream != NULL)
     {
         // Allocate and initialize file handle
-        hf = CreateFileHandle(NULL, NULL);
+        hf = CreateMpqFile(NULL);
         if(hf != NULL)
         {
             hf->pStream = pStream;
@@ -72,67 +55,87 @@ static bool OpenLocalFile(const char * szFileName, HANDLE * phFile)
     return false;
 }
 
-bool OpenPatchedFile(HANDLE hMpq, const char * szFileName, HANDLE * phFile)
+bool OpenPatchedFile(HANDLE hMpq, const char * szFileName, DWORD dwReserved, HANDLE * phFile)
 {
-    TMPQArchive * haBase = NULL;
     TMPQArchive * ha = (TMPQArchive *)hMpq;
-    TFileEntry * pFileEntry;
     TMPQFile * hfPatch;                     // Pointer to patch file
     TMPQFile * hfBase = NULL;               // Pointer to base open file
+    TMPQFile * hfLast = NULL;               // The highest file in the chain that is not patch file
     TMPQFile * hf = NULL;
     HANDLE hPatchFile;
-    char szNameBuffer[MAX_PATH];
+    char szPatchFileName[MAX_PATH];
 
-    // First of all, find the latest archive where the file is in base version
-    // (i.e. where the original, unpatched version of the file exists)
+    // Keep this flag here for future updates
+    dwReserved = dwReserved;
+
+    // First of all, try to open the original version of the file in any of the patch chain
     while(ha != NULL)
     {
-        // If the file is there, then we remember the archive
-        pFileEntry = GetFileEntryExact(ha, GetPatchFileName(ha, szFileName, szNameBuffer), 0);
-        if(pFileEntry != NULL && (pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) == 0)
-            haBase = ha;
+        // Construct the name of the patch file
+        strcpy(szPatchFileName, ha->szPatchPrefix);
+        strcpy(&szPatchFileName[ha->cchPatchPrefix], szFileName);
+        if(SFileOpenFileEx((HANDLE)ha, szPatchFileName, SFILE_OPEN_FROM_MPQ, (HANDLE *)&hfBase))
+        {
+            // The file must be a base file, i.e. without MPQ_FILE_PATCH_FILE
+            if((hfBase->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) == 0)
+            {
+                hf = hfLast = hfBase;
+                break;
+            }
 
-        // Move to the patch archive
+            SFileCloseFile((HANDLE)hfBase);
+        }
+
+        // Move to the next file in the patch chain
         ha = ha->haPatch;
     }
 
-    // If we couldn't find the base file in any of the patches, it doesn't exist
-    if((ha = haBase) == NULL)
+    // If we couldn't find the file in any of the patches, it doesn't exist
+    if(hf == NULL)
     {
         SetLastError(ERROR_FILE_NOT_FOUND);
         return false;
     }
 
-    // Now open the base file
-    if(SFileOpenFileEx((HANDLE)ha, GetPatchFileName(ha, szFileName, szNameBuffer), SFILE_OPEN_BASE_FILE, (HANDLE *)&hfBase))
+    // Now keep going in the patch chain and open every patch file that is there
+    for(ha = ha->haPatch; ha != NULL; ha = ha->haPatch)
     {
-        // The file must be a base file, i.e. without MPQ_FILE_PATCH_FILE
-        assert((hfBase->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) == 0);
-        hf = hfBase;
-
-        // Now open all patches and attach them on top of the base file
-        for(ha = ha->haPatch; ha != NULL; ha = ha->haPatch)
+        // Construct patch file name
+        strcpy(szPatchFileName, ha->szPatchPrefix);
+        strcpy(&szPatchFileName[ha->cchPatchPrefix], szFileName);
+        if(SFileOpenFileEx((HANDLE)ha, szPatchFileName, SFILE_OPEN_FROM_MPQ, &hPatchFile))
         {
-            // Prepare the file name with a correct prefix
-            if(SFileOpenFileEx((HANDLE)ha, GetPatchFileName(ha, szFileName, szNameBuffer), SFILE_OPEN_BASE_FILE, &hPatchFile))
-            {
-                // Remember the new version
-                hfPatch = (TMPQFile *)hPatchFile;
+            // Remember the new version
+            hfPatch = (TMPQFile *)hPatchFile;
 
-                // We should not find patch file
-                assert((hfPatch->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) != 0);
+            // If we encountered a full replacement of the file,
+            // we have to remember the highest full file
+            if((hfPatch->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) == 0)
+                hfLast = hfPatch;
 
-                // Attach the patch to the base file
-                hf->hfPatch = hfPatch;
-                hf = hfPatch;
-            }
+            // Set current patch to base file and move on
+            hf->hfPatchFile = hfPatch;
+            hf = hfPatch;
         }
     }
 
+    // Now we need to free all files that are below the highest unpatched version
+    while(hfBase != hfLast)
+    {
+        TMPQFile * hfNext = hfBase->hfPatchFile;
+
+        // Free the file below
+        hfBase->hfPatchFile = NULL;
+        FreeMPQFile(hfBase);
+
+        // Move the base to the next file
+        hfBase = hfNext;
+    }
+
     // Give the updated base MPQ
     if(phFile != NULL)
         *phFile = (HANDLE)hfBase;
-    return (hfBase != NULL);
+    return true;
 }
 
 /*****************************************************************************/
@@ -140,17 +143,17 @@ bool OpenPatchedFile(HANDLE hMpq, const char * szFileName, HANDLE * phFile)
 /*****************************************************************************/
 
 //-----------------------------------------------------------------------------
-// SFileEnumLocales enums all locale versions within MPQ. 
+// SFileEnumLocales enums all locale versions within MPQ.
 // Functions fills all available language identifiers on a file into the buffer
 // pointed by plcLocales. There must be enough entries to copy the localed,
 // otherwise the function returns ERROR_INSUFFICIENT_BUFFER.
 
 int WINAPI SFileEnumLocales(
-    HANDLE hMpq,
-    const char * szFileName,
-    LCID * plcLocales,
-    LPDWORD pdwMaxLocales,
-    DWORD dwSearchScope)
+        HANDLE hMpq,
+        const char * szFileName,
+        LCID * plcLocales,
+        LPDWORD pdwMaxLocales,
+        DWORD dwSearchScope)
 {
     TMPQArchive * ha = (TMPQArchive *)hMpq;
     TFileEntry * pFileEntry;
@@ -160,13 +163,13 @@ int WINAPI SFileEnumLocales(
     DWORD dwLocales = 0;
 
     // Test the parameters
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
         return ERROR_INVALID_HANDLE;
     if(szFileName == NULL || *szFileName == 0)
         return ERROR_INVALID_PARAMETER;
     if(pdwMaxLocales == NULL)
         return ERROR_INVALID_PARAMETER;
-    
+
     // Keep compiler happy
     dwSearchScope = dwSearchScope;
 
@@ -229,11 +232,11 @@ bool WINAPI SFileHasFile(HANDLE hMpq, const char * szFileName)
     TFileEntry * pFileEntry;
     DWORD dwFlagsToCheck = MPQ_FILE_EXISTS;
     DWORD dwFileIndex = 0;
-    char szPrefixBuffer[MAX_PATH];
+    char szPatchFileName[MAX_PATH];
     bool bIsPseudoName;
     int nError = ERROR_SUCCESS;
 
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
         nError = ERROR_INVALID_HANDLE;
     if(szFileName == NULL || *szFileName == 0)
         nError = ERROR_INVALID_PARAMETER;
@@ -248,7 +251,7 @@ bool WINAPI SFileHasFile(HANDLE hMpq, const char * szFileName)
         while(ha != NULL)
         {
             // Verify presence of the file
-            pFileEntry = (bIsPseudoName == false) ? GetFileEntryLocale(ha, GetPatchFileName(ha, szFileName, szPrefixBuffer), lcFileLocale)
+            pFileEntry = (bIsPseudoName == false) ? GetFileEntryLocale(ha, szFileName, lcFileLocale)
                                                   : GetFileEntryByIndex(ha, dwFileIndex);
             // Verify the file flags
             if(pFileEntry != NULL && (pFileEntry->dwFlags & dwFlagsToCheck) == MPQ_FILE_EXISTS)
@@ -257,6 +260,14 @@ bool WINAPI SFileHasFile(HANDLE hMpq, const char * szFileName)
             // If this is patched archive, go to the patch
             dwFlagsToCheck = MPQ_FILE_EXISTS | MPQ_FILE_PATCH_FILE;
             ha = ha->haPatch;
+
+            // Prepare the patched file name
+            if(ha != NULL)
+            {
+                strcpy(szPatchFileName, ha->szPatchPrefix);
+                strcat(szPatchFileName, szFileName);
+                szFileName = szPatchFileName;
+            }
         }
 
         // Not found, sorry
@@ -295,78 +306,73 @@ bool WINAPI SFileOpenFileEx(HANDLE hMpq, const char * szFileName, DWORD dwSearch
     {
         switch(dwSearchScope)
         {
-            case SFILE_OPEN_FROM_MPQ:
-            case SFILE_OPEN_BASE_FILE:
-                
-                if(!IsValidMpqHandle(hMpq))
-                {
-                    nError = ERROR_INVALID_HANDLE;
-                    break;
-                }
+        case SFILE_OPEN_PATCHED_FILE:
 
-                if(szFileName == NULL || *szFileName == 0)
-                {
-                    nError = ERROR_INVALID_PARAMETER;
-                    break;
-                }
+            // We want to open the updated version of the file
+            return OpenPatchedFile(hMpq, szFileName, 0, phFile);
 
-                // Check the pseudo-file name
-                if(IsPseudoFileName(szFileName, &dwFileIndex))
-                {
-                    pFileEntry = GetFileEntryByIndex(ha, dwFileIndex);
-                    bOpenByIndex = true;
-                    if(pFileEntry == NULL)
-                        nError = ERROR_FILE_NOT_FOUND;
-                }
-                else
-                {
-                    // If this MPQ is a patched archive, open the file as patched
-                    if(ha->haPatch == NULL || dwSearchScope == SFILE_OPEN_BASE_FILE)
-                    {
-                        // Otherwise, open the file from *this* MPQ
-                        pFileEntry = GetFileEntryLocale(ha, szFileName, lcFileLocale);
-                        if(pFileEntry == NULL)
-                            nError = ERROR_FILE_NOT_FOUND;
-                    }
-                    else
-                    {
-                        return OpenPatchedFile(hMpq, szFileName, phFile);
-                    }
-                }
+        case SFILE_OPEN_FROM_MPQ:
+
+            if(!IsValidMpqHandle(ha))
+            {
+                nError = ERROR_INVALID_HANDLE;
                 break;
+            }
 
-            case SFILE_OPEN_ANY_LOCALE:
-
-                // This open option is reserved for opening MPQ internal listfile.
-                // No argument validation. Tries to open file with neutral locale first,
-                // then any other available.
-                pFileEntry = GetFileEntryAny(ha, szFileName);
-                if(pFileEntry == NULL)
-                    nError = ERROR_FILE_NOT_FOUND;
-                break;
-
-            case SFILE_OPEN_LOCAL_FILE:
-
-                if(szFileName == NULL || *szFileName == 0)
-                {
-                    nError = ERROR_INVALID_PARAMETER;
-                    break;
-                }
-
-                return OpenLocalFile(szFileName, phFile); 
-
-            default:
-
-                // Don't accept any other value
+            if(szFileName == NULL || *szFileName == 0)
+            {
                 nError = ERROR_INVALID_PARAMETER;
                 break;
+            }
+
+            // First of all, check the name as-is
+            if(!IsPseudoFileName(szFileName, &dwFileIndex))
+            {
+                pFileEntry = GetFileEntryLocale(ha, szFileName, lcFileLocale);
+                if(pFileEntry == NULL)
+                    nError = ERROR_FILE_NOT_FOUND;
+            }
+            else
+            {
+                bOpenByIndex = true;
+                pFileEntry = GetFileEntryByIndex(ha, dwFileIndex);
+                if(pFileEntry == NULL)
+                    nError = ERROR_FILE_NOT_FOUND;
+            }
+            break;
+
+        case SFILE_OPEN_ANY_LOCALE:
+
+            // This open option is reserved for opening MPQ internal listfile.
+            // No argument validation. Tries to open file with neutral locale first,
+            // then any other available.
+            dwSearchScope = SFILE_OPEN_FROM_MPQ;
+            pFileEntry = GetFileEntryAny(ha, szFileName);
+            if(pFileEntry == NULL)
+                nError = ERROR_FILE_NOT_FOUND;
+            break;
+
+        case SFILE_OPEN_LOCAL_FILE:
+
+            if(szFileName == NULL || *szFileName == 0)
+            {
+                nError = ERROR_INVALID_PARAMETER;
+                break;
+            }
+
+            return OpenLocalFile(szFileName, phFile);
+
+        default:
+
+            // Don't accept any other value
+            nError = ERROR_INVALID_PARAMETER;
+            break;
         }
 
         // Quick return if something failed
         if(nError != ERROR_SUCCESS)
         {
             SetLastError(nError);
-            *phFile = NULL;
             return false;
         }
     }
@@ -383,14 +389,22 @@ bool WINAPI SFileOpenFileEx(HANDLE hMpq, const char * szFileName, DWORD dwSearch
     // Allocate file handle
     if(nError == ERROR_SUCCESS)
     {
-        hf = CreateFileHandle(ha, pFileEntry);
-        if(hf == NULL)
+        if((hf = STORM_ALLOC(TMPQFile, 1)) == NULL)
             nError = ERROR_NOT_ENOUGH_MEMORY;
     }
 
     // Initialize file handle
     if(nError == ERROR_SUCCESS)
     {
+        memset(hf, 0, sizeof(TMPQFile));
+        hf->pFileEntry = pFileEntry;
+        hf->dwMagic = ID_MPQ_FILE;
+        hf->ha = ha;
+
+        hf->MpqFilePos   = pFileEntry->ByteOffset;
+        hf->RawFilePos   = ha->MpqPos + hf->MpqFilePos;
+        hf->dwDataSize   = pFileEntry->dwFileSize;
+
         // If the MPQ has sector CRC enabled, enable if for the file
         if(ha->dwFlags & MPQ_FLAG_CHECK_SECTOR_CRC)
             hf->bCheckSectorCRCs = true;
@@ -399,7 +413,7 @@ bool WINAPI SFileOpenFileEx(HANDLE hMpq, const char * szFileName, DWORD dwSearch
         if(bOpenByIndex == false)
         {
             // If there is no file name yet, allocate it
-            AllocateFileName(ha, pFileEntry, szFileName);
+            AllocateFileName(pFileEntry, szFileName);
 
             // If the file is encrypted, we should detect the file key
             if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
@@ -418,16 +432,22 @@ bool WINAPI SFileOpenFileEx(HANDLE hMpq, const char * szFileName, DWORD dwSearch
         }
     }
 
-    // Cleanup and exit
+    // If the file is actually a patch file, we have to load the patch file header
+    if(nError == ERROR_SUCCESS && pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE)
+    {
+        assert(hf->pPatchInfo == NULL);
+        nError = AllocatePatchInfo(hf, true);
+    }
+
+    // Cleanup
     if(nError != ERROR_SUCCESS)
     {
         SetLastError(nError);
-        FreeFileHandle(hf);
-        return false;
+        FreeMPQFile(hf);
     }
 
     *phFile = hf;
-    return true;
+    return (nError == ERROR_SUCCESS);
 }
 
 //-----------------------------------------------------------------------------
@@ -436,14 +456,14 @@ bool WINAPI SFileOpenFileEx(HANDLE hMpq, const char * szFileName, DWORD dwSearch
 bool WINAPI SFileCloseFile(HANDLE hFile)
 {
     TMPQFile * hf = (TMPQFile *)hFile;
-    
-    if(!IsValidFileHandle(hFile))
+
+    if(!IsValidFileHandle(hf))
     {
         SetLastError(ERROR_INVALID_HANDLE);
         return false;
     }
 
     // Free the structure
-    FreeFileHandle(hf);
+    FreeMPQFile(hf);
     return true;
 }
diff --git a/dep/StormLib/src/SFilePatchArchives.cpp b/dep/StormLib/src/SFilePatchArchives.cpp
index 21446d8c6..fe900486c 100644
--- a/dep/StormLib/src/SFilePatchArchives.cpp
+++ b/dep/StormLib/src/SFilePatchArchives.cpp
@@ -15,10 +15,6 @@
 //-----------------------------------------------------------------------------
 // Local structures
 
-#define PATCH_SIGNATURE_HEADER 0x48435450
-#define PATCH_SIGNATURE_MD5    0x5f35444d
-#define PATCH_SIGNATURE_XFRM   0x4d524658
-
 typedef struct _BLIZZARD_BSDIFF40_FILE
 {
     ULONGLONG Signature;
@@ -27,40 +23,49 @@ typedef struct _BLIZZARD_BSDIFF40_FILE
     ULONGLONG NewFileSize;
 } BLIZZARD_BSDIFF40_FILE, *PBLIZZARD_BSDIFF40_FILE;
 
-//-----------------------------------------------------------------------------
-// Local variables
-
-static const char * LanguageList[] =
-{
-    "deDE",
-    "enCN",
-    "enGB",
-    "enTW",
-    "enUS",
-    "esES",
-    "esMX",
-    "frFR",
-    "koKR",
-    "ptBR",
-    "ptPT",
-    "ruRU",
-    "zhCN",
-    "zhTW",
-    NULL
-};
-
 //-----------------------------------------------------------------------------
 // Local functions
 
+static bool GetDefaultPatchPrefix(
+        const TCHAR * szBaseMpqName,
+        char * szBuffer)
+{
+    const TCHAR * szExtension;
+    const TCHAR * szDash;
+
+    // Ensure that both names are plain names
+    szBaseMpqName = GetPlainFileNameT(szBaseMpqName);
+
+    // Patch prefix is for the Cataclysm MPQs, whose names
+    // are like "locale-enGB.MPQ" or "speech-enGB.MPQ"
+    szExtension = _tcsrchr(szBaseMpqName, _T('.'));
+    szDash = _tcsrchr(szBaseMpqName, _T('-'));
+    strcpy(szBuffer, "Base");
+
+    // If the length of the prefix doesn't match, use default one
+    if(szExtension != NULL && szDash != NULL && (szExtension - szDash) == 5)
+    {
+        // Copy the prefix
+        szBuffer[0] = (char)szDash[1];
+        szBuffer[1] = (char)szDash[2];
+        szBuffer[2] = (char)szDash[3];
+        szBuffer[3] = (char)szDash[4];
+        szBuffer[4] = 0;
+    }
+
+    return true;
+}
+
 static void Decompress_RLE(LPBYTE pbDecompressed, DWORD cbDecompressed, LPBYTE pbCompressed, DWORD cbCompressed)
 {
     LPBYTE pbDecompressedEnd = pbDecompressed + cbDecompressed;
     LPBYTE pbCompressedEnd = pbCompressed + cbCompressed;
-    BYTE RepeatCount; 
+    BYTE RepeatCount;
     BYTE OneByte;
 
     // Cut the initial DWORD from the compressed chunk
     pbCompressed += sizeof(DWORD);
+    cbCompressed -= sizeof(DWORD);
 
     // Pre-fill decompressed buffer with zeros
     memset(pbDecompressed, 0, cbDecompressed);
@@ -69,7 +74,7 @@ static void Decompress_RLE(LPBYTE pbDecompressed, DWORD cbDecompressed, LPBYTE p
     while(pbCompressed < pbCompressedEnd && pbDecompressed < pbDecompressedEnd)
     {
         OneByte = *pbCompressed++;
-        
+
         // Is it a repetition byte ?
         if(OneByte & 0x80)
         {
@@ -89,7 +94,7 @@ static void Decompress_RLE(LPBYTE pbDecompressed, DWORD cbDecompressed, LPBYTE p
     }
 }
 
-static int LoadFilePatch_COPY(TMPQFile * hf, TPatchHeader * pPatchHeader)
+static int LoadMpqPatch_COPY(TMPQFile * hf, TPatchHeader * pPatchHeader)
 {
     int nError = ERROR_SUCCESS;
 
@@ -115,7 +120,7 @@ static int LoadFilePatch_COPY(TMPQFile * hf, TPatchHeader * pPatchHeader)
     return nError;
 }
 
-static int LoadFilePatch_BSD0(TMPQFile * hf, TPatchHeader * pPatchHeader)
+static int LoadMpqPatch_BSD0(TMPQFile * hf, TPatchHeader * pPatchHeader)
 {
     LPBYTE pbDecompressed = NULL;
     LPBYTE pbCompressed = NULL;
@@ -128,7 +133,7 @@ static int LoadFilePatch_BSD0(TMPQFile * hf, TPatchHeader * pPatchHeader)
     cbCompressed = pPatchHeader->dwXfrmBlockSize - SIZE_OF_XFRM_HEADER;
     pbCompressed = STORM_ALLOC(BYTE, cbCompressed);
     if(pbCompressed == NULL)
-        nError = ERROR_NOT_ENOUGH_MEMORY;
+        nError = ERROR_SUCCESS;
 
     // Read the compressed patch data
     if(nError == ERROR_SUCCESS)
@@ -173,38 +178,46 @@ static int LoadFilePatch_BSD0(TMPQFile * hf, TPatchHeader * pPatchHeader)
     return nError;
 }
 
-static int ApplyFilePatch_COPY(
-    TMPQFile * hfFrom,
-    TMPQFile * hf,
-    TPatchHeader * pPatchHeader)
+static int ApplyMpqPatch_COPY(
+        TMPQFile * hf,
+        TPatchHeader * pPatchHeader)
 {
-    // Sanity checks
-    assert(hf->cbFileData == (pPatchHeader->dwXfrmBlockSize - SIZE_OF_XFRM_HEADER));
-    assert(hf->pbFileData != NULL);
-    hfFrom = hfFrom;
+    LPBYTE pbNewFileData;
+    DWORD cbNewFileData;
+
+    // Allocate space for new file data
+    cbNewFileData = pPatchHeader->dwXfrmBlockSize - SIZE_OF_XFRM_HEADER;
+    pbNewFileData = STORM_ALLOC(BYTE, cbNewFileData);
+    if(pbNewFileData == NULL)
+        return ERROR_NOT_ENOUGH_MEMORY;
 
     // Copy the patch data as-is
-    memcpy(hf->pbFileData, (LPBYTE)pPatchHeader + sizeof(TPatchHeader), hf->cbFileData);
+    memcpy(pbNewFileData, (LPBYTE)pPatchHeader + sizeof(TPatchHeader), cbNewFileData);
+
+    // Free the old file data
+    STORM_FREE(hf->pbFileData);
+
+    // Put the new file data there
+    hf->pbFileData = pbNewFileData;
+    hf->cbFileData = cbNewFileData;
     return ERROR_SUCCESS;
 }
 
-static int ApplyFilePatch_BSD0(
-    TMPQFile * hfFrom,
-    TMPQFile * hf,
-    TPatchHeader * pPatchHeader)
+static int ApplyMpqPatch_BSD0(
+        TMPQFile * hf,
+        TPatchHeader * pPatchHeader)
 {
     PBLIZZARD_BSDIFF40_FILE pBsdiff;
     LPDWORD pCtrlBlock;
     LPBYTE pbPatchData = (LPBYTE)pPatchHeader + sizeof(TPatchHeader);
     LPBYTE pDataBlock;
     LPBYTE pExtraBlock;
-    LPBYTE pbOldData = hfFrom->pbFileData;
-    LPBYTE pbNewData = hf->pbFileData;
-    DWORD dwCombineSize;
+    LPBYTE pbNewData = NULL;
+    LPBYTE pbOldData = (LPBYTE)hf->pbFileData;
     DWORD dwNewOffset = 0;                          // Current position to patch
     DWORD dwOldOffset = 0;                          // Current source position
     DWORD dwNewSize;                                // Patched file size
-    DWORD dwOldSize = hfFrom->cbFileData;           // File size before patch
+    DWORD dwOldSize = hf->cbFileData;               // File size before patch
 
     // Get pointer to the patch header
     // Format of BSDIFF header corresponds to original BSDIFF, which is:
@@ -232,6 +245,11 @@ static int ApplyFilePatch_BSD0(
     pExtraBlock = (LPBYTE)pbPatchData;
     dwNewSize = (DWORD)BSWAP_INT64_UNSIGNED(pBsdiff->NewFileSize);
 
+    // Allocate new buffer
+    pbNewData = STORM_ALLOC(BYTE, dwNewSize);
+    if(pbNewData == NULL)
+        return ERROR_NOT_ENOUGH_MEMORY;
+
     // Now patch the file
     while(dwNewOffset < dwNewSize)
     {
@@ -242,26 +260,31 @@ static int ApplyFilePatch_BSD0(
 
         // Sanity check
         if((dwNewOffset + dwAddDataLength) > dwNewSize)
+        {
+            STORM_FREE(pbNewData);
             return ERROR_FILE_CORRUPT;
+        }
 
         // Read the diff string to the target buffer
         memcpy(pbNewData + dwNewOffset, pDataBlock, dwAddDataLength);
         pDataBlock += dwAddDataLength;
 
-        // Get the longest block that we can combine
-        dwCombineSize = ((dwOldOffset + dwAddDataLength) >= dwOldSize) ? (dwOldSize - dwOldOffset) : dwAddDataLength;
-
         // Now combine the patch data with the original file
-        for(i = 0; i < dwCombineSize; i++)
-            pbNewData[dwNewOffset + i] = pbNewData[dwNewOffset + i] + pbOldData[dwOldOffset + i];
-        
-        // Move the offsets 
-        dwNewOffset += dwAddDataLength;
-        dwOldOffset += dwAddDataLength;
+        for(i = 0; i < dwAddDataLength; i++)
+        {
+            if(dwOldOffset < dwOldSize)
+                pbNewData[dwNewOffset] = pbNewData[dwNewOffset] + pbOldData[dwOldOffset];
+
+            dwNewOffset++;
+            dwOldOffset++;
+        }
 
         // Sanity check
         if((dwNewOffset + dwMovDataLength) > dwNewSize)
+        {
+            STORM_FREE(pbNewData);
             return ERROR_FILE_CORRUPT;
+        }
 
         // Copy the data from the extra block in BSDIFF patch
         memcpy(pbNewData + dwNewOffset, pExtraBlock, dwMovDataLength);
@@ -275,12 +298,17 @@ static int ApplyFilePatch_BSD0(
         pCtrlBlock += 3;
     }
 
-    // Success
+    // Free the old file data
+    STORM_FREE(hf->pbFileData);
+
+    // Put the new data to the fil structure
+    hf->pbFileData = pbNewData;
+    hf->cbFileData = dwNewSize;
     return ERROR_SUCCESS;
 }
 
 
-static int LoadFilePatch(TMPQFile * hf)
+static int LoadMpqPatch(TMPQFile * hf)
 {
     TPatchHeader PatchHeader;
     DWORD dwBytesRead;
@@ -300,7 +328,7 @@ static int LoadFilePatch(TMPQFile * hf)
         PatchHeader.dwXfrmBlockSize = BSWAP_INT32_UNSIGNED(PatchHeader.dwXfrmBlockSize);
         PatchHeader.dwPatchType     = BSWAP_INT32_UNSIGNED(PatchHeader.dwPatchType);
 
-        if(PatchHeader.dwSignature != PATCH_SIGNATURE_HEADER || PatchHeader.dwMD5 != PATCH_SIGNATURE_MD5 || PatchHeader.dwXFRM != PATCH_SIGNATURE_XFRM)
+        if(PatchHeader.dwSignature != 0x48435450 || PatchHeader.dwMD5 != 0x5f35444d || PatchHeader.dwXFRM != 0x4d524658)
             nError = ERROR_FILE_CORRUPT;
     }
 
@@ -309,65 +337,52 @@ static int LoadFilePatch(TMPQFile * hf)
     {
         switch(PatchHeader.dwPatchType)
         {
-            case 0x59504f43:    // 'COPY'
-                nError = LoadFilePatch_COPY(hf, &PatchHeader);
-                break;
+        case 0x59504f43:    // 'COPY'
+            nError = LoadMpqPatch_COPY(hf, &PatchHeader);
+            break;
 
-            case 0x30445342:    // 'BSD0'
-                nError = LoadFilePatch_BSD0(hf, &PatchHeader);
-                break;
+        case 0x30445342:    // 'BSD0'
+            nError = LoadMpqPatch_BSD0(hf, &PatchHeader);
+            break;
 
-            default:
-                nError = ERROR_FILE_CORRUPT;
-                break;
+        default:
+            nError = ERROR_FILE_CORRUPT;
+            break;
         }
     }
 
     return nError;
 }
 
-static int ApplyFilePatch(
-    TMPQFile * hfBase,          // The file in the base MPQ
-    TMPQFile * hfPrev,          // The file in the previous MPQ
-    TMPQFile * hf)
+static int ApplyMpqPatch(
+        TMPQFile * hf,
+        TPatchHeader * pPatchHeader)
 {
-    TPatchHeader * pPatchHeader = hf->pPatchHeader;
-    TMPQFile * hfFrom = NULL;
     int nError = ERROR_SUCCESS;
 
-    // Sanity checks
-    assert(hf->pbFileData == NULL);
-
-    // Either take the base version or the previous version
-    if(!memcmp(hfBase->FileDataMD5, pPatchHeader->md5_before_patch, MD5_DIGEST_SIZE))
-        hfFrom = hfBase;
-    if(!memcmp(hfPrev->FileDataMD5, pPatchHeader->md5_before_patch, MD5_DIGEST_SIZE))
-        hfFrom = hfPrev;
-    if(hfFrom == NULL)
-        return ERROR_FILE_CORRUPT;
-
-    // Allocate the buffer for patched file content
-    hf->pbFileData = STORM_ALLOC(BYTE, pPatchHeader->dwSizeAfterPatch);
-    hf->cbFileData = pPatchHeader->dwSizeAfterPatch;
-    if(hf->pbFileData == NULL)
-        return ERROR_NOT_ENOUGH_MEMORY;
+    // Verify the original file before patching
+    if(pPatchHeader->dwSizeBeforePatch != 0)
+    {
+        if(!VerifyDataBlockHash(hf->pbFileData, hf->cbFileData, pPatchHeader->md5_before_patch))
+            nError = ERROR_FILE_CORRUPT;
+    }
 
     // Apply the patch
     if(nError == ERROR_SUCCESS)
     {
         switch(pPatchHeader->dwPatchType)
         {
-            case 0x59504f43:    // 'COPY'
-                nError = ApplyFilePatch_COPY(hfFrom, hf, pPatchHeader);
-                break;
+        case 0x59504f43:    // 'COPY'
+            nError = ApplyMpqPatch_COPY(hf, pPatchHeader);
+            break;
 
-            case 0x30445342:    // 'BSD0'
-                nError = ApplyFilePatch_BSD0(hfFrom, hf, pPatchHeader);
-                break;
+        case 0x30445342:    // 'BSD0'
+            nError = ApplyMpqPatch_BSD0(hf, pPatchHeader);
+            break;
 
-            default:
-                nError = ERROR_FILE_CORRUPT;
-                break;
+        default:
+            nError = ERROR_FILE_CORRUPT;
+            break;
         }
     }
 
@@ -377,267 +392,11 @@ static int ApplyFilePatch(
         // Verify the patched file
         if(!VerifyDataBlockHash(hf->pbFileData, hf->cbFileData, pPatchHeader->md5_after_patch))
             nError = ERROR_FILE_CORRUPT;
-        
-        // Copy the MD5 of the new block
-        memcpy(hf->FileDataMD5, pPatchHeader->md5_after_patch, MD5_DIGEST_SIZE);
     }
 
     return nError;
 }
 
-static void FreePatchData(TMPQFile * hf)
-{
-    STORM_FREE(hf->pbFileData);
-    hf->pbFileData = NULL;
-    hf->cbFileData = 0;
-
-    STORM_FREE(hf->pPatchHeader);
-    hf->pPatchHeader = NULL;
-}
-
-//-----------------------------------------------------------------------------
-// Local functions (patch prefix matching)
-
-static TFileEntry * FindMd5ListFile(TMPQArchive * ha)
-{
-    TFileEntry * pFileEntry = ha->pFileTable + ha->dwFileTableSize;
-    char * szLstName;
-    size_t nTryCount = 0;
-    size_t nLength;
-
-    // Check every file entry for "*-md5.lst".
-    // Go backwards, as the entry is usually at the end of the file table
-    while(pFileEntry > ha->pFileTable && nTryCount < 10)
-    {
-        // The file name must be valid
-        if(pFileEntry->szFileName != NULL)
-        {
-            // Get the name and length
-            szLstName = pFileEntry->szFileName;
-            nLength = strlen(szLstName);
-
-            // Check for the tail name
-            if(!_stricmp(szLstName + nLength - 8, "-md5.lst"))
-                return pFileEntry;
-        }
-
-        // Move back
-        pFileEntry--;
-        nTryCount++;
-    }
-
-    // Not found, sorry
-    return NULL;
-}
-
-static bool CreatePatchPrefix(TMPQArchive * ha, const char * szFileName, const char * szPrefixEnd)
-{
-    TMPQNamePrefix * pNewPrefix;
-    size_t nLength;
-
-    // If the end of the patch prefix was not entered, find it
-    if(szFileName != NULL && szPrefixEnd == NULL)
-        szPrefixEnd = szFileName + strlen(szFileName);
-
-    // Create the patch prefix
-    nLength = (szPrefixEnd - szFileName);
-    pNewPrefix = (TMPQNamePrefix *)STORM_ALLOC(BYTE, sizeof(TMPQNamePrefix) + nLength);
-    if(pNewPrefix != NULL)
-    {
-        // Fill the name prefix
-        pNewPrefix->nLength = nLength;
-        pNewPrefix->szPatchPrefix[0] = 0;
-        
-        // Fill the name prefix. Also add the backslash
-        if(szFileName && nLength)
-        {
-            memcpy(pNewPrefix->szPatchPrefix, szFileName, nLength);
-            pNewPrefix->szPatchPrefix[nLength] = 0;
-        }
-    }
-
-    ha->pPatchPrefix = pNewPrefix;
-    return (pNewPrefix != NULL);
-}
-
-static bool IsMatchingPatchFile(
-    TMPQArchive * ha,
-    const char * szFileName,
-    LPBYTE pbFileMd5)
-{
-    TPatchHeader PatchHeader = {0};
-    HANDLE hFile = NULL;
-    DWORD dwTransferred = 0;
-    bool bResult = false;
-
-    // Open the file and load the patch header
-    if(SFileOpenFileEx((HANDLE)ha, szFileName, SFILE_OPEN_BASE_FILE, &hFile))
-    {
-        // Load the patch header
-        SFileReadFile(hFile, &PatchHeader, sizeof(TPatchHeader), &dwTransferred, NULL);
-        BSWAP_ARRAY32_UNSIGNED(pPatchHeader, sizeof(DWORD) * 6);
-
-        // If the file contains an incremental patch,
-        // compare the "MD5 before patching" with the base file MD5
-        if(dwTransferred == sizeof(TPatchHeader) && PatchHeader.dwSignature == PATCH_SIGNATURE_HEADER)
-            bResult = (!memcmp(PatchHeader.md5_before_patch, pbFileMd5, MD5_DIGEST_SIZE));
-
-        // Close the file
-        SFileCloseFile(hFile);
-    }
-
-    return bResult;
-}
-
-static const char * GetLstFileLanguage(const char * szFileName)
-{
-    char szLstSuffix[0x80];
-    size_t nLength;
-    size_t nSuffixLength;
-
-    // Each language-dependent file ends with "xxXX-md5.lst"
-    nLength = strlen(szFileName);
-    if(nLength < 12)
-        return NULL;
-
-    // Try each and every possibility
-    for(size_t i = 0; LanguageList[i] != NULL; i++)
-    {
-        nSuffixLength = sprintf(szLstSuffix, "%s-md5.lst", LanguageList[i]);
-        assert(nSuffixLength == 12);
-
-        if(!_stricmp(szFileName + nLength - nSuffixLength, szLstSuffix))
-            return LanguageList[i];
-    }
-
-    return NULL;
-}
-
-static bool FindPatchPrefix_WoW_13164_13623(TMPQArchive * haBase, TMPQArchive * haPatch)
-{
-    TFileEntry * pFileEntry;
-    const char * szFilePrefix = "Base";
-    const char * szLanguage;
-    char szNamePrefix[0x10];
-    int nLength;
-
-    // Find a *-md5.lst file in the base archive
-    pFileEntry = FindMd5ListFile(haBase);
-    if(pFileEntry == NULL)
-        return false;
-
-    // Language-specific MPQs have the language identifier right before extension
-    szLanguage = GetLstFileLanguage(pFileEntry->szFileName);
-    if(szLanguage != NULL)
-        szFilePrefix = szLanguage;
-
-    // Format the name prefix
-    nLength = sprintf(szNamePrefix, "%s\\", szFilePrefix);
-    return CreatePatchPrefix(haPatch, szNamePrefix, &szNamePrefix[nLength]);
-}
-
-//
-// Find match in Starcraft II patch MPQs
-// Match a LST file in the root directory if the MPQ with any of the file in subdirectories
-//
-// The problem:
-// Base:  enGB-md5.lst
-// Patch: Campaigns\Liberty.SC2Campaign\enGB.SC2Assets\enGB-md5.lst
-//        Campaigns\Liberty.SC2Campaign\enGB.SC2Data\enGB-md5.lst
-//        Campaigns\LibertyStory.SC2Campaign\enGB.SC2Data\enGB-md5.lst
-//        Campaigns\LibertyStory.SC2Campaign\enGB.SC2Data\enGB-md5.lst Mods\Core.SC2Mod\enGB.SC2Assets\enGB-md5.lst
-//        Mods\Core.SC2Mod\enGB.SC2Data\enGB-md5.lst
-//        Mods\Liberty.SC2Mod\enGB.SC2Assets\enGB-md5.lst
-//        Mods\Liberty.SC2Mod\enGB.SC2Data\enGB-md5.lst
-//        Mods\LibertyMulti.SC2Mod\enGB.SC2Data\enGB-md5.lst
-//
-// Solution:
-// We need to match the file by its MD5
-//
-
-static bool FindPatchPrefix_SC2(TMPQArchive * haBase, TMPQArchive * haPatch)
-{
-    TFileEntry * pFileTableEnd;
-    TFileEntry * pFileEntry;
-    TFileEntry * pBaseEntry;
-    const char * szPlainName;
-    char * szLstFileName;
-    size_t cchWorkBuffer = 0x400;
-    size_t cchBaseName;
-    size_t cchDirName;
-    bool bResult = false;
-
-    // Find a *-md5.lst file in the base archive
-    pBaseEntry = FindMd5ListFile(haBase);
-    if(pBaseEntry == NULL)
-        return false;
-    cchBaseName = strlen(pBaseEntry->szFileName) + 1;
-
-    // Allocate working buffer for merging LST file
-    szLstFileName = STORM_ALLOC(char, cchWorkBuffer);
-    if(szLstFileName != NULL)
-    {
-        // Find that file in the patch MPQ
-        pFileTableEnd = haPatch->pFileTable + haPatch->dwFileTableSize;
-        for(pFileEntry = haPatch->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-        {
-            // Find the "(patch_metadata)" file within that folder
-            // Note that the file is always relatively small and contains the patch prefix
-            // Checking for file size greatly speeds up the search process
-            if(pFileEntry->szFileName && !(pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) && (0 < pFileEntry->dwFileSize && pFileEntry->dwFileSize < 0x40))
-            {
-                // If the plain file name matches, we need to check its MD5
-                szPlainName = GetPlainFileName(pFileEntry->szFileName);
-                cchDirName = (size_t)(szPlainName - pFileEntry->szFileName);
-
-                // The file name must not too long and must be PATCH_METADATA_NAME
-                if((cchDirName + cchBaseName) < cchWorkBuffer && _stricmp(szPlainName, PATCH_METADATA_NAME) == 0)
-                {
-                    // Construct the name of the eventuall LST file
-                    memcpy(szLstFileName, pFileEntry->szFileName, cchDirName);
-                    memcpy(szLstFileName + cchDirName, pBaseEntry->szFileName, cchBaseName);
-
-                    // If there is the "*-md5.lst" file in that directory, we check its MD5
-                    if(IsMatchingPatchFile(haPatch, szLstFileName, pBaseEntry->md5))
-                    {
-                        bResult = CreatePatchPrefix(haPatch, pFileEntry->szFileName, szPlainName);
-                        break;
-                    }
-                }
-            }
-        }
-
-        // Free the work buffer
-        STORM_FREE(szLstFileName);
-    }
-
-    return bResult;
-}
-
-static bool FindPatchPrefix(TMPQArchive * haBase, TMPQArchive * haPatch, const char * szPatchPathPrefix)
-{
-    // If the patch prefix was explicitly entered, we use that one
-    if(szPatchPathPrefix != NULL)
-        return CreatePatchPrefix(haPatch, szPatchPathPrefix, szPatchPathPrefix + strlen(szPatchPathPrefix));
-
-    // Patches for World of Warcraft - mostly the do not use prefix.
-    // Those who do, they have the (patch_metadata) file present in the "base" subdirectory.
-    // All patches that use patch prefix have the "base\\(patch_metadata) file present
-    if(GetFileEntryAny(haPatch, "base\\" PATCH_METADATA_NAME))
-        return FindPatchPrefix_WoW_13164_13623(haBase, haPatch);
-
-    // Updates for Starcraft II
-    // Match: LocalizedData\GameHotkeys.txt <==> Campaigns\Liberty.SC2Campaign\enGB.SC2Data\LocalizedData\GameHotkeys.txt 
-    // All Starcraft II base archives seem to have the file "StreamingBuckets.txt" present
-    if(GetFileEntryAny(haBase, "StreamingBuckets.txt"))
-        return FindPatchPrefix_SC2(haBase, haPatch);
-
-    // Diablo III patch MPQs don't use patch prefix
-    // Hearthstone MPQs don't use patch prefix
-    CreatePatchPrefix(haPatch, NULL, NULL);
-    return true;
-}
-
 //-----------------------------------------------------------------------------
 // Public functions (StormLib internals)
 
@@ -666,75 +425,34 @@ bool IsIncrementalPatchFile(const void * pvData, DWORD cbData, LPDWORD pdwPatche
     return false;
 }
 
-//
-// Note: The patch may either be applied to the base file or to the previous version
-// In Starcraft II, Mods\Core.SC2Mod\Base.SC2Data, file StreamingBuckets.txt:
-//
-// Base file MD5: 31376b0344b6df59ad009d4296125539
-//
-// s2-update-base-23258: from 31376b0344b6df59ad009d4296125539 to 941a82683452e54bf024a8d491501824
-// s2-update-base-24540: from 31376b0344b6df59ad009d4296125539 to 941a82683452e54bf024a8d491501824
-// s2-update-base-26147: from 31376b0344b6df59ad009d4296125539 to d5d5253c762fac6b9761240288a0771a
-// s2-update-base-28522: from 31376b0344b6df59ad009d4296125539 to 5a76c4b356920aab7afd22e0e1913d7a
-// s2-update-base-30508: from 31376b0344b6df59ad009d4296125539 to 8cb0d4799893fe801cc78ae4488a3671
-// s2-update-base-32283: from 31376b0344b6df59ad009d4296125539 to 8cb0d4799893fe801cc78ae4488a3671
-//
-// We don't keep all intermediate versions in memory, as it would cause massive
-// memory usage during patching process. A prime example is the file
-// DBFilesClient\\Item-Sparse.db2 from locale-enGB.MPQ (WoW 16965), which has
-// 9 patches in a row, each requiring 70 MB memory (35 MB patch data + 35 MB work buffer)
-//
-
 int PatchFileData(TMPQFile * hf)
 {
     TMPQFile * hfBase = hf;
-    TMPQFile * hfPrev = hf;
     int nError = ERROR_SUCCESS;
 
-    // We need to calculate the MD5 of the entire file
-    assert(hf->pbFileData != NULL);
-    assert(hf->cbFileData != 0);
-    CalculateDataBlockHash(hf->pbFileData, hf->cbFileData, hf->FileDataMD5);
+    // Move to the first patch
+    hf = hf->hfPatchFile;
 
-    // Apply all patches
-    for(hf = hf->hfPatch; hf != NULL; hf = hf->hfPatch)
+    // Now go through all patches and patch the original data
+    while(hf != NULL)
     {
         // This must be true
         assert(hf->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE);
 
         // Make sure that the patch data is loaded
-        nError = LoadFilePatch(hf);
+        nError = LoadMpqPatch(hf);
         if(nError != ERROR_SUCCESS)
             break;
 
         // Apply the patch
-        nError = ApplyFilePatch(hfBase, hfPrev, hf);
+        nError = ApplyMpqPatch(hfBase, hf->pPatchHeader);
         if(nError != ERROR_SUCCESS)
             break;
 
-        // Only keep base file version and previous version
-        if(hfPrev != hfBase)
-            FreePatchData(hfPrev);
-
-        // Is this the last patch in the chain?
-        if(hf->hfPatch == NULL)
-            break;
-        hfPrev = hf;
+        // Move to the next patch
+        hf = hf->hfPatchFile;
     }
 
-    // When done, we need to rewrite the base file data
-    // with the last of the patch chain
-    if(nError == ERROR_SUCCESS)
-    {
-        // Free the base file data
-        STORM_FREE(hfBase->pbFileData);
-
-        // Switch the latest patched data to the base file
-        hfBase->pbFileData = hf->pbFileData;
-        hfBase->cbFileData = hf->cbFileData;
-        hf->pbFileData = NULL;
-        hf->cbFileData = 0;
-    }
     return nError;
 }
 
@@ -760,25 +478,34 @@ int PatchFileData(TMPQFile * hf)
 //
 
 bool WINAPI SFileOpenPatchArchive(
-    HANDLE hMpq,
-    const TCHAR * szPatchMpqName,
-    const char * szPatchPathPrefix,
-    DWORD dwFlags)
+        HANDLE hMpq,
+        const TCHAR * szPatchMpqName,
+        const char * szPatchPathPrefix,
+        DWORD dwFlags)
 {
     TMPQArchive * haPatch;
     TMPQArchive * ha = (TMPQArchive *)hMpq;
     HANDLE hPatchMpq = NULL;
+    char szPatchPrefixBuff[MPQ_PATCH_PREFIX_LEN];
     int nError = ERROR_SUCCESS;
 
     // Keep compiler happy
     dwFlags = dwFlags;
 
     // Verify input parameters
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
         nError = ERROR_INVALID_HANDLE;
     if(szPatchMpqName == NULL || *szPatchMpqName == 0)
         nError = ERROR_INVALID_PARAMETER;
 
+    // If the user didn't give the patch prefix, get default one
+    if(szPatchPathPrefix != NULL)
+    {
+        // Save length of the patch prefix
+        if(strlen(szPatchPathPrefix) > MPQ_PATCH_PREFIX_LEN - 2)
+            nError = ERROR_INVALID_PARAMETER;
+    }
+
     //
     // We don't allow adding patches to archives that have been open for write
     //
@@ -793,19 +520,38 @@ bool WINAPI SFileOpenPatchArchive(
 
     if(nError == ERROR_SUCCESS)
     {
-        if(!(ha->dwFlags & MPQ_FLAG_READ_ONLY))
+        if(!FileStream_IsReadOnly(ha->pStream))
             nError = ERROR_ACCESS_DENIED;
     }
 
     // Open the archive like it is normal archive
     if(nError == ERROR_SUCCESS)
     {
-        if(!SFileOpenArchive(szPatchMpqName, 0, MPQ_OPEN_READ_ONLY | MPQ_OPEN_PATCH, &hPatchMpq))
+        if(!SFileOpenArchive(szPatchMpqName, 0, MPQ_OPEN_READ_ONLY, &hPatchMpq))
             return false;
         haPatch = (TMPQArchive *)hPatchMpq;
 
-        // We need to remember the proper patch prefix to match names of patched files
-        FindPatchPrefix(ha, (TMPQArchive *)hPatchMpq, szPatchPathPrefix);
+        // Older WoW patches (build 13914) used to have
+        // several language versions in one patch file
+        // Those patches needed to have a path prefix
+        // We can distinguish such patches by not having the (patch_metadata) file
+        if(szPatchPathPrefix == NULL)
+        {
+            if(!SFileHasFile(hPatchMpq, PATCH_METADATA_NAME))
+            {
+                GetDefaultPatchPrefix(FileStream_GetFileName(ha->pStream), szPatchPrefixBuff);
+                szPatchPathPrefix = szPatchPrefixBuff;
+            }
+        }
+
+        // Save the prefix for patch file names.
+        // Make sure that there is backslash after it
+        if(szPatchPathPrefix != NULL && *szPatchPathPrefix != 0)
+        {
+            strcpy(haPatch->szPatchPrefix, szPatchPathPrefix);
+            strcat(haPatch->szPatchPrefix, "\\");
+            haPatch->cchPatchPrefix = strlen(haPatch->szPatchPrefix);
+        }
 
         // Now add the patch archive to the list of patches to the original MPQ
         while(ha != NULL)
@@ -834,7 +580,7 @@ bool WINAPI SFileIsPatchedArchive(HANDLE hMpq)
     TMPQArchive * ha = (TMPQArchive *)hMpq;
 
     // Verify input parameters
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
         return false;
 
     return (ha->haPatch != NULL);
diff --git a/dep/StormLib/src/SFileReadFile.cpp b/dep/StormLib/src/SFileReadFile.cpp
index 6884f5512..741352c2c 100644
--- a/dep/StormLib/src/SFileReadFile.cpp
+++ b/dep/StormLib/src/SFileReadFile.cpp
@@ -13,9 +13,111 @@
 #include "StormLib.h"
 #include "StormCommon.h"
 
+//-----------------------------------------------------------------------------
+// Local structures
+
+struct TFileHeader2Ext
+{
+    DWORD dwOffset00Data;               // Required data at offset 00 (32-bits)
+    DWORD dwOffset00Mask;               // Mask for data at offset 00 (32 bits). 0 = data are ignored
+    DWORD dwOffset04Data;               // Required data at offset 04 (32-bits)
+    DWORD dwOffset04Mask;               // Mask for data at offset 04 (32 bits). 0 = data are ignored
+    const char * szExt;                 // Supplied extension, if the condition is true
+};
+
 //-----------------------------------------------------------------------------
 // Local functions
 
+static void CopyFileName(char * szTarget, const TCHAR * szSource)
+{
+    while(*szSource != 0)
+        *szTarget++ = (char)*szSource++;
+    *szTarget = 0;
+}
+
+static DWORD GetMpqFileCount(TMPQArchive * ha)
+{
+    TFileEntry * pFileTableEnd;
+    TFileEntry * pFileEntry;
+    DWORD dwFileCount = 0;
+
+    // Go through all open MPQs, including patches
+    while(ha != NULL)
+    {
+        // Only count files that are not patch files
+        pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
+        for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
+        {
+            // If the file is patch file and this is not primary archive, skip it
+            // BUGBUG: This errorneously counts non-patch files that are in both
+            // base MPQ and in patches, and increases the number of files by cca 50%
+            if((pFileEntry->dwFlags & (MPQ_FILE_EXISTS | MPQ_FILE_PATCH_FILE)) == MPQ_FILE_EXISTS)
+                dwFileCount++;
+        }
+
+        // Move to the next patch archive
+        ha = ha->haPatch;
+    }
+
+    return dwFileCount;
+}
+
+static bool GetFilePatchChain(TMPQFile * hf, void * pvFileInfo, DWORD cbFileInfo, LPDWORD pcbLengthNeeded)
+{
+    TMPQFile * hfTemp;
+    TCHAR * szPatchChain = (TCHAR *)pvFileInfo;
+    TCHAR * szFileName;
+    size_t cchCharsNeeded = 1;
+    size_t nLength;
+    DWORD cbLengthNeeded;
+
+    // Check if the "hf" is a MPQ file
+    if(hf->pStream != NULL)
+    {
+        // Calculate the length needed
+        szFileName = FileStream_GetFileName(hf->pStream);
+        cchCharsNeeded += _tcslen(szFileName) + 1;
+        cbLengthNeeded = (DWORD)(cchCharsNeeded * sizeof(TCHAR));
+
+        // If we have enough space, copy the file name
+        if(cbFileInfo >= cbLengthNeeded)
+        {
+            nLength = _tcslen(szFileName) + 1;
+            memcpy(szPatchChain, szFileName, nLength * sizeof(TCHAR));
+            szPatchChain += nLength;
+
+            // Terminate the multi-string
+            *szPatchChain = 0;
+        }
+    }
+    else
+    {
+        // Calculate number of characters needed
+        for(hfTemp = hf; hfTemp != NULL; hfTemp = hfTemp->hfPatchFile)
+            cchCharsNeeded += _tcslen(FileStream_GetFileName(hfTemp->ha->pStream)) + 1;
+        cbLengthNeeded = (DWORD)(cchCharsNeeded * sizeof(TCHAR));
+
+        // If we have enough space, the copy the patch chain
+        if(cbFileInfo >= cbLengthNeeded)
+        {
+            for(hfTemp = hf; hfTemp != NULL; hfTemp = hfTemp->hfPatchFile)
+            {
+                szFileName = FileStream_GetFileName(hfTemp->ha->pStream);
+                nLength = _tcslen(szFileName) + 1;
+                memcpy(szPatchChain, szFileName, nLength * sizeof(TCHAR));
+                szPatchChain += nLength;
+            }
+
+            // Terminate the multi-string
+            *szPatchChain = 0;
+        }
+    }
+
+    // Give result length, terminate multi-string and return
+    *pcbLengthNeeded = cbLengthNeeded;
+    return true;
+}
+
 //  hf            - MPQ File handle.
 //  pbBuffer      - Pointer to target buffer to store sectors.
 //  dwByteOffset  - Position of sector in the file (relative to file begin)
@@ -48,7 +150,7 @@ static int ReadMpqSectors(TMPQFile * hf, LPBYTE pbBuffer, DWORD dwByteOffset, DW
     dwRawBytesToRead = dwBytesToRead;
 
     // Perform all necessary work to do with compressed files
-    if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS_MASK)
+    if(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED)
     {
         // If the sector positions are not loaded yet, do it
         if(hf->SectorOffsets == NULL)
@@ -74,12 +176,12 @@ static int ReadMpqSectors(TMPQFile * hf, LPBYTE pbBuffer, DWORD dwByteOffset, DW
 
         // TODO: If the raw data MD5s are not loaded yet, load them now
         // Only do it if the MPQ is of format 4.0
-//      if(ha->pHeader->wFormatVersion >= MPQ_FORMAT_VERSION_4 && ha->pHeader->dwRawChunkSize != 0)
-//      {
-//          nError = AllocateRawMD5s(hf, true);
-//          if(nError != ERROR_SUCCESS)
-//              return nError;
-//      }
+        //      if(ha->pHeader->wFormatVersion >= MPQ_FORMAT_VERSION_4 && ha->pHeader->dwRawChunkSize != 0)
+        //      {
+        //          nError = AllocateRawMD5s(hf, true);
+        //          if(nError != ERROR_SUCCESS)
+        //              return nError;
+        //      }
 
         // If the file is compressed, also allocate secondary buffer
         pbInSector = pbRawSector = STORM_ALLOC(BYTE, dwBytesToRead);
@@ -95,123 +197,120 @@ static int ReadMpqSectors(TMPQFile * hf, LPBYTE pbBuffer, DWORD dwByteOffset, DW
     CalculateRawSectorOffset(RawFilePos, hf, dwRawSectorOffset);
 
     // Set file pointer and read all required sectors
-    if(FileStream_Read(ha->pStream, &RawFilePos, pbInSector, dwRawBytesToRead))
+    if(!FileStream_Read(ha->pStream, &RawFilePos, pbInSector, dwRawBytesToRead))
+        return GetLastError();
+    dwBytesRead = 0;
+
+    // Now we have to decrypt and decompress all file sectors that have been loaded
+    for(DWORD i = 0; i < dwSectorsToRead; i++)
     {
-        // Now we have to decrypt and decompress all file sectors that have been loaded
-        for(DWORD i = 0; i < dwSectorsToRead; i++)
+        DWORD dwRawBytesInThisSector = ha->dwSectorSize;
+        DWORD dwBytesInThisSector = ha->dwSectorSize;
+        DWORD dwIndex = dwSectorIndex + i;
+
+        // If there is not enough bytes in the last sector,
+        // cut the number of bytes in this sector
+        if(dwRawBytesInThisSector > dwBytesToRead)
+            dwRawBytesInThisSector = dwBytesToRead;
+        if(dwBytesInThisSector > dwBytesToRead)
+            dwBytesInThisSector = dwBytesToRead;
+
+        // If the file is compressed, we have to adjust the raw sector size
+        if(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED)
+            dwRawBytesInThisSector = hf->SectorOffsets[dwIndex + 1] - hf->SectorOffsets[dwIndex];
+
+        // If the file is encrypted, we have to decrypt the sector
+        if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
         {
-            DWORD dwRawBytesInThisSector = ha->dwSectorSize;
-            DWORD dwBytesInThisSector = ha->dwSectorSize;
-            DWORD dwIndex = dwSectorIndex + i;
+            BSWAP_ARRAY32_UNSIGNED(pbInSector, dwRawBytesInThisSector);
 
-            // If there is not enough bytes in the last sector,
-            // cut the number of bytes in this sector
-            if(dwRawBytesInThisSector > dwBytesToRead)
-                dwRawBytesInThisSector = dwBytesToRead;
-            if(dwBytesInThisSector > dwBytesToRead)
-                dwBytesInThisSector = dwBytesToRead;
-
-            // If the file is compressed, we have to adjust the raw sector size
-            if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS_MASK)
-                dwRawBytesInThisSector = hf->SectorOffsets[dwIndex + 1] - hf->SectorOffsets[dwIndex];
-
-            // If the file is encrypted, we have to decrypt the sector
-            if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
+            // If we don't know the key, try to detect it by file content
+            if(hf->dwFileKey == 0)
             {
-                BSWAP_ARRAY32_UNSIGNED(pbInSector, dwRawBytesInThisSector);
-
-                // If we don't know the key, try to detect it by file content
+                hf->dwFileKey = DetectFileKeyByContent(pbInSector, dwBytesInThisSector);
                 if(hf->dwFileKey == 0)
                 {
-                    hf->dwFileKey = DetectFileKeyByContent(pbInSector, dwBytesInThisSector, hf->dwDataSize);
-                    if(hf->dwFileKey == 0)
-                    {
-                        nError = ERROR_UNKNOWN_FILE_KEY;
-                        break;
-                    }
-                }
-
-                DecryptMpqBlock(pbInSector, dwRawBytesInThisSector, hf->dwFileKey + dwIndex);
-                BSWAP_ARRAY32_UNSIGNED(pbInSector, dwRawBytesInThisSector);
-            }
-
-            // If the file has sector CRC check turned on, perform it
-            if(hf->bCheckSectorCRCs && hf->SectorChksums != NULL)
-            {
-                DWORD dwAdlerExpected = hf->SectorChksums[dwIndex];
-                DWORD dwAdlerValue = 0;
-
-                // We can only check sector CRC when it's not zero
-                // Neither can we check it if it's 0xFFFFFFFF.
-                if(dwAdlerExpected != 0 && dwAdlerExpected != 0xFFFFFFFF)
-                {
-                    dwAdlerValue = adler32(0, pbInSector, dwRawBytesInThisSector);
-                    if(dwAdlerValue != dwAdlerExpected)
-                    {
-                        nError = ERROR_CHECKSUM_ERROR;
-                        break;
-                    }
-                }
-            }
-
-            // If the sector is really compressed, decompress it.
-            // WARNING : Some sectors may not be compressed, it can be determined only
-            // by comparing uncompressed and compressed size !!!
-            if(dwRawBytesInThisSector < dwBytesInThisSector)
-            {
-                int cbOutSector = dwBytesInThisSector;
-                int cbInSector = dwRawBytesInThisSector;
-                int nResult = 0;
-
-                // Is the file compressed by Blizzard's multiple compression ?
-                if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS)
-                {
-                    if(ha->pHeader->wFormatVersion >= MPQ_FORMAT_VERSION_2)
-                        nResult = SCompDecompress2(pbOutSector, &cbOutSector, pbInSector, cbInSector);
-                    else
-                        nResult = SCompDecompress(pbOutSector, &cbOutSector, pbInSector, cbInSector);
-                }
-
-                // Is the file compressed by PKWARE Data Compression Library ?
-                else if(pFileEntry->dwFlags & MPQ_FILE_IMPLODE)
-                {
-                    nResult = SCompExplode(pbOutSector, &cbOutSector, pbInSector, cbInSector);
-                }
-
-                // Did the decompression fail ?
-                if(nResult == 0)
-                {
-                    nError = ERROR_FILE_CORRUPT;
+                    nError = ERROR_UNKNOWN_FILE_KEY;
                     break;
                 }
             }
-            else
+
+            DecryptMpqBlock(pbInSector, dwRawBytesInThisSector, hf->dwFileKey + dwIndex);
+            BSWAP_ARRAY32_UNSIGNED(pbInSector, dwRawBytesInThisSector);
+        }
+
+        // If the file has sector CRC check turned on, perform it
+        if(hf->bCheckSectorCRCs && hf->SectorChksums != NULL)
+        {
+            DWORD dwAdlerExpected = hf->SectorChksums[dwIndex];
+            DWORD dwAdlerValue = 0;
+
+            // We can only check sector CRC when it's not zero
+            // Neither can we check it if it's 0xFFFFFFFF.
+            if(dwAdlerExpected != 0 && dwAdlerExpected != 0xFFFFFFFF)
             {
-                if(pbOutSector != pbInSector)
-                    memcpy(pbOutSector, pbInSector, dwBytesInThisSector);
+                dwAdlerValue = adler32(0, pbInSector, dwRawBytesInThisSector);
+                if(dwAdlerValue != dwAdlerExpected)
+                {
+                    nError = ERROR_CHECKSUM_ERROR;
+                    break;
+                }
+            }
+        }
+
+        // If the sector is really compressed, decompress it.
+        // WARNING : Some sectors may not be compressed, it can be determined only
+        // by comparing uncompressed and compressed size !!!
+        if(dwRawBytesInThisSector < dwBytesInThisSector)
+        {
+            int cbOutSector = dwBytesInThisSector;
+            int cbInSector = dwRawBytesInThisSector;
+            int nResult = 0;
+
+            // Is the file compressed by Blizzard's multiple compression ?
+            if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS)
+            {
+                if(ha->pHeader->wFormatVersion >= MPQ_FORMAT_VERSION_2)
+                    nResult = SCompDecompress2((char *)pbOutSector, &cbOutSector, (char *)pbInSector, cbInSector);
+                else
+                    nResult = SCompDecompress((char *)pbOutSector, &cbOutSector, (char *)pbInSector, cbInSector);
             }
 
-            // Move pointers
-            dwBytesToRead -= dwBytesInThisSector;
-            dwByteOffset += dwBytesInThisSector;
-            dwBytesRead += dwBytesInThisSector;
-            pbOutSector += dwBytesInThisSector;
-            pbInSector += dwRawBytesInThisSector;
-            dwSectorsDone++;
+            // Is the file compressed by PKWARE Data Compression Library ?
+            else if(pFileEntry->dwFlags & MPQ_FILE_IMPLODE)
+            {
+                nResult = SCompExplode((char *)pbOutSector, &cbOutSector, (char *)pbInSector, cbInSector);
+            }
+
+            // Did the decompression fail ?
+            if(nResult == 0)
+            {
+                nError = ERROR_FILE_CORRUPT;
+                break;
+            }
         }
-    }
-    else
-    {
-        nError = GetLastError();
+        else
+        {
+            if(pbOutSector != pbInSector)
+                memcpy(pbOutSector, pbInSector, dwBytesInThisSector);
+        }
+
+        // Move pointers
+        dwBytesToRead -= dwBytesInThisSector;
+        dwByteOffset += dwBytesInThisSector;
+        dwBytesRead += dwBytesInThisSector;
+        pbOutSector += dwBytesInThisSector;
+        pbInSector += dwRawBytesInThisSector;
+        dwSectorsDone++;
     }
 
     // Free all used buffers
     if(pbRawSector != NULL)
         STORM_FREE(pbRawSector);
-    
+
     // Give the caller thenumber of bytes read
     *pdwBytesRead = dwBytesRead;
-    return nError; 
+    return nError;
 }
 
 static int ReadMpqFileSingleUnit(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos, DWORD dwToRead, LPDWORD pdwBytesRead)
@@ -240,7 +339,7 @@ static int ReadMpqFileSingleUnit(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos
     if(hf->dwSectorOffs != 0)
     {
         // Is the file compressed?
-        if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS_MASK)
+        if(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED)
         {
             // Allocate space for compressed data
             pbCompressed = STORM_ALLOC(BYTE, pFileEntry->dwCmpSize);
@@ -248,7 +347,7 @@ static int ReadMpqFileSingleUnit(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos
                 return ERROR_NOT_ENOUGH_MEMORY;
             pbRawData = pbCompressed;
         }
-        
+
         // Load the raw (compressed, encrypted) data
         if(!FileStream_Read(ha->pStream, &RawFilePos, pbRawData, pFileEntry->dwCmpSize))
         {
@@ -265,7 +364,7 @@ static int ReadMpqFileSingleUnit(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos
         }
 
         // If the file is compressed, we have to decompress it now
-        if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS_MASK)
+        if(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED)
         {
             int cbOutBuffer = (int)hf->dwDataSize;
             int cbInBuffer = (int)pFileEntry->dwCmpSize;
@@ -281,7 +380,7 @@ static int ReadMpqFileSingleUnit(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos
             // --------------------------------------  ---------- -------- -------- ---------------
             // esES\DBFilesClient\LightSkyBox.dbc      0xBE->0xA2  0xBC     0xBC     Yes
             // deDE\DBFilesClient\MountCapability.dbc  0x93->0x77  0x77     0x77     No
-            // 
+            //
 
             if(pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE)
                 cbInBuffer = cbInBuffer - sizeof(TPatchInfo);
@@ -290,115 +389,19 @@ static int ReadMpqFileSingleUnit(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos
             if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS)
             {
                 if(ha->pHeader->wFormatVersion >= MPQ_FORMAT_VERSION_2)
-                    nResult = SCompDecompress2(hf->pbFileSector, &cbOutBuffer, pbRawData, cbInBuffer);
+                    nResult = SCompDecompress2((char *)hf->pbFileSector, &cbOutBuffer, (char *)pbRawData, cbInBuffer);
                 else
-                    nResult = SCompDecompress(hf->pbFileSector, &cbOutBuffer, pbRawData, cbInBuffer);
+                    nResult = SCompDecompress((char *)hf->pbFileSector, &cbOutBuffer, (char *)pbRawData, cbInBuffer);
             }
 
             // Is the file compressed by PKWARE Data Compression Library ?
             // Note: Single unit files compressed with IMPLODE are not supported by Blizzard
             else if(pFileEntry->dwFlags & MPQ_FILE_IMPLODE)
-                nResult = SCompExplode(hf->pbFileSector, &cbOutBuffer, pbRawData, cbInBuffer);
+                nResult = SCompExplode((char *)hf->pbFileSector, &cbOutBuffer, (char *)pbRawData, cbInBuffer);
 
             nError = (nResult != 0) ? ERROR_SUCCESS : ERROR_FILE_CORRUPT;
         }
         else
-        {
-            if(hf->pbFileSector != NULL && pbRawData != hf->pbFileSector)
-                memcpy(hf->pbFileSector, pbRawData, hf->dwDataSize);
-        }
-
-        // Free the decompression buffer.
-        if(pbCompressed != NULL)
-            STORM_FREE(pbCompressed);
-
-        // The file sector is now properly loaded
-        hf->dwSectorOffs = 0;
-    }
-
-    // At this moment, we have the file loaded into the file buffer.
-    // Copy as much as the caller wants
-    if(nError == ERROR_SUCCESS && hf->dwSectorOffs == 0)
-    {
-        // File position is greater or equal to file size ?
-        if(dwFilePos >= hf->dwDataSize)
-        {
-            *pdwBytesRead = 0;
-            return ERROR_SUCCESS;
-        }
-
-        // If not enough bytes remaining in the file, cut them
-        if((hf->dwDataSize - dwFilePos) < dwToRead)
-            dwToRead = (hf->dwDataSize - dwFilePos);
-
-        // Copy the bytes
-        memcpy(pvBuffer, hf->pbFileSector + dwFilePos, dwToRead);
-
-        // Give the number of bytes read
-        *pdwBytesRead = dwToRead;
-        return ERROR_SUCCESS;
-    }
-
-    // An error, sorry
-    return ERROR_CAN_NOT_COMPLETE;
-}
-
-static int ReadMpkFileSingleUnit(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos, DWORD dwToRead, LPDWORD pdwBytesRead)
-{
-    ULONGLONG RawFilePos = hf->RawFilePos + 0x0C;   // For some reason, MPK files start at position (hf->RawFilePos + 0x0C)
-    TMPQArchive * ha = hf->ha;
-    TFileEntry * pFileEntry = hf->pFileEntry;
-    LPBYTE pbCompressed = NULL;
-    LPBYTE pbRawData = hf->pbFileSector;
-    int nError = ERROR_SUCCESS;
-
-    // We do not support patch files in MPK archives
-    assert(hf->pPatchInfo == NULL);
-
-    // If the file buffer is not allocated yet, do it.
-    if(hf->pbFileSector == NULL)
-    {
-        nError = AllocateSectorBuffer(hf);
-        if(nError != ERROR_SUCCESS)
-            return nError;
-        pbRawData = hf->pbFileSector;
-    }
-
-    // If the file sector is not loaded yet, do it
-    if(hf->dwSectorOffs != 0)
-    {
-        // Is the file compressed?
-        if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS_MASK)
-        {
-            // Allocate space for compressed data
-            pbCompressed = STORM_ALLOC(BYTE, pFileEntry->dwCmpSize);
-            if(pbCompressed == NULL)
-                return ERROR_NOT_ENOUGH_MEMORY;
-            pbRawData = pbCompressed;
-        }
-        
-        // Load the raw (compressed, encrypted) data
-        if(!FileStream_Read(ha->pStream, &RawFilePos, pbRawData, pFileEntry->dwCmpSize))
-        {
-            STORM_FREE(pbCompressed);
-            return GetLastError();
-        }
-
-        // If the file is encrypted, we have to decrypt the data first
-        if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
-        {
-            DecryptMpkTable(pbRawData, pFileEntry->dwCmpSize);
-        }
-
-        // If the file is compressed, we have to decompress it now
-        if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS_MASK)
-        {
-            int cbOutBuffer = (int)hf->dwDataSize;
-
-            if(!SCompDecompressMpk(hf->pbFileSector, &cbOutBuffer, pbRawData, (int)pFileEntry->dwCmpSize))
-                nError = ERROR_FILE_CORRUPT;
-        }
-        else
         {
             if(pbRawData != hf->pbFileSector)
                 memcpy(hf->pbFileSector, pbRawData, hf->dwDataSize);
@@ -439,8 +442,7 @@ static int ReadMpkFileSingleUnit(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos
     return ERROR_CAN_NOT_COMPLETE;
 }
 
-
-static int ReadMpqFileSectorFile(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos, DWORD dwBytesToRead, LPDWORD pdwBytesRead)
+static int ReadMpqFile(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos, DWORD dwBytesToRead, LPDWORD pdwBytesRead)
 {
     TMPQArchive * ha = hf->ha;
     LPBYTE pbBuffer = (BYTE *)pvBuffer;
@@ -477,7 +479,7 @@ static int ReadMpqFileSectorFile(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos
     {
         DWORD dwBytesInSector = ha->dwSectorSize;
         DWORD dwBufferOffs = dwFilePos & dwSectorSizeMask;
-        DWORD dwToCopy;                                     
+        DWORD dwToCopy;
 
         // Is the file sector already loaded ?
         if(hf->dwSectorOffs != dwFileSectorPos)
@@ -551,7 +553,7 @@ static int ReadMpqFileSectorFile(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos
 
         // Copy the data from the cached last sector to the caller's buffer
         memcpy(pbBuffer, hf->pbFileSector, dwToCopy);
-        
+
         // Update pointers
         dwTotalBytesRead += dwToCopy;
     }
@@ -568,7 +570,7 @@ static int ReadMpqFilePatchFile(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos,
     int nError = ERROR_SUCCESS;
 
     // Make sure that the patch file is loaded completely
-    if(nError == ERROR_SUCCESS && hf->pbFileData == NULL)
+    if(hf->pbFileData == NULL)
     {
         // Load the original file and store its content to "pbOldData"
         hf->pbFileData = STORM_ALLOC(BYTE, hf->pFileEntry->dwFileSize);
@@ -580,7 +582,7 @@ static int ReadMpqFilePatchFile(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos,
         if(hf->pFileEntry->dwFlags & MPQ_FILE_SINGLE_UNIT)
             nError = ReadMpqFileSingleUnit(hf, hf->pbFileData, 0, hf->cbFileData, &dwBytesRead);
         else
-            nError = ReadMpqFileSectorFile(hf, hf->pbFileData, 0, hf->cbFileData, &dwBytesRead);
+            nError = ReadMpqFile(hf, hf->pbFileData, 0, hf->cbFileData, &dwBytesRead);
 
         // Fix error code
         if(nError == ERROR_SUCCESS && dwBytesRead != hf->cbFileData)
@@ -618,38 +620,6 @@ static int ReadMpqFilePatchFile(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos,
     return nError;
 }
 
-static int ReadMpqFileLocalFile(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos, DWORD dwToRead, LPDWORD pdwBytesRead)
-{
-    ULONGLONG FilePosition1 = dwFilePos;
-    ULONGLONG FilePosition2;
-    DWORD dwBytesRead = 0;
-    int nError = ERROR_SUCCESS;
-
-    assert(hf->pStream != NULL);
-
-    // Because stream I/O functions are designed to read
-    // "all or nothing", we compare file position before and after,
-    // and if they differ, we assume that number of bytes read
-    // is the difference between them
-
-    if(!FileStream_Read(hf->pStream, &FilePosition1, pvBuffer, dwToRead))
-    {
-        // If not all bytes have been read, then return the number of bytes read
-        if((nError = GetLastError()) == ERROR_HANDLE_EOF)
-        {
-            FileStream_GetPos(hf->pStream, &FilePosition2);
-            dwBytesRead = (DWORD)(FilePosition2 - FilePosition1);
-        }
-    }
-    else
-    {
-        dwBytesRead = dwToRead;
-    }
-
-    *pdwBytesRead = dwBytesRead;
-    return nError;
-}
-
 //-----------------------------------------------------------------------------
 // SFileReadFile
 
@@ -663,7 +633,7 @@ bool WINAPI SFileReadFile(HANDLE hFile, void * pvBuffer, DWORD dwToRead, LPDWORD
     lpOverlapped = lpOverlapped;
 
     // Check valid parameters
-    if(!IsValidFileHandle(hFile))
+    if(!IsValidFileHandle(hf))
     {
         SetLastError(ERROR_INVALID_HANDLE);
         return false;
@@ -675,49 +645,60 @@ bool WINAPI SFileReadFile(HANDLE hFile, void * pvBuffer, DWORD dwToRead, LPDWORD
         return false;
     }
 
-    // If we didn't load the patch info yet, do it now
-    if(hf->pFileEntry != NULL && (hf->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) && hf->pPatchInfo == NULL)
-    {
-        nError = AllocatePatchInfo(hf, true);
-        if(nError != ERROR_SUCCESS)
-        {
-            SetLastError(nError);
-            return false;
-        }
-    }
-
     // If the file is local file, read the data directly from the stream
     if(hf->pStream != NULL)
     {
-        nError = ReadMpqFileLocalFile(hf, pvBuffer, hf->dwFilePos, dwToRead, &dwBytesRead);
-    }
+        ULONGLONG FilePosition1;
+        ULONGLONG FilePosition2;
 
-    // If the file is a patch file, we have to read it special way
-    else if(hf->hfPatch != NULL && (hf->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) == 0)
-    {
-        nError = ReadMpqFilePatchFile(hf, pvBuffer, hf->dwFilePos, dwToRead, &dwBytesRead);
-    }
+        // Because stream I/O functions are designed to read
+        // "all or nothing", we compare file position before and after,
+        // and if they differ, we assume that number of bytes read
+        // is the difference between them
 
-    // If the archive is a MPK archive, we need special way to read the file
-    else if(hf->ha->dwSubType == MPQ_SUBTYPE_MPK)
-    {
-        nError = ReadMpkFileSingleUnit(hf, pvBuffer, hf->dwFilePos, dwToRead, &dwBytesRead);
+        FileStream_GetPos(hf->pStream, &FilePosition1);
+        if(!FileStream_Read(hf->pStream, NULL, pvBuffer, dwToRead))
+        {
+            // If not all bytes have been read, then return the number
+            // of bytes read
+            if((nError = GetLastError()) == ERROR_HANDLE_EOF)
+            {
+                FileStream_GetPos(hf->pStream, &FilePosition2);
+                dwBytesRead = (DWORD)(FilePosition2 - FilePosition1);
+            }
+            else
+            {
+                nError = GetLastError();
+            }
+        }
+        else
+        {
+            dwBytesRead = dwToRead;
+        }
     }
-
-    // If the file is single unit file, redirect it to read file 
-    else if(hf->pFileEntry->dwFlags & MPQ_FILE_SINGLE_UNIT)
-    {
-        nError = ReadMpqFileSingleUnit(hf, pvBuffer, hf->dwFilePos, dwToRead, &dwBytesRead);
-    }
-
-    // Otherwise read it as sector based MPQ file
     else
-    {                                                                   
-        nError = ReadMpqFileSectorFile(hf, pvBuffer, hf->dwFilePos, dwToRead, &dwBytesRead);
-    }
+    {
+        // If the file is a patch file, we have to read it special way
+        if(hf->hfPatchFile != NULL && (hf->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) == 0)
+        {
+            nError = ReadMpqFilePatchFile(hf, pvBuffer, hf->dwFilePos, dwToRead, &dwBytesRead);
+        }
 
-    // Increment the file position
-    hf->dwFilePos += dwBytesRead;
+        // If the file is single unit file, redirect it to read file
+        else if(hf->pFileEntry->dwFlags & MPQ_FILE_SINGLE_UNIT)
+        {
+            nError = ReadMpqFileSingleUnit(hf, pvBuffer, hf->dwFilePos, dwToRead, &dwBytesRead);
+        }
+
+        // Otherwise read it as sector based MPQ file
+        else
+        {
+            nError = ReadMpqFile(hf, pvBuffer, hf->dwFilePos, dwToRead, &dwBytesRead);
+        }
+
+        // Increment the file position
+        hf->dwFilePos += dwBytesRead;
+    }
 
     // Give the caller the number of bytes read
     if(pdwRead != NULL)
@@ -743,13 +724,13 @@ DWORD WINAPI SFileGetFileSize(HANDLE hFile, LPDWORD pdwFileSizeHigh)
     TMPQFile * hf = (TMPQFile *)hFile;
 
     // Validate the file handle before we go on
-    if(IsValidFileHandle(hFile))
+    if(IsValidFileHandle(hf))
     {
         // Make sure that the variable is initialized
         FileSize = 0;
 
         // If the file is patched file, we have to get the size of the last version
-        if(hf->hfPatch != NULL)
+        if(hf->hfPatchFile != NULL)
         {
             // Walk through the entire patch chain, take the last version
             while(hf != NULL)
@@ -758,7 +739,7 @@ DWORD WINAPI SFileGetFileSize(HANDLE hFile, LPDWORD pdwFileSizeHigh)
                 FileSize = hf->pFileEntry->dwFileSize;
 
                 // Move to the next patch file in the hierarchy
-                hf = hf->hfPatch;
+                hf = hf->hfPatchFile;
             }
         }
         else
@@ -792,7 +773,7 @@ DWORD WINAPI SFileSetFilePointer(HANDLE hFile, LONG lFilePos, LONG * plFilePosHi
     DWORD dwFilePosHi;
 
     // If the hFile is not a valid file handle, return an error.
-    if(!IsValidFileHandle(hFile))
+    if(!IsValidFileHandle(hf))
     {
         SetLastError(ERROR_INVALID_HANDLE);
         return SFILE_INVALID_POS;
@@ -801,35 +782,35 @@ DWORD WINAPI SFileSetFilePointer(HANDLE hFile, LONG lFilePos, LONG * plFilePosHi
     // Get the relative point where to move from
     switch(dwMoveMethod)
     {
-        case FILE_BEGIN:
-            FilePosition = 0;
-            break;
+    case FILE_BEGIN:
+        FilePosition = 0;
+        break;
 
-        case FILE_CURRENT:
-            if(hf->pStream != NULL)
-            {
-                FileStream_GetPos(hf->pStream, &FilePosition);
-            }
-            else
-            {
-                FilePosition = hf->dwFilePos;
-            }
-            break;
+    case FILE_CURRENT:
+        if(hf->pStream != NULL)
+        {
+            FileStream_GetPos(hf->pStream, &FilePosition);
+        }
+        else
+        {
+            FilePosition = hf->dwFilePos;
+        }
+        break;
 
-        case FILE_END:
-            if(hf->pStream != NULL)
-            {
-                FileStream_GetSize(hf->pStream, &FilePosition);
-            }
-            else
-            {
-                FilePosition = SFileGetFileSize(hFile, NULL);
-            }
-            break;
+    case FILE_END:
+        if(hf->pStream != NULL)
+        {
+            FileStream_GetSize(hf->pStream, &FilePosition);
+        }
+        else
+        {
+            FilePosition = SFileGetFileSize(hFile, NULL);
+        }
+        break;
 
-        default:
-            SetLastError(ERROR_INVALID_PARAMETER);
-            return SFILE_INVALID_POS;
+    default:
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return SFILE_INVALID_POS;
     }
 
     // Now get the move offset. Note that both values form
@@ -841,8 +822,10 @@ DWORD WINAPI SFileSetFilePointer(HANDLE hFile, LONG lFilePos, LONG * plFilePosHi
     MoveOffset = MAKE_OFFSET64(dwFilePosHi, lFilePos);
 
     // Now calculate the new file pointer
-    // Do not allow the file pointer to overflow
-    FilePosition = ((FilePosition + MoveOffset) >= FilePosition) ? (FilePosition + MoveOffset) : 0;
+    // Do not allow the file pointer to go before the begin of the file
+    FilePosition += MoveOffset;
+    if(FilePosition < 0)
+        FilePosition = 0;
 
     // Now apply the file pointer to the file
     if(hf->pStream != NULL)
@@ -876,3 +859,328 @@ DWORD WINAPI SFileSetFilePointer(HANDLE hFile, LONG lFilePos, LONG * plFilePosHi
     }
 }
 
+//-----------------------------------------------------------------------------
+// Tries to retrieve the file name
+
+static TFileHeader2Ext data2ext[] =
+{
+    {0x00005A4D, 0x0000FFFF, 0x00000000, 0x00000000, "exe"},    // EXE files
+    {0x00000006, 0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, "dc6"},    // EXE files
+    {0x1A51504D, 0xFFFFFFFF, 0x00000000, 0x00000000, "mpq"},    // MPQ archive header ID ('MPQ\x1A')
+    {0x46464952, 0xFFFFFFFF, 0x00000000, 0x00000000, "wav"},    // WAVE header 'RIFF'
+    {0x324B4D53, 0xFFFFFFFF, 0x00000000, 0x00000000, "smk"},    // Old "Smacker Video" files 'SMK2'
+    {0x694B4942, 0xFFFFFFFF, 0x00000000, 0x00000000, "bik"},    // Bink video files (new)
+    {0x0801050A, 0xFFFFFFFF, 0x00000000, 0x00000000, "pcx"},    // PCX images used in Diablo I
+    {0x544E4F46, 0xFFFFFFFF, 0x00000000, 0x00000000, "fnt"},    // Font files used in Diablo II
+    {0x6D74683C, 0xFFFFFFFF, 0x00000000, 0x00000000, "html"},   // HTML '<htm'
+    {0x4D54483C, 0xFFFFFFFF, 0x00000000, 0x00000000, "html"},   // HTML '<HTM
+    {0x216F6F57, 0xFFFFFFFF, 0x00000000, 0x00000000, "tbl"},    // Table files
+    {0x31504C42, 0xFFFFFFFF, 0x00000000, 0x00000000, "blp"},    // BLP textures
+    {0x32504C42, 0xFFFFFFFF, 0x00000000, 0x00000000, "blp"},    // BLP textures (v2)
+    {0x584C444D, 0xFFFFFFFF, 0x00000000, 0x00000000, "mdx"},    // MDX files
+    {0x45505954, 0xFFFFFFFF, 0x00000000, 0x00000000, "pud"},    // Warcraft II maps
+    {0x38464947, 0xFFFFFFFF, 0x00000000, 0x00000000, "gif"},    // GIF images 'GIF8'
+    {0x3032444D, 0xFFFFFFFF, 0x00000000, 0x00000000, "m2"},     // WoW ??? .m2
+    {0x43424457, 0xFFFFFFFF, 0x00000000, 0x00000000, "dbc"},    // ??? .dbc
+    {0x47585053, 0xFFFFFFFF, 0x00000000, 0x00000000, "bls"},    // WoW pixel shaders
+    {0xE0FFD8FF, 0xFFFFFFFF, 0x00000000, 0x00000000, "jpg"},    // JPEG image
+    {0x00000000, 0x00000000, 0x00000000, 0x00000000, "xxx"},    // Default extension
+    {0, 0, 0, 0, NULL}                                          // Terminator
+};
+
+bool WINAPI SFileGetFileName(HANDLE hFile, char * szFileName)
+{
+    TFileEntry * pFileEntry;
+    TMPQFile * hf = (TMPQFile *)hFile;  // MPQ File handle
+    char szPseudoName[20];
+    DWORD FirstBytes[2];                // The first 4 bytes of the file
+    DWORD dwFilePos;                    // Saved file position
+    int nError = ERROR_SUCCESS;
+    int i;
+
+    // Pre-zero the output buffer
+    if(szFileName != NULL)
+        *szFileName = 0;
+
+    // Check valid parameters
+    if(!IsValidFileHandle(hf))
+        nError = ERROR_INVALID_HANDLE;
+    pFileEntry = hf->pFileEntry;
+
+    // Only do something if the file name is not filled
+    if(nError == ERROR_SUCCESS && pFileEntry != NULL && pFileEntry->szFileName == NULL)
+    {
+        // Read the first 2 DWORDs bytes from the file
+        FirstBytes[0] = FirstBytes[1] = 0;
+        dwFilePos = SFileSetFilePointer(hf, 0, NULL, FILE_CURRENT);
+        SFileReadFile(hFile, FirstBytes, sizeof(FirstBytes), NULL, NULL);
+        BSWAP_ARRAY32_UNSIGNED(FirstBytes, sizeof(FirstBytes));
+        SFileSetFilePointer(hf, dwFilePos, NULL, FILE_BEGIN);
+
+        // Try to guess file extension from those 2 DWORDs
+        for(i = 0; data2ext[i].szExt != NULL; i++)
+        {
+            if((FirstBytes[0] & data2ext[i].dwOffset00Mask) == data2ext[i].dwOffset00Data &&
+                    (FirstBytes[1] & data2ext[i].dwOffset04Mask) == data2ext[i].dwOffset04Data)
+            {
+                sprintf(szPseudoName, "File%08u.%s", (unsigned int)(pFileEntry - hf->ha->pFileTable), data2ext[i].szExt);
+                break;
+            }
+        }
+
+        // Put the file name to the file table
+        AllocateFileName(pFileEntry, szPseudoName);
+    }
+
+    // Now put the file name to the file structure
+    if(nError == ERROR_SUCCESS && szFileName != NULL)
+    {
+        if(pFileEntry != NULL && pFileEntry->szFileName != NULL)
+            strcpy(szFileName, pFileEntry->szFileName);
+        else if(hf->pStream != NULL)
+            CopyFileName(szFileName, FileStream_GetFileName(hf->pStream));
+    }
+    return (nError == ERROR_SUCCESS);
+}
+
+//-----------------------------------------------------------------------------
+// Retrieves an information about an archive or about a file within the archive
+//
+//  hMpqOrFile - Handle to an MPQ archive or to a file
+//  dwInfoType - Information to obtain
+
+#define VERIFY_MPQ_HANDLE(h)                \
+    if(!IsValidMpqHandle(h))                \
+{                                       \
+    nError = ERROR_INVALID_HANDLE;      \
+    break;                              \
+    }
+
+#define VERIFY_FILE_HANDLE(h)               \
+    if(!IsValidFileHandle(h))               \
+{                                       \
+    nError = ERROR_INVALID_HANDLE;      \
+    break;                              \
+    }
+
+bool WINAPI SFileGetFileInfo(
+        HANDLE hMpqOrFile,
+        DWORD dwInfoType,
+        void * pvFileInfo,
+        DWORD cbFileInfo,
+        LPDWORD pcbLengthNeeded)
+{
+    TMPQArchive * ha = (TMPQArchive *)hMpqOrFile;
+    TMPQBlock * pBlock;
+    TMPQFile * hf = (TMPQFile *)hMpqOrFile;
+    void * pvSrcFileInfo = NULL;
+    DWORD cbLengthNeeded = 0;
+    DWORD dwIsReadOnly;
+    DWORD dwFileCount = 0;
+    DWORD dwFileIndex;
+    DWORD dwFileKey;
+    DWORD i;
+    int nError = ERROR_SUCCESS;
+
+    switch(dwInfoType)
+    {
+    case SFILE_INFO_ARCHIVE_NAME:
+        VERIFY_MPQ_HANDLE(ha);
+
+        // pvFileInfo receives the name of the archive, terminated by 0
+        pvSrcFileInfo = FileStream_GetFileName(ha->pStream);
+        cbLengthNeeded = (DWORD)(_tcslen((TCHAR *)pvSrcFileInfo) + 1) * sizeof(TCHAR);
+        break;
+
+    case SFILE_INFO_ARCHIVE_SIZE:       // Size of the archive
+        VERIFY_MPQ_HANDLE(ha);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &ha->pHeader->dwArchiveSize;
+        break;
+
+    case SFILE_INFO_MAX_FILE_COUNT:     // Max. number of files in the MPQ
+        VERIFY_MPQ_HANDLE(ha);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &ha->dwMaxFileCount;
+        break;
+
+    case SFILE_INFO_HASH_TABLE_SIZE:    // Size of the hash table
+        VERIFY_MPQ_HANDLE(ha);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &ha->pHeader->dwHashTableSize;
+        break;
+
+    case SFILE_INFO_BLOCK_TABLE_SIZE:   // Size of the block table
+        VERIFY_MPQ_HANDLE(ha);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &ha->pHeader->dwBlockTableSize;
+        break;
+
+    case SFILE_INFO_SECTOR_SIZE:
+        VERIFY_MPQ_HANDLE(ha);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &ha->dwSectorSize;
+        break;
+
+    case SFILE_INFO_HASH_TABLE:
+        VERIFY_MPQ_HANDLE(ha);
+        cbLengthNeeded = ha->pHeader->dwHashTableSize * sizeof(TMPQHash);
+        pvSrcFileInfo = ha->pHashTable;
+        break;
+
+    case SFILE_INFO_BLOCK_TABLE:
+        VERIFY_MPQ_HANDLE(ha);
+        cbLengthNeeded = ha->dwFileTableSize * sizeof(TMPQBlock);
+        if(cbFileInfo < cbLengthNeeded)
+        {
+            nError = ERROR_INSUFFICIENT_BUFFER;
+            break;
+        }
+
+        // Construct block table from file table size
+        pBlock = (TMPQBlock *)pvFileInfo;
+        for(i = 0; i < ha->dwFileTableSize; i++)
+        {
+            pBlock->dwFilePos = (DWORD)ha->pFileTable[i].ByteOffset;
+            pBlock->dwFSize   = ha->pFileTable[i].dwFileSize;
+            pBlock->dwCSize   = ha->pFileTable[i].dwCmpSize;
+            pBlock->dwFlags   = ha->pFileTable[i].dwFlags;
+            pBlock++;
+        }
+        break;
+
+    case SFILE_INFO_NUM_FILES:
+        VERIFY_MPQ_HANDLE(ha);
+        dwFileCount = GetMpqFileCount(ha);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &dwFileCount;
+        break;
+
+        case SFILE_INFO_STREAM_FLAGS:
+            VERIFY_MPQ_HANDLE(ha);
+            FileStream_GetFlags(ha->pStream, &dwFileKey);
+            cbLengthNeeded = sizeof(DWORD);
+            pvSrcFileInfo = &dwFileKey;
+       break;
+
+    case SFILE_INFO_IS_READ_ONLY:
+        VERIFY_MPQ_HANDLE(ha);
+        dwIsReadOnly = (FileStream_IsReadOnly(ha->pStream) || (ha->dwFlags & MPQ_FLAG_READ_ONLY));
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &dwIsReadOnly;
+        break;
+
+    case SFILE_INFO_HASH_INDEX:
+        VERIFY_FILE_HANDLE(hf);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &hf->pFileEntry->dwHashIndex;
+        break;
+
+    case SFILE_INFO_CODENAME1:
+        VERIFY_FILE_HANDLE(hf);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &hf->pFileEntry->dwHashIndex;
+        if(ha->pHashTable != NULL)
+            pvSrcFileInfo = &ha->pHashTable[hf->pFileEntry->dwHashIndex].dwName1;
+        break;
+
+    case SFILE_INFO_CODENAME2:
+        VERIFY_FILE_HANDLE(hf);
+        cbLengthNeeded = sizeof(DWORD);
+        if(ha->pHashTable != NULL)
+            pvSrcFileInfo = &ha->pHashTable[hf->pFileEntry->dwHashIndex].dwName2;
+        break;
+
+    case SFILE_INFO_LOCALEID:
+        VERIFY_FILE_HANDLE(hf);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &hf->pFileEntry->lcLocale;
+        break;
+
+    case SFILE_INFO_BLOCKINDEX:
+        VERIFY_FILE_HANDLE(hf);
+        dwFileIndex = (DWORD)(hf->pFileEntry - hf->ha->pFileTable);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &dwFileIndex;
+        break;
+
+    case SFILE_INFO_FILE_SIZE:
+        VERIFY_FILE_HANDLE(hf);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &hf->pFileEntry->dwFileSize;
+        break;
+
+    case SFILE_INFO_COMPRESSED_SIZE:
+        VERIFY_FILE_HANDLE(hf);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &hf->pFileEntry->dwCmpSize;
+        break;
+
+    case SFILE_INFO_FLAGS:
+        VERIFY_FILE_HANDLE(hf);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &hf->pFileEntry->dwFlags;
+        break;
+
+    case SFILE_INFO_POSITION:
+        VERIFY_FILE_HANDLE(hf);
+        cbLengthNeeded = sizeof(ULONGLONG);
+        pvSrcFileInfo = &hf->pFileEntry->ByteOffset;
+        break;
+
+    case SFILE_INFO_KEY:
+        VERIFY_FILE_HANDLE(hf);
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &hf->dwFileKey;
+        break;
+
+    case SFILE_INFO_KEY_UNFIXED:
+        VERIFY_FILE_HANDLE(hf);
+        dwFileKey = hf->dwFileKey;
+        if(hf->pFileEntry->dwFlags & MPQ_FILE_FIX_KEY)
+            dwFileKey = (dwFileKey ^ hf->pFileEntry->dwFileSize) - (DWORD)hf->MpqFilePos;
+        cbLengthNeeded = sizeof(DWORD);
+        pvSrcFileInfo = &dwFileKey;
+        break;
+
+    case SFILE_INFO_FILETIME:
+        VERIFY_FILE_HANDLE(hf);
+        cbLengthNeeded = sizeof(ULONGLONG);
+        pvSrcFileInfo = &hf->pFileEntry->FileTime;
+        break;
+
+    case SFILE_INFO_PATCH_CHAIN:
+        VERIFY_FILE_HANDLE(hf);
+        GetFilePatchChain(hf, pvFileInfo, cbFileInfo, &cbLengthNeeded);
+        break;
+
+    default:
+        nError = ERROR_INVALID_PARAMETER;
+        break;
+    }
+
+    // If everything is OK so far, copy the information
+    if(nError == ERROR_SUCCESS)
+    {
+        // Is the output buffer large enough?
+        if(cbFileInfo >= cbLengthNeeded)
+        {
+            // Copy the data
+            if(pvSrcFileInfo != NULL)
+                memcpy(pvFileInfo, pvSrcFileInfo, cbLengthNeeded);
+        }
+        else
+        {
+            nError = ERROR_INSUFFICIENT_BUFFER;
+        }
+
+        // Give the size to the caller
+        if(pcbLengthNeeded != NULL)
+            *pcbLengthNeeded = cbLengthNeeded;
+    }
+
+    // Set the last error value, if needed
+    if(nError != ERROR_SUCCESS)
+        SetLastError(nError);
+    return (nError == ERROR_SUCCESS);
+}
diff --git a/dep/StormLib/src/SFileVerify.cpp b/dep/StormLib/src/SFileVerify.cpp
index 426701650..8344480ef 100644
--- a/dep/StormLib/src/SFileVerify.cpp
+++ b/dep/StormLib/src/SFileVerify.cpp
@@ -20,83 +20,89 @@
 //-----------------------------------------------------------------------------
 // Local defines
 
+#define SIGNATURE_TYPE_NONE             0
+#define SIGNATURE_TYPE_WEAK             1
+#define SIGNATURE_TYPE_STRONG           2
+
 #define MPQ_DIGEST_UNIT_SIZE      0x10000
 
+typedef struct _MPQ_SIGNATURE_INFO
+{
+    ULONGLONG BeginMpqData;                 // File offset where the hashing starts
+    ULONGLONG BeginExclude;                 // Begin of the excluded area (used for (signature) file)
+    ULONGLONG EndExclude;                   // End of the excluded area (used for (signature) file)
+    ULONGLONG EndMpqData;                   // File offset where the hashing ends
+    ULONGLONG EndOfFile;                    // Size of the entire file
+    BYTE  Signature[MPQ_STRONG_SIGNATURE_SIZE + 0x10];
+    DWORD cbSignatureSize;                  // Length of the signature
+    int nSignatureType;                     // See SIGNATURE_TYPE_XXX
+
+} MPQ_SIGNATURE_INFO, *PMPQ_SIGNATURE_INFO;
+
 //-----------------------------------------------------------------------------
 // Known Blizzard public keys
 // Created by Jean-Francois Roy using OpenSSL
 
-static const char * szBlizzardWeakPrivateKey =
-    "-----BEGIN PRIVATE KEY-----"
-    "MIIBOQIBAAJBAJJidwS/uILMBSO5DLGsBFknIXWWjQJe2kfdfEk3G/j66w4KkhZ1"
-    "V61Rt4zLaMVCYpDun7FLwRjkMDSepO1q2DcCAwEAAQJANtiztVDMJh2hE1hjPDKy"
-    "UmEJ9U/aN3gomuKOjbQbQ/bWWcM/WfhSVHmPqtqh/bQI2UXFr0rnXngeteZHLr/b"
-    "8QIhAMuWriSKGMACw18/rVVfUrThs915odKBH1Alr3vMVVzZAiEAuBHPSQkgwcb6"
-    "L4MWaiKuOzq08mSyNqPeN8oSy18q848CIHeMn+3s+eOmu7su1UYQl6yH7OrdBd1q"
-    "3UxfFNEJiAbhAiAqxdCyOxHGlbM7aS3DOg3cq5ayoN2cvtV7h1R4t8OmVwIgF+5z"
-    "/6vkzBUsZhd8Nwyis+MeQYH0rpFpMKdTlqmPF2Q="
-    "-----END PRIVATE KEY-----";
-
 static const char * szBlizzardWeakPublicKey =
-    "-----BEGIN PUBLIC KEY-----"
-    "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJJidwS/uILMBSO5DLGsBFknIXWWjQJe"
-    "2kfdfEk3G/j66w4KkhZ1V61Rt4zLaMVCYpDun7FLwRjkMDSepO1q2DcCAwEAAQ=="
-    "-----END PUBLIC KEY-----";
+        "-----BEGIN PUBLIC KEY-----"
+        "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJJidwS/uILMBSO5DLGsBFknIXWWjQJe"
+        "2kfdfEk3G/j66w4KkhZ1V61Rt4zLaMVCYpDun7FLwRjkMDSepO1q2DcCAwEAAQ=="
+        "-----END PUBLIC KEY-----";
 
 static const char * szBlizzardStrongPublicKey =
-    "-----BEGIN PUBLIC KEY-----"
-    "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsQZ+ziT2h8h+J/iMQpgd"
-    "tH1HaJzOBE3agjU4yMPcrixaPOZoA4t8bwfey7qczfWywocYo3pleytFF+IuD4HD"
-    "Fl9OXN1SFyupSgMx1EGZlgbFAomnbq9MQJyMqQtMhRAjFgg4TndS7YNb+JMSAEKp"
-    "kXNqY28n/EVBHD5TsMuVCL579gIenbr61dI92DDEdy790IzIG0VKWLh/KOTcTJfm"
-    "Ds/7HQTkGouVW+WUsfekuqNQo7ND9DBnhLjLjptxeFE2AZqYcA1ao3S9LN3GL1tW"
-    "lVXFIX9c7fWqaVTQlZ2oNsI/ARVApOK3grNgqvwH6YoVYVXjNJEo5sQJsPsdV/hk"
-    "dwIDAQAB"
-    "-----END PUBLIC KEY-----";
+        "-----BEGIN PUBLIC KEY-----"
+        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsQZ+ziT2h8h+J/iMQpgd"
+        "tH1HaJzOBE3agjU4yMPcrixaPOZoA4t8bwfey7qczfWywocYo3pleytFF+IuD4HD"
+        "Fl9OXN1SFyupSgMx1EGZlgbFAomnbq9MQJyMqQtMhRAjFgg4TndS7YNb+JMSAEKp"
+        "kXNqY28n/EVBHD5TsMuVCL579gIenbr61dI92DDEdy790IzIG0VKWLh/KOTcTJfm"
+        "Ds/7HQTkGouVW+WUsfekuqNQo7ND9DBnhLjLjptxeFE2AZqYcA1ao3S9LN3GL1tW"
+        "lVXFIX9c7fWqaVTQlZ2oNsI/ARVApOK3grNgqvwH6YoVYVXjNJEo5sQJsPsdV/hk"
+        "dwIDAQAB"
+        "-----END PUBLIC KEY-----";
 
 static const char * szWarcraft3MapPublicKey =
-    "-----BEGIN PUBLIC KEY-----"
-    "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1BwklUUQ3UvjizOBRoF5"
-    "yyOVc7KD+oGOQH5i6eUk1yfs0luCC70kNucNrfqhmviywVtahRse1JtXCPrx2bd3"
-    "iN8Dx91fbkxjYIOGTsjYoHKTp0BbaFkJih776fcHgnFSb+7mJcDuJVvJOXxEH6w0"
-    "1vo6VtujCqj1arqbyoal+xtAaczF3us5cOEp45sR1zAWTn1+7omN7VWV4QqJPaDS"
-    "gBSESc0l1grO0i1VUSumayk7yBKIkb+LBvcG6WnYZHCi7VdLmaxER5m8oZfER66b"
-    "heHoiSQIZf9PAY6Guw2DT5BTc54j/AaLQAKf2qcRSgQLVo5kQaddF3rCpsXoB/74"
-    "6QIDAQAB"
-    "-----END PUBLIC KEY-----";
+        "-----BEGIN PUBLIC KEY-----"
+        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1BwklUUQ3UvjizOBRoF5"
+        "yyOVc7KD+oGOQH5i6eUk1yfs0luCC70kNucNrfqhmviywVtahRse1JtXCPrx2bd3"
+        "iN8Dx91fbkxjYIOGTsjYoHKTp0BbaFkJih776fcHgnFSb+7mJcDuJVvJOXxEH6w0"
+        "1vo6VtujCqj1arqbyoal+xtAaczF3us5cOEp45sR1zAWTn1+7omN7VWV4QqJPaDS"
+        "gBSESc0l1grO0i1VUSumayk7yBKIkb+LBvcG6WnYZHCi7VdLmaxER5m8oZfER66b"
+        "heHoiSQIZf9PAY6Guw2DT5BTc54j/AaLQAKf2qcRSgQLVo5kQaddF3rCpsXoB/74"
+        "6QIDAQAB"
+        "-----END PUBLIC KEY-----";
 
 static const char * szWowPatchPublicKey =
-    "-----BEGIN PUBLIC KEY-----"
-    "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwOsMV0LagAWPEtEQM6b9"
-    "6FHFkUyGbbyda2/Dfc9dyl21E9QvX+Yw7qKRMAKPzA2TlQQLZKvXpnKXF/YIK5xa"
-    "5uwg9CEHCEAYolLG4xn0FUOE0E/0PuuytI0p0ICe6rk00PifZzTr8na2wI/l/GnQ"
-    "bvnIVF1ck6cslATpQJ5JJVMXzoFlUABS19WESw4MXuJAS3AbMhxNWdEhVv7eO51c"
-    "yGjRLy9QjogZODZTY0fSEksgBqQxNCoYVJYI/sF5K2flDsGqrIp0OdJ6teJlzg1Y"
-    "UjYnb6bKjlidXoHEXI2TgA/mD6O3XFIt08I9s3crOCTgICq7cgX35qrZiIVWZdRv"
-    "TwIDAQAB"
-    "-----END PUBLIC KEY-----";
+        "-----BEGIN PUBLIC KEY-----"
+        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwOsMV0LagAWPEtEQM6b9"
+        "6FHFkUyGbbyda2/Dfc9dyl21E9QvX+Yw7qKRMAKPzA2TlQQLZKvXpnKXF/YIK5xa"
+        "5uwg9CEHCEAYolLG4xn0FUOE0E/0PuuytI0p0ICe6rk00PifZzTr8na2wI/l/GnQ"
+        "bvnIVF1ck6cslATpQJ5JJVMXzoFlUABS19WESw4MXuJAS3AbMhxNWdEhVv7eO51c"
+        "yGjRLy9QjogZODZTY0fSEksgBqQxNCoYVJYI/sF5K2flDsGqrIp0OdJ6teJlzg1Y"
+        "UjYnb6bKjlidXoHEXI2TgA/mD6O3XFIt08I9s3crOCTgICq7cgX35qrZiIVWZdRv"
+        "TwIDAQAB"
+        "-----END PUBLIC KEY-----";
 
 static const char * szWowSurveyPublicKey =
-    "-----BEGIN PUBLIC KEY-----"
-    "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIt1DR6nRyyKsy2qahHe"
-    "MKLtacatn/KxieHcwH87wLBxKy+jZ0gycTmJ7SaTdBAEMDs/V5IPIXEtoqYnid2c"
-    "63TmfGDU92oc3Ph1PWUZ2PWxBhT06HYxRdbrgHw9/I29pNPi/607x+lzPORITOgU"
-    "BR6MR8au8HsQP4bn4vkJNgnSgojh48/XQOB/cAln7As1neP61NmVimoLR4Bwi3zt"
-    "zfgrZaUpyeNCUrOYJmH09YIjbBySTtXOUidoPHjFrMsCWpr6xs8xbETbs7MJFL6a"
-    "vcUfTT67qfIZ9RsuKfnXJTIrV0kwDSjjuNXiPTmWAehSsiHIsrUXX5RNcwsSjClr"
-    "nQIDAQAB"
-    "-----END PUBLIC KEY-----";
+        "-----BEGIN PUBLIC KEY-----"
+        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIt1DR6nRyyKsy2qahHe"
+        "MKLtacatn/KxieHcwH87wLBxKy+jZ0gycTmJ7SaTdBAEMDs/V5IPIXEtoqYnid2c"
+        "63TmfGDU92oc3Ph1PWUZ2PWxBhT06HYxRdbrgHw9/I29pNPi/607x+lzPORITOgU"
+        "BR6MR8au8HsQP4bn4vkJNgnSgojh48/XQOB/cAln7As1neP61NmVimoLR4Bwi3zt"
+        "zfgrZaUpyeNCUrOYJmH09YIjbBySTtXOUidoPHjFrMsCWpr6xs8xbETbs7MJFL6a"
+        "vcUfTT67qfIZ9RsuKfnXJTIrV0kwDSjjuNXiPTmWAehSsiHIsrUXX5RNcwsSjClr"
+        "nQIDAQAB"
+        "-----END PUBLIC KEY-----";
 
 static const char * szStarcraft2MapPublicKey =
-    "-----BEGIN PUBLIC KEY-----"
-    "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmk4GT8zb+ICC25a17KZB"
-    "q/ygKGJ2VSO6IT5PGHJlm1KfnHBA4B6SH3xMlJ4c6eG2k7QevZv+FOhjsAHubyWq"
-    "2VKqWbrIFKv2ILc2RfMn8J9EDVRxvcxh6slRrVL69D0w1tfVGjMiKq2Fym5yGoRT"
-    "E7CRgDqbAbXP9LBsCNWHiJLwfxMGzHbk8pIl9oia5pvM7ofZamSHchxlpy6xa4GJ"
-    "7xKN01YCNvklTL1D7uol3wkwcHc7vrF8QwuJizuA5bSg4poEGtH62BZOYi+UL/z0"
-    "31YK+k9CbQyM0X0pJoJoYz1TK+Y5J7vBnXCZtfcTYQ/ZzN6UcxTa57dJaiOlCh9z"
-    "nQIDAQAB"
-    "-----END PUBLIC KEY-----";
+        "-----BEGIN PUBLIC KEY-----"
+        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmk4GT8zb+ICC25a17KZB"
+        "q/ygKGJ2VSO6IT5PGHJlm1KfnHBA4B6SH3xMlJ4c6eG2k7QevZv+FOhjsAHubyWq"
+        "2VKqWbrIFKv2ILc2RfMn8J9EDVRxvcxh6slRrVL69D0w1tfVGjMiKq2Fym5yGoRT"
+        "E7CRgDqbAbXP9LBsCNWHiJLwfxMGzHbk8pIl9oia5pvM7ofZamSHchxlpy6xa4GJ"
+        "7xKN01YCNvklTL1D7uol3wkwcHc7vrF8QwuJizuA5bSg4poEGtH62BZOYi+UL/z0"
+        "31YK+k9CbQyM0X0pJoJoYz1TK+Y5J7vBnXCZtfcTYQ/ZzN6UcxTa57dJaiOlCh9z"
+        "nQIDAQAB"
+        "-----END PUBLIC KEY-----";
 
 //-----------------------------------------------------------------------------
 // Local functions
@@ -113,6 +119,13 @@ static void memrev(unsigned char *buf, size_t count)
     }
 }
 
+static bool is_valid_md5(void * pvMd5)
+{
+    LPDWORD Md5 = (LPDWORD)pvMd5;
+
+    return (Md5[0] | Md5[1] | Md5[2] | Md5[3]) ? true : false;
+}
+
 static bool decode_base64_key(const char * szKeyBase64, rsa_key * key)
 {
     unsigned char decoded_key[0x200];
@@ -140,10 +153,10 @@ static bool decode_base64_key(const char * szKeyBase64, rsa_key * key)
 }
 
 static void GetPlainAnsiFileName(
-    const TCHAR * szFileName,
-    char * szPlainName)
+        const TCHAR * szFileName,
+        char * szPlainName)
 {
-    const TCHAR * szPlainNameT = GetPlainFileName(szFileName);
+    const TCHAR * szPlainNameT = GetPlainFileNameT(szFileName);
 
     // Convert the plain name to ANSI
     while(*szPlainNameT != 0)
@@ -153,8 +166,8 @@ static void GetPlainAnsiFileName(
 
 // Calculate begin and end of the MPQ archive
 static void CalculateArchiveRange(
-    TMPQArchive * ha,
-    PMPQ_SIGNATURE_INFO pSI)
+        TMPQArchive * ha,
+        PMPQ_SIGNATURE_INFO pSI)
 {
     ULONGLONG TempPos = 0;
     char szMapHeader[0x200];
@@ -173,17 +186,71 @@ static void CalculateArchiveRange(
         }
     }
 
-    // Get the MPQ data end. This is stored in the MPQ header
+    // Get the MPQ data end. This is stored in our MPQ header,
+    // and it's been already prepared by SFileOpenArchive,
     pSI->EndMpqData = ha->MpqPos + ha->pHeader->ArchiveSize64;
 
     // Get the size of the entire file
     FileStream_GetSize(ha->pStream, &pSI->EndOfFile);
 }
 
+static bool QueryMpqSignatureInfo(
+        TMPQArchive * ha,
+        PMPQ_SIGNATURE_INFO pSI)
+{
+    ULONGLONG ExtraBytes;
+    TMPQFile * hf;
+    HANDLE hFile;
+    DWORD dwFileSize;
+
+    // Calculate the range of the MPQ
+    CalculateArchiveRange(ha, pSI);
+
+    // If there is "(signature)" file in the MPQ, it has a weak signature
+    if(SFileOpenFileEx((HANDLE)ha, SIGNATURE_NAME, SFILE_OPEN_FROM_MPQ, &hFile))
+    {
+        // Get the content of the signature
+        SFileReadFile(hFile, pSI->Signature, sizeof(pSI->Signature), &pSI->cbSignatureSize, NULL);
+
+        // Verify the size of the signature
+        hf = (TMPQFile *)hFile;
+
+        // We have to exclude the signature file from the digest
+        pSI->BeginExclude = ha->MpqPos + hf->pFileEntry->ByteOffset;
+        pSI->EndExclude = pSI->BeginExclude + hf->pFileEntry->dwCmpSize;
+        dwFileSize = hf->dwDataSize;
+
+        // Close the file
+        SFileCloseFile(hFile);
+        pSI->nSignatureType = SIGNATURE_TYPE_WEAK;
+        return (dwFileSize == (MPQ_WEAK_SIGNATURE_SIZE + 8)) ? true : false;
+    }
+
+    // If there is extra bytes beyond the end of the archive,
+    // it's the strong signature
+    ExtraBytes = pSI->EndOfFile - pSI->EndMpqData;
+    if(ExtraBytes >= (MPQ_STRONG_SIGNATURE_SIZE + 4))
+    {
+        // Read the strong signature
+        if(!FileStream_Read(ha->pStream, &pSI->EndMpqData, pSI->Signature, (MPQ_STRONG_SIGNATURE_SIZE + 4)))
+            return false;
+
+        // Check the signature header "NGIS"
+        if(pSI->Signature[0] != 'N' || pSI->Signature[1] != 'G' || pSI->Signature[2] != 'I' || pSI->Signature[3] != 'S')
+            return false;
+
+        pSI->nSignatureType = SIGNATURE_TYPE_STRONG;
+        return true;
+    }
+
+    // Succeeded, but no known signature found
+    return true;
+}
+
 static bool CalculateMpqHashMd5(
-    TMPQArchive * ha,
-    PMPQ_SIGNATURE_INFO pSI,
-    LPBYTE pMd5Digest)
+        TMPQArchive * ha,
+        PMPQ_SIGNATURE_INFO pSI,
+        LPBYTE pMd5Digest)
 {
     hash_state md5_state;
     ULONGLONG BeginBuffer;
@@ -216,7 +283,7 @@ static bool CalculateMpqHashMd5(
         if(dwToRead == 0)
             break;
 
-        // Read the next chunk 
+        // Read the next chunk
         if(!FileStream_Read(ha->pStream, &BeginBuffer, pbDigestBuffer, dwToRead))
         {
             STORM_FREE(pbDigestBuffer);
@@ -257,18 +324,17 @@ static bool CalculateMpqHashMd5(
 }
 
 static void AddTailToSha1(
-    hash_state * psha1_state,
-    const char * szTail)
+        hash_state * psha1_state,
+        const char * szTail)
 {
-    unsigned char * pbTail = (unsigned char *)szTail;
     unsigned char szUpperCase[0x200];
     unsigned long nLength = 0;
 
     // Convert the tail to uppercase
     // Note that we don't need to terminate the string with zero
-    while(*pbTail != 0)
+    while(*szTail != 0)
     {
-        szUpperCase[nLength++] = AsciiToUpperTable[*pbTail++];
+        szUpperCase[nLength++] = (unsigned char)toupper(*szTail++);
     }
 
     // Append the tail to the SHA1
@@ -276,11 +342,11 @@ static void AddTailToSha1(
 }
 
 static bool CalculateMpqHashSha1(
-    TMPQArchive * ha,
-    PMPQ_SIGNATURE_INFO pSI,
-    unsigned char * sha1_tail0,
-    unsigned char * sha1_tail1,
-    unsigned char * sha1_tail2)
+        TMPQArchive * ha,
+        PMPQ_SIGNATURE_INFO pSI,
+        unsigned char * sha1_tail0,
+        unsigned char * sha1_tail1,
+        unsigned char * sha1_tail2)
 {
     ULONGLONG BeginBuffer;
     hash_state sha1_state_temp;
@@ -312,7 +378,7 @@ static bool CalculateMpqHashSha1(
         if(dwToRead == 0)
             break;
 
-        // Read the next chunk 
+        // Read the next chunk
         if(!FileStream_Read(ha->pStream, &BeginBuffer, pbDigestBuffer, dwToRead))
         {
             STORM_FREE(pbDigestBuffer);
@@ -345,9 +411,9 @@ static bool CalculateMpqHashSha1(
 }
 
 static int VerifyRawMpqData(
-    TMPQArchive * ha,
-    ULONGLONG ByteOffset,
-    DWORD dwDataSize)
+        TMPQArchive * ha,
+        ULONGLONG ByteOffset,
+        DWORD dwDataSize)
 {
     ULONGLONG DataOffset = ha->MpqPos + ByteOffset;
     LPBYTE pbDataChunk;
@@ -433,8 +499,8 @@ static int VerifyRawMpqData(
 }
 
 static DWORD VerifyWeakSignature(
-    TMPQArchive * ha,
-    PMPQ_SIGNATURE_INFO pSI)
+        TMPQArchive * ha,
+        PMPQ_SIGNATURE_INFO pSI)
 {
     BYTE RevSignature[MPQ_WEAK_SIGNATURE_SIZE];
     BYTE Md5Digest[MD5_DIGEST_SIZE];
@@ -461,9 +527,9 @@ static DWORD VerifyWeakSignature(
 }
 
 static DWORD VerifyStrongSignatureWithKey(
-    unsigned char * reversed_signature,
-    unsigned char * padded_digest,
-    const char * szPublicKey)
+        unsigned char * reversed_signature,
+        unsigned char * padded_digest,
+        const char * szPublicKey)
 {
     rsa_key key;
     int result = 0;
@@ -478,15 +544,15 @@ static DWORD VerifyStrongSignatureWithKey(
     // Verify the signature
     if(rsa_verify_simple(reversed_signature, MPQ_STRONG_SIGNATURE_SIZE, padded_digest, MPQ_STRONG_SIGNATURE_SIZE, &result, &key) != CRYPT_OK)
         return ERROR_VERIFY_FAILED;
-    
+
     // Free the key and return result
     rsa_free(&key);
     return result ? ERROR_STRONG_SIGNATURE_OK : ERROR_STRONG_SIGNATURE_ERROR;
 }
 
 static DWORD VerifyStrongSignature(
-    TMPQArchive * ha,
-    PMPQ_SIGNATURE_INFO pSI)
+        TMPQArchive * ha,
+        PMPQ_SIGNATURE_INFO pSI)
 {
     unsigned char reversed_signature[MPQ_STRONG_SIGNATURE_SIZE];
     unsigned char Sha1Digest_tail0[SHA1_DIGEST_SIZE];
@@ -548,11 +614,11 @@ static DWORD VerifyStrongSignature(
 }
 
 static DWORD VerifyFile(
-    HANDLE hMpq,
-    const char * szFileName,
-    LPDWORD pdwCrc32,
-    char * pMD5,
-    DWORD dwFlags)
+        HANDLE hMpq,
+        const char * szFileName,
+        LPDWORD pdwCrc32,
+        char * pMD5,
+        DWORD dwFlags)
 {
     hash_state md5_state;
     unsigned char * pFileMd5;
@@ -562,17 +628,14 @@ static DWORD VerifyFile(
     BYTE Buffer[0x1000];
     HANDLE hFile = NULL;
     DWORD dwVerifyResult = 0;
+    DWORD dwSearchScope = SFILE_OPEN_FROM_MPQ;
     DWORD dwTotalBytes = 0;
     DWORD dwBytesRead;
     DWORD dwCrc32 = 0;
 
-    //
-    // Note: When the MPQ is patched, it will
-    // automatically check the patched version of the file
-    //
-
-    // Make sure the md5 is initialized
-    memset(md5, 0, sizeof(md5));
+    // Fix the open type for patched archives
+    if(SFileIsPatchedArchive(hMpq))
+        dwSearchScope = SFILE_OPEN_PATCHED_FILE;
 
     // If we have to verify raw data MD5, do it before file open
     if(dwFlags & SFILE_VERIFY_RAW_MD5)
@@ -604,7 +667,7 @@ static DWORD VerifyFile(
     }
 
     // Attempt to open the file
-    if(SFileOpenFileEx(hMpq, szFileName, SFILE_OPEN_FROM_MPQ, &hFile))
+    if(SFileOpenFileEx(hMpq, szFileName, dwSearchScope, &hFile))
     {
         // Get the file size
         hf = (TMPQFile *)hFile;
@@ -634,7 +697,7 @@ static DWORD VerifyFile(
             // Update CRC32 value
             if(dwFlags & SFILE_VERIFY_FILE_CRC)
                 dwCrc32 = crc32(dwCrc32, Buffer, dwBytesRead);
-            
+
             // Update MD5 value
             if(dwFlags & SFILE_VERIFY_FILE_MD5)
                 md5_process(&md5_state, Buffer, dwBytesRead);
@@ -656,7 +719,7 @@ static DWORD VerifyFile(
         if(dwTotalBytes == 0)
         {
             // Check CRC32 and MD5 only if there is no patches
-            if(hf->hfPatch == NULL)
+            if(hf->hfPatchFile == NULL)
             {
                 // Check if the CRC32 matches.
                 if(dwFlags & SFILE_VERIFY_FILE_CRC)
@@ -678,7 +741,7 @@ static DWORD VerifyFile(
                     md5_done(&md5_state, md5);
 
                     // Only check the MD5 if it is valid
-                    if(IsValidMD5(pFileMd5))
+                    if(is_valid_md5(pFileMd5))
                     {
                         dwVerifyResult |= VERIFY_FILE_HAS_MD5;
                         if(memcmp(md5, pFileMd5, MD5_DIGEST_SIZE))
@@ -709,159 +772,11 @@ static DWORD VerifyFile(
     if(pdwCrc32 != NULL)
         *pdwCrc32 = dwCrc32;
     if(pMD5 != NULL)
-        memcpy(pMD5, md5, MD5_DIGEST_SIZE); 
+        memcpy(pMD5, md5, MD5_DIGEST_SIZE);
 
     return dwVerifyResult;
 }
 
-// Used in SFileGetFileInfo
-bool QueryMpqSignatureInfo(
-    TMPQArchive * ha,
-    PMPQ_SIGNATURE_INFO pSI)
-{
-    TFileEntry * pFileEntry;
-    ULONGLONG ExtraBytes;
-    DWORD dwFileSize;
-
-    // Make sure it's all zeroed
-    memset(pSI, 0, sizeof(MPQ_SIGNATURE_INFO));
-
-    // Calculate the range of the MPQ
-    CalculateArchiveRange(ha, pSI);
-
-    // If there is "(signature)" file in the MPQ, it has a weak signature
-    pFileEntry = GetFileEntryLocale(ha, SIGNATURE_NAME, LANG_NEUTRAL);
-    if(pFileEntry != NULL)
-    {
-        // Calculate the begin and end of the signature file itself
-        pSI->BeginExclude = ha->MpqPos + pFileEntry->ByteOffset;
-        pSI->EndExclude = pSI->BeginExclude + pFileEntry->dwCmpSize;
-        dwFileSize = (DWORD)(pSI->EndExclude - pSI->BeginExclude);
-
-        // Does the signature have proper size?
-        if(dwFileSize == MPQ_SIGNATURE_FILE_SIZE)
-        {
-            // Read the weak signature
-            if(!FileStream_Read(ha->pStream, &pSI->BeginExclude, pSI->Signature, dwFileSize))
-                return false;
-
-            pSI->cbSignatureSize = dwFileSize;
-            pSI->SignatureTypes |= SIGNATURE_TYPE_WEAK;
-            return true;
-        }
-    }
-
-    // If there is extra bytes beyond the end of the archive,
-    // it's the strong signature
-    ExtraBytes = pSI->EndOfFile - pSI->EndMpqData;
-    if(ExtraBytes >= (MPQ_STRONG_SIGNATURE_SIZE + 4))
-    {
-        // Read the strong signature
-        if(!FileStream_Read(ha->pStream, &pSI->EndMpqData, pSI->Signature, (MPQ_STRONG_SIGNATURE_SIZE + 4)))
-            return false;
-
-        // Check the signature header "NGIS"
-        if(pSI->Signature[0] != 'N' || pSI->Signature[1] != 'G' || pSI->Signature[2] != 'I' || pSI->Signature[3] != 'S')
-            return false;
-
-        pSI->SignatureTypes |= SIGNATURE_TYPE_STRONG;
-        return true;
-    }
-
-    // Succeeded, but no known signature found
-    return true;
-}
-
-//-----------------------------------------------------------------------------
-// Support for weak signature
-
-int SSignFileCreate(TMPQArchive * ha)
-{
-    TMPQFile * hf = NULL;
-    BYTE EmptySignature[MPQ_SIGNATURE_FILE_SIZE];
-    int nError = ERROR_SUCCESS;
-
-    // Only save the signature if we should do so
-    if(ha->dwFileFlags3 != 0)
-    {
-        // The (signature) file must be non-encrypted and non-compressed
-        assert(ha->dwFileFlags3 == MPQ_FILE_EXISTS);
-
-        // Create the (signature) file file in the MPQ
-        // Note that the file must not be compressed or encrypted
-        nError = SFileAddFile_Init(ha, SIGNATURE_NAME,
-                                       0,
-                                       sizeof(EmptySignature),
-                                       LANG_NEUTRAL,
-                                       ha->dwFileFlags3 | MPQ_FILE_REPLACEEXISTING,
-                                      &hf);
-
-        // Write the empty signature file to the archive
-        if(nError == ERROR_SUCCESS)
-        {
-            // Write the empty zeroed fiel to the MPQ
-            memset(EmptySignature, 0, sizeof(EmptySignature));
-            nError = SFileAddFile_Write(hf, EmptySignature, (DWORD)sizeof(EmptySignature), 0);
-        }
-
-        // If the save process succeeded, we clear the MPQ_FLAG_ATTRIBUTE_INVALID flag
-        if(nError == ERROR_SUCCESS)
-        {
-            ha->dwFlags &= ~MPQ_FLAG_SIGNATURE_INVALID;
-            ha->dwReservedFiles--;
-        }
-
-        // Free the file
-        if(hf != NULL)
-            SFileAddFile_Finish(hf);
-    }
-
-    return nError;
-}
-
-int SSignFileFinish(TMPQArchive * ha)
-{
-    MPQ_SIGNATURE_INFO si;
-    unsigned long signature_len = MPQ_WEAK_SIGNATURE_SIZE;
-    BYTE WeakSignature[MPQ_SIGNATURE_FILE_SIZE];
-    BYTE Md5Digest[MD5_DIGEST_SIZE];
-    rsa_key key;
-    int hash_idx = find_hash("md5");
-
-    // Sanity checks
-    assert((ha->dwFlags & MPQ_FLAG_CHANGED) == 0);
-    assert(ha->dwFileFlags3 == MPQ_FILE_EXISTS);
-
-    // Query the weak signature info
-    memset(&si, 0, sizeof(MPQ_SIGNATURE_INFO));
-    if(!QueryMpqSignatureInfo(ha, &si))
-        return ERROR_FILE_CORRUPT;
-
-    // There must be exactly one signature
-    if(si.SignatureTypes != SIGNATURE_TYPE_WEAK)
-        return ERROR_FILE_CORRUPT;
-
-    // Calculate MD5 of the entire archive
-    if(!CalculateMpqHashMd5(ha, &si, Md5Digest))
-        return ERROR_VERIFY_FAILED;
-
-    // Decode the private key
-    if(!decode_base64_key(szBlizzardWeakPrivateKey, &key))
-        return ERROR_VERIFY_FAILED;
-
-    // Sign the hash
-    memset(WeakSignature, 0, sizeof(WeakSignature));
-    rsa_sign_hash_ex(Md5Digest, sizeof(Md5Digest), WeakSignature + 8, &signature_len, LTC_LTC_PKCS_1_V1_5, 0, 0, hash_idx, 0, &key);
-	memrev(WeakSignature + 8, MPQ_WEAK_SIGNATURE_SIZE); 
-    rsa_free(&key);
-
-    // Write the signature to the MPQ. Don't use SFile* functions, but write the hash directly
-    if(!FileStream_Write(ha->pStream, &si.BeginExclude, WeakSignature, MPQ_SIGNATURE_FILE_SIZE))
-        return GetLastError();
-
-    return ERROR_SUCCESS;
-}
-
 //-----------------------------------------------------------------------------
 // Public (exported) functions
 
@@ -909,7 +824,7 @@ int WINAPI SFileVerifyRawData(HANDLE hMpq, DWORD dwWhatToVerify, const char * sz
     TMPQHeader * pHeader;
 
     // Verify input parameters
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
         return ERROR_INVALID_PARAMETER;
     pHeader = ha->pHeader;
 
@@ -920,54 +835,54 @@ int WINAPI SFileVerifyRawData(HANDLE hMpq, DWORD dwWhatToVerify, const char * sz
     // If we have to verify MPQ header, do it
     switch(dwWhatToVerify)
     {
-        case SFILE_VERIFY_MPQ_HEADER:
-            
-            // Only if the header is of version 4 or newer
-            if(pHeader->dwHeaderSize >= (MPQ_HEADER_SIZE_V4 - MD5_DIGEST_SIZE))
-                return VerifyRawMpqData(ha, 0, MPQ_HEADER_SIZE_V4 - MD5_DIGEST_SIZE);
-            return ERROR_SUCCESS;
+    case SFILE_VERIFY_MPQ_HEADER:
 
-        case SFILE_VERIFY_HET_TABLE:
+        // Only if the header is of version 4 or newer
+        if(pHeader->dwHeaderSize >= (MPQ_HEADER_SIZE_V4 - MD5_DIGEST_SIZE))
+            return VerifyRawMpqData(ha, 0, MPQ_HEADER_SIZE_V4 - MD5_DIGEST_SIZE);
+        return ERROR_SUCCESS;
 
-            // Only if we have HET table
-            if(pHeader->HetTablePos64 && pHeader->HetTableSize64)
-                return VerifyRawMpqData(ha, pHeader->HetTablePos64, (DWORD)pHeader->HetTableSize64);
-            return ERROR_SUCCESS;
+    case SFILE_VERIFY_HET_TABLE:
 
-        case SFILE_VERIFY_BET_TABLE:
+        // Only if we have HET table
+        if(pHeader->HetTablePos64 && pHeader->HetTableSize64)
+            return VerifyRawMpqData(ha, pHeader->HetTablePos64, (DWORD)pHeader->HetTableSize64);
+        return ERROR_SUCCESS;
 
-            // Only if we have BET table
-            if(pHeader->BetTablePos64 && pHeader->BetTableSize64)
-                return VerifyRawMpqData(ha, pHeader->BetTablePos64, (DWORD)pHeader->BetTableSize64);
-            return ERROR_SUCCESS;
+    case SFILE_VERIFY_BET_TABLE:
 
-        case SFILE_VERIFY_HASH_TABLE:
+        // Only if we have BET table
+        if(pHeader->BetTablePos64 && pHeader->BetTableSize64)
+            return VerifyRawMpqData(ha, pHeader->BetTablePos64, (DWORD)pHeader->BetTableSize64);
+        return ERROR_SUCCESS;
 
-            // Hash table is not protected by MD5
-            return ERROR_SUCCESS;
+    case SFILE_VERIFY_HASH_TABLE:
 
-        case SFILE_VERIFY_BLOCK_TABLE:
+        // Hash table is not protected by MD5
+        return ERROR_SUCCESS;
 
-            // Block table is not protected by MD5
-            return ERROR_SUCCESS;
+    case SFILE_VERIFY_BLOCK_TABLE:
 
-        case SFILE_VERIFY_HIBLOCK_TABLE:
+        // Block table is not protected by MD5
+        return ERROR_SUCCESS;
 
-            // It is unknown if the hi-block table is protected my MD5 or not.
-            return ERROR_SUCCESS;
+    case SFILE_VERIFY_HIBLOCK_TABLE:
 
-        case SFILE_VERIFY_FILE:
+        // It is unknown if the hi-block table is protected my MD5 or not.
+        return ERROR_SUCCESS;
 
-            // Verify parameters
-            if(szFileName == NULL || *szFileName == 0)
-                return ERROR_INVALID_PARAMETER;
+    case SFILE_VERIFY_FILE:
 
-            // Get the offset of a file
-            pFileEntry = GetFileEntryLocale(ha, szFileName, lcFileLocale);
-            if(pFileEntry == NULL)
-                return ERROR_FILE_NOT_FOUND;
+        // Verify parameters
+        if(szFileName == NULL || *szFileName == 0)
+            return ERROR_INVALID_PARAMETER;
 
-            return VerifyRawMpqData(ha, pFileEntry->ByteOffset, pFileEntry->dwCmpSize);
+        // Get the offset of a file
+        pFileEntry = GetFileEntryLocale(ha, szFileName, lcFileLocale);
+        if(pFileEntry == NULL)
+            return ERROR_FILE_NOT_FOUND;
+
+        return VerifyRawMpqData(ha, pFileEntry->ByteOffset, pFileEntry->dwCmpSize);
     }
 
     return ERROR_INVALID_PARAMETER;
@@ -981,73 +896,26 @@ DWORD WINAPI SFileVerifyArchive(HANDLE hMpq)
     TMPQArchive * ha = (TMPQArchive *)hMpq;
 
     // Verify input parameters
-    if(!IsValidMpqHandle(hMpq))
+    if(!IsValidMpqHandle(ha))
         return ERROR_VERIFY_FAILED;
 
-    // If the archive was modified, we need to flush it
-    if(ha->dwFlags & MPQ_FLAG_CHANGED)
-        SFileFlushArchive(hMpq);
-
     // Get the MPQ signature and signature type
     memset(&si, 0, sizeof(MPQ_SIGNATURE_INFO));
     if(!QueryMpqSignatureInfo(ha, &si))
         return ERROR_VERIFY_FAILED;
 
-    // If there is no signature
-    if(si.SignatureTypes == 0)
+    // Verify the signature
+    switch(si.nSignatureType)
+    {
+    case SIGNATURE_TYPE_NONE:
         return ERROR_NO_SIGNATURE;
 
-    // We haven't seen a MPQ with both signatures
-    assert(si.SignatureTypes == SIGNATURE_TYPE_WEAK || si.SignatureTypes == SIGNATURE_TYPE_STRONG);
-
-    // Verify the strong signature, if present
-    if(si.SignatureTypes & SIGNATURE_TYPE_STRONG)
-        return VerifyStrongSignature(ha, &si);
-
-    // Verify the weak signature, if present
-    if(si.SignatureTypes & SIGNATURE_TYPE_WEAK)
+    case SIGNATURE_TYPE_WEAK:
         return VerifyWeakSignature(ha, &si);
 
-    return ERROR_NO_SIGNATURE;
+    case SIGNATURE_TYPE_STRONG:
+        return VerifyStrongSignature(ha, &si);
+    }
+
+    return ERROR_VERIFY_FAILED;
 }
-
-// Verifies the archive against the signature
-bool WINAPI SFileSignArchive(HANDLE hMpq, DWORD dwSignatureType)
-{
-    TMPQArchive * ha;
-
-    // Verify the archive handle
-    ha = IsValidMpqHandle(hMpq);
-    if(ha == NULL)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return false;
-    }
-
-    // We only support weak signature, and only for MPQs version 1.0
-    if(dwSignatureType != SIGNATURE_TYPE_WEAK)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return false;
-    }
-
-    // The archive must not be malformed and must not be read-only
-    if(ha->dwFlags & (MPQ_FLAG_READ_ONLY | MPQ_FLAG_MALFORMED))
-    {
-        SetLastError(ERROR_ACCESS_DENIED);
-        return false;
-    }
-
-    // If the signature is not there yet
-    if(ha->dwFileFlags3 == 0)
-    {
-        // Turn the signature on. The signature will
-        // be applied when the archive is closed
-        ha->dwFlags |= MPQ_FLAG_SIGNATURE_INVALID | MPQ_FLAG_CHANGED;
-        ha->dwFileFlags3 = MPQ_FILE_EXISTS;
-        ha->dwReservedFiles++;
-    }
-
-    return true;
-}
-
diff --git a/dep/StormLib/src/StormCommon.h b/dep/StormLib/src/StormCommon.h
index dbd1d0d59..57a890667 100644
--- a/dep/StormLib/src/StormCommon.h
+++ b/dep/StormLib/src/StormCommon.h
@@ -35,16 +35,16 @@
 
 // Include functions from zlib
 #ifndef __SYS_ZLIB
-  #include "zlib/zlib.h"
+#include "zlib/zlib.h"
 #else
-  #include <zlib.h>
+#include <zlib.h>
 #endif
 
 // Include functions from bzlib
 #ifndef __SYS_BZLIB
-  #include "bzip2/bzlib.h"
+#include "bzip2/bzlib.h"
 #else
-  #include <bzlib.h>
+#include <bzlib.h>
 #endif
 
 //-----------------------------------------------------------------------------
@@ -61,73 +61,56 @@
 
 #define ID_MPQ_FILE            0x46494c45     // Used internally for checking TMPQFile ('FILE')
 
+#define MPQ_WEAK_SIGNATURE_SIZE        64
+#define MPQ_STRONG_SIGNATURE_SIZE     256
+
 // Prevent problems with CRT "min" and "max" functions,
 // as they are not defined on all platforms
 #define STORMLIB_MIN(a, b) ((a < b) ? a : b)
 #define STORMLIB_MAX(a, b) ((a > b) ? a : b)
-#define STORMLIB_UNUSED(p) ((void)(p))
 
 // Macro for building 64-bit file offset from two 32-bit
-#define MAKE_OFFSET64(hi, lo)      (((ULONGLONG)hi << 32) | (ULONGLONG)lo)
-
-//-----------------------------------------------------------------------------
-// MPQ signature information
-
-// Size of each signature type
-#define MPQ_WEAK_SIGNATURE_SIZE                 64
-#define MPQ_STRONG_SIGNATURE_SIZE              256 
-#define MPQ_STRONG_SIGNATURE_ID         0x5349474E      // ID of the strong signature ("NGIS")
-#define MPQ_SIGNATURE_FILE_SIZE (MPQ_WEAK_SIGNATURE_SIZE + 8)
-
-// MPQ signature info
-typedef struct _MPQ_SIGNATURE_INFO
-{
-    ULONGLONG BeginMpqData;                     // File offset where the hashing starts
-    ULONGLONG BeginExclude;                     // Begin of the excluded area (used for (signature) file)
-    ULONGLONG EndExclude;                       // End of the excluded area (used for (signature) file)
-    ULONGLONG EndMpqData;                       // File offset where the hashing ends
-    ULONGLONG EndOfFile;                        // Size of the entire file
-    BYTE  Signature[MPQ_STRONG_SIGNATURE_SIZE + 0x10];
-    DWORD cbSignatureSize;                      // Length of the signature
-    DWORD SignatureTypes;                       // See SIGNATURE_TYPE_XXX
-
-} MPQ_SIGNATURE_INFO, *PMPQ_SIGNATURE_INFO;
+#define MAKE_OFFSET64(hi, lo)      (((ULONGLONG)hi << 32) | lo)
 
 //-----------------------------------------------------------------------------
 // Memory management
 //
 // We use our own macros for allocating/freeing memory. If you want
-// to redefine them, please keep the following rules:
+// to redefine them, please keep the following rules
 //
 //  - The memory allocation must return NULL if not enough memory
 //    (i.e not to throw exception)
-//  - The allocating function does not need to fill the allocated buffer with zeros
-//  - Memory freeing function doesn't have to test the pointer to NULL
+//  - It is not necessary to fill the allocated buffer with zeros
+//  - Memory freeing function doesn't have to test the pointer to NULL.
 //
 
-//#if defined(_MSC_VER) && defined(_DEBUG)
-//
-//#define STORM_ALLOC(type, nitems) (type *)HeapAlloc(GetProcessHeap(), 0, ((nitems) * sizeof(type)))
-//#define STORM_FREE(ptr)           HeapFree(GetProcessHeap(), 0, ptr)
-//
-//#else
+#if defined(_MSC_VER) && defined(_DEBUG)
+__inline void * DebugMalloc(char * /* szFile */, int /* nLine */, size_t nSize)
+{
+    //  return new BYTE[nSize];
+    return HeapAlloc(GetProcessHeap(), 0, nSize);
+}
 
-#define STORM_ALLOC(type, nitems) (type *)malloc((nitems) * sizeof(type))
-#define STORM_FREE(ptr)           free(ptr)
+__inline void DebugFree(void * ptr)
+{
+    //  delete [] ptr;
+    HeapFree(GetProcessHeap(), 0, ptr);
+}
 
-//#endif
+#define STORM_ALLOC(type, nitems) (type *)DebugMalloc(__FILE__, __LINE__, (nitems) * sizeof(type))
+#define STORM_FREE(ptr)           DebugFree(ptr)
+#else
+
+#define STORM_ALLOC(type, nitems)   (type *)malloc((nitems) * sizeof(type))
+#define STORM_FREE(ptr) free(ptr)
+
+#endif
 
 //-----------------------------------------------------------------------------
 // StormLib internal global variables
 
 extern LCID lcFileLocale;                       // Preferred file locale
 
-//-----------------------------------------------------------------------------
-// Conversion to uppercase/lowercase (and "/" to "\")
-
-extern unsigned char AsciiToLowerTable[256];
-extern unsigned char AsciiToUpperTable[256];
-
 //-----------------------------------------------------------------------------
 // Encryption and decryption functions
 
@@ -135,11 +118,8 @@ extern unsigned char AsciiToUpperTable[256];
 #define MPQ_HASH_NAME_A         0x100
 #define MPQ_HASH_NAME_B         0x200
 #define MPQ_HASH_FILE_KEY       0x300
-#define MPQ_HASH_KEY2_MIX       0x400
 
 DWORD HashString(const char * szFileName, DWORD dwHashType);
-DWORD HashStringSlash(const char * szFileName, DWORD dwHashType);
-DWORD HashStringLower(const char * szFileName, DWORD dwHashType);
 
 void  InitializeMpqCryptography();
 
@@ -148,13 +128,15 @@ DWORD GetHashTableSizeForFileCount(DWORD dwFileCount);
 bool IsPseudoFileName(const char * szFileName, LPDWORD pdwFileIndex);
 ULONGLONG HashStringJenkins(const char * szFileName);
 
-DWORD GetDefaultSpecialFileFlags(DWORD dwFileSize, USHORT wFormatVersion);
+int ConvertMpqHeaderToFormat4(TMPQArchive * ha, ULONGLONG FileSize, DWORD dwFlags);
 
-void  EncryptMpqBlock(void * pvDataBlock, DWORD dwLength, DWORD dwKey);
-void  DecryptMpqBlock(void * pvDataBlock, DWORD dwLength, DWORD dwKey);
+DWORD GetDefaultSpecialFileFlags(TMPQArchive * ha, DWORD dwFileSize);
 
-DWORD DetectFileKeyBySectorSize(LPDWORD EncryptedData, DWORD dwSectorSize, DWORD dwSectorOffsLen);
-DWORD DetectFileKeyByContent(void * pvEncryptedData, DWORD dwSectorSize, DWORD dwFileSize);
+void  EncryptMpqBlock(void * pvFileBlock, DWORD dwLength, DWORD dwKey);
+void  DecryptMpqBlock(void * pvFileBlock, DWORD dwLength, DWORD dwKey);
+
+DWORD DetectFileKeyBySectorSize(LPDWORD SectorOffsets, DWORD decrypted);
+DWORD DetectFileKeyByContent(void * pvFileContent, DWORD dwFileSize);
 DWORD DecryptFileKey(const char * szFileName, ULONGLONG MpqPos, DWORD dwFileSize, DWORD dwFlags);
 
 bool IsValidMD5(LPBYTE pbMd5);
@@ -164,38 +146,29 @@ void CalculateDataBlockHash(void * pvDataBlock, DWORD cbDataBlock, LPBYTE md5_ha
 //-----------------------------------------------------------------------------
 // Handle validation functions
 
-TMPQArchive * IsValidMpqHandle(HANDLE hMpq);
-TMPQFile * IsValidFileHandle(HANDLE hFile);
+bool IsValidMpqHandle(TMPQArchive * ha);
+bool IsValidFileHandle(TMPQFile * hf);
 
 //-----------------------------------------------------------------------------
-// Support for MPQ file tables
+// Hash table and block table manipulation
 
-int ConvertMpqHeaderToFormat4(TMPQArchive * ha, ULONGLONG MpqOffset, ULONGLONG FileSize, DWORD dwFlags);
-
-TMPQHash * FindFreeHashEntry(TMPQArchive * ha, DWORD dwStartIndex, DWORD dwName1, DWORD dwName2, LCID lcLocale);
 TMPQHash * GetFirstHashEntry(TMPQArchive * ha, const char * szFileName);
 TMPQHash * GetNextHashEntry(TMPQArchive * ha, TMPQHash * pFirstHash, TMPQHash * pPrevHash);
-TMPQHash * AllocateHashEntry(TMPQArchive * ha, TFileEntry * pFileEntry);
+DWORD AllocateHashEntry(TMPQArchive * ha, TFileEntry * pFileEntry);
+DWORD AllocateHetEntry(TMPQArchive * ha, TFileEntry * pFileEntry);
 
-TMPQExtHeader * LoadExtTable(TMPQArchive * ha, ULONGLONG ByteOffset, size_t Size, DWORD dwSignature, DWORD dwKey);
-TMPQHetTable * LoadHetTable(TMPQArchive * ha);
-TMPQBetTable * LoadBetTable(TMPQArchive * ha);
+void FindFreeMpqSpace(TMPQArchive * ha, ULONGLONG * pFreeSpacePos);
 
-TMPQHash * LoadHashTable(TMPQArchive * ha);
-TMPQBlock * LoadBlockTable(TMPQArchive * ha, bool bDontFixEntries = false);
-TMPQBlock * TranslateBlockTable(TMPQArchive * ha, ULONGLONG * pcbTableSize, bool * pbNeedHiBlockTable);
-
-ULONGLONG FindFreeMpqSpace(TMPQArchive * ha);
+// Functions that loads and verifies MPQ data bitmap
+int  LoadMpqDataBitmap(TMPQArchive * ha, ULONGLONG FileSize, bool * pbFileIsComplete);
 
 // Functions that load the HET and BET tables
 int  CreateHashTable(TMPQArchive * ha, DWORD dwHashTableSize);
 int  LoadAnyHashTable(TMPQArchive * ha);
-int  BuildFileTable(TMPQArchive * ha);
-int  RebuildHetTable(TMPQArchive * ha);
-int  RebuildFileTable(TMPQArchive * ha, DWORD dwNewHashTableSize, DWORD dwNewMaxFileCount);
+int  BuildFileTable(TMPQArchive * ha, ULONGLONG FileSize);
 int  SaveMPQTables(TMPQArchive * ha);
 
-TMPQHetTable * CreateHetTable(DWORD dwEntryCount, DWORD dwTotalCount, DWORD dwHashBitSize, LPBYTE pbSrcData);
+TMPQHetTable * CreateHetTable(DWORD dwMaxFileCount, DWORD dwHashBitSize, bool bCreateEmpty);
 void FreeHetTable(TMPQHetTable * pHetTable);
 
 TMPQBetTable * CreateBetTable(DWORD dwMaxFileCount);
@@ -208,37 +181,23 @@ TFileEntry * GetFileEntryExact(TMPQArchive * ha, const char * szFileName, LCID l
 TFileEntry * GetFileEntryByIndex(TMPQArchive * ha, DWORD dwIndex);
 
 // Allocates file name in the file entry
-void AllocateFileName(TMPQArchive * ha, TFileEntry * pFileEntry, const char * szFileName);
+void AllocateFileName(TFileEntry * pFileEntry, const char * szFileName);
 
 // Allocates new file entry in the MPQ tables. Reuses existing, if possible
+TFileEntry * FindFreeFileEntry(TMPQArchive * ha);
 TFileEntry * AllocateFileEntry(TMPQArchive * ha, const char * szFileName, LCID lcLocale);
 int  RenameFileEntry(TMPQArchive * ha, TFileEntry * pFileEntry, const char * szNewFileName);
-void DeleteFileEntry(TMPQArchive * ha, TFileEntry * pFileEntry);
+void ClearFileEntry(TMPQArchive * ha, TFileEntry * pFileEntry);
+int  FreeFileEntry(TMPQArchive * ha, TFileEntry * pFileEntry);
 
 // Invalidates entries for (listfile) and (attributes)
 void InvalidateInternalFiles(TMPQArchive * ha);
 
-// Retrieves information about the strong signature
-bool QueryMpqSignatureInfo(TMPQArchive * ha, PMPQ_SIGNATURE_INFO pSignatureInfo);
-
-//-----------------------------------------------------------------------------
-// Support for alternate file formats (SBaseSubTypes.cpp)
-
-int ConvertSqpHeaderToFormat4(TMPQArchive * ha, ULONGLONG FileSize, DWORD dwFlags);
-TMPQHash * LoadSqpHashTable(TMPQArchive * ha);
-TMPQBlock * LoadSqpBlockTable(TMPQArchive * ha);
-
-int ConvertMpkHeaderToFormat4(TMPQArchive * ha, ULONGLONG FileSize, DWORD dwFlags);
-void DecryptMpkTable(void * pvMpkTable, size_t cbSize);
-TMPQHash * LoadMpkHashTable(TMPQArchive * ha);
-TMPQBlock * LoadMpkBlockTable(TMPQArchive * ha);
-int SCompDecompressMpk(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer);
-
 //-----------------------------------------------------------------------------
 // Common functions - MPQ File
 
-TMPQFile * CreateFileHandle(TMPQArchive * ha, TFileEntry * pFileEntry);
-void * LoadMpqTable(TMPQArchive * ha, ULONGLONG ByteOffset, DWORD dwCompressedSize, DWORD dwRealSize, DWORD dwKey);
+TMPQFile * CreateMpqFile(TMPQArchive * ha);
+int  LoadMpqTable(TMPQArchive * ha, ULONGLONG ByteOffset, void * pvTable, DWORD dwCompressedSize, DWORD dwRealSize, DWORD dwKey);
 int  AllocateSectorBuffer(TMPQFile * hf);
 int  AllocatePatchInfo(TMPQFile * hf, bool bLoadFromFile);
 int  AllocateSectorOffsets(TMPQFile * hf, bool bLoadFromFile);
@@ -249,48 +208,44 @@ int  WriteSectorOffsets(TMPQFile * hf);
 int  WriteSectorChecksums(TMPQFile * hf);
 int  WriteMemDataMD5(TFileStream * pStream, ULONGLONG RawDataOffs, void * pvRawData, DWORD dwRawDataSize, DWORD dwChunkSize, LPDWORD pcbTotalSize);
 int  WriteMpqDataMD5(TFileStream * pStream, ULONGLONG RawDataOffs, DWORD dwRawDataSize, DWORD dwChunkSize);
-void FreeFileHandle(TMPQFile *& hf);
+void FreeMPQFile(TMPQFile *& hf);
 
 bool IsIncrementalPatchFile(const void * pvData, DWORD cbData, LPDWORD pdwPatchedFileSize);
 int  PatchFileData(TMPQFile * hf);
 
-void FreeArchiveHandle(TMPQArchive *& ha);
+void FreeMPQArchive(TMPQArchive *& ha);
 
 //-----------------------------------------------------------------------------
 // Utility functions
 
 bool CheckWildCard(const char * szString, const char * szWildCard);
+const char * GetPlainFileNameA(const char * szFileName);
+const TCHAR * GetPlainFileNameT(const TCHAR * szFileName);
 bool IsInternalMpqFileName(const char * szFileName);
 
-const TCHAR * GetPlainFileName(const TCHAR * szFileName);
-const char * GetPlainFileName(const char * szFileName);
-
-void CopyFileName(TCHAR * szTarget, const char * szSource, size_t cchLength);
-void CopyFileName(char * szTarget, const TCHAR * szSource, size_t cchLength);
-
 //-----------------------------------------------------------------------------
 // Support for adding files to the MPQ
 
 int SFileAddFile_Init(
-    TMPQArchive * ha,
-    const char * szArchivedName,
-    ULONGLONG ft,
-    DWORD dwFileSize,
-    LCID lcLocale,
-    DWORD dwFlags,
-    TMPQFile ** phf
-    );
+        TMPQArchive * ha,
+        const char * szArchivedName,
+        ULONGLONG ft,
+        DWORD dwFileSize,
+        LCID lcLocale,
+        DWORD dwFlags,
+        TMPQFile ** phf
+        );
 
 int SFileAddFile_Write(
-    TMPQFile * hf,
-    const void * pvData,
-    DWORD dwSize,
-    DWORD dwCompression
-    );
+        TMPQFile * hf,
+        const void * pvData,
+        DWORD dwSize,
+        DWORD dwCompression
+        );
 
 int SFileAddFile_Finish(
-    TMPQFile * hf
-    );
+        TMPQFile * hf
+        );
 
 //-----------------------------------------------------------------------------
 // Attributes support
@@ -303,12 +258,6 @@ int  SAttrFileSaveToMpq(TMPQArchive * ha);
 
 int  SListFileSaveToMpq(TMPQArchive * ha);
 
-//-----------------------------------------------------------------------------
-// Weak signature support
-
-int SSignFileCreate(TMPQArchive * ha);
-int SSignFileFinish(TMPQArchive * ha);
-
 //-----------------------------------------------------------------------------
 // Dump data support
 
diff --git a/dep/StormLib/src/StormLib.h b/dep/StormLib/src/StormLib.h
index d9f344384..6cbc05529 100644
--- a/dep/StormLib/src/StormLib.h
+++ b/dep/StormLib/src/StormLib.h
@@ -66,19 +66,15 @@
 /* 15.09.11  8.04  Lad  Bug fixes, testing for Diablo III MPQs               */
 /* 26.04.12  8.10  Lad  Support for data map, added SFileGetArchiveBitmap    */
 /* 29.05.12  8.20  Lad  C-only interface                                     */
-/* 14.01.13  8.21  Lad  ADPCM and Huffmann (de)compression refactored        */
-/* 04.12.13  9.00  Lad  Unit tests, bug fixes                                */
-/* 27.08.14  9.10  Lad  Signing archives with weak digital signature         */
-/* 25.11.14  9.11  Lad  Fixed bug reading & creating HET table               */
 /*****************************************************************************/
 
 #ifndef __STORMLIB_H__
 #define __STORMLIB_H__
 
 #ifdef _MSC_VER
-#pragma warning(disable:4668)       // 'XXX' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' 
+#pragma warning(disable:4668)       // 'XXX' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
 #pragma warning(disable:4820)       // 'XXX' : '2' bytes padding added after data member 'XXX::yyy'
-#endif                                             
+#endif
 
 #include "StormPort.h"
 
@@ -91,78 +87,74 @@ extern "C" {
 //
 // The library type is encoded in the library name as the following
 // StormLibXYZ.lib
-// 
+//
 //  X - D for Debug version, R for Release version
 //  Y - A for ANSI version, U for Unicode version
 //  Z - S for static-linked CRT library, D for multithreaded DLL CRT library
 //
 
 /*#if defined(_MSC_VER) && !defined(__STORMLIB_SELF__)
-  
-  #ifdef _DEBUG                                 // DEBUG VERSIONS
-    #ifndef _UNICODE                            
-      #ifdef _DLL                               
-        #pragma comment(lib, "StormLibDAD.lib") // Debug Ansi CRT-DLL version
-      #else        
-        #pragma comment(lib, "StormLibDAS.lib") // Debug Ansi CRT-LIB version
-      #endif
-    #else
-      #ifdef _DLL                               
-        #pragma comment(lib, "StormLibDUD.lib") // Debug Unicode CRT-DLL version
-      #else        
-        #pragma comment(lib, "StormLibDUS.lib") // Debug Unicode CRT-LIB version
-      #endif
-    #endif
-  #else                                         // RELEASE VERSIONS
-    #ifndef _UNICODE                            
-      #ifdef _DLL
-        #pragma comment(lib, "StormLibRAD.lib") // Release Ansi CRT-DLL version
-      #else        
-        #pragma comment(lib, "StormLibRAS.lib") // Release Ansi CRT-LIB version
-      #endif
-    #else
-      #ifdef _DLL
-        #pragma comment(lib, "StormLibRUD.lib") // Release Unicode CRT-DLL version
-      #else        
-        #pragma comment(lib, "StormLibRUS.lib") // Release Unicode CRT-LIB version
-      #endif
-    #endif
-  #endif
+
+#ifdef _DEBUG                                 // DEBUG VERSIONS
+#ifndef _UNICODE
+#ifdef _DLL
+#pragma comment(lib, "StormLibDAD.lib") // Debug Ansi CRT-DLL version
+#else
+#pragma comment(lib, "StormLibDAS.lib") // Debug Ansi CRT-LIB version
+#endif
+#else
+#ifdef _DLL
+#pragma comment(lib, "StormLibDUD.lib") // Debug Unicode CRT-DLL version
+#else
+#pragma comment(lib, "StormLibDUS.lib") // Debug Unicode CRT-LIB version
+#endif
+#endif
+#else                                         // RELEASE VERSIONS
+#ifndef _UNICODE
+#ifdef _DLL
+#pragma comment(lib, "StormLibRAD.lib") // Release Ansi CRT-DLL version
+#else
+#pragma comment(lib, "StormLibRAS.lib") // Release Ansi CRT-LIB version
+#endif
+#else
+#ifdef _DLL
+#pragma comment(lib, "StormLibRUD.lib") // Release Unicode CRT-DLL version
+#else
+#pragma comment(lib, "StormLibRUS.lib") // Release Unicode CRT-LIB version
+#endif
+#endif
+#endif
 
 #endif*/
 
 //-----------------------------------------------------------------------------
 // Defines
 
-#define STORMLIB_VERSION                0x090B  // Current version of StormLib (9.11)
-#define STORMLIB_VERSION_STRING         "9.11"  // String version of StormLib version
-
 #define ID_MPQ                      0x1A51504D  // MPQ archive header ID ('MPQ\x1A')
 #define ID_MPQ_USERDATA             0x1B51504D  // MPQ userdata entry ('MPQ\x1B')
-#define ID_MPK                      0x1A4B504D  // MPK archive header ID ('MPK\x1A')
 
-#define ERROR_AVI_FILE                   10000  // Not a MPQ file, but an AVI file.
+#define ERROR_AVI_FILE                   10000  // No MPQ file, but AVI file.
 #define ERROR_UNKNOWN_FILE_KEY           10001  // Returned by SFileReadFile when can't find file key
 #define ERROR_CHECKSUM_ERROR             10002  // Returned by SFileReadFile when sector CRC doesn't match
 #define ERROR_INTERNAL_FILE              10003  // The given operation is not allowed on internal file
 #define ERROR_BASE_FILE_MISSING          10004  // The file is present as incremental patch file, but base file is missing
 #define ERROR_MARKED_FOR_DELETE          10005  // The file was marked as "deleted" in the MPQ
-#define ERROR_FILE_INCOMPLETE            10006  // The required file part is missing
-#define ERROR_UNKNOWN_FILE_NAMES         10007  // A name of at least one file is unknown
 
 // Values for SFileCreateArchive
-#define HASH_TABLE_SIZE_MIN         0x00000004  // Verified: If there is 1 file, hash table size is 4
+#define HASH_TABLE_SIZE_MIN         0x00000004  // Minimum acceptable hash table size
 #define HASH_TABLE_SIZE_DEFAULT     0x00001000  // Default hash table size for empty MPQs
 #define HASH_TABLE_SIZE_MAX         0x00080000  // Maximum acceptable hash table size
 
 #define HASH_ENTRY_DELETED          0xFFFFFFFE  // Block index for deleted entry in the hash table
 #define HASH_ENTRY_FREE             0xFFFFFFFF  // Block index for free entry in the hash table
 
-#define HET_ENTRY_DELETED                 0x80  // NameHash1 value for a deleted entry
-#define HET_ENTRY_FREE                    0x00  // NameHash1 value for free entry
+#define HET_ENTRY_DELETED                 0x80  // HET hash value for a deleted entry
+#define HET_ENTRY_FREE                    0x00  // HET hash value for free entry
 
 #define HASH_STATE_SIZE                   0x60  // Size of LibTomCrypt's hash_state structure
 
+#define MPQ_PATCH_PREFIX_LEN              0x20  // Maximum length of the patch prefix
+
 // Values for SFileOpenArchive
 #define SFILE_OPEN_HARD_DISK_FILE            2  // Open the archive on HDD
 #define SFILE_OPEN_CDROM_FILE                3  // Open the archive only if it is on CDROM
@@ -170,25 +162,17 @@ extern "C" {
 // Values for SFileOpenFile
 #define SFILE_OPEN_FROM_MPQ         0x00000000  // Open the file from the MPQ archive
 #define SFILE_OPEN_PATCHED_FILE     0x00000001  // Open the file from the MPQ archive
-#define SFILE_OPEN_BASE_FILE        0xFFFFFFFD  // Reserved for StormLib internal use
 #define SFILE_OPEN_ANY_LOCALE       0xFFFFFFFE  // Reserved for StormLib internal use
 #define SFILE_OPEN_LOCAL_FILE       0xFFFFFFFF  // Open a local file
 
 // Flags for TMPQArchive::dwFlags
 #define MPQ_FLAG_READ_ONLY          0x00000001  // If set, the MPQ has been open for read-only access
 #define MPQ_FLAG_CHANGED            0x00000002  // If set, the MPQ tables have been changed
-#define MPQ_FLAG_MALFORMED          0x00000004  // Malformed data structure detected (W3M map protectors)
+#define MPQ_FLAG_PROTECTED          0x00000004  // Set on protected MPQs (like W3M maps)
 #define MPQ_FLAG_CHECK_SECTOR_CRC   0x00000008  // Checking sector CRC when reading files
-#define MPQ_FLAG_LISTFILE_INVALID   0x00000020  // If set, it means that the (listfile) has been invalidated
-#define MPQ_FLAG_ATTRIBUTES_INVALID 0x00000040  // If set, it means that the (attributes) has been invalidated
-#define MPQ_FLAG_SIGNATURE_INVALID  0x00000080  // If set, it means that the (signature) has been invalidated
-#define MPQ_FLAG_SAVING_TABLES      0x00000100  // If set, we are saving MPQ internal files and MPQ tables
-#define MPQ_FLAG_PATCH              0x00000200  // If set, this MPQ is a patch archive
-
-// Values for TMPQArchive::dwSubType
-#define MPQ_SUBTYPE_MPQ             0x00000000  // The file is a MPQ file (Blizzard games)
-#define MPQ_SUBTYPE_SQP             0x00000001  // The file is a SQP file (War of the Immortals)
-#define MPQ_SUBTYPE_MPK             0x00000002  // The file is a MPK file (Longwu Online)
+#define MPQ_FLAG_NEED_FIX_SIZE      0x00000010  // Used during opening the archive
+#define MPQ_FLAG_INV_LISTFILE       0x00000020  // If set, it means that the (listfile) has been invalidated
+#define MPQ_FLAG_INV_ATTRIBUTES     0x00000040  // If set, it means that the (attributes) has been invalidated
 
 // Return value for SFileGetFileSize and SFileSetFilePointer
 #define SFILE_INVALID_SIZE          0xFFFFFFFF
@@ -198,27 +182,26 @@ extern "C" {
 // Flags for SFileAddFile
 #define MPQ_FILE_IMPLODE            0x00000100  // Implode method (By PKWARE Data Compression Library)
 #define MPQ_FILE_COMPRESS           0x00000200  // Compress methods (By multiple methods)
-#define MPQ_FILE_ENCRYPTED          0x00010000  // Indicates whether file is encrypted 
+#define MPQ_FILE_COMPRESSED         0x0000FF00  // File is compressed
+#define MPQ_FILE_ENCRYPTED          0x00010000  // Indicates whether file is encrypted
 #define MPQ_FILE_FIX_KEY            0x00020000  // File decryption key has to be fixed
 #define MPQ_FILE_PATCH_FILE         0x00100000  // The file is a patch file. Raw file data begin with TPatchInfo structure
 #define MPQ_FILE_SINGLE_UNIT        0x01000000  // File is stored as a single unit, rather than split into sectors (Thx, Quantam)
 #define MPQ_FILE_DELETE_MARKER      0x02000000  // File is a deletion marker. Used in MPQ patches, indicating that the file no longer exists.
 #define MPQ_FILE_SECTOR_CRC         0x04000000  // File has checksums for each sector.
-                                                // Ignored if file is not compressed or imploded.
-
-#define MPQ_FILE_COMPRESS_MASK      0x0000FF00  // Mask for a file being compressed
+// Ignored if file is not compressed or imploded.
 #define MPQ_FILE_EXISTS             0x80000000  // Set if file exists, reset when the file was deleted
 #define MPQ_FILE_REPLACEEXISTING    0x80000000  // Replace when the file exist (SFileAddFile)
 
 #define MPQ_FILE_VALID_FLAGS     (MPQ_FILE_IMPLODE       |  \
-                                  MPQ_FILE_COMPRESS      |  \
-                                  MPQ_FILE_ENCRYPTED     |  \
-                                  MPQ_FILE_FIX_KEY       |  \
-                                  MPQ_FILE_PATCH_FILE    |  \
-                                  MPQ_FILE_SINGLE_UNIT   |  \
-                                  MPQ_FILE_DELETE_MARKER |  \
-                                  MPQ_FILE_SECTOR_CRC    |  \
-                                  MPQ_FILE_EXISTS)
+    MPQ_FILE_COMPRESS      |  \
+    MPQ_FILE_ENCRYPTED     |  \
+    MPQ_FILE_FIX_KEY       |  \
+    MPQ_FILE_PATCH_FILE    |  \
+    MPQ_FILE_SINGLE_UNIT   |  \
+    MPQ_FILE_DELETE_MARKER |  \
+    MPQ_FILE_SECTOR_CRC    |  \
+    MPQ_FILE_EXISTS)
 
 // Compression types for multiple compressions
 #define MPQ_COMPRESSION_HUFFMANN          0x01  // Huffmann compression (used on WAVE files only)
@@ -244,13 +227,46 @@ extern "C" {
 #define MPQ_KEY_HASH_TABLE          0xC3AF3770  // Obtained by HashString("(hash table)", MPQ_HASH_FILE_KEY)
 #define MPQ_KEY_BLOCK_TABLE         0xEC83B3A3  // Obtained by HashString("(block table)", MPQ_HASH_FILE_KEY)
 
+// Block map defines
+#define MPQ_DATA_BITMAP_SIGNATURE   0x33767470  // Signature of the MPQ data bitmap ('ptv3')
+
+// Constants for SFileGetFileInfo
+#define SFILE_INFO_ARCHIVE_NAME              1  // MPQ size (value from header)
+#define SFILE_INFO_ARCHIVE_SIZE              2  // MPQ size (value from header)
+#define SFILE_INFO_MAX_FILE_COUNT            3  // Max number of files in the MPQ
+#define SFILE_INFO_HASH_TABLE_SIZE           4  // Size of hash table, in entries
+#define SFILE_INFO_BLOCK_TABLE_SIZE          5  // Number of entries in the block table
+#define SFILE_INFO_SECTOR_SIZE               6  // Size of file sector (in bytes)
+#define SFILE_INFO_HASH_TABLE                7  // Pointer to Hash table (TMPQHash *)
+#define SFILE_INFO_BLOCK_TABLE               8  // Pointer to Block Table (TMPQBlock *)
+#define SFILE_INFO_NUM_FILES                 9  // Real number of files within archive
+#define SFILE_INFO_STREAM_FLAGS             10  // Stream flags for the MPQ. See STREAM_FLAG_XXX
+#define SFILE_INFO_IS_READ_ONLY             11  // TRUE of the MPQ was open as read only
+//------
+#define SFILE_INFO_HASH_INDEX              100  // Hash index of file in MPQ
+#define SFILE_INFO_CODENAME1               101  // The first codename of the file
+#define SFILE_INFO_CODENAME2               102  // The second codename of the file
+#define SFILE_INFO_LOCALEID                103  // Locale ID of file in MPQ
+#define SFILE_INFO_BLOCKINDEX              104  // Index to Block Table
+#define SFILE_INFO_FILE_SIZE               105  // Original file size (from the block table)
+#define SFILE_INFO_COMPRESSED_SIZE         106  // Compressed file size (from the block table)
+#define SFILE_INFO_FLAGS                   107  // File flags
+#define SFILE_INFO_POSITION                108  // File position within archive
+#define SFILE_INFO_KEY                     109  // File decryption key
+#define SFILE_INFO_KEY_UNFIXED             110  // Decryption key not fixed to file pos and size
+#define SFILE_INFO_FILETIME                111  // TMPQFileTime
+#define SFILE_INFO_PATCH_CHAIN             112  // Chain of patches
+
 #define LISTFILE_NAME             "(listfile)"  // Name of internal listfile
 #define SIGNATURE_NAME           "(signature)"  // Name of internal signature
 #define ATTRIBUTES_NAME         "(attributes)"  // Name of internal attributes file
 #define PATCH_METADATA_NAME "(patch_metadata)"
 
+#define STORMLIB_VERSION                0x0814  // Current version of StormLib (8.10)
+#define STORMLIB_VERSION_STRING         "8.20"
+
 #define MPQ_FORMAT_VERSION_1                 0  // Up to The Burning Crusade
-#define MPQ_FORMAT_VERSION_2                 1  // The Burning Crusade and newer 
+#define MPQ_FORMAT_VERSION_2                 1  // The Burning Crusade and newer
 #define MPQ_FORMAT_VERSION_3                 2  // WoW Cataclysm Beta
 #define MPQ_FORMAT_VERSION_4                 3  // WoW Cataclysm and newer
 
@@ -269,32 +285,27 @@ extern "C" {
 #define BASE_PROVIDER_HTTP          0x00000002  // Base data source is a file on web server
 #define BASE_PROVIDER_MASK          0x0000000F  // Mask for base provider value
 
-#define STREAM_PROVIDER_FLAT        0x00000000  // Stream is linear with no offset mapping
+#define STREAM_PROVIDER_LINEAR      0x00000000  // Stream is linear with no offset mapping
 #define STREAM_PROVIDER_PARTIAL     0x00000010  // Stream is partial file (.part)
-#define STREAM_PROVIDER_MPQE        0x00000020  // Stream is an encrypted MPQ
-#define STREAM_PROVIDER_BLOCK4      0x00000030  // 0x4000 per block, text MD5 after each block, max 0x2000 blocks per file
+#define STREAM_PROVIDER_ENCRYPTED   0x00000020  // Stream is an encrypted MPQ
 #define STREAM_PROVIDER_MASK        0x000000F0  // Mask for stream provider value
 
 #define STREAM_FLAG_READ_ONLY       0x00000100  // Stream is read only
 #define STREAM_FLAG_WRITE_SHARE     0x00000200  // Allow write sharing when open for write
-#define STREAM_FLAG_USE_BITMAP      0x00000400  // If the file has a file bitmap, load it and use it
-#define STREAM_OPTIONS_MASK         0x0000FF00  // Mask for stream options
-
-#define STREAM_PROVIDERS_MASK       0x000000FF  // Mask to get stream providers
-#define STREAM_FLAGS_MASK           0x0000FFFF  // Mask for all stream flags (providers+options)
+#define STREAM_FLAG_MASK            0x0000FF00  // Mask for stream flags
+#define STREAM_OPTIONS_MASK         0x0000FFFF  // Mask for all stream options
 
 #define MPQ_OPEN_NO_LISTFILE        0x00010000  // Don't load the internal listfile
 #define MPQ_OPEN_NO_ATTRIBUTES      0x00020000  // Don't open the attributes
-#define MPQ_OPEN_NO_HEADER_SEARCH   0x00040000  // Don't search for the MPQ header past the begin of the file
-#define MPQ_OPEN_FORCE_MPQ_V1       0x00080000  // Always open the archive as MPQ v 1.00, ignore the "wFormatVersion" variable in the header
-#define MPQ_OPEN_CHECK_SECTOR_CRC   0x00100000  // On files with MPQ_FILE_SECTOR_CRC, the CRC will be checked when reading file
-#define MPQ_OPEN_PATCH              0x00200000  // This archive is a patch MPQ. Used internally.
+#define MPQ_OPEN_FORCE_MPQ_V1       0x00040000  // Always open the archive as MPQ v 1.00, ignore the "wFormatVersion" variable in the header
+#define MPQ_OPEN_CHECK_SECTOR_CRC   0x00080000  // On files with MPQ_FILE_SECTOR_CRC, the CRC will be checked when reading file
+
+// Deprecated
 #define MPQ_OPEN_READ_ONLY          STREAM_FLAG_READ_ONLY
+#define MPQ_OPEN_ENCRYPTED          STREAM_PROVIDER_ENCRYPTED
 
 // Flags for SFileCreateArchive
-#define MPQ_CREATE_LISTFILE         0x00100000  // Also add the (listfile) file
-#define MPQ_CREATE_ATTRIBUTES       0x00200000  // Also add the (attributes) file
-#define MPQ_CREATE_SIGNATURE        0x00400000  // Also add the (signature) file
+#define MPQ_CREATE_ATTRIBUTES       0x00100000  // Also add the (attributes) file
 #define MPQ_CREATE_ARCHIVE_V1       0x00000000  // Creates archive of version 1 (size up to 4GB)
 #define MPQ_CREATE_ARCHIVE_V2       0x01000000  // Creates archive of version 2 (larger than 4 GB)
 #define MPQ_CREATE_ARCHIVE_V3       0x02000000  // Creates archive of version 3
@@ -332,11 +343,6 @@ extern "C" {
 #define SFILE_VERIFY_HIBLOCK_TABLE      0x0006  // Verify raw data of the hi-block table
 #define SFILE_VERIFY_FILE               0x0007  // Verify raw data of a file
 
-// Signature types
-#define SIGNATURE_TYPE_NONE             0x0000  // The archive has no signature in it
-#define SIGNATURE_TYPE_WEAK             0x0001  // The archive has weak signature
-#define SIGNATURE_TYPE_STRONG           0x0002  // The archive has strong signature
-
 // Return values for SFileVerifyArchive
 #define ERROR_NO_SIGNATURE                   0  // There is no signature in the MPQ
 #define ERROR_VERIFY_FAILED                  1  // There was an error during verifying signature (like no memory)
@@ -344,7 +350,7 @@ extern "C" {
 #define ERROR_WEAK_SIGNATURE_ERROR           3  // There is a weak signature but sign check failed
 #define ERROR_STRONG_SIGNATURE_OK            4  // There is a strong signature and sign check passed
 #define ERROR_STRONG_SIGNATURE_ERROR         5  // There is a strong signature but sign check failed
-                                           
+
 #ifndef MD5_DIGEST_SIZE
 #define MD5_DIGEST_SIZE                   0x10
 #endif
@@ -357,126 +363,16 @@ extern "C" {
 #define LANG_NEUTRAL                      0x00  // Neutral locale
 #endif
 
-// Pointer to hashing function
-typedef DWORD (*HASH_STRING)(const char * szFileName, DWORD dwHashType);
-
-//-----------------------------------------------------------------------------
-// File information classes for SFileGetFileInfo and SFileFreeFileInfo
-
-typedef enum _SFileInfoClass
-{
-    // Info classes for archives
-    SFileMpqFileName,                       // Name of the archive file (TCHAR [])
-    SFileMpqStreamBitmap,                   // Array of bits, each bit means availability of one block (BYTE [])
-    SFileMpqUserDataOffset,                 // Offset of the user data header (ULONGLONG)
-    SFileMpqUserDataHeader,                 // Raw (unfixed) user data header (TMPQUserData)
-    SFileMpqUserData,                       // MPQ USer data, without the header (BYTE [])
-    SFileMpqHeaderOffset,                   // Offset of the MPQ header (ULONGLONG)
-    SFileMpqHeaderSize,                     // Fixed size of the MPQ header
-    SFileMpqHeader,                         // Raw (unfixed) archive header (TMPQHeader)
-    SFileMpqHetTableOffset,                 // Offset of the HET table, relative to MPQ header (ULONGLONG)
-    SFileMpqHetTableSize,                   // Compressed size of the HET table (ULONGLONG)
-    SFileMpqHetHeader,                      // HET table header (TMPQHetHeader)
-    SFileMpqHetTable,                       // HET table as pointer. Must be freed using SFileFreeFileInfo
-    SFileMpqBetTableOffset,                 // Offset of the BET table, relative to MPQ header (ULONGLONG)
-    SFileMpqBetTableSize,                   // Compressed size of the BET table (ULONGLONG)
-    SFileMpqBetHeader,                      // BET table header, followed by the flags (TMPQBetHeader + DWORD[])
-    SFileMpqBetTable,                       // BET table as pointer. Must be freed using SFileFreeFileInfo
-    SFileMpqHashTableOffset,                // Hash table offset, relative to MPQ header (ULONGLONG)
-    SFileMpqHashTableSize64,                // Compressed size of the hash table (ULONGLONG)
-    SFileMpqHashTableSize,                  // Size of the hash table, in entries (DWORD)
-    SFileMpqHashTable,                      // Raw (unfixed) hash table (TMPQBlock [])
-    SFileMpqBlockTableOffset,               // Block table offset, relative to MPQ header (ULONGLONG)
-    SFileMpqBlockTableSize64,               // Compressed size of the block table (ULONGLONG)
-    SFileMpqBlockTableSize,                 // Size of the block table, in entries (DWORD)
-    SFileMpqBlockTable,                     // Raw (unfixed) block table (TMPQBlock [])
-    SFileMpqHiBlockTableOffset,             // Hi-block table offset, relative to MPQ header (ULONGLONG)
-    SFileMpqHiBlockTableSize64,             // Compressed size of the hi-block table (ULONGLONG)
-    SFileMpqHiBlockTable,                   // The hi-block table (USHORT [])
-    SFileMpqSignatures,                     // Signatures present in the MPQ (DWORD)
-    SFileMpqStrongSignatureOffset,          // Byte offset of the strong signature, relative to begin of the file (ULONGLONG)
-    SFileMpqStrongSignatureSize,            // Size of the strong signature (DWORD)
-    SFileMpqStrongSignature,                // The strong signature (BYTE [])
-    SFileMpqArchiveSize64,                  // Archive size from the header (ULONGLONG)
-    SFileMpqArchiveSize,                    // Archive size from the header (DWORD)
-    SFileMpqMaxFileCount,                   // Max number of files in the archive (DWORD)
-    SFileMpqFileTableSize,                  // Number of entries in the file table (DWORD)
-    SFileMpqSectorSize,                     // Sector size (DWORD)
-    SFileMpqNumberOfFiles,                  // Number of files (DWORD)
-    SFileMpqRawChunkSize,                   // Size of the raw data chunk for MD5
-    SFileMpqStreamFlags,                    // Stream flags (DWORD)
-    SFileMpqIsReadOnly,                     // Nonzero if the MPQ is read only (DWORD)
-
-    // Info classes for files
-    SFileInfoPatchChain,                    // Chain of patches where the file is (TCHAR [])
-    SFileInfoFileEntry,                     // The file entry for the file (TFileEntry)
-    SFileInfoHashEntry,                     // Hash table entry for the file (TMPQHash)
-    SFileInfoHashIndex,                     // Index of the hash table entry (DWORD)
-    SFileInfoNameHash1,                     // The first name hash in the hash table (DWORD)
-    SFileInfoNameHash2,                     // The second name hash in the hash table (DWORD)
-    SFileInfoNameHash3,                     // 64-bit file name hash for the HET/BET tables (ULONGLONG)
-    SFileInfoLocale,                        // File locale (DWORD)
-    SFileInfoFileIndex,                     // Block index (DWORD)
-    SFileInfoByteOffset,                    // File position in the archive (ULONGLONG)
-    SFileInfoFileTime,                      // File time (ULONGLONG)
-    SFileInfoFileSize,                      // Size of the file (DWORD)
-    SFileInfoCompressedSize,                // Compressed file size (DWORD)
-    SFileInfoFlags,                         // File flags from (DWORD)
-    SFileInfoEncryptionKey,                 // File encryption key
-    SFileInfoEncryptionKeyRaw,              // Unfixed value of the file key
-} SFileInfoClass;
-
-//-----------------------------------------------------------------------------
-// Deprecated flags. These are going to be removed in next releases.
-
-/*
-
-STORMLIB_DEPRECATED_FLAG(DWORD, STREAM_PROVIDER_LINEAR, STREAM_PROVIDER_FLAT);
-STORMLIB_DEPRECATED_FLAG(DWORD, STREAM_PROVIDER_ENCRYPTED, STREAM_PROVIDER_MPQE);
-STORMLIB_DEPRECATED_FLAG(DWORD, MPQ_OPEN_ENCRYPTED, STREAM_PROVIDER_MPQE);
-STORMLIB_DEPRECATED_FLAG(DWORD, MPQ_OPEN_PARTIAL, STREAM_PROVIDER_PARTIAL);
-
-// MPQ_FILE_COMPRESSED is deprecated. Do not use.
-STORMLIB_DEPRECATED_FLAG(DWORD, MPQ_FILE_COMPRESSED, MPQ_FILE_COMPRESS_MASK);
-
-// Legacy values for file info classes. Included for backward compatibility, do not use.
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_ARCHIVE_NAME, SFileMpqFileName);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_ARCHIVE_SIZE, SFileMpqArchiveSize);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_MAX_FILE_COUNT, SFileMpqMaxFileCount);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_HASH_TABLE_SIZE, SFileMpqHashTableSize);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_BLOCK_TABLE_SIZE, SFileMpqBlockTableSize);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_SECTOR_SIZE, SFileMpqSectorSize);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_HASH_TABLE, SFileMpqHashTable);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_BLOCK_TABLE, SFileMpqBlockTable);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_NUM_FILES, SFileMpqNumberOfFiles);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_STREAM_FLAGS, SFileMpqStreamFlags);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_IS_READ_ONLY, SFileMpqIsReadOnly);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_HASH_INDEX, SFileInfoHashIndex);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_CODENAME1, SFileInfoNameHash1);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_CODENAME2, SFileInfoNameHash2);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_LOCALEID, SFileInfoLocale);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_BLOCKINDEX, SFileInfoFileIndex);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_FILE_SIZE, SFileInfoFileSize);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_COMPRESSED_SIZE, SFileInfoCompressedSize);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_FLAGS, SFileInfoFlags);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_POSITION, SFileInfoByteOffset);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_KEY, SFileInfoEncryptionKey);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_KEY_UNFIXED, SFileInfoEncryptionKeyRaw);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_FILETIME, SFileInfoFileTime);
-STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_PATCH_CHAIN, SFileInfoPatchChain);
-*/
-
 //-----------------------------------------------------------------------------
 // Callback functions
 
 // Values for compact callback
-#define CCB_CHECKING_FILES                  1   // Checking archive (dwParam1 = current, dwParam2 = total)
-#define CCB_CHECKING_HASH_TABLE             2   // Checking hash table (dwParam1 = current, dwParam2 = total)
-#define CCB_COPYING_NON_MPQ_DATA            3   // Copying non-MPQ data: No params used
-#define CCB_COMPACTING_FILES                4   // Compacting archive (dwParam1 = current, dwParam2 = total)
-#define CCB_CLOSING_ARCHIVE                 5   // Closing archive: No params used
-                                      
-typedef void (WINAPI * SFILE_DOWNLOAD_CALLBACK)(void * pvUserData, ULONGLONG ByteOffset, DWORD dwTotalBytes);
+#define CCB_CHECKING_FILES                   1  // Checking archive (dwParam1 = current, dwParam2 = total)
+#define CCB_CHECKING_HASH_TABLE              2  // Checking hash table (dwParam1 = current, dwParam2 = total)
+#define CCB_COPYING_NON_MPQ_DATA             3  // Copying non-MPQ data: No params used
+#define CCB_COMPACTING_FILES                 4  // Compacting archive (dwParam1 = current, dwParam2 = total)
+#define CCB_CLOSING_ARCHIVE                  5  // Closing archive: No params used
+
 typedef void (WINAPI * SFILE_ADDFILE_CALLBACK)(void * pvUserData, DWORD dwBytesWritten, DWORD dwTotalBytes, bool bFinalCall);
 typedef void (WINAPI * SFILE_COMPACT_CALLBACK)(void * pvUserData, DWORD dwWorkType, ULONGLONG BytesProcessed, ULONGLONG TotalBytes);
 
@@ -487,7 +383,7 @@ typedef struct TFileStream TFileStream;
 
 typedef struct _TBitArray
 {
-    DWORD NumberOfBytes;                        // Total number of bytes in "Elements"
+
     DWORD NumberOfBits;                         // Total number of bits that are available
     BYTE Elements[1];                           // Array of elements (variable length)
 } TBitArray;
@@ -495,6 +391,19 @@ typedef struct _TBitArray
 void GetBits(TBitArray * array, unsigned int nBitPosition, unsigned int nBitLength, void * pvBuffer, int nResultSize);
 void SetBits(TBitArray * array, unsigned int nBitPosition, unsigned int nBitLength, void * pvBuffer, int nResultSize);
 
+// Structure for file bitmap. Used by SFileGetArchiveBitmap
+typedef struct _TFileBitmap
+{
+    ULONGLONG StartOffset;                      // Starting offset of the file, covered by bitmap
+    ULONGLONG EndOffset;                        // Ending offset of the file, covered by bitmap
+    DWORD IsComplete;                           // If nonzero, no blocks are missing
+    DWORD BitmapSize;                           // Size of the file bitmap (in bytes)
+    DWORD BlockSize;                            // Size of one block, in bytes
+    DWORD Reserved;                             // Alignment
+
+    // Followed by file bitmap (variable length), array of BYTEs)
+} TFileBitmap;
+
 //-----------------------------------------------------------------------------
 // Structures related to MPQ format
 //
@@ -509,7 +418,6 @@ void SetBits(TBitArray * array, unsigned int nBitPosition, unsigned int nBitLeng
 #define MPQ_HEADER_SIZE_V2    0x2C
 #define MPQ_HEADER_SIZE_V3    0x44
 #define MPQ_HEADER_SIZE_V4    0xD0
-#define MPQ_HEADER_DWORDS     (MPQ_HEADER_SIZE_V4 / 0x04)
 
 typedef struct _TMPQUserData
 {
@@ -558,14 +466,14 @@ typedef struct _TMPQHeader
 
     // Offset to the beginning of the hash table, relative to the beginning of the archive.
     DWORD dwHashTablePos;
-    
+
     // Offset to the beginning of the block table, relative to the beginning of the archive.
     DWORD dwBlockTablePos;
-    
+
     // Number of entries in the hash table. Must be a power of two, and must be less than 2^16 for
     // the original MoPaQ format, or less than 2^20 for the Burning Crusade format.
     DWORD dwHashTableSize;
-    
+
     // Number of entries in the block table
     DWORD dwBlockTableSize;
 
@@ -610,7 +518,7 @@ typedef struct _TMPQHeader
 
     // Size of raw data chunk to calculate MD5.
     // MD5 of each data chunk follows the raw file data.
-    DWORD dwRawChunkSize;                                 
+    DWORD dwRawChunkSize;
 
     // MD5 of MPQ tables
     unsigned char MD5_BlockTable[MD5_DIGEST_SIZE];      // MD5 of the block table before decryption
@@ -622,12 +530,13 @@ typedef struct _TMPQHeader
 } TMPQHeader;
 #pragma pack(pop)
 
-// Hash table entry. All files in the archive are searched by their hashes.
+
+// Hash entry. All files in the archive are searched by their hashes.
 typedef struct _TMPQHash
 {
     // The hash of the file path, using method A.
     DWORD dwName1;
-    
+
     // The hash of the file path, using method B.
     DWORD dwName2;
 
@@ -658,53 +567,54 @@ typedef struct _TMPQHash
     DWORD dwBlockIndex;
 } TMPQHash;
 
+
 // File description block contains informations about the file
 typedef struct _TMPQBlock
 {
     // Offset of the beginning of the file, relative to the beginning of the archive.
     DWORD dwFilePos;
-    
+
     // Compressed file size
     DWORD dwCSize;
-    
+
     // Only valid if the block is a file; otherwise meaningless, and should be 0.
     // If the file is compressed, this is the size of the uncompressed file data.
-    DWORD dwFSize;                      
-    
+    DWORD dwFSize;
+
     // Flags for the file. See MPQ_FILE_XXXX constants
-    DWORD dwFlags;                      
+    DWORD dwFlags;
 } TMPQBlock;
 
 // Patch file information, preceding the sector offset table
 typedef struct _TPatchInfo
 {
-    DWORD dwLength;                             // Length of patch info header, in bytes
-    DWORD dwFlags;                              // Flags. 0x80000000 = MD5 (?)
-    DWORD dwDataSize;                           // Uncompressed size of the patch file
-    BYTE  md5[0x10];                            // MD5 of the entire patch file after decompression
+    DWORD dwLength;                     // Length of patch info header, in bytes
+    DWORD dwFlags;                      // Flags. 0x80000000 = MD5 (?)
+    DWORD dwDataSize;                   // Uncompressed size of the patch file
+    BYTE  md5[0x10];                    // MD5 of the entire patch file after decompression
 
     // Followed by the sector table (variable length)
 } TPatchInfo;
 
-// Header for PTCH files 
+// Header for PTCH files
 typedef struct _TPatchHeader
 {
     //-- PATCH header -----------------------------------
-    DWORD dwSignature;                          // 'PTCH'
-    DWORD dwSizeOfPatchData;                    // Size of the entire patch (decompressed)
-    DWORD dwSizeBeforePatch;                    // Size of the file before patch
-    DWORD dwSizeAfterPatch;                     // Size of file after patch
-    
+    DWORD dwSignature;                  // 'PTCH'
+    DWORD dwSizeOfPatchData;            // Size of the entire patch (decompressed)
+    DWORD dwSizeBeforePatch;            // Size of the file before patch
+    DWORD dwSizeAfterPatch;             // Size of file after patch
+
     //-- MD5 block --------------------------------------
-    DWORD dwMD5;                                // 'MD5_'
-    DWORD dwMd5BlockSize;                       // Size of the MD5 block, including the signature and size itself
-    BYTE md5_before_patch[0x10];                // MD5 of the original (unpached) file
-    BYTE md5_after_patch[0x10];                 // MD5 of the patched file
+    DWORD dwMD5;                        // 'MD5_'
+    DWORD dwMd5BlockSize;               // Size of the MD5 block, including the signature and size itself
+    BYTE md5_before_patch[0x10];        // MD5 of the original (unpached) file
+    BYTE md5_after_patch[0x10];         // MD5 of the patched file
 
     //-- XFRM block -------------------------------------
-    DWORD dwXFRM;                               // 'XFRM'
-    DWORD dwXfrmBlockSize;                      // Size of the XFRM block, includes XFRM header and patch data
-    DWORD dwPatchType;                          // Type of patch ('BSD0' or 'COPY')
+    DWORD dwXFRM;                       // 'XFRM'
+    DWORD dwXfrmBlockSize;              // Size of the XFRM block, includes XFRM header and patch data
+    DWORD dwPatchType;                  // Type of patch ('BSD0' or 'COPY')
 
     // Followed by the patch data
 } TPatchHeader;
@@ -716,273 +626,211 @@ typedef struct _TPatchHeader
 // (attributes) file and from (listfile).
 typedef struct _TFileEntry
 {
-    ULONGLONG FileNameHash;                     // Jenkins hash of the file name. Only used when the MPQ has BET table.
-    ULONGLONG ByteOffset;                       // Position of the file content in the MPQ, relative to the MPQ header
-    ULONGLONG FileTime;                         // FileTime from the (attributes) file. 0 if not present.
-    DWORD     dwHashIndex;                      // Index to the hash table. Only used when the MPQ has classic hash table
-    DWORD     dwFileSize;                       // Decompressed size of the file
-    DWORD     dwCmpSize;                        // Compressed size of the file (i.e., size of the file data in the MPQ)
-    DWORD     dwFlags;                          // File flags (from block table)
-    USHORT    lcLocale;                         // Locale ID for the file
-    USHORT    wPlatform;                        // Platform ID for the file
-    DWORD     dwCrc32;                          // CRC32 from (attributes) file. 0 if not present.
-    unsigned char md5[MD5_DIGEST_SIZE];         // File MD5 from the (attributes) file. 0 if not present.
-    char * szFileName;                          // File name. NULL if not known.
+    ULONGLONG ByteOffset;               // Position of the file content in the MPQ, relative to the MPQ header
+    ULONGLONG FileTime;                 // FileTime from the (attributes) file. 0 if not present.
+    ULONGLONG BetHash;                  // Lower part of the file name hash. Only used when the MPQ has BET table.
+    DWORD     dwHashIndex;              // Index to the hash table. Only used when the MPQ has classic hash table
+    DWORD     dwHetIndex;               // Index to the HET table. Only used when the MPQ has HET table
+    DWORD     dwFileSize;               // Decompressed size of the file
+    DWORD     dwCmpSize;                // Compressed size of the file (i.e., size of the file data in the MPQ)
+    DWORD     dwFlags;                  // File flags (from block table)
+    USHORT    lcLocale;                 // Locale ID for the file
+    USHORT    wPlatform;                // Platform ID for the file
+    DWORD     dwCrc32;                  // CRC32 from (attributes) file. 0 if not present.
+    unsigned char md5[MD5_DIGEST_SIZE]; // File MD5 from the (attributes) file. 0 if not present.
+    char * szFileName;                  // File name. NULL if not known.
 } TFileEntry;
 
 // Common header for HET and BET tables
-typedef struct _TMPQExtHeader
+typedef struct _TMPQExtTable
 {
-    DWORD dwSignature;                          // 'HET\x1A' or 'BET\x1A'
-    DWORD dwVersion;                            // Version. Seems to be always 1
-    DWORD dwDataSize;                           // Size of the contained table
+    DWORD dwSignature;                  // 'HET\x1A' or 'BET\x1A'
+    DWORD dwVersion;                    // Version. Seems to be always 1
+    DWORD dwDataSize;                   // Size of the contained table
 
     // Followed by the table header
     // Followed by the table data
 
-} TMPQExtHeader;
+} TMPQExtTable;
 
-// Structure for HET table header
-typedef struct _TMPQHetHeader
+//
+// MPQ data bitmap, can be found at (FileSize - sizeof(TMPQBlockMap))
+//
+// There is bit map of the entire MPQ before TMPQBitmap. Each 0x4000-byte
+// block is represented by one bit (including the last, eventually incomplete block).
+//
+typedef struct _TMPQBitmap
 {
-    TMPQExtHeader ExtHdr;
-
-    DWORD dwTableSize;                      // Size of the entire HET table, including HET_TABLE_HEADER (in bytes)
-    DWORD dwEntryCount;                     // Number of occupied entries in the HET table
-    DWORD dwTotalCount;                     // Total number of entries in the HET table
-    DWORD dwNameHashBitSize;                // Size of the name hash entry (in bits)
-    DWORD dwIndexSizeTotal;                 // Total size of file index (in bits)
-    DWORD dwIndexSizeExtra;                 // Extra bits in the file index
-    DWORD dwIndexSize;                      // Effective size of the file index (in bits)
-    DWORD dwIndexTableSize;                 // Size of the block index subtable (in bytes)
-
-} TMPQHetHeader;
-
-// Structure for BET table header
-typedef struct _TMPQBetHeader
-{
-    TMPQExtHeader ExtHdr;
-
-    DWORD dwTableSize;                      // Size of the entire BET table, including the header (in bytes)
-    DWORD dwEntryCount;                     // Number of entries in the BET table. Must match HET_TABLE_HEADER::dwEntryCount
-    DWORD dwUnknown08;
-    DWORD dwTableEntrySize;                 // Size of one table entry (in bits)
-    DWORD dwBitIndex_FilePos;               // Bit index of the file position (within the entry record)
-    DWORD dwBitIndex_FileSize;              // Bit index of the file size (within the entry record)
-    DWORD dwBitIndex_CmpSize;               // Bit index of the compressed size (within the entry record)
-    DWORD dwBitIndex_FlagIndex;             // Bit index of the flag index (within the entry record)
-    DWORD dwBitIndex_Unknown;               // Bit index of the ??? (within the entry record)
-    DWORD dwBitCount_FilePos;               // Bit size of file position (in the entry record)
-    DWORD dwBitCount_FileSize;              // Bit size of file size (in the entry record)
-    DWORD dwBitCount_CmpSize;               // Bit size of compressed file size (in the entry record)
-    DWORD dwBitCount_FlagIndex;             // Bit size of flags index (in the entry record)
-    DWORD dwBitCount_Unknown;               // Bit size of ??? (in the entry record)
-    DWORD dwBitTotal_NameHash2;             // Total bit size of the NameHash2
-    DWORD dwBitExtra_NameHash2;             // Extra bits in the NameHash2
-    DWORD dwBitCount_NameHash2;             // Effective size of NameHash2 (in bits)
-    DWORD dwNameHashArraySize;              // Size of NameHash2 table, in bytes
-    DWORD dwFlagCount;                      // Number of flags in the following array
-
-} TMPQBetHeader;
+    DWORD dwSignature;                  // 'ptv3' (MPQ_BLOCK_MAP_SIGNATURE)
+    DWORD dwAlways3;                    // Unknown, seems to always have value of 3
+    DWORD dwBuildNumber;                // Game build number for that MPQ
+    DWORD dwMapOffsetLo;                // Low 32-bits of the offset of the bit map
+    DWORD dwMapOffsetHi;                // High 32-bits of the offset of the bit map
+    DWORD dwBlockSize;                  // Size of one block (usually 0x4000 bytes)
+} TMPQBitmap;
 
 // Structure for parsed HET table
 typedef struct _TMPQHetTable
 {
-    TBitArray * pBetIndexes;                    // Bit array of FileIndex values
-    LPBYTE     pNameHashes;                     // Array of NameHash1 values (NameHash1 = upper 8 bits of FileName hashe)
-    ULONGLONG  AndMask64;                       // AND mask used for calculating file name hash
-    ULONGLONG  OrMask64;                        // OR mask used for setting the highest bit of the file name hash
+    TBitArray * pBetIndexes;            // Bit array of indexes to BET tables
+    LPBYTE     pHetHashes;              // Array of HET hashes. Each entry has size of 1 byte
+    ULONGLONG  AndMask64;               // AND mask used for calculating file name hash
+    ULONGLONG  OrMask64;                // OR mask used for setting the highest bit of the file name hash
 
-    DWORD      dwEntryCount;                    // Number of occupied entries in the HET table
-    DWORD      dwTotalCount;                    // Number of entries in both NameHash and FileIndex table
-    DWORD      dwNameHashBitSize;               // Size of the name hash entry (in bits)
-    DWORD      dwIndexSizeTotal;                // Total size of one entry in pBetIndexes (in bits)
-    DWORD      dwIndexSizeExtra;                // Extra bits in the entry in pBetIndexes
-    DWORD      dwIndexSize;                     // Effective size of one entry in pBetIndexes (in bits)
+    DWORD      dwIndexSizeTotal;        // Total size of one entry in pBetIndexes (in bits)
+    DWORD      dwIndexSizeExtra;        // Extra bits in the entry in pBetIndexes
+    DWORD      dwIndexSize;             // Effective size of one entry in pBetIndexes (in bits)
+    DWORD      dwMaxFileCount;          // Maximum number of files in the MPQ
+    DWORD      dwHashTableSize;         // Number of entries in pBetHashes
+    DWORD      dwHashBitSize;           // Effective number of bits in the hash
 } TMPQHetTable;
 
 // Structure for parsed BET table
 typedef struct _TMPQBetTable
 {
-    TBitArray * pNameHashes;                    // Array of NameHash2 entries (lower 24 bits of FileName hash)
-    TBitArray * pFileTable;                     // Bit-based file table
-    LPDWORD pFileFlags;                         // Array of file flags
+    TBitArray * pBetHashes;             // Array of BET hashes
+    TBitArray * pFileTable;             // Bit-based file table
+    LPDWORD pFileFlags;                 // Array of file flags
 
-    DWORD dwTableEntrySize;                     // Size of one table entry, in bits
-    DWORD dwBitIndex_FilePos;                   // Bit index of the file position in the table entry
-    DWORD dwBitIndex_FileSize;                  // Bit index of the file size in the table entry
-    DWORD dwBitIndex_CmpSize;                   // Bit index of the compressed size in the table entry
-    DWORD dwBitIndex_FlagIndex;                 // Bit index of the flag index in the table entry
-    DWORD dwBitIndex_Unknown;                   // Bit index of ??? in the table entry
-    DWORD dwBitCount_FilePos;                   // Size of file offset (in bits) within table entry
-    DWORD dwBitCount_FileSize;                  // Size of file size (in bits) within table entry
-    DWORD dwBitCount_CmpSize;                   // Size of compressed file size (in bits) within table entry
-    DWORD dwBitCount_FlagIndex;                 // Size of flag index (in bits) within table entry
-    DWORD dwBitCount_Unknown;                   // Size of ??? (in bits) within table entry
-    DWORD dwBitTotal_NameHash2;                 // Total size of the NameHash2
-    DWORD dwBitExtra_NameHash2;                 // Extra bits in the NameHash2
-    DWORD dwBitCount_NameHash2;                 // Effective size of the NameHash2
-    DWORD dwEntryCount;                         // Number of entries
-    DWORD dwFlagCount;                          // Number of file flags in pFileFlags
+    DWORD dwTableEntrySize;             // Size of one table entry, in bits
+    DWORD dwBitIndex_FilePos;           // Bit index of the file position in the table entry
+    DWORD dwBitIndex_FileSize;          // Bit index of the file size in the table entry
+    DWORD dwBitIndex_CmpSize;           // Bit index of the compressed size in the table entry
+    DWORD dwBitIndex_FlagIndex;         // Bit index of the flag index in the table entry
+    DWORD dwBitIndex_Unknown;           // Bit index of ??? in the table entry
+    DWORD dwBitCount_FilePos;           // Size of file offset (in bits) within table entry
+    DWORD dwBitCount_FileSize;          // Size of file size (in bits) within table entry
+    DWORD dwBitCount_CmpSize;           // Size of compressed file size (in bits) within table entry
+    DWORD dwBitCount_FlagIndex;         // Size of flag index (in bits) within table entry
+    DWORD dwBitCount_Unknown;           // Size of ??? (in bits) within table entry
+    DWORD dwBetHashSizeTotal;           // Total size of bet hash
+    DWORD dwBetHashSizeExtra;           // Extra bits in the bet hash
+    DWORD dwBetHashSize;                // Effective size of the bet hash
+    DWORD dwFileCount;                  // Number of files (usually equal to maximum number of files)
+    DWORD dwFlagCount;                  // Number of entries in pFileFlags
 } TMPQBetTable;
 
-// Structure for patch prefix
-typedef struct _TMPQNamePrefix
-{
-    size_t nLength;                             // Length of this patch prefix. Can be 0
-    char szPatchPrefix[1];                      // Patch name prefix (variable length). If not empty, it always starts with backslash.
-} TMPQNamePrefix;
-
 // Archive handle structure
 typedef struct _TMPQArchive
 {
-    TFileStream  * pStream;                     // Open stream for the MPQ
+    TFileStream  * pStream;             // Open stream for the MPQ
 
-    ULONGLONG      UserDataPos;                 // Position of user data (relative to the begin of the file)
-    ULONGLONG      MpqPos;                      // MPQ header offset (relative to the begin of the file)
+    ULONGLONG      UserDataPos;         // Position of user data (relative to the begin of the file)
+    ULONGLONG      MpqPos;              // MPQ header offset (relative to the begin of the file)
 
-    struct _TMPQArchive * haPatch;              // Pointer to patch archive, if any
-    struct _TMPQArchive * haBase;               // Pointer to base ("previous version") archive, if any
-    TMPQNamePrefix * pPatchPrefix;              // Patch prefix to precede names of patch files
+    struct _TMPQArchive * haPatch;      // Pointer to patch archive, if any
+    struct _TMPQArchive * haBase;       // Pointer to base ("previous version") archive, if any
+    char szPatchPrefix[MPQ_PATCH_PREFIX_LEN]; // Prefix for file names in patch MPQs
+    size_t         cchPatchPrefix;      // Length of the patch prefix, in characters
 
-    TMPQUserData * pUserData;                   // MPQ user data (NULL if not present in the file)
-    TMPQHeader   * pHeader;                     // MPQ file header
-    TMPQHash     * pHashTable;                  // Hash table
-    TMPQHetTable * pHetTable;                   // HET table
-    TFileEntry   * pFileTable;                  // File table
-    HASH_STRING    pfnHashString;               // Hashing function that will convert the file name into hash
-    
-    TMPQUserData   UserData;                    // MPQ user data. Valid only when ID_MPQ_USERDATA has been found
-    DWORD          HeaderData[MPQ_HEADER_DWORDS];  // Storage for MPQ header
+    TMPQUserData * pUserData;           // MPQ user data (NULL if not present in the file)
+    TMPQHeader   * pHeader;             // MPQ file header
+    TMPQBitmap   * pBitmap;             // MPQ bitmap
+    TMPQHash     * pHashTable;          // Hash table
+    TMPQHetTable * pHetTable;           // Het table
+    TFileEntry   * pFileTable;          // File table
+
+    TMPQUserData   UserData;            // MPQ user data. Valid only when ID_MPQ_USERDATA has been found
+    BYTE           HeaderData[MPQ_HEADER_SIZE_V4];  // Storage for MPQ header
 
     DWORD          dwHETBlockSize;
     DWORD          dwBETBlockSize;
-    DWORD          dwMaxFileCount;              // Maximum number of files in the MPQ. Also total size of the file table.
-    DWORD          dwFileTableSize;             // Current size of the file table, e.g. index of the entry past the last occupied one
-    DWORD          dwReservedFiles;             // Number of entries reserved for internal MPQ files (listfile, attributes)
-    DWORD          dwSectorSize;                // Default size of one file sector
-    DWORD          dwFileFlags1;                // Flags for (listfile)
-    DWORD          dwFileFlags2;                // Flags for (attributes)
-    DWORD          dwFileFlags3;                // Flags for (signature)
-    DWORD          dwAttrFlags;                 // Flags for the (attributes) file, see MPQ_ATTRIBUTE_XXX
-    DWORD          dwFlags;                     // See MPQ_FLAG_XXXXX
-    DWORD          dwSubType;                   // See MPQ_SUBTYPE_XXX
-
-    SFILE_ADDFILE_CALLBACK pfnAddFileCB;        // Callback function for adding files
-    void         * pvAddFileUserData;           // User data thats passed to the callback
-
-    SFILE_COMPACT_CALLBACK pfnCompactCB;        // Callback function for compacting the archive
-    ULONGLONG      CompactBytesProcessed;       // Amount of bytes that have been processed during a particular compact call
-    ULONGLONG      CompactTotalBytes;           // Total amount of bytes to be compacted
-    void         * pvCompactUserData;           // User data thats passed to the callback
-} TMPQArchive;                                      
+    DWORD          dwFileTableSize;     // Current size of the file table, e.g. index of the entry past the last occupied one
+    DWORD          dwMaxFileCount;      // Maximum number of files in the MPQ
+    DWORD          dwSectorSize;        // Default size of one file sector
+    DWORD          dwFileFlags1;        // Flags for (listfile)
+    DWORD          dwFileFlags2;        // Flags for (attributes)
+    DWORD          dwAttrFlags;         // Flags for the (attributes) file, see MPQ_ATTRIBUTE_XXX
+    DWORD          dwFlags;             // See MPQ_FLAG_XXXXX
+} TMPQArchive;
 
 // File handle structure
 typedef struct _TMPQFile
 {
-    TFileStream  * pStream;                     // File stream. Only used on local files
-    TMPQArchive  * ha;                          // Archive handle
-    TFileEntry   * pFileEntry;                  // File entry for the file
-    DWORD          dwFileKey;                   // Decryption key
-    DWORD          dwFilePos;                   // Current file position
-    ULONGLONG      RawFilePos;                  // Offset in MPQ archive (relative to file begin)
-    ULONGLONG      MpqFilePos;                  // Offset in MPQ archive (relative to MPQ header)
-    DWORD          dwMagic;                     // 'FILE'
+    TFileStream  * pStream;             // File stream. Only used on local files
+    TMPQArchive  * ha;                  // Archive handle
+    TFileEntry   * pFileEntry;          // File entry for the file
+    DWORD          dwFileKey;           // Decryption key
+    DWORD          dwFilePos;           // Current file position
+    ULONGLONG      RawFilePos;          // Offset in MPQ archive (relative to file begin)
+    ULONGLONG      MpqFilePos;          // Offset in MPQ archive (relative to MPQ header)
+    DWORD          dwMagic;             // 'FILE'
 
-    struct _TMPQFile * hfPatch;                 // Pointer to opened patch file
-    TPatchHeader * pPatchHeader;                // Patch header. Only used if the file is a patch file
-    LPBYTE         pbFileData;                  // Data of the file (single unit files, patched files)
-    DWORD          cbFileData;                  // Size of file data
-    BYTE           FileDataMD5[MD5_DIGEST_SIZE];// MD5 hash of the loaded file data. Used during patch process
+    struct _TMPQFile * hfPatchFile;     // Pointer to opened patch file
+    TPatchHeader * pPatchHeader;        // Patch header. Only used if the file is a patch file
+    LPBYTE         pbFileData;          // Loaded and patched file data. Only used if the file is a patch file
+    DWORD          cbFileData;          // Size of loaded patched data
 
-    TPatchInfo   * pPatchInfo;                  // Patch info block, preceding the sector table
-    DWORD        * SectorOffsets;               // Position of each file sector, relative to the begin of the file. Only for compressed files.
-    DWORD        * SectorChksums;               // Array of sector checksums (either ADLER32 or MD5) values for each file sector
-    DWORD          dwCompression0;              // Compression that will be used on the first file sector
-    DWORD          dwSectorCount;               // Number of sectors in the file
-    DWORD          dwPatchedFileSize;           // Size of patched file. Used when saving patch file to the MPQ
-    DWORD          dwDataSize;                  // Size of data in the file (on patch files, this differs from file size in block table entry)
+    TPatchInfo   * pPatchInfo;          // Patch info block, preceding the sector table
+    DWORD        * SectorOffsets;       // Position of each file sector, relative to the begin of the file. Only for compressed files.
+    DWORD        * SectorChksums;       // Array of sector checksums (either ADLER32 or MD5) values for each file sector
+    DWORD          dwSectorCount;       // Number of sectors in the file
+    DWORD          dwPatchedFileSize;   // Size of patched file. Used when saving patch file to the MPQ
+    DWORD          dwDataSize;          // Size of data in the file (on patch files, this differs from file size in block table entry)
 
-    LPBYTE         pbFileSector;                // Last loaded file sector. For single unit files, entire file content
-    DWORD          dwSectorOffs;                // File position of currently loaded file sector
-    DWORD          dwSectorSize;                // Size of the file sector. For single unit files, this is equal to the file size
+    LPBYTE         pbFileSector;        // Last loaded file sector. For single unit files, entire file content
+    DWORD          dwSectorOffs;        // File position of currently loaded file sector
+    DWORD          dwSectorSize;        // Size of the file sector. For single unit files, this is equal to the file size
 
-    unsigned char  hctx[HASH_STATE_SIZE];       // Hash state for MD5. Used when saving file to MPQ
-    DWORD          dwCrc32;                     // CRC32 value, used when saving file to MPQ
+    unsigned char  hctx[HASH_STATE_SIZE];// Hash state for MD5. Used when saving file to MPQ
+    DWORD          dwCrc32;             // CRC32 value, used when saving file to MPQ
 
-    int            nAddFileError;               // Result of the "Add File" operations
-
-    bool           bLoadedSectorCRCs;           // If true, we already tried to load sector CRCs
-    bool           bCheckSectorCRCs;            // If true, then SFileReadFile will check sector CRCs when reading the file
-    bool           bIsWriteHandle;              // If true, this handle has been created by SFileCreateFile
+    bool           bLoadedSectorCRCs;   // If true, we already tried to load sector CRCs
+    bool           bCheckSectorCRCs;    // If true, then SFileReadFile will check sector CRCs when reading the file
+    bool           bIsWriteHandle;      // If true, this handle has been created by SFileCreateFile
+    bool           bErrorOccured;       // If true, then at least one error occured during saving the file to the archive
 } TMPQFile;
 
 // Structure for SFileFindFirstFile and SFileFindNextFile
 typedef struct _SFILE_FIND_DATA
 {
-    char   cFileName[MAX_PATH];                 // Full name of the found file
-    char * szPlainName;                         // Plain name of the found file
-    DWORD  dwHashIndex;                         // Hash table index for the file
-    DWORD  dwBlockIndex;                        // Block table index for the file
-    DWORD  dwFileSize;                          // File size in bytes
-    DWORD  dwFileFlags;                         // MPQ file flags
-    DWORD  dwCompSize;                          // Compressed file size
-    DWORD  dwFileTimeLo;                        // Low 32-bits of the file time (0 if not present)
-    DWORD  dwFileTimeHi;                        // High 32-bits of the file time (0 if not present)
-    LCID   lcLocale;                            // Locale version
+    char   cFileName[MAX_PATH];         // Full name of the found file
+    char * szPlainName;                 // Plain name of the found file
+    DWORD  dwHashIndex;                 // Hash table index for the file
+    DWORD  dwBlockIndex;                // Block table index for the file
+    DWORD  dwFileSize;                  // File size in bytes
+    DWORD  dwFileFlags;                 // MPQ file flags
+    DWORD  dwCompSize;                  // Compressed file size
+    DWORD  dwFileTimeLo;                // Low 32-bits of the file time (0 if not present)
+    DWORD  dwFileTimeHi;                // High 32-bits of the file time (0 if not present)
+    LCID   lcLocale;                    // Locale version
 
 } SFILE_FIND_DATA, *PSFILE_FIND_DATA;
 
 typedef struct _SFILE_CREATE_MPQ
 {
-    DWORD cbSize;                               // Size of this structure, in bytes
-    DWORD dwMpqVersion;                         // Version of the MPQ to be created
-    void *pvUserData;                           // Reserved, must be NULL
-    DWORD cbUserData;                           // Reserved, must be 0
-    DWORD dwStreamFlags;                        // Stream flags for creating the MPQ
-    DWORD dwFileFlags1;                         // File flags for (listfile). 0 = default
-    DWORD dwFileFlags2;                         // File flags for (attributes). 0 = default
-    DWORD dwFileFlags3;                         // File flags for (signature). 0 = default
-    DWORD dwAttrFlags;                          // Flags for the (attributes) file. If 0, no attributes will be created
-    DWORD dwSectorSize;                         // Sector size for compressed files
-    DWORD dwRawChunkSize;                       // Size of raw data chunk
-    DWORD dwMaxFileCount;                       // File limit for the MPQ
+    DWORD cbSize;                       // Size of this structure, in bytes
+    DWORD dwMpqVersion;                 // Version of the MPQ to be created
+    void *pvUserData;                   // Reserved, must be NULL
+    DWORD cbUserData;                   // Reserved, must be 0
+    DWORD dwStreamFlags;                // Stream flags for creating the MPQ
+    DWORD dwFileFlags1;                 // File flags for (listfile). 0 = default
+    DWORD dwFileFlags2;                 // File flags for (attributes). 0 = default
+    DWORD dwAttrFlags;                  // Flags for the (attributes) file. If 0, no attributes will be created
+    DWORD dwSectorSize;                 // Sector size for compressed files
+    DWORD dwRawChunkSize;               // Size of raw data chunk
+    DWORD dwMaxFileCount;               // File limit for the MPQ
 
 } SFILE_CREATE_MPQ, *PSFILE_CREATE_MPQ;
 
 //-----------------------------------------------------------------------------
 // Stream support - functions
 
-// Structure used by FileStream_GetBitmap
-typedef struct _TStreamBitmap
-{
-    ULONGLONG StreamSize;                       // Size of the stream, in bytes
-    DWORD BitmapSize;                           // Size of the block map, in bytes
-    DWORD BlockCount;                           // Number of blocks in the stream
-    DWORD BlockSize;                            // Size of one block
-    DWORD IsComplete;                           // Nonzero if the file is complete
-
-    // Followed by the BYTE array, each bit means availability of one block
-
-} TStreamBitmap;
-
-// UNICODE versions of the file access functions
 TFileStream * FileStream_CreateFile(const TCHAR * szFileName, DWORD dwStreamFlags);
 TFileStream * FileStream_OpenFile(const TCHAR * szFileName, DWORD dwStreamFlags);
-const TCHAR * FileStream_GetFileName(TFileStream * pStream);
-size_t FileStream_Prefix(const TCHAR * szFileName, DWORD * pdwProvider);
-
-bool FileStream_SetCallback(TFileStream * pStream, SFILE_DOWNLOAD_CALLBACK pfnCallback, void * pvUserData);
-
-bool FileStream_GetBitmap(TFileStream * pStream, void * pvBitmap, DWORD cbBitmap, LPDWORD pcbLengthNeeded);
+TCHAR * FileStream_GetFileName(TFileStream * pStream);
+bool FileStream_IsReadOnly(TFileStream * pStream);
 bool FileStream_Read(TFileStream * pStream, ULONGLONG * pByteOffset, void * pvBuffer, DWORD dwBytesToRead);
 bool FileStream_Write(TFileStream * pStream, ULONGLONG * pByteOffset, const void * pvBuffer, DWORD dwBytesToWrite);
-bool FileStream_SetSize(TFileStream * pStream, ULONGLONG NewFileSize);
-bool FileStream_GetSize(TFileStream * pStream, ULONGLONG * pFileSize);
 bool FileStream_GetPos(TFileStream * pStream, ULONGLONG * pByteOffset);
+bool FileStream_SetPos(TFileStream * pStream, ULONGLONG ByteOffset);
+bool FileStream_GetSize(TFileStream * pStream, ULONGLONG * pFileSize);
+bool FileStream_SetSize(TFileStream * pStream, ULONGLONG NewFileSize);
 bool FileStream_GetTime(TFileStream * pStream, ULONGLONG * pFT);
 bool FileStream_GetFlags(TFileStream * pStream, LPDWORD pdwStreamFlags);
-bool FileStream_Replace(TFileStream * pStream, TFileStream * pNewStream);
+bool FileStream_Switch(TFileStream * pStream, TFileStream * pTempStream);
+bool FileStream_SetBitmap(TFileStream * pStream, TFileBitmap * pBitmap);
+bool FileStream_GetBitmap(TFileStream * pStream, TFileBitmap * pBitmap, DWORD Length, LPDWORD LengthNeeded);
 void FileStream_Close(TFileStream * pStream);
 
 //-----------------------------------------------------------------------------
@@ -1008,10 +856,10 @@ LCID   WINAPI SFileSetLocale(LCID lcNewLocale);
 // Functions for archive manipulation
 
 bool   WINAPI SFileOpenArchive(const TCHAR * szMpqName, DWORD dwPriority, DWORD dwFlags, HANDLE * phMpq);
-bool   WINAPI SFileCreateArchive(const TCHAR * szMpqName, DWORD dwCreateFlags, DWORD dwMaxFileCount, HANDLE * phMpq);
+bool   WINAPI SFileCreateArchive(const TCHAR * szMpqName, DWORD dwFlags, DWORD dwMaxFileCount, HANDLE * phMpq);
 bool   WINAPI SFileCreateArchive2(const TCHAR * szMpqName, PSFILE_CREATE_MPQ pCreateInfo, HANDLE * phMpq);
 
-bool   WINAPI SFileSetDownloadCallback(HANDLE hMpq, SFILE_DOWNLOAD_CALLBACK DownloadCB, void * pvUserData);
+bool   WINAPI SFileGetArchiveBitmap(HANDLE hMpq, TFileBitmap * pBitmap, DWORD Length, LPDWORD LengthNeeded);
 bool   WINAPI SFileFlushArchive(HANDLE hMpq);
 bool   WINAPI SFileCloseArchive(HANDLE hMpq);
 
@@ -1021,7 +869,7 @@ bool   WINAPI SFileCloseArchive(HANDLE hMpq);
 int    WINAPI SFileAddListFile(HANDLE hMpq, const char * szListFile);
 
 // Archive compacting
-bool   WINAPI SFileSetCompactCallback(HANDLE hMpq, SFILE_COMPACT_CALLBACK CompactCB, void * pvUserData);
+bool   WINAPI SFileSetCompactCallback(HANDLE hMpq, SFILE_COMPACT_CALLBACK CompactCB, void * pvData);
 bool   WINAPI SFileCompactArchive(HANDLE hMpq, const char * szListFile, bool bReserved);
 
 // Changing the maximum file count
@@ -1043,17 +891,16 @@ bool   WINAPI SFileIsPatchedArchive(HANDLE hMpq);
 // Functions for file manipulation
 
 // Reading from MPQ file
-bool   WINAPI SFileHasFile(HANDLE hMpq, const char * szFileName);
 bool   WINAPI SFileOpenFileEx(HANDLE hMpq, const char * szFileName, DWORD dwSearchScope, HANDLE * phFile);
 DWORD  WINAPI SFileGetFileSize(HANDLE hFile, LPDWORD pdwFileSizeHigh);
 DWORD  WINAPI SFileSetFilePointer(HANDLE hFile, LONG lFilePos, LONG * plFilePosHigh, DWORD dwMoveMethod);
 bool   WINAPI SFileReadFile(HANDLE hFile, void * lpBuffer, DWORD dwToRead, LPDWORD pdwRead, LPOVERLAPPED lpOverlapped);
 bool   WINAPI SFileCloseFile(HANDLE hFile);
 
-// Retrieving info about a file in the archive
-bool   WINAPI SFileGetFileInfo(HANDLE hMpqOrFile, SFileInfoClass InfoClass, void * pvFileInfo, DWORD cbFileInfo, LPDWORD pcbLengthNeeded);
+// Retrieving info about the file
+bool   WINAPI SFileHasFile(HANDLE hMpq, const char * szFileName);
 bool   WINAPI SFileGetFileName(HANDLE hFile, char * szFileName);
-bool   WINAPI SFileFreeFileInfo(void * pvFileInfo, SFileInfoClass InfoClass);
+bool   WINAPI SFileGetFileInfo(HANDLE hMpqOrFile, DWORD dwInfoType, void * pvFileInfo, DWORD cbFileInfo, LPDWORD pcbLengthNeeded);
 
 // High-level extract function
 bool   WINAPI SFileExtractFile(HANDLE hMpq, const char * szToExtract, const TCHAR * szExtracted, DWORD dwSearchScope);
@@ -1072,7 +919,6 @@ DWORD  WINAPI SFileVerifyFile(HANDLE hMpq, const char * szFileName, DWORD dwFlag
 int    WINAPI SFileVerifyRawData(HANDLE hMpq, DWORD dwWhatToVerify, const char * szFileName);
 
 // Verifies the signature, if present
-bool   WINAPI SFileSignArchive(HANDLE hMpq, DWORD dwSignatureType);
 DWORD  WINAPI SFileVerifyArchive(HANDLE hMpq);
 
 //-----------------------------------------------------------------------------
@@ -1097,23 +943,23 @@ bool   WINAPI SFileWriteFile(HANDLE hFile, const void * pvData, DWORD dwSize, DW
 bool   WINAPI SFileFinishFile(HANDLE hFile);
 
 bool   WINAPI SFileAddFileEx(HANDLE hMpq, const TCHAR * szFileName, const char * szArchivedName, DWORD dwFlags, DWORD dwCompression, DWORD dwCompressionNext);
-bool   WINAPI SFileAddFile(HANDLE hMpq, const TCHAR * szFileName, const char * szArchivedName, DWORD dwFlags); 
-bool   WINAPI SFileAddWave(HANDLE hMpq, const TCHAR * szFileName, const char * szArchivedName, DWORD dwFlags, DWORD dwQuality); 
+bool   WINAPI SFileAddFile(HANDLE hMpq, const TCHAR * szFileName, const char * szArchivedName, DWORD dwFlags);
+bool   WINAPI SFileAddWave(HANDLE hMpq, const TCHAR * szFileName, const char * szArchivedName, DWORD dwFlags, DWORD dwQuality);
 bool   WINAPI SFileRemoveFile(HANDLE hMpq, const char * szFileName, DWORD dwSearchScope);
 bool   WINAPI SFileRenameFile(HANDLE hMpq, const char * szOldFileName, const char * szNewFileName);
 bool   WINAPI SFileSetFileLocale(HANDLE hFile, LCID lcNewLocale);
 bool   WINAPI SFileSetDataCompression(DWORD DataCompression);
 
-bool   WINAPI SFileSetAddFileCallback(HANDLE hMpq, SFILE_ADDFILE_CALLBACK AddFileCB, void * pvUserData);
+bool   WINAPI SFileSetAddFileCallback(HANDLE hMpq, SFILE_ADDFILE_CALLBACK AddFileCB, void * pvData);
 
 //-----------------------------------------------------------------------------
 // Compression and decompression
 
-int    WINAPI SCompImplode    (void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer);
-int    WINAPI SCompExplode    (void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer);
-int    WINAPI SCompCompress   (void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer, unsigned uCompressionMask, int nCmpType, int nCmpLevel);
-int    WINAPI SCompDecompress (void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer);
-int    WINAPI SCompDecompress2(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer);
+int    WINAPI SCompImplode    (char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer);
+int    WINAPI SCompExplode    (char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer);
+int    WINAPI SCompCompress   (char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer, unsigned uCompressionMask, int nCmpType, int nCmpLevel);
+int    WINAPI SCompDecompress (char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer);
+int    WINAPI SCompDecompress2(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer);
 
 //-----------------------------------------------------------------------------
 // Non-Windows support for SetLastError/GetLastError
@@ -1130,8 +976,8 @@ int   GetLastError();
 // possibility to use them together with StormLib (StormXXX instead of SFileXXX)
 
 #ifdef __LINK_STORM_DLL__
-  #define STORM_ALTERNATE_NAMES         // Force storm_dll.h to use alternate fnc names
-  #include "..\storm_dll\storm_dll.h"
+#define STORM_ALTERNATE_NAMES         // Force storm_dll.h to use alternate fnc names
+#include "..\storm_dll\storm_dll.h"
 #endif // __LINK_STORM_DLL__
 
 #ifdef __cplusplus
diff --git a/dep/StormLib/src/StormPort.h b/dep/StormLib/src/StormPort.h
index 37fbad0a0..5673516c1 100644
--- a/dep/StormLib/src/StormPort.h
+++ b/dep/StormLib/src/StormPort.h
@@ -21,270 +21,221 @@
 /* 24.07.04  1.03  Sam  Mac OS X compatibility                               */
 /* 22.11.06  1.04  Sam  Mac OS X compatibility (for StormLib 6.0)            */
 /* 31.12.06  1.05  XPinguin  Full GNU/Linux compatibility		             */
-/* 17.10.12  1.05  Lad  Moved error codes so they don't overlap with errno.h */
 /*****************************************************************************/
 
 #ifndef __STORMPORT_H__
 #define __STORMPORT_H__
 
 #ifndef __cplusplus
-  #define bool char
-  #define true 1
-  #define false 0
+#define bool char
+#define true 1
+#define false 0
 #endif
 
-//-----------------------------------------------------------------------------
 // Defines for Windows
-
 #if !defined(PLATFORM_DEFINED) && (defined(WIN32) || defined(WIN64))
 
-  // In MSVC 8.0, there are some functions declared as deprecated.
-  #if _MSC_VER >= 1400
-  #define _CRT_SECURE_NO_DEPRECATE
-  #define _CRT_NON_CONFORMING_SWPRINTFS
-  #endif
+// In MSVC 8.0, there are some functions declared as deprecated.
+#if _MSC_VER >= 1400
+#define _CRT_SECURE_NO_DEPRECATE
+#define _CRT_NON_CONFORMING_SWPRINTFS
+#endif
 
-  #include <tchar.h>
-  #include <assert.h>
-  #include <ctype.h>
-  #include <stdio.h>
-  #include <windows.h>
-  #include <wininet.h>
-  #define PLATFORM_LITTLE_ENDIAN
+#include <tchar.h>
+#include <assert.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <windows.h>
+#include <wininet.h>
+#define PLATFORM_LITTLE_ENDIAN
 
-  #ifdef WIN64
-    #define PLATFORM_64BIT
-  #else
-    #define PLATFORM_32BIT
-  #endif
+#ifdef WIN64
+#define PLATFORM_64BIT
+#else
+#define PLATFORM_32BIT
+#endif
 
-  #define PLATFORM_WINDOWS
-  #define PLATFORM_DEFINED                  // The platform is known now
+#define PLATFORM_WINDOWS
+#define PLATFORM_DEFINED                  // The platform is known now
 
 #endif
 
-//-----------------------------------------------------------------------------
 // Defines for Mac
-
 #if !defined(PLATFORM_DEFINED) && defined(__APPLE__)  // Mac BSD API
 
-  // Macintosh
-  #include <sys/types.h>
-  #include <sys/stat.h>
-  #include <sys/mman.h>
-  #include <unistd.h>
-  #include <fcntl.h>
-  #include <stdlib.h>
-  #include <errno.h>
+// Macintosh
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <errno.h>
 
-  // Support for PowerPC on Max OS X
-  #if (__ppc__ == 1) || (__POWERPC__ == 1) || (_ARCH_PPC == 1)
-    #include <stdint.h>
-    #include <CoreFoundation/CFByteOrder.h>
-  #endif 
+#define    PKEXPORT
+#define    __SYS_ZLIB
+#define    __SYS_BZLIB
 
-  #define    PKEXPORT
-  #define    __SYS_ZLIB
-  #define    __SYS_BZLIB
+#ifndef __BIG_ENDIAN__
+#define PLATFORM_LITTLE_ENDIAN
+#endif
 
-  #ifndef __BIG_ENDIAN__
-    #define PLATFORM_LITTLE_ENDIAN
-  #endif
-
-  #define PLATFORM_MAC
-  #define PLATFORM_DEFINED                  // The platform is known now
+#define PLATFORM_MAC
+#define PLATFORM_DEFINED                  // The platform is known now
 
 #endif
 
-//-----------------------------------------------------------------------------
 // Assumption: we are not on Windows nor Macintosh, so this must be linux *grin*
-
 #if !defined(PLATFORM_DEFINED)
 
-  #include <sys/types.h>
-  #include <sys/stat.h>
-  #include <sys/mman.h>
-  #include <fcntl.h>
-  #include <unistd.h>
-  #include <stdint.h>
-  #include <stdlib.h>
-  #include <stdio.h>
-  #include <stdarg.h>
-  #include <string.h>
-  #include <ctype.h>
-  #include <assert.h>
-  #include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <ctype.h>
+#include <assert.h>
+#include <errno.h>
 
-  #define PLATFORM_LITTLE_ENDIAN
-  #define PLATFORM_LINUX
-  #define PLATFORM_DEFINED
+#define PLATFORM_LITTLE_ENDIAN
+#define PLATFORM_LINUX
+#define PLATFORM_DEFINED
 
 #endif
 
-//-----------------------------------------------------------------------------
-// Definition of Windows-specific types for non-Windows platforms
-
+// Definition of Windows-specific structures for non-Windows platforms
 #ifndef PLATFORM_WINDOWS
-  #if __LP64__
-    #define PLATFORM_64BIT
-  #else
-    #define PLATFORM_32BIT
-  #endif
+#if __LP64__
+#define PLATFORM_64BIT
+#else
+#define PLATFORM_32BIT
+#endif
 
-  // Typedefs for ANSI C
-  typedef unsigned char  BYTE;
-  typedef unsigned short USHORT;
-  typedef int            LONG;
-  typedef unsigned int   DWORD;
-  typedef unsigned long  DWORD_PTR;
-  typedef long           LONG_PTR;
-  typedef long           INT_PTR;
-  typedef long long      LONGLONG;
-  typedef unsigned long long ULONGLONG;
-  typedef void         * HANDLE;
-  typedef void         * LPOVERLAPPED; // Unsupported on Linux and Mac
-  typedef char           TCHAR;
-  typedef unsigned int   LCID;
-  typedef LONG         * PLONG;
-  typedef DWORD        * LPDWORD;
-  typedef BYTE         * LPBYTE;
+// Typedefs for ANSI C
+typedef unsigned char  BYTE;
+typedef unsigned short USHORT;
+typedef int            LONG;
+typedef unsigned int   DWORD;
+typedef unsigned long  DWORD_PTR;
+typedef long           LONG_PTR;
+typedef long           INT_PTR;
+typedef long long      LONGLONG;
+typedef unsigned long long ULONGLONG;
+typedef void         * HANDLE;
+typedef void         * LPOVERLAPPED; // Unsupported on Linux and Mac
+typedef char           TCHAR;
+typedef unsigned int   LCID;
+typedef LONG         * PLONG;
+typedef DWORD        * LPDWORD;
+typedef BYTE         * LPBYTE;
 
-  #ifdef PLATFORM_32BIT
-    #define _LZMA_UINT32_IS_ULONG
-  #endif
+#ifdef PLATFORM_32BIT
+#define _LZMA_UINT32_IS_ULONG
+#endif
 
-  // Some Windows-specific defines
-  #ifndef MAX_PATH
-    #define MAX_PATH 1024
-  #endif
+// Some Windows-specific defines
+#ifndef MAX_PATH
+#define MAX_PATH 1024
+#endif
 
-  #define WINAPI 
+#define WINAPI
 
-  #define FILE_BEGIN    SEEK_SET
-  #define FILE_CURRENT  SEEK_CUR
-  #define FILE_END      SEEK_END
+#define FILE_BEGIN    SEEK_SET
+#define FILE_CURRENT  SEEK_CUR
+#define FILE_END      SEEK_END
 
-  #define _T(x)     x
-  #define _tcslen   strlen
-  #define _tcscpy   strcpy
-  #define _tcscat   strcat
-  #define _tcschr   strchr
-  #define _tcsrchr  strrchr
-  #define _tcsstr   strstr
-  #define _tprintf  printf
-  #define _stprintf sprintf
-  #define _tremove  remove
+#define _T(x)     x
+#define _tcslen   strlen
+#define _tcscpy   strcpy
+#define _tcscat   strcat
+#define _tcsrchr  strrchr
+#define _tprintf  printf
+#define _stprintf sprintf
+#define _tremove  remove
 
-  #define _stricmp  strcasecmp
-  #define _strnicmp strncasecmp
-  #define _tcsicmp  strcasecmp
-  #define _tcsnicmp strncasecmp
+#define _stricmp  strcasecmp
+#define _strnicmp strncasecmp
+#define _tcsnicmp strncasecmp
 
-#endif // !PLATFORM_WINDOWS
+#endif // !WIN32
 
 // 64-bit calls are supplied by "normal" calls on Mac
 #if defined(PLATFORM_MAC)
-  #define stat64  stat
-  #define fstat64 fstat
-  #define lseek64 lseek
-  #define ftruncate64 ftruncate
-  #define off64_t off_t
-  #define O_LARGEFILE 0
+#define stat64  stat
+#define fstat64 fstat
+#define lseek64 lseek
+#define off64_t off_t
+#define O_LARGEFILE 0
 #endif
-                                                
+
 // Platform-specific error codes for UNIX-based platforms
 #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-  #define ERROR_SUCCESS                  0
-  #define ERROR_FILE_NOT_FOUND           ENOENT
-  #define ERROR_ACCESS_DENIED            EPERM
-  #define ERROR_INVALID_HANDLE           EBADF
-  #define ERROR_NOT_ENOUGH_MEMORY        ENOMEM
-  #define ERROR_NOT_SUPPORTED            ENOTSUP
-  #define ERROR_INVALID_PARAMETER        EINVAL
-  #define ERROR_DISK_FULL                ENOSPC
-  #define ERROR_ALREADY_EXISTS           EEXIST
-  #define ERROR_INSUFFICIENT_BUFFER      ENOBUFS
-  #define ERROR_BAD_FORMAT               1000        // No such error code under Linux
-  #define ERROR_NO_MORE_FILES            1001        // No such error code under Linux
-  #define ERROR_HANDLE_EOF               1002        // No such error code under Linux
-  #define ERROR_CAN_NOT_COMPLETE         1003        // No such error code under Linux
-  #define ERROR_FILE_CORRUPT             1004        // No such error code under Linux
+#define ERROR_SUCCESS                  0
+#define ERROR_FILE_NOT_FOUND           ENOENT
+#define ERROR_ACCESS_DENIED            EPERM
+#define ERROR_INVALID_HANDLE           EBADF
+#define ERROR_NOT_ENOUGH_MEMORY        ENOMEM
+#define ERROR_BAD_FORMAT               105         // No such error code under Linux
+#define ERROR_NO_MORE_FILES            106
+#define ERROR_HANDLE_EOF               107         // No such error code under Linux
+#define ERROR_NOT_SUPPORTED            ENOTSUP
+#define ERROR_INVALID_PARAMETER        EINVAL
+#define ERROR_DISK_FULL                ENOSPC
+#define ERROR_ALREADY_EXISTS           EEXIST
+#define ERROR_CAN_NOT_COMPLETE         108         // No such error code under Linux
+#define ERROR_FILE_CORRUPT             109         // No such error code under Linux
+#define ERROR_INSUFFICIENT_BUFFER      ENOBUFS
 #endif
 
-//-----------------------------------------------------------------------------
-// Swapping functions
-
 #ifdef PLATFORM_LITTLE_ENDIAN
-    #define    BSWAP_INT16_UNSIGNED(a)          (a)
-    #define    BSWAP_INT16_SIGNED(a)            (a)
-    #define    BSWAP_INT32_UNSIGNED(a)          (a)
-    #define    BSWAP_INT32_SIGNED(a)            (a)
-    #define    BSWAP_INT64_SIGNED(a)            (a)
-    #define    BSWAP_INT64_UNSIGNED(a)          (a)
-    #define    BSWAP_ARRAY16_UNSIGNED(a,b)      {}
-    #define    BSWAP_ARRAY32_UNSIGNED(a,b)      {}
-    #define    BSWAP_ARRAY64_UNSIGNED(a,b)      {}
-    #define    BSWAP_PART_HEADER(a)             {}
-    #define    BSWAP_TMPQHEADER(a,b)            {}
-    #define    BSWAP_TMPKHEADER(a)              {}
+#define    BSWAP_INT16_UNSIGNED(a)          (a)
+#define    BSWAP_INT16_SIGNED(a)            (a)
+#define    BSWAP_INT32_UNSIGNED(a)          (a)
+#define    BSWAP_INT32_SIGNED(a)            (a)
+#define    BSWAP_INT64_SIGNED(a)            (a)
+#define    BSWAP_INT64_UNSIGNED(a)          (a)
+#define    BSWAP_ARRAY16_UNSIGNED(a,b)      {}
+#define    BSWAP_ARRAY32_UNSIGNED(a,b)      {}
+#define    BSWAP_ARRAY64_UNSIGNED(a,b)      {}
+#define    BSWAP_PART_HEADER(a)             {}
+#define    BSWAP_TMPQUSERDATA(a)            {}
+#define    BSWAP_TMPQHEADER(a)              {}
 #else
-
 #ifdef __cplusplus
   extern "C" {
 #endif
-    int16_t  SwapInt16(uint16_t);
-    uint16_t SwapUInt16(uint16_t);
-    int32_t  SwapInt32(uint32_t);
-    uint32_t SwapUInt32(uint32_t);
-    int64_t  SwapInt64(uint64_t);
-    uint64_t SwapUInt64(uint64_t);
-    void ConvertUInt16Buffer(void * ptr, size_t length);
-    void ConvertUInt32Buffer(void * ptr, size_t length);
-    void ConvertUInt64Buffer(void * ptr, size_t length);
-    void ConvertTMPQUserData(void *userData);
-    void ConvertTMPQHeader(void *header, uint16_t wPart);
-    void ConvertTMPKHeader(void *header);
+int16_t  SwapInt16(uint16_t);
+uint16_t SwapUInt16(uint16_t);
+int32_t  SwapInt32(uint32_t);
+uint32_t SwapUInt32(uint32_t);
+int64_t  SwapInt64(uint64_t);
+uint64_t SwapUInt64(uint64_t);
+void ConvertUInt16Buffer(void * ptr, size_t length);
+void ConvertUInt32Buffer(void * ptr, size_t length);
+void ConvertUInt64Buffer(void * ptr, size_t length);
+void ConvertPartHeader(void * partHeader);
+void ConvertTMPQUserData(void *userData);
+void ConvertTMPQHeader(void *header);
 #ifdef __cplusplus
   }
 #endif
-    #define    BSWAP_INT16_SIGNED(a)            SwapInt16((a))
-    #define    BSWAP_INT16_UNSIGNED(a)          SwapUInt16((a))
-    #define    BSWAP_INT32_SIGNED(a)            SwapInt32((a))
-    #define    BSWAP_INT32_UNSIGNED(a)          SwapUInt32((a))
-    #define    BSWAP_INT64_SIGNED(a)            SwapInt64((a))
-    #define    BSWAP_INT64_UNSIGNED(a)          SwapUInt64((a))
-    #define    BSWAP_ARRAY16_UNSIGNED(a,b)      ConvertUInt16Buffer((a),(b))
-    #define    BSWAP_ARRAY32_UNSIGNED(a,b)      ConvertUInt32Buffer((a),(b))
-    #define    BSWAP_ARRAY64_UNSIGNED(a,b)      ConvertUInt64Buffer((a),(b))
-    #define    BSWAP_TMPQHEADER(a,b)            ConvertTMPQHeader((a),(b))
-    #define    BSWAP_TMPKHEADER(a)              ConvertTMPKHeader((a))
+#define    BSWAP_INT16_SIGNED(a)            SwapInt16((a))
+#define    BSWAP_INT16_UNSIGNED(a)          SwapUInt16((a))
+#define    BSWAP_INT32_SIGNED(a)            SwapInt32((a))
+#define    BSWAP_INT32_UNSIGNED(a)          SwapUInt32((a))
+#define    BSWAP_INT64_SIGNED(a)            SwapInt64((a))
+#define    BSWAP_INT64_UNSIGNED(a)          SwapUInt64((a))
+#define    BSWAP_ARRAY16_UNSIGNED(a,b)      ConvertUInt16Buffer((a),(b))
+#define    BSWAP_ARRAY32_UNSIGNED(a,b)      ConvertUInt32Buffer((a),(b))
+#define    BSWAP_ARRAY64_UNSIGNED(a,b)      ConvertUInt64Buffer((a),(b))
+#define    BSWAP_PART_HEADER(a)             ConvertPartHeader(a)
+#define    BSWAP_TMPQUSERDATA(a)            ConvertTMPQUserData((a))
+#define    BSWAP_TMPQHEADER(a)              ConvertTMPQHeader((a))
 #endif
 
-//-----------------------------------------------------------------------------
-// Macro for deprecated symbols
-
-/*
-#ifdef _MSC_VER
-  #if _MSC_FULL_VER >= 140050320
-    #define STORMLIB_DEPRECATED(_Text) __declspec(deprecated(_Text))
-  #else
-    #define STORMLIB_DEPRECATED(_Text) __declspec(deprecated)
-  #endif
-#else
-  #ifdef __GNUC__
-    #define STORMLIB_DEPRECATED(_Text) __attribute__((deprecated))
-  #else
-    #define STORMLIB_DEPRECATED(_Text) __attribute__((deprecated(_Text)))
-  #endif
-#endif
-
-// When a flag is deprecated, use this macro
-#ifndef _STORMLIB_NO_DEPRECATE
-  #define STORMLIB_DEPRECATED_FLAG(type, oldflag, newflag)    \
-    const STORMLIB_DEPRECATED(#oldflag " is deprecated. Use " #newflag ". To supress this warning, define _STORMLIB_NO_DEPRECATE") static type oldflag = (type)newflag;
-#else
-#define STORMLIB_DEPRECATED_FLAG(type, oldflag, newflag) static type oldflag = (type)newflag;
-#endif
-*/
-
 #endif // __STORMPORT_H__
diff --git a/dep/StormLib/src/adpcm/adpcm.cpp b/dep/StormLib/src/adpcm/adpcm.cpp
index 7805dc578..783cf10bf 100644
--- a/dep/StormLib/src/adpcm/adpcm.cpp
+++ b/dep/StormLib/src/adpcm/adpcm.cpp
@@ -10,389 +10,349 @@
 /* 11.03.03  1.00  Lad  Splitted from Pkware.cpp                             */
 /* 20.05.03  2.00  Lad  Added compression                                    */
 /* 19.11.03  2.01  Dan  Big endian handling                                  */
-/* 10.01.13  3.00  Lad  Refactored, beautified, documented :-)               */
 /*****************************************************************************/
 
-#include "../StormPort.h"
 #include "adpcm.h"
 
+//------------------------------------------------------------------------------
+// Structures
+
+typedef union _BYTE_AND_WORD_PTR
+{
+    short * pw;
+    unsigned char * pb;
+} BYTE_AND_WORD_PTR;
+
+typedef union _WORD_AND_BYTE_ARRAY
+{
+    short w;
+    unsigned char b[2];
+} WORD_AND_BYTE_ARRAY;
+
 //-----------------------------------------------------------------------------
 // Tables necessary dor decompression
 
-static int NextStepTable[] =
+static long Table1503F120[] =
 {
-    -1, 0, -1, 4, -1, 2, -1, 6,
-    -1, 1, -1, 5, -1, 3, -1, 7,
-    -1, 1, -1, 5, -1, 3, -1, 7,
-    -1, 2, -1, 4, -1, 6, -1, 8
+    0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000006,
+    0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
+    0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
+    0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008
 };
 
-static int StepSizeTable[] =
+static long step_table[] =
 {
-        7,     8,     9,    10,     11,    12,    13,    14,
-       16,    17,    19,    21,     23,    25,    28,    31,
-       34,    37,    41,    45,     50,    55,    60,    66,
-       73,    80,    88,    97,    107,   118,   130,   143,
-      157,   173,   190,   209,    230,   253,   279,   307,
-      337,   371,   408,   449,    494,   544,   598,   658,
-      724,   796,   876,   963,   1060,  1166,  1282,  1411,
-     1552,  1707,  1878,  2066,   2272,  2499,  2749,  3024,
-     3327,  3660,  4026,  4428,   4871,  5358,  5894,  6484,
-     7132,  7845,  8630,  9493,  10442, 11487, 12635, 13899,
-     15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794,
-     32767
+    0x00000007, 0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E,
+    0x00000010, 0x00000011, 0x00000013, 0x00000015, 0x00000017, 0x00000019, 0x0000001C, 0x0000001F,
+    0x00000022, 0x00000025, 0x00000029, 0x0000002D, 0x00000032, 0x00000037, 0x0000003C, 0x00000042,
+    0x00000049, 0x00000050, 0x00000058, 0x00000061, 0x0000006B, 0x00000076, 0x00000082, 0x0000008F,
+    0x0000009D, 0x000000AD, 0x000000BE, 0x000000D1, 0x000000E6, 0x000000FD, 0x00000117, 0x00000133,
+    0x00000151, 0x00000173, 0x00000198, 0x000001C1, 0x000001EE, 0x00000220, 0x00000256, 0x00000292,
+    0x000002D4, 0x0000031C, 0x0000036C, 0x000003C3, 0x00000424, 0x0000048E, 0x00000502, 0x00000583,
+    0x00000610, 0x000006AB, 0x00000756, 0x00000812, 0x000008E0, 0x000009C3, 0x00000ABD, 0x00000BD0,
+    0x00000CFF, 0x00000E4C, 0x00000FBA, 0x0000114C, 0x00001307, 0x000014EE, 0x00001706, 0x00001954,
+    0x00001BDC, 0x00001EA5, 0x000021B6, 0x00002515, 0x000028CA, 0x00002CDF, 0x0000315B, 0x0000364B,
+    0x00003BB9, 0x000041B2, 0x00004844, 0x00004F7E, 0x00005771, 0x0000602F, 0x000069CE, 0x00007462,
+    0x00007FFF
 };
 
-//-----------------------------------------------------------------------------
-// Helper class for writing output ADPCM data
-
-class TADPCMStream
-{
-    public:
-
-    TADPCMStream(void * pvBuffer, size_t cbBuffer)
-    {
-        pbBufferEnd = (unsigned char *)pvBuffer + cbBuffer;
-        pbBuffer = (unsigned char *)pvBuffer;
-    }
-
-    bool ReadByteSample(unsigned char & ByteSample)
-    {
-        // Check if there is enough space in the buffer
-        if(pbBuffer >= pbBufferEnd)
-            return false;
-
-        ByteSample = *pbBuffer++;
-        return true;
-    }
-
-    bool WriteByteSample(unsigned char ByteSample)
-    {
-        // Check if there is enough space in the buffer
-        if(pbBuffer >= pbBufferEnd)
-            return false;
-
-        *pbBuffer++ = ByteSample;
-        return true;
-    }
-
-    bool ReadWordSample(short & OneSample)
-    {
-        // Check if we have enough space in the output buffer
-        if((size_t)(pbBufferEnd - pbBuffer) < sizeof(short))
-            return false;
-
-        // Write the sample
-        OneSample = pbBuffer[0] + (((short)pbBuffer[1]) << 0x08);
-        pbBuffer += sizeof(short);
-        return true;
-    }
-
-    bool WriteWordSample(short OneSample)
-    {
-        // Check if we have enough space in the output buffer
-        if((size_t)(pbBufferEnd - pbBuffer) < sizeof(short))
-            return false;
-
-        // Write the sample
-        *pbBuffer++ = (unsigned char)(OneSample & 0xFF);
-        *pbBuffer++ = (unsigned char)(OneSample >> 0x08);
-        return true;
-    }
-
-    int LengthProcessed(void * pvBuffer)
-    {
-        return pbBuffer - (unsigned char *)pvBuffer;
-    }
-
-    unsigned char * pbBufferEnd;
-    unsigned char * pbBuffer;
-};                    
-
 //----------------------------------------------------------------------------
-// Local functions
+// CompressWave
 
-static inline short GetNextStepIndex(int StepIndex, unsigned int EncodedSample)
+// 1500EF70
+int CompressADPCM(unsigned char * pbOutBuffer, int dwOutLength, short * pwInBuffer, int dwInLength, int nChannels, int nCmpLevel)
+//                ECX                          EDX
 {
-    // Get the next step index
-    StepIndex = StepIndex + NextStepTable[EncodedSample & 0x1F];
+    WORD_AND_BYTE_ARRAY Wcmp;
+    BYTE_AND_WORD_PTR out;                    // Pointer to the output buffer
+    long SInt32Array1[2];
+    long SInt32Array2[2];
+    long SInt32Array3[2];
+    long nBytesRemains = dwOutLength;       // Number of bytes remaining
+    long nWordsRemains;                     // Number of words remaining
+//  unsigned char * pbSaveOutBuffer;        // Copy of output buffer (actually not used)
+    unsigned long dwBitBuff;
+    unsigned long dwStopBit;
+    unsigned long dwBit;
+    unsigned long ebx;
+    unsigned long esi;
+    long nTableValue;
+    long nOneWord;
+    long var_1C;
+    long var_2C;
+    int nLength;
+    int nIndex;
+    int nValue;
+    int i, chnl;
 
-    // Don't make the step index overflow
-    if(StepIndex < 0)
-        StepIndex = 0;
-    else if(StepIndex > 88)
-        StepIndex = 88;
-
-    return (short)StepIndex;
-}
-
-static inline int UpdatePredictedSample(int PredictedSample, int EncodedSample, int Difference)
-{
-    // Is the sign bit set?
-    if(EncodedSample & 0x40)
-    {
-        PredictedSample -= Difference;
-        if(PredictedSample <= -32768)
-            PredictedSample = -32768;
-    }
-    else
-    {
-        PredictedSample += Difference;
-        if(PredictedSample >= 32767)
-            PredictedSample = 32767;
-    }
-
-    return PredictedSample;
-}
-
-static inline int DecodeSample(int PredictedSample, int EncodedSample, int StepSize, int Difference)
-{
-    if(EncodedSample & 0x01)
-        Difference += (StepSize >> 0);
-
-    if(EncodedSample & 0x02)
-        Difference += (StepSize >> 1);
-
-    if(EncodedSample & 0x04)
-        Difference += (StepSize >> 2);
-
-    if(EncodedSample & 0x08)
-        Difference += (StepSize >> 3);
-
-    if(EncodedSample & 0x10)
-        Difference += (StepSize >> 4);
-
-    if(EncodedSample & 0x20)
-        Difference += (StepSize >> 5);
-
-    return UpdatePredictedSample(PredictedSample, EncodedSample, Difference);
-}
-
-//----------------------------------------------------------------------------
-// Compression routine
-
-int CompressADPCM(void * pvOutBuffer, int cbOutBuffer, void * pvInBuffer, int cbInBuffer, int ChannelCount, int CompressionLevel)
-{
-    TADPCMStream os(pvOutBuffer, cbOutBuffer);      // The output stream
-    TADPCMStream is(pvInBuffer, cbInBuffer);        // The input stream
-    unsigned char BitShift = (unsigned char)(CompressionLevel - 1);
-    short PredictedSamples[MAX_ADPCM_CHANNEL_COUNT];// Predicted samples for each channel
-    short StepIndexes[MAX_ADPCM_CHANNEL_COUNT];     // Step indexes for each channel
-    short InputSample;                              // Input sample for the current channel
-    int TotalStepSize;
-    int ChannelIndex;
-    int AbsDifference;
-    int Difference;
-    int MaxBitMask;
-    int StepSize;
-
-//  _tprintf(_T("== CMPR Started ==============\n"));
-
-    // First byte in the output stream contains zero. The second one contains the compression level
-    os.WriteByteSample(0);
-    if(!os.WriteByteSample(BitShift))
+    // If less than 2 bytes remain, don't decompress anything
+//  pbSaveOutBuffer = pbOutBuffer;
+    out.pb = pbOutBuffer;
+    if(nBytesRemains < 2)
         return 2;
 
-    // Set the initial step index for each channel
-    StepIndexes[0] = StepIndexes[1] = INITIAL_ADPCM_STEP_INDEX;
+    Wcmp.b[1] = (unsigned char)(nCmpLevel - 1);
+    Wcmp.b[0] = (unsigned char)0;
 
-    // Next, InitialSample value for each channel follows
-    for(int i = 0; i < ChannelCount; i++)
+    *out.pw++ = BSWAP_INT16_SIGNED(Wcmp.w);
+    if((out.pb - pbOutBuffer + (nChannels * 2)) > nBytesRemains)
+        return (int)(out.pb - pbOutBuffer + (nChannels * 2));
+
+    SInt32Array1[0] = SInt32Array1[1] = 0x2C;
+
+    for(i = 0; i < nChannels; i++)
     {
-        // Get the initial sample from the input stream
-        if(!is.ReadWordSample(InputSample))
-            return os.LengthProcessed(pvOutBuffer);
-
-        // Store the initial sample to our sample array
-        PredictedSamples[i] = InputSample;
-
-        // Also store the loaded sample to the output stream
-        if(!os.WriteWordSample(InputSample))
-            return os.LengthProcessed(pvOutBuffer);
+        nOneWord = BSWAP_INT16_SIGNED(*pwInBuffer++);
+        *out.pw++ = BSWAP_INT16_SIGNED((short)nOneWord);
+        SInt32Array2[i] = nOneWord;
     }
 
-    // Get the initial index
-    ChannelIndex = ChannelCount - 1;
-    
-    // Now keep reading the input data as long as there is something in the input buffer
-    while(is.ReadWordSample(InputSample))
+    // Weird. But it's there
+    nLength = dwInLength;
+    if(nLength < 0)                     // mov eax, dwInLength; cdq; sub eax, edx;
+        nLength++;
+
+    nLength = (nLength / 2) - (int)(out.pb - pbOutBuffer);
+    nLength = (nLength < 0) ? 0 : nLength;
+
+    nIndex  = nChannels - 1;            // edi
+    nWordsRemains = dwInLength / 2;     // eax
+
+    // ebx - nChannels
+    // ecx - pwOutPos
+    for(chnl = nChannels; chnl < nWordsRemains; chnl++)
     {
-        int EncodedSample = 0;
+        // 1500F030
+        if((out.pb - pbOutBuffer + 2) > nBytesRemains)
+            return (int)(out.pb - pbOutBuffer + 2);
 
-        // If we have two channels, we need to flip the channel index
-        ChannelIndex = (ChannelIndex + 1) % ChannelCount;
+        // Switch index
+        if(nChannels == 2)
+            nIndex = (nIndex == 0) ? 1 : 0;
 
-        // Get the difference from the previous sample.
-        // If the difference is negative, set the sign bit to the encoded sample
-        AbsDifference = InputSample - PredictedSamples[ChannelIndex];
-        if(AbsDifference < 0)
+        // Load one word from the input stream
+        nOneWord = BSWAP_INT16_SIGNED(*pwInBuffer++);   // ecx - nOneWord
+        SInt32Array3[nIndex] = nOneWord;
+
+        // esi - SInt32Array2[nIndex]
+        // eax - nValue
+        nValue = nOneWord - SInt32Array2[nIndex];
+        nValue = (nValue < 0) ? ((nValue ^ 0xFFFFFFFF) + 1) : nValue;
+
+        ebx = (nOneWord >= SInt32Array2[nIndex]) ? 0 : 0x40;
+
+        // esi - SInt32Array2[nIndex]
+        // edx - step_table[SInt32Array2[nIndex]]
+        // edi - (step_table[SInt32Array1[nIndex]] >> nCmpLevel)
+        nTableValue = step_table[SInt32Array1[nIndex]];
+        dwStopBit = (unsigned long)nCmpLevel;
+
+        // edi - nIndex;
+        if(nValue < (nTableValue >> nCmpLevel))
         {
-            AbsDifference = -AbsDifference;
-            EncodedSample |= 0x40;
-        }
-
-        // If the difference is too low (higher that difference treshold),
-        // write a step index modifier marker
-        StepSize = StepSizeTable[StepIndexes[ChannelIndex]];
-        if(AbsDifference < (StepSize >> CompressionLevel))
-        {
-            if(StepIndexes[ChannelIndex] != 0)
-                StepIndexes[ChannelIndex]--;
-            
-            os.WriteByteSample(0x80);
+            if(SInt32Array1[nIndex] != 0)
+                SInt32Array1[nIndex]--;
+            *out.pb++ = 0x80;
         }
         else
         {
-            // If the difference is too high, write marker that
-            // indicates increase in step size
-            while(AbsDifference > (StepSize << 1))
+            while(nValue > nTableValue * 2)
             {
-                if(StepIndexes[ChannelIndex] >= 0x58)
+                if(SInt32Array1[nIndex] >= 0x58 || nLength == 0)
                     break;
 
-                // Modify the step index
-                StepIndexes[ChannelIndex] += 8;
-                if(StepIndexes[ChannelIndex] > 0x58)
-                    StepIndexes[ChannelIndex] = 0x58;
+                SInt32Array1[nIndex] += 8;
+                if(SInt32Array1[nIndex] > 0x58)
+                    SInt32Array1[nIndex] = 0x58;
 
-                // Write the "modify step index" marker
-                StepSize = StepSizeTable[StepIndexes[ChannelIndex]];
-                os.WriteByteSample(0x81);
+                nTableValue = step_table[SInt32Array1[nIndex]];
+                *out.pb++ = 0x81;
+                nLength--;
             }
 
-            // Get the limit bit value
-            MaxBitMask = (1 << (BitShift - 1));
-            MaxBitMask = (MaxBitMask > 0x20) ? 0x20 : MaxBitMask;
-            Difference = StepSize >> BitShift;
-            TotalStepSize = 0;
+            var_2C = nTableValue >> Wcmp.b[1];
+            dwBitBuff = 0;
 
-            for(int BitVal = 0x01; BitVal <= MaxBitMask; BitVal <<= 1)
+            esi = (1 << (dwStopBit - 2));
+            dwStopBit = (esi <= 0x20) ? esi : 0x20;
+
+            for(var_1C = 0, dwBit = 1; ; dwBit <<= 1)
             {
-                if((TotalStepSize + StepSize) <= AbsDifference)
+//              esi = var_1C + nTableValue;
+                if((var_1C + nTableValue) <= nValue)
                 {
-                    TotalStepSize += StepSize;
-                    EncodedSample |= BitVal;
+                    var_1C += nTableValue;
+                    dwBitBuff |= dwBit;
                 }
-                StepSize >>= 1;
+                if(dwBit == dwStopBit)
+                    break;
+
+                nTableValue >>= 1;
             }
 
-            PredictedSamples[ChannelIndex] = (short)UpdatePredictedSample(PredictedSamples[ChannelIndex],
-                                                                          EncodedSample,
-                                                                          Difference + TotalStepSize);
-            // Write the encoded sample to the output stream
-            if(!os.WriteByteSample((unsigned char)EncodedSample))
-                break;
-            
-            // Calculates the step index to use for the next encode
-            StepIndexes[ChannelIndex] = GetNextStepIndex(StepIndexes[ChannelIndex], EncodedSample);
+            nValue = SInt32Array2[nIndex];
+            if(ebx != 0)
+            {
+                nValue -= (var_1C + var_2C);
+                if(nValue < -32768)
+                    nValue = -32768;
+            }
+            else
+            {
+                nValue += (var_1C + var_2C);
+                if(nValue > 32767)
+                    nValue = 32767;
+            }
+
+            SInt32Array2[nIndex]  = nValue;
+            *out.pb++ = (unsigned char)(dwBitBuff | ebx);
+            nTableValue = Table1503F120[dwBitBuff & 0x1F];
+            SInt32Array1[nIndex]  = SInt32Array1[nIndex] + nTableValue;
+            if(SInt32Array1[nIndex] < 0)
+                SInt32Array1[nIndex] = 0;
+            else if(SInt32Array1[nIndex] > 0x58)
+                SInt32Array1[nIndex] = 0x58;
         }
     }
 
-//  _tprintf(_T("== CMPR Ended ================\n"));
-    return os.LengthProcessed(pvOutBuffer);
+    return (int)(out.pb - pbOutBuffer);
 }
 
 //----------------------------------------------------------------------------
-// Decompression routine
+// DecompressADPCM
 
-int DecompressADPCM(void * pvOutBuffer, int cbOutBuffer, void * pvInBuffer, int cbInBuffer, int ChannelCount)
+// 1500F230
+int DecompressADPCM(unsigned char * pbOutBuffer, int dwOutLength, unsigned char * pbInBuffer, int dwInLength, int nChannels)
 {
-    TADPCMStream os(pvOutBuffer, cbOutBuffer);          // Output stream
-    TADPCMStream is(pvInBuffer, cbInBuffer);            // Input stream
-    unsigned char EncodedSample;
-    unsigned char BitShift;
-    short PredictedSamples[MAX_ADPCM_CHANNEL_COUNT];    // Predicted sample for each channel
-    short StepIndexes[MAX_ADPCM_CHANNEL_COUNT];         // Predicted step index for each channel
-    int ChannelIndex;                                   // Current channel index
+    BYTE_AND_WORD_PTR out;                // Output buffer
+    BYTE_AND_WORD_PTR in;
+    unsigned char * pbInBufferEnd = (pbInBuffer + dwInLength);
+    long SInt32Array1[2];
+    long SInt32Array2[2];
+    long nOneWord;
+    int nIndex;
+    int i;
 
-    // Initialize the StepIndex for each channel
-    StepIndexes[0] = StepIndexes[1] = INITIAL_ADPCM_STEP_INDEX;
+    SInt32Array1[0] = SInt32Array1[1] = 0x2C;
+    out.pb = pbOutBuffer;
+    in.pb = pbInBuffer;
+    in.pw++;
 
-//  _tprintf(_T("== DCMP Started ==============\n"));
-
-    // The first byte is always zero, the second one contains bit shift (compression level - 1)
-    is.ReadByteSample(BitShift);
-    is.ReadByteSample(BitShift);
-//  _tprintf(_T("DCMP: BitShift = %u\n"), (unsigned int)(unsigned char)BitShift);
-
-    // Next, InitialSample value for each channel follows
-    for(int i = 0; i < ChannelCount; i++)
+    // Fill the Uint32Array2 array by channel values.
+    for(i = 0; i < nChannels; i++)
     {
-        // Get the initial sample from the input stream
-        short InitialSample;
+        nOneWord = BSWAP_INT16_SIGNED(*in.pw++);
+        SInt32Array2[i] = nOneWord;
+        if(dwOutLength < 2)
+            return (int)(out.pb - pbOutBuffer);
 
-        // Attempt to read the initial sample
-        if(!is.ReadWordSample(InitialSample))
-            return os.LengthProcessed(pvOutBuffer);
-
-//      _tprintf(_T("DCMP: Loaded InitialSample[%u]: %04X\n"), i, (unsigned int)(unsigned short)InitialSample);
-
-        // Store the initial sample to our sample array
-        PredictedSamples[i] = InitialSample;
-
-        // Also store the loaded sample to the output stream
-        if(!os.WriteWordSample(InitialSample))
-            return os.LengthProcessed(pvOutBuffer);
+        *out.pw++ = BSWAP_INT16_SIGNED((short)nOneWord);
+        dwOutLength -= sizeof(short);
     }
 
     // Get the initial index
-    ChannelIndex = ChannelCount - 1;
+    nIndex = nChannels - 1;
 
-    // Keep reading as long as there is something in the input buffer
-    while(is.ReadByteSample(EncodedSample))
+    // Perform the decompression
+    while(in.pb < pbInBufferEnd)
     {
-//      _tprintf(_T("DCMP: Loaded Encoded Sample: %02X\n"), (unsigned int)(unsigned char)EncodedSample);
+        unsigned char nOneByte = *in.pb++;
 
-        // If we have two channels, we need to flip the channel index
-        ChannelIndex = (ChannelIndex + 1) % ChannelCount;
+        // Switch index
+        if(nChannels == 2)
+            nIndex = (nIndex == 0) ? 1 : 0;
 
-        if(EncodedSample == 0x80)
+        // 1500F2A2: Get one byte from input buffer
+        if(nOneByte & 0x80)
         {
-            if(StepIndexes[ChannelIndex] != 0)
-                StepIndexes[ChannelIndex]--;
+            switch(nOneByte & 0x7F)
+            {
+                case 0:     // 1500F315
+                    if(SInt32Array1[nIndex] != 0)
+                        SInt32Array1[nIndex]--;
 
-//          _tprintf(_T("DCMP: Writing Decoded Sample: %04lX\n"), (unsigned int)(unsigned short)PredictedSamples[ChannelIndex]);
-            if(!os.WriteWordSample(PredictedSamples[ChannelIndex]))
-                return os.LengthProcessed(pvOutBuffer);
-        }
-        else if(EncodedSample == 0x81)
-        {
-            // Modify the step index
-            StepIndexes[ChannelIndex] += 8;
-            if(StepIndexes[ChannelIndex] > 0x58)
-                StepIndexes[ChannelIndex] = 0x58;
+                    if(dwOutLength < 2)
+                        return (int)(out.pb - pbOutBuffer);
 
-//          _tprintf(_T("DCMP: New value of StepIndex: %04lX\n"), (unsigned int)(unsigned short)StepIndexes[ChannelIndex]);
+                    *out.pw++ = BSWAP_INT16_SIGNED((unsigned short)SInt32Array2[nIndex]);
+                    dwOutLength -= sizeof(unsigned short);
+                    break;
 
-            // Next pass, keep going on the same channel
-            ChannelIndex = (ChannelIndex + 1) % ChannelCount;
+                case 1:     // 1500F2E8
+                    SInt32Array1[nIndex] += 8;
+                    if(SInt32Array1[nIndex] > 0x58)
+                        SInt32Array1[nIndex] = 0x58;
+
+                    if(nChannels == 2)
+                        nIndex = (nIndex == 0) ? 1 : 0;
+                    break;
+
+                case 2:     // 1500F41E
+                    break;
+
+                default:    // 1500F2C4
+                    SInt32Array1[nIndex] -= 8;
+                    if(SInt32Array1[nIndex] < 0)
+                        SInt32Array1[nIndex] = 0;
+
+                    if(nChannels == 2)
+                        nIndex = (nIndex == 0) ? 1 : 0;
+                    break;
+            }
         }
         else
         {
-            int StepIndex = StepIndexes[ChannelIndex];
-            int StepSize = StepSizeTable[StepIndex];
+            // 1500F349
+            long temp1 = step_table[SInt32Array1[nIndex]];     // EDI
+            long temp2 = temp1 >> pbInBuffer[1];               // ESI
+            long temp3 = SInt32Array2[nIndex];                 // ECX
 
-            // Encode one sample
-            PredictedSamples[ChannelIndex] = (short)DecodeSample(PredictedSamples[ChannelIndex],
-                                                                 EncodedSample, 
-                                                                 StepSize,
-                                                                 StepSize >> BitShift);
+            if(nOneByte & 0x01)          // EBX = nOneByte
+                temp2 += (temp1 >> 0);
 
-//          _tprintf(_T("DCMP: Writing decoded sample: %04X\n"), (unsigned int)(unsigned short)PredictedSamples[ChannelIndex]);
+            if(nOneByte & 0x02)
+                temp2 += (temp1 >> 1);
 
-            // Write the decoded sample to the output stream
-            if(!os.WriteWordSample(PredictedSamples[ChannelIndex]))
+            if(nOneByte & 0x04)
+                temp2 += (temp1 >> 2);
+
+            if(nOneByte & 0x08)
+                temp2 += (temp1 >> 3);
+
+            if(nOneByte & 0x10)
+                temp2 += (temp1 >> 4);
+
+            if(nOneByte & 0x20)
+                temp2 += (temp1 >> 5);
+
+            if(nOneByte & 0x40)
+            {
+                temp3 = temp3 - temp2;
+                if(temp3 <= -32768)
+                    temp3 = -32768;
+            }
+            else
+            {
+                temp3 = temp3 + temp2;
+                if(temp3 >= 32767)
+                    temp3 = 32767;
+            }
+
+            SInt32Array2[nIndex] = temp3;
+            if(dwOutLength < 2)
                 break;
 
-            // Calculates the step index to use for the next encode
-            StepIndexes[ChannelIndex] = GetNextStepIndex(StepIndex, EncodedSample);
-//          _tprintf(_T("DCMP: New step index: %04X\n"), (unsigned int)(unsigned short)StepIndexes[ChannelIndex]);
+            // Store the output 16-bit value
+            *out.pw++ = BSWAP_INT16_SIGNED((short)SInt32Array2[nIndex]);
+            dwOutLength -= 2;
+
+            SInt32Array1[nIndex] += Table1503F120[nOneByte & 0x1F];
+
+            if(SInt32Array1[nIndex] < 0)
+                SInt32Array1[nIndex] = 0;
+            else if(SInt32Array1[nIndex] > 0x58)
+                SInt32Array1[nIndex] = 0x58;
         }
     }
-
-//  _tprintf(_T("DCMP: Total length written: %u\n"), (unsigned int)os.LengthProcessed(pvOutBuffer));
-//  _tprintf(_T("== DCMP Ended ================\n"));
-
-    // Return total bytes written since beginning of the output buffer
-    return os.LengthProcessed(pvOutBuffer);
+    return (int)(out.pb - pbOutBuffer);
 }
diff --git a/dep/StormLib/src/adpcm/adpcm.h b/dep/StormLib/src/adpcm/adpcm.h
index b1bf36143..beb961597 100644
--- a/dep/StormLib/src/adpcm/adpcm.h
+++ b/dep/StormLib/src/adpcm/adpcm.h
@@ -12,15 +12,11 @@
 #define __ADPCM_H__
 
 //-----------------------------------------------------------------------------
-// Defines
+// Functions
 
-#define MAX_ADPCM_CHANNEL_COUNT   2
-#define INITIAL_ADPCM_STEP_INDEX  0x2C
+#include "../StormPort.h"
 
-//-----------------------------------------------------------------------------
-// Public functions
-
-int  CompressADPCM  (void * pvOutBuffer, int dwOutLength, void * pvInBuffer, int dwInLength, int nCmpType, int ChannelCount);
-int  DecompressADPCM(void * pvOutBuffer, int dwOutLength, void * pvInBuffer, int dwInLength, int ChannelCount);
+int  CompressADPCM  (unsigned char * pbOutBuffer, int dwOutLength, short * pwInBuffer, int dwInLength, int nCmpType, int nChannels);
+int  DecompressADPCM(unsigned char * pbOutBuffer, int dwOutLength, unsigned char * pbInBuffer, int dwInLength, int nChannels);
 
 #endif // __ADPCM_H__
diff --git a/dep/StormLib/src/huffman/huff.cpp b/dep/StormLib/src/huffman/huff.cpp
index cf5ae0542..e12dd7df0 100644
--- a/dep/StormLib/src/huffman/huff.cpp
+++ b/dep/StormLib/src/huffman/huff.cpp
@@ -13,267 +13,152 @@
 /* 03.05.03  1.00  Lad  Added compression methods                            */
 /* 19.11.03  1.01  Dan  Big endian handling                                  */
 /* 08.12.03  2.01  Dan  High-memory handling (> 0x80000000)                  */
-/* 09.01.13  3.00  Lad  Refactored, beautified, documented :-)               */
 /*****************************************************************************/
- 
+
 #include <assert.h>
 #include <string.h>
- 
-#include "../StormPort.h"
+
 #include "huff.h"
 
+// Special for Mac - we have to know if normal pointer greater or less
+// than 0x80000000. This variable is used in the PTR_VALID and PTR_INVALID
+// macros
+static long mul = 1;
+
+#define PTR_VALID(ptr)           (((LONG_PTR)(ptr) * mul) > 0)
+#define PTR_INVALID(ptr)         (((LONG_PTR)(ptr) * mul) < 0)
+#define PTR_INVALID_OR_NULL(ptr) (((LONG_PTR)(ptr) * mul) <= 0)
+
+
 //-----------------------------------------------------------------------------
-// Table of byte-to-weight values
+// Methods of the THTreeItem struct
 
-// Table for (de)compression. Every compression type has 258 entries
-static unsigned char ByteToWeight_00[] =
+// 1501DB70
+THTreeItem * THTreeItem::Call1501DB70(THTreeItem * pLast)
 {
-    0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-    0x00, 0x00
-};
+    if(pLast == NULL)
+        pLast = this + 1;
+    return pLast;
+}
 
-// Data for compression type 0x01
-static unsigned char ByteToWeight_01[] =
+// Gets previous Huffman tree item (?)
+THTreeItem * THTreeItem::GetPrevItem(LONG_PTR value)
 {
-    0x54, 0x16, 0x16, 0x0D, 0x0C, 0x08, 0x06, 0x05, 0x06, 0x05, 0x06, 0x03, 0x04, 0x04, 0x03, 0x05,
-    0x0E, 0x0B, 0x14, 0x13, 0x13, 0x09, 0x0B, 0x06, 0x05, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02,
-    0x0D, 0x07, 0x09, 0x06, 0x06, 0x04, 0x03, 0x02, 0x04, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02,
-    0x09, 0x06, 0x04, 0x04, 0x04, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x04,
-    0x08, 0x03, 0x04, 0x07, 0x09, 0x05, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02,
-    0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02,
-    0x06, 0x0A, 0x08, 0x08, 0x06, 0x07, 0x04, 0x03, 0x04, 0x04, 0x02, 0x02, 0x04, 0x02, 0x03, 0x03,
-    0x04, 0x03, 0x07, 0x07, 0x09, 0x06, 0x04, 0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02,
-    0x0A, 0x02, 0x02, 0x03, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x03, 0x05, 0x02, 0x03,
-    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x03, 0x01, 0x01, 0x01,
-    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x04, 0x04, 0x04, 0x07, 0x09, 0x08, 0x0C, 0x02,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x03,
-    0x04, 0x01, 0x02, 0x04, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
-    0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x4B,
-    0x00, 0x00
-};
-   
-// Data for compression type 0x02
-static unsigned char ByteToWeight_02[] =
-{
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x27, 0x00, 0x00, 0x23, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x06, 0x0E, 0x10, 0x04,
-    0x06, 0x08, 0x05, 0x04, 0x04, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03, 0x01, 0x01, 0x02, 0x01, 0x01,
-    0x01, 0x04, 0x02, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x04, 0x01, 0x01, 0x02, 0x03, 0x03, 0x02,
-    0x03, 0x01, 0x03, 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x01,
-    0x01, 0x29, 0x07, 0x16, 0x12, 0x40, 0x0A, 0x0A, 0x11, 0x25, 0x01, 0x03, 0x17, 0x10, 0x26, 0x2A,
-    0x10, 0x01, 0x23, 0x23, 0x2F, 0x10, 0x06, 0x07, 0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00
-};
-   
-// Data for compression type 0x03
-static unsigned char ByteToWeight_03[] =
-{
-    0xFF, 0x0B, 0x07, 0x05, 0x0B, 0x02, 0x02, 0x02, 0x06, 0x02, 0x02, 0x01, 0x04, 0x02, 0x01, 0x03,
-    0x09, 0x01, 0x01, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
-    0x05, 0x01, 0x01, 0x01, 0x0D, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x02, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
-    0x0A, 0x04, 0x02, 0x01, 0x06, 0x03, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01,
-    0x05, 0x02, 0x03, 0x04, 0x03, 0x03, 0x03, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x03, 0x03,
-    0x01, 0x03, 0x01, 0x01, 0x02, 0x05, 0x01, 0x01, 0x04, 0x03, 0x05, 0x01, 0x03, 0x01, 0x03, 0x03,
-    0x02, 0x01, 0x04, 0x03, 0x0A, 0x06, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x02, 0x02, 0x01, 0x0A, 0x02, 0x05, 0x01, 0x01, 0x02, 0x07, 0x02, 0x17, 0x01, 0x05, 0x01, 0x01,
-    0x0E, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x06, 0x02, 0x01, 0x04, 0x05, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
-    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x11,
-    0x00, 0x00
-};
-   
-// Data for compression type 0x04
-static unsigned char ByteToWeight_04[] =
-{
-    0xFF, 0xFB, 0x98, 0x9A, 0x84, 0x85, 0x63, 0x64, 0x3E, 0x3E, 0x22, 0x22, 0x13, 0x13, 0x18, 0x17,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00
-};
-   
-// Data for compression type 0x05
-static unsigned char ByteToWeight_05[] =
-{
-    0xFF, 0xF1, 0x9D, 0x9E, 0x9A, 0x9B, 0x9A, 0x97, 0x93, 0x93, 0x8C, 0x8E, 0x86, 0x88, 0x80, 0x82,
-    0x7C, 0x7C, 0x72, 0x73, 0x69, 0x6B, 0x5F, 0x60, 0x55, 0x56, 0x4A, 0x4B, 0x40, 0x41, 0x37, 0x37,
-    0x2F, 0x2F, 0x27, 0x27, 0x21, 0x21, 0x1B, 0x1C, 0x17, 0x17, 0x13, 0x13, 0x10, 0x10, 0x0D, 0x0D,
-    0x0B, 0x0B, 0x09, 0x09, 0x08, 0x08, 0x07, 0x07, 0x06, 0x05, 0x05, 0x04, 0x04, 0x04, 0x19, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00
-};
-   
-    // Data for compression type 0x06
-static unsigned char ByteToWeight_06[] =
-{
-    0xC3, 0xCB, 0xF5, 0x41, 0xFF, 0x7B, 0xF7, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xBF, 0xCC, 0xF2, 0x40, 0xFD, 0x7C, 0xF7, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x7A, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00
-};
-   
-// Data for compression type 0x07
-static unsigned char ByteToWeight_07[] =
-{
-    0xC3, 0xD9, 0xEF, 0x3D, 0xF9, 0x7C, 0xE9, 0x1E, 0xFD, 0xAB, 0xF1, 0x2C, 0xFC, 0x5B, 0xFE, 0x17,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xBD, 0xD9, 0xEC, 0x3D, 0xF5, 0x7D, 0xE8, 0x1D, 0xFB, 0xAE, 0xF0, 0x2C, 0xFB, 0x5C, 0xFF, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x70, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00
-};
-   
-// Data for compression type 0x08
-static unsigned char ByteToWeight_08[] =
-{
-    0xBA, 0xC5, 0xDA, 0x33, 0xE3, 0x6D, 0xD8, 0x18, 0xE5, 0x94, 0xDA, 0x23, 0xDF, 0x4A, 0xD1, 0x10,
-    0xEE, 0xAF, 0xE4, 0x2C, 0xEA, 0x5A, 0xDE, 0x15, 0xF4, 0x87, 0xE9, 0x21, 0xF6, 0x43, 0xFC, 0x12,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xB0, 0xC7, 0xD8, 0x33, 0xE3, 0x6B, 0xD6, 0x18, 0xE7, 0x95, 0xD8, 0x23, 0xDB, 0x49, 0xD0, 0x11,
-    0xE9, 0xB2, 0xE2, 0x2B, 0xE8, 0x5C, 0xDD, 0x15, 0xF1, 0x87, 0xE7, 0x20, 0xF7, 0x44, 0xFF, 0x13,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x5F, 0x9E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00
-};
+    if(PTR_INVALID(prev))
+        return PTR_NOT(prev);
 
-static unsigned char * WeightTables[0x09] =
+    if(value == -1 || PTR_INVALID(value))
+        value = (LONG_PTR)(this - next->prev);
+    return prev + value;
+
+// OLD VERSION
+//  if(PTR_INT(value) < 0)
+//      value = PTR_INT((item - item->next->prev));
+//  return (THTreeItem *)((char *)prev + value);
+}
+
+// 1500F5E0
+void THTreeItem::ClearItemLinks()
 {
-    ByteToWeight_00,
-    ByteToWeight_01,
-    ByteToWeight_02,
-    ByteToWeight_03,
-    ByteToWeight_04,
-    ByteToWeight_05,
-    ByteToWeight_06,
-    ByteToWeight_07,
-    ByteToWeight_08
-};
+    next = prev = NULL;
+}
 
-//----------------------------------------------------------------------------- 
-// Debug/diagnostics
-
-#ifdef _DEBUG
-void DumpHuffmannTree(THTreeItem * pItem)
+// 1500BC90
+void THTreeItem::RemoveItem()
 {
-    THTreeItem * pChildLo;                          // Item with the lower weight
-    THTreeItem * pChildHi;                          // Item with the higher weight
+    THTreeItem * pTemp;                // EDX
 
-    // Get the lower-weight branch
-    pChildLo = pItem->pChildLo;
-    if(pChildLo != NULL)
+    if(next != NULL)
     {
-        // Get the higher-weight branch
-        pChildHi = pChildLo->pPrev;
+        pTemp = prev;
 
-        // Parse the lower-weight branch
-        DumpHuffmannTree(pChildHi);
-        DumpHuffmannTree(pChildLo);
+        if(PTR_INVALID_OR_NULL(pTemp))
+            pTemp = PTR_NOT(pTemp);
+        else
+            pTemp += (this - next->prev);
+
+        pTemp->next = next;
+        next->prev  = prev;
+        next = prev = NULL;
+    }
+}
+
+/*
+// OLD VERSION : Removes item from the tree (?)
+static void RemoveItem(THTreeItem * item)
+{
+    THTreeItem * next = item->next;     // ESI
+    THTreeItem * prev = item->prev;     // EDX
+
+    if(next == NULL)
+        return;
+
+    if(PTR_INT(prev) < 0)
+        prev = PTR_NOT(prev);
+    else
+        // ??? usually item == next->prev, so what is it ?
+        prev = (THTreeItem *)((unsigned char *)prev + (unsigned long)((unsigned char *)item - (unsigned char *)(next->prev)));
+
+    // Remove HTree item from the chain
+    prev->next = next;                  // Sets the 'first' pointer
+    next->prev = item->prev;
+
+    // Invalidate pointers
+    item->next = NULL;
+    item->prev = NULL;
+}
+*/
+
+//-----------------------------------------------------------------------------
+// TOutputStream functions
+
+void TOutputStream::PutBits(unsigned long dwBuff, unsigned int nPutBits)
+{
+    dwBitBuff |= (dwBuff << nBits);
+    nBits     += nPutBits;
+
+    // Flush completed bytes
+    while(nBits >= 8)
+    {
+        if(cbOutSize != 0)
+        {
+            *pbOutPos++ = (unsigned char)dwBitBuff;
+            cbOutSize--;
+        }
+
+        dwBitBuff >>= 8;
+        nBits      -= 8;
     }
 }
-#endif
 
 //-----------------------------------------------------------------------------
 // TInputStream functions
 
-TInputStream::TInputStream(void * pvInBuffer, size_t cbInBuffer)
+// Gets one bit from input stream
+unsigned long TInputStream::GetBit()
 {
-    pbInBufferEnd = (unsigned char *)pvInBuffer + cbInBuffer;
-    pbInBuffer = (unsigned char *)pvInBuffer;
-    BitBuffer = 0;
-    BitCount = 0;
+    unsigned long dwOneBit = 0;
+
+    // Ensure that the input stream is reloaded, if there are no bits left
+    if(BitCount == 0)
+    {
+        // Refill the bit buffer
+        BitBuffer = *pbInBuffer++;
+        BitCount = 8;
+    }
+
+    // Copy the bit from bit buffer to the variable
+    dwOneBit = (BitBuffer & 0x01);
+    BitBuffer >>= 1;
+    BitCount--;
+
+    return dwOneBit;
 }
 
 // Gets 7 bits from the stream. DOES NOT remove the bits from input stream
-unsigned int TInputStream::Peek7Bits()
+unsigned long TInputStream::Get7Bits()
 {
-    unsigned int dwReloadByte = 0;
+    unsigned long dwReloadByte = 0;
 
     // If there is not enough bits to get the value,
     // we have to add 8 more bits from the input buffer
@@ -288,32 +173,11 @@ unsigned int TInputStream::Peek7Bits()
     return (BitBuffer & 0x7F);
 }
 
-// Gets one bit from input stream
-unsigned int TInputStream::Get1Bit()
-{
-    unsigned int OneBit = 0;
-
-    // Ensure that the input stream is reloaded, if there are no bits left
-    if(BitCount == 0)
-    {
-        // Refill the bit buffer
-        BitBuffer = *pbInBuffer++;
-        BitCount = 8;
-    }
-
-    // Copy the bit from bit buffer to the variable
-    OneBit = (BitBuffer & 0x01);
-    BitBuffer >>= 1;
-    BitCount--;
-
-    return OneBit;
-}   
-
 // Gets the whole byte from the input stream.
-unsigned int TInputStream::Get8Bits()
+unsigned long TInputStream::Get8Bits()
 {
-    unsigned int dwReloadByte = 0;
-    unsigned int dwOneByte = 0;
+    unsigned long dwReloadByte = 0;
+    unsigned long dwOneByte = 0;
 
     // If there is not enough bits to get the value,
     // we have to add 8 more bits from the input buffer
@@ -333,7 +197,7 @@ unsigned int TInputStream::Get8Bits()
 
 void TInputStream::SkipBits(unsigned int dwBitsToSkip)
 {
-    unsigned int dwReloadByte = 0;
+    unsigned long dwReloadByte = 0;
 
     // If there is not enough bits in the buffer,
     // we have to add 8 more bits from the input buffer
@@ -350,520 +214,1090 @@ void TInputStream::SkipBits(unsigned int dwBitsToSkip)
 }
 
 //-----------------------------------------------------------------------------
-// TOutputStream functions
+// Functions for huffmann tree items
 
-TOutputStream::TOutputStream(void * pvOutBuffer, size_t cbOutLength)
+// Inserts item into the tree (?)
+static void InsertItem(THTreeItem ** itemPtr, THTreeItem * item, unsigned long nWhere, THTreeItem * item2)
 {
-    pbOutBufferEnd = (unsigned char *)pvOutBuffer + cbOutLength;
-    pbOutBuffer = (unsigned char *)pvOutBuffer;
-    BitBuffer = 0;
-    BitCount = 0;
-}
+    THTreeItem * next = item->next;     // EDI - next to the first item
+    THTreeItem * prev = item->prev;     // ESI - prev to the first item
+    THTreeItem * prev2;                 // Pointer to previous item
+    LONG_PTR next2;                     // Pointer to the next item
 
-void TOutputStream::PutBits(unsigned int dwValue, unsigned int nBitCount)
-{
-    BitBuffer |= (dwValue << BitCount);
-    BitCount += nBitCount;
- 
-    // Flush completed bytes
-    while(BitCount >= 8)
+    // The same code like in RemoveItem(item);
+    if(next != 0)                       // If the first item already has next one
     {
-        if(pbOutBuffer < pbOutBufferEnd)
-            *pbOutBuffer++ = (unsigned char)BitBuffer;
- 
-        BitBuffer >>= 8;
-        BitCount -= 8;
+        if(PTR_INVALID(prev))
+            prev = PTR_NOT(prev);
+        else
+            prev += (item - next->prev);
+
+        // 150083C1
+        // Remove the item from the tree
+        prev->next = next;
+        next->prev = prev;
+
+        // Invalidate 'prev' and 'next' pointer
+        item->next = 0;
+        item->prev = 0;
     }
-}
 
-void TOutputStream::Flush()
-{
-    while(BitCount != 0)
+    if(item2 == NULL)                   // EDX - If the second item is not entered,
+        item2 = PTR_PTR(&itemPtr[1]);   // take the first tree item
+
+    switch(nWhere)
     {
-        if(pbOutBuffer < pbOutBufferEnd)
-            *pbOutBuffer++ = (unsigned char)BitBuffer;
+        case SWITCH_ITEMS :             // Switch the two items
+            item->next  = item2->next;  // item2->next (Pointer to pointer to first)
+            item->prev  = item2->next->prev;
+            item2->next->prev = item;
+            item2->next = item;         // Set the first item
+            return;
 
-        BitBuffer >>= 8;
-        BitCount -= ((BitCount > 8) ? 8 : BitCount);
-    }
-}
+        case INSERT_ITEM:               // Insert as the last item
+            item->next = item2;         // Set next item (or pointer to pointer to first item)
+            item->prev = item2->prev;   // Set prev item (or last item in the tree)
 
-//-----------------------------------------------------------------------------
-// Methods of the THTreeItem struct
+            next2 = PTR_INT(itemPtr[0]);// Usually NULL
+            prev2 = item2->prev;        // Prev item to the second (or last tree item)
 
-void THTreeItem::RemoveItem()
-{
-    if(pNext != NULL)
-    {
-        pPrev->pNext = pNext;
-        pNext->pPrev = pPrev;
-        pNext = pPrev = NULL;
+            if(PTR_INVALID(prev2))
+            {
+                if(prev != NULL)
+                {
+                    prev2 = PTR_NOT(prev);
+                    if(prev2 != NULL)
+                    {
+                        prev2->next = item;
+                        item2->prev = item;     // Next after last item
+                    }
+                }
+                return;
+            }
+
+            if(PTR_INVALID(next2))
+                next2 = (LONG_PTR)(item2 - item2->next->prev);
+//              next2 = (THTreeItem *)(unsigned long)((unsigned char *)item2 - (unsigned char *)(item2->next->prev));
+
+//          prev2 = (THTreeItem *)((char *)prev2 + (unsigned long)next2);// ???
+            prev2 += next2;
+            prev2->next = item;
+            item2->prev = item;         // Set the next/last item
+            return;
+
+        default:
+            return;
     }
 }
 
 //-----------------------------------------------------------------------------
 // THuffmannTree class functions
- 
-THuffmannTree::THuffmannTree(bool bCompression)
+
+THuffmannTree::THuffmannTree()
 {
-    // TODO: Obsolete, delete this!!
-//  InitializeHTListHead(&ItemLinks);
-    pFirst = pLast = LIST_HEAD();
- 
-    MinValidValue = 1;
-    ItemsUsed = 0;
- 
-    // If we are going to decompress data, we need to invalidate all item links
-    // We do so by zeroing their ValidValue, so it becomes lower MinValidValue
+    // We have to check if the "this" pointer is less than zero
+    if((LONG_PTR)this < 0)
+        mul = -1;
+}
+
+void THuffmannTree::InitTree(bool bCompression)
+{
+    THTreeItem * pItem;
+    unsigned int nCount;
+
+    // Clear links for all the items in the tree
+    for(pItem = items0008, nCount = 0x203; nCount != 0; pItem++, nCount--)
+        pItem->ClearItemLinks();
+
+    pItem3050 = NULL;
+    pItem3054 = PTR_PTR(&pItem3054);
+    pItem3058 = PTR_NOT(pItem3054);
+
+    pItem305C = NULL;
+    pFirst    = PTR_PTR(&pFirst);
+    pLast     = PTR_NOT(pFirst);
+
+    offs0004  = 1;
+    nItems    = 0;
+
+    // Clear all TQDecompress items. Do this only if preparing for decompression
     if(bCompression == false)
     {
-        memset(QuickLinks, 0, sizeof(QuickLinks));
+        for(nCount = 0; nCount < sizeof(qd3474) / sizeof(TQDecompress); nCount++)
+            qd3474[nCount].offs00 = 0;
     }
 }
 
-THuffmannTree::~THuffmannTree()
-{
-    // Our Huffmann tree does not use any memory allocations,
-    // so we don't need to do eny code in the destructor
-}
-
-void THuffmannTree::LinkTwoItems(THTreeItem * pItem1, THTreeItem * pItem2)
-{
-    pItem2->pNext = pItem1->pNext;
-    pItem2->pPrev = pItem1->pNext->pPrev;
-    pItem1->pNext->pPrev = pItem2;
-    pItem1->pNext = pItem2;
-}
-
-// Inserts item into the tree (?)
-void THuffmannTree::InsertItem(THTreeItem * pNewItem, TInsertPoint InsertPoint, THTreeItem * pInsertPoint)
-{
-    // Remove the item from the tree
-    pNewItem->RemoveItem();
- 
-    if(pInsertPoint == NULL)
-        pInsertPoint = LIST_HEAD();
-
-    switch(InsertPoint)
-    {
-        case InsertAfter:
-            LinkTwoItems(pInsertPoint, pNewItem);
-            return;
-       
-        case InsertBefore:
-            pNewItem->pNext = pInsertPoint;             // Set next item (or pointer to pointer to first item)
-            pNewItem->pPrev = pInsertPoint->pPrev;      // Set prev item (or last item in the tree)
-            pInsertPoint->pPrev->pNext = pNewItem;
-            pInsertPoint->pPrev = pNewItem;             // Set the next/last item
-            return;
-    }
-}
-
-THTreeItem * THuffmannTree::FindHigherOrEqualItem(THTreeItem * pItem, unsigned int Weight)
-{
-    // Parse all existing items
-    if(pItem != NULL)
-    {
-        while(pItem != LIST_HEAD())
-        {
-            if(pItem->Weight >= Weight)
-                return pItem;
-
-            pItem = pItem->pPrev;
-        }
-    }
-
-    // If not found, we just get the first item
-    return LIST_HEAD();
-}
-
-THTreeItem * THuffmannTree::CreateNewItem(unsigned int DecompressedValue, unsigned int Weight, TInsertPoint InsertPoint)
-{
-    THTreeItem * pNewItem;
-
-    // Allocate new item from the item pool
-    pNewItem = &ItemBuffer[ItemsUsed++];
-
-    // Insert this item to the top of the tree
-    InsertItem(pNewItem, InsertPoint, NULL);
-
-    // Fill the rest of the item
-    pNewItem->DecompressedValue = DecompressedValue;
-    pNewItem->Weight = Weight;
-    pNewItem->pParent = NULL;
-    pNewItem->pChildLo = NULL;
-    return pNewItem;
-}
-
-unsigned int THuffmannTree::FixupItemPosByWeight(THTreeItem * pNewItem, unsigned int MaxWeight)
-{
-    THTreeItem * pHigherItem;
-
-    if(pNewItem->Weight < MaxWeight)
-    {
-        // Find an item that has higher weight than this one
-        pHigherItem = FindHigherOrEqualItem(pLast, pNewItem->Weight);
-
-        // Remove the item and put it to the new position
-        pNewItem->RemoveItem();
-        LinkTwoItems(pHigherItem, pNewItem);
-    }
-    else
-    {
-        MaxWeight = pNewItem->Weight;
-    }
-
-    // Return the (updated) maximum weight
-    return MaxWeight;
-}
-
 // Builds Huffman tree. Called with the first 8 bits loaded from input stream
-void THuffmannTree::BuildTree(unsigned int CompressionType)
+void THuffmannTree::BuildTree(unsigned int nCmpType)
 {
-    THTreeItem * pNewItem;
-    THTreeItem * pChildLo;
-    THTreeItem * pChildHi;
-    unsigned char * WeightTable;
-    unsigned int MaxWeight;                     // [ESP+10] - The greatest character found in table
- 
+    unsigned long   maxByte;                // [ESP+10] - The greatest character found in table
+    THTreeItem   ** itemPtr;                // [ESP+14] - Pointer to Huffman tree item pointer array
+    unsigned char * byteArray;              // [ESP+1C] - Pointer to unsigned char in Table1502A630
+    THTreeItem    * child1;
+    unsigned long   i;                      // egcs in linux doesn't like multiple for loops without an explicit i
+
+    // Loop while pointer has a valid value
+    while(PTR_VALID(pLast))                 // ESI - Last entry
+    {
+        THTreeItem * temp;                  // EAX
+
+        if(pLast->next != NULL)             // ESI->next
+            pLast->RemoveItem();
+                                            // EDI = &offs3054
+        pItem3058   = PTR_PTR(&pItem3054);  // [EDI+4]
+        pLast->prev = pItem3058;            // EAX
+
+        temp = PTR_PTR(&pItem3054)->GetPrevItem(PTR_INT(&pItem3050));
+
+        temp->next = pLast;
+        pItem3054  = pLast;
+    }
+
     // Clear all pointers in HTree item array
-    memset(ItemsByByte, 0, sizeof(ItemsByByte));
-    MaxWeight = 0;
- 
-    // Ensure that the compression type is in range
-    assert((CompressionType & 0x0F) <= 0x08);
-    WeightTable  = WeightTables[CompressionType & 0x0F];
- 
-    // Build the linear list of entries that is sorted by byte weight
-    for(unsigned int i = 0; i < 0x100; i++)
+    memset(items306C, 0, sizeof(items306C));
+
+    maxByte = 0;                            // Greatest character found init to zero.
+    itemPtr = (THTreeItem **)&items306C;    // Pointer to current entry in HTree item pointer array
+
+    // Ensure we have low 8 bits only
+    nCmpType &= 0xFF;
+    byteArray  = Table1502A630 + nCmpType * 258; // EDI also
+
+    for(i = 0; i < 0x100; i++, itemPtr++)
     {
+        THTreeItem * item   = pItem3058;    // Item to be created
+        THTreeItem * pItem3 = pItem3058;
+        unsigned char         oneByte = byteArray[i];
+
         // Skip all the bytes which are zero.
-        if(WeightTable[i] != 0)
+        if(byteArray[i] == 0)
+            continue;
+
+        // If not valid pointer, take the first available item in the array
+        if(PTR_INVALID_OR_NULL(item))
+            item = &items0008[nItems++];
+
+        // Insert this item as the top of the tree
+        InsertItem(&pItem305C, item, SWITCH_ITEMS, NULL);
+
+        item->parent    = NULL;                 // Invalidate child and parent
+        item->child     = NULL;
+        *itemPtr        = item;                 // Store pointer into pointer array
+
+        item->dcmpByte  = i;                    // Store counter
+        item->byteValue = oneByte;              // Store byte value
+        if(oneByte >= maxByte)
         {
-            // Create new tree item
-            ItemsByByte[i] = pNewItem = CreateNewItem(i, WeightTable[i], InsertAfter);
-
-            // We need to put the item to the right place in the list
-            MaxWeight = FixupItemPosByWeight(pNewItem, MaxWeight);
-        }
-    }
- 
-    // Insert termination entries at the end of the list
-    ItemsByByte[0x100] = CreateNewItem(0x100, 1, InsertBefore);
-    ItemsByByte[0x101] = CreateNewItem(0x101, 1, InsertBefore);
- 
-    // Now we need to build the tree. We start at the last entry
-    // and go backwards to the first one
-    pChildLo = pLast;
-
-    // Work as long as both children are valid
-    // pChildHi is child with higher weight, pChildLo is the one with lower weight
-    while(pChildLo != LIST_HEAD())
-    {
-        // Also get and verify the higher-weight child
-        pChildHi = pChildLo->pPrev;
-        if(pChildHi == LIST_HEAD())
-            break;
-
-        // Create new parent item for the children
-        pNewItem = CreateNewItem(0, pChildHi->Weight + pChildLo->Weight, InsertAfter);
-
-        // Link both child items to their new parent
-        pChildLo->pParent = pNewItem;
-        pChildHi->pParent = pNewItem;
-        pNewItem->pChildLo = pChildLo;
-
-        // Fixup the item's position by its weight
-        MaxWeight = FixupItemPosByWeight(pNewItem, MaxWeight);
-
-        // Get the previous lower-weight child
-        pChildLo = pChildHi->pPrev;
-    }
-
-    // Initialize the MinValidValue to 1, which invalidates all quick-link items
-    MinValidValue = 1;
-}
-
-void THuffmannTree::IncWeightsAndRebalance(THTreeItem * pItem)
-{
-    THTreeItem * pHigherItem;           // A previous item with greater or equal weight
-    THTreeItem * pChildHi;              // The higher-weight child
-    THTreeItem * pChildLo;              // The lower-weight child
-    THTreeItem * pParent;
- 
-    // Climb up the tree and increment weight of each tree item
-    for(; pItem != NULL; pItem = pItem->pParent)
-    {
-        // Increment the item's weight
-        pItem->Weight++;
-
-        // Find a previous item with equal or greater weight, which is not equal to this item
-        pHigherItem = FindHigherOrEqualItem(pItem->pPrev, pItem->Weight);
-        pChildHi = pHigherItem->pNext;
-
-        // If the item is not equal to the tree item, we need to rebalance the tree
-        if(pChildHi != pItem)
-        {
-            // Move the previous item to the RIGHT from the given item
-            pChildHi->RemoveItem();
-            LinkTwoItems(pItem, pChildHi);
-            
-            // Move the given item AFTER the greater-weight tree item
-            pItem->RemoveItem();
-            LinkTwoItems(pHigherItem, pItem);
-     
-            // We need to maintain the tree so that pChildHi->Weight is >= pChildLo->Weight.
-            // Rebalance the tree accordingly.
-            pChildLo = pChildHi->pParent->pChildLo;
-            pParent = pItem->pParent;
-            if(pParent->pChildLo == pItem)
-                pParent->pChildLo = pChildHi;
-            if(pChildLo == pChildHi)
-                pChildHi->pParent->pChildLo = pItem;
-            pParent = pItem->pParent;
-            pItem->pParent = pChildHi->pParent;
-            pChildHi->pParent = pParent;
-
-            // Increment the global valid value. This invalidates all quick-link items.
-            MinValidValue++;
-        }
-    }
-}
-
-void THuffmannTree::InsertNewBranchAndRebalance(unsigned int Value1, unsigned int Value2)
-{
-    THTreeItem * pLastItem = pLast;
-    THTreeItem * pChildHi;
-    THTreeItem * pChildLo;
-
-    // Create higher-weight child
-    pChildHi = CreateNewItem(Value1, pLastItem->Weight, InsertBefore);
-    pChildHi->pParent = pLastItem;
-    ItemsByByte[Value1] = pChildHi;
-
-    // Create lower-weight child
-    pChildLo = CreateNewItem(Value2, 0, InsertBefore);
-    pChildLo->pParent = pLastItem;
-    pLastItem->pChildLo = pChildLo;
-    ItemsByByte[Value2] = pChildLo;
-
-    IncWeightsAndRebalance(pChildLo);
-}
-
-void THuffmannTree::EncodeOneByte(TOutputStream * os, THTreeItem * pItem)
-{
-    THTreeItem * pParent = pItem->pParent;
-    unsigned int BitBuffer = 0;
-    unsigned int BitCount = 0;
-
-    // Put 1's as long as there is parent
-    while(pParent != NULL)
-    {
-        // Fill the bit buffer
-        BitBuffer = (BitBuffer << 1) | ((pParent->pChildLo != pItem) ? 1 : 0);
-        BitCount++;
-
-        // Move to the parent
-        pItem = pParent;
-        pParent = pParent->pParent;
-    }
-
-    // Write the bits to the output stream
-    os->PutBits(BitBuffer, BitCount);
-}
-
-unsigned int THuffmannTree::DecodeOneByte(TInputStream * is)
-{
-    THTreeItem * pItemLink = NULL;
-    THTreeItem * pItem;
-    unsigned int ItemLinkIndex;
-    unsigned int BitCount = 0;
-
-    // Check for the end of the input stream
-    if(is->pbInBuffer >= is->pbInBufferEnd && is->BitCount < 7)
-        return 0x1FF;
-
-    // Get the eventual quick-link index
-    ItemLinkIndex = is->Peek7Bits();
-    
-    // Is the quick-link item valid?
-    if(QuickLinks[ItemLinkIndex].ValidValue > MinValidValue)
-    {
-        // If that item needs less than 7 bits, we can get decompressed value directly
-        if(QuickLinks[ItemLinkIndex].ValidBits <= 7)
-        {
-            is->SkipBits(QuickLinks[ItemLinkIndex].ValidBits);
-            return QuickLinks[ItemLinkIndex].DecompressedValue;
+            maxByte = oneByte;
+            continue;
         }
 
-        // Otherwise we cannot get decompressed value directly
-        // but we can skip 7 levels of tree parsing
-        pItem = QuickLinks[ItemLinkIndex].pItem;
-        is->SkipBits(7);
+        // Find the first item which has byte value greater than current one byte
+        if(PTR_VALID(pItem3 = pLast))           // EDI - Pointer to the last item
+        {
+            // 15006AF7
+            if(pItem3 != NULL)
+            {
+                do  // 15006AFB
+                {
+                    if(pItem3->byteValue >= oneByte)
+                        goto _15006B09;
+                    pItem3 = pItem3->prev;
+                }
+                while(PTR_VALID(pItem3));
+            }
+        }
+        pItem3 = NULL;
+
+        // 15006B09
+        _15006B09:
+        if(item->next != NULL)
+            item->RemoveItem();
+
+        // 15006B15
+        if(pItem3 == NULL)
+            pItem3 = PTR_PTR(&pFirst);
+
+        // 15006B1F
+        item->next = pItem3->next;
+        item->prev = pItem3->next->prev;
+        pItem3->next->prev = item;
+        pItem3->next = item;
+    }
+
+    // 15006B4A
+    for(; i < 0x102; i++)
+    {
+        THTreeItem ** itemPtr = &items306C[i];  // EDI
+
+        // 15006B59
+        THTreeItem * item = pItem3058;          // ESI
+        if(PTR_INVALID_OR_NULL(item))
+            item = &items0008[nItems++];
+
+        InsertItem(&pItem305C, item, INSERT_ITEM, NULL);
+
+        // 15006B89
+        item->dcmpByte   = i;
+        item->byteValue  = 1;
+        item->parent     = NULL;
+        item->child      = NULL;
+        *itemPtr++ = item;
+    }
+
+    // 15006BAA
+    if(PTR_VALID(child1 = pLast))                   // EDI - last item (first child to item
+    {
+        THTreeItem * child2;                        // EBP
+        THTreeItem * item;                          // ESI
+
+        // 15006BB8
+        while(PTR_VALID(child2 = child1->prev))
+        {
+            if(PTR_INVALID_OR_NULL(item = pItem3058))
+                item = &items0008[nItems++];
+
+            // 15006BE3
+            InsertItem(&pItem305C, item, SWITCH_ITEMS, NULL);
+
+            // 15006BF3
+            item->parent = NULL;
+            item->child  = NULL;
+
+            //EDX = child2->byteValue + child1->byteValue;
+            //EAX = child1->byteValue;
+            //ECX = maxByte;                        // The greatest character (0xFF usually)
+
+            item->byteValue = child1->byteValue + child2->byteValue; // 0x02
+            item->child     = child1;                                // Prev item in the
+            child1->parent  = item;
+            child2->parent  = item;
+
+            // EAX = item->byteValue;
+            if(item->byteValue >= maxByte)
+                maxByte = item->byteValue;
+            else
+            {
+                THTreeItem * pItem2 = child2->prev;   // EDI
+
+                // 15006C2D
+                while(PTR_VALID(pItem2))
+                {
+                    if(pItem2->byteValue >= item->byteValue)
+                        goto _15006C3B;
+                    pItem2 = pItem2->prev;
+                }
+                pItem2 = NULL;
+
+                _15006C3B:
+                if(item->next != 0)
+                {
+                    THTreeItem * temp4 = item->GetPrevItem(-1);
+
+                    temp4->next      = item->next;                 // The first item changed
+                    item->next->prev = item->prev;                 // First->prev changed to negative value
+                    item->next = NULL;
+                    item->prev = NULL;
+                }
+
+                // 15006C62
+                if(pItem2 == NULL)
+                    pItem2 = PTR_PTR(&pFirst);
+
+                item->next = pItem2->next;                           // Set item with 0x100 byte value
+                item->prev = pItem2->next->prev;                     // Set item with 0x17 byte value
+                pItem2->next->prev = item;                           // Changed prev of item with
+                pItem2->next = item;
+            }
+
+            // 15006C7B
+            if(PTR_INVALID_OR_NULL(child1 = child2->prev))
+                break;
+        }
+    }
+    // 15006C88
+    offs0004 = 1;
+}
+/*
+// Modifies Huffman tree. Adds new item and changes
+void THuffmannTree::ModifyTree(unsigned long dwIndex)
+{
+    THTreeItem * pItem1 = pItem3058;                              // ESI
+    THTreeItem * pSaveLast = (PTR_INT(pLast) <= 0) ? NULL : pLast;  // EBX
+    THTreeItem * temp;                                              // EAX
+
+    // Prepare the first item to insert to the tree
+    if(PTR_INT(pItem1) <= 0)
+        pItem1 = &items0008[nItems++];
+
+    // If item has any next item, remove it from the chain
+    if(pItem1->next != NULL)
+    {
+        THTreeItem * temp = pItem1->GetPrevItem(-1);                  // EAX
+
+        temp->next = pItem1->next;
+        pItem1->next->prev = pItem1->prev;
+        pItem1->next = NULL;
+        pItem1->prev = NULL;
+    }
+
+    pItem1->next = PTR_PTR(&pFirst);
+    pItem1->prev = pLast;
+    temp = pItem1->next->GetPrevItem(PTR_INT(pItem305C));
+
+    // 150068E9
+    temp->next = pItem1;
+    pLast  = pItem1;
+
+    pItem1->parent = NULL;
+    pItem1->child  = NULL;
+
+    // 150068F6
+    pItem1->dcmpByte  = pSaveLast->dcmpByte;   // Copy item index
+    pItem1->byteValue = pSaveLast->byteValue;  // Copy item byte value
+    pItem1->parent    = pSaveLast;             // Set parent to last item
+    items306C[pSaveLast->dcmpByte] = pItem1;  // Insert item into item pointer array
+
+    // Prepare the second item to insert into the tree
+    if(PTR_INT((pItem1 = pItem3058)) <= 0)
+        pItem1 = &items0008[nItems++];
+
+    // 1500692E
+    if(pItem1->next != NULL)
+    {
+        temp = pItem1->GetPrevItem(-1);   // EAX
+
+        temp->next = pItem1->next;
+        pItem1->next->prev = pItem1->prev;
+        pItem1->next = NULL;
+        pItem1->prev = NULL;
+    }
+    // 1500694C
+    pItem1->next = PTR_PTR(&pFirst);
+    pItem1->prev = pLast;
+    temp = pItem1->next->GetPrevItem(PTR_INT(pItem305C));
+
+    // 15006968
+    temp->next = pItem1;
+    pLast      = pItem1;
+
+    // 1500696E
+    pItem1->child     = NULL;
+    pItem1->dcmpByte  = dwIndex;
+    pItem1->byteValue = 0;
+    pItem1->parent    = pSaveLast;
+    pSaveLast->child   = pItem1;
+    items306C[dwIndex] = pItem1;
+
+    do
+    {
+        THTreeItem  * pItem2 = pItem1;
+        THTreeItem  * pItem3;
+        unsigned long byteValue;
+
+        // 15006993
+        byteValue = ++pItem1->byteValue;
+
+        // Pass through all previous which have its value greater than byteValue
+        while(PTR_INT((pItem3 = pItem2->prev)) > 0)  // EBX
+        {
+            if(pItem3->byteValue >= byteValue)
+                goto _150069AE;
+
+            pItem2 = pItem2->prev;
+        }
+        // 150069AC
+        pItem3 = NULL;
+
+        _150069AE:
+        if(pItem2 == pItem1)
+            continue;
+
+        // 150069B2
+        // Switch pItem2 with item
+        InsertItem(&pItem305C, pItem2, SWITCH_ITEMS, pItem1);
+        InsertItem(&pItem305C, pItem1, SWITCH_ITEMS, pItem3);
+
+        // 150069D0
+        // Switch parents of pItem1 and pItem2
+        temp = pItem2->parent->child;
+        if(pItem1 == pItem1->parent->child)
+            pItem1->parent->child = pItem2;
+
+        if(pItem2 == temp)
+            pItem2->parent->child = pItem1;
+
+        // 150069ED
+        // Switch parents of pItem1 and pItem3
+        temp = pItem1->parent;
+        pItem1 ->parent = pItem2->parent;
+        pItem2->parent = temp;
+        offs0004++;
+    }
+    while(PTR_INT((pItem1 = pItem1->parent)) > 0);
+}
+
+void THuffmannTree::UninitTree()
+{
+    while(PTR_INT(pLast) > 0)
+    {
+        pItem = pItem305C->Call1501DB70(pLast);
+        pItem->RemoveItem();
+    }
+
+    for(pItem = pFirst; PTR_INT(pItem3058) > 0; pItem = pItem3058)
+        pItem->RemoveItem();
+    PTR_PTR(&pItem3054)->RemoveItem();
+
+    for(pItem = items0008 + 0x203, nCount = 0x203; nCount != 0; nCount--)
+    {
+        pItem--;
+        pItem->RemoveItem();
+        pItem->RemoveItem();
+    }
+}
+*/
+
+THTreeItem * THuffmannTree::Call1500E740(unsigned int nValue)
+{
+    THTreeItem * pItem1 = pItem3058;    // EDX
+    THTreeItem * pItem2;                // EAX
+    THTreeItem * pNext;
+    THTreeItem * pPrev;
+    THTreeItem ** ppItem;
+
+    if(PTR_INVALID_OR_NULL(pItem1) || (pItem2 = pItem1) == NULL)
+    {
+        if((pItem2 = &items0008[nItems++]) != NULL)
+            pItem1 = pItem2;
+        else
+            pItem1 = pFirst;
+    }
+    else
+        pItem1 = pItem2;
+
+    pNext = pItem1->next;
+    if(pNext != NULL)
+    {
+        pPrev = pItem1->prev;
+        if(PTR_INVALID_OR_NULL(pPrev))
+            pPrev = PTR_NOT(pPrev);
+        else
+            pPrev += (pItem1 - pItem1->next->prev);
+
+        pPrev->next = pNext;
+        pNext->prev = pPrev;
+        pItem1->next = NULL;
+        pItem1->prev = NULL;
+    }
+
+    ppItem = &pFirst;       // esi
+    if(nValue > 1)
+    {
+        // ecx = pFirst->next;
+        pItem1->next = *ppItem;
+        pItem1->prev = (*ppItem)->prev;
+
+        (*ppItem)->prev = pItem2;
+        *ppItem = pItem1;
+
+        pItem2->parent = NULL;
+        pItem2->child  = NULL;
     }
     else
     {
-        // Just a sanity check
-        if(pFirst == LIST_HEAD())
-            return 0x1FF;
-
-        // We don't have the quick-link item, we need to parse the tree from its root
-        pItem = pFirst;
-    }
-
-    // Step down the tree until we find a terminal item
-    while(pItem->pChildLo != NULL)
-    {
-        // If the next bit in the compressed stream is set, we get the higher-weight
-        // child. Otherwise, get the lower-weight child.
-        pItem = is->Get1Bit() ? pItem->pChildLo->pPrev : pItem->pChildLo;
-        BitCount++;
-
-        // If the number of loaded bits reached 7,
-        // remember the current item for storing into quick-link item array
-        if(BitCount == 7)
-            pItemLink = pItem;
-    }
-
-    // If we didn't get the item from the quick-link array,
-    // set the entry in it
-    if(QuickLinks[ItemLinkIndex].ValidValue < MinValidValue)
-    {
-        // If the current compressed byte was more than 7 bits,
-        // set a quick-link item with pointer to tree item
-        if(BitCount > 7)
+        pItem1->next = (THTreeItem *)ppItem;
+        pItem1->prev = ppItem[1];
+        // edi = pItem305C;
+        pPrev = ppItem[1];      // ecx
+        if(PTR_INVALID_OR_NULL(pPrev))
         {
-            QuickLinks[ItemLinkIndex].ValidValue = MinValidValue;
-            QuickLinks[ItemLinkIndex].ValidBits = BitCount;
-            QuickLinks[ItemLinkIndex].pItem = pItemLink;
+            pPrev = PTR_NOT(pPrev);
+            pPrev->next = pItem1;
+            pPrev->prev = pItem2;
+
+            pItem2->parent = NULL;
+            pItem2->child  = NULL;
         }
         else
         {
-            // Limit the quick-decompress item to lower amount of bits
-            ItemLinkIndex &= (0xFFFFFFFF >> (32 - BitCount));
-            while(ItemLinkIndex < LINK_ITEM_COUNT)
-            {
-                // Fill the quick-decompress item
-                QuickLinks[ItemLinkIndex].ValidValue = MinValidValue;
-                QuickLinks[ItemLinkIndex].ValidBits  = BitCount;
-                QuickLinks[ItemLinkIndex].DecompressedValue = pItem->DecompressedValue;
+            if(PTR_INVALID(pItem305C))
+                pPrev += (THTreeItem *)ppItem - (*ppItem)->prev;
+            else
+                pPrev += PTR_INT(pItem305C);
 
-                // Increment the index
-                ItemLinkIndex += (1 << BitCount);
-            }
+            pPrev->next    = pItem1;
+            ppItem[1]      = pItem2;
+            pItem2->parent = NULL;
+            pItem2->child  = NULL;
         }
     }
-
-    // Return the decompressed value from the found item
-    return pItem->DecompressedValue;
+    return pItem2;
 }
 
-unsigned int THuffmannTree::Compress(TOutputStream * os, void * pvInBuffer, int cbInBuffer, int CompressionType)
+void THuffmannTree::Call1500E820(THTreeItem * pItem)
 {
-    unsigned char * pbInBufferEnd = (unsigned char *)pvInBuffer + cbInBuffer;
-    unsigned char * pbInBuffer = (unsigned char *)pvInBuffer;
-    unsigned char * pbOutBuff = os->pbOutBuffer;
-    unsigned char InputByte;
- 
-    BuildTree(CompressionType);
-    bIsCmp0 = (CompressionType == 0);
+    THTreeItem * pItem1;                // edi
+    THTreeItem * pItem2 = NULL;         // eax
+    THTreeItem * pItem3;                // edx
+    THTreeItem * pPrev;                 // ebx
+
+    for(; pItem != NULL; pItem = pItem->parent)
+    {
+        pItem->byteValue++;
+
+        for(pItem1 = pItem; ; pItem1 = pPrev)
+        {
+            pPrev = pItem1->prev;
+            if(PTR_INVALID_OR_NULL(pPrev))
+            {
+                pPrev = NULL;
+                break;
+            }
+
+            if(pPrev->byteValue >= pItem->byteValue)
+                break;
+        }
+
+        if(pItem1 == pItem)
+            continue;
+
+        if(pItem1->next != NULL)
+        {
+            pItem2 = pItem1->GetPrevItem(-1);
+            pItem2->next = pItem1->next;
+            pItem1->next->prev = pItem1->prev;
+            pItem1->next = NULL;
+            pItem1->prev = NULL;
+        }
+
+        pItem2 = pItem->next;
+        pItem1->next = pItem2;
+        pItem1->prev = pItem2->prev;
+        pItem2->prev = pItem1;
+        pItem->next = pItem1;
+        if((pItem2 = pItem1) != NULL)
+        {
+            pItem2 = pItem->GetPrevItem(-1);
+            pItem2->next = pItem->next;
+            pItem->next->prev = pItem->prev;
+            pItem->next = NULL;
+            pItem->prev = NULL;
+        }
+
+        if(pPrev == NULL)
+            pPrev = PTR_PTR(&pFirst);
+
+        pItem2       = pPrev->next;
+        pItem->next  = pItem2;
+        pItem->prev  = pItem2->prev;
+        pItem2->prev = pItem;
+        pPrev->next  = pItem;
+
+        pItem3 = pItem1->parent->child;
+        pItem2 = pItem->parent;
+        if(pItem2->child == pItem)
+            pItem2->child = pItem1;
+        if(pItem3 == pItem1)
+            pItem1->parent->child = pItem;
+
+        pItem2 = pItem->parent;
+        pItem->parent  = pItem1->parent;
+        pItem1->parent = pItem2;
+        offs0004++;
+    }
+}
+
+// 1500E920
+unsigned int THuffmannTree::DoCompression(TOutputStream * os, unsigned char * pbInBuffer, int nInLength, int nCmpType)
+{
+    THTreeItem  * pItem1;
+    THTreeItem  * pItem2;
+    THTreeItem  * pItem3;
+    THTreeItem  * pTemp;
+    unsigned long dwBitBuff;
+    unsigned int  nBits;
+    unsigned int  nBit;
+
+    BuildTree(nCmpType);
+    bIsCmp0 = (nCmpType == 0);
 
     // Store the compression type into output buffer
-    os->PutBits(CompressionType, 8);
- 
-    // Process the entire input buffer
-    while(pbInBuffer < pbInBufferEnd)
+    os->dwBitBuff |= (nCmpType << os->nBits);
+    os->nBits     += 8;
+
+    // Flush completed bytes
+    while(os->nBits >= 8)
     {
-        // Get the (next) byte from the input buffer
-        InputByte = *pbInBuffer++;
-
-        // Do we have an item for such input value?
-        if(ItemsByByte[InputByte] == NULL)
+        if(os->cbOutSize != 0)
         {
-            // Encode the relationship
-            EncodeOneByte(os, ItemsByByte[0x101]);
- 
-            // Store the loaded byte into output stream
-            os->PutBits(InputByte, 8);
- 
-            InsertNewBranchAndRebalance(pLast->DecompressedValue, InputByte);
+            *os->pbOutPos++ = (unsigned char)os->dwBitBuff;
+            os->cbOutSize--;
+        }
 
-            if(bIsCmp0)
+        os->dwBitBuff >>= 8;
+        os->nBits      -= 8;
+    }
+
+    for(; nInLength != 0; nInLength--)
+    {
+        unsigned char bOneByte = *pbInBuffer++;
+
+        if((pItem1 = items306C[bOneByte]) == NULL)
+        {
+            pItem2    = items306C[0x101];  // ecx
+            pItem3    = pItem2->parent;    // eax
+            dwBitBuff = 0;
+            nBits     = 0;
+
+            for(; pItem3 != NULL; pItem3 = pItem3->parent)
             {
-                IncWeightsAndRebalance(ItemsByByte[InputByte]);
+                nBit      = (pItem3->child != pItem2) ? 1 : 0;
+                dwBitBuff = (dwBitBuff << 1) | nBit;
+                nBits++;
+                pItem2  = pItem3;
+            }
+            os->PutBits(dwBitBuff, nBits);
+
+            // Store the loaded byte into output stream
+            os->dwBitBuff |= (bOneByte << os->nBits);
+            os->nBits     += 8;
+
+            // Flush the whole byte(s)
+            while(os->nBits >= 8)
+            {
+                if(os->cbOutSize != 0)
+                {
+                    *os->pbOutPos++ = (unsigned char)os->dwBitBuff;
+                    os->cbOutSize--;
+                }
+                os->dwBitBuff >>= 8;
+                os->nBits -= 8;
+            }
+
+            pItem1 = (PTR_INVALID_OR_NULL(pLast)) ? NULL : pLast;
+            pItem2 = Call1500E740(1);
+            pItem2->dcmpByte  = pItem1->dcmpByte;
+            pItem2->byteValue = pItem1->byteValue;
+            pItem2->parent    = pItem1;
+            items306C[pItem2->dcmpByte] = pItem2;
+
+            pItem2 = Call1500E740(1);
+            pItem2->dcmpByte  = bOneByte;
+            pItem2->byteValue = 0;
+            pItem2->parent    = pItem1;
+            items306C[pItem2->dcmpByte] = pItem2;
+            pItem1->child = pItem2;
+
+            Call1500E820(pItem2);
+
+            if(bIsCmp0 != 0)
+            {
+                Call1500E820(items306C[bOneByte]);
                 continue;
             }
-  
-            IncWeightsAndRebalance(ItemsByByte[InputByte]);
+
+            for(pItem1 = items306C[bOneByte]; pItem1 != NULL; pItem1 = pItem1->parent)
+            {
+                pItem1->byteValue++;
+                pItem2 = pItem1;
+
+                for(;;)
+                {
+                    pItem3 = pItem2->prev;
+                    if(PTR_INVALID_OR_NULL(pItem3))
+                    {
+                        pItem3 = NULL;
+                        break;
+                    }
+                    if(pItem3->byteValue >= pItem1->byteValue)
+                        break;
+                    pItem2 = pItem3;
+                }
+
+                if(pItem2 != pItem1)
+                {
+                    InsertItem(&pItem305C, pItem2, SWITCH_ITEMS, pItem1);
+                    InsertItem(&pItem305C, pItem1, SWITCH_ITEMS, pItem3);
+
+                    pItem3 = pItem2->parent->child;
+                    if(pItem1->parent->child == pItem1)
+                        pItem1->parent->child = pItem2;
+
+                    if(pItem3 == pItem2)
+                        pItem2->parent->child = pItem1;
+
+                    pTemp = pItem1->parent;
+                    pItem1->parent = pItem2->parent;
+                    pItem2->parent = pTemp;
+                    offs0004++;
+                }
+            }
+        }
+// 1500EB62
+        else
+        {
+            dwBitBuff = 0;
+            nBits = 0;
+            for(pItem2 = pItem1->parent; pItem2 != NULL; pItem2 = pItem2->parent)
+            {
+                nBit      = (pItem2->child != pItem1) ? 1 : 0;
+                dwBitBuff = (dwBitBuff << 1) | nBit;
+                nBits++;
+                pItem1    = pItem2;
+            }
+            os->PutBits(dwBitBuff, nBits);
+        }
+
+// 1500EB98
+        if(bIsCmp0 != 0)
+            Call1500E820(items306C[bOneByte]);  // 1500EB9D
+// 1500EBAF
+    } // for(; nInLength != 0; nInLength--)
+
+// 1500EBB8
+    pItem1 = items306C[0x100];
+    dwBitBuff = 0;
+    nBits = 0;
+    for(pItem2 = pItem1->parent; pItem2 != NULL; pItem2 = pItem2->parent)
+    {
+        nBit      = (pItem2->child != pItem1) ? 1 : 0;
+        dwBitBuff = (dwBitBuff << 1) | nBit;
+        nBits++;
+        pItem1    = pItem2;
+    }
+
+// 1500EBE6
+    os->PutBits(dwBitBuff, nBits);
+
+// 1500EBEF
+    // Flush the remaining bits
+    while(os->nBits != 0)
+    {
+        if(os->cbOutSize != 0)
+        {
+            *os->pbOutPos++ = (unsigned char)os->dwBitBuff;
+            os->cbOutSize--;
+        }
+        os->dwBitBuff >>= 8;
+        os->nBits -= ((os->nBits > 8) ? 8 : os->nBits);
+    }
+
+    return (unsigned int)(os->pbOutPos - os->pbOutBuffer);
+}
+
+// Decompression using Huffman tree (1500E450)
+unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigned int dwOutLength, TInputStream * is)
+{
+    TQDecompress  * qd;
+    THTreeItem    * pItem1;
+    THTreeItem    * pItem2;
+    unsigned char * pbOutPos = pbOutBuffer;
+    unsigned long nBitCount;
+    unsigned int nDcmpByte = 0;
+    unsigned int n8Bits;                // 8 bits loaded from input stream
+    unsigned int n7Bits;                // 7 bits loaded from input stream
+    bool bHasQdEntry;
+
+    // Test the output length. Must not be NULL.
+    if(dwOutLength == 0)
+        return 0;
+
+    // Get the compression type from the input stream
+    n8Bits = is->Get8Bits();
+
+    // Build the Huffman tree
+    BuildTree(n8Bits);
+    bIsCmp0 = (n8Bits == 0) ? 1 : 0;
+
+    for(;;)
+    {
+        // Security check: If we are at the end of the input buffer,
+        // it means that the data is corrupt
+        if(is->BitCount == 0 && is->pbInBuffer >= is->pbInBufferEnd)
+            return 0;
+
+        // Get 7 bits from input stream
+        n7Bits = is->Get7Bits();
+
+        // Try to use quick decompression. Check TQDecompress array for corresponding item.
+        // If found, ise the result byte instead.
+        qd = &qd3474[n7Bits];
+
+        // If there is a quick-pass possible (ebx)
+        bHasQdEntry = (qd->offs00 >= offs0004) ? true : false;
+
+        // If we can use quick decompress, use it.
+        if(bHasQdEntry)
+        {
+            if(qd->nBits > 7)
+            {
+                is->SkipBits(7);
+                pItem1 = qd->pItem;
+                goto _1500E549;
+            }
+            is->SkipBits(qd->nBits);
+            nDcmpByte = qd->dcmpByte;
         }
         else
         {
-            EncodeOneByte(os, ItemsByByte[InputByte]);
+            pItem1 = pFirst->next->prev;
+            if(PTR_INVALID_OR_NULL(pItem1))
+                pItem1 = NULL;
+_1500E549:
+            nBitCount = 0;
+            pItem2 = NULL;
+
+            do
+            {
+                if(pItem1 == NULL)
+                    return 0;
+
+                pItem1 = pItem1->child;     // Move down by one level
+                if(is->GetBit())            // If current bit is set, move to previous
+                    pItem1 = pItem1->prev;
+
+                if(++nBitCount == 7)        // If we are at 7th bit, save current HTree item.
+                    pItem2 = pItem1;
+            }
+            while(pItem1->child != NULL);   // Walk until tree has no deeper level
+
+            if(bHasQdEntry == false)
+            {
+                if(nBitCount > 7)
+                {
+                    qd->offs00 = offs0004;
+                    qd->nBits  = nBitCount;
+                    qd->pItem  = pItem2;
+                }
+                else
+                {
+                    unsigned long nIndex = n7Bits & (0xFFFFFFFF >> (32 - nBitCount));
+                    unsigned long nAdd   = (1 << nBitCount);
+
+                    for(qd = &qd3474[nIndex]; nIndex <= 0x7F; nIndex += nAdd, qd += nAdd)
+                    {
+                        qd->offs00   = offs0004;
+                        qd->nBits    = nBitCount;
+                        qd->dcmpByte = pItem1->dcmpByte;
+                    }
+                }
+            }
+            nDcmpByte = pItem1->dcmpByte;
         }
- 
-        if(bIsCmp0)
+
+        if(nDcmpByte == 0x101)          // Huffman tree needs to be modified
         {
-            IncWeightsAndRebalance(ItemsByByte[InputByte]);
-        }
-    }
- 
-    // Put the termination mark to the compressed stream
-    EncodeOneByte(os, ItemsByByte[0x100]);
- 
-    // Flush the remaining bits
-    os->Flush();
-    return (unsigned int)(os->pbOutBuffer - pbOutBuff);
-}
- 
-// Decompression using Huffman tree (1500E450)
-unsigned int THuffmannTree::Decompress(void * pvOutBuffer, unsigned int cbOutLength, TInputStream * is)
-{
-    unsigned char * pbOutBufferEnd = (unsigned char *)pvOutBuffer + cbOutLength;
-    unsigned char * pbOutBuffer = (unsigned char *)pvOutBuffer;
-    unsigned int DecompressedValue = 0;
-    unsigned int CompressionType = 0;
-   
-    // Test the output length. Must not be NULL.
-    if(cbOutLength == 0)
-        return 0;
- 
-    // Get the compression type from the input stream
-    CompressionType = is->Get8Bits();
-    bIsCmp0 = (CompressionType == 0) ? 1 : 0;
- 
-    // Build the Huffman tree
-    BuildTree(CompressionType);    
- 
-    // Process the entire input buffer until end of the stream
-    while((DecompressedValue = DecodeOneByte(is)) != 0x100)
-    {
-        // Did an error occur?
-        if(DecompressedValue == 0x1FF)          // An error occurred
-            return 0;
+            n8Bits = is->Get8Bits();
+            pItem1 = (PTR_INVALID_OR_NULL(pLast)) ? NULL : pLast;
 
-        // Huffman tree needs to be modified
-        if(DecompressedValue == 0x101)
-        {
-            // The decompressed byte is stored in the next 8 bits
-            DecompressedValue = is->Get8Bits();
+            pItem2 = Call1500E740(1);
+            pItem2->parent    = pItem1;
+            pItem2->dcmpByte  = pItem1->dcmpByte;
+            pItem2->byteValue = pItem1->byteValue;
+            items306C[pItem2->dcmpByte] = pItem2;
 
-            InsertNewBranchAndRebalance(pLast->DecompressedValue, DecompressedValue);
+            pItem2 = Call1500E740(1);
+            pItem2->parent    = pItem1;
+            pItem2->dcmpByte  = n8Bits;
+            pItem2->byteValue = 0;
+            items306C[pItem2->dcmpByte] = pItem2;
 
+            pItem1->child = pItem2;
+            Call1500E820(pItem2);
             if(bIsCmp0 == 0)
-                IncWeightsAndRebalance(ItemsByByte[DecompressedValue]);
+                Call1500E820(items306C[n8Bits]);
+
+            nDcmpByte = n8Bits;
         }
- 
-        // A byte successfully decoded - store it in the output stream
-        *pbOutBuffer++ = (unsigned char)DecompressedValue;
-        if(pbOutBuffer >= pbOutBufferEnd)
+
+        if(nDcmpByte == 0x100)
             break;
- 
+
+        *pbOutPos++ = (unsigned char)nDcmpByte;
+        if(--dwOutLength == 0)
+            break;
+
         if(bIsCmp0)
-        {
-            IncWeightsAndRebalance(ItemsByByte[DecompressedValue]);
-        }
+            Call1500E820(items306C[nDcmpByte]);
     }
- 
-    return (unsigned int)(pbOutBuffer - (unsigned char *)pvOutBuffer);
+
+    return (unsigned int)(pbOutPos - pbOutBuffer);
 }
 
+
+// Table for (de)compression. Every compression type has 258 entries
+unsigned char THuffmannTree::Table1502A630[] =
+{
+    // Data for compression type 0x00
+    0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+    0x00, 0x00,
+
+    // Data for compression type 0x01
+    0x54, 0x16, 0x16, 0x0D, 0x0C, 0x08, 0x06, 0x05, 0x06, 0x05, 0x06, 0x03, 0x04, 0x04, 0x03, 0x05,
+    0x0E, 0x0B, 0x14, 0x13, 0x13, 0x09, 0x0B, 0x06, 0x05, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02,
+    0x0D, 0x07, 0x09, 0x06, 0x06, 0x04, 0x03, 0x02, 0x04, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02,
+    0x09, 0x06, 0x04, 0x04, 0x04, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x04,
+    0x08, 0x03, 0x04, 0x07, 0x09, 0x05, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02,
+    0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02,
+    0x06, 0x0A, 0x08, 0x08, 0x06, 0x07, 0x04, 0x03, 0x04, 0x04, 0x02, 0x02, 0x04, 0x02, 0x03, 0x03,
+    0x04, 0x03, 0x07, 0x07, 0x09, 0x06, 0x04, 0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02,
+    0x0A, 0x02, 0x02, 0x03, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x03, 0x05, 0x02, 0x03,
+    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x03, 0x01, 0x01, 0x01,
+    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x04, 0x04, 0x04, 0x07, 0x09, 0x08, 0x0C, 0x02,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x03,
+    0x04, 0x01, 0x02, 0x04, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
+    0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x4B,
+    0x00, 0x00,
+
+    // Data for compression type 0x02
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x27, 0x00, 0x00, 0x23, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x06, 0x0E, 0x10, 0x04,
+    0x06, 0x08, 0x05, 0x04, 0x04, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03, 0x01, 0x01, 0x02, 0x01, 0x01,
+    0x01, 0x04, 0x02, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x04, 0x01, 0x01, 0x02, 0x03, 0x03, 0x02,
+    0x03, 0x01, 0x03, 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x01,
+    0x01, 0x29, 0x07, 0x16, 0x12, 0x40, 0x0A, 0x0A, 0x11, 0x25, 0x01, 0x03, 0x17, 0x10, 0x26, 0x2A,
+    0x10, 0x01, 0x23, 0x23, 0x2F, 0x10, 0x06, 0x07, 0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+
+    // Data for compression type 0x03
+    0xFF, 0x0B, 0x07, 0x05, 0x0B, 0x02, 0x02, 0x02, 0x06, 0x02, 0x02, 0x01, 0x04, 0x02, 0x01, 0x03,
+    0x09, 0x01, 0x01, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
+    0x05, 0x01, 0x01, 0x01, 0x0D, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x02, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
+    0x0A, 0x04, 0x02, 0x01, 0x06, 0x03, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01,
+    0x05, 0x02, 0x03, 0x04, 0x03, 0x03, 0x03, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x03, 0x03,
+    0x01, 0x03, 0x01, 0x01, 0x02, 0x05, 0x01, 0x01, 0x04, 0x03, 0x05, 0x01, 0x03, 0x01, 0x03, 0x03,
+    0x02, 0x01, 0x04, 0x03, 0x0A, 0x06, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x02, 0x02, 0x01, 0x0A, 0x02, 0x05, 0x01, 0x01, 0x02, 0x07, 0x02, 0x17, 0x01, 0x05, 0x01, 0x01,
+    0x0E, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x06, 0x02, 0x01, 0x04, 0x05, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
+    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x11,
+    0x00, 0x00,
+
+    // Data for compression type 0x04
+    0xFF, 0xFB, 0x98, 0x9A, 0x84, 0x85, 0x63, 0x64, 0x3E, 0x3E, 0x22, 0x22, 0x13, 0x13, 0x18, 0x17,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+
+    // Data for compression type 0x05
+    0xFF, 0xF1, 0x9D, 0x9E, 0x9A, 0x9B, 0x9A, 0x97, 0x93, 0x93, 0x8C, 0x8E, 0x86, 0x88, 0x80, 0x82,
+    0x7C, 0x7C, 0x72, 0x73, 0x69, 0x6B, 0x5F, 0x60, 0x55, 0x56, 0x4A, 0x4B, 0x40, 0x41, 0x37, 0x37,
+    0x2F, 0x2F, 0x27, 0x27, 0x21, 0x21, 0x1B, 0x1C, 0x17, 0x17, 0x13, 0x13, 0x10, 0x10, 0x0D, 0x0D,
+    0x0B, 0x0B, 0x09, 0x09, 0x08, 0x08, 0x07, 0x07, 0x06, 0x05, 0x05, 0x04, 0x04, 0x04, 0x19, 0x18,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+
+    // Data for compression type 0x06
+    0xC3, 0xCB, 0xF5, 0x41, 0xFF, 0x7B, 0xF7, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xBF, 0xCC, 0xF2, 0x40, 0xFD, 0x7C, 0xF7, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x7A, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+
+    // Data for compression type 0x07
+    0xC3, 0xD9, 0xEF, 0x3D, 0xF9, 0x7C, 0xE9, 0x1E, 0xFD, 0xAB, 0xF1, 0x2C, 0xFC, 0x5B, 0xFE, 0x17,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xBD, 0xD9, 0xEC, 0x3D, 0xF5, 0x7D, 0xE8, 0x1D, 0xFB, 0xAE, 0xF0, 0x2C, 0xFB, 0x5C, 0xFF, 0x18,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x70, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+
+    // Data for compression type 0x08
+    0xBA, 0xC5, 0xDA, 0x33, 0xE3, 0x6D, 0xD8, 0x18, 0xE5, 0x94, 0xDA, 0x23, 0xDF, 0x4A, 0xD1, 0x10,
+    0xEE, 0xAF, 0xE4, 0x2C, 0xEA, 0x5A, 0xDE, 0x15, 0xF4, 0x87, 0xE9, 0x21, 0xF6, 0x43, 0xFC, 0x12,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xB0, 0xC7, 0xD8, 0x33, 0xE3, 0x6B, 0xD6, 0x18, 0xE7, 0x95, 0xD8, 0x23, 0xDB, 0x49, 0xD0, 0x11,
+    0xE9, 0xB2, 0xE2, 0x2B, 0xE8, 0x5C, 0xDD, 0x15, 0xF1, 0x87, 0xE7, 0x20, 0xF7, 0x44, 0xFF, 0x13,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x5F, 0x9E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00
+};
diff --git a/dep/StormLib/src/huffman/huff.h b/dep/StormLib/src/huffman/huff.h
index b0a54eef2..d1c06e0f4 100644
--- a/dep/StormLib/src/huffman/huff.h
+++ b/dep/StormLib/src/huffman/huff.h
@@ -9,15 +9,25 @@
 /* 03.05.03  2.00  Lad  Added compression                                    */
 /* 08.12.03  2.01  Dan  High-memory handling (> 0x80000000)                  */
 /*****************************************************************************/
- 
+
 #ifndef __HUFFMAN_H__
 #define __HUFFMAN_H__
 
+#include "../StormPort.h"
+
 //-----------------------------------------------------------------------------
 // Defines
- 
-#define HUFF_ITEM_COUNT    0x203        // Number of items in the item pool
-#define LINK_ITEM_COUNT    0x80         // Maximum number of quick-link items
+
+#define INSERT_ITEM    1
+#define SWITCH_ITEMS   2                    // Switch the item1 and item2
+
+#define PTR_NOT(ptr)  (THTreeItem *)(~(DWORD_PTR)(ptr))
+#define PTR_PTR(ptr)  ((THTreeItem *)(ptr))
+#define PTR_INT(ptr)  (INT_PTR)(ptr)
+
+#ifndef NULL
+#define NULL 0
+#endif
 
 //-----------------------------------------------------------------------------
 // Structures and classes
@@ -27,76 +37,65 @@ class TInputStream
 {
     public:
 
-    TInputStream(void * pvInBuffer, size_t cbInBuffer);
-    unsigned int Get1Bit();
-    unsigned int Peek7Bits();
-    unsigned int Get8Bits();
+    unsigned long GetBit();
+    unsigned long Get7Bits();
+    unsigned long Get8Bits();
     void SkipBits(unsigned int BitCount);
- 
-    unsigned char * pbInBufferEnd;      // End position in the the input buffer
-    unsigned char * pbInBuffer;         // Current position in the the input buffer
-    unsigned int BitBuffer;             // Input bit buffer
-    unsigned int BitCount;              // Number of bits remaining in 'dwBitBuff'
+
+    unsigned char * pbInBuffer;         // Input data
+    unsigned char * pbInBufferEnd;      // End of the input buffer
+    unsigned long   BitBuffer;          // Input bit buffer
+    unsigned int    BitCount;           // Number of bits remaining in 'dwBitBuff'
 };
- 
 
 // Output stream for Huffmann compression
 class TOutputStream
 {
     public:
- 
-    TOutputStream(void * pvOutBuffer, size_t cbOutLength);
-    void PutBits(unsigned int dwValue, unsigned int nBitCount);
-    void Flush();
- 
-    unsigned char * pbOutBufferEnd;     // End position in the output buffer
-    unsigned char * pbOutBuffer;        // Current position in the output buffer
-    unsigned int BitBuffer;             // Bit buffer
-    unsigned int BitCount;              // Number of bits in the bit buffer
+
+    void PutBits(unsigned long dwBuff, unsigned int nPutBits);
+
+    unsigned char * pbOutBuffer;        // 00 : Output buffer
+    unsigned long   cbOutSize;          // 04 : Size of output buffer
+    unsigned char * pbOutPos;           // 08 : Current output position
+    unsigned long   dwBitBuff;          // 0C : Bit buffer
+    unsigned long   nBits;              // 10 : Number of bits in the bit buffer
 };
 
-// A virtual tree item that represents the head of the item list
-#define LIST_HEAD()  ((THTreeItem *)(&pFirst))
-
-enum TInsertPoint
-{
-    InsertAfter = 1,
-    InsertBefore = 2
-};
-
-// Huffmann tree item
+// Huffmann tree item (?)
 struct THTreeItem
 {
-    THTreeItem()    { pPrev = pNext = NULL;}
-//  ~THTreeItem()   { RemoveItem(); }
-
+    THTreeItem * Call1501DB70(THTreeItem * pLast);
+    THTreeItem * GetPrevItem(LONG_PTR value);
+    void         ClearItemLinks();
     void         RemoveItem();
-//  void         RemoveEntry();
- 
-    THTreeItem  * pNext;                // Pointer to lower-weight tree item
-    THTreeItem  * pPrev;                // Pointer to higher-weight item
-    unsigned int  DecompressedValue;    // 08 - Decompressed byte value (also index in the array)
-    unsigned int  Weight;               // 0C - Weight
-    THTreeItem  * pParent;              // 10 - Pointer to parent item (NULL if none)
-    THTreeItem  * pChildLo;             // 14 - Pointer to the child with lower-weight child ("left child")
+
+    THTreeItem  * next;                 // 00 - Pointer to next THTreeItem
+    THTreeItem  * prev;                 // 04 - Pointer to prev THTreeItem (< 0 if none)
+    unsigned long dcmpByte;             // 08 - Index of this item in item pointer array, decompressed byte value
+    unsigned long byteValue;            // 0C - Some byte value
+    THTreeItem  * parent;               // 10 - Pointer to parent THTreeItem (NULL if none)
+    THTreeItem  * child;                // 14 - Pointer to child  THTreeItem
+    int           addressMultiplier;    // -1 if object on negative address (>0x80000000), +1 if positive
 };
 
-
-// Structure used for quick navigating in the huffmann tree.
-// Allows skipping up to 7 bits in the compressed stream, thus
-// decompressing a bit faster. Sometimes it can even get the decompressed
-// byte directly.
-struct TQuickLink
-{      
-    unsigned int ValidValue;            // If greater than THuffmannTree::MinValidValue, the entry is valid
-    unsigned int ValidBits;             // Number of bits that are valid for this item link
+// Structure used for quick decompress. The 'bitCount' contains number of bits
+// and byte value contains result decompressed byte value.
+// After each walk through Huffman tree are filled all entries which are
+// multiplies of number of bits loaded from input stream. These entries
+// contain number of bits and result value. At the next 7 bits is tested this
+// structure first. If corresponding entry found, decompression routine will
+// not walk through Huffman tree and directly stores output byte to output stream.
+struct TQDecompress
+{
+    unsigned long offs00;               // 00 - 1 if resolved
+    unsigned long nBits;                // 04 - Bit count
     union
     {
-        THTreeItem  * pItem;            // Pointer to the item within the Huffmann tree
-        unsigned int DecompressedValue; // Value for direct decompression
+        unsigned long dcmpByte;         // 08 - Byte value for decompress (if bitCount <= 7)
+        THTreeItem  * pItem;            // 08 - THTreeItem (if number of bits is greater than 7
     };
 };
-                                           
 
 // Structure for Huffman tree (Size 0x3674 bytes). Because I'm not expert
 // for the decompression, I do not know actually if the class is really a Hufmann
@@ -104,40 +103,40 @@ struct TQuickLink
 class THuffmannTree
 {
     public:
-    
-    THuffmannTree(bool bCompression);
-    ~THuffmannTree();
 
-    void  LinkTwoItems(THTreeItem * pItem1, THTreeItem * pItem2);
-    void  InsertItem(THTreeItem * item, TInsertPoint InsertPoint, THTreeItem * item2);
+    THuffmannTree();
+    void  InitTree(bool bCompression);
+    void  BuildTree(unsigned int nCmpType);
+//  void  ModifyTree(unsigned long dwIndex);
+//  void  UninitTree();
 
-    THTreeItem * FindHigherOrEqualItem(THTreeItem * pItem, unsigned int Weight);
-    THTreeItem * CreateNewItem(unsigned int DecompressedValue, unsigned int Weight, TInsertPoint InsertPoint);
+//  void  Call15007010(Bit32 dwInLength, THTreeItem * item);
+    THTreeItem * Call1500E740(unsigned int nValue);
+    void         Call1500E820(THTreeItem * pItem);
+    unsigned int DoCompression(TOutputStream * os, unsigned char * pbInBuffer, int nInLength, int nCmpType);
+    unsigned int DoDecompression(unsigned char * pbOutBuffer, unsigned int dwOutLength, TInputStream * is);
 
-    unsigned int FixupItemPosByWeight(THTreeItem * pItem, unsigned int MaxWeight);
-    void  BuildTree(unsigned int CompressionType);
+    unsigned long bIsCmp0;              // 0000 - 1 if compression type 0
+    unsigned long offs0004;             // 0004 - Some flag
+    THTreeItem    items0008[0x203];     // 0008 - HTree items
 
-    void  IncWeightsAndRebalance(THTreeItem * pItem);
-    void  InsertNewBranchAndRebalance(unsigned int Value1, unsigned int Value2);
+    //- Sometimes used as HTree item -----------
+    THTreeItem  * pItem3050;            // 3050 - Always NULL (?)
+    THTreeItem  * pItem3054;            // 3054 - Pointer to Huffman tree item
+    THTreeItem  * pItem3058;            // 3058 - Pointer to Huffman tree item (< 0 if invalid)
 
-    void  EncodeOneByte(TOutputStream * os, THTreeItem * pItem);
-    unsigned int DecodeOneByte(TInputStream * is);
+    //- Sometimes used as HTree item -----------
+    THTreeItem  * pItem305C;            // 305C - Usually NULL
+    THTreeItem  * pFirst;               // 3060 - Pointer to top (first) Huffman tree item
+    THTreeItem  * pLast;                // 3064 - Pointer to bottom (last) Huffman tree item (< 0 if invalid)
+    unsigned long nItems;               // 3068 - Number of used HTree items
 
-    unsigned int Compress(TOutputStream * os, void * pvInBuffer, int cbInBuffer, int nCmpType);
-    unsigned int Decompress(void * pvOutBuffer, unsigned int cbOutLength, TInputStream * is);
- 
-    THTreeItem   ItemBuffer[HUFF_ITEM_COUNT];   // Buffer for tree items. No memory allocation is needed
-    unsigned int ItemsUsed;                     // Number of tree items used from ItemBuffer
- 
-    // Head of the linear item list
-    THTreeItem * pFirst;                        // Pointer to the highest weight item
-    THTreeItem * pLast;                         // Pointer to the lowest weight item
+    //-------------------------------------------
+    THTreeItem * items306C[0x102];      // 306C - THTreeItem pointer array
+    TQDecompress qd3474[0x80];          // 3474 - Array for quick decompression
+    int          addressMultiplier;     // -1 if object on negative address (>0x80000000), +1 if positive
 
-    THTreeItem * ItemsByByte[0x102];            // Array of item pointers, one for each possible byte value
-    TQuickLink   QuickLinks[LINK_ITEM_COUNT];   // Array of quick-link items
-    
-    unsigned int MinValidValue;                 // A minimum value of TQDecompress::ValidValue to be considered valid
-    unsigned int bIsCmp0;                       // 1 if compression type 0
+    static unsigned char Table1502A630[];// Some table
 };
 
 #endif // __HUFFMAN_H__
diff --git a/dep/StormLibOld/src/huffman/huff_patch.cpp b/dep/StormLib/src/huffman/huff_patch.cpp
similarity index 100%
rename from dep/StormLibOld/src/huffman/huff_patch.cpp
rename to dep/StormLib/src/huffman/huff_patch.cpp
diff --git a/dep/StormLibOld/src/huffman/huff_patch.h b/dep/StormLib/src/huffman/huff_patch.h
similarity index 100%
rename from dep/StormLibOld/src/huffman/huff_patch.h
rename to dep/StormLib/src/huffman/huff_patch.h
diff --git a/dep/StormLib/src/jenkins/lookup3.c b/dep/StormLib/src/jenkins/lookup3.c
index e7db216ba..6af56b481 100644
--- a/dep/StormLib/src/jenkins/lookup3.c
+++ b/dep/StormLib/src/jenkins/lookup3.c
@@ -292,7 +292,7 @@ uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
   u.ptr = key;
   if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
     const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-    //const uint8_t  *k8;
+    const uint8_t  *k8;
 
     /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
     while (length > 12)
@@ -336,7 +336,7 @@ uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
 
 #else /* make valgrind happy */
 
-    const uint8_t  *k8 = (const uint8_t *)k;
+    k8 = (const uint8_t *)k;
     switch(length)
     {
     case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
@@ -358,7 +358,7 @@ uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
 
   } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
     const uint16_t *k = (const uint16_t *)key;         /* read 16-bit chunks */
-    //const uint8_t  *k8;
+    const uint8_t  *k8;
 
     /*--------------- all but last block: aligned reads and different mixing */
     while (length > 12)
@@ -372,7 +372,7 @@ uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
     }
 
     /*----------------------------- handle the last (probably partial) block */
-    const uint8_t *k8 = (const uint8_t *)k;
+    k8 = (const uint8_t *)k;
     switch(length)
     {
     case 12: c+=k[4]+(((uint32_t)k[5])<<16);
@@ -477,7 +477,7 @@ void hashlittle2(
   u.ptr = key;
   if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
     const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-    //const uint8_t  *k8;
+    const uint8_t  *k8;
 
     /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
     while (length > 12)
@@ -521,7 +521,7 @@ void hashlittle2(
 
 #else /* make valgrind happy */
 
-    const uint8_t  *k8 = (const uint8_t *)k;
+    k8 = (const uint8_t *)k;
     switch(length)
     {
     case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
@@ -654,7 +654,7 @@ uint32_t hashbig( const void *key, size_t length, uint32_t initval)
   u.ptr = key;
   if (HASH_BIG_ENDIAN && ((u.i & 0x3) == 0)) {
     const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-    //const uint8_t  *k8;
+    const uint8_t  *k8;
 
     /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
     while (length > 12)
@@ -698,7 +698,7 @@ uint32_t hashbig( const void *key, size_t length, uint32_t initval)
 
 #else  /* make valgrind happy */
 
-    const uint8_t  *k8 = (const uint8_t *)k;
+    k8 = (const uint8_t *)k;
     switch(length)                   /* all the case statements fall through */
     {
     case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
diff --git a/dep/StormLib/src/pklib/explode.c b/dep/StormLib/src/pklib/explode.c
index 73c500495..510845c42 100644
--- a/dep/StormLib/src/pklib/explode.c
+++ b/dep/StormLib/src/pklib/explode.c
@@ -16,7 +16,7 @@
 
 #include "pklib.h"
 
-#define PKDCL_OK                    0       
+#define PKDCL_OK                    0
 #define PKDCL_STREAM_END            1   // All data from the input stream is read
 #define PKDCL_NEED_DICT             2   // Need more data (dictionary)
 #define PKDCL_CONTINUE             10   // Internal flag, not returned to user
@@ -31,7 +31,7 @@ char CopyrightPkware[] = "PKWARE Data Compression Library for Win32\r\n"
 //-----------------------------------------------------------------------------
 // Tables
 
-static unsigned char DistBits[] = 
+static unsigned char DistBits[] =
 {
     0x02, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
     0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
@@ -39,7 +39,7 @@ static unsigned char DistBits[] =
     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08
 };
 
-static unsigned char DistCode[] = 
+static unsigned char DistCode[] =
 {
     0x03, 0x0D, 0x05, 0x19, 0x09, 0x11, 0x01, 0x3E, 0x1E, 0x2E, 0x0E, 0x36, 0x16, 0x26, 0x06, 0x3A,
     0x1A, 0x2A, 0x0A, 0x32, 0x12, 0x22, 0x42, 0x02, 0x7C, 0x3C, 0x5C, 0x1C, 0x6C, 0x2C, 0x4C, 0x0C,
@@ -88,7 +88,7 @@ static unsigned char ChBitsAsc[] =
     0x0D, 0x0D, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D
 };
 
-static unsigned short ChCodeAsc[] = 
+static unsigned short ChCodeAsc[] =
 {
     0x0490, 0x0FE0, 0x07E0, 0x0BE0, 0x03E0, 0x0DE0, 0x05E0, 0x09E0,
     0x01E0, 0x00B8, 0x0062, 0x0EE0, 0x06E0, 0x0022, 0x0AE0, 0x02E0,
@@ -121,7 +121,7 @@ static unsigned short ChCodeAsc[] =
     0x0300, 0x0D40, 0x1D00, 0x0D00, 0x1500, 0x0540, 0x0500, 0x1900,
     0x0900, 0x0940, 0x1100, 0x0100, 0x1E00, 0x0E00, 0x0140, 0x1600,
     0x0600, 0x1A00, 0x0E40, 0x0640, 0x0A40, 0x0A00, 0x1200, 0x0200,
-    0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000  
+    0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000
 };
 
 //-----------------------------------------------------------------------------
@@ -133,8 +133,8 @@ static void GenDecodeTabs(
     unsigned char * length_bits,        // [in] Table of lengths. Each length is stored as number of bits
     size_t elements)                    // [in] Number of elements in start_indexes and length_bits
 {
-    unsigned int index;
-    unsigned int length;
+    unsigned long index;
+    unsigned long length;
     size_t i;
 
     for(i = 0; i < elements; i++)
@@ -151,7 +151,7 @@ static void GenDecodeTabs(
 static void GenAscTabs(TDcmpStruct * pWork)
 {
     unsigned short * pChCodeAsc = &ChCodeAsc[0xFF];
-    unsigned int  acc, add;
+    unsigned long  acc, add;
     unsigned short count;
 
     for(count = 0x00FF; pChCodeAsc >= ChCodeAsc; pChCodeAsc--, count--)
@@ -227,7 +227,7 @@ static void GenAscTabs(TDcmpStruct * pWork)
 // Returns: PKDCL_OK:         Operation was successful
 //          PKDCL_STREAM_END: There are no more bits in the input buffer
 
-static int WasteBits(TDcmpStruct * pWork, unsigned int nBits)
+static int WasteBits(TDcmpStruct * pWork, unsigned long nBits)
 {
     // If number of bits required is less than number of (bits in the buffer) ?
     if(nBits <= pWork->extra_bits)
@@ -267,22 +267,22 @@ static int WasteBits(TDcmpStruct * pWork, unsigned int nBits)
 //           0x305: End of stream
 //           0x306: Error
 
-static unsigned int DecodeLit(TDcmpStruct * pWork)
+static unsigned long DecodeLit(TDcmpStruct * pWork)
 {
-    unsigned int extra_length_bits;    // Number of bits of extra literal length
-    unsigned int length_code;          // Length code
-    unsigned int value;
+    unsigned long extra_length_bits;    // Number of bits of extra literal length
+    unsigned long length_code;          // Length code
+    unsigned long value;
 
     // Test the current bit in byte buffer. If is not set, simply return the next 8 bits.
     if(pWork->bit_buff & 1)
     {
         // Remove one bit from the input data
         if(WasteBits(pWork, 1))
-            return 0x306;   
-                      
+            return 0x306;
+
         // The next 8 bits hold the index to the length code table
         length_code = pWork->LengthCodes[pWork->bit_buff & 0xFF];
-        
+
         // Remove the apropriate number of bits
         if(WasteBits(pWork, pWork->LenBits[length_code]))
             return 0x306;
@@ -290,7 +290,7 @@ static unsigned int DecodeLit(TDcmpStruct * pWork)
         // Are there some extra bits for the obtained length code ?
         if((extra_length_bits = pWork->ExLenBits[length_code]) != 0)
         {
-            unsigned int extra_length = pWork->bit_buff & ((1 << extra_length_bits) - 1);
+            unsigned long extra_length = pWork->bit_buff & ((1 << extra_length_bits) - 1);
 
             if(WasteBits(pWork, extra_length_bits))
             {
@@ -312,7 +312,7 @@ static unsigned int DecodeLit(TDcmpStruct * pWork)
     // If the binary compression type, read 8 bits and return them as one byte.
     if(pWork->ctype == CMP_BINARY)
     {
-        unsigned int uncompressed_byte = pWork->bit_buff & 0xFF;
+        unsigned long uncompressed_byte = pWork->bit_buff & 0xFF;
 
         if(WasteBits(pWork, 8))
             return 0x306;
@@ -357,11 +357,11 @@ static unsigned int DecodeLit(TDcmpStruct * pWork)
 // Decodes the distance of the repetition, backwards relative to the
 // current output buffer position
 
-static unsigned int DecodeDist(TDcmpStruct * pWork, unsigned int rep_length)
+static unsigned long DecodeDist(TDcmpStruct * pWork, unsigned long rep_length)
 {
-    unsigned int dist_pos_code;            // Distance position code
-    unsigned int dist_pos_bits;            // Number of bits of distance position
-    unsigned int distance;                 // Distance position
+    unsigned long dist_pos_code;            // Distance position code
+    unsigned long dist_pos_bits;            // Number of bits of distance position
+    unsigned long distance;                 // Distance position
 
     // Next 2-8 bits in the input buffer is the distance position code
     dist_pos_code = pWork->DistPosCodes[pWork->bit_buff & 0xFF];
@@ -388,10 +388,10 @@ static unsigned int DecodeDist(TDcmpStruct * pWork, unsigned int rep_length)
     return distance + 1;
 }
 
-static unsigned int Expand(TDcmpStruct * pWork)
+static unsigned long Expand(TDcmpStruct * pWork)
 {
-    unsigned int next_literal;         // Literal decoded from the compressed data
-    unsigned int result;               // Value to be returned
+    unsigned long next_literal;         // Literal decoded from the compressed data
+    unsigned long result;               // Value to be returned
     unsigned int copyBytes;             // Number of bytes to copy to the output buffer
 
     pWork->outputPos = 0x1000;          // Initialize output buffer position
@@ -412,8 +412,8 @@ static unsigned int Expand(TDcmpStruct * pWork)
         {
             unsigned char * source;
             unsigned char * target;
-            unsigned int rep_length;       // Length of the repetition, in bytes
-            unsigned int minus_dist;       // Backward distance to the repetition, relative to the current buffer position
+            unsigned long rep_length;       // Length of the repetition, in bytes
+            unsigned long minus_dist;       // Backward distance to the repetition, relative to the current buffer position
 
             // Get the length of the repeating sequence.
             // Note that the repeating block may overlap the current output position,
@@ -442,7 +442,7 @@ static unsigned int Expand(TDcmpStruct * pWork)
         {
             pWork->out_buff[pWork->outputPos++] = (unsigned char)next_literal;
         }
-    
+
         // Flush the output buffer, if number of extracted bytes has reached the end
         if(pWork->outputPos >= 0x2000)
         {
@@ -495,7 +495,7 @@ unsigned int explode(
     pWork->in_pos     = 3;                 // Position in input buffer
 
     // Test for the valid dictionary size
-    if(4 > pWork->dsize_bits || pWork->dsize_bits > 6) 
+    if(4 > pWork->dsize_bits || pWork->dsize_bits > 6)
         return CMP_INVALID_DICTSIZE;
 
     pWork->dsize_mask = 0xFFFF >> (0x10 - pWork->dsize_bits); // Shifted by 'sar' instruction
@@ -517,6 +517,6 @@ unsigned int explode(
     GenDecodeTabs(pWork->DistPosCodes, DistCode, pWork->DistBits, sizeof(pWork->DistBits));
     if(Expand(pWork) != 0x306)
         return CMP_NO_ERROR;
-        
+
     return CMP_ABORT;
 }
diff --git a/dep/StormLib/src/pklib/implode.c b/dep/StormLib/src/pklib/implode.c
index 1771b1862..fbbc6d8da 100644
--- a/dep/StormLib/src/pklib/implode.c
+++ b/dep/StormLib/src/pklib/implode.c
@@ -27,7 +27,7 @@
 //-----------------------------------------------------------------------------
 // Tables
 
-static unsigned char DistBits[] = 
+static unsigned char DistBits[] =
 {
     0x02, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
     0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
@@ -35,7 +35,7 @@ static unsigned char DistBits[] =
     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08
 };
 
-static unsigned char DistCode[] = 
+static unsigned char DistCode[] =
 {
     0x03, 0x0D, 0x05, 0x19, 0x09, 0x11, 0x01, 0x3E, 0x1E, 0x2E, 0x0E, 0x36, 0x16, 0x26, 0x06, 0x3A,
     0x1A, 0x2A, 0x0A, 0x32, 0x12, 0x22, 0x42, 0x02, 0x7C, 0x3C, 0x5C, 0x1C, 0x6C, 0x2C, 0x4C, 0x0C,
@@ -78,7 +78,7 @@ static unsigned char ChBitsAsc[] =
     0x0D, 0x0D, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D
 };
 
-static unsigned short ChCodeAsc[] = 
+static unsigned short ChCodeAsc[] =
 {
     0x0490, 0x0FE0, 0x07E0, 0x0BE0, 0x03E0, 0x0DE0, 0x05E0, 0x09E0,
     0x01E0, 0x00B8, 0x0062, 0x0EE0, 0x06E0, 0x0022, 0x0AE0, 0x02E0,
@@ -111,7 +111,7 @@ static unsigned short ChCodeAsc[] =
     0x0300, 0x0D40, 0x1D00, 0x0D00, 0x1500, 0x0540, 0x0500, 0x1900,
     0x0900, 0x0940, 0x1100, 0x0100, 0x1E00, 0x0E00, 0x0140, 0x1600,
     0x0600, 0x1A00, 0x0E40, 0x0640, 0x0A40, 0x0A00, 0x1200, 0x0200,
-    0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000  
+    0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000
 };
 
 //-----------------------------------------------------------------------------
@@ -140,7 +140,7 @@ static void SortBuffer(TCmpStruct * pWork, unsigned char * buffer_begin, unsigne
 
     // Zero the entire "phash_to_index" table
     memset(pWork->phash_to_index, 0, sizeof(pWork->phash_to_index));
-    
+
     // Step 1: Count amount of each PAIR_HASH in the input buffer
     // The table will look like this:
     //  offs 0x000: Number of occurences of PAIR_HASH 0
@@ -150,7 +150,7 @@ static void SortBuffer(TCmpStruct * pWork, unsigned char * buffer_begin, unsigne
     for(buffer_ptr = buffer_begin; buffer_ptr < buffer_end; buffer_ptr++)
         pWork->phash_to_index[BYTE_PAIR_HASH(buffer_ptr)]++;
 
-    // Step 2: Convert the table to the array of PAIR_HASH amounts. 
+    // Step 2: Convert the table to the array of PAIR_HASH amounts.
     // Each element contains count of PAIR_HASHes that is less or equal
     // to element index
     // The table will look like this:
@@ -218,7 +218,7 @@ static void OutputBits(TCmpStruct * pWork, unsigned int nbits, unsigned long bit
     {
         pWork->out_bytes++;
         bit_buff >>= (8 - out_bits);
-        
+
         pWork->out_buff[pWork->out_bytes] = (unsigned char)bit_buff;
         pWork->out_bits &= 7;
     }
@@ -236,7 +236,7 @@ static void OutputBits(TCmpStruct * pWork, unsigned int nbits, unsigned long bit
 
 // This function searches for a repetition
 // (a previous occurence of the current byte sequence)
-// Returns length of the repetition, and stores the backward distance 
+// Returns length of the repetition, and stores the backward distance
 // to pWork structure.
 static unsigned int FindRep(TCmpStruct * pWork, unsigned char * input_data)
 {
@@ -277,7 +277,7 @@ static unsigned int FindRep(TCmpStruct * pWork, unsigned char * input_data)
     phash_offs = pWork->phash_offs + phash_offs_index;
     prev_repetition = pWork->work_buff + phash_offs[0];
     repetition_limit = input_data - 1;
-    
+
     // If the current PAIR_HASH was not encountered before,
     // we haven't found a repetition.
     if(prev_repetition >= repetition_limit)
@@ -303,7 +303,7 @@ static unsigned int FindRep(TCmpStruct * pWork, unsigned char * input_data)
             {
                 prev_repetition++;
                 input_data_ptr++;
-                
+
                 // Are the bytes different ?
                 if(*prev_repetition != *input_data_ptr)
                     break;
@@ -399,7 +399,7 @@ static unsigned int FindRep(TCmpStruct * pWork, unsigned char * input_data)
         pWork->offs09BC[++offs_in_rep] = ++di_val;
     }
 
-    // 
+    //
     // Now go through all the repetitions from the first found one
     // to the current input data, and check if any of them migh be
     // a start of a greater sequence match.
@@ -408,7 +408,7 @@ static unsigned int FindRep(TCmpStruct * pWork, unsigned char * input_data)
     prev_repetition = pWork->work_buff + phash_offs[0];
     prev_rep_end = prev_repetition + rep_length;
     rep_length2 = rep_length;
-    
+
     for(;;)
     {
         rep_length2 = pWork->offs09BC[rep_length2];
@@ -502,7 +502,7 @@ static void WriteCmpData(TCmpStruct * pWork)
     unsigned int save_rep_length;           // Saved length of current repetition
     unsigned int save_distance = 0;         // Saved distance of current repetition
     unsigned int rep_length;                // Length of the found repetition
-    unsigned int phase = 0;                 // 
+    unsigned int phase = 0;                 //
 
     // Store the compression type and dictionary size
     pWork->out_buff[0] = (char)pWork->ctype;
@@ -542,12 +542,12 @@ static void WriteCmpData(TCmpStruct * pWork)
         input_data_end = pWork->work_buff + pWork->dsize_bytes + total_loaded;
         if(input_data_ended)
             input_data_end += 0x204;
-        
+
         //
         // Warning: The end of the buffer passed to "SortBuffer" is actually 2 bytes beyond
         // valid data. It is questionable if this is actually a bug or not,
         // but it might cause the compressed data output to be dependent on random bytes
-        // that are in the buffer. 
+        // that are in the buffer.
         // To prevent that, the calling application must always zero the compression
         // buffer before passing it to "implode"
         //
@@ -556,7 +556,7 @@ static void WriteCmpData(TCmpStruct * pWork)
         // previously compressed data, if any.
         switch(phase)
         {
-            case 0: 
+            case 0:
                 SortBuffer(pWork, input_data, input_data_end + 1);
                 phase++;
                 if(pWork->dsize_bytes != 0x1000)
diff --git a/dep/StormLib/src/pklib/pklib.h b/dep/StormLib/src/pklib/pklib.h
index f43da153b..eb18049ab 100644
--- a/dep/StormLib/src/pklib/pklib.h
+++ b/dep/StormLib/src/pklib/pklib.h
@@ -34,7 +34,7 @@
 
 #ifndef PKEXPORT
 #ifdef WIN32
-#define PKEXPORT  __cdecl                   // Use for normal __cdecl calling 
+#define PKEXPORT  __cdecl                   // Use for normal __cdecl calling
 #else
 #define PKEXPORT
 #endif
@@ -47,7 +47,7 @@
 typedef struct
 {
     unsigned int   distance;                // 0000: Backward distance of the currently found repetition, decreased by 1
-    unsigned int   out_bytes;               // 0004: # bytes available in out_buff            
+    unsigned int   out_bytes;               // 0004: # bytes available in out_buff
     unsigned int   out_bits;                // 0008: # of bits available in the last out byte
     unsigned int   dsize_bits;              // 000C: Number of bits needed for dictionary size. 4 = 0x400, 5 = 0x800, 6 = 0x1000
     unsigned int   dsize_mask;              // 0010: Bit mask for dictionary. 0x0F = 0x400, 0x1F = 0x800, 0x3F = 0x1000
@@ -57,14 +57,14 @@ typedef struct
     unsigned char  dist_codes[0x40];        // 005C: Distance codes
     unsigned char  nChBits[0x306];          // 009C: Table of literal bit lengths to be put to the output stream
     unsigned short nChCodes[0x306];         // 03A2: Table of literal codes to be put to the output stream
-    unsigned short offs09AE;                // 09AE: 
+    unsigned short offs09AE;                // 09AE:
 
     void         * param;                   // 09B0: User parameter
     unsigned int (*read_buf)(char *buf, unsigned int *size, void *param);  // 9B4
     void         (*write_buf)(char *buf, unsigned int *size, void *param); // 9B8
 
     unsigned short offs09BC[0x204];         // 09BC:
-    unsigned long  offs0DC4;                // 0DC4: 
+    unsigned long  offs0DC4;                // 0DC4:
     unsigned short phash_to_index[0x900];   // 0DC8: Array of indexes (one for each PAIR_HASH) to the "pair_hash_offsets" table
     unsigned short phash_to_index_end;      // 1FC8: End marker for "phash_to_index" table
     char           out_buff[0x802];         // 1FCA: Compressed data
@@ -101,15 +101,15 @@ typedef struct
     unsigned char in_buff[0x800];           // 2234: Buffer for data to be decompressed
     unsigned char DistPosCodes[0x100];      // 2A34: Table of distance position codes
     unsigned char LengthCodes[0x100];       // 2B34: Table of length codes
-    unsigned char offs2C34[0x100];          // 2C34: Buffer for 
-    unsigned char offs2D34[0x100];          // 2D34: Buffer for 
-    unsigned char offs2E34[0x80];           // 2EB4: Buffer for 
-    unsigned char offs2EB4[0x100];          // 2EB4: Buffer for 
-    unsigned char ChBitsAsc[0x100];         // 2FB4: Buffer for 
+    unsigned char offs2C34[0x100];          // 2C34: Buffer for
+    unsigned char offs2D34[0x100];          // 2D34: Buffer for
+    unsigned char offs2E34[0x80];           // 2EB4: Buffer for
+    unsigned char offs2EB4[0x100];          // 2EB4: Buffer for
+    unsigned char ChBitsAsc[0x100];         // 2FB4: Buffer for
     unsigned char DistBits[0x40];           // 30B4: Numbers of bytes to skip copied block length
     unsigned char LenBits[0x10];            // 30F4: Numbers of bits for skip copied block length
     unsigned char ExLenBits[0x10];          // 3104: Number of valid bits for copied block
-    unsigned short LenBase[0x10];           // 3114: Buffer for 
+    unsigned short LenBase[0x10];           // 3114: Buffer for
 } TDcmpStruct;
 
 #define EXP_BUFFER_SIZE sizeof(TDcmpStruct) // Size of decompression structure
diff --git a/dep/StormLib/src/sparse/sparse.cpp b/dep/StormLib/src/sparse/sparse.cpp
index dc988ba43..96f2efd70 100644
--- a/dep/StormLib/src/sparse/sparse.cpp
+++ b/dep/StormLib/src/sparse/sparse.cpp
@@ -14,24 +14,22 @@
 /* 19.11.03  1.01  Dan  Big endian handling                                  */
 /* 08.12.03  2.01  Dan  High-memory handling (> 0x80000000)                  */
 /*****************************************************************************/
- 
+
 #include <assert.h>
 #include <string.h>
- 
+
 #include "sparse.h"
 
 //-----------------------------------------------------------------------------
 // Public functions
 
-void CompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+void CompressSparse(unsigned char * pbOutBuffer, int * pcbOutBuffer, unsigned char * pbInBuffer, int cbInBuffer)
 {
-    unsigned char * pbOutBufferEnd = (unsigned char *)pvOutBuffer + *pcbOutBuffer;
-    unsigned char * pbInBufferEnd = (unsigned char *)pvInBuffer + cbInBuffer;
-    unsigned char * pbLastNonZero = (unsigned char *)pvInBuffer;
-    unsigned char * pbOutBuffer0 = (unsigned char *)pvOutBuffer;
-    unsigned char * pbInBuffPtr = (unsigned char *)pvInBuffer;
-    unsigned char * pbOutBuffer = (unsigned char *)pvOutBuffer;
-    unsigned char * pbInBuffer = (unsigned char *)pvInBuffer;
+    unsigned char * pbOutBufferEnd = pbOutBuffer + *pcbOutBuffer;
+    unsigned char * pbInBufferEnd = pbInBuffer + cbInBuffer;
+    unsigned char * pbLastNonZero = pbInBuffer;
+    unsigned char * pbOutBuffer0 = pbOutBuffer;
+    unsigned char * pbInBuffPtr = pbInBuffer;
     size_t NumberOfNonZeros;
     size_t NumberOfZeros;
 
@@ -88,7 +86,7 @@ void CompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, i
                 // Put marker that means "0x80 of nonzeros"
                 *pbOutBuffer++ = 0xFF;
                 memcpy(pbOutBuffer, pbInBuffer, 0x80);
-                
+
                 // Adjust counter of nonzeros and both pointers
                 NumberOfNonZeros -= 0x80;
                 pbOutBuffer += 0x80;
@@ -108,7 +106,7 @@ void CompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, i
                 // Put marker that means "1 nonzero byte"
                 *pbOutBuffer++ = 0x80;
                 memcpy(pbOutBuffer, pbInBuffer, 1);
-                
+
                 // Adjust counter of nonzeros and both pointers
                 NumberOfNonZeros--;
                 pbOutBuffer++;
@@ -185,7 +183,7 @@ void CompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, i
 
             // Put marker that means "Several zeros"
             *pbOutBuffer++ = (unsigned char)(NumberOfZeros - 3);
-    
+
             // Adjust pointer
             pbInBuffer += NumberOfZeros;
         }
@@ -210,7 +208,7 @@ void CompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, i
                 // Terminate with a marker that means "0x80 of nonzeros"
                 *pbOutBuffer++ = 0xFF;
                 memcpy(pbOutBuffer, pbInBuffer, NumberOfNonZeros);
-                
+
                 // Adjust pointer
                 pbOutBuffer += NumberOfNonZeros;
                 break;
@@ -236,11 +234,9 @@ void CompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, i
     *pcbOutBuffer = (int)(pbOutBuffer - pbOutBuffer0);
 }
 
-int DecompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer)
+int DecompressSparse(unsigned char * pbOutBuffer, int * pcbOutBuffer, unsigned char * pbInBuffer, int cbInBuffer)
 {
-    unsigned char * pbInBufferEnd = (unsigned char *)pvInBuffer + cbInBuffer;
-    unsigned char * pbOutBuffer = (unsigned char *)pvOutBuffer;
-    unsigned char * pbInBuffer = (unsigned char *)pvInBuffer;
+    unsigned char * pbInBufferEnd = pbInBuffer + cbInBuffer;
     unsigned int cbChunkSize;
     unsigned int cbOutBuffer = 0;
     unsigned int OneByte;
@@ -260,7 +256,7 @@ int DecompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer,
     cbOutBuffer |= (OneByte << 0x00);
 
     // Verify the size of the stream against the output buffer size
-    if(cbOutBuffer > (unsigned int)*pcbOutBuffer)
+    if(cbOutBuffer > *pcbOutBuffer)
         return 0;
 
     // Put the output size to the buffer
diff --git a/dep/StormLib/src/sparse/sparse.h b/dep/StormLib/src/sparse/sparse.h
index b1cd87299..032395f0b 100644
--- a/dep/StormLib/src/sparse/sparse.h
+++ b/dep/StormLib/src/sparse/sparse.h
@@ -13,7 +13,7 @@
 
 #include "../StormPort.h"
 
-void CompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer);
-int  DecompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer);
+void CompressSparse(unsigned char * pbOutBuffer, int * pcbOutLength, unsigned char * pbInBuffer, int cbInLength);
+int  DecompressSparse(unsigned char * pbOutBuffer, int * pcbOutLength, unsigned char * pbInBuffer, int cbInLength);
 
 #endif // __SPARSE_H__
diff --git a/dep/StormLib/src/zlib/adler32.c b/dep/StormLib/src/zlib/adler32.c
index 65ad6a5ad..007ba2627 100644
--- a/dep/StormLib/src/zlib/adler32.c
+++ b/dep/StormLib/src/zlib/adler32.c
@@ -1,15 +1,12 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2007 Mark Adler
+ * Copyright (C) 1995-2004 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* @(#) $Id$ */
 
-#include "zutil.h"
-
-#define local static
-
-local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);
+#define ZLIB_INTERNAL
+#include "zlib.h"
 
 #define BASE 65521UL    /* largest prime smaller than 65536 */
 #define NMAX 5552
@@ -128,10 +125,10 @@ uLong ZEXPORT adler32(adler, buf, len)
 }
 
 /* ========================================================================= */
-local uLong adler32_combine_(adler1, adler2, len2)
+uLong ZEXPORT adler32_combine(adler1, adler2, len2)
     uLong adler1;
     uLong adler2;
-    z_off64_t len2;
+    z_off_t len2;
 {
     unsigned long sum1;
     unsigned long sum2;
@@ -144,26 +141,9 @@ local uLong adler32_combine_(adler1, adler2, len2)
     MOD(sum2);
     sum1 += (adler2 & 0xffff) + BASE - 1;
     sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
-    if (sum1 >= BASE) sum1 -= BASE;
-    if (sum1 >= BASE) sum1 -= BASE;
-    if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
-    if (sum2 >= BASE) sum2 -= BASE;
+    if (sum1 > BASE) sum1 -= BASE;
+    if (sum1 > BASE) sum1 -= BASE;
+    if (sum2 > (BASE << 1)) sum2 -= (BASE << 1);
+    if (sum2 > BASE) sum2 -= BASE;
     return sum1 | (sum2 << 16);
 }
-
-/* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off_t len2;
-{
-    return adler32_combine_(adler1, adler2, len2);
-}
-
-uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
-    return adler32_combine_(adler1, adler2, len2);
-}
diff --git a/dep/StormLibOld/src/zlib/compress2.c b/dep/StormLib/src/zlib/compress2.c
similarity index 100%
rename from dep/StormLibOld/src/zlib/compress2.c
rename to dep/StormLib/src/zlib/compress2.c
diff --git a/dep/StormLib/src/zlib/crc32.c b/dep/StormLib/src/zlib/crc32.c
index 91be372d2..f658a9ef5 100644
--- a/dep/StormLib/src/zlib/crc32.c
+++ b/dep/StormLib/src/zlib/crc32.c
@@ -1,5 +1,5 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010 Mark Adler
+ * Copyright (C) 1995-2005 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
@@ -53,7 +53,7 @@
 
 /* Definitions for doing the crc four data bytes at a time. */
 #ifdef BYFOUR
-#  define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \
+#  define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \
                 (((w)&0xff00)<<8)+(((w)&0xff)<<24))
    local unsigned long crc32_little OF((unsigned long,
                         const unsigned char FAR *, unsigned));
@@ -68,8 +68,6 @@
 local unsigned long gf2_matrix_times OF((unsigned long *mat,
                                          unsigned long vec));
 local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2);
-
 
 #ifdef DYNAMIC_CRC_TABLE
 
@@ -221,7 +219,7 @@ const unsigned long FAR * ZEXPORT get_crc_table()
 unsigned long ZEXPORT crc32(crc, buf, len)
     unsigned long crc;
     const unsigned char FAR *buf;
-    uInt len;
+    unsigned len;
 {
     if (buf == Z_NULL) return 0UL;
 
@@ -369,22 +367,22 @@ local void gf2_matrix_square(square, mat)
 }
 
 /* ========================================================================= */
-local uLong crc32_combine_(crc1, crc2, len2)
+uLong ZEXPORT crc32_combine(crc1, crc2, len2)
     uLong crc1;
     uLong crc2;
-    z_off64_t len2;
+    z_off_t len2;
 {
     int n;
     unsigned long row;
     unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
     unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
 
-    /* degenerate case (also disallow negative lengths) */
-    if (len2 <= 0)
+    /* degenerate case */
+    if (len2 == 0)
         return crc1;
 
     /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
+    odd[0] = 0xedb88320L;           /* CRC-32 polynomial */
     row = 1;
     for (n = 1; n < GF2_DIM; n++) {
         odd[n] = row;
@@ -423,20 +421,3 @@ local uLong crc32_combine_(crc1, crc2, len2)
     crc1 ^= crc2;
     return crc1;
 }
-
-/* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
-}
-
-uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
-}
diff --git a/dep/StormLib/src/zlib/deflate.c b/dep/StormLib/src/zlib/deflate.c
index 5c4022f3d..29ce1f64a 100644
--- a/dep/StormLib/src/zlib/deflate.c
+++ b/dep/StormLib/src/zlib/deflate.c
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -79,18 +79,19 @@ local block_state deflate_fast   OF((deflate_state *s, int flush));
 #ifndef FASTEST
 local block_state deflate_slow   OF((deflate_state *s, int flush));
 #endif
-local block_state deflate_rle    OF((deflate_state *s, int flush));
-local block_state deflate_huff   OF((deflate_state *s, int flush));
 local void lm_init        OF((deflate_state *s));
 local void putShortMSB    OF((deflate_state *s, uInt b));
 local void flush_pending  OF((z_streamp strm));
 local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
+#ifndef FASTEST
 #ifdef ASMV
       void match_init OF((void)); /* asm code initialization */
       uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #else
 local uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #endif
+#endif
+local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));
 
 #ifdef DEBUG
 local  void check_match OF((deflate_state *s, IPos start, IPos match,
@@ -109,6 +110,11 @@ local  void check_match OF((deflate_state *s, IPos start, IPos match,
 #endif
 /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
 
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
 /* Values for max_lazy_match, good_match and max_chain_length, depending on
  * the desired pack level (0..9). The values given below have been tuned to
  * exclude worst case performance for pathological files. Better values may be
@@ -282,8 +288,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
     s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
 
-    s->high_water = 0;      /* nothing written to s->window yet */
-
     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
 
     overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
@@ -328,8 +332,8 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
         strm->adler = adler32(strm->adler, dictionary, dictLength);
 
     if (length < MIN_MATCH) return Z_OK;
-    if (length > s->w_size) {
-        length = s->w_size;
+    if (length > MAX_DIST(s)) {
+        length = MAX_DIST(s);
         dictionary += dictLength - length; /* use the tail of the dictionary */
     }
     zmemcpy(s->window, dictionary, length);
@@ -431,10 +435,9 @@ int ZEXPORT deflateParams(strm, level, strategy)
     }
     func = configuration_table[s->level].func;
 
-    if ((strategy != s->strategy || func != configuration_table[level].func) &&
-        strm->total_in != 0) {
+    if (func != configuration_table[level].func && strm->total_in != 0) {
         /* Flush the last buffer: */
-        err = deflate(strm, Z_BLOCK);
+        err = deflate(strm, Z_PARTIAL_FLUSH);
     }
     if (s->level != level) {
         s->level = level;
@@ -478,66 +481,33 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
  * resulting from using fixed blocks instead of stored blocks, which deflate
  * can emit on compressed data for some combinations of the parameters.
  *
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel.  But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
+ * This function could be more sophisticated to provide closer upper bounds
+ * for every combination of windowBits and memLevel, as well as wrap.
+ * But even the conservative upper bound of about 14% expansion does not
+ * seem onerous for output buffer allocation.
  */
 uLong ZEXPORT deflateBound(strm, sourceLen)
     z_streamp strm;
     uLong sourceLen;
 {
     deflate_state *s;
-    uLong complen, wraplen;
-    Bytef *str;
+    uLong destLen;
 
-    /* conservative upper bound for compressed data */
-    complen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
+    /* conservative upper bound */
+    destLen = sourceLen +
+              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11;
 
-    /* if can't get parameters, return conservative bound plus zlib wrapper */
+    /* if can't get parameters, return conservative bound */
     if (strm == Z_NULL || strm->state == Z_NULL)
-        return complen + 6;
-
-    /* compute wrapper length */
-    s = strm->state;
-    switch (s->wrap) {
-    case 0:                                 /* raw deflate */
-        wraplen = 0;
-        break;
-    case 1:                                 /* zlib wrapper */
-        wraplen = 6 + (s->strstart ? 4 : 0);
-        break;
-    case 2:                                 /* gzip wrapper */
-        wraplen = 18;
-        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
-            if (s->gzhead->extra != Z_NULL)
-                wraplen += 2 + s->gzhead->extra_len;
-            str = s->gzhead->name;
-            if (str != Z_NULL)
-                do {
-                    wraplen++;
-                } while (*str++);
-            str = s->gzhead->comment;
-            if (str != Z_NULL)
-                do {
-                    wraplen++;
-                } while (*str++);
-            if (s->gzhead->hcrc)
-                wraplen += 2;
-        }
-        break;
-    default:                                /* for compiler happiness */
-        wraplen = 6;
-    }
+        return destLen;
 
     /* if not default parameters, return conservative bound */
+    s = strm->state;
     if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return complen + wraplen;
+        return destLen;
 
     /* default settings: return tight bound for that case */
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13 - 6 + wraplen;
+    return compressBound(sourceLen);
 }
 
 /* =========================================================================
@@ -587,7 +557,7 @@ int ZEXPORT deflate (strm, flush)
     deflate_state *s;
 
     if (strm == Z_NULL || strm->state == Z_NULL ||
-        flush > Z_BLOCK || flush < 0) {
+        flush > Z_FINISH || flush < 0) {
         return Z_STREAM_ERROR;
     }
     s = strm->state;
@@ -611,7 +581,7 @@ int ZEXPORT deflate (strm, flush)
             put_byte(s, 31);
             put_byte(s, 139);
             put_byte(s, 8);
-            if (s->gzhead == Z_NULL) {
+            if (s->gzhead == NULL) {
                 put_byte(s, 0);
                 put_byte(s, 0);
                 put_byte(s, 0);
@@ -638,7 +608,7 @@ int ZEXPORT deflate (strm, flush)
                             (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
                              4 : 0));
                 put_byte(s, s->gzhead->os & 0xff);
-                if (s->gzhead->extra != Z_NULL) {
+                if (s->gzhead->extra != NULL) {
                     put_byte(s, s->gzhead->extra_len & 0xff);
                     put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
                 }
@@ -680,7 +650,7 @@ int ZEXPORT deflate (strm, flush)
     }
 #ifdef GZIP
     if (s->status == EXTRA_STATE) {
-        if (s->gzhead->extra != Z_NULL) {
+        if (s->gzhead->extra != NULL) {
             uInt beg = s->pending;  /* start of bytes to update crc */
 
             while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
@@ -708,7 +678,7 @@ int ZEXPORT deflate (strm, flush)
             s->status = NAME_STATE;
     }
     if (s->status == NAME_STATE) {
-        if (s->gzhead->name != Z_NULL) {
+        if (s->gzhead->name != NULL) {
             uInt beg = s->pending;  /* start of bytes to update crc */
             int val;
 
@@ -739,7 +709,7 @@ int ZEXPORT deflate (strm, flush)
             s->status = COMMENT_STATE;
     }
     if (s->status == COMMENT_STATE) {
-        if (s->gzhead->comment != Z_NULL) {
+        if (s->gzhead->comment != NULL) {
             uInt beg = s->pending;  /* start of bytes to update crc */
             int val;
 
@@ -817,9 +787,7 @@ int ZEXPORT deflate (strm, flush)
         (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
         block_state bstate;
 
-        bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
-                    (s->strategy == Z_RLE ? deflate_rle(s, flush) :
-                        (*(configuration_table[s->level].func))(s, flush));
+        bstate = (*(configuration_table[s->level].func))(s, flush);
 
         if (bstate == finish_started || bstate == finish_done) {
             s->status = FINISH_STATE;
@@ -840,17 +808,13 @@ int ZEXPORT deflate (strm, flush)
         if (bstate == block_done) {
             if (flush == Z_PARTIAL_FLUSH) {
                 _tr_align(s);
-            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
+            } else { /* FULL_FLUSH or SYNC_FLUSH */
                 _tr_stored_block(s, (char*)0, 0L, 0);
                 /* For a full flush, this empty block will be recognized
                  * as a special marker by inflate_sync().
                  */
                 if (flush == Z_FULL_FLUSH) {
                     CLEAR_HASH(s);             /* forget history */
-                    if (s->lookahead == 0) {
-                        s->strstart = 0;
-                        s->block_start = 0L;
-                    }
                 }
             }
             flush_pending(strm);
@@ -1203,13 +1167,12 @@ local uInt longest_match(s, cur_match)
     return s->lookahead;
 }
 #endif /* ASMV */
-
-#else /* FASTEST */
+#endif /* FASTEST */
 
 /* ---------------------------------------------------------------------------
- * Optimized version for FASTEST only
+ * Optimized version for level == 1 or strategy == Z_RLE only
  */
-local uInt longest_match(s, cur_match)
+local uInt longest_match_fast(s, cur_match)
     deflate_state *s;
     IPos cur_match;                             /* current match */
 {
@@ -1262,8 +1225,6 @@ local uInt longest_match(s, cur_match)
     return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
 }
 
-#endif /* FASTEST */
-
 #ifdef DEBUG
 /* ===========================================================================
  * Check that the match at match_start is indeed a match.
@@ -1342,6 +1303,7 @@ local void fill_window(s)
                later. (Using level 0 permanently is not an optimal usage of
                zlib, so we don't care about this pathological case.)
              */
+            /* %%% avoid this when Z_RLE */
             n = s->hash_size;
             p = &s->head[n];
             do {
@@ -1393,61 +1355,27 @@ local void fill_window(s)
          */
 
     } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-
-    /* If the WIN_INIT bytes after the end of the current data have never been
-     * written, then zero those bytes in order to avoid memory check reports of
-     * the use of uninitialized (or uninitialised as Julian writes) bytes by
-     * the longest match routines.  Update the high water mark for the next
-     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-     */
-    if (s->high_water < s->window_size) {
-        ulg curr = s->strstart + (ulg)(s->lookahead);
-        ulg init;
-
-        if (s->high_water < curr) {
-            /* Previous high water mark below current data -- zero WIN_INIT
-             * bytes or up to end of window, whichever is less.
-             */
-            init = s->window_size - curr;
-            if (init > WIN_INIT)
-                init = WIN_INIT;
-            zmemzero(s->window + curr, (unsigned)init);
-            s->high_water = curr + init;
-        }
-        else if (s->high_water < (ulg)curr + WIN_INIT) {
-            /* High water mark at or above current data, but below current data
-             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-             * to end of window, whichever is less.
-             */
-            init = (ulg)curr + WIN_INIT - s->high_water;
-            if (init > s->window_size - s->high_water)
-                init = s->window_size - s->high_water;
-            zmemzero(s->window + s->high_water, (unsigned)init);
-            s->high_water += init;
-        }
-    }
 }
 
 /* ===========================================================================
  * Flush the current block, with given end-of-file flag.
  * IN assertion: strstart is set to the end of the current match.
  */
-#define FLUSH_BLOCK_ONLY(s, last) { \
+#define FLUSH_BLOCK_ONLY(s, eof) { \
    _tr_flush_block(s, (s->block_start >= 0L ? \
                    (charf *)&s->window[(unsigned)s->block_start] : \
                    (charf *)Z_NULL), \
                 (ulg)((long)s->strstart - s->block_start), \
-                (last)); \
+                (eof)); \
    s->block_start = s->strstart; \
    flush_pending(s->strm); \
    Tracev((stderr,"[FLUSH]")); \
 }
 
 /* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, last) { \
-   FLUSH_BLOCK_ONLY(s, last); \
-   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
+#define FLUSH_BLOCK(s, eof) { \
+   FLUSH_BLOCK_ONLY(s, eof); \
+   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
 }
 
 /* ===========================================================================
@@ -1521,7 +1449,7 @@ local block_state deflate_fast(s, flush)
     deflate_state *s;
     int flush;
 {
-    IPos hash_head;       /* head of the hash chain */
+    IPos hash_head = NIL; /* head of the hash chain */
     int bflush;           /* set if current block must be flushed */
 
     for (;;) {
@@ -1541,7 +1469,6 @@ local block_state deflate_fast(s, flush)
         /* Insert the string window[strstart .. strstart+2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
-        hash_head = NIL;
         if (s->lookahead >= MIN_MATCH) {
             INSERT_STRING(s, s->strstart, hash_head);
         }
@@ -1554,8 +1481,19 @@ local block_state deflate_fast(s, flush)
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
              */
-            s->match_length = longest_match (s, hash_head);
-            /* longest_match() sets match_start */
+#ifdef FASTEST
+            if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) ||
+                (s->strategy == Z_RLE && s->strstart - hash_head == 1)) {
+                s->match_length = longest_match_fast (s, hash_head);
+            }
+#else
+            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
+                s->match_length = longest_match (s, hash_head);
+            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
+                s->match_length = longest_match_fast (s, hash_head);
+            }
+#endif
+            /* longest_match() or longest_match_fast() sets match_start */
         }
         if (s->match_length >= MIN_MATCH) {
             check_match(s, s->strstart, s->match_start, s->match_length);
@@ -1617,7 +1555,7 @@ local block_state deflate_slow(s, flush)
     deflate_state *s;
     int flush;
 {
-    IPos hash_head;          /* head of hash chain */
+    IPos hash_head = NIL;    /* head of hash chain */
     int bflush;              /* set if current block must be flushed */
 
     /* Process the input block. */
@@ -1638,7 +1576,6 @@ local block_state deflate_slow(s, flush)
         /* Insert the string window[strstart .. strstart+2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
-        hash_head = NIL;
         if (s->lookahead >= MIN_MATCH) {
             INSERT_STRING(s, s->strstart, hash_head);
         }
@@ -1654,8 +1591,12 @@ local block_state deflate_slow(s, flush)
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
              */
-            s->match_length = longest_match (s, hash_head);
-            /* longest_match() sets match_start */
+            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
+                s->match_length = longest_match (s, hash_head);
+            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
+                s->match_length = longest_match_fast (s, hash_head);
+            }
+            /* longest_match() or longest_match_fast() sets match_start */
 
             if (s->match_length <= 5 && (s->strategy == Z_FILTERED
 #if TOO_FAR <= 32767
@@ -1733,6 +1674,7 @@ local block_state deflate_slow(s, flush)
 }
 #endif /* FASTEST */
 
+#if 0
 /* ===========================================================================
  * For Z_RLE, simply look for runs of bytes, generate matches only of distance
  * one.  Do not maintain a hash table.  (It will be regenerated if this run of
@@ -1742,9 +1684,11 @@ local block_state deflate_rle(s, flush)
     deflate_state *s;
     int flush;
 {
-    int bflush;             /* set if current block must be flushed */
-    uInt prev;              /* byte at distance one to match */
-    Bytef *scan, *strend;   /* scan goes up to strend for length of run */
+    int bflush;         /* set if current block must be flushed */
+    uInt run;           /* length of run */
+    uInt max;           /* maximum length of run */
+    uInt prev;          /* byte at distance one to match */
+    Bytef *scan;        /* scan for end of run */
 
     for (;;) {
         /* Make sure that we always have enough lookahead, except
@@ -1760,33 +1704,23 @@ local block_state deflate_rle(s, flush)
         }
 
         /* See how many times the previous byte repeats */
-        s->match_length = 0;
-        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
+        run = 0;
+        if (s->strstart > 0) {      /* if there is a previous byte, that is */
+            max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH;
             scan = s->window + s->strstart - 1;
-            prev = *scan;
-            if (prev == *++scan && prev == *++scan && prev == *++scan) {
-                strend = s->window + s->strstart + MAX_MATCH;
-                do {
-                } while (prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         scan < strend);
-                s->match_length = MAX_MATCH - (int)(strend - scan);
-                if (s->match_length > s->lookahead)
-                    s->match_length = s->lookahead;
-            }
+            prev = *scan++;
+            do {
+                if (*scan++ != prev)
+                    break;
+            } while (++run < max);
         }
 
         /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->strstart - 1, s->match_length);
-
-            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-            s->strstart += s->match_length;
-            s->match_length = 0;
+        if (run >= MIN_MATCH) {
+            check_match(s, s->strstart, s->strstart - 1, run);
+            _tr_tally_dist(s, 1, run - MIN_MATCH, bflush);
+            s->lookahead -= run;
+            s->strstart += run;
         } else {
             /* No match, output a literal byte */
             Tracevv((stderr,"%c", s->window[s->strstart]));
@@ -1799,36 +1733,4 @@ local block_state deflate_rle(s, flush)
     FLUSH_BLOCK(s, flush == Z_FINISH);
     return flush == Z_FINISH ? finish_done : block_done;
 }
-
-/* ===========================================================================
- * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
- * (It will be regenerated if this run of deflate switches away from Huffman.)
- */
-local block_state deflate_huff(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    int bflush;             /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we have a literal to write. */
-        if (s->lookahead == 0) {
-            fill_window(s);
-            if (s->lookahead == 0) {
-                if (flush == Z_NO_FLUSH)
-                    return need_more;
-                break;      /* flush the current block */
-            }
-        }
-
-        /* Output a literal byte */
-        s->match_length = 0;
-        Tracevv((stderr,"%c", s->window[s->strstart]));
-        _tr_tally_lit (s, s->window[s->strstart], bflush);
-        s->lookahead--;
-        s->strstart++;
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
+#endif
diff --git a/dep/StormLib/src/zlib/deflate.h b/dep/StormLib/src/zlib/deflate.h
index cbf0d1ea5..05a5ab3a2 100644
--- a/dep/StormLib/src/zlib/deflate.h
+++ b/dep/StormLib/src/zlib/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2010 Jean-loup Gailly
+ * Copyright (C) 1995-2004 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -260,13 +260,6 @@ typedef struct internal_state {
      * are always zero.
      */
 
-    ulg high_water;
-    /* High water mark offset in window for initialized bytes -- bytes above
-     * this are set to zero in order to avoid memory check warnings when
-     * longest match routines access bytes past the input.  This is then
-     * updated to the new high water mark.
-     */
-
 } FAR deflate_state;
 
 /* Output a byte on the stream.
@@ -285,18 +278,14 @@ typedef struct internal_state {
  * distances are limited to MAX_DIST instead of WSIZE.
  */
 
-#define WIN_INIT MAX_MATCH
-/* Number of bytes after end of data in window to initialize in order to avoid
-   memory checker errors from longest match routines */
-
         /* in trees.c */
-void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
-int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
-void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
-void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
+void _tr_init         OF((deflate_state *s));
+int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
+void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
+                          int eof));
+void _tr_align        OF((deflate_state *s));
+void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
+                          int eof));
 
 #define d_code(dist) \
    ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
@@ -309,11 +298,11 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
 /* Inline versions of _tr_tally for speed: */
 
 #if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch ZLIB_INTERNAL _length_code[];
-  extern uch ZLIB_INTERNAL _dist_code[];
+  extern uch _length_code[];
+  extern uch _dist_code[];
 #else
-  extern const uch ZLIB_INTERNAL _length_code[];
-  extern const uch ZLIB_INTERNAL _dist_code[];
+  extern const uch _length_code[];
+  extern const uch _dist_code[];
 #endif
 
 # define _tr_tally_lit(s, c, flush) \
diff --git a/dep/StormLib/src/zlib/inffast.c b/dep/StormLib/src/zlib/inffast.c
index 2f1d60b43..bbee92ed1 100644
--- a/dep/StormLib/src/zlib/inffast.c
+++ b/dep/StormLib/src/zlib/inffast.c
@@ -1,5 +1,5 @@
 /* inffast.c -- fast decoding
- * Copyright (C) 1995-2008, 2010 Mark Adler
+ * Copyright (C) 1995-2004 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -64,7 +64,7 @@
       requires strm->avail_out >= 258 for each loop to avoid checking for
       output space.
  */
-void ZLIB_INTERNAL inflate_fast(strm, start)
+void inflate_fast(strm, start)
 z_streamp strm;
 unsigned start;         /* inflate()'s starting value for strm->avail_out */
 {
@@ -79,7 +79,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
 #endif
     unsigned wsize;             /* window size or zero if not using window */
     unsigned whave;             /* valid bytes in the window */
-    unsigned wnext;             /* window write index */
+    unsigned write;             /* window write index */
     unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
     unsigned long hold;         /* local strm->hold */
     unsigned bits;              /* local strm->bits */
@@ -87,7 +87,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     code const FAR *dcode;      /* local strm->distcode */
     unsigned lmask;             /* mask for first level of length codes */
     unsigned dmask;             /* mask for first level of distance codes */
-    code here;                  /* retrieved table entry */
+    code this;                  /* retrieved table entry */
     unsigned op;                /* code bits, operation, extra bits, or */
                                 /*  window position, window bytes to copy */
     unsigned len;               /* match length, unused bytes */
@@ -106,7 +106,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
 #endif
     wsize = state->wsize;
     whave = state->whave;
-    wnext = state->wnext;
+    write = state->write;
     window = state->window;
     hold = state->hold;
     bits = state->bits;
@@ -124,20 +124,20 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             hold += (unsigned long)(PUP(in)) << bits;
             bits += 8;
         }
-        here = lcode[hold & lmask];
+        this = lcode[hold & lmask];
       dolen:
-        op = (unsigned)(here.bits);
+        op = (unsigned)(this.bits);
         hold >>= op;
         bits -= op;
-        op = (unsigned)(here.op);
+        op = (unsigned)(this.op);
         if (op == 0) {                          /* literal */
-            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+            Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
                     "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", here.val));
-            PUP(out) = (unsigned char)(here.val);
+                    "inflate:         literal 0x%02x\n", this.val));
+            PUP(out) = (unsigned char)(this.val);
         }
         else if (op & 16) {                     /* length base */
-            len = (unsigned)(here.val);
+            len = (unsigned)(this.val);
             op &= 15;                           /* number of extra bits */
             if (op) {
                 if (bits < op) {
@@ -155,14 +155,14 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 hold += (unsigned long)(PUP(in)) << bits;
                 bits += 8;
             }
-            here = dcode[hold & dmask];
+            this = dcode[hold & dmask];
           dodist:
-            op = (unsigned)(here.bits);
+            op = (unsigned)(this.bits);
             hold >>= op;
             bits -= op;
-            op = (unsigned)(here.op);
+            op = (unsigned)(this.op);
             if (op & 16) {                      /* distance base */
-                dist = (unsigned)(here.val);
+                dist = (unsigned)(this.val);
                 op &= 15;                       /* number of extra bits */
                 if (bits < op) {
                     hold += (unsigned long)(PUP(in)) << bits;
@@ -187,34 +187,12 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 if (dist > op) {                /* see if copy from window */
                     op = dist - op;             /* distance back in window */
                     if (op > whave) {
-                        if (state->sane) {
-                            strm->msg =
-                                (char *)"invalid distance too far back";
-                            state->mode = BAD;
-                            break;
-                        }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                        if (len <= op - whave) {
-                            do {
-                                PUP(out) = 0;
-                            } while (--len);
-                            continue;
-                        }
-                        len -= op - whave;
-                        do {
-                            PUP(out) = 0;
-                        } while (--op > whave);
-                        if (op == 0) {
-                            from = out - dist;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--len);
-                            continue;
-                        }
-#endif
+                        strm->msg = (char *)"invalid distance too far back";
+                        state->mode = BAD;
+                        break;
                     }
                     from = window - OFF;
-                    if (wnext == 0) {           /* very common case */
+                    if (write == 0) {           /* very common case */
                         from += wsize - op;
                         if (op < len) {         /* some from window */
                             len -= op;
@@ -224,17 +202,17 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                             from = out - dist;  /* rest from output */
                         }
                     }
-                    else if (wnext < op) {      /* wrap around window */
-                        from += wsize + wnext - op;
-                        op -= wnext;
+                    else if (write < op) {      /* wrap around window */
+                        from += wsize + write - op;
+                        op -= write;
                         if (op < len) {         /* some from end of window */
                             len -= op;
                             do {
                                 PUP(out) = PUP(from);
                             } while (--op);
                             from = window - OFF;
-                            if (wnext < len) {  /* some from start of window */
-                                op = wnext;
+                            if (write < len) {  /* some from start of window */
+                                op = write;
                                 len -= op;
                                 do {
                                     PUP(out) = PUP(from);
@@ -244,7 +222,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                         }
                     }
                     else {                      /* contiguous in window */
-                        from += wnext - op;
+                        from += write - op;
                         if (op < len) {         /* some from window */
                             len -= op;
                             do {
@@ -281,7 +259,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 }
             }
             else if ((op & 64) == 0) {          /* 2nd level distance code */
-                here = dcode[here.val + (hold & ((1U << op) - 1))];
+                this = dcode[this.val + (hold & ((1U << op) - 1))];
                 goto dodist;
             }
             else {
@@ -291,7 +269,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             }
         }
         else if ((op & 64) == 0) {              /* 2nd level length code */
-            here = lcode[here.val + (hold & ((1U << op) - 1))];
+            this = lcode[this.val + (hold & ((1U << op) - 1))];
             goto dolen;
         }
         else if (op & 32) {                     /* end-of-block */
@@ -327,7 +305,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
    inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
    - Using bit fields for code structure
    - Different op definition to avoid & for extra bits (do & for table bits)
-   - Three separate decoding do-loops for direct, window, and wnext == 0
+   - Three separate decoding do-loops for direct, window, and write == 0
    - Special case for distance > 1 copies to do overlapped load and store copy
    - Explicit branch predictions (based on measured branch probabilities)
    - Deferring match copy and interspersed it with decoding subsequent codes
diff --git a/dep/StormLib/src/zlib/inffast.h b/dep/StormLib/src/zlib/inffast.h
index e5c1aa4ca..1e88d2d97 100644
--- a/dep/StormLib/src/zlib/inffast.h
+++ b/dep/StormLib/src/zlib/inffast.h
@@ -1,5 +1,5 @@
 /* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003, 2010 Mark Adler
+ * Copyright (C) 1995-2003 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -8,4 +8,4 @@
    subject to change. Applications should only use zlib.h.
  */
 
-void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
+void inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/dep/StormLib/src/zlib/inflate.c b/dep/StormLib/src/zlib/inflate.c
index a8431abea..792fdee8e 100644
--- a/dep/StormLib/src/zlib/inflate.c
+++ b/dep/StormLib/src/zlib/inflate.c
@@ -1,5 +1,5 @@
 /* inflate.c -- zlib decompression
- * Copyright (C) 1995-2010 Mark Adler
+ * Copyright (C) 1995-2005 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -45,7 +45,7 @@
  * - Rearrange window copies in inflate_fast() for speed and simplification
  * - Unroll last copy for window match in inflate_fast()
  * - Use local copies of window variables in inflate_fast() for speed
- * - Pull out common wnext == 0 case for speed in inflate_fast()
+ * - Pull out common write == 0 case for speed in inflate_fast()
  * - Make op and len in inflate_fast() unsigned for consistency
  * - Add FAR to lcode and dcode declarations in inflate_fast()
  * - Simplified bad distance check in inflate_fast()
@@ -117,52 +117,28 @@ z_streamp strm;
     state->head = Z_NULL;
     state->wsize = 0;
     state->whave = 0;
-    state->wnext = 0;
+    state->write = 0;
     state->hold = 0;
     state->bits = 0;
     state->lencode = state->distcode = state->next = state->codes;
-    state->sane = 1;
-    state->back = -1;
     Tracev((stderr, "inflate: reset\n"));
     return Z_OK;
 }
 
-int ZEXPORT inflateReset2(strm, windowBits)
+int ZEXPORT inflatePrime(strm, bits, value)
 z_streamp strm;
-int windowBits;
+int bits;
+int value;
 {
-    int wrap;
     struct inflate_state FAR *state;
 
-    /* get the state */
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
-
-    /* extract wrap request from windowBits parameter */
-    if (windowBits < 0) {
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-    else {
-        wrap = (windowBits >> 4) + 1;
-#ifdef GUNZIP
-        if (windowBits < 48)
-            windowBits &= 15;
-#endif
-    }
-
-    /* set number of window bits, free window if different */
-    if (windowBits && (windowBits < 8 || windowBits > 15))
-        return Z_STREAM_ERROR;
-    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
-        ZFREE(strm, state->window);
-        state->window = Z_NULL;
-    }
-
-    /* update state and reset the rest of it */
-    state->wrap = wrap;
-    state->wbits = (unsigned)windowBits;
-    return inflateReset(strm);
+    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
+    value &= (1L << bits) - 1;
+    state->hold += value << state->bits;
+    state->bits += bits;
+    return Z_OK;
 }
 
 int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
@@ -171,7 +147,6 @@ int windowBits;
 const char *version;
 int stream_size;
 {
-    int ret;
     struct inflate_state FAR *state;
 
     if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
@@ -189,13 +164,24 @@ int stream_size;
     if (state == Z_NULL) return Z_MEM_ERROR;
     Tracev((stderr, "inflate: allocated\n"));
     strm->state = (struct internal_state FAR *)state;
-    state->window = Z_NULL;
-    ret = inflateReset2(strm, windowBits);
-    if (ret != Z_OK) {
+    if (windowBits < 0) {
+        state->wrap = 0;
+        windowBits = -windowBits;
+    }
+    else {
+        state->wrap = (windowBits >> 4) + 1;
+#ifdef GUNZIP
+        if (windowBits < 48) windowBits &= 15;
+#endif
+    }
+    if (windowBits < 8 || windowBits > 15) {
         ZFREE(strm, state);
         strm->state = Z_NULL;
+        return Z_STREAM_ERROR;
     }
-    return ret;
+    state->wbits = (unsigned)windowBits;
+    state->window = Z_NULL;
+    return inflateReset(strm);
 }
 
 int ZEXPORT inflateInit_(strm, version, stream_size)
@@ -206,27 +192,6 @@ int stream_size;
     return inflateInit2_(strm, DEF_WBITS, version, stream_size);
 }
 
-int ZEXPORT inflatePrime(strm, bits, value)
-z_streamp strm;
-int bits;
-int value;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (bits < 0) {
-        state->hold = 0;
-        state->bits = 0;
-        return Z_OK;
-    }
-    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
-    value &= (1L << bits) - 1;
-    state->hold += value << state->bits;
-    state->bits += bits;
-    return Z_OK;
-}
-
 /*
    Return state with length and distance decoding tables and index sizes set to
    fixed code decoding.  Normally this returns fixed tables from inffixed.h.
@@ -375,7 +340,7 @@ unsigned out;
     /* if window not in use yet, initialize */
     if (state->wsize == 0) {
         state->wsize = 1U << state->wbits;
-        state->wnext = 0;
+        state->write = 0;
         state->whave = 0;
     }
 
@@ -383,22 +348,22 @@ unsigned out;
     copy = out - strm->avail_out;
     if (copy >= state->wsize) {
         zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
-        state->wnext = 0;
+        state->write = 0;
         state->whave = state->wsize;
     }
     else {
-        dist = state->wsize - state->wnext;
+        dist = state->wsize - state->write;
         if (dist > copy) dist = copy;
-        zmemcpy(state->window + state->wnext, strm->next_out - copy, dist);
+        zmemcpy(state->window + state->write, strm->next_out - copy, dist);
         copy -= dist;
         if (copy) {
             zmemcpy(state->window, strm->next_out - copy, copy);
-            state->wnext = copy;
+            state->write = copy;
             state->whave = state->wsize;
         }
         else {
-            state->wnext += dist;
-            if (state->wnext == state->wsize) state->wnext = 0;
+            state->write += dist;
+            if (state->write == state->wsize) state->write = 0;
             if (state->whave < state->wsize) state->whave += dist;
         }
     }
@@ -599,7 +564,7 @@ int flush;
     unsigned in, out;           /* save starting available input and output */
     unsigned copy;              /* number of stored or match bytes to copy */
     unsigned char FAR *from;    /* where to copy match bytes from */
-    code here;                  /* current decoding table entry */
+    code this;                  /* current decoding table entry */
     code last;                  /* parent table entry */
     unsigned len;               /* length to copy for repeats, bits to drop */
     int ret;                    /* return code */
@@ -654,9 +619,7 @@ int flush;
             }
             DROPBITS(4);
             len = BITS(4) + 8;
-            if (state->wbits == 0)
-                state->wbits = len;
-            else if (len > state->wbits) {
+            if (len > state->wbits) {
                 strm->msg = (char *)"invalid window size";
                 state->mode = BAD;
                 break;
@@ -808,7 +771,7 @@ int flush;
             strm->adler = state->check = adler32(0L, Z_NULL, 0);
             state->mode = TYPE;
         case TYPE:
-            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+            if (flush == Z_BLOCK) goto inf_leave;
         case TYPEDO:
             if (state->last) {
                 BYTEBITS();
@@ -828,11 +791,7 @@ int flush;
                 fixedtables(state);
                 Tracev((stderr, "inflate:     fixed codes block%s\n",
                         state->last ? " (last)" : ""));
-                state->mode = LEN_;             /* decode codes */
-                if (flush == Z_TREES) {
-                    DROPBITS(2);
-                    goto inf_leave;
-                }
+                state->mode = LEN;              /* decode codes */
                 break;
             case 2:                             /* dynamic block */
                 Tracev((stderr, "inflate:     dynamic codes block%s\n",
@@ -857,9 +816,6 @@ int flush;
             Tracev((stderr, "inflate:       stored length %u\n",
                     state->length));
             INITBITS();
-            state->mode = COPY_;
-            if (flush == Z_TREES) goto inf_leave;
-        case COPY_:
             state->mode = COPY;
         case COPY:
             copy = state->length;
@@ -920,19 +876,19 @@ int flush;
         case CODELENS:
             while (state->have < state->nlen + state->ndist) {
                 for (;;) {
-                    here = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(here.bits) <= bits) break;
+                    this = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(this.bits) <= bits) break;
                     PULLBYTE();
                 }
-                if (here.val < 16) {
-                    NEEDBITS(here.bits);
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
+                if (this.val < 16) {
+                    NEEDBITS(this.bits);
+                    DROPBITS(this.bits);
+                    state->lens[state->have++] = this.val;
                 }
                 else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
+                    if (this.val == 16) {
+                        NEEDBITS(this.bits + 2);
+                        DROPBITS(this.bits);
                         if (state->have == 0) {
                             strm->msg = (char *)"invalid bit length repeat";
                             state->mode = BAD;
@@ -942,16 +898,16 @@ int flush;
                         copy = 3 + BITS(2);
                         DROPBITS(2);
                     }
-                    else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
+                    else if (this.val == 17) {
+                        NEEDBITS(this.bits + 3);
+                        DROPBITS(this.bits);
                         len = 0;
                         copy = 3 + BITS(3);
                         DROPBITS(3);
                     }
                     else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
+                        NEEDBITS(this.bits + 7);
+                        DROPBITS(this.bits);
                         len = 0;
                         copy = 11 + BITS(7);
                         DROPBITS(7);
@@ -969,16 +925,7 @@ int flush;
             /* handle error breaks in while */
             if (state->mode == BAD) break;
 
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
-                state->mode = BAD;
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
-               concerning the ENOUGH constants, which depend on those values */
+            /* build code tables */
             state->next = state->codes;
             state->lencode = (code const FAR *)(state->next);
             state->lenbits = 9;
@@ -999,102 +946,88 @@ int flush;
                 break;
             }
             Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN_;
-            if (flush == Z_TREES) goto inf_leave;
-        case LEN_:
             state->mode = LEN;
         case LEN:
             if (have >= 6 && left >= 258) {
                 RESTORE();
                 inflate_fast(strm, out);
                 LOAD();
-                if (state->mode == TYPE)
-                    state->back = -1;
                 break;
             }
-            state->back = 0;
             for (;;) {
-                here = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(here.bits) <= bits) break;
+                this = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(this.bits) <= bits) break;
                 PULLBYTE();
             }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
+            if (this.op && (this.op & 0xf0) == 0) {
+                last = this;
                 for (;;) {
-                    here = state->lencode[last.val +
+                    this = state->lencode[last.val +
                             (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    if ((unsigned)(last.bits + this.bits) <= bits) break;
                     PULLBYTE();
                 }
                 DROPBITS(last.bits);
-                state->back += last.bits;
             }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            state->length = (unsigned)here.val;
-            if ((int)(here.op) == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+            DROPBITS(this.bits);
+            state->length = (unsigned)this.val;
+            if ((int)(this.op) == 0) {
+                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
                         "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
+                        "inflate:         literal 0x%02x\n", this.val));
                 state->mode = LIT;
                 break;
             }
-            if (here.op & 32) {
+            if (this.op & 32) {
                 Tracevv((stderr, "inflate:         end of block\n"));
-                state->back = -1;
                 state->mode = TYPE;
                 break;
             }
-            if (here.op & 64) {
+            if (this.op & 64) {
                 strm->msg = (char *)"invalid literal/length code";
                 state->mode = BAD;
                 break;
             }
-            state->extra = (unsigned)(here.op) & 15;
+            state->extra = (unsigned)(this.op) & 15;
             state->mode = LENEXT;
         case LENEXT:
             if (state->extra) {
                 NEEDBITS(state->extra);
                 state->length += BITS(state->extra);
                 DROPBITS(state->extra);
-                state->back += state->extra;
             }
             Tracevv((stderr, "inflate:         length %u\n", state->length));
-            state->was = state->length;
             state->mode = DIST;
         case DIST:
             for (;;) {
-                here = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(here.bits) <= bits) break;
+                this = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(this.bits) <= bits) break;
                 PULLBYTE();
             }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
+            if ((this.op & 0xf0) == 0) {
+                last = this;
                 for (;;) {
-                    here = state->distcode[last.val +
+                    this = state->distcode[last.val +
                             (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    if ((unsigned)(last.bits + this.bits) <= bits) break;
                     PULLBYTE();
                 }
                 DROPBITS(last.bits);
-                state->back += last.bits;
             }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            if (here.op & 64) {
+            DROPBITS(this.bits);
+            if (this.op & 64) {
                 strm->msg = (char *)"invalid distance code";
                 state->mode = BAD;
                 break;
             }
-            state->offset = (unsigned)here.val;
-            state->extra = (unsigned)(here.op) & 15;
+            state->offset = (unsigned)this.val;
+            state->extra = (unsigned)(this.op) & 15;
             state->mode = DISTEXT;
         case DISTEXT:
             if (state->extra) {
                 NEEDBITS(state->extra);
                 state->offset += BITS(state->extra);
                 DROPBITS(state->extra);
-                state->back += state->extra;
             }
 #ifdef INFLATE_STRICT
             if (state->offset > state->dmax) {
@@ -1103,6 +1036,11 @@ int flush;
                 break;
             }
 #endif
+            if (state->offset > state->whave + out - left) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
             Tracevv((stderr, "inflate:         distance %u\n", state->offset));
             state->mode = MATCH;
         case MATCH:
@@ -1110,32 +1048,12 @@ int flush;
             copy = out - left;
             if (state->offset > copy) {         /* copy from window */
                 copy = state->offset - copy;
-                if (copy > state->whave) {
-                    if (state->sane) {
-                        strm->msg = (char *)"invalid distance too far back";
-                        state->mode = BAD;
-                        break;
-                    }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                    Trace((stderr, "inflate.c too far\n"));
-                    copy -= state->whave;
-                    if (copy > state->length) copy = state->length;
-                    if (copy > left) copy = left;
-                    left -= copy;
-                    state->length -= copy;
-                    do {
-                        *put++ = 0;
-                    } while (--copy);
-                    if (state->length == 0) state->mode = LEN;
-                    break;
-#endif
-                }
-                if (copy > state->wnext) {
-                    copy -= state->wnext;
+                if (copy > state->write) {
+                    copy -= state->write;
                     from = state->window + (state->wsize - copy);
                 }
                 else
-                    from = state->window + (state->wnext - copy);
+                    from = state->window + (state->write - copy);
                 if (copy > state->length) copy = state->length;
             }
             else {                              /* copy from output */
@@ -1228,8 +1146,7 @@ int flush;
         strm->adler = state->check =
             UPDATE(state->check, strm->next_out - out, out);
     strm->data_type = state->bits + (state->last ? 64 : 0) +
-                      (state->mode == TYPE ? 128 : 0) +
-                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
+                      (state->mode == TYPE ? 128 : 0);
     if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
         ret = Z_BUF_ERROR;
     return ret;
@@ -1449,32 +1366,3 @@ z_streamp source;
     dest->state = (struct internal_state FAR *)copy;
     return Z_OK;
 }
-
-int ZEXPORT inflateUndermine(strm, subvert)
-z_streamp strm;
-int subvert;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    state->sane = !subvert;
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-    return Z_OK;
-#else
-    state->sane = 1;
-    return Z_DATA_ERROR;
-#endif
-}
-
-long ZEXPORT inflateMark(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
-    state = (struct inflate_state FAR *)strm->state;
-    return ((long)(state->back) << 16) +
-        (state->mode == COPY ? state->length :
-            (state->mode == MATCH ? state->was - state->length : 0));
-}
diff --git a/dep/StormLib/src/zlib/inflate.h b/dep/StormLib/src/zlib/inflate.h
index 95f4986d4..07bd3e78a 100644
--- a/dep/StormLib/src/zlib/inflate.h
+++ b/dep/StormLib/src/zlib/inflate.h
@@ -1,5 +1,5 @@
 /* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2009 Mark Adler
+ * Copyright (C) 1995-2004 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -32,13 +32,11 @@ typedef enum {
         TYPE,       /* i: waiting for type bits, including last-flag bit */
         TYPEDO,     /* i: same, but skip check to exit inflate on new block */
         STORED,     /* i: waiting for stored size (length and complement) */
-        COPY_,      /* i/o: same as COPY below, but only first time in */
         COPY,       /* i/o: waiting for input or output to copy stored block */
         TABLE,      /* i: waiting for dynamic block table lengths */
         LENLENS,    /* i: waiting for code length code lengths */
         CODELENS,   /* i: waiting for length/lit and distance code lengths */
-            LEN_,       /* i: same as LEN below, but only first time in */
-            LEN,        /* i: waiting for length/lit/eob code */
+            LEN,        /* i: waiting for length/lit code */
             LENEXT,     /* i: waiting for length extra bits */
             DIST,       /* i: waiting for distance code */
             DISTEXT,    /* i: waiting for distance extra bits */
@@ -55,21 +53,19 @@ typedef enum {
 /*
     State transitions between above modes -
 
-    (most modes can go to BAD or MEM on error -- not shown for clarity)
+    (most modes can go to the BAD or MEM mode -- not shown for clarity)
 
     Process header:
-        HEAD -> (gzip) or (zlib) or (raw)
-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
-                  HCRC -> TYPE
+        HEAD -> (gzip) or (zlib)
+        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME
+        NAME -> COMMENT -> HCRC -> TYPE
         (zlib) -> DICTID or TYPE
         DICTID -> DICT -> TYPE
-        (raw) -> TYPEDO
     Read deflate blocks:
-            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
-            STORED -> COPY_ -> COPY -> TYPE
-            TABLE -> LENLENS -> CODELENS -> LEN_
-            LEN_ -> LEN
-    Read deflate codes in fixed or dynamic block:
+            TYPE -> STORED or TABLE or LEN or CHECK
+            STORED -> COPY -> TYPE
+            TABLE -> LENLENS -> CODELENS -> LEN
+    Read deflate codes:
                 LEN -> LENEXT or LIT or TYPE
                 LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
                 LIT -> LEN
@@ -77,7 +73,7 @@ typedef enum {
         CHECK -> LENGTH -> DONE
  */
 
-/* state maintained between inflate() calls.  Approximately 10K bytes. */
+/* state maintained between inflate() calls.  Approximately 7K bytes. */
 struct inflate_state {
     inflate_mode mode;          /* current inflate mode */
     int last;                   /* true if processing last block */
@@ -92,7 +88,7 @@ struct inflate_state {
     unsigned wbits;             /* log base 2 of requested window size */
     unsigned wsize;             /* window size or zero if not using window */
     unsigned whave;             /* valid bytes in the window */
-    unsigned wnext;             /* window write index */
+    unsigned write;             /* window write index */
     unsigned char FAR *window;  /* allocated sliding window, if needed */
         /* bit accumulator */
     unsigned long hold;         /* input bit accumulator */
@@ -116,7 +112,4 @@ struct inflate_state {
     unsigned short lens[320];   /* temporary storage for code lengths */
     unsigned short work[288];   /* work area for code table building */
     code codes[ENOUGH];         /* space for code tables */
-    int sane;                   /* if false, allow invalid distance too far */
-    int back;                   /* bits back of last unprocessed length/lit */
-    unsigned was;               /* initial length of match */
 };
diff --git a/dep/StormLib/src/zlib/inftrees.c b/dep/StormLib/src/zlib/inftrees.c
index 11e9c52ac..8a9c13ff0 100644
--- a/dep/StormLib/src/zlib/inftrees.c
+++ b/dep/StormLib/src/zlib/inftrees.c
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2010 Mark Adler
+ * Copyright (C) 1995-2005 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.5 Copyright 1995-2010 Mark Adler ";
+   " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -29,7 +29,7 @@ const char inflate_copyright[] =
    table index bits.  It will differ if the request is greater than the
    longest code or if it is less than the shortest code.
  */
-int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
+int inflate_table(type, lens, codes, table, bits, work)
 codetype type;
 unsigned short FAR *lens;
 unsigned codes;
@@ -50,7 +50,7 @@ unsigned short FAR *work;
     unsigned fill;              /* index for replicating entries */
     unsigned low;               /* low bits for current root entry */
     unsigned mask;              /* mask for low root bits */
-    code here;                  /* table entry for duplication */
+    code this;                  /* table entry for duplication */
     code FAR *next;             /* next available space in table */
     const unsigned short FAR *base;     /* base value table to use */
     const unsigned short FAR *extra;    /* extra bits table to use */
@@ -62,7 +62,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
@@ -115,15 +115,15 @@ unsigned short FAR *work;
         if (count[max] != 0) break;
     if (root > max) root = max;
     if (max == 0) {                     /* no symbols to code at all */
-        here.op = (unsigned char)64;    /* invalid code marker */
-        here.bits = (unsigned char)1;
-        here.val = (unsigned short)0;
-        *(*table)++ = here;             /* make a table to force an error */
-        *(*table)++ = here;
+        this.op = (unsigned char)64;    /* invalid code marker */
+        this.bits = (unsigned char)1;
+        this.val = (unsigned short)0;
+        *(*table)++ = this;             /* make a table to force an error */
+        *(*table)++ = this;
         *bits = 1;
         return 0;     /* no symbols, but wait for decoding to report error */
     }
-    for (min = 1; min < max; min++)
+    for (min = 1; min <= MAXBITS; min++)
         if (count[min] != 0) break;
     if (root < min) root = min;
 
@@ -166,10 +166,11 @@ unsigned short FAR *work;
        entered in the tables.
 
        used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked for LENS and DIST tables against
-       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
-       the initial root table size constants.  See the comments in inftrees.h
-       for more information.
+       provided *table space.  It is checked when a LENS table is being made
+       against the space in *table, ENOUGH, minus the maximum space needed by
+       the worst case distance code, MAXD.  This should never happen, but the
+       sufficiency of ENOUGH has not been proven exhaustively, hence the check.
+       This assumes that when type == LENS, bits == 9.
 
        sym increments through all symbols, and the loop terminates when
        all codes of length max, i.e. all codes, have been processed.  This
@@ -208,25 +209,24 @@ unsigned short FAR *work;
     mask = used - 1;            /* mask for comparing low */
 
     /* check available table space */
-    if ((type == LENS && used >= ENOUGH_LENS) ||
-        (type == DISTS && used >= ENOUGH_DISTS))
+    if (type == LENS && used >= ENOUGH - MAXD)
         return 1;
 
     /* process all codes and make table entries */
     for (;;) {
         /* create table entry */
-        here.bits = (unsigned char)(len - drop);
+        this.bits = (unsigned char)(len - drop);
         if ((int)(work[sym]) < end) {
-            here.op = (unsigned char)0;
-            here.val = work[sym];
+            this.op = (unsigned char)0;
+            this.val = work[sym];
         }
         else if ((int)(work[sym]) > end) {
-            here.op = (unsigned char)(extra[work[sym]]);
-            here.val = base[work[sym]];
+            this.op = (unsigned char)(extra[work[sym]]);
+            this.val = base[work[sym]];
         }
         else {
-            here.op = (unsigned char)(32 + 64);         /* end of block */
-            here.val = 0;
+            this.op = (unsigned char)(32 + 64);         /* end of block */
+            this.val = 0;
         }
 
         /* replicate for those indices with low len bits equal to huff */
@@ -235,7 +235,7 @@ unsigned short FAR *work;
         min = fill;                 /* save offset to next table */
         do {
             fill -= incr;
-            next[(huff >> drop) + fill] = here;
+            next[(huff >> drop) + fill] = this;
         } while (fill != 0);
 
         /* backwards increment the len-bit code huff */
@@ -277,8 +277,7 @@ unsigned short FAR *work;
 
             /* check for enough space */
             used += 1U << curr;
-            if ((type == LENS && used >= ENOUGH_LENS) ||
-                (type == DISTS && used >= ENOUGH_DISTS))
+            if (type == LENS && used >= ENOUGH - MAXD)
                 return 1;
 
             /* point entry in root table to sub-table */
@@ -296,20 +295,20 @@ unsigned short FAR *work;
        through high index bits.  When the current sub-table is filled, the loop
        drops back to the root table to fill in any remaining entries there.
      */
-    here.op = (unsigned char)64;                /* invalid code marker */
-    here.bits = (unsigned char)(len - drop);
-    here.val = (unsigned short)0;
+    this.op = (unsigned char)64;                /* invalid code marker */
+    this.bits = (unsigned char)(len - drop);
+    this.val = (unsigned short)0;
     while (huff != 0) {
         /* when done with sub-table, drop back to root table */
         if (drop != 0 && (huff & mask) != low) {
             drop = 0;
             len = root;
             next = *table;
-            here.bits = (unsigned char)len;
+            this.bits = (unsigned char)len;
         }
 
         /* put invalid code marker in table */
-        next[huff >> drop] = here;
+        next[huff >> drop] = this;
 
         /* backwards increment the len-bit code huff */
         incr = 1U << (len - 1);
diff --git a/dep/StormLib/src/zlib/inftrees.h b/dep/StormLib/src/zlib/inftrees.h
index baa53a0b1..b1104c87e 100644
--- a/dep/StormLib/src/zlib/inftrees.h
+++ b/dep/StormLib/src/zlib/inftrees.h
@@ -1,5 +1,5 @@
 /* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005, 2010 Mark Adler
+ * Copyright (C) 1995-2005 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -35,28 +35,21 @@ typedef struct {
     01000000 - invalid code
  */
 
-/* Maximum size of the dynamic table.  The maximum number of code structures is
-   1444, which is the sum of 852 for literal/length codes and 592 for distance
-   codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distribtution.  The arguments to that
-   program are the number of symbols, the initial root table size, and the
-   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
-   The initial root table size (9 or 6) is found in the fifth argument of the
-   inflate_table() calls in inflate.c and infback.c.  If the root table size is
-   changed, then these maximum sizes would be need to be recalculated and
-   updated. */
-#define ENOUGH_LENS 852
-#define ENOUGH_DISTS 592
-#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
+/* Maximum size of dynamic tree.  The maximum found in a long but non-
+   exhaustive search was 1444 code structures (852 for length/literals
+   and 592 for distances, the latter actually the result of an
+   exhaustive search).  The true maximum is not known, but the value
+   below is more than safe. */
+#define ENOUGH 2048
+#define MAXD 592
 
-/* Type of code to build for inflate_table() */
+/* Type of code to build for inftable() */
 typedef enum {
     CODES,
     LENS,
     DISTS
 } codetype;
 
-int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
+extern int inflate_table OF((codetype type, unsigned short FAR *lens,
                              unsigned codes, code FAR * FAR *table,
                              unsigned FAR *bits, unsigned short FAR *work));
diff --git a/dep/StormLib/src/zlib/trees.c b/dep/StormLib/src/zlib/trees.c
index 56e9bb1c1..395e4e168 100644
--- a/dep/StormLib/src/zlib/trees.c
+++ b/dep/StormLib/src/zlib/trees.c
@@ -1,6 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2010 Jean-loup Gailly
- * detect_data_type() function provided freely by Cosmin Truta, 2006
+ * Copyright (C) 1995-2005 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -153,7 +152,7 @@ local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
                               int blcodes));
 local void compress_block OF((deflate_state *s, ct_data *ltree,
                               ct_data *dtree));
-local int  detect_data_type OF((deflate_state *s));
+local void set_data_type  OF((deflate_state *s));
 local unsigned bi_reverse OF((unsigned value, int length));
 local void bi_windup      OF((deflate_state *s));
 local void bi_flush       OF((deflate_state *s));
@@ -204,12 +203,12 @@ local void send_bits(s, value, length)
      * unused bits in value.
      */
     if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (ush)value << s->bi_valid;
+        s->bi_buf |= (value << s->bi_valid);
         put_short(s, s->bi_buf);
         s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
         s->bi_valid += length - Buf_size;
     } else {
-        s->bi_buf |= (ush)value << s->bi_valid;
+        s->bi_buf |= value << s->bi_valid;
         s->bi_valid += length;
     }
 }
@@ -219,12 +218,12 @@ local void send_bits(s, value, length)
 { int len = length;\
   if (s->bi_valid > (int)Buf_size - len) {\
     int val = value;\
-    s->bi_buf |= (ush)val << s->bi_valid;\
+    s->bi_buf |= (val << s->bi_valid);\
     put_short(s, s->bi_buf);\
     s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
     s->bi_valid += len - Buf_size;\
   } else {\
-    s->bi_buf |= (ush)(value) << s->bi_valid;\
+    s->bi_buf |= (value) << s->bi_valid;\
     s->bi_valid += len;\
   }\
 }
@@ -251,13 +250,11 @@ local void tr_static_init()
     if (static_init_done) return;
 
     /* For some embedded targets, global variables are not initialized: */
-#ifdef NO_INIT_GLOBAL_POINTERS
     static_l_desc.static_tree = static_ltree;
     static_l_desc.extra_bits = extra_lbits;
     static_d_desc.static_tree = static_dtree;
     static_d_desc.extra_bits = extra_dbits;
     static_bl_desc.extra_bits = extra_blbits;
-#endif
 
     /* Initialize the mapping length (0..255) -> length code (0..28) */
     length = 0;
@@ -351,14 +348,13 @@ void gen_trees_header()
                 static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
     }
 
-    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
+    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
     for (i = 0; i < DIST_CODE_LEN; i++) {
         fprintf(header, "%2u%s", _dist_code[i],
                 SEPARATOR(i, DIST_CODE_LEN-1, 20));
     }
 
-    fprintf(header,
-        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
     for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
         fprintf(header, "%2u%s", _length_code[i],
                 SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
@@ -383,7 +379,7 @@ void gen_trees_header()
 /* ===========================================================================
  * Initialize the tree data structures for a new zlib stream.
  */
-void ZLIB_INTERNAL _tr_init(s)
+void _tr_init(s)
     deflate_state *s;
 {
     tr_static_init();
@@ -868,13 +864,13 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
 /* ===========================================================================
  * Send a stored block
  */
-void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
+void _tr_stored_block(s, buf, stored_len, eof)
     deflate_state *s;
     charf *buf;       /* input block */
     ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
+    int eof;          /* true if this is the last block for a file */
 {
-    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
+    send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
 #ifdef DEBUG
     s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
     s->compressed_len += (stored_len + 4) << 3;
@@ -893,7 +889,7 @@ void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
  * To simplify the code, we assume the worst case of last real code encoded
  * on one bit only.
  */
-void ZLIB_INTERNAL _tr_align(s)
+void _tr_align(s)
     deflate_state *s;
 {
     send_bits(s, STATIC_TREES<<1, 3);
@@ -922,11 +918,11 @@ void ZLIB_INTERNAL _tr_align(s)
  * Determine the best encoding for the current block: dynamic trees, static
  * trees or store, and output the encoded block to the zip file.
  */
-void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
+void _tr_flush_block(s, buf, stored_len, eof)
     deflate_state *s;
     charf *buf;       /* input block, or NULL if too old */
     ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
+    int eof;          /* true if this is the last block for a file */
 {
     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
     int max_blindex = 0;  /* index of last bit length code of non zero freq */
@@ -935,8 +931,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
     if (s->level > 0) {
 
         /* Check if the file is binary or text */
-        if (s->strm->data_type == Z_UNKNOWN)
-            s->strm->data_type = detect_data_type(s);
+        if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN)
+            set_data_type(s);
 
         /* Construct the literal and distance trees */
         build_tree(s, (tree_desc *)(&(s->l_desc)));
@@ -982,20 +978,20 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
          * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
          * transform a block into a stored block.
          */
-        _tr_stored_block(s, buf, stored_len, last);
+        _tr_stored_block(s, buf, stored_len, eof);
 
 #ifdef FORCE_STATIC
     } else if (static_lenb >= 0) { /* force static trees */
 #else
     } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
 #endif
-        send_bits(s, (STATIC_TREES<<1)+last, 3);
+        send_bits(s, (STATIC_TREES<<1)+eof, 3);
         compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
 #ifdef DEBUG
         s->compressed_len += 3 + s->static_len;
 #endif
     } else {
-        send_bits(s, (DYN_TREES<<1)+last, 3);
+        send_bits(s, (DYN_TREES<<1)+eof, 3);
         send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
                        max_blindex+1);
         compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
@@ -1009,21 +1005,21 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
      */
     init_block(s);
 
-    if (last) {
+    if (eof) {
         bi_windup(s);
 #ifdef DEBUG
         s->compressed_len += 7;  /* align on byte boundary */
 #endif
     }
     Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*last));
+           s->compressed_len-7*eof));
 }
 
 /* ===========================================================================
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */
-int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+int _tr_tally (s, dist, lc)
     deflate_state *s;
     unsigned dist;  /* distance of matched string */
     unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
@@ -1122,45 +1118,24 @@ local void compress_block(s, ltree, dtree)
 }
 
 /* ===========================================================================
- * Check if the data type is TEXT or BINARY, using the following algorithm:
- * - TEXT if the two conditions below are satisfied:
- *    a) There are no non-portable control characters belonging to the
- *       "black list" (0..6, 14..25, 28..31).
- *    b) There is at least one printable character belonging to the
- *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
- * - BINARY otherwise.
- * - The following partially-portable control characters form a
- *   "gray list" that is ignored in this detection algorithm:
- *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
+ * Set the data type to BINARY or TEXT, using a crude approximation:
+ * set it to Z_TEXT if all symbols are either printable characters (33 to 255)
+ * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise.
  * IN assertion: the fields Freq of dyn_ltree are set.
  */
-local int detect_data_type(s)
+local void set_data_type(s)
     deflate_state *s;
 {
-    /* black_mask is the bit mask of black-listed bytes
-     * set bits 0..6, 14..25, and 28..31
-     * 0xf3ffc07f = binary 11110011111111111100000001111111
-     */
-    unsigned long black_mask = 0xf3ffc07fUL;
     int n;
 
-    /* Check for non-textual ("black-listed") bytes. */
-    for (n = 0; n <= 31; n++, black_mask >>= 1)
-        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
-            return Z_BINARY;
-
-    /* Check for textual ("white-listed") bytes. */
-    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
-            || s->dyn_ltree[13].Freq != 0)
-        return Z_TEXT;
-    for (n = 32; n < LITERALS; n++)
+    for (n = 0; n < 9; n++)
         if (s->dyn_ltree[n].Freq != 0)
-            return Z_TEXT;
-
-    /* There are no "black-listed" or "white-listed" bytes:
-     * this stream either is empty or has tolerated ("gray-listed") bytes only.
-     */
-    return Z_BINARY;
+            break;
+    if (n == 9)
+        for (n = 14; n < 32; n++)
+            if (s->dyn_ltree[n].Freq != 0)
+                break;
+    s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY;
 }
 
 /* ===========================================================================
diff --git a/dep/StormLib/src/zlib/trees.h b/dep/StormLib/src/zlib/trees.h
index d35639d82..72facf900 100644
--- a/dep/StormLib/src/zlib/trees.h
+++ b/dep/StormLib/src/zlib/trees.h
@@ -70,7 +70,7 @@ local const ct_data static_dtree[D_CODES] = {
 {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
 };
 
-const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
+const uch _dist_code[DIST_CODE_LEN] = {
  0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
@@ -99,7 +99,7 @@ const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
 };
 
-const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
+const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
  0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
diff --git a/dep/StormLib/src/zlib/zconf.h b/dep/StormLib/src/zlib/zconf.h
index 02ce56c43..03a9431c8 100644
--- a/dep/StormLib/src/zlib/zconf.h
+++ b/dep/StormLib/src/zlib/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -11,124 +11,52 @@
 /*
  * If you *really* need a unique prefix for all types and library functions,
  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
  */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-
-/* all linked symbols */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateInit2_         z_deflateInit2_
+#ifdef Z_PREFIX
 #  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  define gz_error              z_gz_error
-#  define gz_intmax             z_gz_intmax
-#  define gz_strwinerror        z_gz_strwinerror
-#  define gzbuffer              z_gzbuffer
-#  define gzclearerr            z_gzclearerr
-#  define gzclose               z_gzclose
-#  define gzclose_r             z_gzclose_r
-#  define gzclose_w             z_gzclose_w
-#  define gzdirect              z_gzdirect
-#  define gzdopen               z_gzdopen
-#  define gzeof                 z_gzeof
-#  define gzerror               z_gzerror
-#  define gzflush               z_gzflush
-#  define gzgetc                z_gzgetc
-#  define gzgets                z_gzgets
-#  define gzoffset              z_gzoffset
-#  define gzoffset64            z_gzoffset64
-#  define gzopen                z_gzopen
-#  define gzopen64              z_gzopen64
-#  define gzprintf              z_gzprintf
-#  define gzputc                z_gzputc
-#  define gzputs                z_gzputs
-#  define gzread                z_gzread
-#  define gzrewind              z_gzrewind
-#  define gzseek                z_gzseek
-#  define gzseek64              z_gzseek64
-#  define gzsetparams           z_gzsetparams
-#  define gztell                z_gztell
-#  define gztell64              z_gztell64
-#  define gzungetc              z_gzungetc
-#  define gzwrite               z_gzwrite
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit2_         z_inflateInit2_
+#  define deflate               z_deflate
+#  define deflateEnd            z_deflateEnd
 #  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
+#  define inflate               z_inflate
+#  define inflateEnd            z_inflateEnd
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateCopy           z_deflateCopy
+#  define deflateReset          z_deflateReset
+#  define deflateParams         z_deflateParams
+#  define deflateBound          z_deflateBound
+#  define deflatePrime          z_deflatePrime
+#  define inflateInit2_         z_inflateInit2_
 #  define inflateSetDictionary  z_inflateSetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
+#  define inflateCopy           z_inflateCopy
+#  define inflateReset          z_inflateReset
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define compress              z_compress
+#  define compress2             z_compress2
+#  define compressBound         z_compressBound
 #  define uncompress            z_uncompress
+#  define adler32               z_adler32
+#  define crc32                 z_crc32
+#  define get_crc_table         z_get_crc_table
 #  define zError                z_zError
-#  define zcalloc               z_zcalloc
-#  define zcfree                z_zcfree
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
 
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
 #  define alloc_func            z_alloc_func
-#  define charf                 z_charf
 #  define free_func             z_free_func
-#  define gzFile                z_gzFile
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
 #  define in_func               z_in_func
-#  define intf                  z_intf
 #  define out_func              z_out_func
+#  define Byte                  z_Byte
 #  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
 #  define uLong                 z_uLong
+#  define Bytef                 z_Bytef
+#  define charf                 z_charf
+#  define intf                  z_intf
+#  define uIntf                 z_uIntf
 #  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
 #  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
+#  define voidp                 z_voidp
 #endif
 
 #if defined(__MSDOS__) && !defined(MSDOS)
@@ -356,73 +284,49 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef STDC
-#  include <sys/types.h>    /* for off_t */
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#  include <unistd.h>       /* for SEEK_* and off_t */
+#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
+#  include <sys/types.h> /* for off_t */
+#  include <unistd.h>    /* for SEEK_* and off_t */
 #  ifdef VMS
-#    include <unixio.h>     /* for off_t */
-#  endif
-#  ifndef z_off_t
-#    define z_off_t off_t
+#    include <unixio.h>   /* for off_t */
 #  endif
+#  define z_off_t off_t
 #endif
-
 #ifndef SEEK_SET
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
 #endif
-
 #ifndef z_off_t
 #  define z_off_t long
 #endif
 
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-#  define z_off64_t off64_t
-#else
-#  define z_off64_t z_off_t
-#endif
-
 #if defined(__OS400__)
 #  define NO_vsnprintf
 #endif
 
 #if defined(__MVS__)
 #  define NO_vsnprintf
+#  ifdef FAR
+#    undef FAR
+#  endif
 #endif
 
 /* MVS linker does not support external names larger than 8 bytes */
 #if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
+#   pragma map(deflateInit_,"DEIN")
+#   pragma map(deflateInit2_,"DEIN2")
+#   pragma map(deflateEnd,"DEEND")
+#   pragma map(deflateBound,"DEBND")
+#   pragma map(inflateInit_,"ININ")
+#   pragma map(inflateInit2_,"ININ2")
+#   pragma map(inflateEnd,"INEND")
+#   pragma map(inflateSync,"INSY")
+#   pragma map(inflateSetDictionary,"INSEDI")
+#   pragma map(compressBound,"CMBND")
+#   pragma map(inflate_table,"INTABL")
+#   pragma map(inflate_fast,"INFA")
+#   pragma map(inflate_copyright,"INCOPY")
 #endif
 
 #endif /* ZCONF_H */
diff --git a/dep/StormLib/src/zlib/zlib.h b/dep/StormLib/src/zlib/zlib.h
index bfbba83e8..022817927 100644
--- a/dep/StormLib/src/zlib/zlib.h
+++ b/dep/StormLib/src/zlib/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.5, April 19th, 2010
+  version 1.2.3, July 18th, 2005
 
-  Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -37,44 +37,41 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.5"
-#define ZLIB_VERNUM 0x1250
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 5
-#define ZLIB_VER_SUBREVISION 0
+#define ZLIB_VERSION "1.2.3"
+#define ZLIB_VERNUM 0x1230
 
 /*
-    The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed data.
-  This version of the library supports only one compression method (deflation)
-  but other algorithms will be added later and will have the same stream
-  interface.
+     The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed
+  data.  This version of the library supports only one compression method
+  (deflation) but other algorithms will be added later and will have the same
+  stream interface.
 
-    Compression can be done in a single step if the buffers are large enough,
-  or can be done by repeated calls of the compression function.  In the latter
-  case, the application must provide more input and/or consume the output
+     Compression can be done in a single step if the buffers are large
+  enough (for example if an input file is mmap'ed), or can be done by
+  repeated calls of the compression function.  In the latter case, the
+  application must provide more input and/or consume the output
   (providing more output space) before each call.
 
-    The compressed data format used by default by the in-memory functions is
+     The compressed data format used by default by the in-memory functions is
   the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
   around a deflate stream, which is itself documented in RFC 1951.
 
-    The library also supports reading and writing files in gzip (.gz) format
+     The library also supports reading and writing files in gzip (.gz) format
   with an interface similar to that of stdio using the functions that start
   with "gz".  The gzip format is different from the zlib format.  gzip is a
   gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
 
-    This library can optionally read and write gzip streams in memory as well.
+     This library can optionally read and write gzip streams in memory as well.
 
-    The zlib format was designed to be compact and fast for use in memory
+     The zlib format was designed to be compact and fast for use in memory
   and on communications channels.  The gzip format was designed for single-
   file compression on file systems, has a larger header than zlib to maintain
   directory information, and uses a different, slower check method than zlib.
 
-    The library does not install any signal handler.  The decoder checks
-  the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
+     The library does not install any signal handler. The decoder checks
+  the consistency of the compressed data, so the library should never
+  crash even in case of corrupted input.
 */
 
 typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
@@ -129,45 +126,45 @@ typedef struct gz_header_s {
 typedef gz_header FAR *gz_headerp;
 
 /*
-     The application must update next_in and avail_in when avail_in has dropped
-   to zero.  It must update next_out and avail_out when avail_out has dropped
-   to zero.  The application must initialize zalloc, zfree and opaque before
-   calling the init function.  All other fields are set by the compression
-   library and must not be updated by the application.
+   The application must update next_in and avail_in when avail_in has
+   dropped to zero. It must update next_out and avail_out when avail_out
+   has dropped to zero. The application must initialize zalloc, zfree and
+   opaque before calling the init function. All other fields are set by the
+   compression library and must not be updated by the application.
 
-     The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree.  This can be useful for custom
-   memory management.  The compression library attaches no meaning to the
+   The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree. This can be useful for custom
+   memory management. The compression library attaches no meaning to the
    opaque value.
 
-     zalloc must return Z_NULL if there is not enough memory for the object.
+   zalloc must return Z_NULL if there is not enough memory for the object.
    If zlib is used in a multi-threaded application, zalloc and zfree must be
    thread safe.
 
-     On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this if
-   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
-   returned by zalloc for objects of exactly 65536 bytes *must* have their
-   offset normalized to zero.  The default allocation function provided by this
-   library ensures this (see zutil.c).  To reduce memory requirements and avoid
-   any allocation of 64K objects, at the expense of compression ratio, compile
-   the library with -DMAX_WBITS=14 (see zconf.h).
+   On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this
+   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+   pointers returned by zalloc for objects of exactly 65536 bytes *must*
+   have their offset normalized to zero. The default allocation function
+   provided by this library ensures this (see zutil.c). To reduce memory
+   requirements and avoid any allocation of 64K objects, at the expense of
+   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
 
-     The fields total_in and total_out can be used for statistics or progress
-   reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
-   if the decompressor wants to decompress everything in a single step).
+   The fields total_in and total_out can be used for statistics or
+   progress reports. After compression, total_in holds the total size of
+   the uncompressed data and may be saved for use in the decompressor
+   (particularly if the decompressor wants to decompress everything in
+   a single step).
 */
 
                         /* constants */
 
 #define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
+#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
 #define Z_SYNC_FLUSH    2
 #define Z_FULL_FLUSH    3
 #define Z_FINISH        4
 #define Z_BLOCK         5
-#define Z_TREES         6
 /* Allowed flush values; see deflate() and inflate() below for details */
 
 #define Z_OK            0
@@ -179,8 +176,8 @@ typedef gz_header FAR *gz_headerp;
 #define Z_MEM_ERROR    (-4)
 #define Z_BUF_ERROR    (-5)
 #define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
+/* Return codes for the compression/decompression functions. Negative
+ * values are errors, positive values are used for special but normal events.
  */
 
 #define Z_NO_COMPRESSION         0
@@ -210,140 +207,119 @@ typedef gz_header FAR *gz_headerp;
 #define zlib_version zlibVersion()
 /* for compatibility with versions < 1.0.2 */
 
-
                         /* basic functions */
 
 ZEXTERN const char * ZEXPORT zlibVersion OF((void));
 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is not
-   compatible with the zlib.h header file used by the application.  This check
-   is automatically made by deflateInit and inflateInit.
+   If the first character differs, the library code actually used is
+   not compatible with the zlib.h header file used by the application.
+   This check is automatically made by deflateInit and inflateInit.
  */
 
 /*
 ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
 
-     Initializes the internal stream state for compression.  The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
-   allocation functions.
+     Initializes the internal stream state for compression. The fields
+   zalloc, zfree and opaque must be initialized before by the caller.
+   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
+   use default allocation functions.
 
      The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at all
-   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
-   requests a default compromise between speed and compression (currently
-   equivalent to level 6).
+   1 gives best speed, 9 gives best compression, 0 gives no compression at
+   all (the input data is simply copied a block at a time).
+   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+   compression (currently equivalent to level 6).
 
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if level is not a valid compression level, or
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
    Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
-   if there is no error message.  deflateInit does not perform any compression:
-   this will be done by deflate().
+   with the version assumed by the caller (ZLIB_VERSION).
+   msg is set to null if there is no error message.  deflateInit does not
+   perform any compression: this will be done by deflate().
 */
 
 
 ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 /*
     deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
+  buffer becomes empty or the output buffer becomes full. It may introduce some
+  output latency (reading input without producing any output) except when
   forced to flush.
 
-    The detailed semantics are as follows.  deflate performs one or both of the
+    The detailed semantics are as follows. deflate performs one or both of the
   following actions:
 
   - Compress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
+    accordingly. If not all input can be processed (because there is not
     enough room in the output buffer), next_in and avail_in are updated and
     processing will resume at this point for the next call of deflate().
 
   - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  This action is forced if the parameter flush is non zero.
+    accordingly. This action is forced if the parameter flush is non zero.
     Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
-    output may be provided even if flush is not set.
+    should be set only when necessary (in interactive applications).
+    Some output may be provided even if flush is not set.
 
-    Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating avail_in or avail_out accordingly; avail_out should
-  never be zero before the call.  The application can consume the compressed
-  output when it wants, for example when the output buffer is full (avail_out
-  == 0), or after each call of deflate().  If deflate returns Z_OK and with
-  zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
+  Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming
+  more output, and updating avail_in or avail_out accordingly; avail_out
+  should never be zero before the call. The application can consume the
+  compressed output when it wants, for example when the output buffer is full
+  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+  and with zero avail_out, it must be called again after making room in the
+  output buffer because there might be more output pending.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumulate before producing output, in order to
+  decide how much data to accumualte before producing output, in order to
   maximize compression.
 
     If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
   flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far.  (In
-  particular avail_in is zero after the call if enough output space has been
-  provided before the call.) Flushing may degrade compression for some
-  compression algorithms and so it should be used only when necessary.  This
-  completes the current deflate block and follows it with an empty stored block
-  that is three bits plus filler bits to the next byte, followed by four bytes
-  (00 00 ff ff).
-
-    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
-  output buffer, but the output is not aligned to a byte boundary.  All of the
-  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
-  This completes the current deflate block and follows it with an empty fixed
-  codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
-  block.
-
-    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
-  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
-  seven bits of the current block are held to be written as the next byte after
-  the next deflate block is completed.  In this case, the decompressor may not
-  be provided enough bits at this point in order to complete decompression of
-  the data provided so far to the compressor.  It may need to wait for the next
-  block to be emitted.  This is for advanced applications that need to control
-  the emission of deflate blocks.
+  that the decompressor can get all input data available so far. (In particular
+  avail_in is zero after the call if enough output space has been provided
+  before the call.)  Flushing may degrade compression for some compression
+  algorithms and so it should be used only when necessary.
 
     If flush is set to Z_FULL_FLUSH, all output is flushed as with
   Z_SYNC_FLUSH, and the compression state is reset so that decompression can
   restart from this point if previous compressed data has been damaged or if
-  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
+  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
   compression.
 
     If deflate returns with avail_out == 0, this function must be called again
   with the same value of the flush parameter and more output space (updated
   avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
   avail_out is greater than six to avoid repeated flush markers due to
   avail_out == 0 on return.
 
     If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
+  pending output is flushed and deflate returns with Z_STREAM_END if there
+  was enough output space; if deflate returns with Z_OK, this function must be
   called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error.  After
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
-  are deflateReset or deflateEnd.
+  more input data, until it returns with Z_STREAM_END or an error. After
+  deflate has returned Z_STREAM_END, the only possible operations on the
+  stream are deflateReset or deflateEnd.
 
     Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  If deflate does not return
+  is to be done in a single step. In this case, avail_out must be at least
+  the value returned by deflateBound (see below). If deflate does not return
   Z_STREAM_END, then it must be called again as described above.
 
     deflate() sets strm->adler to the adler32 checksum of all input read
   so far (that is, total_in bytes).
 
     deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
-  binary.  This field is only for information purposes and does not affect the
-  compression algorithm in any manner.
+  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
+  binary. This field is only for information purposes and does not affect
+  the compression algorithm in any manner.
 
     deflate() returns Z_OK if some progress has been made (more input
   processed or more output produced), Z_STREAM_END if all input has been
   consumed and all output has been produced (only when flush is set to
   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
+  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
+  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
   fatal, and deflate() can be called again with more input and more output
   space to continue compressing.
 */
@@ -352,13 +328,13 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
 /*
      All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
+   This function discards any unprocessed input and does not flush any
+   pending output.
 
      deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
    stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded).  In the error case, msg
-   may be set but then points to a static string (which must not be
+   prematurely (some input or output was discarded). In the error case,
+   msg may be set but then points to a static string (which must not be
    deallocated).
 */
 
@@ -366,10 +342,10 @@ ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
 /*
 ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 
-     Initializes the internal stream state for decompression.  The fields
+     Initializes the internal stream state for decompression. The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
-   exact value depends on the compression method), inflateInit determines the
+   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
+   value depends on the compression method), inflateInit determines the
    compression method from the zlib header and allocates all data structures
    accordingly; otherwise the allocation will be deferred to the first call of
    inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
@@ -377,108 +353,95 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit() does not process any header information -- that is deferred
-   until inflate() is called.
+   version assumed by the caller.  msg is set to null if there is no error
+   message. inflateInit does not perform any decompression apart from reading
+   the zlib header if present: this will be done by inflate().  (So next_in and
+   avail_in may be modified, but next_out and avail_out are unchanged.)
 */
 
 
 ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
 /*
     inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
+  buffer becomes empty or the output buffer becomes full. It may introduce
   some output latency (reading input without producing any output) except when
   forced to flush.
 
-  The detailed semantics are as follows.  inflate performs one or both of the
+  The detailed semantics are as follows. inflate performs one or both of the
   following actions:
 
   - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
-    resume at this point for the next call of inflate().
+    accordingly. If not all input can be processed (because there is not
+    enough room in the output buffer), next_in is updated and processing
+    will resume at this point for the next call of inflate().
 
   - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there is
-    no more input data or no more space in the output buffer (see below about
-    the flush parameter).
+    accordingly.  inflate() provides as much output as possible, until there
+    is no more input data or no more space in the output buffer (see below
+    about the flush parameter).
 
-    Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
-  application can consume the uncompressed output when it wants, for example
-  when the output buffer is full (avail_out == 0), or after each call of
-  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
-  called again after making room in the output buffer because there might be
-  more output pending.
+  Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming
+  more output, and updating the next_* and avail_* values accordingly.
+  The application can consume the uncompressed output when it wants, for
+  example when the output buffer is full (avail_out == 0), or after each
+  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
+  must be called again after making room in the output buffer because there
+  might be more output pending.
 
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
-  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer.  Z_BLOCK requests that inflate()
-  stop if and when it gets to the next deflate block boundary.  When decoding
-  the zlib or gzip format, this will cause inflate() to return immediately
-  after the header and before the first block.  When doing a raw inflate,
-  inflate() will go ahead and process the first block, and will return when it
-  gets to the end of that block, or when it runs out of data.
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
+  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
+  if and when it gets to the next deflate block boundary. When decoding the
+  zlib or gzip format, this will cause inflate() to return immediately after
+  the header and before the first block. When doing a raw inflate, inflate()
+  will go ahead and process the first block, and will return when it gets to
+  the end of that block, or when it runs out of data.
 
     The Z_BLOCK option assists in appending to or combining deflate streams.
   Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
-  inflate() is currently decoding the last block in the deflate stream, plus
-  128 if inflate() returned immediately after decoding an end-of-block code or
-  decoding the complete header up to just before the first byte of the deflate
-  stream.  The end-of-block will not be indicated until all of the uncompressed
-  data from that block has been written to strm->next_out.  The number of
-  unused bits may in general be greater than seven, except when bit 7 of
-  data_type is set, in which case the number of unused bits will be less than
-  eight.  data_type is set as noted here every time inflate() returns for all
-  flush options, and so can be used to determine the amount of currently
-  consumed input in bits.
-
-    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
-  end of each deflate block header is reached, before any actual data in that
-  block is decoded.  This allows the caller to determine the length of the
-  deflate block header for later use in random access within a deflate block.
-  256 is added to the value of strm->data_type when inflate() returns
-  immediately after reaching the end of the deflate block header.
+  number of unused bits in the last byte taken from strm->next_in, plus 64
+  if inflate() is currently decoding the last block in the deflate stream,
+  plus 128 if inflate() returned immediately after decoding an end-of-block
+  code or decoding the complete header up to just before the first byte of the
+  deflate stream. The end-of-block will not be indicated until all of the
+  uncompressed data from that block has been written to strm->next_out.  The
+  number of unused bits may in general be greater than seven, except when
+  bit 7 of data_type is set, in which case the number of unused bits will be
+  less than eight.
 
     inflate() should normally be called until it returns Z_STREAM_END or an
-  error.  However if all decompression is to be performed in a single step (a
-  single call of inflate), the parameter flush should be set to Z_FINISH.  In
-  this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all the uncompressed data.  (The size
-  of the uncompressed data may have been saved by the compressor for this
-  purpose.) The next operation on this stream must be inflateEnd to deallocate
-  the decompression state.  The use of Z_FINISH is never required, but can be
-  used to inform inflate that a faster approach may be used for the single
-  inflate() call.
+  error. However if all decompression is to be performed in a single step
+  (a single call of inflate), the parameter flush should be set to
+  Z_FINISH. In this case all pending input is processed and all pending
+  output is flushed; avail_out must be large enough to hold all the
+  uncompressed data. (The size of the uncompressed data may have been saved
+  by the compressor for this purpose.) The next operation on this stream must
+  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+  is never required, but can be used to inform inflate that a faster approach
+  may be used for the single inflate() call.
 
      In this implementation, inflate() always flushes as much output as
   possible to the output buffer, and always uses the faster approach on the
-  first call.  So the only effect of the flush parameter in this implementation
+  first call. So the only effect of the flush parameter in this implementation
   is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK or Z_TREES is used.
+  because Z_BLOCK is used.
 
      If a preset dictionary is needed after this call (see inflateSetDictionary
   below), inflate sets strm->adler to the adler32 checksum of the dictionary
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
   strm->adler to the adler32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed adler32
+  below. At the end of the stream, inflate() checks that its computed adler32
   checksum is equal to that saved by the compressor and returns Z_STREAM_END
   only if the checksum is correct.
 
-    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically, if requested when
-  initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.
+    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically.  Any information
+  contained in the gzip header is not retained, so applications that need that
+  information should instead use raw inflate, see inflateInit2() below, or
+  inflateBack() and perform their own processing of the gzip header and
+  trailer.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
@@ -486,28 +449,27 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
   corrupted (input stream not conforming to the zlib format or incorrect check
   value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
+  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
   Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
   inflate() can be called again with more input and more output space to
-  continue decompressing.  If Z_DATA_ERROR is returned, the application may
-  then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
+  continue decompressing. If Z_DATA_ERROR is returned, the application may then
+  call inflateSync() to look for a good compression block if a partial recovery
+  of the data is desired.
 */
 
 
 ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
 /*
      All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
+   This function discards any unprocessed input and does not flush any
+   pending output.
 
      inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
+   was inconsistent. In the error case, msg may be set but then points to a
    static string (which must not be deallocated).
 */
 
-
                         /* Advanced functions */
 
 /*
@@ -522,57 +484,55 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
                                      int  memLevel,
                                      int  strategy));
 
-     This is another version of deflateInit with more compression options.  The
-   fields next_in, zalloc, zfree and opaque must be initialized before by the
-   caller.
+     This is another version of deflateInit with more compression options. The
+   fields next_in, zalloc, zfree and opaque must be initialized before by
+   the caller.
 
-     The method parameter is the compression method.  It must be Z_DEFLATED in
+     The method parameter is the compression method. It must be Z_DEFLATED in
    this version of the library.
 
      The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library.  Larger values of this parameter result in better
-   compression at the expense of memory usage.  The default value is 15 if
+   (the size of the history buffer). It should be in the range 8..15 for this
+   version of the library. Larger values of this parameter result in better
+   compression at the expense of memory usage. The default value is 15 if
    deflateInit is used instead.
 
-     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
-   determines the window size.  deflate() will then generate raw deflate data
+     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
+   determines the window size. deflate() will then generate raw deflate data
    with no zlib header or trailer, and will not compute an adler32 check value.
 
-     windowBits can also be greater than 15 for optional gzip encoding.  Add
+     windowBits can also be greater than 15 for optional gzip encoding. Add
    16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper.  The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
+   compressed data instead of a zlib wrapper. The gzip header will have no
+   file name, no extra data, no comment, no modification time (set to zero),
+   no header crc, and the operating system will be set to 255 (unknown).  If a
    gzip stream is being written, strm->adler is a crc32 instead of an adler32.
 
      The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state.  memLevel=1 uses minimum memory but is
-   slow and reduces compression ratio; memLevel=9 uses maximum memory for
-   optimal speed.  The default value is 8.  See zconf.h for total memory usage
-   as a function of windowBits and memLevel.
+   for the internal compression state. memLevel=1 uses minimum memory but
+   is slow and reduces compression ratio; memLevel=9 uses maximum memory
+   for optimal speed. The default value is 8. See zconf.h for total memory
+   usage as a function of windowBits and memLevel.
 
-     The strategy parameter is used to tune the compression algorithm.  Use the
+     The strategy parameter is used to tune the compression algorithm. Use the
    value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
    filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
    string match), or Z_RLE to limit match distances to one (run-length
-   encoding).  Filtered data consists mostly of small values with a somewhat
-   random distribution.  In this case, the compression algorithm is tuned to
-   compress them better.  The effect of Z_FILTERED is to force more Huffman
+   encoding). Filtered data consists mostly of small values with a somewhat
+   random distribution. In this case, the compression algorithm is tuned to
+   compress them better. The effect of Z_FILTERED is to force more Huffman
    coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
-   strategy parameter only affects the compression ratio but not the
-   correctness of the compressed output even if it is not set appropriately.
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-   decoder for special applications.
+   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
+   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
+   parameter only affects the compression ratio but not the correctness of the
+   compressed output even if it is not set appropriately.  Z_FIXED prevents the
+   use of dynamic Huffman codes, allowing for a simpler decoder for special
+   applications.
 
-     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
-   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
-   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
-   set to null if there is no error message.  deflateInit2 does not perform any
-   compression: this will be done by deflate().
+      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
+   method). msg is set to null if there is no error message.  deflateInit2 does
+   not perform any compression: this will be done by deflate().
 */
 
 ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
@@ -580,37 +540,37 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
                                              uInt  dictLength));
 /*
      Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any call
-   of deflate.  The compressor and decompressor must use exactly the same
+   without producing any compressed output. This function must be called
+   immediately after deflateInit, deflateInit2 or deflateReset, before any
+   call of deflate. The compressor and decompressor must use exactly the same
    dictionary (see inflateSetDictionary).
 
      The dictionary should consist of strings (byte sequences) that are likely
    to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary.  Using a
+   used strings preferably put towards the end of the dictionary. Using a
    dictionary is most useful when the data to be compressed is short and can be
    predicted with good accuracy; the data can then be compressed better than
    with the default empty dictionary.
 
      Depending on the size of the compression data structures selected by
    deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size
-   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
-   useful should be put at the end of the dictionary, not at the front.  In
-   addition, the current implementation of deflate will use at most the window
-   size minus 262 bytes of the provided dictionary.
+   discarded, for example if the dictionary is larger than the window size in
+   deflate or deflate2. Thus the strings most likely to be useful should be
+   put at the end of the dictionary, not at the front. In addition, the
+   current implementation of deflate will use at most the window size minus
+   262 bytes of the provided dictionary.
 
      Upon return of this function, strm->adler is set to the adler32 value
    of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
+   which dictionary has been used by the compressor. (The adler32 value
    applies to the whole dictionary even if only a subset of the dictionary is
    actually used by the compressor.) If a raw deflate was requested, then the
    adler32 value is not computed and strm->adler is not set.
 
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   parameter is invalid (such as NULL dictionary) or the stream state is
    inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort).  deflateSetDictionary does not
+   or if the compression method is bsort). deflateSetDictionary does not
    perform any compression: this will be done by deflate().
 */
 
@@ -621,26 +581,26 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
 
      This function can be useful when several compression strategies will be
    tried, for example when there are several ways of pre-processing the input
-   data with a filter.  The streams that will be discarded should then be freed
+   data with a filter. The streams that will be discarded should then be freed
    by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and can
-   consume lots of memory.
+   compression state which can be quite large, so this strategy is slow and
+   can consume lots of memory.
 
      deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   (such as zalloc being NULL). msg is left unchanged in both source and
    destination.
 */
 
 ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
 /*
      This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.  The
-   stream will keep the same compression level and any other attributes that
-   may have been set by deflateInit2.
+   but does not free and reallocate all the internal compression state.
+   The stream will keep the same compression level and any other attributes
+   that may have been set by deflateInit2.
 
-     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
+      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being NULL).
 */
 
 ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
@@ -650,18 +610,18 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
      Dynamically update the compression level and compression strategy.  The
    interpretation of level and strategy is as in deflateInit2.  This can be
    used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
-   compressed with the old level (and may be flushed); the new level will take
-   effect only at the next call of deflate().
+   to switch to a different kind of input data requiring a different
+   strategy. If the compression level is changed, the input available so far
+   is compressed with the old level (and may be flushed); the new level will
+   take effect only at the next call of deflate().
 
      Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to be
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
+   a call of deflate(), since the currently available input may have to
+   be compressed and flushed. In particular, strm->avail_out must be non-zero.
 
      deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-   strm->avail_out was zero.
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
+   if strm->avail_out was zero.
 */
 
 ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
@@ -685,10 +645,9 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
                                        uLong sourceLen));
 /*
      deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit() or
-   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
-   to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().
+   deflation of sourceLen bytes.  It must be called after deflateInit()
+   or deflateInit2().  This would be used to allocate an output buffer
+   for deflation in a single pass, and so would be called before deflate().
 */
 
 ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
@@ -696,21 +655,21 @@ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
                                      int value));
 /*
      deflatePrime() inserts bits in the deflate output stream.  The intent
-   is that this function is used to start off the deflate output with the bits
-   leftover from a previous deflate stream when appending to it.  As such, this
-   function can only be used for raw deflate, and must be used before the first
-   deflate() call after a deflateInit2() or deflateReset().  bits must be less
-   than or equal to 16, and that many of the least significant bits of value
-   will be inserted in the output.
+  is that this function is used to start off the deflate output with the
+  bits leftover from a previous deflate stream when appending to it.  As such,
+  this function can only be used for raw deflate, and must be used before the
+  first deflate() call after a deflateInit2() or deflateReset().  bits must be
+  less than or equal to 16, and that many of the least significant bits of
+  value will be inserted in the output.
 
-     deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.
 */
 
 ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
                                          gz_headerp head));
 /*
-     deflateSetHeader() provides gzip header information for when a gzip
+      deflateSetHeader() provides gzip header information for when a gzip
    stream is requested by deflateInit2().  deflateSetHeader() may be called
    after deflateInit2() or deflateReset() and before the first call of
    deflate().  The text, time, os, extra field, name, and comment information
@@ -723,11 +682,11 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
    1.3.x) do not support header crc's, and will report that it is a "multi-part
    gzip file" and give up.
 
-     If deflateSetHeader is not used, the default gzip header has text false,
+      If deflateSetHeader is not used, the default gzip header has text false,
    the time set to zero, and os set to 255, with no extra, name, or comment
    fields.  The gzip header is returned to the default state by deflateReset().
 
-     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.
 */
 
@@ -735,50 +694,43 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
 ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
                                      int  windowBits));
 
-     This is another version of inflateInit with an extra parameter.  The
+     This is another version of inflateInit with an extra parameter. The
    fields next_in, avail_in, zalloc, zfree and opaque must be initialized
    before by the caller.
 
      The windowBits parameter is the base two logarithm of the maximum window
    size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library.  The default value is 15 if inflateInit is used
-   instead.  windowBits must be greater than or equal to the windowBits value
+   this version of the library. The default value is 15 if inflateInit is used
+   instead. windowBits must be greater than or equal to the windowBits value
    provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used.  If a compressed stream with a larger window
+   deflateInit2() was not used. If a compressed stream with a larger window
    size is given as input, inflate() will return with the error code
    Z_DATA_ERROR instead of trying to allocate a larger window.
 
-     windowBits can also be zero to request that inflate use the window size in
-   the zlib header of the compressed stream.
-
-     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
-   determines the window size.  inflate() will then process raw deflate data,
+     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
+   determines the window size. inflate() will then process raw deflate data,
    not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream.  This
+   looking for any check values for comparison at the end of the stream. This
    is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values.  If a custom
+   such as zip.  Those formats provide their own check values. If a custom
    format is developed using the raw deflate format for compressed data, it is
    recommended that a check value such as an adler32 or a crc32 be applied to
    the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is.  Note that comments
+   most applications, the zlib format should be used as is. Note that comments
    above on the use in deflateInit2() applies to the magnitude of windowBits.
 
-     windowBits can also be greater than 15 for optional gzip decoding.  Add
+     windowBits can also be greater than 15 for optional gzip decoding. Add
    32 to windowBits to enable zlib and gzip decoding with automatic header
    detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
+   a crc32 instead of an adler32.
 
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit2 does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit2() does not process any header information -- that is
-   deferred until inflate() is called.
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
+   is set to null if there is no error message.  inflateInit2 does not perform
+   any decompression apart from reading the zlib header if present: this will
+   be done by inflate(). (So next_in and avail_in may be modified, but next_out
+   and avail_out are unchanged.)
 */
 
 ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
@@ -786,8 +738,8 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
                                              uInt  dictLength));
 /*
      Initializes the decompression dictionary from the given uncompressed byte
-   sequence.  This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
+   sequence. This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
    can be determined from the adler32 value returned by that call of inflate.
    The compressor and decompressor must use exactly the same dictionary (see
    deflateSetDictionary).  For raw inflate, this function can be called
@@ -796,26 +748,26 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
    dictionary that was used for compression is provided.
 
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   parameter is invalid (such as NULL dictionary) or the stream state is
    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
+   expected one (incorrect adler32 value). inflateSetDictionary does not
    perform any decompression: this will be done by subsequent calls of
    inflate().
 */
 
 ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
 /*
-     Skips invalid compressed data until a full flush point (see above the
-   description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
+    Skips invalid compressed data until a full flush point (see above the
+  description of deflate with Z_FULL_FLUSH) can be found, or until all
+  available input is skipped. No output is provided.
 
-     inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-   if no more input was provided, Z_DATA_ERROR if no flush point has been
-   found, or Z_STREAM_ERROR if the stream structure was inconsistent.  In the
-   success case, the application may save the current current value of total_in
-   which indicates where valid compressed data was found.  In the error case,
-   the application may repeatedly call inflateSync, providing more input each
-   time, until success or end of the input data.
+    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
+  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
+  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
+  case, the application may save the current current value of total_in which
+  indicates where valid compressed data was found. In the error case, the
+  application may repeatedly call inflateSync, providing more input each time,
+  until success or end of the input data.
 */
 
 ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
@@ -830,30 +782,18 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
 
      inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   (such as zalloc being NULL). msg is left unchanged in both source and
    destination.
 */
 
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
-   stream will keep attributes that may have been set by inflateInit2.
+   but does not free and reallocate all the internal decompression state.
+   The stream will keep attributes that may have been set by inflateInit2.
 
-     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
-                                      int windowBits));
-/*
-     This function is the same as inflateReset, but it also permits changing
-   the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
-
-     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
-   the windowBits parameter is invalid.
+      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being NULL).
 */
 
 ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
@@ -861,87 +801,54 @@ ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
                                      int value));
 /*
      This function inserts bits in the inflate input stream.  The intent is
-   that this function is used to start inflating at a bit position in the
-   middle of a byte.  The provided bits will be used before any bytes are used
-   from next_in.  This function should only be used with raw inflate, and
-   should be used before the first inflate() call after inflateInit2() or
-   inflateReset().  bits must be less than or equal to 16, and that many of the
-   least significant bits of value will be inserted in the input.
+  that this function is used to start inflating at a bit position in the
+  middle of a byte.  The provided bits will be used before any bytes are used
+  from next_in.  This function should only be used with raw inflate, and
+  should be used before the first inflate() call after inflateInit2() or
+  inflateReset().  bits must be less than or equal to 16, and that many of the
+  least significant bits of value will be inserted in the input.
 
-     If bits is negative, then the input stream bit buffer is emptied.  Then
-   inflatePrime() can be called again to put bits in the buffer.  This is used
-   to clear out bits leftover after feeding inflate a block description prior
-   to feeding inflate codes.
-
-     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.
 */
 
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
-/*
-     This function returns two values, one in the lower 16 bits of the return
-   value, and the other in the remaining upper bits, obtained by shifting the
-   return value down 16 bits.  If the upper value is -1 and the lower value is
-   zero, then inflate() is currently decoding information outside of a block.
-   If the upper value is -1 and the lower value is non-zero, then inflate is in
-   the middle of a stored block, with the lower value equaling the number of
-   bytes from the input remaining to copy.  If the upper value is not -1, then
-   it is the number of bits back from the current bit position in the input of
-   the code (literal or length/distance pair) currently being processed.  In
-   that case the lower value is the number of bytes already emitted for that
-   code.
-
-     A code is being processed if inflate is waiting for more input to complete
-   decoding of the code, or if it has completed decoding but is waiting for
-   more output space to write the literal or match data.
-
-     inflateMark() is used to mark locations in the input data for random
-   access, which may be at bit positions, and to note those cases where the
-   output of a code may span boundaries of random access blocks.  The current
-   location in the input stream can be determined from avail_in and data_type
-   as noted in the description for the Z_BLOCK flush parameter for inflate.
-
-     inflateMark returns the value noted above or -1 << 16 if the provided
-   source stream state was inconsistent.
-*/
-
 ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
                                          gz_headerp head));
 /*
-     inflateGetHeader() requests that gzip header information be stored in the
+      inflateGetHeader() requests that gzip header information be stored in the
    provided gz_header structure.  inflateGetHeader() may be called after
    inflateInit2() or inflateReset(), and before the first call of inflate().
    As inflate() processes the gzip stream, head->done is zero until the header
    is completed, at which time head->done is set to one.  If a zlib stream is
    being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
-   used to force inflate() to return immediately after header processing is
-   complete and before any actual data is decompressed.
+   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
+   force inflate() to return immediately after header processing is complete
+   and before any actual data is decompressed.
 
-     The text, time, xflags, and os fields are filled in with the gzip header
+      The text, time, xflags, and os fields are filled in with the gzip header
    contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
+   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
    contains the maximum number of bytes to write to extra.  Once done is true,
    extra_len contains the actual extra field length, and extra contains the
    extra field, or that field truncated if extra_max is less than extra_len.
    If name is not Z_NULL, then up to name_max characters are written there,
    terminated with a zero unless the length is greater than name_max.  If
    comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When any
-   of extra, name, or comment are not Z_NULL and the respective field is not
-   present in the header, then that field is set to Z_NULL to signal its
+   terminated with a zero unless the length is greater than comm_max.  When
+   any of extra, name, or comment are not Z_NULL and the respective field is
+   not present in the header, then that field is set to Z_NULL to signal its
    absence.  This allows the use of deflateSetHeader() with the returned
    structure to duplicate the header.  However if those fields are set to
    allocated memory, then the application will need to save those pointers
    elsewhere so that they can be eventually freed.
 
-     If inflateGetHeader is not used, then the header information is simply
+      If inflateGetHeader is not used, then the header information is simply
    discarded.  The header is always checked for validity, including the header
    CRC if present.  inflateReset() will reset the process to discard the header
    information.  The application would need to call inflateGetHeader() again to
    retrieve the header from the next gzip stream.
 
-     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.
 */
 
@@ -962,9 +869,9 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
      See inflateBack() for the usage of these routines.
 
      inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not be
-   allocated, or Z_VERSION_ERROR if the version of the library does not match
-   the version of the header file.
+   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+   be allocated, or Z_VERSION_ERROR if the version of the library does not
+   match the version of the header file.
 */
 
 typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
@@ -984,15 +891,15 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
      inflateBackInit() must be called first to allocate the internal state
    and to initialize the state with the user-provided window buffer.
    inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free the
-   allocated state.
+   deflate stream with each call.  inflateBackEnd() is then called to free
+   the allocated state.
 
      A raw deflate stream is one with no zlib or gzip header or trailer.
    This routine would normally be used in a utility that reads zip or gzip
    files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
-   behavior of inflate(), which expects either a zlib or gzip header and
+   header and process the trailer on its own, hence this routine expects
+   only the raw deflate stream to decompress.  This is different from the
+   normal behavior of inflate(), which expects either a zlib or gzip header and
    trailer around the deflate stream.
 
      inflateBack() uses two subroutines supplied by the caller that are then
@@ -1018,7 +925,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
    immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
    must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
+   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
 
      The in_desc and out_desc parameters of inflateBack() is passed as the
    first parameter of in() and out() respectively when they are called.  These
@@ -1028,15 +935,15 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
      On return, inflateBack() will set strm->next_in and strm->avail_in to
    pass back any unused input that was provided by the last in() call.  The
    return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
-   in the deflate stream (in which case strm->msg is set to indicate the nature
-   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
-   In the case of Z_BUF_ERROR, an input or output error can be distinguished
-   using strm->next_in which will be Z_NULL only if in() returned an error.  If
-   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
-   non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.) Note that inflateBack()
-   cannot return Z_OK.
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format
+   error in the deflate stream (in which case strm->msg is set to indicate the
+   nature of the error), or Z_STREAM_ERROR if the stream was not properly
+   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
+   distinguished using strm->next_in which will be Z_NULL only if in() returned
+   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
+   out() returning non-zero.  (in() will always be called before out(), so
+   strm->next_in is assured to be defined if out() returns non-zero.)  Note
+   that inflateBack() cannot return Z_OK.
 */
 
 ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
@@ -1092,22 +999,23 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
                         /* utility functions */
 
 /*
-     The following utility functions are implemented on top of the basic
-   stream-oriented functions.  To simplify the interface, some default options
-   are assumed (compression level and memory usage, standard memory allocation
-   functions).  The source code of these utility functions can be modified if
-   you need special options.
+     The following utility functions are implemented on top of the
+   basic stream-oriented functions. To simplify the interface, some
+   default options are assumed (compression level and memory usage,
+   standard memory allocation functions). The source code of these
+   utility functions can easily be modified if you need special options.
 */
 
 ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
                                  const Bytef *source, uLong sourceLen));
 /*
      Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be at least the value returned
+   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
    compressed buffer.
-
+     This function can be used to compress a whole file at once if the
+   input file is mmap'ed.
      compress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
    buffer.
@@ -1117,11 +1025,11 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
                                   const Bytef *source, uLong sourceLen,
                                   int level));
 /*
-     Compresses the source buffer into the destination buffer.  The level
+     Compresses the source buffer into the destination buffer. The level
    parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer.  Upon entry, destLen is the total size of the
+   length of the source buffer. Upon entry, destLen is the total size of the
    destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
+   compressBound(sourceLen). Upon exit, destLen is the actual size of the
    compressed buffer.
 
      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
@@ -1132,20 +1040,22 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
 ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
 /*
      compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before a
-   compress() or compress2() call to allocate the destination buffer.
+   compress() or compress2() on sourceLen bytes.  It would be used before
+   a compress() or compress2() call to allocate the destination buffer.
 */
 
 ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
                                    const Bytef *source, uLong sourceLen));
 /*
      Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data.  (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+     This function can be used to decompress a whole file at once if the
+   input file is mmap'ed.
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1153,199 +1063,136 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
 */
 
 
-                        /* gzip file access functions */
+typedef voidp gzFile;
 
+ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
 /*
-     This library supports reading and writing files in gzip (.gz) format with
-   an interface similar to that of stdio, using the functions that start with
-   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
-   wrapper, documented in RFC 1952, wrapped around a deflate stream.
-*/
-
-typedef voidp gzFile;       /* opaque gzip file descriptor */
-
-/*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
-
-     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
-   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
-   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
-   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
-   for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.) Also "a"
-   can be used instead of "w" to request that the gzip stream that will be
-   written be appended to the file.  "+" will result in an error, since reading
-   and writing to the same gzip file is not supported.
+     Opens a gzip (.gz) file for reading or writing. The mode parameter
+   is as in fopen ("rb" or "wb") but can also include a compression level
+   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
+   Huffman only compression as in "wb1h", or 'R' for run-length encoding
+   as in "wb1R". (See the description of deflateInit2 for more information
+   about the strategy parameter.)
 
      gzopen can be used to read a file which is not in gzip format; in this
    case gzread will directly read from the file without decompression.
 
-     gzopen returns NULL if the file could not be opened, if there was
-   insufficient memory to allocate the gzFile state, or if an invalid mode was
-   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
-   errno can be checked to determine if the reason gzopen failed was that the
-   file could not be opened.
-*/
+     gzopen returns NULL if the file could not be opened or if there was
+   insufficient memory to allocate the (de)compression state; errno
+   can be checked to distinguish the two cases (if errno is zero, the
+   zlib error is Z_MEM_ERROR).  */
 
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
 /*
-     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
-   are obtained from calls like open, dup, creat, pipe or fileno (if the file
-   has been previously opened with fopen).  The mode parameter is as in gzopen.
-
-     The next call of gzclose on the returned gzFile will also close the file
-   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
-   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
-   mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.
-
-     gzdopen returns NULL if there was insufficient memory to allocate the
-   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
-   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
-   used until the next gz* read, write, seek, or close operation, so gzdopen
-   will not detect if fd is invalid (unless fd is -1).
-*/
-
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
-/*
-     Set the internal buffer size used by this library's functions.  The
-   default buffer size is 8192 bytes.  This function must be called after
-   gzopen() or gzdopen(), and before any other calls that read or write the
-   file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
-   writing, or one of the specified size and the other twice that size when
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
-   noticeably increase the speed of decompression (reading).
-
-     The new buffer size also affects the maximum length for gzprintf().
-
-     gzbuffer() returns 0 on success, or -1 on failure, such as being called
-   too late.
+     gzdopen() associates a gzFile with the file descriptor fd.  File
+   descriptors are obtained from calls like open, dup, creat, pipe or
+   fileno (in the file has been previously opened with fopen).
+   The mode parameter is as in gzopen.
+     The next call of gzclose on the returned gzFile will also close the
+   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
+   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
+     gzdopen returns NULL if there was insufficient memory to allocate
+   the (de)compression state.
 */
 
 ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 /*
-     Dynamically update the compression level or strategy.  See the description
+     Dynamically update the compression level or strategy. See the description
    of deflateInit2 for the meaning of these parameters.
-
      gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
    opened for writing.
 */
 
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
 /*
-     Reads the given number of uncompressed bytes from the compressed file.  If
-   the input file was not in gzip format, gzread copies the given number of
-   bytes into the buffer.
+     Reads the given number of uncompressed bytes from the compressed file.
+   If the input file was not in gzip format, gzread copies the given number
+   of bytes into the buffer.
+     gzread returns the number of uncompressed bytes actually read (0 for
+   end of file, -1 for error). */
 
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream, or failing that, reading the rest
-   of the input file directly without decompression.  The entire input file
-   will be read if gzread is called until it returns less than the requested
-   len.
-
-     gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
-*/
-
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-                                voidpc buf, unsigned len));
+ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
+                                   voidpc buf, unsigned len));
 /*
      Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes written or 0 in case of
-   error.
+   gzwrite returns the number of uncompressed bytes actually written
+   (0 in case of error).
 */
 
-ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
+ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
 /*
-     Converts, formats, and writes the arguments to the compressed file under
-   control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 in case of error.  The number of
-   uncompressed bytes written is limited to 8191, or one less than the buffer
-   size given to gzbuffer().  The caller should assure that this limit is not
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
-   nothing written.  In this case, there may also be a buffer overflow with
-   unpredictable consequences, which is possible only if zlib was compiled with
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
-   or vsnprintf() functions were not available.  This can be determined using
-   zlibCompileFlags().
+     Converts, formats, and writes the args to the compressed file under
+   control of the format string, as in fprintf. gzprintf returns the number of
+   uncompressed bytes actually written (0 in case of error).  The number of
+   uncompressed bytes written is limited to 4095. The caller should assure that
+   this limit is not exceeded. If it is exceeded, then gzprintf() will return
+   return an error (0) with nothing written. In this case, there may also be a
+   buffer overflow with unpredictable consequences, which is possible only if
+   zlib was compiled with the insecure functions sprintf() or vsprintf()
+   because the secure snprintf() or vsnprintf() functions were not available.
 */
 
 ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
 /*
-     Writes the given null-terminated string to the compressed file, excluding
+      Writes the given null-terminated string to the compressed file, excluding
    the terminating null character.
-
-     gzputs returns the number of characters written, or -1 in case of error.
+      gzputs returns the number of characters written, or -1 in case of error.
 */
 
 ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
 /*
-     Reads bytes from the compressed file until len-1 characters are read, or a
-   newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  If any characters are read or if len == 1, the
-   string is terminated with a null character.  If no characters are read due
-   to an end-of-file or len < 1, then the buffer is left untouched.
-
-     gzgets returns buf which is a null-terminated string, or it returns NULL
-   for end-of-file or in case of error.  If there was an error, the contents at
-   buf are indeterminate.
+      Reads bytes from the compressed file until len-1 characters are read, or
+   a newline character is read and transferred to buf, or an end-of-file
+   condition is encountered.  The string is then terminated with a null
+   character.
+      gzgets returns buf, or Z_NULL in case of error.
 */
 
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
 /*
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc
-   returns the value that was written, or -1 in case of error.
+      Writes c, converted to an unsigned char, into the compressed file.
+   gzputc returns the value that was written, or -1 in case of error.
 */
 
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
 /*
-     Reads one byte from the compressed file.  gzgetc returns this byte or -1
-   in case of end of file or error.
+      Reads one byte from the compressed file. gzgetc returns this byte
+   or -1 in case of end of file or error.
 */
 
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
 /*
-     Push one character back onto the stream to be read as the first character
-   on the next read.  At least one character of push-back is allowed.
-   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
-   fail if c is -1, and may fail if a character has been pushed but not read
-   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
-   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
-   The pushed character will be discarded if the stream is repositioned with
-   gzseek() or gzrewind().
+      Push one character back onto the stream to be read again later.
+   Only one character of push-back is allowed.  gzungetc() returns the
+   character pushed, or -1 on failure.  gzungetc() will fail if a
+   character has been pushed but not read yet, or if c is -1. The pushed
+   character will be discarded if the stream is repositioned with gzseek()
+   or gzrewind().
 */
 
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
 /*
-     Flushes all pending output into the compressed file.  The parameter flush
-   is as in the deflate() function.  The return value is the zlib error number
-   (see function gzerror below).  gzflush is only permitted when writing.
-
-     If the flush parameter is Z_FINISH, the remaining data is written and the
-   gzip stream is completed in the output.  If gzwrite() is called again, a new
-   gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
-
-     gzflush should be called only when strictly necessary because it will
-   degrade compression if called too often.
+     Flushes all pending output into the compressed file. The parameter
+   flush is as in the deflate() function. The return value is the zlib
+   error number (see function gzerror below). gzflush returns Z_OK if
+   the flush parameter is Z_FINISH and all output could be flushed.
+     gzflush should be called only when strictly necessary because it can
+   degrade compression.
 */
 
+ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
+                                      z_off_t offset, int whence));
 /*
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-                                   z_off_t offset, int whence));
-
-     Sets the starting position for the next gzread or gzwrite on the given
-   compressed file.  The offset represents a number of bytes in the
-   uncompressed data stream.  The whence parameter is defined as in lseek(2);
+      Sets the starting position for the next gzread or gzwrite on the
+   given compressed file. The offset represents a number of bytes in the
+   uncompressed data stream. The whence parameter is defined as in lseek(2);
    the value SEEK_END is not supported.
-
      If the file is opened for reading, this function is emulated but can be
-   extremely slow.  If the file is opened for writing, only forward seeks are
+   extremely slow. If the file is opened for writing, only forward seeks are
    supported; gzseek then compresses a sequence of zeroes up to the new
    starting position.
 
-     gzseek returns the resulting offset location as measured in bytes from
+      gzseek returns the resulting offset location as measured in bytes from
    the beginning of the uncompressed stream, or -1 in case of error, in
    particular if the file is opened for writing and the new starting position
    would be before the current position.
@@ -1355,127 +1202,68 @@ ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
 /*
      Rewinds the given file. This function is supported only for reading.
 
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
 */
 
-/*
 ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-
-     Returns the starting position for the next gzread or gzwrite on the given
-   compressed file.  This position represents a number of bytes in the
-   uncompressed data stream, and is zero when starting, even if appending or
-   reading a gzip stream from the middle of a file using gzdopen().
-
-     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
 /*
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
+     Returns the starting position for the next gzread or gzwrite on the
+   given compressed file. This position represents a number of bytes in the
+   uncompressed data stream.
 
-     Returns the current offset in the file being read or written.  This offset
-   includes the count of bytes that precede the gzip stream, for example when
-   appending or when using gzdopen() for reading.  When reading, the offset
-   does not include as yet unused buffered input.  This information can be used
-   for a progress indicator.  On error, gzoffset() returns -1.
+   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
 */
 
 ZEXTERN int ZEXPORT gzeof OF((gzFile file));
 /*
-     Returns true (1) if the end-of-file indicator has been set while reading,
-   false (0) otherwise.  Note that the end-of-file indicator is set only if the
-   read tried to go past the end of the input, but came up short.  Therefore,
-   just like feof(), gzeof() may return false even if there is no more data to
-   read, in the event that the last read request was for the exact number of
-   bytes remaining in the input file.  This will happen if the input file size
-   is an exact multiple of the buffer size.
-
-     If gzeof() returns true, then the read functions will return no more data,
-   unless the end-of-file indicator is reset by gzclearerr() and the input file
-   has grown since the previous end of file was detected.
+     Returns 1 when EOF has previously been detected reading the given
+   input stream, otherwise zero.
 */
 
 ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
 /*
-     Returns true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.  This state can change from
-   false to true while reading the input file if the end of a gzip stream is
-   reached, but is followed by data that is not another gzip stream.
-
-     If the input file is empty, gzdirect() will return true, since the input
-   does not contain a gzip stream.
-
-     If gzdirect() is used immediately after gzopen() or gzdopen() it will
-   cause buffers to be allocated to allow reading the file to determine if it
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
-   gzdirect().
+     Returns 1 if file is being read directly without decompression, otherwise
+   zero.
 */
 
 ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
 /*
-     Flushes all pending output if necessary, closes the compressed file and
-   deallocates the (de)compression state.  Note that once file is closed, you
-   cannot call gzerror with file, since its structures have been deallocated.
-   gzclose must not be called more than once on the same file, just as free
-   must not be called more than once on the same allocation.
-
-     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, or Z_OK on success.
-*/
-
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
-/*
-     Same as gzclose(), but gzclose_r() is only for use when reading, and
-   gzclose_w() is only for use when writing or appending.  The advantage to
-   using these instead of gzclose() is that they avoid linking in zlib
-   compression or decompression code that is not used when only reading or only
-   writing respectively.  If gzclose() is used, then both compression and
-   decompression code will be included the application when linking to a static
-   zlib library.
+     Flushes all pending output if necessary, closes the compressed file
+   and deallocates all the (de)compression state. The return value is the zlib
+   error number (see function gzerror below).
 */
 
 ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
 /*
-     Returns the error message for the last error which occurred on the given
-   compressed file.  errnum is set to zlib error number.  If an error occurred
-   in the file system and not in the compression library, errnum is set to
-   Z_ERRNO and the application may consult errno to get the exact error code.
-
-     The application must not modify the returned string.  Future calls to
-   this function may invalidate the previously returned string.  If file is
-   closed, then the string previously returned by gzerror will no longer be
-   available.
-
-     gzerror() should be used to distinguish errors from end-of-file for those
-   functions above that do not distinguish those cases in their return values.
+     Returns the error message for the last error which occurred on the
+   given compressed file. errnum is set to zlib error number. If an
+   error occurred in the file system and not in the compression library,
+   errnum is set to Z_ERRNO and the application may consult errno
+   to get the exact error code.
 */
 
 ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
 /*
-     Clears the error and end-of-file flags for file.  This is analogous to the
-   clearerr() function in stdio.  This is useful for continuing to read a gzip
+     Clears the error and end-of-file flags for file. This is analogous to the
+   clearerr() function in stdio. This is useful for continuing to read a gzip
    file that is being written concurrently.
 */
 
-
                         /* checksum functions */
 
 /*
      These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the compression
-   library.
+   anyway because they might be useful in applications using the
+   compression library.
 */
 
 ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
 /*
      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum.  If buf is Z_NULL, this function returns the
-   required initial value for the checksum.
-
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster.
-
-   Usage example:
+   return the updated checksum. If buf is NULL, this function returns
+   the required initial value for the checksum.
+   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+   much faster. Usage example:
 
      uLong adler = adler32(0L, Z_NULL, 0);
 
@@ -1485,10 +1273,9 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
      if (adler != original_adler) error();
 */
 
-/*
 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
                                           z_off_t len2));
-
+/*
      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
    each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
@@ -1498,11 +1285,9 @@ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
 ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
 /*
      Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the for the crc.  Pre- and post-conditioning (one's
-   complement) is performed within this function so it shouldn't be done by the
-   application.
-
+   updated CRC-32. If buf is NULL, this function returns the required initial
+   value for the for the crc. Pre- and post-conditioning (one's complement) is
+   performed within this function so it shouldn't be done by the application.
    Usage example:
 
      uLong crc = crc32(0L, Z_NULL, 0);
@@ -1513,9 +1298,9 @@ ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
      if (crc != original_crc) error();
 */
 
-/*
 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
 
+/*
      Combine two CRC-32 check values into one.  For two sequences of bytes,
    seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
    calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
@@ -1554,57 +1339,16 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
         inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
 #define inflateBackInit(strm, windowBits, window) \
         inflateBackInit_((strm), (windowBits), (window), \
-                                            ZLIB_VERSION, sizeof(z_stream))
+        ZLIB_VERSION, sizeof(z_stream))
 
-/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
- * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
- * both are true, the application gets the *64 functions, and the regular
- * functions are changed to 64 bits) -- in case these are set on systems
- * without large file support, _LFS64_LARGEFILE must also be true
- */
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
-#endif
 
-#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
-#  define gzopen gzopen64
-#  define gzseek gzseek64
-#  define gztell gztell64
-#  define gzoffset gzoffset64
-#  define adler32_combine adler32_combine64
-#  define crc32_combine crc32_combine64
-#  ifdef _LARGEFILE64_SOURCE
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#  endif
-#else
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-#endif
-
-/* hack for buggy compilers */
 #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
+    struct internal_state {int dummy;}; /* hack for buggy compilers */
 #endif
 
-/* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
 ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
 
 #ifdef __cplusplus
 }
diff --git a/dep/StormLib/src/zlib/zutil.c b/dep/StormLib/src/zlib/zutil.c
index 898ed345b..d55f5948a 100644
--- a/dep/StormLib/src/zlib/zutil.c
+++ b/dep/StormLib/src/zlib/zutil.c
@@ -1,5 +1,5 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -34,25 +34,25 @@ uLong ZEXPORT zlibCompileFlags()
     uLong flags;
 
     flags = 0;
-    switch ((int)(sizeof(uInt))) {
+    switch (sizeof(uInt)) {
     case 2:     break;
     case 4:     flags += 1;     break;
     case 8:     flags += 2;     break;
     default:    flags += 3;
     }
-    switch ((int)(sizeof(uLong))) {
+    switch (sizeof(uLong)) {
     case 2:     break;
     case 4:     flags += 1 << 2;        break;
     case 8:     flags += 2 << 2;        break;
     default:    flags += 3 << 2;
     }
-    switch ((int)(sizeof(voidpf))) {
+    switch (sizeof(voidpf)) {
     case 2:     break;
     case 4:     flags += 1 << 4;        break;
     case 8:     flags += 2 << 4;        break;
     default:    flags += 3 << 4;
     }
-    switch ((int)(sizeof(z_off_t))) {
+    switch (sizeof(z_off_t)) {
     case 2:     break;
     case 4:     flags += 1 << 6;        break;
     case 8:     flags += 2 << 6;        break;
@@ -117,9 +117,9 @@ uLong ZEXPORT zlibCompileFlags()
 #  ifndef verbose
 #    define verbose 0
 #  endif
-int ZLIB_INTERNAL z_verbose = verbose;
+int z_verbose = verbose;
 
-void ZLIB_INTERNAL z_error (m)
+void z_error (m)
     char *m;
 {
     fprintf(stderr, "%s\n", m);
@@ -146,7 +146,7 @@ const char * ZEXPORT zError(err)
 
 #ifndef HAVE_MEMCPY
 
-void ZLIB_INTERNAL zmemcpy(dest, source, len)
+void zmemcpy(dest, source, len)
     Bytef* dest;
     const Bytef* source;
     uInt  len;
@@ -157,7 +157,7 @@ void ZLIB_INTERNAL zmemcpy(dest, source, len)
     } while (--len != 0);
 }
 
-int ZLIB_INTERNAL zmemcmp(s1, s2, len)
+int zmemcmp(s1, s2, len)
     const Bytef* s1;
     const Bytef* s2;
     uInt  len;
@@ -170,7 +170,7 @@ int ZLIB_INTERNAL zmemcmp(s1, s2, len)
     return 0;
 }
 
-void ZLIB_INTERNAL zmemzero(dest, len)
+void zmemzero(dest, len)
     Bytef* dest;
     uInt  len;
 {
@@ -213,7 +213,7 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
     voidpf buf = opaque; /* just to make some compilers happy */
     ulg bsize = (ulg)items*size;
@@ -237,7 +237,7 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
     return buf;
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+void  zcfree (voidpf opaque, voidpf ptr)
 {
     int n;
     if (*(ush*)&ptr != 0) { /* object < 64K */
@@ -272,13 +272,13 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 #  define _hfree   hfree
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     return _halloc((long)items, size);
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+void  zcfree (voidpf opaque, voidpf ptr)
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     _hfree(ptr);
@@ -297,7 +297,7 @@ extern voidp  calloc OF((uInt items, uInt size));
 extern void   free   OF((voidpf ptr));
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
+voidpf zcalloc (opaque, items, size)
     voidpf opaque;
     unsigned items;
     unsigned size;
@@ -307,7 +307,7 @@ voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
                               (voidpf)calloc(items, size);
 }
 
-void ZLIB_INTERNAL zcfree (opaque, ptr)
+void  zcfree (opaque, ptr)
     voidpf opaque;
     voidpf ptr;
 {
diff --git a/dep/StormLib/src/zlib/zutil.h b/dep/StormLib/src/zlib/zutil.h
index 258fa8879..b7d5eff81 100644
--- a/dep/StormLib/src/zlib/zutil.h
+++ b/dep/StormLib/src/zlib/zutil.h
@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -13,21 +13,31 @@
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
-#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-#else
-#  define ZLIB_INTERNAL
-#endif
-
+#define ZLIB_INTERNAL
 #include "zlib.h"
 
 #ifdef STDC
-#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
+#  ifndef _WIN32_WCE
 #    include <stddef.h>
 #  endif
 #  include <string.h>
 #  include <stdlib.h>
 #endif
+#ifdef NO_ERRNO_H
+#   ifdef _WIN32_WCE
+      /* The Microsoft C Run-Time Library for Windows CE doesn't have
+       * errno.  We define it as a global variable to simplify porting.
+       * Its value is always 0 and should not be used.  We rename it to
+       * avoid conflict with other libraries that use the same workaround.
+       */
+#     define errno z_errno
+#   endif
+    extern int errno;
+#else
+#  ifndef _WIN32_WCE
+#    include <errno.h>
+#  endif
+#endif
 
 #ifndef local
 #  define local static
@@ -79,7 +89,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
 #  define OS_CODE  0x00
 #  if defined(__TURBOC__) || defined(__BORLANDC__)
-#    if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
        /* Allow compilation with ANSI keywords only enabled */
        void _Cdecl farfree( void *block );
        void *_Cdecl farmalloc( unsigned long nbytes );
@@ -108,7 +118,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #ifdef OS2
 #  define OS_CODE  0x06
 #  ifdef M_I86
-#    include <malloc.h>
+     #include <malloc.h>
 #  endif
 #endif
 
@@ -141,7 +151,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define fdopen(fd,mode) NULL /* No fdopen() */
 #endif
 
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
+#if (defined(_MSC_VER) && (_MSC_VER > 600))
 #  if defined(_WIN32_WCE)
 #    define fdopen(fd,mode) NULL /* No fdopen() */
 #    ifndef _PTRDIFF_T_DEFINED
@@ -153,18 +163,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#if defined(__BORLANDC__)
-  #pragma warn -8004
-  #pragma warn -8008
-  #pragma warn -8066
-#endif
-
-/* provide prototypes for these when building zlib without LFS */
-#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
-    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#endif
-
         /* common defaults */
 
 #ifndef OS_CODE
@@ -199,9 +197,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  ifdef WIN32
      /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
 #    if !defined(vsnprintf) && !defined(NO_vsnprintf)
-#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
-#         define vsnprintf _vsnprintf
-#      endif
+#      define vsnprintf _vsnprintf
 #    endif
 #  endif
 #  ifdef __SASC
@@ -236,16 +232,16 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #    define zmemzero(dest, len) memset(dest, 0, len)
 #  endif
 #else
-   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
-   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
-   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
+   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
+   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
+   extern void zmemzero OF((Bytef* dest, uInt len));
 #endif
 
 /* Diagnostic functions */
 #ifdef DEBUG
 #  include <stdio.h>
-   extern int ZLIB_INTERNAL z_verbose;
-   extern void ZLIB_INTERNAL z_error OF((char *m));
+   extern int z_verbose;
+   extern void z_error    OF((char *m));
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}
@@ -262,9 +258,8 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 
-voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                        unsigned size));
-void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
+void   zcfree  OF((voidpf opaque, voidpf ptr));
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))
diff --git a/dep/StormLibOld/.gitignore b/dep/StormLibOld/.gitignore
deleted file mode 100644
index ee7b95b83..000000000
--- a/dep/StormLibOld/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git-ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# MaNGOS generated files at Windows build
-#
-
-bin
diff --git a/dep/StormLibOld/CMakeLists.txt b/dep/StormLibOld/CMakeLists.txt
deleted file mode 100644
index 6404fb4da..000000000
--- a/dep/StormLibOld/CMakeLists.txt
+++ /dev/null
@@ -1,304 +0,0 @@
-project(StormLib)
-cmake_minimum_required(VERSION 2.6)
-
-set(SRC_FILES
-           src/adpcm/adpcm.cpp
-           src/huffman/huff.cpp
-           src/jenkins/lookup3.c
-           src/lzma/C/LzFind.c
-           src/lzma/C/LzmaDec.c
-           src/lzma/C/LzmaEnc.c
-           src/pklib/explode.c
-           src/pklib/implode.c
-           src/sparse/sparse.cpp
-           src/FileStream.cpp
-           src/SBaseCommon.cpp
-           src/SBaseDumpData.cpp
-           src/SBaseFileTable.cpp
-           src/SCompression.cpp
-           src/SFileAddFile.cpp
-           src/SFileAttributes.cpp
-           src/SFileCompactArchive.cpp
-           src/SFileCreateArchive.cpp
-           src/SFileExtractFile.cpp
-           src/SFileFindFile.cpp
-           src/SFileListFile.cpp
-           src/SFileOpenArchive.cpp
-           src/SFileOpenFileEx.cpp
-           src/SFilePatchArchives.cpp
-           src/SFileReadFile.cpp
-           src/SFileVerify.cpp
-)
-
-set(TOMCRYPT_FILES
-           src/libtomcrypt/src/hashes/hash_memory.c
-           src/libtomcrypt/src/hashes/md5.c
-           src/libtomcrypt/src/hashes/sha1.c
-           src/libtomcrypt/src/math/ltm_desc.c
-           src/libtomcrypt/src/math/multi.c
-           src/libtomcrypt/src/math/rand_prime.c
-           src/libtomcrypt/src/misc/base64_decode.c
-           src/libtomcrypt/src/misc/crypt_argchk.c
-           src/libtomcrypt/src/misc/crypt_find_hash.c
-           src/libtomcrypt/src/misc/crypt_find_prng.c
-           src/libtomcrypt/src/misc/crypt_hash_descriptor.c
-           src/libtomcrypt/src/misc/crypt_hash_is_valid.c
-           src/libtomcrypt/src/misc/crypt_libc.c
-           src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.c
-           src/libtomcrypt/src/misc/crypt_prng_descriptor.c
-           src/libtomcrypt/src/misc/crypt_prng_is_valid.c
-           src/libtomcrypt/src/misc/crypt_register_hash.c
-           src/libtomcrypt/src/misc/crypt_register_prng.c
-           src/libtomcrypt/src/misc/zeromem.c
-           src/libtomcrypt/src/pk/asn1/der_decode_bit_string.c
-           src/libtomcrypt/src/pk/asn1/der_decode_boolean.c
-           src/libtomcrypt/src/pk/asn1/der_decode_choice.c
-           src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.c
-           src/libtomcrypt/src/pk/asn1/der_decode_integer.c
-           src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.c
-           src/libtomcrypt/src/pk/asn1/der_decode_octet_string.c
-           src/libtomcrypt/src/pk/asn1/der_decode_printable_string.c
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.c
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.c
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.c
-           src/libtomcrypt/src/pk/asn1/der_decode_short_integer.c
-           src/libtomcrypt/src/pk/asn1/der_decode_utctime.c
-           src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.c
-           src/libtomcrypt/src/pk/asn1/der_length_bit_string.c
-           src/libtomcrypt/src/pk/asn1/der_length_boolean.c
-           src/libtomcrypt/src/pk/asn1/der_length_ia5_string.c
-           src/libtomcrypt/src/pk/asn1/der_length_integer.c
-           src/libtomcrypt/src/pk/asn1/der_length_object_identifier.c
-           src/libtomcrypt/src/pk/asn1/der_length_octet_string.c
-           src/libtomcrypt/src/pk/asn1/der_length_printable_string.c
-           src/libtomcrypt/src/pk/asn1/der_length_sequence.c
-           src/libtomcrypt/src/pk/asn1/der_length_utctime.c
-           src/libtomcrypt/src/pk/asn1/der_sequence_free.c
-           src/libtomcrypt/src/pk/asn1/der_length_utf8_string.c
-           src/libtomcrypt/src/pk/asn1/der_length_short_integer.c
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_map.c
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_points.c
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c
-           src/libtomcrypt/src/pk/rsa/rsa_exptmod.c
-           src/libtomcrypt/src/pk/rsa/rsa_free.c
-           src/libtomcrypt/src/pk/rsa/rsa_import.c
-           src/libtomcrypt/src/pk/rsa/rsa_make_key.c
-           src/libtomcrypt/src/pk/rsa/rsa_verify_hash.c
-           src/libtomcrypt/src/pk/rsa/rsa_verify_simple.c
-)
-
-set(TOMMATH_FILES
-           src/libtommath/bncore.c
-           src/libtommath/bn_fast_mp_invmod.c
-           src/libtommath/bn_fast_mp_montgomery_reduce.c
-           src/libtommath/bn_fast_s_mp_mul_digs.c
-           src/libtommath/bn_fast_s_mp_mul_high_digs.c
-           src/libtommath/bn_fast_s_mp_sqr.c
-           src/libtommath/bn_mp_2expt.c
-           src/libtommath/bn_mp_abs.c
-           src/libtommath/bn_mp_add.c
-           src/libtommath/bn_mp_addmod.c
-           src/libtommath/bn_mp_add_d.c
-           src/libtommath/bn_mp_and.c
-           src/libtommath/bn_mp_clamp.c
-           src/libtommath/bn_mp_clear.c
-           src/libtommath/bn_mp_clear_multi.c
-           src/libtommath/bn_mp_cmp.c
-           src/libtommath/bn_mp_cmp_d.c
-           src/libtommath/bn_mp_cmp_mag.c
-           src/libtommath/bn_mp_cnt_lsb.c
-           src/libtommath/bn_mp_copy.c
-           src/libtommath/bn_mp_count_bits.c
-           src/libtommath/bn_mp_div.c
-           src/libtommath/bn_mp_div_2.c
-           src/libtommath/bn_mp_div_2d.c
-           src/libtommath/bn_mp_div_3.c
-           src/libtommath/bn_mp_div_d.c
-           src/libtommath/bn_mp_dr_is_modulus.c
-           src/libtommath/bn_mp_dr_reduce.c
-           src/libtommath/bn_mp_dr_setup.c
-           src/libtommath/bn_mp_exch.c
-           src/libtommath/bn_mp_exptmod.c
-           src/libtommath/bn_mp_exptmod_fast.c
-           src/libtommath/bn_mp_expt_d.c
-           src/libtommath/bn_mp_exteuclid.c
-           src/libtommath/bn_mp_fread.c
-           src/libtommath/bn_mp_fwrite.c
-           src/libtommath/bn_mp_gcd.c
-           src/libtommath/bn_mp_get_int.c
-           src/libtommath/bn_mp_grow.c
-           src/libtommath/bn_mp_init.c
-           src/libtommath/bn_mp_init_copy.c
-           src/libtommath/bn_mp_init_multi.c
-           src/libtommath/bn_mp_init_set.c
-           src/libtommath/bn_mp_init_set_int.c
-           src/libtommath/bn_mp_init_size.c
-           src/libtommath/bn_mp_invmod.c
-           src/libtommath/bn_mp_invmod_slow.c
-           src/libtommath/bn_mp_is_square.c
-           src/libtommath/bn_mp_jacobi.c
-           src/libtommath/bn_mp_karatsuba_mul.c
-           src/libtommath/bn_mp_karatsuba_sqr.c
-           src/libtommath/bn_mp_lcm.c
-           src/libtommath/bn_mp_lshd.c
-           src/libtommath/bn_mp_mod.c
-           src/libtommath/bn_mp_mod_2d.c
-           src/libtommath/bn_mp_mod_d.c
-           src/libtommath/bn_mp_montgomery_calc_normalization.c
-           src/libtommath/bn_mp_montgomery_reduce.c
-           src/libtommath/bn_mp_montgomery_setup.c
-           src/libtommath/bn_mp_mul.c
-           src/libtommath/bn_mp_mulmod.c
-           src/libtommath/bn_mp_mul_2.c
-           src/libtommath/bn_mp_mul_2d.c
-           src/libtommath/bn_mp_mul_d.c
-           src/libtommath/bn_mp_neg.c
-           src/libtommath/bn_mp_n_root.c
-           src/libtommath/bn_mp_or.c
-           src/libtommath/bn_mp_prime_fermat.c
-           src/libtommath/bn_mp_prime_is_divisible.c
-           src/libtommath/bn_mp_prime_is_prime.c
-           src/libtommath/bn_mp_prime_miller_rabin.c
-           src/libtommath/bn_mp_prime_next_prime.c
-           src/libtommath/bn_mp_prime_rabin_miller_trials.c
-           src/libtommath/bn_mp_prime_random_ex.c
-           src/libtommath/bn_mp_radix_size.c
-           src/libtommath/bn_mp_radix_smap.c
-           src/libtommath/bn_mp_rand.c
-           src/libtommath/bn_mp_read_radix.c
-           src/libtommath/bn_mp_read_signed_bin.c
-           src/libtommath/bn_mp_read_unsigned_bin.c
-           src/libtommath/bn_mp_reduce.c
-           src/libtommath/bn_mp_reduce_2k.c
-           src/libtommath/bn_mp_reduce_2k_l.c
-           src/libtommath/bn_mp_reduce_2k_setup.c
-           src/libtommath/bn_mp_reduce_2k_setup_l.c
-           src/libtommath/bn_mp_reduce_is_2k.c
-           src/libtommath/bn_mp_reduce_is_2k_l.c
-           src/libtommath/bn_mp_reduce_setup.c
-           src/libtommath/bn_mp_rshd.c
-           src/libtommath/bn_mp_set.c
-           src/libtommath/bn_mp_set_int.c
-           src/libtommath/bn_mp_shrink.c
-           src/libtommath/bn_mp_signed_bin_size.c
-           src/libtommath/bn_mp_sqr.c
-           src/libtommath/bn_mp_sqrmod.c
-           src/libtommath/bn_mp_sqrt.c
-           src/libtommath/bn_mp_sub.c
-           src/libtommath/bn_mp_submod.c
-           src/libtommath/bn_mp_sub_d.c
-           src/libtommath/bn_mp_toom_mul.c
-           src/libtommath/bn_mp_toom_sqr.c
-           src/libtommath/bn_mp_toradix.c
-           src/libtommath/bn_mp_toradix_n.c
-           src/libtommath/bn_mp_to_signed_bin.c
-           src/libtommath/bn_mp_to_signed_bin_n.c
-           src/libtommath/bn_mp_to_unsigned_bin.c
-           src/libtommath/bn_mp_to_unsigned_bin_n.c
-           src/libtommath/bn_mp_unsigned_bin_size.c
-           src/libtommath/bn_mp_xor.c
-           src/libtommath/bn_mp_zero.c
-           src/libtommath/bn_prime_tab.c
-           src/libtommath/bn_reverse.c
-           src/libtommath/bn_s_mp_add.c
-           src/libtommath/bn_s_mp_exptmod.c
-           src/libtommath/bn_s_mp_mul_digs.c
-           src/libtommath/bn_s_mp_mul_high_digs.c
-           src/libtommath/bn_s_mp_sqr.c
-           src/libtommath/bn_s_mp_sub.c
-)
-
-set(ZLIB_BZIP2_FILES
-           src/bzip2/blocksort.c
-           src/bzip2/bzlib.c
-           src/bzip2/compress.c
-           src/bzip2/crctable.c
-           src/bzip2/decompress.c
-           src/bzip2/huffman.c
-           src/bzip2/randtable.c
-           src/zlib/adler32.c
-           src/zlib/compress2.c
-           src/zlib/crc32.c
-           src/zlib/deflate.c
-           src/zlib/inffast.c
-           src/zlib/inflate.c
-           src/zlib/inftrees.c
-           src/zlib/trees.c
-           src/zlib/zutil.c
-)
-
-# set(TEST_SRC_FILES
-#            test/Test.cpp
-# )
-
-add_definitions(-D_7ZIP_ST -DBZ_STRICT_ANSI)
-
-if(WIN32)
-    if(MSVC)
-        message(STATUS "Using MSVC")
-        add_definitions(-D_7ZIP_ST -DWIN32)
-    else()
-        message(STATUS "Using mingw")
-    endif()
-    set(SRC_ADDITIONAL_FILES ${ZLIB_BZIP2_FILES} ${TOMCRYPT_FILES} ${TOMMATH_FILES})
-    set(LINK_LIBS wininet)
-endif()
-
-if(APPLE)
-    message(STATUS "Using Mac OS X port")
-    set(LINK_LIBS z bz2)
-    set(SRC_ADDITIONAL_FILES ${TOMCRYPT_FILES} ${TOMMATH_FILES})
-endif()
-
-if (${CMAKE_SYSTEM_NAME} STREQUAL Linux)
-    message(STATUS "Using Linux port")
-    option(WITH_LIBTOMCRYPT "Use system LibTomCrypt library" OFF)
-    if(WITH_LIBTOMCRYPT)
-        set(LINK_LIBS z bz2 tomcrypt)
-    else()
-        set(LINK_LIBS z bz2)
-        set(SRC_ADDITIONAL_FILES ${TOMCRYPT_FILES} ${TOMMATH_FILES})
-    endif()
-endif()
-
-add_library(storm SHARED ${SRC_FILES} ${SRC_ADDITIONAL_FILES})
-target_link_libraries(storm ${LINK_LIBS})
-
-# option(WITH_TEST "Compile Test application" OFF)
-# if(WITH_TEST)
-#      add_executable(storm_test ${TEST_SRC_FILES})
-#      target_link_libraries(storm_test storm)
-# endif()
-
-# option(WITH_STATIC "Compile static linked library" OFF)
-# if(WITH_STATIC)
-#     add_library(StormLib_static STATIC ${SRC_FILES} ${SRC_ADDITIONAL_FILES})
-#     target_link_libraries(StormLib_static ${LINK_LIBS})
-#     set_target_properties(StormLib_static PROPERTIES OUTPUT_NAME StormLib)
-# endif()
-
-if(APPLE)
-    set_target_properties(storm PROPERTIES FRAMEWORK true)
-    set_target_properties(storm PROPERTIES PUBLIC_HEADER "src/StormLib.h src/StormPort.h")
-    set_target_properties(storm PROPERTIES LINK_FLAGS "-framework Carbon")
-endif()
-
-if(UNIX)
-    set_target_properties(storm PROPERTIES VERSION 8.20.0)
-    set_target_properties(storm PROPERTIES SOVERSION 8.20)
-endif()
-
-# On Win32, build StormLib.dll since we don't want to clash with Storm.dll
-if(WIN32)
-    set_target_properties(storm PROPERTIES OUTPUT_NAME StormLib)
-endif()
-
-install(TARGETS storm RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib FRAMEWORK DESTINATION /Library/Frameworks)
-install(FILES src/StormLib.h src/StormPort.h DESTINATION include)
\ No newline at end of file
diff --git a/dep/StormLibOld/Info.plist b/dep/StormLibOld/Info.plist
deleted file mode 100644
index 0e1ae014f..000000000
--- a/dep/StormLibOld/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>net.zezula.${PRODUCT_NAME:rfc1034Identifier}</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>8.01</string>
-</dict>
-</plist>
diff --git a/dep/StormLibOld/Makefile.linux b/dep/StormLibOld/Makefile.linux
deleted file mode 100644
index e9d89c7d9..000000000
--- a/dep/StormLibOld/Makefile.linux
+++ /dev/null
@@ -1,275 +0,0 @@
-#####################################################################
-###
-#
-# Makefile for compiling StormLib under linux
-#
-# Author: Marko Friedemann <marko.friedemann@bmx-chemnitz.de>
-# Created at: Mon Jan 29 18:26:01 CEST 2001
-# Computer: whiplash.flachland-chemnitz.de
-# System: Linux 2.4.0 on i686
-#
-# Copyright (c) 2001 BMX-Chemnitz.DE All rights reserved.
-#
-#####################################################################
-###
-
-##############################################################
-# updated on Monday 3, 2010 by Christopher Chedeau aka vjeux #
-# updated on April 24, 2010 by Ivan Komissarov aka Nevermore #
-##############################################################
-
-C++ = g++
-CC = gcc
-AR = ar
-DFLAGS = -D__SYS_ZLIB
-OFLAGS =
-LFLAGS = -lbz2 -lz
-CFLAGS = -fPIC -D_7ZIP_ST
-CFLAGS += $(OFLAGS) $(DFLAGS)
-
-OBJS =  src/adpcm/adpcm.o \
-	src/FileStream.o \
-	src/huffman/huff.o \
-	src/SBaseCommon.o \
-	src/SBaseFileTable.o \
-	src/SCompression.o \
-	src/SFileAddFile.o \
-	src/SFileAttributes.o \
-	src/SFileCompactArchive.o \
-	src/SFileCreateArchive.o \
-	src/SFileExtractFile.o \
-	src/SFileFindFile.o \
-	src/SFileListFile.o \
-	src/SFileOpenArchive.o \
-	src/SFileOpenFileEx.o \
-	src/SFilePatchArchives.o \
-	src/SFileReadFile.o \
-	src/SFileVerify.o \
-	src/sparse/sparse.o
-
-COBJS = src/libtomcrypt/src/hashes/sha1.o \
-	src/libtomcrypt/src/hashes/hash_memory.o \
-	src/libtomcrypt/src/hashes/md5.o \
-	src/libtomcrypt/src/misc/crypt_hash_is_valid.o \
-	src/libtomcrypt/src/misc/crypt_prng_descriptor.o \
-	src/libtomcrypt/src/misc/crypt_register_prng.o \
-	src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.o \
-	src/libtomcrypt/src/misc/crypt_find_hash.o \
-	src/libtomcrypt/src/misc/zeromem.o \
-	src/libtomcrypt/src/misc/base64_decode.o \
-	src/libtomcrypt/src/misc/crypt_register_hash.o \
-	src/libtomcrypt/src/misc/crypt_find_prng.o \
-	src/libtomcrypt/src/misc/crypt_prng_is_valid.o \
-	src/libtomcrypt/src/misc/crypt_hash_descriptor.o \
-	src/libtomcrypt/src/misc/crypt_libc.o \
-	src/libtomcrypt/src/misc/crypt_argchk.o \
-	src/libtomcrypt/src/math/multi.o \
-	src/libtomcrypt/src/math/ltm_desc.o \
-	src/libtomcrypt/src/math/rand_prime.o \
-	src/libtomcrypt/src/pk/asn1/der_length_ia5_string.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_utctime.o \
-	src/libtomcrypt/src/pk/asn1/der_length_boolean.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_octet_string.o \
-	src/libtomcrypt/src/pk/asn1/der_length_object_identifier.o \
-	src/libtomcrypt/src/pk/asn1/der_length_bit_string.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.o \
-	src/libtomcrypt/src/pk/asn1/der_length_integer.o \
-	src/libtomcrypt/src/pk/asn1/der_length_sequence.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_choice.o \
-	src/libtomcrypt/src/pk/asn1/der_length_octet_string.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_printable_string.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_bit_string.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_short_integer.o \
-	src/libtomcrypt/src/pk/asn1/der_length_utctime.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_integer.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_boolean.o \
-	src/libtomcrypt/src/pk/asn1/der_sequence_free.o \
-	src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.o \
-	src/libtomcrypt/src/pk/asn1/der_length_short_integer.o \
-	src/libtomcrypt/src/pk/asn1/der_length_printable_string.o \
-	src/libtomcrypt/src/pk/asn1/der_length_utf8_string.o \
-	src/libtomcrypt/src/pk/rsa/rsa_make_key.o \
-	src/libtomcrypt/src/pk/rsa/rsa_free.o \
-	src/libtomcrypt/src/pk/rsa/rsa_verify_simple.o \
-	src/libtomcrypt/src/pk/rsa/rsa_import.o \
-	src/libtomcrypt/src/pk/rsa/rsa_verify_hash.o \
-	src/libtomcrypt/src/pk/rsa/rsa_exptmod.o \
-	src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.o \
-	src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.o \
-	src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.o \
-	src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.o \
-	src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.o \
-	src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.o \
-	src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.o \
-	src/libtomcrypt/src/pk/ecc/ltc_ecc_map.o \
-	src/libtomcrypt/src/pk/ecc/ltc_ecc_points.o \
-	src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.o \
-	src/libtommath/bn_mp_exptmod_fast.o \
-	src/libtommath/bn_mp_jacobi.o \
-	src/libtommath/bn_mp_mod.o \
-	src/libtommath/bn_mp_signed_bin_size.o \
-	src/libtommath/bn_mp_invmod.o \
-	src/libtommath/bn_mp_is_square.o \
-	src/libtommath/bn_mp_neg.o \
-	src/libtommath/bn_mp_reduce_2k.o \
-	src/libtommath/bn_mp_xor.o \
-	src/libtommath/bn_mp_karatsuba_mul.o \
-	src/libtommath/bn_mp_dr_setup.o \
-	src/libtommath/bn_mp_mul.o \
-	src/libtommath/bn_mp_init_multi.o \
-	src/libtommath/bn_mp_clear.o \
-	src/libtommath/bn_s_mp_sqr.o \
-	src/libtommath/bn_mp_rshd.o \
-	src/libtommath/bn_s_mp_sub.o \
-	src/libtommath/bn_mp_sub.o \
-	src/libtommath/bn_mp_toradix.o \
-	src/libtommath/bn_mp_reduce.o \
-	src/libtommath/bn_mp_prime_is_prime.o \
-	src/libtommath/bn_mp_prime_next_prime.o \
-	src/libtommath/bn_mp_exptmod.o \
-	src/libtommath/bn_mp_mod_2d.o \
-	src/libtommath/bn_reverse.o \
-	src/libtommath/bn_mp_init.o \
-	src/libtommath/bn_fast_s_mp_sqr.o \
-	src/libtommath/bn_mp_sqr.o \
-	src/libtommath/bn_mp_cnt_lsb.o \
-	src/libtommath/bn_mp_clear_multi.o \
-	src/libtommath/bn_mp_exch.o \
-	src/libtommath/bn_fast_s_mp_mul_digs.o \
-	src/libtommath/bn_mp_grow.o \
-	src/libtommath/bn_mp_read_radix.o \
-	src/libtommath/bn_mp_mul_2.o \
-	src/libtommath/bn_mp_shrink.o \
-	src/libtommath/bn_mp_div_2.o \
-	src/libtommath/bn_fast_mp_invmod.o \
-	src/libtommath/bn_mp_prime_miller_rabin.o \
-	src/libtommath/bn_mp_to_unsigned_bin.o \
-	src/libtommath/bn_mp_prime_rabin_miller_trials.o \
-	src/libtommath/bn_mp_2expt.o \
-	src/libtommath/bn_mp_cmp_mag.o \
-	src/libtommath/bn_mp_to_signed_bin.o \
-	src/libtommath/bn_mp_get_int.o \
-	src/libtommath/bn_mp_montgomery_reduce.o \
-	src/libtommath/bn_mp_dr_reduce.o \
-	src/libtommath/bn_mp_fwrite.o \
-	src/libtommath/bn_mp_and.o \
-	src/libtommath/bn_mp_exteuclid.o \
-	src/libtommath/bn_fast_mp_montgomery_reduce.o \
-	src/libtommath/bn_s_mp_mul_high_digs.o \
-	src/libtommath/bn_mp_reduce_setup.o \
-	src/libtommath/bn_mp_lcm.o \
-	src/libtommath/bn_mp_abs.o \
-	src/libtommath/bn_mp_cmp.o \
-	src/libtommath/bn_mp_submod.o \
-	src/libtommath/bn_mp_div_d.o \
-	src/libtommath/bn_s_mp_mul_digs.o \
-	src/libtommath/bn_mp_mul_d.o \
-	src/libtommath/bn_mp_to_unsigned_bin_n.o \
-	src/libtommath/bn_mp_prime_random_ex.o \
-	src/libtommath/bn_mp_rand.o \
-	src/libtommath/bn_mp_div_2d.o \
-	src/libtommath/bn_mp_addmod.o \
-	src/libtommath/bn_mp_init_copy.o \
-	src/libtommath/bn_mp_read_unsigned_bin.o \
-	src/libtommath/bn_mp_toradix_n.o \
-	src/libtommath/bn_fast_s_mp_mul_high_digs.o \
-	src/libtommath/bn_mp_toom_sqr.o \
-	src/libtommath/bn_mp_to_signed_bin_n.o \
-	src/libtommath/bn_mp_reduce_2k_setup_l.o \
-	src/libtommath/bn_mp_div.o \
-	src/libtommath/bn_prime_tab.o \
-	src/libtommath/bn_mp_karatsuba_sqr.o \
-	src/libtommath/bn_mp_gcd.o \
-	src/libtommath/bn_mp_prime_is_divisible.o \
-	src/libtommath/bn_mp_set_int.o \
-	src/libtommath/bn_mp_prime_fermat.o \
-	src/libtommath/bn_mp_cmp_d.o \
-	src/libtommath/bn_mp_add.o \
-	src/libtommath/bn_mp_sub_d.o \
-	src/libtommath/bn_s_mp_exptmod.o \
-	src/libtommath/bn_mp_init_size.o \
-	src/libtommath/bncore.o \
-	src/libtommath/bn_mp_radix_smap.o \
-	src/libtommath/bn_mp_reduce_2k_l.o \
-	src/libtommath/bn_mp_montgomery_calc_normalization.o \
-	src/libtommath/bn_mp_mod_d.o \
-	src/libtommath/bn_mp_set.o \
-	src/libtommath/bn_mp_or.o \
-	src/libtommath/bn_mp_sqrt.o \
-	src/libtommath/bn_mp_invmod_slow.o \
-	src/libtommath/bn_mp_count_bits.o \
-	src/libtommath/bn_mp_read_signed_bin.o \
-	src/libtommath/bn_mp_div_3.o \
-	src/libtommath/bn_mp_unsigned_bin_size.o \
-	src/libtommath/bn_mp_mulmod.o \
-	src/libtommath/bn_mp_clamp.o \
-	src/libtommath/bn_mp_reduce_2k_setup.o \
-	src/libtommath/bn_mp_toom_mul.o \
-	src/libtommath/bn_mp_montgomery_setup.o \
-	src/libtommath/bn_mp_expt_d.o \
-	src/libtommath/bn_mp_copy.o \
-	src/libtommath/bn_mp_dr_is_modulus.o \
-	src/libtommath/bn_mp_sqrmod.o \
-	src/libtommath/bn_mp_reduce_is_2k_l.o \
-	src/libtommath/bn_mp_mul_2d.o \
-	src/libtommath/bn_mp_fread.o \
-	src/libtommath/bn_mp_init_set.o \
-	src/libtommath/bn_mp_add_d.o \
-	src/libtommath/bn_mp_zero.o \
-	src/libtommath/bn_s_mp_add.o \
-	src/libtommath/bn_mp_radix_size.o \
-	src/libtommath/bn_mp_init_set_int.o \
-	src/libtommath/bn_mp_n_root.o \
-	src/libtommath/bn_mp_lshd.o \
-	src/libtommath/bn_mp_reduce_is_2k.o \
-	src/pklib/implode.o \
-	src/pklib/crc32.o \
-	src/pklib/explode.o \
-	src/zlib/crc32.o \
-	src/zlib/trees.o \
-	src/zlib/compress2.o \
-	src/zlib/adler32.o \
-	src/zlib/inftrees.o \
-	src/zlib/inffast.o \
-	src/zlib/deflate.o \
-	src/zlib/inflate.o \
-	src/zlib/zutil.o \
-	src/lzma/C/LzFind.o \
-	src/lzma/C/LzmaEnc.o \
-	src/lzma/C/LzmaDec.o \
-	src/jenkins/lookup3.o
-
-LIB = libStorm.so
-SLIB = libStorm.a
-
-all: $(OBJS) $(COBJS) $(LIB) $(SLIB)
-
-$(LIB): $(OBJS) $(COBJS)
-	$(C++) $(ARCH) -shared -o $(LIB) $(OBJS) $(COBJS) $(LFLAGS)
-
-$(SLIB): $(OBJS) $(COBJS)
-	$(AR) rcs $(SLIB) $(OBJS) $(COBJS)
-
-clean:
-	rm -f $(OBJS) $(COBJS) $(LIB)
-
-$(OBJS): %.o: %.cpp
-	$(C++) -o $@ $(CFLAGS) -c $<
-
-$(COBJS): %.o: %.c
-	$(CC) -o $@ $(CFLAGS) -c $<
-
-$(LIB): $(OBJS) $(COBJS)
-
-all: $(LIB)
-
-install: $(LIB)
-	install $(LIB) /usr/local/lib
-	mkdir -p /usr/local/include/StormLib
-	cp src/StormLib.h /usr/local/include/StormLib
-	cp src/StormPort.h /usr/local/include/StormLib
-	ldconfig
diff --git a/dep/StormLibOld/Makefile.mac b/dep/StormLibOld/Makefile.mac
deleted file mode 100644
index 0ca783426..000000000
--- a/dep/StormLibOld/Makefile.mac
+++ /dev/null
@@ -1,253 +0,0 @@
-#####################################################################
-#
-# Makefile for compiling StormLib with g++ on Mac
-#
-# Author: Ladislav Zezula
-# Created: Mon May 10 14:13:00 CEST 2010
-# System: Mac OS X (64bit)
-#    
-#####################################################################
-
-CPP    = g++
-CC     = gcc
-CFLAGS = -Wall
-LFLAGS = -lbz2 -lz -framework Carbon
-ARCH = -arch x86_64
-DFLAGS = -D__SYS_BZLIB -D__SYS_ZLIB -D_7ZIP_ST
-AR     = ar
-ARFLAGS= rcs
-
-LIBRARY  = libStorm.dylib
-
-OBJS_CPP = src/adpcm/adpcm.obj \
-           src/huffman/huff.obj \
-           src/sparse/sparse.obj \
-           src/FileStream.obj \
-           src/SBaseCommon.o \
-           src/SBaseFileTable.o \
-           src/SCompression.obj \
-           src/SFileAddFile.obj \
-           src/SFileAttributes.obj \
-           src/SFileCompactArchive.obj \
-           src/SFileCreateArchive.obj \
-           src/SFileExtractFile.obj \
-           src/SFileFindFile.obj \
-           src/SFileListFile.obj \
-           src/SFileOpenArchive.obj \
-           src/SFileOpenFileEx.obj \
-           src/SFilePatchArchives.obj \
-           src/SFileReadFile.obj \
-           src/SFileVerify.obj
-
-
-OBJS_C   = src/jenkins/lookup3.o \
-           src/libtomcrypt/src/hashes/hash_memory.obj \
-           src/libtomcrypt/src/hashes/md5.obj \
-           src/libtomcrypt/src/hashes/sha1.obj\
-           src/libtomcrypt/src/math/ltm_desc.obj \
-           src/libtomcrypt/src/math/multi.obj \
-           src/libtomcrypt/src/math/rand_prime.obj \
-           src/libtomcrypt/src/misc/base64_decode.obj \
-           src/libtomcrypt/src/misc/crypt_argchk.obj \
-           src/libtomcrypt/src/misc/crypt_find_hash.obj \
-           src/libtomcrypt/src/misc/crypt_find_prng.obj \
-           src/libtomcrypt/src/misc/crypt_hash_descriptor.obj \
-           src/libtomcrypt/src/misc/crypt_hash_is_valid.obj \
-           src/libtomcrypt/src/misc/crypt_libc.obj \
-           src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.obj \
-           src/libtomcrypt/src/misc/crypt_prng_descriptor.obj \
-           src/libtomcrypt/src/misc/crypt_prng_is_valid.obj \
-           src/libtomcrypt/src/misc/crypt_register_hash.obj \
-           src/libtomcrypt/src/misc/crypt_register_prng.obj \
-           src/libtomcrypt/src/misc/zeromem.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_bit_string.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_boolean.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_choice.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_integer.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_octet_string.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_printable_string.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_short_integer.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_utctime.obj \
-           src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.obj \
-           src/libtomcrypt/src/pk/asn1/der_length_bit_string.obj \
-           src/libtomcrypt/src/pk/asn1/der_length_boolean.obj \
-           src/libtomcrypt/src/pk/asn1/der_length_ia5_string.obj \
-           src/libtomcrypt/src/pk/asn1/der_length_integer.obj \
-           src/libtomcrypt/src/pk/asn1/der_length_object_identifier.obj \
-           src/libtomcrypt/src/pk/asn1/der_length_octet_string.obj \
-           src/libtomcrypt/src/pk/asn1/der_length_printable_string.obj \
-           src/libtomcrypt/src/pk/asn1/der_length_sequence.obj \
-           src/libtomcrypt/src/pk/asn1/der_length_short_integer.obj \
-
-           src/libtomcrypt/src/pk/asn1/der_length_utctime.obj \
-
-           src/libtomcrypt/src/pk/asn1/der_length_utf8_string.obj \
-
-           src/libtomcrypt/src/pk/asn1/der_sequence_free.obj \
-
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_map.obj \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.obj \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.obj \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_points.obj \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.obj \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.obj \
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.obj \
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.obj \
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.obj \
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.obj \
-           src/libtomcrypt/src/pk/rsa/rsa_exptmod.obj \
-           src/libtomcrypt/src/pk/rsa/rsa_free.obj \
-           src/libtomcrypt/src/pk/rsa/rsa_import.obj \
-           src/libtomcrypt/src/pk/rsa/rsa_make_key.obj \
-           src/libtomcrypt/src/pk/rsa/rsa_verify_hash.obj \
-           src/libtomcrypt/src/pk/rsa/rsa_verify_simple.obj \
-           src/libtommath/bncore.obj \
-           src/libtommath/bn_fast_mp_invmod.obj \
-           src/libtommath/bn_fast_mp_montgomery_reduce.obj \
-           src/libtommath/bn_fast_s_mp_mul_digs.obj \
-           src/libtommath/bn_fast_s_mp_mul_high_digs.obj \
-           src/libtommath/bn_fast_s_mp_sqr.obj \
-           src/libtommath/bn_mp_2expt.obj \
-           src/libtommath/bn_mp_abs.obj \
-           src/libtommath/bn_mp_add.obj \
-           src/libtommath/bn_mp_addmod.obj \
-           src/libtommath/bn_mp_add_d.obj \
-           src/libtommath/bn_mp_and.obj \
-           src/libtommath/bn_mp_clamp.obj \
-           src/libtommath/bn_mp_clear.obj \
-           src/libtommath/bn_mp_clear_multi.obj \
-           src/libtommath/bn_mp_cmp.obj \
-           src/libtommath/bn_mp_cmp_d.obj \
-           src/libtommath/bn_mp_cmp_mag.obj \
-           src/libtommath/bn_mp_cnt_lsb.obj \
-           src/libtommath/bn_mp_copy.obj \
-           src/libtommath/bn_mp_count_bits.obj \
-           src/libtommath/bn_mp_div.obj \
-           src/libtommath/bn_mp_div_2.obj \
-           src/libtommath/bn_mp_div_2d.obj \
-           src/libtommath/bn_mp_div_3.obj \
-           src/libtommath/bn_mp_div_d.obj \
-           src/libtommath/bn_mp_dr_is_modulus.obj \
-           src/libtommath/bn_mp_dr_reduce.obj \
-           src/libtommath/bn_mp_dr_setup.obj \
-           src/libtommath/bn_mp_exch.obj \
-           src/libtommath/bn_mp_exptmod.obj \
-           src/libtommath/bn_mp_exptmod_fast.obj \
-           src/libtommath/bn_mp_expt_d.obj \
-           src/libtommath/bn_mp_exteuclid.obj \
-           src/libtommath/bn_mp_fread.obj \
-           src/libtommath/bn_mp_fwrite.obj \
-           src/libtommath/bn_mp_gcd.obj \
-           src/libtommath/bn_mp_get_int.obj \
-           src/libtommath/bn_mp_grow.obj \
-           src/libtommath/bn_mp_init.obj \
-           src/libtommath/bn_mp_init_copy.obj \
-           src/libtommath/bn_mp_init_multi.obj \
-           src/libtommath/bn_mp_init_set.obj \
-           src/libtommath/bn_mp_init_set_int.obj \
-           src/libtommath/bn_mp_init_size.obj \
-           src/libtommath/bn_mp_invmod.obj \
-           src/libtommath/bn_mp_invmod_slow.obj \
-           src/libtommath/bn_mp_is_square.obj \
-           src/libtommath/bn_mp_jacobi.obj \
-           src/libtommath/bn_mp_karatsuba_mul.obj \
-           src/libtommath/bn_mp_karatsuba_sqr.obj \
-           src/libtommath/bn_mp_lcm.obj \
-           src/libtommath/bn_mp_lshd.obj \
-           src/libtommath/bn_mp_mod.obj \
-           src/libtommath/bn_mp_mod_2d.obj \
-           src/libtommath/bn_mp_mod_d.obj \
-           src/libtommath/bn_mp_montgomery_calc_normalization.obj \
-           src/libtommath/bn_mp_montgomery_reduce.obj \
-           src/libtommath/bn_mp_montgomery_setup.obj \
-           src/libtommath/bn_mp_mul.obj \
-           src/libtommath/bn_mp_mulmod.obj \
-           src/libtommath/bn_mp_mul_2.obj \
-           src/libtommath/bn_mp_mul_2d.obj \
-           src/libtommath/bn_mp_mul_d.obj \
-           src/libtommath/bn_mp_neg.obj \
-           src/libtommath/bn_mp_n_root.obj \
-           src/libtommath/bn_mp_or.obj \
-           src/libtommath/bn_mp_prime_fermat.obj \
-           src/libtommath/bn_mp_prime_is_divisible.obj \
-           src/libtommath/bn_mp_prime_is_prime.obj \
-           src/libtommath/bn_mp_prime_miller_rabin.obj \
-           src/libtommath/bn_mp_prime_next_prime.obj \
-           src/libtommath/bn_mp_prime_rabin_miller_trials.obj \
-           src/libtommath/bn_mp_prime_random_ex.obj \
-           src/libtommath/bn_mp_radix_size.obj \
-           src/libtommath/bn_mp_radix_smap.obj \
-           src/libtommath/bn_mp_rand.obj \
-           src/libtommath/bn_mp_read_radix.obj \
-           src/libtommath/bn_mp_read_signed_bin.obj \
-           src/libtommath/bn_mp_read_unsigned_bin.obj \
-           src/libtommath/bn_mp_reduce.obj \
-           src/libtommath/bn_mp_reduce_2k.obj \
-           src/libtommath/bn_mp_reduce_2k_l.obj \
-           src/libtommath/bn_mp_reduce_2k_setup.obj \
-           src/libtommath/bn_mp_reduce_2k_setup_l.obj \
-           src/libtommath/bn_mp_reduce_is_2k.obj \
-           src/libtommath/bn_mp_reduce_is_2k_l.obj \
-           src/libtommath/bn_mp_reduce_setup.obj \
-           src/libtommath/bn_mp_rshd.obj \
-           src/libtommath/bn_mp_set.obj \
-           src/libtommath/bn_mp_set_int.obj \
-           src/libtommath/bn_mp_shrink.obj \
-           src/libtommath/bn_mp_signed_bin_size.obj \
-           src/libtommath/bn_mp_sqr.obj \
-           src/libtommath/bn_mp_sqrmod.obj \
-           src/libtommath/bn_mp_sqrt.obj \
-           src/libtommath/bn_mp_sub.obj \
-           src/libtommath/bn_mp_submod.obj \
-           src/libtommath/bn_mp_sub_d.obj \
-           src/libtommath/bn_mp_toom_mul.obj \
-           src/libtommath/bn_mp_toom_sqr.obj \
-           src/libtommath/bn_mp_toradix.obj \
-           src/libtommath/bn_mp_toradix_n.obj \
-           src/libtommath/bn_mp_to_signed_bin.obj \
-           src/libtommath/bn_mp_to_signed_bin_n.obj \
-           src/libtommath/bn_mp_to_unsigned_bin.obj \
-           src/libtommath/bn_mp_to_unsigned_bin_n.obj \
-           src/libtommath/bn_mp_unsigned_bin_size.obj \
-           src/libtommath/bn_mp_xor.obj \
-           src/libtommath/bn_mp_zero.obj \
-           src/libtommath/bn_prime_tab.obj \
-           src/libtommath/bn_reverse.obj \
-           src/libtommath/bn_s_mp_add.obj \
-           src/libtommath/bn_s_mp_exptmod.obj \
-           src/libtommath/bn_s_mp_mul_digs.obj \
-           src/libtommath/bn_s_mp_mul_high_digs.obj \
-           src/libtommath/bn_s_mp_sqr.obj \
-           src/libtommath/bn_s_mp_sub.obj \
-           src/lzma/C/LzFind.obj \
-           src/lzma/C/LzmaDec.obj \
-           src/lzma/C/LzmaEnc.obj \
-           src/pklib/explode.obj \
-           src/pklib/implode.obj
-
-all: $(LIBRARY)
-
-#clean:
-#   rm -f $(OBJS) $(LIBRARY)
-
-#install: $(LIBRARY)
-#   install $(LIBRARY) /usr/local/lib
-#   mkdir -p /usr/local/include/StormLib
-#   cp StormLib.h /usr/local/include/StormLib
-#   cp StormPort.h /usr/local/include/StormLib
-
-$(LIBRARY): $(OBJS_C) $(OBJS_CPP)
-	$(CPP) $(CFLAGS) $(DFLAGS) $(ARCH) $(LFLAGS) -shared -o $(LIBRARY) $(OBJS_C) $(OBJS_CPP)
-#	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJS_C) $(OBJS_CPP)
-
-$(OBJS_C): %.obj: %.c
-	$(CC) -o $@ $(CFLAGS) $(DFLAGS) -c $<
-
-$(OBJS_CPP): %.obj: %.cpp
-	$(CC) -o $@ $(CFLAGS) $(DFLAGS) -c $<
-
diff --git a/dep/StormLibOld/Publish.bat b/dep/StormLibOld/Publish.bat
deleted file mode 100644
index 59db0b1e3..000000000
--- a/dep/StormLibOld/Publish.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-@echo off
-rem This BAT file updates the ZIP file that is to be uploaded to web
-rem Only use when both 32-bit and 64-bit are properly compiled
-
-echo Creating stormlib.zip ...
-cd \Ladik\Appdir
-zip.exe -ur9 ..\WWW\web\download\stormlib.zip StormLib\doc\*
-zip.exe -ur9 ..\WWW\web\download\stormlib.zip StormLib\src\*
-zip.exe -ur9 ..\WWW\web\download\stormlib.zip StormLib\storm_dll\*
-zip.exe -ur9 ..\WWW\web\download\stormlib.zip StormLib\StormLib.xcodeproj\*
-zip.exe -ur9 ..\WWW\web\download\stormlib.zip StormLib\stormlib_dll\*
-zip.exe -ur9 ..\WWW\web\download\stormlib.zip StormLib\test\*
-zip.exe -u9  ..\WWW\web\download\stormlib.zip StormLib\CMakeLists.txt
-zip.exe -u9  ..\WWW\web\download\stormlib.zip StormLib\makefile.*
-zip.exe -u9  ..\WWW\web\download\stormlib.zip StormLib\Info.plist
-zip.exe -u9  ..\WWW\web\download\stormlib.zip StormLib\*.bat
-zip.exe -u9  ..\WWW\web\download\stormlib.zip StormLib\*.sln
-zip.exe -u9  ..\WWW\web\download\stormlib.zip StormLib\*.vcproj
-echo.
-
-echo Press any key to exit ...
-pause >nul
diff --git a/dep/StormLibOld/Publish_beta.bat b/dep/StormLibOld/Publish_beta.bat
deleted file mode 100644
index 380ea1c84..000000000
--- a/dep/StormLibOld/Publish_beta.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-@echo off
-rem This BAT file updates the ZIP file that is to be uploaded to web
-rem Only use when both 32-bit and 64-bit are properly compiled
-
-echo Creating stormlib_beta.zip ...
-cd \Ladik\Appdir
-zip.exe -ur9 ..\WWW\web\download\stormlib_beta.zip StormLib\doc\*
-zip.exe -ur9 ..\WWW\web\download\stormlib_beta.zip StormLib\src\*
-zip.exe -ur9 ..\WWW\web\download\stormlib_beta.zip StormLib\storm_dll\*
-zip.exe -ur9 ..\WWW\web\download\stormlib_beta.zip StormLib\StormLib.xcodeproj\*
-zip.exe -ur9 ..\WWW\web\download\stormlib_beta.zip StormLib\stormlib_dll\*
-zip.exe -ur9 ..\WWW\web\download\stormlib_beta.zip StormLib\test\*
-zip.exe -u9  ..\WWW\web\download\stormlib_beta.zip StormLib\CMakeLists.txt
-zip.exe -u9  ..\WWW\web\download\stormlib_beta.zip StormLib\makefile.*
-zip.exe -u9  ..\WWW\web\download\stormlib_beta.zip StormLib\Info.plist
-zip.exe -u9  ..\WWW\web\download\stormlib_beta.zip StormLib\*.bat
-zip.exe -u9  ..\WWW\web\download\stormlib_beta.zip StormLib\*.sln
-zip.exe -u9  ..\WWW\web\download\stormlib_beta.zip StormLib\*.vcproj
-echo.
-
-echo Press any key to exit ...
-pause >nul
diff --git a/dep/StormLibOld/README.md b/dep/StormLibOld/README.md
deleted file mode 100644
index e14d3d99b..000000000
--- a/dep/StormLibOld/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-stormlib ![Project status](http://getmangos.co.uk/assets/img/repository-status-maintained.png)
-========
-
-The StormLib library is a pack of modules, written in C++, which are able to
-read and also to write files from/to the MPQ archives.
-
-MPQ (MoPaQ) is an archive format developed by Blizzard Entertainment,
-purposed for storing data files, images, sounds, music and videos for their
-games.
-
-*Notice*: this repository is meant to track the development of the original
-[stormlib][1], developed by [Ladislav Zezula][2].
-
-Usage
------
-This library is used inside of [mangos-zero][3] to access data inside of MPQ
-archives included in the [World of Warcraft][4] game client.
-
-
-[1]: http://www.zezula.net/en/mpq/stormlib.html "StormLib"
-[2]: http://www.zezula.net/ "Ladislav Zezula"
-[3]: http://github.com/mangos-zero "mangos-zero"
-[4]: http://eu.blizzard.com/en-gb/games/wow/ "World of Warcraft"
diff --git a/dep/StormLibOld/StormLib.bat b/dep/StormLibOld/StormLib.bat
deleted file mode 100644
index 5228a26b2..000000000
--- a/dep/StormLibOld/StormLib.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-@echo off
-rem Post-build batch for StormLib project
-rem Called as StormLib.bat $(PlatformName) $(ConfigurationName)
-rem Example: StormLib.bat x64 Debug
-
-copy src\StormPort.h ..\aaa\inc
-copy src\StormLib.h  ..\aaa\inc
-
-if x%1 == xWin32 goto PlatformWin32
-if x%1 == xx64 goto PlatformWin64
-goto exit
-
-:PlatformWin32
-copy .\bin\Stormlib\%1\%2\*.lib    ..\aaa\lib32
-goto exit
-
-:PlatformWin64
-copy .\bin\Stormlib\%1\%2\*.lib    ..\aaa\lib64
-goto exit
-
-:exit
-
diff --git a/dep/StormLibOld/StormLib.sln b/dep/StormLibOld/StormLib.sln
deleted file mode 100644
index 758f29c30..000000000
--- a/dep/StormLibOld/StormLib.sln
+++ /dev/null
@@ -1,140 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "StormLib.vcproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_dll", "StormLib_dll.vcproj", "{CB385198-50B1-4CF4-883B-11F042DED6AA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_test", "StormLib_test.vcproj", "{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		DebugAD|Win32 = DebugAD|Win32
-		DebugAD|x64 = DebugAD|x64
-		DebugAS|Win32 = DebugAS|Win32
-		DebugAS|x64 = DebugAS|x64
-		DebugUD|Win32 = DebugUD|Win32
-		DebugUD|x64 = DebugUD|x64
-		DebugUS|Win32 = DebugUS|Win32
-		DebugUS|x64 = DebugUS|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseAD|Win32 = ReleaseAD|Win32
-		ReleaseAD|x64 = ReleaseAD|x64
-		ReleaseAS|Win32 = ReleaseAS|Win32
-		ReleaseAS|x64 = ReleaseAS|x64
-		ReleaseUD|Win32 = ReleaseUD|Win32
-		ReleaseUD|x64 = ReleaseUD|x64
-		ReleaseUS|Win32 = ReleaseUS|Win32
-		ReleaseUS|x64 = ReleaseUS|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|Win32.Build.0 = Debug|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|x64.ActiveCfg = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|x64.Build.0 = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|Win32.ActiveCfg = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|x64.ActiveCfg = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|x64.Build.0 = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|Win32.ActiveCfg = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|x64.ActiveCfg = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|x64.Build.0 = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUD|Win32.ActiveCfg = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUD|x64.ActiveCfg = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUD|x64.Build.0 = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUS|Win32.ActiveCfg = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUS|x64.ActiveCfg = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugUS|x64.Build.0 = Debug|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|Win32.ActiveCfg = Release|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|Win32.Build.0 = Release|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|x64.ActiveCfg = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|x64.Build.0 = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|Win32.ActiveCfg = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|x64.ActiveCfg = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|x64.Build.0 = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|Win32.ActiveCfg = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|x64.ActiveCfg = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|x64.Build.0 = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUD|Win32.ActiveCfg = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUD|x64.ActiveCfg = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUD|x64.Build.0 = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUS|Win32.ActiveCfg = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUS|x64.ActiveCfg = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseUS|x64.Build.0 = Release|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.ActiveCfg = DebugUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.ActiveCfg = DebugUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.Build.0 = DebugUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.ActiveCfg = DebugAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.Build.0 = DebugAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.ActiveCfg = DebugAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.Build.0 = DebugAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.ActiveCfg = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.Build.0 = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.ActiveCfg = DebugAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.Build.0 = DebugAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUD|Win32.ActiveCfg = DebugUD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUD|Win32.Build.0 = DebugUD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUD|x64.ActiveCfg = DebugUD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUD|x64.Build.0 = DebugUD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUS|Win32.ActiveCfg = DebugUS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUS|Win32.Build.0 = DebugUS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUS|x64.ActiveCfg = DebugUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugUS|x64.Build.0 = DebugUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.ActiveCfg = ReleaseUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.ActiveCfg = ReleaseUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.Build.0 = ReleaseUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.ActiveCfg = ReleaseAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.Build.0 = ReleaseAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.ActiveCfg = ReleaseAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.Build.0 = ReleaseAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.ActiveCfg = ReleaseAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.Build.0 = ReleaseAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.ActiveCfg = ReleaseAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.Build.0 = ReleaseAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUD|Win32.ActiveCfg = ReleaseUD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUD|Win32.Build.0 = ReleaseUD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUD|x64.ActiveCfg = ReleaseUD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUD|x64.Build.0 = ReleaseUD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUS|Win32.ActiveCfg = ReleaseUS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUS|Win32.Build.0 = ReleaseUS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUS|x64.ActiveCfg = ReleaseUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseUS|x64.Build.0 = ReleaseUS|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|Win32.Build.0 = Debug|Win32
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|x64.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|x64.Build.0 = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|Win32.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|x64.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|x64.Build.0 = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|Win32.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|x64.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|x64.Build.0 = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUD|Win32.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUD|x64.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUD|x64.Build.0 = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUS|Win32.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUS|x64.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugUS|x64.Build.0 = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|Win32.ActiveCfg = Release|Win32
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|Win32.Build.0 = Release|Win32
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|x64.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|x64.Build.0 = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|Win32.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|x64.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|x64.Build.0 = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|Win32.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|x64.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|x64.Build.0 = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUD|Win32.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUD|x64.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUD|x64.Build.0 = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUS|Win32.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUS|x64.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseUS|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/dep/StormLibOld/StormLib.vcproj b/dep/StormLibOld/StormLib.vcproj
deleted file mode 100644
index cccd638d3..000000000
--- a/dep/StormLibOld/StormLib.vcproj
+++ /dev/null
@@ -1,21605 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="StormLib"
-	ProjectGUID="{78424708-1F6E-4D4B-920C-FB6D26847055}"
-	RootNamespace="StormLib"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="DebugAD|Win32"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)DAD.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DebugAD|x64"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)DAD.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DebugAS|Win32"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)DAS.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DebugAS|x64"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)DAS.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseAD|Win32"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)RAD.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseAD|x64"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)RAD.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseAS|Win32"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)RAS.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseAS|x64"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)RAS.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DebugUD|Win32"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)DUD.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DebugUD|x64"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)DUD.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DebugUS|Win32"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)DUS.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DebugUS|x64"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)DUS.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseUD|Win32"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)RUD.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseUD|x64"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)RUD.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseUS|Win32"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)RUS.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseUS|x64"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\$(ProjectName)RUS.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="StormLib.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Doc Files"
-			>
-			<File
-				RelativePath=".\doc\History.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\doc\The MoPaQ File Format 0.9.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\doc\The MoPaQ File Format 1.0.txt"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
-			<File
-				RelativePath=".\src\StormCommon.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StormLib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StormPort.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			>
-			<File
-				RelativePath=".\src\FileStream.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SBaseCommon.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SBaseFileTable.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SCompression.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileAddFile.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileAttributes.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileCompactArchive.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileCreateArchive.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileExtractFile.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileFindFile.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileListFile.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileOpenArchive.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileOpenFileEx.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFilePatchArchives.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileReadFile.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileVerify.cpp"
-				>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseUS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-						PrecompiledHeaderThrough="StormCommon.h"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="adpcm"
-				>
-				<File
-					RelativePath=".\src\adpcm\adpcm.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\adpcm\adpcm.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="bzip2"
-				>
-				<File
-					RelativePath=".\src\bzip2\blocksort.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\bzlib.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\compress.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\crctable.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\decompress.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\huffman.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\randtable.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="huffman"
-				>
-				<File
-					RelativePath=".\src\huffman\huff.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\huffman\huff.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="libtomcrypt"
-				>
-				<Filter
-					Name="hashes"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\hash_memory.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\md5.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\sha1.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="math"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\ltm_desc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\multi.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\rand_prime.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="misc"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\base64_decode.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_argchk.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_find_hash.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_find_prng.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_hash_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_hash_is_valid.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_libc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_prng_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_prng_is_valid.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_register_hash.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_register_prng.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\zeromem.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="pk"
-					>
-					<Filter
-						Name="asn1"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_choice.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_sequence.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_sequence_free.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="ecc"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="pkcs1"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="rsa"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_exptmod.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_free.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_import.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_make_key.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c"
-							>
-						</File>
-					</Filter>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="libtommath"
-				>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_mp_invmod.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_mp_montgomery_reduce.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_mul_digs.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_mul_high_digs.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_sqr.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_2expt.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_abs.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_add.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_add_d.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_addmod.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_and.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clamp.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clear.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clear_multi.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp_d.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp_mag.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cnt_lsb.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_copy.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_count_bits.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_2.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_2d.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_3.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_d.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_is_modulus.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_reduce.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_setup.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exch.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_expt_d.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exptmod.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exptmod_fast.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exteuclid.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_fread.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_fwrite.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_gcd.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_get_int.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_grow.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_copy.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_multi.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_set.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_set_int.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_size.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_invmod.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_invmod_slow.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_is_square.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_jacobi.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_karatsuba_mul.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_karatsuba_sqr.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_lcm.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_lshd.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod_2d.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod_d.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_calc_normalization.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_reduce.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_setup.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_2.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_2d.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_d.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mulmod.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_n_root.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_neg.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_or.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_fermat.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_is_divisible.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_is_prime.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_miller_rabin.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_next_prime.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_rabin_miller_trials.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_random_ex.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_radix_size.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_radix_smap.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_rand.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_radix.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_signed_bin.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_unsigned_bin.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_l.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_setup.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_setup_l.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_is_2k.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_is_2k_l.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_setup.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_rshd.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_set.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_set_int.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_shrink.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_signed_bin_size.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqr.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqrmod.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqrt.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sub.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sub_d.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_submod.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_signed_bin.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_signed_bin_n.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_unsigned_bin.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_unsigned_bin_n.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toom_mul.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toom_sqr.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toradix.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toradix_n.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_unsigned_bin_size.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_xor.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_zero.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_prime_tab.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_reverse.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_add.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_exptmod.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_mul_digs.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_mul_high_digs.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_sqr.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_sub.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bncore.c"
-					>
-					<FileConfiguration
-						Name="DebugAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseAS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="DebugUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUD|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough="tommath.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseUS|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							PrecompiledHeaderThrough=""
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="lzma"
-				>
-				<File
-					RelativePath=".\src\lzma\C\LzFind.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\lzma\C\LzFindMt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\lzma\C\LzmaDec.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\lzma\C\LzmaEnc.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\lzma\C\Threads.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="pklib"
-				>
-				<File
-					RelativePath=".\src\pklib\explode.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pklib\implode.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pklib\pklib.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="sparse"
-				>
-				<File
-					RelativePath=".\src\sparse\sparse.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\sparse\sparse.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="zlib"
-				>
-				<File
-					RelativePath=".\src\zlib\adler32.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\compress2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\crc32.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\deflate.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\inffast.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\inflate.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\inftrees.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\trees.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\zutil.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="jenkins"
-				>
-				<File
-					RelativePath=".\src\jenkins\lookup.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\jenkins\lookup3.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dep/StormLibOld/StormLib.vcxproj b/dep/StormLibOld/StormLib.vcxproj
deleted file mode 100644
index 328b47398..000000000
--- a/dep/StormLibOld/StormLib.vcxproj
+++ /dev/null
@@ -1,688 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugAD|Win32">
-      <Configuration>DebugAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAD|x64">
-      <Configuration>DebugAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|Win32">
-      <Configuration>DebugAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|x64">
-      <Configuration>DebugAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|Win32">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|x64">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|Win32">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|x64">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>StormLib</ProjectName>
-    <ProjectGuid>{78424708-1F6E-4D4B-920C-FB6D26847055}</ProjectGuid>
-    <RootNamespace>StormLib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">$(ProjectName)RAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">$(ProjectName)RAS</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt" />
-    <None Include="doc\The MoPaQ File Format 0.9.txt" />
-    <None Include="doc\The MoPaQ File Format 1.0.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\StormCommon.h" />
-    <ClInclude Include="src\StormLib.h" />
-    <ClInclude Include="src\StormPort.h" />
-    <ClInclude Include="src\adpcm\adpcm.h" />
-    <ClInclude Include="src\huffman\huff.h" />
-    <ClInclude Include="src\pklib\pklib.h" />
-    <ClInclude Include="src\sparse\sparse.h" />
-    <ClInclude Include="src\jenkins\lookup.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\FileStream.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseCommon.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseFileTable.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SCompression.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAddFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAttributes.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCompactArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCreateArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileExtractFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileFindFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileListFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenFileEx.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFilePatchArchives.cpp" />
-    <ClCompile Include="src\SFileReadFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileVerify.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\adpcm\adpcm.cpp" />
-    <ClCompile Include="src\bzip2\blocksort.c" />
-    <ClCompile Include="src\bzip2\bzlib.c" />
-    <ClCompile Include="src\bzip2\compress.c" />
-    <ClCompile Include="src\bzip2\crctable.c" />
-    <ClCompile Include="src\bzip2\decompress.c" />
-    <ClCompile Include="src\bzip2\huffman.c" />
-    <ClCompile Include="src\bzip2\randtable.c" />
-    <ClCompile Include="src\huffman\huff.cpp" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="src\libtommath\bn_reverse.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bncore.c" />
-    <ClCompile Include="src\lzma\C\LzFind.c" />
-    <ClCompile Include="src\lzma\C\LzFindMt.c" />
-    <ClCompile Include="src\lzma\C\LzmaDec.c" />
-    <ClCompile Include="src\lzma\C\LzmaEnc.c" />
-    <ClCompile Include="src\lzma\C\Threads.c" />
-    <ClCompile Include="src\pklib\explode.c" />
-    <ClCompile Include="src\pklib\implode.c" />
-    <ClCompile Include="src\sparse\sparse.cpp" />
-    <ClCompile Include="src\zlib\adler32.c" />
-    <ClCompile Include="src\zlib\compress2.c" />
-    <ClCompile Include="src\zlib\crc32.c" />
-    <ClCompile Include="src\zlib\deflate.c" />
-    <ClCompile Include="src\zlib\inffast.c" />
-    <ClCompile Include="src\zlib\inflate.c" />
-    <ClCompile Include="src\zlib\inftrees.c" />
-    <ClCompile Include="src\zlib\trees.c" />
-    <ClCompile Include="src\zlib\zutil.c" />
-    <ClCompile Include="src\jenkins\lookup3.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/StormLibOld/StormLib.vcxproj.filters b/dep/StormLibOld/StormLib.vcxproj.filters
deleted file mode 100644
index ef66e8266..000000000
--- a/dep/StormLibOld/StormLib.vcxproj.filters
+++ /dev/null
@@ -1,773 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Doc Files">
-      <UniqueIdentifier>{effa28bb-96bc-4993-9585-b693f1b43fed}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{7286f457-bd1b-48bb-a3db-f0578efc1599}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{d600e869-3d0d-4e8c-a7a1-3d8e197a2221}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\adpcm">
-      <UniqueIdentifier>{ebdeaea5-c32f-45d5-8f90-3eaa095c6718}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\bzip2">
-      <UniqueIdentifier>{7dec5e6c-4b3a-4b2e-a101-be989834099d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\huffman">
-      <UniqueIdentifier>{1bfbfc3e-5dc4-4b0c-854b-e89d6640a2fc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt">
-      <UniqueIdentifier>{47adf465-3887-4876-bf83-d37b4a985aaa}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\hashes">
-      <UniqueIdentifier>{790545bb-38f9-4912-bbe3-12df58f4baa5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\math">
-      <UniqueIdentifier>{94bebdeb-9e41-4035-86f0-7f6ae11e2554}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\misc">
-      <UniqueIdentifier>{ede5853a-1e68-4ece-a685-92c8332c3f14}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk">
-      <UniqueIdentifier>{a51db59f-9173-4695-a630-f0cd4a681a01}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\asn1">
-      <UniqueIdentifier>{c031a94e-2744-4a55-8816-ace1bf00100b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\ecc">
-      <UniqueIdentifier>{2f21719f-6b7b-4030-8ecf-3d78c206aeed}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\pkcs1">
-      <UniqueIdentifier>{78e6bf7d-7caf-4e0f-a6fb-6b47a29829e2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\rsa">
-      <UniqueIdentifier>{cc4ee160-f0fc-4b20-b407-321a736eef53}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtommath">
-      <UniqueIdentifier>{6e6e1703-0f73-4c7f-8ec7-43e54dc41686}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\lzma">
-      <UniqueIdentifier>{1ca211be-0681-4c87-a79f-a0d642e712b4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\pklib">
-      <UniqueIdentifier>{528999a0-8a83-4e92-8464-def8777926e9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\sparse">
-      <UniqueIdentifier>{13b274dc-aaf6-464c-ab6a-ce8043d293d7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\zlib">
-      <UniqueIdentifier>{4e915cd1-6776-4950-af15-16692935d179}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\jenkins">
-      <UniqueIdentifier>{9e077595-7d70-423c-90ce-aa5ec68eac06}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt">
-      <Filter>Doc Files</Filter>
-    </None>
-    <None Include="doc\The MoPaQ File Format 0.9.txt">
-      <Filter>Doc Files</Filter>
-    </None>
-    <None Include="doc\The MoPaQ File Format 1.0.txt">
-      <Filter>Doc Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\StormCommon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StormLib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StormPort.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\adpcm\adpcm.h">
-      <Filter>Source Files\adpcm</Filter>
-    </ClInclude>
-    <ClInclude Include="src\huffman\huff.h">
-      <Filter>Source Files\huffman</Filter>
-    </ClInclude>
-    <ClInclude Include="src\pklib\pklib.h">
-      <Filter>Source Files\pklib</Filter>
-    </ClInclude>
-    <ClInclude Include="src\sparse\sparse.h">
-      <Filter>Source Files\sparse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\jenkins\lookup.h">
-      <Filter>Source Files\jenkins</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\FileStream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SBaseCommon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SBaseFileTable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SCompression.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileAddFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileAttributes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileCompactArchive.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileCreateArchive.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileExtractFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileFindFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileListFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenArchive.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenFileEx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFilePatchArchives.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileReadFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileVerify.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\adpcm\adpcm.cpp">
-      <Filter>Source Files\adpcm</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\blocksort.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\bzlib.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\compress.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\crctable.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\decompress.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\huffman.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\randtable.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\huffman\huff.cpp">
-      <Filter>Source Files\huffman</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_abs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_add.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_and.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clear.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_copy.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exch.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_fread.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_grow.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_neg.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_or.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_rand.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_set.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sub.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_submod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_xor.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_zero.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_prime_tab.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_reverse.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bncore.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\LzFind.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\LzFindMt.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\LzmaDec.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\LzmaEnc.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\Threads.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pklib\explode.c">
-      <Filter>Source Files\pklib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pklib\implode.c">
-      <Filter>Source Files\pklib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\sparse\sparse.cpp">
-      <Filter>Source Files\sparse</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\adler32.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\compress2.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\crc32.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\deflate.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\inffast.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\inflate.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\inftrees.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\trees.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\zutil.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\jenkins\lookup3.c">
-      <Filter>Source Files\jenkins</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/StormLibOld/StormLib.xcodeproj/project.pbxproj b/dep/StormLibOld/StormLib.xcodeproj/project.pbxproj
deleted file mode 100644
index 319e26313..000000000
--- a/dep/StormLibOld/StormLib.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,1992 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		221F6A741168529C0026C852 /* LzmaDec.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F6A721168529C0026C852 /* LzmaDec.h */; };
-		221F6A751168529C0026C852 /* LzmaEnc.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F6A731168529C0026C852 /* LzmaEnc.h */; };
-		221F6A761168529C0026C852 /* LzmaDec.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F6A721168529C0026C852 /* LzmaDec.h */; };
-		221F6A771168529C0026C852 /* LzmaEnc.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F6A731168529C0026C852 /* LzmaEnc.h */; };
-		221F6A7B116852AA0026C852 /* LzmaEnc.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F6A7A116852AA0026C852 /* LzmaEnc.c */; };
-		221F6A7C116852AA0026C852 /* LzmaEnc.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F6A7A116852AA0026C852 /* LzmaEnc.c */; };
-		221F6A7E116852B20026C852 /* LzmaDec.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F6A7D116852B20026C852 /* LzmaDec.c */; };
-		221F6A7F116852B20026C852 /* LzmaDec.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F6A7D116852B20026C852 /* LzmaDec.c */; };
-		221F6AB51168545B0026C852 /* LzFind.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F6AB31168545B0026C852 /* LzFind.c */; };
-		221F6AB61168545B0026C852 /* LzFind.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F6AB41168545B0026C852 /* LzFind.h */; };
-		221F6AB71168545B0026C852 /* LzFind.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F6AB31168545B0026C852 /* LzFind.c */; };
-		221F6AB81168545B0026C852 /* LzFind.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F6AB41168545B0026C852 /* LzFind.h */; };
-		221F6ABA116854730026C852 /* LzHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F6AB9116854730026C852 /* LzHash.h */; };
-		221F6ABB116854730026C852 /* LzHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F6AB9116854730026C852 /* LzHash.h */; };
-		221F6ABD116854870026C852 /* Types.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F6ABC116854870026C852 /* Types.h */; };
-		221F6ABE116854870026C852 /* Types.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F6ABC116854870026C852 /* Types.h */; };
-		2254917B11948CE70044424D /* crypt_ltc_mp_descriptor.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184811933FCF0083AC69 /* crypt_ltc_mp_descriptor.c */; settings = {COMPILER_FLAGS = "-fno-common"; }; };
-		225530DB1056BC7900FA646A /* huff.h in Headers */ = {isa = PBXBuildFile; fileRef = 32ED009D0D03542A00AB0B4E /* huff.h */; };
-		225530DE1056BC7900FA646A /* pklib.h in Headers */ = {isa = PBXBuildFile; fileRef = 32ED00A80D03542A00AB0B4E /* pklib.h */; };
-		225530DF1056BC7900FA646A /* StormCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 32ED00AB0D03542A00AB0B4E /* StormCommon.h */; };
-		225530E01056BC7900FA646A /* StormLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 32ED00B60D03542A00AB0B4E /* StormLib.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		225530E11056BC7900FA646A /* StormPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 32ED00B70D03542A00AB0B4E /* StormPort.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		225530E31056BC8700FA646A /* huff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED009C0D03542A00AB0B4E /* huff.cpp */; };
-		225530E61056BC8700FA646A /* explode.c in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00A60D03542A00AB0B4E /* explode.c */; };
-		225530E71056BC8700FA646A /* implode.c in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00A70D03542A00AB0B4E /* implode.c */; };
-		225530E81056BC8700FA646A /* SFileAttributes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00A90D03542A00AB0B4E /* SFileAttributes.cpp */; };
-		225530E91056BC8700FA646A /* SBaseCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00AA0D03542A00AB0B4E /* SBaseCommon.cpp */; };
-		225530EA1056BC8700FA646A /* SCompression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00AC0D03542A00AB0B4E /* SCompression.cpp */; };
-		225530EB1056BC8700FA646A /* SFileCompactArchive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00AD0D03542A00AB0B4E /* SFileCompactArchive.cpp */; };
-		225530EC1056BC8700FA646A /* SFileCreateArchive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00AE0D03542A00AB0B4E /* SFileCreateArchive.cpp */; };
-		225530ED1056BC8700FA646A /* SFileExtractFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00AF0D03542A00AB0B4E /* SFileExtractFile.cpp */; };
-		225530EE1056BC8700FA646A /* SFileFindFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00B00D03542A00AB0B4E /* SFileFindFile.cpp */; };
-		225530EF1056BC8700FA646A /* SFileOpenArchive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00B10D03542A00AB0B4E /* SFileOpenArchive.cpp */; };
-		225530F01056BC8700FA646A /* SFileOpenFileEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00B20D03542A00AB0B4E /* SFileOpenFileEx.cpp */; };
-		225530F11056BC8700FA646A /* SFileReadFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00B30D03542A00AB0B4E /* SFileReadFile.cpp */; };
-		225530F21056BC8700FA646A /* SFileListFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00B40D03542A00AB0B4E /* SFileListFile.cpp */; };
-		225C734D1257CCC70009E8DA /* lookup.h in Headers */ = {isa = PBXBuildFile; fileRef = 225C734B1257CCC70009E8DA /* lookup.h */; };
-		225C734F1257CCC70009E8DA /* lookup.h in Headers */ = {isa = PBXBuildFile; fileRef = 225C734B1257CCC70009E8DA /* lookup.h */; };
-		225C73501257CCC70009E8DA /* lookup3.c in Sources */ = {isa = PBXBuildFile; fileRef = 225C734C1257CCC70009E8DA /* lookup3.c */; };
-		225C73541257CD0C0009E8DA /* SBaseFileTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 225C73531257CD0C0009E8DA /* SBaseFileTable.cpp */; };
-		225C73551257CD0C0009E8DA /* SBaseFileTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 225C73531257CD0C0009E8DA /* SBaseFileTable.cpp */; };
-		225C735A1257CD1F0009E8DA /* lookup3.c in Sources */ = {isa = PBXBuildFile; fileRef = 225C734C1257CCC70009E8DA /* lookup3.c */; };
-		225FAC9C0E53BAA100DA2CAE /* huff.h in Headers */ = {isa = PBXBuildFile; fileRef = 32ED009D0D03542A00AB0B4E /* huff.h */; };
-		225FAC9F0E53BAA100DA2CAE /* pklib.h in Headers */ = {isa = PBXBuildFile; fileRef = 32ED00A80D03542A00AB0B4E /* pklib.h */; };
-		225FACA00E53BAA100DA2CAE /* StormCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 32ED00AB0D03542A00AB0B4E /* StormCommon.h */; };
-		225FACA10E53BAA100DA2CAE /* StormLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 32ED00B60D03542A00AB0B4E /* StormLib.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		225FACA20E53BAA100DA2CAE /* StormPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 32ED00B70D03542A00AB0B4E /* StormPort.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		225FACA50E53BAB400DA2CAE /* huff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED009C0D03542A00AB0B4E /* huff.cpp */; };
-		225FACA90E53BAB400DA2CAE /* explode.c in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00A60D03542A00AB0B4E /* explode.c */; };
-		225FACAA0E53BAB400DA2CAE /* implode.c in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00A70D03542A00AB0B4E /* implode.c */; };
-		225FACAB0E53BAB400DA2CAE /* SFileAttributes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00A90D03542A00AB0B4E /* SFileAttributes.cpp */; };
-		225FACAC0E53BAB400DA2CAE /* SBaseCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00AA0D03542A00AB0B4E /* SBaseCommon.cpp */; };
-		225FACAD0E53BAB400DA2CAE /* SCompression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00AC0D03542A00AB0B4E /* SCompression.cpp */; };
-		225FACAE0E53BAB400DA2CAE /* SFileCompactArchive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00AD0D03542A00AB0B4E /* SFileCompactArchive.cpp */; };
-		225FACAF0E53BAB400DA2CAE /* SFileCreateArchive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00AE0D03542A00AB0B4E /* SFileCreateArchive.cpp */; };
-		225FACB00E53BAB400DA2CAE /* SFileExtractFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00AF0D03542A00AB0B4E /* SFileExtractFile.cpp */; };
-		225FACB10E53BAB400DA2CAE /* SFileFindFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00B00D03542A00AB0B4E /* SFileFindFile.cpp */; };
-		225FACB20E53BAB400DA2CAE /* SFileOpenArchive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00B10D03542A00AB0B4E /* SFileOpenArchive.cpp */; };
-		225FACB30E53BAB400DA2CAE /* SFileOpenFileEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00B20D03542A00AB0B4E /* SFileOpenFileEx.cpp */; };
-		225FACB40E53BAB400DA2CAE /* SFileReadFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00B30D03542A00AB0B4E /* SFileReadFile.cpp */; };
-		225FACB50E53BAB400DA2CAE /* SFileListFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32ED00B40D03542A00AB0B4E /* SFileListFile.cpp */; };
-		225FADD40E53C06600DA2CAE /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 32D20A8A0CF3902D00230E7A /* libbz2.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
-		225FADD50E53C06600DA2CAE /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 32D20A8B0CF3902D00230E7A /* libz.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
-		228B538411BF7D0D001A58DA /* FileStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 228B538311BF7D0D001A58DA /* FileStream.cpp */; };
-		228B538511BF7D0D001A58DA /* FileStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 228B538311BF7D0D001A58DA /* FileStream.cpp */; };
-		22954AD211D463AB0064B264 /* Test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2295488911D45A820064B264 /* Test.cpp */; };
-		22954AD311D463B50064B264 /* libStormLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 225530D41056BAC800FA646A /* libStormLib.a */; };
-		22954AD611D463BE0064B264 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 32D20A8A0CF3902D00230E7A /* libbz2.dylib */; };
-		22954AD711D463BE0064B264 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 32D20A8B0CF3902D00230E7A /* libz.dylib */; };
-		2299D9D71167EFA8005C19BF /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2299D9D51167EFA8005C19BF /* adpcm.cpp */; };
-		2299D9D81167EFA8005C19BF /* adpcm.h in Headers */ = {isa = PBXBuildFile; fileRef = 2299D9D61167EFA8005C19BF /* adpcm.h */; };
-		2299D9D91167EFA8005C19BF /* adpcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2299D9D51167EFA8005C19BF /* adpcm.cpp */; };
-		2299D9DA1167EFA8005C19BF /* adpcm.h in Headers */ = {isa = PBXBuildFile; fileRef = 2299D9D61167EFA8005C19BF /* adpcm.h */; };
-		2299D9DE1167EFC6005C19BF /* sparse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2299D9DC1167EFC6005C19BF /* sparse.cpp */; };
-		2299D9DF1167EFC6005C19BF /* sparse.h in Headers */ = {isa = PBXBuildFile; fileRef = 2299D9DD1167EFC6005C19BF /* sparse.h */; };
-		2299D9E01167EFC6005C19BF /* sparse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2299D9DC1167EFC6005C19BF /* sparse.cpp */; };
-		2299D9E11167EFC6005C19BF /* sparse.h in Headers */ = {isa = PBXBuildFile; fileRef = 2299D9DD1167EFC6005C19BF /* sparse.h */; };
-		2299DA4E1167FD16005C19BF /* SFileAddFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2299DA4D1167FD16005C19BF /* SFileAddFile.cpp */; };
-		2299DA4F1167FD16005C19BF /* SFileAddFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2299DA4D1167FD16005C19BF /* SFileAddFile.cpp */; };
-		22AEA122123125D800359B16 /* SFilePatchArchives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22AEA121123125D800359B16 /* SFilePatchArchives.cpp */; };
-		22AEA123123125D800359B16 /* SFilePatchArchives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22AEA121123125D800359B16 /* SFilePatchArchives.cpp */; };
-		22C9187D11933FCF0083AC69 /* hash_memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9182B11933FCF0083AC69 /* hash_memory.c */; };
-		22C9187E11933FCF0083AC69 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9182C11933FCF0083AC69 /* md5.c */; };
-		22C9187F11933FCF0083AC69 /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9182D11933FCF0083AC69 /* sha1.c */; };
-		22C9188011933FCF0083AC69 /* tomcrypt.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9182F11933FCF0083AC69 /* tomcrypt.h */; };
-		22C9188111933FCF0083AC69 /* tomcrypt_argchk.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183011933FCF0083AC69 /* tomcrypt_argchk.h */; };
-		22C9188211933FCF0083AC69 /* tomcrypt_cfg.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183111933FCF0083AC69 /* tomcrypt_cfg.h */; };
-		22C9188311933FCF0083AC69 /* tomcrypt_cipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183211933FCF0083AC69 /* tomcrypt_cipher.h */; };
-		22C9188411933FCF0083AC69 /* tomcrypt_custom.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183311933FCF0083AC69 /* tomcrypt_custom.h */; };
-		22C9188511933FCF0083AC69 /* tomcrypt_hash.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183411933FCF0083AC69 /* tomcrypt_hash.h */; };
-		22C9188611933FCF0083AC69 /* tomcrypt_mac.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183511933FCF0083AC69 /* tomcrypt_mac.h */; };
-		22C9188711933FCF0083AC69 /* tomcrypt_macros.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183611933FCF0083AC69 /* tomcrypt_macros.h */; };
-		22C9188811933FCF0083AC69 /* tomcrypt_math.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183711933FCF0083AC69 /* tomcrypt_math.h */; };
-		22C9188911933FCF0083AC69 /* tomcrypt_misc.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183811933FCF0083AC69 /* tomcrypt_misc.h */; };
-		22C9188A11933FCF0083AC69 /* tomcrypt_pk.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183911933FCF0083AC69 /* tomcrypt_pk.h */; };
-		22C9188B11933FCF0083AC69 /* tomcrypt_pkcs.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183A11933FCF0083AC69 /* tomcrypt_pkcs.h */; };
-		22C9188C11933FCF0083AC69 /* tomcrypt_prng.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183B11933FCF0083AC69 /* tomcrypt_prng.h */; };
-		22C9188D11933FCF0083AC69 /* ltm_desc.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9183D11933FCF0083AC69 /* ltm_desc.c */; };
-		22C9188E11933FCF0083AC69 /* multi.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9183E11933FCF0083AC69 /* multi.c */; };
-		22C9188F11933FCF0083AC69 /* rand_prime.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9183F11933FCF0083AC69 /* rand_prime.c */; };
-		22C9189011933FCF0083AC69 /* base64_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184111933FCF0083AC69 /* base64_decode.c */; };
-		22C9189111933FCF0083AC69 /* crypt_argchk.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184211933FCF0083AC69 /* crypt_argchk.c */; };
-		22C9189211933FCF0083AC69 /* crypt_find_hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184311933FCF0083AC69 /* crypt_find_hash.c */; };
-		22C9189311933FCF0083AC69 /* crypt_find_prng.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184411933FCF0083AC69 /* crypt_find_prng.c */; };
-		22C9189411933FCF0083AC69 /* crypt_hash_descriptor.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184511933FCF0083AC69 /* crypt_hash_descriptor.c */; };
-		22C9189511933FCF0083AC69 /* crypt_hash_is_valid.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184611933FCF0083AC69 /* crypt_hash_is_valid.c */; };
-		22C9189611933FCF0083AC69 /* crypt_libc.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184711933FCF0083AC69 /* crypt_libc.c */; };
-		22C9189811933FCF0083AC69 /* crypt_prng_descriptor.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184911933FCF0083AC69 /* crypt_prng_descriptor.c */; };
-		22C9189911933FCF0083AC69 /* crypt_prng_is_valid.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184A11933FCF0083AC69 /* crypt_prng_is_valid.c */; };
-		22C9189A11933FCF0083AC69 /* crypt_register_hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184B11933FCF0083AC69 /* crypt_register_hash.c */; };
-		22C9189B11933FCF0083AC69 /* crypt_register_prng.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184C11933FCF0083AC69 /* crypt_register_prng.c */; };
-		22C9189C11933FCF0083AC69 /* zeromem.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184D11933FCF0083AC69 /* zeromem.c */; };
-		22C9189D11933FCF0083AC69 /* der_decode_bit_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185011933FCF0083AC69 /* der_decode_bit_string.c */; };
-		22C9189E11933FCF0083AC69 /* der_decode_boolean.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185111933FCF0083AC69 /* der_decode_boolean.c */; };
-		22C9189F11933FCF0083AC69 /* der_decode_choice.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185211933FCF0083AC69 /* der_decode_choice.c */; };
-		22C918A011933FCF0083AC69 /* der_decode_ia5_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185311933FCF0083AC69 /* der_decode_ia5_string.c */; };
-		22C918A111933FCF0083AC69 /* der_decode_integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185411933FCF0083AC69 /* der_decode_integer.c */; };
-		22C918A211933FCF0083AC69 /* der_decode_object_identifier.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185511933FCF0083AC69 /* der_decode_object_identifier.c */; };
-		22C918A311933FCF0083AC69 /* der_decode_octet_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185611933FCF0083AC69 /* der_decode_octet_string.c */; };
-		22C918A411933FCF0083AC69 /* der_decode_printable_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185711933FCF0083AC69 /* der_decode_printable_string.c */; };
-		22C918A511933FCF0083AC69 /* der_decode_sequence_ex.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185811933FCF0083AC69 /* der_decode_sequence_ex.c */; };
-		22C918A611933FCF0083AC69 /* der_decode_sequence_flexi.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185911933FCF0083AC69 /* der_decode_sequence_flexi.c */; };
-		22C918A711933FCF0083AC69 /* der_decode_sequence_multi.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185A11933FCF0083AC69 /* der_decode_sequence_multi.c */; };
-		22C918A811933FCF0083AC69 /* der_decode_short_integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185B11933FCF0083AC69 /* der_decode_short_integer.c */; };
-		22C918A911933FCF0083AC69 /* der_decode_utctime.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185C11933FCF0083AC69 /* der_decode_utctime.c */; };
-		22C918AA11933FCF0083AC69 /* der_decode_utf8_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185D11933FCF0083AC69 /* der_decode_utf8_string.c */; };
-		22C918AB11933FCF0083AC69 /* der_length_bit_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185E11933FCF0083AC69 /* der_length_bit_string.c */; };
-		22C918AC11933FCF0083AC69 /* der_length_boolean.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185F11933FCF0083AC69 /* der_length_boolean.c */; };
-		22C918AD11933FCF0083AC69 /* der_length_ia5_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186011933FCF0083AC69 /* der_length_ia5_string.c */; };
-		22C918AE11933FCF0083AC69 /* der_length_integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186111933FCF0083AC69 /* der_length_integer.c */; };
-		22C918AF11933FCF0083AC69 /* der_length_object_identifier.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186211933FCF0083AC69 /* der_length_object_identifier.c */; };
-		22C918B011933FCF0083AC69 /* der_length_octet_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186311933FCF0083AC69 /* der_length_octet_string.c */; };
-		22C918B111933FCF0083AC69 /* der_length_printable_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186411933FCF0083AC69 /* der_length_printable_string.c */; };
-		22C918B211933FCF0083AC69 /* der_length_sequence.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186511933FCF0083AC69 /* der_length_sequence.c */; };
-		22C918B311933FCF0083AC69 /* der_length_short_integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186611933FCF0083AC69 /* der_length_short_integer.c */; };
-		22C918B411933FCF0083AC69 /* der_length_utctime.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186711933FCF0083AC69 /* der_length_utctime.c */; };
-		22C918B511933FCF0083AC69 /* der_length_utf8_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186811933FCF0083AC69 /* der_length_utf8_string.c */; };
-		22C918B611933FCF0083AC69 /* der_sequence_free.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186911933FCF0083AC69 /* der_sequence_free.c */; };
-		22C918B711933FCF0083AC69 /* ltc_ecc_map.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186B11933FCF0083AC69 /* ltc_ecc_map.c */; };
-		22C918B811933FCF0083AC69 /* ltc_ecc_mul2add.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186C11933FCF0083AC69 /* ltc_ecc_mul2add.c */; };
-		22C918B911933FCF0083AC69 /* ltc_ecc_mulmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186D11933FCF0083AC69 /* ltc_ecc_mulmod.c */; };
-		22C918BA11933FCF0083AC69 /* ltc_ecc_points.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186E11933FCF0083AC69 /* ltc_ecc_points.c */; };
-		22C918BB11933FCF0083AC69 /* ltc_ecc_projective_add_point.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186F11933FCF0083AC69 /* ltc_ecc_projective_add_point.c */; };
-		22C918BC11933FCF0083AC69 /* ltc_ecc_projective_dbl_point.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187011933FCF0083AC69 /* ltc_ecc_projective_dbl_point.c */; };
-		22C918BD11933FCF0083AC69 /* pkcs_1_mgf1.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187211933FCF0083AC69 /* pkcs_1_mgf1.c */; };
-		22C918BE11933FCF0083AC69 /* pkcs_1_oaep_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187311933FCF0083AC69 /* pkcs_1_oaep_decode.c */; };
-		22C918BF11933FCF0083AC69 /* pkcs_1_pss_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187411933FCF0083AC69 /* pkcs_1_pss_decode.c */; };
-		22C918C011933FCF0083AC69 /* pkcs_1_v1_5_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187511933FCF0083AC69 /* pkcs_1_v1_5_decode.c */; };
-		22C918C111933FCF0083AC69 /* rsa_exptmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187711933FCF0083AC69 /* rsa_exptmod.c */; };
-		22C918C211933FCF0083AC69 /* rsa_free.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187811933FCF0083AC69 /* rsa_free.c */; };
-		22C918C311933FCF0083AC69 /* rsa_import.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187911933FCF0083AC69 /* rsa_import.c */; };
-		22C918C411933FCF0083AC69 /* rsa_make_key.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187A11933FCF0083AC69 /* rsa_make_key.c */; };
-		22C918C511933FCF0083AC69 /* rsa_verify_hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187B11933FCF0083AC69 /* rsa_verify_hash.c */; };
-		22C918C611933FCF0083AC69 /* rsa_verify_simple.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187C11933FCF0083AC69 /* rsa_verify_simple.c */; };
-		22C918C711933FCF0083AC69 /* hash_memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9182B11933FCF0083AC69 /* hash_memory.c */; };
-		22C918C811933FCF0083AC69 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9182C11933FCF0083AC69 /* md5.c */; };
-		22C918C911933FCF0083AC69 /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9182D11933FCF0083AC69 /* sha1.c */; };
-		22C918CA11933FCF0083AC69 /* tomcrypt.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9182F11933FCF0083AC69 /* tomcrypt.h */; };
-		22C918CB11933FCF0083AC69 /* tomcrypt_argchk.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183011933FCF0083AC69 /* tomcrypt_argchk.h */; };
-		22C918CC11933FCF0083AC69 /* tomcrypt_cfg.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183111933FCF0083AC69 /* tomcrypt_cfg.h */; };
-		22C918CD11933FCF0083AC69 /* tomcrypt_cipher.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183211933FCF0083AC69 /* tomcrypt_cipher.h */; };
-		22C918CE11933FCF0083AC69 /* tomcrypt_custom.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183311933FCF0083AC69 /* tomcrypt_custom.h */; };
-		22C918CF11933FCF0083AC69 /* tomcrypt_hash.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183411933FCF0083AC69 /* tomcrypt_hash.h */; };
-		22C918D011933FCF0083AC69 /* tomcrypt_mac.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183511933FCF0083AC69 /* tomcrypt_mac.h */; };
-		22C918D111933FCF0083AC69 /* tomcrypt_macros.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183611933FCF0083AC69 /* tomcrypt_macros.h */; };
-		22C918D211933FCF0083AC69 /* tomcrypt_math.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183711933FCF0083AC69 /* tomcrypt_math.h */; };
-		22C918D311933FCF0083AC69 /* tomcrypt_misc.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183811933FCF0083AC69 /* tomcrypt_misc.h */; };
-		22C918D411933FCF0083AC69 /* tomcrypt_pk.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183911933FCF0083AC69 /* tomcrypt_pk.h */; };
-		22C918D511933FCF0083AC69 /* tomcrypt_pkcs.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183A11933FCF0083AC69 /* tomcrypt_pkcs.h */; };
-		22C918D611933FCF0083AC69 /* tomcrypt_prng.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C9183B11933FCF0083AC69 /* tomcrypt_prng.h */; };
-		22C918D711933FCF0083AC69 /* ltm_desc.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9183D11933FCF0083AC69 /* ltm_desc.c */; };
-		22C918D811933FCF0083AC69 /* multi.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9183E11933FCF0083AC69 /* multi.c */; };
-		22C918D911933FCF0083AC69 /* rand_prime.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9183F11933FCF0083AC69 /* rand_prime.c */; };
-		22C918DA11933FCF0083AC69 /* base64_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184111933FCF0083AC69 /* base64_decode.c */; };
-		22C918DB11933FCF0083AC69 /* crypt_argchk.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184211933FCF0083AC69 /* crypt_argchk.c */; };
-		22C918DC11933FCF0083AC69 /* crypt_find_hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184311933FCF0083AC69 /* crypt_find_hash.c */; };
-		22C918DD11933FCF0083AC69 /* crypt_find_prng.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184411933FCF0083AC69 /* crypt_find_prng.c */; };
-		22C918DE11933FCF0083AC69 /* crypt_hash_descriptor.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184511933FCF0083AC69 /* crypt_hash_descriptor.c */; };
-		22C918DF11933FCF0083AC69 /* crypt_hash_is_valid.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184611933FCF0083AC69 /* crypt_hash_is_valid.c */; };
-		22C918E011933FCF0083AC69 /* crypt_libc.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184711933FCF0083AC69 /* crypt_libc.c */; };
-		22C918E111933FCF0083AC69 /* crypt_ltc_mp_descriptor.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184811933FCF0083AC69 /* crypt_ltc_mp_descriptor.c */; };
-		22C918E211933FCF0083AC69 /* crypt_prng_descriptor.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184911933FCF0083AC69 /* crypt_prng_descriptor.c */; };
-		22C918E311933FCF0083AC69 /* crypt_prng_is_valid.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184A11933FCF0083AC69 /* crypt_prng_is_valid.c */; };
-		22C918E411933FCF0083AC69 /* crypt_register_hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184B11933FCF0083AC69 /* crypt_register_hash.c */; };
-		22C918E511933FCF0083AC69 /* crypt_register_prng.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184C11933FCF0083AC69 /* crypt_register_prng.c */; };
-		22C918E611933FCF0083AC69 /* zeromem.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9184D11933FCF0083AC69 /* zeromem.c */; };
-		22C918E711933FCF0083AC69 /* der_decode_bit_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185011933FCF0083AC69 /* der_decode_bit_string.c */; };
-		22C918E811933FCF0083AC69 /* der_decode_boolean.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185111933FCF0083AC69 /* der_decode_boolean.c */; };
-		22C918E911933FCF0083AC69 /* der_decode_choice.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185211933FCF0083AC69 /* der_decode_choice.c */; };
-		22C918EA11933FCF0083AC69 /* der_decode_ia5_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185311933FCF0083AC69 /* der_decode_ia5_string.c */; };
-		22C918EB11933FCF0083AC69 /* der_decode_integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185411933FCF0083AC69 /* der_decode_integer.c */; };
-		22C918EC11933FCF0083AC69 /* der_decode_object_identifier.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185511933FCF0083AC69 /* der_decode_object_identifier.c */; };
-		22C918ED11933FCF0083AC69 /* der_decode_octet_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185611933FCF0083AC69 /* der_decode_octet_string.c */; };
-		22C918EE11933FCF0083AC69 /* der_decode_printable_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185711933FCF0083AC69 /* der_decode_printable_string.c */; };
-		22C918EF11933FCF0083AC69 /* der_decode_sequence_ex.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185811933FCF0083AC69 /* der_decode_sequence_ex.c */; };
-		22C918F011933FCF0083AC69 /* der_decode_sequence_flexi.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185911933FCF0083AC69 /* der_decode_sequence_flexi.c */; };
-		22C918F111933FCF0083AC69 /* der_decode_sequence_multi.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185A11933FCF0083AC69 /* der_decode_sequence_multi.c */; };
-		22C918F211933FCF0083AC69 /* der_decode_short_integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185B11933FCF0083AC69 /* der_decode_short_integer.c */; };
-		22C918F311933FCF0083AC69 /* der_decode_utctime.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185C11933FCF0083AC69 /* der_decode_utctime.c */; };
-		22C918F411933FCF0083AC69 /* der_decode_utf8_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185D11933FCF0083AC69 /* der_decode_utf8_string.c */; };
-		22C918F511933FCF0083AC69 /* der_length_bit_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185E11933FCF0083AC69 /* der_length_bit_string.c */; };
-		22C918F611933FCF0083AC69 /* der_length_boolean.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9185F11933FCF0083AC69 /* der_length_boolean.c */; };
-		22C918F711933FCF0083AC69 /* der_length_ia5_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186011933FCF0083AC69 /* der_length_ia5_string.c */; };
-		22C918F811933FCF0083AC69 /* der_length_integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186111933FCF0083AC69 /* der_length_integer.c */; };
-		22C918F911933FCF0083AC69 /* der_length_object_identifier.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186211933FCF0083AC69 /* der_length_object_identifier.c */; };
-		22C918FA11933FCF0083AC69 /* der_length_octet_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186311933FCF0083AC69 /* der_length_octet_string.c */; };
-		22C918FB11933FCF0083AC69 /* der_length_printable_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186411933FCF0083AC69 /* der_length_printable_string.c */; };
-		22C918FC11933FCF0083AC69 /* der_length_sequence.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186511933FCF0083AC69 /* der_length_sequence.c */; };
-		22C918FD11933FCF0083AC69 /* der_length_short_integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186611933FCF0083AC69 /* der_length_short_integer.c */; };
-		22C918FE11933FCF0083AC69 /* der_length_utctime.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186711933FCF0083AC69 /* der_length_utctime.c */; };
-		22C918FF11933FCF0083AC69 /* der_length_utf8_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186811933FCF0083AC69 /* der_length_utf8_string.c */; };
-		22C9190011933FCF0083AC69 /* der_sequence_free.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186911933FCF0083AC69 /* der_sequence_free.c */; };
-		22C9190111933FCF0083AC69 /* ltc_ecc_map.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186B11933FCF0083AC69 /* ltc_ecc_map.c */; };
-		22C9190211933FCF0083AC69 /* ltc_ecc_mul2add.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186C11933FCF0083AC69 /* ltc_ecc_mul2add.c */; };
-		22C9190311933FCF0083AC69 /* ltc_ecc_mulmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186D11933FCF0083AC69 /* ltc_ecc_mulmod.c */; };
-		22C9190411933FCF0083AC69 /* ltc_ecc_points.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186E11933FCF0083AC69 /* ltc_ecc_points.c */; };
-		22C9190511933FCF0083AC69 /* ltc_ecc_projective_add_point.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9186F11933FCF0083AC69 /* ltc_ecc_projective_add_point.c */; };
-		22C9190611933FCF0083AC69 /* ltc_ecc_projective_dbl_point.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187011933FCF0083AC69 /* ltc_ecc_projective_dbl_point.c */; };
-		22C9190711933FCF0083AC69 /* pkcs_1_mgf1.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187211933FCF0083AC69 /* pkcs_1_mgf1.c */; };
-		22C9190811933FCF0083AC69 /* pkcs_1_oaep_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187311933FCF0083AC69 /* pkcs_1_oaep_decode.c */; };
-		22C9190911933FCF0083AC69 /* pkcs_1_pss_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187411933FCF0083AC69 /* pkcs_1_pss_decode.c */; };
-		22C9190A11933FCF0083AC69 /* pkcs_1_v1_5_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187511933FCF0083AC69 /* pkcs_1_v1_5_decode.c */; };
-		22C9190B11933FCF0083AC69 /* rsa_exptmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187711933FCF0083AC69 /* rsa_exptmod.c */; };
-		22C9190C11933FCF0083AC69 /* rsa_free.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187811933FCF0083AC69 /* rsa_free.c */; };
-		22C9190D11933FCF0083AC69 /* rsa_import.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187911933FCF0083AC69 /* rsa_import.c */; };
-		22C9190E11933FCF0083AC69 /* rsa_make_key.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187A11933FCF0083AC69 /* rsa_make_key.c */; };
-		22C9190F11933FCF0083AC69 /* rsa_verify_hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187B11933FCF0083AC69 /* rsa_verify_hash.c */; };
-		22C9191011933FCF0083AC69 /* rsa_verify_simple.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9187C11933FCF0083AC69 /* rsa_verify_simple.c */; };
-		22C9198A1193400A0083AC69 /* bn_fast_mp_invmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919111193400A0083AC69 /* bn_fast_mp_invmod.c */; };
-		22C9198B1193400A0083AC69 /* bn_fast_mp_montgomery_reduce.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919121193400A0083AC69 /* bn_fast_mp_montgomery_reduce.c */; };
-		22C9198C1193400A0083AC69 /* bn_fast_s_mp_mul_digs.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919131193400A0083AC69 /* bn_fast_s_mp_mul_digs.c */; };
-		22C9198D1193400A0083AC69 /* bn_fast_s_mp_mul_high_digs.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919141193400A0083AC69 /* bn_fast_s_mp_mul_high_digs.c */; };
-		22C9198E1193400A0083AC69 /* bn_fast_s_mp_sqr.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919151193400A0083AC69 /* bn_fast_s_mp_sqr.c */; };
-		22C9198F1193400A0083AC69 /* bn_mp_2expt.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919161193400A0083AC69 /* bn_mp_2expt.c */; };
-		22C919901193400A0083AC69 /* bn_mp_abs.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919171193400A0083AC69 /* bn_mp_abs.c */; };
-		22C919911193400A0083AC69 /* bn_mp_add_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919181193400A0083AC69 /* bn_mp_add_d.c */; };
-		22C919921193400A0083AC69 /* bn_mp_add.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919191193400A0083AC69 /* bn_mp_add.c */; };
-		22C919931193400A0083AC69 /* bn_mp_addmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9191A1193400A0083AC69 /* bn_mp_addmod.c */; };
-		22C919941193400A0083AC69 /* bn_mp_and.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9191B1193400A0083AC69 /* bn_mp_and.c */; };
-		22C919951193400A0083AC69 /* bn_mp_clamp.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9191C1193400A0083AC69 /* bn_mp_clamp.c */; };
-		22C919961193400A0083AC69 /* bn_mp_clear_multi.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9191D1193400A0083AC69 /* bn_mp_clear_multi.c */; };
-		22C919971193400A0083AC69 /* bn_mp_clear.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9191E1193400A0083AC69 /* bn_mp_clear.c */; };
-		22C919981193400A0083AC69 /* bn_mp_cmp_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9191F1193400A0083AC69 /* bn_mp_cmp_d.c */; };
-		22C919991193400A0083AC69 /* bn_mp_cmp_mag.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919201193400A0083AC69 /* bn_mp_cmp_mag.c */; };
-		22C9199A1193400A0083AC69 /* bn_mp_cmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919211193400A0083AC69 /* bn_mp_cmp.c */; };
-		22C9199B1193400A0083AC69 /* bn_mp_cnt_lsb.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919221193400A0083AC69 /* bn_mp_cnt_lsb.c */; };
-		22C9199C1193400A0083AC69 /* bn_mp_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919231193400A0083AC69 /* bn_mp_copy.c */; };
-		22C9199D1193400A0083AC69 /* bn_mp_count_bits.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919241193400A0083AC69 /* bn_mp_count_bits.c */; };
-		22C9199E1193400A0083AC69 /* bn_mp_div_2.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919251193400A0083AC69 /* bn_mp_div_2.c */; };
-		22C9199F1193400A0083AC69 /* bn_mp_div_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919261193400A0083AC69 /* bn_mp_div_2d.c */; };
-		22C919A01193400A0083AC69 /* bn_mp_div_3.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919271193400A0083AC69 /* bn_mp_div_3.c */; };
-		22C919A11193400A0083AC69 /* bn_mp_div_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919281193400A0083AC69 /* bn_mp_div_d.c */; };
-		22C919A21193400A0083AC69 /* bn_mp_div.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919291193400A0083AC69 /* bn_mp_div.c */; };
-		22C919A31193400A0083AC69 /* bn_mp_dr_is_modulus.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9192A1193400A0083AC69 /* bn_mp_dr_is_modulus.c */; };
-		22C919A41193400A0083AC69 /* bn_mp_dr_reduce.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9192B1193400A0083AC69 /* bn_mp_dr_reduce.c */; };
-		22C919A51193400A0083AC69 /* bn_mp_dr_setup.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9192C1193400A0083AC69 /* bn_mp_dr_setup.c */; };
-		22C919A61193400A0083AC69 /* bn_mp_exch.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9192D1193400A0083AC69 /* bn_mp_exch.c */; };
-		22C919A71193400A0083AC69 /* bn_mp_expt_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9192E1193400A0083AC69 /* bn_mp_expt_d.c */; };
-		22C919A81193400A0083AC69 /* bn_mp_exptmod_fast.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9192F1193400A0083AC69 /* bn_mp_exptmod_fast.c */; };
-		22C919A91193400A0083AC69 /* bn_mp_exptmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919301193400A0083AC69 /* bn_mp_exptmod.c */; };
-		22C919AA1193400A0083AC69 /* bn_mp_exteuclid.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919311193400A0083AC69 /* bn_mp_exteuclid.c */; };
-		22C919AB1193400A0083AC69 /* bn_mp_fread.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919321193400A0083AC69 /* bn_mp_fread.c */; };
-		22C919AC1193400A0083AC69 /* bn_mp_fwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919331193400A0083AC69 /* bn_mp_fwrite.c */; };
-		22C919AD1193400A0083AC69 /* bn_mp_gcd.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919341193400A0083AC69 /* bn_mp_gcd.c */; };
-		22C919AE1193400A0083AC69 /* bn_mp_get_int.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919351193400A0083AC69 /* bn_mp_get_int.c */; };
-		22C919AF1193400A0083AC69 /* bn_mp_grow.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919361193400A0083AC69 /* bn_mp_grow.c */; };
-		22C919B01193400A0083AC69 /* bn_mp_init_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919371193400A0083AC69 /* bn_mp_init_copy.c */; };
-		22C919B11193400A0083AC69 /* bn_mp_init_multi.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919381193400A0083AC69 /* bn_mp_init_multi.c */; };
-		22C919B21193400A0083AC69 /* bn_mp_init_set_int.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919391193400A0083AC69 /* bn_mp_init_set_int.c */; };
-		22C919B31193400A0083AC69 /* bn_mp_init_set.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9193A1193400A0083AC69 /* bn_mp_init_set.c */; };
-		22C919B41193400A0083AC69 /* bn_mp_init_size.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9193B1193400A0083AC69 /* bn_mp_init_size.c */; };
-		22C919B51193400A0083AC69 /* bn_mp_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9193C1193400A0083AC69 /* bn_mp_init.c */; };
-		22C919B61193400A0083AC69 /* bn_mp_invmod_slow.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9193D1193400A0083AC69 /* bn_mp_invmod_slow.c */; };
-		22C919B71193400A0083AC69 /* bn_mp_invmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9193E1193400A0083AC69 /* bn_mp_invmod.c */; };
-		22C919B81193400A0083AC69 /* bn_mp_is_square.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9193F1193400A0083AC69 /* bn_mp_is_square.c */; };
-		22C919B91193400A0083AC69 /* bn_mp_jacobi.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919401193400A0083AC69 /* bn_mp_jacobi.c */; };
-		22C919BA1193400A0083AC69 /* bn_mp_karatsuba_mul.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919411193400A0083AC69 /* bn_mp_karatsuba_mul.c */; };
-		22C919BB1193400A0083AC69 /* bn_mp_karatsuba_sqr.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919421193400A0083AC69 /* bn_mp_karatsuba_sqr.c */; };
-		22C919BC1193400A0083AC69 /* bn_mp_lcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919431193400A0083AC69 /* bn_mp_lcm.c */; };
-		22C919BD1193400A0083AC69 /* bn_mp_lshd.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919441193400A0083AC69 /* bn_mp_lshd.c */; };
-		22C919BE1193400A0083AC69 /* bn_mp_mod_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919451193400A0083AC69 /* bn_mp_mod_2d.c */; };
-		22C919BF1193400A0083AC69 /* bn_mp_mod_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919461193400A0083AC69 /* bn_mp_mod_d.c */; };
-		22C919C01193400A0083AC69 /* bn_mp_mod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919471193400A0083AC69 /* bn_mp_mod.c */; };
-		22C919C11193400A0083AC69 /* bn_mp_montgomery_calc_normalization.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919481193400A0083AC69 /* bn_mp_montgomery_calc_normalization.c */; };
-		22C919C21193400A0083AC69 /* bn_mp_montgomery_reduce.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919491193400A0083AC69 /* bn_mp_montgomery_reduce.c */; };
-		22C919C31193400A0083AC69 /* bn_mp_montgomery_setup.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9194A1193400A0083AC69 /* bn_mp_montgomery_setup.c */; };
-		22C919C41193400A0083AC69 /* bn_mp_mul_2.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9194B1193400A0083AC69 /* bn_mp_mul_2.c */; };
-		22C919C51193400A0083AC69 /* bn_mp_mul_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9194C1193400A0083AC69 /* bn_mp_mul_2d.c */; };
-		22C919C61193400A0083AC69 /* bn_mp_mul_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9194D1193400A0083AC69 /* bn_mp_mul_d.c */; };
-		22C919C71193400A0083AC69 /* bn_mp_mul.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9194E1193400A0083AC69 /* bn_mp_mul.c */; };
-		22C919C81193400A0083AC69 /* bn_mp_mulmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9194F1193400A0083AC69 /* bn_mp_mulmod.c */; };
-		22C919C91193400A0083AC69 /* bn_mp_n_root.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919501193400A0083AC69 /* bn_mp_n_root.c */; };
-		22C919CA1193400A0083AC69 /* bn_mp_neg.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919511193400A0083AC69 /* bn_mp_neg.c */; };
-		22C919CB1193400A0083AC69 /* bn_mp_or.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919521193400A0083AC69 /* bn_mp_or.c */; };
-		22C919CC1193400A0083AC69 /* bn_mp_prime_fermat.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919531193400A0083AC69 /* bn_mp_prime_fermat.c */; };
-		22C919CD1193400A0083AC69 /* bn_mp_prime_is_divisible.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919541193400A0083AC69 /* bn_mp_prime_is_divisible.c */; };
-		22C919CE1193400A0083AC69 /* bn_mp_prime_is_prime.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919551193400A0083AC69 /* bn_mp_prime_is_prime.c */; };
-		22C919CF1193400A0083AC69 /* bn_mp_prime_miller_rabin.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919561193400A0083AC69 /* bn_mp_prime_miller_rabin.c */; };
-		22C919D01193400A0083AC69 /* bn_mp_prime_next_prime.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919571193400A0083AC69 /* bn_mp_prime_next_prime.c */; };
-		22C919D11193400A0083AC69 /* bn_mp_prime_rabin_miller_trials.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919581193400A0083AC69 /* bn_mp_prime_rabin_miller_trials.c */; };
-		22C919D21193400A0083AC69 /* bn_mp_prime_random_ex.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919591193400A0083AC69 /* bn_mp_prime_random_ex.c */; };
-		22C919D31193400A0083AC69 /* bn_mp_radix_size.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9195A1193400A0083AC69 /* bn_mp_radix_size.c */; };
-		22C919D41193400A0083AC69 /* bn_mp_radix_smap.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9195B1193400A0083AC69 /* bn_mp_radix_smap.c */; };
-		22C919D51193400A0083AC69 /* bn_mp_rand.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9195C1193400A0083AC69 /* bn_mp_rand.c */; };
-		22C919D61193400A0083AC69 /* bn_mp_read_radix.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9195D1193400A0083AC69 /* bn_mp_read_radix.c */; };
-		22C919D71193400A0083AC69 /* bn_mp_read_signed_bin.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9195E1193400A0083AC69 /* bn_mp_read_signed_bin.c */; };
-		22C919D81193400A0083AC69 /* bn_mp_read_unsigned_bin.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9195F1193400A0083AC69 /* bn_mp_read_unsigned_bin.c */; };
-		22C919D91193400A0083AC69 /* bn_mp_reduce_2k_l.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919601193400A0083AC69 /* bn_mp_reduce_2k_l.c */; };
-		22C919DA1193400A0083AC69 /* bn_mp_reduce_2k_setup_l.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919611193400A0083AC69 /* bn_mp_reduce_2k_setup_l.c */; };
-		22C919DB1193400A0083AC69 /* bn_mp_reduce_2k_setup.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919621193400A0083AC69 /* bn_mp_reduce_2k_setup.c */; };
-		22C919DC1193400A0083AC69 /* bn_mp_reduce_2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919631193400A0083AC69 /* bn_mp_reduce_2k.c */; };
-		22C919DD1193400A0083AC69 /* bn_mp_reduce_is_2k_l.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919641193400A0083AC69 /* bn_mp_reduce_is_2k_l.c */; };
-		22C919DE1193400A0083AC69 /* bn_mp_reduce_is_2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919651193400A0083AC69 /* bn_mp_reduce_is_2k.c */; };
-		22C919DF1193400A0083AC69 /* bn_mp_reduce_setup.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919661193400A0083AC69 /* bn_mp_reduce_setup.c */; };
-		22C919E01193400A0083AC69 /* bn_mp_reduce.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919671193400A0083AC69 /* bn_mp_reduce.c */; };
-		22C919E11193400A0083AC69 /* bn_mp_rshd.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919681193400A0083AC69 /* bn_mp_rshd.c */; };
-		22C919E21193400A0083AC69 /* bn_mp_set_int.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919691193400A0083AC69 /* bn_mp_set_int.c */; };
-		22C919E31193400A0083AC69 /* bn_mp_set.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9196A1193400A0083AC69 /* bn_mp_set.c */; };
-		22C919E41193400A0083AC69 /* bn_mp_shrink.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9196B1193400A0083AC69 /* bn_mp_shrink.c */; };
-		22C919E51193400A0083AC69 /* bn_mp_signed_bin_size.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9196C1193400A0083AC69 /* bn_mp_signed_bin_size.c */; };
-		22C919E61193400A0083AC69 /* bn_mp_sqr.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9196D1193400A0083AC69 /* bn_mp_sqr.c */; };
-		22C919E71193400A0083AC69 /* bn_mp_sqrmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9196E1193400A0083AC69 /* bn_mp_sqrmod.c */; };
-		22C919E81193400A0083AC69 /* bn_mp_sqrt.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9196F1193400A0083AC69 /* bn_mp_sqrt.c */; };
-		22C919E91193400A0083AC69 /* bn_mp_sub_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919701193400A0083AC69 /* bn_mp_sub_d.c */; };
-		22C919EA1193400A0083AC69 /* bn_mp_sub.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919711193400A0083AC69 /* bn_mp_sub.c */; };
-		22C919EB1193400A0083AC69 /* bn_mp_submod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919721193400A0083AC69 /* bn_mp_submod.c */; };
-		22C919EC1193400A0083AC69 /* bn_mp_to_signed_bin_n.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919731193400A0083AC69 /* bn_mp_to_signed_bin_n.c */; };
-		22C919ED1193400A0083AC69 /* bn_mp_to_signed_bin.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919741193400A0083AC69 /* bn_mp_to_signed_bin.c */; };
-		22C919EE1193400A0083AC69 /* bn_mp_to_unsigned_bin_n.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919751193400A0083AC69 /* bn_mp_to_unsigned_bin_n.c */; };
-		22C919EF1193400A0083AC69 /* bn_mp_to_unsigned_bin.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919761193400A0083AC69 /* bn_mp_to_unsigned_bin.c */; };
-		22C919F01193400A0083AC69 /* bn_mp_toom_mul.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919771193400A0083AC69 /* bn_mp_toom_mul.c */; };
-		22C919F11193400A0083AC69 /* bn_mp_toom_sqr.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919781193400A0083AC69 /* bn_mp_toom_sqr.c */; };
-		22C919F21193400A0083AC69 /* bn_mp_toradix_n.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919791193400A0083AC69 /* bn_mp_toradix_n.c */; };
-		22C919F31193400A0083AC69 /* bn_mp_toradix.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9197A1193400A0083AC69 /* bn_mp_toradix.c */; };
-		22C919F41193400A0083AC69 /* bn_mp_unsigned_bin_size.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9197B1193400A0083AC69 /* bn_mp_unsigned_bin_size.c */; };
-		22C919F51193400A0083AC69 /* bn_mp_xor.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9197C1193400A0083AC69 /* bn_mp_xor.c */; };
-		22C919F61193400A0083AC69 /* bn_mp_zero.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9197D1193400A0083AC69 /* bn_mp_zero.c */; };
-		22C919F71193400A0083AC69 /* bn_prime_tab.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9197E1193400A0083AC69 /* bn_prime_tab.c */; };
-		22C919F81193400A0083AC69 /* bn_reverse.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9197F1193400A0083AC69 /* bn_reverse.c */; };
-		22C919F91193400A0083AC69 /* bn_s_mp_add.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919801193400A0083AC69 /* bn_s_mp_add.c */; };
-		22C919FA1193400A0083AC69 /* bn_s_mp_exptmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919811193400A0083AC69 /* bn_s_mp_exptmod.c */; };
-		22C919FB1193400A0083AC69 /* bn_s_mp_mul_digs.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919821193400A0083AC69 /* bn_s_mp_mul_digs.c */; };
-		22C919FC1193400A0083AC69 /* bn_s_mp_mul_high_digs.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919831193400A0083AC69 /* bn_s_mp_mul_high_digs.c */; };
-		22C919FD1193400A0083AC69 /* bn_s_mp_sqr.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919841193400A0083AC69 /* bn_s_mp_sqr.c */; };
-		22C919FE1193400A0083AC69 /* bn_s_mp_sub.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919851193400A0083AC69 /* bn_s_mp_sub.c */; };
-		22C919FF1193400A0083AC69 /* bncore.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919861193400A0083AC69 /* bncore.c */; };
-		22C91A001193400A0083AC69 /* tommath_class.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C919871193400A0083AC69 /* tommath_class.h */; };
-		22C91A011193400A0083AC69 /* tommath_superclass.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C919881193400A0083AC69 /* tommath_superclass.h */; };
-		22C91A021193400A0083AC69 /* tommath.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C919891193400A0083AC69 /* tommath.h */; };
-		22C91A031193400A0083AC69 /* bn_fast_mp_invmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919111193400A0083AC69 /* bn_fast_mp_invmod.c */; };
-		22C91A041193400A0083AC69 /* bn_fast_mp_montgomery_reduce.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919121193400A0083AC69 /* bn_fast_mp_montgomery_reduce.c */; };
-		22C91A051193400A0083AC69 /* bn_fast_s_mp_mul_digs.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919131193400A0083AC69 /* bn_fast_s_mp_mul_digs.c */; };
-		22C91A061193400A0083AC69 /* bn_fast_s_mp_mul_high_digs.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919141193400A0083AC69 /* bn_fast_s_mp_mul_high_digs.c */; };
-		22C91A071193400A0083AC69 /* bn_fast_s_mp_sqr.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919151193400A0083AC69 /* bn_fast_s_mp_sqr.c */; };
-		22C91A081193400A0083AC69 /* bn_mp_2expt.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919161193400A0083AC69 /* bn_mp_2expt.c */; };
-		22C91A091193400A0083AC69 /* bn_mp_abs.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919171193400A0083AC69 /* bn_mp_abs.c */; };
-		22C91A0A1193400A0083AC69 /* bn_mp_add_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919181193400A0083AC69 /* bn_mp_add_d.c */; };
-		22C91A0B1193400A0083AC69 /* bn_mp_add.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919191193400A0083AC69 /* bn_mp_add.c */; };
-		22C91A0C1193400A0083AC69 /* bn_mp_addmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9191A1193400A0083AC69 /* bn_mp_addmod.c */; };
-		22C91A0D1193400A0083AC69 /* bn_mp_and.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9191B1193400A0083AC69 /* bn_mp_and.c */; };
-		22C91A0E1193400A0083AC69 /* bn_mp_clamp.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9191C1193400A0083AC69 /* bn_mp_clamp.c */; };
-		22C91A0F1193400A0083AC69 /* bn_mp_clear_multi.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9191D1193400A0083AC69 /* bn_mp_clear_multi.c */; };
-		22C91A101193400A0083AC69 /* bn_mp_clear.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9191E1193400A0083AC69 /* bn_mp_clear.c */; };
-		22C91A111193400A0083AC69 /* bn_mp_cmp_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9191F1193400A0083AC69 /* bn_mp_cmp_d.c */; };
-		22C91A121193400A0083AC69 /* bn_mp_cmp_mag.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919201193400A0083AC69 /* bn_mp_cmp_mag.c */; };
-		22C91A131193400A0083AC69 /* bn_mp_cmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919211193400A0083AC69 /* bn_mp_cmp.c */; };
-		22C91A141193400A0083AC69 /* bn_mp_cnt_lsb.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919221193400A0083AC69 /* bn_mp_cnt_lsb.c */; };
-		22C91A151193400A0083AC69 /* bn_mp_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919231193400A0083AC69 /* bn_mp_copy.c */; };
-		22C91A161193400A0083AC69 /* bn_mp_count_bits.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919241193400A0083AC69 /* bn_mp_count_bits.c */; };
-		22C91A171193400A0083AC69 /* bn_mp_div_2.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919251193400A0083AC69 /* bn_mp_div_2.c */; };
-		22C91A181193400A0083AC69 /* bn_mp_div_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919261193400A0083AC69 /* bn_mp_div_2d.c */; };
-		22C91A191193400A0083AC69 /* bn_mp_div_3.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919271193400A0083AC69 /* bn_mp_div_3.c */; };
-		22C91A1A1193400A0083AC69 /* bn_mp_div_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919281193400A0083AC69 /* bn_mp_div_d.c */; };
-		22C91A1B1193400A0083AC69 /* bn_mp_div.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919291193400A0083AC69 /* bn_mp_div.c */; };
-		22C91A1C1193400A0083AC69 /* bn_mp_dr_is_modulus.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9192A1193400A0083AC69 /* bn_mp_dr_is_modulus.c */; };
-		22C91A1D1193400A0083AC69 /* bn_mp_dr_reduce.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9192B1193400A0083AC69 /* bn_mp_dr_reduce.c */; };
-		22C91A1E1193400A0083AC69 /* bn_mp_dr_setup.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9192C1193400A0083AC69 /* bn_mp_dr_setup.c */; };
-		22C91A1F1193400A0083AC69 /* bn_mp_exch.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9192D1193400A0083AC69 /* bn_mp_exch.c */; };
-		22C91A201193400A0083AC69 /* bn_mp_expt_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9192E1193400A0083AC69 /* bn_mp_expt_d.c */; };
-		22C91A211193400A0083AC69 /* bn_mp_exptmod_fast.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9192F1193400A0083AC69 /* bn_mp_exptmod_fast.c */; };
-		22C91A221193400A0083AC69 /* bn_mp_exptmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919301193400A0083AC69 /* bn_mp_exptmod.c */; };
-		22C91A231193400A0083AC69 /* bn_mp_exteuclid.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919311193400A0083AC69 /* bn_mp_exteuclid.c */; };
-		22C91A241193400A0083AC69 /* bn_mp_fread.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919321193400A0083AC69 /* bn_mp_fread.c */; };
-		22C91A251193400A0083AC69 /* bn_mp_fwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919331193400A0083AC69 /* bn_mp_fwrite.c */; };
-		22C91A261193400A0083AC69 /* bn_mp_gcd.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919341193400A0083AC69 /* bn_mp_gcd.c */; };
-		22C91A271193400A0083AC69 /* bn_mp_get_int.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919351193400A0083AC69 /* bn_mp_get_int.c */; };
-		22C91A281193400A0083AC69 /* bn_mp_grow.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919361193400A0083AC69 /* bn_mp_grow.c */; };
-		22C91A291193400A0083AC69 /* bn_mp_init_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919371193400A0083AC69 /* bn_mp_init_copy.c */; };
-		22C91A2A1193400A0083AC69 /* bn_mp_init_multi.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919381193400A0083AC69 /* bn_mp_init_multi.c */; };
-		22C91A2B1193400A0083AC69 /* bn_mp_init_set_int.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919391193400A0083AC69 /* bn_mp_init_set_int.c */; };
-		22C91A2C1193400A0083AC69 /* bn_mp_init_set.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9193A1193400A0083AC69 /* bn_mp_init_set.c */; };
-		22C91A2D1193400A0083AC69 /* bn_mp_init_size.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9193B1193400A0083AC69 /* bn_mp_init_size.c */; };
-		22C91A2E1193400A0083AC69 /* bn_mp_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9193C1193400A0083AC69 /* bn_mp_init.c */; };
-		22C91A2F1193400A0083AC69 /* bn_mp_invmod_slow.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9193D1193400A0083AC69 /* bn_mp_invmod_slow.c */; };
-		22C91A301193400A0083AC69 /* bn_mp_invmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9193E1193400A0083AC69 /* bn_mp_invmod.c */; };
-		22C91A311193400A0083AC69 /* bn_mp_is_square.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9193F1193400A0083AC69 /* bn_mp_is_square.c */; };
-		22C91A321193400A0083AC69 /* bn_mp_jacobi.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919401193400A0083AC69 /* bn_mp_jacobi.c */; };
-		22C91A331193400A0083AC69 /* bn_mp_karatsuba_mul.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919411193400A0083AC69 /* bn_mp_karatsuba_mul.c */; };
-		22C91A341193400A0083AC69 /* bn_mp_karatsuba_sqr.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919421193400A0083AC69 /* bn_mp_karatsuba_sqr.c */; };
-		22C91A351193400A0083AC69 /* bn_mp_lcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919431193400A0083AC69 /* bn_mp_lcm.c */; };
-		22C91A361193400A0083AC69 /* bn_mp_lshd.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919441193400A0083AC69 /* bn_mp_lshd.c */; };
-		22C91A371193400A0083AC69 /* bn_mp_mod_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919451193400A0083AC69 /* bn_mp_mod_2d.c */; };
-		22C91A381193400A0083AC69 /* bn_mp_mod_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919461193400A0083AC69 /* bn_mp_mod_d.c */; };
-		22C91A391193400A0083AC69 /* bn_mp_mod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919471193400A0083AC69 /* bn_mp_mod.c */; };
-		22C91A3A1193400A0083AC69 /* bn_mp_montgomery_calc_normalization.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919481193400A0083AC69 /* bn_mp_montgomery_calc_normalization.c */; };
-		22C91A3B1193400A0083AC69 /* bn_mp_montgomery_reduce.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919491193400A0083AC69 /* bn_mp_montgomery_reduce.c */; };
-		22C91A3C1193400A0083AC69 /* bn_mp_montgomery_setup.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9194A1193400A0083AC69 /* bn_mp_montgomery_setup.c */; };
-		22C91A3D1193400A0083AC69 /* bn_mp_mul_2.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9194B1193400A0083AC69 /* bn_mp_mul_2.c */; };
-		22C91A3E1193400A0083AC69 /* bn_mp_mul_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9194C1193400A0083AC69 /* bn_mp_mul_2d.c */; };
-		22C91A3F1193400A0083AC69 /* bn_mp_mul_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9194D1193400A0083AC69 /* bn_mp_mul_d.c */; };
-		22C91A401193400A0083AC69 /* bn_mp_mul.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9194E1193400A0083AC69 /* bn_mp_mul.c */; };
-		22C91A411193400A0083AC69 /* bn_mp_mulmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9194F1193400A0083AC69 /* bn_mp_mulmod.c */; };
-		22C91A421193400A0083AC69 /* bn_mp_n_root.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919501193400A0083AC69 /* bn_mp_n_root.c */; };
-		22C91A431193400A0083AC69 /* bn_mp_neg.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919511193400A0083AC69 /* bn_mp_neg.c */; };
-		22C91A441193400A0083AC69 /* bn_mp_or.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919521193400A0083AC69 /* bn_mp_or.c */; };
-		22C91A451193400A0083AC69 /* bn_mp_prime_fermat.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919531193400A0083AC69 /* bn_mp_prime_fermat.c */; };
-		22C91A461193400A0083AC69 /* bn_mp_prime_is_divisible.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919541193400A0083AC69 /* bn_mp_prime_is_divisible.c */; };
-		22C91A471193400A0083AC69 /* bn_mp_prime_is_prime.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919551193400A0083AC69 /* bn_mp_prime_is_prime.c */; };
-		22C91A481193400A0083AC69 /* bn_mp_prime_miller_rabin.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919561193400A0083AC69 /* bn_mp_prime_miller_rabin.c */; };
-		22C91A491193400A0083AC69 /* bn_mp_prime_next_prime.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919571193400A0083AC69 /* bn_mp_prime_next_prime.c */; };
-		22C91A4A1193400A0083AC69 /* bn_mp_prime_rabin_miller_trials.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919581193400A0083AC69 /* bn_mp_prime_rabin_miller_trials.c */; };
-		22C91A4B1193400A0083AC69 /* bn_mp_prime_random_ex.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919591193400A0083AC69 /* bn_mp_prime_random_ex.c */; };
-		22C91A4C1193400A0083AC69 /* bn_mp_radix_size.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9195A1193400A0083AC69 /* bn_mp_radix_size.c */; };
-		22C91A4D1193400A0083AC69 /* bn_mp_radix_smap.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9195B1193400A0083AC69 /* bn_mp_radix_smap.c */; };
-		22C91A4E1193400A0083AC69 /* bn_mp_rand.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9195C1193400A0083AC69 /* bn_mp_rand.c */; };
-		22C91A4F1193400A0083AC69 /* bn_mp_read_radix.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9195D1193400A0083AC69 /* bn_mp_read_radix.c */; };
-		22C91A501193400A0083AC69 /* bn_mp_read_signed_bin.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9195E1193400A0083AC69 /* bn_mp_read_signed_bin.c */; };
-		22C91A511193400A0083AC69 /* bn_mp_read_unsigned_bin.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9195F1193400A0083AC69 /* bn_mp_read_unsigned_bin.c */; };
-		22C91A521193400A0083AC69 /* bn_mp_reduce_2k_l.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919601193400A0083AC69 /* bn_mp_reduce_2k_l.c */; };
-		22C91A531193400A0083AC69 /* bn_mp_reduce_2k_setup_l.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919611193400A0083AC69 /* bn_mp_reduce_2k_setup_l.c */; };
-		22C91A541193400A0083AC69 /* bn_mp_reduce_2k_setup.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919621193400A0083AC69 /* bn_mp_reduce_2k_setup.c */; };
-		22C91A551193400A0083AC69 /* bn_mp_reduce_2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919631193400A0083AC69 /* bn_mp_reduce_2k.c */; };
-		22C91A561193400A0083AC69 /* bn_mp_reduce_is_2k_l.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919641193400A0083AC69 /* bn_mp_reduce_is_2k_l.c */; };
-		22C91A571193400A0083AC69 /* bn_mp_reduce_is_2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919651193400A0083AC69 /* bn_mp_reduce_is_2k.c */; };
-		22C91A581193400A0083AC69 /* bn_mp_reduce_setup.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919661193400A0083AC69 /* bn_mp_reduce_setup.c */; };
-		22C91A591193400A0083AC69 /* bn_mp_reduce.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919671193400A0083AC69 /* bn_mp_reduce.c */; };
-		22C91A5A1193400A0083AC69 /* bn_mp_rshd.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919681193400A0083AC69 /* bn_mp_rshd.c */; };
-		22C91A5B1193400A0083AC69 /* bn_mp_set_int.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919691193400A0083AC69 /* bn_mp_set_int.c */; };
-		22C91A5C1193400A0083AC69 /* bn_mp_set.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9196A1193400A0083AC69 /* bn_mp_set.c */; };
-		22C91A5D1193400A0083AC69 /* bn_mp_shrink.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9196B1193400A0083AC69 /* bn_mp_shrink.c */; };
-		22C91A5E1193400A0083AC69 /* bn_mp_signed_bin_size.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9196C1193400A0083AC69 /* bn_mp_signed_bin_size.c */; };
-		22C91A5F1193400A0083AC69 /* bn_mp_sqr.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9196D1193400A0083AC69 /* bn_mp_sqr.c */; };
-		22C91A601193400A0083AC69 /* bn_mp_sqrmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9196E1193400A0083AC69 /* bn_mp_sqrmod.c */; };
-		22C91A611193400A0083AC69 /* bn_mp_sqrt.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9196F1193400A0083AC69 /* bn_mp_sqrt.c */; };
-		22C91A621193400A0083AC69 /* bn_mp_sub_d.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919701193400A0083AC69 /* bn_mp_sub_d.c */; };
-		22C91A631193400A0083AC69 /* bn_mp_sub.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919711193400A0083AC69 /* bn_mp_sub.c */; };
-		22C91A641193400A0083AC69 /* bn_mp_submod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919721193400A0083AC69 /* bn_mp_submod.c */; };
-		22C91A651193400A0083AC69 /* bn_mp_to_signed_bin_n.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919731193400A0083AC69 /* bn_mp_to_signed_bin_n.c */; };
-		22C91A661193400A0083AC69 /* bn_mp_to_signed_bin.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919741193400A0083AC69 /* bn_mp_to_signed_bin.c */; };
-		22C91A671193400A0083AC69 /* bn_mp_to_unsigned_bin_n.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919751193400A0083AC69 /* bn_mp_to_unsigned_bin_n.c */; };
-		22C91A681193400A0083AC69 /* bn_mp_to_unsigned_bin.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919761193400A0083AC69 /* bn_mp_to_unsigned_bin.c */; };
-		22C91A691193400A0083AC69 /* bn_mp_toom_mul.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919771193400A0083AC69 /* bn_mp_toom_mul.c */; };
-		22C91A6A1193400A0083AC69 /* bn_mp_toom_sqr.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919781193400A0083AC69 /* bn_mp_toom_sqr.c */; };
-		22C91A6B1193400A0083AC69 /* bn_mp_toradix_n.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919791193400A0083AC69 /* bn_mp_toradix_n.c */; };
-		22C91A6C1193400A0083AC69 /* bn_mp_toradix.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9197A1193400A0083AC69 /* bn_mp_toradix.c */; };
-		22C91A6D1193400A0083AC69 /* bn_mp_unsigned_bin_size.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9197B1193400A0083AC69 /* bn_mp_unsigned_bin_size.c */; };
-		22C91A6E1193400A0083AC69 /* bn_mp_xor.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9197C1193400A0083AC69 /* bn_mp_xor.c */; };
-		22C91A6F1193400A0083AC69 /* bn_mp_zero.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9197D1193400A0083AC69 /* bn_mp_zero.c */; };
-		22C91A701193400A0083AC69 /* bn_prime_tab.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9197E1193400A0083AC69 /* bn_prime_tab.c */; };
-		22C91A711193400A0083AC69 /* bn_reverse.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C9197F1193400A0083AC69 /* bn_reverse.c */; };
-		22C91A721193400A0083AC69 /* bn_s_mp_add.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919801193400A0083AC69 /* bn_s_mp_add.c */; };
-		22C91A731193400A0083AC69 /* bn_s_mp_exptmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919811193400A0083AC69 /* bn_s_mp_exptmod.c */; };
-		22C91A741193400A0083AC69 /* bn_s_mp_mul_digs.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919821193400A0083AC69 /* bn_s_mp_mul_digs.c */; };
-		22C91A751193400A0083AC69 /* bn_s_mp_mul_high_digs.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919831193400A0083AC69 /* bn_s_mp_mul_high_digs.c */; };
-		22C91A761193400A0083AC69 /* bn_s_mp_sqr.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919841193400A0083AC69 /* bn_s_mp_sqr.c */; };
-		22C91A771193400A0083AC69 /* bn_s_mp_sub.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919851193400A0083AC69 /* bn_s_mp_sub.c */; };
-		22C91A781193400A0083AC69 /* bncore.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C919861193400A0083AC69 /* bncore.c */; };
-		22C91A791193400A0083AC69 /* tommath_class.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C919871193400A0083AC69 /* tommath_class.h */; };
-		22C91A7A1193400A0083AC69 /* tommath_superclass.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C919881193400A0083AC69 /* tommath_superclass.h */; };
-		22C91A7B1193400A0083AC69 /* tommath.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C919891193400A0083AC69 /* tommath.h */; };
-		22EC6044154B28A000679228 /* FileStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 22EC6043154B28A000679228 /* FileStream.h */; };
-		22EC6045154B28A000679228 /* FileStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 22EC6043154B28A000679228 /* FileStream.h */; };
-		22F5A9C51193DFBA00F8B121 /* SFileVerify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22F5A9C41193DFBA00F8B121 /* SFileVerify.cpp */; };
-		22F5A9C61193DFBA00F8B121 /* SFileVerify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22F5A9C41193DFBA00F8B121 /* SFileVerify.cpp */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		2229F62E11D4653600118914 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 225530D31056BAC800FA646A;
-			remoteInfo = StormLib;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		221F6A721168529C0026C852 /* LzmaDec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LzmaDec.h; path = C/LzmaDec.h; sourceTree = "<group>"; };
-		221F6A731168529C0026C852 /* LzmaEnc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LzmaEnc.h; path = C/LzmaEnc.h; sourceTree = "<group>"; };
-		221F6A7A116852AA0026C852 /* LzmaEnc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = LzmaEnc.c; path = C/LzmaEnc.c; sourceTree = "<group>"; };
-		221F6A7D116852B20026C852 /* LzmaDec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = LzmaDec.c; path = C/LzmaDec.c; sourceTree = "<group>"; };
-		221F6AB31168545B0026C852 /* LzFind.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = LzFind.c; path = C/LzFind.c; sourceTree = "<group>"; };
-		221F6AB41168545B0026C852 /* LzFind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LzFind.h; path = C/LzFind.h; sourceTree = "<group>"; };
-		221F6AB9116854730026C852 /* LzHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LzHash.h; path = C/LzHash.h; sourceTree = "<group>"; };
-		221F6ABC116854870026C852 /* Types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Types.h; path = C/Types.h; sourceTree = "<group>"; };
-		2253A19F10568A83001909F9 /* StormLib.exp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.exports; name = StormLib.exp; path = stormlib_dll/StormLib.exp; sourceTree = "<group>"; };
-		225530D41056BAC800FA646A /* libStormLib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libStormLib.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		225C734B1257CCC70009E8DA /* lookup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lookup.h; sourceTree = "<group>"; };
-		225C734C1257CCC70009E8DA /* lookup3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lookup3.c; sourceTree = "<group>"; };
-		225C73531257CD0C0009E8DA /* SBaseFileTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBaseFileTable.cpp; path = src/SBaseFileTable.cpp; sourceTree = "<group>"; };
-		225FAC940E53B7F800DA2CAE /* StormLib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = StormLib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		225FAC950E53B7F800DA2CAE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		228B538311BF7D0D001A58DA /* FileStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileStream.cpp; path = src/FileStream.cpp; sourceTree = "<group>"; };
-		2295488911D45A820064B264 /* Test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Test.cpp; path = test/Test.cpp; sourceTree = "<group>"; };
-		22954ACE11D463A30064B264 /* StormLib_Test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = StormLib_Test; sourceTree = BUILT_PRODUCTS_DIR; };
-		2299D9D51167EFA8005C19BF /* adpcm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adpcm.cpp; sourceTree = "<group>"; };
-		2299D9D61167EFA8005C19BF /* adpcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adpcm.h; sourceTree = "<group>"; };
-		2299D9DC1167EFC6005C19BF /* sparse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sparse.cpp; sourceTree = "<group>"; };
-		2299D9DD1167EFC6005C19BF /* sparse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sparse.h; sourceTree = "<group>"; };
-		2299DA4D1167FD16005C19BF /* SFileAddFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SFileAddFile.cpp; path = src/SFileAddFile.cpp; sourceTree = "<group>"; };
-		22AEA121123125D800359B16 /* SFilePatchArchives.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SFilePatchArchives.cpp; path = src/SFilePatchArchives.cpp; sourceTree = "<group>"; };
-		22C9182B11933FCF0083AC69 /* hash_memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hash_memory.c; sourceTree = "<group>"; };
-		22C9182C11933FCF0083AC69 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = md5.c; sourceTree = "<group>"; };
-		22C9182D11933FCF0083AC69 /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; };
-		22C9182F11933FCF0083AC69 /* tomcrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt.h; sourceTree = "<group>"; };
-		22C9183011933FCF0083AC69 /* tomcrypt_argchk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt_argchk.h; sourceTree = "<group>"; };
-		22C9183111933FCF0083AC69 /* tomcrypt_cfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt_cfg.h; sourceTree = "<group>"; };
-		22C9183211933FCF0083AC69 /* tomcrypt_cipher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt_cipher.h; sourceTree = "<group>"; };
-		22C9183311933FCF0083AC69 /* tomcrypt_custom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt_custom.h; sourceTree = "<group>"; };
-		22C9183411933FCF0083AC69 /* tomcrypt_hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt_hash.h; sourceTree = "<group>"; };
-		22C9183511933FCF0083AC69 /* tomcrypt_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt_mac.h; sourceTree = "<group>"; };
-		22C9183611933FCF0083AC69 /* tomcrypt_macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt_macros.h; sourceTree = "<group>"; };
-		22C9183711933FCF0083AC69 /* tomcrypt_math.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt_math.h; sourceTree = "<group>"; };
-		22C9183811933FCF0083AC69 /* tomcrypt_misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt_misc.h; sourceTree = "<group>"; };
-		22C9183911933FCF0083AC69 /* tomcrypt_pk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt_pk.h; sourceTree = "<group>"; };
-		22C9183A11933FCF0083AC69 /* tomcrypt_pkcs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt_pkcs.h; sourceTree = "<group>"; };
-		22C9183B11933FCF0083AC69 /* tomcrypt_prng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tomcrypt_prng.h; sourceTree = "<group>"; };
-		22C9183D11933FCF0083AC69 /* ltm_desc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ltm_desc.c; sourceTree = "<group>"; };
-		22C9183E11933FCF0083AC69 /* multi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = multi.c; sourceTree = "<group>"; };
-		22C9183F11933FCF0083AC69 /* rand_prime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rand_prime.c; sourceTree = "<group>"; };
-		22C9184111933FCF0083AC69 /* base64_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base64_decode.c; sourceTree = "<group>"; };
-		22C9184211933FCF0083AC69 /* crypt_argchk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_argchk.c; sourceTree = "<group>"; };
-		22C9184311933FCF0083AC69 /* crypt_find_hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_find_hash.c; sourceTree = "<group>"; };
-		22C9184411933FCF0083AC69 /* crypt_find_prng.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_find_prng.c; sourceTree = "<group>"; };
-		22C9184511933FCF0083AC69 /* crypt_hash_descriptor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_hash_descriptor.c; sourceTree = "<group>"; };
-		22C9184611933FCF0083AC69 /* crypt_hash_is_valid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_hash_is_valid.c; sourceTree = "<group>"; };
-		22C9184711933FCF0083AC69 /* crypt_libc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_libc.c; sourceTree = "<group>"; };
-		22C9184811933FCF0083AC69 /* crypt_ltc_mp_descriptor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_ltc_mp_descriptor.c; sourceTree = "<group>"; };
-		22C9184911933FCF0083AC69 /* crypt_prng_descriptor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_prng_descriptor.c; sourceTree = "<group>"; };
-		22C9184A11933FCF0083AC69 /* crypt_prng_is_valid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_prng_is_valid.c; sourceTree = "<group>"; };
-		22C9184B11933FCF0083AC69 /* crypt_register_hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_register_hash.c; sourceTree = "<group>"; };
-		22C9184C11933FCF0083AC69 /* crypt_register_prng.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_register_prng.c; sourceTree = "<group>"; };
-		22C9184D11933FCF0083AC69 /* zeromem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zeromem.c; sourceTree = "<group>"; };
-		22C9185011933FCF0083AC69 /* der_decode_bit_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_bit_string.c; sourceTree = "<group>"; };
-		22C9185111933FCF0083AC69 /* der_decode_boolean.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_boolean.c; sourceTree = "<group>"; };
-		22C9185211933FCF0083AC69 /* der_decode_choice.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_choice.c; sourceTree = "<group>"; };
-		22C9185311933FCF0083AC69 /* der_decode_ia5_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_ia5_string.c; sourceTree = "<group>"; };
-		22C9185411933FCF0083AC69 /* der_decode_integer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_integer.c; sourceTree = "<group>"; };
-		22C9185511933FCF0083AC69 /* der_decode_object_identifier.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_object_identifier.c; sourceTree = "<group>"; };
-		22C9185611933FCF0083AC69 /* der_decode_octet_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_octet_string.c; sourceTree = "<group>"; };
-		22C9185711933FCF0083AC69 /* der_decode_printable_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_printable_string.c; sourceTree = "<group>"; };
-		22C9185811933FCF0083AC69 /* der_decode_sequence_ex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_sequence_ex.c; sourceTree = "<group>"; };
-		22C9185911933FCF0083AC69 /* der_decode_sequence_flexi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_sequence_flexi.c; sourceTree = "<group>"; };
-		22C9185A11933FCF0083AC69 /* der_decode_sequence_multi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_sequence_multi.c; sourceTree = "<group>"; };
-		22C9185B11933FCF0083AC69 /* der_decode_short_integer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_short_integer.c; sourceTree = "<group>"; };
-		22C9185C11933FCF0083AC69 /* der_decode_utctime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_utctime.c; sourceTree = "<group>"; };
-		22C9185D11933FCF0083AC69 /* der_decode_utf8_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_decode_utf8_string.c; sourceTree = "<group>"; };
-		22C9185E11933FCF0083AC69 /* der_length_bit_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_length_bit_string.c; sourceTree = "<group>"; };
-		22C9185F11933FCF0083AC69 /* der_length_boolean.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_length_boolean.c; sourceTree = "<group>"; };
-		22C9186011933FCF0083AC69 /* der_length_ia5_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_length_ia5_string.c; sourceTree = "<group>"; };
-		22C9186111933FCF0083AC69 /* der_length_integer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_length_integer.c; sourceTree = "<group>"; };
-		22C9186211933FCF0083AC69 /* der_length_object_identifier.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_length_object_identifier.c; sourceTree = "<group>"; };
-		22C9186311933FCF0083AC69 /* der_length_octet_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_length_octet_string.c; sourceTree = "<group>"; };
-		22C9186411933FCF0083AC69 /* der_length_printable_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_length_printable_string.c; sourceTree = "<group>"; };
-		22C9186511933FCF0083AC69 /* der_length_sequence.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_length_sequence.c; sourceTree = "<group>"; };
-		22C9186611933FCF0083AC69 /* der_length_short_integer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_length_short_integer.c; sourceTree = "<group>"; };
-		22C9186711933FCF0083AC69 /* der_length_utctime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_length_utctime.c; sourceTree = "<group>"; };
-		22C9186811933FCF0083AC69 /* der_length_utf8_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_length_utf8_string.c; sourceTree = "<group>"; };
-		22C9186911933FCF0083AC69 /* der_sequence_free.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_sequence_free.c; sourceTree = "<group>"; };
-		22C9186B11933FCF0083AC69 /* ltc_ecc_map.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ltc_ecc_map.c; sourceTree = "<group>"; };
-		22C9186C11933FCF0083AC69 /* ltc_ecc_mul2add.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ltc_ecc_mul2add.c; sourceTree = "<group>"; };
-		22C9186D11933FCF0083AC69 /* ltc_ecc_mulmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ltc_ecc_mulmod.c; sourceTree = "<group>"; };
-		22C9186E11933FCF0083AC69 /* ltc_ecc_points.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ltc_ecc_points.c; sourceTree = "<group>"; };
-		22C9186F11933FCF0083AC69 /* ltc_ecc_projective_add_point.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ltc_ecc_projective_add_point.c; sourceTree = "<group>"; };
-		22C9187011933FCF0083AC69 /* ltc_ecc_projective_dbl_point.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ltc_ecc_projective_dbl_point.c; sourceTree = "<group>"; };
-		22C9187211933FCF0083AC69 /* pkcs_1_mgf1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkcs_1_mgf1.c; sourceTree = "<group>"; };
-		22C9187311933FCF0083AC69 /* pkcs_1_oaep_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkcs_1_oaep_decode.c; sourceTree = "<group>"; };
-		22C9187411933FCF0083AC69 /* pkcs_1_pss_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkcs_1_pss_decode.c; sourceTree = "<group>"; };
-		22C9187511933FCF0083AC69 /* pkcs_1_v1_5_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkcs_1_v1_5_decode.c; sourceTree = "<group>"; };
-		22C9187711933FCF0083AC69 /* rsa_exptmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rsa_exptmod.c; sourceTree = "<group>"; };
-		22C9187811933FCF0083AC69 /* rsa_free.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rsa_free.c; sourceTree = "<group>"; };
-		22C9187911933FCF0083AC69 /* rsa_import.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rsa_import.c; sourceTree = "<group>"; };
-		22C9187A11933FCF0083AC69 /* rsa_make_key.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rsa_make_key.c; sourceTree = "<group>"; };
-		22C9187B11933FCF0083AC69 /* rsa_verify_hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rsa_verify_hash.c; sourceTree = "<group>"; };
-		22C9187C11933FCF0083AC69 /* rsa_verify_simple.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rsa_verify_simple.c; sourceTree = "<group>"; };
-		22C919111193400A0083AC69 /* bn_fast_mp_invmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_fast_mp_invmod.c; sourceTree = "<group>"; };
-		22C919121193400A0083AC69 /* bn_fast_mp_montgomery_reduce.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_fast_mp_montgomery_reduce.c; sourceTree = "<group>"; };
-		22C919131193400A0083AC69 /* bn_fast_s_mp_mul_digs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_fast_s_mp_mul_digs.c; sourceTree = "<group>"; };
-		22C919141193400A0083AC69 /* bn_fast_s_mp_mul_high_digs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_fast_s_mp_mul_high_digs.c; sourceTree = "<group>"; };
-		22C919151193400A0083AC69 /* bn_fast_s_mp_sqr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_fast_s_mp_sqr.c; sourceTree = "<group>"; };
-		22C919161193400A0083AC69 /* bn_mp_2expt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_2expt.c; sourceTree = "<group>"; };
-		22C919171193400A0083AC69 /* bn_mp_abs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_abs.c; sourceTree = "<group>"; };
-		22C919181193400A0083AC69 /* bn_mp_add_d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_add_d.c; sourceTree = "<group>"; };
-		22C919191193400A0083AC69 /* bn_mp_add.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_add.c; sourceTree = "<group>"; };
-		22C9191A1193400A0083AC69 /* bn_mp_addmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_addmod.c; sourceTree = "<group>"; };
-		22C9191B1193400A0083AC69 /* bn_mp_and.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_and.c; sourceTree = "<group>"; };
-		22C9191C1193400A0083AC69 /* bn_mp_clamp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_clamp.c; sourceTree = "<group>"; };
-		22C9191D1193400A0083AC69 /* bn_mp_clear_multi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_clear_multi.c; sourceTree = "<group>"; };
-		22C9191E1193400A0083AC69 /* bn_mp_clear.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_clear.c; sourceTree = "<group>"; };
-		22C9191F1193400A0083AC69 /* bn_mp_cmp_d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_cmp_d.c; sourceTree = "<group>"; };
-		22C919201193400A0083AC69 /* bn_mp_cmp_mag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_cmp_mag.c; sourceTree = "<group>"; };
-		22C919211193400A0083AC69 /* bn_mp_cmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_cmp.c; sourceTree = "<group>"; };
-		22C919221193400A0083AC69 /* bn_mp_cnt_lsb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_cnt_lsb.c; sourceTree = "<group>"; };
-		22C919231193400A0083AC69 /* bn_mp_copy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_copy.c; sourceTree = "<group>"; };
-		22C919241193400A0083AC69 /* bn_mp_count_bits.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_count_bits.c; sourceTree = "<group>"; };
-		22C919251193400A0083AC69 /* bn_mp_div_2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_div_2.c; sourceTree = "<group>"; };
-		22C919261193400A0083AC69 /* bn_mp_div_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_div_2d.c; sourceTree = "<group>"; };
-		22C919271193400A0083AC69 /* bn_mp_div_3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_div_3.c; sourceTree = "<group>"; };
-		22C919281193400A0083AC69 /* bn_mp_div_d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_div_d.c; sourceTree = "<group>"; };
-		22C919291193400A0083AC69 /* bn_mp_div.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_div.c; sourceTree = "<group>"; };
-		22C9192A1193400A0083AC69 /* bn_mp_dr_is_modulus.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_dr_is_modulus.c; sourceTree = "<group>"; };
-		22C9192B1193400A0083AC69 /* bn_mp_dr_reduce.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_dr_reduce.c; sourceTree = "<group>"; };
-		22C9192C1193400A0083AC69 /* bn_mp_dr_setup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_dr_setup.c; sourceTree = "<group>"; };
-		22C9192D1193400A0083AC69 /* bn_mp_exch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_exch.c; sourceTree = "<group>"; };
-		22C9192E1193400A0083AC69 /* bn_mp_expt_d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_expt_d.c; sourceTree = "<group>"; };
-		22C9192F1193400A0083AC69 /* bn_mp_exptmod_fast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_exptmod_fast.c; sourceTree = "<group>"; };
-		22C919301193400A0083AC69 /* bn_mp_exptmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_exptmod.c; sourceTree = "<group>"; };
-		22C919311193400A0083AC69 /* bn_mp_exteuclid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_exteuclid.c; sourceTree = "<group>"; };
-		22C919321193400A0083AC69 /* bn_mp_fread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_fread.c; sourceTree = "<group>"; };
-		22C919331193400A0083AC69 /* bn_mp_fwrite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_fwrite.c; sourceTree = "<group>"; };
-		22C919341193400A0083AC69 /* bn_mp_gcd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_gcd.c; sourceTree = "<group>"; };
-		22C919351193400A0083AC69 /* bn_mp_get_int.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_get_int.c; sourceTree = "<group>"; };
-		22C919361193400A0083AC69 /* bn_mp_grow.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_grow.c; sourceTree = "<group>"; };
-		22C919371193400A0083AC69 /* bn_mp_init_copy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_init_copy.c; sourceTree = "<group>"; };
-		22C919381193400A0083AC69 /* bn_mp_init_multi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_init_multi.c; sourceTree = "<group>"; };
-		22C919391193400A0083AC69 /* bn_mp_init_set_int.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_init_set_int.c; sourceTree = "<group>"; };
-		22C9193A1193400A0083AC69 /* bn_mp_init_set.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_init_set.c; sourceTree = "<group>"; };
-		22C9193B1193400A0083AC69 /* bn_mp_init_size.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_init_size.c; sourceTree = "<group>"; };
-		22C9193C1193400A0083AC69 /* bn_mp_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_init.c; sourceTree = "<group>"; };
-		22C9193D1193400A0083AC69 /* bn_mp_invmod_slow.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_invmod_slow.c; sourceTree = "<group>"; };
-		22C9193E1193400A0083AC69 /* bn_mp_invmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_invmod.c; sourceTree = "<group>"; };
-		22C9193F1193400A0083AC69 /* bn_mp_is_square.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_is_square.c; sourceTree = "<group>"; };
-		22C919401193400A0083AC69 /* bn_mp_jacobi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_jacobi.c; sourceTree = "<group>"; };
-		22C919411193400A0083AC69 /* bn_mp_karatsuba_mul.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_karatsuba_mul.c; sourceTree = "<group>"; };
-		22C919421193400A0083AC69 /* bn_mp_karatsuba_sqr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_karatsuba_sqr.c; sourceTree = "<group>"; };
-		22C919431193400A0083AC69 /* bn_mp_lcm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_lcm.c; sourceTree = "<group>"; };
-		22C919441193400A0083AC69 /* bn_mp_lshd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_lshd.c; sourceTree = "<group>"; };
-		22C919451193400A0083AC69 /* bn_mp_mod_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_mod_2d.c; sourceTree = "<group>"; };
-		22C919461193400A0083AC69 /* bn_mp_mod_d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_mod_d.c; sourceTree = "<group>"; };
-		22C919471193400A0083AC69 /* bn_mp_mod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_mod.c; sourceTree = "<group>"; };
-		22C919481193400A0083AC69 /* bn_mp_montgomery_calc_normalization.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_montgomery_calc_normalization.c; sourceTree = "<group>"; };
-		22C919491193400A0083AC69 /* bn_mp_montgomery_reduce.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_montgomery_reduce.c; sourceTree = "<group>"; };
-		22C9194A1193400A0083AC69 /* bn_mp_montgomery_setup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_montgomery_setup.c; sourceTree = "<group>"; };
-		22C9194B1193400A0083AC69 /* bn_mp_mul_2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_mul_2.c; sourceTree = "<group>"; };
-		22C9194C1193400A0083AC69 /* bn_mp_mul_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_mul_2d.c; sourceTree = "<group>"; };
-		22C9194D1193400A0083AC69 /* bn_mp_mul_d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_mul_d.c; sourceTree = "<group>"; };
-		22C9194E1193400A0083AC69 /* bn_mp_mul.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_mul.c; sourceTree = "<group>"; };
-		22C9194F1193400A0083AC69 /* bn_mp_mulmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_mulmod.c; sourceTree = "<group>"; };
-		22C919501193400A0083AC69 /* bn_mp_n_root.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_n_root.c; sourceTree = "<group>"; };
-		22C919511193400A0083AC69 /* bn_mp_neg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_neg.c; sourceTree = "<group>"; };
-		22C919521193400A0083AC69 /* bn_mp_or.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_or.c; sourceTree = "<group>"; };
-		22C919531193400A0083AC69 /* bn_mp_prime_fermat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_prime_fermat.c; sourceTree = "<group>"; };
-		22C919541193400A0083AC69 /* bn_mp_prime_is_divisible.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_prime_is_divisible.c; sourceTree = "<group>"; };
-		22C919551193400A0083AC69 /* bn_mp_prime_is_prime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_prime_is_prime.c; sourceTree = "<group>"; };
-		22C919561193400A0083AC69 /* bn_mp_prime_miller_rabin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_prime_miller_rabin.c; sourceTree = "<group>"; };
-		22C919571193400A0083AC69 /* bn_mp_prime_next_prime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_prime_next_prime.c; sourceTree = "<group>"; };
-		22C919581193400A0083AC69 /* bn_mp_prime_rabin_miller_trials.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_prime_rabin_miller_trials.c; sourceTree = "<group>"; };
-		22C919591193400A0083AC69 /* bn_mp_prime_random_ex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_prime_random_ex.c; sourceTree = "<group>"; };
-		22C9195A1193400A0083AC69 /* bn_mp_radix_size.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_radix_size.c; sourceTree = "<group>"; };
-		22C9195B1193400A0083AC69 /* bn_mp_radix_smap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_radix_smap.c; sourceTree = "<group>"; };
-		22C9195C1193400A0083AC69 /* bn_mp_rand.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_rand.c; sourceTree = "<group>"; };
-		22C9195D1193400A0083AC69 /* bn_mp_read_radix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_read_radix.c; sourceTree = "<group>"; };
-		22C9195E1193400A0083AC69 /* bn_mp_read_signed_bin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_read_signed_bin.c; sourceTree = "<group>"; };
-		22C9195F1193400A0083AC69 /* bn_mp_read_unsigned_bin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_read_unsigned_bin.c; sourceTree = "<group>"; };
-		22C919601193400A0083AC69 /* bn_mp_reduce_2k_l.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_reduce_2k_l.c; sourceTree = "<group>"; };
-		22C919611193400A0083AC69 /* bn_mp_reduce_2k_setup_l.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_reduce_2k_setup_l.c; sourceTree = "<group>"; };
-		22C919621193400A0083AC69 /* bn_mp_reduce_2k_setup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_reduce_2k_setup.c; sourceTree = "<group>"; };
-		22C919631193400A0083AC69 /* bn_mp_reduce_2k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_reduce_2k.c; sourceTree = "<group>"; };
-		22C919641193400A0083AC69 /* bn_mp_reduce_is_2k_l.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_reduce_is_2k_l.c; sourceTree = "<group>"; };
-		22C919651193400A0083AC69 /* bn_mp_reduce_is_2k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_reduce_is_2k.c; sourceTree = "<group>"; };
-		22C919661193400A0083AC69 /* bn_mp_reduce_setup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_reduce_setup.c; sourceTree = "<group>"; };
-		22C919671193400A0083AC69 /* bn_mp_reduce.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_reduce.c; sourceTree = "<group>"; };
-		22C919681193400A0083AC69 /* bn_mp_rshd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_rshd.c; sourceTree = "<group>"; };
-		22C919691193400A0083AC69 /* bn_mp_set_int.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_set_int.c; sourceTree = "<group>"; };
-		22C9196A1193400A0083AC69 /* bn_mp_set.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_set.c; sourceTree = "<group>"; };
-		22C9196B1193400A0083AC69 /* bn_mp_shrink.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_shrink.c; sourceTree = "<group>"; };
-		22C9196C1193400A0083AC69 /* bn_mp_signed_bin_size.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_signed_bin_size.c; sourceTree = "<group>"; };
-		22C9196D1193400A0083AC69 /* bn_mp_sqr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_sqr.c; sourceTree = "<group>"; };
-		22C9196E1193400A0083AC69 /* bn_mp_sqrmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_sqrmod.c; sourceTree = "<group>"; };
-		22C9196F1193400A0083AC69 /* bn_mp_sqrt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_sqrt.c; sourceTree = "<group>"; };
-		22C919701193400A0083AC69 /* bn_mp_sub_d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_sub_d.c; sourceTree = "<group>"; };
-		22C919711193400A0083AC69 /* bn_mp_sub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_sub.c; sourceTree = "<group>"; };
-		22C919721193400A0083AC69 /* bn_mp_submod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_submod.c; sourceTree = "<group>"; };
-		22C919731193400A0083AC69 /* bn_mp_to_signed_bin_n.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_to_signed_bin_n.c; sourceTree = "<group>"; };
-		22C919741193400A0083AC69 /* bn_mp_to_signed_bin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_to_signed_bin.c; sourceTree = "<group>"; };
-		22C919751193400A0083AC69 /* bn_mp_to_unsigned_bin_n.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_to_unsigned_bin_n.c; sourceTree = "<group>"; };
-		22C919761193400A0083AC69 /* bn_mp_to_unsigned_bin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_to_unsigned_bin.c; sourceTree = "<group>"; };
-		22C919771193400A0083AC69 /* bn_mp_toom_mul.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_toom_mul.c; sourceTree = "<group>"; };
-		22C919781193400A0083AC69 /* bn_mp_toom_sqr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_toom_sqr.c; sourceTree = "<group>"; };
-		22C919791193400A0083AC69 /* bn_mp_toradix_n.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_toradix_n.c; sourceTree = "<group>"; };
-		22C9197A1193400A0083AC69 /* bn_mp_toradix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_toradix.c; sourceTree = "<group>"; };
-		22C9197B1193400A0083AC69 /* bn_mp_unsigned_bin_size.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_unsigned_bin_size.c; sourceTree = "<group>"; };
-		22C9197C1193400A0083AC69 /* bn_mp_xor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_xor.c; sourceTree = "<group>"; };
-		22C9197D1193400A0083AC69 /* bn_mp_zero.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_mp_zero.c; sourceTree = "<group>"; };
-		22C9197E1193400A0083AC69 /* bn_prime_tab.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_prime_tab.c; sourceTree = "<group>"; };
-		22C9197F1193400A0083AC69 /* bn_reverse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_reverse.c; sourceTree = "<group>"; };
-		22C919801193400A0083AC69 /* bn_s_mp_add.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_s_mp_add.c; sourceTree = "<group>"; };
-		22C919811193400A0083AC69 /* bn_s_mp_exptmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_s_mp_exptmod.c; sourceTree = "<group>"; };
-		22C919821193400A0083AC69 /* bn_s_mp_mul_digs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_s_mp_mul_digs.c; sourceTree = "<group>"; };
-		22C919831193400A0083AC69 /* bn_s_mp_mul_high_digs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_s_mp_mul_high_digs.c; sourceTree = "<group>"; };
-		22C919841193400A0083AC69 /* bn_s_mp_sqr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_s_mp_sqr.c; sourceTree = "<group>"; };
-		22C919851193400A0083AC69 /* bn_s_mp_sub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bn_s_mp_sub.c; sourceTree = "<group>"; };
-		22C919861193400A0083AC69 /* bncore.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bncore.c; sourceTree = "<group>"; };
-		22C919871193400A0083AC69 /* tommath_class.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tommath_class.h; sourceTree = "<group>"; };
-		22C919881193400A0083AC69 /* tommath_superclass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tommath_superclass.h; sourceTree = "<group>"; };
-		22C919891193400A0083AC69 /* tommath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tommath.h; sourceTree = "<group>"; };
-		22EC6043154B28A000679228 /* FileStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileStream.h; path = src/FileStream.h; sourceTree = "<group>"; };
-		22F5A9C41193DFBA00F8B121 /* SFileVerify.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SFileVerify.cpp; path = src/SFileVerify.cpp; sourceTree = "<group>"; };
-		32D20A8A0CF3902D00230E7A /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = /usr/lib/libbz2.dylib; sourceTree = "<absolute>"; };
-		32D20A8B0CF3902D00230E7A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
-		32ED009C0D03542A00AB0B4E /* huff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = huff.cpp; sourceTree = "<group>"; };
-		32ED009D0D03542A00AB0B4E /* huff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = huff.h; sourceTree = "<group>"; };
-		32ED00A60D03542A00AB0B4E /* explode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = explode.c; sourceTree = "<group>"; };
-		32ED00A70D03542A00AB0B4E /* implode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = implode.c; sourceTree = "<group>"; };
-		32ED00A80D03542A00AB0B4E /* pklib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pklib.h; sourceTree = "<group>"; };
-		32ED00A90D03542A00AB0B4E /* SFileAttributes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SFileAttributes.cpp; path = src/SFileAttributes.cpp; sourceTree = "<group>"; };
-		32ED00AA0D03542A00AB0B4E /* SBaseCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBaseCommon.cpp; path = src/SBaseCommon.cpp; sourceTree = "<group>"; };
-		32ED00AB0D03542A00AB0B4E /* StormCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StormCommon.h; path = src/StormCommon.h; sourceTree = "<group>"; };
-		32ED00AC0D03542A00AB0B4E /* SCompression.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SCompression.cpp; path = src/SCompression.cpp; sourceTree = "<group>"; };
-		32ED00AD0D03542A00AB0B4E /* SFileCompactArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SFileCompactArchive.cpp; path = src/SFileCompactArchive.cpp; sourceTree = "<group>"; };
-		32ED00AE0D03542A00AB0B4E /* SFileCreateArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SFileCreateArchive.cpp; path = src/SFileCreateArchive.cpp; sourceTree = "<group>"; };
-		32ED00AF0D03542A00AB0B4E /* SFileExtractFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SFileExtractFile.cpp; path = src/SFileExtractFile.cpp; sourceTree = "<group>"; };
-		32ED00B00D03542A00AB0B4E /* SFileFindFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SFileFindFile.cpp; path = src/SFileFindFile.cpp; sourceTree = "<group>"; };
-		32ED00B10D03542A00AB0B4E /* SFileOpenArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SFileOpenArchive.cpp; path = src/SFileOpenArchive.cpp; sourceTree = "<group>"; };
-		32ED00B20D03542A00AB0B4E /* SFileOpenFileEx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SFileOpenFileEx.cpp; path = src/SFileOpenFileEx.cpp; sourceTree = "<group>"; };
-		32ED00B30D03542A00AB0B4E /* SFileReadFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SFileReadFile.cpp; path = src/SFileReadFile.cpp; sourceTree = "<group>"; };
-		32ED00B40D03542A00AB0B4E /* SFileListFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SFileListFile.cpp; path = src/SFileListFile.cpp; sourceTree = "<group>"; };
-		32ED00B60D03542A00AB0B4E /* StormLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StormLib.h; path = src/StormLib.h; sourceTree = "<group>"; };
-		32ED00B70D03542A00AB0B4E /* StormPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StormPort.h; path = src/StormPort.h; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		225530D21056BAC800FA646A /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		225FAC920E53B7F800DA2CAE /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				225FADD40E53C06600DA2CAE /* libbz2.dylib in Frameworks */,
-				225FADD50E53C06600DA2CAE /* libz.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		22954ACC11D463A30064B264 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				22954AD611D463BE0064B264 /* libbz2.dylib in Frameworks */,
-				22954AD711D463BE0064B264 /* libz.dylib in Frameworks */,
-				22954AD311D463B50064B264 /* libStormLib.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		034768DDFF38A45A11DB9C8B /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				225FAC940E53B7F800DA2CAE /* StormLib.framework */,
-				225530D41056BAC800FA646A /* libStormLib.a */,
-				22954ACE11D463A30064B264 /* StormLib_Test */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		0867D691FE84028FC02AAC07 /* stormlib */ = {
-			isa = PBXGroup;
-			children = (
-				32DBEE830D00E58F00DB1E81 /* Source */,
-				2295488711D45A520064B264 /* Test */,
-				0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
-				22B54B321054B287001D6436 /* Resources */,
-				034768DDFF38A45A11DB9C8B /* Products */,
-				2253A19F10568A83001909F9 /* StormLib.exp */,
-			);
-			name = stormlib;
-			sourceTree = "<group>";
-		};
-		0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				32D20A8A0CF3902D00230E7A /* libbz2.dylib */,
-				32D20A8B0CF3902D00230E7A /* libz.dylib */,
-			);
-			name = "External Frameworks and Libraries";
-			sourceTree = "<group>";
-		};
-		221F652D116851D70026C852 /* lzma */ = {
-			isa = PBXGroup;
-			children = (
-				221F6AB31168545B0026C852 /* LzFind.c */,
-				221F6AB41168545B0026C852 /* LzFind.h */,
-				221F6AB9116854730026C852 /* LzHash.h */,
-				221F6A7D116852B20026C852 /* LzmaDec.c */,
-				221F6A721168529C0026C852 /* LzmaDec.h */,
-				221F6A7A116852AA0026C852 /* LzmaEnc.c */,
-				221F6A731168529C0026C852 /* LzmaEnc.h */,
-				221F6ABC116854870026C852 /* Types.h */,
-			);
-			name = lzma;
-			path = src/lzma;
-			sourceTree = "<group>";
-		};
-		225C734A1257CCC70009E8DA /* jenkins */ = {
-			isa = PBXGroup;
-			children = (
-				225C734B1257CCC70009E8DA /* lookup.h */,
-				225C734C1257CCC70009E8DA /* lookup3.c */,
-			);
-			name = jenkins;
-			path = src/jenkins;
-			sourceTree = "<group>";
-		};
-		2295488711D45A520064B264 /* Test */ = {
-			isa = PBXGroup;
-			children = (
-				2295488911D45A820064B264 /* Test.cpp */,
-			);
-			name = Test;
-			sourceTree = "<group>";
-		};
-		2299D9D41167EFA8005C19BF /* adpcm */ = {
-			isa = PBXGroup;
-			children = (
-				2299D9D51167EFA8005C19BF /* adpcm.cpp */,
-				2299D9D61167EFA8005C19BF /* adpcm.h */,
-			);
-			name = adpcm;
-			path = src/adpcm;
-			sourceTree = "<group>";
-		};
-		2299D9DB1167EFC6005C19BF /* sparse */ = {
-			isa = PBXGroup;
-			children = (
-				2299D9DC1167EFC6005C19BF /* sparse.cpp */,
-				2299D9DD1167EFC6005C19BF /* sparse.h */,
-			);
-			name = sparse;
-			path = src/sparse;
-			sourceTree = "<group>";
-		};
-		22B54B321054B287001D6436 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				225FAC950E53B7F800DA2CAE /* Info.plist */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		22C9181D11933E3A0083AC69 /* libtomcrypt */ = {
-			isa = PBXGroup;
-			children = (
-				22C9182A11933FCF0083AC69 /* hashes */,
-				22C9182E11933FCF0083AC69 /* headers */,
-				22C9183C11933FCF0083AC69 /* math */,
-				22C9184011933FCF0083AC69 /* misc */,
-				22C9184E11933FCF0083AC69 /* pk */,
-			);
-			name = libtomcrypt;
-			path = src/libtomcrypt;
-			sourceTree = "<group>";
-		};
-		22C9181E11933E470083AC69 /* libtommath */ = {
-			isa = PBXGroup;
-			children = (
-				22C919111193400A0083AC69 /* bn_fast_mp_invmod.c */,
-				22C919121193400A0083AC69 /* bn_fast_mp_montgomery_reduce.c */,
-				22C919131193400A0083AC69 /* bn_fast_s_mp_mul_digs.c */,
-				22C919141193400A0083AC69 /* bn_fast_s_mp_mul_high_digs.c */,
-				22C919151193400A0083AC69 /* bn_fast_s_mp_sqr.c */,
-				22C919161193400A0083AC69 /* bn_mp_2expt.c */,
-				22C919171193400A0083AC69 /* bn_mp_abs.c */,
-				22C919181193400A0083AC69 /* bn_mp_add_d.c */,
-				22C919191193400A0083AC69 /* bn_mp_add.c */,
-				22C9191A1193400A0083AC69 /* bn_mp_addmod.c */,
-				22C9191B1193400A0083AC69 /* bn_mp_and.c */,
-				22C9191C1193400A0083AC69 /* bn_mp_clamp.c */,
-				22C9191D1193400A0083AC69 /* bn_mp_clear_multi.c */,
-				22C9191E1193400A0083AC69 /* bn_mp_clear.c */,
-				22C9191F1193400A0083AC69 /* bn_mp_cmp_d.c */,
-				22C919201193400A0083AC69 /* bn_mp_cmp_mag.c */,
-				22C919211193400A0083AC69 /* bn_mp_cmp.c */,
-				22C919221193400A0083AC69 /* bn_mp_cnt_lsb.c */,
-				22C919231193400A0083AC69 /* bn_mp_copy.c */,
-				22C919241193400A0083AC69 /* bn_mp_count_bits.c */,
-				22C919251193400A0083AC69 /* bn_mp_div_2.c */,
-				22C919261193400A0083AC69 /* bn_mp_div_2d.c */,
-				22C919271193400A0083AC69 /* bn_mp_div_3.c */,
-				22C919281193400A0083AC69 /* bn_mp_div_d.c */,
-				22C919291193400A0083AC69 /* bn_mp_div.c */,
-				22C9192A1193400A0083AC69 /* bn_mp_dr_is_modulus.c */,
-				22C9192B1193400A0083AC69 /* bn_mp_dr_reduce.c */,
-				22C9192C1193400A0083AC69 /* bn_mp_dr_setup.c */,
-				22C9192D1193400A0083AC69 /* bn_mp_exch.c */,
-				22C9192E1193400A0083AC69 /* bn_mp_expt_d.c */,
-				22C9192F1193400A0083AC69 /* bn_mp_exptmod_fast.c */,
-				22C919301193400A0083AC69 /* bn_mp_exptmod.c */,
-				22C919311193400A0083AC69 /* bn_mp_exteuclid.c */,
-				22C919321193400A0083AC69 /* bn_mp_fread.c */,
-				22C919331193400A0083AC69 /* bn_mp_fwrite.c */,
-				22C919341193400A0083AC69 /* bn_mp_gcd.c */,
-				22C919351193400A0083AC69 /* bn_mp_get_int.c */,
-				22C919361193400A0083AC69 /* bn_mp_grow.c */,
-				22C919371193400A0083AC69 /* bn_mp_init_copy.c */,
-				22C919381193400A0083AC69 /* bn_mp_init_multi.c */,
-				22C919391193400A0083AC69 /* bn_mp_init_set_int.c */,
-				22C9193A1193400A0083AC69 /* bn_mp_init_set.c */,
-				22C9193B1193400A0083AC69 /* bn_mp_init_size.c */,
-				22C9193C1193400A0083AC69 /* bn_mp_init.c */,
-				22C9193D1193400A0083AC69 /* bn_mp_invmod_slow.c */,
-				22C9193E1193400A0083AC69 /* bn_mp_invmod.c */,
-				22C9193F1193400A0083AC69 /* bn_mp_is_square.c */,
-				22C919401193400A0083AC69 /* bn_mp_jacobi.c */,
-				22C919411193400A0083AC69 /* bn_mp_karatsuba_mul.c */,
-				22C919421193400A0083AC69 /* bn_mp_karatsuba_sqr.c */,
-				22C919431193400A0083AC69 /* bn_mp_lcm.c */,
-				22C919441193400A0083AC69 /* bn_mp_lshd.c */,
-				22C919451193400A0083AC69 /* bn_mp_mod_2d.c */,
-				22C919461193400A0083AC69 /* bn_mp_mod_d.c */,
-				22C919471193400A0083AC69 /* bn_mp_mod.c */,
-				22C919481193400A0083AC69 /* bn_mp_montgomery_calc_normalization.c */,
-				22C919491193400A0083AC69 /* bn_mp_montgomery_reduce.c */,
-				22C9194A1193400A0083AC69 /* bn_mp_montgomery_setup.c */,
-				22C9194B1193400A0083AC69 /* bn_mp_mul_2.c */,
-				22C9194C1193400A0083AC69 /* bn_mp_mul_2d.c */,
-				22C9194D1193400A0083AC69 /* bn_mp_mul_d.c */,
-				22C9194E1193400A0083AC69 /* bn_mp_mul.c */,
-				22C9194F1193400A0083AC69 /* bn_mp_mulmod.c */,
-				22C919501193400A0083AC69 /* bn_mp_n_root.c */,
-				22C919511193400A0083AC69 /* bn_mp_neg.c */,
-				22C919521193400A0083AC69 /* bn_mp_or.c */,
-				22C919531193400A0083AC69 /* bn_mp_prime_fermat.c */,
-				22C919541193400A0083AC69 /* bn_mp_prime_is_divisible.c */,
-				22C919551193400A0083AC69 /* bn_mp_prime_is_prime.c */,
-				22C919561193400A0083AC69 /* bn_mp_prime_miller_rabin.c */,
-				22C919571193400A0083AC69 /* bn_mp_prime_next_prime.c */,
-				22C919581193400A0083AC69 /* bn_mp_prime_rabin_miller_trials.c */,
-				22C919591193400A0083AC69 /* bn_mp_prime_random_ex.c */,
-				22C9195A1193400A0083AC69 /* bn_mp_radix_size.c */,
-				22C9195B1193400A0083AC69 /* bn_mp_radix_smap.c */,
-				22C9195C1193400A0083AC69 /* bn_mp_rand.c */,
-				22C9195D1193400A0083AC69 /* bn_mp_read_radix.c */,
-				22C9195E1193400A0083AC69 /* bn_mp_read_signed_bin.c */,
-				22C9195F1193400A0083AC69 /* bn_mp_read_unsigned_bin.c */,
-				22C919601193400A0083AC69 /* bn_mp_reduce_2k_l.c */,
-				22C919611193400A0083AC69 /* bn_mp_reduce_2k_setup_l.c */,
-				22C919621193400A0083AC69 /* bn_mp_reduce_2k_setup.c */,
-				22C919631193400A0083AC69 /* bn_mp_reduce_2k.c */,
-				22C919641193400A0083AC69 /* bn_mp_reduce_is_2k_l.c */,
-				22C919651193400A0083AC69 /* bn_mp_reduce_is_2k.c */,
-				22C919661193400A0083AC69 /* bn_mp_reduce_setup.c */,
-				22C919671193400A0083AC69 /* bn_mp_reduce.c */,
-				22C919681193400A0083AC69 /* bn_mp_rshd.c */,
-				22C919691193400A0083AC69 /* bn_mp_set_int.c */,
-				22C9196A1193400A0083AC69 /* bn_mp_set.c */,
-				22C9196B1193400A0083AC69 /* bn_mp_shrink.c */,
-				22C9196C1193400A0083AC69 /* bn_mp_signed_bin_size.c */,
-				22C9196D1193400A0083AC69 /* bn_mp_sqr.c */,
-				22C9196E1193400A0083AC69 /* bn_mp_sqrmod.c */,
-				22C9196F1193400A0083AC69 /* bn_mp_sqrt.c */,
-				22C919701193400A0083AC69 /* bn_mp_sub_d.c */,
-				22C919711193400A0083AC69 /* bn_mp_sub.c */,
-				22C919721193400A0083AC69 /* bn_mp_submod.c */,
-				22C919731193400A0083AC69 /* bn_mp_to_signed_bin_n.c */,
-				22C919741193400A0083AC69 /* bn_mp_to_signed_bin.c */,
-				22C919751193400A0083AC69 /* bn_mp_to_unsigned_bin_n.c */,
-				22C919761193400A0083AC69 /* bn_mp_to_unsigned_bin.c */,
-				22C919771193400A0083AC69 /* bn_mp_toom_mul.c */,
-				22C919781193400A0083AC69 /* bn_mp_toom_sqr.c */,
-				22C919791193400A0083AC69 /* bn_mp_toradix_n.c */,
-				22C9197A1193400A0083AC69 /* bn_mp_toradix.c */,
-				22C9197B1193400A0083AC69 /* bn_mp_unsigned_bin_size.c */,
-				22C9197C1193400A0083AC69 /* bn_mp_xor.c */,
-				22C9197D1193400A0083AC69 /* bn_mp_zero.c */,
-				22C9197E1193400A0083AC69 /* bn_prime_tab.c */,
-				22C9197F1193400A0083AC69 /* bn_reverse.c */,
-				22C919801193400A0083AC69 /* bn_s_mp_add.c */,
-				22C919811193400A0083AC69 /* bn_s_mp_exptmod.c */,
-				22C919821193400A0083AC69 /* bn_s_mp_mul_digs.c */,
-				22C919831193400A0083AC69 /* bn_s_mp_mul_high_digs.c */,
-				22C919841193400A0083AC69 /* bn_s_mp_sqr.c */,
-				22C919851193400A0083AC69 /* bn_s_mp_sub.c */,
-				22C919861193400A0083AC69 /* bncore.c */,
-				22C919871193400A0083AC69 /* tommath_class.h */,
-				22C919881193400A0083AC69 /* tommath_superclass.h */,
-				22C919891193400A0083AC69 /* tommath.h */,
-			);
-			name = libtommath;
-			path = src/libtommath;
-			sourceTree = "<group>";
-		};
-		22C9182A11933FCF0083AC69 /* hashes */ = {
-			isa = PBXGroup;
-			children = (
-				22C9182B11933FCF0083AC69 /* hash_memory.c */,
-				22C9182C11933FCF0083AC69 /* md5.c */,
-				22C9182D11933FCF0083AC69 /* sha1.c */,
-			);
-			name = hashes;
-			path = src/hashes;
-			sourceTree = "<group>";
-		};
-		22C9182E11933FCF0083AC69 /* headers */ = {
-			isa = PBXGroup;
-			children = (
-				22C9182F11933FCF0083AC69 /* tomcrypt.h */,
-				22C9183011933FCF0083AC69 /* tomcrypt_argchk.h */,
-				22C9183111933FCF0083AC69 /* tomcrypt_cfg.h */,
-				22C9183211933FCF0083AC69 /* tomcrypt_cipher.h */,
-				22C9183311933FCF0083AC69 /* tomcrypt_custom.h */,
-				22C9183411933FCF0083AC69 /* tomcrypt_hash.h */,
-				22C9183511933FCF0083AC69 /* tomcrypt_mac.h */,
-				22C9183611933FCF0083AC69 /* tomcrypt_macros.h */,
-				22C9183711933FCF0083AC69 /* tomcrypt_math.h */,
-				22C9183811933FCF0083AC69 /* tomcrypt_misc.h */,
-				22C9183911933FCF0083AC69 /* tomcrypt_pk.h */,
-				22C9183A11933FCF0083AC69 /* tomcrypt_pkcs.h */,
-				22C9183B11933FCF0083AC69 /* tomcrypt_prng.h */,
-			);
-			name = headers;
-			path = src/headers;
-			sourceTree = "<group>";
-		};
-		22C9183C11933FCF0083AC69 /* math */ = {
-			isa = PBXGroup;
-			children = (
-				22C9183D11933FCF0083AC69 /* ltm_desc.c */,
-				22C9183E11933FCF0083AC69 /* multi.c */,
-				22C9183F11933FCF0083AC69 /* rand_prime.c */,
-			);
-			name = math;
-			path = src/math;
-			sourceTree = "<group>";
-		};
-		22C9184011933FCF0083AC69 /* misc */ = {
-			isa = PBXGroup;
-			children = (
-				22C9184111933FCF0083AC69 /* base64_decode.c */,
-				22C9184211933FCF0083AC69 /* crypt_argchk.c */,
-				22C9184311933FCF0083AC69 /* crypt_find_hash.c */,
-				22C9184411933FCF0083AC69 /* crypt_find_prng.c */,
-				22C9184511933FCF0083AC69 /* crypt_hash_descriptor.c */,
-				22C9184611933FCF0083AC69 /* crypt_hash_is_valid.c */,
-				22C9184711933FCF0083AC69 /* crypt_libc.c */,
-				22C9184811933FCF0083AC69 /* crypt_ltc_mp_descriptor.c */,
-				22C9184911933FCF0083AC69 /* crypt_prng_descriptor.c */,
-				22C9184A11933FCF0083AC69 /* crypt_prng_is_valid.c */,
-				22C9184B11933FCF0083AC69 /* crypt_register_hash.c */,
-				22C9184C11933FCF0083AC69 /* crypt_register_prng.c */,
-				22C9184D11933FCF0083AC69 /* zeromem.c */,
-			);
-			name = misc;
-			path = src/misc;
-			sourceTree = "<group>";
-		};
-		22C9184E11933FCF0083AC69 /* pk */ = {
-			isa = PBXGroup;
-			children = (
-				22C9184F11933FCF0083AC69 /* asn1 */,
-				22C9186A11933FCF0083AC69 /* ecc */,
-				22C9187111933FCF0083AC69 /* pkcs1 */,
-				22C9187611933FCF0083AC69 /* rsa */,
-			);
-			name = pk;
-			path = src/pk;
-			sourceTree = "<group>";
-		};
-		22C9184F11933FCF0083AC69 /* asn1 */ = {
-			isa = PBXGroup;
-			children = (
-				22C9185011933FCF0083AC69 /* der_decode_bit_string.c */,
-				22C9185111933FCF0083AC69 /* der_decode_boolean.c */,
-				22C9185211933FCF0083AC69 /* der_decode_choice.c */,
-				22C9185311933FCF0083AC69 /* der_decode_ia5_string.c */,
-				22C9185411933FCF0083AC69 /* der_decode_integer.c */,
-				22C9185511933FCF0083AC69 /* der_decode_object_identifier.c */,
-				22C9185611933FCF0083AC69 /* der_decode_octet_string.c */,
-				22C9185711933FCF0083AC69 /* der_decode_printable_string.c */,
-				22C9185811933FCF0083AC69 /* der_decode_sequence_ex.c */,
-				22C9185911933FCF0083AC69 /* der_decode_sequence_flexi.c */,
-				22C9185A11933FCF0083AC69 /* der_decode_sequence_multi.c */,
-				22C9185B11933FCF0083AC69 /* der_decode_short_integer.c */,
-				22C9185C11933FCF0083AC69 /* der_decode_utctime.c */,
-				22C9185D11933FCF0083AC69 /* der_decode_utf8_string.c */,
-				22C9185E11933FCF0083AC69 /* der_length_bit_string.c */,
-				22C9185F11933FCF0083AC69 /* der_length_boolean.c */,
-				22C9186011933FCF0083AC69 /* der_length_ia5_string.c */,
-				22C9186111933FCF0083AC69 /* der_length_integer.c */,
-				22C9186211933FCF0083AC69 /* der_length_object_identifier.c */,
-				22C9186311933FCF0083AC69 /* der_length_octet_string.c */,
-				22C9186411933FCF0083AC69 /* der_length_printable_string.c */,
-				22C9186511933FCF0083AC69 /* der_length_sequence.c */,
-				22C9186611933FCF0083AC69 /* der_length_short_integer.c */,
-				22C9186711933FCF0083AC69 /* der_length_utctime.c */,
-				22C9186811933FCF0083AC69 /* der_length_utf8_string.c */,
-				22C9186911933FCF0083AC69 /* der_sequence_free.c */,
-			);
-			path = asn1;
-			sourceTree = "<group>";
-		};
-		22C9186A11933FCF0083AC69 /* ecc */ = {
-			isa = PBXGroup;
-			children = (
-				22C9186B11933FCF0083AC69 /* ltc_ecc_map.c */,
-				22C9186C11933FCF0083AC69 /* ltc_ecc_mul2add.c */,
-				22C9186D11933FCF0083AC69 /* ltc_ecc_mulmod.c */,
-				22C9186E11933FCF0083AC69 /* ltc_ecc_points.c */,
-				22C9186F11933FCF0083AC69 /* ltc_ecc_projective_add_point.c */,
-				22C9187011933FCF0083AC69 /* ltc_ecc_projective_dbl_point.c */,
-			);
-			path = ecc;
-			sourceTree = "<group>";
-		};
-		22C9187111933FCF0083AC69 /* pkcs1 */ = {
-			isa = PBXGroup;
-			children = (
-				22C9187211933FCF0083AC69 /* pkcs_1_mgf1.c */,
-				22C9187311933FCF0083AC69 /* pkcs_1_oaep_decode.c */,
-				22C9187411933FCF0083AC69 /* pkcs_1_pss_decode.c */,
-				22C9187511933FCF0083AC69 /* pkcs_1_v1_5_decode.c */,
-			);
-			path = pkcs1;
-			sourceTree = "<group>";
-		};
-		22C9187611933FCF0083AC69 /* rsa */ = {
-			isa = PBXGroup;
-			children = (
-				22C9187711933FCF0083AC69 /* rsa_exptmod.c */,
-				22C9187811933FCF0083AC69 /* rsa_free.c */,
-				22C9187911933FCF0083AC69 /* rsa_import.c */,
-				22C9187A11933FCF0083AC69 /* rsa_make_key.c */,
-				22C9187B11933FCF0083AC69 /* rsa_verify_hash.c */,
-				22C9187C11933FCF0083AC69 /* rsa_verify_simple.c */,
-			);
-			path = rsa;
-			sourceTree = "<group>";
-		};
-		32DBEE830D00E58F00DB1E81 /* Source */ = {
-			isa = PBXGroup;
-			children = (
-				2299D9D41167EFA8005C19BF /* adpcm */,
-				32ED009B0D03542A00AB0B4E /* huffman */,
-				225C734A1257CCC70009E8DA /* jenkins */,
-				22C9181D11933E3A0083AC69 /* libtomcrypt */,
-				22C9181E11933E470083AC69 /* libtommath */,
-				221F652D116851D70026C852 /* lzma */,
-				32ED00A40D03542A00AB0B4E /* pklib */,
-				2299D9DB1167EFC6005C19BF /* sparse */,
-				228B538311BF7D0D001A58DA /* FileStream.cpp */,
-				22EC6043154B28A000679228 /* FileStream.h */,
-				32ED00AA0D03542A00AB0B4E /* SBaseCommon.cpp */,
-				225C73531257CD0C0009E8DA /* SBaseFileTable.cpp */,
-				32ED00AC0D03542A00AB0B4E /* SCompression.cpp */,
-				2299DA4D1167FD16005C19BF /* SFileAddFile.cpp */,
-				32ED00A90D03542A00AB0B4E /* SFileAttributes.cpp */,
-				32ED00AD0D03542A00AB0B4E /* SFileCompactArchive.cpp */,
-				32ED00AE0D03542A00AB0B4E /* SFileCreateArchive.cpp */,
-				32ED00AF0D03542A00AB0B4E /* SFileExtractFile.cpp */,
-				32ED00B00D03542A00AB0B4E /* SFileFindFile.cpp */,
-				32ED00B40D03542A00AB0B4E /* SFileListFile.cpp */,
-				32ED00B10D03542A00AB0B4E /* SFileOpenArchive.cpp */,
-				32ED00B20D03542A00AB0B4E /* SFileOpenFileEx.cpp */,
-				22AEA121123125D800359B16 /* SFilePatchArchives.cpp */,
-				32ED00B30D03542A00AB0B4E /* SFileReadFile.cpp */,
-				22F5A9C41193DFBA00F8B121 /* SFileVerify.cpp */,
-				32ED00AB0D03542A00AB0B4E /* StormCommon.h */,
-				32ED00B60D03542A00AB0B4E /* StormLib.h */,
-				32ED00B70D03542A00AB0B4E /* StormPort.h */,
-			);
-			name = Source;
-			sourceTree = "<group>";
-		};
-		32ED009B0D03542A00AB0B4E /* huffman */ = {
-			isa = PBXGroup;
-			children = (
-				32ED009C0D03542A00AB0B4E /* huff.cpp */,
-				32ED009D0D03542A00AB0B4E /* huff.h */,
-			);
-			name = huffman;
-			path = src/huffman;
-			sourceTree = "<group>";
-		};
-		32ED00A40D03542A00AB0B4E /* pklib */ = {
-			isa = PBXGroup;
-			children = (
-				32ED00A60D03542A00AB0B4E /* explode.c */,
-				32ED00A70D03542A00AB0B4E /* implode.c */,
-				32ED00A80D03542A00AB0B4E /* pklib.h */,
-			);
-			name = pklib;
-			path = src/pklib;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		225530D01056BAC800FA646A /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				225530DB1056BC7900FA646A /* huff.h in Headers */,
-				225530DE1056BC7900FA646A /* pklib.h in Headers */,
-				225530DF1056BC7900FA646A /* StormCommon.h in Headers */,
-				225530E01056BC7900FA646A /* StormLib.h in Headers */,
-				225530E11056BC7900FA646A /* StormPort.h in Headers */,
-				2299D9DA1167EFA8005C19BF /* adpcm.h in Headers */,
-				2299D9E11167EFC6005C19BF /* sparse.h in Headers */,
-				221F6A761168529C0026C852 /* LzmaDec.h in Headers */,
-				221F6A771168529C0026C852 /* LzmaEnc.h in Headers */,
-				221F6AB81168545B0026C852 /* LzFind.h in Headers */,
-				221F6ABB116854730026C852 /* LzHash.h in Headers */,
-				221F6ABE116854870026C852 /* Types.h in Headers */,
-				22C9188011933FCF0083AC69 /* tomcrypt.h in Headers */,
-				22C9188111933FCF0083AC69 /* tomcrypt_argchk.h in Headers */,
-				22C9188211933FCF0083AC69 /* tomcrypt_cfg.h in Headers */,
-				22C9188311933FCF0083AC69 /* tomcrypt_cipher.h in Headers */,
-				22C9188411933FCF0083AC69 /* tomcrypt_custom.h in Headers */,
-				22C9188511933FCF0083AC69 /* tomcrypt_hash.h in Headers */,
-				22C9188611933FCF0083AC69 /* tomcrypt_mac.h in Headers */,
-				22C9188711933FCF0083AC69 /* tomcrypt_macros.h in Headers */,
-				22C9188811933FCF0083AC69 /* tomcrypt_math.h in Headers */,
-				22C9188911933FCF0083AC69 /* tomcrypt_misc.h in Headers */,
-				22C9188A11933FCF0083AC69 /* tomcrypt_pk.h in Headers */,
-				22C9188B11933FCF0083AC69 /* tomcrypt_pkcs.h in Headers */,
-				22C9188C11933FCF0083AC69 /* tomcrypt_prng.h in Headers */,
-				22C91A001193400A0083AC69 /* tommath_class.h in Headers */,
-				22C91A011193400A0083AC69 /* tommath_superclass.h in Headers */,
-				22C91A021193400A0083AC69 /* tommath.h in Headers */,
-				225C734F1257CCC70009E8DA /* lookup.h in Headers */,
-				22EC6044154B28A000679228 /* FileStream.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		225FAC8F0E53B7F800DA2CAE /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				225FAC9C0E53BAA100DA2CAE /* huff.h in Headers */,
-				225FAC9F0E53BAA100DA2CAE /* pklib.h in Headers */,
-				225FACA00E53BAA100DA2CAE /* StormCommon.h in Headers */,
-				225FACA10E53BAA100DA2CAE /* StormLib.h in Headers */,
-				225FACA20E53BAA100DA2CAE /* StormPort.h in Headers */,
-				2299D9D81167EFA8005C19BF /* adpcm.h in Headers */,
-				2299D9DF1167EFC6005C19BF /* sparse.h in Headers */,
-				221F6A741168529C0026C852 /* LzmaDec.h in Headers */,
-				221F6A751168529C0026C852 /* LzmaEnc.h in Headers */,
-				221F6AB61168545B0026C852 /* LzFind.h in Headers */,
-				221F6ABA116854730026C852 /* LzHash.h in Headers */,
-				221F6ABD116854870026C852 /* Types.h in Headers */,
-				22C918CA11933FCF0083AC69 /* tomcrypt.h in Headers */,
-				22C918CB11933FCF0083AC69 /* tomcrypt_argchk.h in Headers */,
-				22C918CC11933FCF0083AC69 /* tomcrypt_cfg.h in Headers */,
-				22C918CD11933FCF0083AC69 /* tomcrypt_cipher.h in Headers */,
-				22C918CE11933FCF0083AC69 /* tomcrypt_custom.h in Headers */,
-				22C918CF11933FCF0083AC69 /* tomcrypt_hash.h in Headers */,
-				22C918D011933FCF0083AC69 /* tomcrypt_mac.h in Headers */,
-				22C918D111933FCF0083AC69 /* tomcrypt_macros.h in Headers */,
-				22C918D211933FCF0083AC69 /* tomcrypt_math.h in Headers */,
-				22C918D311933FCF0083AC69 /* tomcrypt_misc.h in Headers */,
-				22C918D411933FCF0083AC69 /* tomcrypt_pk.h in Headers */,
-				22C918D511933FCF0083AC69 /* tomcrypt_pkcs.h in Headers */,
-				22C918D611933FCF0083AC69 /* tomcrypt_prng.h in Headers */,
-				22C91A791193400A0083AC69 /* tommath_class.h in Headers */,
-				22C91A7A1193400A0083AC69 /* tommath_superclass.h in Headers */,
-				22C91A7B1193400A0083AC69 /* tommath.h in Headers */,
-				225C734D1257CCC70009E8DA /* lookup.h in Headers */,
-				22EC6045154B28A000679228 /* FileStream.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		225530D31056BAC800FA646A /* StormLib */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 225530D71056BB1600FA646A /* Build configuration list for PBXNativeTarget "StormLib" */;
-			buildPhases = (
-				225530D01056BAC800FA646A /* Headers */,
-				225530D11056BAC800FA646A /* Sources */,
-				225530D21056BAC800FA646A /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = StormLib;
-			productName = StormLib;
-			productReference = 225530D41056BAC800FA646A /* libStormLib.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		225FAC930E53B7F800DA2CAE /* StormLibFramework */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 225FAC980E53B7F900DA2CAE /* Build configuration list for PBXNativeTarget "StormLibFramework" */;
-			buildPhases = (
-				225FAC8F0E53B7F800DA2CAE /* Headers */,
-				225FAC900E53B7F800DA2CAE /* Resources */,
-				225FAC910E53B7F800DA2CAE /* Sources */,
-				225FAC920E53B7F800DA2CAE /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = StormLibFramework;
-			productName = StormLib;
-			productReference = 225FAC940E53B7F800DA2CAE /* StormLib.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-		22954ACD11D463A30064B264 /* StormLib_Test */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 22954AD911D463E00064B264 /* Build configuration list for PBXNativeTarget "StormLib_Test" */;
-			buildPhases = (
-				22954ACB11D463A30064B264 /* Sources */,
-				22954ACC11D463A30064B264 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				2229F62F11D4653600118914 /* PBXTargetDependency */,
-			);
-			name = StormLib_Test;
-			productName = StormLib_Test;
-			productReference = 22954ACE11D463A30064B264 /* StormLib_Test */;
-			productType = "com.apple.product-type.tool";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		0867D690FE84028FC02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0430;
-			};
-			buildConfigurationList = 1DEB916408733D950010E9CD /* Build configuration list for PBXProject "StormLib" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				en,
-			);
-			mainGroup = 0867D691FE84028FC02AAC07 /* stormlib */;
-			productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				225530D31056BAC800FA646A /* StormLib */,
-				225FAC930E53B7F800DA2CAE /* StormLibFramework */,
-				22954ACD11D463A30064B264 /* StormLib_Test */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		225FAC900E53B7F800DA2CAE /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		225530D11056BAC800FA646A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				225530E31056BC8700FA646A /* huff.cpp in Sources */,
-				225530E61056BC8700FA646A /* explode.c in Sources */,
-				225530E71056BC8700FA646A /* implode.c in Sources */,
-				225530E81056BC8700FA646A /* SFileAttributes.cpp in Sources */,
-				225530E91056BC8700FA646A /* SBaseCommon.cpp in Sources */,
-				225530EA1056BC8700FA646A /* SCompression.cpp in Sources */,
-				225530EB1056BC8700FA646A /* SFileCompactArchive.cpp in Sources */,
-				225530EC1056BC8700FA646A /* SFileCreateArchive.cpp in Sources */,
-				225530ED1056BC8700FA646A /* SFileExtractFile.cpp in Sources */,
-				225530EE1056BC8700FA646A /* SFileFindFile.cpp in Sources */,
-				225530EF1056BC8700FA646A /* SFileOpenArchive.cpp in Sources */,
-				225530F01056BC8700FA646A /* SFileOpenFileEx.cpp in Sources */,
-				225530F11056BC8700FA646A /* SFileReadFile.cpp in Sources */,
-				225530F21056BC8700FA646A /* SFileListFile.cpp in Sources */,
-				2299D9D91167EFA8005C19BF /* adpcm.cpp in Sources */,
-				2299D9E01167EFC6005C19BF /* sparse.cpp in Sources */,
-				2299DA4F1167FD16005C19BF /* SFileAddFile.cpp in Sources */,
-				221F6A7C116852AA0026C852 /* LzmaEnc.c in Sources */,
-				221F6A7F116852B20026C852 /* LzmaDec.c in Sources */,
-				221F6AB71168545B0026C852 /* LzFind.c in Sources */,
-				22C9187D11933FCF0083AC69 /* hash_memory.c in Sources */,
-				22C9187E11933FCF0083AC69 /* md5.c in Sources */,
-				22C9187F11933FCF0083AC69 /* sha1.c in Sources */,
-				22C9188D11933FCF0083AC69 /* ltm_desc.c in Sources */,
-				22C9188E11933FCF0083AC69 /* multi.c in Sources */,
-				22C9188F11933FCF0083AC69 /* rand_prime.c in Sources */,
-				22C9189011933FCF0083AC69 /* base64_decode.c in Sources */,
-				22C9189111933FCF0083AC69 /* crypt_argchk.c in Sources */,
-				22C9189211933FCF0083AC69 /* crypt_find_hash.c in Sources */,
-				22C9189311933FCF0083AC69 /* crypt_find_prng.c in Sources */,
-				22C9189411933FCF0083AC69 /* crypt_hash_descriptor.c in Sources */,
-				22C9189511933FCF0083AC69 /* crypt_hash_is_valid.c in Sources */,
-				22C9189611933FCF0083AC69 /* crypt_libc.c in Sources */,
-				2254917B11948CE70044424D /* crypt_ltc_mp_descriptor.c in Sources */,
-				22C9189811933FCF0083AC69 /* crypt_prng_descriptor.c in Sources */,
-				22C9189911933FCF0083AC69 /* crypt_prng_is_valid.c in Sources */,
-				22C9189A11933FCF0083AC69 /* crypt_register_hash.c in Sources */,
-				22C9189B11933FCF0083AC69 /* crypt_register_prng.c in Sources */,
-				22C9189C11933FCF0083AC69 /* zeromem.c in Sources */,
-				22C9189D11933FCF0083AC69 /* der_decode_bit_string.c in Sources */,
-				22C9189E11933FCF0083AC69 /* der_decode_boolean.c in Sources */,
-				22C9189F11933FCF0083AC69 /* der_decode_choice.c in Sources */,
-				22C918A011933FCF0083AC69 /* der_decode_ia5_string.c in Sources */,
-				22C918A111933FCF0083AC69 /* der_decode_integer.c in Sources */,
-				22C918A211933FCF0083AC69 /* der_decode_object_identifier.c in Sources */,
-				22C918A311933FCF0083AC69 /* der_decode_octet_string.c in Sources */,
-				22C918A411933FCF0083AC69 /* der_decode_printable_string.c in Sources */,
-				22C918A511933FCF0083AC69 /* der_decode_sequence_ex.c in Sources */,
-				22C918A611933FCF0083AC69 /* der_decode_sequence_flexi.c in Sources */,
-				22C918A711933FCF0083AC69 /* der_decode_sequence_multi.c in Sources */,
-				22C918A811933FCF0083AC69 /* der_decode_short_integer.c in Sources */,
-				22C918A911933FCF0083AC69 /* der_decode_utctime.c in Sources */,
-				22C918AA11933FCF0083AC69 /* der_decode_utf8_string.c in Sources */,
-				22C918AB11933FCF0083AC69 /* der_length_bit_string.c in Sources */,
-				22C918AC11933FCF0083AC69 /* der_length_boolean.c in Sources */,
-				22C918AD11933FCF0083AC69 /* der_length_ia5_string.c in Sources */,
-				22C918AE11933FCF0083AC69 /* der_length_integer.c in Sources */,
-				22C918AF11933FCF0083AC69 /* der_length_object_identifier.c in Sources */,
-				22C918B011933FCF0083AC69 /* der_length_octet_string.c in Sources */,
-				22C918B111933FCF0083AC69 /* der_length_printable_string.c in Sources */,
-				22C918B211933FCF0083AC69 /* der_length_sequence.c in Sources */,
-				22C918B311933FCF0083AC69 /* der_length_short_integer.c in Sources */,
-				22C918B411933FCF0083AC69 /* der_length_utctime.c in Sources */,
-				22C918B511933FCF0083AC69 /* der_length_utf8_string.c in Sources */,
-				22C918B611933FCF0083AC69 /* der_sequence_free.c in Sources */,
-				22C918B711933FCF0083AC69 /* ltc_ecc_map.c in Sources */,
-				22C918B811933FCF0083AC69 /* ltc_ecc_mul2add.c in Sources */,
-				22C918B911933FCF0083AC69 /* ltc_ecc_mulmod.c in Sources */,
-				22C918BA11933FCF0083AC69 /* ltc_ecc_points.c in Sources */,
-				22C918BB11933FCF0083AC69 /* ltc_ecc_projective_add_point.c in Sources */,
-				22C918BC11933FCF0083AC69 /* ltc_ecc_projective_dbl_point.c in Sources */,
-				22C918BD11933FCF0083AC69 /* pkcs_1_mgf1.c in Sources */,
-				22C918BE11933FCF0083AC69 /* pkcs_1_oaep_decode.c in Sources */,
-				22C918BF11933FCF0083AC69 /* pkcs_1_pss_decode.c in Sources */,
-				22C918C011933FCF0083AC69 /* pkcs_1_v1_5_decode.c in Sources */,
-				22C918C111933FCF0083AC69 /* rsa_exptmod.c in Sources */,
-				22C918C211933FCF0083AC69 /* rsa_free.c in Sources */,
-				22C918C311933FCF0083AC69 /* rsa_import.c in Sources */,
-				22C918C411933FCF0083AC69 /* rsa_make_key.c in Sources */,
-				22C918C511933FCF0083AC69 /* rsa_verify_hash.c in Sources */,
-				22C918C611933FCF0083AC69 /* rsa_verify_simple.c in Sources */,
-				22C9198A1193400A0083AC69 /* bn_fast_mp_invmod.c in Sources */,
-				22C9198B1193400A0083AC69 /* bn_fast_mp_montgomery_reduce.c in Sources */,
-				22C9198C1193400A0083AC69 /* bn_fast_s_mp_mul_digs.c in Sources */,
-				22C9198D1193400A0083AC69 /* bn_fast_s_mp_mul_high_digs.c in Sources */,
-				22C9198E1193400A0083AC69 /* bn_fast_s_mp_sqr.c in Sources */,
-				22C9198F1193400A0083AC69 /* bn_mp_2expt.c in Sources */,
-				22C919901193400A0083AC69 /* bn_mp_abs.c in Sources */,
-				22C919911193400A0083AC69 /* bn_mp_add_d.c in Sources */,
-				22C919921193400A0083AC69 /* bn_mp_add.c in Sources */,
-				22C919931193400A0083AC69 /* bn_mp_addmod.c in Sources */,
-				22C919941193400A0083AC69 /* bn_mp_and.c in Sources */,
-				22C919951193400A0083AC69 /* bn_mp_clamp.c in Sources */,
-				22C919961193400A0083AC69 /* bn_mp_clear_multi.c in Sources */,
-				22C919971193400A0083AC69 /* bn_mp_clear.c in Sources */,
-				22C919981193400A0083AC69 /* bn_mp_cmp_d.c in Sources */,
-				22C919991193400A0083AC69 /* bn_mp_cmp_mag.c in Sources */,
-				22C9199A1193400A0083AC69 /* bn_mp_cmp.c in Sources */,
-				22C9199B1193400A0083AC69 /* bn_mp_cnt_lsb.c in Sources */,
-				22C9199C1193400A0083AC69 /* bn_mp_copy.c in Sources */,
-				22C9199D1193400A0083AC69 /* bn_mp_count_bits.c in Sources */,
-				22C9199E1193400A0083AC69 /* bn_mp_div_2.c in Sources */,
-				22C9199F1193400A0083AC69 /* bn_mp_div_2d.c in Sources */,
-				22C919A01193400A0083AC69 /* bn_mp_div_3.c in Sources */,
-				22C919A11193400A0083AC69 /* bn_mp_div_d.c in Sources */,
-				22C919A21193400A0083AC69 /* bn_mp_div.c in Sources */,
-				22C919A31193400A0083AC69 /* bn_mp_dr_is_modulus.c in Sources */,
-				22C919A41193400A0083AC69 /* bn_mp_dr_reduce.c in Sources */,
-				22C919A51193400A0083AC69 /* bn_mp_dr_setup.c in Sources */,
-				22C919A61193400A0083AC69 /* bn_mp_exch.c in Sources */,
-				22C919A71193400A0083AC69 /* bn_mp_expt_d.c in Sources */,
-				22C919A81193400A0083AC69 /* bn_mp_exptmod_fast.c in Sources */,
-				22C919A91193400A0083AC69 /* bn_mp_exptmod.c in Sources */,
-				22C919AA1193400A0083AC69 /* bn_mp_exteuclid.c in Sources */,
-				22C919AB1193400A0083AC69 /* bn_mp_fread.c in Sources */,
-				22C919AC1193400A0083AC69 /* bn_mp_fwrite.c in Sources */,
-				22C919AD1193400A0083AC69 /* bn_mp_gcd.c in Sources */,
-				22C919AE1193400A0083AC69 /* bn_mp_get_int.c in Sources */,
-				22C919AF1193400A0083AC69 /* bn_mp_grow.c in Sources */,
-				22C919B01193400A0083AC69 /* bn_mp_init_copy.c in Sources */,
-				22C919B11193400A0083AC69 /* bn_mp_init_multi.c in Sources */,
-				22C919B21193400A0083AC69 /* bn_mp_init_set_int.c in Sources */,
-				22C919B31193400A0083AC69 /* bn_mp_init_set.c in Sources */,
-				22C919B41193400A0083AC69 /* bn_mp_init_size.c in Sources */,
-				22C919B51193400A0083AC69 /* bn_mp_init.c in Sources */,
-				22C919B61193400A0083AC69 /* bn_mp_invmod_slow.c in Sources */,
-				22C919B71193400A0083AC69 /* bn_mp_invmod.c in Sources */,
-				22C919B81193400A0083AC69 /* bn_mp_is_square.c in Sources */,
-				22C919B91193400A0083AC69 /* bn_mp_jacobi.c in Sources */,
-				22C919BA1193400A0083AC69 /* bn_mp_karatsuba_mul.c in Sources */,
-				22C919BB1193400A0083AC69 /* bn_mp_karatsuba_sqr.c in Sources */,
-				22C919BC1193400A0083AC69 /* bn_mp_lcm.c in Sources */,
-				22C919BD1193400A0083AC69 /* bn_mp_lshd.c in Sources */,
-				22C919BE1193400A0083AC69 /* bn_mp_mod_2d.c in Sources */,
-				22C919BF1193400A0083AC69 /* bn_mp_mod_d.c in Sources */,
-				22C919C01193400A0083AC69 /* bn_mp_mod.c in Sources */,
-				22C919C11193400A0083AC69 /* bn_mp_montgomery_calc_normalization.c in Sources */,
-				22C919C21193400A0083AC69 /* bn_mp_montgomery_reduce.c in Sources */,
-				22C919C31193400A0083AC69 /* bn_mp_montgomery_setup.c in Sources */,
-				22C919C41193400A0083AC69 /* bn_mp_mul_2.c in Sources */,
-				22C919C51193400A0083AC69 /* bn_mp_mul_2d.c in Sources */,
-				22C919C61193400A0083AC69 /* bn_mp_mul_d.c in Sources */,
-				22C919C71193400A0083AC69 /* bn_mp_mul.c in Sources */,
-				22C919C81193400A0083AC69 /* bn_mp_mulmod.c in Sources */,
-				22C919C91193400A0083AC69 /* bn_mp_n_root.c in Sources */,
-				22C919CA1193400A0083AC69 /* bn_mp_neg.c in Sources */,
-				22C919CB1193400A0083AC69 /* bn_mp_or.c in Sources */,
-				22C919CC1193400A0083AC69 /* bn_mp_prime_fermat.c in Sources */,
-				22C919CD1193400A0083AC69 /* bn_mp_prime_is_divisible.c in Sources */,
-				22C919CE1193400A0083AC69 /* bn_mp_prime_is_prime.c in Sources */,
-				22C919CF1193400A0083AC69 /* bn_mp_prime_miller_rabin.c in Sources */,
-				22C919D01193400A0083AC69 /* bn_mp_prime_next_prime.c in Sources */,
-				22C919D11193400A0083AC69 /* bn_mp_prime_rabin_miller_trials.c in Sources */,
-				22C919D21193400A0083AC69 /* bn_mp_prime_random_ex.c in Sources */,
-				22C919D31193400A0083AC69 /* bn_mp_radix_size.c in Sources */,
-				22C919D41193400A0083AC69 /* bn_mp_radix_smap.c in Sources */,
-				22C919D51193400A0083AC69 /* bn_mp_rand.c in Sources */,
-				22C919D61193400A0083AC69 /* bn_mp_read_radix.c in Sources */,
-				22C919D71193400A0083AC69 /* bn_mp_read_signed_bin.c in Sources */,
-				22C919D81193400A0083AC69 /* bn_mp_read_unsigned_bin.c in Sources */,
-				22C919D91193400A0083AC69 /* bn_mp_reduce_2k_l.c in Sources */,
-				22C919DA1193400A0083AC69 /* bn_mp_reduce_2k_setup_l.c in Sources */,
-				22C919DB1193400A0083AC69 /* bn_mp_reduce_2k_setup.c in Sources */,
-				22C919DC1193400A0083AC69 /* bn_mp_reduce_2k.c in Sources */,
-				22C919DD1193400A0083AC69 /* bn_mp_reduce_is_2k_l.c in Sources */,
-				22C919DE1193400A0083AC69 /* bn_mp_reduce_is_2k.c in Sources */,
-				22C919DF1193400A0083AC69 /* bn_mp_reduce_setup.c in Sources */,
-				22C919E01193400A0083AC69 /* bn_mp_reduce.c in Sources */,
-				22C919E11193400A0083AC69 /* bn_mp_rshd.c in Sources */,
-				22C919E21193400A0083AC69 /* bn_mp_set_int.c in Sources */,
-				22C919E31193400A0083AC69 /* bn_mp_set.c in Sources */,
-				22C919E41193400A0083AC69 /* bn_mp_shrink.c in Sources */,
-				22C919E51193400A0083AC69 /* bn_mp_signed_bin_size.c in Sources */,
-				22C919E61193400A0083AC69 /* bn_mp_sqr.c in Sources */,
-				22C919E71193400A0083AC69 /* bn_mp_sqrmod.c in Sources */,
-				22C919E81193400A0083AC69 /* bn_mp_sqrt.c in Sources */,
-				22C919E91193400A0083AC69 /* bn_mp_sub_d.c in Sources */,
-				22C919EA1193400A0083AC69 /* bn_mp_sub.c in Sources */,
-				22C919EB1193400A0083AC69 /* bn_mp_submod.c in Sources */,
-				22C919EC1193400A0083AC69 /* bn_mp_to_signed_bin_n.c in Sources */,
-				22C919ED1193400A0083AC69 /* bn_mp_to_signed_bin.c in Sources */,
-				22C919EE1193400A0083AC69 /* bn_mp_to_unsigned_bin_n.c in Sources */,
-				22C919EF1193400A0083AC69 /* bn_mp_to_unsigned_bin.c in Sources */,
-				22C919F01193400A0083AC69 /* bn_mp_toom_mul.c in Sources */,
-				22C919F11193400A0083AC69 /* bn_mp_toom_sqr.c in Sources */,
-				22C919F21193400A0083AC69 /* bn_mp_toradix_n.c in Sources */,
-				22C919F31193400A0083AC69 /* bn_mp_toradix.c in Sources */,
-				22C919F41193400A0083AC69 /* bn_mp_unsigned_bin_size.c in Sources */,
-				22C919F51193400A0083AC69 /* bn_mp_xor.c in Sources */,
-				22C919F61193400A0083AC69 /* bn_mp_zero.c in Sources */,
-				22C919F71193400A0083AC69 /* bn_prime_tab.c in Sources */,
-				22C919F81193400A0083AC69 /* bn_reverse.c in Sources */,
-				22C919F91193400A0083AC69 /* bn_s_mp_add.c in Sources */,
-				22C919FA1193400A0083AC69 /* bn_s_mp_exptmod.c in Sources */,
-				22C919FB1193400A0083AC69 /* bn_s_mp_mul_digs.c in Sources */,
-				22C919FC1193400A0083AC69 /* bn_s_mp_mul_high_digs.c in Sources */,
-				22C919FD1193400A0083AC69 /* bn_s_mp_sqr.c in Sources */,
-				22C919FE1193400A0083AC69 /* bn_s_mp_sub.c in Sources */,
-				22C919FF1193400A0083AC69 /* bncore.c in Sources */,
-				22F5A9C51193DFBA00F8B121 /* SFileVerify.cpp in Sources */,
-				228B538511BF7D0D001A58DA /* FileStream.cpp in Sources */,
-				22AEA123123125D800359B16 /* SFilePatchArchives.cpp in Sources */,
-				225C73501257CCC70009E8DA /* lookup3.c in Sources */,
-				225C73551257CD0C0009E8DA /* SBaseFileTable.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		225FAC910E53B7F800DA2CAE /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				225FACA50E53BAB400DA2CAE /* huff.cpp in Sources */,
-				225FACA90E53BAB400DA2CAE /* explode.c in Sources */,
-				225FACAA0E53BAB400DA2CAE /* implode.c in Sources */,
-				225FACAB0E53BAB400DA2CAE /* SFileAttributes.cpp in Sources */,
-				225FACAC0E53BAB400DA2CAE /* SBaseCommon.cpp in Sources */,
-				225FACAD0E53BAB400DA2CAE /* SCompression.cpp in Sources */,
-				225FACAE0E53BAB400DA2CAE /* SFileCompactArchive.cpp in Sources */,
-				225FACAF0E53BAB400DA2CAE /* SFileCreateArchive.cpp in Sources */,
-				225FACB00E53BAB400DA2CAE /* SFileExtractFile.cpp in Sources */,
-				225FACB10E53BAB400DA2CAE /* SFileFindFile.cpp in Sources */,
-				225FACB20E53BAB400DA2CAE /* SFileOpenArchive.cpp in Sources */,
-				225FACB30E53BAB400DA2CAE /* SFileOpenFileEx.cpp in Sources */,
-				225FACB40E53BAB400DA2CAE /* SFileReadFile.cpp in Sources */,
-				225FACB50E53BAB400DA2CAE /* SFileListFile.cpp in Sources */,
-				2299D9D71167EFA8005C19BF /* adpcm.cpp in Sources */,
-				2299D9DE1167EFC6005C19BF /* sparse.cpp in Sources */,
-				2299DA4E1167FD16005C19BF /* SFileAddFile.cpp in Sources */,
-				221F6A7B116852AA0026C852 /* LzmaEnc.c in Sources */,
-				221F6A7E116852B20026C852 /* LzmaDec.c in Sources */,
-				221F6AB51168545B0026C852 /* LzFind.c in Sources */,
-				22C918C711933FCF0083AC69 /* hash_memory.c in Sources */,
-				22C918C811933FCF0083AC69 /* md5.c in Sources */,
-				22C918C911933FCF0083AC69 /* sha1.c in Sources */,
-				22C918D711933FCF0083AC69 /* ltm_desc.c in Sources */,
-				22C918D811933FCF0083AC69 /* multi.c in Sources */,
-				22C918D911933FCF0083AC69 /* rand_prime.c in Sources */,
-				22C918DA11933FCF0083AC69 /* base64_decode.c in Sources */,
-				22C918DB11933FCF0083AC69 /* crypt_argchk.c in Sources */,
-				22C918DC11933FCF0083AC69 /* crypt_find_hash.c in Sources */,
-				22C918DD11933FCF0083AC69 /* crypt_find_prng.c in Sources */,
-				22C918DE11933FCF0083AC69 /* crypt_hash_descriptor.c in Sources */,
-				22C918DF11933FCF0083AC69 /* crypt_hash_is_valid.c in Sources */,
-				22C918E011933FCF0083AC69 /* crypt_libc.c in Sources */,
-				22C918E111933FCF0083AC69 /* crypt_ltc_mp_descriptor.c in Sources */,
-				22C918E211933FCF0083AC69 /* crypt_prng_descriptor.c in Sources */,
-				22C918E311933FCF0083AC69 /* crypt_prng_is_valid.c in Sources */,
-				22C918E411933FCF0083AC69 /* crypt_register_hash.c in Sources */,
-				22C918E511933FCF0083AC69 /* crypt_register_prng.c in Sources */,
-				22C918E611933FCF0083AC69 /* zeromem.c in Sources */,
-				22C918E711933FCF0083AC69 /* der_decode_bit_string.c in Sources */,
-				22C918E811933FCF0083AC69 /* der_decode_boolean.c in Sources */,
-				22C918E911933FCF0083AC69 /* der_decode_choice.c in Sources */,
-				22C918EA11933FCF0083AC69 /* der_decode_ia5_string.c in Sources */,
-				22C918EB11933FCF0083AC69 /* der_decode_integer.c in Sources */,
-				22C918EC11933FCF0083AC69 /* der_decode_object_identifier.c in Sources */,
-				22C918ED11933FCF0083AC69 /* der_decode_octet_string.c in Sources */,
-				22C918EE11933FCF0083AC69 /* der_decode_printable_string.c in Sources */,
-				22C918EF11933FCF0083AC69 /* der_decode_sequence_ex.c in Sources */,
-				22C918F011933FCF0083AC69 /* der_decode_sequence_flexi.c in Sources */,
-				22C918F111933FCF0083AC69 /* der_decode_sequence_multi.c in Sources */,
-				22C918F211933FCF0083AC69 /* der_decode_short_integer.c in Sources */,
-				22C918F311933FCF0083AC69 /* der_decode_utctime.c in Sources */,
-				22C918F411933FCF0083AC69 /* der_decode_utf8_string.c in Sources */,
-				22C918F511933FCF0083AC69 /* der_length_bit_string.c in Sources */,
-				22C918F611933FCF0083AC69 /* der_length_boolean.c in Sources */,
-				22C918F711933FCF0083AC69 /* der_length_ia5_string.c in Sources */,
-				22C918F811933FCF0083AC69 /* der_length_integer.c in Sources */,
-				22C918F911933FCF0083AC69 /* der_length_object_identifier.c in Sources */,
-				22C918FA11933FCF0083AC69 /* der_length_octet_string.c in Sources */,
-				22C918FB11933FCF0083AC69 /* der_length_printable_string.c in Sources */,
-				22C918FC11933FCF0083AC69 /* der_length_sequence.c in Sources */,
-				22C918FD11933FCF0083AC69 /* der_length_short_integer.c in Sources */,
-				22C918FE11933FCF0083AC69 /* der_length_utctime.c in Sources */,
-				22C918FF11933FCF0083AC69 /* der_length_utf8_string.c in Sources */,
-				22C9190011933FCF0083AC69 /* der_sequence_free.c in Sources */,
-				22C9190111933FCF0083AC69 /* ltc_ecc_map.c in Sources */,
-				22C9190211933FCF0083AC69 /* ltc_ecc_mul2add.c in Sources */,
-				22C9190311933FCF0083AC69 /* ltc_ecc_mulmod.c in Sources */,
-				22C9190411933FCF0083AC69 /* ltc_ecc_points.c in Sources */,
-				22C9190511933FCF0083AC69 /* ltc_ecc_projective_add_point.c in Sources */,
-				22C9190611933FCF0083AC69 /* ltc_ecc_projective_dbl_point.c in Sources */,
-				22C9190711933FCF0083AC69 /* pkcs_1_mgf1.c in Sources */,
-				22C9190811933FCF0083AC69 /* pkcs_1_oaep_decode.c in Sources */,
-				22C9190911933FCF0083AC69 /* pkcs_1_pss_decode.c in Sources */,
-				22C9190A11933FCF0083AC69 /* pkcs_1_v1_5_decode.c in Sources */,
-				22C9190B11933FCF0083AC69 /* rsa_exptmod.c in Sources */,
-				22C9190C11933FCF0083AC69 /* rsa_free.c in Sources */,
-				22C9190D11933FCF0083AC69 /* rsa_import.c in Sources */,
-				22C9190E11933FCF0083AC69 /* rsa_make_key.c in Sources */,
-				22C9190F11933FCF0083AC69 /* rsa_verify_hash.c in Sources */,
-				22C9191011933FCF0083AC69 /* rsa_verify_simple.c in Sources */,
-				22C91A031193400A0083AC69 /* bn_fast_mp_invmod.c in Sources */,
-				22C91A041193400A0083AC69 /* bn_fast_mp_montgomery_reduce.c in Sources */,
-				22C91A051193400A0083AC69 /* bn_fast_s_mp_mul_digs.c in Sources */,
-				22C91A061193400A0083AC69 /* bn_fast_s_mp_mul_high_digs.c in Sources */,
-				22C91A071193400A0083AC69 /* bn_fast_s_mp_sqr.c in Sources */,
-				22C91A081193400A0083AC69 /* bn_mp_2expt.c in Sources */,
-				22C91A091193400A0083AC69 /* bn_mp_abs.c in Sources */,
-				22C91A0A1193400A0083AC69 /* bn_mp_add_d.c in Sources */,
-				22C91A0B1193400A0083AC69 /* bn_mp_add.c in Sources */,
-				22C91A0C1193400A0083AC69 /* bn_mp_addmod.c in Sources */,
-				22C91A0D1193400A0083AC69 /* bn_mp_and.c in Sources */,
-				22C91A0E1193400A0083AC69 /* bn_mp_clamp.c in Sources */,
-				22C91A0F1193400A0083AC69 /* bn_mp_clear_multi.c in Sources */,
-				22C91A101193400A0083AC69 /* bn_mp_clear.c in Sources */,
-				22C91A111193400A0083AC69 /* bn_mp_cmp_d.c in Sources */,
-				22C91A121193400A0083AC69 /* bn_mp_cmp_mag.c in Sources */,
-				22C91A131193400A0083AC69 /* bn_mp_cmp.c in Sources */,
-				22C91A141193400A0083AC69 /* bn_mp_cnt_lsb.c in Sources */,
-				22C91A151193400A0083AC69 /* bn_mp_copy.c in Sources */,
-				22C91A161193400A0083AC69 /* bn_mp_count_bits.c in Sources */,
-				22C91A171193400A0083AC69 /* bn_mp_div_2.c in Sources */,
-				22C91A181193400A0083AC69 /* bn_mp_div_2d.c in Sources */,
-				22C91A191193400A0083AC69 /* bn_mp_div_3.c in Sources */,
-				22C91A1A1193400A0083AC69 /* bn_mp_div_d.c in Sources */,
-				22C91A1B1193400A0083AC69 /* bn_mp_div.c in Sources */,
-				22C91A1C1193400A0083AC69 /* bn_mp_dr_is_modulus.c in Sources */,
-				22C91A1D1193400A0083AC69 /* bn_mp_dr_reduce.c in Sources */,
-				22C91A1E1193400A0083AC69 /* bn_mp_dr_setup.c in Sources */,
-				22C91A1F1193400A0083AC69 /* bn_mp_exch.c in Sources */,
-				22C91A201193400A0083AC69 /* bn_mp_expt_d.c in Sources */,
-				22C91A211193400A0083AC69 /* bn_mp_exptmod_fast.c in Sources */,
-				22C91A221193400A0083AC69 /* bn_mp_exptmod.c in Sources */,
-				22C91A231193400A0083AC69 /* bn_mp_exteuclid.c in Sources */,
-				22C91A241193400A0083AC69 /* bn_mp_fread.c in Sources */,
-				22C91A251193400A0083AC69 /* bn_mp_fwrite.c in Sources */,
-				22C91A261193400A0083AC69 /* bn_mp_gcd.c in Sources */,
-				22C91A271193400A0083AC69 /* bn_mp_get_int.c in Sources */,
-				22C91A281193400A0083AC69 /* bn_mp_grow.c in Sources */,
-				22C91A291193400A0083AC69 /* bn_mp_init_copy.c in Sources */,
-				22C91A2A1193400A0083AC69 /* bn_mp_init_multi.c in Sources */,
-				22C91A2B1193400A0083AC69 /* bn_mp_init_set_int.c in Sources */,
-				22C91A2C1193400A0083AC69 /* bn_mp_init_set.c in Sources */,
-				22C91A2D1193400A0083AC69 /* bn_mp_init_size.c in Sources */,
-				22C91A2E1193400A0083AC69 /* bn_mp_init.c in Sources */,
-				22C91A2F1193400A0083AC69 /* bn_mp_invmod_slow.c in Sources */,
-				22C91A301193400A0083AC69 /* bn_mp_invmod.c in Sources */,
-				22C91A311193400A0083AC69 /* bn_mp_is_square.c in Sources */,
-				22C91A321193400A0083AC69 /* bn_mp_jacobi.c in Sources */,
-				22C91A331193400A0083AC69 /* bn_mp_karatsuba_mul.c in Sources */,
-				22C91A341193400A0083AC69 /* bn_mp_karatsuba_sqr.c in Sources */,
-				22C91A351193400A0083AC69 /* bn_mp_lcm.c in Sources */,
-				22C91A361193400A0083AC69 /* bn_mp_lshd.c in Sources */,
-				22C91A371193400A0083AC69 /* bn_mp_mod_2d.c in Sources */,
-				22C91A381193400A0083AC69 /* bn_mp_mod_d.c in Sources */,
-				22C91A391193400A0083AC69 /* bn_mp_mod.c in Sources */,
-				22C91A3A1193400A0083AC69 /* bn_mp_montgomery_calc_normalization.c in Sources */,
-				22C91A3B1193400A0083AC69 /* bn_mp_montgomery_reduce.c in Sources */,
-				22C91A3C1193400A0083AC69 /* bn_mp_montgomery_setup.c in Sources */,
-				22C91A3D1193400A0083AC69 /* bn_mp_mul_2.c in Sources */,
-				22C91A3E1193400A0083AC69 /* bn_mp_mul_2d.c in Sources */,
-				22C91A3F1193400A0083AC69 /* bn_mp_mul_d.c in Sources */,
-				22C91A401193400A0083AC69 /* bn_mp_mul.c in Sources */,
-				22C91A411193400A0083AC69 /* bn_mp_mulmod.c in Sources */,
-				22C91A421193400A0083AC69 /* bn_mp_n_root.c in Sources */,
-				22C91A431193400A0083AC69 /* bn_mp_neg.c in Sources */,
-				22C91A441193400A0083AC69 /* bn_mp_or.c in Sources */,
-				22C91A451193400A0083AC69 /* bn_mp_prime_fermat.c in Sources */,
-				22C91A461193400A0083AC69 /* bn_mp_prime_is_divisible.c in Sources */,
-				22C91A471193400A0083AC69 /* bn_mp_prime_is_prime.c in Sources */,
-				22C91A481193400A0083AC69 /* bn_mp_prime_miller_rabin.c in Sources */,
-				22C91A491193400A0083AC69 /* bn_mp_prime_next_prime.c in Sources */,
-				22C91A4A1193400A0083AC69 /* bn_mp_prime_rabin_miller_trials.c in Sources */,
-				22C91A4B1193400A0083AC69 /* bn_mp_prime_random_ex.c in Sources */,
-				22C91A4C1193400A0083AC69 /* bn_mp_radix_size.c in Sources */,
-				22C91A4D1193400A0083AC69 /* bn_mp_radix_smap.c in Sources */,
-				22C91A4E1193400A0083AC69 /* bn_mp_rand.c in Sources */,
-				22C91A4F1193400A0083AC69 /* bn_mp_read_radix.c in Sources */,
-				22C91A501193400A0083AC69 /* bn_mp_read_signed_bin.c in Sources */,
-				22C91A511193400A0083AC69 /* bn_mp_read_unsigned_bin.c in Sources */,
-				22C91A521193400A0083AC69 /* bn_mp_reduce_2k_l.c in Sources */,
-				22C91A531193400A0083AC69 /* bn_mp_reduce_2k_setup_l.c in Sources */,
-				22C91A541193400A0083AC69 /* bn_mp_reduce_2k_setup.c in Sources */,
-				22C91A551193400A0083AC69 /* bn_mp_reduce_2k.c in Sources */,
-				22C91A561193400A0083AC69 /* bn_mp_reduce_is_2k_l.c in Sources */,
-				22C91A571193400A0083AC69 /* bn_mp_reduce_is_2k.c in Sources */,
-				22C91A581193400A0083AC69 /* bn_mp_reduce_setup.c in Sources */,
-				22C91A591193400A0083AC69 /* bn_mp_reduce.c in Sources */,
-				22C91A5A1193400A0083AC69 /* bn_mp_rshd.c in Sources */,
-				22C91A5B1193400A0083AC69 /* bn_mp_set_int.c in Sources */,
-				22C91A5C1193400A0083AC69 /* bn_mp_set.c in Sources */,
-				22C91A5D1193400A0083AC69 /* bn_mp_shrink.c in Sources */,
-				22C91A5E1193400A0083AC69 /* bn_mp_signed_bin_size.c in Sources */,
-				22C91A5F1193400A0083AC69 /* bn_mp_sqr.c in Sources */,
-				22C91A601193400A0083AC69 /* bn_mp_sqrmod.c in Sources */,
-				22C91A611193400A0083AC69 /* bn_mp_sqrt.c in Sources */,
-				22C91A621193400A0083AC69 /* bn_mp_sub_d.c in Sources */,
-				22C91A631193400A0083AC69 /* bn_mp_sub.c in Sources */,
-				22C91A641193400A0083AC69 /* bn_mp_submod.c in Sources */,
-				22C91A651193400A0083AC69 /* bn_mp_to_signed_bin_n.c in Sources */,
-				22C91A661193400A0083AC69 /* bn_mp_to_signed_bin.c in Sources */,
-				22C91A671193400A0083AC69 /* bn_mp_to_unsigned_bin_n.c in Sources */,
-				22C91A681193400A0083AC69 /* bn_mp_to_unsigned_bin.c in Sources */,
-				22C91A691193400A0083AC69 /* bn_mp_toom_mul.c in Sources */,
-				22C91A6A1193400A0083AC69 /* bn_mp_toom_sqr.c in Sources */,
-				22C91A6B1193400A0083AC69 /* bn_mp_toradix_n.c in Sources */,
-				22C91A6C1193400A0083AC69 /* bn_mp_toradix.c in Sources */,
-				22C91A6D1193400A0083AC69 /* bn_mp_unsigned_bin_size.c in Sources */,
-				22C91A6E1193400A0083AC69 /* bn_mp_xor.c in Sources */,
-				22C91A6F1193400A0083AC69 /* bn_mp_zero.c in Sources */,
-				22C91A701193400A0083AC69 /* bn_prime_tab.c in Sources */,
-				22C91A711193400A0083AC69 /* bn_reverse.c in Sources */,
-				22C91A721193400A0083AC69 /* bn_s_mp_add.c in Sources */,
-				22C91A731193400A0083AC69 /* bn_s_mp_exptmod.c in Sources */,
-				22C91A741193400A0083AC69 /* bn_s_mp_mul_digs.c in Sources */,
-				22C91A751193400A0083AC69 /* bn_s_mp_mul_high_digs.c in Sources */,
-				22C91A761193400A0083AC69 /* bn_s_mp_sqr.c in Sources */,
-				22C91A771193400A0083AC69 /* bn_s_mp_sub.c in Sources */,
-				22C91A781193400A0083AC69 /* bncore.c in Sources */,
-				22F5A9C61193DFBA00F8B121 /* SFileVerify.cpp in Sources */,
-				228B538411BF7D0D001A58DA /* FileStream.cpp in Sources */,
-				22AEA122123125D800359B16 /* SFilePatchArchives.cpp in Sources */,
-				225C73541257CD0C0009E8DA /* SBaseFileTable.cpp in Sources */,
-				225C735A1257CD1F0009E8DA /* lookup3.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		22954ACB11D463A30064B264 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				22954AD211D463AB0064B264 /* Test.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		2229F62F11D4653600118914 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 225530D31056BAC800FA646A /* StormLib */;
-			targetProxy = 2229F62E11D4653600118914 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin XCBuildConfiguration section */
-		1DEB916508733D950010E9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = (
-					_7ZIP_ST,
-					_DEBUG,
-				);
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
-				SKIP_INSTALL = YES;
-				STRIP_INSTALLED_PRODUCT = NO;
-			};
-			name = Debug;
-		};
-		1DEB916608733D950010E9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = _7ZIP_ST;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				SDKROOT = macosx;
-				SKIP_INSTALL = YES;
-				STRIP_INSTALLED_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		225530D51056BAC900FA646A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				INSTALL_PATH = /usr/local/lib;
-				PRODUCT_NAME = StormLib;
-			};
-			name = Debug;
-		};
-		225530D61056BAC900FA646A /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				INSTALL_PATH = /usr/local/lib;
-				PRODUCT_NAME = StormLib;
-			};
-			name = Release;
-		};
-		225FAC960E53B7F900DA2CAE /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				EXPORTED_SYMBOLS_FILE = "$(PROJECT_DIR)/stormlib_dll/StormLib.exp";
-				FRAMEWORK_VERSION = A;
-				GCC_DYNAMIC_NO_PIC = NO;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					/usr/lib/clang/3.1/lib/darwin,
-				);
-				PRODUCT_NAME = StormLib;
-			};
-			name = Debug;
-		};
-		225FAC970E53B7F900DA2CAE /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				EXPORTED_SYMBOLS_FILE = "$(PROJECT_DIR)/stormlib_dll/StormLib.exp";
-				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					/usr/lib/clang/3.1/lib/darwin,
-				);
-				PRODUCT_NAME = StormLib;
-			};
-			name = Release;
-		};
-		22954AD011D463A40064B264 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = (
-					_7ZIP_ST,
-					_DEBUG,
-					__STORMLIB_TEST__,
-				);
-				INSTALL_PATH = /usr/local/bin;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					/usr/lib/clang/3.1/lib/darwin,
-				);
-				PRODUCT_NAME = StormLib_Test;
-			};
-			name = Debug;
-		};
-		22954AD111D463A40064B264 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				INSTALL_PATH = /usr/local/bin;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					/usr/lib/clang/3.1/lib/darwin,
-				);
-				PRODUCT_NAME = StormLib_Test;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		1DEB916408733D950010E9CD /* Build configuration list for PBXProject "StormLib" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB916508733D950010E9CD /* Debug */,
-				1DEB916608733D950010E9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
-		};
-		225530D71056BB1600FA646A /* Build configuration list for PBXNativeTarget "StormLib" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				225530D51056BAC900FA646A /* Debug */,
-				225530D61056BAC900FA646A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
-		};
-		225FAC980E53B7F900DA2CAE /* Build configuration list for PBXNativeTarget "StormLibFramework" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				225FAC960E53B7F900DA2CAE /* Debug */,
-				225FAC970E53B7F900DA2CAE /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
-		};
-		22954AD911D463E00064B264 /* Build configuration list for PBXNativeTarget "StormLib_Test" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				22954AD011D463A40064B264 /* Debug */,
-				22954AD111D463A40064B264 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Debug;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
-}
diff --git a/dep/StormLibOld/StormLib110.vcxproj b/dep/StormLibOld/StormLib110.vcxproj
deleted file mode 100644
index 7e32ee373..000000000
--- a/dep/StormLibOld/StormLib110.vcxproj
+++ /dev/null
@@ -1,696 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugAD|Win32">
-      <Configuration>DebugAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAD|x64">
-      <Configuration>DebugAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|Win32">
-      <Configuration>DebugAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|x64">
-      <Configuration>DebugAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|Win32">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|x64">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|Win32">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|x64">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>StormLib</ProjectName>
-    <ProjectGuid>{78424708-1F6E-4D4B-920C-FB6D26847055}</ProjectGuid>
-    <RootNamespace>StormLib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">$(ProjectName)RAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">$(ProjectName)RAS</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt" />
-    <None Include="doc\The MoPaQ File Format 0.9.txt" />
-    <None Include="doc\The MoPaQ File Format 1.0.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\StormCommon.h" />
-    <ClInclude Include="src\StormLib.h" />
-    <ClInclude Include="src\StormPort.h" />
-    <ClInclude Include="src\adpcm\adpcm.h" />
-    <ClInclude Include="src\huffman\huff.h" />
-    <ClInclude Include="src\pklib\pklib.h" />
-    <ClInclude Include="src\sparse\sparse.h" />
-    <ClInclude Include="src\jenkins\lookup.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\FileStream.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseCommon.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseFileTable.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SCompression.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAddFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAttributes.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCompactArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCreateArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileExtractFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileFindFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileListFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenFileEx.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFilePatchArchives.cpp" />
-    <ClCompile Include="src\SFileReadFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileVerify.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\adpcm\adpcm.cpp" />
-    <ClCompile Include="src\bzip2\blocksort.c" />
-    <ClCompile Include="src\bzip2\bzlib.c" />
-    <ClCompile Include="src\bzip2\compress.c" />
-    <ClCompile Include="src\bzip2\crctable.c" />
-    <ClCompile Include="src\bzip2\decompress.c" />
-    <ClCompile Include="src\bzip2\huffman.c" />
-    <ClCompile Include="src\bzip2\randtable.c" />
-    <ClCompile Include="src\huffman\huff.cpp" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="src\libtommath\bn_reverse.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bncore.c" />
-    <ClCompile Include="src\lzma\C\LzFind.c" />
-    <ClCompile Include="src\lzma\C\LzFindMt.c" />
-    <ClCompile Include="src\lzma\C\LzmaDec.c" />
-    <ClCompile Include="src\lzma\C\LzmaEnc.c" />
-    <ClCompile Include="src\lzma\C\Threads.c" />
-    <ClCompile Include="src\pklib\explode.c" />
-    <ClCompile Include="src\pklib\implode.c" />
-    <ClCompile Include="src\sparse\sparse.cpp" />
-    <ClCompile Include="src\zlib\adler32.c" />
-    <ClCompile Include="src\zlib\compress2.c" />
-    <ClCompile Include="src\zlib\crc32.c" />
-    <ClCompile Include="src\zlib\deflate.c" />
-    <ClCompile Include="src\zlib\inffast.c" />
-    <ClCompile Include="src\zlib\inflate.c" />
-    <ClCompile Include="src\zlib\inftrees.c" />
-    <ClCompile Include="src\zlib\trees.c" />
-    <ClCompile Include="src\zlib\zutil.c" />
-    <ClCompile Include="src\jenkins\lookup3.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/StormLibOld/StormLib120.vcxproj b/dep/StormLibOld/StormLib120.vcxproj
deleted file mode 100644
index 7e32ee373..000000000
--- a/dep/StormLibOld/StormLib120.vcxproj
+++ /dev/null
@@ -1,696 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugAD|Win32">
-      <Configuration>DebugAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAD|x64">
-      <Configuration>DebugAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|Win32">
-      <Configuration>DebugAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|x64">
-      <Configuration>DebugAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|Win32">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|x64">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|Win32">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|x64">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>StormLib</ProjectName>
-    <ProjectGuid>{78424708-1F6E-4D4B-920C-FB6D26847055}</ProjectGuid>
-    <RootNamespace>StormLib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">$(ProjectName)RAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">$(ProjectName)RAS</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt" />
-    <None Include="doc\The MoPaQ File Format 0.9.txt" />
-    <None Include="doc\The MoPaQ File Format 1.0.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\StormCommon.h" />
-    <ClInclude Include="src\StormLib.h" />
-    <ClInclude Include="src\StormPort.h" />
-    <ClInclude Include="src\adpcm\adpcm.h" />
-    <ClInclude Include="src\huffman\huff.h" />
-    <ClInclude Include="src\pklib\pklib.h" />
-    <ClInclude Include="src\sparse\sparse.h" />
-    <ClInclude Include="src\jenkins\lookup.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\FileStream.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseCommon.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseFileTable.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SCompression.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAddFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAttributes.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCompactArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCreateArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileExtractFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileFindFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileListFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenFileEx.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFilePatchArchives.cpp" />
-    <ClCompile Include="src\SFileReadFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileVerify.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\adpcm\adpcm.cpp" />
-    <ClCompile Include="src\bzip2\blocksort.c" />
-    <ClCompile Include="src\bzip2\bzlib.c" />
-    <ClCompile Include="src\bzip2\compress.c" />
-    <ClCompile Include="src\bzip2\crctable.c" />
-    <ClCompile Include="src\bzip2\decompress.c" />
-    <ClCompile Include="src\bzip2\huffman.c" />
-    <ClCompile Include="src\bzip2\randtable.c" />
-    <ClCompile Include="src\huffman\huff.cpp" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="src\libtommath\bn_reverse.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bncore.c" />
-    <ClCompile Include="src\lzma\C\LzFind.c" />
-    <ClCompile Include="src\lzma\C\LzFindMt.c" />
-    <ClCompile Include="src\lzma\C\LzmaDec.c" />
-    <ClCompile Include="src\lzma\C\LzmaEnc.c" />
-    <ClCompile Include="src\lzma\C\Threads.c" />
-    <ClCompile Include="src\pklib\explode.c" />
-    <ClCompile Include="src\pklib\implode.c" />
-    <ClCompile Include="src\sparse\sparse.cpp" />
-    <ClCompile Include="src\zlib\adler32.c" />
-    <ClCompile Include="src\zlib\compress2.c" />
-    <ClCompile Include="src\zlib\crc32.c" />
-    <ClCompile Include="src\zlib\deflate.c" />
-    <ClCompile Include="src\zlib\inffast.c" />
-    <ClCompile Include="src\zlib\inflate.c" />
-    <ClCompile Include="src\zlib\inftrees.c" />
-    <ClCompile Include="src\zlib\trees.c" />
-    <ClCompile Include="src\zlib\zutil.c" />
-    <ClCompile Include="src\jenkins\lookup3.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/StormLibOld/StormLib_dll.vcproj b/dep/StormLibOld/StormLib_dll.vcproj
deleted file mode 100644
index f56cd8477..000000000
--- a/dep/StormLibOld/StormLib_dll.vcproj
+++ /dev/null
@@ -1,2499 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="StormLib_dll"
-	ProjectGUID="{CB385198-50B1-4CF4-883B-11F042DED6AA}"
-	RootNamespace="StormLib_dll"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\StormLib.dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile=".\StormLib_dll\StormLib.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\StormLib.dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile=".\StormLib_dll\StormLib.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\StormLib.dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile=".\StormLib_dll\StormLib.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\StormLib.dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile=".\StormLib_dll\StormLib.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Doc Files"
-			>
-			<File
-				RelativePath=".\doc\History.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\doc\The MoPaQ File Format 0.9.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\doc\The MoPaQ File Format 1.0.txt"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
-			<File
-				RelativePath=".\src\StormCommon.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StormLib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StormPort.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			>
-			<File
-				RelativePath=".\stormlib_dll\DllMain.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\FileStream.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SBaseCommon.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SBaseFileTable.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SCompression.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileAddFile.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileAttributes.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileCompactArchive.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileCreateArchive.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileExtractFile.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileFindFile.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileListFile.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileOpenArchive.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileOpenFileEx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFilePatchArchives.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileReadFile.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileVerify.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DebugAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAD|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseAS|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\stormlib_dll\StormLib.def"
-				>
-			</File>
-			<Filter
-				Name="adpcm"
-				>
-				<File
-					RelativePath=".\src\adpcm\adpcm.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\adpcm\adpcm.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="bzip2"
-				>
-				<File
-					RelativePath=".\src\bzip2\blocksort.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\bzlib.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\compress.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\crctable.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\decompress.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\huffman.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\randtable.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="huffman"
-				>
-				<File
-					RelativePath=".\src\huffman\huff.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\huffman\huff.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="libtomcrypt"
-				>
-				<Filter
-					Name="hashes"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\hash_memory.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\md5.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\sha1.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="math"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\ltm_desc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\multi.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\rand_prime.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="misc"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\base64_decode.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_argchk.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_find_hash.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_find_prng.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_hash_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_hash_is_valid.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_libc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_prng_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_prng_is_valid.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_register_hash.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_register_prng.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\zeromem.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="pk"
-					>
-					<Filter
-						Name="asn1"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_choice.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_sequence.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_sequence_free.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="ecc"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="pkcs1"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="rsa"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_exptmod.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_free.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_import.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_make_key.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c"
-							>
-						</File>
-					</Filter>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="libtommath"
-				>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_mp_invmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_mp_montgomery_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_mul_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_mul_high_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_2expt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_abs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_add.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_add_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_addmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_and.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clamp.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clear.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clear_multi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp_mag.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cnt_lsb.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_copy.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_count_bits.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_3.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_is_modulus.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exch.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_expt_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exptmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exptmod_fast.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exteuclid.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_fread.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_fwrite.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_gcd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_get_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_grow.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_copy.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_multi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_set.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_set_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_invmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_invmod_slow.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_is_square.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_jacobi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_karatsuba_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_karatsuba_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_lcm.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_lshd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_calc_normalization.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mulmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_n_root.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_neg.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_or.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_fermat.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_is_divisible.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_is_prime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_miller_rabin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_next_prime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_rabin_miller_trials.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_random_ex.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_radix_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_radix_smap.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_rand.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_radix.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_signed_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_unsigned_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_setup_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_is_2k.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_is_2k_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_rshd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_set.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_set_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_shrink.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_signed_bin_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqrmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqrt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sub.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sub_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_submod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_signed_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_signed_bin_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_unsigned_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_unsigned_bin_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toom_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toom_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toradix.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toradix_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_unsigned_bin_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_xor.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_zero.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_prime_tab.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_reverse.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_add.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_exptmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_mul_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_mul_high_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_sub.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bncore.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="lzma"
-				>
-				<File
-					RelativePath=".\src\lzma\C\LzFind.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\lzma\C\LzFindMt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\lzma\C\LzmaDec.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\lzma\C\LzmaEnc.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\lzma\C\Threads.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="pklib"
-				>
-				<File
-					RelativePath=".\src\pklib\explode.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pklib\implode.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pklib\pklib.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="sparse"
-				>
-				<File
-					RelativePath=".\src\sparse\sparse.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\sparse\sparse.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="zlib"
-				>
-				<File
-					RelativePath=".\src\zlib\adler32.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\compress2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\crc32.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\deflate.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\inffast.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\inflate.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\inftrees.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\trees.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\zutil.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="jenkins"
-				>
-				<File
-					RelativePath=".\src\jenkins\lookup.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\jenkins\lookup3.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dep/StormLibOld/StormLib_dll.vcxproj b/dep/StormLibOld/StormLib_dll.vcxproj
deleted file mode 100644
index 740f5af25..000000000
--- a/dep/StormLibOld/StormLib_dll.vcxproj
+++ /dev/null
@@ -1,511 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>StormLib_dll</ProjectName>
-    <ProjectGuid>{CB385198-50B1-4CF4-883B-11F042DED6AA}</ProjectGuid>
-    <RootNamespace>StormLib_dll</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)StormLib.dll</OutputFile>
-      <ModuleDefinitionFile>.\StormLib_dll\StormLib.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)StormLib.dll</OutputFile>
-      <ModuleDefinitionFile>.\StormLib_dll\StormLib.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)StormLib.dll</OutputFile>
-      <ModuleDefinitionFile>.\StormLib_dll\StormLib.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)StormLib.dll</OutputFile>
-      <ModuleDefinitionFile>.\StormLib_dll\StormLib.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt" />
-    <None Include="doc\The MoPaQ File Format 0.9.txt" />
-    <None Include="doc\The MoPaQ File Format 1.0.txt" />
-    <None Include="stormlib_dll\StormLib.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\StormCommon.h" />
-    <ClInclude Include="src\StormLib.h" />
-    <ClInclude Include="src\StormPort.h" />
-    <ClInclude Include="src\adpcm\adpcm.h" />
-    <ClInclude Include="src\huffman\huff.h" />
-    <ClInclude Include="src\pklib\pklib.h" />
-    <ClInclude Include="src\sparse\sparse.h" />
-    <ClInclude Include="src\jenkins\lookup.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="stormlib_dll\DllMain.c">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\FileStream.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseCommon.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseFileTable.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SCompression.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAddFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAttributes.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCompactArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCreateArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileExtractFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileFindFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileListFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenFileEx.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFilePatchArchives.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileReadFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileVerify.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\adpcm\adpcm.cpp" />
-    <ClCompile Include="src\bzip2\blocksort.c" />
-    <ClCompile Include="src\bzip2\bzlib.c" />
-    <ClCompile Include="src\bzip2\compress.c" />
-    <ClCompile Include="src\bzip2\crctable.c" />
-    <ClCompile Include="src\bzip2\decompress.c" />
-    <ClCompile Include="src\bzip2\huffman.c" />
-    <ClCompile Include="src\bzip2\randtable.c" />
-    <ClCompile Include="src\huffman\huff.cpp" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="src\libtommath\bn_reverse.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bncore.c" />
-    <ClCompile Include="src\lzma\C\LzFind.c" />
-    <ClCompile Include="src\lzma\C\LzFindMt.c" />
-    <ClCompile Include="src\lzma\C\LzmaDec.c" />
-    <ClCompile Include="src\lzma\C\LzmaEnc.c" />
-    <ClCompile Include="src\lzma\C\Threads.c" />
-    <ClCompile Include="src\pklib\explode.c" />
-    <ClCompile Include="src\pklib\implode.c" />
-    <ClCompile Include="src\sparse\sparse.cpp" />
-    <ClCompile Include="src\zlib\adler32.c" />
-    <ClCompile Include="src\zlib\compress2.c" />
-    <ClCompile Include="src\zlib\crc32.c" />
-    <ClCompile Include="src\zlib\deflate.c" />
-    <ClCompile Include="src\zlib\inffast.c" />
-    <ClCompile Include="src\zlib\inflate.c" />
-    <ClCompile Include="src\zlib\inftrees.c" />
-    <ClCompile Include="src\zlib\trees.c" />
-    <ClCompile Include="src\zlib\zutil.c" />
-    <ClCompile Include="src\jenkins\lookup3.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/StormLibOld/StormLib_dll.vcxproj.filters b/dep/StormLibOld/StormLib_dll.vcxproj.filters
deleted file mode 100644
index 3b818268a..000000000
--- a/dep/StormLibOld/StormLib_dll.vcxproj.filters
+++ /dev/null
@@ -1,779 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Doc Files">
-      <UniqueIdentifier>{4c9205db-fd84-4138-bf99-9762053fad24}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{c46bb1be-e2ee-44ed-8ccf-277792e674a5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{f14302d2-8c36-4dd9-aa65-ada246a32592}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\adpcm">
-      <UniqueIdentifier>{0402bd47-a1d1-47d5-b192-c30d6c9fc00f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\bzip2">
-      <UniqueIdentifier>{821a4034-910a-4ee0-beda-3716d7e0d4e7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\huffman">
-      <UniqueIdentifier>{ac0040f0-0b8f-477a-928d-b159162ddabc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt">
-      <UniqueIdentifier>{490bdd04-2b51-4cd9-a48a-804a6c5c2e66}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\hashes">
-      <UniqueIdentifier>{f26bb75a-155e-4230-aefb-bc9797199ff2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\math">
-      <UniqueIdentifier>{76f65750-18e0-40d9-ba7b-7fd6e864abd9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\misc">
-      <UniqueIdentifier>{9f4ea0eb-a4cc-4425-8762-1530b05002a8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk">
-      <UniqueIdentifier>{7345615c-9ea6-4f79-ad9d-bfba3678e2df}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\asn1">
-      <UniqueIdentifier>{d100666f-35f0-4465-b5f0-48614229b2b7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\ecc">
-      <UniqueIdentifier>{a08914e6-844f-4dcc-8867-b38b8f55df64}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\pkcs1">
-      <UniqueIdentifier>{e2ea2efd-8853-40e6-aeee-af7a67e1dbec}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\rsa">
-      <UniqueIdentifier>{5a8af9f4-dc43-4d8d-8fea-1d24f9615100}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtommath">
-      <UniqueIdentifier>{1e741e95-ab82-47d4-8faa-47e03780c4ee}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\lzma">
-      <UniqueIdentifier>{261ff9dd-b1eb-4662-99b1-9a18d82c644a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\pklib">
-      <UniqueIdentifier>{d6033939-9a98-4c26-a158-8226dbbbc1a6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\sparse">
-      <UniqueIdentifier>{e36b055a-1636-4850-b7c8-4170a94fb162}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\zlib">
-      <UniqueIdentifier>{65341005-077a-4f02-a4af-0bb63fad4c30}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\jenkins">
-      <UniqueIdentifier>{c33670da-5145-4e1d-b7a5-762b85b9e63a}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt">
-      <Filter>Doc Files</Filter>
-    </None>
-    <None Include="doc\The MoPaQ File Format 0.9.txt">
-      <Filter>Doc Files</Filter>
-    </None>
-    <None Include="doc\The MoPaQ File Format 1.0.txt">
-      <Filter>Doc Files</Filter>
-    </None>
-    <None Include="stormlib_dll\StormLib.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\StormCommon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StormLib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StormPort.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\adpcm\adpcm.h">
-      <Filter>Source Files\adpcm</Filter>
-    </ClInclude>
-    <ClInclude Include="src\huffman\huff.h">
-      <Filter>Source Files\huffman</Filter>
-    </ClInclude>
-    <ClInclude Include="src\pklib\pklib.h">
-      <Filter>Source Files\pklib</Filter>
-    </ClInclude>
-    <ClInclude Include="src\sparse\sparse.h">
-      <Filter>Source Files\sparse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\jenkins\lookup.h">
-      <Filter>Source Files\jenkins</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="stormlib_dll\DllMain.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FileStream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SBaseCommon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SBaseFileTable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SCompression.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileAddFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileAttributes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileCompactArchive.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileCreateArchive.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileExtractFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileFindFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileListFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenArchive.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenFileEx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFilePatchArchives.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileReadFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileVerify.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\adpcm\adpcm.cpp">
-      <Filter>Source Files\adpcm</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\blocksort.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\bzlib.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\compress.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\crctable.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\decompress.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\huffman.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\randtable.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\huffman\huff.cpp">
-      <Filter>Source Files\huffman</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_abs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_add.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_and.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clear.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_copy.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exch.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_fread.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_grow.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_neg.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_or.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_rand.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_set.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sub.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_submod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_xor.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_zero.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_prime_tab.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_reverse.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bncore.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\LzFind.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\LzFindMt.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\LzmaDec.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\LzmaEnc.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\Threads.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pklib\explode.c">
-      <Filter>Source Files\pklib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pklib\implode.c">
-      <Filter>Source Files\pklib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\sparse\sparse.cpp">
-      <Filter>Source Files\sparse</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\adler32.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\compress2.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\crc32.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\deflate.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\inffast.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\inflate.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\inftrees.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\trees.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\zutil.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\jenkins\lookup3.c">
-      <Filter>Source Files\jenkins</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/StormLibOld/StormLib_test.kdev4 b/dep/StormLibOld/StormLib_test.kdev4
deleted file mode 100644
index 5bea3f80c..000000000
--- a/dep/StormLibOld/StormLib_test.kdev4
+++ /dev/null
@@ -1,4 +0,0 @@
-[Project]
-Name=StormLib_test
-Manager=KDevCMakeManager
-VersionControl=
diff --git a/dep/StormLibOld/StormLib_test.vcproj b/dep/StormLibOld/StormLib_test.vcproj
deleted file mode 100644
index 6386d5317..000000000
--- a/dep/StormLibOld/StormLib_test.vcproj
+++ /dev/null
@@ -1,1984 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="StormLib_test"
-	ProjectGUID="{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}"
-	RootNamespace="StormLib_test"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<DefaultToolFile
-			FileName="masm.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="./src/libtomcrypt/src/headers"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__STORMLIB_TEST__"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				VerboseOutput="false"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="./src/libtomcrypt/src/headers"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__STORMLIB_TEST__"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="./bin/$(ProjectName)/$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="./src/libtomcrypt/src/headers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__STORMLIB_TEST__"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="./src/libtomcrypt/src/headers"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__STORMLIB_TEST__"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="1"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Doc Files"
-			>
-			<File
-				RelativePath=".\doc\History.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\doc\The MoPaQ File Format 0.9.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\doc\The MoPaQ File Format 1.0.txt"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
-			<File
-				RelativePath=".\src\FileStream.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StormCommon.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StormLib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StormPort.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			>
-			<File
-				RelativePath=".\src\FileStream.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SBaseCommon.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SBaseDumpData.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SBaseFileTable.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SCompression.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileAddFile.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileAttributes.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileCompactArchive.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileCreateArchive.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileExtractFile.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileFindFile.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileListFile.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileOpenArchive.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileOpenFileEx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFilePatchArchives.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileReadFile.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\src\SFileVerify.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\test\Test.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="adpcm"
-				>
-				<File
-					RelativePath=".\src\adpcm\adpcm.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\adpcm\adpcm.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="bzip2"
-				>
-				<File
-					RelativePath=".\src\bzip2\blocksort.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\bzlib.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\compress.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\crctable.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\decompress.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\huffman.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\bzip2\randtable.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="huffman"
-				>
-				<File
-					RelativePath=".\src\huffman\huff.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\huffman\huff.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="libtomcrypt"
-				>
-				<Filter
-					Name="hashes"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\hash_memory.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\md5.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\hashes\sha1.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="math"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\ltm_desc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\multi.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\math\rand_prime.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="misc"
-					>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\base64_decode.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_argchk.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_find_hash.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_find_prng.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_hash_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_hash_is_valid.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_libc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_prng_descriptor.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_prng_is_valid.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_register_hash.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\crypt_register_prng.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\libtomcrypt\src\misc\zeromem.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="pk"
-					>
-					<Filter
-						Name="asn1"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_choice.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_bit_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_boolean.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_octet_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_printable_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_sequence.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_short_integer.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_utctime.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\asn1\der_sequence_free.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="ecc"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="pkcs1"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="rsa"
-						>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_exptmod.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_free.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_import.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_make_key.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c"
-							>
-						</File>
-					</Filter>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="libtommath"
-				>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_mp_invmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_mp_montgomery_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_mul_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_mul_high_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_fast_s_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_2expt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_abs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_add.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_add_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_addmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_and.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clamp.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clear.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_clear_multi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cmp_mag.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_cnt_lsb.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_copy.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_count_bits.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_3.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_div_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_is_modulus.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_dr_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exch.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_expt_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exptmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exptmod_fast.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_exteuclid.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_fread.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_fwrite.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_gcd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_get_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_grow.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_copy.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_multi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_set.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_set_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_init_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_invmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_invmod_slow.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_is_square.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_jacobi.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_karatsuba_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_karatsuba_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_lcm.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_lshd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mod_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_calc_normalization.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_montgomery_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_2d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mul_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_mulmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_n_root.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_neg.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_or.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_fermat.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_is_divisible.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_is_prime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_miller_rabin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_next_prime.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_rabin_miller_trials.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_prime_random_ex.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_radix_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_radix_smap.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_rand.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_radix.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_signed_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_read_unsigned_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_2k_setup_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_is_2k.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_is_2k_l.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_reduce_setup.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_rshd.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_set.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_set_int.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_shrink.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_signed_bin_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqrmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sqrt.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sub.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_sub_d.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_submod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_signed_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_signed_bin_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_unsigned_bin.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_to_unsigned_bin_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toom_mul.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toom_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toradix.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_toradix_n.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_unsigned_bin_size.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_xor.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_mp_zero.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_prime_tab.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_reverse.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_add.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_exptmod.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_mul_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_mul_high_digs.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_sqr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bn_s_mp_sub.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\libtommath\bncore.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="lzma"
-				>
-				<File
-					RelativePath=".\src\lzma\C\LzFind.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\lzma\C\LzFindMt.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\lzma\C\LzmaDec.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\lzma\C\LzmaEnc.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\src\lzma\C\Threads.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="pklib"
-				>
-				<File
-					RelativePath=".\src\pklib\explode.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pklib\implode.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\pklib\pklib.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="sparse"
-				>
-				<File
-					RelativePath=".\src\sparse\sparse.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\sparse\sparse.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="zlib"
-				>
-				<File
-					RelativePath=".\src\zlib\adler32.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\compress2.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\crc32.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\deflate.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\inffast.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\inflate.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\inftrees.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\trees.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\zlib\zutil.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="jenkins"
-				>
-				<File
-					RelativePath=".\src\jenkins\lookup.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\jenkins\lookup3.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dep/StormLibOld/StormLib_test.vcxproj b/dep/StormLibOld/StormLib_test.vcxproj
deleted file mode 100644
index cb554fe2c..000000000
--- a/dep/StormLibOld/StormLib_test.vcxproj
+++ /dev/null
@@ -1,385 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>StormLib_test</ProjectName>
-    <ProjectGuid>{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}</ProjectGuid>
-    <RootNamespace>StormLib_test</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./src/libtomcrypt/src/headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>./src/libtomcrypt/src/headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;__STORMLIB_TEST__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt" />
-    <None Include="doc\The MoPaQ File Format 0.9.txt" />
-    <None Include="doc\The MoPaQ File Format 1.0.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\StormCommon.h" />
-    <ClInclude Include="src\StormLib.h" />
-    <ClInclude Include="src\StormPort.h" />
-    <ClInclude Include="src\adpcm\adpcm.h" />
-    <ClInclude Include="src\huffman\huff.h" />
-    <ClInclude Include="src\pklib\pklib.h" />
-    <ClInclude Include="src\sparse\sparse.h" />
-    <ClInclude Include="src\jenkins\lookup.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\FileStream.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseCommon.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseDumpData.cpp" />
-    <ClCompile Include="src\SBaseFileTable.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SCompression.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAddFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAttributes.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCompactArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCreateArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileExtractFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileFindFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileListFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenFileEx.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFilePatchArchives.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileReadFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileVerify.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="test\Test.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\adpcm\adpcm.cpp" />
-    <ClCompile Include="src\bzip2\blocksort.c" />
-    <ClCompile Include="src\bzip2\bzlib.c" />
-    <ClCompile Include="src\bzip2\compress.c" />
-    <ClCompile Include="src\bzip2\crctable.c" />
-    <ClCompile Include="src\bzip2\decompress.c" />
-    <ClCompile Include="src\bzip2\huffman.c" />
-    <ClCompile Include="src\bzip2\randtable.c" />
-    <ClCompile Include="src\huffman\huff.cpp" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="src\libtommath\bn_reverse.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bncore.c" />
-    <ClCompile Include="src\lzma\C\LzFind.c" />
-    <ClCompile Include="src\lzma\C\LzFindMt.c" />
-    <ClCompile Include="src\lzma\C\LzmaDec.c" />
-    <ClCompile Include="src\lzma\C\LzmaEnc.c" />
-    <ClCompile Include="src\lzma\C\Threads.c" />
-    <ClCompile Include="src\pklib\explode.c" />
-    <ClCompile Include="src\pklib\implode.c" />
-    <ClCompile Include="src\sparse\sparse.cpp" />
-    <ClCompile Include="src\zlib\adler32.c" />
-    <ClCompile Include="src\zlib\compress2.c" />
-    <ClCompile Include="src\zlib\crc32.c" />
-    <ClCompile Include="src\zlib\deflate.c" />
-    <ClCompile Include="src\zlib\inffast.c" />
-    <ClCompile Include="src\zlib\inflate.c" />
-    <ClCompile Include="src\zlib\inftrees.c" />
-    <ClCompile Include="src\zlib\trees.c" />
-    <ClCompile Include="src\zlib\zutil.c" />
-    <ClCompile Include="src\jenkins\lookup3.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="test\x86_ripped_code.asm" />
-    <MASM Include="test\x86_starcraft_lzma.asm">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </MASM>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/StormLibOld/StormLib_test.vcxproj.filters b/dep/StormLibOld/StormLib_test.vcxproj.filters
deleted file mode 100644
index 09d1b7dcb..000000000
--- a/dep/StormLibOld/StormLib_test.vcxproj.filters
+++ /dev/null
@@ -1,787 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Doc Files">
-      <UniqueIdentifier>{0521b37a-df0c-4809-92ee-5c21b80735f5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{3f337e66-2467-48f8-a358-c81ed372f252}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{6babe236-18ee-471b-8a62-d03a22e90198}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\adpcm">
-      <UniqueIdentifier>{f0a0e8e3-b2c2-4d1c-879d-a43f03ea5a61}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\bzip2">
-      <UniqueIdentifier>{2aaefdc1-9d77-4a38-9f4c-5e870ec44945}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\huffman">
-      <UniqueIdentifier>{4e9f5c7f-af4c-4fd4-830f-3a2da5d7206c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt">
-      <UniqueIdentifier>{4d3becbb-eec3-45b8-a125-02d94d150a33}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\hashes">
-      <UniqueIdentifier>{0ab926c1-a33f-4c11-8c1a-101256e167f0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\math">
-      <UniqueIdentifier>{5085a0e7-4e7e-4676-91d5-7b4e2fbb0664}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\misc">
-      <UniqueIdentifier>{8a3caff1-3400-424c-807f-2ed016789093}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk">
-      <UniqueIdentifier>{bea80b25-7db8-4811-a8e6-8032eb386539}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\asn1">
-      <UniqueIdentifier>{ffe3f691-7640-4d6d-a972-62b8885c7b1a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\ecc">
-      <UniqueIdentifier>{213deedd-9a1e-400d-b023-68e8fba78e18}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\pkcs1">
-      <UniqueIdentifier>{816de789-6cb1-4be0-864d-e1171bc8e138}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtomcrypt\pk\rsa">
-      <UniqueIdentifier>{20df7a5a-581d-4f4c-b676-6698f2ff15f1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libtommath">
-      <UniqueIdentifier>{a385691f-2a7f-4e22-93ab-7d46e356a858}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\lzma">
-      <UniqueIdentifier>{0f30053a-90ce-4d0c-bbd8-f209eba9bd42}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\pklib">
-      <UniqueIdentifier>{16f73278-7a0c-44ce-9e4a-1d82fa474f10}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\sparse">
-      <UniqueIdentifier>{a7380b86-f5f2-4f08-97e8-80d9be6aa833}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\zlib">
-      <UniqueIdentifier>{efee3853-4625-4137-b32a-ff3a14b3ad38}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\jenkins">
-      <UniqueIdentifier>{248420f6-1bae-41ff-9f20-6bf0cf804ef8}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt">
-      <Filter>Doc Files</Filter>
-    </None>
-    <None Include="doc\The MoPaQ File Format 0.9.txt">
-      <Filter>Doc Files</Filter>
-    </None>
-    <None Include="doc\The MoPaQ File Format 1.0.txt">
-      <Filter>Doc Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\StormCommon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StormLib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StormPort.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\adpcm\adpcm.h">
-      <Filter>Source Files\adpcm</Filter>
-    </ClInclude>
-    <ClInclude Include="src\huffman\huff.h">
-      <Filter>Source Files\huffman</Filter>
-    </ClInclude>
-    <ClInclude Include="src\pklib\pklib.h">
-      <Filter>Source Files\pklib</Filter>
-    </ClInclude>
-    <ClInclude Include="src\sparse\sparse.h">
-      <Filter>Source Files\sparse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\jenkins\lookup.h">
-      <Filter>Source Files\jenkins</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\FileStream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SBaseCommon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SBaseDumpData.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SBaseFileTable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SCompression.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileAddFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileAttributes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileCompactArchive.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileCreateArchive.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileExtractFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileFindFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileListFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenArchive.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenFileEx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFilePatchArchives.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileReadFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SFileVerify.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="test\Test.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\adpcm\adpcm.cpp">
-      <Filter>Source Files\adpcm</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\blocksort.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\bzlib.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\compress.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\crctable.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\decompress.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\huffman.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\bzip2\randtable.c">
-      <Filter>Source Files\bzip2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\huffman\huff.cpp">
-      <Filter>Source Files\huffman</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c">
-      <Filter>Source Files\libtomcrypt\hashes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c">
-      <Filter>Source Files\libtomcrypt\math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c">
-      <Filter>Source Files\libtomcrypt\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c">
-      <Filter>Source Files\libtomcrypt\pk\asn1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c">
-      <Filter>Source Files\libtomcrypt\pk\ecc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c">
-      <Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c">
-      <Filter>Source Files\libtomcrypt\pk\rsa</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_abs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_add.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_and.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clear.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_copy.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exch.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_fread.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_grow.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_neg.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_or.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_rand.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_set.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sub.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_submod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_xor.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_mp_zero.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_prime_tab.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_reverse.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libtommath\bncore.c">
-      <Filter>Source Files\libtommath</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\LzFind.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\LzFindMt.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\LzmaDec.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\LzmaEnc.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\lzma\C\Threads.c">
-      <Filter>Source Files\lzma</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pklib\explode.c">
-      <Filter>Source Files\pklib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pklib\implode.c">
-      <Filter>Source Files\pklib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\sparse\sparse.cpp">
-      <Filter>Source Files\sparse</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\adler32.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\compress2.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\crc32.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\deflate.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\inffast.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\inflate.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\inftrees.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\trees.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\zlib\zutil.c">
-      <Filter>Source Files\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\jenkins\lookup3.c">
-      <Filter>Source Files\jenkins</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="test\x86_ripped_code.asm">
-      <Filter>Source Files</Filter>
-    </MASM>
-    <MASM Include="test\x86_starcraft_lzma.asm">
-      <Filter>Source Files</Filter>
-    </MASM>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/StormLibOld/StormLib_vc100.sln b/dep/StormLibOld/StormLib_vc100.sln
deleted file mode 100644
index dbe7e4a72..000000000
--- a/dep/StormLibOld/StormLib_vc100.sln
+++ /dev/null
@@ -1,110 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_dll", "StormLib_dll.vcxproj", "{CB385198-50B1-4CF4-883B-11F042DED6AA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib_test", "StormLib_test.vcxproj", "{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Storm_dll", "Storm_dll.vcxproj", "{BD600973-C6FA-4CE3-8821-67F6418B7F9C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "StormLib.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		DebugAD|Win32 = DebugAD|Win32
-		DebugAD|x64 = DebugAD|x64
-		DebugAS|Win32 = DebugAS|Win32
-		DebugAS|x64 = DebugAS|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseAD|Win32 = ReleaseAD|Win32
-		ReleaseAD|x64 = ReleaseAD|x64
-		ReleaseAS|Win32 = ReleaseAS|Win32
-		ReleaseAS|x64 = ReleaseAS|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|Win32.Build.0 = Debug|Win32
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|x64.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Debug|x64.Build.0 = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|Win32.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|x64.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAD|x64.Build.0 = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|Win32.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|x64.ActiveCfg = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.DebugAS|x64.Build.0 = Debug|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|Win32.ActiveCfg = Release|Win32
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|Win32.Build.0 = Release|Win32
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|x64.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.Release|x64.Build.0 = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|Win32.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|x64.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAD|x64.Build.0 = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|Win32.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|x64.ActiveCfg = Release|x64
-		{CB385198-50B1-4CF4-883B-11F042DED6AA}.ReleaseAS|x64.Build.0 = Release|x64
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|Win32.Build.0 = Debug|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Debug|x64.ActiveCfg = Debug|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|Win32.Build.0 = Debug|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|Win32.Build.0 = Debug|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|Win32.ActiveCfg = Release|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|Win32.Build.0 = Release|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.Release|x64.ActiveCfg = Release|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{AA561A7B-26EA-49AF-90E8-C53C1FA2965D}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Debug|Win32.Build.0 = Debug|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Debug|x64.ActiveCfg = Debug|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.DebugAD|Win32.Build.0 = Debug|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.DebugAS|Win32.Build.0 = Debug|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Release|Win32.ActiveCfg = Release|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Release|Win32.Build.0 = Release|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.Release|x64.ActiveCfg = Release|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{BD600973-C6FA-4CE3-8821-67F6418B7F9C}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.ActiveCfg = DebugAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.ActiveCfg = DebugAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.Build.0 = DebugAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.ActiveCfg = DebugAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.Build.0 = DebugAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.ActiveCfg = DebugAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.Build.0 = DebugAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.ActiveCfg = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.Build.0 = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.ActiveCfg = DebugAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.Build.0 = DebugAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.ActiveCfg = ReleaseAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.ActiveCfg = ReleaseAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.Build.0 = ReleaseAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.ActiveCfg = ReleaseAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.Build.0 = ReleaseAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.ActiveCfg = ReleaseAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.Build.0 = ReleaseAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.ActiveCfg = ReleaseAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.Build.0 = ReleaseAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.ActiveCfg = ReleaseAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.Build.0 = ReleaseAS|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/dep/StormLibOld/StormLib_vc110.vcxproj b/dep/StormLibOld/StormLib_vc110.vcxproj
deleted file mode 100644
index 7e32ee373..000000000
--- a/dep/StormLibOld/StormLib_vc110.vcxproj
+++ /dev/null
@@ -1,696 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugAD|Win32">
-      <Configuration>DebugAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAD|x64">
-      <Configuration>DebugAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|Win32">
-      <Configuration>DebugAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|x64">
-      <Configuration>DebugAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|Win32">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|x64">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|Win32">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|x64">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>StormLib</ProjectName>
-    <ProjectGuid>{78424708-1F6E-4D4B-920C-FB6D26847055}</ProjectGuid>
-    <RootNamespace>StormLib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">$(ProjectName)RAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">$(ProjectName)RAS</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt" />
-    <None Include="doc\The MoPaQ File Format 0.9.txt" />
-    <None Include="doc\The MoPaQ File Format 1.0.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\StormCommon.h" />
-    <ClInclude Include="src\StormLib.h" />
-    <ClInclude Include="src\StormPort.h" />
-    <ClInclude Include="src\adpcm\adpcm.h" />
-    <ClInclude Include="src\huffman\huff.h" />
-    <ClInclude Include="src\pklib\pklib.h" />
-    <ClInclude Include="src\sparse\sparse.h" />
-    <ClInclude Include="src\jenkins\lookup.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\FileStream.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseCommon.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseFileTable.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SCompression.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAddFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAttributes.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCompactArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCreateArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileExtractFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileFindFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileListFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenFileEx.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFilePatchArchives.cpp" />
-    <ClCompile Include="src\SFileReadFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileVerify.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\adpcm\adpcm.cpp" />
-    <ClCompile Include="src\bzip2\blocksort.c" />
-    <ClCompile Include="src\bzip2\bzlib.c" />
-    <ClCompile Include="src\bzip2\compress.c" />
-    <ClCompile Include="src\bzip2\crctable.c" />
-    <ClCompile Include="src\bzip2\decompress.c" />
-    <ClCompile Include="src\bzip2\huffman.c" />
-    <ClCompile Include="src\bzip2\randtable.c" />
-    <ClCompile Include="src\huffman\huff.cpp" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="src\libtommath\bn_reverse.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bncore.c" />
-    <ClCompile Include="src\lzma\C\LzFind.c" />
-    <ClCompile Include="src\lzma\C\LzFindMt.c" />
-    <ClCompile Include="src\lzma\C\LzmaDec.c" />
-    <ClCompile Include="src\lzma\C\LzmaEnc.c" />
-    <ClCompile Include="src\lzma\C\Threads.c" />
-    <ClCompile Include="src\pklib\explode.c" />
-    <ClCompile Include="src\pklib\implode.c" />
-    <ClCompile Include="src\sparse\sparse.cpp" />
-    <ClCompile Include="src\zlib\adler32.c" />
-    <ClCompile Include="src\zlib\compress2.c" />
-    <ClCompile Include="src\zlib\crc32.c" />
-    <ClCompile Include="src\zlib\deflate.c" />
-    <ClCompile Include="src\zlib\inffast.c" />
-    <ClCompile Include="src\zlib\inflate.c" />
-    <ClCompile Include="src\zlib\inftrees.c" />
-    <ClCompile Include="src\zlib\trees.c" />
-    <ClCompile Include="src\zlib\zutil.c" />
-    <ClCompile Include="src\jenkins\lookup3.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/StormLibOld/StormLib_vc120.vcxproj b/dep/StormLibOld/StormLib_vc120.vcxproj
deleted file mode 100644
index 51c3312e1..000000000
--- a/dep/StormLibOld/StormLib_vc120.vcxproj
+++ /dev/null
@@ -1,696 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugAD|Win32">
-      <Configuration>DebugAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAD|x64">
-      <Configuration>DebugAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|Win32">
-      <Configuration>DebugAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|x64">
-      <Configuration>DebugAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|Win32">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|x64">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|Win32">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|x64">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>StormLib</ProjectName>
-    <ProjectGuid>{78424708-1F6E-4D4B-920C-FB6D26847055}</ProjectGuid>
-    <RootNamespace>StormLib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">$(ProjectName)RAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">$(ProjectName)RAS</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt" />
-    <None Include="doc\The MoPaQ File Format 0.9.txt" />
-    <None Include="doc\The MoPaQ File Format 1.0.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\StormCommon.h" />
-    <ClInclude Include="src\StormLib.h" />
-    <ClInclude Include="src\StormPort.h" />
-    <ClInclude Include="src\adpcm\adpcm.h" />
-    <ClInclude Include="src\huffman\huff.h" />
-    <ClInclude Include="src\pklib\pklib.h" />
-    <ClInclude Include="src\sparse\sparse.h" />
-    <ClInclude Include="src\jenkins\lookup.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\FileStream.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseCommon.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseFileTable.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SCompression.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAddFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAttributes.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCompactArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCreateArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileExtractFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileFindFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileListFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenFileEx.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFilePatchArchives.cpp" />
-    <ClCompile Include="src\SFileReadFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileVerify.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\adpcm\adpcm.cpp" />
-    <ClCompile Include="src\bzip2\blocksort.c" />
-    <ClCompile Include="src\bzip2\bzlib.c" />
-    <ClCompile Include="src\bzip2\compress.c" />
-    <ClCompile Include="src\bzip2\crctable.c" />
-    <ClCompile Include="src\bzip2\decompress.c" />
-    <ClCompile Include="src\bzip2\huffman.c" />
-    <ClCompile Include="src\bzip2\randtable.c" />
-    <ClCompile Include="src\huffman\huff.cpp" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="src\libtommath\bn_reverse.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bncore.c" />
-    <ClCompile Include="src\lzma\C\LzFind.c" />
-    <ClCompile Include="src\lzma\C\LzFindMt.c" />
-    <ClCompile Include="src\lzma\C\LzmaDec.c" />
-    <ClCompile Include="src\lzma\C\LzmaEnc.c" />
-    <ClCompile Include="src\lzma\C\Threads.c" />
-    <ClCompile Include="src\pklib\explode.c" />
-    <ClCompile Include="src\pklib\implode.c" />
-    <ClCompile Include="src\sparse\sparse.cpp" />
-    <ClCompile Include="src\zlib\adler32.c" />
-    <ClCompile Include="src\zlib\compress2.c" />
-    <ClCompile Include="src\zlib\crc32.c" />
-    <ClCompile Include="src\zlib\deflate.c" />
-    <ClCompile Include="src\zlib\inffast.c" />
-    <ClCompile Include="src\zlib\inflate.c" />
-    <ClCompile Include="src\zlib\inftrees.c" />
-    <ClCompile Include="src\zlib\trees.c" />
-    <ClCompile Include="src\zlib\zutil.c" />
-    <ClCompile Include="src\jenkins\lookup3.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/StormLibOld/Storm_dll.bat b/dep/StormLibOld/Storm_dll.bat
deleted file mode 100644
index 466a3d33f..000000000
--- a/dep/StormLibOld/Storm_dll.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-@echo off
-rem Post-build batch for StormDll project
-rem Called as StormDll.bat $(PlatformName) $(ConfigurationName)
-rem Example: StormDll.bat x64 Debug
-
-if x%1 == xWin32 goto PlatformWin32
-if x%1 == xx64 goto PlatformWin64
-goto exit
-
-:PlatformWin32
-copy .\bin\Storm_dll\%1\%2\*.lib    .
-goto exit
-
-:PlatformWin64
-copy .\bin\Storm_dll\%1\%2\*.lib    .
-goto exit
-
-:exit
diff --git a/dep/StormLibOld/Storm_dll.lib b/dep/StormLibOld/Storm_dll.lib
deleted file mode 100644
index cb6e65c9c..000000000
Binary files a/dep/StormLibOld/Storm_dll.lib and /dev/null differ
diff --git a/dep/StormLibOld/Storm_dll.vcproj b/dep/StormLibOld/Storm_dll.vcproj
deleted file mode 100644
index 4eb8902ac..000000000
--- a/dep/StormLibOld/Storm_dll.vcproj
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="Storm_dll"
-	ProjectGUID="{BD600973-C6FA-4CE3-8821-67F6418B7F9C}"
-	RootNamespace="Storm_dll"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\bin\Storm_dll\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory=".\bin\Storm_dll\$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Storm_dll_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\storm.dll"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				ModuleDefinitionFile=".\Storm_dll\Storm_dll.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				BaseAddress="0x15000000"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="Storm_dll.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\bin\Storm_dll\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory=".\bin\Storm_dll\$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Storm_dll_EXPORTS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\storm.dll"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				ModuleDefinitionFile=".\Storm_dll\storm_dll.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				BaseAddress="0x15000000"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="Storm_dll.bat $(PlatformName) $(ConfigurationName)"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\Storm_dll\storm_dll.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\storm_dll\storm_dll.def"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Storm_dll\storm_dll.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/dep/StormLibOld/Storm_dll.vcxproj b/dep/StormLibOld/Storm_dll.vcxproj
deleted file mode 100644
index df10c4700..000000000
--- a/dep/StormLibOld/Storm_dll.vcxproj
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>Storm_dll</ProjectName>
-    <ProjectGuid>{BD600973-C6FA-4CE3-8821-67F6418B7F9C}</ProjectGuid>
-    <RootNamespace>Storm_dll</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\bin\Storm_dll\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\bin\Storm_dll\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\bin\Storm_dll\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\bin\Storm_dll\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Storm_dll_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)storm.dll</OutputFile>
-      <ModuleDefinitionFile>.\Storm_dll\Storm_dll.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <BaseAddress>0x15000000</BaseAddress>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>Storm_dll.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Storm_dll_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)storm.dll</OutputFile>
-      <ModuleDefinitionFile>.\Storm_dll\storm_dll.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <BaseAddress>0x15000000</BaseAddress>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>Storm_dll.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="Storm_dll\storm_dll.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="storm_dll\storm_dll.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Storm_dll\storm_dll.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/StormLibOld/Storm_dll.vcxproj.filters b/dep/StormLibOld/Storm_dll.vcxproj.filters
deleted file mode 100644
index 48e14f060..000000000
--- a/dep/StormLibOld/Storm_dll.vcxproj.filters
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Storm_dll\storm_dll.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="storm_dll\storm_dll.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Storm_dll\storm_dll.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/History.txt b/dep/StormLibOld/doc/History.txt
deleted file mode 100644
index e7ef388ef..000000000
--- a/dep/StormLibOld/doc/History.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-
-  StormLib history
-  ================
-
- Version 8.02
-
- - Support for UNICODE encoding for on-disk files
- - Optimized file deleting
-
- Version 8.01
-
- - SFileFindFirstFile and SFileFindNextFile no longer find files that have
-   patch file in the oldest MPQ in the patch chain
- - Write support for MPQs version 4
-
- Version 8.00
-
- - Updated support for protected maps from Warcraft III
-
- Version 7.11
-
- - Support for MPQs v 3.0 (WOW-Cataclysm BETA)
- - StormLib now deals properly with files that have MPQ_SECTOR_CHECKSUM missing,
-   but have sector checksum entry present in the sector offset table
-
- Version 7.10
-
- - Support for partial MPQs ("interface.MPQ.part")
- - The only operation that is externally allowed to do with internal files
-   ("(listfile)", "(attributes)" and "(signature)") is reading. Attempt to modify any of the file
-   fails and GetLastError returns ERROR_INTERNAL_FILE
- - Fixed memory leak that has occured when writing more than one sector to the file at once
-
- Version 7.01
-
- - Support for adding files from memory
- - Fixed improper validation of handles to MPQ file and MPQ archive
- - Fixed bug where StormLib didn't save CRC32 of the file when added to archive
-
- Version 7.00
-
- - Properly deals with MPQs protected by w3xMaster
- - Major rewrite
- - Fixed support for (attributes)
- - Added file verification
- - Added MPQ signature verification
-
- Version 6.22
-
- - Properly deals with MPQs protected by w3xMaster
-
- Version 6.21
-
- - SFileRenameFile now properly re-crypts the file if necessary.
- - SFileFindFirstFile correctly deals with deleted files
-
- Version 6.20
-
- - Fixed lots of bugs when processing files with same names but different locales
- - Fixed bugs when repeately extracts the same file with MPQ_FILE_SINGLE_UNIT flag
- - Added SFileFlushArchive
- - Fixed issue opening AVI files renamed to MPQ using SFileCreateArchiveEx
diff --git a/dep/StormLibOld/doc/Sector Offset MD5.txt b/dep/StormLibOld/doc/Sector Offset MD5.txt
deleted file mode 100644
index 12829ca34..000000000
--- a/dep/StormLibOld/doc/Sector Offset MD5.txt	
+++ /dev/null
@@ -1,25 +0,0 @@
-
-    After sector offset table
-    =========================
-
-FileSize    CmpSize   DWORDs
-00007588    000075A4  0x01
-0000A9EA    000095EC  0x01
-0000E51D    0000E20D  0x02
-00015C00    00015C40  0x02
-0001C578    000186C4  0x02
-0002A9D4    0002A9EA  0x04
-00037BAC    00037A42  0x06
-0003C3C1    00034084  0x06
-0003D224    0003B30F  0x06
-00045105    0004195A  0x07
-00045D9C    0003D87D  0x07
-0004AAB8    0004860A  0x08
-0004D18E    00048E0C  0x07
-00056B4C    00056BDD  0x09
-0005DC08    00059426  0x09
-00061EC0    00057711  0x0A
-0006CEC4    00062561  0x0B
-000778EE    00066736  0x0C
-000AD0CB    0007F32E  0x11
-00327EAC    00303395  0x53
diff --git a/dep/StormLibOld/doc/The MoPaQ File Format 0.9.txt b/dep/StormLibOld/doc/The MoPaQ File Format 0.9.txt
deleted file mode 100644
index 410a0e5de..000000000
--- a/dep/StormLibOld/doc/The MoPaQ File Format 0.9.txt	
+++ /dev/null
@@ -1,318 +0,0 @@
-THE MOPAQ ARCHIVE FORMAT
-v0.9 (Thursday, June 30, 2005)
-by Justin Olbrantz(Quantam)
-
-Distribution and reproduction of this specification are allowed without limitation, as long as it is not altered. Quoting
-in other works is freely allowed, as long as the source and author of the quote is stated.
-
-TABLE OF CONTENTS
-1. Introduction to the MoPaQ Format
-2. The MoPaQ Format
-	2.1 General Archive Layout
-	2.2 Archive Header
-	2.3 Block Table
-	2.4 Hash Table
-	2.5 File Data
-	2.6 Listfile
-	2.7 Extended Attributes
-	2.8 Weak (Old) Digital Signature
-	2.9 Strong (New) Digital Signature
-3. Algorithm Source Code
-	3.1 Encryption/Decryption
-	3.2 Hashing
-	3.3 Conversion of FILETIME and time_t
-
-1. INTRODUCTION TO THE MOPAQ FORMAT
-The MoPaQ (or MPQ) format is an archive file format designed by Mike O'Brien (hence the name Mike O'brien PaCK) at Blizzard
-Entertainment. The format has been used in all Blizzard games since (and including) Diablo. It is heavily optimized to be
-a read-only game archive format, and excels at this role.
-
-The Blizzard MoPaQ-reading functions are contained in the Storm module, which my be either statically or dynamically linked.
-The Blizzard MoPaQ-writing functions are contained in the MPQAPI module, which is always statically linked.
-
-2. THE MOPAQ FORMAT
-All numbers in the MoPaQ format are in little endian. Data types are listed either as int (integer, the number of bits specified),
-byte (8 bits), and char (bytes which contain ASCII characters). All sizes and offsets are in bytes, unless specified otherwise.
-Structure members are listed in the following general form:
-offset from the beginning of the structure: data type(array size) member name : member description
-
-2.1 GENERAL ARCHIVE LAYOUT
-- Archive Header
-- File Data
-- File Data - Special Files
-- Hash Table
-- Block Table
-- Strong Digital signature
-
-This is the usual archive format, and is not absolutely essential. Some archives have been observed placing the hash table
-and file table after the archive header, and before the file data.
-
-2.2 ARCHIVE HEADER
-00h: char(4) Magic : Indicates that the file is a MoPaQ archive. Must be ASCII "MPQ" 1Ah.
-04h: int32 HeaderSize : Size of the archive header. Should be 32.
-08h: int32 ArchiveSize : Size of the whole archive, including the header. Does not include the strong digital signature, if present.
-This size is used, among other things, for determining the region to hash in computing the digital signature.
-0Ch: int16 Unknown : Unknown
-0Eh: int8 SectorSizeShift : Power of two exponent specifying the number of 512-byte disk sectors in each logical sector
-in the archive. The size of each logical sector the archive is 512 * 2^SectorSizeShift. Bugs in the Storm library dictate
-that this should always be 3 (4096 byte sectors).
-10h: int32 HashTableOffset : Offset to the beginning of the hash table, relative to the beginning of the archive.
-14h: int32 BlockTableOffset : Offset to the beginning of the block table, relative to the beginning of the archive.
-18h: int32 HashTableEntries : Number of entries in the hash table. Must be a power of two, and must be less than 2^16.
-1Ch: int32 BlockTableEntries : Number of entries in the block table.
-
-The archive header is the first structure in the archive, at archive offset 0, but the archive does not need to be at offset
-0 of the containing file. The offset of the archive in the file is referred to here as ArchiveOffset. If the archive is not
-at the beginning of the file, it must begin at a disk sector boundary (512 bytes). Early versions of Storm require that the
-archive be at the end of the containing file (ArchiveOffset + ArchiveSize = file size), but this is not required in newer
-versions (due to the strong digital signature not being considered a part of the archive).
-
-2.3 BLOCK TABLE
-The block table contains entries for each region in the archive. Regions may be either files or empty space, which may be
-overwritten by new files (typically this space is from deleted file data). The block table is encrypted, using the hash
-of "(block table)" as the key. Each entry is structured as follows:
-
-00h: int32 BlockOffset : Offset of the beginning of the block, relative to the beginning of the archive. Meaningless if the block size is 0.
-04h: int32 BlockSize : Size of the block in the archive.
-08h: int32 FileSize : Size of the file data stored in the block. Only valid if the block is a file, otherwise meaningless, and should be 0. If the file is compressed, this is the size of the uncompressed file data.
-0Ch: int32 Flags : Bit mask of the flags for the block. The following values are conclusively identified:
-	80000000h: Block is a file, and follows the file data format; otherwise, block is free space, and may be overwritten. If the block is not a file, all other flags should be cleared.
-	01000000h: File is stored as a single unit, rather than split into sectors.
-	00020000h: The file's encryption key is adjusted by the block offset and file size (explained in detail in the File Data section). File must be encrypted.
-	00010000h: File is encrypted.
-	00000200h: File is compressed. Mutually exclusive to file imploded.
-	00000100h: File is imploded. Mutually exclusive to file compressed.
-
-2.4 HASH TABLE
-Instead of storing file names, for quick access MoPaQs use a fixed, power of two-size hash table of files in the archive. A file is uniquely identified by its file path, its language, and its platform. The home entry for a file in the hash table is computed as a hash of the file path. In the event of a collision (the home entry is occupied by another file), progressive overflow is used, and the file is placed in the next available hash table entry. Searches for a desired file in the hash table proceed from the home entry for the file until either the file is found, the entire hash table is searched, or an empty hash table entry (FileBlockIndex of FFFFFFFFh) is encountered. The hash table is encrypted using the hash of "(hash table)" as the key. Each entry is structured as follows:
-
-00h: int32 FilePathHashA : The hash of the file path, using method A.
-04h: int32 FilePathHashB : The hash of the file path, using method B.
-08h: int16 Language : The language of the file. This is a Windows LANGID data type, and uses the same values. 0 indicates the default language (American English), or that the file is language-neutral.
-0Ah: int8 Platform : The platform the file is used for. 0 indicates the default platform. No other values have been observed.
-0Ch: int32 FileBlockIndex : If the hash table entry is valid, this is the index into the block table of the file. Otherwise, one of the following two values:
-	FFFFFFFFh: Hash table entry is empty, and has always been empty. Terminates searches for a given file.
-	FFFFFFFEh: Hash table entry is empty, but was valid at some point (in other words, the file was deleted). Does not terminate searches for a given file.
-
-2.5 FILE DATA
-00h: int32(SectorsInFile + 1) SectorOffsetTable : Offsets to the start of each sector's data, relative to the beginning of the file data. Not present if this information is calculatable (see details below).
-immediately following SectorOffsetTable: SectorData : Data of each sector in the file, packed end to end (see details below).
-
-Normally, file data is split up into sectors, for simple streaming. All sectors, save for the last, will contain as many bytes of file data as specified in the archive header's SectorSizeShift; the last sector may be smaller than this, depending on the size of the file data. This sector size is the size of the raw file data; if the file is compressed, the compressed sector will be smaller or the same size as the uncompressed sector size. Individual sectors in a compressed file may be stored uncompressed; this occurs if and only if the sector could not be compressed by the algorithm used (if the compressed sector size was greater than or equal to the size of the raw data), and is indicated by the sector's compressed size in SectorOffsetTable being equal to the uncompressed size of the sector (which may be calculated from the FileSize).
-
-If the sector is compressed (but not imploded), a bit mask byte of the compression algorithm(s) used to compress the sector is appended to the beginning of the compressed sector data. This additional byte counts towards the total size of the sector; if the size of the sector (including this byte) exceeds or matches the uncompressed size of the sector data, the sector will be stored uncompressed, and this byte omitted. Multiple compression algorithms may be used on the same sector; in this case, successive compression occurs in the order the algorithms are listed below, and decompression occurs in the opposite order. For implimentations of all of these algorithms, see StormLib.
-	40h: IMA ADPCM mono
-	80h: IMA ADPCM stereo
-	01h: Huffman encoded
-	02h: Deflated (see ZLib)
-	08h: Imploded (see PKWare Data Compression Library)
-	10h: BZip2 compressed (see BZip2)
-
-If the file is stored as a single unit (indicated in the file's Flags), there is effectively only a single sector, which
-contains the entire file.
-
-If the file is encrypted, each sector (after compression and appendage of the compression type byte, if applicable)
-is encrypted with the file's key. The base key for a file is determined by a hash of the file name stripped of the
-directory (i.e. the key for a file named "directory\file" would be computed as the hash of "file"). If this key is
-adjusted, as indicated in the file's Flags, the final key is calculated as ((base key + BlockOffset - ArchiveOffset)
-XOR FileSize) (StormLib - an open-source implementation of the MoPaQ reading and writing functions,
-by Ladislav Zezula - incorrectly uses an AND in place of the XOR). Each sector is encrypted using the key + the
-0-based index of the sector in the file. The SectorOffsetTable, if present, is encrypted using the key - 1.
-
-The SectorOffsetTable is omitted when the sizes and offsets of all sectors in the file are calculatable from the FileSize.
-This can happen in several circumstances. If the file is not compressed/imploded, then the size and offset of all sectors
-is known, based on the archive's SectorSizeShift. If the file is stored as a single unit compressed/imploded, then the
-SectorOffsetTable is omitted, as the single file "sector" corresponds to BlockSize and FileSize, as mentioned previously.
-Note that the SectorOffsetTable will always be present if the file is compressed/imploded and the file is not stored as
-a single unit, even if there is only a single sector in the file (the size of the file is less than or equal to the
-archive's sector size).
-
-2.6 LISTFILE
-The listfile is a very simple extension to the MoPaQ format that contains the file paths of (most) files in the archive.
-The languages and platforms of the files are not stored in the listfile. The listfile is contained in the file "(listfile)",
-and is simply a non-Unix-style text file with one file path on each line, lines terminated with the bytes 0Dh 0Ah. The file
-"(listfile)" may not be listed in the listfile.
-
-2.7 EXTENDED ATTRIBUTES
-The extended attributes are optional file attributes for files in the block table. These attributes were added at times after
-the MoPaQ format was already finalized, and it is not necessary for every archive to have all (or any) of the extended attributes.
-If an archive contains a given attribute, there will be an instance of that attribute for every block in the block table, although
-the attribute will be meaningless if the block is not a file. The order of the attributes for blocks correspond to the order of the
-blocks in the block table, and are of the same number. The attributes are stored in parallel arrays in the "(attributes)" file,
-in the archive. The attributes corresponding to this file need not be valid (and logically cannot be). Unlike all the other
-structures in the MoPaQ format, entries in the extended attributes are NOT guaranteed to be aligned. Also note that in some
-archives, malicious zeroing of the attributes has been observed, perhaps with the intent of breaking archive viewers. This
-file is structured as follows:
-
-00h: int32 Version : Specifies the extended attributes format version. For now, must be 100.
-04h: int32 AttributesPresent : Bit mask of the extended attributes present in the archive:
-	00000001h: File CRC32s.
-	00000002h: File timestamps.
-	00000004h: File MD5s.
-08h: int32(BlockTableEntries) CRC32s : CRC32s of the (uncompressed) file data for each block in the archive. Omitted if the
-archive does not have CRC32s. immediately after CRC32s: FILETIME(BlockTableEntries) Timestamps : Timestamps for each block
-in the archive. The format is that of the Windows FILETIME structure. Omitted if the archive does not have timestamps.
-immediately after Timestamps: MD5(BlockTableEntries) MD5s : MD5s of the (uncompressed) file data for each block in the archive.
-Omitted if the archive does not have MD5s.
-
-2.8 WEAK DIGITAL SIGNATURE
-The weak digital signature is a digital signature using Microsoft CryptoAPI. It is an implimentation of the RSASSA-PKCS1-v1_5
-digital signature protocol, using the MD5 hashing algorithm and a 512-bit (weak) RSA key (for more information about this
-protocol, see the RSA Labs PKCS1 specification). The public key and exponent are stored in a resource in Storm. The signature
-is stored uncompressed, unencrypted in the file "(signature)" in the archive. The archive is hashed from the beginning of the
-archive (ArchiveOffset in the containing file) to the end of the archive (the length indicated by ArchiveSize); the signature
-file is added to the archive before signing, and the space occupied by the file is considered to be all binary 0s during
-signing/verification. This file is structured as follows:
-
-00h: int32 Unknown : Must be 0.
-04h: int32 Unknown : must be 0.
-08h: int512 Signature : The digital signature. Like all other numbers in the MoPaQ format, this is stored in little-endian order.
-
-2.9 STRONG DIGITAL SIGNATURE
-The strong digital signature uses a simple proprietary implementation of RSA signing, using the SHA-1 hashing algorithm and
-a 2048-bit (strong) RSA key. The default public key and exponent are stored in Storm, but other keys may be used as well.
-The strong digital signature is stored immediately after the archive, in the containing file; the entire archive (ArchiveSize
-bytes, starting at ArchiveOffset in the containing file) is hashed as a single block. The signature has the following format:
-
-00h: char(4) Magic : Indicates the presence of a digital signature. Must be "NGIS" ("SIGN" backwards).
-04h: int2048 Signature : The digital signature, stored in little-endian format.
-
-When the Signature field is decrypted with the public key and exponent, and the result stored in little-endian order, it is structured as follows:
-
-00h: byte Padding : Must be 0Bh.
-01h: byte(235) Padding : Must be BBh.
-ECh: byte(20) SHA-1 : SHA-1 hash of the archive, in standard SHA-1 format.
-
-3. ALGORITHM SOURCE CODE
-3.1 ENCRYPTION/DECRYPTION
-I believe this was derived at some point from code in StormLib. Assumes the long type to be 32 bits, and the machine to be little endian order.
-
-unsigned long dwCryptTable[0x500];
-
-void InitializeCryptTable()
-{
-    unsigned long seed   = 0x00100001;
-    unsigned long index1 = 0;
-    unsigned long index2 = 0;
-    int   i;
-
-    for (index1 = 0; index1 < 0x100; index1++)
-    {
-        for (index2 = index1, i = 0; i < 5; i++, index2 += 0x100)
-        {
-            unsigned long temp1, temp2;
-
-            seed  = (seed * 125 + 3) % 0x2AAAAB;
-            temp1 = (seed & 0xFFFF) << 0x10;
-
-            seed  = (seed * 125 + 3) % 0x2AAAAB;
-            temp2 = (seed & 0xFFFF);
-
-            dwCryptTable[index2] = (temp1 | temp2);
-        }
-    }
-}
-
-void EncryptData(void *lpbyBuffer, unsigned long dwLength, unsigned long dwKey)
-{
-    unsigned long *lpdwBuffer = (unsigned long *)lpbyBuffer;
-    unsigned long seed = 0xEEEEEEEE;
-    unsigned long ch;
-
-	assert(lpbyBuffer);
-
-    dwLength /= sizeof(unsigned long);
-
-    while(dwLength-- > 0)
-    {
-        seed += dwCryptTable[0x400 + (dwKey & 0xFF)];
-        ch = *lpdwBuffer ^ (dwKey + seed);
-
-        dwKey = ((~dwKey << 0x15) + 0x11111111) | (dwKey >> 0x0B);
-        seed = *lpdwBuffer + seed + (seed << 5) + 3;
-
-		*lpdwBuffer++ = ch;
-    }
-}
-
-void DecryptData(void *lpbyBuffer, unsigned long dwLength, unsigned long dwKey)
-{
-	unsigned long *lpdwBuffer = (unsigned long *)lpbyBuffer;
-    unsigned long seed = 0xEEEEEEEE;
-    unsigned long ch;
-
-	assert(lpbyBuffer);
-
-    dwLength /= sizeof(unsigned long);
-
-    while(dwLength-- > 0)
-    {
-        seed += dwCryptTable[0x400 + (dwKey & 0xFF)];
-        ch = *lpdwBuffer ^ (dwKey + seed);
-
-        dwKey = ((~dwKey << 0x15) + 0x11111111) | (dwKey >> 0x0B);
-        seed = ch + seed + (seed << 5) + 3;
-
-		*lpdwBuffer++ = ch;
-    }
-}
-
-3.2 HASHING
-Based on code from StormLib.
-
-// Different types of hashes to make with HashString
-#define MPQ_HASH_TABLE_OFFSET	0
-#define MPQ_HASH_NAME_A	1
-#define MPQ_HASH_NAME_B	2
-#define MPQ_HASH_FILE_KEY	3
-
-unsigned long HashString(const char *lpszString, unsigned long dwHashType)
-{
-    unsigned long  seed1 = 0x7FED7FED;
-    unsigned long  seed2 = 0xEEEEEEEE;
-    int    ch;
-
-    while (*lpszString != 0)
-    {
-        ch = toupper(*lpszString++);
-
-        seed1 = dwCryptTable[(dwHashType * 0xFF) + ch] ^ (seed1 + seed2);
-        seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
-    }
-    return seed1;
-}
-
-3.3 CONVERSION OF FILETIME AND time_t
-
-#define EPOCH_OFFSET 116444736000000000ULL	// Number of 100 ns units between 01/01/1601 and 01/01/1970
-
-bool GetTimeFromFileTime(FILETIME &fileTime, time_t &time)
-{
-	// The FILETIME represents a 64-bit integer: the number of 100 ns units since January 1, 1601
-	unsigned long long nTime = ((unsigned long long)fileTime.dwHighDateTime << 32) + fileTime.dwLowDateTime;
-
-	if (nTime < EPOCH_OFFSET)
-		return false;
-
-	nTime -= EPOCH_OFFSET;	// Convert the time base from 01/01/1601 to 01/01/1970
-	nTime /= 10000000ULL;	// Convert 100 ns to sec
-
-	time = (time_t)nTime;
-
-	// Test for overflow (FILETIME is 64 bits, time_t is 32 bits)
-	if ((nTime - (unsigned long long)time) > 0)
-		return false;
-
-	return true;
-}
-
-void GetFileTimeFromTime(time_t &time, FILETIME &fileTime)
-{
-	unsigned long long nTime = (unsigned long long)time;
-
-	nTime *= 10000000ULL;
-	nTime += EPOCH_OFFSET;
-
-	fileTime.dwLowDateTime = (DWORD)nTime;
-	fileTime.dwHighDateTime = (DWORD)(nTime >> 32);
-}
diff --git a/dep/StormLibOld/doc/The MoPaQ File Format 1.0.txt b/dep/StormLibOld/doc/The MoPaQ File Format 1.0.txt
deleted file mode 100644
index 026d80c0b..000000000
--- a/dep/StormLibOld/doc/The MoPaQ File Format 1.0.txt	
+++ /dev/null
@@ -1,433 +0,0 @@
-THE MOPAQ ARCHIVE FORMAT
-v1.0 (Friday, September 1, 2006)
-by Justin Olbrantz(Quantam)
-
-Distribution and reproduction of this specification are allowed without limitation, as long as it is not altered. Quotation in other works is freely allowed, as long as the source and author of the quote are stated.
-
-TABLE OF CONTENTS
-1. Introduction to the MoPaQ Format
-2. The MoPaQ Format
-	2.1 General Archive Layout
-	2.2 Archive Header
-	2.3 Block Table
-	2.4 Extended Block Table
-	2.5 Hash Table
-	2.6 File Data
-	2.7 Listfile
-	2.8 Extended Attributes
-	2.9 Weak (Old) Digital Signature
-	2.10 Strong (New) Digital Signature
-3. Algorithm Source Code
-	3.1 Encryption/Decryption
-	3.2 Hashing and File Key Computation
-	3.3 Finding Files
-	3.4 Deleting Files
-	3.5 Conversion of FILETIME and time_t
-	3.6 Forming a 64-bit Large Archive Offset from 32-bit and 16-bit Components
-4. Revision History
-
-1. INTRODUCTION TO THE MOPAQ FORMAT
-The MoPaQ (or MPQ) format is an archive file format designed by Mike O'Brien (hence the name Mike O'brien PaCK) at Blizzard Entertainment. The format has been used in all Blizzard games since (and including) Diablo. It is heavily optimized to be a read-only game archive format, and excels at this role.
-
-The Blizzard MoPaQ-reading functions are contained in the Storm module, which my be either statically or dynamically linked. The Blizzard MoPaQ-writing functions are contained in the MPQAPI module, which is always statically linked.
-
-StormLib - mentioned several times in this specification - is an open-source MoPaQ reading and writing library written by Ladislav Zezula (no affiliation with Blizzard Entertainment). While it's a bit dated, and does not support all of the newer MoPaQ features, it contains source code to the more exotic compression methods used by MoPaQ, such as the PKWare implode algorithm, MoPaQ's huffman compression algorithm, and the IMA ADPCM compression used by MoPaQ.
-
-2. THE MOPAQ FORMAT
-All numbers in the MoPaQ format are in little endian byte order; signed numbers use the two's complement system. Data types are listed either as int (integer, the number of bits specified), byte (8 bits), or char (bytes which contain ASCII characters). All sizes and offsets are in bytes, unless specified otherwise. Structure members are listed in the following general form:
-offset from the beginning of the structure: data type(array size) member name : member description
-
-2.1 GENERAL ARCHIVE LAYOUT
-- Archive Header
-- File Data
-- File Data - Special Files
-- Hash Table
-- Block Table
-- Extended Block Table
-- Strong Digital signature
-
-This is the usual archive format, but it is not mandatory. Some archives have been observed placing the hash table and file table after the archive header, and before the file data.
-
-2.2 ARCHIVE HEADER
-00h: char(4) Magic : Indicates that the file is a MoPaQ archive. Must be ASCII "MPQ" 1Ah.
-04h: int32 HeaderSize : Size of the archive header.
-08h: int32 ArchiveSize : Size of the whole archive, including the header. Does not include the strong digital signature, if present. This size is used, among other things, for determining the region to hash in computing the digital signature. This field is deprecated in the Burning Crusade MoPaQ format, and the size of the archive is calculated as the size from the beginning of the archive to the end of the hash table, block table, or extended block table (whichever is largest).
-0Ch: int16 FormatVersion : MoPaQ format version. MPQAPI will not open archives where this is negative. Known versions:
-	0000h: Original format. HeaderSize should be 20h, and large archives are not supported.
-	0001h: Burning Crusade format. Header size should be 2Ch, and large archives are supported.
-0Eh: int8 SectorSizeShift : Power of two exponent specifying the number of 512-byte disk sectors in each logical sector in the archive. The size of each logical sector in the archive is 512 * 2^SectorSizeShift. Bugs in the Storm library dictate that this should always be 3 (4096 byte sectors).
-10h: int32 HashTableOffset : Offset to the beginning of the hash table, relative to the beginning of the archive.
-14h: int32 BlockTableOffset : Offset to the beginning of the block table, relative to the beginning of the archive.
-18h: int32 HashTableEntries : Number of entries in the hash table. Must be a power of two, and must be less than 2^16 for the original MoPaQ format, or less than 2^20 for the Burning Crusade format.
-1Ch: int32 BlockTableEntries : Number of entries in the block table.
-Fields only present in the Burning Crusade format and later:
-20h: int64 ExtendedBlockTableOffset : Offset to the beginning of the extended block table, relative to the beginning of the archive.
-28h: int16 HashTableOffsetHigh : High 16 bits of the hash table offset for large archives.
-2Ah: int16 BlockTableOffsetHigh : High 16 bits of the block table offset for large archives.
-
-The archive header is the first structure in the archive, at archive offset 0; however, the archive does not need to be at offset 0 of the containing file. The offset of the archive in the file is referred to here as ArchiveOffset. If the archive is not at the beginning of the file, it must begin at a disk sector boundary (512 bytes). Early versions of Storm require that the archive be at the end of the containing file (ArchiveOffset + ArchiveSize = file size), but this is not required in newer versions (due to the strong digital signature not being considered a part of the archive).
-
-2.3 BLOCK TABLE
-The block table contains entries for each region in the archive. Regions may be either files, empty space, which may be overwritten by new files (typically this space is from deleted file data), or unused block table entries. Empty space entries should have BlockOffset and BlockSize nonzero, and FileSize and Flags zero; unused block table entries should have BlockSize, FileSize, and Flags zero. The block table is encrypted, using the hash of "(block table)" as the key. Each entry is structured as follows:
-
-00h: int32 BlockOffset : Offset of the beginning of the block, relative to the beginning of the archive.
-04h: int32 BlockSize : Size of the block in the archive.
-08h: int32 FileSize : Size of the file data stored in the block. Only valid if the block is a file; otherwise meaningless, and should be 0. If the file is compressed, this is the size of the uncompressed file data.
-0Ch: int32 Flags : Bit mask of the flags for the block. The following values are conclusively identified:
-	80000000h: Block is a file, and follows the file data format; otherwise, block is free space or unused. If the block is not a file, all other flags should be cleared, and FileSize should be 0.
-	01000000h: File is stored as a single unit, rather than split into sectors.
-	00020000h: The file's encryption key is adjusted by the block offset and file size (explained in detail in the File Data section). File must be encrypted.
-	00010000h: File is encrypted.
-	00000200h: File is compressed. File cannot be imploded.
-	00000100h: File is imploded. File cannot be compressed.
-
-2.4 EXTENDED BLOCK TABLE
-The extended block table was added to support archives larger than 4 gigabytes (2^32 bytes). The table contains the upper bits of the archive offsets for each block in the block table. It is simply an array of int16s, which become bits 32-47 of the archive offsets for each block, with bits 48-63 being zero. Individual blocks in the archive are still limited to 4 gigabytes in size. This table is only present in Burning Crusade format archives that exceed 4 gigabytes size.
-
-As of the Burning Crusade Friends and Family beta, this table is not encrypted.
-
-2.5 HASH TABLE
-Instead of storing file names, for quick access MoPaQs use a fixed, power of two-size hash table of files in the archive. A file is uniquely identified by its file path, its language, and its platform. The home entry for a file in the hash table is computed as a hash of the file path. In the event of a collision (the home entry is occupied by another file), progressive overflow is used, and the file is placed in the next available hash table entry. Searches for a desired file in the hash table proceed from the home entry for the file until either the file is found, the entire hash table is searched, or an empty hash table entry (FileBlockIndex of FFFFFFFFh) is encountered. The hash table is encrypted using the hash of "(hash table)" as the key. Each entry is structured as follows:
-
-00h: int32 FilePathHashA : The hash of the file path, using method A.
-04h: int32 FilePathHashB : The hash of the file path, using method B.
-08h: int16 Language : The language of the file. This is a Windows LANGID data type, and uses the same values. 0 indicates the default language (American English), or that the file is language-neutral.
-0Ah: int8 Platform : The platform the file is used for. 0 indicates the default platform. No other values have been observed.
-0Ch: int32 FileBlockIndex : If the hash table entry is valid, this is the index into the block table of the file. Otherwise, one of the following two values:
-	FFFFFFFFh: Hash table entry is empty, and has always been empty. Terminates searches for a given file.
-	FFFFFFFEh: Hash table entry is empty, but was valid at some point (in other words, the file was deleted). Does not terminate searches for a given file.
-
-2.6 FILE DATA
-The data for each file is composed of the following structure:
-00h: int32(SectorsInFile + 1) SectorOffsetTable : Offsets to the start of each sector, relative to the beginning of the file data. The last entry contains the file size, making it possible to easily calculate the size of any given sector. This table is not present if this information can be calculated (see details below).
-immediately following SectorOffsetTable: SECTOR Sectors(SectorsInFile) : Data of each sector in the file, packed end to end (see details below).
-
-Normally, file data is split up into sectors, for simple streaming. All sectors, save for the last, will contain as many bytes of file data as specified in the archive header's SectorSizeShift; the last sector may contain less than this, depending on the size of the entire file's data. If the file is compressed or imploded, the sector will be smaller or the same size as the file data it contains. Individual sectors in a compressed or imploded file may be stored uncompressed; this occurs if and only if the file data the sector contains could not be compressed by the algorithm(s) used (if the compressed sector size was greater than or equal to the size of the file data), and is indicated by the sector's size in SectorOffsetTable being equal to the size of the file data in the sector (which may be calculated from the FileSize).
-
-The format of each sector depends on the kind of sector it is. Uncompressed sectors are simply the the raw file data contained in the sector. Imploded sectors are the raw compressed data following compression with the implode algorithm (these sectors can only be in imploded files). Compressed sectors (only found in compressed - not imploded - files) are compressed with one or more compression algorithms, and have the following structure:
-00h: byte CompressionMask : Mask of the compression types applied to this sector. If multiple compression types are used, they are applied in the order listed below, and decompression is performed in the opposite order. This byte counts towards the total sector size, meaning that the sector will be stored uncompressed if the data cannot be compressed by at least two bytes; as well, this byte is encrypted with the sector data, if applicable. The following compression types are defined (for implementations of these algorithms, see StormLib):
-	40h: IMA ADPCM mono
-	80h: IMA ADPCM stereo
-	01h: Huffman encoded
-	02h: Deflated (see ZLib)
-	08h: Imploded (see PKWare Data Compression Library)
-	10h: BZip2 compressed (see BZip2)
-01h: byte(SectorSize - 1) SectorData : The compressed data for the sector.
-
-If the file is stored as a single unit (indicated in the file's Flags), there is effectively only a single sector, which contains the entire file data.
-
-If the file is encrypted, each sector (after compression/implosion, if applicable) is encrypted with the file's key. The base key for a file is determined by a hash of the file name stripped of the directory (i.e. the key for a file named "directory\file" would be computed as the hash of "file"). If this key is adjusted, as indicated in the file's Flags, the final key is calculated as ((base key + BlockOffset - ArchiveOffset) XOR FileSize) (StormLib incorrectly uses an AND in place of the XOR). Each sector is encrypted using the key + the 0-based index of the sector in the file. The SectorOffsetTable, if present, is encrypted using the key - 1.
-
-The SectorOffsetTable is omitted when the sizes and offsets of all sectors in the file are calculatable from the FileSize. This can happen in several circumstances. If the file is not compressed/imploded, then the size and offset of all sectors is known, based on the archive's SectorSizeShift. If the file is stored as a single unit compressed/imploded, then the SectorOffsetTable is omitted, as the single file "sector" corresponds to BlockSize and FileSize, as mentioned previously. However, the SectorOffsetTable will be present if the file is compressed/imploded and the file is not stored as a single unit, even if there is only a single sector in the file (the size of the file is less than or equal to the archive's sector size).
-
-2.7 LISTFILE
-The listfile is a very simple extension to the MoPaQ format that contains the file paths of (most) files in the archive. The languages and platforms of the files are not stored in the listfile. The listfile is contained in the file "(listfile)" (default language and platform), and is simply a text file with file paths separated by ';', 0Dh, 0Ah, or some combination of these. The file "(listfile)" may not be listed in the listfile.
-
-2.8 EXTENDED ATTRIBUTES
-The extended attributes are optional file attributes for files in the block table. These attributes were added at times after the MoPaQ format was already finalized, and it is not necessary for every archive to have all (or any) of the extended attributes. If an archive contains a given attribute, there will be an instance of that attribute for every block in the block table, although the attribute will be meaningless if the block is not a file. The order of the attributes for blocks correspond to the order of the blocks in the block table, and are of the same number. The attributes are stored in parallel arrays in the "(attributes)" file (default language and platform), in the archive. The attributes corresponding to this file need not be valid (and logically cannot be). Unlike all the other structures in the MoPaQ format, entries in the extended attributes are NOT guaranteed to be aligned. Also note that in some archives, malicious zeroing of the attributes has been observed, perhaps with the intent of breaking archive viewers. This file is structured as follows:
-
-00h: int32 Version : Specifies the extended attributes format version. For now, must be 100.
-04h: int32 AttributesPresent : Bit mask of the extended attributes present in the archive:
-	00000001h: File CRC32s.
-	00000002h: File timestamps.
-	00000004h: File MD5s.
-08h: int32(BlockTableEntries) CRC32s : CRC32s of the (uncompressed) file data for each block in the archive. Omitted if the archive does not have CRC32s.
-immediately after CRC32s: FILETIME(BlockTableEntries) Timestamps : Timestamps for each block in the archive. The format is that of the Windows FILETIME structure. Omitted if the archive does not have timestamps.
-immediately after Timestamps: MD5(BlockTableEntries) MD5s : MD5s of the (uncompressed) file data for each block in the archive. Omitted if the archive does not have MD5s.
-
-2.9 WEAK DIGITAL SIGNATURE
-The weak digital signature is a digital signature using Microsoft CryptoAPI. It is an implimentation
-of the RSASSA-PKCS1-v1_5 digital signature protocol, using the MD5 hashing algorithm and a 512-bit (weak)
-RSA key (for more information about this protocol, see the RSA Labs PKCS1 specification). The public key
-and exponent are stored in a resource in Storm, the private key is stored in a separate file, whose filename
-is passed to MPQAPI (the private key is not stored in MPQAPI). The signature is stored uncompressed,
-unencrypted in the file "(signature)" (default language and platform) in the archive. The archive
-is hashed from the beginning of the archive (ArchiveOffset in the containing file) to the end of
-the archive (the length indicated by ArchiveSize, or calculated in the Burning Crusade MoPaQ format);
-the signature file is added to the archive before signing, and the space occupied by the file is considered
-to be all binary 0s during signing/verification. This file is structured as follows:
-
-00h: int32 Unknown : Must be 0.
-04h: int32 Unknown : Must be 0.
-08h: int512 Signature : The digital signature. Like all other numbers in the MoPaQ format, this is stored
-in little-endian order. The structure of this, when decrypted, follows the RSASSA-PKCS1-v1_5 specification;
-this format is rather icky to work with (I wrote a program to verify this signature using nothing but an MD5
-function and huge integer functions; it wasn't pleasant), and best left to an encryption library such as Cryto++.
-
-2.10 STRONG DIGITAL SIGNATURE
-The strong digital signature uses a simple proprietary implementation of RSA signing, using the SHA-1 hashing algorithm and a 2048-bit (strong) RSA key. The default public key and exponent are stored in Storm, but other keys may be used as well. The strong digital signature is stored immediately after the archive, in the containing file; the entire archive (ArchiveSize bytes, starting at ArchiveOffset in the containing file) is hashed as a single block. The signature has the following format:
-
-00h: char(4) Magic : Indicates the presence of a digital signature. Must be "NGIS" ("SIGN" backwards).
-04h: int2048 Signature : The digital signature, stored in little-endian format.
-
-When the Signature field is decrypted with the public key and exponent, and the resulting large integer is stored in little-endian order, it is structured as follows:
-
-00h: byte Padding : Must be 0Bh.
-01h: byte(235) Padding : Must be BBh.
-ECh: byte(20) SHA-1 : SHA-1 hash of the archive, in standard SHA-1 byte order.
-
-3. ALGORITHM SOURCE CODE
-All of the sample code here assumes little endian machine byte order, that the short type is 16 bits, that the long type is 32 bits, and that the long long type is 64 bits. Adjustments must be made if these assumptions are not correct on a given platform. All code not credited otherwise was written by myself in the writing of this specification.
-
-3.1 ENCRYPTION/DECRYPTION
-Based on code from StormLib.
-
-unsigned long dwCryptTable[0x500];
-
-// The encryption and hashing functions use a number table in their procedures. This table must be initialized before the functions are called the first time.
-void InitializeCryptTable()
-{
-    unsigned long seed   = 0x00100001;
-    unsigned long index1 = 0;
-    unsigned long index2 = 0;
-    int   i;
-
-    for (index1 = 0; index1 < 0x100; index1++)
-    {
-        for (index2 = index1, i = 0; i < 5; i++, index2 += 0x100)
-        {
-            unsigned long temp1, temp2;
-
-            seed  = (seed * 125 + 3) % 0x2AAAAB;
-            temp1 = (seed & 0xFFFF) << 0x10;
-
-            seed  = (seed * 125 + 3) % 0x2AAAAB;
-            temp2 = (seed & 0xFFFF);
-
-            dwCryptTable[index2] = (temp1 | temp2);
-        }
-    }
-}
-
-void EncryptData(void *lpbyBuffer, unsigned long dwLength, unsigned long dwKey)
-{
-    assert(lpbyBuffer);
-
-    unsigned long *lpdwBuffer = (unsigned long *)lpbyBuffer;
-    unsigned long seed = 0xEEEEEEEE;
-    unsigned long ch;
-
-    dwLength /= sizeof(unsigned long);
-
-    while(dwLength-- > 0)
-    {
-        seed += dwCryptTable[0x400 + (dwKey & 0xFF)];
-        ch = *lpdwBuffer ^ (dwKey + seed);
-
-        dwKey = ((~dwKey << 0x15) + 0x11111111) | (dwKey >> 0x0B);
-        seed = *lpdwBuffer + seed + (seed << 5) + 3;
-
-		*lpdwBuffer++ = ch;
-    }
-}
-
-void DecryptData(void *lpbyBuffer, unsigned long dwLength, unsigned long dwKey)
-{
-    assert(lpbyBuffer);
-
-    unsigned long *lpdwBuffer = (unsigned long *)lpbyBuffer;
-    unsigned long seed = 0xEEEEEEEEL;
-    unsigned long ch;
-
-    dwLength /= sizeof(unsigned long);
-
-    while(dwLength-- > 0)
-    {
-        seed += dwCryptTable[0x400 + (dwKey & 0xFF)];
-        ch = *lpdwBuffer ^ (dwKey + seed);
-
-        dwKey = ((~dwKey << 0x15) + 0x11111111L) | (dwKey >> 0x0B);
-        seed = ch + seed + (seed << 5) + 3;
-
-		*lpdwBuffer++ = ch;
-    }
-}
-
-3.2 HASHING AND FILE KEY COMPUTATION
-These functions may have been derived from StormLib code at some point in the very distant past. It was so long ago that I don't remember for certain.
-
-// Different types of hashes to make with HashString
-#define MPQ_HASH_TABLE_OFFSET	0
-#define MPQ_HASH_NAME_A	1
-#define MPQ_HASH_NAME_B	2
-#define MPQ_HASH_FILE_KEY	3
-
-// Based on code from StormLib.
-unsigned long HashString(const char *lpszString, unsigned long dwHashType)
-{
-    assert(lpszString);
-    assert(dwHashType <= MPQ_HASH_FILE_KEY);
-
-    unsigned long  seed1 = 0x7FED7FEDL;
-    unsigned long  seed2 = 0xEEEEEEEEL;
-    int    ch;
-
-    while (*lpszString != 0)
-    {
-        ch = toupper(*lpszString++);
-
-        seed1 = dwCryptTable[(dwHashType * 0x100) + ch] ^ (seed1 + seed2);
-        seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
-    }
-    return seed1;
-}
-
-#define BLOCK_OFFSET_ADJUSTED_KEY 0x00020000L
-
-unsigned long ComputeFileKey(const char *lpszFilePath, const BlockTableEntry &blockEntry, unsigned long nArchiveOffset)
-{
-	assert(lpszFilePath);
-
-	// Find the file name part of the path
-	const char *lpszFileName = strrchr(lpszFilePath, '\\');
-	if (lpszFileName)
-		lpszFileName++;	// Skip the \
-	else
-		lpszFileName = lpszFilePath;
-
-	// Hash the name to get the base key
-	unsigned long nFileKey = HashString(lpszFileName, MPQ_HASH_FILE_KEY);
-
-	// Offset-adjust the key if necessary
-	if (blockEntry.Flags & BLOCK_OFFSET_ADJUSTED_KEY)
-		nFileKey = (nFileKey + blockEntry.BlockOffset) ^ blockEntry.FileSize;
-
-	return nFileKey;
-}
-
-3.3 FINDING FILES
-
-#define MPQ_HASH_ENTRY_EMPTY 0xFFFFFFFFL
-#define MPQ_HASH_ENTRY_DELETED 0xFFFFFFFEL
-
-bool FindFileInHashTable(const HashTableEntry *lpHashTable, unsigned long nHashTableSize, const char *lpszFilePath, unsigned short nLang, unsigned char nPlatform, unsigned long &iFileHashEntry)
-{
-	assert(lpHashTable);
-	assert(nHashTableSize);
-	assert(lpszFilePath);
-
-	// Find the home entry in the hash table for the file
-	unsigned long iInitEntry = HashString(lpszFilePath, MPQ_HASH_TABLE_OFFSET) & (nHashTableSize - 1);
-
-	// Is there anything there at all?
-	if (lpHashTable[iInitEntry].FileBlockIndex == MPQ_HASH_ENTRY_EMPTY)
-		return false;
-
-	// Compute the hashes to compare the hash table entry against
-	unsigned long nNameHashA = HashString(lpszFilePath, MPQ_HASH_NAME_A),
-		nNameHashB = HashString(lpszFilePath, MPQ_HASH_NAME_B),
-		iCurEntry = iInitEntry;
-
-	// Check each entry in the hash table till a termination point is reached
-	do
-	{
-		if (lpHashTable[iCurEntry].FileBlockIndex != MPQ_HASH_ENTRY_DELETED)
-		{
-			if (lpHashTable[iCurEntry].FilePathHashA == nNameHashA
-				&& lpHashTable[iCurEntry].FilePathHashB == nNameHashB
-				&& lpHashTable[iCurEntry].Language == nLang
-				&& lpHashTable[iCurEntry].Platform == nPlatform)
-			{
-				iFileHashEntry = iCurEntry;
-
-				return true;
-			}
-		}
-
-		iCurEntry = (iCurEntry + 1) & (nHashTableSize - 1);
-	} while (iCurEntry != iInitEntry && lpHashTable[iCurEntry].FileBlockIndex != MPQ_HASH_ENTRY_EMPTY);
-
-	return false;
-}
-
-3.4 DELETING FILES
-
-bool DeleteFile(HashTableEntry *lpHashTable, unsigned long nHashTableSize, BlockTableEntry *lpBlockTable, const char *lpszFilePath, unsigned short nLang, unsigned char nPlatform)
-{
-	assert(lpHashTable);
-	assert(nHashTableSize);
-	assert(lpBlockTable);
-
-	// Find the file in the hash table
-	unsigned long iFileHashEntry;
-
-	if (!FindFileInHashTable(lpHashTable, nHashTableSize, lpszFilePath, nLang, nPlatform, iFileHashEntry))
-		return false;
-
-	// Get the block table index before we nuke the hash table entry
-	unsigned long iFileBlockEntry = lpHashTable[iFileHashEntry].FileBlockIndex;
-
-	// Delete the file's entry in the hash table
-	memset(&lpHashTable[iFileHashEntry], 0xFF, sizeof(HashTableEntry));
-
-	// If the next entry is empty, mark this one as empty; otherwise, mark this as deleted.
-	if (lpHashTable[(iFileHashEntry + 1) & (nHashTableSize - 1)].FileBlockIndex == MPQ_HASH_ENTRY_EMPTY)
-		lpHashTable[iFileHashEntry].FileBlockIndex = MPQ_HASH_ENTRY_EMPTY;
-	else
-		lpHashTable[iFileHashEntry].FileBlockIndex = MPQ_HASH_ENTRY_DELETED;
-
-	// If the block occupies space, mark the block as free space; otherwise, clear the block table entry.
-	if (lpBlockTable[iFileBlockEntry].BlockSize > 0)
-	{
-		lpBlockTable[iFileBlockEntry].FileSize = 0;
-		lpBlockTable[iFileBlockEntry].Flags = 0;
-	}
-	else
-		memset(&lpBlockTable[iFileBlockEntry], 0, sizeof(BlockTableEntry);
-
-	return true;
-}
-
-3.5 CONVERSION OF FILETIME AND time_t
-This code assumes that the base ("zero") date for time_t is 01/01/1970. This is true on Windows, Unix System V systems, and Mac OS X. It is unknown whether this is true on all other platforms. You'll need to research this yourself, if you plan on porting it somewhere else.
-
-#define EPOCH_OFFSET 116444736000000000ULL	// Number of 100 ns units between 01/01/1601 and 01/01/1970
-
-bool GetTimeFromFileTime(const FILETIME &fileTime, time_t &time)
-{
-	// The FILETIME represents a 64-bit integer: the number of 100 ns units since January 1, 1601
-	unsigned long long nTime = ((unsigned long long)fileTime.dwHighDateTime << 32) + fileTime.dwLowDateTime;
-
-	if (nTime < EPOCH_OFFSET)
-		return false;
-
-	nTime -= EPOCH_OFFSET;	// Convert the time base from 01/01/1601 to 01/01/1970
-	nTime /= 10000000ULL;	// Convert 100 ns to sec
-
-	time = (time_t)nTime;
-
-	// Test for overflow (FILETIME is 64 bits, time_t is 32 bits)
-	if ((nTime - (unsigned long long)time) > 0)
-		return false;
-
-	return true;
-}
-
-void GetFileTimeFromTime(const time_t &time, FILETIME &fileTime)
-{
-	unsigned long long nTime = (unsigned long long)time;
-
-	nTime *= 10000000ULL;
-	nTime += EPOCH_OFFSET;
-
-	fileTime.dwLowDateTime = (DWORD)nTime;
-	fileTime.dwHighDateTime = (DWORD)(nTime >> 32);
-}
-
-3.6 FORMING A 64-BIT LARGE ARCHIVE OFFSET FROM 32-BIT AND 16-BIT COMPONENTS
-unsigned long long MakeLargeArchiveOffset(unsigned long nOffsetLow, unsigned short nOffsetHigh)
-{
-	return ((unsigned long long)nOffsetHigh << 32) + (unsigned long long)nOffsetLow;
-}
-
-4. REVISION HISTORY
-1.0
-	- Updated to include most of the changes found in the Burning Crusade Friends and Family beta
-
-0.91.
-	- Updated several structure member descriptions
-	- Listed the full set of characters that can separate list file entries
-	- Noted that (attributes), (listfile), and (signature) use the default language and platform codes
-	- Redid part of the file data specs to clarify the format of sectors
-	- Enhanced descriptions of the different kinds of block table entries
-	- Added ComputeFileKey, FindFileInHashTable, and DeleteFile source
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/d3-authenticationcode-deDE.txt b/dep/StormLibOld/doc/d3-authenticationcode-deDE.txt
deleted file mode 100644
index cac66712a..000000000
--- a/dep/StormLibOld/doc/d3-authenticationcode-deDE.txt
+++ /dev/null
@@ -1 +0,0 @@
-UCMXF6EJY352EFH4XFRXCFH2XC9MQRZK
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/d3-authenticationcode-enGB.txt b/dep/StormLibOld/doc/d3-authenticationcode-enGB.txt
deleted file mode 100644
index 2bc9c8385..000000000
--- a/dep/StormLibOld/doc/d3-authenticationcode-enGB.txt
+++ /dev/null
@@ -1 +0,0 @@
-MMKVHY48RP7WXP4GHYBQ7SL9J9UNPHBP
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/d3-authenticationcode-enSG.txt b/dep/StormLibOld/doc/d3-authenticationcode-enSG.txt
deleted file mode 100644
index e6f1ec296..000000000
--- a/dep/StormLibOld/doc/d3-authenticationcode-enSG.txt
+++ /dev/null
@@ -1 +0,0 @@
-8MXLWHQ7VGGLTZ9MQZQSFDCLJYET3CPP
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/d3-authenticationcode-enUS.txt b/dep/StormLibOld/doc/d3-authenticationcode-enUS.txt
deleted file mode 100644
index 8d73e61de..000000000
--- a/dep/StormLibOld/doc/d3-authenticationcode-enUS.txt
+++ /dev/null
@@ -1 +0,0 @@
-EJ2R5TM6XFE2GUNG5QDGHKQ9UAKPWZSZ
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/d3-authenticationcode-esES.txt b/dep/StormLibOld/doc/d3-authenticationcode-esES.txt
deleted file mode 100644
index 6b1b0a1b8..000000000
--- a/dep/StormLibOld/doc/d3-authenticationcode-esES.txt
+++ /dev/null
@@ -1 +0,0 @@
-PBGFBE42Z6LNK65UGJQ3WZVMCLP4HQQT
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/d3-authenticationcode-esMX.txt b/dep/StormLibOld/doc/d3-authenticationcode-esMX.txt
deleted file mode 100644
index 504759e8d..000000000
--- a/dep/StormLibOld/doc/d3-authenticationcode-esMX.txt
+++ /dev/null
@@ -1 +0,0 @@
-X7SEJJS9TSGCW5P28EBSC47AJPEY8VU2
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/d3-authenticationcode-frFR.txt b/dep/StormLibOld/doc/d3-authenticationcode-frFR.txt
deleted file mode 100644
index bb35a2bfd..000000000
--- a/dep/StormLibOld/doc/d3-authenticationcode-frFR.txt
+++ /dev/null
@@ -1 +0,0 @@
-5KVBQA8VYE6XRY3DLGC5ZDE4XS4P7YA2
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/d3-authenticationcode-itIT.txt b/dep/StormLibOld/doc/d3-authenticationcode-itIT.txt
deleted file mode 100644
index a62031d38..000000000
--- a/dep/StormLibOld/doc/d3-authenticationcode-itIT.txt
+++ /dev/null
@@ -1 +0,0 @@
-478JD2K56EVNVVY4XX8TDWYT5B8KB254
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/d3-authenticationcode-koKR.txt b/dep/StormLibOld/doc/d3-authenticationcode-koKR.txt
deleted file mode 100644
index 296ffcc94..000000000
--- a/dep/StormLibOld/doc/d3-authenticationcode-koKR.txt
+++ /dev/null
@@ -1 +0,0 @@
-8TS4VNFQRZTN6YWHE9CHVDH9NVWD474A
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/d3-authenticationcode-plPL.txt b/dep/StormLibOld/doc/d3-authenticationcode-plPL.txt
deleted file mode 100644
index a92563c18..000000000
--- a/dep/StormLibOld/doc/d3-authenticationcode-plPL.txt
+++ /dev/null
@@ -1 +0,0 @@
-LJ52Z32DF4LZ4ZJJXVKK3AZQA6GABLJB
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/d3-authenticationcode-ptBR.txt b/dep/StormLibOld/doc/d3-authenticationcode-ptBR.txt
deleted file mode 100644
index e6e5c3568..000000000
--- a/dep/StormLibOld/doc/d3-authenticationcode-ptBR.txt
+++ /dev/null
@@ -1 +0,0 @@
-K6BDHY2ECUE2545YKNLBJPVYWHE7XYAG
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/d3-authenticationcode-zhTW.txt b/dep/StormLibOld/doc/d3-authenticationcode-zhTW.txt
deleted file mode 100644
index 138a5449c..000000000
--- a/dep/StormLibOld/doc/d3-authenticationcode-zhTW.txt
+++ /dev/null
@@ -1 +0,0 @@
-6VWCQTN8V3ZZMRUCZXV8A8CGUX2TAA8H
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/diablo3_ruru_disk_encrypted_win.blob b/dep/StormLibOld/doc/diablo3_ruru_disk_encrypted_win.blob
deleted file mode 100644
index 7972b2d76..000000000
--- a/dep/StormLibOld/doc/diablo3_ruru_disk_encrypted_win.blob
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-"config":{
-	"product": "D3",
-		"install_progress_percent": 70.0,
-		"install_progress_info": [8000000000.0, 0.0, 0.0],
-		"download_progress_info": [10000000.0, 500000000.0, 500000000.0],
-		"install_progress_speed": 5000000.0,
-		"tome_download_progress_percent": 0.0,
-		"updater_product": "d3_patch",
-		"expansion_level": 0,
-		"ptr": false,
-		"beta": false,
-		"update_method": "patch on demand",
-		"supports_multibox": false,
-		"data_dir": "Data_D3/PC/MPQs/",
-		"patch_url": "http://ruRU.patch.battle.net:1119/patch",
-		"update_regex": "(?P<prefix>d3-update-(?P<dataset>\\w+))-(?P<build>\\d+)\\.mpq$",
-		"update_identifier": "d3-update-",
-		"torrent_file_path": "Diablo III.tfil",
-		"manifest_file_path": "Diablo III.mfil",
-		"priority_file_path": "Diablo III.pfil",
-		"priority_file_layout": "Retail",
-		"binary_version_path": "Diablo III.exe",
-		"binary_launch_path": "Diablo III.exe",
-		"display_locales":["ruRU"],
-		"supported_locales" : ["enUS", "esMX", "ptBR", "enGB", "deDE", "esES", "frFR", "itIT", "plPL", "enSG", "ptPT", "ruRU", "koKR", "zhTW", "zhCN"],
-		"launch_arguments":["-launch","-uid","diablo3_ruru"],
-		"form": {
-			"eula":	{
-				"eula":false
-			},
-			"game_dir": {		
-				"default": "Program Files",
-				"dirname": "Diablo III",
-				"required_space": 15032385536
-			},			
-			"language":	{
-				"default":["ruRU"],
-				"list":["ruRU"]
-			},
-			"authentication_key": {
-				"url": [
-					"http://ruru.nydus.battle.net/D3/ruRU/setup/mediakey",
-					"http://dist.blizzard.com/mediakey/d3-authenticationcode-ruRU.txt" 
-					]
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/dep/StormLibOld/doc/diablo3_urls.txt b/dep/StormLibOld/doc/diablo3_urls.txt
deleted file mode 100644
index 1fbb6e0b5..000000000
--- a/dep/StormLibOld/doc/diablo3_urls.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-shttp://dist.blizzard.com/mediakey/d3-authenticationcode-deDE.txt
-http://dist.blizzard.com/mediakey/d3-authenticationcode-enGB.txt
-http://dist.blizzard.com/mediakey/d3-authenticationcode-enSG.txt
-http://dist.blizzard.com/mediakey/d3-authenticationcode-enUS.txt
-http://dist.blizzard.com/mediakey/d3-authenticationcode-esES.txt
-http://dist.blizzard.com/mediakey/d3-authenticationcode-esMX.txt
-http://dist.blizzard.com/mediakey/d3-authenticationcode-frFR.txt
-http://dist.blizzard.com/mediakey/d3-authenticationcode-itIT.txt
-http://dist.blizzard.com/mediakey/d3-authenticationcode-koKR.txt
-http://dist.blizzard.com/mediakey/d3-authenticationcode-plPL.txt
-http://dist.blizzard.com/mediakey/d3-authenticationcode-ptBR.txt
-http://dist.blizzard.com/mediakey/d3-authenticationcode-ruRU.txt  <====
-http://dist.blizzard.com/mediakey/d3-authenticationcode-zhTW.txt
-http://dist.blizzard.com/mediakey/d3-authenticationcode-zhCN.txt  <====
diff --git a/dep/StormLibOld/makefile.w32 b/dep/StormLibOld/makefile.w32
deleted file mode 100644
index 8826ccd32..000000000
--- a/dep/StormLibOld/makefile.w32
+++ /dev/null
@@ -1,268 +0,0 @@
-#####################################################################
-#
-# Makefile for compiling StormLib with MINGW
-#
-# Author: Ladislav Zezula
-# Created: Mon May 10 14:13:00 CEST 2010
-# System: Windows Seven
-#    
-#####################################################################
-
-PATH   = C:\TOOLS32\MINGW\bin
-CPP    = g++
-CC     = gcc
-CFLAGS = -Wall
-DFLAGS = -D_7ZIP_ST
-LFLAGS = -shared
-#LFLAGS = -lbz2 -lz
-AR     = ar
-ARFLAGS= rcs
-
-LIBRARY  = StormLib.dll
-#LIBRARY  = StormLib.lib
-
-OBJS_CPP = src/adpcm/adpcm.o \
-           src/huffman/huff.o \
-           src/sparse/sparse.o \
-           src/FileStream.o \
-           src/SBaseCommon.o \
-           src/SBaseFileTable.o \
-           src/SCompression.o \
-           src/SFileAddFile.o \
-           src/SFileAttributes.o \
-           src/SFileCompactArchive.o \
-           src/SFileCreateArchive.o \
-           src/SFileExtractFile.o \
-           src/SFileFindFile.o \
-           src/SFileListFile.o \
-           src/SFileOpenArchive.o \
-           src/SFileOpenFileEx.o \
-           src/SFilePatchArchives.o \
-           src/SFileReadFile.o \
-           src/SFileVerify.o
-              
-
-OBJS_C   = src/bzip2/blocksort.o \
-           src/bzip2/bzlib.o \
-           src/bzip2/compress.o \
-           src/bzip2/crctable.o \
-           src/bzip2/decompress.o \
-           src/bzip2/huffman.o \
-           src/bzip2/randtable.o \
-           src/jenkins/lookup3.o \
-           src/libtomcrypt/src/hashes/hash_memory.o \
-           src/libtomcrypt/src/hashes/md5.o \
-           src/libtomcrypt/src/hashes/sha1.o\
-           src/libtomcrypt/src/math/ltm_desc.o \
-           src/libtomcrypt/src/math/multi.o \
-           src/libtomcrypt/src/math/rand_prime.o \
-           src/libtomcrypt/src/misc/base64_decode.o \
-           src/libtomcrypt/src/misc/crypt_argchk.o \
-           src/libtomcrypt/src/misc/crypt_find_hash.o \
-           src/libtomcrypt/src/misc/crypt_find_prng.o \
-           src/libtomcrypt/src/misc/crypt_hash_descriptor.o \
-           src/libtomcrypt/src/misc/crypt_hash_is_valid.o \
-           src/libtomcrypt/src/misc/crypt_libc.o \
-           src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.o \
-           src/libtomcrypt/src/misc/crypt_prng_descriptor.o \
-           src/libtomcrypt/src/misc/crypt_prng_is_valid.o \
-           src/libtomcrypt/src/misc/crypt_register_hash.o \
-           src/libtomcrypt/src/misc/crypt_register_prng.o \
-           src/libtomcrypt/src/misc/zeromem.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_bit_string.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_boolean.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_choice.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_integer.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_octet_string.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_printable_string.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_short_integer.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_utctime.o \
-           src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.o \
-           src/libtomcrypt/src/pk/asn1/der_length_bit_string.o \
-           src/libtomcrypt/src/pk/asn1/der_length_boolean.o \
-           src/libtomcrypt/src/pk/asn1/der_length_ia5_string.o \
-           src/libtomcrypt/src/pk/asn1/der_length_integer.o \
-           src/libtomcrypt/src/pk/asn1/der_length_object_identifier.o \
-           src/libtomcrypt/src/pk/asn1/der_length_octet_string.o \
-           src/libtomcrypt/src/pk/asn1/der_length_printable_string.o \
-           src/libtomcrypt/src/pk/asn1/der_length_sequence.o \
-           src/libtomcrypt/src/pk/asn1/der_length_short_integer.o \
-           src/libtomcrypt/src/pk/asn1/der_length_utctime.o \
-           src/libtomcrypt/src/pk/asn1/der_length_utf8_string.o \
-           src/libtomcrypt/src/pk/asn1/der_sequence_free.o \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_map.o \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.o \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.o \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_points.o \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.o \
-           src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.o \
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.o \
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.o \
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.o \
-           src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.o \
-           src/libtomcrypt/src/pk/rsa/rsa_exptmod.o \
-           src/libtomcrypt/src/pk/rsa/rsa_free.o \
-           src/libtomcrypt/src/pk/rsa/rsa_import.o \
-           src/libtomcrypt/src/pk/rsa/rsa_make_key.o \
-           src/libtomcrypt/src/pk/rsa/rsa_verify_hash.o \
-           src/libtomcrypt/src/pk/rsa/rsa_verify_simple.o \
-           src/libtommath/bncore.o \
-           src/libtommath/bn_fast_mp_invmod.o \
-           src/libtommath/bn_fast_mp_montgomery_reduce.o \
-           src/libtommath/bn_fast_s_mp_mul_digs.o \
-           src/libtommath/bn_fast_s_mp_mul_high_digs.o \
-           src/libtommath/bn_fast_s_mp_sqr.o \
-           src/libtommath/bn_mp_2expt.o \
-           src/libtommath/bn_mp_abs.o \
-           src/libtommath/bn_mp_add.o \
-           src/libtommath/bn_mp_addmod.o \
-           src/libtommath/bn_mp_add_d.o \
-           src/libtommath/bn_mp_and.o \
-           src/libtommath/bn_mp_clamp.o \
-           src/libtommath/bn_mp_clear.o \
-           src/libtommath/bn_mp_clear_multi.o \
-           src/libtommath/bn_mp_cmp.o \
-           src/libtommath/bn_mp_cmp_d.o \
-           src/libtommath/bn_mp_cmp_mag.o \
-           src/libtommath/bn_mp_cnt_lsb.o \
-           src/libtommath/bn_mp_copy.o \
-           src/libtommath/bn_mp_count_bits.o \
-           src/libtommath/bn_mp_div.o \
-           src/libtommath/bn_mp_div_2.o \
-           src/libtommath/bn_mp_div_2d.o \
-           src/libtommath/bn_mp_div_3.o \
-           src/libtommath/bn_mp_div_d.o \
-           src/libtommath/bn_mp_dr_is_modulus.o \
-           src/libtommath/bn_mp_dr_reduce.o \
-           src/libtommath/bn_mp_dr_setup.o \
-           src/libtommath/bn_mp_exch.o \
-           src/libtommath/bn_mp_exptmod.o \
-           src/libtommath/bn_mp_exptmod_fast.o \
-           src/libtommath/bn_mp_expt_d.o \
-           src/libtommath/bn_mp_exteuclid.o \
-           src/libtommath/bn_mp_fread.o \
-           src/libtommath/bn_mp_fwrite.o \
-           src/libtommath/bn_mp_gcd.o \
-           src/libtommath/bn_mp_get_int.o \
-           src/libtommath/bn_mp_grow.o \
-           src/libtommath/bn_mp_init.o \
-           src/libtommath/bn_mp_init_copy.o \
-           src/libtommath/bn_mp_init_multi.o \
-           src/libtommath/bn_mp_init_set.o \
-           src/libtommath/bn_mp_init_set_int.o \
-           src/libtommath/bn_mp_init_size.o \
-           src/libtommath/bn_mp_invmod.o \
-           src/libtommath/bn_mp_invmod_slow.o \
-           src/libtommath/bn_mp_is_square.o \
-           src/libtommath/bn_mp_jacobi.o \
-           src/libtommath/bn_mp_karatsuba_mul.o \
-           src/libtommath/bn_mp_karatsuba_sqr.o \
-           src/libtommath/bn_mp_lcm.o \
-           src/libtommath/bn_mp_lshd.o \
-           src/libtommath/bn_mp_mod.o \
-           src/libtommath/bn_mp_mod_2d.o \
-           src/libtommath/bn_mp_mod_d.o \
-           src/libtommath/bn_mp_montgomery_calc_normalization.o \
-           src/libtommath/bn_mp_montgomery_reduce.o \
-           src/libtommath/bn_mp_montgomery_setup.o \
-           src/libtommath/bn_mp_mul.o \
-           src/libtommath/bn_mp_mulmod.o \
-           src/libtommath/bn_mp_mul_2.o \
-           src/libtommath/bn_mp_mul_2d.o \
-           src/libtommath/bn_mp_mul_d.o \
-           src/libtommath/bn_mp_neg.o \
-           src/libtommath/bn_mp_n_root.o \
-           src/libtommath/bn_mp_or.o \
-           src/libtommath/bn_mp_prime_fermat.o \
-           src/libtommath/bn_mp_prime_is_divisible.o \
-           src/libtommath/bn_mp_prime_is_prime.o \
-           src/libtommath/bn_mp_prime_miller_rabin.o \
-           src/libtommath/bn_mp_prime_next_prime.o \
-           src/libtommath/bn_mp_prime_rabin_miller_trials.o \
-           src/libtommath/bn_mp_prime_random_ex.o \
-           src/libtommath/bn_mp_radix_size.o \
-           src/libtommath/bn_mp_radix_smap.o \
-           src/libtommath/bn_mp_rand.o \
-           src/libtommath/bn_mp_read_radix.o \
-           src/libtommath/bn_mp_read_signed_bin.o \
-           src/libtommath/bn_mp_read_unsigned_bin.o \
-           src/libtommath/bn_mp_reduce.o \
-           src/libtommath/bn_mp_reduce_2k.o \
-           src/libtommath/bn_mp_reduce_2k_l.o \
-           src/libtommath/bn_mp_reduce_2k_setup.o \
-           src/libtommath/bn_mp_reduce_2k_setup_l.o \
-           src/libtommath/bn_mp_reduce_is_2k.o \
-           src/libtommath/bn_mp_reduce_is_2k_l.o \
-           src/libtommath/bn_mp_reduce_setup.o \
-           src/libtommath/bn_mp_rshd.o \
-           src/libtommath/bn_mp_set.o \
-           src/libtommath/bn_mp_set_int.o \
-           src/libtommath/bn_mp_shrink.o \
-           src/libtommath/bn_mp_signed_bin_size.o \
-           src/libtommath/bn_mp_sqr.o \
-           src/libtommath/bn_mp_sqrmod.o \
-           src/libtommath/bn_mp_sqrt.o \
-           src/libtommath/bn_mp_sub.o \
-           src/libtommath/bn_mp_submod.o \
-           src/libtommath/bn_mp_sub_d.o \
-           src/libtommath/bn_mp_toom_mul.o \
-           src/libtommath/bn_mp_toom_sqr.o \
-           src/libtommath/bn_mp_toradix.o \
-           src/libtommath/bn_mp_toradix_n.o \
-           src/libtommath/bn_mp_to_signed_bin.o \
-           src/libtommath/bn_mp_to_signed_bin_n.o \
-           src/libtommath/bn_mp_to_unsigned_bin.o \
-           src/libtommath/bn_mp_to_unsigned_bin_n.o \
-           src/libtommath/bn_mp_unsigned_bin_size.o \
-           src/libtommath/bn_mp_xor.o \
-           src/libtommath/bn_mp_zero.o \
-           src/libtommath/bn_prime_tab.o \
-           src/libtommath/bn_reverse.o \
-           src/libtommath/bn_s_mp_add.o \
-           src/libtommath/bn_s_mp_exptmod.o \
-           src/libtommath/bn_s_mp_mul_digs.o \
-           src/libtommath/bn_s_mp_mul_high_digs.o \
-           src/libtommath/bn_s_mp_sqr.o \
-           src/libtommath/bn_s_mp_sub.o \
-           src/lzma/C/LzFind.o \
-           src/lzma/C/LzmaDec.o \
-           src/lzma/C/LzmaEnc.o \
-           src/pklib/explode.o \
-           src/pklib/implode.o \
-           src/zlib/adler32.o \
-           src/zlib/compress2.o \
-           src/zlib/crc32.o \
-           src/zlib/deflate.o \
-           src/zlib/inffast.o \
-           src/zlib/inflate.o \
-           src/zlib/inftrees.o \
-           src/zlib/trees.o \
-           src/zlib/zutil.o \
-           stormlib_dll/DllMain.o
-
-all: $(LIBRARY)
-
-#clean:
-#   rm -f $(OBJS) $(LIBRARY)
-
-#install: $(LIBRARY)
-#   install $(LIBRARY) /usr/local/lib
-#   mkdir -p /usr/local/include/StormLib
-#   cp StormLib.h /usr/local/include/StormLib
-#   cp StormPort.h /usr/local/include/StormLib
-
-$(LIBRARY): $(OBJS_C) $(OBJS_CPP)
-	$(CPP) $(CFLAGS) $(DFLAGS) -o $(LIBRARY) $(OBJS_C) $(OBJS_CPP)  $(LFLAGS)  
-	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJS_C) $(OBJS_CPP)
-
-$(OBJS_C): %.o: %.c
-	$(CC) -o $@ $(CFLAGS) $(DFLAGS) -c $<
-
-$(OBJS_CPP): %.o: %.cpp
-	$(CC) -o $@ $(CFLAGS) $(DFLAGS) -c $<
-
diff --git a/dep/StormLibOld/src/FileStream.cpp b/dep/StormLibOld/src/FileStream.cpp
deleted file mode 100644
index d34496868..000000000
--- a/dep/StormLibOld/src/FileStream.cpp
+++ /dev/null
@@ -1,2294 +0,0 @@
-/*****************************************************************************/
-/* FileStream.cpp                         Copyright (c) Ladislav Zezula 2010 */
-/*---------------------------------------------------------------------------*/
-/* File stream support for StormLib                                          */
-/*                                                                           */
-/* Windows support: Written by Ladislav Zezula                               */
-/* Mac support:     Written by Sam Wilkins                                   */
-/* Linux support:   Written by Sam Wilkins and Ivan Komissarov               */
-/* Big-endian:      Written & debugged by Sam Wilkins                        */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 11.06.10  1.00  Lad  Derived from StormPortMac.cpp and StormPortLinux.cpp */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-#include "FileStream.h"
-
-#ifdef _MSC_VER
-#pragma comment(lib, "wininet.lib")
-#endif
-
-//-----------------------------------------------------------------------------
-// Local defines
-
-#ifndef INVALID_HANDLE_VALUE
-#define INVALID_HANDLE_VALUE ((HANDLE)-1)
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(disable: 4800)                  // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
-#endif
-
-//-----------------------------------------------------------------------------
-// Local functions - platform-specific functions
-
-#ifndef PLATFORM_WINDOWS
-static int nLastError = ERROR_SUCCESS;
-
-int GetLastError()
-{
-    return nLastError;
-}
-
-void SetLastError(int nError)
-{
-    nLastError = nError;
-}
-#endif
-
-#ifndef PLATFORM_LITTLE_ENDIAN
-void ConvertPartHeader(void * partHeader)
-{
-    PPART_FILE_HEADER theHeader = (PPART_FILE_HEADER)partHeader;
-
-    theHeader->PartialVersion = SwapUInt32(theHeader->PartialVersion);
-    theHeader->Flags          = SwapUInt32(theHeader->Flags);
-    theHeader->FileSizeLo     = SwapUInt32(theHeader->FileSizeLo);
-    theHeader->FileSizeHi     = SwapUInt32(theHeader->FileSizeHi);
-    theHeader->BlockSize      = SwapUInt32(theHeader->BlockSize);
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// Preparing file bitmap for a complete file of a given size
-
-#define DEFAULT_BLOCK_SIZE 0x4000
-
-static bool Dummy_GetBitmap(
-        TFileStream * pStream,
-        TFileBitmap * pBitmap,
-        DWORD Length,
-        LPDWORD LengthNeeded)
-{
-    ULONGLONG FileSize = 0;
-    DWORD TotalLength;
-    DWORD BlockCount;
-    DWORD BitmapSize;
-    DWORD LastByte;
-    bool bResult = false;
-
-    // Get file size and calculate bitmap length
-    FileStream_GetSize(pStream, &FileSize);
-    BlockCount = (DWORD)(((FileSize - 1) / DEFAULT_BLOCK_SIZE) + 1);
-    BitmapSize = (DWORD)(((BlockCount - 1) / 8) + 1);
-
-    // Calculate and give the total length
-    TotalLength = sizeof(TFileBitmap) + BitmapSize;
-    if(LengthNeeded != NULL)
-        *LengthNeeded = TotalLength;
-
-    // Has the caller given enough space for storing the structure?
-    if(Length >= sizeof(TFileBitmap))
-    {
-        memset(pBitmap, 0, sizeof(TFileBitmap));
-        pBitmap->EndOffset  = FileSize;
-        pBitmap->IsComplete = 1;
-        pBitmap->BitmapSize = BitmapSize;
-        pBitmap->BlockSize  = DEFAULT_BLOCK_SIZE;
-        bResult = true;
-    }
-
-    // Do we have enough space to fill the bitmap as well?
-    if(Length >= TotalLength)
-    {
-        LPBYTE pbBitmap = (LPBYTE)(pBitmap + 1);
-
-        // Fill the full blocks
-        memset(pbBitmap, 0xFF, (BlockCount / 8));
-        pbBitmap += (BlockCount / 8);
-        bResult = true;
-
-        // Supply the last block
-        if(BlockCount & 7)
-        {
-            LastByte = (1 << (BlockCount & 7)) - 1;
-            pbBitmap[0] = (BYTE)LastByte;
-        }
-    }
-
-    return bResult;
-}
-
-//-----------------------------------------------------------------------------
-// Local functions - base file support
-
-static bool BaseFile_Read(
-        TFileStream * pStream,                  // Pointer to an open stream
-        ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
-        void * pvBuffer,                        // Pointer to data to be read
-        DWORD dwBytesToRead)                    // Number of bytes to read from the file
-{
-    ULONGLONG ByteOffset = (pByteOffset != NULL) ? *pByteOffset : pStream->Base.File.FilePos;
-    DWORD dwBytesRead = 0;                  // Must be set by platform-specific code
-
-#ifdef PLATFORM_WINDOWS
-    {
-        // Note: StormLib no longer supports Windows 9x.
-        // Thus, we can use the OVERLAPPED structure to specify
-        // file offset to read from file. This allows us to skip
-        // one system call to SetFilePointer
-
-        // Update the byte offset
-        pStream->Base.File.FilePos = ByteOffset;
-
-        // Read the data
-        if(dwBytesToRead != 0)
-        {
-            OVERLAPPED Overlapped;
-
-            Overlapped.OffsetHigh = (DWORD)(ByteOffset >> 32);
-            Overlapped.Offset = (DWORD)ByteOffset;
-            Overlapped.hEvent = NULL;
-            if(!ReadFile(pStream->Base.File.hFile, pvBuffer, dwBytesToRead, &dwBytesRead, &Overlapped))
-                return false;
-        }
-        /*
-        // If the byte offset is different from the current file position,
-        // we have to update the file position
-        if(ByteOffset != pStream->Base.File.FilePos)
-        {
-            LONG ByteOffsetHi = (LONG)(ByteOffset >> 32);
-
-            SetFilePointer(pStream->Base.File.hFile, (LONG)ByteOffset, &ByteOffsetHi, FILE_BEGIN);
-            pStream->Base.File.FilePos = ByteOffset;
-        }
-
-        // Read the data
-        if(dwBytesToRead != 0)
-        {
-            if(!ReadFile(pStream->Base.File.hFile, pvBuffer, dwBytesToRead, &dwBytesRead, NULL))
-                return false;
-        }
-*/
-    }
-#endif
-
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-    {
-        ssize_t bytes_read;
-
-        // If the byte offset is different from the current file position,
-        // we have to update the file position
-        if(ByteOffset != pStream->Base.File.FilePos)
-        {
-            lseek((intptr_t)pStream->Base.File.hFile, (off_t)(ByteOffset), SEEK_SET);
-            pStream->Base.File.FilePos = ByteOffset;
-        }
-
-        // Perform the read operation
-        if(dwBytesToRead != 0)
-        {
-            bytes_read = read((intptr_t)pStream->Base.File.hFile, pvBuffer, (size_t)dwBytesToRead);
-            if(bytes_read == -1)
-            {
-                nLastError = errno;
-                return false;
-            }
-
-            dwBytesRead = (DWORD)(size_t)bytes_read;
-        }
-    }
-#endif
-
-    // Increment the current file position by number of bytes read
-    // If the number of bytes read doesn't match to required amount, return false
-    pStream->Base.File.FilePos = ByteOffset + dwBytesRead;
-    if(dwBytesRead != dwBytesToRead)
-        SetLastError(ERROR_HANDLE_EOF);
-    return (dwBytesRead == dwBytesToRead);
-}
-
-/*
- * \a pStream Pointer to an open stream
- * \a pByteOffset Pointer to file byte offset. If NULL, writes to current position
- * \a pvBuffer Pointer to data to be written
- * \a dwBytesToWrite Number of bytes to write to the file
- */
-
-static bool BaseFile_Write(TFileStream * pStream, ULONGLONG * pByteOffset, const void * pvBuffer, DWORD dwBytesToWrite)
-{
-    ULONGLONG ByteOffset = (pByteOffset != NULL) ? *pByteOffset : pStream->Base.File.FilePos;
-    DWORD dwBytesWritten = 0;               // Must be set by platform-specific code
-
-#ifdef PLATFORM_WINDOWS
-    {
-        // Note: StormLib no longer supports Windows 9x.
-        // Thus, we can use the OVERLAPPED structure to specify
-        // file offset to read from file. This allows us to skip
-        // one system call to SetFilePointer
-
-        // Update the byte offset
-        pStream->Base.File.FilePos = ByteOffset;
-
-        // Read the data
-        if(dwBytesToWrite != 0)
-        {
-            OVERLAPPED Overlapped;
-
-            Overlapped.OffsetHigh = (DWORD)(ByteOffset >> 32);
-            Overlapped.Offset = (DWORD)ByteOffset;
-            Overlapped.hEvent = NULL;
-            if(!WriteFile(pStream->Base.File.hFile, pvBuffer, dwBytesToWrite, &dwBytesWritten, &Overlapped))
-                return false;
-        }
-        /*
-        // If the byte offset is different from the current file position,
-        // we have to update the file position
-        if(ByteOffset != pStream->Base.File.FilePos)
-        {
-            LONG ByteOffsetHi = (LONG)(ByteOffset >> 32);
-
-            SetFilePointer(pStream->Base.File.hFile, (LONG)ByteOffset, &ByteOffsetHi, FILE_BEGIN);
-            pStream->Base.File.FilePos = ByteOffset;
-        }
-
-        // Read the data
-        if(dwBytesToWrite != 0)
-        {
-        if(!WriteFile(pStream->Base.File.hFile, pvBuffer, dwBytesToWrite, &dwBytesWritten, NULL))
-            return false;
-    }
-*/
-    }
-#endif
-
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-    {
-        ssize_t bytes_written;
-
-        // If the byte offset is different from the current file position,
-        // we have to update the file position
-        if(ByteOffset != pStream->Base.File.FilePos)
-        {
-            lseek((intptr_t)pStream->Base.File.hFile, (off_t)(ByteOffset), SEEK_SET);
-            pStream->Base.File.FilePos = ByteOffset;
-        }
-
-        // Perform the read operation
-        bytes_written = write((intptr_t)pStream->Base.File.hFile, pvBuffer, (size_t)dwBytesToWrite);
-        if(bytes_written == -1)
-        {
-            nLastError = errno;
-            return false;
-        }
-
-        dwBytesWritten = (DWORD)(size_t)bytes_written;
-    }
-#endif
-
-    // Increment the current file position by number of bytes read
-    pStream->Base.File.FilePos = ByteOffset + dwBytesWritten;
-
-    // Also modify the file size, if needed
-    if(pStream->Base.File.FilePos > pStream->Base.File.FileSize)
-        pStream->Base.File.FileSize = pStream->Base.File.FilePos;
-
-    if(dwBytesWritten != dwBytesToWrite)
-        SetLastError(ERROR_DISK_FULL);
-    return (dwBytesWritten == dwBytesToWrite);
-}
-
-static bool BaseFile_GetPos(
-        TFileStream * pStream,                  // Pointer to an open stream
-        ULONGLONG * pByteOffset)                // Pointer to file byte offset
-{
-    *pByteOffset = pStream->Base.File.FilePos;
-    return true;
-}
-
-static bool BaseFile_GetSize(
-        TFileStream * pStream,                  // Pointer to an open stream
-        ULONGLONG * pFileSize)                  // Pointer where to store file size
-{
-    *pFileSize = pStream->Base.File.FileSize;
-    return true;
-}
-
-/*
- * \a pStream Pointer to an open stream
- * \a NewFileSize New size of the file
- */
-static bool BaseFile_SetSize(TFileStream * pStream, ULONGLONG NewFileSize)
-{
-#ifdef PLATFORM_WINDOWS
-    {
-        LONG FileSizeHi = (LONG)(NewFileSize >> 32);
-        LONG FileSizeLo;
-        DWORD dwNewPos;
-        bool bResult;
-
-        // Set the position at the new file size
-        dwNewPos = SetFilePointer(pStream->Base.File.hFile, (LONG)NewFileSize, &FileSizeHi, FILE_BEGIN);
-        if(dwNewPos == INVALID_SET_FILE_POINTER && GetLastError() != ERROR_SUCCESS)
-            return false;
-
-        // Set the current file pointer as the end of the file
-        bResult = (bool)SetEndOfFile(pStream->Base.File.hFile);
-
-        // Restore the file position
-        FileSizeHi = (LONG)(pStream->Base.File.FilePos >> 32);
-        FileSizeLo = (LONG)(pStream->Base.File.FilePos);
-        SetFilePointer(pStream->Base.File.hFile, FileSizeLo, &FileSizeHi, FILE_BEGIN);
-        return bResult;
-    }
-#endif
-
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-    {
-        if(ftruncate((intptr_t)pStream->Base.File.hFile, (off_t)NewFileSize) == -1)
-        {
-            nLastError = errno;
-            return false;
-        }
-
-        return true;
-    }
-#endif
-}
-
-static bool BaseFile_GetTime(TFileStream * pStream, ULONGLONG * pFileTime)
-{
-    *pFileTime = pStream->Base.File.FileTime;
-    return true;
-}
-
-// Renames the file pointed by pStream so that it contains data from pNewStream
-static bool BaseFile_Switch(TFileStream * pStream, TFileStream * pNewStream)
-{
-#ifdef PLATFORM_WINDOWS
-    // Delete the original stream file. Don't check the result value,
-    // because if the file doesn't exist, it would fail
-    DeleteFile(pStream->szFileName);
-
-    // Rename the new file to the old stream's file
-    return (bool)MoveFile(pNewStream->szFileName, pStream->szFileName);
-#endif
-
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-    // "rename" on Linux also works if the target file exists
-    if(rename(pNewStream->szFileName, pStream->szFileName) == -1)
-    {
-        nLastError = errno;
-        return false;
-    }
-
-    return true;
-#endif
-}
-
-static void BaseFile_Close(TFileStream * pStream)
-{
-    if(pStream->Base.File.hFile != INVALID_HANDLE_VALUE)
-    {
-#ifdef PLATFORM_WINDOWS
-        CloseHandle(pStream->Base.File.hFile);
-#endif
-
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-        close((intptr_t)pStream->Base.File.hFile);
-#endif
-    }
-
-    // Also invalidate the handle
-    pStream->Base.File.hFile = INVALID_HANDLE_VALUE;
-}
-
-static bool BaseFile_Create(
-        TFileStream * pStream,
-        const TCHAR * szFileName,
-        DWORD dwStreamFlags)
-{
-#ifdef PLATFORM_WINDOWS
-    {
-        DWORD dwWriteShare = (dwStreamFlags & STREAM_FLAG_WRITE_SHARE) ? FILE_SHARE_WRITE : 0;
-
-        pStream->Base.File.hFile = CreateFile(szFileName,
-                                              GENERIC_READ | GENERIC_WRITE,
-                                              dwWriteShare | FILE_SHARE_READ,
-                                              NULL,
-                                              CREATE_ALWAYS,
-                                              0,
-                                              NULL);
-        if(pStream->Base.File.hFile == INVALID_HANDLE_VALUE)
-            return false;
-    }
-#endif
-
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-    {
-        intptr_t handle;
-
-        handle = open(szFileName, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-        if(handle == -1)
-        {
-            nLastError = errno;
-            return false;
-        }
-
-        pStream->Base.File.hFile = (HANDLE)handle;
-    }
-#endif
-
-    // Fill-in the entry points
-    pStream->BaseRead    = BaseFile_Read;
-    pStream->BaseWrite   = BaseFile_Write;
-    pStream->BaseGetPos  = BaseFile_GetPos;
-    pStream->BaseGetSize = BaseFile_GetSize;
-    pStream->BaseSetSize = BaseFile_SetSize;
-    pStream->BaseSetSize = BaseFile_SetSize;
-    pStream->BaseGetTime = BaseFile_GetTime;
-    pStream->BaseClose   = BaseFile_Close;
-
-    // Reset the file position
-    pStream->Base.File.FileSize = 0;
-    pStream->Base.File.FilePos = 0;
-    pStream->dwFlags = dwStreamFlags;
-    return true;
-}
-
-static bool BaseFile_Open(
-        TFileStream * pStream,
-        const TCHAR * szFileName,
-        DWORD dwStreamFlags)
-{
-#ifdef PLATFORM_WINDOWS
-    {
-        ULARGE_INTEGER FileSize;
-        DWORD dwDesiredAccess = (dwStreamFlags & STREAM_FLAG_READ_ONLY) ? GENERIC_READ : GENERIC_ALL;
-        DWORD dwWriteShare = (dwStreamFlags & STREAM_FLAG_WRITE_SHARE) ? FILE_SHARE_WRITE : 0;
-
-        // Open the file
-        pStream->Base.File.hFile = CreateFile(szFileName,
-                                              dwDesiredAccess,
-                                              dwWriteShare | FILE_SHARE_READ,
-                                              NULL,
-                                              OPEN_EXISTING,
-                                              0,
-                                              NULL);
-        if(pStream->Base.File.hFile == INVALID_HANDLE_VALUE)
-            return false;
-
-        // Query the file size
-        FileSize.LowPart = GetFileSize(pStream->Base.File.hFile, &FileSize.HighPart);
-        pStream->Base.File.FileSize = FileSize.QuadPart;
-
-        // Query last write time
-        GetFileTime(pStream->Base.File.hFile, NULL, NULL, (LPFILETIME)&pStream->Base.File.FileTime);
-    }
-#endif
-
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-    {
-        struct stat fileinfo;
-        int oflag = (dwStreamFlags & STREAM_FLAG_READ_ONLY) ? O_RDONLY : O_RDWR;
-        intptr_t handle;
-
-        // Open the file
-        handle = open(szFileName, oflag);
-        if(handle == -1)
-        {
-            nLastError = errno;
-            return false;
-        }
-
-        // Get the file size
-        if(fstat(handle, &fileinfo) == -1)
-        {
-            nLastError = errno;
-            return false;
-        }
-
-        // time_t is number of seconds since 1.1.1970, UTC.
-        // 1 second = 10000000 (decimal) in FILETIME
-        // Set the start to 1.1.1970 00:00:00
-        pStream->Base.File.FileTime = 0x019DB1DED53E8000ULL + (10000000 * fileinfo.st_mtime);
-        pStream->Base.File.FileSize = (ULONGLONG)fileinfo.st_size;
-        pStream->Base.File.hFile = (HANDLE)handle;
-    }
-#endif
-
-    // Fill-in the entry points
-    pStream->BaseRead    = BaseFile_Read;
-    pStream->BaseWrite   = BaseFile_Write;
-    pStream->BaseGetPos  = BaseFile_GetPos;
-    pStream->BaseGetSize = BaseFile_GetSize;
-    pStream->BaseSetSize = BaseFile_SetSize;
-    pStream->BaseGetTime = BaseFile_GetTime;
-    pStream->BaseClose   = BaseFile_Close;
-
-    // Reset the file position
-    pStream->Base.File.FilePos = 0;
-    pStream->dwFlags = dwStreamFlags;
-    return true;
-}
-
-//-----------------------------------------------------------------------------
-// Local functions - base memory-mapped file support
-
-static bool BaseMap_Read(
-        TFileStream * pStream,                  // Pointer to an open stream
-        ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
-        void * pvBuffer,                        // Pointer to data to be read
-        DWORD dwBytesToRead)                    // Number of bytes to read from the file
-{
-    ULONGLONG ByteOffset = (pByteOffset != NULL) ? *pByteOffset : pStream->Base.Map.FilePos;
-
-    // Do we have to read anything at all?
-    if(dwBytesToRead != 0)
-    {
-        // Don't allow reading past file size
-        if((ByteOffset + dwBytesToRead) > pStream->Base.Map.FileSize)
-            return false;
-
-        // Copy the required data
-        memcpy(pvBuffer, pStream->Base.Map.pbFile + (size_t)ByteOffset, dwBytesToRead);
-    }
-
-    // Move the current file position
-    pStream->Base.Map.FilePos += dwBytesToRead;
-    return true;
-}
-
-static bool BaseMap_GetPos(
-        TFileStream * pStream,                  // Pointer to an open stream
-        ULONGLONG * pByteOffset)                // Pointer to file byte offset
-{
-    *pByteOffset = pStream->Base.Map.FilePos;
-    return true;
-}
-
-static bool BaseMap_GetSize(
-        TFileStream * pStream,                  // Pointer to an open stream
-        ULONGLONG * pFileSize)                  // Pointer where to store file size
-{
-    *pFileSize = pStream->Base.Map.FileSize;
-    return true;
-}
-
-static bool BaseMap_GetTime(TFileStream * pStream, ULONGLONG * pFileTime)
-{
-    *pFileTime = pStream->Base.Map.FileTime;
-    return true;
-}
-
-static void BaseMap_Close(TFileStream * pStream)
-{
-#ifdef PLATFORM_WINDOWS
-    if(pStream->Base.Map.pbFile != NULL)
-        UnmapViewOfFile(pStream->Base.Map.pbFile);
-#endif
-
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-    if(pStream->Base.Map.pbFile != NULL)
-        munmap(pStream->Base.Map.pbFile, (size_t )pStream->Base.Map.FileSize);
-#endif
-
-    pStream->Base.Map.pbFile = NULL;
-}
-
-static bool BaseMap_Open(
-        TFileStream * pStream,
-        const TCHAR * szFileName,
-        DWORD dwStreamFlags)
-{
-#ifdef PLATFORM_WINDOWS
-
-    ULARGE_INTEGER FileSize;
-    HANDLE hFile;
-    HANDLE hMap;
-    bool bResult = false;
-
-    // Open the file for read access
-    hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
-    if(hFile != NULL)
-    {
-        // Retrieve file size. Don't allow mapping file of a zero size.
-        FileSize.LowPart = GetFileSize(hFile, &FileSize.HighPart);
-        if(FileSize.QuadPart != 0)
-        {
-            // Retrieve file time
-            GetFileTime(hFile, NULL, NULL, (LPFILETIME)&pStream->Base.Map.FileTime);
-
-            // Now create mapping object
-            hMap = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
-            if(hMap != NULL)
-            {
-                // Map the entire view into memory
-                // Note that this operation will fail if the file can't fit
-                // into usermode address space
-                pStream->Base.Map.pbFile = (LPBYTE)MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0);
-                if(pStream->Base.Map.pbFile != NULL)
-                {
-                    pStream->Base.Map.FileSize = FileSize.QuadPart;
-                    pStream->Base.Map.FilePos = 0;
-                    bResult = true;
-                }
-
-                // Close the map handle
-                CloseHandle(hMap);
-            }
-        }
-
-        // Close the file handle
-        CloseHandle(hFile);
-    }
-
-    // If the file is not there and is not available for random access,
-    // report error
-    if(bResult == false)
-        return false;
-#endif
-
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-    struct stat fileinfo;
-    intptr_t handle;
-    bool bResult = false;
-
-    // Open the file
-    handle = open(szFileName, O_RDONLY);
-    if(handle != -1)
-    {
-        // Get the file size
-        if(fstat(handle, &fileinfo) != -1)
-        {
-            pStream->Base.Map.pbFile = (LPBYTE)mmap(NULL, (size_t)fileinfo.st_size, PROT_READ, MAP_PRIVATE, handle, 0);
-            if(pStream->Base.Map.pbFile != NULL)
-            {
-                // time_t is number of seconds since 1.1.1970, UTC.
-                // 1 second = 10000000 (decimal) in FILETIME
-                // Set the start to 1.1.1970 00:00:00
-                pStream->Base.Map.FileTime = 0x019DB1DED53E8000ULL + (10000000 * fileinfo.st_mtime);
-                pStream->Base.Map.FileSize = (ULONGLONG)fileinfo.st_size;
-                pStream->Base.Map.FilePos = 0;
-                bResult = true;
-            }
-        }
-        close(handle);
-    }
-
-    // Did the mapping fail?
-    if(bResult == false)
-    {
-        nLastError = errno;
-        return false;
-    }
-#endif
-
-    // Fill-in entry points
-    pStream->BaseRead    = BaseMap_Read;
-    pStream->BaseGetPos  = BaseMap_GetPos;
-    pStream->BaseGetSize = BaseMap_GetSize;
-    pStream->BaseGetTime = BaseMap_GetTime;
-    pStream->BaseClose   = BaseMap_Close;
-    pStream->dwFlags = dwStreamFlags;
-    return true;
-}
-
-//-----------------------------------------------------------------------------
-// Local functions - base HTTP file support
-
-static const TCHAR * BaseHttp_ExtractServerName(const TCHAR * szFileName, TCHAR * szServerName)
-{
-    // Check for HTTP
-    if(!_tcsnicmp(szFileName, _T("http://"), 7))
-        szFileName += 7;
-
-    // Cut off the server name
-    if(szServerName != NULL)
-    {
-        while(szFileName[0] != 0 && szFileName[0] != _T('/'))
-            *szServerName++ = *szFileName++;
-        *szServerName = 0;
-    }
-    else
-    {
-        while(szFileName[0] != 0 && szFileName[0] != _T('/'))
-            *szFileName++;
-    }
-
-    // Return the remainder
-    return szFileName;
-}
-
-static bool BaseHttp_Read(
-        TFileStream * pStream,                  // Pointer to an open stream
-        ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
-        void * pvBuffer,                        // Pointer to data to be read
-        DWORD dwBytesToRead)                    // Number of bytes to read from the file
-{
-#ifdef PLATFORM_WINDOWS
-    ULONGLONG ByteOffset = (pByteOffset != NULL) ? *pByteOffset : pStream->Base.Http.FilePos;
-    DWORD dwTotalBytesRead = 0;
-
-    // Do we have to read anything at all?
-    if(dwBytesToRead != 0)
-    {
-        HINTERNET hRequest;
-        LPCTSTR szFileName;
-        LPBYTE pbBuffer = (LPBYTE)pvBuffer;
-        TCHAR szRangeRequest[0x80];
-        DWORD dwStartOffset = (DWORD)ByteOffset;
-        DWORD dwEndOffset = dwStartOffset + dwBytesToRead;
-        BYTE Buffer[0x200];
-
-        // Open HTTP request to the file
-        szFileName = BaseHttp_ExtractServerName(pStream->szFileName, NULL);
-        hRequest = HttpOpenRequest(pStream->Base.Http.hConnect, _T("GET"), szFileName, NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0);
-        if(hRequest != NULL)
-        {
-            // Add range request to the HTTP headers
-            // http://www.clevercomponents.com/articles/article015/resuming.asp
-            _stprintf(szRangeRequest, _T("Range: bytes=%d-%d"), dwStartOffset, dwEndOffset);
-            HttpAddRequestHeaders(hRequest, szRangeRequest, 0xFFFFFFFF, HTTP_ADDREQ_FLAG_ADD_IF_NEW);
-
-            // Send the request to the server
-            if(HttpSendRequest(hRequest, NULL, 0, NULL, 0))
-            {
-                while(dwTotalBytesRead < dwBytesToRead)
-                {
-                    DWORD dwBlockBytesToRead = dwBytesToRead - dwTotalBytesRead;
-                    DWORD dwBlockBytesRead = 0;
-
-                    // Read the block from the file
-                    if(dwBlockBytesToRead > sizeof(Buffer))
-                        dwBlockBytesToRead = sizeof(Buffer);
-                    InternetReadFile(hRequest, pbBuffer, dwBlockBytesToRead, &dwBlockBytesRead);
-
-                    // Check for end
-                    if(dwBlockBytesRead == 0)
-                        break;
-
-                    // Move buffers
-                    dwTotalBytesRead += dwBlockBytesRead;
-                    pbBuffer += dwBlockBytesRead;
-                }
-            }
-            InternetCloseHandle(hRequest);
-        }
-    }
-
-    // Increment the current file position by number of bytes read
-    pStream->Base.Http.FilePos = ByteOffset + dwTotalBytesRead;
-
-    // If the number of bytes read doesn't match the required amount, return false
-    if(dwTotalBytesRead != dwBytesToRead)
-        SetLastError(ERROR_HANDLE_EOF);
-    return (dwTotalBytesRead == dwBytesToRead);
-
-#else
-
-    // Not supported
-    pStream = pStream;
-    pByteOffset = pByteOffset;
-    pvBuffer = pvBuffer;
-    dwBytesToRead = dwBytesToRead;
-    SetLastError(ERROR_NOT_SUPPORTED);
-    return false;
-
-#endif
-}
-
-static bool BaseHttp_GetPos(
-        TFileStream * pStream,                  // Pointer to an open stream
-        ULONGLONG * pByteOffset)                // Pointer to file byte offset
-{
-    *pByteOffset = pStream->Base.Http.FilePos;
-    return true;
-}
-
-static bool BaseHttp_GetSize(
-        TFileStream * pStream,                  // Pointer to an open stream
-        ULONGLONG * pFileSize)                  // Pointer where to store file size
-{
-    *pFileSize = pStream->Base.Http.FileSize;
-    return true;
-}
-
-static bool BaseHttp_GetTime(TFileStream * pStream, ULONGLONG * pFileTime)
-{
-    *pFileTime = pStream->Base.Http.FileTime;
-    return true;
-}
-
-static void BaseHttp_Close(TFileStream * pStream)
-{
-#ifdef PLATFORM_WINDOWS
-    if(pStream->Base.Http.hConnect != NULL)
-        InternetCloseHandle(pStream->Base.Http.hConnect);
-    pStream->Base.Http.hConnect = NULL;
-
-    if(pStream->Base.Http.hInternet != NULL)
-        InternetCloseHandle(pStream->Base.Http.hInternet);
-    pStream->Base.Http.hInternet = NULL;
-#else
-    pStream = pStream;
-#endif
-}
-
-static bool BaseHttp_Open(
-        TFileStream * pStream,
-        const TCHAR * szFileName,
-        DWORD dwStreamFlags)
-{
-#ifdef PLATFORM_WINDOWS
-
-    HINTERNET hRequest;
-    DWORD dwTemp = 0;
-    bool bFileAvailable = false;
-    int nError = ERROR_SUCCESS;
-
-    // Don't connect to the internet
-    if(!InternetGetConnectedState(&dwTemp, 0))
-        nError = GetLastError();
-
-    // Initiate the connection to the internet
-    if(nError == ERROR_SUCCESS)
-    {
-        pStream->Base.Http.hInternet = InternetOpen(_T("StormLib HTTP MPQ reader"),
-                                                    INTERNET_OPEN_TYPE_PRECONFIG,
-                                                    NULL,
-                                                    NULL,
-                                                    0);
-        if(pStream->Base.Http.hInternet == NULL)
-            nError = GetLastError();
-    }
-
-    // Connect to the server
-    if(nError == ERROR_SUCCESS)
-    {
-        TCHAR szServerName[MAX_PATH];
-        DWORD dwFlags = INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_NO_UI | INTERNET_FLAG_NO_CACHE_WRITE;
-
-        // Initiate connection with the server
-        szFileName = BaseHttp_ExtractServerName(szFileName, szServerName);
-        pStream->Base.Http.hConnect = InternetConnect(pStream->Base.Http.hInternet,
-                                                      szServerName,
-                                                      INTERNET_DEFAULT_HTTP_PORT,
-                                                      NULL,
-                                                      NULL,
-                                                      INTERNET_SERVICE_HTTP,
-                                                      dwFlags,
-                                                      0);
-        if(pStream->Base.Http.hConnect == NULL)
-            nError = GetLastError();
-    }
-
-    // Now try to query the file size
-    if(nError == ERROR_SUCCESS)
-    {
-        // Open HTTP request to the file
-        hRequest = HttpOpenRequest(pStream->Base.Http.hConnect, _T("GET"), szFileName, NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0);
-        if(hRequest != NULL)
-        {
-            if(HttpSendRequest(hRequest, NULL, 0, NULL, 0))
-            {
-                ULONGLONG FileTime = 0;
-                DWORD dwFileSize = 0;
-                DWORD dwDataSize;
-                DWORD dwIndex = 0;
-
-                // Check if the MPQ has Last Modified field
-                dwDataSize = sizeof(ULONGLONG);
-                if(HttpQueryInfo(hRequest, HTTP_QUERY_LAST_MODIFIED | HTTP_QUERY_FLAG_SYSTEMTIME, &FileTime, &dwDataSize, &dwIndex))
-                    pStream->Base.Http.FileTime = FileTime;
-
-                // Verify if the server supports random access
-                dwDataSize = sizeof(DWORD);
-                if(HttpQueryInfo(hRequest, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwFileSize, &dwDataSize, &dwIndex))
-                {
-                    if(dwFileSize != 0)
-                    {
-                        pStream->Base.Http.FileSize = dwFileSize;
-                        pStream->Base.Http.FilePos = 0;
-                        bFileAvailable = true;
-                    }
-                }
-            }
-            InternetCloseHandle(hRequest);
-        }
-    }
-
-    // If the file is not there and is not available for random access,
-    // report error
-    if(bFileAvailable == false)
-    {
-        BaseHttp_Close(pStream);
-        return false;
-    }
-
-    // Fill-in entry points
-    pStream->BaseRead    = BaseHttp_Read;
-    pStream->BaseGetPos  = BaseHttp_GetPos;
-    pStream->BaseGetSize = BaseHttp_GetSize;
-    pStream->BaseGetTime = BaseHttp_GetTime;
-    pStream->BaseClose   = BaseHttp_Close;
-    pStream->dwFlags = dwStreamFlags;
-    return true;
-
-#else
-
-    // Not supported
-    pStream = pStream;
-    szFileName = szFileName;
-    SetLastError(ERROR_NOT_SUPPORTED);
-    return false;
-
-#endif
-}
-
-//-----------------------------------------------------------------------------
-// Local functions - linear stream support
-
-static bool LinearStream_Read(
-        TLinearStream * pStream,                // Pointer to an open stream
-        ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
-        void * pvBuffer,                        // Pointer to data to be read
-        DWORD dwBytesToRead)                    // Number of bytes to read from the file
-{
-    ULONGLONG ByteOffset;
-    ULONGLONG EndOffset;
-    LPBYTE pbBitmap;
-    DWORD BlockIndex;
-    DWORD ByteIndex;
-    DWORD BitMask;
-
-    // At this point, we must have a bitmap set
-    assert(pStream->pBitmap != NULL);
-
-    // If we have data map, we must check if the data block is present in the MPQ
-    if(dwBytesToRead != 0)
-    {
-        DWORD BlockSize = pStream->pBitmap->BlockSize;
-
-        // Get the offset where we read it from
-        if(pByteOffset == NULL)
-            pStream->BaseGetPos(pStream, &ByteOffset);
-        else
-            ByteOffset = *pByteOffset;
-        EndOffset = ByteOffset + dwBytesToRead;
-
-        // If the start of the area is within the region
-        // protected by data map, check each block
-        if(ByteOffset < pStream->pBitmap->EndOffset)
-        {
-            // Cut the end of the stream protected by the data map
-            EndOffset = STORMLIB_MIN(EndOffset, pStream->pBitmap->EndOffset);
-
-            // Calculate the initial block index
-            BlockIndex = (DWORD)(ByteOffset / BlockSize);
-            pbBitmap = (LPBYTE)(pStream->pBitmap + 1);
-
-            // Parse each block
-            while(ByteOffset < EndOffset)
-            {
-                // Prepare byte index and bit mask
-                ByteIndex = BlockIndex / 8;
-                BitMask = 1 << (BlockIndex & 0x07);
-
-                // If that bit is not set, it means that the block is not present
-                if((pbBitmap[ByteIndex] & BitMask) == 0)
-                {
-                    SetLastError(ERROR_FILE_CORRUPT);
-                    return false;
-                }
-
-                // Move to tne next block
-                ByteOffset += BlockSize;
-                BlockIndex++;
-            }
-        }
-    }
-
-    // Now if all tests passed, we can call the base read function
-    return pStream->BaseRead(pStream, pByteOffset, pvBuffer, dwBytesToRead);
-}
-
-static bool LinearStream_Switch(TLinearStream * pStream, TLinearStream * pNewStream)
-{
-    // Sanity checks
-    assert((pNewStream->dwFlags & STREAM_PROVIDER_MASK) == STREAM_PROVIDER_LINEAR);
-    assert((pNewStream->dwFlags & BASE_PROVIDER_MASK) == BASE_PROVIDER_FILE);
-    assert((pStream->dwFlags & STREAM_PROVIDER_MASK) == STREAM_PROVIDER_LINEAR);
-    assert((pStream->dwFlags & BASE_PROVIDER_MASK) == BASE_PROVIDER_FILE);
-
-    // Close the new stream
-    pNewStream->BaseClose(pNewStream);
-
-    // Close the source stream
-    pStream->BaseClose(pStream);
-
-    // Rename the new data source file to the existing file
-    if(!BaseFile_Switch(pStream, pNewStream))
-        return false;
-
-    // Now we have to open the "pStream" again
-    if(!BaseFile_Open(pStream, pStream->szFileName, pNewStream->dwFlags))
-        return false;
-
-    // We need to cleanup the new data stream
-    FileStream_Close(pNewStream);
-    return true;
-}
-
-static bool LinearStream_GetBitmap(
-        TLinearStream * pStream,
-        TFileBitmap * pBitmap,
-        DWORD Length,
-        LPDWORD LengthNeeded)
-{
-    DWORD TotalLength;
-    bool bResult = false;
-
-    // Assumed that we have bitmap now
-    assert(pStream->pBitmap != NULL);
-
-    // Give the bitmap length
-    TotalLength = sizeof(TFileBitmap) + pStream->pBitmap->BitmapSize;
-    if(LengthNeeded != NULL)
-        *LengthNeeded = TotalLength;
-
-    // Do we have enough space to fill at least the bitmap structure?
-    if(Length >= sizeof(TFileBitmap))
-    {
-        // Enough space for complete bitmap?
-        if(Length >= TotalLength)
-        {
-            memcpy(pBitmap, pStream->pBitmap, TotalLength);
-            bResult = true;
-        }
-        else
-        {
-            memcpy(pBitmap, pStream->pBitmap, sizeof(TFileBitmap));
-            bResult = true;
-        }
-    }
-
-    return bResult;
-}
-
-static void LinearStream_Close(TLinearStream * pStream)
-{
-    // Free the data map, if any
-    if(pStream->pBitmap != NULL)
-        STORM_FREE(pStream->pBitmap);
-    pStream->pBitmap = NULL;
-
-    // Call the base class for closing the stream
-    return pStream->BaseClose(pStream);
-}
-
-static bool LinearStream_Open(TLinearStream * pStream)
-{
-    // No extra work here really; just set entry points
-    pStream->StreamRead    = pStream->BaseRead;
-    pStream->StreamWrite   = pStream->BaseWrite;
-    pStream->StreamGetPos  = pStream->BaseGetPos;
-    pStream->StreamGetSize = pStream->BaseGetSize;
-    pStream->StreamSetSize = pStream->BaseSetSize;
-    pStream->StreamGetTime = pStream->BaseGetTime;
-    pStream->StreamGetBmp  = (STREAM_GETBMP)Dummy_GetBitmap;
-    pStream->StreamSwitch  = (STREAM_SWITCH)LinearStream_Switch;
-    pStream->StreamClose   = (STREAM_CLOSE)LinearStream_Close;
-    return true;
-}
-
-//-----------------------------------------------------------------------------
-// Local functions - partial stream support
-
-static bool IsPartHeader(PPART_FILE_HEADER pPartHdr)
-{
-    // Version number must be 2
-    if(pPartHdr->PartialVersion == 2)
-    {
-        // GameBuildNumber must be an ASCII number
-        if(isdigit(pPartHdr->GameBuildNumber[0]) && isdigit(pPartHdr->GameBuildNumber[1]) && isdigit(pPartHdr->GameBuildNumber[2]))
-        {
-            // Block size must be power of 2
-            if((pPartHdr->BlockSize & (pPartHdr->BlockSize - 1)) == 0)
-                return true;
-        }
-    }
-
-    return false;
-}
-
-static bool PartialStream_Read(
-        TPartialStream * pStream,
-        ULONGLONG * pByteOffset,
-        void * pvBuffer,
-        DWORD dwBytesToRead)
-{
-    ULONGLONG RawByteOffset;
-    LPBYTE pbBuffer = (LPBYTE)pvBuffer;
-    DWORD dwBytesRemaining = dwBytesToRead;
-    DWORD dwPartOffset;
-    DWORD dwPartIndex;
-    DWORD dwBytesRead = 0;
-    DWORD dwBlockSize = pStream->BlockSize;
-    bool bResult = false;
-    int nFailReason = ERROR_HANDLE_EOF;             // Why it failed if not enough bytes was read
-
-    // If the byte offset is not entered, use the current position
-    if(pByteOffset == NULL)
-        pByteOffset = &pStream->VirtualPos;
-
-    // Check if the file position is not at or beyond end of the file
-    if(*pByteOffset >= pStream->VirtualSize)
-    {
-        SetLastError(ERROR_HANDLE_EOF);
-        return false;
-    }
-
-    // Get the part index where the read offset is
-    // Note that the part index should now be within the range,
-    // as read requests beyond-EOF are handled by the previous test
-    dwPartIndex = (DWORD)(*pByteOffset / pStream->BlockSize);
-    assert(dwPartIndex < pStream->BlockCount);
-
-    // If the number of bytes remaining goes past
-    // the end of the file, cut them
-    if((*pByteOffset + dwBytesRemaining) > pStream->VirtualSize)
-        dwBytesRemaining = (DWORD)(pStream->VirtualSize - *pByteOffset);
-
-    // Calculate the offset in the current part
-    dwPartOffset = (DWORD)(*pByteOffset) & (pStream->BlockSize - 1);
-
-    // Read all data, one part at a time
-    while(dwBytesRemaining != 0)
-    {
-        PPART_FILE_MAP_ENTRY PartMap = pStream->PartMap + dwPartIndex;
-        DWORD dwBytesInPart;
-
-        // If the part is not present in the file, we fail the read
-        if((PartMap->Flags & 3) == 0)
-        {
-            nFailReason = ERROR_FILE_CORRUPT;
-            bResult = false;
-            break;
-        }
-
-        // If we are in the last part, we have to cut the number of bytes in the last part
-        if(dwPartIndex == pStream->BlockCount - 1)
-            dwBlockSize = (DWORD)pStream->VirtualSize & (pStream->BlockSize - 1);
-
-        // Get the number of bytes reamining in the current part
-        dwBytesInPart = dwBlockSize - dwPartOffset;
-
-        // Compute the raw file offset of the file part
-        RawByteOffset = MAKE_OFFSET64(PartMap->BlockOffsHi, PartMap->BlockOffsLo);
-        if(RawByteOffset == 0)
-        {
-            nFailReason = ERROR_FILE_CORRUPT;
-            bResult = false;
-            break;
-        }
-
-        // If the number of bytes in part is too big, cut it
-        if(dwBytesInPart > dwBytesRemaining)
-            dwBytesInPart = dwBytesRemaining;
-
-        // Append the offset within the part
-        RawByteOffset += dwPartOffset;
-        if(!pStream->BaseRead(pStream, &RawByteOffset, pbBuffer, dwBytesInPart))
-        {
-            nFailReason = ERROR_FILE_CORRUPT;
-            bResult = false;
-            break;
-        }
-
-        // Increment the file position
-        dwBytesRemaining -= dwBytesInPart;
-        dwBytesRead += dwBytesInPart;
-        pbBuffer += dwBytesInPart;
-
-        // Move to the next file part
-        dwPartOffset = 0;
-        dwPartIndex++;
-    }
-
-    // Move the file position by the number of bytes read
-    pStream->VirtualPos = *pByteOffset + dwBytesRead;
-    if(dwBytesRead != dwBytesToRead)
-        SetLastError(nFailReason);
-    return (dwBytesRead == dwBytesToRead);
-}
-
-static bool PartialStream_GetPos(
-        TPartialStream * pStream,
-        ULONGLONG & ByteOffset)
-{
-    ByteOffset = pStream->VirtualPos;
-    return true;
-}
-
-static bool PartialStream_GetSize(
-        TPartialStream * pStream,               // Pointer to an open stream
-        ULONGLONG & FileSize)                   // Pointer where to store file size
-{
-    FileSize = pStream->VirtualSize;
-    return true;
-}
-
-static bool PartialStream_GetBitmap(
-        TPartialStream * pStream,
-        TFileBitmap * pBitmap,
-        DWORD Length,
-        LPDWORD LengthNeeded)
-{
-    LPBYTE pbBitmap;
-    DWORD TotalLength;
-    DWORD BitmapSize = 0;
-    DWORD ByteOffset;
-    DWORD BitMask;
-    bool bResult = false;
-
-    // Do we have stream bitmap?
-    BitmapSize = ((pStream->BlockCount - 1) / 8) + 1;
-
-    // Give the bitmap length
-    TotalLength = sizeof(TFileBitmap) + BitmapSize;
-    if(LengthNeeded != NULL)
-        *LengthNeeded = TotalLength;
-
-    // Do we have enough to fill at least the header?
-    if(Length >= sizeof(TFileBitmap))
-    {
-        // Fill the bitmap header
-        pBitmap->StartOffset = 0;
-        pBitmap->EndOffset  = pStream->VirtualSize;
-        pBitmap->IsComplete = 1;
-        pBitmap->BitmapSize = BitmapSize;
-        pBitmap->BlockSize = pStream->BlockSize;
-        pBitmap->Reserved = 0;
-
-        // Is there at least one incomplete block?
-        for(DWORD i = 0; i < pStream->BlockCount; i++)
-        {
-            if(pStream->PartMap[i].Flags != 3)
-            {
-                pBitmap->IsComplete = 0;
-                break;
-            }
-        }
-
-        bResult = true;
-    }
-
-    // Do we have enough space for supplying the bitmap?
-    if(Length >= TotalLength)
-    {
-        // Fill the file bitmap
-        pbBitmap = (LPBYTE)(pBitmap + 1);
-        for(DWORD i = 0; i < pStream->BlockCount; i++)
-        {
-            // Is the block there?
-            if(pStream->PartMap[i].Flags == 3)
-            {
-                ByteOffset = i / 8;
-                BitMask = 1 << (i & 7);
-                pbBitmap[ByteOffset] |= BitMask;
-            }
-        }
-        bResult = true;
-    }
-
-    return bResult;
-}
-
-static void PartialStream_Close(TPartialStream * pStream)
-{
-    // Free the part map
-    if(pStream->PartMap != NULL)
-        STORM_FREE(pStream->PartMap);
-    pStream->PartMap = NULL;
-
-    // Clear variables
-    pStream->VirtualSize = 0;
-    pStream->VirtualPos = 0;
-
-    // Close the base stream
-    assert(pStream->BaseClose != NULL);
-    pStream->BaseClose(pStream);
-}
-
-static bool PartialStream_Open(TPartialStream * pStream)
-{
-    PART_FILE_HEADER PartHdr;
-    ULONGLONG VirtualSize;                  // Size of the file stored in part file
-    ULONGLONG ByteOffset = {0};
-    DWORD BlockCount;
-
-    // Sanity check
-    assert(pStream->BaseRead != NULL);
-
-    // Attempt to read PART file header
-    if(pStream->BaseRead(pStream, &ByteOffset, &PartHdr, sizeof(PART_FILE_HEADER)))
-    {
-        // We need to swap PART file header on big-endian platforms
-        BSWAP_PART_HEADER(&PartHdr);
-
-        // Verify the PART file header
-        if(IsPartHeader(&PartHdr))
-        {
-            // Calculate the number of parts in the file
-            VirtualSize = MAKE_OFFSET64(PartHdr.FileSizeHi, PartHdr.FileSizeLo);
-            assert(VirtualSize != 0);
-            BlockCount = (DWORD)((VirtualSize + PartHdr.BlockSize - 1) / PartHdr.BlockSize);
-
-            // Allocate the map entry array
-            pStream->PartMap = STORM_ALLOC(PART_FILE_MAP_ENTRY, BlockCount);
-            if(pStream->PartMap != NULL)
-            {
-                // Load the block map
-                if(pStream->BaseRead(pStream, NULL, pStream->PartMap, BlockCount * sizeof(PART_FILE_MAP_ENTRY)))
-                {
-                    // Swap the array of file map entries
-                    BSWAP_ARRAY32_UNSIGNED(pStream->PartMap, BlockCount * sizeof(PART_FILE_MAP_ENTRY));
-
-                    // Fill the members of PART file stream
-                    pStream->VirtualSize   = ((ULONGLONG)PartHdr.FileSizeHi) + PartHdr.FileSizeLo;
-                    pStream->VirtualPos    = 0;
-                    pStream->BlockCount    = BlockCount;
-                    pStream->BlockSize     = PartHdr.BlockSize;
-
-                    // Set new function pointers
-                    pStream->StreamRead    = (STREAM_READ)PartialStream_Read;
-                    pStream->StreamGetPos  = (STREAM_GETPOS)PartialStream_GetPos;
-                    pStream->StreamGetSize = (STREAM_GETSIZE)PartialStream_GetSize;
-                    pStream->StreamGetTime = pStream->BaseGetTime;
-                    pStream->StreamGetTime = pStream->BaseGetTime;
-                    pStream->StreamGetBmp  = (STREAM_GETBMP)PartialStream_GetBitmap;
-                    pStream->StreamClose   = (STREAM_CLOSE)PartialStream_Close;
-                    return true;
-                }
-
-                // Free the part map
-                STORM_FREE(pStream->PartMap);
-                pStream->PartMap = NULL;
-            }
-        }
-    }
-
-    SetLastError(ERROR_BAD_FORMAT);
-    return false;
-}
-
-//-----------------------------------------------------------------------------
-// Local functions - encrypted stream support
-
-static const char * szKeyTemplate = "expand 32-byte k000000000000000000000000000000000000000000000000";
-
-static const char * AuthCodeArray[] =
-{
-    // Diablo III: Agent.exe (1.0.0.954)
-    // Address of decryption routine: 00502b00
-    // Pointer to decryptor object: ECX
-    // Pointer to key: ECX+0x5C
-    // Authentication code URL: http://dist.blizzard.com/mediakey/d3-authenticationcode-enGB.txt
-    //                                                                                           -0C-    -1C--08-    -18--04-    -14--00-    -10-
-    "UCMXF6EJY352EFH4XFRXCFH2XC9MQRZK",         // Diablo III Installer (deDE): "expand 32-byte kEFH40000QRZKY3520000XC9MF6EJ0000CFH2UCMX0000XFRX"
-    "MMKVHY48RP7WXP4GHYBQ7SL9J9UNPHBP",         // Diablo III Installer (enGB): "expand 32-byte kXP4G0000PHBPRP7W0000J9UNHY4800007SL9MMKV0000HYBQ"
-    "8MXLWHQ7VGGLTZ9MQZQSFDCLJYET3CPP",         // Diablo III Installer (enSG): "expand 32-byte kTZ9M00003CPPVGGL0000JYETWHQ70000FDCL8MXL0000QZQS"
-    "EJ2R5TM6XFE2GUNG5QDGHKQ9UAKPWZSZ",         // Diablo III Installer (enUS): "expand 32-byte kGUNG0000WZSZXFE20000UAKP5TM60000HKQ9EJ2R00005QDG"
-    "PBGFBE42Z6LNK65UGJQ3WZVMCLP4HQQT",         // Diablo III Installer (esES): "expand 32-byte kK65U0000HQQTZ6LN0000CLP4BE420000WZVMPBGF0000GJQ3"
-    "X7SEJJS9TSGCW5P28EBSC47AJPEY8VU2",         // Diablo III Installer (esMX): "expand 32-byte kW5P200008VU2TSGC0000JPEYJJS90000C47AX7SE00008EBS"
-    "5KVBQA8VYE6XRY3DLGC5ZDE4XS4P7YA2",         // Diablo III Installer (frFR): "expand 32-byte kRY3D00007YA2YE6X0000XS4PQA8V0000ZDE45KVB0000LGC5"
-    "478JD2K56EVNVVY4XX8TDWYT5B8KB254",         // Diablo III Installer (itIT): "expand 32-byte kVVY40000B2546EVN00005B8KD2K50000DWYT478J0000XX8T"
-    "8TS4VNFQRZTN6YWHE9CHVDH9NVWD474A",         // Diablo III Installer (koKR): "expand 32-byte k6YWH0000474ARZTN0000NVWDVNFQ0000VDH98TS40000E9CH"
-    "LJ52Z32DF4LZ4ZJJXVKK3AZQA6GABLJB",         // Diablo III Installer (plPL): "expand 32-byte k4ZJJ0000BLJBF4LZ0000A6GAZ32D00003AZQLJ520000XVKK"
-    "K6BDHY2ECUE2545YKNLBJPVYWHE7XYAG",         // Diablo III Installer (ptBR): "expand 32-byte k545Y0000XYAGCUE20000WHE7HY2E0000JPVYK6BD0000KNLB"
-    "NDVW8GWLAYCRPGRNY8RT7ZZUQU63VLPR",         // Diablo III Installer (ruRU): "expand 32-byte kXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    "6VWCQTN8V3ZZMRUCZXV8A8CGUX2TAA8H",         // Diablo III Installer (zhTW): "expand 32-byte kMRUC0000AA8HV3ZZ0000UX2TQTN80000A8CG6VWC0000ZXV8"
-//  "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",         // Diablo III Installer (zhCN): "expand 32-byte kXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-
-    // Note: Starcraft II (Wings of Liberty): Installer.exe (4.1.1.4219)
-    // Address of decryption routine: 0053A3D0
-    // Pointer to decryptor object: ECX
-    // Pointer to key: ECX+0x5C
-    // Authentication code URL: http://dist.blizzard.com/mediakey/sc2-authenticationcode-enUS.txt
-    //                                                                                          -0C-    -1C--08-    -18--04-    -14--00-    -10-
-    "Y45MD3CAK4KXSSXHYD9VY64Z8EKJ4XFX",         // SC2 Wings of Liberty (deDE): "expand 32-byte kSSXH00004XFXK4KX00008EKJD3CA0000Y64ZY45M0000YD9V"
-    "G8MN8UDG6NA2ANGY6A3DNY82HRGF29ZH",         // SC2 Wings of Liberty (enGB): "expand 32-byte kANGY000029ZH6NA20000HRGF8UDG0000NY82G8MN00006A3D"
-    "W9RRHLB2FDU9WW5B3ECEBLRSFWZSF7HW",         // SC2 Wings of Liberty (enSG): "expand 32-byte kWW5B0000F7HWFDU90000FWZSHLB20000BLRSW9RR00003ECE"
-    "3DH5RE5NVM5GTFD85LXGWT6FK859ETR5",         // SC2 Wings of Liberty (enUS): "expand 32-byte kTFD80000ETR5VM5G0000K859RE5N0000WT6F3DH500005LXG"
-    "8WLKUAXE94PFQU4Y249PAZ24N4R4XKTQ",         // SC2 Wings of Liberty (esES): "expand 32-byte kQU4Y0000XKTQ94PF0000N4R4UAXE0000AZ248WLK0000249P"
-    "A34DXX3VHGGXSQBRFE5UFFDXMF9G4G54",         // SC2 Wings of Liberty (esMX): "expand 32-byte kSQBR00004G54HGGX0000MF9GXX3V0000FFDXA34D0000FE5U"
-    "ZG7J9K938HJEFWPQUA768MA2PFER6EAJ",         // SC2 Wings of Liberty (frFR): "expand 32-byte kFWPQ00006EAJ8HJE0000PFER9K9300008MA2ZG7J0000UA76"
-    "NE7CUNNNTVAPXV7E3G2BSVBWGVMW8BL2",         // SC2 Wings of Liberty (itIT): "expand 32-byte kXV7E00008BL2TVAP0000GVMWUNNN0000SVBWNE7C00003G2B"
-    "3V9E2FTMBM9QQWK7U6MAMWAZWQDB838F",         // SC2 Wings of Liberty (koKR): "expand 32-byte kQWK70000838FBM9Q0000WQDB2FTM0000MWAZ3V9E0000U6MA"
-    "2NSFB8MELULJ83U6YHA3UP6K4MQD48L6",         // SC2 Wings of Liberty (plPL): "expand 32-byte k83U6000048L6LULJ00004MQDB8ME0000UP6K2NSF0000YHA3"
-    "QA2TZ9EWZ4CUU8BMB5WXCTY65F9CSW4E",         // SC2 Wings of Liberty (ptBR): "expand 32-byte kU8BM0000SW4EZ4CU00005F9CZ9EW0000CTY6QA2T0000B5WX"
-    "VHB378W64BAT9SH7D68VV9NLQDK9YEGT",         // SC2 Wings of Liberty (ruRU): "expand 32-byte k9SH70000YEGT4BAT0000QDK978W60000V9NLVHB30000D68V"
-    "U3NFQJV4M6GC7KBN9XQJ3BRDN3PLD9NE",         // SC2 Wings of Liberty (zhTW): "expand 32-byte k7KBN0000D9NEM6GC0000N3PLQJV400003BRDU3NF00009XQJ"
-
-    NULL
-};
-
-static DWORD Rol32(DWORD dwValue, DWORD dwRolCount)
-{
-    DWORD dwShiftRight = 32 - dwRolCount;
-
-    return (dwValue << dwRolCount) | (dwValue >> dwShiftRight);
-}
-
-static void CreateKeyFromAuthCode(
-    LPBYTE pbKeyBuffer,
-    const char * szAuthCode)
-{
-    LPDWORD KeyPosition = (LPDWORD)(pbKeyBuffer + 0x10);
-    LPDWORD AuthCode32 = (LPDWORD)szAuthCode;
-
-    memcpy(pbKeyBuffer, szKeyTemplate, MPQE_CHUNK_SIZE);
-    KeyPosition[0x00] = AuthCode32[0x03];
-    KeyPosition[0x02] = AuthCode32[0x07];
-    KeyPosition[0x03] = AuthCode32[0x02];
-    KeyPosition[0x05] = AuthCode32[0x06];
-    KeyPosition[0x06] = AuthCode32[0x01];
-    KeyPosition[0x08] = AuthCode32[0x05];
-    KeyPosition[0x09] = AuthCode32[0x00];
-    KeyPosition[0x0B] = AuthCode32[0x04];
-    BSWAP_ARRAY32_UNSIGNED(pbKeyBuffer, MPQE_CHUNK_SIZE);
-}
-
-static void DecryptFileChunk(
-        DWORD * MpqData,
-        LPBYTE pbKey,
-        ULONGLONG ByteOffset,
-        DWORD dwLength)
-{
-    ULONGLONG ChunkOffset;
-    DWORD KeyShuffled[0x10];
-    DWORD KeyMirror[0x10];
-    DWORD RoundCount = 0x14;
-
-    // Prepare the key
-    ChunkOffset = ByteOffset / MPQE_CHUNK_SIZE;
-    memcpy(KeyMirror, pbKey, MPQE_CHUNK_SIZE);
-    BSWAP_ARRAY32_UNSIGNED(KeyMirror, MPQE_CHUNK_SIZE);
-    KeyMirror[0x05] = (DWORD)(ChunkOffset >> 32);
-    KeyMirror[0x08] = (DWORD)(ChunkOffset);
-
-    while(dwLength >= MPQE_CHUNK_SIZE)
-    {
-        // Shuffle the key - part 1
-        KeyShuffled[0x0E] = KeyMirror[0x00];
-        KeyShuffled[0x0C] = KeyMirror[0x01];
-        KeyShuffled[0x05] = KeyMirror[0x02];
-        KeyShuffled[0x0F] = KeyMirror[0x03];
-        KeyShuffled[0x0A] = KeyMirror[0x04];
-        KeyShuffled[0x07] = KeyMirror[0x05];
-        KeyShuffled[0x0B] = KeyMirror[0x06];
-        KeyShuffled[0x09] = KeyMirror[0x07];
-        KeyShuffled[0x03] = KeyMirror[0x08];
-        KeyShuffled[0x06] = KeyMirror[0x09];
-        KeyShuffled[0x08] = KeyMirror[0x0A];
-        KeyShuffled[0x0D] = KeyMirror[0x0B];
-        KeyShuffled[0x02] = KeyMirror[0x0C];
-        KeyShuffled[0x04] = KeyMirror[0x0D];
-        KeyShuffled[0x01] = KeyMirror[0x0E];
-        KeyShuffled[0x00] = KeyMirror[0x0F];
-
-        // Shuffle the key - part 2
-        for(DWORD i = 0; i < RoundCount; i += 2)
-        {
-            KeyShuffled[0x0A] = KeyShuffled[0x0A] ^ Rol32((KeyShuffled[0x0E] + KeyShuffled[0x02]), 0x07);
-            KeyShuffled[0x03] = KeyShuffled[0x03] ^ Rol32((KeyShuffled[0x0A] + KeyShuffled[0x0E]), 0x09);
-            KeyShuffled[0x02] = KeyShuffled[0x02] ^ Rol32((KeyShuffled[0x03] + KeyShuffled[0x0A]), 0x0D);
-            KeyShuffled[0x0E] = KeyShuffled[0x0E] ^ Rol32((KeyShuffled[0x02] + KeyShuffled[0x03]), 0x12);
-
-            KeyShuffled[0x07] = KeyShuffled[0x07] ^ Rol32((KeyShuffled[0x0C] + KeyShuffled[0x04]), 0x07);
-            KeyShuffled[0x06] = KeyShuffled[0x06] ^ Rol32((KeyShuffled[0x07] + KeyShuffled[0x0C]), 0x09);
-            KeyShuffled[0x04] = KeyShuffled[0x04] ^ Rol32((KeyShuffled[0x06] + KeyShuffled[0x07]), 0x0D);
-            KeyShuffled[0x0C] = KeyShuffled[0x0C] ^ Rol32((KeyShuffled[0x04] + KeyShuffled[0x06]), 0x12);
-
-            KeyShuffled[0x0B] = KeyShuffled[0x0B] ^ Rol32((KeyShuffled[0x05] + KeyShuffled[0x01]), 0x07);
-            KeyShuffled[0x08] = KeyShuffled[0x08] ^ Rol32((KeyShuffled[0x0B] + KeyShuffled[0x05]), 0x09);
-            KeyShuffled[0x01] = KeyShuffled[0x01] ^ Rol32((KeyShuffled[0x08] + KeyShuffled[0x0B]), 0x0D);
-            KeyShuffled[0x05] = KeyShuffled[0x05] ^ Rol32((KeyShuffled[0x01] + KeyShuffled[0x08]), 0x12);
-
-            KeyShuffled[0x09] = KeyShuffled[0x09] ^ Rol32((KeyShuffled[0x0F] + KeyShuffled[0x00]), 0x07);
-            KeyShuffled[0x0D] = KeyShuffled[0x0D] ^ Rol32((KeyShuffled[0x09] + KeyShuffled[0x0F]), 0x09);
-            KeyShuffled[0x00] = KeyShuffled[0x00] ^ Rol32((KeyShuffled[0x0D] + KeyShuffled[0x09]), 0x0D);
-            KeyShuffled[0x0F] = KeyShuffled[0x0F] ^ Rol32((KeyShuffled[0x00] + KeyShuffled[0x0D]), 0x12);
-
-            KeyShuffled[0x04] = KeyShuffled[0x04] ^ Rol32((KeyShuffled[0x0E] + KeyShuffled[0x09]), 0x07);
-            KeyShuffled[0x08] = KeyShuffled[0x08] ^ Rol32((KeyShuffled[0x04] + KeyShuffled[0x0E]), 0x09);
-            KeyShuffled[0x09] = KeyShuffled[0x09] ^ Rol32((KeyShuffled[0x08] + KeyShuffled[0x04]), 0x0D);
-            KeyShuffled[0x0E] = KeyShuffled[0x0E] ^ Rol32((KeyShuffled[0x09] + KeyShuffled[0x08]), 0x12);
-
-            KeyShuffled[0x01] = KeyShuffled[0x01] ^ Rol32((KeyShuffled[0x0C] + KeyShuffled[0x0A]), 0x07);
-            KeyShuffled[0x0D] = KeyShuffled[0x0D] ^ Rol32((KeyShuffled[0x01] + KeyShuffled[0x0C]), 0x09);
-            KeyShuffled[0x0A] = KeyShuffled[0x0A] ^ Rol32((KeyShuffled[0x0D] + KeyShuffled[0x01]), 0x0D);
-            KeyShuffled[0x0C] = KeyShuffled[0x0C] ^ Rol32((KeyShuffled[0x0A] + KeyShuffled[0x0D]), 0x12);
-
-            KeyShuffled[0x00] = KeyShuffled[0x00] ^ Rol32((KeyShuffled[0x05] + KeyShuffled[0x07]), 0x07);
-            KeyShuffled[0x03] = KeyShuffled[0x03] ^ Rol32((KeyShuffled[0x00] + KeyShuffled[0x05]), 0x09);
-            KeyShuffled[0x07] = KeyShuffled[0x07] ^ Rol32((KeyShuffled[0x03] + KeyShuffled[0x00]), 0x0D);
-            KeyShuffled[0x05] = KeyShuffled[0x05] ^ Rol32((KeyShuffled[0x07] + KeyShuffled[0x03]), 0x12);
-
-            KeyShuffled[0x02] = KeyShuffled[0x02] ^ Rol32((KeyShuffled[0x0F] + KeyShuffled[0x0B]), 0x07);
-            KeyShuffled[0x06] = KeyShuffled[0x06] ^ Rol32((KeyShuffled[0x02] + KeyShuffled[0x0F]), 0x09);
-            KeyShuffled[0x0B] = KeyShuffled[0x0B] ^ Rol32((KeyShuffled[0x06] + KeyShuffled[0x02]), 0x0D);
-            KeyShuffled[0x0F] = KeyShuffled[0x0F] ^ Rol32((KeyShuffled[0x0B] + KeyShuffled[0x06]), 0x12);
-        }
-
-        // Decrypt one data chunk
-        BSWAP_ARRAY32_UNSIGNED(MpqData, MPQE_CHUNK_SIZE);
-        MpqData[0x00] = MpqData[0x00] ^ (KeyShuffled[0x0E] + KeyMirror[0x00]);
-        MpqData[0x01] = MpqData[0x01] ^ (KeyShuffled[0x04] + KeyMirror[0x0D]);
-        MpqData[0x02] = MpqData[0x02] ^ (KeyShuffled[0x08] + KeyMirror[0x0A]);
-        MpqData[0x03] = MpqData[0x03] ^ (KeyShuffled[0x09] + KeyMirror[0x07]);
-        MpqData[0x04] = MpqData[0x04] ^ (KeyShuffled[0x0A] + KeyMirror[0x04]);
-        MpqData[0x05] = MpqData[0x05] ^ (KeyShuffled[0x0C] + KeyMirror[0x01]);
-        MpqData[0x06] = MpqData[0x06] ^ (KeyShuffled[0x01] + KeyMirror[0x0E]);
-        MpqData[0x07] = MpqData[0x07] ^ (KeyShuffled[0x0D] + KeyMirror[0x0B]);
-        MpqData[0x08] = MpqData[0x08] ^ (KeyShuffled[0x03] + KeyMirror[0x08]);
-        MpqData[0x09] = MpqData[0x09] ^ (KeyShuffled[0x07] + KeyMirror[0x05]);
-        MpqData[0x0A] = MpqData[0x0A] ^ (KeyShuffled[0x05] + KeyMirror[0x02]);
-        MpqData[0x0B] = MpqData[0x0B] ^ (KeyShuffled[0x00] + KeyMirror[0x0F]);
-        MpqData[0x0C] = MpqData[0x0C] ^ (KeyShuffled[0x02] + KeyMirror[0x0C]);
-        MpqData[0x0D] = MpqData[0x0D] ^ (KeyShuffled[0x06] + KeyMirror[0x09]);
-        MpqData[0x0E] = MpqData[0x0E] ^ (KeyShuffled[0x0B] + KeyMirror[0x06]);
-        MpqData[0x0F] = MpqData[0x0F] ^ (KeyShuffled[0x0F] + KeyMirror[0x03]);
-        BSWAP_ARRAY32_UNSIGNED(MpqData, MPQE_CHUNK_SIZE);
-
-        // Update byte offset in the key
-        KeyMirror[0x08]++;
-        if(KeyMirror[0x08] == 0)
-            KeyMirror[0x05]++;
-
-        // Move pointers and decrease number of bytes to decrypt
-        MpqData  += (MPQE_CHUNK_SIZE / sizeof(DWORD));
-        dwLength -= MPQE_CHUNK_SIZE;
-    }
-}
-
-static bool DetectFileKey(LPBYTE pbKeyBuffer, LPBYTE pbEncryptedHeader)
-{
-    ULONGLONG ByteOffset = 0;
-    BYTE FileHeader[MPQE_CHUNK_SIZE];
-
-    // We just try all known keys one by one
-    for(int i = 0; AuthCodeArray[i] != NULL; i++)
-    {
-        // Prepare they decryption key from game serial number
-        CreateKeyFromAuthCode(pbKeyBuffer, AuthCodeArray[i]);
-
-        // Try to decrypt with the given key
-        memcpy(FileHeader, pbEncryptedHeader, MPQE_CHUNK_SIZE);
-        DecryptFileChunk((LPDWORD)FileHeader, pbKeyBuffer, ByteOffset, MPQE_CHUNK_SIZE);
-
-        // We check the decrypted data
-        // All known encrypted MPQs have header at the begin of the file,
-        // so we check for MPQ signature there.
-        if(FileHeader[0] == 'M' && FileHeader[1] == 'P' && FileHeader[2] == 'Q')
-            return true;
-    }
-
-    // Key not found, sorry
-    return false;
-}
-
-static bool EncryptedStream_Read(
-        TEncryptedStream * pStream,             // Pointer to an open stream
-        ULONGLONG * pByteOffset,                // Pointer to file byte offset. If NULL, it reads from the current position
-        void * pvBuffer,                        // Pointer to data to be read
-        DWORD dwBytesToRead)                    // Number of bytes to read from the file
-{
-    ULONGLONG StartOffset;                  // Offset of the first byte to be read from the file
-    ULONGLONG ByteOffset;                   // Offset that the caller wants
-    ULONGLONG EndOffset;                    // End offset that is to be read from the file
-    DWORD dwBytesToAllocate;
-    DWORD dwBytesToDecrypt;
-    DWORD dwOffsetInCache;
-    LPBYTE pbMpqData = NULL;
-    bool bResult = false;
-
-    // Get the byte offset
-    if(pByteOffset == NULL)
-        pStream->BaseGetPos(pStream, &ByteOffset);
-    else
-        ByteOffset = *pByteOffset;
-
-    // Cut it down to MPQE chunk size
-    StartOffset = ByteOffset;
-    StartOffset = StartOffset & ~(MPQE_CHUNK_SIZE - 1);
-    EndOffset = ByteOffset + dwBytesToRead;
-
-    // Calculate number of bytes to decrypt
-    dwBytesToDecrypt = (DWORD)(EndOffset - StartOffset);
-    dwBytesToAllocate = (dwBytesToDecrypt + (MPQE_CHUNK_SIZE - 1)) & ~(MPQE_CHUNK_SIZE - 1);
-
-    // Allocate buffers for encrypted and decrypted data
-    pbMpqData = STORM_ALLOC(BYTE, dwBytesToAllocate);
-    if(pbMpqData)
-    {
-        // Get the offset of the desired data in the cache
-        dwOffsetInCache = (DWORD)(ByteOffset - StartOffset);
-
-        // Read the file from the stream as-is
-        if(pStream->BaseRead(pStream, &StartOffset, pbMpqData, dwBytesToDecrypt))
-        {
-            // Decrypt the data
-            DecryptFileChunk((LPDWORD)pbMpqData, pStream->Key, StartOffset, dwBytesToAllocate);
-
-            // Copy the decrypted data
-            memcpy(pvBuffer, pbMpqData + dwOffsetInCache, dwBytesToRead);
-            bResult = true;
-        }
-        else
-        {
-            assert(false);
-        }
-
-        // Free decryption buffer
-        STORM_FREE(pbMpqData);
-    }
-
-    // Free buffers and exit
-    return bResult;
-}
-
-static bool EncryptedStream_Open(TEncryptedStream * pStream)
-{
-    ULONGLONG ByteOffset = 0;
-    BYTE EncryptedHeader[MPQE_CHUNK_SIZE];
-
-    // Sanity check
-    assert(pStream->BaseRead != NULL);
-
-    // Load one MPQE chunk and try to detect the file key
-    if(pStream->BaseRead(pStream, &ByteOffset, EncryptedHeader, sizeof(EncryptedHeader)))
-    {
-        // Attempt to decrypt the MPQ header with all known keys
-        if(DetectFileKey(pStream->Key, EncryptedHeader))
-        {
-            // Assign functions
-            pStream->StreamRead    = (STREAM_READ)EncryptedStream_Read;
-            pStream->StreamGetPos  = pStream->BaseGetPos;
-            pStream->StreamGetSize = pStream->BaseGetSize;
-            pStream->StreamGetTime = pStream->BaseGetTime;
-            pStream->StreamGetBmp  = (STREAM_GETBMP)Dummy_GetBitmap;
-            pStream->StreamClose   = pStream->BaseClose;
-
-            // We need to reset the position back to the begin of the file
-            pStream->BaseRead(pStream, &ByteOffset, EncryptedHeader, 0);
-            return true;
-        }
-
-        // An unknown key
-        SetLastError(ERROR_UNKNOWN_FILE_KEY);
-    }
-    return false;
-}
-
-//-----------------------------------------------------------------------------
-// Public functions
-
-/*
- * This function creates a new file for read-write access
- *
- * - If the current platform supports file sharing,
- *   the file must be created for read sharing (i.e. another application
- *   can open the file for read, but not for write)
- * - If the file does not exist, the function must create new one
- * - If the file exists, the function must rewrite it and set to zero size
- * - The parameters of the function must be validate by the caller
- * - The function must initialize all stream function pointers in TFileStream
- * - If the function fails from any reason, it must close all handles
- *   and free all memory that has been allocated in the process of stream creation,
- *   including the TFileStream structure itself
- *
- * \a szFileName Name of the file to create
- */
-
-TFileStream * FileStream_CreateFile(
-        const TCHAR * szFileName,
-        DWORD dwStreamFlags)
-{
-    TFileStream * pStream;
-
-    // We only support creation of linear, local file
-    if((dwStreamFlags & (STREAM_PROVIDER_MASK | BASE_PROVIDER_MASK)) != (STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE))
-    {
-        SetLastError(ERROR_NOT_SUPPORTED);
-        return NULL;
-    }
-
-    // Allocate file stream structure for linear stream
-    pStream = STORM_ALLOC(TFileStream, 1);
-    if(pStream != NULL)
-    {
-        // Reset entire structure to zero
-        memset(pStream, 0, sizeof(TFileStream));
-        _tcscpy(pStream->szFileName, szFileName);
-
-        // Attempt to create the disk file
-        if(BaseFile_Create(pStream, szFileName, dwStreamFlags))
-        {
-            // Fill the stream provider functions
-            pStream->StreamRead    = pStream->BaseRead;
-            pStream->StreamWrite   = pStream->BaseWrite;
-            pStream->StreamGetPos  = pStream->BaseGetPos;
-            pStream->StreamGetSize = pStream->BaseGetSize;
-            pStream->StreamSetSize = pStream->BaseSetSize;
-            pStream->StreamGetTime = pStream->BaseGetTime;
-            pStream->StreamGetBmp  = (STREAM_GETBMP)Dummy_GetBitmap;;
-            pStream->StreamSwitch  = (STREAM_SWITCH)LinearStream_Switch;
-            pStream->StreamClose   = pStream->BaseClose;
-            return pStream;
-        }
-
-        // File create failed, delete the stream
-        STORM_FREE(pStream);
-        pStream = NULL;
-    }
-
-    // Return the stream
-    return pStream;
-}
-
-/*
- * This function opens an existing file for read or read-write access
- * - If the current platform supports file sharing,
- *   the file must be open for read sharing (i.e. another application
- *   can open the file for read, but not for write)
- * - If the file does not exist, the function must return NULL
- * - If the file exists but cannot be open, then function must return NULL
- * - The parameters of the function must be validate by the caller
- * - The function must check if the file is a PART file,
- *   and create TPartialStream object if so.
- * - The function must initialize all stream function pointers in TFileStream
- * - If the function fails from any reason, it must close all handles
- *   and free all memory that has been allocated in the process of stream creation,
- *   including the TFileStream structure itself
- *
- * \a szFileName Name of the file to open
- * \a dwStreamFlags specifies the provider and base storage type
- */
-
-TFileStream * FileStream_OpenFile(
-        const TCHAR * szFileName,
-        DWORD dwStreamFlags)
-{
-    TFileStream * pStream = NULL;
-    size_t StreamSize = 0;
-    bool bStreamResult = false;
-    bool bBaseResult = false;
-
-    // Allocate file stream for each stream provider
-    switch(dwStreamFlags & STREAM_PROVIDER_MASK)
-    {
-    case STREAM_PROVIDER_LINEAR:    // Allocate structure for linear stream
-        StreamSize = sizeof(TLinearStream);
-        break;
-
-    case STREAM_PROVIDER_PARTIAL:
-        dwStreamFlags |= STREAM_FLAG_READ_ONLY;
-        StreamSize = sizeof(TPartialStream);
-        break;
-
-    case STREAM_PROVIDER_ENCRYPTED:
-        dwStreamFlags |= STREAM_FLAG_READ_ONLY;
-        StreamSize = sizeof(TEncryptedStream);
-        break;
-
-    default:
-        return NULL;
-    }
-
-    // Allocate the stream for each type
-    pStream = (TFileStream *)STORM_ALLOC(BYTE, StreamSize);
-    if(pStream == NULL)
-        return NULL;
-
-    // Fill the stream structure with zeros
-    memset(pStream, 0, StreamSize);
-    _tcscpy(pStream->szFileName, szFileName);
-
-    // Now initialize the respective base provider
-    switch(dwStreamFlags & BASE_PROVIDER_MASK)
-    {
-    case BASE_PROVIDER_FILE:
-        bBaseResult = BaseFile_Open(pStream, szFileName, dwStreamFlags);
-        break;
-
-    case BASE_PROVIDER_MAP:
-        dwStreamFlags |= STREAM_FLAG_READ_ONLY;
-        bBaseResult = BaseMap_Open(pStream, szFileName, dwStreamFlags);
-        break;
-
-    case BASE_PROVIDER_HTTP:
-        dwStreamFlags |= STREAM_FLAG_READ_ONLY;
-        bBaseResult = BaseHttp_Open(pStream, szFileName, dwStreamFlags);
-        break;
-    }
-
-    // If we failed to open the base storage, fail the operation
-    if(bBaseResult == false)
-    {
-        STORM_FREE(pStream);
-        return NULL;
-    }
-
-    // Now initialize the stream provider
-    switch(dwStreamFlags & STREAM_PROVIDER_MASK)
-    {
-    case STREAM_PROVIDER_LINEAR:
-        bStreamResult = LinearStream_Open((TLinearStream *)pStream);
-        break;
-
-    case STREAM_PROVIDER_PARTIAL:
-        bStreamResult = PartialStream_Open((TPartialStream *)pStream);
-        break;
-
-    case STREAM_PROVIDER_ENCRYPTED:
-        bStreamResult = EncryptedStream_Open((TEncryptedStream *)pStream);
-        break;
-    }
-
-    // If the operation failed, free the stream and set it to NULL
-    if(bStreamResult == false)
-    {
-        // Only close the base stream
-        pStream->BaseClose(pStream);
-        STORM_FREE(pStream);
-        pStream = NULL;
-    }
-
-    return pStream;
-}
-
-/*
- * Reads data from the stream
- *
- * - Returns true if the read operation succeeded and all bytes have been read
- * - Returns false if either read failed or not all bytes have been read
- * - If the pByteOffset is NULL, the function must read the data from the current file position
- * - The function can be called with dwBytesToRead = 0. In that case, pvBuffer is ignored
- *   and the function just adjusts file pointer.
- *
- * \a pStream Pointer to an open stream
- * \a pByteOffset Pointer to file byte offset. If NULL, it reads from the current position
- * \a pvBuffer Pointer to data to be read
- * \a dwBytesToRead Number of bytes to read from the file
- *
- * \returns
- * - If the function reads the required amount of bytes, it returns true.
- * - If the function reads less than required bytes, it returns false and GetLastError() returns ERROR_HANDLE_EOF
- * - If the function fails, it reads false and GetLastError() returns an error code different from ERROR_HANDLE_EOF
- */
-bool FileStream_Read(TFileStream * pStream, ULONGLONG * pByteOffset, void * pvBuffer, DWORD dwBytesToRead)
-{
-    assert(pStream->StreamRead != NULL);
-    return pStream->StreamRead(pStream, pByteOffset, pvBuffer, dwBytesToRead);
-}
-
-/*
- * This function writes data to the stream
- *
- * - Returns true if the write operation succeeded and all bytes have been written
- * - Returns false if either write failed or not all bytes have been written
- * - If the pByteOffset is NULL, the function must write the data to the current file position
- *
- * \a pStream Pointer to an open stream
- * \a pByteOffset Pointer to file byte offset. If NULL, it reads from the current position
- * \a pvBuffer Pointer to data to be written
- * \a dwBytesToWrite Number of bytes to write to the file
- */
-bool FileStream_Write(TFileStream * pStream, ULONGLONG * pByteOffset, const void * pvBuffer, DWORD dwBytesToWrite)
-{
-    if(pStream->dwFlags & STREAM_FLAG_READ_ONLY)
-        return false;
-
-    assert(pStream->StreamWrite != NULL);
-    return pStream->StreamWrite(pStream, pByteOffset, pvBuffer, dwBytesToWrite);
-}
-
-/*
- * This function returns the current file position
- * \a pStream
- * \a ByteOffset
- */
-bool FileStream_GetPos(TFileStream * pStream, ULONGLONG * pByteOffset)
-{
-    assert(pStream->StreamGetPos != NULL);
-    return pStream->StreamGetPos(pStream, pByteOffset);
-}
-
-/*
- * Returns the size of a file
- *
- * \a pStream Pointer to an open stream
- * \a FileSize Pointer where to store the file size
- */
-bool FileStream_GetSize(TFileStream * pStream, ULONGLONG * pFileSize)
-{
-    assert(pStream->StreamGetSize != NULL);
-    return pStream->StreamGetSize(pStream, pFileSize);
-}
-
-/*
- * Sets the size of a file
- *
- * \a pStream Pointer to an open stream
- * \a NewFileSize File size to set
- */
-bool FileStream_SetSize(TFileStream * pStream, ULONGLONG NewFileSize)
-{
-    if(pStream->dwFlags & STREAM_FLAG_READ_ONLY)
-        return false;
-
-    assert(pStream->StreamSetSize != NULL);
-    return pStream->StreamSetSize(pStream, NewFileSize);
-}
-
-/*
- * Returns the last write time of a file
- *
- * \a pStream Pointer to an open stream
- * \a pFileType Pointer where to store the file last write time
- */
-bool FileStream_GetTime(TFileStream * pStream, ULONGLONG * pFileTime)
-{
-    assert(pStream->StreamGetTime != NULL);
-    return pStream->StreamGetTime(pStream, pFileTime);
-}
-
-/*
- * Returns the stream flags
- *
- * \a pStream Pointer to an open stream
- * \a pdwStreamFlags Pointer where to store the stream flags
- */
-bool FileStream_GetFlags(TFileStream * pStream, LPDWORD pdwStreamFlags)
-{
-    *pdwStreamFlags = pStream->dwFlags;
-    return true;
-}
-
-/*
- * Switches a stream with another. Used for final phase of archive compacting.
- * Performs these steps:
- *
- * 1) Closes the handle to the existing MPQ
- * 2) Renames the temporary MPQ to the original MPQ, overwrites existing one
- * 3) Opens the MPQ stores the handle and stream position to the new stream structure
- *
- * \a pStream Pointer to an open stream
- * \a pTempStream Temporary ("working") stream (created during archive compacting)
- */
-bool FileStream_Switch(TFileStream * pStream, TFileStream * pNewStream)
-{
-    if(pStream->dwFlags & STREAM_FLAG_READ_ONLY)
-        return false;
-
-    assert(pStream->StreamSwitch != NULL);
-    return pStream->StreamSwitch(pStream, pNewStream);
-}
-
-/*
- * Returns the file name of the stream
- *
- * \a pStream Pointer to an open stream
- */
-TCHAR * FileStream_GetFileName(TFileStream * pStream)
-{
-    assert(pStream != NULL);
-    return pStream->szFileName;
-}
-
-/*
- * Returns true if the stream is read-only
- *
- * \a pStream Pointer to an open stream
- */
-bool FileStream_IsReadOnly(TFileStream * pStream)
-{
-    return (pStream->dwFlags & STREAM_FLAG_READ_ONLY) ? true : false;
-}
-
-/*
- * This function enabled a linear stream to include data bitmap.
- * Used by MPQs v 4.0 from WoW. Each file block is represented by
- * a bit in the bitmap. 1 means the block is present, 0 means it's not.
- *
- * \a pStream Pointer to an open stream
- * \a pBitmap Pointer to file bitmap
- */
-
-bool FileStream_SetBitmap(TFileStream * pStream, TFileBitmap * pBitmap)
-{
-    TLinearStream * pLinearStream;
-
-    // It must be a linear stream.
-    if((pStream->dwFlags & STREAM_PROVIDER_MASK) != STREAM_PROVIDER_LINEAR)
-        return false;
-    pLinearStream = (TLinearStream *)pStream;
-
-    // Two bitmaps are not allowed
-    if(pLinearStream->pBitmap != NULL)
-        return false;
-
-    // We need to change some entry points
-    pLinearStream->StreamRead   = (STREAM_READ)LinearStream_Read;
-    pLinearStream->StreamGetBmp = (STREAM_GETBMP)LinearStream_GetBitmap;
-
-    // Using data bitmap renders the stream to be read only.
-    pLinearStream->dwFlags |= STREAM_FLAG_READ_ONLY;
-    pLinearStream->pBitmap = pBitmap;
-    return true;
-}
-
-/*
- * This function retrieves the file bitmap. A file bitmap is an array
- * of bits, each bit representing one file block. A value of 1 means
- * that the block is present in the file, a value of 0 means that the
- * block is not present.
- *
- * \a pStream Pointer to an open stream
- * \a pBitmap Pointer to buffer where to store the file bitmap
- * \a Length  Size of buffer pointed by pBitmap, in bytes
- * \a LengthNeeded If non-NULL, the function supplies the necessary byte size of the buffer
- */
-bool FileStream_GetBitmap(TFileStream * pStream, TFileBitmap * pBitmap, DWORD Length, LPDWORD LengthNeeded)
-{
-    assert(pStream->StreamGetBmp != NULL);
-    return pStream->StreamGetBmp(pStream, pBitmap, Length, LengthNeeded);
-}
-
-/*
- * This function closes an archive file and frees any data buffers
- * that have been allocated for stream management. The function must also
- * support partially allocated structure, i.e. one or more buffers
- * can be NULL, if there was an allocation failure during the process
- *
- * \a pStream Pointer to an open stream
- */
-void FileStream_Close(TFileStream * pStream)
-{
-    // Check if the stream structure is allocated at all
-    if(pStream != NULL)
-    {
-        // Close the stream provider.
-        // This will also close the base stream
-        assert(pStream->StreamClose != NULL);
-        pStream->StreamClose(pStream);
-
-        // Free the stream itself
-        STORM_FREE(pStream);
-    }
-}
-
-//-----------------------------------------------------------------------------
-// main - for testing purposes
-
-#ifdef __STORMLIB_TEST__
-int FileStream_Test(const TCHAR * szFileName, DWORD dwStreamFlags)
-{
-    TFileStream * pStream;
-    TMPQHeader MpqHeader;
-    ULONGLONG FilePos;
-    TMPQBlock * pBlock;
-    TMPQHash * pHash;
-
-    InitializeMpqCryptography();
-
-    pStream = FileStream_OpenFile(szFileName, dwStreamFlags);
-    if(pStream == NULL)
-        return GetLastError();
-
-    // Read the MPQ header
-    FileStream_Read(pStream, NULL, &MpqHeader, MPQ_HEADER_SIZE_V2);
-    if(MpqHeader.dwID != ID_MPQ)
-        return ERROR_FILE_CORRUPT;
-
-    // Read the hash table
-    pHash = STORM_ALLOC(TMPQHash, MpqHeader.dwHashTableSize);
-    if(pHash != NULL)
-    {
-        FilePos = MpqHeader.dwHashTablePos;
-        FileStream_Read(pStream, &FilePos, pHash, MpqHeader.dwHashTableSize * sizeof(TMPQHash));
-        DecryptMpqBlock(pHash, MpqHeader.dwHashTableSize * sizeof(TMPQHash), MPQ_KEY_HASH_TABLE);
-        STORM_FREE(pHash);
-    }
-
-    // Read the block table
-    pBlock = STORM_ALLOC(TMPQBlock, MpqHeader.dwBlockTableSize);
-    if(pBlock != NULL)
-    {
-        FilePos = MpqHeader.dwBlockTablePos;
-        FileStream_Read(pStream, &FilePos, pBlock, MpqHeader.dwBlockTableSize * sizeof(TMPQBlock));
-        DecryptMpqBlock(pBlock, MpqHeader.dwBlockTableSize * sizeof(TMPQBlock), MPQ_KEY_BLOCK_TABLE);
-        STORM_FREE(pBlock);
-    }
-
-    FileStream_Close(pStream);
-    return ERROR_SUCCESS;
-}
-#endif
-
-/*
-int FileStream_Test()
-{
-    TFileStream * pStream;
-
-    InitializeMpqCryptography();
-
-    //
-    // Test 1: Write to a stream
-    //
-
-    pStream = FileStream_CreateFile("E:\\Stream.bin", 0);
-    if(pStream != NULL)
-    {
-        char szString1[100] = "This is a single line\n\r";
-        DWORD dwLength = strlen(szString1);
-
-        for(int i = 0; i < 10; i++)
-        {
-            if(!FileStream_Write(pStream, NULL, szString1, dwLength))
-            {
-                printf("Failed to write to the stream\n");
-                return ERROR_CAN_NOT_COMPLETE;
-            }
-        }
-        FileStream_Close(pStream);
-    }
-
-    //
-    // Test2: Read from the stream
-    //
-
-    pStream = FileStream_OpenFile("E:\\Stream.bin", STREAM_FLAG_READ_ONLY | STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
-    if(pStream != NULL)
-    {
-        char szString1[100] = "This is a single line\n\r";
-        char szString2[100];
-        DWORD dwLength = strlen(szString1);
-
-        // This call must end with an error
-        if(FileStream_Write(pStream, NULL, "aaa", 3))
-        {
-            printf("Write succeeded while it should fail\n");
-            return -1;
-        }
-
-        for(int i = 0; i < 10; i++)
-        {
-            if(!FileStream_Read(pStream, NULL, szString2, dwLength))
-            {
-                printf("Failed to read from the stream\n");
-                return -1;
-            }
-
-            szString2[dwLength] = 0;
-            if(strcmp(szString1, szString2))
-            {
-                printf("Data read from file are different from data written\n");
-                return -1;
-            }
-        }
-        FileStream_Close(pStream);
-    }
-
-    //
-    // Test3: Open the temp stream, write some data and switch it to the original stream
-    //
-
-    pStream = FileStream_OpenFile("E:\\Stream.bin", STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
-    if(pStream != NULL)
-    {
-        TFileStream * pTempStream;
-        ULONGLONG FileSize;
-
-        pTempStream = FileStream_CreateFile("E:\\TempStream.bin", 0);
-        if(pTempStream == NULL)
-        {
-            printf("Failed to create temp stream\n");
-            return -1;
-        }
-
-        // Copy the original stream to the temp
-        if(!FileStream_GetSize(pStream, FileSize))
-        {
-            printf("Failed to get the file size\n");
-            return -1;
-        }
-
-        while(FileSize != 0)
-        {
-            DWORD dwBytesToRead = (DWORD)FileSize;
-            char Buffer[0x80];
-
-            if(dwBytesToRead > sizeof(Buffer))
-                dwBytesToRead = sizeof(Buffer);
-
-            if(!FileStream_Read(pStream, NULL, Buffer, dwBytesToRead))
-            {
-                printf("CopyStream: Read source file failed\n");
-                return -1;
-            }
-
-            if(!FileStream_Write(pTempStream, NULL, Buffer, dwBytesToRead))
-            {
-                printf("CopyStream: Write target file failed\n");
-                return -1;
-            }
-
-            FileSize -= dwBytesToRead;
-        }
-
-        // Switch the streams
-        // Note that the pTempStream is closed by the operation
-        FileStream_Switch(pStream, pTempStream);
-        FileStream_Close(pStream);
-    }
-
-    //
-    // Test4: Read from the stream again
-    //
-
-    pStream = FileStream_OpenFile("E:\\Stream.bin", STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
-    if(pStream != NULL)
-    {
-        char szString1[100] = "This is a single line\n\r";
-        char szString2[100];
-        DWORD dwLength = strlen(szString1);
-
-        for(int i = 0; i < 10; i++)
-        {
-            if(!FileStream_Read(pStream, NULL, szString2, dwLength))
-            {
-                printf("Failed to read from the stream\n");
-                return -1;
-            }
-
-            szString2[dwLength] = 0;
-            if(strcmp(szString1, szString2))
-            {
-                printf("Data read from file are different from data written\n");
-                return -1;
-            }
-        }
-        FileStream_Close(pStream);
-    }
-
-    return 0;
-}
-*/
-
diff --git a/dep/StormLibOld/src/FileStream.h b/dep/StormLibOld/src/FileStream.h
deleted file mode 100644
index 5c50a0d2a..000000000
--- a/dep/StormLibOld/src/FileStream.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*****************************************************************************/
-/* FileStream.h                           Copyright (c) Ladislav Zezula 2012 */
-/*---------------------------------------------------------------------------*/
-/* Description: Definitions for FileStream object                            */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 14.04.12  1.00  Lad  The first version of FileStream.h                    */
-/*****************************************************************************/
-
-#ifndef __FILESTREAM_H__
-#define __FILESTREAM_H__
-
-//-----------------------------------------------------------------------------
-// Function prototypes
-
-typedef bool (*STREAM_READ)(
-        struct TFileStream * pStream,       // Pointer to an open stream
-        ULONGLONG * pByteOffset,            // Pointer to file byte offset. If NULL, it reads from the current position
-        void * pvBuffer,                    // Pointer to data to be read
-        DWORD dwBytesToRead                 // Number of bytes to read from the file
-        );
-
-typedef bool (*STREAM_WRITE)(
-        struct TFileStream * pStream,       // Pointer to an open stream
-        ULONGLONG * pByteOffset,            // Pointer to file byte offset. If NULL, it writes to the current position
-        const void * pvBuffer,              // Pointer to data to be written
-        DWORD dwBytesToWrite                // Number of bytes to read from the file
-        );
-
-typedef bool (*STREAM_GETPOS)(
-        struct TFileStream * pStream,       // Pointer to an open stream
-        ULONGLONG * pByteOffset             // Pointer to store current file position
-        );
-
-typedef bool (*STREAM_GETSIZE)(
-        struct TFileStream * pStream,       // Pointer to an open stream
-        ULONGLONG * pFileSize               // Receives the file size, in bytes
-        );
-
-typedef bool (*STREAM_SETSIZE)(
-        struct TFileStream * pStream,       // Pointer to an open stream
-        ULONGLONG FileSize                  // New size for the file, in bytes
-        );
-
-typedef bool (*STREAM_GETTIME)(
-        struct TFileStream * pStream,
-        ULONGLONG * pFT
-        );
-
-typedef bool (*STREAM_SWITCH)(
-        struct TFileStream * pStream,
-        struct TFileStream * pNewStream
-        );
-
-typedef bool (*STREAM_GETBMP)(
-        TFileStream * pStream,
-        TFileBitmap * pBitmap,
-        DWORD Length,
-        LPDWORD LengthNeeded
-        );
-
-typedef void (*STREAM_CLOSE)(
-        struct TFileStream * pStream
-        );
-
-//-----------------------------------------------------------------------------
-// Local structures - part file structure
-
-typedef struct _PART_FILE_HEADER
-{
-    DWORD PartialVersion;                   // Always set to 2
-    char  GameBuildNumber[0x20];            // Minimum build number of the game that can use this MPQ
-    DWORD Flags;                            // Flags (details unknown)
-    DWORD FileSizeLo;                       // Low 32 bits of the contained file size
-    DWORD FileSizeHi;                       // High 32 bits of the contained file size
-    DWORD BlockSize;                        // Size of one file block, in bytes
-
-} PART_FILE_HEADER, *PPART_FILE_HEADER;
-
-// Structure describing the block-to-file map entry
-typedef struct _PART_FILE_MAP_ENTRY
-{
-    DWORD Flags;                            // 3 = the block is present in the file
-    DWORD BlockOffsLo;                      // Low 32 bits of the block position in the file
-    DWORD BlockOffsHi;                      // High 32 bits of the block position in the file
-    DWORD LargeValueLo;                     // 64-bit value, meaning is unknown
-    DWORD LargeValueHi;
-
-} PART_FILE_MAP_ENTRY, *PPART_FILE_MAP_ENTRY;
-
-//-----------------------------------------------------------------------------
-// Local structures
-
-union TBaseData
-{
-    struct
-    {
-        ULONGLONG FileSize;                 // Size of the file
-        ULONGLONG FilePos;                  // Current file position
-        ULONGLONG FileTime;                 // Date/time of last modification of the file
-        HANDLE hFile;                       // File handle
-    } File;
-
-    struct
-    {
-        ULONGLONG FileSize;                 // Mapped file size
-        ULONGLONG FilePos;                  // Current stream position
-        ULONGLONG FileTime;                 // Date/time of last modification of the file
-        LPBYTE pbFile;                      // Pointer to mapped view
-    } Map;
-
-    struct
-    {
-        ULONGLONG FileSize;                 // Size of the internet file
-        ULONGLONG FilePos;                  // Current position in the file
-        ULONGLONG FileTime;                 // Date/time of last modification of the file
-        HANDLE hInternet;                   // Internet handle
-        HANDLE hConnect;                    // Connection to the internet server
-    } Http;
-};
-
-//-----------------------------------------------------------------------------
-// Structure for linear stream
-
-struct TFileStream
-{
-    // Stream provider functions
-    STREAM_READ    StreamRead;              // Pointer to stream read function for this archive. Do not use directly.
-    STREAM_WRITE   StreamWrite;             // Pointer to stream write function for this archive. Do not use directly.
-    STREAM_GETPOS  StreamGetPos;            // Pointer to function that returns current file position
-    STREAM_GETSIZE StreamGetSize;           // Pointer to function returning file size
-    STREAM_SETSIZE StreamSetSize;           // Pointer to function changing file size
-    STREAM_GETTIME StreamGetTime;           // Pointer to function retrieving the file time
-    STREAM_GETBMP  StreamGetBmp;            // Pointer to function that retrieves the file bitmap
-    STREAM_SWITCH  StreamSwitch;            // Pointer to function changing the stream to another file
-    STREAM_CLOSE   StreamClose;             // Pointer to function closing the stream
-
-    // Stream provider data members
-    TCHAR szFileName[MAX_PATH];             // File name
-    DWORD dwFlags;                          // Stream flags
-
-    // Base provider functions
-    STREAM_READ    BaseRead;
-    STREAM_WRITE   BaseWrite;
-    STREAM_GETPOS  BaseGetPos;              // Pointer to function that returns current file position
-    STREAM_GETSIZE BaseGetSize;             // Pointer to function returning file size
-    STREAM_SETSIZE BaseSetSize;             // Pointer to function changing file size
-    STREAM_GETTIME BaseGetTime;             // Pointer to function retrieving the file time
-    STREAM_CLOSE   BaseClose;               // Pointer to function closing the stream
-
-    // Base provider data members
-    TBaseData Base;                         // Base provider data
-
-    // Followed by stream provider data, with variable length
-};
-
-//-----------------------------------------------------------------------------
-// Structure for linear stream
-
-struct TLinearStream : public TFileStream
-{
-    TFileBitmap * pBitmap;                  // Pointer to the stream bitmap
-};
-
-//-----------------------------------------------------------------------------
-// Structure for partial stream
-
-struct TPartialStream : public TFileStream
-{
-    ULONGLONG VirtualSize;                  // Virtual size of the file
-    ULONGLONG VirtualPos;                   // Virtual position in the file
-    DWORD     BlockCount;                   // Number of file blocks. Used by partial file stream
-    DWORD     BlockSize;                    // Size of one block. Used by partial file stream
-
-    PPART_FILE_MAP_ENTRY PartMap;           // File map, variable length
-};
-
-//-----------------------------------------------------------------------------
-// Structure for encrypted stream
-
-#define MPQE_CHUNK_SIZE 0x40                // Size of one chunk to be decrypted
-
-struct TEncryptedStream : public TFileStream
-{
-    BYTE Key[MPQE_CHUNK_SIZE];              // File key
-};
-
-#endif // __FILESTREAM_H__
diff --git a/dep/StormLibOld/src/SBaseCommon.cpp b/dep/StormLibOld/src/SBaseCommon.cpp
deleted file mode 100644
index fecda60d0..000000000
--- a/dep/StormLibOld/src/SBaseCommon.cpp
+++ /dev/null
@@ -1,1700 +0,0 @@
-/*****************************************************************************/
-/* SBaseCommon.cpp                        Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Common functions for StormLib, used by all SFile*** modules               */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 24.03.03  1.00  Lad  The first version of SFileCommon.cpp                 */
-/* 19.11.03  1.01  Dan  Big endian handling                                  */
-/* 12.06.04  1.01  Lad  Renamed to SCommon.cpp                               */
-/* 06.09.10  1.01  Lad  Renamed to SBaseCommon.cpp                           */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-char StormLibCopyright[] = "StormLib v " STORMLIB_VERSION_STRING " Copyright Ladislav Zezula 1998-2012";
-
-//-----------------------------------------------------------------------------
-// The buffer for decryption engine.
-
-LCID    lcFileLocale = LANG_NEUTRAL;            // File locale
-USHORT  wPlatform = 0;                          // File platform
-
-//-----------------------------------------------------------------------------
-// Storm buffer functions
-
-#define STORM_BUFFER_SIZE       0x500
-
-static DWORD StormBuffer[STORM_BUFFER_SIZE];    // Buffer for the decryption engine
-static bool  bMpqCryptographyInitialized = false;
-
-DWORD HashString(const char * szFileName, DWORD dwHashType)
-{
-    LPBYTE pbKey   = (BYTE *)szFileName;
-    DWORD  dwSeed1 = 0x7FED7FED;
-    DWORD  dwSeed2 = 0xEEEEEEEE;
-    DWORD  ch;
-
-    while(*pbKey != 0)
-    {
-        ch = toupper(*pbKey++);
-
-        dwSeed1 = StormBuffer[dwHashType + ch] ^ (dwSeed1 + dwSeed2);
-        dwSeed2 = ch + dwSeed1 + dwSeed2 + (dwSeed2 << 5) + 3;
-    }
-
-    return dwSeed1;
-}
-
-void InitializeMpqCryptography()
-{
-    DWORD dwSeed = 0x00100001;
-    DWORD index1 = 0;
-    DWORD index2 = 0;
-    int   i;
-
-    // Initialize the decryption buffer.
-    // Do nothing if already done.
-    if(bMpqCryptographyInitialized == false)
-    {
-        for(index1 = 0; index1 < 0x100; index1++)
-        {
-            for(index2 = index1, i = 0; i < 5; i++, index2 += 0x100)
-            {
-                DWORD temp1, temp2;
-
-                dwSeed = (dwSeed * 125 + 3) % 0x2AAAAB;
-                temp1  = (dwSeed & 0xFFFF) << 0x10;
-
-                dwSeed = (dwSeed * 125 + 3) % 0x2AAAAB;
-                temp2  = (dwSeed & 0xFFFF);
-
-                StormBuffer[index2] = (temp1 | temp2);
-            }
-        }
-
-        // Also register both MD5 and SHA1 hash algorithms
-        register_hash(&md5_desc);
-        register_hash(&sha1_desc);
-
-        // Use LibTomMath as support math library for LibTomCrypt
-        ltc_mp = ltm_desc;
-
-        // Don't do that again
-        bMpqCryptographyInitialized = true;
-    }
-}
-
-//-----------------------------------------------------------------------------
-// Calculates the hash table size for a given amount of files
-
-DWORD GetHashTableSizeForFileCount(DWORD dwFileCount)
-{
-    DWORD dwPowerOfTwo;
-
-    // Round the hash table size up to the nearest power of two
-    for(dwPowerOfTwo = HASH_TABLE_SIZE_MIN; dwPowerOfTwo < HASH_TABLE_SIZE_MAX; dwPowerOfTwo <<= 1)
-    {
-        if(dwPowerOfTwo >= dwFileCount)
-        {
-            return dwPowerOfTwo;
-        }
-    }
-
-    // Don't allow the hash table size go over allowed maximum
-    return HASH_TABLE_SIZE_MAX;
-}
-
-//-----------------------------------------------------------------------------
-// Calculates a Jenkin's Encrypting and decrypting MPQ file data
-
-ULONGLONG HashStringJenkins(const char * szFileName)
-{
-    char * szTemp;
-    char szLocFileName[0x108];
-    char chOneChar;
-    size_t nLength = 0;
-    unsigned int primary_hash = 1;
-    unsigned int secondary_hash = 2;
-
-    // This is required to produce defined results
-    assert(szFileName != NULL);
-
-    // Normalize the file name - convert to uppercase, and convert "/" to "\\".
-    if(szFileName != NULL)
-    {
-        szTemp = szLocFileName;
-        while(*szFileName != 0)
-        {
-            chOneChar = (char)tolower(*szFileName++);
-            if(chOneChar == '/')
-                chOneChar = '\\';
-
-            *szTemp++ = chOneChar;
-        }
-
-        nLength = szTemp - szLocFileName;
-        *szTemp = 0;
-    }
-
-    // Thanks Quantam for finding out what the algorithm is.
-    // I am really getting old for reversing large chunks of assembly
-    // that does hashing :-)
-    hashlittle2(szLocFileName, nLength, &secondary_hash, &primary_hash);
-
-    // Combine those 2 together
-    return (ULONGLONG)primary_hash * (ULONGLONG)0x100000000ULL + (ULONGLONG)secondary_hash;
-}
-
-//-----------------------------------------------------------------------------
-// This function converts the MPQ header so it always looks like version 4
-
-int ConvertMpqHeaderToFormat4(
-        TMPQArchive * ha,
-        ULONGLONG FileSize,
-        DWORD dwFlags)
-{
-    ULONGLONG ByteOffset;
-    TMPQHeader * pHeader = ha->pHeader;
-    DWORD dwExpectedArchiveSize;
-    USHORT wFormatVersion = pHeader->wFormatVersion;
-    int nError = ERROR_SUCCESS;
-
-    // If version 1.0 is forced, then the format version is forced to be 1.0
-    // Reason: Storm.dll in Warcraft III ignores format version value
-    if(dwFlags & MPQ_OPEN_FORCE_MPQ_V1)
-        wFormatVersion = MPQ_FORMAT_VERSION_1;
-
-    // Format-specific fixes
-    switch(wFormatVersion)
-    {
-    case MPQ_FORMAT_VERSION_1:
-
-        // Check for malformed MPQ header version 1.0
-        if(pHeader->dwHeaderSize != MPQ_HEADER_SIZE_V1)
-        {
-            pHeader->dwHeaderSize = MPQ_HEADER_SIZE_V1;
-            ha->dwFlags |= MPQ_FLAG_PROTECTED;
-        }
-
-        //
-        // The value of "dwArchiveSize" member in the MPQ header
-        // is ignored by Storm.dll and can contain garbage value
-        // ("w3xmaster" protector).
-        //
-
-        dwExpectedArchiveSize = (DWORD)(FileSize - ha->MpqPos);
-        if(pHeader->dwArchiveSize != dwExpectedArchiveSize)
-        {
-            // Note: dwExpectedArchiveSize might be incorrect at this point.
-            // MPQs version 1.0 can have strong digital signature appended at the end,
-            // or they might just have arbitrary data there.
-            // In either case, we recalculate the archive size later when
-            // block table is loaded and positions of all files is known.
-            pHeader->dwArchiveSize = dwExpectedArchiveSize;
-            ha->dwFlags |= MPQ_FLAG_NEED_FIX_SIZE;
-        }
-
-        // Zero the fields in 2.0 part of the MPQ header
-        pHeader->HiBlockTablePos64 = 0;
-        pHeader->wHashTablePosHi = 0;
-        pHeader->wBlockTablePosHi = 0;
-        // No break here !!!
-
-    case MPQ_FORMAT_VERSION_2:
-    case MPQ_FORMAT_VERSION_3:
-
-        // In MPQ format 3.0, the entire header is optional
-        // and the size of the header can actually be identical
-        // to size of header 2.0
-        if(pHeader->dwHeaderSize < MPQ_HEADER_SIZE_V3)
-        {
-            ULONGLONG ArchiveSize64 = pHeader->dwArchiveSize;
-
-            // In format 2.0, the archive size is obsolete and is calculated
-            // as the highest offset of hash table, block table or hi-block table.
-            // However, we can still rely on it, if the size of the archive is under 4 GB
-            if((FileSize - ha->MpqPos) >> 32)
-            {
-                ByteOffset = MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos) + (pHeader->dwHashTableSize * sizeof(TMPQHash));
-                if(ByteOffset > ArchiveSize64)
-                    ArchiveSize64 = ByteOffset;
-
-                ByteOffset = MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos) + (pHeader->dwBlockTableSize * sizeof(TMPQBlock));
-                if(ByteOffset > ArchiveSize64)
-                    ArchiveSize64 = ByteOffset;
-
-                // Only if we actually have a hi-block table
-                if(pHeader->HiBlockTablePos64)
-                {
-                    ByteOffset = pHeader->HiBlockTablePos64 + (pHeader->dwBlockTableSize * sizeof(USHORT));
-                    if(ByteOffset > ArchiveSize64)
-                        ArchiveSize64 = ByteOffset;
-                }
-
-                // We need to recalculate archive size later,
-                // when block table is loaded and the position of files is known
-                ha->dwFlags |= MPQ_FLAG_NEED_FIX_SIZE;
-            }
-
-            // Initialize the rest of the 3.0 header
-            pHeader->ArchiveSize64 = ArchiveSize64;
-            pHeader->HetTablePos64 = 0;
-            pHeader->BetTablePos64 = 0;
-        }
-
-        //
-        // Calculate compressed size of each table. We assume the following order:
-        // 1) HET table
-        // 2) BET table
-        // 3) Classic hash table
-        // 4) Classic block table
-        // 5) Hi-block table
-        //
-
-        // Set all sizes to zero
-        pHeader->HetTableSize64 = 0;
-        pHeader->BetTableSize64 = 0;
-
-        // Either both HET and BET table exist or none of them does.
-        if(pHeader->HetTablePos64)
-        {
-            // Compressed size of the HET and BET tables
-            pHeader->HetTableSize64 = pHeader->BetTablePos64 - pHeader->HetTablePos64;
-            pHeader->BetTableSize64 = MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos) - pHeader->HetTablePos64;
-        }
-
-        // Compressed size of hash and block table
-        if(wFormatVersion >= MPQ_FORMAT_VERSION_2)
-        {
-            // Compressed size of the hash table
-            pHeader->HashTableSize64 = MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos) - MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos);
-
-            // Block and hi-block table
-            if(pHeader->HiBlockTablePos64)
-            {
-                pHeader->BlockTableSize64 = pHeader->HiBlockTablePos64 - MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
-                pHeader->HiBlockTableSize64 = pHeader->ArchiveSize64 - pHeader->HiBlockTablePos64;
-            }
-            else
-            {
-                pHeader->BlockTableSize64 = pHeader->ArchiveSize64 - MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
-                pHeader->HiBlockTableSize64 = 0;
-            }
-        }
-        else
-        {
-            // No known MPQ in format 1.0 has any of the tables compressed
-            pHeader->HashTableSize64 = pHeader->dwHashTableSize * sizeof(TMPQHash);
-            pHeader->BlockTableSize64 = pHeader->dwBlockTableSize * sizeof(TMPQBlock);
-            pHeader->HiBlockTableSize64 = 0;
-        }
-
-        // Set the data chunk size for MD5 to zero
-        pHeader->dwRawChunkSize = 0;
-
-        // Fill the MD5's
-        memset(pHeader->MD5_BlockTable,   0, MD5_DIGEST_SIZE);
-        memset(pHeader->MD5_HashTable,    0, MD5_DIGEST_SIZE);
-        memset(pHeader->MD5_HiBlockTable, 0, MD5_DIGEST_SIZE);
-        memset(pHeader->MD5_BetTable,     0, MD5_DIGEST_SIZE);
-        memset(pHeader->MD5_HetTable,     0, MD5_DIGEST_SIZE);
-        memset(pHeader->MD5_MpqHeader,    0, MD5_DIGEST_SIZE);
-        // No break here !!!!
-
-    case MPQ_FORMAT_VERSION_4:
-
-        // Verify header MD5. Header MD5 is calculated from the MPQ header since the 'MPQ\x1A'
-        // signature until the position of header MD5 at offset 0xC0
-        if(!VerifyDataBlockHash(ha->pHeader, MPQ_HEADER_SIZE_V4 - MD5_DIGEST_SIZE, ha->pHeader->MD5_MpqHeader))
-            nError = ERROR_FILE_CORRUPT;
-        break;
-    }
-
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// Default flags for (attributes) and (listfile)
-
-DWORD GetDefaultSpecialFileFlags(TMPQArchive * ha, DWORD dwFileSize)
-{
-    // Fixed for format 1.0
-    if(ha->pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1)
-        return MPQ_FILE_COMPRESS | MPQ_FILE_ENCRYPTED | MPQ_FILE_FIX_KEY;
-
-    // Size-dependent for formats 2.0-4.0
-    return (dwFileSize > 0x4000) ? (MPQ_FILE_COMPRESS | MPQ_FILE_SECTOR_CRC) : (MPQ_FILE_COMPRESS | MPQ_FILE_SINGLE_UNIT);
-}
-
-
-//-----------------------------------------------------------------------------
-// Encrypting and decrypting MPQ file data
-
-void EncryptMpqBlock(void * pvFileBlock, DWORD dwLength, DWORD dwSeed1)
-{
-    LPDWORD block = (LPDWORD)pvFileBlock;
-    DWORD dwSeed2 = 0xEEEEEEEE;
-    DWORD ch;
-
-    // Round to DWORDs
-    dwLength >>= 2;
-
-    while(dwLength-- > 0)
-    {
-        dwSeed2 += StormBuffer[0x400 + (dwSeed1 & 0xFF)];
-        ch     = *block;
-        *block++ = ch ^ (dwSeed1 + dwSeed2);
-
-        dwSeed1  = ((~dwSeed1 << 0x15) + 0x11111111) | (dwSeed1 >> 0x0B);
-        dwSeed2  = ch + dwSeed2 + (dwSeed2 << 5) + 3;
-    }
-}
-
-void DecryptMpqBlock(void * pvFileBlock, DWORD dwLength, DWORD dwSeed1)
-{
-    LPDWORD block = (LPDWORD)pvFileBlock;
-    DWORD dwSeed2 = 0xEEEEEEEE;
-    DWORD ch;
-
-    // Round to DWORDs
-    dwLength >>= 2;
-
-    while(dwLength-- > 0)
-    {
-        dwSeed2 += StormBuffer[0x400 + (dwSeed1 & 0xFF)];
-        ch     = *block ^ (dwSeed1 + dwSeed2);
-
-        dwSeed1  = ((~dwSeed1 << 0x15) + 0x11111111) | (dwSeed1 >> 0x0B);
-        dwSeed2  = ch + dwSeed2 + (dwSeed2 << 5) + 3;
-        *block++ = ch;
-    }
-}
-
-/*
-void EncryptMpqTable(void * pvMpqTable, DWORD dwLength, const char * szKey)
-{
-    EncryptMpqBlock(pvMpqTable, dwLength, HashString(szKey, MPQ_HASH_FILE_KEY));
-}
-
-void DecryptMpqTable(void * pvMpqTable, DWORD dwLength, const char * szKey)
-{
-    DecryptMpqBlock(pvMpqTable, dwLength, HashString(szKey, MPQ_HASH_FILE_KEY));
-}
-*/
-
-/*
- * Functions tries to get file decryption key. The trick comes from sector
- * positions which are stored at the begin of each compressed file. We know the
- * file size, that means we know number of sectors that means we know the first
- * DWORD value in sector position. And if we know encrypted and decrypted value,
- * we can find the decryption key !!!
- *
- * hf            - MPQ file handle
- * SectorOffsets - DWORD array of sector positions
- * ch            - Decrypted value of the first sector pos
- */
-
-DWORD DetectFileKeyBySectorSize(LPDWORD SectorOffsets, DWORD decrypted)
-{
-    DWORD saveKey1;
-    DWORD temp = *SectorOffsets ^ decrypted;    // temp = seed1 + seed2
-    temp -= 0xEEEEEEEE;                 // temp = seed1 + StormBuffer[0x400 + (seed1 & 0xFF)]
-
-    for(int i = 0; i < 0x100; i++)      // Try all 255 possibilities
-    {
-        DWORD seed1;
-        DWORD seed2 = 0xEEEEEEEE;
-        DWORD ch;
-
-        // Try the first DWORD (We exactly know the value)
-        seed1  = temp - StormBuffer[0x400 + i];
-        seed2 += StormBuffer[0x400 + (seed1 & 0xFF)];
-        ch     = SectorOffsets[0] ^ (seed1 + seed2);
-
-        if(ch != decrypted)
-            continue;
-
-        // Add 1 because we are decrypting sector positions
-        saveKey1 = seed1 + 1;
-
-        // If OK, continue and test the second value. We don't know exactly the value,
-        // but we know that the second one has lower 16 bits set to zero
-        // (no compressed sector is larger than 0xFFFF bytes)
-        seed1  = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
-        seed2  = ch + seed2 + (seed2 << 5) + 3;
-
-        seed2 += StormBuffer[0x400 + (seed1 & 0xFF)];
-        ch     = SectorOffsets[1] ^ (seed1 + seed2);
-
-        if((ch & 0xFFFF0000) == 0)
-            return saveKey1;
-    }
-    return 0;
-}
-
-// Function tries to detect file encryption key. It expectes at least two uncompressed bytes
-DWORD DetectFileKeyByKnownContent(void * pvFileContent, DWORD nDwords, ...)
-{
-    LPDWORD pdwContent = (LPDWORD)pvFileContent;
-    va_list argList;
-    DWORD dwDecrypted[0x10];
-    DWORD saveKey1;
-    DWORD dwTemp;
-    DWORD i, j;
-
-    // We need at least two DWORDS to detect the file key
-    if(nDwords < 0x02 || nDwords > 0x10)
-        return 0;
-
-    va_start(argList, nDwords);
-    for(i = 0; i < nDwords; i++)
-        dwDecrypted[i] = va_arg(argList, DWORD);
-    va_end(argList);
-
-    dwTemp = (*pdwContent ^ dwDecrypted[0]) - 0xEEEEEEEE;
-    for(i = 0; i < 0x100; i++)      // Try all 256 possibilities
-    {
-        DWORD seed1;
-        DWORD seed2 = 0xEEEEEEEE;
-        DWORD ch;
-
-        // Try the first DWORD
-        seed1  = dwTemp - StormBuffer[0x400 + i];
-        seed2 += StormBuffer[0x400 + (seed1 & 0xFF)];
-        ch     = pdwContent[0] ^ (seed1 + seed2);
-
-        if(ch != dwDecrypted[0])
-            continue;
-
-        saveKey1 = seed1;
-
-        // If OK, continue and test all bytes.
-        for(j = 1; j < nDwords; j++)
-        {
-            seed1  = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
-            seed2  = ch + seed2 + (seed2 << 5) + 3;
-
-            seed2 += StormBuffer[0x400 + (seed1 & 0xFF)];
-            ch     = pdwContent[j] ^ (seed1 + seed2);
-
-            if(ch == dwDecrypted[j] && j == nDwords - 1)
-                return saveKey1;
-        }
-    }
-    return 0;
-}
-
-DWORD DetectFileKeyByContent(void * pvFileContent, DWORD dwFileSize)
-{
-    DWORD dwFileKey;
-
-    // Try to break the file encryption key as if it was a WAVE file
-    if(dwFileSize >= 0x0C)
-    {
-        dwFileKey = DetectFileKeyByKnownContent(pvFileContent, 3, 0x46464952, dwFileSize - 8, 0x45564157);
-        if(dwFileKey != 0)
-            return dwFileKey;
-    }
-
-    // Try to break the encryption key as if it was an EXE file
-    if(dwFileSize > 0x40)
-    {
-        dwFileKey = DetectFileKeyByKnownContent(pvFileContent, 2, 0x00905A4D, 0x00000003);
-        if(dwFileKey != 0)
-            return dwFileKey;
-    }
-
-    // Try to break the encryption key as if it was a XML file
-    if(dwFileSize > 0x04)
-    {
-        dwFileKey = DetectFileKeyByKnownContent(pvFileContent, 2, 0x6D783F3C, 0x6576206C);
-        if(dwFileKey != 0)
-            return dwFileKey;
-    }
-
-    // Not detected, sorry
-    return 0;
-}
-
-DWORD DecryptFileKey(
-        const char * szFileName,
-        ULONGLONG MpqPos,
-        DWORD dwFileSize,
-        DWORD dwFlags)
-{
-    DWORD dwFileKey;
-    DWORD dwMpqPos = (DWORD)MpqPos;
-
-    // File key is calculated from plain name
-    szFileName = GetPlainFileNameA(szFileName);
-    dwFileKey = HashString(szFileName, MPQ_HASH_FILE_KEY);
-
-    // Fix the key, if needed
-    if(dwFlags & MPQ_FILE_FIX_KEY)
-        dwFileKey = (dwFileKey + dwMpqPos) ^ dwFileSize;
-
-    // Return the key
-    return dwFileKey;
-}
-
-//-----------------------------------------------------------------------------
-// Handle validation functions
-
-bool IsValidMpqHandle(TMPQArchive * ha)
-{
-    if(ha == NULL)
-        return false;
-    if(ha->pHeader == NULL || ha->pHeader->dwID != ID_MPQ)
-        return false;
-
-    return (bool)(ha->pHeader->dwID == ID_MPQ);
-}
-
-bool IsValidFileHandle(TMPQFile * hf)
-{
-    if(hf == NULL)
-        return false;
-
-    if(hf->dwMagic != ID_MPQ_FILE)
-        return false;
-
-    if(hf->pStream != NULL)
-        return true;
-
-    return IsValidMpqHandle(hf->ha);
-}
-
-//-----------------------------------------------------------------------------
-// Hash table and block table manipulation
-
-// Retrieves the first hash entry for the given file.
-// Every locale version of a file has its own hash entry
-TMPQHash * GetFirstHashEntry(TMPQArchive * ha, const char * szFileName)
-{
-    TMPQHash * pStartHash;                  // File hash entry (start)
-    TMPQHash * pHashEnd = ha->pHashTable + ha->pHeader->dwHashTableSize;
-    TMPQHash * pHash;                       // File hash entry (current)
-    DWORD dwHashTableSizeMask;
-    DWORD dwIndex = HashString(szFileName, MPQ_HASH_TABLE_INDEX);
-    DWORD dwName1 = HashString(szFileName, MPQ_HASH_NAME_A);
-    DWORD dwName2 = HashString(szFileName, MPQ_HASH_NAME_B);
-
-    // Get the first possible has entry that might be the one
-    dwHashTableSizeMask = ha->pHeader->dwHashTableSize ? (ha->pHeader->dwHashTableSize - 1) : 0;
-    pStartHash = pHash = ha->pHashTable + (dwIndex & dwHashTableSizeMask);
-
-    // There might be deleted entries in the hash table prior to our desired entry.
-    while(pHash->dwBlockIndex != HASH_ENTRY_FREE)
-    {
-        // If the entry agrees, we found it.
-        if(pHash->dwName1 == dwName1 && pHash->dwName2 == dwName2 && pHash->dwBlockIndex < ha->dwFileTableSize)
-            return pHash;
-
-        // Move to the next hash entry. Stop searching
-        // if we got reached the original hash entry
-        if(++pHash >= pHashEnd)
-            pHash = ha->pHashTable;
-        if(pHash == pStartHash)
-            break;
-    }
-
-    // The apropriate hash entry was not found
-    return NULL;
-}
-
-TMPQHash * GetNextHashEntry(TMPQArchive * ha, TMPQHash * pFirstHash, TMPQHash * pPrevHash)
-{
-    TMPQHash * pHashEnd = ha->pHashTable + ha->pHeader->dwHashTableSize;
-    TMPQHash * pHash = pPrevHash;
-    DWORD dwName1 = pPrevHash->dwName1;
-    DWORD dwName2 = pPrevHash->dwName2;
-
-    // Now go for any next entry that follows the pPrevHash,
-    // until either free hash entry was found, or the start entry was reached
-    for(;;)
-    {
-        // Move to the next hash entry. Stop searching
-        // if we got reached the original hash entry
-        if(++pHash >= pHashEnd)
-            pHash = ha->pHashTable;
-        if(pHash == pFirstHash)
-            break;
-
-        // If the entry is a free entry, stop search
-        if(pHash->dwBlockIndex == HASH_ENTRY_FREE)
-            break;
-
-        // If the entry is not free and the name agrees, we found it
-        if(pHash->dwName1 == dwName1 && pHash->dwName2 == dwName2 && pHash->dwBlockIndex < ha->pHeader->dwBlockTableSize)
-            return pHash;
-    }
-
-    // No next entry
-    return NULL;
-}
-
-// Allocates an entry in the hash table
-DWORD AllocateHashEntry(
-        TMPQArchive * ha,
-        TFileEntry * pFileEntry)
-{
-    TMPQHash * pStartHash;                  // File hash entry (start)
-    TMPQHash * pHashEnd = ha->pHashTable + ha->pHeader->dwHashTableSize;
-    TMPQHash * pHash;                       // File hash entry (current)
-    DWORD dwHashTableSizeMask;
-    DWORD dwIndex = HashString(pFileEntry->szFileName, MPQ_HASH_TABLE_INDEX);
-    DWORD dwName1 = HashString(pFileEntry->szFileName, MPQ_HASH_NAME_A);
-    DWORD dwName2 = HashString(pFileEntry->szFileName, MPQ_HASH_NAME_B);
-
-    // Get the first possible has entry that might be the one
-    dwHashTableSizeMask = ha->pHeader->dwHashTableSize ? (ha->pHeader->dwHashTableSize - 1) : 0;
-    pStartHash = pHash = ha->pHashTable + (dwIndex & dwHashTableSizeMask);
-
-    // There might be deleted entries in the hash table prior to our desired entry.
-    while(pHash->dwBlockIndex < HASH_ENTRY_DELETED)
-    {
-        // If there already is an existing entry, reuse it.
-        if(pHash->dwName1 == dwName1 && pHash->dwName2 == dwName2 && pHash->lcLocale == pFileEntry->lcLocale)
-            break;
-
-        // Move to the next hash entry.
-        // If we reached the starting entry, it's failure.
-        if(++pHash >= pHashEnd)
-            pHash = ha->pHashTable;
-        if(pHash == pStartHash)
-            return HASH_ENTRY_FREE;
-    }
-
-    // Fill the free hash entry
-    pHash->dwName1      = dwName1;
-    pHash->dwName2      = dwName2;
-    pHash->lcLocale     = pFileEntry->lcLocale;
-    pHash->wPlatform    = pFileEntry->wPlatform;
-    pHash->dwBlockIndex = (DWORD)(pFileEntry - ha->pFileTable);
-
-    // Fill the hash index in the file entry
-    pFileEntry->dwHashIndex = (DWORD)(pHash - ha->pHashTable);
-    return pFileEntry->dwHashIndex;
-}
-
-// Finds a free space in the MPQ where to store next data
-// The free space begins beyond the file that is stored at the fuhrtest
-// position in the MPQ.
-void FindFreeMpqSpace(TMPQArchive * ha, ULONGLONG * pFreeSpacePos)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-    TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-    TFileEntry * pFileEntry = ha->pFileTable;
-    ULONGLONG FreeSpacePos = ha->pHeader->dwHeaderSize;
-    DWORD dwChunkCount;
-
-    // Parse the entire block table
-    for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-    {
-        // Only take existing files
-        if(pFileEntry->dwFlags & MPQ_FILE_EXISTS)
-        {
-            // If the end of the file is bigger than current MPQ table pos, update it
-            if((pFileEntry->ByteOffset + pFileEntry->dwCmpSize) > FreeSpacePos)
-            {
-                // Get the end of the file data
-                FreeSpacePos = pFileEntry->ByteOffset + pFileEntry->dwCmpSize;
-
-                // Add the MD5 chunks, if present
-                if(pHeader->dwRawChunkSize != 0 && pFileEntry->dwCmpSize != 0)
-                {
-                    dwChunkCount = ((pFileEntry->dwCmpSize - 1) / pHeader->dwRawChunkSize) + 1;
-                    FreeSpacePos += dwChunkCount * MD5_DIGEST_SIZE;
-                }
-            }
-        }
-    }
-
-    // Give the free space position to the caller
-    if(pFreeSpacePos != NULL)
-        *pFreeSpacePos = FreeSpacePos;
-}
-
-//-----------------------------------------------------------------------------
-// Common functions - MPQ File
-
-TMPQFile * CreateMpqFile(TMPQArchive * ha)
-{
-    TMPQFile * hf;
-
-    // Allocate space for TMPQFile
-    hf = STORM_ALLOC(TMPQFile, 1);
-    if(hf != NULL)
-    {
-        // Fill the file structure
-        memset(hf, 0, sizeof(TMPQFile));
-        hf->ha = ha;
-        hf->pStream = NULL;
-        hf->dwMagic = ID_MPQ_FILE;
-    }
-
-    return hf;
-}
-
-// Loads a table from MPQ.
-// Can be used for hash table, block table, sector offset table or sector checksum table
-int LoadMpqTable(
-        TMPQArchive * ha,
-        ULONGLONG ByteOffset,
-        void * pvTable,
-        DWORD dwCompressedSize,
-        DWORD dwRealSize,
-        DWORD dwKey)
-{
-    LPBYTE pbCompressed = NULL;
-    LPBYTE pbToRead = (LPBYTE)pvTable;
-    int nError = ERROR_SUCCESS;
-
-    // "interface.MPQ.part" in trial version of World of Warcraft
-    // has block table and hash table compressed.
-    if(dwCompressedSize < dwRealSize)
-    {
-        // Allocate temporary buffer for holding compressed data
-        pbCompressed = STORM_ALLOC(BYTE, dwCompressedSize);
-        if(pbCompressed == NULL)
-            return ERROR_NOT_ENOUGH_MEMORY;
-
-        // Assign the temporary buffer as target for read operation
-        pbToRead = pbCompressed;
-    }
-
-    // Read the table
-    if(FileStream_Read(ha->pStream, &ByteOffset, pbToRead, dwCompressedSize))
-    {
-        // First of all, decrypt the table
-        if(dwKey != 0)
-        {
-            BSWAP_ARRAY32_UNSIGNED(pbToRead, dwCompressedSize);
-            DecryptMpqBlock(pbToRead, dwCompressedSize, dwKey);
-            BSWAP_ARRAY32_UNSIGNED(pbToRead, dwCompressedSize);
-        }
-
-        // If the table is compressed, decompress it
-        if(dwCompressedSize < dwRealSize)
-        {
-            int cbOutBuffer = (int)dwRealSize;
-            int cbInBuffer = (int)dwCompressedSize;
-
-            if(!SCompDecompress2((char *)pvTable, &cbOutBuffer, (char *)pbCompressed, cbInBuffer))
-                nError = GetLastError();
-
-            // Free the temporary buffer
-            STORM_FREE(pbCompressed);
-        }
-    }
-    else
-    {
-        nError = GetLastError();
-    }
-
-    BSWAP_ARRAY32_UNSIGNED(pvTable, dwRealSize);
-    return nError;
-}
-
-void CalculateRawSectorOffset(
-        ULONGLONG & RawFilePos,
-        TMPQFile * hf,
-        DWORD dwSectorOffset)
-{
-    //
-    // Some MPQ protectors place the sector offset table after the actual file data.
-    // Sector offsets in the sector offset table are negative. When added
-    // to MPQ file offset from the block table entry, the result is a correct
-    // position of the file data in the MPQ.
-    //
-    // The position of sector table must be always within the MPQ, however.
-    // When a negative sector offset is found, we make sure that we make the addition
-    // just in 32-bits, and then add the MPQ offset.
-    //
-
-    if(dwSectorOffset & 0x80000000)
-    {
-        RawFilePos = hf->ha->MpqPos + ((DWORD)hf->pFileEntry->ByteOffset + dwSectorOffset);
-    }
-    else
-    {
-        RawFilePos = hf->RawFilePos + dwSectorOffset;
-    }
-
-    // We also have to add patch header size, if patch header is present
-    if(hf->pPatchInfo != NULL)
-        RawFilePos += hf->pPatchInfo->dwLength;
-}
-
-unsigned char * AllocateMd5Buffer(
-        DWORD dwRawDataSize,
-        DWORD dwChunkSize,
-        LPDWORD pcbMd5Size)
-{
-    unsigned char * md5_array;
-    DWORD cbMd5Size;
-
-    // Sanity check
-    assert(dwRawDataSize != 0);
-    assert(dwChunkSize != 0);
-
-    // Calculate how many MD5's we will calculate
-    cbMd5Size = (((dwRawDataSize - 1) / dwChunkSize) + 1) * MD5_DIGEST_SIZE;
-
-    // Allocate space for array or MD5s
-    md5_array = STORM_ALLOC(BYTE, cbMd5Size);
-
-    // Give the size of the MD5 array
-    if(pcbMd5Size != NULL)
-        *pcbMd5Size = cbMd5Size;
-    return md5_array;
-}
-
-// Allocates sector buffer and sector offset table
-int AllocateSectorBuffer(TMPQFile * hf)
-{
-    TMPQArchive * ha = hf->ha;
-
-    // Caller of AllocateSectorBuffer must ensure these
-    assert(hf->pbFileSector == NULL);
-    assert(hf->pFileEntry != NULL);
-    assert(hf->ha != NULL);
-
-    // Don't allocate anything if the file has zero size
-    if(hf->pFileEntry->dwFileSize == 0 || hf->dwDataSize == 0)
-        return ERROR_SUCCESS;
-
-    // Determine the file sector size and allocate buffer for it
-    hf->dwSectorSize = (hf->pFileEntry->dwFlags & MPQ_FILE_SINGLE_UNIT) ? hf->dwDataSize : ha->dwSectorSize;
-    hf->pbFileSector = STORM_ALLOC(BYTE, hf->dwSectorSize);
-    hf->dwSectorOffs = SFILE_INVALID_POS;
-
-    // Return result
-    return (hf->pbFileSector != NULL) ? (int)ERROR_SUCCESS : (int)ERROR_NOT_ENOUGH_MEMORY;
-}
-
-// Allocates sector offset table
-int AllocatePatchInfo(TMPQFile * hf, bool bLoadFromFile)
-{
-    TMPQArchive * ha = hf->ha;
-    DWORD dwLength = sizeof(TPatchInfo);
-
-    // The following conditions must be true
-    assert(hf->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE);
-    assert(hf->pPatchInfo == NULL);
-
-__AllocateAndLoadPatchInfo:
-
-    // Allocate space for patch header. Start with default size,
-    // and if its size if bigger, then we reload them
-    hf->pPatchInfo = (TPatchInfo *)STORM_ALLOC(BYTE, dwLength);
-    if(hf->pPatchInfo == NULL)
-        return ERROR_NOT_ENOUGH_MEMORY;
-
-    // Do we have to load the patch header from the file ?
-    if(bLoadFromFile)
-    {
-        // Load the patch header
-        if(!FileStream_Read(ha->pStream, &hf->RawFilePos, hf->pPatchInfo, dwLength))
-        {
-            // Free the patch info
-            STORM_FREE(hf->pPatchInfo);
-            hf->pPatchInfo = NULL;
-            return GetLastError();
-        }
-
-        // Perform necessary swapping
-        hf->pPatchInfo->dwLength = BSWAP_INT32_UNSIGNED(hf->pPatchInfo->dwLength);
-        hf->pPatchInfo->dwFlags = BSWAP_INT32_UNSIGNED(hf->pPatchInfo->dwFlags);
-        hf->pPatchInfo->dwDataSize = BSWAP_INT32_UNSIGNED(hf->pPatchInfo->dwDataSize);
-
-        // Verify the size of the patch header
-        // If it's not default size, we have to reload them
-        if(hf->pPatchInfo->dwLength > dwLength)
-        {
-            // Free the patch info
-            dwLength = hf->pPatchInfo->dwLength;
-            STORM_FREE(hf->pPatchInfo);
-            hf->pPatchInfo = NULL;
-
-            // If the length is out of all possible ranges, fail the operation
-            if(dwLength > 0x400)
-                return ERROR_FILE_CORRUPT;
-            goto __AllocateAndLoadPatchInfo;
-        }
-
-        // Patch file data size according to the patch header
-        hf->dwDataSize = hf->pPatchInfo->dwDataSize;
-    }
-    else
-    {
-        memset(hf->pPatchInfo, 0, dwLength);
-    }
-
-    // Save the final length to the patch header
-    hf->pPatchInfo->dwLength = dwLength;
-    hf->pPatchInfo->dwFlags  = 0x80000000;
-    return ERROR_SUCCESS;
-}
-
-// Allocates sector offset table
-int AllocateSectorOffsets(TMPQFile * hf, bool bLoadFromFile)
-{
-    TMPQArchive * ha = hf->ha;
-    TFileEntry * pFileEntry = hf->pFileEntry;
-    DWORD dwSectorOffsLen;
-    bool bSectorOffsetTableCorrupt = false;
-
-    // Caller of AllocateSectorOffsets must ensure these
-    assert(hf->SectorOffsets == NULL);
-    assert(hf->pFileEntry != NULL);
-    assert(hf->dwDataSize != 0);
-    assert(hf->ha != NULL);
-
-    // If the file is stored as single unit, just set number of sectors to 1
-    if(pFileEntry->dwFlags & MPQ_FILE_SINGLE_UNIT)
-    {
-        hf->dwSectorCount = 1;
-        return ERROR_SUCCESS;
-    }
-
-    // Calculate the number of data sectors
-    // Note that this doesn't work if the file size is zero
-    hf->dwSectorCount = ((hf->dwDataSize - 1) / hf->dwSectorSize) + 1;
-
-    // Calculate the number of file sectors
-    dwSectorOffsLen = (hf->dwSectorCount + 1) * sizeof(DWORD);
-
-    // If MPQ_FILE_SECTOR_CRC flag is set, there will either be extra DWORD
-    // or an array of MD5's. Either way, we read at least 4 bytes more
-    // in order to save additional read from the file.
-    if(pFileEntry->dwFlags & MPQ_FILE_SECTOR_CRC)
-        dwSectorOffsLen += sizeof(DWORD);
-
-    // Only allocate and load the table if the file is compressed
-    if(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED)
-    {
-__LoadSectorOffsets:
-
-        // Allocate the sector offset table
-        hf->SectorOffsets = (DWORD *)STORM_ALLOC(BYTE, dwSectorOffsLen);
-        if(hf->SectorOffsets == NULL)
-            return ERROR_NOT_ENOUGH_MEMORY;
-
-        // Only read from the file if we are supposed to do so
-        if(bLoadFromFile)
-        {
-            ULONGLONG RawFilePos = hf->RawFilePos;
-
-            if(hf->pPatchInfo != NULL)
-                RawFilePos += hf->pPatchInfo->dwLength;
-
-            // Load the sector offsets from the file
-            if(!FileStream_Read(ha->pStream, &RawFilePos, hf->SectorOffsets, dwSectorOffsLen))
-            {
-                // Free the sector offsets
-                STORM_FREE(hf->SectorOffsets);
-                hf->SectorOffsets = NULL;
-                return GetLastError();
-            }
-
-            // Swap the sector positions
-            BSWAP_ARRAY32_UNSIGNED(hf->SectorOffsets, dwSectorOffsLen);
-
-            // Decrypt loaded sector positions if necessary
-            if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
-            {
-                // If we don't know the file key, try to find it.
-                if(hf->dwFileKey == 0)
-                {
-                    hf->dwFileKey = DetectFileKeyBySectorSize(hf->SectorOffsets, dwSectorOffsLen);
-                    if(hf->dwFileKey == 0)
-                    {
-                        STORM_FREE(hf->SectorOffsets);
-                        hf->SectorOffsets = NULL;
-                        return ERROR_UNKNOWN_FILE_KEY;
-                    }
-                }
-
-                // Decrypt sector positions
-                DecryptMpqBlock(hf->SectorOffsets, dwSectorOffsLen, hf->dwFileKey - 1);
-            }
-
-            //
-            // Validate the sector offset table
-            //
-            // Note: Some MPQ protectors put the actual file data before the sector offset table.
-            // In this case, the sector offsets are negative (> 0x80000000).
-            //
-
-            for(DWORD i = 0; i < hf->dwSectorCount; i++)
-            {
-                DWORD dwSectorOffset1 = hf->SectorOffsets[i+1];
-                DWORD dwSectorOffset0 = hf->SectorOffsets[i];
-
-                // Every following sector offset must be bigger than the previous one
-                if(dwSectorOffset1 <= dwSectorOffset0)
-                {
-                    bSectorOffsetTableCorrupt = true;
-                    break;
-                }
-
-                // The sector size must not be bigger than compressed file size
-                if((dwSectorOffset1 - dwSectorOffset0) > pFileEntry->dwCmpSize)
-                {
-                    bSectorOffsetTableCorrupt = true;
-                    break;
-                }
-            }
-
-            // If data corruption detected, free the sector offset table
-            if(bSectorOffsetTableCorrupt)
-            {
-                STORM_FREE(hf->SectorOffsets);
-                hf->SectorOffsets = NULL;
-                return ERROR_FILE_CORRUPT;
-            }
-
-            //
-            // There may be various extra DWORDs loaded after the sector offset table.
-            // They are mostly empty on WoW release MPQs, but on MPQs from PTR,
-            // they contain random non-zero data. Their meaning is unknown.
-            //
-            // These extra values are, however, include in the dwCmpSize in the file
-            // table. We cannot ignore them, because compacting archive would fail
-            //
-
-            if(hf->SectorOffsets[0] > dwSectorOffsLen)
-            {
-                dwSectorOffsLen = hf->SectorOffsets[0];
-                STORM_FREE(hf->SectorOffsets);
-                hf->SectorOffsets = NULL;
-                goto __LoadSectorOffsets;
-            }
-        }
-        else
-        {
-            memset(hf->SectorOffsets, 0, dwSectorOffsLen);
-            hf->SectorOffsets[0] = dwSectorOffsLen;
-        }
-    }
-
-    return ERROR_SUCCESS;
-}
-
-int AllocateSectorChecksums(TMPQFile * hf, bool bLoadFromFile)
-{
-    TMPQArchive * ha = hf->ha;
-    TFileEntry * pFileEntry = hf->pFileEntry;
-    ULONGLONG RawFilePos;
-    DWORD dwCompressedSize = 0;
-    DWORD dwExpectedSize;
-    DWORD dwCrcOffset;                      // Offset of the CRC table, relative to file offset in the MPQ
-    DWORD dwCrcSize;
-
-    // Caller of AllocateSectorChecksums must ensure these
-    assert(hf->SectorChksums == NULL);
-    assert(hf->SectorOffsets != NULL);
-    assert(hf->pFileEntry != NULL);
-    assert(hf->ha != NULL);
-
-    // Single unit files don't have sector checksums
-    if(pFileEntry->dwFlags & MPQ_FILE_SINGLE_UNIT)
-        return ERROR_SUCCESS;
-
-    // Caller must ensure that we are only called when we have sector checksums
-    assert(pFileEntry->dwFlags & MPQ_FILE_SECTOR_CRC);
-
-    //
-    // Older MPQs store an array of CRC32's after
-    // the raw file data in the MPQ.
-    //
-    // In newer MPQs, the (since Cataclysm BETA) the (attributes) file
-    // contains additional 32-bit values beyond the sector table.
-    // Their number depends on size of the (attributes), but their
-    // meaning is unknown. They are usually zeroed in retail game files,
-    // but contain some sort of checksum in BETA MPQs
-    //
-
-    // Does the size of the file table match with the CRC32-based checksums?
-    dwExpectedSize = (hf->dwSectorCount + 2) * sizeof(DWORD);
-    if(hf->SectorOffsets[0] == dwExpectedSize)
-    {
-        // Is there valid size of the sector checksums?
-        if(hf->SectorOffsets[hf->dwSectorCount + 1] >= hf->SectorOffsets[hf->dwSectorCount])
-            dwCompressedSize = hf->SectorOffsets[hf->dwSectorCount + 1] - hf->SectorOffsets[hf->dwSectorCount];
-
-        // Ignore cases when the length is too small or too big.
-        if(dwCompressedSize < sizeof(DWORD) || dwCompressedSize > hf->dwSectorSize)
-            return ERROR_SUCCESS;
-
-        // Allocate the array for the sector checksums
-        hf->SectorChksums = STORM_ALLOC(DWORD, hf->dwSectorCount);
-        if(hf->SectorChksums == NULL)
-            return ERROR_NOT_ENOUGH_MEMORY;
-
-        // If we are not supposed to load it from the file, allocate empty buffer
-        if(bLoadFromFile == false)
-        {
-            memset(hf->SectorChksums, 0, hf->dwSectorCount * sizeof(DWORD));
-            return ERROR_SUCCESS;
-        }
-
-        // Calculate offset of the CRC table
-        dwCrcSize = hf->dwSectorCount * sizeof(DWORD);
-        dwCrcOffset = hf->SectorOffsets[hf->dwSectorCount];
-        CalculateRawSectorOffset(RawFilePos, hf, dwCrcOffset);
-
-        // Now read the table from the MPQ
-        return LoadMpqTable(ha, RawFilePos, hf->SectorChksums, dwCompressedSize, dwCrcSize, 0);
-    }
-
-    // If the size doesn't match, we ignore sector checksums
-    //  assert(false);
-    return ERROR_SUCCESS;
-}
-
-int WritePatchInfo(TMPQFile * hf)
-{
-    TMPQArchive * ha = hf->ha;
-    TPatchInfo * pPatchInfo = hf->pPatchInfo;
-
-    // The caller must make sure that this function is only called
-    // when the following is true.
-    assert(hf->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE);
-    assert(pPatchInfo != NULL);
-
-    BSWAP_ARRAY32_UNSIGNED(pPatchInfo, 3 * sizeof(DWORD));
-    if(!FileStream_Write(ha->pStream, &hf->RawFilePos, pPatchInfo, sizeof(TPatchInfo)))
-        return GetLastError();
-
-    return ERROR_SUCCESS;
-}
-
-int WriteSectorOffsets(TMPQFile * hf)
-{
-    TMPQArchive * ha = hf->ha;
-    TFileEntry * pFileEntry = hf->pFileEntry;
-    ULONGLONG RawFilePos = hf->RawFilePos;
-    DWORD dwSectorOffsLen;
-
-    // The caller must make sure that this function is only called
-    // when the following is true.
-    assert(hf->pFileEntry->dwFlags & MPQ_FILE_COMPRESSED);
-    assert(hf->SectorOffsets != NULL);
-    dwSectorOffsLen = hf->SectorOffsets[0];
-
-    // If file is encrypted, sector positions are also encrypted
-    if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
-        EncryptMpqBlock(hf->SectorOffsets, dwSectorOffsLen, hf->dwFileKey - 1);
-    BSWAP_ARRAY32_UNSIGNED(hf->SectorOffsets, dwSectorOffsLen);
-
-    // Adjust sector offset table position, if we also have patch info
-    if(hf->pPatchInfo != NULL)
-        RawFilePos += hf->pPatchInfo->dwLength;
-
-    // Write sector offsets to the archive
-    if(!FileStream_Write(ha->pStream, &RawFilePos, hf->SectorOffsets, dwSectorOffsLen))
-        return GetLastError();
-
-    // Not necessary, as the sector checksums
-    // are going to be freed when this is done.
-    //  BSWAP_ARRAY32_UNSIGNED(hf->SectorOffsets, dwSectorOffsLen);
-    return ERROR_SUCCESS;
-}
-
-
-int WriteSectorChecksums(TMPQFile * hf)
-{
-    TMPQArchive * ha = hf->ha;
-    ULONGLONG RawFilePos;
-    TFileEntry * pFileEntry = hf->pFileEntry;
-    LPBYTE pbCompressed;
-    DWORD dwCompressedSize = 0;
-    DWORD dwCrcSize;
-    int nOutSize;
-    int nError = ERROR_SUCCESS;
-
-    // The caller must make sure that this function is only called
-    // when the following is true.
-    assert(hf->pFileEntry->dwFlags & MPQ_FILE_SECTOR_CRC);
-    assert(hf->SectorOffsets != NULL);
-    assert(hf->SectorChksums != NULL);
-
-    // If the MPQ has MD5 of each raw data chunk,
-    // we leave sector offsets empty
-    if(ha->pHeader->dwRawChunkSize != 0)
-    {
-        hf->SectorOffsets[hf->dwSectorCount + 1] = hf->SectorOffsets[hf->dwSectorCount];
-        return ERROR_SUCCESS;
-    }
-
-    // Calculate size of the checksum array
-    dwCrcSize = hf->dwSectorCount * sizeof(DWORD);
-
-    // Allocate buffer for compressed sector CRCs.
-    pbCompressed = STORM_ALLOC(BYTE, dwCrcSize);
-    if(pbCompressed == NULL)
-        return ERROR_NOT_ENOUGH_MEMORY;
-
-    // Perform the compression
-    BSWAP_ARRAY32_UNSIGNED(hf->SectorChksums, dwCrcSize);
-
-    nOutSize = (int)dwCrcSize;
-    SCompCompress((char *)pbCompressed, &nOutSize, (char *)hf->SectorChksums, (int)dwCrcSize, MPQ_COMPRESSION_ZLIB, 0, 0);
-    dwCompressedSize = (DWORD)nOutSize;
-
-    // Write the sector CRCs to the archive
-    RawFilePos = hf->RawFilePos + hf->SectorOffsets[hf->dwSectorCount];
-    if(hf->pPatchInfo != NULL)
-        RawFilePos += hf->pPatchInfo->dwLength;
-    if(!FileStream_Write(ha->pStream, &RawFilePos, pbCompressed, dwCompressedSize))
-        nError = GetLastError();
-
-    // Not necessary, as the sector checksums
-    // are going to be freed when this is done.
-    //  BSWAP_ARRAY32_UNSIGNED(hf->SectorChksums, dwCrcSize);
-
-    // Store the sector CRCs
-    hf->SectorOffsets[hf->dwSectorCount + 1] = hf->SectorOffsets[hf->dwSectorCount] + dwCompressedSize;
-    pFileEntry->dwCmpSize += dwCompressedSize;
-    STORM_FREE(pbCompressed);
-    return nError;
-}
-
-int WriteMemDataMD5(
-        TFileStream * pStream,
-        ULONGLONG RawDataOffs,
-        void * pvRawData,
-        DWORD dwRawDataSize,
-        DWORD dwChunkSize,
-        LPDWORD pcbTotalSize)
-{
-    unsigned char * md5_array;
-    unsigned char * md5;
-    LPBYTE pbRawData = (LPBYTE)pvRawData;
-    DWORD dwBytesRemaining = dwRawDataSize;
-    DWORD dwMd5ArraySize = 0;
-    int nError = ERROR_SUCCESS;
-
-    // Allocate buffer for array of MD5
-    md5_array = md5 = AllocateMd5Buffer(dwRawDataSize, dwChunkSize, &dwMd5ArraySize);
-    if(md5_array == NULL)
-        return ERROR_NOT_ENOUGH_MEMORY;
-
-    // For every file chunk, calculate MD5
-    while(dwBytesRemaining != 0)
-    {
-        // Get the remaining number of bytes to read
-        dwChunkSize = STORMLIB_MIN(dwBytesRemaining, dwChunkSize);
-
-        // Calculate MD5
-        CalculateDataBlockHash(pbRawData, dwChunkSize, md5);
-        md5 += MD5_DIGEST_SIZE;
-
-        // Move offset and size
-        dwBytesRemaining -= dwChunkSize;
-        pbRawData += dwChunkSize;
-    }
-
-    // Write the array od MD5's to the file
-    RawDataOffs += dwRawDataSize;
-    if(!FileStream_Write(pStream, &RawDataOffs, md5_array, dwMd5ArraySize))
-        nError = GetLastError();
-
-    // Give the caller the size of the MD5 array
-    if(pcbTotalSize != NULL)
-        *pcbTotalSize = dwRawDataSize + dwMd5ArraySize;
-
-    // Free buffers and exit
-    STORM_FREE(md5_array);
-    return nError;
-}
-
-
-// Writes the MD5 for each chunk of the raw file data
-int WriteMpqDataMD5(
-        TFileStream * pStream,
-        ULONGLONG RawDataOffs,
-        DWORD dwRawDataSize,
-        DWORD dwChunkSize)
-{
-    unsigned char * md5_array;
-    unsigned char * md5;
-    LPBYTE pbFileChunk;
-    DWORD dwMd5ArraySize = 0;
-    DWORD dwToRead = dwRawDataSize;
-    int nError = ERROR_SUCCESS;
-
-    // Allocate buffer for array of MD5
-    md5_array = md5 = AllocateMd5Buffer(dwRawDataSize, dwChunkSize, &dwMd5ArraySize);
-    if(md5_array == NULL)
-        return ERROR_NOT_ENOUGH_MEMORY;
-
-    // Allocate space for file chunk
-    pbFileChunk = STORM_ALLOC(BYTE, dwChunkSize);
-    if(pbFileChunk == NULL)
-    {
-        STORM_FREE(md5_array);
-        return ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // For every file chunk, calculate MD5
-    while(dwRawDataSize != 0)
-    {
-        // Get the remaining number of bytes to read
-        dwToRead = STORMLIB_MIN(dwRawDataSize, dwChunkSize);
-
-        // Read the chunk
-        if(!FileStream_Read(pStream, &RawDataOffs, pbFileChunk, dwToRead))
-        {
-            nError = GetLastError();
-            break;
-        }
-
-        // Calculate MD5
-        CalculateDataBlockHash(pbFileChunk, dwToRead, md5);
-        md5 += MD5_DIGEST_SIZE;
-
-        // Move offset and size
-        RawDataOffs += dwToRead;
-        dwRawDataSize -= dwToRead;
-    }
-
-    // Write the array od MD5's to the file
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!FileStream_Write(pStream, NULL, md5_array, dwMd5ArraySize))
-            nError = GetLastError();
-    }
-
-    // Free buffers and exit
-    STORM_FREE(pbFileChunk);
-    STORM_FREE(md5_array);
-    return nError;
-}
-
-// Frees the structure for MPQ file
-void FreeMPQFile(TMPQFile *& hf)
-{
-    if(hf != NULL)
-    {
-        // If we have patch file attached to this one, free it first
-        if(hf->hfPatchFile != NULL)
-            FreeMPQFile(hf->hfPatchFile);
-
-        // Then free all buffers allocated in the file structure
-        if(hf->pPatchHeader != NULL)
-            STORM_FREE(hf->pPatchHeader);
-        if(hf->pbFileData != NULL)
-            STORM_FREE(hf->pbFileData);
-        if(hf->pPatchInfo != NULL)
-            STORM_FREE(hf->pPatchInfo);
-        if(hf->SectorOffsets != NULL)
-            STORM_FREE(hf->SectorOffsets);
-        if(hf->SectorChksums != NULL)
-            STORM_FREE(hf->SectorChksums);
-        if(hf->pbFileSector != NULL)
-            STORM_FREE(hf->pbFileSector);
-        FileStream_Close(hf->pStream);
-        STORM_FREE(hf);
-        hf = NULL;
-    }
-}
-
-// Frees the MPQ archive
-void FreeMPQArchive(TMPQArchive *& ha)
-{
-    if(ha != NULL)
-    {
-        // First of all, free the patch archive, if any
-        if(ha->haPatch != NULL)
-            FreeMPQArchive(ha->haPatch);
-
-        // Close the file stream
-        FileStream_Close(ha->pStream);
-        ha->pStream = NULL;
-
-        // Free the file names from the file table
-        if(ha->pFileTable != NULL)
-        {
-            for(DWORD i = 0; i < ha->dwFileTableSize; i++)
-            {
-                if(ha->pFileTable[i].szFileName != NULL)
-                    STORM_FREE(ha->pFileTable[i].szFileName);
-                ha->pFileTable[i].szFileName = NULL;
-            }
-
-            // Then free all buffers allocated in the archive structure
-            STORM_FREE(ha->pFileTable);
-        }
-
-        if(ha->pBitmap != NULL)
-            STORM_FREE(ha->pBitmap);
-        if(ha->pHashTable != NULL)
-            STORM_FREE(ha->pHashTable);
-        if(ha->pHetTable != NULL)
-            FreeHetTable(ha->pHetTable);
-        STORM_FREE(ha);
-        ha = NULL;
-    }
-}
-
-const char * GetPlainFileNameA(const char * szFileName)
-{
-    const char * szPlainName = szFileName;
-
-    while(*szFileName != 0)
-    {
-        if(*szFileName == '\\' || *szFileName == '/')
-            szPlainName = szFileName + 1;
-        szFileName++;
-    }
-
-    return szPlainName;
-}
-
-const TCHAR * GetPlainFileNameT(const TCHAR * szFileName)
-{
-    const TCHAR * szPlainName = szFileName;
-
-    while(*szFileName != 0)
-    {
-        if(*szFileName == '\\' || *szFileName == '/')
-            szPlainName = szFileName + 1;
-        szFileName++;
-    }
-
-    return szPlainName;
-}
-
-bool IsInternalMpqFileName(const char * szFileName)
-{
-    if(szFileName != NULL && szFileName[0] == '(')
-    {
-        if(!_stricmp(szFileName, LISTFILE_NAME) ||
-                !_stricmp(szFileName, ATTRIBUTES_NAME) ||
-                !_stricmp(szFileName, SIGNATURE_NAME))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-// Verifies if the file name is a pseudo-name
-bool IsPseudoFileName(const char * szFileName, DWORD * pdwFileIndex)
-{
-    DWORD dwFileIndex = 0;
-
-    if(szFileName != NULL)
-    {
-        // Must be "File########.ext"
-        if(!_strnicmp(szFileName, "File", 4))
-        {
-            // Check 8 digits
-            for(int i = 4; i < 4+8; i++)
-            {
-                if(szFileName[i] < '0' || szFileName[i] > '9')
-                    return false;
-                dwFileIndex = (dwFileIndex * 10) + (szFileName[i] - '0');
-            }
-
-            // An extension must follow
-            if(szFileName[12] == '.')
-            {
-                if(pdwFileIndex != NULL)
-                    *pdwFileIndex = dwFileIndex;
-                return true;
-            }
-        }
-    }
-
-    // Not a pseudo-name
-    return false;
-}
-
-//-----------------------------------------------------------------------------
-// Functions calculating and verifying the MD5 signature
-
-bool IsValidMD5(LPBYTE pbMd5)
-{
-    BYTE BitSummary = 0;
-
-    // The MD5 is considered invalid of it is zeroed
-    BitSummary |= pbMd5[0x00] | pbMd5[0x01] | pbMd5[0x02] | pbMd5[0x03] | pbMd5[0x04] | pbMd5[0x05] | pbMd5[0x06] | pbMd5[0x07];
-    BitSummary |= pbMd5[0x08] | pbMd5[0x09] | pbMd5[0x0A] | pbMd5[0x0B] | pbMd5[0x0C] | pbMd5[0x0D] | pbMd5[0x0E] | pbMd5[0x0F];
-    return (BitSummary != 0);
-}
-
-bool VerifyDataBlockHash(void * pvDataBlock, DWORD cbDataBlock, LPBYTE expected_md5)
-{
-    hash_state md5_state;
-    BYTE md5_digest[MD5_DIGEST_SIZE];
-
-    // Don't verify the block if the MD5 is not valid.
-    if(!IsValidMD5(expected_md5))
-        return true;
-
-    // Calculate the MD5 of the data block
-    md5_init(&md5_state);
-    md5_process(&md5_state, (unsigned char *)pvDataBlock, cbDataBlock);
-    md5_done(&md5_state, md5_digest);
-
-    // Does the MD5's match?
-    return (memcmp(md5_digest, expected_md5, MD5_DIGEST_SIZE) == 0);
-}
-
-void CalculateDataBlockHash(void * pvDataBlock, DWORD cbDataBlock, LPBYTE md5_hash)
-{
-    hash_state md5_state;
-
-    md5_init(&md5_state);
-    md5_process(&md5_state, (unsigned char *)pvDataBlock, cbDataBlock);
-    md5_done(&md5_state, md5_hash);
-}
-
-
-//-----------------------------------------------------------------------------
-// Swapping functions
-
-#ifndef PLATFORM_LITTLE_ENDIAN
-
-//
-// Note that those functions are implemented for Mac operating system,
-// as this is the only supported platform that uses big endian.
-//
-
-// Swaps a signed 16-bit integer
-int16_t SwapInt16(uint16_t data)
-{
-    return (int16_t)CFSwapInt16(data);
-}
-
-// Swaps an unsigned 16-bit integer
-uint16_t SwapUInt16(uint16_t data)
-{
-    return CFSwapInt16(data);
-}
-
-// Swaps signed 32-bit integer
-int32_t SwapInt32(uint32_t data)
-{
-    return (int32_t)CFSwapInt32(data);
-}
-
-// Swaps an unsigned 32-bit integer
-uint32_t SwapUInt32(uint32_t data)
-{
-    return CFSwapInt32(data);
-}
-
-// Swaps signed 64-bit integer
-int64_t SwapInt64(int64_t data)
-{
-    return (int64_t)CFSwapInt64(data);
-}
-
-// Swaps an unsigned 64-bit integer
-uint64_t SwapUInt64(uint64_t data)
-{
-    return CFSwapInt64(data);
-}
-
-// Swaps array of unsigned 16-bit integers
-void ConvertUInt16Buffer(void * ptr, size_t length)
-{
-    uint16_t * buffer = (uint16_t *)ptr;
-    uint32_t nElements = (uint32_t)(length / sizeof(uint16_t));
-
-    while(nElements-- > 0)
-    {
-        *buffer = SwapUInt16(*buffer);
-        buffer++;
-    }
-}
-
-// Swaps array of unsigned 32-bit integers
-void ConvertUInt32Buffer(void * ptr, size_t length)
-{
-    uint32_t * buffer = (uint32_t *)ptr;
-    uint32_t nElements = (uint32_t)(length / sizeof(uint32_t));
-
-    while(nElements-- > 0)
-    {
-        *buffer = SwapUInt32(*buffer);
-        buffer++;
-    }
-}
-
-// Swaps array of unsigned 64-bit integers
-void ConvertUInt64Buffer(void * ptr, size_t length)
-{
-    uint64_t * buffer = (uint64_t *)ptr;
-    uint32_t nElements = (uint32_t)(length / sizeof(uint64_t));
-
-    while(nElements-- > 0)
-    {
-        *buffer = SwapUInt64(*buffer);
-        buffer++;
-    }
-}
-
-// Swaps the TMPQUserData structure
-void ConvertTMPQUserData(void *userData)
-{
-    TMPQUserData * theData = (TMPQUserData *)userData;
-
-    theData->dwID = SwapUInt32(theData->dwID);
-    theData->cbUserDataSize = SwapUInt32(theData->cbUserDataSize);
-    theData->dwHeaderOffs = SwapUInt32(theData->dwHeaderOffs);
-    theData->cbUserDataHeader = SwapUInt32(theData->cbUserDataHeader);
-}
-
-// Swaps the TMPQHeader structure
-void ConvertTMPQHeader(void *header)
-{
-    TMPQHeader * theHeader = (TMPQHeader *)header;
-
-    theHeader->dwID = SwapUInt32(theHeader->dwID);
-    theHeader->dwHeaderSize = SwapUInt32(theHeader->dwHeaderSize);
-    theHeader->dwArchiveSize = SwapUInt32(theHeader->dwArchiveSize);
-    theHeader->wFormatVersion = SwapUInt16(theHeader->wFormatVersion);
-    theHeader->wSectorSize = SwapUInt16(theHeader->wSectorSize);
-    theHeader->dwHashTablePos = SwapUInt32(theHeader->dwHashTablePos);
-    theHeader->dwBlockTablePos = SwapUInt32(theHeader->dwBlockTablePos);
-    theHeader->dwHashTableSize = SwapUInt32(theHeader->dwHashTableSize);
-    theHeader->dwBlockTableSize = SwapUInt32(theHeader->dwBlockTableSize);
-
-    if(theHeader->wFormatVersion >= MPQ_FORMAT_VERSION_2)
-    {
-        // Swap the hi-block table position
-        theHeader->HiBlockTablePos64 = SwapUInt64(theHeader->HiBlockTablePos64);
-
-        theHeader->wHashTablePosHi = SwapUInt16(theHeader->wHashTablePosHi);
-        theHeader->wBlockTablePosHi = SwapUInt16(theHeader->wBlockTablePosHi);
-
-        if(theHeader->wFormatVersion >= MPQ_FORMAT_VERSION_3)
-        {
-            theHeader->ArchiveSize64 = SwapUInt64(theHeader->ArchiveSize64);
-            theHeader->BetTablePos64 = SwapUInt64(theHeader->BetTablePos64);
-            theHeader->HetTablePos64 = SwapUInt64(theHeader->HetTablePos64);
-
-            if(theHeader->wFormatVersion >= MPQ_FORMAT_VERSION_4)
-            {
-                theHeader->HashTableSize64    = SwapUInt64(theHeader->HashTableSize64);
-                theHeader->BlockTableSize64   = SwapUInt64(theHeader->BlockTableSize64);
-                theHeader->HiBlockTableSize64 = SwapUInt64(theHeader->HiBlockTableSize64);
-                theHeader->HetTableSize64     = SwapUInt64(theHeader->HetTableSize64);
-                theHeader->BetTableSize64     = SwapUInt64(theHeader->BetTableSize64);
-            }
-        }
-    }
-}
-
-#endif  // PLATFORM_LITTLE_ENDIAN
diff --git a/dep/StormLibOld/src/SBaseDumpData.cpp b/dep/StormLibOld/src/SBaseDumpData.cpp
deleted file mode 100644
index 9b6537bd3..000000000
--- a/dep/StormLibOld/src/SBaseDumpData.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*****************************************************************************/
-/* SBaseDumpData.cpp                      Copyright (c) Ladislav Zezula 2011 */
-/*---------------------------------------------------------------------------*/
-/* Description :                                                             */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 26.01.11  1.00  Lad  The first version of SBaseDumpData.cpp               */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-#ifdef __STORMLIB_DUMP_DATA__
-
-void DumpMpqHeader(TMPQHeader * pHeader)
-{
-    printf("== MPQ Header =================================\n");
-    printf("DWORD dwID                   = %08X\n",    pHeader->dwID);
-    printf("DWORD dwHeaderSize           = %08X\n",    pHeader->dwHeaderSize);
-    printf("DWORD dwArchiveSize          = %08X\n",    pHeader->dwArchiveSize);
-    printf("USHORT wFormatVersion        = %04X\n",    pHeader->wFormatVersion);
-    printf("USHORT wSectorSize           = %04X\n",    pHeader->wSectorSize);
-    printf("DWORD dwHashTablePos         = %08X\n",    pHeader->dwHashTablePos);
-    printf("DWORD dwBlockTablePos        = %08X\n",    pHeader->dwBlockTablePos);
-    printf("DWORD dwHashTableSize        = %08X\n",    pHeader->dwHashTableSize);
-    printf("DWORD dwBlockTableSize       = %08X\n",    pHeader->dwBlockTableSize);
-    printf("ULONGLONG HiBlockTablePos64  = %016llX\n", pHeader->HiBlockTablePos64);
-    printf("USHORT wHashTablePosHi       = %04X\n",    pHeader->wHashTablePosHi);
-    printf("USHORT wBlockTablePosHi      = %04X\n",    pHeader->wBlockTablePosHi);
-    printf("ULONGLONG ArchiveSize64      = %016llX\n", pHeader->ArchiveSize64);
-    printf("ULONGLONG BetTablePos64      = %016llX\n", pHeader->BetTablePos64);
-    printf("ULONGLONG HetTablePos64      = %016llX\n", pHeader->HetTablePos64);
-    printf("ULONGLONG HashTableSize64    = %016llX\n", pHeader->HashTableSize64);
-    printf("ULONGLONG BlockTableSize64   = %016llX\n", pHeader->BlockTableSize64);
-    printf("ULONGLONG HiBlockTableSize64 = %016llX\n", pHeader->HiBlockTableSize64);
-    printf("ULONGLONG HetTableSize64     = %016llX\n", pHeader->HetTableSize64);
-    printf("ULONGLONG BetTableSize64     = %016llX\n", pHeader->BetTableSize64);
-    printf("DWORD dwRawChunkSize         = %08X\n",     pHeader->dwRawChunkSize);
-    printf("-----------------------------------------------\n\n");
-}
-
-void DumpHetAndBetTable(TMPQHetTable * pHetTable, TMPQBetTable * pBetTable)
-{
-    DWORD i;
-
-    if(pHetTable == NULL || pBetTable == NULL)
-        return;
-
-    printf("== HET Header =================================\n");
-    printf("ULONGLONG  AndMask64         = %016llX\n", pHetTable->AndMask64);
-    printf("ULONGLONG  OrMask64          = %016llX\n", pHetTable->OrMask64);
-    printf("DWORD      dwIndexSizeTotal  = %08X\n",     pHetTable->dwIndexSizeTotal);
-    printf("DWORD      dwIndexSizeExtra  = %08X\n",     pHetTable->dwIndexSizeExtra);
-    printf("DWORD      dwIndexSize       = %08X\n",     pHetTable->dwIndexSize);
-    printf("DWORD      dwMaxFileCount    = %08X\n",     pHetTable->dwMaxFileCount);
-    printf("DWORD      dwHashTableSize   = %08X\n",     pHetTable->dwHashTableSize);
-    printf("DWORD      dwHashBitSize     = %08X\n",     pHetTable->dwHashBitSize);
-    printf("-----------------------------------------------\n\n");
-
-    printf("== BET Header =================================\n");
-    printf("DWORD dwTableEntrySize       = %08X\n",     pBetTable->dwTableEntrySize);
-    printf("DWORD dwBitIndex_FilePos     = %08X\n",     pBetTable->dwBitIndex_FilePos);
-    printf("DWORD dwBitIndex_FileSize    = %08X\n",     pBetTable->dwBitIndex_FileSize);
-    printf("DWORD dwBitIndex_CmpSize     = %08X\n",     pBetTable->dwBitIndex_CmpSize);
-    printf("DWORD dwBitIndex_FlagIndex   = %08X\n",     pBetTable->dwBitIndex_FlagIndex);
-    printf("DWORD dwBitIndex_Unknown     = %08X\n",     pBetTable->dwBitIndex_Unknown);
-    printf("DWORD dwBitCount_FilePos     = %08X\n",     pBetTable->dwBitCount_FilePos);
-    printf("DWORD dwBitCount_FileSize    = %08X\n",     pBetTable->dwBitCount_FileSize);
-    printf("DWORD dwBitCount_CmpSize     = %08X\n",     pBetTable->dwBitCount_CmpSize);
-    printf("DWORD dwBitCount_FlagIndex   = %08X\n",     pBetTable->dwBitCount_FlagIndex);
-    printf("DWORD dwBitCount_Unknown     = %08X\n",     pBetTable->dwBitCount_Unknown);
-    printf("DWORD dwBetHashSizeTotal     = %08X\n",     pBetTable->dwBetHashSizeTotal);
-    printf("DWORD dwBetHashSizeExtra     = %08X\n",     pBetTable->dwBetHashSizeExtra);
-    printf("DWORD dwBetHashSize          = %08X\n",     pBetTable->dwBetHashSize);
-    printf("DWORD dwMaxFileCount         = %08X\n",     pBetTable->dwMaxFileCount);
-    printf("DWORD dwFlagCount            = %08X\n",     pBetTable->dwFlagCount);
-    printf("-----------------------------------------------\n\n");
-
-    printf("== HET & Bet Table ======================================================================\n\n");
-    printf("HetIdx HetHash BetIdx BetHash          ByteOffset       FileSize CmpSize  FlgIdx Flags   \n");
-    printf("------ ------- ------ ---------------- ---------------- -------- -------- ------ --------\n");
-    for(i = 0; i < pHetTable->dwHashTableSize; i++)
-    {
-        ULONGLONG ByteOffset = 0;
-        ULONGLONG BetHash = 0;
-        DWORD dwFileSize = 0;
-        DWORD dwCmpSize = 0;
-        DWORD dwFlagIndex = 0;
-        DWORD dwFlags = 0;
-        DWORD dwBetIndex = 0;
-
-        GetBits(pHetTable->pBetIndexes, i * pHetTable->dwIndexSizeTotal,
-                                        pHetTable->dwIndexSize,
-                                        &dwBetIndex,
-                                        4);
-
-        if(dwBetIndex < pHetTable->dwMaxFileCount)
-        {
-            DWORD dwEntryIndex = pBetTable->dwTableEntrySize * dwBetIndex;
-
-            GetBits(pBetTable->pBetHashes, dwBetIndex * pBetTable->dwBetHashSizeTotal,
-                                           pBetTable->dwBetHashSize,
-                                           &BetHash,
-                                           8);
-
-            GetBits(dwEntryIndex + pBetTable->dwBitIndex_FilePos,
-                                           pBetTable->dwBitCount_FilePos,
-                                           &ByteOffset,
-                                           8);
-
-            GetBits(dwEntryIndex + pBetTable->dwBitIndex_FileSize,
-                                           pBetTable->dwBitCount_FileSize,
-                                           &dwFileSize,
-                                           4);
-
-            GetBits(dwEntryIndex + pBetTable->dwBitIndex_CmpSize,
-                                           pBetTable->dwBitCount_CmpSize,
-                                           &dwCmpSize,
-                                           4);
-
-            GetBits(dwEntryIndex + pBetTable->dwBitIndex_FlagIndex,
-                                           pBetTable->dwBitCount_FlagIndex,
-                                           &dwFlagIndex,
-                                           4);
-
-            dwFlags = pBetTable->pFileFlags[dwFlagIndex];
-        }
-
-        printf(" %04X    %02lX     %04X  %016llX %016llX %08X %08X  %04X  %08X\n", i,
-               pHetTable->pHetHashes[i],
-               dwBetIndex,
-               BetHash,
-               ByteOffset,
-               dwFileSize,
-               dwCmpSize,
-               dwFlagIndex,
-               dwFlags);
-    }
-    printf("-----------------------------------------------------------------------------------------\n");
-}
-
-#endif  // __STORMLIB_DUMP_DATA__
diff --git a/dep/StormLibOld/src/SBaseFileTable.cpp b/dep/StormLibOld/src/SBaseFileTable.cpp
deleted file mode 100644
index 0e25101ed..000000000
--- a/dep/StormLibOld/src/SBaseFileTable.cpp
+++ /dev/null
@@ -1,2552 +0,0 @@
-/*****************************************************************************/
-/* SBaseFileTable.cpp                     Copyright (c) Ladislav Zezula 2010 */
-/*---------------------------------------------------------------------------*/
-/* Description: Common handler for classic and new hash&block tables         */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 06.09.10  1.00  Lad  The first version of SBaseFileTable.cpp              */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-//-----------------------------------------------------------------------------
-// Local defines
-
-#define INVALID_FLAG_VALUE 0xCCCCCCCC
-#define MAX_FLAG_INDEX     512
-
-//-----------------------------------------------------------------------------
-// Local structures
-
-// Structure for HET table header
-typedef struct _HET_TABLE_HEADER
-{
-    DWORD dwTableSize;                      // Size of the entire HET table, including HET_TABLE_HEADER (in bytes)
-    DWORD dwMaxFileCount;                   // Maximum number of files in the MPQ
-    DWORD dwHashTableSize;                  // Size of the hash table (in bytes)
-    DWORD dwHashEntrySize;                  // Effective size of the hash entry (in bits)
-    DWORD dwIndexSizeTotal;                 // Total size of file index (in bits)
-    DWORD dwIndexSizeExtra;                 // Extra bits in the file index
-    DWORD dwIndexSize;                      // Effective size of the file index (in bits)
-    DWORD dwIndexTableSize;                 // Size of the block index subtable (in bytes)
-
-} HET_TABLE_HEADER, *PHET_TABLE_HEADER;
-
-// Structure for BET table header
-typedef struct _BET_TABLE_HEADER
-{
-    DWORD dwTableSize;                      // Size of the entire BET table, including the header (in bytes)
-    DWORD dwFileCount;                      // Number of files in the BET table
-    DWORD dwUnknown08;
-    DWORD dwTableEntrySize;                 // Size of one table entry (in bits)
-    DWORD dwBitIndex_FilePos;               // Bit index of the file position (within the entry record)
-    DWORD dwBitIndex_FileSize;              // Bit index of the file size (within the entry record)
-    DWORD dwBitIndex_CmpSize;               // Bit index of the compressed size (within the entry record)
-    DWORD dwBitIndex_FlagIndex;             // Bit index of the flag index (within the entry record)
-    DWORD dwBitIndex_Unknown;               // Bit index of the ??? (within the entry record)
-    DWORD dwBitCount_FilePos;               // Bit size of file position (in the entry record)
-    DWORD dwBitCount_FileSize;              // Bit size of file size (in the entry record)
-    DWORD dwBitCount_CmpSize;               // Bit size of compressed file size (in the entry record)
-    DWORD dwBitCount_FlagIndex;             // Bit size of flags index (in the entry record)
-    DWORD dwBitCount_Unknown;               // Bit size of ??? (in the entry record)
-    DWORD dwBetHashSizeTotal;               // Total size of the BET hash
-    DWORD dwBetHashSizeExtra;               // Extra bits in the BET hash
-    DWORD dwBetHashSize;                    // Effective size of BET hash (in bits)
-    DWORD dwBetHashArraySize;               // Size of BET hashes array, in bytes
-    DWORD dwFlagCount;                      // Number of flags in the following array
-
-} BET_TABLE_HEADER, *PBET_TABLE_HEADER;
-
-//-----------------------------------------------------------------------------
-// Support for calculating bit sizes
-
-static void InitFileFlagArray(LPDWORD FlagArray)
-{
-    for(DWORD dwFlagIndex = 0; dwFlagIndex < MAX_FLAG_INDEX; dwFlagIndex++)
-        FlagArray[dwFlagIndex] = INVALID_FLAG_VALUE;
-}
-
-static DWORD GetFileFlagIndex(LPDWORD FlagArray, DWORD dwFlags)
-{
-    // Find free or equal entry in the flag array
-    for(DWORD dwFlagIndex = 0; dwFlagIndex < MAX_FLAG_INDEX; dwFlagIndex++)
-    {
-        if(FlagArray[dwFlagIndex] == INVALID_FLAG_VALUE || FlagArray[dwFlagIndex] == dwFlags)
-        {
-            FlagArray[dwFlagIndex] = dwFlags;
-            return dwFlagIndex;
-        }
-    }
-
-    // This should never happen
-    assert(false);
-    return 0xFFFFFFFF;
-}
-
-static DWORD GetNecessaryBitCount(ULONGLONG MaxValue)
-{
-    DWORD dwBitCount = 0;
-
-    while(MaxValue > 0)
-    {
-        MaxValue >>= 1;
-        dwBitCount++;
-    }
-
-    return dwBitCount;
-}
-
-//-----------------------------------------------------------------------------
-// Support functions for BIT_ARRAY
-
-static USHORT SetBitsMask[] = {0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF};
-
-static TBitArray * CreateBitArray(
-        DWORD NumberOfBits,
-        BYTE FillValue)
-{
-    TBitArray * pBitArray;
-    size_t nSize = sizeof(TBitArray) + (NumberOfBits + 7) / 8;
-
-    // Allocate the bit array
-    pBitArray = (TBitArray *)STORM_ALLOC(BYTE, nSize);
-    if(pBitArray != NULL)
-    {
-        memset(pBitArray, FillValue, nSize);
-        pBitArray->NumberOfBits = NumberOfBits;
-    }
-
-    return pBitArray;
-}
-
-void GetBits(
-        TBitArray * pArray,
-        unsigned int nBitPosition,
-        unsigned int nBitLength,
-        void * pvBuffer,
-        int nResultByteSize)
-{
-    unsigned char * pbBuffer = (unsigned char *)pvBuffer;
-    unsigned int nBytePosition0 = (nBitPosition / 8);
-    unsigned int nBytePosition1 = nBytePosition0 + 1;
-    unsigned int nByteLength = (nBitLength / 8);
-    unsigned int nBitOffset = (nBitPosition & 0x07);
-    unsigned char BitBuffer;
-
-    // Keep compiler happy for platforms where nResultByteSize is not used
-    nResultByteSize = nResultByteSize;
-
-#ifdef _DEBUG
-    // Check if the target is properly zeroed
-    for(int i = 0; i < nResultByteSize; i++)
-        assert(pbBuffer[i] == 0);
-#endif
-
-#ifndef PLATFORM_LITTLE_ENDIAN
-    // Adjust the buffer pointer for big endian platforms
-    pbBuffer += (nResultByteSize - 1);
-#endif
-
-    // Copy whole bytes, if any
-    while(nByteLength > 0)
-    {
-        // Is the current position in the Elements byte-aligned?
-        if(nBitOffset != 0)
-        {
-            BitBuffer = (unsigned char)((pArray->Elements[nBytePosition0] >> nBitOffset) | (pArray->Elements[nBytePosition1] << (0x08 - nBitOffset)));
-        }
-        else
-        {
-            BitBuffer = pArray->Elements[nBytePosition0];
-        }
-
-#ifdef PLATFORM_LITTLE_ENDIAN
-        *pbBuffer++ = BitBuffer;
-#else
-        *pbBuffer-- = BitBuffer;
-#endif
-
-        // Move byte positions and lengths
-        nBytePosition1++;
-        nBytePosition0++;
-        nByteLength--;
-    }
-
-    // Get the rest of the bits
-    nBitLength = (nBitLength & 0x07);
-    if(nBitLength != 0)
-    {
-        *pbBuffer = (unsigned char)(pArray->Elements[nBytePosition0] >> nBitOffset);
-
-        if(nBitLength > (8 - nBitOffset))
-            *pbBuffer = (unsigned char)((pArray->Elements[nBytePosition1] << (8 - nBitOffset)) | (pArray->Elements[nBytePosition0] >> nBitOffset));
-
-        *pbBuffer &= (0x01 << nBitLength) - 1;
-    }
-}
-
-void SetBits(
-        TBitArray * pArray,
-        unsigned int nBitPosition,
-        unsigned int nBitLength,
-        void * pvBuffer,
-        int nResultByteSize)
-{
-    unsigned char * pbBuffer = (unsigned char *)pvBuffer;
-    unsigned int nBytePosition = (nBitPosition / 8);
-    unsigned int nBitOffset = (nBitPosition & 0x07);
-    unsigned short BitBuffer = 0;
-    unsigned short AndMask = 0;
-    unsigned short OneByte = 0;
-
-    // Keep compiler happy for platforms where nResultByteSize is not used
-    nResultByteSize = nResultByteSize;
-
-#ifndef PLATFORM_LITTLE_ENDIAN
-    // Adjust the buffer pointer for big endian platforms
-    pbBuffer += (nResultByteSize - 1);
-#endif
-
-    // Copy whole bytes, if any
-    while(nBitLength > 8)
-    {
-        // Reload the bit buffer
-#ifdef PLATFORM_LITTLE_ENDIAN
-        OneByte = *pbBuffer++;
-#else
-        OneByte = *pbBuffer--;
-#endif
-        // Update the BitBuffer and AndMask for the bit array
-        BitBuffer = (BitBuffer >> 0x08) | (OneByte << nBitOffset);
-        AndMask = (AndMask >> 0x08) | (0x00FF << nBitOffset);
-
-        // Update the byte in the array
-        pArray->Elements[nBytePosition] = (BYTE)((pArray->Elements[nBytePosition] & ~AndMask) | BitBuffer);
-
-        // Move byte positions and lengths
-        nBytePosition++;
-        nBitLength -= 0x08;
-    }
-
-    if(nBitLength != 0)
-    {
-        // Reload the bit buffer
-        OneByte = *pbBuffer;
-
-        // Update the AND mask for the last bit
-        BitBuffer = (BitBuffer >> 0x08) | (OneByte << nBitOffset);
-        AndMask = (AndMask >> 0x08) | (SetBitsMask[nBitLength] << nBitOffset);
-
-        // Update the byte in the array
-        pArray->Elements[nBytePosition] = (BYTE)((pArray->Elements[nBytePosition] & ~AndMask) | BitBuffer);
-
-        // Update the next byte, if needed
-        if(AndMask & 0xFF00)
-        {
-            nBytePosition++;
-            BitBuffer >>= 0x08;
-            AndMask >>= 0x08;
-
-            pArray->Elements[nBytePosition] = (BYTE)((pArray->Elements[nBytePosition] & ~AndMask) | BitBuffer);
-        }
-    }
-}
-
-
-//-----------------------------------------------------------------------------
-// Support for hash table
-
-// Returns a hash table entry in the following order:
-// 1) A hash table entry with the neutral locale
-// 2) A hash table entry with any other locale
-// 3) NULL
-static TMPQHash * GetHashEntryAny(TMPQArchive * ha, const char * szFileName)
-{
-    TMPQHash * pHashNeutral = NULL;
-    TMPQHash * pFirstHash = GetFirstHashEntry(ha, szFileName);
-    TMPQHash * pHashAny = NULL;
-    TMPQHash * pHash = pFirstHash;
-
-    // Parse the found hashes
-    while(pHash != NULL)
-    {
-        // If we found neutral hash, remember it
-        if(pHash->lcLocale == 0)
-            pHashNeutral = pHash;
-        if(pHashAny == NULL)
-            pHashAny = pHash;
-
-        // Get the next hash entry for that file
-        pHash = GetNextHashEntry(ha, pFirstHash, pHash);
-    }
-
-    // At the end, return neutral hash (if found), otherwise NULL
-    return (pHashNeutral != NULL) ? pHashNeutral : pHashAny;
-}
-
-// Returns a hash table entry in the following order:
-// 1) A hash table entry with the preferred locale
-// 2) A hash table entry with the neutral locale
-// 3) NULL
-static TMPQHash * GetHashEntryLocale(TMPQArchive * ha, const char * szFileName, LCID lcLocale)
-{
-    TMPQHash * pHashNeutral = NULL;
-    TMPQHash * pFirstHash = GetFirstHashEntry(ha, szFileName);
-    TMPQHash * pHash = pFirstHash;
-
-    // Parse the found hashes
-    while(pHash != NULL)
-    {
-        // If the locales match, return it
-        if(pHash->lcLocale == lcLocale)
-            return pHash;
-
-        // If we found neutral hash, remember it
-        if(pHash->lcLocale == 0)
-            pHashNeutral = pHash;
-
-        // Get the next hash entry for that file
-        pHash = GetNextHashEntry(ha, pFirstHash, pHash);
-    }
-
-    // At the end, return neutral hash (if found), otherwise NULL
-    return pHashNeutral;
-}
-
-// Returns a hash table entry in the following order:
-// 1) A hash table entry with the preferred locale
-// 2) NULL
-static TMPQHash * GetHashEntryExact(TMPQArchive * ha, const char * szFileName, LCID lcLocale)
-{
-    TMPQHash * pFirstHash = GetFirstHashEntry(ha, szFileName);
-    TMPQHash * pHash = pFirstHash;
-
-    // Parse the found hashes
-    while(pHash != NULL)
-    {
-        // If the locales match, return it
-        if(pHash->lcLocale == lcLocale)
-            return pHash;
-
-        // Get the next hash entry for that file
-        pHash = GetNextHashEntry(ha, pFirstHash, pHash);
-    }
-
-    // Not found
-    return NULL;
-}
-
-static TMPQHash * TranslateHashTable(
-        TMPQArchive * ha,
-        ULONGLONG * pcbTableSize)
-{
-    TMPQHash * pHashTable;
-    size_t HashTableSize;
-
-    // Allocate copy of the hash table
-    pHashTable = STORM_ALLOC(TMPQHash, ha->pHeader->dwHashTableSize);
-    if(pHashTable != NULL)
-    {
-        // Copy the hash table
-        HashTableSize = sizeof(TMPQHash) * ha->pHeader->dwHashTableSize;
-        memcpy(pHashTable, ha->pHashTable, HashTableSize);
-
-        // Give the size to the caller
-        if(pcbTableSize != NULL)
-        {
-            *pcbTableSize = (ULONGLONG)HashTableSize;
-        }
-    }
-
-    return pHashTable;
-}
-
-static TMPQBlock * TranslateBlockTable(
-        TMPQArchive * ha,
-        ULONGLONG * pcbTableSize,
-        bool * pbNeedHiBlockTable)
-{
-    TFileEntry * pFileEntry = ha->pFileTable;
-    TMPQBlock * pBlockTable;
-    TMPQBlock * pBlock;
-    size_t BlockTableSize;
-    bool bNeedHiBlockTable = false;
-
-    // Allocate copy of the hash table
-    pBlockTable = pBlock = STORM_ALLOC(TMPQBlock, ha->dwFileTableSize);
-    if(pBlockTable != NULL)
-    {
-        // Copy the block table
-        BlockTableSize = sizeof(TMPQBlock) * ha->dwFileTableSize;
-        for(DWORD i = 0; i < ha->dwFileTableSize; i++)
-        {
-            bNeedHiBlockTable = (pFileEntry->ByteOffset >> 32) ? true : false;
-            pBlock->dwFilePos = (DWORD)pFileEntry->ByteOffset;
-            pBlock->dwFSize   = pFileEntry->dwFileSize;
-            pBlock->dwCSize   = pFileEntry->dwCmpSize;
-            pBlock->dwFlags   = pFileEntry->dwFlags;
-
-            pFileEntry++;
-            pBlock++;
-        }
-
-        // Give the size to the caller
-        if(pcbTableSize != NULL)
-            *pcbTableSize = (ULONGLONG)BlockTableSize;
-
-        if(pbNeedHiBlockTable != NULL)
-            *pbNeedHiBlockTable = bNeedHiBlockTable;
-    }
-
-    return pBlockTable;
-}
-
-static USHORT * TranslateHiBlockTable(
-        TMPQArchive * ha,
-        ULONGLONG * pcbTableSize)
-{
-    TFileEntry * pFileEntry = ha->pFileTable;
-    USHORT * pHiBlockTable;
-    USHORT * pHiBlock;
-    size_t HiBlockTableSize;
-
-    // Allocate copy of the hash table
-    pHiBlockTable = pHiBlock = STORM_ALLOC(USHORT, ha->dwFileTableSize);
-    if(pHiBlockTable != NULL)
-    {
-        // Copy the block table
-        HiBlockTableSize = sizeof(USHORT) * ha->dwFileTableSize;
-        for(DWORD i = 0; i < ha->dwFileTableSize; i++)
-            pHiBlock[i] = (USHORT)(pFileEntry[i].ByteOffset >> 0x20);
-
-        // Give the size to the caller
-        if(pcbTableSize != NULL)
-            *pcbTableSize = (ULONGLONG)HiBlockTableSize;
-    }
-
-    return pHiBlockTable;
-}
-
-//-----------------------------------------------------------------------------
-// General EXT table functions
-
-TMPQExtTable * LoadExtTable(
-        TMPQArchive * ha,
-        ULONGLONG ByteOffset,
-        size_t Size,
-        DWORD dwSignature,
-        DWORD dwKey)
-{
-    TMPQExtTable * pCompressed = NULL;      // Compressed table
-    TMPQExtTable * pExtTable = NULL;        // Uncompressed table
-
-    // Do nothing if the size is zero
-    if(ByteOffset != 0 && Size != 0)
-    {
-        // Allocate size for the compressed table
-        pExtTable = (TMPQExtTable *)STORM_ALLOC(BYTE, Size);
-        if(pExtTable != NULL)
-        {
-            // Load the table from the MPQ
-            ByteOffset += ha->MpqPos;
-            if(!FileStream_Read(ha->pStream, &ByteOffset, pExtTable, (DWORD)Size))
-            {
-                STORM_FREE(pExtTable);
-                return NULL;
-            }
-
-            // Swap the ext table header
-            BSWAP_ARRAY32_UNSIGNED(pExtTable, sizeof(TMPQExtTable));
-            if(pExtTable->dwSignature != dwSignature)
-            {
-                STORM_FREE(pExtTable);
-                return NULL;
-            }
-
-            // Decrypt the block
-            BSWAP_ARRAY32_UNSIGNED(pExtTable + 1, pExtTable->dwDataSize);
-            DecryptMpqBlock(pExtTable + 1, (DWORD)(Size - sizeof(TMPQExtTable)), dwKey);
-            BSWAP_ARRAY32_UNSIGNED(pExtTable + 1, pExtTable->dwDataSize);
-
-            // If the table is compressed, decompress it
-            if((pExtTable->dwDataSize + sizeof(TMPQExtTable)) > Size)
-            {
-                pCompressed = pExtTable;
-                pExtTable = (TMPQExtTable *)STORM_ALLOC(BYTE, sizeof(TMPQExtTable) + pCompressed->dwDataSize);
-                if(pExtTable != NULL)
-                {
-                    int cbOutBuffer = (int)pCompressed->dwDataSize;
-                    int cbInBuffer = (int)Size;
-
-                    // Decompress the extended table
-                    pExtTable->dwSignature = pCompressed->dwSignature;
-                    pExtTable->dwVersion   = pCompressed->dwVersion;
-                    pExtTable->dwDataSize  = pCompressed->dwDataSize;
-                    if(!SCompDecompress2((char *)(pExtTable + 1), &cbOutBuffer, (char *)(pCompressed + 1), cbInBuffer))
-                    {
-                        STORM_FREE(pExtTable);
-                        pExtTable = NULL;
-                    }
-                }
-
-                // Free the compressed block
-                STORM_FREE(pCompressed);
-            }
-        }
-    }
-
-    // Return the decompressed table to the caller
-    return pExtTable;
-}
-
-// Used in MPQ Editor
-void FreeMpqBuffer(void * pvBuffer)
-{
-    STORM_FREE(pvBuffer);
-}
-
-static int SaveMpqTable(
-        TMPQArchive * ha,
-        void * pMpqTable,
-        ULONGLONG ByteOffset,
-        size_t Size,
-        unsigned char * md5,
-        DWORD dwKey,
-        bool bCompress)
-{
-    ULONGLONG FileOffset;
-    void * pCompressed = NULL;
-    int nError = ERROR_SUCCESS;
-
-    // Do we have to compress the table?
-    if(bCompress)
-    {
-        int cbOutBuffer = (int)Size;
-        int cbInBuffer = (int)Size;
-
-        // Allocate extra space for compressed table
-        pCompressed = STORM_ALLOC(BYTE, Size);
-        if(pCompressed == NULL)
-            return ERROR_NOT_ENOUGH_MEMORY;
-
-        // Compress the table
-        SCompCompress((char *)pCompressed, &cbOutBuffer, (char *)pMpqTable, cbInBuffer, MPQ_COMPRESSION_ZLIB, 0, 0);
-
-        // If the compression failed, revert it. Otherwise, swap the tables
-        if(cbOutBuffer >= cbInBuffer)
-        {
-            STORM_FREE(pCompressed);
-            pCompressed = NULL;
-        }
-        else
-        {
-            pMpqTable = pCompressed;
-        }
-    }
-
-    // Encrypt the table
-    if(dwKey != 0)
-    {
-        BSWAP_ARRAY32_UNSIGNED(pMpqTable, Size);
-        EncryptMpqBlock(pMpqTable, (DWORD)Size, dwKey);
-        BSWAP_ARRAY32_UNSIGNED(pMpqTable, Size);
-    }
-
-    // Calculate the MD5
-    if(md5 != NULL)
-    {
-        CalculateDataBlockHash(pMpqTable, (DWORD)Size, md5);
-    }
-
-    // Save the table to the MPQ
-    BSWAP_ARRAY32_UNSIGNED(pMpqTable, Size);
-    FileOffset = ha->MpqPos + ByteOffset;
-    if(!FileStream_Write(ha->pStream, &FileOffset, pMpqTable, (DWORD)Size))
-        nError = GetLastError();
-
-    // Free the compressed table, if any
-    if(pCompressed != NULL)
-        STORM_FREE(pCompressed);
-    return nError;
-}
-
-static int SaveExtTable(
-        TMPQArchive * ha,
-        TMPQExtTable * pExtTable,
-        ULONGLONG ByteOffset,
-        DWORD dwTableSize,
-        unsigned char * md5,
-        DWORD dwKey,
-        bool bCompress,
-        LPDWORD pcbTotalSize)
-{
-    ULONGLONG FileOffset;
-    TMPQExtTable * pCompressed = NULL;
-    DWORD cbTotalSize = 0;
-    int nError = ERROR_SUCCESS;
-
-    // Do we have to compress the table?
-    if(bCompress)
-    {
-        int cbOutBuffer = (int)dwTableSize;
-        int cbInBuffer = (int)dwTableSize;
-
-        // Allocate extra space for compressed table
-        pCompressed = (TMPQExtTable *)STORM_ALLOC(BYTE, dwTableSize);
-        if(pCompressed == NULL)
-            return ERROR_NOT_ENOUGH_MEMORY;
-
-        // Compress the table
-        pCompressed->dwSignature = pExtTable->dwSignature;
-        pCompressed->dwVersion   = pExtTable->dwVersion;
-        pCompressed->dwDataSize  = pExtTable->dwDataSize;
-        SCompCompress((char *)(pCompressed + 1), &cbOutBuffer, (char *)(pExtTable + 1), cbInBuffer, MPQ_COMPRESSION_ZLIB, 0, 0);
-
-        // If the compression failed, revert it. Otherwise, swap the tables
-        if(cbOutBuffer >= cbInBuffer)
-        {
-            STORM_FREE(pCompressed);
-            pCompressed = NULL;
-        }
-        else
-        {
-            pExtTable = pCompressed;
-        }
-    }
-
-    // Encrypt the table
-    if(dwKey != 0)
-    {
-        BSWAP_ARRAY32_UNSIGNED(pExtTable + 1, pExtTable->dwDataSize);
-        EncryptMpqBlock(pExtTable + 1, (DWORD)(dwTableSize - sizeof(TMPQExtTable)), dwKey);
-        BSWAP_ARRAY32_UNSIGNED(pExtTable + 1, pExtTable->dwDataSize);
-    }
-
-    // Calculate the MD5 of the table after
-    if(md5 != NULL)
-    {
-        CalculateDataBlockHash(pExtTable, dwTableSize, md5);
-    }
-
-    // Save the table to the MPQ
-    FileOffset = ha->MpqPos + ByteOffset;
-    if(FileStream_Write(ha->pStream, &FileOffset, pExtTable, dwTableSize))
-        cbTotalSize += dwTableSize;
-    else
-        nError = GetLastError();
-
-    // We have to write raw data MD5
-    if(nError == ERROR_SUCCESS && ha->pHeader->dwRawChunkSize != 0)
-    {
-        nError = WriteMemDataMD5(ha->pStream,
-                                 FileOffset,
-                                 pExtTable,
-                                 dwTableSize,
-                                 ha->pHeader->dwRawChunkSize,
-                                 &cbTotalSize);
-    }
-
-    // Give the total written size, if needed
-    if(pcbTotalSize != NULL)
-        *pcbTotalSize = cbTotalSize;
-
-    // Free the compressed table, if any
-    if(pCompressed != NULL)
-        STORM_FREE(pCompressed);
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// Support for HET table
-
-static void CreateHetHeader(
-        TMPQHetTable * pHetTable,
-        PHET_TABLE_HEADER pHetHeader)
-{
-    // Fill the BET header
-    pHetHeader->dwMaxFileCount   = pHetTable->dwMaxFileCount;
-    pHetHeader->dwHashTableSize  = pHetTable->dwHashTableSize;
-    pHetHeader->dwHashEntrySize  = pHetTable->dwHashBitSize;
-    pHetHeader->dwIndexSizeTotal = GetNecessaryBitCount(pHetTable->dwMaxFileCount);
-    pHetHeader->dwIndexSizeExtra = 0;
-    pHetHeader->dwIndexSize      = pHetHeader->dwIndexSizeTotal;
-    pHetHeader->dwIndexTableSize = ((pHetHeader->dwIndexSizeTotal * pHetTable->dwHashTableSize) + 7) / 8;
-
-    // Calculate the total size needed for holding HET table
-    pHetHeader->dwTableSize = sizeof(HET_TABLE_HEADER) +
-            pHetHeader->dwHashTableSize +
-            pHetHeader->dwIndexTableSize;
-}
-
-TMPQHetTable * CreateHetTable(DWORD dwMaxFileCount, DWORD dwHashBitSize, bool bCreateEmpty)
-{
-    TMPQHetTable * pHetTable;
-
-    pHetTable = STORM_ALLOC(TMPQHetTable, 1);
-    if(pHetTable != NULL)
-    {
-        pHetTable->dwIndexSizeTotal = 0;
-        pHetTable->dwIndexSizeExtra = 0;
-        pHetTable->dwIndexSize      = pHetTable->dwIndexSizeTotal;
-        pHetTable->dwMaxFileCount   = dwMaxFileCount;
-        pHetTable->dwHashTableSize  = (dwMaxFileCount * 4 / 3);
-        pHetTable->dwHashBitSize    = dwHashBitSize;
-
-        // Size of one index is calculated from max file count
-        pHetTable->dwIndexSizeTotal = GetNecessaryBitCount(dwMaxFileCount);
-        pHetTable->dwIndexSizeExtra = 0;
-        pHetTable->dwIndexSize      = pHetTable->dwIndexSizeTotal;
-
-        // Allocate hash table
-        pHetTable->pHetHashes = STORM_ALLOC(BYTE, pHetTable->dwHashTableSize);
-        memset(pHetTable->pHetHashes, 0, pHetTable->dwHashTableSize);
-
-        // If we shall create empty HET table, we have to allocate empty block index table as well
-        if(bCreateEmpty)
-            pHetTable->pBetIndexes = CreateBitArray(pHetTable->dwHashTableSize * pHetTable->dwIndexSizeTotal, 0xFF);
-
-        // Calculate masks
-        pHetTable->AndMask64 = 0;
-        if(dwHashBitSize != 0x40)
-            pHetTable->AndMask64 = (ULONGLONG)1 << dwHashBitSize;
-        pHetTable->AndMask64--;
-
-        pHetTable->OrMask64 = (ULONGLONG)1 << (dwHashBitSize - 1);
-    }
-
-    return pHetTable;
-}
-
-static TMPQHetTable * TranslateHetTable(TMPQExtTable * pExtTable)
-{
-    HET_TABLE_HEADER HetHeader;
-    TMPQHetTable * pHetTable = NULL;
-    LPBYTE pbSrcData = (LPBYTE)(pExtTable + 1);
-
-    // Sanity check
-    assert(pExtTable->dwSignature == HET_TABLE_SIGNATURE);
-    assert(pExtTable->dwVersion == 1);
-
-    // Verify size of the HET table
-    if(pExtTable != NULL && pExtTable->dwDataSize >= sizeof(HET_TABLE_HEADER))
-    {
-        // Copy the table header in order to have it aligned and swapped
-        memcpy(&HetHeader, pbSrcData, sizeof(HET_TABLE_HEADER));
-        BSWAP_ARRAY32_UNSIGNED(&HetHeader, sizeof(HET_TABLE_HEADER));
-        pbSrcData += sizeof(HET_TABLE_HEADER);
-
-        // Verify the size of the table in the header
-        if(HetHeader.dwTableSize == pExtTable->dwDataSize)
-        {
-            // Create translated table
-            pHetTable = CreateHetTable(HetHeader.dwMaxFileCount, HetHeader.dwHashEntrySize, false);
-            if(pHetTable != NULL)
-            {
-                // Copy the hash table size, index size and extra bits from the HET header
-                pHetTable->dwHashTableSize  = HetHeader.dwHashTableSize;
-                pHetTable->dwIndexSizeTotal = HetHeader.dwIndexSizeTotal;
-                pHetTable->dwIndexSizeExtra = HetHeader.dwIndexSizeExtra;
-
-                // Fill the hash table
-                if(pHetTable->pHetHashes != NULL)
-                    memcpy(pHetTable->pHetHashes, pbSrcData, pHetTable->dwHashTableSize);
-                pbSrcData += pHetTable->dwHashTableSize;
-
-                // Copy the block index table
-                pHetTable->pBetIndexes = CreateBitArray(HetHeader.dwIndexTableSize * 8, 0xFF);
-                if(pHetTable->pBetIndexes != NULL)
-                    memcpy(pHetTable->pBetIndexes->Elements, pbSrcData, HetHeader.dwIndexTableSize);
-                pbSrcData += HetHeader.dwIndexTableSize;
-            }
-        }
-    }
-
-    return pHetTable;
-}
-
-static TMPQExtTable * TranslateHetTable(TMPQHetTable * pHetTable, ULONGLONG * pcbHetTable)
-{
-    TMPQExtTable * pExtTable = NULL;
-    HET_TABLE_HEADER HetHeader;
-    LPBYTE pbLinearTable = NULL;
-    LPBYTE pbTrgData;
-    size_t HetTableSize;
-
-    // Prepare header of the HET table
-    CreateHetHeader(pHetTable, &HetHeader);
-
-    // Calculate the total size needed for holding the encrypted HET table
-    HetTableSize = HetHeader.dwTableSize;
-
-    // Allocate space for the linear table
-    pbLinearTable = STORM_ALLOC(BYTE, sizeof(TMPQExtTable) + HetTableSize);
-    if(pbLinearTable != NULL)
-    {
-        // Create the common ext table header
-        pExtTable = (TMPQExtTable *)pbLinearTable;
-        pExtTable->dwSignature = HET_TABLE_SIGNATURE;
-        pExtTable->dwVersion   = 1;
-        pExtTable->dwDataSize  = (DWORD)HetTableSize;
-        pbTrgData = (LPBYTE)(pExtTable + 1);
-
-        // Copy the HET table header
-        memcpy(pbTrgData, &HetHeader, sizeof(HET_TABLE_HEADER));
-        BSWAP_ARRAY32_UNSIGNED(pbTrgData, sizeof(HET_TABLE_HEADER));
-        pbTrgData += sizeof(HET_TABLE_HEADER);
-
-        // Copy the array of HET hashes
-        memcpy(pbTrgData, pHetTable->pHetHashes, pHetTable->dwHashTableSize);
-        pbTrgData += pHetTable->dwHashTableSize;
-
-        // Copy the bit array of BET indexes
-        memcpy(pbTrgData, pHetTable->pBetIndexes->Elements, HetHeader.dwIndexTableSize);
-
-        // Calculate the total size of the table, including the TMPQExtTable
-        if(pcbHetTable != NULL)
-        {
-            *pcbHetTable = (ULONGLONG)(sizeof(TMPQExtTable) + HetTableSize);
-        }
-    }
-
-    return pExtTable;
-}
-
-DWORD GetFileIndex_Het(TMPQArchive * ha, const char * szFileName)
-{
-    TMPQHetTable * pHetTable = ha->pHetTable;
-    ULONGLONG FileNameHash;
-    ULONGLONG AndMask64;
-    ULONGLONG OrMask64;
-    ULONGLONG BetHash;
-    DWORD StartIndex;
-    DWORD Index;
-    BYTE HetHash;                   // Upper 8 bits of the masked file name hash
-
-    // Do nothing if the MPQ has no HET table
-    assert(ha->pHetTable != NULL);
-
-    // Calculate 64-bit hash of the file name
-    AndMask64 = pHetTable->AndMask64;
-    OrMask64 = pHetTable->OrMask64;
-    FileNameHash = (HashStringJenkins(szFileName) & AndMask64) | OrMask64;
-
-    // Split the file name hash into two parts:
-    // Part 1: The highest 8 bits of the name hash
-    // Part 2: The rest of the name hash (without the highest 8 bits)
-    HetHash = (BYTE)(FileNameHash >> (pHetTable->dwHashBitSize - 8));
-    BetHash = FileNameHash & (AndMask64 >> 0x08);
-
-    // Calculate the starting index to the hash table
-    StartIndex = Index = (DWORD)(FileNameHash % pHetTable->dwHashTableSize);
-
-    // Go through HET table until we find a terminator
-    while(pHetTable->pHetHashes[Index] != HET_ENTRY_FREE)
-    {
-        // Did we find match ?
-        if(pHetTable->pHetHashes[Index] == HetHash)
-        {
-            DWORD dwFileIndex = 0;
-
-            // Get the index of the BetHash
-            GetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * Index,
-                                            pHetTable->dwIndexSize,
-                                            &dwFileIndex,
-                                            4);
-
-            //
-            // TODO: This condition only happens when we are opening a MPQ
-            // where some files were deleted by StormLib. Perhaps
-            // we should not allow shrinking of the file table in MPQs v 4.0?
-            // assert(dwFileIndex <= ha->dwFileTableSize);
-            //
-
-            // Verify the BetHash against the entry in the table of BET hashes
-            if(dwFileIndex <= ha->dwFileTableSize && ha->pFileTable[dwFileIndex].BetHash == BetHash)
-                return dwFileIndex;
-        }
-
-        // Move to the next entry in the primary search table
-        // If we came to the start index again, we are done
-        Index = (Index + 1) % pHetTable->dwHashTableSize;
-        if(Index == StartIndex)
-            break;
-    }
-
-    // File not found
-    return HASH_ENTRY_FREE;
-}
-
-DWORD AllocateHetEntry(
-        TMPQArchive * ha,
-        TFileEntry * pFileEntry)
-{
-    TMPQHetTable * pHetTable = ha->pHetTable;
-    ULONGLONG FileNameHash;
-    ULONGLONG AndMask64;
-    ULONGLONG OrMask64;
-    ULONGLONG BetHash;
-    DWORD FreeHetIndex = HASH_ENTRY_FREE;
-    DWORD dwFileIndex;
-    DWORD StartIndex;
-    DWORD Index;
-    BYTE HetHash;                   // Upper 8 bits of the masked file name hash
-
-    // Do nothing if the MPQ has no HET table
-    assert(ha->pHetTable != NULL);
-
-    // Calculate 64-bit hash of the file name
-    AndMask64 = pHetTable->AndMask64;
-    OrMask64 = pHetTable->OrMask64;
-    FileNameHash = (HashStringJenkins(pFileEntry->szFileName) & AndMask64) | OrMask64;
-
-    // Calculate the starting index to the hash table
-    StartIndex = Index = (DWORD)(FileNameHash % pHetTable->dwHashTableSize);
-
-    // Split the file name hash into two parts:
-    // Part 1: The highest 8 bits of the name hash
-    // Part 2: The rest of the name hash (without the highest 8 bits)
-    HetHash = (BYTE)(FileNameHash >> (pHetTable->dwHashBitSize - 8));
-    BetHash = FileNameHash & (AndMask64 >> 0x08);
-
-    // Go through HET table until we find a terminator
-    for(;;)
-    {
-        // Check for entries that might have been deleted
-        if(pHetTable->pHetHashes[Index] == HET_ENTRY_DELETED)
-        {
-            DWORD dwInvalidBetIndex = (1 << pHetTable->dwIndexSizeTotal) - 1;
-            DWORD dwBetIndex = 0;
-
-            // Verify the BET index. If it's really free, we can use it
-            dwFileIndex = (DWORD)(pFileEntry - ha->pFileTable);
-            GetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * Index,
-                                            pHetTable->dwIndexSize,
-                                            &dwBetIndex,
-                                            4);
-
-            if(dwBetIndex == dwInvalidBetIndex)
-            {
-                FreeHetIndex = Index;
-                break;
-            }
-        }
-
-        // Is that entry free ?
-        if(pHetTable->pHetHashes[Index] == HET_ENTRY_FREE)
-        {
-            FreeHetIndex = Index;
-            break;
-        }
-
-        // Move to the next entry in the primary search table
-        // If we came to the start index again, we are done
-        Index = (Index + 1) % pHetTable->dwHashTableSize;
-        if(Index == StartIndex)
-            return HASH_ENTRY_FREE;
-    }
-
-    // Fill the HET table entry
-    dwFileIndex = (DWORD)(pFileEntry - ha->pFileTable);
-    pHetTable->pHetHashes[FreeHetIndex] = HetHash;
-    SetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * FreeHetIndex,
-                                    pHetTable->dwIndexSize,
-                                    &dwFileIndex,
-                                    4);
-    // Fill the file entry
-    pFileEntry->BetHash    = BetHash;
-    pFileEntry->dwHetIndex = FreeHetIndex;
-    return FreeHetIndex;
-}
-
-void FreeHetTable(TMPQHetTable * pHetTable)
-{
-    if(pHetTable != NULL)
-    {
-        if(pHetTable->pHetHashes != NULL)
-            STORM_FREE(pHetTable->pHetHashes);
-        if(pHetTable->pBetIndexes != NULL)
-            STORM_FREE(pHetTable->pBetIndexes);
-
-        STORM_FREE(pHetTable);
-    }
-}
-
-//-----------------------------------------------------------------------------
-// Support for BET table
-
-static void CreateBetHeader(
-        TMPQArchive * ha,
-        PBET_TABLE_HEADER pBetHeader)
-{
-    TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-    TFileEntry * pFileEntry;
-    ULONGLONG MaxByteOffset = 0;
-    DWORD FlagArray[MAX_FLAG_INDEX];
-    DWORD dwMaxFlagIndex = 0;
-    DWORD dwMaxFileSize = 0;
-    DWORD dwMaxCmpSize = 0;
-    DWORD dwFlagIndex;
-
-    // Initialize array of flag combinations
-    InitFileFlagArray(FlagArray);
-
-    // Get the maximum values for the BET table
-    for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-    {
-        // Highest file position in the MPQ
-        if(pFileEntry->ByteOffset > MaxByteOffset)
-            MaxByteOffset = pFileEntry->ByteOffset;
-
-        // Biggest file size
-        if(pFileEntry->dwFileSize > dwMaxFileSize)
-            dwMaxFileSize = pFileEntry->dwFileSize;
-
-        // Biggest compressed size
-        if(pFileEntry->dwCmpSize > dwMaxCmpSize)
-            dwMaxCmpSize = pFileEntry->dwCmpSize;
-
-        // Check if this flag was there before
-        dwFlagIndex = GetFileFlagIndex(FlagArray, pFileEntry->dwFlags);
-        if(dwFlagIndex > dwMaxFlagIndex)
-            dwMaxFlagIndex = dwFlagIndex;
-    }
-
-    // Now save bit count for every piece of file information
-    pBetHeader->dwBitIndex_FilePos   = 0;
-    pBetHeader->dwBitCount_FilePos   = GetNecessaryBitCount(MaxByteOffset);
-
-    pBetHeader->dwBitIndex_FileSize  = pBetHeader->dwBitIndex_FilePos + pBetHeader->dwBitCount_FilePos;
-    pBetHeader->dwBitCount_FileSize  = GetNecessaryBitCount(dwMaxFileSize);
-
-    pBetHeader->dwBitIndex_CmpSize   = pBetHeader->dwBitIndex_FileSize + pBetHeader->dwBitCount_FileSize;
-    pBetHeader->dwBitCount_CmpSize   = GetNecessaryBitCount(dwMaxCmpSize);
-
-    pBetHeader->dwBitIndex_FlagIndex = pBetHeader->dwBitIndex_CmpSize + pBetHeader->dwBitCount_CmpSize;
-    pBetHeader->dwBitCount_FlagIndex = GetNecessaryBitCount(dwMaxFlagIndex + 1);
-
-    pBetHeader->dwBitIndex_Unknown   = pBetHeader->dwBitIndex_FlagIndex + pBetHeader->dwBitCount_FlagIndex;
-    pBetHeader->dwBitCount_Unknown   = 0;
-
-    // Calculate the total size of one entry
-    pBetHeader->dwTableEntrySize     = pBetHeader->dwBitCount_FilePos +
-            pBetHeader->dwBitCount_FileSize +
-            pBetHeader->dwBitCount_CmpSize +
-            pBetHeader->dwBitCount_FlagIndex +
-            pBetHeader->dwBitCount_Unknown;
-
-    // Save the file count and flag count
-    pBetHeader->dwFileCount          = ha->dwFileTableSize;
-    pBetHeader->dwFlagCount          = dwMaxFlagIndex + 1;
-    pBetHeader->dwUnknown08          = 0x10;
-
-    // Save the total size of the BET hash
-    pBetHeader->dwBetHashSizeTotal   = ha->pHetTable->dwHashBitSize - 0x08;
-    pBetHeader->dwBetHashSizeExtra   = 0;
-    pBetHeader->dwBetHashSize        = pBetHeader->dwBetHashSizeTotal;
-    pBetHeader->dwBetHashArraySize   = ((pBetHeader->dwBetHashSizeTotal * pBetHeader->dwFileCount) + 7) / 8;
-
-    // Save the total table size
-    pBetHeader->dwTableSize          = sizeof(BET_TABLE_HEADER) +
-            pBetHeader->dwFlagCount * sizeof(DWORD) +
-            ((pBetHeader->dwTableEntrySize * pBetHeader->dwFileCount) + 7) / 8 +
-            pBetHeader->dwBetHashArraySize;
-}
-
-TMPQBetTable * CreateBetTable(DWORD dwFileCount)
-{
-    TMPQBetTable * pBetTable;
-
-    // Allocate BET table
-    pBetTable = STORM_ALLOC(TMPQBetTable, 1);
-    if(pBetTable != NULL)
-    {
-        memset(pBetTable, 0, sizeof(TMPQBetTable));
-        pBetTable->dwFileCount = dwFileCount;
-    }
-
-    return pBetTable;
-}
-
-static TMPQBetTable * TranslateBetTable(
-        TMPQArchive * ha,
-        TMPQExtTable * pExtTable)
-{
-    BET_TABLE_HEADER BetHeader;
-    TMPQBetTable * pBetTable = NULL;
-    LPBYTE pbSrcData = (LPBYTE)(pExtTable + 1);
-    DWORD LengthInBytes;
-
-    // Sanity check
-    assert(pExtTable->dwSignature == BET_TABLE_SIGNATURE);
-    assert(pExtTable->dwVersion == 1);
-    assert(ha->pHetTable != NULL);
-    ha = ha;
-
-    // Verify size of the HET table
-    if(pExtTable != NULL && pExtTable->dwDataSize >= sizeof(BET_TABLE_HEADER))
-    {
-        // Copy the table header in order to have it aligned and swapped
-        memcpy(&BetHeader, pbSrcData, sizeof(BET_TABLE_HEADER));
-        BSWAP_ARRAY32_UNSIGNED(&BetHeader, sizeof(BET_TABLE_HEADER));
-        pbSrcData += sizeof(BET_TABLE_HEADER);
-
-        // Some MPQs affected by a bug in StormLib have pBetTable->dwFileCount
-        // greater than ha->dwMaxFileCount
-        if(BetHeader.dwFileCount > ha->dwMaxFileCount)
-            return NULL;
-
-        // Verify the size of the table in the header
-        if(BetHeader.dwTableSize == pExtTable->dwDataSize)
-        {
-            // Create translated table
-            pBetTable = CreateBetTable(BetHeader.dwFileCount);
-            if(pBetTable != NULL)
-            {
-                // Copy the variables from the header to the BetTable
-                pBetTable->dwTableEntrySize     = BetHeader.dwTableEntrySize;
-                pBetTable->dwBitIndex_FilePos   = BetHeader.dwBitIndex_FilePos;
-                pBetTable->dwBitIndex_FileSize  = BetHeader.dwBitIndex_FileSize;
-                pBetTable->dwBitIndex_CmpSize   = BetHeader.dwBitIndex_CmpSize;
-                pBetTable->dwBitIndex_FlagIndex = BetHeader.dwBitIndex_FlagIndex;
-                pBetTable->dwBitIndex_Unknown   = BetHeader.dwBitIndex_Unknown;
-                pBetTable->dwBitCount_FilePos   = BetHeader.dwBitCount_FilePos;
-                pBetTable->dwBitCount_FileSize  = BetHeader.dwBitCount_FileSize;
-                pBetTable->dwBitCount_CmpSize   = BetHeader.dwBitCount_CmpSize;
-                pBetTable->dwBitCount_FlagIndex = BetHeader.dwBitCount_FlagIndex;
-                pBetTable->dwBitCount_Unknown   = BetHeader.dwBitCount_Unknown;
-
-                // Since we don't know what the "unknown" is, we'll assert when it's nonzero
-                assert(pBetTable->dwBitCount_Unknown == 0);
-
-                // Allocate array for flags
-                if(BetHeader.dwFlagCount != 0)
-                {
-                    // Allocate array for file flags and load it
-                    pBetTable->pFileFlags = STORM_ALLOC(DWORD, BetHeader.dwFlagCount);
-                    if(pBetTable->pFileFlags != NULL)
-                    {
-                        LengthInBytes = BetHeader.dwFlagCount * sizeof(DWORD);
-                        memcpy(pBetTable->pFileFlags, pbSrcData, LengthInBytes);
-                        BSWAP_ARRAY32_UNSIGNED(pBetTable->pFileFlags, LengthInBytes);
-                        pbSrcData += LengthInBytes;
-                    }
-
-                    // Save the number of flags
-                    pBetTable->dwFlagCount = BetHeader.dwFlagCount;
-                }
-
-                // Load the bit-based file table
-                pBetTable->pFileTable = CreateBitArray(pBetTable->dwTableEntrySize * BetHeader.dwFileCount, 0);
-                LengthInBytes = (pBetTable->pFileTable->NumberOfBits + 7) / 8;
-                if(pBetTable->pFileTable != NULL)
-                    memcpy(pBetTable->pFileTable->Elements, pbSrcData, LengthInBytes);
-                pbSrcData += LengthInBytes;
-
-                // Fill the sizes of BET hash
-                pBetTable->dwBetHashSizeTotal = BetHeader.dwBetHashSizeTotal;
-                pBetTable->dwBetHashSizeExtra = BetHeader.dwBetHashSizeExtra;
-                pBetTable->dwBetHashSize      = BetHeader.dwBetHashSize;
-
-                // Create and load the array of BET hashes
-                pBetTable->pBetHashes = CreateBitArray(pBetTable->dwBetHashSizeTotal * BetHeader.dwFileCount, 0);
-                LengthInBytes = (pBetTable->pBetHashes->NumberOfBits + 7) / 8;
-                if(pBetTable->pBetHashes != NULL)
-                    memcpy(pBetTable->pBetHashes->Elements, pbSrcData, LengthInBytes);
-                pbSrcData += BetHeader.dwBetHashArraySize;
-
-                // Dump both tables
-                //              DumpHetAndBetTable(ha->pHetTable, pBetTable);
-            }
-        }
-    }
-
-    return pBetTable;
-}
-
-TMPQExtTable * TranslateBetTable(
-        TMPQArchive * ha,
-        ULONGLONG * pcbBetTable)
-{
-    TMPQExtTable * pExtTable = NULL;
-    BET_TABLE_HEADER BetHeader;
-    TBitArray * pBitArray = NULL;
-    LPBYTE pbLinearTable = NULL;
-    LPBYTE pbTrgData;
-    size_t BetTableSize;
-    DWORD LengthInBytes;
-    DWORD FlagArray[MAX_FLAG_INDEX];
-    DWORD i;
-
-    // Calculate the bit sizes of various entries
-    InitFileFlagArray(FlagArray);
-    CreateBetHeader(ha, &BetHeader);
-
-    // Calculate the size of the BET table
-    BetTableSize = sizeof(BET_TABLE_HEADER) +
-            BetHeader.dwFlagCount * sizeof(DWORD) +
-            ((BetHeader.dwTableEntrySize * BetHeader.dwFileCount) + 7) / 8 +
-            BetHeader.dwBetHashArraySize;
-
-    // Allocate space
-    pbLinearTable = STORM_ALLOC(BYTE, sizeof(TMPQExtTable) + BetTableSize);
-    if(pbLinearTable != NULL)
-    {
-        // Create the common ext table header
-        pExtTable = (TMPQExtTable *)pbLinearTable;
-        pExtTable->dwSignature = BET_TABLE_SIGNATURE;
-        pExtTable->dwVersion   = 1;
-        pExtTable->dwDataSize  = (DWORD)BetTableSize;
-        pbTrgData = (LPBYTE)(pExtTable + 1);
-
-        // Copy the BET table header
-        memcpy(pbTrgData, &BetHeader, sizeof(BET_TABLE_HEADER));
-        BSWAP_ARRAY32_UNSIGNED(pbTrgData, sizeof(BET_TABLE_HEADER));
-        pbTrgData += sizeof(BET_TABLE_HEADER);
-
-        // Save the bit-based block table
-        pBitArray = CreateBitArray(BetHeader.dwFileCount * BetHeader.dwTableEntrySize, 0);
-        if(pBitArray != NULL)
-        {
-            TFileEntry * pFileEntry = ha->pFileTable;
-            DWORD dwFlagIndex = 0;
-            DWORD nBitOffset = 0;
-
-            // Construct the array of flag values and bit-based file table
-            for(i = 0; i < BetHeader.dwFileCount; i++, pFileEntry++)
-            {
-                //
-                // Note: Blizzard MPQs contain valid values even for non-existant files
-                // (FilePos, FileSize, CmpSize and FlagIndex)
-                // Note: If flags is zero, it must be in the flag table too !!!
-                //
-
-                // Save the byte offset
-                SetBits(pBitArray, nBitOffset + BetHeader.dwBitIndex_FilePos,
-                                   BetHeader.dwBitCount_FilePos,
-                                   &pFileEntry->ByteOffset,
-                                   8);
-                SetBits(pBitArray, nBitOffset + BetHeader.dwBitIndex_FileSize,
-                                   BetHeader.dwBitCount_FileSize,
-                                   &pFileEntry->dwFileSize,
-                                   4);
-                SetBits(pBitArray, nBitOffset + BetHeader.dwBitIndex_CmpSize,
-                                   BetHeader.dwBitCount_CmpSize,
-                                   &pFileEntry->dwCmpSize,
-                                   4);
-
-                // Save the flag index
-                dwFlagIndex = GetFileFlagIndex(FlagArray, pFileEntry->dwFlags);
-                SetBits(pBitArray, nBitOffset + BetHeader.dwBitIndex_FlagIndex,
-                                   BetHeader.dwBitCount_FlagIndex,
-                                   &dwFlagIndex,
-                                   4);
-
-                // Move the bit offset
-                nBitOffset += BetHeader.dwTableEntrySize;
-            }
-
-            // Write the array of flags
-            LengthInBytes = BetHeader.dwFlagCount * sizeof(DWORD);
-            memcpy(pbTrgData, FlagArray, LengthInBytes);
-            BSWAP_ARRAY32_UNSIGNED(pbTrgData, LengthInBytes);
-            pbTrgData += LengthInBytes;
-
-            // Write the bit-based block table
-            LengthInBytes = (pBitArray->NumberOfBits + 7) / 8;
-            memcpy(pbTrgData, pBitArray->Elements, LengthInBytes);
-            pbTrgData += LengthInBytes;
-
-            // Free the bit array
-            STORM_FREE(pBitArray);
-        }
-
-        // Create bit array for BET hashes
-        pBitArray = CreateBitArray(BetHeader.dwBetHashSizeTotal * BetHeader.dwFileCount, 0);
-        if(pBitArray != NULL)
-        {
-            TFileEntry * pFileEntry = ha->pFileTable;
-            ULONGLONG AndMask64 = ha->pHetTable->AndMask64;
-            ULONGLONG OrMask64 = ha->pHetTable->OrMask64;
-
-            for(i = 0; i < BetHeader.dwFileCount; i++)
-            {
-                ULONGLONG FileNameHash = 0;
-
-                // Calculate 64-bit hash of the file name
-                if((pFileEntry->dwFlags & MPQ_FILE_EXISTS) && pFileEntry->szFileName != NULL)
-                {
-                    FileNameHash = (HashStringJenkins(pFileEntry->szFileName) & AndMask64) | OrMask64;
-                    FileNameHash = FileNameHash & (AndMask64 >> 0x08);
-                }
-
-                // Insert the name hash to the bit array
-                SetBits(pBitArray, BetHeader.dwBetHashSizeTotal * i,
-                                   BetHeader.dwBetHashSize,
-                                   &FileNameHash,
-                                   8);
-
-                // Move to the next file entry
-                pFileEntry++;
-            }
-
-            // Write the array of BET hashes
-            LengthInBytes = (pBitArray->NumberOfBits + 7) / 8;
-            memcpy(pbTrgData, pBitArray->Elements, LengthInBytes);
-            pbTrgData += LengthInBytes;
-
-            // Free the bit array
-            STORM_FREE(pBitArray);
-        }
-
-        // Write the size of the BET table in the MPQ
-        if(pcbBetTable != NULL)
-        {
-            *pcbBetTable = (ULONGLONG)(sizeof(TMPQExtTable) + BetTableSize);
-        }
-    }
-
-    return pExtTable;
-}
-
-void FreeBetTable(TMPQBetTable * pBetTable)
-{
-    if(pBetTable != NULL)
-    {
-        if(pBetTable->pFileTable != NULL)
-            STORM_FREE(pBetTable->pFileTable);
-        if(pBetTable->pFileFlags != NULL)
-            STORM_FREE(pBetTable->pFileFlags);
-        if(pBetTable->pBetHashes != NULL)
-            STORM_FREE(pBetTable->pBetHashes);
-
-        STORM_FREE(pBetTable);
-    }
-}
-
-//-----------------------------------------------------------------------------
-// Support for file table
-
-TFileEntry * GetFileEntryAny(TMPQArchive * ha, const char * szFileName)
-{
-    TMPQHash * pHash;
-    DWORD dwFileIndex;
-
-    // If we have HET table in the MPQ, try to find the file in HET table
-    if(ha->pHetTable != NULL)
-    {
-        dwFileIndex = GetFileIndex_Het(ha, szFileName);
-        if(dwFileIndex != HASH_ENTRY_FREE)
-            return ha->pFileTable + dwFileIndex;
-    }
-
-    // Otherwise, perform the file search in the classic hash table
-    if(ha->pHashTable != NULL)
-    {
-        pHash = GetHashEntryAny(ha, szFileName);
-        if(pHash != NULL && pHash->dwBlockIndex < ha->dwFileTableSize)
-            return ha->pFileTable + pHash->dwBlockIndex;
-    }
-
-    // Not found
-    return NULL;
-}
-
-TFileEntry * GetFileEntryLocale(TMPQArchive * ha, const char * szFileName, LCID lcLocale)
-{
-    TMPQHash * pHash;
-    DWORD dwFileIndex;
-
-    // If we have HET table in the MPQ, try to find the file in HET table
-    if(ha->pHetTable != NULL)
-    {
-        dwFileIndex = GetFileIndex_Het(ha, szFileName);
-        if(dwFileIndex != HASH_ENTRY_FREE)
-            return ha->pFileTable + dwFileIndex;
-    }
-
-    // Otherwise, perform the file search in the classic hash table
-    if(ha->pHashTable != NULL)
-    {
-        pHash = GetHashEntryLocale(ha, szFileName, lcLocale);
-        if(pHash != NULL && pHash->dwBlockIndex < ha->dwFileTableSize)
-            return ha->pFileTable + pHash->dwBlockIndex;
-    }
-
-    // Not found
-    return NULL;
-}
-
-TFileEntry * GetFileEntryExact(TMPQArchive * ha, const char * szFileName, LCID lcLocale)
-{
-    TMPQHash * pHash;
-    DWORD dwFileIndex;
-
-    // If we have HET table in the MPQ, try to find the file in HET table
-    if(ha->pHetTable != NULL)
-    {
-        dwFileIndex = GetFileIndex_Het(ha, szFileName);
-        if(dwFileIndex != HASH_ENTRY_FREE)
-            return ha->pFileTable + dwFileIndex;
-    }
-
-    // Otherwise, perform the file search in the classic hash table
-    if(ha->pHashTable != NULL)
-    {
-        pHash = GetHashEntryExact(ha, szFileName, lcLocale);
-        if(pHash != NULL && pHash->dwBlockIndex < ha->dwFileTableSize)
-            return ha->pFileTable + pHash->dwBlockIndex;
-    }
-
-    // Not found
-    return NULL;
-}
-
-TFileEntry * GetFileEntryByIndex(TMPQArchive * ha, DWORD dwIndex)
-{
-    // For MPQs with classic hash table
-    if(dwIndex < ha->dwFileTableSize)
-        return ha->pFileTable + dwIndex;
-    return NULL;
-}
-
-void AllocateFileName(TFileEntry * pFileEntry, const char * szFileName)
-{
-    // Sanity check
-    assert(pFileEntry != NULL);
-
-    // If the file name is pseudo file name, free it at this point
-    if(IsPseudoFileName(pFileEntry->szFileName, NULL))
-    {
-        if(pFileEntry->szFileName != NULL)
-            STORM_FREE(pFileEntry->szFileName);
-        pFileEntry->szFileName = NULL;
-    }
-
-    // Only allocate new file name if it's not there yet
-    if(pFileEntry->szFileName == NULL)
-    {
-        pFileEntry->szFileName = STORM_ALLOC(char, strlen(szFileName) + 1);
-        if(pFileEntry->szFileName != NULL)
-            strcpy(pFileEntry->szFileName, szFileName);
-    }
-}
-
-
-// Finds a free file entry. Does NOT increment table size.
-TFileEntry * FindFreeFileEntry(TMPQArchive * ha)
-{
-    TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-    TFileEntry * pFreeEntry = NULL;
-    TFileEntry * pFileEntry;
-
-    // Try to find a free entry
-    for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-    {
-        // If that entry is free, we reuse it
-        if((pFileEntry->dwFlags & MPQ_FILE_EXISTS) == 0)
-        {
-            pFreeEntry = pFileEntry;
-            break;
-        }
-
-        //
-        // Note: Files with "delete marker" are not deleted.
-        // Don't consider them free entries
-        //
-    }
-
-    // Do we have a deleted entry?
-    if(pFreeEntry != NULL)
-    {
-        ClearFileEntry(ha, pFreeEntry);
-        return pFreeEntry;
-    }
-
-    // If no file entry within the existing file table is free,
-    // we try the reserve space after current file table
-    if(ha->dwFileTableSize < ha->dwMaxFileCount)
-        return ha->pFileTable + ha->dwFileTableSize;
-
-    // If we reached maximum file count, we cannot add more files to the MPQ
-    assert(ha->dwFileTableSize == ha->dwMaxFileCount);
-    return NULL;
-}
-
-
-TFileEntry * AllocateFileEntry(TMPQArchive * ha, const char * szFileName, LCID lcLocale)
-{
-    TFileEntry * pFileEntry = NULL;
-    TMPQHash * pHash;
-    DWORD dwHashIndex;
-    DWORD dwFileIndex;
-    bool bHashEntryExists = false;
-    bool bHetEntryExists = false;
-
-    // If the archive has classic hash table, we try to
-    // find the file in the hash table
-    if(ha->pHashTable != NULL)
-    {
-        // If the hash entry is already there, we reuse the file entry
-        pHash = GetHashEntryExact(ha, szFileName, lcLocale);
-        if(pHash != NULL)
-        {
-            pFileEntry = ha->pFileTable + pHash->dwBlockIndex;
-            bHashEntryExists = true;
-        }
-    }
-
-    // If the archive has HET table, try to use it for
-    // finding the file
-    if(ha->pHetTable != NULL)
-    {
-        dwFileIndex = GetFileIndex_Het(ha, szFileName);
-        if(dwFileIndex != HASH_ENTRY_FREE)
-        {
-            pFileEntry = ha->pFileTable + dwFileIndex;
-            bHetEntryExists = true;
-        }
-    }
-
-    // If still haven't found the file entry, we allocate new one
-    if(pFileEntry == NULL)
-    {
-        pFileEntry = FindFreeFileEntry(ha);
-        if(pFileEntry == NULL)
-            return NULL;
-    }
-
-    // Fill the rest of the file entry
-    pFileEntry->ByteOffset = 0;
-    pFileEntry->FileTime   = 0;
-    pFileEntry->dwFileSize = 0;
-    pFileEntry->dwCmpSize  = 0;
-    pFileEntry->dwFlags    = 0;
-    pFileEntry->lcLocale   = (USHORT)lcLocale;
-    pFileEntry->wPlatform  = 0;
-    pFileEntry->dwCrc32    = 0;
-    memset(pFileEntry->md5, 0, MD5_DIGEST_SIZE);
-
-    // Allocate space for file name, if it's not there yet
-    AllocateFileName(pFileEntry, szFileName);
-
-    // If the free file entry is at the end of the file table,
-    // we have to increment file table size
-    if(pFileEntry == ha->pFileTable + ha->dwFileTableSize)
-    {
-        assert(ha->dwFileTableSize < ha->dwMaxFileCount);
-        ha->pHeader->dwBlockTableSize++;
-        ha->dwFileTableSize++;
-    }
-
-    // If the MPQ has hash table, we have to insert the new entry into the hash table
-    if(ha->pHashTable != NULL && bHashEntryExists == false)
-    {
-        dwHashIndex = AllocateHashEntry(ha, pFileEntry);
-        assert(dwHashIndex != HASH_ENTRY_FREE);
-    }
-
-    // If the MPQ has HET table, we have to insert it to the HET table as well
-    if(ha->pHetTable != NULL && bHetEntryExists == false)
-    {
-        // TODO: Does HET table even support locales?
-        // Most probably, Blizzard gave up that silly idea long ago.
-        dwHashIndex = AllocateHetEntry(ha, pFileEntry);
-        assert(dwHashIndex != HASH_ENTRY_FREE);
-    }
-
-    // Return the file entry
-    return pFileEntry;
-}
-
-int RenameFileEntry(
-        TMPQArchive * ha,
-        TFileEntry * pFileEntry,
-        const char * szNewFileName)
-{
-    TMPQHash * pHash;
-    DWORD dwFileIndex;
-    int nError = ERROR_SUCCESS;
-
-    // If the MPQ has classic hash table, clear the entry there
-    if(ha->pHashTable != NULL)
-    {
-        assert(pFileEntry->dwHashIndex < ha->pHeader->dwHashTableSize);
-
-        pHash = ha->pHashTable + pFileEntry->dwHashIndex;
-        memset(pHash, 0xFF, sizeof(TMPQHash));
-        pHash->dwBlockIndex = HASH_ENTRY_DELETED;
-    }
-
-    // If the MPQ has HET table, clear the entry there as well
-    if(ha->pHetTable != NULL)
-    {
-        TMPQHetTable * pHetTable = ha->pHetTable;
-        DWORD dwInvalidFileIndex = (1 << pHetTable->dwIndexSizeTotal) - 1;
-
-        assert(pFileEntry->dwHetIndex < pHetTable->dwHashTableSize);
-
-        // Clear the entry in the HET hash array
-        pHetTable->pHetHashes[pFileEntry->dwHetIndex] = HET_ENTRY_DELETED;
-
-        // Set the BET index to invalid index
-        SetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * pFileEntry->dwHetIndex,
-                                        pHetTable->dwIndexSize,
-                                        &dwInvalidFileIndex,
-                                        4);
-    }
-
-    // Free the old file name
-    if(pFileEntry->szFileName != NULL)
-        STORM_FREE(pFileEntry->szFileName);
-    pFileEntry->szFileName = NULL;
-
-    // Allocate new file name
-    AllocateFileName(pFileEntry, szNewFileName);
-
-    // Now find a hash entry for the new file name
-    if(ha->pHashTable != NULL)
-    {
-        // Try to find the hash table entry for the new file name
-        // Note: If this fails, we leave the MPQ in a corrupt state
-        dwFileIndex = AllocateHashEntry(ha, pFileEntry);
-        if(dwFileIndex == HASH_ENTRY_FREE)
-            nError = ERROR_FILE_CORRUPT;
-    }
-
-    // If the archive has HET table, we have to allocate HET table for the file as well
-    // finding the file
-    if(ha->pHetTable != NULL)
-    {
-        dwFileIndex = AllocateHetEntry(ha, pFileEntry);
-        if(dwFileIndex == HASH_ENTRY_FREE)
-            nError = ERROR_FILE_CORRUPT;
-    }
-
-    // Invalidate the entries for (listfile) and (attributes)
-    // After we are done with MPQ changes, we need to re-create them
-    InvalidateInternalFiles(ha);
-    return nError;
-}
-
-void ClearFileEntry(
-        TMPQArchive * ha,
-        TFileEntry * pFileEntry)
-{
-    TMPQHash * pHash = NULL;
-
-    // If the MPQ has classic hash table, clear the entry there
-    if(ha->pHashTable != NULL)
-    {
-        assert(pFileEntry->dwHashIndex < ha->pHeader->dwHashTableSize);
-
-        pHash = ha->pHashTable + pFileEntry->dwHashIndex;
-        memset(pHash, 0xFF, sizeof(TMPQHash));
-        pHash->dwBlockIndex = HASH_ENTRY_DELETED;
-    }
-
-    // If the MPQ has HET table, clear the entry there as well
-    if(ha->pHetTable != NULL)
-    {
-        TMPQHetTable * pHetTable = ha->pHetTable;
-        DWORD dwInvalidFileIndex = (1 << pHetTable->dwIndexSizeTotal) - 1;
-
-        assert(pFileEntry->dwHetIndex < pHetTable->dwHashTableSize);
-
-        // Clear the entry in the HET hash array
-        pHetTable->pHetHashes[pFileEntry->dwHetIndex] = HET_ENTRY_DELETED;
-
-        // Set the BET index to invalid index
-        SetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * pFileEntry->dwHetIndex,
-                                        pHetTable->dwIndexSize,
-                                        &dwInvalidFileIndex,
-                                        4);
-    }
-
-    // Free the file name, and set the file entry as deleted
-    if(pFileEntry->szFileName != NULL)
-        STORM_FREE(pFileEntry->szFileName);
-
-    // Invalidate the file entry
-    memset(pFileEntry, 0, sizeof(TFileEntry));
-}
-
-int FreeFileEntry(
-        TMPQArchive * ha,
-        TFileEntry * pFileEntry)
-{
-    TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-    TFileEntry * pTempEntry;
-    int nError = ERROR_SUCCESS;
-
-    //
-    // If we have HET table, we cannot just get rid of the file
-    // Doing so would lead to empty gaps in the HET table
-    // We have to keep BET hash, hash index, HET index, locale, platform and file name
-    //
-
-    if(ha->pHetTable == NULL)
-    {
-        TFileEntry * pLastFileEntry = ha->pFileTable + ha->dwFileTableSize - 1;
-        TFileEntry * pLastUsedEntry = pLastFileEntry;
-
-        // Zero the file entry
-        ClearFileEntry(ha, pFileEntry);
-
-        // Now there is a chance that we created a chunk of free
-        // file entries at the end of the file table. We check this
-        // and eventually free all deleted file entries at the end
-        for(pTempEntry = ha->pFileTable; pTempEntry < pFileTableEnd; pTempEntry++)
-        {
-            // Is that an occupied file entry?
-            if(pTempEntry->dwFlags & MPQ_FILE_EXISTS)
-                pLastUsedEntry = pTempEntry;
-        }
-
-        // Can we free some entries at the end?
-        if(pLastUsedEntry < pLastFileEntry)
-        {
-            // Fix the size of the file table entry
-            ha->dwFileTableSize = (DWORD)(pLastUsedEntry - ha->pFileTable) + 1;
-            ha->pHeader->dwBlockTableSize = ha->dwFileTableSize;
-        }
-    }
-    else
-    {
-        // Note: Deleted entries in Blizzard MPQs version 4.0
-        // normally contain valid byte offset and length
-        pFileEntry->dwFlags &= ~MPQ_FILE_EXISTS;
-        nError = ERROR_SUCCESS;
-    }
-
-    return nError;
-}
-
-void InvalidateInternalFiles(TMPQArchive * ha)
-{
-    TFileEntry * pFileEntry;
-
-    // Invalidate the (listfile), if not done yet
-    if(!(ha->dwFlags & MPQ_FLAG_INV_LISTFILE))
-    {
-        pFileEntry = GetFileEntryExact(ha, LISTFILE_NAME, LANG_NEUTRAL);
-        if(pFileEntry != NULL)
-            FreeFileEntry(ha, pFileEntry);
-        ha->dwFlags |= MPQ_FLAG_INV_LISTFILE;
-    }
-
-    // Invalidate the (attributes), if not done yet
-    if(!(ha->dwFlags & MPQ_FLAG_INV_ATTRIBUTES))
-    {
-        pFileEntry = GetFileEntryExact(ha, ATTRIBUTES_NAME, LANG_NEUTRAL);
-        if(pFileEntry != NULL)
-            FreeFileEntry(ha, pFileEntry);
-        ha->dwFlags |= MPQ_FLAG_INV_ATTRIBUTES;
-    }
-
-    // Remember that the MPQ has been changed and it will be necessary
-    // to update the tables
-    ha->dwFlags |= MPQ_FLAG_CHANGED;
-}
-
-//-----------------------------------------------------------------------------
-// Functions that loads and verify MPQ data bitmap
-
-int LoadMpqDataBitmap(TMPQArchive * ha, ULONGLONG FileSize, bool * pbFileIsComplete)
-{
-    TMPQBitmap * pBitmap = NULL;
-    TMPQBitmap DataBitmap;
-    ULONGLONG BitmapOffset;
-    ULONGLONG EndOfMpq;
-    DWORD DataBlockCount = 0;
-    DWORD BitmapByteSize;
-    DWORD WholeByteCount;
-    DWORD ExtraBitsCount;
-
-    // Is there enough space for a MPQ bitmap?
-    EndOfMpq = ha->MpqPos + ha->pHeader->ArchiveSize64;
-    FileSize = FileSize - sizeof(TMPQBitmap);
-    if(FileSize > EndOfMpq)
-    {
-        // Try to load the data bitmap from the end of the file
-        if(FileStream_Read(ha->pStream, &FileSize, &DataBitmap, sizeof(TMPQBitmap)))
-        {
-            // Is it a valid data bitmap?
-            BSWAP_ARRAY32_UNSIGNED((LPDWORD)(&DataBitmap), sizeof(TMPQBitmap));
-            if(DataBitmap.dwSignature == MPQ_DATA_BITMAP_SIGNATURE)
-            {
-                // We assume that MPQs with data bitmap begin at position 0
-                assert(ha->MpqPos == 0);
-
-                // Calculate the number of extra bytes for data bitmap
-                DataBlockCount = (DWORD)(((ha->pHeader->ArchiveSize64 - 1) / DataBitmap.dwBlockSize) + 1);
-                BitmapByteSize = ((DataBlockCount - 1) / 8) + 1;
-
-                // Verify the data block size
-                BitmapOffset = ((ULONGLONG)DataBitmap.dwMapOffsetHi << 32) | DataBitmap.dwMapOffsetLo;
-                assert((DWORD)(FileSize - BitmapOffset) == BitmapByteSize);
-
-                // Allocate space for the data bitmap
-                pBitmap = (TMPQBitmap *)STORM_ALLOC(BYTE, sizeof(TMPQBitmap) + BitmapByteSize);
-                if(pBitmap != NULL)
-                {
-                    // Copy the bitmap header
-                    memcpy(pBitmap, &DataBitmap, sizeof(TMPQBitmap));
-
-                    // Read the remaining part
-                    if(!FileStream_Read(ha->pStream, &BitmapOffset, (pBitmap + 1), BitmapByteSize))
-                    {
-                        STORM_FREE(pBitmap);
-                        pBitmap = NULL;
-                    }
-                }
-            }
-        }
-    }
-
-    // If the caller asks for file completeness, check it
-    if(pBitmap != NULL && pbFileIsComplete != NULL)
-    {
-        LPBYTE pbBitmap = (LPBYTE)(pBitmap + 1);
-        DWORD i;
-        bool bFileIsComplete = true;
-
-        // Calculate the number of whole bytes and extra bits of the bitmap
-        WholeByteCount = (DataBlockCount / 8);
-        ExtraBitsCount = (DataBlockCount & 7);
-
-        // Verify the whole bytes - their value must be 0xFF
-        for(i = 0; i < WholeByteCount; i++)
-        {
-            if(pbBitmap[i] != 0xFF)
-                bFileIsComplete = false;
-        }
-
-        // If there are extra bits, calculate the mask
-        if(ExtraBitsCount != 0)
-        {
-            BYTE ExpectedValue = (BYTE)((1 << ExtraBitsCount) - 1);
-
-            if(pbBitmap[i] != ExpectedValue)
-                bFileIsComplete = false;
-        }
-
-        // Give the result to the caller
-        *pbFileIsComplete = bFileIsComplete;
-    }
-
-    ha->pBitmap = pBitmap;
-    return ERROR_SUCCESS;
-}
-
-//-----------------------------------------------------------------------------
-// Support for file tables - hash table, block table, hi-block table
-
-int CreateHashTable(TMPQArchive * ha, DWORD dwHashTableSize)
-{
-    TMPQHash * pHashTable;
-
-    // Sanity checks
-    assert((dwHashTableSize & (dwHashTableSize - 1)) == 0);
-    assert(ha->pHashTable == NULL);
-
-    // Create the hash table
-    pHashTable = STORM_ALLOC(TMPQHash, dwHashTableSize);
-    if(pHashTable == NULL)
-        return ERROR_NOT_ENOUGH_MEMORY;
-
-    // Fill it
-    memset(pHashTable, 0xFF, dwHashTableSize * sizeof(TMPQHash));
-    ha->pHashTable = pHashTable;
-
-    // Set the max file count, if needed
-    if(ha->pHetTable == NULL)
-        ha->dwMaxFileCount = dwHashTableSize;
-    return ERROR_SUCCESS;
-}
-
-TMPQHash * LoadHashTable(TMPQArchive * ha)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-    ULONGLONG ByteOffset;
-    TMPQHash * pHashTable;
-    DWORD dwTableSize;
-    DWORD dwCmpSize;
-    int nError;
-
-    // If the MPQ has no hash table, do nothing
-    if(pHeader->dwHashTablePos == 0 && pHeader->wHashTablePosHi == 0)
-        return NULL;
-
-    // If the hash table size is zero, do nothing
-    if(pHeader->dwHashTableSize == 0)
-        return NULL;
-
-    // Allocate buffer for the hash table
-    dwTableSize = pHeader->dwHashTableSize * sizeof(TMPQHash);
-    pHashTable = STORM_ALLOC(TMPQHash, pHeader->dwHashTableSize);
-    if(pHashTable == NULL)
-        return NULL;
-
-    // Compressed size of the hash table
-    dwCmpSize = (DWORD)pHeader->HashTableSize64;
-
-    //
-    // Load the table from the MPQ, with decompression
-    //
-    // Note: We will NOT check if the hash table is properly decrypted.
-    // Some MPQ protectors corrupt the hash table by rewriting part of it.
-    // Hash table, the way how it works, allows arbitrary values for unused entries.
-    //
-
-    ByteOffset = ha->MpqPos + MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos);
-    nError = LoadMpqTable(ha, ByteOffset, pHashTable, dwCmpSize, dwTableSize, MPQ_KEY_HASH_TABLE);
-    if(nError != ERROR_SUCCESS)
-    {
-        STORM_FREE(pHashTable);
-        pHashTable = NULL;
-    }
-
-    // Return the hash table
-    return pHashTable;
-}
-
-static void FixBlockTableSize(
-        TMPQArchive * ha,
-        TMPQBlock * pBlockTable,
-        DWORD dwClaimedSize)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-    ULONGLONG BlockTableStart;
-    ULONGLONG BlockTableEnd;
-    ULONGLONG FileDataStart;
-
-    // Only perform this check on MPQs version 1.0
-    if(pHeader->dwHeaderSize == MPQ_HEADER_SIZE_V1)
-    {
-        // Calculate claimed block table begin and end
-        BlockTableStart = ha->MpqPos + MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
-        BlockTableEnd = BlockTableStart + (pHeader->dwBlockTableSize * sizeof(TMPQBlock));
-
-        for(DWORD i = 0; i < dwClaimedSize; i++)
-        {
-            // If the block table end goes into that file, fix the block table end
-            FileDataStart = ha->MpqPos + pBlockTable[i].dwFilePos;
-            if(BlockTableStart < FileDataStart && BlockTableEnd > FileDataStart)
-            {
-                dwClaimedSize = (DWORD)((FileDataStart - BlockTableStart) / sizeof(TMPQBlock));
-                BlockTableEnd = FileDataStart;
-            }
-        }
-    }
-
-    // Fix the block table size
-    pHeader->BlockTableSize64 = dwClaimedSize * sizeof(TMPQBlock);
-    pHeader->dwBlockTableSize = dwClaimedSize;
-}
-
-TMPQBlock * LoadBlockTable(TMPQArchive * ha, ULONGLONG FileSize)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-    TMPQBlock * pBlockTable;
-    ULONGLONG ByteOffset;
-    DWORD dwTableSize;
-    DWORD dwCmpSize;
-    int nError;
-
-    // Do nothing if the block table position is zero
-    if(pHeader->dwBlockTablePos == 0 && pHeader->wBlockTablePosHi == 0)
-        return NULL;
-
-    // Do nothing if the block table size is zero
-    if(pHeader->dwBlockTableSize == 0)
-        return NULL;
-
-    // Sanity check, enforced by LoadAnyHashTable
-    assert(ha->dwMaxFileCount >= pHeader->dwBlockTableSize);
-
-    // Calculate sizes of both tables
-    ByteOffset = ha->MpqPos + MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
-    dwTableSize = pHeader->dwBlockTableSize * sizeof(TMPQBlock);
-    dwCmpSize = (DWORD)pHeader->BlockTableSize64;
-
-    // Allocate space for the block table
-    // Note: pHeader->dwBlockTableSize can be zero !!!
-    pBlockTable = STORM_ALLOC(TMPQBlock, ha->dwMaxFileCount);
-    if(pBlockTable == NULL)
-        return NULL;
-
-    // Fill the block table with zeros
-    memset(pBlockTable, 0, dwTableSize);
-
-    // I found a MPQ which claimed 0x200 entries in the block table,
-    // but the file was cut and there was only 0x1A0 entries.
-    // We will handle this case properly.
-    if(dwTableSize == dwCmpSize && (ByteOffset + dwTableSize) > FileSize)
-    {
-        pHeader->dwBlockTableSize = (DWORD)((FileSize - ByteOffset) / sizeof(TMPQBlock));
-        pHeader->BlockTableSize64 = pHeader->dwBlockTableSize * sizeof(TMPQBlock);
-        dwTableSize = dwCmpSize = pHeader->dwBlockTableSize * sizeof(TMPQBlock);
-    }
-
-    //
-    // One of the first cracked versions of Diablo I had block table unencrypted
-    // StormLib does NOT support such MPQs anymore, as they are incompatible
-    // with compressed block table feature
-    //
-
-    // Load the block table
-    nError = LoadMpqTable(ha, ByteOffset, pBlockTable, dwCmpSize, dwTableSize, MPQ_KEY_BLOCK_TABLE);
-    if(nError != ERROR_SUCCESS)
-    {
-        // Failed, sorry
-        STORM_FREE(pBlockTable);
-        return NULL;
-    }
-
-    // Defense against MPQs that claim block table to be bigger than it really is
-    FixBlockTableSize(ha, pBlockTable, pHeader->dwBlockTableSize);
-    return pBlockTable;
-}
-
-int LoadHetTable(TMPQArchive * ha)
-{
-    TMPQExtTable * pExtTable;
-    TMPQHeader * pHeader = ha->pHeader;
-    int nError = ERROR_SUCCESS;
-
-    // If the HET table position is not NULL, we expect
-    // both HET and BET tables to be present.
-    if(pHeader->HetTablePos64 != 0)
-    {
-        // Attempt to load the HET table (Hash Extended Table)
-        pExtTable = LoadExtTable(ha, pHeader->HetTablePos64, (size_t)pHeader->HetTableSize64, HET_TABLE_SIGNATURE, MPQ_KEY_HASH_TABLE);
-        if(pExtTable != NULL)
-        {
-            // If succeeded, we have to limit the maximum file count
-            // to the values saved in the HET table
-            // If loading HET table fails, we ignore the result.
-            ha->pHetTable = TranslateHetTable(pExtTable);
-            if(ha->pHetTable != NULL)
-                ha->dwMaxFileCount = ha->pHetTable->dwMaxFileCount;
-
-            STORM_FREE(pExtTable);
-        }
-
-        // If the HET hable failed to load, it's corrupt.
-        if(ha->pHetTable == NULL)
-            nError = ERROR_FILE_CORRUPT;
-    }
-
-    return nError;
-}
-
-TMPQBetTable * LoadBetTable(TMPQArchive * ha)
-{
-    TMPQExtTable * pExtTable;
-    TMPQBetTable * pBetTable = NULL;
-    TMPQHeader * pHeader = ha->pHeader;
-
-    // If the HET table position is not NULL, we expect
-    // both HET and BET tables to be present.
-    if(pHeader->BetTablePos64 != 0)
-    {
-        // Attempt to load the HET table (Hash Extended Table)
-        pExtTable = LoadExtTable(ha, pHeader->BetTablePos64, (size_t)pHeader->BetTableSize64, BET_TABLE_SIGNATURE, MPQ_KEY_BLOCK_TABLE);
-        if(pExtTable != NULL)
-        {
-            // If succeeded, we translate the BET table
-            // to more readable form
-            pBetTable = TranslateBetTable(ha, pExtTable);
-            STORM_FREE(pExtTable);
-        }
-    }
-
-    return pBetTable;
-}
-
-int LoadAnyHashTable(TMPQArchive * ha)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-
-    // If the MPQ archive is empty, don't bother trying to load anything
-    if(pHeader->dwHashTableSize == 0 && pHeader->HetTableSize64 == 0)
-        return CreateHashTable(ha, HASH_TABLE_SIZE_DEFAULT);
-
-    // Try to load HET and/or classic hash table
-    LoadHetTable(ha);
-
-    // Load the HASH table
-    ha->pHashTable = LoadHashTable(ha);
-
-    // Set the maximum file count to the size of the hash table
-    // In case there is HET table, we have to keep the file limit
-    if(ha->pHetTable == NULL)
-        ha->dwMaxFileCount = pHeader->dwHashTableSize;
-
-    // Did at least one succeed?
-    if(ha->pHetTable == NULL && ha->pHashTable == NULL)
-        return ERROR_FILE_CORRUPT;
-
-    // In theory, a MPQ could have bigger block table than hash table
-    if(ha->pHeader->dwBlockTableSize > ha->dwMaxFileCount)
-    {
-        ha->dwMaxFileCount = ha->pHeader->dwBlockTableSize;
-        ha->dwFlags |= MPQ_FLAG_READ_ONLY;
-    }
-
-    return ERROR_SUCCESS;
-}
-
-int BuildFileTable_Classic(
-        TMPQArchive * ha,
-        TFileEntry * pFileTable,
-        ULONGLONG FileSize)
-{
-    TFileEntry * pFileEntry;
-    TMPQHeader * pHeader = ha->pHeader;
-    TMPQBlock * pBlockTable;
-    TMPQBlock * pBlock;
-    int nError = ERROR_SUCCESS;
-
-    // Sanity checks
-    assert(ha->pHashTable != NULL);
-
-    // Load the block table
-    pBlockTable = LoadBlockTable(ha, FileSize);
-    if(pBlockTable != NULL)
-    {
-        TMPQHash * pHashEnd = ha->pHashTable + pHeader->dwHashTableSize;
-        TMPQHash * pHash;
-
-        // If we don't have HET table, we build the file entries from the hash&block tables
-        if(ha->pHetTable == NULL)
-        {
-            for(pHash = ha->pHashTable; pHash < pHashEnd; pHash++)
-            {
-                if(pHash->dwBlockIndex < pHeader->dwBlockTableSize)
-                {
-                    pFileEntry = pFileTable + pHash->dwBlockIndex;
-                    pBlock = pBlockTable + pHash->dwBlockIndex;
-
-                    //
-                    // Yet another silly map protector: For each valid file,
-                    // there are 4 items in the hash table, that appears to be valid:
-                    //
-                    //   a6d79af0 e61a0932 001e0000 0000770b <== Fake valid
-                    //   a6d79af0 e61a0932 0000d761 0000dacb <== Fake valid
-                    //   a6d79af0 e61a0932 00000000 0000002f <== Real file entry
-                    //   a6d79af0 e61a0932 00005a4f 000093bc <== Fake valid
-                    //
-
-                    if(!(pBlock->dwFlags & ~MPQ_FILE_VALID_FLAGS) && (pBlock->dwFlags & MPQ_FILE_EXISTS))
-                    {
-                        // Fill the entry
-                        pFileEntry->ByteOffset  = pBlock->dwFilePos;
-                        pFileEntry->dwHashIndex = (DWORD)(pHash - ha->pHashTable);
-                        pFileEntry->dwFileSize  = pBlock->dwFSize;
-                        pFileEntry->dwCmpSize   = pBlock->dwCSize;
-                        pFileEntry->dwFlags     = pBlock->dwFlags;
-                        pFileEntry->lcLocale    = pHash->lcLocale;
-                        pFileEntry->wPlatform   = pHash->wPlatform;
-                    }
-                    else
-                    {
-                        // If the hash table entry doesn't point to the valid file item,
-                        // we invalidate the entire hash table entry
-                        pHash->dwName1      = 0xFFFFFFFF;
-                        pHash->dwName2      = 0xFFFFFFFF;
-                        pHash->lcLocale     = 0xFFFF;
-                        pHash->wPlatform    = 0xFFFF;
-                        pHash->dwBlockIndex = HASH_ENTRY_DELETED;
-                    }
-                }
-            }
-        }
-        else
-        {
-            for(pHash = ha->pHashTable; pHash < pHashEnd; pHash++)
-            {
-                if(pHash->dwBlockIndex < ha->dwFileTableSize)
-                {
-                    pFileEntry = pFileTable + pHash->dwBlockIndex;
-                    if(pFileEntry->dwFlags & MPQ_FILE_EXISTS)
-                    {
-                        pFileEntry->dwHashIndex = (DWORD)(pHash - ha->pHashTable);
-                        pFileEntry->lcLocale    = pHash->lcLocale;
-                        pFileEntry->wPlatform   = pHash->wPlatform;
-                    }
-                }
-            }
-        }
-
-        // Free the block table
-        STORM_FREE(pBlockTable);
-    }
-    else
-    {
-        nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Load the hi-block table
-    if(nError == ERROR_SUCCESS && pHeader->HiBlockTablePos64 != 0)
-    {
-        ULONGLONG ByteOffset;
-        USHORT * pHiBlockTable = NULL;
-        DWORD dwTableSize = pHeader->dwBlockTableSize * sizeof(USHORT);
-
-        // Allocate space for the hi-block table
-        // Note: pHeader->dwBlockTableSize can be zero !!!
-        pHiBlockTable = STORM_ALLOC(USHORT, pHeader->dwBlockTableSize + 1);
-        if(pHiBlockTable != NULL)
-        {
-            // Load the hi-block table. It is not encrypted, nor compressed
-            ByteOffset = ha->MpqPos + pHeader->HiBlockTablePos64;
-            if(!FileStream_Read(ha->pStream, &ByteOffset, pHiBlockTable, dwTableSize))
-                nError = GetLastError();
-
-            // Now merge the hi-block table to the file table
-            if(nError == ERROR_SUCCESS)
-            {
-                pFileEntry = pFileTable;
-
-                // Add the high file offset to the base file offset.
-                // We also need to swap it during the process.
-                for(DWORD i = 0; i < pHeader->dwBlockTableSize; i++)
-                {
-                    pFileEntry->ByteOffset |= ((ULONGLONG)BSWAP_INT16_UNSIGNED(pHiBlockTable[i]) << 32);
-                    pFileEntry++;
-                }
-            }
-
-            // Free the hi-block table
-            STORM_FREE(pHiBlockTable);
-        }
-        else
-        {
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-        }
-    }
-
-    // Set the current size of the file table
-    ha->dwFileTableSize = pHeader->dwBlockTableSize;
-    return nError;
-}
-
-int BuildFileTable_HetBet(
-        TMPQArchive * ha,
-        TFileEntry * pFileTable)
-{
-    TMPQHetTable * pHetTable = ha->pHetTable;
-    TMPQBetTable * pBetTable;
-    TFileEntry * pFileEntry = pFileTable;
-    TBitArray * pBitArray;
-    DWORD dwBitPosition = 0;
-    DWORD i;
-    int nError = ERROR_FILE_CORRUPT;
-
-    // Load the BET table from the MPQ
-    pBetTable = LoadBetTable(ha);
-    if(pBetTable != NULL)
-    {
-        // Step one: Fill the indexes to the HET table
-        for(i = 0; i < pHetTable->dwHashTableSize; i++)
-        {
-            DWORD dwFileIndex = 0;
-
-            // Is the entry in the HET table occupied?
-            if(pHetTable->pHetHashes[i] != 0)
-            {
-                // Load the index to the BET table
-                GetBits(pHetTable->pBetIndexes, pHetTable->dwIndexSizeTotal * i,
-                                                pHetTable->dwIndexSize,
-                                                &dwFileIndex,
-                                                4);
-                // Overflow test
-                if(dwFileIndex < pBetTable->dwFileCount)
-                {
-                    // Get the file entry and save HET index
-                    pFileEntry = pFileTable + dwFileIndex;
-                    pFileEntry->dwHetIndex = i;
-
-                    // Load the BET hash
-                    GetBits(pBetTable->pBetHashes, pBetTable->dwBetHashSizeTotal * dwFileIndex,
-                                                   pBetTable->dwBetHashSize,
-                                                   &pFileEntry->BetHash,
-                                                   8);
-                }
-            }
-        }
-
-        // Go through the entire BET table and convert it to the file table.
-        pFileEntry = pFileTable;
-        pBitArray = pBetTable->pFileTable;
-        for(i = 0; i < pBetTable->dwFileCount; i++)
-        {
-            DWORD dwFlagIndex = 0;
-
-            // Read the file position
-            GetBits(pBitArray, dwBitPosition + pBetTable->dwBitIndex_FilePos,
-                               pBetTable->dwBitCount_FilePos,
-                               &pFileEntry->ByteOffset,
-                               8);
-
-            // Read the file size
-            GetBits(pBitArray, dwBitPosition + pBetTable->dwBitIndex_FileSize,
-                               pBetTable->dwBitCount_FileSize,
-                               &pFileEntry->dwFileSize,
-                               4);
-
-            // Read the compressed size
-            GetBits(pBitArray, dwBitPosition + pBetTable->dwBitIndex_CmpSize,
-                               pBetTable->dwBitCount_CmpSize,
-                               &pFileEntry->dwCmpSize,
-                               4);
-
-
-            // Read the flag index
-            if(pBetTable->dwFlagCount != 0)
-            {
-                GetBits(pBitArray, dwBitPosition + pBetTable->dwBitIndex_FlagIndex,
-                                   pBetTable->dwBitCount_FlagIndex,
-                                   &dwFlagIndex,
-                                   4);
-
-                pFileEntry->dwFlags = pBetTable->pFileFlags[dwFlagIndex];
-            }
-
-            //
-            // TODO: Locale (?)
-            //
-
-            // Move the current bit position
-            dwBitPosition += pBetTable->dwTableEntrySize;
-            pFileEntry++;
-        }
-
-        // Set the current size of the file table
-        ha->dwFileTableSize = pBetTable->dwFileCount;
-        FreeBetTable(pBetTable);
-        nError = ERROR_SUCCESS;
-    }
-    else
-    {
-        nError = ERROR_FILE_CORRUPT;
-    }
-
-    return nError;
-}
-
-int BuildFileTable(TMPQArchive * ha, ULONGLONG FileSize)
-{
-    TFileEntry * pFileTable;
-    bool bFileTableCreated = false;
-
-    // Sanity checks
-    assert(ha->dwFileTableSize == 0);
-    assert(ha->dwMaxFileCount != 0);
-
-    // Allocate the file table with size determined before
-    pFileTable = STORM_ALLOC(TFileEntry, ha->dwMaxFileCount);
-    if(pFileTable == NULL)
-        return ERROR_NOT_ENOUGH_MEMORY;
-
-    // Fill the table with zeros
-    memset(pFileTable, 0, ha->dwMaxFileCount * sizeof(TFileEntry));
-
-    // If we have HET table, we load file table from the BET table
-    // Note: If BET table is corrupt or missing, we set the archive as read only
-    if(ha->pHetTable != NULL)
-    {
-        if(BuildFileTable_HetBet(ha, pFileTable) != ERROR_SUCCESS)
-            ha->dwFlags |= MPQ_FLAG_READ_ONLY;
-        else
-            bFileTableCreated = true;
-    }
-
-    // If we have hash table, we load the file table from the block table
-    // Note: If block table is corrupt or missing, we set the archive as read only
-    if(ha->pHashTable != NULL)
-    {
-        if(BuildFileTable_Classic(ha, pFileTable, FileSize) != ERROR_SUCCESS)
-            ha->dwFlags |= MPQ_FLAG_READ_ONLY;
-        else
-            bFileTableCreated = true;
-    }
-
-    // If something failed, we free the file table entry
-    if(bFileTableCreated == false)
-    {
-        STORM_FREE(pFileTable);
-        return ERROR_FILE_CORRUPT;
-    }
-
-    // Assign it to the archive structure
-    ha->pFileTable = pFileTable;
-    return ERROR_SUCCESS;
-}
-
-// Saves MPQ header, hash table, block table and hi-block table.
-int SaveMPQTables(TMPQArchive * ha)
-{
-    TMPQExtTable * pHetTable = NULL;
-    TMPQExtTable * pBetTable = NULL;
-    TMPQHeader * pHeader = ha->pHeader;
-    TMPQBlock * pBlockTable = NULL;
-    TMPQHash * pHashTable = NULL;
-    ULONGLONG HetTableSize64 = 0;
-    ULONGLONG BetTableSize64 = 0;
-    ULONGLONG HashTableSize64 = 0;
-    ULONGLONG BlockTableSize64 = 0;
-    ULONGLONG HiBlockTableSize64 = 0;
-    ULONGLONG TablePos = 0;             // A table position, relative to the begin of the MPQ
-    USHORT * pHiBlockTable = NULL;
-    DWORD cbTotalSize;
-    bool bNeedHiBlockTable = false;
-    int nError = ERROR_SUCCESS;
-
-    // We expect this function to be called only when tables have been changed
-    assert(ha->dwFlags & MPQ_FLAG_CHANGED);
-
-    // Find the space where the MPQ tables will be saved
-    FindFreeMpqSpace(ha, &TablePos);
-
-    // If the MPQ has HET table, we prepare a ready-to-save version
-    if(nError == ERROR_SUCCESS && ha->pHetTable != NULL)
-    {
-        pHetTable = TranslateHetTable(ha->pHetTable, &HetTableSize64);
-        if(pHetTable == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // If the MPQ has HET table, we also must create BET table to be saved
-    if(nError == ERROR_SUCCESS && ha->pHetTable != NULL)
-    {
-        pBetTable = TranslateBetTable(ha, &BetTableSize64);
-        if(pBetTable == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Now create hash table
-    if(nError == ERROR_SUCCESS && ha->pHashTable != NULL)
-    {
-        pHashTable = TranslateHashTable(ha, &HashTableSize64);
-        if(pHashTable == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Create block table
-    if(nError == ERROR_SUCCESS && ha->pHashTable != NULL)
-    {
-        pBlockTable = TranslateBlockTable(ha, &BlockTableSize64, &bNeedHiBlockTable);
-        if(pBlockTable == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Create hi-block table, if needed
-    if(nError == ERROR_SUCCESS && bNeedHiBlockTable)
-    {
-        pHiBlockTable = TranslateHiBlockTable(ha, &HiBlockTableSize64);
-        if(pHiBlockTable == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Write the HET table, if any
-    if(nError == ERROR_SUCCESS && pHetTable != NULL)
-    {
-        pHeader->HetTableSize64 = HetTableSize64;
-        pHeader->HetTablePos64  = TablePos;
-        nError = SaveExtTable(ha, pHetTable, TablePos, (DWORD)HetTableSize64, pHeader->MD5_HetTable, MPQ_KEY_HASH_TABLE, false, &cbTotalSize);
-        TablePos += cbTotalSize;
-    }
-
-    // Write the BET table, if any
-    if(nError == ERROR_SUCCESS && pBetTable != NULL)
-    {
-        pHeader->BetTableSize64 = BetTableSize64;
-        pHeader->BetTablePos64  = TablePos;
-        nError = SaveExtTable(ha, pBetTable, TablePos, (DWORD)BetTableSize64, pHeader->MD5_BetTable, MPQ_KEY_BLOCK_TABLE, false, &cbTotalSize);
-        TablePos += cbTotalSize;
-    }
-
-    // Write the hash table, if we have any
-    if(nError == ERROR_SUCCESS && pHashTable != NULL)
-    {
-        pHeader->HashTableSize64 = HashTableSize64;
-        pHeader->wHashTablePosHi = (USHORT)(TablePos >> 32);
-        pHeader->dwHashTableSize = (DWORD)(HashTableSize64 / sizeof(TMPQHash));
-        pHeader->dwHashTablePos = (DWORD)TablePos;
-        nError = SaveMpqTable(ha, pHashTable, TablePos, (size_t)HashTableSize64, pHeader->MD5_HashTable, MPQ_KEY_HASH_TABLE, false);
-        TablePos += HashTableSize64;
-    }
-
-    // Write the block table, if we have any
-    if(nError == ERROR_SUCCESS && pBlockTable != NULL)
-    {
-        pHeader->BlockTableSize64 = BlockTableSize64;
-        pHeader->wBlockTablePosHi = (USHORT)(TablePos >> 32);
-        pHeader->dwBlockTableSize = (DWORD)(BlockTableSize64 / sizeof(TMPQBlock));
-        pHeader->dwBlockTablePos = (DWORD)TablePos;
-        nError = SaveMpqTable(ha, pBlockTable, TablePos, (size_t)BlockTableSize64, pHeader->MD5_BlockTable, MPQ_KEY_BLOCK_TABLE, false);
-        TablePos += BlockTableSize64;
-    }
-
-    // Write the hi-block table, if we have any
-    if(nError == ERROR_SUCCESS && pHiBlockTable != NULL)
-    {
-        ULONGLONG ByteOffset = ha->MpqPos + TablePos;
-
-        pHeader->HiBlockTableSize64 = HiBlockTableSize64;
-        pHeader->HiBlockTablePos64 = TablePos;
-        BSWAP_ARRAY16_UNSIGNED(pHiBlockTable, HiBlockTableSize64);
-
-        if(!FileStream_Write(ha->pStream, &ByteOffset, pHiBlockTable, (DWORD)HiBlockTableSize64))
-            nError = GetLastError();
-        TablePos += HiBlockTableSize64;
-    }
-
-    // Cut the MPQ
-    if(nError == ERROR_SUCCESS)
-    {
-        ULONGLONG FileSize = ha->MpqPos + TablePos;
-
-        if(!FileStream_SetSize(ha->pStream, FileSize))
-            nError = GetLastError();
-    }
-
-    // Write the MPQ header
-    if(nError == ERROR_SUCCESS)
-    {
-        // Update the size of the archive
-        pHeader->ArchiveSize64 = TablePos;
-        pHeader->dwArchiveSize = (DWORD)TablePos;
-
-        // Update the MD5 of the archive header
-        CalculateDataBlockHash(pHeader, MPQ_HEADER_SIZE_V4 - MD5_DIGEST_SIZE, pHeader->MD5_MpqHeader);
-
-        // Write the MPQ header to the file
-        BSWAP_TMPQHEADER(pHeader);
-        if(!FileStream_Write(ha->pStream, &ha->MpqPos, pHeader, pHeader->dwHeaderSize))
-            nError = GetLastError();
-        BSWAP_TMPQHEADER(pHeader);
-    }
-
-    // Clear the changed flag
-    if(nError == ERROR_SUCCESS)
-        ha->dwFlags &= ~MPQ_FLAG_CHANGED;
-
-    // Cleanup and exit
-    if(pHetTable != NULL)
-        STORM_FREE(pHetTable);
-    if(pBetTable != NULL)
-        STORM_FREE(pBetTable);
-    if(pHashTable != NULL)
-        STORM_FREE(pHashTable);
-    if(pBlockTable != NULL)
-        STORM_FREE(pBlockTable);
-    if(pHiBlockTable != NULL)
-        STORM_FREE(pHiBlockTable);
-    return nError;
-}
diff --git a/dep/StormLibOld/src/SCompression.cpp b/dep/StormLibOld/src/SCompression.cpp
deleted file mode 100644
index 19ef5940f..000000000
--- a/dep/StormLibOld/src/SCompression.cpp
+++ /dev/null
@@ -1,1135 +0,0 @@
-/*****************************************************************************/
-/* SCompression.cpp                       Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* This module serves as a bridge between StormLib code and (de)compression  */
-/* functions. All (de)compression calls go (and should only go) through this */
-/* module. No system headers should be included in this module to prevent    */
-/* compile-time problems.                                                    */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 01.04.03  1.00  Lad  The first version of SCompression.cpp                */
-/* 19.11.03  1.01  Dan  Big endian handling                                  */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-//-----------------------------------------------------------------------------
-// Local structures
-
-// Information about the input and output buffers for pklib
-typedef struct
-{
-    char * pbInBuff;                     // Pointer to input data buffer
-    char * pbInBuffEnd;                  // End of the input buffer
-    char * pbOutBuff;                    // Pointer to output data buffer
-    char * pbOutBuffEnd;                 // Pointer to output data buffer
-} TDataInfo;
-
-// Prototype of the compression function
-// Function doesn't return an error. A success means that the size of compressed buffer
-// is lower than size of uncompressed buffer.
-typedef void (*COMPRESS)(
-        char * pbOutBuffer,                 // [out] Pointer to the buffer where the compressed data will be stored
-        int * pcbOutBuffer,                 // [in]  Pointer to length of the buffer pointed by pbOutBuffer
-        // [out] Contains length of the compressed data
-        char * pbInBuffer,                  // [in]  Pointer to the buffer with data to compress
-        int cbInBuffer,                     // [in]  Length of the buffer pointer by pbInBuffer
-        int * pCmpType,                     // [in]  Compression-method specific value. ADPCM Setups this for the following Huffman compression
-        int nCmpLevel);                     // [in]  Compression specific value. ADPCM uses this. Should be set to zero.
-
-// Prototype of the decompression function
-// Returns 1 if success, 0 if failure
-typedef int (*DECOMPRESS)(
-        char * pbOutBuffer,                 // [out] Pointer to the buffer where to store decompressed data
-        int * pcbOutBuffer,                 // [in]  Pointer to total size of the buffer pointed by pbOutBuffer
-        // [out] Contains length of the decompressed data
-        char * pbInBuffer,                  // [in]  Pointer to data to be decompressed
-        int cbInBuffer);                    // [in]  Length of the data to be decompressed
-
-// Table of compression functions
-typedef struct
-{
-    unsigned long uMask;                // Compression mask
-    COMPRESS Compress;                  // Compression function
-} TCompressTable;
-
-// Table of decompression functions
-typedef struct
-{
-    unsigned long uMask;                // Decompression bit
-    DECOMPRESS    Decompress;           // Decompression function
-} TDecompressTable;
-
-
-/*****************************************************************************/
-/*                                                                           */
-/*  Support for Huffman compression (0x01)                                   */
-/*                                                                           */
-/*****************************************************************************/
-
-// 1500F4C0
-void Compress_huff(
-        char * pbOutBuffer,
-        int * pcbOutBuffer,
-        char * pbInBuffer,
-        int cbInBuffer,
-        int * pCmpType,
-        int /* nCmpLevel */)
-{
-    THuffmannTree ht;                   // Huffmann tree for compression
-    TOutputStream os;                   // Output stream
-
-    // Initialize output stream
-    os.pbOutBuffer = (unsigned char *)pbOutBuffer;
-    os.cbOutSize   = *pcbOutBuffer;
-    os.pbOutPos    = (unsigned char *)pbOutBuffer;
-    os.dwBitBuff   = 0;
-    os.nBits       = 0;
-
-    // Initialize the Huffmann tree for compression
-    ht.InitTree(true);
-
-    *pcbOutBuffer = ht.DoCompression(&os, (unsigned char *)pbInBuffer, cbInBuffer, *pCmpType);
-
-    // The following code is not necessary to run, because it has no
-    // effect on the output data. It only clears the huffmann tree, but when
-    // the tree is on the stack, who cares ?
-    //  ht.UninitTree();
-}
-
-// 1500F5F0
-int Decompress_huff(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
-{
-    THuffmannTree ht;
-    TInputStream  is;
-
-    // Initialize input stream
-    is.pbInBufferEnd = (unsigned char *)pbInBuffer + cbInBuffer;
-    is.pbInBuffer = (unsigned char *)pbInBuffer;
-    is.BitBuffer  = 0;
-    is.BitCount   = 0;
-
-    // Initialize the Huffmann tree for compression
-    ht.InitTree(false);
-    *pcbOutBuffer = ht.DoDecompression((unsigned char *)pbOutBuffer, *pcbOutBuffer, &is);
-    if(*pcbOutBuffer == 0)
-        return 0;
-
-    // The following code is not necessary to run, because it has no
-    // effect on the output data. It only clears the huffmann tree, but when
-    // the tree is on the stack, who cares ?
-    //  ht.UninitTree();
-    return 1;
-}
-
-/******************************************************************************/
-/*                                                                            */
-/*  Support for ZLIB compression (0x02)                                       */
-/*                                                                            */
-/******************************************************************************/
-
-void Compress_ZLIB(
-        char * pbOutBuffer,
-        int * pcbOutBuffer,
-        char * pbInBuffer,
-        int cbInBuffer,
-        int * /* pCmpType */,
-        int /* nCmpLevel */)
-{
-    z_stream z;                        // Stream information for zlib
-    int windowBits;
-    int nResult;
-
-    // Fill the stream structure for zlib
-    z.next_in   = (Bytef *)pbInBuffer;
-    z.avail_in  = (uInt)cbInBuffer;
-    z.total_in  = cbInBuffer;
-    z.next_out  = (Bytef *)pbOutBuffer;
-    z.avail_out = *pcbOutBuffer;
-    z.total_out = 0;
-    z.zalloc    = NULL;
-    z.zfree     = NULL;
-
-    // Determine the proper window bits (WoW.exe build 12694)
-    if(cbInBuffer <= 0x100)
-        windowBits = 8;
-    else if(cbInBuffer <= 0x200)
-        windowBits = 9;
-    else if(cbInBuffer <= 0x400)
-        windowBits = 10;
-    else if(cbInBuffer <= 0x800)
-        windowBits = 11;
-    else if(cbInBuffer <= 0x1000)
-        windowBits = 12;
-    else if(cbInBuffer <= 0x2000)
-        windowBits = 13;
-    else if(cbInBuffer <= 0x4000)
-        windowBits = 14;
-    else
-        windowBits = 15;
-
-    // Initialize the compression.
-    // Storm.dll uses zlib version 1.1.3
-    // Wow.exe uses zlib version 1.2.3
-    nResult = deflateInit2(&z,
-                           6,                  // Compression level used by WoW MPQs
-                           Z_DEFLATED,
-                           windowBits,
-                           8,
-                           Z_DEFAULT_STRATEGY);
-    if(nResult == Z_OK)
-    {
-        // Call zlib to compress the data
-        nResult = deflate(&z, Z_FINISH);
-
-        if(nResult == Z_OK || nResult == Z_STREAM_END)
-            *pcbOutBuffer = z.total_out;
-
-        deflateEnd(&z);
-    }
-}
-
-int Decompress_ZLIB(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
-{
-    z_stream z;                        // Stream information for zlib
-    int nResult;
-
-    // Fill the stream structure for zlib
-    z.next_in   = (Bytef *)pbInBuffer;
-    z.avail_in  = (uInt)cbInBuffer;
-    z.total_in  = cbInBuffer;
-    z.next_out  = (Bytef *)pbOutBuffer;
-    z.avail_out = *pcbOutBuffer;
-    z.total_out = 0;
-    z.zalloc    = NULL;
-    z.zfree     = NULL;
-
-    // Initialize the decompression structure. Storm.dll uses zlib version 1.1.3
-    if((nResult = inflateInit(&z)) == 0)
-    {
-        // Call zlib to decompress the data
-        nResult = inflate(&z, Z_FINISH);
-        *pcbOutBuffer = z.total_out;
-        inflateEnd(&z);
-    }
-    return nResult;
-}
-
-/******************************************************************************/
-/*                                                                            */
-/*  Support functions for PKWARE Data Compression Library compression (0x08)  */
-/*                                                                            */
-/******************************************************************************/
-
-// Function loads data from the input buffer. Used by Pklib's "implode"
-// and "explode" function as user-defined callback
-// Returns number of bytes loaded
-//
-//   char * buf          - Pointer to a buffer where to store loaded data
-//   unsigned int * size - Max. number of bytes to read
-//   void * param        - Custom pointer, parameter of implode/explode
-
-static unsigned int ReadInputData(char * buf, unsigned int * size, void * param)
-{
-    TDataInfo * pInfo = (TDataInfo *)param;
-    unsigned int nMaxAvail = (unsigned int)(pInfo->pbInBuffEnd - pInfo->pbInBuff);
-    unsigned int nToRead = *size;
-
-    // Check the case when not enough data available
-    if(nToRead > nMaxAvail)
-        nToRead = nMaxAvail;
-
-    // Load data and increment offsets
-    memcpy(buf, pInfo->pbInBuff, nToRead);
-    pInfo->pbInBuff += nToRead;
-    assert(pInfo->pbInBuff <= pInfo->pbInBuffEnd);
-    return nToRead;
-}
-
-// Function for store output data. Used by Pklib's "implode" and "explode"
-// as user-defined callback
-//
-//   char * buf          - Pointer to data to be written
-//   unsigned int * size - Number of bytes to write
-//   void * param        - Custom pointer, parameter of implode/explode
-
-static void WriteOutputData(char * buf, unsigned int * size, void * param)
-{
-    TDataInfo * pInfo = (TDataInfo *)param;
-    unsigned int nMaxWrite = (unsigned int)(pInfo->pbOutBuffEnd - pInfo->pbOutBuff);
-    unsigned int nToWrite = *size;
-
-    // Check the case when not enough space in the output buffer
-    if(nToWrite > nMaxWrite)
-        nToWrite = nMaxWrite;
-
-    // Write output data and increments offsets
-    memcpy(pInfo->pbOutBuff, buf, nToWrite);
-    pInfo->pbOutBuff += nToWrite;
-    assert(pInfo->pbOutBuff <= pInfo->pbOutBuffEnd);
-}
-
-static void Compress_PKLIB(
-        char * pbOutBuffer,
-        int * pcbOutBuffer,
-        char * pbInBuffer,
-        int cbInBuffer,
-        int * /* pCmpType */,
-        int /* nCmpLevel */)
-{
-    TDataInfo Info;                                      // Data information
-    char * work_buf = STORM_ALLOC(char, CMP_BUFFER_SIZE);// Pklib's work buffer
-    unsigned int dict_size;                              // Dictionary size
-    unsigned int ctype = CMP_BINARY;                     // Compression type
-
-    // Fill data information structure
-    memset(work_buf, 0, CMP_BUFFER_SIZE);
-    Info.pbInBuff     = pbInBuffer;
-    Info.pbInBuffEnd  = pbInBuffer + cbInBuffer;
-    Info.pbOutBuff    = pbOutBuffer;
-    Info.pbOutBuffEnd = pbOutBuffer + *pcbOutBuffer;
-
-    //
-    // Set the dictionary size
-    //
-    // Diablo I ues fixed dictionary size of CMP_IMPLODE_DICT_SIZE3
-    // Starcraft uses the variable dictionary size based on algorithm below
-    //
-
-    if (cbInBuffer < 0x600)
-        dict_size = CMP_IMPLODE_DICT_SIZE1;
-    else if(0x600 <= cbInBuffer && cbInBuffer < 0xC00)
-        dict_size = CMP_IMPLODE_DICT_SIZE2;
-    else
-        dict_size = CMP_IMPLODE_DICT_SIZE3;
-
-    // Do the compression
-    if(implode(ReadInputData, WriteOutputData, work_buf, &Info, &ctype, &dict_size) == CMP_NO_ERROR)
-        *pcbOutBuffer = (int)(Info.pbOutBuff - pbOutBuffer);
-
-    STORM_FREE(work_buf);
-}
-
-static int Decompress_PKLIB(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
-{
-    TDataInfo Info;                             // Data information
-    char * work_buf = STORM_ALLOC(char, EXP_BUFFER_SIZE);// Pklib's work buffer
-
-    // Fill data information structure
-    memset(work_buf, 0, EXP_BUFFER_SIZE);
-    Info.pbInBuff     = pbInBuffer;
-    Info.pbInBuffEnd  = pbInBuffer + cbInBuffer;
-    Info.pbOutBuff    = pbOutBuffer;
-    Info.pbOutBuffEnd = pbOutBuffer + *pcbOutBuffer;
-
-    // Do the decompression
-    explode(ReadInputData, WriteOutputData, work_buf, &Info);
-
-    // If PKLIB is unable to decompress the data, return 0;
-    if(Info.pbOutBuff == pbOutBuffer)
-        return 0;
-
-    // Give away the number of decompressed bytes
-    *pcbOutBuffer = (int)(Info.pbOutBuff - pbOutBuffer);
-    STORM_FREE(work_buf);
-    return 1;
-}
-
-/******************************************************************************/
-/*                                                                            */
-/*  Support for Bzip2 compression (0x10)                                      */
-/*                                                                            */
-/******************************************************************************/
-
-static void Compress_BZIP2(
-        char * pbOutBuffer,
-        int * pcbOutBuffer,
-        char * pbInBuffer,
-        int cbInBuffer,
-        int * /* pCmpType */,
-        int /* nCmpLevel */)
-{
-    bz_stream strm;
-    int blockSize100k = 9;
-    int workFactor = 30;
-    int bzError;
-
-    // Initialize the BZIP2 compression
-    strm.bzalloc = NULL;
-    strm.bzfree  = NULL;
-
-    // Blizzard uses 9 as blockSize100k, (0x30 as workFactor)
-    // Last checked on Starcraft II
-    if(BZ2_bzCompressInit(&strm, blockSize100k, 0, workFactor) == BZ_OK)
-    {
-        strm.next_in   = pbInBuffer;
-        strm.avail_in  = cbInBuffer;
-        strm.next_out  = pbOutBuffer;
-        strm.avail_out = *pcbOutBuffer;
-
-        // Perform the compression
-        for(;;)
-        {
-            bzError = BZ2_bzCompress(&strm, (strm.avail_in != 0) ? BZ_RUN : BZ_FINISH);
-            if(bzError == BZ_STREAM_END || bzError < 0)
-                break;
-        }
-
-        // Put the stream into idle state
-        BZ2_bzCompressEnd(&strm);
-
-        if(bzError > 0)
-            *pcbOutBuffer = strm.total_out_lo32;
-    }
-}
-
-static int Decompress_BZIP2(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
-{
-    bz_stream strm;
-    int nResult = BZ_OK;
-
-    // Initialize the BZIP2 decompression
-    strm.bzalloc = NULL;
-    strm.bzfree  = NULL;
-    if(BZ2_bzDecompressInit(&strm, 0, 0) == BZ_OK)
-    {
-        strm.next_in   = pbInBuffer;
-        strm.avail_in  = cbInBuffer;
-        strm.next_out  = pbOutBuffer;
-        strm.avail_out = *pcbOutBuffer;
-
-        // Perform the decompression
-        while(nResult != BZ_STREAM_END)
-        {
-            nResult = BZ2_bzDecompress(&strm);
-
-            // If any error there, break the loop
-            if(nResult < BZ_OK)
-                break;
-        }
-
-        // Put the stream into idle state
-        BZ2_bzDecompressEnd(&strm);
-
-        // If all succeeded, set the number of output bytes
-        if(nResult >= BZ_OK)
-        {
-            *pcbOutBuffer = strm.total_out_lo32;
-            return 1;
-        }
-    }
-
-    // Something failed, so set number of output bytes to zero
-    *pcbOutBuffer = 0;
-    return 1;
-}
-
-/******************************************************************************/
-/*                                                                            */
-/*  Support functions for LZMA compression (0x12)                             */
-/*                                                                            */
-/******************************************************************************/
-
-#define LZMA_HEADER_SIZE (1 + LZMA_PROPS_SIZE + 8)
-
-static SRes LZMA_Callback_Progress(void * /* p */, UInt64 /* inSize */, UInt64 /* outSize */)
-{
-    return SZ_OK;
-}
-
-static void * LZMA_Callback_Alloc(void *p, size_t size)
-{
-    p = p;
-    return STORM_ALLOC(BYTE, size);
-}
-
-/* address can be 0 */
-static void LZMA_Callback_Free(void *p, void *address)
-{
-    p = p;
-    if(address != NULL)
-        STORM_FREE(address);
-}
-
-//
-// Note: So far, I haven't seen any files compressed by LZMA.
-// This code haven't been verified against code ripped from Starcraft II Beta,
-// but we know that Starcraft LZMA decompression code is able to decompress
-// the data compressed by StormLib.
-//
-
-/*static */ void Compress_LZMA(
-        char * pbOutBuffer,
-        int * pcbOutBuffer,
-        char * pbInBuffer,
-        int cbInBuffer,
-        int * /* pCmpType */,
-        int /* nCmpLevel */)
-{
-    ICompressProgress Progress;
-    CLzmaEncProps props;
-    ISzAlloc SzAlloc;
-    Byte * destBuffer;
-    SizeT destLen = *pcbOutBuffer;
-    SizeT srcLen = cbInBuffer;
-    Byte encodedProps[LZMA_PROPS_SIZE];
-    size_t encodedPropsSize = LZMA_PROPS_SIZE;
-    SRes nResult;
-
-    // Fill the callbacks in structures
-    Progress.Progress = LZMA_Callback_Progress;
-    SzAlloc.Alloc = LZMA_Callback_Alloc;
-    SzAlloc.Free = LZMA_Callback_Free;
-
-    // Initialize properties
-    LzmaEncProps_Init(&props);
-
-    // Perform compression
-    destBuffer = (Byte *)pbOutBuffer + LZMA_HEADER_SIZE;
-    destLen = *pcbOutBuffer - LZMA_HEADER_SIZE;
-    nResult = LzmaEncode(destBuffer,
-                         &destLen,
-                         (Byte *)pbInBuffer,
-                         srcLen,
-                         &props,
-                         encodedProps,
-                         &encodedPropsSize,
-                         0,
-                         &Progress,
-                         &SzAlloc,
-                         &SzAlloc);
-    if(nResult != SZ_OK)
-        return;
-
-    // If we failed to compress the data
-    if(destLen >= (SizeT)(*pcbOutBuffer - LZMA_HEADER_SIZE))
-        return;
-
-    // Write "useFilter" variable. Blizzard MPQ must not use filter.
-    *pbOutBuffer++ = 0;
-
-    // Copy the encoded properties to the output buffer
-    memcpy(pbOutBuffer, encodedProps, encodedPropsSize);
-    pbOutBuffer += encodedPropsSize;
-
-    // Copy the size of the data
-    *pbOutBuffer++ = (unsigned char)(srcLen >> 0x00);
-    *pbOutBuffer++ = (unsigned char)(srcLen >> 0x08);
-    *pbOutBuffer++ = (unsigned char)(srcLen >> 0x10);
-    *pbOutBuffer++ = (unsigned char)(srcLen >> 0x18);
-    *pbOutBuffer++ = 0;
-    *pbOutBuffer++ = 0;
-    *pbOutBuffer++ = 0;
-    *pbOutBuffer++ = 0;
-
-    // Give the size of the data to the caller
-    *pcbOutBuffer = (unsigned int)(destLen + LZMA_HEADER_SIZE);
-}
-
-static int Decompress_LZMA(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
-{
-    ELzmaStatus LzmaStatus;
-    ISzAlloc SzAlloc;
-    Byte * destBuffer = (Byte *)pbOutBuffer;
-    Byte * srcBuffer = (Byte *)pbInBuffer;
-    SizeT destLen = *pcbOutBuffer;
-    SizeT srcLen = cbInBuffer;
-    SRes nResult;
-
-    // There must be at least 0x0E bytes in the buffer
-    if(srcLen <= LZMA_HEADER_SIZE)
-        return 0;
-
-    // We only accept blocks that have no filter used
-    if(*srcBuffer != 0)
-        return 0;
-
-    // Fill the callbacks in structures
-    SzAlloc.Alloc = LZMA_Callback_Alloc;
-    SzAlloc.Free = LZMA_Callback_Free;
-
-    // Perform compression
-    srcLen = cbInBuffer - LZMA_HEADER_SIZE;
-    nResult = LzmaDecode(destBuffer,
-                         &destLen,
-                         srcBuffer + LZMA_HEADER_SIZE,
-                         &srcLen,
-                         srcBuffer + 1,
-                         LZMA_PROPS_SIZE,
-                         LZMA_FINISH_END,
-                         &LzmaStatus,
-                         &SzAlloc);
-    if(nResult != SZ_OK)
-        return 0;
-
-    *pcbOutBuffer = (unsigned int)destLen;
-    return 1;
-}
-
-/******************************************************************************/
-/*                                                                            */
-/*  Support functions for SPARSE compression (0x20)                           */
-/*                                                                            */
-/******************************************************************************/
-
-void Compress_SPARSE(
-        char * pbOutBuffer,
-        int * pcbOutBuffer,
-        char * pbInBuffer,
-        int cbInBuffer,
-        int * /* pCmpType */,
-        int /* nCmpLevel */)
-{
-    CompressSparse((unsigned char *)pbOutBuffer, pcbOutBuffer, (unsigned char *)pbInBuffer, cbInBuffer);
-}
-
-int Decompress_SPARSE(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
-{
-    return DecompressSparse((unsigned char *)pbOutBuffer, pcbOutBuffer, (unsigned char *)pbInBuffer, cbInBuffer);
-}
-
-/******************************************************************************/
-/*                                                                            */
-/*  Support for ADPCM mono compression (0x40)                                 */
-/*                                                                            */
-/******************************************************************************/
-
-static void Compress_ADPCM_mono(
-        char * pbOutBuffer,
-        int * pcbOutBuffer,
-        char * pbInBuffer,
-        int cbInBuffer,
-        int * pCmpType,
-        int nCmpLevel)
-{
-    // Prepare the compression level for Huffmann compression,
-    // which will be called as next step
-    if(0 < nCmpLevel && nCmpLevel <= 2)
-    {
-        nCmpLevel = 4;
-        *pCmpType = 6;
-    }
-    else if(nCmpLevel == 3)
-    {
-        nCmpLevel = 6;
-        *pCmpType = 8;
-    }
-    else
-    {
-        nCmpLevel = 5;
-        *pCmpType = 7;
-    }
-    *pcbOutBuffer = CompressADPCM((unsigned char *)pbOutBuffer, *pcbOutBuffer, (short *)pbInBuffer, cbInBuffer, 1, nCmpLevel);
-}
-
-static int Decompress_ADPCM_mono(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
-{
-    *pcbOutBuffer = DecompressADPCM((unsigned char *)pbOutBuffer, *pcbOutBuffer, (unsigned char *)pbInBuffer, cbInBuffer, 1);
-    return 1;
-}
-
-/******************************************************************************/
-/*                                                                            */
-/*  Support for ADPCM stereo compression (0x80)                               */
-/*                                                                            */
-/******************************************************************************/
-
-static void Compress_ADPCM_stereo(
-        char * pbOutBuffer,
-        int * pcbOutBuffer,
-        char * pbInBuffer,
-        int cbInBuffer,
-        int * pCmpType,
-        int nCmpLevel)
-{
-    // Prepare the compression level for Huffmann compression,
-    // which will be called as next step
-    if(0 < nCmpLevel && nCmpLevel <= 2)
-    {
-        nCmpLevel = 4;
-        *pCmpType = 6;
-    }
-    else if(nCmpLevel == 3)
-    {
-        nCmpLevel = 6;
-        *pCmpType = 8;
-    }
-    else
-    {
-        nCmpLevel = 5;
-        *pCmpType = 7;
-    }
-    *pcbOutBuffer = CompressADPCM((unsigned char *)pbOutBuffer, *pcbOutBuffer, (short *)pbInBuffer, cbInBuffer, 2, nCmpLevel);
-}
-
-static int Decompress_ADPCM_stereo(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
-{
-    *pcbOutBuffer = DecompressADPCM((unsigned char *)pbOutBuffer, *pcbOutBuffer, (unsigned char *)pbInBuffer, cbInBuffer, 2);
-    return 1;
-}
-
-/*****************************************************************************/
-/*                                                                           */
-/*   SCompImplode                                                            */
-/*                                                                           */
-/*****************************************************************************/
-
-int WINAPI SCompImplode(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
-{
-    int cbOutBuffer = *pcbOutBuffer;
-
-    // Check for valid parameters
-    if(!pcbOutBuffer || *pcbOutBuffer < cbInBuffer || !pbOutBuffer || !pbInBuffer)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-
-    // Perform the compression
-    Compress_PKLIB(pbOutBuffer, &cbOutBuffer, pbInBuffer, cbInBuffer, NULL, 0);
-
-    // If the compression was unsuccessful, copy the data as-is
-    if(cbOutBuffer >= *pcbOutBuffer)
-    {
-        memcpy(pbOutBuffer, pbInBuffer, cbInBuffer);
-        cbOutBuffer = *pcbOutBuffer;
-    }
-
-    *pcbOutBuffer = cbOutBuffer;
-    return 1;
-}
-
-/*****************************************************************************/
-/*                                                                           */
-/*   SCompExplode                                                            */
-/*                                                                           */
-/*****************************************************************************/
-
-int WINAPI SCompExplode(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
-{
-    int cbOutBuffer = *pcbOutBuffer;
-
-    // Check for valid parameters
-    if(!pcbOutBuffer || *pcbOutBuffer < cbInBuffer || !pbOutBuffer || !pbInBuffer)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-
-    // If the input length is the same as output length, do nothing.
-    if(cbInBuffer == cbOutBuffer)
-    {
-        // If the buffers are equal, don't copy anything.
-        if(pbInBuffer == pbOutBuffer)
-            return 1;
-
-        memcpy(pbOutBuffer, pbInBuffer, cbInBuffer);
-        return 1;
-    }
-
-    // Perform decompression
-    if(!Decompress_PKLIB(pbOutBuffer, &cbOutBuffer, pbInBuffer, cbInBuffer))
-    {
-        SetLastError(ERROR_FILE_CORRUPT);
-        return false;
-    }
-
-    *pcbOutBuffer = cbOutBuffer;
-    return 1;
-}
-
-/*****************************************************************************/
-/*                                                                           */
-/*   SCompCompress                                                           */
-/*                                                                           */
-/*****************************************************************************/
-
-// This table contains compress functions which can be applied to
-// uncompressed data. Each bit means the corresponding
-// compression method/function must be applied.
-//
-//   WAVes compression            Data compression
-//   ------------------           -------------------
-//   1st sector   - 0x08          0x08 (D, HF, W2, SC, D2)
-//   Next sectors - 0x81          0x02 (W3)
-
-static TCompressTable cmp_table[] =
-{
-    {MPQ_COMPRESSION_SPARSE,       Compress_SPARSE},         // Sparse compression
-    {MPQ_COMPRESSION_ADPCM_MONO,   Compress_ADPCM_mono},     // IMA ADPCM mono compression
-    {MPQ_COMPRESSION_ADPCM_STEREO, Compress_ADPCM_stereo},   // IMA ADPCM stereo compression
-    {MPQ_COMPRESSION_HUFFMANN,     Compress_huff},           // Huffmann compression
-    {MPQ_COMPRESSION_ZLIB,         Compress_ZLIB},           // Compression with the "zlib" library
-    {MPQ_COMPRESSION_PKWARE,       Compress_PKLIB},          // Compression with Pkware DCL
-    {MPQ_COMPRESSION_BZIP2,        Compress_BZIP2}           // Compression Bzip2 library
-};
-
-int WINAPI SCompCompress(
-        char * pbOutBuffer,
-        int * pcbOutBuffer,
-        char * pbInBuffer,
-        int cbInBuffer,
-        unsigned uCompressionMask,
-        int nCmpType,
-        int nCmpLevel)
-{
-    COMPRESS CompressFuncArray[0x10];       // Array of compression functions, applied sequentially
-    unsigned char CompressByte[0x10];       // CompressByte for each method in the CompressFuncArray array
-    char * pbWorkBuffer = NULL;             // Temporary storage for decompressed data
-    char * pbOutput = pbOutBuffer;          // Current output buffer
-    char * pbInput = pbInBuffer;            // Current input buffer
-    int nCompressCount = 0;
-    int nCompressIndex = 0;
-    int nAtLeastOneCompressionDone = 0;
-    int cbOutBuffer = 0;
-    int cbInLength = cbInBuffer;
-    int nResult = 1;
-
-    // Check for valid parameters
-    if(!pcbOutBuffer || *pcbOutBuffer < cbInBuffer || !pbOutBuffer || !pbInBuffer)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-
-    // Zero input length brings zero output length
-    if(cbInBuffer == 0)
-    {
-        *pcbOutBuffer = 0;
-        return true;
-    }
-
-    // Setup the compression function array
-    if(uCompressionMask == MPQ_COMPRESSION_LZMA)
-    {
-        CompressFuncArray[0] = Compress_LZMA;
-        CompressByte[0] = (char)uCompressionMask;
-        nCompressCount = 1;
-    }
-    else
-    {
-        // Fill the compressions array
-        for(size_t i = 0; i < (sizeof(cmp_table) / sizeof(TCompressTable)); i++)
-        {
-            // If the mask agrees, insert the compression function to the array
-            if(uCompressionMask & cmp_table[i].uMask)
-            {
-                CompressFuncArray[nCompressCount] = cmp_table[i].Compress;
-                CompressByte[nCompressCount] = (unsigned char)cmp_table[i].uMask;
-                uCompressionMask &= ~cmp_table[i].uMask;
-                nCompressCount++;
-            }
-        }
-
-        // If at least one of the compressions remaing unknown, return an error
-        if(uCompressionMask != 0)
-        {
-            SetLastError(ERROR_NOT_SUPPORTED);
-            return 0;
-        }
-    }
-
-    // If there is at least one compression, do it
-    if(nCompressCount > 0)
-    {
-        // If we need to do more than 1 compression, allocate intermediate buffer
-        if(nCompressCount > 1)
-        {
-            pbWorkBuffer = STORM_ALLOC(char, *pcbOutBuffer);
-            if(pbWorkBuffer == NULL)
-            {
-                SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-                return 0;
-            }
-        }
-
-        // Get the current compression index
-        nCompressIndex = nCompressCount - 1;
-
-        // Perform all compressions in the array
-        for(int i = 0; i < nCompressCount; i++)
-        {
-            // Choose the proper output buffer
-            pbOutput = (nCompressIndex & 1) ? pbWorkBuffer : pbOutBuffer;
-            nCompressIndex--;
-
-            // Perform the (next) compression
-            // Note that if the compression method is unable to compress the input data block
-            // by at least 2 bytes, we consider it as failure and will use source data instead
-            cbOutBuffer = *pcbOutBuffer - 1;
-            CompressFuncArray[i](pbOutput + 1, &cbOutBuffer, pbInput, cbInLength, &nCmpType, nCmpLevel);
-
-            // If the compression failed, we copy the input buffer as-is.
-            // Note that there is one extra byte at the end of the intermediate buffer, so it should be OK
-            if(cbOutBuffer > (cbInLength - 2))
-            {
-                memcpy(pbOutput + nAtLeastOneCompressionDone, pbInput, cbInLength);
-                cbOutBuffer = cbInLength;
-            }
-            else
-            {
-                // Remember that we have done at least one compression
-                nAtLeastOneCompressionDone = 1;
-                uCompressionMask |= CompressByte[i];
-            }
-
-            // Now point input buffer to the output buffer
-            pbInput = pbOutput + nAtLeastOneCompressionDone;
-            cbInLength = cbOutBuffer;
-        }
-
-        // If at least one compression succeeded, put the compression
-        // mask to the begin of the output buffer
-        if(nAtLeastOneCompressionDone)
-            *pbOutBuffer  = (char)uCompressionMask;
-        *pcbOutBuffer = cbOutBuffer + nAtLeastOneCompressionDone;
-    }
-    else
-    {
-        memcpy(pbOutBuffer, pbInBuffer, cbInBuffer);
-        *pcbOutBuffer = cbInBuffer;
-    }
-
-    // Cleanup and return
-    if(pbWorkBuffer != NULL)
-        STORM_FREE(pbWorkBuffer);
-    return nResult;
-}
-
-/*****************************************************************************/
-/*                                                                           */
-/*   SCompDecompress                                                         */
-/*                                                                           */
-/*****************************************************************************/
-
-// This table contains decompress functions which can be applied to
-// uncompressed data. The compression mask is stored in the first byte
-// of compressed data
-static TDecompressTable dcmp_table[] =
-{
-    {MPQ_COMPRESSION_BZIP2,        Decompress_BZIP2},        // Decompression with Bzip2 library
-    {MPQ_COMPRESSION_PKWARE,       Decompress_PKLIB},        // Decompression with Pkware Data Compression Library
-    {MPQ_COMPRESSION_ZLIB,         Decompress_ZLIB},         // Decompression with the "zlib" library
-    {MPQ_COMPRESSION_HUFFMANN,     Decompress_huff},         // Huffmann decompression
-    {MPQ_COMPRESSION_ADPCM_STEREO, Decompress_ADPCM_stereo}, // IMA ADPCM stereo decompression
-    {MPQ_COMPRESSION_ADPCM_MONO,   Decompress_ADPCM_mono},   // IMA ADPCM mono decompression
-    {MPQ_COMPRESSION_SPARSE,       Decompress_SPARSE}        // Sparse decompression
-};
-
-int WINAPI SCompDecompress(
-        char * pbOutBuffer,
-        int * pcbOutBuffer,
-        char * pbInBuffer,
-        int cbInBuffer)
-{
-    char *   pbWorkBuffer = NULL;           // Temporary storage for decompressed data
-    char *   pbOutput = pbOutBuffer;        // Where to store decompressed data
-    char *   pbInput;                       // Where to store decompressed data
-    unsigned uCompressionMask;              // Decompressions applied to the data
-    unsigned uCompressionCopy;              // Decompressions applied to the data
-    int      cbOutBuffer = *pcbOutBuffer;   // Current size of the output buffer
-    int      cbInLength;                    // Current size of the input buffer
-    int      nCompressCount = 0;            // Number of compressions to be applied
-    int      nCompressIndex = 0;
-    int      nResult = 1;
-
-    // Verify buffer sizes
-    if(cbOutBuffer < cbInBuffer || cbInBuffer < 1)
-        return 0;
-
-    // If the input length is the same as output length, do nothing.
-    if(cbOutBuffer == cbInBuffer)
-    {
-        // If the buffers are equal, don't copy anything.
-        if(pbInBuffer != pbOutBuffer)
-            memcpy(pbOutBuffer, pbInBuffer, cbInBuffer);
-        return 1;
-    }
-
-    // Get applied compression types and decrement data length
-    uCompressionMask = uCompressionCopy = (unsigned char)*pbInBuffer++;
-    cbInBuffer--;
-
-    // Get current compressed data and length of it
-    pbInput = pbInBuffer;
-    cbInLength = cbInBuffer;
-
-    // This compression function doesn't support LZMA
-    assert(uCompressionMask != MPQ_COMPRESSION_LZMA);
-
-    // Parse the compression mask
-    for(size_t i = 0; i < (sizeof(dcmp_table) / sizeof(TDecompressTable)); i++)
-    {
-        // If the mask agrees, insert the compression function to the array
-        if(uCompressionMask & dcmp_table[i].uMask)
-        {
-            uCompressionCopy &= ~dcmp_table[i].uMask;
-            nCompressCount++;
-        }
-    }
-
-    // If at least one of the compressions remaing unknown, return an error
-    if(nCompressCount == 0 || uCompressionCopy != 0)
-    {
-        SetLastError(ERROR_NOT_SUPPORTED);
-        return 0;
-    }
-
-    // If there is more than one compression, we have to allocate extra buffer
-    if(nCompressCount > 1)
-    {
-        pbWorkBuffer = STORM_ALLOC(char, cbOutBuffer);
-        if(pbWorkBuffer == NULL)
-        {
-            SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-            return 0;
-        }
-    }
-
-    // Get the current compression index
-    nCompressIndex = nCompressCount - 1;
-
-    // Apply all decompressions
-    for(size_t i = 0; i < (sizeof(dcmp_table) / sizeof(TDecompressTable)); i++)
-    {
-        // Perform the (next) decompression
-        if(uCompressionMask & dcmp_table[i].uMask)
-        {
-            // Get the correct output buffer
-            pbOutput = (nCompressIndex & 1) ? pbWorkBuffer : pbOutBuffer;
-            nCompressIndex--;
-
-            // Perform the decompression
-            cbOutBuffer = *pcbOutBuffer;
-            nResult = dcmp_table[i].Decompress(pbOutput, &cbOutBuffer, pbInput, cbInLength);
-            if(nResult == 0 || cbOutBuffer == 0)
-            {
-                SetLastError(ERROR_FILE_CORRUPT);
-                nResult = 0;
-                break;
-            }
-
-            // Switch buffers
-            cbInLength = cbOutBuffer;
-            pbInput = pbOutput;
-        }
-    }
-
-    // Put the length of the decompressed data to the output buffer
-    *pcbOutBuffer = cbOutBuffer;
-
-    // Cleanup and return
-    if(pbWorkBuffer != NULL)
-        STORM_FREE(pbWorkBuffer);
-    return nResult;
-}
-
-int WINAPI SCompDecompress2(
-        char * pbOutBuffer,
-        int * pcbOutBuffer,
-        char * pbInBuffer,
-        int cbInBuffer)
-{
-    DECOMPRESS pfnDecompress1 = NULL;
-    DECOMPRESS pfnDecompress2 = NULL;
-    char * pbWorkBuffer = pbOutBuffer;
-    int cbWorkBuffer = *pcbOutBuffer;
-    int nResult;
-    char CompressionMethod;
-
-    // Verify buffer sizes
-    if(*pcbOutBuffer < cbInBuffer || cbInBuffer < 1)
-        return 0;
-
-    // If the outputbuffer is as big as input buffer, just copy the block
-    if(*pcbOutBuffer == cbInBuffer)
-    {
-        if(pbOutBuffer != pbInBuffer)
-            memcpy(pbOutBuffer, pbInBuffer, cbInBuffer);
-        return 1;
-    }
-
-    // Get the compression methods
-    CompressionMethod = *pbInBuffer++;
-    cbInBuffer--;
-
-    // We only recognize a fixed set of compression methods
-    switch((unsigned char)CompressionMethod)
-    {
-    case MPQ_COMPRESSION_ZLIB:
-        pfnDecompress1 = Decompress_ZLIB;
-        break;
-
-    case MPQ_COMPRESSION_PKWARE:
-        pfnDecompress1 = Decompress_PKLIB;
-        break;
-
-    case MPQ_COMPRESSION_BZIP2:
-        pfnDecompress1 = Decompress_BZIP2;
-        break;
-
-    case MPQ_COMPRESSION_LZMA:
-        pfnDecompress1 = Decompress_LZMA;
-        break;
-
-    case MPQ_COMPRESSION_SPARSE:
-        pfnDecompress1 = Decompress_SPARSE;
-        break;
-
-    case (MPQ_COMPRESSION_SPARSE | MPQ_COMPRESSION_ZLIB):
-        pfnDecompress1 = Decompress_ZLIB;
-        pfnDecompress2 = Decompress_SPARSE;
-        break;
-
-    case (MPQ_COMPRESSION_SPARSE | MPQ_COMPRESSION_BZIP2):
-        pfnDecompress1 = Decompress_BZIP2;
-        pfnDecompress2 = Decompress_SPARSE;
-        break;
-
-        //
-        // Note: Any combination including MPQ_COMPRESSION_ADPCM_MONO,
-        // MPQ_COMPRESSION_ADPCM_STEREO or MPQ_COMPRESSION_HUFFMANN
-        // is not supported by newer MPQs.
-        //
-
-    default:
-        SetLastError(ERROR_FILE_CORRUPT);
-        return 0;
-    }
-
-    // If we have to use two decompressions, allocate temporary buffer
-    if(pfnDecompress2 != NULL)
-    {
-        pbWorkBuffer = STORM_ALLOC(char, *pcbOutBuffer);
-        if(pbWorkBuffer == NULL)
-        {
-            SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-            return 0;
-        }
-    }
-
-    // Apply the first decompression method
-    nResult = pfnDecompress1(pbWorkBuffer, &cbWorkBuffer, pbInBuffer, cbInBuffer);
-
-    // Apply the second decompression method, if any
-    if(pfnDecompress2 != NULL && nResult != 0)
-    {
-        cbInBuffer   = cbWorkBuffer;
-        cbWorkBuffer = *pcbOutBuffer;
-        nResult = pfnDecompress2(pbOutBuffer, &cbWorkBuffer, pbWorkBuffer, cbInBuffer);
-    }
-
-    // Supply the output buffer size
-    *pcbOutBuffer = cbWorkBuffer;
-
-    // Free temporary buffer
-    if(pbWorkBuffer != pbOutBuffer)
-        STORM_FREE(pbWorkBuffer);
-
-    if(nResult == 0)
-        SetLastError(ERROR_FILE_CORRUPT);
-    return nResult;
-}
diff --git a/dep/StormLibOld/src/SFileAddFile.cpp b/dep/StormLibOld/src/SFileAddFile.cpp
deleted file mode 100644
index 3f12e697f..000000000
--- a/dep/StormLibOld/src/SFileAddFile.cpp
+++ /dev/null
@@ -1,1286 +0,0 @@
-/*****************************************************************************/
-/* SFileAddFile.cpp                       Copyright (c) Ladislav Zezula 2010 */
-/*---------------------------------------------------------------------------*/
-/* MPQ Editing functions                                                     */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 27.03.10  1.00  Lad  Splitted from SFileCreateArchiveEx.cpp               */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-//-----------------------------------------------------------------------------
-// Local structures
-
-#define FILE_SIGNATURE_RIFF     0x46464952
-#define FILE_SIGNATURE_WAVE     0x45564157
-#define FILE_SIGNATURE_FMT      0x20746D66
-#define AUDIO_FORMAT_PCM                 1
-
-typedef struct _WAVE_FILE_HEADER
-{
-    DWORD dwChunkId;                        // 0x52494646 ("RIFF")
-    DWORD dwChunkSize;                      // Size of that chunk, in bytes
-    DWORD dwFormat;                         // Must be 0x57415645 ("WAVE")
-
-    // Format sub-chunk
-    DWORD dwSubChunk1Id;                    // 0x666d7420 ("fmt ")
-    DWORD dwSubChunk1Size;                  // 0x16 for PCM
-    USHORT wAudioFormat;                    // 1 = PCM. Other value means some sort of compression
-    USHORT wChannels;                       // Number of channels
-    DWORD dwSampleRate;                     // 8000, 44100, etc.
-    DWORD dwBytesRate;                      // SampleRate * NumChannels * BitsPerSample/8
-    USHORT wBlockAlign;                     // NumChannels * BitsPerSample/8
-    USHORT wBitsPerSample;                  // 8 bits = 8, 16 bits = 16, etc.
-
-    // Followed by "data" sub-chunk (we don't care)
-} WAVE_FILE_HEADER, *PWAVE_FILE_HEADER;
-
-//-----------------------------------------------------------------------------
-// Local variables
-
-// Data compression for SFileAddFile
-// Kept here for compatibility with code that was created with StormLib version < 6.50
-static DWORD DefaultDataCompression = MPQ_COMPRESSION_PKWARE;
-
-static SFILE_ADDFILE_CALLBACK AddFileCB = NULL;
-static void * pvUserData = NULL;
-
-//-----------------------------------------------------------------------------
-// MPQ write data functions
-
-#define LOSSY_COMPRESSION_MASK (MPQ_COMPRESSION_ADPCM_MONO | MPQ_COMPRESSION_ADPCM_STEREO | MPQ_COMPRESSION_HUFFMANN)
-
-static int IsWaveFile(
-        LPBYTE pbFileData,
-        DWORD cbFileData,
-        LPDWORD pdwChannels)
-{
-    PWAVE_FILE_HEADER pWaveHdr = (PWAVE_FILE_HEADER)pbFileData;
-
-    if(cbFileData > sizeof(WAVE_FILE_HEADER))
-    {
-        if(pWaveHdr->dwChunkId == FILE_SIGNATURE_RIFF && pWaveHdr->dwFormat == FILE_SIGNATURE_WAVE)
-        {
-            if(pWaveHdr->dwSubChunk1Id == FILE_SIGNATURE_FMT && pWaveHdr->wAudioFormat == AUDIO_FORMAT_PCM)
-            {
-                *pdwChannels = pWaveHdr->wChannels;
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-
-static int WriteDataToMpqFile(
-        TMPQArchive * ha,
-        TMPQFile * hf,
-        LPBYTE pbFileData,
-        DWORD dwDataSize,
-        DWORD dwCompression)
-{
-    TFileEntry * pFileEntry = hf->pFileEntry;
-    ULONGLONG ByteOffset;
-    LPBYTE pbCompressed = NULL;         // Compressed (target) data
-    LPBYTE pbToWrite = NULL;            // Data to write to the file
-    int nCompressionLevel = -1;         // ADPCM compression level (only used for wave files)
-    int nError = ERROR_SUCCESS;
-
-    // If the caller wants ADPCM compression, we will set wave compression level to 4,
-    // which corresponds to medium quality
-    if(dwCompression & LOSSY_COMPRESSION_MASK)
-        nCompressionLevel = 4;
-
-    // Make sure that the caller won't overrun the previously initiated file size
-    assert(hf->dwFilePos + dwDataSize <= pFileEntry->dwFileSize);
-    assert(hf->dwSectorCount != 0);
-    assert(hf->pbFileSector != NULL);
-    if((hf->dwFilePos + dwDataSize) > pFileEntry->dwFileSize)
-        return ERROR_DISK_FULL;
-    pbToWrite = hf->pbFileSector;
-
-    // Now write all data to the file sector buffer
-    if(nError == ERROR_SUCCESS)
-    {
-        DWORD dwBytesInSector = hf->dwFilePos % hf->dwSectorSize;
-        DWORD dwSectorIndex = hf->dwFilePos / hf->dwSectorSize;
-        DWORD dwBytesToCopy;
-
-        // Process all data.
-        while(dwDataSize != 0)
-        {
-            dwBytesToCopy = dwDataSize;
-
-            // Check for sector overflow
-            if(dwBytesToCopy > (hf->dwSectorSize - dwBytesInSector))
-                dwBytesToCopy = (hf->dwSectorSize - dwBytesInSector);
-
-            // Copy the data to the file sector
-            memcpy(hf->pbFileSector + dwBytesInSector, pbFileData, dwBytesToCopy);
-            dwBytesInSector += dwBytesToCopy;
-            pbFileData += dwBytesToCopy;
-            dwDataSize -= dwBytesToCopy;
-
-            // Update the file position
-            hf->dwFilePos += dwBytesToCopy;
-
-            // If the current sector is full, or if the file is already full,
-            // then write the data to the MPQ
-            if(dwBytesInSector >= hf->dwSectorSize || hf->dwFilePos >= pFileEntry->dwFileSize)
-            {
-                // Set the position in the file
-                ByteOffset = hf->RawFilePos + pFileEntry->dwCmpSize;
-
-                // Update CRC32 and MD5 of the file
-                md5_process((hash_state *)hf->hctx, hf->pbFileSector, dwBytesInSector);
-                hf->dwCrc32 = crc32(hf->dwCrc32, hf->pbFileSector, dwBytesInSector);
-
-                // Compress the file sector, if needed
-                if(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED)
-                {
-                    int nOutBuffer = (int)dwBytesInSector;
-                    int nInBuffer = (int)dwBytesInSector;
-
-                    // If the file is compressed, allocate buffer for the compressed data.
-                    // Note that we allocate buffer that is a bit longer than sector size,
-                    // for case if the compression method performs a buffer overrun
-                    if(pbCompressed == NULL)
-                    {
-                        pbToWrite = pbCompressed = STORM_ALLOC(BYTE, hf->dwSectorSize + 0x100);
-                        if(pbCompressed == NULL)
-                        {
-                            nError = ERROR_NOT_ENOUGH_MEMORY;
-                            break;
-                        }
-                    }
-
-                    //
-                    // Note that both SCompImplode and SCompCompress give original buffer,
-                    // if they are unable to comperss the data.
-                    //
-
-                    if(pFileEntry->dwFlags & MPQ_FILE_IMPLODE)
-                    {
-                        SCompImplode((char *)pbCompressed,
-                                     &nOutBuffer,
-                                     (char *)hf->pbFileSector,
-                                     nInBuffer);
-                    }
-
-                    if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS)
-                    {
-                        SCompCompress((char *)pbCompressed,
-                                      &nOutBuffer,
-                                      (char *)hf->pbFileSector,
-                                      nInBuffer,
-                                      (unsigned)dwCompression,
-                                      0,
-                                      nCompressionLevel);
-                    }
-
-                    // Update sector positions
-                    dwBytesInSector = nOutBuffer;
-                    if(hf->SectorOffsets != NULL)
-                        hf->SectorOffsets[dwSectorIndex+1] = hf->SectorOffsets[dwSectorIndex] + dwBytesInSector;
-
-                    // We have to calculate sector CRC, if enabled
-                    if(hf->SectorChksums != NULL)
-                        hf->SectorChksums[dwSectorIndex] = adler32(0, pbCompressed, nOutBuffer);
-                }
-
-                // Encrypt the sector, if necessary
-                if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
-                {
-                    BSWAP_ARRAY32_UNSIGNED(pbToWrite, dwBytesInSector);
-                    EncryptMpqBlock(pbToWrite, dwBytesInSector, hf->dwFileKey + dwSectorIndex);
-                    BSWAP_ARRAY32_UNSIGNED(pbToWrite, dwBytesInSector);
-                }
-
-                // Write the file sector
-                if(!FileStream_Write(ha->pStream, &ByteOffset, pbToWrite, dwBytesInSector))
-                {
-                    nError = GetLastError();
-                    break;
-                }
-
-                // Call the compact callback, if any
-                if(AddFileCB != NULL)
-                    AddFileCB(pvUserData, hf->dwFilePos, hf->dwDataSize, false);
-
-                // Update the compressed file size
-                pFileEntry->dwCmpSize += dwBytesInSector;
-                dwBytesInSector = 0;
-                dwSectorIndex++;
-            }
-        }
-    }
-
-    // Cleanup
-    if(pbCompressed != NULL)
-        STORM_FREE(pbCompressed);
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// Recrypts file data for file renaming
-
-static int RecryptFileData(
-        TMPQArchive * ha,
-        TMPQFile * hf,
-        const char * szFileName,
-        const char * szNewFileName)
-{
-    ULONGLONG RawFilePos;
-    TFileEntry * pFileEntry = hf->pFileEntry;
-    DWORD dwBytesToRecrypt = pFileEntry->dwCmpSize;
-    DWORD dwOldKey;
-    DWORD dwNewKey;
-    int nError = ERROR_SUCCESS;
-
-    // The file must be encrypted
-    assert(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED);
-
-    // File decryption key is calculated from the plain name
-    szNewFileName = GetPlainFileNameA(szNewFileName);
-    szFileName = GetPlainFileNameA(szFileName);
-
-    // Calculate both file keys
-    dwOldKey = DecryptFileKey(szFileName,    pFileEntry->ByteOffset, pFileEntry->dwFileSize, pFileEntry->dwFlags);
-    dwNewKey = DecryptFileKey(szNewFileName, pFileEntry->ByteOffset, pFileEntry->dwFileSize, pFileEntry->dwFlags);
-
-    // Incase the keys are equal, don't recrypt the file
-    if(dwNewKey == dwOldKey)
-        return ERROR_SUCCESS;
-    hf->dwFileKey = dwOldKey;
-
-    // Calculate the raw position of the file in the archive
-    hf->MpqFilePos = pFileEntry->ByteOffset;
-    hf->RawFilePos = ha->MpqPos + hf->MpqFilePos;
-
-    // Allocate buffer for file transfer
-    nError = AllocateSectorBuffer(hf);
-    if(nError != ERROR_SUCCESS)
-        return nError;
-
-    // Also allocate buffer for sector offsets
-    // Note: Don't load sector checksums, we don't need to recrypt them
-    nError = AllocateSectorOffsets(hf, true);
-    if(nError != ERROR_SUCCESS)
-        return nError;
-
-    // If we have sector offsets, recrypt these as well
-    if(hf->SectorOffsets != NULL)
-    {
-        // Allocate secondary buffer for sectors copy
-        DWORD * SectorOffsetsCopy = (DWORD *)STORM_ALLOC(BYTE, hf->SectorOffsets[0]);
-        DWORD dwSectorOffsLen = hf->SectorOffsets[0];
-
-        if(SectorOffsetsCopy == NULL)
-            return ERROR_NOT_ENOUGH_MEMORY;
-
-        // Recrypt the array of sector offsets
-        memcpy(SectorOffsetsCopy, hf->SectorOffsets, dwSectorOffsLen);
-        EncryptMpqBlock(SectorOffsetsCopy, dwSectorOffsLen, dwNewKey - 1);
-        BSWAP_ARRAY32_UNSIGNED(SectorOffsetsCopy, dwSectorOffsLen);
-
-        // Write the recrypted array back
-        if(!FileStream_Write(ha->pStream, &hf->RawFilePos, SectorOffsetsCopy, dwSectorOffsLen))
-            nError = GetLastError();
-        STORM_FREE(SectorOffsetsCopy);
-    }
-
-    // Now we have to recrypt all file sectors. We do it without
-    // recompression, because recompression is not necessary in this case
-    if(nError == ERROR_SUCCESS)
-    {
-        for(DWORD dwSector = 0; dwSector < hf->dwSectorCount; dwSector++)
-        {
-            DWORD dwRawDataInSector = hf->dwSectorSize;
-            DWORD dwRawByteOffset = dwSector * hf->dwSectorSize;
-
-            // Last sector: If there is not enough bytes remaining in the file, cut the raw size
-            if(dwRawDataInSector > dwBytesToRecrypt)
-                dwRawDataInSector = dwBytesToRecrypt;
-
-            // Fix the raw data length if the file is compressed
-            if(hf->SectorOffsets != NULL)
-            {
-                dwRawDataInSector = hf->SectorOffsets[dwSector+1] - hf->SectorOffsets[dwSector];
-                dwRawByteOffset = hf->SectorOffsets[dwSector];
-            }
-
-            // Calculate the raw file offset of the file sector
-            CalculateRawSectorOffset(RawFilePos, hf, dwRawByteOffset);
-
-            // Read the file sector
-            if(!FileStream_Read(ha->pStream, &RawFilePos, hf->pbFileSector, dwRawDataInSector))
-            {
-                nError = GetLastError();
-                break;
-            }
-
-            // If necessary, re-encrypt the sector
-            // Note: Recompression is not necessary here. Unlike encryption,
-            // the compression does not depend on the position of the file in MPQ.
-            BSWAP_ARRAY32_UNSIGNED(hf->pbFileSector, dwRawDataInSector);
-            DecryptMpqBlock(hf->pbFileSector, dwRawDataInSector, dwOldKey + dwSector);
-            EncryptMpqBlock(hf->pbFileSector, dwRawDataInSector, dwNewKey + dwSector);
-            BSWAP_ARRAY32_UNSIGNED(hf->pbFileSector, dwRawDataInSector);
-
-            // Write the sector back
-            if(!FileStream_Write(ha->pStream, &RawFilePos, hf->pbFileSector, dwRawDataInSector))
-            {
-                nError = GetLastError();
-                break;
-            }
-
-            // Decrement number of bytes remaining
-            dwBytesToRecrypt -= hf->dwSectorSize;
-        }
-    }
-
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// Support functions for adding files to the MPQ
-
-int SFileAddFile_Init(
-        TMPQArchive * ha,
-        const char * szFileName,
-        ULONGLONG FileTime,
-        DWORD dwFileSize,
-        LCID lcLocale,
-        DWORD dwFlags,
-        TMPQFile ** phf)
-{
-    TFileEntry * pFileEntry = NULL;
-    ULONGLONG TempPos;                  // For various file offset calculations
-    TMPQFile * hf = NULL;               // File structure for newly added file
-    int nError = ERROR_SUCCESS;
-
-    //
-    // Note: This is an internal function so no validity checks are done.
-    // It is the caller's responsibility to make sure that no invalid
-    // flags get to this point
-    //
-
-    // Sestor CRC is not allowed with single unit files
-    if(dwFlags & MPQ_FILE_SINGLE_UNIT)
-        dwFlags &= ~MPQ_FILE_SECTOR_CRC;
-
-    // Sector CRC is not allowed if the file is not compressed
-    if(!(dwFlags & MPQ_FILE_COMPRESSED))
-        dwFlags &= ~MPQ_FILE_SECTOR_CRC;
-
-    // Fix Key is not allowed if the file is not enrypted
-    if(!(dwFlags & MPQ_FILE_ENCRYPTED))
-        dwFlags &= ~MPQ_FILE_FIX_KEY;
-
-    // If the MPQ is of version 3.0 or higher, we ignore file locale.
-    // This is because HET and BET tables have no known support for it
-    if(ha->pHeader->wFormatVersion >= MPQ_FORMAT_VERSION_3)
-        lcLocale = 0;
-
-    // Allocate the TMPQFile entry for newly added file
-    hf = CreateMpqFile(ha);
-    if(hf == NULL)
-        nError = ERROR_NOT_ENOUGH_MEMORY;
-
-    // Find a free space in the MPQ, as well as free block table entry
-    if(nError == ERROR_SUCCESS)
-    {
-        // Find the position where the file will be stored
-        FindFreeMpqSpace(ha, &hf->MpqFilePos);
-        hf->RawFilePos = ha->MpqPos + hf->MpqFilePos;
-        hf->bIsWriteHandle = true;
-
-        // Sanity check: The MPQ must be marked as changed at this point
-        assert((ha->dwFlags & MPQ_FLAG_CHANGED) != 0);
-
-        // When format V1, the size of the archive cannot exceed 4 GB
-        if(ha->pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1)
-        {
-            TempPos  = hf->MpqFilePos + dwFileSize;
-            TempPos += ha->pHeader->dwHashTableSize * sizeof(TMPQHash);
-            TempPos += ha->pHeader->dwBlockTableSize * sizeof(TMPQBlock);
-            TempPos += ha->pHeader->dwBlockTableSize * sizeof(USHORT);
-            if((TempPos >> 32) != 0)
-                nError = ERROR_DISK_FULL;
-        }
-    }
-
-    // Allocate file entry in the MPQ
-    if(nError == ERROR_SUCCESS)
-    {
-        // Check if the file already exists in the archive
-        pFileEntry = GetFileEntryExact(ha, szFileName, lcLocale);
-        if(pFileEntry == NULL)
-        {
-            pFileEntry = AllocateFileEntry(ha, szFileName, lcLocale);
-            if(pFileEntry == NULL)
-                nError = ERROR_DISK_FULL;
-        }
-        else
-        {
-            // If the file exists and "replace existing" is not set, fail it
-            if((dwFlags & MPQ_FILE_REPLACEEXISTING) == 0)
-                nError = ERROR_ALREADY_EXISTS;
-
-            // If the file entry already contains a file
-            // and it is a pseudo-name, replace it
-            if(nError == ERROR_SUCCESS)
-            {
-                AllocateFileName(pFileEntry, szFileName);
-            }
-        }
-    }
-
-    //
-    // At this point, the file name in file entry must be non-NULL
-    //
-
-    // Create key for file encryption
-    if(nError == ERROR_SUCCESS && (dwFlags & MPQ_FILE_ENCRYPTED))
-    {
-        hf->dwFileKey = DecryptFileKey(szFileName, hf->MpqFilePos, dwFileSize, dwFlags);
-    }
-
-    if(nError == ERROR_SUCCESS)
-    {
-        // Initialize the hash entry for the file
-        hf->pFileEntry = pFileEntry;
-        hf->dwDataSize = dwFileSize;
-
-        // Initialize the block table entry for the file
-        pFileEntry->ByteOffset = hf->MpqFilePos;
-        pFileEntry->dwFileSize = dwFileSize;
-        pFileEntry->dwCmpSize = 0;
-        pFileEntry->dwFlags  = dwFlags | MPQ_FILE_EXISTS;
-        pFileEntry->lcLocale = (USHORT)lcLocale;
-
-        // Initialize the file time, CRC32 and MD5
-        assert(sizeof(hf->hctx) >= sizeof(hash_state));
-        memset(pFileEntry->md5, 0, MD5_DIGEST_SIZE);
-        md5_init((hash_state *)hf->hctx);
-        pFileEntry->dwCrc32 = crc32(0, Z_NULL, 0);
-
-        // If the caller gave us a file time, use it.
-        pFileEntry->FileTime = FileTime;
-
-        // Call the callback, if needed
-        if(AddFileCB != NULL)
-            AddFileCB(pvUserData, 0, hf->dwDataSize, false);
-    }
-
-    // If an error occured, remember it
-    if(nError != ERROR_SUCCESS)
-        hf->bErrorOccured = true;
-    *phf = hf;
-    return nError;
-}
-
-int SFileAddFile_Write(TMPQFile * hf, const void * pvData, DWORD dwSize, DWORD dwCompression)
-{
-    TMPQArchive * ha;
-    TFileEntry * pFileEntry;
-    int nError = ERROR_SUCCESS;
-
-    // Don't bother if the caller gave us zero size
-    if(pvData == NULL || dwSize == 0)
-        return ERROR_SUCCESS;
-
-    // Get pointer to the MPQ archive
-    pFileEntry = hf->pFileEntry;
-    ha = hf->ha;
-
-    // Allocate file buffers
-    if(hf->pbFileSector == NULL)
-    {
-        ULONGLONG RawFilePos = hf->RawFilePos;
-
-        // Allocate buffer for file sector
-        nError = AllocateSectorBuffer(hf);
-        if(nError != ERROR_SUCCESS)
-        {
-            hf->bErrorOccured = true;
-            return nError;
-        }
-
-        // Allocate patch info, if the data is patch
-        if(hf->pPatchInfo == NULL && IsIncrementalPatchFile(pvData, dwSize, &hf->dwPatchedFileSize))
-        {
-            // Set the MPQ_FILE_PATCH_FILE flag
-            hf->pFileEntry->dwFlags |= MPQ_FILE_PATCH_FILE;
-
-            // Allocate the patch info
-            nError = AllocatePatchInfo(hf, false);
-            if(nError != ERROR_SUCCESS)
-            {
-                hf->bErrorOccured = true;
-                return nError;
-            }
-        }
-
-        // Allocate sector offsets
-        if(hf->SectorOffsets == NULL)
-        {
-            nError = AllocateSectorOffsets(hf, false);
-            if(nError != ERROR_SUCCESS)
-            {
-                hf->bErrorOccured = true;
-                return nError;
-            }
-        }
-
-        // Create array of sector checksums
-        if(hf->SectorChksums == NULL && (pFileEntry->dwFlags & MPQ_FILE_SECTOR_CRC))
-        {
-            nError = AllocateSectorChecksums(hf, false);
-            if(nError != ERROR_SUCCESS)
-            {
-                hf->bErrorOccured = true;
-                return nError;
-            }
-        }
-
-        // Pre-save the patch info, if any
-        if(hf->pPatchInfo != NULL)
-        {
-            if(!FileStream_Write(ha->pStream, &RawFilePos, hf->pPatchInfo, hf->pPatchInfo->dwLength))
-                nError = GetLastError();
-
-            pFileEntry->dwCmpSize += hf->pPatchInfo->dwLength;
-            RawFilePos += hf->pPatchInfo->dwLength;
-        }
-
-        // Pre-save the sector offset table, just to reserve space in the file.
-        // Note that we dont need to swap the sector positions, nor encrypt the table
-        // at the moment, as it will be written again after writing all file sectors.
-        if(hf->SectorOffsets != NULL)
-        {
-            if(!FileStream_Write(ha->pStream, &RawFilePos, hf->SectorOffsets, hf->SectorOffsets[0]))
-                nError = GetLastError();
-
-            pFileEntry->dwCmpSize += hf->SectorOffsets[0];
-            RawFilePos += hf->SectorOffsets[0];
-        }
-    }
-
-    // Write the MPQ data to the file
-    if(nError == ERROR_SUCCESS)
-        nError = WriteDataToMpqFile(ha, hf, (LPBYTE)pvData, dwSize, dwCompression);
-
-    // If it succeeded and we wrote all the file data,
-    // we need to re-save sector offset table
-    if(nError == ERROR_SUCCESS)
-    {
-        if(hf->dwFilePos >= pFileEntry->dwFileSize)
-        {
-            // Finish calculating CRC32
-            hf->pFileEntry->dwCrc32 = hf->dwCrc32;
-
-            // Finish calculating MD5
-            md5_done((hash_state *)hf->hctx, hf->pFileEntry->md5);
-
-            // If we also have sector checksums, write them to the file
-            if(hf->SectorChksums != NULL)
-            {
-                nError = WriteSectorChecksums(hf);
-                if(nError != ERROR_SUCCESS)
-                    hf->bErrorOccured = true;
-            }
-
-            // Now write patch info
-            if(hf->pPatchInfo != NULL)
-            {
-                memcpy(hf->pPatchInfo->md5, hf->pFileEntry->md5, MD5_DIGEST_SIZE);
-                hf->pPatchInfo->dwDataSize  = hf->pFileEntry->dwFileSize;
-                hf->pFileEntry->dwFileSize = hf->dwPatchedFileSize;
-                nError = WritePatchInfo(hf);
-                if(nError != ERROR_SUCCESS)
-                    hf->bErrorOccured = true;
-            }
-
-            // Now write sector offsets to the file
-            if(hf->SectorOffsets != NULL)
-            {
-                nError = WriteSectorOffsets(hf);
-                if(nError != ERROR_SUCCESS)
-                    hf->bErrorOccured = true;
-            }
-
-            // Write the MD5 hashes of each file chunk, if required
-            if(ha->pHeader->dwRawChunkSize != 0)
-            {
-                nError = WriteMpqDataMD5(ha->pStream,
-                                         ha->MpqPos + hf->pFileEntry->ByteOffset,
-                                         hf->pFileEntry->dwCmpSize,
-                                         ha->pHeader->dwRawChunkSize);
-                if(nError != ERROR_SUCCESS)
-                    hf->bErrorOccured = true;
-            }
-        }
-    }
-    else
-    {
-        hf->bErrorOccured = true;
-    }
-
-    return nError;
-}
-
-int SFileAddFile_Finish(TMPQFile * hf)
-{
-    TMPQArchive * ha = hf->ha;
-    TFileEntry * pFileEntry = hf->pFileEntry;
-    int nError = ERROR_SUCCESS;
-
-    // If all previous operations succeeded, we can update the MPQ
-    if(!hf->bErrorOccured)
-    {
-        // Verify if the caller wrote the file properly
-        if(hf->pPatchInfo == NULL)
-        {
-            assert(pFileEntry != NULL);
-            if(hf->dwFilePos != pFileEntry->dwFileSize)
-            {
-                nError = ERROR_CAN_NOT_COMPLETE;
-                hf->bErrorOccured = true;
-            }
-        }
-        else
-        {
-            if(hf->dwFilePos != hf->pPatchInfo->dwDataSize)
-            {
-                nError = ERROR_CAN_NOT_COMPLETE;
-                hf->bErrorOccured = true;
-            }
-        }
-    }
-
-    if(!hf->bErrorOccured)
-    {
-        // Call the user callback, if any
-        if(AddFileCB != NULL)
-            AddFileCB(pvUserData, hf->dwDataSize, hf->dwDataSize, true);
-
-        // Update the size of the block table
-        ha->pHeader->dwBlockTableSize = ha->dwFileTableSize;
-    }
-    else
-    {
-        // Free the file entry in MPQ tables
-        if(pFileEntry != NULL)
-            FreeFileEntry(ha, pFileEntry);
-    }
-
-    // Clear the add file callback
-    FreeMPQFile(hf);
-    pvUserData = NULL;
-    AddFileCB = NULL;
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// Adds data as file to the archive
-
-bool WINAPI SFileCreateFile(
-        HANDLE hMpq,
-        const char * szArchivedName,
-        ULONGLONG FileTime,
-        DWORD dwFileSize,
-        LCID lcLocale,
-        DWORD dwFlags,
-        HANDLE * phFile)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    int nError = ERROR_SUCCESS;
-
-    // Check valid parameters
-    if(!IsValidMpqHandle(ha))
-        nError = ERROR_INVALID_HANDLE;
-    if(szArchivedName == NULL || *szArchivedName == 0)
-        nError = ERROR_INVALID_PARAMETER;
-    if(phFile == NULL)
-        nError = ERROR_INVALID_PARAMETER;
-
-    // Don't allow to add file if the MPQ is open for read only
-    if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
-        nError = ERROR_ACCESS_DENIED;
-
-    // Don't allow to add a file under pseudo-file name
-    if(IsPseudoFileName(szArchivedName, NULL))
-        nError = ERROR_INVALID_PARAMETER;
-
-    // Don't allow to add any of the internal files
-    if(IsInternalMpqFileName(szArchivedName))
-        nError = ERROR_INTERNAL_FILE;
-
-    // Perform validity check of the MPQ flags
-    if(nError == ERROR_SUCCESS)
-    {
-        // Mask all unsupported flags out
-        dwFlags &= MPQ_FILE_VALID_FLAGS;
-
-        // Check for valid flag combinations
-        if((dwFlags & (MPQ_FILE_IMPLODE | MPQ_FILE_COMPRESS)) == (MPQ_FILE_IMPLODE | MPQ_FILE_COMPRESS))
-            nError = ERROR_INVALID_PARAMETER;
-    }
-
-    // Create the file in MPQ
-    if(nError == ERROR_SUCCESS)
-    {
-        // Invalidate the entries for (listfile) and (attributes)
-        // After we are done with MPQ changes, we need to re-create them anyway
-        InvalidateInternalFiles(ha);
-
-        // Initiate the add file operation
-        nError = SFileAddFile_Init(ha, szArchivedName, FileTime, dwFileSize, lcLocale, dwFlags, (TMPQFile **)phFile);
-    }
-
-    // Deal with the errors
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
-
-bool WINAPI SFileWriteFile(
-        HANDLE hFile,
-        const void * pvData,
-        DWORD dwSize,
-        DWORD dwCompression)
-{
-    TMPQFile * hf = (TMPQFile *)hFile;
-    int nError = ERROR_SUCCESS;
-
-    // Check the proper parameters
-    if(!IsValidFileHandle(hf))
-        nError = ERROR_INVALID_HANDLE;
-    if(hf->bIsWriteHandle == false)
-        nError = ERROR_INVALID_HANDLE;
-
-    // Special checks for single unit files
-    if(nError == ERROR_SUCCESS && (hf->pFileEntry->dwFlags & MPQ_FILE_SINGLE_UNIT))
-    {
-        //
-        // Note: Blizzard doesn't support single unit files
-        // that are stored as encrypted or imploded. We will allow them here,
-        // the calling application must ensure that such flag combination doesn't get here
-        //
-
-        //      if(dwFlags & MPQ_FILE_IMPLODE)
-        //          nError = ERROR_INVALID_PARAMETER;
-        //
-        //      if(dwFlags & MPQ_FILE_ENCRYPTED)
-        //          nError = ERROR_INVALID_PARAMETER;
-
-        // Lossy compression is not allowed on single unit files
-        if(dwCompression & LOSSY_COMPRESSION_MASK)
-            nError = ERROR_INVALID_PARAMETER;
-    }
-
-
-    // Write the data to the file
-    if(nError == ERROR_SUCCESS)
-        nError = SFileAddFile_Write(hf, pvData, dwSize, dwCompression);
-
-    // Deal with errors
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
-
-bool WINAPI SFileFinishFile(HANDLE hFile)
-{
-    TMPQFile * hf = (TMPQFile *)hFile;
-    int nError = ERROR_SUCCESS;
-
-    // Check the proper parameters
-    if(!IsValidFileHandle(hf))
-        nError = ERROR_INVALID_HANDLE;
-    if(hf->bIsWriteHandle == false)
-        nError = ERROR_INVALID_HANDLE;
-
-    // Finish the file
-    if(nError == ERROR_SUCCESS)
-        nError = SFileAddFile_Finish(hf);
-
-    // Deal with errors
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
-
-//-----------------------------------------------------------------------------
-// Adds a file to the archive
-
-bool WINAPI SFileAddFileEx(
-        HANDLE hMpq,
-        const TCHAR * szFileName,
-        const char * szArchivedName,
-        DWORD dwFlags,
-        DWORD dwCompression,            // Compression of the first sector
-        DWORD dwCompressionNext)        // Compression of next sectors
-{
-    ULONGLONG FileSize = 0;
-    ULONGLONG FileTime = 0;
-    TFileStream * pStream = NULL;
-    HANDLE hMpqFile = NULL;
-    LPBYTE pbFileData = NULL;
-    DWORD dwBytesRemaining = 0;
-    DWORD dwBytesToRead;
-    DWORD dwSectorSize = 0x1000;
-    DWORD dwChannels = 0;
-    bool bIsAdpcmCompression = false;
-    bool bIsFirstSector = true;
-    int nError = ERROR_SUCCESS;
-
-    // Check parameters
-    if(szFileName == NULL || *szFileName == 0)
-        nError = ERROR_INVALID_PARAMETER;
-
-    // Open added file
-    if(nError == ERROR_SUCCESS)
-    {
-        pStream = FileStream_OpenFile(szFileName, STREAM_FLAG_READ_ONLY | STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
-        if(pStream == NULL)
-            nError = GetLastError();
-    }
-
-    // Get the file size and file time
-    if(nError == ERROR_SUCCESS)
-    {
-        FileStream_GetTime(pStream, &FileTime);
-        FileStream_GetSize(pStream, &FileSize);
-
-        // Files bigger than 4GB cannot be added to MPQ
-        if(FileSize >> 32)
-            nError = ERROR_DISK_FULL;
-    }
-
-    // Allocate data buffer for reading from the source file
-    if(nError == ERROR_SUCCESS)
-    {
-        dwBytesRemaining = (DWORD)FileSize;
-        pbFileData = STORM_ALLOC(BYTE, dwSectorSize);
-        if(pbFileData == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Deal with various combination of compressions
-    if(nError == ERROR_SUCCESS)
-    {
-        // When the compression for next blocks is set to default,
-        // we will copy the compression for the first sector
-        if(dwCompressionNext == MPQ_COMPRESSION_NEXT_SAME)
-            dwCompressionNext = dwCompression;
-
-        // If the caller wants ADPCM compression, we make sure
-        // that the first sector is not compressed with lossy compression
-        if(dwCompressionNext & (MPQ_COMPRESSION_ADPCM_MONO | MPQ_COMPRESSION_ADPCM_STEREO))
-        {
-            // The first compression must not be WAVE
-            if(dwCompression & (MPQ_COMPRESSION_ADPCM_MONO | MPQ_COMPRESSION_ADPCM_STEREO))
-                dwCompression = MPQ_COMPRESSION_PKWARE;
-
-            dwCompressionNext &= ~(MPQ_COMPRESSION_ADPCM_MONO | MPQ_COMPRESSION_ADPCM_STEREO);
-            bIsAdpcmCompression = true;
-        }
-
-        // Initiate adding file to the MPQ
-        if(!SFileCreateFile(hMpq, szArchivedName, FileTime, (DWORD)FileSize, lcFileLocale, dwFlags, &hMpqFile))
-            nError = GetLastError();
-    }
-
-    // Write the file data to the MPQ
-    while(nError == ERROR_SUCCESS && dwBytesRemaining != 0)
-    {
-        // Get the number of bytes remaining in the source file
-        dwBytesToRead = dwBytesRemaining;
-        if(dwBytesToRead > dwSectorSize)
-            dwBytesToRead = dwSectorSize;
-
-        // Read data from the local file
-        if(!FileStream_Read(pStream, NULL, pbFileData, dwBytesToRead))
-        {
-            nError = GetLastError();
-            break;
-        }
-
-        // If the file being added is a WAVE file, we check number of channels
-        if(bIsFirstSector && bIsAdpcmCompression)
-        {
-            // The file must really be a wave file, otherwise it's data corruption
-            if(!IsWaveFile(pbFileData, dwBytesToRead, &dwChannels))
-            {
-                nError = ERROR_BAD_FORMAT;
-                break;
-            }
-
-            // Setup the compression according to number of channels
-            dwCompressionNext |= (dwChannels == 1) ? MPQ_COMPRESSION_ADPCM_MONO : MPQ_COMPRESSION_ADPCM_STEREO;
-            bIsFirstSector = false;
-        }
-
-        // Add the file sectors to the MPQ
-        if(!SFileWriteFile(hMpqFile, pbFileData, dwBytesToRead, dwCompression))
-        {
-            nError = GetLastError();
-            break;
-        }
-
-        // Set the next data compression
-        dwBytesRemaining -= dwBytesToRead;
-        dwCompression = dwCompressionNext;
-    }
-
-    // Finish the file writing
-    if(hMpqFile != NULL)
-    {
-        if(!SFileFinishFile(hMpqFile))
-            nError = GetLastError();
-    }
-
-    // Cleanup and exit
-    if(pbFileData != NULL)
-        STORM_FREE(pbFileData);
-    if(pStream != NULL)
-        FileStream_Close(pStream);
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
-
-// Adds a data file into the archive
-bool WINAPI SFileAddFile(HANDLE hMpq, const TCHAR * szFileName, const char * szArchivedName, DWORD dwFlags)
-{
-    return SFileAddFileEx(hMpq,
-                          szFileName,
-                          szArchivedName,
-                          dwFlags,
-                          DefaultDataCompression,
-                          DefaultDataCompression);
-}
-
-// Adds a WAVE file into the archive
-bool WINAPI SFileAddWave(HANDLE hMpq, const TCHAR * szFileName, const char * szArchivedName, DWORD dwFlags, DWORD dwQuality)
-{
-    DWORD dwCompression = 0;
-
-    //
-    // Note to wave compression level:
-    // The following conversion table applied:
-    // High quality:   WaveCompressionLevel = -1
-    // Medium quality: WaveCompressionLevel = 4
-    // Low quality:    WaveCompressionLevel = 2
-    //
-    // Starcraft files are packed as Mono (0x41) on medium quality.
-    // Because this compression is not used anymore, our compression functions
-    // will default to WaveCompressionLevel = 4 when using ADPCM compression
-    //
-
-    // Convert quality to data compression
-    switch(dwQuality)
-    {
-    case MPQ_WAVE_QUALITY_HIGH:
-        //          WaveCompressionLevel = -1;
-        dwCompression = MPQ_COMPRESSION_PKWARE;
-        break;
-
-    case MPQ_WAVE_QUALITY_MEDIUM:
-        //          WaveCompressionLevel = 4;
-        dwCompression = MPQ_COMPRESSION_ADPCM_STEREO | MPQ_COMPRESSION_HUFFMANN;
-        break;
-
-    case MPQ_WAVE_QUALITY_LOW:
-        //          WaveCompressionLevel = 2;
-        dwCompression = MPQ_COMPRESSION_ADPCM_STEREO | MPQ_COMPRESSION_HUFFMANN;
-        break;
-    }
-
-    return SFileAddFileEx(hMpq,
-                          szFileName,
-                          szArchivedName,
-                          dwFlags,
-                          MPQ_COMPRESSION_PKWARE,   // First sector should be compressed as data
-                          dwCompression);           // Next sectors should be compressed as WAVE
-}
-
-//-----------------------------------------------------------------------------
-// bool SFileRemoveFile(HANDLE hMpq, char * szFileName)
-//
-// This function removes a file from the archive. The file content
-// remains there, only the entries in the hash table and in the block
-// table are updated.
-
-bool WINAPI SFileRemoveFile(HANDLE hMpq, const char * szFileName, DWORD dwSearchScope)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    TFileEntry * pFileEntry = NULL; // File entry of the file to be deleted
-    DWORD dwFileIndex = 0;
-    int nError = ERROR_SUCCESS;
-
-    // Keep compiler happy
-    dwSearchScope = dwSearchScope;
-
-    // Check the parameters
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!IsValidMpqHandle(ha))
-            nError = ERROR_INVALID_HANDLE;
-        if(szFileName == NULL || *szFileName == 0)
-            nError = ERROR_INVALID_PARAMETER;
-        if(IsInternalMpqFileName(szFileName))
-            nError = ERROR_INTERNAL_FILE;
-    }
-
-    if(nError == ERROR_SUCCESS)
-    {
-        // Do not allow to remove files from MPQ open for read only
-        if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
-            nError = ERROR_ACCESS_DENIED;
-    }
-
-    // Get hash entry belonging to this file
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!IsPseudoFileName(szFileName, &dwFileIndex))
-        {
-            if((pFileEntry = GetFileEntryExact(ha, (char *)szFileName, lcFileLocale)) == NULL)
-                nError = ERROR_FILE_NOT_FOUND;
-        }
-        else
-        {
-            if((pFileEntry = GetFileEntryByIndex(ha, dwFileIndex)) == NULL)
-                nError = ERROR_FILE_NOT_FOUND;
-        }
-    }
-
-    // Test if the file is not already deleted
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!(pFileEntry->dwFlags & MPQ_FILE_EXISTS))
-            nError = ERROR_FILE_NOT_FOUND;
-    }
-
-    if(nError == ERROR_SUCCESS)
-    {
-        // Invalidate the entries for (listfile) and (attributes)
-        // After we are done with MPQ changes, we need to re-create them anyway
-        InvalidateInternalFiles(ha);
-
-        // Mark the file entry as free
-        nError = FreeFileEntry(ha, pFileEntry);
-    }
-
-    // Resolve error and exit
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
-
-// Renames the file within the archive.
-bool WINAPI SFileRenameFile(HANDLE hMpq, const char * szFileName, const char * szNewFileName)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    TFileEntry * pFileEntry = NULL;
-    ULONGLONG RawDataOffs;
-    TMPQFile * hf;
-    int nError = ERROR_SUCCESS;
-
-    // Test the valid parameters
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!IsValidMpqHandle(ha))
-            nError = ERROR_INVALID_HANDLE;
-        if(szFileName == NULL || *szFileName == 0 || szNewFileName == NULL || *szNewFileName == 0)
-            nError = ERROR_INVALID_PARAMETER;
-    }
-
-    if(nError == ERROR_SUCCESS)
-    {
-        // Do not allow to rename files in MPQ open for read only
-        if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
-            nError = ERROR_ACCESS_DENIED;
-
-        // Do not allow renaming anything to a pseudo-file name
-        if(IsPseudoFileName(szFileName, NULL) || IsPseudoFileName(szNewFileName, NULL))
-            nError = ERROR_INVALID_PARAMETER;
-
-        // Do not allow to rename any of the internal files
-        // Also do not allow to rename any of files to an internal file
-        if(IsInternalMpqFileName(szFileName) || IsInternalMpqFileName(szNewFileName))
-            nError = ERROR_INTERNAL_FILE;
-    }
-
-    // Find the current file entry.
-    if(nError == ERROR_SUCCESS)
-    {
-        // Get the file entry
-        pFileEntry = GetFileEntryLocale(ha, szFileName, lcFileLocale);
-        if(pFileEntry == NULL)
-            nError = ERROR_FILE_NOT_FOUND;
-    }
-
-    // Also try to find file entry for the new file.
-    // This verifies if we are not overwriting an existing file
-    // (whose name we perhaps don't know)
-    if(nError == ERROR_SUCCESS)
-    {
-        if(GetFileEntryLocale(ha, szNewFileName, pFileEntry->lcLocale) != NULL)
-            nError = ERROR_ALREADY_EXISTS;
-    }
-
-    // Now we rename the existing file entry.
-    if(nError == ERROR_SUCCESS)
-    {
-        // Rename the file entry
-        nError = RenameFileEntry(ha, pFileEntry, szNewFileName);
-    }
-
-    // Now we copy the existing file entry to the new one
-    if(nError == ERROR_SUCCESS)
-    {
-        // If the file is encrypted, we have to re-crypt the file content
-        // with the new decryption key
-        if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
-        {
-            hf = CreateMpqFile(ha);
-            if(hf != NULL)
-            {
-                // Recrypt the file data in the MPQ
-                hf->pFileEntry = pFileEntry;
-                hf->dwDataSize = pFileEntry->dwFileSize;
-                nError = RecryptFileData(ha, hf, szFileName, szNewFileName);
-
-                // Update the MD5
-                if(ha->pHeader->dwRawChunkSize != 0)
-                {
-                    RawDataOffs = ha->MpqPos + pFileEntry->ByteOffset;
-                    WriteMpqDataMD5(ha->pStream,
-                                    RawDataOffs,
-                                    pFileEntry->dwCmpSize,
-                                    ha->pHeader->dwRawChunkSize);
-                }
-
-                FreeMPQFile(hf);
-            }
-            else
-            {
-                nError = ERROR_NOT_ENOUGH_MEMORY;
-            }
-        }
-    }
-
-    //
-    // Note: MPQ_FLAG_CHANGED is set by RenameFileEntry
-    //
-
-    // Resolve error and return
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
-
-//-----------------------------------------------------------------------------
-// Sets default data compression for SFileAddFile
-
-bool WINAPI SFileSetDataCompression(DWORD DataCompression)
-{
-    unsigned int uValidMask = (MPQ_COMPRESSION_ZLIB | MPQ_COMPRESSION_PKWARE | MPQ_COMPRESSION_BZIP2 | MPQ_COMPRESSION_SPARSE);
-
-    if((DataCompression & uValidMask) != DataCompression)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return false;
-    }
-
-    DefaultDataCompression = DataCompression;
-    return true;
-}
-
-//-----------------------------------------------------------------------------
-// Changes locale ID of a file
-
-bool WINAPI SFileSetFileLocale(HANDLE hFile, LCID lcNewLocale)
-{
-    TMPQArchive * ha;
-    TFileEntry * pFileEntry;
-    TMPQFile * hf = (TMPQFile *)hFile;
-
-    // Invalid handle => do nothing
-    if(!IsValidFileHandle(hf))
-    {
-        SetLastError(ERROR_INVALID_HANDLE);
-        return false;
-    }
-
-    // Do not allow unnamed access
-    if(hf->pFileEntry->szFileName == NULL)
-    {
-        SetLastError(ERROR_CAN_NOT_COMPLETE);
-        return false;
-    }
-
-    // Do not allow to change locale of any internal file
-    if(IsInternalMpqFileName(hf->pFileEntry->szFileName))
-    {
-        SetLastError(ERROR_INTERNAL_FILE);
-        return false;
-    }
-
-    // Do not allow changing file locales in MPQs version 3 or higher
-    ha = hf->ha;
-    if(ha->pHeader->wFormatVersion >= MPQ_FORMAT_VERSION_3)
-    {
-        SetLastError(ERROR_NOT_SUPPORTED);
-        return false;
-    }
-
-    // Do not allow to rename files in MPQ open for read only
-    if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
-    {
-        SetLastError(ERROR_ACCESS_DENIED);
-        return false;
-    }
-
-    // If the file already has that locale, return OK
-    if(hf->pFileEntry->lcLocale == lcNewLocale)
-        return true;
-
-    // We have to check if the file+locale is not already there
-    pFileEntry = GetFileEntryExact(ha, hf->pFileEntry->szFileName, lcNewLocale);
-    if(pFileEntry != NULL)
-    {
-        SetLastError(ERROR_ALREADY_EXISTS);
-        return false;
-    }
-
-    // Set the locale and return success
-    pFileEntry = hf->pFileEntry;
-    pFileEntry->lcLocale = (USHORT)lcNewLocale;
-
-    // Save the new locale to the hash table, if any
-    if(ha->pHashTable != NULL)
-        ha->pHashTable[pFileEntry->dwHashIndex].lcLocale = (USHORT)lcNewLocale;
-
-    // Remember that the MPQ tables have been changed
-    ha->dwFlags |= MPQ_FLAG_CHANGED;
-    return true;
-}
-
-//-----------------------------------------------------------------------------
-// Sets add file callback
-
-bool WINAPI SFileSetAddFileCallback(HANDLE /* hMpq */, SFILE_ADDFILE_CALLBACK aAddFileCB, void * pvData)
-{
-    pvUserData = pvData;
-    AddFileCB = aAddFileCB;
-    return true;
-}
diff --git a/dep/StormLibOld/src/SFileAttributes.cpp b/dep/StormLibOld/src/SFileAttributes.cpp
deleted file mode 100644
index e3659bfdc..000000000
--- a/dep/StormLibOld/src/SFileAttributes.cpp
+++ /dev/null
@@ -1,472 +0,0 @@
-/*****************************************************************************/
-/* SAttrFile.cpp                          Copyright (c) Ladislav Zezula 2007 */
-/*---------------------------------------------------------------------------*/
-/* Description:                                                              */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 12.06.04  1.00  Lad  The first version of SAttrFile.cpp                   */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-//-----------------------------------------------------------------------------
-// Local structures
-
-typedef struct _MPQ_ATTRIBUTES_HEADER
-{
-    DWORD dwVersion;                    // Version of the (attributes) file. Must be 100 (0x64)
-    DWORD dwFlags;                      // See MPQ_ATTRIBUTE_XXXX
-
-    // Followed by an array of CRC32
-    // Followed by an array of file times
-    // Followed by an array of MD5
-    // Followed by an array of patch bits
-} MPQ_ATTRIBUTES_HEADER, *PMPQ_ATTRIBUTES_HEADER;
-
-//-----------------------------------------------------------------------------
-// Public functions (internal use by StormLib)
-
-int SAttrLoadAttributes(TMPQArchive * ha)
-{
-    MPQ_ATTRIBUTES_HEADER AttrHeader;
-    HANDLE hFile = NULL;
-    DWORD dwBlockTableSize = ha->pHeader->dwBlockTableSize;
-    DWORD dwArraySize;
-    DWORD dwBytesRead;
-    DWORD i;
-    int nError = ERROR_SUCCESS;
-
-    // File table must be initialized
-    assert(ha->pFileTable != NULL);
-
-    // Attempt to open the "(attributes)" file.
-    // If it's not there, then the archive doesn't support attributes
-    if(SFileOpenFileEx((HANDLE)ha, ATTRIBUTES_NAME, SFILE_OPEN_ANY_LOCALE, &hFile))
-    {
-        // Load the content of the attributes file
-        SFileReadFile(hFile, &AttrHeader, sizeof(MPQ_ATTRIBUTES_HEADER), &dwBytesRead, NULL);
-        if(dwBytesRead != sizeof(MPQ_ATTRIBUTES_HEADER))
-            nError = ERROR_FILE_CORRUPT;
-
-        // Verify the header of the (attributes) file
-        if(nError == ERROR_SUCCESS)
-        {
-            AttrHeader.dwVersion = BSWAP_INT32_UNSIGNED(AttrHeader.dwVersion);
-            AttrHeader.dwFlags   = BSWAP_INT32_UNSIGNED(AttrHeader.dwFlags);
-            ha->dwAttrFlags      = AttrHeader.dwFlags;
-            if(dwBytesRead != sizeof(MPQ_ATTRIBUTES_HEADER))
-                nError = ERROR_FILE_CORRUPT;
-        }
-
-        // Verify format of the attributes
-        if(nError == ERROR_SUCCESS)
-        {
-            if(AttrHeader.dwVersion > MPQ_ATTRIBUTES_V1)
-                nError = ERROR_BAD_FORMAT;
-        }
-
-        // Load the CRC32 (if any)
-        if(nError == ERROR_SUCCESS && (AttrHeader.dwFlags & MPQ_ATTRIBUTE_CRC32))
-        {
-            LPDWORD pArrayCRC32 = STORM_ALLOC(DWORD, dwBlockTableSize);
-
-            if(pArrayCRC32 != NULL)
-            {
-                dwArraySize = dwBlockTableSize * sizeof(DWORD);
-                SFileReadFile(hFile, pArrayCRC32, dwArraySize, &dwBytesRead, NULL);
-                if(dwBytesRead == dwArraySize)
-                {
-                    for(i = 0; i < dwBlockTableSize; i++)
-                        ha->pFileTable[i].dwCrc32 = BSWAP_INT32_UNSIGNED(pArrayCRC32[i]);
-                }
-                else
-                    nError = ERROR_FILE_CORRUPT;
-
-                STORM_FREE(pArrayCRC32);
-            }
-            else
-                nError = ERROR_NOT_ENOUGH_MEMORY;
-        }
-
-        // Read the array of file times
-        if(nError == ERROR_SUCCESS && (AttrHeader.dwFlags & MPQ_ATTRIBUTE_FILETIME))
-        {
-            ULONGLONG * pArrayFileTime = STORM_ALLOC(ULONGLONG, dwBlockTableSize);
-
-            if(pArrayFileTime != NULL)
-            {
-                dwArraySize = dwBlockTableSize * sizeof(ULONGLONG);
-                SFileReadFile(hFile, pArrayFileTime, dwArraySize, &dwBytesRead, NULL);
-                if(dwBytesRead == dwArraySize)
-                {
-                    for(i = 0; i < dwBlockTableSize; i++)
-                        ha->pFileTable[i].FileTime = BSWAP_INT64_UNSIGNED(pArrayFileTime[i]);
-                }
-                else
-                    nError = ERROR_FILE_CORRUPT;
-
-                STORM_FREE(pArrayFileTime);
-            }
-            else
-                nError = ERROR_NOT_ENOUGH_MEMORY;
-        }
-
-        // Read the MD5 (if any)
-        // Note: MD5 array can be incomplete, if it's the last array in the (attributes)
-        if(nError == ERROR_SUCCESS && (AttrHeader.dwFlags & MPQ_ATTRIBUTE_MD5))
-        {
-            unsigned char * pArrayMD5 = STORM_ALLOC(unsigned char, (dwBlockTableSize * MD5_DIGEST_SIZE));
-            unsigned char * md5;
-
-            if(pArrayMD5 != NULL)
-            {
-                dwArraySize = dwBlockTableSize * MD5_DIGEST_SIZE;
-                SFileReadFile(hFile, pArrayMD5, dwArraySize, &dwBytesRead, NULL);
-                if(dwBytesRead == dwArraySize)
-                {
-                    md5 = pArrayMD5;
-                    for(i = 0; i < dwBlockTableSize; i++)
-                    {
-                        memcpy(ha->pFileTable[i].md5, md5, MD5_DIGEST_SIZE);
-                        md5 += MD5_DIGEST_SIZE;
-                    }
-                }
-                else
-                    nError = ERROR_FILE_CORRUPT;
-
-                STORM_FREE(pArrayMD5);
-            }
-            else
-                nError = ERROR_NOT_ENOUGH_MEMORY;
-        }
-
-        // Read the patch bit for each file
-        if(nError == ERROR_SUCCESS && (AttrHeader.dwFlags & MPQ_ATTRIBUTE_PATCH_BIT))
-        {
-            LPBYTE pbBitArray;
-            DWORD dwByteSize = ((dwBlockTableSize - 1) / 8) + 1;
-
-            pbBitArray = STORM_ALLOC(BYTE, dwByteSize);
-            if(pbBitArray != NULL)
-            {
-                SFileReadFile(hFile, pbBitArray, dwByteSize, &dwBytesRead, NULL);
-                if(dwBytesRead == dwByteSize)
-                {
-                    for(i = 0; i < dwBlockTableSize; i++)
-                    {
-                        DWORD dwByteIndex = i / 8;
-                        DWORD dwBitMask = 0x80 >> (i & 7);
-
-                        // Is the appropriate bit set?
-                        if(pbBitArray[dwByteIndex] & dwBitMask)
-                        {
-                            // At the moment, we assume that the patch bit is present
-                            // in both file table and (attributes)
-                            assert((ha->pFileTable[i].dwFlags & MPQ_FILE_PATCH_FILE) != 0);
-                            ha->pFileTable[i].dwFlags |= MPQ_FILE_PATCH_FILE;
-                        }
-                    }
-                }
-                else
-                    nError = ERROR_FILE_CORRUPT;
-
-                STORM_FREE(pbBitArray);
-            }
-        }
-
-        //
-        // Note: Version 7.00 of StormLib saved the (attributes) incorrectly.
-        // Sometimes, number of entries in the (attributes) was 1 item less
-        // than block table size.
-        // If we encounter such table, we will zero all three arrays
-        //
-
-        if(nError != ERROR_SUCCESS)
-            ha->dwAttrFlags = 0;
-
-        // Cleanup & exit
-        SFileCloseFile(hFile);
-    }
-    return nError;
-}
-
-int SAttrFileSaveToMpq(TMPQArchive * ha)
-{
-    MPQ_ATTRIBUTES_HEADER AttrHeader;
-    TFileEntry * pFileEntry;
-    TMPQFile * hf = NULL;
-    DWORD dwFinalBlockTableSize = ha->dwFileTableSize;
-    DWORD dwFileSize = 0;
-    DWORD dwToWrite;
-    DWORD i;
-    int nError = ERROR_SUCCESS;
-
-    // Now we have to check if we need patch bits in the (attributes)
-    if(nError == ERROR_SUCCESS)
-    {
-        for(i = 0; i < ha->dwFileTableSize; i++)
-        {
-            if(ha->pFileTable[i].dwFlags & MPQ_FILE_PATCH_FILE)
-            {
-                ha->dwAttrFlags |= MPQ_ATTRIBUTE_PATCH_BIT;
-                break;
-            }
-        }
-    }
-
-    // If the (attributes) is not in the file table yet,
-    // we have to increase the final block table size
-    pFileEntry = GetFileEntryExact(ha, ATTRIBUTES_NAME, LANG_NEUTRAL);
-    if(pFileEntry != NULL)
-    {
-        // If "(attributes)" file exists, and it's set to 0, then remove it
-        if(ha->dwAttrFlags == 0)
-        {
-            FreeFileEntry(ha, pFileEntry);
-            return ERROR_SUCCESS;
-        }
-    }
-    else
-    {
-        // If we don't want to create file atributes, do nothing
-        if(ha->dwAttrFlags == 0)
-            return ERROR_SUCCESS;
-
-        // Check where the file entry is going to be allocated.
-        // If at the end of the file table, we have to increment
-        // the expected size of the (attributes) file.
-        pFileEntry = FindFreeFileEntry(ha);
-        if(pFileEntry == ha->pFileTable + ha->dwFileTableSize)
-            dwFinalBlockTableSize++;
-    }
-
-    // Calculate the size of the attributes file
-    if(nError == ERROR_SUCCESS)
-    {
-        dwFileSize = sizeof(MPQ_ATTRIBUTES_HEADER);         // Header
-        if(ha->dwAttrFlags & MPQ_ATTRIBUTE_CRC32)
-            dwFileSize += dwFinalBlockTableSize * sizeof(DWORD);
-        if(ha->dwAttrFlags & MPQ_ATTRIBUTE_FILETIME)
-            dwFileSize += dwFinalBlockTableSize * sizeof(ULONGLONG);
-        if(ha->dwAttrFlags & MPQ_ATTRIBUTE_MD5)
-            dwFileSize += dwFinalBlockTableSize * MD5_DIGEST_SIZE;
-        if(ha->dwAttrFlags & MPQ_ATTRIBUTE_PATCH_BIT)
-            dwFileSize += ((dwFinalBlockTableSize - 1)) / 8 + 1;
-    }
-
-    // Determine the flags for (attributes)
-    if(ha->dwFileFlags2 == 0)
-        ha->dwFileFlags2 = GetDefaultSpecialFileFlags(ha, dwFileSize);
-
-    // Create the attributes file in the MPQ
-    nError = SFileAddFile_Init(ha, ATTRIBUTES_NAME,
-                               0,
-                               dwFileSize,
-                               LANG_NEUTRAL,
-                               ha->dwFileFlags2 | MPQ_FILE_REPLACEEXISTING,
-                               &hf);
-
-    // Write all parts of the (attributes) file
-    if(nError == ERROR_SUCCESS)
-    {
-        assert(ha->dwFileTableSize == dwFinalBlockTableSize);
-
-        // Note that we don't know what the new bit (0x08) means.
-        AttrHeader.dwVersion = BSWAP_INT32_UNSIGNED(100);
-        AttrHeader.dwFlags   = BSWAP_INT32_UNSIGNED((ha->dwAttrFlags & MPQ_ATTRIBUTE_ALL));
-        dwToWrite = sizeof(MPQ_ATTRIBUTES_HEADER);
-        nError = SFileAddFile_Write(hf, &AttrHeader, dwToWrite, MPQ_COMPRESSION_ZLIB);
-    }
-
-    // Write the array of CRC32
-    if(nError == ERROR_SUCCESS && (ha->dwAttrFlags & MPQ_ATTRIBUTE_CRC32))
-    {
-        LPDWORD pArrayCRC32 = STORM_ALLOC(DWORD, dwFinalBlockTableSize);
-
-        if(pArrayCRC32 != NULL)
-        {
-            // Copy from file table
-            for(i = 0; i < ha->dwFileTableSize; i++)
-                pArrayCRC32[i] = BSWAP_INT32_UNSIGNED(ha->pFileTable[i].dwCrc32);
-
-            dwToWrite = ha->dwFileTableSize * sizeof(DWORD);
-            nError = SFileAddFile_Write(hf, pArrayCRC32, dwToWrite, MPQ_COMPRESSION_ZLIB);
-            STORM_FREE(pArrayCRC32);
-        }
-    }
-
-    // Write the array of file time
-    if(nError == ERROR_SUCCESS && (ha->dwAttrFlags & MPQ_ATTRIBUTE_FILETIME))
-    {
-        ULONGLONG * pArrayFileTime = STORM_ALLOC(ULONGLONG, ha->dwFileTableSize);
-
-        if(pArrayFileTime != NULL)
-        {
-            // Copy from file table
-            for(i = 0; i < ha->dwFileTableSize; i++)
-                pArrayFileTime[i] = BSWAP_INT64_UNSIGNED(ha->pFileTable[i].FileTime);
-
-            dwToWrite = ha->dwFileTableSize * sizeof(ULONGLONG);
-            nError = SFileAddFile_Write(hf, pArrayFileTime, dwToWrite, MPQ_COMPRESSION_ZLIB);
-            STORM_FREE(pArrayFileTime);
-        }
-    }
-
-    // Write the array of MD5s
-    if(nError == ERROR_SUCCESS && (ha->dwAttrFlags & MPQ_ATTRIBUTE_MD5))
-    {
-        char * pArrayMD5 = STORM_ALLOC(char, ha->dwFileTableSize * MD5_DIGEST_SIZE);
-
-        if(pArrayMD5 != NULL)
-        {
-            // Copy from file table
-            for(i = 0; i < ha->dwFileTableSize; i++)
-                memcpy(&pArrayMD5[i * MD5_DIGEST_SIZE], ha->pFileTable[i].md5, MD5_DIGEST_SIZE);
-
-            dwToWrite = ha->dwFileTableSize * MD5_DIGEST_SIZE;
-            nError = SFileAddFile_Write(hf, pArrayMD5, dwToWrite, MPQ_COMPRESSION_ZLIB);
-            STORM_FREE(pArrayMD5);
-        }
-    }
-
-    // Write the array of patch bits
-    if(nError == ERROR_SUCCESS && (ha->dwAttrFlags & MPQ_ATTRIBUTE_PATCH_BIT))
-    {
-        LPBYTE pbBitArray;
-        DWORD dwByteSize = ((ha->dwFileTableSize - 1) / 8) + 1;
-
-        pbBitArray = STORM_ALLOC(BYTE, dwByteSize);
-        if(pbBitArray != NULL)
-        {
-            memset(pbBitArray, 0, dwByteSize);
-            for(i = 0; i < ha->dwFileTableSize; i++)
-            {
-                DWORD dwByteIndex = i / 8;
-                DWORD dwBitMask = 0x80 >> (i & 7);
-
-                if(ha->pFileTable[i].dwFlags & MPQ_FILE_PATCH_FILE)
-                    pbBitArray[dwByteIndex] |= dwBitMask;
-            }
-
-            nError = SFileAddFile_Write(hf, pbBitArray, dwByteSize, MPQ_COMPRESSION_ZLIB);
-            STORM_FREE(pbBitArray);
-        }
-    }
-
-    // Finalize the file in the archive
-    if(hf != NULL)
-    {
-        SFileAddFile_Finish(hf);
-    }
-
-    if(nError == ERROR_SUCCESS)
-        ha->dwFlags &= ~MPQ_FLAG_INV_ATTRIBUTES;
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// Public functions
-
-DWORD WINAPI SFileGetAttributes(HANDLE hMpq)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-
-    // Verify the parameters
-    if(!IsValidMpqHandle(ha))
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return SFILE_INVALID_ATTRIBUTES;
-    }
-
-    return ha->dwAttrFlags;
-}
-
-bool WINAPI SFileSetAttributes(HANDLE hMpq, DWORD dwFlags)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-
-    // Verify the parameters
-    if(!IsValidMpqHandle(ha))
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return false;
-    }
-
-    // Not allowed when the archive is read-only
-    if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
-    {
-        SetLastError(ERROR_ACCESS_DENIED);
-        return false;
-    }
-
-    // Set the attributes
-    InvalidateInternalFiles(ha);
-    ha->dwAttrFlags = (dwFlags & MPQ_ATTRIBUTE_ALL);
-    return true;
-}
-
-bool WINAPI SFileUpdateFileAttributes(HANDLE hMpq, const char * szFileName)
-{
-    hash_state md5_state;
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    TMPQFile * hf;
-    BYTE Buffer[0x1000];
-    HANDLE hFile = NULL;
-    DWORD dwTotalBytes = 0;
-    DWORD dwBytesRead;
-    DWORD dwCrc32;
-
-    // Verify the parameters
-    if(!IsValidMpqHandle(ha))
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return false;
-    }
-
-    // Not allowed when the archive is read-only
-    if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
-    {
-        SetLastError(ERROR_ACCESS_DENIED);
-        return false;
-    }
-
-    // Attempt to open the file
-    if(!SFileOpenFileEx(hMpq, szFileName, SFILE_OPEN_FROM_MPQ, &hFile))
-        return false;
-
-    // Get the file size
-    hf = (TMPQFile *)hFile;
-    SFileGetFileInfo(hFile, SFILE_INFO_FILE_SIZE, &dwTotalBytes, sizeof(DWORD), NULL);
-
-    // Initialize the CRC32 and MD5 contexts
-    md5_init(&md5_state);
-    dwCrc32 = crc32(0, Z_NULL, 0);
-
-    // Go through entire file and calculate both CRC32 and MD5
-    while(dwTotalBytes != 0)
-    {
-        // Read data from file
-        SFileReadFile(hFile, Buffer, sizeof(Buffer), &dwBytesRead, NULL);
-        if(dwBytesRead == 0)
-            break;
-
-        // Update CRC32 and MD5
-        dwCrc32 = crc32(dwCrc32, Buffer, dwBytesRead);
-        md5_process(&md5_state, Buffer, dwBytesRead);
-
-        // Decrement the total size
-        dwTotalBytes -= dwBytesRead;
-    }
-
-    // Update both CRC32 and MD5
-    hf->pFileEntry->dwCrc32 = dwCrc32;
-    md5_done(&md5_state, hf->pFileEntry->md5);
-
-    // Remember that we need to save the MPQ tables
-    InvalidateInternalFiles(ha);
-    SFileCloseFile(hFile);
-    return true;
-}
diff --git a/dep/StormLibOld/src/SFileCompactArchive.cpp b/dep/StormLibOld/src/SFileCompactArchive.cpp
deleted file mode 100644
index 46ae8be83..000000000
--- a/dep/StormLibOld/src/SFileCompactArchive.cpp
+++ /dev/null
@@ -1,765 +0,0 @@
-/*****************************************************************************/
-/* SFileCompactArchive.cpp                Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Archive compacting function                                               */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 14.04.03  1.00  Lad  Splitted from SFileCreateArchiveEx.cpp               */
-/* 19.11.03  1.01  Dan  Big endian handling                                  */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-/*****************************************************************************/
-/* Local variables                                                           */
-/*****************************************************************************/
-
-static SFILE_COMPACT_CALLBACK CompactCB = NULL;
-static ULONGLONG CompactBytesProcessed = 0;
-static ULONGLONG CompactTotalBytes = 0;
-static void * pvUserData = NULL;
-
-/*****************************************************************************/
-/* Local functions                                                           */
-/*****************************************************************************/
-
-static int CheckIfAllFilesKnown(TMPQArchive * ha, const char * szListFile, LPDWORD pFileKeys)
-{
-    TFileEntry * pFileTableEnd;
-    TFileEntry * pFileEntry;
-    DWORD dwBlockIndex = 0;
-    int nError = ERROR_SUCCESS;
-
-    // Add the listfile to the MPQ
-    if(nError == ERROR_SUCCESS && szListFile != NULL)
-    {
-        // Notify the user
-        if(CompactCB != NULL)
-            CompactCB(pvUserData, CCB_CHECKING_FILES, CompactBytesProcessed, CompactTotalBytes);
-
-        nError = SFileAddListFile((HANDLE)ha, szListFile);
-    }
-
-    // Verify the file table
-    if(nError == ERROR_SUCCESS)
-    {
-        pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-        for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++, dwBlockIndex++)
-        {
-            if(pFileEntry->dwFlags & MPQ_FILE_EXISTS)
-            {
-                if(pFileEntry->szFileName != NULL && !IsPseudoFileName(pFileEntry->szFileName, NULL))
-                {
-                    DWORD dwFileKey = 0;
-
-                    // Resolve the file key. Use plain file name for it
-                    if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
-                    {
-                        dwFileKey = DecryptFileKey(pFileEntry->szFileName,
-                                                   pFileEntry->ByteOffset,
-                                                   pFileEntry->dwFileSize,
-                                                   pFileEntry->dwFlags);
-                    }
-
-                    // Give the key to the caller
-                    if(pFileKeys != NULL)
-                        pFileKeys[dwBlockIndex] = dwFileKey;
-                }
-                else
-                {
-                    nError = ERROR_CAN_NOT_COMPLETE;
-                    break;
-                }
-            }
-        }
-    }
-
-    return nError;
-}
-
-static int CopyNonMpqData(
-        TFileStream * pSrcStream,
-        TFileStream * pTrgStream,
-        ULONGLONG & ByteOffset,
-        ULONGLONG & ByteCount)
-{
-    ULONGLONG DataSize = ByteCount;
-    DWORD dwToRead;
-    char DataBuffer[0x1000];
-    int nError = ERROR_SUCCESS;
-
-    // Copy the data
-    while(DataSize > 0)
-    {
-        // Get the proper size of data
-        dwToRead = sizeof(DataBuffer);
-        if(DataSize < dwToRead)
-            dwToRead = (DWORD)DataSize;
-
-        // Read from the source stream
-        if(!FileStream_Read(pSrcStream, &ByteOffset, DataBuffer, dwToRead))
-        {
-            nError = GetLastError();
-            break;
-        }
-
-        // Write to the target stream
-        if(!FileStream_Write(pTrgStream, NULL, DataBuffer, dwToRead))
-        {
-            nError = GetLastError();
-            break;
-        }
-
-        // Update the progress
-        if(CompactCB != NULL)
-        {
-            CompactBytesProcessed += dwToRead;
-            CompactCB(pvUserData, CCB_COPYING_NON_MPQ_DATA, CompactBytesProcessed, CompactTotalBytes);
-        }
-
-        // Decrement the number of data to be copied
-        ByteOffset += dwToRead;
-        DataSize -= dwToRead;
-    }
-
-    return ERROR_SUCCESS;
-}
-
-// Copies all file sectors into another archive.
-static int CopyMpqFileSectors(
-        TMPQArchive * ha,
-        TMPQFile * hf,
-        TFileStream * pNewStream)
-{
-    TFileEntry * pFileEntry = hf->pFileEntry;
-    ULONGLONG RawFilePos;               // Used for calculating sector offset in the old MPQ archive
-    ULONGLONG MpqFilePos;               // MPQ file position in the new archive
-    DWORD dwBytesToCopy = pFileEntry->dwCmpSize;
-    DWORD dwPatchSize = 0;              // Size of patch header
-    DWORD dwFileKey1 = 0;               // File key used for decryption
-    DWORD dwFileKey2 = 0;               // File key used for encryption
-    DWORD dwCmpSize = 0;                // Compressed file size, including patch header
-    int nError = ERROR_SUCCESS;
-
-    // Remember the position in the destination file
-    FileStream_GetPos(pNewStream, &MpqFilePos);
-    MpqFilePos -= ha->MpqPos;
-
-    // Resolve decryption keys. Note that the file key given
-    // in the TMPQFile structure also includes the key adjustment
-    if(nError == ERROR_SUCCESS && (pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED))
-    {
-        dwFileKey2 = dwFileKey1 = hf->dwFileKey;
-        if(pFileEntry->dwFlags & MPQ_FILE_FIX_KEY)
-        {
-            dwFileKey2 = (dwFileKey1 ^ pFileEntry->dwFileSize) - (DWORD)pFileEntry->ByteOffset;
-            dwFileKey2 = (dwFileKey2 + (DWORD)MpqFilePos) ^ pFileEntry->dwFileSize;
-        }
-    }
-
-    // If we have to save patch header, do it
-    if(nError == ERROR_SUCCESS && hf->pPatchInfo != NULL)
-    {
-        BSWAP_ARRAY32_UNSIGNED(hf->pPatchInfo, sizeof(DWORD) * 3);
-        if(!FileStream_Write(pNewStream, NULL, hf->pPatchInfo, hf->pPatchInfo->dwLength))
-            nError = GetLastError();
-
-        // Save the size of the patch info
-        dwPatchSize = hf->pPatchInfo->dwLength;
-    }
-
-    // If we have to save sector offset table, do it.
-    if(nError == ERROR_SUCCESS && hf->SectorOffsets != NULL)
-    {
-        DWORD * SectorOffsetsCopy = (DWORD *)STORM_ALLOC(BYTE, hf->SectorOffsets[0]);
-        DWORD dwSectorOffsLen = hf->SectorOffsets[0];
-
-        assert((pFileEntry->dwFlags & MPQ_FILE_SINGLE_UNIT) == 0);
-        assert(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED);
-
-        if(SectorOffsetsCopy == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-
-        // Encrypt the secondary sector offset table and write it to the target file
-        if(nError == ERROR_SUCCESS)
-        {
-            memcpy(SectorOffsetsCopy, hf->SectorOffsets, dwSectorOffsLen);
-            if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
-                EncryptMpqBlock(SectorOffsetsCopy, dwSectorOffsLen, dwFileKey2 - 1);
-
-            BSWAP_ARRAY32_UNSIGNED(SectorOffsetsCopy, dwSectorOffsLen);
-            if(!FileStream_Write(pNewStream, NULL, SectorOffsetsCopy, dwSectorOffsLen))
-                nError = GetLastError();
-
-            dwBytesToCopy -= dwSectorOffsLen;
-            dwCmpSize += dwSectorOffsLen;
-        }
-
-        // Update compact progress
-        if(CompactCB != NULL)
-        {
-            CompactBytesProcessed += dwSectorOffsLen;
-            CompactCB(pvUserData, CCB_COMPACTING_FILES, CompactBytesProcessed, CompactTotalBytes);
-        }
-
-        STORM_FREE(SectorOffsetsCopy);
-    }
-
-    // Now we have to copy all file sectors. We do it without
-    // recompression, because recompression is not necessary in this case
-    if(nError == ERROR_SUCCESS)
-    {
-        for(DWORD dwSector = 0; dwSector < hf->dwSectorCount; dwSector++)
-        {
-            DWORD dwRawDataInSector = hf->dwSectorSize;
-            DWORD dwRawByteOffset = dwSector * hf->dwSectorSize;
-
-            // Fix the raw data length if the file is compressed
-            if(hf->SectorOffsets != NULL)
-            {
-                dwRawDataInSector = hf->SectorOffsets[dwSector+1] - hf->SectorOffsets[dwSector];
-                dwRawByteOffset = hf->SectorOffsets[dwSector];
-            }
-
-            // Last sector: If there is not enough bytes remaining in the file, cut the raw size
-            if(dwRawDataInSector > dwBytesToCopy)
-                dwRawDataInSector = dwBytesToCopy;
-
-            // Calculate the raw file offset of the file sector
-            CalculateRawSectorOffset(RawFilePos, hf, dwRawByteOffset);
-
-            // Read the file sector
-            if(!FileStream_Read(ha->pStream, &RawFilePos, hf->pbFileSector, dwRawDataInSector))
-            {
-                nError = GetLastError();
-                break;
-            }
-
-            // If necessary, re-encrypt the sector
-            // Note: Recompression is not necessary here. Unlike encryption,
-            // the compression does not depend on the position of the file in MPQ.
-            if((pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED) && dwFileKey1 != dwFileKey2)
-            {
-                BSWAP_ARRAY32_UNSIGNED(hf->pbFileSector, dwRawDataInSector);
-                DecryptMpqBlock(hf->pbFileSector, dwRawDataInSector, dwFileKey1 + dwSector);
-                EncryptMpqBlock(hf->pbFileSector, dwRawDataInSector, dwFileKey2 + dwSector);
-                BSWAP_ARRAY32_UNSIGNED(hf->pbFileSector, dwRawDataInSector);
-            }
-
-            // Now write the sector back to the file
-            if(!FileStream_Write(pNewStream, NULL, hf->pbFileSector, dwRawDataInSector))
-            {
-                nError = GetLastError();
-                break;
-            }
-
-            // Update compact progress
-            if(CompactCB != NULL)
-            {
-                CompactBytesProcessed += dwRawDataInSector;
-                CompactCB(pvUserData, CCB_COMPACTING_FILES, CompactBytesProcessed, CompactTotalBytes);
-            }
-
-            // Adjust byte counts
-            dwBytesToCopy -= dwRawDataInSector;
-            dwCmpSize += dwRawDataInSector;
-        }
-    }
-
-    // Copy the sector CRCs, if any
-    // Sector CRCs are always compressed (not imploded) and unencrypted
-    if(nError == ERROR_SUCCESS && hf->SectorOffsets != NULL && hf->SectorChksums != NULL)
-    {
-        DWORD dwCrcLength;
-
-        dwCrcLength = hf->SectorOffsets[hf->dwSectorCount + 1] - hf->SectorOffsets[hf->dwSectorCount];
-        if(dwCrcLength != 0)
-        {
-            if(!FileStream_Read(ha->pStream, NULL, hf->SectorChksums, dwCrcLength))
-                nError = GetLastError();
-
-            if(!FileStream_Write(pNewStream, NULL, hf->SectorChksums, dwCrcLength))
-                nError = GetLastError();
-
-            // Update compact progress
-            if(CompactCB != NULL)
-            {
-                CompactBytesProcessed += dwCrcLength;
-                CompactCB(pvUserData, CCB_COMPACTING_FILES, CompactBytesProcessed, CompactTotalBytes);
-            }
-
-            // Size of the CRC block is also included in the compressed file size
-            dwBytesToCopy -= dwCrcLength;
-            dwCmpSize += dwCrcLength;
-        }
-    }
-
-    // There might be extra data beyond sector checksum table
-    // Sometimes, these data are even part of sector offset table
-    // Examples:
-    // 2012 - WoW\15354\locale-enGB.MPQ:DBFilesClient\SpellLevels.dbc
-    // 2012 - WoW\15354\locale-enGB.MPQ:Interface\AddOns\Blizzard_AuctionUI\Blizzard_AuctionUI.xml
-    if(nError == ERROR_SUCCESS && dwBytesToCopy != 0)
-    {
-        LPBYTE pbExtraData;
-
-        // Allocate space for the extra data
-        pbExtraData = STORM_ALLOC(BYTE, dwBytesToCopy);
-        if(pbExtraData != NULL)
-        {
-            if(!FileStream_Read(ha->pStream, NULL, pbExtraData, dwBytesToCopy))
-                nError = GetLastError();
-
-            if(!FileStream_Write(pNewStream, NULL, pbExtraData, dwBytesToCopy))
-                nError = GetLastError();
-
-            // Include these extra data in the compressed size
-            dwCmpSize += dwBytesToCopy;
-            dwBytesToCopy = 0;
-            STORM_FREE(pbExtraData);
-        }
-        else
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Write the MD5's of the raw file data, if needed
-    if(nError == ERROR_SUCCESS && ha->pHeader->dwRawChunkSize != 0)
-    {
-        nError = WriteMpqDataMD5(pNewStream,
-                                 ha->MpqPos + MpqFilePos,
-                                 pFileEntry->dwCmpSize,
-                                 ha->pHeader->dwRawChunkSize);
-    }
-
-    // Update file position in the block table
-    if(nError == ERROR_SUCCESS)
-    {
-        // At this point, number of bytes written should be exactly
-        // the same like the compressed file size. If it isn't,
-        // there's something wrong (an unknown archive version, MPQ protection, ...)
-        //
-        // Note: Diablo savegames have very weird layout, and the file "hero"
-        // seems to have improper compressed size. Instead of real compressed size,
-        // the "dwCmpSize" member of the block table entry contains
-        // uncompressed size of file data + size of the sector table.
-        // If we compact the archive, Diablo will refuse to load the game
-        // Seems like some sort of protection to me.
-        //
-        // Note: Some patch files in WOW patches don't count the patch header
-        // into compressed size
-        //
-
-        if(dwCmpSize <= pFileEntry->dwCmpSize && pFileEntry->dwCmpSize <= dwCmpSize + dwPatchSize)
-        {
-            // Note: DO NOT update the compressed size in the file entry, no matter how bad it is.
-            pFileEntry->ByteOffset = MpqFilePos;
-        }
-        else
-        {
-            nError = ERROR_FILE_CORRUPT;
-            assert(false);
-        }
-    }
-
-    return nError;
-}
-
-static int CopyMpqFiles(TMPQArchive * ha, LPDWORD pFileKeys, TFileStream * pNewStream)
-{
-    TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-    TFileEntry * pFileEntry;
-    TMPQFile * hf = NULL;
-    int nError = ERROR_SUCCESS;
-
-    // Walk through all files and write them to the destination MPQ archive
-    for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-    {
-        // Copy all the file sectors
-        // Only do that when the file has nonzero size
-        if((pFileEntry->dwFlags & MPQ_FILE_EXISTS) && pFileEntry->dwFileSize != 0)
-        {
-            // Allocate structure for the MPQ file
-            hf = CreateMpqFile(ha);
-            if(hf == NULL)
-                return ERROR_NOT_ENOUGH_MEMORY;
-
-            // Store file entry
-            hf->pFileEntry = pFileEntry;
-
-            // Set the raw file position
-            hf->MpqFilePos = pFileEntry->ByteOffset;
-            hf->RawFilePos = ha->MpqPos + hf->MpqFilePos;
-
-            // Set the file decryption key
-            hf->dwFileKey = pFileKeys[pFileEntry - ha->pFileTable];
-            hf->dwDataSize = pFileEntry->dwFileSize;
-
-            // If the file is a patch file, load the patch header
-            if(pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE)
-            {
-                nError = AllocatePatchInfo(hf, true);
-                if(nError != ERROR_SUCCESS)
-                    break;
-            }
-
-            // Allocate buffers for file sector and sector offset table
-            nError = AllocateSectorBuffer(hf);
-            if(nError != ERROR_SUCCESS)
-                break;
-
-            // Also allocate sector offset table and sector checksum table
-            nError = AllocateSectorOffsets(hf, true);
-            if(nError != ERROR_SUCCESS)
-                break;
-
-            // Also load sector checksums, if any
-            if(pFileEntry->dwFlags & MPQ_FILE_SECTOR_CRC)
-            {
-                nError = AllocateSectorChecksums(hf, false);
-                if(nError != ERROR_SUCCESS)
-                    break;
-            }
-
-            // Copy all file sectors
-            nError = CopyMpqFileSectors(ha, hf, pNewStream);
-            if(nError != ERROR_SUCCESS)
-                break;
-
-            // Free buffers. This also sets "hf" to NULL.
-            FreeMPQFile(hf);
-        }
-    }
-
-    // Cleanup and exit
-    if(hf != NULL)
-        FreeMPQFile(hf);
-    return nError;
-}
-
-
-/*****************************************************************************/
-/* Public functions                                                          */
-/*****************************************************************************/
-
-bool WINAPI SFileSetCompactCallback(HANDLE /* hMpq */, SFILE_COMPACT_CALLBACK aCompactCB, void * pvData)
-{
-    CompactCB = aCompactCB;
-    pvUserData = pvData;
-    return true;
-}
-
-//-----------------------------------------------------------------------------
-// Archive compacting
-
-bool WINAPI SFileCompactArchive(HANDLE hMpq, const char * szListFile, bool /* bReserved */)
-{
-    TFileStream * pTempStream = NULL;
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    ULONGLONG ByteOffset;
-    ULONGLONG ByteCount;
-    LPDWORD pFileKeys = NULL;
-    TCHAR szTempFile[MAX_PATH] = _T("");
-    TCHAR * szTemp = NULL;
-    int nError = ERROR_SUCCESS;
-
-    // Test the valid parameters
-    if(!IsValidMpqHandle(ha))
-        nError = ERROR_INVALID_HANDLE;
-    if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
-        nError = ERROR_ACCESS_DENIED;
-
-    // If the MPQ is changed at this moment, we have to flush the archive
-    if(nError == ERROR_SUCCESS && (ha->dwFlags & MPQ_FLAG_CHANGED))
-    {
-        SFileFlushArchive(hMpq);
-    }
-
-    // Create the table with file keys
-    if(nError == ERROR_SUCCESS)
-    {
-        if((pFileKeys = STORM_ALLOC(DWORD, ha->dwFileTableSize)) != NULL)
-            memset(pFileKeys, 0, sizeof(DWORD) * ha->dwFileTableSize);
-        else
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // First of all, we have to check of we are able to decrypt all files.
-    // If not, sorry, but the archive cannot be compacted.
-    if(nError == ERROR_SUCCESS)
-    {
-        // Initialize the progress variables for compact callback
-        FileStream_GetSize(ha->pStream, &CompactTotalBytes);
-        CompactBytesProcessed = 0;
-        nError = CheckIfAllFilesKnown(ha, szListFile, pFileKeys);
-    }
-
-    // Get the temporary file name and create it
-    if(nError == ERROR_SUCCESS)
-    {
-        _tcscpy(szTempFile, FileStream_GetFileName(ha->pStream));
-        if((szTemp = _tcsrchr(szTempFile, '.')) != NULL)
-            _tcscpy(szTemp + 1, _T("mp_"));
-        else
-            _tcscat(szTempFile, _T("_"));
-
-        pTempStream = FileStream_CreateFile(szTempFile, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
-        if(pTempStream == NULL)
-            nError = GetLastError();
-    }
-
-    // Write the data before MPQ user data (if any)
-    if(nError == ERROR_SUCCESS && ha->UserDataPos != 0)
-    {
-        // Inform the application about the progress
-        if(CompactCB != NULL)
-            CompactCB(pvUserData, CCB_COPYING_NON_MPQ_DATA, CompactBytesProcessed, CompactTotalBytes);
-
-        ByteOffset = 0;
-        ByteCount = ha->UserDataPos;
-        nError = CopyNonMpqData(ha->pStream, pTempStream, ByteOffset, ByteCount);
-    }
-
-    // Write the MPQ user data (if any)
-    if(nError == ERROR_SUCCESS && ha->MpqPos > ha->UserDataPos)
-    {
-        // At this point, we assume that the user data size is equal
-        // to pUserData->dwHeaderOffs.
-        // If this assumption doesn't work, then we have an unknown version of MPQ
-        ByteOffset = ha->UserDataPos;
-        ByteCount = ha->MpqPos - ha->UserDataPos;
-
-        assert(ha->pUserData != NULL);
-        assert(ha->pUserData->dwHeaderOffs == ByteCount);
-        nError = CopyNonMpqData(ha->pStream, pTempStream, ByteOffset, ByteCount);
-    }
-
-    // Write the MPQ header
-    if(nError == ERROR_SUCCESS)
-    {
-        // Remember the header size before swapping
-        DWORD dwBytesToWrite = ha->pHeader->dwHeaderSize;
-
-        BSWAP_TMPQHEADER(ha->pHeader);
-        if(!FileStream_Write(pTempStream, NULL, ha->pHeader, dwBytesToWrite))
-            nError = GetLastError();
-        BSWAP_TMPQHEADER(ha->pHeader);
-
-        // Update the progress
-        CompactBytesProcessed += ha->pHeader->dwHeaderSize;
-    }
-
-    // Now copy all files
-    if(nError == ERROR_SUCCESS)
-    {
-        nError = CopyMpqFiles(ha, pFileKeys, pTempStream);
-        ha->dwFlags |= MPQ_FLAG_CHANGED;
-    }
-
-    // If succeeded, switch the streams
-    if(nError == ERROR_SUCCESS)
-    {
-        if(FileStream_Switch(ha->pStream, pTempStream))
-            pTempStream = NULL;
-        else
-            nError = ERROR_CAN_NOT_COMPLETE;
-    }
-
-    // If all succeeded, save the MPQ tables
-    if(nError == ERROR_SUCCESS)
-    {
-        //
-        // Note: We don't recalculate position of the MPQ tables at this point.
-        // SaveMPQTables does it automatically.
-        //
-
-        nError = SaveMPQTables(ha);
-        if(nError == ERROR_SUCCESS && CompactCB != NULL)
-        {
-            CompactBytesProcessed += (ha->pHeader->dwHashTableSize * sizeof(TMPQHash));
-            CompactBytesProcessed += (ha->pHeader->dwBlockTableSize * sizeof(TMPQBlock));
-            CompactCB(pvUserData, CCB_CLOSING_ARCHIVE, CompactBytesProcessed, CompactTotalBytes);
-        }
-    }
-
-    // Invalidate the compact callback
-    pvUserData = NULL;
-    CompactCB = NULL;
-
-    // Cleanup and return
-    if(pTempStream != NULL)
-        FileStream_Close(pTempStream);
-    if(pFileKeys != NULL)
-        STORM_FREE(pFileKeys);
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
-
-//-----------------------------------------------------------------------------
-// Changing hash table size
-
-DWORD WINAPI SFileGetMaxFileCount(HANDLE hMpq)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-
-    return ha->dwMaxFileCount;
-}
-
-bool WINAPI SFileSetMaxFileCount(HANDLE hMpq, DWORD dwMaxFileCount)
-{
-    TMPQHetTable * pOldHetTable = NULL;
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    TFileEntry * pOldFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-    TFileEntry * pOldFileTable = NULL;
-    TFileEntry * pOldFileEntry;
-    TFileEntry * pFileEntry;
-    TMPQHash * pOldHashTable = NULL;
-    DWORD dwOldHashTableSize = 0;
-    DWORD dwOldFileTableSize = 0;
-    int nError = ERROR_SUCCESS;
-
-    // Test the valid parameters
-    if(!IsValidMpqHandle(ha))
-        nError = ERROR_INVALID_HANDLE;
-    if(ha->dwFlags & MPQ_FLAG_READ_ONLY)
-        nError = ERROR_ACCESS_DENIED;
-
-    // The new limit must not be lower than the index of the last file entry in the table
-    if(nError == ERROR_SUCCESS && ha->dwFileTableSize > dwMaxFileCount)
-        nError = ERROR_DISK_FULL;
-
-    // ALL file names must be known in order to be able
-    // to rebuild hash table size
-    if(nError == ERROR_SUCCESS)
-    {
-        nError = CheckIfAllFilesKnown(ha, NULL, NULL);
-    }
-
-    // If the MPQ has a hash table, then we relocate the hash table
-    if(nError == ERROR_SUCCESS && ha->pHashTable != NULL)
-    {
-        // Save parameters for the current hash table
-        dwOldHashTableSize = ha->pHeader->dwHashTableSize;
-        pOldHashTable = ha->pHashTable;
-
-        // Allocate new hash table
-        ha->pHeader->dwHashTableSize = GetHashTableSizeForFileCount(dwMaxFileCount);
-        ha->pHashTable = STORM_ALLOC(TMPQHash, ha->pHeader->dwHashTableSize);
-        if(ha->pHashTable != NULL)
-            memset(ha->pHashTable, 0xFF, ha->pHeader->dwHashTableSize * sizeof(TMPQHash));
-        else
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // If the MPQ has HET table, allocate new one as well
-    if(nError == ERROR_SUCCESS && ha->pHetTable != NULL)
-    {
-        // Save the original HET table
-        pOldHetTable = ha->pHetTable;
-
-        // Create new one
-        ha->pHetTable = CreateHetTable(dwMaxFileCount, 0x40, true);
-        if(ha->pHetTable == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Now reallocate the file table
-    if(nError == ERROR_SUCCESS)
-    {
-        // Save the current file table
-        dwOldFileTableSize = ha->dwFileTableSize;
-        pOldFileTable = ha->pFileTable;
-
-        // Create new one
-        ha->pFileTable = STORM_ALLOC(TFileEntry, dwMaxFileCount);
-        if(ha->pFileTable != NULL)
-            memset(ha->pFileTable, 0, dwMaxFileCount * sizeof(TFileEntry));
-        else
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Now we have to build both classic hash table and HET table.
-    if(nError == ERROR_SUCCESS)
-    {
-        DWORD dwFileIndex = 0;
-        DWORD dwHashIndex = 0;
-
-        // Create new hash and HET entry for each file
-        pFileEntry = ha->pFileTable;
-        for(pOldFileEntry = pOldFileTable; pOldFileEntry < pOldFileTableEnd; pOldFileEntry++)
-        {
-            if(pOldFileEntry->dwFlags & MPQ_FILE_EXISTS)
-            {
-                // Copy the old file entry to the new one
-                memcpy(pFileEntry, pOldFileEntry, sizeof(TFileEntry));
-                assert(pFileEntry->szFileName != NULL);
-
-                // Create new entry in the hash table
-                if(ha->pHashTable != NULL)
-                {
-                    dwHashIndex = AllocateHashEntry(ha, pFileEntry);
-                    if(dwHashIndex == HASH_ENTRY_FREE)
-                    {
-                        nError = ERROR_CAN_NOT_COMPLETE;
-                        break;
-                    }
-                }
-
-                // Create new entry in the HET table, if needed
-                if(ha->pHetTable != NULL)
-                {
-                    dwHashIndex = AllocateHetEntry(ha, pFileEntry);
-                    if(dwHashIndex == HASH_ENTRY_FREE)
-                    {
-                        nError = ERROR_CAN_NOT_COMPLETE;
-                        break;
-                    }
-                }
-
-                // Move to the next file entry in the new table
-                pFileEntry++;
-                dwFileIndex++;
-            }
-        }
-    }
-
-    // Mark the archive as changed
-    // Note: We always have to rebuild the (attributes) file due to file table change
-    if(nError == ERROR_SUCCESS)
-    {
-        ha->dwMaxFileCount = dwMaxFileCount;
-        InvalidateInternalFiles(ha);
-    }
-    else
-    {
-        // Revert the hash table
-        if(ha->pHashTable != NULL && pOldHashTable != NULL)
-        {
-            STORM_FREE(ha->pHashTable);
-            ha->pHeader->dwHashTableSize = dwOldHashTableSize;
-            ha->pHashTable = pOldHashTable;
-        }
-
-        // Revert the HET table
-        if(ha->pHetTable != NULL && pOldHetTable != NULL)
-        {
-            FreeHetTable(ha->pHetTable);
-            ha->pHetTable = pOldHetTable;
-        }
-
-        // Revert the file table
-        if(pOldFileTable != NULL)
-        {
-            STORM_FREE(ha->pFileTable);
-            ha->pFileTable = pOldFileTable;
-        }
-
-        SetLastError(nError);
-    }
-
-    // Return the result
-    return (nError == ERROR_SUCCESS);
-}
diff --git a/dep/StormLibOld/src/SFileCreateArchive.cpp b/dep/StormLibOld/src/SFileCreateArchive.cpp
deleted file mode 100644
index 3ce0c02b5..000000000
--- a/dep/StormLibOld/src/SFileCreateArchive.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*****************************************************************************/
-/* SFileCreateArchive.cpp                 Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* MPQ Editing functions                                                     */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 24.03.03  1.00  Lad  Splitted from SFileOpenArchive.cpp                   */
-/* 08.06.10  1.00  Lad  Renamed to SFileCreateArchive.cpp                    */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-//-----------------------------------------------------------------------------
-// Local variables
-
-static const DWORD MpqHeaderSizes[] =
-{
-    MPQ_HEADER_SIZE_V1,
-    MPQ_HEADER_SIZE_V2,
-    MPQ_HEADER_SIZE_V3,
-    MPQ_HEADER_SIZE_V4
-};
-
-//-----------------------------------------------------------------------------
-// Local functions
-
-static USHORT GetSectorSizeShift(DWORD dwSectorSize)
-{
-    USHORT wSectorSizeShift = 0;
-
-    while(dwSectorSize > 0x200)
-    {
-        dwSectorSize >>= 1;
-        wSectorSizeShift++;
-    }
-
-    return wSectorSizeShift;
-}
-
-static int WriteNakedMPQHeader(TMPQArchive * ha)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-    TMPQHeader Header;
-    DWORD dwBytesToWrite = pHeader->dwHeaderSize;
-    int nError = ERROR_SUCCESS;
-
-    // Prepare the naked MPQ header
-    memset(&Header, 0, sizeof(TMPQHeader));
-    Header.dwID           = pHeader->dwID;
-    Header.dwHeaderSize   = pHeader->dwHeaderSize;
-    Header.dwArchiveSize  = pHeader->dwHeaderSize;
-    Header.wFormatVersion = pHeader->wFormatVersion;
-    Header.wSectorSize    = pHeader->wSectorSize;
-
-    // Write it to the file
-    BSWAP_TMPQHEADER(&Header);
-    if(!FileStream_Write(ha->pStream, &ha->MpqPos, &Header, dwBytesToWrite))
-        nError = GetLastError();
-
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// Creates a new MPQ archive.
-
-bool WINAPI SFileCreateArchive(const TCHAR * szMpqName, DWORD dwFlags, DWORD dwMaxFileCount, HANDLE * phMpq)
-{
-    SFILE_CREATE_MPQ CreateInfo;
-
-    // Fill the create structure
-    memset(&CreateInfo, 0, sizeof(SFILE_CREATE_MPQ));
-    CreateInfo.cbSize         = sizeof(SFILE_CREATE_MPQ);
-    CreateInfo.dwMpqVersion   = (dwFlags & MPQ_CREATE_ARCHIVE_VMASK) >> FLAGS_TO_FORMAT_SHIFT;
-    CreateInfo.dwStreamFlags  = STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE;
-    CreateInfo.dwAttrFlags    = (dwFlags & MPQ_CREATE_ATTRIBUTES) ? MPQ_ATTRIBUTE_ALL : 0;
-    CreateInfo.dwSectorSize   = (CreateInfo.dwMpqVersion >= MPQ_FORMAT_VERSION_3) ? 0x4000 : 0x1000;
-    CreateInfo.dwRawChunkSize = (CreateInfo.dwMpqVersion >= MPQ_FORMAT_VERSION_4) ? 0x4000 : 0;
-    CreateInfo.dwMaxFileCount = dwMaxFileCount;
-    return SFileCreateArchive2(szMpqName, &CreateInfo, phMpq);
-}
-
-bool WINAPI SFileCreateArchive2(const TCHAR * szMpqName, PSFILE_CREATE_MPQ pCreateInfo, HANDLE * phMpq)
-{
-    TFileStream * pStream = NULL;           // File stream
-    TMPQArchive * ha = NULL;                // MPQ archive handle
-    ULONGLONG MpqPos = 0;                   // Position of MPQ header in the file
-    HANDLE hMpq = NULL;
-    DWORD dwBlockTableSize = 0;             // Initial block table size
-    DWORD dwHashTableSize = 0;
-    DWORD dwMaxFileCount;
-    int nError = ERROR_SUCCESS;
-
-    // Check the parameters, if they are valid
-    if(szMpqName == NULL || *szMpqName == 0 || pCreateInfo == NULL || phMpq == NULL)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return false;
-    }
-
-    // Verify if all variables in SFILE_CREATE_MPQ are correct
-    if((pCreateInfo->cbSize == 0 || pCreateInfo->cbSize > sizeof(SFILE_CREATE_MPQ)) ||
-            (pCreateInfo->dwMpqVersion > MPQ_FORMAT_VERSION_4)                        ||
-            (pCreateInfo->pvUserData != NULL || pCreateInfo->cbUserData != 0)            ||
-            (pCreateInfo->dwAttrFlags & ~MPQ_ATTRIBUTE_ALL)                              ||
-            (pCreateInfo->dwSectorSize & (pCreateInfo->dwSectorSize - 1))                ||
-            (pCreateInfo->dwRawChunkSize & (pCreateInfo->dwRawChunkSize - 1))            ||
-            (pCreateInfo->dwMaxFileCount < 4))
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return false;
-    }
-
-    // One time initialization of MPQ cryptography
-    InitializeMpqCryptography();
-
-    // We verify if the file already exists and if it's a MPQ archive.
-    // If yes, we won't allow to overwrite it.
-    if(SFileOpenArchive(szMpqName, 0, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE | MPQ_OPEN_NO_ATTRIBUTES | MPQ_OPEN_NO_LISTFILE, &hMpq))
-    {
-        SFileCloseArchive(hMpq);
-        SetLastError(ERROR_ALREADY_EXISTS);
-        return false;
-    }
-
-    //
-    // At this point, we have to create the archive.
-    // - If the file exists, convert it to MPQ archive.
-    // - If the file doesn't exist, create new empty file
-    //
-
-    pStream = FileStream_OpenFile(szMpqName, pCreateInfo->dwStreamFlags);
-    if(pStream == NULL)
-    {
-        pStream = FileStream_CreateFile(szMpqName, pCreateInfo->dwStreamFlags);
-        if(pStream == NULL)
-            return false;
-    }
-
-    // Increment the maximum amount of files to have space
-    // for listfile and attributes file
-    dwMaxFileCount = pCreateInfo->dwMaxFileCount;
-    if(pCreateInfo->dwAttrFlags != 0)
-        dwMaxFileCount++;
-    dwMaxFileCount++;
-
-    // If file count is not zero, initialize the hash table size
-    dwHashTableSize = GetHashTableSizeForFileCount(dwMaxFileCount);
-
-    // Retrieve the file size and round it up to 0x200 bytes
-    FileStream_GetSize(pStream, &MpqPos);
-    MpqPos = (MpqPos + 0x1FF) & (ULONGLONG)0xFFFFFFFFFFFFFE00ULL;
-    if(!FileStream_SetSize(pStream, MpqPos))
-        nError = GetLastError();
-
-#ifdef _DEBUG
-    // Debug code, used for testing StormLib
-    //  dwBlockTableSize = dwHashTableSize * 2;
-#endif
-
-    // Create the archive handle
-    if(nError == ERROR_SUCCESS)
-    {
-        if((ha = STORM_ALLOC(TMPQArchive, 1)) == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Fill the MPQ archive handle structure
-    if(nError == ERROR_SUCCESS)
-    {
-        memset(ha, 0, sizeof(TMPQArchive));
-        ha->pStream         = pStream;
-        ha->dwSectorSize    = pCreateInfo->dwSectorSize;
-        ha->UserDataPos     = MpqPos;
-        ha->MpqPos          = MpqPos;
-        ha->pHeader         = (TMPQHeader *)ha->HeaderData;
-        ha->dwMaxFileCount  = dwMaxFileCount;
-        ha->dwFileTableSize = 0;
-        ha->dwFileFlags1    = pCreateInfo->dwFileFlags1;
-        ha->dwFileFlags2    = pCreateInfo->dwFileFlags2;
-        ha->dwFlags         = 0;
-
-        // Setup the attributes
-        ha->dwAttrFlags     = pCreateInfo->dwAttrFlags;
-        pStream = NULL;
-    }
-
-    // Fill the MPQ header
-    if(nError == ERROR_SUCCESS)
-    {
-        TMPQHeader * pHeader = ha->pHeader;
-
-        // Fill the MPQ header
-        memset(pHeader, 0, sizeof(ha->HeaderData));
-        pHeader->dwID             = ID_MPQ;
-        pHeader->dwHeaderSize     = MpqHeaderSizes[pCreateInfo->dwMpqVersion];
-        pHeader->dwArchiveSize    = pHeader->dwHeaderSize + dwHashTableSize * sizeof(TMPQHash);
-        pHeader->wFormatVersion   = (USHORT)pCreateInfo->dwMpqVersion;
-        pHeader->wSectorSize      = GetSectorSizeShift(ha->dwSectorSize);
-        pHeader->dwHashTablePos   = pHeader->dwHeaderSize;
-        pHeader->dwHashTableSize  = dwHashTableSize;
-        pHeader->dwBlockTablePos  = pHeader->dwHashTablePos + dwHashTableSize * sizeof(TMPQHash);
-        pHeader->dwBlockTableSize = dwBlockTableSize;
-
-        // For MPQs version 4 and higher, we set the size of raw data block
-        // for calculating MD5
-        if(pCreateInfo->dwMpqVersion >= MPQ_FORMAT_VERSION_4)
-            pHeader->dwRawChunkSize = pCreateInfo->dwRawChunkSize;
-
-        // Write the naked MPQ header
-        nError = WriteNakedMPQHeader(ha);
-
-        // Remember that the (listfile) and (attributes) need to be saved
-        ha->dwFlags |= MPQ_FLAG_CHANGED | MPQ_FLAG_INV_LISTFILE | MPQ_FLAG_INV_ATTRIBUTES;
-    }
-
-    // Create initial HET table, if the caller required an MPQ format 3.0 or newer
-    if(nError == ERROR_SUCCESS && pCreateInfo->dwMpqVersion >= MPQ_FORMAT_VERSION_3)
-    {
-        ha->pHetTable = CreateHetTable(ha->dwMaxFileCount, 0x40, true);
-        if(ha->pHetTable == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Create initial hash table
-    if(nError == ERROR_SUCCESS)
-    {
-        nError = CreateHashTable(ha, dwHashTableSize);
-    }
-
-    // Create initial file table
-    if(nError == ERROR_SUCCESS)
-    {
-        ha->pFileTable = STORM_ALLOC(TFileEntry, ha->dwMaxFileCount);
-        if(ha->pFileTable != NULL)
-            memset(ha->pFileTable, 0x00, sizeof(TFileEntry) * ha->dwMaxFileCount);
-        else
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Cleanup : If an error, delete all buffers and return
-    if(nError != ERROR_SUCCESS)
-    {
-        FileStream_Close(pStream);
-        FreeMPQArchive(ha);
-        SetLastError(nError);
-        ha = NULL;
-    }
-
-    // Return the values
-    *phMpq = (HANDLE)ha;
-    return (nError == ERROR_SUCCESS);
-}
diff --git a/dep/StormLibOld/src/SFileExtractFile.cpp b/dep/StormLibOld/src/SFileExtractFile.cpp
deleted file mode 100644
index c8053ed4e..000000000
--- a/dep/StormLibOld/src/SFileExtractFile.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************/
-/* SFileExtractFile.cpp                   Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Simple extracting utility                                                 */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 20.06.03  1.00  Lad  The first version of SFileExtractFile.cpp            */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-bool WINAPI SFileExtractFile(HANDLE hMpq, const char * szToExtract, const TCHAR * szExtracted, DWORD dwSearchScope)
-{
-    TFileStream * pLocalFile = NULL;
-    HANDLE hMpqFile = NULL;
-    int nError = ERROR_SUCCESS;
-
-    // Open the MPQ file
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!SFileOpenFileEx(hMpq, szToExtract, dwSearchScope, &hMpqFile))
-            nError = GetLastError();
-    }
-
-    // Create the local file
-    if(nError == ERROR_SUCCESS)
-    {
-        pLocalFile = FileStream_CreateFile(szExtracted, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
-        if(pLocalFile == NULL)
-            nError = GetLastError();
-    }
-
-    // Copy the file's content
-    if(nError == ERROR_SUCCESS)
-    {
-        char  szBuffer[0x1000];
-        DWORD dwTransferred;
-
-        for(;;)
-        {
-            // dwTransferred is only set to nonzero if something has been read.
-            // nError can be ERROR_SUCCESS or ERROR_HANDLE_EOF
-            if(!SFileReadFile(hMpqFile, szBuffer, sizeof(szBuffer), &dwTransferred, NULL))
-                nError = GetLastError();
-            if(nError == ERROR_HANDLE_EOF)
-                nError = ERROR_SUCCESS;
-            if(dwTransferred == 0)
-                break;
-
-            // If something has been actually read, write it
-            if(!FileStream_Write(pLocalFile, NULL, szBuffer, dwTransferred))
-                nError = GetLastError();
-        }
-    }
-
-    // Close the files
-    if(hMpqFile != NULL)
-        SFileCloseFile(hMpqFile);
-    if(pLocalFile != NULL)
-        FileStream_Close(pLocalFile);
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
diff --git a/dep/StormLibOld/src/SFileFindFile.cpp b/dep/StormLibOld/src/SFileFindFile.cpp
deleted file mode 100644
index 952d4d016..000000000
--- a/dep/StormLibOld/src/SFileFindFile.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-/*****************************************************************************/
-/* SFileFindFile.cpp                      Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* A module for file searching within MPQs                                   */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 25.03.03  1.00  Lad  The first version of SFileFindFile.cpp               */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-//-----------------------------------------------------------------------------
-// Defines
-
-#define LISTFILE_CACHE_SIZE 0x1000
-
-//-----------------------------------------------------------------------------
-// Private structure used for file search (search handle)
-
-struct TMPQSearch;
-typedef int (*MPQSEARCH)(TMPQSearch *, SFILE_FIND_DATA *);
-
-// Used by searching in MPQ archives
-struct TMPQSearch
-{
-    TMPQArchive * ha;                   // Handle to MPQ, where the search runs
-    TFileEntry ** pSearchTable;         // Table for files that have been already found
-    DWORD  dwSearchTableItems;          // Number of items in the search table
-    DWORD  dwNextIndex;                 // Next file index to be checked
-    DWORD  dwFlagMask;                  // For checking flag mask
-    char   szSearchMask[1];             // Search mask (variable length)
-};
-
-//-----------------------------------------------------------------------------
-// Local functions
-
-static bool IsValidSearchHandle(TMPQSearch * hs)
-{
-    if(hs == NULL)
-        return false;
-
-    return IsValidMpqHandle(hs->ha);
-}
-
-bool CheckWildCard(const char * szString, const char * szWildCard)
-{
-    const char * szSubString;
-    int nSubStringLength;
-    int nMatchCount = 0;
-
-    // When the mask is empty, it never matches
-    if(szWildCard == NULL || *szWildCard == 0)
-        return false;
-
-    // If the wildcard contains just "*", then it always matches
-    if(szWildCard[0] == '*' && szWildCard[1] == 0)
-        return true;
-
-    // Do normal test
-    for(;;)
-    {
-        // If there is '?' in the wildcard, we skip one char
-        while(*szWildCard == '?')
-        {
-            szWildCard++;
-            szString++;
-        }
-
-        // If there is '*', means zero or more chars. We have to
-        // find the sequence after '*'
-        if(*szWildCard == '*')
-        {
-            // More stars is equal to one star
-            while(*szWildCard == '*' || *szWildCard == '?')
-                szWildCard++;
-
-            // If we found end of the wildcard, it's a match
-            if(*szWildCard == 0)
-                return true;
-
-            // Determine the length of the substring in szWildCard
-            szSubString = szWildCard;
-            while(*szSubString != 0 && *szSubString != '?' && *szSubString != '*')
-                szSubString++;
-            nSubStringLength = (int)(szSubString - szWildCard);
-            nMatchCount = 0;
-
-            // Now we have to find a substring in szString,
-            // that matches the substring in szWildCard
-            while(*szString != 0)
-            {
-                // Calculate match count
-                while(nMatchCount < nSubStringLength)
-                {
-                    if(toupper(szString[nMatchCount]) != toupper(szWildCard[nMatchCount]))
-                        break;
-                    if(szString[nMatchCount] == 0)
-                        break;
-                    nMatchCount++;
-                }
-
-                // If the match count has reached substring length, we found a match
-                if(nMatchCount == nSubStringLength)
-                {
-                    szWildCard += nMatchCount;
-                    szString += nMatchCount;
-                    break;
-                }
-
-                // No match, move to the next char in szString
-                nMatchCount = 0;
-                szString++;
-            }
-        }
-        else
-        {
-            // If we came to the end of the string, compare it to the wildcard
-            if(toupper(*szString) != toupper(*szWildCard))
-                return false;
-
-            // If we arrived to the end of the string, it's a match
-            if(*szString == 0)
-                return true;
-
-            // Otherwise, continue in comparing
-            szWildCard++;
-            szString++;
-        }
-    }
-}
-
-static DWORD GetSearchTableItems(TMPQArchive * ha)
-{
-    DWORD dwMergeItems = 0;
-
-    // Loop over all patches
-    while(ha != NULL)
-    {
-        // Append the number of files
-        dwMergeItems += (ha->pHetTable != NULL) ? ha->pHetTable->dwMaxFileCount
-                                                : ha->pHeader->dwBlockTableSize;
-        // Move to the patched archive
-        ha = ha->haPatch;
-    }
-
-    // Return the double size of number of items
-    return (dwMergeItems | 1);
-}
-
-static bool FileWasFoundBefore(
-        TMPQArchive * ha,
-        TMPQSearch * hs,
-        TFileEntry * pFileEntry)
-{
-    TFileEntry * pEntry;
-    char * szRealFileName = pFileEntry->szFileName;
-    DWORD dwStartIndex;
-    DWORD dwNameHash;
-    DWORD dwIndex;
-
-    if(hs->pSearchTable != NULL && szRealFileName != NULL)
-    {
-        // If we are in patch MPQ, we check if patch prefix matches
-        // and then trim the patch prefix
-        if(ha->cchPatchPrefix != 0)
-        {
-            // If the patch prefix doesn't fit, we pretend that the file
-            // was there before and it will be skipped
-            if(_strnicmp(szRealFileName, ha->szPatchPrefix, ha->cchPatchPrefix))
-                return true;
-
-            szRealFileName += ha->cchPatchPrefix;
-        }
-
-        // Calculate the hash to the table
-        dwNameHash = HashString(szRealFileName, MPQ_HASH_NAME_A);
-        dwStartIndex = dwIndex = (dwNameHash % hs->dwSearchTableItems);
-
-        // The file might have been found before
-        // only if this is not the first MPQ being searched
-        if(ha->haBase != NULL)
-        {
-            // Enumerate all entries in the search table
-            for(;;)
-            {
-                // Get the file entry at that position
-                pEntry = hs->pSearchTable[dwIndex];
-                if(pEntry == NULL)
-                    break;
-
-                if(pEntry->szFileName != NULL)
-                {
-                    // Does the name match?
-                    if(!_stricmp(pEntry->szFileName, szRealFileName))
-                        return true;
-                }
-
-                // Move to the next entry
-                dwIndex = (dwIndex + 1) % hs->dwSearchTableItems;
-                if(dwIndex == dwStartIndex)
-                    break;
-            }
-        }
-
-        // Put the entry to the table for later use
-        hs->pSearchTable[dwIndex] = pFileEntry;
-    }
-    return false;
-}
-
-static TFileEntry * FindPatchEntry(TMPQArchive * ha, TFileEntry * pFileEntry)
-{
-    TFileEntry * pPatchEntry = NULL;
-    TFileEntry * pTempEntry;
-    char szFileName[MAX_PATH];
-    LCID lcLocale = pFileEntry->lcLocale;
-
-    // Go while there are patches
-    while(ha->haPatch != NULL)
-    {
-        // Move to the patch archive
-        ha = ha->haPatch;
-
-        // Prepare the prefix for the file name
-        strcpy(szFileName, ha->szPatchPrefix);
-        strcat(szFileName, pFileEntry->szFileName);
-
-        // Try to find the file there
-        pTempEntry = GetFileEntryExact(ha, szFileName, lcLocale);
-        if(pTempEntry != NULL)
-            pPatchEntry = pTempEntry;
-    }
-
-    // Return the found patch entry
-    return pPatchEntry;
-}
-
-// Performs one MPQ search
-static int DoMPQSearch(TMPQSearch * hs, SFILE_FIND_DATA * lpFindFileData)
-{
-    TMPQArchive * ha = hs->ha;
-    TFileEntry * pFileTableEnd;
-    TFileEntry * pPatchEntry;
-    TFileEntry * pFileEntry;
-    const char * szFileName;
-    HANDLE hFile;
-    char szPseudoName[20];
-    DWORD dwBlockIndex;
-    size_t nPrefixLength;
-
-    // Start searching with base MPQ
-    while(ha != NULL)
-    {
-        // Now parse the file entry table in order to get all files.
-        pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-        pFileEntry = ha->pFileTable + hs->dwNextIndex;
-
-        // Get the length of the patch prefix (0 if none)
-        nPrefixLength = strlen(ha->szPatchPrefix);
-
-        // Parse the file table
-        while(pFileEntry < pFileTableEnd)
-        {
-            // Increment the next index for subsequent search
-            hs->dwNextIndex++;
-
-            // Is it a file and not a patch file?
-            if((pFileEntry->dwFlags & hs->dwFlagMask) == MPQ_FILE_EXISTS)
-            {
-                // Now we have to check if this file was not enumerated before
-                if(!FileWasFoundBefore(ha, hs, pFileEntry))
-                {
-                    // Find a patch to this file
-                    pPatchEntry = FindPatchEntry(ha, pFileEntry);
-                    if(pPatchEntry == NULL)
-                        pPatchEntry = pFileEntry;
-
-                    // Prepare the block index
-                    dwBlockIndex = (DWORD)(pFileEntry - ha->pFileTable);
-
-                    // Get the file name. If it's not known, we will create pseudo-name
-                    szFileName = pFileEntry->szFileName;
-                    if(szFileName == NULL)
-                    {
-                        // Open the file by its pseudo-name.
-                        // This also generates the file name with a proper extension
-                        sprintf(szPseudoName, "File%08u.xxx", dwBlockIndex);
-                        if(SFileOpenFileEx((HANDLE)hs->ha, szPseudoName, SFILE_OPEN_FROM_MPQ, &hFile))
-                        {
-                            szFileName = (pFileEntry->szFileName != NULL) ? pFileEntry->szFileName : szPseudoName;
-                            SFileCloseFile(hFile);
-                        }
-                    }
-
-                    // Check the file name against the wildcard
-                    if(CheckWildCard(szFileName + nPrefixLength, hs->szSearchMask))
-                    {
-                        // Fill the found entry
-                        lpFindFileData->dwHashIndex  = pPatchEntry->dwHashIndex;
-                        lpFindFileData->dwBlockIndex = dwBlockIndex;
-                        lpFindFileData->dwFileSize   = pPatchEntry->dwFileSize;
-                        lpFindFileData->dwFileFlags  = pPatchEntry->dwFlags;
-                        lpFindFileData->dwCompSize   = pPatchEntry->dwCmpSize;
-                        lpFindFileData->lcLocale     = pPatchEntry->lcLocale;
-
-                        // Fill the filetime
-                        lpFindFileData->dwFileTimeHi = (DWORD)(pPatchEntry->FileTime >> 32);
-                        lpFindFileData->dwFileTimeLo = (DWORD)(pPatchEntry->FileTime);
-
-                        // Fill the file name and plain file name
-                        strcpy(lpFindFileData->cFileName, szFileName + nPrefixLength);
-                        lpFindFileData->szPlainName = (char *)GetPlainFileNameA(lpFindFileData->cFileName);
-                        return ERROR_SUCCESS;
-                    }
-
-                }
-            }
-
-            pFileEntry++;
-        }
-
-        // Move to the next patch in the patch chain
-        hs->ha = ha = ha->haPatch;
-        hs->dwNextIndex = 0;
-    }
-
-    // No more files found, return error
-    return ERROR_NO_MORE_FILES;
-}
-
-static void FreeMPQSearch(TMPQSearch *& hs)
-{
-    if(hs != NULL)
-    {
-        if(hs->pSearchTable != NULL)
-            STORM_FREE(hs->pSearchTable);
-        STORM_FREE(hs);
-        hs = NULL;
-    }
-}
-
-//-----------------------------------------------------------------------------
-// Public functions
-
-HANDLE WINAPI SFileFindFirstFile(HANDLE hMpq, const char * szMask, SFILE_FIND_DATA * lpFindFileData, const char * szListFile)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    TMPQSearch * hs = NULL;
-    size_t nSize  = 0;
-    int nError = ERROR_SUCCESS;
-
-    // Check for the valid parameters
-    if(!IsValidMpqHandle(ha))
-        nError = ERROR_INVALID_HANDLE;
-    if(szMask == NULL || lpFindFileData == NULL)
-        nError = ERROR_INVALID_PARAMETER;
-
-    // Include the listfile into the MPQ's internal listfile
-    // Note that if the listfile name is NULL, do nothing because the
-    // internal listfile is always included.
-    if(nError == ERROR_SUCCESS && szListFile != NULL && *szListFile != 0)
-        nError = SFileAddListFile((HANDLE)ha, szListFile);
-
-    // Allocate the structure for MPQ search
-    if(nError == ERROR_SUCCESS)
-    {
-        nSize = sizeof(TMPQSearch) + strlen(szMask) + 1;
-        if((hs = (TMPQSearch *)STORM_ALLOC(char, nSize)) == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Perform the first search
-    if(nError == ERROR_SUCCESS)
-    {
-        memset(hs, 0, sizeof(TMPQSearch));
-        strcpy(hs->szSearchMask, szMask);
-        hs->dwFlagMask = MPQ_FILE_EXISTS;
-        hs->ha = ha;
-
-        // If the archive is patched archive, we have to create a merge table
-        // to prevent files being repeated
-        if(ha->haPatch != NULL)
-        {
-            hs->dwSearchTableItems = GetSearchTableItems(ha);
-            hs->pSearchTable = STORM_ALLOC(TFileEntry *, hs->dwSearchTableItems);
-            hs->dwFlagMask = MPQ_FILE_EXISTS | MPQ_FILE_PATCH_FILE;
-            if(hs->pSearchTable != NULL)
-                memset(hs->pSearchTable, 0, hs->dwSearchTableItems * sizeof(TFileEntry *));
-            else
-                nError = ERROR_NOT_ENOUGH_MEMORY;
-        }
-    }
-
-    // Perform first item searching
-    if(nError == ERROR_SUCCESS)
-    {
-        nError = DoMPQSearch(hs, lpFindFileData);
-    }
-
-    // Cleanup
-    if(nError != ERROR_SUCCESS)
-    {
-        FreeMPQSearch(hs);
-        SetLastError(nError);
-    }
-
-    // Return the result value
-    return (HANDLE)hs;
-}
-
-bool WINAPI SFileFindNextFile(HANDLE hFind, SFILE_FIND_DATA * lpFindFileData)
-{
-    TMPQSearch * hs = (TMPQSearch *)hFind;
-    int nError = ERROR_SUCCESS;
-
-    // Check the parameters
-    if(!IsValidSearchHandle(hs))
-        nError = ERROR_INVALID_HANDLE;
-    if(lpFindFileData == NULL)
-        nError = ERROR_INVALID_PARAMETER;
-
-    if(nError == ERROR_SUCCESS)
-        nError = DoMPQSearch(hs, lpFindFileData);
-
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
-
-bool WINAPI SFileFindClose(HANDLE hFind)
-{
-    TMPQSearch * hs = (TMPQSearch *)hFind;
-
-    // Check the parameters
-    if(!IsValidSearchHandle(hs))
-    {
-        SetLastError(ERROR_INVALID_HANDLE);
-        return false;
-    }
-
-    FreeMPQSearch(hs);
-    return true;
-}
diff --git a/dep/StormLibOld/src/SFileListFile.cpp b/dep/StormLibOld/src/SFileListFile.cpp
deleted file mode 100644
index a575c581a..000000000
--- a/dep/StormLibOld/src/SFileListFile.cpp
+++ /dev/null
@@ -1,637 +0,0 @@
-/*****************************************************************************/
-/* SListFile.cpp                          Copyright (c) Ladislav Zezula 2004 */
-/*---------------------------------------------------------------------------*/
-/* Description:                                                              */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 12.06.04  1.00  Lad  The first version of SListFile.cpp                   */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-#include <assert.h>
-
-//-----------------------------------------------------------------------------
-// Listfile entry structure
-
-#define CACHE_BUFFER_SIZE  0x1000       // Size of the cache buffer
-
-struct TListFileCache
-{
-    HANDLE  hFile;                      // Stormlib file handle
-    char  * szMask;                     // File mask
-    DWORD   dwFileSize;                 // Total size of the cached file
-    DWORD   dwFilePos;                  // Position of the cache in the file
-    BYTE  * pBegin;                     // The begin of the listfile cache
-    BYTE  * pPos;
-    BYTE  * pEnd;                       // The last character in the file cache
-
-    BYTE Buffer[CACHE_BUFFER_SIZE];     // Listfile cache itself
-};
-
-//-----------------------------------------------------------------------------
-// Local functions (cache)
-
-static bool FreeListFileCache(TListFileCache * pCache)
-{
-    // Valid parameter check
-    if(pCache == NULL)
-        return false;
-
-    // Free all allocated buffers
-    if(pCache->hFile != NULL)
-        SFileCloseFile(pCache->hFile);
-    if(pCache->szMask != NULL)
-        STORM_FREE(pCache->szMask);
-    STORM_FREE(pCache);
-    return true;
-}
-
-static TListFileCache * CreateListFileCache(HANDLE hListFile, const char * szMask)
-{
-    TListFileCache * pCache = NULL;
-    DWORD dwBytesRead = 0;
-    int nError = ERROR_SUCCESS;
-
-    // Allocate cache for one file block
-    pCache = (TListFileCache *)STORM_ALLOC(TListFileCache, 1);
-    if(pCache == NULL)
-        nError = ERROR_NOT_ENOUGH_MEMORY;
-
-    // Clear the entire structure
-    if(nError == ERROR_SUCCESS)
-    {
-        memset(pCache, 0, sizeof(TListFileCache));
-        pCache->hFile = hListFile;
-
-        // Shall we allocate a mask?
-        if(szMask != NULL)
-        {
-            pCache->szMask = STORM_ALLOC(char, strlen(szMask) + 1);
-            if(pCache->szMask != NULL)
-                strcpy(pCache->szMask, szMask);
-            else
-                nError = ERROR_NOT_ENOUGH_MEMORY;
-        }
-    }
-
-    // Initialize the file cache
-    if(nError == ERROR_SUCCESS)
-    {
-        pCache->dwFileSize = SFileGetFileSize(pCache->hFile, NULL);
-
-        // Fill the cache
-        SFileReadFile(pCache->hFile, pCache->Buffer, CACHE_BUFFER_SIZE, &dwBytesRead, NULL);
-        if(dwBytesRead == 0)
-            nError = GetLastError();
-    }
-
-    // Allocate pointers
-    if(nError == ERROR_SUCCESS)
-    {
-        pCache->pBegin =
-                pCache->pPos = &pCache->Buffer[0];
-        pCache->pEnd = pCache->pBegin + dwBytesRead;
-    }
-    else
-    {
-        FreeListFileCache(pCache);
-        SetLastError(nError);
-        pCache = NULL;
-    }
-
-    // Return the cache
-    return pCache;
-}
-
-// Reloads the cache. Returns number of characters
-// that has been loaded into the cache.
-static DWORD ReloadListFileCache(TListFileCache * pCache)
-{
-    DWORD dwBytesToRead;
-    DWORD dwBytesRead = 0;
-
-    // Only do something if the cache is empty
-    if(pCache->pPos >= pCache->pEnd)
-    {
-        //      __TryReadBlock:
-
-        // Move the file position forward
-        pCache->dwFilePos += CACHE_BUFFER_SIZE;
-        if(pCache->dwFilePos >= pCache->dwFileSize)
-            return 0;
-
-        // Get the number of bytes remaining
-        dwBytesToRead = pCache->dwFileSize - pCache->dwFilePos;
-        if(dwBytesToRead > CACHE_BUFFER_SIZE)
-            dwBytesToRead = CACHE_BUFFER_SIZE;
-
-        // Load the next data chunk to the cache
-        SFileSetFilePointer(pCache->hFile, pCache->dwFilePos, NULL, FILE_BEGIN);
-        SFileReadFile(pCache->hFile, pCache->Buffer, CACHE_BUFFER_SIZE, &dwBytesRead, NULL);
-
-        // If we didn't read anything, it might mean that the block
-        // of the file is not available (in case of partial MPQs).
-        // We stop reading the file at this point, because the rest
-        // of the listfile is unreliable
-        if(dwBytesRead == 0)
-            return 0;
-
-        // Set the buffer pointers
-        pCache->pBegin =
-                pCache->pPos = &pCache->Buffer[0];
-        pCache->pEnd = pCache->pBegin + dwBytesRead;
-    }
-
-    return dwBytesRead;
-}
-
-static size_t ReadListFileLine(TListFileCache * pCache, char * szLine, int nMaxChars)
-{
-    char * szLineBegin = szLine;
-    char * szLineEnd = szLine + nMaxChars - 1;
-    char * szExtraString = NULL;
-
-    // Skip newlines, spaces, tabs and another non-printable stuff
-    for(;;)
-    {
-        // If we need to reload the cache, do it
-        if(pCache->pPos == pCache->pEnd)
-        {
-            if(ReloadListFileCache(pCache) == 0)
-                break;
-        }
-
-        // If we found a non-whitespace character, stop
-        if(*pCache->pPos > 0x20)
-            break;
-
-        // Skip the character
-        pCache->pPos++;
-    }
-
-    // Copy the remaining characters
-    while(szLine < szLineEnd)
-    {
-        // If we need to reload the cache, do it now and resume copying
-        if(pCache->pPos == pCache->pEnd)
-        {
-            if(ReloadListFileCache(pCache) == 0)
-                break;
-        }
-
-        // If we have found a newline, stop loading
-        if(*pCache->pPos == 0x0D || *pCache->pPos == 0x0A)
-            break;
-
-        // Blizzard listfiles can also contain information about patch:
-        // Pass1\Files\MacOS\unconditional\user\Background Downloader.app\Contents\Info.plist~Patch(Data#frFR#base-frFR,1326)
-        if(*pCache->pPos == '~')
-            szExtraString = szLine;
-
-        // Copy the character
-        *szLine++ = *pCache->pPos++;
-    }
-
-    // Terminate line with zero
-    *szLine = 0;
-
-    // If there was extra string after the file name, clear it
-    if(szExtraString != NULL)
-    {
-        if(szExtraString[0] == '~' && szExtraString[1] == 'P')
-        {
-            szLine = szExtraString;
-            *szExtraString = 0;
-        }
-    }
-
-    // Return the length of the line
-    return (szLine - szLineBegin);
-}
-
-static int CompareFileNodes(const void * p1, const void * p2)
-{
-    char * szFileName1 = *(char **)p1;
-    char * szFileName2 = *(char **)p2;
-
-    return _stricmp(szFileName1, szFileName2);
-}
-
-static int WriteListFileLine(
-        TMPQFile * hf,
-        const char * szLine)
-{
-    char szNewLine[2] = {0x0D, 0x0A};
-    size_t nLength = strlen(szLine);
-    int nError;
-
-    nError = SFileAddFile_Write(hf, szLine, (DWORD)nLength, MPQ_COMPRESSION_ZLIB);
-    if(nError != ERROR_SUCCESS)
-        return nError;
-
-    return SFileAddFile_Write(hf, szNewLine, sizeof(szNewLine), MPQ_COMPRESSION_ZLIB);
-}
-
-//-----------------------------------------------------------------------------
-// Local functions (listfile nodes)
-
-// Adds a name into the list of all names. For each locale in the MPQ,
-// one entry will be created
-// If the file name is already there, does nothing.
-static int SListFileCreateNodeForAllLocales(TMPQArchive * ha, const char * szFileName)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-    TFileEntry * pFileEntry;
-    TMPQHash * pFirstHash;
-    TMPQHash * pHash;
-    bool bNameEntryCreated = false;
-
-    // If we have HET table, use that one
-    if(ha->pHetTable != NULL)
-    {
-        pFileEntry = GetFileEntryAny(ha, szFileName);
-        if(pFileEntry != NULL)
-        {
-            // Allocate file name for the file entry
-            AllocateFileName(pFileEntry, szFileName);
-            bNameEntryCreated = true;
-        }
-
-        return ERROR_SUCCESS;
-    }
-
-    // If we have hash table, we use it
-    if(bNameEntryCreated == false && ha->pHashTable != NULL)
-    {
-        // Look for the first hash table entry for the file
-        pFirstHash = pHash = GetFirstHashEntry(ha, szFileName);
-
-        // Go while we found something
-        while(pHash != NULL)
-        {
-            // Is it a valid file table index ?
-            if(pHash->dwBlockIndex < pHeader->dwBlockTableSize)
-            {
-                // Allocate file name for the file entry
-                AllocateFileName(ha->pFileTable + pHash->dwBlockIndex, szFileName);
-                bNameEntryCreated = true;
-            }
-
-            // Now find the next language version of the file
-            pHash = GetNextHashEntry(ha, pFirstHash, pHash);
-        }
-    }
-
-    return ERROR_CAN_NOT_COMPLETE;
-}
-
-// Saves the whole listfile into the MPQ.
-int SListFileSaveToMpq(TMPQArchive * ha)
-{
-    TFileEntry * pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-    TFileEntry * pFileEntry;
-    TMPQFile * hf = NULL;
-    char * szPrevItem;
-    char ** SortTable = NULL;
-    DWORD dwFileSize = 0;
-    size_t nFileNodes = 0;
-    size_t i;
-    int nError = ERROR_SUCCESS;
-
-    // Allocate the table for sorting listfile
-    SortTable = STORM_ALLOC(char*, ha->dwFileTableSize);
-    if(SortTable == NULL)
-        return ERROR_NOT_ENOUGH_MEMORY;
-
-    // Construct the sort table
-    // Note: in MPQs with multiple locale versions of the same file,
-    // this code causes adding multiple listfile entries.
-    // Since those MPQs were last time used in Starcraft,
-    // we leave it as it is.
-    for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-    {
-        // Only take existing items
-        if((pFileEntry->dwFlags & MPQ_FILE_EXISTS) && pFileEntry->szFileName != NULL)
-        {
-            // Ignore pseudo-names
-            if(!IsPseudoFileName(pFileEntry->szFileName, NULL) && !IsInternalMpqFileName(pFileEntry->szFileName))
-            {
-                SortTable[nFileNodes++] = pFileEntry->szFileName;
-            }
-        }
-    }
-
-    // Sort the table
-    qsort(SortTable, nFileNodes, sizeof(char *), CompareFileNodes);
-
-    // Now parse the table of file names again - remove duplicates
-    // and count file size.
-    if(nFileNodes != 0)
-    {
-        // Count the 0-th item
-        dwFileSize += (DWORD)strlen(SortTable[0]) + 2;
-        szPrevItem = SortTable[0];
-
-        // Count all next items
-        for(i = 1; i < nFileNodes; i++)
-        {
-            // If the item is the same like the last one, skip it
-            if(_stricmp(SortTable[i], szPrevItem))
-            {
-                dwFileSize += (DWORD)strlen(SortTable[i]) + 2;
-                szPrevItem = SortTable[i];
-            }
-        }
-
-        // Determine the flags for (listfile)
-        if(ha->dwFileFlags1 == 0)
-            ha->dwFileFlags1 = GetDefaultSpecialFileFlags(ha, dwFileSize);
-
-        // Create the listfile in the MPQ
-        nError = SFileAddFile_Init(ha, LISTFILE_NAME,
-                                   0,
-                                   dwFileSize,
-                                   LANG_NEUTRAL,
-                                   ha->dwFileFlags1 | MPQ_FILE_REPLACEEXISTING,
-                                   &hf);
-        // Add all file names
-        if(nError == ERROR_SUCCESS)
-        {
-            // Each name is followed by newline ("\x0D\x0A")
-            szPrevItem = SortTable[0];
-            nError = WriteListFileLine(hf, SortTable[0]);
-
-            // Count all next items
-            for(i = 1; i < nFileNodes; i++)
-            {
-                // If the item is the same like the last one, skip it
-                if(_stricmp(SortTable[i], szPrevItem))
-                {
-                    WriteListFileLine(hf, SortTable[i]);
-                    szPrevItem = SortTable[i];
-                }
-            }
-        }
-    }
-    else
-    {
-        // Create the listfile in the MPQ
-        dwFileSize = (DWORD)strlen(LISTFILE_NAME) + 2;
-        nError = SFileAddFile_Init(ha, LISTFILE_NAME,
-                                   0,
-                                   dwFileSize,
-                                   LANG_NEUTRAL,
-                                   MPQ_FILE_ENCRYPTED | MPQ_FILE_COMPRESS | MPQ_FILE_REPLACEEXISTING,
-                                   &hf);
-
-        // Just add "(listfile)" there
-        if(nError == ERROR_SUCCESS)
-        {
-            WriteListFileLine(hf, LISTFILE_NAME);
-        }
-    }
-
-    // Finalize the file in the MPQ
-    if(hf != NULL)
-    {
-        SFileAddFile_Finish(hf);
-    }
-
-    // Free buffers
-    if(nError == ERROR_SUCCESS)
-        ha->dwFlags &= ~MPQ_FLAG_INV_LISTFILE;
-    if(SortTable != NULL)
-        STORM_FREE(SortTable);
-    return nError;
-}
-
-static int SFileAddArbitraryListFile(
-    TMPQArchive * ha,
-    HANDLE hListFile)
-{
-    TListFileCache * pCache = NULL;
-    size_t nLength;
-    char szFileName[MAX_PATH];
-    int nError = ERROR_SUCCESS;
-
-    // Create the listfile cache for that file
-    pCache = CreateListFileCache(hListFile, NULL);
-    if(pCache == NULL)
-        nError = GetLastError();
-
-    // Load the node list. Add the node for every locale in the archive
-    if(nError == ERROR_SUCCESS)
-    {
-        while((nLength = ReadListFileLine(pCache, szFileName, sizeof(szFileName))) > 0)
-            SListFileCreateNodeForAllLocales(ha, szFileName);
-        pCache->hFile = NULL;
-    }
-
-    // Delete the cache
-    if(pCache != NULL)
-        FreeListFileCache(pCache);
-    return nError;
-}
-
-static int SFileAddExternalListFile(
-    TMPQArchive * ha,
-    HANDLE hMpq,
-    const char * szListFile)
-{
-    HANDLE hListFile;
-    int nError = ERROR_SUCCESS;
-
-    // Open the external list file
-    if(SFileOpenFileEx(hMpq, szListFile, SFILE_OPEN_LOCAL_FILE, &hListFile))
-    {
-        // Add the data from the listfile to MPQ
-        nError = SFileAddArbitraryListFile(ha, hListFile);
-        SFileCloseFile(hListFile);
-    }
-    return nError;
-}
-
-static int SFileAddInternalListFile(
-    TMPQArchive * ha,
-    HANDLE hMpq)
-{
-    TMPQArchive * haMpq = (TMPQArchive *)hMpq;
-    TMPQHash * pFirstHash;
-    TMPQHash * pHash;
-    HANDLE hListFile;
-    LCID lcSaveLocale = lcFileLocale;
-    int nError = ERROR_SUCCESS;
-
-    // If there is hash table, we need to support multiple listfiles
-    // with different locales (BrooDat.mpq)
-    if(haMpq->pHashTable != NULL)
-    {
-        pFirstHash = pHash = GetFirstHashEntry(haMpq, LISTFILE_NAME);
-        while(nError == ERROR_SUCCESS && pHash != NULL)
-        {
-            // Set the prefered locale to that from list file
-            SFileSetLocale(pHash->lcLocale);
-            if(SFileOpenFileEx(hMpq, LISTFILE_NAME, 0, &hListFile))
-            {
-                // Add the data from the listfile to MPQ
-                nError = SFileAddArbitraryListFile(ha, hListFile);
-                SFileCloseFile(hListFile);
-            }
-
-            // Restore the original locale
-            SFileSetLocale(lcSaveLocale);
-
-            // Move to the next hash
-            pHash = GetNextHashEntry(haMpq, pFirstHash, pHash);
-        }
-    }
-    else
-    {
-        // Open the external list file
-        if(SFileOpenFileEx(hMpq, LISTFILE_NAME, 0, &hListFile))
-        {
-            // Add the data from the listfile to MPQ
-            // The function also closes the listfile handle
-            nError = SFileAddArbitraryListFile(ha, hListFile);
-            SFileCloseFile(hListFile);
-        }
-    }
-
-    // Return the result of the operation
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// File functions
-
-// Adds a listfile into the MPQ archive.
-int WINAPI SFileAddListFile(HANDLE hMpq, const char * szListFile)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    int nError = ERROR_SUCCESS;
-
-    // Add the listfile for each MPQ in the patch chain
-    while(ha != NULL)
-    {
-        if(szListFile != NULL)
-            SFileAddExternalListFile(ha, hMpq, szListFile);
-        else
-            SFileAddInternalListFile(ha, hMpq);
-
-        // Also, add three special files to the listfile:
-        // (listfile) itself, (attributes) and (signature)
-        SListFileCreateNodeForAllLocales(ha, LISTFILE_NAME);
-        SListFileCreateNodeForAllLocales(ha, SIGNATURE_NAME);
-        SListFileCreateNodeForAllLocales(ha, ATTRIBUTES_NAME);
-
-        // Move to the next archive in the chain
-        ha = ha->haPatch;
-    }
-
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// Enumerating files in listfile
-
-HANDLE WINAPI SListFileFindFirstFile(HANDLE hMpq, const char * szListFile, const char * szMask, SFILE_FIND_DATA * lpFindFileData)
-{
-    TListFileCache * pCache = NULL;
-    HANDLE hListFile;
-    size_t nLength = 0;
-    DWORD dwSearchScope = SFILE_OPEN_LOCAL_FILE;
-    int nError = ERROR_SUCCESS;
-
-    // Initialize the structure with zeros
-    memset(lpFindFileData, 0, sizeof(SFILE_FIND_DATA));
-
-    // If the szListFile is NULL, it means we have to open internal listfile
-    if(szListFile == NULL)
-    {
-        // Use SFILE_OPEN_ANY_LOCALE for listfile. This will allow us to load
-        // the listfile even if there is only non-neutral version of the listfile in the MPQ
-        dwSearchScope = SFILE_OPEN_ANY_LOCALE;
-        szListFile = LISTFILE_NAME;
-    }
-
-    // Open the local/internal listfile
-    if(!SFileOpenFileEx(hMpq, szListFile, dwSearchScope, &hListFile))
-        nError = GetLastError();
-
-    // Load the listfile to cache
-    if(nError == ERROR_SUCCESS)
-    {
-        pCache = CreateListFileCache(hListFile, szMask);
-        if(pCache == NULL)
-            nError = GetLastError();
-    }
-
-    // Perform file search
-    if(nError == ERROR_SUCCESS)
-    {
-        for(;;)
-        {
-            // Read the (next) line
-            nLength = ReadListFileLine(pCache, lpFindFileData->cFileName, sizeof(lpFindFileData->cFileName));
-            if(nLength == 0)
-            {
-                nError = ERROR_NO_MORE_FILES;
-                break;
-            }
-
-            // If some mask entered, check it
-            if(CheckWildCard(lpFindFileData->cFileName, pCache->szMask))
-                break;
-        }
-    }
-
-    // Cleanup & exit
-    if(nError != ERROR_SUCCESS)
-    {
-        memset(lpFindFileData, 0, sizeof(SFILE_FIND_DATA));
-        FreeListFileCache(pCache);
-
-        SetLastError(nError);
-        pCache = NULL;
-    }
-    return (HANDLE)pCache;
-}
-
-bool WINAPI SListFileFindNextFile(HANDLE hFind, SFILE_FIND_DATA * lpFindFileData)
-{
-    TListFileCache * pCache = (TListFileCache *)hFind;
-    size_t nLength;
-    bool bResult = false;
-    int nError = ERROR_SUCCESS;
-
-    for(;;)
-    {
-        // Read the (next) line
-        nLength = ReadListFileLine(pCache, lpFindFileData->cFileName, sizeof(lpFindFileData->cFileName));
-        if(nLength == 0)
-        {
-            nError = ERROR_NO_MORE_FILES;
-            break;
-        }
-
-        // If some mask entered, check it
-        if(CheckWildCard(lpFindFileData->cFileName, pCache->szMask))
-        {
-            bResult = true;
-            break;
-        }
-    }
-
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return bResult;
-}
-
-bool WINAPI SListFileFindClose(HANDLE hFind)
-{
-    return FreeListFileCache((TListFileCache *)hFind);
-}
-
diff --git a/dep/StormLibOld/src/SFileOpenArchive.cpp b/dep/StormLibOld/src/SFileOpenArchive.cpp
deleted file mode 100644
index b44c9909c..000000000
--- a/dep/StormLibOld/src/SFileOpenArchive.cpp
+++ /dev/null
@@ -1,480 +0,0 @@
-/*****************************************************************************/
-/* SFileOpenArchive.cpp                       Copyright Ladislav Zezula 1999 */
-/*                                                                           */
-/* Author : Ladislav Zezula                                                  */
-/* E-mail : ladik@zezula.net                                                 */
-/* WWW    : www.zezula.net                                                   */
-/*---------------------------------------------------------------------------*/
-/*                       Archive functions of Storm.dll                      */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* xx.xx.xx  1.00  Lad  The first version of SFileOpenArchive.cpp            */
-/* 19.11.03  1.01  Dan  Big endian handling                                  */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-/*****************************************************************************/
-/* Local functions                                                           */
-/*****************************************************************************/
-
-static bool IsAviFile(void * pvFileBegin)
-{
-    LPDWORD AviHeader = (DWORD *)pvFileBegin;
-    DWORD DwordValue0 = BSWAP_INT32_UNSIGNED(AviHeader[0]);
-    DWORD DwordValue2 = BSWAP_INT32_UNSIGNED(AviHeader[2]);
-    DWORD DwordValue3 = BSWAP_INT32_UNSIGNED(AviHeader[3]);
-
-    // Test for 'RIFF', 'AVI ' or 'LIST'
-    return (DwordValue0 == 0x46464952 && DwordValue2 == 0x20495641 && DwordValue3 == 0x5453494C);
-}
-
-static TFileBitmap * CreateFileBitmap(TMPQArchive * ha, TMPQBitmap * pMpqBitmap, bool bFileIsComplete)
-{
-    TFileBitmap * pBitmap;
-    size_t nLength;
-
-    // Calculate the length of the bitmap in blocks and in bytes
-    nLength = (size_t)(((ha->pHeader->ArchiveSize64 - 1) / pMpqBitmap->dwBlockSize) + 1);
-    nLength = (size_t)(((nLength - 1) / 8) + 1);
-
-    // Allocate the file bitmap
-    pBitmap = (TFileBitmap *)STORM_ALLOC(BYTE, sizeof(TFileBitmap) + nLength);
-    if(pBitmap != NULL)
-    {
-        // Fill the structure
-        pBitmap->StartOffset = ha->MpqPos;
-        pBitmap->EndOffset = ha->MpqPos + ha->pHeader->ArchiveSize64;
-        pBitmap->IsComplete = bFileIsComplete ? 1 : 0;
-        pBitmap->BitmapSize = (DWORD)nLength;
-        pBitmap->BlockSize = pMpqBitmap->dwBlockSize;
-        pBitmap->Reserved = 0;
-
-        // Copy the file bitmap
-        memcpy((pBitmap + 1), (pMpqBitmap + 1), nLength);
-    }
-
-    return pBitmap;
-}
-
-// This function gets the right positions of the hash table and the block table.
-static int VerifyMpqTablePositions(TMPQArchive * ha, ULONGLONG FileSize)
-{
-    TMPQHeader * pHeader = ha->pHeader;
-    ULONGLONG ByteOffset;
-
-    // Check the begin of HET table
-    if(pHeader->HetTablePos64)
-    {
-        ByteOffset = ha->MpqPos + pHeader->HetTablePos64;
-        if(ByteOffset > FileSize)
-            return ERROR_BAD_FORMAT;
-    }
-
-    // Check the begin of BET table
-    if(pHeader->BetTablePos64)
-    {
-        ByteOffset = ha->MpqPos + pHeader->BetTablePos64;
-        if(ByteOffset > FileSize)
-            return ERROR_BAD_FORMAT;
-    }
-
-    // Check the begin of hash table
-    if(pHeader->wHashTablePosHi || pHeader->dwHashTablePos)
-    {
-        ByteOffset = ha->MpqPos + MAKE_OFFSET64(pHeader->wHashTablePosHi, pHeader->dwHashTablePos);
-        if(ByteOffset > FileSize)
-            return ERROR_BAD_FORMAT;
-    }
-
-    // Check the begin of block table
-    if(pHeader->wBlockTablePosHi || pHeader->dwBlockTablePos)
-    {
-        ByteOffset = ha->MpqPos + MAKE_OFFSET64(pHeader->wBlockTablePosHi, pHeader->dwBlockTablePos);
-        if(ByteOffset > FileSize)
-            return ERROR_BAD_FORMAT;
-    }
-
-    // Check the begin of hi-block table
-    if(pHeader->HiBlockTablePos64 != 0)
-    {
-        ByteOffset = ha->MpqPos + pHeader->HiBlockTablePos64;
-        if(ByteOffset > FileSize)
-            return ERROR_BAD_FORMAT;
-    }
-
-    // All OK.
-    return ERROR_SUCCESS;
-}
-
-
-/*****************************************************************************/
-/* Public functions                                                          */
-/*****************************************************************************/
-
-//-----------------------------------------------------------------------------
-// SFileGetLocale and SFileSetLocale
-// Set the locale for all newly opened files
-
-LCID WINAPI SFileGetLocale()
-{
-    return lcFileLocale;
-}
-
-LCID WINAPI SFileSetLocale(LCID lcNewLocale)
-{
-    lcFileLocale = lcNewLocale;
-    return lcFileLocale;
-}
-
-//-----------------------------------------------------------------------------
-// SFileOpenArchive
-//
-//   szFileName - MPQ archive file name to open
-//   dwPriority - When SFileOpenFileEx called, this contains the search priority for searched archives
-//   dwFlags    - See MPQ_OPEN_XXX in StormLib.h
-//   phMpq      - Pointer to store open archive handle
-
-bool WINAPI SFileOpenArchive(
-        const TCHAR * szMpqName,
-        DWORD dwPriority,
-        DWORD dwFlags,
-        HANDLE * phMpq)
-{
-    TFileStream * pStream = NULL;       // Open file stream
-    TMPQArchive * ha = NULL;            // Archive handle
-    TFileEntry * pFileEntry;
-    ULONGLONG FileSize = 0;             // Size of the file
-    int nError = ERROR_SUCCESS;
-
-    // Verify the parameters
-    if(szMpqName == NULL || *szMpqName == 0 || phMpq == NULL)
-        nError = ERROR_INVALID_PARAMETER;
-
-    // One time initialization of MPQ cryptography
-    InitializeMpqCryptography();
-    dwPriority = dwPriority;
-
-    // Open the MPQ archive file
-    if(nError == ERROR_SUCCESS)
-    {
-        // Initialize the stream
-        pStream = FileStream_OpenFile(szMpqName, (dwFlags & STREAM_OPTIONS_MASK));
-        if(pStream == NULL)
-            nError = GetLastError();
-    }
-
-    // Allocate the MPQhandle
-    if(nError == ERROR_SUCCESS)
-    {
-        FileStream_GetSize(pStream, &FileSize);
-        if((ha = STORM_ALLOC(TMPQArchive, 1)) == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Initialize handle structure and allocate structure for MPQ header
-    if(nError == ERROR_SUCCESS)
-    {
-        memset(ha, 0, sizeof(TMPQArchive));
-        ha->pStream = pStream;
-        pStream = NULL;
-
-        // Remember if the archive is open for write
-        if(FileStream_IsReadOnly(ha->pStream))
-            ha->dwFlags |= MPQ_FLAG_READ_ONLY;
-
-        // Also remember if we shall check sector CRCs when reading file
-        if(dwFlags & MPQ_OPEN_CHECK_SECTOR_CRC)
-            ha->dwFlags |= MPQ_FLAG_CHECK_SECTOR_CRC;
-    }
-
-    // Find the offset of MPQ header within the file
-    if(nError == ERROR_SUCCESS)
-    {
-        ULONGLONG SearchPos = 0;
-        DWORD dwHeaderID;
-
-        while(SearchPos < FileSize)
-        {
-            DWORD dwBytesAvailable = MPQ_HEADER_SIZE_V4;
-
-            // Cut the bytes available, if needed
-            if((FileSize - SearchPos) < MPQ_HEADER_SIZE_V4)
-                dwBytesAvailable = (DWORD)(FileSize - SearchPos);
-
-            // Read the eventual MPQ header
-            if(!FileStream_Read(ha->pStream, &SearchPos, ha->HeaderData, dwBytesAvailable))
-            {
-                nError = GetLastError();
-                break;
-            }
-
-            // There are AVI files from Warcraft III with 'MPQ' extension.
-            if(SearchPos == 0 && IsAviFile(ha->HeaderData))
-            {
-                nError = ERROR_AVI_FILE;
-                break;
-            }
-
-            // If there is the MPQ user data signature, process it
-            dwHeaderID = BSWAP_INT32_UNSIGNED(*(LPDWORD)ha->HeaderData);
-            if(dwHeaderID == ID_MPQ_USERDATA && ha->pUserData == NULL)
-            {
-                // Ignore the MPQ user data completely if the caller wants to open the MPQ as V1.0
-                if((dwFlags & MPQ_OPEN_FORCE_MPQ_V1) == 0)
-                {
-                    // Fill the user data header
-                    ha->pUserData = &ha->UserData;
-                    memcpy(ha->pUserData, ha->HeaderData, sizeof(TMPQUserData));
-                    BSWAP_TMPQUSERDATA(ha->pUserData);
-
-                    // Remember the position of the user data and continue search
-                    ha->UserDataPos = SearchPos;
-                    SearchPos += ha->pUserData->dwHeaderOffs;
-                    continue;
-                }
-            }
-
-            // There must be MPQ header signature
-            if(dwHeaderID == ID_MPQ)
-            {
-                // Save the position where the MPQ header has been found
-                if(ha->pUserData == NULL)
-                    ha->UserDataPos = SearchPos;
-                ha->pHeader = (TMPQHeader *)ha->HeaderData;
-                ha->MpqPos = SearchPos;
-
-                // Now convert the header to version 4
-                BSWAP_TMPQHEADER(ha->pHeader);
-                nError = ConvertMpqHeaderToFormat4(ha, FileSize, dwFlags);
-                break;
-            }
-
-            // Move to the next possible offset
-            SearchPos += 0x200;
-        }
-
-        // If we haven't found MPQ header in the file, it's an error
-        if(ha->pHeader == NULL)
-            nError = ERROR_BAD_FORMAT;
-    }
-
-    // Fix table positions according to format
-    if(nError == ERROR_SUCCESS)
-    {
-        // Dump the header
-        //      DumpMpqHeader(ha->pHeader);
-
-        // W3x Map Protectors use the fact that War3's Storm.dll ignores the MPQ user data,
-        // and probably ignores the MPQ format version as well. The trick is to
-        // fake MPQ format 2, with an improper hi-word position of hash table and block table
-        // We can overcome such protectors by forcing opening the archive as MPQ v 1.0
-        if(dwFlags & MPQ_OPEN_FORCE_MPQ_V1)
-        {
-            ha->pHeader->wFormatVersion = MPQ_FORMAT_VERSION_1;
-            ha->pHeader->dwHeaderSize = MPQ_HEADER_SIZE_V1;
-            ha->dwFlags |= MPQ_FLAG_READ_ONLY;
-            ha->pUserData = NULL;
-        }
-
-        // Both MPQ_OPEN_NO_LISTFILE or MPQ_OPEN_NO_ATTRIBUTES trigger read only mode
-        if(dwFlags & (MPQ_OPEN_NO_LISTFILE | MPQ_OPEN_NO_ATTRIBUTES))
-            ha->dwFlags |= MPQ_FLAG_READ_ONLY;
-
-        // Set the size of file sector
-        ha->dwSectorSize = (0x200 << ha->pHeader->wSectorSize);
-
-        // Verify if any of the tables doesn't start beyond the end of the file
-        nError = VerifyMpqTablePositions(ha, FileSize);
-    }
-
-    // Check if the MPQ has data bitmap. If yes, we can verify if the MPQ is complete
-    if(nError == ERROR_SUCCESS && ha->pHeader->wFormatVersion >= MPQ_FORMAT_VERSION_4)
-    {
-        TFileBitmap * pBitmap;
-        bool bFileIsComplete = true;
-
-        LoadMpqDataBitmap(ha, FileSize, &bFileIsComplete);
-        if(ha->pBitmap != NULL && bFileIsComplete == false)
-        {
-            // Convert the MPQ bitmap to the file bitmap
-            pBitmap = CreateFileBitmap(ha, ha->pBitmap, bFileIsComplete);
-
-            // Set the data bitmap into the file stream for additional checks
-            FileStream_SetBitmap(ha->pStream, pBitmap);
-            ha->dwFlags |= MPQ_FLAG_READ_ONLY;
-        }
-    }
-
-    // Read the hash table. Ignore the result, as hash table is no longer required
-    // Read HET table. Ignore the result, as HET table is no longer required
-    if(nError == ERROR_SUCCESS)
-    {
-        nError = LoadAnyHashTable(ha);
-    }
-
-    // Now, build the file table. It will be built by combining
-    // the block table, BET table, hi-block table, (attributes) and (listfile).
-    if(nError == ERROR_SUCCESS)
-    {
-        nError = BuildFileTable(ha, FileSize);
-    }
-
-    // Verify the file table, if no kind of protection was detected
-    if(nError == ERROR_SUCCESS && (ha->dwFlags & MPQ_FLAG_PROTECTED) == 0)
-    {
-        TFileEntry * pFileTableEnd = ha->pFileTable + ha->pHeader->dwBlockTableSize;
-//      ULONGLONG ArchiveSize = 0;
-        ULONGLONG RawFilePos;
-
-        // Parse all file entries
-        for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-        {
-            // If that file entry is valid, check the file position
-            if(pFileEntry->dwFlags & MPQ_FILE_EXISTS)
-            {
-                // Get the 64-bit file position,
-                // relative to the begin of the file
-                RawFilePos = ha->MpqPos + pFileEntry->ByteOffset;
-
-                // Begin of the file must be within range
-                if(RawFilePos > FileSize)
-                {
-                    nError = ERROR_FILE_CORRUPT;
-                    break;
-                }
-
-                // End of the file must be within range
-                RawFilePos += pFileEntry->dwCmpSize;
-                if(RawFilePos > FileSize)
-                {
-                    nError = ERROR_FILE_CORRUPT;
-                    break;
-                }
-
-                // Also, we remember end of the file
-                //              if(RawFilePos > ArchiveSize)
-                //                  ArchiveSize = RawFilePos;
-            }
-        }
-    }
-
-    // Load the internal listfile and include it to the file table
-    if(nError == ERROR_SUCCESS && (dwFlags & MPQ_OPEN_NO_LISTFILE) == 0)
-    {
-        // Save the flags for (listfile)
-        pFileEntry = GetFileEntryLocale(ha, LISTFILE_NAME, LANG_NEUTRAL);
-        if(pFileEntry != NULL)
-            ha->dwFileFlags1 = pFileEntry->dwFlags;
-
-        // Ignore result of the operation. (listfile) is optional.
-        SFileAddListFile((HANDLE)ha, NULL);
-    }
-
-    // Load the "(attributes)" file and merge it to the file table
-    if(nError == ERROR_SUCCESS && (dwFlags & MPQ_OPEN_NO_ATTRIBUTES) == 0)
-    {
-        // Save the flags for (attributes)
-        pFileEntry = GetFileEntryLocale(ha, ATTRIBUTES_NAME, LANG_NEUTRAL);
-        if(pFileEntry != NULL)
-            ha->dwFileFlags2 = pFileEntry->dwFlags;
-
-        // Ignore result of the operation. (attributes) is optional.
-        SAttrLoadAttributes(ha);
-    }
-
-    // Cleanup and exit
-    if(nError != ERROR_SUCCESS)
-    {
-        FileStream_Close(pStream);
-        FreeMPQArchive(ha);
-        SetLastError(nError);
-        ha = NULL;
-    }
-
-    *phMpq = ha;
-    return (nError == ERROR_SUCCESS);
-}
-
-//-----------------------------------------------------------------------------
-// SFileGetArchiveBitmap
-
-bool WINAPI SFileGetArchiveBitmap(HANDLE hMpq, TFileBitmap * pBitmap, DWORD Length, LPDWORD LengthNeeded)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-
-    return FileStream_GetBitmap(ha->pStream, pBitmap, Length, LengthNeeded);
-}
-
-//-----------------------------------------------------------------------------
-// bool SFileFlushArchive(HANDLE hMpq)
-//
-// Saves all dirty data into MPQ archive.
-// Has similar effect like SFileCloseArchive, but the archive is not closed.
-// Use on clients who keep MPQ archive open even for write operations,
-// and terminating without calling SFileCloseArchive might corrupt the archive.
-//
-
-bool WINAPI SFileFlushArchive(HANDLE hMpq)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    int nResultError = ERROR_SUCCESS;
-    int nError;
-
-    // Do nothing if 'hMpq' is bad parameter
-    if(!IsValidMpqHandle(ha))
-    {
-        SetLastError(ERROR_INVALID_HANDLE);
-        return false;
-    }
-
-    // If the (listfile) has been invalidated, save it
-    if(ha->dwFlags & MPQ_FLAG_INV_LISTFILE)
-    {
-        nError = SListFileSaveToMpq(ha);
-        if(nError != ERROR_SUCCESS)
-            nResultError = nError;
-    }
-
-    // If the (attributes) has been invalidated, save it
-    if(ha->dwFlags & MPQ_FLAG_INV_ATTRIBUTES)
-    {
-        nError = SAttrFileSaveToMpq(ha);
-        if(nError != ERROR_SUCCESS)
-            nResultError = nError;
-    }
-
-    // Save HET table, BET table, hash table, block table, hi-block table
-    if(ha->dwFlags & MPQ_FLAG_CHANGED)
-    {
-        nError = SaveMPQTables(ha);
-        if(nError != ERROR_SUCCESS)
-            nResultError = nError;
-    }
-
-    // Return the error
-    if(nResultError != ERROR_SUCCESS)
-        SetLastError(nResultError);
-    return (nResultError == ERROR_SUCCESS);
-}
-
-//-----------------------------------------------------------------------------
-// bool SFileCloseArchive(HANDLE hMpq);
-//
-
-bool WINAPI SFileCloseArchive(HANDLE hMpq)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    bool bResult;
-
-    // Flush all unsaved data to the storage
-    bResult = SFileFlushArchive(hMpq);
-
-    // Free all memory used by MPQ archive
-    FreeMPQArchive(ha);
-    return bResult;
-}
-
diff --git a/dep/StormLibOld/src/SFileOpenFileEx.cpp b/dep/StormLibOld/src/SFileOpenFileEx.cpp
deleted file mode 100644
index 4d2516af4..000000000
--- a/dep/StormLibOld/src/SFileOpenFileEx.cpp
+++ /dev/null
@@ -1,469 +0,0 @@
-/*****************************************************************************/
-/* SFileOpenFileEx.cpp                    Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Description :                                                             */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* xx.xx.99  1.00  Lad  The first version of SFileOpenFileEx.cpp             */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-/*****************************************************************************/
-/* Local functions                                                           */
-/*****************************************************************************/
-
-static bool OpenLocalFile(const char * szFileName, HANDLE * phFile)
-{
-    TFileStream * pStream;
-    TMPQFile * hf = NULL;
-
-    // We have to convert the local file name to UNICODE, if needed
-#ifdef _UNICODE
-    TCHAR szFileNameT[MAX_PATH];
-    int i;
-
-    for(i = 0; szFileName[i] != 0; i++)
-        szFileNameT[i] = szFileName[i];
-    szFileNameT[i] = 0;
-    pStream = FileStream_OpenFile(szFileNameT, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
-
-#else
-    pStream = FileStream_OpenFile(szFileName, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
-#endif
-
-    if(pStream != NULL)
-    {
-        // Allocate and initialize file handle
-        hf = CreateMpqFile(NULL);
-        if(hf != NULL)
-        {
-            hf->pStream = pStream;
-            *phFile = hf;
-            return true;
-        }
-        else
-        {
-            FileStream_Close(pStream);
-            SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-        }
-    }
-    *phFile = NULL;
-    return false;
-}
-
-bool OpenPatchedFile(HANDLE hMpq, const char * szFileName, DWORD dwReserved, HANDLE * phFile)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    TMPQFile * hfPatch;                     // Pointer to patch file
-    TMPQFile * hfBase = NULL;               // Pointer to base open file
-    TMPQFile * hfLast = NULL;               // The highest file in the chain that is not patch file
-    TMPQFile * hf = NULL;
-    HANDLE hPatchFile;
-    char szPatchFileName[MAX_PATH];
-
-    // Keep this flag here for future updates
-    dwReserved = dwReserved;
-
-    // First of all, try to open the original version of the file in any of the patch chain
-    while(ha != NULL)
-    {
-        // Construct the name of the patch file
-        strcpy(szPatchFileName, ha->szPatchPrefix);
-        strcpy(&szPatchFileName[ha->cchPatchPrefix], szFileName);
-        if(SFileOpenFileEx((HANDLE)ha, szPatchFileName, SFILE_OPEN_FROM_MPQ, (HANDLE *)&hfBase))
-        {
-            // The file must be a base file, i.e. without MPQ_FILE_PATCH_FILE
-            if((hfBase->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) == 0)
-            {
-                hf = hfLast = hfBase;
-                break;
-            }
-
-            SFileCloseFile((HANDLE)hfBase);
-        }
-
-        // Move to the next file in the patch chain
-        ha = ha->haPatch;
-    }
-
-    // If we couldn't find the file in any of the patches, it doesn't exist
-    if(hf == NULL)
-    {
-        SetLastError(ERROR_FILE_NOT_FOUND);
-        return false;
-    }
-
-    // Now keep going in the patch chain and open every patch file that is there
-    for(ha = ha->haPatch; ha != NULL; ha = ha->haPatch)
-    {
-        // Construct patch file name
-        strcpy(szPatchFileName, ha->szPatchPrefix);
-        strcpy(&szPatchFileName[ha->cchPatchPrefix], szFileName);
-        if(SFileOpenFileEx((HANDLE)ha, szPatchFileName, SFILE_OPEN_FROM_MPQ, &hPatchFile))
-        {
-            // Remember the new version
-            hfPatch = (TMPQFile *)hPatchFile;
-
-            // If we encountered a full replacement of the file,
-            // we have to remember the highest full file
-            if((hfPatch->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) == 0)
-                hfLast = hfPatch;
-
-            // Set current patch to base file and move on
-            hf->hfPatchFile = hfPatch;
-            hf = hfPatch;
-        }
-    }
-
-    // Now we need to free all files that are below the highest unpatched version
-    while(hfBase != hfLast)
-    {
-        TMPQFile * hfNext = hfBase->hfPatchFile;
-
-        // Free the file below
-        hfBase->hfPatchFile = NULL;
-        FreeMPQFile(hfBase);
-
-        // Move the base to the next file
-        hfBase = hfNext;
-    }
-
-    // Give the updated base MPQ
-    if(phFile != NULL)
-        *phFile = (HANDLE)hfBase;
-    return true;
-}
-
-/*****************************************************************************/
-/* Public functions                                                          */
-/*****************************************************************************/
-
-//-----------------------------------------------------------------------------
-// SFileEnumLocales enums all locale versions within MPQ.
-// Functions fills all available language identifiers on a file into the buffer
-// pointed by plcLocales. There must be enough entries to copy the localed,
-// otherwise the function returns ERROR_INSUFFICIENT_BUFFER.
-
-int WINAPI SFileEnumLocales(
-        HANDLE hMpq,
-        const char * szFileName,
-        LCID * plcLocales,
-        LPDWORD pdwMaxLocales,
-        DWORD dwSearchScope)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    TFileEntry * pFileEntry;
-    TMPQHash * pFirstHash;
-    TMPQHash * pHash;
-    DWORD dwFileIndex = 0;
-    DWORD dwLocales = 0;
-
-    // Test the parameters
-    if(!IsValidMpqHandle(ha))
-        return ERROR_INVALID_HANDLE;
-    if(szFileName == NULL || *szFileName == 0)
-        return ERROR_INVALID_PARAMETER;
-    if(pdwMaxLocales == NULL)
-        return ERROR_INVALID_PARAMETER;
-
-    // Keep compiler happy
-    dwSearchScope = dwSearchScope;
-
-    // Parse hash table entries for all locales
-    if(!IsPseudoFileName(szFileName, &dwFileIndex))
-    {
-        // Calculate the number of locales
-        pFirstHash = pHash = GetFirstHashEntry(ha, szFileName);
-        while(pHash != NULL)
-        {
-            dwLocales++;
-            pHash = GetNextHashEntry(ha, pFirstHash, pHash);
-        }
-
-        // Test if there is enough space to copy the locales
-        if(*pdwMaxLocales < dwLocales)
-        {
-            *pdwMaxLocales = dwLocales;
-            return ERROR_INSUFFICIENT_BUFFER;
-        }
-
-        // Enum the locales
-        pFirstHash = pHash = GetFirstHashEntry(ha, szFileName);
-        while(pHash != NULL)
-        {
-            *plcLocales++ = pHash->lcLocale;
-            pHash = GetNextHashEntry(ha, pFirstHash, pHash);
-        }
-    }
-    else
-    {
-        // There must be space for 1 locale
-        if(*pdwMaxLocales < 1)
-        {
-            *pdwMaxLocales = 1;
-            return ERROR_INSUFFICIENT_BUFFER;
-        }
-
-        // For nameless access, always return 1 locale
-        pFileEntry = GetFileEntryByIndex(ha, dwFileIndex);
-        pHash = ha->pHashTable + pFileEntry->dwHashIndex;
-        *plcLocales = pHash->lcLocale;
-        dwLocales = 1;
-    }
-
-    // Give the caller the total number of found locales
-    *pdwMaxLocales = dwLocales;
-    return ERROR_SUCCESS;
-}
-
-//-----------------------------------------------------------------------------
-// SFileHasFile
-//
-//   hMpq          - Handle of opened MPQ archive
-//   szFileName    - Name of file to look for
-
-bool WINAPI SFileHasFile(HANDLE hMpq, const char * szFileName)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    TFileEntry * pFileEntry;
-    DWORD dwFlagsToCheck = MPQ_FILE_EXISTS;
-    DWORD dwFileIndex = 0;
-    char szPatchFileName[MAX_PATH];
-    bool bIsPseudoName;
-    int nError = ERROR_SUCCESS;
-
-    if(!IsValidMpqHandle(ha))
-        nError = ERROR_INVALID_HANDLE;
-    if(szFileName == NULL || *szFileName == 0)
-        nError = ERROR_INVALID_PARAMETER;
-
-    // Prepare the file opening
-    if(nError == ERROR_SUCCESS)
-    {
-        // Different processing for pseudo-names
-        bIsPseudoName = IsPseudoFileName(szFileName, &dwFileIndex);
-
-        // Walk through the MPQ and all patches
-        while(ha != NULL)
-        {
-            // Verify presence of the file
-            pFileEntry = (bIsPseudoName == false) ? GetFileEntryLocale(ha, szFileName, lcFileLocale)
-                                                  : GetFileEntryByIndex(ha, dwFileIndex);
-            // Verify the file flags
-            if(pFileEntry != NULL && (pFileEntry->dwFlags & dwFlagsToCheck) == MPQ_FILE_EXISTS)
-                return true;
-
-            // If this is patched archive, go to the patch
-            dwFlagsToCheck = MPQ_FILE_EXISTS | MPQ_FILE_PATCH_FILE;
-            ha = ha->haPatch;
-
-            // Prepare the patched file name
-            if(ha != NULL)
-            {
-                strcpy(szPatchFileName, ha->szPatchPrefix);
-                strcat(szPatchFileName, szFileName);
-                szFileName = szPatchFileName;
-            }
-        }
-
-        // Not found, sorry
-        nError = ERROR_FILE_NOT_FOUND;
-    }
-
-    // Cleanup
-    SetLastError(nError);
-    return false;
-}
-
-
-//-----------------------------------------------------------------------------
-// SFileOpenFileEx
-//
-//   hMpq          - Handle of opened MPQ archive
-//   szFileName    - Name of file to open
-//   dwSearchScope - Where to search
-//   phFile        - Pointer to store opened file handle
-
-bool WINAPI SFileOpenFileEx(HANDLE hMpq, const char * szFileName, DWORD dwSearchScope, HANDLE * phFile)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    TFileEntry  * pFileEntry = NULL;
-    TMPQFile    * hf = NULL;
-    DWORD dwFileIndex = 0;
-    bool bOpenByIndex = false;
-    int nError = ERROR_SUCCESS;
-
-    // Don't accept NULL pointer to file handle
-    if(phFile == NULL)
-        nError = ERROR_INVALID_PARAMETER;
-
-    // Prepare the file opening
-    if(nError == ERROR_SUCCESS)
-    {
-        switch(dwSearchScope)
-        {
-        case SFILE_OPEN_PATCHED_FILE:
-
-            // We want to open the updated version of the file
-            return OpenPatchedFile(hMpq, szFileName, 0, phFile);
-
-        case SFILE_OPEN_FROM_MPQ:
-
-            if(!IsValidMpqHandle(ha))
-            {
-                nError = ERROR_INVALID_HANDLE;
-                break;
-            }
-
-            if(szFileName == NULL || *szFileName == 0)
-            {
-                nError = ERROR_INVALID_PARAMETER;
-                break;
-            }
-
-            // First of all, check the name as-is
-            if(!IsPseudoFileName(szFileName, &dwFileIndex))
-            {
-                pFileEntry = GetFileEntryLocale(ha, szFileName, lcFileLocale);
-                if(pFileEntry == NULL)
-                    nError = ERROR_FILE_NOT_FOUND;
-            }
-            else
-            {
-                bOpenByIndex = true;
-                pFileEntry = GetFileEntryByIndex(ha, dwFileIndex);
-                if(pFileEntry == NULL)
-                    nError = ERROR_FILE_NOT_FOUND;
-            }
-            break;
-
-        case SFILE_OPEN_ANY_LOCALE:
-
-            // This open option is reserved for opening MPQ internal listfile.
-            // No argument validation. Tries to open file with neutral locale first,
-            // then any other available.
-            dwSearchScope = SFILE_OPEN_FROM_MPQ;
-            pFileEntry = GetFileEntryAny(ha, szFileName);
-            if(pFileEntry == NULL)
-                nError = ERROR_FILE_NOT_FOUND;
-            break;
-
-        case SFILE_OPEN_LOCAL_FILE:
-
-            if(szFileName == NULL || *szFileName == 0)
-            {
-                nError = ERROR_INVALID_PARAMETER;
-                break;
-            }
-
-            return OpenLocalFile(szFileName, phFile);
-
-        default:
-
-            // Don't accept any other value
-            nError = ERROR_INVALID_PARAMETER;
-            break;
-        }
-
-        // Quick return if something failed
-        if(nError != ERROR_SUCCESS)
-        {
-            SetLastError(nError);
-            return false;
-        }
-    }
-
-    // Test if the file was not already deleted.
-    if(nError == ERROR_SUCCESS)
-    {
-        if((pFileEntry->dwFlags & MPQ_FILE_EXISTS) == 0)
-            nError = ERROR_FILE_NOT_FOUND;
-        if(pFileEntry->dwFlags & ~MPQ_FILE_VALID_FLAGS)
-            nError = ERROR_NOT_SUPPORTED;
-    }
-
-    // Allocate file handle
-    if(nError == ERROR_SUCCESS)
-    {
-        if((hf = STORM_ALLOC(TMPQFile, 1)) == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Initialize file handle
-    if(nError == ERROR_SUCCESS)
-    {
-        memset(hf, 0, sizeof(TMPQFile));
-        hf->pFileEntry = pFileEntry;
-        hf->dwMagic = ID_MPQ_FILE;
-        hf->ha = ha;
-
-        hf->MpqFilePos   = pFileEntry->ByteOffset;
-        hf->RawFilePos   = ha->MpqPos + hf->MpqFilePos;
-        hf->dwDataSize   = pFileEntry->dwFileSize;
-
-        // If the MPQ has sector CRC enabled, enable if for the file
-        if(ha->dwFlags & MPQ_FLAG_CHECK_SECTOR_CRC)
-            hf->bCheckSectorCRCs = true;
-
-        // If we know the real file name, copy it to the file entry
-        if(bOpenByIndex == false)
-        {
-            // If there is no file name yet, allocate it
-            AllocateFileName(pFileEntry, szFileName);
-
-            // If the file is encrypted, we should detect the file key
-            if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
-            {
-                hf->dwFileKey = DecryptFileKey(szFileName,
-                                               pFileEntry->ByteOffset,
-                                               pFileEntry->dwFileSize,
-                                               pFileEntry->dwFlags);
-            }
-        }
-        else
-        {
-            // Try to auto-detect the file name
-            if(!SFileGetFileName(hf, NULL))
-                nError = GetLastError();
-        }
-    }
-
-    // If the file is actually a patch file, we have to load the patch file header
-    if(nError == ERROR_SUCCESS && pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE)
-    {
-        assert(hf->pPatchInfo == NULL);
-        nError = AllocatePatchInfo(hf, true);
-    }
-
-    // Cleanup
-    if(nError != ERROR_SUCCESS)
-    {
-        SetLastError(nError);
-        FreeMPQFile(hf);
-    }
-
-    *phFile = hf;
-    return (nError == ERROR_SUCCESS);
-}
-
-//-----------------------------------------------------------------------------
-// bool WINAPI SFileCloseFile(HANDLE hFile);
-
-bool WINAPI SFileCloseFile(HANDLE hFile)
-{
-    TMPQFile * hf = (TMPQFile *)hFile;
-
-    if(!IsValidFileHandle(hf))
-    {
-        SetLastError(ERROR_INVALID_HANDLE);
-        return false;
-    }
-
-    // Free the structure
-    FreeMPQFile(hf);
-    return true;
-}
diff --git a/dep/StormLibOld/src/SFilePatchArchives.cpp b/dep/StormLibOld/src/SFilePatchArchives.cpp
deleted file mode 100644
index fe900486c..000000000
--- a/dep/StormLibOld/src/SFilePatchArchives.cpp
+++ /dev/null
@@ -1,587 +0,0 @@
-/*****************************************************************************/
-/* SFilePatchArchives.cpp                 Copyright (c) Ladislav Zezula 2010 */
-/*---------------------------------------------------------------------------*/
-/* Description:                                                              */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 18.08.10  1.00  Lad  The first version of SFilePatchArchives.cpp          */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-//-----------------------------------------------------------------------------
-// Local structures
-
-typedef struct _BLIZZARD_BSDIFF40_FILE
-{
-    ULONGLONG Signature;
-    ULONGLONG CtrlBlockSize;
-    ULONGLONG DataBlockSize;
-    ULONGLONG NewFileSize;
-} BLIZZARD_BSDIFF40_FILE, *PBLIZZARD_BSDIFF40_FILE;
-
-//-----------------------------------------------------------------------------
-// Local functions
-
-static bool GetDefaultPatchPrefix(
-        const TCHAR * szBaseMpqName,
-        char * szBuffer)
-{
-    const TCHAR * szExtension;
-    const TCHAR * szDash;
-
-    // Ensure that both names are plain names
-    szBaseMpqName = GetPlainFileNameT(szBaseMpqName);
-
-    // Patch prefix is for the Cataclysm MPQs, whose names
-    // are like "locale-enGB.MPQ" or "speech-enGB.MPQ"
-    szExtension = _tcsrchr(szBaseMpqName, _T('.'));
-    szDash = _tcsrchr(szBaseMpqName, _T('-'));
-    strcpy(szBuffer, "Base");
-
-    // If the length of the prefix doesn't match, use default one
-    if(szExtension != NULL && szDash != NULL && (szExtension - szDash) == 5)
-    {
-        // Copy the prefix
-        szBuffer[0] = (char)szDash[1];
-        szBuffer[1] = (char)szDash[2];
-        szBuffer[2] = (char)szDash[3];
-        szBuffer[3] = (char)szDash[4];
-        szBuffer[4] = 0;
-    }
-
-    return true;
-}
-
-static void Decompress_RLE(LPBYTE pbDecompressed, DWORD cbDecompressed, LPBYTE pbCompressed, DWORD cbCompressed)
-{
-    LPBYTE pbDecompressedEnd = pbDecompressed + cbDecompressed;
-    LPBYTE pbCompressedEnd = pbCompressed + cbCompressed;
-    BYTE RepeatCount;
-    BYTE OneByte;
-
-    // Cut the initial DWORD from the compressed chunk
-    pbCompressed += sizeof(DWORD);
-    cbCompressed -= sizeof(DWORD);
-
-    // Pre-fill decompressed buffer with zeros
-    memset(pbDecompressed, 0, cbDecompressed);
-
-    // Unpack
-    while(pbCompressed < pbCompressedEnd && pbDecompressed < pbDecompressedEnd)
-    {
-        OneByte = *pbCompressed++;
-
-        // Is it a repetition byte ?
-        if(OneByte & 0x80)
-        {
-            RepeatCount = (OneByte & 0x7F) + 1;
-            for(BYTE i = 0; i < RepeatCount; i++)
-            {
-                if(pbDecompressed == pbDecompressedEnd || pbCompressed == pbCompressedEnd)
-                    break;
-
-                *pbDecompressed++ = *pbCompressed++;
-            }
-        }
-        else
-        {
-            pbDecompressed += (OneByte + 1);
-        }
-    }
-}
-
-static int LoadMpqPatch_COPY(TMPQFile * hf, TPatchHeader * pPatchHeader)
-{
-    int nError = ERROR_SUCCESS;
-
-    // Allocate space for patch header and compressed data
-    hf->pPatchHeader = (TPatchHeader *)STORM_ALLOC(BYTE, pPatchHeader->dwSizeOfPatchData);
-    if(hf->pPatchHeader == NULL)
-        nError = ERROR_NOT_ENOUGH_MEMORY;
-
-    // Load the patch data and decide if they are compressed or not
-    if(nError == ERROR_SUCCESS)
-    {
-        LPBYTE pbPatchFile = (LPBYTE)hf->pPatchHeader;
-
-        // Copy the patch header itself
-        memcpy(pbPatchFile, pPatchHeader, sizeof(TPatchHeader));
-        pbPatchFile += sizeof(TPatchHeader);
-
-        // Load the rest of the patch
-        if(!SFileReadFile((HANDLE)hf, pbPatchFile, pPatchHeader->dwSizeOfPatchData - sizeof(TPatchHeader), NULL, NULL))
-            nError = GetLastError();
-    }
-
-    return nError;
-}
-
-static int LoadMpqPatch_BSD0(TMPQFile * hf, TPatchHeader * pPatchHeader)
-{
-    LPBYTE pbDecompressed = NULL;
-    LPBYTE pbCompressed = NULL;
-    DWORD cbDecompressed = 0;
-    DWORD cbCompressed = 0;
-    DWORD dwBytesRead = 0;
-    int nError = ERROR_SUCCESS;
-
-    // Allocate space for compressed data
-    cbCompressed = pPatchHeader->dwXfrmBlockSize - SIZE_OF_XFRM_HEADER;
-    pbCompressed = STORM_ALLOC(BYTE, cbCompressed);
-    if(pbCompressed == NULL)
-        nError = ERROR_SUCCESS;
-
-    // Read the compressed patch data
-    if(nError == ERROR_SUCCESS)
-    {
-        // Load the rest of the header
-        SFileReadFile((HANDLE)hf, pbCompressed, cbCompressed, &dwBytesRead, NULL);
-        if(dwBytesRead != cbCompressed)
-            nError = ERROR_FILE_CORRUPT;
-    }
-
-    // Get the uncompressed size of the patch
-    if(nError == ERROR_SUCCESS)
-    {
-        cbDecompressed = pPatchHeader->dwSizeOfPatchData - sizeof(TPatchHeader);
-        hf->pPatchHeader = (TPatchHeader *)STORM_ALLOC(BYTE, pPatchHeader->dwSizeOfPatchData);
-        if(hf->pPatchHeader == NULL)
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-    }
-
-    // Now decompress the patch data
-    if(nError == ERROR_SUCCESS)
-    {
-        // Copy the patch header
-        memcpy(hf->pPatchHeader, pPatchHeader, sizeof(TPatchHeader));
-        pbDecompressed = (LPBYTE)hf->pPatchHeader + sizeof(TPatchHeader);
-
-        // Uncompress or copy the patch data
-        if(cbCompressed < cbDecompressed)
-        {
-            Decompress_RLE(pbDecompressed, cbDecompressed, pbCompressed, cbCompressed);
-        }
-        else
-        {
-            assert(cbCompressed == cbDecompressed);
-            memcpy(pbDecompressed, pbCompressed, cbCompressed);
-        }
-    }
-
-    // Free buffers and exit
-    if(pbCompressed != NULL)
-        STORM_FREE(pbCompressed);
-    return nError;
-}
-
-static int ApplyMpqPatch_COPY(
-        TMPQFile * hf,
-        TPatchHeader * pPatchHeader)
-{
-    LPBYTE pbNewFileData;
-    DWORD cbNewFileData;
-
-    // Allocate space for new file data
-    cbNewFileData = pPatchHeader->dwXfrmBlockSize - SIZE_OF_XFRM_HEADER;
-    pbNewFileData = STORM_ALLOC(BYTE, cbNewFileData);
-    if(pbNewFileData == NULL)
-        return ERROR_NOT_ENOUGH_MEMORY;
-
-    // Copy the patch data as-is
-    memcpy(pbNewFileData, (LPBYTE)pPatchHeader + sizeof(TPatchHeader), cbNewFileData);
-
-    // Free the old file data
-    STORM_FREE(hf->pbFileData);
-
-    // Put the new file data there
-    hf->pbFileData = pbNewFileData;
-    hf->cbFileData = cbNewFileData;
-    return ERROR_SUCCESS;
-}
-
-static int ApplyMpqPatch_BSD0(
-        TMPQFile * hf,
-        TPatchHeader * pPatchHeader)
-{
-    PBLIZZARD_BSDIFF40_FILE pBsdiff;
-    LPDWORD pCtrlBlock;
-    LPBYTE pbPatchData = (LPBYTE)pPatchHeader + sizeof(TPatchHeader);
-    LPBYTE pDataBlock;
-    LPBYTE pExtraBlock;
-    LPBYTE pbNewData = NULL;
-    LPBYTE pbOldData = (LPBYTE)hf->pbFileData;
-    DWORD dwNewOffset = 0;                          // Current position to patch
-    DWORD dwOldOffset = 0;                          // Current source position
-    DWORD dwNewSize;                                // Patched file size
-    DWORD dwOldSize = hf->cbFileData;               // File size before patch
-
-    // Get pointer to the patch header
-    // Format of BSDIFF header corresponds to original BSDIFF, which is:
-    // 0000   8 bytes   signature "BSDIFF40"
-    // 0008   8 bytes   size of the control block
-    // 0010   8 bytes   size of the data block
-    // 0018   8 bytes   new size of the patched file
-    pBsdiff = (PBLIZZARD_BSDIFF40_FILE)pbPatchData;
-    pbPatchData += sizeof(BLIZZARD_BSDIFF40_FILE);
-
-    // Get pointer to the 32-bit BSDIFF control block
-    // The control block follows immediately after the BSDIFF header
-    // and consists of three 32-bit integers
-    // 0000   4 bytes   Length to copy from the BSDIFF data block the new file
-    // 0004   4 bytes   Length to copy from the BSDIFF extra block
-    // 0008   4 bytes   Size to increment source file offset
-    pCtrlBlock = (LPDWORD)pbPatchData;
-    pbPatchData += (size_t)BSWAP_INT64_UNSIGNED(pBsdiff->CtrlBlockSize);
-
-    // Get the pointer to the data block
-    pDataBlock = (LPBYTE)pbPatchData;
-    pbPatchData += (size_t)BSWAP_INT64_UNSIGNED(pBsdiff->DataBlockSize);
-
-    // Get the pointer to the extra block
-    pExtraBlock = (LPBYTE)pbPatchData;
-    dwNewSize = (DWORD)BSWAP_INT64_UNSIGNED(pBsdiff->NewFileSize);
-
-    // Allocate new buffer
-    pbNewData = STORM_ALLOC(BYTE, dwNewSize);
-    if(pbNewData == NULL)
-        return ERROR_NOT_ENOUGH_MEMORY;
-
-    // Now patch the file
-    while(dwNewOffset < dwNewSize)
-    {
-        DWORD dwAddDataLength = BSWAP_INT32_UNSIGNED(pCtrlBlock[0]);
-        DWORD dwMovDataLength = BSWAP_INT32_UNSIGNED(pCtrlBlock[1]);
-        DWORD dwOldMoveLength = BSWAP_INT32_UNSIGNED(pCtrlBlock[2]);
-        DWORD i;
-
-        // Sanity check
-        if((dwNewOffset + dwAddDataLength) > dwNewSize)
-        {
-            STORM_FREE(pbNewData);
-            return ERROR_FILE_CORRUPT;
-        }
-
-        // Read the diff string to the target buffer
-        memcpy(pbNewData + dwNewOffset, pDataBlock, dwAddDataLength);
-        pDataBlock += dwAddDataLength;
-
-        // Now combine the patch data with the original file
-        for(i = 0; i < dwAddDataLength; i++)
-        {
-            if(dwOldOffset < dwOldSize)
-                pbNewData[dwNewOffset] = pbNewData[dwNewOffset] + pbOldData[dwOldOffset];
-
-            dwNewOffset++;
-            dwOldOffset++;
-        }
-
-        // Sanity check
-        if((dwNewOffset + dwMovDataLength) > dwNewSize)
-        {
-            STORM_FREE(pbNewData);
-            return ERROR_FILE_CORRUPT;
-        }
-
-        // Copy the data from the extra block in BSDIFF patch
-        memcpy(pbNewData + dwNewOffset, pExtraBlock, dwMovDataLength);
-        pExtraBlock += dwMovDataLength;
-        dwNewOffset += dwMovDataLength;
-
-        // Move the old offset
-        if(dwOldMoveLength & 0x80000000)
-            dwOldMoveLength = 0x80000000 - dwOldMoveLength;
-        dwOldOffset += dwOldMoveLength;
-        pCtrlBlock += 3;
-    }
-
-    // Free the old file data
-    STORM_FREE(hf->pbFileData);
-
-    // Put the new data to the fil structure
-    hf->pbFileData = pbNewData;
-    hf->cbFileData = dwNewSize;
-    return ERROR_SUCCESS;
-}
-
-
-static int LoadMpqPatch(TMPQFile * hf)
-{
-    TPatchHeader PatchHeader;
-    DWORD dwBytesRead;
-    int nError = ERROR_SUCCESS;
-
-    // Read the patch header
-    SFileReadFile((HANDLE)hf, &PatchHeader, sizeof(TPatchHeader), &dwBytesRead, NULL);
-    if(dwBytesRead != sizeof(TPatchHeader))
-        nError = ERROR_FILE_CORRUPT;
-
-    // Verify the signatures in the patch header
-    if(nError == ERROR_SUCCESS)
-    {
-        // BSWAP the entire header, if needed
-        BSWAP_ARRAY32_UNSIGNED(&PatchHeader, sizeof(DWORD) * 6);
-        PatchHeader.dwXFRM          = BSWAP_INT32_UNSIGNED(PatchHeader.dwXFRM);
-        PatchHeader.dwXfrmBlockSize = BSWAP_INT32_UNSIGNED(PatchHeader.dwXfrmBlockSize);
-        PatchHeader.dwPatchType     = BSWAP_INT32_UNSIGNED(PatchHeader.dwPatchType);
-
-        if(PatchHeader.dwSignature != 0x48435450 || PatchHeader.dwMD5 != 0x5f35444d || PatchHeader.dwXFRM != 0x4d524658)
-            nError = ERROR_FILE_CORRUPT;
-    }
-
-    // Read the patch, depending on patch type
-    if(nError == ERROR_SUCCESS)
-    {
-        switch(PatchHeader.dwPatchType)
-        {
-        case 0x59504f43:    // 'COPY'
-            nError = LoadMpqPatch_COPY(hf, &PatchHeader);
-            break;
-
-        case 0x30445342:    // 'BSD0'
-            nError = LoadMpqPatch_BSD0(hf, &PatchHeader);
-            break;
-
-        default:
-            nError = ERROR_FILE_CORRUPT;
-            break;
-        }
-    }
-
-    return nError;
-}
-
-static int ApplyMpqPatch(
-        TMPQFile * hf,
-        TPatchHeader * pPatchHeader)
-{
-    int nError = ERROR_SUCCESS;
-
-    // Verify the original file before patching
-    if(pPatchHeader->dwSizeBeforePatch != 0)
-    {
-        if(!VerifyDataBlockHash(hf->pbFileData, hf->cbFileData, pPatchHeader->md5_before_patch))
-            nError = ERROR_FILE_CORRUPT;
-    }
-
-    // Apply the patch
-    if(nError == ERROR_SUCCESS)
-    {
-        switch(pPatchHeader->dwPatchType)
-        {
-        case 0x59504f43:    // 'COPY'
-            nError = ApplyMpqPatch_COPY(hf, pPatchHeader);
-            break;
-
-        case 0x30445342:    // 'BSD0'
-            nError = ApplyMpqPatch_BSD0(hf, pPatchHeader);
-            break;
-
-        default:
-            nError = ERROR_FILE_CORRUPT;
-            break;
-        }
-    }
-
-    // Verify MD5 after patch
-    if(nError == ERROR_SUCCESS && pPatchHeader->dwSizeAfterPatch != 0)
-    {
-        // Verify the patched file
-        if(!VerifyDataBlockHash(hf->pbFileData, hf->cbFileData, pPatchHeader->md5_after_patch))
-            nError = ERROR_FILE_CORRUPT;
-    }
-
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// Public functions (StormLib internals)
-
-bool IsIncrementalPatchFile(const void * pvData, DWORD cbData, LPDWORD pdwPatchedFileSize)
-{
-    TPatchHeader * pPatchHeader = (TPatchHeader *)pvData;
-    BLIZZARD_BSDIFF40_FILE DiffFile;
-    DWORD dwPatchType;
-
-    if(cbData >= sizeof(TPatchHeader) + sizeof(BLIZZARD_BSDIFF40_FILE))
-    {
-        dwPatchType = BSWAP_INT32_UNSIGNED(pPatchHeader->dwPatchType);
-        if(dwPatchType == 0x30445342)
-        {
-            // Give the caller the patch file size
-            if(pdwPatchedFileSize != NULL)
-            {
-                Decompress_RLE((LPBYTE)&DiffFile, sizeof(BLIZZARD_BSDIFF40_FILE), (LPBYTE)(pPatchHeader + 1), sizeof(BLIZZARD_BSDIFF40_FILE));
-                DiffFile.NewFileSize = BSWAP_INT64_UNSIGNED(DiffFile.NewFileSize);
-                *pdwPatchedFileSize = (DWORD)DiffFile.NewFileSize;
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-int PatchFileData(TMPQFile * hf)
-{
-    TMPQFile * hfBase = hf;
-    int nError = ERROR_SUCCESS;
-
-    // Move to the first patch
-    hf = hf->hfPatchFile;
-
-    // Now go through all patches and patch the original data
-    while(hf != NULL)
-    {
-        // This must be true
-        assert(hf->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE);
-
-        // Make sure that the patch data is loaded
-        nError = LoadMpqPatch(hf);
-        if(nError != ERROR_SUCCESS)
-            break;
-
-        // Apply the patch
-        nError = ApplyMpqPatch(hfBase, hf->pPatchHeader);
-        if(nError != ERROR_SUCCESS)
-            break;
-
-        // Move to the next patch
-        hf = hf->hfPatchFile;
-    }
-
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// Public functions
-
-//
-// Patch prefix is the path subdirectory where the patched files are within MPQ.
-//
-// Example 1:
-// Main MPQ:  locale-enGB.MPQ
-// Patch MPQ: wow-update-12694.MPQ
-// File in main MPQ: DBFilesClient\Achievement.dbc
-// File in patch MPQ: enGB\DBFilesClient\Achievement.dbc
-// Path prefix: enGB
-//
-// Example 2:
-// Main MPQ:  expansion1.MPQ
-// Patch MPQ: wow-update-12694.MPQ
-// File in main MPQ: DBFilesClient\Achievement.dbc
-// File in patch MPQ: Base\DBFilesClient\Achievement.dbc
-// Path prefix: Base
-//
-
-bool WINAPI SFileOpenPatchArchive(
-        HANDLE hMpq,
-        const TCHAR * szPatchMpqName,
-        const char * szPatchPathPrefix,
-        DWORD dwFlags)
-{
-    TMPQArchive * haPatch;
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    HANDLE hPatchMpq = NULL;
-    char szPatchPrefixBuff[MPQ_PATCH_PREFIX_LEN];
-    int nError = ERROR_SUCCESS;
-
-    // Keep compiler happy
-    dwFlags = dwFlags;
-
-    // Verify input parameters
-    if(!IsValidMpqHandle(ha))
-        nError = ERROR_INVALID_HANDLE;
-    if(szPatchMpqName == NULL || *szPatchMpqName == 0)
-        nError = ERROR_INVALID_PARAMETER;
-
-    // If the user didn't give the patch prefix, get default one
-    if(szPatchPathPrefix != NULL)
-    {
-        // Save length of the patch prefix
-        if(strlen(szPatchPathPrefix) > MPQ_PATCH_PREFIX_LEN - 2)
-            nError = ERROR_INVALID_PARAMETER;
-    }
-
-    //
-    // We don't allow adding patches to archives that have been open for write
-    //
-    // Error scenario:
-    //
-    // 1) Open archive for writing
-    // 2) Modify or replace a file
-    // 3) Add patch archive to the opened MPQ
-    // 4) Read patched file
-    // 5) Now what ?
-    //
-
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!FileStream_IsReadOnly(ha->pStream))
-            nError = ERROR_ACCESS_DENIED;
-    }
-
-    // Open the archive like it is normal archive
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!SFileOpenArchive(szPatchMpqName, 0, MPQ_OPEN_READ_ONLY, &hPatchMpq))
-            return false;
-        haPatch = (TMPQArchive *)hPatchMpq;
-
-        // Older WoW patches (build 13914) used to have
-        // several language versions in one patch file
-        // Those patches needed to have a path prefix
-        // We can distinguish such patches by not having the (patch_metadata) file
-        if(szPatchPathPrefix == NULL)
-        {
-            if(!SFileHasFile(hPatchMpq, PATCH_METADATA_NAME))
-            {
-                GetDefaultPatchPrefix(FileStream_GetFileName(ha->pStream), szPatchPrefixBuff);
-                szPatchPathPrefix = szPatchPrefixBuff;
-            }
-        }
-
-        // Save the prefix for patch file names.
-        // Make sure that there is backslash after it
-        if(szPatchPathPrefix != NULL && *szPatchPathPrefix != 0)
-        {
-            strcpy(haPatch->szPatchPrefix, szPatchPathPrefix);
-            strcat(haPatch->szPatchPrefix, "\\");
-            haPatch->cchPatchPrefix = strlen(haPatch->szPatchPrefix);
-        }
-
-        // Now add the patch archive to the list of patches to the original MPQ
-        while(ha != NULL)
-        {
-            if(ha->haPatch == NULL)
-            {
-                haPatch->haBase = ha;
-                ha->haPatch = haPatch;
-                return true;
-            }
-
-            // Move to the next archive
-            ha = ha->haPatch;
-        }
-
-        // Should never happen
-        nError = ERROR_CAN_NOT_COMPLETE;
-    }
-
-    SetLastError(nError);
-    return false;
-}
-
-bool WINAPI SFileIsPatchedArchive(HANDLE hMpq)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-
-    // Verify input parameters
-    if(!IsValidMpqHandle(ha))
-        return false;
-
-    return (ha->haPatch != NULL);
-}
diff --git a/dep/StormLibOld/src/SFileReadFile.cpp b/dep/StormLibOld/src/SFileReadFile.cpp
deleted file mode 100644
index 741352c2c..000000000
--- a/dep/StormLibOld/src/SFileReadFile.cpp
+++ /dev/null
@@ -1,1186 +0,0 @@
-/*****************************************************************************/
-/* SFileReadFile.cpp                      Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Description :                                                             */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* xx.xx.99  1.00  Lad  The first version of SFileReadFile.cpp               */
-/* 24.03.99  1.00  Lad  Added the SFileGetFileInfo function                  */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-//-----------------------------------------------------------------------------
-// Local structures
-
-struct TFileHeader2Ext
-{
-    DWORD dwOffset00Data;               // Required data at offset 00 (32-bits)
-    DWORD dwOffset00Mask;               // Mask for data at offset 00 (32 bits). 0 = data are ignored
-    DWORD dwOffset04Data;               // Required data at offset 04 (32-bits)
-    DWORD dwOffset04Mask;               // Mask for data at offset 04 (32 bits). 0 = data are ignored
-    const char * szExt;                 // Supplied extension, if the condition is true
-};
-
-//-----------------------------------------------------------------------------
-// Local functions
-
-static void CopyFileName(char * szTarget, const TCHAR * szSource)
-{
-    while(*szSource != 0)
-        *szTarget++ = (char)*szSource++;
-    *szTarget = 0;
-}
-
-static DWORD GetMpqFileCount(TMPQArchive * ha)
-{
-    TFileEntry * pFileTableEnd;
-    TFileEntry * pFileEntry;
-    DWORD dwFileCount = 0;
-
-    // Go through all open MPQs, including patches
-    while(ha != NULL)
-    {
-        // Only count files that are not patch files
-        pFileTableEnd = ha->pFileTable + ha->dwFileTableSize;
-        for(pFileEntry = ha->pFileTable; pFileEntry < pFileTableEnd; pFileEntry++)
-        {
-            // If the file is patch file and this is not primary archive, skip it
-            // BUGBUG: This errorneously counts non-patch files that are in both
-            // base MPQ and in patches, and increases the number of files by cca 50%
-            if((pFileEntry->dwFlags & (MPQ_FILE_EXISTS | MPQ_FILE_PATCH_FILE)) == MPQ_FILE_EXISTS)
-                dwFileCount++;
-        }
-
-        // Move to the next patch archive
-        ha = ha->haPatch;
-    }
-
-    return dwFileCount;
-}
-
-static bool GetFilePatchChain(TMPQFile * hf, void * pvFileInfo, DWORD cbFileInfo, LPDWORD pcbLengthNeeded)
-{
-    TMPQFile * hfTemp;
-    TCHAR * szPatchChain = (TCHAR *)pvFileInfo;
-    TCHAR * szFileName;
-    size_t cchCharsNeeded = 1;
-    size_t nLength;
-    DWORD cbLengthNeeded;
-
-    // Check if the "hf" is a MPQ file
-    if(hf->pStream != NULL)
-    {
-        // Calculate the length needed
-        szFileName = FileStream_GetFileName(hf->pStream);
-        cchCharsNeeded += _tcslen(szFileName) + 1;
-        cbLengthNeeded = (DWORD)(cchCharsNeeded * sizeof(TCHAR));
-
-        // If we have enough space, copy the file name
-        if(cbFileInfo >= cbLengthNeeded)
-        {
-            nLength = _tcslen(szFileName) + 1;
-            memcpy(szPatchChain, szFileName, nLength * sizeof(TCHAR));
-            szPatchChain += nLength;
-
-            // Terminate the multi-string
-            *szPatchChain = 0;
-        }
-    }
-    else
-    {
-        // Calculate number of characters needed
-        for(hfTemp = hf; hfTemp != NULL; hfTemp = hfTemp->hfPatchFile)
-            cchCharsNeeded += _tcslen(FileStream_GetFileName(hfTemp->ha->pStream)) + 1;
-        cbLengthNeeded = (DWORD)(cchCharsNeeded * sizeof(TCHAR));
-
-        // If we have enough space, the copy the patch chain
-        if(cbFileInfo >= cbLengthNeeded)
-        {
-            for(hfTemp = hf; hfTemp != NULL; hfTemp = hfTemp->hfPatchFile)
-            {
-                szFileName = FileStream_GetFileName(hfTemp->ha->pStream);
-                nLength = _tcslen(szFileName) + 1;
-                memcpy(szPatchChain, szFileName, nLength * sizeof(TCHAR));
-                szPatchChain += nLength;
-            }
-
-            // Terminate the multi-string
-            *szPatchChain = 0;
-        }
-    }
-
-    // Give result length, terminate multi-string and return
-    *pcbLengthNeeded = cbLengthNeeded;
-    return true;
-}
-
-//  hf            - MPQ File handle.
-//  pbBuffer      - Pointer to target buffer to store sectors.
-//  dwByteOffset  - Position of sector in the file (relative to file begin)
-//  dwBytesToRead - Number of bytes to read. Must be multiplier of sector size.
-//  pdwBytesRead  - Stored number of bytes loaded
-static int ReadMpqSectors(TMPQFile * hf, LPBYTE pbBuffer, DWORD dwByteOffset, DWORD dwBytesToRead, LPDWORD pdwBytesRead)
-{
-    ULONGLONG RawFilePos;
-    TMPQArchive * ha = hf->ha;
-    TFileEntry * pFileEntry = hf->pFileEntry;
-    LPBYTE pbRawSector = NULL;
-    LPBYTE pbOutSector = pbBuffer;
-    LPBYTE pbInSector = pbBuffer;
-    DWORD dwRawBytesToRead;
-    DWORD dwRawSectorOffset = dwByteOffset;
-    DWORD dwSectorsToRead = dwBytesToRead / ha->dwSectorSize;
-    DWORD dwSectorIndex = dwByteOffset / ha->dwSectorSize;
-    DWORD dwSectorsDone = 0;
-    DWORD dwBytesRead = 0;
-    int nError = ERROR_SUCCESS;
-
-    // Note that dwByteOffset must be aligned to size of one sector
-    // Note that dwBytesToRead must be a multiplier of one sector size
-    // This is local function, so we won't check if that's true.
-    // Note that files stored in single units are processed by a separate function
-
-    // If there is not enough bytes remaining, cut dwBytesToRead
-    if((dwByteOffset + dwBytesToRead) > hf->dwDataSize)
-        dwBytesToRead = hf->dwDataSize - dwByteOffset;
-    dwRawBytesToRead = dwBytesToRead;
-
-    // Perform all necessary work to do with compressed files
-    if(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED)
-    {
-        // If the sector positions are not loaded yet, do it
-        if(hf->SectorOffsets == NULL)
-        {
-            nError = AllocateSectorOffsets(hf, true);
-            if(nError != ERROR_SUCCESS)
-                return nError;
-        }
-
-        // If the sector checksums are not loaded yet, load them now.
-        if(hf->SectorChksums == NULL && (pFileEntry->dwFlags & MPQ_FILE_SECTOR_CRC) && hf->bLoadedSectorCRCs == false)
-        {
-            //
-            // Sector CRCs is plain crap feature. It is almost never present,
-            // often it's empty, or the end offset of sector CRCs is zero.
-            // We only try to load sector CRCs once, and regardless if it fails
-            // or not, we won't try that again for the given file.
-            //
-
-            AllocateSectorChecksums(hf, true);
-            hf->bLoadedSectorCRCs = true;
-        }
-
-        // TODO: If the raw data MD5s are not loaded yet, load them now
-        // Only do it if the MPQ is of format 4.0
-        //      if(ha->pHeader->wFormatVersion >= MPQ_FORMAT_VERSION_4 && ha->pHeader->dwRawChunkSize != 0)
-        //      {
-        //          nError = AllocateRawMD5s(hf, true);
-        //          if(nError != ERROR_SUCCESS)
-        //              return nError;
-        //      }
-
-        // If the file is compressed, also allocate secondary buffer
-        pbInSector = pbRawSector = STORM_ALLOC(BYTE, dwBytesToRead);
-        if(pbRawSector == NULL)
-            return ERROR_NOT_ENOUGH_MEMORY;
-
-        // Assign the temporary buffer as target for read operation
-        dwRawSectorOffset = hf->SectorOffsets[dwSectorIndex];
-        dwRawBytesToRead = hf->SectorOffsets[dwSectorIndex + dwSectorsToRead] - dwRawSectorOffset;
-    }
-
-    // Calculate raw file offset where the sector(s) are stored.
-    CalculateRawSectorOffset(RawFilePos, hf, dwRawSectorOffset);
-
-    // Set file pointer and read all required sectors
-    if(!FileStream_Read(ha->pStream, &RawFilePos, pbInSector, dwRawBytesToRead))
-        return GetLastError();
-    dwBytesRead = 0;
-
-    // Now we have to decrypt and decompress all file sectors that have been loaded
-    for(DWORD i = 0; i < dwSectorsToRead; i++)
-    {
-        DWORD dwRawBytesInThisSector = ha->dwSectorSize;
-        DWORD dwBytesInThisSector = ha->dwSectorSize;
-        DWORD dwIndex = dwSectorIndex + i;
-
-        // If there is not enough bytes in the last sector,
-        // cut the number of bytes in this sector
-        if(dwRawBytesInThisSector > dwBytesToRead)
-            dwRawBytesInThisSector = dwBytesToRead;
-        if(dwBytesInThisSector > dwBytesToRead)
-            dwBytesInThisSector = dwBytesToRead;
-
-        // If the file is compressed, we have to adjust the raw sector size
-        if(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED)
-            dwRawBytesInThisSector = hf->SectorOffsets[dwIndex + 1] - hf->SectorOffsets[dwIndex];
-
-        // If the file is encrypted, we have to decrypt the sector
-        if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
-        {
-            BSWAP_ARRAY32_UNSIGNED(pbInSector, dwRawBytesInThisSector);
-
-            // If we don't know the key, try to detect it by file content
-            if(hf->dwFileKey == 0)
-            {
-                hf->dwFileKey = DetectFileKeyByContent(pbInSector, dwBytesInThisSector);
-                if(hf->dwFileKey == 0)
-                {
-                    nError = ERROR_UNKNOWN_FILE_KEY;
-                    break;
-                }
-            }
-
-            DecryptMpqBlock(pbInSector, dwRawBytesInThisSector, hf->dwFileKey + dwIndex);
-            BSWAP_ARRAY32_UNSIGNED(pbInSector, dwRawBytesInThisSector);
-        }
-
-        // If the file has sector CRC check turned on, perform it
-        if(hf->bCheckSectorCRCs && hf->SectorChksums != NULL)
-        {
-            DWORD dwAdlerExpected = hf->SectorChksums[dwIndex];
-            DWORD dwAdlerValue = 0;
-
-            // We can only check sector CRC when it's not zero
-            // Neither can we check it if it's 0xFFFFFFFF.
-            if(dwAdlerExpected != 0 && dwAdlerExpected != 0xFFFFFFFF)
-            {
-                dwAdlerValue = adler32(0, pbInSector, dwRawBytesInThisSector);
-                if(dwAdlerValue != dwAdlerExpected)
-                {
-                    nError = ERROR_CHECKSUM_ERROR;
-                    break;
-                }
-            }
-        }
-
-        // If the sector is really compressed, decompress it.
-        // WARNING : Some sectors may not be compressed, it can be determined only
-        // by comparing uncompressed and compressed size !!!
-        if(dwRawBytesInThisSector < dwBytesInThisSector)
-        {
-            int cbOutSector = dwBytesInThisSector;
-            int cbInSector = dwRawBytesInThisSector;
-            int nResult = 0;
-
-            // Is the file compressed by Blizzard's multiple compression ?
-            if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS)
-            {
-                if(ha->pHeader->wFormatVersion >= MPQ_FORMAT_VERSION_2)
-                    nResult = SCompDecompress2((char *)pbOutSector, &cbOutSector, (char *)pbInSector, cbInSector);
-                else
-                    nResult = SCompDecompress((char *)pbOutSector, &cbOutSector, (char *)pbInSector, cbInSector);
-            }
-
-            // Is the file compressed by PKWARE Data Compression Library ?
-            else if(pFileEntry->dwFlags & MPQ_FILE_IMPLODE)
-            {
-                nResult = SCompExplode((char *)pbOutSector, &cbOutSector, (char *)pbInSector, cbInSector);
-            }
-
-            // Did the decompression fail ?
-            if(nResult == 0)
-            {
-                nError = ERROR_FILE_CORRUPT;
-                break;
-            }
-        }
-        else
-        {
-            if(pbOutSector != pbInSector)
-                memcpy(pbOutSector, pbInSector, dwBytesInThisSector);
-        }
-
-        // Move pointers
-        dwBytesToRead -= dwBytesInThisSector;
-        dwByteOffset += dwBytesInThisSector;
-        dwBytesRead += dwBytesInThisSector;
-        pbOutSector += dwBytesInThisSector;
-        pbInSector += dwRawBytesInThisSector;
-        dwSectorsDone++;
-    }
-
-    // Free all used buffers
-    if(pbRawSector != NULL)
-        STORM_FREE(pbRawSector);
-
-    // Give the caller thenumber of bytes read
-    *pdwBytesRead = dwBytesRead;
-    return nError;
-}
-
-static int ReadMpqFileSingleUnit(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos, DWORD dwToRead, LPDWORD pdwBytesRead)
-{
-    ULONGLONG RawFilePos = hf->RawFilePos;
-    TMPQArchive * ha = hf->ha;
-    TFileEntry * pFileEntry = hf->pFileEntry;
-    LPBYTE pbCompressed = NULL;
-    LPBYTE pbRawData = NULL;
-    int nError = ERROR_SUCCESS;
-
-    // If the file buffer is not allocated yet, do it.
-    if(hf->pbFileSector == NULL)
-    {
-        nError = AllocateSectorBuffer(hf);
-        if(nError != ERROR_SUCCESS)
-            return nError;
-        pbRawData = hf->pbFileSector;
-    }
-
-    // If the file is a patch file, adjust raw data offset
-    if(hf->pPatchInfo != NULL)
-        RawFilePos += hf->pPatchInfo->dwLength;
-
-    // If the file sector is not loaded yet, do it
-    if(hf->dwSectorOffs != 0)
-    {
-        // Is the file compressed?
-        if(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED)
-        {
-            // Allocate space for compressed data
-            pbCompressed = STORM_ALLOC(BYTE, pFileEntry->dwCmpSize);
-            if(pbCompressed == NULL)
-                return ERROR_NOT_ENOUGH_MEMORY;
-            pbRawData = pbCompressed;
-        }
-
-        // Load the raw (compressed, encrypted) data
-        if(!FileStream_Read(ha->pStream, &RawFilePos, pbRawData, pFileEntry->dwCmpSize))
-        {
-            STORM_FREE(pbCompressed);
-            return GetLastError();
-        }
-
-        // If the file is encrypted, we have to decrypt the data first
-        if(pFileEntry->dwFlags & MPQ_FILE_ENCRYPTED)
-        {
-            BSWAP_ARRAY32_UNSIGNED(pbRawData, pFileEntry->dwCmpSize);
-            DecryptMpqBlock(pbRawData, pFileEntry->dwCmpSize, hf->dwFileKey);
-            BSWAP_ARRAY32_UNSIGNED(pbRawData, pFileEntry->dwCmpSize);
-        }
-
-        // If the file is compressed, we have to decompress it now
-        if(pFileEntry->dwFlags & MPQ_FILE_COMPRESSED)
-        {
-            int cbOutBuffer = (int)hf->dwDataSize;
-            int cbInBuffer = (int)pFileEntry->dwCmpSize;
-            int nResult = 0;
-
-            //
-            // If the file is an incremental patch, the size of compressed data
-            // is determined as pFileEntry->dwCmpSize - sizeof(TPatchInfo)
-            //
-            // In "wow-update-12694.MPQ" from Wow-Cataclysm BETA:
-            //
-            // File                                    CmprSize   DcmpSize DataSize Compressed?
-            // --------------------------------------  ---------- -------- -------- ---------------
-            // esES\DBFilesClient\LightSkyBox.dbc      0xBE->0xA2  0xBC     0xBC     Yes
-            // deDE\DBFilesClient\MountCapability.dbc  0x93->0x77  0x77     0x77     No
-            //
-
-            if(pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE)
-                cbInBuffer = cbInBuffer - sizeof(TPatchInfo);
-
-            // Is the file compressed by Blizzard's multiple compression ?
-            if(pFileEntry->dwFlags & MPQ_FILE_COMPRESS)
-            {
-                if(ha->pHeader->wFormatVersion >= MPQ_FORMAT_VERSION_2)
-                    nResult = SCompDecompress2((char *)hf->pbFileSector, &cbOutBuffer, (char *)pbRawData, cbInBuffer);
-                else
-                    nResult = SCompDecompress((char *)hf->pbFileSector, &cbOutBuffer, (char *)pbRawData, cbInBuffer);
-            }
-
-            // Is the file compressed by PKWARE Data Compression Library ?
-            // Note: Single unit files compressed with IMPLODE are not supported by Blizzard
-            else if(pFileEntry->dwFlags & MPQ_FILE_IMPLODE)
-                nResult = SCompExplode((char *)hf->pbFileSector, &cbOutBuffer, (char *)pbRawData, cbInBuffer);
-
-            nError = (nResult != 0) ? ERROR_SUCCESS : ERROR_FILE_CORRUPT;
-        }
-        else
-        {
-            if(pbRawData != hf->pbFileSector)
-                memcpy(hf->pbFileSector, pbRawData, hf->dwDataSize);
-        }
-
-        // Free the decompression buffer.
-        if(pbCompressed != NULL)
-            STORM_FREE(pbCompressed);
-
-        // The file sector is now properly loaded
-        hf->dwSectorOffs = 0;
-    }
-
-    // At this moment, we have the file loaded into the file buffer.
-    // Copy as much as the caller wants
-    if(nError == ERROR_SUCCESS && hf->dwSectorOffs == 0)
-    {
-        // File position is greater or equal to file size ?
-        if(dwFilePos >= hf->dwDataSize)
-        {
-            *pdwBytesRead = 0;
-            return ERROR_SUCCESS;
-        }
-
-        // If not enough bytes remaining in the file, cut them
-        if((hf->dwDataSize - dwFilePos) < dwToRead)
-            dwToRead = (hf->dwDataSize - dwFilePos);
-
-        // Copy the bytes
-        memcpy(pvBuffer, hf->pbFileSector + dwFilePos, dwToRead);
-
-        // Give the number of bytes read
-        *pdwBytesRead = dwToRead;
-        return ERROR_SUCCESS;
-    }
-
-    // An error, sorry
-    return ERROR_CAN_NOT_COMPLETE;
-}
-
-static int ReadMpqFile(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos, DWORD dwBytesToRead, LPDWORD pdwBytesRead)
-{
-    TMPQArchive * ha = hf->ha;
-    LPBYTE pbBuffer = (BYTE *)pvBuffer;
-    DWORD dwTotalBytesRead = 0;                         // Total bytes read in all three parts
-    DWORD dwSectorSizeMask = ha->dwSectorSize - 1;      // Mask for block size, usually 0x0FFF
-    DWORD dwFileSectorPos;                              // File offset of the loaded sector
-    DWORD dwBytesRead;                                  // Number of bytes read (temporary variable)
-    int nError;
-
-    // If the file position is at or beyond end of file, do nothing
-    if(dwFilePos >= hf->dwDataSize)
-    {
-        *pdwBytesRead = 0;
-        return ERROR_SUCCESS;
-    }
-
-    // If not enough bytes in the file remaining, cut them
-    if(dwBytesToRead > (hf->dwDataSize - dwFilePos))
-        dwBytesToRead = (hf->dwDataSize - dwFilePos);
-
-    // Compute sector position in the file
-    dwFileSectorPos = dwFilePos & ~dwSectorSizeMask;  // Position in the block
-
-    // If the file sector buffer is not allocated yet, do it now
-    if(hf->pbFileSector == NULL)
-    {
-        nError = AllocateSectorBuffer(hf);
-        if(nError != ERROR_SUCCESS)
-            return nError;
-    }
-
-    // Load the first (incomplete) file sector
-    if(dwFilePos & dwSectorSizeMask)
-    {
-        DWORD dwBytesInSector = ha->dwSectorSize;
-        DWORD dwBufferOffs = dwFilePos & dwSectorSizeMask;
-        DWORD dwToCopy;
-
-        // Is the file sector already loaded ?
-        if(hf->dwSectorOffs != dwFileSectorPos)
-        {
-            // Load one MPQ sector into archive buffer
-            nError = ReadMpqSectors(hf, hf->pbFileSector, dwFileSectorPos, ha->dwSectorSize, &dwBytesInSector);
-            if(nError != ERROR_SUCCESS)
-                return nError;
-
-            // Remember that the data loaded to the sector have new file offset
-            hf->dwSectorOffs = dwFileSectorPos;
-        }
-        else
-        {
-            if((dwFileSectorPos + dwBytesInSector) > hf->dwDataSize)
-                dwBytesInSector = hf->dwDataSize - dwFileSectorPos;
-        }
-
-        // Copy the data from the offset in the loaded sector to the end of the sector
-        dwToCopy = dwBytesInSector - dwBufferOffs;
-        if(dwToCopy > dwBytesToRead)
-            dwToCopy = dwBytesToRead;
-
-        // Copy data from sector buffer into target buffer
-        memcpy(pbBuffer, hf->pbFileSector + dwBufferOffs, dwToCopy);
-
-        // Update pointers and byte counts
-        dwTotalBytesRead += dwToCopy;
-        dwFileSectorPos  += dwBytesInSector;
-        pbBuffer         += dwToCopy;
-        dwBytesToRead    -= dwToCopy;
-    }
-
-    // Load the whole ("middle") sectors only if there is at least one full sector to be read
-    if(dwBytesToRead >= ha->dwSectorSize)
-    {
-        DWORD dwBlockBytes = dwBytesToRead & ~dwSectorSizeMask;
-
-        // Load all sectors to the output buffer
-        nError = ReadMpqSectors(hf, pbBuffer, dwFileSectorPos, dwBlockBytes, &dwBytesRead);
-        if(nError != ERROR_SUCCESS)
-            return nError;
-
-        // Update pointers
-        dwTotalBytesRead += dwBytesRead;
-        dwFileSectorPos  += dwBytesRead;
-        pbBuffer         += dwBytesRead;
-        dwBytesToRead    -= dwBytesRead;
-    }
-
-    // Read the terminating sector
-    if(dwBytesToRead > 0)
-    {
-        DWORD dwToCopy = ha->dwSectorSize;
-
-        // Is the file sector already loaded ?
-        if(hf->dwSectorOffs != dwFileSectorPos)
-        {
-            // Load one MPQ sector into archive buffer
-            nError = ReadMpqSectors(hf, hf->pbFileSector, dwFileSectorPos, ha->dwSectorSize, &dwBytesRead);
-            if(nError != ERROR_SUCCESS)
-                return nError;
-
-            // Remember that the data loaded to the sector have new file offset
-            hf->dwSectorOffs = dwFileSectorPos;
-        }
-
-        // Check number of bytes read
-        if(dwToCopy > dwBytesToRead)
-            dwToCopy = dwBytesToRead;
-
-        // Copy the data from the cached last sector to the caller's buffer
-        memcpy(pbBuffer, hf->pbFileSector, dwToCopy);
-
-        // Update pointers
-        dwTotalBytesRead += dwToCopy;
-    }
-
-    // Store total number of bytes read to the caller
-    *pdwBytesRead = dwTotalBytesRead;
-    return ERROR_SUCCESS;
-}
-
-static int ReadMpqFilePatchFile(TMPQFile * hf, void * pvBuffer, DWORD dwFilePos, DWORD dwToRead, LPDWORD pdwBytesRead)
-{
-    DWORD dwBytesToRead = dwToRead;
-    DWORD dwBytesRead = 0;
-    int nError = ERROR_SUCCESS;
-
-    // Make sure that the patch file is loaded completely
-    if(hf->pbFileData == NULL)
-    {
-        // Load the original file and store its content to "pbOldData"
-        hf->pbFileData = STORM_ALLOC(BYTE, hf->pFileEntry->dwFileSize);
-        hf->cbFileData = hf->pFileEntry->dwFileSize;
-        if(hf->pbFileData == NULL)
-            return ERROR_NOT_ENOUGH_MEMORY;
-
-        // Read the file data
-        if(hf->pFileEntry->dwFlags & MPQ_FILE_SINGLE_UNIT)
-            nError = ReadMpqFileSingleUnit(hf, hf->pbFileData, 0, hf->cbFileData, &dwBytesRead);
-        else
-            nError = ReadMpqFile(hf, hf->pbFileData, 0, hf->cbFileData, &dwBytesRead);
-
-        // Fix error code
-        if(nError == ERROR_SUCCESS && dwBytesRead != hf->cbFileData)
-            nError = ERROR_FILE_CORRUPT;
-
-        // Patch the file data
-        if(nError == ERROR_SUCCESS)
-            nError = PatchFileData(hf);
-
-        // Reset number of bytes read to zero
-        dwBytesRead = 0;
-    }
-
-    // If there is something to read, do it
-    if(nError == ERROR_SUCCESS)
-    {
-        if(dwFilePos < hf->cbFileData)
-        {
-            // Make sure we don't copy more than file size
-            if((dwFilePos + dwToRead) > hf->cbFileData)
-                dwToRead = hf->cbFileData - dwFilePos;
-
-            // Copy the appropriate amount of the file data to the caller's buffer
-            memcpy(pvBuffer, hf->pbFileData + dwFilePos, dwToRead);
-            dwBytesRead = dwToRead;
-        }
-
-        // Set the proper error code
-        nError = (dwBytesRead == dwBytesToRead) ? ERROR_SUCCESS : ERROR_HANDLE_EOF;
-    }
-
-    // Give the result to the caller
-    if(pdwBytesRead != NULL)
-        *pdwBytesRead = dwBytesRead;
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// SFileReadFile
-
-bool WINAPI SFileReadFile(HANDLE hFile, void * pvBuffer, DWORD dwToRead, LPDWORD pdwRead, LPOVERLAPPED lpOverlapped)
-{
-    TMPQFile * hf = (TMPQFile *)hFile;
-    DWORD dwBytesRead = 0;                      // Number of bytes read
-    int nError = ERROR_SUCCESS;
-
-    // Keep compilers happy
-    lpOverlapped = lpOverlapped;
-
-    // Check valid parameters
-    if(!IsValidFileHandle(hf))
-    {
-        SetLastError(ERROR_INVALID_HANDLE);
-        return false;
-    }
-
-    if(pvBuffer == NULL)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return false;
-    }
-
-    // If the file is local file, read the data directly from the stream
-    if(hf->pStream != NULL)
-    {
-        ULONGLONG FilePosition1;
-        ULONGLONG FilePosition2;
-
-        // Because stream I/O functions are designed to read
-        // "all or nothing", we compare file position before and after,
-        // and if they differ, we assume that number of bytes read
-        // is the difference between them
-
-        FileStream_GetPos(hf->pStream, &FilePosition1);
-        if(!FileStream_Read(hf->pStream, NULL, pvBuffer, dwToRead))
-        {
-            // If not all bytes have been read, then return the number
-            // of bytes read
-            if((nError = GetLastError()) == ERROR_HANDLE_EOF)
-            {
-                FileStream_GetPos(hf->pStream, &FilePosition2);
-                dwBytesRead = (DWORD)(FilePosition2 - FilePosition1);
-            }
-            else
-            {
-                nError = GetLastError();
-            }
-        }
-        else
-        {
-            dwBytesRead = dwToRead;
-        }
-    }
-    else
-    {
-        // If the file is a patch file, we have to read it special way
-        if(hf->hfPatchFile != NULL && (hf->pFileEntry->dwFlags & MPQ_FILE_PATCH_FILE) == 0)
-        {
-            nError = ReadMpqFilePatchFile(hf, pvBuffer, hf->dwFilePos, dwToRead, &dwBytesRead);
-        }
-
-        // If the file is single unit file, redirect it to read file
-        else if(hf->pFileEntry->dwFlags & MPQ_FILE_SINGLE_UNIT)
-        {
-            nError = ReadMpqFileSingleUnit(hf, pvBuffer, hf->dwFilePos, dwToRead, &dwBytesRead);
-        }
-
-        // Otherwise read it as sector based MPQ file
-        else
-        {
-            nError = ReadMpqFile(hf, pvBuffer, hf->dwFilePos, dwToRead, &dwBytesRead);
-        }
-
-        // Increment the file position
-        hf->dwFilePos += dwBytesRead;
-    }
-
-    // Give the caller the number of bytes read
-    if(pdwRead != NULL)
-        *pdwRead = dwBytesRead;
-
-    // If the read operation succeeded, but not full number of bytes was read,
-    // set the last error to ERROR_HANDLE_EOF
-    if(nError == ERROR_SUCCESS && (dwBytesRead < dwToRead))
-        nError = ERROR_HANDLE_EOF;
-
-    // If something failed, set the last error value
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
-
-//-----------------------------------------------------------------------------
-// SFileGetFileSize
-
-DWORD WINAPI SFileGetFileSize(HANDLE hFile, LPDWORD pdwFileSizeHigh)
-{
-    ULONGLONG FileSize;
-    TMPQFile * hf = (TMPQFile *)hFile;
-
-    // Validate the file handle before we go on
-    if(IsValidFileHandle(hf))
-    {
-        // Make sure that the variable is initialized
-        FileSize = 0;
-
-        // If the file is patched file, we have to get the size of the last version
-        if(hf->hfPatchFile != NULL)
-        {
-            // Walk through the entire patch chain, take the last version
-            while(hf != NULL)
-            {
-                // Get the size of the currently pointed version
-                FileSize = hf->pFileEntry->dwFileSize;
-
-                // Move to the next patch file in the hierarchy
-                hf = hf->hfPatchFile;
-            }
-        }
-        else
-        {
-            // Is it a local file ?
-            if(hf->pStream != NULL)
-            {
-                FileStream_GetSize(hf->pStream, &FileSize);
-            }
-            else
-            {
-                FileSize = hf->dwDataSize;
-            }
-        }
-
-        // If opened from archive, return file size
-        if(pdwFileSizeHigh != NULL)
-            *pdwFileSizeHigh = (DWORD)(FileSize >> 32);
-        return (DWORD)FileSize;
-    }
-
-    SetLastError(ERROR_INVALID_HANDLE);
-    return SFILE_INVALID_SIZE;
-}
-
-DWORD WINAPI SFileSetFilePointer(HANDLE hFile, LONG lFilePos, LONG * plFilePosHigh, DWORD dwMoveMethod)
-{
-    TMPQFile * hf = (TMPQFile *)hFile;
-    ULONGLONG FilePosition;
-    ULONGLONG MoveOffset;
-    DWORD dwFilePosHi;
-
-    // If the hFile is not a valid file handle, return an error.
-    if(!IsValidFileHandle(hf))
-    {
-        SetLastError(ERROR_INVALID_HANDLE);
-        return SFILE_INVALID_POS;
-    }
-
-    // Get the relative point where to move from
-    switch(dwMoveMethod)
-    {
-    case FILE_BEGIN:
-        FilePosition = 0;
-        break;
-
-    case FILE_CURRENT:
-        if(hf->pStream != NULL)
-        {
-            FileStream_GetPos(hf->pStream, &FilePosition);
-        }
-        else
-        {
-            FilePosition = hf->dwFilePos;
-        }
-        break;
-
-    case FILE_END:
-        if(hf->pStream != NULL)
-        {
-            FileStream_GetSize(hf->pStream, &FilePosition);
-        }
-        else
-        {
-            FilePosition = SFileGetFileSize(hFile, NULL);
-        }
-        break;
-
-    default:
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return SFILE_INVALID_POS;
-    }
-
-    // Now get the move offset. Note that both values form
-    // a signed 64-bit value (a file pointer can be moved backwards)
-    if(plFilePosHigh != NULL)
-        dwFilePosHi = *plFilePosHigh;
-    else
-        dwFilePosHi = (lFilePos & 0x80000000) ? 0xFFFFFFFF : 0;
-    MoveOffset = MAKE_OFFSET64(dwFilePosHi, lFilePos);
-
-    // Now calculate the new file pointer
-    // Do not allow the file pointer to go before the begin of the file
-    FilePosition += MoveOffset;
-    if(FilePosition < 0)
-        FilePosition = 0;
-
-    // Now apply the file pointer to the file
-    if(hf->pStream != NULL)
-    {
-        // Apply the new file position
-        if(!FileStream_Read(hf->pStream, &FilePosition, NULL, 0))
-            return SFILE_INVALID_POS;
-
-        // Return the new file position
-        if(plFilePosHigh != NULL)
-            *plFilePosHigh = (LONG)(FilePosition >> 32);
-        return (DWORD)FilePosition;
-    }
-    else
-    {
-        // Files in MPQ can't be bigger than 4 GB.
-        // We don't allow to go past 4 GB
-        if(FilePosition >> 32)
-        {
-            SetLastError(ERROR_INVALID_PARAMETER);
-            return SFILE_INVALID_POS;
-        }
-
-        // Change the file position
-        hf->dwFilePos = (DWORD)FilePosition;
-
-        // Return the new file position
-        if(plFilePosHigh != NULL)
-            *plFilePosHigh = 0;
-        return (DWORD)FilePosition;
-    }
-}
-
-//-----------------------------------------------------------------------------
-// Tries to retrieve the file name
-
-static TFileHeader2Ext data2ext[] =
-{
-    {0x00005A4D, 0x0000FFFF, 0x00000000, 0x00000000, "exe"},    // EXE files
-    {0x00000006, 0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, "dc6"},    // EXE files
-    {0x1A51504D, 0xFFFFFFFF, 0x00000000, 0x00000000, "mpq"},    // MPQ archive header ID ('MPQ\x1A')
-    {0x46464952, 0xFFFFFFFF, 0x00000000, 0x00000000, "wav"},    // WAVE header 'RIFF'
-    {0x324B4D53, 0xFFFFFFFF, 0x00000000, 0x00000000, "smk"},    // Old "Smacker Video" files 'SMK2'
-    {0x694B4942, 0xFFFFFFFF, 0x00000000, 0x00000000, "bik"},    // Bink video files (new)
-    {0x0801050A, 0xFFFFFFFF, 0x00000000, 0x00000000, "pcx"},    // PCX images used in Diablo I
-    {0x544E4F46, 0xFFFFFFFF, 0x00000000, 0x00000000, "fnt"},    // Font files used in Diablo II
-    {0x6D74683C, 0xFFFFFFFF, 0x00000000, 0x00000000, "html"},   // HTML '<htm'
-    {0x4D54483C, 0xFFFFFFFF, 0x00000000, 0x00000000, "html"},   // HTML '<HTM
-    {0x216F6F57, 0xFFFFFFFF, 0x00000000, 0x00000000, "tbl"},    // Table files
-    {0x31504C42, 0xFFFFFFFF, 0x00000000, 0x00000000, "blp"},    // BLP textures
-    {0x32504C42, 0xFFFFFFFF, 0x00000000, 0x00000000, "blp"},    // BLP textures (v2)
-    {0x584C444D, 0xFFFFFFFF, 0x00000000, 0x00000000, "mdx"},    // MDX files
-    {0x45505954, 0xFFFFFFFF, 0x00000000, 0x00000000, "pud"},    // Warcraft II maps
-    {0x38464947, 0xFFFFFFFF, 0x00000000, 0x00000000, "gif"},    // GIF images 'GIF8'
-    {0x3032444D, 0xFFFFFFFF, 0x00000000, 0x00000000, "m2"},     // WoW ??? .m2
-    {0x43424457, 0xFFFFFFFF, 0x00000000, 0x00000000, "dbc"},    // ??? .dbc
-    {0x47585053, 0xFFFFFFFF, 0x00000000, 0x00000000, "bls"},    // WoW pixel shaders
-    {0xE0FFD8FF, 0xFFFFFFFF, 0x00000000, 0x00000000, "jpg"},    // JPEG image
-    {0x00000000, 0x00000000, 0x00000000, 0x00000000, "xxx"},    // Default extension
-    {0, 0, 0, 0, NULL}                                          // Terminator
-};
-
-bool WINAPI SFileGetFileName(HANDLE hFile, char * szFileName)
-{
-    TFileEntry * pFileEntry;
-    TMPQFile * hf = (TMPQFile *)hFile;  // MPQ File handle
-    char szPseudoName[20];
-    DWORD FirstBytes[2];                // The first 4 bytes of the file
-    DWORD dwFilePos;                    // Saved file position
-    int nError = ERROR_SUCCESS;
-    int i;
-
-    // Pre-zero the output buffer
-    if(szFileName != NULL)
-        *szFileName = 0;
-
-    // Check valid parameters
-    if(!IsValidFileHandle(hf))
-        nError = ERROR_INVALID_HANDLE;
-    pFileEntry = hf->pFileEntry;
-
-    // Only do something if the file name is not filled
-    if(nError == ERROR_SUCCESS && pFileEntry != NULL && pFileEntry->szFileName == NULL)
-    {
-        // Read the first 2 DWORDs bytes from the file
-        FirstBytes[0] = FirstBytes[1] = 0;
-        dwFilePos = SFileSetFilePointer(hf, 0, NULL, FILE_CURRENT);
-        SFileReadFile(hFile, FirstBytes, sizeof(FirstBytes), NULL, NULL);
-        BSWAP_ARRAY32_UNSIGNED(FirstBytes, sizeof(FirstBytes));
-        SFileSetFilePointer(hf, dwFilePos, NULL, FILE_BEGIN);
-
-        // Try to guess file extension from those 2 DWORDs
-        for(i = 0; data2ext[i].szExt != NULL; i++)
-        {
-            if((FirstBytes[0] & data2ext[i].dwOffset00Mask) == data2ext[i].dwOffset00Data &&
-                    (FirstBytes[1] & data2ext[i].dwOffset04Mask) == data2ext[i].dwOffset04Data)
-            {
-                sprintf(szPseudoName, "File%08u.%s", (unsigned int)(pFileEntry - hf->ha->pFileTable), data2ext[i].szExt);
-                break;
-            }
-        }
-
-        // Put the file name to the file table
-        AllocateFileName(pFileEntry, szPseudoName);
-    }
-
-    // Now put the file name to the file structure
-    if(nError == ERROR_SUCCESS && szFileName != NULL)
-    {
-        if(pFileEntry != NULL && pFileEntry->szFileName != NULL)
-            strcpy(szFileName, pFileEntry->szFileName);
-        else if(hf->pStream != NULL)
-            CopyFileName(szFileName, FileStream_GetFileName(hf->pStream));
-    }
-    return (nError == ERROR_SUCCESS);
-}
-
-//-----------------------------------------------------------------------------
-// Retrieves an information about an archive or about a file within the archive
-//
-//  hMpqOrFile - Handle to an MPQ archive or to a file
-//  dwInfoType - Information to obtain
-
-#define VERIFY_MPQ_HANDLE(h)                \
-    if(!IsValidMpqHandle(h))                \
-{                                       \
-    nError = ERROR_INVALID_HANDLE;      \
-    break;                              \
-    }
-
-#define VERIFY_FILE_HANDLE(h)               \
-    if(!IsValidFileHandle(h))               \
-{                                       \
-    nError = ERROR_INVALID_HANDLE;      \
-    break;                              \
-    }
-
-bool WINAPI SFileGetFileInfo(
-        HANDLE hMpqOrFile,
-        DWORD dwInfoType,
-        void * pvFileInfo,
-        DWORD cbFileInfo,
-        LPDWORD pcbLengthNeeded)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpqOrFile;
-    TMPQBlock * pBlock;
-    TMPQFile * hf = (TMPQFile *)hMpqOrFile;
-    void * pvSrcFileInfo = NULL;
-    DWORD cbLengthNeeded = 0;
-    DWORD dwIsReadOnly;
-    DWORD dwFileCount = 0;
-    DWORD dwFileIndex;
-    DWORD dwFileKey;
-    DWORD i;
-    int nError = ERROR_SUCCESS;
-
-    switch(dwInfoType)
-    {
-    case SFILE_INFO_ARCHIVE_NAME:
-        VERIFY_MPQ_HANDLE(ha);
-
-        // pvFileInfo receives the name of the archive, terminated by 0
-        pvSrcFileInfo = FileStream_GetFileName(ha->pStream);
-        cbLengthNeeded = (DWORD)(_tcslen((TCHAR *)pvSrcFileInfo) + 1) * sizeof(TCHAR);
-        break;
-
-    case SFILE_INFO_ARCHIVE_SIZE:       // Size of the archive
-        VERIFY_MPQ_HANDLE(ha);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &ha->pHeader->dwArchiveSize;
-        break;
-
-    case SFILE_INFO_MAX_FILE_COUNT:     // Max. number of files in the MPQ
-        VERIFY_MPQ_HANDLE(ha);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &ha->dwMaxFileCount;
-        break;
-
-    case SFILE_INFO_HASH_TABLE_SIZE:    // Size of the hash table
-        VERIFY_MPQ_HANDLE(ha);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &ha->pHeader->dwHashTableSize;
-        break;
-
-    case SFILE_INFO_BLOCK_TABLE_SIZE:   // Size of the block table
-        VERIFY_MPQ_HANDLE(ha);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &ha->pHeader->dwBlockTableSize;
-        break;
-
-    case SFILE_INFO_SECTOR_SIZE:
-        VERIFY_MPQ_HANDLE(ha);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &ha->dwSectorSize;
-        break;
-
-    case SFILE_INFO_HASH_TABLE:
-        VERIFY_MPQ_HANDLE(ha);
-        cbLengthNeeded = ha->pHeader->dwHashTableSize * sizeof(TMPQHash);
-        pvSrcFileInfo = ha->pHashTable;
-        break;
-
-    case SFILE_INFO_BLOCK_TABLE:
-        VERIFY_MPQ_HANDLE(ha);
-        cbLengthNeeded = ha->dwFileTableSize * sizeof(TMPQBlock);
-        if(cbFileInfo < cbLengthNeeded)
-        {
-            nError = ERROR_INSUFFICIENT_BUFFER;
-            break;
-        }
-
-        // Construct block table from file table size
-        pBlock = (TMPQBlock *)pvFileInfo;
-        for(i = 0; i < ha->dwFileTableSize; i++)
-        {
-            pBlock->dwFilePos = (DWORD)ha->pFileTable[i].ByteOffset;
-            pBlock->dwFSize   = ha->pFileTable[i].dwFileSize;
-            pBlock->dwCSize   = ha->pFileTable[i].dwCmpSize;
-            pBlock->dwFlags   = ha->pFileTable[i].dwFlags;
-            pBlock++;
-        }
-        break;
-
-    case SFILE_INFO_NUM_FILES:
-        VERIFY_MPQ_HANDLE(ha);
-        dwFileCount = GetMpqFileCount(ha);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &dwFileCount;
-        break;
-
-        case SFILE_INFO_STREAM_FLAGS:
-            VERIFY_MPQ_HANDLE(ha);
-            FileStream_GetFlags(ha->pStream, &dwFileKey);
-            cbLengthNeeded = sizeof(DWORD);
-            pvSrcFileInfo = &dwFileKey;
-       break;
-
-    case SFILE_INFO_IS_READ_ONLY:
-        VERIFY_MPQ_HANDLE(ha);
-        dwIsReadOnly = (FileStream_IsReadOnly(ha->pStream) || (ha->dwFlags & MPQ_FLAG_READ_ONLY));
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &dwIsReadOnly;
-        break;
-
-    case SFILE_INFO_HASH_INDEX:
-        VERIFY_FILE_HANDLE(hf);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &hf->pFileEntry->dwHashIndex;
-        break;
-
-    case SFILE_INFO_CODENAME1:
-        VERIFY_FILE_HANDLE(hf);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &hf->pFileEntry->dwHashIndex;
-        if(ha->pHashTable != NULL)
-            pvSrcFileInfo = &ha->pHashTable[hf->pFileEntry->dwHashIndex].dwName1;
-        break;
-
-    case SFILE_INFO_CODENAME2:
-        VERIFY_FILE_HANDLE(hf);
-        cbLengthNeeded = sizeof(DWORD);
-        if(ha->pHashTable != NULL)
-            pvSrcFileInfo = &ha->pHashTable[hf->pFileEntry->dwHashIndex].dwName2;
-        break;
-
-    case SFILE_INFO_LOCALEID:
-        VERIFY_FILE_HANDLE(hf);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &hf->pFileEntry->lcLocale;
-        break;
-
-    case SFILE_INFO_BLOCKINDEX:
-        VERIFY_FILE_HANDLE(hf);
-        dwFileIndex = (DWORD)(hf->pFileEntry - hf->ha->pFileTable);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &dwFileIndex;
-        break;
-
-    case SFILE_INFO_FILE_SIZE:
-        VERIFY_FILE_HANDLE(hf);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &hf->pFileEntry->dwFileSize;
-        break;
-
-    case SFILE_INFO_COMPRESSED_SIZE:
-        VERIFY_FILE_HANDLE(hf);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &hf->pFileEntry->dwCmpSize;
-        break;
-
-    case SFILE_INFO_FLAGS:
-        VERIFY_FILE_HANDLE(hf);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &hf->pFileEntry->dwFlags;
-        break;
-
-    case SFILE_INFO_POSITION:
-        VERIFY_FILE_HANDLE(hf);
-        cbLengthNeeded = sizeof(ULONGLONG);
-        pvSrcFileInfo = &hf->pFileEntry->ByteOffset;
-        break;
-
-    case SFILE_INFO_KEY:
-        VERIFY_FILE_HANDLE(hf);
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &hf->dwFileKey;
-        break;
-
-    case SFILE_INFO_KEY_UNFIXED:
-        VERIFY_FILE_HANDLE(hf);
-        dwFileKey = hf->dwFileKey;
-        if(hf->pFileEntry->dwFlags & MPQ_FILE_FIX_KEY)
-            dwFileKey = (dwFileKey ^ hf->pFileEntry->dwFileSize) - (DWORD)hf->MpqFilePos;
-        cbLengthNeeded = sizeof(DWORD);
-        pvSrcFileInfo = &dwFileKey;
-        break;
-
-    case SFILE_INFO_FILETIME:
-        VERIFY_FILE_HANDLE(hf);
-        cbLengthNeeded = sizeof(ULONGLONG);
-        pvSrcFileInfo = &hf->pFileEntry->FileTime;
-        break;
-
-    case SFILE_INFO_PATCH_CHAIN:
-        VERIFY_FILE_HANDLE(hf);
-        GetFilePatchChain(hf, pvFileInfo, cbFileInfo, &cbLengthNeeded);
-        break;
-
-    default:
-        nError = ERROR_INVALID_PARAMETER;
-        break;
-    }
-
-    // If everything is OK so far, copy the information
-    if(nError == ERROR_SUCCESS)
-    {
-        // Is the output buffer large enough?
-        if(cbFileInfo >= cbLengthNeeded)
-        {
-            // Copy the data
-            if(pvSrcFileInfo != NULL)
-                memcpy(pvFileInfo, pvSrcFileInfo, cbLengthNeeded);
-        }
-        else
-        {
-            nError = ERROR_INSUFFICIENT_BUFFER;
-        }
-
-        // Give the size to the caller
-        if(pcbLengthNeeded != NULL)
-            *pcbLengthNeeded = cbLengthNeeded;
-    }
-
-    // Set the last error value, if needed
-    if(nError != ERROR_SUCCESS)
-        SetLastError(nError);
-    return (nError == ERROR_SUCCESS);
-}
diff --git a/dep/StormLibOld/src/SFileVerify.cpp b/dep/StormLibOld/src/SFileVerify.cpp
deleted file mode 100644
index 8344480ef..000000000
--- a/dep/StormLibOld/src/SFileVerify.cpp
+++ /dev/null
@@ -1,921 +0,0 @@
-/*****************************************************************************/
-/* SFileVerify.cpp                        Copyright (c) Ladislav Zezula 2010 */
-/*---------------------------------------------------------------------------*/
-/* MPQ files and MPQ archives verification.                                  */
-/*                                                                           */
-/* The MPQ signature verification has been written by Jean-Francois Roy      */
-/* <bahamut@macstorm.org> and Justin Olbrantz (Quantam).                     */
-/* The MPQ public keys have been created by MPQKit, using OpenSSL library.   */
-/*                                                                           */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 04.05.10  1.00  Lad  The first version of SFileVerify.cpp                 */
-/*****************************************************************************/
-
-#define __STORMLIB_SELF__
-#include "StormLib.h"
-#include "StormCommon.h"
-
-//-----------------------------------------------------------------------------
-// Local defines
-
-#define SIGNATURE_TYPE_NONE             0
-#define SIGNATURE_TYPE_WEAK             1
-#define SIGNATURE_TYPE_STRONG           2
-
-#define MPQ_DIGEST_UNIT_SIZE      0x10000
-
-typedef struct _MPQ_SIGNATURE_INFO
-{
-    ULONGLONG BeginMpqData;                 // File offset where the hashing starts
-    ULONGLONG BeginExclude;                 // Begin of the excluded area (used for (signature) file)
-    ULONGLONG EndExclude;                   // End of the excluded area (used for (signature) file)
-    ULONGLONG EndMpqData;                   // File offset where the hashing ends
-    ULONGLONG EndOfFile;                    // Size of the entire file
-    BYTE  Signature[MPQ_STRONG_SIGNATURE_SIZE + 0x10];
-    DWORD cbSignatureSize;                  // Length of the signature
-    int nSignatureType;                     // See SIGNATURE_TYPE_XXX
-
-} MPQ_SIGNATURE_INFO, *PMPQ_SIGNATURE_INFO;
-
-//-----------------------------------------------------------------------------
-// Known Blizzard public keys
-// Created by Jean-Francois Roy using OpenSSL
-
-static const char * szBlizzardWeakPublicKey =
-        "-----BEGIN PUBLIC KEY-----"
-        "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJJidwS/uILMBSO5DLGsBFknIXWWjQJe"
-        "2kfdfEk3G/j66w4KkhZ1V61Rt4zLaMVCYpDun7FLwRjkMDSepO1q2DcCAwEAAQ=="
-        "-----END PUBLIC KEY-----";
-
-static const char * szBlizzardStrongPublicKey =
-        "-----BEGIN PUBLIC KEY-----"
-        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsQZ+ziT2h8h+J/iMQpgd"
-        "tH1HaJzOBE3agjU4yMPcrixaPOZoA4t8bwfey7qczfWywocYo3pleytFF+IuD4HD"
-        "Fl9OXN1SFyupSgMx1EGZlgbFAomnbq9MQJyMqQtMhRAjFgg4TndS7YNb+JMSAEKp"
-        "kXNqY28n/EVBHD5TsMuVCL579gIenbr61dI92DDEdy790IzIG0VKWLh/KOTcTJfm"
-        "Ds/7HQTkGouVW+WUsfekuqNQo7ND9DBnhLjLjptxeFE2AZqYcA1ao3S9LN3GL1tW"
-        "lVXFIX9c7fWqaVTQlZ2oNsI/ARVApOK3grNgqvwH6YoVYVXjNJEo5sQJsPsdV/hk"
-        "dwIDAQAB"
-        "-----END PUBLIC KEY-----";
-
-static const char * szWarcraft3MapPublicKey =
-        "-----BEGIN PUBLIC KEY-----"
-        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1BwklUUQ3UvjizOBRoF5"
-        "yyOVc7KD+oGOQH5i6eUk1yfs0luCC70kNucNrfqhmviywVtahRse1JtXCPrx2bd3"
-        "iN8Dx91fbkxjYIOGTsjYoHKTp0BbaFkJih776fcHgnFSb+7mJcDuJVvJOXxEH6w0"
-        "1vo6VtujCqj1arqbyoal+xtAaczF3us5cOEp45sR1zAWTn1+7omN7VWV4QqJPaDS"
-        "gBSESc0l1grO0i1VUSumayk7yBKIkb+LBvcG6WnYZHCi7VdLmaxER5m8oZfER66b"
-        "heHoiSQIZf9PAY6Guw2DT5BTc54j/AaLQAKf2qcRSgQLVo5kQaddF3rCpsXoB/74"
-        "6QIDAQAB"
-        "-----END PUBLIC KEY-----";
-
-static const char * szWowPatchPublicKey =
-        "-----BEGIN PUBLIC KEY-----"
-        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwOsMV0LagAWPEtEQM6b9"
-        "6FHFkUyGbbyda2/Dfc9dyl21E9QvX+Yw7qKRMAKPzA2TlQQLZKvXpnKXF/YIK5xa"
-        "5uwg9CEHCEAYolLG4xn0FUOE0E/0PuuytI0p0ICe6rk00PifZzTr8na2wI/l/GnQ"
-        "bvnIVF1ck6cslATpQJ5JJVMXzoFlUABS19WESw4MXuJAS3AbMhxNWdEhVv7eO51c"
-        "yGjRLy9QjogZODZTY0fSEksgBqQxNCoYVJYI/sF5K2flDsGqrIp0OdJ6teJlzg1Y"
-        "UjYnb6bKjlidXoHEXI2TgA/mD6O3XFIt08I9s3crOCTgICq7cgX35qrZiIVWZdRv"
-        "TwIDAQAB"
-        "-----END PUBLIC KEY-----";
-
-static const char * szWowSurveyPublicKey =
-        "-----BEGIN PUBLIC KEY-----"
-        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIt1DR6nRyyKsy2qahHe"
-        "MKLtacatn/KxieHcwH87wLBxKy+jZ0gycTmJ7SaTdBAEMDs/V5IPIXEtoqYnid2c"
-        "63TmfGDU92oc3Ph1PWUZ2PWxBhT06HYxRdbrgHw9/I29pNPi/607x+lzPORITOgU"
-        "BR6MR8au8HsQP4bn4vkJNgnSgojh48/XQOB/cAln7As1neP61NmVimoLR4Bwi3zt"
-        "zfgrZaUpyeNCUrOYJmH09YIjbBySTtXOUidoPHjFrMsCWpr6xs8xbETbs7MJFL6a"
-        "vcUfTT67qfIZ9RsuKfnXJTIrV0kwDSjjuNXiPTmWAehSsiHIsrUXX5RNcwsSjClr"
-        "nQIDAQAB"
-        "-----END PUBLIC KEY-----";
-
-static const char * szStarcraft2MapPublicKey =
-        "-----BEGIN PUBLIC KEY-----"
-        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmk4GT8zb+ICC25a17KZB"
-        "q/ygKGJ2VSO6IT5PGHJlm1KfnHBA4B6SH3xMlJ4c6eG2k7QevZv+FOhjsAHubyWq"
-        "2VKqWbrIFKv2ILc2RfMn8J9EDVRxvcxh6slRrVL69D0w1tfVGjMiKq2Fym5yGoRT"
-        "E7CRgDqbAbXP9LBsCNWHiJLwfxMGzHbk8pIl9oia5pvM7ofZamSHchxlpy6xa4GJ"
-        "7xKN01YCNvklTL1D7uol3wkwcHc7vrF8QwuJizuA5bSg4poEGtH62BZOYi+UL/z0"
-        "31YK+k9CbQyM0X0pJoJoYz1TK+Y5J7vBnXCZtfcTYQ/ZzN6UcxTa57dJaiOlCh9z"
-        "nQIDAQAB"
-        "-----END PUBLIC KEY-----";
-
-//-----------------------------------------------------------------------------
-// Local functions
-
-static void memrev(unsigned char *buf, size_t count)
-{
-    unsigned char *r;
-
-    for (r = buf + count - 1; buf < r; buf++, r--)
-    {
-        *buf ^= *r;
-        *r   ^= *buf;
-        *buf ^= *r;
-    }
-}
-
-static bool is_valid_md5(void * pvMd5)
-{
-    LPDWORD Md5 = (LPDWORD)pvMd5;
-
-    return (Md5[0] | Md5[1] | Md5[2] | Md5[3]) ? true : false;
-}
-
-static bool decode_base64_key(const char * szKeyBase64, rsa_key * key)
-{
-    unsigned char decoded_key[0x200];
-    const char * szBase64Begin;
-    const char * szBase64End;
-    unsigned long decoded_length = sizeof(decoded_key);
-    unsigned long length;
-
-    // Find out the begin of the BASE64 data
-    szBase64Begin = szKeyBase64 + strlen("-----BEGIN PUBLIC KEY-----");
-    szBase64End   = szBase64Begin + strlen(szBase64Begin) - strlen("-----END PUBLIC KEY-----");
-    if(szBase64End[0] != '-')
-        return false;
-
-    // decode the base64 string
-    length = (unsigned long)(szBase64End - szBase64Begin);
-    if(base64_decode((unsigned char *)szBase64Begin, length, decoded_key, &decoded_length) != CRYPT_OK)
-        return false;
-
-    // Create RSA key
-    if(rsa_import(decoded_key, decoded_length, key) != CRYPT_OK)
-        return false;
-
-    return true;
-}
-
-static void GetPlainAnsiFileName(
-        const TCHAR * szFileName,
-        char * szPlainName)
-{
-    const TCHAR * szPlainNameT = GetPlainFileNameT(szFileName);
-
-    // Convert the plain name to ANSI
-    while(*szPlainNameT != 0)
-        *szPlainName++ = (char)*szPlainNameT++;
-    *szPlainName = 0;
-}
-
-// Calculate begin and end of the MPQ archive
-static void CalculateArchiveRange(
-        TMPQArchive * ha,
-        PMPQ_SIGNATURE_INFO pSI)
-{
-    ULONGLONG TempPos = 0;
-    char szMapHeader[0x200];
-
-    // Get the MPQ begin
-    pSI->BeginMpqData = ha->MpqPos;
-
-    // Warcraft III maps are signed from the map header to the end
-    if(FileStream_Read(ha->pStream, &TempPos, szMapHeader, sizeof(szMapHeader)))
-    {
-        // Is it a map header ?
-        if(szMapHeader[0] == 'H' && szMapHeader[1] == 'M' && szMapHeader[2] == '3' && szMapHeader[3] == 'W')
-        {
-            // We will have to hash since the map header
-            pSI->BeginMpqData = 0;
-        }
-    }
-
-    // Get the MPQ data end. This is stored in our MPQ header,
-    // and it's been already prepared by SFileOpenArchive,
-    pSI->EndMpqData = ha->MpqPos + ha->pHeader->ArchiveSize64;
-
-    // Get the size of the entire file
-    FileStream_GetSize(ha->pStream, &pSI->EndOfFile);
-}
-
-static bool QueryMpqSignatureInfo(
-        TMPQArchive * ha,
-        PMPQ_SIGNATURE_INFO pSI)
-{
-    ULONGLONG ExtraBytes;
-    TMPQFile * hf;
-    HANDLE hFile;
-    DWORD dwFileSize;
-
-    // Calculate the range of the MPQ
-    CalculateArchiveRange(ha, pSI);
-
-    // If there is "(signature)" file in the MPQ, it has a weak signature
-    if(SFileOpenFileEx((HANDLE)ha, SIGNATURE_NAME, SFILE_OPEN_FROM_MPQ, &hFile))
-    {
-        // Get the content of the signature
-        SFileReadFile(hFile, pSI->Signature, sizeof(pSI->Signature), &pSI->cbSignatureSize, NULL);
-
-        // Verify the size of the signature
-        hf = (TMPQFile *)hFile;
-
-        // We have to exclude the signature file from the digest
-        pSI->BeginExclude = ha->MpqPos + hf->pFileEntry->ByteOffset;
-        pSI->EndExclude = pSI->BeginExclude + hf->pFileEntry->dwCmpSize;
-        dwFileSize = hf->dwDataSize;
-
-        // Close the file
-        SFileCloseFile(hFile);
-        pSI->nSignatureType = SIGNATURE_TYPE_WEAK;
-        return (dwFileSize == (MPQ_WEAK_SIGNATURE_SIZE + 8)) ? true : false;
-    }
-
-    // If there is extra bytes beyond the end of the archive,
-    // it's the strong signature
-    ExtraBytes = pSI->EndOfFile - pSI->EndMpqData;
-    if(ExtraBytes >= (MPQ_STRONG_SIGNATURE_SIZE + 4))
-    {
-        // Read the strong signature
-        if(!FileStream_Read(ha->pStream, &pSI->EndMpqData, pSI->Signature, (MPQ_STRONG_SIGNATURE_SIZE + 4)))
-            return false;
-
-        // Check the signature header "NGIS"
-        if(pSI->Signature[0] != 'N' || pSI->Signature[1] != 'G' || pSI->Signature[2] != 'I' || pSI->Signature[3] != 'S')
-            return false;
-
-        pSI->nSignatureType = SIGNATURE_TYPE_STRONG;
-        return true;
-    }
-
-    // Succeeded, but no known signature found
-    return true;
-}
-
-static bool CalculateMpqHashMd5(
-        TMPQArchive * ha,
-        PMPQ_SIGNATURE_INFO pSI,
-        LPBYTE pMd5Digest)
-{
-    hash_state md5_state;
-    ULONGLONG BeginBuffer;
-    ULONGLONG EndBuffer;
-    LPBYTE pbDigestBuffer = NULL;
-
-    // Allocate buffer for creating the MPQ digest.
-    pbDigestBuffer = STORM_ALLOC(BYTE, MPQ_DIGEST_UNIT_SIZE);
-    if(pbDigestBuffer == NULL)
-        return false;
-
-    // Initialize the MD5 hash state
-    md5_init(&md5_state);
-
-    // Set the byte offset of begin of the data
-    BeginBuffer = pSI->BeginMpqData;
-
-    // Create the digest
-    for(;;)
-    {
-        ULONGLONG BytesRemaining;
-        LPBYTE pbSigBegin = NULL;
-        LPBYTE pbSigEnd = NULL;
-        DWORD dwToRead = MPQ_DIGEST_UNIT_SIZE;
-
-        // Check the number of bytes remaining
-        BytesRemaining = pSI->EndMpqData - BeginBuffer;
-        if(BytesRemaining < MPQ_DIGEST_UNIT_SIZE)
-            dwToRead = (DWORD)BytesRemaining;
-        if(dwToRead == 0)
-            break;
-
-        // Read the next chunk
-        if(!FileStream_Read(ha->pStream, &BeginBuffer, pbDigestBuffer, dwToRead))
-        {
-            STORM_FREE(pbDigestBuffer);
-            return false;
-        }
-
-        // Move the current byte offset
-        EndBuffer = BeginBuffer + dwToRead;
-
-        // Check if the signature is within the loaded digest
-        if(BeginBuffer <= pSI->BeginExclude && pSI->BeginExclude < EndBuffer)
-            pbSigBegin = pbDigestBuffer + (size_t)(pSI->BeginExclude - BeginBuffer);
-        if(BeginBuffer <= pSI->EndExclude && pSI->EndExclude < EndBuffer)
-            pbSigEnd = pbDigestBuffer + (size_t)(pSI->EndExclude - BeginBuffer);
-
-        // Zero the part that belongs to the signature
-        if(pbSigBegin != NULL || pbSigEnd != NULL)
-        {
-            if(pbSigBegin == NULL)
-                pbSigBegin = pbDigestBuffer;
-            if(pbSigEnd == NULL)
-                pbSigEnd = pbDigestBuffer + dwToRead;
-
-            memset(pbSigBegin, 0, (pbSigEnd - pbSigBegin));
-        }
-
-        // Pass the buffer to the hashing function
-        md5_process(&md5_state, pbDigestBuffer, dwToRead);
-
-        // Move pointers
-        BeginBuffer += dwToRead;
-    }
-
-    // Finalize the MD5 hash
-    md5_done(&md5_state, pMd5Digest);
-    STORM_FREE(pbDigestBuffer);
-    return true;
-}
-
-static void AddTailToSha1(
-        hash_state * psha1_state,
-        const char * szTail)
-{
-    unsigned char szUpperCase[0x200];
-    unsigned long nLength = 0;
-
-    // Convert the tail to uppercase
-    // Note that we don't need to terminate the string with zero
-    while(*szTail != 0)
-    {
-        szUpperCase[nLength++] = (unsigned char)toupper(*szTail++);
-    }
-
-    // Append the tail to the SHA1
-    sha1_process(psha1_state, szUpperCase, nLength);
-}
-
-static bool CalculateMpqHashSha1(
-        TMPQArchive * ha,
-        PMPQ_SIGNATURE_INFO pSI,
-        unsigned char * sha1_tail0,
-        unsigned char * sha1_tail1,
-        unsigned char * sha1_tail2)
-{
-    ULONGLONG BeginBuffer;
-    hash_state sha1_state_temp;
-    hash_state sha1_state;
-    LPBYTE pbDigestBuffer = NULL;
-    char szPlainName[MAX_PATH];
-
-    // Allocate buffer for creating the MPQ digest.
-    pbDigestBuffer = STORM_ALLOC(BYTE, MPQ_DIGEST_UNIT_SIZE);
-    if(pbDigestBuffer == NULL)
-        return false;
-
-    // Initialize SHA1 state structure
-    sha1_init(&sha1_state);
-
-    // Calculate begin of data to be hashed
-    BeginBuffer = pSI->BeginMpqData;
-
-    // Create the digest
-    for(;;)
-    {
-        ULONGLONG BytesRemaining;
-        DWORD dwToRead = MPQ_DIGEST_UNIT_SIZE;
-
-        // Check the number of bytes remaining
-        BytesRemaining = pSI->EndMpqData - BeginBuffer;
-        if(BytesRemaining < MPQ_DIGEST_UNIT_SIZE)
-            dwToRead = (DWORD)BytesRemaining;
-        if(dwToRead == 0)
-            break;
-
-        // Read the next chunk
-        if(!FileStream_Read(ha->pStream, &BeginBuffer, pbDigestBuffer, dwToRead))
-        {
-            STORM_FREE(pbDigestBuffer);
-            return false;
-        }
-
-        // Pass the buffer to the hashing function
-        sha1_process(&sha1_state, pbDigestBuffer, dwToRead);
-
-        // Move pointers
-        BeginBuffer += dwToRead;
-    }
-
-    // Add all three known tails and generate three hashes
-    memcpy(&sha1_state_temp, &sha1_state, sizeof(hash_state));
-    sha1_done(&sha1_state_temp, sha1_tail0);
-
-    memcpy(&sha1_state_temp, &sha1_state, sizeof(hash_state));
-    GetPlainAnsiFileName(FileStream_GetFileName(ha->pStream), szPlainName);
-    AddTailToSha1(&sha1_state_temp, szPlainName);
-    sha1_done(&sha1_state_temp, sha1_tail1);
-
-    memcpy(&sha1_state_temp, &sha1_state, sizeof(hash_state));
-    AddTailToSha1(&sha1_state_temp, "ARCHIVE");
-    sha1_done(&sha1_state_temp, sha1_tail2);
-
-    // Finalize the MD5 hash
-    STORM_FREE(pbDigestBuffer);
-    return true;
-}
-
-static int VerifyRawMpqData(
-        TMPQArchive * ha,
-        ULONGLONG ByteOffset,
-        DWORD dwDataSize)
-{
-    ULONGLONG DataOffset = ha->MpqPos + ByteOffset;
-    LPBYTE pbDataChunk;
-    LPBYTE pbMD5Array1;                 // Calculated MD5 array
-    LPBYTE pbMD5Array2;                 // MD5 array loaded from the MPQ
-    DWORD dwBytesInChunk;
-    DWORD dwChunkCount;
-    DWORD dwChunkSize = ha->pHeader->dwRawChunkSize;
-    DWORD dwMD5Size;
-    int nError = ERROR_SUCCESS;
-
-    // Don't verify zero-sized blocks
-    if(dwDataSize == 0)
-        return ERROR_SUCCESS;
-
-    // Get the number of data chunks to calculate MD5
-    assert(dwChunkSize != 0);
-    dwChunkCount = ((dwDataSize - 1) / dwChunkSize) + 1;
-    dwMD5Size = dwChunkCount * MD5_DIGEST_SIZE;
-
-    // Allocate space for data chunk and for the MD5 array
-    pbDataChunk = STORM_ALLOC(BYTE, dwChunkSize);
-    if(pbDataChunk == NULL)
-        return ERROR_NOT_ENOUGH_MEMORY;
-
-    // Allocate space for MD5 array
-    pbMD5Array1 = STORM_ALLOC(BYTE, dwMD5Size);
-    pbMD5Array2 = STORM_ALLOC(BYTE, dwMD5Size);
-    if(pbMD5Array1 == NULL || pbMD5Array2 == NULL)
-        nError = ERROR_NOT_ENOUGH_MEMORY;
-
-    // Calculate MD5 of each data chunk
-    if(nError == ERROR_SUCCESS)
-    {
-        LPBYTE pbMD5 = pbMD5Array1;
-
-        for(DWORD i = 0; i < dwChunkCount; i++)
-        {
-            // Get the number of bytes in the chunk
-            dwBytesInChunk = STORMLIB_MIN(dwChunkSize, dwDataSize);
-
-            // Read the data chunk
-            if(!FileStream_Read(ha->pStream, &DataOffset, pbDataChunk, dwBytesInChunk))
-            {
-                nError = ERROR_FILE_CORRUPT;
-                break;
-            }
-
-            // Calculate MD5
-            CalculateDataBlockHash(pbDataChunk, dwBytesInChunk, pbMD5);
-
-            // Move pointers and offsets
-            DataOffset += dwBytesInChunk;
-            dwDataSize -= dwBytesInChunk;
-            pbMD5 += MD5_DIGEST_SIZE;
-        }
-    }
-
-    // Read the MD5 array
-    if(nError == ERROR_SUCCESS)
-    {
-        // Read the array of MD5
-        if(!FileStream_Read(ha->pStream, &DataOffset, pbMD5Array2, dwMD5Size))
-            nError = GetLastError();
-    }
-
-    // Compare the array of MD5
-    if(nError == ERROR_SUCCESS)
-    {
-        // Compare the MD5
-        if(memcmp(pbMD5Array1, pbMD5Array2, dwMD5Size))
-            nError = ERROR_FILE_CORRUPT;
-    }
-
-    // Free memory and return result
-    if(pbMD5Array2 != NULL)
-        STORM_FREE(pbMD5Array2);
-    if(pbMD5Array1 != NULL)
-        STORM_FREE(pbMD5Array1);
-    if(pbDataChunk != NULL)
-        STORM_FREE(pbDataChunk);
-    return nError;
-}
-
-static DWORD VerifyWeakSignature(
-        TMPQArchive * ha,
-        PMPQ_SIGNATURE_INFO pSI)
-{
-    BYTE RevSignature[MPQ_WEAK_SIGNATURE_SIZE];
-    BYTE Md5Digest[MD5_DIGEST_SIZE];
-    rsa_key key;
-    int hash_idx = find_hash("md5");
-    int result = 0;
-
-    // Calculate hash of the entire archive, skipping the (signature) file
-    if(!CalculateMpqHashMd5(ha, pSI, Md5Digest))
-        return ERROR_VERIFY_FAILED;
-
-    // Import the Blizzard key in OpenSSL format
-    if(!decode_base64_key(szBlizzardWeakPublicKey, &key))
-        return ERROR_VERIFY_FAILED;
-
-    // Verify the signature
-    memcpy(RevSignature, &pSI->Signature[8], MPQ_WEAK_SIGNATURE_SIZE);
-    memrev(RevSignature, MPQ_WEAK_SIGNATURE_SIZE);
-    rsa_verify_hash_ex(RevSignature, MPQ_WEAK_SIGNATURE_SIZE, Md5Digest, sizeof(Md5Digest), LTC_LTC_PKCS_1_V1_5, hash_idx, 0, &result, &key);
-    rsa_free(&key);
-
-    // Return the result
-    return result ? ERROR_WEAK_SIGNATURE_OK : ERROR_WEAK_SIGNATURE_ERROR;
-}
-
-static DWORD VerifyStrongSignatureWithKey(
-        unsigned char * reversed_signature,
-        unsigned char * padded_digest,
-        const char * szPublicKey)
-{
-    rsa_key key;
-    int result = 0;
-
-    // Import the Blizzard key in OpenSSL format
-    if(!decode_base64_key(szPublicKey, &key))
-    {
-        assert(false);
-        return ERROR_VERIFY_FAILED;
-    }
-
-    // Verify the signature
-    if(rsa_verify_simple(reversed_signature, MPQ_STRONG_SIGNATURE_SIZE, padded_digest, MPQ_STRONG_SIGNATURE_SIZE, &result, &key) != CRYPT_OK)
-        return ERROR_VERIFY_FAILED;
-
-    // Free the key and return result
-    rsa_free(&key);
-    return result ? ERROR_STRONG_SIGNATURE_OK : ERROR_STRONG_SIGNATURE_ERROR;
-}
-
-static DWORD VerifyStrongSignature(
-        TMPQArchive * ha,
-        PMPQ_SIGNATURE_INFO pSI)
-{
-    unsigned char reversed_signature[MPQ_STRONG_SIGNATURE_SIZE];
-    unsigned char Sha1Digest_tail0[SHA1_DIGEST_SIZE];
-    unsigned char Sha1Digest_tail1[SHA1_DIGEST_SIZE];
-    unsigned char Sha1Digest_tail2[SHA1_DIGEST_SIZE];
-    unsigned char padded_digest[MPQ_STRONG_SIGNATURE_SIZE];
-    DWORD dwResult;
-    size_t digest_offset;
-
-    // Calculate SHA1 hash of the archive
-    if(!CalculateMpqHashSha1(ha, pSI, Sha1Digest_tail0, Sha1Digest_tail1, Sha1Digest_tail2))
-        return ERROR_VERIFY_FAILED;
-
-    // Prepare the signature for decryption
-    memcpy(reversed_signature, &pSI->Signature[4], MPQ_STRONG_SIGNATURE_SIZE);
-    memrev(reversed_signature, MPQ_STRONG_SIGNATURE_SIZE);
-
-    // Prepare the padded digest for comparison
-    digest_offset = sizeof(padded_digest) - SHA1_DIGEST_SIZE;
-    memset(padded_digest, 0xbb, digest_offset);
-    padded_digest[0] = 0x0b;
-
-    // Try Blizzard Strong public key with no SHA1 tail
-    memcpy(padded_digest + digest_offset, Sha1Digest_tail0, SHA1_DIGEST_SIZE);
-    memrev(padded_digest + digest_offset, SHA1_DIGEST_SIZE);
-    dwResult = VerifyStrongSignatureWithKey(reversed_signature, padded_digest, szBlizzardStrongPublicKey);
-    if(dwResult == ERROR_STRONG_SIGNATURE_OK)
-        return dwResult;
-
-    // Try War 3 map public key with plain file name as SHA1 tail
-    memcpy(padded_digest + digest_offset, Sha1Digest_tail1, SHA1_DIGEST_SIZE);
-    memrev(padded_digest + digest_offset, SHA1_DIGEST_SIZE);
-    dwResult = VerifyStrongSignatureWithKey(reversed_signature, padded_digest, szWarcraft3MapPublicKey);
-    if(dwResult == ERROR_STRONG_SIGNATURE_OK)
-        return dwResult;
-
-    // Try WoW-TBC public key with "ARCHIVE" as SHA1 tail
-    memcpy(padded_digest + digest_offset, Sha1Digest_tail2, SHA1_DIGEST_SIZE);
-    memrev(padded_digest + digest_offset, SHA1_DIGEST_SIZE);
-    dwResult = VerifyStrongSignatureWithKey(reversed_signature, padded_digest, szWowPatchPublicKey);
-    if(dwResult == ERROR_STRONG_SIGNATURE_OK)
-        return dwResult;
-
-    // Try Survey public key with no SHA1 tail
-    memcpy(padded_digest + digest_offset, Sha1Digest_tail0, SHA1_DIGEST_SIZE);
-    memrev(padded_digest + digest_offset, SHA1_DIGEST_SIZE);
-    dwResult = VerifyStrongSignatureWithKey(reversed_signature, padded_digest, szWowSurveyPublicKey);
-    if(dwResult == ERROR_STRONG_SIGNATURE_OK)
-        return dwResult;
-
-    // Try Starcraft II public key with no SHA1 tail
-    memcpy(padded_digest + digest_offset, Sha1Digest_tail0, SHA1_DIGEST_SIZE);
-    memrev(padded_digest + digest_offset, SHA1_DIGEST_SIZE);
-    dwResult = VerifyStrongSignatureWithKey(reversed_signature, padded_digest, szStarcraft2MapPublicKey);
-    if(dwResult == ERROR_STRONG_SIGNATURE_OK)
-        return dwResult;
-
-    return ERROR_STRONG_SIGNATURE_ERROR;
-}
-
-static DWORD VerifyFile(
-        HANDLE hMpq,
-        const char * szFileName,
-        LPDWORD pdwCrc32,
-        char * pMD5,
-        DWORD dwFlags)
-{
-    hash_state md5_state;
-    unsigned char * pFileMd5;
-    unsigned char md5[MD5_DIGEST_SIZE];
-    TFileEntry * pFileEntry;
-    TMPQFile * hf;
-    BYTE Buffer[0x1000];
-    HANDLE hFile = NULL;
-    DWORD dwVerifyResult = 0;
-    DWORD dwSearchScope = SFILE_OPEN_FROM_MPQ;
-    DWORD dwTotalBytes = 0;
-    DWORD dwBytesRead;
-    DWORD dwCrc32 = 0;
-
-    // Fix the open type for patched archives
-    if(SFileIsPatchedArchive(hMpq))
-        dwSearchScope = SFILE_OPEN_PATCHED_FILE;
-
-    // If we have to verify raw data MD5, do it before file open
-    if(dwFlags & SFILE_VERIFY_RAW_MD5)
-    {
-        TMPQArchive * ha = (TMPQArchive *)hMpq;
-
-        // Parse the base MPQ and all patches
-        while(ha != NULL)
-        {
-            // Does the archive have support for raw MD5?
-            if(ha->pHeader->dwRawChunkSize != 0)
-            {
-                // The file has raw MD5 if the archive supports it
-                dwVerifyResult |= VERIFY_FILE_HAS_RAW_MD5;
-
-                // Find file entry for the file
-                pFileEntry = GetFileEntryLocale(ha, szFileName, lcFileLocale);
-                if(pFileEntry != NULL)
-                {
-                    // If the file's raw MD5 doesn't match, don't bother with more checks
-                    if(VerifyRawMpqData(ha, pFileEntry->ByteOffset, pFileEntry->dwCmpSize) != ERROR_SUCCESS)
-                        return dwVerifyResult | VERIFY_FILE_RAW_MD5_ERROR;
-                }
-            }
-
-            // Move to the next patch
-            ha = ha->haPatch;
-        }
-    }
-
-    // Attempt to open the file
-    if(SFileOpenFileEx(hMpq, szFileName, dwSearchScope, &hFile))
-    {
-        // Get the file size
-        hf = (TMPQFile *)hFile;
-        pFileEntry = hf->pFileEntry;
-        dwTotalBytes = SFileGetFileSize(hFile, NULL);
-
-        // Initialize the CRC32 and MD5 contexts
-        md5_init(&md5_state);
-        dwCrc32 = crc32(0, Z_NULL, 0);
-
-        // Also turn on sector checksum verification
-        if(dwFlags & SFILE_VERIFY_SECTOR_CRC)
-            hf->bCheckSectorCRCs = true;
-
-        // Go through entire file and update both CRC32 and MD5
-        for(;;)
-        {
-            // Read data from file
-            SFileReadFile(hFile, Buffer, sizeof(Buffer), &dwBytesRead, NULL);
-            if(dwBytesRead == 0)
-            {
-                if(GetLastError() == ERROR_CHECKSUM_ERROR)
-                    dwVerifyResult |= VERIFY_FILE_SECTOR_CRC_ERROR;
-                break;
-            }
-
-            // Update CRC32 value
-            if(dwFlags & SFILE_VERIFY_FILE_CRC)
-                dwCrc32 = crc32(dwCrc32, Buffer, dwBytesRead);
-
-            // Update MD5 value
-            if(dwFlags & SFILE_VERIFY_FILE_MD5)
-                md5_process(&md5_state, Buffer, dwBytesRead);
-
-            // Decrement the total size
-            dwTotalBytes -= dwBytesRead;
-        }
-
-        // If the file has sector checksums, indicate it in the flags
-        if(dwFlags & SFILE_VERIFY_SECTOR_CRC)
-        {
-            if((hf->pFileEntry->dwFlags & MPQ_FILE_SECTOR_CRC) && hf->SectorChksums != NULL && hf->SectorChksums[0] != 0)
-                dwVerifyResult |= VERIFY_FILE_HAS_SECTOR_CRC;
-        }
-
-        // Check if the entire file has been read
-        // No point in checking CRC32 and MD5 if not
-        // Skip checksum checks if the file has patches
-        if(dwTotalBytes == 0)
-        {
-            // Check CRC32 and MD5 only if there is no patches
-            if(hf->hfPatchFile == NULL)
-            {
-                // Check if the CRC32 matches.
-                if(dwFlags & SFILE_VERIFY_FILE_CRC)
-                {
-                    // Only check the CRC32 if it is valid
-                    if(pFileEntry->dwCrc32 != 0)
-                    {
-                        dwVerifyResult |= VERIFY_FILE_HAS_CHECKSUM;
-                        if(dwCrc32 != pFileEntry->dwCrc32)
-                            dwVerifyResult |= VERIFY_FILE_CHECKSUM_ERROR;
-                    }
-                }
-
-                // Check if MD5 matches
-                if(dwFlags & SFILE_VERIFY_FILE_MD5)
-                {
-                    // Patch files have their MD5 saved in the patch info
-                    pFileMd5 = (hf->pPatchInfo != NULL) ? hf->pPatchInfo->md5 : pFileEntry->md5;
-                    md5_done(&md5_state, md5);
-
-                    // Only check the MD5 if it is valid
-                    if(is_valid_md5(pFileMd5))
-                    {
-                        dwVerifyResult |= VERIFY_FILE_HAS_MD5;
-                        if(memcmp(md5, pFileMd5, MD5_DIGEST_SIZE))
-                            dwVerifyResult |= VERIFY_FILE_MD5_ERROR;
-                    }
-                }
-            }
-            else
-            {
-                // Patched files are MD5-checked automatically
-                dwVerifyResult |= VERIFY_FILE_HAS_MD5;
-            }
-        }
-        else
-        {
-            dwVerifyResult |= VERIFY_READ_ERROR;
-        }
-
-        SFileCloseFile(hFile);
-    }
-    else
-    {
-        // Remember that the file couldn't be open
-        dwVerifyResult |= VERIFY_OPEN_ERROR;
-    }
-
-    // If the caller required CRC32 and/or MD5, give it to him
-    if(pdwCrc32 != NULL)
-        *pdwCrc32 = dwCrc32;
-    if(pMD5 != NULL)
-        memcpy(pMD5, md5, MD5_DIGEST_SIZE);
-
-    return dwVerifyResult;
-}
-
-//-----------------------------------------------------------------------------
-// Public (exported) functions
-
-bool WINAPI SFileGetFileChecksums(HANDLE hMpq, const char * szFileName, LPDWORD pdwCrc32, char * pMD5)
-{
-    DWORD dwVerifyResult;
-    DWORD dwVerifyFlags = 0;
-
-    if(pdwCrc32 != NULL)
-        dwVerifyFlags |= SFILE_VERIFY_FILE_CRC;
-    if(pMD5 != NULL)
-        dwVerifyFlags |= SFILE_VERIFY_FILE_MD5;
-
-    dwVerifyResult = VerifyFile(hMpq,
-                                szFileName,
-                                pdwCrc32,
-                                pMD5,
-                                dwVerifyFlags);
-
-    // If verification failed, return zero
-    if(dwVerifyResult & VERIFY_FILE_ERROR_MASK)
-    {
-        SetLastError(ERROR_FILE_CORRUPT);
-        return false;
-    }
-
-    return true;
-}
-
-
-DWORD WINAPI SFileVerifyFile(HANDLE hMpq, const char * szFileName, DWORD dwFlags)
-{
-    return VerifyFile(hMpq,
-                      szFileName,
-                      NULL,
-                      NULL,
-                      dwFlags);
-}
-
-// Verifies raw data of the archive Only works for MPQs version 4 or newer
-int WINAPI SFileVerifyRawData(HANDLE hMpq, DWORD dwWhatToVerify, const char * szFileName)
-{
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-    TFileEntry * pFileEntry;
-    TMPQHeader * pHeader;
-
-    // Verify input parameters
-    if(!IsValidMpqHandle(ha))
-        return ERROR_INVALID_PARAMETER;
-    pHeader = ha->pHeader;
-
-    // If the archive doesn't have raw data MD5, report it as OK
-    if(pHeader->dwRawChunkSize == 0)
-        return ERROR_SUCCESS;
-
-    // If we have to verify MPQ header, do it
-    switch(dwWhatToVerify)
-    {
-    case SFILE_VERIFY_MPQ_HEADER:
-
-        // Only if the header is of version 4 or newer
-        if(pHeader->dwHeaderSize >= (MPQ_HEADER_SIZE_V4 - MD5_DIGEST_SIZE))
-            return VerifyRawMpqData(ha, 0, MPQ_HEADER_SIZE_V4 - MD5_DIGEST_SIZE);
-        return ERROR_SUCCESS;
-
-    case SFILE_VERIFY_HET_TABLE:
-
-        // Only if we have HET table
-        if(pHeader->HetTablePos64 && pHeader->HetTableSize64)
-            return VerifyRawMpqData(ha, pHeader->HetTablePos64, (DWORD)pHeader->HetTableSize64);
-        return ERROR_SUCCESS;
-
-    case SFILE_VERIFY_BET_TABLE:
-
-        // Only if we have BET table
-        if(pHeader->BetTablePos64 && pHeader->BetTableSize64)
-            return VerifyRawMpqData(ha, pHeader->BetTablePos64, (DWORD)pHeader->BetTableSize64);
-        return ERROR_SUCCESS;
-
-    case SFILE_VERIFY_HASH_TABLE:
-
-        // Hash table is not protected by MD5
-        return ERROR_SUCCESS;
-
-    case SFILE_VERIFY_BLOCK_TABLE:
-
-        // Block table is not protected by MD5
-        return ERROR_SUCCESS;
-
-    case SFILE_VERIFY_HIBLOCK_TABLE:
-
-        // It is unknown if the hi-block table is protected my MD5 or not.
-        return ERROR_SUCCESS;
-
-    case SFILE_VERIFY_FILE:
-
-        // Verify parameters
-        if(szFileName == NULL || *szFileName == 0)
-            return ERROR_INVALID_PARAMETER;
-
-        // Get the offset of a file
-        pFileEntry = GetFileEntryLocale(ha, szFileName, lcFileLocale);
-        if(pFileEntry == NULL)
-            return ERROR_FILE_NOT_FOUND;
-
-        return VerifyRawMpqData(ha, pFileEntry->ByteOffset, pFileEntry->dwCmpSize);
-    }
-
-    return ERROR_INVALID_PARAMETER;
-}
-
-
-// Verifies the archive against the signature
-DWORD WINAPI SFileVerifyArchive(HANDLE hMpq)
-{
-    MPQ_SIGNATURE_INFO si;
-    TMPQArchive * ha = (TMPQArchive *)hMpq;
-
-    // Verify input parameters
-    if(!IsValidMpqHandle(ha))
-        return ERROR_VERIFY_FAILED;
-
-    // Get the MPQ signature and signature type
-    memset(&si, 0, sizeof(MPQ_SIGNATURE_INFO));
-    if(!QueryMpqSignatureInfo(ha, &si))
-        return ERROR_VERIFY_FAILED;
-
-    // Verify the signature
-    switch(si.nSignatureType)
-    {
-    case SIGNATURE_TYPE_NONE:
-        return ERROR_NO_SIGNATURE;
-
-    case SIGNATURE_TYPE_WEAK:
-        return VerifyWeakSignature(ha, &si);
-
-    case SIGNATURE_TYPE_STRONG:
-        return VerifyStrongSignature(ha, &si);
-    }
-
-    return ERROR_VERIFY_FAILED;
-}
diff --git a/dep/StormLibOld/src/StormCommon.h b/dep/StormLibOld/src/StormCommon.h
deleted file mode 100644
index 57a890667..000000000
--- a/dep/StormLibOld/src/StormCommon.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/*****************************************************************************/
-/* SCommon.h                              Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Common functions for encryption/decryption from Storm.dll. Included by    */
-/* SFile*** functions, do not include and do not use this file directly      */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 24.03.03  1.00  Lad  The first version of SFileCommon.h                   */
-/* 12.06.04  1.00  Lad  Renamed to SCommon.h                                 */
-/* 06.09.10  1.00  Lad  Renamed to StormCommon.h                             */
-/*****************************************************************************/
-
-#ifndef __STORMCOMMON_H__
-#define __STORMCOMMON_H__
-
-//-----------------------------------------------------------------------------
-// Compression support
-
-// Include functions from Pkware Data Compression Library
-#include "pklib/pklib.h"
-
-// Include functions from Huffmann compression
-#include "huffman/huff.h"
-
-// Include functions from IMA ADPCM compression
-#include "adpcm/adpcm.h"
-
-// Include functions from SPARSE compression
-#include "sparse/sparse.h"
-
-// Include functions from LZMA compression
-#include "lzma/C/LzmaEnc.h"
-#include "lzma/C/LzmaDec.h"
-
-// Include functions from zlib
-#ifndef __SYS_ZLIB
-#include "zlib/zlib.h"
-#else
-#include <zlib.h>
-#endif
-
-// Include functions from bzlib
-#ifndef __SYS_BZLIB
-#include "bzip2/bzlib.h"
-#else
-#include <bzlib.h>
-#endif
-
-//-----------------------------------------------------------------------------
-// Cryptography support
-
-// Headers from LibTomCrypt
-#include "libtomcrypt/src/headers/tomcrypt.h"
-
-// For HashStringJenkins
-#include "jenkins/lookup.h"
-
-//-----------------------------------------------------------------------------
-// StormLib private defines
-
-#define ID_MPQ_FILE            0x46494c45     // Used internally for checking TMPQFile ('FILE')
-
-#define MPQ_WEAK_SIGNATURE_SIZE        64
-#define MPQ_STRONG_SIGNATURE_SIZE     256
-
-// Prevent problems with CRT "min" and "max" functions,
-// as they are not defined on all platforms
-#define STORMLIB_MIN(a, b) ((a < b) ? a : b)
-#define STORMLIB_MAX(a, b) ((a > b) ? a : b)
-
-// Macro for building 64-bit file offset from two 32-bit
-#define MAKE_OFFSET64(hi, lo)      (((ULONGLONG)hi << 32) | lo)
-
-//-----------------------------------------------------------------------------
-// Memory management
-//
-// We use our own macros for allocating/freeing memory. If you want
-// to redefine them, please keep the following rules
-//
-//  - The memory allocation must return NULL if not enough memory
-//    (i.e not to throw exception)
-//  - It is not necessary to fill the allocated buffer with zeros
-//  - Memory freeing function doesn't have to test the pointer to NULL.
-//
-
-#if defined(_MSC_VER) && defined(_DEBUG)
-__inline void * DebugMalloc(char * /* szFile */, int /* nLine */, size_t nSize)
-{
-    //  return new BYTE[nSize];
-    return HeapAlloc(GetProcessHeap(), 0, nSize);
-}
-
-__inline void DebugFree(void * ptr)
-{
-    //  delete [] ptr;
-    HeapFree(GetProcessHeap(), 0, ptr);
-}
-
-#define STORM_ALLOC(type, nitems) (type *)DebugMalloc(__FILE__, __LINE__, (nitems) * sizeof(type))
-#define STORM_FREE(ptr)           DebugFree(ptr)
-#else
-
-#define STORM_ALLOC(type, nitems)   (type *)malloc((nitems) * sizeof(type))
-#define STORM_FREE(ptr) free(ptr)
-
-#endif
-
-//-----------------------------------------------------------------------------
-// StormLib internal global variables
-
-extern LCID lcFileLocale;                       // Preferred file locale
-
-//-----------------------------------------------------------------------------
-// Encryption and decryption functions
-
-#define MPQ_HASH_TABLE_INDEX    0x000
-#define MPQ_HASH_NAME_A         0x100
-#define MPQ_HASH_NAME_B         0x200
-#define MPQ_HASH_FILE_KEY       0x300
-
-DWORD HashString(const char * szFileName, DWORD dwHashType);
-
-void  InitializeMpqCryptography();
-
-DWORD GetHashTableSizeForFileCount(DWORD dwFileCount);
-
-bool IsPseudoFileName(const char * szFileName, LPDWORD pdwFileIndex);
-ULONGLONG HashStringJenkins(const char * szFileName);
-
-int ConvertMpqHeaderToFormat4(TMPQArchive * ha, ULONGLONG FileSize, DWORD dwFlags);
-
-DWORD GetDefaultSpecialFileFlags(TMPQArchive * ha, DWORD dwFileSize);
-
-void  EncryptMpqBlock(void * pvFileBlock, DWORD dwLength, DWORD dwKey);
-void  DecryptMpqBlock(void * pvFileBlock, DWORD dwLength, DWORD dwKey);
-
-DWORD DetectFileKeyBySectorSize(LPDWORD SectorOffsets, DWORD decrypted);
-DWORD DetectFileKeyByContent(void * pvFileContent, DWORD dwFileSize);
-DWORD DecryptFileKey(const char * szFileName, ULONGLONG MpqPos, DWORD dwFileSize, DWORD dwFlags);
-
-bool IsValidMD5(LPBYTE pbMd5);
-bool VerifyDataBlockHash(void * pvDataBlock, DWORD cbDataBlock, LPBYTE expected_md5);
-void CalculateDataBlockHash(void * pvDataBlock, DWORD cbDataBlock, LPBYTE md5_hash);
-
-//-----------------------------------------------------------------------------
-// Handle validation functions
-
-bool IsValidMpqHandle(TMPQArchive * ha);
-bool IsValidFileHandle(TMPQFile * hf);
-
-//-----------------------------------------------------------------------------
-// Hash table and block table manipulation
-
-TMPQHash * GetFirstHashEntry(TMPQArchive * ha, const char * szFileName);
-TMPQHash * GetNextHashEntry(TMPQArchive * ha, TMPQHash * pFirstHash, TMPQHash * pPrevHash);
-DWORD AllocateHashEntry(TMPQArchive * ha, TFileEntry * pFileEntry);
-DWORD AllocateHetEntry(TMPQArchive * ha, TFileEntry * pFileEntry);
-
-void FindFreeMpqSpace(TMPQArchive * ha, ULONGLONG * pFreeSpacePos);
-
-// Functions that loads and verifies MPQ data bitmap
-int  LoadMpqDataBitmap(TMPQArchive * ha, ULONGLONG FileSize, bool * pbFileIsComplete);
-
-// Functions that load the HET and BET tables
-int  CreateHashTable(TMPQArchive * ha, DWORD dwHashTableSize);
-int  LoadAnyHashTable(TMPQArchive * ha);
-int  BuildFileTable(TMPQArchive * ha, ULONGLONG FileSize);
-int  SaveMPQTables(TMPQArchive * ha);
-
-TMPQHetTable * CreateHetTable(DWORD dwMaxFileCount, DWORD dwHashBitSize, bool bCreateEmpty);
-void FreeHetTable(TMPQHetTable * pHetTable);
-
-TMPQBetTable * CreateBetTable(DWORD dwMaxFileCount);
-void FreeBetTable(TMPQBetTable * pBetTable);
-
-// Functions for finding files in the file table
-TFileEntry * GetFileEntryAny(TMPQArchive * ha, const char * szFileName);
-TFileEntry * GetFileEntryLocale(TMPQArchive * ha, const char * szFileName, LCID lcLocale);
-TFileEntry * GetFileEntryExact(TMPQArchive * ha, const char * szFileName, LCID lcLocale);
-TFileEntry * GetFileEntryByIndex(TMPQArchive * ha, DWORD dwIndex);
-
-// Allocates file name in the file entry
-void AllocateFileName(TFileEntry * pFileEntry, const char * szFileName);
-
-// Allocates new file entry in the MPQ tables. Reuses existing, if possible
-TFileEntry * FindFreeFileEntry(TMPQArchive * ha);
-TFileEntry * AllocateFileEntry(TMPQArchive * ha, const char * szFileName, LCID lcLocale);
-int  RenameFileEntry(TMPQArchive * ha, TFileEntry * pFileEntry, const char * szNewFileName);
-void ClearFileEntry(TMPQArchive * ha, TFileEntry * pFileEntry);
-int  FreeFileEntry(TMPQArchive * ha, TFileEntry * pFileEntry);
-
-// Invalidates entries for (listfile) and (attributes)
-void InvalidateInternalFiles(TMPQArchive * ha);
-
-//-----------------------------------------------------------------------------
-// Common functions - MPQ File
-
-TMPQFile * CreateMpqFile(TMPQArchive * ha);
-int  LoadMpqTable(TMPQArchive * ha, ULONGLONG ByteOffset, void * pvTable, DWORD dwCompressedSize, DWORD dwRealSize, DWORD dwKey);
-int  AllocateSectorBuffer(TMPQFile * hf);
-int  AllocatePatchInfo(TMPQFile * hf, bool bLoadFromFile);
-int  AllocateSectorOffsets(TMPQFile * hf, bool bLoadFromFile);
-int  AllocateSectorChecksums(TMPQFile * hf, bool bLoadFromFile);
-void CalculateRawSectorOffset(ULONGLONG & RawFilePos, TMPQFile * hf, DWORD dwSectorOffset);
-int  WritePatchInfo(TMPQFile * hf);
-int  WriteSectorOffsets(TMPQFile * hf);
-int  WriteSectorChecksums(TMPQFile * hf);
-int  WriteMemDataMD5(TFileStream * pStream, ULONGLONG RawDataOffs, void * pvRawData, DWORD dwRawDataSize, DWORD dwChunkSize, LPDWORD pcbTotalSize);
-int  WriteMpqDataMD5(TFileStream * pStream, ULONGLONG RawDataOffs, DWORD dwRawDataSize, DWORD dwChunkSize);
-void FreeMPQFile(TMPQFile *& hf);
-
-bool IsIncrementalPatchFile(const void * pvData, DWORD cbData, LPDWORD pdwPatchedFileSize);
-int  PatchFileData(TMPQFile * hf);
-
-void FreeMPQArchive(TMPQArchive *& ha);
-
-//-----------------------------------------------------------------------------
-// Utility functions
-
-bool CheckWildCard(const char * szString, const char * szWildCard);
-const char * GetPlainFileNameA(const char * szFileName);
-const TCHAR * GetPlainFileNameT(const TCHAR * szFileName);
-bool IsInternalMpqFileName(const char * szFileName);
-
-//-----------------------------------------------------------------------------
-// Support for adding files to the MPQ
-
-int SFileAddFile_Init(
-        TMPQArchive * ha,
-        const char * szArchivedName,
-        ULONGLONG ft,
-        DWORD dwFileSize,
-        LCID lcLocale,
-        DWORD dwFlags,
-        TMPQFile ** phf
-        );
-
-int SFileAddFile_Write(
-        TMPQFile * hf,
-        const void * pvData,
-        DWORD dwSize,
-        DWORD dwCompression
-        );
-
-int SFileAddFile_Finish(
-        TMPQFile * hf
-        );
-
-//-----------------------------------------------------------------------------
-// Attributes support
-
-int  SAttrLoadAttributes(TMPQArchive * ha);
-int  SAttrFileSaveToMpq(TMPQArchive * ha);
-
-//-----------------------------------------------------------------------------
-// Listfile functions
-
-int  SListFileSaveToMpq(TMPQArchive * ha);
-
-//-----------------------------------------------------------------------------
-// Dump data support
-
-#ifdef __STORMLIB_DUMP_DATA__
-void DumpMpqHeader(TMPQHeader * pHeader);
-void DumpHetAndBetTable(TMPQHetTable * pHetTable, TMPQBetTable * pBetTable);
-
-#else
-#define DumpMpqHeader(h)           /* */
-#define DumpHetAndBetTable(h, b)   /* */
-#endif
-
-#endif // __STORMCOMMON_H__
-
diff --git a/dep/StormLibOld/src/StormLib.h b/dep/StormLibOld/src/StormLib.h
deleted file mode 100644
index e5e153697..000000000
--- a/dep/StormLibOld/src/StormLib.h
+++ /dev/null
@@ -1,987 +0,0 @@
-/*****************************************************************************/
-/* StormLib.h                        Copyright (c) Ladislav Zezula 1999-2010 */
-/*---------------------------------------------------------------------------*/
-/* StormLib library v 7.02                                                   */
-/*                                                                           */
-/* Author : Ladislav Zezula                                                  */
-/* E-mail : ladik@zezula.net                                                 */
-/* WWW    : http://www.zezula.net                                            */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* xx.xx.99  1.00  Lad  Created                                              */
-/* 24.03.03  2.50  Lad  Version 2.50                                         */
-/* 02.04.03  3.00  Lad  Version 3.00 with compression                        */
-/* 11.04.03  3.01  Lad  Renamed to StormLib.h for compatibility with         */
-/*                      original headers for Storm.dll                       */
-/* 10.05.03  3.02  Lad  Added Pkware DCL compression                         */
-/* 26.05.03  4.00  Lad  Completed all compressions                           */
-/* 18.06.03  4.01  Lad  Added SFileSetFileLocale                             */
-/*                      Added SFileExtractFile                               */
-/* 26.07.03  4.02  Lad  Implemented nameless rename and delete               */
-/* 26.07.03  4.03  Lad  Added support for protected MPQs                     */
-/* 28.08.03  4.10  Lad  Fixed bugs that caused StormLib incorrectly work     */
-/*                      with Diablo I savegames and with files having full   */
-/*                      hash table                                           */
-/* 08.12.03  4.11  DCH  Fixed bug in reading file sector larger than 0x1000  */
-/*                      on certain files.                                    */
-/*                      Fixed bug in AddFile with MPQ_FILE_REPLACE_EXISTING  */
-/*                      (Thanx Daniel Chiamarello, dchiamarello@madvawes.com)*/
-/* 21.12.03  4.50  Lad  Completed port for Mac                               */
-/*                      Fixed bug in compacting (if fsize is mul of 0x1000)  */
-/*                      Fixed bug in SCompCompress                           */
-/* 27.05.04  4.51  Lad  Changed memory management from new/delete to our     */
-/*                      own macros                                           */
-/* 22.06.04  4.60  Lad  Optimized search. Support for multiple listfiles.    */
-/* 30.09.04  4.61  Lad  Fixed some bugs (Aaargh !!!)                         */
-/*                      Correctly works if HashTableSize > BlockTableSize    */
-/* 29.12.04  4.70  Lad  Fixed compatibility problem with MPQs from WoW       */
-/* 14.07.05  5.00  Lad  Added the BZLIB compression support                  */
-/*                      Added suport of files stored as single unit          */
-/* 17.04.06  5.01  Lad  Converted to MS Visual Studio 8.0                    */
-/*                      Fixed issue with protected Warcraft 3 protected maps */
-/* 15.05.06  5.02  Lad  Fixed issue with WoW 1.10+                           */
-/* 07.09.06  5.10  Lad  Fixed processing files longer than 2GB               */
-/* 22.11.06  6.00  Lad  Support for MPQ archives V2                          */
-/* 12.06.07  6.10  Lad  Support for (attributes) file                        */
-/* 10.09.07  6.12  Lad  Support for MPQs protected by corrupting hash table  */
-/* 03.12.07  6.13  Lad  Support for MPQs with hash tbl size > block tbl size */
-/* 07.04.08  6.20  Lad  Added SFileFlushArchive                              */
-/* 09.04.08        Lad  Removed FilePointer variable from MPQ handle         */
-/*                      structure, as it caused more problems than benefits  */
-/* 12.05.08  6.22  Lad  Support for w3xMaster map protector                  */
-/* 05.10.08  6.23  Lad  Support for protectors who set negative values in    */
-/*                      the table of file blocks                             */
-/* 26.05.09  6.24  Lad  Fixed search for multiple lang files with deleted    */
-/*                      entries                                              */
-/* 03.09.09  6.25  Lad  Fixed decompression bug in huffmann decompression    */
-/* 22.03.10  6.50  Lad  New compressions in Starcraft II (LZMA, sparse)      */
-/*                      Fixed compacting MPQs that contain single unit files */
-/* 26.04.10  7.00  Lad  Major rewrite                                        */
-/* 08.06.10  7.10  Lad  Support for partial MPQs                             */
-/* 08.07.10  7.11  Lad  Support for MPQs v 3.0                               */
-/* 20.08.10  7.20  Lad  Support for opening multiple MPQs in patch mode      */
-/* 20.09.10  8.00  Lad  MPQs v 4, HET and BET tables                         */
-/* 07.01.11  8.01  Lad  Write support for MPQs v 3 and 4                     */
-/* 15.09.11  8.04  Lad  Bug fixes, testing for Diablo III MPQs               */
-/* 26.04.12  8.10  Lad  Support for data map, added SFileGetArchiveBitmap    */
-/* 29.05.12  8.20  Lad  C-only interface                                     */
-/*****************************************************************************/
-
-#ifndef __STORMLIB_H__
-#define __STORMLIB_H__
-
-#ifdef _MSC_VER
-#pragma warning(disable:4668)       // 'XXX' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
-#pragma warning(disable:4820)       // 'XXX' : '2' bytes padding added after data member 'XXX::yyy'
-#endif
-
-#include "StormPort.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//-----------------------------------------------------------------------------
-// Use the apropriate library
-//
-// The library type is encoded in the library name as the following
-// StormLibXYZ.lib
-//
-//  X - D for Debug version, R for Release version
-//  Y - A for ANSI version, U for Unicode version
-//  Z - S for static-linked CRT library, D for multithreaded DLL CRT library
-//
-
-#if defined(_MSC_VER) && !defined(__STORMLIB_SELF__)
-
-#ifdef _DEBUG                                 // DEBUG VERSIONS
-#ifndef _UNICODE
-#ifdef _DLL
-#pragma comment(lib, "StormLibDAD.lib") // Debug Ansi CRT-DLL version
-#else
-#pragma comment(lib, "StormLibDAS.lib") // Debug Ansi CRT-LIB version
-#endif
-#else
-#ifdef _DLL
-#pragma comment(lib, "StormLibDUD.lib") // Debug Unicode CRT-DLL version
-#else
-#pragma comment(lib, "StormLibDUS.lib") // Debug Unicode CRT-LIB version
-#endif
-#endif
-#else                                         // RELEASE VERSIONS
-#ifndef _UNICODE
-#ifdef _DLL
-#pragma comment(lib, "StormLibRAD.lib") // Release Ansi CRT-DLL version
-#else
-#pragma comment(lib, "StormLibRAS.lib") // Release Ansi CRT-LIB version
-#endif
-#else
-#ifdef _DLL
-#pragma comment(lib, "StormLibRUD.lib") // Release Unicode CRT-DLL version
-#else
-#pragma comment(lib, "StormLibRUS.lib") // Release Unicode CRT-LIB version
-#endif
-#endif
-#endif
-
-#endif
-
-//-----------------------------------------------------------------------------
-// Defines
-
-#define ID_MPQ                      0x1A51504D  // MPQ archive header ID ('MPQ\x1A')
-#define ID_MPQ_USERDATA             0x1B51504D  // MPQ userdata entry ('MPQ\x1B')
-
-#define ERROR_AVI_FILE                   10000  // No MPQ file, but AVI file.
-#define ERROR_UNKNOWN_FILE_KEY           10001  // Returned by SFileReadFile when can't find file key
-#define ERROR_CHECKSUM_ERROR             10002  // Returned by SFileReadFile when sector CRC doesn't match
-#define ERROR_INTERNAL_FILE              10003  // The given operation is not allowed on internal file
-#define ERROR_BASE_FILE_MISSING          10004  // The file is present as incremental patch file, but base file is missing
-#define ERROR_MARKED_FOR_DELETE          10005  // The file was marked as "deleted" in the MPQ
-
-// Values for SFileCreateArchive
-#define HASH_TABLE_SIZE_MIN         0x00000004  // Minimum acceptable hash table size
-#define HASH_TABLE_SIZE_DEFAULT     0x00001000  // Default hash table size for empty MPQs
-#define HASH_TABLE_SIZE_MAX         0x00080000  // Maximum acceptable hash table size
-
-#define HASH_ENTRY_DELETED          0xFFFFFFFE  // Block index for deleted entry in the hash table
-#define HASH_ENTRY_FREE             0xFFFFFFFF  // Block index for free entry in the hash table
-
-#define HET_ENTRY_DELETED                 0x80  // HET hash value for a deleted entry
-#define HET_ENTRY_FREE                    0x00  // HET hash value for free entry
-
-#define HASH_STATE_SIZE                   0x60  // Size of LibTomCrypt's hash_state structure
-
-#define MPQ_PATCH_PREFIX_LEN              0x20  // Maximum length of the patch prefix
-
-// Values for SFileOpenArchive
-#define SFILE_OPEN_HARD_DISK_FILE            2  // Open the archive on HDD
-#define SFILE_OPEN_CDROM_FILE                3  // Open the archive only if it is on CDROM
-
-// Values for SFileOpenFile
-#define SFILE_OPEN_FROM_MPQ         0x00000000  // Open the file from the MPQ archive
-#define SFILE_OPEN_PATCHED_FILE     0x00000001  // Open the file from the MPQ archive
-#define SFILE_OPEN_ANY_LOCALE       0xFFFFFFFE  // Reserved for StormLib internal use
-#define SFILE_OPEN_LOCAL_FILE       0xFFFFFFFF  // Open a local file
-
-// Flags for TMPQArchive::dwFlags
-#define MPQ_FLAG_READ_ONLY          0x00000001  // If set, the MPQ has been open for read-only access
-#define MPQ_FLAG_CHANGED            0x00000002  // If set, the MPQ tables have been changed
-#define MPQ_FLAG_PROTECTED          0x00000004  // Set on protected MPQs (like W3M maps)
-#define MPQ_FLAG_CHECK_SECTOR_CRC   0x00000008  // Checking sector CRC when reading files
-#define MPQ_FLAG_NEED_FIX_SIZE      0x00000010  // Used during opening the archive
-#define MPQ_FLAG_INV_LISTFILE       0x00000020  // If set, it means that the (listfile) has been invalidated
-#define MPQ_FLAG_INV_ATTRIBUTES     0x00000040  // If set, it means that the (attributes) has been invalidated
-
-// Return value for SFileGetFileSize and SFileSetFilePointer
-#define SFILE_INVALID_SIZE          0xFFFFFFFF
-#define SFILE_INVALID_POS           0xFFFFFFFF
-#define SFILE_INVALID_ATTRIBUTES    0xFFFFFFFF
-
-// Flags for SFileAddFile
-#define MPQ_FILE_IMPLODE            0x00000100  // Implode method (By PKWARE Data Compression Library)
-#define MPQ_FILE_COMPRESS           0x00000200  // Compress methods (By multiple methods)
-#define MPQ_FILE_COMPRESSED         0x0000FF00  // File is compressed
-#define MPQ_FILE_ENCRYPTED          0x00010000  // Indicates whether file is encrypted
-#define MPQ_FILE_FIX_KEY            0x00020000  // File decryption key has to be fixed
-#define MPQ_FILE_PATCH_FILE         0x00100000  // The file is a patch file. Raw file data begin with TPatchInfo structure
-#define MPQ_FILE_SINGLE_UNIT        0x01000000  // File is stored as a single unit, rather than split into sectors (Thx, Quantam)
-#define MPQ_FILE_DELETE_MARKER      0x02000000  // File is a deletion marker. Used in MPQ patches, indicating that the file no longer exists.
-#define MPQ_FILE_SECTOR_CRC         0x04000000  // File has checksums for each sector.
-// Ignored if file is not compressed or imploded.
-#define MPQ_FILE_EXISTS             0x80000000  // Set if file exists, reset when the file was deleted
-#define MPQ_FILE_REPLACEEXISTING    0x80000000  // Replace when the file exist (SFileAddFile)
-
-#define MPQ_FILE_VALID_FLAGS     (MPQ_FILE_IMPLODE       |  \
-    MPQ_FILE_COMPRESS      |  \
-    MPQ_FILE_ENCRYPTED     |  \
-    MPQ_FILE_FIX_KEY       |  \
-    MPQ_FILE_PATCH_FILE    |  \
-    MPQ_FILE_SINGLE_UNIT   |  \
-    MPQ_FILE_DELETE_MARKER |  \
-    MPQ_FILE_SECTOR_CRC    |  \
-    MPQ_FILE_EXISTS)
-
-// Compression types for multiple compressions
-#define MPQ_COMPRESSION_HUFFMANN          0x01  // Huffmann compression (used on WAVE files only)
-#define MPQ_COMPRESSION_ZLIB              0x02  // ZLIB compression
-#define MPQ_COMPRESSION_PKWARE            0x08  // PKWARE DCL compression
-#define MPQ_COMPRESSION_BZIP2             0x10  // BZIP2 compression (added in Warcraft III)
-#define MPQ_COMPRESSION_SPARSE            0x20  // Sparse compression (added in Starcraft 2)
-#define MPQ_COMPRESSION_ADPCM_MONO        0x40  // IMA ADPCM compression (mono)
-#define MPQ_COMPRESSION_ADPCM_STEREO      0x80  // IMA ADPCM compression (stereo)
-#define MPQ_COMPRESSION_LZMA              0x12  // LZMA compression. Added in Starcraft 2. This value is NOT a combination of flags.
-#define MPQ_COMPRESSION_NEXT_SAME   0xFFFFFFFF  // Same compression
-
-// Constants for SFileAddWave
-#define MPQ_WAVE_QUALITY_HIGH                0  // Best quality, the worst compression
-#define MPQ_WAVE_QUALITY_MEDIUM              1  // Medium quality, medium compression
-#define MPQ_WAVE_QUALITY_LOW                 2  // Low quality, the best compression
-
-// Signatures for HET and BET table
-#define HET_TABLE_SIGNATURE         0x1A544548  // 'HET\x1a'
-#define BET_TABLE_SIGNATURE         0x1A544542  // 'BET\x1a'
-
-// Decryption keys for MPQ tables
-#define MPQ_KEY_HASH_TABLE          0xC3AF3770  // Obtained by HashString("(hash table)", MPQ_HASH_FILE_KEY)
-#define MPQ_KEY_BLOCK_TABLE         0xEC83B3A3  // Obtained by HashString("(block table)", MPQ_HASH_FILE_KEY)
-
-// Block map defines
-#define MPQ_DATA_BITMAP_SIGNATURE   0x33767470  // Signature of the MPQ data bitmap ('ptv3')
-
-// Constants for SFileGetFileInfo
-#define SFILE_INFO_ARCHIVE_NAME              1  // MPQ size (value from header)
-#define SFILE_INFO_ARCHIVE_SIZE              2  // MPQ size (value from header)
-#define SFILE_INFO_MAX_FILE_COUNT            3  // Max number of files in the MPQ
-#define SFILE_INFO_HASH_TABLE_SIZE           4  // Size of hash table, in entries
-#define SFILE_INFO_BLOCK_TABLE_SIZE          5  // Number of entries in the block table
-#define SFILE_INFO_SECTOR_SIZE               6  // Size of file sector (in bytes)
-#define SFILE_INFO_HASH_TABLE                7  // Pointer to Hash table (TMPQHash *)
-#define SFILE_INFO_BLOCK_TABLE               8  // Pointer to Block Table (TMPQBlock *)
-#define SFILE_INFO_NUM_FILES                 9  // Real number of files within archive
-#define SFILE_INFO_STREAM_FLAGS             10  // Stream flags for the MPQ. See STREAM_FLAG_XXX
-#define SFILE_INFO_IS_READ_ONLY             11  // TRUE of the MPQ was open as read only
-//------
-#define SFILE_INFO_HASH_INDEX              100  // Hash index of file in MPQ
-#define SFILE_INFO_CODENAME1               101  // The first codename of the file
-#define SFILE_INFO_CODENAME2               102  // The second codename of the file
-#define SFILE_INFO_LOCALEID                103  // Locale ID of file in MPQ
-#define SFILE_INFO_BLOCKINDEX              104  // Index to Block Table
-#define SFILE_INFO_FILE_SIZE               105  // Original file size (from the block table)
-#define SFILE_INFO_COMPRESSED_SIZE         106  // Compressed file size (from the block table)
-#define SFILE_INFO_FLAGS                   107  // File flags
-#define SFILE_INFO_POSITION                108  // File position within archive
-#define SFILE_INFO_KEY                     109  // File decryption key
-#define SFILE_INFO_KEY_UNFIXED             110  // Decryption key not fixed to file pos and size
-#define SFILE_INFO_FILETIME                111  // TMPQFileTime
-#define SFILE_INFO_PATCH_CHAIN             112  // Chain of patches
-
-#define LISTFILE_NAME             "(listfile)"  // Name of internal listfile
-#define SIGNATURE_NAME           "(signature)"  // Name of internal signature
-#define ATTRIBUTES_NAME         "(attributes)"  // Name of internal attributes file
-#define PATCH_METADATA_NAME "(patch_metadata)"
-
-#define STORMLIB_VERSION                0x0814  // Current version of StormLib (8.10)
-#define STORMLIB_VERSION_STRING         "8.20"
-
-#define MPQ_FORMAT_VERSION_1                 0  // Up to The Burning Crusade
-#define MPQ_FORMAT_VERSION_2                 1  // The Burning Crusade and newer
-#define MPQ_FORMAT_VERSION_3                 2  // WoW Cataclysm Beta
-#define MPQ_FORMAT_VERSION_4                 3  // WoW Cataclysm and newer
-
-// Flags for MPQ attributes
-#define MPQ_ATTRIBUTE_CRC32         0x00000001  // The "(attributes)" contains CRC32 for each file
-#define MPQ_ATTRIBUTE_FILETIME      0x00000002  // The "(attributes)" contains file time for each file
-#define MPQ_ATTRIBUTE_MD5           0x00000004  // The "(attributes)" contains MD5 for each file
-#define MPQ_ATTRIBUTE_PATCH_BIT     0x00000008  // The "(attributes)" contains a patch bit for each file
-#define MPQ_ATTRIBUTE_ALL           0x0000000F  // Summary mask
-
-#define MPQ_ATTRIBUTES_V1                  100  // (attributes) format version 1.00
-
-// Flags for SFileOpenArchive
-#define BASE_PROVIDER_FILE          0x00000000  // Base data source is a file
-#define BASE_PROVIDER_MAP           0x00000001  // Base data source is memory-mapped file
-#define BASE_PROVIDER_HTTP          0x00000002  // Base data source is a file on web server
-#define BASE_PROVIDER_MASK          0x0000000F  // Mask for base provider value
-
-#define STREAM_PROVIDER_LINEAR      0x00000000  // Stream is linear with no offset mapping
-#define STREAM_PROVIDER_PARTIAL     0x00000010  // Stream is partial file (.part)
-#define STREAM_PROVIDER_ENCRYPTED   0x00000020  // Stream is an encrypted MPQ
-#define STREAM_PROVIDER_MASK        0x000000F0  // Mask for stream provider value
-
-#define STREAM_FLAG_READ_ONLY       0x00000100  // Stream is read only
-#define STREAM_FLAG_WRITE_SHARE     0x00000200  // Allow write sharing when open for write
-#define STREAM_FLAG_MASK            0x0000FF00  // Mask for stream flags
-#define STREAM_OPTIONS_MASK         0x0000FFFF  // Mask for all stream options
-
-#define MPQ_OPEN_NO_LISTFILE        0x00010000  // Don't load the internal listfile
-#define MPQ_OPEN_NO_ATTRIBUTES      0x00020000  // Don't open the attributes
-#define MPQ_OPEN_FORCE_MPQ_V1       0x00040000  // Always open the archive as MPQ v 1.00, ignore the "wFormatVersion" variable in the header
-#define MPQ_OPEN_CHECK_SECTOR_CRC   0x00080000  // On files with MPQ_FILE_SECTOR_CRC, the CRC will be checked when reading file
-
-// Deprecated
-#define MPQ_OPEN_READ_ONLY          STREAM_FLAG_READ_ONLY
-#define MPQ_OPEN_ENCRYPTED          STREAM_PROVIDER_ENCRYPTED
-
-// Flags for SFileCreateArchive
-#define MPQ_CREATE_ATTRIBUTES       0x00100000  // Also add the (attributes) file
-#define MPQ_CREATE_ARCHIVE_V1       0x00000000  // Creates archive of version 1 (size up to 4GB)
-#define MPQ_CREATE_ARCHIVE_V2       0x01000000  // Creates archive of version 2 (larger than 4 GB)
-#define MPQ_CREATE_ARCHIVE_V3       0x02000000  // Creates archive of version 3
-#define MPQ_CREATE_ARCHIVE_V4       0x03000000  // Creates archive of version 4
-#define MPQ_CREATE_ARCHIVE_VMASK    0x0F000000  // Mask for archive version
-
-#define FLAGS_TO_FORMAT_SHIFT               24  // (MPQ_CREATE_ARCHIVE_V4 >> FLAGS_TO_FORMAT_SHIFT) => MPQ_FORMAT_VERSION_4
-
-// Flags for SFileVerifyFile
-#define SFILE_VERIFY_SECTOR_CRC     0x00000001  // Verify sector checksum for the file, if available
-#define SFILE_VERIFY_FILE_CRC       0x00000002  // Verify file CRC, if available
-#define SFILE_VERIFY_FILE_MD5       0x00000004  // Verify file MD5, if available
-#define SFILE_VERIFY_RAW_MD5        0x00000008  // Verify raw file MD5, if available
-#define SFILE_VERIFY_ALL            0x0000000F  // Verify every checksum possible
-
-// Return values for SFileVerifyFile
-#define VERIFY_OPEN_ERROR               0x0001  // Failed to open the file
-#define VERIFY_READ_ERROR               0x0002  // Failed to read all data from the file
-#define VERIFY_FILE_HAS_SECTOR_CRC      0x0004  // File has sector CRC
-#define VERIFY_FILE_SECTOR_CRC_ERROR    0x0008  // Sector CRC check failed
-#define VERIFY_FILE_HAS_CHECKSUM        0x0010  // File has CRC32
-#define VERIFY_FILE_CHECKSUM_ERROR      0x0020  // CRC32 check failed
-#define VERIFY_FILE_HAS_MD5             0x0040  // File has data MD5
-#define VERIFY_FILE_MD5_ERROR           0x0080  // MD5 check failed
-#define VERIFY_FILE_HAS_RAW_MD5         0x0100  // File has raw data MD5
-#define VERIFY_FILE_RAW_MD5_ERROR       0x0200  // Raw MD5 check failed
-#define VERIFY_FILE_ERROR_MASK      (VERIFY_OPEN_ERROR | VERIFY_READ_ERROR | VERIFY_FILE_SECTOR_CRC_ERROR | VERIFY_FILE_CHECKSUM_ERROR | VERIFY_FILE_MD5_ERROR | VERIFY_FILE_RAW_MD5_ERROR)
-
-// Flags for SFileVerifyRawData (for MPQs version 4.0 or higher)
-#define SFILE_VERIFY_MPQ_HEADER         0x0001  // Verify raw MPQ header
-#define SFILE_VERIFY_HET_TABLE          0x0002  // Verify raw data of the HET table
-#define SFILE_VERIFY_BET_TABLE          0x0003  // Verify raw data of the BET table
-#define SFILE_VERIFY_HASH_TABLE         0x0004  // Verify raw data of the hash table
-#define SFILE_VERIFY_BLOCK_TABLE        0x0005  // Verify raw data of the block table
-#define SFILE_VERIFY_HIBLOCK_TABLE      0x0006  // Verify raw data of the hi-block table
-#define SFILE_VERIFY_FILE               0x0007  // Verify raw data of a file
-
-// Return values for SFileVerifyArchive
-#define ERROR_NO_SIGNATURE                   0  // There is no signature in the MPQ
-#define ERROR_VERIFY_FAILED                  1  // There was an error during verifying signature (like no memory)
-#define ERROR_WEAK_SIGNATURE_OK              2  // There is a weak signature and sign check passed
-#define ERROR_WEAK_SIGNATURE_ERROR           3  // There is a weak signature but sign check failed
-#define ERROR_STRONG_SIGNATURE_OK            4  // There is a strong signature and sign check passed
-#define ERROR_STRONG_SIGNATURE_ERROR         5  // There is a strong signature but sign check failed
-
-#ifndef MD5_DIGEST_SIZE
-#define MD5_DIGEST_SIZE                   0x10
-#endif
-
-#ifndef SHA1_DIGEST_SIZE
-#define SHA1_DIGEST_SIZE                  0x14  // 160 bits
-#endif
-
-#ifndef LANG_NEUTRAL
-#define LANG_NEUTRAL                      0x00  // Neutral locale
-#endif
-
-//-----------------------------------------------------------------------------
-// Callback functions
-
-// Values for compact callback
-#define CCB_CHECKING_FILES                   1  // Checking archive (dwParam1 = current, dwParam2 = total)
-#define CCB_CHECKING_HASH_TABLE              2  // Checking hash table (dwParam1 = current, dwParam2 = total)
-#define CCB_COPYING_NON_MPQ_DATA             3  // Copying non-MPQ data: No params used
-#define CCB_COMPACTING_FILES                 4  // Compacting archive (dwParam1 = current, dwParam2 = total)
-#define CCB_CLOSING_ARCHIVE                  5  // Closing archive: No params used
-
-typedef void (WINAPI * SFILE_ADDFILE_CALLBACK)(void * pvUserData, DWORD dwBytesWritten, DWORD dwTotalBytes, bool bFinalCall);
-typedef void (WINAPI * SFILE_COMPACT_CALLBACK)(void * pvUserData, DWORD dwWorkType, ULONGLONG BytesProcessed, ULONGLONG TotalBytes);
-
-typedef struct TFileStream TFileStream;
-
-//-----------------------------------------------------------------------------
-// Structure for bit arrays used for HET and BET tables
-
-typedef struct _TBitArray
-{
-
-    DWORD NumberOfBits;                         // Total number of bits that are available
-    BYTE Elements[1];                           // Array of elements (variable length)
-} TBitArray;
-
-void GetBits(TBitArray * array, unsigned int nBitPosition, unsigned int nBitLength, void * pvBuffer, int nResultSize);
-void SetBits(TBitArray * array, unsigned int nBitPosition, unsigned int nBitLength, void * pvBuffer, int nResultSize);
-
-// Structure for file bitmap. Used by SFileGetArchiveBitmap
-typedef struct _TFileBitmap
-{
-    ULONGLONG StartOffset;                      // Starting offset of the file, covered by bitmap
-    ULONGLONG EndOffset;                        // Ending offset of the file, covered by bitmap
-    DWORD IsComplete;                           // If nonzero, no blocks are missing
-    DWORD BitmapSize;                           // Size of the file bitmap (in bytes)
-    DWORD BlockSize;                            // Size of one block, in bytes
-    DWORD Reserved;                             // Alignment
-
-    // Followed by file bitmap (variable length), array of BYTEs)
-} TFileBitmap;
-
-//-----------------------------------------------------------------------------
-// Structures related to MPQ format
-//
-// Note: All structures in this header file are supposed to remain private
-// to StormLib. The structures may (and will) change over time, as the MPQ
-// file format evolves. Programmers directly using these structures need to
-// be aware of this. And the last, but not least, NEVER do any modifications
-// to those structures directly, always use SFile* functions.
-//
-
-#define MPQ_HEADER_SIZE_V1    0x20
-#define MPQ_HEADER_SIZE_V2    0x2C
-#define MPQ_HEADER_SIZE_V3    0x44
-#define MPQ_HEADER_SIZE_V4    0xD0
-
-typedef struct _TMPQUserData
-{
-    // The ID_MPQ_USERDATA ('MPQ\x1B') signature
-    DWORD dwID;
-
-    // Maximum size of the user data
-    DWORD cbUserDataSize;
-
-    // Offset of the MPQ header, relative to the begin of this header
-    DWORD dwHeaderOffs;
-
-    // Appears to be size of user data header (Starcraft II maps)
-    DWORD cbUserDataHeader;
-} TMPQUserData;
-
-// MPQ file header
-//
-// We have to make sure that the header is packed OK.
-// Reason: A 64-bit integer at the beginning of 3.0 part,
-// which is offset 0x2C
-#pragma pack(push, 1)
-typedef struct _TMPQHeader
-{
-    // The ID_MPQ ('MPQ\x1A') signature
-    DWORD dwID;
-
-    // Size of the archive header
-    DWORD dwHeaderSize;
-
-    // 32-bit size of MPQ archive
-    // This field is deprecated in the Burning Crusade MoPaQ format, and the size of the archive
-    // is calculated as the size from the beginning of the archive to the end of the hash table,
-    // block table, or hi-block table (whichever is largest).
-    DWORD dwArchiveSize;
-
-    // 0 = Format 1 (up to The Burning Crusade)
-    // 1 = Format 2 (The Burning Crusade and newer)
-    // 2 = Format 3 (WoW - Cataclysm beta or newer)
-    // 3 = Format 4 (WoW - Cataclysm beta or newer)
-    USHORT wFormatVersion;
-
-    // Power of two exponent specifying the number of 512-byte disk sectors in each file sector
-    // in the archive. The size of each file sector in the archive is 512 * 2 ^ wSectorSize.
-    USHORT wSectorSize;
-
-    // Offset to the beginning of the hash table, relative to the beginning of the archive.
-    DWORD dwHashTablePos;
-
-    // Offset to the beginning of the block table, relative to the beginning of the archive.
-    DWORD dwBlockTablePos;
-
-    // Number of entries in the hash table. Must be a power of two, and must be less than 2^16 for
-    // the original MoPaQ format, or less than 2^20 for the Burning Crusade format.
-    DWORD dwHashTableSize;
-
-    // Number of entries in the block table
-    DWORD dwBlockTableSize;
-
-    //-- MPQ HEADER v 2 -------------------------------------------
-
-    // Offset to the beginning of array of 16-bit high parts of file offsets.
-    ULONGLONG HiBlockTablePos64;
-
-    // High 16 bits of the hash table offset for large archives.
-    USHORT wHashTablePosHi;
-
-    // High 16 bits of the block table offset for large archives.
-    USHORT wBlockTablePosHi;
-
-    //-- MPQ HEADER v 3 -------------------------------------------
-
-    // 64-bit version of the archive size
-    ULONGLONG ArchiveSize64;
-
-    // 64-bit position of the BET table
-    ULONGLONG BetTablePos64;
-
-    // 64-bit position of the HET table
-    ULONGLONG HetTablePos64;
-
-    //-- MPQ HEADER v 4 -------------------------------------------
-
-    // Compressed size of the hash table
-    ULONGLONG HashTableSize64;
-
-    // Compressed size of the block table
-    ULONGLONG BlockTableSize64;
-
-    // Compressed size of the hi-block table
-    ULONGLONG HiBlockTableSize64;
-
-    // Compressed size of the HET block
-    ULONGLONG HetTableSize64;
-
-    // Compressed size of the BET block
-    ULONGLONG BetTableSize64;
-
-    // Size of raw data chunk to calculate MD5.
-    // MD5 of each data chunk follows the raw file data.
-    DWORD dwRawChunkSize;
-
-    // MD5 of MPQ tables
-    unsigned char MD5_BlockTable[MD5_DIGEST_SIZE];      // MD5 of the block table before decryption
-    unsigned char MD5_HashTable[MD5_DIGEST_SIZE];       // MD5 of the hash table before decryption
-    unsigned char MD5_HiBlockTable[MD5_DIGEST_SIZE];    // MD5 of the hi-block table
-    unsigned char MD5_BetTable[MD5_DIGEST_SIZE];        // MD5 of the BET table before decryption
-    unsigned char MD5_HetTable[MD5_DIGEST_SIZE];        // MD5 of the HET table before decryption
-    unsigned char MD5_MpqHeader[MD5_DIGEST_SIZE];       // MD5 of the MPQ header from signature to (including) MD5_HetTable
-} TMPQHeader;
-#pragma pack(pop)
-
-
-// Hash entry. All files in the archive are searched by their hashes.
-typedef struct _TMPQHash
-{
-    // The hash of the file path, using method A.
-    DWORD dwName1;
-
-    // The hash of the file path, using method B.
-    DWORD dwName2;
-
-#ifdef PLATFORM_LITTLE_ENDIAN
-
-    // The language of the file. This is a Windows LANGID data type, and uses the same values.
-    // 0 indicates the default language (American English), or that the file is language-neutral.
-    USHORT lcLocale;
-
-    // The platform the file is used for. 0 indicates the default platform.
-    // No other values have been observed.
-    // Note: wPlatform is actually just BYTE, but since it has never been used, we don't care.
-    USHORT wPlatform;
-
-#else
-
-    USHORT wPlatform;
-    USHORT lcLocale;
-
-#endif
-
-    // If the hash table entry is valid, this is the index into the block table of the file.
-    // Otherwise, one of the following two values:
-    //  - FFFFFFFFh: Hash table entry is empty, and has always been empty.
-    //               Terminates searches for a given file.
-    //  - FFFFFFFEh: Hash table entry is empty, but was valid at some point (a deleted file).
-    //               Does not terminate searches for a given file.
-    DWORD dwBlockIndex;
-} TMPQHash;
-
-
-// File description block contains informations about the file
-typedef struct _TMPQBlock
-{
-    // Offset of the beginning of the file, relative to the beginning of the archive.
-    DWORD dwFilePos;
-
-    // Compressed file size
-    DWORD dwCSize;
-
-    // Only valid if the block is a file; otherwise meaningless, and should be 0.
-    // If the file is compressed, this is the size of the uncompressed file data.
-    DWORD dwFSize;
-
-    // Flags for the file. See MPQ_FILE_XXXX constants
-    DWORD dwFlags;
-} TMPQBlock;
-
-// Patch file information, preceding the sector offset table
-typedef struct _TPatchInfo
-{
-    DWORD dwLength;                     // Length of patch info header, in bytes
-    DWORD dwFlags;                      // Flags. 0x80000000 = MD5 (?)
-    DWORD dwDataSize;                   // Uncompressed size of the patch file
-    BYTE  md5[0x10];                    // MD5 of the entire patch file after decompression
-
-    // Followed by the sector table (variable length)
-} TPatchInfo;
-
-// Header for PTCH files
-typedef struct _TPatchHeader
-{
-    //-- PATCH header -----------------------------------
-    DWORD dwSignature;                  // 'PTCH'
-    DWORD dwSizeOfPatchData;            // Size of the entire patch (decompressed)
-    DWORD dwSizeBeforePatch;            // Size of the file before patch
-    DWORD dwSizeAfterPatch;             // Size of file after patch
-
-    //-- MD5 block --------------------------------------
-    DWORD dwMD5;                        // 'MD5_'
-    DWORD dwMd5BlockSize;               // Size of the MD5 block, including the signature and size itself
-    BYTE md5_before_patch[0x10];        // MD5 of the original (unpached) file
-    BYTE md5_after_patch[0x10];         // MD5 of the patched file
-
-    //-- XFRM block -------------------------------------
-    DWORD dwXFRM;                       // 'XFRM'
-    DWORD dwXfrmBlockSize;              // Size of the XFRM block, includes XFRM header and patch data
-    DWORD dwPatchType;                  // Type of patch ('BSD0' or 'COPY')
-
-    // Followed by the patch data
-} TPatchHeader;
-
-#define SIZE_OF_XFRM_HEADER  0x0C
-
-// This is the combined file entry for maintaining file list in the MPQ.
-// This structure is combined from block table, hi-block table,
-// (attributes) file and from (listfile).
-typedef struct _TFileEntry
-{
-    ULONGLONG ByteOffset;               // Position of the file content in the MPQ, relative to the MPQ header
-    ULONGLONG FileTime;                 // FileTime from the (attributes) file. 0 if not present.
-    ULONGLONG BetHash;                  // Lower part of the file name hash. Only used when the MPQ has BET table.
-    DWORD     dwHashIndex;              // Index to the hash table. Only used when the MPQ has classic hash table
-    DWORD     dwHetIndex;               // Index to the HET table. Only used when the MPQ has HET table
-    DWORD     dwFileSize;               // Decompressed size of the file
-    DWORD     dwCmpSize;                // Compressed size of the file (i.e., size of the file data in the MPQ)
-    DWORD     dwFlags;                  // File flags (from block table)
-    USHORT    lcLocale;                 // Locale ID for the file
-    USHORT    wPlatform;                // Platform ID for the file
-    DWORD     dwCrc32;                  // CRC32 from (attributes) file. 0 if not present.
-    unsigned char md5[MD5_DIGEST_SIZE]; // File MD5 from the (attributes) file. 0 if not present.
-    char * szFileName;                  // File name. NULL if not known.
-} TFileEntry;
-
-// Common header for HET and BET tables
-typedef struct _TMPQExtTable
-{
-    DWORD dwSignature;                  // 'HET\x1A' or 'BET\x1A'
-    DWORD dwVersion;                    // Version. Seems to be always 1
-    DWORD dwDataSize;                   // Size of the contained table
-
-    // Followed by the table header
-    // Followed by the table data
-
-} TMPQExtTable;
-
-//
-// MPQ data bitmap, can be found at (FileSize - sizeof(TMPQBlockMap))
-//
-// There is bit map of the entire MPQ before TMPQBitmap. Each 0x4000-byte
-// block is represented by one bit (including the last, eventually incomplete block).
-//
-typedef struct _TMPQBitmap
-{
-    DWORD dwSignature;                  // 'ptv3' (MPQ_BLOCK_MAP_SIGNATURE)
-    DWORD dwAlways3;                    // Unknown, seems to always have value of 3
-    DWORD dwBuildNumber;                // Game build number for that MPQ
-    DWORD dwMapOffsetLo;                // Low 32-bits of the offset of the bit map
-    DWORD dwMapOffsetHi;                // High 32-bits of the offset of the bit map
-    DWORD dwBlockSize;                  // Size of one block (usually 0x4000 bytes)
-} TMPQBitmap;
-
-// Structure for parsed HET table
-typedef struct _TMPQHetTable
-{
-    TBitArray * pBetIndexes;            // Bit array of indexes to BET tables
-    LPBYTE     pHetHashes;              // Array of HET hashes. Each entry has size of 1 byte
-    ULONGLONG  AndMask64;               // AND mask used for calculating file name hash
-    ULONGLONG  OrMask64;                // OR mask used for setting the highest bit of the file name hash
-
-    DWORD      dwIndexSizeTotal;        // Total size of one entry in pBetIndexes (in bits)
-    DWORD      dwIndexSizeExtra;        // Extra bits in the entry in pBetIndexes
-    DWORD      dwIndexSize;             // Effective size of one entry in pBetIndexes (in bits)
-    DWORD      dwMaxFileCount;          // Maximum number of files in the MPQ
-    DWORD      dwHashTableSize;         // Number of entries in pBetHashes
-    DWORD      dwHashBitSize;           // Effective number of bits in the hash
-} TMPQHetTable;
-
-// Structure for parsed BET table
-typedef struct _TMPQBetTable
-{
-    TBitArray * pBetHashes;             // Array of BET hashes
-    TBitArray * pFileTable;             // Bit-based file table
-    LPDWORD pFileFlags;                 // Array of file flags
-
-    DWORD dwTableEntrySize;             // Size of one table entry, in bits
-    DWORD dwBitIndex_FilePos;           // Bit index of the file position in the table entry
-    DWORD dwBitIndex_FileSize;          // Bit index of the file size in the table entry
-    DWORD dwBitIndex_CmpSize;           // Bit index of the compressed size in the table entry
-    DWORD dwBitIndex_FlagIndex;         // Bit index of the flag index in the table entry
-    DWORD dwBitIndex_Unknown;           // Bit index of ??? in the table entry
-    DWORD dwBitCount_FilePos;           // Size of file offset (in bits) within table entry
-    DWORD dwBitCount_FileSize;          // Size of file size (in bits) within table entry
-    DWORD dwBitCount_CmpSize;           // Size of compressed file size (in bits) within table entry
-    DWORD dwBitCount_FlagIndex;         // Size of flag index (in bits) within table entry
-    DWORD dwBitCount_Unknown;           // Size of ??? (in bits) within table entry
-    DWORD dwBetHashSizeTotal;           // Total size of bet hash
-    DWORD dwBetHashSizeExtra;           // Extra bits in the bet hash
-    DWORD dwBetHashSize;                // Effective size of the bet hash
-    DWORD dwFileCount;                  // Number of files (usually equal to maximum number of files)
-    DWORD dwFlagCount;                  // Number of entries in pFileFlags
-} TMPQBetTable;
-
-// Archive handle structure
-typedef struct _TMPQArchive
-{
-    TFileStream  * pStream;             // Open stream for the MPQ
-
-    ULONGLONG      UserDataPos;         // Position of user data (relative to the begin of the file)
-    ULONGLONG      MpqPos;              // MPQ header offset (relative to the begin of the file)
-
-    struct _TMPQArchive * haPatch;      // Pointer to patch archive, if any
-    struct _TMPQArchive * haBase;       // Pointer to base ("previous version") archive, if any
-    char szPatchPrefix[MPQ_PATCH_PREFIX_LEN]; // Prefix for file names in patch MPQs
-    size_t         cchPatchPrefix;      // Length of the patch prefix, in characters
-
-    TMPQUserData * pUserData;           // MPQ user data (NULL if not present in the file)
-    TMPQHeader   * pHeader;             // MPQ file header
-    TMPQBitmap   * pBitmap;             // MPQ bitmap
-    TMPQHash     * pHashTable;          // Hash table
-    TMPQHetTable * pHetTable;           // Het table
-    TFileEntry   * pFileTable;          // File table
-
-    TMPQUserData   UserData;            // MPQ user data. Valid only when ID_MPQ_USERDATA has been found
-    BYTE           HeaderData[MPQ_HEADER_SIZE_V4];  // Storage for MPQ header
-
-    DWORD          dwHETBlockSize;
-    DWORD          dwBETBlockSize;
-    DWORD          dwFileTableSize;     // Current size of the file table, e.g. index of the entry past the last occupied one
-    DWORD          dwMaxFileCount;      // Maximum number of files in the MPQ
-    DWORD          dwSectorSize;        // Default size of one file sector
-    DWORD          dwFileFlags1;        // Flags for (listfile)
-    DWORD          dwFileFlags2;        // Flags for (attributes)
-    DWORD          dwAttrFlags;         // Flags for the (attributes) file, see MPQ_ATTRIBUTE_XXX
-    DWORD          dwFlags;             // See MPQ_FLAG_XXXXX
-} TMPQArchive;
-
-// File handle structure
-typedef struct _TMPQFile
-{
-    TFileStream  * pStream;             // File stream. Only used on local files
-    TMPQArchive  * ha;                  // Archive handle
-    TFileEntry   * pFileEntry;          // File entry for the file
-    DWORD          dwFileKey;           // Decryption key
-    DWORD          dwFilePos;           // Current file position
-    ULONGLONG      RawFilePos;          // Offset in MPQ archive (relative to file begin)
-    ULONGLONG      MpqFilePos;          // Offset in MPQ archive (relative to MPQ header)
-    DWORD          dwMagic;             // 'FILE'
-
-    struct _TMPQFile * hfPatchFile;     // Pointer to opened patch file
-    TPatchHeader * pPatchHeader;        // Patch header. Only used if the file is a patch file
-    LPBYTE         pbFileData;          // Loaded and patched file data. Only used if the file is a patch file
-    DWORD          cbFileData;          // Size of loaded patched data
-
-    TPatchInfo   * pPatchInfo;          // Patch info block, preceding the sector table
-    DWORD        * SectorOffsets;       // Position of each file sector, relative to the begin of the file. Only for compressed files.
-    DWORD        * SectorChksums;       // Array of sector checksums (either ADLER32 or MD5) values for each file sector
-    DWORD          dwSectorCount;       // Number of sectors in the file
-    DWORD          dwPatchedFileSize;   // Size of patched file. Used when saving patch file to the MPQ
-    DWORD          dwDataSize;          // Size of data in the file (on patch files, this differs from file size in block table entry)
-
-    LPBYTE         pbFileSector;        // Last loaded file sector. For single unit files, entire file content
-    DWORD          dwSectorOffs;        // File position of currently loaded file sector
-    DWORD          dwSectorSize;        // Size of the file sector. For single unit files, this is equal to the file size
-
-    unsigned char  hctx[HASH_STATE_SIZE];// Hash state for MD5. Used when saving file to MPQ
-    DWORD          dwCrc32;             // CRC32 value, used when saving file to MPQ
-
-    bool           bLoadedSectorCRCs;   // If true, we already tried to load sector CRCs
-    bool           bCheckSectorCRCs;    // If true, then SFileReadFile will check sector CRCs when reading the file
-    bool           bIsWriteHandle;      // If true, this handle has been created by SFileCreateFile
-    bool           bErrorOccured;       // If true, then at least one error occured during saving the file to the archive
-} TMPQFile;
-
-// Structure for SFileFindFirstFile and SFileFindNextFile
-typedef struct _SFILE_FIND_DATA
-{
-    char   cFileName[MAX_PATH];         // Full name of the found file
-    char * szPlainName;                 // Plain name of the found file
-    DWORD  dwHashIndex;                 // Hash table index for the file
-    DWORD  dwBlockIndex;                // Block table index for the file
-    DWORD  dwFileSize;                  // File size in bytes
-    DWORD  dwFileFlags;                 // MPQ file flags
-    DWORD  dwCompSize;                  // Compressed file size
-    DWORD  dwFileTimeLo;                // Low 32-bits of the file time (0 if not present)
-    DWORD  dwFileTimeHi;                // High 32-bits of the file time (0 if not present)
-    LCID   lcLocale;                    // Locale version
-
-} SFILE_FIND_DATA, *PSFILE_FIND_DATA;
-
-typedef struct _SFILE_CREATE_MPQ
-{
-    DWORD cbSize;                       // Size of this structure, in bytes
-    DWORD dwMpqVersion;                 // Version of the MPQ to be created
-    void *pvUserData;                   // Reserved, must be NULL
-    DWORD cbUserData;                   // Reserved, must be 0
-    DWORD dwStreamFlags;                // Stream flags for creating the MPQ
-    DWORD dwFileFlags1;                 // File flags for (listfile). 0 = default
-    DWORD dwFileFlags2;                 // File flags for (attributes). 0 = default
-    DWORD dwAttrFlags;                  // Flags for the (attributes) file. If 0, no attributes will be created
-    DWORD dwSectorSize;                 // Sector size for compressed files
-    DWORD dwRawChunkSize;               // Size of raw data chunk
-    DWORD dwMaxFileCount;               // File limit for the MPQ
-
-} SFILE_CREATE_MPQ, *PSFILE_CREATE_MPQ;
-
-//-----------------------------------------------------------------------------
-// Stream support - functions
-
-TFileStream * FileStream_CreateFile(const TCHAR * szFileName, DWORD dwStreamFlags);
-TFileStream * FileStream_OpenFile(const TCHAR * szFileName, DWORD dwStreamFlags);
-TCHAR * FileStream_GetFileName(TFileStream * pStream);
-bool FileStream_IsReadOnly(TFileStream * pStream);
-bool FileStream_Read(TFileStream * pStream, ULONGLONG * pByteOffset, void * pvBuffer, DWORD dwBytesToRead);
-bool FileStream_Write(TFileStream * pStream, ULONGLONG * pByteOffset, const void * pvBuffer, DWORD dwBytesToWrite);
-bool FileStream_GetPos(TFileStream * pStream, ULONGLONG * pByteOffset);
-bool FileStream_SetPos(TFileStream * pStream, ULONGLONG ByteOffset);
-bool FileStream_GetSize(TFileStream * pStream, ULONGLONG * pFileSize);
-bool FileStream_SetSize(TFileStream * pStream, ULONGLONG NewFileSize);
-bool FileStream_GetTime(TFileStream * pStream, ULONGLONG * pFT);
-bool FileStream_GetFlags(TFileStream * pStream, LPDWORD pdwStreamFlags);
-bool FileStream_Switch(TFileStream * pStream, TFileStream * pTempStream);
-bool FileStream_SetBitmap(TFileStream * pStream, TFileBitmap * pBitmap);
-bool FileStream_GetBitmap(TFileStream * pStream, TFileBitmap * pBitmap, DWORD Length, LPDWORD LengthNeeded);
-void FileStream_Close(TFileStream * pStream);
-
-//-----------------------------------------------------------------------------
-// Functions prototypes for Storm.dll
-
-// Typedefs for functions exported by Storm.dll
-typedef LCID  (WINAPI * SFILESETLOCALE)(LCID);
-typedef bool  (WINAPI * SFILEOPENARCHIVE)(const char *, DWORD, DWORD, HANDLE *);
-typedef bool  (WINAPI * SFILECLOSEARCHIVE)(HANDLE);
-typedef bool  (WINAPI * SFILEOPENFILEEX)(HANDLE, const char *, DWORD, HANDLE *);
-typedef bool  (WINAPI * SFILECLOSEFILE)(HANDLE);
-typedef DWORD (WINAPI * SFILEGETFILESIZE)(HANDLE, LPDWORD);
-typedef DWORD (WINAPI * SFILESETFILEPOINTER)(HANDLE, LONG, LONG *, DWORD);
-typedef bool  (WINAPI * SFILEREADFILE)(HANDLE, void *, DWORD, LPDWORD, LPOVERLAPPED);
-
-//-----------------------------------------------------------------------------
-// Functions for manipulation with StormLib global flags
-
-LCID   WINAPI SFileGetLocale();
-LCID   WINAPI SFileSetLocale(LCID lcNewLocale);
-
-//-----------------------------------------------------------------------------
-// Functions for archive manipulation
-
-bool   WINAPI SFileOpenArchive(const TCHAR * szMpqName, DWORD dwPriority, DWORD dwFlags, HANDLE * phMpq);
-bool   WINAPI SFileCreateArchive(const TCHAR * szMpqName, DWORD dwFlags, DWORD dwMaxFileCount, HANDLE * phMpq);
-bool   WINAPI SFileCreateArchive2(const TCHAR * szMpqName, PSFILE_CREATE_MPQ pCreateInfo, HANDLE * phMpq);
-
-bool   WINAPI SFileGetArchiveBitmap(HANDLE hMpq, TFileBitmap * pBitmap, DWORD Length, LPDWORD LengthNeeded);
-bool   WINAPI SFileFlushArchive(HANDLE hMpq);
-bool   WINAPI SFileCloseArchive(HANDLE hMpq);
-
-// Adds another listfile into MPQ. The currently added listfile(s) remain,
-// so you can use this API to combining more listfiles.
-// Note that this function is internally called by SFileFindFirstFile
-int    WINAPI SFileAddListFile(HANDLE hMpq, const char * szListFile);
-
-// Archive compacting
-bool   WINAPI SFileSetCompactCallback(HANDLE hMpq, SFILE_COMPACT_CALLBACK CompactCB, void * pvData);
-bool   WINAPI SFileCompactArchive(HANDLE hMpq, const char * szListFile, bool bReserved);
-
-// Changing the maximum file count
-DWORD  WINAPI SFileGetMaxFileCount(HANDLE hMpq);
-bool   WINAPI SFileSetMaxFileCount(HANDLE hMpq, DWORD dwMaxFileCount);
-
-// Changing (attributes) file
-DWORD  WINAPI SFileGetAttributes(HANDLE hMpq);
-bool   WINAPI SFileSetAttributes(HANDLE hMpq, DWORD dwFlags);
-bool   WINAPI SFileUpdateFileAttributes(HANDLE hMpq, const char * szFileName);
-
-//-----------------------------------------------------------------------------
-// Functions for manipulation with patch archives
-
-bool   WINAPI SFileOpenPatchArchive(HANDLE hMpq, const TCHAR * szPatchMpqName, const char * szPatchPathPrefix, DWORD dwFlags);
-bool   WINAPI SFileIsPatchedArchive(HANDLE hMpq);
-
-//-----------------------------------------------------------------------------
-// Functions for file manipulation
-
-// Reading from MPQ file
-bool   WINAPI SFileOpenFileEx(HANDLE hMpq, const char * szFileName, DWORD dwSearchScope, HANDLE * phFile);
-DWORD  WINAPI SFileGetFileSize(HANDLE hFile, LPDWORD pdwFileSizeHigh);
-DWORD  WINAPI SFileSetFilePointer(HANDLE hFile, LONG lFilePos, LONG * plFilePosHigh, DWORD dwMoveMethod);
-bool   WINAPI SFileReadFile(HANDLE hFile, void * lpBuffer, DWORD dwToRead, LPDWORD pdwRead, LPOVERLAPPED lpOverlapped);
-bool   WINAPI SFileCloseFile(HANDLE hFile);
-
-// Retrieving info about the file
-bool   WINAPI SFileHasFile(HANDLE hMpq, const char * szFileName);
-bool   WINAPI SFileGetFileName(HANDLE hFile, char * szFileName);
-bool   WINAPI SFileGetFileInfo(HANDLE hMpqOrFile, DWORD dwInfoType, void * pvFileInfo, DWORD cbFileInfo, LPDWORD pcbLengthNeeded);
-
-// High-level extract function
-bool   WINAPI SFileExtractFile(HANDLE hMpq, const char * szToExtract, const TCHAR * szExtracted, DWORD dwSearchScope);
-
-//-----------------------------------------------------------------------------
-// Functions for file and archive verification
-
-// Generates file CRC32
-bool   WINAPI SFileGetFileChecksums(HANDLE hMpq, const char * szFileName, LPDWORD pdwCrc32, char * pMD5);
-
-// Verifies file against its checksums stored in (attributes) attributes (depending on dwFlags).
-// For dwFlags, use one or more of MPQ_ATTRIBUTE_MD5
-DWORD  WINAPI SFileVerifyFile(HANDLE hMpq, const char * szFileName, DWORD dwFlags);
-
-// Verifies raw data of the archive. Only works for MPQs version 4 or newer
-int    WINAPI SFileVerifyRawData(HANDLE hMpq, DWORD dwWhatToVerify, const char * szFileName);
-
-// Verifies the signature, if present
-DWORD  WINAPI SFileVerifyArchive(HANDLE hMpq);
-
-//-----------------------------------------------------------------------------
-// Functions for file searching
-
-HANDLE WINAPI SFileFindFirstFile(HANDLE hMpq, const char * szMask, SFILE_FIND_DATA * lpFindFileData, const char * szListFile);
-bool   WINAPI SFileFindNextFile(HANDLE hFind, SFILE_FIND_DATA * lpFindFileData);
-bool   WINAPI SFileFindClose(HANDLE hFind);
-
-HANDLE WINAPI SListFileFindFirstFile(HANDLE hMpq, const char * szListFile, const char * szMask, SFILE_FIND_DATA * lpFindFileData);
-bool   WINAPI SListFileFindNextFile(HANDLE hFind, SFILE_FIND_DATA * lpFindFileData);
-bool   WINAPI SListFileFindClose(HANDLE hFind);
-
-// Locale support
-int    WINAPI SFileEnumLocales(HANDLE hMpq, const char * szFileName, LCID * plcLocales, LPDWORD pdwMaxLocales, DWORD dwSearchScope);
-
-//-----------------------------------------------------------------------------
-// Support for adding files to the MPQ
-
-bool   WINAPI SFileCreateFile(HANDLE hMpq, const char * szArchivedName, ULONGLONG FileTime, DWORD dwFileSize, LCID lcLocale, DWORD dwFlags, HANDLE * phFile);
-bool   WINAPI SFileWriteFile(HANDLE hFile, const void * pvData, DWORD dwSize, DWORD dwCompression);
-bool   WINAPI SFileFinishFile(HANDLE hFile);
-
-bool   WINAPI SFileAddFileEx(HANDLE hMpq, const TCHAR * szFileName, const char * szArchivedName, DWORD dwFlags, DWORD dwCompression, DWORD dwCompressionNext);
-bool   WINAPI SFileAddFile(HANDLE hMpq, const TCHAR * szFileName, const char * szArchivedName, DWORD dwFlags);
-bool   WINAPI SFileAddWave(HANDLE hMpq, const TCHAR * szFileName, const char * szArchivedName, DWORD dwFlags, DWORD dwQuality);
-bool   WINAPI SFileRemoveFile(HANDLE hMpq, const char * szFileName, DWORD dwSearchScope);
-bool   WINAPI SFileRenameFile(HANDLE hMpq, const char * szOldFileName, const char * szNewFileName);
-bool   WINAPI SFileSetFileLocale(HANDLE hFile, LCID lcNewLocale);
-bool   WINAPI SFileSetDataCompression(DWORD DataCompression);
-
-bool   WINAPI SFileSetAddFileCallback(HANDLE hMpq, SFILE_ADDFILE_CALLBACK AddFileCB, void * pvData);
-
-//-----------------------------------------------------------------------------
-// Compression and decompression
-
-int    WINAPI SCompImplode    (char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer);
-int    WINAPI SCompExplode    (char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer);
-int    WINAPI SCompCompress   (char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer, unsigned uCompressionMask, int nCmpType, int nCmpLevel);
-int    WINAPI SCompDecompress (char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer);
-int    WINAPI SCompDecompress2(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer);
-
-//-----------------------------------------------------------------------------
-// Non-Windows support for SetLastError/GetLastError
-
-#ifndef PLATFORM_WINDOWS
-
-void  SetLastError(int err);
-int   GetLastError();
-
-#endif
-
-//-----------------------------------------------------------------------------
-// Functions from Storm.dll. They use slightly different names for keeping
-// possibility to use them together with StormLib (StormXXX instead of SFileXXX)
-
-#ifdef __LINK_STORM_DLL__
-#define STORM_ALTERNATE_NAMES         // Force storm_dll.h to use alternate fnc names
-#include "..\storm_dll\storm_dll.h"
-#endif // __LINK_STORM_DLL__
-
-#ifdef __cplusplus
-}   // extern "C"
-#endif
-
-#endif  // __STORMLIB_H__
diff --git a/dep/StormLibOld/src/StormPort.h b/dep/StormLibOld/src/StormPort.h
deleted file mode 100644
index 5673516c1..000000000
--- a/dep/StormLibOld/src/StormPort.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/*****************************************************************************/
-/* StormPort.h                           Copyright (c) Marko Friedemann 2001 */
-/*---------------------------------------------------------------------------*/
-/* Portability module for the StormLib library. Contains a wrapper symbols   */
-/* to make the compilation under Linux work                                  */
-/*                                                                           */
-/* Author: Marko Friedemann <marko.friedemann@bmx-chemnitz.de>               */
-/* Created at: Mon Jan 29 18:26:01 CEST 2001                                 */
-/* Computer: whiplash.flachland-chemnitz.de                                  */
-/* System: Linux 2.4.0 on i686                                               */
-/*                                                                           */
-/* Author: Sam Wilkins <swilkins1337@gmail.com>                              */
-/* System: Mac OS X and port to big endian processor                         */
-/*                                                                           */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 29.01.01  1.00  Mar  Created                                              */
-/* 24.03.03  1.01  Lad  Some cosmetic changes                                */
-/* 12.11.03  1.02  Dan  Macintosh compatibility                              */
-/* 24.07.04  1.03  Sam  Mac OS X compatibility                               */
-/* 22.11.06  1.04  Sam  Mac OS X compatibility (for StormLib 6.0)            */
-/* 31.12.06  1.05  XPinguin  Full GNU/Linux compatibility		             */
-/*****************************************************************************/
-
-#ifndef __STORMPORT_H__
-#define __STORMPORT_H__
-
-#ifndef __cplusplus
-#define bool char
-#define true 1
-#define false 0
-#endif
-
-// Defines for Windows
-#if !defined(PLATFORM_DEFINED) && (defined(WIN32) || defined(WIN64))
-
-// In MSVC 8.0, there are some functions declared as deprecated.
-#if _MSC_VER >= 1400
-#define _CRT_SECURE_NO_DEPRECATE
-#define _CRT_NON_CONFORMING_SWPRINTFS
-#endif
-
-#include <tchar.h>
-#include <assert.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <windows.h>
-#include <wininet.h>
-#define PLATFORM_LITTLE_ENDIAN
-
-#ifdef WIN64
-#define PLATFORM_64BIT
-#else
-#define PLATFORM_32BIT
-#endif
-
-#define PLATFORM_WINDOWS
-#define PLATFORM_DEFINED                  // The platform is known now
-
-#endif
-
-// Defines for Mac
-#if !defined(PLATFORM_DEFINED) && defined(__APPLE__)  // Mac BSD API
-
-// Macintosh
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#define    PKEXPORT
-#define    __SYS_ZLIB
-#define    __SYS_BZLIB
-
-#ifndef __BIG_ENDIAN__
-#define PLATFORM_LITTLE_ENDIAN
-#endif
-
-#define PLATFORM_MAC
-#define PLATFORM_DEFINED                  // The platform is known now
-
-#endif
-
-// Assumption: we are not on Windows nor Macintosh, so this must be linux *grin*
-#if !defined(PLATFORM_DEFINED)
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
-#include <errno.h>
-
-#define PLATFORM_LITTLE_ENDIAN
-#define PLATFORM_LINUX
-#define PLATFORM_DEFINED
-
-#endif
-
-// Definition of Windows-specific structures for non-Windows platforms
-#ifndef PLATFORM_WINDOWS
-#if __LP64__
-#define PLATFORM_64BIT
-#else
-#define PLATFORM_32BIT
-#endif
-
-// Typedefs for ANSI C
-typedef unsigned char  BYTE;
-typedef unsigned short USHORT;
-typedef int            LONG;
-typedef unsigned int   DWORD;
-typedef unsigned long  DWORD_PTR;
-typedef long           LONG_PTR;
-typedef long           INT_PTR;
-typedef long long      LONGLONG;
-typedef unsigned long long ULONGLONG;
-typedef void         * HANDLE;
-typedef void         * LPOVERLAPPED; // Unsupported on Linux and Mac
-typedef char           TCHAR;
-typedef unsigned int   LCID;
-typedef LONG         * PLONG;
-typedef DWORD        * LPDWORD;
-typedef BYTE         * LPBYTE;
-
-#ifdef PLATFORM_32BIT
-#define _LZMA_UINT32_IS_ULONG
-#endif
-
-// Some Windows-specific defines
-#ifndef MAX_PATH
-#define MAX_PATH 1024
-#endif
-
-#define WINAPI
-
-#define FILE_BEGIN    SEEK_SET
-#define FILE_CURRENT  SEEK_CUR
-#define FILE_END      SEEK_END
-
-#define _T(x)     x
-#define _tcslen   strlen
-#define _tcscpy   strcpy
-#define _tcscat   strcat
-#define _tcsrchr  strrchr
-#define _tprintf  printf
-#define _stprintf sprintf
-#define _tremove  remove
-
-#define _stricmp  strcasecmp
-#define _strnicmp strncasecmp
-#define _tcsnicmp strncasecmp
-
-#endif // !WIN32
-
-// 64-bit calls are supplied by "normal" calls on Mac
-#if defined(PLATFORM_MAC)
-#define stat64  stat
-#define fstat64 fstat
-#define lseek64 lseek
-#define off64_t off_t
-#define O_LARGEFILE 0
-#endif
-
-// Platform-specific error codes for UNIX-based platforms
-#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
-#define ERROR_SUCCESS                  0
-#define ERROR_FILE_NOT_FOUND           ENOENT
-#define ERROR_ACCESS_DENIED            EPERM
-#define ERROR_INVALID_HANDLE           EBADF
-#define ERROR_NOT_ENOUGH_MEMORY        ENOMEM
-#define ERROR_BAD_FORMAT               105         // No such error code under Linux
-#define ERROR_NO_MORE_FILES            106
-#define ERROR_HANDLE_EOF               107         // No such error code under Linux
-#define ERROR_NOT_SUPPORTED            ENOTSUP
-#define ERROR_INVALID_PARAMETER        EINVAL
-#define ERROR_DISK_FULL                ENOSPC
-#define ERROR_ALREADY_EXISTS           EEXIST
-#define ERROR_CAN_NOT_COMPLETE         108         // No such error code under Linux
-#define ERROR_FILE_CORRUPT             109         // No such error code under Linux
-#define ERROR_INSUFFICIENT_BUFFER      ENOBUFS
-#endif
-
-#ifdef PLATFORM_LITTLE_ENDIAN
-#define    BSWAP_INT16_UNSIGNED(a)          (a)
-#define    BSWAP_INT16_SIGNED(a)            (a)
-#define    BSWAP_INT32_UNSIGNED(a)          (a)
-#define    BSWAP_INT32_SIGNED(a)            (a)
-#define    BSWAP_INT64_SIGNED(a)            (a)
-#define    BSWAP_INT64_UNSIGNED(a)          (a)
-#define    BSWAP_ARRAY16_UNSIGNED(a,b)      {}
-#define    BSWAP_ARRAY32_UNSIGNED(a,b)      {}
-#define    BSWAP_ARRAY64_UNSIGNED(a,b)      {}
-#define    BSWAP_PART_HEADER(a)             {}
-#define    BSWAP_TMPQUSERDATA(a)            {}
-#define    BSWAP_TMPQHEADER(a)              {}
-#else
-#ifdef __cplusplus
-  extern "C" {
-#endif
-int16_t  SwapInt16(uint16_t);
-uint16_t SwapUInt16(uint16_t);
-int32_t  SwapInt32(uint32_t);
-uint32_t SwapUInt32(uint32_t);
-int64_t  SwapInt64(uint64_t);
-uint64_t SwapUInt64(uint64_t);
-void ConvertUInt16Buffer(void * ptr, size_t length);
-void ConvertUInt32Buffer(void * ptr, size_t length);
-void ConvertUInt64Buffer(void * ptr, size_t length);
-void ConvertPartHeader(void * partHeader);
-void ConvertTMPQUserData(void *userData);
-void ConvertTMPQHeader(void *header);
-#ifdef __cplusplus
-  }
-#endif
-#define    BSWAP_INT16_SIGNED(a)            SwapInt16((a))
-#define    BSWAP_INT16_UNSIGNED(a)          SwapUInt16((a))
-#define    BSWAP_INT32_SIGNED(a)            SwapInt32((a))
-#define    BSWAP_INT32_UNSIGNED(a)          SwapUInt32((a))
-#define    BSWAP_INT64_SIGNED(a)            SwapInt64((a))
-#define    BSWAP_INT64_UNSIGNED(a)          SwapUInt64((a))
-#define    BSWAP_ARRAY16_UNSIGNED(a,b)      ConvertUInt16Buffer((a),(b))
-#define    BSWAP_ARRAY32_UNSIGNED(a,b)      ConvertUInt32Buffer((a),(b))
-#define    BSWAP_ARRAY64_UNSIGNED(a,b)      ConvertUInt64Buffer((a),(b))
-#define    BSWAP_PART_HEADER(a)             ConvertPartHeader(a)
-#define    BSWAP_TMPQUSERDATA(a)            ConvertTMPQUserData((a))
-#define    BSWAP_TMPQHEADER(a)              ConvertTMPQHeader((a))
-#endif
-
-#endif // __STORMPORT_H__
diff --git a/dep/StormLibOld/src/adpcm/adpcm.cpp b/dep/StormLibOld/src/adpcm/adpcm.cpp
deleted file mode 100644
index 783cf10bf..000000000
--- a/dep/StormLibOld/src/adpcm/adpcm.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-/*****************************************************************************/
-/* adpcm.cpp                              Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* This module contains implementation of adpcm decompression method used by */
-/* Storm.dll to decompress WAVE files. Thanks to Tom Amigo for releasing     */
-/* his sources.                                                              */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 11.03.03  1.00  Lad  Splitted from Pkware.cpp                             */
-/* 20.05.03  2.00  Lad  Added compression                                    */
-/* 19.11.03  2.01  Dan  Big endian handling                                  */
-/*****************************************************************************/
-
-#include "adpcm.h"
-
-//------------------------------------------------------------------------------
-// Structures
-
-typedef union _BYTE_AND_WORD_PTR
-{
-    short * pw;
-    unsigned char * pb;
-} BYTE_AND_WORD_PTR;
-
-typedef union _WORD_AND_BYTE_ARRAY
-{
-    short w;
-    unsigned char b[2];
-} WORD_AND_BYTE_ARRAY;
-
-//-----------------------------------------------------------------------------
-// Tables necessary dor decompression
-
-static long Table1503F120[] =
-{
-    0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000006,
-    0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
-    0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
-    0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008
-};
-
-static long step_table[] =
-{
-    0x00000007, 0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E,
-    0x00000010, 0x00000011, 0x00000013, 0x00000015, 0x00000017, 0x00000019, 0x0000001C, 0x0000001F,
-    0x00000022, 0x00000025, 0x00000029, 0x0000002D, 0x00000032, 0x00000037, 0x0000003C, 0x00000042,
-    0x00000049, 0x00000050, 0x00000058, 0x00000061, 0x0000006B, 0x00000076, 0x00000082, 0x0000008F,
-    0x0000009D, 0x000000AD, 0x000000BE, 0x000000D1, 0x000000E6, 0x000000FD, 0x00000117, 0x00000133,
-    0x00000151, 0x00000173, 0x00000198, 0x000001C1, 0x000001EE, 0x00000220, 0x00000256, 0x00000292,
-    0x000002D4, 0x0000031C, 0x0000036C, 0x000003C3, 0x00000424, 0x0000048E, 0x00000502, 0x00000583,
-    0x00000610, 0x000006AB, 0x00000756, 0x00000812, 0x000008E0, 0x000009C3, 0x00000ABD, 0x00000BD0,
-    0x00000CFF, 0x00000E4C, 0x00000FBA, 0x0000114C, 0x00001307, 0x000014EE, 0x00001706, 0x00001954,
-    0x00001BDC, 0x00001EA5, 0x000021B6, 0x00002515, 0x000028CA, 0x00002CDF, 0x0000315B, 0x0000364B,
-    0x00003BB9, 0x000041B2, 0x00004844, 0x00004F7E, 0x00005771, 0x0000602F, 0x000069CE, 0x00007462,
-    0x00007FFF
-};
-
-//----------------------------------------------------------------------------
-// CompressWave
-
-// 1500EF70
-int CompressADPCM(unsigned char * pbOutBuffer, int dwOutLength, short * pwInBuffer, int dwInLength, int nChannels, int nCmpLevel)
-//                ECX                          EDX
-{
-    WORD_AND_BYTE_ARRAY Wcmp;
-    BYTE_AND_WORD_PTR out;                    // Pointer to the output buffer
-    long SInt32Array1[2];
-    long SInt32Array2[2];
-    long SInt32Array3[2];
-    long nBytesRemains = dwOutLength;       // Number of bytes remaining
-    long nWordsRemains;                     // Number of words remaining
-//  unsigned char * pbSaveOutBuffer;        // Copy of output buffer (actually not used)
-    unsigned long dwBitBuff;
-    unsigned long dwStopBit;
-    unsigned long dwBit;
-    unsigned long ebx;
-    unsigned long esi;
-    long nTableValue;
-    long nOneWord;
-    long var_1C;
-    long var_2C;
-    int nLength;
-    int nIndex;
-    int nValue;
-    int i, chnl;
-
-    // If less than 2 bytes remain, don't decompress anything
-//  pbSaveOutBuffer = pbOutBuffer;
-    out.pb = pbOutBuffer;
-    if(nBytesRemains < 2)
-        return 2;
-
-    Wcmp.b[1] = (unsigned char)(nCmpLevel - 1);
-    Wcmp.b[0] = (unsigned char)0;
-
-    *out.pw++ = BSWAP_INT16_SIGNED(Wcmp.w);
-    if((out.pb - pbOutBuffer + (nChannels * 2)) > nBytesRemains)
-        return (int)(out.pb - pbOutBuffer + (nChannels * 2));
-
-    SInt32Array1[0] = SInt32Array1[1] = 0x2C;
-
-    for(i = 0; i < nChannels; i++)
-    {
-        nOneWord = BSWAP_INT16_SIGNED(*pwInBuffer++);
-        *out.pw++ = BSWAP_INT16_SIGNED((short)nOneWord);
-        SInt32Array2[i] = nOneWord;
-    }
-
-    // Weird. But it's there
-    nLength = dwInLength;
-    if(nLength < 0)                     // mov eax, dwInLength; cdq; sub eax, edx;
-        nLength++;
-
-    nLength = (nLength / 2) - (int)(out.pb - pbOutBuffer);
-    nLength = (nLength < 0) ? 0 : nLength;
-
-    nIndex  = nChannels - 1;            // edi
-    nWordsRemains = dwInLength / 2;     // eax
-
-    // ebx - nChannels
-    // ecx - pwOutPos
-    for(chnl = nChannels; chnl < nWordsRemains; chnl++)
-    {
-        // 1500F030
-        if((out.pb - pbOutBuffer + 2) > nBytesRemains)
-            return (int)(out.pb - pbOutBuffer + 2);
-
-        // Switch index
-        if(nChannels == 2)
-            nIndex = (nIndex == 0) ? 1 : 0;
-
-        // Load one word from the input stream
-        nOneWord = BSWAP_INT16_SIGNED(*pwInBuffer++);   // ecx - nOneWord
-        SInt32Array3[nIndex] = nOneWord;
-
-        // esi - SInt32Array2[nIndex]
-        // eax - nValue
-        nValue = nOneWord - SInt32Array2[nIndex];
-        nValue = (nValue < 0) ? ((nValue ^ 0xFFFFFFFF) + 1) : nValue;
-
-        ebx = (nOneWord >= SInt32Array2[nIndex]) ? 0 : 0x40;
-
-        // esi - SInt32Array2[nIndex]
-        // edx - step_table[SInt32Array2[nIndex]]
-        // edi - (step_table[SInt32Array1[nIndex]] >> nCmpLevel)
-        nTableValue = step_table[SInt32Array1[nIndex]];
-        dwStopBit = (unsigned long)nCmpLevel;
-
-        // edi - nIndex;
-        if(nValue < (nTableValue >> nCmpLevel))
-        {
-            if(SInt32Array1[nIndex] != 0)
-                SInt32Array1[nIndex]--;
-            *out.pb++ = 0x80;
-        }
-        else
-        {
-            while(nValue > nTableValue * 2)
-            {
-                if(SInt32Array1[nIndex] >= 0x58 || nLength == 0)
-                    break;
-
-                SInt32Array1[nIndex] += 8;
-                if(SInt32Array1[nIndex] > 0x58)
-                    SInt32Array1[nIndex] = 0x58;
-
-                nTableValue = step_table[SInt32Array1[nIndex]];
-                *out.pb++ = 0x81;
-                nLength--;
-            }
-
-            var_2C = nTableValue >> Wcmp.b[1];
-            dwBitBuff = 0;
-
-            esi = (1 << (dwStopBit - 2));
-            dwStopBit = (esi <= 0x20) ? esi : 0x20;
-
-            for(var_1C = 0, dwBit = 1; ; dwBit <<= 1)
-            {
-//              esi = var_1C + nTableValue;
-                if((var_1C + nTableValue) <= nValue)
-                {
-                    var_1C += nTableValue;
-                    dwBitBuff |= dwBit;
-                }
-                if(dwBit == dwStopBit)
-                    break;
-
-                nTableValue >>= 1;
-            }
-
-            nValue = SInt32Array2[nIndex];
-            if(ebx != 0)
-            {
-                nValue -= (var_1C + var_2C);
-                if(nValue < -32768)
-                    nValue = -32768;
-            }
-            else
-            {
-                nValue += (var_1C + var_2C);
-                if(nValue > 32767)
-                    nValue = 32767;
-            }
-
-            SInt32Array2[nIndex]  = nValue;
-            *out.pb++ = (unsigned char)(dwBitBuff | ebx);
-            nTableValue = Table1503F120[dwBitBuff & 0x1F];
-            SInt32Array1[nIndex]  = SInt32Array1[nIndex] + nTableValue;
-            if(SInt32Array1[nIndex] < 0)
-                SInt32Array1[nIndex] = 0;
-            else if(SInt32Array1[nIndex] > 0x58)
-                SInt32Array1[nIndex] = 0x58;
-        }
-    }
-
-    return (int)(out.pb - pbOutBuffer);
-}
-
-//----------------------------------------------------------------------------
-// DecompressADPCM
-
-// 1500F230
-int DecompressADPCM(unsigned char * pbOutBuffer, int dwOutLength, unsigned char * pbInBuffer, int dwInLength, int nChannels)
-{
-    BYTE_AND_WORD_PTR out;                // Output buffer
-    BYTE_AND_WORD_PTR in;
-    unsigned char * pbInBufferEnd = (pbInBuffer + dwInLength);
-    long SInt32Array1[2];
-    long SInt32Array2[2];
-    long nOneWord;
-    int nIndex;
-    int i;
-
-    SInt32Array1[0] = SInt32Array1[1] = 0x2C;
-    out.pb = pbOutBuffer;
-    in.pb = pbInBuffer;
-    in.pw++;
-
-    // Fill the Uint32Array2 array by channel values.
-    for(i = 0; i < nChannels; i++)
-    {
-        nOneWord = BSWAP_INT16_SIGNED(*in.pw++);
-        SInt32Array2[i] = nOneWord;
-        if(dwOutLength < 2)
-            return (int)(out.pb - pbOutBuffer);
-
-        *out.pw++ = BSWAP_INT16_SIGNED((short)nOneWord);
-        dwOutLength -= sizeof(short);
-    }
-
-    // Get the initial index
-    nIndex = nChannels - 1;
-
-    // Perform the decompression
-    while(in.pb < pbInBufferEnd)
-    {
-        unsigned char nOneByte = *in.pb++;
-
-        // Switch index
-        if(nChannels == 2)
-            nIndex = (nIndex == 0) ? 1 : 0;
-
-        // 1500F2A2: Get one byte from input buffer
-        if(nOneByte & 0x80)
-        {
-            switch(nOneByte & 0x7F)
-            {
-                case 0:     // 1500F315
-                    if(SInt32Array1[nIndex] != 0)
-                        SInt32Array1[nIndex]--;
-
-                    if(dwOutLength < 2)
-                        return (int)(out.pb - pbOutBuffer);
-
-                    *out.pw++ = BSWAP_INT16_SIGNED((unsigned short)SInt32Array2[nIndex]);
-                    dwOutLength -= sizeof(unsigned short);
-                    break;
-
-                case 1:     // 1500F2E8
-                    SInt32Array1[nIndex] += 8;
-                    if(SInt32Array1[nIndex] > 0x58)
-                        SInt32Array1[nIndex] = 0x58;
-
-                    if(nChannels == 2)
-                        nIndex = (nIndex == 0) ? 1 : 0;
-                    break;
-
-                case 2:     // 1500F41E
-                    break;
-
-                default:    // 1500F2C4
-                    SInt32Array1[nIndex] -= 8;
-                    if(SInt32Array1[nIndex] < 0)
-                        SInt32Array1[nIndex] = 0;
-
-                    if(nChannels == 2)
-                        nIndex = (nIndex == 0) ? 1 : 0;
-                    break;
-            }
-        }
-        else
-        {
-            // 1500F349
-            long temp1 = step_table[SInt32Array1[nIndex]];     // EDI
-            long temp2 = temp1 >> pbInBuffer[1];               // ESI
-            long temp3 = SInt32Array2[nIndex];                 // ECX
-
-            if(nOneByte & 0x01)          // EBX = nOneByte
-                temp2 += (temp1 >> 0);
-
-            if(nOneByte & 0x02)
-                temp2 += (temp1 >> 1);
-
-            if(nOneByte & 0x04)
-                temp2 += (temp1 >> 2);
-
-            if(nOneByte & 0x08)
-                temp2 += (temp1 >> 3);
-
-            if(nOneByte & 0x10)
-                temp2 += (temp1 >> 4);
-
-            if(nOneByte & 0x20)
-                temp2 += (temp1 >> 5);
-
-            if(nOneByte & 0x40)
-            {
-                temp3 = temp3 - temp2;
-                if(temp3 <= -32768)
-                    temp3 = -32768;
-            }
-            else
-            {
-                temp3 = temp3 + temp2;
-                if(temp3 >= 32767)
-                    temp3 = 32767;
-            }
-
-            SInt32Array2[nIndex] = temp3;
-            if(dwOutLength < 2)
-                break;
-
-            // Store the output 16-bit value
-            *out.pw++ = BSWAP_INT16_SIGNED((short)SInt32Array2[nIndex]);
-            dwOutLength -= 2;
-
-            SInt32Array1[nIndex] += Table1503F120[nOneByte & 0x1F];
-
-            if(SInt32Array1[nIndex] < 0)
-                SInt32Array1[nIndex] = 0;
-            else if(SInt32Array1[nIndex] > 0x58)
-                SInt32Array1[nIndex] = 0x58;
-        }
-    }
-    return (int)(out.pb - pbOutBuffer);
-}
diff --git a/dep/StormLibOld/src/adpcm/adpcm.h b/dep/StormLibOld/src/adpcm/adpcm.h
deleted file mode 100644
index beb961597..000000000
--- a/dep/StormLibOld/src/adpcm/adpcm.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*****************************************************************************/
-/* adpcm.h                                Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Header file for adpcm decompress functions                                */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 31.03.03  1.00  Lad  The first version of adpcm.h                         */
-/*****************************************************************************/
-
-#ifndef __ADPCM_H__
-#define __ADPCM_H__
-
-//-----------------------------------------------------------------------------
-// Functions
-
-#include "../StormPort.h"
-
-int  CompressADPCM  (unsigned char * pbOutBuffer, int dwOutLength, short * pwInBuffer, int dwInLength, int nCmpType, int nChannels);
-int  DecompressADPCM(unsigned char * pbOutBuffer, int dwOutLength, unsigned char * pbInBuffer, int dwInLength, int nChannels);
-
-#endif // __ADPCM_H__
diff --git a/dep/StormLibOld/src/huffman/huff.cpp b/dep/StormLibOld/src/huffman/huff.cpp
deleted file mode 100644
index e12dd7df0..000000000
--- a/dep/StormLibOld/src/huffman/huff.cpp
+++ /dev/null
@@ -1,1303 +0,0 @@
-/*****************************************************************************/
-/* huffman.cpp                       Copyright (c) Ladislav Zezula 1998-2003 */
-/*---------------------------------------------------------------------------*/
-/* This module contains Huffmann (de)compression methods                     */
-/*                                                                           */
-/* Authors : Ladislav Zezula (ladik@zezula.net)                              */
-/*           ShadowFlare     (BlakFlare@hotmail.com)                         */
-/*                                                                           */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* xx.xx.xx  1.00  Lad  The first version of dcmp.cpp                        */
-/* 03.05.03  1.00  Lad  Added compression methods                            */
-/* 19.11.03  1.01  Dan  Big endian handling                                  */
-/* 08.12.03  2.01  Dan  High-memory handling (> 0x80000000)                  */
-/*****************************************************************************/
-
-#include <assert.h>
-#include <string.h>
-
-#include "huff.h"
-
-// Special for Mac - we have to know if normal pointer greater or less
-// than 0x80000000. This variable is used in the PTR_VALID and PTR_INVALID
-// macros
-static long mul = 1;
-
-#define PTR_VALID(ptr)           (((LONG_PTR)(ptr) * mul) > 0)
-#define PTR_INVALID(ptr)         (((LONG_PTR)(ptr) * mul) < 0)
-#define PTR_INVALID_OR_NULL(ptr) (((LONG_PTR)(ptr) * mul) <= 0)
-
-
-//-----------------------------------------------------------------------------
-// Methods of the THTreeItem struct
-
-// 1501DB70
-THTreeItem * THTreeItem::Call1501DB70(THTreeItem * pLast)
-{
-    if(pLast == NULL)
-        pLast = this + 1;
-    return pLast;
-}
-
-// Gets previous Huffman tree item (?)
-THTreeItem * THTreeItem::GetPrevItem(LONG_PTR value)
-{
-    if(PTR_INVALID(prev))
-        return PTR_NOT(prev);
-
-    if(value == -1 || PTR_INVALID(value))
-        value = (LONG_PTR)(this - next->prev);
-    return prev + value;
-
-// OLD VERSION
-//  if(PTR_INT(value) < 0)
-//      value = PTR_INT((item - item->next->prev));
-//  return (THTreeItem *)((char *)prev + value);
-}
-
-// 1500F5E0
-void THTreeItem::ClearItemLinks()
-{
-    next = prev = NULL;
-}
-
-// 1500BC90
-void THTreeItem::RemoveItem()
-{
-    THTreeItem * pTemp;                // EDX
-
-    if(next != NULL)
-    {
-        pTemp = prev;
-
-        if(PTR_INVALID_OR_NULL(pTemp))
-            pTemp = PTR_NOT(pTemp);
-        else
-            pTemp += (this - next->prev);
-
-        pTemp->next = next;
-        next->prev  = prev;
-        next = prev = NULL;
-    }
-}
-
-/*
-// OLD VERSION : Removes item from the tree (?)
-static void RemoveItem(THTreeItem * item)
-{
-    THTreeItem * next = item->next;     // ESI
-    THTreeItem * prev = item->prev;     // EDX
-
-    if(next == NULL)
-        return;
-
-    if(PTR_INT(prev) < 0)
-        prev = PTR_NOT(prev);
-    else
-        // ??? usually item == next->prev, so what is it ?
-        prev = (THTreeItem *)((unsigned char *)prev + (unsigned long)((unsigned char *)item - (unsigned char *)(next->prev)));
-
-    // Remove HTree item from the chain
-    prev->next = next;                  // Sets the 'first' pointer
-    next->prev = item->prev;
-
-    // Invalidate pointers
-    item->next = NULL;
-    item->prev = NULL;
-}
-*/
-
-//-----------------------------------------------------------------------------
-// TOutputStream functions
-
-void TOutputStream::PutBits(unsigned long dwBuff, unsigned int nPutBits)
-{
-    dwBitBuff |= (dwBuff << nBits);
-    nBits     += nPutBits;
-
-    // Flush completed bytes
-    while(nBits >= 8)
-    {
-        if(cbOutSize != 0)
-        {
-            *pbOutPos++ = (unsigned char)dwBitBuff;
-            cbOutSize--;
-        }
-
-        dwBitBuff >>= 8;
-        nBits      -= 8;
-    }
-}
-
-//-----------------------------------------------------------------------------
-// TInputStream functions
-
-// Gets one bit from input stream
-unsigned long TInputStream::GetBit()
-{
-    unsigned long dwOneBit = 0;
-
-    // Ensure that the input stream is reloaded, if there are no bits left
-    if(BitCount == 0)
-    {
-        // Refill the bit buffer
-        BitBuffer = *pbInBuffer++;
-        BitCount = 8;
-    }
-
-    // Copy the bit from bit buffer to the variable
-    dwOneBit = (BitBuffer & 0x01);
-    BitBuffer >>= 1;
-    BitCount--;
-
-    return dwOneBit;
-}
-
-// Gets 7 bits from the stream. DOES NOT remove the bits from input stream
-unsigned long TInputStream::Get7Bits()
-{
-    unsigned long dwReloadByte = 0;
-
-    // If there is not enough bits to get the value,
-    // we have to add 8 more bits from the input buffer
-    if(BitCount < 7)
-    {
-        dwReloadByte = *pbInBuffer++;
-        BitBuffer |= dwReloadByte << BitCount;
-        BitCount += 8;
-    }
-
-    // Return the first available 7 bits. DO NOT remove them from the input stream
-    return (BitBuffer & 0x7F);
-}
-
-// Gets the whole byte from the input stream.
-unsigned long TInputStream::Get8Bits()
-{
-    unsigned long dwReloadByte = 0;
-    unsigned long dwOneByte = 0;
-
-    // If there is not enough bits to get the value,
-    // we have to add 8 more bits from the input buffer
-    if(BitCount < 8)
-    {
-        dwReloadByte = *pbInBuffer++;
-        BitBuffer |= dwReloadByte << BitCount;
-        BitCount += 8;
-    }
-
-    // Return the lowest 8 its
-    dwOneByte = (BitBuffer & 0xFF);
-    BitBuffer >>= 8;
-    BitCount -= 8;
-    return dwOneByte;
-}
-
-void TInputStream::SkipBits(unsigned int dwBitsToSkip)
-{
-    unsigned long dwReloadByte = 0;
-
-    // If there is not enough bits in the buffer,
-    // we have to add 8 more bits from the input buffer
-    if(BitCount < dwBitsToSkip)
-    {
-        dwReloadByte = *pbInBuffer++;
-        BitBuffer |= dwReloadByte << BitCount;
-        BitCount += 8;
-    }
-
-    // Skip the remaining bits
-    BitBuffer >>= dwBitsToSkip;
-    BitCount -= dwBitsToSkip;
-}
-
-//-----------------------------------------------------------------------------
-// Functions for huffmann tree items
-
-// Inserts item into the tree (?)
-static void InsertItem(THTreeItem ** itemPtr, THTreeItem * item, unsigned long nWhere, THTreeItem * item2)
-{
-    THTreeItem * next = item->next;     // EDI - next to the first item
-    THTreeItem * prev = item->prev;     // ESI - prev to the first item
-    THTreeItem * prev2;                 // Pointer to previous item
-    LONG_PTR next2;                     // Pointer to the next item
-
-    // The same code like in RemoveItem(item);
-    if(next != 0)                       // If the first item already has next one
-    {
-        if(PTR_INVALID(prev))
-            prev = PTR_NOT(prev);
-        else
-            prev += (item - next->prev);
-
-        // 150083C1
-        // Remove the item from the tree
-        prev->next = next;
-        next->prev = prev;
-
-        // Invalidate 'prev' and 'next' pointer
-        item->next = 0;
-        item->prev = 0;
-    }
-
-    if(item2 == NULL)                   // EDX - If the second item is not entered,
-        item2 = PTR_PTR(&itemPtr[1]);   // take the first tree item
-
-    switch(nWhere)
-    {
-        case SWITCH_ITEMS :             // Switch the two items
-            item->next  = item2->next;  // item2->next (Pointer to pointer to first)
-            item->prev  = item2->next->prev;
-            item2->next->prev = item;
-            item2->next = item;         // Set the first item
-            return;
-
-        case INSERT_ITEM:               // Insert as the last item
-            item->next = item2;         // Set next item (or pointer to pointer to first item)
-            item->prev = item2->prev;   // Set prev item (or last item in the tree)
-
-            next2 = PTR_INT(itemPtr[0]);// Usually NULL
-            prev2 = item2->prev;        // Prev item to the second (or last tree item)
-
-            if(PTR_INVALID(prev2))
-            {
-                if(prev != NULL)
-                {
-                    prev2 = PTR_NOT(prev);
-                    if(prev2 != NULL)
-                    {
-                        prev2->next = item;
-                        item2->prev = item;     // Next after last item
-                    }
-                }
-                return;
-            }
-
-            if(PTR_INVALID(next2))
-                next2 = (LONG_PTR)(item2 - item2->next->prev);
-//              next2 = (THTreeItem *)(unsigned long)((unsigned char *)item2 - (unsigned char *)(item2->next->prev));
-
-//          prev2 = (THTreeItem *)((char *)prev2 + (unsigned long)next2);// ???
-            prev2 += next2;
-            prev2->next = item;
-            item2->prev = item;         // Set the next/last item
-            return;
-
-        default:
-            return;
-    }
-}
-
-//-----------------------------------------------------------------------------
-// THuffmannTree class functions
-
-THuffmannTree::THuffmannTree()
-{
-    // We have to check if the "this" pointer is less than zero
-    if((LONG_PTR)this < 0)
-        mul = -1;
-}
-
-void THuffmannTree::InitTree(bool bCompression)
-{
-    THTreeItem * pItem;
-    unsigned int nCount;
-
-    // Clear links for all the items in the tree
-    for(pItem = items0008, nCount = 0x203; nCount != 0; pItem++, nCount--)
-        pItem->ClearItemLinks();
-
-    pItem3050 = NULL;
-    pItem3054 = PTR_PTR(&pItem3054);
-    pItem3058 = PTR_NOT(pItem3054);
-
-    pItem305C = NULL;
-    pFirst    = PTR_PTR(&pFirst);
-    pLast     = PTR_NOT(pFirst);
-
-    offs0004  = 1;
-    nItems    = 0;
-
-    // Clear all TQDecompress items. Do this only if preparing for decompression
-    if(bCompression == false)
-    {
-        for(nCount = 0; nCount < sizeof(qd3474) / sizeof(TQDecompress); nCount++)
-            qd3474[nCount].offs00 = 0;
-    }
-}
-
-// Builds Huffman tree. Called with the first 8 bits loaded from input stream
-void THuffmannTree::BuildTree(unsigned int nCmpType)
-{
-    unsigned long   maxByte;                // [ESP+10] - The greatest character found in table
-    THTreeItem   ** itemPtr;                // [ESP+14] - Pointer to Huffman tree item pointer array
-    unsigned char * byteArray;              // [ESP+1C] - Pointer to unsigned char in Table1502A630
-    THTreeItem    * child1;
-    unsigned long   i;                      // egcs in linux doesn't like multiple for loops without an explicit i
-
-    // Loop while pointer has a valid value
-    while(PTR_VALID(pLast))                 // ESI - Last entry
-    {
-        THTreeItem * temp;                  // EAX
-
-        if(pLast->next != NULL)             // ESI->next
-            pLast->RemoveItem();
-                                            // EDI = &offs3054
-        pItem3058   = PTR_PTR(&pItem3054);  // [EDI+4]
-        pLast->prev = pItem3058;            // EAX
-
-        temp = PTR_PTR(&pItem3054)->GetPrevItem(PTR_INT(&pItem3050));
-
-        temp->next = pLast;
-        pItem3054  = pLast;
-    }
-
-    // Clear all pointers in HTree item array
-    memset(items306C, 0, sizeof(items306C));
-
-    maxByte = 0;                            // Greatest character found init to zero.
-    itemPtr = (THTreeItem **)&items306C;    // Pointer to current entry in HTree item pointer array
-
-    // Ensure we have low 8 bits only
-    nCmpType &= 0xFF;
-    byteArray  = Table1502A630 + nCmpType * 258; // EDI also
-
-    for(i = 0; i < 0x100; i++, itemPtr++)
-    {
-        THTreeItem * item   = pItem3058;    // Item to be created
-        THTreeItem * pItem3 = pItem3058;
-        unsigned char         oneByte = byteArray[i];
-
-        // Skip all the bytes which are zero.
-        if(byteArray[i] == 0)
-            continue;
-
-        // If not valid pointer, take the first available item in the array
-        if(PTR_INVALID_OR_NULL(item))
-            item = &items0008[nItems++];
-
-        // Insert this item as the top of the tree
-        InsertItem(&pItem305C, item, SWITCH_ITEMS, NULL);
-
-        item->parent    = NULL;                 // Invalidate child and parent
-        item->child     = NULL;
-        *itemPtr        = item;                 // Store pointer into pointer array
-
-        item->dcmpByte  = i;                    // Store counter
-        item->byteValue = oneByte;              // Store byte value
-        if(oneByte >= maxByte)
-        {
-            maxByte = oneByte;
-            continue;
-        }
-
-        // Find the first item which has byte value greater than current one byte
-        if(PTR_VALID(pItem3 = pLast))           // EDI - Pointer to the last item
-        {
-            // 15006AF7
-            if(pItem3 != NULL)
-            {
-                do  // 15006AFB
-                {
-                    if(pItem3->byteValue >= oneByte)
-                        goto _15006B09;
-                    pItem3 = pItem3->prev;
-                }
-                while(PTR_VALID(pItem3));
-            }
-        }
-        pItem3 = NULL;
-
-        // 15006B09
-        _15006B09:
-        if(item->next != NULL)
-            item->RemoveItem();
-
-        // 15006B15
-        if(pItem3 == NULL)
-            pItem3 = PTR_PTR(&pFirst);
-
-        // 15006B1F
-        item->next = pItem3->next;
-        item->prev = pItem3->next->prev;
-        pItem3->next->prev = item;
-        pItem3->next = item;
-    }
-
-    // 15006B4A
-    for(; i < 0x102; i++)
-    {
-        THTreeItem ** itemPtr = &items306C[i];  // EDI
-
-        // 15006B59
-        THTreeItem * item = pItem3058;          // ESI
-        if(PTR_INVALID_OR_NULL(item))
-            item = &items0008[nItems++];
-
-        InsertItem(&pItem305C, item, INSERT_ITEM, NULL);
-
-        // 15006B89
-        item->dcmpByte   = i;
-        item->byteValue  = 1;
-        item->parent     = NULL;
-        item->child      = NULL;
-        *itemPtr++ = item;
-    }
-
-    // 15006BAA
-    if(PTR_VALID(child1 = pLast))                   // EDI - last item (first child to item
-    {
-        THTreeItem * child2;                        // EBP
-        THTreeItem * item;                          // ESI
-
-        // 15006BB8
-        while(PTR_VALID(child2 = child1->prev))
-        {
-            if(PTR_INVALID_OR_NULL(item = pItem3058))
-                item = &items0008[nItems++];
-
-            // 15006BE3
-            InsertItem(&pItem305C, item, SWITCH_ITEMS, NULL);
-
-            // 15006BF3
-            item->parent = NULL;
-            item->child  = NULL;
-
-            //EDX = child2->byteValue + child1->byteValue;
-            //EAX = child1->byteValue;
-            //ECX = maxByte;                        // The greatest character (0xFF usually)
-
-            item->byteValue = child1->byteValue + child2->byteValue; // 0x02
-            item->child     = child1;                                // Prev item in the
-            child1->parent  = item;
-            child2->parent  = item;
-
-            // EAX = item->byteValue;
-            if(item->byteValue >= maxByte)
-                maxByte = item->byteValue;
-            else
-            {
-                THTreeItem * pItem2 = child2->prev;   // EDI
-
-                // 15006C2D
-                while(PTR_VALID(pItem2))
-                {
-                    if(pItem2->byteValue >= item->byteValue)
-                        goto _15006C3B;
-                    pItem2 = pItem2->prev;
-                }
-                pItem2 = NULL;
-
-                _15006C3B:
-                if(item->next != 0)
-                {
-                    THTreeItem * temp4 = item->GetPrevItem(-1);
-
-                    temp4->next      = item->next;                 // The first item changed
-                    item->next->prev = item->prev;                 // First->prev changed to negative value
-                    item->next = NULL;
-                    item->prev = NULL;
-                }
-
-                // 15006C62
-                if(pItem2 == NULL)
-                    pItem2 = PTR_PTR(&pFirst);
-
-                item->next = pItem2->next;                           // Set item with 0x100 byte value
-                item->prev = pItem2->next->prev;                     // Set item with 0x17 byte value
-                pItem2->next->prev = item;                           // Changed prev of item with
-                pItem2->next = item;
-            }
-
-            // 15006C7B
-            if(PTR_INVALID_OR_NULL(child1 = child2->prev))
-                break;
-        }
-    }
-    // 15006C88
-    offs0004 = 1;
-}
-/*
-// Modifies Huffman tree. Adds new item and changes
-void THuffmannTree::ModifyTree(unsigned long dwIndex)
-{
-    THTreeItem * pItem1 = pItem3058;                              // ESI
-    THTreeItem * pSaveLast = (PTR_INT(pLast) <= 0) ? NULL : pLast;  // EBX
-    THTreeItem * temp;                                              // EAX
-
-    // Prepare the first item to insert to the tree
-    if(PTR_INT(pItem1) <= 0)
-        pItem1 = &items0008[nItems++];
-
-    // If item has any next item, remove it from the chain
-    if(pItem1->next != NULL)
-    {
-        THTreeItem * temp = pItem1->GetPrevItem(-1);                  // EAX
-
-        temp->next = pItem1->next;
-        pItem1->next->prev = pItem1->prev;
-        pItem1->next = NULL;
-        pItem1->prev = NULL;
-    }
-
-    pItem1->next = PTR_PTR(&pFirst);
-    pItem1->prev = pLast;
-    temp = pItem1->next->GetPrevItem(PTR_INT(pItem305C));
-
-    // 150068E9
-    temp->next = pItem1;
-    pLast  = pItem1;
-
-    pItem1->parent = NULL;
-    pItem1->child  = NULL;
-
-    // 150068F6
-    pItem1->dcmpByte  = pSaveLast->dcmpByte;   // Copy item index
-    pItem1->byteValue = pSaveLast->byteValue;  // Copy item byte value
-    pItem1->parent    = pSaveLast;             // Set parent to last item
-    items306C[pSaveLast->dcmpByte] = pItem1;  // Insert item into item pointer array
-
-    // Prepare the second item to insert into the tree
-    if(PTR_INT((pItem1 = pItem3058)) <= 0)
-        pItem1 = &items0008[nItems++];
-
-    // 1500692E
-    if(pItem1->next != NULL)
-    {
-        temp = pItem1->GetPrevItem(-1);   // EAX
-
-        temp->next = pItem1->next;
-        pItem1->next->prev = pItem1->prev;
-        pItem1->next = NULL;
-        pItem1->prev = NULL;
-    }
-    // 1500694C
-    pItem1->next = PTR_PTR(&pFirst);
-    pItem1->prev = pLast;
-    temp = pItem1->next->GetPrevItem(PTR_INT(pItem305C));
-
-    // 15006968
-    temp->next = pItem1;
-    pLast      = pItem1;
-
-    // 1500696E
-    pItem1->child     = NULL;
-    pItem1->dcmpByte  = dwIndex;
-    pItem1->byteValue = 0;
-    pItem1->parent    = pSaveLast;
-    pSaveLast->child   = pItem1;
-    items306C[dwIndex] = pItem1;
-
-    do
-    {
-        THTreeItem  * pItem2 = pItem1;
-        THTreeItem  * pItem3;
-        unsigned long byteValue;
-
-        // 15006993
-        byteValue = ++pItem1->byteValue;
-
-        // Pass through all previous which have its value greater than byteValue
-        while(PTR_INT((pItem3 = pItem2->prev)) > 0)  // EBX
-        {
-            if(pItem3->byteValue >= byteValue)
-                goto _150069AE;
-
-            pItem2 = pItem2->prev;
-        }
-        // 150069AC
-        pItem3 = NULL;
-
-        _150069AE:
-        if(pItem2 == pItem1)
-            continue;
-
-        // 150069B2
-        // Switch pItem2 with item
-        InsertItem(&pItem305C, pItem2, SWITCH_ITEMS, pItem1);
-        InsertItem(&pItem305C, pItem1, SWITCH_ITEMS, pItem3);
-
-        // 150069D0
-        // Switch parents of pItem1 and pItem2
-        temp = pItem2->parent->child;
-        if(pItem1 == pItem1->parent->child)
-            pItem1->parent->child = pItem2;
-
-        if(pItem2 == temp)
-            pItem2->parent->child = pItem1;
-
-        // 150069ED
-        // Switch parents of pItem1 and pItem3
-        temp = pItem1->parent;
-        pItem1 ->parent = pItem2->parent;
-        pItem2->parent = temp;
-        offs0004++;
-    }
-    while(PTR_INT((pItem1 = pItem1->parent)) > 0);
-}
-
-void THuffmannTree::UninitTree()
-{
-    while(PTR_INT(pLast) > 0)
-    {
-        pItem = pItem305C->Call1501DB70(pLast);
-        pItem->RemoveItem();
-    }
-
-    for(pItem = pFirst; PTR_INT(pItem3058) > 0; pItem = pItem3058)
-        pItem->RemoveItem();
-    PTR_PTR(&pItem3054)->RemoveItem();
-
-    for(pItem = items0008 + 0x203, nCount = 0x203; nCount != 0; nCount--)
-    {
-        pItem--;
-        pItem->RemoveItem();
-        pItem->RemoveItem();
-    }
-}
-*/
-
-THTreeItem * THuffmannTree::Call1500E740(unsigned int nValue)
-{
-    THTreeItem * pItem1 = pItem3058;    // EDX
-    THTreeItem * pItem2;                // EAX
-    THTreeItem * pNext;
-    THTreeItem * pPrev;
-    THTreeItem ** ppItem;
-
-    if(PTR_INVALID_OR_NULL(pItem1) || (pItem2 = pItem1) == NULL)
-    {
-        if((pItem2 = &items0008[nItems++]) != NULL)
-            pItem1 = pItem2;
-        else
-            pItem1 = pFirst;
-    }
-    else
-        pItem1 = pItem2;
-
-    pNext = pItem1->next;
-    if(pNext != NULL)
-    {
-        pPrev = pItem1->prev;
-        if(PTR_INVALID_OR_NULL(pPrev))
-            pPrev = PTR_NOT(pPrev);
-        else
-            pPrev += (pItem1 - pItem1->next->prev);
-
-        pPrev->next = pNext;
-        pNext->prev = pPrev;
-        pItem1->next = NULL;
-        pItem1->prev = NULL;
-    }
-
-    ppItem = &pFirst;       // esi
-    if(nValue > 1)
-    {
-        // ecx = pFirst->next;
-        pItem1->next = *ppItem;
-        pItem1->prev = (*ppItem)->prev;
-
-        (*ppItem)->prev = pItem2;
-        *ppItem = pItem1;
-
-        pItem2->parent = NULL;
-        pItem2->child  = NULL;
-    }
-    else
-    {
-        pItem1->next = (THTreeItem *)ppItem;
-        pItem1->prev = ppItem[1];
-        // edi = pItem305C;
-        pPrev = ppItem[1];      // ecx
-        if(PTR_INVALID_OR_NULL(pPrev))
-        {
-            pPrev = PTR_NOT(pPrev);
-            pPrev->next = pItem1;
-            pPrev->prev = pItem2;
-
-            pItem2->parent = NULL;
-            pItem2->child  = NULL;
-        }
-        else
-        {
-            if(PTR_INVALID(pItem305C))
-                pPrev += (THTreeItem *)ppItem - (*ppItem)->prev;
-            else
-                pPrev += PTR_INT(pItem305C);
-
-            pPrev->next    = pItem1;
-            ppItem[1]      = pItem2;
-            pItem2->parent = NULL;
-            pItem2->child  = NULL;
-        }
-    }
-    return pItem2;
-}
-
-void THuffmannTree::Call1500E820(THTreeItem * pItem)
-{
-    THTreeItem * pItem1;                // edi
-    THTreeItem * pItem2 = NULL;         // eax
-    THTreeItem * pItem3;                // edx
-    THTreeItem * pPrev;                 // ebx
-
-    for(; pItem != NULL; pItem = pItem->parent)
-    {
-        pItem->byteValue++;
-
-        for(pItem1 = pItem; ; pItem1 = pPrev)
-        {
-            pPrev = pItem1->prev;
-            if(PTR_INVALID_OR_NULL(pPrev))
-            {
-                pPrev = NULL;
-                break;
-            }
-
-            if(pPrev->byteValue >= pItem->byteValue)
-                break;
-        }
-
-        if(pItem1 == pItem)
-            continue;
-
-        if(pItem1->next != NULL)
-        {
-            pItem2 = pItem1->GetPrevItem(-1);
-            pItem2->next = pItem1->next;
-            pItem1->next->prev = pItem1->prev;
-            pItem1->next = NULL;
-            pItem1->prev = NULL;
-        }
-
-        pItem2 = pItem->next;
-        pItem1->next = pItem2;
-        pItem1->prev = pItem2->prev;
-        pItem2->prev = pItem1;
-        pItem->next = pItem1;
-        if((pItem2 = pItem1) != NULL)
-        {
-            pItem2 = pItem->GetPrevItem(-1);
-            pItem2->next = pItem->next;
-            pItem->next->prev = pItem->prev;
-            pItem->next = NULL;
-            pItem->prev = NULL;
-        }
-
-        if(pPrev == NULL)
-            pPrev = PTR_PTR(&pFirst);
-
-        pItem2       = pPrev->next;
-        pItem->next  = pItem2;
-        pItem->prev  = pItem2->prev;
-        pItem2->prev = pItem;
-        pPrev->next  = pItem;
-
-        pItem3 = pItem1->parent->child;
-        pItem2 = pItem->parent;
-        if(pItem2->child == pItem)
-            pItem2->child = pItem1;
-        if(pItem3 == pItem1)
-            pItem1->parent->child = pItem;
-
-        pItem2 = pItem->parent;
-        pItem->parent  = pItem1->parent;
-        pItem1->parent = pItem2;
-        offs0004++;
-    }
-}
-
-// 1500E920
-unsigned int THuffmannTree::DoCompression(TOutputStream * os, unsigned char * pbInBuffer, int nInLength, int nCmpType)
-{
-    THTreeItem  * pItem1;
-    THTreeItem  * pItem2;
-    THTreeItem  * pItem3;
-    THTreeItem  * pTemp;
-    unsigned long dwBitBuff;
-    unsigned int  nBits;
-    unsigned int  nBit;
-
-    BuildTree(nCmpType);
-    bIsCmp0 = (nCmpType == 0);
-
-    // Store the compression type into output buffer
-    os->dwBitBuff |= (nCmpType << os->nBits);
-    os->nBits     += 8;
-
-    // Flush completed bytes
-    while(os->nBits >= 8)
-    {
-        if(os->cbOutSize != 0)
-        {
-            *os->pbOutPos++ = (unsigned char)os->dwBitBuff;
-            os->cbOutSize--;
-        }
-
-        os->dwBitBuff >>= 8;
-        os->nBits      -= 8;
-    }
-
-    for(; nInLength != 0; nInLength--)
-    {
-        unsigned char bOneByte = *pbInBuffer++;
-
-        if((pItem1 = items306C[bOneByte]) == NULL)
-        {
-            pItem2    = items306C[0x101];  // ecx
-            pItem3    = pItem2->parent;    // eax
-            dwBitBuff = 0;
-            nBits     = 0;
-
-            for(; pItem3 != NULL; pItem3 = pItem3->parent)
-            {
-                nBit      = (pItem3->child != pItem2) ? 1 : 0;
-                dwBitBuff = (dwBitBuff << 1) | nBit;
-                nBits++;
-                pItem2  = pItem3;
-            }
-            os->PutBits(dwBitBuff, nBits);
-
-            // Store the loaded byte into output stream
-            os->dwBitBuff |= (bOneByte << os->nBits);
-            os->nBits     += 8;
-
-            // Flush the whole byte(s)
-            while(os->nBits >= 8)
-            {
-                if(os->cbOutSize != 0)
-                {
-                    *os->pbOutPos++ = (unsigned char)os->dwBitBuff;
-                    os->cbOutSize--;
-                }
-                os->dwBitBuff >>= 8;
-                os->nBits -= 8;
-            }
-
-            pItem1 = (PTR_INVALID_OR_NULL(pLast)) ? NULL : pLast;
-            pItem2 = Call1500E740(1);
-            pItem2->dcmpByte  = pItem1->dcmpByte;
-            pItem2->byteValue = pItem1->byteValue;
-            pItem2->parent    = pItem1;
-            items306C[pItem2->dcmpByte] = pItem2;
-
-            pItem2 = Call1500E740(1);
-            pItem2->dcmpByte  = bOneByte;
-            pItem2->byteValue = 0;
-            pItem2->parent    = pItem1;
-            items306C[pItem2->dcmpByte] = pItem2;
-            pItem1->child = pItem2;
-
-            Call1500E820(pItem2);
-
-            if(bIsCmp0 != 0)
-            {
-                Call1500E820(items306C[bOneByte]);
-                continue;
-            }
-
-            for(pItem1 = items306C[bOneByte]; pItem1 != NULL; pItem1 = pItem1->parent)
-            {
-                pItem1->byteValue++;
-                pItem2 = pItem1;
-
-                for(;;)
-                {
-                    pItem3 = pItem2->prev;
-                    if(PTR_INVALID_OR_NULL(pItem3))
-                    {
-                        pItem3 = NULL;
-                        break;
-                    }
-                    if(pItem3->byteValue >= pItem1->byteValue)
-                        break;
-                    pItem2 = pItem3;
-                }
-
-                if(pItem2 != pItem1)
-                {
-                    InsertItem(&pItem305C, pItem2, SWITCH_ITEMS, pItem1);
-                    InsertItem(&pItem305C, pItem1, SWITCH_ITEMS, pItem3);
-
-                    pItem3 = pItem2->parent->child;
-                    if(pItem1->parent->child == pItem1)
-                        pItem1->parent->child = pItem2;
-
-                    if(pItem3 == pItem2)
-                        pItem2->parent->child = pItem1;
-
-                    pTemp = pItem1->parent;
-                    pItem1->parent = pItem2->parent;
-                    pItem2->parent = pTemp;
-                    offs0004++;
-                }
-            }
-        }
-// 1500EB62
-        else
-        {
-            dwBitBuff = 0;
-            nBits = 0;
-            for(pItem2 = pItem1->parent; pItem2 != NULL; pItem2 = pItem2->parent)
-            {
-                nBit      = (pItem2->child != pItem1) ? 1 : 0;
-                dwBitBuff = (dwBitBuff << 1) | nBit;
-                nBits++;
-                pItem1    = pItem2;
-            }
-            os->PutBits(dwBitBuff, nBits);
-        }
-
-// 1500EB98
-        if(bIsCmp0 != 0)
-            Call1500E820(items306C[bOneByte]);  // 1500EB9D
-// 1500EBAF
-    } // for(; nInLength != 0; nInLength--)
-
-// 1500EBB8
-    pItem1 = items306C[0x100];
-    dwBitBuff = 0;
-    nBits = 0;
-    for(pItem2 = pItem1->parent; pItem2 != NULL; pItem2 = pItem2->parent)
-    {
-        nBit      = (pItem2->child != pItem1) ? 1 : 0;
-        dwBitBuff = (dwBitBuff << 1) | nBit;
-        nBits++;
-        pItem1    = pItem2;
-    }
-
-// 1500EBE6
-    os->PutBits(dwBitBuff, nBits);
-
-// 1500EBEF
-    // Flush the remaining bits
-    while(os->nBits != 0)
-    {
-        if(os->cbOutSize != 0)
-        {
-            *os->pbOutPos++ = (unsigned char)os->dwBitBuff;
-            os->cbOutSize--;
-        }
-        os->dwBitBuff >>= 8;
-        os->nBits -= ((os->nBits > 8) ? 8 : os->nBits);
-    }
-
-    return (unsigned int)(os->pbOutPos - os->pbOutBuffer);
-}
-
-// Decompression using Huffman tree (1500E450)
-unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigned int dwOutLength, TInputStream * is)
-{
-    TQDecompress  * qd;
-    THTreeItem    * pItem1;
-    THTreeItem    * pItem2;
-    unsigned char * pbOutPos = pbOutBuffer;
-    unsigned long nBitCount;
-    unsigned int nDcmpByte = 0;
-    unsigned int n8Bits;                // 8 bits loaded from input stream
-    unsigned int n7Bits;                // 7 bits loaded from input stream
-    bool bHasQdEntry;
-
-    // Test the output length. Must not be NULL.
-    if(dwOutLength == 0)
-        return 0;
-
-    // Get the compression type from the input stream
-    n8Bits = is->Get8Bits();
-
-    // Build the Huffman tree
-    BuildTree(n8Bits);
-    bIsCmp0 = (n8Bits == 0) ? 1 : 0;
-
-    for(;;)
-    {
-        // Security check: If we are at the end of the input buffer,
-        // it means that the data is corrupt
-        if(is->BitCount == 0 && is->pbInBuffer >= is->pbInBufferEnd)
-            return 0;
-
-        // Get 7 bits from input stream
-        n7Bits = is->Get7Bits();
-
-        // Try to use quick decompression. Check TQDecompress array for corresponding item.
-        // If found, ise the result byte instead.
-        qd = &qd3474[n7Bits];
-
-        // If there is a quick-pass possible (ebx)
-        bHasQdEntry = (qd->offs00 >= offs0004) ? true : false;
-
-        // If we can use quick decompress, use it.
-        if(bHasQdEntry)
-        {
-            if(qd->nBits > 7)
-            {
-                is->SkipBits(7);
-                pItem1 = qd->pItem;
-                goto _1500E549;
-            }
-            is->SkipBits(qd->nBits);
-            nDcmpByte = qd->dcmpByte;
-        }
-        else
-        {
-            pItem1 = pFirst->next->prev;
-            if(PTR_INVALID_OR_NULL(pItem1))
-                pItem1 = NULL;
-_1500E549:
-            nBitCount = 0;
-            pItem2 = NULL;
-
-            do
-            {
-                if(pItem1 == NULL)
-                    return 0;
-
-                pItem1 = pItem1->child;     // Move down by one level
-                if(is->GetBit())            // If current bit is set, move to previous
-                    pItem1 = pItem1->prev;
-
-                if(++nBitCount == 7)        // If we are at 7th bit, save current HTree item.
-                    pItem2 = pItem1;
-            }
-            while(pItem1->child != NULL);   // Walk until tree has no deeper level
-
-            if(bHasQdEntry == false)
-            {
-                if(nBitCount > 7)
-                {
-                    qd->offs00 = offs0004;
-                    qd->nBits  = nBitCount;
-                    qd->pItem  = pItem2;
-                }
-                else
-                {
-                    unsigned long nIndex = n7Bits & (0xFFFFFFFF >> (32 - nBitCount));
-                    unsigned long nAdd   = (1 << nBitCount);
-
-                    for(qd = &qd3474[nIndex]; nIndex <= 0x7F; nIndex += nAdd, qd += nAdd)
-                    {
-                        qd->offs00   = offs0004;
-                        qd->nBits    = nBitCount;
-                        qd->dcmpByte = pItem1->dcmpByte;
-                    }
-                }
-            }
-            nDcmpByte = pItem1->dcmpByte;
-        }
-
-        if(nDcmpByte == 0x101)          // Huffman tree needs to be modified
-        {
-            n8Bits = is->Get8Bits();
-            pItem1 = (PTR_INVALID_OR_NULL(pLast)) ? NULL : pLast;
-
-            pItem2 = Call1500E740(1);
-            pItem2->parent    = pItem1;
-            pItem2->dcmpByte  = pItem1->dcmpByte;
-            pItem2->byteValue = pItem1->byteValue;
-            items306C[pItem2->dcmpByte] = pItem2;
-
-            pItem2 = Call1500E740(1);
-            pItem2->parent    = pItem1;
-            pItem2->dcmpByte  = n8Bits;
-            pItem2->byteValue = 0;
-            items306C[pItem2->dcmpByte] = pItem2;
-
-            pItem1->child = pItem2;
-            Call1500E820(pItem2);
-            if(bIsCmp0 == 0)
-                Call1500E820(items306C[n8Bits]);
-
-            nDcmpByte = n8Bits;
-        }
-
-        if(nDcmpByte == 0x100)
-            break;
-
-        *pbOutPos++ = (unsigned char)nDcmpByte;
-        if(--dwOutLength == 0)
-            break;
-
-        if(bIsCmp0)
-            Call1500E820(items306C[nDcmpByte]);
-    }
-
-    return (unsigned int)(pbOutPos - pbOutBuffer);
-}
-
-
-// Table for (de)compression. Every compression type has 258 entries
-unsigned char THuffmannTree::Table1502A630[] =
-{
-    // Data for compression type 0x00
-    0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-    0x00, 0x00,
-
-    // Data for compression type 0x01
-    0x54, 0x16, 0x16, 0x0D, 0x0C, 0x08, 0x06, 0x05, 0x06, 0x05, 0x06, 0x03, 0x04, 0x04, 0x03, 0x05,
-    0x0E, 0x0B, 0x14, 0x13, 0x13, 0x09, 0x0B, 0x06, 0x05, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02,
-    0x0D, 0x07, 0x09, 0x06, 0x06, 0x04, 0x03, 0x02, 0x04, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02,
-    0x09, 0x06, 0x04, 0x04, 0x04, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x04,
-    0x08, 0x03, 0x04, 0x07, 0x09, 0x05, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02,
-    0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02,
-    0x06, 0x0A, 0x08, 0x08, 0x06, 0x07, 0x04, 0x03, 0x04, 0x04, 0x02, 0x02, 0x04, 0x02, 0x03, 0x03,
-    0x04, 0x03, 0x07, 0x07, 0x09, 0x06, 0x04, 0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02,
-    0x0A, 0x02, 0x02, 0x03, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x03, 0x05, 0x02, 0x03,
-    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x03, 0x01, 0x01, 0x01,
-    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x04, 0x04, 0x04, 0x07, 0x09, 0x08, 0x0C, 0x02,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x03,
-    0x04, 0x01, 0x02, 0x04, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
-    0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x4B,
-    0x00, 0x00,
-
-    // Data for compression type 0x02
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x27, 0x00, 0x00, 0x23, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x06, 0x0E, 0x10, 0x04,
-    0x06, 0x08, 0x05, 0x04, 0x04, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03, 0x01, 0x01, 0x02, 0x01, 0x01,
-    0x01, 0x04, 0x02, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x04, 0x01, 0x01, 0x02, 0x03, 0x03, 0x02,
-    0x03, 0x01, 0x03, 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x01,
-    0x01, 0x29, 0x07, 0x16, 0x12, 0x40, 0x0A, 0x0A, 0x11, 0x25, 0x01, 0x03, 0x17, 0x10, 0x26, 0x2A,
-    0x10, 0x01, 0x23, 0x23, 0x2F, 0x10, 0x06, 0x07, 0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00,
-
-    // Data for compression type 0x03
-    0xFF, 0x0B, 0x07, 0x05, 0x0B, 0x02, 0x02, 0x02, 0x06, 0x02, 0x02, 0x01, 0x04, 0x02, 0x01, 0x03,
-    0x09, 0x01, 0x01, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
-    0x05, 0x01, 0x01, 0x01, 0x0D, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x02, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
-    0x0A, 0x04, 0x02, 0x01, 0x06, 0x03, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01,
-    0x05, 0x02, 0x03, 0x04, 0x03, 0x03, 0x03, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x03, 0x03,
-    0x01, 0x03, 0x01, 0x01, 0x02, 0x05, 0x01, 0x01, 0x04, 0x03, 0x05, 0x01, 0x03, 0x01, 0x03, 0x03,
-    0x02, 0x01, 0x04, 0x03, 0x0A, 0x06, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x02, 0x02, 0x01, 0x0A, 0x02, 0x05, 0x01, 0x01, 0x02, 0x07, 0x02, 0x17, 0x01, 0x05, 0x01, 0x01,
-    0x0E, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x06, 0x02, 0x01, 0x04, 0x05, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
-    0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x11,
-    0x00, 0x00,
-
-    // Data for compression type 0x04
-    0xFF, 0xFB, 0x98, 0x9A, 0x84, 0x85, 0x63, 0x64, 0x3E, 0x3E, 0x22, 0x22, 0x13, 0x13, 0x18, 0x17,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00,
-
-    // Data for compression type 0x05
-    0xFF, 0xF1, 0x9D, 0x9E, 0x9A, 0x9B, 0x9A, 0x97, 0x93, 0x93, 0x8C, 0x8E, 0x86, 0x88, 0x80, 0x82,
-    0x7C, 0x7C, 0x72, 0x73, 0x69, 0x6B, 0x5F, 0x60, 0x55, 0x56, 0x4A, 0x4B, 0x40, 0x41, 0x37, 0x37,
-    0x2F, 0x2F, 0x27, 0x27, 0x21, 0x21, 0x1B, 0x1C, 0x17, 0x17, 0x13, 0x13, 0x10, 0x10, 0x0D, 0x0D,
-    0x0B, 0x0B, 0x09, 0x09, 0x08, 0x08, 0x07, 0x07, 0x06, 0x05, 0x05, 0x04, 0x04, 0x04, 0x19, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00,
-
-    // Data for compression type 0x06
-    0xC3, 0xCB, 0xF5, 0x41, 0xFF, 0x7B, 0xF7, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xBF, 0xCC, 0xF2, 0x40, 0xFD, 0x7C, 0xF7, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x7A, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00,
-
-    // Data for compression type 0x07
-    0xC3, 0xD9, 0xEF, 0x3D, 0xF9, 0x7C, 0xE9, 0x1E, 0xFD, 0xAB, 0xF1, 0x2C, 0xFC, 0x5B, 0xFE, 0x17,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xBD, 0xD9, 0xEC, 0x3D, 0xF5, 0x7D, 0xE8, 0x1D, 0xFB, 0xAE, 0xF0, 0x2C, 0xFB, 0x5C, 0xFF, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x70, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00,
-
-    // Data for compression type 0x08
-    0xBA, 0xC5, 0xDA, 0x33, 0xE3, 0x6D, 0xD8, 0x18, 0xE5, 0x94, 0xDA, 0x23, 0xDF, 0x4A, 0xD1, 0x10,
-    0xEE, 0xAF, 0xE4, 0x2C, 0xEA, 0x5A, 0xDE, 0x15, 0xF4, 0x87, 0xE9, 0x21, 0xF6, 0x43, 0xFC, 0x12,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xB0, 0xC7, 0xD8, 0x33, 0xE3, 0x6B, 0xD6, 0x18, 0xE7, 0x95, 0xD8, 0x23, 0xDB, 0x49, 0xD0, 0x11,
-    0xE9, 0xB2, 0xE2, 0x2B, 0xE8, 0x5C, 0xDD, 0x15, 0xF1, 0x87, 0xE7, 0x20, 0xF7, 0x44, 0xFF, 0x13,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x5F, 0x9E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00
-};
diff --git a/dep/StormLibOld/src/huffman/huff.h b/dep/StormLibOld/src/huffman/huff.h
deleted file mode 100644
index d1c06e0f4..000000000
--- a/dep/StormLibOld/src/huffman/huff.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*****************************************************************************/
-/* huffman.h                              Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Description :                                                             */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* xx.xx.xx  1.00  Lad  The first version of huffman.h                       */
-/* 03.05.03  2.00  Lad  Added compression                                    */
-/* 08.12.03  2.01  Dan  High-memory handling (> 0x80000000)                  */
-/*****************************************************************************/
-
-#ifndef __HUFFMAN_H__
-#define __HUFFMAN_H__
-
-#include "../StormPort.h"
-
-//-----------------------------------------------------------------------------
-// Defines
-
-#define INSERT_ITEM    1
-#define SWITCH_ITEMS   2                    // Switch the item1 and item2
-
-#define PTR_NOT(ptr)  (THTreeItem *)(~(DWORD_PTR)(ptr))
-#define PTR_PTR(ptr)  ((THTreeItem *)(ptr))
-#define PTR_INT(ptr)  (INT_PTR)(ptr)
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-//-----------------------------------------------------------------------------
-// Structures and classes
-
-// Input stream for Huffmann decompression
-class TInputStream
-{
-    public:
-
-    unsigned long GetBit();
-    unsigned long Get7Bits();
-    unsigned long Get8Bits();
-    void SkipBits(unsigned int BitCount);
-
-    unsigned char * pbInBuffer;         // Input data
-    unsigned char * pbInBufferEnd;      // End of the input buffer
-    unsigned long   BitBuffer;          // Input bit buffer
-    unsigned int    BitCount;           // Number of bits remaining in 'dwBitBuff'
-};
-
-// Output stream for Huffmann compression
-class TOutputStream
-{
-    public:
-
-    void PutBits(unsigned long dwBuff, unsigned int nPutBits);
-
-    unsigned char * pbOutBuffer;        // 00 : Output buffer
-    unsigned long   cbOutSize;          // 04 : Size of output buffer
-    unsigned char * pbOutPos;           // 08 : Current output position
-    unsigned long   dwBitBuff;          // 0C : Bit buffer
-    unsigned long   nBits;              // 10 : Number of bits in the bit buffer
-};
-
-// Huffmann tree item (?)
-struct THTreeItem
-{
-    THTreeItem * Call1501DB70(THTreeItem * pLast);
-    THTreeItem * GetPrevItem(LONG_PTR value);
-    void         ClearItemLinks();
-    void         RemoveItem();
-
-    THTreeItem  * next;                 // 00 - Pointer to next THTreeItem
-    THTreeItem  * prev;                 // 04 - Pointer to prev THTreeItem (< 0 if none)
-    unsigned long dcmpByte;             // 08 - Index of this item in item pointer array, decompressed byte value
-    unsigned long byteValue;            // 0C - Some byte value
-    THTreeItem  * parent;               // 10 - Pointer to parent THTreeItem (NULL if none)
-    THTreeItem  * child;                // 14 - Pointer to child  THTreeItem
-    int           addressMultiplier;    // -1 if object on negative address (>0x80000000), +1 if positive
-};
-
-// Structure used for quick decompress. The 'bitCount' contains number of bits
-// and byte value contains result decompressed byte value.
-// After each walk through Huffman tree are filled all entries which are
-// multiplies of number of bits loaded from input stream. These entries
-// contain number of bits and result value. At the next 7 bits is tested this
-// structure first. If corresponding entry found, decompression routine will
-// not walk through Huffman tree and directly stores output byte to output stream.
-struct TQDecompress
-{
-    unsigned long offs00;               // 00 - 1 if resolved
-    unsigned long nBits;                // 04 - Bit count
-    union
-    {
-        unsigned long dcmpByte;         // 08 - Byte value for decompress (if bitCount <= 7)
-        THTreeItem  * pItem;            // 08 - THTreeItem (if number of bits is greater than 7
-    };
-};
-
-// Structure for Huffman tree (Size 0x3674 bytes). Because I'm not expert
-// for the decompression, I do not know actually if the class is really a Hufmann
-// tree. If someone knows the decompression details, please let me know
-class THuffmannTree
-{
-    public:
-
-    THuffmannTree();
-    void  InitTree(bool bCompression);
-    void  BuildTree(unsigned int nCmpType);
-//  void  ModifyTree(unsigned long dwIndex);
-//  void  UninitTree();
-
-//  void  Call15007010(Bit32 dwInLength, THTreeItem * item);
-    THTreeItem * Call1500E740(unsigned int nValue);
-    void         Call1500E820(THTreeItem * pItem);
-    unsigned int DoCompression(TOutputStream * os, unsigned char * pbInBuffer, int nInLength, int nCmpType);
-    unsigned int DoDecompression(unsigned char * pbOutBuffer, unsigned int dwOutLength, TInputStream * is);
-
-    unsigned long bIsCmp0;              // 0000 - 1 if compression type 0
-    unsigned long offs0004;             // 0004 - Some flag
-    THTreeItem    items0008[0x203];     // 0008 - HTree items
-
-    //- Sometimes used as HTree item -----------
-    THTreeItem  * pItem3050;            // 3050 - Always NULL (?)
-    THTreeItem  * pItem3054;            // 3054 - Pointer to Huffman tree item
-    THTreeItem  * pItem3058;            // 3058 - Pointer to Huffman tree item (< 0 if invalid)
-
-    //- Sometimes used as HTree item -----------
-    THTreeItem  * pItem305C;            // 305C - Usually NULL
-    THTreeItem  * pFirst;               // 3060 - Pointer to top (first) Huffman tree item
-    THTreeItem  * pLast;                // 3064 - Pointer to bottom (last) Huffman tree item (< 0 if invalid)
-    unsigned long nItems;               // 3068 - Number of used HTree items
-
-    //-------------------------------------------
-    THTreeItem * items306C[0x102];      // 306C - THTreeItem pointer array
-    TQDecompress qd3474[0x80];          // 3474 - Array for quick decompression
-    int          addressMultiplier;     // -1 if object on negative address (>0x80000000), +1 if positive
-
-    static unsigned char Table1502A630[];// Some table
-};
-
-#endif // __HUFFMAN_H__
diff --git a/dep/StormLibOld/src/jenkins/lookup.h b/dep/StormLibOld/src/jenkins/lookup.h
deleted file mode 100644
index 54ccc979c..000000000
--- a/dep/StormLibOld/src/jenkins/lookup.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef __LOOKUP3_H__
-#define __LOOKUP3_H__
-
-#ifdef WIN32
-typedef unsigned char  uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int   uint32_t;
-#else
-#include <stdint.h>     /* defines uint32_t etc */
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-uint32_t hashlittle(const void *key, size_t length, uint32_t initval);
-void hashlittle2(const void *key, size_t length, uint32_t *pc, uint32_t *pb);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // __LOOKUP3_H__
diff --git a/dep/StormLibOld/src/jenkins/lookup3.c b/dep/StormLibOld/src/jenkins/lookup3.c
deleted file mode 100644
index 6af56b481..000000000
--- a/dep/StormLibOld/src/jenkins/lookup3.c
+++ /dev/null
@@ -1,1003 +0,0 @@
-/*
--------------------------------------------------------------------------------
-lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-
-These are functions for producing 32-bit hashes for hash table lookup.
-hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-are externally useful functions.  Routines to test the hash are included 
-if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-the public domain.  It has no warranty.
-
-You probably want to use hashlittle().  hashlittle() and hashbig()
-hash byte arrays.  hashlittle() is is faster than hashbig() on
-little-endian machines.  Intel and AMD are little-endian machines.
-On second thought, you probably want hashlittle2(), which is identical to
-hashlittle() except it returns two 32-bit hashes for the price of one.  
-You could implement hashbig2() if you wanted but I haven't bothered here.
-
-If you want to find a hash of, say, exactly 7 integers, do
-  a = i1;  b = i2;  c = i3;
-  mix(a,b,c);
-  a += i4; b += i5; c += i6;
-  mix(a,b,c);
-  a += i7;
-  final(a,b,c);
-then use c as the hash value.  If you have a variable length array of
-4-byte integers to hash, use hashword().  If you have a byte array (like
-a character string), use hashlittle().  If you have several byte arrays, or
-a mix of things, see the comments above hashlittle().  
-
-Why is this so big?  I read 12 bytes at a time into 3 4-byte integers, 
-then mix those integers.  This is fast (you can do a lot more thorough
-mixing with 12*3 instructions on 3 integers than you can with 3 instructions
-on 1 byte), but shoehorning those bytes into integers efficiently is messy.
--------------------------------------------------------------------------------
-*/
-//#define SELF_TEST 1
-
-#include <stdio.h>      /* defines printf for tests */
-#include <time.h>       /* defines time_t for timings in the test */
-
-#ifdef linux
-#include <sys/param.h>  /* attempt to define endianness */
-#include <endian.h>    /* attempt to define endianness */
-#endif
-
-#include "lookup.h"
-
-/*
- * My best guess at if you are big-endian or little-endian.  This may
- * need adjustment.
- */
-#if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
-     __BYTE_ORDER == __LITTLE_ENDIAN) || \
-    (defined(i386) || defined(__i386__) || defined(__i486__) || \
-     defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL))
-# define HASH_LITTLE_ENDIAN 1
-# define HASH_BIG_ENDIAN 0
-#elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
-       __BYTE_ORDER == __BIG_ENDIAN) || \
-      (defined(sparc) || defined(POWERPC) || defined(mc68000) || defined(sel))
-# define HASH_LITTLE_ENDIAN 0
-# define HASH_BIG_ENDIAN 1
-#else
-# define HASH_LITTLE_ENDIAN 0
-# define HASH_BIG_ENDIAN 0
-#endif
-
-#define hashsize(n) ((uint32_t)1<<(n))
-#define hashmask(n) (hashsize(n)-1)
-#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-
-/*
--------------------------------------------------------------------------------
-mix -- mix 3 32-bit values reversibly.
-
-This is reversible, so any information in (a,b,c) before mix() is
-still in (a,b,c) after mix().
-
-If four pairs of (a,b,c) inputs are run through mix(), or through
-mix() in reverse, there are at least 32 bits of the output that
-are sometimes the same for one pair and different for another pair.
-This was tested for:
-* pairs that differed by one bit, by two bits, in any combination
-  of top bits of (a,b,c), or in any combination of bottom bits of
-  (a,b,c).
-* "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
-  the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
-  is commonly produced by subtraction) look like a single 1-bit
-  difference.
-* the base values were pseudorandom, all zero but one bit set, or 
-  all zero plus a counter that starts at zero.
-
-Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
-satisfy this are
-    4  6  8 16 19  4
-    9 15  3 18 27 15
-   14  9  3  7 17  3
-Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
-for "differ" defined as + with a one-bit base and a two-bit delta.  I
-used http://burtleburtle.net/bob/hash/avalanche.html to choose 
-the operations, constants, and arrangements of the variables.
-
-This does not achieve avalanche.  There are input bits of (a,b,c)
-that fail to affect some output bits of (a,b,c), especially of a.  The
-most thoroughly mixed value is c, but it doesn't really even achieve
-avalanche in c.
-
-This allows some parallelism.  Read-after-writes are good at doubling
-the number of bits affected, so the goal of mixing pulls in the opposite
-direction as the goal of parallelism.  I did what I could.  Rotates
-seem to cost as much as shifts on every machine I could lay my hands
-on, and rotates are much kinder to the top and bottom bits, so I used
-rotates.
--------------------------------------------------------------------------------
-*/
-#define mix(a,b,c) \
-{ \
-  a -= c;  a ^= rot(c, 4);  c += b; \
-  b -= a;  b ^= rot(a, 6);  a += c; \
-  c -= b;  c ^= rot(b, 8);  b += a; \
-  a -= c;  a ^= rot(c,16);  c += b; \
-  b -= a;  b ^= rot(a,19);  a += c; \
-  c -= b;  c ^= rot(b, 4);  b += a; \
-}
-
-/*
--------------------------------------------------------------------------------
-final -- final mixing of 3 32-bit values (a,b,c) into c
-
-Pairs of (a,b,c) values differing in only a few bits will usually
-produce values of c that look totally different.  This was tested for
-* pairs that differed by one bit, by two bits, in any combination
-  of top bits of (a,b,c), or in any combination of bottom bits of
-  (a,b,c).
-* "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
-  the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
-  is commonly produced by subtraction) look like a single 1-bit
-  difference.
-* the base values were pseudorandom, all zero but one bit set, or 
-  all zero plus a counter that starts at zero.
-
-These constants passed:
- 14 11 25 16 4 14 24
- 12 14 25 16 4 14 24
-and these came close:
-  4  8 15 26 3 22 24
- 10  8 15 26 3 22 24
- 11  8 15 26 3 22 24
--------------------------------------------------------------------------------
-*/
-#define final(a,b,c) \
-{ \
-  c ^= b; c -= rot(b,14); \
-  a ^= c; a -= rot(c,11); \
-  b ^= a; b -= rot(a,25); \
-  c ^= b; c -= rot(b,16); \
-  a ^= c; a -= rot(c,4);  \
-  b ^= a; b -= rot(a,14); \
-  c ^= b; c -= rot(b,24); \
-}
-
-/*
---------------------------------------------------------------------
- This works on all machines.  To be useful, it requires
- -- that the key be an array of uint32_t's, and
- -- that the length be the number of uint32_t's in the key
-
- The function hashword() is identical to hashlittle() on little-endian
- machines, and identical to hashbig() on big-endian machines,
- except that the length has to be measured in uint32_ts rather than in
- bytes.  hashlittle() is more complicated than hashword() only because
- hashlittle() has to dance around fitting the key bytes into registers.
---------------------------------------------------------------------
-*/
-uint32_t hashword(
-const uint32_t *k,                   /* the key, an array of uint32_t values */
-size_t          length,               /* the length of the key, in uint32_ts */
-uint32_t        initval)         /* the previous hash, or an arbitrary value */
-{
-  uint32_t a,b,c;
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + (((uint32_t)length)<<2) + initval;
-
-  /*------------------------------------------------- handle most of the key */
-  while (length > 3)
-  {
-    a += k[0];
-    b += k[1];
-    c += k[2];
-    mix(a,b,c);
-    length -= 3;
-    k += 3;
-  }
-
-  /*------------------------------------------- handle the last 3 uint32_t's */
-  switch(length)                     /* all the case statements fall through */
-  { 
-  case 3 : c+=k[2];
-  case 2 : b+=k[1];
-  case 1 : a+=k[0];
-    final(a,b,c);
-  case 0:     /* case 0: nothing left to add */
-    break;
-  }
-  /*------------------------------------------------------ report the result */
-  return c;
-}
-
-
-/*
---------------------------------------------------------------------
-hashword2() -- same as hashword(), but take two seeds and return two
-32-bit values.  pc and pb must both be nonnull, and *pc and *pb must
-both be initialized with seeds.  If you pass in (*pb)==0, the output 
-(*pc) will be the same as the return value from hashword().
---------------------------------------------------------------------
-*/
-void hashword2 (
-const uint32_t *k,                   /* the key, an array of uint32_t values */
-size_t          length,               /* the length of the key, in uint32_ts */
-uint32_t       *pc,                      /* IN: seed OUT: primary hash value */
-uint32_t       *pb)               /* IN: more seed OUT: secondary hash value */
-{
-  uint32_t a,b,c;
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((uint32_t)(length<<2)) + *pc;
-  c += *pb;
-
-  /*------------------------------------------------- handle most of the key */
-  while (length > 3)
-  {
-    a += k[0];
-    b += k[1];
-    c += k[2];
-    mix(a,b,c);
-    length -= 3;
-    k += 3;
-  }
-
-  /*------------------------------------------- handle the last 3 uint32_t's */
-  switch(length)                     /* all the case statements fall through */
-  { 
-  case 3 : c+=k[2];
-  case 2 : b+=k[1];
-  case 1 : a+=k[0];
-    final(a,b,c);
-  case 0:     /* case 0: nothing left to add */
-    break;
-  }
-  /*------------------------------------------------------ report the result */
-  *pc=c; *pb=b;
-}
-
-
-/*
--------------------------------------------------------------------------------
-hashlittle() -- hash a variable-length key into a 32-bit value
-  k       : the key (the unaligned variable-length array of bytes)
-  length  : the length of the key, counting by bytes
-  initval : can be any 4-byte value
-Returns a 32-bit value.  Every bit of the key affects every bit of
-the return value.  Two keys differing by one or two bits will have
-totally different hash values.
-
-The best hash table sizes are powers of 2.  There is no need to do
-mod a prime (mod is sooo slow!).  If you need less than 32 bits,
-use a bitmask.  For example, if you need only 10 bits, do
-  h = (h & hashmask(10));
-In which case, the hash table should have hashsize(10) elements.
-
-If you are hashing n strings (uint8_t **)k, do it like this:
-  for (i=0, h=0; i<n; ++i) h = hashlittle( k[i], len[i], h);
-
-By Bob Jenkins, 2006.  bob_jenkins@burtleburtle.net.  You may use this
-code any way you wish, private, educational, or commercial.  It's free.
-
-Use for hash table lookup, or anything where one collision in 2^^32 is
-acceptable.  Do NOT use for cryptographic purposes.
--------------------------------------------------------------------------------
-*/
-
-uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
-{
-  uint32_t a,b,c;                                          /* internal state */
-  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
-
-  u.ptr = key;
-  if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
-    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-    const uint8_t  *k8;
-
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      b += k[1];
-      c += k[2];
-      mix(a,b,c);
-      length -= 12;
-      k += 3;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    /* 
-     * "k[2]&0xffffff" actually reads beyond the end of the string, but
-     * then masks off the part it's not allowed to read.  Because the
-     * string is aligned, the masked-off tail is in the same word as the
-     * rest of the string.  Every machine with memory protection I've seen
-     * does it on word boundaries, so is OK with this.  But VALGRIND will
-     * still catch it and complain.  The masking trick does make the hash
-     * noticably faster for short strings (like English words).
-     */
-#ifndef VALGRIND
-
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
-    case 10: c+=k[2]&0xffff; b+=k[1]; a+=k[0]; break;
-    case 9 : c+=k[2]&0xff; b+=k[1]; a+=k[0]; break;
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=k[1]&0xffffff; a+=k[0]; break;
-    case 6 : b+=k[1]&0xffff; a+=k[0]; break;
-    case 5 : b+=k[1]&0xff; a+=k[0]; break;
-    case 4 : a+=k[0]; break;
-    case 3 : a+=k[0]&0xffffff; break;
-    case 2 : a+=k[0]&0xffff; break;
-    case 1 : a+=k[0]&0xff; break;
-    case 0 : return c;              /* zero length strings require no mixing */
-    }
-
-#else /* make valgrind happy */
-
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=((uint32_t)k8[10])<<16;  /* fall through */
-    case 10: c+=((uint32_t)k8[9])<<8;    /* fall through */
-    case 9 : c+=k8[8];                   /* fall through */
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=((uint32_t)k8[6])<<16;   /* fall through */
-    case 6 : b+=((uint32_t)k8[5])<<8;    /* fall through */
-    case 5 : b+=k8[4];                   /* fall through */
-    case 4 : a+=k[0]; break;
-    case 3 : a+=((uint32_t)k8[2])<<16;   /* fall through */
-    case 2 : a+=((uint32_t)k8[1])<<8;    /* fall through */
-    case 1 : a+=k8[0]; break;
-    case 0 : return c;
-    }
-
-#endif /* !valgrind */
-
-  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
-    const uint16_t *k = (const uint16_t *)key;         /* read 16-bit chunks */
-    const uint8_t  *k8;
-
-    /*--------------- all but last block: aligned reads and different mixing */
-    while (length > 12)
-    {
-      a += k[0] + (((uint32_t)k[1])<<16);
-      b += k[2] + (((uint32_t)k[3])<<16);
-      c += k[4] + (((uint32_t)k[5])<<16);
-      mix(a,b,c);
-      length -= 12;
-      k += 6;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[4]+(((uint32_t)k[5])<<16);
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 11: c+=((uint32_t)k8[10])<<16;     /* fall through */
-    case 10: c+=k[4];
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 9 : c+=k8[8];                      /* fall through */
-    case 8 : b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 7 : b+=((uint32_t)k8[6])<<16;      /* fall through */
-    case 6 : b+=k[2];
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 5 : b+=k8[4];                      /* fall through */
-    case 4 : a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 3 : a+=((uint32_t)k8[2])<<16;      /* fall through */
-    case 2 : a+=k[0];
-             break;
-    case 1 : a+=k8[0];
-             break;
-    case 0 : return c;                     /* zero length requires no mixing */
-    }
-
-  } else {                        /* need to read the key one byte at a time */
-    const uint8_t *k = (const uint8_t *)key;
-
-    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      a += ((uint32_t)k[1])<<8;
-      a += ((uint32_t)k[2])<<16;
-      a += ((uint32_t)k[3])<<24;
-      b += k[4];
-      b += ((uint32_t)k[5])<<8;
-      b += ((uint32_t)k[6])<<16;
-      b += ((uint32_t)k[7])<<24;
-      c += k[8];
-      c += ((uint32_t)k[9])<<8;
-      c += ((uint32_t)k[10])<<16;
-      c += ((uint32_t)k[11])<<24;
-      mix(a,b,c);
-      length -= 12;
-      k += 12;
-    }
-
-    /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch(length)                   /* all the case statements fall through */
-    {
-    case 12: c+=((uint32_t)k[11])<<24;
-    case 11: c+=((uint32_t)k[10])<<16;
-    case 10: c+=((uint32_t)k[9])<<8;
-    case 9 : c+=k[8];
-    case 8 : b+=((uint32_t)k[7])<<24;
-    case 7 : b+=((uint32_t)k[6])<<16;
-    case 6 : b+=((uint32_t)k[5])<<8;
-    case 5 : b+=k[4];
-    case 4 : a+=((uint32_t)k[3])<<24;
-    case 3 : a+=((uint32_t)k[2])<<16;
-    case 2 : a+=((uint32_t)k[1])<<8;
-    case 1 : a+=k[0];
-             break;
-    case 0 : return c;
-    }
-  }
-
-  final(a,b,c);
-  return c;
-}
-
-
-/*
- * hashlittle2: return 2 32-bit hash values
- *
- * This is identical to hashlittle(), except it returns two 32-bit hash
- * values instead of just one.  This is good enough for hash table
- * lookup with 2^^64 buckets, or if you want a second hash if you're not
- * happy with the first, or if you want a probably-unique 64-bit ID for
- * the key.  *pc is better mixed than *pb, so use *pc first.  If you want
- * a 64-bit value do something like "*pc + (((uint64_t)*pb)<<32)".
- */
-void hashlittle2( 
-  const void *key,       /* the key to hash */
-  size_t      length,    /* length of the key */
-  uint32_t   *pc,        /* IN: primary initval, OUT: primary hash */
-  uint32_t   *pb)        /* IN: secondary initval, OUT: secondary hash */
-{
-  uint32_t a,b,c;                                          /* internal state */
-  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((uint32_t)length) + *pc;
-  c += *pb;
-
-  u.ptr = key;
-  if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
-    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-    const uint8_t  *k8;
-
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      b += k[1];
-      c += k[2];
-      mix(a,b,c);
-      length -= 12;
-      k += 3;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    /* 
-     * "k[2]&0xffffff" actually reads beyond the end of the string, but
-     * then masks off the part it's not allowed to read.  Because the
-     * string is aligned, the masked-off tail is in the same word as the
-     * rest of the string.  Every machine with memory protection I've seen
-     * does it on word boundaries, so is OK with this.  But VALGRIND will
-     * still catch it and complain.  The masking trick does make the hash
-     * noticably faster for short strings (like English words).
-     */
-#ifndef VALGRIND
-
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
-    case 10: c+=k[2]&0xffff; b+=k[1]; a+=k[0]; break;
-    case 9 : c+=k[2]&0xff; b+=k[1]; a+=k[0]; break;
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=k[1]&0xffffff; a+=k[0]; break;
-    case 6 : b+=k[1]&0xffff; a+=k[0]; break;
-    case 5 : b+=k[1]&0xff; a+=k[0]; break;
-    case 4 : a+=k[0]; break;
-    case 3 : a+=k[0]&0xffffff; break;
-    case 2 : a+=k[0]&0xffff; break;
-    case 1 : a+=k[0]&0xff; break;
-    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
-    }
-
-#else /* make valgrind happy */
-
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=((uint32_t)k8[10])<<16;  /* fall through */
-    case 10: c+=((uint32_t)k8[9])<<8;    /* fall through */
-    case 9 : c+=k8[8];                   /* fall through */
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=((uint32_t)k8[6])<<16;   /* fall through */
-    case 6 : b+=((uint32_t)k8[5])<<8;    /* fall through */
-    case 5 : b+=k8[4];                   /* fall through */
-    case 4 : a+=k[0]; break;
-    case 3 : a+=((uint32_t)k8[2])<<16;   /* fall through */
-    case 2 : a+=((uint32_t)k8[1])<<8;    /* fall through */
-    case 1 : a+=k8[0]; break;
-    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
-    }
-
-#endif /* !valgrind */
-
-  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
-    const uint16_t *k = (const uint16_t *)key;         /* read 16-bit chunks */
-    const uint8_t  *k8;
-
-    /*--------------- all but last block: aligned reads and different mixing */
-    while (length > 12)
-    {
-      a += k[0] + (((uint32_t)k[1])<<16);
-      b += k[2] + (((uint32_t)k[3])<<16);
-      c += k[4] + (((uint32_t)k[5])<<16);
-      mix(a,b,c);
-      length -= 12;
-      k += 6;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[4]+(((uint32_t)k[5])<<16);
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 11: c+=((uint32_t)k8[10])<<16;     /* fall through */
-    case 10: c+=k[4];
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 9 : c+=k8[8];                      /* fall through */
-    case 8 : b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 7 : b+=((uint32_t)k8[6])<<16;      /* fall through */
-    case 6 : b+=k[2];
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 5 : b+=k8[4];                      /* fall through */
-    case 4 : a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 3 : a+=((uint32_t)k8[2])<<16;      /* fall through */
-    case 2 : a+=k[0];
-             break;
-    case 1 : a+=k8[0];
-             break;
-    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
-    }
-
-  } else {                        /* need to read the key one byte at a time */
-    const uint8_t *k = (const uint8_t *)key;
-
-    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      a += ((uint32_t)k[1])<<8;
-      a += ((uint32_t)k[2])<<16;
-      a += ((uint32_t)k[3])<<24;
-      b += k[4];
-      b += ((uint32_t)k[5])<<8;
-      b += ((uint32_t)k[6])<<16;
-      b += ((uint32_t)k[7])<<24;
-      c += k[8];
-      c += ((uint32_t)k[9])<<8;
-      c += ((uint32_t)k[10])<<16;
-      c += ((uint32_t)k[11])<<24;
-      mix(a,b,c);
-      length -= 12;
-      k += 12;
-    }
-
-    /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch(length)                   /* all the case statements fall through */
-    {
-    case 12: c+=((uint32_t)k[11])<<24;
-    case 11: c+=((uint32_t)k[10])<<16;
-    case 10: c+=((uint32_t)k[9])<<8;
-    case 9 : c+=k[8];
-    case 8 : b+=((uint32_t)k[7])<<24;
-    case 7 : b+=((uint32_t)k[6])<<16;
-    case 6 : b+=((uint32_t)k[5])<<8;
-    case 5 : b+=k[4];
-    case 4 : a+=((uint32_t)k[3])<<24;
-    case 3 : a+=((uint32_t)k[2])<<16;
-    case 2 : a+=((uint32_t)k[1])<<8;
-    case 1 : a+=k[0];
-             break;
-    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
-    }
-  }
-
-  final(a,b,c);
-  *pc=c; *pb=b;
-}
-
-
-
-/*
- * hashbig():
- * This is the same as hashword() on big-endian machines.  It is different
- * from hashlittle() on all machines.  hashbig() takes advantage of
- * big-endian byte ordering. 
- */
-uint32_t hashbig( const void *key, size_t length, uint32_t initval)
-{
-  uint32_t a,b,c;
-  union { const void *ptr; size_t i; } u; /* to cast key to (size_t) happily */
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
-
-  u.ptr = key;
-  if (HASH_BIG_ENDIAN && ((u.i & 0x3) == 0)) {
-    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-    const uint8_t  *k8;
-
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      b += k[1];
-      c += k[2];
-      mix(a,b,c);
-      length -= 12;
-      k += 3;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    /* 
-     * "k[2]<<8" actually reads beyond the end of the string, but
-     * then shifts out the part it's not allowed to read.  Because the
-     * string is aligned, the illegal read is in the same word as the
-     * rest of the string.  Every machine with memory protection I've seen
-     * does it on word boundaries, so is OK with this.  But VALGRIND will
-     * still catch it and complain.  The masking trick does make the hash
-     * noticably faster for short strings (like English words).
-     */
-#ifndef VALGRIND
-
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=k[2]&0xffffff00; b+=k[1]; a+=k[0]; break;
-    case 10: c+=k[2]&0xffff0000; b+=k[1]; a+=k[0]; break;
-    case 9 : c+=k[2]&0xff000000; b+=k[1]; a+=k[0]; break;
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=k[1]&0xffffff00; a+=k[0]; break;
-    case 6 : b+=k[1]&0xffff0000; a+=k[0]; break;
-    case 5 : b+=k[1]&0xff000000; a+=k[0]; break;
-    case 4 : a+=k[0]; break;
-    case 3 : a+=k[0]&0xffffff00; break;
-    case 2 : a+=k[0]&0xffff0000; break;
-    case 1 : a+=k[0]&0xff000000; break;
-    case 0 : return c;              /* zero length strings require no mixing */
-    }
-
-#else  /* make valgrind happy */
-
-    k8 = (const uint8_t *)k;
-    switch(length)                   /* all the case statements fall through */
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=((uint32_t)k8[10])<<8;  /* fall through */
-    case 10: c+=((uint32_t)k8[9])<<16;  /* fall through */
-    case 9 : c+=((uint32_t)k8[8])<<24;  /* fall through */
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=((uint32_t)k8[6])<<8;   /* fall through */
-    case 6 : b+=((uint32_t)k8[5])<<16;  /* fall through */
-    case 5 : b+=((uint32_t)k8[4])<<24;  /* fall through */
-    case 4 : a+=k[0]; break;
-    case 3 : a+=((uint32_t)k8[2])<<8;   /* fall through */
-    case 2 : a+=((uint32_t)k8[1])<<16;  /* fall through */
-    case 1 : a+=((uint32_t)k8[0])<<24; break;
-    case 0 : return c;
-    }
-
-#endif /* !VALGRIND */
-
-  } else {                        /* need to read the key one byte at a time */
-    const uint8_t *k = (const uint8_t *)key;
-
-    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += ((uint32_t)k[0])<<24;
-      a += ((uint32_t)k[1])<<16;
-      a += ((uint32_t)k[2])<<8;
-      a += ((uint32_t)k[3]);
-      b += ((uint32_t)k[4])<<24;
-      b += ((uint32_t)k[5])<<16;
-      b += ((uint32_t)k[6])<<8;
-      b += ((uint32_t)k[7]);
-      c += ((uint32_t)k[8])<<24;
-      c += ((uint32_t)k[9])<<16;
-      c += ((uint32_t)k[10])<<8;
-      c += ((uint32_t)k[11]);
-      mix(a,b,c);
-      length -= 12;
-      k += 12;
-    }
-
-    /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch(length)                   /* all the case statements fall through */
-    {
-    case 12: c+=k[11];
-    case 11: c+=((uint32_t)k[10])<<8;
-    case 10: c+=((uint32_t)k[9])<<16;
-    case 9 : c+=((uint32_t)k[8])<<24;
-    case 8 : b+=k[7];
-    case 7 : b+=((uint32_t)k[6])<<8;
-    case 6 : b+=((uint32_t)k[5])<<16;
-    case 5 : b+=((uint32_t)k[4])<<24;
-    case 4 : a+=k[3];
-    case 3 : a+=((uint32_t)k[2])<<8;
-    case 2 : a+=((uint32_t)k[1])<<16;
-    case 1 : a+=((uint32_t)k[0])<<24;
-             break;
-    case 0 : return c;
-    }
-  }
-
-  final(a,b,c);
-  return c;
-}
-
-
-#ifdef SELF_TEST
-
-/* used for timings */
-void driver1()
-{
-  uint8_t buf[256];
-  uint32_t i;
-  uint32_t h=0;
-  time_t a,z;
-
-  time(&a);
-  for (i=0; i<256; ++i) buf[i] = 'x';
-  for (i=0; i<1; ++i) 
-  {
-    h = hashlittle(&buf[0],1,h);
-  }
-  time(&z);
-  if (z-a > 0) printf("time %d %.8x\n", z-a, h);
-}
-
-/* check that every input bit changes every output bit half the time */
-#define HASHSTATE 1
-#define HASHLEN   1
-#define MAXPAIR 60
-#define MAXLEN  70
-void driver2()
-{
-  uint8_t qa[MAXLEN+1], qb[MAXLEN+2], *a = &qa[0], *b = &qb[1];
-  uint32_t c[HASHSTATE], d[HASHSTATE], i=0, j=0, k, l, m=0, z;
-  uint32_t e[HASHSTATE],f[HASHSTATE],g[HASHSTATE],h[HASHSTATE];
-  uint32_t x[HASHSTATE],y[HASHSTATE];
-  uint32_t hlen;
-
-  printf("No more than %d trials should ever be needed \n",MAXPAIR/2);
-  for (hlen=0; hlen < MAXLEN; ++hlen)
-  {
-    z=0;
-    for (i=0; i<hlen; ++i)  /*----------------------- for each input byte, */
-    {
-      for (j=0; j<8; ++j)   /*------------------------ for each input bit, */
-      {
-	for (m=1; m<8; ++m) /*------------ for serveral possible initvals, */
-	{
-	  for (l=0; l<HASHSTATE; ++l)
-	    e[l]=f[l]=g[l]=h[l]=x[l]=y[l]=~((uint32_t)0);
-
-      	  /*---- check that every output bit is affected by that input bit */
-	  for (k=0; k<MAXPAIR; k+=2)
-	  { 
-	    uint32_t finished=1;
-	    /* keys have one bit different */
-	    for (l=0; l<hlen+1; ++l) {a[l] = b[l] = (uint8_t)0;}
-	    /* have a and b be two keys differing in only one bit */
-	    a[i] ^= (k<<j);
-	    a[i] ^= (k>>(8-j));
-	     c[0] = hashlittle(a, hlen, m);
-	    b[i] ^= ((k+1)<<j);
-	    b[i] ^= ((k+1)>>(8-j));
-	     d[0] = hashlittle(b, hlen, m);
-	    /* check every bit is 1, 0, set, and not set at least once */
-	    for (l=0; l<HASHSTATE; ++l)
-	    {
-	      e[l] &= (c[l]^d[l]);
-	      f[l] &= ~(c[l]^d[l]);
-	      g[l] &= c[l];
-	      h[l] &= ~c[l];
-	      x[l] &= d[l];
-	      y[l] &= ~d[l];
-	      if (e[l]|f[l]|g[l]|h[l]|x[l]|y[l]) finished=0;
-	    }
-	    if (finished) break;
-	  }
-	  if (k>z) z=k;
-	  if (k==MAXPAIR) 
-	  {
-	     printf("Some bit didn't change: ");
-	     printf("%.8x %.8x %.8x %.8x %.8x %.8x  ",
-	            e[0],f[0],g[0],h[0],x[0],y[0]);
-	     printf("i %d j %d m %d len %d\n", i, j, m, hlen);
-	  }
-	  if (z==MAXPAIR) goto done;
-	}
-      }
-    }
-   done:
-    if (z < MAXPAIR)
-    {
-      printf("Mix success  %2d bytes  %2d initvals  ",i,m);
-      printf("required  %d  trials\n", z/2);
-    }
-  }
-  printf("\n");
-}
-
-/* Check for reading beyond the end of the buffer and alignment problems */
-void driver3()
-{
-  uint8_t buf[MAXLEN+20], *b;
-  uint32_t len;
-  uint8_t q[] = "This is the time for all good men to come to the aid of their country...";
-  uint32_t h;
-  uint8_t qq[] = "xThis is the time for all good men to come to the aid of their country...";
-  uint32_t i;
-  uint8_t qqq[] = "xxThis is the time for all good men to come to the aid of their country...";
-  uint32_t j;
-  uint8_t qqqq[] = "xxxThis is the time for all good men to come to the aid of their country...";
-  uint32_t ref,x,y;
-  uint8_t *p;
-
-  printf("Endianness.  These lines should all be the same (for values filled in):\n");
-  printf("%.8x                            %.8x                            %.8x\n",
-         hashword((const uint32_t *)q, (sizeof(q)-1)/4, 13),
-         hashword((const uint32_t *)q, (sizeof(q)-5)/4, 13),
-         hashword((const uint32_t *)q, (sizeof(q)-9)/4, 13));
-  p = q;
-  printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
-         hashlittle(p, sizeof(q)-1, 13), hashlittle(p, sizeof(q)-2, 13),
-         hashlittle(p, sizeof(q)-3, 13), hashlittle(p, sizeof(q)-4, 13),
-         hashlittle(p, sizeof(q)-5, 13), hashlittle(p, sizeof(q)-6, 13),
-         hashlittle(p, sizeof(q)-7, 13), hashlittle(p, sizeof(q)-8, 13),
-         hashlittle(p, sizeof(q)-9, 13), hashlittle(p, sizeof(q)-10, 13),
-         hashlittle(p, sizeof(q)-11, 13), hashlittle(p, sizeof(q)-12, 13));
-  p = &qq[1];
-  printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
-         hashlittle(p, sizeof(q)-1, 13), hashlittle(p, sizeof(q)-2, 13),
-         hashlittle(p, sizeof(q)-3, 13), hashlittle(p, sizeof(q)-4, 13),
-         hashlittle(p, sizeof(q)-5, 13), hashlittle(p, sizeof(q)-6, 13),
-         hashlittle(p, sizeof(q)-7, 13), hashlittle(p, sizeof(q)-8, 13),
-         hashlittle(p, sizeof(q)-9, 13), hashlittle(p, sizeof(q)-10, 13),
-         hashlittle(p, sizeof(q)-11, 13), hashlittle(p, sizeof(q)-12, 13));
-  p = &qqq[2];
-  printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
-         hashlittle(p, sizeof(q)-1, 13), hashlittle(p, sizeof(q)-2, 13),
-         hashlittle(p, sizeof(q)-3, 13), hashlittle(p, sizeof(q)-4, 13),
-         hashlittle(p, sizeof(q)-5, 13), hashlittle(p, sizeof(q)-6, 13),
-         hashlittle(p, sizeof(q)-7, 13), hashlittle(p, sizeof(q)-8, 13),
-         hashlittle(p, sizeof(q)-9, 13), hashlittle(p, sizeof(q)-10, 13),
-         hashlittle(p, sizeof(q)-11, 13), hashlittle(p, sizeof(q)-12, 13));
-  p = &qqqq[3];
-  printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
-         hashlittle(p, sizeof(q)-1, 13), hashlittle(p, sizeof(q)-2, 13),
-         hashlittle(p, sizeof(q)-3, 13), hashlittle(p, sizeof(q)-4, 13),
-         hashlittle(p, sizeof(q)-5, 13), hashlittle(p, sizeof(q)-6, 13),
-         hashlittle(p, sizeof(q)-7, 13), hashlittle(p, sizeof(q)-8, 13),
-         hashlittle(p, sizeof(q)-9, 13), hashlittle(p, sizeof(q)-10, 13),
-         hashlittle(p, sizeof(q)-11, 13), hashlittle(p, sizeof(q)-12, 13));
-  printf("\n");
-
-  /* check that hashlittle2 and hashlittle produce the same results */
-  i=47; j=0;
-  hashlittle2(q, sizeof(q), &i, &j);
-  if (hashlittle(q, sizeof(q), 47) != i)
-    printf("hashlittle2 and hashlittle mismatch\n");
-
-  /* check that hashword2 and hashword produce the same results */
-  len = 0xdeadbeef;
-  i=47, j=0;
-  hashword2(&len, 1, &i, &j);
-  if (hashword(&len, 1, 47) != i)
-    printf("hashword2 and hashword mismatch %x %x\n", 
-	   i, hashword(&len, 1, 47));
-
-  /* check hashlittle doesn't read before or after the ends of the string */
-  for (h=0, b=buf+1; h<8; ++h, ++b)
-  {
-    for (i=0; i<MAXLEN; ++i)
-    {
-      len = i;
-      for (j=0; j<i; ++j) *(b+j)=0;
-
-      /* these should all be equal */
-      ref = hashlittle(b, len, (uint32_t)1);
-      *(b+i)=(uint8_t)~0;
-      *(b-1)=(uint8_t)~0;
-      x = hashlittle(b, len, (uint32_t)1);
-      y = hashlittle(b, len, (uint32_t)1);
-      if ((ref != x) || (ref != y)) 
-      {
-	printf("alignment error: %.8x %.8x %.8x %d %d\n",ref,x,y,
-               h, i);
-      }
-    }
-  }
-}
-
-/* check for problems with nulls */
- void driver4()
-{
-  uint8_t buf[1];
-  uint32_t h,i,state[HASHSTATE];
-
-
-  buf[0] = ~0;
-  for (i=0; i<HASHSTATE; ++i) state[i] = 1;
-  printf("These should all be different\n");
-  for (i=0, h=0; i<8; ++i)
-  {
-    h = hashlittle(buf, 0, h);
-    printf("%2ld  0-byte strings, hash is  %.8x\n", i, h);
-  }
-}
-
-void driver5()
-{
-  uint32_t b,c;
-  b=0, c=0, hashlittle2("", 0, &c, &b);
-  printf("hash is %.8lx %.8lx\n", c, b);   /* deadbeef deadbeef */
-  b=0xdeadbeef, c=0, hashlittle2("", 0, &c, &b);
-  printf("hash is %.8lx %.8lx\n", c, b);   /* bd5b7dde deadbeef */
-  b=0xdeadbeef, c=0xdeadbeef, hashlittle2("", 0, &c, &b);
-  printf("hash is %.8lx %.8lx\n", c, b);   /* 9c093ccd bd5b7dde */
-  b=0, c=0, hashlittle2("Four score and seven years ago", 30, &c, &b);
-  printf("hash is %.8lx %.8lx\n", c, b);   /* 17770551 ce7226e6 */
-  b=1, c=0, hashlittle2("Four score and seven years ago", 30, &c, &b);
-  printf("hash is %.8lx %.8lx\n", c, b);   /* e3607cae bd371de4 */
-  b=0, c=1, hashlittle2("Four score and seven years ago", 30, &c, &b);
-  printf("hash is %.8lx %.8lx\n", c, b);   /* cd628161 6cbea4b3 */
-  c = hashlittle("Four score and seven years ago", 30, 0);
-  printf("hash is %.8lx\n", c);   /* 17770551 */
-  c = hashlittle("Four score and seven years ago", 30, 1);
-  printf("hash is %.8lx\n", c);   /* cd628161 */
-}
-
-
-int main()
-{
-  driver1();   /* test that the key is hashed: used for timings */
-  driver2();   /* test that whole key is hashed thoroughly */
-  driver3();   /* test that nothing but the key is hashed */
-  driver4();   /* test hashing multiple buffers (all buffers are null) */
-  driver5();   /* test the hash against known vectors */
-  return 1;
-}
-
-#endif  /* SELF_TEST */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/hashes/hash_memory.c b/dep/StormLibOld/src/libtomcrypt/src/hashes/hash_memory.c
deleted file mode 100644
index 98edf63e3..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/hashes/hash_memory.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-  @file hash_memory.c
-  Hash memory helper, Tom St Denis
-*/
-
-/*
-  Hash a block of memory and store the digest.
-  @param hash   The index of the hash you wish to use
-  @param in     The data you wish to hash
-  @param inlen  The length of the data to hash (octets)
-  @param out    [out] Where to store the digest
-  @param outlen [in/out] Max size and resulting size of the digest
-  @return CRYPT_OK if successful
-*/
-int hash_memory(int hash, const unsigned char *in, unsigned long inlen, unsigned char *out, unsigned long *outlen)
-{
-    hash_state *md;
-    int err;
-
-    LTC_ARGCHK(in     != NULL);
-    LTC_ARGCHK(out    != NULL);
-    LTC_ARGCHK(outlen != NULL);
-
-    if ((err = hash_is_valid(hash)) != CRYPT_OK) {
-        return err;
-    }
-
-    if (*outlen < hash_descriptor[hash].hashsize) {
-       *outlen = hash_descriptor[hash].hashsize;
-       return CRYPT_BUFFER_OVERFLOW;
-    }
-
-    md = XMALLOC(sizeof(hash_state));
-    if (md == NULL) {
-       return CRYPT_MEM;
-    }
-
-    if ((err = hash_descriptor[hash].init(md)) != CRYPT_OK) {
-       goto LBL_ERR;
-    }
-    if ((err = hash_descriptor[hash].process(md, in, inlen)) != CRYPT_OK) {
-       goto LBL_ERR;
-    }
-    err = hash_descriptor[hash].done(md, out);
-    *outlen = hash_descriptor[hash].hashsize;
-LBL_ERR:
-#ifdef LTC_CLEAN_STACK
-    zeromem(md, sizeof(hash_state));
-#endif
-    XFREE(md);
-
-    return err;
-}
-
-/* $Source: /cvs/libtom/libtomcrypt/src/hashes/helper/hash_memory.c,v $ */
-/* $Revision: 1.6 $ */
-/* $Date: 2006/12/28 01:27:23 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/hashes/md5.c b/dep/StormLibOld/src/libtomcrypt/src/hashes/md5.c
deleted file mode 100644
index 7f45d4c72..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/hashes/md5.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-
-/*
-  @file md5.c
-  LTC_MD5 hash function by Tom St Denis 
-*/
-
-#ifdef LTC_MD5
-
-const struct ltc_hash_descriptor md5_desc =
-{
-    "md5",
-    3,
-    16,
-    64,
-
-    /* OID */
-   { 1, 2, 840, 113549, 2, 5,  },
-   6,
-
-    &md5_init,
-    &md5_process,
-    &md5_done,
-    &md5_test,
-    NULL
-};
-
-#define F(x,y,z)  (z ^ (x & (y ^ z)))
-#define G(x,y,z)  (y ^ (z & (y ^ x)))
-#define H(x,y,z)  (x^y^z)
-#define I(x,y,z)  (y^(x|(~z)))
-
-#ifdef LTC_SMALL_CODE
-
-#define FF(a,b,c,d,M,s,t) \
-    a = (a + F(b,c,d) + M + t); a = ROL(a, s) + b;
-
-#define GG(a,b,c,d,M,s,t) \
-    a = (a + G(b,c,d) + M + t); a = ROL(a, s) + b;
-
-#define HH(a,b,c,d,M,s,t) \
-    a = (a + H(b,c,d) + M + t); a = ROL(a, s) + b;
-
-#define II(a,b,c,d,M,s,t) \
-    a = (a + I(b,c,d) + M + t); a = ROL(a, s) + b;
-
-static const unsigned char Worder[64] = {
-   0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,
-   1,6,11,0,5,10,15,4,9,14,3,8,13,2,7,12,
-   5,8,11,14,1,4,7,10,13,0,3,6,9,12,15,2,
-   0,7,14,5,12,3,10,1,8,15,6,13,4,11,2,9
-};
-
-static const unsigned char Rorder[64] = {
-   7,12,17,22,7,12,17,22,7,12,17,22,7,12,17,22,
-   5,9,14,20,5,9,14,20,5,9,14,20,5,9,14,20,
-   4,11,16,23,4,11,16,23,4,11,16,23,4,11,16,23,
-   6,10,15,21,6,10,15,21,6,10,15,21,6,10,15,21
-};
-
-static const ulong32 Korder[64] = {
-0xd76aa478UL, 0xe8c7b756UL, 0x242070dbUL, 0xc1bdceeeUL, 0xf57c0fafUL, 0x4787c62aUL, 0xa8304613UL, 0xfd469501UL,
-0x698098d8UL, 0x8b44f7afUL, 0xffff5bb1UL, 0x895cd7beUL, 0x6b901122UL, 0xfd987193UL, 0xa679438eUL, 0x49b40821UL,
-0xf61e2562UL, 0xc040b340UL, 0x265e5a51UL, 0xe9b6c7aaUL, 0xd62f105dUL, 0x02441453UL, 0xd8a1e681UL, 0xe7d3fbc8UL,
-0x21e1cde6UL, 0xc33707d6UL, 0xf4d50d87UL, 0x455a14edUL, 0xa9e3e905UL, 0xfcefa3f8UL, 0x676f02d9UL, 0x8d2a4c8aUL,
-0xfffa3942UL, 0x8771f681UL, 0x6d9d6122UL, 0xfde5380cUL, 0xa4beea44UL, 0x4bdecfa9UL, 0xf6bb4b60UL, 0xbebfbc70UL,
-0x289b7ec6UL, 0xeaa127faUL, 0xd4ef3085UL, 0x04881d05UL, 0xd9d4d039UL, 0xe6db99e5UL, 0x1fa27cf8UL, 0xc4ac5665UL,
-0xf4292244UL, 0x432aff97UL, 0xab9423a7UL, 0xfc93a039UL, 0x655b59c3UL, 0x8f0ccc92UL, 0xffeff47dUL, 0x85845dd1UL,
-0x6fa87e4fUL, 0xfe2ce6e0UL, 0xa3014314UL, 0x4e0811a1UL, 0xf7537e82UL, 0xbd3af235UL, 0x2ad7d2bbUL, 0xeb86d391UL
-};
-
-#else
-
-#define FF(a,b,c,d,M,s,t) \
-    a = (a + F(b,c,d) + M + t); a = ROLc(a, s) + b;
-
-#define GG(a,b,c,d,M,s,t) \
-    a = (a + G(b,c,d) + M + t); a = ROLc(a, s) + b;
-
-#define HH(a,b,c,d,M,s,t) \
-    a = (a + H(b,c,d) + M + t); a = ROLc(a, s) + b;
-
-#define II(a,b,c,d,M,s,t) \
-    a = (a + I(b,c,d) + M + t); a = ROLc(a, s) + b;
-
-
-#endif   
-
-#ifdef LTC_CLEAN_STACK
-static int _md5_compress(hash_state *md, unsigned char *buf)
-#else
-static int  md5_compress(hash_state *md, unsigned char *buf)
-#endif
-{
-    ulong32 i, W[16], a, b, c, d;
-#ifdef LTC_SMALL_CODE
-    ulong32 t;
-#endif
-
-    /* copy the state into 512-bits into W[0..15] */
-    for (i = 0; i < 16; i++) {
-        LOAD32L(W[i], buf + (4*i));
-    }
- 
-    /* copy state */
-    a = md->md5.state[0];
-    b = md->md5.state[1];
-    c = md->md5.state[2];
-    d = md->md5.state[3];
-
-#ifdef LTC_SMALL_CODE
-    for (i = 0; i < 16; ++i) {
-        FF(a,b,c,d,W[Worder[i]],Rorder[i],Korder[i]);
-        t = d; d = c; c = b; b = a; a = t;
-    }
-
-    for (; i < 32; ++i) {
-        GG(a,b,c,d,W[Worder[i]],Rorder[i],Korder[i]);
-        t = d; d = c; c = b; b = a; a = t;
-    }
-
-    for (; i < 48; ++i) {
-        HH(a,b,c,d,W[Worder[i]],Rorder[i],Korder[i]);
-        t = d; d = c; c = b; b = a; a = t;
-    }
-
-    for (; i < 64; ++i) {
-        II(a,b,c,d,W[Worder[i]],Rorder[i],Korder[i]);
-        t = d; d = c; c = b; b = a; a = t;
-    }
-
-#else
-    FF(a,b,c,d,W[0],7,0xd76aa478UL)
-    FF(d,a,b,c,W[1],12,0xe8c7b756UL)
-    FF(c,d,a,b,W[2],17,0x242070dbUL)
-    FF(b,c,d,a,W[3],22,0xc1bdceeeUL)
-    FF(a,b,c,d,W[4],7,0xf57c0fafUL)
-    FF(d,a,b,c,W[5],12,0x4787c62aUL)
-    FF(c,d,a,b,W[6],17,0xa8304613UL)
-    FF(b,c,d,a,W[7],22,0xfd469501UL)
-    FF(a,b,c,d,W[8],7,0x698098d8UL)
-    FF(d,a,b,c,W[9],12,0x8b44f7afUL)
-    FF(c,d,a,b,W[10],17,0xffff5bb1UL)
-    FF(b,c,d,a,W[11],22,0x895cd7beUL)
-    FF(a,b,c,d,W[12],7,0x6b901122UL)
-    FF(d,a,b,c,W[13],12,0xfd987193UL)
-    FF(c,d,a,b,W[14],17,0xa679438eUL)
-    FF(b,c,d,a,W[15],22,0x49b40821UL)
-    GG(a,b,c,d,W[1],5,0xf61e2562UL)
-    GG(d,a,b,c,W[6],9,0xc040b340UL)
-    GG(c,d,a,b,W[11],14,0x265e5a51UL)
-    GG(b,c,d,a,W[0],20,0xe9b6c7aaUL)
-    GG(a,b,c,d,W[5],5,0xd62f105dUL)
-    GG(d,a,b,c,W[10],9,0x02441453UL)
-    GG(c,d,a,b,W[15],14,0xd8a1e681UL)
-    GG(b,c,d,a,W[4],20,0xe7d3fbc8UL)
-    GG(a,b,c,d,W[9],5,0x21e1cde6UL)
-    GG(d,a,b,c,W[14],9,0xc33707d6UL)
-    GG(c,d,a,b,W[3],14,0xf4d50d87UL)
-    GG(b,c,d,a,W[8],20,0x455a14edUL)
-    GG(a,b,c,d,W[13],5,0xa9e3e905UL)
-    GG(d,a,b,c,W[2],9,0xfcefa3f8UL)
-    GG(c,d,a,b,W[7],14,0x676f02d9UL)
-    GG(b,c,d,a,W[12],20,0x8d2a4c8aUL)
-    HH(a,b,c,d,W[5],4,0xfffa3942UL)
-    HH(d,a,b,c,W[8],11,0x8771f681UL)
-    HH(c,d,a,b,W[11],16,0x6d9d6122UL)
-    HH(b,c,d,a,W[14],23,0xfde5380cUL)
-    HH(a,b,c,d,W[1],4,0xa4beea44UL)
-    HH(d,a,b,c,W[4],11,0x4bdecfa9UL)
-    HH(c,d,a,b,W[7],16,0xf6bb4b60UL)
-    HH(b,c,d,a,W[10],23,0xbebfbc70UL)
-    HH(a,b,c,d,W[13],4,0x289b7ec6UL)
-    HH(d,a,b,c,W[0],11,0xeaa127faUL)
-    HH(c,d,a,b,W[3],16,0xd4ef3085UL)
-    HH(b,c,d,a,W[6],23,0x04881d05UL)
-    HH(a,b,c,d,W[9],4,0xd9d4d039UL)
-    HH(d,a,b,c,W[12],11,0xe6db99e5UL)
-    HH(c,d,a,b,W[15],16,0x1fa27cf8UL)
-    HH(b,c,d,a,W[2],23,0xc4ac5665UL)
-    II(a,b,c,d,W[0],6,0xf4292244UL)
-    II(d,a,b,c,W[7],10,0x432aff97UL)
-    II(c,d,a,b,W[14],15,0xab9423a7UL)
-    II(b,c,d,a,W[5],21,0xfc93a039UL)
-    II(a,b,c,d,W[12],6,0x655b59c3UL)
-    II(d,a,b,c,W[3],10,0x8f0ccc92UL)
-    II(c,d,a,b,W[10],15,0xffeff47dUL)
-    II(b,c,d,a,W[1],21,0x85845dd1UL)
-    II(a,b,c,d,W[8],6,0x6fa87e4fUL)
-    II(d,a,b,c,W[15],10,0xfe2ce6e0UL)
-    II(c,d,a,b,W[6],15,0xa3014314UL)
-    II(b,c,d,a,W[13],21,0x4e0811a1UL)
-    II(a,b,c,d,W[4],6,0xf7537e82UL)
-    II(d,a,b,c,W[11],10,0xbd3af235UL)
-    II(c,d,a,b,W[2],15,0x2ad7d2bbUL)
-    II(b,c,d,a,W[9],21,0xeb86d391UL)
-#endif
-
-    md->md5.state[0] = md->md5.state[0] + a;
-    md->md5.state[1] = md->md5.state[1] + b;
-    md->md5.state[2] = md->md5.state[2] + c;
-    md->md5.state[3] = md->md5.state[3] + d;
-
-    return CRYPT_OK;
-}
-
-#ifdef LTC_CLEAN_STACK
-static int md5_compress(hash_state *md, unsigned char *buf)
-{
-   int err;
-   err = _md5_compress(md, buf);
-   burn_stack(sizeof(ulong32) * 21);
-   return err;
-}
-#endif
-
-/*
-   Initialize the hash state
-   @param md   The hash state you wish to initialize
-   @return CRYPT_OK if successful
-*/
-int md5_init(hash_state * md)
-{
-   LTC_ARGCHK(md != NULL);
-   md->md5.state[0] = 0x67452301UL;
-   md->md5.state[1] = 0xefcdab89UL;
-   md->md5.state[2] = 0x98badcfeUL;
-   md->md5.state[3] = 0x10325476UL;
-   md->md5.curlen = 0;
-   md->md5.length = 0;
-   return CRYPT_OK;
-}
-
-/*
-   Process a block of memory though the hash
-   @param md     The hash state
-   @param in     The data to hash
-   @param inlen  The length of the data (octets)
-   @return CRYPT_OK if successful
-*/
-HASH_PROCESS(md5_process, md5_compress, md5, 64)
-
-/*
-   Terminate the hash to get the digest
-   @param md  The hash state
-   @param out [out] The destination of the hash (16 bytes)
-   @return CRYPT_OK if successful
-*/
-int md5_done(hash_state * md, unsigned char *out)
-{
-    int i;
-
-    LTC_ARGCHK(md  != NULL);
-    LTC_ARGCHK(out != NULL);
-
-    if (md->md5.curlen >= sizeof(md->md5.buf)) {
-       return CRYPT_INVALID_ARG;
-    }
-
-
-    /* increase the length of the message */
-    md->md5.length += md->md5.curlen * 8;
-
-    /* append the '1' bit */
-    md->md5.buf[md->md5.curlen++] = (unsigned char)0x80;
-
-    /* if the length is currently above 56 bytes we append zeros
-     * then compress.  Then we can fall back to padding zeros and length
-     * encoding like normal.
-     */
-    if (md->md5.curlen > 56) {
-        while (md->md5.curlen < 64) {
-            md->md5.buf[md->md5.curlen++] = (unsigned char)0;
-        }
-        md5_compress(md, md->md5.buf);
-        md->md5.curlen = 0;
-    }
-
-    /* pad upto 56 bytes of zeroes */
-    while (md->md5.curlen < 56) {
-        md->md5.buf[md->md5.curlen++] = (unsigned char)0;
-    }
-
-    /* store length */
-    STORE64L(md->md5.length, md->md5.buf+56);
-    md5_compress(md, md->md5.buf);
-
-    /* copy output */
-    for (i = 0; i < 4; i++) {
-        STORE32L(md->md5.state[i], out+(4*i));
-    }
-#ifdef LTC_CLEAN_STACK
-    zeromem(md, sizeof(hash_state));
-#endif
-    return CRYPT_OK;
-}
-
-/*
-  Self-test the hash
-  @return CRYPT_OK if successful, CRYPT_NOP if self-tests have been disabled
-*/  
-int  md5_test(void)
-{
- #ifndef LTC_TEST
-    return CRYPT_NOP;
- #else    
-  static const struct {
-      char *msg;
-      unsigned char hash[16];
-  } tests[] = {
-    { "",
-      { 0xd4, 0x1d, 0x8c, 0xd9, 0x8f, 0x00, 0xb2, 0x04, 
-        0xe9, 0x80, 0x09, 0x98, 0xec, 0xf8, 0x42, 0x7e } },
-    { "a",
-      {0x0c, 0xc1, 0x75, 0xb9, 0xc0, 0xf1, 0xb6, 0xa8, 
-       0x31, 0xc3, 0x99, 0xe2, 0x69, 0x77, 0x26, 0x61 } },
-    { "abc",
-      { 0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, 
-        0xd6, 0x96, 0x3f, 0x7d, 0x28, 0xe1, 0x7f, 0x72 } },
-    { "message digest", 
-      { 0xf9, 0x6b, 0x69, 0x7d, 0x7c, 0xb7, 0x93, 0x8d, 
-        0x52, 0x5a, 0x2f, 0x31, 0xaa, 0xf1, 0x61, 0xd0 } }, 
-    { "abcdefghijklmnopqrstuvwxyz",
-      { 0xc3, 0xfc, 0xd3, 0xd7, 0x61, 0x92, 0xe4, 0x00, 
-        0x7d, 0xfb, 0x49, 0x6c, 0xca, 0x67, 0xe1, 0x3b } },
-    { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-      { 0xd1, 0x74, 0xab, 0x98, 0xd2, 0x77, 0xd9, 0xf5, 
-        0xa5, 0x61, 0x1c, 0x2c, 0x9f, 0x41, 0x9d, 0x9f } },
-    { "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
-      { 0x57, 0xed, 0xf4, 0xa2, 0x2b, 0xe3, 0xc9, 0x55, 
-        0xac, 0x49, 0xda, 0x2e, 0x21, 0x07, 0xb6, 0x7a } }, 
-    { NULL, { 0 } }
-  };
-
-  int i;
-  unsigned char tmp[16];
-  hash_state md;
-
-  for (i = 0; tests[i].msg != NULL; i++) {
-      md5_init(&md);
-      md5_process(&md, (unsigned char *)tests[i].msg, (unsigned long)strlen(tests[i].msg));
-      md5_done(&md, tmp);
-      if (XMEMCMP(tmp, tests[i].hash, 16) != 0) {
-         return CRYPT_FAIL_TESTVECTOR;
-      }
-  }
-  return CRYPT_OK;
- #endif
-}
-
-#endif
-
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/hashes/md5.c,v $ */
-/* $Revision: 1.10 $ */
-/* $Date: 2007/05/12 14:25:28 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/hashes/sha1.c b/dep/StormLibOld/src/libtomcrypt/src/hashes/sha1.c
deleted file mode 100644
index 82317a598..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/hashes/sha1.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-  @file sha1.c
-  LTC_SHA1 code by Tom St Denis 
-*/
-
-
-#ifdef LTC_SHA1
-
-const struct ltc_hash_descriptor sha1_desc =
-{
-    "sha1",
-    2,
-    20,
-    64,
-
-    /* OID */
-   { 1, 3, 14, 3, 2, 26,  },
-   6,
-
-    &sha1_init,
-    &sha1_process,
-    &sha1_done,
-    &sha1_test,
-    NULL
-};
-
-#define F0(x,y,z)  (z ^ (x & (y ^ z)))
-#define F1(x,y,z)  (x ^ y ^ z)
-#define F2(x,y,z)  ((x & y) | (z & (x | y)))
-#define F3(x,y,z)  (x ^ y ^ z)
-
-#ifdef LTC_CLEAN_STACK
-static int _sha1_compress(hash_state *md, unsigned char *buf)
-#else
-static int  sha1_compress(hash_state *md, unsigned char *buf)
-#endif
-{
-    ulong32 a,b,c,d,e,W[80],i;
-#ifdef LTC_SMALL_CODE
-    ulong32 t;
-#endif
-
-    /* copy the state into 512-bits into W[0..15] */
-    for (i = 0; i < 16; i++) {
-        LOAD32H(W[i], buf + (4*i));
-    }
-
-    /* copy state */
-    a = md->sha1.state[0];
-    b = md->sha1.state[1];
-    c = md->sha1.state[2];
-    d = md->sha1.state[3];
-    e = md->sha1.state[4];
-
-    /* expand it */
-    for (i = 16; i < 80; i++) {
-        W[i] = ROL(W[i-3] ^ W[i-8] ^ W[i-14] ^ W[i-16], 1); 
-    }
-
-    /* compress */
-    /* round one */
-    #define FF0(a,b,c,d,e,i) e = (ROLc(a, 5) + F0(b,c,d) + e + W[i] + 0x5a827999UL); b = ROLc(b, 30);
-    #define FF1(a,b,c,d,e,i) e = (ROLc(a, 5) + F1(b,c,d) + e + W[i] + 0x6ed9eba1UL); b = ROLc(b, 30);
-    #define FF2(a,b,c,d,e,i) e = (ROLc(a, 5) + F2(b,c,d) + e + W[i] + 0x8f1bbcdcUL); b = ROLc(b, 30);
-    #define FF3(a,b,c,d,e,i) e = (ROLc(a, 5) + F3(b,c,d) + e + W[i] + 0xca62c1d6UL); b = ROLc(b, 30);
- 
-#ifdef LTC_SMALL_CODE
- 
-    for (i = 0; i < 20; ) {
-       FF0(a,b,c,d,e,i++); t = e; e = d; d = c; c = b; b = a; a = t;
-    }
-
-    for (; i < 40; ) {
-       FF1(a,b,c,d,e,i++); t = e; e = d; d = c; c = b; b = a; a = t;
-    }
-
-    for (; i < 60; ) {
-       FF2(a,b,c,d,e,i++); t = e; e = d; d = c; c = b; b = a; a = t;
-    }
-
-    for (; i < 80; ) {
-       FF3(a,b,c,d,e,i++); t = e; e = d; d = c; c = b; b = a; a = t;
-    }
-
-#else
-
-    for (i = 0; i < 20; ) {
-       FF0(a,b,c,d,e,i++);
-       FF0(e,a,b,c,d,i++);
-       FF0(d,e,a,b,c,i++);
-       FF0(c,d,e,a,b,i++);
-       FF0(b,c,d,e,a,i++);
-    }
-
-    /* round two */
-    for (; i < 40; )  { 
-       FF1(a,b,c,d,e,i++);
-       FF1(e,a,b,c,d,i++);
-       FF1(d,e,a,b,c,i++);
-       FF1(c,d,e,a,b,i++);
-       FF1(b,c,d,e,a,i++);
-    }
-
-    /* round three */
-    for (; i < 60; )  { 
-       FF2(a,b,c,d,e,i++);
-       FF2(e,a,b,c,d,i++);
-       FF2(d,e,a,b,c,i++);
-       FF2(c,d,e,a,b,i++);
-       FF2(b,c,d,e,a,i++);
-    }
-
-    /* round four */
-    for (; i < 80; )  { 
-       FF3(a,b,c,d,e,i++);
-       FF3(e,a,b,c,d,i++);
-       FF3(d,e,a,b,c,i++);
-       FF3(c,d,e,a,b,i++);
-       FF3(b,c,d,e,a,i++);
-    }
-#endif
-
-    #undef FF0
-    #undef FF1
-    #undef FF2
-    #undef FF3
-
-    /* store */
-    md->sha1.state[0] = md->sha1.state[0] + a;
-    md->sha1.state[1] = md->sha1.state[1] + b;
-    md->sha1.state[2] = md->sha1.state[2] + c;
-    md->sha1.state[3] = md->sha1.state[3] + d;
-    md->sha1.state[4] = md->sha1.state[4] + e;
-
-    return CRYPT_OK;
-}
-
-#ifdef LTC_CLEAN_STACK
-static int sha1_compress(hash_state *md, unsigned char *buf)
-{
-   int err;
-   err = _sha1_compress(md, buf);
-   burn_stack(sizeof(ulong32) * 87);
-   return err;
-}
-#endif
-
-/*
-   Initialize the hash state
-   @param md   The hash state you wish to initialize
-   @return CRYPT_OK if successful
-*/
-int sha1_init(hash_state * md)
-{
-   LTC_ARGCHK(md != NULL);
-   md->sha1.state[0] = 0x67452301UL;
-   md->sha1.state[1] = 0xefcdab89UL;
-   md->sha1.state[2] = 0x98badcfeUL;
-   md->sha1.state[3] = 0x10325476UL;
-   md->sha1.state[4] = 0xc3d2e1f0UL;
-   md->sha1.curlen = 0;
-   md->sha1.length = 0;
-   return CRYPT_OK;
-}
-
-/*
-   Process a block of memory though the hash
-   @param md     The hash state
-   @param in     The data to hash
-   @param inlen  The length of the data (octets)
-   @return CRYPT_OK if successful
-*/
-HASH_PROCESS(sha1_process, sha1_compress, sha1, 64)
-
-/*
-   Terminate the hash to get the digest
-   @param md  The hash state
-   @param out [out] The destination of the hash (20 bytes)
-   @return CRYPT_OK if successful
-*/
-int sha1_done(hash_state * md, unsigned char *out)
-{
-    int i;
-
-    LTC_ARGCHK(md  != NULL);
-    LTC_ARGCHK(out != NULL);
-
-    if (md->sha1.curlen >= sizeof(md->sha1.buf)) {
-       return CRYPT_INVALID_ARG;
-    }
-
-    /* increase the length of the message */
-    md->sha1.length += md->sha1.curlen * 8;
-
-    /* append the '1' bit */
-    md->sha1.buf[md->sha1.curlen++] = (unsigned char)0x80;
-
-    /* if the length is currently above 56 bytes we append zeros
-     * then compress.  Then we can fall back to padding zeros and length
-     * encoding like normal.
-     */
-    if (md->sha1.curlen > 56) {
-        while (md->sha1.curlen < 64) {
-            md->sha1.buf[md->sha1.curlen++] = (unsigned char)0;
-        }
-        sha1_compress(md, md->sha1.buf);
-        md->sha1.curlen = 0;
-    }
-
-    /* pad upto 56 bytes of zeroes */
-    while (md->sha1.curlen < 56) {
-        md->sha1.buf[md->sha1.curlen++] = (unsigned char)0;
-    }
-
-    /* store length */
-    STORE64H(md->sha1.length, md->sha1.buf+56);
-    sha1_compress(md, md->sha1.buf);
-
-    /* copy output */
-    for (i = 0; i < 5; i++) {
-        STORE32H(md->sha1.state[i], out+(4*i));
-    }
-#ifdef LTC_CLEAN_STACK
-    zeromem(md, sizeof(hash_state));
-#endif
-    return CRYPT_OK;
-}
-
-/*
-  Self-test the hash
-  @return CRYPT_OK if successful, CRYPT_NOP if self-tests have been disabled
-*/  
-int  sha1_test(void)
-{
- #ifndef LTC_TEST
-    return CRYPT_NOP;
- #else    
-  static const struct {
-      char *msg;
-      unsigned char hash[20];
-  } tests[] = {
-    { "abc",
-      { 0xa9, 0x99, 0x3e, 0x36, 0x47, 0x06, 0x81, 0x6a,
-        0xba, 0x3e, 0x25, 0x71, 0x78, 0x50, 0xc2, 0x6c,
-        0x9c, 0xd0, 0xd8, 0x9d }
-    },
-    { "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-      { 0x84, 0x98, 0x3E, 0x44, 0x1C, 0x3B, 0xD2, 0x6E,
-        0xBA, 0xAE, 0x4A, 0xA1, 0xF9, 0x51, 0x29, 0xE5,
-        0xE5, 0x46, 0x70, 0xF1 }
-    }
-  };
-
-  int i;
-  unsigned char tmp[20];
-  hash_state md;
-
-  for (i = 0; i < (int)(sizeof(tests) / sizeof(tests[0]));  i++) {
-      sha1_init(&md);
-      sha1_process(&md, (unsigned char*)tests[i].msg, (unsigned long)strlen(tests[i].msg));
-      sha1_done(&md, tmp);
-      if (XMEMCMP(tmp, tests[i].hash, 20) != 0) {
-         return CRYPT_FAIL_TESTVECTOR;
-      }
-  }
-  return CRYPT_OK;
-  #endif
-}
-
-#endif
-
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/hashes/sha1.c,v $ */
-/* $Revision: 1.10 $ */
-/* $Date: 2007/05/12 14:25:28 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt.h
deleted file mode 100644
index 74cdff475..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef TOMCRYPT_H_
-#define TOMCRYPT_H_
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <ctype.h>
-#include <limits.h>
-
-/* use configuration data */
-#include "tomcrypt_custom.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* version */
-#define CRYPT   0x0117
-#define SCRYPT  "1.17"
-
-/* max size of either a cipher/hash block or symmetric key [largest of the two] */
-#define MAXBLOCKSIZE  128
-
-/* descriptor table size */
-#define TAB_SIZE      32
-
-/* error codes [will be expanded in future releases] */
-enum {
-   CRYPT_OK=0,             /* Result OK */
-   CRYPT_ERROR,            /* Generic Error */
-   CRYPT_NOP,              /* Not a failure but no operation was performed */
-
-   CRYPT_INVALID_KEYSIZE,  /* Invalid key size given */
-   CRYPT_INVALID_ROUNDS,   /* Invalid number of rounds */
-   CRYPT_FAIL_TESTVECTOR,  /* Algorithm failed test vectors */
-
-   CRYPT_BUFFER_OVERFLOW,  /* Not enough space for output */
-   CRYPT_INVALID_PACKET,   /* Invalid input packet given */
-
-   CRYPT_INVALID_PRNGSIZE, /* Invalid number of bits for a PRNG */
-   CRYPT_ERROR_READPRNG,   /* Could not read enough from PRNG */
-
-   CRYPT_INVALID_CIPHER,   /* Invalid cipher specified */
-   CRYPT_INVALID_HASH,     /* Invalid hash specified */
-   CRYPT_INVALID_PRNG,     /* Invalid PRNG specified */
-
-   CRYPT_MEM,              /* Out of memory */
-
-   CRYPT_PK_TYPE_MISMATCH, /* Not equivalent types of PK keys */
-   CRYPT_PK_NOT_PRIVATE,   /* Requires a private PK key */
-
-   CRYPT_INVALID_ARG,      /* Generic invalid argument */
-   CRYPT_FILE_NOTFOUND,    /* File Not Found */
-
-   CRYPT_PK_INVALID_TYPE,  /* Invalid type of PK key */
-   CRYPT_PK_INVALID_SYSTEM,/* Invalid PK system specified */
-   CRYPT_PK_DUP,           /* Duplicate key already in key ring */
-   CRYPT_PK_NOT_FOUND,     /* Key not found in keyring */
-   CRYPT_PK_INVALID_SIZE,  /* Invalid size input for PK parameters */
-
-   CRYPT_INVALID_PRIME_SIZE,/* Invalid size of prime requested */
-   CRYPT_PK_INVALID_PADDING /* Invalid padding on input */
-};
-
-#include "tomcrypt_cfg.h"
-#include "tomcrypt_macros.h"
-#include "tomcrypt_cipher.h"
-#include "tomcrypt_hash.h"
-#include "tomcrypt_mac.h"
-#include "tomcrypt_prng.h"
-#include "tomcrypt_pk.h"
-#include "tomcrypt_math.h"
-#include "tomcrypt_misc.h"
-#include "tomcrypt_argchk.h"
-#include "tomcrypt_pkcs.h"
-
-#ifdef __cplusplus
-   }
-#endif
-
-#endif /* TOMCRYPT_H_ */
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt.h,v $ */
-/* $Revision: 1.21 $ */
-/* $Date: 2006/12/16 19:34:05 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_argchk.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_argchk.h
deleted file mode 100644
index cfc93ad7e..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_argchk.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Defines the LTC_ARGCHK macro used within the library */
-/* ARGTYPE is defined in mycrypt_cfg.h */
-#if ARGTYPE == 0
-
-#include <signal.h>
-
-/* this is the default LibTomCrypt macro  */
-void crypt_argchk(char *v, char *s, int d);
-#define LTC_ARGCHK(x) if (!(x)) { crypt_argchk(#x, __FILE__, __LINE__); }
-#define LTC_ARGCHKVD(x) LTC_ARGCHK(x)
-
-#elif ARGTYPE == 1
-
-/* fatal type of error */
-#define LTC_ARGCHK(x) assert((x))
-#define LTC_ARGCHKVD(x) LTC_ARGCHK(x)
-
-#elif ARGTYPE == 2
-
-#define LTC_ARGCHK(x) if (!(x)) { fprintf(stderr, "\nwarning: ARGCHK failed at %s:%d\n", __FILE__, __LINE__); }
-#define LTC_ARGCHKVD(x) LTC_ARGCHK(x)
-
-#elif ARGTYPE == 3
-
-#define LTC_ARGCHK(x) 
-#define LTC_ARGCHKVD(x) LTC_ARGCHK(x)
-
-#elif ARGTYPE == 4
-
-#define LTC_ARGCHK(x)   if (!(x)) return CRYPT_INVALID_ARG;
-#define LTC_ARGCHKVD(x) if (!(x)) return;
-
-#endif
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_argchk.h,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/08/27 20:50:21 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_cfg.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_cfg.h
deleted file mode 100644
index 7feae6e8b..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_cfg.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* This is the build config file.
- *
- * With this you can setup what to inlcude/exclude automatically during any build.  Just comment
- * out the line that #define's the word for the thing you want to remove.  phew!
- */
-
-#ifndef TOMCRYPT_CFG_H
-#define TOMCRYPT_CFG_H
-
-#if defined(_WIN32) || defined(_MSC_VER)
-#define LTC_CALL __cdecl
-#else
-#ifndef LTC_CALL
-   #define LTC_CALL
-#endif
-#endif
-
-#ifndef LTC_EXPORT
-#define LTC_EXPORT
-#endif
-
-/* certain platforms use macros for these, making the prototypes broken */
-#ifndef LTC_NO_PROTOTYPES
-
-/* you can change how memory allocation works ... */
-LTC_EXPORT void * LTC_CALL XMALLOC(size_t n);
-LTC_EXPORT void * LTC_CALL XREALLOC(void *p, size_t n);
-LTC_EXPORT void * LTC_CALL XCALLOC(size_t n, size_t s);
-LTC_EXPORT void LTC_CALL XFREE(void *p);
-
-LTC_EXPORT void LTC_CALL XQSORT(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *));
-
-
-/* change the clock function too */
-LTC_EXPORT clock_t LTC_CALL XCLOCK(void);
-
-/* various other functions */
-LTC_EXPORT void * LTC_CALL XMEMCPY(void *dest, const void *src, size_t n);
-LTC_EXPORT int   LTC_CALL XMEMCMP(const void *s1, const void *s2, size_t n);
-LTC_EXPORT void * LTC_CALL XMEMSET(void *s, int c, size_t n);
-
-LTC_EXPORT int   LTC_CALL XSTRCMP(const char *s1, const char *s2);
-
-#endif
-
-/* type of argument checking, 0=default, 1=fatal and 2=error+continue, 3=nothing */
-#ifndef ARGTYPE
-   #define ARGTYPE  0
-#endif
-
-/* Controls endianess and size of registers.  Leave uncommented to get platform neutral [slower] code 
- * 
- * Note: in order to use the optimized macros your platform must support unaligned 32 and 64 bit read/writes.
- * The x86 platforms allow this but some others [ARM for instance] do not.  On those platforms you **MUST**
- * use the portable [slower] macros.
- */
-
-/* detect x86-32 machines somewhat */
-#if !defined(__STRICT_ANSI__) && (defined(INTEL_CC) || (defined(_MSC_VER) && defined(WIN32)) || (defined(__GNUC__) && (defined(__DJGPP__) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__i386__))))
-   #define ENDIAN_LITTLE
-   #define ENDIAN_32BITWORD
-   #define LTC_FAST
-   #define LTC_FAST_TYPE    unsigned long
-#endif
-
-/* detects MIPS R5900 processors (PS2) */
-#if (defined(__R5900) || defined(R5900) || defined(__R5900__)) && (defined(_mips) || defined(__mips__) || defined(mips))
-   #define ENDIAN_LITTLE
-   #define ENDIAN_64BITWORD
-#endif
-
-/* detect amd64 */
-#if !defined(__STRICT_ANSI__) && defined(__x86_64__)
-   #define ENDIAN_LITTLE
-   #define ENDIAN_64BITWORD
-   #define LTC_FAST
-   #define LTC_FAST_TYPE    unsigned long
-#endif
-
-/* detect PPC32 */
-#if !defined(__STRICT_ANSI__) && defined(LTC_PPC32)
-   #define ENDIAN_BIG
-   #define ENDIAN_32BITWORD
-   #define LTC_FAST
-   #define LTC_FAST_TYPE    unsigned long
-#endif   
-
-/* detect sparc and sparc64 */
-#if defined(__sparc__)
-  #define ENDIAN_BIG
-  #if defined(__arch64__)
-    #define ENDIAN_64BITWORD
-  #else
-    #define ENDIAN_32BITWORD
-  #endif
-#endif
-
-
-#ifdef LTC_NO_FAST
-   #ifdef LTC_FAST
-      #undef LTC_FAST
-   #endif
-#endif
-
-/* No asm is a quick way to disable anything "not portable" */
-#ifdef LTC_NO_ASM
-   #undef ENDIAN_LITTLE
-   #undef ENDIAN_BIG
-   #undef ENDIAN_32BITWORD
-   #undef ENDIAN_64BITWORD
-   #undef LTC_FAST
-   #undef LTC_FAST_TYPE
-   #define LTC_NO_ROLC
-	#define LTC_NO_BSWAP
-#endif
-
-/* #define ENDIAN_LITTLE */
-/* #define ENDIAN_BIG */
-
-/* #define ENDIAN_32BITWORD */
-/* #define ENDIAN_64BITWORD */
-
-#if (defined(ENDIAN_BIG) || defined(ENDIAN_LITTLE)) && !(defined(ENDIAN_32BITWORD) || defined(ENDIAN_64BITWORD))
-    #error You must specify a word size as well as endianess in tomcrypt_cfg.h
-#endif
-
-#if !(defined(ENDIAN_BIG) || defined(ENDIAN_LITTLE))
-   #define ENDIAN_NEUTRAL
-#endif
-
-#endif
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_cfg.h,v $ */
-/* $Revision: 1.19 $ */
-/* $Date: 2006/12/04 02:19:48 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_cipher.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_cipher.h
deleted file mode 100644
index bd740bf4a..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_cipher.h
+++ /dev/null
@@ -1,891 +0,0 @@
-/* ---- SYMMETRIC KEY STUFF -----
- *
- * We put each of the ciphers scheduled keys in their own structs then we put all of 
- * the key formats in one union.  This makes the function prototypes easier to use.
- */
-#ifdef LTC_BLOWFISH
-struct blowfish_key {
-   ulong32 S[4][256];
-   ulong32 K[18];
-};
-#endif
-
-#ifdef LTC_RC5
-struct rc5_key {
-   int rounds;
-   ulong32 K[50];
-};
-#endif
-
-#ifdef LTC_RC6
-struct rc6_key {
-   ulong32 K[44];
-};
-#endif
-
-#ifdef LTC_SAFERP
-struct saferp_key {
-   unsigned char K[33][16];
-   long rounds;
-};
-#endif
-
-#ifdef LTC_RIJNDAEL
-struct rijndael_key {
-   ulong32 eK[60], dK[60];
-   int Nr;
-};
-#endif
-
-#ifdef LTC_KSEED
-struct kseed_key {
-    ulong32 K[32], dK[32];
-};
-#endif
-
-#ifdef LTC_KASUMI
-struct kasumi_key {
-    ulong32 KLi1[8], KLi2[8],
-            KOi1[8], KOi2[8], KOi3[8],
-            KIi1[8], KIi2[8], KIi3[8];
-};
-#endif
-
-#ifdef LTC_XTEA
-struct xtea_key {
-   unsigned long A[32], B[32];
-};
-#endif
-
-#ifdef LTC_TWOFISH
-#ifndef LTC_TWOFISH_SMALL
-   struct twofish_key {
-      ulong32 S[4][256], K[40];
-   };
-#else
-   struct twofish_key {
-      ulong32 K[40];
-      unsigned char S[32], start;
-   };
-#endif
-#endif
-
-#ifdef LTC_SAFER
-#define LTC_SAFER_K64_DEFAULT_NOF_ROUNDS     6
-#define LTC_SAFER_K128_DEFAULT_NOF_ROUNDS   10
-#define LTC_SAFER_SK64_DEFAULT_NOF_ROUNDS    8
-#define LTC_SAFER_SK128_DEFAULT_NOF_ROUNDS  10
-#define LTC_SAFER_MAX_NOF_ROUNDS            13
-#define LTC_SAFER_BLOCK_LEN                  8
-#define LTC_SAFER_KEY_LEN     (1 + LTC_SAFER_BLOCK_LEN * (1 + 2 * LTC_SAFER_MAX_NOF_ROUNDS))
-typedef unsigned char safer_block_t[LTC_SAFER_BLOCK_LEN];
-typedef unsigned char safer_key_t[LTC_SAFER_KEY_LEN];
-struct safer_key { safer_key_t key; };
-#endif
-
-#ifdef LTC_RC2
-struct rc2_key { unsigned xkey[64]; };
-#endif
-
-#ifdef LTC_DES
-struct des_key {
-    ulong32 ek[32], dk[32];
-};
-
-struct des3_key {
-    ulong32 ek[3][32], dk[3][32];
-};
-#endif
-
-#ifdef LTC_CAST5
-struct cast5_key {
-    ulong32 K[32], keylen;
-};
-#endif
-
-#ifdef LTC_NOEKEON
-struct noekeon_key {
-    ulong32 K[4], dK[4];
-};
-#endif
-
-#ifdef LTC_SKIPJACK 
-struct skipjack_key {
-    unsigned char key[10];
-};
-#endif
-
-#ifdef LTC_KHAZAD
-struct khazad_key {
-   ulong64 roundKeyEnc[8 + 1]; 
-   ulong64 roundKeyDec[8 + 1]; 
-};
-#endif
-
-#ifdef LTC_ANUBIS
-struct anubis_key { 
-   int keyBits; 
-   int R; 
-   ulong32 roundKeyEnc[18 + 1][4]; 
-   ulong32 roundKeyDec[18 + 1][4]; 
-}; 
-#endif
-
-#ifdef LTC_MULTI2
-struct multi2_key {
-    int N;
-    ulong32 uk[8];
-};
-#endif
-
-typedef union Symmetric_key {
-#ifdef LTC_DES
-   struct des_key des;
-   struct des3_key des3;
-#endif
-#ifdef LTC_RC2
-   struct rc2_key rc2;
-#endif
-#ifdef LTC_SAFER
-   struct safer_key safer;
-#endif
-#ifdef LTC_TWOFISH
-   struct twofish_key  twofish;
-#endif
-#ifdef LTC_BLOWFISH
-   struct blowfish_key blowfish;
-#endif
-#ifdef LTC_RC5
-   struct rc5_key      rc5;
-#endif
-#ifdef LTC_RC6
-   struct rc6_key      rc6;
-#endif
-#ifdef LTC_SAFERP
-   struct saferp_key   saferp;
-#endif
-#ifdef LTC_RIJNDAEL
-   struct rijndael_key rijndael;
-#endif
-#ifdef LTC_XTEA
-   struct xtea_key     xtea;
-#endif
-#ifdef LTC_CAST5
-   struct cast5_key    cast5;
-#endif
-#ifdef LTC_NOEKEON
-   struct noekeon_key  noekeon;
-#endif   
-#ifdef LTC_SKIPJACK
-   struct skipjack_key skipjack;
-#endif
-#ifdef LTC_KHAZAD
-   struct khazad_key   khazad;
-#endif
-#ifdef LTC_ANUBIS
-   struct anubis_key   anubis;
-#endif
-#ifdef LTC_KSEED
-   struct kseed_key    kseed;
-#endif
-#ifdef LTC_KASUMI
-   struct kasumi_key   kasumi;
-#endif  
-#ifdef LTC_MULTI2
-   struct multi2_key   multi2;
-#endif
-   void   *data;
-} symmetric_key;
-
-#ifdef LTC_ECB_MODE
-/** A block cipher ECB structure */
-typedef struct {
-   /** The index of the cipher chosen */
-   int                 cipher, 
-   /** The block size of the given cipher */
-                       blocklen;
-   /** The scheduled key */                       
-   symmetric_key       key;
-} symmetric_ECB;
-#endif
-
-#ifdef LTC_CFB_MODE
-/** A block cipher CFB structure */
-typedef struct {
-   /** The index of the cipher chosen */
-   int                 cipher, 
-   /** The block size of the given cipher */                        
-                       blocklen, 
-   /** The padding offset */
-                       padlen;
-   /** The current IV */
-   unsigned char       IV[MAXBLOCKSIZE], 
-   /** The pad used to encrypt/decrypt */ 
-                       pad[MAXBLOCKSIZE];
-   /** The scheduled key */
-   symmetric_key       key;
-} symmetric_CFB;
-#endif
-
-#ifdef LTC_OFB_MODE
-/** A block cipher OFB structure */
-typedef struct {
-   /** The index of the cipher chosen */
-   int                 cipher, 
-   /** The block size of the given cipher */                        
-                       blocklen, 
-   /** The padding offset */
-                       padlen;
-   /** The current IV */
-   unsigned char       IV[MAXBLOCKSIZE];
-   /** The scheduled key */
-   symmetric_key       key;
-} symmetric_OFB;
-#endif
-
-#ifdef LTC_CBC_MODE
-/** A block cipher CBC structure */
-typedef struct {
-   /** The index of the cipher chosen */
-   int                 cipher, 
-   /** The block size of the given cipher */                        
-                       blocklen;
-   /** The current IV */
-   unsigned char       IV[MAXBLOCKSIZE];
-   /** The scheduled key */
-   symmetric_key       key;
-} symmetric_CBC;
-#endif
-
-
-#ifdef LTC_CTR_MODE
-/** A block cipher CTR structure */
-typedef struct {
-   /** The index of the cipher chosen */
-   int                 cipher,
-   /** The block size of the given cipher */                        
-                       blocklen, 
-   /** The padding offset */
-                       padlen, 
-   /** The mode (endianess) of the CTR, 0==little, 1==big */
-                       mode,
-   /** counter width */
-                       ctrlen;
-
-   /** The counter */                       
-   unsigned char       ctr[MAXBLOCKSIZE], 
-   /** The pad used to encrypt/decrypt */                       
-                       pad[MAXBLOCKSIZE];
-   /** The scheduled key */
-   symmetric_key       key;
-} symmetric_CTR;
-#endif
-
-
-#ifdef LTC_LRW_MODE
-/** A LRW structure */
-typedef struct {
-    /** The index of the cipher chosen (must be a 128-bit block cipher) */
-    int               cipher;
-
-    /** The current IV */
-    unsigned char     IV[16],
- 
-    /** the tweak key */
-                      tweak[16],
-
-    /** The current pad, it's the product of the first 15 bytes against the tweak key */
-                      pad[16];
-
-    /** The scheduled symmetric key */
-    symmetric_key     key;
-
-#ifdef LRW_TABLES
-    /** The pre-computed multiplication table */
-    unsigned char     PC[16][256][16];
-#endif
-} symmetric_LRW;
-#endif
-
-#ifdef LTC_F8_MODE
-/** A block cipher F8 structure */
-typedef struct {
-   /** The index of the cipher chosen */
-   int                 cipher, 
-   /** The block size of the given cipher */                        
-                       blocklen, 
-   /** The padding offset */
-                       padlen;
-   /** The current IV */
-   unsigned char       IV[MAXBLOCKSIZE],
-                       MIV[MAXBLOCKSIZE];
-   /** Current block count */
-   ulong32             blockcnt;
-   /** The scheduled key */
-   symmetric_key       key;
-} symmetric_F8;
-#endif
-
-
-/** cipher descriptor table, last entry has "name == NULL" to mark the end of table */
-extern struct ltc_cipher_descriptor {
-   /** name of cipher */
-   char *name;
-   /** internal ID */
-   unsigned char ID;
-   /** min keysize (octets) */
-   int  min_key_length, 
-   /** max keysize (octets) */
-        max_key_length, 
-   /** block size (octets) */
-        block_length, 
-   /** default number of rounds */
-        default_rounds;
-   /** Setup the cipher 
-      @param key         The input symmetric key
-      @param keylen      The length of the input key (octets)
-      @param num_rounds  The requested number of rounds (0==default)
-      @param skey        [out] The destination of the scheduled key
-      @return CRYPT_OK if successful
-   */
-   int  (*setup)(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-   /** Encrypt a block
-      @param pt      The plaintext
-      @param ct      [out] The ciphertext
-      @param skey    The scheduled key
-      @return CRYPT_OK if successful
-   */
-   int (*ecb_encrypt)(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-   /** Decrypt a block
-      @param ct      The ciphertext
-      @param pt      [out] The plaintext
-      @param skey    The scheduled key
-      @return CRYPT_OK if successful
-   */
-   int (*ecb_decrypt)(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-   /** Test the block cipher
-       @return CRYPT_OK if successful, CRYPT_NOP if self-testing has been disabled
-   */
-   int (*test)(void);
-
-   /** Terminate the context 
-      @param skey    The scheduled key
-   */
-   void (*done)(symmetric_key *skey);      
-
-   /** Determine a key size
-       @param keysize    [in/out] The size of the key desired and the suggested size
-       @return CRYPT_OK if successful
-   */
-   int  (*keysize)(int *keysize);
-
-/** Accelerators **/
-   /** Accelerated ECB encryption 
-       @param pt      Plaintext
-       @param ct      Ciphertext
-       @param blocks  The number of complete blocks to process
-       @param skey    The scheduled key context
-       @return CRYPT_OK if successful
-   */
-   int (*accel_ecb_encrypt)(const unsigned char *pt, unsigned char *ct, unsigned long blocks, symmetric_key *skey);
-
-   /** Accelerated ECB decryption 
-       @param pt      Plaintext
-       @param ct      Ciphertext
-       @param blocks  The number of complete blocks to process
-       @param skey    The scheduled key context
-       @return CRYPT_OK if successful
-   */
-   int (*accel_ecb_decrypt)(const unsigned char *ct, unsigned char *pt, unsigned long blocks, symmetric_key *skey);
-
-   /** Accelerated CBC encryption 
-       @param pt      Plaintext
-       @param ct      Ciphertext
-       @param blocks  The number of complete blocks to process
-       @param IV      The initial value (input/output)
-       @param skey    The scheduled key context
-       @return CRYPT_OK if successful
-   */
-   int (*accel_cbc_encrypt)(const unsigned char *pt, unsigned char *ct, unsigned long blocks, unsigned char *IV, symmetric_key *skey);
-
-   /** Accelerated CBC decryption 
-       @param pt      Plaintext
-       @param ct      Ciphertext
-       @param blocks  The number of complete blocks to process
-       @param IV      The initial value (input/output)
-       @param skey    The scheduled key context
-       @return CRYPT_OK if successful
-   */
-   int (*accel_cbc_decrypt)(const unsigned char *ct, unsigned char *pt, unsigned long blocks, unsigned char *IV, symmetric_key *skey);
-
-   /** Accelerated CTR encryption 
-       @param pt      Plaintext
-       @param ct      Ciphertext
-       @param blocks  The number of complete blocks to process
-       @param IV      The initial value (input/output)
-       @param mode    little or big endian counter (mode=0 or mode=1)
-       @param skey    The scheduled key context
-       @return CRYPT_OK if successful
-   */
-   int (*accel_ctr_encrypt)(const unsigned char *pt, unsigned char *ct, unsigned long blocks, unsigned char *IV, int mode, symmetric_key *skey);
-
-   /** Accelerated LRW 
-       @param pt      Plaintext
-       @param ct      Ciphertext
-       @param blocks  The number of complete blocks to process
-       @param IV      The initial value (input/output)
-       @param tweak   The LRW tweak
-       @param skey    The scheduled key context
-       @return CRYPT_OK if successful
-   */
-   int (*accel_lrw_encrypt)(const unsigned char *pt, unsigned char *ct, unsigned long blocks, unsigned char *IV, const unsigned char *tweak, symmetric_key *skey);
-
-   /** Accelerated LRW 
-       @param ct      Ciphertext
-       @param pt      Plaintext
-       @param blocks  The number of complete blocks to process
-       @param IV      The initial value (input/output)
-       @param tweak   The LRW tweak
-       @param skey    The scheduled key context
-       @return CRYPT_OK if successful
-   */
-   int (*accel_lrw_decrypt)(const unsigned char *ct, unsigned char *pt, unsigned long blocks, unsigned char *IV, const unsigned char *tweak, symmetric_key *skey);
-
-   /** Accelerated CCM packet (one-shot)
-       @param key        The secret key to use
-       @param keylen     The length of the secret key (octets)
-       @param uskey      A previously scheduled key [optional can be NULL]
-       @param nonce      The session nonce [use once]
-       @param noncelen   The length of the nonce
-       @param header     The header for the session
-       @param headerlen  The length of the header (octets)
-       @param pt         [out] The plaintext
-       @param ptlen      The length of the plaintext (octets)
-       @param ct         [out] The ciphertext
-       @param tag        [out] The destination tag
-       @param taglen     [in/out] The max size and resulting size of the authentication tag
-       @param direction  Encrypt or Decrypt direction (0 or 1)
-       @return CRYPT_OK if successful
-   */
-   int (*accel_ccm_memory)(
-       const unsigned char *key,    unsigned long keylen,
-       symmetric_key       *uskey,
-       const unsigned char *nonce,  unsigned long noncelen,
-       const unsigned char *header, unsigned long headerlen,
-             unsigned char *pt,     unsigned long ptlen,
-             unsigned char *ct,
-             unsigned char *tag,    unsigned long *taglen,
-                       int  direction);
-
-   /** Accelerated GCM packet (one shot)
-       @param key        The secret key
-       @param keylen     The length of the secret key
-       @param IV         The initial vector 
-       @param IVlen      The length of the initial vector
-       @param adata      The additional authentication data (header)
-       @param adatalen   The length of the adata
-       @param pt         The plaintext
-       @param ptlen      The length of the plaintext (ciphertext length is the same)
-       @param ct         The ciphertext
-       @param tag        [out] The MAC tag
-       @param taglen     [in/out] The MAC tag length
-       @param direction  Encrypt or Decrypt mode (GCM_ENCRYPT or GCM_DECRYPT)
-       @return CRYPT_OK on success
-   */
-   int (*accel_gcm_memory)(
-       const unsigned char *key,    unsigned long keylen,
-       const unsigned char *IV,     unsigned long IVlen,
-       const unsigned char *adata,  unsigned long adatalen,
-             unsigned char *pt,     unsigned long ptlen,
-             unsigned char *ct, 
-             unsigned char *tag,    unsigned long *taglen,
-                       int direction);
-
-   /** Accelerated one shot LTC_OMAC 
-       @param key            The secret key
-       @param keylen         The key length (octets) 
-       @param in             The message 
-       @param inlen          Length of message (octets)
-       @param out            [out] Destination for tag
-       @param outlen         [in/out] Initial and final size of out
-       @return CRYPT_OK on success
-   */
-   int (*omac_memory)(
-       const unsigned char *key, unsigned long keylen,
-       const unsigned char *in,  unsigned long inlen,
-             unsigned char *out, unsigned long *outlen);
-
-   /** Accelerated one shot XCBC 
-       @param key            The secret key
-       @param keylen         The key length (octets) 
-       @param in             The message 
-       @param inlen          Length of message (octets)
-       @param out            [out] Destination for tag
-       @param outlen         [in/out] Initial and final size of out
-       @return CRYPT_OK on success
-   */
-   int (*xcbc_memory)(
-       const unsigned char *key, unsigned long keylen,
-       const unsigned char *in,  unsigned long inlen,
-             unsigned char *out, unsigned long *outlen);
-
-   /** Accelerated one shot F9 
-       @param key            The secret key
-       @param keylen         The key length (octets) 
-       @param in             The message 
-       @param inlen          Length of message (octets)
-       @param out            [out] Destination for tag
-       @param outlen         [in/out] Initial and final size of out
-       @return CRYPT_OK on success
-       @remark Requires manual padding
-   */
-   int (*f9_memory)(
-       const unsigned char *key, unsigned long keylen,
-       const unsigned char *in,  unsigned long inlen,
-             unsigned char *out, unsigned long *outlen);
-} cipher_descriptor[];
-
-#ifdef LTC_BLOWFISH
-int blowfish_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int blowfish_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int blowfish_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int blowfish_test(void);
-void blowfish_done(symmetric_key *skey);
-int blowfish_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor blowfish_desc;
-#endif
-
-#ifdef LTC_RC5
-int rc5_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int rc5_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int rc5_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int rc5_test(void);
-void rc5_done(symmetric_key *skey);
-int rc5_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor rc5_desc;
-#endif
-
-#ifdef LTC_RC6
-int rc6_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int rc6_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int rc6_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int rc6_test(void);
-void rc6_done(symmetric_key *skey);
-int rc6_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor rc6_desc;
-#endif
-
-#ifdef LTC_RC2
-int rc2_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int rc2_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int rc2_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int rc2_test(void);
-void rc2_done(symmetric_key *skey);
-int rc2_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor rc2_desc;
-#endif
-
-#ifdef LTC_SAFERP
-int saferp_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int saferp_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int saferp_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int saferp_test(void);
-void saferp_done(symmetric_key *skey);
-int saferp_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor saferp_desc;
-#endif
-
-#ifdef LTC_SAFER
-int safer_k64_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int safer_sk64_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int safer_k128_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int safer_sk128_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int safer_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *key);
-int safer_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *key);
-int safer_k64_test(void);
-int safer_sk64_test(void);
-int safer_sk128_test(void);
-void safer_done(symmetric_key *skey);
-int safer_64_keysize(int *keysize);
-int safer_128_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor safer_k64_desc, safer_k128_desc, safer_sk64_desc, safer_sk128_desc;
-#endif
-
-#ifdef LTC_RIJNDAEL
-
-/* make aes an alias */
-#define aes_setup           rijndael_setup
-#define aes_ecb_encrypt     rijndael_ecb_encrypt
-#define aes_ecb_decrypt     rijndael_ecb_decrypt
-#define aes_test            rijndael_test
-#define aes_done            rijndael_done
-#define aes_keysize         rijndael_keysize
-
-#define aes_enc_setup           rijndael_enc_setup
-#define aes_enc_ecb_encrypt     rijndael_enc_ecb_encrypt
-#define aes_enc_keysize         rijndael_enc_keysize
-
-int rijndael_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int rijndael_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int rijndael_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int rijndael_test(void);
-void rijndael_done(symmetric_key *skey);
-int rijndael_keysize(int *keysize);
-int rijndael_enc_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int rijndael_enc_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-void rijndael_enc_done(symmetric_key *skey);
-int rijndael_enc_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor rijndael_desc, aes_desc;
-extern const struct ltc_cipher_descriptor rijndael_enc_desc, aes_enc_desc;
-#endif
-
-#ifdef LTC_XTEA
-int xtea_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int xtea_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int xtea_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int xtea_test(void);
-void xtea_done(symmetric_key *skey);
-int xtea_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor xtea_desc;
-#endif
-
-#ifdef LTC_TWOFISH
-int twofish_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int twofish_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int twofish_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int twofish_test(void);
-void twofish_done(symmetric_key *skey);
-int twofish_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor twofish_desc;
-#endif
-
-#ifdef LTC_DES
-int des_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int des_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int des_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int des_test(void);
-void des_done(symmetric_key *skey);
-int des_keysize(int *keysize);
-int des3_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int des3_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int des3_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int des3_test(void);
-void des3_done(symmetric_key *skey);
-int des3_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor des_desc, des3_desc;
-#endif
-
-#ifdef LTC_CAST5
-int cast5_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int cast5_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int cast5_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int cast5_test(void);
-void cast5_done(symmetric_key *skey);
-int cast5_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor cast5_desc;
-#endif
-
-#ifdef LTC_NOEKEON
-int noekeon_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int noekeon_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int noekeon_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int noekeon_test(void);
-void noekeon_done(symmetric_key *skey);
-int noekeon_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor noekeon_desc;
-#endif
-
-#ifdef LTC_SKIPJACK
-int skipjack_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int skipjack_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int skipjack_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int skipjack_test(void);
-void skipjack_done(symmetric_key *skey);
-int skipjack_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor skipjack_desc;
-#endif
-
-#ifdef LTC_KHAZAD
-int khazad_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int khazad_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int khazad_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int khazad_test(void);
-void khazad_done(symmetric_key *skey);
-int khazad_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor khazad_desc;
-#endif
-
-#ifdef LTC_ANUBIS
-int anubis_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int anubis_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int anubis_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int anubis_test(void);
-void anubis_done(symmetric_key *skey);
-int anubis_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor anubis_desc;
-#endif
-
-#ifdef LTC_KSEED
-int kseed_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int kseed_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int kseed_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int kseed_test(void);
-void kseed_done(symmetric_key *skey);
-int kseed_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor kseed_desc;
-#endif
-
-#ifdef LTC_KASUMI
-int kasumi_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int kasumi_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int kasumi_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int kasumi_test(void);
-void kasumi_done(symmetric_key *skey);
-int kasumi_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor kasumi_desc;
-#endif
-
-
-#ifdef LTC_MULTI2
-int multi2_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
-int multi2_ecb_encrypt(const unsigned char *pt, unsigned char *ct, symmetric_key *skey);
-int multi2_ecb_decrypt(const unsigned char *ct, unsigned char *pt, symmetric_key *skey);
-int multi2_test(void);
-void multi2_done(symmetric_key *skey);
-int multi2_keysize(int *keysize);
-extern const struct ltc_cipher_descriptor multi2_desc;
-#endif
-
-#ifdef LTC_ECB_MODE
-int ecb_start(int cipher, const unsigned char *key, 
-              int keylen, int num_rounds, symmetric_ECB *ecb);
-int ecb_encrypt(const unsigned char *pt, unsigned char *ct, unsigned long len, symmetric_ECB *ecb);
-int ecb_decrypt(const unsigned char *ct, unsigned char *pt, unsigned long len, symmetric_ECB *ecb);
-int ecb_done(symmetric_ECB *ecb);
-#endif
-
-#ifdef LTC_CFB_MODE
-int cfb_start(int cipher, const unsigned char *IV, const unsigned char *key, 
-              int keylen, int num_rounds, symmetric_CFB *cfb);
-int cfb_encrypt(const unsigned char *pt, unsigned char *ct, unsigned long len, symmetric_CFB *cfb);
-int cfb_decrypt(const unsigned char *ct, unsigned char *pt, unsigned long len, symmetric_CFB *cfb);
-int cfb_getiv(unsigned char *IV, unsigned long *len, symmetric_CFB *cfb);
-int cfb_setiv(const unsigned char *IV, unsigned long len, symmetric_CFB *cfb);
-int cfb_done(symmetric_CFB *cfb);
-#endif
-
-#ifdef LTC_OFB_MODE
-int ofb_start(int cipher, const unsigned char *IV, const unsigned char *key, 
-              int keylen, int num_rounds, symmetric_OFB *ofb);
-int ofb_encrypt(const unsigned char *pt, unsigned char *ct, unsigned long len, symmetric_OFB *ofb);
-int ofb_decrypt(const unsigned char *ct, unsigned char *pt, unsigned long len, symmetric_OFB *ofb);
-int ofb_getiv(unsigned char *IV, unsigned long *len, symmetric_OFB *ofb);
-int ofb_setiv(const unsigned char *IV, unsigned long len, symmetric_OFB *ofb);
-int ofb_done(symmetric_OFB *ofb);
-#endif
-
-#ifdef LTC_CBC_MODE
-int cbc_start(int cipher, const unsigned char *IV, const unsigned char *key,
-               int keylen, int num_rounds, symmetric_CBC *cbc);
-int cbc_encrypt(const unsigned char *pt, unsigned char *ct, unsigned long len, symmetric_CBC *cbc);
-int cbc_decrypt(const unsigned char *ct, unsigned char *pt, unsigned long len, symmetric_CBC *cbc);
-int cbc_getiv(unsigned char *IV, unsigned long *len, symmetric_CBC *cbc);
-int cbc_setiv(const unsigned char *IV, unsigned long len, symmetric_CBC *cbc);
-int cbc_done(symmetric_CBC *cbc);
-#endif
-
-#ifdef LTC_CTR_MODE
-
-#define CTR_COUNTER_LITTLE_ENDIAN    0x0000
-#define CTR_COUNTER_BIG_ENDIAN       0x1000
-#define LTC_CTR_RFC3686              0x2000
-
-int ctr_start(               int   cipher,
-              const unsigned char *IV,
-              const unsigned char *key,       int keylen,
-                             int  num_rounds, int ctr_mode,
-                   symmetric_CTR *ctr);
-int ctr_encrypt(const unsigned char *pt, unsigned char *ct, unsigned long len, symmetric_CTR *ctr);
-int ctr_decrypt(const unsigned char *ct, unsigned char *pt, unsigned long len, symmetric_CTR *ctr);
-int ctr_getiv(unsigned char *IV, unsigned long *len, symmetric_CTR *ctr);
-int ctr_setiv(const unsigned char *IV, unsigned long len, symmetric_CTR *ctr);
-int ctr_done(symmetric_CTR *ctr);
-int ctr_test(void);
-#endif
-
-#ifdef LTC_LRW_MODE
-
-#define LRW_ENCRYPT 0
-#define LRW_DECRYPT 1
-
-int lrw_start(               int   cipher,
-              const unsigned char *IV,
-              const unsigned char *key,       int keylen,
-              const unsigned char *tweak,
-                             int  num_rounds, 
-                   symmetric_LRW *lrw);
-int lrw_encrypt(const unsigned char *pt, unsigned char *ct, unsigned long len, symmetric_LRW *lrw);
-int lrw_decrypt(const unsigned char *ct, unsigned char *pt, unsigned long len, symmetric_LRW *lrw);
-int lrw_getiv(unsigned char *IV, unsigned long *len, symmetric_LRW *lrw);
-int lrw_setiv(const unsigned char *IV, unsigned long len, symmetric_LRW *lrw);
-int lrw_done(symmetric_LRW *lrw);
-int lrw_test(void);
-
-/* don't call */
-int lrw_process(const unsigned char *pt, unsigned char *ct, unsigned long len, int mode, symmetric_LRW *lrw);
-#endif    
-
-#ifdef LTC_F8_MODE
-int f8_start(                int  cipher, const unsigned char *IV, 
-             const unsigned char *key,                    int  keylen, 
-             const unsigned char *salt_key,               int  skeylen,
-                             int  num_rounds,   symmetric_F8  *f8);
-int f8_encrypt(const unsigned char *pt, unsigned char *ct, unsigned long len, symmetric_F8 *f8);
-int f8_decrypt(const unsigned char *ct, unsigned char *pt, unsigned long len, symmetric_F8 *f8);
-int f8_getiv(unsigned char *IV, unsigned long *len, symmetric_F8 *f8);
-int f8_setiv(const unsigned char *IV, unsigned long len, symmetric_F8 *f8);
-int f8_done(symmetric_F8 *f8);
-int f8_test_mode(void);
-#endif
-
-#ifdef LTC_XTS_MODE
-typedef struct {
-   symmetric_key  key1, key2;
-   int            cipher;
-} symmetric_xts;
-
-int xts_start(                int  cipher,
-              const unsigned char *key1, 
-              const unsigned char *key2, 
-                    unsigned long  keylen,
-                              int  num_rounds, 
-                    symmetric_xts *xts);
-
-int xts_encrypt(
-   const unsigned char *pt, unsigned long ptlen,
-         unsigned char *ct,
-   const unsigned char *tweak,
-         symmetric_xts *xts);
-int xts_decrypt(
-   const unsigned char *ct, unsigned long ptlen,
-         unsigned char *pt,
-   const unsigned char *tweak,
-         symmetric_xts *xts);
-
-void xts_done(symmetric_xts *xts);
-int  xts_test(void);
-void xts_mult_x(unsigned char *I);
-#endif
-
-int find_cipher(const char *name);
-int find_cipher_any(const char *name, int blocklen, int keylen);
-int find_cipher_id(unsigned char ID);
-int register_cipher(const struct ltc_cipher_descriptor *cipher);
-int unregister_cipher(const struct ltc_cipher_descriptor *cipher);
-int cipher_is_valid(int idx);
-
-LTC_MUTEX_PROTO(ltc_cipher_mutex)
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_cipher.h,v $ */
-/* $Revision: 1.54 $ */
-/* $Date: 2007/05/12 14:37:41 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_custom.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_custom.h
deleted file mode 100644
index 88ec8f984..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_custom.h
+++ /dev/null
@@ -1,424 +0,0 @@
-#ifndef TOMCRYPT_CUSTOM_H_
-#define TOMCRYPT_CUSTOM_H_
-
-#define LTC_NO_CIPHERS
-#define LTC_NO_HASHES
-#define LTC_NO_MACS
-#define LTC_NO_PRNGS
-#define LTC_NO_CURVES
-#define LTC_NO_MODES
-#define LTC_NO_PKCS
-#define LTC_NO_ROLC
-
-#define LTC_SOURCE
-#define LTC_SHA1
-#define LTC_MD5
-#define LTC_DER
-#define LTC_RC4
-
-#define USE_LTM
-#define LTM_DESC
-
-/* macros for various libc functions you can change for embedded targets */
-#ifndef XMALLOC
-   #ifdef malloc 
-   #define LTC_NO_PROTOTYPES
-   #endif
-#define XMALLOC  LibTomMalloc
-#endif
-#ifndef XREALLOC
-   #ifdef realloc 
-   #define LTC_NO_PROTOTYPES
-   #endif
-#define XREALLOC LibTomRealloc
-#endif
-#ifndef XCALLOC
-   #ifdef calloc 
-   #define LTC_NO_PROTOTYPES
-   #endif
-#define XCALLOC  LibTomCalloc
-#endif
-#ifndef XFREE
-   #ifdef free
-   #define LTC_NO_PROTOTYPES
-   #endif
-#define XFREE    LibTomFree
-#endif
-
-#ifndef XMEMSET
-   #ifdef memset
-   #define LTC_NO_PROTOTYPES
-   #endif
-#define XMEMSET  memset
-#endif
-#ifndef XMEMCPY
-   #ifdef memcpy
-   #define LTC_NO_PROTOTYPES
-   #endif
-#define XMEMCPY  memcpy
-#endif
-#ifndef XMEMCMP
-   #ifdef memcmp 
-   #define LTC_NO_PROTOTYPES
-   #endif
-#define XMEMCMP  memcmp
-#endif
-#ifndef XSTRCMP
-   #ifdef strcmp
-   #define LTC_NO_PROTOTYPES
-   #endif
-#define XSTRCMP strcmp
-#endif
-
-#ifndef XCLOCK
-#define XCLOCK   LibTomClock
-#endif
-#ifndef XCLOCKS_PER_SEC
-#define XCLOCKS_PER_SEC CLOCKS_PER_SEC
-#endif
-
-#ifndef XQSORT
-   #ifdef qsort
-   #define LTC_NO_PROTOTYPES
-   #endif
-#define XQSORT LibTomQsort
-#endif
-
-/* Easy button? */
-#ifdef LTC_EASY
-   #define LTC_NO_CIPHERS
-   #define LTC_RIJNDAEL
-   #define LTC_BLOWFISH
-   #define LTC_DES
-   #define LTC_CAST5
-   
-   #define LTC_NO_MODES
-   #define LTC_ECB_MODE
-   #define LTC_CBC_MODE
-   #define LTC_CTR_MODE
-   
-   #define LTC_NO_HASHES
-   #define LTC_SHA1
-   #define LTC_SHA512
-   #define LTC_SHA384
-   #define LTC_SHA256
-   #define LTC_SHA224
-   
-   #define LTC_NO_MACS
-   #define LTC_HMAC
-   #define LTC_OMAC
-   #define LTC_CCM_MODE
-
-   #define LTC_NO_PRNGS
-   #define LTC_SPRNG
-   #define LTC_YARROW
-   #define LTC_DEVRANDOM
-   #define TRY_URANDOM_FIRST
-      
-   #define LTC_NO_PK
-   #define LTC_MRSA
-   #define LTC_MECC
-#endif   
-
-/* Use small code where possible */
-/* #define LTC_SMALL_CODE */
-
-/* Enable self-test test vector checking */
-#ifndef LTC_NO_TEST
-   #define LTC_TEST
-#endif
-
-/* clean the stack of functions which put private information on stack */
-/* #define LTC_CLEAN_STACK */
-
-/* disable all file related functions */
-/* #define LTC_NO_FILE */
-
-/* disable all forms of ASM */
-/* #define LTC_NO_ASM */
-
-/* disable FAST mode */
-/* #define LTC_NO_FAST */
-
-/* disable BSWAP on x86 */
-/* #define LTC_NO_BSWAP */
-
-/* ---> Symmetric Block Ciphers <--- */
-#ifndef LTC_NO_CIPHERS
-
-#define LTC_BLOWFISH
-#define LTC_RC2
-#define LTC_RC5
-#define LTC_RC6
-#define LTC_SAFERP
-#define LTC_RIJNDAEL
-#define LTC_XTEA
-/* _TABLES tells it to use tables during setup, _SMALL means to use the smaller scheduled key format
- * (saves 4KB of ram), _ALL_TABLES enables all tables during setup */
-#define LTC_TWOFISH
-#ifndef LTC_NO_TABLES
-   #define LTC_TWOFISH_TABLES
-   /* #define LTC_TWOFISH_ALL_TABLES */
-#else
-   #define LTC_TWOFISH_SMALL
-#endif
-/* #define LTC_TWOFISH_SMALL */
-/* LTC_DES includes EDE triple-LTC_DES */
-#define LTC_DES
-#define LTC_CAST5
-#define LTC_NOEKEON
-#define LTC_SKIPJACK
-#define LTC_SAFER
-#define LTC_KHAZAD
-#define LTC_ANUBIS
-#define LTC_ANUBIS_TWEAK
-#define LTC_KSEED
-#define LTC_KASUMI
-
-#endif /* LTC_NO_CIPHERS */
-
-
-/* ---> Block Cipher Modes of Operation <--- */
-#ifndef LTC_NO_MODES
-
-#define LTC_CFB_MODE
-#define LTC_OFB_MODE
-#define LTC_ECB_MODE
-#define LTC_CBC_MODE
-#define LTC_CTR_MODE
-
-/* F8 chaining mode */
-#define LTC_F8_MODE
-
-/* LRW mode */
-#define LTC_LRW_MODE
-#ifndef LTC_NO_TABLES
-   /* like GCM mode this will enable 16 8x128 tables [64KB] that make
-    * seeking very fast.  
-    */
-   #define LRW_TABLES
-#endif
-
-/* XTS mode */
-#define LTC_XTS_MODE
-
-#endif /* LTC_NO_MODES */
-
-/* ---> One-Way Hash Functions <--- */
-#ifndef LTC_NO_HASHES 
-
-#define LTC_CHC_HASH
-#define LTC_WHIRLPOOL
-#define LTC_SHA512
-#define LTC_SHA384
-#define LTC_SHA256
-#define LTC_SHA224
-#define LTC_TIGER
-#define LTC_SHA1
-#define LTC_MD5
-#define LTC_MD4
-#define LTC_MD2
-#define LTC_RIPEMD128
-#define LTC_RIPEMD160
-#define LTC_RIPEMD256
-#define LTC_RIPEMD320
-
-#endif /* LTC_NO_HASHES */
-
-/* ---> MAC functions <--- */
-#ifndef LTC_NO_MACS
-
-#define LTC_HMAC
-#define LTC_OMAC
-#define LTC_PMAC
-#define LTC_XCBC
-#define LTC_F9_MODE
-#define LTC_PELICAN
-
-#if defined(LTC_PELICAN) && !defined(LTC_RIJNDAEL)
-   #error Pelican-MAC requires LTC_RIJNDAEL
-#endif
-
-/* ---> Encrypt + Authenticate Modes <--- */
-
-#define LTC_EAX_MODE
-#if defined(LTC_EAX_MODE) && !(defined(LTC_CTR_MODE) && defined(LTC_OMAC))
-   #error LTC_EAX_MODE requires CTR and LTC_OMAC mode
-#endif
-
-#define LTC_OCB_MODE
-#define LTC_CCM_MODE
-#define LTC_GCM_MODE
-
-/* Use 64KiB tables */
-#ifndef LTC_NO_TABLES
-   #define LTC_GCM_TABLES 
-#endif
-
-/* USE SSE2? requires GCC works on x86_32 and x86_64*/
-#ifdef LTC_GCM_TABLES
-/* #define LTC_GCM_TABLES_SSE2 */
-#endif
-
-#endif /* LTC_NO_MACS */
-
-/* Various tidbits of modern neatoness */
-#define LTC_BASE64
-
-/* --> Pseudo Random Number Generators <--- */
-#ifndef LTC_NO_PRNGS
-
-/* Yarrow */
-#define LTC_YARROW
-/* which descriptor of AES to use?  */
-/* 0 = rijndael_enc 1 = aes_enc, 2 = rijndael [full], 3 = aes [full] */
-#define LTC_YARROW_AES 0
-
-#if defined(LTC_YARROW) && !defined(LTC_CTR_MODE)
-   #error LTC_YARROW requires LTC_CTR_MODE chaining mode to be defined!
-#endif
-
-/* a PRNG that simply reads from an available system source */
-#define LTC_SPRNG
-
-/* The LTC_RC4 stream cipher */
-#define LTC_RC4
-
-/* Fortuna PRNG */
-#define LTC_FORTUNA
-/* reseed every N calls to the read function */
-#define LTC_FORTUNA_WD    10
-/* number of pools (4..32) can save a bit of ram by lowering the count */
-#define LTC_FORTUNA_POOLS 32
-
-/* Greg's LTC_SOBER128 PRNG ;-0 */
-#define LTC_SOBER128
-
-/* the *nix style /dev/random device */
-#define LTC_DEVRANDOM
-/* try /dev/urandom before trying /dev/random */
-#define TRY_URANDOM_FIRST
-
-#endif /* LTC_NO_PRNGS */
-
-/* ---> math provider? <--- */
-#ifndef LTC_NO_MATH
-
-/* LibTomMath */
-#define LTM_LTC_DESC
-
-/* TomsFastMath */
-//#define TFM_LTC_DESC
-
-#endif /* LTC_NO_MATH */
-
-/* ---> Public Key Crypto <--- */
-#ifndef LTC_NO_PK
-
-/* Include RSA support */
-#define LTC_MRSA
-
-/* Include Katja (a Rabin variant like RSA) */
-/* #define MKAT */ 
-
-/* Digital Signature Algorithm */
-#define LTC_MDSA
-
-/* ECC */
-#define LTC_MECC
-
-/* use Shamir's trick for point mul (speeds up signature verification) */
-#define LTC_ECC_SHAMIR
-
-#if defined(TFM_LTC_DESC) && defined(LTC_MECC)
-   #define LTC_MECC_ACCEL
-#endif   
-
-/* do we want fixed point ECC */
-/* #define LTC_MECC_FP */
-
-/* Timing Resistant? */
-/* #define LTC_ECC_TIMING_RESISTANT */
-
-#endif /* LTC_NO_PK */
-
-/* LTC_PKCS #1 (RSA) and #5 (Password Handling) stuff */
-#ifndef LTC_NO_PKCS
-
-#define LTC_PKCS_1
-#define LTC_PKCS_5
-
-/* Include ASN.1 DER (required by DSA/RSA) */
-#define LTC_DER
-
-#endif /* LTC_NO_PKCS */
-
-/* cleanup */
-
-#ifdef LTC_MECC
-/* Supported ECC Key Sizes */
-#ifndef LTC_NO_CURVES
-   #define ECC112
-   #define ECC128
-   #define ECC160
-   #define ECC192
-   #define ECC224
-   #define ECC256
-   #define ECC384
-   #define ECC521
-#endif
-#endif
-
-#if defined(LTC_MECC) || defined(LTC_MRSA) || defined(LTC_MDSA) || defined(MKATJA)
-   /* Include the MPI functionality?  (required by the PK algorithms) */
-   #define MPI
-#endif
-
-#ifdef LTC_MRSA
-   #define LTC_PKCS_1
-#endif   
-
-#if defined(LTC_DER) && !defined(MPI) 
-   #error ASN.1 DER requires MPI functionality
-#endif
-
-#if (defined(LTC_MDSA) || defined(LTC_MRSA) || defined(LTC_MECC) || defined(MKATJA)) && !defined(LTC_DER)
-   #error PK requires ASN.1 DER functionality, make sure LTC_DER is enabled
-#endif
-
-/* THREAD management */
-#ifdef LTC_PTHREAD
-
-#include <pthread.h>
-
-#define LTC_MUTEX_GLOBAL(x)   pthread_mutex_t x = PTHREAD_MUTEX_INITIALIZER;
-#define LTC_MUTEX_PROTO(x)    extern pthread_mutex_t x;
-#define LTC_MUTEX_TYPE(x)     pthread_mutex_t x;
-#define LTC_MUTEX_INIT(x)     pthread_mutex_init(x, NULL);
-#define LTC_MUTEX_LOCK(x)     pthread_mutex_lock(x);
-#define LTC_MUTEX_UNLOCK(x)   pthread_mutex_unlock(x);
-
-#else
-
-/* default no functions */
-#define LTC_MUTEX_GLOBAL(x)
-#define LTC_MUTEX_PROTO(x)
-#define LTC_MUTEX_TYPE(x)
-#define LTC_MUTEX_INIT(x)
-#define LTC_MUTEX_LOCK(x)
-#define LTC_MUTEX_UNLOCK(x)
-
-#endif
-
-/* Debuggers */
-
-/* define this if you use Valgrind, note: it CHANGES the way SOBER-128 and LTC_RC4 work (see the code) */
-/* #define LTC_VALGRIND */
-
-#endif
-
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_custom.h,v $ */
-/* $Revision: 1.73 $ */
-/* $Date: 2007/05/12 14:37:41 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_hash.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_hash.h
deleted file mode 100644
index 18553ebf9..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_hash.h
+++ /dev/null
@@ -1,378 +0,0 @@
-/* ---- HASH FUNCTIONS ---- */
-#ifdef LTC_SHA512
-struct sha512_state {
-    ulong64  length, state[8];
-    unsigned long curlen;
-    unsigned char buf[128];
-};
-#endif
-
-#ifdef LTC_SHA256
-struct sha256_state {
-    ulong64 length;
-    ulong32 state[8], curlen;
-    unsigned char buf[64];
-};
-#endif
-
-#ifdef LTC_SHA1
-struct sha1_state {
-    ulong64 length;
-    ulong32 state[5], curlen;
-    unsigned char buf[64];
-};
-#endif
-
-#ifdef LTC_MD5
-struct md5_state {
-    ulong64 length;
-    ulong32 state[4], curlen;
-    unsigned char buf[64];
-};
-#endif
-
-#ifdef LTC_MD4
-struct md4_state {
-    ulong64 length;
-    ulong32 state[4], curlen;
-    unsigned char buf[64];
-};
-#endif
-
-#ifdef LTC_TIGER
-struct tiger_state {
-    ulong64 state[3], length;
-    unsigned long curlen;
-    unsigned char buf[64];
-};
-#endif
-
-#ifdef LTC_MD2
-struct md2_state {
-    unsigned char chksum[16], X[48], buf[16];
-    unsigned long curlen;
-};
-#endif
-
-#ifdef LTC_RIPEMD128
-struct rmd128_state {
-    ulong64 length;
-    unsigned char buf[64];
-    ulong32 curlen, state[4];
-};
-#endif
-
-#ifdef LTC_RIPEMD160
-struct rmd160_state {
-    ulong64 length;
-    unsigned char buf[64];
-    ulong32 curlen, state[5];
-};
-#endif
-
-#ifdef LTC_RIPEMD256
-struct rmd256_state {
-    ulong64 length;
-    unsigned char buf[64];
-    ulong32 curlen, state[8];
-};
-#endif
-
-#ifdef LTC_RIPEMD320
-struct rmd320_state {
-    ulong64 length;
-    unsigned char buf[64];
-    ulong32 curlen, state[10];
-};
-#endif
-
-#ifdef LTC_WHIRLPOOL
-struct whirlpool_state {
-    ulong64 length, state[8];
-    unsigned char buf[64];
-    ulong32 curlen;
-};
-#endif
-
-#ifdef LTC_CHC_HASH
-struct chc_state {
-    ulong64 length;
-    unsigned char state[MAXBLOCKSIZE], buf[MAXBLOCKSIZE];
-    ulong32 curlen;
-};
-#endif
-
-typedef union Hash_state {
-#ifdef LTC_CHC_HASH
-    struct chc_state chc;
-#endif
-#ifdef LTC_WHIRLPOOL
-    struct whirlpool_state whirlpool;
-#endif
-#ifdef LTC_SHA512
-    struct sha512_state sha512;
-#endif
-#ifdef LTC_SHA256
-    struct sha256_state sha256;
-#endif
-#ifdef LTC_SHA1
-    struct sha1_state   sha1;
-#endif
-#ifdef LTC_MD5
-    struct md5_state    md5;
-#endif
-#ifdef LTC_MD4
-    struct md4_state    md4;
-#endif
-#ifdef LTC_MD2
-    struct md2_state    md2;
-#endif
-#ifdef LTC_TIGER
-    struct tiger_state  tiger;
-#endif
-#ifdef LTC_RIPEMD128
-    struct rmd128_state rmd128;
-#endif
-#ifdef LTC_RIPEMD160
-    struct rmd160_state rmd160;
-#endif
-#ifdef LTC_RIPEMD256
-    struct rmd256_state rmd256;
-#endif
-#ifdef LTC_RIPEMD320
-    struct rmd320_state rmd320;
-#endif
-    void *data;
-} hash_state;
-
-/** hash descriptor */
-extern  struct ltc_hash_descriptor {
-    /** name of hash */
-    char *name;
-    /** internal ID */
-    unsigned char ID;
-    /** Size of digest in octets */
-    unsigned long hashsize;
-    /** Input block size in octets */
-    unsigned long blocksize;
-    /** ASN.1 OID */
-    unsigned long OID[16];
-    /** Length of DER encoding */
-    unsigned long OIDlen;
-
-    /** Init a hash state
-      @param hash   The hash to initialize
-      @return CRYPT_OK if successful
-    */
-    int (*init)(hash_state *hash);
-    /** Process a block of data 
-      @param hash   The hash state
-      @param in     The data to hash
-      @param inlen  The length of the data (octets)
-      @return CRYPT_OK if successful
-    */
-    int (*process)(hash_state *hash, const unsigned char *in, unsigned long inlen);
-    /** Produce the digest and store it
-      @param hash   The hash state
-      @param out    [out] The destination of the digest
-      @return CRYPT_OK if successful
-    */
-    int (*done)(hash_state *hash, unsigned char *out);
-    /** Self-test
-      @return CRYPT_OK if successful, CRYPT_NOP if self-tests have been disabled
-    */
-    int (*test)(void);
-
-    /* accelerated hmac callback: if you need to-do multiple packets just use the generic hmac_memory and provide a hash callback */
-    int  (*hmac_block)(const unsigned char *key, unsigned long  keylen,
-                       const unsigned char *in,  unsigned long  inlen, 
-                             unsigned char *out, unsigned long *outlen);
-
-} hash_descriptor[];
-
-#ifdef LTC_CHC_HASH
-int chc_register(int cipher);
-int chc_init(hash_state * md);
-int chc_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int chc_done(hash_state * md, unsigned char *hash);
-int chc_test(void);
-extern const struct ltc_hash_descriptor chc_desc;
-#endif
-
-#ifdef LTC_WHIRLPOOL
-int whirlpool_init(hash_state * md);
-int whirlpool_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int whirlpool_done(hash_state * md, unsigned char *hash);
-int whirlpool_test(void);
-extern const struct ltc_hash_descriptor whirlpool_desc;
-#endif
-
-#ifdef LTC_SHA512
-int sha512_init(hash_state * md);
-int sha512_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int sha512_done(hash_state * md, unsigned char *hash);
-int sha512_test(void);
-extern const struct ltc_hash_descriptor sha512_desc;
-#endif
-
-#ifdef LTC_SHA384
-#ifndef LTC_SHA512
-   #error LTC_SHA512 is required for LTC_SHA384
-#endif
-int sha384_init(hash_state * md);
-#define sha384_process sha512_process
-int sha384_done(hash_state * md, unsigned char *hash);
-int sha384_test(void);
-extern const struct ltc_hash_descriptor sha384_desc;
-#endif
-
-#ifdef LTC_SHA256
-int sha256_init(hash_state * md);
-int sha256_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int sha256_done(hash_state * md, unsigned char *hash);
-int sha256_test(void);
-extern const struct ltc_hash_descriptor sha256_desc;
-
-#ifdef LTC_SHA224
-#ifndef LTC_SHA256
-   #error LTC_SHA256 is required for LTC_SHA224
-#endif
-int sha224_init(hash_state * md);
-#define sha224_process sha256_process
-int sha224_done(hash_state * md, unsigned char *hash);
-int sha224_test(void);
-extern const struct ltc_hash_descriptor sha224_desc;
-#endif
-#endif
-
-#ifdef LTC_SHA1
-int sha1_init(hash_state * md);
-int sha1_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int sha1_done(hash_state * md, unsigned char *hash);
-int sha1_test(void);
-extern const struct ltc_hash_descriptor sha1_desc;
-#endif
-
-#ifdef LTC_MD5
-int md5_init(hash_state * md);
-int md5_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int md5_done(hash_state * md, unsigned char *hash);
-int md5_test(void);
-extern const struct ltc_hash_descriptor md5_desc;
-#endif
-
-#ifdef LTC_MD4
-int md4_init(hash_state * md);
-int md4_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int md4_done(hash_state * md, unsigned char *hash);
-int md4_test(void);
-extern const struct ltc_hash_descriptor md4_desc;
-#endif
-
-#ifdef LTC_MD2
-int md2_init(hash_state * md);
-int md2_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int md2_done(hash_state * md, unsigned char *hash);
-int md2_test(void);
-extern const struct ltc_hash_descriptor md2_desc;
-#endif
-
-#ifdef LTC_TIGER
-int tiger_init(hash_state * md);
-int tiger_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int tiger_done(hash_state * md, unsigned char *hash);
-int tiger_test(void);
-extern const struct ltc_hash_descriptor tiger_desc;
-#endif
-
-#ifdef LTC_RIPEMD128
-int rmd128_init(hash_state * md);
-int rmd128_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int rmd128_done(hash_state * md, unsigned char *hash);
-int rmd128_test(void);
-extern const struct ltc_hash_descriptor rmd128_desc;
-#endif
-
-#ifdef LTC_RIPEMD160
-int rmd160_init(hash_state * md);
-int rmd160_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int rmd160_done(hash_state * md, unsigned char *hash);
-int rmd160_test(void);
-extern const struct ltc_hash_descriptor rmd160_desc;
-#endif
-
-#ifdef LTC_RIPEMD256
-int rmd256_init(hash_state * md);
-int rmd256_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int rmd256_done(hash_state * md, unsigned char *hash);
-int rmd256_test(void);
-extern const struct ltc_hash_descriptor rmd256_desc;
-#endif
-
-#ifdef LTC_RIPEMD320
-int rmd320_init(hash_state * md);
-int rmd320_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int rmd320_done(hash_state * md, unsigned char *hash);
-int rmd320_test(void);
-extern const struct ltc_hash_descriptor rmd320_desc;
-#endif
-
-
-int find_hash(const char *name);
-int find_hash_id(unsigned char ID);
-int find_hash_oid(const unsigned long *ID, unsigned long IDlen);
-int find_hash_any(const char *name, int digestlen);
-int register_hash(const struct ltc_hash_descriptor *hash);
-int unregister_hash(const struct ltc_hash_descriptor *hash);
-int hash_is_valid(int idx);
-
-LTC_MUTEX_PROTO(ltc_hash_mutex)
-
-int hash_memory(int hash, 
-                const unsigned char *in,  unsigned long inlen, 
-                      unsigned char *out, unsigned long *outlen);
-int hash_memory_multi(int hash, unsigned char *out, unsigned long *outlen,
-                      const unsigned char *in, unsigned long inlen, ...);
-int hash_filehandle(int hash, FILE *in, unsigned char *out, unsigned long *outlen);
-int hash_file(int hash, const char *fname, unsigned char *out, unsigned long *outlen);
-
-/* a simple macro for making hash "process" functions */
-#define HASH_PROCESS(func_name, compress_name, state_var, block_size)                       \
-int func_name (hash_state * md, const unsigned char *in, unsigned long inlen)               \
-{                                                                                           \
-    unsigned long n;                                                                        \
-    int           err;                                                                      \
-    LTC_ARGCHK(md != NULL);                                                                 \
-    LTC_ARGCHK(in != NULL);                                                                 \
-    if (md-> state_var .curlen > sizeof(md-> state_var .buf)) {                             \
-       return CRYPT_INVALID_ARG;                                                            \
-    }                                                                                       \
-    while (inlen > 0) {                                                                     \
-        if (md-> state_var .curlen == 0 && inlen >= block_size) {                           \
-           if ((err = compress_name (md, (unsigned char *)in)) != CRYPT_OK) {               \
-              return err;                                                                   \
-           }                                                                                \
-           md-> state_var .length += block_size * 8;                                        \
-           in             += block_size;                                                    \
-           inlen          -= block_size;                                                    \
-        } else {                                                                            \
-           n = MIN(inlen, (block_size - md-> state_var .curlen));                           \
-           memcpy(md-> state_var .buf + md-> state_var.curlen, in, (size_t)n);              \
-           md-> state_var .curlen += n;                                                     \
-           in             += n;                                                             \
-           inlen          -= n;                                                             \
-           if (md-> state_var .curlen == block_size) {                                      \
-              if ((err = compress_name (md, md-> state_var .buf)) != CRYPT_OK) {            \
-                 return err;                                                                \
-              }                                                                             \
-              md-> state_var .length += 8*block_size;                                       \
-              md-> state_var .curlen = 0;                                                   \
-           }                                                                                \
-       }                                                                                    \
-    }                                                                                       \
-    return CRYPT_OK;                                                                        \
-}
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_hash.h,v $ */
-/* $Revision: 1.22 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_mac.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_mac.h
deleted file mode 100644
index 7ad9516bd..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_mac.h
+++ /dev/null
@@ -1,384 +0,0 @@
-#ifdef LTC_HMAC
-typedef struct Hmac_state {
-     hash_state     md;
-     int            hash;
-     hash_state     hashstate;
-     unsigned char  *key;
-} hmac_state;
-
-int hmac_init(hmac_state *hmac, int hash, const unsigned char *key, unsigned long keylen);
-int hmac_process(hmac_state *hmac, const unsigned char *in, unsigned long inlen);
-int hmac_done(hmac_state *hmac, unsigned char *out, unsigned long *outlen);
-int hmac_test(void);
-int hmac_memory(int hash, 
-                const unsigned char *key, unsigned long keylen,
-                const unsigned char *in,  unsigned long inlen, 
-                      unsigned char *out, unsigned long *outlen);
-int hmac_memory_multi(int hash, 
-                const unsigned char *key,  unsigned long keylen,
-                      unsigned char *out,  unsigned long *outlen,
-                const unsigned char *in,   unsigned long inlen, ...);
-int hmac_file(int hash, const char *fname, const unsigned char *key,
-              unsigned long keylen, 
-              unsigned char *dst, unsigned long *dstlen);
-#endif
-
-#ifdef LTC_OMAC
-
-typedef struct {
-   int             cipher_idx, 
-                   buflen,
-                   blklen;
-   unsigned char   block[MAXBLOCKSIZE],
-                   prev[MAXBLOCKSIZE],
-                   Lu[2][MAXBLOCKSIZE];
-   symmetric_key   key;
-} omac_state;
-
-int omac_init(omac_state *omac, int cipher, const unsigned char *key, unsigned long keylen);
-int omac_process(omac_state *omac, const unsigned char *in, unsigned long inlen);
-int omac_done(omac_state *omac, unsigned char *out, unsigned long *outlen);
-int omac_memory(int cipher, 
-               const unsigned char *key, unsigned long keylen,
-               const unsigned char *in,  unsigned long inlen,
-                     unsigned char *out, unsigned long *outlen);
-int omac_memory_multi(int cipher, 
-                const unsigned char *key, unsigned long keylen,
-                      unsigned char *out, unsigned long *outlen,
-                const unsigned char *in,  unsigned long inlen, ...);
-int omac_file(int cipher, 
-              const unsigned char *key, unsigned long keylen,
-              const          char *filename, 
-                    unsigned char *out, unsigned long *outlen);
-int omac_test(void);
-#endif /* LTC_OMAC */
-
-#ifdef LTC_PMAC
-
-typedef struct {
-   unsigned char     Ls[32][MAXBLOCKSIZE],    /* L shifted by i bits to the left */
-                     Li[MAXBLOCKSIZE],        /* value of Li [current value, we calc from previous recall] */
-                     Lr[MAXBLOCKSIZE],        /* L * x^-1 */
-                     block[MAXBLOCKSIZE],     /* currently accumulated block */
-                     checksum[MAXBLOCKSIZE];  /* current checksum */
-
-   symmetric_key     key;                     /* scheduled key for cipher */
-   unsigned long     block_index;             /* index # for current block */
-   int               cipher_idx,              /* cipher idx */
-                     block_len,               /* length of block */
-                     buflen;                  /* number of bytes in the buffer */
-} pmac_state;
-
-int pmac_init(pmac_state *pmac, int cipher, const unsigned char *key, unsigned long keylen);
-int pmac_process(pmac_state *pmac, const unsigned char *in, unsigned long inlen);
-int pmac_done(pmac_state *pmac, unsigned char *out, unsigned long *outlen);
-
-int pmac_memory(int cipher, 
-               const unsigned char *key, unsigned long keylen,
-               const unsigned char *msg, unsigned long msglen,
-                     unsigned char *out, unsigned long *outlen);
-
-int pmac_memory_multi(int cipher, 
-                const unsigned char *key, unsigned long keylen,
-                      unsigned char *out, unsigned long *outlen,
-                const unsigned char *in, unsigned long inlen, ...);
-
-int pmac_file(int cipher, 
-             const unsigned char *key, unsigned long keylen,
-             const          char *filename, 
-                   unsigned char *out, unsigned long *outlen);
-
-int pmac_test(void);
-
-/* internal functions */
-int pmac_ntz(unsigned long x);
-void pmac_shift_xor(pmac_state *pmac);
-
-#endif /* PMAC */
-
-#ifdef LTC_EAX_MODE
-
-#if !(defined(LTC_OMAC) && defined(LTC_CTR_MODE))
-   #error LTC_EAX_MODE requires LTC_OMAC and CTR
-#endif
-
-typedef struct {
-   unsigned char N[MAXBLOCKSIZE];
-   symmetric_CTR ctr;
-   omac_state    headeromac, ctomac;
-} eax_state;
-
-int eax_init(eax_state *eax, int cipher, const unsigned char *key, unsigned long keylen,
-             const unsigned char *nonce, unsigned long noncelen,
-             const unsigned char *header, unsigned long headerlen);
-
-int eax_encrypt(eax_state *eax, const unsigned char *pt, unsigned char *ct, unsigned long length);
-int eax_decrypt(eax_state *eax, const unsigned char *ct, unsigned char *pt, unsigned long length);
-int eax_addheader(eax_state *eax, const unsigned char *header, unsigned long length);
-int eax_done(eax_state *eax, unsigned char *tag, unsigned long *taglen);
-
-int eax_encrypt_authenticate_memory(int cipher,
-    const unsigned char *key,    unsigned long keylen,
-    const unsigned char *nonce,  unsigned long noncelen,
-    const unsigned char *header, unsigned long headerlen,
-    const unsigned char *pt,     unsigned long ptlen,
-          unsigned char *ct,
-          unsigned char *tag,    unsigned long *taglen);
-
-int eax_decrypt_verify_memory(int cipher,
-    const unsigned char *key,    unsigned long keylen,
-    const unsigned char *nonce,  unsigned long noncelen,
-    const unsigned char *header, unsigned long headerlen,
-    const unsigned char *ct,     unsigned long ctlen,
-          unsigned char *pt,
-          unsigned char *tag,    unsigned long taglen,
-          int           *stat);
-
- int eax_test(void);
-#endif /* EAX MODE */
-
-#ifdef LTC_OCB_MODE
-typedef struct {
-   unsigned char     L[MAXBLOCKSIZE],         /* L value */
-                     Ls[32][MAXBLOCKSIZE],    /* L shifted by i bits to the left */
-                     Li[MAXBLOCKSIZE],        /* value of Li [current value, we calc from previous recall] */
-                     Lr[MAXBLOCKSIZE],        /* L * x^-1 */
-                     R[MAXBLOCKSIZE],         /* R value */
-                     checksum[MAXBLOCKSIZE];  /* current checksum */
-
-   symmetric_key     key;                     /* scheduled key for cipher */
-   unsigned long     block_index;             /* index # for current block */
-   int               cipher,                  /* cipher idx */
-                     block_len;               /* length of block */
-} ocb_state;
-
-int ocb_init(ocb_state *ocb, int cipher, 
-             const unsigned char *key, unsigned long keylen, const unsigned char *nonce);
-
-int ocb_encrypt(ocb_state *ocb, const unsigned char *pt, unsigned char *ct);
-int ocb_decrypt(ocb_state *ocb, const unsigned char *ct, unsigned char *pt);
-
-int ocb_done_encrypt(ocb_state *ocb, 
-                     const unsigned char *pt,  unsigned long ptlen,
-                           unsigned char *ct, 
-                           unsigned char *tag, unsigned long *taglen);
-
-int ocb_done_decrypt(ocb_state *ocb, 
-                     const unsigned char *ct,  unsigned long ctlen,
-                           unsigned char *pt, 
-                     const unsigned char *tag, unsigned long taglen, int *stat);
-
-int ocb_encrypt_authenticate_memory(int cipher,
-    const unsigned char *key,    unsigned long keylen,
-    const unsigned char *nonce,  
-    const unsigned char *pt,     unsigned long ptlen,
-          unsigned char *ct,
-          unsigned char *tag,    unsigned long *taglen);
-
-int ocb_decrypt_verify_memory(int cipher,
-    const unsigned char *key,    unsigned long keylen,
-    const unsigned char *nonce,  
-    const unsigned char *ct,     unsigned long ctlen,
-          unsigned char *pt,
-    const unsigned char *tag,    unsigned long taglen,
-          int           *stat);
-
-int ocb_test(void);
-
-/* internal functions */
-void ocb_shift_xor(ocb_state *ocb, unsigned char *Z);
-int ocb_ntz(unsigned long x);
-int s_ocb_done(ocb_state *ocb, const unsigned char *pt, unsigned long ptlen,
-               unsigned char *ct, unsigned char *tag, unsigned long *taglen, int mode);
-
-#endif /* LTC_OCB_MODE */
-
-#ifdef LTC_CCM_MODE
-
-#define CCM_ENCRYPT 0
-#define CCM_DECRYPT 1
-
-int ccm_memory(int cipher,
-    const unsigned char *key,    unsigned long keylen,
-    symmetric_key       *uskey,
-    const unsigned char *nonce,  unsigned long noncelen,
-    const unsigned char *header, unsigned long headerlen,
-          unsigned char *pt,     unsigned long ptlen,
-          unsigned char *ct,
-          unsigned char *tag,    unsigned long *taglen,
-                    int  direction);
-
-int ccm_test(void);
-
-#endif /* LTC_CCM_MODE */
-
-#if defined(LRW_MODE) || defined(LTC_GCM_MODE)
-void gcm_gf_mult(const unsigned char *a, const unsigned char *b, unsigned char *c);
-#endif
-
-
-/* table shared between GCM and LRW */
-#if defined(LTC_GCM_TABLES) || defined(LRW_TABLES) || ((defined(LTC_GCM_MODE) || defined(LTC_GCM_MODE)) && defined(LTC_FAST))
-extern const unsigned char gcm_shift_table[];
-#endif
-
-#ifdef LTC_GCM_MODE
-
-#define GCM_ENCRYPT 0
-#define GCM_DECRYPT 1
-
-#define LTC_GCM_MODE_IV    0
-#define LTC_GCM_MODE_AAD   1
-#define LTC_GCM_MODE_TEXT  2
-
-typedef struct { 
-   symmetric_key       K;
-   unsigned char       H[16],        /* multiplier */
-                       X[16],        /* accumulator */
-                       Y[16],        /* counter */
-                       Y_0[16],      /* initial counter */
-                       buf[16];      /* buffer for stuff */
-
-   int                 cipher,       /* which cipher */
-                       ivmode,       /* Which mode is the IV in? */
-                       mode,         /* mode the GCM code is in */
-                       buflen;       /* length of data in buf */
-
-   ulong64             totlen,       /* 64-bit counter used for IV and AAD */
-                       pttotlen;     /* 64-bit counter for the PT */
-
-#ifdef LTC_GCM_TABLES
-   unsigned char       PC[16][256][16]  /* 16 tables of 8x128 */
-#ifdef LTC_GCM_TABLES_SSE2
-__attribute__ ((aligned (16)))
-#endif
-;
-#endif  
-} gcm_state;
-
-void gcm_mult_h(gcm_state *gcm, unsigned char *I);
-
-int gcm_init(gcm_state *gcm, int cipher,
-             const unsigned char *key, int keylen);
-
-int gcm_reset(gcm_state *gcm);
-
-int gcm_add_iv(gcm_state *gcm, 
-               const unsigned char *IV,     unsigned long IVlen);
-
-int gcm_add_aad(gcm_state *gcm,
-               const unsigned char *adata,  unsigned long adatalen);
-
-int gcm_process(gcm_state *gcm,
-                     unsigned char *pt,     unsigned long ptlen,
-                     unsigned char *ct,
-                     int direction);
-
-int gcm_done(gcm_state *gcm, 
-                     unsigned char *tag,    unsigned long *taglen);
-
-int gcm_memory(      int           cipher,
-               const unsigned char *key,    unsigned long keylen,
-               const unsigned char *IV,     unsigned long IVlen,
-               const unsigned char *adata,  unsigned long adatalen,
-                     unsigned char *pt,     unsigned long ptlen,
-                     unsigned char *ct, 
-                     unsigned char *tag,    unsigned long *taglen,
-                               int direction);
-int gcm_test(void);
-
-#endif /* LTC_GCM_MODE */
-
-#ifdef LTC_PELICAN
-
-typedef struct pelican_state
-{
-    symmetric_key K;
-    unsigned char state[16];
-    int           buflen;
-} pelican_state;
-
-int pelican_init(pelican_state *pelmac, const unsigned char *key, unsigned long keylen);
-int pelican_process(pelican_state *pelmac, const unsigned char *in, unsigned long inlen);
-int pelican_done(pelican_state *pelmac, unsigned char *out);
-int pelican_test(void);
-
-int pelican_memory(const unsigned char *key, unsigned long keylen,
-                   const unsigned char *in, unsigned long inlen,
-                         unsigned char *out);
-
-#endif
-
-#ifdef LTC_XCBC
-
-/* add this to "keylen" to xcbc_init to use a pure three-key XCBC MAC */
-#define LTC_XCBC_PURE  0x8000UL
-
-typedef struct {
-   unsigned char K[3][MAXBLOCKSIZE],
-                 IV[MAXBLOCKSIZE];
-
-   symmetric_key key;
-
-             int cipher,
-                 buflen,
-                 blocksize;
-} xcbc_state;
-
-int xcbc_init(xcbc_state *xcbc, int cipher, const unsigned char *key, unsigned long keylen);
-int xcbc_process(xcbc_state *xcbc, const unsigned char *in, unsigned long inlen);
-int xcbc_done(xcbc_state *xcbc, unsigned char *out, unsigned long *outlen);
-int xcbc_memory(int cipher, 
-               const unsigned char *key, unsigned long keylen,
-               const unsigned char *in,  unsigned long inlen,
-                     unsigned char *out, unsigned long *outlen);
-int xcbc_memory_multi(int cipher, 
-                const unsigned char *key, unsigned long keylen,
-                      unsigned char *out, unsigned long *outlen,
-                const unsigned char *in,  unsigned long inlen, ...);
-int xcbc_file(int cipher, 
-              const unsigned char *key, unsigned long keylen,
-              const          char *filename, 
-                    unsigned char *out, unsigned long *outlen);
-int xcbc_test(void);
-
-#endif
-
-#ifdef LTC_F9_MODE
-
-typedef struct {
-   unsigned char akey[MAXBLOCKSIZE],
-                 ACC[MAXBLOCKSIZE],
-                 IV[MAXBLOCKSIZE];
-
-   symmetric_key key;
-
-             int cipher,
-                 buflen,
-                 keylen,
-                 blocksize;
-} f9_state;
-
-int f9_init(f9_state *f9, int cipher, const unsigned char *key, unsigned long keylen);
-int f9_process(f9_state *f9, const unsigned char *in, unsigned long inlen);
-int f9_done(f9_state *f9, unsigned char *out, unsigned long *outlen);
-int f9_memory(int cipher, 
-               const unsigned char *key, unsigned long keylen,
-               const unsigned char *in,  unsigned long inlen,
-                     unsigned char *out, unsigned long *outlen);
-int f9_memory_multi(int cipher, 
-                const unsigned char *key, unsigned long keylen,
-                      unsigned char *out, unsigned long *outlen,
-                const unsigned char *in,  unsigned long inlen, ...);
-int f9_file(int cipher, 
-              const unsigned char *key, unsigned long keylen,
-              const          char *filename, 
-                    unsigned char *out, unsigned long *outlen);
-int f9_test(void);
-
-#endif
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_mac.h,v $ */
-/* $Revision: 1.23 $ */
-/* $Date: 2007/05/12 14:37:41 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_macros.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_macros.h
deleted file mode 100644
index 53bda9bb4..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_macros.h
+++ /dev/null
@@ -1,424 +0,0 @@
-/* fix for MSVC ...evil! */
-#ifdef _MSC_VER
-   #define CONST64(n) n ## ui64
-   typedef unsigned __int64 ulong64;
-#else
-   #define CONST64(n) n ## ULL
-   typedef unsigned long long ulong64;
-#endif
-
-/* this is the "32-bit at least" data type 
- * Re-define it to suit your platform but it must be at least 32-bits 
- */
-#if defined(__x86_64__) || (defined(__sparc__) && defined(__arch64__))
-   typedef unsigned ulong32;
-#else
-   typedef unsigned long ulong32;
-#endif
-
-/* ---- HELPER MACROS ---- */
-#ifdef ENDIAN_NEUTRAL
-
-#define STORE32L(x, y)                                                                     \
-     { (y)[3] = (unsigned char)(((x)>>24)&255); (y)[2] = (unsigned char)(((x)>>16)&255);   \
-       (y)[1] = (unsigned char)(((x)>>8)&255); (y)[0] = (unsigned char)((x)&255); }
-
-#define LOAD32L(x, y)                            \
-     { x = ((unsigned long)((y)[3] & 255)<<24) | \
-           ((unsigned long)((y)[2] & 255)<<16) | \
-           ((unsigned long)((y)[1] & 255)<<8)  | \
-           ((unsigned long)((y)[0] & 255)); }
-
-#define STORE64L(x, y)                                                                     \
-     { (y)[7] = (unsigned char)(((x)>>56)&255); (y)[6] = (unsigned char)(((x)>>48)&255);   \
-       (y)[5] = (unsigned char)(((x)>>40)&255); (y)[4] = (unsigned char)(((x)>>32)&255);   \
-       (y)[3] = (unsigned char)(((x)>>24)&255); (y)[2] = (unsigned char)(((x)>>16)&255);   \
-       (y)[1] = (unsigned char)(((x)>>8)&255); (y)[0] = (unsigned char)((x)&255); }
-
-#define LOAD64L(x, y)                                                       \
-     { x = (((ulong64)((y)[7] & 255))<<56)|(((ulong64)((y)[6] & 255))<<48)| \
-           (((ulong64)((y)[5] & 255))<<40)|(((ulong64)((y)[4] & 255))<<32)| \
-           (((ulong64)((y)[3] & 255))<<24)|(((ulong64)((y)[2] & 255))<<16)| \
-           (((ulong64)((y)[1] & 255))<<8)|(((ulong64)((y)[0] & 255))); }
-
-#define STORE32H(x, y)                                                                     \
-     { (y)[0] = (unsigned char)(((x)>>24)&255); (y)[1] = (unsigned char)(((x)>>16)&255);   \
-       (y)[2] = (unsigned char)(((x)>>8)&255); (y)[3] = (unsigned char)((x)&255); }
-
-#define LOAD32H(x, y)                            \
-     { x = ((unsigned long)((y)[0] & 255)<<24) | \
-           ((unsigned long)((y)[1] & 255)<<16) | \
-           ((unsigned long)((y)[2] & 255)<<8)  | \
-           ((unsigned long)((y)[3] & 255)); }
-
-#define STORE64H(x, y)                                                                     \
-   { (y)[0] = (unsigned char)(((x)>>56)&255); (y)[1] = (unsigned char)(((x)>>48)&255);     \
-     (y)[2] = (unsigned char)(((x)>>40)&255); (y)[3] = (unsigned char)(((x)>>32)&255);     \
-     (y)[4] = (unsigned char)(((x)>>24)&255); (y)[5] = (unsigned char)(((x)>>16)&255);     \
-     (y)[6] = (unsigned char)(((x)>>8)&255); (y)[7] = (unsigned char)((x)&255); }
-
-#define LOAD64H(x, y)                                                      \
-   { x = (((ulong64)((y)[0] & 255))<<56)|(((ulong64)((y)[1] & 255))<<48) | \
-         (((ulong64)((y)[2] & 255))<<40)|(((ulong64)((y)[3] & 255))<<32) | \
-         (((ulong64)((y)[4] & 255))<<24)|(((ulong64)((y)[5] & 255))<<16) | \
-         (((ulong64)((y)[6] & 255))<<8)|(((ulong64)((y)[7] & 255))); }
-
-#endif /* ENDIAN_NEUTRAL */
-
-#ifdef ENDIAN_LITTLE
-
-#if !defined(LTC_NO_BSWAP) && (defined(INTEL_CC) || (defined(__GNUC__) && (defined(__DJGPP__) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__i386__) || defined(__x86_64__))))
-
-#define STORE32H(x, y)           \
-asm __volatile__ (               \
-   "bswapl %0     \n\t"          \
-   "movl   %0,(%1)\n\t"          \
-   "bswapl %0     \n\t"          \
-      ::"r"(x), "r"(y));
-
-#define LOAD32H(x, y)          \
-asm __volatile__ (             \
-   "movl (%1),%0\n\t"          \
-   "bswapl %0\n\t"             \
-   :"=r"(x): "r"(y));
-
-#else
-
-#define STORE32H(x, y)                                                                     \
-     { (y)[0] = (unsigned char)(((x)>>24)&255); (y)[1] = (unsigned char)(((x)>>16)&255);   \
-       (y)[2] = (unsigned char)(((x)>>8)&255); (y)[3] = (unsigned char)((x)&255); }
-
-#define LOAD32H(x, y)                            \
-     { x = ((unsigned long)((y)[0] & 255)<<24) | \
-           ((unsigned long)((y)[1] & 255)<<16) | \
-           ((unsigned long)((y)[2] & 255)<<8)  | \
-           ((unsigned long)((y)[3] & 255)); }
-
-#endif
-
-
-/* x86_64 processor */
-#if !defined(LTC_NO_BSWAP) && (defined(__GNUC__) && defined(__x86_64__))
-
-#define STORE64H(x, y)           \
-asm __volatile__ (               \
-   "bswapq %0     \n\t"          \
-   "movq   %0,(%1)\n\t"          \
-   "bswapq %0     \n\t"          \
-      ::"r"(x), "r"(y));
-
-#define LOAD64H(x, y)          \
-asm __volatile__ (             \
-   "movq (%1),%0\n\t"          \
-   "bswapq %0\n\t"             \
-   :"=r"(x): "r"(y));
-
-#else
-
-#define STORE64H(x, y)                                                                     \
-   { (y)[0] = (unsigned char)(((x)>>56)&255); (y)[1] = (unsigned char)(((x)>>48)&255);     \
-     (y)[2] = (unsigned char)(((x)>>40)&255); (y)[3] = (unsigned char)(((x)>>32)&255);     \
-     (y)[4] = (unsigned char)(((x)>>24)&255); (y)[5] = (unsigned char)(((x)>>16)&255);     \
-     (y)[6] = (unsigned char)(((x)>>8)&255); (y)[7] = (unsigned char)((x)&255); }
-
-#define LOAD64H(x, y)                                                      \
-   { x = (((ulong64)((y)[0] & 255))<<56)|(((ulong64)((y)[1] & 255))<<48) | \
-         (((ulong64)((y)[2] & 255))<<40)|(((ulong64)((y)[3] & 255))<<32) | \
-         (((ulong64)((y)[4] & 255))<<24)|(((ulong64)((y)[5] & 255))<<16) | \
-         (((ulong64)((y)[6] & 255))<<8)|(((ulong64)((y)[7] & 255))); }
-
-#endif
-
-#ifdef ENDIAN_32BITWORD 
-
-#define STORE32L(x, y)        \
-     { ulong32  __t = (x); XMEMCPY(y, &__t, 4); }
-
-#define LOAD32L(x, y)         \
-     XMEMCPY(&(x), y, 4);
-
-#define STORE64L(x, y)                                                                     \
-     { (y)[7] = (unsigned char)(((x)>>56)&255); (y)[6] = (unsigned char)(((x)>>48)&255);   \
-       (y)[5] = (unsigned char)(((x)>>40)&255); (y)[4] = (unsigned char)(((x)>>32)&255);   \
-       (y)[3] = (unsigned char)(((x)>>24)&255); (y)[2] = (unsigned char)(((x)>>16)&255);   \
-       (y)[1] = (unsigned char)(((x)>>8)&255); (y)[0] = (unsigned char)((x)&255); }
-
-#define LOAD64L(x, y)                                                       \
-     { x = (((ulong64)((y)[7] & 255))<<56)|(((ulong64)((y)[6] & 255))<<48)| \
-           (((ulong64)((y)[5] & 255))<<40)|(((ulong64)((y)[4] & 255))<<32)| \
-           (((ulong64)((y)[3] & 255))<<24)|(((ulong64)((y)[2] & 255))<<16)| \
-           (((ulong64)((y)[1] & 255))<<8)|(((ulong64)((y)[0] & 255))); }
-
-#else /* 64-bit words then  */
-
-#define STORE32L(x, y)        \
-     { ulong32 __t = (x); XMEMCPY(y, &__t, 4); }
-
-#define LOAD32L(x, y)         \
-     { XMEMCPY(&(x), y, 4); x &= 0xFFFFFFFF; }
-
-#define STORE64L(x, y)        \
-     { ulong64 __t = (x); XMEMCPY(y, &__t, 8); }
-
-#define LOAD64L(x, y)         \
-    { XMEMCPY(&(x), y, 8); }
-
-#endif /* ENDIAN_64BITWORD */
-
-#endif /* ENDIAN_LITTLE */
-
-#ifdef ENDIAN_BIG
-#define STORE32L(x, y)                                                                     \
-     { (y)[3] = (unsigned char)(((x)>>24)&255); (y)[2] = (unsigned char)(((x)>>16)&255);   \
-       (y)[1] = (unsigned char)(((x)>>8)&255); (y)[0] = (unsigned char)((x)&255); }
-
-#define LOAD32L(x, y)                            \
-     { x = ((unsigned long)((y)[3] & 255)<<24) | \
-           ((unsigned long)((y)[2] & 255)<<16) | \
-           ((unsigned long)((y)[1] & 255)<<8)  | \
-           ((unsigned long)((y)[0] & 255)); }
-
-#define STORE64L(x, y)                                                                     \
-   { (y)[7] = (unsigned char)(((x)>>56)&255); (y)[6] = (unsigned char)(((x)>>48)&255);     \
-     (y)[5] = (unsigned char)(((x)>>40)&255); (y)[4] = (unsigned char)(((x)>>32)&255);     \
-     (y)[3] = (unsigned char)(((x)>>24)&255); (y)[2] = (unsigned char)(((x)>>16)&255);     \
-     (y)[1] = (unsigned char)(((x)>>8)&255); (y)[0] = (unsigned char)((x)&255); }
-
-#define LOAD64L(x, y)                                                      \
-   { x = (((ulong64)((y)[7] & 255))<<56)|(((ulong64)((y)[6] & 255))<<48) | \
-         (((ulong64)((y)[5] & 255))<<40)|(((ulong64)((y)[4] & 255))<<32) | \
-         (((ulong64)((y)[3] & 255))<<24)|(((ulong64)((y)[2] & 255))<<16) | \
-         (((ulong64)((y)[1] & 255))<<8)|(((ulong64)((y)[0] & 255))); }
-
-#ifdef ENDIAN_32BITWORD 
-
-#define STORE32H(x, y)        \
-     { ulong32 __t = (x); XMEMCPY(y, &__t, 4); }
-
-#define LOAD32H(x, y)         \
-     XMEMCPY(&(x), y, 4);
-
-#define STORE64H(x, y)                                                                     \
-     { (y)[0] = (unsigned char)(((x)>>56)&255); (y)[1] = (unsigned char)(((x)>>48)&255);   \
-       (y)[2] = (unsigned char)(((x)>>40)&255); (y)[3] = (unsigned char)(((x)>>32)&255);   \
-       (y)[4] = (unsigned char)(((x)>>24)&255); (y)[5] = (unsigned char)(((x)>>16)&255);   \
-       (y)[6] = (unsigned char)(((x)>>8)&255);  (y)[7] = (unsigned char)((x)&255); }
-
-#define LOAD64H(x, y)                                                       \
-     { x = (((ulong64)((y)[0] & 255))<<56)|(((ulong64)((y)[1] & 255))<<48)| \
-           (((ulong64)((y)[2] & 255))<<40)|(((ulong64)((y)[3] & 255))<<32)| \
-           (((ulong64)((y)[4] & 255))<<24)|(((ulong64)((y)[5] & 255))<<16)| \
-           (((ulong64)((y)[6] & 255))<<8)| (((ulong64)((y)[7] & 255))); }
-
-#else /* 64-bit words then  */
-
-#define STORE32H(x, y)        \
-     { ulong32 __t = (x); XMEMCPY(y, &__t, 4); }
-
-#define LOAD32H(x, y)         \
-     { XMEMCPY(&(x), y, 4); x &= 0xFFFFFFFF; }
-
-#define STORE64H(x, y)        \
-     { ulong64 __t = (x); XMEMCPY(y, &__t, 8); }
-
-#define LOAD64H(x, y)         \
-    { XMEMCPY(&(x), y, 8); }
-
-#endif /* ENDIAN_64BITWORD */
-#endif /* ENDIAN_BIG */
-
-#define BSWAP(x)  ( ((x>>24)&0x000000FFUL) | ((x<<24)&0xFF000000UL)  | \
-                    ((x>>8)&0x0000FF00UL)  | ((x<<8)&0x00FF0000UL) )
-
-
-/* 32-bit Rotates */
-#if defined(_MSC_VER)
-
-/* instrinsic rotate */
-#include <stdlib.h>
-#pragma intrinsic(_lrotr,_lrotl)
-#define ROR(x,n) _lrotr(x,n)
-#define ROL(x,n) _lrotl(x,n)
-#define RORc(x,n) _lrotr(x,n)
-#define ROLc(x,n) _lrotl(x,n)
-
-#elif !defined(__STRICT_ANSI__) && defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && !defined(INTEL_CC) && !defined(LTC_NO_ASM)
-
-static inline unsigned ROL(unsigned word, int i)
-{
-   asm ("roll %%cl,%0"
-      :"=r" (word)
-      :"0" (word),"c" (i));
-   return word;
-}
-
-static inline unsigned ROR(unsigned word, int i)
-{
-   asm ("rorl %%cl,%0"
-      :"=r" (word)
-      :"0" (word),"c" (i));
-   return word;
-}
-
-#ifndef LTC_NO_ROLC
-
-static inline unsigned ROLc(unsigned word, const int i)
-{
-   asm ("roll %2,%0"
-      :"=r" (word)
-      :"0" (word),"I" (i));
-   return word;
-}
-
-static inline unsigned RORc(unsigned word, const int i)
-{
-   asm ("rorl %2,%0"
-      :"=r" (word)
-      :"0" (word),"I" (i));
-   return word;
-}
-
-#else
-
-#define ROLc ROL
-#define RORc ROR
-
-#endif
-
-#elif !defined(__STRICT_ANSI__) && defined(LTC_PPC32)
-
-static inline unsigned ROL(unsigned word, int i)
-{
-   asm ("rotlw %0,%0,%2"
-      :"=r" (word)
-      :"0" (word),"r" (i));
-   return word;
-}
-
-static inline unsigned ROR(unsigned word, int i)
-{
-   asm ("rotlw %0,%0,%2"
-      :"=r" (word)
-      :"0" (word),"r" (32-i));
-   return word;
-}
-
-#ifndef LTC_NO_ROLC
-
-static inline unsigned ROLc(unsigned word, const int i)
-{
-   asm ("rotlwi %0,%0,%2"
-      :"=r" (word)
-      :"0" (word),"I" (i));
-   return word;
-}
-
-static inline unsigned RORc(unsigned word, const int i)
-{
-   asm ("rotrwi %0,%0,%2"
-      :"=r" (word)
-      :"0" (word),"I" (i));
-   return word;
-}
-
-#else
-
-#define ROLc ROL
-#define RORc ROR
-
-#endif
-
-
-#else
-
-/* rotates the hard way */
-#define ROL(x, y) ( (((unsigned long)(x)<<(unsigned long)((y)&31)) | (((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
-#define ROR(x, y) ( ((((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)((y)&31)) | ((unsigned long)(x)<<(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
-#define ROLc(x, y) ( (((unsigned long)(x)<<(unsigned long)((y)&31)) | (((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
-#define RORc(x, y) ( ((((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)((y)&31)) | ((unsigned long)(x)<<(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
-
-#endif
-
-
-/* 64-bit Rotates */
-#if !defined(__STRICT_ANSI__) && defined(__GNUC__) && defined(__x86_64__) && !defined(LTC_NO_ASM)
-
-static inline unsigned long ROL64(unsigned long word, int i)
-{
-   asm("rolq %%cl,%0"
-      :"=r" (word)
-      :"0" (word),"c" (i));
-   return word;
-}
-
-static inline unsigned long ROR64(unsigned long word, int i)
-{
-   asm("rorq %%cl,%0"
-      :"=r" (word)
-      :"0" (word),"c" (i));
-   return word;
-}
-
-#ifndef LTC_NO_ROLC
-
-static inline unsigned long ROL64c(unsigned long word, const int i)
-{
-   asm("rolq %2,%0"
-      :"=r" (word)
-      :"0" (word),"J" (i));
-   return word;
-}
-
-static inline unsigned long ROR64c(unsigned long word, const int i)
-{
-   asm("rorq %2,%0"
-      :"=r" (word)
-      :"0" (word),"J" (i));
-   return word;
-}
-
-#else /* LTC_NO_ROLC */
-
-#define ROL64c ROL64
-#define ROR64c ROR64
-
-#endif
-
-#else /* Not x86_64  */
-
-#define ROL64(x, y) \
-    ( (((x)<<((ulong64)(y)&63)) | \
-      (((x)&CONST64(0xFFFFFFFFFFFFFFFF))>>((ulong64)64-((y)&63)))) & CONST64(0xFFFFFFFFFFFFFFFF))
-
-#define ROR64(x, y) \
-    ( ((((x)&CONST64(0xFFFFFFFFFFFFFFFF))>>((ulong64)(y)&CONST64(63))) | \
-      ((x)<<((ulong64)(64-((y)&CONST64(63)))))) & CONST64(0xFFFFFFFFFFFFFFFF))
-
-#define ROL64c(x, y) \
-    ( (((x)<<((ulong64)(y)&63)) | \
-      (((x)&CONST64(0xFFFFFFFFFFFFFFFF))>>((ulong64)64-((y)&63)))) & CONST64(0xFFFFFFFFFFFFFFFF))
-
-#define ROR64c(x, y) \
-    ( ((((x)&CONST64(0xFFFFFFFFFFFFFFFF))>>((ulong64)(y)&CONST64(63))) | \
-      ((x)<<((ulong64)(64-((y)&CONST64(63)))))) & CONST64(0xFFFFFFFFFFFFFFFF))
-
-#endif
-
-#ifndef MAX
-   #define MAX(x, y) ( ((x)>(y))?(x):(y) )
-#endif
-
-#ifndef MIN
-   #define MIN(x, y) ( ((x)<(y))?(x):(y) )
-#endif
-
-/* extract a byte portably */
-#ifdef _MSC_VER
-   #define byte(x, n) ((unsigned char)((x) >> (8 * (n))))
-#else
-   #define byte(x, n) (((x) >> (8 * (n))) & 255)
-#endif   
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_macros.h,v $ */
-/* $Revision: 1.15 $ */
-/* $Date: 2006/11/29 23:43:57 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_math.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_math.h
deleted file mode 100644
index a05d7fff9..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_math.h
+++ /dev/null
@@ -1,500 +0,0 @@
-/** math functions **/
-
-#define LTC_MP_LT   -1
-#define LTC_MP_EQ    0
-#define LTC_MP_GT    1
-
-#define LTC_MP_NO    0
-#define LTC_MP_YES   1
-
-#ifndef LTC_MECC
-   typedef void ecc_point;
-#endif
-
-#ifndef LTC_MRSA
-   typedef void rsa_key;
-#endif
-
-/** math descriptor */
-typedef struct {
-   /** Name of the math provider */
-   char *name;
-
-   /** Bits per digit, amount of bits must fit in an unsigned long */
-   int  bits_per_digit;
-
-/* ---- init/deinit functions ---- */
-
-   /** initialize a bignum
-     @param   a     The number to initialize
-     @return  CRYPT_OK on success
-   */
-   int (*init)(void **a);
-   
-   /** init copy 
-     @param  dst    The number to initialize and write to
-     @param  src    The number to copy from
-     @return CRYPT_OK on success
-   */
-   int (*init_copy)(void **dst, void *src);
-
-   /** deinit 
-      @param   a    The number to free
-      @return CRYPT_OK on success
-   */
-   void (*deinit)(void *a);
-
-/* ---- data movement ---- */
-
-   /** negate
-      @param   src   The number to negate
-      @param   dst   The destination
-      @return CRYPT_OK on success
-   */
-   int (*neg)(void *src, void *dst);
-   
-   /** copy 
-      @param   src   The number to copy from
-      @param   dst   The number to write to 
-      @return CRYPT_OK on success
-   */
-   int (*copy)(void *src, void *dst);
-
-/* ---- trivial low level functions ---- */
-
-   /** set small constant 
-      @param a    Number to write to
-      @param n    Source upto bits_per_digit (actually meant for very small constants) 
-      @return CRYPT_OK on succcess
-   */
-   int (*set_int)(void *a, unsigned long n);
-
-   /** get small constant 
-      @param a    Number to read, only fetches upto bits_per_digit from the number
-      @return  The lower bits_per_digit of the integer (unsigned)
-   */
-   unsigned long (*get_int)(void *a);
-
-   /** get digit n 
-     @param a  The number to read from
-     @param n  The number of the digit to fetch
-     @return  The bits_per_digit  sized n'th digit of a
-   */
-   unsigned long (*get_digit)(void *a, int n);
-
-   /** Get the number of digits that represent the number
-     @param a   The number to count
-     @return The number of digits used to represent the number
-   */
-   int (*get_digit_count)(void *a);
-
-   /** compare two integers
-     @param a   The left side integer
-     @param b   The right side integer
-     @return LTC_MP_LT if a < b, LTC_MP_GT if a > b and LTC_MP_EQ otherwise.  (signed comparison)
-   */
-   int (*compare)(void *a, void *b);
-
-   /** compare against int 
-     @param a   The left side integer
-     @param b   The right side integer (upto bits_per_digit)
-     @return LTC_MP_LT if a < b, LTC_MP_GT if a > b and LTC_MP_EQ otherwise.  (signed comparison)
-   */
-   int (*compare_d)(void *a, unsigned long n);
-
-   /** Count the number of bits used to represent the integer
-     @param a   The integer to count
-     @return The number of bits required to represent the integer
-   */
-   int (*count_bits)(void * a);
-
-   /** Count the number of LSB bits which are zero 
-     @param a   The integer to count
-     @return The number of contiguous zero LSB bits
-   */
-   int (*count_lsb_bits)(void *a);
-
-   /** Compute a power of two
-     @param a  The integer to store the power in
-     @param n  The power of two you want to store (a = 2^n)
-     @return CRYPT_OK on success
-   */
-   int (*twoexpt)(void *a , int n);
-
-/* ---- radix conversions ---- */
-   
-   /** read ascii string 
-     @param a     The integer to store into
-     @param str   The string to read
-     @param radix The radix the integer has been represented in (2-64)
-     @return CRYPT_OK on success
-   */
-   int (*read_radix)(void *a, const char *str, int radix);
-
-   /** write number to string
-     @param a     The integer to store
-     @param str   The destination for the string
-     @param radix The radix the integer is to be represented in (2-64)
-     @return CRYPT_OK on success
-   */
-   int (*write_radix)(void *a, char *str, int radix);
-
-   /** get size as unsigned char string 
-     @param a     The integer to get the size (when stored in array of octets)
-     @return The length of the integer
-   */
-   unsigned long (*unsigned_size)(void *a);
-
-   /** store an integer as an array of octets 
-     @param src   The integer to store
-     @param dst   The buffer to store the integer in
-     @return CRYPT_OK on success
-   */
-   int (*unsigned_write)(void *src, unsigned char *dst);
-
-   /** read an array of octets and store as integer
-     @param dst   The integer to load
-     @param src   The array of octets 
-     @param len   The number of octets 
-     @return CRYPT_OK on success
-   */
-   int (*unsigned_read)(void *dst, unsigned char *src, unsigned long len);
-
-/* ---- basic math ---- */
-
-   /** add two integers 
-     @param a   The first source integer
-     @param b   The second source integer
-     @param c   The destination of "a + b"
-     @return CRYPT_OK on success
-   */
-   int (*add)(void *a, void *b, void *c);
-
-
-   /** add two integers 
-     @param a   The first source integer
-     @param b   The second source integer (single digit of upto bits_per_digit in length)
-     @param c   The destination of "a + b"
-     @return CRYPT_OK on success
-   */
-   int (*addi)(void *a, unsigned long b, void *c);
-
-   /** subtract two integers 
-     @param a   The first source integer
-     @param b   The second source integer
-     @param c   The destination of "a - b"
-     @return CRYPT_OK on success
-   */
-   int (*sub)(void *a, void *b, void *c);
-
-   /** subtract two integers 
-     @param a   The first source integer
-     @param b   The second source integer (single digit of upto bits_per_digit in length)
-     @param c   The destination of "a - b"
-     @return CRYPT_OK on success
-   */
-   int (*subi)(void *a, unsigned long b, void *c);
-
-   /** multiply two integers 
-     @param a   The first source integer
-     @param b   The second source integer (single digit of upto bits_per_digit in length)
-     @param c   The destination of "a * b"
-     @return CRYPT_OK on success
-   */
-   int (*mul)(void *a, void *b, void *c);
-
-   /** multiply two integers 
-     @param a   The first source integer
-     @param b   The second source integer (single digit of upto bits_per_digit in length)
-     @param c   The destination of "a * b"
-     @return CRYPT_OK on success
-   */
-   int (*muli)(void *a, unsigned long b, void *c);
-
-   /** Square an integer
-     @param a    The integer to square
-     @param b    The destination
-     @return CRYPT_OK on success
-   */
-   int (*sqr)(void *a, void *b);
-
-   /** Divide an integer
-     @param a    The dividend
-     @param b    The divisor
-     @param c    The quotient (can be NULL to signify don't care)
-     @param d    The remainder (can be NULL to signify don't care)
-     @return CRYPT_OK on success
-   */
-   int (*mpdiv)(void *a, void *b, void *c, void *d);
-
-   /** divide by two 
-      @param  a   The integer to divide (shift right)
-      @param  b   The destination 
-      @return CRYPT_OK on success
-   */
-   int (*div_2)(void *a, void *b);
-
-   /** Get remainder (small value)
-      @param  a    The integer to reduce
-      @param  b    The modulus (upto bits_per_digit in length)
-      @param  c    The destination for the residue
-      @return CRYPT_OK on success
-   */
-   int (*modi)(void *a, unsigned long b, unsigned long *c);
-
-   /** gcd 
-      @param  a     The first integer
-      @param  b     The second integer
-      @param  c     The destination for (a, b)
-      @return CRYPT_OK on success
-   */
-   int (*gcd)(void *a, void *b, void *c);
-
-   /** lcm 
-      @param  a     The first integer
-      @param  b     The second integer
-      @param  c     The destination for [a, b]
-      @return CRYPT_OK on success
-   */
-   int (*lcm)(void *a, void *b, void *c);
-
-   /** Modular multiplication
-      @param  a     The first source
-      @param  b     The second source 
-      @param  c     The modulus
-      @param  d     The destination (a*b mod c)
-      @return CRYPT_OK on success
-   */
-   int (*mulmod)(void *a, void *b, void *c, void *d);
-
-   /** Modular squaring
-      @param  a     The first source
-      @param  b     The modulus
-      @param  c     The destination (a*a mod b)
-      @return CRYPT_OK on success
-   */
-   int (*sqrmod)(void *a, void *b, void *c);
-
-   /** Modular inversion
-      @param  a     The value to invert
-      @param  b     The modulus 
-      @param  c     The destination (1/a mod b)
-      @return CRYPT_OK on success
-   */
-   int (*invmod)(void *, void *, void *);
-
-/* ---- reduction ---- */
-
-   /** setup montgomery
-       @param a  The modulus 
-       @param b  The destination for the reduction digit 
-       @return CRYPT_OK on success
-   */
-   int (*montgomery_setup)(void *a, void **b);
-
-   /** get normalization value 
-       @param a   The destination for the normalization value
-       @param b   The modulus
-       @return  CRYPT_OK on success
-   */
-   int (*montgomery_normalization)(void *a, void *b);
-
-   /** reduce a number
-       @param a   The number [and dest] to reduce
-       @param b   The modulus
-       @param c   The value "b" from montgomery_setup()
-       @return CRYPT_OK on success
-   */
-   int (*montgomery_reduce)(void *a, void *b, void *c);
-
-   /** clean up  (frees memory)
-       @param a   The value "b" from montgomery_setup()
-       @return CRYPT_OK on success
-   */      
-   void (*montgomery_deinit)(void *a);
-
-/* ---- exponentiation ---- */
-
-   /** Modular exponentiation
-       @param a    The base integer
-       @param b    The power (can be negative) integer
-       @param c    The modulus integer
-       @param d    The destination
-       @return CRYPT_OK on success
-   */
-   int (*exptmod)(void *a, void *b, void *c, void *d);
-
-   /** Primality testing
-       @param a     The integer to test
-       @param b     The destination of the result (FP_YES if prime)
-       @return CRYPT_OK on success
-   */
-   int (*isprime)(void *a, int *b);
-
-/* ----  (optional) ecc point math ---- */
-
-   /** ECC GF(p) point multiplication (from the NIST curves)
-       @param k   The integer to multiply the point by
-       @param G   The point to multiply
-       @param R   The destination for kG  
-       @param modulus  The modulus for the field
-       @param map Boolean indicated whether to map back to affine or not (can be ignored if you work in affine only)
-       @return CRYPT_OK on success
-   */
-   int (*ecc_ptmul)(void *k, ecc_point *G, ecc_point *R, void *modulus, int map);
-
-   /** ECC GF(p) point addition 
-       @param P    The first point
-       @param Q    The second point
-       @param R    The destination of P + Q
-       @param modulus  The modulus
-       @param mp   The "b" value from montgomery_setup()
-       @return CRYPT_OK on success
-   */
-   int (*ecc_ptadd)(ecc_point *P, ecc_point *Q, ecc_point *R, void *modulus, void *mp);
-
-   /** ECC GF(p) point double 
-       @param P    The first point
-       @param R    The destination of 2P
-       @param modulus  The modulus
-       @param mp   The "b" value from montgomery_setup()
-       @return CRYPT_OK on success
-   */
-   int (*ecc_ptdbl)(ecc_point *P, ecc_point *R, void *modulus, void *mp);
-
-   /** ECC mapping from projective to affine, currently uses (x,y,z) => (x/z^2, y/z^3, 1)
-       @param P     The point to map
-       @param modulus The modulus
-       @param mp    The "b" value from montgomery_setup()
-       @return CRYPT_OK on success
-       @remark  The mapping can be different but keep in mind a ecc_point only has three 
-                integers (x,y,z) so if you use a different mapping you have to make it fit.
-   */
-   int (*ecc_map)(ecc_point *P, void *modulus, void *mp);
-
-   /** Computes kA*A + kB*B = C using Shamir's Trick
-       @param A        First point to multiply
-       @param kA       What to multiple A by
-       @param B        Second point to multiply
-       @param kB       What to multiple B by
-       @param C        [out] Destination point (can overlap with A or B
-       @param modulus  Modulus for curve 
-       @return CRYPT_OK on success
-   */ 
-   int (*ecc_mul2add)(ecc_point *A, void *kA,
-                      ecc_point *B, void *kB,
-                      ecc_point *C,
-                           void *modulus);
-
-/* ---- (optional) rsa optimized math (for internal CRT) ---- */
-
-   /** RSA Key Generation 
-       @param prng     An active PRNG state
-       @param wprng    The index of the PRNG desired
-       @param size     The size of the modulus (key size) desired (octets)
-       @param e        The "e" value (public key).  e==65537 is a good choice
-       @param key      [out] Destination of a newly created private key pair
-       @return CRYPT_OK if successful, upon error all allocated ram is freed
-    */
-    int (*rsa_keygen)(prng_state *prng, int wprng, int size, long e, rsa_key *key);
-   
-
-   /** RSA exponentiation
-      @param in       The octet array representing the base
-      @param inlen    The length of the input
-      @param out      The destination (to be stored in an octet array format)
-      @param outlen   The length of the output buffer and the resulting size (zero padded to the size of the modulus)
-      @param which    PK_PUBLIC for public RSA and PK_PRIVATE for private RSA
-      @param key      The RSA key to use 
-      @return CRYPT_OK on success
-   */
-   int (*rsa_me)(const unsigned char *in,   unsigned long inlen,
-                       unsigned char *out,  unsigned long *outlen, int which,
-                       rsa_key *key);
-} ltc_math_descriptor;
-
-extern ltc_math_descriptor ltc_mp;
-
-int ltc_init_multi(void **a, ...);
-void ltc_deinit_multi(void *a, ...);
-
-#ifdef LTM_DESC
-extern const ltc_math_descriptor ltm_desc;
-#endif
-
-#ifdef TFM_DESC
-extern const ltc_math_descriptor tfm_desc;
-#endif
-
-#ifdef GMP_DESC
-extern const ltc_math_descriptor gmp_desc;
-#endif
-
-#if !defined(DESC_DEF_ONLY) && defined(LTC_SOURCE)
-
-#define MP_DIGIT_BIT                 ltc_mp.bits_per_digit
-
-/* some handy macros */
-#define mp_init(a)                   ltc_mp.init(a)
-#define mp_init_multi                ltc_init_multi
-#define mp_clear(a)                  ltc_mp.deinit(a)
-#define mp_clear_multi               ltc_deinit_multi
-#define mp_init_copy(a, b)           ltc_mp.init_copy(a, b)
-
-#define mp_neg(a, b)                 ltc_mp.neg(a, b)
-#define mp_copy(a, b)                ltc_mp.copy(a, b)
-
-#define mp_set(a, b)                 ltc_mp.set_int(a, b)
-#define mp_set_int(a, b)             ltc_mp.set_int(a, b)
-#define mp_get_int(a)                ltc_mp.get_int(a)
-#define mp_get_digit(a, n)           ltc_mp.get_digit(a, n)
-#define mp_get_digit_count(a)        ltc_mp.get_digit_count(a)
-#define mp_cmp(a, b)                 ltc_mp.compare(a, b)
-#define mp_cmp_d(a, b)               ltc_mp.compare_d(a, b)
-#define mp_count_bits(a)             ltc_mp.count_bits(a)
-#define mp_cnt_lsb(a)                ltc_mp.count_lsb_bits(a)
-#define mp_2expt(a, b)               ltc_mp.twoexpt(a, b)
-
-#define mp_read_radix(a, b, c)       ltc_mp.read_radix(a, b, c)
-#define mp_toradix(a, b, c)          ltc_mp.write_radix(a, b, c)
-#define mp_unsigned_bin_size(a)      ltc_mp.unsigned_size(a)
-#define mp_to_unsigned_bin(a, b)     ltc_mp.unsigned_write(a, b)
-#define mp_read_unsigned_bin(a, b, c) ltc_mp.unsigned_read(a, b, c)
-
-#define mp_add(a, b, c)              ltc_mp.add(a, b, c)
-#define mp_add_d(a, b, c)            ltc_mp.addi(a, b, c)
-#define mp_sub(a, b, c)              ltc_mp.sub(a, b, c)
-#define mp_sub_d(a, b, c)            ltc_mp.subi(a, b, c)
-#define mp_mul(a, b, c)              ltc_mp.mul(a, b, c)
-#define mp_mul_d(a, b, c)            ltc_mp.muli(a, b, c)
-#define mp_sqr(a, b)                 ltc_mp.sqr(a, b)
-#define mp_div(a, b, c, d)           ltc_mp.mpdiv(a, b, c, d)
-#define mp_div_2(a, b)               ltc_mp.div_2(a, b)
-#define mp_mod(a, b, c)              ltc_mp.mpdiv(a, b, NULL, c)
-#define mp_mod_d(a, b, c)            ltc_mp.modi(a, b, c)
-#define mp_gcd(a, b, c)              ltc_mp.gcd(a, b, c)
-#define mp_lcm(a, b, c)              ltc_mp.lcm(a, b, c)
-
-#define mp_mulmod(a, b, c, d)        ltc_mp.mulmod(a, b, c, d)
-#define mp_sqrmod(a, b, c)           ltc_mp.sqrmod(a, b, c)
-#define mp_invmod(a, b, c)           ltc_mp.invmod(a, b, c)
-
-#define mp_montgomery_setup(a, b)    ltc_mp.montgomery_setup(a, b)
-#define mp_montgomery_normalization(a, b) ltc_mp.montgomery_normalization(a, b)
-#define mp_montgomery_reduce(a, b, c)   ltc_mp.montgomery_reduce(a, b, c)
-#define mp_montgomery_free(a)        ltc_mp.montgomery_deinit(a)
-
-#define mp_exptmod(a,b,c,d)          ltc_mp.exptmod(a,b,c,d)
-#define mp_prime_is_prime(a, b, c)   ltc_mp.isprime(a, c)
-
-#define mp_iszero(a)                 (mp_cmp_d(a, 0) == LTC_MP_EQ ? LTC_MP_YES : LTC_MP_NO)
-#define mp_isodd(a)                  (mp_get_digit_count(a) > 0 ? (mp_get_digit(a, 0) & 1 ? LTC_MP_YES : LTC_MP_NO) : LTC_MP_NO)
-#define mp_exch(a, b)                do { void *ABC__tmp = a; a = b; b = ABC__tmp; } while(0);
-
-#define mp_tohex(a, b)               mp_toradix(a, b, 16)
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_math.h,v $ */
-/* $Revision: 1.44 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_misc.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_misc.h
deleted file mode 100644
index f5384cacc..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_misc.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ---- LTC_BASE64 Routines ---- */
-#ifdef LTC_BASE64
-int base64_encode(const unsigned char *in,  unsigned long len, 
-                        unsigned char *out, unsigned long *outlen);
-
-int base64_decode(const unsigned char *in,  unsigned long len, 
-                        unsigned char *out, unsigned long *outlen);
-#endif
-
-/* ---- MEM routines ---- */
-void zeromem(void *dst, size_t len);
-void burn_stack(unsigned long len);
-
-const char *error_to_string(int err);
-
-extern const char *crypt_build_settings;
-
-/* ---- HMM ---- */
-int crypt_fsa(void *mp, ...);
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_misc.h,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_pk.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_pk.h
deleted file mode 100644
index b5f277a88..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_pk.h
+++ /dev/null
@@ -1,558 +0,0 @@
-/* ---- NUMBER THEORY ---- */
-
-enum {
-   PK_PUBLIC=0,
-   PK_PRIVATE=1
-};
-
-int rand_prime(void *N, long len, prng_state *prng, int wprng);
-
-/* ---- RSA ---- */
-#ifdef LTC_MRSA
-
-/* Min and Max RSA key sizes (in bits) */
-#define MIN_RSA_SIZE 1024
-#define MAX_RSA_SIZE 4096
-
-/** RSA LTC_PKCS style key */
-typedef struct Rsa_key {
-    /** Type of key, PK_PRIVATE or PK_PUBLIC */
-    int type;
-    /** The public exponent */
-    void *e; 
-    /** The private exponent */
-    void *d; 
-    /** The modulus */
-    void *N; 
-    /** The p factor of N */
-    void *p; 
-    /** The q factor of N */
-    void *q; 
-    /** The 1/q mod p CRT param */
-    void *qP; 
-    /** The d mod (p - 1) CRT param */
-    void *dP; 
-    /** The d mod (q - 1) CRT param */
-    void *dQ;
-} rsa_key;
-
-int rsa_make_key(prng_state *prng, int wprng, int size, long e, rsa_key *key);
-
-int rsa_exptmod(const unsigned char *in,   unsigned long inlen,
-                      unsigned char *out,  unsigned long *outlen, int which,
-                      rsa_key *key);
-
-void rsa_free(rsa_key *key);
-
-/* These use LTC_PKCS #1 v2.0 padding */
-#define rsa_encrypt_key(_in, _inlen, _out, _outlen, _lparam, _lparamlen, _prng, _prng_idx, _hash_idx, _key) \
-  rsa_encrypt_key_ex(_in, _inlen, _out, _outlen, _lparam, _lparamlen, _prng, _prng_idx, _hash_idx, LTC_LTC_PKCS_1_OAEP, _key)
-
-#define rsa_decrypt_key(_in, _inlen, _out, _outlen, _lparam, _lparamlen, _hash_idx, _stat, _key) \
-  rsa_decrypt_key_ex(_in, _inlen, _out, _outlen, _lparam, _lparamlen, _hash_idx, LTC_LTC_PKCS_1_OAEP, _stat, _key)
-
-#define rsa_sign_hash(_in, _inlen, _out, _outlen, _prng, _prng_idx, _hash_idx, _saltlen, _key) \
-  rsa_sign_hash_ex(_in, _inlen, _out, _outlen, LTC_LTC_PKCS_1_PSS, _prng, _prng_idx, _hash_idx, _saltlen, _key)
-
-#define rsa_verify_hash(_sig, _siglen, _hash, _hashlen, _hash_idx, _saltlen, _stat, _key) \
-  rsa_verify_hash_ex(_sig, _siglen, _hash, _hashlen, LTC_LTC_PKCS_1_PSS, _hash_idx, _saltlen, _stat, _key)
-
-/* These can be switched between LTC_PKCS #1 v2.x and LTC_PKCS #1 v1.5 paddings */
-int rsa_encrypt_key_ex(const unsigned char *in,     unsigned long inlen,
-                             unsigned char *out,    unsigned long *outlen,
-                       const unsigned char *lparam, unsigned long lparamlen,
-                       prng_state *prng, int prng_idx, int hash_idx, int padding, rsa_key *key);
-
-int rsa_decrypt_key_ex(const unsigned char *in,       unsigned long  inlen,
-                             unsigned char *out,      unsigned long *outlen,
-                       const unsigned char *lparam,   unsigned long  lparamlen,
-                             int            hash_idx, int            padding,
-                             int           *stat,     rsa_key       *key);
-
-int rsa_sign_hash_ex(const unsigned char *in,       unsigned long  inlen,
-                           unsigned char *out,      unsigned long *outlen,
-                           int            padding,
-                           prng_state    *prng,     int            prng_idx,
-                           int            hash_idx, unsigned long  saltlen,
-                           rsa_key *key);
-
-int rsa_verify_hash_ex(const unsigned char *sig,      unsigned long siglen,
-                       const unsigned char *hash,     unsigned long hashlen,
-                             int            padding,
-                             int            hash_idx, unsigned long saltlen,
-                             int           *stat,     rsa_key      *key);
-
-/* LTC_PKCS #1 import/export */
-int rsa_export(unsigned char *out, unsigned long *outlen, int type, rsa_key *key);
-int rsa_import(const unsigned char *in, unsigned long inlen, rsa_key *key);
-
-/* Ladik: Added for verifying Blizzard strong signature verification */
-int rsa_verify_simple(const unsigned char *sig,  unsigned long siglen,
-                      const unsigned char *hash, unsigned long hashlen,
-                            int           *stat,
-                            rsa_key       *key);
-
-#endif
-
-/* ---- Katja ---- */
-#ifdef MKAT
-
-/* Min and Max KAT key sizes (in bits) */
-#define MIN_KAT_SIZE 1024
-#define MAX_KAT_SIZE 4096
-
-/** Katja LTC_PKCS style key */
-typedef struct KAT_key {
-    /** Type of key, PK_PRIVATE or PK_PUBLIC */
-    int type;
-    /** The private exponent */
-    void *d; 
-    /** The modulus */
-    void *N; 
-    /** The p factor of N */
-    void *p; 
-    /** The q factor of N */
-    void *q; 
-    /** The 1/q mod p CRT param */
-    void *qP; 
-    /** The d mod (p - 1) CRT param */
-    void *dP; 
-    /** The d mod (q - 1) CRT param */
-    void *dQ;
-    /** The pq param */
-    void *pq;
-} katja_key;
-
-int katja_make_key(prng_state *prng, int wprng, int size, katja_key *key);
-
-int katja_exptmod(const unsigned char *in,   unsigned long inlen,
-                        unsigned char *out,  unsigned long *outlen, int which,
-                        katja_key *key);
-
-void katja_free(katja_key *key);
-
-/* These use LTC_PKCS #1 v2.0 padding */
-int katja_encrypt_key(const unsigned char *in,     unsigned long inlen,
-                            unsigned char *out,    unsigned long *outlen,
-                      const unsigned char *lparam, unsigned long lparamlen,
-                      prng_state *prng, int prng_idx, int hash_idx, katja_key *key);
-                                        
-int katja_decrypt_key(const unsigned char *in,       unsigned long inlen,
-                            unsigned char *out,      unsigned long *outlen, 
-                      const unsigned char *lparam,   unsigned long lparamlen,
-                            int            hash_idx, int *stat,
-                            katja_key       *key);
-
-/* LTC_PKCS #1 import/export */
-int katja_export(unsigned char *out, unsigned long *outlen, int type, katja_key *key);
-int katja_import(const unsigned char *in, unsigned long inlen, katja_key *key);
-                        
-#endif
-
-/* ---- ECC Routines ---- */
-#ifdef LTC_MECC
-
-/* size of our temp buffers for exported keys */
-#define ECC_BUF_SIZE 256
-
-/* max private key size */
-#define ECC_MAXSIZE  66
-
-/** Structure defines a NIST GF(p) curve */
-typedef struct {
-   /** The size of the curve in octets */
-   int size;
-
-   /** name of curve */
-   char *name; 
-
-   /** The prime that defines the field the curve is in (encoded in hex) */
-   char *prime;
-
-   /** The fields B param (hex) */
-   char *B;
-
-   /** The order of the curve (hex) */
-   char *order;
-  
-   /** The x co-ordinate of the base point on the curve (hex) */
-   char *Gx;
- 
-   /** The y co-ordinate of the base point on the curve (hex) */
-   char *Gy;
-} ltc_ecc_set_type;
-
-/** A point on a ECC curve, stored in Jacbobian format such that (x,y,z) => (x/z^2, y/z^3, 1) when interpretted as affine */
-typedef struct {
-    /** The x co-ordinate */
-    void *x;
-
-    /** The y co-ordinate */
-    void *y;
-
-    /** The z co-ordinate */
-    void *z;
-} ecc_point;
-
-/** An ECC key */
-typedef struct {
-    /** Type of key, PK_PRIVATE or PK_PUBLIC */
-    int type;
-
-    /** Index into the ltc_ecc_sets[] for the parameters of this curve; if -1, then this key is using user supplied curve in dp */
-    int idx;
-
-	/** pointer to domain parameters; either points to NIST curves (identified by idx >= 0) or user supplied curve */
-	const ltc_ecc_set_type *dp;
-
-    /** The public key */
-    ecc_point pubkey;
-
-    /** The private key */
-    void *k;
-} ecc_key;
-
-/** the ECC params provided */
-extern const ltc_ecc_set_type ltc_ecc_sets[];
-
-int  ecc_test(void);
-void ecc_sizes(int *low, int *high);
-int  ecc_get_size(ecc_key *key);
-
-int  ecc_make_key(prng_state *prng, int wprng, int keysize, ecc_key *key);
-int  ecc_make_key_ex(prng_state *prng, int wprng, ecc_key *key, const ltc_ecc_set_type *dp);
-void ecc_free(ecc_key *key);
-
-int  ecc_export(unsigned char *out, unsigned long *outlen, int type, ecc_key *key);
-int  ecc_import(const unsigned char *in, unsigned long inlen, ecc_key *key);
-int  ecc_import_ex(const unsigned char *in, unsigned long inlen, ecc_key *key, const ltc_ecc_set_type *dp);
-
-int ecc_ansi_x963_export(ecc_key *key, unsigned char *out, unsigned long *outlen);
-int ecc_ansi_x963_import(const unsigned char *in, unsigned long inlen, ecc_key *key);
-int ecc_ansi_x963_import_ex(const unsigned char *in, unsigned long inlen, ecc_key *key, ltc_ecc_set_type *dp);
-
-int  ecc_shared_secret(ecc_key *private_key, ecc_key *public_key, 
-                       unsigned char *out, unsigned long *outlen);
-
-int  ecc_encrypt_key(const unsigned char *in,   unsigned long inlen,
-                           unsigned char *out,  unsigned long *outlen, 
-                           prng_state *prng, int wprng, int hash, 
-                           ecc_key *key);
-
-int  ecc_decrypt_key(const unsigned char *in,  unsigned long  inlen,
-                           unsigned char *out, unsigned long *outlen, 
-                           ecc_key *key);
-
-int  ecc_sign_hash(const unsigned char *in,  unsigned long inlen, 
-                         unsigned char *out, unsigned long *outlen, 
-                         prng_state *prng, int wprng, ecc_key *key);
-
-int  ecc_verify_hash(const unsigned char *sig,  unsigned long siglen,
-                     const unsigned char *hash, unsigned long hashlen, 
-                     int *stat, ecc_key *key);
-
-/* low level functions */
-ecc_point *ltc_ecc_new_point(void);
-void       ltc_ecc_del_point(ecc_point *p);
-int        ltc_ecc_is_valid_idx(int n);
-
-/* point ops (mp == montgomery digit) */
-#if !defined(LTC_MECC_ACCEL) || defined(LTM_LTC_DESC) || defined(GMP_LTC_DESC)
-/* R = 2P */
-int ltc_ecc_projective_dbl_point(ecc_point *P, ecc_point *R, void *modulus, void *mp);
-
-/* R = P + Q */
-int ltc_ecc_projective_add_point(ecc_point *P, ecc_point *Q, ecc_point *R, void *modulus, void *mp);
-#endif
-
-#if defined(LTC_MECC_FP)
-/* optimized point multiplication using fixed point cache (HAC algorithm 14.117) */
-int ltc_ecc_fp_mulmod(void *k, ecc_point *G, ecc_point *R, void *modulus, int map);
-
-/* functions for saving/loading/freeing/adding to fixed point cache */
-int ltc_ecc_fp_save_state(unsigned char **out, unsigned long *outlen);
-int ltc_ecc_fp_restore_state(unsigned char *in, unsigned long inlen);
-void ltc_ecc_fp_free(void);
-int ltc_ecc_fp_add_point(ecc_point *g, void *modulus, int lock);
-
-/* lock/unlock all points currently in fixed point cache */
-void ltc_ecc_fp_tablelock(int lock);
-#endif
-
-/* R = kG */
-int ltc_ecc_mulmod(void *k, ecc_point *G, ecc_point *R, void *modulus, int map);
-
-#ifdef LTC_ECC_SHAMIR
-/* kA*A + kB*B = C */
-int ltc_ecc_mul2add(ecc_point *A, void *kA,
-                    ecc_point *B, void *kB,
-                    ecc_point *C,
-                         void *modulus);
-
-#ifdef LTC_MECC_FP
-/* Shamir's trick with optimized point multiplication using fixed point cache */
-int ltc_ecc_fp_mul2add(ecc_point *A, void *kA,
-                       ecc_point *B, void *kB,
-                       ecc_point *C, void *modulus);
-#endif
-
-#endif
-
-
-/* map P to affine from projective */
-int ltc_ecc_map(ecc_point *P, void *modulus, void *mp);
-
-#endif
-
-#ifdef LTC_MDSA
-
-/* Max diff between group and modulus size in bytes */
-#define LTC_MDSA_DELTA     512
-
-/* Max DSA group size in bytes (default allows 4k-bit groups) */
-#define LTC_MDSA_MAX_GROUP 512
-
-/** DSA key structure */
-typedef struct {
-   /** The key type, PK_PRIVATE or PK_PUBLIC */
-   int type; 
-
-   /** The order of the sub-group used in octets */
-   int qord;
-
-   /** The generator  */
-   void *g;
-
-   /** The prime used to generate the sub-group */
-   void *q;
-
-   /** The large prime that generats the field the contains the sub-group */
-   void *p;
-
-   /** The private key */
-   void *x;
-
-   /** The public key */
-   void *y;
-} dsa_key;
-
-int dsa_make_key(prng_state *prng, int wprng, int group_size, int modulus_size, dsa_key *key);
-void dsa_free(dsa_key *key);
-
-int dsa_sign_hash_raw(const unsigned char *in,  unsigned long inlen,
-                                   void *r,   void *s,
-                               prng_state *prng, int wprng, dsa_key *key);
-
-int dsa_sign_hash(const unsigned char *in,  unsigned long inlen,
-                        unsigned char *out, unsigned long *outlen,
-                        prng_state *prng, int wprng, dsa_key *key);
-
-int dsa_verify_hash_raw(         void *r,          void *s,
-                    const unsigned char *hash, unsigned long hashlen, 
-                                    int *stat,      dsa_key *key);
-
-int dsa_verify_hash(const unsigned char *sig,  unsigned long siglen,
-                    const unsigned char *hash, unsigned long hashlen, 
-                          int           *stat, dsa_key       *key);
-
-int dsa_encrypt_key(const unsigned char *in,   unsigned long inlen,
-                          unsigned char *out,  unsigned long *outlen, 
-                          prng_state *prng, int wprng, int hash, 
-                          dsa_key *key);
-                      
-int dsa_decrypt_key(const unsigned char *in,  unsigned long  inlen,
-                          unsigned char *out, unsigned long *outlen, 
-                          dsa_key *key);
-                          
-int dsa_import(const unsigned char *in, unsigned long inlen, dsa_key *key);
-int dsa_export(unsigned char *out, unsigned long *outlen, int type, dsa_key *key);
-int dsa_verify_key(dsa_key *key, int *stat);
-
-int dsa_shared_secret(void          *private_key, void *base,
-                      dsa_key       *public_key,
-                      unsigned char *out,         unsigned long *outlen);
-#endif
-
-#ifdef LTC_DER
-/* DER handling */
-
-enum {
- LTC_ASN1_EOL,
- LTC_ASN1_BOOLEAN,
- LTC_ASN1_INTEGER,
- LTC_ASN1_SHORT_INTEGER,
- LTC_ASN1_BIT_STRING,
- LTC_ASN1_OCTET_STRING,
- LTC_ASN1_NULL,
- LTC_ASN1_OBJECT_IDENTIFIER,
- LTC_ASN1_IA5_STRING,
- LTC_ASN1_PRINTABLE_STRING,
- LTC_ASN1_UTF8_STRING,
- LTC_ASN1_UTCTIME,
- LTC_ASN1_CHOICE,
- LTC_ASN1_SEQUENCE,
- LTC_ASN1_SET,
- LTC_ASN1_SETOF
-};
-
-/** A LTC ASN.1 list type */
-typedef struct ltc_asn1_list_ {
-   /** The LTC ASN.1 enumerated type identifier */
-   int           type;
-   /** The data to encode or place for decoding */
-   void         *data;
-   /** The size of the input or resulting output */
-   unsigned long size;
-   /** The used flag, this is used by the CHOICE ASN.1 type to indicate which choice was made */
-   int           used;
-   /** prev/next entry in the list */
-   struct ltc_asn1_list_ *prev, *next, *child, *parent;
-} ltc_asn1_list;
-
-#define LTC_SET_ASN1(list, index, Type, Data, Size)  \
-   do {                                              \
-      int LTC_MACRO_temp            = (index);       \
-      ltc_asn1_list *LTC_MACRO_list = (list);        \
-      LTC_MACRO_list[LTC_MACRO_temp].type = (Type);  \
-      LTC_MACRO_list[LTC_MACRO_temp].data = (void*)(Data);  \
-      LTC_MACRO_list[LTC_MACRO_temp].size = (Size);  \
-      LTC_MACRO_list[LTC_MACRO_temp].used = 0;       \
-   } while (0);
-
-/* SEQUENCE */
-int der_encode_sequence_ex(ltc_asn1_list *list, unsigned long inlen,
-                           unsigned char *out,  unsigned long *outlen, int type_of);
-                          
-#define der_encode_sequence(list, inlen, out, outlen) der_encode_sequence_ex(list, inlen, out, outlen, LTC_ASN1_SEQUENCE)                        
-
-int der_decode_sequence_ex(const unsigned char *in, unsigned long  inlen,
-                           ltc_asn1_list *list,     unsigned long  outlen, int ordered);
-                              
-#define der_decode_sequence(in, inlen, list, outlen) der_decode_sequence_ex(in, inlen, list, outlen, 1)
-
-int der_length_sequence(ltc_asn1_list *list, unsigned long inlen,
-                        unsigned long *outlen);
-
-/* SET */
-#define der_decode_set(in, inlen, list, outlen) der_decode_sequence_ex(in, inlen, list, outlen, 0)
-#define der_length_set der_length_sequence
-int der_encode_set(ltc_asn1_list *list, unsigned long inlen,
-                   unsigned char *out,  unsigned long *outlen);
-
-int der_encode_setof(ltc_asn1_list *list, unsigned long inlen,
-                     unsigned char *out,  unsigned long *outlen);
-                        
-/* VA list handy helpers with triplets of <type, size, data> */
-int der_encode_sequence_multi(unsigned char *out, unsigned long *outlen, ...);
-int der_decode_sequence_multi(const unsigned char *in, unsigned long inlen, ...);
-
-/* FLEXI DECODER handle unknown list decoder */
-int  der_decode_sequence_flexi(const unsigned char *in, unsigned long *inlen, ltc_asn1_list **out);
-void der_free_sequence_flexi(ltc_asn1_list *list);
-void der_sequence_free(ltc_asn1_list *in);
-
-/* BOOLEAN */
-int der_length_boolean(unsigned long *outlen);
-int der_encode_boolean(int in, 
-                       unsigned char *out, unsigned long *outlen);
-int der_decode_boolean(const unsigned char *in, unsigned long inlen,
-                                       int *out);		       
-/* INTEGER */
-int der_encode_integer(void *num, unsigned char *out, unsigned long *outlen);
-int der_decode_integer(const unsigned char *in, unsigned long inlen, void *num);
-int der_length_integer(void *num, unsigned long *len);
-
-/* INTEGER -- handy for 0..2^32-1 values */
-int der_decode_short_integer(const unsigned char *in, unsigned long inlen, unsigned long *num);
-int der_encode_short_integer(unsigned long num, unsigned char *out, unsigned long *outlen);
-int der_length_short_integer(unsigned long num, unsigned long *outlen);
-
-/* BIT STRING */
-int der_encode_bit_string(const unsigned char *in, unsigned long inlen,
-                                unsigned char *out, unsigned long *outlen);
-int der_decode_bit_string(const unsigned char *in, unsigned long inlen,
-                                unsigned char *out, unsigned long *outlen);
-int der_length_bit_string(unsigned long nbits, unsigned long *outlen);
-
-/* OCTET STRING */
-int der_encode_octet_string(const unsigned char *in, unsigned long inlen,
-                                  unsigned char *out, unsigned long *outlen);
-int der_decode_octet_string(const unsigned char *in, unsigned long inlen,
-                                  unsigned char *out, unsigned long *outlen);
-int der_length_octet_string(unsigned long noctets, unsigned long *outlen);
-
-/* OBJECT IDENTIFIER */
-int der_encode_object_identifier(unsigned long *words, unsigned long  nwords,
-                                 unsigned char *out,   unsigned long *outlen);
-int der_decode_object_identifier(const unsigned char *in,    unsigned long  inlen,
-                                       unsigned long *words, unsigned long *outlen);
-int der_length_object_identifier(unsigned long *words, unsigned long nwords, unsigned long *outlen);
-unsigned long der_object_identifier_bits(unsigned long x);
-
-/* IA5 STRING */
-int der_encode_ia5_string(const unsigned char *in, unsigned long inlen,
-                                unsigned char *out, unsigned long *outlen);
-int der_decode_ia5_string(const unsigned char *in, unsigned long inlen,
-                                unsigned char *out, unsigned long *outlen);
-int der_length_ia5_string(const unsigned char *octets, unsigned long noctets, unsigned long *outlen);
-
-int der_ia5_char_encode(int c);
-int der_ia5_value_decode(int v);
-
-/* Printable STRING */
-int der_encode_printable_string(const unsigned char *in, unsigned long inlen,
-                                unsigned char *out, unsigned long *outlen);
-int der_decode_printable_string(const unsigned char *in, unsigned long inlen,
-                                unsigned char *out, unsigned long *outlen);
-int der_length_printable_string(const unsigned char *octets, unsigned long noctets, unsigned long *outlen);
-
-int der_printable_char_encode(int c);
-int der_printable_value_decode(int v);
-
-/* UTF-8 */
-#if (defined(SIZE_MAX) || __STDC_VERSION__ >= 199901L || defined(WCHAR_MAX) || defined(_WCHAR_T) || defined(_WCHAR_T_DEFINED) || defined (__WCHAR_TYPE__)) && !defined(LTC_NO_WCHAR) 
-#include <wchar.h>
-#else
-typedef ulong32 wchar_t;
-#endif
-
-int der_encode_utf8_string(const wchar_t *in,  unsigned long inlen,
-                           unsigned char *out, unsigned long *outlen);
-
-int der_decode_utf8_string(const unsigned char *in,  unsigned long inlen,
-                                       wchar_t *out, unsigned long *outlen);
-unsigned long der_utf8_charsize(const wchar_t c);
-int der_length_utf8_string(const wchar_t *in, unsigned long noctets, unsigned long *outlen);
-
-
-/* CHOICE */
-int der_decode_choice(const unsigned char *in,   unsigned long *inlen,
-                            ltc_asn1_list *list, unsigned long  outlen);
-
-/* UTCTime */
-typedef struct {
-   unsigned YY, /* year */
-            MM, /* month */
-            DD, /* day */
-            hh, /* hour */
-            mm, /* minute */
-            ss, /* second */
-            off_dir, /* timezone offset direction 0 == +, 1 == - */
-            off_hh, /* timezone offset hours */
-            off_mm; /* timezone offset minutes */
-} ltc_utctime;
-
-int der_encode_utctime(ltc_utctime *utctime, 
-                       unsigned char *out,   unsigned long *outlen);
-
-int der_decode_utctime(const unsigned char *in, unsigned long *inlen,
-                             ltc_utctime   *out);
-
-int der_length_utctime(ltc_utctime *utctime, unsigned long *outlen);
-
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_pk.h,v $ */
-/* $Revision: 1.81 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_pkcs.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_pkcs.h
deleted file mode 100644
index 84fb82a62..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_pkcs.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* LTC_PKCS Header Info */
-
-/* ===> LTC_PKCS #1 -- RSA Cryptography <=== */
-#ifdef LTC_PKCS_1
-
-enum ltc_pkcs_1_v1_5_blocks
-{
-  LTC_LTC_PKCS_1_EMSA   = 1,        /* Block type 1 (LTC_PKCS #1 v1.5 signature padding) */
-  LTC_LTC_PKCS_1_EME    = 2         /* Block type 2 (LTC_PKCS #1 v1.5 encryption padding) */
-};
-
-enum ltc_pkcs_1_paddings
-{
-  LTC_LTC_PKCS_1_V1_5   = 1,        /* LTC_PKCS #1 v1.5 padding (\sa ltc_pkcs_1_v1_5_blocks) */
-  LTC_LTC_PKCS_1_OAEP   = 2,        /* LTC_PKCS #1 v2.0 encryption padding */
-  LTC_LTC_PKCS_1_PSS    = 3         /* LTC_PKCS #1 v2.1 signature padding */
-};
-
-int pkcs_1_mgf1(      int            hash_idx,
-                const unsigned char *seed, unsigned long seedlen,
-                      unsigned char *mask, unsigned long masklen);
-
-int pkcs_1_i2osp(void *n, unsigned long modulus_len, unsigned char *out);
-int pkcs_1_os2ip(void *n, unsigned char *in, unsigned long inlen);
-
-/* *** v1.5 padding */
-int pkcs_1_v1_5_encode(const unsigned char *msg, 
-                             unsigned long  msglen,
-                             int            block_type,
-                             unsigned long  modulus_bitlen,
-                                prng_state *prng, 
-                                       int  prng_idx,
-                             unsigned char *out, 
-                             unsigned long *outlen);
-
-int pkcs_1_v1_5_decode(const unsigned char *msg, 
-                             unsigned long  msglen,
-                                       int  block_type,
-                             unsigned long  modulus_bitlen,
-                             unsigned char *out, 
-                             unsigned long *outlen,
-                                       int *is_valid);
-
-/* *** v2.1 padding */
-int pkcs_1_oaep_encode(const unsigned char *msg,    unsigned long msglen,
-                       const unsigned char *lparam, unsigned long lparamlen,
-                             unsigned long modulus_bitlen, prng_state *prng,
-                             int           prng_idx,         int  hash_idx,
-                             unsigned char *out,    unsigned long *outlen);
-
-int pkcs_1_oaep_decode(const unsigned char *msg,    unsigned long msglen,
-                       const unsigned char *lparam, unsigned long lparamlen,
-                             unsigned long modulus_bitlen, int hash_idx,
-                             unsigned char *out,    unsigned long *outlen,
-                             int           *res);
-
-int pkcs_1_pss_encode(const unsigned char *msghash, unsigned long msghashlen,
-                            unsigned long saltlen,  prng_state   *prng,     
-                            int           prng_idx, int           hash_idx,
-                            unsigned long modulus_bitlen,
-                            unsigned char *out,     unsigned long *outlen);
-
-int pkcs_1_pss_decode(const unsigned char *msghash, unsigned long msghashlen,
-                      const unsigned char *sig,     unsigned long siglen,
-                            unsigned long saltlen,  int           hash_idx,
-                            unsigned long modulus_bitlen, int    *res);
-
-#endif /* LTC_PKCS_1 */
-
-/* ===> LTC_PKCS #5 -- Password Based Cryptography <=== */
-#ifdef LTC_PKCS_5
-
-/* Algorithm #1 (old) */
-int pkcs_5_alg1(const unsigned char *password, unsigned long password_len, 
-                const unsigned char *salt, 
-                int iteration_count,  int hash_idx,
-                unsigned char *out,   unsigned long *outlen);
-
-/* Algorithm #2 (new) */
-int pkcs_5_alg2(const unsigned char *password, unsigned long password_len, 
-                const unsigned char *salt,     unsigned long salt_len,
-                int iteration_count,           int hash_idx,
-                unsigned char *out,            unsigned long *outlen);
-
-#endif  /* LTC_PKCS_5 */
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_pkcs.h,v $ */
-/* $Revision: 1.8 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_prng.h b/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_prng.h
deleted file mode 100644
index f3e3e550e..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/headers/tomcrypt_prng.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* ---- PRNG Stuff ---- */
-#ifdef LTC_YARROW
-struct yarrow_prng {
-    int                   cipher, hash;
-    unsigned char         pool[MAXBLOCKSIZE];
-    symmetric_CTR         ctr;
-    LTC_MUTEX_TYPE(prng_lock)
-};
-#endif
-
-#ifdef LTC_RC4
-struct rc4_prng {
-    int x, y;
-    unsigned char buf[256];
-};
-#endif
-
-#ifdef LTC_FORTUNA
-struct fortuna_prng {
-    hash_state pool[LTC_FORTUNA_POOLS];     /* the  pools */
-
-    symmetric_key skey;
-
-    unsigned char K[32],      /* the current key */
-                  IV[16];     /* IV for CTR mode */
-    
-    unsigned long pool_idx,   /* current pool we will add to */
-                  pool0_len,  /* length of 0'th pool */
-                  wd;            
-
-    ulong64       reset_cnt;  /* number of times we have reset */
-    LTC_MUTEX_TYPE(prng_lock)
-};
-#endif
-
-#ifdef LTC_SOBER128
-struct sober128_prng {
-    ulong32      R[17],          /* Working storage for the shift register */
-                 initR[17],      /* saved register contents */ 
-                 konst,          /* key dependent constant */
-                 sbuf;           /* partial word encryption buffer */
-
-    int          nbuf,           /* number of part-word stream bits buffered */
-                 flag,           /* first add_entropy call or not? */
-                 set;            /* did we call add_entropy to set key? */
-    
-};
-#endif
-
-typedef union Prng_state {
-    char dummy[1];
-#ifdef LTC_YARROW
-    struct yarrow_prng    yarrow;
-#endif
-#ifdef LTC_RC4
-    struct rc4_prng       rc4;
-#endif
-#ifdef LTC_FORTUNA
-    struct fortuna_prng   fortuna;
-#endif
-#ifdef LTC_SOBER128
-    struct sober128_prng  sober128;
-#endif
-} prng_state;
-
-/** PRNG descriptor */
-extern struct ltc_prng_descriptor {
-    /** Name of the PRNG */
-    char *name;
-    /** size in bytes of exported state */
-    int  export_size;
-    /** Start a PRNG state
-        @param prng   [out] The state to initialize
-        @return CRYPT_OK if successful
-    */
-    int (*start)(prng_state *prng);
-    /** Add entropy to the PRNG
-        @param in         The entropy
-        @param inlen      Length of the entropy (octets)\
-        @param prng       The PRNG state
-        @return CRYPT_OK if successful
-    */
-    int (*add_entropy)(const unsigned char *in, unsigned long inlen, prng_state *prng);
-    /** Ready a PRNG state to read from
-        @param prng       The PRNG state to ready
-        @return CRYPT_OK if successful
-    */
-    int (*ready)(prng_state *prng);
-    /** Read from the PRNG
-        @param out     [out] Where to store the data
-        @param outlen  Length of data desired (octets)
-        @param prng    The PRNG state to read from
-        @return Number of octets read
-    */
-    unsigned long (*read)(unsigned char *out, unsigned long outlen, prng_state *prng);
-    /** Terminate a PRNG state
-        @param prng   The PRNG state to terminate
-        @return CRYPT_OK if successful
-    */
-    int (*done)(prng_state *prng);
-    /** Export a PRNG state  
-        @param out     [out] The destination for the state
-        @param outlen  [in/out] The max size and resulting size of the PRNG state
-        @param prng    The PRNG to export
-        @return CRYPT_OK if successful
-    */
-    int (*pexport)(unsigned char *out, unsigned long *outlen, prng_state *prng);
-    /** Import a PRNG state
-        @param in      The data to import
-        @param inlen   The length of the data to import (octets)
-        @param prng    The PRNG to initialize/import
-        @return CRYPT_OK if successful
-    */
-    int (*pimport)(const unsigned char *in, unsigned long inlen, prng_state *prng);
-    /** Self-test the PRNG
-        @return CRYPT_OK if successful, CRYPT_NOP if self-testing has been disabled
-    */
-    int (*test)(void);
-} prng_descriptor[];
-
-#ifdef LTC_YARROW
-int yarrow_start(prng_state *prng);
-int yarrow_add_entropy(const unsigned char *in, unsigned long inlen, prng_state *prng);
-int yarrow_ready(prng_state *prng);
-unsigned long yarrow_read(unsigned char *out, unsigned long outlen, prng_state *prng);
-int yarrow_done(prng_state *prng);
-int  yarrow_export(unsigned char *out, unsigned long *outlen, prng_state *prng);
-int  yarrow_import(const unsigned char *in, unsigned long inlen, prng_state *prng);
-int  yarrow_test(void);
-extern const struct ltc_prng_descriptor yarrow_desc;
-#endif
-
-#ifdef LTC_FORTUNA
-int fortuna_start(prng_state *prng);
-int fortuna_add_entropy(const unsigned char *in, unsigned long inlen, prng_state *prng);
-int fortuna_ready(prng_state *prng);
-unsigned long fortuna_read(unsigned char *out, unsigned long outlen, prng_state *prng);
-int fortuna_done(prng_state *prng);
-int  fortuna_export(unsigned char *out, unsigned long *outlen, prng_state *prng);
-int  fortuna_import(const unsigned char *in, unsigned long inlen, prng_state *prng);
-int  fortuna_test(void);
-extern const struct ltc_prng_descriptor fortuna_desc;
-#endif
-
-#ifdef LTC_RC4
-int rc4_start(prng_state *prng);
-int rc4_add_entropy(const unsigned char *in, unsigned long inlen, prng_state *prng);
-int rc4_ready(prng_state *prng);
-unsigned long rc4_read(unsigned char *out, unsigned long outlen, prng_state *prng);
-int  rc4_done(prng_state *prng);
-int  rc4_export(unsigned char *out, unsigned long *outlen, prng_state *prng);
-int  rc4_import(const unsigned char *in, unsigned long inlen, prng_state *prng);
-int  rc4_test(void);
-extern const struct ltc_prng_descriptor rc4_desc;
-#endif
-
-#ifdef LTC_SPRNG
-int sprng_start(prng_state *prng);
-int sprng_add_entropy(const unsigned char *in, unsigned long inlen, prng_state *prng);
-int sprng_ready(prng_state *prng);
-unsigned long sprng_read(unsigned char *out, unsigned long outlen, prng_state *prng);
-int sprng_done(prng_state *prng);
-int  sprng_export(unsigned char *out, unsigned long *outlen, prng_state *prng);
-int  sprng_import(const unsigned char *in, unsigned long inlen, prng_state *prng);
-int  sprng_test(void);
-extern const struct ltc_prng_descriptor sprng_desc;
-#endif
-
-#ifdef LTC_SOBER128
-int sober128_start(prng_state *prng);
-int sober128_add_entropy(const unsigned char *in, unsigned long inlen, prng_state *prng);
-int sober128_ready(prng_state *prng);
-unsigned long sober128_read(unsigned char *out, unsigned long outlen, prng_state *prng);
-int sober128_done(prng_state *prng);
-int  sober128_export(unsigned char *out, unsigned long *outlen, prng_state *prng);
-int  sober128_import(const unsigned char *in, unsigned long inlen, prng_state *prng);
-int  sober128_test(void);
-extern const struct ltc_prng_descriptor sober128_desc;
-#endif
-
-int find_prng(const char *name);
-int register_prng(const struct ltc_prng_descriptor *prng);
-int unregister_prng(const struct ltc_prng_descriptor *prng);
-int prng_is_valid(int idx);
-LTC_MUTEX_PROTO(ltc_prng_mutex)
-
-/* Slow RNG you **might** be able to use to seed a PRNG with.  Be careful as this
- * might not work on all platforms as planned
- */
-unsigned long rng_get_bytes(unsigned char *out, 
-                            unsigned long outlen, 
-                            void (*callback)(void));
-
-int rng_make_prng(int bits, int wprng, prng_state *prng, void (*callback)(void));
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_prng.h,v $ */
-/* $Revision: 1.9 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/math/ltm_desc.c b/dep/StormLibOld/src/libtomcrypt/src/math/ltm_desc.c
deleted file mode 100644
index f081249b8..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/math/ltm_desc.c
+++ /dev/null
@@ -1,483 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-#define DESC_DEF_ONLY
-#include "../headers/tomcrypt.h"
-
-#ifdef LTM_DESC
-
-#include "../../../libtommath/tommath.h"
-
-static const struct {
-    int mpi_code, ltc_code;
-} mpi_to_ltc_codes[] = {
-   { MP_OKAY ,  CRYPT_OK},
-   { MP_MEM  ,  CRYPT_MEM},
-   { MP_VAL  ,  CRYPT_INVALID_ARG},
-};
-
-/*
-   Convert a MPI error to a LTC error (Possibly the most powerful function ever!  Oh wait... no) 
-   @param err    The error to convert
-   @return The equivalent LTC error code or CRYPT_ERROR if none found
-*/
-static int mpi_to_ltc_error(int err)
-{
-   int x;
-
-   for (x = 0; x < (int)(sizeof(mpi_to_ltc_codes)/sizeof(mpi_to_ltc_codes[0])); x++) {
-       if (err == mpi_to_ltc_codes[x].mpi_code) { 
-          return mpi_to_ltc_codes[x].ltc_code;
-       }
-   }
-   return CRYPT_ERROR;
-}
-
-static int init(void **a)
-{
-   int err;
-
-   LTC_ARGCHK(a != NULL);
-
-   *a = XCALLOC(1, sizeof(mp_int));
-   if (*a == NULL) {
-      return CRYPT_MEM;
-   }
-   
-   if ((err = mpi_to_ltc_error(mp_init(*a))) != CRYPT_OK) {
-      XFREE(*a);
-   }
-   return err;
-}
-
-static void deinit(void *a)
-{
-   LTC_ARGCHKVD(a != NULL);
-   mp_clear(a);
-   XFREE(a);
-}
-
-static int neg(void *a, void *b)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   return mpi_to_ltc_error(mp_neg(a, b));
-}
-
-static int copy(void *a, void *b)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   return mpi_to_ltc_error(mp_copy(a, b));
-}
-
-static int init_copy(void **a, void *b)
-{
-   if (init(a) != CRYPT_OK) {
-      return CRYPT_MEM;
-   }
-   return copy(b, *a);
-}
-
-/* ---- trivial ---- */
-static int set_int(void *a, unsigned long b)
-{
-   LTC_ARGCHK(a != NULL);
-   return mpi_to_ltc_error(mp_set_int(a, b));
-}
-
-static unsigned long get_int(void *a)
-{
-   LTC_ARGCHK(a != NULL);
-   return mp_get_int(a);
-}
-
-static unsigned long get_digit(void *a, int n)
-{
-   mp_int *A;
-   LTC_ARGCHK(a != NULL);
-   A = a;
-   return (n >= A->used || n < 0) ? 0 : A->dp[n];
-}
-
-static int get_digit_count(void *a)
-{
-   mp_int *A;
-   LTC_ARGCHK(a != NULL);
-   A = a;
-   return A->used;
-}
-   
-static int compare(void *a, void *b)
-{
-   int ret;
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   ret = mp_cmp(a, b);
-   switch (ret) {
-      case MP_LT: return LTC_MP_LT;
-      case MP_EQ: return LTC_MP_EQ;
-      case MP_GT: return LTC_MP_GT;
-   }
-   return 0;
-}
-
-static int compare_d(void *a, unsigned long b)
-{
-   int ret;
-   LTC_ARGCHK(a != NULL);
-   ret = mp_cmp_d(a, b);
-   switch (ret) {
-      case MP_LT: return LTC_MP_LT;
-      case MP_EQ: return LTC_MP_EQ;
-      case MP_GT: return LTC_MP_GT;
-   }
-   return 0;
-}
-
-static int count_bits(void *a)
-{
-   LTC_ARGCHK(a != NULL);
-   return mp_count_bits(a);
-}
-
-static int count_lsb_bits(void *a)
-{
-   LTC_ARGCHK(a != NULL);
-   return mp_cnt_lsb(a);
-}
-
-
-static int twoexpt(void *a, int n)
-{
-   LTC_ARGCHK(a != NULL);
-   return mpi_to_ltc_error(mp_2expt(a, n));
-}
-
-/* ---- conversions ---- */
-
-/* read ascii string */
-static int read_radix(void *a, const char *b, int radix)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   return mpi_to_ltc_error(mp_read_radix(a, b, radix));
-}
-
-/* write one */
-static int write_radix(void *a, char *b, int radix)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   return mpi_to_ltc_error(mp_toradix(a, b, radix));
-}
-
-/* get size as unsigned char string */
-static unsigned long unsigned_size(void *a)
-{
-   LTC_ARGCHK(a != NULL);
-   return mp_unsigned_bin_size(a);
-}
-
-/* store */
-static int unsigned_write(void *a, unsigned char *b)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   return mpi_to_ltc_error(mp_to_unsigned_bin(a, b));
-}
-
-/* read */
-static int unsigned_read(void *a, unsigned char *b, unsigned long len)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   return mpi_to_ltc_error(mp_read_unsigned_bin(a, b, len));
-}
-
-/* add */
-static int add(void *a, void *b, void *c)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   LTC_ARGCHK(c != NULL);
-   return mpi_to_ltc_error(mp_add(a, b, c));
-}
-  
-static int addi(void *a, unsigned long b, void *c)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(c != NULL);
-   return mpi_to_ltc_error(mp_add_d(a, b, c));
-}
-
-/* sub */
-static int sub(void *a, void *b, void *c)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   LTC_ARGCHK(c != NULL);
-   return mpi_to_ltc_error(mp_sub(a, b, c));
-}
-
-static int subi(void *a, unsigned long b, void *c)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(c != NULL);
-   return mpi_to_ltc_error(mp_sub_d(a, b, c));
-}
-
-/* mul */
-static int mul(void *a, void *b, void *c)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   LTC_ARGCHK(c != NULL);
-   return mpi_to_ltc_error(mp_mul(a, b, c));
-}
-
-static int muli(void *a, unsigned long b, void *c)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(c != NULL);
-   return mpi_to_ltc_error(mp_mul_d(a, b, c));
-}
-
-/* sqr */
-static int sqr(void *a, void *b)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   return mpi_to_ltc_error(mp_sqr(a, b));
-}
-
-/* div */
-static int divide(void *a, void *b, void *c, void *d)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   return mpi_to_ltc_error(mp_div(a, b, c, d));
-}
-
-static int div_2(void *a, void *b)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   return mpi_to_ltc_error(mp_div_2(a, b));
-}
-
-/* modi */
-static int modi(void *a, unsigned long b, unsigned long *c)
-{
-   mp_digit tmp;
-   int      err;
-
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(c != NULL);
-
-   if ((err = mpi_to_ltc_error(mp_mod_d(a, b, &tmp))) != CRYPT_OK) {
-      return err;
-   }
-   *c = tmp;
-   return CRYPT_OK;
-}  
-
-/* gcd */
-static int gcd(void *a, void *b, void *c)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   LTC_ARGCHK(c != NULL);
-   return mpi_to_ltc_error(mp_gcd(a, b, c));
-}
-
-/* lcm */
-static int lcm(void *a, void *b, void *c)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   LTC_ARGCHK(c != NULL);
-   return mpi_to_ltc_error(mp_lcm(a, b, c));
-}
-
-static int mulmod(void *a, void *b, void *c, void *d)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   LTC_ARGCHK(c != NULL);
-   LTC_ARGCHK(d != NULL);
-   return mpi_to_ltc_error(mp_mulmod(a,b,c,d));
-}
-
-static int sqrmod(void *a, void *b, void *c)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   LTC_ARGCHK(c != NULL);
-   return mpi_to_ltc_error(mp_sqrmod(a,b,c));
-}
-
-/* invmod */
-static int invmod(void *a, void *b, void *c)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   LTC_ARGCHK(c != NULL);
-   return mpi_to_ltc_error(mp_invmod(a, b, c));
-}
-
-/* setup */
-static int montgomery_setup(void *a, void **b)
-{
-   int err;
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   *b = XCALLOC(1, sizeof(mp_digit));
-   if (*b == NULL) {
-      return CRYPT_MEM;
-   }
-   if ((err = mpi_to_ltc_error(mp_montgomery_setup(a, (mp_digit *)*b))) != CRYPT_OK) {
-      XFREE(*b);
-   }
-   return err;
-}
-
-/* get normalization value */
-static int montgomery_normalization(void *a, void *b)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   return mpi_to_ltc_error(mp_montgomery_calc_normalization(a, b));
-}
-
-/* reduce */
-static int montgomery_reduce(void *a, void *b, void *c)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   LTC_ARGCHK(c != NULL);
-   return mpi_to_ltc_error(mp_montgomery_reduce(a, b, *((mp_digit *)c)));
-}
-
-/* clean up */
-static void montgomery_deinit(void *a)
-{
-   XFREE(a);
-}
-
-static int exptmod(void *a, void *b, void *c, void *d)
-{
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   LTC_ARGCHK(c != NULL);
-   LTC_ARGCHK(d != NULL);
-   return mpi_to_ltc_error(mp_exptmod(a,b,c,d));
-}   
-
-static int isprime(void *a, int *b)
-{
-   int err;
-   LTC_ARGCHK(a != NULL);
-   LTC_ARGCHK(b != NULL);
-   err = mpi_to_ltc_error(mp_prime_is_prime(a, 8, b));
-   *b = (*b == MP_YES) ? LTC_MP_YES : LTC_MP_NO;
-   return err;
-}   
-
-const ltc_math_descriptor ltm_desc = {
-
-   "LibTomMath",
-   (int)DIGIT_BIT,
-
-   &init,
-   &init_copy,
-   &deinit,
-
-   &neg,
-   &copy,
-
-   &set_int,
-   &get_int,
-   &get_digit,
-   &get_digit_count,
-   &compare,
-   &compare_d,
-   &count_bits,
-   &count_lsb_bits,
-   &twoexpt,
-
-   &read_radix,
-   &write_radix,
-   &unsigned_size,
-   &unsigned_write,
-   &unsigned_read,
-
-   &add,
-   &addi,
-   &sub,
-   &subi,
-   &mul,
-   &muli,
-   &sqr,
-   &divide,
-   &div_2,
-   &modi,
-   &gcd,
-   &lcm,
-
-   &mulmod,
-   &sqrmod,
-   &invmod,
-   
-   &montgomery_setup,
-   &montgomery_normalization,
-   &montgomery_reduce,
-   &montgomery_deinit,
-
-   &exptmod,
-   &isprime,
-
-#ifdef LTC_MECC
-#ifdef LTC_MECC_FP
-   &ltc_ecc_fp_mulmod,
-#else   
-   &ltc_ecc_mulmod,
-#endif
-   &ltc_ecc_projective_add_point,
-   &ltc_ecc_projective_dbl_point,
-   &ltc_ecc_map,
-#ifdef LTC_ECC_SHAMIR
-#ifdef LTC_MECC_FP
-   &ltc_ecc_fp_mul2add,
-#else
-   &ltc_ecc_mul2add,
-#endif /* LTC_MECC_FP */
-#else
-   NULL,
-#endif /* LTC_ECC_SHAMIR */
-#else
-   NULL, NULL, NULL, NULL, NULL,
-#endif /* LTC_MECC */
-
-#ifdef LTC_MRSA
-   &rsa_make_key,
-   &rsa_exptmod,
-#else
-   NULL, NULL
-#endif
-};
-
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/math/ltm_desc.c,v $ */
-/* $Revision: 1.31 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/math/multi.c b/dep/StormLibOld/src/libtomcrypt/src/math/multi.c
deleted file mode 100644
index 7d40040a1..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/math/multi.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-#ifdef MPI
-#include <stdarg.h>
-
-int ltc_init_multi(void **a, ...)
-{
-   void    **cur = a;
-   int       np  = 0;
-   va_list   args;
-
-   va_start(args, a);
-   while (cur != NULL) {
-       if (mp_init(cur) != CRYPT_OK) {
-          /* failed */
-          va_list clean_list;
-
-          va_start(clean_list, a);
-          cur = a;
-          while (np--) {
-              mp_clear(*cur);
-              cur = va_arg(clean_list, void**);
-          }
-          va_end(clean_list);
-          return CRYPT_MEM;
-       }
-       ++np;
-       cur = va_arg(args, void**);
-   }
-   va_end(args);
-   return CRYPT_OK;   
-}
-
-void ltc_deinit_multi(void *a, ...)
-{
-   void     *cur = a;
-   va_list   args;
-
-   va_start(args, a);
-   while (cur != NULL) {
-       mp_clear(cur);
-       cur = va_arg(args, void *);
-   }
-   va_end(args);
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/math/multi.c,v $ */
-/* $Revision: 1.6 $ */
-/* $Date: 2006/12/28 01:27:23 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/math/rand_prime.c b/dep/StormLibOld/src/libtomcrypt/src/math/rand_prime.c
deleted file mode 100644
index 33d390172..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/math/rand_prime.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-  @file rand_prime.c
-  Generate a random prime, Tom St Denis
-*/  
-
-#define USE_BBS 1
-
-int rand_prime(void *N, long len, prng_state *prng, int wprng)
-{
-   int            err, res, type;
-   unsigned char *buf;
-
-   LTC_ARGCHK(N != NULL);
-
-   /* get type */
-   if (len < 0) {
-      type = USE_BBS;
-      len = -len;
-   } else {
-      type = 0;
-   }
-
-   /* allow sizes between 2 and 512 bytes for a prime size */
-   if (len < 2 || len > 512) { 
-      return CRYPT_INVALID_PRIME_SIZE;
-   }
-   
-   /* valid PRNG? Better be! */
-   if ((err = prng_is_valid(wprng)) != CRYPT_OK) {
-      return err; 
-   }
-
-   /* allocate buffer to work with */
-   buf = XCALLOC(1, len);
-   if (buf == NULL) {
-       return CRYPT_MEM;
-   }
-
-   do {
-      /* generate value */
-      if (prng_descriptor[wprng].read(buf, len, prng) != (unsigned long)len) {
-         XFREE(buf);
-         return CRYPT_ERROR_READPRNG;
-      }
-
-      /* munge bits */
-      buf[0]     |= 0x80 | 0x40;
-      buf[len-1] |= 0x01 | ((type & USE_BBS) ? 0x02 : 0x00);
- 
-      /* load value */
-      if ((err = mp_read_unsigned_bin(N, buf, len)) != CRYPT_OK) {
-         XFREE(buf);
-         return err;
-      }
-
-      /* test */
-      if ((err = mp_prime_is_prime(N, 8, &res)) != CRYPT_OK) {
-         XFREE(buf);
-         return err;
-      }
-   } while (res == LTC_MP_NO);
-
-#ifdef LTC_CLEAN_STACK
-   zeromem(buf, len);
-#endif
-
-   XFREE(buf);
-   return CRYPT_OK;
-}
-      
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/math/rand_prime.c,v $ */
-/* $Revision: 1.7 $ */
-/* $Date: 2006/12/28 01:27:23 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/base64_decode.c b/dep/StormLibOld/src/libtomcrypt/src/misc/base64_decode.c
deleted file mode 100644
index e4970fef3..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/base64_decode.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-  @file base64_decode.c
-  Compliant base64 code donated by Wayne Scott (wscott@bitmover.com)
-*/
-
-
-#ifdef LTC_BASE64
-
-static const unsigned char map[256] = {
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255,  62, 255, 255, 255,  63,
- 52,  53,  54,  55,  56,  57,  58,  59,  60,  61, 255, 255,
-255, 254, 255, 255, 255,   0,   1,   2,   3,   4,   5,   6,
-  7,   8,   9,  10,  11,  12,  13,  14,  15,  16,  17,  18,
- 19,  20,  21,  22,  23,  24,  25, 255, 255, 255, 255, 255,
-255,  26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  36,
- 37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,  48,
- 49,  50,  51, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-255, 255, 255, 255 };
-
-/*
-   base64 decode a block of memory
-   @param in       The base64 data to decode
-   @param inlen    The length of the base64 data
-   @param out      [out] The destination of the binary decoded data
-   @param outlen   [in/out] The max size and resulting size of the decoded data
-   @return CRYPT_OK if successful
-*/
-int base64_decode(const unsigned char *in,  unsigned long inlen, 
-                        unsigned char *out, unsigned long *outlen)
-{
-   unsigned long t, x, y, z;
-   unsigned char c;
-   int           g;
-
-   LTC_ARGCHK(in     != NULL);
-   LTC_ARGCHK(out    != NULL);
-   LTC_ARGCHK(outlen != NULL);
-
-   g = 3;
-   for (x = y = z = t = 0; x < inlen; x++) {
-       c = map[in[x]&0xFF];
-       if (c == 255) continue;
-       /* the final = symbols are read and used to trim the remaining bytes */
-       if (c == 254) { 
-          c = 0; 
-          /* prevent g < 0 which would potentially allow an overflow later */
-          if (--g < 0) {
-             return CRYPT_INVALID_PACKET;
-          }
-       } else if (g != 3) {
-          /* we only allow = to be at the end */
-          return CRYPT_INVALID_PACKET;
-       }
-
-       t = (t<<6)|c;
-
-       if (++y == 4) {
-          if (z + g > *outlen) { 
-             return CRYPT_BUFFER_OVERFLOW; 
-          }
-          out[z++] = (unsigned char)((t>>16)&255);
-          if (g > 1) out[z++] = (unsigned char)((t>>8)&255);
-          if (g > 2) out[z++] = (unsigned char)(t&255);
-          y = t = 0;
-       }
-   }
-   if (y != 0) {
-       return CRYPT_INVALID_PACKET;
-   }
-   *outlen = z;
-   return CRYPT_OK;
-}
-
-#endif
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/misc/base64/base64_decode.c,v $ */
-/* $Revision: 1.6 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_argchk.c b/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_argchk.c
deleted file mode 100644
index 0a7583bf7..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_argchk.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-#include <signal.h>
-
-/*
-  @file crypt_argchk.c
-  Perform argument checking, Tom St Denis
-*/  
-
-#if (ARGTYPE == 0)
-void crypt_argchk(char *v, char *s, int d)
-{
- fprintf(stderr, "LTC_ARGCHK '%s' failure on line %d of file %s\n",
-         v, d, s);
- (void)raise(SIGABRT);
-}
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt_argchk.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_find_hash.c b/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_find_hash.c
deleted file mode 100644
index 3264d857b..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_find_hash.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-  @file crypt_find_hash.c
-  Find a hash, Tom St Denis
-*/
-
-/*
-   Find a registered hash by name
-   @param name   The name of the hash to look for
-   @return >= 0 if found, -1 if not present
-*/
-int find_hash(const char *name)
-{
-   int x;
-   LTC_ARGCHK(name != NULL);
-   LTC_MUTEX_LOCK(&ltc_hash_mutex);
-   for (x = 0; x < TAB_SIZE; x++) {
-       if (hash_descriptor[x].name != NULL && XSTRCMP(hash_descriptor[x].name, name) == 0) {
-          LTC_MUTEX_UNLOCK(&ltc_hash_mutex);
-          return x;
-       }
-   }
-   LTC_MUTEX_UNLOCK(&ltc_hash_mutex);
-   return -1;
-}
-
-/* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt_find_hash.c,v $ */
-/* $Revision: 1.7 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_find_prng.c b/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_find_prng.c
deleted file mode 100644
index 0f1e8eb64..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_find_prng.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-  @file crypt_find_prng.c
-  Find a PRNG, Tom St Denis
-*/
-
-/*
-   Find a registered PRNG by name
-   @param name   The name of the PRNG to look for
-   @return >= 0 if found, -1 if not present
-*/
-int find_prng(const char *name)
-{
-   int x;
-   LTC_ARGCHK(name != NULL);
-   LTC_MUTEX_LOCK(&ltc_prng_mutex);
-   for (x = 0; x < TAB_SIZE; x++) {
-       if ((prng_descriptor[x].name != NULL) && XSTRCMP(prng_descriptor[x].name, name) == 0) {
-          LTC_MUTEX_UNLOCK(&ltc_prng_mutex);
-          return x;
-       }
-   }
-   LTC_MUTEX_UNLOCK(&ltc_prng_mutex);
-   return -1;
-}
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt_find_prng.c,v $ */
-/* $Revision: 1.7 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_hash_descriptor.c b/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_hash_descriptor.c
deleted file mode 100644
index 113cb1c89..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_hash_descriptor.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-  @file crypt_hash_descriptor.c
-  Stores the hash descriptor table, Tom St Denis  
-*/
-
-struct ltc_hash_descriptor hash_descriptor[TAB_SIZE] = {
-{ NULL, 0, 0, 0, { 0 }, 0, NULL, NULL, NULL, NULL, NULL }
-};
-
-LTC_MUTEX_GLOBAL(ltc_hash_mutex)
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt_hash_descriptor.c,v $ */
-/* $Revision: 1.10 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_hash_is_valid.c b/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_hash_is_valid.c
deleted file mode 100644
index 72eaf93ea..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_hash_is_valid.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-  @file crypt_hash_is_valid.c
-  Determine if hash is valid, Tom St Denis
-*/  
-
-/*
-   Test if a hash index is valid
-   @param idx   The index of the hash to search for
-   @return CRYPT_OK if valid
-*/
-int hash_is_valid(int idx)
-{
-   LTC_MUTEX_LOCK(&ltc_hash_mutex);
-   if (idx < 0 || idx >= TAB_SIZE || hash_descriptor[idx].name == NULL) {
-      LTC_MUTEX_UNLOCK(&ltc_hash_mutex);
-      return CRYPT_INVALID_HASH;
-   }
-   LTC_MUTEX_UNLOCK(&ltc_hash_mutex);
-   return CRYPT_OK;
-}
-
-/* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt_hash_is_valid.c,v $ */
-/* $Revision: 1.6 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_libc.c b/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_libc.c
deleted file mode 100644
index bcc89f4f9..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_libc.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************/
-/* crypt_libc.c                           Copyright (c) Ladislav Zezula 2010 */
-/*---------------------------------------------------------------------------*/
-/* Description:                                                              */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 05.05.10  1.00  Lad  The first version of crypt_libc.c                    */
-/*****************************************************************************/
-
-// LibTomCrypt header
-#include <stdlib.h>
-#include "../headers/tomcrypt.h"
-
-void * LibTomMalloc(size_t n)
-{
-    return malloc(n);
-}
-
-void * LibTomCalloc(size_t n, size_t s)
-{
-    return calloc(n, s);
-}
-
-void * LibTomRealloc(void *p, size_t n)
-{
-    return realloc(p, n);
-}
-
-void LibTomFree(void * p)
-{
-    free(p);
-}
-
-clock_t LibTomClock(void)
-{
-    return clock();
-}
-
-void LibTomQsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *))
-{
-    qsort(base, nmemb, size, compar);
-}
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.c b/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.c
deleted file mode 100644
index 91ba9d162..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-ltc_math_descriptor ltc_mp;
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_prng_descriptor.c b/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_prng_descriptor.c
deleted file mode 100644
index 5ccb19c15..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_prng_descriptor.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-  @file crypt_prng_descriptor.c
-  Stores the PRNG descriptors, Tom St Denis
-*/  
-struct ltc_prng_descriptor prng_descriptor[TAB_SIZE] = {
-{ NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
-};
-
-LTC_MUTEX_GLOBAL(ltc_prng_mutex)
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt_prng_descriptor.c,v $ */
-/* $Revision: 1.8 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_prng_is_valid.c b/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_prng_is_valid.c
deleted file mode 100644
index b6e597eae..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_prng_is_valid.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-  @file crypt_prng_is_valid.c
-  Determine if PRNG is valid, Tom St Denis
-*/
-
-/*
-   Test if a PRNG index is valid
-   @param idx   The index of the PRNG to search for
-   @return CRYPT_OK if valid
-*/
-int prng_is_valid(int idx)
-{
-   LTC_MUTEX_LOCK(&ltc_prng_mutex);
-   if (idx < 0 || idx >= TAB_SIZE || prng_descriptor[idx].name == NULL) {
-      LTC_MUTEX_UNLOCK(&ltc_prng_mutex);
-      return CRYPT_INVALID_PRNG;
-   }
-   LTC_MUTEX_UNLOCK(&ltc_prng_mutex);
-   return CRYPT_OK;
-}
-
-/* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt_prng_is_valid.c,v $ */
-/* $Revision: 1.6 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_register_hash.c b/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_register_hash.c
deleted file mode 100644
index 35d33abbd..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_register_hash.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-  @file crypt_register_hash.c
-  Register a HASH, Tom St Denis
-*/
-
-/*
-   Register a hash with the descriptor table
-   @param hash   The hash you wish to register
-   @return value >= 0 if successfully added (or already present), -1 if unsuccessful
-*/
-int register_hash(const struct ltc_hash_descriptor *hash)
-{
-   int x;
-
-   LTC_ARGCHK(hash != NULL);
-
-   /* is it already registered? */
-   LTC_MUTEX_LOCK(&ltc_hash_mutex);
-   for (x = 0; x < TAB_SIZE; x++) {
-       if (XMEMCMP(&hash_descriptor[x], hash, sizeof(struct ltc_hash_descriptor)) == 0) {
-          LTC_MUTEX_UNLOCK(&ltc_hash_mutex);
-          return x;
-       }
-   }
-
-   /* find a blank spot */
-   for (x = 0; x < TAB_SIZE; x++) {
-       if (hash_descriptor[x].name == NULL) {
-          XMEMCPY(&hash_descriptor[x], hash, sizeof(struct ltc_hash_descriptor));
-          LTC_MUTEX_UNLOCK(&ltc_hash_mutex);
-          return x;
-       }
-   }
-
-   /* no spot */
-   LTC_MUTEX_UNLOCK(&ltc_hash_mutex);
-   return -1;
-}
-
-/* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt_register_hash.c,v $ */
-/* $Revision: 1.7 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_register_prng.c b/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_register_prng.c
deleted file mode 100644
index bfc2d7a2a..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/crypt_register_prng.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-  @file crypt_register_prng.c
-  Register a PRNG, Tom St Denis
-*/
-  
-/*
-   Register a PRNG with the descriptor table
-   @param prng   The PRNG you wish to register
-   @return value >= 0 if successfully added (or already present), -1 if unsuccessful
-*/
-int register_prng(const struct ltc_prng_descriptor *prng)
-{
-   int x;
-
-   LTC_ARGCHK(prng != NULL);
-
-   /* is it already registered? */
-   LTC_MUTEX_LOCK(&ltc_prng_mutex);
-   for (x = 0; x < TAB_SIZE; x++) {
-       if (XMEMCMP(&prng_descriptor[x], prng, sizeof(struct ltc_prng_descriptor)) == 0) {
-          LTC_MUTEX_UNLOCK(&ltc_prng_mutex);
-          return x;
-       }
-   }
-
-   /* find a blank spot */
-   for (x = 0; x < TAB_SIZE; x++) {
-       if (prng_descriptor[x].name == NULL) {
-          XMEMCPY(&prng_descriptor[x], prng, sizeof(struct ltc_prng_descriptor));
-          LTC_MUTEX_UNLOCK(&ltc_prng_mutex);
-          return x;
-       }
-   }
-
-   /* no spot */
-   LTC_MUTEX_UNLOCK(&ltc_prng_mutex);
-   return -1;
-}
-
-/* $Source: /cvs/libtom/libtomcrypt/src/misc/crypt/crypt_register_prng.c,v $ */
-/* $Revision: 1.8 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/misc/zeromem.c b/dep/StormLibOld/src/libtomcrypt/src/misc/zeromem.c
deleted file mode 100644
index 510a6d756..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/misc/zeromem.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../headers/tomcrypt.h"
-
-/*
-   @file zeromem.c
-   Zero a block of memory, Tom St Denis
-*/
-
-/*
-   Zero a block of memory
-   @param out    The destination of the area to zero
-   @param outlen The length of the area to zero (octets)
-*/
-void zeromem(void *out, size_t outlen)
-{
-   unsigned char *mem = out;
-   LTC_ARGCHKVD(out != NULL);
-   while (outlen-- > 0) {
-      *mem++ = 0;
-   }
-}
-
-/* $Source: /cvs/libtom/libtomcrypt/src/misc/zeromem.c,v $ */
-/* $Revision: 1.7 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_bit_string.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_bit_string.c
deleted file mode 100644
index 50856e526..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_bit_string.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_decode_bit_string.c
-  ASN.1 DER, encode a BIT STRING, Tom St Denis
-*/
-
-
-#ifdef LTC_DER
-
-/*
-  Store a BIT STRING
-  @param in      The DER encoded BIT STRING
-  @param inlen   The size of the DER BIT STRING
-  @param out     [out] The array of bits stored (one per char)
-  @param outlen  [in/out] The number of bits stored
-  @return CRYPT_OK if successful
-*/
-int der_decode_bit_string(const unsigned char *in,  unsigned long inlen,
-                                unsigned char *out, unsigned long *outlen)
-{
-   unsigned long dlen, blen, x, y;
-
-   LTC_ARGCHK(in     != NULL);
-   LTC_ARGCHK(out    != NULL);
-   LTC_ARGCHK(outlen != NULL);
-
-   /* packet must be at least 4 bytes */
-   if (inlen < 4) {
-       return CRYPT_INVALID_ARG;
-   }
-
-   /* check for 0x03 */
-   if ((in[0]&0x1F) != 0x03) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-    /* offset in the data */
-    x = 1;
-
-   /* get the length of the data */
-   if (in[x] & 0x80) {
-      /* long format get number of length bytes */
-      y = in[x++] & 0x7F;
-
-      /* invalid if 0 or > 2 */
-      if (y == 0 || y > 2) {
-         return CRYPT_INVALID_PACKET;
-      }
-
-      /* read the data len */
-      dlen = 0;
-      while (y--) {
-         dlen = (dlen << 8) | (unsigned long)in[x++];
-      }
-   } else {
-      /* short format */
-      dlen = in[x++] & 0x7F;
-   }
-  
-   /* is the data len too long or too short? */
-   if ((dlen == 0) || (dlen + x > inlen)) {
-       return CRYPT_INVALID_PACKET;
-   }
-
-   /* get padding count */
-   blen = ((dlen - 1) << 3) - (in[x++] & 7);
-
-   /* too many bits? */
-   if (blen > *outlen) {
-      *outlen = blen;
-      return CRYPT_BUFFER_OVERFLOW;
-   }
-
-   /* decode/store the bits */
-   for (y = 0; y < blen; y++) {
-       out[y] = (in[x] & (1 << (7 - (y & 7)))) ? 1 : 0;
-       if ((y & 7) == 7) {
-          ++x;
-       }
-   }
-
-   /* we done */
-   *outlen = blen;
-   return CRYPT_OK;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/bit/der_decode_bit_string.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_boolean.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_boolean.c
deleted file mode 100644
index b60f83f98..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_boolean.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_decode_boolean.c
-  ASN.1 DER, decode a BOOLEAN, Tom St Denis
-*/
-
-
-#ifdef LTC_DER
-
-/*
-  Read a BOOLEAN
-  @param in      The destination for the DER encoded BOOLEAN
-  @param inlen   The size of the DER BOOLEAN
-  @param out     [out]  The boolean to decode
-  @return CRYPT_OK if successful
-*/
-int der_decode_boolean(const unsigned char *in, unsigned long inlen,
-                                       int *out)
-{
-   LTC_ARGCHK(in  != NULL);
-   LTC_ARGCHK(out != NULL);
-   
-   if (inlen != 3 || in[0] != 0x01 || in[1] != 0x01 || (in[2] != 0x00 && in[2] != 0xFF)) {
-      return CRYPT_INVALID_ARG;
-   }
-   
-   *out = (in[2]==0xFF) ? 1 : 0;
-   
-   return CRYPT_OK;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/boolean/der_decode_boolean.c,v $ */
-/* $Revision: 1.2 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_choice.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_choice.c
deleted file mode 100644
index 0d118a997..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_choice.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_decode_choice.c
-  ASN.1 DER, decode a CHOICE, Tom St Denis
-*/
-
-#ifdef LTC_DER
-
-/*
-   Decode a CHOICE
-   @param in       The DER encoded input
-   @param inlen    [in/out] The size of the input and resulting size of read type
-   @param list     The list of items to decode
-   @param outlen   The number of items in the list
-   @return CRYPT_OK on success
-*/
-int der_decode_choice(const unsigned char *in,   unsigned long *inlen,
-                            ltc_asn1_list *list, unsigned long  outlen)
-{
-   unsigned long size, x, z;
-   void          *data;
-
-   LTC_ARGCHK(in    != NULL);
-   LTC_ARGCHK(inlen != NULL);
-   LTC_ARGCHK(list  != NULL);
-
-   /* get blk size */
-   if (*inlen < 2) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* set all of the "used" flags to zero */
-   for (x = 0; x < outlen; x++) {
-       list[x].used = 0;
-   }
-
-   /* now scan until we have a winner */
-   for (x = 0; x < outlen; x++) {
-       size = list[x].size;
-       data = list[x].data;
-
-       switch (list[x].type) {
-           case LTC_ASN1_INTEGER:
-               if (der_decode_integer(in, *inlen, data) == CRYPT_OK) {
-                  if (der_length_integer(data, &z) == CRYPT_OK) {
-                      list[x].used = 1;
-                      *inlen       = z;
-                      return CRYPT_OK;
-                  }
-               }
-               break;
-
-           case LTC_ASN1_SHORT_INTEGER:
-               if (der_decode_short_integer(in, *inlen, data) == CRYPT_OK) {
-                  if (der_length_short_integer(size, &z) == CRYPT_OK) {
-                      list[x].used = 1;
-                      *inlen       = z;
-                      return CRYPT_OK;
-                  }
-               }
-               break;
-
-           case LTC_ASN1_BIT_STRING:
-               if (der_decode_bit_string(in, *inlen, data, &size) == CRYPT_OK) {
-                  if (der_length_bit_string(size, &z) == CRYPT_OK) {
-                     list[x].used = 1;
-                     list[x].size = size;
-                     *inlen       = z;
-                     return CRYPT_OK;
-                  }
-               }
-               break;
-
-           case LTC_ASN1_OCTET_STRING:
-               if (der_decode_octet_string(in, *inlen, data, &size) == CRYPT_OK) {
-                  if (der_length_octet_string(size, &z) == CRYPT_OK) {
-                     list[x].used = 1;
-                     list[x].size = size;
-                     *inlen       = z;
-                     return CRYPT_OK;
-                  }
-               }
-               break;
-
-           case LTC_ASN1_NULL:
-               if (*inlen == 2 && in[x] == 0x05 && in[x+1] == 0x00) {
-                  *inlen = 2;
-                  list[x].used   = 1;
-                  return CRYPT_OK;
-               }
-               break;
-                  
-           case LTC_ASN1_OBJECT_IDENTIFIER:
-               if (der_decode_object_identifier(in, *inlen, data, &size) == CRYPT_OK) {
-                  if (der_length_object_identifier(data, size, &z) == CRYPT_OK) {
-                     list[x].used = 1;
-                     list[x].size = size;
-                     *inlen       = z;
-                     return CRYPT_OK;
-                  }
-               }
-               break;
-
-           case LTC_ASN1_IA5_STRING:
-               if (der_decode_ia5_string(in, *inlen, data, &size) == CRYPT_OK) {
-                  if (der_length_ia5_string(data, size, &z) == CRYPT_OK) {
-                     list[x].used = 1;
-                     list[x].size = size;
-                     *inlen       = z;
-                     return CRYPT_OK;
-                  }
-               }
-               break;
-
-
-           case LTC_ASN1_PRINTABLE_STRING:
-               if (der_decode_printable_string(in, *inlen, data, &size) == CRYPT_OK) {
-                  if (der_length_printable_string(data, size, &z) == CRYPT_OK) {
-                     list[x].used = 1;
-                     list[x].size = size;
-                     *inlen       = z;
-                     return CRYPT_OK;
-                  }
-               }
-               break;
-
-           case LTC_ASN1_UTF8_STRING:
-               if (der_decode_utf8_string(in, *inlen, data, &size) == CRYPT_OK) {
-                  if (der_length_utf8_string(data, size, &z) == CRYPT_OK) {
-                     list[x].used = 1;
-                     list[x].size = size;
-                     *inlen       = z;
-                     return CRYPT_OK;
-                  }
-               }
-               break;
-
-           case LTC_ASN1_UTCTIME:
-               z = *inlen;
-               if (der_decode_utctime(in, &z, data) == CRYPT_OK) {
-                  list[x].used = 1;
-                  *inlen       = z;
-                  return CRYPT_OK;
-               }
-               break;
-
-           case LTC_ASN1_SET:
-           case LTC_ASN1_SETOF:
-           case LTC_ASN1_SEQUENCE:
-               if (der_decode_sequence(in, *inlen, data, size) == CRYPT_OK) {
-                  if (der_length_sequence(data, size, &z) == CRYPT_OK) {
-                     list[x].used = 1;
-                     *inlen       = z;
-                     return CRYPT_OK;
-                  }
-               }
-               break;
-
-           default:
-               return CRYPT_INVALID_ARG;
-       }
-   }
-
-   return CRYPT_INVALID_PACKET;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/choice/der_decode_choice.c,v $ */
-/* $Revision: 1.9 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.c
deleted file mode 100644
index 14753d7d8..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_decode_ia5_string.c
-  ASN.1 DER, encode a IA5 STRING, Tom St Denis
-*/
-
-
-#ifdef LTC_DER
-
-/*
-  Store a IA5 STRING
-  @param in      The DER encoded IA5 STRING
-  @param inlen   The size of the DER IA5 STRING
-  @param out     [out] The array of octets stored (one per char)
-  @param outlen  [in/out] The number of octets stored
-  @return CRYPT_OK if successful
-*/
-int der_decode_ia5_string(const unsigned char *in, unsigned long inlen,
-                                unsigned char *out, unsigned long *outlen)
-{
-   unsigned long x, y, len;
-   int           t;
-
-   LTC_ARGCHK(in     != NULL);
-   LTC_ARGCHK(out    != NULL);
-   LTC_ARGCHK(outlen != NULL);
-
-   /* must have header at least */
-   if (inlen < 2) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* check for 0x16 */
-   if ((in[0] & 0x1F) != 0x16) {
-      return CRYPT_INVALID_PACKET;
-   }
-   x = 1;
-
-   /* decode the length */
-   if (in[x] & 0x80) {
-      /* valid # of bytes in length are 1,2,3 */
-      y = in[x] & 0x7F;
-      if ((y == 0) || (y > 3) || ((x + y) > inlen)) {
-         return CRYPT_INVALID_PACKET;
-      }
-
-      /* read the length in */
-      len = 0;
-      ++x;
-      while (y--) {
-         len = (len << 8) | in[x++];
-      }
-   } else {
-      len = in[x++] & 0x7F;
-   }
-
-   /* is it too long? */
-   if (len > *outlen) {
-      *outlen = len;
-      return CRYPT_BUFFER_OVERFLOW;
-   }
-
-   if (len + x > inlen) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* read the data */
-   for (y = 0; y < len; y++) {
-       t = der_ia5_value_decode(in[x++]);
-       if (t == -1) {
-           return CRYPT_INVALID_ARG;
-       }
-       out[y] = t;
-   }
-
-   *outlen = y;
-
-   return CRYPT_OK;
-}
- 
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/ia5/der_decode_ia5_string.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_integer.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_integer.c
deleted file mode 100644
index 9ddfceb36..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_integer.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_decode_integer.c
-  ASN.1 DER, decode an integer, Tom St Denis
-*/
-
-
-#ifdef LTC_DER
-
-/*
-  Read a mp_int integer
-  @param in       The DER encoded data
-  @param inlen    Size of DER encoded data
-  @param num      The first mp_int to decode
-  @return CRYPT_OK if successful
-*/
-int der_decode_integer(const unsigned char *in, unsigned long inlen, void *num)
-{
-   unsigned long x, y, z;
-   int           err;
-
-   LTC_ARGCHK(num    != NULL);
-   LTC_ARGCHK(in     != NULL);
-
-   /* min DER INTEGER is 0x02 01 00 == 0 */
-   if (inlen < (1 + 1 + 1)) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* ok expect 0x02 when we AND with 0001 1111 [1F] */
-   x = 0;
-   if ((in[x++] & 0x1F) != 0x02) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* now decode the len stuff */
-   z = in[x++];
-
-   if ((z & 0x80) == 0x00) {
-      /* short form */
-
-      /* will it overflow? */
-      if (x + z > inlen) {
-         return CRYPT_INVALID_PACKET;
-      }
-     
-      /* no so read it */
-      if ((err = mp_read_unsigned_bin(num, (unsigned char *)in + x, z)) != CRYPT_OK) {
-         return err;
-      }
-   } else {
-      /* long form */
-      z &= 0x7F;
-      
-      /* will number of length bytes overflow? (or > 4) */
-      if (((x + z) > inlen) || (z > 4) || (z == 0)) {
-         return CRYPT_INVALID_PACKET;
-      }
-
-      /* now read it in */
-      y = 0;
-      while (z--) {
-         y = ((unsigned long)(in[x++])) | (y << 8);
-      }
-
-      /* now will reading y bytes overrun? */
-      if ((x + y) > inlen) {
-         return CRYPT_INVALID_PACKET;
-      }
-
-      /* no so read it */
-      if ((err = mp_read_unsigned_bin(num, (unsigned char *)in + x, y)) != CRYPT_OK) {
-         return err;
-      }
-   }
-
-   /* see if it's negative */
-   if (in[x] & 0x80) {
-      void *tmp;
-      if (mp_init(&tmp) != CRYPT_OK) {
-         return CRYPT_MEM;
-      }
-
-      if (mp_2expt(tmp, mp_count_bits(num)) != CRYPT_OK || mp_sub(num, tmp, num) != CRYPT_OK) {
-         mp_clear(tmp);
-         return CRYPT_MEM;
-      }
-      mp_clear(tmp);
-   } 
-
-   return CRYPT_OK;
-
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/integer/der_decode_integer.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.c
deleted file mode 100644
index 57fe2c920..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_decode_object_identifier.c
-  ASN.1 DER, Decode Object Identifier, Tom St Denis
-*/
-
-#ifdef LTC_DER
-/*
-  Decode OID data and store the array of integers in words
-  @param in      The OID DER encoded data
-  @param inlen   The length of the OID data
-  @param words   [out] The destination of the OID words
-  @param outlen  [in/out] The number of OID words
-  @return CRYPT_OK if successful
-*/
-int der_decode_object_identifier(const unsigned char *in,    unsigned long  inlen,
-                                       unsigned long *words, unsigned long *outlen)
-{
-   unsigned long x, y, t, len;
-
-   LTC_ARGCHK(in     != NULL);
-   LTC_ARGCHK(words  != NULL);
-   LTC_ARGCHK(outlen != NULL);
-
-   /* header is at least 3 bytes */
-   if (inlen < 3) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* must be room for at least two words */
-   if (*outlen < 2) {
-      return CRYPT_BUFFER_OVERFLOW;
-   }
-
-   /* decode the packet header */
-   x = 0;
-   if ((in[x++] & 0x1F) != 0x06) {
-      return CRYPT_INVALID_PACKET;
-   }
-   
-   /* get the length */
-   if (in[x] < 128) {
-      len = in[x++]; 
-   } else {
-       if (in[x] < 0x81 || in[x] > 0x82) {
-          return CRYPT_INVALID_PACKET;
-       }
-       y   = in[x++] & 0x7F;
-       len = 0;
-       while (y--) {
-          len = (len << 8) | (unsigned long)in[x++];
-       }
-   }
-
-   if (len < 1 || (len + x) > inlen) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* decode words */
-   y = 0;
-   t = 0;
-   while (len--) {
-       t = (t << 7) | (in[x] & 0x7F);
-       if (!(in[x++] & 0x80)) {
-           /* store t */
-           if (y >= *outlen) {
-              return CRYPT_BUFFER_OVERFLOW;
-           }
-      if (y == 0) {
-         words[0] = t / 40;
-         words[1] = t % 40;
-         y = 2;
-      } else {
-              words[y++] = t;
-      }
-           t          = 0;
-       }
-   }
-       
-   *outlen = y;
-   return CRYPT_OK;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/object_identifier/der_decode_object_identifier.c,v $ */
-/* $Revision: 1.6 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_octet_string.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_octet_string.c
deleted file mode 100644
index c738b52e2..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_octet_string.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_decode_octet_string.c
-  ASN.1 DER, encode a OCTET STRING, Tom St Denis
-*/
-
-
-#ifdef LTC_DER
-
-/*
-  Store a OCTET STRING
-  @param in      The DER encoded OCTET STRING
-  @param inlen   The size of the DER OCTET STRING
-  @param out     [out] The array of octets stored (one per char)
-  @param outlen  [in/out] The number of octets stored
-  @return CRYPT_OK if successful
-*/
-int der_decode_octet_string(const unsigned char *in, unsigned long inlen,
-                                  unsigned char *out, unsigned long *outlen)
-{
-   unsigned long x, y, len;
-
-   LTC_ARGCHK(in     != NULL);
-   LTC_ARGCHK(out    != NULL);
-   LTC_ARGCHK(outlen != NULL);
-
-   /* must have header at least */
-   if (inlen < 2) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* check for 0x04 */
-   if ((in[0] & 0x1F) != 0x04) {
-      return CRYPT_INVALID_PACKET;
-   }
-   x = 1;
-
-   /* decode the length */
-   if (in[x] & 0x80) {
-      /* valid # of bytes in length are 1,2,3 */
-      y = in[x] & 0x7F;
-      if ((y == 0) || (y > 3) || ((x + y) > inlen)) {
-         return CRYPT_INVALID_PACKET;
-      }
-
-      /* read the length in */
-      len = 0;
-      ++x;
-      while (y--) {
-         len = (len << 8) | in[x++];
-      }
-   } else {
-      len = in[x++] & 0x7F;
-   }
-
-   /* is it too long? */
-   if (len > *outlen) {
-      *outlen = len;
-      return CRYPT_BUFFER_OVERFLOW;
-   }
-
-   if (len + x > inlen) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* read the data */
-   for (y = 0; y < len; y++) {
-       out[y] = in[x++];
-   }
-
-   *outlen = y;
-
-   return CRYPT_OK;
-}
- 
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/octet/der_decode_octet_string.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_printable_string.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_printable_string.c
deleted file mode 100644
index 7c0311fbc..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_printable_string.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_decode_printable_string.c
-  ASN.1 DER, encode a printable STRING, Tom St Denis
-*/
-
-
-#ifdef LTC_DER
-
-/*
-  Store a printable STRING
-  @param in      The DER encoded printable STRING
-  @param inlen   The size of the DER printable STRING
-  @param out     [out] The array of octets stored (one per char)
-  @param outlen  [in/out] The number of octets stored
-  @return CRYPT_OK if successful
-*/
-int der_decode_printable_string(const unsigned char *in, unsigned long inlen,
-                                unsigned char *out, unsigned long *outlen)
-{
-   unsigned long x, y, len;
-   int           t;
-
-   LTC_ARGCHK(in     != NULL);
-   LTC_ARGCHK(out    != NULL);
-   LTC_ARGCHK(outlen != NULL);
-
-   /* must have header at least */
-   if (inlen < 2) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* check for 0x13 */
-   if ((in[0] & 0x1F) != 0x13) {
-      return CRYPT_INVALID_PACKET;
-   }
-   x = 1;
-
-   /* decode the length */
-   if (in[x] & 0x80) {
-      /* valid # of bytes in length are 1,2,3 */
-      y = in[x] & 0x7F;
-      if ((y == 0) || (y > 3) || ((x + y) > inlen)) {
-         return CRYPT_INVALID_PACKET;
-      }
-
-      /* read the length in */
-      len = 0;
-      ++x;
-      while (y--) {
-         len = (len << 8) | in[x++];
-      }
-   } else {
-      len = in[x++] & 0x7F;
-   }
-
-   /* is it too long? */
-   if (len > *outlen) {
-      *outlen = len;
-      return CRYPT_BUFFER_OVERFLOW;
-   }
-
-   if (len + x > inlen) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* read the data */
-   for (y = 0; y < len; y++) {
-       t = der_printable_value_decode(in[x++]);
-       if (t == -1) {
-           return CRYPT_INVALID_ARG;
-       }
-       out[y] = t;
-   }
-
-   *outlen = y;
-
-   return CRYPT_OK;
-}
- 
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/printable_string/der_decode_printable_string.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.c
deleted file mode 100644
index b3b439d92..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-#include <stdarg.h>
-
-
-/*
-  @file der_decode_sequence_ex.c
-  ASN.1 DER, decode a SEQUENCE, Tom St Denis
-*/
-
-#ifdef LTC_DER
-
-/*
-   Decode a SEQUENCE
-   @param in       The DER encoded input
-   @param inlen    The size of the input
-   @param list     The list of items to decode
-   @param outlen   The number of items in the list
-   @param ordered  Search an unordeded or ordered list
-   @return CRYPT_OK on success
-*/
-int der_decode_sequence_ex(const unsigned char *in, unsigned long  inlen,
-                           ltc_asn1_list *list,     unsigned long  outlen, int ordered)
-{
-   int           err, type;
-   unsigned long size, x, y, z, i, blksize;
-   void          *data;
-
-   LTC_ARGCHK(in   != NULL);
-   LTC_ARGCHK(list != NULL);
-   
-   /* get blk size */
-   if (inlen < 2) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* sequence type? We allow 0x30 SEQUENCE and 0x31 SET since fundamentally they're the same structure */
-   x = 0;
-   if (in[x] != 0x30 && in[x] != 0x31) {
-      return CRYPT_INVALID_PACKET;
-   }
-   ++x;
-
-   if (in[x] < 128) {
-      blksize = in[x++];
-   } else if (in[x] & 0x80) {
-      if (in[x] < 0x81 || in[x] > 0x83) {
-         return CRYPT_INVALID_PACKET;
-      }
-      y = in[x++] & 0x7F;
-
-      /* would reading the len bytes overrun? */
-      if (x + y > inlen) {
-         return CRYPT_INVALID_PACKET;
-      }
-
-      /* read len */
-      blksize = 0;
-      while (y--) {
-          blksize = (blksize << 8) | (unsigned long)in[x++];
-      }
-  }
-
-  /* would this blksize overflow? */
-  if (x + blksize > inlen) {
-     return CRYPT_INVALID_PACKET;
-  }
-
-   /* mark all as unused */
-   for (i = 0; i < outlen; i++) {
-       list[i].used = 0;
-   }     
-
-  /* ok read data */
-   inlen = blksize;
-   for (i = 0; i < outlen; i++) {
-       z    = 0;
-       type = list[i].type;
-       size = list[i].size;
-       data = list[i].data;
-       if (!ordered && list[i].used == 1) { continue; }
-
-       if (type == LTC_ASN1_EOL) { 
-          break;
-       }
-
-       switch (type) {
-           case LTC_ASN1_BOOLEAN:
-               z = inlen;
-               if ((err = der_decode_boolean(in + x, z, ((int *)data))) != CRYPT_OK) {
-                   goto LBL_ERR;
-               }
-               if ((err = der_length_boolean(&z)) != CRYPT_OK) {
-                   goto LBL_ERR;
-                }
-                break;
-          
-           case LTC_ASN1_INTEGER:
-               z = inlen;
-               if ((err = der_decode_integer(in + x, z, data)) != CRYPT_OK) {
-                  if (!ordered) {  continue; }
-                  goto LBL_ERR;
-               }
-               if ((err = der_length_integer(data, &z)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               break;
-
-           case LTC_ASN1_SHORT_INTEGER:
-               z = inlen;
-               if ((err = der_decode_short_integer(in + x, z, data)) != CRYPT_OK) {
-                  if (!ordered) { continue; }
-                  goto LBL_ERR;
-               }
-               if ((err = der_length_short_integer(((unsigned long*)data)[0], &z)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               
-               break;
-
-           case LTC_ASN1_BIT_STRING:
-               z = inlen;
-               if ((err = der_decode_bit_string(in + x, z, data, &size)) != CRYPT_OK) {
-                  if (!ordered) { continue; }
-                  goto LBL_ERR;
-               }
-               list[i].size = size;
-               if ((err = der_length_bit_string(size, &z)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               break;
-
-           case LTC_ASN1_OCTET_STRING:
-               z = inlen;
-               if ((err = der_decode_octet_string(in + x, z, data, &size)) != CRYPT_OK) {
-                  if (!ordered) { continue; }
-                  goto LBL_ERR;
-               }
-               list[i].size = size;
-               if ((err = der_length_octet_string(size, &z)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               break;
-
-           case LTC_ASN1_NULL:
-               if (inlen < 2 || in[x] != 0x05 || in[x+1] != 0x00) {
-                  if (!ordered) { continue; }
-                  err = CRYPT_INVALID_PACKET;
-                  goto LBL_ERR;
-               }
-               z = 2;
-               break;
-                  
-           case LTC_ASN1_OBJECT_IDENTIFIER:
-               z = inlen;
-               if ((err = der_decode_object_identifier(in + x, z, data, &size)) != CRYPT_OK) {
-                  if (!ordered) { continue; }
-                  goto LBL_ERR;
-               }
-               list[i].size = size;
-               if ((err = der_length_object_identifier(data, size, &z)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               break;
-
-           case LTC_ASN1_IA5_STRING:
-               z = inlen;
-               if ((err = der_decode_ia5_string(in + x, z, data, &size)) != CRYPT_OK) {
-                  if (!ordered) { continue; }
-                  goto LBL_ERR;
-               }
-               list[i].size = size;
-               if ((err = der_length_ia5_string(data, size, &z)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               break;
-
-
-           case LTC_ASN1_PRINTABLE_STRING:
-               z = inlen;
-               if ((err = der_decode_printable_string(in + x, z, data, &size)) != CRYPT_OK) {
-                  if (!ordered) { continue; }
-                  goto LBL_ERR;
-               }
-               list[i].size = size;
-               if ((err = der_length_printable_string(data, size, &z)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               break;
-
-           case LTC_ASN1_UTF8_STRING:
-               z = inlen;
-               if ((err = der_decode_utf8_string(in + x, z, data, &size)) != CRYPT_OK) {
-                  if (!ordered) { continue; }
-                  goto LBL_ERR;
-               }
-               list[i].size = size;
-               if ((err = der_length_utf8_string(data, size, &z)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               break;
-
-           case LTC_ASN1_UTCTIME:
-               z = inlen;
-               if ((err = der_decode_utctime(in + x, &z, data)) != CRYPT_OK) {
-                  if (!ordered) { continue; }
-                  goto LBL_ERR;
-               }
-               break;
-
-           case LTC_ASN1_SET:
-               z = inlen;
-               if ((err = der_decode_set(in + x, z, data, size)) != CRYPT_OK) {
-                  if (!ordered) { continue; }
-                  goto LBL_ERR;
-               }
-               if ((err = der_length_sequence(data, size, &z)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               break;
-           
-           case LTC_ASN1_SETOF:
-           case LTC_ASN1_SEQUENCE:
-               /* detect if we have the right type */
-               if ((type == LTC_ASN1_SETOF && (in[x] & 0x3F) != 0x31) || (type == LTC_ASN1_SEQUENCE && (in[x] & 0x3F) != 0x30)) {
-                  err = CRYPT_INVALID_PACKET;
-                  goto LBL_ERR;
-               }
-
-               z = inlen;
-               if ((err = der_decode_sequence(in + x, z, data, size)) != CRYPT_OK) {
-                  if (!ordered) { continue; }
-                  goto LBL_ERR;
-               }
-               if ((err = der_length_sequence(data, size, &z)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               break;
-
-
-           case LTC_ASN1_CHOICE:
-               z = inlen;
-               if ((err = der_decode_choice(in + x, &z, data, size)) != CRYPT_OK) {
-                  if (!ordered) { continue; }
-                  goto LBL_ERR;
-               }
-               break;
-
-           default:
-               err = CRYPT_INVALID_ARG;
-               goto LBL_ERR;
-       }
-       x           += z;
-       inlen       -= z;
-       list[i].used = 1;
-       if (!ordered) { 
-          /* restart the decoder */
-          i = -1;
-       }          
-   }
-     
-   for (i = 0; i < outlen; i++) {
-      if (list[i].used == 0) {
-          err = CRYPT_INVALID_PACKET;
-          goto LBL_ERR;
-      }
-   }                
-   err = CRYPT_OK;   
-
-LBL_ERR:
-   return err;
-}  
- 
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/sequence/der_decode_sequence_ex.c,v $ */
-/* $Revision: 1.16 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.c
deleted file mode 100644
index 261e4ec53..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_decode_sequence_flexi.c
-  ASN.1 DER, decode an array of ASN.1 types with a flexi parser, Tom St Denis
-*/
-
-#ifdef LTC_DER
-
-static unsigned long fetch_length(const unsigned char *in, unsigned long inlen)
-{
-   unsigned long x, y, z;
-
-   y = 0;
-
-   /* skip type and read len */
-   if (inlen < 2) {
-      return 0xFFFFFFFF;
-   }
-   ++in; ++y;
-   
-   /* read len */
-   x = *in++; ++y;
-   
-   /* <128 means literal */
-   if (x < 128) {
-      return x+y;
-   }
-   x     &= 0x7F; /* the lower 7 bits are the length of the length */
-   inlen -= 2;
-   
-   /* len means len of len! */
-   if (x == 0 || x > 4 || x > inlen) {
-      return 0xFFFFFFFF;
-   }
-   
-   y += x;
-   z = 0;
-   while (x--) {   
-      z = (z<<8) | ((unsigned long)*in);
-      ++in;
-   }
-   return z+y;
-}
-
-/** 
-   ASN.1 DER Flexi(ble) decoder will decode arbitrary DER packets and create a linked list of the decoded elements.
-   @param in      The input buffer
-   @param inlen   [in/out] The length of the input buffer and on output the amount of decoded data 
-   @param out     [out] A pointer to the linked list
-   @return CRYPT_OK on success.
-*/   
-int der_decode_sequence_flexi(const unsigned char *in, unsigned long *inlen, ltc_asn1_list **out)
-{
-   ltc_asn1_list *l;
-   unsigned long err, type, len, totlen, x, y;
-   void          *realloc_tmp;
-   
-   LTC_ARGCHK(in    != NULL);
-   LTC_ARGCHK(inlen != NULL);
-   LTC_ARGCHK(out   != NULL);
-
-   l = NULL;
-   totlen = 0;
-   
-   /* scan the input and and get lengths and what not */
-   while (*inlen) {     
-      /* read the type byte */
-      type = *in;
-
-      /* fetch length */
-      len = fetch_length(in, *inlen);
-      if (len > *inlen) {
-         err = CRYPT_INVALID_PACKET;
-         goto error;
-      }
-
-      /* alloc new link */
-      if (l == NULL) {
-         l = XCALLOC(1, sizeof(*l));
-         if (l == NULL) {
-            err = CRYPT_MEM;
-            goto error;
-         }
-      } else {
-         l->next = XCALLOC(1, sizeof(*l));
-         if (l->next == NULL) {
-            err = CRYPT_MEM;
-            goto error;
-         }
-         l->next->prev = l;
-         l = l->next;
-      }
-
-      /* now switch on type */
-      switch (type) {
-         case 0x01: /* BOOLEAN */
-            l->type = LTC_ASN1_BOOLEAN;
-            l->size = 1;
-            l->data = XCALLOC(1, sizeof(int));
-       
-            if ((err = der_decode_boolean(in, *inlen, l->data)) != CRYPT_OK) {
-               goto error;
-            }
-        
-            if ((err = der_length_boolean(&len)) != CRYPT_OK) {
-               goto error;
-            }
-            break;
-
-         case 0x02: /* INTEGER */
-             /* init field */
-             l->type = LTC_ASN1_INTEGER;
-             l->size = 1;
-             if ((err = mp_init(&l->data)) != CRYPT_OK) {
-                 goto error;
-             }
-             
-             /* decode field */
-             if ((err = der_decode_integer(in, *inlen, l->data)) != CRYPT_OK) {
-                 goto error;
-             }
-             
-             /* calc length of object */
-             if ((err = der_length_integer(l->data, &len)) != CRYPT_OK) {
-                 goto error;
-             }
-             break;
-
-         case 0x03: /* BIT */
-            /* init field */
-            l->type = LTC_ASN1_BIT_STRING;
-            l->size = len * 8; /* *8 because we store decoded bits one per char and they are encoded 8 per char.  */
-
-            if ((l->data = XCALLOC(1, l->size)) == NULL) {
-               err = CRYPT_MEM;
-               goto error;
-            }
-            
-            if ((err = der_decode_bit_string(in, *inlen, l->data, &l->size)) != CRYPT_OK) {
-               goto error;
-            }
-            
-            if ((err = der_length_bit_string(l->size, &len)) != CRYPT_OK) {
-               goto error;
-            }
-            break;
-
-         case 0x04: /* OCTET */
-
-            /* init field */
-            l->type = LTC_ASN1_OCTET_STRING;
-            l->size = len;
-
-            if ((l->data = XCALLOC(1, l->size)) == NULL) {
-               err = CRYPT_MEM;
-               goto error;
-            }
-            
-            if ((err = der_decode_octet_string(in, *inlen, l->data, &l->size)) != CRYPT_OK) {
-               goto error;
-            }
-            
-            if ((err = der_length_octet_string(l->size, &len)) != CRYPT_OK) {
-               goto error;
-            }
-            break;
-
-         case 0x05: /* NULL */
-         
-            /* valid NULL is 0x05 0x00 */
-            if (in[0] != 0x05 || in[1] != 0x00) {
-               err = CRYPT_INVALID_PACKET;
-               goto error;
-            }
-            
-            /* simple to store ;-) */
-            l->type = LTC_ASN1_NULL;
-            l->data = NULL;
-            l->size = 0;
-            len     = 2;
-            
-            break;
-         
-         case 0x06: /* OID */
-         
-            /* init field */
-            l->type = LTC_ASN1_OBJECT_IDENTIFIER;
-            l->size = len;
-
-            if ((l->data = XCALLOC(len, sizeof(unsigned long))) == NULL) {
-               err = CRYPT_MEM;
-               goto error;
-            }
-            
-            if ((err = der_decode_object_identifier(in, *inlen, l->data, &l->size)) != CRYPT_OK) {
-               goto error;
-            }
-            
-            if ((err = der_length_object_identifier(l->data, l->size, &len)) != CRYPT_OK) {
-               goto error;
-            }
-            
-            /* resize it to save a bunch of mem */
-            if ((realloc_tmp = XREALLOC(l->data, l->size * sizeof(unsigned long))) == NULL) {
-               /* out of heap but this is not an error */
-               break;
-            }
-            l->data = realloc_tmp;
-            break;
-  
-         case 0x0C: /* UTF8 */
-         
-            /* init field */
-            l->type = LTC_ASN1_UTF8_STRING;
-            l->size = len;
-
-            if ((l->data = XCALLOC(sizeof(wchar_t), l->size)) == NULL) {
-               err = CRYPT_MEM;
-               goto error;
-            }
-            
-            if ((err = der_decode_utf8_string(in, *inlen, l->data, &l->size)) != CRYPT_OK) {
-               goto error;
-            }
-            
-            if ((err = der_length_utf8_string(l->data, l->size, &len)) != CRYPT_OK) {
-               goto error;
-            }
-            break;
-
-         case 0x13: /* PRINTABLE */
-         
-            /* init field */
-            l->type = LTC_ASN1_PRINTABLE_STRING;
-            l->size = len;
-
-            if ((l->data = XCALLOC(1, l->size)) == NULL) {
-               err = CRYPT_MEM;
-               goto error;
-            }
-            
-            if ((err = der_decode_printable_string(in, *inlen, l->data, &l->size)) != CRYPT_OK) {
-               goto error;
-            }
-            
-            if ((err = der_length_printable_string(l->data, l->size, &len)) != CRYPT_OK) {
-               goto error;
-            }
-            break;
-         
-         case 0x16: /* IA5 */
-         
-            /* init field */
-            l->type = LTC_ASN1_IA5_STRING;
-            l->size = len;
-
-            if ((l->data = XCALLOC(1, l->size)) == NULL) {
-               err = CRYPT_MEM;
-               goto error;
-            }
-            
-            if ((err = der_decode_ia5_string(in, *inlen, l->data, &l->size)) != CRYPT_OK) {
-               goto error;
-            }
-            
-            if ((err = der_length_ia5_string(l->data, l->size, &len)) != CRYPT_OK) {
-               goto error;
-            }
-            break;
-         
-         case 0x17: /* UTC TIME */
-         
-            /* init field */
-            l->type = LTC_ASN1_UTCTIME;
-            l->size = 1;
-
-            if ((l->data = XCALLOC(1, sizeof(ltc_utctime))) == NULL) {
-               err = CRYPT_MEM;
-               goto error;
-            }
-            
-            len = *inlen;
-            if ((err = der_decode_utctime(in, &len, l->data)) != CRYPT_OK) {
-               goto error;
-            }
-            
-            if ((err = der_length_utctime(l->data, &len)) != CRYPT_OK) {
-               goto error;
-            }
-            break;
-         
-         case 0x30: /* SEQUENCE */
-         case 0x31: /* SET */
-         
-             /* init field */
-             l->type = (type == 0x30) ? LTC_ASN1_SEQUENCE : LTC_ASN1_SET;
-             
-             /* we have to decode the SEQUENCE header and get it's length */
-             
-                /* move past type */
-                ++in; --(*inlen);
-                
-                /* read length byte */
-                x = *in++; --(*inlen);
-                
-                /* smallest SEQUENCE/SET header */
-                y = 2;
-                
-                /* now if it's > 127 the next bytes are the length of the length */
-                if (x > 128) {
-                   x      &= 0x7F;
-                   in     += x;
-                   *inlen -= x;
-                   
-                   /* update sequence header len */
-                   y      += x;
-                }
-             
-             /* Sequence elements go as child */
-             len = len - y;
-             if ((err = der_decode_sequence_flexi(in, &len, &(l->child))) != CRYPT_OK) {
-                goto error;
-             }
-             
-             /* len update */
-             totlen += y;
-             
-             /* link them up y0 */
-             l->child->parent = l;
-             
-             break;
-         default:
-           /* invalid byte ... this is a soft error */
-           /* remove link */
-           l       = l->prev;
-           XFREE(l->next);
-           l->next = NULL;
-           goto outside;
-      }
-      
-      /* advance pointers */
-      totlen  += len;
-      in      += len;
-      *inlen  -= len;
-   }
-   
-outside:   
-
-   /* rewind l please */
-   while (l->prev != NULL || l->parent != NULL) {
-      if (l->parent != NULL) {
-         l = l->parent;
-      } else {
-         l = l->prev;
-      }
-   }
-   
-   /* return */
-   *out   = l;
-   *inlen = totlen;
-   return CRYPT_OK;
-
-error:
-   /* free list */
-   der_sequence_free(l);
-
-   return err;
-}
-
-#endif
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/sequence/der_decode_sequence_flexi.c,v $ */
-/* $Revision: 1.26 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.c
deleted file mode 100644
index 982b06bd7..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-#include <stdarg.h>
-
-
-/*
-  @file der_decode_sequence_multi.c
-  ASN.1 DER, decode a SEQUENCE, Tom St Denis
-*/
-
-#ifdef LTC_DER
-
-/*
-  Decode a SEQUENCE type using a VA list
-  @param in    Input buffer
-  @param inlen Length of input in octets
-  @remark <...> is of the form <type, size, data> (int, unsigned long, void*)
-  @return CRYPT_OK on success
-*/  
-int der_decode_sequence_multi(const unsigned char *in, unsigned long inlen, ...)
-{
-   int           err, type;
-   unsigned long size, x;
-   void          *data;
-   va_list       args;
-   ltc_asn1_list *list;
-
-   LTC_ARGCHK(in    != NULL);
-
-   /* get size of output that will be required */
-   va_start(args, inlen);
-   x = 0;
-   for (;;) {
-       type = va_arg(args, int);
-       size = va_arg(args, unsigned long);
-       data = va_arg(args, void*);
-
-       if (type == LTC_ASN1_EOL) { 
-          break;
-       }
-
-       switch (type) {
-           case LTC_ASN1_BOOLEAN:
-           case LTC_ASN1_INTEGER:
-           case LTC_ASN1_SHORT_INTEGER:
-           case LTC_ASN1_BIT_STRING:
-           case LTC_ASN1_OCTET_STRING:
-           case LTC_ASN1_NULL:
-           case LTC_ASN1_OBJECT_IDENTIFIER:
-           case LTC_ASN1_IA5_STRING:
-           case LTC_ASN1_PRINTABLE_STRING:
-           case LTC_ASN1_UTF8_STRING:
-           case LTC_ASN1_UTCTIME:
-           case LTC_ASN1_SET:
-           case LTC_ASN1_SETOF:
-           case LTC_ASN1_SEQUENCE:
-           case LTC_ASN1_CHOICE:
-                ++x; 
-                break;
-          
-           default:
-               va_end(args);
-               return CRYPT_INVALID_ARG;
-       }
-   }
-   va_end(args);
-
-   /* allocate structure for x elements */
-   if (x == 0) {
-      return CRYPT_NOP;
-   }
-
-   list = XCALLOC(sizeof(*list), x);
-   if (list == NULL) {
-      return CRYPT_MEM;
-   }
-
-   /* fill in the structure */
-   va_start(args, inlen);
-   x = 0;
-   for (;;) {
-       type = va_arg(args, int);
-       size = va_arg(args, unsigned long);
-       data = va_arg(args, void*);
-
-       if (type == LTC_ASN1_EOL) { 
-          break;
-       }
-
-       switch (type) {
-           case LTC_ASN1_BOOLEAN:
-           case LTC_ASN1_INTEGER:
-           case LTC_ASN1_SHORT_INTEGER:
-           case LTC_ASN1_BIT_STRING:
-           case LTC_ASN1_OCTET_STRING:
-           case LTC_ASN1_NULL:
-           case LTC_ASN1_OBJECT_IDENTIFIER:
-           case LTC_ASN1_IA5_STRING:
-           case LTC_ASN1_PRINTABLE_STRING:
-           case LTC_ASN1_UTF8_STRING:
-           case LTC_ASN1_UTCTIME:
-           case LTC_ASN1_SEQUENCE:
-           case LTC_ASN1_SET:
-           case LTC_ASN1_SETOF:          
-           case LTC_ASN1_CHOICE:
-                list[x].type   = type;
-                list[x].size   = size;
-                list[x++].data = data;
-                break;
-         
-           default:
-               va_end(args);
-               err = CRYPT_INVALID_ARG;
-               goto LBL_ERR;
-       }
-   }
-   va_end(args);
-
-   err = der_decode_sequence(in, inlen, list, x);
-LBL_ERR:
-   XFREE(list);
-   return err;
-}
-
-#endif
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/sequence/der_decode_sequence_multi.c,v $ */
-/* $Revision: 1.13 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_short_integer.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_short_integer.c
deleted file mode 100644
index 5a2cc9682..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_short_integer.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_decode_short_integer.c
-  ASN.1 DER, decode an integer, Tom St Denis
-*/
-
-
-#ifdef LTC_DER
-
-/*
-  Read a short integer
-  @param in       The DER encoded data
-  @param inlen    Size of data
-  @param num      [out] The integer to decode
-  @return CRYPT_OK if successful
-*/
-int der_decode_short_integer(const unsigned char *in, unsigned long inlen, unsigned long *num)
-{
-   unsigned long len, x, y;
-
-   LTC_ARGCHK(num    != NULL);
-   LTC_ARGCHK(in     != NULL);
-
-   /* check length */
-   if (inlen < 2) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* check header */
-   x = 0;
-   if ((in[x++] & 0x1F) != 0x02) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* get the packet len */
-   len = in[x++];
-
-   if (x + len > inlen) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* read number */
-   y = 0;
-   while (len--) {
-      y = (y<<8) | (unsigned long)in[x++];
-   }
-   *num = y;
-
-   return CRYPT_OK;
-
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/short_integer/der_decode_short_integer.c,v $ */
-/* $Revision: 1.7 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_utctime.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_utctime.c
deleted file mode 100644
index 17f9c3af9..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_utctime.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_decode_utctime.c
-  ASN.1 DER, decode a  UTCTIME, Tom St Denis
-*/
-
-#ifdef LTC_DER
-
-static int char_to_int(unsigned char x)
-{
-   switch (x)  {
-      case '0': return 0;
-      case '1': return 1;
-      case '2': return 2;
-      case '3': return 3;
-      case '4': return 4;
-      case '5': return 5;
-      case '6': return 6;
-      case '7': return 7;
-      case '8': return 8;
-      case '9': return 9;
-   }
-   return 100;
-}
-
-#define DECODE_V(y, max) \
-   y  = char_to_int(buf[x])*10 + char_to_int(buf[x+1]); \
-   if (y >= max) return CRYPT_INVALID_PACKET;           \
-   x += 2;
-
-/*
-  Decodes a UTC time structure in DER format (reads all 6 valid encoding formats)
-  @param in     Input buffer
-  @param inlen  Length of input buffer in octets
-  @param out    [out] Destination of UTC time structure
-  @return CRYPT_OK   if successful
-*/
-int der_decode_utctime(const unsigned char *in, unsigned long *inlen,
-                             ltc_utctime   *out)
-{
-   unsigned char buf[32];
-   unsigned long x;
-   int           y;
-
-   LTC_ARGCHK(in    != NULL);
-   LTC_ARGCHK(inlen != NULL);
-   LTC_ARGCHK(out   != NULL);
-
-   /* check header */
-   if (*inlen < 2UL || (in[1] >= sizeof(buf)) || ((in[1] + 2UL) > *inlen)) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* decode the string */
-   for (x = 0; x < in[1]; x++) {
-       y = der_ia5_value_decode(in[x+2]);
-       if (y == -1) {
-          return CRYPT_INVALID_PACKET;
-       }
-       buf[x] = y;
-   }
-   *inlen = 2 + x;
-
-
-   /* possible encodings are 
-YYMMDDhhmmZ
-YYMMDDhhmm+hh'mm'
-YYMMDDhhmm-hh'mm'
-YYMMDDhhmmssZ
-YYMMDDhhmmss+hh'mm'
-YYMMDDhhmmss-hh'mm'
-
-    So let's do a trivial decode upto [including] mm 
-   */
-
-    x = 0;
-    DECODE_V(out->YY, 100);
-    DECODE_V(out->MM, 13);
-    DECODE_V(out->DD, 32);
-    DECODE_V(out->hh, 24);
-    DECODE_V(out->mm, 60);
-
-    /* clear timezone and seconds info */
-    out->off_dir = out->off_hh = out->off_mm = out->ss = 0;
-
-    /* now is it Z, +, - or 0-9 */
-    if (buf[x] == 'Z') {
-       return CRYPT_OK;
-    } else if (buf[x] == '+' || buf[x] == '-') {
-       out->off_dir = (buf[x++] == '+') ? 0 : 1;
-       DECODE_V(out->off_hh, 24);
-       DECODE_V(out->off_mm, 60);
-       return CRYPT_OK;
-    }
-
-    /* decode seconds */
-    DECODE_V(out->ss, 60);
-
-    /* now is it Z, +, - */
-    if (buf[x] == 'Z') {
-       return CRYPT_OK;
-    } else if (buf[x] == '+' || buf[x] == '-') {
-       out->off_dir = (buf[x++] == '+') ? 0 : 1;
-       DECODE_V(out->off_hh, 24);
-       DECODE_V(out->off_mm, 60);
-       return CRYPT_OK;
-    } else {
-       return CRYPT_INVALID_PACKET;
-    }
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/utctime/der_decode_utctime.c,v $ */
-/* $Revision: 1.9 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.c
deleted file mode 100644
index 45656ff1f..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_decode_utf8_string.c
-  ASN.1 DER, encode a UTF8 STRING, Tom St Denis
-*/
-
-
-#ifdef LTC_DER
-
-/*
-  Store a UTF8 STRING
-  @param in      The DER encoded UTF8 STRING
-  @param inlen   The size of the DER UTF8 STRING
-  @param out     [out] The array of utf8s stored (one per char)
-  @param outlen  [in/out] The number of utf8s stored
-  @return CRYPT_OK if successful
-*/
-int der_decode_utf8_string(const unsigned char *in,  unsigned long inlen,
-                                       wchar_t *out, unsigned long *outlen)
-{
-   wchar_t       tmp;
-   unsigned long x, y, z, len;
-
-   LTC_ARGCHK(in     != NULL);
-   LTC_ARGCHK(out    != NULL);
-   LTC_ARGCHK(outlen != NULL);
-
-   /* must have header at least */
-   if (inlen < 2) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* check for 0x0C */
-   if ((in[0] & 0x1F) != 0x0C) {
-      return CRYPT_INVALID_PACKET;
-   }
-   x = 1;
-
-   /* decode the length */
-   if (in[x] & 0x80) {
-      /* valid # of bytes in length are 1,2,3 */
-      y = in[x] & 0x7F;
-      if ((y == 0) || (y > 3) || ((x + y) > inlen)) {
-         return CRYPT_INVALID_PACKET;
-      }
-
-      /* read the length in */
-      len = 0;
-      ++x;
-      while (y--) {
-         len = (len << 8) | in[x++];
-      }
-   } else {
-      len = in[x++] & 0x7F;
-   }
-
-   if (len + x > inlen) {
-      return CRYPT_INVALID_PACKET;
-   }
-
-   /* proceed to decode */
-   for (y = 0; x < inlen; ) {
-      /* get first byte */
-      tmp = in[x++];
- 
-      /* count number of bytes */
-      for (z = 0; (tmp & 0x80) && (z <= 4); z++, tmp = (tmp << 1) & 0xFF);
-      
-      if (z > 4 || (x + (z - 1) > inlen)) {
-         return CRYPT_INVALID_PACKET;
-      }
-
-      /* decode, grab upper bits */
-      tmp >>= z;
-
-      /* grab remaining bytes */
-      if (z > 1) { --z; }
-      while (z-- != 0) {
-         if ((in[x] & 0xC0) != 0x80) {
-            return CRYPT_INVALID_PACKET;
-         }
-         tmp = (tmp << 6) | ((wchar_t)in[x++] & 0x3F);
-      }
-
-      if (y > *outlen) {
-         *outlen = y;
-         return CRYPT_BUFFER_OVERFLOW;
-      }
-      out[y++] = tmp;
-   }
-   *outlen = y;
-
-   return CRYPT_OK;
-}
- 
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/utf8/der_decode_utf8_string.c,v $ */
-/* $Revision: 1.8 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_bit_string.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_bit_string.c
deleted file mode 100644
index abb092c54..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_bit_string.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_length_bit_string.c
-  ASN.1 DER, get length of BIT STRING, Tom St Denis
-*/
-
-#ifdef LTC_DER
-/*
-  Gets length of DER encoding of BIT STRING 
-  @param nbits  The number of bits in the string to encode
-  @param outlen [out] The length of the DER encoding for the given string
-  @return CRYPT_OK if successful
-*/
-int der_length_bit_string(unsigned long nbits, unsigned long *outlen)
-{
-   unsigned long nbytes;
-   LTC_ARGCHK(outlen != NULL);
-
-   /* get the number of the bytes */
-   nbytes = (nbits >> 3) + ((nbits & 7) ? 1 : 0) + 1;
- 
-   if (nbytes < 128) {
-      /* 03 LL PP DD DD DD ... */
-      *outlen = 2 + nbytes;
-   } else if (nbytes < 256) {
-      /* 03 81 LL PP DD DD DD ... */
-      *outlen = 3 + nbytes;
-   } else if (nbytes < 65536) {
-      /* 03 82 LL LL PP DD DD DD ... */
-      *outlen = 4 + nbytes;
-   } else {
-      return CRYPT_INVALID_ARG;
-   }
-
-   return CRYPT_OK;
-}
-
-#endif
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/bit/der_length_bit_string.c,v $ */
-/* $Revision: 1.3 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_boolean.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_boolean.c
deleted file mode 100644
index 30fb3017d..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_boolean.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_length_boolean.c
-  ASN.1 DER, get length of a BOOLEAN, Tom St Denis
-*/
-
-#ifdef LTC_DER
-/*
-  Gets length of DER encoding of a BOOLEAN 
-  @param outlen [out] The length of the DER encoding
-  @return CRYPT_OK if successful
-*/
-int der_length_boolean(unsigned long *outlen)
-{
-   LTC_ARGCHK(outlen != NULL);
-   *outlen = 3;
-   return CRYPT_OK;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/boolean/der_length_boolean.c,v $ */
-/* $Revision: 1.3 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_ia5_string.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_ia5_string.c
deleted file mode 100644
index 4b3bbe5a3..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_ia5_string.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_length_ia5_string.c
-  ASN.1 DER, get length of IA5 STRING, Tom St Denis
-*/
-
-#ifdef LTC_DER
-
-static const struct {
-   int code, value;
-} ia5_table[] = {
-{ '\0', 0 },
-{ '\a', 7 }, 
-{ '\b', 8 }, 
-{ '\t', 9 }, 
-{ '\n', 10 }, 
-{ '\f', 12 }, 
-{ '\r', 13 }, 
-{ ' ', 32 }, 
-{ '!', 33 }, 
-{ '"', 34 }, 
-{ '#', 35 }, 
-{ '$', 36 }, 
-{ '%', 37 }, 
-{ '&', 38 }, 
-{ '\'', 39 }, 
-{ '(', 40 }, 
-{ ')', 41 }, 
-{ '*', 42 }, 
-{ '+', 43 }, 
-{ ',', 44 }, 
-{ '-', 45 }, 
-{ '.', 46 }, 
-{ '/', 47 }, 
-{ '0', 48 }, 
-{ '1', 49 }, 
-{ '2', 50 }, 
-{ '3', 51 }, 
-{ '4', 52 }, 
-{ '5', 53 }, 
-{ '6', 54 }, 
-{ '7', 55 }, 
-{ '8', 56 }, 
-{ '9', 57 }, 
-{ ':', 58 }, 
-{ ';', 59 }, 
-{ '<', 60 }, 
-{ '=', 61 }, 
-{ '>', 62 }, 
-{ '?', 63 }, 
-{ '@', 64 }, 
-{ 'A', 65 }, 
-{ 'B', 66 }, 
-{ 'C', 67 }, 
-{ 'D', 68 }, 
-{ 'E', 69 }, 
-{ 'F', 70 }, 
-{ 'G', 71 }, 
-{ 'H', 72 }, 
-{ 'I', 73 }, 
-{ 'J', 74 }, 
-{ 'K', 75 }, 
-{ 'L', 76 }, 
-{ 'M', 77 }, 
-{ 'N', 78 }, 
-{ 'O', 79 }, 
-{ 'P', 80 }, 
-{ 'Q', 81 }, 
-{ 'R', 82 }, 
-{ 'S', 83 }, 
-{ 'T', 84 }, 
-{ 'U', 85 }, 
-{ 'V', 86 }, 
-{ 'W', 87 }, 
-{ 'X', 88 }, 
-{ 'Y', 89 }, 
-{ 'Z', 90 }, 
-{ '[', 91 }, 
-{ '\\', 92 }, 
-{ ']', 93 }, 
-{ '^', 94 }, 
-{ '_', 95 }, 
-{ '`', 96 }, 
-{ 'a', 97 }, 
-{ 'b', 98 }, 
-{ 'c', 99 }, 
-{ 'd', 100 }, 
-{ 'e', 101 }, 
-{ 'f', 102 }, 
-{ 'g', 103 }, 
-{ 'h', 104 }, 
-{ 'i', 105 }, 
-{ 'j', 106 }, 
-{ 'k', 107 }, 
-{ 'l', 108 }, 
-{ 'm', 109 }, 
-{ 'n', 110 }, 
-{ 'o', 111 }, 
-{ 'p', 112 }, 
-{ 'q', 113 }, 
-{ 'r', 114 }, 
-{ 's', 115 }, 
-{ 't', 116 }, 
-{ 'u', 117 }, 
-{ 'v', 118 }, 
-{ 'w', 119 }, 
-{ 'x', 120 }, 
-{ 'y', 121 }, 
-{ 'z', 122 }, 
-{ '{', 123 }, 
-{ '|', 124 }, 
-{ '}', 125 }, 
-{ '~', 126 }
-};
-
-int der_ia5_char_encode(int c)
-{
-   int x;
-   for (x = 0; x < (int)(sizeof(ia5_table)/sizeof(ia5_table[0])); x++) {
-       if (ia5_table[x].code == c) {
-          return ia5_table[x].value;
-       }
-   }
-   return -1;
-}
-
-int der_ia5_value_decode(int v)
-{
-   int x;
-   for (x = 0; x < (int)(sizeof(ia5_table)/sizeof(ia5_table[0])); x++) {
-       if (ia5_table[x].value == v) {
-          return ia5_table[x].code;
-       }
-   }
-   return -1;
-}
-   
-/*
-  Gets length of DER encoding of IA5 STRING 
-  @param octets   The values you want to encode 
-  @param noctets  The number of octets in the string to encode
-  @param outlen   [out] The length of the DER encoding for the given string
-  @return CRYPT_OK if successful
-*/
-int der_length_ia5_string(const unsigned char *octets, unsigned long noctets, unsigned long *outlen)
-{
-   unsigned long x;
-
-   LTC_ARGCHK(outlen != NULL);
-   LTC_ARGCHK(octets != NULL);
-
-   /* scan string for validity */
-   for (x = 0; x < noctets; x++) {
-       if (der_ia5_char_encode(octets[x]) == -1) {
-          return CRYPT_INVALID_ARG;
-       }
-   }
-
-   if (noctets < 128) {
-      /* 16 LL DD DD DD ... */
-      *outlen = 2 + noctets;
-   } else if (noctets < 256) {
-      /* 16 81 LL DD DD DD ... */
-      *outlen = 3 + noctets;
-   } else if (noctets < 65536UL) {
-      /* 16 82 LL LL DD DD DD ... */
-      *outlen = 4 + noctets;
-   } else if (noctets < 16777216UL) {
-      /* 16 83 LL LL LL DD DD DD ... */
-      *outlen = 5 + noctets;
-   } else {
-      return CRYPT_INVALID_ARG;
-   }
-
-   return CRYPT_OK;
-}
-
-#endif
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/ia5/der_length_ia5_string.c,v $ */
-/* $Revision: 1.3 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_integer.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_integer.c
deleted file mode 100644
index 56c45ae3d..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_integer.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_length_integer.c
-  ASN.1 DER, get length of encoding, Tom St Denis
-*/
-
-
-#ifdef LTC_DER
-/*
-  Gets length of DER encoding of num 
-  @param num    The int to get the size of 
-  @param outlen [out] The length of the DER encoding for the given integer
-  @return CRYPT_OK if successful
-*/
-int der_length_integer(void *num, unsigned long *outlen)
-{
-   unsigned long z, len;
-   int           leading_zero;
-
-   LTC_ARGCHK(num     != NULL);
-   LTC_ARGCHK(outlen  != NULL);
-
-   if (mp_cmp_d(num, 0) != LTC_MP_LT) {
-      /* positive */
-
-      /* we only need a leading zero if the msb of the first byte is one */
-      if ((mp_count_bits(num) & 7) == 0 || mp_iszero(num) == LTC_MP_YES) {
-         leading_zero = 1;
-      } else {
-         leading_zero = 0;
-      }
-
-      /* size for bignum */
-      z = len = leading_zero + mp_unsigned_bin_size(num);
-   } else {
-      /* it's negative */
-      /* find power of 2 that is a multiple of eight and greater than count bits */
-      leading_zero = 0;
-      z = mp_count_bits(num);
-      z = z + (8 - (z & 7));
-      if (((mp_cnt_lsb(num)+1)==mp_count_bits(num)) && ((mp_count_bits(num)&7)==0)) --z;
-      len = z = z >> 3;
-   }
-
-   /* now we need a length */
-   if (z < 128) {
-      /* short form */
-      ++len;
-   } else {
-      /* long form (relies on z != 0), assumes length bytes < 128 */
-      ++len;
-
-      while (z) {
-         ++len;
-         z >>= 8;
-      }
-   }
-
-   /* we need a 0x02 to indicate it's INTEGER */
-   ++len;
-
-   /* return length */
-   *outlen = len; 
-   return CRYPT_OK;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/integer/der_length_integer.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_object_identifier.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_object_identifier.c
deleted file mode 100644
index 0b7af35e7..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_object_identifier.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_length_object_identifier.c
-  ASN.1 DER, get length of Object Identifier, Tom St Denis
-*/
-
-#ifdef LTC_DER
-
-unsigned long der_object_identifier_bits(unsigned long x)
-{
-   unsigned long c;
-   x &= 0xFFFFFFFF;
-   c  = 0;
-   while (x) {
-     ++c;
-     x >>= 1;
-   }
-   return c;
-}
-
-
-/*
-  Gets length of DER encoding of Object Identifier
-  @param nwords   The number of OID words 
-  @param words    The actual OID words to get the size of
-  @param outlen   [out] The length of the DER encoding for the given string
-  @return CRYPT_OK if successful
-*/
-int der_length_object_identifier(unsigned long *words, unsigned long nwords, unsigned long *outlen)
-{
-   unsigned long y, z, t, wordbuf;   
-
-   LTC_ARGCHK(words  != NULL);
-   LTC_ARGCHK(outlen != NULL);
-
-
-   /* must be >= 2 words */
-   if (nwords < 2) {
-      return CRYPT_INVALID_ARG;
-   }
-
-   /* word1 = 0,1,2,3 and word2 0..39 */
-   if (words[0] > 3 || (words[0] < 2 && words[1] > 39)) {
-      return CRYPT_INVALID_ARG;
-   }
-
-   /* leading word is the first two */
-   z = 0;
-   wordbuf = words[0] * 40 + words[1];
-   for (y = 1; y < nwords; y++) {
-       t = der_object_identifier_bits(wordbuf);
-       z += t/7 + ((t%7) ? 1 : 0) + (wordbuf == 0 ? 1 : 0);
-       if (y < nwords - 1) {
-          /* grab next word */
-          wordbuf = words[y+1];
-       }
-   }
-
-   /* now depending on the length our length encoding changes */
-   if (z < 128) {
-      z += 2;
-   } else if (z < 256) {
-      z += 3;
-   } else if (z < 65536UL) {
-      z += 4;
-   } else {
-      return CRYPT_INVALID_ARG;
-   }
-
-   *outlen = z;
-   return CRYPT_OK;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/object_identifier/der_length_object_identifier.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_octet_string.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_octet_string.c
deleted file mode 100644
index 6e3ce2c7b..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_octet_string.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_length_octet_string.c
-  ASN.1 DER, get length of OCTET STRING, Tom St Denis
-*/
-
-#ifdef LTC_DER
-/*
-  Gets length of DER encoding of OCTET STRING 
-  @param noctets  The number of octets in the string to encode
-  @param outlen   [out] The length of the DER encoding for the given string
-  @return CRYPT_OK if successful
-*/
-int der_length_octet_string(unsigned long noctets, unsigned long *outlen)
-{
-   LTC_ARGCHK(outlen != NULL);
-
-   if (noctets < 128) {
-      /* 04 LL DD DD DD ... */
-      *outlen = 2 + noctets;
-   } else if (noctets < 256) {
-      /* 04 81 LL DD DD DD ... */
-      *outlen = 3 + noctets;
-   } else if (noctets < 65536UL) {
-      /* 04 82 LL LL DD DD DD ... */
-      *outlen = 4 + noctets;
-   } else if (noctets < 16777216UL) {
-      /* 04 83 LL LL LL DD DD DD ... */
-      *outlen = 5 + noctets;
-   } else {
-      return CRYPT_INVALID_ARG;
-   }
-
-   return CRYPT_OK;
-}
-
-#endif
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/octet/der_length_octet_string.c,v $ */
-/* $Revision: 1.3 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_printable_string.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_printable_string.c
deleted file mode 100644
index 1cda6f7c3..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_printable_string.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_length_printable_string.c
-  ASN.1 DER, get length of Printable STRING, Tom St Denis
-*/
-
-#ifdef LTC_DER
-
-static const struct {
-   int code, value;
-} printable_table[] = {
-{ ' ', 32 }, 
-{ '\'', 39 }, 
-{ '(', 40 }, 
-{ ')', 41 }, 
-{ '+', 43 }, 
-{ ',', 44 }, 
-{ '-', 45 }, 
-{ '.', 46 }, 
-{ '/', 47 }, 
-{ '0', 48 }, 
-{ '1', 49 }, 
-{ '2', 50 }, 
-{ '3', 51 }, 
-{ '4', 52 }, 
-{ '5', 53 }, 
-{ '6', 54 }, 
-{ '7', 55 }, 
-{ '8', 56 }, 
-{ '9', 57 }, 
-{ ':', 58 }, 
-{ '=', 61 }, 
-{ '?', 63 }, 
-{ 'A', 65 }, 
-{ 'B', 66 }, 
-{ 'C', 67 }, 
-{ 'D', 68 }, 
-{ 'E', 69 }, 
-{ 'F', 70 }, 
-{ 'G', 71 }, 
-{ 'H', 72 }, 
-{ 'I', 73 }, 
-{ 'J', 74 }, 
-{ 'K', 75 }, 
-{ 'L', 76 }, 
-{ 'M', 77 }, 
-{ 'N', 78 }, 
-{ 'O', 79 }, 
-{ 'P', 80 }, 
-{ 'Q', 81 }, 
-{ 'R', 82 }, 
-{ 'S', 83 }, 
-{ 'T', 84 }, 
-{ 'U', 85 }, 
-{ 'V', 86 }, 
-{ 'W', 87 }, 
-{ 'X', 88 }, 
-{ 'Y', 89 }, 
-{ 'Z', 90 }, 
-{ 'a', 97 }, 
-{ 'b', 98 }, 
-{ 'c', 99 }, 
-{ 'd', 100 }, 
-{ 'e', 101 }, 
-{ 'f', 102 }, 
-{ 'g', 103 }, 
-{ 'h', 104 }, 
-{ 'i', 105 }, 
-{ 'j', 106 }, 
-{ 'k', 107 }, 
-{ 'l', 108 }, 
-{ 'm', 109 }, 
-{ 'n', 110 }, 
-{ 'o', 111 }, 
-{ 'p', 112 }, 
-{ 'q', 113 }, 
-{ 'r', 114 }, 
-{ 's', 115 }, 
-{ 't', 116 }, 
-{ 'u', 117 }, 
-{ 'v', 118 }, 
-{ 'w', 119 }, 
-{ 'x', 120 }, 
-{ 'y', 121 }, 
-{ 'z', 122 }, 
-};
-
-int der_printable_char_encode(int c)
-{
-   int x;
-   for (x = 0; x < (int)(sizeof(printable_table)/sizeof(printable_table[0])); x++) {
-       if (printable_table[x].code == c) {
-          return printable_table[x].value;
-       }
-   }
-   return -1;
-}
-
-int der_printable_value_decode(int v)
-{
-   int x;
-   for (x = 0; x < (int)(sizeof(printable_table)/sizeof(printable_table[0])); x++) {
-       if (printable_table[x].value == v) {
-          return printable_table[x].code;
-       }
-   }
-   return -1;
-}
-   
-/*
-  Gets length of DER encoding of Printable STRING 
-  @param octets   The values you want to encode 
-  @param noctets  The number of octets in the string to encode
-  @param outlen   [out] The length of the DER encoding for the given string
-  @return CRYPT_OK if successful
-*/
-int der_length_printable_string(const unsigned char *octets, unsigned long noctets, unsigned long *outlen)
-{
-   unsigned long x;
-
-   LTC_ARGCHK(outlen != NULL);
-   LTC_ARGCHK(octets != NULL);
-
-   /* scan string for validity */
-   for (x = 0; x < noctets; x++) {
-       if (der_printable_char_encode(octets[x]) == -1) {
-          return CRYPT_INVALID_ARG;
-       }
-   }
-
-   if (noctets < 128) {
-      /* 16 LL DD DD DD ... */
-      *outlen = 2 + noctets;
-   } else if (noctets < 256) {
-      /* 16 81 LL DD DD DD ... */
-      *outlen = 3 + noctets;
-   } else if (noctets < 65536UL) {
-      /* 16 82 LL LL DD DD DD ... */
-      *outlen = 4 + noctets;
-   } else if (noctets < 16777216UL) {
-      /* 16 83 LL LL LL DD DD DD ... */
-      *outlen = 5 + noctets;
-   } else {
-      return CRYPT_INVALID_ARG;
-   }
-
-   return CRYPT_OK;
-}
-
-#endif
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/printable_string/der_length_printable_string.c,v $ */
-/* $Revision: 1.3 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_sequence.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_sequence.c
deleted file mode 100644
index 4add44794..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_sequence.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_length_sequence.c
-  ASN.1 DER, length a SEQUENCE, Tom St Denis
-*/
-
-#ifdef LTC_DER
-
-/*
-   Get the length of a DER sequence 
-   @param list   The sequences of items in the SEQUENCE
-   @param inlen  The number of items
-   @param outlen [out] The length required in octets to store it 
-   @return CRYPT_OK on success
-*/
-int der_length_sequence(ltc_asn1_list *list, unsigned long inlen,
-                        unsigned long *outlen) 
-{
-   int           err, type;
-   unsigned long size, x, y, z, i;
-   void          *data;
-
-   LTC_ARGCHK(list    != NULL);
-   LTC_ARGCHK(outlen  != NULL);
-
-   /* get size of output that will be required */
-   y = 0;
-   for (i = 0; i < inlen; i++) {
-       type = list[i].type;
-       size = list[i].size;
-       data = list[i].data;
-
-       if (type == LTC_ASN1_EOL) { 
-          break;
-       }
-
-       switch (type) {
-           case LTC_ASN1_BOOLEAN:
-              if ((err = der_length_boolean(&x)) != CRYPT_OK) {
-                 goto LBL_ERR;
-              }
-              y += x;
-              break;
-          
-           case LTC_ASN1_INTEGER:
-               if ((err = der_length_integer(data, &x)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               y += x;
-               break;
-
-           case LTC_ASN1_SHORT_INTEGER:
-               if ((err = der_length_short_integer(*((unsigned long *)data), &x)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               y += x;
-               break;
-
-           case LTC_ASN1_BIT_STRING:
-               if ((err = der_length_bit_string(size, &x)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               y += x;
-               break;
-
-           case LTC_ASN1_OCTET_STRING:
-               if ((err = der_length_octet_string(size, &x)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               y += x;
-               break;
-
-           case LTC_ASN1_NULL:
-               y += 2;
-               break;
-
-           case LTC_ASN1_OBJECT_IDENTIFIER:
-               if ((err = der_length_object_identifier(data, size, &x)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               y += x;
-               break;
-
-           case LTC_ASN1_IA5_STRING:
-               if ((err = der_length_ia5_string(data, size, &x)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               y += x;
-               break;
-
-           case LTC_ASN1_PRINTABLE_STRING:
-               if ((err = der_length_printable_string(data, size, &x)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               y += x;
-               break;
-
-           case LTC_ASN1_UTCTIME:
-               if ((err = der_length_utctime(data, &x)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               y += x;
-               break;
-
-           case LTC_ASN1_UTF8_STRING:
-               if ((err = der_length_utf8_string(data, size, &x)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               y += x;
-               break;
-
-           case LTC_ASN1_SET:
-           case LTC_ASN1_SETOF:
-           case LTC_ASN1_SEQUENCE:
-               if ((err = der_length_sequence(data, size, &x)) != CRYPT_OK) {
-                  goto LBL_ERR;
-               }
-               y += x;
-               break;
-
-          
-           default:
-               err = CRYPT_INVALID_ARG;
-               goto LBL_ERR;
-       }
-   }
-
-   /* calc header size */
-   z = y;
-   if (y < 128) {
-      y += 2;
-   } else if (y < 256) {
-      /* 0x30 0x81 LL */
-      y += 3;
-   } else if (y < 65536UL) {
-      /* 0x30 0x82 LL LL */
-      y += 4;
-   } else if (y < 16777216UL) {
-      /* 0x30 0x83 LL LL LL */
-      y += 5;
-   } else {
-      err = CRYPT_INVALID_ARG;
-      goto LBL_ERR;
-   }
-
-   /* store size */
-   *outlen = y;
-   err     = CRYPT_OK;
-
-LBL_ERR:
-   return err;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/sequence/der_length_sequence.c,v $ */
-/* $Revision: 1.14 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_short_integer.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_short_integer.c
deleted file mode 100644
index a39e1b764..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_short_integer.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_length_short_integer.c
-  ASN.1 DER, get length of encoding, Tom St Denis
-*/
-
-
-#ifdef LTC_DER
-/*
-  Gets length of DER encoding of num 
-  @param num    The integer to get the size of 
-  @param outlen [out] The length of the DER encoding for the given integer
-  @return CRYPT_OK if successful
-*/
-int der_length_short_integer(unsigned long num, unsigned long *outlen)
-{
-   unsigned long z, y, len;
-
-   LTC_ARGCHK(outlen  != NULL);
-
-   /* force to 32 bits */
-   num &= 0xFFFFFFFFUL;
-
-   /* get the number of bytes */
-   z = 0;
-   y = num;
-   while (y) {
-     ++z;
-     y >>= 8;
-   }
-   
-   /* handle zero */
-   if (z == 0) {
-      z = 1;
-   }
-
-   /* we need a 0x02 to indicate it's INTEGER */
-   len = 1;
-
-   /* length byte */
-   ++len;
-
-   /* bytes in value */
-   len += z;
-
-   /* see if msb is set */
-   len += (num&(1UL<<((z<<3) - 1))) ? 1 : 0;
-
-   /* return length */
-   *outlen = len; 
-   
-   return CRYPT_OK;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/short_integer/der_length_short_integer.c,v $ */
-/* $Revision: 1.6 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_utctime.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_utctime.c
deleted file mode 100644
index d7c8a1ac3..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_utctime.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_length_utctime.c
-  ASN.1 DER, get length of UTCTIME, Tom St Denis
-*/
-
-#ifdef LTC_DER
-
-/*
-  Gets length of DER encoding of UTCTIME
-  @param utctime      The UTC time structure to get the size of
-  @param outlen [out] The length of the DER encoding
-  @return CRYPT_OK if successful
-*/
-int der_length_utctime(ltc_utctime *utctime, unsigned long *outlen)
-{
-   LTC_ARGCHK(outlen  != NULL);
-   LTC_ARGCHK(utctime != NULL);
-
-   if (utctime->off_hh == 0 && utctime->off_mm == 0) {
-      /* we encode as YYMMDDhhmmssZ */
-      *outlen = 2 + 13;
-   } else {
-      /* we encode as YYMMDDhhmmss{+|-}hh'mm' */
-      *outlen = 2 + 17;
-   }
-
-   return CRYPT_OK;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/utctime/der_length_utctime.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_utf8_string.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_utf8_string.c
deleted file mode 100644
index 83787e969..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_length_utf8_string.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_length_utf8_string.c
-  ASN.1 DER, get length of UTF8 STRING, Tom St Denis
-*/
-
-#ifdef LTC_DER
-
-/** Return the size in bytes of a UTF-8 character
-  @param c   The UTF-8 character to measure
-  @return    The size in bytes
-*/
-unsigned long der_utf8_charsize(const wchar_t c)
-{
-   if (c <= 0x7F) {
-      return 1;
-   } else if (c <= 0x7FF) {
-      return 2;
-   } else if (c <= 0xFFFF) {
-      return 3;
-   } else {
-      return 4;
-   }
-}
-
-/*
-  Gets length of DER encoding of UTF8 STRING 
-  @param in       The characters to measure the length of
-  @param noctets  The number of octets in the string to encode
-  @param outlen   [out] The length of the DER encoding for the given string
-  @return CRYPT_OK if successful
-*/
-int der_length_utf8_string(const wchar_t *in, unsigned long noctets, unsigned long *outlen)
-{
-   unsigned long x, len;
-
-   LTC_ARGCHK(in     != NULL);
-   LTC_ARGCHK(outlen != NULL);
-
-   len = 0;
-   for (x = 0; x < noctets; x++) {
-      if (in[x] < 0 || in[x] > 0x10FFFF) {
-         return CRYPT_INVALID_ARG;
-      }
-      len += der_utf8_charsize(in[x]);
-   }
-
-   if (len < 128) {
-      /* 0C LL DD DD DD ... */
-      *outlen = 2 + len;
-   } else if (len < 256) {
-      /* 0C 81 LL DD DD DD ... */
-      *outlen = 3 + len;
-   } else if (len < 65536UL) {
-      /* 0C 82 LL LL DD DD DD ... */
-      *outlen = 4 + len;
-   } else if (len < 16777216UL) {
-      /* 0C 83 LL LL LL DD DD DD ... */
-      *outlen = 5 + len;
-   } else {
-      return CRYPT_INVALID_ARG;
-   }
-
-   return CRYPT_OK;
-}
-
-#endif
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/utf8/der_length_utf8_string.c,v $ */
-/* $Revision: 1.6 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_sequence_free.c b/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_sequence_free.c
deleted file mode 100644
index 11d045655..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/asn1/der_sequence_free.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file der_sequence_free.c
-  ASN.1 DER, free's a structure allocated by der_decode_sequence_flexi(), Tom St Denis
-*/
-
-#ifdef LTC_DER
-
-/*
-  Free memory allocated by der_decode_sequence_flexi()
-  @param in     The list to free
-*/  
-void der_sequence_free(ltc_asn1_list *in)
-{
-   ltc_asn1_list *l;
-   
-   /* walk to the start of the chain */
-   while (in->prev != NULL || in->parent != NULL) {
-      if (in->parent != NULL) {
-          in = in->parent;
-      } else {
-          in = in->prev;
-      }
-   }
-   
-   /* now walk the list and free stuff */
-   while (in != NULL) {
-      /* is there a child? */
-      if (in->child) {
-         /* disconnect */
-         in->child->parent = NULL;
-         der_sequence_free(in->child);
-      }
-      
-      switch (in->type) { 
-         case LTC_ASN1_SET:
-         case LTC_ASN1_SETOF:
-         case LTC_ASN1_SEQUENCE: break;
-         case LTC_ASN1_INTEGER : if (in->data != NULL) { mp_clear(in->data); } break;
-         default               : if (in->data != NULL) { XFREE(in->data);    }
-      }
-      
-      /* move to next and free current */
-      l = in->next;
-      free(in);
-      in = l;
-   }     
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/asn1/der/sequence/der_sequence_free.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:27:24 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_map.c b/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_map.c
deleted file mode 100644
index b4b54e811..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_map.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Implements ECC over Z/pZ for curve y^2 = x^3 - 3x + b
- *
- * All curves taken from NIST recommendation paper of July 1999
- * Available at http://csrc.nist.gov/cryptval/dss.htm
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file ltc_ecc_map.c
-  ECC Crypto, Tom St Denis
-*/  
-
-#ifdef LTC_MECC
-
-/*
-  Map a projective jacbobian point back to affine space
-  @param P        [in/out] The point to map
-  @param modulus  The modulus of the field the ECC curve is in
-  @param mp       The "b" value from montgomery_setup()
-  @return CRYPT_OK on success
-*/
-int ltc_ecc_map(ecc_point *P, void *modulus, void *mp)
-{
-   void *t1, *t2;
-   int   err;
-
-   LTC_ARGCHK(P       != NULL);
-   LTC_ARGCHK(modulus != NULL);
-   LTC_ARGCHK(mp      != NULL);
-
-   if ((err = mp_init_multi(&t1, &t2, NULL)) != CRYPT_OK) {
-      return CRYPT_MEM;
-   }
-
-   /* first map z back to normal */
-   if ((err = mp_montgomery_reduce(P->z, modulus, mp)) != CRYPT_OK)           { goto done; }
-
-   /* get 1/z */
-   if ((err = mp_invmod(P->z, modulus, t1)) != CRYPT_OK)                      { goto done; }
- 
-   /* get 1/z^2 and 1/z^3 */
-   if ((err = mp_sqr(t1, t2)) != CRYPT_OK)                                    { goto done; }
-   if ((err = mp_mod(t2, modulus, t2)) != CRYPT_OK)                           { goto done; }
-   if ((err = mp_mul(t1, t2, t1)) != CRYPT_OK)                                { goto done; }
-   if ((err = mp_mod(t1, modulus, t1)) != CRYPT_OK)                           { goto done; }
-
-   /* multiply against x/y */
-   if ((err = mp_mul(P->x, t2, P->x)) != CRYPT_OK)                            { goto done; }
-   if ((err = mp_montgomery_reduce(P->x, modulus, mp)) != CRYPT_OK)           { goto done; }
-   if ((err = mp_mul(P->y, t1, P->y)) != CRYPT_OK)                            { goto done; }
-   if ((err = mp_montgomery_reduce(P->y, modulus, mp)) != CRYPT_OK)           { goto done; }
-   if ((err = mp_set(P->z, 1)) != CRYPT_OK)                                   { goto done; }
-
-   err = CRYPT_OK;
-done:
-   mp_clear_multi(t1, t2, NULL);
-   return err;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/ecc/ltc_ecc_map.c,v $ */
-/* $Revision: 1.7 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
-
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c b/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c
deleted file mode 100644
index 1f699de99..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Implements ECC over Z/pZ for curve y^2 = x^3 - 3x + b
- *
- * All curves taken from NIST recommendation paper of July 1999
- * Available at http://csrc.nist.gov/cryptval/dss.htm
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file ltc_ecc_mul2add.c
-  ECC Crypto, Shamir's Trick, Tom St Denis
-*/  
-
-#ifdef LTC_MECC
-
-#ifdef LTC_ECC_SHAMIR
-
-/** Computes kA*A + kB*B = C using Shamir's Trick
-  @param A        First point to multiply
-  @param kA       What to multiple A by
-  @param B        Second point to multiply
-  @param kB       What to multiple B by
-  @param C        [out] Destination point (can overlap with A or B
-  @param modulus  Modulus for curve 
-  @return CRYPT_OK on success
-*/ 
-int ltc_ecc_mul2add(ecc_point *A, void *kA,
-                    ecc_point *B, void *kB,
-                    ecc_point *C,
-                         void *modulus)
-{
-  ecc_point     *precomp[16];
-  unsigned       bitbufA, bitbufB, lenA, lenB, len, x, y, nA, nB, nibble;
-  unsigned char *tA, *tB;
-  int            err, first;
-  void          *mp, *mu;
- 
-  /* argchks */
-  LTC_ARGCHK(A       != NULL);
-  LTC_ARGCHK(B       != NULL);
-  LTC_ARGCHK(C       != NULL);
-  LTC_ARGCHK(kA      != NULL);
-  LTC_ARGCHK(kB      != NULL);
-  LTC_ARGCHK(modulus != NULL);
-
-  /* allocate memory */
-  tA = XCALLOC(1, ECC_BUF_SIZE);
-  if (tA == NULL) {
-     return CRYPT_MEM;
-  }
-  tB = XCALLOC(1, ECC_BUF_SIZE);
-  if (tB == NULL) {
-     XFREE(tA);
-     return CRYPT_MEM;
-  }
-
-  /* get sizes */
-  lenA = mp_unsigned_bin_size(kA);
-  lenB = mp_unsigned_bin_size(kB);
-  len  = MAX(lenA, lenB);
-
-  /* sanity check */
-  if ((lenA > ECC_BUF_SIZE) || (lenB > ECC_BUF_SIZE)) {
-     err = CRYPT_INVALID_ARG;
-     goto ERR_T;
-  }
-
-  /* extract and justify kA */
-  mp_to_unsigned_bin(kA, (len - lenA) + tA);
-
-  /* extract and justify kB */
-  mp_to_unsigned_bin(kB, (len - lenB) + tB);
-
-  /* allocate the table */
-  for (x = 0; x < 16; x++) {
-     precomp[x] = ltc_ecc_new_point();
-     if (precomp[x] == NULL) {
-         for (y = 0; y < x; ++y) {
-            ltc_ecc_del_point(precomp[y]);
-         }
-         err = CRYPT_MEM;
-         goto ERR_T;
-     }
-  }
-
-   /* init montgomery reduction */
-   if ((err = mp_montgomery_setup(modulus, &mp)) != CRYPT_OK) {
-      goto ERR_P;
-   }
-   if ((err = mp_init(&mu)) != CRYPT_OK) {
-      goto ERR_MP;
-   }
-   if ((err = mp_montgomery_normalization(mu, modulus)) != CRYPT_OK) {
-      goto ERR_MU;
-   }
-
-  /* copy ones ... */
-  if ((err = mp_mulmod(A->x, mu, modulus, precomp[1]->x)) != CRYPT_OK)                                         { goto ERR_MU; }
-  if ((err = mp_mulmod(A->y, mu, modulus, precomp[1]->y)) != CRYPT_OK)                                         { goto ERR_MU; }
-  if ((err = mp_mulmod(A->z, mu, modulus, precomp[1]->z)) != CRYPT_OK)                                         { goto ERR_MU; }
-
-  if ((err = mp_mulmod(B->x, mu, modulus, precomp[1<<2]->x)) != CRYPT_OK)                                      { goto ERR_MU; }
-  if ((err = mp_mulmod(B->y, mu, modulus, precomp[1<<2]->y)) != CRYPT_OK)                                      { goto ERR_MU; }
-  if ((err = mp_mulmod(B->z, mu, modulus, precomp[1<<2]->z)) != CRYPT_OK)                                      { goto ERR_MU; }
-
-  /* precomp [i,0](A + B) table */
-  if ((err = ltc_mp.ecc_ptdbl(precomp[1], precomp[2], modulus, mp)) != CRYPT_OK)                               { goto ERR_MU; }
-  if ((err = ltc_mp.ecc_ptadd(precomp[1], precomp[2], precomp[3], modulus, mp)) != CRYPT_OK)                   { goto ERR_MU; }
-
-  /* precomp [0,i](A + B) table */
-  if ((err = ltc_mp.ecc_ptdbl(precomp[1<<2], precomp[2<<2], modulus, mp)) != CRYPT_OK)                         { goto ERR_MU; }
-  if ((err = ltc_mp.ecc_ptadd(precomp[1<<2], precomp[2<<2], precomp[3<<2], modulus, mp)) != CRYPT_OK)          { goto ERR_MU; }
-
-  /* precomp [i,j](A + B) table (i != 0, j != 0) */
-  for (x = 1; x < 4; x++) {
-     for (y = 1; y < 4; y++) {
-        if ((err = ltc_mp.ecc_ptadd(precomp[x], precomp[(y<<2)], precomp[x+(y<<2)], modulus, mp)) != CRYPT_OK) { goto ERR_MU; }
-     }
-  }   
-
-  nibble  = 3;
-  first   = 1;
-  bitbufA = tA[0];
-  bitbufB = tB[0];
-
-  /* for every byte of the multiplicands */
-  for (x = -1;; ) {
-     /* grab a nibble */
-     if (++nibble == 4) {
-        ++x; if (x == len) break;
-        bitbufA = tA[x];
-        bitbufB = tB[x];
-        nibble  = 0;
-     }
-
-     /* extract two bits from both, shift/update */
-     nA = (bitbufA >> 6) & 0x03;
-     nB = (bitbufB >> 6) & 0x03;
-     bitbufA = (bitbufA << 2) & 0xFF;   
-     bitbufB = (bitbufB << 2) & 0xFF;   
-
-     /* if both zero, if first, continue */
-     if ((nA == 0) && (nB == 0) && (first == 1)) {
-        continue;
-     }
-
-     /* double twice, only if this isn't the first */
-     if (first == 0) {
-        /* double twice */
-        if ((err = ltc_mp.ecc_ptdbl(C, C, modulus, mp)) != CRYPT_OK)                  { goto ERR_MU; }
-        if ((err = ltc_mp.ecc_ptdbl(C, C, modulus, mp)) != CRYPT_OK)                  { goto ERR_MU; }
-     }
-
-     /* if not both zero */
-     if ((nA != 0) || (nB != 0)) {
-        if (first == 1) {
-           /* if first, copy from table */
-           first = 0;
-           if ((err = mp_copy(precomp[nA + (nB<<2)]->x, C->x)) != CRYPT_OK)           { goto ERR_MU; }
-           if ((err = mp_copy(precomp[nA + (nB<<2)]->y, C->y)) != CRYPT_OK)           { goto ERR_MU; }
-           if ((err = mp_copy(precomp[nA + (nB<<2)]->z, C->z)) != CRYPT_OK)           { goto ERR_MU; }
-        } else {
-           /* if not first, add from table */
-           if ((err = ltc_mp.ecc_ptadd(C, precomp[nA + (nB<<2)], C, modulus, mp)) != CRYPT_OK) { goto ERR_MU; }
-        }
-     }
-  }
-
-  /* reduce to affine */
-  err = ltc_ecc_map(C, modulus, mp);
-
-  /* clean up */
-ERR_MU:
-   mp_clear(mu);
-ERR_MP:
-   mp_montgomery_free(mp);
-ERR_P:
-   for (x = 0; x < 16; x++) {
-       ltc_ecc_del_point(precomp[x]);
-   }
-ERR_T:
-#ifdef LTC_CLEAN_STACK
-   zeromem(tA, ECC_BUF_SIZE);
-   zeromem(tB, ECC_BUF_SIZE);
-#endif
-   XFREE(tA);
-   XFREE(tB);
-
-   return err;
-}
-
-#endif
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c,v $ */
-/* $Revision: 1.8 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c b/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c
deleted file mode 100644
index 5c0edd447..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Implements ECC over Z/pZ for curve y^2 = x^3 - 3x + b
- *
- * All curves taken from NIST recommendation paper of July 1999
- * Available at http://csrc.nist.gov/cryptval/dss.htm
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file ltc_ecc_mulmod.c
-  ECC Crypto, Tom St Denis
-*/  
-
-#ifdef LTC_MECC
-#ifndef LTC_ECC_TIMING_RESISTANT
-
-/* size of sliding window, don't change this! */
-#define WINSIZE 4
-
-/*
-   Perform a point multiplication 
-   @param k    The scalar to multiply by
-   @param G    The base point
-   @param R    [out] Destination for kG
-   @param modulus  The modulus of the field the ECC curve is in
-   @param map      Boolean whether to map back to affine or not (1==map, 0 == leave in projective)
-   @return CRYPT_OK on success
-*/
-int ltc_ecc_mulmod(void *k, ecc_point *G, ecc_point *R, void *modulus, int map)
-{
-   ecc_point *tG, *M[8];
-   int        i, j, err;
-   void       *mu, *mp;
-   unsigned long buf;
-   int        first, bitbuf, bitcpy, bitcnt, mode, digidx;
-
-   LTC_ARGCHK(k       != NULL);
-   LTC_ARGCHK(G       != NULL);
-   LTC_ARGCHK(R       != NULL);
-   LTC_ARGCHK(modulus != NULL);
-
-   /* init montgomery reduction */
-   if ((err = mp_montgomery_setup(modulus, &mp)) != CRYPT_OK) {
-      return err;
-   }
-   if ((err = mp_init(&mu)) != CRYPT_OK) {
-      mp_montgomery_free(mp);
-      return err;
-   }
-   if ((err = mp_montgomery_normalization(mu, modulus)) != CRYPT_OK) {
-      mp_montgomery_free(mp);
-      mp_clear(mu);
-      return err;
-   }
-  
-  /* alloc ram for window temps */
-  for (i = 0; i < 8; i++) {
-      M[i] = ltc_ecc_new_point();
-      if (M[i] == NULL) {
-         for (j = 0; j < i; j++) {
-             ltc_ecc_del_point(M[j]);
-         }
-         mp_montgomery_free(mp);
-         mp_clear(mu);
-         return CRYPT_MEM;
-      }
-  }
-
-   /* make a copy of G incase R==G */
-   tG = ltc_ecc_new_point();
-   if (tG == NULL)                                                                   { err = CRYPT_MEM; goto done; }
-
-   /* tG = G  and convert to montgomery */
-   if (mp_cmp_d(mu, 1) == LTC_MP_EQ) {
-      if ((err = mp_copy(G->x, tG->x)) != CRYPT_OK)                                  { goto done; }
-      if ((err = mp_copy(G->y, tG->y)) != CRYPT_OK)                                  { goto done; }
-      if ((err = mp_copy(G->z, tG->z)) != CRYPT_OK)                                  { goto done; }
-   } else {      
-      if ((err = mp_mulmod(G->x, mu, modulus, tG->x)) != CRYPT_OK)                   { goto done; }
-      if ((err = mp_mulmod(G->y, mu, modulus, tG->y)) != CRYPT_OK)                   { goto done; }
-      if ((err = mp_mulmod(G->z, mu, modulus, tG->z)) != CRYPT_OK)                   { goto done; }
-   }
-   mp_clear(mu);
-   mu = NULL;
-   
-   /* calc the M tab, which holds kG for k==8..15 */
-   /* M[0] == 8G */
-   if ((err = ltc_mp.ecc_ptdbl(tG, M[0], modulus, mp)) != CRYPT_OK)                 { goto done; }
-   if ((err = ltc_mp.ecc_ptdbl(M[0], M[0], modulus, mp)) != CRYPT_OK)               { goto done; }
-   if ((err = ltc_mp.ecc_ptdbl(M[0], M[0], modulus, mp)) != CRYPT_OK)               { goto done; }
-
-   /* now find (8+k)G for k=1..7 */
-   for (j = 9; j < 16; j++) {
-       if ((err = ltc_mp.ecc_ptadd(M[j-9], tG, M[j-8], modulus, mp)) != CRYPT_OK)   { goto done; }
-   }
-
-   /* setup sliding window */
-   mode   = 0;
-   bitcnt = 1;
-   buf    = 0;
-   digidx = mp_get_digit_count(k) - 1;
-   bitcpy = bitbuf = 0;
-   first  = 1;
-
-   /* perform ops */
-   for (;;) {
-     /* grab next digit as required */
-     if (--bitcnt == 0) {
-       if (digidx == -1) {
-          break;
-       }
-       buf    = mp_get_digit(k, digidx);
-       bitcnt = (int) ltc_mp.bits_per_digit;
-       --digidx;
-     }
-
-     /* grab the next msb from the ltiplicand */
-     i = (buf >> (ltc_mp.bits_per_digit - 1)) & 1;
-     buf <<= 1;
-
-     /* skip leading zero bits */
-     if (mode == 0 && i == 0) {
-        continue;
-     }
-
-     /* if the bit is zero and mode == 1 then we double */
-     if (mode == 1 && i == 0) {
-        if ((err = ltc_mp.ecc_ptdbl(R, R, modulus, mp)) != CRYPT_OK)                 { goto done; }
-        continue;
-     }
-
-     /* else we add it to the window */
-     bitbuf |= (i << (WINSIZE - ++bitcpy));
-     mode = 2;
-
-     if (bitcpy == WINSIZE) {
-       /* if this is the first window we do a simple copy */
-       if (first == 1) {
-          /* R = kG [k = first window] */
-          if ((err = mp_copy(M[bitbuf-8]->x, R->x)) != CRYPT_OK)                     { goto done; }
-          if ((err = mp_copy(M[bitbuf-8]->y, R->y)) != CRYPT_OK)                     { goto done; }
-          if ((err = mp_copy(M[bitbuf-8]->z, R->z)) != CRYPT_OK)                     { goto done; }
-          first = 0;
-       } else {
-         /* normal window */
-         /* ok window is filled so double as required and add  */
-         /* double first */
-         for (j = 0; j < WINSIZE; j++) {
-           if ((err = ltc_mp.ecc_ptdbl(R, R, modulus, mp)) != CRYPT_OK)              { goto done; }
-         }
-
-         /* then add, bitbuf will be 8..15 [8..2^WINSIZE] guaranteed */
-         if ((err = ltc_mp.ecc_ptadd(R, M[bitbuf-8], R, modulus, mp)) != CRYPT_OK)   { goto done; }
-       }
-       /* empty window and reset */
-       bitcpy = bitbuf = 0;
-       mode = 1;
-    }
-  }
-
-   /* if bits remain then double/add */
-   if (mode == 2 && bitcpy > 0) {
-     /* double then add */
-     for (j = 0; j < bitcpy; j++) {
-       /* only double if we have had at least one add first */
-       if (first == 0) {
-          if ((err = ltc_mp.ecc_ptdbl(R, R, modulus, mp)) != CRYPT_OK)              { goto done; }
-       }
-
-       bitbuf <<= 1;
-       if ((bitbuf & (1 << WINSIZE)) != 0) {
-         if (first == 1){
-            /* first add, so copy */
-            if ((err = mp_copy(tG->x, R->x)) != CRYPT_OK)                           { goto done; }
-            if ((err = mp_copy(tG->y, R->y)) != CRYPT_OK)                           { goto done; }
-            if ((err = mp_copy(tG->z, R->z)) != CRYPT_OK)                           { goto done; }
-            first = 0;
-         } else {
-            /* then add */
-            if ((err = ltc_mp.ecc_ptadd(R, tG, R, modulus, mp)) != CRYPT_OK)        { goto done; }
-         }
-       }
-     }
-   }
-
-   /* map R back from projective space */
-   if (map) {
-      err = ltc_ecc_map(R, modulus, mp);
-   } else {
-      err = CRYPT_OK;
-   }
-done:
-   if (mu != NULL) {
-      mp_clear(mu);
-   }
-   mp_montgomery_free(mp);
-   ltc_ecc_del_point(tG);
-   for (i = 0; i < 8; i++) {
-       ltc_ecc_del_point(M[i]);
-   }
-   return err;
-}
-
-#endif
-
-#undef WINSIZE
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c,v $ */
-/* $Revision: 1.26 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_points.c b/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_points.c
deleted file mode 100644
index a0e3de544..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_points.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Implements ECC over Z/pZ for curve y^2 = x^3 - 3x + b
- *
- * All curves taken from NIST recommendation paper of July 1999
- * Available at http://csrc.nist.gov/cryptval/dss.htm
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file ltc_ecc_points.c
-  ECC Crypto, Tom St Denis
-*/  
-
-#ifdef LTC_MECC
-
-/*
-   Allocate a new ECC point
-   @return A newly allocated point or NULL on error 
-*/
-ecc_point *ltc_ecc_new_point(void)
-{
-   ecc_point *p;
-   p = XCALLOC(1, sizeof(*p));
-   if (p == NULL) {
-      return NULL;
-   }
-   if (mp_init_multi(&p->x, &p->y, &p->z, NULL) != CRYPT_OK) {
-      XFREE(p);
-      return NULL;
-   }
-   return p;
-}
-
-/** Free an ECC point from memory
-  @param p   The point to free
-*/
-void ltc_ecc_del_point(ecc_point *p)
-{
-   /* prevents free'ing null arguments */
-   if (p != NULL) {
-      mp_clear_multi(p->x, p->y, p->z, NULL); /* note: p->z may be NULL but that's ok with this function anyways */
-      XFREE(p);
-   }
-}
-
-#endif
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/ecc/ltc_ecc_points.c,v $ */
-/* $Revision: 1.7 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
-
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c b/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c
deleted file mode 100644
index 2f057c637..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Implements ECC over Z/pZ for curve y^2 = x^3 - 3x + b
- *
- * All curves taken from NIST recommendation paper of July 1999
- * Available at http://csrc.nist.gov/cryptval/dss.htm
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file ltc_ecc_projective_add_point.c
-  ECC Crypto, Tom St Denis
-*/  
-
-#if defined(LTC_MECC) && (!defined(LTC_MECC_ACCEL) || defined(LTM_LTC_DESC))
-
-/*
-   Add two ECC points
-   @param P        The point to add
-   @param Q        The point to add
-   @param R        [out] The destination of the double
-   @param modulus  The modulus of the field the ECC curve is in
-   @param mp       The "b" value from montgomery_setup()
-   @return CRYPT_OK on success
-*/
-int ltc_ecc_projective_add_point(ecc_point *P, ecc_point *Q, ecc_point *R, void *modulus, void *mp)
-{
-   void  *t1, *t2, *x, *y, *z;
-   int    err;
-
-   LTC_ARGCHK(P       != NULL);
-   LTC_ARGCHK(Q       != NULL);
-   LTC_ARGCHK(R       != NULL);
-   LTC_ARGCHK(modulus != NULL);
-   LTC_ARGCHK(mp      != NULL);
-
-   if ((err = mp_init_multi(&t1, &t2, &x, &y, &z, NULL)) != CRYPT_OK) {
-      return err;
-   }
-   
-   /* should we dbl instead? */
-   if ((err = mp_sub(modulus, Q->y, t1)) != CRYPT_OK)                          { goto done; }
-
-   if ( (mp_cmp(P->x, Q->x) == LTC_MP_EQ) && 
-        (Q->z != NULL && mp_cmp(P->z, Q->z) == LTC_MP_EQ) &&
-        (mp_cmp(P->y, Q->y) == LTC_MP_EQ || mp_cmp(P->y, t1) == LTC_MP_EQ)) {
-        mp_clear_multi(t1, t2, x, y, z, NULL);
-        return ltc_ecc_projective_dbl_point(P, R, modulus, mp);
-   }
-
-   if ((err = mp_copy(P->x, x)) != CRYPT_OK)                                   { goto done; }
-   if ((err = mp_copy(P->y, y)) != CRYPT_OK)                                   { goto done; }
-   if ((err = mp_copy(P->z, z)) != CRYPT_OK)                                   { goto done; }
-
-   /* if Z is one then these are no-operations */
-   if (Q->z != NULL) {
-      /* T1 = Z' * Z' */
-      if ((err = mp_sqr(Q->z, t1)) != CRYPT_OK)                                { goto done; }
-      if ((err = mp_montgomery_reduce(t1, modulus, mp)) != CRYPT_OK)           { goto done; }
-      /* X = X * T1 */
-      if ((err = mp_mul(t1, x, x)) != CRYPT_OK)                                { goto done; }
-      if ((err = mp_montgomery_reduce(x, modulus, mp)) != CRYPT_OK)            { goto done; }
-      /* T1 = Z' * T1 */
-      if ((err = mp_mul(Q->z, t1, t1)) != CRYPT_OK)                            { goto done; }
-      if ((err = mp_montgomery_reduce(t1, modulus, mp)) != CRYPT_OK)           { goto done; }
-      /* Y = Y * T1 */
-      if ((err = mp_mul(t1, y, y)) != CRYPT_OK)                                { goto done; }
-      if ((err = mp_montgomery_reduce(y, modulus, mp)) != CRYPT_OK)            { goto done; }
-   }
-
-   /* T1 = Z*Z */
-   if ((err = mp_sqr(z, t1)) != CRYPT_OK)                                      { goto done; }
-   if ((err = mp_montgomery_reduce(t1, modulus, mp)) != CRYPT_OK)              { goto done; }
-   /* T2 = X' * T1 */
-   if ((err = mp_mul(Q->x, t1, t2)) != CRYPT_OK)                               { goto done; }
-   if ((err = mp_montgomery_reduce(t2, modulus, mp)) != CRYPT_OK)              { goto done; }
-   /* T1 = Z * T1 */
-   if ((err = mp_mul(z, t1, t1)) != CRYPT_OK)                                  { goto done; }
-   if ((err = mp_montgomery_reduce(t1, modulus, mp)) != CRYPT_OK)              { goto done; }
-   /* T1 = Y' * T1 */
-   if ((err = mp_mul(Q->y, t1, t1)) != CRYPT_OK)                               { goto done; }
-   if ((err = mp_montgomery_reduce(t1, modulus, mp)) != CRYPT_OK)              { goto done; }
-
-   /* Y = Y - T1 */
-   if ((err = mp_sub(y, t1, y)) != CRYPT_OK)                                   { goto done; }
-   if (mp_cmp_d(y, 0) == LTC_MP_LT) {
-      if ((err = mp_add(y, modulus, y)) != CRYPT_OK)                           { goto done; }
-   }
-   /* T1 = 2T1 */
-   if ((err = mp_add(t1, t1, t1)) != CRYPT_OK)                                 { goto done; }
-   if (mp_cmp(t1, modulus) != LTC_MP_LT) {
-      if ((err = mp_sub(t1, modulus, t1)) != CRYPT_OK)                         { goto done; }
-   }
-   /* T1 = Y + T1 */
-   if ((err = mp_add(t1, y, t1)) != CRYPT_OK)                                  { goto done; }
-   if (mp_cmp(t1, modulus) != LTC_MP_LT) {
-      if ((err = mp_sub(t1, modulus, t1)) != CRYPT_OK)                         { goto done; }
-   }
-   /* X = X - T2 */
-   if ((err = mp_sub(x, t2, x)) != CRYPT_OK)                                   { goto done; }
-   if (mp_cmp_d(x, 0) == LTC_MP_LT) {
-      if ((err = mp_add(x, modulus, x)) != CRYPT_OK)                           { goto done; }
-   }
-   /* T2 = 2T2 */
-   if ((err = mp_add(t2, t2, t2)) != CRYPT_OK)                                 { goto done; }
-   if (mp_cmp(t2, modulus) != LTC_MP_LT) {
-      if ((err = mp_sub(t2, modulus, t2)) != CRYPT_OK)                         { goto done; }
-   }
-   /* T2 = X + T2 */
-   if ((err = mp_add(t2, x, t2)) != CRYPT_OK)                                  { goto done; }
-   if (mp_cmp(t2, modulus) != LTC_MP_LT) {
-      if ((err = mp_sub(t2, modulus, t2)) != CRYPT_OK)                         { goto done; }
-   }
-
-   /* if Z' != 1 */
-   if (Q->z != NULL) {
-      /* Z = Z * Z' */
-      if ((err = mp_mul(z, Q->z, z)) != CRYPT_OK)                              { goto done; }
-      if ((err = mp_montgomery_reduce(z, modulus, mp)) != CRYPT_OK)            { goto done; }
-   }
-
-   /* Z = Z * X */
-   if ((err = mp_mul(z, x, z)) != CRYPT_OK)                                    { goto done; }
-   if ((err = mp_montgomery_reduce(z, modulus, mp)) != CRYPT_OK)               { goto done; }
-
-   /* T1 = T1 * X  */
-   if ((err = mp_mul(t1, x, t1)) != CRYPT_OK)                                  { goto done; }
-   if ((err = mp_montgomery_reduce(t1, modulus, mp)) != CRYPT_OK)              { goto done; }
-   /* X = X * X */
-   if ((err = mp_sqr(x, x)) != CRYPT_OK)                                       { goto done; }
-   if ((err = mp_montgomery_reduce(x, modulus, mp)) != CRYPT_OK)               { goto done; }
-   /* T2 = T2 * x */
-   if ((err = mp_mul(t2, x, t2)) != CRYPT_OK)                                  { goto done; }
-   if ((err = mp_montgomery_reduce(t2, modulus, mp)) != CRYPT_OK)              { goto done; }
-   /* T1 = T1 * X  */
-   if ((err = mp_mul(t1, x, t1)) != CRYPT_OK)                                  { goto done; }
-   if ((err = mp_montgomery_reduce(t1, modulus, mp)) != CRYPT_OK)              { goto done; }
- 
-   /* X = Y*Y */
-   if ((err = mp_sqr(y, x)) != CRYPT_OK)                                       { goto done; }
-   if ((err = mp_montgomery_reduce(x, modulus, mp)) != CRYPT_OK)               { goto done; }
-   /* X = X - T2 */
-   if ((err = mp_sub(x, t2, x)) != CRYPT_OK)                                   { goto done; }
-   if (mp_cmp_d(x, 0) == LTC_MP_LT) {
-      if ((err = mp_add(x, modulus, x)) != CRYPT_OK)                           { goto done; }
-   }
-
-   /* T2 = T2 - X */
-   if ((err = mp_sub(t2, x, t2)) != CRYPT_OK)                                  { goto done; }
-   if (mp_cmp_d(t2, 0) == LTC_MP_LT) {
-      if ((err = mp_add(t2, modulus, t2)) != CRYPT_OK)                         { goto done; }
-   } 
-   /* T2 = T2 - X */
-   if ((err = mp_sub(t2, x, t2)) != CRYPT_OK)                                  { goto done; }
-   if (mp_cmp_d(t2, 0) == LTC_MP_LT) {
-      if ((err = mp_add(t2, modulus, t2)) != CRYPT_OK)                         { goto done; }
-   }
-   /* T2 = T2 * Y */
-   if ((err = mp_mul(t2, y, t2)) != CRYPT_OK)                                  { goto done; }
-   if ((err = mp_montgomery_reduce(t2, modulus, mp)) != CRYPT_OK)              { goto done; }
-   /* Y = T2 - T1 */
-   if ((err = mp_sub(t2, t1, y)) != CRYPT_OK)                                  { goto done; }
-   if (mp_cmp_d(y, 0) == LTC_MP_LT) {
-      if ((err = mp_add(y, modulus, y)) != CRYPT_OK)                           { goto done; }
-   }
-   /* Y = Y/2 */
-   if (mp_isodd(y)) {
-      if ((err = mp_add(y, modulus, y)) != CRYPT_OK)                           { goto done; }
-   }
-   if ((err = mp_div_2(y, y)) != CRYPT_OK)                                     { goto done; }
-
-   if ((err = mp_copy(x, R->x)) != CRYPT_OK)                                   { goto done; }
-   if ((err = mp_copy(y, R->y)) != CRYPT_OK)                                   { goto done; }
-   if ((err = mp_copy(z, R->z)) != CRYPT_OK)                                   { goto done; }
-
-   err = CRYPT_OK;
-done:
-   mp_clear_multi(t1, t2, x, y, z, NULL);
-   return err;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c,v $ */
-/* $Revision: 1.16 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
-
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c b/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c
deleted file mode 100644
index 57762cb1e..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Implements ECC over Z/pZ for curve y^2 = x^3 - 3x + b
- *
- * All curves taken from NIST recommendation paper of July 1999
- * Available at http://csrc.nist.gov/cryptval/dss.htm
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file ltc_ecc_projective_dbl_point.c
-  ECC Crypto, Tom St Denis
-*/  
-
-#if defined(LTC_MECC) && (!defined(LTC_MECC_ACCEL) || defined(LTM_LTC_DESC))
-
-/*
-   Double an ECC point
-   @param P   The point to double
-   @param R   [out] The destination of the double
-   @param modulus  The modulus of the field the ECC curve is in
-   @param mp       The "b" value from montgomery_setup()
-   @return CRYPT_OK on success
-*/
-int ltc_ecc_projective_dbl_point(ecc_point *P, ecc_point *R, void *modulus, void *mp)
-{
-   void *t1, *t2;
-   int   err;
-
-   LTC_ARGCHK(P       != NULL);
-   LTC_ARGCHK(R       != NULL);
-   LTC_ARGCHK(modulus != NULL);
-   LTC_ARGCHK(mp      != NULL);
-
-   if ((err = mp_init_multi(&t1, &t2, NULL)) != CRYPT_OK) {
-      return err;
-   }
-
-   if (P != R) {
-      if ((err = mp_copy(P->x, R->x)) != CRYPT_OK)                                { goto done; }
-      if ((err = mp_copy(P->y, R->y)) != CRYPT_OK)                                { goto done; }
-      if ((err = mp_copy(P->z, R->z)) != CRYPT_OK)                                { goto done; }
-   }
-
-   /* t1 = Z * Z */
-   if ((err = mp_sqr(R->z, t1)) != CRYPT_OK)                                      { goto done; }
-   if ((err = mp_montgomery_reduce(t1, modulus, mp)) != CRYPT_OK)                 { goto done; }
-   /* Z = Y * Z */
-   if ((err = mp_mul(R->z, R->y, R->z)) != CRYPT_OK)                              { goto done; }
-   if ((err = mp_montgomery_reduce(R->z, modulus, mp)) != CRYPT_OK)               { goto done; }
-   /* Z = 2Z */
-   if ((err = mp_add(R->z, R->z, R->z)) != CRYPT_OK)                              { goto done; }
-   if (mp_cmp(R->z, modulus) != LTC_MP_LT) {
-      if ((err = mp_sub(R->z, modulus, R->z)) != CRYPT_OK)                        { goto done; }
-   }
-   
-   /* T2 = X - T1 */
-   if ((err = mp_sub(R->x, t1, t2)) != CRYPT_OK)                                  { goto done; }
-   if (mp_cmp_d(t2, 0) == LTC_MP_LT) {
-      if ((err = mp_add(t2, modulus, t2)) != CRYPT_OK)                            { goto done; }
-   }
-   /* T1 = X + T1 */
-   if ((err = mp_add(t1, R->x, t1)) != CRYPT_OK)                                  { goto done; }
-   if (mp_cmp(t1, modulus) != LTC_MP_LT) {
-      if ((err = mp_sub(t1, modulus, t1)) != CRYPT_OK)                            { goto done; }
-   }
-   /* T2 = T1 * T2 */
-   if ((err = mp_mul(t1, t2, t2)) != CRYPT_OK)                                    { goto done; }
-   if ((err = mp_montgomery_reduce(t2, modulus, mp)) != CRYPT_OK)                 { goto done; }
-   /* T1 = 2T2 */
-   if ((err = mp_add(t2, t2, t1)) != CRYPT_OK)                                    { goto done; }
-   if (mp_cmp(t1, modulus) != LTC_MP_LT) {
-      if ((err = mp_sub(t1, modulus, t1)) != CRYPT_OK)                            { goto done; }
-   }
-   /* T1 = T1 + T2 */
-   if ((err = mp_add(t1, t2, t1)) != CRYPT_OK)                                    { goto done; }
-   if (mp_cmp(t1, modulus) != LTC_MP_LT) {
-      if ((err = mp_sub(t1, modulus, t1)) != CRYPT_OK)                            { goto done; }
-   }
-
-   /* Y = 2Y */
-   if ((err = mp_add(R->y, R->y, R->y)) != CRYPT_OK)                              { goto done; }
-   if (mp_cmp(R->y, modulus) != LTC_MP_LT) {
-      if ((err = mp_sub(R->y, modulus, R->y)) != CRYPT_OK)                        { goto done; }
-   }
-   /* Y = Y * Y */
-   if ((err = mp_sqr(R->y, R->y)) != CRYPT_OK)                                    { goto done; }
-   if ((err = mp_montgomery_reduce(R->y, modulus, mp)) != CRYPT_OK)               { goto done; }
-   /* T2 = Y * Y */
-   if ((err = mp_sqr(R->y, t2)) != CRYPT_OK)                                      { goto done; }
-   if ((err = mp_montgomery_reduce(t2, modulus, mp)) != CRYPT_OK)                 { goto done; }
-   /* T2 = T2/2 */
-   if (mp_isodd(t2)) {
-      if ((err = mp_add(t2, modulus, t2)) != CRYPT_OK)                            { goto done; }
-   }
-   if ((err = mp_div_2(t2, t2)) != CRYPT_OK)                                      { goto done; }
-   /* Y = Y * X */
-   if ((err = mp_mul(R->y, R->x, R->y)) != CRYPT_OK)                              { goto done; }
-   if ((err = mp_montgomery_reduce(R->y, modulus, mp)) != CRYPT_OK)               { goto done; }
-
-   /* X  = T1 * T1 */
-   if ((err = mp_sqr(t1, R->x)) != CRYPT_OK)                                      { goto done; }
-   if ((err = mp_montgomery_reduce(R->x, modulus, mp)) != CRYPT_OK)               { goto done; }
-   /* X = X - Y */
-   if ((err = mp_sub(R->x, R->y, R->x)) != CRYPT_OK)                              { goto done; }
-   if (mp_cmp_d(R->x, 0) == LTC_MP_LT) {
-      if ((err = mp_add(R->x, modulus, R->x)) != CRYPT_OK)                        { goto done; }
-   }
-   /* X = X - Y */
-   if ((err = mp_sub(R->x, R->y, R->x)) != CRYPT_OK)                              { goto done; }
-   if (mp_cmp_d(R->x, 0) == LTC_MP_LT) {
-      if ((err = mp_add(R->x, modulus, R->x)) != CRYPT_OK)                        { goto done; }
-   }
-
-   /* Y = Y - X */     
-   if ((err = mp_sub(R->y, R->x, R->y)) != CRYPT_OK)                              { goto done; }
-   if (mp_cmp_d(R->y, 0) == LTC_MP_LT) {
-      if ((err = mp_add(R->y, modulus, R->y)) != CRYPT_OK)                        { goto done; }
-   }
-   /* Y = Y * T1 */
-   if ((err = mp_mul(R->y, t1, R->y)) != CRYPT_OK)                                { goto done; }
-   if ((err = mp_montgomery_reduce(R->y, modulus, mp)) != CRYPT_OK)               { goto done; }
-   /* Y = Y - T2 */
-   if ((err = mp_sub(R->y, t2, R->y)) != CRYPT_OK)                                { goto done; }
-   if (mp_cmp_d(R->y, 0) == LTC_MP_LT) {
-      if ((err = mp_add(R->y, modulus, R->y)) != CRYPT_OK)                        { goto done; }
-   }
- 
-   err = CRYPT_OK;
-done:
-   mp_clear_multi(t1, t2, NULL);
-   return err;
-}
-#endif
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c,v $ */
-/* $Revision: 1.11 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
-
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c b/dep/StormLibOld/src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c
deleted file mode 100644
index e18887434..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/** 
-  @file pkcs_1_mgf1.c
-  The Mask Generation Function (MGF1) for LTC_PKCS #1, Tom St Denis 
-*/
-
-#ifdef LTC_PKCS_1
-
-/*
-   Perform LTC_PKCS #1 MGF1 (internal)
-   @param seed        The seed for MGF1
-   @param seedlen     The length of the seed
-   @param hash_idx    The index of the hash desired
-   @param mask        [out] The destination
-   @param masklen     The length of the mask desired
-   @return CRYPT_OK if successful
-*/
-int pkcs_1_mgf1(int                  hash_idx,
-                const unsigned char *seed, unsigned long seedlen,
-                      unsigned char *mask, unsigned long masklen)
-{
-   unsigned long hLen, x;
-   ulong32       counter;
-   int           err;
-   hash_state    *md;
-   unsigned char *buf;
- 
-   LTC_ARGCHK(seed != NULL);
-   LTC_ARGCHK(mask != NULL);
-
-   /* ensure valid hash */
-   if ((err = hash_is_valid(hash_idx)) != CRYPT_OK) { 
-      return err;
-   }
-
-   /* get hash output size */
-   hLen = hash_descriptor[hash_idx].hashsize;
-
-   /* allocate memory */
-   md  = XMALLOC(sizeof(hash_state));
-   buf = XMALLOC(hLen);
-   if (md == NULL || buf == NULL) {
-      if (md != NULL) {
-         XFREE(md);
-      }
-      if (buf != NULL) {
-         XFREE(buf);
-      }
-      return CRYPT_MEM;
-   }
-
-   /* start counter */
-   counter = 0;
-
-   while (masklen > 0) {
-       /* handle counter */
-       STORE32H(counter, buf);
-       ++counter;
-
-       /* get hash of seed || counter */
-       if ((err = hash_descriptor[hash_idx].init(md)) != CRYPT_OK) {
-          goto LBL_ERR;
-       }
-       if ((err = hash_descriptor[hash_idx].process(md, seed, seedlen)) != CRYPT_OK) {
-          goto LBL_ERR;
-       }
-       if ((err = hash_descriptor[hash_idx].process(md, buf, 4)) != CRYPT_OK) {
-          goto LBL_ERR;
-       }
-       if ((err = hash_descriptor[hash_idx].done(md, buf)) != CRYPT_OK) {
-          goto LBL_ERR;
-       }
-
-       /* store it */
-       for (x = 0; x < hLen && masklen > 0; x++, masklen--) {
-          *mask++ = buf[x];
-       }
-   }
-
-   err = CRYPT_OK;
-LBL_ERR:
-#ifdef LTC_CLEAN_STACK
-   zeromem(buf, hLen);
-   zeromem(md,  sizeof(hash_state));
-#endif
-
-   XFREE(buf);
-   XFREE(md);
-
-   return err;
-}
-
-#endif /* LTC_PKCS_1 */
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c,v $ */
-/* $Revision: 1.8 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c b/dep/StormLibOld/src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c
deleted file mode 100644
index 3941fb84e..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/** 
-  @file pkcs_1_oaep_decode.c
-  OAEP Padding for LTC_PKCS #1, Tom St Denis 
-*/
-
-#ifdef LTC_PKCS_1
-
-/*
-   LTC_PKCS #1 v2.00 OAEP decode
-   @param msg              The encoded data to decode
-   @param msglen           The length of the encoded data (octets)
-   @param lparam           The session or system data (can be NULL)
-   @param lparamlen        The length of the lparam
-   @param modulus_bitlen   The bit length of the RSA modulus
-   @param hash_idx         The index of the hash desired
-   @param out              [out] Destination of decoding
-   @param outlen           [in/out] The max size and resulting size of the decoding
-   @param res              [out] Result of decoding, 1==valid, 0==invalid
-   @return CRYPT_OK if successful (even if invalid)
-*/
-int pkcs_1_oaep_decode(const unsigned char *msg,    unsigned long msglen,
-                       const unsigned char *lparam, unsigned long lparamlen,
-                             unsigned long modulus_bitlen, int hash_idx,
-                             unsigned char *out,    unsigned long *outlen,
-                             int           *res)
-{
-   unsigned char *DB, *seed, *mask;
-   unsigned long hLen, x, y, modulus_len;
-   int           err;
-
-   LTC_ARGCHK(msg    != NULL);
-   LTC_ARGCHK(out    != NULL);
-   LTC_ARGCHK(outlen != NULL);
-   LTC_ARGCHK(res    != NULL);
-
-   /* default to invalid packet */
-   *res = 0;
-   
-   /* test valid hash */
-   if ((err = hash_is_valid(hash_idx)) != CRYPT_OK) { 
-      return err;
-   }
-   hLen        = hash_descriptor[hash_idx].hashsize;
-   modulus_len = (modulus_bitlen >> 3) + (modulus_bitlen & 7 ? 1 : 0);
-
-   /* test hash/message size */
-   if ((2*hLen >= (modulus_len - 2)) || (msglen != modulus_len)) {
-      return CRYPT_PK_INVALID_SIZE;
-   }
-
-   /* allocate ram for DB/mask/salt of size modulus_len */
-   DB   = XMALLOC(modulus_len);
-   mask = XMALLOC(modulus_len);
-   seed = XMALLOC(hLen);
-   if (DB == NULL || mask == NULL || seed == NULL) {
-      if (DB != NULL) {
-         XFREE(DB);
-      }
-      if (mask != NULL) {
-         XFREE(mask);
-      }
-      if (seed != NULL) {
-         XFREE(seed);
-      }
-      return CRYPT_MEM;
-   }
-
-   /* ok so it's now in the form
-  
-      0x00  || maskedseed || maskedDB 
-  
-       1    ||   hLen     ||  modulus_len - hLen - 1
-   
-    */
-
-   /* must have leading 0x00 byte */
-   if (msg[0] != 0x00) {
-      err = CRYPT_OK;
-      goto LBL_ERR;
-   }
-
-   /* now read the masked seed */
-   x = 1;
-   XMEMCPY(seed, msg + x, hLen);
-   x += hLen;
-
-   /* now read the masked DB */
-   XMEMCPY(DB, msg + x, modulus_len - hLen - 1);
-   x += modulus_len - hLen - 1;
-
-   /* compute MGF1 of maskedDB (hLen) */ 
-   if ((err = pkcs_1_mgf1(hash_idx, DB, modulus_len - hLen - 1, mask, hLen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* XOR against seed */
-   for (y = 0; y < hLen; y++) {
-      seed[y] ^= mask[y];
-   }
-
-   /* compute MGF1 of seed (k - hlen - 1) */
-   if ((err = pkcs_1_mgf1(hash_idx, seed, hLen, mask, modulus_len - hLen - 1)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* xor against DB */
-   for (y = 0; y < (modulus_len - hLen - 1); y++) {
-       DB[y] ^= mask[y]; 
-   }
-
-   /* now DB == lhash || PS || 0x01 || M, PS == k - mlen - 2hlen - 2 zeroes */
-
-   /* compute lhash and store it in seed [reuse temps!] */
-   x = modulus_len;
-   if (lparam != NULL) {
-      if ((err = hash_memory(hash_idx, lparam, lparamlen, seed, &x)) != CRYPT_OK) {
-         goto LBL_ERR;
-      }
-   } else {
-      /* can't pass hash_memory a NULL so use DB with zero length */
-      if ((err = hash_memory(hash_idx, DB, 0, seed, &x)) != CRYPT_OK) {
-         goto LBL_ERR;
-      }
-   }
-
-   /* compare the lhash'es */
-   if (XMEMCMP(seed, DB, hLen) != 0) {
-      err = CRYPT_OK;
-      goto LBL_ERR;
-   }
-
-   /* now zeroes before a 0x01 */
-   for (x = hLen; x < (modulus_len - hLen - 1) && DB[x] == 0x00; x++) {
-      /* step... */
-   }
-
-   /* error out if wasn't 0x01 */
-   if (x == (modulus_len - hLen - 1) || DB[x] != 0x01) {
-      err = CRYPT_INVALID_PACKET;
-      goto LBL_ERR;
-   }
-
-   /* rest is the message (and skip 0x01) */
-   if ((modulus_len - hLen - 1 - ++x) > *outlen) {
-      *outlen = modulus_len - hLen - 1 - x;
-      err = CRYPT_BUFFER_OVERFLOW;
-      goto LBL_ERR;
-   }
-
-   /* copy message */
-   *outlen = modulus_len - hLen - 1 - x;
-   XMEMCPY(out, DB + x, modulus_len - hLen - 1 - x);
-   x += modulus_len - hLen - 1;
-
-   /* valid packet */
-   *res = 1;
-
-   err = CRYPT_OK;
-LBL_ERR:
-#ifdef LTC_CLEAN_STACK
-   zeromem(DB,   modulus_len);
-   zeromem(seed, hLen);
-   zeromem(mask, modulus_len);
-#endif
-
-   XFREE(seed);
-   XFREE(mask);
-   XFREE(DB);
-
-   return err;
-}
-
-#endif /* LTC_PKCS_1 */
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c,v $ */
-/* $Revision: 1.13 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c b/dep/StormLibOld/src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c
deleted file mode 100644
index 027314388..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/** 
-  @file pkcs_1_pss_decode.c
-  LTC_PKCS #1 PSS Signature Padding, Tom St Denis 
-*/
-
-#ifdef LTC_PKCS_1
-
-/*
-   LTC_PKCS #1 v2.00 PSS decode
-   @param  msghash         The hash to verify
-   @param  msghashlen      The length of the hash (octets)
-   @param  sig             The signature data (encoded data)
-   @param  siglen          The length of the signature data (octets)
-   @param  saltlen         The length of the salt used (octets)
-   @param  hash_idx        The index of the hash desired
-   @param  modulus_bitlen  The bit length of the RSA modulus
-   @param  res             [out] The result of the comparison, 1==valid, 0==invalid
-   @return CRYPT_OK if successful (even if the comparison failed)
-*/
-int pkcs_1_pss_decode(const unsigned char *msghash, unsigned long msghashlen,
-                      const unsigned char *sig,     unsigned long siglen,
-                            unsigned long saltlen,  int           hash_idx,
-                            unsigned long modulus_bitlen, int    *res)
-{
-   unsigned char *DB, *mask, *salt, *hash;
-   unsigned long x, y, hLen, modulus_len;
-   int           err;
-   hash_state    md;
-
-   LTC_ARGCHK(msghash != NULL);
-   LTC_ARGCHK(res     != NULL);
-
-   /* default to invalid */
-   *res = 0;
-
-   /* ensure hash is valid */
-   if ((err = hash_is_valid(hash_idx)) != CRYPT_OK) {
-      return err;
-   }
-
-   hLen        = hash_descriptor[hash_idx].hashsize;
-   modulus_len = (modulus_bitlen>>3) + (modulus_bitlen & 7 ? 1 : 0);
-
-   /* check sizes */
-   if ((saltlen > modulus_len) || 
-       (modulus_len < hLen + saltlen + 2) || (siglen != modulus_len)) {
-      return CRYPT_PK_INVALID_SIZE;
-   }
-
-   /* allocate ram for DB/mask/salt/hash of size modulus_len */
-   DB   = XMALLOC(modulus_len);
-   mask = XMALLOC(modulus_len);
-   salt = XMALLOC(modulus_len);
-   hash = XMALLOC(modulus_len);
-   if (DB == NULL || mask == NULL || salt == NULL || hash == NULL) {
-      if (DB != NULL) {
-         XFREE(DB);
-      }
-      if (mask != NULL) {
-         XFREE(mask);
-      }
-      if (salt != NULL) {
-         XFREE(salt);
-      }
-      if (hash != NULL) {
-         XFREE(hash);
-      }
-      return CRYPT_MEM;
-   }
-
-   /* ensure the 0xBC byte */
-   if (sig[siglen-1] != 0xBC) {
-      err = CRYPT_INVALID_PACKET;
-      goto LBL_ERR;
-   }
-
-   /* copy out the DB */
-   x = 0;
-   XMEMCPY(DB, sig + x, modulus_len - hLen - 1);
-   x += modulus_len - hLen - 1;
-
-   /* copy out the hash */
-   XMEMCPY(hash, sig + x, hLen);
-   x += hLen;
-
-   /* check the MSB */
-   if ((sig[0] & ~(0xFF >> ((modulus_len<<3) - (modulus_bitlen-1)))) != 0) {
-      err = CRYPT_INVALID_PACKET;
-      goto LBL_ERR;
-   }
-
-   /* generate mask of length modulus_len - hLen - 1 from hash */
-   if ((err = pkcs_1_mgf1(hash_idx, hash, hLen, mask, modulus_len - hLen - 1)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* xor against DB */
-   for (y = 0; y < (modulus_len - hLen - 1); y++) {
-      DB[y] ^= mask[y];
-   }
-   
-   /* now clear the first byte [make sure smaller than modulus] */
-   DB[0] &= 0xFF >> ((modulus_len<<3) - (modulus_bitlen-1));
-
-   /* DB = PS || 0x01 || salt, PS == modulus_len - saltlen - hLen - 2 zero bytes */
-
-   /* check for zeroes and 0x01 */
-   for (x = 0; x < modulus_len - saltlen - hLen - 2; x++) {
-       if (DB[x] != 0x00) {
-          err = CRYPT_INVALID_PACKET;
-          goto LBL_ERR;
-       }
-   }
-
-   /* check for the 0x01 */
-   if (DB[x++] != 0x01) {
-      err = CRYPT_INVALID_PACKET;
-      goto LBL_ERR;
-   }
-
-   /* M = (eight) 0x00 || msghash || salt, mask = H(M) */
-   if ((err = hash_descriptor[hash_idx].init(&md)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-   zeromem(mask, 8);
-   if ((err = hash_descriptor[hash_idx].process(&md, mask, 8)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-   if ((err = hash_descriptor[hash_idx].process(&md, msghash, msghashlen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-   if ((err = hash_descriptor[hash_idx].process(&md, DB+x, saltlen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-   if ((err = hash_descriptor[hash_idx].done(&md, mask)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* mask == hash means valid signature */
-   if (XMEMCMP(mask, hash, hLen) == 0) {
-      *res = 1;
-   }
-
-   err = CRYPT_OK;
-LBL_ERR:
-#ifdef LTC_CLEAN_STACK
-   zeromem(DB,   modulus_len);   
-   zeromem(mask, modulus_len);   
-   zeromem(salt, modulus_len);   
-   zeromem(hash, modulus_len);   
-#endif
-
-   XFREE(hash);
-   XFREE(salt);
-   XFREE(mask);
-   XFREE(DB);
-
-   return err;
-}
-
-#endif /* LTC_PKCS_1 */
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c,v $ */
-/* $Revision: 1.11 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c b/dep/StormLibOld/src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c
deleted file mode 100644
index 7c3711c17..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/** @file pkcs_1_v1_5_decode.c
- *
- *  LTC_PKCS #1 v1.5 Padding. (Andreas Lange)
- */
-
-#ifdef LTC_PKCS_1
-
-/** @brief LTC_PKCS #1 v1.5 decode.
- *
- *  @param msg              The encoded data to decode
- *  @param msglen           The length of the encoded data (octets)
- *  @param block_type       Block type to use in padding (\sa ltc_pkcs_1_v1_5_blocks)
- *  @param modulus_bitlen   The bit length of the RSA modulus
- *  @param out              [out] Destination of decoding
- *  @param outlen           [in/out] The max size and resulting size of the decoding
- *  @param is_valid         [out] Boolean whether the padding was valid
- *
- *  @return CRYPT_OK if successful (even if invalid)
- */
-int pkcs_1_v1_5_decode(const unsigned char *msg, 
-                             unsigned long  msglen,
-                                       int  block_type,
-                             unsigned long  modulus_bitlen,
-                             unsigned char *out, 
-                             unsigned long *outlen,
-                                       int *is_valid)
-{
-  unsigned long modulus_len, ps_len, i;
-  int result;
-
-  /* default to invalid packet */
-  *is_valid = 0;
-
-  modulus_len = (modulus_bitlen >> 3) + (modulus_bitlen & 7 ? 1 : 0);
-
-  /* test message size */
-
-  if ((msglen > modulus_len) || (modulus_len < 11)) {
-    return CRYPT_PK_INVALID_SIZE;
-  }
-
-  /* separate encoded message */
-
-  if ((msg[0] != 0x00) || (msg[1] != (unsigned char)block_type)) {
-    result = CRYPT_INVALID_PACKET;
-    goto bail;
-  }
-
-  if (block_type == LTC_LTC_PKCS_1_EME) {
-    for (i = 2; i < modulus_len; i++) {
-      /* separator */
-      if (msg[i] == 0x00) { break; }
-    }
-    ps_len = i++ - 2;
-
-    if ((i >= modulus_len) || (ps_len < 8)) {
-      /* There was no octet with hexadecimal value 0x00 to separate ps from m,
-       * or the length of ps is less than 8 octets.
-       */
-      result = CRYPT_INVALID_PACKET;
-      goto bail;
-    }
-  } else {
-    for (i = 2; i < modulus_len - 1; i++) {
-       if (msg[i] != 0xFF) { break; }
-    }
-
-    /* separator check */
-    if (msg[i] != 0) {
-      /* There was no octet with hexadecimal value 0x00 to separate ps from m. */
-      result = CRYPT_INVALID_PACKET;
-      goto bail;
-    }
-
-    ps_len = i - 2;
-  }
-
-  if (*outlen < (msglen - (2 + ps_len + 1))) {
-    *outlen = msglen - (2 + ps_len + 1);
-    result = CRYPT_BUFFER_OVERFLOW;
-    goto bail;
-  }
-
-  *outlen = (msglen - (2 + ps_len + 1));
-  XMEMCPY(out, &msg[2 + ps_len + 1], *outlen);
-
-  /* valid packet */
-  *is_valid = 1;
-  result    = CRYPT_OK;
-bail:
-  return result;
-} /* pkcs_1_v1_5_decode */
-
-#endif /* #ifdef LTC_PKCS_1 */
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c,v $ */
-/* $Revision: 1.7 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_exptmod.c b/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_exptmod.c
deleted file mode 100644
index b0acd4042..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_exptmod.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file rsa_exptmod.c
-  RSA LTC_PKCS exptmod, Tom St Denis
-*/  
-
-#ifdef LTC_MRSA
-
-/** 
-   Compute an RSA modular exponentiation 
-   @param in         The input data to send into RSA
-   @param inlen      The length of the input (octets)
-   @param out        [out] The destination 
-   @param outlen     [in/out] The max size and resulting size of the output
-   @param which      Which exponent to use, e.g. PK_PRIVATE or PK_PUBLIC
-   @param key        The RSA key to use 
-   @return CRYPT_OK if successful
-*/   
-int rsa_exptmod(const unsigned char *in,   unsigned long inlen,
-                      unsigned char *out,  unsigned long *outlen, int which,
-                      rsa_key *key)
-{
-   void         *tmp, *tmpa, *tmpb;
-   unsigned long x;
-   int           err;
-
-   LTC_ARGCHK(in     != NULL);
-   LTC_ARGCHK(out    != NULL);
-   LTC_ARGCHK(outlen != NULL);
-   LTC_ARGCHK(key    != NULL);
-  
-   /* is the key of the right type for the operation? */
-   if (which == PK_PRIVATE && (key->type != PK_PRIVATE)) {
-      return CRYPT_PK_NOT_PRIVATE;
-   }
-
-   /* must be a private or public operation */
-   if (which != PK_PRIVATE && which != PK_PUBLIC) {
-      return CRYPT_PK_INVALID_TYPE;
-   }
-
-   /* init and copy into tmp */
-   if ((err = mp_init_multi(&tmp, &tmpa, &tmpb, NULL)) != CRYPT_OK)                                    { return err; }
-   if ((err = mp_read_unsigned_bin(tmp, (unsigned char *)in, (int)inlen)) != CRYPT_OK)                 { goto error; }
-
-   /* sanity check on the input */
-   if (mp_cmp(key->N, tmp) == LTC_MP_LT) {
-      err = CRYPT_PK_INVALID_SIZE;
-      goto error;
-   }
-
-   /* are we using the private exponent and is the key optimized? */
-   if (which == PK_PRIVATE) {
-      /* tmpa = tmp^dP mod p */
-      if ((err = mp_exptmod(tmp, key->dP, key->p, tmpa)) != CRYPT_OK)                               { goto error; }
-
-      /* tmpb = tmp^dQ mod q */
-      if ((err = mp_exptmod(tmp, key->dQ, key->q, tmpb)) != CRYPT_OK)                               { goto error; }
-
-      /* tmp = (tmpa - tmpb) * qInv (mod p) */
-      if ((err = mp_sub(tmpa, tmpb, tmp)) != CRYPT_OK)                                              { goto error; }
-      if ((err = mp_mulmod(tmp, key->qP, key->p, tmp)) != CRYPT_OK)                                { goto error; }
-
-      /* tmp = tmpb + q * tmp */
-      if ((err = mp_mul(tmp, key->q, tmp)) != CRYPT_OK)                                             { goto error; }
-      if ((err = mp_add(tmp, tmpb, tmp)) != CRYPT_OK)                                               { goto error; }
-   } else {
-      /* exptmod it */
-      if ((err = mp_exptmod(tmp, key->e, key->N, tmp)) != CRYPT_OK)                                { goto error; }
-   }
-
-   /* read it back */
-   x = (unsigned long)mp_unsigned_bin_size(key->N);
-   if (x > *outlen) {
-      *outlen = x;
-      err = CRYPT_BUFFER_OVERFLOW;
-      goto error;
-   }
-
-   /* this should never happen ... */
-   if (mp_unsigned_bin_size(tmp) > mp_unsigned_bin_size(key->N)) {
-      err = CRYPT_ERROR;
-      goto error;
-   }
-   *outlen = x;
-
-   /* convert it */
-   zeromem(out, x);
-   if ((err = mp_to_unsigned_bin(tmp, out+(x-mp_unsigned_bin_size(tmp)))) != CRYPT_OK)               { goto error; }
-
-   /* clean up and return */
-   err = CRYPT_OK;
-error:
-   mp_clear_multi(tmp, tmpa, tmpb, NULL);
-   return err;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/rsa/rsa_exptmod.c,v $ */
-/* $Revision: 1.18 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_free.c b/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_free.c
deleted file mode 100644
index 58cdeb75b..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_free.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file rsa_free.c
-  Free an RSA key, Tom St Denis
-*/  
-
-#ifdef LTC_MRSA
-
-/*
-  Free an RSA key from memory
-  @param key   The RSA key to free
-*/
-void rsa_free(rsa_key *key)
-{
-   LTC_ARGCHKVD(key != NULL);
-   mp_clear_multi(key->e, key->d, key->N, key->dQ, key->dP, key->qP, key->p, key->q, NULL);
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/rsa/rsa_free.c,v $ */
-/* $Revision: 1.10 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_import.c b/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_import.c
deleted file mode 100644
index ca38169f4..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_import.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file rsa_import.c
-  Import a LTC_PKCS RSA key, Tom St Denis
-*/  
-
-#ifdef LTC_MRSA
-
-/*
-  Import an RSAPublicKey or RSAPrivateKey [two-prime only, only support >= 1024-bit keys, defined in LTC_PKCS #1 v2.1]
-  @param in      The packet to import from
-  @param inlen   It's length (octets)
-  @param key     [out] Destination for newly imported key
-  @return CRYPT_OK if successful, upon error allocated memory is freed
-*/
-int rsa_import(const unsigned char *in, unsigned long inlen, rsa_key *key)
-{
-   int           err;
-   void         *zero;
-   unsigned char *tmpbuf;
-   unsigned long  t, x, y, z, tmpoid[16];
-   ltc_asn1_list ssl_pubkey_hashoid[2];
-   ltc_asn1_list ssl_pubkey[2];
-
-   LTC_ARGCHK(in          != NULL);
-   LTC_ARGCHK(key         != NULL);
-   LTC_ARGCHK(ltc_mp.name != NULL);
-
-   /* init key */
-   if ((err = mp_init_multi(&key->e, &key->d, &key->N, &key->dQ, 
-                            &key->dP, &key->qP, &key->p, &key->q, NULL)) != CRYPT_OK) {
-      return err;
-   }
-
-   /* see if the OpenSSL DER format RSA public key will work */
-   tmpbuf = XCALLOC(1, MAX_RSA_SIZE*8);
-   if (tmpbuf == NULL) {
-       err = CRYPT_MEM;
-       goto LBL_ERR;
-   }
-
-   /* this includes the internal hash ID and optional params (NULL in this case) */
-   LTC_SET_ASN1(ssl_pubkey_hashoid, 0, LTC_ASN1_OBJECT_IDENTIFIER, tmpoid,                sizeof(tmpoid)/sizeof(tmpoid[0]));   
-   LTC_SET_ASN1(ssl_pubkey_hashoid, 1, LTC_ASN1_NULL,              NULL,                  0);
-
-   /* the actual format of the SSL DER key is odd, it stores a RSAPublicKey in a **BIT** string ... so we have to extract it
-      then proceed to convert bit to octet 
-    */
-   LTC_SET_ASN1(ssl_pubkey, 0,         LTC_ASN1_SEQUENCE,          &ssl_pubkey_hashoid,   2);
-   LTC_SET_ASN1(ssl_pubkey, 1,         LTC_ASN1_BIT_STRING,        tmpbuf,                MAX_RSA_SIZE*8);
-
-   if (der_decode_sequence(in, inlen,
-                           ssl_pubkey, 2UL) == CRYPT_OK) {
-
-      /* ok now we have to reassemble the BIT STRING to an OCTET STRING.  Thanks OpenSSL... */
-      for (t = y = z = x = 0; x < ssl_pubkey[1].size; x++) {
-          y = (y << 1) | tmpbuf[x];
-          if (++z == 8) {
-             tmpbuf[t++] = (unsigned char)y;
-             y           = 0;
-             z           = 0;
-          }
-      }
-
-      /* now it should be SEQUENCE { INTEGER, INTEGER } */
-      if ((err = der_decode_sequence_multi(tmpbuf, t,
-                                           LTC_ASN1_INTEGER, 1UL, key->N, 
-                                           LTC_ASN1_INTEGER, 1UL, key->e, 
-                                           LTC_ASN1_EOL,     0UL, NULL)) != CRYPT_OK) {
-         XFREE(tmpbuf);
-         goto LBL_ERR;
-      }
-      XFREE(tmpbuf);
-      key->type = PK_PUBLIC;
-      return CRYPT_OK;
-   }
-   XFREE(tmpbuf);
-
-   /* not SSL public key, try to match against LTC_PKCS #1 standards */
-   if ((err = der_decode_sequence_multi(in, inlen, 
-                                  LTC_ASN1_INTEGER, 1UL, key->N, 
-                                  LTC_ASN1_EOL,     0UL, NULL)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   if (mp_cmp_d(key->N, 0) == LTC_MP_EQ) {
-      if ((err = mp_init(&zero)) != CRYPT_OK) { 
-         goto LBL_ERR;
-      }
-      /* it's a private key */
-      if ((err = der_decode_sequence_multi(in, inlen, 
-                          LTC_ASN1_INTEGER, 1UL, zero, 
-                          LTC_ASN1_INTEGER, 1UL, key->N, 
-                          LTC_ASN1_INTEGER, 1UL, key->e,
-                          LTC_ASN1_INTEGER, 1UL, key->d, 
-                          LTC_ASN1_INTEGER, 1UL, key->p, 
-                          LTC_ASN1_INTEGER, 1UL, key->q, 
-                          LTC_ASN1_INTEGER, 1UL, key->dP,
-                          LTC_ASN1_INTEGER, 1UL, key->dQ, 
-                          LTC_ASN1_INTEGER, 1UL, key->qP, 
-                          LTC_ASN1_EOL,     0UL, NULL)) != CRYPT_OK) {
-         mp_clear(zero);
-         goto LBL_ERR;
-      }
-      mp_clear(zero);
-      key->type = PK_PRIVATE;
-   } else if (mp_cmp_d(key->N, 1) == LTC_MP_EQ) {
-      /* we don't support multi-prime RSA */
-      err = CRYPT_PK_INVALID_TYPE;
-      goto LBL_ERR;
-   } else {
-      /* it's a public key and we lack e */
-      if ((err = der_decode_sequence_multi(in, inlen, 
-                                     LTC_ASN1_INTEGER, 1UL, key->N, 
-                                     LTC_ASN1_INTEGER, 1UL, key->e, 
-                                     LTC_ASN1_EOL,     0UL, NULL)) != CRYPT_OK) {
-         goto LBL_ERR;
-      }
-      key->type = PK_PUBLIC;
-   }
-   return CRYPT_OK;
-LBL_ERR:
-   mp_clear_multi(key->d,  key->e, key->N, key->dQ, key->dP, key->qP, key->p, key->q, NULL);
-   return err;
-}
-
-#endif /* LTC_MRSA */
-
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/rsa/rsa_import.c,v $ */
-/* $Revision: 1.23 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_make_key.c b/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_make_key.c
deleted file mode 100644
index 178b49336..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_make_key.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file rsa_make_key.c
-  RSA key generation, Tom St Denis
-*/  
-
-#ifdef LTC_MRSA
-
-/** 
-   Create an RSA key
-   @param prng     An active PRNG state
-   @param wprng    The index of the PRNG desired
-   @param size     The size of the modulus (key size) desired (octets)
-   @param e        The "e" value (public key).  e==65537 is a good choice
-   @param key      [out] Destination of a newly created private key pair
-   @return CRYPT_OK if successful, upon error all allocated ram is freed
-*/
-int rsa_make_key(prng_state *prng, int wprng, int size, long e, rsa_key *key)
-{
-   void *p, *q, *tmp1, *tmp2, *tmp3;
-   int    err;
-
-   LTC_ARGCHK(ltc_mp.name != NULL);
-   LTC_ARGCHK(key         != NULL);
-
-   if ((size < (MIN_RSA_SIZE/8)) || (size > (MAX_RSA_SIZE/8))) {
-      return CRYPT_INVALID_KEYSIZE;
-   }
-
-   if ((e < 3) || ((e & 1) == 0)) {
-      return CRYPT_INVALID_ARG;
-   }
-
-   if ((err = prng_is_valid(wprng)) != CRYPT_OK) {
-      return err;
-   }
-
-   if ((err = mp_init_multi(&p, &q, &tmp1, &tmp2, &tmp3, NULL)) != CRYPT_OK) {
-      return err;
-   }
-
-   /* make primes p and q (optimization provided by Wayne Scott) */
-   if ((err = mp_set_int(tmp3, e)) != CRYPT_OK)                      { goto errkey; }  /* tmp3 = e */
-
-   /* make prime "p" */
-   do {
-       if ((err = rand_prime( p, size/2, prng, wprng)) != CRYPT_OK)  { goto errkey; }
-       if ((err = mp_sub_d( p, 1,  tmp1)) != CRYPT_OK)               { goto errkey; }  /* tmp1 = p-1 */
-       if ((err = mp_gcd( tmp1,  tmp3,  tmp2)) != CRYPT_OK)          { goto errkey; }  /* tmp2 = gcd(p-1, e) */
-   } while (mp_cmp_d( tmp2, 1) != 0);                                                  /* while e divides p-1 */
-
-   /* make prime "q" */
-   do {
-       if ((err = rand_prime( q, size/2, prng, wprng)) != CRYPT_OK)  { goto errkey; }
-       if ((err = mp_sub_d( q, 1,  tmp1)) != CRYPT_OK)               { goto errkey; } /* tmp1 = q-1 */
-       if ((err = mp_gcd( tmp1,  tmp3,  tmp2)) != CRYPT_OK)          { goto errkey; } /* tmp2 = gcd(q-1, e) */
-   } while (mp_cmp_d( tmp2, 1) != 0);                                                 /* while e divides q-1 */
-
-   /* tmp1 = lcm(p-1, q-1) */
-   if ((err = mp_sub_d( p, 1,  tmp2)) != CRYPT_OK)                   { goto errkey; } /* tmp2 = p-1 */
-                                                                                      /* tmp1 = q-1 (previous do/while loop) */
-   if ((err = mp_lcm( tmp1,  tmp2,  tmp1)) != CRYPT_OK)              { goto errkey; } /* tmp1 = lcm(p-1, q-1) */
-
-   /* make key */
-   if ((err = mp_init_multi(&key->e, &key->d, &key->N, &key->dQ, &key->dP, &key->qP, &key->p, &key->q, NULL)) != CRYPT_OK) {
-      goto errkey;
-   }
-
-   if ((err = mp_set_int( key->e, e)) != CRYPT_OK)                     { goto errkey; } /* key->e =  e */
-   if ((err = mp_invmod( key->e,  tmp1,  key->d)) != CRYPT_OK)         { goto errkey; } /* key->d = 1/e mod lcm(p-1,q-1) */
-   if ((err = mp_mul( p,  q,  key->N)) != CRYPT_OK)                    { goto errkey; } /* key->N = pq */
-
-   /* optimize for CRT now */
-   /* find d mod q-1 and d mod p-1 */
-   if ((err = mp_sub_d( p, 1,  tmp1)) != CRYPT_OK)                     { goto errkey; } /* tmp1 = q-1 */
-   if ((err = mp_sub_d( q, 1,  tmp2)) != CRYPT_OK)                     { goto errkey; } /* tmp2 = p-1 */
-   if ((err = mp_mod( key->d,  tmp1,  key->dP)) != CRYPT_OK)           { goto errkey; } /* dP = d mod p-1 */
-   if ((err = mp_mod( key->d,  tmp2,  key->dQ)) != CRYPT_OK)           { goto errkey; } /* dQ = d mod q-1 */
-   if ((err = mp_invmod( q,  p,  key->qP)) != CRYPT_OK)                { goto errkey; } /* qP = 1/q mod p */
-
-   if ((err = mp_copy( p,  key->p)) != CRYPT_OK)                       { goto errkey; }
-   if ((err = mp_copy( q,  key->q)) != CRYPT_OK)                       { goto errkey; }
-
-   /* set key type (in this case it's CRT optimized) */
-   key->type = PK_PRIVATE;
-
-   /* return ok and free temps */
-   err       = CRYPT_OK;
-   goto cleanup;
-errkey:
-   mp_clear_multi(key->d, key->e, key->N, key->dQ, key->dP, key->qP, key->p, key->q, NULL);
-cleanup:
-   mp_clear_multi(tmp3, tmp2, tmp1, p, q, NULL);
-   return err;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/rsa/rsa_make_key.c,v $ */
-/* $Revision: 1.16 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_verify_hash.c b/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_verify_hash.c
deleted file mode 100644
index fa514557b..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_verify_hash.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file rsa_verify_hash.c
-  RSA LTC_PKCS #1 v1.5 or v2 PSS signature verification, Tom St Denis and Andreas Lange
-*/
-
-#ifdef LTC_MRSA
-
-/*
-  LTC_PKCS #1 de-sign then v1.5 or PSS depad
-  @param sig              The signature data
-  @param siglen           The length of the signature data (octets)
-  @param hash             The hash of the message that was signed
-  @param hashlen          The length of the hash of the message that was signed (octets)
-  @param padding          Type of padding (LTC_LTC_PKCS_1_PSS or LTC_LTC_PKCS_1_V1_5)
-  @param hash_idx         The index of the desired hash
-  @param saltlen          The length of the salt used during signature
-  @param stat             [out] The result of the signature comparison, 1==valid, 0==invalid
-  @param key              The public RSA key corresponding to the key that performed the signature
-  @return CRYPT_OK on success (even if the signature is invalid)
-*/
-int rsa_verify_hash_ex(const unsigned char *sig,      unsigned long siglen,
-                       const unsigned char *hash,     unsigned long hashlen,
-                             int            padding,
-                             int            hash_idx, unsigned long saltlen,
-                             int           *stat,     rsa_key      *key)
-{
-  unsigned long modulus_bitlen, modulus_bytelen, x;
-  int           err;
-  unsigned char *tmpbuf;
-
-  LTC_ARGCHK(hash  != NULL);
-  LTC_ARGCHK(sig   != NULL);
-  LTC_ARGCHK(stat  != NULL);
-  LTC_ARGCHK(key   != NULL);
-
-  /* default to invalid */
-  *stat = 0;
-
-  /* valid padding? */
-
-  if ((padding != LTC_LTC_PKCS_1_V1_5) &&
-      (padding != LTC_LTC_PKCS_1_PSS)) {
-    return CRYPT_PK_INVALID_PADDING;
-  }
-
-  if (padding == LTC_LTC_PKCS_1_PSS) {
-    /* valid hash ? */
-    if ((err = hash_is_valid(hash_idx)) != CRYPT_OK) {
-       return err;
-    }
-  }
-
-  /* get modulus len in bits */
-  modulus_bitlen = mp_count_bits( (key->N));
-
-  /* outlen must be at least the size of the modulus */
-  modulus_bytelen = mp_unsigned_bin_size( (key->N));
-  if (modulus_bytelen != siglen) {
-     return CRYPT_INVALID_PACKET;
-  }
-
-  /* allocate temp buffer for decoded sig */
-  tmpbuf = XMALLOC(siglen);
-  if (tmpbuf == NULL) {
-     return CRYPT_MEM;
-  }
-
-  /* RSA decode it  */
-  x = siglen;
-  if ((err = ltc_mp.rsa_me(sig, siglen, tmpbuf, &x, PK_PUBLIC, key)) != CRYPT_OK) {
-     XFREE(tmpbuf);
-     return err;
-  }
-
-  /* make sure the output is the right size */
-  if (x != siglen) {
-     XFREE(tmpbuf);
-     return CRYPT_INVALID_PACKET;
-  }
-
-  if (padding == LTC_LTC_PKCS_1_PSS) {
-    /* PSS decode and verify it */
-    err = pkcs_1_pss_decode(hash, hashlen, tmpbuf, x, saltlen, hash_idx, modulus_bitlen, stat);
-  } else {
-    /* LTC_PKCS #1 v1.5 decode it */
-    unsigned char *out;
-    unsigned long outlen, loid[16];
-    int           decoded;
-    ltc_asn1_list digestinfo[2], siginfo[2];
-
-    /* not all hashes have OIDs... so sad */
-    if (hash_descriptor[hash_idx].OIDlen == 0) {
-       err = CRYPT_INVALID_ARG;
-       goto bail_2;
-    }
-
-    /* allocate temp buffer for decoded hash */
-    outlen = ((modulus_bitlen >> 3) + (modulus_bitlen & 7 ? 1 : 0)) - 3;
-    out    = XMALLOC(outlen);
-    if (out == NULL) {
-      err = CRYPT_MEM;
-      goto bail_2;
-    }
-
-    if ((err = pkcs_1_v1_5_decode(tmpbuf, x, LTC_LTC_PKCS_1_EMSA, modulus_bitlen, out, &outlen, &decoded)) != CRYPT_OK) {
-      XFREE(out);       
-      goto bail_2;
-    }
-
-    /* now we must decode out[0...outlen-1] using ASN.1, test the OID and then test the hash */
-    /* construct the SEQUENCE 
-      SEQUENCE {
-         SEQUENCE {hashoid OID
-                   blah    NULL
-         }
-         hash    OCTET STRING 
-      }
-   */
-    LTC_SET_ASN1(digestinfo, 0, LTC_ASN1_OBJECT_IDENTIFIER, loid, sizeof(loid)/sizeof(loid[0]));
-    LTC_SET_ASN1(digestinfo, 1, LTC_ASN1_NULL,              NULL,                          0);
-    LTC_SET_ASN1(siginfo,    0, LTC_ASN1_SEQUENCE,          digestinfo,                    2);
-    LTC_SET_ASN1(siginfo,    1, LTC_ASN1_OCTET_STRING,      tmpbuf,                        siglen);
-   
-    if ((err = der_decode_sequence(out, outlen, siginfo, 2)) != CRYPT_OK) {
-       XFREE(out);
-       goto bail_2;
-    }
-
-    /* test OID */
-    if ((digestinfo[0].size == hash_descriptor[hash_idx].OIDlen) &&
-        (XMEMCMP(digestinfo[0].data, hash_descriptor[hash_idx].OID, sizeof(unsigned long) * hash_descriptor[hash_idx].OIDlen) == 0) &&
-        (siginfo[1].size == hashlen) &&
-        (XMEMCMP(siginfo[1].data, hash, hashlen) == 0)) {
-       *stat = 1;
-    }
-
-#ifdef LTC_CLEAN_STACK
-    zeromem(out, outlen);
-#endif
-    XFREE(out);
-  }
-
-bail_2:
-#ifdef LTC_CLEAN_STACK
-  zeromem(tmpbuf, siglen);
-#endif
-  XFREE(tmpbuf);
-  return err;
-}
-
-#endif /* LTC_MRSA */
-
-/* $Source: /cvs/libtom/libtomcrypt/src/pk/rsa/rsa_verify_hash.c,v $ */
-/* $Revision: 1.13 $ */
-/* $Date: 2007/05/12 14:32:35 $ */
diff --git a/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_verify_simple.c b/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_verify_simple.c
deleted file mode 100644
index fec8a248b..000000000
--- a/dep/StormLibOld/src/libtomcrypt/src/pk/rsa/rsa_verify_simple.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include "../../headers/tomcrypt.h"
-
-/*
-  @file rsa_verify_simple.c
-  Created by Ladislav Zezula (zezula@volny.cz) as modification
-  for Blizzard strong signature verification
-*/
-
-#ifdef LTC_MRSA
-
-/*
-  Simple RSA decryption
-  @param sig              The signature data
-  @param siglen           The length of the signature data (octets)
-  @param hash             The hash of the message that was signed
-  @param hashlen          The length of the hash of the message that was signed (octets)
-  @param stat             [out] The result of the signature comparison, 1==valid, 0==invalid
-  @param key              The public RSA key corresponding
-  @return Error code
-*/
-int rsa_verify_simple(const unsigned char *sig,  unsigned long siglen,
-                      const unsigned char *hash, unsigned long hashlen,
-                            int           *stat,
-                            rsa_key       *key)
-{
-  unsigned long modulus_bitlen, modulus_bytelen, x;
-  unsigned char *tmpbuf;
-  int           err;
-
-  LTC_ARGCHK(sig  != NULL);
-  LTC_ARGCHK(hash != NULL);
-  LTC_ARGCHK(stat != NULL);
-  LTC_ARGCHK(key  != NULL);
-
-  /* default to invalid */
-  *stat = 0;
-
-  /* get modulus len in bits */
-  modulus_bitlen = mp_count_bits( (key->N));
-
-  /* outlen must be at least the size of the modulus */
-  modulus_bytelen = mp_unsigned_bin_size( (key->N));
-  if (modulus_bytelen != siglen) {
-     return CRYPT_INVALID_PACKET;
-  }
-
-  /* allocate temp buffer for decoded sig */
-  tmpbuf = XMALLOC(siglen);
-  if (tmpbuf == NULL) {
-     return CRYPT_MEM;
-  }
-
-  /* RSA decode it  */
-  x = siglen;
-  if ((err = ltc_mp.rsa_me(sig, siglen, tmpbuf, &x, PK_PUBLIC, key)) != CRYPT_OK) {
-     XFREE(tmpbuf);
-     return err;
-  }
-
-  /* make sure the output is the right size */
-  if (x != siglen) {
-     XFREE(tmpbuf);
-     return CRYPT_INVALID_PACKET;
-  }
-
-  /* compare the decrypted signature with the given hash */
-  if(x == hashlen && XMEMCMP(tmpbuf, hash, hashlen) == 0)
-      *stat = 1;
-       
-#ifdef LTC_CLEAN_STACK
-  zeromem(tmpbuf, siglen);
-#endif
-  XFREE(tmpbuf);
-  return CRYPT_OK;
-}
-
-#endif /* LTC_MRSA */
diff --git a/dep/StormLibOld/src/libtommath/bn_fast_mp_invmod.c b/dep/StormLibOld/src/libtommath/bn_fast_mp_invmod.c
deleted file mode 100644
index 597d7a9b5..000000000
--- a/dep/StormLibOld/src/libtommath/bn_fast_mp_invmod.c
+++ /dev/null
@@ -1,148 +0,0 @@
-#include "tommath.h"
-#ifdef BN_FAST_MP_INVMOD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* computes the modular inverse via binary extended euclidean algorithm, 
- * that is c = 1/a mod b 
- *
- * Based on slow invmod except this is optimized for the case where b is 
- * odd as per HAC Note 14.64 on pp. 610
- */
-int fast_mp_invmod (mp_int * a, mp_int * b, mp_int * c)
-{
-  mp_int  x, y, u, v, B, D;
-  int     res, neg;
-
-  /* 2. [modified] b must be odd   */
-  if (mp_iseven (b) == 1) {
-    return MP_VAL;
-  }
-
-  /* init all our temps */
-  if ((res = mp_init_multi(&x, &y, &u, &v, &B, &D, NULL)) != MP_OKAY) {
-     return res;
-  }
-
-  /* x == modulus, y == value to invert */
-  if ((res = mp_copy (b, &x)) != MP_OKAY) {
-    goto LBL_ERR;
-  }
-
-  /* we need y = |a| */
-  if ((res = mp_mod (a, b, &y)) != MP_OKAY) {
-    goto LBL_ERR;
-  }
-
-  /* 3. u=x, v=y, A=1, B=0, C=0,D=1 */
-  if ((res = mp_copy (&x, &u)) != MP_OKAY) {
-    goto LBL_ERR;
-  }
-  if ((res = mp_copy (&y, &v)) != MP_OKAY) {
-    goto LBL_ERR;
-  }
-  mp_set (&D, 1);
-
-top:
-  /* 4.  while u is even do */
-  while (mp_iseven (&u) == 1) {
-    /* 4.1 u = u/2 */
-    if ((res = mp_div_2 (&u, &u)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-    /* 4.2 if B is odd then */
-    if (mp_isodd (&B) == 1) {
-      if ((res = mp_sub (&B, &x, &B)) != MP_OKAY) {
-        goto LBL_ERR;
-      }
-    }
-    /* B = B/2 */
-    if ((res = mp_div_2 (&B, &B)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-  }
-
-  /* 5.  while v is even do */
-  while (mp_iseven (&v) == 1) {
-    /* 5.1 v = v/2 */
-    if ((res = mp_div_2 (&v, &v)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-    /* 5.2 if D is odd then */
-    if (mp_isodd (&D) == 1) {
-      /* D = (D-x)/2 */
-      if ((res = mp_sub (&D, &x, &D)) != MP_OKAY) {
-        goto LBL_ERR;
-      }
-    }
-    /* D = D/2 */
-    if ((res = mp_div_2 (&D, &D)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-  }
-
-  /* 6.  if u >= v then */
-  if (mp_cmp (&u, &v) != MP_LT) {
-    /* u = u - v, B = B - D */
-    if ((res = mp_sub (&u, &v, &u)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-
-    if ((res = mp_sub (&B, &D, &B)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-  } else {
-    /* v - v - u, D = D - B */
-    if ((res = mp_sub (&v, &u, &v)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-
-    if ((res = mp_sub (&D, &B, &D)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-  }
-
-  /* if not zero goto step 4 */
-  if (mp_iszero (&u) == 0) {
-    goto top;
-  }
-
-  /* now a = C, b = D, gcd == g*v */
-
-  /* if v != 1 then there is no inverse */
-  if (mp_cmp_d (&v, 1) != MP_EQ) {
-    res = MP_VAL;
-    goto LBL_ERR;
-  }
-
-  /* b is now the inverse */
-  neg = a->sign;
-  while (D.sign == MP_NEG) {
-    if ((res = mp_add (&D, b, &D)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-  }
-  mp_exch (&D, c);
-  c->sign = neg;
-  res = MP_OKAY;
-
-LBL_ERR:mp_clear_multi (&x, &y, &u, &v, &B, &D, NULL);
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_fast_mp_invmod.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_fast_mp_montgomery_reduce.c b/dep/StormLibOld/src/libtommath/bn_fast_mp_montgomery_reduce.c
deleted file mode 100644
index 65eed7da1..000000000
--- a/dep/StormLibOld/src/libtommath/bn_fast_mp_montgomery_reduce.c
+++ /dev/null
@@ -1,172 +0,0 @@
-#include "tommath.h"
-#ifdef BN_FAST_MP_MONTGOMERY_REDUCE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* computes xR**-1 == x (mod N) via Montgomery Reduction
- *
- * This is an optimized implementation of montgomery_reduce
- * which uses the comba method to quickly calculate the columns of the
- * reduction.
- *
- * Based on Algorithm 14.32 on pp.601 of HAC.
-*/
-int fast_mp_montgomery_reduce (mp_int * x, mp_int * n, mp_digit rho)
-{
-  int     ix, res, olduse;
-  mp_word W[MP_WARRAY];
-
-  /* get old used count */
-  olduse = x->used;
-
-  /* grow a as required */
-  if (x->alloc < n->used + 1) {
-    if ((res = mp_grow (x, n->used + 1)) != MP_OKAY) {
-      return res;
-    }
-  }
-
-  /* first we have to get the digits of the input into
-   * an array of double precision words W[...]
-   */
-  {
-    register mp_word *_W;
-    register mp_digit *tmpx;
-
-    /* alias for the W[] array */
-    _W   = W;
-
-    /* alias for the digits of  x*/
-    tmpx = x->dp;
-
-    /* copy the digits of a into W[0..a->used-1] */
-    for (ix = 0; ix < x->used; ix++) {
-      *_W++ = *tmpx++;
-    }
-
-    /* zero the high words of W[a->used..m->used*2] */
-    for (; ix < n->used * 2 + 1; ix++) {
-      *_W++ = 0;
-    }
-  }
-
-  /* now we proceed to zero successive digits
-   * from the least significant upwards
-   */
-  for (ix = 0; ix < n->used; ix++) {
-    /* mu = ai * m' mod b
-     *
-     * We avoid a double precision multiplication (which isn't required)
-     * by casting the value down to a mp_digit.  Note this requires
-     * that W[ix-1] have  the carry cleared (see after the inner loop)
-     */
-    register mp_digit mu;
-    mu = (mp_digit) (((W[ix] & MP_MASK) * rho) & MP_MASK);
-
-    /* a = a + mu * m * b**i
-     *
-     * This is computed in place and on the fly.  The multiplication
-     * by b**i is handled by offseting which columns the results
-     * are added to.
-     *
-     * Note the comba method normally doesn't handle carries in the
-     * inner loop In this case we fix the carry from the previous
-     * column since the Montgomery reduction requires digits of the
-     * result (so far) [see above] to work.  This is
-     * handled by fixing up one carry after the inner loop.  The
-     * carry fixups are done in order so after these loops the
-     * first m->used words of W[] have the carries fixed
-     */
-    {
-      register int iy;
-      register mp_digit *tmpn;
-      register mp_word *_W;
-
-      /* alias for the digits of the modulus */
-      tmpn = n->dp;
-
-      /* Alias for the columns set by an offset of ix */
-      _W = W + ix;
-
-      /* inner loop */
-      for (iy = 0; iy < n->used; iy++) {
-          *_W++ += ((mp_word)mu) * ((mp_word)*tmpn++);
-      }
-    }
-
-    /* now fix carry for next digit, W[ix+1] */
-    W[ix + 1] += W[ix] >> ((mp_word) DIGIT_BIT);
-  }
-
-  /* now we have to propagate the carries and
-   * shift the words downward [all those least
-   * significant digits we zeroed].
-   */
-  {
-    register mp_digit *tmpx;
-    register mp_word *_W, *_W1;
-
-    /* nox fix rest of carries */
-
-    /* alias for current word */
-    _W1 = W + ix;
-
-    /* alias for next word, where the carry goes */
-    _W = W + ++ix;
-
-    for (; ix <= n->used * 2 + 1; ix++) {
-      *_W++ += *_W1++ >> ((mp_word) DIGIT_BIT);
-    }
-
-    /* copy out, A = A/b**n
-     *
-     * The result is A/b**n but instead of converting from an
-     * array of mp_word to mp_digit than calling mp_rshd
-     * we just copy them in the right order
-     */
-
-    /* alias for destination word */
-    tmpx = x->dp;
-
-    /* alias for shifted double precision result */
-    _W = W + n->used;
-
-    for (ix = 0; ix < n->used + 1; ix++) {
-      *tmpx++ = (mp_digit)(*_W++ & ((mp_word) MP_MASK));
-    }
-
-    /* zero oldused digits, if the input a was larger than
-     * m->used+1 we'll have to clear the digits
-     */
-    for (; ix < olduse; ix++) {
-      *tmpx++ = 0;
-    }
-  }
-
-  /* set the max used and clamp */
-  x->used = n->used + 1;
-  mp_clamp (x);
-
-  /* if A >= m then A = A - m */
-  if (mp_cmp_mag (x, n) != MP_LT) {
-    return s_mp_sub (x, n, x);
-  }
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_fast_mp_montgomery_reduce.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_fast_s_mp_mul_digs.c b/dep/StormLibOld/src/libtommath/bn_fast_s_mp_mul_digs.c
deleted file mode 100644
index df83f89ec..000000000
--- a/dep/StormLibOld/src/libtommath/bn_fast_s_mp_mul_digs.c
+++ /dev/null
@@ -1,107 +0,0 @@
-#include "tommath.h"
-#ifdef BN_FAST_S_MP_MUL_DIGS_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Fast (comba) multiplier
- *
- * This is the fast column-array [comba] multiplier.  It is 
- * designed to compute the columns of the product first 
- * then handle the carries afterwards.  This has the effect 
- * of making the nested loops that compute the columns very
- * simple and schedulable on super-scalar processors.
- *
- * This has been modified to produce a variable number of 
- * digits of output so if say only a half-product is required 
- * you don't have to compute the upper half (a feature 
- * required for fast Barrett reduction).
- *
- * Based on Algorithm 14.12 on pp.595 of HAC.
- *
- */
-int fast_s_mp_mul_digs (mp_int * a, mp_int * b, mp_int * c, int digs)
-{
-  int     olduse, res, pa, ix, iz;
-  mp_digit W[MP_WARRAY];
-  register mp_word  _W;
-
-  /* grow the destination as required */
-  if (c->alloc < digs) {
-    if ((res = mp_grow (c, digs)) != MP_OKAY) {
-      return res;
-    }
-  }
-
-  /* number of output digits to produce */
-  pa = MIN(digs, a->used + b->used);
-
-  /* clear the carry */
-  _W = 0;
-  for (ix = 0; ix < pa; ix++) { 
-      int      tx, ty;
-      int      iy;
-      mp_digit *tmpx, *tmpy;
-
-      /* get offsets into the two bignums */
-      ty = MIN(b->used-1, ix);
-      tx = ix - ty;
-
-      /* setup temp aliases */
-      tmpx = a->dp + tx;
-      tmpy = b->dp + ty;
-
-      /* this is the number of times the loop will iterrate, essentially 
-         while (tx++ < a->used && ty-- >= 0) { ... }
-       */
-      iy = MIN(a->used-tx, ty+1);
-
-      /* execute loop */
-      for (iz = 0; iz < iy; ++iz) {
-         _W += ((mp_word)*tmpx++)*((mp_word)*tmpy--);
-
-      }
-
-      /* store term */
-      W[ix] = ((mp_digit)_W) & MP_MASK;
-
-      /* make next carry */
-      _W = _W >> ((mp_word)DIGIT_BIT);
- }
-
-  /* setup dest */
-  olduse  = c->used;
-  c->used = pa;
-
-  {
-    register mp_digit *tmpc;
-    tmpc = c->dp;
-    for (ix = 0; ix < pa+1; ix++) {
-      /* now extract the previous digit [below the carry] */
-      *tmpc++ = W[ix];
-    }
-
-    /* clear unused digits [that existed in the old copy of c] */
-    for (; ix < olduse; ix++) {
-      *tmpc++ = 0;
-    }
-  }
-  mp_clamp (c);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_fast_s_mp_mul_digs.c,v $ */
-/* $Revision: 1.8 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_fast_s_mp_mul_high_digs.c b/dep/StormLibOld/src/libtommath/bn_fast_s_mp_mul_high_digs.c
deleted file mode 100644
index 6866aab75..000000000
--- a/dep/StormLibOld/src/libtommath/bn_fast_s_mp_mul_high_digs.c
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "tommath.h"
-#ifdef BN_FAST_S_MP_MUL_HIGH_DIGS_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* this is a modified version of fast_s_mul_digs that only produces
- * output digits *above* digs.  See the comments for fast_s_mul_digs
- * to see how it works.
- *
- * This is used in the Barrett reduction since for one of the multiplications
- * only the higher digits were needed.  This essentially halves the work.
- *
- * Based on Algorithm 14.12 on pp.595 of HAC.
- */
-int fast_s_mp_mul_high_digs (mp_int * a, mp_int * b, mp_int * c, int digs)
-{
-  int     olduse, res, pa, ix, iz;
-  mp_digit W[MP_WARRAY];
-  mp_word  _W;
-
-  /* grow the destination as required */
-  pa = a->used + b->used;
-  if (c->alloc < pa) {
-    if ((res = mp_grow (c, pa)) != MP_OKAY) {
-      return res;
-    }
-  }
-
-  /* number of output digits to produce */
-  pa = a->used + b->used;
-  _W = 0;
-  for (ix = digs; ix < pa; ix++) { 
-      int      tx, ty, iy;
-      mp_digit *tmpx, *tmpy;
-
-      /* get offsets into the two bignums */
-      ty = MIN(b->used-1, ix);
-      tx = ix - ty;
-
-      /* setup temp aliases */
-      tmpx = a->dp + tx;
-      tmpy = b->dp + ty;
-
-      /* this is the number of times the loop will iterrate, essentially its 
-         while (tx++ < a->used && ty-- >= 0) { ... }
-       */
-      iy = MIN(a->used-tx, ty+1);
-
-      /* execute loop */
-      for (iz = 0; iz < iy; iz++) {
-         _W += ((mp_word)*tmpx++)*((mp_word)*tmpy--);
-      }
-
-      /* store term */
-      W[ix] = ((mp_digit)_W) & MP_MASK;
-
-      /* make next carry */
-      _W = _W >> ((mp_word)DIGIT_BIT);
-  }
-  
-  /* setup dest */
-  olduse  = c->used;
-  c->used = pa;
-
-  {
-    register mp_digit *tmpc;
-
-    tmpc = c->dp + digs;
-    for (ix = digs; ix < pa; ix++) {
-      /* now extract the previous digit [below the carry] */
-      *tmpc++ = W[ix];
-    }
-
-    /* clear unused digits [that existed in the old copy of c] */
-    for (; ix < olduse; ix++) {
-      *tmpc++ = 0;
-    }
-  }
-  mp_clamp (c);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_fast_s_mp_mul_high_digs.c,v $ */
-/* $Revision: 1.6 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_fast_s_mp_sqr.c b/dep/StormLibOld/src/libtommath/bn_fast_s_mp_sqr.c
deleted file mode 100644
index 5f9d58cac..000000000
--- a/dep/StormLibOld/src/libtommath/bn_fast_s_mp_sqr.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include "tommath.h"
-#ifdef BN_FAST_S_MP_SQR_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* the jist of squaring...
- * you do like mult except the offset of the tmpx [one that 
- * starts closer to zero] can't equal the offset of tmpy.  
- * So basically you set up iy like before then you min it with
- * (ty-tx) so that it never happens.  You double all those 
- * you add in the inner loop
-
-After that loop you do the squares and add them in.
-*/
-
-int fast_s_mp_sqr (mp_int * a, mp_int * b)
-{
-  int       olduse, res, pa, ix, iz;
-  mp_digit   W[MP_WARRAY], *tmpx;
-  mp_word   W1;
-
-  /* grow the destination as required */
-  pa = a->used + a->used;
-  if (b->alloc < pa) {
-    if ((res = mp_grow (b, pa)) != MP_OKAY) {
-      return res;
-    }
-  }
-
-  /* number of output digits to produce */
-  W1 = 0;
-  for (ix = 0; ix < pa; ix++) { 
-      int      tx, ty, iy;
-      mp_word  _W;
-      mp_digit *tmpy;
-
-      /* clear counter */
-      _W = 0;
-
-      /* get offsets into the two bignums */
-      ty = MIN(a->used-1, ix);
-      tx = ix - ty;
-
-      /* setup temp aliases */
-      tmpx = a->dp + tx;
-      tmpy = a->dp + ty;
-
-      /* this is the number of times the loop will iterrate, essentially
-         while (tx++ < a->used && ty-- >= 0) { ... }
-       */
-      iy = MIN(a->used-tx, ty+1);
-
-      /* now for squaring tx can never equal ty 
-       * we halve the distance since they approach at a rate of 2x
-       * and we have to round because odd cases need to be executed
-       */
-      iy = MIN(iy, (ty-tx+1)>>1);
-
-      /* execute loop */
-      for (iz = 0; iz < iy; iz++) {
-         _W += ((mp_word)*tmpx++)*((mp_word)*tmpy--);
-      }
-
-      /* double the inner product and add carry */
-      _W = _W + _W + W1;
-
-      /* even columns have the square term in them */
-      if ((ix&1) == 0) {
-         _W += ((mp_word)a->dp[ix>>1])*((mp_word)a->dp[ix>>1]);
-      }
-
-      /* store it */
-      W[ix] = (mp_digit)(_W & MP_MASK);
-
-      /* make next carry */
-      W1 = _W >> ((mp_word)DIGIT_BIT);
-  }
-
-  /* setup dest */
-  olduse  = b->used;
-  b->used = a->used+a->used;
-
-  {
-    mp_digit *tmpb;
-    tmpb = b->dp;
-    for (ix = 0; ix < pa; ix++) {
-      *tmpb++ = W[ix] & MP_MASK;
-    }
-
-    /* clear unused digits [that existed in the old copy of c] */
-    for (; ix < olduse; ix++) {
-      *tmpb++ = 0;
-    }
-  }
-  mp_clamp (b);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_fast_s_mp_sqr.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_2expt.c b/dep/StormLibOld/src/libtommath/bn_mp_2expt.c
deleted file mode 100644
index f899eaee4..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_2expt.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_2EXPT_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* computes a = 2**b 
- *
- * Simple algorithm which zeroes the int, grows it then just sets one bit
- * as required.
- */
-int
-mp_2expt (mp_int * a, int b)
-{
-  int     res;
-
-  /* zero a as per default */
-  mp_zero (a);
-
-  /* grow a to accomodate the single bit */
-  if ((res = mp_grow (a, b / DIGIT_BIT + 1)) != MP_OKAY) {
-    return res;
-  }
-
-  /* set the used count of where the bit will go */
-  a->used = b / DIGIT_BIT + 1;
-
-  /* put the single bit in its place */
-  a->dp[b / DIGIT_BIT] = ((mp_digit)1) << (b % DIGIT_BIT);
-
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_2expt.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_abs.c b/dep/StormLibOld/src/libtommath/bn_mp_abs.c
deleted file mode 100644
index 14f3a7e07..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_abs.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_ABS_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* b = |a| 
- *
- * Simple function copies the input and fixes the sign to positive
- */
-int
-mp_abs (mp_int * a, mp_int * b)
-{
-  int     res;
-
-  /* copy a to b */
-  if (a != b) {
-     if ((res = mp_copy (a, b)) != MP_OKAY) {
-       return res;
-     }
-  }
-
-  /* force the sign of b to positive */
-  b->sign = MP_ZPOS;
-
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_abs.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_add.c b/dep/StormLibOld/src/libtommath/bn_mp_add.c
deleted file mode 100644
index b368b21c7..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_add.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_ADD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* high level addition (handles signs) */
-int mp_add (mp_int * a, mp_int * b, mp_int * c)
-{
-  int     sa, sb, res;
-
-  /* get sign of both inputs */
-  sa = a->sign;
-  sb = b->sign;
-
-  /* handle two cases, not four */
-  if (sa == sb) {
-    /* both positive or both negative */
-    /* add their magnitudes, copy the sign */
-    c->sign = sa;
-    res = s_mp_add (a, b, c);
-  } else {
-    /* one positive, the other negative */
-    /* subtract the one with the greater magnitude from */
-    /* the one of the lesser magnitude.  The result gets */
-    /* the sign of the one with the greater magnitude. */
-    if (mp_cmp_mag (a, b) == MP_LT) {
-      c->sign = sb;
-      res = s_mp_sub (b, a, c);
-    } else {
-      c->sign = sa;
-      res = s_mp_sub (a, b, c);
-    }
-  }
-  return res;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_add.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_add_d.c b/dep/StormLibOld/src/libtommath/bn_mp_add_d.c
deleted file mode 100644
index c147554bd..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_add_d.c
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_ADD_D_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* single digit addition */
-int
-mp_add_d (mp_int * a, mp_digit b, mp_int * c)
-{
-  int     res, ix, oldused;
-  mp_digit *tmpa, *tmpc, mu;
-
-  /* grow c as required */
-  if (c->alloc < a->used + 1) {
-     if ((res = mp_grow(c, a->used + 1)) != MP_OKAY) {
-        return res;
-     }
-  }
-
-  /* if a is negative and |a| >= b, call c = |a| - b */
-  if (a->sign == MP_NEG && (a->used > 1 || a->dp[0] >= b)) {
-     /* temporarily fix sign of a */
-     a->sign = MP_ZPOS;
-
-     /* c = |a| - b */
-     res = mp_sub_d(a, b, c);
-
-     /* fix sign  */
-     a->sign = c->sign = MP_NEG;
-
-     /* clamp */
-     mp_clamp(c);
-
-     return res;
-  }
-
-  /* old number of used digits in c */
-  oldused = c->used;
-
-  /* sign always positive */
-  c->sign = MP_ZPOS;
-
-  /* source alias */
-  tmpa    = a->dp;
-
-  /* destination alias */
-  tmpc    = c->dp;
-
-  /* if a is positive */
-  if (a->sign == MP_ZPOS) {
-     /* add digit, after this we're propagating
-      * the carry.
-      */
-     *tmpc   = *tmpa++ + b;
-     mu      = *tmpc >> DIGIT_BIT;
-     *tmpc++ &= MP_MASK;
-
-     /* now handle rest of the digits */
-     for (ix = 1; ix < a->used; ix++) {
-        *tmpc   = *tmpa++ + mu;
-        mu      = *tmpc >> DIGIT_BIT;
-        *tmpc++ &= MP_MASK;
-     }
-     /* set final carry */
-     ix++;
-     *tmpc++  = mu;
-
-     /* setup size */
-     c->used = a->used + 1;
-  } else {
-     /* a was negative and |a| < b */
-     c->used  = 1;
-
-     /* the result is a single digit */
-     if (a->used == 1) {
-        *tmpc++  =  b - a->dp[0];
-     } else {
-        *tmpc++  =  b;
-     }
-
-     /* setup count so the clearing of oldused
-      * can fall through correctly
-      */
-     ix       = 1;
-  }
-
-  /* now zero to oldused */
-  while (ix++ < oldused) {
-     *tmpc++ = 0;
-  }
-  mp_clamp(c);
-
-  return MP_OKAY;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_add_d.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_addmod.c b/dep/StormLibOld/src/libtommath/bn_mp_addmod.c
deleted file mode 100644
index 0a21f62e9..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_addmod.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_ADDMOD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* d = a + b (mod c) */
-int
-mp_addmod (mp_int * a, mp_int * b, mp_int * c, mp_int * d)
-{
-  int     res;
-  mp_int  t;
-
-  if ((res = mp_init (&t)) != MP_OKAY) {
-    return res;
-  }
-
-  if ((res = mp_add (a, b, &t)) != MP_OKAY) {
-    mp_clear (&t);
-    return res;
-  }
-  res = mp_mod (&t, c, d);
-  mp_clear (&t);
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_addmod.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_and.c b/dep/StormLibOld/src/libtommath/bn_mp_and.c
deleted file mode 100644
index 6b7afc104..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_and.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_AND_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* AND two ints together */
-int
-mp_and (mp_int * a, mp_int * b, mp_int * c)
-{
-  int     res, ix, px;
-  mp_int  t, *x;
-
-  if (a->used > b->used) {
-    if ((res = mp_init_copy (&t, a)) != MP_OKAY) {
-      return res;
-    }
-    px = b->used;
-    x = b;
-  } else {
-    if ((res = mp_init_copy (&t, b)) != MP_OKAY) {
-      return res;
-    }
-    px = a->used;
-    x = a;
-  }
-
-  for (ix = 0; ix < px; ix++) {
-    t.dp[ix] &= x->dp[ix];
-  }
-
-  /* zero digits above the last from the smallest mp_int */
-  for (; ix < t.used; ix++) {
-    t.dp[ix] = 0;
-  }
-
-  mp_clamp (&t);
-  mp_exch (c, &t);
-  mp_clear (&t);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_and.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_clamp.c b/dep/StormLibOld/src/libtommath/bn_mp_clamp.c
deleted file mode 100644
index d3cc21c3e..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_clamp.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_CLAMP_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* trim unused digits 
- *
- * This is used to ensure that leading zero digits are
- * trimed and the leading "used" digit will be non-zero
- * Typically very fast.  Also fixes the sign if there
- * are no more leading digits
- */
-void
-mp_clamp (mp_int * a)
-{
-  /* decrease used while the most significant digit is
-   * zero.
-   */
-  while (a->used > 0 && a->dp[a->used - 1] == 0) {
-    --(a->used);
-  }
-
-  /* reset the sign flag if used == 0 */
-  if (a->used == 0) {
-    a->sign = MP_ZPOS;
-  }
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_clamp.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_clear.c b/dep/StormLibOld/src/libtommath/bn_mp_clear.c
deleted file mode 100644
index 7644c3825..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_clear.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_CLEAR_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* clear one (frees)  */
-void
-mp_clear (mp_int * a)
-{
-  int i;
-
-  /* only do anything if a hasn't been freed previously */
-  if (a->dp != NULL) {
-    /* first zero the digits */
-    for (i = 0; i < a->used; i++) {
-        a->dp[i] = 0;
-    }
-
-    /* free ram */
-    XFREE(a->dp);
-
-    /* reset members to make debugging easier */
-    a->dp    = NULL;
-    a->alloc = a->used = 0;
-    a->sign  = MP_ZPOS;
-  }
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_clear.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_clear_multi.c b/dep/StormLibOld/src/libtommath/bn_mp_clear_multi.c
deleted file mode 100644
index a10762436..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_clear_multi.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_CLEAR_MULTI_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include <stdarg.h>
-
-void mp_clear_multi(mp_int *mp, ...) 
-{
-    mp_int* next_mp = mp;
-    va_list args;
-    va_start(args, mp);
-    while (next_mp != NULL) {
-        mp_clear(next_mp);
-        next_mp = va_arg(args, mp_int*);
-    }
-    va_end(args);
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_clear_multi.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_cmp.c b/dep/StormLibOld/src/libtommath/bn_mp_cmp.c
deleted file mode 100644
index 761d2b0dc..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_cmp.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_CMP_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* compare two ints (signed)*/
-int
-mp_cmp (mp_int * a, mp_int * b)
-{
-  /* compare based on sign */
-  if (a->sign != b->sign) {
-     if (a->sign == MP_NEG) {
-        return MP_LT;
-     } else {
-        return MP_GT;
-     }
-  }
-  
-  /* compare digits */
-  if (a->sign == MP_NEG) {
-     /* if negative compare opposite direction */
-     return mp_cmp_mag(b, a);
-  } else {
-     return mp_cmp_mag(a, b);
-  }
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_cmp.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_cmp_d.c b/dep/StormLibOld/src/libtommath/bn_mp_cmp_d.c
deleted file mode 100644
index 420dfd31a..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_cmp_d.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_CMP_D_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* compare a digit */
-int mp_cmp_d(mp_int * a, mp_digit b)
-{
-  /* compare based on sign */
-  if (a->sign == MP_NEG) {
-    return MP_LT;
-  }
-
-  /* compare based on magnitude */
-  if (a->used > 1) {
-    return MP_GT;
-  }
-
-  /* compare the only digit of a to b */
-  if (a->dp[0] > b) {
-    return MP_GT;
-  } else if (a->dp[0] < b) {
-    return MP_LT;
-  } else {
-    return MP_EQ;
-  }
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_cmp_d.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_cmp_mag.c b/dep/StormLibOld/src/libtommath/bn_mp_cmp_mag.c
deleted file mode 100644
index 92565a3b8..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_cmp_mag.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_CMP_MAG_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* compare maginitude of two ints (unsigned) */
-int mp_cmp_mag (mp_int * a, mp_int * b)
-{
-  int     n;
-  mp_digit *tmpa, *tmpb;
-
-  /* compare based on # of non-zero digits */
-  if (a->used > b->used) {
-    return MP_GT;
-  }
-  
-  if (a->used < b->used) {
-    return MP_LT;
-  }
-
-  /* alias for a */
-  tmpa = a->dp + (a->used - 1);
-
-  /* alias for b */
-  tmpb = b->dp + (a->used - 1);
-
-  /* compare based on digits  */
-  for (n = 0; n < a->used; ++n, --tmpa, --tmpb) {
-    if (*tmpa > *tmpb) {
-      return MP_GT;
-    }
-
-    if (*tmpa < *tmpb) {
-      return MP_LT;
-    }
-  }
-  return MP_EQ;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_cmp_mag.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_cnt_lsb.c b/dep/StormLibOld/src/libtommath/bn_mp_cnt_lsb.c
deleted file mode 100644
index 60406610e..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_cnt_lsb.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_CNT_LSB_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-static const int lnz[16] = { 
-   4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0
-};
-
-/* Counts the number of lsbs which are zero before the first zero bit */
-int mp_cnt_lsb(mp_int *a)
-{
-   int x;
-   mp_digit q, qq;
-
-   /* easy out */
-   if (mp_iszero(a) == 1) {
-      return 0;
-   }
-
-   /* scan lower digits until non-zero */
-   for (x = 0; x < a->used && a->dp[x] == 0; x++);
-   q = a->dp[x];
-   x *= DIGIT_BIT;
-
-   /* now scan this digit until a 1 is found */
-   if ((q & 1) == 0) {
-      do {
-         qq  = q & 15;
-         x  += lnz[qq];
-         q >>= 4;
-      } while (qq == 0);
-   }
-   return x;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_cnt_lsb.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_copy.c b/dep/StormLibOld/src/libtommath/bn_mp_copy.c
deleted file mode 100644
index 7828592da..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_copy.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_COPY_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* copy, b = a */
-int
-mp_copy (mp_int * a, mp_int * b)
-{
-  int     res, n;
-
-  /* if dst == src do nothing */
-  if (a == b) {
-    return MP_OKAY;
-  }
-
-  /* grow dest */
-  if (b->alloc < a->used) {
-     if ((res = mp_grow (b, a->used)) != MP_OKAY) {
-        return res;
-     }
-  }
-
-  /* zero b and copy the parameters over */
-  {
-    register mp_digit *tmpa, *tmpb;
-
-    /* pointer aliases */
-
-    /* source */
-    tmpa = a->dp;
-
-    /* destination */
-    tmpb = b->dp;
-
-    /* copy all the digits */
-    for (n = 0; n < a->used; n++) {
-      *tmpb++ = *tmpa++;
-    }
-
-    /* clear high digits */
-    for (; n < b->used; n++) {
-      *tmpb++ = 0;
-    }
-  }
-
-  /* copy used count and sign */
-  b->used = a->used;
-  b->sign = a->sign;
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_copy.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_count_bits.c b/dep/StormLibOld/src/libtommath/bn_mp_count_bits.c
deleted file mode 100644
index 9d8640fdf..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_count_bits.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_COUNT_BITS_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* returns the number of bits in an int */
-int
-mp_count_bits (mp_int * a)
-{
-  int     r;
-  mp_digit q;
-
-  /* shortcut */
-  if (a->used == 0) {
-    return 0;
-  }
-
-  /* get number of digits and add that */
-  r = (a->used - 1) * DIGIT_BIT;
-  
-  /* take the last digit and count the bits in it */
-  q = a->dp[a->used - 1];
-  while (q > ((mp_digit) 0)) {
-    ++r;
-    q >>= ((mp_digit) 1);
-  }
-  return r;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_count_bits.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_div.c b/dep/StormLibOld/src/libtommath/bn_mp_div.c
deleted file mode 100644
index 3004a3ea0..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_div.c
+++ /dev/null
@@ -1,292 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_DIV_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-#ifdef BN_MP_DIV_SMALL
-
-/* slower bit-bang division... also smaller */
-int mp_div(mp_int * a, mp_int * b, mp_int * c, mp_int * d)
-{
-   mp_int ta, tb, tq, q;
-   int    res, n, n2;
-
-  /* is divisor zero ? */
-  if (mp_iszero (b) == 1) {
-    return MP_VAL;
-  }
-
-  /* if a < b then q=0, r = a */
-  if (mp_cmp_mag (a, b) == MP_LT) {
-    if (d != NULL) {
-      res = mp_copy (a, d);
-    } else {
-      res = MP_OKAY;
-    }
-    if (c != NULL) {
-      mp_zero (c);
-    }
-    return res;
-  }
-	
-  /* init our temps */
-  if ((res = mp_init_multi(&ta, &tb, &tq, &q, NULL) != MP_OKAY)) {
-     return res;
-  }
-
-
-  mp_set(&tq, 1);
-  n = mp_count_bits(a) - mp_count_bits(b);
-  if (((res = mp_abs(a, &ta)) != MP_OKAY) ||
-      ((res = mp_abs(b, &tb)) != MP_OKAY) || 
-      ((res = mp_mul_2d(&tb, n, &tb)) != MP_OKAY) ||
-      ((res = mp_mul_2d(&tq, n, &tq)) != MP_OKAY)) {
-      goto LBL_ERR;
-  }
-
-  while (n-- >= 0) {
-     if (mp_cmp(&tb, &ta) != MP_GT) {
-        if (((res = mp_sub(&ta, &tb, &ta)) != MP_OKAY) ||
-            ((res = mp_add(&q, &tq, &q)) != MP_OKAY)) {
-           goto LBL_ERR;
-        }
-     }
-     if (((res = mp_div_2d(&tb, 1, &tb, NULL)) != MP_OKAY) ||
-         ((res = mp_div_2d(&tq, 1, &tq, NULL)) != MP_OKAY)) {
-           goto LBL_ERR;
-     }
-  }
-
-  /* now q == quotient and ta == remainder */
-  n  = a->sign;
-  n2 = (a->sign == b->sign ? MP_ZPOS : MP_NEG);
-  if (c != NULL) {
-     mp_exch(c, &q);
-     c->sign  = (mp_iszero(c) == MP_YES) ? MP_ZPOS : n2;
-  }
-  if (d != NULL) {
-     mp_exch(d, &ta);
-     d->sign = (mp_iszero(d) == MP_YES) ? MP_ZPOS : n;
-  }
-LBL_ERR:
-   mp_clear_multi(&ta, &tb, &tq, &q, NULL);
-   return res;
-}
-
-#else
-
-/* integer signed division. 
- * c*b + d == a [e.g. a/b, c=quotient, d=remainder]
- * HAC pp.598 Algorithm 14.20
- *
- * Note that the description in HAC is horribly 
- * incomplete.  For example, it doesn't consider 
- * the case where digits are removed from 'x' in 
- * the inner loop.  It also doesn't consider the 
- * case that y has fewer than three digits, etc..
- *
- * The overall algorithm is as described as 
- * 14.20 from HAC but fixed to treat these cases.
-*/
-int mp_div (mp_int * a, mp_int * b, mp_int * c, mp_int * d)
-{
-  mp_int  q, x, y, t1, t2;
-  int     res, n, t, i, norm, neg;
-
-  /* is divisor zero ? */
-  if (mp_iszero (b) == 1) {
-    return MP_VAL;
-  }
-
-  /* if a < b then q=0, r = a */
-  if (mp_cmp_mag (a, b) == MP_LT) {
-    if (d != NULL) {
-      res = mp_copy (a, d);
-    } else {
-      res = MP_OKAY;
-    }
-    if (c != NULL) {
-      mp_zero (c);
-    }
-    return res;
-  }
-
-  if ((res = mp_init_size (&q, a->used + 2)) != MP_OKAY) {
-    return res;
-  }
-  q.used = a->used + 2;
-
-  if ((res = mp_init (&t1)) != MP_OKAY) {
-    goto LBL_Q;
-  }
-
-  if ((res = mp_init (&t2)) != MP_OKAY) {
-    goto LBL_T1;
-  }
-
-  if ((res = mp_init_copy (&x, a)) != MP_OKAY) {
-    goto LBL_T2;
-  }
-
-  if ((res = mp_init_copy (&y, b)) != MP_OKAY) {
-    goto LBL_X;
-  }
-
-  /* fix the sign */
-  neg = (a->sign == b->sign) ? MP_ZPOS : MP_NEG;
-  x.sign = y.sign = MP_ZPOS;
-
-  /* normalize both x and y, ensure that y >= b/2, [b == 2**DIGIT_BIT] */
-  norm = mp_count_bits(&y) % DIGIT_BIT;
-  if (norm < (int)(DIGIT_BIT-1)) {
-     norm = (DIGIT_BIT-1) - norm;
-     if ((res = mp_mul_2d (&x, norm, &x)) != MP_OKAY) {
-       goto LBL_Y;
-     }
-     if ((res = mp_mul_2d (&y, norm, &y)) != MP_OKAY) {
-       goto LBL_Y;
-     }
-  } else {
-     norm = 0;
-  }
-
-  /* note hac does 0 based, so if used==5 then its 0,1,2,3,4, e.g. use 4 */
-  n = x.used - 1;
-  t = y.used - 1;
-
-  /* while (x >= y*b**n-t) do { q[n-t] += 1; x -= y*b**{n-t} } */
-  if ((res = mp_lshd (&y, n - t)) != MP_OKAY) { /* y = y*b**{n-t} */
-    goto LBL_Y;
-  }
-
-  while (mp_cmp (&x, &y) != MP_LT) {
-    ++(q.dp[n - t]);
-    if ((res = mp_sub (&x, &y, &x)) != MP_OKAY) {
-      goto LBL_Y;
-    }
-  }
-
-  /* reset y by shifting it back down */
-  mp_rshd (&y, n - t);
-
-  /* step 3. for i from n down to (t + 1) */
-  for (i = n; i >= (t + 1); i--) {
-    if (i > x.used) {
-      continue;
-    }
-
-    /* step 3.1 if xi == yt then set q{i-t-1} to b-1, 
-     * otherwise set q{i-t-1} to (xi*b + x{i-1})/yt */
-    if (x.dp[i] == y.dp[t]) {
-      q.dp[i - t - 1] = ((((mp_digit)1) << DIGIT_BIT) - 1);
-    } else {
-      mp_word tmp;
-      tmp = ((mp_word) x.dp[i]) << ((mp_word) DIGIT_BIT);
-      tmp |= ((mp_word) x.dp[i - 1]);
-      tmp /= ((mp_word) y.dp[t]);
-      if (tmp > (mp_word) MP_MASK)
-        tmp = MP_MASK;
-      q.dp[i - t - 1] = (mp_digit) (tmp & (mp_word) (MP_MASK));
-    }
-
-    /* while (q{i-t-1} * (yt * b + y{t-1})) > 
-             xi * b**2 + xi-1 * b + xi-2 
-     
-       do q{i-t-1} -= 1; 
-    */
-    q.dp[i - t - 1] = (q.dp[i - t - 1] + 1) & MP_MASK;
-    do {
-      q.dp[i - t - 1] = (q.dp[i - t - 1] - 1) & MP_MASK;
-
-      /* find left hand */
-      mp_zero (&t1);
-      t1.dp[0] = (t - 1 < 0) ? 0 : y.dp[t - 1];
-      t1.dp[1] = y.dp[t];
-      t1.used = 2;
-      if ((res = mp_mul_d (&t1, q.dp[i - t - 1], &t1)) != MP_OKAY) {
-        goto LBL_Y;
-      }
-
-      /* find right hand */
-      t2.dp[0] = (i - 2 < 0) ? 0 : x.dp[i - 2];
-      t2.dp[1] = (i - 1 < 0) ? 0 : x.dp[i - 1];
-      t2.dp[2] = x.dp[i];
-      t2.used = 3;
-    } while (mp_cmp_mag(&t1, &t2) == MP_GT);
-
-    /* step 3.3 x = x - q{i-t-1} * y * b**{i-t-1} */
-    if ((res = mp_mul_d (&y, q.dp[i - t - 1], &t1)) != MP_OKAY) {
-      goto LBL_Y;
-    }
-
-    if ((res = mp_lshd (&t1, i - t - 1)) != MP_OKAY) {
-      goto LBL_Y;
-    }
-
-    if ((res = mp_sub (&x, &t1, &x)) != MP_OKAY) {
-      goto LBL_Y;
-    }
-
-    /* if x < 0 then { x = x + y*b**{i-t-1}; q{i-t-1} -= 1; } */
-    if (x.sign == MP_NEG) {
-      if ((res = mp_copy (&y, &t1)) != MP_OKAY) {
-        goto LBL_Y;
-      }
-      if ((res = mp_lshd (&t1, i - t - 1)) != MP_OKAY) {
-        goto LBL_Y;
-      }
-      if ((res = mp_add (&x, &t1, &x)) != MP_OKAY) {
-        goto LBL_Y;
-      }
-
-      q.dp[i - t - 1] = (q.dp[i - t - 1] - 1UL) & MP_MASK;
-    }
-  }
-
-  /* now q is the quotient and x is the remainder 
-   * [which we have to normalize] 
-   */
-  
-  /* get sign before writing to c */
-  x.sign = x.used == 0 ? MP_ZPOS : a->sign;
-
-  if (c != NULL) {
-    mp_clamp (&q);
-    mp_exch (&q, c);
-    c->sign = neg;
-  }
-
-  if (d != NULL) {
-    mp_div_2d (&x, norm, &x, NULL);
-    mp_exch (&x, d);
-  }
-
-  res = MP_OKAY;
-
-LBL_Y:mp_clear (&y);
-LBL_X:mp_clear (&x);
-LBL_T2:mp_clear (&t2);
-LBL_T1:mp_clear (&t1);
-LBL_Q:mp_clear (&q);
-  return res;
-}
-
-#endif
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_div.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_div_2.c b/dep/StormLibOld/src/libtommath/bn_mp_div_2.c
deleted file mode 100644
index f3b9d16fa..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_div_2.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_DIV_2_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* b = a/2 */
-int mp_div_2(mp_int * a, mp_int * b)
-{
-  int     x, res, oldused;
-
-  /* copy */
-  if (b->alloc < a->used) {
-    if ((res = mp_grow (b, a->used)) != MP_OKAY) {
-      return res;
-    }
-  }
-
-  oldused = b->used;
-  b->used = a->used;
-  {
-    register mp_digit r, rr, *tmpa, *tmpb;
-
-    /* source alias */
-    tmpa = a->dp + b->used - 1;
-
-    /* dest alias */
-    tmpb = b->dp + b->used - 1;
-
-    /* carry */
-    r = 0;
-    for (x = b->used - 1; x >= 0; x--) {
-      /* get the carry for the next iteration */
-      rr = *tmpa & 1;
-
-      /* shift the current digit, add in carry and store */
-      *tmpb-- = (*tmpa-- >> 1) | (r << (DIGIT_BIT - 1));
-
-      /* forward carry to next iteration */
-      r = rr;
-    }
-
-    /* zero excess digits */
-    tmpb = b->dp + b->used;
-    for (x = b->used; x < oldused; x++) {
-      *tmpb++ = 0;
-    }
-  }
-  b->sign = a->sign;
-  mp_clamp (b);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_div_2.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_div_2d.c b/dep/StormLibOld/src/libtommath/bn_mp_div_2d.c
deleted file mode 100644
index 861ea23a3..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_div_2d.c
+++ /dev/null
@@ -1,97 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_DIV_2D_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* shift right by a certain bit count (store quotient in c, optional remainder in d) */
-int mp_div_2d (mp_int * a, int b, mp_int * c, mp_int * d)
-{
-  mp_digit D, r, rr;
-  int     x, res;
-  mp_int  t;
-
-
-  /* if the shift count is <= 0 then we do no work */
-  if (b <= 0) {
-    res = mp_copy (a, c);
-    if (d != NULL) {
-      mp_zero (d);
-    }
-    return res;
-  }
-
-  if ((res = mp_init (&t)) != MP_OKAY) {
-    return res;
-  }
-
-  /* get the remainder */
-  if (d != NULL) {
-    if ((res = mp_mod_2d (a, b, &t)) != MP_OKAY) {
-      mp_clear (&t);
-      return res;
-    }
-  }
-
-  /* copy */
-  if ((res = mp_copy (a, c)) != MP_OKAY) {
-    mp_clear (&t);
-    return res;
-  }
-
-  /* shift by as many digits in the bit count */
-  if (b >= (int)DIGIT_BIT) {
-    mp_rshd (c, b / DIGIT_BIT);
-  }
-
-  /* shift any bit count < DIGIT_BIT */
-  D = (mp_digit) (b % DIGIT_BIT);
-  if (D != 0) {
-    register mp_digit *tmpc, mask, shift;
-
-    /* mask */
-    mask = (((mp_digit)1) << D) - 1;
-
-    /* shift for lsb */
-    shift = DIGIT_BIT - D;
-
-    /* alias */
-    tmpc = c->dp + (c->used - 1);
-
-    /* carry */
-    r = 0;
-    for (x = c->used - 1; x >= 0; x--) {
-      /* get the lower  bits of this word in a temp */
-      rr = *tmpc & mask;
-
-      /* shift the current word and mix in the carry bits from the previous word */
-      *tmpc = (*tmpc >> D) | (r << shift);
-      --tmpc;
-
-      /* set the carry to the carry bits of the current word found above */
-      r = rr;
-    }
-  }
-  mp_clamp (c);
-  if (d != NULL) {
-    mp_exch (&t, d);
-  }
-  mp_clear (&t);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_div_2d.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_div_3.c b/dep/StormLibOld/src/libtommath/bn_mp_div_3.c
deleted file mode 100644
index 4fc08fc4d..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_div_3.c
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_DIV_3_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* divide by three (based on routine from MPI and the GMP manual) */
-int
-mp_div_3 (mp_int * a, mp_int *c, mp_digit * d)
-{
-  mp_int   q;
-  mp_word  w, t;
-  mp_digit b;
-  int      res, ix;
-  
-  /* b = 2**DIGIT_BIT / 3 */
-  b = (((mp_word)1) << ((mp_word)DIGIT_BIT)) / ((mp_word)3);
-
-  if ((res = mp_init_size(&q, a->used)) != MP_OKAY) {
-     return res;
-  }
-  
-  q.used = a->used;
-  q.sign = a->sign;
-  w = 0;
-  for (ix = a->used - 1; ix >= 0; ix--) {
-     w = (w << ((mp_word)DIGIT_BIT)) | ((mp_word)a->dp[ix]);
-
-     if (w >= 3) {
-        /* multiply w by [1/3] */
-        t = (w * ((mp_word)b)) >> ((mp_word)DIGIT_BIT);
-
-        /* now subtract 3 * [w/3] from w, to get the remainder */
-        w -= t+t+t;
-
-        /* fixup the remainder as required since
-         * the optimization is not exact.
-         */
-        while (w >= 3) {
-           t += 1;
-           w -= 3;
-        }
-      } else {
-        t = 0;
-      }
-      q.dp[ix] = (mp_digit)t;
-  }
-
-  /* [optional] store the remainder */
-  if (d != NULL) {
-     *d = (mp_digit)w;
-  }
-
-  /* [optional] store the quotient */
-  if (c != NULL) {
-     mp_clamp(&q);
-     mp_exch(&q, c);
-  }
-  mp_clear(&q);
-  
-  return res;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_div_3.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_div_d.c b/dep/StormLibOld/src/libtommath/bn_mp_div_d.c
deleted file mode 100644
index c0318a4a1..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_div_d.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_DIV_D_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-static int s_is_power_of_two(mp_digit b, int *p)
-{
-   int x;
-
-   /* fast return if no power of two */
-   if ((b==0) || (b & (b-1))) {
-      return 0;
-   }
-
-   for (x = 0; x < DIGIT_BIT; x++) {
-      if (b == (((mp_digit)1)<<x)) {
-         *p = x;
-         return 1;
-      }
-   }
-   return 0;
-}
-
-/* single digit division (based on routine from MPI) */
-int mp_div_d (mp_int * a, mp_digit b, mp_int * c, mp_digit * d)
-{
-  mp_int  q;
-  mp_word w;
-  mp_digit t;
-  int     res, ix;
-
-  /* cannot divide by zero */
-  if (b == 0) {
-     return MP_VAL;
-  }
-
-  /* quick outs */
-  if (b == 1 || mp_iszero(a) == 1) {
-     if (d != NULL) {
-        *d = 0;
-     }
-     if (c != NULL) {
-        return mp_copy(a, c);
-     }
-     return MP_OKAY;
-  }
-
-  /* power of two ? */
-  if (s_is_power_of_two(b, &ix) == 1) {
-     if (d != NULL) {
-        *d = a->dp[0] & ((((mp_digit)1)<<ix) - 1);
-     }
-     if (c != NULL) {
-        return mp_div_2d(a, ix, c, NULL);
-     }
-     return MP_OKAY;
-  }
-
-#ifdef BN_MP_DIV_3_C
-  /* three? */
-  if (b == 3) {
-     return mp_div_3(a, c, d);
-  }
-#endif
-
-  /* no easy answer [c'est la vie].  Just division */
-  if ((res = mp_init_size(&q, a->used)) != MP_OKAY) {
-     return res;
-  }
-  
-  q.used = a->used;
-  q.sign = a->sign;
-  w = 0;
-  for (ix = a->used - 1; ix >= 0; ix--) {
-     w = (w << ((mp_word)DIGIT_BIT)) | ((mp_word)a->dp[ix]);
-     
-     if (w >= b) {
-        t = (mp_digit)(w / b);
-        w -= ((mp_word)t) * ((mp_word)b);
-      } else {
-        t = 0;
-      }
-      q.dp[ix] = (mp_digit)t;
-  }
-  
-  if (d != NULL) {
-     *d = (mp_digit)w;
-  }
-  
-  if (c != NULL) {
-     mp_clamp(&q);
-     mp_exch(&q, c);
-  }
-  mp_clear(&q);
-  
-  return res;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_div_d.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2007/01/09 04:44:32 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_dr_is_modulus.c b/dep/StormLibOld/src/libtommath/bn_mp_dr_is_modulus.c
deleted file mode 100644
index 22ba5df3d..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_dr_is_modulus.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_DR_IS_MODULUS_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* determines if a number is a valid DR modulus */
-int mp_dr_is_modulus(mp_int *a)
-{
-   int ix;
-
-   /* must be at least two digits */
-   if (a->used < 2) {
-      return 0;
-   }
-
-   /* must be of the form b**k - a [a <= b] so all
-    * but the first digit must be equal to -1 (mod b).
-    */
-   for (ix = 1; ix < a->used; ix++) {
-       if (a->dp[ix] != MP_MASK) {
-          return 0;
-       }
-   }
-   return 1;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_dr_is_modulus.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_dr_reduce.c b/dep/StormLibOld/src/libtommath/bn_mp_dr_reduce.c
deleted file mode 100644
index 0afac941f..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_dr_reduce.c
+++ /dev/null
@@ -1,94 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_DR_REDUCE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* reduce "x" in place modulo "n" using the Diminished Radix algorithm.
- *
- * Based on algorithm from the paper
- *
- * "Generating Efficient Primes for Discrete Log Cryptosystems"
- *                 Chae Hoon Lim, Pil Joong Lee,
- *          POSTECH Information Research Laboratories
- *
- * The modulus must be of a special format [see manual]
- *
- * Has been modified to use algorithm 7.10 from the LTM book instead
- *
- * Input x must be in the range 0 <= x <= (n-1)**2
- */
-int
-mp_dr_reduce (mp_int * x, mp_int * n, mp_digit k)
-{
-  int      err, i, m;
-  mp_word  r;
-  mp_digit mu, *tmpx1, *tmpx2;
-
-  /* m = digits in modulus */
-  m = n->used;
-
-  /* ensure that "x" has at least 2m digits */
-  if (x->alloc < m + m) {
-    if ((err = mp_grow (x, m + m)) != MP_OKAY) {
-      return err;
-    }
-  }
-
-/* top of loop, this is where the code resumes if
- * another reduction pass is required.
- */
-top:
-  /* aliases for digits */
-  /* alias for lower half of x */
-  tmpx1 = x->dp;
-
-  /* alias for upper half of x, or x/B**m */
-  tmpx2 = x->dp + m;
-
-  /* set carry to zero */
-  mu = 0;
-
-  /* compute (x mod B**m) + k * [x/B**m] inline and inplace */
-  for (i = 0; i < m; i++) {
-      r         = ((mp_word)*tmpx2++) * ((mp_word)k) + *tmpx1 + mu;
-      *tmpx1++  = (mp_digit)(r & MP_MASK);
-      mu        = (mp_digit)(r >> ((mp_word)DIGIT_BIT));
-  }
-
-  /* set final carry */
-  *tmpx1++ = mu;
-
-  /* zero words above m */
-  for (i = m + 1; i < x->used; i++) {
-      *tmpx1++ = 0;
-  }
-
-  /* clamp, sub and return */
-  mp_clamp (x);
-
-  /* if x >= n then subtract and reduce again
-   * Each successive "recursion" makes the input smaller and smaller.
-   */
-  if (mp_cmp_mag (x, n) != MP_LT) {
-    s_mp_sub(x, n, x);
-    goto top;
-  }
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_dr_reduce.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_dr_setup.c b/dep/StormLibOld/src/libtommath/bn_mp_dr_setup.c
deleted file mode 100644
index a5152f713..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_dr_setup.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_DR_SETUP_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* determines the setup value */
-void mp_dr_setup(mp_int *a, mp_digit *d)
-{
-   /* the casts are required if DIGIT_BIT is one less than
-    * the number of bits in a mp_digit [e.g. DIGIT_BIT==31]
-    */
-   *d = (mp_digit)((((mp_word)1) << ((mp_word)DIGIT_BIT)) - 
-        ((mp_word)a->dp[0]));
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_dr_setup.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_exch.c b/dep/StormLibOld/src/libtommath/bn_mp_exch.c
deleted file mode 100644
index e5ec7f577..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_exch.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_EXCH_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* swap the elements of two integers, for cases where you can't simply swap the 
- * mp_int pointers around
- */
-void
-mp_exch (mp_int * a, mp_int * b)
-{
-  mp_int  t;
-
-  t  = *a;
-  *a = *b;
-  *b = t;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_exch.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_expt_d.c b/dep/StormLibOld/src/libtommath/bn_mp_expt_d.c
deleted file mode 100644
index 7bf371ce6..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_expt_d.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_EXPT_D_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* calculate c = a**b  using a square-multiply algorithm */
-int mp_expt_d (mp_int * a, mp_digit b, mp_int * c)
-{
-  int     res, x;
-  mp_int  g;
-
-  if ((res = mp_init_copy (&g, a)) != MP_OKAY) {
-    return res;
-  }
-
-  /* set initial result */
-  mp_set (c, 1);
-
-  for (x = 0; x < (int) DIGIT_BIT; x++) {
-    /* square */
-    if ((res = mp_sqr (c, c)) != MP_OKAY) {
-      mp_clear (&g);
-      return res;
-    }
-
-    /* if the bit is set multiply */
-    if ((b & (mp_digit) (((mp_digit)1) << (DIGIT_BIT - 1))) != 0) {
-      if ((res = mp_mul (c, &g, c)) != MP_OKAY) {
-         mp_clear (&g);
-         return res;
-      }
-    }
-
-    /* shift to next bit */
-    b <<= 1;
-  }
-
-  mp_clear (&g);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_expt_d.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_exptmod.c b/dep/StormLibOld/src/libtommath/bn_mp_exptmod.c
deleted file mode 100644
index 27c46ea0a..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_exptmod.c
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_EXPTMOD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-
-/* this is a shell function that calls either the normal or Montgomery
- * exptmod functions.  Originally the call to the montgomery code was
- * embedded in the normal function but that wasted alot of stack space
- * for nothing (since 99% of the time the Montgomery code would be called)
- */
-int mp_exptmod (mp_int * G, mp_int * X, mp_int * P, mp_int * Y)
-{
-  int dr;
-
-  /* modulus P must be positive */
-  if (P->sign == MP_NEG) {
-     return MP_VAL;
-  }
-
-  /* if exponent X is negative we have to recurse */
-  if (X->sign == MP_NEG) {
-#ifdef BN_MP_INVMOD_C
-     mp_int tmpG, tmpX;
-     int err;
-
-     /* first compute 1/G mod P */
-     if ((err = mp_init(&tmpG)) != MP_OKAY) {
-        return err;
-     }
-     if ((err = mp_invmod(G, P, &tmpG)) != MP_OKAY) {
-        mp_clear(&tmpG);
-        return err;
-     }
-
-     /* now get |X| */
-     if ((err = mp_init(&tmpX)) != MP_OKAY) {
-        mp_clear(&tmpG);
-        return err;
-     }
-     if ((err = mp_abs(X, &tmpX)) != MP_OKAY) {
-        mp_clear_multi(&tmpG, &tmpX, NULL);
-        return err;
-     }
-
-     /* and now compute (1/G)**|X| instead of G**X [X < 0] */
-     err = mp_exptmod(&tmpG, &tmpX, P, Y);
-     mp_clear_multi(&tmpG, &tmpX, NULL);
-     return err;
-#else 
-     /* no invmod */
-     return MP_VAL;
-#endif
-  }
-
-/* modified diminished radix reduction */
-#if defined(BN_MP_REDUCE_IS_2K_L_C) && defined(BN_MP_REDUCE_2K_L_C) && defined(BN_S_MP_EXPTMOD_C)
-  if (mp_reduce_is_2k_l(P) == MP_YES) {
-     return s_mp_exptmod(G, X, P, Y, 1);
-  }
-#endif
-
-#ifdef BN_MP_DR_IS_MODULUS_C
-  /* is it a DR modulus? */
-  dr = mp_dr_is_modulus(P);
-#else
-  /* default to no */
-  dr = 0;
-#endif
-
-#ifdef BN_MP_REDUCE_IS_2K_C
-  /* if not, is it a unrestricted DR modulus? */
-  if (dr == 0) {
-     dr = mp_reduce_is_2k(P) << 1;
-  }
-#endif
-    
-  /* if the modulus is odd or dr != 0 use the montgomery method */
-#ifdef BN_MP_EXPTMOD_FAST_C
-  if (mp_isodd (P) == 1 || dr !=  0) {
-    return mp_exptmod_fast (G, X, P, Y, dr);
-  } else {
-#endif
-#ifdef BN_S_MP_EXPTMOD_C
-    /* otherwise use the generic Barrett reduction technique */
-    return s_mp_exptmod (G, X, P, Y, 0);
-#else
-    /* no exptmod for evens */
-    return MP_VAL;
-#endif
-#ifdef BN_MP_EXPTMOD_FAST_C
-  }
-#endif
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_exptmod.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_exptmod_fast.c b/dep/StormLibOld/src/libtommath/bn_mp_exptmod_fast.c
deleted file mode 100644
index 31205d4e2..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_exptmod_fast.c
+++ /dev/null
@@ -1,321 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_EXPTMOD_FAST_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* computes Y == G**X mod P, HAC pp.616, Algorithm 14.85
- *
- * Uses a left-to-right k-ary sliding window to compute the modular exponentiation.
- * The value of k changes based on the size of the exponent.
- *
- * Uses Montgomery or Diminished Radix reduction [whichever appropriate]
- */
-
-#ifdef MP_LOW_MEM
-   #define TAB_SIZE 32
-#else
-   #define TAB_SIZE 256
-#endif
-
-int mp_exptmod_fast (mp_int * G, mp_int * X, mp_int * P, mp_int * Y, int redmode)
-{
-  mp_int  M[TAB_SIZE], res;
-  mp_digit buf, mp;
-  int     err, bitbuf, bitcpy, bitcnt, mode, digidx, x, y, winsize;
-
-  /* use a pointer to the reduction algorithm.  This allows us to use
-   * one of many reduction algorithms without modding the guts of
-   * the code with if statements everywhere.
-   */
-  int     (*redux)(mp_int*,mp_int*,mp_digit);
-
-  /* find window size */
-  x = mp_count_bits (X);
-  if (x <= 7) {
-    winsize = 2;
-  } else if (x <= 36) {
-    winsize = 3;
-  } else if (x <= 140) {
-    winsize = 4;
-  } else if (x <= 450) {
-    winsize = 5;
-  } else if (x <= 1303) {
-    winsize = 6;
-  } else if (x <= 3529) {
-    winsize = 7;
-  } else {
-    winsize = 8;
-  }
-
-#ifdef MP_LOW_MEM
-  if (winsize > 5) {
-     winsize = 5;
-  }
-#endif
-
-  /* init M array */
-  /* init first cell */
-  if ((err = mp_init(&M[1])) != MP_OKAY) {
-     return err;
-  }
-
-  /* now init the second half of the array */
-  for (x = 1<<(winsize-1); x < (1 << winsize); x++) {
-    if ((err = mp_init(&M[x])) != MP_OKAY) {
-      for (y = 1<<(winsize-1); y < x; y++) {
-        mp_clear (&M[y]);
-      }
-      mp_clear(&M[1]);
-      return err;
-    }
-  }
-
-  /* determine and setup reduction code */
-  if (redmode == 0) {
-#ifdef BN_MP_MONTGOMERY_SETUP_C     
-     /* now setup montgomery  */
-     if ((err = mp_montgomery_setup (P, &mp)) != MP_OKAY) {
-        goto LBL_M;
-     }
-#else
-     err = MP_VAL;
-     goto LBL_M;
-#endif
-
-     /* automatically pick the comba one if available (saves quite a few calls/ifs) */
-#ifdef BN_FAST_MP_MONTGOMERY_REDUCE_C
-     if (((P->used * 2 + 1) < MP_WARRAY) &&
-          P->used < (1 << ((CHAR_BIT * sizeof (mp_word)) - (2 * DIGIT_BIT)))) {
-        redux = fast_mp_montgomery_reduce;
-     } else 
-#endif
-     {
-#ifdef BN_MP_MONTGOMERY_REDUCE_C
-        /* use slower baseline Montgomery method */
-        redux = mp_montgomery_reduce;
-#else
-        err = MP_VAL;
-        goto LBL_M;
-#endif
-     }
-  } else if (redmode == 1) {
-#if defined(BN_MP_DR_SETUP_C) && defined(BN_MP_DR_REDUCE_C)
-     /* setup DR reduction for moduli of the form B**k - b */
-     mp_dr_setup(P, &mp);
-     redux = mp_dr_reduce;
-#else
-     err = MP_VAL;
-     goto LBL_M;
-#endif
-  } else {
-#if defined(BN_MP_REDUCE_2K_SETUP_C) && defined(BN_MP_REDUCE_2K_C)
-     /* setup DR reduction for moduli of the form 2**k - b */
-     if ((err = mp_reduce_2k_setup(P, &mp)) != MP_OKAY) {
-        goto LBL_M;
-     }
-     redux = mp_reduce_2k;
-#else
-     err = MP_VAL;
-     goto LBL_M;
-#endif
-  }
-
-  /* setup result */
-  if ((err = mp_init (&res)) != MP_OKAY) {
-    goto LBL_M;
-  }
-
-  /* create M table
-   *
-
-   *
-   * The first half of the table is not computed though accept for M[0] and M[1]
-   */
-
-  if (redmode == 0) {
-#ifdef BN_MP_MONTGOMERY_CALC_NORMALIZATION_C
-     /* now we need R mod m */
-     if ((err = mp_montgomery_calc_normalization (&res, P)) != MP_OKAY) {
-       goto LBL_RES;
-     }
-#else 
-     err = MP_VAL;
-     goto LBL_RES;
-#endif
-
-     /* now set M[1] to G * R mod m */
-     if ((err = mp_mulmod (G, &res, P, &M[1])) != MP_OKAY) {
-       goto LBL_RES;
-     }
-  } else {
-     mp_set(&res, 1);
-     if ((err = mp_mod(G, P, &M[1])) != MP_OKAY) {
-        goto LBL_RES;
-     }
-  }
-
-  /* compute the value at M[1<<(winsize-1)] by squaring M[1] (winsize-1) times */
-  if ((err = mp_copy (&M[1], &M[1 << (winsize - 1)])) != MP_OKAY) {
-    goto LBL_RES;
-  }
-
-  for (x = 0; x < (winsize - 1); x++) {
-    if ((err = mp_sqr (&M[1 << (winsize - 1)], &M[1 << (winsize - 1)])) != MP_OKAY) {
-      goto LBL_RES;
-    }
-    if ((err = redux (&M[1 << (winsize - 1)], P, mp)) != MP_OKAY) {
-      goto LBL_RES;
-    }
-  }
-
-  /* create upper table */
-  for (x = (1 << (winsize - 1)) + 1; x < (1 << winsize); x++) {
-    if ((err = mp_mul (&M[x - 1], &M[1], &M[x])) != MP_OKAY) {
-      goto LBL_RES;
-    }
-    if ((err = redux (&M[x], P, mp)) != MP_OKAY) {
-      goto LBL_RES;
-    }
-  }
-
-  /* set initial mode and bit cnt */
-  mode   = 0;
-  bitcnt = 1;
-  buf    = 0;
-  digidx = X->used - 1;
-  bitcpy = 0;
-  bitbuf = 0;
-
-  for (;;) {
-    /* grab next digit as required */
-    if (--bitcnt == 0) {
-      /* if digidx == -1 we are out of digits so break */
-      if (digidx == -1) {
-        break;
-      }
-      /* read next digit and reset bitcnt */
-      buf    = X->dp[digidx--];
-      bitcnt = (int)DIGIT_BIT;
-    }
-
-    /* grab the next msb from the exponent */
-    y     = (mp_digit)(buf >> (DIGIT_BIT - 1)) & 1;
-    buf <<= (mp_digit)1;
-
-    /* if the bit is zero and mode == 0 then we ignore it
-     * These represent the leading zero bits before the first 1 bit
-     * in the exponent.  Technically this opt is not required but it
-     * does lower the # of trivial squaring/reductions used
-     */
-    if (mode == 0 && y == 0) {
-      continue;
-    }
-
-    /* if the bit is zero and mode == 1 then we square */
-    if (mode == 1 && y == 0) {
-      if ((err = mp_sqr (&res, &res)) != MP_OKAY) {
-        goto LBL_RES;
-      }
-      if ((err = redux (&res, P, mp)) != MP_OKAY) {
-        goto LBL_RES;
-      }
-      continue;
-    }
-
-    /* else we add it to the window */
-    bitbuf |= (y << (winsize - ++bitcpy));
-    mode    = 2;
-
-    if (bitcpy == winsize) {
-      /* ok window is filled so square as required and multiply  */
-      /* square first */
-      for (x = 0; x < winsize; x++) {
-        if ((err = mp_sqr (&res, &res)) != MP_OKAY) {
-          goto LBL_RES;
-        }
-        if ((err = redux (&res, P, mp)) != MP_OKAY) {
-          goto LBL_RES;
-        }
-      }
-
-      /* then multiply */
-      if ((err = mp_mul (&res, &M[bitbuf], &res)) != MP_OKAY) {
-        goto LBL_RES;
-      }
-      if ((err = redux (&res, P, mp)) != MP_OKAY) {
-        goto LBL_RES;
-      }
-
-      /* empty window and reset */
-      bitcpy = 0;
-      bitbuf = 0;
-      mode   = 1;
-    }
-  }
-
-  /* if bits remain then square/multiply */
-  if (mode == 2 && bitcpy > 0) {
-    /* square then multiply if the bit is set */
-    for (x = 0; x < bitcpy; x++) {
-      if ((err = mp_sqr (&res, &res)) != MP_OKAY) {
-        goto LBL_RES;
-      }
-      if ((err = redux (&res, P, mp)) != MP_OKAY) {
-        goto LBL_RES;
-      }
-
-      /* get next bit of the window */
-      bitbuf <<= 1;
-      if ((bitbuf & (1 << winsize)) != 0) {
-        /* then multiply */
-        if ((err = mp_mul (&res, &M[1], &res)) != MP_OKAY) {
-          goto LBL_RES;
-        }
-        if ((err = redux (&res, P, mp)) != MP_OKAY) {
-          goto LBL_RES;
-        }
-      }
-    }
-  }
-
-  if (redmode == 0) {
-     /* fixup result if Montgomery reduction is used
-      * recall that any value in a Montgomery system is
-      * actually multiplied by R mod n.  So we have
-      * to reduce one more time to cancel out the factor
-      * of R.
-      */
-     if ((err = redux(&res, P, mp)) != MP_OKAY) {
-       goto LBL_RES;
-     }
-  }
-
-  /* swap res with Y */
-  mp_exch (&res, Y);
-  err = MP_OKAY;
-LBL_RES:mp_clear (&res);
-LBL_M:
-  mp_clear(&M[1]);
-  for (x = 1<<(winsize-1); x < (1 << winsize); x++) {
-    mp_clear (&M[x]);
-  }
-  return err;
-}
-#endif
-
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_exptmod_fast.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_exteuclid.c b/dep/StormLibOld/src/libtommath/bn_mp_exteuclid.c
deleted file mode 100644
index 9881d6edc..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_exteuclid.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_EXTEUCLID_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Extended euclidean algorithm of (a, b) produces 
-   a*u1 + b*u2 = u3
- */
-int mp_exteuclid(mp_int *a, mp_int *b, mp_int *U1, mp_int *U2, mp_int *U3)
-{
-   mp_int u1,u2,u3,v1,v2,v3,t1,t2,t3,q,tmp;
-   int err;
-
-   if ((err = mp_init_multi(&u1, &u2, &u3, &v1, &v2, &v3, &t1, &t2, &t3, &q, &tmp, NULL)) != MP_OKAY) {
-      return err;
-   }
-
-   /* initialize, (u1,u2,u3) = (1,0,a) */
-   mp_set(&u1, 1);
-   if ((err = mp_copy(a, &u3)) != MP_OKAY)                                        { goto _ERR; }
-
-   /* initialize, (v1,v2,v3) = (0,1,b) */
-   mp_set(&v2, 1);
-   if ((err = mp_copy(b, &v3)) != MP_OKAY)                                        { goto _ERR; }
-
-   /* loop while v3 != 0 */
-   while (mp_iszero(&v3) == MP_NO) {
-       /* q = u3/v3 */
-       if ((err = mp_div(&u3, &v3, &q, NULL)) != MP_OKAY)                         { goto _ERR; }
-
-       /* (t1,t2,t3) = (u1,u2,u3) - (v1,v2,v3)q */
-       if ((err = mp_mul(&v1, &q, &tmp)) != MP_OKAY)                              { goto _ERR; }
-       if ((err = mp_sub(&u1, &tmp, &t1)) != MP_OKAY)                             { goto _ERR; }
-       if ((err = mp_mul(&v2, &q, &tmp)) != MP_OKAY)                              { goto _ERR; }
-       if ((err = mp_sub(&u2, &tmp, &t2)) != MP_OKAY)                             { goto _ERR; }
-       if ((err = mp_mul(&v3, &q, &tmp)) != MP_OKAY)                              { goto _ERR; }
-       if ((err = mp_sub(&u3, &tmp, &t3)) != MP_OKAY)                             { goto _ERR; }
-
-       /* (u1,u2,u3) = (v1,v2,v3) */
-       if ((err = mp_copy(&v1, &u1)) != MP_OKAY)                                  { goto _ERR; }
-       if ((err = mp_copy(&v2, &u2)) != MP_OKAY)                                  { goto _ERR; }
-       if ((err = mp_copy(&v3, &u3)) != MP_OKAY)                                  { goto _ERR; }
-
-       /* (v1,v2,v3) = (t1,t2,t3) */
-       if ((err = mp_copy(&t1, &v1)) != MP_OKAY)                                  { goto _ERR; }
-       if ((err = mp_copy(&t2, &v2)) != MP_OKAY)                                  { goto _ERR; }
-       if ((err = mp_copy(&t3, &v3)) != MP_OKAY)                                  { goto _ERR; }
-   }
-
-   /* make sure U3 >= 0 */
-   if (u3.sign == MP_NEG) {
-      mp_neg(&u1, &u1);
-      mp_neg(&u2, &u2);
-      mp_neg(&u3, &u3);
-   }
-
-   /* copy result out */
-   if (U1 != NULL) { mp_exch(U1, &u1); }
-   if (U2 != NULL) { mp_exch(U2, &u2); }
-   if (U3 != NULL) { mp_exch(U3, &u3); }
-
-   err = MP_OKAY;
-_ERR: mp_clear_multi(&u1, &u2, &u3, &v1, &v2, &v3, &t1, &t2, &t3, &q, &tmp, NULL);
-   return err;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_exteuclid.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_fread.c b/dep/StormLibOld/src/libtommath/bn_mp_fread.c
deleted file mode 100644
index 2976b30aa..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_fread.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_FREAD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* read a bigint from a file stream in ASCII */
-int mp_fread(mp_int *a, int radix, FILE *stream)
-{
-   int err, ch, neg, y;
-   
-   /* clear a */
-   mp_zero(a);
-   
-   /* if first digit is - then set negative */
-   ch = fgetc(stream);
-   if (ch == '-') {
-      neg = MP_NEG;
-      ch = fgetc(stream);
-   } else {
-      neg = MP_ZPOS;
-   }
-   
-   for (;;) {
-      /* find y in the radix map */
-      for (y = 0; y < radix; y++) {
-          if (mp_s_rmap[y] == ch) {
-             break;
-          }
-      }
-      if (y == radix) {
-         break;
-      }
-      
-      /* shift up and add */
-      if ((err = mp_mul_d(a, radix, a)) != MP_OKAY) {
-         return err;
-      }
-      if ((err = mp_add_d(a, y, a)) != MP_OKAY) {
-         return err;
-      }
-      
-      ch = fgetc(stream);
-   }
-   if (mp_cmp_d(a, 0) != MP_EQ) {
-      a->sign = neg;
-   }
-   
-   return MP_OKAY;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_fread.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_fwrite.c b/dep/StormLibOld/src/libtommath/bn_mp_fwrite.c
deleted file mode 100644
index 6782b2e19..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_fwrite.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_FWRITE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-int mp_fwrite(mp_int *a, int radix, FILE *stream)
-{
-   char *buf;
-   int err, len, x;
-   
-   if ((err = mp_radix_size(a, radix, &len)) != MP_OKAY) {
-      return err;
-   }
-
-   buf = OPT_CAST(char) XMALLOC (len);
-   if (buf == NULL) {
-      return MP_MEM;
-   }
-   
-   if ((err = mp_toradix(a, buf, radix)) != MP_OKAY) {
-      XFREE (buf);
-      return err;
-   }
-   
-   for (x = 0; x < len; x++) {
-       if (fputc(buf[x], stream) == EOF) {
-          XFREE (buf);
-          return MP_VAL;
-       }
-   }
-   
-   XFREE (buf);
-   return MP_OKAY;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_fwrite.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_gcd.c b/dep/StormLibOld/src/libtommath/bn_mp_gcd.c
deleted file mode 100644
index ce980eb6b..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_gcd.c
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_GCD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Greatest Common Divisor using the binary method */
-int mp_gcd (mp_int * a, mp_int * b, mp_int * c)
-{
-  mp_int  u, v;
-  int     k, u_lsb, v_lsb, res;
-
-  /* either zero than gcd is the largest */
-  if (mp_iszero (a) == MP_YES) {
-    return mp_abs (b, c);
-  }
-  if (mp_iszero (b) == MP_YES) {
-    return mp_abs (a, c);
-  }
-
-  /* get copies of a and b we can modify */
-  if ((res = mp_init_copy (&u, a)) != MP_OKAY) {
-    return res;
-  }
-
-  if ((res = mp_init_copy (&v, b)) != MP_OKAY) {
-    goto LBL_U;
-  }
-
-  /* must be positive for the remainder of the algorithm */
-  u.sign = v.sign = MP_ZPOS;
-
-  /* B1.  Find the common power of two for u and v */
-  u_lsb = mp_cnt_lsb(&u);
-  v_lsb = mp_cnt_lsb(&v);
-  k     = MIN(u_lsb, v_lsb);
-
-  if (k > 0) {
-     /* divide the power of two out */
-     if ((res = mp_div_2d(&u, k, &u, NULL)) != MP_OKAY) {
-        goto LBL_V;
-     }
-
-     if ((res = mp_div_2d(&v, k, &v, NULL)) != MP_OKAY) {
-        goto LBL_V;
-     }
-  }
-
-  /* divide any remaining factors of two out */
-  if (u_lsb != k) {
-     if ((res = mp_div_2d(&u, u_lsb - k, &u, NULL)) != MP_OKAY) {
-        goto LBL_V;
-     }
-  }
-
-  if (v_lsb != k) {
-     if ((res = mp_div_2d(&v, v_lsb - k, &v, NULL)) != MP_OKAY) {
-        goto LBL_V;
-     }
-  }
-
-  while (mp_iszero(&v) == 0) {
-     /* make sure v is the largest */
-     if (mp_cmp_mag(&u, &v) == MP_GT) {
-        /* swap u and v to make sure v is >= u */
-        mp_exch(&u, &v);
-     }
-     
-     /* subtract smallest from largest */
-     if ((res = s_mp_sub(&v, &u, &v)) != MP_OKAY) {
-        goto LBL_V;
-     }
-     
-     /* Divide out all factors of two */
-     if ((res = mp_div_2d(&v, mp_cnt_lsb(&v), &v, NULL)) != MP_OKAY) {
-        goto LBL_V;
-     } 
-  } 
-
-  /* multiply by 2**k which we divided out at the beginning */
-  if ((res = mp_mul_2d (&u, k, c)) != MP_OKAY) {
-     goto LBL_V;
-  }
-  c->sign = MP_ZPOS;
-  res = MP_OKAY;
-LBL_V:mp_clear (&u);
-LBL_U:mp_clear (&v);
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_gcd.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_get_int.c b/dep/StormLibOld/src/libtommath/bn_mp_get_int.c
deleted file mode 100644
index d9c76d0d1..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_get_int.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_GET_INT_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* get the lower 32-bits of an mp_int */
-unsigned long mp_get_int(mp_int * a) 
-{
-  int i;
-  unsigned long res;
-
-  if (a->used == 0) {
-     return 0;
-  }
-
-  /* get number of digits of the lsb we have to read */
-  i = MIN(a->used,(int)((sizeof(unsigned long)*CHAR_BIT+DIGIT_BIT-1)/DIGIT_BIT))-1;
-
-  /* get most significant digit of result */
-  res = DIGIT(a,i);
-   
-  while (--i >= 0) {
-    res = (res << DIGIT_BIT) | DIGIT(a,i);
-  }
-
-  /* force result to 32-bits always so it is consistent on non 32-bit platforms */
-  return res & 0xFFFFFFFFUL;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_get_int.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_grow.c b/dep/StormLibOld/src/libtommath/bn_mp_grow.c
deleted file mode 100644
index a05dad73b..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_grow.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_GROW_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* grow as required */
-int mp_grow (mp_int * a, int size)
-{
-  int     i;
-  mp_digit *tmp;
-
-  /* if the alloc size is smaller alloc more ram */
-  if (a->alloc < size) {
-    /* ensure there are always at least MP_PREC digits extra on top */
-    size += (MP_PREC * 2) - (size % MP_PREC);
-
-    /* reallocate the array a->dp
-     *
-     * We store the return in a temporary variable
-     * in case the operation failed we don't want
-     * to overwrite the dp member of a.
-     */
-    tmp = OPT_CAST(mp_digit) XREALLOC (a->dp, sizeof (mp_digit) * size);
-    if (tmp == NULL) {
-      /* reallocation failed but "a" is still valid [can be freed] */
-      return MP_MEM;
-    }
-
-    /* reallocation succeeded so set a->dp */
-    a->dp = tmp;
-
-    /* zero excess digits */
-    i        = a->alloc;
-    a->alloc = size;
-    for (; i < a->alloc; i++) {
-      a->dp[i] = 0;
-    }
-  }
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_grow.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_init.c b/dep/StormLibOld/src/libtommath/bn_mp_init.c
deleted file mode 100644
index 107d98be6..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_init.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_INIT_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* init a new mp_int */
-int mp_init (mp_int * a)
-{
-  int i;
-
-  /* allocate memory required and clear it */
-  a->dp = OPT_CAST(mp_digit) XMALLOC (sizeof (mp_digit) * MP_PREC);
-  if (a->dp == NULL) {
-    return MP_MEM;
-  }
-
-  /* set the digits to zero */
-  for (i = 0; i < MP_PREC; i++) {
-      a->dp[i] = 0;
-  }
-
-  /* set the used to zero, allocated digits to the default precision
-   * and sign to positive */
-  a->used  = 0;
-  a->alloc = MP_PREC;
-  a->sign  = MP_ZPOS;
-
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_init.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_init_copy.c b/dep/StormLibOld/src/libtommath/bn_mp_init_copy.c
deleted file mode 100644
index 3ca1186ce..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_init_copy.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_INIT_COPY_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* creates "a" then copies b into it */
-int mp_init_copy (mp_int * a, mp_int * b)
-{
-  int     res;
-
-  if ((res = mp_init (a)) != MP_OKAY) {
-    return res;
-  }
-  return mp_copy (b, a);
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_init_copy.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_init_multi.c b/dep/StormLibOld/src/libtommath/bn_mp_init_multi.c
deleted file mode 100644
index 4f6f367ff..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_init_multi.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_INIT_MULTI_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#include <stdarg.h>
-
-int mp_init_multi(mp_int *mp, ...) 
-{
-    mp_err res = MP_OKAY;      /* Assume ok until proven otherwise */
-    int n = 0;                 /* Number of ok inits */
-    mp_int* cur_arg = mp;
-    va_list args;
-
-    va_start(args, mp);        /* init args to next argument from caller */
-    while (cur_arg != NULL) {
-        if (mp_init(cur_arg) != MP_OKAY) {
-            /* Oops - error! Back-track and mp_clear what we already
-               succeeded in init-ing, then return error.
-            */
-            va_list clean_args;
-            
-            /* end the current list */
-            va_end(args);
-            
-            /* now start cleaning up */            
-            cur_arg = mp;
-            va_start(clean_args, mp);
-            while (n--) {
-                mp_clear(cur_arg);
-                cur_arg = va_arg(clean_args, mp_int*);
-            }
-            va_end(clean_args);
-            res = MP_MEM;
-            break;
-        }
-        n++;
-        cur_arg = va_arg(args, mp_int*);
-    }
-    va_end(args);
-    return res;                /* Assumed ok, if error flagged above. */
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_init_multi.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_init_set.c b/dep/StormLibOld/src/libtommath/bn_mp_init_set.c
deleted file mode 100644
index 853323f3a..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_init_set.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_INIT_SET_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* initialize and set a digit */
-int mp_init_set (mp_int * a, mp_digit b)
-{
-  int err;
-  if ((err = mp_init(a)) != MP_OKAY) {
-     return err;
-  }
-  mp_set(a, b);
-  return err;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_init_set.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_init_set_int.c b/dep/StormLibOld/src/libtommath/bn_mp_init_set_int.c
deleted file mode 100644
index b2f8727e3..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_init_set_int.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_INIT_SET_INT_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* initialize and set a digit */
-int mp_init_set_int (mp_int * a, unsigned long b)
-{
-  int err;
-  if ((err = mp_init(a)) != MP_OKAY) {
-     return err;
-  }
-  return mp_set_int(a, b);
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_init_set_int.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_init_size.c b/dep/StormLibOld/src/libtommath/bn_mp_init_size.c
deleted file mode 100644
index 17b8d9fce..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_init_size.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_INIT_SIZE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* init an mp_init for a given size */
-int mp_init_size (mp_int * a, int size)
-{
-  int x;
-
-  /* pad size so there are always extra digits */
-  size += (MP_PREC * 2) - (size % MP_PREC);	
-  
-  /* alloc mem */
-  a->dp = OPT_CAST(mp_digit) XMALLOC (sizeof (mp_digit) * size);
-  if (a->dp == NULL) {
-    return MP_MEM;
-  }
-
-  /* set the members */
-  a->used  = 0;
-  a->alloc = size;
-  a->sign  = MP_ZPOS;
-
-  /* zero the digits */
-  for (x = 0; x < size; x++) {
-      a->dp[x] = 0;
-  }
-
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_init_size.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_invmod.c b/dep/StormLibOld/src/libtommath/bn_mp_invmod.c
deleted file mode 100644
index 038e584a2..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_invmod.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_INVMOD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* hac 14.61, pp608 */
-int mp_invmod (mp_int * a, mp_int * b, mp_int * c)
-{
-  /* b cannot be negative */
-  if (b->sign == MP_NEG || mp_iszero(b) == 1) {
-    return MP_VAL;
-  }
-
-#ifdef BN_FAST_MP_INVMOD_C
-  /* if the modulus is odd we can use a faster routine instead */
-  if (mp_isodd (b) == 1) {
-    return fast_mp_invmod (a, b, c);
-  }
-#endif
-
-#ifdef BN_MP_INVMOD_SLOW_C
-  return mp_invmod_slow(a, b, c);
-#endif
-
-  return MP_VAL;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_invmod.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_invmod_slow.c b/dep/StormLibOld/src/libtommath/bn_mp_invmod_slow.c
deleted file mode 100644
index 3792a4c23..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_invmod_slow.c
+++ /dev/null
@@ -1,175 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_INVMOD_SLOW_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* hac 14.61, pp608 */
-int mp_invmod_slow (mp_int * a, mp_int * b, mp_int * c)
-{
-  mp_int  x, y, u, v, A, B, C, D;
-  int     res;
-
-  /* b cannot be negative */
-  if (b->sign == MP_NEG || mp_iszero(b) == 1) {
-    return MP_VAL;
-  }
-
-  /* init temps */
-  if ((res = mp_init_multi(&x, &y, &u, &v, 
-                           &A, &B, &C, &D, NULL)) != MP_OKAY) {
-     return res;
-  }
-
-  /* x = a, y = b */
-  if ((res = mp_mod(a, b, &x)) != MP_OKAY) {
-      goto LBL_ERR;
-  }
-  if ((res = mp_copy (b, &y)) != MP_OKAY) {
-    goto LBL_ERR;
-  }
-
-  /* 2. [modified] if x,y are both even then return an error! */
-  if (mp_iseven (&x) == 1 && mp_iseven (&y) == 1) {
-    res = MP_VAL;
-    goto LBL_ERR;
-  }
-
-  /* 3. u=x, v=y, A=1, B=0, C=0,D=1 */
-  if ((res = mp_copy (&x, &u)) != MP_OKAY) {
-    goto LBL_ERR;
-  }
-  if ((res = mp_copy (&y, &v)) != MP_OKAY) {
-    goto LBL_ERR;
-  }
-  mp_set (&A, 1);
-  mp_set (&D, 1);
-
-top:
-  /* 4.  while u is even do */
-  while (mp_iseven (&u) == 1) {
-    /* 4.1 u = u/2 */
-    if ((res = mp_div_2 (&u, &u)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-    /* 4.2 if A or B is odd then */
-    if (mp_isodd (&A) == 1 || mp_isodd (&B) == 1) {
-      /* A = (A+y)/2, B = (B-x)/2 */
-      if ((res = mp_add (&A, &y, &A)) != MP_OKAY) {
-         goto LBL_ERR;
-      }
-      if ((res = mp_sub (&B, &x, &B)) != MP_OKAY) {
-         goto LBL_ERR;
-      }
-    }
-    /* A = A/2, B = B/2 */
-    if ((res = mp_div_2 (&A, &A)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-    if ((res = mp_div_2 (&B, &B)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-  }
-
-  /* 5.  while v is even do */
-  while (mp_iseven (&v) == 1) {
-    /* 5.1 v = v/2 */
-    if ((res = mp_div_2 (&v, &v)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-    /* 5.2 if C or D is odd then */
-    if (mp_isodd (&C) == 1 || mp_isodd (&D) == 1) {
-      /* C = (C+y)/2, D = (D-x)/2 */
-      if ((res = mp_add (&C, &y, &C)) != MP_OKAY) {
-         goto LBL_ERR;
-      }
-      if ((res = mp_sub (&D, &x, &D)) != MP_OKAY) {
-         goto LBL_ERR;
-      }
-    }
-    /* C = C/2, D = D/2 */
-    if ((res = mp_div_2 (&C, &C)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-    if ((res = mp_div_2 (&D, &D)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-  }
-
-  /* 6.  if u >= v then */
-  if (mp_cmp (&u, &v) != MP_LT) {
-    /* u = u - v, A = A - C, B = B - D */
-    if ((res = mp_sub (&u, &v, &u)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-
-    if ((res = mp_sub (&A, &C, &A)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-
-    if ((res = mp_sub (&B, &D, &B)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-  } else {
-    /* v - v - u, C = C - A, D = D - B */
-    if ((res = mp_sub (&v, &u, &v)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-
-    if ((res = mp_sub (&C, &A, &C)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-
-    if ((res = mp_sub (&D, &B, &D)) != MP_OKAY) {
-      goto LBL_ERR;
-    }
-  }
-
-  /* if not zero goto step 4 */
-  if (mp_iszero (&u) == 0)
-    goto top;
-
-  /* now a = C, b = D, gcd == g*v */
-
-  /* if v != 1 then there is no inverse */
-  if (mp_cmp_d (&v, 1) != MP_EQ) {
-    res = MP_VAL;
-    goto LBL_ERR;
-  }
-
-  /* if its too low */
-  while (mp_cmp_d(&C, 0) == MP_LT) {
-      if ((res = mp_add(&C, b, &C)) != MP_OKAY) {
-         goto LBL_ERR;
-      }
-  }
-  
-  /* too big */
-  while (mp_cmp_mag(&C, b) != MP_LT) {
-      if ((res = mp_sub(&C, b, &C)) != MP_OKAY) {
-         goto LBL_ERR;
-      }
-  }
-  
-  /* C is now the inverse */
-  mp_exch (&C, c);
-  res = MP_OKAY;
-LBL_ERR:mp_clear_multi (&x, &y, &u, &v, &A, &B, &C, &D, NULL);
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_invmod_slow.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_is_square.c b/dep/StormLibOld/src/libtommath/bn_mp_is_square.c
deleted file mode 100644
index 5d2fa072c..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_is_square.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_IS_SQUARE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Check if remainders are possible squares - fast exclude non-squares */
-static const char rem_128[128] = {
- 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
- 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
- 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
- 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
- 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
- 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
- 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1
-};
-
-static const char rem_105[105] = {
- 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1,
- 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1,
- 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1,
- 1, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1,
- 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1,
- 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1
-};
-
-/* Store non-zero to ret if arg is square, and zero if not */
-int mp_is_square(mp_int *arg,int *ret) 
-{
-  int           res;
-  mp_digit      c;
-  mp_int        t;
-  unsigned long r;
-
-  /* Default to Non-square :) */
-  *ret = MP_NO; 
-
-  if (arg->sign == MP_NEG) {
-    return MP_VAL;
-  }
-
-  /* digits used?  (TSD) */
-  if (arg->used == 0) {
-     return MP_OKAY;
-  }
-
-  /* First check mod 128 (suppose that DIGIT_BIT is at least 7) */
-  if (rem_128[127 & DIGIT(arg,0)] == 1) {
-     return MP_OKAY;
-  }
-
-  /* Next check mod 105 (3*5*7) */
-  if ((res = mp_mod_d(arg,105,&c)) != MP_OKAY) {
-     return res;
-  }
-  if (rem_105[c] == 1) {
-     return MP_OKAY;
-  }
-
-
-  if ((res = mp_init_set_int(&t,11L*13L*17L*19L*23L*29L*31L)) != MP_OKAY) {
-     return res;
-  }
-  if ((res = mp_mod(arg,&t,&t)) != MP_OKAY) {
-     goto ERR;
-  }
-  r = mp_get_int(&t);
-  /* Check for other prime modules, note it's not an ERROR but we must
-   * free "t" so the easiest way is to goto ERR.  We know that res
-   * is already equal to MP_OKAY from the mp_mod call 
-   */ 
-  if ( (1L<<(r%11)) & 0x5C4L )             goto ERR;
-  if ( (1L<<(r%13)) & 0x9E4L )             goto ERR;
-  if ( (1L<<(r%17)) & 0x5CE8L )            goto ERR;
-  if ( (1L<<(r%19)) & 0x4F50CL )           goto ERR;
-  if ( (1L<<(r%23)) & 0x7ACCA0L )          goto ERR;
-  if ( (1L<<(r%29)) & 0xC2EDD0CL )         goto ERR;
-  if ( (1L<<(r%31)) & 0x6DE2B848L )        goto ERR;
-
-  /* Final check - is sqr(sqrt(arg)) == arg ? */
-  if ((res = mp_sqrt(arg,&t)) != MP_OKAY) {
-     goto ERR;
-  }
-  if ((res = mp_sqr(&t,&t)) != MP_OKAY) {
-     goto ERR;
-  }
-
-  *ret = (mp_cmp_mag(&t,arg) == MP_EQ) ? MP_YES : MP_NO;
-ERR:mp_clear(&t);
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_is_square.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_jacobi.c b/dep/StormLibOld/src/libtommath/bn_mp_jacobi.c
deleted file mode 100644
index c70b946f3..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_jacobi.c
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_JACOBI_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* computes the jacobi c = (a | n) (or Legendre if n is prime)
- * HAC pp. 73 Algorithm 2.149
- */
-int mp_jacobi (mp_int * a, mp_int * p, int *c)
-{
-  mp_int  a1, p1;
-  int     k, s, r, res;
-  mp_digit residue;
-
-  /* if p <= 0 return MP_VAL */
-  if (mp_cmp_d(p, 0) != MP_GT) {
-     return MP_VAL;
-  }
-
-  /* step 1.  if a == 0, return 0 */
-  if (mp_iszero (a) == 1) {
-    *c = 0;
-    return MP_OKAY;
-  }
-
-  /* step 2.  if a == 1, return 1 */
-  if (mp_cmp_d (a, 1) == MP_EQ) {
-    *c = 1;
-    return MP_OKAY;
-  }
-
-  /* default */
-  s = 0;
-
-  /* step 3.  write a = a1 * 2**k  */
-  if ((res = mp_init_copy (&a1, a)) != MP_OKAY) {
-    return res;
-  }
-
-  if ((res = mp_init (&p1)) != MP_OKAY) {
-    goto LBL_A1;
-  }
-
-  /* divide out larger power of two */
-  k = mp_cnt_lsb(&a1);
-  if ((res = mp_div_2d(&a1, k, &a1, NULL)) != MP_OKAY) {
-     goto LBL_P1;
-  }
-
-  /* step 4.  if e is even set s=1 */
-  if ((k & 1) == 0) {
-    s = 1;
-  } else {
-    /* else set s=1 if p = 1/7 (mod 8) or s=-1 if p = 3/5 (mod 8) */
-    residue = p->dp[0] & 7;
-
-    if (residue == 1 || residue == 7) {
-      s = 1;
-    } else if (residue == 3 || residue == 5) {
-      s = -1;
-    }
-  }
-
-  /* step 5.  if p == 3 (mod 4) *and* a1 == 3 (mod 4) then s = -s */
-  if ( ((p->dp[0] & 3) == 3) && ((a1.dp[0] & 3) == 3)) {
-    s = -s;
-  }
-
-  /* if a1 == 1 we're done */
-  if (mp_cmp_d (&a1, 1) == MP_EQ) {
-    *c = s;
-  } else {
-    /* n1 = n mod a1 */
-    if ((res = mp_mod (p, &a1, &p1)) != MP_OKAY) {
-      goto LBL_P1;
-    }
-    if ((res = mp_jacobi (&p1, &a1, &r)) != MP_OKAY) {
-      goto LBL_P1;
-    }
-    *c = s * r;
-  }
-
-  /* done */
-  res = MP_OKAY;
-LBL_P1:mp_clear (&p1);
-LBL_A1:mp_clear (&a1);
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_jacobi.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_karatsuba_mul.c b/dep/StormLibOld/src/libtommath/bn_mp_karatsuba_mul.c
deleted file mode 100644
index b15ec2496..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_karatsuba_mul.c
+++ /dev/null
@@ -1,167 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_KARATSUBA_MUL_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* c = |a| * |b| using Karatsuba Multiplication using 
- * three half size multiplications
- *
- * Let B represent the radix [e.g. 2**DIGIT_BIT] and 
- * let n represent half of the number of digits in 
- * the min(a,b)
- *
- * a = a1 * B**n + a0
- * b = b1 * B**n + b0
- *
- * Then, a * b => 
-   a1b1 * B**2n + ((a1 + a0)(b1 + b0) - (a0b0 + a1b1)) * B + a0b0
- *
- * Note that a1b1 and a0b0 are used twice and only need to be 
- * computed once.  So in total three half size (half # of 
- * digit) multiplications are performed, a0b0, a1b1 and 
- * (a1+b1)(a0+b0)
- *
- * Note that a multiplication of half the digits requires
- * 1/4th the number of single precision multiplications so in 
- * total after one call 25% of the single precision multiplications 
- * are saved.  Note also that the call to mp_mul can end up back 
- * in this function if the a0, a1, b0, or b1 are above the threshold.  
- * This is known as divide-and-conquer and leads to the famous 
- * O(N**lg(3)) or O(N**1.584) work which is asymptopically lower than 
- * the standard O(N**2) that the baseline/comba methods use.  
- * Generally though the overhead of this method doesn't pay off 
- * until a certain size (N ~ 80) is reached.
- */
-int mp_karatsuba_mul (mp_int * a, mp_int * b, mp_int * c)
-{
-  mp_int  x0, x1, y0, y1, t1, x0y0, x1y1;
-  int     B, err;
-
-  /* default the return code to an error */
-  err = MP_MEM;
-
-  /* min # of digits */
-  B = MIN (a->used, b->used);
-
-  /* now divide in two */
-  B = B >> 1;
-
-  /* init copy all the temps */
-  if (mp_init_size (&x0, B) != MP_OKAY)
-    goto ERR;
-  if (mp_init_size (&x1, a->used - B) != MP_OKAY)
-    goto X0;
-  if (mp_init_size (&y0, B) != MP_OKAY)
-    goto X1;
-  if (mp_init_size (&y1, b->used - B) != MP_OKAY)
-    goto Y0;
-
-  /* init temps */
-  if (mp_init_size (&t1, B * 2) != MP_OKAY)
-    goto Y1;
-  if (mp_init_size (&x0y0, B * 2) != MP_OKAY)
-    goto T1;
-  if (mp_init_size (&x1y1, B * 2) != MP_OKAY)
-    goto X0Y0;
-
-  /* now shift the digits */
-  x0.used = y0.used = B;
-  x1.used = a->used - B;
-  y1.used = b->used - B;
-
-  {
-    register int x;
-    register mp_digit *tmpa, *tmpb, *tmpx, *tmpy;
-
-    /* we copy the digits directly instead of using higher level functions
-     * since we also need to shift the digits
-     */
-    tmpa = a->dp;
-    tmpb = b->dp;
-
-    tmpx = x0.dp;
-    tmpy = y0.dp;
-    for (x = 0; x < B; x++) {
-      *tmpx++ = *tmpa++;
-      *tmpy++ = *tmpb++;
-    }
-
-    tmpx = x1.dp;
-    for (x = B; x < a->used; x++) {
-      *tmpx++ = *tmpa++;
-    }
-
-    tmpy = y1.dp;
-    for (x = B; x < b->used; x++) {
-      *tmpy++ = *tmpb++;
-    }
-  }
-
-  /* only need to clamp the lower words since by definition the 
-   * upper words x1/y1 must have a known number of digits
-   */
-  mp_clamp (&x0);
-  mp_clamp (&y0);
-
-  /* now calc the products x0y0 and x1y1 */
-  /* after this x0 is no longer required, free temp [x0==t2]! */
-  if (mp_mul (&x0, &y0, &x0y0) != MP_OKAY)  
-    goto X1Y1;          /* x0y0 = x0*y0 */
-  if (mp_mul (&x1, &y1, &x1y1) != MP_OKAY)
-    goto X1Y1;          /* x1y1 = x1*y1 */
-
-  /* now calc x1+x0 and y1+y0 */
-  if (s_mp_add (&x1, &x0, &t1) != MP_OKAY)
-    goto X1Y1;          /* t1 = x1 - x0 */
-  if (s_mp_add (&y1, &y0, &x0) != MP_OKAY)
-    goto X1Y1;          /* t2 = y1 - y0 */
-  if (mp_mul (&t1, &x0, &t1) != MP_OKAY)
-    goto X1Y1;          /* t1 = (x1 + x0) * (y1 + y0) */
-
-  /* add x0y0 */
-  if (mp_add (&x0y0, &x1y1, &x0) != MP_OKAY)
-    goto X1Y1;          /* t2 = x0y0 + x1y1 */
-  if (s_mp_sub (&t1, &x0, &t1) != MP_OKAY)
-    goto X1Y1;          /* t1 = (x1+x0)*(y1+y0) - (x1y1 + x0y0) */
-
-  /* shift by B */
-  if (mp_lshd (&t1, B) != MP_OKAY)
-    goto X1Y1;          /* t1 = (x0y0 + x1y1 - (x1-x0)*(y1-y0))<<B */
-  if (mp_lshd (&x1y1, B * 2) != MP_OKAY)
-    goto X1Y1;          /* x1y1 = x1y1 << 2*B */
-
-  if (mp_add (&x0y0, &t1, &t1) != MP_OKAY)
-    goto X1Y1;          /* t1 = x0y0 + t1 */
-  if (mp_add (&t1, &x1y1, c) != MP_OKAY)
-    goto X1Y1;          /* t1 = x0y0 + t1 + x1y1 */
-
-  /* Algorithm succeeded set the return code to MP_OKAY */
-  err = MP_OKAY;
-
-X1Y1:mp_clear (&x1y1);
-X0Y0:mp_clear (&x0y0);
-T1:mp_clear (&t1);
-Y1:mp_clear (&y1);
-Y0:mp_clear (&y0);
-X1:mp_clear (&x1);
-X0:mp_clear (&x0);
-ERR:
-  return err;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_karatsuba_mul.c,v $ */
-/* $Revision: 1.6 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_karatsuba_sqr.c b/dep/StormLibOld/src/libtommath/bn_mp_karatsuba_sqr.c
deleted file mode 100644
index b3a45abf7..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_karatsuba_sqr.c
+++ /dev/null
@@ -1,121 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_KARATSUBA_SQR_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Karatsuba squaring, computes b = a*a using three 
- * half size squarings
- *
- * See comments of karatsuba_mul for details.  It 
- * is essentially the same algorithm but merely 
- * tuned to perform recursive squarings.
- */
-int mp_karatsuba_sqr (mp_int * a, mp_int * b)
-{
-  mp_int  x0, x1, t1, t2, x0x0, x1x1;
-  int     B, err;
-
-  err = MP_MEM;
-
-  /* min # of digits */
-  B = a->used;
-
-  /* now divide in two */
-  B = B >> 1;
-
-  /* init copy all the temps */
-  if (mp_init_size (&x0, B) != MP_OKAY)
-    goto ERR;
-  if (mp_init_size (&x1, a->used - B) != MP_OKAY)
-    goto X0;
-
-  /* init temps */
-  if (mp_init_size (&t1, a->used * 2) != MP_OKAY)
-    goto X1;
-  if (mp_init_size (&t2, a->used * 2) != MP_OKAY)
-    goto T1;
-  if (mp_init_size (&x0x0, B * 2) != MP_OKAY)
-    goto T2;
-  if (mp_init_size (&x1x1, (a->used - B) * 2) != MP_OKAY)
-    goto X0X0;
-
-  {
-    register int x;
-    register mp_digit *dst, *src;
-
-    src = a->dp;
-
-    /* now shift the digits */
-    dst = x0.dp;
-    for (x = 0; x < B; x++) {
-      *dst++ = *src++;
-    }
-
-    dst = x1.dp;
-    for (x = B; x < a->used; x++) {
-      *dst++ = *src++;
-    }
-  }
-
-  x0.used = B;
-  x1.used = a->used - B;
-
-  mp_clamp (&x0);
-
-  /* now calc the products x0*x0 and x1*x1 */
-  if (mp_sqr (&x0, &x0x0) != MP_OKAY)
-    goto X1X1;           /* x0x0 = x0*x0 */
-  if (mp_sqr (&x1, &x1x1) != MP_OKAY)
-    goto X1X1;           /* x1x1 = x1*x1 */
-
-  /* now calc (x1+x0)**2 */
-  if (s_mp_add (&x1, &x0, &t1) != MP_OKAY)
-    goto X1X1;           /* t1 = x1 - x0 */
-  if (mp_sqr (&t1, &t1) != MP_OKAY)
-    goto X1X1;           /* t1 = (x1 - x0) * (x1 - x0) */
-
-  /* add x0y0 */
-  if (s_mp_add (&x0x0, &x1x1, &t2) != MP_OKAY)
-    goto X1X1;           /* t2 = x0x0 + x1x1 */
-  if (s_mp_sub (&t1, &t2, &t1) != MP_OKAY)
-    goto X1X1;           /* t1 = (x1+x0)**2 - (x0x0 + x1x1) */
-
-  /* shift by B */
-  if (mp_lshd (&t1, B) != MP_OKAY)
-    goto X1X1;           /* t1 = (x0x0 + x1x1 - (x1-x0)*(x1-x0))<<B */
-  if (mp_lshd (&x1x1, B * 2) != MP_OKAY)
-    goto X1X1;           /* x1x1 = x1x1 << 2*B */
-
-  if (mp_add (&x0x0, &t1, &t1) != MP_OKAY)
-    goto X1X1;           /* t1 = x0x0 + t1 */
-  if (mp_add (&t1, &x1x1, b) != MP_OKAY)
-    goto X1X1;           /* t1 = x0x0 + t1 + x1x1 */
-
-  err = MP_OKAY;
-
-X1X1:mp_clear (&x1x1);
-X0X0:mp_clear (&x0x0);
-T2:mp_clear (&t2);
-T1:mp_clear (&t1);
-X1:mp_clear (&x1);
-X0:mp_clear (&x0);
-ERR:
-  return err;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_karatsuba_sqr.c,v $ */
-/* $Revision: 1.6 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_lcm.c b/dep/StormLibOld/src/libtommath/bn_mp_lcm.c
deleted file mode 100644
index af7ae2372..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_lcm.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_LCM_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* computes least common multiple as |a*b|/(a, b) */
-int mp_lcm (mp_int * a, mp_int * b, mp_int * c)
-{
-  int     res;
-  mp_int  t1, t2;
-
-
-  if ((res = mp_init_multi (&t1, &t2, NULL)) != MP_OKAY) {
-    return res;
-  }
-
-  /* t1 = get the GCD of the two inputs */
-  if ((res = mp_gcd (a, b, &t1)) != MP_OKAY) {
-    goto LBL_T;
-  }
-
-  /* divide the smallest by the GCD */
-  if (mp_cmp_mag(a, b) == MP_LT) {
-     /* store quotient in t2 such that t2 * b is the LCM */
-     if ((res = mp_div(a, &t1, &t2, NULL)) != MP_OKAY) {
-        goto LBL_T;
-     }
-     res = mp_mul(b, &t2, c);
-  } else {
-     /* store quotient in t2 such that t2 * a is the LCM */
-     if ((res = mp_div(b, &t1, &t2, NULL)) != MP_OKAY) {
-        goto LBL_T;
-     }
-     res = mp_mul(a, &t2, c);
-  }
-
-  /* fix the sign to positive */
-  c->sign = MP_ZPOS;
-
-LBL_T:
-  mp_clear_multi (&t1, &t2, NULL);
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_lcm.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_lshd.c b/dep/StormLibOld/src/libtommath/bn_mp_lshd.c
deleted file mode 100644
index ffb0defd0..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_lshd.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_LSHD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* shift left a certain amount of digits */
-int mp_lshd (mp_int * a, int b)
-{
-  int     x, res;
-
-  /* if its less than zero return */
-  if (b <= 0) {
-    return MP_OKAY;
-  }
-
-  /* grow to fit the new digits */
-  if (a->alloc < a->used + b) {
-     if ((res = mp_grow (a, a->used + b)) != MP_OKAY) {
-       return res;
-     }
-  }
-
-  {
-    register mp_digit *top, *bottom;
-
-    /* increment the used by the shift amount then copy upwards */
-    a->used += b;
-
-    /* top */
-    top = a->dp + a->used - 1;
-
-    /* base */
-    bottom = a->dp + a->used - 1 - b;
-
-    /* much like mp_rshd this is implemented using a sliding window
-     * except the window goes the otherway around.  Copying from
-     * the bottom to the top.  see bn_mp_rshd.c for more info.
-     */
-    for (x = a->used - 1; x >= b; x--) {
-      *top-- = *bottom--;
-    }
-
-    /* zero the lower digits */
-    top = a->dp;
-    for (x = 0; x < b; x++) {
-      *top++ = 0;
-    }
-  }
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_lshd.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_mod.c b/dep/StormLibOld/src/libtommath/bn_mp_mod.c
deleted file mode 100644
index b24c71f9d..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_mod.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_MOD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* c = a mod b, 0 <= c < b */
-int
-mp_mod (mp_int * a, mp_int * b, mp_int * c)
-{
-  mp_int  t;
-  int     res;
-
-  if ((res = mp_init (&t)) != MP_OKAY) {
-    return res;
-  }
-
-  if ((res = mp_div (a, b, NULL, &t)) != MP_OKAY) {
-    mp_clear (&t);
-    return res;
-  }
-
-  if (t.sign != b->sign) {
-    res = mp_add (b, &t, c);
-  } else {
-    res = MP_OKAY;
-    mp_exch (&t, c);
-  }
-
-  mp_clear (&t);
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_mod.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_mod_2d.c b/dep/StormLibOld/src/libtommath/bn_mp_mod_2d.c
deleted file mode 100644
index a54a02426..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_mod_2d.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_MOD_2D_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* calc a value mod 2**b */
-int
-mp_mod_2d (mp_int * a, int b, mp_int * c)
-{
-  int     x, res;
-
-  /* if b is <= 0 then zero the int */
-  if (b <= 0) {
-    mp_zero (c);
-    return MP_OKAY;
-  }
-
-  /* if the modulus is larger than the value than return */
-  if (b >= (int) (a->used * DIGIT_BIT)) {
-    res = mp_copy (a, c);
-    return res;
-  }
-
-  /* copy */
-  if ((res = mp_copy (a, c)) != MP_OKAY) {
-    return res;
-  }
-
-  /* zero digits above the last digit of the modulus */
-  for (x = (b / DIGIT_BIT) + ((b % DIGIT_BIT) == 0 ? 0 : 1); x < c->used; x++) {
-    c->dp[x] = 0;
-  }
-  /* clear the digit that is not completely outside/inside the modulus */
-  c->dp[b / DIGIT_BIT] &=
-    (mp_digit) ((((mp_digit) 1) << (((mp_digit) b) % DIGIT_BIT)) - ((mp_digit) 1));
-  mp_clamp (c);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_mod_2d.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_mod_d.c b/dep/StormLibOld/src/libtommath/bn_mp_mod_d.c
deleted file mode 100644
index 59886e773..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_mod_d.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_MOD_D_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-int
-mp_mod_d (mp_int * a, mp_digit b, mp_digit * c)
-{
-  return mp_div_d(a, b, NULL, c);
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_mod_d.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_montgomery_calc_normalization.c b/dep/StormLibOld/src/libtommath/bn_mp_montgomery_calc_normalization.c
deleted file mode 100644
index fdefcbd99..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_montgomery_calc_normalization.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_MONTGOMERY_CALC_NORMALIZATION_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/*
- * shifts with subtractions when the result is greater than b.
- *
- * The method is slightly modified to shift B unconditionally upto just under
- * the leading bit of b.  This saves alot of multiple precision shifting.
- */
-int mp_montgomery_calc_normalization (mp_int * a, mp_int * b)
-{
-  int     x, bits, res;
-
-  /* how many bits of last digit does b use */
-  bits = mp_count_bits (b) % DIGIT_BIT;
-
-  if (b->used > 1) {
-     if ((res = mp_2expt (a, (b->used - 1) * DIGIT_BIT + bits - 1)) != MP_OKAY) {
-        return res;
-     }
-  } else {
-     mp_set(a, 1);
-     bits = 1;
-  }
-
-
-  /* now compute C = A * B mod b */
-  for (x = bits - 1; x < (int)DIGIT_BIT; x++) {
-    if ((res = mp_mul_2 (a, a)) != MP_OKAY) {
-      return res;
-    }
-    if (mp_cmp_mag (a, b) != MP_LT) {
-      if ((res = s_mp_sub (a, b, a)) != MP_OKAY) {
-        return res;
-      }
-    }
-  }
-
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_montgomery_calc_normalization.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_montgomery_reduce.c b/dep/StormLibOld/src/libtommath/bn_mp_montgomery_reduce.c
deleted file mode 100644
index 173848e0a..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_montgomery_reduce.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_MONTGOMERY_REDUCE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* computes xR**-1 == x (mod N) via Montgomery Reduction */
-int
-mp_montgomery_reduce (mp_int * x, mp_int * n, mp_digit rho)
-{
-  int     ix, res, digs;
-  mp_digit mu;
-
-  /* can the fast reduction [comba] method be used?
-   *
-   * Note that unlike in mul you're safely allowed *less*
-   * than the available columns [255 per default] since carries
-   * are fixed up in the inner loop.
-   */
-  digs = n->used * 2 + 1;
-  if ((digs < MP_WARRAY) &&
-      n->used <
-      (1 << ((CHAR_BIT * sizeof (mp_word)) - (2 * DIGIT_BIT)))) {
-    return fast_mp_montgomery_reduce (x, n, rho);
-  }
-
-  /* grow the input as required */
-  if (x->alloc < digs) {
-    if ((res = mp_grow (x, digs)) != MP_OKAY) {
-      return res;
-    }
-  }
-  x->used = digs;
-
-  for (ix = 0; ix < n->used; ix++) {
-    /* mu = ai * rho mod b
-     *
-     * The value of rho must be precalculated via
-     * montgomery_setup() such that
-     * it equals -1/n0 mod b this allows the
-     * following inner loop to reduce the
-     * input one digit at a time
-     */
-    mu = (mp_digit) (((mp_word)x->dp[ix]) * ((mp_word)rho) & MP_MASK);
-
-    /* a = a + mu * m * b**i */
-    {
-      register int iy;
-      register mp_digit *tmpn, *tmpx, u;
-      register mp_word r;
-
-      /* alias for digits of the modulus */
-      tmpn = n->dp;
-
-      /* alias for the digits of x [the input] */
-      tmpx = x->dp + ix;
-
-      /* set the carry to zero */
-      u = 0;
-
-      /* Multiply and add in place */
-      for (iy = 0; iy < n->used; iy++) {
-        /* compute product and sum */
-        r       = ((mp_word)mu) * ((mp_word)*tmpn++) +
-                  ((mp_word) u) + ((mp_word) * tmpx);
-
-        /* get carry */
-        u       = (mp_digit)(r >> ((mp_word) DIGIT_BIT));
-
-        /* fix digit */
-        *tmpx++ = (mp_digit)(r & ((mp_word) MP_MASK));
-      }
-      /* At this point the ix'th digit of x should be zero */
-
-
-      /* propagate carries upwards as required*/
-      while (u) {
-        *tmpx   += u;
-        u        = *tmpx >> DIGIT_BIT;
-        *tmpx++ &= MP_MASK;
-      }
-    }
-  }
-
-  /* at this point the n.used'th least
-   * significant digits of x are all zero
-   * which means we can shift x to the
-   * right by n.used digits and the
-   * residue is unchanged.
-   */
-
-  /* x = x/b**n.used */
-  mp_clamp(x);
-  mp_rshd (x, n->used);
-
-  /* if x >= n then x = x - n */
-  if (mp_cmp_mag (x, n) != MP_LT) {
-    return s_mp_sub (x, n, x);
-  }
-
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_montgomery_reduce.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_montgomery_setup.c b/dep/StormLibOld/src/libtommath/bn_mp_montgomery_setup.c
deleted file mode 100644
index 6f277320e..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_montgomery_setup.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_MONTGOMERY_SETUP_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* setups the montgomery reduction stuff */
-int
-mp_montgomery_setup (mp_int * n, mp_digit * rho)
-{
-  mp_digit x, b;
-
-/* fast inversion mod 2**k
- *
- * Based on the fact that
- *
- * XA = 1 (mod 2**n)  =>  (X(2-XA)) A = 1 (mod 2**2n)
- *                    =>  2*X*A - X*X*A*A = 1
- *                    =>  2*(1) - (1)     = 1
- */
-  b = n->dp[0];
-
-  if ((b & 1) == 0) {
-    return MP_VAL;
-  }
-
-  x = (((b + 2) & 4) << 1) + b; /* here x*a==1 mod 2**4 */
-  x *= 2 - b * x;               /* here x*a==1 mod 2**8 */
-#if !defined(MP_8BIT)
-  x *= 2 - b * x;               /* here x*a==1 mod 2**16 */
-#endif
-#if defined(MP_64BIT) || !(defined(MP_8BIT) || defined(MP_16BIT))
-  x *= 2 - b * x;               /* here x*a==1 mod 2**32 */
-#endif
-#ifdef MP_64BIT
-  x *= 2 - b * x;               /* here x*a==1 mod 2**64 */
-#endif
-
-  /* rho = -1/m mod b */
-  *rho = (unsigned long)(((mp_word)1 << ((mp_word) DIGIT_BIT)) - x) & MP_MASK;
-
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_montgomery_setup.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_mul.c b/dep/StormLibOld/src/libtommath/bn_mp_mul.c
deleted file mode 100644
index a1315dac3..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_mul.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_MUL_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* high level multiplication (handles sign) */
-int mp_mul (mp_int * a, mp_int * b, mp_int * c)
-{
-  int     res, neg;
-  neg = (a->sign == b->sign) ? MP_ZPOS : MP_NEG;
-
-  /* use Toom-Cook? */
-#ifdef BN_MP_TOOM_MUL_C
-  if (MIN (a->used, b->used) >= TOOM_MUL_CUTOFF) {
-    res = mp_toom_mul(a, b, c);
-  } else 
-#endif
-#ifdef BN_MP_KARATSUBA_MUL_C
-  /* use Karatsuba? */
-  if (MIN (a->used, b->used) >= KARATSUBA_MUL_CUTOFF) {
-    res = mp_karatsuba_mul (a, b, c);
-  } else 
-#endif
-  {
-    /* can we use the fast multiplier?
-     *
-     * The fast multiplier can be used if the output will 
-     * have less than MP_WARRAY digits and the number of 
-     * digits won't affect carry propagation
-     */
-    int     digs = a->used + b->used + 1;
-
-#ifdef BN_FAST_S_MP_MUL_DIGS_C
-    if ((digs < MP_WARRAY) &&
-        MIN(a->used, b->used) <= 
-        (1 << ((CHAR_BIT * sizeof (mp_word)) - (2 * DIGIT_BIT)))) {
-      res = fast_s_mp_mul_digs (a, b, c, digs);
-    } else 
-#endif
-#ifdef BN_S_MP_MUL_DIGS_C
-      res = s_mp_mul (a, b, c); /* uses s_mp_mul_digs */
-#else
-      res = MP_VAL;
-#endif
-
-  }
-  c->sign = (c->used > 0) ? neg : MP_ZPOS;
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_mul.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_mul_2.c b/dep/StormLibOld/src/libtommath/bn_mp_mul_2.c
deleted file mode 100644
index 3315744f1..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_mul_2.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_MUL_2_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* b = a*2 */
-int mp_mul_2(mp_int * a, mp_int * b)
-{
-  int     x, res, oldused;
-
-  /* grow to accomodate result */
-  if (b->alloc < a->used + 1) {
-    if ((res = mp_grow (b, a->used + 1)) != MP_OKAY) {
-      return res;
-    }
-  }
-
-  oldused = b->used;
-  b->used = a->used;
-
-  {
-    register mp_digit r, rr, *tmpa, *tmpb;
-
-    /* alias for source */
-    tmpa = a->dp;
-    
-    /* alias for dest */
-    tmpb = b->dp;
-
-    /* carry */
-    r = 0;
-    for (x = 0; x < a->used; x++) {
-    
-      /* get what will be the *next* carry bit from the 
-       * MSB of the current digit 
-       */
-      rr = *tmpa >> ((mp_digit)(DIGIT_BIT - 1));
-      
-      /* now shift up this digit, add in the carry [from the previous] */
-      *tmpb++ = ((*tmpa++ << ((mp_digit)1)) | r) & MP_MASK;
-      
-      /* copy the carry that would be from the source 
-       * digit into the next iteration 
-       */
-      r = rr;
-    }
-
-    /* new leading digit? */
-    if (r != 0) {
-      /* add a MSB which is always 1 at this point */
-      *tmpb = 1;
-      ++(b->used);
-    }
-
-    /* now zero any excess digits on the destination 
-     * that we didn't write to 
-     */
-    tmpb = b->dp + b->used;
-    for (x = b->used; x < oldused; x++) {
-      *tmpb++ = 0;
-    }
-  }
-  b->sign = a->sign;
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_mul_2.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_mul_2d.c b/dep/StormLibOld/src/libtommath/bn_mp_mul_2d.c
deleted file mode 100644
index c636c1798..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_mul_2d.c
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_MUL_2D_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* shift left by a certain bit count */
-int mp_mul_2d (mp_int * a, int b, mp_int * c)
-{
-  mp_digit d;
-  int      res;
-
-  /* copy */
-  if (a != c) {
-     if ((res = mp_copy (a, c)) != MP_OKAY) {
-       return res;
-     }
-  }
-
-  if (c->alloc < (int)(c->used + b/DIGIT_BIT + 1)) {
-     if ((res = mp_grow (c, c->used + b / DIGIT_BIT + 1)) != MP_OKAY) {
-       return res;
-     }
-  }
-
-  /* shift by as many digits in the bit count */
-  if (b >= (int)DIGIT_BIT) {
-    if ((res = mp_lshd (c, b / DIGIT_BIT)) != MP_OKAY) {
-      return res;
-    }
-  }
-
-  /* shift any bit count < DIGIT_BIT */
-  d = (mp_digit) (b % DIGIT_BIT);
-  if (d != 0) {
-    register mp_digit *tmpc, shift, mask, r, rr;
-    register int x;
-
-    /* bitmask for carries */
-    mask = (((mp_digit)1) << d) - 1;
-
-    /* shift for msbs */
-    shift = DIGIT_BIT - d;
-
-    /* alias */
-    tmpc = c->dp;
-
-    /* carry */
-    r    = 0;
-    for (x = 0; x < c->used; x++) {
-      /* get the higher bits of the current word */
-      rr = (*tmpc >> shift) & mask;
-
-      /* shift the current word and OR in the carry */
-      *tmpc = ((*tmpc << d) | r) & MP_MASK;
-      ++tmpc;
-
-      /* set the carry to the carry bits of the current word */
-      r = rr;
-    }
-    
-    /* set final carry */
-    if (r != 0) {
-       c->dp[(c->used)++] = r;
-    }
-  }
-  mp_clamp (c);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_mul_2d.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_mul_d.c b/dep/StormLibOld/src/libtommath/bn_mp_mul_d.c
deleted file mode 100644
index a36a76bba..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_mul_d.c
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_MUL_D_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* multiply by a digit */
-int
-mp_mul_d (mp_int * a, mp_digit b, mp_int * c)
-{
-  mp_digit u, *tmpa, *tmpc;
-  mp_word  r;
-  int      ix, res, olduse;
-
-  /* make sure c is big enough to hold a*b */
-  if (c->alloc < a->used + 1) {
-    if ((res = mp_grow (c, a->used + 1)) != MP_OKAY) {
-      return res;
-    }
-  }
-
-  /* get the original destinations used count */
-  olduse = c->used;
-
-  /* set the sign */
-  c->sign = a->sign;
-
-  /* alias for a->dp [source] */
-  tmpa = a->dp;
-
-  /* alias for c->dp [dest] */
-  tmpc = c->dp;
-
-  /* zero carry */
-  u = 0;
-
-  /* compute columns */
-  for (ix = 0; ix < a->used; ix++) {
-    /* compute product and carry sum for this term */
-    r       = ((mp_word) u) + ((mp_word)*tmpa++) * ((mp_word)b);
-
-    /* mask off higher bits to get a single digit */
-    *tmpc++ = (mp_digit) (r & ((mp_word) MP_MASK));
-
-    /* send carry into next iteration */
-    u       = (mp_digit) (r >> ((mp_word) DIGIT_BIT));
-  }
-
-  /* store final carry [if any] and increment ix offset  */
-  *tmpc++ = u;
-  ++ix;
-
-  /* now zero digits above the top */
-  while (ix++ < olduse) {
-     *tmpc++ = 0;
-  }
-
-  /* set used count */
-  c->used = a->used + 1;
-  mp_clamp(c);
-
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_mul_d.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_mulmod.c b/dep/StormLibOld/src/libtommath/bn_mp_mulmod.c
deleted file mode 100644
index 8ec98bbdd..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_mulmod.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_MULMOD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* d = a * b (mod c) */
-int mp_mulmod (mp_int * a, mp_int * b, mp_int * c, mp_int * d)
-{
-  int     res;
-  mp_int  t;
-
-  if ((res = mp_init (&t)) != MP_OKAY) {
-    return res;
-  }
-
-  if ((res = mp_mul (a, b, &t)) != MP_OKAY) {
-    mp_clear (&t);
-    return res;
-  }
-  res = mp_mod (&t, c, d);
-  mp_clear (&t);
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_mulmod.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_n_root.c b/dep/StormLibOld/src/libtommath/bn_mp_n_root.c
deleted file mode 100644
index f188f5255..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_n_root.c
+++ /dev/null
@@ -1,132 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_N_ROOT_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* find the n'th root of an integer 
- *
- * Result found such that (c)**b <= a and (c+1)**b > a 
- *
- * This algorithm uses Newton's approximation 
- * x[i+1] = x[i] - f(x[i])/f'(x[i]) 
- * which will find the root in log(N) time where 
- * each step involves a fair bit.  This is not meant to 
- * find huge roots [square and cube, etc].
- */
-int mp_n_root (mp_int * a, mp_digit b, mp_int * c)
-{
-  mp_int  t1, t2, t3;
-  int     res, neg;
-
-  /* input must be positive if b is even */
-  if ((b & 1) == 0 && a->sign == MP_NEG) {
-    return MP_VAL;
-  }
-
-  if ((res = mp_init (&t1)) != MP_OKAY) {
-    return res;
-  }
-
-  if ((res = mp_init (&t2)) != MP_OKAY) {
-    goto LBL_T1;
-  }
-
-  if ((res = mp_init (&t3)) != MP_OKAY) {
-    goto LBL_T2;
-  }
-
-  /* if a is negative fudge the sign but keep track */
-  neg     = a->sign;
-  a->sign = MP_ZPOS;
-
-  /* t2 = 2 */
-  mp_set (&t2, 2);
-
-  do {
-    /* t1 = t2 */
-    if ((res = mp_copy (&t2, &t1)) != MP_OKAY) {
-      goto LBL_T3;
-    }
-
-    /* t2 = t1 - ((t1**b - a) / (b * t1**(b-1))) */
-    
-    /* t3 = t1**(b-1) */
-    if ((res = mp_expt_d (&t1, b - 1, &t3)) != MP_OKAY) {   
-      goto LBL_T3;
-    }
-
-    /* numerator */
-    /* t2 = t1**b */
-    if ((res = mp_mul (&t3, &t1, &t2)) != MP_OKAY) {    
-      goto LBL_T3;
-    }
-
-    /* t2 = t1**b - a */
-    if ((res = mp_sub (&t2, a, &t2)) != MP_OKAY) {  
-      goto LBL_T3;
-    }
-
-    /* denominator */
-    /* t3 = t1**(b-1) * b  */
-    if ((res = mp_mul_d (&t3, b, &t3)) != MP_OKAY) {    
-      goto LBL_T3;
-    }
-
-    /* t3 = (t1**b - a)/(b * t1**(b-1)) */
-    if ((res = mp_div (&t2, &t3, &t3, NULL)) != MP_OKAY) {  
-      goto LBL_T3;
-    }
-
-    if ((res = mp_sub (&t1, &t3, &t2)) != MP_OKAY) {
-      goto LBL_T3;
-    }
-  }  while (mp_cmp (&t1, &t2) != MP_EQ);
-
-  /* result can be off by a few so check */
-  for (;;) {
-    if ((res = mp_expt_d (&t1, b, &t2)) != MP_OKAY) {
-      goto LBL_T3;
-    }
-
-    if (mp_cmp (&t2, a) == MP_GT) {
-      if ((res = mp_sub_d (&t1, 1, &t1)) != MP_OKAY) {
-         goto LBL_T3;
-      }
-    } else {
-      break;
-    }
-  }
-
-  /* reset the sign of a first */
-  a->sign = neg;
-
-  /* set the result */
-  mp_exch (&t1, c);
-
-  /* set the sign of the result */
-  c->sign = neg;
-
-  res = MP_OKAY;
-
-LBL_T3:mp_clear (&t3);
-LBL_T2:mp_clear (&t2);
-LBL_T1:mp_clear (&t1);
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_n_root.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_neg.c b/dep/StormLibOld/src/libtommath/bn_mp_neg.c
deleted file mode 100644
index 87a8b5004..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_neg.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_NEG_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* b = -a */
-int mp_neg (mp_int * a, mp_int * b)
-{
-  int     res;
-  if (a != b) {
-     if ((res = mp_copy (a, b)) != MP_OKAY) {
-        return res;
-     }
-  }
-
-  if (mp_iszero(b) != MP_YES) {
-     b->sign = (a->sign == MP_ZPOS) ? MP_NEG : MP_ZPOS;
-  } else {
-     b->sign = MP_ZPOS;
-  }
-
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_neg.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_or.c b/dep/StormLibOld/src/libtommath/bn_mp_or.c
deleted file mode 100644
index 12601eaf7..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_or.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_OR_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* OR two ints together */
-int mp_or (mp_int * a, mp_int * b, mp_int * c)
-{
-  int     res, ix, px;
-  mp_int  t, *x;
-
-  if (a->used > b->used) {
-    if ((res = mp_init_copy (&t, a)) != MP_OKAY) {
-      return res;
-    }
-    px = b->used;
-    x = b;
-  } else {
-    if ((res = mp_init_copy (&t, b)) != MP_OKAY) {
-      return res;
-    }
-    px = a->used;
-    x = a;
-  }
-
-  for (ix = 0; ix < px; ix++) {
-    t.dp[ix] |= x->dp[ix];
-  }
-  mp_clamp (&t);
-  mp_exch (c, &t);
-  mp_clear (&t);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_or.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_prime_fermat.c b/dep/StormLibOld/src/libtommath/bn_mp_prime_fermat.c
deleted file mode 100644
index 297e13c79..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_prime_fermat.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_PRIME_FERMAT_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* performs one Fermat test.
- * 
- * If "a" were prime then b**a == b (mod a) since the order of
- * the multiplicative sub-group would be phi(a) = a-1.  That means
- * it would be the same as b**(a mod (a-1)) == b**1 == b (mod a).
- *
- * Sets result to 1 if the congruence holds, or zero otherwise.
- */
-int mp_prime_fermat (mp_int * a, mp_int * b, int *result)
-{
-  mp_int  t;
-  int     err;
-
-  /* default to composite  */
-  *result = MP_NO;
-
-  /* ensure b > 1 */
-  if (mp_cmp_d(b, 1) != MP_GT) {
-     return MP_VAL;
-  }
-
-  /* init t */
-  if ((err = mp_init (&t)) != MP_OKAY) {
-    return err;
-  }
-
-  /* compute t = b**a mod a */
-  if ((err = mp_exptmod (b, a, a, &t)) != MP_OKAY) {
-    goto LBL_T;
-  }
-
-  /* is it equal to b? */
-  if (mp_cmp (&t, b) == MP_EQ) {
-    *result = MP_YES;
-  }
-
-  err = MP_OKAY;
-LBL_T:mp_clear (&t);
-  return err;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_prime_fermat.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_prime_is_divisible.c b/dep/StormLibOld/src/libtommath/bn_mp_prime_is_divisible.c
deleted file mode 100644
index 0ae649835..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_prime_is_divisible.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_PRIME_IS_DIVISIBLE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* determines if an integers is divisible by one 
- * of the first PRIME_SIZE primes or not
- *
- * sets result to 0 if not, 1 if yes
- */
-int mp_prime_is_divisible (mp_int * a, int *result)
-{
-  int     err, ix;
-  mp_digit res;
-
-  /* default to not */
-  *result = MP_NO;
-
-  for (ix = 0; ix < PRIME_SIZE; ix++) {
-    /* what is a mod LBL_prime_tab[ix] */
-    if ((err = mp_mod_d (a, ltm_prime_tab[ix], &res)) != MP_OKAY) {
-      return err;
-    }
-
-    /* is the residue zero? */
-    if (res == 0) {
-      *result = MP_YES;
-      return MP_OKAY;
-    }
-  }
-
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_prime_is_divisible.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_prime_is_prime.c b/dep/StormLibOld/src/libtommath/bn_mp_prime_is_prime.c
deleted file mode 100644
index 0e1e94bad..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_prime_is_prime.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_PRIME_IS_PRIME_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* performs a variable number of rounds of Miller-Rabin
- *
- * Probability of error after t rounds is no more than
-
- *
- * Sets result to 1 if probably prime, 0 otherwise
- */
-int mp_prime_is_prime (mp_int * a, int t, int *result)
-{
-  mp_int  b;
-  int     ix, err, res;
-
-  /* default to no */
-  *result = MP_NO;
-
-  /* valid value of t? */
-  if (t <= 0 || t > PRIME_SIZE) {
-    return MP_VAL;
-  }
-
-  /* is the input equal to one of the primes in the table? */
-  for (ix = 0; ix < PRIME_SIZE; ix++) {
-      if (mp_cmp_d(a, ltm_prime_tab[ix]) == MP_EQ) {
-         *result = 1;
-         return MP_OKAY;
-      }
-  }
-
-  /* first perform trial division */
-  if ((err = mp_prime_is_divisible (a, &res)) != MP_OKAY) {
-    return err;
-  }
-
-  /* return if it was trivially divisible */
-  if (res == MP_YES) {
-    return MP_OKAY;
-  }
-
-  /* now perform the miller-rabin rounds */
-  if ((err = mp_init (&b)) != MP_OKAY) {
-    return err;
-  }
-
-  for (ix = 0; ix < t; ix++) {
-    /* set the prime */
-    mp_set (&b, ltm_prime_tab[ix]);
-
-    if ((err = mp_prime_miller_rabin (a, &b, &res)) != MP_OKAY) {
-      goto LBL_B;
-    }
-
-    if (res == MP_NO) {
-      goto LBL_B;
-    }
-  }
-
-  /* passed the test */
-  *result = MP_YES;
-LBL_B:mp_clear (&b);
-  return err;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_prime_is_prime.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_prime_miller_rabin.c b/dep/StormLibOld/src/libtommath/bn_mp_prime_miller_rabin.c
deleted file mode 100644
index 47385bc81..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_prime_miller_rabin.c
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_PRIME_MILLER_RABIN_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Miller-Rabin test of "a" to the base of "b" as described in 
- * HAC pp. 139 Algorithm 4.24
- *
- * Sets result to 0 if definitely composite or 1 if probably prime.
- * Randomly the chance of error is no more than 1/4 and often 
- * very much lower.
- */
-int mp_prime_miller_rabin (mp_int * a, mp_int * b, int *result)
-{
-  mp_int  n1, y, r;
-  int     s, j, err;
-
-  /* default */
-  *result = MP_NO;
-
-  /* ensure b > 1 */
-  if (mp_cmp_d(b, 1) != MP_GT) {
-     return MP_VAL;
-  }     
-
-  /* get n1 = a - 1 */
-  if ((err = mp_init_copy (&n1, a)) != MP_OKAY) {
-    return err;
-  }
-  if ((err = mp_sub_d (&n1, 1, &n1)) != MP_OKAY) {
-    goto LBL_N1;
-  }
-
-  /* set 2**s * r = n1 */
-  if ((err = mp_init_copy (&r, &n1)) != MP_OKAY) {
-    goto LBL_N1;
-  }
-
-  /* count the number of least significant bits
-   * which are zero
-   */
-  s = mp_cnt_lsb(&r);
-
-  /* now divide n - 1 by 2**s */
-  if ((err = mp_div_2d (&r, s, &r, NULL)) != MP_OKAY) {
-    goto LBL_R;
-  }
-
-  /* compute y = b**r mod a */
-  if ((err = mp_init (&y)) != MP_OKAY) {
-    goto LBL_R;
-  }
-  if ((err = mp_exptmod (b, &r, a, &y)) != MP_OKAY) {
-    goto LBL_Y;
-  }
-
-  /* if y != 1 and y != n1 do */
-  if (mp_cmp_d (&y, 1) != MP_EQ && mp_cmp (&y, &n1) != MP_EQ) {
-    j = 1;
-    /* while j <= s-1 and y != n1 */
-    while ((j <= (s - 1)) && mp_cmp (&y, &n1) != MP_EQ) {
-      if ((err = mp_sqrmod (&y, a, &y)) != MP_OKAY) {
-         goto LBL_Y;
-      }
-
-      /* if y == 1 then composite */
-      if (mp_cmp_d (&y, 1) == MP_EQ) {
-         goto LBL_Y;
-      }
-
-      ++j;
-    }
-
-    /* if y != n1 then composite */
-    if (mp_cmp (&y, &n1) != MP_EQ) {
-      goto LBL_Y;
-    }
-  }
-
-  /* probably prime now */
-  *result = MP_YES;
-LBL_Y:mp_clear (&y);
-LBL_R:mp_clear (&r);
-LBL_N1:mp_clear (&n1);
-  return err;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_prime_miller_rabin.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_prime_next_prime.c b/dep/StormLibOld/src/libtommath/bn_mp_prime_next_prime.c
deleted file mode 100644
index 833992bac..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_prime_next_prime.c
+++ /dev/null
@@ -1,170 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_PRIME_NEXT_PRIME_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* finds the next prime after the number "a" using "t" trials
- * of Miller-Rabin.
- *
- * bbs_style = 1 means the prime must be congruent to 3 mod 4
- */
-int mp_prime_next_prime(mp_int *a, int t, int bbs_style)
-{
-   int      err, res, x, y;
-   mp_digit res_tab[PRIME_SIZE], step, kstep;
-   mp_int   b;
-
-   /* ensure t is valid */
-   if (t <= 0 || t > PRIME_SIZE) {
-      return MP_VAL;
-   }
-
-   /* force positive */
-   a->sign = MP_ZPOS;
-
-   /* simple algo if a is less than the largest prime in the table */
-   if (mp_cmp_d(a, ltm_prime_tab[PRIME_SIZE-1]) == MP_LT) {
-      /* find which prime it is bigger than */
-      for (x = PRIME_SIZE - 2; x >= 0; x--) {
-          if (mp_cmp_d(a, ltm_prime_tab[x]) != MP_LT) {
-             if (bbs_style == 1) {
-                /* ok we found a prime smaller or
-                 * equal [so the next is larger]
-                 *
-                 * however, the prime must be
-                 * congruent to 3 mod 4
-                 */
-                if ((ltm_prime_tab[x + 1] & 3) != 3) {
-                   /* scan upwards for a prime congruent to 3 mod 4 */
-                   for (y = x + 1; y < PRIME_SIZE; y++) {
-                       if ((ltm_prime_tab[y] & 3) == 3) {
-                          mp_set(a, ltm_prime_tab[y]);
-                          return MP_OKAY;
-                       }
-                   }
-                }
-             } else {
-                mp_set(a, ltm_prime_tab[x + 1]);
-                return MP_OKAY;
-             }
-          }
-      }
-      /* at this point a maybe 1 */
-      if (mp_cmp_d(a, 1) == MP_EQ) {
-         mp_set(a, 2);
-         return MP_OKAY;
-      }
-      /* fall through to the sieve */
-   }
-
-   /* generate a prime congruent to 3 mod 4 or 1/3 mod 4? */
-   if (bbs_style == 1) {
-      kstep   = 4;
-   } else {
-      kstep   = 2;
-   }
-
-   /* at this point we will use a combination of a sieve and Miller-Rabin */
-
-   if (bbs_style == 1) {
-      /* if a mod 4 != 3 subtract the correct value to make it so */
-      if ((a->dp[0] & 3) != 3) {
-         if ((err = mp_sub_d(a, (a->dp[0] & 3) + 1, a)) != MP_OKAY) { return err; };
-      }
-   } else {
-      if (mp_iseven(a) == 1) {
-         /* force odd */
-         if ((err = mp_sub_d(a, 1, a)) != MP_OKAY) {
-            return err;
-         }
-      }
-   }
-
-   /* generate the restable */
-   for (x = 1; x < PRIME_SIZE; x++) {
-      if ((err = mp_mod_d(a, ltm_prime_tab[x], res_tab + x)) != MP_OKAY) {
-         return err;
-      }
-   }
-
-   /* init temp used for Miller-Rabin Testing */
-   if ((err = mp_init(&b)) != MP_OKAY) {
-      return err;
-   }
-
-   for (;;) {
-      /* skip to the next non-trivially divisible candidate */
-      step = 0;
-      do {
-         /* y == 1 if any residue was zero [e.g. cannot be prime] */
-         y     =  0;
-
-         /* increase step to next candidate */
-         step += kstep;
-
-         /* compute the new residue without using division */
-         for (x = 1; x < PRIME_SIZE; x++) {
-             /* add the step to each residue */
-             res_tab[x] += kstep;
-
-             /* subtract the modulus [instead of using division] */
-             if (res_tab[x] >= ltm_prime_tab[x]) {
-                res_tab[x]  -= ltm_prime_tab[x];
-             }
-
-             /* set flag if zero */
-             if (res_tab[x] == 0) {
-                y = 1;
-             }
-         }
-      } while (y == 1 && step < ((((mp_digit)1)<<DIGIT_BIT) - kstep));
-
-      /* add the step */
-      if ((err = mp_add_d(a, step, a)) != MP_OKAY) {
-         goto LBL_ERR;
-      }
-
-      /* if didn't pass sieve and step == MAX then skip test */
-      if (y == 1 && step >= ((((mp_digit)1)<<DIGIT_BIT) - kstep)) {
-         continue;
-      }
-
-      /* is this prime? */
-      for (x = 0; x < t; x++) {
-          mp_set(&b, ltm_prime_tab[t]);
-          if ((err = mp_prime_miller_rabin(a, &b, &res)) != MP_OKAY) {
-             goto LBL_ERR;
-          }
-          if (res == MP_NO) {
-             break;
-          }
-      }
-
-      if (res == MP_YES) {
-         break;
-      }
-   }
-
-   err = MP_OKAY;
-LBL_ERR:
-   mp_clear(&b);
-   return err;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_prime_next_prime.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_prime_rabin_miller_trials.c b/dep/StormLibOld/src/libtommath/bn_mp_prime_rabin_miller_trials.c
deleted file mode 100644
index 3f7608aa7..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_prime_rabin_miller_trials.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_PRIME_RABIN_MILLER_TRIALS_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-
-static const struct {
-   int k, t;
-} sizes[] = {
-{   128,    28 },
-{   256,    16 },
-{   384,    10 },
-{   512,     7 },
-{   640,     6 },
-{   768,     5 },
-{   896,     4 },
-{  1024,     4 }
-};
-
-/* returns # of RM trials required for a given bit size */
-int mp_prime_rabin_miller_trials(int size)
-{
-   int x;
-
-   for (x = 0; x < (int)(sizeof(sizes)/(sizeof(sizes[0]))); x++) {
-       if (sizes[x].k == size) {
-          return sizes[x].t;
-       } else if (sizes[x].k > size) {
-          return (x == 0) ? sizes[0].t : sizes[x - 1].t;
-       }
-   }
-   return sizes[x-1].t + 1;
-}
-
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_prime_rabin_miller_trials.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_prime_random_ex.c b/dep/StormLibOld/src/libtommath/bn_mp_prime_random_ex.c
deleted file mode 100644
index 4eec3f69e..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_prime_random_ex.c
+++ /dev/null
@@ -1,125 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_PRIME_RANDOM_EX_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* makes a truly random prime of a given size (bits),
- *
- * Flags are as follows:
- * 
- *   LTM_PRIME_BBS      - make prime congruent to 3 mod 4
- *   LTM_PRIME_SAFE     - make sure (p-1)/2 is prime as well (implies LTM_PRIME_BBS)
- *   LTM_PRIME_2MSB_OFF - make the 2nd highest bit zero
- *   LTM_PRIME_2MSB_ON  - make the 2nd highest bit one
- *
- * You have to supply a callback which fills in a buffer with random bytes.  "dat" is a parameter you can
- * have passed to the callback (e.g. a state or something).  This function doesn't use "dat" itself
- * so it can be NULL
- *
- */
-
-/* This is possibly the mother of all prime generation functions, muahahahahaha! */
-int mp_prime_random_ex(mp_int *a, int t, int size, int flags, ltm_prime_callback cb, void *dat)
-{
-   unsigned char *tmp, maskAND, maskOR_msb, maskOR_lsb;
-   int res, err, bsize, maskOR_msb_offset;
-
-   /* sanity check the input */
-   if (size <= 1 || t <= 0) {
-      return MP_VAL;
-   }
-
-   /* LTM_PRIME_SAFE implies LTM_PRIME_BBS */
-   if (flags & LTM_PRIME_SAFE) {
-      flags |= LTM_PRIME_BBS;
-   }
-
-   /* calc the byte size */
-   bsize = (size>>3) + ((size&7)?1:0);
-
-   /* we need a buffer of bsize bytes */
-   tmp = OPT_CAST(unsigned char) XMALLOC(bsize);
-   if (tmp == NULL) {
-      return MP_MEM;
-   }
-
-   /* calc the maskAND value for the MSbyte*/
-   maskAND = ((size&7) == 0) ? 0xFF : (0xFF >> (8 - (size & 7)));
-
-   /* calc the maskOR_msb */
-   maskOR_msb        = 0;
-   maskOR_msb_offset = ((size & 7) == 1) ? 1 : 0;
-   if (flags & LTM_PRIME_2MSB_ON) {
-      maskOR_msb       |= 0x80 >> ((9 - size) & 7);
-   }  
-
-   /* get the maskOR_lsb */
-   maskOR_lsb         = 1;
-   if (flags & LTM_PRIME_BBS) {
-      maskOR_lsb     |= 3;
-   }
-
-   do {
-      /* read the bytes */
-      if (cb(tmp, bsize, dat) != bsize) {
-         err = MP_VAL;
-         goto error;
-      }
- 
-      /* work over the MSbyte */
-      tmp[0]    &= maskAND;
-      tmp[0]    |= 1 << ((size - 1) & 7);
-
-      /* mix in the maskORs */
-      tmp[maskOR_msb_offset]   |= maskOR_msb;
-      tmp[bsize-1]             |= maskOR_lsb;
-
-      /* read it in */
-      if ((err = mp_read_unsigned_bin(a, tmp, bsize)) != MP_OKAY)     { goto error; }
-
-      /* is it prime? */
-      if ((err = mp_prime_is_prime(a, t, &res)) != MP_OKAY)           { goto error; }
-      if (res == MP_NO) {  
-         continue;
-      }
-
-      if (flags & LTM_PRIME_SAFE) {
-         /* see if (a-1)/2 is prime */
-         if ((err = mp_sub_d(a, 1, a)) != MP_OKAY)                    { goto error; }
-         if ((err = mp_div_2(a, a)) != MP_OKAY)                       { goto error; }
- 
-         /* is it prime? */
-         if ((err = mp_prime_is_prime(a, t, &res)) != MP_OKAY)        { goto error; }
-      }
-   } while (res == MP_NO);
-
-   if (flags & LTM_PRIME_SAFE) {
-      /* restore a to the original value */
-      if ((err = mp_mul_2(a, a)) != MP_OKAY)                          { goto error; }
-      if ((err = mp_add_d(a, 1, a)) != MP_OKAY)                       { goto error; }
-   }
-
-   err = MP_OKAY;
-error:
-   XFREE(tmp);
-   return err;
-}
-
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_prime_random_ex.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_radix_size.c b/dep/StormLibOld/src/libtommath/bn_mp_radix_size.c
deleted file mode 100644
index 2378f1fc1..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_radix_size.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_RADIX_SIZE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* returns size of ASCII reprensentation */
-int mp_radix_size (mp_int * a, int radix, int *size)
-{
-  int     res, digs;
-  mp_int  t;
-  mp_digit d;
-
-  *size = 0;
-
-  /* special case for binary */
-  if (radix == 2) {
-    *size = mp_count_bits (a) + (a->sign == MP_NEG ? 1 : 0) + 1;
-    return MP_OKAY;
-  }
-
-  /* make sure the radix is in range */
-  if (radix < 2 || radix > 64) {
-    return MP_VAL;
-  }
-
-  if (mp_iszero(a) == MP_YES) {
-    *size = 2;
-    return MP_OKAY;
-  }
-
-  /* digs is the digit count */
-  digs = 0;
-
-  /* if it's negative add one for the sign */
-  if (a->sign == MP_NEG) {
-    ++digs;
-  }
-
-  /* init a copy of the input */
-  if ((res = mp_init_copy (&t, a)) != MP_OKAY) {
-    return res;
-  }
-
-  /* force temp to positive */
-  t.sign = MP_ZPOS; 
-
-  /* fetch out all of the digits */
-  while (mp_iszero (&t) == MP_NO) {
-    if ((res = mp_div_d (&t, (mp_digit) radix, &t, &d)) != MP_OKAY) {
-      mp_clear (&t);
-      return res;
-    }
-    ++digs;
-  }
-  mp_clear (&t);
-
-  /* return digs + 1, the 1 is for the NULL byte that would be required. */
-  *size = digs + 1;
-  return MP_OKAY;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_radix_size.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_radix_smap.c b/dep/StormLibOld/src/libtommath/bn_mp_radix_smap.c
deleted file mode 100644
index 5cbe9520b..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_radix_smap.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_RADIX_SMAP_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* chars used in radix conversions */
-const char *mp_s_rmap = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz+/";
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_radix_smap.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_rand.c b/dep/StormLibOld/src/libtommath/bn_mp_rand.c
deleted file mode 100644
index e1241785e..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_rand.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_RAND_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* makes a pseudo-random int of a given size */
-int
-mp_rand (mp_int * a, int digits)
-{
-  int     res;
-  mp_digit d;
-
-  mp_zero (a);
-  if (digits <= 0) {
-    return MP_OKAY;
-  }
-
-  /* first place a random non-zero digit */
-  do {
-    d = ((mp_digit) abs (rand ())) & MP_MASK;
-  } while (d == 0);
-
-  if ((res = mp_add_d (a, d, a)) != MP_OKAY) {
-    return res;
-  }
-
-  while (--digits > 0) {
-    if ((res = mp_lshd (a, 1)) != MP_OKAY) {
-      return res;
-    }
-
-    if ((res = mp_add_d (a, ((mp_digit) abs (rand ())), a)) != MP_OKAY) {
-      return res;
-    }
-  }
-
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_rand.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_read_radix.c b/dep/StormLibOld/src/libtommath/bn_mp_read_radix.c
deleted file mode 100644
index 6869668fb..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_read_radix.c
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_READ_RADIX_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* read a string [ASCII] in a given radix */
-int mp_read_radix (mp_int * a, const char *str, int radix)
-{
-  int     y, res, neg;
-  char    ch;
-
-  /* zero the digit bignum */
-  mp_zero(a);
-
-  /* make sure the radix is ok */
-  if (radix < 2 || radix > 64) {
-    return MP_VAL;
-  }
-
-  /* if the leading digit is a 
-   * minus set the sign to negative. 
-   */
-  if (*str == '-') {
-    ++str;
-    neg = MP_NEG;
-  } else {
-    neg = MP_ZPOS;
-  }
-
-  /* set the integer to the default of zero */
-  mp_zero (a);
-  
-  /* process each digit of the string */
-  while (*str) {
-    /* if the radix < 36 the conversion is case insensitive
-     * this allows numbers like 1AB and 1ab to represent the same  value
-     * [e.g. in hex]
-     */
-    ch = (char) ((radix < 36) ? toupper (*str) : *str);
-    for (y = 0; y < 64; y++) {
-      if (ch == mp_s_rmap[y]) {
-         break;
-      }
-    }
-
-    /* if the char was found in the map 
-     * and is less than the given radix add it
-     * to the number, otherwise exit the loop. 
-     */
-    if (y < radix) {
-      if ((res = mp_mul_d (a, (mp_digit) radix, a)) != MP_OKAY) {
-         return res;
-      }
-      if ((res = mp_add_d (a, (mp_digit) y, a)) != MP_OKAY) {
-         return res;
-      }
-    } else {
-      break;
-    }
-    ++str;
-  }
-  
-  /* set the sign only if a != 0 */
-  if (mp_iszero(a) != 1) {
-     a->sign = neg;
-  }
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_read_radix.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_read_signed_bin.c b/dep/StormLibOld/src/libtommath/bn_mp_read_signed_bin.c
deleted file mode 100644
index e9a780c28..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_read_signed_bin.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_READ_SIGNED_BIN_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* read signed bin, big endian, first byte is 0==positive or 1==negative */
-int mp_read_signed_bin (mp_int * a, const unsigned char *b, int c)
-{
-  int     res;
-
-  /* read magnitude */
-  if ((res = mp_read_unsigned_bin (a, b + 1, c - 1)) != MP_OKAY) {
-    return res;
-  }
-
-  /* first byte is 0 for positive, non-zero for negative */
-  if (b[0] == 0) {
-     a->sign = MP_ZPOS;
-  } else {
-     a->sign = MP_NEG;
-  }
-
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_read_signed_bin.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_read_unsigned_bin.c b/dep/StormLibOld/src/libtommath/bn_mp_read_unsigned_bin.c
deleted file mode 100644
index 7d3537041..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_read_unsigned_bin.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_READ_UNSIGNED_BIN_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* reads a unsigned char array, assumes the msb is stored first [big endian] */
-int mp_read_unsigned_bin (mp_int * a, const unsigned char *b, int c)
-{
-  int     res;
-
-  /* make sure there are at least two digits */
-  if (a->alloc < 2) {
-     if ((res = mp_grow(a, 2)) != MP_OKAY) {
-        return res;
-     }
-  }
-
-  /* zero the int */
-  mp_zero (a);
-
-  /* read the bytes in */
-  while (c-- > 0) {
-    if ((res = mp_mul_2d (a, 8, a)) != MP_OKAY) {
-      return res;
-    }
-
-#ifndef MP_8BIT
-      a->dp[0] |= *b++;
-      a->used += 1;
-#else
-      a->dp[0] = (*b & MP_MASK);
-      a->dp[1] |= ((*b++ >> 7U) & 1);
-      a->used += 2;
-#endif
-  }
-  mp_clamp (a);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_read_unsigned_bin.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_reduce.c b/dep/StormLibOld/src/libtommath/bn_mp_reduce.c
deleted file mode 100644
index 3a6bb5aca..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_reduce.c
+++ /dev/null
@@ -1,100 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_REDUCE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* reduces x mod m, assumes 0 < x < m**2, mu is 
- * precomputed via mp_reduce_setup.
- * From HAC pp.604 Algorithm 14.42
- */
-int mp_reduce (mp_int * x, mp_int * m, mp_int * mu)
-{
-  mp_int  q;
-  int     res, um = m->used;
-
-  /* q = x */
-  if ((res = mp_init_copy (&q, x)) != MP_OKAY) {
-    return res;
-  }
-
-  /* q1 = x / b**(k-1)  */
-  mp_rshd (&q, um - 1);         
-
-  /* according to HAC this optimization is ok */
-  if (((unsigned long) um) > (((mp_digit)1) << (DIGIT_BIT - 1))) {
-    if ((res = mp_mul (&q, mu, &q)) != MP_OKAY) {
-      goto CLEANUP;
-    }
-  } else {
-#ifdef BN_S_MP_MUL_HIGH_DIGS_C
-    if ((res = s_mp_mul_high_digs (&q, mu, &q, um)) != MP_OKAY) {
-      goto CLEANUP;
-    }
-#elif defined(BN_FAST_S_MP_MUL_HIGH_DIGS_C)
-    if ((res = fast_s_mp_mul_high_digs (&q, mu, &q, um)) != MP_OKAY) {
-      goto CLEANUP;
-    }
-#else 
-    { 
-      res = MP_VAL;
-      goto CLEANUP;
-    }
-#endif
-  }
-
-  /* q3 = q2 / b**(k+1) */
-  mp_rshd (&q, um + 1);         
-
-  /* x = x mod b**(k+1), quick (no division) */
-  if ((res = mp_mod_2d (x, DIGIT_BIT * (um + 1), x)) != MP_OKAY) {
-    goto CLEANUP;
-  }
-
-  /* q = q * m mod b**(k+1), quick (no division) */
-  if ((res = s_mp_mul_digs (&q, m, &q, um + 1)) != MP_OKAY) {
-    goto CLEANUP;
-  }
-
-  /* x = x - q */
-  if ((res = mp_sub (x, &q, x)) != MP_OKAY) {
-    goto CLEANUP;
-  }
-
-  /* If x < 0, add b**(k+1) to it */
-  if (mp_cmp_d (x, 0) == MP_LT) {
-    mp_set (&q, 1);
-    if ((res = mp_lshd (&q, um + 1)) != MP_OKAY)
-      goto CLEANUP;
-    if ((res = mp_add (x, &q, x)) != MP_OKAY)
-      goto CLEANUP;
-  }
-
-  /* Back off if it's too big */
-  while (mp_cmp (x, m) != MP_LT) {
-    if ((res = s_mp_sub (x, m, x)) != MP_OKAY) {
-      goto CLEANUP;
-    }
-  }
-  
-CLEANUP:
-  mp_clear (&q);
-
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_reduce.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_reduce_2k.c b/dep/StormLibOld/src/libtommath/bn_mp_reduce_2k.c
deleted file mode 100644
index 3191d8291..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_reduce_2k.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_REDUCE_2K_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* reduces a modulo n where n is of the form 2**p - d */
-int mp_reduce_2k(mp_int *a, mp_int *n, mp_digit d)
-{
-   mp_int q;
-   int    p, res;
-   
-   if ((res = mp_init(&q)) != MP_OKAY) {
-      return res;
-   }
-   
-   p = mp_count_bits(n);    
-top:
-   /* q = a/2**p, a = a mod 2**p */
-   if ((res = mp_div_2d(a, p, &q, a)) != MP_OKAY) {
-      goto ERR;
-   }
-   
-   if (d != 1) {
-      /* q = q * d */
-      if ((res = mp_mul_d(&q, d, &q)) != MP_OKAY) { 
-         goto ERR;
-      }
-   }
-   
-   /* a = a + q */
-   if ((res = s_mp_add(a, &q, a)) != MP_OKAY) {
-      goto ERR;
-   }
-   
-   if (mp_cmp_mag(a, n) != MP_LT) {
-      s_mp_sub(a, n, a);
-      goto top;
-   }
-   
-ERR:
-   mp_clear(&q);
-   return res;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_reduce_2k.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_reduce_2k_l.c b/dep/StormLibOld/src/libtommath/bn_mp_reduce_2k_l.c
deleted file mode 100644
index 49b7e344e..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_reduce_2k_l.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_REDUCE_2K_L_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* reduces a modulo n where n is of the form 2**p - d 
-   This differs from reduce_2k since "d" can be larger
-   than a single digit.
-*/
-int mp_reduce_2k_l(mp_int *a, mp_int *n, mp_int *d)
-{
-   mp_int q;
-   int    p, res;
-   
-   if ((res = mp_init(&q)) != MP_OKAY) {
-      return res;
-   }
-   
-   p = mp_count_bits(n);    
-top:
-   /* q = a/2**p, a = a mod 2**p */
-   if ((res = mp_div_2d(a, p, &q, a)) != MP_OKAY) {
-      goto ERR;
-   }
-   
-   /* q = q * d */
-   if ((res = mp_mul(&q, d, &q)) != MP_OKAY) { 
-      goto ERR;
-   }
-   
-   /* a = a + q */
-   if ((res = s_mp_add(a, &q, a)) != MP_OKAY) {
-      goto ERR;
-   }
-   
-   if (mp_cmp_mag(a, n) != MP_LT) {
-      s_mp_sub(a, n, a);
-      goto top;
-   }
-   
-ERR:
-   mp_clear(&q);
-   return res;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_reduce_2k_l.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_reduce_2k_setup.c b/dep/StormLibOld/src/libtommath/bn_mp_reduce_2k_setup.c
deleted file mode 100644
index aa3b3bad8..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_reduce_2k_setup.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_REDUCE_2K_SETUP_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* determines the setup value */
-int mp_reduce_2k_setup(mp_int *a, mp_digit *d)
-{
-   int res, p;
-   mp_int tmp;
-   
-   if ((res = mp_init(&tmp)) != MP_OKAY) {
-      return res;
-   }
-   
-   p = mp_count_bits(a);
-   if ((res = mp_2expt(&tmp, p)) != MP_OKAY) {
-      mp_clear(&tmp);
-      return res;
-   }
-   
-   if ((res = s_mp_sub(&tmp, a, &tmp)) != MP_OKAY) {
-      mp_clear(&tmp);
-      return res;
-   }
-   
-   *d = tmp.dp[0];
-   mp_clear(&tmp);
-   return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_reduce_2k_setup.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_reduce_2k_setup_l.c b/dep/StormLibOld/src/libtommath/bn_mp_reduce_2k_setup_l.c
deleted file mode 100644
index 4eca87040..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_reduce_2k_setup_l.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_REDUCE_2K_SETUP_L_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* determines the setup value */
-int mp_reduce_2k_setup_l(mp_int *a, mp_int *d)
-{
-   int    res;
-   mp_int tmp;
-   
-   if ((res = mp_init(&tmp)) != MP_OKAY) {
-      return res;
-   }
-   
-   if ((res = mp_2expt(&tmp, mp_count_bits(a))) != MP_OKAY) {
-      goto ERR;
-   }
-   
-   if ((res = s_mp_sub(&tmp, a, d)) != MP_OKAY) {
-      goto ERR;
-   }
-   
-ERR:
-   mp_clear(&tmp);
-   return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_reduce_2k_setup_l.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_reduce_is_2k.c b/dep/StormLibOld/src/libtommath/bn_mp_reduce_is_2k.c
deleted file mode 100644
index b9ede9789..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_reduce_is_2k.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_REDUCE_IS_2K_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* determines if mp_reduce_2k can be used */
-int mp_reduce_is_2k(mp_int *a)
-{
-   int ix, iy, iw;
-   mp_digit iz;
-   
-   if (a->used == 0) {
-      return MP_NO;
-   } else if (a->used == 1) {
-      return MP_YES;
-   } else if (a->used > 1) {
-      iy = mp_count_bits(a);
-      iz = 1;
-      iw = 1;
-    
-      /* Test every bit from the second digit up, must be 1 */
-      for (ix = DIGIT_BIT; ix < iy; ix++) {
-          if ((a->dp[iw] & iz) == 0) {
-             return MP_NO;
-          }
-          iz <<= 1;
-          if (iz > (mp_digit)MP_MASK) {
-             ++iw;
-             iz = 1;
-          }
-      }
-   }
-   return MP_YES;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_reduce_is_2k.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_reduce_is_2k_l.c b/dep/StormLibOld/src/libtommath/bn_mp_reduce_is_2k_l.c
deleted file mode 100644
index 787875f8b..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_reduce_is_2k_l.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_REDUCE_IS_2K_L_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* determines if reduce_2k_l can be used */
-int mp_reduce_is_2k_l(mp_int *a)
-{
-   int ix, iy;
-   
-   if (a->used == 0) {
-      return MP_NO;
-   } else if (a->used == 1) {
-      return MP_YES;
-   } else if (a->used > 1) {
-      /* if more than half of the digits are -1 we're sold */
-      for (iy = ix = 0; ix < a->used; ix++) {
-          if (a->dp[ix] == MP_MASK) {
-              ++iy;
-          }
-      }
-      return (iy >= (a->used/2)) ? MP_YES : MP_NO;
-      
-   }
-   return MP_NO;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_reduce_is_2k_l.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_reduce_setup.c b/dep/StormLibOld/src/libtommath/bn_mp_reduce_setup.c
deleted file mode 100644
index 00e0a62b9..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_reduce_setup.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_REDUCE_SETUP_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* pre-calculate the value required for Barrett reduction
- * For a given modulus "b" it calulates the value required in "a"
- */
-int mp_reduce_setup (mp_int * a, mp_int * b)
-{
-  int     res;
-  
-  if ((res = mp_2expt (a, b->used * 2 * DIGIT_BIT)) != MP_OKAY) {
-    return res;
-  }
-  return mp_div (a, b, a, NULL);
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_reduce_setup.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_rshd.c b/dep/StormLibOld/src/libtommath/bn_mp_rshd.c
deleted file mode 100644
index eac6721ba..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_rshd.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_RSHD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* shift right a certain amount of digits */
-void mp_rshd (mp_int * a, int b)
-{
-  int     x;
-
-  /* if b <= 0 then ignore it */
-  if (b <= 0) {
-    return;
-  }
-
-  /* if b > used then simply zero it and return */
-  if (a->used <= b) {
-    mp_zero (a);
-    return;
-  }
-
-  {
-    register mp_digit *bottom, *top;
-
-    /* shift the digits down */
-
-    /* bottom */
-    bottom = a->dp;
-
-    /* top [offset into digits] */
-    top = a->dp + b;
-
-    /* this is implemented as a sliding window where 
-     * the window is b-digits long and digits from 
-     * the top of the window are copied to the bottom
-     *
-     * e.g.
-
-     b-2 | b-1 | b0 | b1 | b2 | ... | bb |   ---->
-                 /\                   |      ---->
-                  \-------------------/      ---->
-     */
-    for (x = 0; x < (a->used - b); x++) {
-      *bottom++ = *top++;
-    }
-
-    /* zero the top digits */
-    for (; x < a->used; x++) {
-      *bottom++ = 0;
-    }
-  }
-  
-  /* remove excess digits */
-  a->used -= b;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_rshd.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_set.c b/dep/StormLibOld/src/libtommath/bn_mp_set.c
deleted file mode 100644
index d76d5bbd3..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_set.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_SET_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* set to a digit */
-void mp_set (mp_int * a, mp_digit b)
-{
-  mp_zero (a);
-  a->dp[0] = b & MP_MASK;
-  a->used  = (a->dp[0] != 0) ? 1 : 0;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_set.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_set_int.c b/dep/StormLibOld/src/libtommath/bn_mp_set_int.c
deleted file mode 100644
index 68cf0e32b..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_set_int.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_SET_INT_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* set a 32-bit const */
-int mp_set_int (mp_int * a, unsigned long b)
-{
-  int     x, res;
-
-  mp_zero (a);
-  
-  /* set four bits at a time */
-  for (x = 0; x < 8; x++) {
-    /* shift the number up four bits */
-    if ((res = mp_mul_2d (a, 4, a)) != MP_OKAY) {
-      return res;
-    }
-
-    /* OR in the top four bits of the source */
-    a->dp[0] |= (b >> 28) & 15;
-
-    /* shift the source up to the next four bits */
-    b <<= 4;
-
-    /* ensure that digits are not clamped off */
-    a->used += 1;
-  }
-  mp_clamp (a);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_set_int.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_shrink.c b/dep/StormLibOld/src/libtommath/bn_mp_shrink.c
deleted file mode 100644
index 54920d140..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_shrink.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_SHRINK_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* shrink a bignum */
-int mp_shrink (mp_int * a)
-{
-  mp_digit *tmp;
-  if (a->alloc != a->used && a->used > 0) {
-    if ((tmp = OPT_CAST(mp_digit) XREALLOC (a->dp, sizeof (mp_digit) * a->used)) == NULL) {
-      return MP_MEM;
-    }
-    a->dp    = tmp;
-    a->alloc = a->used;
-  }
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_shrink.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_signed_bin_size.c b/dep/StormLibOld/src/libtommath/bn_mp_signed_bin_size.c
deleted file mode 100644
index b9492a5e5..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_signed_bin_size.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_SIGNED_BIN_SIZE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* get the size for an signed equivalent */
-int mp_signed_bin_size (mp_int * a)
-{
-  return 1 + mp_unsigned_bin_size (a);
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_signed_bin_size.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_sqr.c b/dep/StormLibOld/src/libtommath/bn_mp_sqr.c
deleted file mode 100644
index c10fa6f3b..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_sqr.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_SQR_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* computes b = a*a */
-int
-mp_sqr (mp_int * a, mp_int * b)
-{
-  int     res;
-
-#ifdef BN_MP_TOOM_SQR_C
-  /* use Toom-Cook? */
-  if (a->used >= TOOM_SQR_CUTOFF) {
-    res = mp_toom_sqr(a, b);
-  /* Karatsuba? */
-  } else 
-#endif
-#ifdef BN_MP_KARATSUBA_SQR_C
-if (a->used >= KARATSUBA_SQR_CUTOFF) {
-    res = mp_karatsuba_sqr (a, b);
-  } else 
-#endif
-  {
-#ifdef BN_FAST_S_MP_SQR_C
-    /* can we use the fast comba multiplier? */
-    if ((a->used * 2 + 1) < MP_WARRAY && 
-         a->used < 
-         (1 << (sizeof(mp_word) * CHAR_BIT - 2*DIGIT_BIT - 1))) {
-      res = fast_s_mp_sqr (a, b);
-    } else
-#endif
-#ifdef BN_S_MP_SQR_C
-      res = s_mp_sqr (a, b);
-#else
-      res = MP_VAL;
-#endif
-  }
-  b->sign = MP_ZPOS;
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_sqr.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_sqrmod.c b/dep/StormLibOld/src/libtommath/bn_mp_sqrmod.c
deleted file mode 100644
index 5f4b2f3d6..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_sqrmod.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_SQRMOD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* c = a * a (mod b) */
-int
-mp_sqrmod (mp_int * a, mp_int * b, mp_int * c)
-{
-  int     res;
-  mp_int  t;
-
-  if ((res = mp_init (&t)) != MP_OKAY) {
-    return res;
-  }
-
-  if ((res = mp_sqr (a, &t)) != MP_OKAY) {
-    mp_clear (&t);
-    return res;
-  }
-  res = mp_mod (&t, b, c);
-  mp_clear (&t);
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_sqrmod.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_sqrt.c b/dep/StormLibOld/src/libtommath/bn_mp_sqrt.c
deleted file mode 100644
index e15ba98ca..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_sqrt.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_SQRT_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* this function is less generic than mp_n_root, simpler and faster */
-int mp_sqrt(mp_int *arg, mp_int *ret) 
-{
-  int res;
-  mp_int t1,t2;
-
-  /* must be positive */
-  if (arg->sign == MP_NEG) {
-    return MP_VAL;
-  }
-
-  /* easy out */
-  if (mp_iszero(arg) == MP_YES) {
-    mp_zero(ret);
-    return MP_OKAY;
-  }
-
-  if ((res = mp_init_copy(&t1, arg)) != MP_OKAY) {
-    return res;
-  }
-
-  if ((res = mp_init(&t2)) != MP_OKAY) {
-    goto E2;
-  }
-
-  /* First approx. (not very bad for large arg) */
-  mp_rshd (&t1,t1.used/2);
-
-  /* t1 > 0  */ 
-  if ((res = mp_div(arg,&t1,&t2,NULL)) != MP_OKAY) {
-    goto E1;
-  }
-  if ((res = mp_add(&t1,&t2,&t1)) != MP_OKAY) {
-    goto E1;
-  }
-  if ((res = mp_div_2(&t1,&t1)) != MP_OKAY) {
-    goto E1;
-  }
-  /* And now t1 > sqrt(arg) */
-  do { 
-    if ((res = mp_div(arg,&t1,&t2,NULL)) != MP_OKAY) {
-      goto E1;
-    }
-    if ((res = mp_add(&t1,&t2,&t1)) != MP_OKAY) {
-      goto E1;
-    }
-    if ((res = mp_div_2(&t1,&t1)) != MP_OKAY) {
-      goto E1;
-    }
-    /* t1 >= sqrt(arg) >= t2 at this point */
-  } while (mp_cmp_mag(&t1,&t2) == MP_GT);
-
-  mp_exch(&t1,ret);
-
-E1: mp_clear(&t2);
-E2: mp_clear(&t1);
-  return res;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_sqrt.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_sub.c b/dep/StormLibOld/src/libtommath/bn_mp_sub.c
deleted file mode 100644
index 6e7213861..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_sub.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_SUB_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* high level subtraction (handles signs) */
-int
-mp_sub (mp_int * a, mp_int * b, mp_int * c)
-{
-  int     sa, sb, res;
-
-  sa = a->sign;
-  sb = b->sign;
-
-  if (sa != sb) {
-    /* subtract a negative from a positive, OR */
-    /* subtract a positive from a negative. */
-    /* In either case, ADD their magnitudes, */
-    /* and use the sign of the first number. */
-    c->sign = sa;
-    res = s_mp_add (a, b, c);
-  } else {
-    /* subtract a positive from a positive, OR */
-    /* subtract a negative from a negative. */
-    /* First, take the difference between their */
-    /* magnitudes, then... */
-    if (mp_cmp_mag (a, b) != MP_LT) {
-      /* Copy the sign from the first */
-      c->sign = sa;
-      /* The first has a larger or equal magnitude */
-      res = s_mp_sub (a, b, c);
-    } else {
-      /* The result has the *opposite* sign from */
-      /* the first number. */
-      c->sign = (sa == MP_ZPOS) ? MP_NEG : MP_ZPOS;
-      /* The second has a larger magnitude */
-      res = s_mp_sub (b, a, c);
-    }
-  }
-  return res;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_sub.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_sub_d.c b/dep/StormLibOld/src/libtommath/bn_mp_sub_d.c
deleted file mode 100644
index aa08e31b3..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_sub_d.c
+++ /dev/null
@@ -1,93 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_SUB_D_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* single digit subtraction */
-int
-mp_sub_d (mp_int * a, mp_digit b, mp_int * c)
-{
-  mp_digit *tmpa, *tmpc, mu;
-  int       res, ix, oldused;
-
-  /* grow c as required */
-  if (c->alloc < a->used + 1) {
-     if ((res = mp_grow(c, a->used + 1)) != MP_OKAY) {
-        return res;
-     }
-  }
-
-  /* if a is negative just do an unsigned
-   * addition [with fudged signs]
-   */
-  if (a->sign == MP_NEG) {
-     a->sign = MP_ZPOS;
-     res     = mp_add_d(a, b, c);
-     a->sign = c->sign = MP_NEG;
-
-     /* clamp */
-     mp_clamp(c);
-
-     return res;
-  }
-
-  /* setup regs */
-  oldused = c->used;
-  tmpa    = a->dp;
-  tmpc    = c->dp;
-
-  /* if a <= b simply fix the single digit */
-  if ((a->used == 1 && a->dp[0] <= b) || a->used == 0) {
-     if (a->used == 1) {
-        *tmpc++ = b - *tmpa;
-     } else {
-        *tmpc++ = b;
-     }
-     ix      = 1;
-
-     /* negative/1digit */
-     c->sign = MP_NEG;
-     c->used = 1;
-  } else {
-     /* positive/size */
-     c->sign = MP_ZPOS;
-     c->used = a->used;
-
-     /* subtract first digit */
-     *tmpc    = *tmpa++ - b;
-     mu       = *tmpc >> (sizeof(mp_digit) * CHAR_BIT - 1);
-     *tmpc++ &= MP_MASK;
-
-     /* handle rest of the digits */
-     for (ix = 1; ix < a->used; ix++) {
-        *tmpc    = *tmpa++ - mu;
-        mu       = *tmpc >> (sizeof(mp_digit) * CHAR_BIT - 1);
-        *tmpc++ &= MP_MASK;
-     }
-  }
-
-  /* zero excess digits */
-  while (ix++ < oldused) {
-     *tmpc++ = 0;
-  }
-  mp_clamp(c);
-  return MP_OKAY;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_sub_d.c,v $ */
-/* $Revision: 1.6 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_submod.c b/dep/StormLibOld/src/libtommath/bn_mp_submod.c
deleted file mode 100644
index 6617ff42c..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_submod.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_SUBMOD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* d = a - b (mod c) */
-int
-mp_submod (mp_int * a, mp_int * b, mp_int * c, mp_int * d)
-{
-  int     res;
-  mp_int  t;
-
-
-  if ((res = mp_init (&t)) != MP_OKAY) {
-    return res;
-  }
-
-  if ((res = mp_sub (a, b, &t)) != MP_OKAY) {
-    mp_clear (&t);
-    return res;
-  }
-  res = mp_mod (&t, c, d);
-  mp_clear (&t);
-  return res;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_submod.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_to_signed_bin.c b/dep/StormLibOld/src/libtommath/bn_mp_to_signed_bin.c
deleted file mode 100644
index 154f64b56..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_to_signed_bin.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_TO_SIGNED_BIN_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* store in signed [big endian] format */
-int mp_to_signed_bin (mp_int * a, unsigned char *b)
-{
-  int     res;
-
-  if ((res = mp_to_unsigned_bin (a, b + 1)) != MP_OKAY) {
-    return res;
-  }
-  b[0] = (unsigned char) ((a->sign == MP_ZPOS) ? 0 : 1);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_to_signed_bin.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_to_signed_bin_n.c b/dep/StormLibOld/src/libtommath/bn_mp_to_signed_bin_n.c
deleted file mode 100644
index e119c380a..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_to_signed_bin_n.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_TO_SIGNED_BIN_N_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* store in signed [big endian] format */
-int mp_to_signed_bin_n (mp_int * a, unsigned char *b, unsigned long *outlen)
-{
-   if (*outlen < (unsigned long)mp_signed_bin_size(a)) {
-      return MP_VAL;
-   }
-   *outlen = mp_signed_bin_size(a);
-   return mp_to_signed_bin(a, b);
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_to_signed_bin_n.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_to_unsigned_bin.c b/dep/StormLibOld/src/libtommath/bn_mp_to_unsigned_bin.c
deleted file mode 100644
index ce69e5bf3..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_to_unsigned_bin.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_TO_UNSIGNED_BIN_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* store in unsigned [big endian] format */
-int mp_to_unsigned_bin (mp_int * a, unsigned char *b)
-{
-  int     x, res;
-  mp_int  t;
-
-  if ((res = mp_init_copy (&t, a)) != MP_OKAY) {
-    return res;
-  }
-
-  x = 0;
-  while (mp_iszero (&t) == 0) {
-#ifndef MP_8BIT
-      b[x++] = (unsigned char) (t.dp[0] & 255);
-#else
-      b[x++] = (unsigned char) (t.dp[0] | ((t.dp[1] & 0x01) << 7));
-#endif
-    if ((res = mp_div_2d (&t, 8, &t, NULL)) != MP_OKAY) {
-      mp_clear (&t);
-      return res;
-    }
-  }
-  bn_reverse (b, x);
-  mp_clear (&t);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_to_unsigned_bin.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_to_unsigned_bin_n.c b/dep/StormLibOld/src/libtommath/bn_mp_to_unsigned_bin_n.c
deleted file mode 100644
index dfa27c41b..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_to_unsigned_bin_n.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_TO_UNSIGNED_BIN_N_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* store in unsigned [big endian] format */
-int mp_to_unsigned_bin_n (mp_int * a, unsigned char *b, unsigned long *outlen)
-{
-   if (*outlen < (unsigned long)mp_unsigned_bin_size(a)) {
-      return MP_VAL;
-   }
-   *outlen = mp_unsigned_bin_size(a);
-   return mp_to_unsigned_bin(a, b);
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_to_unsigned_bin_n.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_toom_mul.c b/dep/StormLibOld/src/libtommath/bn_mp_toom_mul.c
deleted file mode 100644
index e48c6b355..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_toom_mul.c
+++ /dev/null
@@ -1,284 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_TOOM_MUL_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* multiplication using the Toom-Cook 3-way algorithm 
- *
- * Much more complicated than Karatsuba but has a lower 
- * asymptotic running time of O(N**1.464).  This algorithm is 
- * only particularly useful on VERY large inputs 
- * (we're talking 1000s of digits here...).
-*/
-int mp_toom_mul(mp_int *a, mp_int *b, mp_int *c)
-{
-    mp_int w0, w1, w2, w3, w4, tmp1, tmp2, a0, a1, a2, b0, b1, b2;
-    int res, B;
-        
-    /* init temps */
-    if ((res = mp_init_multi(&w0, &w1, &w2, &w3, &w4, 
-                             &a0, &a1, &a2, &b0, &b1, 
-                             &b2, &tmp1, &tmp2, NULL)) != MP_OKAY) {
-       return res;
-    }
-    
-    /* B */
-    B = MIN(a->used, b->used) / 3;
-    
-    /* a = a2 * B**2 + a1 * B + a0 */
-    if ((res = mp_mod_2d(a, DIGIT_BIT * B, &a0)) != MP_OKAY) {
-       goto ERR;
-    }
-
-    if ((res = mp_copy(a, &a1)) != MP_OKAY) {
-       goto ERR;
-    }
-    mp_rshd(&a1, B);
-    mp_mod_2d(&a1, DIGIT_BIT * B, &a1);
-
-    if ((res = mp_copy(a, &a2)) != MP_OKAY) {
-       goto ERR;
-    }
-    mp_rshd(&a2, B*2);
-    
-    /* b = b2 * B**2 + b1 * B + b0 */
-    if ((res = mp_mod_2d(b, DIGIT_BIT * B, &b0)) != MP_OKAY) {
-       goto ERR;
-    }
-
-    if ((res = mp_copy(b, &b1)) != MP_OKAY) {
-       goto ERR;
-    }
-    mp_rshd(&b1, B);
-    mp_mod_2d(&b1, DIGIT_BIT * B, &b1);
-
-    if ((res = mp_copy(b, &b2)) != MP_OKAY) {
-       goto ERR;
-    }
-    mp_rshd(&b2, B*2);
-    
-    /* w0 = a0*b0 */
-    if ((res = mp_mul(&a0, &b0, &w0)) != MP_OKAY) {
-       goto ERR;
-    }
-    
-    /* w4 = a2 * b2 */
-    if ((res = mp_mul(&a2, &b2, &w4)) != MP_OKAY) {
-       goto ERR;
-    }
-    
-    /* w1 = (a2 + 2(a1 + 2a0))(b2 + 2(b1 + 2b0)) */
-    if ((res = mp_mul_2(&a0, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp1, &a1, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_mul_2(&tmp1, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp1, &a2, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    
-    if ((res = mp_mul_2(&b0, &tmp2)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp2, &b1, &tmp2)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_mul_2(&tmp2, &tmp2)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp2, &b2, &tmp2)) != MP_OKAY) {
-       goto ERR;
-    }
-    
-    if ((res = mp_mul(&tmp1, &tmp2, &w1)) != MP_OKAY) {
-       goto ERR;
-    }
-    
-    /* w3 = (a0 + 2(a1 + 2a2))(b0 + 2(b1 + 2b2)) */
-    if ((res = mp_mul_2(&a2, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp1, &a1, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_mul_2(&tmp1, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp1, &a0, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    
-    if ((res = mp_mul_2(&b2, &tmp2)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp2, &b1, &tmp2)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_mul_2(&tmp2, &tmp2)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp2, &b0, &tmp2)) != MP_OKAY) {
-       goto ERR;
-    }
-    
-    if ((res = mp_mul(&tmp1, &tmp2, &w3)) != MP_OKAY) {
-       goto ERR;
-    }
-    
-
-    /* w2 = (a2 + a1 + a0)(b2 + b1 + b0) */
-    if ((res = mp_add(&a2, &a1, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp1, &a0, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&b2, &b1, &tmp2)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp2, &b0, &tmp2)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_mul(&tmp1, &tmp2, &w2)) != MP_OKAY) {
-       goto ERR;
-    }
-    
-    /* now solve the matrix 
-    
-       0  0  0  0  1
-       1  2  4  8  16
-       1  1  1  1  1
-       16 8  4  2  1
-       1  0  0  0  0
-       
-       using 12 subtractions, 4 shifts, 
-              2 small divisions and 1 small multiplication 
-     */
-     
-     /* r1 - r4 */
-     if ((res = mp_sub(&w1, &w4, &w1)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r3 - r0 */
-     if ((res = mp_sub(&w3, &w0, &w3)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r1/2 */
-     if ((res = mp_div_2(&w1, &w1)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r3/2 */
-     if ((res = mp_div_2(&w3, &w3)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r2 - r0 - r4 */
-     if ((res = mp_sub(&w2, &w0, &w2)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_sub(&w2, &w4, &w2)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r1 - r2 */
-     if ((res = mp_sub(&w1, &w2, &w1)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r3 - r2 */
-     if ((res = mp_sub(&w3, &w2, &w3)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r1 - 8r0 */
-     if ((res = mp_mul_2d(&w0, 3, &tmp1)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_sub(&w1, &tmp1, &w1)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r3 - 8r4 */
-     if ((res = mp_mul_2d(&w4, 3, &tmp1)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_sub(&w3, &tmp1, &w3)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* 3r2 - r1 - r3 */
-     if ((res = mp_mul_d(&w2, 3, &w2)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_sub(&w2, &w1, &w2)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_sub(&w2, &w3, &w2)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r1 - r2 */
-     if ((res = mp_sub(&w1, &w2, &w1)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r3 - r2 */
-     if ((res = mp_sub(&w3, &w2, &w3)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r1/3 */
-     if ((res = mp_div_3(&w1, &w1, NULL)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r3/3 */
-     if ((res = mp_div_3(&w3, &w3, NULL)) != MP_OKAY) {
-        goto ERR;
-     }
-     
-     /* at this point shift W[n] by B*n */
-     if ((res = mp_lshd(&w1, 1*B)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_lshd(&w2, 2*B)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_lshd(&w3, 3*B)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_lshd(&w4, 4*B)) != MP_OKAY) {
-        goto ERR;
-     }     
-     
-     if ((res = mp_add(&w0, &w1, c)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_add(&w2, &w3, &tmp1)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_add(&w4, &tmp1, &tmp1)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_add(&tmp1, c, c)) != MP_OKAY) {
-        goto ERR;
-     }     
-     
-ERR:
-     mp_clear_multi(&w0, &w1, &w2, &w3, &w4, 
-                    &a0, &a1, &a2, &b0, &b1, 
-                    &b2, &tmp1, &tmp2, NULL);
-     return res;
-}     
-     
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_toom_mul.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_toom_sqr.c b/dep/StormLibOld/src/libtommath/bn_mp_toom_sqr.c
deleted file mode 100644
index fd8bc672a..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_toom_sqr.c
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_TOOM_SQR_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* squaring using Toom-Cook 3-way algorithm */
-int
-mp_toom_sqr(mp_int *a, mp_int *b)
-{
-    mp_int w0, w1, w2, w3, w4, tmp1, a0, a1, a2;
-    int res, B;
-
-    /* init temps */
-    if ((res = mp_init_multi(&w0, &w1, &w2, &w3, &w4, &a0, &a1, &a2, &tmp1, NULL)) != MP_OKAY) {
-       return res;
-    }
-
-    /* B */
-    B = a->used / 3;
-
-    /* a = a2 * B**2 + a1 * B + a0 */
-    if ((res = mp_mod_2d(a, DIGIT_BIT * B, &a0)) != MP_OKAY) {
-       goto ERR;
-    }
-
-    if ((res = mp_copy(a, &a1)) != MP_OKAY) {
-       goto ERR;
-    }
-    mp_rshd(&a1, B);
-    mp_mod_2d(&a1, DIGIT_BIT * B, &a1);
-
-    if ((res = mp_copy(a, &a2)) != MP_OKAY) {
-       goto ERR;
-    }
-    mp_rshd(&a2, B*2);
-
-    /* w0 = a0*a0 */
-    if ((res = mp_sqr(&a0, &w0)) != MP_OKAY) {
-       goto ERR;
-    }
-
-    /* w4 = a2 * a2 */
-    if ((res = mp_sqr(&a2, &w4)) != MP_OKAY) {
-       goto ERR;
-    }
-
-    /* w1 = (a2 + 2(a1 + 2a0))**2 */
-    if ((res = mp_mul_2(&a0, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp1, &a1, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_mul_2(&tmp1, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp1, &a2, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-
-    if ((res = mp_sqr(&tmp1, &w1)) != MP_OKAY) {
-       goto ERR;
-    }
-
-    /* w3 = (a0 + 2(a1 + 2a2))**2 */
-    if ((res = mp_mul_2(&a2, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp1, &a1, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_mul_2(&tmp1, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp1, &a0, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-
-    if ((res = mp_sqr(&tmp1, &w3)) != MP_OKAY) {
-       goto ERR;
-    }
-
-
-    /* w2 = (a2 + a1 + a0)**2 */
-    if ((res = mp_add(&a2, &a1, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_add(&tmp1, &a0, &tmp1)) != MP_OKAY) {
-       goto ERR;
-    }
-    if ((res = mp_sqr(&tmp1, &w2)) != MP_OKAY) {
-       goto ERR;
-    }
-
-    /* now solve the matrix
-
-       0  0  0  0  1
-       1  2  4  8  16
-       1  1  1  1  1
-       16 8  4  2  1
-       1  0  0  0  0
-
-       using 12 subtractions, 4 shifts, 2 small divisions and 1 small multiplication.
-     */
-
-     /* r1 - r4 */
-     if ((res = mp_sub(&w1, &w4, &w1)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r3 - r0 */
-     if ((res = mp_sub(&w3, &w0, &w3)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r1/2 */
-     if ((res = mp_div_2(&w1, &w1)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r3/2 */
-     if ((res = mp_div_2(&w3, &w3)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r2 - r0 - r4 */
-     if ((res = mp_sub(&w2, &w0, &w2)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_sub(&w2, &w4, &w2)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r1 - r2 */
-     if ((res = mp_sub(&w1, &w2, &w1)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r3 - r2 */
-     if ((res = mp_sub(&w3, &w2, &w3)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r1 - 8r0 */
-     if ((res = mp_mul_2d(&w0, 3, &tmp1)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_sub(&w1, &tmp1, &w1)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r3 - 8r4 */
-     if ((res = mp_mul_2d(&w4, 3, &tmp1)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_sub(&w3, &tmp1, &w3)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* 3r2 - r1 - r3 */
-     if ((res = mp_mul_d(&w2, 3, &w2)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_sub(&w2, &w1, &w2)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_sub(&w2, &w3, &w2)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r1 - r2 */
-     if ((res = mp_sub(&w1, &w2, &w1)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r3 - r2 */
-     if ((res = mp_sub(&w3, &w2, &w3)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r1/3 */
-     if ((res = mp_div_3(&w1, &w1, NULL)) != MP_OKAY) {
-        goto ERR;
-     }
-     /* r3/3 */
-     if ((res = mp_div_3(&w3, &w3, NULL)) != MP_OKAY) {
-        goto ERR;
-     }
-
-     /* at this point shift W[n] by B*n */
-     if ((res = mp_lshd(&w1, 1*B)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_lshd(&w2, 2*B)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_lshd(&w3, 3*B)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_lshd(&w4, 4*B)) != MP_OKAY) {
-        goto ERR;
-     }
-
-     if ((res = mp_add(&w0, &w1, b)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_add(&w2, &w3, &tmp1)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_add(&w4, &tmp1, &tmp1)) != MP_OKAY) {
-        goto ERR;
-     }
-     if ((res = mp_add(&tmp1, b, b)) != MP_OKAY) {
-        goto ERR;
-     }
-
-ERR:
-     mp_clear_multi(&w0, &w1, &w2, &w3, &w4, &a0, &a1, &a2, &tmp1, NULL);
-     return res;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_toom_sqr.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_toradix.c b/dep/StormLibOld/src/libtommath/bn_mp_toradix.c
deleted file mode 100644
index 539abe9ba..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_toradix.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_TORADIX_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* stores a bignum as a ASCII string in a given radix (2..64) */
-int mp_toradix (mp_int * a, char *str, int radix)
-{
-  int     res, digs;
-  mp_int  t;
-  mp_digit d;
-  char   *_s = str;
-
-  /* check range of the radix */
-  if (radix < 2 || radix > 64) {
-    return MP_VAL;
-  }
-
-  /* quick out if its zero */
-  if (mp_iszero(a) == 1) {
-     *str++ = '0';
-     *str = '\0';
-     return MP_OKAY;
-  }
-
-  if ((res = mp_init_copy (&t, a)) != MP_OKAY) {
-    return res;
-  }
-
-  /* if it is negative output a - */
-  if (t.sign == MP_NEG) {
-    ++_s;
-    *str++ = '-';
-    t.sign = MP_ZPOS;
-  }
-
-  digs = 0;
-  while (mp_iszero (&t) == 0) {
-    if ((res = mp_div_d (&t, (mp_digit) radix, &t, &d)) != MP_OKAY) {
-      mp_clear (&t);
-      return res;
-    }
-    *str++ = mp_s_rmap[d];
-    ++digs;
-  }
-
-  /* reverse the digits of the string.  In this case _s points
-   * to the first digit [exluding the sign] of the number]
-   */
-  bn_reverse ((unsigned char *)_s, digs);
-
-  /* append a NULL so the string is properly terminated */
-  *str = '\0';
-
-  mp_clear (&t);
-  return MP_OKAY;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_toradix.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_toradix_n.c b/dep/StormLibOld/src/libtommath/bn_mp_toradix_n.c
deleted file mode 100644
index 0322f8d4b..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_toradix_n.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_TORADIX_N_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* stores a bignum as a ASCII string in a given radix (2..64) 
- *
- * Stores upto maxlen-1 chars and always a NULL byte 
- */
-int mp_toradix_n(mp_int * a, char *str, int radix, int maxlen)
-{
-  int     res, digs;
-  mp_int  t;
-  mp_digit d;
-  char   *_s = str;
-
-  /* check range of the maxlen, radix */
-  if (maxlen < 2 || radix < 2 || radix > 64) {
-    return MP_VAL;
-  }
-
-  /* quick out if its zero */
-  if (mp_iszero(a) == MP_YES) {
-     *str++ = '0';
-     *str = '\0';
-     return MP_OKAY;
-  }
-
-  if ((res = mp_init_copy (&t, a)) != MP_OKAY) {
-    return res;
-  }
-
-  /* if it is negative output a - */
-  if (t.sign == MP_NEG) {
-    /* we have to reverse our digits later... but not the - sign!! */
-    ++_s;
-
-    /* store the flag and mark the number as positive */
-    *str++ = '-';
-    t.sign = MP_ZPOS;
- 
-    /* subtract a char */
-    --maxlen;
-  }
-
-  digs = 0;
-  while (mp_iszero (&t) == 0) {
-    if (--maxlen < 1) {
-       /* no more room */
-       break;
-    }
-    if ((res = mp_div_d (&t, (mp_digit) radix, &t, &d)) != MP_OKAY) {
-      mp_clear (&t);
-      return res;
-    }
-    *str++ = mp_s_rmap[d];
-    ++digs;
-  }
-
-  /* reverse the digits of the string.  In this case _s points
-   * to the first digit [exluding the sign] of the number
-   */
-  bn_reverse ((unsigned char *)_s, digs);
-
-  /* append a NULL so the string is properly terminated */
-  *str = '\0';
-
-  mp_clear (&t);
-  return MP_OKAY;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_toradix_n.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_unsigned_bin_size.c b/dep/StormLibOld/src/libtommath/bn_mp_unsigned_bin_size.c
deleted file mode 100644
index 88f3e92dd..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_unsigned_bin_size.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_UNSIGNED_BIN_SIZE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* get the size for an unsigned equivalent */
-int mp_unsigned_bin_size (mp_int * a)
-{
-  int     size = mp_count_bits (a);
-  return (size / 8 + ((size & 7) != 0 ? 1 : 0));
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_unsigned_bin_size.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_xor.c b/dep/StormLibOld/src/libtommath/bn_mp_xor.c
deleted file mode 100644
index bf0446ecf..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_xor.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_XOR_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* XOR two ints together */
-int
-mp_xor (mp_int * a, mp_int * b, mp_int * c)
-{
-  int     res, ix, px;
-  mp_int  t, *x;
-
-  if (a->used > b->used) {
-    if ((res = mp_init_copy (&t, a)) != MP_OKAY) {
-      return res;
-    }
-    px = b->used;
-    x = b;
-  } else {
-    if ((res = mp_init_copy (&t, b)) != MP_OKAY) {
-      return res;
-    }
-    px = a->used;
-    x = a;
-  }
-
-  for (ix = 0; ix < px; ix++) {
-     t.dp[ix] ^= x->dp[ix];
-  }
-  mp_clamp (&t);
-  mp_exch (c, &t);
-  mp_clear (&t);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_xor.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_mp_zero.c b/dep/StormLibOld/src/libtommath/bn_mp_zero.c
deleted file mode 100644
index f21db5ed5..000000000
--- a/dep/StormLibOld/src/libtommath/bn_mp_zero.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "tommath.h"
-#ifdef BN_MP_ZERO_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* set to zero */
-void mp_zero (mp_int * a)
-{
-  int       n;
-  mp_digit *tmp;
-
-  a->sign = MP_ZPOS;
-  a->used = 0;
-
-  tmp = a->dp;
-  for (n = 0; n < a->alloc; n++) {
-     *tmp++ = 0;
-  }
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_mp_zero.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_prime_tab.c b/dep/StormLibOld/src/libtommath/bn_prime_tab.c
deleted file mode 100644
index 7d306dd56..000000000
--- a/dep/StormLibOld/src/libtommath/bn_prime_tab.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "tommath.h"
-#ifdef BN_PRIME_TAB_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-const mp_digit ltm_prime_tab[] = {
-  0x0002, 0x0003, 0x0005, 0x0007, 0x000B, 0x000D, 0x0011, 0x0013,
-  0x0017, 0x001D, 0x001F, 0x0025, 0x0029, 0x002B, 0x002F, 0x0035,
-  0x003B, 0x003D, 0x0043, 0x0047, 0x0049, 0x004F, 0x0053, 0x0059,
-  0x0061, 0x0065, 0x0067, 0x006B, 0x006D, 0x0071, 0x007F,
-#ifndef MP_8BIT
-  0x0083,
-  0x0089, 0x008B, 0x0095, 0x0097, 0x009D, 0x00A3, 0x00A7, 0x00AD,
-  0x00B3, 0x00B5, 0x00BF, 0x00C1, 0x00C5, 0x00C7, 0x00D3, 0x00DF,
-  0x00E3, 0x00E5, 0x00E9, 0x00EF, 0x00F1, 0x00FB, 0x0101, 0x0107,
-  0x010D, 0x010F, 0x0115, 0x0119, 0x011B, 0x0125, 0x0133, 0x0137,
-
-  0x0139, 0x013D, 0x014B, 0x0151, 0x015B, 0x015D, 0x0161, 0x0167,
-  0x016F, 0x0175, 0x017B, 0x017F, 0x0185, 0x018D, 0x0191, 0x0199,
-  0x01A3, 0x01A5, 0x01AF, 0x01B1, 0x01B7, 0x01BB, 0x01C1, 0x01C9,
-  0x01CD, 0x01CF, 0x01D3, 0x01DF, 0x01E7, 0x01EB, 0x01F3, 0x01F7,
-  0x01FD, 0x0209, 0x020B, 0x021D, 0x0223, 0x022D, 0x0233, 0x0239,
-  0x023B, 0x0241, 0x024B, 0x0251, 0x0257, 0x0259, 0x025F, 0x0265,
-  0x0269, 0x026B, 0x0277, 0x0281, 0x0283, 0x0287, 0x028D, 0x0293,
-  0x0295, 0x02A1, 0x02A5, 0x02AB, 0x02B3, 0x02BD, 0x02C5, 0x02CF,
-
-  0x02D7, 0x02DD, 0x02E3, 0x02E7, 0x02EF, 0x02F5, 0x02F9, 0x0301,
-  0x0305, 0x0313, 0x031D, 0x0329, 0x032B, 0x0335, 0x0337, 0x033B,
-  0x033D, 0x0347, 0x0355, 0x0359, 0x035B, 0x035F, 0x036D, 0x0371,
-  0x0373, 0x0377, 0x038B, 0x038F, 0x0397, 0x03A1, 0x03A9, 0x03AD,
-  0x03B3, 0x03B9, 0x03C7, 0x03CB, 0x03D1, 0x03D7, 0x03DF, 0x03E5,
-  0x03F1, 0x03F5, 0x03FB, 0x03FD, 0x0407, 0x0409, 0x040F, 0x0419,
-  0x041B, 0x0425, 0x0427, 0x042D, 0x043F, 0x0443, 0x0445, 0x0449,
-  0x044F, 0x0455, 0x045D, 0x0463, 0x0469, 0x047F, 0x0481, 0x048B,
-
-  0x0493, 0x049D, 0x04A3, 0x04A9, 0x04B1, 0x04BD, 0x04C1, 0x04C7,
-  0x04CD, 0x04CF, 0x04D5, 0x04E1, 0x04EB, 0x04FD, 0x04FF, 0x0503,
-  0x0509, 0x050B, 0x0511, 0x0515, 0x0517, 0x051B, 0x0527, 0x0529,
-  0x052F, 0x0551, 0x0557, 0x055D, 0x0565, 0x0577, 0x0581, 0x058F,
-  0x0593, 0x0595, 0x0599, 0x059F, 0x05A7, 0x05AB, 0x05AD, 0x05B3,
-  0x05BF, 0x05C9, 0x05CB, 0x05CF, 0x05D1, 0x05D5, 0x05DB, 0x05E7,
-  0x05F3, 0x05FB, 0x0607, 0x060D, 0x0611, 0x0617, 0x061F, 0x0623,
-  0x062B, 0x062F, 0x063D, 0x0641, 0x0647, 0x0649, 0x064D, 0x0653
-#endif
-};
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_prime_tab.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_reverse.c b/dep/StormLibOld/src/libtommath/bn_reverse.c
deleted file mode 100644
index d4a919af4..000000000
--- a/dep/StormLibOld/src/libtommath/bn_reverse.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "tommath.h"
-#ifdef BN_REVERSE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* reverse an array, used for radix code */
-void
-bn_reverse (unsigned char *s, int len)
-{
-  int     ix, iy;
-  unsigned char t;
-
-  ix = 0;
-  iy = len - 1;
-  while (ix < iy) {
-    t     = s[ix];
-    s[ix] = s[iy];
-    s[iy] = t;
-    ++ix;
-    --iy;
-  }
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_reverse.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_s_mp_add.c b/dep/StormLibOld/src/libtommath/bn_s_mp_add.c
deleted file mode 100644
index 5ea9c6d20..000000000
--- a/dep/StormLibOld/src/libtommath/bn_s_mp_add.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include "tommath.h"
-#ifdef BN_S_MP_ADD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* low level addition, based on HAC pp.594, Algorithm 14.7 */
-int
-s_mp_add (mp_int * a, mp_int * b, mp_int * c)
-{
-  mp_int *x;
-  int     olduse, res, min, max;
-
-  /* find sizes, we let |a| <= |b| which means we have to sort
-   * them.  "x" will point to the input with the most digits
-   */
-  if (a->used > b->used) {
-    min = b->used;
-    max = a->used;
-    x = a;
-  } else {
-    min = a->used;
-    max = b->used;
-    x = b;
-  }
-
-  /* init result */
-  if (c->alloc < max + 1) {
-    if ((res = mp_grow (c, max + 1)) != MP_OKAY) {
-      return res;
-    }
-  }
-
-  /* get old used digit count and set new one */
-  olduse = c->used;
-  c->used = max + 1;
-
-  {
-    register mp_digit u, *tmpa, *tmpb, *tmpc;
-    register int i;
-
-    /* alias for digit pointers */
-
-    /* first input */
-    tmpa = a->dp;
-
-    /* second input */
-    tmpb = b->dp;
-
-    /* destination */
-    tmpc = c->dp;
-
-    /* zero the carry */
-    u = 0;
-    for (i = 0; i < min; i++) {
-      /* Compute the sum at one digit, T[i] = A[i] + B[i] + U */
-      *tmpc = *tmpa++ + *tmpb++ + u;
-
-      /* U = carry bit of T[i] */
-      u = *tmpc >> ((mp_digit)DIGIT_BIT);
-
-      /* take away carry bit from T[i] */
-      *tmpc++ &= MP_MASK;
-    }
-
-    /* now copy higher words if any, that is in A+B 
-     * if A or B has more digits add those in 
-     */
-    if (min != max) {
-      for (; i < max; i++) {
-        /* T[i] = X[i] + U */
-        *tmpc = x->dp[i] + u;
-
-        /* U = carry bit of T[i] */
-        u = *tmpc >> ((mp_digit)DIGIT_BIT);
-
-        /* take away carry bit from T[i] */
-        *tmpc++ &= MP_MASK;
-      }
-    }
-
-    /* add carry */
-    *tmpc++ = u;
-
-    /* clear digits above oldused */
-    for (i = c->used; i < olduse; i++) {
-      *tmpc++ = 0;
-    }
-  }
-
-  mp_clamp (c);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_s_mp_add.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_s_mp_exptmod.c b/dep/StormLibOld/src/libtommath/bn_s_mp_exptmod.c
deleted file mode 100644
index 9fb2da8fd..000000000
--- a/dep/StormLibOld/src/libtommath/bn_s_mp_exptmod.c
+++ /dev/null
@@ -1,252 +0,0 @@
-#include "tommath.h"
-#ifdef BN_S_MP_EXPTMOD_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-#ifdef MP_LOW_MEM
-   #define TAB_SIZE 32
-#else
-   #define TAB_SIZE 256
-#endif
-
-int s_mp_exptmod (mp_int * G, mp_int * X, mp_int * P, mp_int * Y, int redmode)
-{
-  mp_int  M[TAB_SIZE], res, mu;
-  mp_digit buf;
-  int     err, bitbuf, bitcpy, bitcnt, mode, digidx, x, y, winsize;
-  int (*redux)(mp_int*,mp_int*,mp_int*);
-
-  /* find window size */
-  x = mp_count_bits (X);
-  if (x <= 7) {
-    winsize = 2;
-  } else if (x <= 36) {
-    winsize = 3;
-  } else if (x <= 140) {
-    winsize = 4;
-  } else if (x <= 450) {
-    winsize = 5;
-  } else if (x <= 1303) {
-    winsize = 6;
-  } else if (x <= 3529) {
-    winsize = 7;
-  } else {
-    winsize = 8;
-  }
-
-#ifdef MP_LOW_MEM
-    if (winsize > 5) {
-       winsize = 5;
-    }
-#endif
-
-  /* init M array */
-  /* init first cell */
-  if ((err = mp_init(&M[1])) != MP_OKAY) {
-     return err; 
-  }
-
-  /* now init the second half of the array */
-  for (x = 1<<(winsize-1); x < (1 << winsize); x++) {
-    if ((err = mp_init(&M[x])) != MP_OKAY) {
-      for (y = 1<<(winsize-1); y < x; y++) {
-        mp_clear (&M[y]);
-      }
-      mp_clear(&M[1]);
-      return err;
-    }
-  }
-
-  /* create mu, used for Barrett reduction */
-  if ((err = mp_init (&mu)) != MP_OKAY) {
-    goto LBL_M;
-  }
-  
-  if (redmode == 0) {
-     if ((err = mp_reduce_setup (&mu, P)) != MP_OKAY) {
-        goto LBL_MU;
-     }
-     redux = mp_reduce;
-  } else {
-     if ((err = mp_reduce_2k_setup_l (P, &mu)) != MP_OKAY) {
-        goto LBL_MU;
-     }
-     redux = mp_reduce_2k_l;
-  }    
-
-  /* create M table
-   *
-   * The M table contains powers of the base, 
-   * e.g. M[x] = G**x mod P
-   *
-   * The first half of the table is not 
-   * computed though accept for M[0] and M[1]
-   */
-  if ((err = mp_mod (G, P, &M[1])) != MP_OKAY) {
-    goto LBL_MU;
-  }
-
-  /* compute the value at M[1<<(winsize-1)] by squaring 
-   * M[1] (winsize-1) times 
-   */
-  if ((err = mp_copy (&M[1], &M[1 << (winsize - 1)])) != MP_OKAY) {
-    goto LBL_MU;
-  }
-
-  for (x = 0; x < (winsize - 1); x++) {
-    /* square it */
-    if ((err = mp_sqr (&M[1 << (winsize - 1)], 
-                       &M[1 << (winsize - 1)])) != MP_OKAY) {
-      goto LBL_MU;
-    }
-
-    /* reduce modulo P */
-    if ((err = redux (&M[1 << (winsize - 1)], P, &mu)) != MP_OKAY) {
-      goto LBL_MU;
-    }
-  }
-
-  /* create upper table, that is M[x] = M[x-1] * M[1] (mod P)
-   * for x = (2**(winsize - 1) + 1) to (2**winsize - 1)
-   */
-  for (x = (1 << (winsize - 1)) + 1; x < (1 << winsize); x++) {
-    if ((err = mp_mul (&M[x - 1], &M[1], &M[x])) != MP_OKAY) {
-      goto LBL_MU;
-    }
-    if ((err = redux (&M[x], P, &mu)) != MP_OKAY) {
-      goto LBL_MU;
-    }
-  }
-
-  /* setup result */
-  if ((err = mp_init (&res)) != MP_OKAY) {
-    goto LBL_MU;
-  }
-  mp_set (&res, 1);
-
-  /* set initial mode and bit cnt */
-  mode   = 0;
-  bitcnt = 1;
-  buf    = 0;
-  digidx = X->used - 1;
-  bitcpy = 0;
-  bitbuf = 0;
-
-  for (;;) {
-    /* grab next digit as required */
-    if (--bitcnt == 0) {
-      /* if digidx == -1 we are out of digits */
-      if (digidx == -1) {
-        break;
-      }
-      /* read next digit and reset the bitcnt */
-      buf    = X->dp[digidx--];
-      bitcnt = (int) DIGIT_BIT;
-    }
-
-    /* grab the next msb from the exponent */
-    y     = (buf >> (mp_digit)(DIGIT_BIT - 1)) & 1;
-    buf <<= (mp_digit)1;
-
-    /* if the bit is zero and mode == 0 then we ignore it
-     * These represent the leading zero bits before the first 1 bit
-     * in the exponent.  Technically this opt is not required but it
-     * does lower the # of trivial squaring/reductions used
-     */
-    if (mode == 0 && y == 0) {
-      continue;
-    }
-
-    /* if the bit is zero and mode == 1 then we square */
-    if (mode == 1 && y == 0) {
-      if ((err = mp_sqr (&res, &res)) != MP_OKAY) {
-        goto LBL_RES;
-      }
-      if ((err = redux (&res, P, &mu)) != MP_OKAY) {
-        goto LBL_RES;
-      }
-      continue;
-    }
-
-    /* else we add it to the window */
-    bitbuf |= (y << (winsize - ++bitcpy));
-    mode    = 2;
-
-    if (bitcpy == winsize) {
-      /* ok window is filled so square as required and multiply  */
-      /* square first */
-      for (x = 0; x < winsize; x++) {
-        if ((err = mp_sqr (&res, &res)) != MP_OKAY) {
-          goto LBL_RES;
-        }
-        if ((err = redux (&res, P, &mu)) != MP_OKAY) {
-          goto LBL_RES;
-        }
-      }
-
-      /* then multiply */
-      if ((err = mp_mul (&res, &M[bitbuf], &res)) != MP_OKAY) {
-        goto LBL_RES;
-      }
-      if ((err = redux (&res, P, &mu)) != MP_OKAY) {
-        goto LBL_RES;
-      }
-
-      /* empty window and reset */
-      bitcpy = 0;
-      bitbuf = 0;
-      mode   = 1;
-    }
-  }
-
-  /* if bits remain then square/multiply */
-  if (mode == 2 && bitcpy > 0) {
-    /* square then multiply if the bit is set */
-    for (x = 0; x < bitcpy; x++) {
-      if ((err = mp_sqr (&res, &res)) != MP_OKAY) {
-        goto LBL_RES;
-      }
-      if ((err = redux (&res, P, &mu)) != MP_OKAY) {
-        goto LBL_RES;
-      }
-
-      bitbuf <<= 1;
-      if ((bitbuf & (1 << winsize)) != 0) {
-        /* then multiply */
-        if ((err = mp_mul (&res, &M[1], &res)) != MP_OKAY) {
-          goto LBL_RES;
-        }
-        if ((err = redux (&res, P, &mu)) != MP_OKAY) {
-          goto LBL_RES;
-        }
-      }
-    }
-  }
-
-  mp_exch (&res, Y);
-  err = MP_OKAY;
-LBL_RES:mp_clear (&res);
-LBL_MU:mp_clear (&mu);
-LBL_M:
-  mp_clear(&M[1]);
-  for (x = 1<<(winsize-1); x < (1 << winsize); x++) {
-    mp_clear (&M[x]);
-  }
-  return err;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_s_mp_exptmod.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_s_mp_mul_digs.c b/dep/StormLibOld/src/libtommath/bn_s_mp_mul_digs.c
deleted file mode 100644
index f04dacfb9..000000000
--- a/dep/StormLibOld/src/libtommath/bn_s_mp_mul_digs.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "tommath.h"
-#ifdef BN_S_MP_MUL_DIGS_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* multiplies |a| * |b| and only computes upto digs digits of result
- * HAC pp. 595, Algorithm 14.12  Modified so you can control how 
- * many digits of output are created.
- */
-int s_mp_mul_digs (mp_int * a, mp_int * b, mp_int * c, int digs)
-{
-  mp_int  t;
-  int     res, pa, pb, ix, iy;
-  mp_digit u;
-  mp_word r;
-  mp_digit tmpx, *tmpt, *tmpy;
-
-  /* can we use the fast multiplier? */
-  if (((digs) < MP_WARRAY) &&
-      MIN (a->used, b->used) < 
-          (1 << ((CHAR_BIT * sizeof (mp_word)) - (2 * DIGIT_BIT)))) {
-    return fast_s_mp_mul_digs (a, b, c, digs);
-  }
-
-  if ((res = mp_init_size (&t, digs)) != MP_OKAY) {
-    return res;
-  }
-  t.used = digs;
-
-  /* compute the digits of the product directly */
-  pa = a->used;
-  for (ix = 0; ix < pa; ix++) {
-    /* set the carry to zero */
-    u = 0;
-
-    /* limit ourselves to making digs digits of output */
-    pb = MIN (b->used, digs - ix);
-
-    /* setup some aliases */
-    /* copy of the digit from a used within the nested loop */
-    tmpx = a->dp[ix];
-    
-    /* an alias for the destination shifted ix places */
-    tmpt = t.dp + ix;
-    
-    /* an alias for the digits of b */
-    tmpy = b->dp;
-
-    /* compute the columns of the output and propagate the carry */
-    for (iy = 0; iy < pb; iy++) {
-      /* compute the column as a mp_word */
-      r       = ((mp_word)*tmpt) +
-                ((mp_word)tmpx) * ((mp_word)*tmpy++) +
-                ((mp_word) u);
-
-      /* the new column is the lower part of the result */
-      *tmpt++ = (mp_digit) (r & ((mp_word) MP_MASK));
-
-      /* get the carry word from the result */
-      u       = (mp_digit) (r >> ((mp_word) DIGIT_BIT));
-    }
-    /* set carry if it is placed below digs */
-    if (ix + iy < digs) {
-      *tmpt = u;
-    }
-  }
-
-  mp_clamp (&t);
-  mp_exch (&t, c);
-
-  mp_clear (&t);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_s_mp_mul_digs.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_s_mp_mul_high_digs.c b/dep/StormLibOld/src/libtommath/bn_s_mp_mul_high_digs.c
deleted file mode 100644
index b1d019925..000000000
--- a/dep/StormLibOld/src/libtommath/bn_s_mp_mul_high_digs.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "tommath.h"
-#ifdef BN_S_MP_MUL_HIGH_DIGS_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* multiplies |a| * |b| and does not compute the lower digs digits
- * [meant to get the higher part of the product]
- */
-int
-s_mp_mul_high_digs (mp_int * a, mp_int * b, mp_int * c, int digs)
-{
-  mp_int  t;
-  int     res, pa, pb, ix, iy;
-  mp_digit u;
-  mp_word r;
-  mp_digit tmpx, *tmpt, *tmpy;
-
-  /* can we use the fast multiplier? */
-#ifdef BN_FAST_S_MP_MUL_HIGH_DIGS_C
-  if (((a->used + b->used + 1) < MP_WARRAY)
-      && MIN (a->used, b->used) < (1 << ((CHAR_BIT * sizeof (mp_word)) - (2 * DIGIT_BIT)))) {
-    return fast_s_mp_mul_high_digs (a, b, c, digs);
-  }
-#endif
-
-  if ((res = mp_init_size (&t, a->used + b->used + 1)) != MP_OKAY) {
-    return res;
-  }
-  t.used = a->used + b->used + 1;
-
-  pa = a->used;
-  pb = b->used;
-  for (ix = 0; ix < pa; ix++) {
-    /* clear the carry */
-    u = 0;
-
-    /* left hand side of A[ix] * B[iy] */
-    tmpx = a->dp[ix];
-
-    /* alias to the address of where the digits will be stored */
-    tmpt = &(t.dp[digs]);
-
-    /* alias for where to read the right hand side from */
-    tmpy = b->dp + (digs - ix);
-
-    for (iy = digs - ix; iy < pb; iy++) {
-      /* calculate the double precision result */
-      r       = ((mp_word)*tmpt) +
-                ((mp_word)tmpx) * ((mp_word)*tmpy++) +
-                ((mp_word) u);
-
-      /* get the lower part */
-      *tmpt++ = (mp_digit) (r & ((mp_word) MP_MASK));
-
-      /* carry the carry */
-      u       = (mp_digit) (r >> ((mp_word) DIGIT_BIT));
-    }
-    *tmpt = u;
-  }
-  mp_clamp (&t);
-  mp_exch (&t, c);
-  mp_clear (&t);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_s_mp_mul_high_digs.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_s_mp_sqr.c b/dep/StormLibOld/src/libtommath/bn_s_mp_sqr.c
deleted file mode 100644
index c1e994efd..000000000
--- a/dep/StormLibOld/src/libtommath/bn_s_mp_sqr.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#include "tommath.h"
-#ifdef BN_S_MP_SQR_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* low level squaring, b = a*a, HAC pp.596-597, Algorithm 14.16 */
-int s_mp_sqr (mp_int * a, mp_int * b)
-{
-  mp_int  t;
-  int     res, ix, iy, pa;
-  mp_word r;
-  mp_digit u, tmpx, *tmpt;
-
-  pa = a->used;
-  if ((res = mp_init_size (&t, 2*pa + 1)) != MP_OKAY) {
-    return res;
-  }
-
-  /* default used is maximum possible size */
-  t.used = 2*pa + 1;
-
-  for (ix = 0; ix < pa; ix++) {
-    /* first calculate the digit at 2*ix */
-    /* calculate double precision result */
-    r = ((mp_word) t.dp[2*ix]) +
-        ((mp_word)a->dp[ix])*((mp_word)a->dp[ix]);
-
-    /* store lower part in result */
-    t.dp[ix+ix] = (mp_digit) (r & ((mp_word) MP_MASK));
-
-    /* get the carry */
-    u           = (mp_digit)(r >> ((mp_word) DIGIT_BIT));
-
-    /* left hand side of A[ix] * A[iy] */
-    tmpx        = a->dp[ix];
-
-    /* alias for where to store the results */
-    tmpt        = t.dp + (2*ix + 1);
-    
-    for (iy = ix + 1; iy < pa; iy++) {
-      /* first calculate the product */
-      r       = ((mp_word)tmpx) * ((mp_word)a->dp[iy]);
-
-      /* now calculate the double precision result, note we use
-       * addition instead of *2 since it's easier to optimize
-       */
-      r       = ((mp_word) *tmpt) + r + r + ((mp_word) u);
-
-      /* store lower part */
-      *tmpt++ = (mp_digit) (r & ((mp_word) MP_MASK));
-
-      /* get carry */
-      u       = (mp_digit)(r >> ((mp_word) DIGIT_BIT));
-    }
-    /* propagate upwards */
-    while (u != ((mp_digit) 0)) {
-      r       = ((mp_word) *tmpt) + ((mp_word) u);
-      *tmpt++ = (mp_digit) (r & ((mp_word) MP_MASK));
-      u       = (mp_digit)(r >> ((mp_word) DIGIT_BIT));
-    }
-  }
-
-  mp_clamp (&t);
-  mp_exch (&t, b);
-  mp_clear (&t);
-  return MP_OKAY;
-}
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_s_mp_sqr.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bn_s_mp_sub.c b/dep/StormLibOld/src/libtommath/bn_s_mp_sub.c
deleted file mode 100644
index 0ae91cc4d..000000000
--- a/dep/StormLibOld/src/libtommath/bn_s_mp_sub.c
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "tommath.h"
-#ifdef BN_S_MP_SUB_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* low level subtraction (assumes |a| > |b|), HAC pp.595 Algorithm 14.9 */
-int
-s_mp_sub (mp_int * a, mp_int * b, mp_int * c)
-{
-  int     olduse, res, min, max;
-
-  /* find sizes */
-  min = b->used;
-  max = a->used;
-
-  /* init result */
-  if (c->alloc < max) {
-    if ((res = mp_grow (c, max)) != MP_OKAY) {
-      return res;
-    }
-  }
-  olduse = c->used;
-  c->used = max;
-
-  {
-    register mp_digit u, *tmpa, *tmpb, *tmpc;
-    register int i;
-
-    /* alias for digit pointers */
-    tmpa = a->dp;
-    tmpb = b->dp;
-    tmpc = c->dp;
-
-    /* set carry to zero */
-    u = 0;
-    for (i = 0; i < min; i++) {
-      /* T[i] = A[i] - B[i] - U */
-      *tmpc = *tmpa++ - *tmpb++ - u;
-
-      /* U = carry bit of T[i]
-       * Note this saves performing an AND operation since
-       * if a carry does occur it will propagate all the way to the
-       * MSB.  As a result a single shift is enough to get the carry
-       */
-      u = *tmpc >> ((mp_digit)(CHAR_BIT * sizeof (mp_digit) - 1));
-
-      /* Clear carry from T[i] */
-      *tmpc++ &= MP_MASK;
-    }
-
-    /* now copy higher words if any, e.g. if A has more digits than B  */
-    for (; i < max; i++) {
-      /* T[i] = A[i] - U */
-      *tmpc = *tmpa++ - u;
-
-      /* U = carry bit of T[i] */
-      u = *tmpc >> ((mp_digit)(CHAR_BIT * sizeof (mp_digit) - 1));
-
-      /* Clear carry from T[i] */
-      *tmpc++ &= MP_MASK;
-    }
-
-    /* clear digits above used (since we may not have grown result above) */
-    for (i = c->used; i < olduse; i++) {
-      *tmpc++ = 0;
-    }
-  }
-
-  mp_clamp (c);
-  return MP_OKAY;
-}
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bn_s_mp_sub.c,v $ */
-/* $Revision: 1.4 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/bncore.c b/dep/StormLibOld/src/libtommath/bncore.c
deleted file mode 100644
index ad7347f84..000000000
--- a/dep/StormLibOld/src/libtommath/bncore.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "tommath.h"
-#ifdef BNCORE_C
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
- */
-
-/* Known optimal configurations
-
- CPU                    /Compiler     /MUL CUTOFF/SQR CUTOFF
--------------------------------------------------------------
- Intel P4 Northwood     /GCC v3.4.1   /        88/       128/LTM 0.32 ;-)
- AMD Athlon64           /GCC v3.4.4   /        80/       120/LTM 0.35
- 
-*/
-
-int     KARATSUBA_MUL_CUTOFF = 80,      /* Min. number of digits before Karatsuba multiplication is used. */
-        KARATSUBA_SQR_CUTOFF = 120,     /* Min. number of digits before Karatsuba squaring is used. */
-        
-        TOOM_MUL_CUTOFF      = 350,      /* no optimal values of these are known yet so set em high */
-        TOOM_SQR_CUTOFF      = 400; 
-#endif
-
-/* $Source: /cvs/libtom/libtommath/bncore.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/28 01:25:13 $ */
diff --git a/dep/StormLibOld/src/libtommath/tommath.h b/dep/StormLibOld/src/libtommath/tommath.h
deleted file mode 100644
index 1ead3d04b..000000000
--- a/dep/StormLibOld/src/libtommath/tommath.h
+++ /dev/null
@@ -1,584 +0,0 @@
-/* LibTomMath, multiple-precision integer library -- Tom St Denis
- *
- * LibTomMath is a library that provides multiple-precision
- * integer arithmetic as well as number theoretic functionality.
- *
- * The library was designed directly after the MPI library by
- * Michael Fromberger but has been written from scratch with
- * additional optimizations in place.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://math.libtomcrypt.com
- */
-#ifndef BN_H_
-#define BN_H_
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <limits.h>
-
-#include "tommath_class.h"
-
-#ifndef MIN
-   #define MIN(x,y) ((x)<(y)?(x):(y))
-#endif
-
-#ifndef MAX
-   #define MAX(x,y) ((x)>(y)?(x):(y))
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-
-/* C++ compilers don't like assigning void * to mp_digit * */
-#define  OPT_CAST(x)  (x *)
-
-#else
-
-/* C on the other hand doesn't care */
-#define  OPT_CAST(x)
-
-#endif
-
-
-/* detect 64-bit mode if possible */
-#if defined(__x86_64__) 
-   #if !(defined(MP_64BIT) && defined(MP_16BIT) && defined(MP_8BIT))
-      #define MP_64BIT
-   #endif
-#endif
-
-/* some default configurations.
- *
- * A "mp_digit" must be able to hold DIGIT_BIT + 1 bits
- * A "mp_word" must be able to hold 2*DIGIT_BIT + 1 bits
- *
- * At the very least a mp_digit must be able to hold 7 bits
- * [any size beyond that is ok provided it doesn't overflow the data type]
- */
-#ifdef MP_8BIT
-   typedef unsigned char      mp_digit;
-   typedef unsigned short     mp_word;
-#elif defined(MP_16BIT)
-   typedef unsigned short     mp_digit;
-   typedef unsigned long      mp_word;
-#elif defined(MP_64BIT)
-   /* for GCC only on supported platforms */
-#ifndef CRYPT
-   typedef unsigned long long ulong64;
-   typedef signed long long   long64;
-#endif
-
-   typedef unsigned long      mp_digit;
-   typedef unsigned long      mp_word __attribute__ ((mode(TI)));
-
-   #define DIGIT_BIT          60
-#else
-   /* this is the default case, 28-bit digits */
-   
-   /* this is to make porting into LibTomCrypt easier :-) */
-#ifndef CRYPT
-   #if defined(_MSC_VER) || defined(__BORLANDC__) 
-      typedef unsigned __int64   ulong64;
-      typedef signed __int64     long64;
-   #else
-      typedef unsigned long long ulong64;
-      typedef signed long long   long64;
-   #endif
-#endif
-
-   typedef unsigned long      mp_digit;
-   typedef ulong64            mp_word;
-
-#ifdef MP_31BIT   
-   /* this is an extension that uses 31-bit digits */
-   #define DIGIT_BIT          31
-#else
-   /* default case is 28-bit digits, defines MP_28BIT as a handy macro to test */
-   #define DIGIT_BIT          28
-   #define MP_28BIT
-#endif   
-#endif
-
-/* define heap macros */
-#ifndef CRYPT
-   /* default to libc stuff */
-   #ifndef XMALLOC 
-       #define XMALLOC  malloc
-       #define XFREE    free
-       #define XREALLOC realloc
-       #define XCALLOC  calloc
-   #else
-      /* prototypes for our heap functions */
-      extern void *XMALLOC(size_t n);
-      extern void *XREALLOC(void *p, size_t n);
-      extern void *XCALLOC(size_t n, size_t s);
-      extern void XFREE(void *p);
-   #endif
-#endif
-
-
-/* otherwise the bits per digit is calculated automatically from the size of a mp_digit */
-#ifndef DIGIT_BIT
-   #define DIGIT_BIT     ((int)((CHAR_BIT * sizeof(mp_digit) - 1)))  /* bits per digit */
-#endif
-
-#define MP_DIGIT_BIT     DIGIT_BIT
-#define MP_MASK          ((((mp_digit)1)<<((mp_digit)DIGIT_BIT))-((mp_digit)1))
-#define MP_DIGIT_MAX     MP_MASK
-
-/* equalities */
-#define MP_LT        -1   /* less than */
-#define MP_EQ         0   /* equal to */
-#define MP_GT         1   /* greater than */
-
-#define MP_ZPOS       0   /* positive integer */
-#define MP_NEG        1   /* negative */
-
-#define MP_OKAY       0   /* ok result */
-#define MP_MEM        -2  /* out of mem */
-#define MP_VAL        -3  /* invalid input */
-#define MP_RANGE      MP_VAL
-
-#define MP_YES        1   /* yes response */
-#define MP_NO         0   /* no response */
-
-/* Primality generation flags */
-#define LTM_PRIME_BBS      0x0001 /* BBS style prime */
-#define LTM_PRIME_SAFE     0x0002 /* Safe prime (p-1)/2 == prime */
-#define LTM_PRIME_2MSB_ON  0x0008 /* force 2nd MSB to 1 */
-
-typedef int           mp_err;
-
-/* you'll have to tune these... */
-extern int KARATSUBA_MUL_CUTOFF,
-           KARATSUBA_SQR_CUTOFF,
-           TOOM_MUL_CUTOFF,
-           TOOM_SQR_CUTOFF;
-
-/* define this to use lower memory usage routines (exptmods mostly) */
-/* #define MP_LOW_MEM */
-
-/* default precision */
-#ifndef MP_PREC
-   #ifndef MP_LOW_MEM
-      #define MP_PREC                 32     /* default digits of precision */
-   #else
-      #define MP_PREC                 8      /* default digits of precision */
-   #endif   
-#endif
-
-/* size of comba arrays, should be at least 2 * 2**(BITS_PER_WORD - BITS_PER_DIGIT*2) */
-#define MP_WARRAY               (1 << (sizeof(mp_word) * CHAR_BIT - 2 * DIGIT_BIT + 1))
-
-/* the infamous mp_int structure */
-typedef struct  {
-    int used, alloc, sign;
-    mp_digit *dp;
-} mp_int;
-
-/* callback for mp_prime_random, should fill dst with random bytes and return how many read [upto len] */
-typedef int ltm_prime_callback(unsigned char *dst, int len, void *dat);
-
-
-#define USED(m)    ((m)->used)
-#define DIGIT(m,k) ((m)->dp[(k)])
-#define SIGN(m)    ((m)->sign)
-
-/* error code to char* string */
-char *mp_error_to_string(int code);
-
-/* ---> init and deinit bignum functions <--- */
-/* init a bignum */
-int mp_init(mp_int *a);
-
-/* free a bignum */
-void mp_clear(mp_int *a);
-
-/* init a null terminated series of arguments */
-int mp_init_multi(mp_int *mp, ...);
-
-/* clear a null terminated series of arguments */
-void mp_clear_multi(mp_int *mp, ...);
-
-/* exchange two ints */
-void mp_exch(mp_int *a, mp_int *b);
-
-/* shrink ram required for a bignum */
-int mp_shrink(mp_int *a);
-
-/* grow an int to a given size */
-int mp_grow(mp_int *a, int size);
-
-/* init to a given number of digits */
-int mp_init_size(mp_int *a, int size);
-
-/* ---> Basic Manipulations <--- */
-#define mp_iszero(a) (((a)->used == 0) ? MP_YES : MP_NO)
-#define mp_iseven(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO)
-#define mp_isodd(a)  (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO)
-
-/* set to zero */
-void mp_zero(mp_int *a);
-
-/* set to a digit */
-void mp_set(mp_int *a, mp_digit b);
-
-/* set a 32-bit const */
-int mp_set_int(mp_int *a, unsigned long b);
-
-/* get a 32-bit value */
-unsigned long mp_get_int(mp_int * a);
-
-/* initialize and set a digit */
-int mp_init_set (mp_int * a, mp_digit b);
-
-/* initialize and set 32-bit value */
-int mp_init_set_int (mp_int * a, unsigned long b);
-
-/* copy, b = a */
-int mp_copy(mp_int *a, mp_int *b);
-
-/* inits and copies, a = b */
-int mp_init_copy(mp_int *a, mp_int *b);
-
-/* trim unused digits */
-void mp_clamp(mp_int *a);
-
-/* ---> digit manipulation <--- */
-
-/* right shift by "b" digits */
-void mp_rshd(mp_int *a, int b);
-
-/* left shift by "b" digits */
-int mp_lshd(mp_int *a, int b);
-
-/* c = a / 2**b */
-int mp_div_2d(mp_int *a, int b, mp_int *c, mp_int *d);
-
-/* b = a/2 */
-int mp_div_2(mp_int *a, mp_int *b);
-
-/* c = a * 2**b */
-int mp_mul_2d(mp_int *a, int b, mp_int *c);
-
-/* b = a*2 */
-int mp_mul_2(mp_int *a, mp_int *b);
-
-/* c = a mod 2**d */
-int mp_mod_2d(mp_int *a, int b, mp_int *c);
-
-/* computes a = 2**b */
-int mp_2expt(mp_int *a, int b);
-
-/* Counts the number of lsbs which are zero before the first zero bit */
-int mp_cnt_lsb(mp_int *a);
-
-/* I Love Earth! */
-
-/* makes a pseudo-random int of a given size */
-int mp_rand(mp_int *a, int digits);
-
-/* ---> binary operations <--- */
-/* c = a XOR b  */
-int mp_xor(mp_int *a, mp_int *b, mp_int *c);
-
-/* c = a OR b */
-int mp_or(mp_int *a, mp_int *b, mp_int *c);
-
-/* c = a AND b */
-int mp_and(mp_int *a, mp_int *b, mp_int *c);
-
-/* ---> Basic arithmetic <--- */
-
-/* b = -a */
-int mp_neg(mp_int *a, mp_int *b);
-
-/* b = |a| */
-int mp_abs(mp_int *a, mp_int *b);
-
-/* compare a to b */
-int mp_cmp(mp_int *a, mp_int *b);
-
-/* compare |a| to |b| */
-int mp_cmp_mag(mp_int *a, mp_int *b);
-
-/* c = a + b */
-int mp_add(mp_int *a, mp_int *b, mp_int *c);
-
-/* c = a - b */
-int mp_sub(mp_int *a, mp_int *b, mp_int *c);
-
-/* c = a * b */
-int mp_mul(mp_int *a, mp_int *b, mp_int *c);
-
-/* b = a*a  */
-int mp_sqr(mp_int *a, mp_int *b);
-
-/* a/b => cb + d == a */
-int mp_div(mp_int *a, mp_int *b, mp_int *c, mp_int *d);
-
-/* c = a mod b, 0 <= c < b  */
-int mp_mod(mp_int *a, mp_int *b, mp_int *c);
-
-/* ---> single digit functions <--- */
-
-/* compare against a single digit */
-int mp_cmp_d(mp_int *a, mp_digit b);
-
-/* c = a + b */
-int mp_add_d(mp_int *a, mp_digit b, mp_int *c);
-
-/* c = a - b */
-int mp_sub_d(mp_int *a, mp_digit b, mp_int *c);
-
-/* c = a * b */
-int mp_mul_d(mp_int *a, mp_digit b, mp_int *c);
-
-/* a/b => cb + d == a */
-int mp_div_d(mp_int *a, mp_digit b, mp_int *c, mp_digit *d);
-
-/* a/3 => 3c + d == a */
-int mp_div_3(mp_int *a, mp_int *c, mp_digit *d);
-
-/* c = a**b */
-int mp_expt_d(mp_int *a, mp_digit b, mp_int *c);
-
-/* c = a mod b, 0 <= c < b  */
-int mp_mod_d(mp_int *a, mp_digit b, mp_digit *c);
-
-/* ---> number theory <--- */
-
-/* d = a + b (mod c) */
-int mp_addmod(mp_int *a, mp_int *b, mp_int *c, mp_int *d);
-
-/* d = a - b (mod c) */
-int mp_submod(mp_int *a, mp_int *b, mp_int *c, mp_int *d);
-
-/* d = a * b (mod c) */
-int mp_mulmod(mp_int *a, mp_int *b, mp_int *c, mp_int *d);
-
-/* c = a * a (mod b) */
-int mp_sqrmod(mp_int *a, mp_int *b, mp_int *c);
-
-/* c = 1/a (mod b) */
-int mp_invmod(mp_int *a, mp_int *b, mp_int *c);
-
-/* c = (a, b) */
-int mp_gcd(mp_int *a, mp_int *b, mp_int *c);
-
-/* produces value such that U1*a + U2*b = U3 */
-int mp_exteuclid(mp_int *a, mp_int *b, mp_int *U1, mp_int *U2, mp_int *U3);
-
-/* c = [a, b] or (a*b)/(a, b) */
-int mp_lcm(mp_int *a, mp_int *b, mp_int *c);
-
-/* finds one of the b'th root of a, such that |c|**b <= |a|
- *
- * returns error if a < 0 and b is even
- */
-int mp_n_root(mp_int *a, mp_digit b, mp_int *c);
-
-/* special sqrt algo */
-int mp_sqrt(mp_int *arg, mp_int *ret);
-
-/* is number a square? */
-int mp_is_square(mp_int *arg, int *ret);
-
-/* computes the jacobi c = (a | n) (or Legendre if b is prime)  */
-int mp_jacobi(mp_int *a, mp_int *n, int *c);
-
-/* used to setup the Barrett reduction for a given modulus b */
-int mp_reduce_setup(mp_int *a, mp_int *b);
-
-/* Barrett Reduction, computes a (mod b) with a precomputed value c
- *
- * Assumes that 0 < a <= b*b, note if 0 > a > -(b*b) then you can merely
- * compute the reduction as -1 * mp_reduce(mp_abs(a)) [pseudo code].
- */
-int mp_reduce(mp_int *a, mp_int *b, mp_int *c);
-
-/* setups the montgomery reduction */
-int mp_montgomery_setup(mp_int *a, mp_digit *mp);
-
-/* computes a = B**n mod b without division or multiplication useful for
- * normalizing numbers in a Montgomery system.
- */
-int mp_montgomery_calc_normalization(mp_int *a, mp_int *b);
-
-/* computes x/R == x (mod N) via Montgomery Reduction */
-int mp_montgomery_reduce(mp_int *a, mp_int *m, mp_digit mp);
-
-/* returns 1 if a is a valid DR modulus */
-int mp_dr_is_modulus(mp_int *a);
-
-/* sets the value of "d" required for mp_dr_reduce */
-void mp_dr_setup(mp_int *a, mp_digit *d);
-
-/* reduces a modulo b using the Diminished Radix method */
-int mp_dr_reduce(mp_int *a, mp_int *b, mp_digit mp);
-
-/* returns true if a can be reduced with mp_reduce_2k */
-int mp_reduce_is_2k(mp_int *a);
-
-/* determines k value for 2k reduction */
-int mp_reduce_2k_setup(mp_int *a, mp_digit *d);
-
-/* reduces a modulo b where b is of the form 2**p - k [0 <= a] */
-int mp_reduce_2k(mp_int *a, mp_int *n, mp_digit d);
-
-/* returns true if a can be reduced with mp_reduce_2k_l */
-int mp_reduce_is_2k_l(mp_int *a);
-
-/* determines k value for 2k reduction */
-int mp_reduce_2k_setup_l(mp_int *a, mp_int *d);
-
-/* reduces a modulo b where b is of the form 2**p - k [0 <= a] */
-int mp_reduce_2k_l(mp_int *a, mp_int *n, mp_int *d);
-
-/* d = a**b (mod c) */
-int mp_exptmod(mp_int *a, mp_int *b, mp_int *c, mp_int *d);
-
-/* ---> Primes <--- */
-
-/* number of primes */
-#ifdef MP_8BIT
-   #define PRIME_SIZE      31
-#else
-   #define PRIME_SIZE      256
-#endif
-
-/* table of first PRIME_SIZE primes */
-extern const mp_digit ltm_prime_tab[];
-
-/* result=1 if a is divisible by one of the first PRIME_SIZE primes */
-int mp_prime_is_divisible(mp_int *a, int *result);
-
-/* performs one Fermat test of "a" using base "b".
- * Sets result to 0 if composite or 1 if probable prime
- */
-int mp_prime_fermat(mp_int *a, mp_int *b, int *result);
-
-/* performs one Miller-Rabin test of "a" using base "b".
- * Sets result to 0 if composite or 1 if probable prime
- */
-int mp_prime_miller_rabin(mp_int *a, mp_int *b, int *result);
-
-/* This gives [for a given bit size] the number of trials required
- * such that Miller-Rabin gives a prob of failure lower than 2^-96 
- */
-int mp_prime_rabin_miller_trials(int size);
-
-/* performs t rounds of Miller-Rabin on "a" using the first
- * t prime bases.  Also performs an initial sieve of trial
- * division.  Determines if "a" is prime with probability
- * of error no more than (1/4)**t.
- *
- * Sets result to 1 if probably prime, 0 otherwise
- */
-int mp_prime_is_prime(mp_int *a, int t, int *result);
-
-/* finds the next prime after the number "a" using "t" trials
- * of Miller-Rabin.
- *
- * bbs_style = 1 means the prime must be congruent to 3 mod 4
- */
-int mp_prime_next_prime(mp_int *a, int t, int bbs_style);
-
-/* makes a truly random prime of a given size (bytes),
- * call with bbs = 1 if you want it to be congruent to 3 mod 4 
- *
- * You have to supply a callback which fills in a buffer with random bytes.  "dat" is a parameter you can
- * have passed to the callback (e.g. a state or something).  This function doesn't use "dat" itself
- * so it can be NULL
- *
- * The prime generated will be larger than 2^(8*size).
- */
-#define mp_prime_random(a, t, size, bbs, cb, dat) mp_prime_random_ex(a, t, ((size) * 8) + 1, (bbs==1)?LTM_PRIME_BBS:0, cb, dat)
-
-/* makes a truly random prime of a given size (bits),
- *
- * Flags are as follows:
- * 
- *   LTM_PRIME_BBS      - make prime congruent to 3 mod 4
- *   LTM_PRIME_SAFE     - make sure (p-1)/2 is prime as well (implies LTM_PRIME_BBS)
- *   LTM_PRIME_2MSB_OFF - make the 2nd highest bit zero
- *   LTM_PRIME_2MSB_ON  - make the 2nd highest bit one
- *
- * You have to supply a callback which fills in a buffer with random bytes.  "dat" is a parameter you can
- * have passed to the callback (e.g. a state or something).  This function doesn't use "dat" itself
- * so it can be NULL
- *
- */
-int mp_prime_random_ex(mp_int *a, int t, int size, int flags, ltm_prime_callback cb, void *dat);
-
-/* ---> radix conversion <--- */
-int mp_count_bits(mp_int *a);
-
-int mp_unsigned_bin_size(mp_int *a);
-int mp_read_unsigned_bin(mp_int *a, const unsigned char *b, int c);
-int mp_to_unsigned_bin(mp_int *a, unsigned char *b);
-int mp_to_unsigned_bin_n (mp_int * a, unsigned char *b, unsigned long *outlen);
-
-int mp_signed_bin_size(mp_int *a);
-int mp_read_signed_bin(mp_int *a, const unsigned char *b, int c);
-int mp_to_signed_bin(mp_int *a,  unsigned char *b);
-int mp_to_signed_bin_n (mp_int * a, unsigned char *b, unsigned long *outlen);
-
-int mp_read_radix(mp_int *a, const char *str, int radix);
-int mp_toradix(mp_int *a, char *str, int radix);
-int mp_toradix_n(mp_int * a, char *str, int radix, int maxlen);
-int mp_radix_size(mp_int *a, int radix, int *size);
-
-int mp_fread(mp_int *a, int radix, FILE *stream);
-int mp_fwrite(mp_int *a, int radix, FILE *stream);
-
-#define mp_read_raw(mp, str, len) mp_read_signed_bin((mp), (str), (len))
-#define mp_raw_size(mp)           mp_signed_bin_size(mp)
-#define mp_toraw(mp, str)         mp_to_signed_bin((mp), (str))
-#define mp_read_mag(mp, str, len) mp_read_unsigned_bin((mp), (str), (len))
-#define mp_mag_size(mp)           mp_unsigned_bin_size(mp)
-#define mp_tomag(mp, str)         mp_to_unsigned_bin((mp), (str))
-
-#define mp_tobinary(M, S)  mp_toradix((M), (S), 2)
-#define mp_tooctal(M, S)   mp_toradix((M), (S), 8)
-#define mp_todecimal(M, S) mp_toradix((M), (S), 10)
-#define mp_tohex(M, S)     mp_toradix((M), (S), 16)
-
-/* lowlevel functions, do not call! */
-int s_mp_add(mp_int *a, mp_int *b, mp_int *c);
-int s_mp_sub(mp_int *a, mp_int *b, mp_int *c);
-#define s_mp_mul(a, b, c) s_mp_mul_digs(a, b, c, (a)->used + (b)->used + 1)
-int fast_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, int digs);
-int s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, int digs);
-int fast_s_mp_mul_high_digs(mp_int *a, mp_int *b, mp_int *c, int digs);
-int s_mp_mul_high_digs(mp_int *a, mp_int *b, mp_int *c, int digs);
-int fast_s_mp_sqr(mp_int *a, mp_int *b);
-int s_mp_sqr(mp_int *a, mp_int *b);
-int mp_karatsuba_mul(mp_int *a, mp_int *b, mp_int *c);
-int mp_toom_mul(mp_int *a, mp_int *b, mp_int *c);
-int mp_karatsuba_sqr(mp_int *a, mp_int *b);
-int mp_toom_sqr(mp_int *a, mp_int *b);
-int fast_mp_invmod(mp_int *a, mp_int *b, mp_int *c);
-int mp_invmod_slow (mp_int * a, mp_int * b, mp_int * c);
-int fast_mp_montgomery_reduce(mp_int *a, mp_int *m, mp_digit mp);
-int mp_exptmod_fast(mp_int *G, mp_int *X, mp_int *P, mp_int *Y, int mode);
-int s_mp_exptmod (mp_int * G, mp_int * X, mp_int * P, mp_int * Y, int mode);
-void bn_reverse(unsigned char *s, int len);
-
-extern const char *mp_s_rmap;
-
-#ifdef __cplusplus
-   }
-#endif
-
-#endif
-
-
-/* $Source: /cvs/libtom/libtommath/tommath.h,v $ */
-/* $Revision: 1.8 $ */
-/* $Date: 2006/03/31 14:18:44 $ */
diff --git a/dep/StormLibOld/src/libtommath/tommath_class.h b/dep/StormLibOld/src/libtommath/tommath_class.h
deleted file mode 100644
index 18d1553de..000000000
--- a/dep/StormLibOld/src/libtommath/tommath_class.h
+++ /dev/null
@@ -1,999 +0,0 @@
-#if !(defined(LTM1) && defined(LTM2) && defined(LTM3))
-#if defined(LTM2)
-#define LTM3
-#endif
-#if defined(LTM1)
-#define LTM2
-#endif
-#define LTM1
-
-#if defined(LTM_ALL)
-#define BN_ERROR_C
-#define BN_FAST_MP_INVMOD_C
-#define BN_FAST_MP_MONTGOMERY_REDUCE_C
-#define BN_FAST_S_MP_MUL_DIGS_C
-#define BN_FAST_S_MP_MUL_HIGH_DIGS_C
-#define BN_FAST_S_MP_SQR_C
-#define BN_MP_2EXPT_C
-#define BN_MP_ABS_C
-#define BN_MP_ADD_C
-#define BN_MP_ADD_D_C
-#define BN_MP_ADDMOD_C
-#define BN_MP_AND_C
-#define BN_MP_CLAMP_C
-#define BN_MP_CLEAR_C
-#define BN_MP_CLEAR_MULTI_C
-#define BN_MP_CMP_C
-#define BN_MP_CMP_D_C
-#define BN_MP_CMP_MAG_C
-#define BN_MP_CNT_LSB_C
-#define BN_MP_COPY_C
-#define BN_MP_COUNT_BITS_C
-#define BN_MP_DIV_C
-#define BN_MP_DIV_2_C
-#define BN_MP_DIV_2D_C
-#define BN_MP_DIV_3_C
-#define BN_MP_DIV_D_C
-#define BN_MP_DR_IS_MODULUS_C
-#define BN_MP_DR_REDUCE_C
-#define BN_MP_DR_SETUP_C
-#define BN_MP_EXCH_C
-#define BN_MP_EXPT_D_C
-#define BN_MP_EXPTMOD_C
-#define BN_MP_EXPTMOD_FAST_C
-#define BN_MP_EXTEUCLID_C
-#define BN_MP_FREAD_C
-#define BN_MP_FWRITE_C
-#define BN_MP_GCD_C
-#define BN_MP_GET_INT_C
-#define BN_MP_GROW_C
-#define BN_MP_INIT_C
-#define BN_MP_INIT_COPY_C
-#define BN_MP_INIT_MULTI_C
-#define BN_MP_INIT_SET_C
-#define BN_MP_INIT_SET_INT_C
-#define BN_MP_INIT_SIZE_C
-#define BN_MP_INVMOD_C
-#define BN_MP_INVMOD_SLOW_C
-#define BN_MP_IS_SQUARE_C
-#define BN_MP_JACOBI_C
-#define BN_MP_KARATSUBA_MUL_C
-#define BN_MP_KARATSUBA_SQR_C
-#define BN_MP_LCM_C
-#define BN_MP_LSHD_C
-#define BN_MP_MOD_C
-#define BN_MP_MOD_2D_C
-#define BN_MP_MOD_D_C
-#define BN_MP_MONTGOMERY_CALC_NORMALIZATION_C
-#define BN_MP_MONTGOMERY_REDUCE_C
-#define BN_MP_MONTGOMERY_SETUP_C
-#define BN_MP_MUL_C
-#define BN_MP_MUL_2_C
-#define BN_MP_MUL_2D_C
-#define BN_MP_MUL_D_C
-#define BN_MP_MULMOD_C
-#define BN_MP_N_ROOT_C
-#define BN_MP_NEG_C
-#define BN_MP_OR_C
-#define BN_MP_PRIME_FERMAT_C
-#define BN_MP_PRIME_IS_DIVISIBLE_C
-#define BN_MP_PRIME_IS_PRIME_C
-#define BN_MP_PRIME_MILLER_RABIN_C
-#define BN_MP_PRIME_NEXT_PRIME_C
-#define BN_MP_PRIME_RABIN_MILLER_TRIALS_C
-#define BN_MP_PRIME_RANDOM_EX_C
-#define BN_MP_RADIX_SIZE_C
-#define BN_MP_RADIX_SMAP_C
-#define BN_MP_RAND_C
-#define BN_MP_READ_RADIX_C
-#define BN_MP_READ_SIGNED_BIN_C
-#define BN_MP_READ_UNSIGNED_BIN_C
-#define BN_MP_REDUCE_C
-#define BN_MP_REDUCE_2K_C
-#define BN_MP_REDUCE_2K_L_C
-#define BN_MP_REDUCE_2K_SETUP_C
-#define BN_MP_REDUCE_2K_SETUP_L_C
-#define BN_MP_REDUCE_IS_2K_C
-#define BN_MP_REDUCE_IS_2K_L_C
-#define BN_MP_REDUCE_SETUP_C
-#define BN_MP_RSHD_C
-#define BN_MP_SET_C
-#define BN_MP_SET_INT_C
-#define BN_MP_SHRINK_C
-#define BN_MP_SIGNED_BIN_SIZE_C
-#define BN_MP_SQR_C
-#define BN_MP_SQRMOD_C
-#define BN_MP_SQRT_C
-#define BN_MP_SUB_C
-#define BN_MP_SUB_D_C
-#define BN_MP_SUBMOD_C
-#define BN_MP_TO_SIGNED_BIN_C
-#define BN_MP_TO_SIGNED_BIN_N_C
-#define BN_MP_TO_UNSIGNED_BIN_C
-#define BN_MP_TO_UNSIGNED_BIN_N_C
-#define BN_MP_TOOM_MUL_C
-#define BN_MP_TOOM_SQR_C
-#define BN_MP_TORADIX_C
-#define BN_MP_TORADIX_N_C
-#define BN_MP_UNSIGNED_BIN_SIZE_C
-#define BN_MP_XOR_C
-#define BN_MP_ZERO_C
-#define BN_PRIME_TAB_C
-#define BN_REVERSE_C
-#define BN_S_MP_ADD_C
-#define BN_S_MP_EXPTMOD_C
-#define BN_S_MP_MUL_DIGS_C
-#define BN_S_MP_MUL_HIGH_DIGS_C
-#define BN_S_MP_SQR_C
-#define BN_S_MP_SUB_C
-#define BNCORE_C
-#endif
-
-#if defined(BN_ERROR_C)
-   #define BN_MP_ERROR_TO_STRING_C
-#endif
-
-#if defined(BN_FAST_MP_INVMOD_C)
-   #define BN_MP_ISEVEN_C
-   #define BN_MP_INIT_MULTI_C
-   #define BN_MP_COPY_C
-   #define BN_MP_MOD_C
-   #define BN_MP_SET_C
-   #define BN_MP_DIV_2_C
-   #define BN_MP_ISODD_C
-   #define BN_MP_SUB_C
-   #define BN_MP_CMP_C
-   #define BN_MP_ISZERO_C
-   #define BN_MP_CMP_D_C
-   #define BN_MP_ADD_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_MULTI_C
-#endif
-
-#if defined(BN_FAST_MP_MONTGOMERY_REDUCE_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_RSHD_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_S_MP_SUB_C
-#endif
-
-#if defined(BN_FAST_S_MP_MUL_DIGS_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BN_FAST_S_MP_MUL_HIGH_DIGS_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BN_FAST_S_MP_SQR_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BN_MP_2EXPT_C)
-   #define BN_MP_ZERO_C
-   #define BN_MP_GROW_C
-#endif
-
-#if defined(BN_MP_ABS_C)
-   #define BN_MP_COPY_C
-#endif
-
-#if defined(BN_MP_ADD_C)
-   #define BN_S_MP_ADD_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_S_MP_SUB_C
-#endif
-
-#if defined(BN_MP_ADD_D_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_SUB_D_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BN_MP_ADDMOD_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_ADD_C
-   #define BN_MP_CLEAR_C
-   #define BN_MP_MOD_C
-#endif
-
-#if defined(BN_MP_AND_C)
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_CLAMP_C)
-#endif
-
-#if defined(BN_MP_CLEAR_C)
-#endif
-
-#if defined(BN_MP_CLEAR_MULTI_C)
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_CMP_C)
-   #define BN_MP_CMP_MAG_C
-#endif
-
-#if defined(BN_MP_CMP_D_C)
-#endif
-
-#if defined(BN_MP_CMP_MAG_C)
-#endif
-
-#if defined(BN_MP_CNT_LSB_C)
-   #define BN_MP_ISZERO_C
-#endif
-
-#if defined(BN_MP_COPY_C)
-   #define BN_MP_GROW_C
-#endif
-
-#if defined(BN_MP_COUNT_BITS_C)
-#endif
-
-#if defined(BN_MP_DIV_C)
-   #define BN_MP_ISZERO_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_MP_COPY_C
-   #define BN_MP_ZERO_C
-   #define BN_MP_INIT_MULTI_C
-   #define BN_MP_SET_C
-   #define BN_MP_COUNT_BITS_C
-   #define BN_MP_ABS_C
-   #define BN_MP_MUL_2D_C
-   #define BN_MP_CMP_C
-   #define BN_MP_SUB_C
-   #define BN_MP_ADD_C
-   #define BN_MP_DIV_2D_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_MULTI_C
-   #define BN_MP_INIT_SIZE_C
-   #define BN_MP_INIT_C
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_LSHD_C
-   #define BN_MP_RSHD_C
-   #define BN_MP_MUL_D_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_DIV_2_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BN_MP_DIV_2D_C)
-   #define BN_MP_COPY_C
-   #define BN_MP_ZERO_C
-   #define BN_MP_INIT_C
-   #define BN_MP_MOD_2D_C
-   #define BN_MP_CLEAR_C
-   #define BN_MP_RSHD_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_EXCH_C
-#endif
-
-#if defined(BN_MP_DIV_3_C)
-   #define BN_MP_INIT_SIZE_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_DIV_D_C)
-   #define BN_MP_ISZERO_C
-   #define BN_MP_COPY_C
-   #define BN_MP_DIV_2D_C
-   #define BN_MP_DIV_3_C
-   #define BN_MP_INIT_SIZE_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_DR_IS_MODULUS_C)
-#endif
-
-#if defined(BN_MP_DR_REDUCE_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_S_MP_SUB_C
-#endif
-
-#if defined(BN_MP_DR_SETUP_C)
-#endif
-
-#if defined(BN_MP_EXCH_C)
-#endif
-
-#if defined(BN_MP_EXPT_D_C)
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_SET_C
-   #define BN_MP_SQR_C
-   #define BN_MP_CLEAR_C
-   #define BN_MP_MUL_C
-#endif
-
-#if defined(BN_MP_EXPTMOD_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_INVMOD_C
-   #define BN_MP_CLEAR_C
-   #define BN_MP_ABS_C
-   #define BN_MP_CLEAR_MULTI_C
-   #define BN_MP_REDUCE_IS_2K_L_C
-   #define BN_S_MP_EXPTMOD_C
-   #define BN_MP_DR_IS_MODULUS_C
-   #define BN_MP_REDUCE_IS_2K_C
-   #define BN_MP_ISODD_C
-   #define BN_MP_EXPTMOD_FAST_C
-#endif
-
-#if defined(BN_MP_EXPTMOD_FAST_C)
-   #define BN_MP_COUNT_BITS_C
-   #define BN_MP_INIT_C
-   #define BN_MP_CLEAR_C
-   #define BN_MP_MONTGOMERY_SETUP_C
-   #define BN_FAST_MP_MONTGOMERY_REDUCE_C
-   #define BN_MP_MONTGOMERY_REDUCE_C
-   #define BN_MP_DR_SETUP_C
-   #define BN_MP_DR_REDUCE_C
-   #define BN_MP_REDUCE_2K_SETUP_C
-   #define BN_MP_REDUCE_2K_C
-   #define BN_MP_MONTGOMERY_CALC_NORMALIZATION_C
-   #define BN_MP_MULMOD_C
-   #define BN_MP_SET_C
-   #define BN_MP_MOD_C
-   #define BN_MP_COPY_C
-   #define BN_MP_SQR_C
-   #define BN_MP_MUL_C
-   #define BN_MP_EXCH_C
-#endif
-
-#if defined(BN_MP_EXTEUCLID_C)
-   #define BN_MP_INIT_MULTI_C
-   #define BN_MP_SET_C
-   #define BN_MP_COPY_C
-   #define BN_MP_ISZERO_C
-   #define BN_MP_DIV_C
-   #define BN_MP_MUL_C
-   #define BN_MP_SUB_C
-   #define BN_MP_NEG_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_MULTI_C
-#endif
-
-#if defined(BN_MP_FREAD_C)
-   #define BN_MP_ZERO_C
-   #define BN_MP_S_RMAP_C
-   #define BN_MP_MUL_D_C
-   #define BN_MP_ADD_D_C
-   #define BN_MP_CMP_D_C
-#endif
-
-#if defined(BN_MP_FWRITE_C)
-   #define BN_MP_RADIX_SIZE_C
-   #define BN_MP_TORADIX_C
-#endif
-
-#if defined(BN_MP_GCD_C)
-   #define BN_MP_ISZERO_C
-   #define BN_MP_ABS_C
-   #define BN_MP_ZERO_C
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_CNT_LSB_C
-   #define BN_MP_DIV_2D_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_MP_EXCH_C
-   #define BN_S_MP_SUB_C
-   #define BN_MP_MUL_2D_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_GET_INT_C)
-#endif
-
-#if defined(BN_MP_GROW_C)
-#endif
-
-#if defined(BN_MP_INIT_C)
-#endif
-
-#if defined(BN_MP_INIT_COPY_C)
-   #define BN_MP_COPY_C
-#endif
-
-#if defined(BN_MP_INIT_MULTI_C)
-   #define BN_MP_ERR_C
-   #define BN_MP_INIT_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_INIT_SET_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_SET_C
-#endif
-
-#if defined(BN_MP_INIT_SET_INT_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_SET_INT_C
-#endif
-
-#if defined(BN_MP_INIT_SIZE_C)
-   #define BN_MP_INIT_C
-#endif
-
-#if defined(BN_MP_INVMOD_C)
-   #define BN_MP_ISZERO_C
-   #define BN_MP_ISODD_C
-   #define BN_FAST_MP_INVMOD_C
-   #define BN_MP_INVMOD_SLOW_C
-#endif
-
-#if defined(BN_MP_INVMOD_SLOW_C)
-   #define BN_MP_ISZERO_C
-   #define BN_MP_INIT_MULTI_C
-   #define BN_MP_MOD_C
-   #define BN_MP_COPY_C
-   #define BN_MP_ISEVEN_C
-   #define BN_MP_SET_C
-   #define BN_MP_DIV_2_C
-   #define BN_MP_ISODD_C
-   #define BN_MP_ADD_C
-   #define BN_MP_SUB_C
-   #define BN_MP_CMP_C
-   #define BN_MP_CMP_D_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_MULTI_C
-#endif
-
-#if defined(BN_MP_IS_SQUARE_C)
-   #define BN_MP_MOD_D_C
-   #define BN_MP_INIT_SET_INT_C
-   #define BN_MP_MOD_C
-   #define BN_MP_GET_INT_C
-   #define BN_MP_SQRT_C
-   #define BN_MP_SQR_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_JACOBI_C)
-   #define BN_MP_CMP_D_C
-   #define BN_MP_ISZERO_C
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_CNT_LSB_C
-   #define BN_MP_DIV_2D_C
-   #define BN_MP_MOD_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_KARATSUBA_MUL_C)
-   #define BN_MP_MUL_C
-   #define BN_MP_INIT_SIZE_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_SUB_C
-   #define BN_MP_ADD_C
-   #define BN_MP_LSHD_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_KARATSUBA_SQR_C)
-   #define BN_MP_INIT_SIZE_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_SQR_C
-   #define BN_MP_SUB_C
-   #define BN_S_MP_ADD_C
-   #define BN_MP_LSHD_C
-   #define BN_MP_ADD_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_LCM_C)
-   #define BN_MP_INIT_MULTI_C
-   #define BN_MP_GCD_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_MP_DIV_C
-   #define BN_MP_MUL_C
-   #define BN_MP_CLEAR_MULTI_C
-#endif
-
-#if defined(BN_MP_LSHD_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_RSHD_C
-#endif
-
-#if defined(BN_MP_MOD_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_DIV_C
-   #define BN_MP_CLEAR_C
-   #define BN_MP_ADD_C
-   #define BN_MP_EXCH_C
-#endif
-
-#if defined(BN_MP_MOD_2D_C)
-   #define BN_MP_ZERO_C
-   #define BN_MP_COPY_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BN_MP_MOD_D_C)
-   #define BN_MP_DIV_D_C
-#endif
-
-#if defined(BN_MP_MONTGOMERY_CALC_NORMALIZATION_C)
-   #define BN_MP_COUNT_BITS_C
-   #define BN_MP_2EXPT_C
-   #define BN_MP_SET_C
-   #define BN_MP_MUL_2_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_S_MP_SUB_C
-#endif
-
-#if defined(BN_MP_MONTGOMERY_REDUCE_C)
-   #define BN_FAST_MP_MONTGOMERY_REDUCE_C
-   #define BN_MP_GROW_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_RSHD_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_S_MP_SUB_C
-#endif
-
-#if defined(BN_MP_MONTGOMERY_SETUP_C)
-#endif
-
-#if defined(BN_MP_MUL_C)
-   #define BN_MP_TOOM_MUL_C
-   #define BN_MP_KARATSUBA_MUL_C
-   #define BN_FAST_S_MP_MUL_DIGS_C
-   #define BN_S_MP_MUL_C
-   #define BN_S_MP_MUL_DIGS_C
-#endif
-
-#if defined(BN_MP_MUL_2_C)
-   #define BN_MP_GROW_C
-#endif
-
-#if defined(BN_MP_MUL_2D_C)
-   #define BN_MP_COPY_C
-   #define BN_MP_GROW_C
-   #define BN_MP_LSHD_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BN_MP_MUL_D_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BN_MP_MULMOD_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_MUL_C
-   #define BN_MP_CLEAR_C
-   #define BN_MP_MOD_C
-#endif
-
-#if defined(BN_MP_N_ROOT_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_SET_C
-   #define BN_MP_COPY_C
-   #define BN_MP_EXPT_D_C
-   #define BN_MP_MUL_C
-   #define BN_MP_SUB_C
-   #define BN_MP_MUL_D_C
-   #define BN_MP_DIV_C
-   #define BN_MP_CMP_C
-   #define BN_MP_SUB_D_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_NEG_C)
-   #define BN_MP_COPY_C
-   #define BN_MP_ISZERO_C
-#endif
-
-#if defined(BN_MP_OR_C)
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_PRIME_FERMAT_C)
-   #define BN_MP_CMP_D_C
-   #define BN_MP_INIT_C
-   #define BN_MP_EXPTMOD_C
-   #define BN_MP_CMP_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_PRIME_IS_DIVISIBLE_C)
-   #define BN_MP_MOD_D_C
-#endif
-
-#if defined(BN_MP_PRIME_IS_PRIME_C)
-   #define BN_MP_CMP_D_C
-   #define BN_MP_PRIME_IS_DIVISIBLE_C
-   #define BN_MP_INIT_C
-   #define BN_MP_SET_C
-   #define BN_MP_PRIME_MILLER_RABIN_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_PRIME_MILLER_RABIN_C)
-   #define BN_MP_CMP_D_C
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_SUB_D_C
-   #define BN_MP_CNT_LSB_C
-   #define BN_MP_DIV_2D_C
-   #define BN_MP_EXPTMOD_C
-   #define BN_MP_CMP_C
-   #define BN_MP_SQRMOD_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_PRIME_NEXT_PRIME_C)
-   #define BN_MP_CMP_D_C
-   #define BN_MP_SET_C
-   #define BN_MP_SUB_D_C
-   #define BN_MP_ISEVEN_C
-   #define BN_MP_MOD_D_C
-   #define BN_MP_INIT_C
-   #define BN_MP_ADD_D_C
-   #define BN_MP_PRIME_MILLER_RABIN_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_PRIME_RABIN_MILLER_TRIALS_C)
-#endif
-
-#if defined(BN_MP_PRIME_RANDOM_EX_C)
-   #define BN_MP_READ_UNSIGNED_BIN_C
-   #define BN_MP_PRIME_IS_PRIME_C
-   #define BN_MP_SUB_D_C
-   #define BN_MP_DIV_2_C
-   #define BN_MP_MUL_2_C
-   #define BN_MP_ADD_D_C
-#endif
-
-#if defined(BN_MP_RADIX_SIZE_C)
-   #define BN_MP_COUNT_BITS_C
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_ISZERO_C
-   #define BN_MP_DIV_D_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_RADIX_SMAP_C)
-   #define BN_MP_S_RMAP_C
-#endif
-
-#if defined(BN_MP_RAND_C)
-   #define BN_MP_ZERO_C
-   #define BN_MP_ADD_D_C
-   #define BN_MP_LSHD_C
-#endif
-
-#if defined(BN_MP_READ_RADIX_C)
-   #define BN_MP_ZERO_C
-   #define BN_MP_S_RMAP_C
-   #define BN_MP_RADIX_SMAP_C
-   #define BN_MP_MUL_D_C
-   #define BN_MP_ADD_D_C
-   #define BN_MP_ISZERO_C
-#endif
-
-#if defined(BN_MP_READ_SIGNED_BIN_C)
-   #define BN_MP_READ_UNSIGNED_BIN_C
-#endif
-
-#if defined(BN_MP_READ_UNSIGNED_BIN_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_ZERO_C
-   #define BN_MP_MUL_2D_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BN_MP_REDUCE_C)
-   #define BN_MP_REDUCE_SETUP_C
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_RSHD_C
-   #define BN_MP_MUL_C
-   #define BN_S_MP_MUL_HIGH_DIGS_C
-   #define BN_FAST_S_MP_MUL_HIGH_DIGS_C
-   #define BN_MP_MOD_2D_C
-   #define BN_S_MP_MUL_DIGS_C
-   #define BN_MP_SUB_C
-   #define BN_MP_CMP_D_C
-   #define BN_MP_SET_C
-   #define BN_MP_LSHD_C
-   #define BN_MP_ADD_C
-   #define BN_MP_CMP_C
-   #define BN_S_MP_SUB_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_REDUCE_2K_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_COUNT_BITS_C
-   #define BN_MP_DIV_2D_C
-   #define BN_MP_MUL_D_C
-   #define BN_S_MP_ADD_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_S_MP_SUB_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_REDUCE_2K_L_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_COUNT_BITS_C
-   #define BN_MP_DIV_2D_C
-   #define BN_MP_MUL_C
-   #define BN_S_MP_ADD_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_S_MP_SUB_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_REDUCE_2K_SETUP_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_COUNT_BITS_C
-   #define BN_MP_2EXPT_C
-   #define BN_MP_CLEAR_C
-   #define BN_S_MP_SUB_C
-#endif
-
-#if defined(BN_MP_REDUCE_2K_SETUP_L_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_2EXPT_C
-   #define BN_MP_COUNT_BITS_C
-   #define BN_S_MP_SUB_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_REDUCE_IS_2K_C)
-   #define BN_MP_REDUCE_2K_C
-   #define BN_MP_COUNT_BITS_C
-#endif
-
-#if defined(BN_MP_REDUCE_IS_2K_L_C)
-#endif
-
-#if defined(BN_MP_REDUCE_SETUP_C)
-   #define BN_MP_2EXPT_C
-   #define BN_MP_DIV_C
-#endif
-
-#if defined(BN_MP_RSHD_C)
-   #define BN_MP_ZERO_C
-#endif
-
-#if defined(BN_MP_SET_C)
-   #define BN_MP_ZERO_C
-#endif
-
-#if defined(BN_MP_SET_INT_C)
-   #define BN_MP_ZERO_C
-   #define BN_MP_MUL_2D_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BN_MP_SHRINK_C)
-#endif
-
-#if defined(BN_MP_SIGNED_BIN_SIZE_C)
-   #define BN_MP_UNSIGNED_BIN_SIZE_C
-#endif
-
-#if defined(BN_MP_SQR_C)
-   #define BN_MP_TOOM_SQR_C
-   #define BN_MP_KARATSUBA_SQR_C
-   #define BN_FAST_S_MP_SQR_C
-   #define BN_S_MP_SQR_C
-#endif
-
-#if defined(BN_MP_SQRMOD_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_SQR_C
-   #define BN_MP_CLEAR_C
-   #define BN_MP_MOD_C
-#endif
-
-#if defined(BN_MP_SQRT_C)
-   #define BN_MP_N_ROOT_C
-   #define BN_MP_ISZERO_C
-   #define BN_MP_ZERO_C
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_RSHD_C
-   #define BN_MP_DIV_C
-   #define BN_MP_ADD_C
-   #define BN_MP_DIV_2_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_SUB_C)
-   #define BN_S_MP_ADD_C
-   #define BN_MP_CMP_MAG_C
-   #define BN_S_MP_SUB_C
-#endif
-
-#if defined(BN_MP_SUB_D_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_ADD_D_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BN_MP_SUBMOD_C)
-   #define BN_MP_INIT_C
-   #define BN_MP_SUB_C
-   #define BN_MP_CLEAR_C
-   #define BN_MP_MOD_C
-#endif
-
-#if defined(BN_MP_TO_SIGNED_BIN_C)
-   #define BN_MP_TO_UNSIGNED_BIN_C
-#endif
-
-#if defined(BN_MP_TO_SIGNED_BIN_N_C)
-   #define BN_MP_SIGNED_BIN_SIZE_C
-   #define BN_MP_TO_SIGNED_BIN_C
-#endif
-
-#if defined(BN_MP_TO_UNSIGNED_BIN_C)
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_ISZERO_C
-   #define BN_MP_DIV_2D_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_TO_UNSIGNED_BIN_N_C)
-   #define BN_MP_UNSIGNED_BIN_SIZE_C
-   #define BN_MP_TO_UNSIGNED_BIN_C
-#endif
-
-#if defined(BN_MP_TOOM_MUL_C)
-   #define BN_MP_INIT_MULTI_C
-   #define BN_MP_MOD_2D_C
-   #define BN_MP_COPY_C
-   #define BN_MP_RSHD_C
-   #define BN_MP_MUL_C
-   #define BN_MP_MUL_2_C
-   #define BN_MP_ADD_C
-   #define BN_MP_SUB_C
-   #define BN_MP_DIV_2_C
-   #define BN_MP_MUL_2D_C
-   #define BN_MP_MUL_D_C
-   #define BN_MP_DIV_3_C
-   #define BN_MP_LSHD_C
-   #define BN_MP_CLEAR_MULTI_C
-#endif
-
-#if defined(BN_MP_TOOM_SQR_C)
-   #define BN_MP_INIT_MULTI_C
-   #define BN_MP_MOD_2D_C
-   #define BN_MP_COPY_C
-   #define BN_MP_RSHD_C
-   #define BN_MP_SQR_C
-   #define BN_MP_MUL_2_C
-   #define BN_MP_ADD_C
-   #define BN_MP_SUB_C
-   #define BN_MP_DIV_2_C
-   #define BN_MP_MUL_2D_C
-   #define BN_MP_MUL_D_C
-   #define BN_MP_DIV_3_C
-   #define BN_MP_LSHD_C
-   #define BN_MP_CLEAR_MULTI_C
-#endif
-
-#if defined(BN_MP_TORADIX_C)
-   #define BN_MP_ISZERO_C
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_DIV_D_C
-   #define BN_MP_CLEAR_C
-   #define BN_MP_S_RMAP_C
-#endif
-
-#if defined(BN_MP_TORADIX_N_C)
-   #define BN_MP_ISZERO_C
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_DIV_D_C
-   #define BN_MP_CLEAR_C
-   #define BN_MP_S_RMAP_C
-#endif
-
-#if defined(BN_MP_UNSIGNED_BIN_SIZE_C)
-   #define BN_MP_COUNT_BITS_C
-#endif
-
-#if defined(BN_MP_XOR_C)
-   #define BN_MP_INIT_COPY_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_MP_ZERO_C)
-#endif
-
-#if defined(BN_PRIME_TAB_C)
-#endif
-
-#if defined(BN_REVERSE_C)
-#endif
-
-#if defined(BN_S_MP_ADD_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BN_S_MP_EXPTMOD_C)
-   #define BN_MP_COUNT_BITS_C
-   #define BN_MP_INIT_C
-   #define BN_MP_CLEAR_C
-   #define BN_MP_REDUCE_SETUP_C
-   #define BN_MP_REDUCE_C
-   #define BN_MP_REDUCE_2K_SETUP_L_C
-   #define BN_MP_REDUCE_2K_L_C
-   #define BN_MP_MOD_C
-   #define BN_MP_COPY_C
-   #define BN_MP_SQR_C
-   #define BN_MP_MUL_C
-   #define BN_MP_SET_C
-   #define BN_MP_EXCH_C
-#endif
-
-#if defined(BN_S_MP_MUL_DIGS_C)
-   #define BN_FAST_S_MP_MUL_DIGS_C
-   #define BN_MP_INIT_SIZE_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_S_MP_MUL_HIGH_DIGS_C)
-   #define BN_FAST_S_MP_MUL_HIGH_DIGS_C
-   #define BN_MP_INIT_SIZE_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_S_MP_SQR_C)
-   #define BN_MP_INIT_SIZE_C
-   #define BN_MP_CLAMP_C
-   #define BN_MP_EXCH_C
-   #define BN_MP_CLEAR_C
-#endif
-
-#if defined(BN_S_MP_SUB_C)
-   #define BN_MP_GROW_C
-   #define BN_MP_CLAMP_C
-#endif
-
-#if defined(BNCORE_C)
-#endif
-
-#ifdef LTM3
-#define LTM_LAST
-#endif
-#include "tommath_superclass.h"
-#include "tommath_class.h"
-#else
-#define LTM_LAST
-#endif
-
-/* $Source: /cvs/libtom/libtommath/tommath_class.h,v $ */
-/* $Revision: 1.3 $ */
-/* $Date: 2005/07/28 11:59:32 $ */
diff --git a/dep/StormLibOld/src/libtommath/tommath_superclass.h b/dep/StormLibOld/src/libtommath/tommath_superclass.h
deleted file mode 100644
index 2fdebe683..000000000
--- a/dep/StormLibOld/src/libtommath/tommath_superclass.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* super class file for PK algos */
-
-/* default ... include all MPI */
-#define LTM_ALL
-
-/* RSA only (does not support DH/DSA/ECC) */
-/* #define SC_RSA_1 */
-
-/* For reference.... On an Athlon64 optimizing for speed...
-
-   LTM's mpi.o with all functions [striped] is 142KiB in size.
-
-*/
-
-/* Works for RSA only, mpi.o is 68KiB */
-#ifdef SC_RSA_1
-   #define BN_MP_SHRINK_C
-   #define BN_MP_LCM_C
-   #define BN_MP_PRIME_RANDOM_EX_C
-   #define BN_MP_INVMOD_C
-   #define BN_MP_GCD_C
-   #define BN_MP_MOD_C
-   #define BN_MP_MULMOD_C
-   #define BN_MP_ADDMOD_C
-   #define BN_MP_EXPTMOD_C
-   #define BN_MP_SET_INT_C
-   #define BN_MP_INIT_MULTI_C
-   #define BN_MP_CLEAR_MULTI_C
-   #define BN_MP_UNSIGNED_BIN_SIZE_C
-   #define BN_MP_TO_UNSIGNED_BIN_C
-   #define BN_MP_MOD_D_C
-   #define BN_MP_PRIME_RABIN_MILLER_TRIALS_C
-   #define BN_REVERSE_C
-   #define BN_PRIME_TAB_C
-
-   /* other modifiers */
-   #define BN_MP_DIV_SMALL                    /* Slower division, not critical */
-
-   /* here we are on the last pass so we turn things off.  The functions classes are still there
-    * but we remove them specifically from the build.  This also invokes tweaks in functions
-    * like removing support for even moduli, etc...
-    */
-#ifdef LTM_LAST
-   #undef  BN_MP_TOOM_MUL_C
-   #undef  BN_MP_TOOM_SQR_C
-   #undef  BN_MP_KARATSUBA_MUL_C
-   #undef  BN_MP_KARATSUBA_SQR_C
-   #undef  BN_MP_REDUCE_C
-   #undef  BN_MP_REDUCE_SETUP_C
-   #undef  BN_MP_DR_IS_MODULUS_C
-   #undef  BN_MP_DR_SETUP_C
-   #undef  BN_MP_DR_REDUCE_C
-   #undef  BN_MP_REDUCE_IS_2K_C
-   #undef  BN_MP_REDUCE_2K_SETUP_C
-   #undef  BN_MP_REDUCE_2K_C
-   #undef  BN_S_MP_EXPTMOD_C
-   #undef  BN_MP_DIV_3_C
-   #undef  BN_S_MP_MUL_HIGH_DIGS_C
-   #undef  BN_FAST_S_MP_MUL_HIGH_DIGS_C
-   #undef  BN_FAST_MP_INVMOD_C
-
-   /* To safely undefine these you have to make sure your RSA key won't exceed the Comba threshold
-    * which is roughly 255 digits [7140 bits for 32-bit machines, 15300 bits for 64-bit machines] 
-    * which means roughly speaking you can handle upto 2536-bit RSA keys with these defined without
-    * trouble.  
-    */
-   #undef  BN_S_MP_MUL_DIGS_C
-   #undef  BN_S_MP_SQR_C
-   #undef  BN_MP_MONTGOMERY_REDUCE_C
-#endif
-
-#endif
-
-/* $Source: /cvs/libtom/libtommath/tommath_superclass.h,v $ */
-/* $Revision: 1.3 $ */
-/* $Date: 2005/05/14 13:29:17 $ */
diff --git a/dep/StormLibOld/src/lzma/C/LzFind.c b/dep/StormLibOld/src/lzma/C/LzFind.c
deleted file mode 100644
index e3ecb0542..000000000
--- a/dep/StormLibOld/src/lzma/C/LzFind.c
+++ /dev/null
@@ -1,761 +0,0 @@
-/* LzFind.c -- Match finder for LZ algorithms
-2009-04-22 : Igor Pavlov : Public domain */
-
-#include <string.h>
-
-#include "LzFind.h"
-#include "LzHash.h"
-
-#define kEmptyHashValue 0
-#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
-#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
-#define kNormalizeMask (~(kNormalizeStepMin - 1))
-#define kMaxHistorySize ((UInt32)3 << 30)
-
-#define kStartMaxLen 3
-
-static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
-{
-  if (!p->directInput)
-  {
-    alloc->Free(alloc, p->bufferBase);
-    p->bufferBase = 0;
-  }
-}
-
-/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
-
-static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
-{
-  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
-  if (p->directInput)
-  {
-    p->blockSize = blockSize;
-    return 1;
-  }
-  if (p->bufferBase == 0 || p->blockSize != blockSize)
-  {
-    LzInWindow_Free(p, alloc);
-    p->blockSize = blockSize;
-    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
-  }
-  return (p->bufferBase != 0);
-}
-
-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
-Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
-
-UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
-
-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
-{
-  p->posLimit -= subValue;
-  p->pos -= subValue;
-  p->streamPos -= subValue;
-}
-
-static void MatchFinder_ReadBlock(CMatchFinder *p)
-{
-  if (p->streamEndWasReached || p->result != SZ_OK)
-    return;
-  if (p->directInput)
-  {
-    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
-    if (curSize > p->directInputRem)
-      curSize = (UInt32)p->directInputRem;
-    p->directInputRem -= curSize;
-    p->streamPos += curSize;
-    if (p->directInputRem == 0)
-      p->streamEndWasReached = 1;
-    return;
-  }
-  for (;;)
-  {
-    Byte *dest = p->buffer + (p->streamPos - p->pos);
-    size_t size = (p->bufferBase + p->blockSize - dest);
-    if (size == 0)
-      return;
-    p->result = p->stream->Read(p->stream, dest, &size);
-    if (p->result != SZ_OK)
-      return;
-    if (size == 0)
-    {
-      p->streamEndWasReached = 1;
-      return;
-    }
-    p->streamPos += (UInt32)size;
-    if (p->streamPos - p->pos > p->keepSizeAfter)
-      return;
-  }
-}
-
-void MatchFinder_MoveBlock(CMatchFinder *p)
-{
-  memmove(p->bufferBase,
-    p->buffer - p->keepSizeBefore,
-    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
-  p->buffer = p->bufferBase + p->keepSizeBefore;
-}
-
-int MatchFinder_NeedMove(CMatchFinder *p)
-{
-  if (p->directInput)
-    return 0;
-  /* if (p->streamEndWasReached) return 0; */
-  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
-}
-
-void MatchFinder_ReadIfRequired(CMatchFinder *p)
-{
-  if (p->streamEndWasReached)
-    return;
-  if (p->keepSizeAfter >= p->streamPos - p->pos)
-    MatchFinder_ReadBlock(p);
-}
-
-static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
-{
-  if (MatchFinder_NeedMove(p))
-    MatchFinder_MoveBlock(p);
-  MatchFinder_ReadBlock(p);
-}
-
-static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
-{
-  p->cutValue = 32;
-  p->btMode = 1;
-  p->numHashBytes = 4;
-  p->bigHash = 0;
-}
-
-#define kCrcPoly 0xEDB88320
-
-void MatchFinder_Construct(CMatchFinder *p)
-{
-  UInt32 i;
-  p->bufferBase = 0;
-  p->directInput = 0;
-  p->hash = 0;
-  MatchFinder_SetDefaultSettings(p);
-
-  for (i = 0; i < 256; i++)
-  {
-    UInt32 r = i;
-    int j;
-    for (j = 0; j < 8; j++)
-      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
-    p->crc[i] = r;
-  }
-}
-
-static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
-{
-  alloc->Free(alloc, p->hash);
-  p->hash = 0;
-}
-
-void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
-{
-  MatchFinder_FreeThisClassMemory(p, alloc);
-  LzInWindow_Free(p, alloc);
-}
-
-static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
-{
-  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
-  if (sizeInBytes / sizeof(CLzRef) != num)
-    return 0;
-  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
-}
-
-int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
-    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-    ISzAlloc *alloc)
-{
-  UInt32 sizeReserv;
-  if (historySize > kMaxHistorySize)
-  {
-    MatchFinder_Free(p, alloc);
-    return 0;
-  }
-  sizeReserv = historySize >> 1;
-  if (historySize > ((UInt32)2 << 30))
-    sizeReserv = historySize >> 2;
-  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
-
-  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
-  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
-  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
-  if (LzInWindow_Create(p, sizeReserv, alloc))
-  {
-    UInt32 newCyclicBufferSize = historySize + 1;
-    UInt32 hs;
-    p->matchMaxLen = matchMaxLen;
-    {
-      p->fixedHashSize = 0;
-      if (p->numHashBytes == 2)
-        hs = (1 << 16) - 1;
-      else
-      {
-        hs = historySize - 1;
-        hs |= (hs >> 1);
-        hs |= (hs >> 2);
-        hs |= (hs >> 4);
-        hs |= (hs >> 8);
-        hs >>= 1;
-        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
-        if (hs > (1 << 24))
-        {
-          if (p->numHashBytes == 3)
-            hs = (1 << 24) - 1;
-          else
-            hs >>= 1;
-        }
-      }
-      p->hashMask = hs;
-      hs++;
-      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
-      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
-      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
-      hs += p->fixedHashSize;
-    }
-
-    {
-      UInt32 prevSize = p->hashSizeSum + p->numSons;
-      UInt32 newSize;
-      p->historySize = historySize;
-      p->hashSizeSum = hs;
-      p->cyclicBufferSize = newCyclicBufferSize;
-      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
-      newSize = p->hashSizeSum + p->numSons;
-      if (p->hash != 0 && prevSize == newSize)
-        return 1;
-      MatchFinder_FreeThisClassMemory(p, alloc);
-      p->hash = AllocRefs(newSize, alloc);
-      if (p->hash != 0)
-      {
-        p->son = p->hash + p->hashSizeSum;
-        return 1;
-      }
-    }
-  }
-  MatchFinder_Free(p, alloc);
-  return 0;
-}
-
-static void MatchFinder_SetLimits(CMatchFinder *p)
-{
-  UInt32 limit = kMaxValForNormalize - p->pos;
-  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
-  if (limit2 < limit)
-    limit = limit2;
-  limit2 = p->streamPos - p->pos;
-  if (limit2 <= p->keepSizeAfter)
-  {
-    if (limit2 > 0)
-      limit2 = 1;
-  }
-  else
-    limit2 -= p->keepSizeAfter;
-  if (limit2 < limit)
-    limit = limit2;
-  {
-    UInt32 lenLimit = p->streamPos - p->pos;
-    if (lenLimit > p->matchMaxLen)
-      lenLimit = p->matchMaxLen;
-    p->lenLimit = lenLimit;
-  }
-  p->posLimit = p->pos + limit;
-}
-
-void MatchFinder_Init(CMatchFinder *p)
-{
-  UInt32 i;
-  for (i = 0; i < p->hashSizeSum; i++)
-    p->hash[i] = kEmptyHashValue;
-  p->cyclicBufferPos = 0;
-  p->buffer = p->bufferBase;
-  p->pos = p->streamPos = p->cyclicBufferSize;
-  p->result = SZ_OK;
-  p->streamEndWasReached = 0;
-  MatchFinder_ReadBlock(p);
-  MatchFinder_SetLimits(p);
-}
-
-static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
-{
-  return (p->pos - p->historySize - 1) & kNormalizeMask;
-}
-
-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
-{
-  UInt32 i;
-  for (i = 0; i < numItems; i++)
-  {
-    UInt32 value = items[i];
-    if (value <= subValue)
-      value = kEmptyHashValue;
-    else
-      value -= subValue;
-    items[i] = value;
-  }
-}
-
-static void MatchFinder_Normalize(CMatchFinder *p)
-{
-  UInt32 subValue = MatchFinder_GetSubValue(p);
-  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
-  MatchFinder_ReduceOffsets(p, subValue);
-}
-
-static void MatchFinder_CheckLimits(CMatchFinder *p)
-{
-  if (p->pos == kMaxValForNormalize)
-    MatchFinder_Normalize(p);
-  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
-    MatchFinder_CheckAndMoveAndRead(p);
-  if (p->cyclicBufferPos == p->cyclicBufferSize)
-    p->cyclicBufferPos = 0;
-  MatchFinder_SetLimits(p);
-}
-
-static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-    UInt32 *distances, UInt32 maxLen)
-{
-  son[_cyclicBufferPos] = curMatch;
-  for (;;)
-  {
-    UInt32 delta = pos - curMatch;
-    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-      return distances;
-    {
-      const Byte *pb = cur - delta;
-      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
-      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
-      {
-        UInt32 len = 0;
-        while (++len != lenLimit)
-          if (pb[len] != cur[len])
-            break;
-        if (maxLen < len)
-        {
-          *distances++ = maxLen = len;
-          *distances++ = delta - 1;
-          if (len == lenLimit)
-            return distances;
-        }
-      }
-    }
-  }
-}
-
-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-    UInt32 *distances, UInt32 maxLen)
-{
-  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-  UInt32 len0 = 0, len1 = 0;
-  for (;;)
-  {
-    UInt32 delta = pos - curMatch;
-    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-    {
-      *ptr0 = *ptr1 = kEmptyHashValue;
-      return distances;
-    }
-    {
-      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-      const Byte *pb = cur - delta;
-      UInt32 len = (len0 < len1 ? len0 : len1);
-      if (pb[len] == cur[len])
-      {
-        if (++len != lenLimit && pb[len] == cur[len])
-          while (++len != lenLimit)
-            if (pb[len] != cur[len])
-              break;
-        if (maxLen < len)
-        {
-          *distances++ = maxLen = len;
-          *distances++ = delta - 1;
-          if (len == lenLimit)
-          {
-            *ptr1 = pair[0];
-            *ptr0 = pair[1];
-            return distances;
-          }
-        }
-      }
-      if (pb[len] < cur[len])
-      {
-        *ptr1 = curMatch;
-        ptr1 = pair + 1;
-        curMatch = *ptr1;
-        len1 = len;
-      }
-      else
-      {
-        *ptr0 = curMatch;
-        ptr0 = pair;
-        curMatch = *ptr0;
-        len0 = len;
-      }
-    }
-  }
-}
-
-static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
-{
-  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-  UInt32 len0 = 0, len1 = 0;
-  for (;;)
-  {
-    UInt32 delta = pos - curMatch;
-    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-    {
-      *ptr0 = *ptr1 = kEmptyHashValue;
-      return;
-    }
-    {
-      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-      const Byte *pb = cur - delta;
-      UInt32 len = (len0 < len1 ? len0 : len1);
-      if (pb[len] == cur[len])
-      {
-        while (++len != lenLimit)
-          if (pb[len] != cur[len])
-            break;
-        {
-          if (len == lenLimit)
-          {
-            *ptr1 = pair[0];
-            *ptr0 = pair[1];
-            return;
-          }
-        }
-      }
-      if (pb[len] < cur[len])
-      {
-        *ptr1 = curMatch;
-        ptr1 = pair + 1;
-        curMatch = *ptr1;
-        len1 = len;
-      }
-      else
-      {
-        *ptr0 = curMatch;
-        ptr0 = pair;
-        curMatch = *ptr0;
-        len0 = len;
-      }
-    }
-  }
-}
-
-#define MOVE_POS \
-  ++p->cyclicBufferPos; \
-  p->buffer++; \
-  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
-
-#define MOVE_POS_RET MOVE_POS return offset;
-
-static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
-
-#define GET_MATCHES_HEADER2(minLen, ret_op) \
-  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
-  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
-  cur = p->buffer;
-
-#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
-#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
-
-#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
-
-#define GET_MATCHES_FOOTER(offset, maxLen) \
-  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
-  distances + offset, maxLen) - distances); MOVE_POS_RET;
-
-#define SKIP_FOOTER \
-  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
-
-static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-{
-  UInt32 offset;
-  GET_MATCHES_HEADER(2)
-  HASH2_CALC;
-  curMatch = p->hash[hashValue];
-  p->hash[hashValue] = p->pos;
-  offset = 0;
-  GET_MATCHES_FOOTER(offset, 1)
-}
-
-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-{
-  UInt32 offset;
-  GET_MATCHES_HEADER(3)
-  HASH_ZIP_CALC;
-  curMatch = p->hash[hashValue];
-  p->hash[hashValue] = p->pos;
-  offset = 0;
-  GET_MATCHES_FOOTER(offset, 2)
-}
-
-static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-{
-  UInt32 hash2Value, delta2, maxLen, offset;
-  GET_MATCHES_HEADER(3)
-
-  HASH3_CALC;
-
-  delta2 = p->pos - p->hash[hash2Value];
-  curMatch = p->hash[kFix3HashSize + hashValue];
-  
-  p->hash[hash2Value] =
-  p->hash[kFix3HashSize + hashValue] = p->pos;
-
-
-  maxLen = 2;
-  offset = 0;
-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-  {
-    for (; maxLen != lenLimit; maxLen++)
-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-        break;
-    distances[0] = maxLen;
-    distances[1] = delta2 - 1;
-    offset = 2;
-    if (maxLen == lenLimit)
-    {
-      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
-      MOVE_POS_RET;
-    }
-  }
-  GET_MATCHES_FOOTER(offset, maxLen)
-}
-
-static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-{
-  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
-  GET_MATCHES_HEADER(4)
-
-  HASH4_CALC;
-
-  delta2 = p->pos - p->hash[                hash2Value];
-  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
-  curMatch = p->hash[kFix4HashSize + hashValue];
-  
-  p->hash[                hash2Value] =
-  p->hash[kFix3HashSize + hash3Value] =
-  p->hash[kFix4HashSize + hashValue] = p->pos;
-
-  maxLen = 1;
-  offset = 0;
-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-  {
-    distances[0] = maxLen = 2;
-    distances[1] = delta2 - 1;
-    offset = 2;
-  }
-  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
-  {
-    maxLen = 3;
-    distances[offset + 1] = delta3 - 1;
-    offset += 2;
-    delta2 = delta3;
-  }
-  if (offset != 0)
-  {
-    for (; maxLen != lenLimit; maxLen++)
-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-        break;
-    distances[offset - 2] = maxLen;
-    if (maxLen == lenLimit)
-    {
-      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
-      MOVE_POS_RET;
-    }
-  }
-  if (maxLen < 3)
-    maxLen = 3;
-  GET_MATCHES_FOOTER(offset, maxLen)
-}
-
-static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-{
-  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
-  GET_MATCHES_HEADER(4)
-
-  HASH4_CALC;
-
-  delta2 = p->pos - p->hash[                hash2Value];
-  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
-  curMatch = p->hash[kFix4HashSize + hashValue];
-
-  p->hash[                hash2Value] =
-  p->hash[kFix3HashSize + hash3Value] =
-  p->hash[kFix4HashSize + hashValue] = p->pos;
-
-  maxLen = 1;
-  offset = 0;
-  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-  {
-    distances[0] = maxLen = 2;
-    distances[1] = delta2 - 1;
-    offset = 2;
-  }
-  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
-  {
-    maxLen = 3;
-    distances[offset + 1] = delta3 - 1;
-    offset += 2;
-    delta2 = delta3;
-  }
-  if (offset != 0)
-  {
-    for (; maxLen != lenLimit; maxLen++)
-      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-        break;
-    distances[offset - 2] = maxLen;
-    if (maxLen == lenLimit)
-    {
-      p->son[p->cyclicBufferPos] = curMatch;
-      MOVE_POS_RET;
-    }
-  }
-  if (maxLen < 3)
-    maxLen = 3;
-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
-    distances + offset, maxLen) - (distances));
-  MOVE_POS_RET
-}
-
-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-{
-  UInt32 offset;
-  GET_MATCHES_HEADER(3)
-  HASH_ZIP_CALC;
-  curMatch = p->hash[hashValue];
-  p->hash[hashValue] = p->pos;
-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
-    distances, 2) - (distances));
-  MOVE_POS_RET
-}
-
-static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-{
-  do
-  {
-    SKIP_HEADER(2)
-    HASH2_CALC;
-    curMatch = p->hash[hashValue];
-    p->hash[hashValue] = p->pos;
-    SKIP_FOOTER
-  }
-  while (--num != 0);
-}
-
-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-{
-  do
-  {
-    SKIP_HEADER(3)
-    HASH_ZIP_CALC;
-    curMatch = p->hash[hashValue];
-    p->hash[hashValue] = p->pos;
-    SKIP_FOOTER
-  }
-  while (--num != 0);
-}
-
-static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-{
-  do
-  {
-    UInt32 hash2Value;
-    SKIP_HEADER(3)
-    HASH3_CALC;
-    curMatch = p->hash[kFix3HashSize + hashValue];
-    p->hash[hash2Value] =
-    p->hash[kFix3HashSize + hashValue] = p->pos;
-    SKIP_FOOTER
-  }
-  while (--num != 0);
-}
-
-static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-{
-  do
-  {
-    UInt32 hash2Value, hash3Value;
-    SKIP_HEADER(4)
-    HASH4_CALC;
-    curMatch = p->hash[kFix4HashSize + hashValue];
-    p->hash[                hash2Value] =
-    p->hash[kFix3HashSize + hash3Value] = p->pos;
-    p->hash[kFix4HashSize + hashValue] = p->pos;
-    SKIP_FOOTER
-  }
-  while (--num != 0);
-}
-
-static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-{
-  do
-  {
-    UInt32 hash2Value, hash3Value;
-    SKIP_HEADER(4)
-    HASH4_CALC;
-    curMatch = p->hash[kFix4HashSize + hashValue];
-    p->hash[                hash2Value] =
-    p->hash[kFix3HashSize + hash3Value] =
-    p->hash[kFix4HashSize + hashValue] = p->pos;
-    p->son[p->cyclicBufferPos] = curMatch;
-    MOVE_POS
-  }
-  while (--num != 0);
-}
-
-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-{
-  do
-  {
-    SKIP_HEADER(3)
-    HASH_ZIP_CALC;
-    curMatch = p->hash[hashValue];
-    p->hash[hashValue] = p->pos;
-    p->son[p->cyclicBufferPos] = curMatch;
-    MOVE_POS
-  }
-  while (--num != 0);
-}
-
-void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
-{
-  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
-  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
-  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
-  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
-  if (!p->btMode)
-  {
-    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
-    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
-  }
-  else if (p->numHashBytes == 2)
-  {
-    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
-    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
-  }
-  else if (p->numHashBytes == 3)
-  {
-    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
-    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
-  }
-  else
-  {
-    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
-    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
-  }
-}
diff --git a/dep/StormLibOld/src/lzma/C/LzFind.h b/dep/StormLibOld/src/lzma/C/LzFind.h
deleted file mode 100644
index 010c4b92b..000000000
--- a/dep/StormLibOld/src/lzma/C/LzFind.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* LzFind.h -- Match finder for LZ algorithms
-2009-04-22 : Igor Pavlov : Public domain */
-
-#ifndef __LZ_FIND_H
-#define __LZ_FIND_H
-
-#include "Types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef UInt32 CLzRef;
-
-typedef struct _CMatchFinder
-{
-  Byte *buffer;
-  UInt32 pos;
-  UInt32 posLimit;
-  UInt32 streamPos;
-  UInt32 lenLimit;
-
-  UInt32 cyclicBufferPos;
-  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
-
-  UInt32 matchMaxLen;
-  CLzRef *hash;
-  CLzRef *son;
-  UInt32 hashMask;
-  UInt32 cutValue;
-
-  Byte *bufferBase;
-  ISeqInStream *stream;
-  int streamEndWasReached;
-
-  UInt32 blockSize;
-  UInt32 keepSizeBefore;
-  UInt32 keepSizeAfter;
-
-  UInt32 numHashBytes;
-  int directInput;
-  size_t directInputRem;
-  int btMode;
-  int bigHash;
-  UInt32 historySize;
-  UInt32 fixedHashSize;
-  UInt32 hashSizeSum;
-  UInt32 numSons;
-  SRes result;
-  UInt32 crc[256];
-} CMatchFinder;
-
-#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
-#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
-
-#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
-
-int MatchFinder_NeedMove(CMatchFinder *p);
-Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
-void MatchFinder_MoveBlock(CMatchFinder *p);
-void MatchFinder_ReadIfRequired(CMatchFinder *p);
-
-void MatchFinder_Construct(CMatchFinder *p);
-
-/* Conditions:
-     historySize <= 3 GB
-     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
-*/
-int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
-    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-    ISzAlloc *alloc);
-void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
-void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
-void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
-
-UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
-    UInt32 *distances, UInt32 maxLen);
-
-/*
-Conditions:
-  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
-  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
-*/
-
-typedef void (*Mf_Init_Func)(void *object);
-typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
-typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
-typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
-typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
-typedef void (*Mf_Skip_Func)(void *object, UInt32);
-
-typedef struct _IMatchFinder
-{
-  Mf_Init_Func Init;
-  Mf_GetIndexByte_Func GetIndexByte;
-  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
-  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
-  Mf_GetMatches_Func GetMatches;
-  Mf_Skip_Func Skip;
-} IMatchFinder;
-
-void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
-
-void MatchFinder_Init(CMatchFinder *p);
-UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
-UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
-void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
-void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/StormLibOld/src/lzma/C/LzFindMt.c b/dep/StormLibOld/src/lzma/C/LzFindMt.c
deleted file mode 100644
index aa41ed98a..000000000
--- a/dep/StormLibOld/src/lzma/C/LzFindMt.c
+++ /dev/null
@@ -1,793 +0,0 @@
-/* LzFindMt.c -- multithreaded Match finder for LZ algorithms
-2009-09-20 : Igor Pavlov : Public domain */
-
-#include "LzHash.h"
-
-#include "LzFindMt.h"
-
-void MtSync_Construct(CMtSync *p)
-{
-  p->wasCreated = False;
-  p->csWasInitialized = False;
-  p->csWasEntered = False;
-  Thread_Construct(&p->thread);
-  Event_Construct(&p->canStart);
-  Event_Construct(&p->wasStarted);
-  Event_Construct(&p->wasStopped);
-  Semaphore_Construct(&p->freeSemaphore);
-  Semaphore_Construct(&p->filledSemaphore);
-}
-
-void MtSync_GetNextBlock(CMtSync *p)
-{
-  if (p->needStart)
-  {
-    p->numProcessedBlocks = 1;
-    p->needStart = False;
-    p->stopWriting = False;
-    p->exit = False;
-    Event_Reset(&p->wasStarted);
-    Event_Reset(&p->wasStopped);
-
-    Event_Set(&p->canStart);
-    Event_Wait(&p->wasStarted);
-  }
-  else
-  {
-    CriticalSection_Leave(&p->cs);
-    p->csWasEntered = False;
-    p->numProcessedBlocks++;
-    Semaphore_Release1(&p->freeSemaphore);
-  }
-  Semaphore_Wait(&p->filledSemaphore);
-  CriticalSection_Enter(&p->cs);
-  p->csWasEntered = True;
-}
-
-/* MtSync_StopWriting must be called if Writing was started */
-
-void MtSync_StopWriting(CMtSync *p)
-{
-  UInt32 myNumBlocks = p->numProcessedBlocks;
-  if (!Thread_WasCreated(&p->thread) || p->needStart)
-    return;
-  p->stopWriting = True;
-  if (p->csWasEntered)
-  {
-    CriticalSection_Leave(&p->cs);
-    p->csWasEntered = False;
-  }
-  Semaphore_Release1(&p->freeSemaphore);
- 
-  Event_Wait(&p->wasStopped);
-
-  while (myNumBlocks++ != p->numProcessedBlocks)
-  {
-    Semaphore_Wait(&p->filledSemaphore);
-    Semaphore_Release1(&p->freeSemaphore);
-  }
-  p->needStart = True;
-}
-
-void MtSync_Destruct(CMtSync *p)
-{
-  if (Thread_WasCreated(&p->thread))
-  {
-    MtSync_StopWriting(p);
-    p->exit = True;
-    if (p->needStart)
-      Event_Set(&p->canStart);
-    Thread_Wait(&p->thread);
-    Thread_Close(&p->thread);
-  }
-  if (p->csWasInitialized)
-  {
-    CriticalSection_Delete(&p->cs);
-    p->csWasInitialized = False;
-  }
-
-  Event_Close(&p->canStart);
-  Event_Close(&p->wasStarted);
-  Event_Close(&p->wasStopped);
-  Semaphore_Close(&p->freeSemaphore);
-  Semaphore_Close(&p->filledSemaphore);
-
-  p->wasCreated = False;
-}
-
-#define RINOK_THREAD(x) { if ((x) != 0) return SZ_ERROR_THREAD; }
-
-static SRes MtSync_Create2(CMtSync *p, unsigned (MY_STD_CALL *startAddress)(void *), void *obj, UInt32 numBlocks)
-{
-  if (p->wasCreated)
-    return SZ_OK;
-
-  RINOK_THREAD(CriticalSection_Init(&p->cs));
-  p->csWasInitialized = True;
-
-  RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->canStart));
-  RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->wasStarted));
-  RINOK_THREAD(AutoResetEvent_CreateNotSignaled(&p->wasStopped));
-  
-  RINOK_THREAD(Semaphore_Create(&p->freeSemaphore, numBlocks, numBlocks));
-  RINOK_THREAD(Semaphore_Create(&p->filledSemaphore, 0, numBlocks));
-
-  p->needStart = True;
-  
-  RINOK_THREAD(Thread_Create(&p->thread, startAddress, obj));
-  p->wasCreated = True;
-  return SZ_OK;
-}
-
-static SRes MtSync_Create(CMtSync *p, unsigned (MY_STD_CALL *startAddress)(void *), void *obj, UInt32 numBlocks)
-{
-  SRes res = MtSync_Create2(p, startAddress, obj, numBlocks);
-  if (res != SZ_OK)
-    MtSync_Destruct(p);
-  return res;
-}
-
-void MtSync_Init(CMtSync *p) { p->needStart = True; }
-
-#define kMtMaxValForNormalize 0xFFFFFFFF
-
-#define DEF_GetHeads2(name, v, action) \
-static void GetHeads ## name(const Byte *p, UInt32 pos, \
-UInt32 *hash, UInt32 hashMask, UInt32 *heads, UInt32 numHeads, const UInt32 *crc) \
-{ action; for (; numHeads != 0; numHeads--) { \
-const UInt32 value = (v); p++; *heads++ = pos - hash[value]; hash[value] = pos++;  } }
-
-#define DEF_GetHeads(name, v) DEF_GetHeads2(name, v, ;)
-
-DEF_GetHeads2(2,  (p[0] | ((UInt32)p[1] << 8)), hashMask = hashMask; crc = crc; )
-DEF_GetHeads(3,  (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8)) & hashMask)
-DEF_GetHeads(4,  (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8) ^ (crc[p[3]] << 5)) & hashMask)
-DEF_GetHeads(4b, (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8) ^ ((UInt32)p[3] << 16)) & hashMask)
-/* DEF_GetHeads(5,  (crc[p[0]] ^ p[1] ^ ((UInt32)p[2] << 8) ^ (crc[p[3]] << 5) ^ (crc[p[4]] << 3)) & hashMask) */
-
-void HashThreadFunc(CMatchFinderMt *mt)
-{
-  CMtSync *p = &mt->hashSync;
-  for (;;)
-  {
-    UInt32 numProcessedBlocks = 0;
-    Event_Wait(&p->canStart);
-    Event_Set(&p->wasStarted);
-    for (;;)
-    {
-      if (p->exit)
-        return;
-      if (p->stopWriting)
-      {
-        p->numProcessedBlocks = numProcessedBlocks;
-        Event_Set(&p->wasStopped);
-        break;
-      }
-
-      {
-        CMatchFinder *mf = mt->MatchFinder;
-        if (MatchFinder_NeedMove(mf))
-        {
-          CriticalSection_Enter(&mt->btSync.cs);
-          CriticalSection_Enter(&mt->hashSync.cs);
-          {
-            const Byte *beforePtr = MatchFinder_GetPointerToCurrentPos(mf);
-            const Byte *afterPtr;
-            MatchFinder_MoveBlock(mf);
-            afterPtr = MatchFinder_GetPointerToCurrentPos(mf);
-            mt->pointerToCurPos -= beforePtr - afterPtr;
-            mt->buffer -= beforePtr - afterPtr;
-          }
-          CriticalSection_Leave(&mt->btSync.cs);
-          CriticalSection_Leave(&mt->hashSync.cs);
-          continue;
-        }
-
-        Semaphore_Wait(&p->freeSemaphore);
-
-        MatchFinder_ReadIfRequired(mf);
-        if (mf->pos > (kMtMaxValForNormalize - kMtHashBlockSize))
-        {
-          UInt32 subValue = (mf->pos - mf->historySize - 1);
-          MatchFinder_ReduceOffsets(mf, subValue);
-          MatchFinder_Normalize3(subValue, mf->hash + mf->fixedHashSize, mf->hashMask + 1);
-        }
-        {
-          UInt32 *heads = mt->hashBuf + ((numProcessedBlocks++) & kMtHashNumBlocksMask) * kMtHashBlockSize;
-          UInt32 num = mf->streamPos - mf->pos;
-          heads[0] = 2;
-          heads[1] = num;
-          if (num >= mf->numHashBytes)
-          {
-            num = num - mf->numHashBytes + 1;
-            if (num > kMtHashBlockSize - 2)
-              num = kMtHashBlockSize - 2;
-            mt->GetHeadsFunc(mf->buffer, mf->pos, mf->hash + mf->fixedHashSize, mf->hashMask, heads + 2, num, mf->crc);
-            heads[0] += num;
-          }
-          mf->pos += num;
-          mf->buffer += num;
-        }
-      }
-
-      Semaphore_Release1(&p->filledSemaphore);
-    }
-  }
-}
-
-void MatchFinderMt_GetNextBlock_Hash(CMatchFinderMt *p)
-{
-  MtSync_GetNextBlock(&p->hashSync);
-  p->hashBufPosLimit = p->hashBufPos = ((p->hashSync.numProcessedBlocks - 1) & kMtHashNumBlocksMask) * kMtHashBlockSize;
-  p->hashBufPosLimit += p->hashBuf[p->hashBufPos++];
-  p->hashNumAvail = p->hashBuf[p->hashBufPos++];
-}
-
-#define kEmptyHashValue 0
-
-/* #define MFMT_GM_INLINE */
-
-#ifdef MFMT_GM_INLINE
-
-#define NO_INLINE MY_FAST_CALL
-
-Int32 NO_INLINE GetMatchesSpecN(UInt32 lenLimit, UInt32 pos, const Byte *cur, CLzRef *son,
-    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
-    UInt32 *_distances, UInt32 _maxLen, const UInt32 *hash, Int32 limit, UInt32 size, UInt32 *posRes)
-{
-  do
-  {
-  UInt32 *distances = _distances + 1;
-  UInt32 curMatch = pos - *hash++;
-
-  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-  UInt32 len0 = 0, len1 = 0;
-  UInt32 cutValue = _cutValue;
-  UInt32 maxLen = _maxLen;
-  for (;;)
-  {
-    UInt32 delta = pos - curMatch;
-    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-    {
-      *ptr0 = *ptr1 = kEmptyHashValue;
-      break;
-    }
-    {
-      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-      const Byte *pb = cur - delta;
-      UInt32 len = (len0 < len1 ? len0 : len1);
-      if (pb[len] == cur[len])
-      {
-        if (++len != lenLimit && pb[len] == cur[len])
-          while (++len != lenLimit)
-            if (pb[len] != cur[len])
-              break;
-        if (maxLen < len)
-        {
-          *distances++ = maxLen = len;
-          *distances++ = delta - 1;
-          if (len == lenLimit)
-          {
-            *ptr1 = pair[0];
-            *ptr0 = pair[1];
-            break;
-          }
-        }
-      }
-      if (pb[len] < cur[len])
-      {
-        *ptr1 = curMatch;
-        ptr1 = pair + 1;
-        curMatch = *ptr1;
-        len1 = len;
-      }
-      else
-      {
-        *ptr0 = curMatch;
-        ptr0 = pair;
-        curMatch = *ptr0;
-        len0 = len;
-      }
-    }
-  }
-  pos++;
-  _cyclicBufferPos++;
-  cur++;
-  {
-    UInt32 num = (UInt32)(distances - _distances);
-    *_distances = num - 1;
-    _distances += num;
-    limit -= num;
-  }
-  }
-  while (limit > 0 && --size != 0);
-  *posRes = pos;
-  return limit;
-}
-
-#endif
-
-void BtGetMatches(CMatchFinderMt *p, UInt32 *distances)
-{
-  UInt32 numProcessed = 0;
-  UInt32 curPos = 2;
-  UInt32 limit = kMtBtBlockSize - (p->matchMaxLen * 2);
-  distances[1] = p->hashNumAvail;
-  while (curPos < limit)
-  {
-    if (p->hashBufPos == p->hashBufPosLimit)
-    {
-      MatchFinderMt_GetNextBlock_Hash(p);
-      distances[1] = numProcessed + p->hashNumAvail;
-      if (p->hashNumAvail >= p->numHashBytes)
-        continue;
-      for (; p->hashNumAvail != 0; p->hashNumAvail--)
-        distances[curPos++] = 0;
-      break;
-    }
-    {
-      UInt32 size = p->hashBufPosLimit - p->hashBufPos;
-      UInt32 lenLimit = p->matchMaxLen;
-      UInt32 pos = p->pos;
-      UInt32 cyclicBufferPos = p->cyclicBufferPos;
-      if (lenLimit >= p->hashNumAvail)
-        lenLimit = p->hashNumAvail;
-      {
-        UInt32 size2 = p->hashNumAvail - lenLimit + 1;
-        if (size2 < size)
-          size = size2;
-        size2 = p->cyclicBufferSize - cyclicBufferPos;
-        if (size2 < size)
-          size = size2;
-      }
-      #ifndef MFMT_GM_INLINE
-      while (curPos < limit && size-- != 0)
-      {
-        UInt32 *startDistances = distances + curPos;
-        UInt32 num = (UInt32)(GetMatchesSpec1(lenLimit, pos - p->hashBuf[p->hashBufPos++],
-          pos, p->buffer, p->son, cyclicBufferPos, p->cyclicBufferSize, p->cutValue,
-          startDistances + 1, p->numHashBytes - 1) - startDistances);
-        *startDistances = num - 1;
-        curPos += num;
-        cyclicBufferPos++;
-        pos++;
-        p->buffer++;
-      }
-      #else
-      {
-        UInt32 posRes;
-        curPos = limit - GetMatchesSpecN(lenLimit, pos, p->buffer, p->son, cyclicBufferPos, p->cyclicBufferSize, p->cutValue,
-          distances + curPos, p->numHashBytes - 1, p->hashBuf + p->hashBufPos, (Int32)(limit - curPos) , size, &posRes);
-        p->hashBufPos += posRes - pos;
-        cyclicBufferPos += posRes - pos;
-        p->buffer += posRes - pos;
-        pos = posRes;
-      }
-      #endif
-
-      numProcessed += pos - p->pos;
-      p->hashNumAvail -= pos - p->pos;
-      p->pos = pos;
-      if (cyclicBufferPos == p->cyclicBufferSize)
-        cyclicBufferPos = 0;
-      p->cyclicBufferPos = cyclicBufferPos;
-    }
-  }
-  distances[0] = curPos;
-}
-
-void BtFillBlock(CMatchFinderMt *p, UInt32 globalBlockIndex)
-{
-  CMtSync *sync = &p->hashSync;
-  if (!sync->needStart)
-  {
-    CriticalSection_Enter(&sync->cs);
-    sync->csWasEntered = True;
-  }
-  
-  BtGetMatches(p, p->btBuf + (globalBlockIndex & kMtBtNumBlocksMask) * kMtBtBlockSize);
-
-  if (p->pos > kMtMaxValForNormalize - kMtBtBlockSize)
-  {
-    UInt32 subValue = p->pos - p->cyclicBufferSize;
-    MatchFinder_Normalize3(subValue, p->son, p->cyclicBufferSize * 2);
-    p->pos -= subValue;
-  }
-
-  if (!sync->needStart)
-  {
-    CriticalSection_Leave(&sync->cs);
-    sync->csWasEntered = False;
-  }
-}
-
-void BtThreadFunc(CMatchFinderMt *mt)
-{
-  CMtSync *p = &mt->btSync;
-  for (;;)
-  {
-    UInt32 blockIndex = 0;
-    Event_Wait(&p->canStart);
-    Event_Set(&p->wasStarted);
-    for (;;)
-    {
-      if (p->exit)
-        return;
-      if (p->stopWriting)
-      {
-        p->numProcessedBlocks = blockIndex;
-        MtSync_StopWriting(&mt->hashSync);
-        Event_Set(&p->wasStopped);
-        break;
-      }
-      Semaphore_Wait(&p->freeSemaphore);
-      BtFillBlock(mt, blockIndex++);
-      Semaphore_Release1(&p->filledSemaphore);
-    }
-  }
-}
-
-void MatchFinderMt_Construct(CMatchFinderMt *p)
-{
-  p->hashBuf = 0;
-  MtSync_Construct(&p->hashSync);
-  MtSync_Construct(&p->btSync);
-}
-
-void MatchFinderMt_FreeMem(CMatchFinderMt *p, ISzAlloc *alloc)
-{
-  alloc->Free(alloc, p->hashBuf);
-  p->hashBuf = 0;
-}
-
-void MatchFinderMt_Destruct(CMatchFinderMt *p, ISzAlloc *alloc)
-{
-  MtSync_Destruct(&p->hashSync);
-  MtSync_Destruct(&p->btSync);
-  MatchFinderMt_FreeMem(p, alloc);
-}
-
-#define kHashBufferSize (kMtHashBlockSize * kMtHashNumBlocks)
-#define kBtBufferSize (kMtBtBlockSize * kMtBtNumBlocks)
-
-static unsigned MY_STD_CALL HashThreadFunc2(void *p) { HashThreadFunc((CMatchFinderMt *)p);  return 0; }
-static unsigned MY_STD_CALL BtThreadFunc2(void *p)
-{
-  Byte allocaDummy[0x180];
-  int i = 0;
-  for (i = 0; i < 16; i++)
-    allocaDummy[i] = (Byte)i;
-  BtThreadFunc((CMatchFinderMt *)p);
-  return 0;
-}
-
-SRes MatchFinderMt_Create(CMatchFinderMt *p, UInt32 historySize, UInt32 keepAddBufferBefore,
-    UInt32 matchMaxLen, UInt32 keepAddBufferAfter, ISzAlloc *alloc)
-{
-  CMatchFinder *mf = p->MatchFinder;
-  p->historySize = historySize;
-  if (kMtBtBlockSize <= matchMaxLen * 4)
-    return SZ_ERROR_PARAM;
-  if (p->hashBuf == 0)
-  {
-    p->hashBuf = (UInt32 *)alloc->Alloc(alloc, (kHashBufferSize + kBtBufferSize) * sizeof(UInt32));
-    if (p->hashBuf == 0)
-      return SZ_ERROR_MEM;
-    p->btBuf = p->hashBuf + kHashBufferSize;
-  }
-  keepAddBufferBefore += (kHashBufferSize + kBtBufferSize);
-  keepAddBufferAfter += kMtHashBlockSize;
-  if (!MatchFinder_Create(mf, historySize, keepAddBufferBefore, matchMaxLen, keepAddBufferAfter, alloc))
-    return SZ_ERROR_MEM;
-
-  RINOK(MtSync_Create(&p->hashSync, HashThreadFunc2, p, kMtHashNumBlocks));
-  RINOK(MtSync_Create(&p->btSync, BtThreadFunc2, p, kMtBtNumBlocks));
-  return SZ_OK;
-}
-
-/* Call it after ReleaseStream / SetStream */
-void MatchFinderMt_Init(CMatchFinderMt *p)
-{
-  CMatchFinder *mf = p->MatchFinder;
-  p->btBufPos = p->btBufPosLimit = 0;
-  p->hashBufPos = p->hashBufPosLimit = 0;
-  MatchFinder_Init(mf);
-  p->pointerToCurPos = MatchFinder_GetPointerToCurrentPos(mf);
-  p->btNumAvailBytes = 0;
-  p->lzPos = p->historySize + 1;
-
-  p->hash = mf->hash;
-  p->fixedHashSize = mf->fixedHashSize;
-  p->crc = mf->crc;
-
-  p->son = mf->son;
-  p->matchMaxLen = mf->matchMaxLen;
-  p->numHashBytes = mf->numHashBytes;
-  p->pos = mf->pos;
-  p->buffer = mf->buffer;
-  p->cyclicBufferPos = mf->cyclicBufferPos;
-  p->cyclicBufferSize = mf->cyclicBufferSize;
-  p->cutValue = mf->cutValue;
-}
-
-/* ReleaseStream is required to finish multithreading */
-void MatchFinderMt_ReleaseStream(CMatchFinderMt *p)
-{
-  MtSync_StopWriting(&p->btSync);
-  /* p->MatchFinder->ReleaseStream(); */
-}
-
-void MatchFinderMt_Normalize(CMatchFinderMt *p)
-{
-  MatchFinder_Normalize3(p->lzPos - p->historySize - 1, p->hash, p->fixedHashSize);
-  p->lzPos = p->historySize + 1;
-}
-
-void MatchFinderMt_GetNextBlock_Bt(CMatchFinderMt *p)
-{
-  UInt32 blockIndex;
-  MtSync_GetNextBlock(&p->btSync);
-  blockIndex = ((p->btSync.numProcessedBlocks - 1) & kMtBtNumBlocksMask);
-  p->btBufPosLimit = p->btBufPos = blockIndex * kMtBtBlockSize;
-  p->btBufPosLimit += p->btBuf[p->btBufPos++];
-  p->btNumAvailBytes = p->btBuf[p->btBufPos++];
-  if (p->lzPos >= kMtMaxValForNormalize - kMtBtBlockSize)
-    MatchFinderMt_Normalize(p);
-}
-
-const Byte * MatchFinderMt_GetPointerToCurrentPos(CMatchFinderMt *p)
-{
-  return p->pointerToCurPos;
-}
-
-#define GET_NEXT_BLOCK_IF_REQUIRED if (p->btBufPos == p->btBufPosLimit) MatchFinderMt_GetNextBlock_Bt(p);
-
-UInt32 MatchFinderMt_GetNumAvailableBytes(CMatchFinderMt *p)
-{
-  GET_NEXT_BLOCK_IF_REQUIRED;
-  return p->btNumAvailBytes;
-}
-
-Byte MatchFinderMt_GetIndexByte(CMatchFinderMt *p, Int32 index)
-{
-  return p->pointerToCurPos[index];
-}
-
-UInt32 * MixMatches2(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
-{
-  UInt32 hash2Value, curMatch2;
-  UInt32 *hash = p->hash;
-  const Byte *cur = p->pointerToCurPos;
-  UInt32 lzPos = p->lzPos;
-  MT_HASH2_CALC
-      
-  curMatch2 = hash[hash2Value];
-  hash[hash2Value] = lzPos;
-
-  if (curMatch2 >= matchMinPos)
-    if (cur[(ptrdiff_t)curMatch2 - lzPos] == cur[0])
-    {
-      *distances++ = 2;
-      *distances++ = lzPos - curMatch2 - 1;
-    }
-  return distances;
-}
-
-UInt32 * MixMatches3(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
-{
-  UInt32 hash2Value, hash3Value, curMatch2, curMatch3;
-  UInt32 *hash = p->hash;
-  const Byte *cur = p->pointerToCurPos;
-  UInt32 lzPos = p->lzPos;
-  MT_HASH3_CALC
-
-  curMatch2 = hash[                hash2Value];
-  curMatch3 = hash[kFix3HashSize + hash3Value];
-  
-  hash[                hash2Value] =
-  hash[kFix3HashSize + hash3Value] =
-    lzPos;
-
-  if (curMatch2 >= matchMinPos && cur[(ptrdiff_t)curMatch2 - lzPos] == cur[0])
-  {
-    distances[1] = lzPos - curMatch2 - 1;
-    if (cur[(ptrdiff_t)curMatch2 - lzPos + 2] == cur[2])
-    {
-      distances[0] = 3;
-      return distances + 2;
-    }
-    distances[0] = 2;
-    distances += 2;
-  }
-  if (curMatch3 >= matchMinPos && cur[(ptrdiff_t)curMatch3 - lzPos] == cur[0])
-  {
-    *distances++ = 3;
-    *distances++ = lzPos - curMatch3 - 1;
-  }
-  return distances;
-}
-
-/*
-UInt32 *MixMatches4(CMatchFinderMt *p, UInt32 matchMinPos, UInt32 *distances)
-{
-  UInt32 hash2Value, hash3Value, hash4Value, curMatch2, curMatch3, curMatch4;
-  UInt32 *hash = p->hash;
-  const Byte *cur = p->pointerToCurPos;
-  UInt32 lzPos = p->lzPos;
-  MT_HASH4_CALC
-      
-  curMatch2 = hash[                hash2Value];
-  curMatch3 = hash[kFix3HashSize + hash3Value];
-  curMatch4 = hash[kFix4HashSize + hash4Value];
-  
-  hash[                hash2Value] =
-  hash[kFix3HashSize + hash3Value] =
-  hash[kFix4HashSize + hash4Value] =
-    lzPos;
-
-  if (curMatch2 >= matchMinPos && cur[(ptrdiff_t)curMatch2 - lzPos] == cur[0])
-  {
-    distances[1] = lzPos - curMatch2 - 1;
-    if (cur[(ptrdiff_t)curMatch2 - lzPos + 2] == cur[2])
-    {
-      distances[0] =  (cur[(ptrdiff_t)curMatch2 - lzPos + 3] == cur[3]) ? 4 : 3;
-      return distances + 2;
-    }
-    distances[0] = 2;
-    distances += 2;
-  }
-  if (curMatch3 >= matchMinPos && cur[(ptrdiff_t)curMatch3 - lzPos] == cur[0])
-  {
-    distances[1] = lzPos - curMatch3 - 1;
-    if (cur[(ptrdiff_t)curMatch3 - lzPos + 3] == cur[3])
-    {
-      distances[0] = 4;
-      return distances + 2;
-    }
-    distances[0] = 3;
-    distances += 2;
-  }
-
-  if (curMatch4 >= matchMinPos)
-    if (
-      cur[(ptrdiff_t)curMatch4 - lzPos] == cur[0] &&
-      cur[(ptrdiff_t)curMatch4 - lzPos + 3] == cur[3]
-      )
-    {
-      *distances++ = 4;
-      *distances++ = lzPos - curMatch4 - 1;
-    }
-  return distances;
-}
-*/
-
-#define INCREASE_LZ_POS p->lzPos++; p->pointerToCurPos++;
-
-UInt32 MatchFinderMt2_GetMatches(CMatchFinderMt *p, UInt32 *distances)
-{
-  const UInt32 *btBuf = p->btBuf + p->btBufPos;
-  UInt32 len = *btBuf++;
-  p->btBufPos += 1 + len;
-  p->btNumAvailBytes--;
-  {
-    UInt32 i;
-    for (i = 0; i < len; i += 2)
-    {
-      *distances++ = *btBuf++;
-      *distances++ = *btBuf++;
-    }
-  }
-  INCREASE_LZ_POS
-  return len;
-}
-
-UInt32 MatchFinderMt_GetMatches(CMatchFinderMt *p, UInt32 *distances)
-{
-  const UInt32 *btBuf = p->btBuf + p->btBufPos;
-  UInt32 len = *btBuf++;
-  p->btBufPos += 1 + len;
-
-  if (len == 0)
-  {
-    if (p->btNumAvailBytes-- >= 4)
-      len = (UInt32)(p->MixMatchesFunc(p, p->lzPos - p->historySize, distances) - (distances));
-  }
-  else
-  {
-    /* Condition: there are matches in btBuf with length < p->numHashBytes */
-    UInt32 *distances2;
-    p->btNumAvailBytes--;
-    distances2 = p->MixMatchesFunc(p, p->lzPos - btBuf[1], distances);
-    do
-    {
-      *distances2++ = *btBuf++;
-      *distances2++ = *btBuf++;
-    }
-    while ((len -= 2) != 0);
-    len  = (UInt32)(distances2 - (distances));
-  }
-  INCREASE_LZ_POS
-  return len;
-}
-
-#define SKIP_HEADER2_MT  do { GET_NEXT_BLOCK_IF_REQUIRED
-#define SKIP_HEADER_MT(n) SKIP_HEADER2_MT if (p->btNumAvailBytes-- >= (n)) { const Byte *cur = p->pointerToCurPos; UInt32 *hash = p->hash;
-#define SKIP_FOOTER_MT } INCREASE_LZ_POS p->btBufPos += p->btBuf[p->btBufPos] + 1; } while (--num != 0);
-
-void MatchFinderMt0_Skip(CMatchFinderMt *p, UInt32 num)
-{
-  SKIP_HEADER2_MT { p->btNumAvailBytes--;
-  SKIP_FOOTER_MT
-}
-
-void MatchFinderMt2_Skip(CMatchFinderMt *p, UInt32 num)
-{
-  SKIP_HEADER_MT(2)
-      UInt32 hash2Value;
-      MT_HASH2_CALC
-      hash[hash2Value] = p->lzPos;
-  SKIP_FOOTER_MT
-}
-
-void MatchFinderMt3_Skip(CMatchFinderMt *p, UInt32 num)
-{
-  SKIP_HEADER_MT(3)
-      UInt32 hash2Value, hash3Value;
-      MT_HASH3_CALC
-      hash[kFix3HashSize + hash3Value] =
-      hash[                hash2Value] =
-        p->lzPos;
-  SKIP_FOOTER_MT
-}
-
-/*
-void MatchFinderMt4_Skip(CMatchFinderMt *p, UInt32 num)
-{
-  SKIP_HEADER_MT(4)
-      UInt32 hash2Value, hash3Value, hash4Value;
-      MT_HASH4_CALC
-      hash[kFix4HashSize + hash4Value] =
-      hash[kFix3HashSize + hash3Value] =
-      hash[                hash2Value] =
-        p->lzPos;
-  SKIP_FOOTER_MT
-}
-*/
-
-void MatchFinderMt_CreateVTable(CMatchFinderMt *p, IMatchFinder *vTable)
-{
-  vTable->Init = (Mf_Init_Func)MatchFinderMt_Init;
-  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinderMt_GetIndexByte;
-  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinderMt_GetNumAvailableBytes;
-  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinderMt_GetPointerToCurrentPos;
-  vTable->GetMatches = (Mf_GetMatches_Func)MatchFinderMt_GetMatches;
-  switch(p->MatchFinder->numHashBytes)
-  {
-    case 2:
-      p->GetHeadsFunc = GetHeads2;
-      p->MixMatchesFunc = (Mf_Mix_Matches)0;
-      vTable->Skip = (Mf_Skip_Func)MatchFinderMt0_Skip;
-      vTable->GetMatches = (Mf_GetMatches_Func)MatchFinderMt2_GetMatches;
-      break;
-    case 3:
-      p->GetHeadsFunc = GetHeads3;
-      p->MixMatchesFunc = (Mf_Mix_Matches)MixMatches2;
-      vTable->Skip = (Mf_Skip_Func)MatchFinderMt2_Skip;
-      break;
-    default:
-    /* case 4: */
-      p->GetHeadsFunc = p->MatchFinder->bigHash ? GetHeads4b : GetHeads4;
-      /* p->GetHeadsFunc = GetHeads4; */
-      p->MixMatchesFunc = (Mf_Mix_Matches)MixMatches3;
-      vTable->Skip = (Mf_Skip_Func)MatchFinderMt3_Skip;
-      break;
-    /*
-    default:
-      p->GetHeadsFunc = GetHeads5;
-      p->MixMatchesFunc = (Mf_Mix_Matches)MixMatches4;
-      vTable->Skip = (Mf_Skip_Func)MatchFinderMt4_Skip;
-      break;
-    */
-  }
-}
diff --git a/dep/StormLibOld/src/lzma/C/LzFindMt.h b/dep/StormLibOld/src/lzma/C/LzFindMt.h
deleted file mode 100644
index b985af5fe..000000000
--- a/dep/StormLibOld/src/lzma/C/LzFindMt.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* LzFindMt.h -- multithreaded Match finder for LZ algorithms
-2009-02-07 : Igor Pavlov : Public domain */
-
-#ifndef __LZ_FIND_MT_H
-#define __LZ_FIND_MT_H
-
-#include "LzFind.h"
-#include "Threads.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define kMtHashBlockSize (1 << 13)
-#define kMtHashNumBlocks (1 << 3)
-#define kMtHashNumBlocksMask (kMtHashNumBlocks - 1)
-
-#define kMtBtBlockSize (1 << 14)
-#define kMtBtNumBlocks (1 << 6)
-#define kMtBtNumBlocksMask (kMtBtNumBlocks - 1)
-
-typedef struct _CMtSync
-{
-  Bool wasCreated;
-  Bool needStart;
-  Bool exit;
-  Bool stopWriting;
-
-  CThread thread;
-  CAutoResetEvent canStart;
-  CAutoResetEvent wasStarted;
-  CAutoResetEvent wasStopped;
-  CSemaphore freeSemaphore;
-  CSemaphore filledSemaphore;
-  Bool csWasInitialized;
-  Bool csWasEntered;
-  CCriticalSection cs;
-  UInt32 numProcessedBlocks;
-} CMtSync;
-
-typedef UInt32 * (*Mf_Mix_Matches)(void *p, UInt32 matchMinPos, UInt32 *distances);
-
-/* kMtCacheLineDummy must be >= size_of_CPU_cache_line */
-#define kMtCacheLineDummy 128
-
-typedef void (*Mf_GetHeads)(const Byte *buffer, UInt32 pos,
-  UInt32 *hash, UInt32 hashMask, UInt32 *heads, UInt32 numHeads, const UInt32 *crc);
-
-typedef struct _CMatchFinderMt
-{
-  /* LZ */
-  const Byte *pointerToCurPos;
-  UInt32 *btBuf;
-  UInt32 btBufPos;
-  UInt32 btBufPosLimit;
-  UInt32 lzPos;
-  UInt32 btNumAvailBytes;
-
-  UInt32 *hash;
-  UInt32 fixedHashSize;
-  UInt32 historySize;
-  const UInt32 *crc;
-
-  Mf_Mix_Matches MixMatchesFunc;
-  
-  /* LZ + BT */
-  CMtSync btSync;
-  Byte btDummy[kMtCacheLineDummy];
-
-  /* BT */
-  UInt32 *hashBuf;
-  UInt32 hashBufPos;
-  UInt32 hashBufPosLimit;
-  UInt32 hashNumAvail;
-
-  CLzRef *son;
-  UInt32 matchMaxLen;
-  UInt32 numHashBytes;
-  UInt32 pos;
-  Byte *buffer;
-  UInt32 cyclicBufferPos;
-  UInt32 cyclicBufferSize; /* it must be historySize + 1 */
-  UInt32 cutValue;
-
-  /* BT + Hash */
-  CMtSync hashSync;
-  /* Byte hashDummy[kMtCacheLineDummy]; */
-  
-  /* Hash */
-  Mf_GetHeads GetHeadsFunc;
-  CMatchFinder *MatchFinder;
-} CMatchFinderMt;
-
-void MatchFinderMt_Construct(CMatchFinderMt *p);
-void MatchFinderMt_Destruct(CMatchFinderMt *p, ISzAlloc *alloc);
-SRes MatchFinderMt_Create(CMatchFinderMt *p, UInt32 historySize, UInt32 keepAddBufferBefore,
-    UInt32 matchMaxLen, UInt32 keepAddBufferAfter, ISzAlloc *alloc);
-void MatchFinderMt_CreateVTable(CMatchFinderMt *p, IMatchFinder *vTable);
-void MatchFinderMt_ReleaseStream(CMatchFinderMt *p);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/StormLibOld/src/lzma/C/LzHash.h b/dep/StormLibOld/src/lzma/C/LzHash.h
deleted file mode 100644
index f3e89966c..000000000
--- a/dep/StormLibOld/src/lzma/C/LzHash.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* LzHash.h -- HASH functions for LZ algorithms
-2009-02-07 : Igor Pavlov : Public domain */
-
-#ifndef __LZ_HASH_H
-#define __LZ_HASH_H
-
-#define kHash2Size (1 << 10)
-#define kHash3Size (1 << 16)
-#define kHash4Size (1 << 20)
-
-#define kFix3HashSize (kHash2Size)
-#define kFix4HashSize (kHash2Size + kHash3Size)
-#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
-
-#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
-
-#define HASH3_CALC { \
-  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-  hash2Value = temp & (kHash2Size - 1); \
-  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
-
-#define HASH4_CALC { \
-  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-  hash2Value = temp & (kHash2Size - 1); \
-  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
-
-#define HASH5_CALC { \
-  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-  hash2Value = temp & (kHash2Size - 1); \
-  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
-  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
-  hash4Value &= (kHash4Size - 1); }
-
-/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
-#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
-
-
-#define MT_HASH2_CALC \
-  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
-
-#define MT_HASH3_CALC { \
-  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-  hash2Value = temp & (kHash2Size - 1); \
-  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
-
-#define MT_HASH4_CALC { \
-  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-  hash2Value = temp & (kHash2Size - 1); \
-  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
-
-#endif
diff --git a/dep/StormLibOld/src/lzma/C/LzmaDec.c b/dep/StormLibOld/src/lzma/C/LzmaDec.c
deleted file mode 100644
index 2036761bf..000000000
--- a/dep/StormLibOld/src/lzma/C/LzmaDec.c
+++ /dev/null
@@ -1,999 +0,0 @@
-/* LzmaDec.c -- LZMA Decoder
-2009-09-20 : Igor Pavlov : Public domain */
-
-#include "LzmaDec.h"
-
-#include <string.h>
-
-#define kNumTopBits 24
-#define kTopValue ((UInt32)1 << kNumTopBits)
-
-#define kNumBitModelTotalBits 11
-#define kBitModelTotal (1 << kNumBitModelTotalBits)
-#define kNumMoveBits 5
-
-#define RC_INIT_SIZE 5
-
-#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
-
-#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
-#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
-#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
-  { UPDATE_0(p); i = (i + i); A0; } else \
-  { UPDATE_1(p); i = (i + i) + 1; A1; }
-#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
-
-#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
-#define TREE_DECODE(probs, limit, i) \
-  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
-
-/* #define _LZMA_SIZE_OPT */
-
-#ifdef _LZMA_SIZE_OPT
-#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
-#else
-#define TREE_6_DECODE(probs, i) \
-  { i = 1; \
-  TREE_GET_BIT(probs, i); \
-  TREE_GET_BIT(probs, i); \
-  TREE_GET_BIT(probs, i); \
-  TREE_GET_BIT(probs, i); \
-  TREE_GET_BIT(probs, i); \
-  TREE_GET_BIT(probs, i); \
-  i -= 0x40; }
-#endif
-
-#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
-
-#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-#define UPDATE_0_CHECK range = bound;
-#define UPDATE_1_CHECK range -= bound; code -= bound;
-#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
-  { UPDATE_0_CHECK; i = (i + i); A0; } else \
-  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
-#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
-#define TREE_DECODE_CHECK(probs, limit, i) \
-  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
-
-
-#define kNumPosBitsMax 4
-#define kNumPosStatesMax (1 << kNumPosBitsMax)
-
-#define kLenNumLowBits 3
-#define kLenNumLowSymbols (1 << kLenNumLowBits)
-#define kLenNumMidBits 3
-#define kLenNumMidSymbols (1 << kLenNumMidBits)
-#define kLenNumHighBits 8
-#define kLenNumHighSymbols (1 << kLenNumHighBits)
-
-#define LenChoice 0
-#define LenChoice2 (LenChoice + 1)
-#define LenLow (LenChoice2 + 1)
-#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
-#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
-#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
-
-
-#define kNumStates 12
-#define kNumLitStates 7
-
-#define kStartPosModelIndex 4
-#define kEndPosModelIndex 14
-#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-
-#define kNumPosSlotBits 6
-#define kNumLenToPosStates 4
-
-#define kNumAlignBits 4
-#define kAlignTableSize (1 << kNumAlignBits)
-
-#define kMatchMinLen 2
-#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-
-#define IsMatch 0
-#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
-#define IsRepG0 (IsRep + kNumStates)
-#define IsRepG1 (IsRepG0 + kNumStates)
-#define IsRepG2 (IsRepG1 + kNumStates)
-#define IsRep0Long (IsRepG2 + kNumStates)
-#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
-#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
-#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
-#define LenCoder (Align + kAlignTableSize)
-#define RepLenCoder (LenCoder + kNumLenProbs)
-#define Literal (RepLenCoder + kNumLenProbs)
-
-#define LZMA_BASE_SIZE 1846
-#define LZMA_LIT_SIZE 768
-
-#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
-
-#if Literal != LZMA_BASE_SIZE
-StopCompilingDueBUG
-#endif
-
-#define LZMA_DIC_MIN (1 << 12)
-
-/* First LZMA-symbol is always decoded.
-And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
-Out:
-  Result:
-    SZ_OK - OK
-    SZ_ERROR_DATA - Error
-  p->remainLen:
-    < kMatchSpecLenStart : normal remain
-    = kMatchSpecLenStart : finished
-    = kMatchSpecLenStart + 1 : Flush marker
-    = kMatchSpecLenStart + 2 : State Init Marker
-*/
-
-static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
-{
-  CLzmaProb *probs = p->probs;
-
-  unsigned state = p->state;
-  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
-  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
-  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
-  unsigned lc = p->prop.lc;
-
-  Byte *dic = p->dic;
-  SizeT dicBufSize = p->dicBufSize;
-  SizeT dicPos = p->dicPos;
-  
-  UInt32 processedPos = p->processedPos;
-  UInt32 checkDicSize = p->checkDicSize;
-  unsigned len = 0;
-
-  const Byte *buf = p->buf;
-  UInt32 range = p->range;
-  UInt32 code = p->code;
-
-  do
-  {
-    CLzmaProb *prob;
-    UInt32 bound;
-    unsigned ttt;
-    unsigned posState = processedPos & pbMask;
-
-    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-    IF_BIT_0(prob)
-    {
-      unsigned symbol;
-      UPDATE_0(prob);
-      prob = probs + Literal;
-      if (checkDicSize != 0 || processedPos != 0)
-        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
-        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
-
-      if (state < kNumLitStates)
-      {
-        state -= (state < 4) ? state : 3;
-        symbol = 1;
-        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
-      }
-      else
-      {
-        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-        unsigned offs = 0x100;
-        state -= (state < 10) ? 3 : 6;
-        symbol = 1;
-        do
-        {
-          unsigned bit;
-          CLzmaProb *probLit;
-          matchByte <<= 1;
-          bit = (matchByte & offs);
-          probLit = prob + offs + bit + symbol;
-          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
-        }
-        while (symbol < 0x100);
-      }
-      dic[dicPos++] = (Byte)symbol;
-      processedPos++;
-      continue;
-    }
-    else
-    {
-      UPDATE_1(prob);
-      prob = probs + IsRep + state;
-      IF_BIT_0(prob)
-      {
-        UPDATE_0(prob);
-        state += kNumStates;
-        prob = probs + LenCoder;
-      }
-      else
-      {
-        UPDATE_1(prob);
-        if (checkDicSize == 0 && processedPos == 0)
-          return SZ_ERROR_DATA;
-        prob = probs + IsRepG0 + state;
-        IF_BIT_0(prob)
-        {
-          UPDATE_0(prob);
-          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-          IF_BIT_0(prob)
-          {
-            UPDATE_0(prob);
-            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-            dicPos++;
-            processedPos++;
-            state = state < kNumLitStates ? 9 : 11;
-            continue;
-          }
-          UPDATE_1(prob);
-        }
-        else
-        {
-          UInt32 distance;
-          UPDATE_1(prob);
-          prob = probs + IsRepG1 + state;
-          IF_BIT_0(prob)
-          {
-            UPDATE_0(prob);
-            distance = rep1;
-          }
-          else
-          {
-            UPDATE_1(prob);
-            prob = probs + IsRepG2 + state;
-            IF_BIT_0(prob)
-            {
-              UPDATE_0(prob);
-              distance = rep2;
-            }
-            else
-            {
-              UPDATE_1(prob);
-              distance = rep3;
-              rep3 = rep2;
-            }
-            rep2 = rep1;
-          }
-          rep1 = rep0;
-          rep0 = distance;
-        }
-        state = state < kNumLitStates ? 8 : 11;
-        prob = probs + RepLenCoder;
-      }
-      {
-        unsigned limit, offset;
-        CLzmaProb *probLen = prob + LenChoice;
-        IF_BIT_0(probLen)
-        {
-          UPDATE_0(probLen);
-          probLen = prob + LenLow + (posState << kLenNumLowBits);
-          offset = 0;
-          limit = (1 << kLenNumLowBits);
-        }
-        else
-        {
-          UPDATE_1(probLen);
-          probLen = prob + LenChoice2;
-          IF_BIT_0(probLen)
-          {
-            UPDATE_0(probLen);
-            probLen = prob + LenMid + (posState << kLenNumMidBits);
-            offset = kLenNumLowSymbols;
-            limit = (1 << kLenNumMidBits);
-          }
-          else
-          {
-            UPDATE_1(probLen);
-            probLen = prob + LenHigh;
-            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-            limit = (1 << kLenNumHighBits);
-          }
-        }
-        TREE_DECODE(probLen, limit, len);
-        len += offset;
-      }
-
-      if (state >= kNumStates)
-      {
-        UInt32 distance;
-        prob = probs + PosSlot +
-            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
-        TREE_6_DECODE(prob, distance);
-        if (distance >= kStartPosModelIndex)
-        {
-          unsigned posSlot = (unsigned)distance;
-          int numDirectBits = (int)(((distance >> 1) - 1));
-          distance = (2 | (distance & 1));
-          if (posSlot < kEndPosModelIndex)
-          {
-            distance <<= numDirectBits;
-            prob = probs + SpecPos + distance - posSlot - 1;
-            {
-              UInt32 mask = 1;
-              unsigned i = 1;
-              do
-              {
-                GET_BIT2(prob + i, i, ; , distance |= mask);
-                mask <<= 1;
-              }
-              while (--numDirectBits != 0);
-            }
-          }
-          else
-          {
-            numDirectBits -= kNumAlignBits;
-            do
-            {
-              NORMALIZE
-              range >>= 1;
-              
-              {
-                UInt32 t;
-                code -= range;
-                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
-                distance = (distance << 1) + (t + 1);
-                code += range & t;
-              }
-              /*
-              distance <<= 1;
-              if (code >= range)
-              {
-                code -= range;
-                distance |= 1;
-              }
-              */
-            }
-            while (--numDirectBits != 0);
-            prob = probs + Align;
-            distance <<= kNumAlignBits;
-            {
-              unsigned i = 1;
-              GET_BIT2(prob + i, i, ; , distance |= 1);
-              GET_BIT2(prob + i, i, ; , distance |= 2);
-              GET_BIT2(prob + i, i, ; , distance |= 4);
-              GET_BIT2(prob + i, i, ; , distance |= 8);
-            }
-            if (distance == (UInt32)0xFFFFFFFF)
-            {
-              len += kMatchSpecLenStart;
-              state -= kNumStates;
-              break;
-            }
-          }
-        }
-        rep3 = rep2;
-        rep2 = rep1;
-        rep1 = rep0;
-        rep0 = distance + 1;
-        if (checkDicSize == 0)
-        {
-          if (distance >= processedPos)
-            return SZ_ERROR_DATA;
-        }
-        else if (distance >= checkDicSize)
-          return SZ_ERROR_DATA;
-        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
-      }
-
-      len += kMatchMinLen;
-
-      if (limit == dicPos)
-        return SZ_ERROR_DATA;
-      {
-        SizeT rem = limit - dicPos;
-        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
-        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
-
-        processedPos += curLen;
-
-        len -= curLen;
-        if (pos + curLen <= dicBufSize)
-        {
-          Byte *dest = dic + dicPos;
-          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
-          const Byte *lim = dest + curLen;
-          dicPos += curLen;
-          do
-            *(dest) = (Byte)*(dest + src);
-          while (++dest != lim);
-        }
-        else
-        {
-          do
-          {
-            dic[dicPos++] = dic[pos];
-            if (++pos == dicBufSize)
-              pos = 0;
-          }
-          while (--curLen != 0);
-        }
-      }
-    }
-  }
-  while (dicPos < limit && buf < bufLimit);
-  NORMALIZE;
-  p->buf = buf;
-  p->range = range;
-  p->code = code;
-  p->remainLen = len;
-  p->dicPos = dicPos;
-  p->processedPos = processedPos;
-  p->reps[0] = rep0;
-  p->reps[1] = rep1;
-  p->reps[2] = rep2;
-  p->reps[3] = rep3;
-  p->state = state;
-
-  return SZ_OK;
-}
-
-static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
-{
-  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
-  {
-    Byte *dic = p->dic;
-    SizeT dicPos = p->dicPos;
-    SizeT dicBufSize = p->dicBufSize;
-    unsigned len = p->remainLen;
-    UInt32 rep0 = p->reps[0];
-    if (limit - dicPos < len)
-      len = (unsigned)(limit - dicPos);
-
-    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
-      p->checkDicSize = p->prop.dicSize;
-
-    p->processedPos += len;
-    p->remainLen -= len;
-    while (len-- != 0)
-    {
-      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-      dicPos++;
-    }
-    p->dicPos = dicPos;
-  }
-}
-
-static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
-{
-  do
-  {
-    SizeT limit2 = limit;
-    if (p->checkDicSize == 0)
-    {
-      UInt32 rem = p->prop.dicSize - p->processedPos;
-      if (limit - p->dicPos > rem)
-        limit2 = p->dicPos + rem;
-    }
-    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
-    if (p->processedPos >= p->prop.dicSize)
-      p->checkDicSize = p->prop.dicSize;
-    LzmaDec_WriteRem(p, limit);
-  }
-  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
-
-  if (p->remainLen > kMatchSpecLenStart)
-  {
-    p->remainLen = kMatchSpecLenStart;
-  }
-  return 0;
-}
-
-typedef enum
-{
-  DUMMY_ERROR, /* unexpected end of input stream */
-  DUMMY_LIT,
-  DUMMY_MATCH,
-  DUMMY_REP
-} ELzmaDummy;
-
-static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
-{
-  UInt32 range = p->range;
-  UInt32 code = p->code;
-  const Byte *bufLimit = buf + inSize;
-  CLzmaProb *probs = p->probs;
-  unsigned state = p->state;
-  ELzmaDummy res;
-
-  {
-    CLzmaProb *prob;
-    UInt32 bound;
-    unsigned ttt;
-    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
-
-    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-    IF_BIT_0_CHECK(prob)
-    {
-      UPDATE_0_CHECK
-
-      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
-
-      prob = probs + Literal;
-      if (p->checkDicSize != 0 || p->processedPos != 0)
-        prob += (LZMA_LIT_SIZE *
-          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
-          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
-
-      if (state < kNumLitStates)
-      {
-        unsigned symbol = 1;
-        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
-      }
-      else
-      {
-        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
-            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
-        unsigned offs = 0x100;
-        unsigned symbol = 1;
-        do
-        {
-          unsigned bit;
-          CLzmaProb *probLit;
-          matchByte <<= 1;
-          bit = (matchByte & offs);
-          probLit = prob + offs + bit + symbol;
-          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
-        }
-        while (symbol < 0x100);
-      }
-      res = DUMMY_LIT;
-    }
-    else
-    {
-      unsigned len;
-      UPDATE_1_CHECK;
-
-      prob = probs + IsRep + state;
-      IF_BIT_0_CHECK(prob)
-      {
-        UPDATE_0_CHECK;
-        state = 0;
-        prob = probs + LenCoder;
-        res = DUMMY_MATCH;
-      }
-      else
-      {
-        UPDATE_1_CHECK;
-        res = DUMMY_REP;
-        prob = probs + IsRepG0 + state;
-        IF_BIT_0_CHECK(prob)
-        {
-          UPDATE_0_CHECK;
-          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-          IF_BIT_0_CHECK(prob)
-          {
-            UPDATE_0_CHECK;
-            NORMALIZE_CHECK;
-            return DUMMY_REP;
-          }
-          else
-          {
-            UPDATE_1_CHECK;
-          }
-        }
-        else
-        {
-          UPDATE_1_CHECK;
-          prob = probs + IsRepG1 + state;
-          IF_BIT_0_CHECK(prob)
-          {
-            UPDATE_0_CHECK;
-          }
-          else
-          {
-            UPDATE_1_CHECK;
-            prob = probs + IsRepG2 + state;
-            IF_BIT_0_CHECK(prob)
-            {
-              UPDATE_0_CHECK;
-            }
-            else
-            {
-              UPDATE_1_CHECK;
-            }
-          }
-        }
-        state = kNumStates;
-        prob = probs + RepLenCoder;
-      }
-      {
-        unsigned limit, offset;
-        CLzmaProb *probLen = prob + LenChoice;
-        IF_BIT_0_CHECK(probLen)
-        {
-          UPDATE_0_CHECK;
-          probLen = prob + LenLow + (posState << kLenNumLowBits);
-          offset = 0;
-          limit = 1 << kLenNumLowBits;
-        }
-        else
-        {
-          UPDATE_1_CHECK;
-          probLen = prob + LenChoice2;
-          IF_BIT_0_CHECK(probLen)
-          {
-            UPDATE_0_CHECK;
-            probLen = prob + LenMid + (posState << kLenNumMidBits);
-            offset = kLenNumLowSymbols;
-            limit = 1 << kLenNumMidBits;
-          }
-          else
-          {
-            UPDATE_1_CHECK;
-            probLen = prob + LenHigh;
-            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-            limit = 1 << kLenNumHighBits;
-          }
-        }
-        TREE_DECODE_CHECK(probLen, limit, len);
-        len += offset;
-      }
-
-      if (state < 4)
-      {
-        unsigned posSlot;
-        prob = probs + PosSlot +
-            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
-            kNumPosSlotBits);
-        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
-        if (posSlot >= kStartPosModelIndex)
-        {
-          int numDirectBits = ((posSlot >> 1) - 1);
-
-          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
-
-          if (posSlot < kEndPosModelIndex)
-          {
-            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
-          }
-          else
-          {
-            numDirectBits -= kNumAlignBits;
-            do
-            {
-              NORMALIZE_CHECK
-              range >>= 1;
-              code -= range & (((code - range) >> 31) - 1);
-              /* if (code >= range) code -= range; */
-            }
-            while (--numDirectBits != 0);
-            prob = probs + Align;
-            numDirectBits = kNumAlignBits;
-          }
-          {
-            unsigned i = 1;
-            do
-            {
-              GET_BIT_CHECK(prob + i, i);
-            }
-            while (--numDirectBits != 0);
-          }
-        }
-      }
-    }
-  }
-  NORMALIZE_CHECK;
-  return res;
-}
-
-
-static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
-{
-  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
-  p->range = 0xFFFFFFFF;
-  p->needFlush = 0;
-}
-
-void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
-{
-  p->needFlush = 1;
-  p->remainLen = 0;
-  p->tempBufSize = 0;
-
-  if (initDic)
-  {
-    p->processedPos = 0;
-    p->checkDicSize = 0;
-    p->needInitState = 1;
-  }
-  if (initState)
-    p->needInitState = 1;
-}
-
-void LzmaDec_Init(CLzmaDec *p)
-{
-  p->dicPos = 0;
-  LzmaDec_InitDicAndState(p, True, True);
-}
-
-static void LzmaDec_InitStateReal(CLzmaDec *p)
-{
-  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
-  UInt32 i;
-  CLzmaProb *probs = p->probs;
-  for (i = 0; i < numProbs; i++)
-    probs[i] = kBitModelTotal >> 1;
-  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
-  p->state = 0;
-  p->needInitState = 0;
-}
-
-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
-    ELzmaFinishMode finishMode, ELzmaStatus *status)
-{
-  SizeT inSize = *srcLen;
-  (*srcLen) = 0;
-  LzmaDec_WriteRem(p, dicLimit);
-  
-  *status = LZMA_STATUS_NOT_SPECIFIED;
-
-  while (p->remainLen != kMatchSpecLenStart)
-  {
-      int checkEndMarkNow;
-
-      if (p->needFlush != 0)
-      {
-        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
-          p->tempBuf[p->tempBufSize++] = *src++;
-        if (p->tempBufSize < RC_INIT_SIZE)
-        {
-          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-          return SZ_OK;
-        }
-        if (p->tempBuf[0] != 0)
-          return SZ_ERROR_DATA;
-
-        LzmaDec_InitRc(p, p->tempBuf);
-        p->tempBufSize = 0;
-      }
-
-      checkEndMarkNow = 0;
-      if (p->dicPos >= dicLimit)
-      {
-        if (p->remainLen == 0 && p->code == 0)
-        {
-          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
-          return SZ_OK;
-        }
-        if (finishMode == LZMA_FINISH_ANY)
-        {
-          *status = LZMA_STATUS_NOT_FINISHED;
-          return SZ_OK;
-        }
-        if (p->remainLen != 0)
-        {
-          *status = LZMA_STATUS_NOT_FINISHED;
-          return SZ_ERROR_DATA;
-        }
-        checkEndMarkNow = 1;
-      }
-
-      if (p->needInitState)
-        LzmaDec_InitStateReal(p);
-  
-      if (p->tempBufSize == 0)
-      {
-        SizeT processed;
-        const Byte *bufLimit;
-        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
-        {
-          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
-          if (dummyRes == DUMMY_ERROR)
-          {
-            memcpy(p->tempBuf, src, inSize);
-            p->tempBufSize = (unsigned)inSize;
-            (*srcLen) += inSize;
-            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-            return SZ_OK;
-          }
-          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
-          {
-            *status = LZMA_STATUS_NOT_FINISHED;
-            return SZ_ERROR_DATA;
-          }
-          bufLimit = src;
-        }
-        else
-          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
-        p->buf = src;
-        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
-          return SZ_ERROR_DATA;
-        processed = (SizeT)(p->buf - src);
-        (*srcLen) += processed;
-        src += processed;
-        inSize -= processed;
-      }
-      else
-      {
-        unsigned rem = p->tempBufSize, lookAhead = 0;
-        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
-          p->tempBuf[rem++] = src[lookAhead++];
-        p->tempBufSize = rem;
-        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
-        {
-          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
-          if (dummyRes == DUMMY_ERROR)
-          {
-            (*srcLen) += lookAhead;
-            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-            return SZ_OK;
-          }
-          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
-          {
-            *status = LZMA_STATUS_NOT_FINISHED;
-            return SZ_ERROR_DATA;
-          }
-        }
-        p->buf = p->tempBuf;
-        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
-          return SZ_ERROR_DATA;
-        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
-        (*srcLen) += lookAhead;
-        src += lookAhead;
-        inSize -= lookAhead;
-        p->tempBufSize = 0;
-      }
-  }
-  if (p->code == 0)
-    *status = LZMA_STATUS_FINISHED_WITH_MARK;
-  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
-}
-
-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
-{
-  SizeT outSize = *destLen;
-  SizeT inSize = *srcLen;
-  *srcLen = *destLen = 0;
-  for (;;)
-  {
-    SizeT inSizeCur = inSize, outSizeCur, dicPos;
-    ELzmaFinishMode curFinishMode;
-    SRes res;
-    if (p->dicPos == p->dicBufSize)
-      p->dicPos = 0;
-    dicPos = p->dicPos;
-    if (outSize > p->dicBufSize - dicPos)
-    {
-      outSizeCur = p->dicBufSize;
-      curFinishMode = LZMA_FINISH_ANY;
-    }
-    else
-    {
-      outSizeCur = dicPos + outSize;
-      curFinishMode = finishMode;
-    }
-
-    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
-    src += inSizeCur;
-    inSize -= inSizeCur;
-    *srcLen += inSizeCur;
-    outSizeCur = p->dicPos - dicPos;
-    memcpy(dest, p->dic + dicPos, outSizeCur);
-    dest += outSizeCur;
-    outSize -= outSizeCur;
-    *destLen += outSizeCur;
-    if (res != 0)
-      return res;
-    if (outSizeCur == 0 || outSize == 0)
-      return SZ_OK;
-  }
-}
-
-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
-{
-  alloc->Free(alloc, p->probs);
-  p->probs = 0;
-}
-
-static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
-{
-  alloc->Free(alloc, p->dic);
-  p->dic = 0;
-}
-
-void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
-{
-  LzmaDec_FreeProbs(p, alloc);
-  LzmaDec_FreeDict(p, alloc);
-}
-
-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
-{
-  UInt32 dicSize;
-  Byte d;
-  
-  if (size < LZMA_PROPS_SIZE)
-    return SZ_ERROR_UNSUPPORTED;
-  else
-    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
- 
-  if (dicSize < LZMA_DIC_MIN)
-    dicSize = LZMA_DIC_MIN;
-  p->dicSize = dicSize;
-
-  d = data[0];
-  if (d >= (9 * 5 * 5))
-    return SZ_ERROR_UNSUPPORTED;
-
-  p->lc = d % 9;
-  d /= 9;
-  p->pb = d / 5;
-  p->lp = d % 5;
-
-  return SZ_OK;
-}
-
-static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
-{
-  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
-  if (p->probs == 0 || numProbs != p->numProbs)
-  {
-    LzmaDec_FreeProbs(p, alloc);
-    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
-    p->numProbs = numProbs;
-    if (p->probs == 0)
-      return SZ_ERROR_MEM;
-  }
-  return SZ_OK;
-}
-
-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-{
-  CLzmaProps propNew;
-  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-  p->prop = propNew;
-  return SZ_OK;
-}
-
-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-{
-  CLzmaProps propNew;
-  SizeT dicBufSize;
-  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-  dicBufSize = propNew.dicSize;
-  if (p->dic == 0 || dicBufSize != p->dicBufSize)
-  {
-    LzmaDec_FreeDict(p, alloc);
-    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
-    if (p->dic == 0)
-    {
-      LzmaDec_FreeProbs(p, alloc);
-      return SZ_ERROR_MEM;
-    }
-  }
-  p->dicBufSize = dicBufSize;
-  p->prop = propNew;
-  return SZ_OK;
-}
-
-SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
-    ELzmaStatus *status, ISzAlloc *alloc)
-{
-  CLzmaDec p;
-  SRes res;
-  SizeT inSize = *srcLen;
-  SizeT outSize = *destLen;
-  *srcLen = *destLen = 0;
-  if (inSize < RC_INIT_SIZE)
-    return SZ_ERROR_INPUT_EOF;
-
-  LzmaDec_Construct(&p);
-  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
-  if (res != 0)
-    return res;
-  p.dic = dest;
-  p.dicBufSize = outSize;
-
-  LzmaDec_Init(&p);
-  
-  *srcLen = inSize;
-  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
-
-  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
-    res = SZ_ERROR_INPUT_EOF;
-
-  (*destLen) = p.dicPos;
-  LzmaDec_FreeProbs(&p, alloc);
-  return res;
-}
diff --git a/dep/StormLibOld/src/lzma/C/LzmaDec.h b/dep/StormLibOld/src/lzma/C/LzmaDec.h
deleted file mode 100644
index bf7f084ba..000000000
--- a/dep/StormLibOld/src/lzma/C/LzmaDec.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/* LzmaDec.h -- LZMA Decoder
-2009-02-07 : Igor Pavlov : Public domain */
-
-#ifndef __LZMA_DEC_H
-#define __LZMA_DEC_H
-
-#include "Types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* #define _LZMA_PROB32 */
-/* _LZMA_PROB32 can increase the speed on some CPUs,
-   but memory usage for CLzmaDec::probs will be doubled in that case */
-
-#ifdef _LZMA_PROB32
-#define CLzmaProb UInt32
-#else
-#define CLzmaProb UInt16
-#endif
-
-
-/* ---------- LZMA Properties ---------- */
-
-#define LZMA_PROPS_SIZE 5
-
-typedef struct _CLzmaProps
-{
-  unsigned lc, lp, pb;
-  UInt32 dicSize;
-} CLzmaProps;
-
-/* LzmaProps_Decode - decodes properties
-Returns:
-  SZ_OK
-  SZ_ERROR_UNSUPPORTED - Unsupported properties
-*/
-
-SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
-
-
-/* ---------- LZMA Decoder state ---------- */
-
-/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
-   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
-
-#define LZMA_REQUIRED_INPUT_MAX 20
-
-typedef struct
-{
-  CLzmaProps prop;
-  CLzmaProb *probs;
-  Byte *dic;
-  const Byte *buf;
-  UInt32 range, code;
-  SizeT dicPos;
-  SizeT dicBufSize;
-  UInt32 processedPos;
-  UInt32 checkDicSize;
-  unsigned state;
-  UInt32 reps[4];
-  unsigned remainLen;
-  int needFlush;
-  int needInitState;
-  UInt32 numProbs;
-  unsigned tempBufSize;
-  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
-} CLzmaDec;
-
-#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
-
-void LzmaDec_Init(CLzmaDec *p);
-
-/* There are two types of LZMA streams:
-     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
-     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
-
-typedef enum
-{
-  LZMA_FINISH_ANY,   /* finish at any point */
-  LZMA_FINISH_END    /* block must be finished at the end */
-} ELzmaFinishMode;
-
-/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
-
-   You must use LZMA_FINISH_END, when you know that current output buffer
-   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
-
-   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
-   and output value of destLen will be less than output buffer size limit.
-   You can check status result also.
-
-   You can use multiple checks to test data integrity after full decompression:
-     1) Check Result and "status" variable.
-     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
-     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
-        You must use correct finish mode in that case. */
-
-typedef enum
-{
-  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
-  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
-  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
-  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
-  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
-} ELzmaStatus;
-
-/* ELzmaStatus is used only as output value for function call */
-
-
-/* ---------- Interfaces ---------- */
-
-/* There are 3 levels of interfaces:
-     1) Dictionary Interface
-     2) Buffer Interface
-     3) One Call Interface
-   You can select any of these interfaces, but don't mix functions from different
-   groups for same object. */
-
-
-/* There are two variants to allocate state for Dictionary Interface:
-     1) LzmaDec_Allocate / LzmaDec_Free
-     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
-   You can use variant 2, if you set dictionary buffer manually.
-   For Buffer Interface you must always use variant 1.
-
-LzmaDec_Allocate* can return:
-  SZ_OK
-  SZ_ERROR_MEM         - Memory allocation error
-  SZ_ERROR_UNSUPPORTED - Unsupported properties
-*/
-   
-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
-void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
-
-SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
-void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
-
-/* ---------- Dictionary Interface ---------- */
-
-/* You can use it, if you want to eliminate the overhead for data copying from
-   dictionary to some other external buffer.
-   You must work with CLzmaDec variables directly in this interface.
-
-   STEPS:
-     LzmaDec_Constr()
-     LzmaDec_Allocate()
-     for (each new stream)
-     {
-       LzmaDec_Init()
-       while (it needs more decompression)
-       {
-         LzmaDec_DecodeToDic()
-         use data from CLzmaDec::dic and update CLzmaDec::dicPos
-       }
-     }
-     LzmaDec_Free()
-*/
-
-/* LzmaDec_DecodeToDic
-   
-   The decoding to internal dictionary buffer (CLzmaDec::dic).
-   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
-
-finishMode:
-  It has meaning only if the decoding reaches output limit (dicLimit).
-  LZMA_FINISH_ANY - Decode just dicLimit bytes.
-  LZMA_FINISH_END - Stream must be finished after dicLimit.
-
-Returns:
-  SZ_OK
-    status:
-      LZMA_STATUS_FINISHED_WITH_MARK
-      LZMA_STATUS_NOT_FINISHED
-      LZMA_STATUS_NEEDS_MORE_INPUT
-      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
-  SZ_ERROR_DATA - Data error
-*/
-
-SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
-
-
-/* ---------- Buffer Interface ---------- */
-
-/* It's zlib-like interface.
-   See LzmaDec_DecodeToDic description for information about STEPS and return results,
-   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
-   to work with CLzmaDec variables manually.
-
-finishMode:
-  It has meaning only if the decoding reaches output limit (*destLen).
-  LZMA_FINISH_ANY - Decode just destLen bytes.
-  LZMA_FINISH_END - Stream must be finished after (*destLen).
-*/
-
-SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
-    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
-
-
-/* ---------- One Call Interface ---------- */
-
-/* LzmaDecode
-
-finishMode:
-  It has meaning only if the decoding reaches output limit (*destLen).
-  LZMA_FINISH_ANY - Decode just destLen bytes.
-  LZMA_FINISH_END - Stream must be finished after (*destLen).
-
-Returns:
-  SZ_OK
-    status:
-      LZMA_STATUS_FINISHED_WITH_MARK
-      LZMA_STATUS_NOT_FINISHED
-      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
-  SZ_ERROR_DATA - Data error
-  SZ_ERROR_MEM  - Memory allocation error
-  SZ_ERROR_UNSUPPORTED - Unsupported properties
-  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
-*/
-
-SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
-    ELzmaStatus *status, ISzAlloc *alloc);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/StormLibOld/src/lzma/C/LzmaEnc.c b/dep/StormLibOld/src/lzma/C/LzmaEnc.c
deleted file mode 100644
index 169d4f463..000000000
--- a/dep/StormLibOld/src/lzma/C/LzmaEnc.c
+++ /dev/null
@@ -1,2268 +0,0 @@
-/* LzmaEnc.c -- LZMA Encoder
-2009-11-24 : Igor Pavlov : Public domain */
-
-#include <string.h>
-
-/* #define SHOW_STAT */
-/* #define SHOW_STAT2 */
-
-#if defined(SHOW_STAT) || defined(SHOW_STAT2)
-#include <stdio.h>
-#endif
-
-#include "LzmaEnc.h"
-
-#include "LzFind.h"
-#ifndef _7ZIP_ST
-#include "LzFindMt.h"
-#endif
-
-#ifdef SHOW_STAT
-static int ttt = 0;
-#endif
-
-#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
-
-#define kBlockSize (9 << 10)
-#define kUnpackBlockSize (1 << 18)
-#define kMatchArraySize (1 << 21)
-#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
-
-#define kNumMaxDirectBits (31)
-
-#define kNumTopBits 24
-#define kTopValue ((UInt32)1 << kNumTopBits)
-
-#define kNumBitModelTotalBits 11
-#define kBitModelTotal (1 << kNumBitModelTotalBits)
-#define kNumMoveBits 5
-#define kProbInitValue (kBitModelTotal >> 1)
-
-#define kNumMoveReducingBits 4
-#define kNumBitPriceShiftBits 4
-#define kBitPrice (1 << kNumBitPriceShiftBits)
-
-void LzmaEncProps_Init(CLzmaEncProps *p)
-{
-  p->level = 5;
-  p->dictSize = p->mc = 0;
-  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
-  p->writeEndMark = 0;
-}
-
-void LzmaEncProps_Normalize(CLzmaEncProps *p)
-{
-  int level = p->level;
-  if (level < 0) level = 5;
-  p->level = level;
-  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
-  if (p->lc < 0) p->lc = 3;
-  if (p->lp < 0) p->lp = 0;
-  if (p->pb < 0) p->pb = 2;
-  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
-  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
-  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
-  if (p->numHashBytes < 0) p->numHashBytes = 4;
-  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
-  if (p->numThreads < 0)
-    p->numThreads =
-      #ifndef _7ZIP_ST
-      ((p->btMode && p->algo) ? 2 : 1);
-      #else
-      1;
-      #endif
-}
-
-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
-{
-  CLzmaEncProps props = *props2;
-  LzmaEncProps_Normalize(&props);
-  return props.dictSize;
-}
-
-/* #define LZMA_LOG_BSR */
-/* Define it for Intel's CPU */
-
-
-#ifdef LZMA_LOG_BSR
-
-#define kDicLogSizeMaxCompress 30
-
-#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
-
-UInt32 GetPosSlot1(UInt32 pos)
-{
-  UInt32 res;
-  BSR2_RET(pos, res);
-  return res;
-}
-#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
-#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
-
-#else
-
-#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
-#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
-
-void LzmaEnc_FastPosInit(Byte *g_FastPos)
-{
-  int c = 2, slotFast;
-  g_FastPos[0] = 0;
-  g_FastPos[1] = 1;
-  
-  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
-  {
-    UInt32 k = (1 << ((slotFast >> 1) - 1));
-    UInt32 j;
-    for (j = 0; j < k; j++, c++)
-      g_FastPos[c] = (Byte)slotFast;
-  }
-}
-
-#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
-  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
-  res = p->g_FastPos[pos >> i] + (i * 2); }
-/*
-#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
-  p->g_FastPos[pos >> 6] + 12 : \
-  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
-*/
-
-#define GetPosSlot1(pos) p->g_FastPos[pos]
-#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
-#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
-
-#endif
-
-
-#define LZMA_NUM_REPS 4
-
-typedef unsigned CState;
-
-typedef struct
-{
-  UInt32 price;
-
-  CState state;
-  int prev1IsChar;
-  int prev2;
-
-  UInt32 posPrev2;
-  UInt32 backPrev2;
-
-  UInt32 posPrev;
-  UInt32 backPrev;
-  UInt32 backs[LZMA_NUM_REPS];
-} COptimal;
-
-#define kNumOpts (1 << 12)
-
-#define kNumLenToPosStates 4
-#define kNumPosSlotBits 6
-#define kDicLogSizeMin 0
-#define kDicLogSizeMax 32
-#define kDistTableSizeMax (kDicLogSizeMax * 2)
-
-
-#define kNumAlignBits 4
-#define kAlignTableSize (1 << kNumAlignBits)
-#define kAlignMask (kAlignTableSize - 1)
-
-#define kStartPosModelIndex 4
-#define kEndPosModelIndex 14
-#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
-
-#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-
-#ifdef _LZMA_PROB32
-#define CLzmaProb UInt32
-#else
-#define CLzmaProb UInt16
-#endif
-
-#define LZMA_PB_MAX 4
-#define LZMA_LC_MAX 8
-#define LZMA_LP_MAX 4
-
-#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
-
-
-#define kLenNumLowBits 3
-#define kLenNumLowSymbols (1 << kLenNumLowBits)
-#define kLenNumMidBits 3
-#define kLenNumMidSymbols (1 << kLenNumMidBits)
-#define kLenNumHighBits 8
-#define kLenNumHighSymbols (1 << kLenNumHighBits)
-
-#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-
-#define LZMA_MATCH_LEN_MIN 2
-#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
-
-#define kNumStates 12
-
-typedef struct
-{
-  CLzmaProb choice;
-  CLzmaProb choice2;
-  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
-  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
-  CLzmaProb high[kLenNumHighSymbols];
-} CLenEnc;
-
-typedef struct
-{
-  CLenEnc p;
-  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
-  UInt32 tableSize;
-  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
-} CLenPriceEnc;
-
-typedef struct
-{
-  UInt32 range;
-  Byte cache;
-  UInt64 low;
-  UInt64 cacheSize;
-  Byte *buf;
-  Byte *bufLim;
-  Byte *bufBase;
-  ISeqOutStream *outStream;
-  UInt64 processed;
-  SRes res;
-} CRangeEnc;
-
-typedef struct
-{
-  CLzmaProb *litProbs;
-
-  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
-  CLzmaProb isRep[kNumStates];
-  CLzmaProb isRepG0[kNumStates];
-  CLzmaProb isRepG1[kNumStates];
-  CLzmaProb isRepG2[kNumStates];
-  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
-
-  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
-  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
-  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-  
-  CLenPriceEnc lenEnc;
-  CLenPriceEnc repLenEnc;
-
-  UInt32 reps[LZMA_NUM_REPS];
-  UInt32 state;
-} CSaveState;
-
-typedef struct
-{
-  IMatchFinder matchFinder;
-  void *matchFinderObj;
-
-  #ifndef _7ZIP_ST
-  Bool mtMode;
-  CMatchFinderMt matchFinderMt;
-  #endif
-
-  CMatchFinder matchFinderBase;
-
-  #ifndef _7ZIP_ST
-  Byte pad[128];
-  #endif
-  
-  UInt32 optimumEndIndex;
-  UInt32 optimumCurrentIndex;
-
-  UInt32 longestMatchLength;
-  UInt32 numPairs;
-  UInt32 numAvail;
-  COptimal opt[kNumOpts];
-  
-  #ifndef LZMA_LOG_BSR
-  Byte g_FastPos[1 << kNumLogBits];
-  #endif
-
-  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
-  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
-  UInt32 numFastBytes;
-  UInt32 additionalOffset;
-  UInt32 reps[LZMA_NUM_REPS];
-  UInt32 state;
-
-  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
-  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
-  UInt32 alignPrices[kAlignTableSize];
-  UInt32 alignPriceCount;
-
-  UInt32 distTableSize;
-
-  unsigned lc, lp, pb;
-  unsigned lpMask, pbMask;
-
-  CLzmaProb *litProbs;
-
-  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
-  CLzmaProb isRep[kNumStates];
-  CLzmaProb isRepG0[kNumStates];
-  CLzmaProb isRepG1[kNumStates];
-  CLzmaProb isRepG2[kNumStates];
-  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
-
-  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
-  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
-  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-  
-  CLenPriceEnc lenEnc;
-  CLenPriceEnc repLenEnc;
-
-  unsigned lclp;
-
-  Bool fastMode;
-  
-  CRangeEnc rc;
-
-  Bool writeEndMark;
-  UInt64 nowPos64;
-  UInt32 matchPriceCount;
-  Bool finished;
-  Bool multiThread;
-
-  SRes result;
-  UInt32 dictSize;
-  UInt32 matchFinderCycles;
-
-  int needInit;
-
-  CSaveState saveState;
-} CLzmaEnc;
-
-void LzmaEnc_SaveState(CLzmaEncHandle pp)
-{
-  CLzmaEnc *p = (CLzmaEnc *)pp;
-  CSaveState *dest = &p->saveState;
-  int i;
-  dest->lenEnc = p->lenEnc;
-  dest->repLenEnc = p->repLenEnc;
-  dest->state = p->state;
-
-  for (i = 0; i < kNumStates; i++)
-  {
-    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
-    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
-  }
-  for (i = 0; i < kNumLenToPosStates; i++)
-    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
-  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
-  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
-  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
-  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
-  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
-  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
-  memcpy(dest->reps, p->reps, sizeof(p->reps));
-  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
-}
-
-void LzmaEnc_RestoreState(CLzmaEncHandle pp)
-{
-  CLzmaEnc *dest = (CLzmaEnc *)pp;
-  const CSaveState *p = &dest->saveState;
-  int i;
-  dest->lenEnc = p->lenEnc;
-  dest->repLenEnc = p->repLenEnc;
-  dest->state = p->state;
-
-  for (i = 0; i < kNumStates; i++)
-  {
-    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
-    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
-  }
-  for (i = 0; i < kNumLenToPosStates; i++)
-    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
-  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
-  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
-  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
-  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
-  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
-  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
-  memcpy(dest->reps, p->reps, sizeof(p->reps));
-  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
-}
-
-SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
-{
-  CLzmaEnc *p = (CLzmaEnc *)pp;
-  CLzmaEncProps props = *props2;
-  LzmaEncProps_Normalize(&props);
-
-  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
-      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
-    return SZ_ERROR_PARAM;
-  p->dictSize = props.dictSize;
-  p->matchFinderCycles = props.mc;
-  {
-    unsigned fb = props.fb;
-    if (fb < 5)
-      fb = 5;
-    if (fb > LZMA_MATCH_LEN_MAX)
-      fb = LZMA_MATCH_LEN_MAX;
-    p->numFastBytes = fb;
-  }
-  p->lc = props.lc;
-  p->lp = props.lp;
-  p->pb = props.pb;
-  p->fastMode = (props.algo == 0);
-  p->matchFinderBase.btMode = props.btMode;
-  {
-    UInt32 numHashBytes = 4;
-    if (props.btMode)
-    {
-      if (props.numHashBytes < 2)
-        numHashBytes = 2;
-      else if (props.numHashBytes < 4)
-        numHashBytes = props.numHashBytes;
-    }
-    p->matchFinderBase.numHashBytes = numHashBytes;
-  }
-
-  p->matchFinderBase.cutValue = props.mc;
-
-  p->writeEndMark = props.writeEndMark;
-
-  #ifndef _7ZIP_ST
-  /*
-  if (newMultiThread != _multiThread)
-  {
-    ReleaseMatchFinder();
-    _multiThread = newMultiThread;
-  }
-  */
-  p->multiThread = (props.numThreads > 1);
-  #endif
-
-  return SZ_OK;
-}
-
-static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
-static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
-static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
-static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
-
-#define IsCharState(s) ((s) < 7)
-
-#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
-
-#define kInfinityPrice (1 << 30)
-
-static void RangeEnc_Construct(CRangeEnc *p)
-{
-  p->outStream = 0;
-  p->bufBase = 0;
-}
-
-#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
-
-#define RC_BUF_SIZE (1 << 16)
-static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
-{
-  if (p->bufBase == 0)
-  {
-    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
-    if (p->bufBase == 0)
-      return 0;
-    p->bufLim = p->bufBase + RC_BUF_SIZE;
-  }
-  return 1;
-}
-
-static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
-{
-  alloc->Free(alloc, p->bufBase);
-  p->bufBase = 0;
-}
-
-static void RangeEnc_Init(CRangeEnc *p)
-{
-  /* Stream.Init(); */
-  p->low = 0;
-  p->range = 0xFFFFFFFF;
-  p->cacheSize = 1;
-  p->cache = 0;
-
-  p->buf = p->bufBase;
-
-  p->processed = 0;
-  p->res = SZ_OK;
-}
-
-static void RangeEnc_FlushStream(CRangeEnc *p)
-{
-  size_t num;
-  if (p->res != SZ_OK)
-    return;
-  num = p->buf - p->bufBase;
-  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
-    p->res = SZ_ERROR_WRITE;
-  p->processed += num;
-  p->buf = p->bufBase;
-}
-
-static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
-{
-  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
-  {
-    Byte temp = p->cache;
-    do
-    {
-      Byte *buf = p->buf;
-      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
-      p->buf = buf;
-      if (buf == p->bufLim)
-        RangeEnc_FlushStream(p);
-      temp = 0xFF;
-    }
-    while (--p->cacheSize != 0);
-    p->cache = (Byte)((UInt32)p->low >> 24);
-  }
-  p->cacheSize++;
-  p->low = (UInt32)p->low << 8;
-}
-
-static void RangeEnc_FlushData(CRangeEnc *p)
-{
-  int i;
-  for (i = 0; i < 5; i++)
-    RangeEnc_ShiftLow(p);
-}
-
-static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
-{
-  do
-  {
-    p->range >>= 1;
-    p->low += p->range & (0 - ((value >> --numBits) & 1));
-    if (p->range < kTopValue)
-    {
-      p->range <<= 8;
-      RangeEnc_ShiftLow(p);
-    }
-  }
-  while (numBits != 0);
-}
-
-static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
-{
-  UInt32 ttt = *prob;
-  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
-  if (symbol == 0)
-  {
-    p->range = newBound;
-    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
-  }
-  else
-  {
-    p->low += newBound;
-    p->range -= newBound;
-    ttt -= ttt >> kNumMoveBits;
-  }
-  *prob = (CLzmaProb)ttt;
-  if (p->range < kTopValue)
-  {
-    p->range <<= 8;
-    RangeEnc_ShiftLow(p);
-  }
-}
-
-static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
-{
-  symbol |= 0x100;
-  do
-  {
-    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
-    symbol <<= 1;
-  }
-  while (symbol < 0x10000);
-}
-
-static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
-{
-  UInt32 offs = 0x100;
-  symbol |= 0x100;
-  do
-  {
-    matchByte <<= 1;
-    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
-    symbol <<= 1;
-    offs &= ~(matchByte ^ symbol);
-  }
-  while (symbol < 0x10000);
-}
-
-void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
-{
-  UInt32 i;
-  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
-  {
-    const int kCyclesBits = kNumBitPriceShiftBits;
-    UInt32 w = i;
-    UInt32 bitCount = 0;
-    int j;
-    for (j = 0; j < kCyclesBits; j++)
-    {
-      w = w * w;
-      bitCount <<= 1;
-      while (w >= ((UInt32)1 << 16))
-      {
-        w >>= 1;
-        bitCount++;
-      }
-    }
-    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
-  }
-}
-
-
-#define GET_PRICE(prob, symbol) \
-  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
-
-#define GET_PRICEa(prob, symbol) \
-  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
-
-#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
-#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
-
-#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
-#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
-
-static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
-{
-  UInt32 price = 0;
-  symbol |= 0x100;
-  do
-  {
-    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
-    symbol <<= 1;
-  }
-  while (symbol < 0x10000);
-  return price;
-}
-
-static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
-{
-  UInt32 price = 0;
-  UInt32 offs = 0x100;
-  symbol |= 0x100;
-  do
-  {
-    matchByte <<= 1;
-    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
-    symbol <<= 1;
-    offs &= ~(matchByte ^ symbol);
-  }
-  while (symbol < 0x10000);
-  return price;
-}
-
-
-static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
-{
-  UInt32 m = 1;
-  int i;
-  for (i = numBitLevels; i != 0;)
-  {
-    UInt32 bit;
-    i--;
-    bit = (symbol >> i) & 1;
-    RangeEnc_EncodeBit(rc, probs + m, bit);
-    m = (m << 1) | bit;
-  }
-}
-
-static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
-{
-  UInt32 m = 1;
-  int i;
-  for (i = 0; i < numBitLevels; i++)
-  {
-    UInt32 bit = symbol & 1;
-    RangeEnc_EncodeBit(rc, probs + m, bit);
-    m = (m << 1) | bit;
-    symbol >>= 1;
-  }
-}
-
-static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
-{
-  UInt32 price = 0;
-  symbol |= (1 << numBitLevels);
-  while (symbol != 1)
-  {
-    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
-    symbol >>= 1;
-  }
-  return price;
-}
-
-static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
-{
-  UInt32 price = 0;
-  UInt32 m = 1;
-  int i;
-  for (i = numBitLevels; i != 0; i--)
-  {
-    UInt32 bit = symbol & 1;
-    symbol >>= 1;
-    price += GET_PRICEa(probs[m], bit);
-    m = (m << 1) | bit;
-  }
-  return price;
-}
-
-
-static void LenEnc_Init(CLenEnc *p)
-{
-  unsigned i;
-  p->choice = p->choice2 = kProbInitValue;
-  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
-    p->low[i] = kProbInitValue;
-  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
-    p->mid[i] = kProbInitValue;
-  for (i = 0; i < kLenNumHighSymbols; i++)
-    p->high[i] = kProbInitValue;
-}
-
-static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
-{
-  if (symbol < kLenNumLowSymbols)
-  {
-    RangeEnc_EncodeBit(rc, &p->choice, 0);
-    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
-  }
-  else
-  {
-    RangeEnc_EncodeBit(rc, &p->choice, 1);
-    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
-    {
-      RangeEnc_EncodeBit(rc, &p->choice2, 0);
-      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
-    }
-    else
-    {
-      RangeEnc_EncodeBit(rc, &p->choice2, 1);
-      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
-    }
-  }
-}
-
-static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
-{
-  UInt32 a0 = GET_PRICE_0a(p->choice);
-  UInt32 a1 = GET_PRICE_1a(p->choice);
-  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
-  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
-  UInt32 i = 0;
-  for (i = 0; i < kLenNumLowSymbols; i++)
-  {
-    if (i >= numSymbols)
-      return;
-    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
-  }
-  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
-  {
-    if (i >= numSymbols)
-      return;
-    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
-  }
-  for (; i < numSymbols; i++)
-    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
-}
-
-static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
-{
-  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
-  p->counters[posState] = p->tableSize;
-}
-
-static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
-{
-  UInt32 posState;
-  for (posState = 0; posState < numPosStates; posState++)
-    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
-}
-
-static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
-{
-  LenEnc_Encode(&p->p, rc, symbol, posState);
-  if (updatePrice)
-    if (--p->counters[posState] == 0)
-      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
-}
-
-
-
-
-static void MovePos(CLzmaEnc *p, UInt32 num)
-{
-  #ifdef SHOW_STAT
-  ttt += num;
-  printf("\n MovePos %d", num);
-  #endif
-  if (num != 0)
-  {
-    p->additionalOffset += num;
-    p->matchFinder.Skip(p->matchFinderObj, num);
-  }
-}
-
-static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
-{
-  UInt32 lenRes = 0, numPairs;
-  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
-  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
-  #ifdef SHOW_STAT
-  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
-  ttt++;
-  {
-    UInt32 i;
-    for (i = 0; i < numPairs; i += 2)
-      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
-  }
-  #endif
-  if (numPairs > 0)
-  {
-    lenRes = p->matches[numPairs - 2];
-    if (lenRes == p->numFastBytes)
-    {
-      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-      UInt32 distance = p->matches[numPairs - 1] + 1;
-      UInt32 numAvail = p->numAvail;
-      if (numAvail > LZMA_MATCH_LEN_MAX)
-        numAvail = LZMA_MATCH_LEN_MAX;
-      {
-        const Byte *pby2 = pby - distance;
-        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
-      }
-    }
-  }
-  p->additionalOffset++;
-  *numDistancePairsRes = numPairs;
-  return lenRes;
-}
-
-
-#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
-#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
-#define IsShortRep(p) ((p)->backPrev == 0)
-
-static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
-{
-  return
-    GET_PRICE_0(p->isRepG0[state]) +
-    GET_PRICE_0(p->isRep0Long[state][posState]);
-}
-
-static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
-{
-  UInt32 price;
-  if (repIndex == 0)
-  {
-    price = GET_PRICE_0(p->isRepG0[state]);
-    price += GET_PRICE_1(p->isRep0Long[state][posState]);
-  }
-  else
-  {
-    price = GET_PRICE_1(p->isRepG0[state]);
-    if (repIndex == 1)
-      price += GET_PRICE_0(p->isRepG1[state]);
-    else
-    {
-      price += GET_PRICE_1(p->isRepG1[state]);
-      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
-    }
-  }
-  return price;
-}
-
-static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
-{
-  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
-    GetPureRepPrice(p, repIndex, state, posState);
-}
-
-static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
-{
-  UInt32 posMem = p->opt[cur].posPrev;
-  UInt32 backMem = p->opt[cur].backPrev;
-  p->optimumEndIndex = cur;
-  do
-  {
-    if (p->opt[cur].prev1IsChar)
-    {
-      MakeAsChar(&p->opt[posMem])
-      p->opt[posMem].posPrev = posMem - 1;
-      if (p->opt[cur].prev2)
-      {
-        p->opt[posMem - 1].prev1IsChar = False;
-        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
-        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
-      }
-    }
-    {
-      UInt32 posPrev = posMem;
-      UInt32 backCur = backMem;
-      
-      backMem = p->opt[posPrev].backPrev;
-      posMem = p->opt[posPrev].posPrev;
-      
-      p->opt[posPrev].backPrev = backCur;
-      p->opt[posPrev].posPrev = cur;
-      cur = posPrev;
-    }
-  }
-  while (cur != 0);
-  *backRes = p->opt[0].backPrev;
-  p->optimumCurrentIndex  = p->opt[0].posPrev;
-  return p->optimumCurrentIndex;
-}
-
-#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
-
-static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
-{
-  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
-  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
-  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
-  UInt32 *matches;
-  const Byte *data;
-  Byte curByte, matchByte;
-  if (p->optimumEndIndex != p->optimumCurrentIndex)
-  {
-    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
-    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
-    *backRes = opt->backPrev;
-    p->optimumCurrentIndex = opt->posPrev;
-    return lenRes;
-  }
-  p->optimumCurrentIndex = p->optimumEndIndex = 0;
-  
-  if (p->additionalOffset == 0)
-    mainLen = ReadMatchDistances(p, &numPairs);
-  else
-  {
-    mainLen = p->longestMatchLength;
-    numPairs = p->numPairs;
-  }
-
-  numAvail = p->numAvail;
-  if (numAvail < 2)
-  {
-    *backRes = (UInt32)(-1);
-    return 1;
-  }
-  if (numAvail > LZMA_MATCH_LEN_MAX)
-    numAvail = LZMA_MATCH_LEN_MAX;
-
-  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-  repMaxIndex = 0;
-  for (i = 0; i < LZMA_NUM_REPS; i++)
-  {
-    UInt32 lenTest;
-    const Byte *data2;
-    reps[i] = p->reps[i];
-    data2 = data - (reps[i] + 1);
-    if (data[0] != data2[0] || data[1] != data2[1])
-    {
-      repLens[i] = 0;
-      continue;
-    }
-    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
-    repLens[i] = lenTest;
-    if (lenTest > repLens[repMaxIndex])
-      repMaxIndex = i;
-  }
-  if (repLens[repMaxIndex] >= p->numFastBytes)
-  {
-    UInt32 lenRes;
-    *backRes = repMaxIndex;
-    lenRes = repLens[repMaxIndex];
-    MovePos(p, lenRes - 1);
-    return lenRes;
-  }
-
-  matches = p->matches;
-  if (mainLen >= p->numFastBytes)
-  {
-    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
-    MovePos(p, mainLen - 1);
-    return mainLen;
-  }
-  curByte = *data;
-  matchByte = *(data - (reps[0] + 1));
-
-  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
-  {
-    *backRes = (UInt32)-1;
-    return 1;
-  }
-
-  p->opt[0].state = (CState)p->state;
-
-  posState = (position & p->pbMask);
-
-  {
-    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
-    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
-        (!IsCharState(p->state) ?
-          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
-          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
-  }
-
-  MakeAsChar(&p->opt[1]);
-
-  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
-  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
-
-  if (matchByte == curByte)
-  {
-    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
-    if (shortRepPrice < p->opt[1].price)
-    {
-      p->opt[1].price = shortRepPrice;
-      MakeAsShortRep(&p->opt[1]);
-    }
-  }
-  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
-
-  if (lenEnd < 2)
-  {
-    *backRes = p->opt[1].backPrev;
-    return 1;
-  }
-
-  p->opt[1].posPrev = 0;
-  for (i = 0; i < LZMA_NUM_REPS; i++)
-    p->opt[0].backs[i] = reps[i];
-
-  len = lenEnd;
-  do
-    p->opt[len--].price = kInfinityPrice;
-  while (len >= 2);
-
-  for (i = 0; i < LZMA_NUM_REPS; i++)
-  {
-    UInt32 repLen = repLens[i];
-    UInt32 price;
-    if (repLen < 2)
-      continue;
-    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
-    do
-    {
-      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
-      COptimal *opt = &p->opt[repLen];
-      if (curAndLenPrice < opt->price)
-      {
-        opt->price = curAndLenPrice;
-        opt->posPrev = 0;
-        opt->backPrev = i;
-        opt->prev1IsChar = False;
-      }
-    }
-    while (--repLen >= 2);
-  }
-
-  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
-
-  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
-  if (len <= mainLen)
-  {
-    UInt32 offs = 0;
-    while (len > matches[offs])
-      offs += 2;
-    for (; ; len++)
-    {
-      COptimal *opt;
-      UInt32 distance = matches[offs + 1];
-
-      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
-      UInt32 lenToPosState = GetLenToPosState(len);
-      if (distance < kNumFullDistances)
-        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
-      else
-      {
-        UInt32 slot;
-        GetPosSlot2(distance, slot);
-        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
-      }
-      opt = &p->opt[len];
-      if (curAndLenPrice < opt->price)
-      {
-        opt->price = curAndLenPrice;
-        opt->posPrev = 0;
-        opt->backPrev = distance + LZMA_NUM_REPS;
-        opt->prev1IsChar = False;
-      }
-      if (len == matches[offs])
-      {
-        offs += 2;
-        if (offs == numPairs)
-          break;
-      }
-    }
-  }
-
-  cur = 0;
-
-    #ifdef SHOW_STAT2
-    if (position >= 0)
-    {
-      unsigned i;
-      printf("\n pos = %4X", position);
-      for (i = cur; i <= lenEnd; i++)
-      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
-    }
-    #endif
-
-  for (;;)
-  {
-    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
-    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
-    Bool nextIsChar;
-    Byte curByte, matchByte;
-    const Byte *data;
-    COptimal *curOpt;
-    COptimal *nextOpt;
-
-    cur++;
-    if (cur == lenEnd)
-      return Backward(p, backRes, cur);
-
-    newLen = ReadMatchDistances(p, &numPairs);
-    if (newLen >= p->numFastBytes)
-    {
-      p->numPairs = numPairs;
-      p->longestMatchLength = newLen;
-      return Backward(p, backRes, cur);
-    }
-    position++;
-    curOpt = &p->opt[cur];
-    posPrev = curOpt->posPrev;
-    if (curOpt->prev1IsChar)
-    {
-      posPrev--;
-      if (curOpt->prev2)
-      {
-        state = p->opt[curOpt->posPrev2].state;
-        if (curOpt->backPrev2 < LZMA_NUM_REPS)
-          state = kRepNextStates[state];
-        else
-          state = kMatchNextStates[state];
-      }
-      else
-        state = p->opt[posPrev].state;
-      state = kLiteralNextStates[state];
-    }
-    else
-      state = p->opt[posPrev].state;
-    if (posPrev == cur - 1)
-    {
-      if (IsShortRep(curOpt))
-        state = kShortRepNextStates[state];
-      else
-        state = kLiteralNextStates[state];
-    }
-    else
-    {
-      UInt32 pos;
-      const COptimal *prevOpt;
-      if (curOpt->prev1IsChar && curOpt->prev2)
-      {
-        posPrev = curOpt->posPrev2;
-        pos = curOpt->backPrev2;
-        state = kRepNextStates[state];
-      }
-      else
-      {
-        pos = curOpt->backPrev;
-        if (pos < LZMA_NUM_REPS)
-          state = kRepNextStates[state];
-        else
-          state = kMatchNextStates[state];
-      }
-      prevOpt = &p->opt[posPrev];
-      if (pos < LZMA_NUM_REPS)
-      {
-        UInt32 i;
-        reps[0] = prevOpt->backs[pos];
-        for (i = 1; i <= pos; i++)
-          reps[i] = prevOpt->backs[i - 1];
-        for (; i < LZMA_NUM_REPS; i++)
-          reps[i] = prevOpt->backs[i];
-      }
-      else
-      {
-        UInt32 i;
-        reps[0] = (pos - LZMA_NUM_REPS);
-        for (i = 1; i < LZMA_NUM_REPS; i++)
-          reps[i] = prevOpt->backs[i - 1];
-      }
-    }
-    curOpt->state = (CState)state;
-
-    curOpt->backs[0] = reps[0];
-    curOpt->backs[1] = reps[1];
-    curOpt->backs[2] = reps[2];
-    curOpt->backs[3] = reps[3];
-
-    curPrice = curOpt->price;
-    nextIsChar = False;
-    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-    curByte = *data;
-    matchByte = *(data - (reps[0] + 1));
-
-    posState = (position & p->pbMask);
-
-    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
-    {
-      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
-      curAnd1Price +=
-        (!IsCharState(state) ?
-          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
-          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
-    }
-
-    nextOpt = &p->opt[cur + 1];
-
-    if (curAnd1Price < nextOpt->price)
-    {
-      nextOpt->price = curAnd1Price;
-      nextOpt->posPrev = cur;
-      MakeAsChar(nextOpt);
-      nextIsChar = True;
-    }
-
-    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
-    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
-    
-    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
-    {
-      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
-      if (shortRepPrice <= nextOpt->price)
-      {
-        nextOpt->price = shortRepPrice;
-        nextOpt->posPrev = cur;
-        MakeAsShortRep(nextOpt);
-        nextIsChar = True;
-      }
-    }
-    numAvailFull = p->numAvail;
-    {
-      UInt32 temp = kNumOpts - 1 - cur;
-      if (temp < numAvailFull)
-        numAvailFull = temp;
-    }
-
-    if (numAvailFull < 2)
-      continue;
-    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
-
-    if (!nextIsChar && matchByte != curByte) /* speed optimization */
-    {
-      /* try Literal + rep0 */
-      UInt32 temp;
-      UInt32 lenTest2;
-      const Byte *data2 = data - (reps[0] + 1);
-      UInt32 limit = p->numFastBytes + 1;
-      if (limit > numAvailFull)
-        limit = numAvailFull;
-
-      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
-      lenTest2 = temp - 1;
-      if (lenTest2 >= 2)
-      {
-        UInt32 state2 = kLiteralNextStates[state];
-        UInt32 posStateNext = (position + 1) & p->pbMask;
-        UInt32 nextRepMatchPrice = curAnd1Price +
-            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-            GET_PRICE_1(p->isRep[state2]);
-        /* for (; lenTest2 >= 2; lenTest2--) */
-        {
-          UInt32 curAndLenPrice;
-          COptimal *opt;
-          UInt32 offset = cur + 1 + lenTest2;
-          while (lenEnd < offset)
-            p->opt[++lenEnd].price = kInfinityPrice;
-          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-          opt = &p->opt[offset];
-          if (curAndLenPrice < opt->price)
-          {
-            opt->price = curAndLenPrice;
-            opt->posPrev = cur + 1;
-            opt->backPrev = 0;
-            opt->prev1IsChar = True;
-            opt->prev2 = False;
-          }
-        }
-      }
-    }
-    
-    startLen = 2; /* speed optimization */
-    {
-    UInt32 repIndex;
-    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
-    {
-      UInt32 lenTest;
-      UInt32 lenTestTemp;
-      UInt32 price;
-      const Byte *data2 = data - (reps[repIndex] + 1);
-      if (data[0] != data2[0] || data[1] != data2[1])
-        continue;
-      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
-      while (lenEnd < cur + lenTest)
-        p->opt[++lenEnd].price = kInfinityPrice;
-      lenTestTemp = lenTest;
-      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
-      do
-      {
-        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
-        COptimal *opt = &p->opt[cur + lenTest];
-        if (curAndLenPrice < opt->price)
-        {
-          opt->price = curAndLenPrice;
-          opt->posPrev = cur;
-          opt->backPrev = repIndex;
-          opt->prev1IsChar = False;
-        }
-      }
-      while (--lenTest >= 2);
-      lenTest = lenTestTemp;
-      
-      if (repIndex == 0)
-        startLen = lenTest + 1;
-        
-      /* if (_maxMode) */
-        {
-          UInt32 lenTest2 = lenTest + 1;
-          UInt32 limit = lenTest2 + p->numFastBytes;
-          UInt32 nextRepMatchPrice;
-          if (limit > numAvailFull)
-            limit = numAvailFull;
-          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
-          lenTest2 -= lenTest + 1;
-          if (lenTest2 >= 2)
-          {
-            UInt32 state2 = kRepNextStates[state];
-            UInt32 posStateNext = (position + lenTest) & p->pbMask;
-            UInt32 curAndLenCharPrice =
-                price + p->repLenEnc.prices[posState][lenTest - 2] +
-                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
-                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
-                    data[lenTest], data2[lenTest], p->ProbPrices);
-            state2 = kLiteralNextStates[state2];
-            posStateNext = (position + lenTest + 1) & p->pbMask;
-            nextRepMatchPrice = curAndLenCharPrice +
-                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-                GET_PRICE_1(p->isRep[state2]);
-            
-            /* for (; lenTest2 >= 2; lenTest2--) */
-            {
-              UInt32 curAndLenPrice;
-              COptimal *opt;
-              UInt32 offset = cur + lenTest + 1 + lenTest2;
-              while (lenEnd < offset)
-                p->opt[++lenEnd].price = kInfinityPrice;
-              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-              opt = &p->opt[offset];
-              if (curAndLenPrice < opt->price)
-              {
-                opt->price = curAndLenPrice;
-                opt->posPrev = cur + lenTest + 1;
-                opt->backPrev = 0;
-                opt->prev1IsChar = True;
-                opt->prev2 = True;
-                opt->posPrev2 = cur;
-                opt->backPrev2 = repIndex;
-              }
-            }
-          }
-        }
-    }
-    }
-    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
-    if (newLen > numAvail)
-    {
-      newLen = numAvail;
-      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
-      matches[numPairs] = newLen;
-      numPairs += 2;
-    }
-    if (newLen >= startLen)
-    {
-      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
-      UInt32 offs, curBack, posSlot;
-      UInt32 lenTest;
-      while (lenEnd < cur + newLen)
-        p->opt[++lenEnd].price = kInfinityPrice;
-
-      offs = 0;
-      while (startLen > matches[offs])
-        offs += 2;
-      curBack = matches[offs + 1];
-      GetPosSlot2(curBack, posSlot);
-      for (lenTest = /*2*/ startLen; ; lenTest++)
-      {
-        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
-        UInt32 lenToPosState = GetLenToPosState(lenTest);
-        COptimal *opt;
-        if (curBack < kNumFullDistances)
-          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
-        else
-          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
-        
-        opt = &p->opt[cur + lenTest];
-        if (curAndLenPrice < opt->price)
-        {
-          opt->price = curAndLenPrice;
-          opt->posPrev = cur;
-          opt->backPrev = curBack + LZMA_NUM_REPS;
-          opt->prev1IsChar = False;
-        }
-
-        if (/*_maxMode && */lenTest == matches[offs])
-        {
-          /* Try Match + Literal + Rep0 */
-          const Byte *data2 = data - (curBack + 1);
-          UInt32 lenTest2 = lenTest + 1;
-          UInt32 limit = lenTest2 + p->numFastBytes;
-          UInt32 nextRepMatchPrice;
-          if (limit > numAvailFull)
-            limit = numAvailFull;
-          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
-          lenTest2 -= lenTest + 1;
-          if (lenTest2 >= 2)
-          {
-            UInt32 state2 = kMatchNextStates[state];
-            UInt32 posStateNext = (position + lenTest) & p->pbMask;
-            UInt32 curAndLenCharPrice = curAndLenPrice +
-                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
-                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
-                    data[lenTest], data2[lenTest], p->ProbPrices);
-            state2 = kLiteralNextStates[state2];
-            posStateNext = (posStateNext + 1) & p->pbMask;
-            nextRepMatchPrice = curAndLenCharPrice +
-                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-                GET_PRICE_1(p->isRep[state2]);
-            
-            /* for (; lenTest2 >= 2; lenTest2--) */
-            {
-              UInt32 offset = cur + lenTest + 1 + lenTest2;
-              UInt32 curAndLenPrice;
-              COptimal *opt;
-              while (lenEnd < offset)
-                p->opt[++lenEnd].price = kInfinityPrice;
-              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-              opt = &p->opt[offset];
-              if (curAndLenPrice < opt->price)
-              {
-                opt->price = curAndLenPrice;
-                opt->posPrev = cur + lenTest + 1;
-                opt->backPrev = 0;
-                opt->prev1IsChar = True;
-                opt->prev2 = True;
-                opt->posPrev2 = cur;
-                opt->backPrev2 = curBack + LZMA_NUM_REPS;
-              }
-            }
-          }
-          offs += 2;
-          if (offs == numPairs)
-            break;
-          curBack = matches[offs + 1];
-          if (curBack >= kNumFullDistances)
-            GetPosSlot2(curBack, posSlot);
-        }
-      }
-    }
-  }
-}
-
-#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
-
-static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
-{
-  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
-  const Byte *data;
-  const UInt32 *matches;
-
-  if (p->additionalOffset == 0)
-    mainLen = ReadMatchDistances(p, &numPairs);
-  else
-  {
-    mainLen = p->longestMatchLength;
-    numPairs = p->numPairs;
-  }
-
-  numAvail = p->numAvail;
-  *backRes = (UInt32)-1;
-  if (numAvail < 2)
-    return 1;
-  if (numAvail > LZMA_MATCH_LEN_MAX)
-    numAvail = LZMA_MATCH_LEN_MAX;
-  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-
-  repLen = repIndex = 0;
-  for (i = 0; i < LZMA_NUM_REPS; i++)
-  {
-    UInt32 len;
-    const Byte *data2 = data - (p->reps[i] + 1);
-    if (data[0] != data2[0] || data[1] != data2[1])
-      continue;
-    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
-    if (len >= p->numFastBytes)
-    {
-      *backRes = i;
-      MovePos(p, len - 1);
-      return len;
-    }
-    if (len > repLen)
-    {
-      repIndex = i;
-      repLen = len;
-    }
-  }
-
-  matches = p->matches;
-  if (mainLen >= p->numFastBytes)
-  {
-    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
-    MovePos(p, mainLen - 1);
-    return mainLen;
-  }
-
-  mainDist = 0; /* for GCC */
-  if (mainLen >= 2)
-  {
-    mainDist = matches[numPairs - 1];
-    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
-    {
-      if (!ChangePair(matches[numPairs - 3], mainDist))
-        break;
-      numPairs -= 2;
-      mainLen = matches[numPairs - 2];
-      mainDist = matches[numPairs - 1];
-    }
-    if (mainLen == 2 && mainDist >= 0x80)
-      mainLen = 1;
-  }
-
-  if (repLen >= 2 && (
-        (repLen + 1 >= mainLen) ||
-        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
-        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
-  {
-    *backRes = repIndex;
-    MovePos(p, repLen - 1);
-    return repLen;
-  }
-  
-  if (mainLen < 2 || numAvail <= 2)
-    return 1;
-
-  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
-  if (p->longestMatchLength >= 2)
-  {
-    UInt32 newDistance = matches[p->numPairs - 1];
-    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
-        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
-        (p->longestMatchLength > mainLen + 1) ||
-        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
-      return 1;
-  }
-  
-  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-  for (i = 0; i < LZMA_NUM_REPS; i++)
-  {
-    UInt32 len, limit;
-    const Byte *data2 = data - (p->reps[i] + 1);
-    if (data[0] != data2[0] || data[1] != data2[1])
-      continue;
-    limit = mainLen - 1;
-    for (len = 2; len < limit && data[len] == data2[len]; len++);
-    if (len >= limit)
-      return 1;
-  }
-  *backRes = mainDist + LZMA_NUM_REPS;
-  MovePos(p, mainLen - 2);
-  return mainLen;
-}
-
-static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
-{
-  UInt32 len;
-  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
-  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-  p->state = kMatchNextStates[p->state];
-  len = LZMA_MATCH_LEN_MIN;
-  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
-  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
-  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
-}
-
-static SRes CheckErrors(CLzmaEnc *p)
-{
-  if (p->result != SZ_OK)
-    return p->result;
-  if (p->rc.res != SZ_OK)
-    p->result = SZ_ERROR_WRITE;
-  if (p->matchFinderBase.result != SZ_OK)
-    p->result = SZ_ERROR_READ;
-  if (p->result != SZ_OK)
-    p->finished = True;
-  return p->result;
-}
-
-static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
-{
-  /* ReleaseMFStream(); */
-  p->finished = True;
-  if (p->writeEndMark)
-    WriteEndMarker(p, nowPos & p->pbMask);
-  RangeEnc_FlushData(&p->rc);
-  RangeEnc_FlushStream(&p->rc);
-  return CheckErrors(p);
-}
-
-static void FillAlignPrices(CLzmaEnc *p)
-{
-  UInt32 i;
-  for (i = 0; i < kAlignTableSize; i++)
-    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
-  p->alignPriceCount = 0;
-}
-
-static void FillDistancesPrices(CLzmaEnc *p)
-{
-  UInt32 tempPrices[kNumFullDistances];
-  UInt32 i, lenToPosState;
-  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
-  {
-    UInt32 posSlot = GetPosSlot1(i);
-    UInt32 footerBits = ((posSlot >> 1) - 1);
-    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
-    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
-  }
-
-  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
-  {
-    UInt32 posSlot;
-    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
-    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
-    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
-      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
-    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
-      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
-
-    {
-      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
-      UInt32 i;
-      for (i = 0; i < kStartPosModelIndex; i++)
-        distancesPrices[i] = posSlotPrices[i];
-      for (; i < kNumFullDistances; i++)
-        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
-    }
-  }
-  p->matchPriceCount = 0;
-}
-
-void LzmaEnc_Construct(CLzmaEnc *p)
-{
-  RangeEnc_Construct(&p->rc);
-  MatchFinder_Construct(&p->matchFinderBase);
-  #ifndef _7ZIP_ST
-  MatchFinderMt_Construct(&p->matchFinderMt);
-  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
-  #endif
-
-  {
-    CLzmaEncProps props;
-    LzmaEncProps_Init(&props);
-    LzmaEnc_SetProps(p, &props);
-  }
-
-  #ifndef LZMA_LOG_BSR
-  LzmaEnc_FastPosInit(p->g_FastPos);
-  #endif
-
-  LzmaEnc_InitPriceTables(p->ProbPrices);
-  p->litProbs = 0;
-  p->saveState.litProbs = 0;
-}
-
-CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
-{
-  void *p;
-  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
-  if (p != 0)
-    LzmaEnc_Construct((CLzmaEnc *)p);
-  return p;
-}
-
-void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
-{
-  alloc->Free(alloc, p->litProbs);
-  alloc->Free(alloc, p->saveState.litProbs);
-  p->litProbs = 0;
-  p->saveState.litProbs = 0;
-}
-
-void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
-{
-  #ifndef _7ZIP_ST
-  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
-  #endif
-  MatchFinder_Free(&p->matchFinderBase, allocBig);
-  LzmaEnc_FreeLits(p, alloc);
-  RangeEnc_Free(&p->rc, alloc);
-}
-
-void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
-{
-  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
-  alloc->Free(alloc, p);
-}
-
-static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
-{
-  UInt32 nowPos32, startPos32;
-  if (p->needInit)
-  {
-    p->matchFinder.Init(p->matchFinderObj);
-    p->needInit = 0;
-  }
-
-  if (p->finished)
-    return p->result;
-  RINOK(CheckErrors(p));
-
-  nowPos32 = (UInt32)p->nowPos64;
-  startPos32 = nowPos32;
-
-  if (p->nowPos64 == 0)
-  {
-    UInt32 numPairs;
-    Byte curByte;
-    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
-      return Flush(p, nowPos32);
-    ReadMatchDistances(p, &numPairs);
-    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
-    p->state = kLiteralNextStates[p->state];
-    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
-    LitEnc_Encode(&p->rc, p->litProbs, curByte);
-    p->additionalOffset--;
-    nowPos32++;
-  }
-
-  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
-  for (;;)
-  {
-    UInt32 pos, len, posState;
-
-    if (p->fastMode)
-      len = GetOptimumFast(p, &pos);
-    else
-      len = GetOptimum(p, nowPos32, &pos);
-
-    #ifdef SHOW_STAT2
-    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
-    #endif
-
-    posState = nowPos32 & p->pbMask;
-    if (len == 1 && pos == (UInt32)-1)
-    {
-      Byte curByte;
-      CLzmaProb *probs;
-      const Byte *data;
-
-      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
-      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
-      curByte = *data;
-      probs = LIT_PROBS(nowPos32, *(data - 1));
-      if (IsCharState(p->state))
-        LitEnc_Encode(&p->rc, probs, curByte);
-      else
-        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
-      p->state = kLiteralNextStates[p->state];
-    }
-    else
-    {
-      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
-      if (pos < LZMA_NUM_REPS)
-      {
-        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
-        if (pos == 0)
-        {
-          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
-          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
-        }
-        else
-        {
-          UInt32 distance = p->reps[pos];
-          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
-          if (pos == 1)
-            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
-          else
-          {
-            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
-            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
-            if (pos == 3)
-              p->reps[3] = p->reps[2];
-            p->reps[2] = p->reps[1];
-          }
-          p->reps[1] = p->reps[0];
-          p->reps[0] = distance;
-        }
-        if (len == 1)
-          p->state = kShortRepNextStates[p->state];
-        else
-        {
-          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-          p->state = kRepNextStates[p->state];
-        }
-      }
-      else
-      {
-        UInt32 posSlot;
-        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-        p->state = kMatchNextStates[p->state];
-        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-        pos -= LZMA_NUM_REPS;
-        GetPosSlot(pos, posSlot);
-        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
-        
-        if (posSlot >= kStartPosModelIndex)
-        {
-          UInt32 footerBits = ((posSlot >> 1) - 1);
-          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
-          UInt32 posReduced = pos - base;
-
-          if (posSlot < kEndPosModelIndex)
-            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
-          else
-          {
-            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
-            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
-            p->alignPriceCount++;
-          }
-        }
-        p->reps[3] = p->reps[2];
-        p->reps[2] = p->reps[1];
-        p->reps[1] = p->reps[0];
-        p->reps[0] = pos;
-        p->matchPriceCount++;
-      }
-    }
-    p->additionalOffset -= len;
-    nowPos32 += len;
-    if (p->additionalOffset == 0)
-    {
-      UInt32 processed;
-      if (!p->fastMode)
-      {
-        if (p->matchPriceCount >= (1 << 7))
-          FillDistancesPrices(p);
-        if (p->alignPriceCount >= kAlignTableSize)
-          FillAlignPrices(p);
-      }
-      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
-        break;
-      processed = nowPos32 - startPos32;
-      if (useLimits)
-      {
-        if (processed + kNumOpts + 300 >= maxUnpackSize ||
-            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
-          break;
-      }
-      else if (processed >= (1 << 15))
-      {
-        p->nowPos64 += nowPos32 - startPos32;
-        return CheckErrors(p);
-      }
-    }
-  }
-  p->nowPos64 += nowPos32 - startPos32;
-  return Flush(p, nowPos32);
-}
-
-#define kBigHashDicLimit ((UInt32)1 << 24)
-
-static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-{
-  UInt32 beforeSize = kNumOpts;
-  Bool btMode;
-  if (!RangeEnc_Alloc(&p->rc, alloc))
-    return SZ_ERROR_MEM;
-  btMode = (p->matchFinderBase.btMode != 0);
-  #ifndef _7ZIP_ST
-  p->mtMode = (p->multiThread && !p->fastMode && btMode);
-  #endif
-
-  {
-    unsigned lclp = p->lc + p->lp;
-    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
-    {
-      LzmaEnc_FreeLits(p, alloc);
-      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
-      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
-      if (p->litProbs == 0 || p->saveState.litProbs == 0)
-      {
-        LzmaEnc_FreeLits(p, alloc);
-        return SZ_ERROR_MEM;
-      }
-      p->lclp = lclp;
-    }
-  }
-
-  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
-
-  if (beforeSize + p->dictSize < keepWindowSize)
-    beforeSize = keepWindowSize - p->dictSize;
-
-  #ifndef _7ZIP_ST
-  if (p->mtMode)
-  {
-    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
-    p->matchFinderObj = &p->matchFinderMt;
-    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
-  }
-  else
-  #endif
-  {
-    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
-      return SZ_ERROR_MEM;
-    p->matchFinderObj = &p->matchFinderBase;
-    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
-  }
-  return SZ_OK;
-}
-
-void LzmaEnc_Init(CLzmaEnc *p)
-{
-  UInt32 i;
-  p->state = 0;
-  for (i = 0 ; i < LZMA_NUM_REPS; i++)
-    p->reps[i] = 0;
-
-  RangeEnc_Init(&p->rc);
-
-
-  for (i = 0; i < kNumStates; i++)
-  {
-    UInt32 j;
-    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
-    {
-      p->isMatch[i][j] = kProbInitValue;
-      p->isRep0Long[i][j] = kProbInitValue;
-    }
-    p->isRep[i] = kProbInitValue;
-    p->isRepG0[i] = kProbInitValue;
-    p->isRepG1[i] = kProbInitValue;
-    p->isRepG2[i] = kProbInitValue;
-  }
-
-  {
-    UInt32 num = 0x300 << (p->lp + p->lc);
-    for (i = 0; i < num; i++)
-      p->litProbs[i] = kProbInitValue;
-  }
-
-  {
-    for (i = 0; i < kNumLenToPosStates; i++)
-    {
-      CLzmaProb *probs = p->posSlotEncoder[i];
-      UInt32 j;
-      for (j = 0; j < (1 << kNumPosSlotBits); j++)
-        probs[j] = kProbInitValue;
-    }
-  }
-  {
-    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
-      p->posEncoders[i] = kProbInitValue;
-  }
-
-  LenEnc_Init(&p->lenEnc.p);
-  LenEnc_Init(&p->repLenEnc.p);
-
-  for (i = 0; i < (1 << kNumAlignBits); i++)
-    p->posAlignEncoder[i] = kProbInitValue;
-
-  p->optimumEndIndex = 0;
-  p->optimumCurrentIndex = 0;
-  p->additionalOffset = 0;
-
-  p->pbMask = (1 << p->pb) - 1;
-  p->lpMask = (1 << p->lp) - 1;
-}
-
-void LzmaEnc_InitPrices(CLzmaEnc *p)
-{
-  if (!p->fastMode)
-  {
-    FillDistancesPrices(p);
-    FillAlignPrices(p);
-  }
-
-  p->lenEnc.tableSize =
-  p->repLenEnc.tableSize =
-      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
-  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
-  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
-}
-
-static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-{
-  UInt32 i;
-  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
-    if (p->dictSize <= ((UInt32)1 << i))
-      break;
-  p->distTableSize = i * 2;
-
-  p->finished = False;
-  p->result = SZ_OK;
-  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
-  LzmaEnc_Init(p);
-  LzmaEnc_InitPrices(p);
-  p->nowPos64 = 0;
-  return SZ_OK;
-}
-
-static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
-    ISzAlloc *alloc, ISzAlloc *allocBig)
-{
-  CLzmaEnc *p = (CLzmaEnc *)pp;
-  p->matchFinderBase.stream = inStream;
-  p->needInit = 1;
-  p->rc.outStream = outStream;
-  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
-}
-
-SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
-    ISeqInStream *inStream, UInt32 keepWindowSize,
-    ISzAlloc *alloc, ISzAlloc *allocBig)
-{
-  CLzmaEnc *p = (CLzmaEnc *)pp;
-  p->matchFinderBase.stream = inStream;
-  p->needInit = 1;
-  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
-}
-
-static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
-{
-  p->matchFinderBase.directInput = 1;
-  p->matchFinderBase.bufferBase = (Byte *)src;
-  p->matchFinderBase.directInputRem = srcLen;
-}
-
-SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
-    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-{
-  CLzmaEnc *p = (CLzmaEnc *)pp;
-  LzmaEnc_SetInputBuf(p, src, srcLen);
-  p->needInit = 1;
-
-  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
-}
-
-void LzmaEnc_Finish(CLzmaEncHandle pp)
-{
-  #ifndef _7ZIP_ST
-  CLzmaEnc *p = (CLzmaEnc *)pp;
-  if (p->mtMode)
-    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
-  #else
-  pp = pp;
-  #endif
-}
-
-typedef struct
-{
-  ISeqOutStream funcTable;
-  Byte *data;
-  SizeT rem;
-  Bool overflow;
-} CSeqOutStreamBuf;
-
-static size_t MyWrite(void *pp, const void *data, size_t size)
-{
-  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
-  if (p->rem < size)
-  {
-    size = p->rem;
-    p->overflow = True;
-  }
-  memcpy(p->data, data, size);
-  p->rem -= size;
-  p->data += size;
-  return size;
-}
-
-
-UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
-{
-  const CLzmaEnc *p = (CLzmaEnc *)pp;
-  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
-}
-
-const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
-{
-  const CLzmaEnc *p = (CLzmaEnc *)pp;
-  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
-}
-
-SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
-    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
-{
-  CLzmaEnc *p = (CLzmaEnc *)pp;
-  UInt64 nowPos64;
-  SRes res;
-  CSeqOutStreamBuf outStream;
-
-  outStream.funcTable.Write = MyWrite;
-  outStream.data = dest;
-  outStream.rem = *destLen;
-  outStream.overflow = False;
-
-  p->writeEndMark = False;
-  p->finished = False;
-  p->result = SZ_OK;
-
-  if (reInit)
-    LzmaEnc_Init(p);
-  LzmaEnc_InitPrices(p);
-  nowPos64 = p->nowPos64;
-  RangeEnc_Init(&p->rc);
-  p->rc.outStream = &outStream.funcTable;
-
-  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
-  
-  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
-  *destLen -= outStream.rem;
-  if (outStream.overflow)
-    return SZ_ERROR_OUTPUT_EOF;
-
-  return res;
-}
-
-static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
-{
-  SRes res = SZ_OK;
-
-  #ifndef _7ZIP_ST
-  Byte allocaDummy[0x300];
-  int i = 0;
-  for (i = 0; i < 16; i++)
-    allocaDummy[i] = (Byte)i;
-  #endif
-
-  for (;;)
-  {
-    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
-    if (res != SZ_OK || p->finished != 0)
-      break;
-    if (progress != 0)
-    {
-      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
-      if (res != SZ_OK)
-      {
-        res = SZ_ERROR_PROGRESS;
-        break;
-      }
-    }
-  }
-  LzmaEnc_Finish(p);
-  return res;
-}
-
-SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
-    ISzAlloc *alloc, ISzAlloc *allocBig)
-{
-  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
-  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
-}
-
-SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
-{
-  CLzmaEnc *p = (CLzmaEnc *)pp;
-  int i;
-  UInt32 dictSize = p->dictSize;
-  if (*size < LZMA_PROPS_SIZE)
-    return SZ_ERROR_PARAM;
-  *size = LZMA_PROPS_SIZE;
-  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
-
-  for (i = 11; i <= 30; i++)
-  {
-    if (dictSize <= ((UInt32)2 << i))
-    {
-      dictSize = (2 << i);
-      break;
-    }
-    if (dictSize <= ((UInt32)3 << i))
-    {
-      dictSize = (3 << i);
-      break;
-    }
-  }
-
-  for (i = 0; i < 4; i++)
-    props[1 + i] = (Byte)(dictSize >> (8 * i));
-  return SZ_OK;
-}
-
-SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
-{
-  SRes res;
-  CLzmaEnc *p = (CLzmaEnc *)pp;
-
-  CSeqOutStreamBuf outStream;
-
-  LzmaEnc_SetInputBuf(p, src, srcLen);
-
-  outStream.funcTable.Write = MyWrite;
-  outStream.data = dest;
-  outStream.rem = *destLen;
-  outStream.overflow = False;
-
-  p->writeEndMark = writeEndMark;
-
-  p->rc.outStream = &outStream.funcTable;
-  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
-  if (res == SZ_OK)
-    res = LzmaEnc_Encode2(p, progress);
-
-  *destLen -= outStream.rem;
-  if (outStream.overflow)
-    return SZ_ERROR_OUTPUT_EOF;
-  return res;
-}
-
-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
-{
-  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
-  SRes res;
-  if (p == 0)
-    return SZ_ERROR_MEM;
-
-  res = LzmaEnc_SetProps(p, props);
-  if (res == SZ_OK)
-  {
-    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
-    if (res == SZ_OK)
-      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
-          writeEndMark, progress, alloc, allocBig);
-  }
-
-  LzmaEnc_Destroy(p, alloc, allocBig);
-  return res;
-}
diff --git a/dep/StormLibOld/src/lzma/C/LzmaEnc.h b/dep/StormLibOld/src/lzma/C/LzmaEnc.h
deleted file mode 100644
index 200d60eb8..000000000
--- a/dep/StormLibOld/src/lzma/C/LzmaEnc.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*  LzmaEnc.h -- LZMA Encoder
-2009-02-07 : Igor Pavlov : Public domain */
-
-#ifndef __LZMA_ENC_H
-#define __LZMA_ENC_H
-
-#include "Types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LZMA_PROPS_SIZE 5
-
-typedef struct _CLzmaEncProps
-{
-  int level;       /*  0 <= level <= 9 */
-  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
-                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
-                       default = (1 << 24) */
-  int lc;          /* 0 <= lc <= 8, default = 3 */
-  int lp;          /* 0 <= lp <= 4, default = 0 */
-  int pb;          /* 0 <= pb <= 4, default = 2 */
-  int algo;        /* 0 - fast, 1 - normal, default = 1 */
-  int fb;          /* 5 <= fb <= 273, default = 32 */
-  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
-  int numHashBytes; /* 2, 3 or 4, default = 4 */
-  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
-  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
-  int numThreads;  /* 1 or 2, default = 2 */
-} CLzmaEncProps;
-
-void LzmaEncProps_Init(CLzmaEncProps *p);
-void LzmaEncProps_Normalize(CLzmaEncProps *p);
-UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
-
-
-/* ---------- CLzmaEncHandle Interface ---------- */
-
-/* LzmaEnc_* functions can return the following exit codes:
-Returns:
-  SZ_OK           - OK
-  SZ_ERROR_MEM    - Memory allocation error
-  SZ_ERROR_PARAM  - Incorrect paramater in props
-  SZ_ERROR_WRITE  - Write callback error.
-  SZ_ERROR_PROGRESS - some break from progress callback
-  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
-*/
-
-typedef void * CLzmaEncHandle;
-
-CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
-void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
-SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
-SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
-SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-
-/* ---------- One Call Interface ---------- */
-
-/* LzmaEncode
-Return code:
-  SZ_OK               - OK
-  SZ_ERROR_MEM        - Memory allocation error
-  SZ_ERROR_PARAM      - Incorrect paramater
-  SZ_ERROR_OUTPUT_EOF - output buffer overflow
-  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
-*/
-
-SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/StormLibOld/src/lzma/C/Threads.c b/dep/StormLibOld/src/lzma/C/Threads.c
deleted file mode 100644
index 7af1da2e2..000000000
--- a/dep/StormLibOld/src/lzma/C/Threads.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Threads.c -- multithreading library
-2009-09-20 : Igor Pavlov : Public domain */
-
-#ifndef _WIN32_WCE
-#include <process.h>
-#endif
-
-#include "Threads.h"
-
-static WRes GetError()
-{
-  DWORD res = GetLastError();
-  return (res) ? (WRes)(res) : 1;
-}
-
-WRes HandleToWRes(HANDLE h) { return (h != 0) ? 0 : GetError(); }
-WRes BOOLToWRes(BOOL v) { return v ? 0 : GetError(); }
-
-WRes HandlePtr_Close(HANDLE *p)
-{
-  if (*p != NULL)
-    if (!CloseHandle(*p))
-      return GetError();
-  *p = NULL;
-  return 0;
-}
-
-WRes Handle_WaitObject(HANDLE h) { return (WRes)WaitForSingleObject(h, INFINITE); }
-
-WRes Thread_Create(CThread *p, THREAD_FUNC_TYPE func, LPVOID param)
-{
-  unsigned threadId; /* Windows Me/98/95: threadId parameter may not be NULL in _beginthreadex/CreateThread functions */
-  *p =
-    #ifdef UNDER_CE
-    CreateThread(0, 0, func, param, 0, &threadId);
-    #else
-    (HANDLE)_beginthreadex(NULL, 0, func, param, 0, &threadId);
-    #endif
-    /* maybe we must use errno here, but probably GetLastError() is also OK. */
-  return HandleToWRes(*p);
-}
-
-WRes Event_Create(CEvent *p, BOOL manualReset, int signaled)
-{
-  *p = CreateEvent(NULL, manualReset, (signaled ? TRUE : FALSE), NULL);
-  return HandleToWRes(*p);
-}
-
-WRes Event_Set(CEvent *p) { return BOOLToWRes(SetEvent(*p)); }
-WRes Event_Reset(CEvent *p) { return BOOLToWRes(ResetEvent(*p)); }
-
-WRes ManualResetEvent_Create(CManualResetEvent *p, int signaled) { return Event_Create(p, TRUE, signaled); }
-WRes AutoResetEvent_Create(CAutoResetEvent *p, int signaled) { return Event_Create(p, FALSE, signaled); }
-WRes ManualResetEvent_CreateNotSignaled(CManualResetEvent *p) { return ManualResetEvent_Create(p, 0); }
-WRes AutoResetEvent_CreateNotSignaled(CAutoResetEvent *p) { return AutoResetEvent_Create(p, 0); }
-
-
-WRes Semaphore_Create(CSemaphore *p, UInt32 initCount, UInt32 maxCount)
-{
-  *p = CreateSemaphore(NULL, (LONG)initCount, (LONG)maxCount, NULL);
-  return HandleToWRes(*p);
-}
-
-static WRes Semaphore_Release(CSemaphore *p, LONG releaseCount, LONG *previousCount)
-  { return BOOLToWRes(ReleaseSemaphore(*p, releaseCount, previousCount)); }
-WRes Semaphore_ReleaseN(CSemaphore *p, UInt32 num)
-  { return Semaphore_Release(p, (LONG)num, NULL); }
-WRes Semaphore_Release1(CSemaphore *p) { return Semaphore_ReleaseN(p, 1); }
-
-WRes CriticalSection_Init(CCriticalSection *p)
-{
-  /* InitializeCriticalSection can raise only STATUS_NO_MEMORY exception */
-  #ifdef _MSC_VER
-  __try
-  #endif
-  {
-    InitializeCriticalSection(p);
-    /* InitializeCriticalSectionAndSpinCount(p, 0); */
-  }
-  #ifdef _MSC_VER
-  __except (EXCEPTION_EXECUTE_HANDLER) { return 1; }
-  #endif
-  return 0;
-}
diff --git a/dep/StormLibOld/src/lzma/C/Threads.h b/dep/StormLibOld/src/lzma/C/Threads.h
deleted file mode 100644
index d0ddd80e2..000000000
--- a/dep/StormLibOld/src/lzma/C/Threads.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Threads.h -- multithreading library
-2009-03-27 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_THREADS_H
-#define __7Z_THREADS_H
-
-#include "Types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WRes HandlePtr_Close(HANDLE *h);
-WRes Handle_WaitObject(HANDLE h);
-
-typedef HANDLE CThread;
-#define Thread_Construct(p) *(p) = NULL
-#define Thread_WasCreated(p) (*(p) != NULL)
-#define Thread_Close(p) HandlePtr_Close(p)
-#define Thread_Wait(p) Handle_WaitObject(*(p))
-typedef unsigned THREAD_FUNC_RET_TYPE;
-#define THREAD_FUNC_CALL_TYPE MY_STD_CALL
-#define THREAD_FUNC_DECL THREAD_FUNC_RET_TYPE THREAD_FUNC_CALL_TYPE
-typedef THREAD_FUNC_RET_TYPE (THREAD_FUNC_CALL_TYPE * THREAD_FUNC_TYPE)(void *);
-WRes Thread_Create(CThread *p, THREAD_FUNC_TYPE func, LPVOID param);
-
-typedef HANDLE CEvent;
-typedef CEvent CAutoResetEvent;
-typedef CEvent CManualResetEvent;
-#define Event_Construct(p) *(p) = NULL
-#define Event_IsCreated(p) (*(p) != NULL)
-#define Event_Close(p) HandlePtr_Close(p)
-#define Event_Wait(p) Handle_WaitObject(*(p))
-WRes Event_Set(CEvent *p);
-WRes Event_Reset(CEvent *p);
-WRes ManualResetEvent_Create(CManualResetEvent *p, int signaled);
-WRes ManualResetEvent_CreateNotSignaled(CManualResetEvent *p);
-WRes AutoResetEvent_Create(CAutoResetEvent *p, int signaled);
-WRes AutoResetEvent_CreateNotSignaled(CAutoResetEvent *p);
-
-typedef HANDLE CSemaphore;
-#define Semaphore_Construct(p) (*p) = NULL
-#define Semaphore_Close(p) HandlePtr_Close(p)
-#define Semaphore_Wait(p) Handle_WaitObject(*(p))
-WRes Semaphore_Create(CSemaphore *p, UInt32 initCount, UInt32 maxCount);
-WRes Semaphore_ReleaseN(CSemaphore *p, UInt32 num);
-WRes Semaphore_Release1(CSemaphore *p);
-
-typedef CRITICAL_SECTION CCriticalSection;
-WRes CriticalSection_Init(CCriticalSection *p);
-#define CriticalSection_Delete(p) DeleteCriticalSection(p)
-#define CriticalSection_Enter(p) EnterCriticalSection(p)
-#define CriticalSection_Leave(p) LeaveCriticalSection(p)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/StormLibOld/src/lzma/C/Types.h b/dep/StormLibOld/src/lzma/C/Types.h
deleted file mode 100644
index 0526cb47b..000000000
--- a/dep/StormLibOld/src/lzma/C/Types.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Types.h -- Basic types
-2010-03-11 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_TYPES_H
-#define __7Z_TYPES_H
-
-#include <stddef.h>
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#ifndef EXTERN_C_BEGIN
-#ifdef __cplusplus
-#define EXTERN_C_BEGIN extern "C" {
-#define EXTERN_C_END }
-#else
-#define EXTERN_C_BEGIN
-#define EXTERN_C_END
-#endif
-#endif
-
-EXTERN_C_BEGIN
-
-#define SZ_OK 0
-
-#define SZ_ERROR_DATA 1
-#define SZ_ERROR_MEM 2
-#define SZ_ERROR_CRC 3
-#define SZ_ERROR_UNSUPPORTED 4
-#define SZ_ERROR_PARAM 5
-#define SZ_ERROR_INPUT_EOF 6
-#define SZ_ERROR_OUTPUT_EOF 7
-#define SZ_ERROR_READ 8
-#define SZ_ERROR_WRITE 9
-#define SZ_ERROR_PROGRESS 10
-#define SZ_ERROR_FAIL 11
-#define SZ_ERROR_THREAD 12
-
-#define SZ_ERROR_ARCHIVE 16
-#define SZ_ERROR_NO_ARCHIVE 17
-
-typedef int SRes;
-
-#ifdef _WIN32
-typedef DWORD WRes;
-#else
-typedef int WRes;
-#endif
-
-#ifndef RINOK
-#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
-#endif
-
-typedef unsigned char Byte;
-typedef short Int16;
-typedef unsigned short UInt16;
-
-#ifdef _LZMA_UINT32_IS_ULONG
-typedef long Int32;
-typedef unsigned long UInt32;
-#else
-typedef int Int32;
-typedef unsigned int UInt32;
-#endif
-
-#ifdef _SZ_NO_INT_64
-
-/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
-   NOTES: Some code will work incorrectly in that case! */
-
-typedef long Int64;
-typedef unsigned long UInt64;
-
-#else
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef __int64 Int64;
-typedef unsigned __int64 UInt64;
-#else
-typedef long long int Int64;
-typedef unsigned long long int UInt64;
-#endif
-
-#endif
-
-#ifdef _LZMA_NO_SYSTEM_SIZE_T
-typedef UInt32 SizeT;
-#else
-typedef size_t SizeT;
-#endif
-
-typedef int Bool;
-#define True 1
-#define False 0
-
-
-#ifdef _WIN32
-#define MY_STD_CALL __stdcall
-#else
-#define MY_STD_CALL
-#endif
-
-#ifdef _MSC_VER
-
-#if _MSC_VER >= 1300
-#define MY_NO_INLINE __declspec(noinline)
-#else
-#define MY_NO_INLINE
-#endif
-
-#define MY_CDECL __cdecl
-#define MY_FAST_CALL __fastcall
-
-#else
-
-#define MY_CDECL
-#define MY_FAST_CALL
-
-#endif
-
-
-/* The following interfaces use first parameter as pointer to structure */
-
-typedef struct
-{
-  Byte (*Read)(void *p); /* reads one byte, returns 0 in case of EOF or error */
-} IByteIn;
-
-typedef struct
-{
-  void (*Write)(void *p, Byte b);
-} IByteOut;
-
-typedef struct
-{
-  SRes (*Read)(void *p, void *buf, size_t *size);
-    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-       (output(*size) < input(*size)) is allowed */
-} ISeqInStream;
-
-/* it can return SZ_ERROR_INPUT_EOF */
-SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
-SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
-SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
-
-typedef struct
-{
-  size_t (*Write)(void *p, const void *buf, size_t size);
-    /* Returns: result - the number of actually written bytes.
-       (result < size) means error */
-} ISeqOutStream;
-
-typedef enum
-{
-  SZ_SEEK_SET = 0,
-  SZ_SEEK_CUR = 1,
-  SZ_SEEK_END = 2
-} ESzSeek;
-
-typedef struct
-{
-  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
-  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
-} ISeekInStream;
-
-typedef struct
-{
-  SRes (*Look)(void *p, const void **buf, size_t *size);
-    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-       (output(*size) > input(*size)) is not allowed
-       (output(*size) < input(*size)) is allowed */
-  SRes (*Skip)(void *p, size_t offset);
-    /* offset must be <= output(*size) of Look */
-
-  SRes (*Read)(void *p, void *buf, size_t *size);
-    /* reads directly (without buffer). It's same as ISeqInStream::Read */
-  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
-} ILookInStream;
-
-SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
-SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
-
-/* reads via ILookInStream::Read */
-SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
-SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
-
-#define LookToRead_BUF_SIZE (1 << 14)
-
-typedef struct
-{
-  ILookInStream s;
-  ISeekInStream *realStream;
-  size_t pos;
-  size_t size;
-  Byte buf[LookToRead_BUF_SIZE];
-} CLookToRead;
-
-void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
-void LookToRead_Init(CLookToRead *p);
-
-typedef struct
-{
-  ISeqInStream s;
-  ILookInStream *realStream;
-} CSecToLook;
-
-void SecToLook_CreateVTable(CSecToLook *p);
-
-typedef struct
-{
-  ISeqInStream s;
-  ILookInStream *realStream;
-} CSecToRead;
-
-void SecToRead_CreateVTable(CSecToRead *p);
-
-typedef struct
-{
-  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
-    /* Returns: result. (result != SZ_OK) means break.
-       Value (UInt64)(Int64)-1 for size means unknown value. */
-} ICompressProgress;
-
-typedef struct
-{
-  void *(*Alloc)(void *p, size_t size);
-  void (*Free)(void *p, void *address); /* address can be 0 */
-} ISzAlloc;
-
-#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
-#define IAlloc_Free(p, a) (p)->Free((p), a)
-
-EXTERN_C_END
-
-#endif
diff --git a/dep/StormLibOld/src/lzma/info.txt b/dep/StormLibOld/src/lzma/info.txt
deleted file mode 100644
index 4cee86e35..000000000
--- a/dep/StormLibOld/src/lzma/info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Taken from LZMA SDK v 9.11
\ No newline at end of file
diff --git a/dep/StormLibOld/src/pklib/crc32.c b/dep/StormLibOld/src/pklib/crc32.c
deleted file mode 100644
index cd47b1d4a..000000000
--- a/dep/StormLibOld/src/pklib/crc32.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************/
-/* crc32.c                                Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Pkware Data Compression Library Version 1.11                              */
-/* Dissassembled method crc32 - cdecl version                                */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 09.04.03  1.00  Lad  The first version of crc32.c                         */
-/* 02.05.03  1.00  Lad  Stress test done                                     */
-/*****************************************************************************/
-
-#include "pklib.h"
-
-static unsigned long crc_table[] =
-{
-    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-};
-
-
-unsigned long PKEXPORT crc32_pklib(char * buffer, unsigned int * psize, unsigned long * old_crc)
-{
-    unsigned int  size = *psize;
-    unsigned long ch;
-    unsigned long crc_value = *old_crc;
-
-    while(size-- != 0)
-    {
-        ch = *buffer++ ^ (char)crc_value;
-        crc_value >>= 8;
-
-        crc_value = crc_table[ch & 0x0FF] ^ crc_value;
-    }
-    return crc_value;
-}
diff --git a/dep/StormLibOld/src/pklib/explode.c b/dep/StormLibOld/src/pklib/explode.c
deleted file mode 100644
index 510845c42..000000000
--- a/dep/StormLibOld/src/pklib/explode.c
+++ /dev/null
@@ -1,522 +0,0 @@
-/*****************************************************************************/
-/* explode.c                              Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Implode function of PKWARE Data Compression library                       */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 11.03.03  1.00  Lad  Splitted from Pkware.cpp                             */
-/* 08.04.03  1.01  Lad  Renamed to explode.c to be compatible with pklib     */
-/* 02.05.03  1.01  Lad  Stress test done                                     */
-/* 22.04.10  1.01  Lad  Documented                                           */
-/*****************************************************************************/
-
-#include <assert.h>
-#include <string.h>
-
-#include "pklib.h"
-
-#define PKDCL_OK                    0
-#define PKDCL_STREAM_END            1   // All data from the input stream is read
-#define PKDCL_NEED_DICT             2   // Need more data (dictionary)
-#define PKDCL_CONTINUE             10   // Internal flag, not returned to user
-#define PKDCL_GET_INPUT            11   // Internal flag, not returned to user
-
-char CopyrightPkware[] = "PKWARE Data Compression Library for Win32\r\n"
-                         "Copyright 1989-1995 PKWARE Inc.  All Rights Reserved\r\n"
-                         "Patent No. 5,051,745\r\n"
-                         "PKWARE Data Compression Library Reg. U.S. Pat. and Tm. Off.\r\n"
-                         "Version 1.11\r\n";
-
-//-----------------------------------------------------------------------------
-// Tables
-
-static unsigned char DistBits[] =
-{
-    0x02, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-    0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-    0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-    0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08
-};
-
-static unsigned char DistCode[] =
-{
-    0x03, 0x0D, 0x05, 0x19, 0x09, 0x11, 0x01, 0x3E, 0x1E, 0x2E, 0x0E, 0x36, 0x16, 0x26, 0x06, 0x3A,
-    0x1A, 0x2A, 0x0A, 0x32, 0x12, 0x22, 0x42, 0x02, 0x7C, 0x3C, 0x5C, 0x1C, 0x6C, 0x2C, 0x4C, 0x0C,
-    0x74, 0x34, 0x54, 0x14, 0x64, 0x24, 0x44, 0x04, 0x78, 0x38, 0x58, 0x18, 0x68, 0x28, 0x48, 0x08,
-    0xF0, 0x70, 0xB0, 0x30, 0xD0, 0x50, 0x90, 0x10, 0xE0, 0x60, 0xA0, 0x20, 0xC0, 0x40, 0x80, 0x00
-};
-
-static unsigned char ExLenBits[] =
-{
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
-};
-
-static unsigned short LenBase[] =
-{
-    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
-    0x0008, 0x000A, 0x000E, 0x0016, 0x0026, 0x0046, 0x0086, 0x0106
-};
-
-static unsigned char LenBits[] =
-{
-    0x03, 0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x07, 0x07
-};
-
-static unsigned char LenCode[] =
-{
-    0x05, 0x03, 0x01, 0x06, 0x0A, 0x02, 0x0C, 0x14, 0x04, 0x18, 0x08, 0x30, 0x10, 0x20, 0x40, 0x00
-};
-
-static unsigned char ChBitsAsc[] =
-{
-    0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x08, 0x07, 0x0C, 0x0C, 0x07, 0x0C, 0x0C,
-    0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-    0x04, 0x0A, 0x08, 0x0C, 0x0A, 0x0C, 0x0A, 0x08, 0x07, 0x07, 0x08, 0x09, 0x07, 0x06, 0x07, 0x08,
-    0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x08, 0x07, 0x07, 0x08, 0x08, 0x0C, 0x0B, 0x07, 0x09, 0x0B,
-    0x0C, 0x06, 0x07, 0x06, 0x06, 0x05, 0x07, 0x08, 0x08, 0x06, 0x0B, 0x09, 0x06, 0x07, 0x06, 0x06,
-    0x07, 0x0B, 0x06, 0x06, 0x06, 0x07, 0x09, 0x08, 0x09, 0x09, 0x0B, 0x08, 0x0B, 0x09, 0x0C, 0x08,
-    0x0C, 0x05, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x05, 0x0B, 0x07, 0x05, 0x06, 0x05, 0x05,
-    0x06, 0x0A, 0x05, 0x05, 0x05, 0x05, 0x08, 0x07, 0x08, 0x08, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C,
-    0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
-    0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
-    0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
-    0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-    0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-    0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-    0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D,
-    0x0D, 0x0D, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D
-};
-
-static unsigned short ChCodeAsc[] =
-{
-    0x0490, 0x0FE0, 0x07E0, 0x0BE0, 0x03E0, 0x0DE0, 0x05E0, 0x09E0,
-    0x01E0, 0x00B8, 0x0062, 0x0EE0, 0x06E0, 0x0022, 0x0AE0, 0x02E0,
-    0x0CE0, 0x04E0, 0x08E0, 0x00E0, 0x0F60, 0x0760, 0x0B60, 0x0360,
-    0x0D60, 0x0560, 0x1240, 0x0960, 0x0160, 0x0E60, 0x0660, 0x0A60,
-    0x000F, 0x0250, 0x0038, 0x0260, 0x0050, 0x0C60, 0x0390, 0x00D8,
-    0x0042, 0x0002, 0x0058, 0x01B0, 0x007C, 0x0029, 0x003C, 0x0098,
-    0x005C, 0x0009, 0x001C, 0x006C, 0x002C, 0x004C, 0x0018, 0x000C,
-    0x0074, 0x00E8, 0x0068, 0x0460, 0x0090, 0x0034, 0x00B0, 0x0710,
-    0x0860, 0x0031, 0x0054, 0x0011, 0x0021, 0x0017, 0x0014, 0x00A8,
-    0x0028, 0x0001, 0x0310, 0x0130, 0x003E, 0x0064, 0x001E, 0x002E,
-    0x0024, 0x0510, 0x000E, 0x0036, 0x0016, 0x0044, 0x0030, 0x00C8,
-    0x01D0, 0x00D0, 0x0110, 0x0048, 0x0610, 0x0150, 0x0060, 0x0088,
-    0x0FA0, 0x0007, 0x0026, 0x0006, 0x003A, 0x001B, 0x001A, 0x002A,
-    0x000A, 0x000B, 0x0210, 0x0004, 0x0013, 0x0032, 0x0003, 0x001D,
-    0x0012, 0x0190, 0x000D, 0x0015, 0x0005, 0x0019, 0x0008, 0x0078,
-    0x00F0, 0x0070, 0x0290, 0x0410, 0x0010, 0x07A0, 0x0BA0, 0x03A0,
-    0x0240, 0x1C40, 0x0C40, 0x1440, 0x0440, 0x1840, 0x0840, 0x1040,
-    0x0040, 0x1F80, 0x0F80, 0x1780, 0x0780, 0x1B80, 0x0B80, 0x1380,
-    0x0380, 0x1D80, 0x0D80, 0x1580, 0x0580, 0x1980, 0x0980, 0x1180,
-    0x0180, 0x1E80, 0x0E80, 0x1680, 0x0680, 0x1A80, 0x0A80, 0x1280,
-    0x0280, 0x1C80, 0x0C80, 0x1480, 0x0480, 0x1880, 0x0880, 0x1080,
-    0x0080, 0x1F00, 0x0F00, 0x1700, 0x0700, 0x1B00, 0x0B00, 0x1300,
-    0x0DA0, 0x05A0, 0x09A0, 0x01A0, 0x0EA0, 0x06A0, 0x0AA0, 0x02A0,
-    0x0CA0, 0x04A0, 0x08A0, 0x00A0, 0x0F20, 0x0720, 0x0B20, 0x0320,
-    0x0D20, 0x0520, 0x0920, 0x0120, 0x0E20, 0x0620, 0x0A20, 0x0220,
-    0x0C20, 0x0420, 0x0820, 0x0020, 0x0FC0, 0x07C0, 0x0BC0, 0x03C0,
-    0x0DC0, 0x05C0, 0x09C0, 0x01C0, 0x0EC0, 0x06C0, 0x0AC0, 0x02C0,
-    0x0CC0, 0x04C0, 0x08C0, 0x00C0, 0x0F40, 0x0740, 0x0B40, 0x0340,
-    0x0300, 0x0D40, 0x1D00, 0x0D00, 0x1500, 0x0540, 0x0500, 0x1900,
-    0x0900, 0x0940, 0x1100, 0x0100, 0x1E00, 0x0E00, 0x0140, 0x1600,
-    0x0600, 0x1A00, 0x0E40, 0x0640, 0x0A40, 0x0A00, 0x1200, 0x0200,
-    0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000
-};
-
-//-----------------------------------------------------------------------------
-// Local functions
-
-static void GenDecodeTabs(
-    unsigned char * positions,          // [out] Table of positions
-    unsigned char * start_indexes,      // [in] Table of start indexes
-    unsigned char * length_bits,        // [in] Table of lengths. Each length is stored as number of bits
-    size_t elements)                    // [in] Number of elements in start_indexes and length_bits
-{
-    unsigned long index;
-    unsigned long length;
-    size_t i;
-
-    for(i = 0; i < elements; i++)
-    {
-        length = 1 << length_bits[i];   // Get the length in bytes
-
-        for(index = start_indexes[i]; index < 0x100; index += length)
-        {
-            positions[index] = (unsigned char)i;
-        }
-    }
-}
-
-static void GenAscTabs(TDcmpStruct * pWork)
-{
-    unsigned short * pChCodeAsc = &ChCodeAsc[0xFF];
-    unsigned long  acc, add;
-    unsigned short count;
-
-    for(count = 0x00FF; pChCodeAsc >= ChCodeAsc; pChCodeAsc--, count--)
-    {
-        unsigned char * pChBitsAsc = pWork->ChBitsAsc + count;
-        unsigned char bits_asc = *pChBitsAsc;
-
-        if(bits_asc <= 8)
-        {
-            add = (1 << bits_asc);
-            acc = *pChCodeAsc;
-
-            do
-            {
-                pWork->offs2C34[acc] = (unsigned char)count;
-                acc += add;
-            }
-            while(acc < 0x100);
-        }
-        else if((acc = (*pChCodeAsc & 0xFF)) != 0)
-        {
-            pWork->offs2C34[acc] = 0xFF;
-
-            if(*pChCodeAsc & 0x3F)
-            {
-                bits_asc -= 4;
-                *pChBitsAsc = bits_asc;
-
-                add = (1 << bits_asc);
-                acc = *pChCodeAsc >> 4;
-                do
-                {
-                    pWork->offs2D34[acc] = (unsigned char)count;
-                    acc += add;
-                }
-                while(acc < 0x100);
-            }
-            else
-            {
-                bits_asc -= 6;
-                *pChBitsAsc = bits_asc;
-
-                add = (1 << bits_asc);
-                acc = *pChCodeAsc >> 6;
-                do
-                {
-                    pWork->offs2E34[acc] = (unsigned char)count;
-                    acc += add;
-                }
-                while(acc < 0x80);
-            }
-        }
-        else
-        {
-            bits_asc -= 8;
-            *pChBitsAsc = bits_asc;
-
-            add = (1 << bits_asc);
-            acc = *pChCodeAsc >> 8;
-            do
-            {
-                pWork->offs2EB4[acc] = (unsigned char)count;
-                acc += add;
-            }
-            while(acc < 0x100);
-        }
-    }
-}
-
-//-----------------------------------------------------------------------------
-// Removes given number of bits in the bit buffer. New bits are reloaded from
-// the input buffer, if needed.
-// Returns: PKDCL_OK:         Operation was successful
-//          PKDCL_STREAM_END: There are no more bits in the input buffer
-
-static int WasteBits(TDcmpStruct * pWork, unsigned long nBits)
-{
-    // If number of bits required is less than number of (bits in the buffer) ?
-    if(nBits <= pWork->extra_bits)
-    {
-        pWork->extra_bits -= nBits;
-        pWork->bit_buff  >>= nBits;
-        return PKDCL_OK;
-    }
-
-    // Load input buffer if necessary
-    pWork->bit_buff >>= pWork->extra_bits;
-    if(pWork->in_pos == pWork->in_bytes)
-    {
-        pWork->in_pos = sizeof(pWork->in_buff);
-        if((pWork->in_bytes = pWork->read_buf((char *)pWork->in_buff, &pWork->in_pos, pWork->param)) == 0)
-            return PKDCL_STREAM_END;
-        pWork->in_pos = 0;
-    }
-
-    // Update bit buffer
-    pWork->bit_buff  |= (pWork->in_buff[pWork->in_pos++] << 8);
-    pWork->bit_buff >>= (nBits - pWork->extra_bits);
-    pWork->extra_bits = (pWork->extra_bits - nBits) + 8;
-    return PKDCL_OK;
-}
-
-//-----------------------------------------------------------------------------
-// Decodes next literal from the input (compressed) data.
-// Returns : 0x000: One byte 0x00
-//           0x001: One byte 0x01
-//           ...
-//           0x0FF: One byte 0xFF
-//           0x100: Repetition, length of 0x02 bytes
-//           0x101: Repetition, length of 0x03 bytes
-//           ...
-//           0x304: Repetition, length of 0x206 bytes
-//           0x305: End of stream
-//           0x306: Error
-
-static unsigned long DecodeLit(TDcmpStruct * pWork)
-{
-    unsigned long extra_length_bits;    // Number of bits of extra literal length
-    unsigned long length_code;          // Length code
-    unsigned long value;
-
-    // Test the current bit in byte buffer. If is not set, simply return the next 8 bits.
-    if(pWork->bit_buff & 1)
-    {
-        // Remove one bit from the input data
-        if(WasteBits(pWork, 1))
-            return 0x306;
-
-        // The next 8 bits hold the index to the length code table
-        length_code = pWork->LengthCodes[pWork->bit_buff & 0xFF];
-
-        // Remove the apropriate number of bits
-        if(WasteBits(pWork, pWork->LenBits[length_code]))
-            return 0x306;
-
-        // Are there some extra bits for the obtained length code ?
-        if((extra_length_bits = pWork->ExLenBits[length_code]) != 0)
-        {
-            unsigned long extra_length = pWork->bit_buff & ((1 << extra_length_bits) - 1);
-
-            if(WasteBits(pWork, extra_length_bits))
-            {
-                if((length_code + extra_length) != 0x10E)
-                    return 0x306;
-            }
-            length_code = pWork->LenBase[length_code] + extra_length;
-        }
-
-        // In order to distinguish uncompressed byte from repetition length,
-        // we have to add 0x100 to the length.
-        return length_code + 0x100;
-    }
-
-    // Remove one bit from the input data
-    if(WasteBits(pWork, 1))
-        return 0x306;
-
-    // If the binary compression type, read 8 bits and return them as one byte.
-    if(pWork->ctype == CMP_BINARY)
-    {
-        unsigned long uncompressed_byte = pWork->bit_buff & 0xFF;
-
-        if(WasteBits(pWork, 8))
-            return 0x306;
-        return uncompressed_byte;
-    }
-
-    // When ASCII compression ...
-    if(pWork->bit_buff & 0xFF)
-    {
-        value = pWork->offs2C34[pWork->bit_buff & 0xFF];
-
-        if(value == 0xFF)
-        {
-            if(pWork->bit_buff & 0x3F)
-            {
-                if(WasteBits(pWork, 4))
-                    return 0x306;
-
-                value = pWork->offs2D34[pWork->bit_buff & 0xFF];
-            }
-            else
-            {
-                if(WasteBits(pWork, 6))
-                    return 0x306;
-
-                value = pWork->offs2E34[pWork->bit_buff & 0x7F];
-            }
-        }
-    }
-    else
-    {
-        if(WasteBits(pWork, 8))
-            return 0x306;
-
-        value = pWork->offs2EB4[pWork->bit_buff & 0xFF];
-    }
-
-    return WasteBits(pWork, pWork->ChBitsAsc[value]) ? 0x306 : value;
-}
-
-//-----------------------------------------------------------------------------
-// Decodes the distance of the repetition, backwards relative to the
-// current output buffer position
-
-static unsigned long DecodeDist(TDcmpStruct * pWork, unsigned long rep_length)
-{
-    unsigned long dist_pos_code;            // Distance position code
-    unsigned long dist_pos_bits;            // Number of bits of distance position
-    unsigned long distance;                 // Distance position
-
-    // Next 2-8 bits in the input buffer is the distance position code
-    dist_pos_code = pWork->DistPosCodes[pWork->bit_buff & 0xFF];
-    dist_pos_bits = pWork->DistBits[dist_pos_code];
-    if(WasteBits(pWork, dist_pos_bits))
-        return 0;
-
-    if(rep_length == 2)
-    {
-        // If the repetition is only 2 bytes length,
-        // then take 2 bits from the stream in order to get the distance
-        distance = (dist_pos_code << 2) | (pWork->bit_buff & 0x03);
-        if(WasteBits(pWork, 2))
-            return 0;
-    }
-    else
-    {
-        // If the repetition is more than 2 bytes length,
-        // then take "dsize_bits" bits in order to get the distance
-        distance = (dist_pos_code << pWork->dsize_bits) | (pWork->bit_buff & pWork->dsize_mask);
-        if(WasteBits(pWork, pWork->dsize_bits))
-            return 0;
-    }
-    return distance + 1;
-}
-
-static unsigned long Expand(TDcmpStruct * pWork)
-{
-    unsigned long next_literal;         // Literal decoded from the compressed data
-    unsigned long result;               // Value to be returned
-    unsigned int copyBytes;             // Number of bytes to copy to the output buffer
-
-    pWork->outputPos = 0x1000;          // Initialize output buffer position
-
-    // Decode the next literal from the input data.
-    // The returned literal can either be an uncompressed byte (next_literal < 0x100)
-    // or an encoded length of the repeating byte sequence that
-    // is to be copied to the current buffer position
-    while((result = next_literal = DecodeLit(pWork)) < 0x305)
-    {
-        // If the literal is greater than 0x100, it holds length
-        // of repeating byte sequence
-        // literal of 0x100 means repeating sequence of 0x2 bytes
-        // literal of 0x101 means repeating sequence of 0x3 bytes
-        // ...
-        // literal of 0x305 means repeating sequence of 0x207 bytes
-        if(next_literal >= 0x100)
-        {
-            unsigned char * source;
-            unsigned char * target;
-            unsigned long rep_length;       // Length of the repetition, in bytes
-            unsigned long minus_dist;       // Backward distance to the repetition, relative to the current buffer position
-
-            // Get the length of the repeating sequence.
-            // Note that the repeating block may overlap the current output position,
-            // for example if there was a sequence of equal bytes
-            rep_length = next_literal - 0xFE;
-
-            // Get backward distance to the repetition
-            if((minus_dist = DecodeDist(pWork, rep_length)) == 0)
-            {
-                result = 0x306;
-                break;
-            }
-
-            // Target and source pointer
-            target = &pWork->out_buff[pWork->outputPos];
-            source = target - minus_dist;
-
-            // Update buffer output position
-            pWork->outputPos += rep_length;
-
-            // Copy the repeating sequence
-            while(rep_length-- > 0)
-                *target++ = *source++;
-        }
-        else
-        {
-            pWork->out_buff[pWork->outputPos++] = (unsigned char)next_literal;
-        }
-
-        // Flush the output buffer, if number of extracted bytes has reached the end
-        if(pWork->outputPos >= 0x2000)
-        {
-            // Copy decompressed data into user buffer
-            copyBytes = 0x1000;
-            pWork->write_buf((char *)&pWork->out_buff[0x1000], &copyBytes, pWork->param);
-
-            // Now copy the decompressed data to the first half of the buffer.
-            // This is needed because the decompression might reuse them as repetitions.
-            // Note that if the output buffer overflowed previously, the extra decompressed bytes
-            // are stored in "out_buff_overflow", and they will now be
-            // within decompressed part of the output buffer.
-            memcpy(pWork->out_buff, &pWork->out_buff[0x1000], pWork->outputPos - 0x1000);
-            pWork->outputPos -= 0x1000;
-        }
-    }
-
-    // Flush any remaining decompressed bytes
-    copyBytes = pWork->outputPos - 0x1000;
-    pWork->write_buf((char *)&pWork->out_buff[0x1000], &copyBytes, pWork->param);
-    return result;
-}
-
-
-//-----------------------------------------------------------------------------
-// Main exploding function.
-
-unsigned int explode(
-        unsigned int (*read_buf)(char *buf, unsigned  int *size, void *param),
-        void         (*write_buf)(char *buf, unsigned  int *size, void *param),
-        char         *work_buf,
-        void         *param)
-{
-    TDcmpStruct * pWork = (TDcmpStruct *)work_buf;
-
-    // Initialize work struct and load compressed data
-    // Note: The caller must zero the "work_buff" before passing it to explode
-    pWork->read_buf   = read_buf;
-    pWork->write_buf  = write_buf;
-    pWork->param      = param;
-    pWork->in_pos     = sizeof(pWork->in_buff);
-    pWork->in_bytes   = pWork->read_buf((char *)pWork->in_buff, &pWork->in_pos, pWork->param);
-    if(pWork->in_bytes <= 4)
-        return CMP_BAD_DATA;
-
-    pWork->ctype      = pWork->in_buff[0]; // Get the compression type (CMP_BINARY or CMP_ASCII)
-    pWork->dsize_bits = pWork->in_buff[1]; // Get the dictionary size
-    pWork->bit_buff   = pWork->in_buff[2]; // Initialize 16-bit bit buffer
-    pWork->extra_bits = 0;                 // Extra (over 8) bits
-    pWork->in_pos     = 3;                 // Position in input buffer
-
-    // Test for the valid dictionary size
-    if(4 > pWork->dsize_bits || pWork->dsize_bits > 6)
-        return CMP_INVALID_DICTSIZE;
-
-    pWork->dsize_mask = 0xFFFF >> (0x10 - pWork->dsize_bits); // Shifted by 'sar' instruction
-
-    if(pWork->ctype != CMP_BINARY)
-    {
-        if(pWork->ctype != CMP_ASCII)
-            return CMP_INVALID_MODE;
-
-        memcpy(pWork->ChBitsAsc, ChBitsAsc, sizeof(pWork->ChBitsAsc));
-        GenAscTabs(pWork);
-    }
-
-    memcpy(pWork->LenBits, LenBits, sizeof(pWork->LenBits));
-    GenDecodeTabs(pWork->LengthCodes, LenCode, pWork->LenBits, sizeof(pWork->LenBits));
-    memcpy(pWork->ExLenBits, ExLenBits, sizeof(pWork->ExLenBits));
-    memcpy(pWork->LenBase, LenBase, sizeof(pWork->LenBase));
-    memcpy(pWork->DistBits, DistBits, sizeof(pWork->DistBits));
-    GenDecodeTabs(pWork->DistPosCodes, DistCode, pWork->DistBits, sizeof(pWork->DistBits));
-    if(Expand(pWork) != 0x306)
-        return CMP_NO_ERROR;
-
-    return CMP_ABORT;
-}
diff --git a/dep/StormLibOld/src/pklib/implode.c b/dep/StormLibOld/src/pklib/implode.c
deleted file mode 100644
index fbbc6d8da..000000000
--- a/dep/StormLibOld/src/pklib/implode.c
+++ /dev/null
@@ -1,769 +0,0 @@
-/*****************************************************************************/
-/* implode.c                              Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Implode function of PKWARE Data Compression library                       */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 11.04.03  1.00  Lad  First version of implode.c                           */
-/* 02.05.03  1.00  Lad  Stress test done                                     */
-/* 22.04.10  1.01  Lad  Documented                                           */
-/*****************************************************************************/
-
-#include <assert.h>
-#include <string.h>
-
-#include "pklib.h"
-
-#if ((1200 < _MSC_VER) && (_MSC_VER < 1400))
-#pragma optimize("", off)               // Fucking Microsoft VS.NET 2003 compiler !!! (_MSC_VER=1310)
-#endif
-
-//-----------------------------------------------------------------------------
-// Defines
-
-#define MAX_REP_LENGTH 0x204            // The longest allowed repetition
-
-//-----------------------------------------------------------------------------
-// Tables
-
-static unsigned char DistBits[] =
-{
-    0x02, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-    0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-    0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-    0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08
-};
-
-static unsigned char DistCode[] =
-{
-    0x03, 0x0D, 0x05, 0x19, 0x09, 0x11, 0x01, 0x3E, 0x1E, 0x2E, 0x0E, 0x36, 0x16, 0x26, 0x06, 0x3A,
-    0x1A, 0x2A, 0x0A, 0x32, 0x12, 0x22, 0x42, 0x02, 0x7C, 0x3C, 0x5C, 0x1C, 0x6C, 0x2C, 0x4C, 0x0C,
-    0x74, 0x34, 0x54, 0x14, 0x64, 0x24, 0x44, 0x04, 0x78, 0x38, 0x58, 0x18, 0x68, 0x28, 0x48, 0x08,
-    0xF0, 0x70, 0xB0, 0x30, 0xD0, 0x50, 0x90, 0x10, 0xE0, 0x60, 0xA0, 0x20, 0xC0, 0x40, 0x80, 0x00
-};
-
-static unsigned char ExLenBits[] =
-{
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
-};
-
-static unsigned char LenBits[] =
-{
-    0x03, 0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x07, 0x07
-};
-
-static unsigned char LenCode[] =
-{
-    0x05, 0x03, 0x01, 0x06, 0x0A, 0x02, 0x0C, 0x14, 0x04, 0x18, 0x08, 0x30, 0x10, 0x20, 0x40, 0x00
-};
-
-static unsigned char ChBitsAsc[] =
-{
-    0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x08, 0x07, 0x0C, 0x0C, 0x07, 0x0C, 0x0C,
-    0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-    0x04, 0x0A, 0x08, 0x0C, 0x0A, 0x0C, 0x0A, 0x08, 0x07, 0x07, 0x08, 0x09, 0x07, 0x06, 0x07, 0x08,
-    0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x08, 0x07, 0x07, 0x08, 0x08, 0x0C, 0x0B, 0x07, 0x09, 0x0B,
-    0x0C, 0x06, 0x07, 0x06, 0x06, 0x05, 0x07, 0x08, 0x08, 0x06, 0x0B, 0x09, 0x06, 0x07, 0x06, 0x06,
-    0x07, 0x0B, 0x06, 0x06, 0x06, 0x07, 0x09, 0x08, 0x09, 0x09, 0x0B, 0x08, 0x0B, 0x09, 0x0C, 0x08,
-    0x0C, 0x05, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x05, 0x0B, 0x07, 0x05, 0x06, 0x05, 0x05,
-    0x06, 0x0A, 0x05, 0x05, 0x05, 0x05, 0x08, 0x07, 0x08, 0x08, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C,
-    0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
-    0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
-    0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
-    0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-    0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-    0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-    0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D,
-    0x0D, 0x0D, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D
-};
-
-static unsigned short ChCodeAsc[] =
-{
-    0x0490, 0x0FE0, 0x07E0, 0x0BE0, 0x03E0, 0x0DE0, 0x05E0, 0x09E0,
-    0x01E0, 0x00B8, 0x0062, 0x0EE0, 0x06E0, 0x0022, 0x0AE0, 0x02E0,
-    0x0CE0, 0x04E0, 0x08E0, 0x00E0, 0x0F60, 0x0760, 0x0B60, 0x0360,
-    0x0D60, 0x0560, 0x1240, 0x0960, 0x0160, 0x0E60, 0x0660, 0x0A60,
-    0x000F, 0x0250, 0x0038, 0x0260, 0x0050, 0x0C60, 0x0390, 0x00D8,
-    0x0042, 0x0002, 0x0058, 0x01B0, 0x007C, 0x0029, 0x003C, 0x0098,
-    0x005C, 0x0009, 0x001C, 0x006C, 0x002C, 0x004C, 0x0018, 0x000C,
-    0x0074, 0x00E8, 0x0068, 0x0460, 0x0090, 0x0034, 0x00B0, 0x0710,
-    0x0860, 0x0031, 0x0054, 0x0011, 0x0021, 0x0017, 0x0014, 0x00A8,
-    0x0028, 0x0001, 0x0310, 0x0130, 0x003E, 0x0064, 0x001E, 0x002E,
-    0x0024, 0x0510, 0x000E, 0x0036, 0x0016, 0x0044, 0x0030, 0x00C8,
-    0x01D0, 0x00D0, 0x0110, 0x0048, 0x0610, 0x0150, 0x0060, 0x0088,
-    0x0FA0, 0x0007, 0x0026, 0x0006, 0x003A, 0x001B, 0x001A, 0x002A,
-    0x000A, 0x000B, 0x0210, 0x0004, 0x0013, 0x0032, 0x0003, 0x001D,
-    0x0012, 0x0190, 0x000D, 0x0015, 0x0005, 0x0019, 0x0008, 0x0078,
-    0x00F0, 0x0070, 0x0290, 0x0410, 0x0010, 0x07A0, 0x0BA0, 0x03A0,
-    0x0240, 0x1C40, 0x0C40, 0x1440, 0x0440, 0x1840, 0x0840, 0x1040,
-    0x0040, 0x1F80, 0x0F80, 0x1780, 0x0780, 0x1B80, 0x0B80, 0x1380,
-    0x0380, 0x1D80, 0x0D80, 0x1580, 0x0580, 0x1980, 0x0980, 0x1180,
-    0x0180, 0x1E80, 0x0E80, 0x1680, 0x0680, 0x1A80, 0x0A80, 0x1280,
-    0x0280, 0x1C80, 0x0C80, 0x1480, 0x0480, 0x1880, 0x0880, 0x1080,
-    0x0080, 0x1F00, 0x0F00, 0x1700, 0x0700, 0x1B00, 0x0B00, 0x1300,
-    0x0DA0, 0x05A0, 0x09A0, 0x01A0, 0x0EA0, 0x06A0, 0x0AA0, 0x02A0,
-    0x0CA0, 0x04A0, 0x08A0, 0x00A0, 0x0F20, 0x0720, 0x0B20, 0x0320,
-    0x0D20, 0x0520, 0x0920, 0x0120, 0x0E20, 0x0620, 0x0A20, 0x0220,
-    0x0C20, 0x0420, 0x0820, 0x0020, 0x0FC0, 0x07C0, 0x0BC0, 0x03C0,
-    0x0DC0, 0x05C0, 0x09C0, 0x01C0, 0x0EC0, 0x06C0, 0x0AC0, 0x02C0,
-    0x0CC0, 0x04C0, 0x08C0, 0x00C0, 0x0F40, 0x0740, 0x0B40, 0x0340,
-    0x0300, 0x0D40, 0x1D00, 0x0D00, 0x1500, 0x0540, 0x0500, 0x1900,
-    0x0900, 0x0940, 0x1100, 0x0100, 0x1E00, 0x0E00, 0x0140, 0x1600,
-    0x0600, 0x1A00, 0x0E40, 0x0640, 0x0A40, 0x0A00, 0x1200, 0x0200,
-    0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000
-};
-
-//-----------------------------------------------------------------------------
-// Macros
-
-// Macro for calculating hash of the current byte pair.
-// Note that most exact byte pair hash would be buffer[0] + buffer[1] << 0x08,
-// but even this way gives nice indication of equal byte pairs, with significantly
-// smaller size of the array that holds numbers of those hashes
-#define BYTE_PAIR_HASH(buffer)   ((buffer[0] * 4) + (buffer[1] * 5))
-
-//-----------------------------------------------------------------------------
-// Local functions
-
-// Builds the "hash_to_index" table and "pair_hash_offsets" table.
-// Every element of "hash_to_index" will contain lowest index to the
-// "pair_hash_offsets" table, effectively giving offset of the first
-// occurence of the given PAIR_HASH in the input data.
-static void SortBuffer(TCmpStruct * pWork, unsigned char * buffer_begin, unsigned char * buffer_end)
-{
-    unsigned short * phash_to_index;
-    unsigned char  * buffer_ptr;
-    unsigned short total_sum = 0;
-    unsigned long byte_pair_hash;           // Hash value of the byte pair
-    unsigned short byte_pair_offs;          // Offset of the byte pair, relative to "work_buff"
-
-    // Zero the entire "phash_to_index" table
-    memset(pWork->phash_to_index, 0, sizeof(pWork->phash_to_index));
-
-    // Step 1: Count amount of each PAIR_HASH in the input buffer
-    // The table will look like this:
-    //  offs 0x000: Number of occurences of PAIR_HASH 0
-    //  offs 0x001: Number of occurences of PAIR_HASH 1
-    //  ...
-    //  offs 0x8F7: Number of occurences of PAIR_HASH 0x8F7 (the highest hash value)
-    for(buffer_ptr = buffer_begin; buffer_ptr < buffer_end; buffer_ptr++)
-        pWork->phash_to_index[BYTE_PAIR_HASH(buffer_ptr)]++;
-
-    // Step 2: Convert the table to the array of PAIR_HASH amounts.
-    // Each element contains count of PAIR_HASHes that is less or equal
-    // to element index
-    // The table will look like this:
-    //  offs 0x000: Number of occurences of PAIR_HASH 0 or lower
-    //  offs 0x001: Number of occurences of PAIR_HASH 1 or lower
-    //  ...
-    //  offs 0x8F7: Number of occurences of PAIR_HASH 0x8F7 or lower
-    for(phash_to_index = pWork->phash_to_index; phash_to_index < &pWork->phash_to_index_end; phash_to_index++)
-    {
-        total_sum = total_sum + phash_to_index[0];
-        phash_to_index[0] = total_sum;
-    }
-
-    // Step 3: Convert the table to the array of indexes.
-    // Now, each element contains index to the first occurence of given PAIR_HASH
-    for(buffer_end--; buffer_end >= buffer_begin; buffer_end--)
-    {
-        byte_pair_hash = BYTE_PAIR_HASH(buffer_end);
-        byte_pair_offs = (unsigned short)(buffer_end - pWork->work_buff);
-
-        pWork->phash_to_index[byte_pair_hash]--;
-        pWork->phash_offs[pWork->phash_to_index[byte_pair_hash]] = byte_pair_offs;
-    }
-}
-
-static void FlushBuf(TCmpStruct * pWork)
-{
-    unsigned char save_ch1;
-    unsigned char save_ch2;
-    unsigned int size = 0x800;
-
-    pWork->write_buf(pWork->out_buff, &size, pWork->param);
-
-    save_ch1 = pWork->out_buff[0x800];
-    save_ch2 = pWork->out_buff[pWork->out_bytes];
-    pWork->out_bytes -= 0x800;
-
-    memset(pWork->out_buff, 0, sizeof(pWork->out_buff));
-
-    if(pWork->out_bytes != 0)
-        pWork->out_buff[0] = save_ch1;
-    if(pWork->out_bits != 0)
-        pWork->out_buff[pWork->out_bytes] = save_ch2;
-}
-
-static void OutputBits(TCmpStruct * pWork, unsigned int nbits, unsigned long bit_buff)
-{
-    unsigned int out_bits;
-
-    // If more than 8 bits to output, do recursion
-    if(nbits > 8)
-    {
-        OutputBits(pWork, 8, bit_buff);
-        bit_buff >>= 8;
-        nbits -= 8;
-    }
-
-    // Add bits to the last out byte in out_buff;
-    out_bits = pWork->out_bits;
-    pWork->out_buff[pWork->out_bytes] |= (unsigned char)(bit_buff << out_bits);
-    pWork->out_bits += nbits;
-
-    // If 8 or more bits, increment number of bytes
-    if(pWork->out_bits > 8)
-    {
-        pWork->out_bytes++;
-        bit_buff >>= (8 - out_bits);
-
-        pWork->out_buff[pWork->out_bytes] = (unsigned char)bit_buff;
-        pWork->out_bits &= 7;
-    }
-    else
-    {
-        pWork->out_bits &= 7;
-        if(pWork->out_bits == 0)
-            pWork->out_bytes++;
-    }
-
-    // If there is enough compressed bytes, flush them
-    if(pWork->out_bytes >= 0x800)
-        FlushBuf(pWork);
-}
-
-// This function searches for a repetition
-// (a previous occurence of the current byte sequence)
-// Returns length of the repetition, and stores the backward distance
-// to pWork structure.
-static unsigned int FindRep(TCmpStruct * pWork, unsigned char * input_data)
-{
-    unsigned short * phash_to_index;            // Pointer into pWork->phash_to_index table
-    unsigned short * phash_offs;                // Pointer to the table containing offsets of each PAIR_HASH
-    unsigned char * repetition_limit;           // An eventual repetition must be at position below this pointer
-    unsigned char * prev_repetition;            // Pointer to the previous occurence of the current PAIR_HASH
-    unsigned char * prev_rep_end;               // End of the previous repetition
-    unsigned char * input_data_ptr;
-    unsigned short phash_offs_index;            // Index to the table with PAIR_HASH positions
-    unsigned short min_phash_offs;              // The lowest allowed hash offset
-    unsigned short offs_in_rep;                 // Offset within found repetition
-    unsigned int equal_byte_count;              // Number of bytes that are equal to the previous occurence
-    unsigned int rep_length = 1;                // Length of the found repetition
-    unsigned int rep_length2;                   // Secondary repetition
-    unsigned char pre_last_byte;                // Last but one byte from a repetion
-    unsigned short di_val;
-
-    // Calculate the previous position of the PAIR_HASH
-    phash_to_index   = pWork->phash_to_index + BYTE_PAIR_HASH(input_data);
-    min_phash_offs   = (unsigned short)((input_data - pWork->work_buff) - pWork->dsize_bytes + 1);
-    phash_offs_index = phash_to_index[0];
-
-    // If the PAIR_HASH offset is below the limit, find a next one
-    phash_offs = pWork->phash_offs + phash_offs_index;
-    if(*phash_offs < min_phash_offs)
-    {
-        while(*phash_offs < min_phash_offs)
-        {
-            phash_offs_index++;
-            phash_offs++;
-        }
-        *phash_to_index = phash_offs_index;
-    }
-
-    // Get the first location of the PAIR_HASH,
-    // and thus the first eventual location of byte repetition
-    phash_offs = pWork->phash_offs + phash_offs_index;
-    prev_repetition = pWork->work_buff + phash_offs[0];
-    repetition_limit = input_data - 1;
-
-    // If the current PAIR_HASH was not encountered before,
-    // we haven't found a repetition.
-    if(prev_repetition >= repetition_limit)
-        return 0;
-
-    // We have found a match of a PAIR_HASH. Now we have to make sure
-    // that it is also a byte match, because PAIR_HASH is not unique.
-    // We compare the bytes and count the length of the repetition
-    input_data_ptr = input_data;
-    for(;;)
-    {
-        // If the first byte of the repetition and the so-far-last byte
-        // of the repetition are equal, we will compare the blocks.
-        if(*input_data_ptr == *prev_repetition && input_data_ptr[rep_length-1] == prev_repetition[rep_length-1])
-        {
-            // Skip the current byte
-            prev_repetition++;
-            input_data_ptr++;
-            equal_byte_count = 2;
-
-            // Now count how many more bytes are equal
-            while(equal_byte_count < MAX_REP_LENGTH)
-            {
-                prev_repetition++;
-                input_data_ptr++;
-
-                // Are the bytes different ?
-                if(*prev_repetition != *input_data_ptr)
-                    break;
-
-                equal_byte_count++;
-            }
-
-            // If we found a repetition of at least the same length, take it.
-            // If there are multiple repetitions in the input buffer, this will
-            // make sure that we find the most recent one, which in turn allows
-            // us to store backward length in less amount of bits
-            input_data_ptr = input_data;
-            if(equal_byte_count >= rep_length)
-            {
-                // Calculate the backward distance of the repetition.
-                // Note that the distance is stored as decremented by 1
-                pWork->distance = (unsigned int)(input_data - prev_repetition + equal_byte_count - 1);
-
-                // Repetitions longer than 10 bytes will be stored in more bits,
-                // so they need a bit different handling
-                if((rep_length = equal_byte_count) > 10)
-                    break;
-            }
-        }
-
-        // Move forward in the table of PAIR_HASH repetitions.
-        // There might be a more recent occurence of the same repetition.
-        phash_offs_index++;
-        phash_offs++;
-        prev_repetition = pWork->work_buff + phash_offs[0];
-
-        // If the next repetition is beyond the minimum allowed repetition, we are done.
-        if(prev_repetition >= repetition_limit)
-        {
-            // A repetition must have at least 2 bytes, otherwise it's not worth it
-            return (rep_length >= 2) ? rep_length : 0;
-        }
-    }
-
-    // If the repetition has max length of 0x204 bytes, we can't go any fuhrter
-    if(equal_byte_count == MAX_REP_LENGTH)
-    {
-        pWork->distance--;
-        return equal_byte_count;
-    }
-
-    // Check for possibility of a repetition that occurs at more recent position
-    phash_offs = pWork->phash_offs + phash_offs_index;
-    if(pWork->work_buff + phash_offs[1] >= repetition_limit)
-        return rep_length;
-
-    //
-    // The following part checks if there isn't a longer repetition at
-    // a latter offset, that would lead to better compression.
-    //
-    // Example of data that can trigger this optimization:
-    //
-    //   "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEQQQQQQQQQQQQ"
-    //   "XYZ"
-    //   "EEEEEEEEEEEEEEEEQQQQQQQQQQQQ";
-    //
-    // Description of data in this buffer
-    //   [0x00] Single byte "E"
-    //   [0x01] Single byte "E"
-    //   [0x02] Repeat 0x1E bytes from [0x00]
-    //   [0x20] Single byte "X"
-    //   [0x21] Single byte "Y"
-    //   [0x22] Single byte "Z"
-    //   [0x23] 17 possible previous repetitions of length at least 0x10 bytes:
-    //          - Repetition of 0x10 bytes from [0x00] "EEEEEEEEEEEEEEEE"
-    //          - Repetition of 0x10 bytes from [0x01] "EEEEEEEEEEEEEEEE"
-    //          - Repetition of 0x10 bytes from [0x02] "EEEEEEEEEEEEEEEE"
-    //          ...
-    //          - Repetition of 0x10 bytes from [0x0F] "EEEEEEEEEEEEEEEE"
-    //          - Repetition of 0x1C bytes from [0x10] "EEEEEEEEEEEEEEEEQQQQQQQQQQQQ"
-    //          The last repetition is the best one.
-    //
-
-    pWork->offs09BC[0] = 0xFFFF;
-    pWork->offs09BC[1] = 0x0000;
-    di_val = 0;
-
-    // Note: I failed to figure out what does the table "offs09BC" mean.
-    // If anyone has an idea, let me know to zezula_at_volny_dot_cz
-    for(offs_in_rep = 1; offs_in_rep < rep_length; )
-    {
-        if(input_data[offs_in_rep] != input_data[di_val])
-        {
-            di_val = pWork->offs09BC[di_val];
-            if(di_val != 0xFFFF)
-                continue;
-        }
-        pWork->offs09BC[++offs_in_rep] = ++di_val;
-    }
-
-    //
-    // Now go through all the repetitions from the first found one
-    // to the current input data, and check if any of them migh be
-    // a start of a greater sequence match.
-    //
-
-    prev_repetition = pWork->work_buff + phash_offs[0];
-    prev_rep_end = prev_repetition + rep_length;
-    rep_length2 = rep_length;
-
-    for(;;)
-    {
-        rep_length2 = pWork->offs09BC[rep_length2];
-        if(rep_length2 == 0xFFFF)
-            rep_length2 = 0;
-
-        // Get the pointer to the previous repetition
-        phash_offs = pWork->phash_offs + phash_offs_index;
-
-        // Skip those repetitions that don't reach the end
-        // of the first found repetition
-        do
-        {
-            phash_offs++;
-            phash_offs_index++;
-            prev_repetition = pWork->work_buff + *phash_offs;
-            if(prev_repetition >= repetition_limit)
-                return rep_length;
-        }
-        while(prev_repetition + rep_length2 < prev_rep_end);
-
-        // Verify if the last but one byte from the repetition matches
-        // the last but one byte from the input data.
-        // If not, find a next repetition
-        pre_last_byte = input_data[rep_length - 2];
-        if(pre_last_byte == prev_repetition[rep_length - 2])
-        {
-            // If the new repetition reaches beyond the end
-            // of previously found repetition, reset the repetition length to zero.
-            if(prev_repetition + rep_length2 != prev_rep_end)
-            {
-                prev_rep_end = prev_repetition;
-                rep_length2 = 0;
-            }
-        }
-        else
-        {
-            phash_offs = pWork->phash_offs + phash_offs_index;
-            do
-            {
-                phash_offs++;
-                phash_offs_index++;
-                prev_repetition = pWork->work_buff + *phash_offs;
-                if(prev_repetition >= repetition_limit)
-                    return rep_length;
-            }
-            while(prev_repetition[rep_length - 2] != pre_last_byte || prev_repetition[0] != input_data[0]);
-
-            // Reset the length of the repetition to 2 bytes only
-            prev_rep_end = prev_repetition + 2;
-            rep_length2 = 2;
-        }
-
-        // Find out how many more characters are equal to the first repetition.
-        while(*prev_rep_end == input_data[rep_length2])
-        {
-            if(++rep_length2 >= 0x204)
-                break;
-            prev_rep_end++;
-        }
-
-        // Is the newly found repetion at least as long as the previous one ?
-        if(rep_length2 >= rep_length)
-        {
-            // Calculate the distance of the new repetition
-            pWork->distance = (unsigned int)(input_data - prev_repetition - 1);
-            if((rep_length = rep_length2) == 0x204)
-                return rep_length;
-
-            // Update the additional elements in the "offs09BC" table
-            // to reflect new rep length
-            while(offs_in_rep < rep_length2)
-            {
-                if(input_data[offs_in_rep] != input_data[di_val])
-                {
-                    di_val = pWork->offs09BC[di_val];
-                    if(di_val != 0xFFFF)
-                        continue;
-                }
-                pWork->offs09BC[++offs_in_rep] = ++di_val;
-            }
-        }
-    }
-}
-
-static void WriteCmpData(TCmpStruct * pWork)
-{
-    unsigned char * input_data_end;         // Pointer to the end of the input data
-    unsigned char * input_data = pWork->work_buff + pWork->dsize_bytes + 0x204;
-    unsigned int input_data_ended = 0;      // If 1, then all data from the input stream have been already loaded
-    unsigned int save_rep_length;           // Saved length of current repetition
-    unsigned int save_distance = 0;         // Saved distance of current repetition
-    unsigned int rep_length;                // Length of the found repetition
-    unsigned int phase = 0;                 //
-
-    // Store the compression type and dictionary size
-    pWork->out_buff[0] = (char)pWork->ctype;
-    pWork->out_buff[1] = (char)pWork->dsize_bits;
-    pWork->out_bytes = 2;
-
-    // Reset output buffer to zero
-    memset(&pWork->out_buff[2], 0, sizeof(pWork->out_buff) - 2);
-    pWork->out_bits = 0;
-
-    while(input_data_ended == 0)
-    {
-        unsigned int bytes_to_load = 0x1000;
-        int total_loaded = 0;
-        int bytes_loaded;
-
-        // Load the bytes from the input stream, up to 0x1000 bytes
-        while(bytes_to_load != 0)
-        {
-            bytes_loaded = pWork->read_buf((char *)pWork->work_buff + pWork->dsize_bytes + 0x204 + total_loaded,
-                                                  &bytes_to_load,
-                                                   pWork->param);
-            if(bytes_loaded == 0)
-            {
-                if(total_loaded == 0 && phase == 0)
-                    goto __Exit;
-                input_data_ended = 1;
-                break;
-            }
-            else
-            {
-                bytes_to_load -= bytes_loaded;
-                total_loaded += bytes_loaded;
-            }
-        }
-
-        input_data_end = pWork->work_buff + pWork->dsize_bytes + total_loaded;
-        if(input_data_ended)
-            input_data_end += 0x204;
-
-        //
-        // Warning: The end of the buffer passed to "SortBuffer" is actually 2 bytes beyond
-        // valid data. It is questionable if this is actually a bug or not,
-        // but it might cause the compressed data output to be dependent on random bytes
-        // that are in the buffer.
-        // To prevent that, the calling application must always zero the compression
-        // buffer before passing it to "implode"
-        //
-
-        // Search the PAIR_HASHes of the loaded blocks. Also, include
-        // previously compressed data, if any.
-        switch(phase)
-        {
-            case 0:
-                SortBuffer(pWork, input_data, input_data_end + 1);
-                phase++;
-                if(pWork->dsize_bytes != 0x1000)
-                    phase++;
-                break;
-
-            case 1:
-                SortBuffer(pWork, input_data - pWork->dsize_bytes + 0x204, input_data_end + 1);
-                phase++;
-                break;
-
-            default:
-                SortBuffer(pWork, input_data - pWork->dsize_bytes, input_data_end + 1);
-                break;
-        }
-
-        // Perform the compression of the current block
-        while(input_data < input_data_end)
-        {
-            // Find if the current byte sequence wasn't there before.
-            rep_length = FindRep(pWork, input_data);
-            while(rep_length != 0)
-            {
-                // If we found repetition of 2 bytes, that is 0x100 or fuhrter back,
-                // don't bother. Storing the distance of 0x100 bytes would actually
-                // take more space than storing the 2 bytes as-is.
-                if(rep_length == 2 && pWork->distance >= 0x100)
-                    break;
-
-                // When we are at the end of the input data, we cannot allow
-                // the repetition to go past the end of the input data.
-                if(input_data_ended && input_data + rep_length > input_data_end)
-                {
-                    // Shorten the repetition length so that it only covers valid data
-                    rep_length = (unsigned long)(input_data_end - input_data);
-                    if(rep_length < 2)
-                        break;
-
-                    // If we got repetition of 2 bytes, that is 0x100 or more backward, don't bother
-                    if(rep_length == 2 && pWork->distance >= 0x100)
-                        break;
-                    goto __FlushRepetition;
-                }
-
-                if(rep_length >= 8 || input_data + 1 >= input_data_end)
-                    goto __FlushRepetition;
-
-                // Try to find better repetition 1 byte later.
-                // Example: "ARROCKFORT" "AROCKFORT"
-                // When "input_data" points to the second string, FindRep
-                // returns the occurence of "AR". But there is longer repetition "ROCKFORT",
-                // beginning 1 byte after.
-                save_rep_length = rep_length;
-                save_distance = pWork->distance;
-                rep_length = FindRep(pWork, input_data + 1);
-
-                // Only use the new repetition if it's length is greater than the previous one
-                if(rep_length > save_rep_length)
-                {
-                    // If the new repetition if only 1 byte better
-                    // and the previous distance is less than 0x80 bytes, use the previous repetition
-                    if(rep_length > save_rep_length + 1 || save_distance > 0x80)
-                    {
-                        // Flush one byte, so that input_data will point to the secondary repetition
-                        OutputBits(pWork, pWork->nChBits[*input_data], pWork->nChCodes[*input_data]);
-                        input_data++;
-                        continue;
-                    }
-                }
-
-                // Revert to the previous repetition
-                rep_length = save_rep_length;
-                pWork->distance = save_distance;
-
-                __FlushRepetition:
-
-                OutputBits(pWork, pWork->nChBits[rep_length + 0xFE], pWork->nChCodes[rep_length + 0xFE]);
-                if(rep_length == 2)
-                {
-                    OutputBits(pWork, pWork->dist_bits[pWork->distance >> 2],
-                                      pWork->dist_codes[pWork->distance >> 2]);
-                    OutputBits(pWork, 2, pWork->distance & 3);
-                }
-                else
-                {
-                    OutputBits(pWork, pWork->dist_bits[pWork->distance >> pWork->dsize_bits],
-                                      pWork->dist_codes[pWork->distance >> pWork->dsize_bits]);
-                    OutputBits(pWork, pWork->dsize_bits, pWork->dsize_mask & pWork->distance);
-                }
-
-                // Move the begin of the input data by the length of the repetition
-                input_data += rep_length;
-                goto _00402252;
-            }
-
-            // If there was no previous repetition for the current position in the input data,
-            // just output the 9-bit literal for the one character
-            OutputBits(pWork, pWork->nChBits[*input_data], pWork->nChCodes[*input_data]);
-            input_data++;
-_00402252:;
-        }
-
-        if(input_data_ended == 0)
-        {
-            input_data -= 0x1000;
-            memcpy(pWork->work_buff, pWork->work_buff + 0x1000, pWork->dsize_bytes + 0x204);
-        }
-    }
-
-__Exit:
-
-    // Write the termination literal
-    OutputBits(pWork, pWork->nChBits[0x305], pWork->nChCodes[0x305]);
-    if(pWork->out_bits != 0)
-        pWork->out_bytes++;
-    pWork->write_buf(pWork->out_buff, &pWork->out_bytes, pWork->param);
-    return;
-}
-
-//-----------------------------------------------------------------------------
-// Main imploding function
-
-unsigned int PKEXPORT implode(
-    unsigned int (*read_buf)(char *buf, unsigned int *size, void *param),
-    void         (*write_buf)(char *buf, unsigned int *size, void *param),
-    char         *work_buf,
-    void         *param,
-    unsigned int *type,
-    unsigned int *dsize)
-{
-    TCmpStruct * pWork = (TCmpStruct *)work_buf;
-    unsigned int nChCode;
-    unsigned int nCount;
-    unsigned int i;
-    int nCount2;
-
-    // Fill the work buffer information
-    // Note: The caller must zero the "work_buff" before passing it to implode
-    pWork->read_buf    = read_buf;
-    pWork->write_buf   = write_buf;
-    pWork->dsize_bytes = *dsize;
-    pWork->ctype       = *type;
-    pWork->param       = param;
-    pWork->dsize_bits  = 4;
-    pWork->dsize_mask  = 0x0F;
-
-    // Test dictionary size
-    switch(*dsize)
-    {
-        case CMP_IMPLODE_DICT_SIZE3:    // 0x1000 bytes
-            pWork->dsize_bits++;
-            pWork->dsize_mask |= 0x20;
-            // No break here !!!
-
-        case CMP_IMPLODE_DICT_SIZE2:    // 0x800 bytes
-            pWork->dsize_bits++;
-            pWork->dsize_mask |= 0x10;
-            // No break here !!!
-
-        case CMP_IMPLODE_DICT_SIZE1:    // 0x400
-            break;
-
-        default:
-            return CMP_INVALID_DICTSIZE;
-    }
-
-    // Test the compression type
-    switch(*type)
-    {
-        case CMP_BINARY: // We will compress data with binary compression type
-            for(nChCode = 0, nCount = 0; nCount < 0x100; nCount++)
-            {
-                pWork->nChBits[nCount]  = 9;
-                pWork->nChCodes[nCount] = (unsigned short)nChCode;
-                nChCode = (nChCode & 0x0000FFFF) + 2;
-            }
-            break;
-
-
-        case CMP_ASCII: // We will compress data with ASCII compression type
-            for(nCount = 0; nCount < 0x100; nCount++)
-            {
-                pWork->nChBits[nCount]  = (unsigned char )(ChBitsAsc[nCount] + 1);
-                pWork->nChCodes[nCount] = (unsigned short)(ChCodeAsc[nCount] * 2);
-            }
-            break;
-
-        default:
-            return CMP_INVALID_MODE;
-    }
-
-    for(i = 0; i < 0x10; i++)
-    {
-        if(1 << ExLenBits[i])
-        {
-            for(nCount2 = 0; nCount2 < (1 << ExLenBits[i]); nCount2++)
-            {
-                pWork->nChBits[nCount]  = (unsigned char)(ExLenBits[i] + LenBits[i] + 1);
-                pWork->nChCodes[nCount] = (unsigned short)((nCount2 << (LenBits[i] + 1)) | ((LenCode[i] & 0xFFFF00FF) * 2) | 1);
-                nCount++;
-            }
-        }
-    }
-
-    // Copy the distance codes and distance bits and perform the compression
-    memcpy(&pWork->dist_codes, DistCode, sizeof(DistCode));
-    memcpy(&pWork->dist_bits, DistBits, sizeof(DistBits));
-    WriteCmpData(pWork);
-    return CMP_NO_ERROR;
-}
diff --git a/dep/StormLibOld/src/pklib/pklib.h b/dep/StormLibOld/src/pklib/pklib.h
deleted file mode 100644
index eb18049ab..000000000
--- a/dep/StormLibOld/src/pklib/pklib.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*****************************************************************************/
-/* pklib.h                                Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Header file for PKWARE Data Compression Library                           */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 31.03.03  1.00  Lad  The first version of pkware.h                        */
-/*****************************************************************************/
-
-#ifndef __PKLIB_H__
-#define __PKLIB_H__
-
-#include "../StormPort.h"
-
-//-----------------------------------------------------------------------------
-// Defines
-
-#define CMP_BINARY             0            // Binary compression
-#define CMP_ASCII              1            // Ascii compression
-
-#define CMP_NO_ERROR           0
-#define CMP_INVALID_DICTSIZE   1
-#define CMP_INVALID_MODE       2
-#define CMP_BAD_DATA           3
-#define CMP_ABORT              4
-
-#define CMP_IMPLODE_DICT_SIZE1   1024       // Dictionary size of 1024
-#define CMP_IMPLODE_DICT_SIZE2   2048       // Dictionary size of 2048
-#define CMP_IMPLODE_DICT_SIZE3   4096       // Dictionary size of 4096
-
-//-----------------------------------------------------------------------------
-// Define calling convention
-
-#ifndef PKEXPORT
-#ifdef WIN32
-#define PKEXPORT  __cdecl                   // Use for normal __cdecl calling
-#else
-#define PKEXPORT
-#endif
-#endif
-
-//-----------------------------------------------------------------------------
-// Internal structures
-
-// Compression structure
-typedef struct
-{
-    unsigned int   distance;                // 0000: Backward distance of the currently found repetition, decreased by 1
-    unsigned int   out_bytes;               // 0004: # bytes available in out_buff
-    unsigned int   out_bits;                // 0008: # of bits available in the last out byte
-    unsigned int   dsize_bits;              // 000C: Number of bits needed for dictionary size. 4 = 0x400, 5 = 0x800, 6 = 0x1000
-    unsigned int   dsize_mask;              // 0010: Bit mask for dictionary. 0x0F = 0x400, 0x1F = 0x800, 0x3F = 0x1000
-    unsigned int   ctype;                   // 0014: Compression type (CMP_ASCII or CMP_BINARY)
-    unsigned int   dsize_bytes;             // 0018: Dictionary size in bytes
-    unsigned char  dist_bits[0x40];         // 001C: Distance bits
-    unsigned char  dist_codes[0x40];        // 005C: Distance codes
-    unsigned char  nChBits[0x306];          // 009C: Table of literal bit lengths to be put to the output stream
-    unsigned short nChCodes[0x306];         // 03A2: Table of literal codes to be put to the output stream
-    unsigned short offs09AE;                // 09AE:
-
-    void         * param;                   // 09B0: User parameter
-    unsigned int (*read_buf)(char *buf, unsigned int *size, void *param);  // 9B4
-    void         (*write_buf)(char *buf, unsigned int *size, void *param); // 9B8
-
-    unsigned short offs09BC[0x204];         // 09BC:
-    unsigned long  offs0DC4;                // 0DC4:
-    unsigned short phash_to_index[0x900];   // 0DC8: Array of indexes (one for each PAIR_HASH) to the "pair_hash_offsets" table
-    unsigned short phash_to_index_end;      // 1FC8: End marker for "phash_to_index" table
-    char           out_buff[0x802];         // 1FCA: Compressed data
-    unsigned char  work_buff[0x2204];       // 27CC: Work buffer
-                                            //  + DICT_OFFSET  => Dictionary
-                                            //  + UNCMP_OFFSET => Uncompressed data
-    unsigned short phash_offs[0x2204];      // 49D0: Table of offsets for each PAIR_HASH
-} TCmpStruct;
-
-#define CMP_BUFFER_SIZE  sizeof(TCmpStruct) // Size of compression structure.
-                                            // Defined as 36312 in pkware header file
-
-
-// Decompression structure
-typedef struct
-{
-    unsigned long offs0000;                 // 0000
-    unsigned long ctype;                    // 0004: Compression type (CMP_BINARY or CMP_ASCII)
-    unsigned long outputPos;                // 0008: Position in output buffer
-    unsigned long dsize_bits;               // 000C: Dict size (4, 5, 6 for 0x400, 0x800, 0x1000)
-    unsigned long dsize_mask;               // 0010: Dict size bitmask (0x0F, 0x1F, 0x3F for 0x400, 0x800, 0x1000)
-    unsigned long bit_buff;                 // 0014: 16-bit buffer for processing input data
-    unsigned long extra_bits;               // 0018: Number of extra (above 8) bits in bit buffer
-    unsigned int  in_pos;                   // 001C: Position in in_buff
-    unsigned long in_bytes;                 // 0020: Number of bytes in input buffer
-    void        * param;                    // 0024: Custom parameter
-    unsigned int (*read_buf)(char *buf, unsigned int *size, void *param); // Pointer to function that reads data from the input stream
-    void         (*write_buf)(char *buf, unsigned int *size, void *param);// Pointer to function that writes data to the output stream
-
-    unsigned char out_buff[0x2204];         // 0030: Output circle buffer.
-                                            //       0x0000 - 0x0FFF: Previous uncompressed data, kept for repetitions
-                                            //       0x1000 - 0x1FFF: Currently decompressed data
-                                            //       0x2000 - 0x2203: Reserve space for the longest possible repetition
-    unsigned char in_buff[0x800];           // 2234: Buffer for data to be decompressed
-    unsigned char DistPosCodes[0x100];      // 2A34: Table of distance position codes
-    unsigned char LengthCodes[0x100];       // 2B34: Table of length codes
-    unsigned char offs2C34[0x100];          // 2C34: Buffer for
-    unsigned char offs2D34[0x100];          // 2D34: Buffer for
-    unsigned char offs2E34[0x80];           // 2EB4: Buffer for
-    unsigned char offs2EB4[0x100];          // 2EB4: Buffer for
-    unsigned char ChBitsAsc[0x100];         // 2FB4: Buffer for
-    unsigned char DistBits[0x40];           // 30B4: Numbers of bytes to skip copied block length
-    unsigned char LenBits[0x10];            // 30F4: Numbers of bits for skip copied block length
-    unsigned char ExLenBits[0x10];          // 3104: Number of valid bits for copied block
-    unsigned short LenBase[0x10];           // 3114: Buffer for
-} TDcmpStruct;
-
-#define EXP_BUFFER_SIZE sizeof(TDcmpStruct) // Size of decompression structure
-                                            // Defined as 12596 in pkware headers
-
-//-----------------------------------------------------------------------------
-// Public functions
-
-#ifdef __cplusplus
-   extern "C" {
-#endif
-
-unsigned int PKEXPORT implode(
-   unsigned int (*read_buf)(char *buf, unsigned int *size, void *param),
-   void         (*write_buf)(char *buf, unsigned int *size, void *param),
-   char         *work_buf,
-   void         *param,
-   unsigned int *type,
-   unsigned int *dsize);
-
-
-unsigned int PKEXPORT explode(
-   unsigned int (*read_buf)(char *buf, unsigned  int *size, void *param),
-   void         (*write_buf)(char *buf, unsigned  int *size, void *param),
-   char         *work_buf,
-   void         *param);
-
-// The original name "crc32" was changed to "crc32pk" due
-// to compatibility with zlib
-unsigned long PKEXPORT crc32_pklib(char *buffer, unsigned int *size, unsigned long *old_crc);
-
-#ifdef __cplusplus
-   }                         // End of 'extern "C"' declaration
-#endif
-
-#endif // __PKLIB_H__
diff --git a/dep/StormLibOld/src/sparse/sparse.cpp b/dep/StormLibOld/src/sparse/sparse.cpp
deleted file mode 100644
index 96f2efd70..000000000
--- a/dep/StormLibOld/src/sparse/sparse.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-/*****************************************************************************/
-/* huffman.cpp                       Copyright (c) Ladislav Zezula 1998-2003 */
-/*---------------------------------------------------------------------------*/
-/* This module contains Huffmann (de)compression methods                     */
-/*                                                                           */
-/* Authors : Ladislav Zezula (ladik.zezula.net)                              */
-/*           ShadowFlare     (BlakFlare@hotmail.com)                         */
-/*                                                                           */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* xx.xx.xx  1.00  Lad  The first version of dcmp.cpp                        */
-/* 03.05.03  1.00  Lad  Added compression methods                            */
-/* 19.11.03  1.01  Dan  Big endian handling                                  */
-/* 08.12.03  2.01  Dan  High-memory handling (> 0x80000000)                  */
-/*****************************************************************************/
-
-#include <assert.h>
-#include <string.h>
-
-#include "sparse.h"
-
-//-----------------------------------------------------------------------------
-// Public functions
-
-void CompressSparse(unsigned char * pbOutBuffer, int * pcbOutBuffer, unsigned char * pbInBuffer, int cbInBuffer)
-{
-    unsigned char * pbOutBufferEnd = pbOutBuffer + *pcbOutBuffer;
-    unsigned char * pbInBufferEnd = pbInBuffer + cbInBuffer;
-    unsigned char * pbLastNonZero = pbInBuffer;
-    unsigned char * pbOutBuffer0 = pbOutBuffer;
-    unsigned char * pbInBuffPtr = pbInBuffer;
-    size_t NumberOfNonZeros;
-    size_t NumberOfZeros;
-
-    // There must be at least 4 bytes of free space in the output buffer now
-    if((pbInBuffer + 4) >= pbInBufferEnd)
-        return;
-
-    // Put the original data length (in little endian)
-    *pbOutBuffer++ = (unsigned char)(cbInBuffer >> 0x18);
-    *pbOutBuffer++ = (unsigned char)(cbInBuffer >> 0x10);
-    *pbOutBuffer++ = (unsigned char)(cbInBuffer >> 0x08);
-    *pbOutBuffer++ = (unsigned char)(cbInBuffer >> 0x00);
-
-    // If there is at least 3 bytes in the input buffer, do this loop
-    while(pbInBuffer < (pbInBufferEnd - 3))
-    {
-        // Reset the zero count and frontal pointer
-        pbLastNonZero = pbInBuffer;
-        pbInBuffPtr   = pbInBuffer;
-        NumberOfZeros = 0;
-
-        if(pbInBuffPtr < pbInBufferEnd)
-        {
-            do
-            {
-                // Count number of zeros
-                if(*pbInBuffPtr == 0)
-                {
-                    NumberOfZeros++;
-                }
-                else
-                {
-                    // Were there at least 3 zeros before? If yes, we need to flush the data
-                    if(NumberOfZeros >= 3)
-                        break;
-                    pbLastNonZero = pbInBuffPtr + 1;
-                    NumberOfZeros = 0;
-                }
-            }
-            while(++pbInBuffPtr < pbInBufferEnd);
-        }
-
-        // Get number of nonzeros that we found so far and flush them
-        NumberOfNonZeros = pbLastNonZero - pbInBuffer;
-        if(NumberOfNonZeros != 0)
-        {
-            // Process blocks that are longer than 0x81 nonzero bytes
-            while(NumberOfNonZeros > 0x81)
-            {
-                // Verify if we still have enough space in output buffer
-                if((pbOutBuffer + 0x81) >= pbOutBufferEnd)
-                    return;
-
-                // Put marker that means "0x80 of nonzeros"
-                *pbOutBuffer++ = 0xFF;
-                memcpy(pbOutBuffer, pbInBuffer, 0x80);
-
-                // Adjust counter of nonzeros and both pointers
-                NumberOfNonZeros -= 0x80;
-                pbOutBuffer += 0x80;
-                pbInBuffer += 0x80;
-            }
-
-            // BUGBUG: The following code will be triggered if the NumberOfNonZeros
-            // was 0x81 before. It will copy just one byte. This seems like a bug to me,
-            // but since I want StormLib to be exact like Blizzard code is, I will keep
-            // it that way here
-            if(NumberOfNonZeros > 0x80)
-            {
-                // Verify if we still have enough space in output buffer
-                if((pbOutBuffer + 2) >= pbOutBufferEnd)
-                    return;
-
-                // Put marker that means "1 nonzero byte"
-                *pbOutBuffer++ = 0x80;
-                memcpy(pbOutBuffer, pbInBuffer, 1);
-
-                // Adjust counter of nonzeros and both pointers
-                NumberOfNonZeros--;
-                pbOutBuffer++;
-                pbInBuffer++;
-            }
-
-            // If there is 1 nonzero or more, put the block
-            if(NumberOfNonZeros >= 0x01)
-            {
-                // Verify if we still have enough space in output buffer
-                if((pbOutBuffer + NumberOfNonZeros + 1) >= pbOutBufferEnd)
-                    return;
-
-                // Put marker that means "Several nonzero bytes"
-                *pbOutBuffer++ = (unsigned char)(0x80 | (NumberOfNonZeros - 1));
-                memcpy(pbOutBuffer, pbInBuffer, NumberOfNonZeros);
-
-                // Adjust pointers
-                pbOutBuffer += NumberOfNonZeros;
-                pbInBuffer += NumberOfNonZeros;
-            }
-            else
-            {
-                // Verify if we still have enough space in output buffer
-                if((pbOutBuffer + 2) >= pbOutBufferEnd)
-                    return;
-
-                // Put marker that means "1 nonzero byte"
-                *pbOutBuffer++ = 0x80;
-                memcpy(pbOutBuffer, pbInBuffer, 1);
-
-                // Adjust pointers
-                pbOutBuffer++;
-                pbInBuffer++;
-            }
-        }
-
-        // Now flush all zero bytes
-        while(NumberOfZeros > 0x85)
-        {
-            // Do we have at least 2 bytes in the output buffer ?
-            if((pbOutBuffer + 1) >= pbOutBufferEnd)
-                return;
-
-            // Put marker that means "0x82 zeros"
-            *pbOutBuffer++ = 0x7F;
-
-            // Adjust zero counter and input pointer
-            NumberOfZeros -= 0x82;
-            pbInBuffer += 0x82;
-        }
-
-        // If we got more than 0x82 zeros, flush 3 of them now
-        if(NumberOfZeros > 0x82)
-        {
-            // Do we have at least 2 bytes in the output buffer ?
-            if((pbOutBuffer + 1) >= pbOutBufferEnd)
-                return;
-
-            // Put marker that means "0x03 zeros"
-            *pbOutBuffer++ = 0;
-
-            // Adjust zero counter and input pointer
-            NumberOfZeros -= 0x03;
-            pbInBuffer += 0x03;
-        }
-
-        // Is there at least three zeros ?
-        if(NumberOfZeros >= 3)
-        {
-            // Do we have at least 2 bytes in the output buffer ?
-            if((pbOutBuffer + 1) >= pbOutBufferEnd)
-                return;
-
-            // Put marker that means "Several zeros"
-            *pbOutBuffer++ = (unsigned char)(NumberOfZeros - 3);
-
-            // Adjust pointer
-            pbInBuffer += NumberOfZeros;
-        }
-    }
-
-    // Flush last three bytes
-    if(pbInBuffer < pbInBufferEnd)
-    {
-        pbInBuffPtr = pbInBuffer;
-
-        for(;;)
-        {
-            if(*pbInBuffPtr++ != 0)
-            {
-                // Get number of bytes remaining
-                NumberOfNonZeros = (pbInBufferEnd - pbInBuffer);
-
-                // Not enough space in the output buffer ==> exit
-                if((pbOutBuffer + NumberOfNonZeros + 1) >= pbOutBufferEnd)
-                    return;
-
-                // Terminate with a marker that means "0x80 of nonzeros"
-                *pbOutBuffer++ = 0xFF;
-                memcpy(pbOutBuffer, pbInBuffer, NumberOfNonZeros);
-
-                // Adjust pointer
-                pbOutBuffer += NumberOfNonZeros;
-                break;
-            }
-            else
-            {
-                // Is there are more chars in the input buffer
-                if(pbInBuffPtr < pbInBufferEnd)
-                    continue;
-
-                // If the compression will not compress it by even 1 byte, do nothing
-                if((pbOutBuffer + 1) >= pbOutBufferEnd)
-                    return;
-
-                // Terminate with a chunk that means "0x82 of zeros"
-                *pbOutBuffer++ = 0x7F;
-                break;
-            }
-        }
-    }
-
-    // Out the length of the output buffer
-    *pcbOutBuffer = (int)(pbOutBuffer - pbOutBuffer0);
-}
-
-int DecompressSparse(unsigned char * pbOutBuffer, int * pcbOutBuffer, unsigned char * pbInBuffer, int cbInBuffer)
-{
-    unsigned char * pbInBufferEnd = pbInBuffer + cbInBuffer;
-    unsigned int cbChunkSize;
-    unsigned int cbOutBuffer = 0;
-    unsigned int OneByte;
-
-    // Don't decompress anything that is shorter than 5 bytes
-    if(cbInBuffer < 5)
-        return 0;
-
-    // Get the 32-bits from the input stream
-    OneByte = *pbInBuffer++;
-    cbOutBuffer |= (OneByte << 0x18);
-    OneByte = *pbInBuffer++;
-    cbOutBuffer |= (OneByte << 0x10);
-    OneByte = *pbInBuffer++;
-    cbOutBuffer |= (OneByte << 0x08);
-    OneByte = *pbInBuffer++;
-    cbOutBuffer |= (OneByte << 0x00);
-
-    // Verify the size of the stream against the output buffer size
-    if(cbOutBuffer > *pcbOutBuffer)
-        return 0;
-
-    // Put the output size to the buffer
-    *pcbOutBuffer = cbOutBuffer;
-
-    // Process the input buffer
-    while(pbInBuffer < pbInBufferEnd)
-    {
-        // Get (next) byte from the stream
-        OneByte = *pbInBuffer++;
-
-        // If highest bit, it means that that normal data follow
-        if(OneByte & 0x80)
-        {
-            cbChunkSize = (OneByte & 0x7F) + 1;
-            cbChunkSize = (cbChunkSize < cbOutBuffer) ? cbChunkSize : cbOutBuffer;
-            memcpy(pbOutBuffer, pbInBuffer, cbChunkSize);
-            pbInBuffer += cbChunkSize;
-        }
-        else
-        {
-            cbChunkSize = (OneByte & 0x7F) + 3;
-            cbChunkSize = (cbChunkSize < cbOutBuffer) ? cbChunkSize : cbOutBuffer;
-            memset(pbOutBuffer, 0, cbChunkSize);
-        }
-
-        // Increment output buffer pointer
-        pbOutBuffer += cbChunkSize;
-        cbOutBuffer -= cbChunkSize;
-    }
-
-    return 1;
-}
diff --git a/dep/StormLibOld/src/sparse/sparse.h b/dep/StormLibOld/src/sparse/sparse.h
deleted file mode 100644
index 032395f0b..000000000
--- a/dep/StormLibOld/src/sparse/sparse.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*****************************************************************************/
-/* sparse.h                               Copyright (c) Ladislav Zezula 2010 */
-/*---------------------------------------------------------------------------*/
-/* implementation of Sparse compression, used in Starcraft II                */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 05.03.10  1.00  Lad  The first version of sparse.h                        */
-/*****************************************************************************/
-
-#ifndef __SPARSE_H__
-#define __SPARSE_H__
-
-#include "../StormPort.h"
-
-void CompressSparse(unsigned char * pbOutBuffer, int * pcbOutLength, unsigned char * pbInBuffer, int cbInLength);
-int  DecompressSparse(unsigned char * pbOutBuffer, int * pcbOutLength, unsigned char * pbInBuffer, int cbInLength);
-
-#endif // __SPARSE_H__
diff --git a/dep/StormLibOld/storm_dll/storm_dll.cpp b/dep/StormLibOld/storm_dll/storm_dll.cpp
deleted file mode 100644
index 2941f2a37..000000000
--- a/dep/StormLibOld/storm_dll/storm_dll.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************/
-/* Storm.cpp                              Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* This is just a dummy module for building import library for Storm.dll     */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 11.04.03  1.00  Lad  The first version of Storm.cpp                       */
-/*****************************************************************************/
-
-#include <windows.h>
-
-#define BUILDING_STORM_CPP
-#define STORM_ALTERNATE_NAMES
-#include "storm_dll.h"
-
-BOOL WINAPI SFILE(OpenArchive)(LPCSTR lpFileName, DWORD dwPriority, DWORD dwFlags, HANDLE *hMPQ)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SFILE(CloseArchive)(HANDLE hMPQ)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SFILE(GetArchiveName)(HANDLE hMPQ, LPCSTR lpBuffer, DWORD dwBufferLength)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SFILE(OpenFile)(LPCSTR lpFileName, HANDLE *hFile)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SFILE(OpenFileEx)(HANDLE hMPQ, LPCSTR lpFileName, DWORD dwSearchScope, HANDLE *hFile)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SFILE(CloseFile)(HANDLE hFile)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-DWORD WINAPI SFILE(GetFileSize)(HANDLE hFile, LPDWORD lpFileSizeHigh)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SFILE(GetFileArchive)(HANDLE hFile, HANDLE *hMPQ)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SFILE(GetFileName)(HANDLE hFile, LPCSTR lpBuffer, DWORD dwBufferLength)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-DWORD WINAPI SFILE(SetFilePointer)(HANDLE hFile, long lDistanceToMove, PLONG lplDistanceToMoveHigh, DWORD dwMoveMethod)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SFILE(ReadFile)(HANDLE hFile,LPVOID lpBuffer,DWORD nNumberOfBytesToRead,LPDWORD lpNumberOfBytesRead,LPOVERLAPPED lpOverlapped)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-LCID WINAPI SFILE(SetLocale)(LCID nNewLocale)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SFILE(GetBasePath)(LPCSTR lpBuffer, DWORD dwBufferLength)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SFILE(SetBasePath)(LPCSTR lpNewBasePath)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SFILE(Destroy)()
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SCOMP(Compress)(char * pbOutBuffer, int * pdwOutLength, char * pbInBuffer, int dwInLength, int uCmp, int uCmpType, int nCmpLevel)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-BOOL WINAPI SCOMP(Decompress)(char * pbOutBuffer, int * pdwOutLength, char * pbInBuffer, int dwInLength)
-{
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
diff --git a/dep/StormLibOld/storm_dll/storm_dll.def b/dep/StormLibOld/storm_dll/storm_dll.def
deleted file mode 100644
index bdc7ce76e..000000000
--- a/dep/StormLibOld/storm_dll/storm_dll.def
+++ /dev/null
@@ -1,24 +0,0 @@
-; Storm definition file with alternate Storm.dll names
-LIBRARY      "Storm"
-
-EXPORTS
-    StormCloseArchive      @252      ; 0x0FC
-    StormCloseFile         @253      ; 0x0FD
-    StormDestroy           @262      ; 0x106
-    StormGetFileArchive    @264      ; 0x108
-    StormGetFileSize       @265      ; 0x109
-    StormOpenArchive       @266      ; 0x10A
-    StormOpenFile          @267      ; 0x10B
-    StormOpenFileEx        @268      ; 0x10C
-    StormReadFile          @269      ; 0x10D
-    StormSetBasePath       @270      ; 0x10E
-    StormSetFilePointer    @271      ; 0x10F
-    StormSetLocale         @272      ; 0x110
-    StormGetBasePath       @273      ; 0x111
-    StormGetArchiveName    @275      ; 0x113
-    StormGetFileName       @276      ; 0x114
-
-;   StormSetLastError      @465      ; 0x
-
-    StormCompress          @551      ; 0x227
-    StormDecompress        @552      ; 0x228
diff --git a/dep/StormLibOld/storm_dll/storm_dll.h b/dep/StormLibOld/storm_dll/storm_dll.h
deleted file mode 100644
index 6d67820a2..000000000
--- a/dep/StormLibOld/storm_dll/storm_dll.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************/
-/* Storm.h                           Copyright Justin Olbrantz(Quantam) 2000 */
-/*---------------------------------------------------------------------------*/
-/* Storm Interface Library v1.0 for Windows                                  */
-/*                                                                           */
-/* Author : Justin Olbrantz(Quantam)                                         */
-/* E-mail : omega@dragonfire.net                                             */
-/* WWW    : www.campaigncreations.com/starcraft/mpq2k/inside_mopaq/          */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* xx.xx.00  1.00  Qua  The first version of Storm.h                         */
-/* 11.04.03  1.00  Lad  Added some functions                                 */
-/*****************************************************************************/
-
-// We need the Windows data types for the Storm prototypes
-#include <windows.h>
-
-#ifndef __STORM_H__
-#define __STORM_H__
-
-// Somethimes is necessary to change the function names so they
-// will not conflict with other MPQ tools.
-#ifdef STORM_ALTERNATE_NAMES
-  #define SFILE(Name) Storm##Name
-  #define SCOMP(Name) Storm##Name
-#else
-  #define SFILE(Name) SFile##Name
-  #define SCOMP(Name) SComp##Name
-#endif
-
-
-// Just in case anyone is still using C out there
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Storm file function prototypes
-BOOL  WINAPI SFILE(OpenArchive)(LPCSTR lpFileName, DWORD dwPriority, DWORD dwFlags, HANDLE *hMPQ);
-BOOL  WINAPI SFILE(CloseArchive)(HANDLE hMPQ);
-BOOL  WINAPI SFILE(GetArchiveName)(HANDLE hMPQ, LPCSTR lpBuffer, DWORD dwBufferLength);
-BOOL  WINAPI SFILE(OpenFile)(LPCSTR lpFileName, HANDLE *hFile);
-BOOL  WINAPI SFILE(OpenFileEx)(HANDLE hMPQ, LPCSTR lpFileName, DWORD dwSearchScope, HANDLE *hFile);
-BOOL  WINAPI SFILE(CloseFile)(HANDLE hFile);
-DWORD WINAPI SFILE(GetFileSize)(HANDLE hFile, LPDWORD lpFileSizeHigh);
-BOOL  WINAPI SFILE(GetFileArchive)(HANDLE hFile, HANDLE *hMPQ);
-BOOL  WINAPI SFILE(GetFileName)(HANDLE hFile, LPCSTR lpBuffer, DWORD dwBufferLength);
-DWORD WINAPI SFILE(SetFilePointer)(HANDLE hFile, long lDistanceToMove, PLONG lplDistanceToMoveHigh, DWORD dwMoveMethod);
-BOOL  WINAPI SFILE(ReadFile)(HANDLE hFile,LPVOID lpBuffer,DWORD nNumberOfBytesToRead,LPDWORD lpNumberOfBytesRead,LPOVERLAPPED lpOverlapped);
-LCID  WINAPI SFILE(SetLocale)(LCID nNewLocale);
-BOOL  WINAPI SFILE(GetBasePath)(LPCSTR lpBuffer, DWORD dwBufferLength);
-BOOL  WINAPI SFILE(SetBasePath)(LPCSTR lpNewBasePath);
-
-// Storm (de)compression functions
-BOOL  WINAPI SCOMP(Compress)  (char * pbOutBuffer, int * pdwOutLength, char * pbInBuffer, int dwInLength, int uCmp, int uCmpType, int nCmpLevel);
-BOOL  WINAPI SCOMP(Decompress)(char * pbOutBuffer, int * pdwOutLength, char * pbInBuffer, int dwInLength);
-
-
-#if defined(_MSC_VER) && !defined(BUILDING_STORM_CPP)
-#pragma comment(lib, "Storm.lib")    // Force linking Storm.lib and thus Storm.dll
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __STORM_H__
diff --git a/dep/StormLibOld/stormlib_dll/DllMain.c b/dep/StormLibOld/stormlib_dll/DllMain.c
deleted file mode 100644
index d5ef37fc1..000000000
--- a/dep/StormLibOld/stormlib_dll/DllMain.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************/
-/* DllMain.c                              Copyright (c) Ladislav Zezula 2006 */
-/*---------------------------------------------------------------------------*/
-/* Description: DllMain for the StormLib.dll library                         */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 23.11.06  1.00  Lad  The first version of DllMain.c                       */
-/*****************************************************************************/
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-//-----------------------------------------------------------------------------
-// DllMain
-
-DWORD WINAPI DllMain(HINSTANCE hInst, DWORD dwReason, LPVOID lpReserved)
-{
-    UNREFERENCED_PARAMETER(hInst);
-    UNREFERENCED_PARAMETER(dwReason);
-    UNREFERENCED_PARAMETER(lpReserved);
-
-    return TRUE;
-}
diff --git a/dep/StormLibOld/stormlib_dll/StormLib.def b/dep/StormLibOld/stormlib_dll/StormLib.def
deleted file mode 100644
index 61da13dc0..000000000
--- a/dep/StormLibOld/stormlib_dll/StormLib.def
+++ /dev/null
@@ -1,76 +0,0 @@
-;
-; Export file for Windows
-; Copyright (c) 2007-2010 Ladislav Zezula
-; ladik@zezula.net
-;
-
-LIBRARY StormLib.dll
-
-EXPORTS
-
-    SFileSetLocale
-    SFileGetLocale
-
-    SFileOpenArchive
-    SFileCreateArchive
-    SFileGetArchiveBitmap
-    SFileFlushArchive
-    SFileCloseArchive
-
-    SFileAddListFile
-
-    SFileSetCompactCallback
-    SFileCompactArchive
-
-    SFileGetMaxFileCount
-    SFileSetMaxFileCount
-
-    SFileGetAttributes
-    SFileSetAttributes
-    SFileUpdateFileAttributes
-
-    SFileOpenPatchArchive
-    SFileIsPatchedArchive
-
-    SFileOpenFileEx
-    SFileGetFileSize
-    SFileSetFilePointer
-    SFileReadFile
-    SFileCloseFile
-
-    SFileHasFile
-    SFileGetFileName
-    SFileGetFileInfo
-
-    SFileExtractFile
-
-    SFileVerifyFile
-    SFileVerifyRawData
-    SFileVerifyArchive
-
-    SFileFindFirstFile
-    SFileFindNextFile
-    SFileFindClose
-
-    SListFileFindFirstFile
-    SListFileFindNextFile
-    SListFileFindClose
-
-    SFileEnumLocales
-
-    SFileCreateFile
-    SFileWriteFile
-    SFileFinishFile
-    SFileAddFileEx
-    SFileAddFile
-    SFileAddWave
-    SFileRemoveFile
-    SFileRenameFile
-    SFileSetFileLocale
-    SFileSetDataCompression
-    SFileSetAddFileCallback
-
-    SCompImplode
-    SCompExplode
-    SCompCompress
-    SCompDecompress
diff --git a/dep/StormLibOld/stormlib_dll/StormLib.exp b/dep/StormLibOld/stormlib_dll/StormLib.exp
deleted file mode 100644
index eea00023a..000000000
--- a/dep/StormLibOld/stormlib_dll/StormLib.exp
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Export file for Mac OS X
-# Copyright (c) 2009 Sam Wilkins
-# swilkins1337@gmail.com
-#
-
-_SFileSetLocale
-_SFileGetLocale
-
-_SFileOpenArchive
-_SFileCreateArchive
-_SFileGetArchiveBitmap
-_SFileFlushArchive
-_SFileCloseArchive
-
-_SFileAddListFile
-
-_SFileSetCompactCallback
-_SFileCompactArchive
-
-_SFileGetMaxFileCount
-_SFileSetMaxFileCount
-
-_SFileGetAttributes
-_SFileSetAttributes
-_SFileUpdateFileAttributes
-
-_SFileOpenPatchArchive
-_SFileIsPatchedArchive
-
-_SFileOpenFileEx
-_SFileGetFileSize
-_SFileSetFilePointer
-_SFileReadFile
-_SFileCloseFile
-
-_SFileHasFile
-_SFileGetFileName
-_SFileGetFileInfo
-
-_SFileExtractFile
-
-_SFileVerifyFile
-_SFileVerifyRawData
-_SFileVerifyArchive
-
-_SFileFindFirstFile
-_SFileFindNextFile
-_SFileFindClose
-
-_SListFileFindFirstFile
-_SListFileFindNextFile
-_SListFileFindClose
-
-_SFileEnumLocales
-
-_SFileCreateFile
-_SFileWriteFile
-_SFileFinishFile
-_SFileAddFileEx
-_SFileAddFile
-_SFileAddWave
-_SFileRemoveFile
-_SFileRenameFile
-_SFileSetFileLocale
-_SFileSetDataCompression
-_SFileSetAddFileCallback
-
-_SCompImplode
-_SCompExplode
-_SCompCompress
-_SCompDecompress
-
-_SetLastError
-_GetLastError
diff --git a/dep/StormLibOld/test/Test.cpp b/dep/StormLibOld/test/Test.cpp
deleted file mode 100644
index 353ab7337..000000000
--- a/dep/StormLibOld/test/Test.cpp
+++ /dev/null
@@ -1,1899 +0,0 @@
-/*****************************************************************************/
-/* StormLibTest.cpp                       Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* Test module for StormLib                                                  */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 25.03.03  1.00  Lad  The first version of StormLibTest.cpp                */
-/*****************************************************************************/
-
-#define _CRT_SECURE_NO_DEPRECATE
-#define __INCLUDE_CRYPTOGRAPHY__
-#define __STORMLIB_SELF__                   // Don't use StormLib.lib
-#include <stdio.h>
-
-#ifdef _MSC_VER
-#include <crtdbg.h>
-#endif
-
-#include "../src/StormLib.h"
-#include "../src/StormCommon.h"
-
-#ifdef _MSC_VER
-#pragma warning(disable: 4505)              // 'XXX' : unreferenced local function has been removed
-#endif
-
-//------------------------------------------------------------------------------
-// Defines
-
-#ifdef PLATFORM_WINDOWS
-#define WORK_PATH_ROOT "C:\\Multimedia\\MPQs\\"
-#endif
-
-#ifdef PLATFORM_LINUX
-#define WORK_PATH_ROOT "/home/user/MPQs/"
-#endif
-
-#ifdef PLATFORM_MAC
-#define WORK_PATH_ROOT "/Users/sam/StormLib/test"
-#endif
-
-#ifndef LANG_CZECH
-#define LANG_CZECH 0x0405
-#endif
-
-#define MPQ_SECTOR_SIZE 0x1000
-
-#define MAKE_PATH(path) _T(WORK_PATH_ROOT) _T(path)
-
-// Unicode MPQ names
-/* Czech    */ static const wchar_t szUnicodeName1[] = {0x010C, 0x0065, 0x0073, 0x006B, 0x00FD, _T('.'), _T('m'), _T('p'), _T('q'), 0};
-/* Russian  */ static const wchar_t szUnicodeName2[] = {0x0420, 0x0443, 0x0441, 0x0441, 0x043A, 0x0438, 0x0439, _T('.'), _T('m'), _T('p'), _T('q'), 0};
-/* Greece   */ static const wchar_t szUnicodeName3[] = {0x03B5, 0x03BB, 0x03BB, 0x03B7, 0x03BD, 0x03B9, 0x03BA, 0x03AC, _T('.'), _T('m'), _T('p'), _T('q'), 0};
-/* Chinese  */ static const wchar_t szUnicodeName4[] = {0x65E5, 0x672C, 0x8A9E, _T('.'), _T('m'), _T('p'), _T('q'), 0};
-/* Japanese */ static const wchar_t szUnicodeName5[] = {0x7B80, 0x4F53, 0x4E2D, 0x6587, _T('.'), _T('m'), _T('p'), _T('q'), 0};
-/* Arabic */   static const wchar_t szUnicodeName6[] = {0x0627, 0x0644, 0x0639, 0x0639, 0x0631, 0x0628, 0x064A, 0x0629, _T('.'), _T('m'), _T('p'), _T('q'), 0};
-
-//-----------------------------------------------------------------------------
-// Constants
-
-static const TCHAR * szWorkDir = MAKE_PATH("Work");
-
-static unsigned int AddFlags[] =
-{
-//  Compression          Encryption             Fixed key           Single Unit            Sector CRC
-    0                 |  0                   |  0                 | 0                    | 0,
-    0                 |  MPQ_FILE_ENCRYPTED  |  0                 | 0                    | 0,
-    0                 |  MPQ_FILE_ENCRYPTED  |  MPQ_FILE_FIX_KEY  | 0                    | 0,
-    0                 |  0                   |  0                 | MPQ_FILE_SINGLE_UNIT | 0,
-    0                 |  MPQ_FILE_ENCRYPTED  |  0                 | MPQ_FILE_SINGLE_UNIT | 0,
-    0                 |  MPQ_FILE_ENCRYPTED  |  MPQ_FILE_FIX_KEY  | MPQ_FILE_SINGLE_UNIT | 0,
-    MPQ_FILE_IMPLODE  |  0                   |  0                 | 0                    | 0,
-    MPQ_FILE_IMPLODE  |  MPQ_FILE_ENCRYPTED  |  0                 | 0                    | 0,
-    MPQ_FILE_IMPLODE  |  MPQ_FILE_ENCRYPTED  |  MPQ_FILE_FIX_KEY  | 0                    | 0,
-    MPQ_FILE_IMPLODE  |  0                   |  0                 | MPQ_FILE_SINGLE_UNIT | 0,
-    MPQ_FILE_IMPLODE  |  MPQ_FILE_ENCRYPTED  |  0                 | MPQ_FILE_SINGLE_UNIT | 0,
-    MPQ_FILE_IMPLODE  |  MPQ_FILE_ENCRYPTED  |  MPQ_FILE_FIX_KEY  | MPQ_FILE_SINGLE_UNIT | 0,
-    MPQ_FILE_IMPLODE  |  0                   |  0                 | 0                    | MPQ_FILE_SECTOR_CRC,
-    MPQ_FILE_IMPLODE  |  MPQ_FILE_ENCRYPTED  |  0                 | 0                    | MPQ_FILE_SECTOR_CRC,
-    MPQ_FILE_IMPLODE  |  MPQ_FILE_ENCRYPTED  |  MPQ_FILE_FIX_KEY  | 0                    | MPQ_FILE_SECTOR_CRC,
-    MPQ_FILE_COMPRESS |  0                   |  0                 | 0                    | 0,
-    MPQ_FILE_COMPRESS |  MPQ_FILE_ENCRYPTED  |  0                 | 0                    | 0,
-    MPQ_FILE_COMPRESS |  MPQ_FILE_ENCRYPTED  |  MPQ_FILE_FIX_KEY  | 0                    | 0,
-    MPQ_FILE_COMPRESS |  0                   |  0                 | MPQ_FILE_SINGLE_UNIT | 0,
-    MPQ_FILE_COMPRESS |  MPQ_FILE_ENCRYPTED  |  0                 | MPQ_FILE_SINGLE_UNIT | 0,
-    MPQ_FILE_COMPRESS |  MPQ_FILE_ENCRYPTED  |  MPQ_FILE_FIX_KEY  | MPQ_FILE_SINGLE_UNIT | 0,
-    MPQ_FILE_COMPRESS |  0                   |  0                 | 0                    | MPQ_FILE_SECTOR_CRC,
-    MPQ_FILE_COMPRESS |  MPQ_FILE_ENCRYPTED  |  0                 | 0                    | MPQ_FILE_SECTOR_CRC,
-    MPQ_FILE_COMPRESS |  MPQ_FILE_ENCRYPTED  |  MPQ_FILE_FIX_KEY  | 0                    | MPQ_FILE_SECTOR_CRC,
-    0xFFFFFFFF
-};
-
-//-----------------------------------------------------------------------------
-// Local testing functions
-
-static void clreol()
-{
-#ifdef PLATFORM_WINDOWS
-    CONSOLE_SCREEN_BUFFER_INFO ScreenInfo;
-    HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-    LPTSTR szConsoleLine;
-    int nConsoleChars;
-    int i = 0;
-
-    GetConsoleScreenBufferInfo(hConsole, &ScreenInfo);
-    nConsoleChars = (ScreenInfo.srWindow.Right - ScreenInfo.srWindow.Left);
-    if(nConsoleChars > 0)
-    {
-        szConsoleLine = new TCHAR[nConsoleChars + 3];
-        if(szConsoleLine != NULL)
-        {
-            szConsoleLine[i++] = '\r';
-            for(; i < nConsoleChars; i++)
-                szConsoleLine[i] = ' ';
-            szConsoleLine[i++] = '\r';
-            szConsoleLine[i] = 0;
-
-            _tprintf(szConsoleLine);
-            delete []  szConsoleLine;
-        }
-    }
-#endif // PLATFORM_WINDOWS
-}
-
-static void PrintfTA(const TCHAR * szFormat, const TCHAR * szStrT, const char * szStrA, int lcLocale = 0)
-{
-    TCHAR * szTemp;
-    TCHAR szBuffer[MAX_PATH];
-
-    // Convert ANSI string to TCHAR
-    for(szTemp = szBuffer; *szStrA != 0; szTemp++, szStrA++)
-        szTemp[0] = szStrA[0];
-    szTemp[0] = 0;
-
-    _tprintf(szFormat, szStrT, szBuffer, lcLocale);
-}
-
-static void MergeLocalPath(TCHAR * szBuffer, const TCHAR * szPart1, const char * szPart2)
-{
-    // Copy directory name
-    while(*szPart1 != 0)
-        *szBuffer++ = *szPart1++;
-
-    // Add separator
-    *szBuffer++ = _T('/');
-
-    // Copy file name
-    while(*szPart2 != 0)
-        *szBuffer++ = *szPart2++;
-
-    // Terminate the string
-    *szBuffer = 0;
-}
-
-int GetFirstDiffer(void * ptr1, void * ptr2, int nSize)
-{
-    char * buff1 = (char *)ptr1;
-    char * buff2 = (char *)ptr2;
-    int nDiffer;
-
-    for(nDiffer = 0; nDiffer < nSize; nDiffer++)
-    {
-        if(*buff1++ != *buff2++)
-            return nDiffer;
-    }
-    return -1;
-}
-
-static void WINAPI CompactCB(void * /* lpParam */, DWORD dwWork, ULONGLONG BytesDone, ULONGLONG TotalBytes)
-{
-    clreol();
-
-    _tprintf(_T("%u of %u "), (DWORD)BytesDone, (DWORD)TotalBytes);
-    switch(dwWork)
-    {
-        case CCB_CHECKING_FILES:
-            _tprintf(_T("Checking files in archive ...\r"));
-            break;
-
-        case CCB_CHECKING_HASH_TABLE:
-            _tprintf(_T("Checking hash table ...\r"));
-            break;
-
-        case CCB_COPYING_NON_MPQ_DATA:
-            _tprintf(_T("Copying non-MPQ data ...\r"));
-            break;
-
-        case CCB_COMPACTING_FILES:
-            _tprintf(_T("Compacting archive ...\r"));
-            break;
-
-        case CCB_CLOSING_ARCHIVE:
-            _tprintf(_T("Closing archive ...\r"));
-            break;
-    }
-}
-
-static void GenerateRandomDataBlock(LPBYTE pbBuffer, DWORD cbBuffer)
-{
-    LPBYTE pbBufferEnd = pbBuffer + cbBuffer;
-    LPBYTE pbPtr = pbBuffer;
-    DWORD cbBytesToPut = 0;
-    BYTE ByteToPut = 0;
-    bool bRandomData = false;
-
-    while(pbPtr < pbBufferEnd)
-    {
-        // If there are no bytes to put, we will generate new byte and length
-        if(cbBytesToPut == 0)
-        {
-            bRandomData = false;
-            switch(rand() % 10)
-            {
-                case 0:     // A short sequence of zeros
-                    cbBytesToPut = rand() % 0x08;
-                    ByteToPut = 0;
-                    break;
-
-                case 1:     // A long sequence of zeros
-                    cbBytesToPut = rand() % 0x80;
-                    ByteToPut = 0;
-                    break;
-
-                case 2:     // A short sequence of non-zeros
-                    cbBytesToPut = rand() % 0x08;
-                    ByteToPut = (BYTE)(rand() % 0x100);
-                    break;
-
-                case 3:     // A long sequence of non-zeros
-                    cbBytesToPut = rand() % 0x80;
-                    ByteToPut = (BYTE)(rand() % 0x100);
-                    break;
-
-                case 4:     // A short random data
-                    cbBytesToPut = rand() % 0x08;
-                    bRandomData = true;
-                    break;
-
-                case 5:     // A long random data
-                    cbBytesToPut = rand() % 0x80;
-                    bRandomData = true;
-                    break;
-
-                default:    // A single random byte
-                    cbBytesToPut = 1;
-                    ByteToPut = (BYTE)(rand() % 0x100);
-                    break;
-            }
-        }
-
-        // Generate random byte, if needed
-        if(bRandomData)
-            ByteToPut = (BYTE)(rand() % 0x100);
-
-        // Put next byte to the output buffer
-        *pbPtr++ = ByteToPut;
-        cbBytesToPut--;
-    }
-}
-
-static bool CompareArchivedFiles(const char * szFileName, HANDLE hFile1, HANDLE hFile2, DWORD dwBlockSize)
-{
-    LPBYTE pbBuffer1 = NULL;
-    LPBYTE pbBuffer2 = NULL;
-    DWORD dwRead1;                      // Number of bytes read (Storm.dll)
-    DWORD dwRead2;                      // Number of bytes read (StormLib)
-    bool bResult1 = false;              // Result from Storm.dll
-    bool bResult2 = false;              // Result from StormLib
-    bool bResult = true;
-    int nDiff;
-
-    szFileName = szFileName;
-
-    // Allocate buffers
-    pbBuffer1 = new BYTE[dwBlockSize];
-    pbBuffer2 = new BYTE[dwBlockSize];
-
-    for(;;)
-    {
-        // Read the file's content by both methods and compare the result
-        memset(pbBuffer1, 0, dwBlockSize);
-        memset(pbBuffer2, 0, dwBlockSize);
-        bResult1 = SFileReadFile(hFile1, pbBuffer1, dwBlockSize, &dwRead1, NULL);
-        bResult2 = SFileReadFile(hFile2, pbBuffer2, dwBlockSize, &dwRead2, NULL);
-        if(bResult1 != bResult2)
-        {
-            _tprintf(_T("Different results from SFileReadFile, Mpq1 %u, Mpq2 %u\n"), bResult1, bResult2);
-            bResult = false;
-            break;
-        }
-
-        // Test the number of bytes read
-        if(dwRead1 != dwRead2)
-        {
-            _tprintf(_T("Different bytes read from SFileReadFile, Mpq1 %u, Mpq2 %u\n"), dwRead1, dwRead2);
-            bResult = false;
-            break;
-        }
-
-        // No more bytes ==> OK
-        if(dwRead1 == 0)
-            break;
-
-        // Test the content
-        if((nDiff = GetFirstDiffer(pbBuffer1, pbBuffer2, dwRead1)) != -1)
-        {
-            bResult = false;
-            break;
-        }
-    }
-
-    delete [] pbBuffer2;
-    delete [] pbBuffer1;
-    return bResult;
-}
-
-// Random read version
-static bool CompareArchivedFilesRR(const char * /* szFileName */, HANDLE hFile1, HANDLE hFile2, DWORD dwBlockSize)
-{
-    const char * szPositions[3] = {"FILE_BEGIN  ", "FILE_CURRENT", "FILE_END    "};
-    LPBYTE pbBuffer1 = NULL;
-    LPBYTE pbBuffer2 = NULL;
-    DWORD dwFileSize1;                  // File size (Storm.dll)
-    DWORD dwFileSize2;                  // File size (StormLib)
-    DWORD dwRead1;                      // Number of bytes read (Storm.dll)
-    DWORD dwRead2;                      // Number of bytes read (StormLib)
-    bool bResult1 = false;              // Result from Storm.dll
-    bool bResult2 = false;              // Result from StormLib
-    int nError = ERROR_SUCCESS;
-
-    // Test the file size
-    dwFileSize1 = SFileGetFileSize(hFile1, NULL);
-    dwFileSize2 = SFileGetFileSize(hFile2, NULL);
-    if(dwFileSize1 != dwFileSize2)
-    {
-        _tprintf(_T("Different size from SFileGetFileSize (file1: %u, file2: %u)\n"), dwFileSize1, dwFileSize2);
-        return false;
-    }
-
-    if(dwFileSize1 != 0)
-    {
-        for(int i = 0; i < 10000; i++)
-        {
-            DWORD dwRandom     = rand() * rand();
-            DWORD dwMoveMethod = dwRandom % 3;
-            DWORD dwPosition   = dwRandom % dwFileSize1;
-            DWORD dwToRead     = dwRandom % dwBlockSize;
-
-            // Also test negative seek
-            if(rand() & 1)
-            {
-                int nPosition = (int)dwPosition;
-                dwPosition = (DWORD)(-nPosition);
-            }
-
-            // Allocate buffers
-            pbBuffer1 = new BYTE[dwToRead];
-            pbBuffer2 = new BYTE[dwToRead];
-
-            // Set the file pointer
-            _tprintf(_T("RndRead (%u): pos %8i from %s, size %u ...\r"), i, dwPosition, szPositions[dwMoveMethod], dwToRead);
-            dwRead1 = SFileSetFilePointer(hFile1, dwPosition, NULL, dwMoveMethod);
-            dwRead2 = SFileSetFilePointer(hFile2, dwPosition, NULL, dwMoveMethod);
-            if(dwRead1 != dwRead2)
-            {
-                _tprintf(_T("Difference returned by SFileSetFilePointer (file1: %u, file2: %u)\n"), dwRead1, dwRead2);
-                nError = ERROR_CAN_NOT_COMPLETE;
-                break;
-            }
-
-            // Read the file's content by both methods and compare the result
-            bResult1 = SFileReadFile(hFile1, pbBuffer1, dwToRead, &dwRead1, NULL);
-            bResult2 = SFileReadFile(hFile2, pbBuffer2, dwToRead, &dwRead2, NULL);
-            if(bResult1 != bResult2)
-            {
-                _tprintf(_T("Different results from SFileReadFile (file1: %u, file2: %u)\n\n"), bResult1, bResult2);
-                nError = ERROR_CAN_NOT_COMPLETE;
-                break;
-            }
-
-            // Test the number of bytes read
-            if(dwRead1 != dwRead2)
-            {
-                _tprintf(_T("Different bytes read from SFileReadFile (file1: %u, file2: %u)\n\n"), dwRead1, dwRead2);
-                nError = ERROR_CAN_NOT_COMPLETE;
-                break;
-            }
-
-            // Test the content
-            if(dwRead1 != 0 && memcmp(pbBuffer1, pbBuffer2, dwRead1))
-            {
-                _tprintf(_T("Different data content from SFileReadFile\n"));
-                nError = ERROR_CAN_NOT_COMPLETE;
-                break;
-            }
-
-            delete [] pbBuffer2;
-            delete [] pbBuffer1;
-        }
-    }
-    clreol();
-    return (nError == ERROR_SUCCESS) ? true : false;
-}
-
-//-----------------------------------------------------------------------------
-// Opening local file
-
-static int TestOpenLocalFile(const char * szFileName)
-{
-    HANDLE hFile;
-    char szRetrievedName[MAX_PATH];
-
-    if(SFileOpenFileEx(NULL, szFileName, SFILE_OPEN_LOCAL_FILE, &hFile))
-    {
-        SFileGetFileName(hFile, szRetrievedName);
-        SFileCloseFile(hFile);
-    }
-
-    return ERROR_SUCCESS;
-}
-
-//-----------------------------------------------------------------------------
-// Partial file reading
-
-static int TestPartFileRead(const TCHAR * szFileName)
-{
-    ULONGLONG ByteOffset;
-    ULONGLONG FileSize = 0;
-    TFileStream * pStream;
-    BYTE BigBuffer[0x7000];
-    BYTE Buffer[0x100];
-    int nError = ERROR_SUCCESS;
-
-    // Open the partial file
-    pStream = FileStream_OpenFile(szFileName, false);
-    if(pStream == NULL)
-        nError = GetLastError();
-
-    // Get the size of the stream
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!FileStream_GetSize(pStream, &FileSize))
-            nError = GetLastError();
-    }
-
-    // Read the last 0x7000 bytes
-    if(nError == ERROR_SUCCESS)
-    {
-        ByteOffset = FileSize - sizeof(BigBuffer);
-        if(!FileStream_Read(pStream, &ByteOffset, BigBuffer, sizeof(BigBuffer)))
-            nError = GetLastError();
-    }
-
-    // Read the last 0x100 bytes
-    if(nError == ERROR_SUCCESS)
-    {
-        ByteOffset = FileSize - sizeof(Buffer);
-        if(!FileStream_Read(pStream, &ByteOffset, Buffer, sizeof(Buffer)))
-            nError = GetLastError();
-    }
-
-    // Read 0x100 bytes from position (FileSize - 0xFF)
-    if(nError == ERROR_SUCCESS)
-    {
-        ByteOffset = FileSize - sizeof(Buffer) + 1;
-        if(!FileStream_Read(pStream, &ByteOffset, Buffer, sizeof(Buffer)))
-            nError = GetLastError();
-    }
-
-    FileStream_Close(pStream);
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// Compare PKLIB decompression
-
-BYTE pbCompressed1[] = {0x00, 0x04, 0x00, 0x00, 0x04, 0xF0, 0x1F, 0x7B, 0x01, 0xFF};
-BYTE pbCompressed2[] = {0x00, 0x04, 0x00, 0x00, 0x04, 0xF0, 0x1F, 0x00, 0x00, 0x04, 0xFC, 0x03};
-
-static int ComparePklibCompressions()
-{
-    char Decompressed[0x1000];
-    char Compressed[0x1000];
-    int cbDecompressed = 0x208;
-    int cbCompressed = sizeof(Compressed);
-
-    memset(Decompressed, 0, cbDecompressed);
-    SCompImplode(Compressed, &cbCompressed, Decompressed, cbDecompressed);
-
-    cbDecompressed = sizeof(Decompressed);
-    SCompExplode(Decompressed, &cbDecompressed, Compressed, cbCompressed);
-
-
-    return ERROR_SUCCESS;
-}
-
-//-----------------------------------------------------------------------------
-// Compare LZMA decompression
-
-#ifdef PLATFORM_WINDOWS
-typedef void * (*ALLOC_MEMORY)(size_t);
-typedef void (*FREE_MEMORY)(void *);
-typedef int (GIVE_DATA)(void *);
-
-extern "C" int starcraft_decompress_lzma(char * pbInBuffer, int cbInBuffer, char * pbOutBuffer, int cbOutBuffer, int * pcbOutBuffer, ALLOC_MEMORY pfnAllocMemory, FREE_MEMORY pfnFreeMemory);
-extern "C" int starcraft_compress_lzma(char * pbInBuffer, int cbInBuffer, int dummy1, char * pbOutBuffer, int cbOutBuffer, int dummy2, int * pcbOutBuffer, ALLOC_MEMORY pfnAllocMemory, FREE_MEMORY pfnFreeMemory, GIVE_DATA pfnGiveData);
-void Compress_LZMA(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer, int *, int);
-int Decompress_LZMA(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer);
-
-extern "C" void * operator_new(size_t sz)
-{
-    return malloc(sz);
-}
-
-void * Memory_Allocate(size_t byte_size)
-{
-    return malloc(byte_size);
-}
-
-void Memory_Free(void * address)
-{
-    if(address != NULL)
-        free(address);
-}
-
-int GiveData(void *)
-{
-    return 0;
-}
-
-static int StarcraftCompress_LZMA(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
-{
-    return starcraft_compress_lzma(pbInBuffer,
-                                   cbInBuffer,
-                                   0,
-                                   pbOutBuffer,
-                                  *pcbOutBuffer,
-                                   0,
-                                   pcbOutBuffer,
-                                   Memory_Allocate,
-                                   Memory_Free,
-                                   GiveData);
-}
-
-static int StarcraftDecompress_LZMA(char * pbOutBuffer, int * pcbOutBuffer, char * pbInBuffer, int cbInBuffer)
-{
-    return starcraft_decompress_lzma(pbInBuffer,
-                                     cbInBuffer,
-                                     pbOutBuffer,
-                                     *pcbOutBuffer,
-                                     pcbOutBuffer,
-                                     Memory_Allocate,
-                                     Memory_Free);
-}
-
-static int CompareLzmaCompressions(int nSectorSize)
-{
-    LPBYTE pbCompressed1 = NULL;            // Compressed by our code
-    LPBYTE pbCompressed2 = NULL;            // Compressed by Blizzard's code
-    LPBYTE pbDecompressed1 = NULL;          // Decompressed by our code
-    LPBYTE pbDecompressed2 = NULL;          // Decompressed by Blizzard's code
-    LPBYTE pbOriginalData = NULL;
-    int nError = ERROR_SUCCESS;
-
-    // Allocate buffers
-    // Must allocate twice blocks due to probable bug in Storm.dll.
-    // Storm.dll corrupts stack when uncompresses data with PKWARE DCL
-    // and no compression occurs.
-    pbDecompressed1 = new BYTE [nSectorSize];
-    pbDecompressed2 = new BYTE [nSectorSize];
-    pbCompressed1 = new BYTE [nSectorSize];
-    pbCompressed2 = new BYTE [nSectorSize];
-    pbOriginalData = new BYTE[nSectorSize];
-    if(!pbDecompressed1 || !pbDecompressed2 || !pbCompressed1 || !pbCompressed2 || !pbOriginalData)
-        nError = ERROR_NOT_ENOUGH_MEMORY;
-
-    if(nError == ERROR_SUCCESS)
-    {
-        for(int i = 0; i < 100000; i++)
-        {
-            int   nDcmpLength1;
-            int   nDcmpLength2;
-            int   nCmpLength1;
-            int   nCmpLength2;
-            int   nDiff;
-
-            clreol();
-            _tprintf(_T("Testing compression of sector %u\r"), i + 1);
-
-            // Generate random data sector
-            GenerateRandomDataBlock(pbOriginalData, nSectorSize);
-
-            // Compress the sector by both methods
-            nCmpLength1 = nCmpLength2 = nSectorSize;
-//          Compress_LZMA((char *)pbCompressed1, &nCmpLength1, (char *)pbOriginalData, nSectorSize, 0, 0);
-            StarcraftCompress_LZMA((char *)pbCompressed1, &nCmpLength2, (char *)pbOriginalData, nSectorSize);
-
-__TryToDecompress:
-
-            // Only test decompression when the compression actually succeeded
-            if(nCmpLength1 < nSectorSize)
-            {
-                // Decompress both data
-                nDcmpLength2 = nDcmpLength1 = nSectorSize;
-//              Decompress_LZMA((char *)pbDecompressed1, &nDcmpLength1, (char *)pbCompressed1, nCmpLength1);
-                StarcraftDecompress_LZMA((char *)pbDecompressed2, &nDcmpLength2, (char *)pbCompressed1, nCmpLength1);
-
-                // Compare the length of the output data
-                if(nDcmpLength1 != nDcmpLength2)
-                {
-                    _tprintf(_T("Difference in compressed blocks lengths (%u vs %u)\n"), nDcmpLength1, nDcmpLength2);
-                    goto __TryToDecompress;
-                }
-
-                // Compare the output
-                if((nDiff = GetFirstDiffer(pbDecompressed1, pbDecompressed2, nDcmpLength1)) != -1)
-                {
-                    _tprintf(_T("Difference in decompressed blocks (offset 0x%08X)\n"), nDiff);
-                    goto __TryToDecompress;
-                }
-
-                // Check for data overflow
-                if(pbDecompressed1[nSectorSize] != 0xFD || pbDecompressed1[nSectorSize] != 0xFD)
-                {
-                    _tprintf(_T("Damage after decompressed sector !!!\n"));
-                    goto __TryToDecompress;
-                }
-
-                // Compare the decompressed data against original data
-                if((nDiff = GetFirstDiffer(pbDecompressed1, pbOriginalData, nDcmpLength1)) != -1)
-                {
-                    _tprintf(_T("Difference between original data and decompressed data (offset 0x%08X)\n"), nDiff);
-                    goto __TryToDecompress;
-                }
-            }
-        }
-    }
-
-    // Cleanup
-    if(pbOriginalData != NULL)
-        delete [] pbOriginalData;
-    if(pbCompressed2 != NULL)
-        delete [] pbCompressed2;
-    if(pbCompressed1 != NULL)
-        delete [] pbCompressed1;
-    if(pbDecompressed2 != NULL)
-        delete [] pbDecompressed2;
-    if(pbDecompressed1 != NULL)
-        delete [] pbDecompressed1;
-    clreol();
-    return nError;
-}
-#endif // PLATFORM_WINDOWS
-
-//-----------------------------------------------------------------------------
-// Compression method test
-
-static int TestSectorCompress(int nSectorSize)
-{
-    LPBYTE pbDecompressed = NULL;
-    LPBYTE pbCompressed = NULL;
-    LPBYTE pbOriginal = NULL;
-    int nError = ERROR_SUCCESS;
-
-    // Allocate buffers
-    pbDecompressed = new BYTE[nSectorSize];
-    pbCompressed = new BYTE[nSectorSize];
-    pbOriginal = new BYTE[nSectorSize];
-    if(!pbDecompressed || !pbCompressed || !pbOriginal)
-        nError = ERROR_NOT_ENOUGH_MEMORY;
-
-    if(nError == ERROR_SUCCESS)
-    {
-        for(int i = 0; i < 100000; i++)
-        {
-            int nOriginalLength = nSectorSize % (rand() + 1);
-            int nCompressedLength;
-            int nDecompressedLength;
-            int nCmp = MPQ_COMPRESSION_SPARSE | MPQ_COMPRESSION_ZLIB | MPQ_COMPRESSION_BZIP2 | MPQ_COMPRESSION_PKWARE;
-            int nDiff;
-
-            clreol();
-            _tprintf(_T("Testing compression of sector %u\r"), i + 1);
-
-            // Generate random data sector
-            GenerateRandomDataBlock(pbOriginal, nOriginalLength);
-            if(nOriginalLength == 0x123)
-                nOriginalLength = 0;
-
-__TryAgain:
-
-            // Compress the sector
-            nCompressedLength = nOriginalLength;
-            SCompCompress((char *)pbCompressed, &nCompressedLength, (char *)pbOriginal, nOriginalLength, nCmp, 0, -1);
-//          SCompImplode((char *)pbCompressed, &nCompressedLength, (char *)pbOriginal, nOriginalLength);
-
-            // When the method was unable to compress data,
-            // the compressed data must be identical to original data
-            if(nCompressedLength == nOriginalLength)
-            {
-                if((nDiff = GetFirstDiffer(pbCompressed, pbOriginal, nOriginalLength)) != -1)
-                {
-                    _tprintf(_T("Compression error: Fail when unable to compress the data (Offset 0x%08X).\n"), nDiff);
-                    goto __TryAgain;
-                }
-            }
-
-            // Uncompress the sector
-            nDecompressedLength = nOriginalLength;
-            SCompDecompress((char *)pbDecompressed, &nDecompressedLength, (char *)pbCompressed, nCompressedLength);
-//          SCompExplode((char *)pbDecompressed, &nDecompressedLength, (char *)pbCompressed, nCompressedLength);
-
-            // Check the decompressed length against original length
-            if(nDecompressedLength != nOriginalLength)
-            {
-                _tprintf(_T("Length of uncompressed data does not agree with original data length !!!\n"));
-                goto __TryAgain;
-            }
-
-            // Check decompressed block against original block
-            if((nDiff = GetFirstDiffer(pbDecompressed, pbOriginal, nOriginalLength)) != -1)
-            {
-                _tprintf(_T("Decompressed sector does not agree with the original data !!! (Offset 0x%08X)\n"), nDiff);
-                goto __TryAgain;
-            }
-        }
-    }
-
-    // Cleanup
-    delete [] pbOriginal;
-    delete [] pbCompressed;
-    delete [] pbDecompressed;
-    clreol();
-    return nError;
-}
-
-static int TestArchiveOpenAndClose(const TCHAR * szMpqName)
-{
-    const char * szFileName1 = "StringList\\Powers.stl";
-//  const char * szFileName2 = "items\\map\\mapz_deleted.cel";
-    TMPQArchive * ha = NULL;
-    HANDLE hFile1 = NULL;
-//  HANDLE hFile2 = NULL;
-    HANDLE hMpq = NULL;
-    int nError = ERROR_SUCCESS;
-
-    if(nError == ERROR_SUCCESS)
-    {
-        _tprintf(_T("Opening archive %s ...\n"), szMpqName);
-        if(!SFileOpenArchive(szMpqName, 0, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE, &hMpq))
-            nError = GetLastError();
-        ha = (TMPQArchive *)hMpq;
-    }
-
-    if(nError == ERROR_SUCCESS)
-    {
-        SFileAddListFile(hMpq, "c:\\Tools32\\Listfiles\\ListFile.txt");
-    }
-
-/*
-    // Test for TBitArray
-    if(nError == ERROR_SUCCESS && ha->pHetTable != NULL)
-    {
-        TBitArray * pBitArray = ha->pHetTable->pBetIndexes;
-
-        for(ULONG i = 0; i < 0x10000; i++)
-        {
-            BYTE LoadedBits[0x20];
-            BYTE SaveBits[0x40];
-            unsigned int nBitPosition = (i >> 0x08);
-            unsigned int nBitCount = (i & 0xFF);
-
-            memset(LoadedBits, 0, sizeof(LoadedBits));
-            memcpy(SaveBits, pBitArray->Elements, sizeof(SaveBits));
-
-            // Load the index to the BET table
-            GetBits(pBitArray, nBitPosition, nBitCount, LoadedBits, sizeof(LoadedBits));
-
-            // Load the index to the BET table
-            SetBits(pBitArray, nBitPosition, nBitCount, LoadedBits, sizeof(LoadedBits));
-
-            // Verify the bits
-            if(memcmp(SaveBits, pBitArray->Elements, sizeof(SaveBits)))
-                assert(false);
-        }
-    }
-*/
-    // Verify the raw data in the archive
-    if(nError == ERROR_SUCCESS)
-    {
-        // Verify the archive
-        SFileVerifyRawData(hMpq, SFILE_VERIFY_FILE, szFileName1);
-
-        // Try to open a file
-        if(!SFileOpenFileEx(hMpq, szFileName1, SFILE_OPEN_FROM_MPQ, &hFile1))
-        {
-            nError = GetLastError();
-            printf("%s - file not found in the MPQ\n", szFileName1);
-        }
-    }
-
-    // Dummy read from the file
-    if(nError == ERROR_SUCCESS)
-    {
-        DWORD dwBytesRead = 0;
-        BYTE Buffer[0x1000];
-
-        SFileSetFileLocale(hFile1, 0x405);
-        SFileReadFile(hFile1, Buffer, sizeof(Buffer), &dwBytesRead, NULL);
-    }
-/*
-    // Verify the MPQ listfile
-    if(nError == ERROR_SUCCESS)
-    {
-        SFileVerifyFile(hMpq, szFileName1, 0xFFFFFFFF);
-        if(!CompareArchivedFilesRR(szFileName1, hFile1, hFile2, 0x100000))
-            nError = ERROR_CAN_NOT_COMPLETE;
-    }
-*/
-    if(hFile1 != NULL)
-        SFileCloseFile(hFile1);
-    if(hMpq != NULL)
-        SFileCloseArchive(hMpq);
-    return nError;
-}
-
-static int TestFindFiles(const TCHAR * szMpqName)
-{
-    TMPQFile * hf;
-    HANDLE hFile;
-    HANDLE hMpq = NULL;
-    BYTE Buffer[100];
-    int nError = ERROR_SUCCESS;
-    int nFiles = 0;
-    int nFound = 0;
-
-    // Open the archive
-    if(nError == ERROR_SUCCESS)
-    {
-        _tprintf(_T("Opening \"%s\" for finding files ...\n"), szMpqName);
-        if(!SFileOpenArchive(szMpqName, 0, 0, &hMpq))
-            nError = GetLastError();
-    }
-
-    // Compact the archive
-    if(nError == ERROR_SUCCESS)
-    {
-        SFILE_FIND_DATA sf;
-        HANDLE hFind;
-        DWORD dwExtraDataSize;
-        bool bFound = true;
-
-        hFind = SFileFindFirstFile(hMpq, "*", &sf, "c:\\Tools32\\ListFiles\\ListFile.txt");
-        while(hFind != NULL && bFound != false)
-        {
-            if(SFileOpenFileEx(hMpq, sf.cFileName, 0, &hFile))
-            {
-                hf = (TMPQFile *)hFile;
-                SFileReadFile(hFile, Buffer, sizeof(Buffer), NULL, NULL);
-                nFiles++;
-
-                if(sf.dwFileFlags & MPQ_FILE_SECTOR_CRC)
-                {
-                    dwExtraDataSize = hf->SectorOffsets[hf->dwSectorCount + 1] - hf->SectorOffsets[hf->dwSectorCount];
-                    if(dwExtraDataSize != 0)
-                        nFound++;
-                }
-
-                SFileCloseFile(hFile);
-            }
-
-            bFound = SFileFindNextFile(hFind, &sf);
-        }
-    }
-
-    if(hMpq != NULL)
-        SFileCloseArchive(hMpq);
-    if(nError == ERROR_SUCCESS)
-        _tprintf(_T("Search complete\n"));
-    return nError;
-}
-
-static int TestMpqCompacting(const TCHAR * szMpqName)
-{
-    HANDLE hMpq = NULL;
-    int nError = ERROR_SUCCESS;
-
-    // Open the archive
-    if(nError == ERROR_SUCCESS)
-    {
-        _tprintf(_T("Opening \"%s\" for compacting ...\n"), szMpqName);
-        if(!SFileOpenArchive(szMpqName, 0, 0, &hMpq))
-            nError = GetLastError();
-    }
-
-    if(nError == ERROR_SUCCESS)
-    {
-        const char * szFileName = "Shaders\\Effects\\shadowmap.wfx";
-
-        printf("Deleting file %s ...\r", szFileName);
-        if(!SFileRemoveFile(hMpq, szFileName, SFILE_OPEN_FROM_MPQ))
-            nError = GetLastError();
-    }
-/*
-    // Compact the archive
-    if(nError == ERROR_SUCCESS)
-    {
-        _tprintf(_T("Compacting archive ...\r"));
-        SFileSetCompactCallback(hMpq, CompactCB, NULL);
-        if(!SFileCompactArchive(hMpq, "c:\\Tools32\\ListFiles\\ListFile.txt"))
-            nError = GetLastError();
-    }
-*/
-    if(hMpq != NULL)
-        SFileCloseArchive(hMpq);
-    if(nError == ERROR_SUCCESS)
-        _tprintf(_T("Compacting complete (No errors)\n"));
-    return nError;
-}
-
-static int TestCreateArchive(const TCHAR * szMpqName)
-{
-    TFileStream * pStream;
-    const TCHAR * szFileName1 = MAKE_PATH("FileTest.exe");
-    const TCHAR * szFileName2 = MAKE_PATH("ZeroSize.txt");
-    HANDLE hMpq = NULL;                 // Handle of created archive
-    DWORD dwVerifyResult;
-    DWORD dwFileCount = 0;
-    LCID LocaleIDs[] = {0x000, 0x405, 0x406, 0x407, 0xFFFF};
-    char szMpqFileName[MAX_PATH];
-    int nError = ERROR_SUCCESS;
-    int i;
-
-    // Create the new file
-    _tprintf(_T("Creating %s ...\n"), szMpqName);
-    pStream = FileStream_CreateFile(szMpqName, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
-    if(pStream == NULL)
-        nError = GetLastError();
-
-    // Write some data
-    if(nError == ERROR_SUCCESS)
-    {
-        ULONGLONG FileSize = 0x100000;
-
-        FileStream_SetSize(pStream, FileSize);
-        FileStream_Close(pStream);
-    }
-
-    // Well, now create the MPQ archive
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!SFileCreateArchive(szMpqName,
-                               MPQ_CREATE_ARCHIVE_V4 | MPQ_CREATE_ATTRIBUTES,
-                               17,
-                              &hMpq))
-        {
-            nError = GetLastError();
-        }
-    }
-
-    // Add the same file multiple times
-    if(nError == ERROR_SUCCESS)
-    {
-        // Add FileTest.exe
-        for(i = 0; AddFlags[i] != 0xFFFFFFFF; i++)
-        {
-            sprintf(szMpqFileName, "FileTest_%02u.exe", i);
-            PrintfTA(_T("Adding %s as %s ...\n"), szFileName1, szMpqFileName);
-            if(SFileAddFileEx(hMpq, szFileName1, szMpqFileName, AddFlags[i], MPQ_COMPRESSION_ZLIB, MPQ_COMPRESSION_NEXT_SAME))
-            {
-                dwVerifyResult = SFileVerifyFile(hMpq, szMpqFileName, MPQ_ATTRIBUTE_CRC32 | MPQ_ATTRIBUTE_MD5);
-                if(dwVerifyResult & (VERIFY_OPEN_ERROR | VERIFY_READ_ERROR | VERIFY_FILE_SECTOR_CRC_ERROR | VERIFY_FILE_CHECKSUM_ERROR | VERIFY_FILE_MD5_ERROR))
-                    printf("CRC error on \"%s\"\n", szMpqFileName);
-                dwFileCount++;
-            }
-            else
-            {
-                printf("Failed to add the file \"%s\".\n", szMpqFileName);
-            }
-        }
-
-
-        // Delete a file in the middle of the file table
-        SFileRemoveFile(hMpq, "FileTest_10.exe", SFILE_OPEN_FROM_MPQ);
-        SFileAddFileEx(hMpq, szFileName1, "FileTest_xx.exe", MPQ_FILE_COMPRESS | MPQ_FILE_ENCRYPTED, MPQ_COMPRESSION_ZLIB, MPQ_COMPRESSION_NEXT_SAME);
-
-        // Try to decrement max file count
-        dwFileCount = SFileGetMaxFileCount(hMpq);
-        SFileSetMaxFileCount(hMpq, dwFileCount - 1);
-
-        // Add ZeroSize.txt (1)
-        sprintf(szMpqFileName, "ZeroSize_1.txt");
-        for(i = 0; LocaleIDs[i] != 0xFFFF; i++)
-        {
-            PrintfTA(_T("Adding %s as %s (locale %04x) ...\n"), szFileName2, szMpqFileName, LocaleIDs[i]);
-            SFileSetLocale(LocaleIDs[i]);
-            if(!SFileAddFileEx(hMpq, szFileName2, szMpqFileName, MPQ_FILE_COMPRESS | MPQ_FILE_ENCRYPTED, MPQ_COMPRESSION_ZLIB, MPQ_COMPRESSION_NEXT_SAME))
-                printf("Cannot add the file\n");
-        }
-
-        // Add ZeroSize.txt (1)
-        sprintf(szMpqFileName, "ZeroSize_2.txt");
-        for(int i = 0; LocaleIDs[i] != 0xFFFF; i++)
-        {
-            PrintfTA(_T("Adding %s as %s (locale %04x) ...\n"), szFileName2, szMpqFileName, LocaleIDs[i]);
-            SFileSetLocale(LocaleIDs[i]);
-            if(!SFileAddFileEx(hMpq, szFileName2, szMpqFileName, MPQ_FILE_COMPRESS | MPQ_FILE_ENCRYPTED, MPQ_COMPRESSION_ZLIB, MPQ_COMPRESSION_NEXT_SAME))
-                printf("Cannot add the file\n");
-        }
-    }
-
-    // Test rename function
-    if(nError == ERROR_SUCCESS)
-    {
-        _tprintf(_T("Testing rename files ...\n"));
-        SFileSetLocale(LANG_NEUTRAL);
-        if(!SFileRenameFile(hMpq, "FileTest_08.exe", "FileTest_08a.exe"))
-        {
-            nError = GetLastError();
-            _tprintf(_T("Failed to rename the file\n"));
-        }
-
-        if(!SFileRenameFile(hMpq, "FileTest_08a.exe", "FileTest_08.exe"))
-        {
-            nError = GetLastError();
-            _tprintf(_T("Failed to rename the file\n"));
-        }
-
-        if(!SFileRenameFile(hMpq, "FileTest_10.exe", "FileTest_10a.exe"))
-        {
-            nError = GetLastError();
-            _tprintf(_T("Failed to rename the file\n"));
-        }
-
-        if(!SFileRenameFile(hMpq, "FileTest_10a.exe", "FileTest_10.exe"))
-        {
-            nError = GetLastError();
-            _tprintf(_T("Failed to rename the file\n"));
-        }
-
-        if(nError == ERROR_SUCCESS)
-            _tprintf(_T("Rename test succeeded.\n\n"));
-        else
-            _tprintf(_T("Rename test failed.\n\n"));
-    }
-
-    // Compact the archive
-//  if(nError == ERROR_SUCCESS)
-//      SFileCompactArchive(hMpq);
-
-    // Test changing hash table size
-    if(nError == ERROR_SUCCESS)
-        SFileSetMaxFileCount(hMpq, 0x95);
-
-    if(hMpq != NULL)
-        SFileCloseArchive(hMpq);
-
-    // Try to reopen the archive
-    if(SFileOpenArchive(szMpqName, 0, 0, &hMpq))
-        SFileCloseArchive(hMpq);
-
-    _tprintf(_T("\n"));
-    return nError;
-}
-
-static int TestCreateArchive_PaliRoharBug(const TCHAR * szMpqName)
-{
-    const TCHAR * szFileName = MAKE_PATH("FileTest.exe");
-    HANDLE hMpq = NULL;                 // Handle of created archive
-    DWORD dwMaxFileCount = 0;
-    DWORD dwMpqFlags = MPQ_FILE_ENCRYPTED | MPQ_FILE_COMPRESS;
-    char szMpqFileName[MAX_PATH];
-    int nError = ERROR_SUCCESS;
-    int i;
-
-    _tremove(szMpqName);
-    if(SFileCreateArchive(szMpqName,
-                          MPQ_CREATE_ARCHIVE_V4 | MPQ_CREATE_ATTRIBUTES,
-                          1,
-                         &hMpq))
-    {
-        // Add the file there
-        SFileAddFileEx(hMpq, szFileName, "FileTest_base.exe", dwMpqFlags, MPQ_COMPRESSION_ZLIB, MPQ_COMPRESSION_NEXT_SAME);
-        SFileFlushArchive(hMpq);
-        SFileCloseArchive(hMpq);
-
-        // Add the same file 10 times
-        for(i = 0; i < 10; i++)
-        {
-            if(SFileOpenArchive(szMpqName, 0, 0, &hMpq))
-            {
-                dwMaxFileCount = SFileGetMaxFileCount(hMpq) + 1;
-                _tprintf(_T("Increasing max file count to %u ...\n"), dwMaxFileCount);
-                SFileSetMaxFileCount(hMpq, dwMaxFileCount);
-
-                sprintf(szMpqFileName, "FileTest_%02u.exe", dwMaxFileCount);
-                PrintfTA(_T("Adding %s as %s\n"), szFileName, szMpqFileName);
-                if(!SFileAddFileEx(hMpq, szFileName, szMpqFileName, dwMpqFlags, MPQ_COMPRESSION_ZLIB, MPQ_COMPRESSION_NEXT_SAME))
-                {
-                    printf("Failed to add the file \"%s\".\n", szMpqFileName);
-                    break;
-                }
-
-                SFileFlushArchive(hMpq);
-                SFileCompactArchive(hMpq, NULL, false);
-                SFileCloseArchive(hMpq);
-            }
-        }
-    }
-
-    _tprintf(_T("\n"));
-    return nError;
-}
-
-
-static int TestAddFilesToMpq(
-    const TCHAR * szMpqName,
-    ...
-    )
-{
-    const TCHAR * szFileName;
-    const TCHAR * szSrc;
-    char * szTrg;
-    HANDLE hMpq;
-    va_list argList;
-    char szMpqFileName[MAX_PATH];
-    int nError = ERROR_SUCCESS;
-
-    if(!SFileOpenArchive(szMpqName, 0, 0, &hMpq))
-        return GetLastError();
-
-    va_start(argList, szMpqName);
-    while((szFileName = va_arg(argList, const TCHAR *)) != NULL)
-    {
-        // Convert the plain name to ANSI
-        szSrc = GetPlainFileNameT(szFileName);
-        szTrg = szMpqFileName;
-        while(*szSrc != 0)
-            *szTrg++ = (char)*szSrc++;
-        *szTrg = 0;
-
-        // Add the file to MPQ
-        if(!SFileAddFileEx(hMpq, szFileName,
-                                 szMpqFileName,
-                                 MPQ_FILE_COMPRESS,
-                                 MPQ_COMPRESSION_ZLIB,
-                                MPQ_COMPRESSION_NEXT_SAME))
-        {
-            nError = GetLastError();
-            printf("Failed to add the file \"%s\"\n", szFileName);
-        }
-    }
-
-    SFileCloseArchive(hMpq);
-    return nError;
-}
-
-static int TestCreateArchiveFromMemory(const TCHAR * szMpqName)
-{
-#define FILE_SIZE 65535
-
-    HANDLE hFile;
-    HANDLE hMPQ;
-    char* data = new char [FILE_SIZE];          // random memory data
-    char szFileName[100];
-    int i;
-
-    // Create an mpq file for testing
-    if(SFileCreateArchive(szMpqName, MPQ_CREATE_ARCHIVE_V2|MPQ_CREATE_ATTRIBUTES, 0x100000, &hMPQ))
-    {
-        for(i = 0; i < 1000; i++)
-        {
-            sprintf(szFileName, "File%03u.bin", i);
-            printf("Adding file %s\r", szFileName);
-
-            if(SFileCreateFile(hMPQ, szFileName, 0, FILE_SIZE, 0, MPQ_FILE_COMPRESS, &hFile))
-            {
-                SFileWriteFile(hFile, data, FILE_SIZE, MPQ_COMPRESSION_ZLIB);
-                SFileFinishFile(hFile);
-            }
-        }
-    }
-    SFileCloseArchive(hMPQ);
-    delete [] data;
-    return ERROR_SUCCESS;
-}
-
-static int TestFileReadAndWrite(
-    const TCHAR * szMpqName,
-    const char * szFileName)
-{
-    LPBYTE pvFile = NULL;
-    HANDLE hFile = NULL;
-    HANDLE hMpq = NULL;
-    DWORD dwBytesRead;
-    DWORD dwFileSize = 0;
-    int nError = ERROR_SUCCESS;
-
-    if(!SFileOpenArchive(szMpqName, 0, 0, &hMpq))
-    {
-        nError = GetLastError();
-        _tprintf(_T("Failed to open the archive %s (%u).\n"), szMpqName, nError);
-    }
-
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!SFileOpenFileEx(hMpq, szFileName, 0, &hFile))
-        {
-            nError = GetLastError();
-            printf("Failed to open the file %s (%u).\n", szFileName, nError);
-        }
-    }
-
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!SFileGetFileInfo(hFile, SFILE_INFO_FILE_SIZE, &dwFileSize, sizeof(DWORD), NULL))
-        {
-            nError = GetLastError();
-            _tprintf(_T("Failed to get the file size (%u).\n"), nError);
-        }
-    }
-
-    if(nError == ERROR_SUCCESS)
-    {
-        pvFile = new BYTE[dwFileSize];
-        if(pvFile == NULL)
-        {
-            nError = ERROR_NOT_ENOUGH_MEMORY;
-            printf("Failed to allocate buffer for the file (%u).\n", nError);
-        }
-    }
-
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!SFileReadFile(hFile, pvFile, dwFileSize, &dwBytesRead, NULL))
-        {
-            nError = GetLastError();
-            printf("Failed to read file (%u).\n", nError);
-        }
-    }
-
-    if(hFile != NULL)
-    {
-        SFileCloseFile(hFile);
-        hFile = NULL;
-    }
-
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!SFileCreateFile(hMpq, szFileName, 0, dwFileSize, 0, MPQ_FILE_REPLACEEXISTING, &hFile))
-        {
-            nError = GetLastError();
-            printf("Failed to create %s in the archive (%u).\n", szFileName, nError);
-        }
-    }
-
-    if(nError == ERROR_SUCCESS)
-    {
-        if(!SFileWriteFile(hFile, pvFile, dwFileSize, 0))
-        {
-            nError = GetLastError();
-            printf("Failed to write the data to the MPQ (%u).\n", nError);
-        }
-    }
-
-    if(hFile != NULL)
-    {
-        if(!SFileFinishFile(hFile))
-        {
-            nError = GetLastError();
-            printf("Failed to finalize file creation (%u).\n", nError);
-        }
-    }
-
-    if(pvFile != NULL)
-        delete [] pvFile;
-    if(hMpq != NULL)
-        SFileCloseArchive(hMpq);
-    return nError;
-}
-
-static int TestSignatureVerify(const TCHAR * szMpqName)
-{
-    HANDLE hMpq;
-
-    if(SFileOpenArchive(szMpqName, 0, 0, &hMpq))
-    {
-        _tprintf(_T("Verifying digital signature in %s:\n"), szMpqName);
-        switch(SFileVerifyArchive(hMpq))
-        {
-            case ERROR_NO_SIGNATURE:
-                _tprintf(_T("No digital signature present.\n"));
-                break;
-
-            case ERROR_VERIFY_FAILED:
-                _tprintf(_T("Failed to verify signature.\n"));
-                break;
-
-            case ERROR_WEAK_SIGNATURE_OK:
-                _tprintf(_T("Weak signature is OK.\n"));
-                break;
-
-            case ERROR_WEAK_SIGNATURE_ERROR:
-                _tprintf(_T("Weak signature mismatch.\n"));
-                break;
-
-            case ERROR_STRONG_SIGNATURE_OK:
-                _tprintf(_T("Strong signature is OK.\n"));
-                break;
-
-            case ERROR_STRONG_SIGNATURE_ERROR:
-                _tprintf(_T("Strong signature mismatch.\n"));
-                break;
-        }
-
-        SFileCloseArchive(hMpq);
-        _tprintf(_T("\n"));
-    }
-
-    return 0;
-}
-
-
-static int TestCreateArchiveCopy(const TCHAR * szMpqName, const TCHAR * szMpqCopyName, const char * szListFile)
-{
-    TFileStream * pStream;
-    TCHAR  szLocalFile[MAX_PATH];
-    HANDLE hMpq1 = NULL;                // Handle of existing archive
-    HANDLE hMpq2 = NULL;                // Handle of created archive
-    DWORD dwHashTableSize = 0;
-    int nError = ERROR_SUCCESS;
-
-    // If no listfile or an empty one, use NULL
-    if(szListFile == NULL || *szListFile == 0)
-        szListFile = NULL;
-
-    // Create the new file
-    pStream = FileStream_CreateFile(szMpqCopyName, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
-    if(pStream == NULL)
-        nError = GetLastError();
-
-    // Write some data
-    if(nError == ERROR_SUCCESS)
-    {
-        ULONGLONG FileSize = 0x100000;
-
-        FileStream_SetSize(pStream, FileSize);
-        FileStream_Close(pStream);
-    }
-
-    // Open the existing MPQ archive
-    if(nError == ERROR_SUCCESS)
-    {
-        _tprintf(_T("Opening %s ...\n"), szMpqName);
-        if(!SFileOpenArchive(szMpqName, 0, 0, &hMpq1))
-            nError = GetLastError();
-    }
-
-    // Well, now create the MPQ archive
-    if(nError == ERROR_SUCCESS)
-    {
-        _tprintf(_T("Creating %s ...\n"), szMpqCopyName);
-        SFileGetFileInfo(hMpq1, SFILE_INFO_HASH_TABLE_SIZE, &dwHashTableSize, 4, NULL);
-        if(!SFileCreateArchive(szMpqCopyName, 0, dwHashTableSize, &hMpq2))
-            nError = GetLastError();
-    }
-
-    // Copy all files from one archive to another
-    if(nError == ERROR_SUCCESS)
-    {
-        SFILE_FIND_DATA sf;
-        HANDLE hFind = SFileFindFirstFile(hMpq1, "*", &sf, szListFile);
-        bool bResult = true;
-
-        _tprintf(_T("Copying files ...\n"));
-
-        if(hFind != NULL)
-        {
-            while(bResult)
-            {
-                if(strcmp(sf.cFileName, LISTFILE_NAME) && strcmp(sf.cFileName, ATTRIBUTES_NAME))
-                {
-                    SFileSetLocale(sf.lcLocale);
-
-                    // Create the local file name
-                    MergeLocalPath(szLocalFile, szWorkDir, sf.szPlainName);
-                    if(SFileExtractFile(hMpq1, sf.cFileName, szLocalFile, SFILE_OPEN_FROM_MPQ))
-                    {
-                        printf("Extracting %s ... OK\n", sf.cFileName);
-                        if(!SFileAddFile(hMpq2, szLocalFile, sf.cFileName, sf.dwFileFlags))
-                        {
-                            nError = GetLastError();
-                            printf("Adding %s ... Failed\n\n", sf.cFileName);
-                            _tremove(szLocalFile);
-                            break;
-                        }
-                        else
-                        {
-                            printf("Adding %s ... OK\n", sf.cFileName);
-                        }
-                    }
-                    else
-                    {
-                        printf("Extracting %s ... Failed\n", sf.cFileName);
-                    }
-
-                    // Delete the added file
-                    _tremove(szLocalFile);
-                }
-
-                // Find the next file
-                bResult = SFileFindNextFile(hFind, &sf);
-            }
-
-            // Close the search handle
-            SFileFindClose(hFind);
-            printf("\n");
-        }
-    }
-
-    // Close both archives
-    if(hMpq2 != NULL)
-        SFileCloseArchive(hMpq2);
-    if(hMpq1 != NULL)
-        SFileCloseArchive(hMpq1);
-    return nError;
-}
-
-static int TestOpenPatchedArchive(const TCHAR * szMpqName, ...)
-{
-    TFileStream * pStream;
-    HANDLE hFile = NULL;
-    HANDLE hMpq = NULL;
-    va_list argList;
-    const char * szFileName = "World\\Minimaps\\Azeroth\\noLiquid_map20_44.blp";
-    TCHAR szLocFileName[MAX_PATH];
-    LPBYTE pbFullFile = NULL;
-    DWORD dwFileSize;
-    int nError = ERROR_SUCCESS;
-
-    // Open the primary MPQ
-    _tprintf(_T("Opening %s ...\n"), szMpqName);
-    if(!SFileOpenArchive(szMpqName, 0, MPQ_OPEN_READ_ONLY, &hMpq))
-    {
-        nError = GetLastError();
-        _tprintf(_T("Failed to open the archive %s ...\n"), szMpqName);
-    }
-
-    // Add all patches
-    if(nError == ERROR_SUCCESS)
-    {
-        va_start(argList, szMpqName);
-        while((szMpqName = va_arg(argList, const TCHAR *)) != NULL)
-        {
-            _tprintf(_T("Adding patch %s ...\n"), szMpqName);
-            if(!SFileOpenPatchArchive(hMpq, szMpqName, NULL, 0))
-            {
-                nError = GetLastError();
-                printf("Failed to add patch %s ...\n", szMpqName);
-            }
-        }
-        va_end(argList);
-    }
-
-    // Now search all files
-    if(nError == ERROR_SUCCESS)
-    {
-        SFILE_FIND_DATA sf;
-        HANDLE hFind;
-        bool bResult = true;
-
-        hFind = SFileFindFirstFile(hMpq, "World\\Minimaps\\Azeroth\\noLiquid_map20_44.*", &sf, NULL);
-        while(hFind && bResult)
-        {
-            printf("%s\n", sf.cFileName);
-            bResult = SFileFindNextFile(hFind, &sf);
-        }
-    }
-
-    // Now try to open patched version of a file
-    if(nError == ERROR_SUCCESS)
-    {
-        SFileExtractFile(hMpq, szFileName, _T("E:\\noLiquid_map20_44.blp"), SFILE_OPEN_FROM_MPQ);
-    }
-
-    // Now try to open patched version of "Achievement.dbc"
-    if(nError == ERROR_SUCCESS)
-    {
-        printf("Opening patched file \"%s\" ...\n", szFileName);
-        SFileVerifyFile(hMpq, szFileName, SFILE_VERIFY_RAW_MD5);
-        if(!SFileOpenFileEx(hMpq, szFileName, SFILE_OPEN_PATCHED_FILE, &hFile))
-        {
-            nError = GetLastError();
-            printf("Failed to open patched file \"%s\"\n", szFileName);
-        }
-    }
-
-    // Verify of the patched version is correct
-    if(nError == ERROR_SUCCESS)
-    {
-        TCHAR * szPatchChain = NULL;
-        DWORD cbPatchChain = 0;
-
-        // Get the patch chain
-        SFileGetFileInfo(hFile, SFILE_INFO_PATCH_CHAIN, szPatchChain, cbPatchChain, &cbPatchChain);
-        szPatchChain = (TCHAR *)(new BYTE[cbPatchChain]);
-        SFileGetFileInfo(hFile, SFILE_INFO_PATCH_CHAIN, szPatchChain, cbPatchChain, &cbPatchChain);
-        delete [] szPatchChain;
-
-        // Get the size of the full patched file
-        dwFileSize = SFileGetFileSize(hFile, NULL);
-        if(dwFileSize != 0)
-        {
-            DWORD dwBytesRead = 0;
-            BYTE TempData[0x100];
-
-            SFileReadFile(hFile, TempData, sizeof(TempData), &dwBytesRead, NULL);
-            SFileSetFilePointer(hFile, 0, NULL, FILE_BEGIN);
-
-            // Allocate space for the full file
-            pbFullFile = new BYTE[dwFileSize];
-            if(pbFullFile != NULL)
-            {
-                if(!SFileReadFile(hFile, pbFullFile, dwFileSize, NULL, NULL))
-                {
-                    nError = GetLastError();
-                    printf("Failed to read full patched file data \"%s\"\n", szFileName);
-                }
-
-                if(nError == ERROR_SUCCESS)
-                {
-                    MergeLocalPath(szLocFileName, MAKE_PATH("Work//"), GetPlainFileNameA(szFileName));
-                    pStream = FileStream_CreateFile(szLocFileName, STREAM_PROVIDER_LINEAR | BASE_PROVIDER_FILE);
-                    if(pStream != NULL)
-                    {
-                        FileStream_Write(pStream, NULL, pbFullFile, dwFileSize);
-                        FileStream_Close(pStream);
-                    }
-                }
-
-                delete [] pbFullFile;
-            }
-        }
-    }
-
-    // Close handles
-    if(hFile != NULL)
-        SFileCloseFile(hFile);
-    if(hMpq != NULL)
-        SFileCloseArchive(hMpq);
-    return nError;
-}
-
-static int TestCompareTwoArchives(
-    const TCHAR * szMpqName1,
-    const TCHAR * szMpqName2,
-    const char * szListFile,
-    DWORD dwBlockSize)
-{
-    TMPQArchive * ha1 = NULL;
-    TMPQArchive * ha2 = NULL;
-    HANDLE hMpq1 = NULL;                // Handle of the first archive
-    HANDLE hMpq2 = NULL;                // Handle of the second archive
-    HANDLE hFile1 = NULL;
-    HANDLE hFile2 = NULL;
-    int nError = ERROR_SUCCESS;
-
-    // If no listfile or an empty one, use NULL
-    if(szListFile == NULL || *szListFile == 0)
-        szListFile = NULL;
-
-    _tprintf(_T("=============== Comparing MPQ archives ===============\n"));
-
-    // Open the first MPQ archive
-    if(nError == ERROR_SUCCESS && szMpqName1 != NULL)
-    {
-        _tprintf(_T("Opening %s ...\n"), szMpqName1);
-        if(!SFileOpenArchive(szMpqName1, 0, 0, &hMpq1))
-            nError = GetLastError();
-        ha1 = (TMPQArchive *)hMpq1;
-    }
-
-    // Open the second MPQ archive
-    if(nError == ERROR_SUCCESS && szMpqName2 != NULL)
-    {
-        _tprintf(_T("Opening %s ...\n"), szMpqName2);
-        if(!SFileOpenArchive(szMpqName2, 0, 0, &hMpq2))
-            nError = GetLastError();
-        ha2 = (TMPQArchive *)hMpq2;
-    }
-
-    // Compare the header
-    if(nError == ERROR_SUCCESS && (ha1 != NULL && ha2 != NULL))
-    {
-        if(ha1->pHeader->dwHeaderSize != ha2->pHeader->dwHeaderSize)
-            printf(" - Header size is different\n");
-        if(ha1->pHeader->wFormatVersion != ha2->pHeader->wFormatVersion)
-            printf(" - Format version is different\n");
-        if(ha1->pHeader->wSectorSize != ha2->pHeader->wSectorSize)
-            printf(" - Sector size is different\n");
-        if(ha1->pHeader->HetTableSize64 != ha2->pHeader->HetTableSize64)
-            printf(" - HET table size is different\n");
-        if(ha1->pHeader->BetTableSize64 != ha2->pHeader->BetTableSize64)
-            printf(" - BET table size is different\n");
-        if(ha1->pHeader->dwHashTableSize != ha2->pHeader->dwHashTableSize)
-            printf(" - Hash table size is different\n");
-        if(ha1->pHeader->dwBlockTableSize != ha2->pHeader->dwBlockTableSize)
-            printf(" - Block table size is different\n");
-    }
-
-    // Find all files in the first archive and compare them
-    if(nError == ERROR_SUCCESS)
-    {
-        SFILE_FIND_DATA sf;
-        TMPQFile * hf1;
-        TMPQFile * hf2;
-        HANDLE hFind = SFileFindFirstFile(hMpq1, "*", &sf, szListFile);
-        bool bResult = true;
-
-        while(hFind != NULL && bResult == true)
-        {
-//          printf("%s           \r", sf.cFileName);
-            SFileSetLocale(sf.lcLocale);
-
-            // Open the first file
-            if(!SFileOpenFileEx(hMpq1, sf.cFileName, 0, &hFile1))
-                printf("Failed to open the file %s in the first archive\n", sf.cFileName);
-
-            if(!SFileOpenFileEx(hMpq2, sf.cFileName, 0, &hFile2))
-                printf("Failed to open the file %s in the second archive\n", sf.cFileName);
-
-            if(hFile1 != NULL && hFile2 != NULL)
-            {
-                // Get the TMPQFile pointers
-                hf1 = (TMPQFile *)hFile1;
-                hf2 = (TMPQFile *)hFile2;
-
-                // Compare the file sizes
-                if(hf1->pFileEntry->dwFileSize != hf2->pFileEntry->dwFileSize)
-                    printf("Different file size: %s (%u x %u)\n", sf.cFileName, hf1->pFileEntry->dwFileSize, hf2->pFileEntry->dwFileSize);
-
-                if(hf1->pFileEntry->dwCmpSize != hf2->pFileEntry->dwCmpSize)
-                    printf("Different cmpr size: %s (%u x %u)\n", sf.cFileName, hf1->pFileEntry->dwCmpSize, hf2->pFileEntry->dwCmpSize);
-
-                if(hf1->pFileEntry->dwFlags != hf2->pFileEntry->dwFlags)
-                    printf("Different mpq flags: %s (%08X x %08X)\n", sf.cFileName, hf1->pFileEntry->dwFlags, hf2->pFileEntry->dwFlags);
-
-                if(!CompareArchivedFiles(sf.cFileName, hFile1, hFile2, dwBlockSize))
-                    printf("Different file data: %s\n", sf.cFileName);
-
-//              if(!CompareArchivedFilesRR(sf.cFileName, hFile1, hFile2, dwBlockSize))
-//                  printf("Different file data: %s\n", sf.cFileName);
-            }
-
-            // Close both files
-            if(hFile2 != NULL)
-                SFileCloseFile(hFile2);
-            if(hFile1 != NULL)
-                SFileCloseFile(hFile1);
-            hFile2 = hFile1 = NULL;
-
-            // Find the next file
-            bResult = SFileFindNextFile(hFind, &sf);
-        }
-
-        // Close the find handle
-        if(hFind != NULL)
-            SFileFindClose(hFind);
-    }
-
-    // Close both archives
-    clreol();
-    printf("================ MPQ compare complete ================\n");
-    if(hMpq2 != NULL)
-        SFileCloseArchive(hMpq2);
-    if(hMpq1 != NULL)
-        SFileCloseArchive(hMpq1);
-    return nError;
-}
-
-//-----------------------------------------------------------------------------
-// Searching all known MPQs
-
-#ifdef _WIN32
-static int TestSearchOneArchive(const TCHAR * szMpqName)
-{
-    SFILE_FIND_DATA sf;
-    HANDLE hFind;
-    HANDLE hMpq;
-    const TCHAR * szExtension;
-    bool bFound = true;
-
-    // Get the file extension
-    szExtension = _tcsrchr(szMpqName, _T('.'));
-    if(szExtension == NULL)
-        return ERROR_SUCCESS;
-
-    // Only search defined extensions
-    if(_tcsicmp(szExtension, _T(".mpq")) && _tcsnicmp(szExtension, _T(".SC2"), 4))
-        return ERROR_SUCCESS;
-
-    _tprintf(_T("Searching %s ...\n"), szMpqName);
-
-    // Try to open the MPQ
-    if(SFileOpenArchive(szMpqName, 0, MPQ_OPEN_READ_ONLY, &hMpq))
-    {
-        hFind = SFileFindFirstFile(hMpq, "*", &sf, NULL);
-        if(hFind != NULL)
-        {
-            while(bFound)
-            {
-                if(sf.dwFileFlags & MPQ_FILE_DELETE_MARKER)
-                    _tprintf(_T("Delete marker: %s:%hs\n"), szMpqName, sf.cFileName);
-
-                bFound = SFileFindNextFile(hFind, &sf);
-            }
-        }
-
-        SFileCloseArchive(hMpq);
-    }
-
-    return ERROR_SUCCESS;
-}
-
-static int TestSearchAllArchives(const TCHAR * szSearchMask)
-{
-    WIN32_FIND_DATA wf;
-    LPTSTR szFilePart;
-    HANDLE hFind;
-    TCHAR szFullPath[MAX_PATH];
-    BOOL bFound = TRUE;
-
-    // Initiate search
-    _tcscpy(szFullPath, szSearchMask);
-    szFilePart = _tcschr(szFullPath, _T('*'));
-    assert(szFilePart != NULL);
-
-    // Begin search
-    hFind = FindFirstFile(szSearchMask, &wf);
-    if(hFind != INVALID_HANDLE_VALUE)
-    {
-        while(bFound)
-        {
-            // Eliminate "." and ".."
-            if(wf.cFileName[0] != _T('.'))
-            {
-                // Construct the full path
-                _tcscpy(szFilePart, wf.cFileName);
-
-                // If it a directory?
-                if(wf.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-                {
-                    _tcscat(szFullPath, _T("\\*"));
-                    TestSearchAllArchives(szFullPath);
-                }
-                else
-                {
-                    TestSearchOneArchive(szFullPath);
-                }
-            }
-            bFound = FindNextFile(hFind, &wf);
-        }
-        FindClose(hFind);
-    }
-
-    return ERROR_SUCCESS;
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// Main
-//
-
-int main(void)
-{
-    int nError = ERROR_SUCCESS;
-
-#if defined(_MSC_VER) && defined(_DEBUG)
-    _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
-#endif  // defined(_MSC_VER) && defined(_DEBUG)
-
-//  FileStream_OpenEncrypted(_T("e:\\Multimedia\\MPQs\\2010 - Starcraft II\\Installer UI 2 deDE.MPQE"));
-
-    // Mix the random number generator
-//  srand(GetTickCount());
-
-    // Test structure sizes
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestStructureSizes();
-
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestOpenLocalFile("C:\\autoexec.bat");
-
-    // Test reading partial file
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestPartFileRead(MAKE_PATH("2009 - PartialMPQs/patch.MPQ.part"));
-
-//  if(nError == ERROR_SUCCESS)
-//      nError = ComparePklibCompressions();
-
-    // Test LZMA compression method against the code ripped from Starcraft II
-//  if(nError == ERROR_SUCCESS)
-//      nError = CompareLzmaCompressions(MPQ_SECTOR_SIZE);
-
-    // Test compression methods
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestSectorCompress(MPQ_SECTOR_SIZE);
-
-    // Test the archive open and close
-    if(nError == ERROR_SUCCESS)
-        nError = TestArchiveOpenAndClose(MAKE_PATH("BrooDat.mpq"));
-//      nError = TestArchiveOpenAndClose(MAKE_PATH("2011 - WoW BETA/wow-update-13202.MPQ"));
-//      nError = TestArchiveOpenAndClose(MAKE_PATH("2002 - Warcraft III/ProtectedMap_HashTable_FakeValid.w3x"));
-//      nError = TestArchiveOpenAndClose(MAKE_PATH("2010 - Starcraft II/Installer Tome 1 enGB.MPQE"));
-//      nError = TestArchiveOpenAndClose(MAKE_PATH("1997 - Diablo I/DIABDAT_orig.MPQ"));
-//      nError = TestArchiveOpenAndClose(MAKE_PATH("2004 - World of Warcraft/SoundCache-enUS.MPQ"));
-//      nError = TestArchiveOpenAndClose(MAKE_PATH("smpq.mpq "));
-
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestFindFiles(MAKE_PATH("2002 - Warcraft III/HumanEd.mpq"));
-
-    // Create a big MPQ archive
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestCreateArchive_PaliRoharBug(MAKE_PATH("Test.mpq"));
-//      nError = TestCreateArchive(MAKE_PATH("Test.mpq"));
-//      nError = TestCreateArchive((const TCHAR*)szUnicodeName1);
-//      nError = TestCreateArchive((const TCHAR*)szUnicodeName2);
-//      nError = TestCreateArchive((const TCHAR*)szUnicodeName3);
-//      nError = TestCreateArchive((const TCHAR*)szUnicodeName4);
-//      nError = TestCreateArchive((const TCHAR*)szUnicodeName5);
-//      nError = TestCreateArchive((const TCHAR*)szUnicodeName6);
-
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestAddFilesToMpq(MAKE_PATH("wow-update-13202.MPQ"),
-//                                 "c:\\Tools32\\Arj32.exe",
-//                                 "c:\\Tools32\\autoruns.chm",
-//                                 "c:\\Tools32\\CPUEater.exe",
-//                                 "c:\\Tools32\\dumpbin.exe",
-//                                 "c:\\Tools32\\editbin.exe",
-//                                 "c:\\Tools32\\fsg.ini",
-//                                 "c:\\Tools32\\hiew8.ini",
-//                                 "c:\\Tools32\\ida.bat",
-//                                 "c:\\Tools32\\mp3.ini",
-//                                 NULL);
-
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestCreateArchiveFromMemory(MAKE_PATH("Test-leak.mpq"));
-
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestFileReadAndWrite(MAKE_PATH("2002 - Warcraft III/(10)DustwallowKeys.w3m"), "war3map.j");
-
-    // Verify the archive signature
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestSignatureVerify(MAKE_PATH("1998 - Starcraft/BW-1152.exe"));
-//      nError = TestSignatureVerify(MAKE_PATH("2002 - Warcraft III/(10)DustwallowKeys.w3m"));
-//      nError = TestSignatureVerify(MAKE_PATH("2002 - Warcraft III/War3TFT_121b_English.exe"));
-//      nError = TestSignatureVerify(MAKE_PATH("2004 - World of Warcraft/WoW-2.3.3.7799-to-2.4.0.8089-enUS-patch.exe"));
-//      nError = TestSignatureVerify(MAKE_PATH("2004 - World of Warcraft/standalone.MPQ"));
-
-    // Compact the archive
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestMpqCompacting(MAKE_PATH("wow-update-base-14333.MPQ"));
-
-    // Create copy of the archive, appending some bytes before the MPQ header
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestCreateArchiveCopy(MAKE_PATH("PartialMPQs/interface.MPQ.part"), MAKE_PATH("PartialMPQs/interface-copy.MPQ.part"), NULL);
-
-/*
-    if(nError == ERROR_SUCCESS)
-    {
-        nError = TestOpenPatchedArchive(MAKE_PATH("2011 - WoW 4.x/locale-enGB.MPQ"),
-                                        MAKE_PATH("2011 - WoW 4.x/wow-update-13164.MPQ"),
-                                        MAKE_PATH("2011 - WoW 4.x/wow-update-13205.MPQ"),
-                                        MAKE_PATH("2011 - WoW 4.x/wow-update-13287.MPQ"),
-                                        MAKE_PATH("2011 - WoW 4.x/wow-update-13329.MPQ"),
-                                        MAKE_PATH("2011 - WoW 4.x/wow-update-13596.MPQ"),
-                                        MAKE_PATH("2011 - WoW 4.x/wow-update-13623.MPQ"),
-                                        MAKE_PATH("2011 - WoW 4.x/wow-update-enGB-13914.MPQ"),
-                                        MAKE_PATH("2011 - WoW 4.x/wow-update-enGB-14007.MPQ"),
-                                        MAKE_PATH("2011 - WoW 4.x/wow-update-enGB-14333.MPQ"),
-                                        MAKE_PATH("2011 - WoW 4.x/wow-update-enGB-14480.MPQ"),
-                                        NULL);
-    }
-*/
-
-    if(nError == ERROR_SUCCESS)
-    {
-        nError = TestCompareTwoArchives(MAKE_PATH("Sound-copy.mpq"),
-                                        MAKE_PATH("Sound.mpq"),
-                                        NULL,
-                                        0x1001);
-    }
-
-
-//  if(nError == ERROR_SUCCESS)
-//      nError = TestSearchAllArchives(MAKE_PATH("*"));
-
-    return nError;
-}
diff --git a/dep/StormLibOld/test/starcraft_lzma.asm b/dep/StormLibOld/test/starcraft_lzma.asm
deleted file mode 100644
index 0da46b20e..000000000
--- a/dep/StormLibOld/test/starcraft_lzma.asm
+++ /dev/null
@@ -1,11066 +0,0 @@
-;
-;  LZMA compression code ripped from Starctaft II BEta
-;  Used while StormLib's LZMA implementation was tested against Starcraft compression
-;  Not used in StormLib.
-;
-
-.686P
-.MODEL FLAT
-ASSUME FS: NOTHING
-
-.DATA
-
-;---------------------------------------------------------------------------
-; Data
-
-byte_4CB248     db      0,   0Bh,   0Bh,   0Bh ; indirect table for switch statement
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db      1,     2,     3,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db      4,     5,     6,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db      7,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db      8,     9,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Ah
-                align 10h
-
-dword_544960    dd 0BB40E64Eh           ; DATA XREF: sub_401C72+B
-dword_553598    dd ?                    ; DATA XREF: sub_4CB8A0+9
-
-off_50CD3C      dd offset sub_4A0605    ; DATA XREF: sub_4A05F7+1o
-                                        ; .data:off_52A004o ...
-dword_50CD40    dd 0E06D7363h           ; DATA XREF: _CxxThrowException(x,x)+Eo
-                dd 1
-                dd 0
-                dd 0
-                dd 3
-                dd 19930520h
-                dd 0
-                dd 0
-
-; ---------------------------------------------------------------------------
-
-off_546E20      dd offset sub_4CDD70    ; DATA XREF: sub_4D0270:loc_4D0324o
-off_546E24      dd offset sub_4CDD90    ; DATA XREF: sub_4CF810+53r
-off_546E28      dd offset off_50CD3C    ; DATA XREF: .rdata:off_51B888o
-                dd 0
-                db '.?AUISequentialInStream@@',0
-                db 0
-                db    0
-off_546E4C      dd offset off_50CD3C    ; DATA XREF: .rdata:off_51B8C0o
-                dd 0
-                db '.?AUISequentialOutStream@@',0
-                db    0
-off_546E70      dd offset off_50CD3C    ; DATA XREF: .rdata:off_51B8F8o
-                dd 0
-                db '.?AUICompressCoder@@',0
-                db    0
-                db    0
-                db    0
-off_546E90      dd offset off_50CD3C    ; DATA XREF: .rdata:off_51B944o
-                dd 0
-                db '.?AUICompressSetOutStream@@',0
-off_546EB4      dd offset off_50CD3C    ; DATA XREF: .rdata:0051B96Co
-                dd 0
-                db '.?AUICompressSetCoderProperties@@',0
-                db    0
-                db    0
-off_546EE0      dd offset off_50CD3C    ; DATA XREF: .rdata:0051B9B8o
-                dd 0
-                db '.?AUICompressWriteCoderProperties@@',0
-                dd offset off_50CD3C
-                dd 0
-                db '.?AUCSystemException@@',0
-                db 0
-                dd offset off_50CD3C
-                dd 0
-                db '.?AUCOutBufferException@@',0
-                db    0
-                db    0
-off_546F50      dd offset off_50CD3C    ; DATA XREF: .rdata:0051BA04o
-                dd 0
-                db '.?AVCInStreamMemory@@',0
-                db    0
-                db    0
-off_546F70      dd offset off_50CD3C    ; DATA XREF: .rdata:off_51BA4Co
-                dd 0
-                db '.?AVCMyUnknownImp@@',0
-off_546F8C      dd offset off_50CD3C    ; DATA XREF: .rdata:0051BAA8o
-                dd 0
-                db '.?AVCOutStreamMemory@@',0
-                db    0
-off_546FAC      dd offset off_50CD3C    ; DATA XREF: .rdata:0051BAFCo
-                dd 0
-                db '.?AVCEncoder@NLZMA@NCompress@@',0
-                db    0
-off_546FD4      dd offset off_50CD3C    ; DATA XREF: .rdata:off_51BBECo
-                dd 0
-                db '.?AVCBaseState@NLZMA@NCompress@@',0
-                db    0
-                db    0
-                db    0
-
-; ---------------------------------------------------------------------------
-
-dword_51B960    dd 0                    ; DATA XREF: .rdata:00517A64o
-                dd 0
-                dd 0
-                dd offset off_546EB4
-                dd 0    ; offset dword_51B974
-
-dword_51B9AC    dd 0                    ; DATA XREF: .rdata:00517A78o
-                dd 0
-                dd 0
-                dd offset off_546EE0
-                dd 0    ;offset dword_51B9C0
-
-dword_51B9F8    dd 0                    ; DATA XREF: .rdata:00517A8Co
-                dd 0
-                dd 0
-                dd offset off_546F50
-                dd 0    ; offset dword_51BA0C
-
-dword_51BA9C    dd 0                    ; DATA XREF: .rdata:00517AA0o
-                dd 0
-                dd 0
-                dd offset off_546F8C
-                dd 0    ; offset dword_51BAB0
-
-dword_51BAF0    dd 0                    ; DATA XREF: .rdata:00517AF8o
-                dd 0
-                dd 0
-                dd offset off_546FAC
-                dd 0    ; offset dword_51BB04
-
-dword_51BC58    dd 0                    ; DATA XREF: .rdata:00517AE0o
-                dd 4
-                dd 0
-                dd offset off_546FAC
-                dd 0    ; offset dword_51BB04
-
-dword_51BC6C    dd 0                    ; DATA XREF: .rdata:00517ACCo
-                dd 8
-                dd 0
-                dd offset off_546FAC
-                dd 0    ; offset dword_51BB04
-
-dword_51BC80    dd 0                    ; DATA XREF: .rdata:00517AB8o
-                dd 0Ch
-                dd 0
-                dd offset off_546FAC
-                dd 0    ; offset dword_51BB04
-
-; ---------------------------------------------------------------------------
-
-dword_512730    dd 0                    ; DATA XREF: sub_48DB4D+B9o
-dword_512734    dd 0                    ; DATA XREF: CCmdTarget::GetInterface(void const *)+2Dr
-dword_512738    dd 0C0h                 ; DATA XREF: CCmdTarget::GetInterface(void const *)+38r
-dword_51273C    dd 46000000h            ; DATA XREF: CCmdTarget::GetInterface(void const *)+43r
-
-dword_5535A0    dd ?                    ; DATA XREF: sub_4CF900:loc_4CF94Co
-dword_5535A4    dd ?                    ; DATA XREF: .text:004DAF37w
-dword_5535A8    dd ?                    ; DATA XREF: .text:004DAF3Cw
-dword_5535AC    dd ?                    ; DATA XREF: .text:004DAF41w
-
-dword_5535B0    dd ?                    ; DATA XREF: sub_4CF900+5Eo
-dword_5535B4    dd ?                    ; DATA XREF: .text:004DAF17w
-dword_5535B8    dd ?                    ; DATA XREF: .text:004DAF1Cw
-dword_5535BC    dd ?                    ; DATA XREF: .text:004DAF21w
-
-dword_5535C0    dd ?                    ; DATA XREF: sub_4CF900:loc_4CF98Fo
-dword_5535C4    dd ?                    ; DATA XREF: .text:004DAEF7w
-dword_5535C8    dd ?                    ; DATA XREF: .text:004DAEFCw
-dword_5535CC    dd ?                    ; DATA XREF: .text:004DAF01w
-
-
-dword_526DD0    dd 0                    ; DATA XREF: .text:loc_4CF6CBo
-                dd 0
-                dd 0
-                dd 0    ; offset dword_526DE0
-
-kLiteralNextStates db 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5
-kMatchNextStates db 7, 7, 7, 7, 7, 7, 7, 0Ah, 0Ah, 0Ah, 0Ah, 0Ah
-kRepNextStates  db 8, 8, 8, 8, 8, 8, 8, 0Bh, 0Bh, 0Bh, 0Bh, 0Bh
-kShortRepNextStates db 9, 9, 9, 9, 9, 9, 9, 0Bh, 0Bh, 0Bh, 0Bh, 0Bh
-
-dword_550998    dd 200h dup(?)
-dword_551198    dd 800h dup(?)
-dword_553198    dd 100h dup(?)
-
-ICompressSetOutStream_vftable      dd offset __purecall    ; DATA XREF: NCompress_NLZMA_CEncoder_CEncoder+2o
-                dd offset __purecall
-                dd offset __purecall
-                dd offset __purecall
-                dd offset __purecall
-                dd offset dword_51B960
-ICompressSetCoderProperties_vftable   dd offset __purecall    ; DATA XREF: NCompress_NLZMA_CEncoder_CEncoder+9o
-                dd offset __purecall
-                dd offset __purecall
-                dd offset __purecall
-                dd offset dword_51B9AC
-ICompressWriteCoderProperties_vftable      dd offset __purecall    ; DATA XREF: NCompress_NLZMA_CEncoder_CEncoder+10o
-                dd offset __purecall
-                dd offset __purecall
-                dd offset __purecall
-                dd offset dword_51B9F8
-off_517A90      dd offset Interface1_QueryInterface
-                dd offset Interface1_AddRef
-                dd offset Interface1_Release
-                dd offset sub_4CCB20
-                dd offset dword_51BA9C
-off_517AA4      dd offset Interface1_QueryInterface ; DATA XREF: sub_4CF610+Eo
-                dd offset Interface1_AddRef
-                dd offset Interface2_Release
-                dd offset sub_4CCB90
-                dd offset sub_4CF590
-                dd offset dword_51BC80
-NCompress_NLZMA_CEncoder_vftable_ICompressWriteCoderProperties      dd offset sub_4CFA50    ; DATA XREF: sub_4CF810+3Do
-                dd offset sub_4CFA10
-                dd offset sub_4CFA70
-                dd offset sub_4CDDB0
-                dd offset dword_51BC6C
-NCompress_NLZMA_CEncoder_vftable_ICompressSetCoderProperties      dd offset ICompressSetCoderProperties_QueryInterface    ; DATA XREF: sub_4CF810+36o
-                dd offset ICompressSetCoderProperties_AddRef
-                dd offset ICompressSetCoderProperties_Release
-                dd offset ICompressSetCoderProperties_SetCoderProperties
-                dd offset dword_51BC58
-NCompress_NLZMA_CEncoder_vftable_ICompressSetOutStream      dd offset sub_4CFA20    ; DATA XREF: sub_4CF810+2Fo
-                dd offset sub_4CFA80
-                dd offset sub_4CFA40
-                dd offset sub_4CFA90
-                dd offset sub_4CDE70
-                dd offset dword_51BAF0
-NCompress_NLZMA_CEncoder_vftable      dd offset sub_4CF900    ; DATA XREF: sub_4CF810+29o
-                dd offset sub_4CF9D0
-                dd offset sub_4CF9E0
-                dd offset CEncoder_Code
-                dd offset sub_4D0250
-
-.CODE
-
-extrn _operator_new:PROC
-extrn __allshr: PROC
-extrn _free: PROC
-extrn _memcmp: PROC
-extrn _memcpy: PROC
-extrn _memset: PROC
-extrn ___report_gsfailure: PROC
-extrn __purecall: PROC
-VirtualAlloc PROTO STDCALL :DWORD,:DWORD,:DWORD,:DWORD
-VirtualFree PROTO STDCALL :DWORD,:DWORD,:DWORD
-
-; ---------------------------------------------------------------------------
-
-; void __cdecl j__free(void *Memory)
-; 004843B8
-j__free         proc near               ; CODE XREF: sub_401048+16p
-                                        ; .text:004010CFp ...
-                jmp     _free
-j__free         endp
-
-
-; ---------------------------------------------------------------------------
-
-; int __cdecl unknown_libname_324(void *Buf1, void *Buf2)
-unknown_libname_324 proc near
-; sub_48B7BA
-
-Buf1            = dword ptr  4
-Buf2            = dword ptr  8
-
-                push    10h             ; Size
-                push    [esp+4+Buf2]    ; Buf2
-                push    [esp+8+Buf1]    ; Buf1
-                call    _memcmp
-                add     esp, 0Ch
-                neg     eax
-                sbb     eax, eax
-                inc     eax
-                retn
-unknown_libname_324 endp
-
-; ---------------------------------------------------------------------------
-
-sub_4A05F7      proc near               ; CODE XREF: sub_4A0605+3p
-                push    ecx
-                mov     dword ptr [ecx], offset off_50CD3C
-                call    sub_4A98B8
-                pop     ecx
-                retn
-sub_4A05F7      endp
-
-; ---------------------------------------------------------------------------
-
-; int __thiscall sub_4A0605(void *Memory, char)
-sub_4A0605      proc near               ; DATA XREF: .rdata:off_50CD3Co
-
-arg_0           = byte ptr  4
-
-                push    esi
-                mov     esi, ecx
-                call    sub_4A05F7
-                test    [esp+4+arg_0], 1
-                jz      short loc_4A061B
-                push    esi             ; Memory
-                call    j__free
-                pop     ecx
-
-loc_4A061B:                             ; CODE XREF: sub_4A0605+Dj
-                mov     eax, esi
-                pop     esi
-                retn    4
-sub_4A0605      endp
-
-; ---------------------------------------------------------------------------
-
-sub_4A0686      proc near               ; CODE XREF: sub_401C72+49p
-                                        ; sub_40222F+15Cp ...
-                cmp     ecx, dword_544960
-                jnz     short loc_4A0690
-                retn
-loc_4A0690:                             ; CODE XREF: sub_4A0686+6j
-                jmp     ___report_gsfailure
-sub_4A0686      endp
-
-; ---------------------------------------------------------------------------
-
-sub_4A98B8      proc near               ; CODE XREF: sub_4A05F7+7p
-
-                int     3
-                retn
-sub_4A98B8      endp
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CAEC0      proc near               ; CODE XREF: CEncoder_GetOptimum+514p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                push    esi
-                push    edi
-                mov     edi, [esp+8+arg_4]
-                lea     eax, [edi-2]
-                cmp     eax, 4
-                mov     esi, ecx
-                jb      short loc_4CAED5
-                mov     eax, 3
-
-loc_4CAED5:                             ; CODE XREF: sub_4CAEC0+Ej
-                mov     edx, [esp+8+arg_0]
-                cmp     edx, 80h
-                jnb     short loc_4CAEEF
-                shl     eax, 7
-                add     eax, edx
-                mov     ecx, [esi+eax*4+33314h]
-                jmp     short loc_4CAF25
-; ---------------------------------------------------------------------------
-
-loc_4CAEEF:                             ; CODE XREF: sub_4CAEC0+1Fj
-                mov     ecx, 7FFFFh
-                sub     ecx, edx
-                sar     ecx, 1Fh
-                push    ebx
-                and     ecx, 0Ch
-                add     ecx, 6
-                mov     ebx, edx
-                shr     ebx, cl
-                shl     eax, 5
-                add     eax, ecx
-                and     edx, 0Fh
-                movzx   ebx, byte ptr dword_551198[ebx]
-                lea     eax, [ebx+eax*2]
-                mov     ecx, [esi+eax*4+32F14h]
-                add     ecx, [esi+edx*4+33B14h]
-                pop     ebx
-
-loc_4CAF25:                             ; CODE XREF: sub_4CAEC0+2Dj
-                mov     edx, [esp+8+arg_8]
-                imul    edx, 110h
-                add     edx, edi
-                mov     eax, [esi+edx*4+295B8h]
-                pop     edi
-                add     eax, ecx
-                pop     esi
-                retn    0Ch
-sub_4CAEC0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CAF40:                             ; CODE XREF: .text:004DAED5j
-                push    ecx
-                push    ebx
-                push    ebp
-                push    esi
-                mov     ebp, 2
-                mov     bl, 2
-                push    edi
-                mov     byte ptr dword_551198, 0
-                mov     byte ptr dword_551198+1, 1
-                mov     [esp+10h], bl
-                mov     edi, ebp
-
-loc_4CAF60:                             ; CODE XREF: .text:004CAF96j
-                mov     ecx, edi
-                shr     ecx, 1
-                sub     ecx, 1
-                mov     esi, 1
-                shl     esi, cl
-                test    esi, esi
-                jbe     short loc_4CAF89
-                mov     ecx, [esp+10h]
-                push    esi
-                lea     eax, dword_551198[ebp]
-                push    ecx
-                push    eax
-                call    _memset
-                add     esp, 0Ch
-                add     ebp, esi
-
-loc_4CAF89:                             ; CODE XREF: .text:004CAF70j
-                add     bl, 1
-                add     edi, 1
-                cmp     bl, 1Ah
-                mov     [esp+10h], bl
-                jb      short loc_4CAF60
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CAFA0      proc near               ; CODE XREF: sub_4CAFC0+90p
-
-arg_0           = dword ptr  4
-
-                mov     eax, [esp+arg_0]
-                lea     ecx, [eax-61h]
-                cmp     cx, 19h
-                ja      short locret_4CAFB2
-                add     eax, 0FFE0h
-
-locret_4CAFB2:                          ; CODE XREF: sub_4CAFA0+Bj
-                retn
-sub_4CAFA0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CAFC0      proc near               ; CODE XREF: ICompressSetCoderProperties_SetCoderProperties+A5p
-                movzx   ecx, word ptr [eax]
-                lea     edx, [ecx-61h]
-                cmp     dx, 19h
-                ja      short loc_4CAFD2
-                add     ecx, 0FFE0h
-
-loc_4CAFD2:                             ; CODE XREF: sub_4CAFC0+Aj
-                add     eax, 2
-                cmp     cx, 48h
-                jnz     short loc_4CB01B
-                movzx   ecx, word ptr [eax]
-                lea     edx, [ecx-61h]
-                cmp     dx, 19h
-                ja      short loc_4CAFED
-                add     ecx, 0FFE0h
-
-loc_4CAFED:                             ; CODE XREF: sub_4CAFC0+25j
-                add     eax, 2
-                cmp     cx, 43h
-                jz      short loc_4CAFF9
-
-loc_4CAFF6:                             ; CODE XREF: sub_4CAFC0+44j
-                                        ; sub_4CAFC0+4Bj ...
-                xor     eax, eax
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CAFF9:                             ; CODE XREF: sub_4CAFC0+34j
-                movzx   ecx, word ptr [eax]
-                sub     ecx, 30h
-                lea     edx, [ecx-4]
-                test    edx, edx
-                ja      short loc_4CAFF6
-                cmp     word ptr [eax+2], 0
-                jnz     short loc_4CAFF6
-                mov     dword ptr [ebx], 0
-                mov     [edi], ecx
-                mov     eax, 1
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CB01B:                             ; CODE XREF: sub_4CAFC0+19j
-                cmp     cx, 42h
-                jnz     short loc_4CAFF6
-                movzx   ecx, word ptr [eax]
-                lea     edx, [ecx-61h]
-                cmp     dx, 19h
-                ja      short loc_4CB033
-                add     ecx, 0FFE0h
-
-loc_4CB033:                             ; CODE XREF: sub_4CAFC0+6Bj
-                add     eax, 2
-                cmp     cx, 54h
-                jnz     short loc_4CAFF6
-                push    esi
-                movzx   esi, word ptr [eax]
-                sub     esi, 30h
-                lea     ecx, [esi-2]
-                cmp     ecx, 2
-                ja      short loc_4CB06C
-                movzx   eax, word ptr [eax+2]
-                push    eax
-                call    sub_4CAFA0
-                add     esp, 4
-                test    ax, ax
-                jnz     short loc_4CB06C
-                mov     dword ptr [ebx], 1
-                mov     [edi], esi
-                mov     eax, 1
-                pop     esi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CB06C:                             ; CODE XREF: sub_4CAFC0+89j
-                                        ; sub_4CAFC0+9Bj
-                xor     eax, eax
-                pop     esi
-                retn
-sub_4CAFC0      endp
-
-
-ICompressSetCoderProperties_SetCoderProperties      proc near               ; DATA XREF: .rdata:00517ADCo
-
-var_4           = dword ptr -4
-pThis           = dword ptr  4
-propIDs         = dword ptr  8
-properties      = dword ptr  0Ch
-numProperties   = dword ptr  10h
-
-                push    ecx
-                push    ebx
-                push    ebp
-                xor     edx, edx
-                cmp     [esp+0Ch+numProperties], edx
-                push    esi
-                push    edi
-                mov     [esp+14h+var_4], edx
-                jbe     loc_4CB20D
-                mov     esi, [esp+14h+properties]
-                mov     ebp, [esp+14h+pThis]
-                lea     ecx, [ecx+0]
-
-loc_4CB090:                             ; CODE XREF: sub_4CB070+197j
-                mov     eax, [esp+14h+propIDs]
-                mov     eax, [eax+edx*4]
-                add     eax, 0FFFFFC00h
-                cmp     eax, 90h        ; switch 145 cases
-                ja      loc_4CB131      ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                movzx   ecx, ds:byte_4CB248[eax]
-                jmp     ds:off_4CB218[ecx*4] ; switch jump
-
-loc_4CB0B5:                             ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 80
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, [esi+8]
-                lea     ecx, [eax-5]
-                cmp     ecx, 10Ch
-                ja      short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     [ebp+32EF0h], eax
-                jmp     loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB0D4:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 82
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, [esi+8]
-                mov     [ebp+33B88h], eax
-                jmp     loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB0E8:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 112
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                cmp     dword ptr [esi+8], 0
-                setz    cl
-                mov     [ebp+32EECh], cl
-                jmp     loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB100:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 8 ; jumptable 004CB0AE case 81
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, [esi+8]
-                lea     edi, [ebp+0C4h]
-                lea     ebx, [ebp+0CCh]
-                call    sub_4CAFC0
-                test    eax, eax
-                jz      short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     edx, [esp+14h+var_4]
-                jmp     loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB127:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 0Bh ; jumptable 004CB0AE case 128
-                jz      loc_4CB1F9
-
-loc_4CB131:                             ; CODE XREF: sub_4CB070+31j
-                                        ; sub_4CB070+3Ej ...
-                pop     edi             ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                pop     esi
-                pop     ebp
-                mov     eax, 80070057h
-                pop     ebx
-                pop     ecx
-                retn    10h
-; ---------------------------------------------------------------------------
-
-loc_4CB13E:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 129
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                jmp     loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB149:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 0
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, [esi+8]
-                lea     ecx, [eax-1]
-                cmp     ecx, 3FFFFFFFh
-                ja      short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     [ebp+33B64h], eax
-                xor     ecx, ecx
-
-loc_4CB165:                             ; CODE XREF: sub_4CB070+106j
-                mov     edi, 1
-                shl     edi, cl
-                cmp     eax, edi
-                jbe     short loc_4CB178
-                add     ecx, 1
-                cmp     ecx, 1Eh
-                jb      short loc_4CB165
-
-loc_4CB178:                             ; CODE XREF: sub_4CB070+FEj
-                lea     eax, [ecx+ecx]
-                mov     [ebp+33B50h], eax
-                jmp     short loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB183:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 64
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     ecx, [esi+8]
-                cmp     ecx, 4
-                ja      short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, 1
-                shl     eax, cl
-                mov     [ebp+33B54h], ecx
-                sub     eax, 1
-                mov     [ebp+33B58h], eax
-                jmp     short loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB1A9:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 66
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, [esi+8]
-                cmp     eax, 4
-                ja      loc_4CB131      ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     [ebp+33B5Ch], eax
-                jmp     short loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB1C3:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 65
-                jnz     loc_4CB131      ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, [esi+8]
-                cmp     eax, 8
-                ja      loc_4CB131      ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     [ebp+33B60h], eax
-                jmp     short loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB1E1:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 0Bh ; jumptable 004CB0AE case 144
-                jnz     loc_4CB131      ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                cmp     word ptr [esi+8], 0FFFFh
-                setz    cl
-                mov     [ebp+33B8Ch], cl
-
-loc_4CB1F9:                             ; CODE XREF: sub_4CB070+5Fj
-                                        ; sub_4CB070+73j ...
-                add     edx, 1
-                add     esi, 10h
-                cmp     edx, [esp+14h+numProperties]
-                mov     [esp+14h+var_4], edx
-                jb      loc_4CB090
-
-loc_4CB20D:                             ; CODE XREF: sub_4CB070+Fj
-                pop     edi
-                pop     esi
-                pop     ebp
-                xor     eax, eax
-                pop     ebx
-                pop     ecx
-                retn    10h
-
-off_4CB218      dd offset loc_4CB149, offset loc_4CB183, offset loc_4CB1C3
-                dd offset loc_4CB1A9, offset loc_4CB0B5, offset loc_4CB100 ; jump table for switch statement
-                dd offset loc_4CB0D4, offset loc_4CB0E8, offset loc_4CB127
-                dd offset loc_4CB13E, offset loc_4CB1E1, offset loc_4CB131
-
-ICompressSetCoderProperties_SetCoderProperties      endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CB2E0      proc near               ; CODE XREF: CEncoder_GetOptimum+1199p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_4]
-                lea     eax, [esi+esi*4]
-                lea     edx, [ecx+eax*8]
-                mov     [ecx+32F08h], esi
-                mov     eax, [edx+100h]
-                mov     ebx, [edx+104h]
-                push    edi
-
-loc_4CB300:                             ; CODE XREF: sub_4CB2E0+A6j
-                lea     edx, [esi+esi*4]
-                cmp     byte ptr [ecx+edx*8+0F1h], 0
-                lea     edi, [ecx+edx*8]
-                jz      short loc_4CB359
-                lea     edx, [eax+eax*4+1Eh]
-                lea     edx, [ecx+edx*8]
-                mov     dword ptr [edx+14h], 0FFFFFFFFh
-                mov     byte ptr [edx+1], 0
-                lea     edx, [eax+eax*4]
-                lea     edx, [ecx+edx*8]
-                lea     ebp, [eax-1]
-                mov     [edx+100h], ebp
-                cmp     byte ptr [edi+0F2h], 0
-                jz      short loc_4CB359
-                mov     byte ptr [edx+0C9h], 0
-                mov     ebp, [edi+0F4h]
-                mov     [edx+0D8h], ebp
-                mov     edi, [edi+0F8h]
-                mov     [edx+0DCh], edi
-
-loc_4CB359:                             ; CODE XREF: sub_4CB2E0+2Ej
-                                        ; sub_4CB2E0+58j
-                lea     edx, [eax+eax*4]
-                add     edx, edx
-                add     edx, edx
-                add     edx, edx
-                mov     edi, eax
-                test    edi, edi
-                mov     eax, [edx+ecx+100h]
-                mov     ebp, ebx
-                mov     ebx, [edx+ecx+104h]
-                mov     [edx+ecx+100h], esi
-                mov     [edx+ecx+104h], ebp
-                mov     esi, edi
-                jnz     loc_4CB300
-                mov     eax, [ecx+104h]
-                mov     edx, [esp+10h+arg_0]
-                pop     edi
-                pop     esi
-                mov     [edx], eax
-                mov     eax, [ecx+100h]
-                pop     ebp
-                mov     [ecx+32F0Ch], eax
-                pop     ebx
-                retn    8
-sub_4CB2E0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CB3B0      proc near               ; CODE XREF: CEncoder_GetOptimumFast+2Dp
-                                        ; CEncoder_GetOptimumFast+28Fp ...
-
-arg_0           = dword ptr  4
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, ecx
-                mov     ecx, [esi+80h]
-                mov     edx, [esi+78h]
-                lea     eax, [esi+32660h]
-                push    eax
-                push    ecx
-                xor     ebx, ebx
-                call    edx
-                mov     ebp, [esp+14h+arg_0]
-                add     esp, 8
-                test    eax, eax
-                mov     [ebp+0], eax
-                jbe     short loc_4CB446
-                mov     ebx, [esi+eax*4+32658h]
-                cmp     ebx, [esi+32EF8h]
-                jnz     short loc_4CB446
-                mov     eax, [esi+80h]
-                mov     ecx, [esi+70h]
-                push    edi
-                push    eax
-                call    ecx
-                mov     edx, [esi+80h]
-                mov     edi, eax
-                mov     eax, [esi+74h]
-                push    edx
-                add     edi, 1
-                call    eax
-                mov     ecx, [ebp+0]
-                mov     ecx, [esi+ecx*4+3265Ch]
-                add     esp, 8
-                sub     eax, 1
-                add     ecx, 1
-                cmp     edi, 111h
-                jbe     short loc_4CB425
-                mov     edi, 111h
-
-loc_4CB425:                             ; CODE XREF: sub_4CB3B0+6Ej
-                mov     edx, eax
-                sub     edx, ecx
-                cmp     ebx, edi
-                jnb     short loc_4CB445
-                mov     ebp, edx
-                lea     ecx, [eax+ebx]
-                sub     ebp, eax
-
-loc_4CB434:                             ; CODE XREF: sub_4CB3B0+93j
-                mov     dl, [ecx]
-                cmp     dl, [ecx+ebp]
-                jnz     short loc_4CB445
-                add     ebx, 1
-                add     ecx, 1
-                cmp     ebx, edi
-                jb      short loc_4CB434
-
-loc_4CB445:                             ; CODE XREF: sub_4CB3B0+7Bj
-                                        ; sub_4CB3B0+89j
-                pop     edi
-
-loc_4CB446:                             ; CODE XREF: sub_4CB3B0+26j
-                                        ; sub_4CB3B0+35j
-                add     dword ptr [esi+32F04h], 1
-                pop     esi
-                pop     ebp
-                mov     eax, ebx
-                pop     ebx
-                retn    4
-sub_4CB3B0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-CEncoder_GetOptimumFast proc near       ; CODE XREF: CEncoder_CodeOneBlock+1F4p
-
-var_28          = dword ptr -28h
-var_24          = dword ptr -24h
-var_20          = dword ptr -20h
-var_1C          = dword ptr -1Ch
-var_18          = dword ptr -18h
-var_14          = dword ptr -14h
-var_10          = dword ptr -10h
-arg_0           = dword ptr  4
-
-                sub     esp, 28h
-                push    ebx
-                push    esi
-                push    edi
-                mov     edi, ecx
-                mov     eax, [edi+80h]
-                mov     ecx, [edi+70h]
-                push    eax
-                call    ecx
-                add     esp, 4
-                cmp     byte ptr [edi+32F10h], 0
-                mov     esi, eax
-                mov     [esp+34h+var_24], esi
-                jnz     short loc_4CB498
-                lea     edx, [esp+34h+var_20]
-                push    edx
-                mov     ecx, edi
-                call    sub_4CB3B0
-                mov     ebx, [esp+34h+var_20]
-                jmp     short loc_4CB4AF
-; ---------------------------------------------------------------------------
-
-loc_4CB498:                             ; CODE XREF: CEncoder_GetOptimumFast+24j
-                mov     ebx, [edi+32F00h]
-                mov     eax, [edi+32EFCh]
-                mov     [esp+34h+var_20], ebx
-                mov     byte ptr [edi+32F10h], 0
-
-loc_4CB4AF:                             ; CODE XREF: CEncoder_GetOptimumFast+36j
-                mov     ecx, [edi+80h]
-                mov     edx, [edi+74h]
-                push    ecx
-                mov     [esp+38h+var_28], eax
-                call    edx
-                add     esp, 4
-                sub     eax, 1
-                cmp     esi, 111h
-                jbe     loc_4CB55E
-                mov     [esp+34h+var_24], 111h
-
-loc_4CB4D9:                             ; CODE XREF: CEncoder_GetOptimumFast+101j
-                push    ebp
-                xor     ebp, ebp
-                lea     ecx, [edi+14h]
-                mov     [esp+38h+var_18], ebp
-                mov     [esp+38h+var_14], ebp
-                mov     [esp+38h+var_1C], ecx
-                jmp     short loc_4CB4F0
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CB4F0:                             ; CODE XREF: CEncoder_GetOptimumFast+8Bj
-                                        ; CEncoder_GetOptimumFast+132j
-                mov     edx, [esp+38h+var_1C]
-                mov     ecx, eax
-                sub     ecx, [edx]
-                mov     dl, [eax]
-                sub     ecx, 1
-                cmp     dl, [ecx]
-                jnz     short loc_4CB57F
-                mov     dl, [eax+1]
-                cmp     dl, [ecx+1]
-                jnz     short loc_4CB57F
-                mov     esi, 2
-                cmp     [esp+38h+var_24], esi
-                jbe     short loc_4CB537
-                lea     edx, [eax+2]
-                sub     ecx, eax
-                lea     esp, [esp+0]
-
-loc_4CB520:                             ; CODE XREF: CEncoder_GetOptimumFast+D1j
-                mov     bl, [edx]
-                cmp     bl, [ecx+edx]
-                jnz     short loc_4CB533
-                add     esi, 1
-                add     edx, 1
-                cmp     esi, [esp+38h+var_24]
-                jb      short loc_4CB520
-
-loc_4CB533:                             ; CODE XREF: CEncoder_GetOptimumFast+C5j
-                mov     ebx, [esp+38h+var_20]
-
-loc_4CB537:                             ; CODE XREF: CEncoder_GetOptimumFast+B2j
-                cmp     esi, [edi+32EF8h]
-                jnb     short loc_4CB5B9
-                mov     edx, [esp+38h+var_14]
-                lea     ecx, ds:0[ebp*4]
-                mov     [esp+ecx+38h+var_10], esi
-                cmp     esi, [esp+edx+38h+var_10]
-                jbe     short loc_4CB587
-                mov     [esp+38h+var_18], ebp
-                mov     [esp+38h+var_14], ecx
-                jmp     short loc_4CB587
-; ---------------------------------------------------------------------------
-
-loc_4CB55E:                             ; CODE XREF: CEncoder_GetOptimumFast+6Bj
-                cmp     esi, 2
-                jnb     loc_4CB4D9
-                mov     eax, [esp+34h+arg_0]
-                pop     edi
-                pop     esi
-                mov     dword ptr [eax], 0FFFFFFFFh
-                mov     eax, 1
-                pop     ebx
-                add     esp, 28h
-                retn    4
-; ---------------------------------------------------------------------------
-
-loc_4CB57F:                             ; CODE XREF: CEncoder_GetOptimumFast+9Fj
-                                        ; CEncoder_GetOptimumFast+A7j
-                mov     [esp+ebp*4+38h+var_10], 0
-
-loc_4CB587:                             ; CODE XREF: CEncoder_GetOptimumFast+F2j
-                                        ; CEncoder_GetOptimumFast+FCj
-                add     [esp+38h+var_1C], 4
-                add     ebp, 1
-                cmp     ebp, 4
-                jb      loc_4CB4F0
-                mov     esi, [esp+38h+var_28]
-                cmp     esi, [edi+32EF8h]
-                jb      short loc_4CB5EC
-                mov     eax, [edi+ebx*4+3265Ch]
-                mov     ecx, [esp+38h+arg_0]
-                add     eax, 4
-                mov     [ecx], eax
-                jmp     loc_4CB69A
-; ---------------------------------------------------------------------------
-
-loc_4CB5B9:                             ; CODE XREF: CEncoder_GetOptimumFast+DDj
-                mov     eax, [esp+38h+arg_0]
-                mov     [eax], ebp
-                lea     eax, [esi-1]
-                test    eax, eax
-                jz      loc_4CB82E
-                mov     ecx, [edi+80h]
-                mov     edx, [edi+7Ch]
-                add     [edi+32F04h], eax
-                push    eax
-                push    ecx
-                call    edx
-                add     esp, 8
-                pop     ebp
-                pop     edi
-                mov     eax, esi
-                pop     esi
-                pop     ebx
-                add     esp, 28h
-                retn    4
-; ---------------------------------------------------------------------------
-
-loc_4CB5EC:                             ; CODE XREF: CEncoder_GetOptimumFast+142j
-                xor     ebp, ebp
-                cmp     esi, 2
-                mov     [esp+38h+var_20], ebp
-                jb      short loc_4CB65A
-                cmp     ebx, 2
-                mov     ecx, [edi+ebx*4+3265Ch]
-                mov     [esp+38h+var_20], ecx
-                jbe     short loc_4CB63F
-                lea     eax, [edi+ebx*4+32654h]
-                mov     edi, edi
-
-loc_4CB610:                             ; CODE XREF: CEncoder_GetOptimumFast+1DDj
-                mov     edx, [eax-4]
-                add     edx, 1
-                cmp     esi, edx
-                jnz     short loc_4CB63F
-                mov     ecx, [esp+38h+var_20]
-                shr     ecx, 7
-                cmp     ecx, [eax]
-                jbe     short loc_4CB63F
-                mov     edx, [eax-4]
-                mov     ecx, [eax]
-                sub     eax, 8
-                sub     ebx, 2
-                cmp     ebx, 2
-                mov     [esp+38h+var_28], edx
-                mov     [esp+38h+var_20], ecx
-                mov     esi, edx
-                ja      short loc_4CB610
-
-loc_4CB63F:                             ; CODE XREF: CEncoder_GetOptimumFast+1A5j
-                                        ; CEncoder_GetOptimumFast+1B8j ...
-                cmp     esi, 2
-                jnz     short loc_4CB656
-                cmp     [esp+38h+var_20], 80h
-                jb      short loc_4CB656
-                mov     [esp+38h+var_28], 1
-
-loc_4CB656:                             ; CODE XREF: CEncoder_GetOptimumFast+1E2j
-                                        ; CEncoder_GetOptimumFast+1ECj
-                mov     ebp, [esp+38h+var_20]
-
-loc_4CB65A:                             ; CODE XREF: CEncoder_GetOptimumFast+195j
-                mov     edx, [esp+38h+var_18]
-                mov     esi, [esp+edx*4+38h+var_10]
-                cmp     esi, 2
-                mov     ebx, [esp+38h+var_28]
-                jb      short loc_4CB6C7
-                lea     eax, [esi+1]
-                cmp     eax, ebx
-                jnb     short loc_4CB690
-                lea     ecx, [esi+2]
-                cmp     ecx, ebx
-                jb      short loc_4CB681
-                cmp     ebp, 200h
-                ja      short loc_4CB690
-
-loc_4CB681:                             ; CODE XREF: CEncoder_GetOptimumFast+217j
-                lea     edx, [esi+3]
-                cmp     edx, ebx
-                jb      short loc_4CB6C7
-                cmp     ebp, 8000h
-                jbe     short loc_4CB6C7
-
-loc_4CB690:                             ; CODE XREF: CEncoder_GetOptimumFast+210j
-                                        ; CEncoder_GetOptimumFast+21Fj
-                mov     eax, [esp+38h+arg_0]
-                mov     ecx, [esp+38h+var_18]
-                mov     [eax], ecx
-
-loc_4CB69A:                             ; CODE XREF: CEncoder_GetOptimumFast+154j
-                lea     eax, [esi-1]
-                test    eax, eax
-                jz      loc_4CB82E
-                mov     edx, [edi+80h]
-                add     [edi+32F04h], eax
-                push    eax
-                mov     eax, [edi+7Ch]
-                push    edx
-                call    eax
-                add     esp, 8
-                pop     ebp
-                pop     edi
-                mov     eax, esi
-                pop     esi
-                pop     ebx
-                add     esp, 28h
-                retn    4
-; ---------------------------------------------------------------------------
-
-loc_4CB6C7:                             ; CODE XREF: CEncoder_GetOptimumFast+209j
-                                        ; CEncoder_GetOptimumFast+226j ...
-                cmp     ebx, 2
-                jb      short loc_4CB73E
-                cmp     [esp+38h+var_24], 2
-                jbe     short loc_4CB73E
-                mov     ecx, [edi+80h]
-                mov     edx, [edi+70h]
-                push    ecx
-                call    edx
-                add     esp, 4
-                lea     esi, [edi+32F00h]
-                push    esi
-                mov     ecx, edi
-                mov     [esp+3Ch+var_24], eax
-                call    sub_4CB3B0
-                cmp     eax, 2
-                mov     [edi+32EFCh], eax
-                jb      short loc_4CB757
-                cmp     eax, ebx
-                mov     ecx, [esi]
-                mov     edx, [edi+ecx*4+3265Ch]
-                jb      short loc_4CB710
-                cmp     edx, ebp
-                jb      short loc_4CB737
-
-loc_4CB710:                             ; CODE XREF: CEncoder_GetOptimumFast+2AAj
-                lea     ecx, [ebx+1]
-                cmp     eax, ecx
-                jnz     short loc_4CB722
-                mov     esi, edx
-                shr     esi, 7
-                cmp     esi, ebp
-                jbe     short loc_4CB737
-                cmp     eax, ecx
-
-loc_4CB722:                             ; CODE XREF: CEncoder_GetOptimumFast+2B5j
-                ja      short loc_4CB737
-                add     eax, 1
-                cmp     eax, ebx
-                jb      short loc_4CB757
-                cmp     ebx, 3
-                jb      short loc_4CB757
-                shr     ebp, 7
-                cmp     ebp, edx
-                jbe     short loc_4CB757
-
-loc_4CB737:                             ; CODE XREF: CEncoder_GetOptimumFast+2AEj
-                                        ; CEncoder_GetOptimumFast+2BEj ...
-                mov     byte ptr [edi+32F10h], 1
-
-loc_4CB73E:                             ; CODE XREF: CEncoder_GetOptimumFast+26Aj
-                                        ; CEncoder_GetOptimumFast+271j
-                mov     edx, [esp+38h+arg_0]
-                pop     ebp
-                pop     edi
-                pop     esi
-                mov     dword ptr [edx], 0FFFFFFFFh
-                mov     eax, 1
-                pop     ebx
-                add     esp, 28h
-                retn    4
-; ---------------------------------------------------------------------------
-
-loc_4CB757:                             ; CODE XREF: CEncoder_GetOptimumFast+29Dj
-                                        ; CEncoder_GetOptimumFast+2C9j ...
-                mov     eax, [edi+80h]
-                mov     ecx, [edi+74h]
-                push    eax
-                call    ecx
-                lea     ecx, [edi+14h]
-                add     esp, 4
-                sub     eax, 1
-                mov     [esp+38h+var_18], 0
-                mov     ebx, ecx
-
-loc_4CB776:                             ; CODE XREF: CEncoder_GetOptimumFast+39Aj
-                mov     dl, [eax+1]
-                mov     ecx, eax
-                sub     ecx, [ebx]
-                sub     ecx, 1
-                cmp     dl, [ecx+1]
-                jnz     short loc_4CB7DD
-                mov     dl, [eax+2]
-                cmp     dl, [ecx+2]
-                lea     ebp, [eax+2]
-                jnz     short loc_4CB7DD
-                mov     esi, 2
-                cmp     [esp+38h+var_24], esi
-                jbe     short loc_4CB7B4
-                mov     edx, ebp
-                mov     ebp, ecx
-                sub     ebp, eax
-
-loc_4CB7A1:                             ; CODE XREF: CEncoder_GetOptimumFast+352j
-                mov     cl, [edx]
-                cmp     cl, [edx+ebp]
-                jnz     short loc_4CB7B4
-                add     esi, 1
-                add     edx, 1
-                cmp     esi, [esp+38h+var_24]
-                jb      short loc_4CB7A1
-
-loc_4CB7B4:                             ; CODE XREF: CEncoder_GetOptimumFast+339j
-                                        ; CEncoder_GetOptimumFast+346j
-                add     esi, 1
-                cmp     esi, [esp+38h+var_28]
-                jb      short loc_4CB7E9
-                mov     eax, [esp+38h+arg_0]
-                pop     ebp
-                mov     byte ptr [edi+32F10h], 1
-                pop     edi
-                pop     esi
-                mov     dword ptr [eax], 0FFFFFFFFh
-                mov     eax, 1
-                pop     ebx
-                add     esp, 28h
-                retn    4
-; ---------------------------------------------------------------------------
-
-loc_4CB7DD:                             ; CODE XREF: CEncoder_GetOptimumFast+323j
-                                        ; CEncoder_GetOptimumFast+32Ej
-                mov     edx, [esp+38h+var_18]
-                mov     [esp+edx*4+38h+var_10], 0
-
-loc_4CB7E9:                             ; CODE XREF: CEncoder_GetOptimumFast+35Bj
-                mov     ecx, [esp+38h+var_18]
-                add     ecx, 1
-                add     ebx, 4
-                cmp     ecx, 4
-                mov     [esp+38h+var_18], ecx
-                jb      loc_4CB776
-                mov     esi, [esp+38h+var_28]
-                mov     ecx, [esp+38h+var_20]
-                mov     edx, [esp+38h+arg_0]
-                add     ecx, 4
-                lea     eax, [esi-2]
-                test    eax, eax
-                mov     [edx], ecx
-                jz      short loc_4CB82E
-                add     [edi+32F04h], eax
-                mov     ecx, [edi+7Ch]
-                push    eax
-                mov     eax, [edi+80h]
-                push    eax
-                call    ecx
-                add     esp, 8
-
-loc_4CB82E:                             ; CODE XREF: CEncoder_GetOptimumFast+164j
-                                        ; CEncoder_GetOptimumFast+23Fj ...
-                pop     ebp
-                pop     edi
-                mov     eax, esi
-                pop     esi
-                pop     ebx
-                add     esp, 28h
-                retn    4
-CEncoder_GetOptimumFast endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CB8A0      proc near               ; CODE XREF: sub_4CD940+37p
-
-arg_0           = dword ptr  4
-
-                push    edi
-                mov     edi, [esp+4+arg_0]
-                test    edi, edi
-                jz      short loc_4CB8EB
-                mov     eax, dword_553598
-                test    eax, eax
-                jnz     short loc_4CB8DD
-                push    0Ch             ; Size
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                test    eax, eax
-                jz      short loc_4CB8D6
-                mov     dword ptr [eax], 0
-                mov     dword ptr [eax+4], 0
-                mov     dword ptr [eax+8], 0
-                jmp     short loc_4CB8D8
-; ---------------------------------------------------------------------------
-
-loc_4CB8D6:                             ; CODE XREF: sub_4CB8A0+1Ej
-                xor     eax, eax
-
-loc_4CB8D8:                             ; CODE XREF: sub_4CB8A0+34j
-                mov     dword_553598, eax
-
-loc_4CB8DD:                             ; CODE XREF: sub_4CB8A0+10j
-                mov     eax, [eax]
-                test    eax, eax
-                jz      short loc_4CB8EB
-                push    edi
-                call    eax
-                add     esp, 4
-                pop     edi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CB8EB:                             ; CODE XREF: sub_4CB8A0+7j
-                                        ; sub_4CB8A0+41j
-                xor     eax, eax
-                pop     edi
-                retn
-sub_4CB8A0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CB8F0      proc near               ; CODE XREF: sub_4CBA60+85p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                push    edi
-                mov     edi, [esi+44h]
-                add     edi, [esi+40h]
-                add     edi, [esp+8+arg_4]
-                cmp     dword ptr [esi+4Ch], 0
-                jz      short loc_4CB911
-                mov     [esi+3Ch], edi
-                pop     edi
-                mov     eax, 1
-                pop     esi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CB911:                             ; CODE XREF: sub_4CB8F0+14j
-                mov     eax, [esi+30h]
-                test    eax, eax
-                jz      short loc_4CB91D
-                cmp     [esi+3Ch], edi
-                jz      short loc_4CB93E
-
-loc_4CB91D:                             ; CODE XREF: sub_4CB8F0+26j
-                push    ebx
-                mov     ebx, [esp+0Ch+arg_8]
-                push    eax
-                mov     eax, [ebx+4]
-                call    eax
-                mov     dword ptr [esi+30h], 0
-                mov     [esi+3Ch], edi
-                mov     ecx, [ebx]
-                push    edi
-                call    ecx
-                add     esp, 8
-                mov     [esi+30h], eax
-                pop     ebx
-
-loc_4CB93E:                             ; CODE XREF: sub_4CB8F0+2Bj
-                xor     eax, eax
-                cmp     [esi+30h], eax
-                pop     edi
-                setnz   al
-                pop     esi
-                retn
-sub_4CB8F0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CB950:                             ; DATA XREF: sub_4CCAA0+1Co
-                mov     eax, [esp+4]
-                mov     eax, [eax]
-                retn
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CB960:                             ; DATA XREF: sub_4CCAA0+Eo
-                mov     eax, [esp+4]
-                mov     ecx, [eax]
-                mov     edx, [esp+8]
-                mov     al, [edx+ecx]
-                retn
-; ---------------------------------------------------------------------------
-                align 10h
-loc_4CB970:                             ; DATA XREF: sub_4CCAA0+15o
-                mov     ecx, [esp+4]
-
-; =============== S U B R O U T I N E =======================================
-
-; Attributes: library function
-
-; public: int __thiscall CRect::Height(void)const
-?Height@CRect@@QBEHXZ proc near
-                mov     eax, [ecx+0Ch]
-                sub     eax, [ecx+4]
-                retn
-?Height@CRect@@QBEHXZ endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CB980      proc near               ; CODE XREF: sub_4CBC80+46p
-                                        ; sub_4CBD50+61p
-
-arg_0           = dword ptr  4
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                cmp     dword ptr [esi+38h], 0
-                jnz     short loc_4CB9F0
-                cmp     dword ptr [esi+68h], 0
-                jnz     short loc_4CB9F0
-                mov     eax, [esi]
-                sub     eax, [esi+4]
-                mov     ecx, [esi+30h]
-                add     eax, [esi+0Ch]
-                sub     ecx, eax
-                add     ecx, [esi+3Ch]
-                jz      short loc_4CB9F0
-                push    edi
-
-loc_4CB9A4:                             ; CODE XREF: sub_4CB980+63j
-                mov     edx, [esi+34h]
-                lea     edi, [esp+8+arg_0]
-                push    edi
-                push    ecx
-                push    eax
-                mov     eax, [edx]
-                push    edx
-                call    eax
-                add     esp, 10h
-                test    eax, eax
-                mov     [esi+68h], eax
-                jnz     short loc_4CB9EF
-                mov     eax, [esp+8+arg_0]
-                test    eax, eax
-                jz      short loc_4CB9E8
-                add     [esi+0Ch], eax
-                mov     eax, [esi+0Ch]
-                sub     eax, [esi+4]
-                cmp     eax, [esi+44h]
-                ja      short loc_4CB9EF
-                mov     eax, [esi]
-                sub     eax, [esi+4]
-                mov     ecx, [esi+30h]
-                add     eax, [esi+0Ch]
-                sub     ecx, eax
-                add     ecx, [esi+3Ch]
-                jnz     short loc_4CB9A4
-                pop     edi
-                pop     esi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CB9E8:                             ; CODE XREF: sub_4CB980+43j
-                mov     dword ptr [esi+38h], 1
-
-loc_4CB9EF:                             ; CODE XREF: sub_4CB980+3Bj
-                                        ; sub_4CB980+51j
-                pop     edi
-
-loc_4CB9F0:                             ; CODE XREF: sub_4CB980+9j
-                                        ; sub_4CB980+Fj ...
-                pop     esi
-                retn
-sub_4CB980      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBA00      proc near               ; CODE XREF: sub_4CBD50+58p
-
-arg_0           = dword ptr  4
-
-                push    ebx
-                push    ebp
-                push    esi
-                push    edi
-                mov     edi, [esp+10h+arg_0]
-                mov     esi, [edi+0Ch]
-                mov     eax, [edi+40h]
-                sub     esi, [edi+4]
-                mov     ebx, [edi]
-                mov     ebp, [edi+30h]
-                add     esi, eax
-                sub     ebx, eax
-                mov     eax, dword_553598
-                test    eax, eax
-                jnz     short loc_4CBA44
-                push    0Ch             ; Size
-                call    _operator_new  ; operator new(uint)
-                xor     ecx, ecx
-                add     esp, 4
-                cmp     eax, ecx
-                jz      short loc_4CBA3D
-                mov     [eax], ecx
-                mov     [eax+4], ecx
-                mov     [eax+8], ecx
-                jmp     short loc_4CBA3F
-; ---------------------------------------------------------------------------
-
-loc_4CBA3D:                             ; CODE XREF: sub_4CBA00+31j
-                xor     eax, eax
-
-loc_4CBA3F:                             ; CODE XREF: sub_4CBA00+3Bj
-                mov     dword_553598, eax
-
-loc_4CBA44:                             ; CODE XREF: sub_4CBA00+21j
-                mov     eax, [eax+8]
-                test    eax, eax
-                jz      short loc_4CBA53
-                push    esi
-                push    ebx
-                push    ebp
-                call    eax
-                add     esp, 0Ch
-
-loc_4CBA53:                             ; CODE XREF: sub_4CBA00+49j
-                mov     eax, [edi+30h]
-                add     eax, [edi+40h]
-                mov     [edi], eax
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn
-sub_4CBA00      endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBA60      proc near               ; CODE XREF: sub_4D0270+D2p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-arg_10          = dword ptr  14h
-arg_14          = dword ptr  18h
-
-                push    ebx
-                push    esi
-                push    edi
-                mov     edi, [esp+0Ch+arg_4]
-                cmp     edi, 0C0000000h
-                jbe     short loc_4CBAA2
-                mov     esi, [esp+0Ch+arg_0]
-                mov     eax, [esi+20h]
-                mov     edi, [esp+0Ch+arg_14]
-                mov     ecx, [edi+4]
-                push    eax
-                call    ecx
-                xor     ebx, ebx
-                add     esp, 4
-                cmp     [esi+4Ch], ebx
-                mov     [esi+20h], ebx
-                jnz     short loc_4CBA9C
-                mov     edx, [esi+30h]
-                mov     eax, [edi+4]
-                push    edx
-                call    eax
-                add     esp, 4
-                mov     [esi+30h], ebx
-
-loc_4CBA9C:                             ; CODE XREF: sub_4CBA60+2Bj
-                pop     edi
-                pop     esi
-                xor     eax, eax
-                pop     ebx
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CBAA2:                             ; CODE XREF: sub_4CBA60+Dj
-                mov     eax, edi
-                shr     eax, 1
-                cmp     edi, 80000000h
-                jbe     short loc_4CBAB3
-                mov     eax, edi
-                shr     eax, 2
-
-loc_4CBAB3:                             ; CODE XREF: sub_4CBA60+4Cj
-                mov     ecx, [esp+0Ch+arg_8]
-                mov     esi, [esp+0Ch+arg_0]
-                mov     ebx, [esp+0Ch+arg_C]
-                lea     edx, [edi+ecx+1]
-                push    ebp
-                mov     [esi+40h], edx
-                mov     edx, [esp+10h+arg_10]
-                add     ecx, ebx
-                lea     ebp, [ebx+edx]
-                add     ecx, edx
-                mov     [esi+44h], ebp
-                mov     ebp, [esp+10h+arg_14]
-                shr     ecx, 1
-                push    ebp
-                lea     eax, [ecx+eax+80000h]
-                push    eax
-                push    esi
-                call    sub_4CB8F0
-                add     esp, 0Ch
-                test    eax, eax
-                jz      loc_4CBBEA
-                mov     edx, [esi+48h]
-                mov     [esi+1Ch], ebx
-                xor     ebx, ebx
-                cmp     edx, 2
-                lea     ebp, [edi+1]
-                mov     [esi+5Ch], ebx
-                jnz     short loc_4CBB0F
-                mov     eax, 0FFFFh
-                jmp     short loc_4CBB49
-; ---------------------------------------------------------------------------
-
-loc_4CBB0F:                             ; CODE XREF: sub_4CBA60+A6j
-                lea     ecx, [edi-1]
-                mov     eax, ecx
-                shr     eax, 1
-                or      ecx, eax
-                mov     eax, ecx
-                shr     eax, 2
-                or      ecx, eax
-                mov     eax, ecx
-                shr     eax, 4
-                or      ecx, eax
-                mov     eax, ecx
-                or      eax, 1FFFE00h
-                shr     eax, 8
-                or      eax, ecx
-                shr     eax, 1
-                cmp     eax, 1000000h
-                jbe     short loc_4CBB49
-                cmp     edx, 3
-                jnz     short loc_4CBB47
-                mov     eax, 0FFFFFFh
-                jmp     short loc_4CBB49
-; ---------------------------------------------------------------------------
-
-loc_4CBB47:                             ; CODE XREF: sub_4CBA60+DEj
-                shr     eax, 1
-
-loc_4CBB49:                             ; CODE XREF: sub_4CBA60+ADj
-                                        ; sub_4CBA60+D9j ...
-                mov     [esi+28h], eax
-                add     eax, 1
-                cmp     edx, 2
-                jbe     short loc_4CBB5B
-                mov     dword ptr [esi+5Ch], 400h
-
-loc_4CBB5B:                             ; CODE XREF: sub_4CBA60+F2j
-                cmp     edx, 3
-                jbe     short loc_4CBB67
-                add     dword ptr [esi+5Ch], 10000h
-
-loc_4CBB67:                             ; CODE XREF: sub_4CBA60+FEj
-                cmp     edx, 4
-                jbe     short loc_4CBB73
-                add     dword ptr [esi+5Ch], 100000h
-
-loc_4CBB73:                             ; CODE XREF: sub_4CBA60+10Aj
-                mov     ecx, [esi+60h]
-                mov     edx, [esi+5Ch]
-                add     ecx, [esi+64h]
-                add     eax, edx
-                cmp     [esi+50h], ebx
-                mov     [esi+58h], edi
-                mov     [esi+60h], eax
-                mov     [esi+18h], ebp
-                lea     edx, [ebp+ebp+0]
-                jnz     short loc_4CBB92
-                mov     edx, ebp
-
-loc_4CBB92:                             ; CODE XREF: sub_4CBA60+12Ej
-                lea     edi, [eax+edx]
-                mov     eax, [esi+20h]
-                cmp     eax, ebx
-                mov     [esi+64h], edx
-                jz      short loc_4CBBA3
-                cmp     ecx, edi
-                jz      short loc_4CBBE0
-
-loc_4CBBA3:                             ; CODE XREF: sub_4CBA60+13Dj
-                mov     ebp, [esp+10h+arg_14]
-                push    eax
-                mov     eax, [ebp+4]
-                call    eax
-                lea     eax, ds:0[edi*4]
-                mov     ecx, eax
-                shr     ecx, 2
-                add     esp, 4
-                cmp     ecx, edi
-                mov     [esi+20h], ebx
-                jz      short loc_4CBBC7
-                xor     eax, eax
-                jmp     short loc_4CBBD0
-; ---------------------------------------------------------------------------
-
-loc_4CBBC7:                             ; CODE XREF: sub_4CBA60+161j
-                mov     edx, [ebp+0]
-                push    eax
-                call    edx
-                add     esp, 4
-
-loc_4CBBD0:                             ; CODE XREF: sub_4CBA60+165j
-                cmp     eax, ebx
-                mov     [esi+20h], eax
-                jz      short loc_4CBBEC
-                mov     ecx, [esi+60h]
-                lea     edx, [eax+ecx*4]
-                mov     [esi+24h], edx
-
-loc_4CBBE0:                             ; CODE XREF: sub_4CBA60+141j
-                pop     ebp
-                pop     edi
-                pop     esi
-                mov     eax, 1
-                pop     ebx
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CBBEA:                             ; CODE XREF: sub_4CBA60+8Fj
-                xor     ebx, ebx
-
-loc_4CBBEC:                             ; CODE XREF: sub_4CBA60+175j
-                mov     eax, [esi+20h]
-                mov     ecx, [ebp+4]
-                push    eax
-                call    ecx
-                add     esp, 4
-                cmp     [esi+4Ch], ebx
-                mov     [esi+20h], ebx
-                jnz     short loc_4CBC0F
-                mov     edx, [esi+30h]
-                mov     eax, [ebp+4]
-                push    edx
-                call    eax
-                add     esp, 4
-                mov     [esi+30h], ebx
-
-loc_4CBC0F:                             ; CODE XREF: sub_4CBA60+19Ej
-                pop     ebp
-                pop     edi
-                pop     esi
-                xor     eax, eax
-                pop     ebx
-                retn
-sub_4CBA60      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBC20      proc near               ; CODE XREF: sub_4CBD50+79p
-
-arg_0           = dword ptr  4
-
-                mov     eax, [esp+arg_0]
-                mov     edx, [eax+18h]
-                sub     edx, [eax+14h]
-                push    ebx
-                mov     ebx, [eax+4]
-                or      ecx, 0FFFFFFFFh
-                sub     ecx, ebx
-                cmp     edx, ecx
-                push    esi
-                jnb     short loc_4CBC3A
-                mov     ecx, edx
-
-loc_4CBC3A:                             ; CODE XREF: sub_4CBC20+16j
-                mov     esi, [eax+0Ch]
-                sub     esi, ebx
-                push    edi
-                mov     edi, [eax+44h]
-                mov     edx, esi
-                cmp     edx, edi
-                ja      short loc_4CBC54
-                test    edx, edx
-                jbe     short loc_4CBC56
-                mov     edx, 1
-                jmp     short loc_4CBC56
-; ---------------------------------------------------------------------------
-
-loc_4CBC54:                             ; CODE XREF: sub_4CBC20+27j
-                sub     edx, edi
-
-loc_4CBC56:                             ; CODE XREF: sub_4CBC20+2Bj
-                                        ; sub_4CBC20+32j
-                cmp     edx, ecx
-                pop     edi
-                jnb     short loc_4CBC5D
-                mov     ecx, edx
-
-loc_4CBC5D:                             ; CODE XREF: sub_4CBC20+39j
-                mov     edx, [eax+1Ch]
-                cmp     esi, edx
-                jbe     short loc_4CBC66
-                mov     esi, edx
-
-loc_4CBC66:                             ; CODE XREF: sub_4CBC20+42j
-                add     ebx, ecx
-                mov     [eax+10h], esi
-                pop     esi
-                mov     [eax+8], ebx
-                pop     ebx
-                retn
-sub_4CBC20      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBC80      proc near               ; DATA XREF: sub_4CCAA0+8o
-
-arg_0           = dword ptr  4
-
-                push    ebx
-                push    esi
-                mov     esi, [esp+8+arg_0]
-                xor     eax, eax
-                cmp     [esi+60h], eax
-                jbe     short loc_4CBCA2
-                lea     ecx, [ecx+0]
-
-loc_4CBC90:                             ; CODE XREF: sub_4CBC80+20j
-                mov     ecx, [esi+20h]
-                mov     dword ptr [ecx+eax*4], 0
-                add     eax, 1
-                cmp     eax, [esi+60h]
-                jb      short loc_4CBC90
-
-loc_4CBCA2:                             ; CODE XREF: sub_4CBC80+Bj
-                mov     eax, [esi+18h]
-                mov     edx, [esi+30h]
-                push    esi
-                mov     dword ptr [esi+14h], 0
-                mov     [esi], edx
-                mov     [esi+0Ch], eax
-                mov     [esi+4], eax
-                mov     dword ptr [esi+68h], 0
-                mov     dword ptr [esi+38h], 0
-                call    sub_4CB980
-                mov     eax, [esi+18h]
-                mov     ebx, [esi+4]
-                sub     eax, [esi+14h]
-                or      ecx, 0FFFFFFFFh
-                sub     ecx, ebx
-                add     esp, 4
-                cmp     eax, ecx
-                jnb     short loc_4CBCE2
-                mov     ecx, eax
-
-loc_4CBCE2:                             ; CODE XREF: sub_4CBC80+5Ej
-                mov     edx, [esi+0Ch]
-                sub     edx, ebx
-                push    edi
-                mov     edi, [esi+44h]
-                mov     eax, edx
-                cmp     eax, edi
-                ja      short loc_4CBCFC
-                test    eax, eax
-                jbe     short loc_4CBCFE
-                mov     eax, 1
-                jmp     short loc_4CBCFE
-; ---------------------------------------------------------------------------
-
-loc_4CBCFC:                             ; CODE XREF: sub_4CBC80+6Fj
-                sub     eax, edi
-
-loc_4CBCFE:                             ; CODE XREF: sub_4CBC80+73j
-                                        ; sub_4CBC80+7Aj
-                cmp     eax, ecx
-                pop     edi
-                jnb     short loc_4CBD05
-                mov     ecx, eax
-
-loc_4CBD05:                             ; CODE XREF: sub_4CBC80+81j
-                mov     eax, edx
-                mov     edx, [esi+1Ch]
-                cmp     eax, edx
-                jbe     short loc_4CBD10
-                mov     eax, edx
-
-loc_4CBD10:                             ; CODE XREF: sub_4CBC80+8Cj
-                add     ebx, ecx
-                mov     [esi+8], ebx
-                mov     [esi+10h], eax
-                pop     esi
-                pop     ebx
-                retn
-sub_4CBC80      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CBD20      proc near               ; CODE XREF: sub_4CBD50+26p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                push    edi
-                mov     edi, [esp+4+arg_8]
-                xor     eax, eax
-                test    edi, edi
-                jbe     short loc_4CBD4C
-                mov     edx, [esp+4+arg_4]
-                push    esi
-                mov     esi, [esp+8+arg_0]
-
-loc_4CBD34:                             ; CODE XREF: sub_4CBD20+29j
-                mov     ecx, [edx+eax*4]
-                cmp     ecx, esi
-                ja      short loc_4CBD3F
-                xor     ecx, ecx
-                jmp     short loc_4CBD41
-; ---------------------------------------------------------------------------
-
-loc_4CBD3F:                             ; CODE XREF: sub_4CBD20+19j
-                sub     ecx, esi
-
-loc_4CBD41:                             ; CODE XREF: sub_4CBD20+1Dj
-                mov     [edx+eax*4], ecx
-                add     eax, 1
-                cmp     eax, edi
-                jb      short loc_4CBD34
-                pop     esi
-
-loc_4CBD4C:                             ; CODE XREF: sub_4CBD20+9j
-                pop     edi
-                retn
-sub_4CBD20      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBD50      proc near               ; CODE XREF: .text:004CC1A1p
-                                        ; .text:004CC20Ap ...
-
-arg_0           = dword ptr  4
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                cmp     dword ptr [esi+4], 0FFFFFFFFh
-                jnz     short loc_4CBD88
-                mov     eax, [esi+64h]
-                add     eax, [esi+60h]
-                mov     ecx, [esi+20h]
-                push    edi
-                mov     edi, 0FFFFFFFEh
-                sub     edi, [esi+58h]
-                push    eax
-                push    ecx
-                and     edi, 0FFFFFC00h
-                push    edi
-                call    sub_4CBD20
-                sub     [esi+8], edi
-                sub     [esi+4], edi
-                add     esp, 0Ch
-                sub     [esi+0Ch], edi
-                pop     edi
-
-loc_4CBD88:                             ; CODE XREF: sub_4CBD50+9j
-                cmp     dword ptr [esi+38h], 0
-                jnz     short loc_4CBDB9
-                mov     edx, [esi+0Ch]
-                sub     edx, [esi+4]
-                mov     eax, [esi+44h]
-                cmp     eax, edx
-                jnz     short loc_4CBDB9
-                mov     ecx, [esi+3Ch]
-                add     ecx, [esi+30h]
-                sub     ecx, [esi]
-                cmp     ecx, eax
-                ja      short loc_4CBDB0
-                push    esi
-                call    sub_4CBA00
-                add     esp, 4
-
-loc_4CBDB0:                             ; CODE XREF: sub_4CBD50+55j
-                push    esi
-                call    sub_4CB980
-                add     esp, 4
-
-loc_4CBDB9:                             ; CODE XREF: sub_4CBD50+3Cj
-                                        ; sub_4CBD50+49j
-                mov     edx, [esi+14h]
-                cmp     edx, [esi+18h]
-                jnz     short loc_4CBDC8
-                mov     dword ptr [esi+14h], 0
-
-loc_4CBDC8:                             ; CODE XREF: sub_4CBD50+6Fj
-                push    esi
-                call    sub_4CBC20
-                add     esp, 4
-                pop     esi
-                retn
-sub_4CBD50      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBDE0      proc near               ; CODE XREF: sub_4CC5C0+1B7p
-
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-arg_10          = dword ptr  14h
-arg_14          = dword ptr  18h
-arg_18          = dword ptr  1Ch
-arg_1C          = dword ptr  20h
-arg_20          = dword ptr  24h
-arg_24          = dword ptr  28h
-
-                push    ecx
-                mov     edx, [esp+4+arg_4]
-                mov     ecx, [esp+4+arg_10]
-                mov     eax, [esp+4+arg_14]
-                push    ebx
-                mov     [ecx+eax*4], edx
-                mov     ecx, [esp+8+arg_8]
-                push    ebp
-                push    esi
-                sub     ecx, edx
-                cmp     [esp+10h+arg_1C], 0
-                push    edi
-                jz      loc_4CBEAC
-                mov     ebp, [esp+14h+arg_C]
-                mov     ebx, [esp+14h+arg_24]
-                jmp     short loc_4CBE14
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CBE10:                             ; CODE XREF: sub_4CBDE0+C6j
-                mov     eax, [esp+14h+arg_14]
-
-loc_4CBE14:                             ; CODE XREF: sub_4CBDE0+2Dj
-                mov     esi, [esp+14h+arg_18]
-                sub     [esp+14h+arg_1C], 1
-                cmp     ecx, esi
-                jnb     loc_4CBEAC
-                mov     edx, ebp
-                sub     edx, ecx
-                cmp     eax, ecx
-                sbb     edi, edi
-                and     edi, esi
-                sub     edi, ecx
-                add     edi, eax
-                mov     eax, [esp+14h+arg_10]
-                mov     eax, [eax+edi*4]
-                mov     [esp+14h+arg_4], eax
-                mov     al, [edx+ebx]
-                cmp     al, [ebx+ebp]
-                jnz     short loc_4CBE99
-                mov     al, [edx]
-                cmp     al, [ebp+0]
-                jnz     short loc_4CBE99
-                mov     eax, [esp+14h+arg_0]
-                mov     esi, 1
-                cmp     eax, esi
-                jz      short loc_4CBE7A
-                sub     edx, ebp
-                lea     edi, [ebp+1]
-                mov     [esp+14h+var_4], edx
-                jmp     short loc_4CBE69
-; ---------------------------------------------------------------------------
-
-loc_4CBE65:                             ; CODE XREF: sub_4CBDE0+98j
-                mov     edx, [esp+14h+var_4]
-
-loc_4CBE69:                             ; CODE XREF: sub_4CBDE0+83j
-                mov     dl, [edx+edi]
-                cmp     dl, [edi]
-                jnz     short loc_4CBE7A
-                add     esi, 1
-                add     edi, 1
-                cmp     esi, eax
-                jnz     short loc_4CBE65
-
-loc_4CBE7A:                             ; CODE XREF: sub_4CBDE0+78j
-                                        ; sub_4CBDE0+8Ej
-                cmp     ebx, esi
-                jnb     short loc_4CBE99
-                mov     edx, [esp+14h+arg_20]
-                mov     [edx], esi
-                add     edx, 4
-                add     ecx, 0FFFFFFFFh
-                mov     [edx], ecx
-                add     edx, 4
-                cmp     esi, eax
-                mov     ebx, esi
-                mov     [esp+14h+arg_20], edx
-                jz      short loc_4CBEB6
-
-loc_4CBE99:                             ; CODE XREF: sub_4CBDE0+64j
-                                        ; sub_4CBDE0+6Bj ...
-                mov     ecx, [esp+14h+arg_8]
-                sub     ecx, [esp+14h+arg_4]
-                cmp     [esp+14h+arg_1C], 0
-                jnz     loc_4CBE10
-
-loc_4CBEAC:                             ; CODE XREF: sub_4CBDE0+1Fj
-                                        ; sub_4CBDE0+3Fj
-                mov     eax, [esp+14h+arg_20]
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CBEB6:                             ; CODE XREF: sub_4CBDE0+B7j
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     eax, edx
-                pop     ebx
-                pop     ecx
-                retn
-sub_4CBDE0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBEC0      proc near               ; CODE XREF: .text:004CC1E7p
-                                        ; sub_4CC220+14Ep ...
-
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-arg_10          = dword ptr  14h
-arg_14          = dword ptr  18h
-arg_18          = dword ptr  1Ch
-arg_1C          = dword ptr  20h
-arg_20          = dword ptr  24h
-arg_24          = dword ptr  28h
-
-                sub     esp, 10h
-                mov     eax, [esp+10h+arg_10]
-                mov     edx, [esp+10h+arg_8]
-                sub     edx, [esp+10h+arg_4]
-                push    ebx
-                push    ebp
-                push    esi
-                push    edi
-                mov     edi, [esp+20h+arg_14]
-                lea     eax, [eax+edi*8]
-                lea     ecx, [eax+4]
-                mov     [esp+20h+var_C], ecx
-                xor     ecx, ecx
-                xor     ebx, ebx
-                cmp     [esp+20h+arg_1C], ecx
-                mov     ebp, eax
-                mov     [esp+20h+var_10], ebp
-                mov     [esp+20h+var_8], ecx
-                mov     [esp+20h+var_4], ebx
-                jnz     short loc_4CBF24
-
-loc_4CBEF9:                             ; CODE XREF: sub_4CBEC0+6Fj
-                                        ; sub_4CBEC0+151j
-                mov     edx, [esp+20h+var_C]
-                mov     eax, [esp+20h+arg_20]
-                pop     edi
-                pop     esi
-                mov     dword ptr [ebp+0], 0
-                pop     ebp
-                mov     dword ptr [edx], 0
-                pop     ebx
-                add     esp, 10h
-                retn
-; ---------------------------------------------------------------------------
-                jmp     short loc_4CBF20
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CBF20:                             ; CODE XREF: sub_4CBEC0+56j
-                                        ; sub_4CBEC0+14Bj
-                mov     edi, [esp+20h+arg_14]
-
-loc_4CBF24:                             ; CODE XREF: sub_4CBEC0+37j
-                mov     eax, [esp+20h+arg_18]
-                sub     [esp+20h+arg_1C], 1
-                cmp     edx, eax
-                jnb     short loc_4CBEF9
-                cmp     edi, edx
-                sbb     esi, esi
-                and     esi, eax
-                mov     eax, [esp+20h+arg_10]
-                sub     esi, edx
-                add     esi, edi
-                lea     eax, [eax+esi*8]
-                mov     esi, [esp+20h+arg_C]
-                sub     esi, edx
-                cmp     ecx, ebx
-                jb      short loc_4CBF4E
-                mov     ecx, ebx
-
-loc_4CBF4E:                             ; CODE XREF: sub_4CBEC0+8Aj
-                mov     bl, [ecx+esi]
-                mov     edi, [esp+20h+arg_C]
-                cmp     bl, [ecx+edi]
-                jnz     short loc_4CBFB8
-                add     ecx, 1
-                cmp     ecx, [esp+20h+arg_0]
-                jz      short loc_4CBF93
-                mov     bl, [ecx+esi]
-                cmp     bl, [ecx+edi]
-                jnz     short loc_4CBF93
-                add     ecx, 1
-                cmp     ecx, [esp+20h+arg_0]
-                jz      short loc_4CBF93
-                mov     ebx, edi
-                mov     ebp, esi
-                lea     edi, [ecx+ebx]
-                sub     ebp, ebx
-                lea     ecx, [ecx+0]
-
-loc_4CBF80:                             ; CODE XREF: sub_4CBEC0+D1j
-                mov     bl, [edi+ebp]
-                cmp     bl, [edi]
-                jnz     short loc_4CBF93
-                add     ecx, 1
-                add     edi, 1
-                cmp     ecx, [esp+20h+arg_0]
-                jnz     short loc_4CBF80
-
-loc_4CBF93:                             ; CODE XREF: sub_4CBEC0+A1j
-                                        ; sub_4CBEC0+A9j ...
-                cmp     [esp+20h+arg_24], ecx
-                jnb     short loc_4CBFB8
-                mov     edi, [esp+20h+arg_20]
-                mov     [edi], ecx
-                add     edi, 4
-                add     edx, 0FFFFFFFFh
-                mov     [edi], edx
-                add     edi, 4
-                cmp     ecx, [esp+20h+arg_0]
-                mov     [esp+20h+arg_24], ecx
-                mov     [esp+20h+arg_20], edi
-                jz      short loc_4CC016
-
-loc_4CBFB8:                             ; CODE XREF: sub_4CBEC0+98j
-                                        ; sub_4CBEC0+D7j
-                mov     dl, [ecx+esi]
-                mov     esi, [esp+20h+arg_C]
-                cmp     dl, [ecx+esi]
-                mov     edx, [esp+20h+arg_4]
-                jnb     short loc_4CBFE4
-                mov     esi, [esp+20h+var_10]
-                lea     ebp, [eax+4]
-                mov     ebx, ecx
-                mov     ecx, [esp+20h+var_8]
-                mov     [esi], edx
-                mov     eax, [ebp+0]
-                mov     [esp+20h+var_10], ebp
-                mov     [esp+20h+var_4], ebx
-                jmp     short loc_4CBFFC
-; ---------------------------------------------------------------------------
-
-loc_4CBFE4:                             ; CODE XREF: sub_4CBEC0+106j
-                mov     esi, [esp+20h+var_C]
-                mov     ebp, [esp+20h+var_10]
-                mov     ebx, [esp+20h+var_4]
-                mov     [esi], edx
-                mov     [esp+20h+var_C], eax
-                mov     eax, [eax]
-                mov     [esp+20h+var_8], ecx
-
-loc_4CBFFC:                             ; CODE XREF: sub_4CBEC0+122j
-                mov     edx, [esp+20h+arg_8]
-                sub     edx, eax
-                cmp     [esp+20h+arg_1C], 0
-                mov     [esp+20h+arg_4], eax
-                jnz     loc_4CBF20
-                jmp     loc_4CBEF9
-; ---------------------------------------------------------------------------
-
-loc_4CC016:                             ; CODE XREF: sub_4CBEC0+F6j
-                mov     ecx, [eax]
-                mov     edx, [esp+20h+var_10]
-                mov     [edx], ecx
-                mov     eax, [eax+4]
-                mov     ecx, [esp+20h+var_C]
-                mov     [ecx], eax
-                mov     eax, edi
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                add     esp, 10h
-                retn
-sub_4CBEC0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CC040      proc near               ; CODE XREF: sub_4CC220+F8p
-                                        ; sub_4CC3B0+173p ...
-
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-arg_10          = dword ptr  14h
-arg_14          = dword ptr  18h
-arg_18          = dword ptr  1Ch
-arg_1C          = dword ptr  20h
-
-                sub     esp, 10h
-                mov     eax, [esp+10h+arg_10]
-                mov     edx, [esp+10h+arg_4]
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+1Ch+arg_14]
-                lea     eax, [eax+esi*8]
-                lea     ecx, [eax+4]
-                push    edi
-                mov     edi, eax
-                mov     eax, [esp+20h+arg_8]
-                xor     ebx, ebx
-                xor     ebp, ebp
-                sub     eax, edx
-                cmp     [esp+20h+arg_1C], ebx
-                mov     [esp+20h+var_C], ecx
-                mov     [esp+20h+var_10], edi
-                mov     [esp+20h+var_8], ebx
-                mov     [esp+20h+var_4], ebp
-                jz      loc_4CC159
-                nop
-
-loc_4CC080:                             ; CODE XREF: sub_4CC040+114j
-                sub     [esp+20h+arg_1C], 1
-                cmp     eax, [esp+20h+arg_18]
-                jnb     loc_4CC159
-                cmp     esi, eax
-                sbb     ecx, ecx
-                and     ecx, [esp+20h+arg_18]
-                sub     ecx, eax
-                add     ecx, esi
-                mov     esi, [esp+20h+arg_10]
-                lea     edi, [esi+ecx*8]
-                mov     ecx, [esp+20h+arg_C]
-                sub     ecx, eax
-                cmp     ebx, ebp
-                mov     eax, ebx
-                jb      short loc_4CC0B0
-                mov     eax, ebp
-
-loc_4CC0B0:                             ; CODE XREF: sub_4CC040+6Cj
-                mov     bl, [eax+ecx]
-                mov     esi, [esp+20h+arg_C]
-                cmp     bl, [eax+esi]
-                jnz     short loc_4CC102
-                add     eax, 1
-                cmp     eax, [esp+20h+arg_0]
-                jz      short loc_4CC0E3
-                mov     ebx, esi
-                mov     ebp, ecx
-                lea     esi, [eax+ebx]
-                sub     ebp, ebx
-                mov     edi, edi
-
-loc_4CC0D0:                             ; CODE XREF: sub_4CC040+A1j
-                mov     bl, [esi+ebp]
-                cmp     bl, [esi]
-                jnz     short loc_4CC0FC
-                add     eax, 1
-                add     esi, 1
-                cmp     eax, [esp+20h+arg_0]
-                jnz     short loc_4CC0D0
-
-loc_4CC0E3:                             ; CODE XREF: sub_4CC040+83j
-                                        ; sub_4CC040+C0j
-                mov     edx, [edi]
-                mov     eax, [esp+20h+var_10]
-                mov     [eax], edx
-                mov     ecx, [edi+4]
-                mov     edx, [esp+20h+var_C]
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     [edx], ecx
-                pop     ebx
-                add     esp, 10h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC0FC:                             ; CODE XREF: sub_4CC040+95j
-                cmp     eax, [esp+20h+arg_0]
-                jz      short loc_4CC0E3
-
-loc_4CC102:                             ; CODE XREF: sub_4CC040+7Aj
-                mov     cl, [eax+ecx]
-                mov     esi, [esp+20h+arg_C]
-                cmp     cl, [eax+esi]
-                jnb     short loc_4CC129
-                mov     ecx, [esp+20h+var_10]
-                mov     ebx, [esp+20h+var_8]
-                add     edi, 4
-                mov     ebp, eax
-                mov     [ecx], edx
-                mov     edx, [edi]
-                mov     [esp+20h+var_10], edi
-                mov     [esp+20h+var_4], ebp
-                jmp     short loc_4CC143
-; ---------------------------------------------------------------------------
-
-loc_4CC129:                             ; CODE XREF: sub_4CC040+CCj
-                mov     ecx, [esp+20h+var_C]
-                mov     ebp, [esp+20h+var_4]
-                mov     [ecx], edx
-                mov     edx, [edi]
-                mov     ebx, eax
-                mov     [esp+20h+var_C], edi
-                mov     edi, [esp+20h+var_10]
-                mov     [esp+20h+var_8], ebx
-
-loc_4CC143:                             ; CODE XREF: sub_4CC040+E7j
-                mov     eax, [esp+20h+arg_8]
-                sub     eax, edx
-                cmp     [esp+20h+arg_1C], 0
-                jz      short loc_4CC159
-                mov     esi, [esp+20h+arg_14]
-                jmp     loc_4CC080
-; ---------------------------------------------------------------------------
-
-loc_4CC159:                             ; CODE XREF: sub_4CC040+39j
-                                        ; sub_4CC040+49j ...
-                mov     eax, [esp+20h+var_C]
-                mov     dword ptr [edi], 0
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     dword ptr [eax], 0
-                pop     ebx
-                add     esp, 10h
-                retn
-sub_4CC040      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CC180:                             ; DATA XREF: sub_4CCAA0+40o
-                push    esi
-                mov     esi, [esp+8]
-                mov     edx, [esi+10h]
-                cmp     edx, 2
-                jnb     short loc_4CC1AD
-                add     dword ptr [esi+4], 1
-                mov     eax, [esi+4]
-                add     dword ptr [esi+14h], 1
-                add     dword ptr [esi], 1
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC1A9
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC1A9:                             ; CODE XREF: .text:004CC19Ej
-                xor     eax, eax
-                pop     esi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC1AD:                             ; CODE XREF: .text:004CC18Bj
-                mov     eax, [esi]
-                xor     ecx, ecx
-                mov     ch, [eax+1]
-                push    ebx
-                mov     ebx, [esp+10h]
-                push    edi
-                mov     edi, [esi+4]
-                push    1
-                push    ebx
-                mov     cl, [eax]
-                mov     eax, ecx
-                mov     ecx, [esi+20h]
-                lea     eax, [ecx+eax*4]
-                mov     ecx, [eax]
-                mov     [eax], edi
-                mov     eax, [esi+2Ch]
-                push    eax
-                mov     eax, [esi+18h]
-                push    eax
-                mov     eax, [esi+14h]
-                push    eax
-                mov     eax, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    eax
-                mov     eax, [esi+4]
-                push    eax
-                push    ecx
-                push    edx
-                call    sub_4CBEC0
-                add     dword ptr [esi+4], 1
-                add     dword ptr [esi+14h], 1
-                add     dword ptr [esi], 1
-                mov     edi, eax
-                mov     eax, [esi+4]
-                sub     edi, ebx
-                add     esp, 28h
-                sar     edi, 2
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC212
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC212:                             ; CODE XREF: .text:004CC207j
-                mov     eax, edi
-                pop     edi
-                pop     ebx
-                pop     esi
-                retn
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC220      proc near               ; DATA XREF: sub_4CCAA0+54o
-
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                sub     esp, 8
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                mov     eax, [esi+10h]
-                cmp     eax, 3
-                mov     [esp+0Ch+arg_0], eax
-                jnb     short loc_4CC259
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC252
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC252:                             ; CODE XREF: sub_4CC220+27j
-                xor     eax, eax
-                pop     esi
-                add     esp, 8
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC259:                             ; CODE XREF: sub_4CC220+12j
-                push    ebx
-                mov     ebx, [esi+20h]
-                push    ebp
-                xor     edx, edx
-                push    edi
-                mov     edi, [esi]
-                mov     dh, [edi+2]
-                movzx   ecx, byte ptr [edi]
-                movzx   eax, byte ptr [edi+1]
-                xor     eax, dword_553198[ecx*4]
-                xor     edx, eax
-                and     edx, [esi+28h]
-                mov     ecx, eax
-                mov     ebp, [ebx+edx*4+1000h]
-                mov     eax, [esi+4]
-                and     ecx, 3FFh
-                sub     eax, [ebx+ecx*4]
-                mov     [esp+18h+var_8], ebp
-                mov     ebp, [esi+4]
-                mov     [ebx+edx*4+1000h], ebp
-                mov     ebx, [esi+20h]
-                mov     edx, [ebx+edx*4+1000h]
-                mov     [ebx+ecx*4], edx
-                mov     ebx, [esp+18h+arg_4]
-                xor     ebp, ebp
-                cmp     eax, [esi+18h]
-                mov     ecx, 2
-                jnb     loc_4CC348
-                mov     edx, edi
-                sub     edx, eax
-                mov     [esp+18h+var_4], edx
-                mov     dl, [edx]
-                cmp     dl, [edi]
-                jnz     short loc_4CC348
-                mov     edx, [esp+18h+arg_0]
-                cmp     edx, ecx
-                jz      short loc_4CC2EA
-
-loc_4CC2D3:                             ; CODE XREF: sub_4CC220+C4j
-                mov     ebx, [esp+18h+var_4]
-                mov     bl, [ebx+ecx]
-                cmp     bl, [ecx+edi]
-                jnz     short loc_4CC2E6
-                add     ecx, 1
-                cmp     ecx, edx
-                jnz     short loc_4CC2D3
-
-loc_4CC2E6:                             ; CODE XREF: sub_4CC220+BDj
-                mov     ebx, [esp+18h+arg_4]
-
-loc_4CC2EA:                             ; CODE XREF: sub_4CC220+B1j
-                add     eax, 0FFFFFFFFh
-                cmp     ecx, edx
-                mov     [ebx], ecx
-                mov     [ebx+4], eax
-                mov     ebp, 2
-                jnz     short loc_4CC34C
-                mov     eax, [esi+2Ch]
-                mov     ecx, [esi+18h]
-                push    eax
-                mov     eax, [esi+14h]
-                push    ecx
-                mov     ecx, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    ecx
-                mov     ecx, [esi+4]
-                push    eax
-                mov     eax, [esp+2Ch+var_8]
-                push    ecx
-                push    eax
-                push    edx
-                call    sub_4CC040
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                add     esp, 20h
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC33E
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC33E:                             ; CODE XREF: sub_4CC220+113j
-                pop     edi
-                mov     eax, ebp
-                pop     ebp
-                pop     ebx
-                pop     esi
-                add     esp, 8
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC348:                             ; CODE XREF: sub_4CC220+97j
-                                        ; sub_4CC220+A9j
-                mov     edx, [esp+18h+arg_0]
-
-loc_4CC34C:                             ; CODE XREF: sub_4CC220+D9j
-                mov     eax, [esi+2Ch]
-                push    ecx
-                lea     ecx, [ebx+ebp*4]
-                push    ecx
-                mov     ecx, [esi+18h]
-                push    eax
-                mov     eax, [esi+14h]
-                push    ecx
-                mov     ecx, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    ecx
-                mov     ecx, [esi+4]
-                push    eax
-                mov     eax, [esp+34h+var_8]
-                push    ecx
-                push    eax
-                push    edx
-                call    sub_4CBEC0
-                mov     edi, eax
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                sub     edi, ebx
-                add     esp, 28h
-                sar     edi, 2
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC39B
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC39B:                             ; CODE XREF: sub_4CC220+170j
-                mov     eax, edi
-                pop     edi
-                pop     ebp
-                pop     ebx
-                pop     esi
-                add     esp, 8
-                retn
-sub_4CC220      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC3B0      proc near               ; DATA XREF: sub_4CCAA0:loc_4CCB03o
-
-var_10          = dword ptr -10h
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                sub     esp, 10h
-                push    esi
-                mov     esi, [esp+14h+arg_0]
-                mov     eax, [esi+10h]
-                cmp     eax, 4
-                mov     [esp+14h+arg_0], eax
-                jnb     short loc_4CC3E9
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC3E2
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC3E2:                             ; CODE XREF: sub_4CC3B0+27j
-                xor     eax, eax
-                pop     esi
-                add     esp, 10h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC3E9:                             ; CODE XREF: sub_4CC3B0+12j
-                push    ebx
-                push    ebp
-                push    edi
-                mov     edi, [esi]
-                movzx   eax, byte ptr [edi]
-                movzx   edx, byte ptr [edi+1]
-                xor     edx, dword_553198[eax*4]
-                movzx   eax, byte ptr [edi+2]
-                movzx   ebp, byte ptr [edi+3]
-                mov     ecx, eax
-                add     eax, eax
-                add     eax, eax
-                add     eax, eax
-                xor     eax, dword_553198[ebp*4]
-                mov     ebp, [esi+4]
-                shl     eax, 5
-                shl     ecx, 8
-                xor     eax, edx
-                and     eax, [esi+28h]
-                xor     ecx, edx
-                mov     ebx, edx
-                mov     edx, [esi+20h]
-                and     ebx, 3FFh
-                sub     ebp, [edx+ebx*4]
-                and     ecx, 0FFFFh
-                mov     [esp+20h+var_4], ebp
-                mov     ebp, [esi+4]
-                sub     ebp, [edx+ecx*4+1000h]
-                mov     [esp+20h+var_10], ebp
-                mov     ebp, [edx+eax*4+41000h]
-                mov     [esp+20h+var_8], ebp
-                mov     ebp, [esi+4]
-                mov     [edx+eax*4+41000h], ebp
-                mov     edx, [esi+20h]
-                mov     eax, [edx+eax*4+41000h]
-                mov     [edx+ecx*4+1000h], eax
-                mov     eax, [esi+20h]
-                mov     ecx, [eax+ecx*4+1000h]
-                mov     [eax+ebx*4], ecx
-                mov     ecx, [esp+20h+var_4]
-                mov     ebx, [esp+20h+arg_4]
-                xor     ebp, ebp
-                cmp     ecx, [esi+18h]
-                mov     eax, 1
-                jnb     short loc_4CC4A9
-                mov     edx, edi
-                sub     edx, ecx
-                mov     dl, [edx]
-                cmp     dl, [edi]
-                jnz     short loc_4CC4A9
-                mov     eax, 2
-                lea     edx, [ecx-1]
-                mov     [ebx], eax
-                mov     [ebx+4], edx
-                mov     ebp, eax
-
-loc_4CC4A9:                             ; CODE XREF: sub_4CC3B0+DEj
-                                        ; sub_4CC3B0+E8j
-                mov     edx, [esp+20h+var_10]
-                cmp     ecx, edx
-                jz      short loc_4CC4D5
-                cmp     edx, [esi+18h]
-                jnb     short loc_4CC4D5
-                mov     edx, edi
-                sub     edx, [esp+20h+var_10]
-                mov     dl, [edx]
-                cmp     dl, [edi]
-                jnz     short loc_4CC4D5
-                mov     ecx, [esp+20h+var_10]
-                lea     edx, [ecx-1]
-                mov     [ebx+ebp*4+4], edx
-                mov     eax, 3
-                add     ebp, 2
-
-loc_4CC4D5:                             ; CODE XREF: sub_4CC3B0+FFj
-                                        ; sub_4CC3B0+104j ...
-                test    ebp, ebp
-                mov     edx, [esp+20h+arg_0]
-                jz      short loc_4CC553
-                cmp     eax, edx
-                jz      short loc_4CC4FE
-                mov     edx, eax
-                sub     edx, ecx
-                add     edx, edi
-
-loc_4CC4E7:                             ; CODE XREF: sub_4CC3B0+148j
-                mov     cl, [edx]
-                cmp     cl, [eax+edi]
-                jnz     short loc_4CC4FA
-                add     eax, 1
-                add     edx, 1
-                cmp     eax, [esp+20h+arg_0]
-                jnz     short loc_4CC4E7
-
-loc_4CC4FA:                             ; CODE XREF: sub_4CC3B0+13Cj
-                mov     edx, [esp+20h+arg_0]
-
-loc_4CC4FE:                             ; CODE XREF: sub_4CC3B0+12Fj
-                cmp     eax, edx
-                mov     [ebx+ebp*4-8], eax
-                jnz     short loc_4CC553
-                mov     eax, [esi+2Ch]
-                mov     ecx, [esi+18h]
-                push    eax
-                mov     eax, [esi+14h]
-                push    ecx
-                mov     ecx, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    ecx
-                mov     ecx, [esi+4]
-                push    eax
-                mov     eax, [esp+34h+var_8]
-                push    ecx
-                push    eax
-                push    edx
-                call    sub_4CC040
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                add     esp, 20h
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC549
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC549:                             ; CODE XREF: sub_4CC3B0+18Ej
-                pop     edi
-                mov     eax, ebp
-                pop     ebp
-                pop     ebx
-                pop     esi
-                add     esp, 10h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC553:                             ; CODE XREF: sub_4CC3B0+12Bj
-                                        ; sub_4CC3B0+154j
-                cmp     eax, 3
-                jnb     short loc_4CC55D
-                mov     eax, 3
-
-loc_4CC55D:                             ; CODE XREF: sub_4CC3B0+1A6j
-                push    eax
-                mov     eax, [esi+2Ch]
-                lea     ecx, [ebx+ebp*4]
-                push    ecx
-                mov     ecx, [esi+18h]
-                push    eax
-                mov     eax, [esi+14h]
-                push    ecx
-                mov     ecx, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    ecx
-                mov     ecx, [esi+4]
-                push    eax
-                mov     eax, [esp+3Ch+var_8]
-                push    ecx
-                push    eax
-                push    edx
-                call    sub_4CBEC0
-                mov     edi, eax
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                sub     edi, ebx
-                add     esp, 28h
-                sar     edi, 2
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC5AC
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC5AC:                             ; CODE XREF: sub_4CC3B0+1F1j
-                mov     eax, edi
-                pop     edi
-                pop     ebp
-                pop     ebx
-                pop     esi
-                add     esp, 10h
-                retn
-sub_4CC3B0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC5C0      proc near               ; DATA XREF: sub_4CCAA0+29o
-
-var_10          = dword ptr -10h
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                sub     esp, 10h
-                push    esi
-                mov     esi, [esp+14h+arg_0]
-                mov     eax, [esi+10h]
-                cmp     eax, 4
-                mov     [esp+14h+arg_0], eax
-                jnb     short loc_4CC5F9
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC5F2
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC5F2:                             ; CODE XREF: sub_4CC5C0+27j
-                xor     eax, eax
-                pop     esi
-                add     esp, 10h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC5F9:                             ; CODE XREF: sub_4CC5C0+12j
-                push    ebx
-                push    ebp
-                push    edi
-                mov     edi, [esi]
-                movzx   eax, byte ptr [edi]
-                movzx   edx, byte ptr [edi+1]
-                xor     edx, dword_553198[eax*4]
-                movzx   eax, byte ptr [edi+2]
-                movzx   ebp, byte ptr [edi+3]
-                mov     ecx, eax
-                add     eax, eax
-                add     eax, eax
-                add     eax, eax
-                xor     eax, dword_553198[ebp*4]
-                mov     ebp, [esi+4]
-                shl     eax, 5
-                shl     ecx, 8
-                xor     eax, edx
-                and     eax, [esi+28h]
-                xor     ecx, edx
-                mov     ebx, edx
-                mov     edx, [esi+20h]
-                and     ebx, 3FFh
-                sub     ebp, [edx+ebx*4]
-                and     ecx, 0FFFFh
-                mov     [esp+20h+var_4], ebp
-                mov     ebp, [esi+4]
-                sub     ebp, [edx+ecx*4+1000h]
-                mov     [esp+20h+var_10], ebp
-                mov     ebp, [edx+eax*4+41000h]
-                mov     [esp+20h+var_8], ebp
-                mov     ebp, [esi+4]
-                mov     [edx+eax*4+41000h], ebp
-                mov     edx, [esi+20h]
-                mov     eax, [edx+eax*4+41000h]
-                mov     [edx+ecx*4+1000h], eax
-                mov     eax, [esi+20h]
-                mov     ecx, [eax+ecx*4+1000h]
-                mov     [eax+ebx*4], ecx
-                mov     ecx, [esp+20h+var_4]
-                mov     ebx, [esp+20h+arg_4]
-                xor     ebp, ebp
-                cmp     ecx, [esi+18h]
-                mov     eax, 1
-                jnb     short loc_4CC6B9
-                mov     edx, edi
-                sub     edx, ecx
-                mov     dl, [edx]
-                cmp     dl, [edi]
-                jnz     short loc_4CC6B9
-                mov     eax, 2
-                lea     edx, [ecx-1]
-                mov     [ebx], eax
-                mov     [ebx+4], edx
-                mov     ebp, eax
-
-loc_4CC6B9:                             ; CODE XREF: sub_4CC5C0+DEj
-                                        ; sub_4CC5C0+E8j
-                mov     edx, [esp+20h+var_10]
-                cmp     ecx, edx
-                jz      short loc_4CC6E5
-                cmp     edx, [esi+18h]
-                jnb     short loc_4CC6E5
-                mov     edx, edi
-                sub     edx, [esp+20h+var_10]
-                mov     dl, [edx]
-                cmp     dl, [edi]
-                jnz     short loc_4CC6E5
-                mov     ecx, [esp+20h+var_10]
-                lea     edx, [ecx-1]
-                mov     [ebx+ebp*4+4], edx
-                mov     eax, 3
-                add     ebp, 2
-
-loc_4CC6E5:                             ; CODE XREF: sub_4CC5C0+FFj
-                                        ; sub_4CC5C0+104j ...
-                test    ebp, ebp
-                jz      short loc_4CC747
-                cmp     eax, [esp+20h+arg_0]
-                jz      short loc_4CC708
-                mov     edx, eax
-                sub     edx, ecx
-                add     edx, edi
-
-loc_4CC6F5:                             ; CODE XREF: sub_4CC5C0+146j
-                mov     cl, [edx]
-                cmp     cl, [eax+edi]
-                jnz     short loc_4CC708
-                add     eax, 1
-                add     edx, 1
-                cmp     eax, [esp+20h+arg_0]
-                jnz     short loc_4CC6F5
-
-loc_4CC708:                             ; CODE XREF: sub_4CC5C0+12Dj
-                                        ; sub_4CC5C0+13Aj
-                cmp     eax, [esp+20h+arg_0]
-                mov     [ebx+ebp*4-8], eax
-                jnz     short loc_4CC747
-                mov     edx, [esi+14h]
-                mov     eax, [esi+24h]
-                mov     ecx, [esp+20h+var_8]
-                mov     [eax+edx*4], ecx
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC73D
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC73D:                             ; CODE XREF: sub_4CC5C0+172j
-                pop     edi
-                mov     eax, ebp
-                pop     ebp
-                pop     ebx
-                pop     esi
-                add     esp, 10h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC747:                             ; CODE XREF: sub_4CC5C0+127j
-                                        ; sub_4CC5C0+150j
-                cmp     eax, 3
-                jnb     short loc_4CC751
-                mov     eax, 3
-
-loc_4CC751:                             ; CODE XREF: sub_4CC5C0+18Aj
-                mov     ecx, [esi+18h]
-                push    eax
-                mov     eax, [esi+2Ch]
-                lea     edx, [ebx+ebp*4]
-                push    edx
-                mov     edx, [esi+14h]
-                push    eax
-                mov     eax, [esi+24h]
-                push    ecx
-                mov     ecx, [esi]
-                push    edx
-                mov     edx, [esi+4]
-                push    eax
-                mov     eax, [esp+38h+var_8]
-                push    ecx
-                mov     ecx, [esp+3Ch+arg_0]
-                push    edx
-                push    eax
-                push    ecx
-                call    sub_4CBDE0
-                mov     edi, eax
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                sub     edi, ebx
-                add     esp, 28h
-                sar     edi, 2
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC7A4
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC7A4:                             ; CODE XREF: sub_4CC5C0+1D9j
-                mov     eax, edi
-                pop     edi
-                pop     ebp
-                pop     ebx
-                pop     esi
-                add     esp, 10h
-                retn
-sub_4CC5C0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC7B0      proc near               ; DATA XREF: sub_4CCAA0+47o
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                mov     ebp, [esp+8+arg_4]
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     edi, 1
-
-loc_4CC7C1:                             ; CODE XREF: sub_4CC7B0+6Dj
-                mov     edx, [esi+10h]
-                cmp     edx, 2
-                jb      short loc_4CC802
-                mov     eax, [esi]
-                mov     ebx, [esi+4]
-                xor     ecx, ecx
-                mov     ch, [eax+1]
-                mov     cl, [eax]
-                mov     eax, ecx
-                mov     ecx, [esi+20h]
-                lea     eax, [ecx+eax*4]
-                mov     ecx, [eax]
-                mov     [eax], ebx
-                mov     eax, [esi+2Ch]
-                push    eax
-                mov     eax, [esi+18h]
-                push    eax
-                mov     eax, [esi+14h]
-                push    eax
-                mov     eax, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    eax
-                mov     eax, [esi+4]
-                push    eax
-                push    ecx
-                push    edx
-                call    sub_4CC040
-                add     esp, 20h
-
-loc_4CC802:                             ; CODE XREF: sub_4CC7B0+17j
-                add     [esi+4], edi
-                mov     eax, [esi+4]
-                add     [esi+14h], edi
-                add     [esi], edi
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC81B
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC81B:                             ; CODE XREF: sub_4CC7B0+60j
-                sub     ebp, edi
-                jnz     short loc_4CC7C1
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn
-sub_4CC7B0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC830      proc near               ; DATA XREF: sub_4CCAA0+5Bo
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     edi, 1
-                lea     ecx, [ecx+0]
-
-loc_4CC840:                             ; CODE XREF: sub_4CC830+9Fj
-                mov     ebp, [esi+10h]
-                cmp     ebp, 3
-                jb      short loc_4CC8B2
-                mov     ecx, [esi]
-                movzx   edx, byte ptr [ecx]
-                movzx   eax, byte ptr [ecx+1]
-                xor     eax, dword_553198[edx*4]
-                mov     ebx, [esi+4]
-                xor     edx, edx
-                mov     dh, [ecx+2]
-                xor     edx, eax
-                and     edx, [esi+28h]
-                and     eax, 3FFh
-                mov     ecx, edx
-                mov     edx, [esi+20h]
-                mov     edi, [edx+ecx*4+1000h]
-                lea     edx, [edx+ecx*4+1000h]
-                mov     [edx], ebx
-                mov     edx, [esi+20h]
-                mov     ecx, [edx+ecx*4+1000h]
-                mov     [edx+eax*4], ecx
-                mov     edx, [esi+2Ch]
-                mov     eax, [esi+18h]
-                mov     ecx, [esi+14h]
-                push    edx
-                mov     edx, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    ecx
-                mov     ecx, [esi+4]
-                push    edx
-                push    eax
-                push    ecx
-                push    edi
-                push    ebp
-                call    sub_4CC040
-                add     esp, 20h
-                mov     edi, 1
-
-loc_4CC8B2:                             ; CODE XREF: sub_4CC830+16j
-                add     [esi+4], edi
-                mov     eax, [esi+4]
-                add     [esi+14h], edi
-                add     [esi], edi
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC8CB
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC8CB:                             ; CODE XREF: sub_4CC830+90j
-                sub     [esp+10h+arg_4], edi
-                jnz     loc_4CC840
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn
-sub_4CC830      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC8E0      proc near               ; DATA XREF: sub_4CCAA0+6Ao
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     edi, 1
-                lea     ecx, [ecx+0]
-
-loc_4CC8F0:                             ; CODE XREF: sub_4CC8E0+D6j
-                mov     eax, [esi+10h]
-                cmp     eax, 4
-                mov     [esp+10h+arg_0], eax
-                jb      loc_4CC999
-                mov     eax, [esi]
-                movzx   edi, byte ptr [eax+2]
-                movzx   edx, byte ptr [eax]
-                movzx   ebx, byte ptr [eax+3]
-                movzx   ecx, byte ptr [eax+1]
-                xor     ecx, dword_553198[edx*4]
-                mov     ebp, [esi+4]
-                lea     eax, ds:0[edi*8]
-                xor     eax, dword_553198[ebx*4]
-                mov     edx, edi
-                mov     edi, [esi+20h]
-                shl     eax, 5
-                xor     eax, ecx
-                and     eax, [esi+28h]
-                shl     edx, 8
-                mov     ebx, [edi+eax*4+41000h]
-                xor     edx, ecx
-                and     edx, 0FFFFh
-                mov     [edi+edx*4+1000h], ebp
-                mov     edi, [esi+20h]
-                mov     edx, [edi+edx*4+1000h]
-                and     ecx, 3FFh
-                mov     [edi+ecx*4], edx
-                mov     ecx, [esi+20h]
-                mov     edx, [esi+4]
-                mov     [ecx+eax*4+41000h], edx
-                mov     eax, [esi+2Ch]
-                mov     ecx, [esi+18h]
-                mov     edx, [esi+14h]
-                push    eax
-                mov     eax, [esi+24h]
-                push    ecx
-                mov     ecx, [esi]
-                push    edx
-                mov     edx, [esi+4]
-                push    eax
-                mov     eax, [esp+20h+arg_0]
-                push    ecx
-                push    edx
-                push    ebx
-                push    eax
-                call    sub_4CC040
-                add     esp, 20h
-                mov     edi, 1
-
-loc_4CC999:                             ; CODE XREF: sub_4CC8E0+1Aj
-                add     [esi+4], edi
-                mov     eax, [esi+4]
-                add     [esi+14h], edi
-                add     [esi], edi
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC9B2
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC9B2:                             ; CODE XREF: sub_4CC8E0+C7j
-                sub     [esp+10h+arg_4], edi
-                jnz     loc_4CC8F0
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn
-sub_4CC8E0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC9D0      proc near               ; DATA XREF: sub_4CCAA0+30o
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     edi, 1
-                lea     ecx, [ecx+0]
-
-loc_4CC9E0:                             ; CODE XREF: sub_4CC9D0+BAj
-                cmp     dword ptr [esi+10h], 4
-                jb      loc_4CCA6D
-                mov     eax, [esi]
-                movzx   edi, byte ptr [eax+2]
-                movzx   edx, byte ptr [eax]
-                movzx   ebx, byte ptr [eax+3]
-                movzx   ecx, byte ptr [eax+1]
-                xor     ecx, dword_553198[edx*4]
-                mov     ebp, [esi+4]
-                lea     eax, ds:0[edi*8]
-                xor     eax, dword_553198[ebx*4]
-                mov     edx, edi
-                mov     edi, [esi+20h]
-                shl     eax, 5
-                xor     eax, ecx
-                and     eax, [esi+28h]
-                mov     ebx, [edi+eax*4+41000h]
-                lea     edi, [edi+eax*4+41000h]
-                mov     [edi], ebp
-                mov     edi, [esi+20h]
-                mov     eax, [edi+eax*4+41000h]
-                shl     edx, 8
-                xor     edx, ecx
-                and     edx, 0FFFFh
-                mov     [edi+edx*4+1000h], eax
-                mov     eax, [esi+20h]
-                mov     edx, [eax+edx*4+1000h]
-                and     ecx, 3FFh
-                mov     [eax+ecx*4], edx
-                mov     eax, [esi+14h]
-                mov     ecx, [esi+24h]
-                mov     [ecx+eax*4], ebx
-                mov     edi, 1
-
-loc_4CCA6D:                             ; CODE XREF: sub_4CC9D0+14j
-                add     [esi+4], edi
-                mov     eax, [esi+4]
-                add     [esi+14h], edi
-                add     [esi], edi
-                cmp     eax, [esi+8]
-                jnz     short loc_4CCA86
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CCA86:                             ; CODE XREF: sub_4CC9D0+ABj
-                sub     [esp+10h+arg_4], edi
-                jnz     loc_4CC9E0
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn
-sub_4CC9D0      endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CCAA0      proc near               ; CODE XREF: sub_4D0270+F3p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                mov     eax, [esp+arg_4]
-                mov     ecx, [esp+arg_0]
-                mov     dword ptr [eax], offset sub_4CBC80
-                mov     dword ptr [eax+4], offset loc_4CB960
-                mov     dword ptr [eax+8], offset loc_4CB970
-                mov     dword ptr [eax+0Ch], offset loc_4CB950
-                cmp     dword ptr [ecx+50h], 0
-                jnz     short loc_4CCAD8
-                mov     dword ptr [eax+10h], offset sub_4CC5C0
-                mov     dword ptr [eax+14h], offset sub_4CC9D0
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CCAD8:                             ; CODE XREF: sub_4CCAA0+27j
-                mov     ecx, [ecx+48h]
-                cmp     ecx, 2
-                jnz     short loc_4CCAEF
-                mov     dword ptr [eax+10h], offset loc_4CC180
-                mov     dword ptr [eax+14h], offset sub_4CC7B0
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CCAEF:                             ; CODE XREF: sub_4CCAA0+3Ej
-                cmp     ecx, 3
-                jnz     short loc_4CCB03
-                mov     dword ptr [eax+10h], offset sub_4CC220
-                mov     dword ptr [eax+14h], offset sub_4CC830
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CCB03:                             ; CODE XREF: sub_4CCAA0+52j
-                mov     dword ptr [eax+10h], offset sub_4CC3B0
-                mov     dword ptr [eax+14h], offset sub_4CC8E0
-                retn
-sub_4CCAA0      endp
-
-; ---------------------------------------------------------------------------
-
-Interface1_AddRef      proc near               ; DATA XREF: .rdata:00517A94o
-;sub_4CCB80
-
-arg_0           = dword ptr  4
-                mov     eax, [esp+arg_0]
-                add     dword ptr [eax+4], 1
-                mov     eax, [eax+4]
-                retn    4
-Interface1_AddRef      endp
-
-; ---------------------------------------------------------------------------
-
-sub_4CCB20      proc near               ; DATA XREF: .rdata:00517A9Co
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                mov     ecx, [esi+10h]
-                sub     ecx, [esi+18h]
-                mov     eax, [esi+14h]
-                sbb     eax, [esi+1Ch]
-                xor     edx, edx
-                cmp     edx, eax
-                push    edi
-                mov     edi, [esp+8+arg_8]
-                jb      short loc_4CCB48
-                ja      short loc_4CCB42
-                cmp     edi, ecx
-                jbe     short loc_4CCB48
-
-loc_4CCB42:                             ; CODE XREF: sub_4CCB20+1Cj
-                mov     edi, [esi+10h]
-                sub     edi, [esi+18h]
-
-loc_4CCB48:                             ; CODE XREF: sub_4CCB20+1Aj
-                                        ; sub_4CCB20+20j
-                mov     eax, [esp+8+arg_C]
-                test    eax, eax
-                jz      short loc_4CCB52
-                mov     [eax], edi
-
-loc_4CCB52:                             ; CODE XREF: sub_4CCB20+2Ej
-                test    edi, edi
-                jz      short loc_4CCB72
-                mov     eax, [esi+8]
-                add     eax, [esi+18h]
-                mov     ecx, [esp+8+arg_4]
-                push    edi             ; size_t
-                push    eax             ; void *
-                push    ecx             ; void *
-                call    _memcpy         ; Microsoft VisualC 2-8/net runtime
-                add     esp, 0Ch
-                add     [esi+18h], edi
-                adc     dword ptr [esi+1Ch], 0
-
-loc_4CCB72:                             ; CODE XREF: sub_4CCB20+34j
-                pop     edi
-                xor     eax, eax
-                pop     esi
-                retn    10h
-sub_4CCB20      endp
-
-; ---------------------------------------------------------------------------
-
-sub_4CCB90      proc near               ; DATA XREF: .rdata:00517AB0o
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-
-                push    ebx
-                mov     ebx, [esp+4+arg_8]
-                push    esi
-                mov     esi, [esp+8+arg_0]
-                mov     ecx, [esi+10h]
-                mov     eax, [esi+14h]
-                push    edi
-                xor     edi, edi
-                sub     ecx, [esi+18h]
-                sbb     eax, [esi+1Ch]
-                cmp     edi, eax
-                jb      short loc_4CCBC2
-                ja      short loc_4CCBB3
-                cmp     ebx, ecx
-                jbe     short loc_4CCBC2
-
-loc_4CCBB3:                             ; CODE XREF: sub_4CCB90+1Dj
-                pop     edi
-                mov     byte ptr [esi+20h], 1
-                pop     esi
-                mov     eax, 80004005h
-                pop     ebx
-                retn    10h
-
-loc_4CCBC2:                             ; CODE XREF: sub_4CCB90+1Bj
-                                        ; sub_4CCB90+21j
-                mov     ecx, [esi+8]
-                mov     eax, [esp+0Ch+arg_4]
-                add     ecx, [esi+18h]
-                push    ebx             ; size_t
-                push    eax             ; void *
-                push    ecx             ; void *
-                call    _memcpy         ; Microsoft VisualC 2-8/net runtime
-                mov     eax, [esp+18h+arg_C]
-                add     esp, 0Ch
-                add     [esi+18h], ebx
-                adc     [esi+1Ch], edi
-                test    eax, eax
-                jz      short loc_4CCBE7
-                mov     [eax], ebx
-
-loc_4CCBE7:                             ; CODE XREF: sub_4CCB90+53j
-                pop     edi
-                pop     esi
-                xor     eax, eax
-                pop     ebx
-                retn    10h
-sub_4CCB90      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; ---------------------------------------------------------------------------
-
-LzmaProps_Decode proc near              ; CODE XREF: Decompress_lzma_internal+35p
-;sub_4CCBF0
-
-propsRes        = dword ptr  4
-propsData       = dword ptr  8
-propsSize       = dword ptr  0Ch
-
-                cmp     [esp+propsSize], 5   ; LZMA_PROPS_SIZE
-                jge     short loc_4CCBFD
-
-loc_4CCBF7:                             ; CODE XREF: LzmaProps_Decode+16j
-                mov     eax, 1
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CCBFD:                             ; CODE XREF: LzmaProps_Decode+5j
-                mov     eax, [esp+propsData]
-                mov     cl, [eax]
-                cmp     cl, 0E1h        ; 9 * 5 * 5
-                jnb     short loc_4CCBF7
-                cmp     cl, 2Dh
-                push    edi
-                mov     edi, [esp+4+propsRes]
-                mov     dword ptr [edi+8], 0
-                jb      short loc_4CCC40
-                push    esi
-                movzx   esi, cl
-                mov     eax, 6C16C16Dh
-                mul     esi
-                mov     eax, esi
-                sub     eax, edx
-                shr     eax, 1
-                add     eax, edx
-                shr     eax, 5
-                movzx   eax, al
-                mov     edx, eax
-                pop     esi
-
-loc_4CCC35:                             ; CODE XREF: LzmaProps_Decode+4Bj
-                add     cl, 0D3h
-                sub     eax, 1
-                jnz     short loc_4CCC35
-                mov     [edi+8], edx
-
-loc_4CCC40:                             ; CODE XREF: LzmaProps_Decode+27j
-                cmp     cl, 9
-                mov     dword ptr [edi+4], 0
-                jb      short loc_4CCC6B
-                movzx   edx, cl
-                mov     eax, 38E38E39h
-                mul     edx
-                shr     edx, 1
-                movzx   eax, dl
-                mov     edx, eax
-                lea     ecx, [ecx+0]
-
-loc_4CCC60:                             ; CODE XREF: LzmaProps_Decode+76j
-                add     cl, 0F7h
-                sub     eax, 1
-                jnz     short loc_4CCC60
-                mov     [edi+4], edx
-
-loc_4CCC6B:                             ; CODE XREF: LzmaProps_Decode+5Aj
-                movzx   eax, cl
-                mov     [edi], eax
-                xor     eax, eax
-                pop     edi
-                retn
-LzmaProps_Decode endp
-
-sub_4CCC80      proc near               ; CODE XREF: Decompress_lzma_internal+97p
-
-var_3C          = dword ptr -3Ch
-var_38          = dword ptr -38h
-var_34          = dword ptr -34h
-var_30          = dword ptr -30h
-var_2C          = dword ptr -2Ch
-var_28          = dword ptr -28h
-var_24          = dword ptr -24h
-var_20          = dword ptr -20h
-var_1C          = dword ptr -1Ch
-var_18          = dword ptr -18h
-var_14          = dword ptr -14h
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-arg_10          = dword ptr  14h
-arg_14          = dword ptr  18h
-arg_18          = dword ptr  1Ch
-
-                sub     esp, 3Ch
-                mov     eax, [esp+3Ch+arg_0]
-                mov     ecx, [eax+8]
-                push    ebx
-                push    ebp
-                mov     ebp, 1
-                mov     edx, ebp
-                shl     edx, cl
-                mov     ecx, [eax+4]
-                xor     ebx, ebx
-                push    esi
-                sub     edx, ebp
-                mov     [esp+48h+var_C], edx
-                mov     edx, ebp
-                shl     edx, cl
-                mov     ecx, [esp+48h+arg_C]
-                push    edi
-                mov     edi, [eax+0Ch]
-                sub     edx, ebp
-                mov     [esp+4Ch+var_8], edx
-                mov     edx, [eax]
-                mov     [ecx], ebx
-                mov     ecx, [esp+4Ch+arg_18]
-                mov     [ecx], ebx
-                mov     ecx, [eax+4]
-                add     ecx, edx
-                mov     eax, 300h
-                shl     eax, cl
-                mov     [esp+4Ch+var_20], edi
-                mov     [esp+4Ch+var_2C], ebx
-                mov     byte ptr [esp+4Ch+arg_0], bl
-                add     eax, 736h
-                mov     [esp+4Ch+var_14], edx
-                mov     [esp+4Ch+var_34], ebx
-                mov     [esp+4Ch+var_38], ebp
-                mov     [esp+4Ch+var_24], ebp
-                mov     [esp+4Ch+var_28], ebp
-                mov     [esp+4Ch+var_18], ebp
-                jz      short loc_4CCD04
-                mov     ecx, eax
-                shr     ecx, 1
-                mov     eax, 4000400h
-                rep stosd
-                adc     ecx, ecx
-                rep stosw
-
-loc_4CCD04:                             ; CODE XREF: sub_4CCC80+72j
-                mov     edx, [esp+4Ch+arg_8]
-                mov     ecx, [esp+4Ch+arg_4]
-                lea     edi, [ecx+edx]
-                xor     esi, esi
-                or      eax, 0FFFFFFFFh
-                mov     [esp+4Ch+var_3C], edi
-                xor     edx, edx
-                lea     ebx, [ebx+0]
-
-loc_4CCD20:                             ; CODE XREF: sub_4CCC80+BCj
-                cmp     ecx, edi
-                jz      loc_4CCF0B
-                movzx   ebp, byte ptr [ecx]
-                shl     esi, 8
-                or      esi, ebp
-                mov     ebp, 1
-                add     edx, ebp
-                add     ecx, ebp
-                cmp     edx, 5
-                jl      short loc_4CCD20
-                cmp     [esp+4Ch+arg_14], ebx
-                mov     [esp+4Ch+arg_8], ecx
-                jbe     loc_4CCFCD
-                lea     esp, [esp+0]
-
-loc_4CCD50:                             ; CODE XREF: sub_4CCC80+32Dj
-                mov     edx, [esp+4Ch+var_34]
-                mov     ecx, [esp+4Ch+var_C]
-                and     ecx, [esp+4Ch+var_2C]
-                mov     edi, [esp+4Ch+var_20]
-                mov     ebx, edx
-                shl     ebx, 4
-                add     ebx, ecx
-                cmp     eax, 1000000h
-                lea     ebx, [edi+ebx*2]
-                mov     [esp+4Ch+var_1C], ecx
-                mov     [esp+4Ch+var_30], ebx
-                jnb     short loc_4CCD99
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebp, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebp
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CCD99:                             ; CODE XREF: sub_4CCC80+F7j
-                movzx   ebx, word ptr [ebx]
-                movzx   ebp, bx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                jnb     loc_4CCFF4
-                mov     edi, [esp+4Ch+var_30]
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebp
-                mov     ebp, [esp+4Ch+var_8]
-                sar     ecx, 5
-                add     ecx, ebx
-                movzx   ebx, byte ptr [esp+4Ch+arg_0]
-                mov     [edi], cx
-                mov     edi, [esp+4Ch+var_2C]
-                mov     ecx, 8
-                sub     cl, byte ptr [esp+4Ch+var_14]
-                and     ebp, edi
-                shr     ebx, cl
-                mov     ecx, [esp+4Ch+var_14]
-                shl     ebp, cl
-                mov     ecx, [esp+4Ch+var_20]
-                mov     edx, 1
-                add     ebx, ebp
-                imul    ebx, 600h
-                cmp     [esp+4Ch+var_34], 7
-                lea     ebp, [ebx+ecx+0E6Ch]
-                mov     [esp+4Ch+var_30], ebp
-                jl      loc_4CCEB0
-                sub     edi, [esp+4Ch+var_38]
-                mov     ecx, [esp+4Ch+arg_10]
-                movzx   ebx, byte ptr [edi+ecx]
-                jmp     short loc_4CCE20
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CCE20:                             ; CODE XREF: sub_4CCC80+197j
-                                        ; sub_4CCC80+2C6j
-                add     ebx, ebx
-                mov     [esp+4Ch+var_10], ebx
-                and     ebx, 100h
-                cmp     eax, 1000000h
-                lea     ecx, [ebx+edx]
-                lea     ebp, [ebp+ecx*2+200h]
-                mov     [esp+4Ch+arg_0], ebp
-                jnb     short loc_4CCE61
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   edi, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, edi
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CCE61:                             ; CODE XREF: sub_4CCC80+1BFj
-                movzx   edi, word ptr [ebp+0]
-                movzx   ebp, di
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                jnb     loc_4CCF15
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebp
-                sar     ecx, 5
-                add     ecx, edi
-                mov     edi, [esp+4Ch+arg_0]
-                add     edx, edx
-                test    ebx, ebx
-                mov     [edi], cx
-                jz      loc_4CCF36
-
-loc_4CCE97:                             ; CODE XREF: sub_4CCC80+2B0j
-                cmp     edx, 100h
-                jge     loc_4CCF70
-                mov     ebp, [esp+4Ch+var_30]
-                jmp     short loc_4CCEB0
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CCEB0:                             ; CODE XREF: sub_4CCC80+185j
-                                        ; sub_4CCC80+227j ...
-                cmp     eax, 1000000h
-                lea     ecx, [edx+edx]
-                mov     [esp+4Ch+arg_0], ecx
-                jnb     short loc_4CCEDE
-                mov     edi, [esp+4Ch+arg_8]
-                cmp     edi, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebx, byte ptr [edi]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebx
-                add     edi, 1
-                mov     [esp+4Ch+arg_8], edi
-
-loc_4CCEDE:                             ; CODE XREF: sub_4CCC80+23Cj
-                movzx   edi, word ptr [ecx+ebp]
-                movzx   ebx, di
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebx
-                cmp     esi, ecx
-                jnb     short loc_4CCF4B
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebx
-                sar     ecx, 5
-                add     ecx, edi
-                mov     edi, [esp+4Ch+arg_0]
-                mov     [edi+ebp], cx
-                add     edx, edx
-                jmp     short loc_4CCF64
-; ---------------------------------------------------------------------------
-
-loc_4CCF0B:                             ; CODE XREF: sub_4CCC80+A2j
-                pop     edi
-                pop     esi
-                mov     eax, ebp
-                pop     ebp
-                pop     ebx
-                add     esp, 3Ch
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CCF15:                             ; CODE XREF: sub_4CCC80+1F2j
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, di
-                shr     cx, 5
-                sub     di, cx
-                test    ebx, ebx
-                mov     ecx, [esp+4Ch+arg_0]
-                mov     [ecx], di
-                lea     edx, [edx+edx+1]
-                jz      loc_4CCE97
-
-loc_4CCF36:                             ; CODE XREF: sub_4CCC80+211j
-                cmp     edx, 100h
-                jge     short loc_4CCF70
-                mov     ebp, [esp+4Ch+var_30]
-                mov     ebx, [esp+4Ch+var_10]
-                jmp     loc_4CCE20
-; ---------------------------------------------------------------------------
-
-loc_4CCF4B:                             ; CODE XREF: sub_4CCC80+26Fj
-                mov     dx, di
-                shr     dx, 5
-                sub     di, dx
-                mov     edx, [esp+4Ch+arg_0]
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     [edx+ebp], di
-                add     edx, 1
-
-loc_4CCF64:                             ; CODE XREF: sub_4CCC80+289j
-                cmp     edx, 100h
-                jl      loc_4CCEB0
-
-loc_4CCF70:                             ; CODE XREF: sub_4CCC80+21Dj
-                                        ; sub_4CCC80+2BCj
-                mov     ecx, [esp+4Ch+var_2C]
-                mov     edi, [esp+4Ch+arg_10]
-                mov     [ecx+edi], dl
-                add     ecx, 1
-                mov     [esp+4Ch+var_2C], ecx
-                mov     ecx, [esp+4Ch+var_34]
-                cmp     ecx, 4
-                mov     byte ptr [esp+4Ch+arg_0], dl
-                jge     short loc_4CCF99
-                mov     [esp+4Ch+var_34], 0
-                jmp     short loc_4CCFA5
-; ---------------------------------------------------------------------------
-
-loc_4CCF99:                             ; CODE XREF: sub_4CCC80+30Dj
-                cmp     ecx, 0Ah
-                jge     short loc_4CCFEF
-                sub     ecx, 3
-
-loc_4CCFA1:                             ; CODE XREF: sub_4CCC80+372j
-                mov     [esp+4Ch+var_34], ecx
-
-loc_4CCFA5:                             ; CODE XREF: sub_4CCC80+317j
-                                        ; sub_4CCC80+530j ...
-                mov     ecx, [esp+4Ch+var_2C]
-                cmp     ecx, [esp+4Ch+arg_14]
-                jb      loc_4CCD50
-
-loc_4CCFB3:                             ; CODE XREF: sub_4CCC80+A13j
-                                        ; sub_4CCC80+A5Aj
-                cmp     eax, 1000000h
-                jnb     short loc_4CCFCD
-                mov     edx, [esp+4Ch+arg_8]
-                cmp     edx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                add     [esp+4Ch+arg_8], 1
-
-loc_4CCFCD:                             ; CODE XREF: sub_4CCC80+C6j
-                                        ; sub_4CCC80+338j
-                mov     eax, [esp+4Ch+arg_8]
-                sub     eax, [esp+4Ch+arg_4]
-                mov     ecx, [esp+4Ch+arg_C]
-                mov     edx, [esp+4Ch+var_2C]
-                pop     edi
-                mov     [ecx], eax
-                mov     eax, [esp+48h+arg_18]
-                pop     esi
-                pop     ebp
-                mov     [eax], edx
-                xor     eax, eax
-                pop     ebx
-                add     esp, 3Ch
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CCFEF:                             ; CODE XREF: sub_4CCC80+31Cj
-                sub     ecx, 6
-                jmp     short loc_4CCFA1
-; ---------------------------------------------------------------------------
-
-loc_4CCFF4:                             ; CODE XREF: sub_4CCC80+129j
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, bx
-                shr     cx, 5
-                sub     bx, cx
-                cmp     eax, 1000000h
-                mov     ecx, [esp+4Ch+var_30]
-                mov     [ecx], bx
-                jnb     short loc_4CD030
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebx, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebx
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CD030:                             ; CODE XREF: sub_4CCC80+38Ej
-                movzx   ebx, word ptr [edi+edx*2+180h]
-                movzx   ebp, bx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                jnb     short loc_4CD096
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebp
-                sar     ecx, 5
-                add     ecx, ebx
-                mov     [edi+edx*2+180h], cx
-                mov     ecx, [esp+4Ch+var_28]
-                mov     ebp, [esp+4Ch+var_1C]
-                mov     [esp+4Ch+var_18], ecx
-                mov     ecx, [esp+4Ch+var_24]
-                mov     [esp+4Ch+var_28], ecx
-                mov     ecx, [esp+4Ch+var_38]
-                mov     [esp+4Ch+var_24], ecx
-                xor     ecx, ecx
-                cmp     edx, 7
-                setl    cl
-                sub     ecx, 1
-                and     ecx, 3
-                mov     [esp+4Ch+var_34], ecx
-                lea     ecx, [edi+664h]
-                jmp     loc_4CD30B
-; ---------------------------------------------------------------------------
-
-loc_4CD096:                             ; CODE XREF: sub_4CCC80+3C5j
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, bx
-                shr     cx, 5
-                sub     bx, cx
-                cmp     eax, 1000000h
-                mov     [edi+edx*2+180h], bx
-                jnb     short loc_4CD0D3
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebx, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebx
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CD0D3:                             ; CODE XREF: sub_4CCC80+431j
-                movzx   ebx, word ptr [edi+edx*2+198h]
-                movzx   ebp, bx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                mov     [esp+4Ch+arg_0], ebx
-                jnb     loc_4CD1D3
-                mov     ebx, 800h
-                sub     ebx, ebp
-                mov     ebp, [esp+4Ch+var_1C]
-                sar     ebx, 5
-                add     ebx, [esp+4Ch+arg_0]
-                mov     eax, ecx
-                mov     [edi+edx*2+198h], bx
-                lea     ebx, [edx+0Fh]
-                shl     ebx, 4
-                add     ebx, ebp
-                cmp     ecx, 1000000h
-                lea     ebx, [edi+ebx*2]
-                mov     [esp+4Ch+var_30], ebx
-                jnb     short loc_4CD147
-                mov     ebx, [esp+4Ch+arg_8]
-                cmp     ebx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                shl     ecx, 8
-                mov     eax, ecx
-                movzx   ecx, byte ptr [ebx]
-                shl     esi, 8
-                or      esi, ecx
-                add     ebx, 1
-                mov     [esp+4Ch+arg_8], ebx
-
-loc_4CD147:                             ; CODE XREF: sub_4CCC80+4A3j
-                mov     ecx, [esp+4Ch+var_30]
-                movzx   ecx, word ptr [ecx]
-                mov     [esp+4Ch+arg_0], ecx
-                movzx   ebx, cx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebx
-                cmp     esi, ecx
-                jnb     short loc_4CD1B5
-                mov     edi, [esp+4Ch+var_30]
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebx
-                sar     ecx, 5
-                add     ecx, [esp+4Ch+arg_0]
-                mov     [edi], cx
-                mov     edi, [esp+4Ch+var_2C]
-                test    edi, edi
-                jz      loc_4CD6E2
-                xor     ecx, ecx
-                cmp     edx, 7
-                mov     edx, [esp+4Ch+arg_10]
-                setnl   cl
-                lea     ecx, [ecx+ecx+9]
-                mov     [esp+4Ch+var_34], ecx
-                mov     ecx, edi
-                sub     ecx, [esp+4Ch+var_38]
-                add     edi, 1
-                mov     cl, [ecx+edx]
-                mov     [edi+edx-1], cl
-                mov     byte ptr [esp+4Ch+arg_0], cl
-                mov     [esp+4Ch+var_2C], edi
-                jmp     loc_4CCFA5
-; ---------------------------------------------------------------------------
-
-loc_4CD1B5:                             ; CODE XREF: sub_4CCC80+4DFj
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     ecx, [esp+4Ch+arg_0]
-                mov     bx, cx
-                shr     bx, 5
-                sub     cx, bx
-                mov     ebx, [esp+4Ch+var_30]
-                mov     [ebx], cx
-                jmp     loc_4CD2F0
-; ---------------------------------------------------------------------------
-
-loc_4CD1D3:                             ; CODE XREF: sub_4CCC80+46Cj
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, bx
-                shr     cx, 5
-                sub     bx, cx
-                cmp     eax, 1000000h
-                mov     [edi+edx*2+198h], bx
-                jnb     short loc_4CD210
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebx, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebx
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CD210:                             ; CODE XREF: sub_4CCC80+56Ej
-                movzx   ebx, word ptr [edi+edx*2+1B0h]
-                movzx   ebp, bx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                jnb     short loc_4CD246
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebp
-                sar     ecx, 5
-                add     ecx, ebx
-                mov     [edi+edx*2+1B0h], cx
-                mov     ecx, [esp+4Ch+var_24]
-                jmp     loc_4CD2E0
-; ---------------------------------------------------------------------------
-
-loc_4CD246:                             ; CODE XREF: sub_4CCC80+5A5j
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, bx
-                shr     cx, 5
-                sub     bx, cx
-                cmp     eax, 1000000h
-                mov     [edi+edx*2+1B0h], bx
-                jnb     short loc_4CD283
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebx, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebx
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CD283:                             ; CODE XREF: sub_4CCC80+5E1j
-                movzx   ebx, word ptr [edi+edx*2+1C8h]
-                movzx   ebp, bx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                jnb     short loc_4CD2B6
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebp
-                sar     ecx, 5
-                add     ecx, ebx
-                mov     [edi+edx*2+1C8h], cx
-                mov     ecx, [esp+4Ch+var_28]
-                jmp     short loc_4CD2D8
-; ---------------------------------------------------------------------------
-
-loc_4CD2B6:                             ; CODE XREF: sub_4CCC80+618j
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, bx
-                shr     cx, 5
-                sub     bx, cx
-                mov     ecx, [esp+4Ch+var_18]
-                mov     [edi+edx*2+1C8h], bx
-                mov     ebx, [esp+4Ch+var_28]
-                mov     [esp+4Ch+var_18], ebx
-
-loc_4CD2D8:                             ; CODE XREF: sub_4CCC80+634j
-                mov     ebx, [esp+4Ch+var_24]
-                mov     [esp+4Ch+var_28], ebx
-
-loc_4CD2E0:                             ; CODE XREF: sub_4CCC80+5C1j
-                mov     ebx, [esp+4Ch+var_38]
-                mov     ebp, [esp+4Ch+var_1C]
-                mov     [esp+4Ch+var_24], ebx
-                mov     [esp+4Ch+var_38], ecx
-
-loc_4CD2F0:                             ; CODE XREF: sub_4CCC80+54Ej
-                xor     ecx, ecx
-                cmp     edx, 7
-                setnl   cl
-                sub     ecx, 1
-                and     ecx, 0FFFFFFFDh
-                add     ecx, 0Bh
-                mov     [esp+4Ch+var_34], ecx
-                lea     ecx, [edi+0A68h]
-
-loc_4CD30B:                             ; CODE XREF: sub_4CCC80+411j
-                cmp     eax, 1000000h
-                jnb     short loc_4CD332
-                mov     edx, [esp+4Ch+arg_8]
-                cmp     edx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   edi, byte ptr [edx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, edi
-                add     edx, 1
-                mov     [esp+4Ch+arg_8], edx
-
-loc_4CD332:                             ; CODE XREF: sub_4CCC80+690j
-                movzx   edi, word ptr [ecx]
-                movzx   ebx, di
-                mov     edx, eax
-                shr     edx, 0Bh
-                imul    edx, ebx
-                cmp     esi, edx
-                jnb     short loc_4CD36E
-                mov     eax, edx
-                mov     edx, 800h
-                sub     edx, ebx
-                sar     edx, 5
-                add     edx, edi
-                mov     [ecx], dx
-                shl     ebp, 4
-                lea     ecx, [ecx+ebp+4]
-                mov     [esp+4Ch+var_1C], 0
-                mov     edx, 3
-                jmp     loc_4CD409
-; ---------------------------------------------------------------------------
-
-loc_4CD36E:                             ; CODE XREF: sub_4CCC80+6C2j
-                sub     eax, edx
-                sub     esi, edx
-                mov     dx, di
-                shr     dx, 5
-                sub     di, dx
-                cmp     eax, 1000000h
-                mov     [ecx], di
-                jnb     short loc_4CD3A6
-                mov     edx, [esp+4Ch+arg_8]
-                cmp     edx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   edi, byte ptr [edx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, edi
-                add     edx, 1
-                mov     [esp+4Ch+arg_8], edx
-
-loc_4CD3A6:                             ; CODE XREF: sub_4CCC80+704j
-                movzx   edx, word ptr [ecx+2]
-                movzx   ebx, dx
-                mov     edi, eax
-                shr     edi, 0Bh
-                imul    edi, ebx
-                cmp     esi, edi
-                jnb     short loc_4CD3E4
-                mov     eax, edi
-                mov     edi, 800h
-                sub     edi, ebx
-                sar     edi, 5
-                add     edi, edx
-                shl     ebp, 4
-                mov     [ecx+2], di
-                lea     ecx, [ecx+ebp+104h]
-                mov     [esp+4Ch+var_1C], 8
-                mov     edx, 3
-                jmp     short loc_4CD409
-; ---------------------------------------------------------------------------
-
-loc_4CD3E4:                             ; CODE XREF: sub_4CCC80+737j
-                sub     eax, edi
-                sub     esi, edi
-                mov     di, dx
-                shr     di, 5
-                sub     dx, di
-                mov     [ecx+2], dx
-                add     ecx, 204h
-                mov     [esp+4Ch+var_1C], 10h
-                mov     edx, 8
-
-loc_4CD409:                             ; CODE XREF: sub_4CCC80+6E9j
-                                        ; sub_4CCC80+762j
-                mov     [esp+4Ch+arg_0], edx
-                mov     [esp+4Ch+var_10], edx
-                mov     ebx, 1
-                jmp     short loc_4CD420
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CD420:                             ; CODE XREF: sub_4CCC80+796j
-                                        ; sub_4CCC80+819j
-                cmp     eax, 1000000h
-                mov     edx, [esp+4Ch+arg_8]
-                lea     edi, [ebx+ebx]
-                mov     [esp+4Ch+var_30], edi
-                jnb     short loc_4CD44E
-                cmp     edx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebp, byte ptr [edx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebp
-                add     edx, 1
-                mov     [esp+4Ch+arg_8], edx
-
-loc_4CD44E:                             ; CODE XREF: sub_4CCC80+7B0j
-                movzx   edi, word ptr [edi+ecx]
-                movzx   ebp, di
-                mov     edx, eax
-                shr     edx, 0Bh
-                imul    edx, ebp
-                cmp     esi, edx
-                jnb     short loc_4CD47B
-                mov     eax, edx
-                mov     edx, 800h
-                sub     edx, ebp
-                sar     edx, 5
-                add     edx, edi
-                mov     edi, [esp+4Ch+var_30]
-                mov     [edi+ecx], dx
-                add     ebx, ebx
-                jmp     short loc_4CD494
-; ---------------------------------------------------------------------------
-
-loc_4CD47B:                             ; CODE XREF: sub_4CCC80+7DFj
-                mov     ebx, [esp+4Ch+var_30]
-                sub     eax, edx
-                sub     esi, edx
-                mov     dx, di
-                shr     dx, 5
-                sub     di, dx
-                mov     [ebx+ecx], di
-                add     ebx, 1
-
-loc_4CD494:                             ; CODE XREF: sub_4CCC80+7F9j
-                sub     [esp+4Ch+var_10], 1
-                jnz     short loc_4CD420
-                mov     ecx, [esp+4Ch+arg_0]
-                mov     edx, 1
-                shl     edx, cl
-                mov     ecx, [esp+4Ch+var_1C]
-                sub     ecx, edx
-                add     ebx, ecx
-                cmp     [esp+4Ch+var_34], 4
-                mov     [esp+4Ch+var_4], ebx
-                jge     loc_4CD69D
-                add     [esp+4Ch+var_34], 7
-                cmp     ebx, 4
-                jl      short loc_4CD4CC
-                mov     ebx, 3
-
-loc_4CD4CC:                             ; CODE XREF: sub_4CCC80+845j
-                mov     ecx, [esp+4Ch+var_20]
-                shl     ebx, 7
-                lea     ecx, [ebx+ecx+360h]
-                mov     [esp+4Ch+var_30], ecx
-                mov     [esp+4Ch+arg_0], 6
-                mov     edi, 1
-                jmp     short loc_4CD4F0
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CD4F0:                             ; CODE XREF: sub_4CCC80+86Bj
-                                        ; sub_4CCC80+8E3j
-                cmp     eax, 1000000h
-                mov     edx, [esp+4Ch+arg_8]
-                lea     ebx, [edi+edi]
-                jnb     short loc_4CD51A
-                cmp     edx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebp, byte ptr [edx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebp
-                add     edx, 1
-                mov     [esp+4Ch+arg_8], edx
-
-loc_4CD51A:                             ; CODE XREF: sub_4CCC80+87Cj
-                movzx   edx, word ptr [ebx+ecx]
-                movzx   ebp, dx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                jnb     short loc_4CD545
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebp
-                sar     ecx, 5
-                add     ecx, edx
-                mov     [esp+4Ch+var_10], ecx
-                mov     edx, ecx
-                add     edi, edi
-                jmp     short loc_4CD556
-; ---------------------------------------------------------------------------
-
-loc_4CD545:                             ; CODE XREF: sub_4CCC80+8ABj
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, dx
-                shr     cx, 5
-                sub     dx, cx
-                lea     edi, [ebx+1]
-
-loc_4CD556:                             ; CODE XREF: sub_4CCC80+8C3j
-                sub     [esp+4Ch+arg_0], 1
-                mov     ecx, [esp+4Ch+var_30]
-                mov     [ebx+ecx], dx
-                jnz     short loc_4CD4F0
-                sub     edi, 40h
-                cmp     edi, 4
-                jl      loc_4CD68A
-                mov     ebx, 1
-                mov     ecx, edi
-                mov     edx, edi
-                sar     ecx, 1
-                and     edx, ebx
-                sub     ecx, ebx
-                or      edx, 2
-                cmp     edi, 0Eh
-                mov     [esp+4Ch+var_30], ecx
-                jge     short loc_4CD5A1
-                shl     edx, cl
-                mov     ecx, [esp+4Ch+var_20]
-                mov     [esp+4Ch+var_38], edx
-                sub     edx, edi
-                lea     ebp, [ecx+edx*2+55Eh]
-                jmp     short loc_4CD5F3
-; ---------------------------------------------------------------------------
-
-loc_4CD5A1:                             ; CODE XREF: sub_4CCC80+90Aj
-                mov     edi, [esp+4Ch+arg_8]
-                sub     ecx, 4
-
-loc_4CD5A8:                             ; CODE XREF: sub_4CCC80+958j
-                cmp     eax, 1000000h
-                jnb     short loc_4CD5CA
-                cmp     edi, [esp+4Ch+var_3C]
-                jz      loc_4CD6EF
-                movzx   ebp, byte ptr [edi]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebp
-                add     edi, ebx
-                mov     [esp+4Ch+arg_8], edi
-
-loc_4CD5CA:                             ; CODE XREF: sub_4CCC80+92Dj
-                shr     eax, 1
-                add     edx, edx
-                cmp     esi, eax
-                jb      short loc_4CD5D6
-                sub     esi, eax
-                or      edx, ebx
-
-loc_4CD5D6:                             ; CODE XREF: sub_4CCC80+950j
-                sub     ecx, ebx
-                jnz     short loc_4CD5A8
-                mov     ebp, [esp+4Ch+var_20]
-                add     ebp, 644h
-                shl     edx, 4
-                mov     [esp+4Ch+var_38], edx
-                mov     [esp+4Ch+var_30], 4
-
-loc_4CD5F3:                             ; CODE XREF: sub_4CCC80+91Fj
-                mov     [esp+4Ch+var_1C], ebx
-                mov     [esp+4Ch+arg_0], ebx
-                jmp     short loc_4CD600
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CD600:                             ; CODE XREF: sub_4CCC80+97Bj
-                                        ; sub_4CCC80+A02j
-                mov     ebx, [esp+4Ch+arg_0]
-                add     ebx, ebx
-                cmp     eax, 1000000h
-                jnb     short loc_4CD62D
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   edx, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, edx
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CD62D:                             ; CODE XREF: sub_4CCC80+98Bj
-                movzx   edi, word ptr [ebx+ebp]
-                movzx   ecx, di
-                mov     edx, eax
-                shr     edx, 0Bh
-                imul    edx, ecx
-                cmp     esi, edx
-                jnb     short loc_4CD658
-                mov     eax, edx
-                mov     edx, 800h
-                sub     edx, ecx
-                sar     edx, 5
-                add     edx, edi
-                shl     [esp+4Ch+arg_0], 1
-                mov     [ebx+ebp], dx
-                jmp     short loc_4CD679
-; ---------------------------------------------------------------------------
-
-loc_4CD658:                             ; CODE XREF: sub_4CCC80+9BEj
-                mov     cx, di
-                shr     cx, 5
-                sub     di, cx
-                sub     eax, edx
-                sub     esi, edx
-                mov     edx, [esp+4Ch+var_1C]
-                mov     [ebx+ebp], di
-                add     ebx, 1
-                or      [esp+4Ch+var_38], edx
-                mov     [esp+4Ch+arg_0], ebx
-
-loc_4CD679:                             ; CODE XREF: sub_4CCC80+9D6j
-                shl     [esp+4Ch+var_1C], 1
-                sub     [esp+4Ch+var_30], 1
-                jnz     loc_4CD600
-                jmp     short loc_4CD68E
-; ---------------------------------------------------------------------------
-
-loc_4CD68A:                             ; CODE XREF: sub_4CCC80+8EBj
-                mov     [esp+4Ch+var_38], edi
-
-loc_4CD68E:                             ; CODE XREF: sub_4CCC80+A08j
-                add     [esp+4Ch+var_38], 1
-                jz      loc_4CCFB3
-                mov     ebx, [esp+4Ch+var_4]
-
-loc_4CD69D:                             ; CODE XREF: sub_4CCC80+837j
-                mov     ebp, [esp+4Ch+var_2C]
-                mov     ecx, [esp+4Ch+var_38]
-                add     ebx, 2
-                cmp     ecx, ebp
-                ja      short loc_4CD6E2
-                mov     edi, ebp
-                sub     edi, ecx
-                add     edi, [esp+4Ch+arg_10]
-
-loc_4CD6B4:                             ; CODE XREF: sub_4CCC80+A60j
-                mov     cl, [edi]
-                mov     edx, [esp+4Ch+arg_10]
-                sub     ebx, 1
-                mov     [edx+ebp], cl
-                add     ebp, 1
-                add     edi, 1
-                test    ebx, ebx
-                mov     byte ptr [esp+4Ch+arg_0], cl
-                mov     [esp+4Ch+var_2C], ebp
-                jz      loc_4CCFA5
-                cmp     ebp, [esp+4Ch+arg_14]
-                jnb     loc_4CCFB3
-                jmp     short loc_4CD6B4
-; ---------------------------------------------------------------------------
-
-loc_4CD6E2:                             ; CODE XREF: sub_4CCC80+101j
-                                        ; sub_4CCC80+1C9j ...
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     eax, 1
-                pop     ebx
-                add     esp, 3Ch
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CD6EF:                             ; CODE XREF: sub_4CCC80+933j
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     eax, ebx
-                pop     ebx
-                add     esp, 3Ch
-                retn
-sub_4CCC80      endp
-
-_starcraft_decompress_lzma PROC
-;sub_4CD700
-
-var_14          = byte ptr -14h
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_4           = dword ptr -4
-pbInBuffer      = dword ptr  4
-cbInBuffer      = dword ptr  8
-pbOutBuffer     = dword ptr  0Ch
-cbOutBuffer     = dword ptr  10h
-pcbOutBuffer    = dword ptr  14h
-pfnAllocateMemory= dword ptr  18h
-pfnFreeMemory   = dword ptr  1Ch
-
-                sub     esp, 14h
-                push    ebx
-                mov     ebx, [esp+18h+cbInBuffer]
-                cmp     ebx, 0Eh        ; LZMA_PROPS_SIZE + 8
-                jnb     short loc_4CD714
-                xor     al, al
-                pop     ebx
-                add     esp, 14h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CD714:                             ; CODE XREF: Decompress_lzma_internal+Bj
-                push    ebp
-                mov     ebp, [esp+1Ch+pcbOutBuffer]
-                push    edi
-                mov     edi, [esp+20h+pbInBuffer]
-                mov     dword ptr [ebp+0], 0
-                cmp     byte ptr [edi], 0
-                jnz     short loc_4CD741
-                push    5
-                lea     eax, [edi+1]
-                push    eax
-                lea     ecx, [esp+28h+var_10]
-                push    ecx
-                call    LzmaProps_Decode
-                add     esp, 0Ch
-                test    eax, eax
-                jz      short loc_4CD74A
-
-loc_4CD741:                             ; CODE XREF: Decompress_lzma_internal+28j
-                pop     edi
-                pop     ebp
-                xor     al, al
-                pop     ebx
-                add     esp, 14h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CD74A:                             ; CODE XREF: Decompress_lzma_internal+3Fj
-                mov     edx, [esp+20h+var_10]
-                mov     eax, [esp+20h+var_C]
-                lea     ecx, [eax+edx]
-                mov     edx, 300h
-                shl     edx, cl
-                push    esi
-                lea     eax, [edx+edx+0E6Ch]
-                push    eax
-                call    [esp+28h+pfnAllocateMemory]
-                mov     esi, eax
-                add     esp, 4
-                test    esi, esi
-                mov     [esp+24h+var_4], esi
-                jz      short loc_4CD7AA
-                mov     edx, [esp+24h+cbOutBuffer]
-                mov     eax, [esp+24h+pbOutBuffer]
-                lea     ecx, [esp+24h+cbInBuffer]
-                push    ecx             ; cbInBuffer
-                push    edx             ; cbOutBuffer
-                push    eax             ; pbOutBuffer
-                lea     ecx, [esp+30h+var_14]
-                push    ecx             ; &var_14
-                add     ebx, 0FFFFFFF2h
-                push    ebx             ; cbInBuffer - LZMA86_HEADER_SIZE
-                add     edi, 0Eh
-                lea     edx, [esp+38h+var_10]
-                push    edi             ; pbInBuffer + LZMA86_HEADER_SIZE
-                push    edx             ; dest
-                call    sub_4CCC80
-                push    esi
-                mov     edi, eax
-                call    [esp+44h+pfnFreeMemory]
-                add     esp, 20h
-                test    edi, edi
-                jz      short loc_4CD7B4
-
-loc_4CD7AA:                             ; CODE XREF: Decompress_lzma_internal+74j
-                pop     esi
-                pop     edi
-                pop     ebp
-                xor     al, al
-                pop     ebx
-                add     esp, 14h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CD7B4:                             ; CODE XREF: Decompress_lzma_internal+A8j
-                mov     eax, [esp+24h+cbInBuffer]
-                pop     esi
-                pop     edi
-                mov     [ebp+0], eax
-                pop     ebp
-                mov     al, 1
-                pop     ebx
-                add     esp, 14h
-                retn
-_starcraft_decompress_lzma ENDP
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CD7D0      proc near               ; CODE XREF: sub_4CDC00+74p
-
-arg_0           = dword ptr  4
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                or      esi, 8
-                xor     eax, eax
-                cmp     esi, 1
-                jz      short loc_4CD806
-                push    edi
-
-loc_4CD7E0:                             ; CODE XREF: sub_4CD7D0+33j
-                mov     edx, esi
-                shr     esi, 1
-                mov     edi, [ecx+esi*4]
-                and     edx, 1
-                sub     edi, edx
-                neg     edx
-                xor     edi, edx
-                shr     edi, 2
-                and     edi, 1FFh
-                add     eax, dword_550998[edi*4]
-                cmp     esi, 1
-                jnz     short loc_4CD7E0
-                pop     edi
-
-loc_4CD806:                             ; CODE XREF: sub_4CD7D0+Dj
-                pop     esi
-                retn    4
-sub_4CD7D0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CD810      proc near               ; CODE XREF: CEncoder_FillAlignPrices+17p
-
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-
-                push    ecx
-                push    ebx
-                push    ebp
-                push    esi
-                xor     eax, eax
-                push    edi
-                mov     edi, [esp+14h+arg_0]
-                mov     [esp+14h+var_4], ecx
-                lea     esi, [eax+1]
-                lea     ebx, [eax+4]
-
-loc_4CD825:                             ; CODE XREF: sub_4CD810+42j
-                mov     ecx, [esp+14h+var_4]
-                mov     ecx, [ecx+esi*4]
-                mov     edx, edi
-                and     edx, 1
-                sub     ecx, edx
-                mov     ebp, edx
-                neg     ebp
-                xor     ecx, ebp
-                shr     ecx, 2
-                and     ecx, 1FFh
-                add     eax, dword_550998[ecx*4]
-                add     esi, esi
-                shr     edi, 1
-                or      esi, edx
-                sub     ebx, 1
-                jnz     short loc_4CD825
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn    4
-sub_4CD810      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CD860      proc near               ; CODE XREF: CEncoder_FillDistancesPrices+6Bp
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                push    edi
-                mov     edi, [esp+4+arg_4]
-                xor     eax, eax
-                test    edi, edi
-                lea     edx, [eax+1]
-                jz      short loc_4CD8A7
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+10h+arg_8]
-
-loc_4CD875:                             ; CODE XREF: sub_4CD860+42j
-                mov     ebx, [esp+10h+arg_0]
-                mov     ebx, [ebx+edx*4]
-                mov     ecx, esi
-                and     ecx, 1
-                sub     ebx, ecx
-                mov     ebp, ecx
-                neg     ebp
-                xor     ebx, ebp
-                shr     ebx, 2
-                and     ebx, 1FFh
-                add     eax, dword_550998[ebx*4]
-                add     edx, edx
-                shr     esi, 1
-                or      edx, ecx
-                sub     edi, 1
-                jnz     short loc_4CD875
-                pop     esi
-                pop     ebp
-                pop     ebx
-
-loc_4CD8A7:                             ; CODE XREF: sub_4CD860+Cj
-                pop     edi
-                retn
-sub_4CD860      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CD8B0      proc near               ; CODE XREF: CEncoder_CodeOneBlock+7B8p
-                mov     eax, [ecx+24h]
-                mov     edx, [ecx+1Ch]
-                push    ebx
-                push    esi
-                mov     esi, [ecx+30h]
-                xor     ebx, ebx
-                push    edi
-                mov     edi, [ecx+34h]
-                sub     esi, eax
-                sbb     edi, ebx
-                add     esi, edx
-                adc     edi, ebx
-                cmp     eax, edx
-                jbe     short loc_4CD8D4
-                mov     eax, [ecx+28h]
-                add     esi, eax
-                adc     edi, ebx
-
-loc_4CD8D4:                             ; CODE XREF: sub_4CD8B0+1Bj
-                mov     eax, [ecx]
-                xor     edx, edx
-                add     eax, esi
-                adc     edx, edi
-                pop     edi
-                add     eax, 4
-                pop     esi
-                adc     edx, ebx
-                pop     ebx
-                retn
-sub_4CD8B0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CD8F0      proc near               ; CODE XREF: sub_4CD940+21p
-                                        ; .text:loc_4CF730j ...
-                mov     eax, dword_553598
-                test    eax, eax
-                push    esi
-                mov     esi, ecx
-                push    edi
-                mov     edi, [esi]
-                jnz     short loc_4CD92A
-                push    0Ch             ; Size
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                test    eax, eax
-                jz      short loc_4CD923
-                mov     dword ptr [eax], 0
-                mov     dword ptr [eax+4], 0
-                mov     dword ptr [eax+8], 0
-                jmp     short loc_4CD925
-; ---------------------------------------------------------------------------
-
-loc_4CD923:                             ; CODE XREF: sub_4CD8F0+1Bj
-                xor     eax, eax
-
-loc_4CD925:                             ; CODE XREF: sub_4CD8F0+31j
-                mov     dword_553598, eax
-
-loc_4CD92A:                             ; CODE XREF: sub_4CD8F0+Dj
-                mov     eax, [eax+4]
-                test    eax, eax
-                jz      short loc_4CD937
-                push    edi
-                call    eax
-                add     esp, 4
-
-loc_4CD937:                             ; CODE XREF: sub_4CD8F0+3Fj
-                pop     edi
-                mov     dword ptr [esi], 0
-                pop     esi
-                retn
-sub_4CD8F0      endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CD940      proc near               ; CODE XREF: sub_4D0270+74p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                mov     ebx, [esp+4+arg_4]
-                push    esi
-                mov     esi, ecx
-                cmp     dword ptr [esi], 0
-                push    edi
-                mov     edi, [esp+0Ch+arg_0]
-                jz      short loc_4CD95F
-                mov     eax, [esi+8]
-                add     eax, [esi+4]
-                lea     ecx, [edi+ebx]
-                cmp     ecx, eax
-                jz      short loc_4CD981
-
-loc_4CD95F:                             ; CODE XREF: sub_4CD940+10j
-                mov     ecx, esi
-                call    sub_4CD8F0
-                lea     ecx, [edi+ebx]
-                mov     edx, 1
-                shl     edx, cl
-                imul    edx, 0C00h
-                push    edx
-                call    sub_4CB8A0
-                add     esp, 4
-                mov     [esi], eax
-
-loc_4CD981:                             ; CODE XREF: sub_4CD940+1Dj
-                mov     ecx, edi
-                mov     eax, 1
-                shl     eax, cl
-                mov     [esi+8], edi
-                pop     edi
-                mov     [esi+4], ebx
-                sub     eax, 1
-                mov     [esi+0Ch], eax
-                xor     eax, eax
-                cmp     [esi], eax
-                pop     esi
-                setnz   al
-                pop     ebx
-                retn    8
-sub_4CD940      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CD9B0      proc near               ; CODE XREF: CEncoder_GetOptimum+436p
-                                        ; CEncoder_GetOptimum+AE1p
-
-arg_0           = dword ptr  4
-arg_4           = byte ptr  8
-arg_8           = dword ptr  0Ch
-
-                mov     edx, [esp+arg_0]
-                test    edx, edx
-                push    esi
-                jnz     short loc_4CD9F2
-                movzx   eax, [esp+4+arg_4]
-                mov     edx, eax
-                shl     edx, 4
-                add     edx, [esp+4+arg_8]
-                mov     esi, 800h
-                sub     esi, [ecx+edx*4+284B0h]
-                mov     ecx, [ecx+eax*4+28420h]
-                shr     esi, 2
-                mov     eax, dword_550998[esi*4]
-                shr     ecx, 2
-                add     eax, dword_550998[ecx*4]
-                pop     esi
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CD9F2:                             ; CODE XREF: sub_4CD9B0+7j
-                movzx   esi, [esp+4+arg_4]
-                mov     eax, 800h
-                sub     eax, [ecx+esi*4+28420h]
-                shr     eax, 2
-                cmp     edx, 1
-                mov     eax, dword_550998[eax*4]
-                jnz     short loc_4CDA27
-                mov     ecx, [ecx+esi*4+28450h]
-                shr     ecx, 2
-                add     eax, dword_550998[ecx*4]
-                pop     esi
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CDA27:                             ; CODE XREF: sub_4CD9B0+60j
-                push    edi
-                add     edx, 0FFFFFFFEh
-                mov     edi, 800h
-                sub     edi, [ecx+esi*4+28450h]
-                mov     ecx, [ecx+esi*4+28480h]
-                sub     ecx, edx
-                neg     edx
-                xor     ecx, edx
-                shr     edi, 2
-                mov     edx, dword_550998[edi*4]
-                shr     ecx, 2
-                and     ecx, 1FFh
-                add     edx, dword_550998[ecx*4]
-                pop     edi
-                add     eax, edx
-                pop     esi
-                retn    0Ch
-sub_4CD9B0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CDA70      proc near               ; CODE XREF: CEncoder_CodeReal+10Cp
-                                        ; CEncoder_CodeReal+134p ...
-                push    esi
-                mov     esi, [ecx]
-                cmp     dword ptr [esi+80h], 0
-                jz      short loc_4CDA8C
-                cmp     byte ptr [esi+33B95h], 0
-                jz      short loc_4CDA8C
-                mov     byte ptr [esi+33B95h], 0
-
-loc_4CDA8C:                             ; CODE XREF: sub_4CDA70+Aj
-                                        ; sub_4CDA70+13j
-                mov     eax, [esi+33B8Ch]
-                test    eax, eax
-                jz      short loc_4CDAA8
-                mov     ecx, [eax]
-                mov     edx, [ecx+8]
-                push    eax
-                call    edx
-                mov     dword ptr [esi+33B8Ch], 0
-
-loc_4CDAA8:                             ; CODE XREF: sub_4CDA70+24j
-                mov     ecx, [esi+4]
-                mov     edx, [ecx+10h]
-                lea     eax, [esi+4]
-                push    eax
-                call    edx
-                pop     esi
-                retn
-sub_4CDA70      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CDAC0      proc near               ; CODE XREF: CEncoder_GetOptimum+2C4p
-                                        ; CEncoder_GetOptimum+7ACp ...
-
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = byte ptr  8
-arg_8           = byte ptr  0Ch
-
-                push    ecx
-                push    ebx
-                push    ebp
-                xor     ebp, ebp
-                cmp     byte ptr [esp+0Ch+arg_0], 0
-                push    esi
-                mov     eax, ecx
-                push    edi
-                mov     [esp+14h+var_4], eax
-                lea     edi, [ebp+1]
-                lea     ebx, [ebp+8]
-                jz      short loc_4CDB3B
-                movzx   ecx, [esp+14h+arg_8]
-                mov     [esp+14h+arg_0], ecx
-
-loc_4CDAE3:                             ; CODE XREF: sub_4CDAC0+71j
-                movzx   esi, [esp+14h+arg_4]
-                mov     edx, [esp+14h+arg_0]
-                sub     ebx, 1
-                movzx   ecx, bl
-                shr     esi, cl
-                shr     edx, cl
-                and     esi, 1
-                mov     ecx, esi
-                shl     ecx, 8
-                add     ecx, edi
-                mov     eax, [eax+ecx*4+400h]
-                and     edx, 1
-                sub     eax, edx
-                mov     ecx, edx
-                neg     ecx
-                xor     eax, ecx
-                shr     eax, 2
-                and     eax, 1FFh
-                add     ebp, dword_550998[eax*4]
-                add     edi, edi
-                or      edi, edx
-                cmp     esi, edx
-                jnz     short loc_4CDB33
-                test    ebx, ebx
-                jz      short loc_4CDB75
-                mov     eax, [esp+14h+var_4]
-                jmp     short loc_4CDAE3
-; ---------------------------------------------------------------------------
-
-loc_4CDB33:                             ; CODE XREF: sub_4CDAC0+67j
-                test    ebx, ebx
-                jz      short loc_4CDB75
-                mov     eax, [esp+14h+var_4]
-
-loc_4CDB3B:                             ; CODE XREF: sub_4CDAC0+18j
-                movzx   edx, [esp+14h+arg_8]
-                mov     [esp+14h+arg_0], edx
-
-loc_4CDB44:                             ; CODE XREF: sub_4CDAC0+B3j
-                mov     edx, [esp+14h+arg_0]
-                sub     ebx, 1
-                mov     cl, bl
-                shr     edx, cl
-                mov     ecx, [eax+edi*4]
-                add     edi, edi
-                and     edx, 1
-                sub     ecx, edx
-                mov     esi, edx
-                neg     esi
-                xor     ecx, esi
-                shr     ecx, 2
-                and     ecx, 1FFh
-                add     ebp, dword_550998[ecx*4]
-                or      edi, edx
-                test    ebx, ebx
-                jnz     short loc_4CDB44
-
-loc_4CDB75:                             ; CODE XREF: sub_4CDAC0+6Bj
-                                        ; sub_4CDAC0+75j
-                pop     edi
-                pop     esi
-                mov     eax, ebp
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn    0Ch
-sub_4CDAC0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CDB80      proc near               ; CODE XREF: sub_4CDEA0+11Ep
-                                        ; sub_4CDEA0+137p
-
-arg_0           = dword ptr  4
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                test    esi, esi
-                mov     edx, 400h
-                push    edi
-                mov     [ecx], edx
-                mov     [ecx+4], edx
-                jbe     short loc_4CDBE6
-                lea     eax, [ecx+20Ch]
-                lea     ebx, [ebx+0]
-
-loc_4CDBA0:                             ; CODE XREF: sub_4CDB80+64j
-                mov     [eax-200h], edx
-                mov     [eax-1FCh], edx
-                mov     [eax-1F8h], edx
-                mov     [eax-1F4h], edx
-                mov     [eax-1F0h], edx
-                mov     [eax-1ECh], edx
-                mov     [eax-1E8h], edx
-                mov     [eax], edx
-                mov     [eax+4], edx
-                mov     [eax+8], edx
-                mov     [eax+0Ch], edx
-                mov     [eax+10h], edx
-                mov     [eax+14h], edx
-                mov     [eax+18h], edx
-                add     eax, 20h
-                sub     esi, 1
-                jnz     short loc_4CDBA0
-
-loc_4CDBE6:                             ; CODE XREF: sub_4CDB80+12j
-                lea     edi, [ecx+40Ch]
-                mov     ecx, 0FFh
-                mov     eax, edx
-                rep stosd
-                pop     edi
-                pop     esi
-                retn    4
-sub_4CDB80      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CDC00      proc near               ; CODE XREF: sub_4CF740+22p
-                                        ; sub_4CF780+2Bp
-
-var_C           = dword ptr -0Ch
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                sub     esp, 0Ch
-                push    ebx
-                push    ebp
-                push    esi
-                push    edi
-                mov     edi, ecx
-                mov     eax, [edi]
-                mov     ebx, [esp+1Ch+arg_0]
-                mov     ecx, eax
-                shr     ecx, 2
-                mov     edx, dword_550998[ecx*4]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 2
-                mov     eax, dword_550998[ecx*4]
-                mov     ecx, [edi+4]
-                mov     [esp+1Ch+var_C], edx
-                mov     edx, ecx
-                shr     edx, 2
-                mov     ebp, dword_550998[edx*4]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 2
-                mov     ecx, dword_550998[edx*4]
-                add     ebp, eax
-                add     ecx, eax
-                mov     [esp+1Ch+var_8], ebp
-                mov     [esp+1Ch+var_4], ecx
-                xor     esi, esi
-                mov     edi, edi
-
-loc_4CDC60:                             ; CODE XREF: sub_4CDC00+8Aj
-                cmp     esi, [esp+1Ch+arg_4]
-                jnb     loc_4CDD62
-                mov     eax, ebx
-                shl     eax, 5
-                push    esi
-                lea     ecx, [eax+edi+8]
-                call    sub_4CD7D0
-                add     eax, [esp+1Ch+var_C]
-                mov     ecx, [esp+1Ch+arg_8]
-                mov     [ecx+esi*4], eax
-                add     esi, 1
-                cmp     esi, 8
-                jb      short loc_4CDC60
-                cmp     esi, 10h
-                jnb     short loc_4CDD00
-                lea     ecx, [esi-8]
-                mov     [esp+1Ch+arg_0], ecx
-                jmp     short loc_4CDCA0
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CDCA0:                             ; CODE XREF: sub_4CDC00+98j
-                                        ; sub_4CDC00+FEj
-                cmp     esi, [esp+1Ch+arg_4]
-                jnb     loc_4CDD62
-                or      ecx, 8
-                xor     edx, edx
-                cmp     ecx, 1
-                jz      short loc_4CDCE4
-
-loc_4CDCB4:                             ; CODE XREF: sub_4CDC00+DEj
-                mov     eax, ecx
-                shr     ecx, 1
-                and     eax, 1
-                lea     ebp, [ecx+ebx*8]
-                mov     ebp, [edi+ebp*4+208h]
-                sub     ebp, eax
-                neg     eax
-                xor     ebp, eax
-                shr     ebp, 2
-                and     ebp, 1FFh
-                add     edx, dword_550998[ebp*4]
-                cmp     ecx, 1
-                jnz     short loc_4CDCB4
-                mov     ebp, [esp+1Ch+var_8]
-
-loc_4CDCE4:                             ; CODE XREF: sub_4CDC00+B2j
-                mov     eax, [esp+1Ch+arg_8]
-                mov     ecx, [esp+1Ch+arg_0]
-                add     edx, ebp
-                mov     [eax+esi*4], edx
-                add     esi, 1
-                add     ecx, 1
-                cmp     esi, 10h
-                mov     [esp+1Ch+arg_0], ecx
-                jb      short loc_4CDCA0
-
-loc_4CDD00:                             ; CODE XREF: sub_4CDC00+8Fj
-                cmp     esi, [esp+1Ch+arg_4]
-                jnb     short loc_4CDD62
-                lea     ebx, [esi-10h]
-                lea     esp, [esp+0]
-
-loc_4CDD10:                             ; CODE XREF: sub_4CDC00+160j
-                mov     ecx, ebx
-                or      ecx, 100h
-                xor     edx, edx
-                cmp     ecx, 1
-                jz      short loc_4CDD49
-                nop
-
-loc_4CDD20:                             ; CODE XREF: sub_4CDC00+147j
-                mov     eax, ecx
-                shr     ecx, 1
-                mov     ebp, [edi+ecx*4+408h]
-                and     eax, 1
-                sub     ebp, eax
-                neg     eax
-                xor     ebp, eax
-                shr     ebp, 2
-                and     ebp, 1FFh
-                add     edx, dword_550998[ebp*4]
-                cmp     ecx, 1
-                jnz     short loc_4CDD20
-
-loc_4CDD49:                             ; CODE XREF: sub_4CDC00+11Dj
-                mov     ecx, [esp+1Ch+var_4]
-                mov     eax, [esp+1Ch+arg_8]
-                add     edx, ecx
-                mov     [eax+esi*4], edx
-                add     esi, 1
-                add     ebx, 1
-                cmp     esi, [esp+1Ch+arg_4]
-                jb      short loc_4CDD10
-
-loc_4CDD62:                             ; CODE XREF: sub_4CDC00+64j
-                                        ; sub_4CDC00+A4j ...
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                add     esp, 0Ch
-                retn    0Ch
-sub_4CDC00      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-; int __cdecl sub_4CDD70(SIZE_T dwSize)
-sub_4CDD70      proc near               ; DATA XREF: .data:off_546E20o
-
-dwSize          = dword ptr  4
-
-                mov     eax, [esp+dwSize]
-                test    eax, eax
-                jnz     short loc_4CDD79
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CDD79:                             ; CODE XREF: sub_4CDD70+6j
-                push    4               ; flProtect
-                push    1000h           ; flAllocationType
-                push    eax             ; dwSize
-                push    0               ; lpAddress
-                call    ds:VirtualAlloc
-                retn
-sub_4CDD70      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-; int __cdecl sub_4CDD90(LPVOID lpAddress)
-sub_4CDD90      proc near               ; CODE XREF: sub_4CF810+53p
-                                        ; sub_4CF810+73p
-                                        ; DATA XREF: ...
-
-lpAddress       = dword ptr  4
-
-                mov     eax, [esp+lpAddress]
-                test    eax, eax
-                jz      short locret_4CDDA6
-                push    8000h           ; dwFreeType
-                push    0               ; dwSize
-                push    eax             ; lpAddress
-                call    ds:VirtualFree
-
-locret_4CDDA6:                          ; CODE XREF: sub_4CDD90+6j
-                retn
-sub_4CDD90      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CDDB0      proc near               ; DATA XREF: .rdata:00517AC8o
-
-var_10          = dword ptr -10h
-var_C           = byte ptr -0Ch
-var_B           = byte ptr -0Bh
-var_A           = byte ptr -0Ah
-var_9           = byte ptr -9
-var_8           = byte ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                sub     esp, 10h
-                mov     eax, dword_544960
-                xor     eax, esp
-                mov     [esp+10h+var_4], eax
-                mov     ecx, [esp+10h+arg_0]
-                mov     al, [ecx+33B50h]
-                mov     dl, 5
-                imul    dl
-                add     al, [ecx+33B58h]
-                mov     dl, 9
-                imul    dl
-                add     al, [ecx+33B5Ch]
-                push    ebp
-                mov     ebp, [esp+14h+arg_4]
-                mov     [esp+14h+var_C], al
-                mov     eax, [ecx+33B60h]
-                mov     ecx, eax
-                mov     edx, eax
-                push    esi
-                shr     ecx, 8
-                shr     edx, 10h
-                mov     [esp+18h+var_B], al
-                shr     eax, 18h
-                push    edi
-                mov     [esp+1Ch+var_A], cl
-                mov     [esp+1Ch+var_9], dl
-                mov     [esp+1Ch+var_8], al
-                mov     esi, 5
-                lea     edi, [esp+1Ch+var_C]
-
-loc_4CDE13:                             ; CODE XREF: sub_4CDDB0+85j
-                mov     eax, [ebp+0]
-                mov     edx, [eax+0Ch]
-                lea     ecx, [esp+1Ch+var_10]
-                push    ecx
-                push    esi
-                push    edi
-                push    ebp
-                call    edx
-                mov     ecx, [esp+1Ch+var_10]
-                add     edi, ecx
-                sub     esi, ecx
-                test    eax, eax
-                jnz     short loc_4CDE37
-                test    ecx, ecx
-                jz      short loc_4CDE4B
-                test    esi, esi
-                jnz     short loc_4CDE13
-
-loc_4CDE37:                             ; CODE XREF: sub_4CDDB0+7Dj
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     ecx, [esp+10h+var_4]
-                xor     ecx, esp
-                call    sub_4A0686
-                add     esp, 10h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CDE4B:                             ; CODE XREF: sub_4CDDB0+81j
-                mov     ecx, [esp+1Ch+var_4]
-                pop     edi
-                pop     esi
-                pop     ebp
-                xor     ecx, esp
-                mov     eax, 80004005h
-                call    sub_4A0686
-                add     esp, 10h
-                retn    8
-sub_4CDDB0      endp
-
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CDE70      proc near               ; DATA XREF: .rdata:00517AF4o
-
-arg_0           = dword ptr  4
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                mov     eax, [esi+50h]
-                test    eax, eax
-                jz      short loc_4CDE8B
-                mov     ecx, [eax]
-                mov     edx, [ecx+8]
-                push    eax
-                call    edx
-                mov     dword ptr [esi+50h], 0
-
-loc_4CDE8B:                             ; CODE XREF: sub_4CDE70+Aj
-                xor     eax, eax
-                pop     esi
-                retn    4
-sub_4CDE70      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CDEA0      proc near               ; CODE XREF: CEncoder_SetStreams+3Cp
-
-var_4           = dword ptr -4
-
-                push    ecx
-                push    ebx
-                xor     ebx, ebx
-                push    ebp
-                push    esi
-                mov     esi, ecx
-                mov     byte ptr [esi+10h], 0
-                mov     byte ptr [esi+11h], 0
-                mov     [esi+14h], ebx
-                mov     [esi+18h], ebx
-                mov     [esi+1Ch], ebx
-                mov     [esi+20h], ebx
-                mov     eax, [esi+50h]
-                mov     [esi+4Ch], ebx
-                mov     [esi+48h], eax
-                mov     [esi+44h], ebx
-                mov     [esi+58h], ebx
-                mov     [esi+5Ch], ebx
-                mov     [esi+64h], bl
-                push    edi
-                mov     [esi+30h], ebx
-                mov     [esi+34h], ebx
-                mov     dword ptr [esi+38h], 0FFFFFFFFh
-                mov     dword ptr [esi+28h], 1
-                mov     [esi+2Ch], bl
-                lea     ecx, [esi+28420h]
-                lea     edi, [esi+284B0h]
-                mov     [esp+14h+var_4], 0Ch
-                mov     ebp, 400h
-
-loc_4CDF02:                             ; CODE XREF: sub_4CDEA0+9Cj
-                xor     edx, edx
-                mov     eax, edi
-                jmp     short loc_4CDF10
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CDF10:                             ; CODE XREF: sub_4CDEA0+66j
-                                        ; sub_4CDEA0+84j
-                mov     [eax-3C0h], ebp
-                mov     [eax], ebp
-                add     edx, 1
-                add     eax, 4
-                cmp     edx, [esi+33B60h]
-                jbe     short loc_4CDF10
-                mov     [ecx-30h], ebp
-                mov     [ecx], ebp
-                mov     [ecx+30h], ebp
-                mov     [ecx+60h], ebp
-                add     ecx, 4
-                add     edi, 40h
-                sub     [esp+14h+var_4], 1
-                jnz     short loc_4CDF02
-                mov     ecx, [esi+32658h]
-                add     ecx, [esi+32654h]
-                mov     eax, 1
-                shl     eax, cl
-                cmp     eax, ebx
-                jbe     short loc_4CDF7C
-                xor     edx, edx
-                mov     ebx, eax
-                lea     esp, [esp+0]
-
-loc_4CDF60:                             ; CODE XREF: sub_4CDEA0+DAj
-                mov     edi, [esi+32650h]
-                add     edi, edx
-                mov     ecx, 300h
-                mov     eax, ebp
-                add     edx, 0C00h
-                sub     ebx, 1
-                rep stosd
-                jnz     short loc_4CDF60
-
-loc_4CDF7C:                             ; CODE XREF: sub_4CDEA0+B3j
-                lea     edx, [esi+287B4h]
-                mov     ebx, 4
-
-loc_4CDF87:                             ; CODE XREF: sub_4CDEA0+FBj
-                mov     edi, edx
-                mov     ecx, 3Fh
-                mov     eax, ebp
-                add     edx, 100h
-                sub     ebx, 1
-                rep stosd
-                jnz     short loc_4CDF87
-                lea     edi, [esi+28BB0h]
-                mov     ecx, 72h
-                rep stosd
-                mov     ecx, [esi+33B5Ch]
-                mov     edx, 1
-                shl     edx, cl
-                lea     ecx, [esi+28DB8h]
-                push    edx
-                call    sub_4CDB80
-                mov     ecx, [esi+33B5Ch]
-                mov     eax, 1
-                shl     eax, cl
-                lea     ecx, [esi+2DA04h]
-                push    eax
-                call    sub_4CDB80
-                mov     eax, ebp
-                mov     [esi+28D7Ch], eax
-                mov     [esi+28D80h], eax
-                mov     [esi+28D84h], eax
-                mov     [esi+28D88h], eax
-                mov     [esi+28D8Ch], eax
-                mov     [esi+28D90h], eax
-                mov     [esi+28D94h], eax
-                mov     [esi+28D98h], eax
-                mov     [esi+28D9Ch], eax
-                mov     [esi+28DA0h], eax
-                mov     [esi+28DA4h], eax
-                mov     [esi+28DA8h], eax
-                mov     [esi+28DACh], eax
-                mov     [esi+28DB0h], eax
-                mov     [esi+28DB4h], eax
-                xor     eax, eax
-                pop     edi
-                mov     [esi+32F10h], bl
-                mov     [esi+32F08h], eax
-                mov     [esi+32F0Ch], eax
-                mov     [esi+32F04h], eax
-                pop     esi
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn
-sub_4CDEA0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CF450      proc near               ; CODE XREF: .text:004CF692p
-                                        ; CEncoder_Flush+42p
-
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-
-                sub     esp, 8
-                push    esi
-                mov     esi, ecx
-                mov     eax, [esi+0Ch]
-                push    edi
-                mov     edi, [esi+4]
-                cmp     eax, edi
-                jb      short loc_4CF464
-                mov     edi, [esi+10h]
-
-loc_4CF464:                             ; CODE XREF: sub_4CF450+Fj
-                push    ebp
-                mov     ebp, [esi+20h]
-                xor     edx, edx
-                sub     edi, eax
-                cmp     ebp, edx
-                mov     [esp+14h+var_4], edx
-                jz      short loc_4CF4BA
-                push    ebx
-                mov     ebx, [esi]
-                add     ebx, eax
-                mov     eax, dword_553598
-                cmp     eax, edx
-                jnz     short loc_4CF4A5
-                push    0Ch             ; Size
-                call    _operator_new    ; operator new(uint)
-                xor     ecx, ecx
-                add     esp, 4
-                cmp     eax, ecx
-                jz      short loc_4CF49C
-                mov     [eax], ecx
-                mov     [eax+4], ecx
-                mov     [eax+8], ecx
-                jmp     short loc_4CF49E
-; ---------------------------------------------------------------------------
-
-loc_4CF49C:                             ; CODE XREF: sub_4CF450+40j
-                xor     eax, eax
-
-loc_4CF49E:                             ; CODE XREF: sub_4CF450+4Aj
-                mov     dword_553598, eax
-                xor     edx, edx
-
-loc_4CF4A5:                             ; CODE XREF: sub_4CF450+30j
-                mov     eax, [eax+8]
-                cmp     eax, edx
-                jz      short loc_4CF4B6
-                push    edi
-                push    ebx
-                push    ebp
-                call    eax
-                add     esp, 0Ch
-                xor     edx, edx
-
-loc_4CF4B6:                             ; CODE XREF: sub_4CF450+5Aj
-                add     [esi+20h], edi
-                pop     ebx
-
-loc_4CF4BA:                             ; CODE XREF: sub_4CF450+22j
-                mov     eax, [esi+14h]
-                cmp     eax, edx
-                pop     ebp
-                jz      short loc_4CF4E4
-                mov     [esp+10h+var_8], edx
-                mov     ecx, [eax]
-                lea     edx, [esp+10h+var_8]
-                push    edx
-                mov     edx, [esi]
-                add     edx, [esi+0Ch]
-                push    edi
-                push    edx
-                push    eax
-                mov     eax, [ecx+0Ch]
-                call    eax
-                mov     edi, [esp+10h+var_8]
-                mov     [esp+10h+var_4], eax
-                xor     edx, edx
-
-loc_4CF4E4:                             ; CODE XREF: sub_4CF450+70j
-                add     [esi+0Ch], edi
-                mov     ecx, [esi+0Ch]
-                mov     eax, [esi+10h]
-                cmp     ecx, eax
-                jnz     short loc_4CF4F4
-                mov     [esi+0Ch], edx
-
-loc_4CF4F4:                             ; CODE XREF: sub_4CF450+9Fj
-                cmp     [esi+4], eax
-                jnz     short loc_4CF500
-                mov     byte ptr [esi+24h], 1
-                mov     [esi+4], edx
-
-loc_4CF500:                             ; CODE XREF: sub_4CF450+A7j
-                mov     ecx, [esi+0Ch]
-                cmp     ecx, [esi+4]
-                jbe     short loc_4CF50A
-                mov     eax, ecx
-
-loc_4CF50A:                             ; CODE XREF: sub_4CF450+B6j
-                add     [esi+18h], edi
-                mov     [esi+8], eax
-                mov     eax, [esp+10h+var_4]
-                adc     [esi+1Ch], edx
-                pop     edi
-                pop     esi
-                add     esp, 8
-                retn
-sub_4CF450      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-
-; ---------------------------------------------------------------------------
-
-; int __stdcall Interface1_QueryInterface(int, void *Buf1, int)
-Interface1_QueryInterface      proc near               ; DATA XREF: .rdata:off_517A90o
-; sub_4CF520
-
-arg_0           = dword ptr  4
-Buf1            = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                mov     eax, [esp+Buf1]
-                push    offset dword_512730 ; Buf2
-                push    eax             ; Buf1
-                call    unknown_libname_324 ; MFC 3.1/4.0/4.2/8.0 32bit
-                add     esp, 8
-                test    eax, eax
-                jz      short loc_4CF54D
-                mov     eax, [esp+arg_0]
-                mov     ecx, [esp+arg_8]
-                mov     [ecx], eax
-                mov     edx, [eax]
-                push    eax
-                mov     eax, [edx+4]
-                call    eax
-                xor     eax, eax
-                retn    0Ch
-loc_4CF54D:                             ; CODE XREF: Interface1_QueryInterface+14j
-                mov     eax, 80004002h
-                retn    0Ch
-Interface1_QueryInterface      endp
-
-; ---------------------------------------------------------------------------
-
-; int __stdcall Interface1_Release(void *pUnknown)
-Interface1_Release         proc near               ; DATA XREF: .rdata:00517A98o
-
-pUnknown        = dword ptr  4
-
-                mov     ecx, [esp+pUnknown]
-                add     dword ptr [ecx+4], 0FFFFFFFFh
-                mov     eax, [ecx+4]
-                jnz     short locret_4CF585
-                push    ecx             ; Memory
-                mov     dword ptr [ecx], offset off_517A90
-                mov     dword ptr [ecx+8], 0
-                call    j__free
-                add     esp, 4
-                xor     eax, eax
-
-locret_4CF585:                          ; CODE XREF: Interface1_Release+Bj
-                retn    4
-Interface1_Release         endp
-
-; ---------------------------------------------------------------------------
-
-sub_4CF590      proc near               ; DATA XREF: .rdata:00517AB4o
-
-arg_0           = dword ptr  4
-arg_4           = byte ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-
-                mov     eax, [esp+arg_0]
-                mov     edx, [eax+10h]
-                sub     edx, [eax+18h]
-                mov     ecx, [eax+14h]
-                sbb     ecx, [eax+1Ch]
-                push    ebx
-                mov     ebx, [esp+4+arg_8]
-                push    edi
-                mov     edi, [esp+8+arg_C]
-                cmp     edi, ecx
-                jb      short loc_4CF5C2
-                ja      short loc_4CF5B4
-                cmp     ebx, edx
-                jbe     short loc_4CF5C2
-
-loc_4CF5B4:                             ; CODE XREF: sub_4CF590+1Ej
-                pop     edi
-                mov     byte ptr [eax+20h], 1
-                mov     eax, 80004005h
-                pop     ebx
-                retn    10h
-; ---------------------------------------------------------------------------
-
-loc_4CF5C2:                             ; CODE XREF: sub_4CF590+1Cj
-                                        ; sub_4CF590+22j
-                push    esi
-                xor     esi, esi
-                xor     ecx, ecx
-                test    edi, edi
-                jb      short loc_4CF5FA
-                ja      short loc_4CF5D1
-                test    ebx, ebx
-                jbe     short loc_4CF5FA
-
-loc_4CF5D1:                             ; CODE XREF: sub_4CF590+3Bj
-                mov     dl, [esp+0Ch+arg_4]
-                push    ebp
-
-loc_4CF5D6:                             ; CODE XREF: sub_4CF590+5Fj
-                                        ; sub_4CF590+67j
-                mov     ebp, [eax+18h]
-                mov     ebx, [eax+8]
-                mov     [ebx+ebp], dl
-                add     dword ptr [eax+18h], 1
-                adc     dword ptr [eax+1Ch], 0
-                add     esi, 1
-                adc     ecx, 0
-                cmp     ecx, edi
-                jb      short loc_4CF5D6
-                ja      short loc_4CF5F9
-                cmp     esi, [esp+10h+arg_8]
-                jb      short loc_4CF5D6
-
-loc_4CF5F9:                             ; CODE XREF: sub_4CF590+61j
-                pop     ebp
-
-loc_4CF5FA:                             ; CODE XREF: sub_4CF590+39j
-                                        ; sub_4CF590+3Fj
-                pop     esi
-                pop     edi
-                xor     eax, eax
-                pop     ebx
-                retn    10h
-sub_4CF590      endp
-
-; =============== S U B R O U T I N E =======================================
-
-; int __stdcall Interface2_Release(void *pUnknown)
-Interface2_Release proc near            ; DATA XREF: .rdata:00517AACo
-; sub_4CF610
-
-pUnknown        = dword ptr  4
-
-                mov     ecx, [esp+pUnknown]
-                add     dword ptr [ecx+4], 0FFFFFFFFh
-                mov     eax, [ecx+4]
-                jnz     short locret_4CF635
-                push    ecx             ; Memory
-                mov     dword ptr [ecx], offset off_517AA4
-                mov     dword ptr [ecx+8], 0
-                call    j__free
-                add     esp, 4
-                xor     eax, eax
-
-locret_4CF635:                          ; CODE XREF: Interface2_Release+Bj
-                retn    4
-Interface2_Release endp
-
-; =============== S U B R O U T I N E =======================================
-
-loc_4CF640:                             ; CODE XREF: sub_4CF6E0+39p
-                                        ; sub_4CFAC0+57p ...
-                push    ecx
-                push    ebx
-                push    esi
-                push    edi
-                mov     edi, ecx
-                mov     esi, [edi+8]
-                cmp     esi, 0FF000000h
-                jb      short loc_4CF661
-                mov     edx, [edi+0Ch]
-                mov     eax, esi
-                mov     cl, 20h
-                call    __allshr         ; Microsoft VisualC 2-8/net runtime
-                test    eax, eax
-                jz      short loc_4CF6B6
-
-loc_4CF661:                             ; CODE XREF: .text:004CF64Fj
-                mov     bl, [edi+4]
-                lea     esi, [edi+18h]
-
-loc_4CF667:                             ; CODE XREF: .text:004CF6A9j
-                mov     eax, [edi+8]
-                mov     edx, [edi+0Ch]
-                mov     cl, 20h
-                call    __allshr         ; Microsoft VisualC 2-8/net runtime
-                mov     ecx, [esi+4]
-                mov     edx, [esi]
-                add     al, bl
-                mov     [ecx+edx], al
-                add     dword ptr [esi+4], 1
-                mov     eax, [esi+4]
-                cmp     eax, [esi+8]
-                jnz     short loc_4CF6A3
-                cmp     [esi+0Ch], eax
-                jz      short loc_4CF6A3
-                nop
-
-loc_4CF690:                             ; CODE XREF: .text:004CF6A1j
-                mov     ecx, esi
-                call    sub_4CF450
-                test    eax, eax
-                jnz     short loc_4CF6CB
-                mov     eax, [esi+0Ch]
-                cmp     eax, [esi+4]
-                jnz     short loc_4CF690
-
-loc_4CF6A3:                             ; CODE XREF: .text:004CF688j
-                                        ; .text:004CF68Dj
-                or      bl, 0FFh
-                add     dword ptr [edi], 0FFFFFFFFh
-                jnz     short loc_4CF667
-                mov     esi, [edi+8]
-                mov     edx, esi
-                shr     edx, 18h
-                mov     [edi+4], dl
-
-loc_4CF6B6:                             ; CODE XREF: .text:004CF65Fj
-                add     dword ptr [edi], 1
-                shl     esi, 8
-                mov     [edi+8], esi
-                mov     dword ptr [edi+0Ch], 0
-                pop     edi
-                pop     esi
-                pop     ebx
-                pop     ecx
-                retn
-                
-; ---------------------------------------------------------------------------
-
-loc_4CF6CB:                             ; CODE XREF: .text:004CF699j
-                push    offset dword_526DD0
-                lea     ecx, [esp+10h]
-                push    ecx
-                mov     [esp+14h], eax
-                int     3
-;               call    __CxxThrowException@8 ; _CxxThrowException(x,x)
-; ---------------------------------------------------------------------------
-
-                db 2 dup(0CCh)
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CF6E0      proc near               ; CODE XREF: sub_4D0770+FBp
-                                        ; CEncoder_CodeOneBlock+6C5p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    esi
-                push    edi
-                mov     edi, [esp+8+arg_4]
-                add     edi, 0FFFFFFFFh
-                mov     esi, ecx
-                js      short loc_4CF724
-                push    ebp
-                mov     ebp, [esp+0Ch+arg_0]
-
-loc_4CF6F2:                             ; CODE XREF: sub_4CF6E0+41j
-                shr     dword ptr [esi+10h], 1
-                mov     eax, [esi+10h]
-                mov     edx, ebp
-                mov     ecx, edi
-                shr     edx, cl
-                test    dl, 1
-                jz      short loc_4CF70A
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-
-loc_4CF70A:                             ; CODE XREF: sub_4CF6E0+21j
-                cmp     eax, 1000000h
-                jnb     short loc_4CF71E
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4CF71E:                             ; CODE XREF: sub_4CF6E0+2Fj
-                sub     edi, 1
-                jns     short loc_4CF6F2
-                pop     ebp
-
-loc_4CF724:                             ; CODE XREF: sub_4CF6E0+Bj
-                pop     edi
-                pop     esi
-                retn    8
-sub_4CF6E0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CF740      proc near               ; CODE XREF: sub_4D0770+DFp
-                                        ; CEncoder_CodeOneBlock+58Ap ...
-
-arg_0           = dword ptr  4
-
-                push    esi
-                push    edi
-                mov     edi, [esp+8+arg_0]
-                mov     eax, edi
-                imul    eax, 440h
-                mov     esi, ecx
-                mov     edx, [esi+4C08h]
-                lea     ecx, [eax+esi+808h]
-                push    ecx
-                push    edx
-                push    edi
-                mov     ecx, esi
-                call    sub_4CDC00
-                mov     eax, [esi+4C08h]
-                mov     [esi+edi*4+4C0Ch], eax
-                pop     edi
-                pop     esi
-                retn    4
-sub_4CF740      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-              
-sub_4CF780      proc near               ; CODE XREF: CEncoder_SetStreams+7Ep
-                                        ; CEncoder_SetStreams+A6p
-
-arg_0           = dword ptr  4
-
-                push    esi
-                push    edi
-                xor     edi, edi
-                cmp     [esp+8+arg_0], edi
-                mov     esi, ecx
-                jbe     short loc_4CF7CC
-                push    ebx
-                push    ebp
-                lea     ebx, [esi+4C0Ch]
-                lea     ebp, [esi+808h]
-                lea     ebx, [ebx+0]
-
-loc_4CF7A0:                             ; CODE XREF: sub_4CF780+48j
-                mov     eax, [esi+4C08h]
-                push    ebp
-                push    eax
-                push    edi
-                mov     ecx, esi
-                call    sub_4CDC00
-                mov     ecx, [esi+4C08h]
-                mov     [ebx], ecx
-                add     edi, 1
-                add     ebx, 4
-                add     ebp, 440h
-                cmp     edi, [esp+10h+arg_0]
-                jb      short loc_4CF7A0
-                pop     ebp
-                pop     ebx
-
-loc_4CF7CC:                             ; CODE XREF: sub_4CF780+Aj
-                pop     edi
-                pop     esi
-                retn    4
-sub_4CF780      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-CEncoder_GetOptimum proc near           ; CODE XREF: CEncoder_CodeOneBlock+201p
-
-var_7D          = byte ptr -7Dh
-var_7C          = dword ptr -7Ch
-var_78          = dword ptr -78h
-var_74          = dword ptr -74h
-var_70          = dword ptr -70h
-var_6C          = dword ptr -6Ch
-var_68          = dword ptr -68h
-var_64          = dword ptr -64h
-var_60          = dword ptr -60h
-var_5C          = dword ptr -5Ch
-var_58          = dword ptr -58h
-var_54          = dword ptr -54h
-var_50          = dword ptr -50h
-var_4C          = dword ptr -4Ch
-var_48          = dword ptr -48h
-var_44          = dword ptr -44h
-var_40          = dword ptr -40h
-var_3C          = dword ptr -3Ch
-var_38          = dword ptr -38h
-var_34          = dword ptr -34h
-var_30          = dword ptr -30h
-var_2C          = dword ptr -2Ch
-var_28          = dword ptr -28h
-var_24          = dword ptr -24h
-var_20          = dword ptr -20h
-var_1C          = dword ptr -1Ch
-var_18          = dword ptr -18h
-var_14          = dword ptr -14h
-var_10          = dword ptr -10h
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                sub     esp, 80h
-                push    ebp
-                mov     ebp, ecx
-                mov     edx, [ebp+32F0Ch]
-                cmp     [ebp+32F08h], edx
-                push    esi
-                jz      short loc_4CE0A5
-                mov     esi, [esp+88h+arg_4]
-                lea     eax, [edx+edx*4+1Eh]
-                lea     ecx, [ebp+eax*8+0]
-                mov     eax, [ecx+10h]
-                sub     eax, edx
-                mov     edx, [ecx+14h]
-                mov     [esi], edx
-                mov     ecx, [ecx+10h]
-                pop     esi
-                mov     [ebp+32F0Ch], ecx
-                pop     ebp
-                add     esp, 80h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CE0A5:                             ; CODE XREF: CEncoder_GetOptimum+16j
-                mov     edx, [ebp+80h]
-                mov     eax, [ebp+70h]
-                push    ebx
-                xor     esi, esi
-                push    edx
-                mov     [ebp+32F08h], esi
-                mov     [ebp+32F0Ch], esi
-                call    eax
-                add     esp, 4
-                cmp     byte ptr [ebp+32F10h], 0
-                mov     ebx, eax
-                mov     [esp+8Ch+var_60], eax
-                jnz     short loc_4CE0E4
-                lea     ecx, [esp+8Ch+var_70]
-                push    ecx
-                mov     ecx, ebp
-                call    sub_4CB3B0
-                mov     [esp+8Ch+var_68], eax
-                jmp     short loc_4CE0FF
-; ---------------------------------------------------------------------------
-
-loc_4CE0E4:                             ; CODE XREF: CEncoder_GetOptimum+70j
-                mov     edx, [ebp+32EFCh]
-                mov     eax, [ebp+32F00h]
-                mov     [esp+8Ch+var_68], edx
-                mov     [esp+8Ch+var_70], eax
-                mov     byte ptr [ebp+32F10h], 0
-
-loc_4CE0FF:                             ; CODE XREF: CEncoder_GetOptimum+82j
-                mov     ecx, [ebp+80h]
-                mov     edx, [ebp+74h]
-                push    edi
-                push    ecx
-                call    edx
-                mov     edi, eax
-                add     esp, 4
-                sub     edi, 1
-                cmp     ebx, 2
-                jnb     short loc_4CE138
-                mov     eax, [esp+90h+arg_4]
-                pop     edi
-                pop     ebx
-                pop     esi
-                mov     dword ptr [eax], 0FFFFFFFFh
-                mov     eax, 1
-                pop     ebp
-                add     esp, 80h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CE138:                             ; CODE XREF: CEncoder_GetOptimum+B7j
-                cmp     ebx, 111h
-                jbe     short loc_4CE149
-                mov     ebx, 111h
-                mov     [esp+90h+var_60], ebx
-
-loc_4CE149:                             ; CODE XREF: CEncoder_GetOptimum+DEj
-                lea     ecx, [ebp+14h]
-                mov     [esp+90h+var_50], esi
-                mov     [esp+90h+var_64], esi
-                xor     edx, edx
-                mov     [esp+90h+var_4C], esi
-                mov     [esp+90h+var_6C], ecx
-                mov     edi, edi
-
-loc_4CE160:                             ; CODE XREF: CEncoder_GetOptimum+180j
-                mov     eax, [esp+90h+var_6C]
-                mov     eax, [eax]
-                mov     ecx, edi
-                sub     ecx, eax
-                mov     [esp+edx+90h+var_20], eax
-                mov     al, [edi]
-                sub     ecx, 1
-                cmp     al, [ecx]
-                jnz     short loc_4CE1C9
-                mov     al, [edi+1]
-                cmp     al, [ecx+1]
-                jnz     short loc_4CE1C9
-                mov     eax, 2
-                cmp     ebx, eax
-                jbe     short loc_4CE1A7
-                lea     esi, [edi+2]
-                sub     ecx, edi
-                lea     ecx, [ecx+0]
-
-loc_4CE190:                             ; CODE XREF: CEncoder_GetOptimum+143j
-                mov     bl, [esi]
-                cmp     bl, [ecx+esi]
-                mov     ebx, [esp+90h+var_60]
-                jnz     short loc_4CE1A5
-                add     eax, 1
-                add     esi, 1
-                cmp     eax, ebx
-                jb      short loc_4CE190
-
-loc_4CE1A5:                             ; CODE XREF: CEncoder_GetOptimum+139j
-                xor     esi, esi
-
-loc_4CE1A7:                             ; CODE XREF: CEncoder_GetOptimum+126j
-                mov     ecx, [esp+90h+var_4C]
-                mov     [esp+edx+90h+var_10], eax
-                cmp     eax, [esp+ecx+90h+var_10]
-                jbe     short loc_4CE1D0
-                mov     eax, [esp+90h+var_64]
-                mov     [esp+90h+var_50], eax
-                mov     [esp+90h+var_4C], edx
-                jmp     short loc_4CE1D0
-; ---------------------------------------------------------------------------
-
-loc_4CE1C9:                             ; CODE XREF: CEncoder_GetOptimum+115j
-                                        ; CEncoder_GetOptimum+11Dj
-                mov     [esp+edx+90h+var_10], esi
-
-loc_4CE1D0:                             ; CODE XREF: CEncoder_GetOptimum+159j
-                                        ; CEncoder_GetOptimum+167j
-                add     [esp+90h+var_64], 1
-                add     [esp+90h+var_6C], 4
-                add     edx, 4
-                cmp     edx, 10h
-                jb      loc_4CE160
-                mov     ecx, [esp+90h+var_50]
-                mov     ebx, [esp+ecx*4+90h+var_10]
-                mov     eax, [ebp+32EF8h]
-                cmp     ebx, eax
-                mov     [esp+90h+var_40], ebx
-                jb      short loc_4CE234
-                mov     edx, [esp+90h+arg_4]
-                lea     eax, [ebx-1]
-                cmp     eax, esi
-                mov     [edx], ecx
-                jz      short loc_4CE225
-                add     [ebp+32F04h], eax
-                mov     ecx, [ebp+7Ch]
-                push    eax
-                mov     eax, [ebp+80h]
-                push    eax
-                call    ecx
-                add     esp, 8
-
-loc_4CE225:                             ; CODE XREF: CEncoder_GetOptimum+1ADj
-                pop     edi
-                mov     eax, ebx
-                pop     ebx
-                pop     esi
-                pop     ebp
-                add     esp, 80h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CE234:                             ; CODE XREF: CEncoder_GetOptimum+19Dj
-                mov     esi, [esp+90h+var_68]
-                cmp     esi, eax
-                jb      short loc_4CE27F
-                mov     edx, [esp+90h+var_70]
-                mov     eax, [ebp+edx*4+3265Ch]
-                mov     ecx, [esp+90h+arg_4]
-                add     eax, 4
-                mov     [ecx], eax
-                lea     eax, [esi-1]
-                test    eax, eax
-                jz      short loc_4CE270
-                mov     edx, [ebp+80h]
-                add     [ebp+32F04h], eax
-                push    eax
-                mov     eax, [ebp+7Ch]
-                push    edx
-                call    eax
-                add     esp, 8
-
-loc_4CE270:                             ; CODE XREF: CEncoder_GetOptimum+1F8j
-                pop     edi
-                pop     ebx
-                mov     eax, esi
-                pop     esi
-                pop     ebp
-                add     esp, 80h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CE27F:                             ; CODE XREF: CEncoder_GetOptimum+1DAj
-                mov     al, [edi]
-                mov     esi, [esp+90h+var_20]
-                sub     edi, esi
-                cmp     [esp+90h+var_68], 2
-                mov     cl, [edi-1]
-                mov     byte ptr [esp+90h+var_4C], al
-                mov     byte ptr [esp+90h+var_50], cl
-                jnb     short loc_4CE2C1
-                cmp     al, cl
-                jz      short loc_4CE2C1
-                cmp     ebx, 2
-                jnb     short loc_4CE2C1
-                mov     ecx, [esp+90h+arg_4]
-                pop     edi
-                pop     ebx
-                pop     esi
-                mov     dword ptr [ecx], 0FFFFFFFFh
-                mov     eax, 1
-                pop     ebp
-                add     esp, 80h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CE2C1:                             ; CODE XREF: CEncoder_GetOptimum+237j
-                                        ; CEncoder_GetOptimum+23Bj ...
-                mov     edx, [esp+90h+var_4C]
-                mov     bl, [ebp+10h]
-                mov     edi, [ebp+33B60h]
-                and     edi, [esp+90h+arg_0]
-                mov     ecx, [esp+90h+var_50]
-                push    edx
-                cmp     bl, 7
-                setnb   dl
-                push    ecx
-                mov     [ebp+0F0h], bl
-                mov     eax, [ebp+32654h]
-                mov     ecx, 8
-                sub     cl, al
-                push    edx
-                movzx   edx, byte ptr [ebp+11h]
-                shr     edx, cl
-                mov     ecx, [ebp+3265Ch]
-                and     ecx, [esp+9Ch+arg_0]
-                mov     [esp+9Ch+var_3C], ecx
-                mov     ecx, eax
-                mov     eax, [esp+9Ch+var_3C]
-                shl     eax, cl
-                add     edx, eax
-                imul    edx, 0C00h
-                add     edx, [ebp+32650h]
-                mov     ecx, edx
-                call    sub_4CDAC0
-                movzx   ecx, bl
-                shl     ecx, 4
-                add     ecx, edi
-                mov     edx, [ebp+ecx*4+280F0h]
-                shr     edx, 2
-                add     eax, dword_550998[edx*4]
-                mov     ebx, 800h
-                mov     [ebp+124h], eax
-                mov     dword ptr [ebp+12Ch], 0FFFFFFFFh
-                mov     byte ptr [ebp+119h], 0
-                mov     cl, [ebp+10h]
-                movzx   eax, cl
-                mov     edx, eax
-                shl     edx, 4
-                add     edx, edi
-                sub     ebx, [ebp+edx*4+280F0h]
-                mov     edx, 800h
-                sub     edx, [ebp+eax*4+283F0h]
-                mov     al, byte ptr [esp+90h+var_4C]
-                shr     edx, 2
-                mov     edx, dword_550998[edx*4]
-                shr     ebx, 2
-                mov     ebx, dword_550998[ebx*4]
-                add     edx, ebx
-                cmp     byte ptr [esp+90h+var_50], al
-                mov     [esp+90h+var_44], ebx
-                mov     [esp+90h+var_3C], edx
-                jnz     short loc_4CE3F3
-                movzx   eax, cl
-                mov     ebx, [ebp+eax*4+28420h]
-                mov     ecx, eax
-                shl     ecx, 4
-                add     ecx, edi
-                mov     ecx, [ebp+ecx*4+284B0h]
-                shr     ecx, 2
-                mov     eax, dword_550998[ecx*4]
-                shr     ebx, 2
-                add     eax, dword_550998[ebx*4]
-                add     eax, edx
-                cmp     eax, [ebp+124h]
-                jnb     short loc_4CE3F3
-                mov     [ebp+124h], eax
-                mov     dword ptr [ebp+12Ch], 0
-                mov     byte ptr [ebp+119h], 0
-
-loc_4CE3F3:                             ; CODE XREF: CEncoder_GetOptimum+344j
-                                        ; CEncoder_GetOptimum+37Aj
-                mov     eax, [esp+90h+var_68]
-                mov     ecx, [esp+90h+var_40]
-                cmp     eax, ecx
-                jb      short loc_4CE405
-                mov     [esp+90h+var_7C], eax
-                jmp     short loc_4CE40B
-; ---------------------------------------------------------------------------
-
-loc_4CE405:                             ; CODE XREF: CEncoder_GetOptimum+39Dj
-                mov     [esp+90h+var_7C], ecx
-                mov     eax, ecx
-
-loc_4CE40B:                             ; CODE XREF: CEncoder_GetOptimum+3A3j
-                cmp     eax, 2
-                jnb     short loc_4CE431
-                mov     edx, [ebp+12Ch]
-                mov     eax, [esp+90h+arg_4]
-                pop     edi
-                pop     ebx
-                pop     esi
-                mov     [eax], edx
-                mov     eax, 1
-                pop     ebp
-                add     esp, 80h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CE431:                             ; CODE XREF: CEncoder_GetOptimum+3AEj
-                mov     ecx, [esp+90h+var_1C]
-                mov     edx, [esp+90h+var_18]
-                xor     ebx, ebx
-                mov     [ebp+128h], ebx
-                mov     [ebp+10Ch], ecx
-                mov     ecx, [esp+90h+var_14]
-                mov     [ebp+110h], edx
-                lea     edx, [eax+eax*4]
-                mov     [ebp+114h], ecx
-                mov     [ebp+108h], esi
-                lea     ecx, [ebp+edx*8+0FCh]
-                jmp     short loc_4CE470
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CE470:                             ; CODE XREF: CEncoder_GetOptimum+407j
-                                        ; CEncoder_GetOptimum+41Fj
-                mov     dword ptr [ecx], 0FFFFFFFh
-                sub     eax, 1
-                sub     ecx, 28h
-                cmp     eax, 2
-                jnb     short loc_4CE470
-
-loc_4CE481:                             ; CODE XREF: CEncoder_GetOptimum+48Ej
-                mov     esi, [esp+ebx*4+90h+var_10]
-                cmp     esi, 2
-                jb      short loc_4CE4E8
-                movzx   eax, byte ptr [ebp+10h]
-                push    edi
-                push    eax
-                push    ebx
-                mov     ecx, ebp
-                call    sub_4CD9B0
-                add     eax, [esp+90h+var_3C]
-                mov     ecx, edi
-                imul    ecx, 110h
-                add     ecx, esi
-                mov     [esp+90h+var_40], eax
-                lea     edx, [esi+esi*4]
-                lea     eax, [ebp+ecx*4+2E204h]
-                lea     ecx, [ebp+edx*8+0FCh]
-                mov     edi, edi
-
-loc_4CE4C0:                             ; CODE XREF: CEncoder_GetOptimum+486j
-                mov     edx, [eax]
-                add     edx, [esp+90h+var_40]
-                cmp     edx, [ecx]
-                jnb     short loc_4CE4DA
-                mov     [ecx], edx
-                mov     dword ptr [ecx+4], 0
-                mov     [ecx+8], ebx
-                mov     byte ptr [ecx-0Bh], 0
-
-loc_4CE4DA:                             ; CODE XREF: CEncoder_GetOptimum+468j
-                sub     esi, 1
-                sub     eax, 4
-                sub     ecx, 28h
-                cmp     esi, 2
-                jnb     short loc_4CE4C0
-
-loc_4CE4E8:                             ; CODE XREF: CEncoder_GetOptimum+42Bj
-                add     ebx, 1
-                cmp     ebx, 4
-                jb      short loc_4CE481
-                movzx   eax, byte ptr [ebp+10h]
-                mov     ecx, [ebp+eax*4+283F0h]
-                shr     ecx, 2
-                mov     eax, dword_550998[ecx*4]
-                add     eax, [esp+90h+var_44]
-                mov     [esp+90h+var_3C], eax
-                mov     eax, [esp+90h+var_10]
-                cmp     eax, 2
-                lea     ebx, [eax+1]
-                jnb     short loc_4CE521
-                mov     ebx, 2
-
-loc_4CE521:                             ; CODE XREF: CEncoder_GetOptimum+4BAj
-                cmp     ebx, [esp+90h+var_68]
-                ja      loc_4CE5BA
-                xor     eax, eax
-                cmp     ebx, [ebp+32660h]
-                mov     [esp+90h+var_60], eax
-                jbe     short loc_4CE550
-                lea     esp, [esp+0]
-
-loc_4CE540:                             ; CODE XREF: CEncoder_GetOptimum+4EAj
-                add     eax, 2
-                cmp     ebx, [ebp+eax*4+32660h]
-                ja      short loc_4CE540
-                mov     [esp+90h+var_60], eax
-
-loc_4CE550:                             ; CODE XREF: CEncoder_GetOptimum+4D7j
-                lea     edx, [ebx+ebx*4]
-                lea     esi, [ebp+edx*8+0FCh]
-                lea     ebx, [ebx+0]
-
-loc_4CE560:                             ; CODE XREF: CEncoder_GetOptimum+558j
-                mov     eax, [esp+90h+var_60]
-                mov     eax, [ebp+eax*4+32664h]
-                push    edi
-                push    ebx
-                push    eax
-                mov     ecx, ebp
-                mov     [esp+9Ch+var_40], eax
-                call    sub_4CAEC0
-                add     eax, [esp+90h+var_3C]
-                cmp     eax, [esi]
-                jnb     short loc_4CE598
-                mov     ecx, [esp+90h+var_40]
-                add     ecx, 4
-                mov     [esi], eax
-                mov     dword ptr [esi+4], 0
-                mov     [esi+8], ecx
-                mov     byte ptr [esi-0Bh], 0
-
-loc_4CE598:                             ; CODE XREF: CEncoder_GetOptimum+51Fj
-                mov     eax, [esp+90h+var_60]
-                cmp     ebx, [ebp+eax*4+32660h]
-                jnz     short loc_4CE5B2
-                add     eax, 2
-                cmp     eax, [esp+90h+var_70]
-                mov     [esp+90h+var_60], eax
-                jz      short loc_4CE5BA
-
-loc_4CE5B2:                             ; CODE XREF: CEncoder_GetOptimum+543j
-                add     ebx, 1
-                add     esi, 28h
-                jmp     short loc_4CE560
-; ---------------------------------------------------------------------------
-
-loc_4CE5BA:                             ; CODE XREF: CEncoder_GetOptimum+4C5j
-                                        ; CEncoder_GetOptimum+550j
-                mov     eax, 1
-                cmp     [esp+90h+var_7C], eax
-                mov     [esp+90h+var_78], eax
-                jz      loc_4CF1D0
-                mov     esi, eax
-                jmp     short loc_4CE5D5
-; ---------------------------------------------------------------------------
-
-loc_4CE5D1:                             ; CODE XREF: CEncoder_GetOptimum+116Aj
-                mov     esi, [esp+90h+var_78]
-
-loc_4CE5D5:                             ; CODE XREF: CEncoder_GetOptimum+56Fj
-                mov     edx, [ebp+80h]
-                mov     eax, [ebp+70h]
-                push    edx
-                call    eax
-                add     esp, 4
-                lea     ecx, [esp+90h+var_4C]
-                push    ecx
-                mov     ecx, ebp
-                mov     [esp+94h+var_60], eax
-                call    sub_4CB3B0
-                cmp     eax, [ebp+32EF8h]
-                mov     [esp+90h+var_28], eax
-                jnb     loc_4CF1D7
-                add     [esp+90h+arg_0], 1
-                lea     edx, [esi+esi*4+1Eh]
-                mov     bl, [ebp+edx*8+1]
-                test    bl, bl
-                lea     eax, [ebp+edx*8+0]
-                mov     edx, [eax+10h]
-                jz      short loc_4CE673
-                sub     edx, 1
-                cmp     byte ptr [eax+2], 0
-                jz      short loc_4CE660
-                mov     ecx, [eax+4]
-                add     ecx, 6
-                cmp     dword ptr [eax+8], 4
-                lea     ecx, [ecx+ecx*4]
-                mov     cl, [ebp+ecx*8+0]
-                movzx   ecx, cl
-                jnb     short loc_4CE64F
-                mov     cl, ds:kRepNextStates[ecx]
-                movzx   ecx, cl
-                mov     cl, ds:kLiteralNextStates[ecx]
-                jmp     short loc_4CE67B
-; ---------------------------------------------------------------------------
-
-loc_4CE64F:                             ; CODE XREF: CEncoder_GetOptimum+5DCj
-                mov     cl, ds:kMatchNextStates[ecx]
-                movzx   ecx, cl
-                mov     cl, ds:kLiteralNextStates[ecx]
-                jmp     short loc_4CE67B
-; ---------------------------------------------------------------------------
-
-loc_4CE660:                             ; CODE XREF: CEncoder_GetOptimum+5C6j
-                lea     ecx, [edx+edx*4+1Eh]
-                mov     cl, [ebp+ecx*8+0]
-                movzx   ecx, cl
-                mov     cl, ds:kLiteralNextStates[ecx]
-                jmp     short loc_4CE67B
-; ---------------------------------------------------------------------------
-
-loc_4CE673:                             ; CODE XREF: CEncoder_GetOptimum+5BDj
-                lea     ecx, [edx+edx*4+1Eh]
-                mov     cl, [ebp+ecx*8+0]
-
-loc_4CE67B:                             ; CODE XREF: CEncoder_GetOptimum+5EDj
-                                        ; CEncoder_GetOptimum+5FEj ...
-                add     esi, 0FFFFFFFFh
-                cmp     edx, esi
-                jnz     short loc_4CE6AC
-                cmp     dword ptr [eax+14h], 0
-                jnz     short loc_4CE69A
-                movzx   edx, cl
-                mov     bl, ds:kShortRepNextStates[edx]
-                mov     byte ptr [esp+90h+var_64], bl
-                jmp     loc_4CE754
-; ---------------------------------------------------------------------------
-
-loc_4CE69A:                             ; CODE XREF: CEncoder_GetOptimum+626j
-                movzx   ecx, cl
-                mov     bl, ds:kLiteralNextStates[ecx]
-                mov     byte ptr [esp+90h+var_64], bl
-                jmp     loc_4CE754
-; ---------------------------------------------------------------------------
-
-loc_4CE6AC:                             ; CODE XREF: CEncoder_GetOptimum+620j
-                test    bl, bl
-                jz      short loc_4CE6CB
-                cmp     byte ptr [eax+2], 0
-                jz      short loc_4CE6CB
-                mov     edi, [eax+8]
-                mov     edx, [eax+4]
-                movzx   ecx, cl
-                mov     bl, ds:kRepNextStates[ecx]
-                mov     [esp+90h+var_68], edi
-                jmp     short loc_4CE6EA
-; ---------------------------------------------------------------------------
-
-loc_4CE6CB:                             ; CODE XREF: CEncoder_GetOptimum+64Ej
-                                        ; CEncoder_GetOptimum+654j
-                mov     esi, [eax+14h]
-                cmp     esi, 4
-                mov     [esp+90h+var_68], esi
-                movzx   ecx, cl
-                mov     edi, esi
-                jnb     short loc_4CE6E4
-                mov     bl, ds:kRepNextStates[ecx]
-                jmp     short loc_4CE6EA
-; ---------------------------------------------------------------------------
-
-loc_4CE6E4:                             ; CODE XREF: CEncoder_GetOptimum+67Aj
-                mov     bl, ds:kMatchNextStates[ecx]
-
-loc_4CE6EA:                             ; CODE XREF: CEncoder_GetOptimum+669j
-                                        ; CEncoder_GetOptimum+682j
-                cmp     edi, 4
-                lea     edx, [edx+edx*4+1Eh]
-                mov     byte ptr [esp+90h+var_64], bl
-                lea     edx, [ebp+edx*8+0]
-                jnb     short loc_4CE738
-                mov     ecx, [edx+edi*4+18h]
-                mov     esi, 1
-                cmp     edi, esi
-                mov     [esp+90h+var_20], ecx
-                jb      short loc_4CE723
-                mov     ecx, edi
-                lea     esi, [edx+18h]
-                lea     edi, [esp+90h+var_1C]
-                rep movsd
-                mov     esi, [esp+90h+var_68]
-                add     esi, 1
-                cmp     esi, 4
-                jnb     short loc_4CE754
-
-loc_4CE723:                             ; CODE XREF: CEncoder_GetOptimum+6AAj
-                lea     edx, [edx+esi*4+18h]
-                mov     ecx, 4
-                lea     edi, [esp+esi*4+90h+var_20]
-                sub     ecx, esi
-                mov     esi, edx
-                rep movsd
-                jmp     short loc_4CE754
-; ---------------------------------------------------------------------------
-
-loc_4CE738:                             ; CODE XREF: CEncoder_GetOptimum+699j
-                mov     ecx, [edx+18h]
-                mov     [esp+90h+var_1C], ecx
-                mov     ecx, [edx+1Ch]
-                mov     edx, [edx+20h]
-                add     edi, 0FFFFFFFCh
-                mov     [esp+90h+var_20], edi
-                mov     [esp+90h+var_18], ecx
-                mov     [esp+90h+var_14], edx
-
-loc_4CE754:                             ; CODE XREF: CEncoder_GetOptimum+635j
-                                        ; CEncoder_GetOptimum+647j ...
-                mov     ecx, [esp+90h+var_1C]
-                mov     edx, [esp+90h+var_18]
-                mov     edi, [esp+90h+var_20]
-                mov     [eax], bl
-                mov     [eax+1Ch], ecx
-                mov     ecx, [esp+90h+var_14]
-                mov     [eax+18h], edi
-                mov     [eax+20h], edx
-                mov     [eax+24h], ecx
-                mov     esi, [eax+0Ch]
-                mov     edx, [ebp+80h]
-                mov     eax, [ebp+74h]
-                push    edx
-                mov     [esp+94h+var_3C], esi
-                call    eax
-                movzx   ecx, byte ptr [eax-1]
-                sub     eax, 1
-                mov     edx, eax
-                mov     byte ptr [esp+94h+var_5C], cl
-                sub     edx, edi
-                movzx   ecx, byte ptr [edx-1]
-                lea     edi, [edx-1]
-                mov     edx, [ebp+32654h]
-                mov     byte ptr [esp+94h+var_58], cl
-                mov     ecx, [ebp+33B60h]
-                and     ecx, [esp+94h+arg_0]
-                mov     [esp+94h+var_40], edi
-                movzx   edi, bl
-                mov     [esp+94h+var_54], ecx
-                mov     [esp+94h+var_68], edi
-                add     esp, 4
-                shl     edi, 4
-                add     edi, ecx
-                mov     ecx, [esp+90h+var_5C]
-                push    ecx
-                mov     ecx, [esp+94h+var_58]
-                push    ecx
-                cmp     bl, 7
-                mov     ebx, [ebp+3265Ch]
-                setnb   cl
-                and     ebx, [esp+98h+arg_0]
-                mov     [esp+98h+var_74], eax
-                movzx   eax, byte ptr [eax-1]
-                push    ecx
-                mov     ecx, 8
-                sub     cl, dl
-                shr     eax, cl
-                mov     ecx, edx
-                shl     ebx, cl
-                add     eax, ebx
-                imul    eax, 0C00h
-                add     eax, [ebp+32650h]
-                mov     ecx, eax
-                call    sub_4CDAC0
-                mov     ecx, [ebp+edi*4+280F0h]
-                shr     ecx, 2
-                add     eax, dword_550998[ecx*4]
-                mov     ecx, [esp+90h+var_78]
-                add     eax, esi
-                lea     edx, [ecx+ecx*4+23h]
-                cmp     eax, [ebp+edx*8+0Ch]
-                lea     esi, [ebp+edx*8+0]
-                mov     [esp+90h+var_7D], 0
-                jnb     short loc_4CE851
-                mov     [esi+0Ch], eax
-                mov     [esi+10h], ecx
-                mov     dword ptr [esi+14h], 0FFFFFFFFh
-                mov     byte ptr [esi+1], 0
-                mov     [esp+90h+var_7D], 1
-
-loc_4CE851:                             ; CODE XREF: CEncoder_GetOptimum+7D9j
-                mov     ebx, [esp+90h+var_68]
-                mov     edx, 800h
-                sub     edx, [ebp+edi*4+280F0h]
-                shr     edx, 2
-                mov     ecx, dword_550998[edx*4]
-                add     ecx, [esp+90h+var_3C]
-                mov     edx, 800h
-                sub     edx, [ebp+ebx*4+283F0h]
-                mov     ebx, [esp+90h+var_78]
-                shr     edx, 2
-                mov     edx, dword_550998[edx*4]
-                add     edx, ecx
-                mov     [esp+90h+var_24], ecx
-                mov     cl, byte ptr [esp+90h+var_58]
-                cmp     cl, byte ptr [esp+90h+var_5C]
-                mov     [esp+90h+var_38], edx
-                jnz     short loc_4CE8EB
-                cmp     [esi+10h], ebx
-                jnb     short loc_4CE8A8
-                cmp     dword ptr [esi+14h], 0
-                jz      short loc_4CE8EB
-
-loc_4CE8A8:                             ; CODE XREF: CEncoder_GetOptimum+840j
-                mov     ecx, [esp+90h+var_68]
-                mov     ecx, [ebp+ecx*4+28420h]
-                mov     edi, [ebp+edi*4+284B0h]
-                shr     ecx, 2
-                mov     ecx, dword_550998[ecx*4]
-                shr     edi, 2
-                add     ecx, dword_550998[edi*4]
-                add     ecx, edx
-                cmp     ecx, [esi+0Ch]
-                ja      short loc_4CE8EB
-                mov     [esi+0Ch], ecx
-                mov     [esi+10h], ebx
-                mov     dword ptr [esi+14h], 0
-                mov     byte ptr [esi+1], 0
-                mov     [esp+90h+var_7D], 1
-
-loc_4CE8EB:                             ; CODE XREF: CEncoder_GetOptimum+83Bj
-                                        ; CEncoder_GetOptimum+846j ...
-                mov     edx, [esp+90h+var_60]
-                mov     ecx, 0FFFh
-                sub     ecx, ebx
-                cmp     ecx, edx
-                jnb     short loc_4CE900
-                mov     edx, ecx
-                mov     [esp+90h+var_60], edx
-
-loc_4CE900:                             ; CODE XREF: CEncoder_GetOptimum+898j
-                cmp     edx, 2
-                mov     ebx, edx
-                mov     [esp+90h+var_6C], ebx
-                jb      loc_4CF1BB
-                mov     esi, [ebp+32EF8h]
-                mov     edi, [esp+90h+var_60]
-                cmp     edi, esi
-                jbe     short loc_4CE923
-                mov     ebx, esi
-                mov     [esp+90h+var_6C], esi
-
-loc_4CE923:                             ; CODE XREF: CEncoder_GetOptimum+8BBj
-                cmp     [esp+90h+var_7D], 0
-                jnz     loc_4CEA90
-                mov     dl, byte ptr [esp+90h+var_5C]
-                cmp     byte ptr [esp+90h+var_58], dl
-                jz      loc_4CEA90
-                lea     ecx, [esi+1]
-                cmp     edi, ecx
-                jb      short loc_4CE945
-                mov     edi, ecx
-
-loc_4CE945:                             ; CODE XREF: CEncoder_GetOptimum+8E1j
-                mov     esi, 1
-                cmp     edi, esi
-                jbe     short loc_4CE975
-                mov     ebx, [esp+90h+var_74]
-                mov     edx, [esp+90h+var_40]
-                lea     ecx, [ebx+1]
-                sub     edx, ebx
-                jmp     short loc_4CE960
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CE960:                             ; CODE XREF: CEncoder_GetOptimum+8FBj
-                                        ; CEncoder_GetOptimum+90Fj
-                mov     bl, [ecx]
-                cmp     bl, [edx+ecx]
-                jnz     short loc_4CE971
-                add     esi, 1
-                add     ecx, 1
-                cmp     esi, edi
-                jb      short loc_4CE960
-
-loc_4CE971:                             ; CODE XREF: CEncoder_GetOptimum+905j
-                mov     ebx, [esp+90h+var_6C]
-
-loc_4CE975:                             ; CODE XREF: CEncoder_GetOptimum+8ECj
-                add     esi, 0FFFFFFFFh
-                cmp     esi, 2
-                mov     [esp+90h+var_50], esi
-                jb      loc_4CEA90
-                mov     ecx, [esp+90h+var_68]
-                mov     dl, ds:kLiteralNextStates[ecx]
-                mov     ecx, [esp+90h+arg_0]
-                movzx   ebx, dl
-                add     ecx, 1
-                and     ecx, [ebp+33B60h]
-                mov     edx, ebx
-                shl     edx, 4
-                lea     esi, [edx+ecx]
-                mov     edx, 800h
-                sub     edx, [ebp+ebx*4+283F0h]
-                mov     edi, 800h
-                sub     edi, [ebp+esi*4+280F0h]
-                shr     edx, 2
-                mov     edx, dword_550998[edx*4]
-                shr     edi, 2
-                add     edx, dword_550998[edi*4]
-                mov     edi, [esp+90h+var_78]
-                add     edx, eax
-                mov     eax, [esp+90h+var_50]
-                lea     edi, [eax+edi+1]
-                mov     eax, [esp+90h+var_7C]
-                cmp     eax, edi
-                mov     [esp+90h+var_40], esi
-                jnb     short loc_4CEA22
-                mov     esi, [esp+90h+var_7C]
-                lea     eax, [eax+eax*4]
-                lea     eax, [ebp+eax*8+0FCh]
-                mov     [esp+90h+var_3C], eax
-                mov     eax, edi
-                sub     eax, esi
-                add     esi, eax
-                mov     [esp+90h+var_7C], esi
-                mov     esi, [esp+90h+var_3C]
-
-loc_4CEA10:                             ; CODE XREF: CEncoder_GetOptimum+9BCj
-                add     esi, 28h
-                sub     eax, 1
-                mov     dword ptr [esi], 0FFFFFFFh
-                jnz     short loc_4CEA10
-                mov     esi, [esp+90h+var_40]
-
-loc_4CEA22:                             ; CODE XREF: CEncoder_GetOptimum+98Ej
-                imul    ecx, 110h
-                add     ecx, [esp+90h+var_50]
-                mov     eax, 800h
-                sub     eax, [ebp+esi*4+284B0h]
-                mov     esi, [ebp+ebx*4+28420h]
-                mov     ebx, [esp+90h+var_6C]
-                shr     eax, 2
-                mov     eax, dword_550998[eax*4]
-                shr     esi, 2
-                add     eax, dword_550998[esi*4]
-                mov     esi, [esp+90h+var_7C]
-                add     eax, [ebp+ecx*4+2E204h]
-                lea     ecx, [edi+edi*4+1Eh]
-                add     eax, edx
-                cmp     eax, [ebp+ecx*8+0Ch]
-                lea     ecx, [ebp+ecx*8+0]
-                jnb     short loc_4CEA94
-                mov     edx, [esp+90h+var_78]
-                add     edx, 1
-                mov     [ecx+0Ch], eax
-                mov     [ecx+10h], edx
-                mov     dword ptr [ecx+14h], 0
-                mov     byte ptr [ecx+1], 1
-                mov     byte ptr [ecx+2], 0
-                jmp     short loc_4CEA94
-; ---------------------------------------------------------------------------
-
-loc_4CEA90:                             ; CODE XREF: CEncoder_GetOptimum+8C8j
-                                        ; CEncoder_GetOptimum+8D6j ...
-                mov     esi, [esp+90h+var_7C]
-
-loc_4CEA94:                             ; CODE XREF: CEncoder_GetOptimum+A10j
-                                        ; CEncoder_GetOptimum+A2Ej
-                mov     [esp+90h+var_70], 0
-                mov     ecx, [esp+90h+var_70]
-                mov     [esp+90h+var_40], 2
-                jmp     short loc_4CEAB8
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CEAB0:                             ; CODE XREF: CEncoder_GetOptimum+D63j
-                mov     ebx, [esp+90h+var_6C]
-                mov     esi, [esp+90h+var_7C]
-
-loc_4CEAB8:                             ; CODE XREF: CEncoder_GetOptimum+A48j
-                mov     edx, [esp+90h+var_74]
-                mov     eax, edx
-                sub     eax, [esp+ecx*4+90h+var_20]
-                mov     cl, [edx]
-                sub     eax, 1
-                cmp     cl, [eax]
-                mov     [esp+90h+var_48], eax
-                jnz     loc_4CEDB5
-                mov     cl, [edx+1]
-                cmp     cl, [eax+1]
-                jnz     loc_4CEDB5
-                mov     edi, 2
-                cmp     ebx, edi
-                jbe     short loc_4CEB01
-                lea     ecx, [edx+2]
-                sub     eax, edx
-                lea     ecx, [ecx+0]
-
-loc_4CEAF0:                             ; CODE XREF: CEncoder_GetOptimum+A9Fj
-                mov     dl, [ecx]
-                cmp     dl, [eax+ecx]
-                jnz     short loc_4CEB01
-                add     edi, 1
-                add     ecx, 1
-                cmp     edi, ebx
-                jb      short loc_4CEAF0
-
-loc_4CEB01:                             ; CODE XREF: CEncoder_GetOptimum+A86j
-                                        ; CEncoder_GetOptimum+A95j
-                mov     eax, [esp+90h+var_78]
-                lea     ebx, [edi+eax]
-                cmp     esi, ebx
-                jnb     short loc_4CEB2E
-                mov     eax, ebx
-                lea     ecx, [esi+esi*4]
-                sub     eax, esi
-                add     esi, eax
-                lea     ecx, [ebp+ecx*8+0FCh]
-                mov     [esp+90h+var_7C], esi
-
-loc_4CEB20:                             ; CODE XREF: CEncoder_GetOptimum+ACCj
-                add     ecx, 28h
-                sub     eax, 1
-                mov     dword ptr [ecx], 0FFFFFFFh
-                jnz     short loc_4CEB20
-
-loc_4CEB2E:                             ; CODE XREF: CEncoder_GetOptimum+AAAj
-                mov     edx, [esp+90h+var_54]
-                mov     eax, [esp+90h+var_64]
-                mov     ecx, [esp+90h+var_70]
-                push    edx
-                push    eax
-                push    ecx
-                mov     ecx, ebp
-                mov     esi, edi
-                call    sub_4CD9B0
-                add     eax, [esp+90h+var_38]
-                mov     ecx, [esp+90h+var_54]
-                imul    ecx, 110h
-                lea     edx, [edi+ecx]
-                mov     [esp+90h+var_34], ecx
-                lea     ecx, [ebp+edx*4+2E204h]
-                mov     [esp+90h+var_50], ecx
-                lea     edx, [ebx+ebx*4]
-                mov     ebx, [esp+90h+var_50]
-                mov     [esp+90h+var_2C], eax
-                lea     ecx, [ebp+edx*8+0FCh]
-
-loc_4CEB78:                             ; CODE XREF: CEncoder_GetOptimum+B40j
-                mov     edx, [ebx]
-                add     edx, eax
-                cmp     edx, [ecx]
-                jnb     short loc_4CEB94
-                mov     [ecx], edx
-                mov     edx, [esp+90h+var_78]
-                mov     [ecx+4], edx
-                mov     edx, [esp+90h+var_70]
-                mov     [ecx+8], edx
-                mov     byte ptr [ecx-0Bh], 0
-
-loc_4CEB94:                             ; CODE XREF: CEncoder_GetOptimum+B1Ej
-                sub     edi, 1
-                sub     ebx, 4
-                sub     ecx, 28h
-                cmp     edi, 2
-                jnb     short loc_4CEB78
-                cmp     [esp+90h+var_70], 0
-                jnz     short loc_4CEBB0
-                lea     eax, [esi+1]
-                mov     [esp+90h+var_40], eax
-
-loc_4CEBB0:                             ; CODE XREF: CEncoder_GetOptimum+B47j
-                mov     ecx, [ebp+32EF8h]
-                mov     edx, [esp+90h+var_60]
-                lea     eax, [esi+1]
-                add     ecx, eax
-                cmp     edx, ecx
-                jnb     short loc_4CEBC5
-                mov     ecx, edx
-
-loc_4CEBC5:                             ; CODE XREF: CEncoder_GetOptimum+B61j
-                cmp     eax, ecx
-                jnb     short loc_4CEBE7
-                mov     ebx, [esp+90h+var_74]
-                mov     edi, [esp+90h+var_48]
-                lea     edx, [eax+ebx]
-                sub     edi, ebx
-
-loc_4CEBD6:                             ; CODE XREF: CEncoder_GetOptimum+B85j
-                mov     bl, [edx]
-                cmp     bl, [edx+edi]
-                jnz     short loc_4CEBE7
-                add     eax, 1
-                add     edx, 1
-                cmp     eax, ecx
-                jb      short loc_4CEBD6
-
-loc_4CEBE7:                             ; CODE XREF: CEncoder_GetOptimum+B67j
-                                        ; CEncoder_GetOptimum+B7Bj
-                or      ecx, 0FFFFFFFFh
-                sub     ecx, esi
-                add     eax, ecx
-                cmp     eax, 2
-                mov     [esp+90h+var_44], eax
-                jb      loc_4CEDB5
-                mov     edx, [esp+90h+var_68]
-                mov     cl, ds:kRepNextStates[edx]
-                mov     eax, [ebp+33B60h]
-                mov     edi, [esp+90h+arg_0]
-                movzx   ecx, cl
-                mov     ebx, eax
-                lea     edx, [esi+edi]
-                and     ebx, edx
-                mov     edx, ecx
-                mov     cl, ds:kLiteralNextStates[ecx]
-                shl     edx, 4
-                add     ebx, edx
-                mov     edx, [ebp+ebx*4+280F0h]
-                movzx   ebx, cl
-                shr     edx, 2
-                mov     edx, dword_550998[edx*4]
-                mov     [esp+90h+var_30], edx
-                lea     edi, [esi+edi+1]
-                and     edi, eax
-                mov     eax, [ebp+32654h]
-                mov     ecx, ebx
-                shl     ecx, 4
-                add     ecx, edi
-                mov     [esp+90h+var_50], ecx
-                mov     ecx, [esp+90h+var_74]
-                movzx   edx, byte ptr [esi+ecx]
-                push    edx
-                mov     edx, [esp+94h+var_48]
-                movzx   edx, byte ptr [esi+edx]
-                push    edx
-                movzx   edx, byte ptr [ecx+esi-1]
-                mov     ecx, 8
-                sub     cl, al
-                shr     edx, cl
-                mov     ecx, [esp+98h+arg_0]
-                lea     eax, [esi+ecx]
-                mov     ecx, [ebp+3265Ch]
-                and     ecx, eax
-                mov     eax, ecx
-                mov     ecx, [ebp+32654h]
-                shl     eax, cl
-                push    1
-                add     edx, eax
-                imul    edx, 0C00h
-                add     edx, [ebp+32650h]
-                mov     ecx, edx
-                call    sub_4CDAC0
-                mov     ecx, [esp+90h+var_50]
-                mov     edx, 800h
-                sub     edx, [ebp+ecx*4+280F0h]
-                mov     ecx, [esp+90h+var_34]
-                shr     edx, 2
-                add     eax, dword_550998[edx*4]
-                mov     edx, 800h
-                sub     edx, [ebp+ebx*4+283F0h]
-                shr     edx, 2
-                add     eax, dword_550998[edx*4]
-                lea     edx, [esi+ecx]
-                add     eax, [ebp+edx*4+2E204h]
-                mov     ecx, [esp+90h+var_44]
-                add     eax, [esp+90h+var_30]
-                mov     edx, [esp+90h+var_78]
-                add     eax, [esp+90h+var_2C]
-                add     ecx, esi
-                lea     ecx, [ecx+edx+1]
-                cmp     [esp+90h+var_7C], ecx
-                mov     [esp+90h+var_30], ecx
-                jnb     short loc_4CED3E
-                mov     edx, [esp+90h+var_7C]
-                lea     edx, [edx+edx*4]
-                lea     edx, [ebp+edx*8+0FCh]
-                mov     [esp+90h+var_2C], edx
-                mov     edx, [esp+90h+var_7C]
-                sub     ecx, edx
-                add     edx, ecx
-                mov     [esp+90h+var_7C], edx
-                mov     edx, [esp+90h+var_2C]
-                jmp     short loc_4CED30
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CED30:                             ; CODE XREF: CEncoder_GetOptimum+CCBj
-                                        ; CEncoder_GetOptimum+CDCj
-                add     edx, 28h
-                sub     ecx, 1
-                mov     dword ptr [edx], 0FFFFFFFh
-                jnz     short loc_4CED30
-
-loc_4CED3E:                             ; CODE XREF: CEncoder_GetOptimum+CA7j
-                mov     edx, [esp+90h+var_50]
-                imul    edi, 110h
-                add     edi, [esp+90h+var_44]
-                mov     ecx, 800h
-                sub     ecx, [ebp+edx*4+284B0h]
-                mov     edx, [ebp+ebx*4+28420h]
-                shr     ecx, 2
-                mov     ecx, dword_550998[ecx*4]
-                shr     edx, 2
-                add     ecx, dword_550998[edx*4]
-                add     ecx, [ebp+edi*4+2E204h]
-                add     ecx, eax
-                mov     eax, [esp+90h+var_30]
-                lea     eax, [eax+eax*4+1Eh]
-                cmp     ecx, [ebp+eax*8+0Ch]
-                lea     eax, [ebp+eax*8+0]
-                jnb     short loc_4CEDB5
-                mov     [eax+0Ch], ecx
-                mov     ecx, [esp+90h+var_78]
-                lea     edx, [esi+ecx+1]
-                mov     [eax+4], ecx
-                mov     ecx, [esp+90h+var_70]
-                mov     [eax+10h], edx
-                mov     dword ptr [eax+14h], 0
-                mov     byte ptr [eax+1], 1
-                mov     byte ptr [eax+2], 1
-                mov     [eax+8], ecx
-
-loc_4CEDB5:                             ; CODE XREF: CEncoder_GetOptimum+A6Dj
-                                        ; CEncoder_GetOptimum+A79j ...
-                mov     ecx, [esp+90h+var_70]
-                add     ecx, 1
-                cmp     ecx, 4
-                mov     [esp+90h+var_70], ecx
-                jb      loc_4CEAB0
-                mov     edx, [esp+90h+var_28]
-                mov     ecx, [esp+90h+var_6C]
-                cmp     edx, ecx
-                jbe     short loc_4CEDFB
-                xor     eax, eax
-                cmp     ecx, [ebp+32660h]
-                mov     edx, ecx
-                jbe     short loc_4CEDED
-
-loc_4CEDE1:                             ; CODE XREF: CEncoder_GetOptimum+D8Bj
-                add     eax, 2
-                cmp     ecx, [ebp+eax*4+32660h]
-                ja      short loc_4CEDE1
-
-loc_4CEDED:                             ; CODE XREF: CEncoder_GetOptimum+D7Fj
-                mov     [ebp+eax*4+32660h], ecx
-                add     eax, 2
-                mov     [esp+90h+var_4C], eax
-
-loc_4CEDFB:                             ; CODE XREF: CEncoder_GetOptimum+D73j
-                mov     esi, [esp+90h+var_40]
-                cmp     edx, esi
-                jb      loc_4CF1BB
-                mov     eax, [esp+90h+var_68]
-                mov     ecx, [ebp+eax*4+283F0h]
-                shr     ecx, 2
-                mov     eax, dword_550998[ecx*4]
-                add     eax, [esp+90h+var_24]
-                mov     ecx, [esp+90h+var_7C]
-                mov     [esp+90h+var_40], eax
-                mov     eax, [esp+90h+var_78]
-                add     eax, edx
-                cmp     ecx, eax
-                jnb     short loc_4CEE52
-                lea     edx, [ecx+ecx*4]
-                sub     eax, ecx
-                add     ecx, eax
-                lea     edx, [ebp+edx*8+0FCh]
-                mov     [esp+90h+var_7C], ecx
-
-loc_4CEE44:                             ; CODE XREF: CEncoder_GetOptimum+DF0j
-                add     edx, 28h
-                sub     eax, 1
-                mov     dword ptr [edx], 0FFFFFFFh
-                jnz     short loc_4CEE44
-
-loc_4CEE52:                             ; CODE XREF: CEncoder_GetOptimum+DD0j
-                xor     eax, eax
-                cmp     esi, [ebp+32660h]
-                mov     [esp+90h+var_70], eax
-                jbe     short loc_4CEE70
-
-loc_4CEE60:                             ; CODE XREF: CEncoder_GetOptimum+E0Aj
-                add     eax, 2
-                cmp     esi, [ebp+eax*4+32660h]
-                ja      short loc_4CEE60
-                mov     [esp+90h+var_70], eax
-
-loc_4CEE70:                             ; CODE XREF: CEncoder_GetOptimum+DFEj
-                lea     ebx, ds:0[eax*4]
-                mov     edx, [ebx+ebp+32664h]
-                mov     ecx, 7FFFFh
-                sub     ecx, edx
-                sar     ecx, 1Fh
-                and     ecx, 0Ch
-                add     ecx, 6
-                mov     eax, edx
-                shr     eax, cl
-                mov     [esp+90h+var_6C], edx
-                lea     edi, [esi+1]
-                movzx   eax, byte ptr dword_551198[eax]
-                lea     ecx, [eax+ecx*2]
-                mov     eax, [esp+90h+var_54]
-                imul    eax, 110h
-                add     eax, esi
-                lea     eax, [ebp+eax*4+295B8h]
-                mov     [esp+90h+var_3C], ecx
-                mov     ecx, [esp+90h+var_78]
-                mov     [esp+90h+var_54], eax
-                lea     eax, [esi+ecx]
-                lea     eax, [eax+eax*4]
-                lea     ecx, [ebp+eax*8+0FCh]
-                mov     [esp+90h+var_50], ecx
-
-loc_4CEED3:                             ; CODE XREF: CEncoder_GetOptimum+1156j
-                lea     eax, [edi-3]
-                cmp     eax, 4
-                jb      short loc_4CEEE0
-                mov     eax, 3
-
-loc_4CEEE0:                             ; CODE XREF: CEncoder_GetOptimum+E79j
-                cmp     edx, 80h
-                jnb     short loc_4CEEF6
-                shl     eax, 7
-                add     eax, edx
-                mov     eax, [ebp+eax*4+33314h]
-                jmp     short loc_4CEF10
-; ---------------------------------------------------------------------------
-
-loc_4CEEF6:                             ; CODE XREF: CEncoder_GetOptimum+E86j
-                shl     eax, 6
-                add     eax, [esp+90h+var_3C]
-                mov     esi, edx
-                mov     eax, [ebp+eax*4+32F14h]
-                and     esi, 0Fh
-                add     eax, [ebp+esi*4+33B14h]
-
-loc_4CEF10:                             ; CODE XREF: CEncoder_GetOptimum+E94j
-                add     eax, [esp+90h+var_40]
-                mov     esi, [esp+90h+var_54]
-                add     eax, [esi]
-                cmp     eax, [ecx]
-                mov     [esp+90h+var_2C], eax
-                jnb     short loc_4CEF35
-                mov     [ecx], eax
-                mov     eax, [esp+90h+var_78]
-                add     edx, 4
-                mov     [ecx+4], eax
-                mov     [ecx+8], edx
-                mov     byte ptr [ecx-0Bh], 0
-
-loc_4CEF35:                             ; CODE XREF: CEncoder_GetOptimum+EC0j
-                lea     eax, [edi-1]
-                cmp     eax, [ebx+ebp+32660h]
-                jnz     loc_4CF1A1
-                mov     ebx, [esp+90h+var_74]
-                mov     eax, [ebp+32EF8h]
-                mov     esi, [esp+90h+var_60]
-                mov     edx, ebx
-                sub     edx, [esp+90h+var_6C]
-                add     eax, edi
-                sub     edx, 1
-                cmp     esi, eax
-                mov     ecx, edi
-                jnb     short loc_4CEF6C
-                mov     eax, esi
-                mov     [esp+90h+var_44], esi
-                jmp     short loc_4CEF70
-; ---------------------------------------------------------------------------
-
-loc_4CEF6C:                             ; CODE XREF: CEncoder_GetOptimum+F02j
-                mov     [esp+90h+var_44], eax
-
-loc_4CEF70:                             ; CODE XREF: CEncoder_GetOptimum+F0Aj
-                cmp     edi, eax
-                jnb     short loc_4CEF93
-                lea     esi, [edi+edx]
-                sub     ebx, edx
-                lea     esp, [esp+0]
-
-loc_4CEF80:                             ; CODE XREF: CEncoder_GetOptimum+F31j
-                mov     al, [ebx+esi]
-                cmp     al, [esi]
-                jnz     short loc_4CEF93
-                add     ecx, 1
-                add     esi, 1
-                cmp     ecx, [esp+90h+var_44]
-                jb      short loc_4CEF80
-
-loc_4CEF93:                             ; CODE XREF: CEncoder_GetOptimum+F12j
-                                        ; CEncoder_GetOptimum+F25j
-                or      esi, 0FFFFFFFFh
-                lea     eax, [edi-1]
-                sub     esi, eax
-                add     ecx, esi
-                cmp     ecx, 2
-                mov     [esp+90h+var_48], ecx
-                jb      loc_4CF157
-                mov     ecx, [esp+90h+var_68]
-                mov     bl, ds:kMatchNextStates[ecx]
-                mov     ecx, [ebp+33B60h]
-                mov     eax, [esp+90h+arg_0]
-                lea     esi, [edi+eax-1]
-                mov     eax, ecx
-                and     eax, esi
-                movzx   esi, bl
-                movzx   edx, byte ptr [edi+edx-1]
-                mov     ebx, esi
-                shl     ebx, 4
-                add     ebx, eax
-                mov     ebx, [ebp+ebx*4+280F0h]
-                shr     ebx, 2
-                mov     ebx, dword_550998[ebx*4]
-                mov     [esp+90h+var_28], ebx
-                mov     bl, ds:kLiteralNextStates[esi]
-                lea     esi, [eax+1]
-                mov     eax, [ebp+32654h]
-                and     esi, ecx
-                movzx   ebx, bl
-                mov     ecx, ebx
-                shl     ecx, 4
-                add     ecx, esi
-                mov     [esp+90h+var_44], ecx
-                mov     ecx, [esp+90h+var_74]
-                movzx   ecx, byte ptr [ecx+edi-1]
-                push    ecx
-                mov     ecx, [esp+94h+var_74]
-                push    edx
-                movzx   edx, byte ptr [edi+ecx-2]
-                mov     ecx, 8
-                sub     cl, al
-                shr     edx, cl
-                mov     ecx, [esp+98h+arg_0]
-                lea     eax, [edi+ecx-1]
-                mov     ecx, [ebp+3265Ch]
-                and     ecx, eax
-                mov     eax, ecx
-                mov     ecx, [ebp+32654h]
-                shl     eax, cl
-                push    1
-                add     edx, eax
-                imul    edx, 0C00h
-                add     edx, [ebp+32650h]
-                mov     ecx, edx
-                call    sub_4CDAC0
-                mov     edx, 800h
-                sub     edx, [ebp+ebx*4+283F0h]
-                mov     ecx, 800h
-                shr     edx, 2
-                add     eax, dword_550998[edx*4]
-                mov     edx, [esp+90h+var_44]
-                sub     ecx, [ebp+edx*4+280F0h]
-                mov     edx, [esp+90h+var_78]
-                shr     ecx, 2
-                add     eax, dword_550998[ecx*4]
-                mov     ecx, [esp+90h+var_48]
-                add     eax, [esp+90h+var_28]
-                add     ecx, edx
-                add     eax, [esp+90h+var_2C]
-                add     ecx, edi
-                cmp     [esp+90h+var_7C], ecx
-                mov     [esp+90h+var_28], ecx
-                jnb     short loc_4CF0DE
-                mov     edx, [esp+90h+var_7C]
-                lea     edx, [edx+edx*4]
-                lea     edx, [ebp+edx*8+0FCh]
-                mov     [esp+90h+var_24], edx
-                mov     edx, [esp+90h+var_7C]
-                sub     ecx, edx
-                add     edx, ecx
-                mov     [esp+90h+var_7C], edx
-                mov     edx, [esp+90h+var_24]
-                lea     ecx, [ecx+0]
-
-loc_4CF0D0:                             ; CODE XREF: CEncoder_GetOptimum+107Cj
-                add     edx, 28h
-                sub     ecx, 1
-                mov     dword ptr [edx], 0FFFFFFFh
-                jnz     short loc_4CF0D0
-
-loc_4CF0DE:                             ; CODE XREF: CEncoder_GetOptimum+1049j
-                mov     edx, [esp+90h+var_44]
-                imul    esi, 110h
-                add     esi, [esp+90h+var_48]
-                mov     ecx, 800h
-                sub     ecx, [ebp+edx*4+284B0h]
-                mov     edx, [ebp+ebx*4+28420h]
-                shr     ecx, 2
-                mov     ecx, dword_550998[ecx*4]
-                shr     edx, 2
-                add     ecx, dword_550998[edx*4]
-                add     ecx, [ebp+esi*4+2E204h]
-                add     ecx, eax
-                mov     eax, [esp+90h+var_28]
-                lea     eax, [eax+eax*4+1Eh]
-                cmp     ecx, [ebp+eax*8+0Ch]
-                lea     eax, [ebp+eax*8+0]
-                jnb     short loc_4CF157
-                mov     [eax+0Ch], ecx
-                mov     ecx, [esp+90h+var_78]
-                lea     edx, [ecx+edi]
-                mov     [eax+4], ecx
-                mov     ecx, [esp+90h+var_6C]
-                add     ecx, 4
-                mov     [eax+10h], edx
-                mov     dword ptr [eax+14h], 0
-                mov     byte ptr [eax+1], 1
-                mov     byte ptr [eax+2], 1
-                mov     [eax+8], ecx
-
-loc_4CF157:                             ; CODE XREF: CEncoder_GetOptimum+F44j
-                                        ; CEncoder_GetOptimum+10CCj
-                mov     eax, [esp+90h+var_70]
-                add     eax, 2
-                cmp     eax, [esp+90h+var_4C]
-                mov     [esp+90h+var_70], eax
-                jz      short loc_4CF1BB
-                lea     ebx, ds:0[eax*4]
-                mov     eax, [ebx+ebp+32664h]
-                cmp     eax, 80h
-                mov     [esp+90h+var_6C], eax
-                jb      short loc_4CF1A1
-                mov     ecx, 7FFFFh
-                sub     ecx, eax
-                sar     ecx, 1Fh
-                and     ecx, 0Ch
-                add     ecx, 6
-                shr     eax, cl
-                movzx   edx, byte ptr dword_551198[eax]
-                lea     eax, [edx+ecx*2]
-                mov     [esp+90h+var_3C], eax
-
-loc_4CF1A1:                             ; CODE XREF: CEncoder_GetOptimum+EDFj
-                                        ; CEncoder_GetOptimum+111Fj
-                add     [esp+90h+var_50], 28h
-                add     [esp+90h+var_54], 4
-                mov     ecx, [esp+90h+var_50]
-                mov     edx, [esp+90h+var_6C]
-                add     edi, 1
-                jmp     loc_4CEED3
-; ---------------------------------------------------------------------------
-
-loc_4CF1BB:                             ; CODE XREF: CEncoder_GetOptimum+8A9j
-                                        ; CEncoder_GetOptimum+DA1j ...
-                mov     eax, [esp+90h+var_78]
-                add     eax, 1
-                cmp     eax, [esp+90h+var_7C]
-                mov     [esp+90h+var_78], eax
-                jnz     loc_4CE5D1
-
-loc_4CF1D0:                             ; CODE XREF: CEncoder_GetOptimum+567j
-                mov     ecx, [esp+90h+var_78]
-                push    ecx
-                jmp     short loc_4CF1EF
-; ---------------------------------------------------------------------------
-
-loc_4CF1D7:                             ; CODE XREF: CEncoder_GetOptimum+59Ej
-                mov     ecx, [esp+90h+var_4C]
-                mov     [ebp+32F00h], ecx
-                mov     [ebp+32EFCh], eax
-                mov     byte ptr [ebp+32F10h], 1
-                push    esi
-
-loc_4CF1EF:                             ; CODE XREF: CEncoder_GetOptimum+1175j
-                mov     edx, [esp+94h+arg_4]
-                push    edx
-                mov     ecx, ebp
-                call    sub_4CB2E0
-                pop     edi
-                pop     ebx
-                pop     esi
-                pop     ebp
-                add     esp, 80h
-                retn    8
-CEncoder_GetOptimum endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CF210:                             ; DATA XREF: CEncoder_CodeOneBlock+44o
-                mov     edx, [esp+10h]
-                mov     eax, [esp+4]
-                mov     eax, [eax+4]
-                mov     ecx, [eax]
-                push    edx
-                mov     edx, [esp+10h]
-                push    edx
-                mov     edx, [esp+10h]
-                push    edx
-                push    eax
-                mov     eax, [ecx+0Ch]
-                call    eax
-                retn
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-CEncoder_FillDistancesPrices proc near  ; CODE XREF: CEncoder_SetStreams+4Fp
-                                        ; CEncoder_CodeOneBlock+751p
-
-var_20C         = dword ptr -20Ch
-var_208         = dword ptr -208h
-var_204         = dword ptr -204h
-var_200         = dword ptr -200h
-
-                sub     esp, 20Ch
-                push    ebx
-                push    ebp
-                push    esi
-                push    edi
-                mov     ebx, ecx
-                mov     esi, 4
-
-loc_4CF241:                             ; CODE XREF: CEncoder_FillDistancesPrices+80j
-                cmp     esi, 2000h
-                jnb     short loc_4CF252
-                movzx   edx, byte ptr dword_551198[esi]
-                jmp     short loc_4CF27A
-; ---------------------------------------------------------------------------
-
-loc_4CF252:                             ; CODE XREF: CEncoder_FillDistancesPrices+17j
-                cmp     esi, 2000000h
-                jnb     short loc_4CF26B
-                mov     eax, esi
-                shr     eax, 0Ch
-                movzx   edx, byte ptr dword_551198[eax]
-                add     edx, 18h
-                jmp     short loc_4CF27A
-; ---------------------------------------------------------------------------
-
-loc_4CF26B:                             ; CODE XREF: CEncoder_FillDistancesPrices+28j
-                mov     ecx, esi
-                shr     ecx, 18h
-                movzx   edx, byte ptr dword_551198[ecx]
-                add     edx, 30h
-
-loc_4CF27A:                             ; CODE XREF: CEncoder_FillDistancesPrices+20j
-                                        ; CEncoder_FillDistancesPrices+39j
-                mov     ecx, edx
-                mov     eax, edx
-                and     eax, 1
-                shr     ecx, 1
-                sub     ecx, 1
-                or      eax, 2
-                shl     eax, cl
-                mov     edi, esi
-                sub     edi, eax
-                push    edi
-                sub     eax, edx
-                push    ecx
-                lea     edx, [ebx+eax*4+28BACh]
-                push    edx
-                call    sub_4CD860
-                mov     [esp+esi*4+228h+var_200], eax
-                add     esi, 1
-                add     esp, 0Ch
-                cmp     esi, 80h
-                jb      short loc_4CF241
-                lea     ebp, [esp+21Ch+var_200]
-                sub     ebp, ebx
-                lea     esi, [ebx+3331Ch]
-                sub     ebp, 33314h
-                lea     edx, [ebx+32F14h]
-                mov     [esp+21Ch+var_20C], esi
-                mov     [esp+21Ch+var_208], ebp
-                mov     [esp+21Ch+var_204], 4
-                jmp     short loc_4CF2E4
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CF2E0:                             ; CODE XREF: CEncoder_FillDistancesPrices+1BDj
-                mov     esi, [esp+21Ch+var_20C]
-
-loc_4CF2E4:                             ; CODE XREF: CEncoder_FillDistancesPrices+AAj
-                xor     edi, edi
-                cmp     [ebx+33B58h], edi
-                jbe     short loc_4CF33F
-                mov     edi, edi
-
-loc_4CF2F0:                             ; CODE XREF: CEncoder_FillDistancesPrices+109j
-                mov     ecx, edi
-                or      ecx, 40h
-                xor     esi, esi
-                cmp     ecx, 1
-                jz      short loc_4CF32D
-                lea     esp, [esp+0]
-
-loc_4CF300:                             ; CODE XREF: CEncoder_FillDistancesPrices+F7j
-                mov     eax, ecx
-                shr     ecx, 1
-                mov     ebp, [edx+ecx*4-0A764h]
-                and     eax, 1
-                sub     ebp, eax
-                neg     eax
-                xor     ebp, eax
-                shr     ebp, 2
-                and     ebp, 1FFh
-                add     esi, dword_550998[ebp*4]
-                cmp     ecx, 1
-                jnz     short loc_4CF300
-                mov     ebp, [esp+21Ch+var_208]
-
-loc_4CF32D:                             ; CODE XREF: CEncoder_FillDistancesPrices+CAj
-                mov     [edx+edi*4], esi
-                add     edi, 1
-                cmp     edi, [ebx+33B58h]
-                jb      short loc_4CF2F0
-                mov     esi, [esp+21Ch+var_20C]
-
-loc_4CF33F:                             ; CODE XREF: CEncoder_FillDistancesPrices+BCj
-                mov     eax, 0Eh
-                cmp     [ebx+33B58h], eax
-                jbe     short loc_4CF368
-                lea     esp, [esp+0]
-
-loc_4CF350:                             ; CODE XREF: CEncoder_FillDistancesPrices+136j
-                mov     ecx, eax
-                shr     ecx, 1
-                sub     ecx, 5
-                shl     ecx, 6
-                add     [edx+eax*4], ecx
-                add     eax, 1
-                cmp     eax, [ebx+33B58h]
-                jb      short loc_4CF350
-
-loc_4CF368:                             ; CODE XREF: CEncoder_FillDistancesPrices+11Aj
-                mov     eax, [edx]
-                mov     [esi-8], eax
-                mov     ecx, [edx+4]
-                mov     [esi-4], ecx
-                mov     eax, [edx+8]
-                mov     [esi], eax
-                mov     ecx, [edx+0Ch]
-                mov     [esi+4], ecx
-                mov     eax, 4
-                add     esi, 8
-
-loc_4CF386:                             ; CODE XREF: CEncoder_FillDistancesPrices+19Ej
-                cmp     eax, 2000h
-                jnb     short loc_4CF396
-                movzx   ecx, byte ptr dword_551198[eax]
-                jmp     short loc_4CF3BB
-; ---------------------------------------------------------------------------
-
-loc_4CF396:                             ; CODE XREF: CEncoder_FillDistancesPrices+15Bj
-                cmp     eax, 2000000h
-                mov     ecx, eax
-                jnb     short loc_4CF3AE
-                shr     ecx, 0Ch
-                movzx   ecx, byte ptr dword_551198[ecx]
-                add     ecx, 18h
-                jmp     short loc_4CF3BB
-; ---------------------------------------------------------------------------
-
-loc_4CF3AE:                             ; CODE XREF: CEncoder_FillDistancesPrices+16Dj
-                shr     ecx, 18h
-                movzx   ecx, byte ptr dword_551198[ecx]
-                add     ecx, 30h
-
-loc_4CF3BB:                             ; CODE XREF: CEncoder_FillDistancesPrices+164j
-                                        ; CEncoder_FillDistancesPrices+17Cj
-                mov     ecx, [edx+ecx*4]
-                add     ecx, [esi+ebp]
-                add     eax, 1
-                mov     [esi], ecx
-                add     esi, 4
-                cmp     eax, 80h
-                jb      short loc_4CF386
-                add     [esp+21Ch+var_20C], 200h
-                sub     ebp, 200h
-                add     edx, 100h
-                sub     [esp+21Ch+var_204], 1
-                mov     [esp+21Ch+var_208], ebp
-                jnz     loc_4CF2E0
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     dword ptr [ebx+33B70h], 0
-                pop     ebx
-                add     esp, 20Ch
-                retn
-CEncoder_FillDistancesPrices endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-CEncoder_FillAlignPrices proc near      ; CODE XREF: CEncoder_SetStreams+56p
-                                        ; CEncoder_CodeOneBlock+761p
-                push    ebx
-                push    ebp
-                push    esi
-                mov     ebp, ecx
-                push    edi
-                xor     esi, esi
-                lea     ebx, [ebp+28D78h]
-                lea     edi, [ebp+33B14h]
-
-loc_4CF424:                             ; CODE XREF: CEncoder_FillAlignPrices+27j
-                push    esi
-                mov     ecx, ebx
-                call    sub_4CD810
-                mov     [edi], eax
-                add     esi, 1
-                add     edi, 4
-                cmp     esi, 10h
-                jb      short loc_4CF424
-                pop     edi
-                pop     esi
-                mov     dword ptr [ebp+33B54h], 0
-                pop     ebp
-                pop     ebx
-                retn
-CEncoder_FillAlignPrices endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CF810      proc near               ; CODE XREF: sub_4D0250+3p
-
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_4           = dword ptr -4
-
-                push    0FFFFFFFFh
-                push    offset loc_4DA0C9
-                mov     eax, dword ptr fs:[0]
-                push    eax
-                push    ecx
-                push    ebx
-                push    esi
-                mov     eax, dword_544960
-                xor     eax, esp
-                push    eax
-                lea     eax, [esp+1Ch+var_C]
-                mov     dword ptr fs:[0], eax
-                mov     esi, ecx
-                mov     [esp+1Ch+var_10], esi
-                mov     dword ptr [esi], offset NCompress_NLZMA_CEncoder_vftable
-                mov     dword ptr [esi+4], offset NCompress_NLZMA_CEncoder_vftable_ICompressSetOutStream
-                mov     dword ptr [esi+8], offset NCompress_NLZMA_CEncoder_vftable_ICompressSetCoderProperties
-                mov     dword ptr [esi+0Ch], offset NCompress_NLZMA_CEncoder_vftable_ICompressWriteCoderProperties
-                mov     eax, [esi+0A4h]
-                push    eax             ; lpAddress
-                mov     [esp+20h+var_4], 1
-                call    off_546E24
-                xor     ebx, ebx
-                add     esp, 4
-                cmp     [esi+0D0h], ebx
-                mov     [esi+0A4h], ebx
-                jnz     short loc_4CF892
-                mov     ecx, [esi+0B4h]
-                push    ecx             ; lpAddress
-                call    off_546E24
-                add     esp, 4
-                mov     [esi+0B4h], ebx
-
-loc_4CF892:                             ; CODE XREF: sub_4CF810+6Aj
-                mov     eax, [esi+33B8Ch]
-                cmp     eax, ebx
-                jz      short loc_4CF8A4
-                mov     edx, [eax]
-                push    eax
-                mov     eax, [edx+8]
-                call    eax
-
-loc_4CF8A4:                             ; CODE XREF: sub_4CF810+8Aj
-                lea     ecx, [esi+32650h]
-                mov     byte ptr [esp+1Ch+var_4], bl
-                call    sub_4CD8F0
-                mov     eax, [esi+40h]
-                cmp     eax, ebx
-                mov     [esp+1Ch+var_4], 0FFFFFFFFh
-                jz      short loc_4CF8CF
-                push    8000h           ; dwFreeType
-                push    ebx             ; dwSize
-                push    eax             ; lpAddress
-                call    ds:VirtualFree
-
-loc_4CF8CF:                             ; CODE XREF: sub_4CF810+B0j
-                mov     [esi+40h], ebx
-                mov     esi, [esi+54h]
-                cmp     esi, ebx
-                jz      short loc_4CF8E1
-                mov     ecx, [esi]
-                mov     edx, [ecx+8]
-                push    esi
-                call    edx
-
-loc_4CF8E1:                             ; CODE XREF: sub_4CF810+C7j
-                mov     ecx, [esp+1Ch+var_C]
-                mov     dword ptr fs:[0], ecx
-                pop     ecx
-                pop     esi
-                pop     ebx
-                add     esp, 10h
-                retn
-sub_4CF810      endp
-
-; =============== S U B R O U T I N E =======================================
-
-; int __stdcall sub_4CF900(int, void *Buf1, int)
-sub_4CF900      proc near               ; CODE XREF: sub_4CFA20+5j
-                                        ; ICompressSetCoderProperties_QueryInterface+5j ...
-
-arg_0           = dword ptr  4
-Buf1            = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                push    esi
-                mov     esi, [esp+4+Buf1]
-                push    offset dword_512730 ; Buf2
-                push    esi             ; Buf1
-                call    unknown_libname_324 ; MFC 3.1/4.0/4.2/8.0 32bit
-                add     esp, 8
-                test    eax, eax
-                jz      short loc_4CF94C
-
-loc_4CF917:                             ; CODE XREF: sub_4CF900+5Cj
-                mov     eax, [esp+4+arg_0]
-                test    eax, eax
-                jz      short loc_4CF936
-                mov     edx, [esp+4+arg_8]
-                lea     ecx, [eax+4]
-                mov     [edx], ecx
-                mov     ecx, [eax]
-                mov     edx, [ecx+4]
-                push    eax
-                call    edx
-                xor     eax, eax
-                pop     esi
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CF936:                             ; CODE XREF: sub_4CF900+1Dj
-                                        ; sub_4CF900+76j ...
-                mov     edx, [esp+4+arg_8]
-                xor     ecx, ecx
-                mov     [edx], ecx
-                mov     ecx, [eax]
-                mov     edx, [ecx+4]
-                push    eax
-                call    edx
-                xor     eax, eax
-                pop     esi
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CF94C:                             ; CODE XREF: sub_4CF900+15j
-                push    offset dword_5535A0 ; Buf2
-                push    esi             ; Buf1
-                call    unknown_libname_324 ; MFC 3.1/4.0/4.2/8.0 32bit
-                add     esp, 8
-                test    eax, eax
-                jnz     short loc_4CF917
-                push    offset dword_5535B0 ; Buf2
-                push    esi             ; Buf1
-                call    unknown_libname_324 ; MFC 3.1/4.0/4.2/8.0 32bit
-                add     esp, 8
-                test    eax, eax
-                jz      short loc_4CF98F
-                mov     eax, [esp+4+arg_0]
-                test    eax, eax
-                jz      short loc_4CF936
-                mov     edx, [esp+4+arg_8]
-                lea     ecx, [eax+8]
-                mov     [edx], ecx
-                mov     ecx, [eax]
-                mov     edx, [ecx+4]
-                push    eax
-                call    edx
-                xor     eax, eax
-                pop     esi
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CF98F:                             ; CODE XREF: sub_4CF900+6Ej
-                push    offset dword_5535C0 ; Buf2
-                push    esi             ; Buf1
-                call    unknown_libname_324 ; MFC 3.1/4.0/4.2/8.0 32bit
-                add     esp, 8
-                test    eax, eax
-                jz      short loc_4CF9C0
-                mov     eax, [esp+4+arg_0]
-                test    eax, eax
-                jz      short loc_4CF936
-                mov     edx, [esp+4+arg_8]
-                lea     ecx, [eax+0Ch]
-                mov     [edx], ecx
-                mov     ecx, [eax]
-                mov     edx, [ecx+4]
-                push    eax
-                call    edx
-                xor     eax, eax
-                pop     esi
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CF9C0:                             ; CODE XREF: sub_4CF900+9Fj
-                mov     eax, 80004002h
-                pop     esi
-                retn    0Ch
-sub_4CF900      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CF9D0      proc near               ; CODE XREF: ICompressSetCoderProperties_AddRef+5j
-                                        ; sub_4CFA10+5j ...
-
-arg_0           = dword ptr  4
-
-                mov     eax, [esp+arg_0]
-                add     dword ptr [eax+24h], 1
-                mov     eax, [eax+24h]
-                retn    4
-sub_4CF9D0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CF9E0      proc near               ; CODE XREF: sub_4CFA40+5j
-                                        ; ICompressSetCoderProperties_Release+5j ...
-
-arg_0           = dword ptr  4
-
-                mov     ecx, [esp+arg_0]
-                add     dword ptr [ecx+24h], 0FFFFFFFFh
-                mov     eax, [ecx+24h]
-                jnz     short locret_4CF9F8
-                mov     eax, [ecx]
-                mov     edx, [eax+10h]
-                push    1
-                call    edx
-                xor     eax, eax
-
-locret_4CF9F8:                          ; CODE XREF: sub_4CF9E0+Bj
-                retn    4
-sub_4CF9E0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-ICompressSetCoderProperties_AddRef      proc near               ; DATA XREF: .rdata:00517AD4o
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 8
-                jmp     sub_4CF9D0
-ICompressSetCoderProperties_AddRef      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA10      proc near               ; DATA XREF: .rdata:00517AC0o
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 0Ch
-                jmp     sub_4CF9D0
-sub_4CFA10      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA20      proc near               ; DATA XREF: .rdata:NCompress_NLZMA_CEncoder_vftable_ICompressSetOutStreamo
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 4
-                jmp     sub_4CF900
-sub_4CFA20      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-ICompressSetCoderProperties_QueryInterface      proc near               ; DATA XREF: .rdata:NCompress_NLZMA_CEncoder_vftable_ICompressSetCoderPropertieso
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 8
-                jmp     sub_4CF900
-ICompressSetCoderProperties_QueryInterface      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA40      proc near               ; DATA XREF: .rdata:00517AECo
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 4
-                jmp     sub_4CF9E0
-sub_4CFA40      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA50      proc near               ; DATA XREF: .rdata:NCompress_NLZMA_CEncoder_vftable_ICompressWriteCoderPropertieso
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                sub     [esp+arg_0], 0Ch
-                jmp     sub_4CF900
-sub_4CFA50      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-ICompressSetCoderProperties_Release      proc near               ; DATA XREF: .rdata:00517AD8o
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 8
-                jmp     sub_4CF9E0
-ICompressSetCoderProperties_Release      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA70      proc near               ; DATA XREF: .rdata:00517AC4o
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 0Ch
-                jmp     sub_4CF9E0
-sub_4CFA70      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA80      proc near               ; DATA XREF: .rdata:00517AE8o
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 4
-                jmp     sub_4CF9D0
-sub_4CFA80      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA90      proc near               ; DATA XREF: .rdata:00517AF0o
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    esi
-                mov     esi, [esp+4+arg_4]
-                test    esi, esi
-                push    edi
-                mov     edi, [esp+8+arg_0]
-                jz      short loc_4CFAA6
-                mov     eax, [esi]
-                mov     ecx, [eax+4]
-                push    esi
-                call    ecx
-
-loc_4CFAA6:                             ; CODE XREF: sub_4CFA90+Cj
-                mov     eax, [edi+50h]
-                test    eax, eax
-                jz      short loc_4CFAB5
-                mov     edx, [eax]
-                push    eax
-                mov     eax, [edx+8]
-                call    eax
-
-loc_4CFAB5:                             ; CODE XREF: sub_4CFA90+1Bj
-                mov     [edi+50h], esi
-                pop     edi
-                xor     eax, eax
-                pop     esi
-                retn    8
-sub_4CFA90      endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CFAC0      proc near               ; CODE XREF: CEncoder_CodeOneBlock+42Ap
-                                        ; CEncoder_CodeOneBlock+517p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                mov     eax, [esp+arg_0]
-                push    esi
-                mov     esi, [eax+10h]
-                mov     edx, esi
-                shr     edx, 0Bh
-                imul    edx, [ecx]
-                cmp     [esp+4+arg_4], 0
-                jnz     short loc_4CFAEC
-                mov     [eax+10h], edx
-                mov     edx, [ecx]
-                mov     esi, 800h
-                sub     esi, edx
-                shr     esi, 5
-                add     esi, edx
-                mov     [ecx], esi
-                jmp     short loc_4CFB03
-; ---------------------------------------------------------------------------
-
-loc_4CFAEC:                             ; CODE XREF: sub_4CFAC0+15j
-                add     [eax+8], edx
-                adc     dword ptr [eax+0Ch], 0
-                sub     esi, edx
-                mov     [eax+10h], esi
-                mov     edx, [ecx]
-                mov     esi, edx
-                shr     esi, 5
-                sub     edx, esi
-                mov     [ecx], edx
-
-loc_4CFB03:                             ; CODE XREF: sub_4CFAC0+2Aj
-                mov     ecx, [eax+10h]
-                cmp     ecx, 1000000h
-                pop     esi
-                jnb     short locret_4CFB1C
-                shl     ecx, 8
-                mov     [eax+10h], ecx
-                mov     ecx, eax
-                call    loc_4CF640
-
-locret_4CFB1C:                          ; CODE XREF: sub_4CFAC0+4Dj
-                retn    8
-sub_4CFAC0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFB20      proc near               ; CODE XREF: sub_4D0020+52p
-                                        ; sub_4D0020+E4p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     ebp, ecx
-                mov     ebx, 1
-                mov     edx, 3
-
-loc_4CFB34:                             ; CODE XREF: sub_4CFB20+8Cj
-                mov     edi, [esp+10h+arg_4]
-                sub     edx, 1
-                mov     ecx, edx
-                shr     edi, cl
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebp+ebx*4+0]
-                and     edi, 1
-                test    edi, edi
-                mov     [esp+10h+arg_0], edx
-                jnz     short loc_4CFB70
-                mov     [esi+10h], eax
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebp+ebx*4+0], ecx
-                jmp     short loc_4CFB8B
-; ---------------------------------------------------------------------------
-
-loc_4CFB70:                             ; CODE XREF: sub_4CFB20+35j
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [ebp+ebx*4+0], eax
-
-loc_4CFB8B:                             ; CODE XREF: sub_4CFB20+4Ej
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFBA6
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-                mov     edx, [esp+10h+arg_0]
-
-loc_4CFBA6:                             ; CODE XREF: sub_4CFB20+73j
-                add     ebx, ebx
-                or      ebx, edi
-                test    edx, edx
-                jnz     short loc_4CFB34
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn    8
-sub_4CFB20      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFBC0      proc near               ; CODE XREF: sub_4D0020+136p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     ebp, ecx
-                mov     ebx, 1
-                mov     edx, 8
-
-loc_4CFBD4:                             ; CODE XREF: sub_4CFBC0+8Cj
-                mov     edi, [esp+10h+arg_4]
-                sub     edx, 1
-                mov     ecx, edx
-                shr     edi, cl
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebp+ebx*4+0]
-                and     edi, 1
-                test    edi, edi
-                mov     [esp+10h+arg_0], edx
-                jnz     short loc_4CFC10
-                mov     [esi+10h], eax
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebp+ebx*4+0], ecx
-                jmp     short loc_4CFC2B
-; ---------------------------------------------------------------------------
-
-loc_4CFC10:                             ; CODE XREF: sub_4CFBC0+35j
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [ebp+ebx*4+0], eax
-
-loc_4CFC2B:                             ; CODE XREF: sub_4CFBC0+4Ej
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFC46
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-                mov     edx, [esp+10h+arg_0]
-
-loc_4CFC46:                             ; CODE XREF: sub_4CFBC0+73j
-                add     ebx, ebx
-                or      ebx, edi
-                test    edx, edx
-                jnz     short loc_4CFBD4
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn    8
-sub_4CFBC0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFC60      proc near               ; CODE XREF: sub_4D0770+EDp
-                                        ; CEncoder_CodeOneBlock+67Cp
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     ebp, ecx
-                mov     ebx, 1
-                mov     edx, 6
-
-loc_4CFC74:                             ; CODE XREF: sub_4CFC60+8Cj
-                mov     edi, [esp+10h+arg_4]
-                sub     edx, 1
-                mov     ecx, edx
-                shr     edi, cl
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebp+ebx*4+0]
-                and     edi, 1
-                test    edi, edi
-                mov     [esp+10h+arg_0], edx
-                jnz     short loc_4CFCB0
-                mov     [esi+10h], eax
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebp+ebx*4+0], ecx
-                jmp     short loc_4CFCCB
-; ---------------------------------------------------------------------------
-
-loc_4CFCB0:                             ; CODE XREF: sub_4CFC60+35j
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [ebp+ebx*4+0], eax
-
-loc_4CFCCB:                             ; CODE XREF: sub_4CFC60+4Ej
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFCE6
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-                mov     edx, [esp+10h+arg_0]
-
-loc_4CFCE6:                             ; CODE XREF: sub_4CFC60+73j
-                add     ebx, ebx
-                or      ebx, edi
-                test    edx, edx
-                jnz     short loc_4CFC74
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn    8
-sub_4CFC60      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFD00      proc near               ; CODE XREF: sub_4D0770+109p
-                                        ; CEncoder_CodeOneBlock+6D5p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     ebp, ecx
-                mov     edi, 1
-                mov     [esp+10h+arg_0], 4
-
-loc_4CFD17:                             ; CODE XREF: sub_4CFD00+87j
-                mov     ecx, [esi+10h]
-                mov     ebx, [esp+10h+arg_4]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebp+edi*4+0]
-                and     ebx, 1
-                test    ebx, ebx
-                jnz     short loc_4CFD48
-                mov     [esi+10h], eax
-                mov     eax, [ebp+edi*4+0]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebp+edi*4+0], ecx
-                jmp     short loc_4CFD63
-; ---------------------------------------------------------------------------
-
-loc_4CFD48:                             ; CODE XREF: sub_4CFD00+2Dj
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebp+edi*4+0]
-                mov     edx, eax
-                shr     edx, 5
-                sub     eax, edx
-                mov     [ebp+edi*4+0], eax
-
-loc_4CFD63:                             ; CODE XREF: sub_4CFD00+46j
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFD7A
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4CFD7A:                             ; CODE XREF: sub_4CFD00+6Bj
-                shr     [esp+10h+arg_4], 1
-                add     edi, edi
-                or      edi, ebx
-                sub     [esp+10h+arg_0], 1
-                jnz     short loc_4CFD17
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn    8
-sub_4CFD00      endp
-
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFD90      proc near               ; CODE XREF: CEncoder_CodeOneBlock+6AFp
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-
-                mov     eax, [esp+arg_8]
-                test    eax, eax
-                push    edi
-                mov     edi, 1
-                jle     loc_4CFE26
-                push    ebx
-                push    ebp
-                mov     ebp, [esp+0Ch+arg_0]
-                push    esi
-                mov     esi, [esp+10h+arg_4]
-                mov     [esp+10h+arg_8], eax
-
-loc_4CFDB1:                             ; CODE XREF: sub_4CFD90+91j
-                mov     ecx, [esi+10h]
-                mov     ebx, [esp+10h+arg_C]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebp+edi*4+0]
-                and     ebx, 1
-                test    ebx, ebx
-                jnz     short loc_4CFDE2
-                mov     [esi+10h], eax
-                mov     eax, [ebp+edi*4+0]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebp+edi*4+0], ecx
-                jmp     short loc_4CFDFD
-; ---------------------------------------------------------------------------
-
-loc_4CFDE2:                             ; CODE XREF: sub_4CFD90+37j
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebp+edi*4+0]
-                mov     edx, eax
-                shr     edx, 5
-                sub     eax, edx
-                mov     [ebp+edi*4+0], eax
-
-loc_4CFDFD:                             ; CODE XREF: sub_4CFD90+50j
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFE14
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4CFE14:                             ; CODE XREF: sub_4CFD90+75j
-                shr     [esp+10h+arg_C], 1
-                add     edi, edi
-                or      edi, ebx
-                sub     [esp+10h+arg_8], 1
-                jnz     short loc_4CFDB1
-                pop     esi
-                pop     ebp
-                pop     ebx
-
-loc_4CFE26:                             ; CODE XREF: sub_4CFD90+Cj
-                pop     edi
-                retn
-sub_4CFD90      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFE30      proc near               ; CODE XREF: CEncoder_CodeOneBlock+190p
-                                        ; CEncoder_CodeOneBlock+2CCp
-
-arg_0           = dword ptr  4
-arg_4           = byte ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     ebx, ecx
-                mov     ebp, 1
-                mov     edx, 8
-
-loc_4CFE44:                             ; CODE XREF: sub_4CFE30+88j
-                movzx   edi, [esp+10h+arg_4]
-                sub     edx, 1
-                mov     cl, dl
-                shr     edi, cl
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebx+ebp*4]
-                and     edi, 1
-                test    edi, edi
-                mov     [esp+10h+arg_0], edx
-                jnz     short loc_4CFE7E
-                mov     [esi+10h], eax
-                mov     eax, [ebx+ebp*4]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebx+ebp*4], ecx
-                jmp     short loc_4CFE97
-; ---------------------------------------------------------------------------
-
-loc_4CFE7E:                             ; CODE XREF: sub_4CFE30+35j
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebx+ebp*4]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [ebx+ebp*4], eax
-
-loc_4CFE97:                             ; CODE XREF: sub_4CFE30+4Cj
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFEB2
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-                mov     edx, [esp+10h+arg_0]
-
-loc_4CFEB2:                             ; CODE XREF: sub_4CFE30+6Fj
-                add     ebp, ebp
-                or      ebp, edi
-                test    edx, edx
-                jnz     short loc_4CFE44
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn    8
-sub_4CFE30      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CFED0      proc near               ; CODE XREF: CEncoder_CodeOneBlock+300p
-
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = byte ptr  8
-arg_8           = byte ptr  0Ch
-
-                push    ecx
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+10h+arg_0]
-                push    edi
-                mov     [esp+14h+var_4], ecx
-                mov     ebx, 1
-                mov     edx, 8
-                jmp     short loc_4CFEF0
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CFEF0:                             ; CODE XREF: sub_4CFED0+17j
-                                        ; sub_4CFED0+ADj
-                movzx   ebp, [esp+14h+arg_4]
-                movzx   edi, [esp+14h+arg_8]
-                sub     edx, 1
-                movzx   ecx, dl
-                shr     ebp, cl
-                shr     edi, cl
-                mov     ecx, [esp+14h+var_4]
-                mov     [esp+14h+arg_0], edx
-                mov     edx, [esi+10h]
-                and     ebp, 1
-                lea     eax, [ebp+1]
-                shl     eax, 8
-                add     eax, ebx
-                lea     ecx, [ecx+eax*4]
-                mov     eax, edx
-                shr     eax, 0Bh
-                imul    eax, [ecx]
-                and     edi, 1
-                test    edi, edi
-                jnz     short loc_4CFF41
-                mov     [esi+10h], eax
-                mov     eax, [ecx]
-                mov     edx, 800h
-                sub     edx, eax
-                shr     edx, 5
-                add     edx, eax
-                mov     [ecx], edx
-                jmp     short loc_4CFF58
-; ---------------------------------------------------------------------------
-
-loc_4CFF41:                             ; CODE XREF: sub_4CFED0+5Aj
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     edx, eax
-                mov     [esi+10h], edx
-                mov     eax, [ecx]
-                mov     edx, eax
-                shr     edx, 5
-                sub     eax, edx
-                mov     [ecx], eax
-
-loc_4CFF58:                             ; CODE XREF: sub_4CFED0+6Fj
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFF6F
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4CFF6F:                             ; CODE XREF: sub_4CFED0+90j
-                mov     edx, [esp+14h+arg_0]
-                add     ebx, ebx
-                or      ebx, edi
-                cmp     ebp, edi
-                jnz     short loc_4CFF8B
-                test    edx, edx
-                jnz     loc_4CFEF0
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CFF8B:                             ; CODE XREF: sub_4CFED0+A9j
-                test    edx, edx
-                jz      loc_4D0012
-
-loc_4CFF93:                             ; CODE XREF: sub_4CFED0+140j
-                movzx   edi, [esp+14h+arg_8]
-                mov     ebp, [esp+14h+var_4]
-                sub     edx, 1
-                mov     cl, dl
-                shr     edi, cl
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebp+ebx*4+0]
-                and     edi, 1
-                test    edi, edi
-                mov     [esp+14h+arg_0], edx
-                jnz     short loc_4CFFD4
-                mov     [esi+10h], eax
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebp+ebx*4+0], ecx
-                jmp     short loc_4CFFEF
-; ---------------------------------------------------------------------------
-
-loc_4CFFD4:                             ; CODE XREF: sub_4CFED0+E9j
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [ebp+ebx*4+0], eax
-
-loc_4CFFEF:                             ; CODE XREF: sub_4CFED0+102j
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D000A
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-                mov     edx, [esp+14h+arg_0]
-
-loc_4D000A:                             ; CODE XREF: sub_4CFED0+127j
-                add     ebx, ebx
-                or      ebx, edi
-                test    edx, edx
-                jnz     short loc_4CFF93
-
-loc_4D0012:                             ; CODE XREF: sub_4CFED0+BDj
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn    0Ch
-sub_4CFED0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4D0020      proc near               ; CODE XREF: sub_4D0770+C6p
-                                        ; CEncoder_CodeOneBlock+56Dp ...
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                push    ebp
-                mov     ebp, [esp+4+arg_4]
-                cmp     ebp, 8
-                push    esi
-                mov     esi, [esp+8+arg_0]
-                push    edi
-                mov     edi, ecx
-                jnb     short loc_4D007D
-                mov     eax, [esi+10h]
-                shr     eax, 0Bh
-                imul    eax, [edi]
-                mov     [esi+10h], eax
-                mov     eax, [edi]
-                mov     ecx, 800h
-                sub     ecx, eax
-
-loc_4D0047:                             ; DATA XREF: .rdata:0050C3BCo
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [edi], ecx
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0065
-                shl     eax, 8
-
-loc_4D005B:                             ; DATA XREF: .rdata:005064B0o
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4D0065:                             ; CODE XREF: sub_4D0020+36j
-                mov     edx, [esp+0Ch+arg_8]
-                push    ebp
-                shl     edx, 5
-                push    esi
-                lea     ecx, [edx+edi+8]
-                call    sub_4CFB20
-                pop     edi
-                pop     esi
-                pop     ebp
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4D007D:                             ; CODE XREF: sub_4D0020+10j
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [edi]
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [edi]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edi], eax
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D00B6
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4D00B6:                             ; CODE XREF: sub_4D0020+87j
-                cmp     ebp, 10h
-                jnb     short loc_4D010F
-                mov     edx, [esi+10h]
-                shr     edx, 0Bh
-                imul    edx, [edi+4]
-                mov     [esi+10h], edx
-                mov     eax, [edi+4]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [edi+4], ecx
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D00F1
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4D00F1:                             ; CODE XREF: sub_4D0020+C2j
-                mov     edx, [esp+0Ch+arg_8]
-                add     ebp, 0FFFFFFF8h
-                push    ebp
-                shl     edx, 5
-                push    esi
-                lea     ecx, [edx+edi+208h]
-                call    sub_4CFB20
-                pop     edi
-                pop     esi
-                pop     ebp
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4D010F:                             ; CODE XREF: sub_4D0020+99j
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [edi+4]
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [edi+4]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edi+4], eax
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D014B
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4D014B:                             ; CODE XREF: sub_4D0020+11Cj
-                add     ebp, 0FFFFFFF0h
-                push    ebp
-                push    esi
-                lea     ecx, [edi+408h]
-                call    sub_4CFBC0
-                pop     edi
-                pop     esi
-                pop     ebp
-                retn    0Ch
-sub_4D0020      endp
-
-; =============== S U B R O U T I N E =======================================
-
-NCompress_NLZMA_CEncoder_CEncoder      proc near               ; CODE XREF: Compress_lzma_internal+149p
-                mov     eax, ecx
-                mov     dword ptr [eax+4], offset ICompressSetOutStream_vftable
-                mov     dword ptr [eax+8], offset ICompressSetCoderProperties_vftable
-                mov     dword ptr [eax+0Ch], offset ICompressWriteCoderProperties_vftable
-                xor     ecx, ecx
-                mov     [eax+24h], ecx
-                mov     dword ptr [eax], offset NCompress_NLZMA_CEncoder_vftable
-                mov     dword ptr [eax+4], offset NCompress_NLZMA_CEncoder_vftable_ICompressSetOutStream
-                mov     dword ptr [eax+8], offset NCompress_NLZMA_CEncoder_vftable_ICompressSetCoderProperties
-                mov     dword ptr [eax+0Ch], offset NCompress_NLZMA_CEncoder_vftable_ICompressWriteCoderProperties
-                mov     [eax+40h], ecx
-                mov     [eax+44h], ecx
-                mov     [eax+54h], ecx
-                mov     [eax+60h], ecx
-                mov     [eax+32650h], ecx
-                mov     dword ptr [eax+32EF8h], 20h
-                mov     dword ptr [eax+33B58h], 2Ch
-                mov     dword ptr [eax+33B5Ch], 2
-                mov     [eax+33B64h], ecx
-                mov     dword ptr [eax+33B6Ch], 00400000h
-                mov     edx, 3
-                mov     [eax+33B60h], edx
-                mov     [eax+33B68h], edx
-                mov     [eax+33B8Ch], ecx
-                mov     [eax+33B90h], ecx
-                mov     [eax+33B94h], cl
-                mov     [eax+0B4h], ecx
-                mov     [eax+0A4h], ecx
-                mov     dword ptr [eax+0B0h], 20h
-                mov     dword ptr [eax+0D4h], 1
-                mov     dword ptr [eax+0CCh], 4
-                mov     [eax+0D0h], ecx
-                mov     [eax+0D8h], ecx
-                mov     [eax+32EF4h], cl
-                retn
-NCompress_NLZMA_CEncoder_CEncoder      endp
-
-; =============== S U B R O U T I N E =======================================
-
-; int __thiscall sub_4D0250(void *Memory, char)
-sub_4D0250      proc near               ; DATA XREF: .rdata:00517B0Co
-
-arg_0           = byte ptr  4
-
-                push    esi
-                mov     esi, ecx
-                call    sub_4CF810
-                test    [esp+4+arg_0], 1
-                jz      short loc_4D0268
-                push    esi             ; Memory
-                call    j__free
-                add     esp, 4
-
-loc_4D0268:                             ; CODE XREF: sub_4D0250+Dj
-                mov     eax, esi
-                pop     esi
-                retn    4
-sub_4D0250      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4D0270      proc near               ; CODE XREF: CEncoder_SetStreams+14p
-                push    esi
-                mov     esi, ecx
-                mov     eax, [esi+40h]
-                test    eax, eax
-                push    edi
-                mov     edi, 100000h
-                jz      short loc_4D0297
-                cmp     [esi+50h], edi
-                jz      short loc_4D02C5
-                test    eax, eax
-                jz      short loc_4D0297
-                push    8000h           ; dwFreeType
-                push    0               ; dwSize
-                push    eax             ; lpAddress
-                call    ds:VirtualFree
-
-loc_4D0297:                             ; CODE XREF: sub_4D0270+Ej
-                                        ; sub_4D0270+17j
-                push    4               ; flProtect
-                push    1000h           ; flAllocationType
-                push    edi             ; dwSize
-                push    0               ; lpAddress
-                mov     dword ptr [esi+40h], 0
-                mov     [esi+50h], edi
-                call    ds:VirtualAlloc
-                test    eax, eax
-                mov     [esi+40h], eax
-                setnz   al
-                test    al, al
-                jnz     short loc_4D02C5
-                pop     edi
-                mov     eax, 8007000Eh
-                pop     esi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4D02C5:                             ; CODE XREF: sub_4D0270+13j
-                                        ; sub_4D0270+4Bj
-                mov     eax, [esi+33B68h]
-                mov     ecx, [esi+33B64h]
-                cmp     dword ptr [esi+0D4h], 0
-                push    ebx
-                push    eax
-                push    ecx
-                lea     ecx, [esi+32650h]
-                setnz   bl
-                call    sub_4CD940
-                test    al, al
-                jz      short loc_4D034F
-                mov     ecx, [esi+33B6Ch]
-                mov     edx, 1000000h
-                cmp     edx, ecx
-                sbb     eax, eax
-                neg     eax
-                push    ebp
-                mov     ebp, [esi+32EF8h]
-                mov     [esi+0D8h], eax
-                mov     eax, ebp
-                shr     eax, 1
-                add     eax, 10h
-                test    bl, bl
-                jnz     short loc_4D0318
-                shr     eax, 1
-
-loc_4D0318:                             ; CODE XREF: sub_4D0270+A4j
-                mov     edx, [esi+33B90h]
-                test    edx, edx
-                jz      short loc_4D0324
-                mov     eax, edx
-
-loc_4D0324:                             ; CODE XREF: sub_4D0270+B0j
-                push    offset off_546E20
-                push    111h
-                push    ebp
-                push    1000h
-                push    ecx
-                lea     edi, [esi+84h]
-                push    edi
-                mov     [esi+0B0h], eax
-                call    sub_4CBA60
-                add     esp, 18h
-                test    eax, eax
-                pop     ebp
-                jnz     short loc_4D0358
-
-loc_4D034F:                             ; CODE XREF: sub_4D0270+7Bj
-                pop     ebx
-                pop     edi
-                mov     eax, 8007000Eh
-                pop     esi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4D0358:                             ; CODE XREF: sub_4D0270+DDj
-                mov     [esi+80h], edi
-                add     esi, 68h
-                push    esi
-                push    edi
-                call    sub_4CCAA0
-                add     esp, 8
-                pop     ebx
-                pop     edi
-                xor     eax, eax
-                pop     esi
-                retn
-sub_4D0270      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-CEncoder_SetStreams proc near           ; CODE XREF: CEncoder_CodeReal+4Ap
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                mov     eax, [esp+arg_0]
-                push    esi
-                mov     esi, ecx
-                mov     [esi+33B84h], eax
-                mov     byte ptr [esi+33B80h], 0
-                call    sub_4D0270
-                test    eax, eax
-                jnz     loc_4D0441
-                mov     edx, [esp+4+arg_4]
-                mov     ecx, [esi+4]
-                lea     eax, [esi+4]
-                push    edx
-                push    eax
-                mov     eax, [ecx+0Ch]
-                call    eax
-                test    eax, eax
-                jnz     loc_4D0441
-                mov     ecx, esi
-                call    sub_4CDEA0
-                test    eax, eax
-                jnz     short loc_4D0441
-                cmp     [esi+32EF4h], al
-                jnz     short loc_4D03DB
-                mov     ecx, esi
-                call    CEncoder_FillDistancesPrices
-                mov     ecx, esi
-                call    CEncoder_FillAlignPrices
-
-loc_4D03DB:                             ; CODE XREF: CEncoder_SetStreams+4Bj
-                mov     ecx, [esi+32EF8h]
-                sub     ecx, 1
-                mov     [esi+2D9C0h], ecx
-                mov     ecx, [esi+33B5Ch]
-                mov     edx, 1
-                shl     edx, cl
-                lea     ecx, [esi+28DB8h]
-                push    edx
-                call    sub_4CF780
-                mov     ecx, [esi+33B5Ch]
-                mov     eax, [esi+32EF8h]
-                mov     edx, 1
-                shl     edx, cl
-                sub     eax, 1
-                lea     ecx, [esi+2DA04h]
-                mov     [esi+3260Ch], eax
-                push    edx
-                call    sub_4CF780
-                mov     dword ptr [esi+33B78h], 0
-                mov     dword ptr [esi+33B7Ch], 0
-                xor     eax, eax
-
-loc_4D0441:                             ; CODE XREF: CEncoder_SetStreams+1Bj
-                                        ; CEncoder_SetStreams+34j ...
-                pop     esi
-                retn    10h
-CEncoder_SetStreams endp
-
-;Compress_lzma_internal proc near        ; CODE XREF: Compress_lzma+34p
-_starcraft_compress_lzma proc near        ; CODE XREF: Compress_lzma+34p
-; sub_4D0450
-
-var_58          = dword ptr -58h
-var_54          = dword ptr -54h
-var_50          = dword ptr -50h
-var_4C          = dword ptr -4Ch
-var_48          = dword ptr -48h
-var_44          = dword ptr -44h
-var_40          = dword ptr -40h
-var_3C          = word ptr -3Ch
-var_34          = dword ptr -34h
-var_2C          = word ptr -2Ch
-var_24          = dword ptr -24h
-var_1C          = dword ptr -1Ch
-var_14          = dword ptr -14h
-var_C           = dword ptr -0Ch
-var_4           = dword ptr -4
-pbInBuffer      = dword ptr  4
-cbInBuffer      = dword ptr  8
-pcbInBuffer     = dword ptr  0Ch
-pbOutBuffer     = dword ptr  10h
-cbOutBuffer     = dword ptr  14h
-dummy           = dword ptr  18h
-pcbOutBuffer    = dword ptr  1Ch
-pfnAllocateMemory= dword ptr  20h
-pfnFreeMemory   = dword ptr  24h
-pfnGiveData     = dword ptr  28h
-
-                push    0FFFFFFFFh
-                push    offset loc_4DA0FB
-                mov     eax, dword ptr fs:[0]
-                push    eax
-                sub     esp, 4Ch
-                push    ebx
-                push    ebp
-                push    esi
-                push    edi
-                mov     eax, dword_544960
-                xor     eax, esp
-                push    eax
-                lea     eax, [esp+6Ch+var_C]
-                mov     dword ptr fs:[0], eax   
-                mov     eax, dword_553598
-                xor     ebx, ebx
-                cmp     eax, ebx
-                jnz     short loc_4D04A1
-                push    0Ch             ; Size
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                cmp     eax, ebx
-                jz      short loc_4D049A
-                mov     [eax], ebx
-                mov     [eax+4], ebx
-                mov     [eax+8], ebx
-                jmp     short loc_4D049C
-; ---------------------------------------------------------------------------
-
-loc_4D049A:                             ; CODE XREF: Compress_lzma_internal+3Ej
-                xor     eax, eax
-
-loc_4D049C:                             ; CODE XREF: Compress_lzma_internal+48j
-                mov     dword ptr dword_553598, eax
-
-loc_4D04A1:                             ; CODE XREF: Compress_lzma_internal+30j
-                cmp     [eax], ebx
-                jnz     short loc_4D04B3
-                mov     ecx, [esp+6Ch+pfnAllocateMemory]
-                mov     [eax], ecx
-                mov     eax, dword_553598
-
-loc_4D04B3:                             ; CODE XREF: Compress_lzma_internal+53j
-                cmp     eax, ebx
-                jnz     short loc_4D04D6
-                push    0Ch             ; Size
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                cmp     eax, ebx
-                jz      short loc_4D04CF
-                mov     [eax], ebx
-                mov     [eax+4], ebx
-                mov     [eax+8], ebx
-                jmp     short loc_4D04D1
-; ---------------------------------------------------------------------------
-
-loc_4D04CF:                             ; CODE XREF: Compress_lzma_internal+73j
-                xor     eax, eax
-
-loc_4D04D1:                             ; CODE XREF: Compress_lzma_internal+7Dj
-                mov     dword_553598, eax
-
-loc_4D04D6:                             ; CODE XREF: Compress_lzma_internal+65j
-                cmp     [eax+4], ebx
-                jnz     short loc_4D04EA
-                mov     edx, [esp+6Ch+pfnFreeMemory]
-                mov     [eax+4], edx
-                mov     eax, dword_553598
-
-loc_4D04EA:                             ; CODE XREF: Compress_lzma_internal+89j
-                cmp     [eax+8], ebx
-                jnz     short loc_4D04F9
-                mov     ecx, [esp+6Ch+pfnGiveData]
-                mov     [eax+8], ecx
-
-loc_4D04F9:                             ; CODE XREF: Compress_lzma_internal+9Dj
-                mov     edx, [esp+6Ch+pcbOutBuffer]
-                mov     ebp, [esp+6Ch+pcbInBuffer]
-                cmp     ebp, ebx
-                mov     esi, [esp+6Ch+cbInBuffer]
-                mov     [edx], ebx
-                mov     edx, 1
-                mov     eax, esi
-                mov     ecx, ebp
-                ja      short loc_4D0520
-                cmp     esi, ebx
-                jbe     short loc_4D053A
-                jmp     short loc_4D0520
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4D0520:                             ; CODE XREF: Compress_lzma_internal+C5j
-                                        ; Compress_lzma_internal+CBj ...
-                shrd    eax, ecx, 1
-                add     edx, edx
-                shr     ecx, 1
-                cmp     edx, 2000000h
-                ja      short loc_4D053A
-                cmp     ecx, ebx
-                ja      short loc_4D0520
-                jb      short loc_4D053A
-                cmp     eax, ebx
-                ja      short loc_4D0520
-
-loc_4D053A:                             ; CODE XREF: Compress_lzma_internal+C9j
-                                        ; Compress_lzma_internal+DEj ...
-                mov     eax, 13h
-                push    33B98h          ; Size
-                mov     [esp+70h+var_48], 470h
-                mov     [esp+70h+var_44], 400h
-                mov     [esp+70h+var_40], 450h
-                mov     [esp+70h+var_3C], ax
-                mov     [esp+70h+var_2C], ax
-                mov     word ptr [esp+70h+var_1C], ax
-                mov     [esp+70h+var_34], 2
-                mov     [esp+70h+var_24], edx
-                mov     [esp+70h+var_14], 40h
-                mov     [esp+70h+var_58], ebx
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                mov     [esp+6Ch+var_4C], eax
-                cmp     eax, ebx
-                mov     [esp+6Ch+var_4], ebx
-                jz      short loc_4D05A4
-                mov     ecx, eax
-                call    NCompress_NLZMA_CEncoder_CEncoder
-                mov     [esp+6Ch+var_54], eax
-                jmp     short loc_4D05AA
-; ---------------------------------------------------------------------------
-
-loc_4D05A4:                             ; CODE XREF: Compress_lzma_internal+145j
-                mov     [esp+6Ch+var_54], ebx
-                mov     eax, ebx
-
-loc_4D05AA:                             ; CODE XREF: Compress_lzma_internal+152j
-                or      edi, 0FFFFFFFFh
-                cmp     eax, ebx
-                mov     [esp+6Ch+var_4], edi
-                jz      short loc_4D05D1
-                mov     ecx, [eax+8]
-                push    3
-                lea     edx, [esp+70h+var_3C]
-                push    edx
-                add     eax, 8
-                lea     edx, [esp+74h+var_48]
-                push    edx
-                push    eax
-                mov     eax, [ecx+0Ch]
-                call    eax             ; ICompressSetCodeProperties::SetCoderProperties
-                test    eax, eax
-                jz      short loc_4D05D5
-
-loc_4D05D1:                             ; CODE XREF: Compress_lzma_internal+163j
-                mov     [esp+6Ch+var_58], edi
-
-loc_4D05D5:                             ; CODE XREF: Compress_lzma_internal+17Fj
-                push    28h             ; Size
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                cmp     eax, ebx
-                jz      short loc_4D060E
-                mov     ecx, [esp+6Ch+pbInBuffer]
-                mov     [eax+4], ebx
-                add     dword ptr [eax+4], 1
-                mov     dword ptr [eax], offset off_517A90
-                mov     [eax+8], ecx
-                mov     [eax+10h], esi
-                mov     [eax+14h], ebp
-                mov     [eax+18h], ebx
-                mov     [eax+1Ch], ebx
-                mov     [eax+20h], bl
-                mov     edi, eax                ; EDI = pInStreamMemory
-                mov     [esp+6Ch+var_50], eax
-                jmp     short loc_4D0614
-; ---------------------------------------------------------------------------
-
-loc_4D060E:                             ; CODE XREF: Compress_lzma_internal+191j
-                xor     edi, edi
-                mov     [esp+6Ch+var_50], edi
-
-loc_4D0614:                             ; CODE XREF: Compress_lzma_internal+1BCj
-                push    28h             ; Size
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                cmp     eax, ebx
-                jz      short loc_4D0657
-                mov     edx, [esp+6Ch+pbOutBuffer]
-                mov     ecx, [esp+6Ch+cbOutBuffer]
-                mov     [eax+4], ebx
-                add     dword ptr [eax+4], 1
-                mov     [eax+8], edx
-                mov     edx, [esp+6Ch+dummy]
-                mov     dword ptr [eax], offset off_517AA4
-                mov     [eax+10h], ecx
-                mov     [eax+14h], edx
-                mov     [eax+18h], ebx
-                mov     [eax+1Ch], ebx
-                mov     [eax+20h], bl
-                mov     esi, eax        ; ESI = pOutStreamMemory
-                jmp     short loc_4D0659
-; ---------------------------------------------------------------------------
-
-loc_4D0657:                             ; CODE XREF: Compress_lzma_internal+1D0j
-                xor     esi, esi
-
-loc_4D0659:                             ; CODE XREF: Compress_lzma_internal+205j
-                cmp     edi, ebx
-                jz      short loc_4D0661
-                cmp     esi, ebx
-                jnz     short loc_4D0669
-
-loc_4D0661:                             ; CODE XREF: Compress_lzma_internal+20Bj
-                mov     [esp+6Ch+var_58], 0FFFFFFFFh
-
-loc_4D0669:                             ; CODE XREF: Compress_lzma_internal+20Fj
-                mov     eax, [esi]      ; EAX = pOutStreamMemory->vftable
-                mov     ecx, [eax+10h]  ; ECX = 
-                push    ebx
-                mov     edi, 1
-                push    edi
-                push    ebx
-                push    esi
-                call    ecx
-                test    eax, eax
-                jz      short loc_4D0681
-                mov     [esp+6Ch+var_58], edi
-
-loc_4D0681:                             ; CODE XREF: Compress_lzma_internal+22Bj
-                mov     eax, [esp+6Ch+var_54]
-                mov     edx, [eax+0Ch]
-                add     eax, 0Ch
-                push    esi
-                push    eax
-                mov     eax, [edx+0Ch]
-                call    eax
-                test    eax, eax
-                jz      short loc_4D069A
-                mov     [esp+6Ch+var_58], edi
-
-loc_4D069A:                             ; CODE XREF: Compress_lzma_internal+244j
-                xor     edi, edi
-                jmp     short loc_4D06A4
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4D06A0:                             ; CODE XREF: Compress_lzma_internal+27Fj
-                mov     ebp, [esp+6Ch+pcbInBuffer]
-
-loc_4D06A4:                             ; CODE XREF: Compress_lzma_internal+24Cj
-                mov     eax, [esp+6Ch+cbInBuffer]
-                push    ebx
-                push    1
-                mov     edx, ebp
-                mov     ecx, edi
-                call    __allshr         ; Microsoft VisualC 2-8/net runtime
-                push    eax
-                mov     eax, [esi]
-                mov     ecx, [eax+10h]
-                push    esi
-                call    ecx
-                test    eax, eax
-                jz      short loc_4D06C9
-                mov     [esp+6Ch+var_58], 1
-
-loc_4D06C9:                             ; CODE XREF: Compress_lzma_internal+26Fj
-                add     edi, 8
-                cmp     edi, 40h
-                jl      short loc_4D06A0
-                mov     ebp, [esp+6Ch+var_54]
-                xor     edi, edi
-                cmp     [esp+6Ch+var_58], ebx
-                jnz     short loc_4D0723
-                mov     eax, [esp+6Ch+var_50]
-                mov     edx, [ebp+0]
-                mov     ecx, [edx+0Ch]
-                push    ebx
-                push    ebx
-                push    ebx
-                push    esi
-                push    eax
-                push    ebp
-                call    ecx
-                mov     ecx, [esi+18h]
-                mov     edi, eax
-                mov     eax, [esi+1Ch]
-                cmp     eax, ebx
-                ja      short loc_4D0700
-                cmp     ecx, 0FFFFFFFFh
-                jbe     short loc_4D0709
-
-loc_4D0700:                             ; CODE XREF: Compress_lzma_internal+2A9j
-                or      ecx, 0FFFFFFFFh
-                mov     [esp+6Ch+pcbInBuffer], ebx
-                jmp     short loc_4D070D
-; ---------------------------------------------------------------------------
-
-loc_4D0709:                             ; CODE XREF: Compress_lzma_internal+2AEj
-                mov     [esp+6Ch+pcbInBuffer], eax
-
-loc_4D070D:                             ; CODE XREF: Compress_lzma_internal+2B7j
-                mov     edx, [esp+6Ch+pcbOutBuffer]
-                mov     [edx], ecx
-                cmp     [esi+20h], bl
-                jz      short loc_4D0723
-                mov     [esp+6Ch+var_58], 1
-
-loc_4D0723:                             ; CODE XREF: Compress_lzma_internal+28Bj
-                                        ; Compress_lzma_internal+2C9j
-                mov     eax, [esp+6Ch+var_50]
-                cmp     eax, ebx
-                jz      short loc_4D0733
-                mov     ecx, [eax]
-                mov     edx, [ecx+8]
-                push    eax
-                call    edx
-
-loc_4D0733:                             ; CODE XREF: Compress_lzma_internal+2D9j
-                mov     eax, [esi]
-                mov     ecx, [eax+8]
-                push    esi
-                call    ecx
-                mov     edx, [ebp+0]
-                mov     eax, [edx+10h]
-                push    1
-                mov     ecx, ebp
-                call    eax
-                mov     eax, [esp+6Ch+var_58]
-                cmp     eax, ebx
-                jnz     short loc_4D0755
-                neg     edi
-                sbb     edi, edi
-                mov     eax, edi
-
-loc_4D0755:                             ; CODE XREF: Compress_lzma_internal+2FDj
-                mov     ecx, [esp+6Ch+var_C]
-                mov     dword ptr fs:[0], ecx
-                pop     ecx
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                add     esp, 58h
-                retn
-_starcraft_compress_lzma endp
-;Compress_lzma_internal endp
-
-; =============== S U B R O U T I N E =======================================
-
-Compress_lzma   proc near               ; DATA XREF: .rdata:00509684o
-
-pbOutBuffer     = dword ptr  4
-pcbOutBuffer    = dword ptr  8
-pbInBuffer      = dword ptr  0Ch
-cbInBuffer      = dword ptr  10h
-
-                push    esi
-                push    edi
-;                call    sub_47F198
-                mov     esi, [esp+8+pcbOutBuffer] ; ESI = pcbOutBuffer
-                mov     edi, [esp+8+cbInBuffer] ; EDI = cbInBuffer
-;                push    offset GiveDataToCompress
-;                push    offset FreeMemory_47F3AB
-;                push    offset AllocateMemory_47F396
-                push    esi             ; pcbOutBuffer
-                push    0
-                mov     [eax+493E0h], eax
-                push    dword ptr [esi] ; cbOutBuffer
-                push    [esp+20h+pbOutBuffer] ; pbOutBuffer
-                push    0
-                push    edi             ; cbInBuffer
-                push    [esp+2Ch+pbInBuffer] ; pbInBuffer
-;                call    Compress_lzma_internal
-                add     esp, 28h
-                sub     eax, 0
-                jz      short loc_47F401
-                mov     [esi], edi
-                dec     eax
-
-loc_47F401:                             ; CODE XREF: Compress_lzma+3Fj
-                pop     edi
-                pop     esi
-                retn
-Compress_lzma  endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4D0770      proc near               ; CODE XREF: CEncoder_Flush+1Ap
-
-arg_0           = dword ptr  4
-
-                push    edi
-                mov     edi, ecx
-                cmp     byte ptr [edi+33B94h], 0
-                jz      loc_4D0881
-                movzx   eax, byte ptr [edi+10h]
-                mov     ecx, [edi+38h]
-                shl     eax, 4
-                push    ebx
-                mov     ebx, [esp+8+arg_0]
-                add     eax, ebx
-                lea     edx, [edi+eax*4+280F0h]
-                push    ebp
-                push    esi
-                lea     esi, [edi+28h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [edx]
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [edx]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edx], eax
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D07D3
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4D07D3:                             ; CODE XREF: sub_4D0770+54j
-                movzx   edx, byte ptr [edi+10h]
-                mov     ecx, [esi+10h]
-                lea     eax, [edi+edx*4+283F0h]
-                shr     ecx, 0Bh
-                imul    ecx, [eax]
-                mov     [esi+10h], ecx
-                mov     ecx, [eax]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 5
-                add     edx, ecx
-                mov     [eax], edx
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0811
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4D0811:                             ; CODE XREF: sub_4D0770+92j
-                movzx   eax, byte ptr [edi+10h]
-                mov     cl, ds:kMatchNextStates[eax]
-                push    ebx
-                mov     [edi+10h], cl
-                cmp     byte ptr [edi+32EF4h], 0
-                push    0
-                lea     ebp, [edi+28DB8h]
-                push    esi
-                mov     ecx, ebp
-                setz    byte ptr [esp+1Ch+arg_0]
-                call    sub_4D0020
-                cmp     byte ptr [esp+10h+arg_0], 0
-                jz      short loc_4D0854
-                add     dword ptr [ebp+ebx*4+4C0Ch], 0FFFFFFFFh
-                jnz     short loc_4D0854
-                push    ebx
-                mov     ecx, ebp
-                call    sub_4CF740
-
-loc_4D0854:                             ; CODE XREF: sub_4D0770+D0j
-                                        ; sub_4D0770+DAj
-                push    3Fh
-                push    esi
-                lea     ecx, [edi+287B0h]
-                call    sub_4CFC60
-                push    1Ah
-                push    3FFFFFFh
-                mov     ecx, esi
-                call    sub_4CF6E0
-                push    0Fh
-                push    esi
-                lea     ecx, [edi+28D78h]
-                call    sub_4CFD00
-                pop     esi
-                pop     ebp
-                pop     ebx
-
-loc_4D0881:                             ; CODE XREF: sub_4D0770+Aj
-                pop     edi
-                retn    4
-sub_4D0770      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-CEncoder_Flush  proc near               ; CODE XREF: CEncoder_CodeOneBlock+BAp
-                                        ; CEncoder_CodeOneBlock+1D0p ...
-
-arg_0           = dword ptr  4
-
-                push    esi
-                mov     esi, ecx
-                mov     eax, [esi+0ECh]
-                test    eax, eax
-                jnz     short loc_4D08E5
-                mov     eax, [esi+33B60h]
-                and     eax, [esp+4+arg_0]
-                push    ebx
-                push    edi
-                push    eax
-                call    sub_4D0770
-                lea     ebx, [esi+28h]
-                mov     edi, 5
-
-loc_4D08B7:                             ; CODE XREF: CEncoder_Flush+31j
-                mov     ecx, ebx
-                call    loc_4CF640
-                sub     edi, 1
-                jnz     short loc_4D08B7
-                mov     ecx, [esi+4Ch]
-                add     esi, 40h
-                cmp     ecx, [esi+4]
-                pop     edi
-                pop     ebx
-                jz      short loc_4D08E3
-
-loc_4D08D0:                             ; CODE XREF: CEncoder_Flush+51j
-                mov     ecx, esi
-                call    sub_4CF450
-                test    eax, eax
-                jnz     short loc_4D08E5
-                mov     edx, [esi+0Ch]
-                cmp     edx, [esi+4]
-                jnz     short loc_4D08D0
-
-loc_4D08E3:                             ; CODE XREF: CEncoder_Flush+3Ej
-                xor     eax, eax
-
-loc_4D08E5:                             ; CODE XREF: CEncoder_Flush+Bj
-                                        ; CEncoder_Flush+49j
-                pop     esi
-                retn    4
-CEncoder_Flush  endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-CEncoder_CodeOneBlock proc near         ; CODE XREF: CEncoder_CodeReal+B1p
-                                        ; CEncoder_CodeReal+F5p
-
-var_20          = byte ptr -20h
-var_1C          = dword ptr -1Ch
-var_18          = dword ptr -18h
-var_14          = dword ptr -14h
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                sub     esp, 20h
-                push    ebp
-                push    esi
-                mov     esi, ecx
-                push    edi
-                mov     edi, [esi+33B84h]
-                xor     ebp, ebp
-                cmp     edi, ebp
-                jz      short loc_4D0952
-                mov     eax, [edi]
-                mov     ecx, [eax+4]
-                push    edi
-                call    ecx
-                mov     eax, [esi+33B8Ch]
-                cmp     eax, ebp
-                jz      short loc_4D091E
-                mov     edx, [eax]
-                push    eax
-                mov     eax, [edx+8]
-                call    eax
-
-loc_4D091E:                             ; CODE XREF: CEncoder_CodeOneBlock+24j
-                mov     [esi+33B8Ch], edi
-                mov     ecx, [esi+80h]
-                mov     edx, [esi+68h]
-                lea     eax, [esi+33B88h]
-                push    ecx
-                mov     dword ptr [eax], offset loc_4CF210
-                mov     [esi+0B8h], eax
-                call    edx
-                add     esp, 4
-                mov     byte ptr [esi+33B95h], 1
-                mov     [esi+33B84h], ebp
-
-loc_4D0952:                             ; CODE XREF: CEncoder_CodeOneBlock+12j
-                mov     eax, [esp+2Ch+arg_8]
-                mov     dword ptr [eax], 1
-                cmp     byte ptr [esi+33B80h], 0
-                jz      short loc_4D0974
-                mov     eax, [esi+0ECh]
-                pop     edi
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4D0974:                             ; CODE XREF: CEncoder_CodeOneBlock+73j
-                mov     ecx, [esi+33B78h]
-                or      ecx, [esi+33B7Ch]
-                push    ebx
-                mov     byte ptr [esi+33B80h], 1
-                jnz     loc_4D0A9C
-                mov     edx, [esi+80h]
-                mov     eax, [esi+70h]
-                push    edx
-                call    eax
-                add     esp, 4
-                test    eax, eax
-                jnz     short loc_4D09B9
-                mov     ecx, [esi+33B78h]
-                push    ecx
-                mov     ecx, esi
-                call    CEncoder_Flush
-                pop     ebx
-                pop     edi
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4D09B9:                             ; CODE XREF: CEncoder_CodeOneBlock+AFj
-                lea     edx, [esp+30h+var_4]
-                push    edx
-                mov     ecx, esi
-                call    sub_4CB3B0
-                movzx   ecx, byte ptr [esi+10h]
-                mov     eax, [esi+33B60h]
-                and     eax, [esi+33B78h]
-                mov     edx, [esi+38h]
-                lea     edi, [esi+28h]
-                shl     ecx, 4
-                add     eax, ecx
-                shr     edx, 0Bh
-                imul    edx, [esi+eax*4+280F0h]
-                lea     eax, [esi+eax*4+280F0h]
-                mov     [edi+10h], edx
-                mov     ecx, [eax]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 5
-                add     edx, ecx
-                mov     [eax], edx
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0A1C
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0A1C:                             ; CODE XREF: CEncoder_CodeOneBlock+11Dj
-                movzx   eax, byte ptr [esi+10h]
-                mov     cl, ds:kLiteralNextStates[eax]
-                mov     [esi+10h], cl
-                mov     edx, [esi+32F04h]
-                mov     eax, [esi+80h]
-                mov     ecx, [esi+6Ch]
-                neg     edx
-                push    edx
-                push    eax
-                call    ecx
-                mov     bl, al
-                mov     eax, [esi+32654h]
-                add     esp, 8
-                mov     byte ptr [esp+30h+var_10], bl
-                mov     edx, [esp+30h+var_10]
-                push    edx
-                movzx   edx, byte ptr [esi+11h]
-                push    edi
-                mov     edi, [esi+3265Ch]
-                and     edi, [esi+33B78h]
-                mov     ecx, 8
-                sub     cl, al
-                shr     edx, cl
-                mov     ecx, eax
-                shl     edi, cl
-                add     edx, edi
-                imul    edx, 0C00h
-                add     edx, [esi+32650h]
-                mov     ecx, edx
-                call    sub_4CFE30
-                add     dword ptr [esi+32F04h], 0FFFFFFFFh
-                add     dword ptr [esi+33B78h], 1
-                mov     [esi+11h], bl
-                adc     [esi+33B7Ch], ebp
-
-loc_4D0A9C:                             ; CODE XREF: CEncoder_CodeOneBlock+98j
-                mov     edi, [esi+33B78h]
-                mov     eax, [esi+80h]
-                mov     ecx, [esi+70h]
-                push    eax
-                mov     [esp+34h+var_14], edi
-                mov     [esp+34h+var_4], edi
-                call    ecx
-                add     esp, 4
-                test    eax, eax
-                jnz     short loc_4D0AD4
-                push    edi
-                mov     ecx, esi
-                call    CEncoder_Flush
-                pop     ebx
-                pop     edi
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    0Ch
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4D0AD0:                             ; CODE XREF: CEncoder_CodeOneBlock+735j
-                                        ; CEncoder_CodeOneBlock+78Bj
-                mov     edi, [esp+30h+var_14]
-
-loc_4D0AD4:                             ; CODE XREF: CEncoder_CodeOneBlock+1CBj
-                cmp     byte ptr [esi+32EF4h], 0
-                mov     ecx, esi
-                jz      short loc_4D0AEB
-                lea     edx, [esp+30h+var_1C]
-                push    edx
-                call    CEncoder_GetOptimumFast
-                jmp     short loc_4D0AF6
-; ---------------------------------------------------------------------------
-
-loc_4D0AEB:                             ; CODE XREF: CEncoder_CodeOneBlock+1EDj
-                lea     eax, [esp+30h+var_1C]
-                push    eax
-                push    edi
-                call    CEncoder_GetOptimum
-
-loc_4D0AF6:                             ; CODE XREF: CEncoder_CodeOneBlock+1F9j
-                mov     ebx, [esi+33B60h]
-                and     ebx, edi
-                cmp     eax, 1
-                mov     [esp+30h+var_18], eax
-                jnz     loc_4D0C0E
-                cmp     [esp+30h+var_1C], 0FFFFFFFFh
-                jnz     loc_4D0C0E
-                movzx   ecx, byte ptr [esi+10h]
-                mov     edx, [esi+38h]
-                lea     ebp, [esi+28h]
-                shl     ecx, 4
-                shr     edx, 0Bh
-                add     ecx, ebx
-                imul    edx, [esi+ecx*4+280F0h]
-                lea     eax, [esi+ecx*4+280F0h]
-                mov     [ebp+10h], edx
-                mov     ecx, [eax]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 5
-                add     edx, ecx
-                mov     [eax], edx
-                mov     eax, [ebp+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0B61
-                shl     eax, 8
-                mov     ecx, ebp
-                mov     [ebp+10h], eax
-                call    loc_4CF640
-
-loc_4D0B61:                             ; CODE XREF: CEncoder_CodeOneBlock+262j
-                mov     eax, [esi+32F04h]
-                mov     ecx, [esi+80h]
-                mov     edx, [esi+6Ch]
-                neg     eax
-                push    eax
-                push    ecx
-                call    edx
-                movzx   edi, byte ptr [esi+11h]
-                mov     edx, [esi+3265Ch]
-                and     edx, [esp+38h+var_14]
-                mov     bl, al
-                mov     eax, [esi+32654h]
-                mov     ecx, 8
-                sub     cl, al
-                shr     edi, cl
-                mov     ecx, eax
-                shl     edx, cl
-                add     esp, 8
-                mov     byte ptr [esp+30h+var_10], bl
-                add     edi, edx
-                imul    edi, 0C00h
-                add     edi, [esi+32650h]
-                cmp     byte ptr [esi+10h], 7
-                jnb     short loc_4D0BC3
-                mov     eax, [esp+30h+var_10]
-                push    eax
-                push    ebp
-                mov     ecx, edi
-                call    sub_4CFE30
-                jmp     short loc_4D0BF5
-; ---------------------------------------------------------------------------
-
-loc_4D0BC3:                             ; CODE XREF: CEncoder_CodeOneBlock+2C2j
-                mov     edx, [esi+80h]
-                mov     eax, [esi+6Ch]
-                or      ecx, 0FFFFFFFFh
-                sub     ecx, [esi+14h]
-                sub     ecx, [esi+32F04h]
-                push    ecx
-                push    edx
-                call    eax
-                mov     ecx, [esp+38h+var_10]
-                add     esp, 8
-                mov     byte ptr [esp+30h+var_C], al
-                mov     edx, [esp+30h+var_C]
-                push    ecx
-                push    edx
-                push    ebp
-                mov     ecx, edi
-                call    sub_4CFED0
-
-loc_4D0BF5:                             ; CODE XREF: CEncoder_CodeOneBlock+2D1j
-                movzx   eax, byte ptr [esi+10h]
-                mov     cl, ds:kLiteralNextStates[eax]
-                mov     ebp, [esp+30h+var_18]
-                mov     [esi+10h], cl
-                mov     [esi+11h], bl
-                jmp     loc_4D1013
-; ---------------------------------------------------------------------------
-
-loc_4D0C0E:                             ; CODE XREF: CEncoder_CodeOneBlock+215j
-                                        ; CEncoder_CodeOneBlock+220j
-                movzx   edx, byte ptr [esi+10h]
-                mov     ecx, [esi+38h]
-                lea     edi, [esi+28h]
-                shl     edx, 4
-                mov     eax, ecx
-                shr     eax, 0Bh
-                add     edx, ebx
-                imul    eax, [esi+edx*4+280F0h]
-                add     [edi+8], eax
-                lea     edx, [esi+edx*4+280F0h]
-                mov     ebp, 0
-                adc     [edi+0Ch], ebp
-                sub     ecx, eax
-                mov     [edi+10h], ecx
-                mov     eax, [edx]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edx], eax
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0C63
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0C63:                             ; CODE XREF: CEncoder_CodeOneBlock+364j
-                cmp     [esp+30h+var_1C], 4
-                movzx   edx, byte ptr [esi+10h]
-                mov     ecx, [edi+10h]
-                jnb     loc_4D0E91
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [esi+edx*4+283F0h]
-                add     [edi+8], eax
-                lea     edx, [esi+edx*4+283F0h]
-                adc     [edi+0Ch], ebp
-                sub     ecx, eax
-                mov     [edi+10h], ecx
-                mov     eax, [edx]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edx], eax
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0CB6
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0CB6:                             ; CODE XREF: CEncoder_CodeOneBlock+3B7j
-                mov     eax, [esp+30h+var_1C]
-                cmp     eax, ebp
-                mov     ecx, [edi+10h]
-                jnz     short loc_4D0D24
-                movzx   edx, byte ptr [esi+10h]
-                lea     eax, [esi+edx*4+28420h]
-                shr     ecx, 0Bh
-                imul    ecx, [eax]
-                mov     [edi+10h], ecx
-                mov     ecx, [eax]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 5
-                add     edx, ecx
-                mov     [eax], edx
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0CFC
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0CFC:                             ; CODE XREF: CEncoder_CodeOneBlock+3FDj
-                mov     ebp, [esp+30h+var_18]
-                movzx   ecx, byte ptr [esi+10h]
-                xor     eax, eax
-                cmp     ebp, 1
-                setnz   al
-                shl     ecx, 4
-                add     ecx, ebx
-                lea     ecx, [esi+ecx*4+284B0h]
-                push    eax
-                push    edi
-                call    sub_4CFAC0
-                jmp     loc_4D0E2E
-; ---------------------------------------------------------------------------
-
-loc_4D0D24:                             ; CODE XREF: CEncoder_CodeOneBlock+3CFj
-                mov     edx, [esi+eax*4+14h]
-                movzx   eax, byte ptr [esi+10h]
-                mov     [esp+30h+var_8], edx
-                lea     edx, [esi+eax*4+28420h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [edx]
-                add     [edi+8], eax
-                adc     [edi+0Ch], ebp
-                sub     ecx, eax
-                mov     [edi+10h], ecx
-                mov     eax, [edx]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edx], eax
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0D6C
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0D6C:                             ; CODE XREF: CEncoder_CodeOneBlock+46Dj
-                cmp     [esp+30h+var_1C], 1
-                mov     ecx, [edi+10h]
-                jnz     short loc_4D0DB3
-                movzx   edx, byte ptr [esi+10h]
-                lea     eax, [esi+edx*4+28450h]
-                shr     ecx, 0Bh
-                imul    ecx, [eax]
-                mov     [edi+10h], ecx
-                mov     ecx, [eax]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 5
-                add     edx, ecx
-                mov     [eax], edx
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0E1D
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-                jmp     short loc_4D0E1D
-; ---------------------------------------------------------------------------
-
-loc_4D0DB3:                             ; CODE XREF: CEncoder_CodeOneBlock+484j
-                movzx   eax, byte ptr [esi+10h]
-                lea     edx, [esi+eax*4+28450h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [edx]
-                add     [edi+8], eax
-                adc     [edi+0Ch], ebp
-                sub     ecx, eax
-                mov     [edi+10h], ecx
-                mov     eax, [edx]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edx], eax
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0DF3
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0DF3:                             ; CODE XREF: CEncoder_CodeOneBlock+4F4j
-                mov     ebp, [esp+30h+var_1C]
-                movzx   eax, byte ptr [esi+10h]
-                lea     edx, [ebp-2]
-                push    edx
-                push    edi
-                lea     ecx, [esi+eax*4+28480h]
-                call    sub_4CFAC0
-                cmp     ebp, 3
-                jnz     short loc_4D0E17
-                mov     ecx, [esi+1Ch]
-                mov     [esi+20h], ecx
-
-loc_4D0E17:                             ; CODE XREF: CEncoder_CodeOneBlock+51Fj
-                mov     edx, [esi+18h]
-                mov     [esi+1Ch], edx
-
-loc_4D0E1D:                             ; CODE XREF: CEncoder_CodeOneBlock+4B2j
-                                        ; CEncoder_CodeOneBlock+4C1j
-                mov     eax, [esi+14h]
-                mov     ecx, [esp+30h+var_8]
-                mov     ebp, [esp+30h+var_18]
-                mov     [esi+18h], eax
-                mov     [esi+14h], ecx
-
-loc_4D0E2E:                             ; CODE XREF: CEncoder_CodeOneBlock+42Fj
-                cmp     ebp, 1
-                jnz     short loc_4D0E45
-                movzx   edx, byte ptr [esi+10h]
-                mov     al, ds:kShortRepNextStates[edx]
-                mov     [esi+10h], al
-                jmp     loc_4D0FF5
-; ---------------------------------------------------------------------------
-
-loc_4D0E45:                             ; CODE XREF: CEncoder_CodeOneBlock+541j
-                cmp     byte ptr [esi+32EF4h], 0
-                push    ebx
-                lea     edx, [ebp-2]
-                push    edx
-                lea     ecx, [esi+2DA04h]
-                push    edi
-                setz    [esp+3Ch+var_20]
-                call    sub_4D0020
-                cmp     [esp+30h+var_20], 0
-                jz      short loc_4D0E7F
-                add     dword ptr [esi+ebx*4+32610h], 0FFFFFFFFh
-                lea     ecx, [esi+2DA04h]
-                jnz     short loc_4D0E7F
-                push    ebx
-                call    sub_4CF740
-
-loc_4D0E7F:                             ; CODE XREF: CEncoder_CodeOneBlock+577j
-                                        ; CEncoder_CodeOneBlock+587j
-                movzx   eax, byte ptr [esi+10h]
-                mov     cl, ds:kRepNextStates[eax]
-                mov     [esi+10h], cl
-                jmp     loc_4D0FF5
-; ---------------------------------------------------------------------------
-
-loc_4D0E91:                             ; CODE XREF: CEncoder_CodeOneBlock+37Fj
-                lea     eax, [esi+edx*4+283F0h]
-                shr     ecx, 0Bh
-                imul    ecx, [eax]
-                mov     [edi+10h], ecx
-                mov     ecx, [eax]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 5
-                add     edx, ecx
-                mov     [eax], edx
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0EC8
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0EC8:                             ; CODE XREF: CEncoder_CodeOneBlock+5C9j
-                movzx   eax, byte ptr [esi+10h]
-                mov     cl, ds:kMatchNextStates[eax]
-                mov     eax, [esp+30h+var_18]
-                mov     [esi+10h], cl
-                cmp     byte ptr [esi+32EF4h], 0
-                push    ebx
-                setz    [esp+34h+var_20]
-                add     eax, 0FFFFFFFEh
-                push    eax
-                lea     ebp, [esi+28DB8h]
-                push    edi
-                mov     ecx, ebp
-                call    sub_4D0020
-                cmp     [esp+30h+var_20], 0
-                jz      short loc_4D0F11
-                add     dword ptr [ebp+ebx*4+4C0Ch], 0FFFFFFFFh
-                jnz     short loc_4D0F11
-                push    ebx
-                mov     ecx, ebp
-                call    sub_4CF740
-
-loc_4D0F11:                             ; CODE XREF: CEncoder_CodeOneBlock+60Dj
-                                        ; CEncoder_CodeOneBlock+617j
-                mov     eax, [esp+30h+var_1C]
-                sub     eax, 4
-                cmp     eax, 2000h
-                mov     [esp+30h+var_1C], eax
-                jnb     short loc_4D0F2C
-                movzx   ebp, byte ptr dword_551198[eax]
-                jmp     short loc_4D0F4F
-; ---------------------------------------------------------------------------
-
-loc_4D0F2C:                             ; CODE XREF: CEncoder_CodeOneBlock+631j
-                cmp     eax, 2000000h
-                jnb     short loc_4D0F42
-                shr     eax, 0Ch
-                movzx   ebp, byte ptr dword_551198[eax]
-                add     ebp, 18h
-                jmp     short loc_4D0F4F
-; ---------------------------------------------------------------------------
-
-loc_4D0F42:                             ; CODE XREF: CEncoder_CodeOneBlock+641j
-                shr     eax, 18h
-                movzx   ebp, byte ptr dword_551198[eax]
-                add     ebp, 30h
-
-loc_4D0F4F:                             ; CODE XREF: CEncoder_CodeOneBlock+63Aj
-                                        ; CEncoder_CodeOneBlock+650j
-                mov     eax, [esp+30h+var_18]
-                add     eax, 0FFFFFFFEh
-                cmp     eax, 4
-                jb      short loc_4D0F60
-                mov     eax, 3
-
-loc_4D0F60:                             ; CODE XREF: CEncoder_CodeOneBlock+669j
-                push    ebp
-                shl     eax, 8
-                push    edi
-                lea     ecx, [eax+esi+287B0h]
-                call    sub_4CFC60
-                cmp     ebp, 4
-                jb      short loc_4D0FD1
-                mov     ebx, [esp+30h+var_1C]
-                mov     ecx, ebp
-                mov     eax, ebp
-                and     eax, 1
-                shr     ecx, 1
-                sub     ecx, 1
-                or      eax, 2
-                shl     eax, cl
-                sub     ebx, eax
-                cmp     ebp, 0Eh
-                jnb     short loc_4D0FA9
-                push    ebx
-                push    ecx
-                sub     eax, ebp
-                lea     edx, [esi+eax*4+28BACh]
-                push    edi
-                push    edx
-                call    sub_4CFD90
-                add     esp, 10h
-                jmp     short loc_4D0FD1
-; ---------------------------------------------------------------------------
-
-loc_4D0FA9:                             ; CODE XREF: CEncoder_CodeOneBlock+6A0j
-                add     ecx, 0FFFFFFFCh
-                push    ecx
-                mov     eax, ebx
-                shr     eax, 4
-                push    eax
-                mov     ecx, edi
-                call    sub_4CF6E0
-                and     ebx, 0Fh
-                push    ebx
-                push    edi
-                lea     ecx, [esi+28D78h]
-                call    sub_4CFD00
-                add     dword ptr [esi+33B54h], 1
-
-loc_4D0FD1:                             ; CODE XREF: CEncoder_CodeOneBlock+684j
-                                        ; CEncoder_CodeOneBlock+6B7j
-                mov     ecx, [esi+1Ch]
-                mov     edx, [esi+18h]
-                mov     eax, [esi+14h]
-                add     dword ptr [esi+33B70h], 1
-                mov     ebp, [esp+30h+var_18]
-                mov     [esi+20h], ecx
-                mov     ecx, [esp+30h+var_1C]
-                mov     [esi+1Ch], edx
-                mov     [esi+18h], eax
-                mov     [esi+14h], ecx
-
-loc_4D0FF5:                             ; CODE XREF: CEncoder_CodeOneBlock+550j
-                                        ; CEncoder_CodeOneBlock+59Cj
-                mov     eax, [esi+80h]
-                mov     ecx, [esi+6Ch]
-                mov     edx, ebp
-                sub     edx, [esi+32F04h]
-                sub     edx, 1
-                push    edx
-                push    eax
-                call    ecx
-                add     esp, 8
-                mov     [esi+11h], al
-
-loc_4D1013:                             ; CODE XREF: CEncoder_CodeOneBlock+319j
-                sub     [esi+32F04h], ebp
-                mov     eax, [esi+32F04h]
-                add     [esp+30h+var_14], ebp
-                test    eax, eax
-                jnz     loc_4D0AD0
-                cmp     [esi+32EF4h], al
-                jnz     short loc_4D1056
-                cmp     dword ptr [esi+33B70h], 80h
-                jb      short loc_4D1046
-                mov     ecx, esi
-                call    CEncoder_FillDistancesPrices
-
-loc_4D1046:                             ; CODE XREF: CEncoder_CodeOneBlock+74Dj
-                cmp     dword ptr [esi+33B54h], 10h
-                jb      short loc_4D1056
-                mov     ecx, esi
-                call    CEncoder_FillAlignPrices
-
-loc_4D1056:                             ; CODE XREF: CEncoder_CodeOneBlock+741j
-                                        ; CEncoder_CodeOneBlock+75Dj
-                mov     edx, [esi+80h]
-                mov     eax, [esi+70h]
-                push    edx
-                call    eax
-                add     esp, 4
-                test    eax, eax
-                mov     eax, [esp+30h+var_14]
-                jz      short loc_4D10D7
-                mov     ecx, [esp+30h+var_4]
-                mov     edx, eax
-                sub     edx, ecx
-                cmp     edx, 4000h
-                jb      loc_4D0AD0
-                sub     eax, ecx
-                add     [esi+33B78h], eax
-                mov     ecx, [esi+33B78h]
-                mov     eax, [esp+30h+arg_0]
-                adc     dword ptr [esi+33B7Ch], 0
-                mov     [eax], ecx
-                mov     edx, [esi+33B7Ch]
-                lea     ecx, [esi+28h]
-                mov     [eax+4], edx
-                call    sub_4CD8B0
-                mov     ecx, [esp+30h+arg_4]
-                mov     [ecx], eax
-                mov     eax, [esp+30h+arg_8]
-                mov     [ecx+4], edx
-                pop     ebx
-                mov     byte ptr [esi+33B80h], 0
-                pop     edi
-                mov     dword ptr [eax], 0
-                mov     eax, [esi+0ECh]
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4D10D7:                             ; CODE XREF: CEncoder_CodeOneBlock+77Bj
-                push    eax
-                mov     ecx, esi
-                call    CEncoder_Flush
-                pop     ebx
-                pop     edi
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    0Ch
-CEncoder_CodeOneBlock endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-CEncoder_CodeReal proc near             ; CODE XREF: CEncoder_Code+49p
-
-var_20          = dword ptr -20h
-processedOutSize= byte ptr -1Ch
-processedInSize = byte ptr -14h
-var_C           = dword ptr -0Ch
-var_4           = dword ptr -4
-inStream        = dword ptr  4
-outStream       = dword ptr  8
-inSize          = dword ptr  0Ch
-outSize         = dword ptr  10h
-progress        = dword ptr  14h
-
-                push    0FFFFFFFFh
-                push    offset loc_4DA128
-                mov     eax, dword ptr fs:[0]
-                push    eax
-                sub     esp, 14h
-                push    ebp
-                push    esi
-                push    edi
-                mov     eax, dword_544960
-                xor     eax, esp
-                push    eax
-                lea     eax, [esp+30h+var_C]
-                mov     dword ptr fs:[0], eax
-                mov     esi, ecx
-                mov     [esp+30h+var_20], esi
-                mov     eax, [esp+30h+outSize]
-                mov     ecx, [esp+30h+inSize]
-                mov     edx, [esp+30h+outStream]
-                push    eax
-                mov     eax, [esp+34h+inStream]
-                push    ecx
-                push    edx
-                push    eax
-                mov     ecx, esi
-                mov     [esp+40h+var_4], 0
-                call    CEncoder_SetStreams
-                mov     edi, eax
-                test    edi, edi
-                jz      short loc_4D1190
-                cmp     dword ptr [esi+80h], 0
-                mov     [esp+30h+var_4], 0FFFFFFFFh
-                jz      short loc_4D1166
-                cmp     byte ptr [esi+33B95h], 0
-                jz      short loc_4D1166
-                mov     byte ptr [esi+33B95h], 0
-
-loc_4D1166:                             ; CODE XREF: CEncoder_CodeReal+64j
-                                        ; CEncoder_CodeReal+6Dj
-                mov     eax, [esi+33B8Ch]
-                test    eax, eax
-                jz      short loc_4D1182
-                mov     ecx, [eax]
-                mov     edx, [ecx+8]
-                push    eax
-                call    edx
-                mov     dword ptr [esi+33B8Ch], 0
-
-loc_4D1182:                             ; CODE XREF: CEncoder_CodeReal+7Ej
-                mov     ecx, [esi+4]
-                mov     edx, [ecx+10h]
-                lea     eax, [esi+4]
-                push    eax
-                call    edx
-                jmp     short loc_4D1201
-; ---------------------------------------------------------------------------
-
-loc_4D1190:                             ; CODE XREF: CEncoder_CodeReal+53j
-                lea     eax, [esp+30h+outSize]
-                push    eax
-                lea     ecx, [esp+34h+processedOutSize]
-                push    ecx
-                lea     edx, [esp+38h+processedInSize]
-                push    edx
-                mov     ecx, esi
-                call    CEncoder_CodeOneBlock
-                mov     edi, eax
-                test    edi, edi
-                jnz     short loc_4D11F0
-                mov     ebp, [esp+30h+progress]
-
-loc_4D11B0:                             ; CODE XREF: CEncoder_CodeReal+FEj
-                cmp     [esp+30h+outSize], 0
-                jnz     short loc_4D1218
-                test    ebp, ebp
-                jz      short loc_4D11D4
-                mov     eax, [ebp+0]
-                mov     eax, [eax+0Ch]
-                lea     ecx, [esp+30h+processedOutSize]
-                push    ecx
-                lea     edx, [esp+34h+processedInSize]
-                push    edx
-                push    ebp
-                call    eax             ; SetRatioInfo
-                mov     edi, eax
-                test    edi, edi
-                jnz     short loc_4D11F0
-
-loc_4D11D4:                             ; CODE XREF: CEncoder_CodeReal+C9j
-                lea     ecx, [esp+30h+outSize]
-                push    ecx
-                lea     edx, [esp+34h+processedOutSize]
-                push    edx
-                lea     eax, [esp+38h+processedInSize]
-                push    eax
-                mov     ecx, esi
-                call    CEncoder_CodeOneBlock
-                mov     edi, eax
-                test    edi, edi
-                jz      short loc_4D11B0
-
-loc_4D11F0:                             ; CODE XREF: CEncoder_CodeReal+BAj
-                                        ; CEncoder_CodeReal+E2j
-                lea     ecx, [esp+30h+var_20]
-                mov     [esp+30h+var_4], 0FFFFFFFFh
-                call    sub_4CDA70
-
-loc_4D1201:                             ; CODE XREF: CEncoder_CodeReal+9Ej
-                mov     eax, edi
-                mov     ecx, [esp+30h+var_C]
-                mov     dword ptr fs:[0], ecx
-                pop     ecx
-                pop     edi
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    14h
-; ---------------------------------------------------------------------------
-
-loc_4D1218:                             ; CODE XREF: CEncoder_CodeReal+C5j
-                lea     ecx, [esp+30h+var_20]
-                mov     [esp+30h+var_4], 0FFFFFFFFh
-                call    sub_4CDA70
-                xor     eax, eax
-                mov     ecx, [esp+30h+var_C]
-                mov     dword ptr fs:[0], ecx
-                pop     ecx
-                pop     edi
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    14h
-CEncoder_CodeReal endp
-
-; =============== S U B R O U T I N E =======================================
-; Attributes: bp-based frame
-
-CEncoder_Code   proc near               ; DATA XREF: .rdata:00517B08o
-; sub_4D1240
-
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_4           = dword ptr -4
-pThis           = dword ptr  8
-pInStream       = dword ptr  0Ch
-pOutStream      = dword ptr  10h
-pInSize         = dword ptr  14h
-pOutSize        = dword ptr  18h
-progress        = dword ptr  1Ch
-
-                push    ebp
-                mov     ebp, esp
-                push    0FFFFFFFFh
-                push    offset loc_4DA150
-                mov     eax, dword ptr fs:[0]
-                push    eax
-                sub     esp, 8
-                push    ebx
-                push    esi
-                push    edi
-                mov     eax, dword_544960
-                xor     eax, ebp
-                push    eax
-                lea     eax, [ebp+var_C]
-                mov     dword ptr fs:[0], eax
-                mov     [ebp+var_10], esp
-                mov     eax, [ebp+progress]
-                mov     ecx, [ebp+pOutSize]
-                mov     edx, [ebp+pInSize]
-                push    eax
-                mov     eax, [ebp+pOutStream]
-                push    ecx
-                mov     ecx, [ebp+pInStream]
-                push    edx
-                push    eax
-                push    ecx
-                mov     ecx, [ebp+pThis]
-                mov     [ebp+var_4], 0
-                call    CEncoder_CodeReal
-                mov     ecx, [ebp+var_C]
-                mov     dword ptr fs:[0], ecx
-                pop     ecx
-                pop     edi
-                pop     esi
-                pop     ebx
-                mov     esp, ebp
-                pop     ebp
-                retn    18h
-CEncoder_Code   endp
-
-; ---------------------------------------------------------------------------
-
-loc_4DA0FB:                             ; DATA XREF: Compress_lzma_internal+2o
-                mov     edx, [esp+8]
-                lea     eax, [edx-5Ch]
-                mov     ecx, [edx-60h]
-                xor     ecx, eax
-                call    sub_4A0686
-                mov     eax, 0  ; offset dword_526E44
-                int 3;
-;               jmp     ___CxxFrameHandler3
-
-loc_4DA0C9:                             ; DATA XREF: sub_4CF810+2o
-                mov     edx, [esp+8]
-                lea     eax, [edx-0Ch]
-                mov     ecx, [edx-10h]
-                xor     ecx, eax
-                call    sub_4A0686
-                mov     eax, 0  ; offset dword_526E18
-                int 3;
-;               jmp     ___CxxFrameHandler3
-
-loc_4DA128:                             ; DATA XREF: CEncoder_CodeReal+2o
-                mov     edx, [esp+8]
-                lea     eax, [edx-20h]
-                mov     ecx, [edx-24h]
-                xor     ecx, eax
-                call    sub_4A0686
-                mov     eax, 0  ; offset unk_526E70
-                int 3;
-;               jmp     ___CxxFrameHandler3
-
-loc_4DA150:                             ; DATA XREF: CEncoder_Code+5o
-                mov     edx, [esp+8]
-                lea     eax, [edx+0Ch]
-                mov     ecx, [edx-18h]
-                xor     ecx, eax
-                call    sub_4A0686
-                mov     eax, 0  ; offset unk_526ED8
-                int 3;
-;               jmp     ___CxxFrameHandler3
-
-END
diff --git a/dep/StormLibOld/test/starcraft_sparse.asm b/dep/StormLibOld/test/starcraft_sparse.asm
deleted file mode 100644
index 8d710951c..000000000
--- a/dep/StormLibOld/test/starcraft_sparse.asm
+++ /dev/null
@@ -1,387 +0,0 @@
-.686P
-.MODEL FLAT
-ASSUME FS: NOTHING
-.CODE
-
-extrn _memset:PROC
-
-;
-; int starcraft_compress_sparse(char * pbOutBuffer, int * pcbOutLength, char * pbInBuffer, int cbInBuffer);
-;
-
-_starcraft_compress_sparse PROC
-var_C           = dword ptr -0Ch
-var_8           = dword ptr -8
-pbOutBufferEnd  = dword ptr -4
-pbOutBuffer     = dword ptr  8
-pcbOutBuffer    = dword ptr  0Ch
-pbInBuffer      = dword ptr  10h
-cbInBuffer      = dword ptr  14h
-
-                push    ebp
-                mov     ebp, esp
-                sub     esp, 0Ch
-                mov     eax, [ebp+pcbOutBuffer]
-                mov     eax, [eax]
-                mov     edx, [ebp+pbOutBuffer]
-                add     eax, edx
-                mov     [ebp+pbOutBufferEnd], eax
-                mov     eax, [ebp+cbInBuffer]
-                push    edi
-                mov     edi, [ebp+pbInBuffer]
-                add     edx, 4
-                cmp     edx, [ebp+pbOutBufferEnd]
-                lea     ecx, [edi+eax]
-                mov     [ebp+var_C], ecx
-                jnb     loc_466A24
-                push    ebx
-                push    esi
-                mov     esi, [ebp+pbOutBuffer]
-                mov     edx, eax
-                shr     edx, 18h
-                mov     [esi], dl
-                inc     esi
-                mov     edx, eax
-                shr     edx, 10h
-                mov     [esi], dl
-                inc     esi
-                mov     edx, eax
-                shr     edx, 8
-                mov     [esi], dl
-                inc     esi
-                mov     [esi], al
-                lea     eax, [ecx-3]
-                inc     esi
-                cmp     edi, eax
-                jnb     loc_4669FC
-                mov     ebx, 80h
-
-loc_466885:                             ; CODE XREF: Compress_sparse+1CDj
-                and     [ebp+pbInBuffer], 0
-                cmp     edi, ecx
-                mov     eax, edi
-                mov     [ebp+cbInBuffer], edi
-                jnb     short loc_4668B5
-
-loc_466892:                             ; CODE XREF: Compress_sparse+8Aj
-                mov     edx, [ebp+cbInBuffer]
-                cmp     byte ptr [edx], 0
-                jnz     short loc_46689F
-                inc     [ebp+pbInBuffer]
-                jmp     short loc_4668AD
-; ---------------------------------------------------------------------------
-
-loc_46689F:                             ; CODE XREF: Compress_sparse+6Fj
-                cmp     [ebp+pbInBuffer], 3
-                jnb     short loc_4668B5
-                mov     eax, [ebp+cbInBuffer]
-                inc     eax
-                and     [ebp+pbInBuffer], 0
-
-loc_4668AD:                             ; CODE XREF: Compress_sparse+74j
-                inc     [ebp+cbInBuffer]
-                cmp     [ebp+cbInBuffer], ecx
-                jb      short loc_466892
-
-loc_4668B5:                             ; CODE XREF: Compress_sparse+67j
-                                        ; Compress_sparse+7Aj
-                sub     eax, edi
-                mov     [ebp+cbInBuffer], eax
-                jz      loc_466984
-                cmp     eax, 81h
-                jbe     short loc_466901
-                lea     eax, [esi+81h]
-                jmp     short loc_4668D2
-; ---------------------------------------------------------------------------
-
-loc_4668CF:                             ; CODE XREF: Compress_sparse+D6j
-                mov     eax, [ebp+var_8]
-
-loc_4668D2:                             ; CODE XREF: Compress_sparse+A4j
-                cmp     eax, [ebp+pbOutBufferEnd]
-                jnb     loc_466A22
-                push    ebx
-                mov     byte ptr [esi], 0FFh
-                inc     esi
-                inc     eax
-                push    edi
-                push    esi
-                mov     [ebp+var_8], eax
-                call    _memset        ; Microsoft VisualC 2-8/net runtime
-                sub     [ebp+cbInBuffer], ebx
-                add     [ebp+var_8], ebx
-                add     esp, 0Ch
-                add     esi, ebx
-                add     edi, ebx
-                cmp     [ebp+cbInBuffer], 81h
-                ja      short loc_4668CF
-
-loc_466901:                             ; CODE XREF: Compress_sparse+9Cj
-                cmp     [ebp+cbInBuffer], ebx
-                jbe     short loc_466926
-                lea     eax, [esi+2]
-                cmp     eax, [ebp+pbOutBufferEnd]
-                jnb     loc_466A22
-                push    1
-                mov     [esi], bl
-                inc     esi
-                push    edi
-                push    esi
-                call    _memset         ; Microsoft VisualC 2-8/net runtime
-                add     esp, 0Ch
-                inc     esi
-                inc     edi
-                dec     [ebp+cbInBuffer]
-
-loc_466926:                             ; CODE XREF: Compress_sparse+DBj
-                mov     eax, [ebp+cbInBuffer]
-                cmp     eax, 1
-                jb      short loc_466957
-                lea     ecx, [eax+esi+1]
-                cmp     ecx, [ebp+pbOutBufferEnd]
-                jnb     loc_466A22
-                mov     cl, al
-                dec     cl
-                or      cl, bl
-                push    eax
-                mov     [esi], cl
-                inc     esi
-                push    edi
-                push    esi
-                call    _memset         ; Microsoft VisualC 2-8/net runtime
-                add     esi, [ebp+cbInBuffer]
-                add     esp, 0Ch
-                add     edi, [ebp+cbInBuffer]
-                jmp     short loc_466981
-; ---------------------------------------------------------------------------
-
-loc_466957:                             ; CODE XREF: Compress_sparse+103j
-                lea     eax, [esi+2]
-                cmp     eax, [ebp+pbOutBufferEnd]
-                jnb     loc_466A22
-                push    1
-                mov     [esi], bl
-                inc     esi
-                push    edi
-                push    esi
-                call    _memset         ; Microsoft VisualC 2-8/net runtime
-                mov     eax, [ebp+pbInBuffer]
-                mov     ecx, [ebp+cbInBuffer]
-                add     esp, 0Ch
-                lea     eax, [eax+ecx-1]
-                inc     esi
-                inc     edi
-                mov     [ebp+pbInBuffer], eax
-
-loc_466981:                             ; CODE XREF: Compress_sparse+12Cj
-                mov     ecx, [ebp+var_C]
-
-loc_466984:                             ; CODE XREF: Compress_sparse+91j
-                cmp     [ebp+pbInBuffer], 85h
-                jbe     short loc_4669B9
-                lea     eax, [esi+1]
-                mov     [ebp+cbInBuffer], eax
-
-loc_466993:                             ; CODE XREF: Compress_sparse+18Ej
-                mov     eax, [ebp+cbInBuffer]
-                cmp     eax, [ebp+pbOutBufferEnd]
-                jnb     loc_466A22
-                mov     eax, 82h
-                sub     [ebp+pbInBuffer], eax
-                mov     byte ptr [esi], 7Fh
-                inc     esi
-                inc     [ebp+cbInBuffer]
-                add     edi, eax
-                cmp     [ebp+pbInBuffer], 85h
-                ja      short loc_466993
-
-loc_4669B9:                             ; CODE XREF: Compress_sparse+162j
-                cmp     [ebp+pbInBuffer], 82h
-                jbe     short loc_4669D6
-                lea     eax, [esi+1]
-                cmp     eax, [ebp+pbOutBufferEnd]
-                jnb     short loc_466A22
-                mov     byte ptr [esi], 0
-                add     edi, 3
-                sub     [ebp+pbInBuffer], 3
-                mov     esi, eax
-
-loc_4669D6:                             ; CODE XREF: Compress_sparse+197j
-                cmp     [ebp+pbInBuffer], 3
-                jb      short loc_4669F1
-                lea     eax, [esi+1]
-                cmp     eax, [ebp+pbOutBufferEnd]
-                jnb     short loc_466A22
-                mov     dl, byte ptr [ebp+pbInBuffer]
-                sub     dl, 3
-                add     edi, [ebp+pbInBuffer]
-                mov     [esi], dl
-                mov     esi, eax
-
-loc_4669F1:                             ; CODE XREF: Compress_sparse+1B1j
-                lea     eax, [ecx-3]
-                cmp     edi, eax
-                jb      loc_466885
-
-loc_4669FC:                             ; CODE XREF: Compress_sparse+51j
-                cmp     edi, ecx
-                jnb     short loc_466A1A
-                mov     eax, edi
-
-loc_466A02:                             ; CODE XREF: Compress_sparse+1E2j
-                mov     dl, [eax]
-                inc     eax
-                test    dl, dl
-                jnz     short loc_466A27
-                cmp     eax, ecx
-                jb      short loc_466A02
-                lea     eax, [esi+1]
-                cmp     eax, [ebp+pbOutBufferEnd]
-                jnb     short loc_466A22
-                mov     byte ptr [esi], 7Fh
-                mov     esi, eax
-
-loc_466A1A:                             ; CODE XREF: Compress_sparse+1D5j
-                                        ; Compress_sparse+21Cj
-                sub     esi, [ebp+pbOutBuffer]
-                mov     eax, [ebp+pcbOutBuffer]
-                mov     [eax], esi
-
-loc_466A22:                             ; CODE XREF: Compress_sparse+ACj
-                                        ; Compress_sparse+E3j ...
-                pop     esi
-                pop     ebx
-
-loc_466A24:                             ; CODE XREF: Compress_sparse+26j
-                pop     edi
-                leave
-                retn
-; ---------------------------------------------------------------------------
-
-loc_466A27:                             ; CODE XREF: Compress_sparse+1DEj
-                sub     ecx, edi
-                mov     ebx, ecx
-                lea     eax, [ebx+esi+1]
-                cmp     eax, [ebp+pbOutBufferEnd]
-                jnb     short loc_466A22
-                push    ebx
-                mov     byte ptr [esi], 0FFh
-                inc     esi
-                push    edi
-                push    esi
-                call    _memset         ; Microsoft VisualC 2-8/net runtime
-                add     esp, 0Ch
-                add     esi, ebx
-                jmp     short loc_466A1A
-_starcraft_compress_sparse ENDP
-
-;
-; int starcraft_decompress_sparse(char * pbOutBuffer, int * pcbOutLength, char * pbInBuffer, int cbInBuffer);
-;
-
-_starcraft_decompress_sparse PROC
-pbInBufferEnd   = dword ptr -4
-pbOutBuffer     = dword ptr  8
-pcbOutBuffer    = dword ptr  0Ch
-pbInBuffer      = dword ptr  10h
-cbInBuffer      = dword ptr  14h
-
-                push    ebp
-                mov     ebp, esp
-                push    ecx
-                mov     eax, [ebp+pbOutBuffer]
-                push    esi
-                mov     esi, [ebp+pbInBuffer] ; ESI - pbInBuffer
-                mov     [ebp+pbOutBuffer], eax
-                mov     eax, [ebp+cbInBuffer]
-                cmp     eax, 5
-                lea     ecx, [esi+eax]
-                mov     [ebp+pbInBufferEnd], ecx
-                jnb     short loc_466A6A
-                xor     al, al
-                jmp     loc_466AF5
-; ---------------------------------------------------------------------------
-
-loc_466A6A:                             ; CODE XREF: Decompress_sparse+1Aj
-                push    edi
-                movzx   edi, byte ptr [esi]
-                shl     edi, 18h
-                inc     esi
-                movzx   eax, byte ptr [esi]
-                shl     eax, 10h
-                or      edi, eax
-                xor     eax, eax
-                inc     esi
-                mov     ah, [esi]
-                or      edi, eax
-                inc     esi
-                movzx   eax, byte ptr [esi]
-                or      edi, eax
-                mov     eax, [ebp+pcbOutBuffer]
-                inc     esi
-                cmp     esi, ecx
-                mov     [ebp+pbInBuffer], edi ; EDI = cbOutBuffer
-                mov     [eax], edi
-                jnb     short loc_466AF2
-                push    ebx
-
-loc_466A95:                             ; CODE XREF: Decompress_sparse+A8j
-                movzx   eax, byte ptr [esi]
-                inc     esi
-                test    al, al
-                jns     short loc_466AC1
-                and     eax, 7Fh
-                inc     eax             ; AL = (*pbInBuffer & 0x7F) + 1
-                mov     [ebp+cbInBuffer], eax
-                cmp     eax, edi        ; AL < cbOutBuffer ?
-                lea     eax, [ebp+cbInBuffer]
-                jb      short loc_466AAE
-                lea     eax, [ebp+pbInBuffer]
-
-loc_466AAE:                             ; CODE XREF: Decompress_sparse+62j
-                mov     ebx, [eax]
-                push    ebx
-                push    esi
-                push    [ebp+pbOutBuffer]
-                call    _memset         ; Microsoft VisualC 2-8/net runtime
-                add     esp, 0Ch
-                add     esi, ebx
-                jmp     short loc_466AE4
-; ---------------------------------------------------------------------------
-
-loc_466AC1:                             ; CODE XREF: Decompress_sparse+54j
-                and     eax, 7Fh
-                add     eax, 3
-                mov     [ebp+cbInBuffer], eax
-                cmp     eax, edi
-                lea     eax, [ebp+cbInBuffer]
-                jb      short loc_466AD4
-                lea     eax, [ebp+pbInBuffer]
-
-loc_466AD4:                             ; CODE XREF: Decompress_sparse+88j
-                mov     ebx, [eax]
-                push    ebx             ; Size
-                push    0               ; Val
-                push    [ebp+pbOutBuffer] ; Dst
-                call    _memset
-                add     esp, 0Ch
-
-loc_466AE4:                             ; CODE XREF: Decompress_sparse+78j
-                add     [ebp+pbOutBuffer], ebx
-                sub     edi, ebx
-                cmp     esi, [ebp+pbInBufferEnd]
-                mov     [ebp+pbInBuffer], edi
-                jb      short loc_466A95
-                pop     ebx
-
-loc_466AF2:                             ; CODE XREF: Decompress_sparse+4Bj
-                mov     al, 1
-                pop     edi
-
-loc_466AF5:                             ; CODE XREF: Decompress_sparse+1Ej
-                pop     esi
-                leave
-                retn
-_starcraft_decompress_sparse ENDP
-
-END
diff --git a/dep/StormLibOld/test/x86_ripped_code.asm b/dep/StormLibOld/test/x86_ripped_code.asm
deleted file mode 100644
index 4b4be328a..000000000
--- a/dep/StormLibOld/test/x86_ripped_code.asm
+++ /dev/null
@@ -1,1231 +0,0 @@
-.686P
-.MODEL FLAT
-ASSUME FS: NOTHING
-.CODE
-
-extrn _memset:PROC
-extrn _memcpy:PROC
-extrn _memmove:PROC
-
-;------------------------------------------------------------------------------
-; Structures
-;
-
-;------------------------------------------------------------------------------
-; Functions
-;
-
-_aullrem        proc near               ; CODE XREF: sub_6CC140+3Ap
-                                        ; sub_6CC1E0+57p ...
-
-DividendLo      = dword ptr  8
-DividendHi      = dword ptr  0Ch
-DivisorLo       = dword ptr  10h
-DivisorHi       = dword ptr  14h
-
-                push    ebx
-                mov     eax, [esp+DivisorHi]
-                or      eax, eax
-                jnz     short loc_8F8FE1
-                mov     ecx, [esp+DivisorLo]
-                mov     eax, [esp+DividendHi]
-                xor     edx, edx
-                div     ecx
-                mov     eax, [esp+DividendLo]
-                div     ecx
-                mov     eax, edx
-                xor     edx, edx
-                jmp     short loc_8F9031
-; ---------------------------------------------------------------------------
-
-loc_8F8FE1:                             ; CODE XREF: _aullrem+7j
-                mov     ecx, eax
-                mov     ebx, [esp+DivisorLo]
-                mov     edx, [esp+DividendHi]
-                mov     eax, [esp+DividendLo]
-
-loc_8F8FEF:                             ; CODE XREF: _aullrem+39j
-                shr     ecx, 1
-                rcr     ebx, 1
-                shr     edx, 1
-                rcr     eax, 1
-                or      ecx, ecx
-                jnz     short loc_8F8FEF
-                div     ebx
-                mov     ecx, eax
-                mul     [esp+DivisorHi]
-                xchg    eax, ecx
-                mul     [esp+DivisorLo]
-                add     edx, ecx
-                jb      short loc_8F901A
-                cmp     edx, [esp+DividendHi]
-                ja      short loc_8F901A
-                jb      short loc_8F9022
-                cmp     eax, [esp+DividendLo]
-                jbe     short loc_8F9022
-
-loc_8F901A:                             ; CODE XREF: _aullrem+4Aj
-                                        ; _aullrem+50j
-                sub     eax, [esp+DivisorLo]
-                sbb     edx, [esp+DivisorHi]
-
-loc_8F9022:                             ; CODE XREF: _aullrem+52j
-                                        ; _aullrem+58j
-                sub     eax, [esp+DividendLo]
-                sbb     edx, [esp+DividendHi]
-                neg     edx
-                neg     eax
-                sbb     edx, 0
-
-loc_8F9031:                             ; CODE XREF: _aullrem+1Fj
-                pop     ebx
-                retn    10h
-_aullrem        endp
-
-_aullshr        proc near               ; CODE XREF: sub_40E2B6+1ECp
-                                        ; sub_40E2B6+240p ...
-                cmp     cl, 40h
-                jnb     short loc_414BDA
-                cmp     cl, 20h
-                jnb     short loc_414BD0
-                shrd    eax, edx, cl
-                shr     edx, cl
-                retn
-; ---------------------------------------------------------------------------
-
-loc_414BD0:                             ; CODE XREF: _aullshr+8j
-                mov     eax, edx
-                xor     edx, edx
-                and     cl, 1Fh
-                shr     eax, cl
-                retn
-; ---------------------------------------------------------------------------
-
-loc_414BDA:                             ; CODE XREF: _aullshr+3j
-                xor     eax, eax
-                xor     edx, edx
-                retn
-_aullshr        endp
-
-
-; =============== S U B R O U T I N E =======================================
-
-; Attributes: bp-based frame
-
-SFileDecryptMpqHeader proc near         ; CODE XREF: sub_6D00E0+AEp
-                                        ; sub_6D00E0+D3p
-
-EncryptedDataAligned= dword ptr -88h
-var_48          = dword ptr -48h
-DecryptBuffer   = dword ptr -44h
-var_40          = dword ptr -40h
-var_3C          = dword ptr -3Ch
-var_38          = dword ptr -38h
-var_34          = dword ptr -34h
-var_30          = dword ptr -30h
-var_2C          = dword ptr -2Ch
-var_28          = dword ptr -28h
-var_24          = dword ptr -24h
-var_20          = dword ptr -20h
-var_1C          = dword ptr -1Ch
-var_18          = dword ptr -18h
-var_14          = dword ptr -14h
-var_10          = dword ptr -10h
-var_0C          = dword ptr -0Ch
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_FFFFFFF8    = dword ptr  0
-arg_FFFFFFFC    = dword ptr  4
-arg_0           = dword ptr  8
-
-                push    ebp
-                mov     ebp, esp
-                sub     esp, 88h
-                mov     eax, [ecx+8]
-                mov     edx, [ecx+14h]
-                push    ebx
-                mov     ebx, [ecx+10h]
-                mov     [ebp+var_0C], eax
-                mov     eax, [ebp+arg_0]
-                push    esi
-                push    edi
-                mov     edi, [ecx+0Ch]
-                mov     [ebp+DecryptBuffer], ecx
-                mov     [ebp+var_10], edx
-                test    al, 3
-                jz      short loc_6C9F03
-                mov     ecx, [eax]
-                mov     [ebp+EncryptedDataAligned], ecx
-                mov     ecx, [eax+4]
-                mov     [ebp+EncryptedDataAligned+4], ecx
-                mov     ecx, [eax+8]
-                mov     [ebp+EncryptedDataAligned+8], ecx
-                mov     ecx, [eax+0Ch]
-                mov     [ebp+EncryptedDataAligned+0Ch], ecx
-                mov     ecx, [eax+10h]
-                mov     [ebp+EncryptedDataAligned+10h], ecx
-                mov     ecx, [eax+14h]
-                mov     [ebp+EncryptedDataAligned+14h], ecx
-                mov     ecx, [eax+18h]
-                mov     [ebp+EncryptedDataAligned+18h], ecx
-                mov     ecx, [eax+1Ch]
-                mov     [ebp+EncryptedDataAligned+1Ch], ecx
-                mov     ecx, [eax+20h]
-                mov     [ebp+EncryptedDataAligned+20h], ecx
-                mov     ecx, [eax+24h]
-                mov     [ebp+EncryptedDataAligned+24h], ecx
-                mov     ecx, [eax+28h]
-                mov     [ebp+EncryptedDataAligned+28h], ecx
-                mov     ecx, [eax+2Ch]
-                mov     [ebp+EncryptedDataAligned+2Ch], ecx
-                mov     ecx, [eax+30h]
-                mov     [ebp+EncryptedDataAligned+30h], ecx
-                mov     ecx, [eax+34h]
-                mov     [ebp+EncryptedDataAligned+34h], ecx
-                mov     ecx, [eax+38h]
-                mov     eax, [eax+3Ch]
-                mov     [ebp+EncryptedDataAligned+3Ch], eax
-                mov     [ebp+EncryptedDataAligned+38h], ecx
-                lea     eax, [ebp+EncryptedDataAligned]
-
-loc_6C9F03:                             ; CODE XREF: SFileDecryptMpqHeader+26j
-                mov     ecx, [eax]
-                mov     [ebp+var_30], ecx
-                mov     esi, edi
-                not     esi
-                and     esi, edx
-                mov     edx, ebx
-                and     edx, edi
-                or      esi, edx
-                add     esi, ecx
-                mov     ecx, [ebp+var_0C]
-                lea     edx, [esi+ecx-28955B88h]
-                mov     ecx, [eax+4]
-                rol     edx, 7
-                add     edx, edi
-                mov     [ebp+var_2C], ecx
-                mov     ecx, edx
-                not     ecx
-                and     ecx, ebx
-                mov     esi, edi
-                and     esi, edx
-                or      ecx, esi
-                add     ecx, [ebp+var_2C]
-                mov     esi, [ebp+var_10]
-                lea     esi, [ecx+esi-173848AAh]
-                mov     ecx, [eax+8]
-                mov     [ebp+var_40], ecx
-                rol     esi, 0Ch
-                add     esi, edx
-                mov     ecx, esi
-                not     ecx
-                and     ecx, edi
-                mov     edi, esi
-                and     edi, edx
-                or      ecx, edi
-                add     ecx, [ebp+var_40]
-                lea     edi, [ecx+ebx+242070DBh]
-                mov     ecx, [eax+0Ch]
-                ror     edi, 0Fh
-                add     edi, esi
-                mov     [ebp+var_1C], ecx
-                mov     ebx, edi
-                not     ebx
-                and     ebx, edx
-                mov     ecx, esi
-                and     ecx, edi
-                or      ebx, ecx
-                add     ebx, [ebp+var_1C]
-                mov     ecx, [ebp+DecryptBuffer]
-                mov     ecx, [ecx+0Ch]
-                lea     ecx, [ebx+ecx-3E423112h]
-                ror     ecx, 0Ah
-                add     ecx, edi
-                mov     [ebp+var_4], edi
-                and     edi, ecx
-                mov     ebx, ecx
-                not     ebx
-                and     ebx, esi
-                or      ebx, edi
-                mov     edi, [eax+10h]
-                add     ebx, edi
-                lea     edx, [ebx+edx-0A83F051h]
-                rol     edx, 7
-                add     edx, ecx
-                mov     [ebp+arg_0], edx
-                not     edx
-                and     edx, [ebp+var_4]
-                mov     ebx, ecx
-                and     ebx, [ebp+arg_0]
-                mov     [ebp+var_10], edi
-                mov     edi, [eax+14h]
-                or      edx, ebx
-                add     edx, edi
-                lea     esi, [edx+esi+4787C62Ah]
-                mov     edx, [eax+18h]
-                mov     [ebp+var_34], edi
-                mov     edi, [ebp+arg_0]
-                rol     esi, 0Ch
-                add     esi, edi
-                mov     [ebp+var_20], edx
-                mov     edx, esi
-                not     edx
-                and     edx, ecx
-                mov     ebx, esi
-                and     ebx, edi
-                or      edx, ebx
-                add     edx, [ebp+var_20]
-                mov     ebx, [ebp+var_4]
-                lea     edx, [edx+ebx-57CFB9EDh]
-                ror     edx, 0Fh
-                add     edx, esi
-                mov     ebx, edx
-                not     ebx
-                and     ebx, edi
-                mov     edi, esi
-                and     edi, edx
-                or      ebx, edi
-                mov     edi, [eax+1Ch]
-                add     ebx, edi
-                lea     ecx, [ebx+ecx-2B96AFFh]
-                ror     ecx, 0Ah
-                add     ecx, edx
-                mov     [ebp+var_3C], edi
-                mov     edi, [eax+20h]
-                mov     [ebp+var_14], edi
-                mov     edi, ecx
-                not     edi
-                and     edi, esi
-                mov     ebx, edx
-                and     ebx, ecx
-                or      edi, ebx
-                add     edi, [ebp+var_14]
-                mov     ebx, [ebp+arg_0]
-                lea     edi, [edi+ebx+698098D8h]
-                mov     [ebp+var_8], ecx
-                rol     edi, 7
-                add     edi, ecx
-                and     ecx, edi
-                mov     ebx, edi
-                not     ebx
-                and     ebx, edx
-                or      ebx, ecx
-                mov     ecx, [eax+24h]
-                add     ebx, ecx
-                mov     [ebp+var_0C], ecx
-                mov     ecx, [eax+28h]
-                lea     esi, [ebx+esi-74BB0851h]
-                mov     [ebp+var_24], ecx
-                rol     esi, 0Ch
-                add     esi, edi
-                mov     ecx, esi
-                not     ecx
-                and     ecx, [ebp+var_8]
-                mov     ebx, esi
-                and     ebx, edi
-                or      ecx, ebx
-                add     ecx, [ebp+var_24]
-                mov     ebx, esi
-                lea     edx, [ecx+edx-0A44Fh]
-                mov     ecx, [eax+2Ch]
-                ror     edx, 0Fh
-                add     edx, esi
-                mov     [ebp+var_18], ecx
-                and     ebx, edx
-                mov     ecx, edx
-                not     ecx
-                and     ecx, edi
-                or      ecx, ebx
-                add     ecx, [ebp+var_18]
-                mov     ebx, [ebp+var_8]
-                lea     ecx, [ecx+ebx-76A32842h]
-                ror     ecx, 0Ah
-                add     ecx, edx
-                mov     ebx, ecx
-                not     ebx
-                mov     [ebp+var_4], edx
-                and     edx, ecx
-                and     ebx, esi
-                or      ebx, edx
-                mov     edx, [eax+30h]
-                add     ebx, edx
-                mov     [ebp+var_38], edx
-                lea     edi, [ebx+edi+6B901122h]
-                mov     edx, [eax+34h]
-                rol     edi, 7
-                add     edi, ecx
-                mov     [ebp+arg_0], edi
-                not     edi
-                and     edi, [ebp+var_4]
-                mov     ebx, ecx
-                and     ebx, [ebp+arg_0]
-                mov     [ebp+var_8], edx
-                or      edi, ebx
-                add     edi, edx
-                mov     edx, [eax+38h]
-                mov     eax, [eax+3Ch]
-                lea     esi, [edi+esi-2678E6Dh]
-                rol     esi, 0Ch
-                add     esi, [ebp+arg_0]
-                mov     [ebp+var_28], edx
-                mov     edi, esi
-                not     edi
-                mov     edx, edi
-                and     edx, ecx
-                mov     ebx, esi
-                and     ebx, [ebp+arg_0]
-                or      edx, ebx
-                add     edx, [ebp+var_28]
-                mov     ebx, [ebp+var_4]
-                lea     edx, [edx+ebx-5986BC72h]
-                mov     [ebp+var_4], eax
-                ror     edx, 0Fh
-                add     edx, esi
-                mov     ebx, edx
-                not     ebx
-                mov     [ebp+var_48], ebx
-                and     ebx, [ebp+arg_0]
-                mov     eax, esi
-                and     eax, edx
-                or      ebx, eax
-                add     ebx, [ebp+var_4]
-                and     edi, edx
-                lea     ecx, [ebx+ecx+49B40821h]
-                ror     ecx, 0Ah
-                add     ecx, edx
-                mov     eax, esi
-                and     eax, ecx
-                or      edi, eax
-                add     edi, [ebp+var_2C]
-                mov     eax, [ebp+arg_0]
-                lea     edi, [edi+eax-9E1DA9Eh]
-                mov     eax, [ebp+var_48]
-                and     eax, ecx
-                rol     edi, 5
-                add     edi, ecx
-                mov     ebx, edx
-                and     ebx, edi
-                or      eax, ebx
-                add     eax, [ebp+var_20]
-                lea     esi, [eax+esi-3FBF4CC0h]
-                rol     esi, 9
-                add     esi, edi
-                mov     eax, ecx
-                not     eax
-                and     eax, edi
-                mov     ebx, esi
-                and     ebx, ecx
-                or      eax, ebx
-                add     eax, [ebp+var_18]
-                lea     edx, [eax+edx+265E5A51h]
-                rol     edx, 0Eh
-                add     edx, esi
-                mov     eax, edi
-                not     eax
-                and     eax, esi
-                mov     ebx, edx
-                and     ebx, edi
-                or      eax, ebx
-                add     eax, [ebp+var_30]
-                lea     ecx, [eax+ecx-16493856h]
-                ror     ecx, 0Ch
-                mov     eax, esi
-                add     ecx, edx
-                not     eax
-                and     eax, edx
-                mov     ebx, esi
-                and     ebx, ecx
-                or      eax, ebx
-                add     eax, [ebp+var_34]
-                lea     edi, [eax+edi-29D0EFA3h]
-                rol     edi, 5
-                add     edi, ecx
-                mov     [ebp+arg_0], edi
-                mov     eax, edx
-                not     eax
-                and     eax, ecx
-                mov     edi, edx
-                and     edi, [ebp+arg_0]
-                or      eax, edi
-                add     eax, [ebp+var_24]
-                mov     edi, ecx
-                lea     esi, [eax+esi+2441453h]
-                mov     eax, [ebp+arg_0]
-                not     edi
-                and     edi, eax
-                rol     esi, 9
-                add     esi, eax
-                not     eax
-                and     eax, esi
-                mov     ebx, esi
-                and     ebx, ecx
-                or      edi, ebx
-                add     edi, [ebp+var_4]
-                lea     edx, [edi+edx-275E197Fh]
-                rol     edx, 0Eh
-                add     edx, esi
-                mov     edi, edx
-                and     edi, [ebp+arg_0]
-                or      eax, edi
-                add     eax, [ebp+var_10]
-                mov     edi, esi
-                lea     ecx, [eax+ecx-182C0438h]
-                ror     ecx, 0Ch
-                add     ecx, edx
-                and     edi, ecx
-                mov     eax, esi
-                not     eax
-                and     eax, edx
-                or      eax, edi
-                add     eax, [ebp+var_0C]
-                mov     edi, [ebp+arg_0]
-                lea     eax, [eax+edi+21E1CDE6h]
-                rol     eax, 5
-                add     eax, ecx
-                mov     [ebp+arg_0], eax
-                mov     eax, edx
-                not     eax
-                and     eax, ecx
-                mov     edi, edx
-                and     edi, [ebp+arg_0]
-                or      eax, edi
-                add     eax, [ebp+var_28]
-                mov     edi, ecx
-                lea     esi, [eax+esi-3CC8F82Ah]
-                mov     eax, [ebp+arg_0]
-                rol     esi, 9
-                add     esi, eax
-                not     edi
-                and     edi, eax
-                mov     ebx, esi
-                and     ebx, ecx
-                or      edi, ebx
-                add     edi, [ebp+var_1C]
-                not     eax
-                lea     edx, [edi+edx-0B2AF279h]
-                rol     edx, 0Eh
-                add     edx, esi
-                and     eax, esi
-                mov     edi, edx
-                and     edi, [ebp+arg_0]
-                or      eax, edi
-                add     eax, [ebp+var_14]
-                lea     ecx, [eax+ecx+455A14EDh]
-                ror     ecx, 0Ch
-                add     ecx, edx
-                mov     eax, esi
-                not     eax
-                and     eax, edx
-                mov     edi, esi
-                and     edi, ecx
-                or      eax, edi
-                add     eax, [ebp+var_8]
-                mov     edi, [ebp+arg_0]
-                lea     eax, [eax+edi-561C16FBh]
-                rol     eax, 5
-                add     eax, ecx
-                mov     [ebp+arg_0], eax
-                mov     eax, edx
-                not     eax
-                and     eax, ecx
-                mov     edi, edx
-                and     edi, [ebp+arg_0]
-                or      eax, edi
-                add     eax, [ebp+var_40]
-                mov     edi, ecx
-                lea     esi, [eax+esi-3105C08h]
-                mov     eax, [ebp+arg_0]
-                not     edi
-                and     edi, eax
-                rol     esi, 9
-                add     esi, eax
-                mov     ebx, esi
-                and     ebx, ecx
-                or      edi, ebx
-                add     edi, [ebp+var_3C]
-                not     eax
-                lea     edx, [edi+edx+676F02D9h]
-                and     eax, esi
-                rol     edx, 0Eh
-                add     edx, esi
-                mov     edi, edx
-                and     edi, [ebp+arg_0]
-                or      eax, edi
-                add     eax, [ebp+var_38]
-                mov     edi, [ebp+arg_0]
-                lea     ecx, [eax+ecx-72D5B376h]
-                ror     ecx, 0Ch
-                add     ecx, edx
-                mov     eax, esi
-                xor     eax, edx
-                xor     eax, ecx
-                add     eax, [ebp+var_34]
-                lea     eax, [eax+edi-5C6BEh]
-                rol     eax, 4
-                add     eax, ecx
-                mov     edi, edx
-                xor     edi, ecx
-                xor     edi, eax
-                add     edi, [ebp+var_14]
-                lea     esi, [edi+esi-788E097Fh]
-                rol     esi, 0Bh
-                add     esi, eax
-                mov     edi, esi
-                xor     edi, ecx
-                xor     edi, eax
-                add     edi, [ebp+var_18]
-                lea     edx, [edi+edx+6D9D6122h]
-                rol     edx, 10h
-                add     edx, esi
-                mov     edi, esi
-                xor     edi, edx
-                mov     ebx, edi
-                xor     ebx, eax
-                add     ebx, [ebp+var_28]
-                lea     ecx, [ebx+ecx-21AC7F4h]
-                ror     ecx, 9
-                add     ecx, edx
-                xor     edi, ecx
-                add     edi, [ebp+var_2C]
-                lea     eax, [edi+eax-5B4115BCh]
-                rol     eax, 4
-                mov     edi, edx
-                add     eax, ecx
-                xor     edi, ecx
-                xor     edi, eax
-                add     edi, [ebp+var_10]
-                lea     esi, [edi+esi+4BDECFA9h]
-                rol     esi, 0Bh
-                add     esi, eax
-                mov     edi, esi
-                xor     edi, ecx
-                xor     edi, eax
-                add     edi, [ebp+var_3C]
-                lea     edx, [edi+edx-944B4A0h]
-                rol     edx, 10h
-                add     edx, esi
-                mov     edi, esi
-                xor     edi, edx
-                mov     ebx, edi
-                xor     ebx, eax
-                add     ebx, [ebp+var_24]
-                lea     ecx, [ebx+ecx-41404390h]
-                ror     ecx, 9
-                add     ecx, edx
-                xor     edi, ecx
-                add     edi, [ebp+var_8]
-                lea     eax, [edi+eax+289B7EC6h]
-                rol     eax, 4
-                add     eax, ecx
-                mov     edi, edx
-                xor     edi, ecx
-                xor     edi, eax
-                add     edi, [ebp+var_30]
-                lea     esi, [edi+esi-155ED806h]
-                rol     esi, 0Bh
-                add     esi, eax
-                mov     edi, esi
-                xor     edi, ecx
-                xor     edi, eax
-                add     edi, [ebp+var_1C]
-                lea     edi, [edi+edx-2B10CF7Bh]
-                rol     edi, 10h
-                add     edi, esi
-                mov     edx, esi
-                xor     edx, edi
-                mov     ebx, edx
-                xor     ebx, eax
-                add     ebx, [ebp+var_20]
-                lea     ecx, [ebx+ecx+4881D05h]
-                ror     ecx, 9
-                add     ecx, edi
-                xor     edx, ecx
-                add     edx, [ebp+var_0C]
-                lea     eax, [edx+eax-262B2FC7h]
-                rol     eax, 4
-                add     eax, ecx
-                mov     edx, edi
-                xor     edx, ecx
-                xor     edx, eax
-                add     edx, [ebp+var_38]
-                lea     edx, [edx+esi-1924661Bh]
-                rol     edx, 0Bh
-                add     edx, eax
-                mov     esi, edx
-                xor     esi, ecx
-                xor     esi, eax
-                add     esi, [ebp+var_4]
-                mov     ebx, edx
-                lea     esi, [esi+edi+1FA27CF8h]
-                mov     edi, [ebp+var_40]
-                rol     esi, 10h
-                add     esi, edx
-                xor     ebx, esi
-                xor     ebx, eax
-                add     ebx, edi
-                lea     ecx, [ebx+ecx-3B53A99Bh]
-                ror     ecx, 9
-                add     ecx, esi
-                mov     ebx, edx
-                not     ebx
-                or      ebx, ecx
-                xor     ebx, esi
-                add     ebx, [ebp+var_30]
-                lea     eax, [ebx+eax-0BD6DDBCh]
-                rol     eax, 6
-                add     eax, ecx
-                mov     ebx, esi
-                not     ebx
-                or      ebx, eax
-                xor     ebx, ecx
-                add     ebx, [ebp+var_3C]
-                lea     edx, [ebx+edx+432AFF97h]
-                rol     edx, 0Ah
-                add     edx, eax
-                mov     ebx, ecx
-                not     ebx
-                or      ebx, edx
-                xor     ebx, eax
-                add     ebx, [ebp+var_28]
-                lea     esi, [ebx+esi-546BDC59h]
-                rol     esi, 0Fh
-                add     esi, edx
-                mov     ebx, eax
-                not     ebx
-                or      ebx, esi
-                xor     ebx, edx
-                add     ebx, [ebp+var_34]
-                lea     ecx, [ebx+ecx-36C5FC7h]
-                ror     ecx, 0Bh
-                add     ecx, esi
-                mov     ebx, edx
-                not     ebx
-                or      ebx, ecx
-                xor     ebx, esi
-                add     ebx, [ebp+var_38]
-                lea     eax, [ebx+eax+655B59C3h]
-                rol     eax, 6
-                add     eax, ecx
-                mov     ebx, esi
-                not     ebx
-                or      ebx, eax
-                xor     ebx, ecx
-                add     ebx, [ebp+var_1C]
-                lea     edx, [ebx+edx-70F3336Eh]
-                rol     edx, 0Ah
-                add     edx, eax
-                mov     ebx, ecx
-                not     ebx
-                or      ebx, edx
-                xor     ebx, eax
-                add     ebx, [ebp+var_24]
-                lea     esi, [ebx+esi-100B83h]
-                rol     esi, 0Fh
-                add     esi, edx
-                mov     ebx, eax
-                not     ebx
-                or      ebx, esi
-                xor     ebx, edx
-                add     ebx, [ebp+var_2C]
-                lea     ecx, [ebx+ecx-7A7BA22Fh]
-                ror     ecx, 0Bh
-                add     ecx, esi
-                mov     ebx, edx
-                not     ebx
-                or      ebx, ecx
-                xor     ebx, esi
-                add     ebx, [ebp+var_14]
-                lea     eax, [ebx+eax+6FA87E4Fh]
-                rol     eax, 6
-                add     eax, ecx
-                mov     ebx, esi
-                not     ebx
-                or      ebx, eax
-                xor     ebx, ecx
-                add     ebx, [ebp+var_4]
-                lea     edx, [ebx+edx-1D31920h]
-                rol     edx, 0Ah
-                add     edx, eax
-                mov     ebx, ecx
-                not     ebx
-                or      ebx, edx
-                xor     ebx, eax
-                add     ebx, [ebp+var_20]
-                lea     esi, [ebx+esi-5CFEBCECh]
-                rol     esi, 0Fh
-                mov     ebx, eax
-                add     esi, edx
-                not     ebx
-                or      ebx, esi
-                xor     ebx, edx
-                add     ebx, [ebp+var_8]
-                lea     ecx, [ebx+ecx+4E0811A1h]
-                ror     ecx, 0Bh
-                add     ecx, esi
-                mov     ebx, edx
-                not     ebx
-                or      ebx, ecx
-                xor     ebx, esi
-                add     ebx, [ebp+var_10]
-                lea     eax, [ebx+eax-8AC817Eh]
-                rol     eax, 6
-                add     eax, ecx
-                mov     ebx, esi
-                not     ebx
-                or      ebx, eax
-                xor     ebx, ecx
-                add     ebx, [ebp+var_18]
-                lea     edx, [ebx+edx-42C50DCBh]
-                rol     edx, 0Ah
-                add     edx, eax
-                mov     ebx, ecx
-                not     ebx
-                or      ebx, edx
-                xor     ebx, eax
-                add     ebx, edi
-                lea     esi, [ebx+esi+2AD7D2BBh]
-                mov     edi, eax
-                not     edi
-                rol     esi, 0Fh
-                add     esi, edx
-                or      edi, esi
-                xor     edi, edx
-                add     edi, [ebp+var_0C]
-                lea     edi, [edi+ecx-14792C6Fh]
-                mov     ecx, [ebp+DecryptBuffer]
-                mov     ebx, [ecx+8]
-                add     ebx, eax
-                mov     eax, [ecx+10h]
-                ror     edi, 0Bh
-                add     edi, [ecx+0Ch]
-                add     eax, esi
-                add     edi, esi
-                mov     [ecx+10h], eax
-                mov     eax, [ecx+14h]
-                mov     [ecx+0Ch], edi
-                pop     edi
-                add     eax, edx
-                pop     esi
-                mov     [ecx+8], ebx
-                mov     [ecx+14h], eax
-                pop     ebx
-                mov     esp, ebp
-                pop     ebp
-                retn    4
-SFileDecryptMpqHeader endp
-
-; ---------------------------------------------------------------------------
-
-; ---------------------------------------------------------------------------
-
-sub_6D00E0      proc near               ; CODE XREF: sub_6D0210+59p
-                                        ; sub_6D0210+66p ...
-
-var_10          = dword ptr -10h
-pbMpqHeader     = dword ptr -4
-pMpqHeader      = dword ptr  8
-dwSize          = dword ptr  0Ch
-
-                push    ebp
-                mov     ebp, esp
-                push    ecx
-                mov     eax, [ebp+pMpqHeader] ; EAX = MPQ Header
-                push    ebx
-                mov     ebx, [ebp+dwSize] ; EBX - size of MPQ Header
-                push    esi
-                push    edi
-                mov     esi, ecx        ; ESI - decryption buffer (6 DWORDs)
-                mov     edi, [esi]
-                shr     edi, 3
-                and     edi, 3Fh
-                mov     [ebp+pbMpqHeader], eax
-                lea     ecx, ds:0[ebx*8] ; ECX = sizeof header * 8
-                test    ebx, ebx
-                jbe     loc_6D01F8
-                add     [esi], ecx
-                mov     edx, ebx        ; EDX = size of header
-                shr     edx, 1Dh
-                add     [esi+4], edx
-                mov     edx, [esi+4]
-                cmp     [esi], ecx
-                jnb     short loc_6D011E
-                inc     edx
-                mov     [esi+4], edx
-
-loc_6D011E:                             ; CODE XREF: sub_6D00E0+38j
-                test    edi, edi
-                jz      short loc_6D0196
-                lea     eax, [edi+ebx]
-                cmp     eax, 40h
-                jbe     short loc_6D0136
-                mov     eax, 40h
-                sub     eax, edi
-                mov     [ebp+dwSize], eax
-                jmp     short loc_6D013B
-; ---------------------------------------------------------------------------
-
-loc_6D0136:                             ; CODE XREF: sub_6D00E0+48j
-                mov     [ebp+dwSize], ebx
-                mov     eax, ebx
-
-loc_6D013B:                             ; CODE XREF: sub_6D00E0+54j
-                mov     edx, [ebp+pMpqHeader]
-                add     edx, eax
-                lea     ecx, [edi+esi+18h]
-                mov     [ebp+pbMpqHeader], edx
-                cmp     ecx, edx
-                jnb     short loc_6D0163
-                lea     edx, [ecx+eax]
-                mov     ecx, [ebp+pMpqHeader]
-                cmp     edx, ecx
-                jbe     short loc_6D0166
-                push    eax
-                push    ecx
-                lea     eax, [edi+esi+18h]
-                push    eax
-                call    _memmove
-                jmp     short loc_6D0172
-; ---------------------------------------------------------------------------
-
-loc_6D0163:                             ; CODE XREF: sub_6D00E0+69j
-                mov     ecx, [ebp+pMpqHeader]
-
-loc_6D0166:                             ; CODE XREF: sub_6D00E0+73j
-                push    eax
-                push    ecx
-                lea     eax, [edi+esi+18h]
-                push    eax
-                call    _memcpy
-
-loc_6D0172:                             ; CODE XREF: sub_6D00E0+81j
-                mov     eax, [ebp+dwSize]
-                lea     ecx, [eax+edi]
-                add     esp, 0Ch
-                cmp     ecx, 40h
-                jl      short loc_6D01F8
-                mov     edx, [ebp+pbMpqHeader]
-                sub     ebx, eax
-                lea     eax, [esi+18h]
-                push    eax
-                mov     ecx, esi
-                mov     [ebp+pbMpqHeader], edx
-                call    SFileDecryptMpqHeader
-                mov     eax, [ebp+pbMpqHeader]
-
-loc_6D0196:                             ; CODE XREF: sub_6D00E0+40j
-                cmp     ebx, 40h
-                jl      short loc_6D01C4
-                mov     edi, ebx
-                shr     edi, 6
-                mov     ecx, edi
-                neg     ecx
-                shl     ecx, 6
-                add     ebx, ecx
-                lea     esp, [esp+0]
-
-loc_6D01B0:                             ; CODE XREF: sub_6D00E0+E2j
-                push    eax
-                mov     ecx, esi
-                call    SFileDecryptMpqHeader
-                add     [ebp+pbMpqHeader], 40h
-                sub     edi, 1
-                mov     eax, [ebp+pbMpqHeader]
-                jnz     short loc_6D01B0
-
-loc_6D01C4:                             ; CODE XREF: sub_6D00E0+B9j
-                test    ebx, ebx
-                jz      short loc_6D01F8
-                add     esi, 18h
-                lea     edx, [ebx+eax]
-                cmp     esi, edx
-                jnb     short loc_6D01ED
-                lea     ecx, [esi+ebx]
-                cmp     ecx, eax
-                jbe     short loc_6D01ED
-                push    ebx
-                push    eax
-                push    esi
-                call    _memmove
-                add     esp, 0Ch
-                pop     edi
-                pop     esi
-                pop     ebx
-                mov     esp, ebp
-                pop     ebp
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_6D01ED:                             ; CODE XREF: sub_6D00E0+F0j
-                                        ; sub_6D00E0+F7j
-                push    ebx
-                push    eax
-                push    esi
-                call    _memcpy
-                add     esp, 0Ch
-
-loc_6D01F8:                             ; CODE XREF: sub_6D00E0+23j
-                                        ; sub_6D00E0+9Ej ...
-                pop     edi
-                pop     esi
-                pop     ebx
-                mov     esp, ebp
-                pop     ebp
-                retn    8
-sub_6D00E0      endp
-
-aA_1:                                   ; DATA XREF: sub_6249D0+68o
-                                        ; sub_6D0210+4Fo ...
-                dw 80h, 0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-                db    0
-
-sub_6D0210      proc near               ; CODE XREF: SFileVerifyMpqHeaderMD5+42p
-                                        ; sub_6D2D60+A9p ...
-
-var_8           = byte ptr -8
-var_6           = byte ptr -6
-var_5           = byte ptr -5
-var_4           = byte ptr -4
-var_3           = byte ptr -3
-var_2           = byte ptr -2
-var_1           = byte ptr -1
-arg_0           = dword ptr  8
-
-                push    ebp
-                mov     ebp, esp
-                sub     esp, 8
-                push    esi
-                mov     esi, ecx        ; Source address
-                mov     eax, [esi]
-                mov     ecx, eax        
-                shr     ecx, 8
-                mov     [ebp-7], cl
-                mov     ecx, eax
-                shr     ecx, 18h
-                mov     [ebp+var_5], cl
-                mov     ecx, [esi+4]
-                mov     edx, eax
-                shr     edx, 10h
-                mov     [ebp+var_6], dl
-                mov     edx, ecx
-                mov     [ebp+var_4], cl
-                shr     edx, 8
-                mov     [ebp+var_3], dl
-                mov     edx, ecx
-                shr     ecx, 18h
-                mov     [ebp+var_1], cl
-                mov     [ebp+var_8], al
-                shr     eax, 3
-                mov     ecx, 0FFFFFFF7h
-                sub     ecx, eax
-                and     ecx, 3Fh
-                push    edi
-                inc     ecx
-                push    ecx
-                shr     edx, 10h
-                push    offset aA_1     ; ""
-                mov     ecx, esi
-                mov     [ebp+var_2], dl
-                call    sub_6D00E0
-                push    8
-                lea     edx, [ebp+var_8]
-                push    edx
-                mov     ecx, esi
-                call    sub_6D00E0
-                mov     edi, [ebp+arg_0]
-                xor     eax, eax
-
-loc_6D0280:                             ; CODE XREF: sub_6D0210+8Ej
-                mov     ecx, eax
-                and     ecx, 3
-                add     ecx, ecx
-                mov     edx, eax
-                sar     edx, 2
-                mov     edx, [esi+edx*4+8]
-                add     ecx, ecx
-                add     ecx, ecx
-                shr     edx, cl
-                inc     eax
-                cmp     eax, 10h
-                mov     [eax+edi-1], dl
-                jl      short loc_6D0280
-                pop     edi
-                pop     esi
-                mov     esp, ebp
-                pop     ebp
-                retn    4
-sub_6D0210      endp
-
-
-sub_6CEBE0      proc near               ; CODE XREF: sub_4A72D0+49p
-                                        ; SFileVerifyMpqHeaderMD5+51p ...
-
-var_4           = dword ptr -4
-arg_0           = dword ptr  8
-
-                push    ebp
-                mov     ebp, esp
-                mov     edx, [ebp+arg_0]
-                mov     eax, 10h
-                push    esi
-                lea     esp, [esp+0]
-
-loc_6CEBF0:                             ; CODE XREF: sub_6CEBE0+22j
-                mov     esi, [ecx]
-                cmp     esi, [edx]
-                jnz     short loc_6CEC14
-                sub     eax, 4
-                add     edx, 4
-                add     ecx, 4
-                cmp     eax, 4
-                jnb     short loc_6CEBF0
-                xor     eax, eax
-                xor     edx, edx
-                test    eax, eax
-                setz    dl
-                mov     al, dl
-                pop     esi
-                pop     ebp
-                retn    4
-; ---------------------------------------------------------------------------
-
-loc_6CEC14:                             ; CODE XREF: sub_6CEBE0+14j
-                movzx   eax, byte ptr [ecx]
-                movzx   esi, byte ptr [edx]
-                sub     eax, esi
-                jnz     short loc_6CEC40
-                movzx   eax, byte ptr [ecx+1]
-                movzx   esi, byte ptr [edx+1]
-                sub     eax, esi
-                jnz     short loc_6CEC40
-                movzx   eax, byte ptr [ecx+2]
-                movzx   esi, byte ptr [edx+2]
-                sub     eax, esi
-                jnz     short loc_6CEC40
-                movzx   eax, byte ptr [ecx+3]
-                movzx   ecx, byte ptr [edx+3]
-                sub     eax, ecx
-
-loc_6CEC40:                             ; CODE XREF: sub_6CEBE0+3Cj
-                                        ; sub_6CEBE0+48j ...
-                sar     eax, 1Fh
-                or      eax, 1
-                xor     edx, edx
-                test    eax, eax
-                setz    dl
-                mov     al, dl
-                pop     esi
-                pop     ebp
-                retn    4
-sub_6CEBE0      endp
-
-SFileVerifyMpqHeaderMD5 proc near    ; CODE XREF: SFileVerifyMpqHeader+6Bp
-
-var_68          = dword ptr -68h
-var_64          = dword ptr -64h
-var_60          = dword ptr -60h
-var_5C          = dword ptr -5Ch
-var_58          = dword ptr -58h
-var_54          = dword ptr -54h
-var_10          = dword ptr -10h
-
-                push    ebp
-                mov     ebp, esp
-                sub     esp, 68h
-                push    esi
-                mov     esi, eax        ; ESI = pointer to MPQ Header
-                xor     eax, eax
-                push    0C0h
-                push    esi
-                lea     ecx, [ebp+var_68]
-                mov     [ebp+var_64], eax
-                mov     [ebp+var_68], eax
-                mov     [ebp+var_60], 67452301h
-                mov     [ebp+var_5C], 0EFCDAB89h
-                mov     [ebp+var_58], 98BADCFEh
-                mov     [ebp+var_54], 10325476h
-                call    sub_6D00E0
-                lea     eax, [ebp+var_10]
-                push    eax
-                lea     ecx, [ebp+var_68]
-                call    sub_6D0210
-                add     esi, 0C0h
-                push    esi
-                lea     ecx, [ebp+var_10]
-                call    sub_6CEBE0
-                pop     esi
-                mov     esp, ebp
-                pop     ebp
-                retn
-SFileVerifyMpqHeaderMD5 endp
-
-
-_wow_SFileVerifyMpqHeaderMD5 proc
-                push    ebp
-                mov     ebp, esp
-                mov     eax, [ebp+8]
-                call    SFileVerifyMpqHeaderMD5
-                mov     esp, ebp
-                pop     ebp
-                retn
-_wow_SFileVerifyMpqHeaderMD5 endp
-
-END
diff --git a/dep/StormLibOld/test/x86_starcraft_lzma.asm b/dep/StormLibOld/test/x86_starcraft_lzma.asm
deleted file mode 100644
index bb13200b4..000000000
--- a/dep/StormLibOld/test/x86_starcraft_lzma.asm
+++ /dev/null
@@ -1,11066 +0,0 @@
-;
-;  LZMA compression code ripped from Starctaft II BEta
-;  Used while StormLib's LZMA implementation was tested against Starcraft compression
-;  Not used in StormLib.
-;
-
-.686P
-.MODEL FLAT
-ASSUME FS: NOTHING
-
-.DATA
-
-;---------------------------------------------------------------------------
-; Data
-
-byte_4CB248     db      0,   0Bh,   0Bh,   0Bh ; indirect table for switch statement
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db      1,     2,     3,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db      4,     5,     6,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db      7,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db      8,     9,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Bh,   0Bh,   0Bh,   0Bh
-                db    0Ah
-                align 10h
-
-dword_544960    dd 0BB40E64Eh           ; DATA XREF: sub_401C72+B
-dword_553598    dd ?                    ; DATA XREF: sub_4CB8A0+9
-
-off_50CD3C      dd offset sub_4A0605    ; DATA XREF: sub_4A05F7+1o
-                                        ; .data:off_52A004o ...
-dword_50CD40    dd 0E06D7363h           ; DATA XREF: _CxxThrowException(x,x)+Eo
-                dd 1
-                dd 0
-                dd 0
-                dd 3
-                dd 19930520h
-                dd 0
-                dd 0
-
-; ---------------------------------------------------------------------------
-
-off_546E20      dd offset sub_4CDD70    ; DATA XREF: sub_4D0270:loc_4D0324o
-off_546E24      dd offset sub_4CDD90    ; DATA XREF: sub_4CF810+53r
-off_546E28      dd offset off_50CD3C    ; DATA XREF: .rdata:off_51B888o
-                dd 0
-                db '.?AUISequentialInStream@@',0
-                db 0
-                db    0
-off_546E4C      dd offset off_50CD3C    ; DATA XREF: .rdata:off_51B8C0o
-                dd 0
-                db '.?AUISequentialOutStream@@',0
-                db    0
-off_546E70      dd offset off_50CD3C    ; DATA XREF: .rdata:off_51B8F8o
-                dd 0
-                db '.?AUICompressCoder@@',0
-                db    0
-                db    0
-                db    0
-off_546E90      dd offset off_50CD3C    ; DATA XREF: .rdata:off_51B944o
-                dd 0
-                db '.?AUICompressSetOutStream@@',0
-off_546EB4      dd offset off_50CD3C    ; DATA XREF: .rdata:0051B96Co
-                dd 0
-                db '.?AUICompressSetCoderProperties@@',0
-                db    0
-                db    0
-off_546EE0      dd offset off_50CD3C    ; DATA XREF: .rdata:0051B9B8o
-                dd 0
-                db '.?AUICompressWriteCoderProperties@@',0
-                dd offset off_50CD3C
-                dd 0
-                db '.?AUCSystemException@@',0
-                db 0
-                dd offset off_50CD3C
-                dd 0
-                db '.?AUCOutBufferException@@',0
-                db    0
-                db    0
-off_546F50      dd offset off_50CD3C    ; DATA XREF: .rdata:0051BA04o
-                dd 0
-                db '.?AVCInStreamMemory@@',0
-                db    0
-                db    0
-off_546F70      dd offset off_50CD3C    ; DATA XREF: .rdata:off_51BA4Co
-                dd 0
-                db '.?AVCMyUnknownImp@@',0
-off_546F8C      dd offset off_50CD3C    ; DATA XREF: .rdata:0051BAA8o
-                dd 0
-                db '.?AVCOutStreamMemory@@',0
-                db    0
-off_546FAC      dd offset off_50CD3C    ; DATA XREF: .rdata:0051BAFCo
-                dd 0
-                db '.?AVCEncoder@NLZMA@NCompress@@',0
-                db    0
-off_546FD4      dd offset off_50CD3C    ; DATA XREF: .rdata:off_51BBECo
-                dd 0
-                db '.?AVCBaseState@NLZMA@NCompress@@',0
-                db    0
-                db    0
-                db    0
-
-; ---------------------------------------------------------------------------
-
-dword_51B960    dd 0                    ; DATA XREF: .rdata:00517A64o
-                dd 0
-                dd 0
-                dd offset off_546EB4
-                dd 0    ; offset dword_51B974
-
-dword_51B9AC    dd 0                    ; DATA XREF: .rdata:00517A78o
-                dd 0
-                dd 0
-                dd offset off_546EE0
-                dd 0    ;offset dword_51B9C0
-
-dword_51B9F8    dd 0                    ; DATA XREF: .rdata:00517A8Co
-                dd 0
-                dd 0
-                dd offset off_546F50
-                dd 0    ; offset dword_51BA0C
-
-dword_51BA9C    dd 0                    ; DATA XREF: .rdata:00517AA0o
-                dd 0
-                dd 0
-                dd offset off_546F8C
-                dd 0    ; offset dword_51BAB0
-
-dword_51BAF0    dd 0                    ; DATA XREF: .rdata:00517AF8o
-                dd 0
-                dd 0
-                dd offset off_546FAC
-                dd 0    ; offset dword_51BB04
-
-dword_51BC58    dd 0                    ; DATA XREF: .rdata:00517AE0o
-                dd 4
-                dd 0
-                dd offset off_546FAC
-                dd 0    ; offset dword_51BB04
-
-dword_51BC6C    dd 0                    ; DATA XREF: .rdata:00517ACCo
-                dd 8
-                dd 0
-                dd offset off_546FAC
-                dd 0    ; offset dword_51BB04
-
-dword_51BC80    dd 0                    ; DATA XREF: .rdata:00517AB8o
-                dd 0Ch
-                dd 0
-                dd offset off_546FAC
-                dd 0    ; offset dword_51BB04
-
-; ---------------------------------------------------------------------------
-
-dword_512730    dd 0                    ; DATA XREF: sub_48DB4D+B9o
-dword_512734    dd 0                    ; DATA XREF: CCmdTarget::GetInterface(void const *)+2Dr
-dword_512738    dd 0C0h                 ; DATA XREF: CCmdTarget::GetInterface(void const *)+38r
-dword_51273C    dd 46000000h            ; DATA XREF: CCmdTarget::GetInterface(void const *)+43r
-
-dword_5535A0    dd ?                    ; DATA XREF: sub_4CF900:loc_4CF94Co
-dword_5535A4    dd ?                    ; DATA XREF: .text:004DAF37w
-dword_5535A8    dd ?                    ; DATA XREF: .text:004DAF3Cw
-dword_5535AC    dd ?                    ; DATA XREF: .text:004DAF41w
-
-dword_5535B0    dd ?                    ; DATA XREF: sub_4CF900+5Eo
-dword_5535B4    dd ?                    ; DATA XREF: .text:004DAF17w
-dword_5535B8    dd ?                    ; DATA XREF: .text:004DAF1Cw
-dword_5535BC    dd ?                    ; DATA XREF: .text:004DAF21w
-
-dword_5535C0    dd ?                    ; DATA XREF: sub_4CF900:loc_4CF98Fo
-dword_5535C4    dd ?                    ; DATA XREF: .text:004DAEF7w
-dword_5535C8    dd ?                    ; DATA XREF: .text:004DAEFCw
-dword_5535CC    dd ?                    ; DATA XREF: .text:004DAF01w
-
-
-dword_526DD0    dd 0                    ; DATA XREF: .text:loc_4CF6CBo
-                dd 0
-                dd 0
-                dd 0    ; offset dword_526DE0
-
-kLiteralNextStates db 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5
-kMatchNextStates db 7, 7, 7, 7, 7, 7, 7, 0Ah, 0Ah, 0Ah, 0Ah, 0Ah
-kRepNextStates  db 8, 8, 8, 8, 8, 8, 8, 0Bh, 0Bh, 0Bh, 0Bh, 0Bh
-kShortRepNextStates db 9, 9, 9, 9, 9, 9, 9, 0Bh, 0Bh, 0Bh, 0Bh, 0Bh
-
-dword_550998    dd 200h dup(?)
-dword_551198    dd 800h dup(?)
-dword_553198    dd 100h dup(?)
-
-ICompressSetOutStream_vftable      dd offset __purecall    ; DATA XREF: NCompress_NLZMA_CEncoder_CEncoder+2o
-                dd offset __purecall
-                dd offset __purecall
-                dd offset __purecall
-                dd offset __purecall
-                dd offset dword_51B960
-ICompressSetCoderProperties_vftable   dd offset __purecall    ; DATA XREF: NCompress_NLZMA_CEncoder_CEncoder+9o
-                dd offset __purecall
-                dd offset __purecall
-                dd offset __purecall
-                dd offset dword_51B9AC
-ICompressWriteCoderProperties_vftable      dd offset __purecall    ; DATA XREF: NCompress_NLZMA_CEncoder_CEncoder+10o
-                dd offset __purecall
-                dd offset __purecall
-                dd offset __purecall
-                dd offset dword_51B9F8
-off_517A90      dd offset Interface1_QueryInterface
-                dd offset Interface1_AddRef
-                dd offset Interface1_Release
-                dd offset sub_4CCB20
-                dd offset dword_51BA9C
-off_517AA4      dd offset Interface1_QueryInterface ; DATA XREF: sub_4CF610+Eo
-                dd offset Interface1_AddRef
-                dd offset Interface2_Release
-                dd offset sub_4CCB90
-                dd offset sub_4CF590
-                dd offset dword_51BC80
-NCompress_NLZMA_CEncoder_vftable_ICompressWriteCoderProperties      dd offset sub_4CFA50    ; DATA XREF: sub_4CF810+3Do
-                dd offset sub_4CFA10
-                dd offset sub_4CFA70
-                dd offset sub_4CDDB0
-                dd offset dword_51BC6C
-NCompress_NLZMA_CEncoder_vftable_ICompressSetCoderProperties      dd offset ICompressSetCoderProperties_QueryInterface    ; DATA XREF: sub_4CF810+36o
-                dd offset ICompressSetCoderProperties_AddRef
-                dd offset ICompressSetCoderProperties_Release
-                dd offset ICompressSetCoderProperties_SetCoderProperties
-                dd offset dword_51BC58
-NCompress_NLZMA_CEncoder_vftable_ICompressSetOutStream      dd offset sub_4CFA20    ; DATA XREF: sub_4CF810+2Fo
-                dd offset sub_4CFA80
-                dd offset sub_4CFA40
-                dd offset sub_4CFA90
-                dd offset sub_4CDE70
-                dd offset dword_51BAF0
-NCompress_NLZMA_CEncoder_vftable      dd offset sub_4CF900    ; DATA XREF: sub_4CF810+29o
-                dd offset sub_4CF9D0
-                dd offset sub_4CF9E0
-                dd offset CEncoder_Code
-                dd offset sub_4D0250
-
-.CODE
-
-extrn _operator_new:PROC
-extrn __allshr: PROC
-extrn _free: PROC
-extrn _memcmp: PROC
-extrn _memcpy: PROC
-extrn _memset: PROC
-extrn ___report_gsfailure: PROC
-extrn __purecall: PROC
-VirtualAlloc PROTO STDCALL :DWORD,:DWORD,:DWORD,:DWORD
-VirtualFree PROTO STDCALL :DWORD,:DWORD,:DWORD
-
-; ---------------------------------------------------------------------------
-
-; void __cdecl j__free(void *Memory)
-; 004843B8
-j__free         proc near               ; CODE XREF: sub_401048+16p
-                                        ; .text:004010CFp ...
-                jmp     _free
-j__free         endp
-
-
-; ---------------------------------------------------------------------------
-
-; int __cdecl unknown_libname_324(void *Buf1, void *Buf2)
-unknown_libname_324 proc near
-; sub_48B7BA
-
-Buf1            = dword ptr  4
-Buf2            = dword ptr  8
-
-                push    10h             ; Size
-                push    [esp+4+Buf2]    ; Buf2
-                push    [esp+8+Buf1]    ; Buf1
-                call    _memcmp
-                add     esp, 0Ch
-                neg     eax
-                sbb     eax, eax
-                inc     eax
-                retn
-unknown_libname_324 endp
-
-; ---------------------------------------------------------------------------
-
-sub_4A05F7      proc near               ; CODE XREF: sub_4A0605+3p
-                push    ecx
-                mov     dword ptr [ecx], offset off_50CD3C
-                call    sub_4A98B8
-                pop     ecx
-                retn
-sub_4A05F7      endp
-
-; ---------------------------------------------------------------------------
-
-; int __thiscall sub_4A0605(void *Memory, char)
-sub_4A0605      proc near               ; DATA XREF: .rdata:off_50CD3Co
-
-arg_0           = byte ptr  4
-
-                push    esi
-                mov     esi, ecx
-                call    sub_4A05F7
-                test    [esp+4+arg_0], 1
-                jz      short loc_4A061B
-                push    esi             ; Memory
-                call    j__free
-                pop     ecx
-
-loc_4A061B:                             ; CODE XREF: sub_4A0605+Dj
-                mov     eax, esi
-                pop     esi
-                retn    4
-sub_4A0605      endp
-
-; ---------------------------------------------------------------------------
-
-sub_4A0686      proc near               ; CODE XREF: sub_401C72+49p
-                                        ; sub_40222F+15Cp ...
-                cmp     ecx, dword_544960
-                jnz     short loc_4A0690
-                retn
-loc_4A0690:                             ; CODE XREF: sub_4A0686+6j
-                jmp     ___report_gsfailure
-sub_4A0686      endp
-
-; ---------------------------------------------------------------------------
-
-sub_4A98B8      proc near               ; CODE XREF: sub_4A05F7+7p
-
-                int     3
-                retn
-sub_4A98B8      endp
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CAEC0      proc near               ; CODE XREF: CEncoder_GetOptimum+514p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                push    esi
-                push    edi
-                mov     edi, [esp+8+arg_4]
-                lea     eax, [edi-2]
-                cmp     eax, 4
-                mov     esi, ecx
-                jb      short loc_4CAED5
-                mov     eax, 3
-
-loc_4CAED5:                             ; CODE XREF: sub_4CAEC0+Ej
-                mov     edx, [esp+8+arg_0]
-                cmp     edx, 80h
-                jnb     short loc_4CAEEF
-                shl     eax, 7
-                add     eax, edx
-                mov     ecx, [esi+eax*4+33314h]
-                jmp     short loc_4CAF25
-; ---------------------------------------------------------------------------
-
-loc_4CAEEF:                             ; CODE XREF: sub_4CAEC0+1Fj
-                mov     ecx, 7FFFFh
-                sub     ecx, edx
-                sar     ecx, 1Fh
-                push    ebx
-                and     ecx, 0Ch
-                add     ecx, 6
-                mov     ebx, edx
-                shr     ebx, cl
-                shl     eax, 5
-                add     eax, ecx
-                and     edx, 0Fh
-                movzx   ebx, byte ptr dword_551198[ebx]
-                lea     eax, [ebx+eax*2]
-                mov     ecx, [esi+eax*4+32F14h]
-                add     ecx, [esi+edx*4+33B14h]
-                pop     ebx
-
-loc_4CAF25:                             ; CODE XREF: sub_4CAEC0+2Dj
-                mov     edx, [esp+8+arg_8]
-                imul    edx, 110h
-                add     edx, edi
-                mov     eax, [esi+edx*4+295B8h]
-                pop     edi
-                add     eax, ecx
-                pop     esi
-                retn    0Ch
-sub_4CAEC0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CAF40:                             ; CODE XREF: .text:004DAED5j
-                push    ecx
-                push    ebx
-                push    ebp
-                push    esi
-                mov     ebp, 2
-                mov     bl, 2
-                push    edi
-                mov     byte ptr dword_551198, 0
-                mov     byte ptr dword_551198+1, 1
-                mov     [esp+10h], bl
-                mov     edi, ebp
-
-loc_4CAF60:                             ; CODE XREF: .text:004CAF96j
-                mov     ecx, edi
-                shr     ecx, 1
-                sub     ecx, 1
-                mov     esi, 1
-                shl     esi, cl
-                test    esi, esi
-                jbe     short loc_4CAF89
-                mov     ecx, [esp+10h]
-                push    esi
-                lea     eax, dword_551198[ebp]
-                push    ecx
-                push    eax
-                call    _memset
-                add     esp, 0Ch
-                add     ebp, esi
-
-loc_4CAF89:                             ; CODE XREF: .text:004CAF70j
-                add     bl, 1
-                add     edi, 1
-                cmp     bl, 1Ah
-                mov     [esp+10h], bl
-                jb      short loc_4CAF60
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CAFA0      proc near               ; CODE XREF: sub_4CAFC0+90p
-
-arg_0           = dword ptr  4
-
-                mov     eax, [esp+arg_0]
-                lea     ecx, [eax-61h]
-                cmp     cx, 19h
-                ja      short locret_4CAFB2
-                add     eax, 0FFE0h
-
-locret_4CAFB2:                          ; CODE XREF: sub_4CAFA0+Bj
-                retn
-sub_4CAFA0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CAFC0      proc near               ; CODE XREF: ICompressSetCoderProperties_SetCoderProperties+A5p
-                movzx   ecx, word ptr [eax]
-                lea     edx, [ecx-61h]
-                cmp     dx, 19h
-                ja      short loc_4CAFD2
-                add     ecx, 0FFE0h
-
-loc_4CAFD2:                             ; CODE XREF: sub_4CAFC0+Aj
-                add     eax, 2
-                cmp     cx, 48h
-                jnz     short loc_4CB01B
-                movzx   ecx, word ptr [eax]
-                lea     edx, [ecx-61h]
-                cmp     dx, 19h
-                ja      short loc_4CAFED
-                add     ecx, 0FFE0h
-
-loc_4CAFED:                             ; CODE XREF: sub_4CAFC0+25j
-                add     eax, 2
-                cmp     cx, 43h
-                jz      short loc_4CAFF9
-
-loc_4CAFF6:                             ; CODE XREF: sub_4CAFC0+44j
-                                        ; sub_4CAFC0+4Bj ...
-                xor     eax, eax
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CAFF9:                             ; CODE XREF: sub_4CAFC0+34j
-                movzx   ecx, word ptr [eax]
-                sub     ecx, 30h
-                lea     edx, [ecx-4]
-                test    edx, edx
-                ja      short loc_4CAFF6
-                cmp     word ptr [eax+2], 0
-                jnz     short loc_4CAFF6
-                mov     dword ptr [ebx], 0
-                mov     [edi], ecx
-                mov     eax, 1
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CB01B:                             ; CODE XREF: sub_4CAFC0+19j
-                cmp     cx, 42h
-                jnz     short loc_4CAFF6
-                movzx   ecx, word ptr [eax]
-                lea     edx, [ecx-61h]
-                cmp     dx, 19h
-                ja      short loc_4CB033
-                add     ecx, 0FFE0h
-
-loc_4CB033:                             ; CODE XREF: sub_4CAFC0+6Bj
-                add     eax, 2
-                cmp     cx, 54h
-                jnz     short loc_4CAFF6
-                push    esi
-                movzx   esi, word ptr [eax]
-                sub     esi, 30h
-                lea     ecx, [esi-2]
-                cmp     ecx, 2
-                ja      short loc_4CB06C
-                movzx   eax, word ptr [eax+2]
-                push    eax
-                call    sub_4CAFA0
-                add     esp, 4
-                test    ax, ax
-                jnz     short loc_4CB06C
-                mov     dword ptr [ebx], 1
-                mov     [edi], esi
-                mov     eax, 1
-                pop     esi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CB06C:                             ; CODE XREF: sub_4CAFC0+89j
-                                        ; sub_4CAFC0+9Bj
-                xor     eax, eax
-                pop     esi
-                retn
-sub_4CAFC0      endp
-
-
-ICompressSetCoderProperties_SetCoderProperties      proc near               ; DATA XREF: .rdata:00517ADCo
-
-var_4           = dword ptr -4
-pThis           = dword ptr  4
-propIDs         = dword ptr  8
-properties      = dword ptr  0Ch
-numProperties   = dword ptr  10h
-
-                push    ecx
-                push    ebx
-                push    ebp
-                xor     edx, edx
-                cmp     [esp+0Ch+numProperties], edx
-                push    esi
-                push    edi
-                mov     [esp+14h+var_4], edx
-                jbe     loc_4CB20D
-                mov     esi, [esp+14h+properties]
-                mov     ebp, [esp+14h+pThis]
-                lea     ecx, [ecx+0]
-
-loc_4CB090:                             ; CODE XREF: sub_4CB070+197j
-                mov     eax, [esp+14h+propIDs]
-                mov     eax, [eax+edx*4]
-                add     eax, 0FFFFFC00h
-                cmp     eax, 90h        ; switch 145 cases
-                ja      loc_4CB131      ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                movzx   ecx, ds:byte_4CB248[eax]
-                jmp     ds:off_4CB218[ecx*4] ; switch jump
-
-loc_4CB0B5:                             ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 80
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, [esi+8]
-                lea     ecx, [eax-5]
-                cmp     ecx, 10Ch
-                ja      short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     [ebp+32EF0h], eax
-                jmp     loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB0D4:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 82
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, [esi+8]
-                mov     [ebp+33B88h], eax
-                jmp     loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB0E8:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 112
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                cmp     dword ptr [esi+8], 0
-                setz    cl
-                mov     [ebp+32EECh], cl
-                jmp     loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB100:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 8 ; jumptable 004CB0AE case 81
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, [esi+8]
-                lea     edi, [ebp+0C4h]
-                lea     ebx, [ebp+0CCh]
-                call    sub_4CAFC0
-                test    eax, eax
-                jz      short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     edx, [esp+14h+var_4]
-                jmp     loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB127:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 0Bh ; jumptable 004CB0AE case 128
-                jz      loc_4CB1F9
-
-loc_4CB131:                             ; CODE XREF: sub_4CB070+31j
-                                        ; sub_4CB070+3Ej ...
-                pop     edi             ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                pop     esi
-                pop     ebp
-                mov     eax, 80070057h
-                pop     ebx
-                pop     ecx
-                retn    10h
-; ---------------------------------------------------------------------------
-
-loc_4CB13E:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 129
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                jmp     loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB149:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 0
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, [esi+8]
-                lea     ecx, [eax-1]
-                cmp     ecx, 3FFFFFFFh
-                ja      short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     [ebp+33B64h], eax
-                xor     ecx, ecx
-
-loc_4CB165:                             ; CODE XREF: sub_4CB070+106j
-                mov     edi, 1
-                shl     edi, cl
-                cmp     eax, edi
-                jbe     short loc_4CB178
-                add     ecx, 1
-                cmp     ecx, 1Eh
-                jb      short loc_4CB165
-
-loc_4CB178:                             ; CODE XREF: sub_4CB070+FEj
-                lea     eax, [ecx+ecx]
-                mov     [ebp+33B50h], eax
-                jmp     short loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB183:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 64
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     ecx, [esi+8]
-                cmp     ecx, 4
-                ja      short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, 1
-                shl     eax, cl
-                mov     [ebp+33B54h], ecx
-                sub     eax, 1
-                mov     [ebp+33B58h], eax
-                jmp     short loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB1A9:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 66
-                jnz     short loc_4CB131 ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, [esi+8]
-                cmp     eax, 4
-                ja      loc_4CB131      ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     [ebp+33B5Ch], eax
-                jmp     short loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB1C3:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 13h ; jumptable 004CB0AE case 65
-                jnz     loc_4CB131      ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     eax, [esi+8]
-                cmp     eax, 8
-                ja      loc_4CB131      ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                mov     [ebp+33B60h], eax
-                jmp     short loc_4CB1F9
-; ---------------------------------------------------------------------------
-
-loc_4CB1E1:                             ; CODE XREF: sub_4CB070+3Ej
-                                        ; DATA XREF: .text:off_4CB218o
-                cmp     word ptr [esi], 0Bh ; jumptable 004CB0AE case 144
-                jnz     loc_4CB131      ; default
-                                        ; jumptable 004CB0AE cases 1-63,67-79,83-111,113-127,130-143
-                cmp     word ptr [esi+8], 0FFFFh
-                setz    cl
-                mov     [ebp+33B8Ch], cl
-
-loc_4CB1F9:                             ; CODE XREF: sub_4CB070+5Fj
-                                        ; sub_4CB070+73j ...
-                add     edx, 1
-                add     esi, 10h
-                cmp     edx, [esp+14h+numProperties]
-                mov     [esp+14h+var_4], edx
-                jb      loc_4CB090
-
-loc_4CB20D:                             ; CODE XREF: sub_4CB070+Fj
-                pop     edi
-                pop     esi
-                pop     ebp
-                xor     eax, eax
-                pop     ebx
-                pop     ecx
-                retn    10h
-
-off_4CB218      dd offset loc_4CB149, offset loc_4CB183, offset loc_4CB1C3
-                dd offset loc_4CB1A9, offset loc_4CB0B5, offset loc_4CB100 ; jump table for switch statement
-                dd offset loc_4CB0D4, offset loc_4CB0E8, offset loc_4CB127
-                dd offset loc_4CB13E, offset loc_4CB1E1, offset loc_4CB131
-
-ICompressSetCoderProperties_SetCoderProperties      endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CB2E0      proc near               ; CODE XREF: CEncoder_GetOptimum+1199p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_4]
-                lea     eax, [esi+esi*4]
-                lea     edx, [ecx+eax*8]
-                mov     [ecx+32F08h], esi
-                mov     eax, [edx+100h]
-                mov     ebx, [edx+104h]
-                push    edi
-
-loc_4CB300:                             ; CODE XREF: sub_4CB2E0+A6j
-                lea     edx, [esi+esi*4]
-                cmp     byte ptr [ecx+edx*8+0F1h], 0
-                lea     edi, [ecx+edx*8]
-                jz      short loc_4CB359
-                lea     edx, [eax+eax*4+1Eh]
-                lea     edx, [ecx+edx*8]
-                mov     dword ptr [edx+14h], 0FFFFFFFFh
-                mov     byte ptr [edx+1], 0
-                lea     edx, [eax+eax*4]
-                lea     edx, [ecx+edx*8]
-                lea     ebp, [eax-1]
-                mov     [edx+100h], ebp
-                cmp     byte ptr [edi+0F2h], 0
-                jz      short loc_4CB359
-                mov     byte ptr [edx+0C9h], 0
-                mov     ebp, [edi+0F4h]
-                mov     [edx+0D8h], ebp
-                mov     edi, [edi+0F8h]
-                mov     [edx+0DCh], edi
-
-loc_4CB359:                             ; CODE XREF: sub_4CB2E0+2Ej
-                                        ; sub_4CB2E0+58j
-                lea     edx, [eax+eax*4]
-                add     edx, edx
-                add     edx, edx
-                add     edx, edx
-                mov     edi, eax
-                test    edi, edi
-                mov     eax, [edx+ecx+100h]
-                mov     ebp, ebx
-                mov     ebx, [edx+ecx+104h]
-                mov     [edx+ecx+100h], esi
-                mov     [edx+ecx+104h], ebp
-                mov     esi, edi
-                jnz     loc_4CB300
-                mov     eax, [ecx+104h]
-                mov     edx, [esp+10h+arg_0]
-                pop     edi
-                pop     esi
-                mov     [edx], eax
-                mov     eax, [ecx+100h]
-                pop     ebp
-                mov     [ecx+32F0Ch], eax
-                pop     ebx
-                retn    8
-sub_4CB2E0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CB3B0      proc near               ; CODE XREF: CEncoder_GetOptimumFast+2Dp
-                                        ; CEncoder_GetOptimumFast+28Fp ...
-
-arg_0           = dword ptr  4
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, ecx
-                mov     ecx, [esi+80h]
-                mov     edx, [esi+78h]
-                lea     eax, [esi+32660h]
-                push    eax
-                push    ecx
-                xor     ebx, ebx
-                call    edx
-                mov     ebp, [esp+14h+arg_0]
-                add     esp, 8
-                test    eax, eax
-                mov     [ebp+0], eax
-                jbe     short loc_4CB446
-                mov     ebx, [esi+eax*4+32658h]
-                cmp     ebx, [esi+32EF8h]
-                jnz     short loc_4CB446
-                mov     eax, [esi+80h]
-                mov     ecx, [esi+70h]
-                push    edi
-                push    eax
-                call    ecx
-                mov     edx, [esi+80h]
-                mov     edi, eax
-                mov     eax, [esi+74h]
-                push    edx
-                add     edi, 1
-                call    eax
-                mov     ecx, [ebp+0]
-                mov     ecx, [esi+ecx*4+3265Ch]
-                add     esp, 8
-                sub     eax, 1
-                add     ecx, 1
-                cmp     edi, 111h
-                jbe     short loc_4CB425
-                mov     edi, 111h
-
-loc_4CB425:                             ; CODE XREF: sub_4CB3B0+6Ej
-                mov     edx, eax
-                sub     edx, ecx
-                cmp     ebx, edi
-                jnb     short loc_4CB445
-                mov     ebp, edx
-                lea     ecx, [eax+ebx]
-                sub     ebp, eax
-
-loc_4CB434:                             ; CODE XREF: sub_4CB3B0+93j
-                mov     dl, [ecx]
-                cmp     dl, [ecx+ebp]
-                jnz     short loc_4CB445
-                add     ebx, 1
-                add     ecx, 1
-                cmp     ebx, edi
-                jb      short loc_4CB434
-
-loc_4CB445:                             ; CODE XREF: sub_4CB3B0+7Bj
-                                        ; sub_4CB3B0+89j
-                pop     edi
-
-loc_4CB446:                             ; CODE XREF: sub_4CB3B0+26j
-                                        ; sub_4CB3B0+35j
-                add     dword ptr [esi+32F04h], 1
-                pop     esi
-                pop     ebp
-                mov     eax, ebx
-                pop     ebx
-                retn    4
-sub_4CB3B0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-CEncoder_GetOptimumFast proc near       ; CODE XREF: CEncoder_CodeOneBlock+1F4p
-
-var_28          = dword ptr -28h
-var_24          = dword ptr -24h
-var_20          = dword ptr -20h
-var_1C          = dword ptr -1Ch
-var_18          = dword ptr -18h
-var_14          = dword ptr -14h
-var_10          = dword ptr -10h
-arg_0           = dword ptr  4
-
-                sub     esp, 28h
-                push    ebx
-                push    esi
-                push    edi
-                mov     edi, ecx
-                mov     eax, [edi+80h]
-                mov     ecx, [edi+70h]
-                push    eax
-                call    ecx
-                add     esp, 4
-                cmp     byte ptr [edi+32F10h], 0
-                mov     esi, eax
-                mov     [esp+34h+var_24], esi
-                jnz     short loc_4CB498
-                lea     edx, [esp+34h+var_20]
-                push    edx
-                mov     ecx, edi
-                call    sub_4CB3B0
-                mov     ebx, [esp+34h+var_20]
-                jmp     short loc_4CB4AF
-; ---------------------------------------------------------------------------
-
-loc_4CB498:                             ; CODE XREF: CEncoder_GetOptimumFast+24j
-                mov     ebx, [edi+32F00h]
-                mov     eax, [edi+32EFCh]
-                mov     [esp+34h+var_20], ebx
-                mov     byte ptr [edi+32F10h], 0
-
-loc_4CB4AF:                             ; CODE XREF: CEncoder_GetOptimumFast+36j
-                mov     ecx, [edi+80h]
-                mov     edx, [edi+74h]
-                push    ecx
-                mov     [esp+38h+var_28], eax
-                call    edx
-                add     esp, 4
-                sub     eax, 1
-                cmp     esi, 111h
-                jbe     loc_4CB55E
-                mov     [esp+34h+var_24], 111h
-
-loc_4CB4D9:                             ; CODE XREF: CEncoder_GetOptimumFast+101j
-                push    ebp
-                xor     ebp, ebp
-                lea     ecx, [edi+14h]
-                mov     [esp+38h+var_18], ebp
-                mov     [esp+38h+var_14], ebp
-                mov     [esp+38h+var_1C], ecx
-                jmp     short loc_4CB4F0
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CB4F0:                             ; CODE XREF: CEncoder_GetOptimumFast+8Bj
-                                        ; CEncoder_GetOptimumFast+132j
-                mov     edx, [esp+38h+var_1C]
-                mov     ecx, eax
-                sub     ecx, [edx]
-                mov     dl, [eax]
-                sub     ecx, 1
-                cmp     dl, [ecx]
-                jnz     short loc_4CB57F
-                mov     dl, [eax+1]
-                cmp     dl, [ecx+1]
-                jnz     short loc_4CB57F
-                mov     esi, 2
-                cmp     [esp+38h+var_24], esi
-                jbe     short loc_4CB537
-                lea     edx, [eax+2]
-                sub     ecx, eax
-                lea     esp, [esp+0]
-
-loc_4CB520:                             ; CODE XREF: CEncoder_GetOptimumFast+D1j
-                mov     bl, [edx]
-                cmp     bl, [ecx+edx]
-                jnz     short loc_4CB533
-                add     esi, 1
-                add     edx, 1
-                cmp     esi, [esp+38h+var_24]
-                jb      short loc_4CB520
-
-loc_4CB533:                             ; CODE XREF: CEncoder_GetOptimumFast+C5j
-                mov     ebx, [esp+38h+var_20]
-
-loc_4CB537:                             ; CODE XREF: CEncoder_GetOptimumFast+B2j
-                cmp     esi, [edi+32EF8h]
-                jnb     short loc_4CB5B9
-                mov     edx, [esp+38h+var_14]
-                lea     ecx, ds:0[ebp*4]
-                mov     [esp+ecx+38h+var_10], esi
-                cmp     esi, [esp+edx+38h+var_10]
-                jbe     short loc_4CB587
-                mov     [esp+38h+var_18], ebp
-                mov     [esp+38h+var_14], ecx
-                jmp     short loc_4CB587
-; ---------------------------------------------------------------------------
-
-loc_4CB55E:                             ; CODE XREF: CEncoder_GetOptimumFast+6Bj
-                cmp     esi, 2
-                jnb     loc_4CB4D9
-                mov     eax, [esp+34h+arg_0]
-                pop     edi
-                pop     esi
-                mov     dword ptr [eax], 0FFFFFFFFh
-                mov     eax, 1
-                pop     ebx
-                add     esp, 28h
-                retn    4
-; ---------------------------------------------------------------------------
-
-loc_4CB57F:                             ; CODE XREF: CEncoder_GetOptimumFast+9Fj
-                                        ; CEncoder_GetOptimumFast+A7j
-                mov     [esp+ebp*4+38h+var_10], 0
-
-loc_4CB587:                             ; CODE XREF: CEncoder_GetOptimumFast+F2j
-                                        ; CEncoder_GetOptimumFast+FCj
-                add     [esp+38h+var_1C], 4
-                add     ebp, 1
-                cmp     ebp, 4
-                jb      loc_4CB4F0
-                mov     esi, [esp+38h+var_28]
-                cmp     esi, [edi+32EF8h]
-                jb      short loc_4CB5EC
-                mov     eax, [edi+ebx*4+3265Ch]
-                mov     ecx, [esp+38h+arg_0]
-                add     eax, 4
-                mov     [ecx], eax
-                jmp     loc_4CB69A
-; ---------------------------------------------------------------------------
-
-loc_4CB5B9:                             ; CODE XREF: CEncoder_GetOptimumFast+DDj
-                mov     eax, [esp+38h+arg_0]
-                mov     [eax], ebp
-                lea     eax, [esi-1]
-                test    eax, eax
-                jz      loc_4CB82E
-                mov     ecx, [edi+80h]
-                mov     edx, [edi+7Ch]
-                add     [edi+32F04h], eax
-                push    eax
-                push    ecx
-                call    edx
-                add     esp, 8
-                pop     ebp
-                pop     edi
-                mov     eax, esi
-                pop     esi
-                pop     ebx
-                add     esp, 28h
-                retn    4
-; ---------------------------------------------------------------------------
-
-loc_4CB5EC:                             ; CODE XREF: CEncoder_GetOptimumFast+142j
-                xor     ebp, ebp
-                cmp     esi, 2
-                mov     [esp+38h+var_20], ebp
-                jb      short loc_4CB65A
-                cmp     ebx, 2
-                mov     ecx, [edi+ebx*4+3265Ch]
-                mov     [esp+38h+var_20], ecx
-                jbe     short loc_4CB63F
-                lea     eax, [edi+ebx*4+32654h]
-                mov     edi, edi
-
-loc_4CB610:                             ; CODE XREF: CEncoder_GetOptimumFast+1DDj
-                mov     edx, [eax-4]
-                add     edx, 1
-                cmp     esi, edx
-                jnz     short loc_4CB63F
-                mov     ecx, [esp+38h+var_20]
-                shr     ecx, 7
-                cmp     ecx, [eax]
-                jbe     short loc_4CB63F
-                mov     edx, [eax-4]
-                mov     ecx, [eax]
-                sub     eax, 8
-                sub     ebx, 2
-                cmp     ebx, 2
-                mov     [esp+38h+var_28], edx
-                mov     [esp+38h+var_20], ecx
-                mov     esi, edx
-                ja      short loc_4CB610
-
-loc_4CB63F:                             ; CODE XREF: CEncoder_GetOptimumFast+1A5j
-                                        ; CEncoder_GetOptimumFast+1B8j ...
-                cmp     esi, 2
-                jnz     short loc_4CB656
-                cmp     [esp+38h+var_20], 80h
-                jb      short loc_4CB656
-                mov     [esp+38h+var_28], 1
-
-loc_4CB656:                             ; CODE XREF: CEncoder_GetOptimumFast+1E2j
-                                        ; CEncoder_GetOptimumFast+1ECj
-                mov     ebp, [esp+38h+var_20]
-
-loc_4CB65A:                             ; CODE XREF: CEncoder_GetOptimumFast+195j
-                mov     edx, [esp+38h+var_18]
-                mov     esi, [esp+edx*4+38h+var_10]
-                cmp     esi, 2
-                mov     ebx, [esp+38h+var_28]
-                jb      short loc_4CB6C7
-                lea     eax, [esi+1]
-                cmp     eax, ebx
-                jnb     short loc_4CB690
-                lea     ecx, [esi+2]
-                cmp     ecx, ebx
-                jb      short loc_4CB681
-                cmp     ebp, 200h
-                ja      short loc_4CB690
-
-loc_4CB681:                             ; CODE XREF: CEncoder_GetOptimumFast+217j
-                lea     edx, [esi+3]
-                cmp     edx, ebx
-                jb      short loc_4CB6C7
-                cmp     ebp, 8000h
-                jbe     short loc_4CB6C7
-
-loc_4CB690:                             ; CODE XREF: CEncoder_GetOptimumFast+210j
-                                        ; CEncoder_GetOptimumFast+21Fj
-                mov     eax, [esp+38h+arg_0]
-                mov     ecx, [esp+38h+var_18]
-                mov     [eax], ecx
-
-loc_4CB69A:                             ; CODE XREF: CEncoder_GetOptimumFast+154j
-                lea     eax, [esi-1]
-                test    eax, eax
-                jz      loc_4CB82E
-                mov     edx, [edi+80h]
-                add     [edi+32F04h], eax
-                push    eax
-                mov     eax, [edi+7Ch]
-                push    edx
-                call    eax
-                add     esp, 8
-                pop     ebp
-                pop     edi
-                mov     eax, esi
-                pop     esi
-                pop     ebx
-                add     esp, 28h
-                retn    4
-; ---------------------------------------------------------------------------
-
-loc_4CB6C7:                             ; CODE XREF: CEncoder_GetOptimumFast+209j
-                                        ; CEncoder_GetOptimumFast+226j ...
-                cmp     ebx, 2
-                jb      short loc_4CB73E
-                cmp     [esp+38h+var_24], 2
-                jbe     short loc_4CB73E
-                mov     ecx, [edi+80h]
-                mov     edx, [edi+70h]
-                push    ecx
-                call    edx
-                add     esp, 4
-                lea     esi, [edi+32F00h]
-                push    esi
-                mov     ecx, edi
-                mov     [esp+3Ch+var_24], eax
-                call    sub_4CB3B0
-                cmp     eax, 2
-                mov     [edi+32EFCh], eax
-                jb      short loc_4CB757
-                cmp     eax, ebx
-                mov     ecx, [esi]
-                mov     edx, [edi+ecx*4+3265Ch]
-                jb      short loc_4CB710
-                cmp     edx, ebp
-                jb      short loc_4CB737
-
-loc_4CB710:                             ; CODE XREF: CEncoder_GetOptimumFast+2AAj
-                lea     ecx, [ebx+1]
-                cmp     eax, ecx
-                jnz     short loc_4CB722
-                mov     esi, edx
-                shr     esi, 7
-                cmp     esi, ebp
-                jbe     short loc_4CB737
-                cmp     eax, ecx
-
-loc_4CB722:                             ; CODE XREF: CEncoder_GetOptimumFast+2B5j
-                ja      short loc_4CB737
-                add     eax, 1
-                cmp     eax, ebx
-                jb      short loc_4CB757
-                cmp     ebx, 3
-                jb      short loc_4CB757
-                shr     ebp, 7
-                cmp     ebp, edx
-                jbe     short loc_4CB757
-
-loc_4CB737:                             ; CODE XREF: CEncoder_GetOptimumFast+2AEj
-                                        ; CEncoder_GetOptimumFast+2BEj ...
-                mov     byte ptr [edi+32F10h], 1
-
-loc_4CB73E:                             ; CODE XREF: CEncoder_GetOptimumFast+26Aj
-                                        ; CEncoder_GetOptimumFast+271j
-                mov     edx, [esp+38h+arg_0]
-                pop     ebp
-                pop     edi
-                pop     esi
-                mov     dword ptr [edx], 0FFFFFFFFh
-                mov     eax, 1
-                pop     ebx
-                add     esp, 28h
-                retn    4
-; ---------------------------------------------------------------------------
-
-loc_4CB757:                             ; CODE XREF: CEncoder_GetOptimumFast+29Dj
-                                        ; CEncoder_GetOptimumFast+2C9j ...
-                mov     eax, [edi+80h]
-                mov     ecx, [edi+74h]
-                push    eax
-                call    ecx
-                lea     ecx, [edi+14h]
-                add     esp, 4
-                sub     eax, 1
-                mov     [esp+38h+var_18], 0
-                mov     ebx, ecx
-
-loc_4CB776:                             ; CODE XREF: CEncoder_GetOptimumFast+39Aj
-                mov     dl, [eax+1]
-                mov     ecx, eax
-                sub     ecx, [ebx]
-                sub     ecx, 1
-                cmp     dl, [ecx+1]
-                jnz     short loc_4CB7DD
-                mov     dl, [eax+2]
-                cmp     dl, [ecx+2]
-                lea     ebp, [eax+2]
-                jnz     short loc_4CB7DD
-                mov     esi, 2
-                cmp     [esp+38h+var_24], esi
-                jbe     short loc_4CB7B4
-                mov     edx, ebp
-                mov     ebp, ecx
-                sub     ebp, eax
-
-loc_4CB7A1:                             ; CODE XREF: CEncoder_GetOptimumFast+352j
-                mov     cl, [edx]
-                cmp     cl, [edx+ebp]
-                jnz     short loc_4CB7B4
-                add     esi, 1
-                add     edx, 1
-                cmp     esi, [esp+38h+var_24]
-                jb      short loc_4CB7A1
-
-loc_4CB7B4:                             ; CODE XREF: CEncoder_GetOptimumFast+339j
-                                        ; CEncoder_GetOptimumFast+346j
-                add     esi, 1
-                cmp     esi, [esp+38h+var_28]
-                jb      short loc_4CB7E9
-                mov     eax, [esp+38h+arg_0]
-                pop     ebp
-                mov     byte ptr [edi+32F10h], 1
-                pop     edi
-                pop     esi
-                mov     dword ptr [eax], 0FFFFFFFFh
-                mov     eax, 1
-                pop     ebx
-                add     esp, 28h
-                retn    4
-; ---------------------------------------------------------------------------
-
-loc_4CB7DD:                             ; CODE XREF: CEncoder_GetOptimumFast+323j
-                                        ; CEncoder_GetOptimumFast+32Ej
-                mov     edx, [esp+38h+var_18]
-                mov     [esp+edx*4+38h+var_10], 0
-
-loc_4CB7E9:                             ; CODE XREF: CEncoder_GetOptimumFast+35Bj
-                mov     ecx, [esp+38h+var_18]
-                add     ecx, 1
-                add     ebx, 4
-                cmp     ecx, 4
-                mov     [esp+38h+var_18], ecx
-                jb      loc_4CB776
-                mov     esi, [esp+38h+var_28]
-                mov     ecx, [esp+38h+var_20]
-                mov     edx, [esp+38h+arg_0]
-                add     ecx, 4
-                lea     eax, [esi-2]
-                test    eax, eax
-                mov     [edx], ecx
-                jz      short loc_4CB82E
-                add     [edi+32F04h], eax
-                mov     ecx, [edi+7Ch]
-                push    eax
-                mov     eax, [edi+80h]
-                push    eax
-                call    ecx
-                add     esp, 8
-
-loc_4CB82E:                             ; CODE XREF: CEncoder_GetOptimumFast+164j
-                                        ; CEncoder_GetOptimumFast+23Fj ...
-                pop     ebp
-                pop     edi
-                mov     eax, esi
-                pop     esi
-                pop     ebx
-                add     esp, 28h
-                retn    4
-CEncoder_GetOptimumFast endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CB8A0      proc near               ; CODE XREF: sub_4CD940+37p
-
-arg_0           = dword ptr  4
-
-                push    edi
-                mov     edi, [esp+4+arg_0]
-                test    edi, edi
-                jz      short loc_4CB8EB
-                mov     eax, dword_553598
-                test    eax, eax
-                jnz     short loc_4CB8DD
-                push    0Ch             ; Size
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                test    eax, eax
-                jz      short loc_4CB8D6
-                mov     dword ptr [eax], 0
-                mov     dword ptr [eax+4], 0
-                mov     dword ptr [eax+8], 0
-                jmp     short loc_4CB8D8
-; ---------------------------------------------------------------------------
-
-loc_4CB8D6:                             ; CODE XREF: sub_4CB8A0+1Ej
-                xor     eax, eax
-
-loc_4CB8D8:                             ; CODE XREF: sub_4CB8A0+34j
-                mov     dword_553598, eax
-
-loc_4CB8DD:                             ; CODE XREF: sub_4CB8A0+10j
-                mov     eax, [eax]
-                test    eax, eax
-                jz      short loc_4CB8EB
-                push    edi
-                call    eax
-                add     esp, 4
-                pop     edi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CB8EB:                             ; CODE XREF: sub_4CB8A0+7j
-                                        ; sub_4CB8A0+41j
-                xor     eax, eax
-                pop     edi
-                retn
-sub_4CB8A0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CB8F0      proc near               ; CODE XREF: sub_4CBA60+85p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                push    edi
-                mov     edi, [esi+44h]
-                add     edi, [esi+40h]
-                add     edi, [esp+8+arg_4]
-                cmp     dword ptr [esi+4Ch], 0
-                jz      short loc_4CB911
-                mov     [esi+3Ch], edi
-                pop     edi
-                mov     eax, 1
-                pop     esi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CB911:                             ; CODE XREF: sub_4CB8F0+14j
-                mov     eax, [esi+30h]
-                test    eax, eax
-                jz      short loc_4CB91D
-                cmp     [esi+3Ch], edi
-                jz      short loc_4CB93E
-
-loc_4CB91D:                             ; CODE XREF: sub_4CB8F0+26j
-                push    ebx
-                mov     ebx, [esp+0Ch+arg_8]
-                push    eax
-                mov     eax, [ebx+4]
-                call    eax
-                mov     dword ptr [esi+30h], 0
-                mov     [esi+3Ch], edi
-                mov     ecx, [ebx]
-                push    edi
-                call    ecx
-                add     esp, 8
-                mov     [esi+30h], eax
-                pop     ebx
-
-loc_4CB93E:                             ; CODE XREF: sub_4CB8F0+2Bj
-                xor     eax, eax
-                cmp     [esi+30h], eax
-                pop     edi
-                setnz   al
-                pop     esi
-                retn
-sub_4CB8F0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CB950:                             ; DATA XREF: sub_4CCAA0+1Co
-                mov     eax, [esp+4]
-                mov     eax, [eax]
-                retn
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CB960:                             ; DATA XREF: sub_4CCAA0+Eo
-                mov     eax, [esp+4]
-                mov     ecx, [eax]
-                mov     edx, [esp+8]
-                mov     al, [edx+ecx]
-                retn
-; ---------------------------------------------------------------------------
-                align 10h
-loc_4CB970:                             ; DATA XREF: sub_4CCAA0+15o
-                mov     ecx, [esp+4]
-
-; =============== S U B R O U T I N E =======================================
-
-; Attributes: library function
-
-; public: int __thiscall CRect::Height(void)const
-?Height@CRect@@QBEHXZ proc near
-                mov     eax, [ecx+0Ch]
-                sub     eax, [ecx+4]
-                retn
-?Height@CRect@@QBEHXZ endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CB980      proc near               ; CODE XREF: sub_4CBC80+46p
-                                        ; sub_4CBD50+61p
-
-arg_0           = dword ptr  4
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                cmp     dword ptr [esi+38h], 0
-                jnz     short loc_4CB9F0
-                cmp     dword ptr [esi+68h], 0
-                jnz     short loc_4CB9F0
-                mov     eax, [esi]
-                sub     eax, [esi+4]
-                mov     ecx, [esi+30h]
-                add     eax, [esi+0Ch]
-                sub     ecx, eax
-                add     ecx, [esi+3Ch]
-                jz      short loc_4CB9F0
-                push    edi
-
-loc_4CB9A4:                             ; CODE XREF: sub_4CB980+63j
-                mov     edx, [esi+34h]
-                lea     edi, [esp+8+arg_0]
-                push    edi
-                push    ecx
-                push    eax
-                mov     eax, [edx]
-                push    edx
-                call    eax
-                add     esp, 10h
-                test    eax, eax
-                mov     [esi+68h], eax
-                jnz     short loc_4CB9EF
-                mov     eax, [esp+8+arg_0]
-                test    eax, eax
-                jz      short loc_4CB9E8
-                add     [esi+0Ch], eax
-                mov     eax, [esi+0Ch]
-                sub     eax, [esi+4]
-                cmp     eax, [esi+44h]
-                ja      short loc_4CB9EF
-                mov     eax, [esi]
-                sub     eax, [esi+4]
-                mov     ecx, [esi+30h]
-                add     eax, [esi+0Ch]
-                sub     ecx, eax
-                add     ecx, [esi+3Ch]
-                jnz     short loc_4CB9A4
-                pop     edi
-                pop     esi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CB9E8:                             ; CODE XREF: sub_4CB980+43j
-                mov     dword ptr [esi+38h], 1
-
-loc_4CB9EF:                             ; CODE XREF: sub_4CB980+3Bj
-                                        ; sub_4CB980+51j
-                pop     edi
-
-loc_4CB9F0:                             ; CODE XREF: sub_4CB980+9j
-                                        ; sub_4CB980+Fj ...
-                pop     esi
-                retn
-sub_4CB980      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBA00      proc near               ; CODE XREF: sub_4CBD50+58p
-
-arg_0           = dword ptr  4
-
-                push    ebx
-                push    ebp
-                push    esi
-                push    edi
-                mov     edi, [esp+10h+arg_0]
-                mov     esi, [edi+0Ch]
-                mov     eax, [edi+40h]
-                sub     esi, [edi+4]
-                mov     ebx, [edi]
-                mov     ebp, [edi+30h]
-                add     esi, eax
-                sub     ebx, eax
-                mov     eax, dword_553598
-                test    eax, eax
-                jnz     short loc_4CBA44
-                push    0Ch             ; Size
-                call    _operator_new  ; operator new(uint)
-                xor     ecx, ecx
-                add     esp, 4
-                cmp     eax, ecx
-                jz      short loc_4CBA3D
-                mov     [eax], ecx
-                mov     [eax+4], ecx
-                mov     [eax+8], ecx
-                jmp     short loc_4CBA3F
-; ---------------------------------------------------------------------------
-
-loc_4CBA3D:                             ; CODE XREF: sub_4CBA00+31j
-                xor     eax, eax
-
-loc_4CBA3F:                             ; CODE XREF: sub_4CBA00+3Bj
-                mov     dword_553598, eax
-
-loc_4CBA44:                             ; CODE XREF: sub_4CBA00+21j
-                mov     eax, [eax+8]
-                test    eax, eax
-                jz      short loc_4CBA53
-                push    esi
-                push    ebx
-                push    ebp
-                call    eax
-                add     esp, 0Ch
-
-loc_4CBA53:                             ; CODE XREF: sub_4CBA00+49j
-                mov     eax, [edi+30h]
-                add     eax, [edi+40h]
-                mov     [edi], eax
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn
-sub_4CBA00      endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBA60      proc near               ; CODE XREF: sub_4D0270+D2p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-arg_10          = dword ptr  14h
-arg_14          = dword ptr  18h
-
-                push    ebx
-                push    esi
-                push    edi
-                mov     edi, [esp+0Ch+arg_4]
-                cmp     edi, 0C0000000h
-                jbe     short loc_4CBAA2
-                mov     esi, [esp+0Ch+arg_0]
-                mov     eax, [esi+20h]
-                mov     edi, [esp+0Ch+arg_14]
-                mov     ecx, [edi+4]
-                push    eax
-                call    ecx
-                xor     ebx, ebx
-                add     esp, 4
-                cmp     [esi+4Ch], ebx
-                mov     [esi+20h], ebx
-                jnz     short loc_4CBA9C
-                mov     edx, [esi+30h]
-                mov     eax, [edi+4]
-                push    edx
-                call    eax
-                add     esp, 4
-                mov     [esi+30h], ebx
-
-loc_4CBA9C:                             ; CODE XREF: sub_4CBA60+2Bj
-                pop     edi
-                pop     esi
-                xor     eax, eax
-                pop     ebx
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CBAA2:                             ; CODE XREF: sub_4CBA60+Dj
-                mov     eax, edi
-                shr     eax, 1
-                cmp     edi, 80000000h
-                jbe     short loc_4CBAB3
-                mov     eax, edi
-                shr     eax, 2
-
-loc_4CBAB3:                             ; CODE XREF: sub_4CBA60+4Cj
-                mov     ecx, [esp+0Ch+arg_8]
-                mov     esi, [esp+0Ch+arg_0]
-                mov     ebx, [esp+0Ch+arg_C]
-                lea     edx, [edi+ecx+1]
-                push    ebp
-                mov     [esi+40h], edx
-                mov     edx, [esp+10h+arg_10]
-                add     ecx, ebx
-                lea     ebp, [ebx+edx]
-                add     ecx, edx
-                mov     [esi+44h], ebp
-                mov     ebp, [esp+10h+arg_14]
-                shr     ecx, 1
-                push    ebp
-                lea     eax, [ecx+eax+80000h]
-                push    eax
-                push    esi
-                call    sub_4CB8F0
-                add     esp, 0Ch
-                test    eax, eax
-                jz      loc_4CBBEA
-                mov     edx, [esi+48h]
-                mov     [esi+1Ch], ebx
-                xor     ebx, ebx
-                cmp     edx, 2
-                lea     ebp, [edi+1]
-                mov     [esi+5Ch], ebx
-                jnz     short loc_4CBB0F
-                mov     eax, 0FFFFh
-                jmp     short loc_4CBB49
-; ---------------------------------------------------------------------------
-
-loc_4CBB0F:                             ; CODE XREF: sub_4CBA60+A6j
-                lea     ecx, [edi-1]
-                mov     eax, ecx
-                shr     eax, 1
-                or      ecx, eax
-                mov     eax, ecx
-                shr     eax, 2
-                or      ecx, eax
-                mov     eax, ecx
-                shr     eax, 4
-                or      ecx, eax
-                mov     eax, ecx
-                or      eax, 1FFFE00h
-                shr     eax, 8
-                or      eax, ecx
-                shr     eax, 1
-                cmp     eax, 1000000h
-                jbe     short loc_4CBB49
-                cmp     edx, 3
-                jnz     short loc_4CBB47
-                mov     eax, 0FFFFFFh
-                jmp     short loc_4CBB49
-; ---------------------------------------------------------------------------
-
-loc_4CBB47:                             ; CODE XREF: sub_4CBA60+DEj
-                shr     eax, 1
-
-loc_4CBB49:                             ; CODE XREF: sub_4CBA60+ADj
-                                        ; sub_4CBA60+D9j ...
-                mov     [esi+28h], eax
-                add     eax, 1
-                cmp     edx, 2
-                jbe     short loc_4CBB5B
-                mov     dword ptr [esi+5Ch], 400h
-
-loc_4CBB5B:                             ; CODE XREF: sub_4CBA60+F2j
-                cmp     edx, 3
-                jbe     short loc_4CBB67
-                add     dword ptr [esi+5Ch], 10000h
-
-loc_4CBB67:                             ; CODE XREF: sub_4CBA60+FEj
-                cmp     edx, 4
-                jbe     short loc_4CBB73
-                add     dword ptr [esi+5Ch], 100000h
-
-loc_4CBB73:                             ; CODE XREF: sub_4CBA60+10Aj
-                mov     ecx, [esi+60h]
-                mov     edx, [esi+5Ch]
-                add     ecx, [esi+64h]
-                add     eax, edx
-                cmp     [esi+50h], ebx
-                mov     [esi+58h], edi
-                mov     [esi+60h], eax
-                mov     [esi+18h], ebp
-                lea     edx, [ebp+ebp+0]
-                jnz     short loc_4CBB92
-                mov     edx, ebp
-
-loc_4CBB92:                             ; CODE XREF: sub_4CBA60+12Ej
-                lea     edi, [eax+edx]
-                mov     eax, [esi+20h]
-                cmp     eax, ebx
-                mov     [esi+64h], edx
-                jz      short loc_4CBBA3
-                cmp     ecx, edi
-                jz      short loc_4CBBE0
-
-loc_4CBBA3:                             ; CODE XREF: sub_4CBA60+13Dj
-                mov     ebp, [esp+10h+arg_14]
-                push    eax
-                mov     eax, [ebp+4]
-                call    eax
-                lea     eax, ds:0[edi*4]
-                mov     ecx, eax
-                shr     ecx, 2
-                add     esp, 4
-                cmp     ecx, edi
-                mov     [esi+20h], ebx
-                jz      short loc_4CBBC7
-                xor     eax, eax
-                jmp     short loc_4CBBD0
-; ---------------------------------------------------------------------------
-
-loc_4CBBC7:                             ; CODE XREF: sub_4CBA60+161j
-                mov     edx, [ebp+0]
-                push    eax
-                call    edx
-                add     esp, 4
-
-loc_4CBBD0:                             ; CODE XREF: sub_4CBA60+165j
-                cmp     eax, ebx
-                mov     [esi+20h], eax
-                jz      short loc_4CBBEC
-                mov     ecx, [esi+60h]
-                lea     edx, [eax+ecx*4]
-                mov     [esi+24h], edx
-
-loc_4CBBE0:                             ; CODE XREF: sub_4CBA60+141j
-                pop     ebp
-                pop     edi
-                pop     esi
-                mov     eax, 1
-                pop     ebx
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CBBEA:                             ; CODE XREF: sub_4CBA60+8Fj
-                xor     ebx, ebx
-
-loc_4CBBEC:                             ; CODE XREF: sub_4CBA60+175j
-                mov     eax, [esi+20h]
-                mov     ecx, [ebp+4]
-                push    eax
-                call    ecx
-                add     esp, 4
-                cmp     [esi+4Ch], ebx
-                mov     [esi+20h], ebx
-                jnz     short loc_4CBC0F
-                mov     edx, [esi+30h]
-                mov     eax, [ebp+4]
-                push    edx
-                call    eax
-                add     esp, 4
-                mov     [esi+30h], ebx
-
-loc_4CBC0F:                             ; CODE XREF: sub_4CBA60+19Ej
-                pop     ebp
-                pop     edi
-                pop     esi
-                xor     eax, eax
-                pop     ebx
-                retn
-sub_4CBA60      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBC20      proc near               ; CODE XREF: sub_4CBD50+79p
-
-arg_0           = dword ptr  4
-
-                mov     eax, [esp+arg_0]
-                mov     edx, [eax+18h]
-                sub     edx, [eax+14h]
-                push    ebx
-                mov     ebx, [eax+4]
-                or      ecx, 0FFFFFFFFh
-                sub     ecx, ebx
-                cmp     edx, ecx
-                push    esi
-                jnb     short loc_4CBC3A
-                mov     ecx, edx
-
-loc_4CBC3A:                             ; CODE XREF: sub_4CBC20+16j
-                mov     esi, [eax+0Ch]
-                sub     esi, ebx
-                push    edi
-                mov     edi, [eax+44h]
-                mov     edx, esi
-                cmp     edx, edi
-                ja      short loc_4CBC54
-                test    edx, edx
-                jbe     short loc_4CBC56
-                mov     edx, 1
-                jmp     short loc_4CBC56
-; ---------------------------------------------------------------------------
-
-loc_4CBC54:                             ; CODE XREF: sub_4CBC20+27j
-                sub     edx, edi
-
-loc_4CBC56:                             ; CODE XREF: sub_4CBC20+2Bj
-                                        ; sub_4CBC20+32j
-                cmp     edx, ecx
-                pop     edi
-                jnb     short loc_4CBC5D
-                mov     ecx, edx
-
-loc_4CBC5D:                             ; CODE XREF: sub_4CBC20+39j
-                mov     edx, [eax+1Ch]
-                cmp     esi, edx
-                jbe     short loc_4CBC66
-                mov     esi, edx
-
-loc_4CBC66:                             ; CODE XREF: sub_4CBC20+42j
-                add     ebx, ecx
-                mov     [eax+10h], esi
-                pop     esi
-                mov     [eax+8], ebx
-                pop     ebx
-                retn
-sub_4CBC20      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBC80      proc near               ; DATA XREF: sub_4CCAA0+8o
-
-arg_0           = dword ptr  4
-
-                push    ebx
-                push    esi
-                mov     esi, [esp+8+arg_0]
-                xor     eax, eax
-                cmp     [esi+60h], eax
-                jbe     short loc_4CBCA2
-                lea     ecx, [ecx+0]
-
-loc_4CBC90:                             ; CODE XREF: sub_4CBC80+20j
-                mov     ecx, [esi+20h]
-                mov     dword ptr [ecx+eax*4], 0
-                add     eax, 1
-                cmp     eax, [esi+60h]
-                jb      short loc_4CBC90
-
-loc_4CBCA2:                             ; CODE XREF: sub_4CBC80+Bj
-                mov     eax, [esi+18h]
-                mov     edx, [esi+30h]
-                push    esi
-                mov     dword ptr [esi+14h], 0
-                mov     [esi], edx
-                mov     [esi+0Ch], eax
-                mov     [esi+4], eax
-                mov     dword ptr [esi+68h], 0
-                mov     dword ptr [esi+38h], 0
-                call    sub_4CB980
-                mov     eax, [esi+18h]
-                mov     ebx, [esi+4]
-                sub     eax, [esi+14h]
-                or      ecx, 0FFFFFFFFh
-                sub     ecx, ebx
-                add     esp, 4
-                cmp     eax, ecx
-                jnb     short loc_4CBCE2
-                mov     ecx, eax
-
-loc_4CBCE2:                             ; CODE XREF: sub_4CBC80+5Ej
-                mov     edx, [esi+0Ch]
-                sub     edx, ebx
-                push    edi
-                mov     edi, [esi+44h]
-                mov     eax, edx
-                cmp     eax, edi
-                ja      short loc_4CBCFC
-                test    eax, eax
-                jbe     short loc_4CBCFE
-                mov     eax, 1
-                jmp     short loc_4CBCFE
-; ---------------------------------------------------------------------------
-
-loc_4CBCFC:                             ; CODE XREF: sub_4CBC80+6Fj
-                sub     eax, edi
-
-loc_4CBCFE:                             ; CODE XREF: sub_4CBC80+73j
-                                        ; sub_4CBC80+7Aj
-                cmp     eax, ecx
-                pop     edi
-                jnb     short loc_4CBD05
-                mov     ecx, eax
-
-loc_4CBD05:                             ; CODE XREF: sub_4CBC80+81j
-                mov     eax, edx
-                mov     edx, [esi+1Ch]
-                cmp     eax, edx
-                jbe     short loc_4CBD10
-                mov     eax, edx
-
-loc_4CBD10:                             ; CODE XREF: sub_4CBC80+8Cj
-                add     ebx, ecx
-                mov     [esi+8], ebx
-                mov     [esi+10h], eax
-                pop     esi
-                pop     ebx
-                retn
-sub_4CBC80      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CBD20      proc near               ; CODE XREF: sub_4CBD50+26p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                push    edi
-                mov     edi, [esp+4+arg_8]
-                xor     eax, eax
-                test    edi, edi
-                jbe     short loc_4CBD4C
-                mov     edx, [esp+4+arg_4]
-                push    esi
-                mov     esi, [esp+8+arg_0]
-
-loc_4CBD34:                             ; CODE XREF: sub_4CBD20+29j
-                mov     ecx, [edx+eax*4]
-                cmp     ecx, esi
-                ja      short loc_4CBD3F
-                xor     ecx, ecx
-                jmp     short loc_4CBD41
-; ---------------------------------------------------------------------------
-
-loc_4CBD3F:                             ; CODE XREF: sub_4CBD20+19j
-                sub     ecx, esi
-
-loc_4CBD41:                             ; CODE XREF: sub_4CBD20+1Dj
-                mov     [edx+eax*4], ecx
-                add     eax, 1
-                cmp     eax, edi
-                jb      short loc_4CBD34
-                pop     esi
-
-loc_4CBD4C:                             ; CODE XREF: sub_4CBD20+9j
-                pop     edi
-                retn
-sub_4CBD20      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBD50      proc near               ; CODE XREF: .text:004CC1A1p
-                                        ; .text:004CC20Ap ...
-
-arg_0           = dword ptr  4
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                cmp     dword ptr [esi+4], 0FFFFFFFFh
-                jnz     short loc_4CBD88
-                mov     eax, [esi+64h]
-                add     eax, [esi+60h]
-                mov     ecx, [esi+20h]
-                push    edi
-                mov     edi, 0FFFFFFFEh
-                sub     edi, [esi+58h]
-                push    eax
-                push    ecx
-                and     edi, 0FFFFFC00h
-                push    edi
-                call    sub_4CBD20
-                sub     [esi+8], edi
-                sub     [esi+4], edi
-                add     esp, 0Ch
-                sub     [esi+0Ch], edi
-                pop     edi
-
-loc_4CBD88:                             ; CODE XREF: sub_4CBD50+9j
-                cmp     dword ptr [esi+38h], 0
-                jnz     short loc_4CBDB9
-                mov     edx, [esi+0Ch]
-                sub     edx, [esi+4]
-                mov     eax, [esi+44h]
-                cmp     eax, edx
-                jnz     short loc_4CBDB9
-                mov     ecx, [esi+3Ch]
-                add     ecx, [esi+30h]
-                sub     ecx, [esi]
-                cmp     ecx, eax
-                ja      short loc_4CBDB0
-                push    esi
-                call    sub_4CBA00
-                add     esp, 4
-
-loc_4CBDB0:                             ; CODE XREF: sub_4CBD50+55j
-                push    esi
-                call    sub_4CB980
-                add     esp, 4
-
-loc_4CBDB9:                             ; CODE XREF: sub_4CBD50+3Cj
-                                        ; sub_4CBD50+49j
-                mov     edx, [esi+14h]
-                cmp     edx, [esi+18h]
-                jnz     short loc_4CBDC8
-                mov     dword ptr [esi+14h], 0
-
-loc_4CBDC8:                             ; CODE XREF: sub_4CBD50+6Fj
-                push    esi
-                call    sub_4CBC20
-                add     esp, 4
-                pop     esi
-                retn
-sub_4CBD50      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBDE0      proc near               ; CODE XREF: sub_4CC5C0+1B7p
-
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-arg_10          = dword ptr  14h
-arg_14          = dword ptr  18h
-arg_18          = dword ptr  1Ch
-arg_1C          = dword ptr  20h
-arg_20          = dword ptr  24h
-arg_24          = dword ptr  28h
-
-                push    ecx
-                mov     edx, [esp+4+arg_4]
-                mov     ecx, [esp+4+arg_10]
-                mov     eax, [esp+4+arg_14]
-                push    ebx
-                mov     [ecx+eax*4], edx
-                mov     ecx, [esp+8+arg_8]
-                push    ebp
-                push    esi
-                sub     ecx, edx
-                cmp     [esp+10h+arg_1C], 0
-                push    edi
-                jz      loc_4CBEAC
-                mov     ebp, [esp+14h+arg_C]
-                mov     ebx, [esp+14h+arg_24]
-                jmp     short loc_4CBE14
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CBE10:                             ; CODE XREF: sub_4CBDE0+C6j
-                mov     eax, [esp+14h+arg_14]
-
-loc_4CBE14:                             ; CODE XREF: sub_4CBDE0+2Dj
-                mov     esi, [esp+14h+arg_18]
-                sub     [esp+14h+arg_1C], 1
-                cmp     ecx, esi
-                jnb     loc_4CBEAC
-                mov     edx, ebp
-                sub     edx, ecx
-                cmp     eax, ecx
-                sbb     edi, edi
-                and     edi, esi
-                sub     edi, ecx
-                add     edi, eax
-                mov     eax, [esp+14h+arg_10]
-                mov     eax, [eax+edi*4]
-                mov     [esp+14h+arg_4], eax
-                mov     al, [edx+ebx]
-                cmp     al, [ebx+ebp]
-                jnz     short loc_4CBE99
-                mov     al, [edx]
-                cmp     al, [ebp+0]
-                jnz     short loc_4CBE99
-                mov     eax, [esp+14h+arg_0]
-                mov     esi, 1
-                cmp     eax, esi
-                jz      short loc_4CBE7A
-                sub     edx, ebp
-                lea     edi, [ebp+1]
-                mov     [esp+14h+var_4], edx
-                jmp     short loc_4CBE69
-; ---------------------------------------------------------------------------
-
-loc_4CBE65:                             ; CODE XREF: sub_4CBDE0+98j
-                mov     edx, [esp+14h+var_4]
-
-loc_4CBE69:                             ; CODE XREF: sub_4CBDE0+83j
-                mov     dl, [edx+edi]
-                cmp     dl, [edi]
-                jnz     short loc_4CBE7A
-                add     esi, 1
-                add     edi, 1
-                cmp     esi, eax
-                jnz     short loc_4CBE65
-
-loc_4CBE7A:                             ; CODE XREF: sub_4CBDE0+78j
-                                        ; sub_4CBDE0+8Ej
-                cmp     ebx, esi
-                jnb     short loc_4CBE99
-                mov     edx, [esp+14h+arg_20]
-                mov     [edx], esi
-                add     edx, 4
-                add     ecx, 0FFFFFFFFh
-                mov     [edx], ecx
-                add     edx, 4
-                cmp     esi, eax
-                mov     ebx, esi
-                mov     [esp+14h+arg_20], edx
-                jz      short loc_4CBEB6
-
-loc_4CBE99:                             ; CODE XREF: sub_4CBDE0+64j
-                                        ; sub_4CBDE0+6Bj ...
-                mov     ecx, [esp+14h+arg_8]
-                sub     ecx, [esp+14h+arg_4]
-                cmp     [esp+14h+arg_1C], 0
-                jnz     loc_4CBE10
-
-loc_4CBEAC:                             ; CODE XREF: sub_4CBDE0+1Fj
-                                        ; sub_4CBDE0+3Fj
-                mov     eax, [esp+14h+arg_20]
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CBEB6:                             ; CODE XREF: sub_4CBDE0+B7j
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     eax, edx
-                pop     ebx
-                pop     ecx
-                retn
-sub_4CBDE0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CBEC0      proc near               ; CODE XREF: .text:004CC1E7p
-                                        ; sub_4CC220+14Ep ...
-
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-arg_10          = dword ptr  14h
-arg_14          = dword ptr  18h
-arg_18          = dword ptr  1Ch
-arg_1C          = dword ptr  20h
-arg_20          = dword ptr  24h
-arg_24          = dword ptr  28h
-
-                sub     esp, 10h
-                mov     eax, [esp+10h+arg_10]
-                mov     edx, [esp+10h+arg_8]
-                sub     edx, [esp+10h+arg_4]
-                push    ebx
-                push    ebp
-                push    esi
-                push    edi
-                mov     edi, [esp+20h+arg_14]
-                lea     eax, [eax+edi*8]
-                lea     ecx, [eax+4]
-                mov     [esp+20h+var_C], ecx
-                xor     ecx, ecx
-                xor     ebx, ebx
-                cmp     [esp+20h+arg_1C], ecx
-                mov     ebp, eax
-                mov     [esp+20h+var_10], ebp
-                mov     [esp+20h+var_8], ecx
-                mov     [esp+20h+var_4], ebx
-                jnz     short loc_4CBF24
-
-loc_4CBEF9:                             ; CODE XREF: sub_4CBEC0+6Fj
-                                        ; sub_4CBEC0+151j
-                mov     edx, [esp+20h+var_C]
-                mov     eax, [esp+20h+arg_20]
-                pop     edi
-                pop     esi
-                mov     dword ptr [ebp+0], 0
-                pop     ebp
-                mov     dword ptr [edx], 0
-                pop     ebx
-                add     esp, 10h
-                retn
-; ---------------------------------------------------------------------------
-                jmp     short loc_4CBF20
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CBF20:                             ; CODE XREF: sub_4CBEC0+56j
-                                        ; sub_4CBEC0+14Bj
-                mov     edi, [esp+20h+arg_14]
-
-loc_4CBF24:                             ; CODE XREF: sub_4CBEC0+37j
-                mov     eax, [esp+20h+arg_18]
-                sub     [esp+20h+arg_1C], 1
-                cmp     edx, eax
-                jnb     short loc_4CBEF9
-                cmp     edi, edx
-                sbb     esi, esi
-                and     esi, eax
-                mov     eax, [esp+20h+arg_10]
-                sub     esi, edx
-                add     esi, edi
-                lea     eax, [eax+esi*8]
-                mov     esi, [esp+20h+arg_C]
-                sub     esi, edx
-                cmp     ecx, ebx
-                jb      short loc_4CBF4E
-                mov     ecx, ebx
-
-loc_4CBF4E:                             ; CODE XREF: sub_4CBEC0+8Aj
-                mov     bl, [ecx+esi]
-                mov     edi, [esp+20h+arg_C]
-                cmp     bl, [ecx+edi]
-                jnz     short loc_4CBFB8
-                add     ecx, 1
-                cmp     ecx, [esp+20h+arg_0]
-                jz      short loc_4CBF93
-                mov     bl, [ecx+esi]
-                cmp     bl, [ecx+edi]
-                jnz     short loc_4CBF93
-                add     ecx, 1
-                cmp     ecx, [esp+20h+arg_0]
-                jz      short loc_4CBF93
-                mov     ebx, edi
-                mov     ebp, esi
-                lea     edi, [ecx+ebx]
-                sub     ebp, ebx
-                lea     ecx, [ecx+0]
-
-loc_4CBF80:                             ; CODE XREF: sub_4CBEC0+D1j
-                mov     bl, [edi+ebp]
-                cmp     bl, [edi]
-                jnz     short loc_4CBF93
-                add     ecx, 1
-                add     edi, 1
-                cmp     ecx, [esp+20h+arg_0]
-                jnz     short loc_4CBF80
-
-loc_4CBF93:                             ; CODE XREF: sub_4CBEC0+A1j
-                                        ; sub_4CBEC0+A9j ...
-                cmp     [esp+20h+arg_24], ecx
-                jnb     short loc_4CBFB8
-                mov     edi, [esp+20h+arg_20]
-                mov     [edi], ecx
-                add     edi, 4
-                add     edx, 0FFFFFFFFh
-                mov     [edi], edx
-                add     edi, 4
-                cmp     ecx, [esp+20h+arg_0]
-                mov     [esp+20h+arg_24], ecx
-                mov     [esp+20h+arg_20], edi
-                jz      short loc_4CC016
-
-loc_4CBFB8:                             ; CODE XREF: sub_4CBEC0+98j
-                                        ; sub_4CBEC0+D7j
-                mov     dl, [ecx+esi]
-                mov     esi, [esp+20h+arg_C]
-                cmp     dl, [ecx+esi]
-                mov     edx, [esp+20h+arg_4]
-                jnb     short loc_4CBFE4
-                mov     esi, [esp+20h+var_10]
-                lea     ebp, [eax+4]
-                mov     ebx, ecx
-                mov     ecx, [esp+20h+var_8]
-                mov     [esi], edx
-                mov     eax, [ebp+0]
-                mov     [esp+20h+var_10], ebp
-                mov     [esp+20h+var_4], ebx
-                jmp     short loc_4CBFFC
-; ---------------------------------------------------------------------------
-
-loc_4CBFE4:                             ; CODE XREF: sub_4CBEC0+106j
-                mov     esi, [esp+20h+var_C]
-                mov     ebp, [esp+20h+var_10]
-                mov     ebx, [esp+20h+var_4]
-                mov     [esi], edx
-                mov     [esp+20h+var_C], eax
-                mov     eax, [eax]
-                mov     [esp+20h+var_8], ecx
-
-loc_4CBFFC:                             ; CODE XREF: sub_4CBEC0+122j
-                mov     edx, [esp+20h+arg_8]
-                sub     edx, eax
-                cmp     [esp+20h+arg_1C], 0
-                mov     [esp+20h+arg_4], eax
-                jnz     loc_4CBF20
-                jmp     loc_4CBEF9
-; ---------------------------------------------------------------------------
-
-loc_4CC016:                             ; CODE XREF: sub_4CBEC0+F6j
-                mov     ecx, [eax]
-                mov     edx, [esp+20h+var_10]
-                mov     [edx], ecx
-                mov     eax, [eax+4]
-                mov     ecx, [esp+20h+var_C]
-                mov     [ecx], eax
-                mov     eax, edi
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                add     esp, 10h
-                retn
-sub_4CBEC0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CC040      proc near               ; CODE XREF: sub_4CC220+F8p
-                                        ; sub_4CC3B0+173p ...
-
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-arg_10          = dword ptr  14h
-arg_14          = dword ptr  18h
-arg_18          = dword ptr  1Ch
-arg_1C          = dword ptr  20h
-
-                sub     esp, 10h
-                mov     eax, [esp+10h+arg_10]
-                mov     edx, [esp+10h+arg_4]
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+1Ch+arg_14]
-                lea     eax, [eax+esi*8]
-                lea     ecx, [eax+4]
-                push    edi
-                mov     edi, eax
-                mov     eax, [esp+20h+arg_8]
-                xor     ebx, ebx
-                xor     ebp, ebp
-                sub     eax, edx
-                cmp     [esp+20h+arg_1C], ebx
-                mov     [esp+20h+var_C], ecx
-                mov     [esp+20h+var_10], edi
-                mov     [esp+20h+var_8], ebx
-                mov     [esp+20h+var_4], ebp
-                jz      loc_4CC159
-                nop
-
-loc_4CC080:                             ; CODE XREF: sub_4CC040+114j
-                sub     [esp+20h+arg_1C], 1
-                cmp     eax, [esp+20h+arg_18]
-                jnb     loc_4CC159
-                cmp     esi, eax
-                sbb     ecx, ecx
-                and     ecx, [esp+20h+arg_18]
-                sub     ecx, eax
-                add     ecx, esi
-                mov     esi, [esp+20h+arg_10]
-                lea     edi, [esi+ecx*8]
-                mov     ecx, [esp+20h+arg_C]
-                sub     ecx, eax
-                cmp     ebx, ebp
-                mov     eax, ebx
-                jb      short loc_4CC0B0
-                mov     eax, ebp
-
-loc_4CC0B0:                             ; CODE XREF: sub_4CC040+6Cj
-                mov     bl, [eax+ecx]
-                mov     esi, [esp+20h+arg_C]
-                cmp     bl, [eax+esi]
-                jnz     short loc_4CC102
-                add     eax, 1
-                cmp     eax, [esp+20h+arg_0]
-                jz      short loc_4CC0E3
-                mov     ebx, esi
-                mov     ebp, ecx
-                lea     esi, [eax+ebx]
-                sub     ebp, ebx
-                mov     edi, edi
-
-loc_4CC0D0:                             ; CODE XREF: sub_4CC040+A1j
-                mov     bl, [esi+ebp]
-                cmp     bl, [esi]
-                jnz     short loc_4CC0FC
-                add     eax, 1
-                add     esi, 1
-                cmp     eax, [esp+20h+arg_0]
-                jnz     short loc_4CC0D0
-
-loc_4CC0E3:                             ; CODE XREF: sub_4CC040+83j
-                                        ; sub_4CC040+C0j
-                mov     edx, [edi]
-                mov     eax, [esp+20h+var_10]
-                mov     [eax], edx
-                mov     ecx, [edi+4]
-                mov     edx, [esp+20h+var_C]
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     [edx], ecx
-                pop     ebx
-                add     esp, 10h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC0FC:                             ; CODE XREF: sub_4CC040+95j
-                cmp     eax, [esp+20h+arg_0]
-                jz      short loc_4CC0E3
-
-loc_4CC102:                             ; CODE XREF: sub_4CC040+7Aj
-                mov     cl, [eax+ecx]
-                mov     esi, [esp+20h+arg_C]
-                cmp     cl, [eax+esi]
-                jnb     short loc_4CC129
-                mov     ecx, [esp+20h+var_10]
-                mov     ebx, [esp+20h+var_8]
-                add     edi, 4
-                mov     ebp, eax
-                mov     [ecx], edx
-                mov     edx, [edi]
-                mov     [esp+20h+var_10], edi
-                mov     [esp+20h+var_4], ebp
-                jmp     short loc_4CC143
-; ---------------------------------------------------------------------------
-
-loc_4CC129:                             ; CODE XREF: sub_4CC040+CCj
-                mov     ecx, [esp+20h+var_C]
-                mov     ebp, [esp+20h+var_4]
-                mov     [ecx], edx
-                mov     edx, [edi]
-                mov     ebx, eax
-                mov     [esp+20h+var_C], edi
-                mov     edi, [esp+20h+var_10]
-                mov     [esp+20h+var_8], ebx
-
-loc_4CC143:                             ; CODE XREF: sub_4CC040+E7j
-                mov     eax, [esp+20h+arg_8]
-                sub     eax, edx
-                cmp     [esp+20h+arg_1C], 0
-                jz      short loc_4CC159
-                mov     esi, [esp+20h+arg_14]
-                jmp     loc_4CC080
-; ---------------------------------------------------------------------------
-
-loc_4CC159:                             ; CODE XREF: sub_4CC040+39j
-                                        ; sub_4CC040+49j ...
-                mov     eax, [esp+20h+var_C]
-                mov     dword ptr [edi], 0
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     dword ptr [eax], 0
-                pop     ebx
-                add     esp, 10h
-                retn
-sub_4CC040      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CC180:                             ; DATA XREF: sub_4CCAA0+40o
-                push    esi
-                mov     esi, [esp+8]
-                mov     edx, [esi+10h]
-                cmp     edx, 2
-                jnb     short loc_4CC1AD
-                add     dword ptr [esi+4], 1
-                mov     eax, [esi+4]
-                add     dword ptr [esi+14h], 1
-                add     dword ptr [esi], 1
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC1A9
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC1A9:                             ; CODE XREF: .text:004CC19Ej
-                xor     eax, eax
-                pop     esi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC1AD:                             ; CODE XREF: .text:004CC18Bj
-                mov     eax, [esi]
-                xor     ecx, ecx
-                mov     ch, [eax+1]
-                push    ebx
-                mov     ebx, [esp+10h]
-                push    edi
-                mov     edi, [esi+4]
-                push    1
-                push    ebx
-                mov     cl, [eax]
-                mov     eax, ecx
-                mov     ecx, [esi+20h]
-                lea     eax, [ecx+eax*4]
-                mov     ecx, [eax]
-                mov     [eax], edi
-                mov     eax, [esi+2Ch]
-                push    eax
-                mov     eax, [esi+18h]
-                push    eax
-                mov     eax, [esi+14h]
-                push    eax
-                mov     eax, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    eax
-                mov     eax, [esi+4]
-                push    eax
-                push    ecx
-                push    edx
-                call    sub_4CBEC0
-                add     dword ptr [esi+4], 1
-                add     dword ptr [esi+14h], 1
-                add     dword ptr [esi], 1
-                mov     edi, eax
-                mov     eax, [esi+4]
-                sub     edi, ebx
-                add     esp, 28h
-                sar     edi, 2
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC212
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC212:                             ; CODE XREF: .text:004CC207j
-                mov     eax, edi
-                pop     edi
-                pop     ebx
-                pop     esi
-                retn
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC220      proc near               ; DATA XREF: sub_4CCAA0+54o
-
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                sub     esp, 8
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                mov     eax, [esi+10h]
-                cmp     eax, 3
-                mov     [esp+0Ch+arg_0], eax
-                jnb     short loc_4CC259
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC252
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC252:                             ; CODE XREF: sub_4CC220+27j
-                xor     eax, eax
-                pop     esi
-                add     esp, 8
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC259:                             ; CODE XREF: sub_4CC220+12j
-                push    ebx
-                mov     ebx, [esi+20h]
-                push    ebp
-                xor     edx, edx
-                push    edi
-                mov     edi, [esi]
-                mov     dh, [edi+2]
-                movzx   ecx, byte ptr [edi]
-                movzx   eax, byte ptr [edi+1]
-                xor     eax, dword_553198[ecx*4]
-                xor     edx, eax
-                and     edx, [esi+28h]
-                mov     ecx, eax
-                mov     ebp, [ebx+edx*4+1000h]
-                mov     eax, [esi+4]
-                and     ecx, 3FFh
-                sub     eax, [ebx+ecx*4]
-                mov     [esp+18h+var_8], ebp
-                mov     ebp, [esi+4]
-                mov     [ebx+edx*4+1000h], ebp
-                mov     ebx, [esi+20h]
-                mov     edx, [ebx+edx*4+1000h]
-                mov     [ebx+ecx*4], edx
-                mov     ebx, [esp+18h+arg_4]
-                xor     ebp, ebp
-                cmp     eax, [esi+18h]
-                mov     ecx, 2
-                jnb     loc_4CC348
-                mov     edx, edi
-                sub     edx, eax
-                mov     [esp+18h+var_4], edx
-                mov     dl, [edx]
-                cmp     dl, [edi]
-                jnz     short loc_4CC348
-                mov     edx, [esp+18h+arg_0]
-                cmp     edx, ecx
-                jz      short loc_4CC2EA
-
-loc_4CC2D3:                             ; CODE XREF: sub_4CC220+C4j
-                mov     ebx, [esp+18h+var_4]
-                mov     bl, [ebx+ecx]
-                cmp     bl, [ecx+edi]
-                jnz     short loc_4CC2E6
-                add     ecx, 1
-                cmp     ecx, edx
-                jnz     short loc_4CC2D3
-
-loc_4CC2E6:                             ; CODE XREF: sub_4CC220+BDj
-                mov     ebx, [esp+18h+arg_4]
-
-loc_4CC2EA:                             ; CODE XREF: sub_4CC220+B1j
-                add     eax, 0FFFFFFFFh
-                cmp     ecx, edx
-                mov     [ebx], ecx
-                mov     [ebx+4], eax
-                mov     ebp, 2
-                jnz     short loc_4CC34C
-                mov     eax, [esi+2Ch]
-                mov     ecx, [esi+18h]
-                push    eax
-                mov     eax, [esi+14h]
-                push    ecx
-                mov     ecx, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    ecx
-                mov     ecx, [esi+4]
-                push    eax
-                mov     eax, [esp+2Ch+var_8]
-                push    ecx
-                push    eax
-                push    edx
-                call    sub_4CC040
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                add     esp, 20h
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC33E
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC33E:                             ; CODE XREF: sub_4CC220+113j
-                pop     edi
-                mov     eax, ebp
-                pop     ebp
-                pop     ebx
-                pop     esi
-                add     esp, 8
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC348:                             ; CODE XREF: sub_4CC220+97j
-                                        ; sub_4CC220+A9j
-                mov     edx, [esp+18h+arg_0]
-
-loc_4CC34C:                             ; CODE XREF: sub_4CC220+D9j
-                mov     eax, [esi+2Ch]
-                push    ecx
-                lea     ecx, [ebx+ebp*4]
-                push    ecx
-                mov     ecx, [esi+18h]
-                push    eax
-                mov     eax, [esi+14h]
-                push    ecx
-                mov     ecx, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    ecx
-                mov     ecx, [esi+4]
-                push    eax
-                mov     eax, [esp+34h+var_8]
-                push    ecx
-                push    eax
-                push    edx
-                call    sub_4CBEC0
-                mov     edi, eax
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                sub     edi, ebx
-                add     esp, 28h
-                sar     edi, 2
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC39B
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC39B:                             ; CODE XREF: sub_4CC220+170j
-                mov     eax, edi
-                pop     edi
-                pop     ebp
-                pop     ebx
-                pop     esi
-                add     esp, 8
-                retn
-sub_4CC220      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC3B0      proc near               ; DATA XREF: sub_4CCAA0:loc_4CCB03o
-
-var_10          = dword ptr -10h
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                sub     esp, 10h
-                push    esi
-                mov     esi, [esp+14h+arg_0]
-                mov     eax, [esi+10h]
-                cmp     eax, 4
-                mov     [esp+14h+arg_0], eax
-                jnb     short loc_4CC3E9
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC3E2
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC3E2:                             ; CODE XREF: sub_4CC3B0+27j
-                xor     eax, eax
-                pop     esi
-                add     esp, 10h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC3E9:                             ; CODE XREF: sub_4CC3B0+12j
-                push    ebx
-                push    ebp
-                push    edi
-                mov     edi, [esi]
-                movzx   eax, byte ptr [edi]
-                movzx   edx, byte ptr [edi+1]
-                xor     edx, dword_553198[eax*4]
-                movzx   eax, byte ptr [edi+2]
-                movzx   ebp, byte ptr [edi+3]
-                mov     ecx, eax
-                add     eax, eax
-                add     eax, eax
-                add     eax, eax
-                xor     eax, dword_553198[ebp*4]
-                mov     ebp, [esi+4]
-                shl     eax, 5
-                shl     ecx, 8
-                xor     eax, edx
-                and     eax, [esi+28h]
-                xor     ecx, edx
-                mov     ebx, edx
-                mov     edx, [esi+20h]
-                and     ebx, 3FFh
-                sub     ebp, [edx+ebx*4]
-                and     ecx, 0FFFFh
-                mov     [esp+20h+var_4], ebp
-                mov     ebp, [esi+4]
-                sub     ebp, [edx+ecx*4+1000h]
-                mov     [esp+20h+var_10], ebp
-                mov     ebp, [edx+eax*4+41000h]
-                mov     [esp+20h+var_8], ebp
-                mov     ebp, [esi+4]
-                mov     [edx+eax*4+41000h], ebp
-                mov     edx, [esi+20h]
-                mov     eax, [edx+eax*4+41000h]
-                mov     [edx+ecx*4+1000h], eax
-                mov     eax, [esi+20h]
-                mov     ecx, [eax+ecx*4+1000h]
-                mov     [eax+ebx*4], ecx
-                mov     ecx, [esp+20h+var_4]
-                mov     ebx, [esp+20h+arg_4]
-                xor     ebp, ebp
-                cmp     ecx, [esi+18h]
-                mov     eax, 1
-                jnb     short loc_4CC4A9
-                mov     edx, edi
-                sub     edx, ecx
-                mov     dl, [edx]
-                cmp     dl, [edi]
-                jnz     short loc_4CC4A9
-                mov     eax, 2
-                lea     edx, [ecx-1]
-                mov     [ebx], eax
-                mov     [ebx+4], edx
-                mov     ebp, eax
-
-loc_4CC4A9:                             ; CODE XREF: sub_4CC3B0+DEj
-                                        ; sub_4CC3B0+E8j
-                mov     edx, [esp+20h+var_10]
-                cmp     ecx, edx
-                jz      short loc_4CC4D5
-                cmp     edx, [esi+18h]
-                jnb     short loc_4CC4D5
-                mov     edx, edi
-                sub     edx, [esp+20h+var_10]
-                mov     dl, [edx]
-                cmp     dl, [edi]
-                jnz     short loc_4CC4D5
-                mov     ecx, [esp+20h+var_10]
-                lea     edx, [ecx-1]
-                mov     [ebx+ebp*4+4], edx
-                mov     eax, 3
-                add     ebp, 2
-
-loc_4CC4D5:                             ; CODE XREF: sub_4CC3B0+FFj
-                                        ; sub_4CC3B0+104j ...
-                test    ebp, ebp
-                mov     edx, [esp+20h+arg_0]
-                jz      short loc_4CC553
-                cmp     eax, edx
-                jz      short loc_4CC4FE
-                mov     edx, eax
-                sub     edx, ecx
-                add     edx, edi
-
-loc_4CC4E7:                             ; CODE XREF: sub_4CC3B0+148j
-                mov     cl, [edx]
-                cmp     cl, [eax+edi]
-                jnz     short loc_4CC4FA
-                add     eax, 1
-                add     edx, 1
-                cmp     eax, [esp+20h+arg_0]
-                jnz     short loc_4CC4E7
-
-loc_4CC4FA:                             ; CODE XREF: sub_4CC3B0+13Cj
-                mov     edx, [esp+20h+arg_0]
-
-loc_4CC4FE:                             ; CODE XREF: sub_4CC3B0+12Fj
-                cmp     eax, edx
-                mov     [ebx+ebp*4-8], eax
-                jnz     short loc_4CC553
-                mov     eax, [esi+2Ch]
-                mov     ecx, [esi+18h]
-                push    eax
-                mov     eax, [esi+14h]
-                push    ecx
-                mov     ecx, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    ecx
-                mov     ecx, [esi+4]
-                push    eax
-                mov     eax, [esp+34h+var_8]
-                push    ecx
-                push    eax
-                push    edx
-                call    sub_4CC040
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                add     esp, 20h
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC549
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC549:                             ; CODE XREF: sub_4CC3B0+18Ej
-                pop     edi
-                mov     eax, ebp
-                pop     ebp
-                pop     ebx
-                pop     esi
-                add     esp, 10h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC553:                             ; CODE XREF: sub_4CC3B0+12Bj
-                                        ; sub_4CC3B0+154j
-                cmp     eax, 3
-                jnb     short loc_4CC55D
-                mov     eax, 3
-
-loc_4CC55D:                             ; CODE XREF: sub_4CC3B0+1A6j
-                push    eax
-                mov     eax, [esi+2Ch]
-                lea     ecx, [ebx+ebp*4]
-                push    ecx
-                mov     ecx, [esi+18h]
-                push    eax
-                mov     eax, [esi+14h]
-                push    ecx
-                mov     ecx, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    ecx
-                mov     ecx, [esi+4]
-                push    eax
-                mov     eax, [esp+3Ch+var_8]
-                push    ecx
-                push    eax
-                push    edx
-                call    sub_4CBEC0
-                mov     edi, eax
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                sub     edi, ebx
-                add     esp, 28h
-                sar     edi, 2
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC5AC
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC5AC:                             ; CODE XREF: sub_4CC3B0+1F1j
-                mov     eax, edi
-                pop     edi
-                pop     ebp
-                pop     ebx
-                pop     esi
-                add     esp, 10h
-                retn
-sub_4CC3B0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC5C0      proc near               ; DATA XREF: sub_4CCAA0+29o
-
-var_10          = dword ptr -10h
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                sub     esp, 10h
-                push    esi
-                mov     esi, [esp+14h+arg_0]
-                mov     eax, [esi+10h]
-                cmp     eax, 4
-                mov     [esp+14h+arg_0], eax
-                jnb     short loc_4CC5F9
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC5F2
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC5F2:                             ; CODE XREF: sub_4CC5C0+27j
-                xor     eax, eax
-                pop     esi
-                add     esp, 10h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC5F9:                             ; CODE XREF: sub_4CC5C0+12j
-                push    ebx
-                push    ebp
-                push    edi
-                mov     edi, [esi]
-                movzx   eax, byte ptr [edi]
-                movzx   edx, byte ptr [edi+1]
-                xor     edx, dword_553198[eax*4]
-                movzx   eax, byte ptr [edi+2]
-                movzx   ebp, byte ptr [edi+3]
-                mov     ecx, eax
-                add     eax, eax
-                add     eax, eax
-                add     eax, eax
-                xor     eax, dword_553198[ebp*4]
-                mov     ebp, [esi+4]
-                shl     eax, 5
-                shl     ecx, 8
-                xor     eax, edx
-                and     eax, [esi+28h]
-                xor     ecx, edx
-                mov     ebx, edx
-                mov     edx, [esi+20h]
-                and     ebx, 3FFh
-                sub     ebp, [edx+ebx*4]
-                and     ecx, 0FFFFh
-                mov     [esp+20h+var_4], ebp
-                mov     ebp, [esi+4]
-                sub     ebp, [edx+ecx*4+1000h]
-                mov     [esp+20h+var_10], ebp
-                mov     ebp, [edx+eax*4+41000h]
-                mov     [esp+20h+var_8], ebp
-                mov     ebp, [esi+4]
-                mov     [edx+eax*4+41000h], ebp
-                mov     edx, [esi+20h]
-                mov     eax, [edx+eax*4+41000h]
-                mov     [edx+ecx*4+1000h], eax
-                mov     eax, [esi+20h]
-                mov     ecx, [eax+ecx*4+1000h]
-                mov     [eax+ebx*4], ecx
-                mov     ecx, [esp+20h+var_4]
-                mov     ebx, [esp+20h+arg_4]
-                xor     ebp, ebp
-                cmp     ecx, [esi+18h]
-                mov     eax, 1
-                jnb     short loc_4CC6B9
-                mov     edx, edi
-                sub     edx, ecx
-                mov     dl, [edx]
-                cmp     dl, [edi]
-                jnz     short loc_4CC6B9
-                mov     eax, 2
-                lea     edx, [ecx-1]
-                mov     [ebx], eax
-                mov     [ebx+4], edx
-                mov     ebp, eax
-
-loc_4CC6B9:                             ; CODE XREF: sub_4CC5C0+DEj
-                                        ; sub_4CC5C0+E8j
-                mov     edx, [esp+20h+var_10]
-                cmp     ecx, edx
-                jz      short loc_4CC6E5
-                cmp     edx, [esi+18h]
-                jnb     short loc_4CC6E5
-                mov     edx, edi
-                sub     edx, [esp+20h+var_10]
-                mov     dl, [edx]
-                cmp     dl, [edi]
-                jnz     short loc_4CC6E5
-                mov     ecx, [esp+20h+var_10]
-                lea     edx, [ecx-1]
-                mov     [ebx+ebp*4+4], edx
-                mov     eax, 3
-                add     ebp, 2
-
-loc_4CC6E5:                             ; CODE XREF: sub_4CC5C0+FFj
-                                        ; sub_4CC5C0+104j ...
-                test    ebp, ebp
-                jz      short loc_4CC747
-                cmp     eax, [esp+20h+arg_0]
-                jz      short loc_4CC708
-                mov     edx, eax
-                sub     edx, ecx
-                add     edx, edi
-
-loc_4CC6F5:                             ; CODE XREF: sub_4CC5C0+146j
-                mov     cl, [edx]
-                cmp     cl, [eax+edi]
-                jnz     short loc_4CC708
-                add     eax, 1
-                add     edx, 1
-                cmp     eax, [esp+20h+arg_0]
-                jnz     short loc_4CC6F5
-
-loc_4CC708:                             ; CODE XREF: sub_4CC5C0+12Dj
-                                        ; sub_4CC5C0+13Aj
-                cmp     eax, [esp+20h+arg_0]
-                mov     [ebx+ebp*4-8], eax
-                jnz     short loc_4CC747
-                mov     edx, [esi+14h]
-                mov     eax, [esi+24h]
-                mov     ecx, [esp+20h+var_8]
-                mov     [eax+edx*4], ecx
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC73D
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC73D:                             ; CODE XREF: sub_4CC5C0+172j
-                pop     edi
-                mov     eax, ebp
-                pop     ebp
-                pop     ebx
-                pop     esi
-                add     esp, 10h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CC747:                             ; CODE XREF: sub_4CC5C0+127j
-                                        ; sub_4CC5C0+150j
-                cmp     eax, 3
-                jnb     short loc_4CC751
-                mov     eax, 3
-
-loc_4CC751:                             ; CODE XREF: sub_4CC5C0+18Aj
-                mov     ecx, [esi+18h]
-                push    eax
-                mov     eax, [esi+2Ch]
-                lea     edx, [ebx+ebp*4]
-                push    edx
-                mov     edx, [esi+14h]
-                push    eax
-                mov     eax, [esi+24h]
-                push    ecx
-                mov     ecx, [esi]
-                push    edx
-                mov     edx, [esi+4]
-                push    eax
-                mov     eax, [esp+38h+var_8]
-                push    ecx
-                mov     ecx, [esp+3Ch+arg_0]
-                push    edx
-                push    eax
-                push    ecx
-                call    sub_4CBDE0
-                mov     edi, eax
-                mov     eax, 1
-                add     [esi+14h], eax
-                add     [esi], eax
-                add     [esi+4], eax
-                mov     eax, [esi+4]
-                sub     edi, ebx
-                add     esp, 28h
-                sar     edi, 2
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC7A4
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC7A4:                             ; CODE XREF: sub_4CC5C0+1D9j
-                mov     eax, edi
-                pop     edi
-                pop     ebp
-                pop     ebx
-                pop     esi
-                add     esp, 10h
-                retn
-sub_4CC5C0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC7B0      proc near               ; DATA XREF: sub_4CCAA0+47o
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                mov     ebp, [esp+8+arg_4]
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     edi, 1
-
-loc_4CC7C1:                             ; CODE XREF: sub_4CC7B0+6Dj
-                mov     edx, [esi+10h]
-                cmp     edx, 2
-                jb      short loc_4CC802
-                mov     eax, [esi]
-                mov     ebx, [esi+4]
-                xor     ecx, ecx
-                mov     ch, [eax+1]
-                mov     cl, [eax]
-                mov     eax, ecx
-                mov     ecx, [esi+20h]
-                lea     eax, [ecx+eax*4]
-                mov     ecx, [eax]
-                mov     [eax], ebx
-                mov     eax, [esi+2Ch]
-                push    eax
-                mov     eax, [esi+18h]
-                push    eax
-                mov     eax, [esi+14h]
-                push    eax
-                mov     eax, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    eax
-                mov     eax, [esi+4]
-                push    eax
-                push    ecx
-                push    edx
-                call    sub_4CC040
-                add     esp, 20h
-
-loc_4CC802:                             ; CODE XREF: sub_4CC7B0+17j
-                add     [esi+4], edi
-                mov     eax, [esi+4]
-                add     [esi+14h], edi
-                add     [esi], edi
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC81B
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC81B:                             ; CODE XREF: sub_4CC7B0+60j
-                sub     ebp, edi
-                jnz     short loc_4CC7C1
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn
-sub_4CC7B0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC830      proc near               ; DATA XREF: sub_4CCAA0+5Bo
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     edi, 1
-                lea     ecx, [ecx+0]
-
-loc_4CC840:                             ; CODE XREF: sub_4CC830+9Fj
-                mov     ebp, [esi+10h]
-                cmp     ebp, 3
-                jb      short loc_4CC8B2
-                mov     ecx, [esi]
-                movzx   edx, byte ptr [ecx]
-                movzx   eax, byte ptr [ecx+1]
-                xor     eax, dword_553198[edx*4]
-                mov     ebx, [esi+4]
-                xor     edx, edx
-                mov     dh, [ecx+2]
-                xor     edx, eax
-                and     edx, [esi+28h]
-                and     eax, 3FFh
-                mov     ecx, edx
-                mov     edx, [esi+20h]
-                mov     edi, [edx+ecx*4+1000h]
-                lea     edx, [edx+ecx*4+1000h]
-                mov     [edx], ebx
-                mov     edx, [esi+20h]
-                mov     ecx, [edx+ecx*4+1000h]
-                mov     [edx+eax*4], ecx
-                mov     edx, [esi+2Ch]
-                mov     eax, [esi+18h]
-                mov     ecx, [esi+14h]
-                push    edx
-                mov     edx, [esi+24h]
-                push    eax
-                mov     eax, [esi]
-                push    ecx
-                mov     ecx, [esi+4]
-                push    edx
-                push    eax
-                push    ecx
-                push    edi
-                push    ebp
-                call    sub_4CC040
-                add     esp, 20h
-                mov     edi, 1
-
-loc_4CC8B2:                             ; CODE XREF: sub_4CC830+16j
-                add     [esi+4], edi
-                mov     eax, [esi+4]
-                add     [esi+14h], edi
-                add     [esi], edi
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC8CB
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC8CB:                             ; CODE XREF: sub_4CC830+90j
-                sub     [esp+10h+arg_4], edi
-                jnz     loc_4CC840
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn
-sub_4CC830      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC8E0      proc near               ; DATA XREF: sub_4CCAA0+6Ao
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     edi, 1
-                lea     ecx, [ecx+0]
-
-loc_4CC8F0:                             ; CODE XREF: sub_4CC8E0+D6j
-                mov     eax, [esi+10h]
-                cmp     eax, 4
-                mov     [esp+10h+arg_0], eax
-                jb      loc_4CC999
-                mov     eax, [esi]
-                movzx   edi, byte ptr [eax+2]
-                movzx   edx, byte ptr [eax]
-                movzx   ebx, byte ptr [eax+3]
-                movzx   ecx, byte ptr [eax+1]
-                xor     ecx, dword_553198[edx*4]
-                mov     ebp, [esi+4]
-                lea     eax, ds:0[edi*8]
-                xor     eax, dword_553198[ebx*4]
-                mov     edx, edi
-                mov     edi, [esi+20h]
-                shl     eax, 5
-                xor     eax, ecx
-                and     eax, [esi+28h]
-                shl     edx, 8
-                mov     ebx, [edi+eax*4+41000h]
-                xor     edx, ecx
-                and     edx, 0FFFFh
-                mov     [edi+edx*4+1000h], ebp
-                mov     edi, [esi+20h]
-                mov     edx, [edi+edx*4+1000h]
-                and     ecx, 3FFh
-                mov     [edi+ecx*4], edx
-                mov     ecx, [esi+20h]
-                mov     edx, [esi+4]
-                mov     [ecx+eax*4+41000h], edx
-                mov     eax, [esi+2Ch]
-                mov     ecx, [esi+18h]
-                mov     edx, [esi+14h]
-                push    eax
-                mov     eax, [esi+24h]
-                push    ecx
-                mov     ecx, [esi]
-                push    edx
-                mov     edx, [esi+4]
-                push    eax
-                mov     eax, [esp+20h+arg_0]
-                push    ecx
-                push    edx
-                push    ebx
-                push    eax
-                call    sub_4CC040
-                add     esp, 20h
-                mov     edi, 1
-
-loc_4CC999:                             ; CODE XREF: sub_4CC8E0+1Aj
-                add     [esi+4], edi
-                mov     eax, [esi+4]
-                add     [esi+14h], edi
-                add     [esi], edi
-                cmp     eax, [esi+8]
-                jnz     short loc_4CC9B2
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CC9B2:                             ; CODE XREF: sub_4CC8E0+C7j
-                sub     [esp+10h+arg_4], edi
-                jnz     loc_4CC8F0
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn
-sub_4CC8E0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CC9D0      proc near               ; DATA XREF: sub_4CCAA0+30o
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     edi, 1
-                lea     ecx, [ecx+0]
-
-loc_4CC9E0:                             ; CODE XREF: sub_4CC9D0+BAj
-                cmp     dword ptr [esi+10h], 4
-                jb      loc_4CCA6D
-                mov     eax, [esi]
-                movzx   edi, byte ptr [eax+2]
-                movzx   edx, byte ptr [eax]
-                movzx   ebx, byte ptr [eax+3]
-                movzx   ecx, byte ptr [eax+1]
-                xor     ecx, dword_553198[edx*4]
-                mov     ebp, [esi+4]
-                lea     eax, ds:0[edi*8]
-                xor     eax, dword_553198[ebx*4]
-                mov     edx, edi
-                mov     edi, [esi+20h]
-                shl     eax, 5
-                xor     eax, ecx
-                and     eax, [esi+28h]
-                mov     ebx, [edi+eax*4+41000h]
-                lea     edi, [edi+eax*4+41000h]
-                mov     [edi], ebp
-                mov     edi, [esi+20h]
-                mov     eax, [edi+eax*4+41000h]
-                shl     edx, 8
-                xor     edx, ecx
-                and     edx, 0FFFFh
-                mov     [edi+edx*4+1000h], eax
-                mov     eax, [esi+20h]
-                mov     edx, [eax+edx*4+1000h]
-                and     ecx, 3FFh
-                mov     [eax+ecx*4], edx
-                mov     eax, [esi+14h]
-                mov     ecx, [esi+24h]
-                mov     [ecx+eax*4], ebx
-                mov     edi, 1
-
-loc_4CCA6D:                             ; CODE XREF: sub_4CC9D0+14j
-                add     [esi+4], edi
-                mov     eax, [esi+4]
-                add     [esi+14h], edi
-                add     [esi], edi
-                cmp     eax, [esi+8]
-                jnz     short loc_4CCA86
-                push    esi
-                call    sub_4CBD50
-                add     esp, 4
-
-loc_4CCA86:                             ; CODE XREF: sub_4CC9D0+ABj
-                sub     [esp+10h+arg_4], edi
-                jnz     loc_4CC9E0
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn
-sub_4CC9D0      endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CCAA0      proc near               ; CODE XREF: sub_4D0270+F3p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                mov     eax, [esp+arg_4]
-                mov     ecx, [esp+arg_0]
-                mov     dword ptr [eax], offset sub_4CBC80
-                mov     dword ptr [eax+4], offset loc_4CB960
-                mov     dword ptr [eax+8], offset loc_4CB970
-                mov     dword ptr [eax+0Ch], offset loc_4CB950
-                cmp     dword ptr [ecx+50h], 0
-                jnz     short loc_4CCAD8
-                mov     dword ptr [eax+10h], offset sub_4CC5C0
-                mov     dword ptr [eax+14h], offset sub_4CC9D0
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CCAD8:                             ; CODE XREF: sub_4CCAA0+27j
-                mov     ecx, [ecx+48h]
-                cmp     ecx, 2
-                jnz     short loc_4CCAEF
-                mov     dword ptr [eax+10h], offset loc_4CC180
-                mov     dword ptr [eax+14h], offset sub_4CC7B0
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CCAEF:                             ; CODE XREF: sub_4CCAA0+3Ej
-                cmp     ecx, 3
-                jnz     short loc_4CCB03
-                mov     dword ptr [eax+10h], offset sub_4CC220
-                mov     dword ptr [eax+14h], offset sub_4CC830
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CCB03:                             ; CODE XREF: sub_4CCAA0+52j
-                mov     dword ptr [eax+10h], offset sub_4CC3B0
-                mov     dword ptr [eax+14h], offset sub_4CC8E0
-                retn
-sub_4CCAA0      endp
-
-; ---------------------------------------------------------------------------
-
-Interface1_AddRef      proc near               ; DATA XREF: .rdata:00517A94o
-;sub_4CCB80
-
-arg_0           = dword ptr  4
-                mov     eax, [esp+arg_0]
-                add     dword ptr [eax+4], 1
-                mov     eax, [eax+4]
-                retn    4
-Interface1_AddRef      endp
-
-; ---------------------------------------------------------------------------
-
-sub_4CCB20      proc near               ; DATA XREF: .rdata:00517A9Co
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                mov     ecx, [esi+10h]
-                sub     ecx, [esi+18h]
-                mov     eax, [esi+14h]
-                sbb     eax, [esi+1Ch]
-                xor     edx, edx
-                cmp     edx, eax
-                push    edi
-                mov     edi, [esp+8+arg_8]
-                jb      short loc_4CCB48
-                ja      short loc_4CCB42
-                cmp     edi, ecx
-                jbe     short loc_4CCB48
-
-loc_4CCB42:                             ; CODE XREF: sub_4CCB20+1Cj
-                mov     edi, [esi+10h]
-                sub     edi, [esi+18h]
-
-loc_4CCB48:                             ; CODE XREF: sub_4CCB20+1Aj
-                                        ; sub_4CCB20+20j
-                mov     eax, [esp+8+arg_C]
-                test    eax, eax
-                jz      short loc_4CCB52
-                mov     [eax], edi
-
-loc_4CCB52:                             ; CODE XREF: sub_4CCB20+2Ej
-                test    edi, edi
-                jz      short loc_4CCB72
-                mov     eax, [esi+8]
-                add     eax, [esi+18h]
-                mov     ecx, [esp+8+arg_4]
-                push    edi             ; size_t
-                push    eax             ; void *
-                push    ecx             ; void *
-                call    _memcpy         ; Microsoft VisualC 2-8/net runtime
-                add     esp, 0Ch
-                add     [esi+18h], edi
-                adc     dword ptr [esi+1Ch], 0
-
-loc_4CCB72:                             ; CODE XREF: sub_4CCB20+34j
-                pop     edi
-                xor     eax, eax
-                pop     esi
-                retn    10h
-sub_4CCB20      endp
-
-; ---------------------------------------------------------------------------
-
-sub_4CCB90      proc near               ; DATA XREF: .rdata:00517AB0o
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-
-                push    ebx
-                mov     ebx, [esp+4+arg_8]
-                push    esi
-                mov     esi, [esp+8+arg_0]
-                mov     ecx, [esi+10h]
-                mov     eax, [esi+14h]
-                push    edi
-                xor     edi, edi
-                sub     ecx, [esi+18h]
-                sbb     eax, [esi+1Ch]
-                cmp     edi, eax
-                jb      short loc_4CCBC2
-                ja      short loc_4CCBB3
-                cmp     ebx, ecx
-                jbe     short loc_4CCBC2
-
-loc_4CCBB3:                             ; CODE XREF: sub_4CCB90+1Dj
-                pop     edi
-                mov     byte ptr [esi+20h], 1
-                pop     esi
-                mov     eax, 80004005h
-                pop     ebx
-                retn    10h
-
-loc_4CCBC2:                             ; CODE XREF: sub_4CCB90+1Bj
-                                        ; sub_4CCB90+21j
-                mov     ecx, [esi+8]
-                mov     eax, [esp+0Ch+arg_4]
-                add     ecx, [esi+18h]
-                push    ebx             ; size_t
-                push    eax             ; void *
-                push    ecx             ; void *
-                call    _memcpy         ; Microsoft VisualC 2-8/net runtime
-                mov     eax, [esp+18h+arg_C]
-                add     esp, 0Ch
-                add     [esi+18h], ebx
-                adc     [esi+1Ch], edi
-                test    eax, eax
-                jz      short loc_4CCBE7
-                mov     [eax], ebx
-
-loc_4CCBE7:                             ; CODE XREF: sub_4CCB90+53j
-                pop     edi
-                pop     esi
-                xor     eax, eax
-                pop     ebx
-                retn    10h
-sub_4CCB90      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; ---------------------------------------------------------------------------
-
-LzmaProps_Decode proc near              ; CODE XREF: Decompress_lzma_internal+35p
-;sub_4CCBF0
-
-propsRes        = dword ptr  4
-propsData       = dword ptr  8
-propsSize       = dword ptr  0Ch
-
-                cmp     [esp+propsSize], 5   ; LZMA_PROPS_SIZE
-                jge     short loc_4CCBFD
-
-loc_4CCBF7:                             ; CODE XREF: LzmaProps_Decode+16j
-                mov     eax, 1
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CCBFD:                             ; CODE XREF: LzmaProps_Decode+5j
-                mov     eax, [esp+propsData]
-                mov     cl, [eax]
-                cmp     cl, 0E1h        ; 9 * 5 * 5
-                jnb     short loc_4CCBF7
-                cmp     cl, 2Dh
-                push    edi
-                mov     edi, [esp+4+propsRes]
-                mov     dword ptr [edi+8], 0
-                jb      short loc_4CCC40
-                push    esi
-                movzx   esi, cl
-                mov     eax, 6C16C16Dh
-                mul     esi
-                mov     eax, esi
-                sub     eax, edx
-                shr     eax, 1
-                add     eax, edx
-                shr     eax, 5
-                movzx   eax, al
-                mov     edx, eax
-                pop     esi
-
-loc_4CCC35:                             ; CODE XREF: LzmaProps_Decode+4Bj
-                add     cl, 0D3h
-                sub     eax, 1
-                jnz     short loc_4CCC35
-                mov     [edi+8], edx
-
-loc_4CCC40:                             ; CODE XREF: LzmaProps_Decode+27j
-                cmp     cl, 9
-                mov     dword ptr [edi+4], 0
-                jb      short loc_4CCC6B
-                movzx   edx, cl
-                mov     eax, 38E38E39h
-                mul     edx
-                shr     edx, 1
-                movzx   eax, dl
-                mov     edx, eax
-                lea     ecx, [ecx+0]
-
-loc_4CCC60:                             ; CODE XREF: LzmaProps_Decode+76j
-                add     cl, 0F7h
-                sub     eax, 1
-                jnz     short loc_4CCC60
-                mov     [edi+4], edx
-
-loc_4CCC6B:                             ; CODE XREF: LzmaProps_Decode+5Aj
-                movzx   eax, cl
-                mov     [edi], eax
-                xor     eax, eax
-                pop     edi
-                retn
-LzmaProps_Decode endp
-
-sub_4CCC80      proc near               ; CODE XREF: Decompress_lzma_internal+97p
-
-var_3C          = dword ptr -3Ch
-var_38          = dword ptr -38h
-var_34          = dword ptr -34h
-var_30          = dword ptr -30h
-var_2C          = dword ptr -2Ch
-var_28          = dword ptr -28h
-var_24          = dword ptr -24h
-var_20          = dword ptr -20h
-var_1C          = dword ptr -1Ch
-var_18          = dword ptr -18h
-var_14          = dword ptr -14h
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-arg_10          = dword ptr  14h
-arg_14          = dword ptr  18h
-arg_18          = dword ptr  1Ch
-
-                sub     esp, 3Ch
-                mov     eax, [esp+3Ch+arg_0]
-                mov     ecx, [eax+8]
-                push    ebx
-                push    ebp
-                mov     ebp, 1
-                mov     edx, ebp
-                shl     edx, cl
-                mov     ecx, [eax+4]
-                xor     ebx, ebx
-                push    esi
-                sub     edx, ebp
-                mov     [esp+48h+var_C], edx
-                mov     edx, ebp
-                shl     edx, cl
-                mov     ecx, [esp+48h+arg_C]
-                push    edi
-                mov     edi, [eax+0Ch]
-                sub     edx, ebp
-                mov     [esp+4Ch+var_8], edx
-                mov     edx, [eax]
-                mov     [ecx], ebx
-                mov     ecx, [esp+4Ch+arg_18]
-                mov     [ecx], ebx
-                mov     ecx, [eax+4]
-                add     ecx, edx
-                mov     eax, 300h
-                shl     eax, cl
-                mov     [esp+4Ch+var_20], edi
-                mov     [esp+4Ch+var_2C], ebx
-                mov     byte ptr [esp+4Ch+arg_0], bl
-                add     eax, 736h
-                mov     [esp+4Ch+var_14], edx
-                mov     [esp+4Ch+var_34], ebx
-                mov     [esp+4Ch+var_38], ebp
-                mov     [esp+4Ch+var_24], ebp
-                mov     [esp+4Ch+var_28], ebp
-                mov     [esp+4Ch+var_18], ebp
-                jz      short loc_4CCD04
-                mov     ecx, eax
-                shr     ecx, 1
-                mov     eax, 4000400h
-                rep stosd
-                adc     ecx, ecx
-                rep stosw
-
-loc_4CCD04:                             ; CODE XREF: sub_4CCC80+72j
-                mov     edx, [esp+4Ch+arg_8]
-                mov     ecx, [esp+4Ch+arg_4]
-                lea     edi, [ecx+edx]
-                xor     esi, esi
-                or      eax, 0FFFFFFFFh
-                mov     [esp+4Ch+var_3C], edi
-                xor     edx, edx
-                lea     ebx, [ebx+0]
-
-loc_4CCD20:                             ; CODE XREF: sub_4CCC80+BCj
-                cmp     ecx, edi
-                jz      loc_4CCF0B
-                movzx   ebp, byte ptr [ecx]
-                shl     esi, 8
-                or      esi, ebp
-                mov     ebp, 1
-                add     edx, ebp
-                add     ecx, ebp
-                cmp     edx, 5
-                jl      short loc_4CCD20
-                cmp     [esp+4Ch+arg_14], ebx
-                mov     [esp+4Ch+arg_8], ecx
-                jbe     loc_4CCFCD
-                lea     esp, [esp+0]
-
-loc_4CCD50:                             ; CODE XREF: sub_4CCC80+32Dj
-                mov     edx, [esp+4Ch+var_34]
-                mov     ecx, [esp+4Ch+var_C]
-                and     ecx, [esp+4Ch+var_2C]
-                mov     edi, [esp+4Ch+var_20]
-                mov     ebx, edx
-                shl     ebx, 4
-                add     ebx, ecx
-                cmp     eax, 1000000h
-                lea     ebx, [edi+ebx*2]
-                mov     [esp+4Ch+var_1C], ecx
-                mov     [esp+4Ch+var_30], ebx
-                jnb     short loc_4CCD99
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebp, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebp
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CCD99:                             ; CODE XREF: sub_4CCC80+F7j
-                movzx   ebx, word ptr [ebx]
-                movzx   ebp, bx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                jnb     loc_4CCFF4
-                mov     edi, [esp+4Ch+var_30]
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebp
-                mov     ebp, [esp+4Ch+var_8]
-                sar     ecx, 5
-                add     ecx, ebx
-                movzx   ebx, byte ptr [esp+4Ch+arg_0]
-                mov     [edi], cx
-                mov     edi, [esp+4Ch+var_2C]
-                mov     ecx, 8
-                sub     cl, byte ptr [esp+4Ch+var_14]
-                and     ebp, edi
-                shr     ebx, cl
-                mov     ecx, [esp+4Ch+var_14]
-                shl     ebp, cl
-                mov     ecx, [esp+4Ch+var_20]
-                mov     edx, 1
-                add     ebx, ebp
-                imul    ebx, 600h
-                cmp     [esp+4Ch+var_34], 7
-                lea     ebp, [ebx+ecx+0E6Ch]
-                mov     [esp+4Ch+var_30], ebp
-                jl      loc_4CCEB0
-                sub     edi, [esp+4Ch+var_38]
-                mov     ecx, [esp+4Ch+arg_10]
-                movzx   ebx, byte ptr [edi+ecx]
-                jmp     short loc_4CCE20
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CCE20:                             ; CODE XREF: sub_4CCC80+197j
-                                        ; sub_4CCC80+2C6j
-                add     ebx, ebx
-                mov     [esp+4Ch+var_10], ebx
-                and     ebx, 100h
-                cmp     eax, 1000000h
-                lea     ecx, [ebx+edx]
-                lea     ebp, [ebp+ecx*2+200h]
-                mov     [esp+4Ch+arg_0], ebp
-                jnb     short loc_4CCE61
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   edi, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, edi
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CCE61:                             ; CODE XREF: sub_4CCC80+1BFj
-                movzx   edi, word ptr [ebp+0]
-                movzx   ebp, di
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                jnb     loc_4CCF15
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebp
-                sar     ecx, 5
-                add     ecx, edi
-                mov     edi, [esp+4Ch+arg_0]
-                add     edx, edx
-                test    ebx, ebx
-                mov     [edi], cx
-                jz      loc_4CCF36
-
-loc_4CCE97:                             ; CODE XREF: sub_4CCC80+2B0j
-                cmp     edx, 100h
-                jge     loc_4CCF70
-                mov     ebp, [esp+4Ch+var_30]
-                jmp     short loc_4CCEB0
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CCEB0:                             ; CODE XREF: sub_4CCC80+185j
-                                        ; sub_4CCC80+227j ...
-                cmp     eax, 1000000h
-                lea     ecx, [edx+edx]
-                mov     [esp+4Ch+arg_0], ecx
-                jnb     short loc_4CCEDE
-                mov     edi, [esp+4Ch+arg_8]
-                cmp     edi, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebx, byte ptr [edi]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebx
-                add     edi, 1
-                mov     [esp+4Ch+arg_8], edi
-
-loc_4CCEDE:                             ; CODE XREF: sub_4CCC80+23Cj
-                movzx   edi, word ptr [ecx+ebp]
-                movzx   ebx, di
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebx
-                cmp     esi, ecx
-                jnb     short loc_4CCF4B
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebx
-                sar     ecx, 5
-                add     ecx, edi
-                mov     edi, [esp+4Ch+arg_0]
-                mov     [edi+ebp], cx
-                add     edx, edx
-                jmp     short loc_4CCF64
-; ---------------------------------------------------------------------------
-
-loc_4CCF0B:                             ; CODE XREF: sub_4CCC80+A2j
-                pop     edi
-                pop     esi
-                mov     eax, ebp
-                pop     ebp
-                pop     ebx
-                add     esp, 3Ch
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CCF15:                             ; CODE XREF: sub_4CCC80+1F2j
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, di
-                shr     cx, 5
-                sub     di, cx
-                test    ebx, ebx
-                mov     ecx, [esp+4Ch+arg_0]
-                mov     [ecx], di
-                lea     edx, [edx+edx+1]
-                jz      loc_4CCE97
-
-loc_4CCF36:                             ; CODE XREF: sub_4CCC80+211j
-                cmp     edx, 100h
-                jge     short loc_4CCF70
-                mov     ebp, [esp+4Ch+var_30]
-                mov     ebx, [esp+4Ch+var_10]
-                jmp     loc_4CCE20
-; ---------------------------------------------------------------------------
-
-loc_4CCF4B:                             ; CODE XREF: sub_4CCC80+26Fj
-                mov     dx, di
-                shr     dx, 5
-                sub     di, dx
-                mov     edx, [esp+4Ch+arg_0]
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     [edx+ebp], di
-                add     edx, 1
-
-loc_4CCF64:                             ; CODE XREF: sub_4CCC80+289j
-                cmp     edx, 100h
-                jl      loc_4CCEB0
-
-loc_4CCF70:                             ; CODE XREF: sub_4CCC80+21Dj
-                                        ; sub_4CCC80+2BCj
-                mov     ecx, [esp+4Ch+var_2C]
-                mov     edi, [esp+4Ch+arg_10]
-                mov     [ecx+edi], dl
-                add     ecx, 1
-                mov     [esp+4Ch+var_2C], ecx
-                mov     ecx, [esp+4Ch+var_34]
-                cmp     ecx, 4
-                mov     byte ptr [esp+4Ch+arg_0], dl
-                jge     short loc_4CCF99
-                mov     [esp+4Ch+var_34], 0
-                jmp     short loc_4CCFA5
-; ---------------------------------------------------------------------------
-
-loc_4CCF99:                             ; CODE XREF: sub_4CCC80+30Dj
-                cmp     ecx, 0Ah
-                jge     short loc_4CCFEF
-                sub     ecx, 3
-
-loc_4CCFA1:                             ; CODE XREF: sub_4CCC80+372j
-                mov     [esp+4Ch+var_34], ecx
-
-loc_4CCFA5:                             ; CODE XREF: sub_4CCC80+317j
-                                        ; sub_4CCC80+530j ...
-                mov     ecx, [esp+4Ch+var_2C]
-                cmp     ecx, [esp+4Ch+arg_14]
-                jb      loc_4CCD50
-
-loc_4CCFB3:                             ; CODE XREF: sub_4CCC80+A13j
-                                        ; sub_4CCC80+A5Aj
-                cmp     eax, 1000000h
-                jnb     short loc_4CCFCD
-                mov     edx, [esp+4Ch+arg_8]
-                cmp     edx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                add     [esp+4Ch+arg_8], 1
-
-loc_4CCFCD:                             ; CODE XREF: sub_4CCC80+C6j
-                                        ; sub_4CCC80+338j
-                mov     eax, [esp+4Ch+arg_8]
-                sub     eax, [esp+4Ch+arg_4]
-                mov     ecx, [esp+4Ch+arg_C]
-                mov     edx, [esp+4Ch+var_2C]
-                pop     edi
-                mov     [ecx], eax
-                mov     eax, [esp+48h+arg_18]
-                pop     esi
-                pop     ebp
-                mov     [eax], edx
-                xor     eax, eax
-                pop     ebx
-                add     esp, 3Ch
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CCFEF:                             ; CODE XREF: sub_4CCC80+31Cj
-                sub     ecx, 6
-                jmp     short loc_4CCFA1
-; ---------------------------------------------------------------------------
-
-loc_4CCFF4:                             ; CODE XREF: sub_4CCC80+129j
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, bx
-                shr     cx, 5
-                sub     bx, cx
-                cmp     eax, 1000000h
-                mov     ecx, [esp+4Ch+var_30]
-                mov     [ecx], bx
-                jnb     short loc_4CD030
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebx, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebx
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CD030:                             ; CODE XREF: sub_4CCC80+38Ej
-                movzx   ebx, word ptr [edi+edx*2+180h]
-                movzx   ebp, bx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                jnb     short loc_4CD096
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebp
-                sar     ecx, 5
-                add     ecx, ebx
-                mov     [edi+edx*2+180h], cx
-                mov     ecx, [esp+4Ch+var_28]
-                mov     ebp, [esp+4Ch+var_1C]
-                mov     [esp+4Ch+var_18], ecx
-                mov     ecx, [esp+4Ch+var_24]
-                mov     [esp+4Ch+var_28], ecx
-                mov     ecx, [esp+4Ch+var_38]
-                mov     [esp+4Ch+var_24], ecx
-                xor     ecx, ecx
-                cmp     edx, 7
-                setl    cl
-                sub     ecx, 1
-                and     ecx, 3
-                mov     [esp+4Ch+var_34], ecx
-                lea     ecx, [edi+664h]
-                jmp     loc_4CD30B
-; ---------------------------------------------------------------------------
-
-loc_4CD096:                             ; CODE XREF: sub_4CCC80+3C5j
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, bx
-                shr     cx, 5
-                sub     bx, cx
-                cmp     eax, 1000000h
-                mov     [edi+edx*2+180h], bx
-                jnb     short loc_4CD0D3
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebx, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebx
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CD0D3:                             ; CODE XREF: sub_4CCC80+431j
-                movzx   ebx, word ptr [edi+edx*2+198h]
-                movzx   ebp, bx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                mov     [esp+4Ch+arg_0], ebx
-                jnb     loc_4CD1D3
-                mov     ebx, 800h
-                sub     ebx, ebp
-                mov     ebp, [esp+4Ch+var_1C]
-                sar     ebx, 5
-                add     ebx, [esp+4Ch+arg_0]
-                mov     eax, ecx
-                mov     [edi+edx*2+198h], bx
-                lea     ebx, [edx+0Fh]
-                shl     ebx, 4
-                add     ebx, ebp
-                cmp     ecx, 1000000h
-                lea     ebx, [edi+ebx*2]
-                mov     [esp+4Ch+var_30], ebx
-                jnb     short loc_4CD147
-                mov     ebx, [esp+4Ch+arg_8]
-                cmp     ebx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                shl     ecx, 8
-                mov     eax, ecx
-                movzx   ecx, byte ptr [ebx]
-                shl     esi, 8
-                or      esi, ecx
-                add     ebx, 1
-                mov     [esp+4Ch+arg_8], ebx
-
-loc_4CD147:                             ; CODE XREF: sub_4CCC80+4A3j
-                mov     ecx, [esp+4Ch+var_30]
-                movzx   ecx, word ptr [ecx]
-                mov     [esp+4Ch+arg_0], ecx
-                movzx   ebx, cx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebx
-                cmp     esi, ecx
-                jnb     short loc_4CD1B5
-                mov     edi, [esp+4Ch+var_30]
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebx
-                sar     ecx, 5
-                add     ecx, [esp+4Ch+arg_0]
-                mov     [edi], cx
-                mov     edi, [esp+4Ch+var_2C]
-                test    edi, edi
-                jz      loc_4CD6E2
-                xor     ecx, ecx
-                cmp     edx, 7
-                mov     edx, [esp+4Ch+arg_10]
-                setnl   cl
-                lea     ecx, [ecx+ecx+9]
-                mov     [esp+4Ch+var_34], ecx
-                mov     ecx, edi
-                sub     ecx, [esp+4Ch+var_38]
-                add     edi, 1
-                mov     cl, [ecx+edx]
-                mov     [edi+edx-1], cl
-                mov     byte ptr [esp+4Ch+arg_0], cl
-                mov     [esp+4Ch+var_2C], edi
-                jmp     loc_4CCFA5
-; ---------------------------------------------------------------------------
-
-loc_4CD1B5:                             ; CODE XREF: sub_4CCC80+4DFj
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     ecx, [esp+4Ch+arg_0]
-                mov     bx, cx
-                shr     bx, 5
-                sub     cx, bx
-                mov     ebx, [esp+4Ch+var_30]
-                mov     [ebx], cx
-                jmp     loc_4CD2F0
-; ---------------------------------------------------------------------------
-
-loc_4CD1D3:                             ; CODE XREF: sub_4CCC80+46Cj
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, bx
-                shr     cx, 5
-                sub     bx, cx
-                cmp     eax, 1000000h
-                mov     [edi+edx*2+198h], bx
-                jnb     short loc_4CD210
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebx, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebx
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CD210:                             ; CODE XREF: sub_4CCC80+56Ej
-                movzx   ebx, word ptr [edi+edx*2+1B0h]
-                movzx   ebp, bx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                jnb     short loc_4CD246
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebp
-                sar     ecx, 5
-                add     ecx, ebx
-                mov     [edi+edx*2+1B0h], cx
-                mov     ecx, [esp+4Ch+var_24]
-                jmp     loc_4CD2E0
-; ---------------------------------------------------------------------------
-
-loc_4CD246:                             ; CODE XREF: sub_4CCC80+5A5j
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, bx
-                shr     cx, 5
-                sub     bx, cx
-                cmp     eax, 1000000h
-                mov     [edi+edx*2+1B0h], bx
-                jnb     short loc_4CD283
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebx, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebx
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CD283:                             ; CODE XREF: sub_4CCC80+5E1j
-                movzx   ebx, word ptr [edi+edx*2+1C8h]
-                movzx   ebp, bx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                jnb     short loc_4CD2B6
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebp
-                sar     ecx, 5
-                add     ecx, ebx
-                mov     [edi+edx*2+1C8h], cx
-                mov     ecx, [esp+4Ch+var_28]
-                jmp     short loc_4CD2D8
-; ---------------------------------------------------------------------------
-
-loc_4CD2B6:                             ; CODE XREF: sub_4CCC80+618j
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, bx
-                shr     cx, 5
-                sub     bx, cx
-                mov     ecx, [esp+4Ch+var_18]
-                mov     [edi+edx*2+1C8h], bx
-                mov     ebx, [esp+4Ch+var_28]
-                mov     [esp+4Ch+var_18], ebx
-
-loc_4CD2D8:                             ; CODE XREF: sub_4CCC80+634j
-                mov     ebx, [esp+4Ch+var_24]
-                mov     [esp+4Ch+var_28], ebx
-
-loc_4CD2E0:                             ; CODE XREF: sub_4CCC80+5C1j
-                mov     ebx, [esp+4Ch+var_38]
-                mov     ebp, [esp+4Ch+var_1C]
-                mov     [esp+4Ch+var_24], ebx
-                mov     [esp+4Ch+var_38], ecx
-
-loc_4CD2F0:                             ; CODE XREF: sub_4CCC80+54Ej
-                xor     ecx, ecx
-                cmp     edx, 7
-                setnl   cl
-                sub     ecx, 1
-                and     ecx, 0FFFFFFFDh
-                add     ecx, 0Bh
-                mov     [esp+4Ch+var_34], ecx
-                lea     ecx, [edi+0A68h]
-
-loc_4CD30B:                             ; CODE XREF: sub_4CCC80+411j
-                cmp     eax, 1000000h
-                jnb     short loc_4CD332
-                mov     edx, [esp+4Ch+arg_8]
-                cmp     edx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   edi, byte ptr [edx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, edi
-                add     edx, 1
-                mov     [esp+4Ch+arg_8], edx
-
-loc_4CD332:                             ; CODE XREF: sub_4CCC80+690j
-                movzx   edi, word ptr [ecx]
-                movzx   ebx, di
-                mov     edx, eax
-                shr     edx, 0Bh
-                imul    edx, ebx
-                cmp     esi, edx
-                jnb     short loc_4CD36E
-                mov     eax, edx
-                mov     edx, 800h
-                sub     edx, ebx
-                sar     edx, 5
-                add     edx, edi
-                mov     [ecx], dx
-                shl     ebp, 4
-                lea     ecx, [ecx+ebp+4]
-                mov     [esp+4Ch+var_1C], 0
-                mov     edx, 3
-                jmp     loc_4CD409
-; ---------------------------------------------------------------------------
-
-loc_4CD36E:                             ; CODE XREF: sub_4CCC80+6C2j
-                sub     eax, edx
-                sub     esi, edx
-                mov     dx, di
-                shr     dx, 5
-                sub     di, dx
-                cmp     eax, 1000000h
-                mov     [ecx], di
-                jnb     short loc_4CD3A6
-                mov     edx, [esp+4Ch+arg_8]
-                cmp     edx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   edi, byte ptr [edx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, edi
-                add     edx, 1
-                mov     [esp+4Ch+arg_8], edx
-
-loc_4CD3A6:                             ; CODE XREF: sub_4CCC80+704j
-                movzx   edx, word ptr [ecx+2]
-                movzx   ebx, dx
-                mov     edi, eax
-                shr     edi, 0Bh
-                imul    edi, ebx
-                cmp     esi, edi
-                jnb     short loc_4CD3E4
-                mov     eax, edi
-                mov     edi, 800h
-                sub     edi, ebx
-                sar     edi, 5
-                add     edi, edx
-                shl     ebp, 4
-                mov     [ecx+2], di
-                lea     ecx, [ecx+ebp+104h]
-                mov     [esp+4Ch+var_1C], 8
-                mov     edx, 3
-                jmp     short loc_4CD409
-; ---------------------------------------------------------------------------
-
-loc_4CD3E4:                             ; CODE XREF: sub_4CCC80+737j
-                sub     eax, edi
-                sub     esi, edi
-                mov     di, dx
-                shr     di, 5
-                sub     dx, di
-                mov     [ecx+2], dx
-                add     ecx, 204h
-                mov     [esp+4Ch+var_1C], 10h
-                mov     edx, 8
-
-loc_4CD409:                             ; CODE XREF: sub_4CCC80+6E9j
-                                        ; sub_4CCC80+762j
-                mov     [esp+4Ch+arg_0], edx
-                mov     [esp+4Ch+var_10], edx
-                mov     ebx, 1
-                jmp     short loc_4CD420
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CD420:                             ; CODE XREF: sub_4CCC80+796j
-                                        ; sub_4CCC80+819j
-                cmp     eax, 1000000h
-                mov     edx, [esp+4Ch+arg_8]
-                lea     edi, [ebx+ebx]
-                mov     [esp+4Ch+var_30], edi
-                jnb     short loc_4CD44E
-                cmp     edx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebp, byte ptr [edx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebp
-                add     edx, 1
-                mov     [esp+4Ch+arg_8], edx
-
-loc_4CD44E:                             ; CODE XREF: sub_4CCC80+7B0j
-                movzx   edi, word ptr [edi+ecx]
-                movzx   ebp, di
-                mov     edx, eax
-                shr     edx, 0Bh
-                imul    edx, ebp
-                cmp     esi, edx
-                jnb     short loc_4CD47B
-                mov     eax, edx
-                mov     edx, 800h
-                sub     edx, ebp
-                sar     edx, 5
-                add     edx, edi
-                mov     edi, [esp+4Ch+var_30]
-                mov     [edi+ecx], dx
-                add     ebx, ebx
-                jmp     short loc_4CD494
-; ---------------------------------------------------------------------------
-
-loc_4CD47B:                             ; CODE XREF: sub_4CCC80+7DFj
-                mov     ebx, [esp+4Ch+var_30]
-                sub     eax, edx
-                sub     esi, edx
-                mov     dx, di
-                shr     dx, 5
-                sub     di, dx
-                mov     [ebx+ecx], di
-                add     ebx, 1
-
-loc_4CD494:                             ; CODE XREF: sub_4CCC80+7F9j
-                sub     [esp+4Ch+var_10], 1
-                jnz     short loc_4CD420
-                mov     ecx, [esp+4Ch+arg_0]
-                mov     edx, 1
-                shl     edx, cl
-                mov     ecx, [esp+4Ch+var_1C]
-                sub     ecx, edx
-                add     ebx, ecx
-                cmp     [esp+4Ch+var_34], 4
-                mov     [esp+4Ch+var_4], ebx
-                jge     loc_4CD69D
-                add     [esp+4Ch+var_34], 7
-                cmp     ebx, 4
-                jl      short loc_4CD4CC
-                mov     ebx, 3
-
-loc_4CD4CC:                             ; CODE XREF: sub_4CCC80+845j
-                mov     ecx, [esp+4Ch+var_20]
-                shl     ebx, 7
-                lea     ecx, [ebx+ecx+360h]
-                mov     [esp+4Ch+var_30], ecx
-                mov     [esp+4Ch+arg_0], 6
-                mov     edi, 1
-                jmp     short loc_4CD4F0
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CD4F0:                             ; CODE XREF: sub_4CCC80+86Bj
-                                        ; sub_4CCC80+8E3j
-                cmp     eax, 1000000h
-                mov     edx, [esp+4Ch+arg_8]
-                lea     ebx, [edi+edi]
-                jnb     short loc_4CD51A
-                cmp     edx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   ebp, byte ptr [edx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebp
-                add     edx, 1
-                mov     [esp+4Ch+arg_8], edx
-
-loc_4CD51A:                             ; CODE XREF: sub_4CCC80+87Cj
-                movzx   edx, word ptr [ebx+ecx]
-                movzx   ebp, dx
-                mov     ecx, eax
-                shr     ecx, 0Bh
-                imul    ecx, ebp
-                cmp     esi, ecx
-                jnb     short loc_4CD545
-                mov     eax, ecx
-                mov     ecx, 800h
-                sub     ecx, ebp
-                sar     ecx, 5
-                add     ecx, edx
-                mov     [esp+4Ch+var_10], ecx
-                mov     edx, ecx
-                add     edi, edi
-                jmp     short loc_4CD556
-; ---------------------------------------------------------------------------
-
-loc_4CD545:                             ; CODE XREF: sub_4CCC80+8ABj
-                sub     eax, ecx
-                sub     esi, ecx
-                mov     cx, dx
-                shr     cx, 5
-                sub     dx, cx
-                lea     edi, [ebx+1]
-
-loc_4CD556:                             ; CODE XREF: sub_4CCC80+8C3j
-                sub     [esp+4Ch+arg_0], 1
-                mov     ecx, [esp+4Ch+var_30]
-                mov     [ebx+ecx], dx
-                jnz     short loc_4CD4F0
-                sub     edi, 40h
-                cmp     edi, 4
-                jl      loc_4CD68A
-                mov     ebx, 1
-                mov     ecx, edi
-                mov     edx, edi
-                sar     ecx, 1
-                and     edx, ebx
-                sub     ecx, ebx
-                or      edx, 2
-                cmp     edi, 0Eh
-                mov     [esp+4Ch+var_30], ecx
-                jge     short loc_4CD5A1
-                shl     edx, cl
-                mov     ecx, [esp+4Ch+var_20]
-                mov     [esp+4Ch+var_38], edx
-                sub     edx, edi
-                lea     ebp, [ecx+edx*2+55Eh]
-                jmp     short loc_4CD5F3
-; ---------------------------------------------------------------------------
-
-loc_4CD5A1:                             ; CODE XREF: sub_4CCC80+90Aj
-                mov     edi, [esp+4Ch+arg_8]
-                sub     ecx, 4
-
-loc_4CD5A8:                             ; CODE XREF: sub_4CCC80+958j
-                cmp     eax, 1000000h
-                jnb     short loc_4CD5CA
-                cmp     edi, [esp+4Ch+var_3C]
-                jz      loc_4CD6EF
-                movzx   ebp, byte ptr [edi]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, ebp
-                add     edi, ebx
-                mov     [esp+4Ch+arg_8], edi
-
-loc_4CD5CA:                             ; CODE XREF: sub_4CCC80+92Dj
-                shr     eax, 1
-                add     edx, edx
-                cmp     esi, eax
-                jb      short loc_4CD5D6
-                sub     esi, eax
-                or      edx, ebx
-
-loc_4CD5D6:                             ; CODE XREF: sub_4CCC80+950j
-                sub     ecx, ebx
-                jnz     short loc_4CD5A8
-                mov     ebp, [esp+4Ch+var_20]
-                add     ebp, 644h
-                shl     edx, 4
-                mov     [esp+4Ch+var_38], edx
-                mov     [esp+4Ch+var_30], 4
-
-loc_4CD5F3:                             ; CODE XREF: sub_4CCC80+91Fj
-                mov     [esp+4Ch+var_1C], ebx
-                mov     [esp+4Ch+arg_0], ebx
-                jmp     short loc_4CD600
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CD600:                             ; CODE XREF: sub_4CCC80+97Bj
-                                        ; sub_4CCC80+A02j
-                mov     ebx, [esp+4Ch+arg_0]
-                add     ebx, ebx
-                cmp     eax, 1000000h
-                jnb     short loc_4CD62D
-                mov     ecx, [esp+4Ch+arg_8]
-                cmp     ecx, [esp+4Ch+var_3C]
-                jz      loc_4CD6E2
-                movzx   edx, byte ptr [ecx]
-                shl     esi, 8
-                shl     eax, 8
-                or      esi, edx
-                add     ecx, 1
-                mov     [esp+4Ch+arg_8], ecx
-
-loc_4CD62D:                             ; CODE XREF: sub_4CCC80+98Bj
-                movzx   edi, word ptr [ebx+ebp]
-                movzx   ecx, di
-                mov     edx, eax
-                shr     edx, 0Bh
-                imul    edx, ecx
-                cmp     esi, edx
-                jnb     short loc_4CD658
-                mov     eax, edx
-                mov     edx, 800h
-                sub     edx, ecx
-                sar     edx, 5
-                add     edx, edi
-                shl     [esp+4Ch+arg_0], 1
-                mov     [ebx+ebp], dx
-                jmp     short loc_4CD679
-; ---------------------------------------------------------------------------
-
-loc_4CD658:                             ; CODE XREF: sub_4CCC80+9BEj
-                mov     cx, di
-                shr     cx, 5
-                sub     di, cx
-                sub     eax, edx
-                sub     esi, edx
-                mov     edx, [esp+4Ch+var_1C]
-                mov     [ebx+ebp], di
-                add     ebx, 1
-                or      [esp+4Ch+var_38], edx
-                mov     [esp+4Ch+arg_0], ebx
-
-loc_4CD679:                             ; CODE XREF: sub_4CCC80+9D6j
-                shl     [esp+4Ch+var_1C], 1
-                sub     [esp+4Ch+var_30], 1
-                jnz     loc_4CD600
-                jmp     short loc_4CD68E
-; ---------------------------------------------------------------------------
-
-loc_4CD68A:                             ; CODE XREF: sub_4CCC80+8EBj
-                mov     [esp+4Ch+var_38], edi
-
-loc_4CD68E:                             ; CODE XREF: sub_4CCC80+A08j
-                add     [esp+4Ch+var_38], 1
-                jz      loc_4CCFB3
-                mov     ebx, [esp+4Ch+var_4]
-
-loc_4CD69D:                             ; CODE XREF: sub_4CCC80+837j
-                mov     ebp, [esp+4Ch+var_2C]
-                mov     ecx, [esp+4Ch+var_38]
-                add     ebx, 2
-                cmp     ecx, ebp
-                ja      short loc_4CD6E2
-                mov     edi, ebp
-                sub     edi, ecx
-                add     edi, [esp+4Ch+arg_10]
-
-loc_4CD6B4:                             ; CODE XREF: sub_4CCC80+A60j
-                mov     cl, [edi]
-                mov     edx, [esp+4Ch+arg_10]
-                sub     ebx, 1
-                mov     [edx+ebp], cl
-                add     ebp, 1
-                add     edi, 1
-                test    ebx, ebx
-                mov     byte ptr [esp+4Ch+arg_0], cl
-                mov     [esp+4Ch+var_2C], ebp
-                jz      loc_4CCFA5
-                cmp     ebp, [esp+4Ch+arg_14]
-                jnb     loc_4CCFB3
-                jmp     short loc_4CD6B4
-; ---------------------------------------------------------------------------
-
-loc_4CD6E2:                             ; CODE XREF: sub_4CCC80+101j
-                                        ; sub_4CCC80+1C9j ...
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     eax, 1
-                pop     ebx
-                add     esp, 3Ch
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CD6EF:                             ; CODE XREF: sub_4CCC80+933j
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     eax, ebx
-                pop     ebx
-                add     esp, 3Ch
-                retn
-sub_4CCC80      endp
-
-_starcraft_decompress_lzma PROC
-;sub_4CD700
-
-var_14          = byte ptr -14h
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_4           = dword ptr -4
-pbInBuffer      = dword ptr  4
-cbInBuffer      = dword ptr  8
-pbOutBuffer     = dword ptr  0Ch
-cbOutBuffer     = dword ptr  10h
-pcbOutBuffer    = dword ptr  14h
-pfnAllocateMemory= dword ptr  18h
-pfnFreeMemory   = dword ptr  1Ch
-
-                sub     esp, 14h
-                push    ebx
-                mov     ebx, [esp+18h+cbInBuffer]
-                cmp     ebx, 0Eh        ; LZMA_PROPS_SIZE + 8
-                jnb     short loc_4CD714
-                xor     al, al
-                pop     ebx
-                add     esp, 14h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CD714:                             ; CODE XREF: Decompress_lzma_internal+Bj
-                push    ebp
-                mov     ebp, [esp+1Ch+pcbOutBuffer]
-                push    edi
-                mov     edi, [esp+20h+pbInBuffer]
-                mov     dword ptr [ebp+0], 0
-                cmp     byte ptr [edi], 0
-                jnz     short loc_4CD741
-                push    5
-                lea     eax, [edi+1]
-                push    eax
-                lea     ecx, [esp+28h+var_10]
-                push    ecx
-                call    LzmaProps_Decode
-                add     esp, 0Ch
-                test    eax, eax
-                jz      short loc_4CD74A
-
-loc_4CD741:                             ; CODE XREF: Decompress_lzma_internal+28j
-                pop     edi
-                pop     ebp
-                xor     al, al
-                pop     ebx
-                add     esp, 14h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CD74A:                             ; CODE XREF: Decompress_lzma_internal+3Fj
-                mov     edx, [esp+20h+var_10]
-                mov     eax, [esp+20h+var_C]
-                lea     ecx, [eax+edx]
-                mov     edx, 300h
-                shl     edx, cl
-                push    esi
-                lea     eax, [edx+edx+0E6Ch]
-                push    eax
-                call    [esp+28h+pfnAllocateMemory]
-                mov     esi, eax
-                add     esp, 4
-                test    esi, esi
-                mov     [esp+24h+var_4], esi
-                jz      short loc_4CD7AA
-                mov     edx, [esp+24h+cbOutBuffer]
-                mov     eax, [esp+24h+pbOutBuffer]
-                lea     ecx, [esp+24h+cbInBuffer]
-                push    ecx             ; cbInBuffer
-                push    edx             ; cbOutBuffer
-                push    eax             ; pbOutBuffer
-                lea     ecx, [esp+30h+var_14]
-                push    ecx             ; &var_14
-                add     ebx, 0FFFFFFF2h
-                push    ebx             ; cbInBuffer - LZMA86_HEADER_SIZE
-                add     edi, 0Eh
-                lea     edx, [esp+38h+var_10]
-                push    edi             ; pbInBuffer + LZMA86_HEADER_SIZE
-                push    edx             ; dest
-                call    sub_4CCC80
-                push    esi
-                mov     edi, eax
-                call    [esp+44h+pfnFreeMemory]
-                add     esp, 20h
-                test    edi, edi
-                jz      short loc_4CD7B4
-
-loc_4CD7AA:                             ; CODE XREF: Decompress_lzma_internal+74j
-                pop     esi
-                pop     edi
-                pop     ebp
-                xor     al, al
-                pop     ebx
-                add     esp, 14h
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CD7B4:                             ; CODE XREF: Decompress_lzma_internal+A8j
-                mov     eax, [esp+24h+cbInBuffer]
-                pop     esi
-                pop     edi
-                mov     [ebp+0], eax
-                pop     ebp
-                mov     al, 1
-                pop     ebx
-                add     esp, 14h
-                retn
-_starcraft_decompress_lzma ENDP
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CD7D0      proc near               ; CODE XREF: sub_4CDC00+74p
-
-arg_0           = dword ptr  4
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                or      esi, 8
-                xor     eax, eax
-                cmp     esi, 1
-                jz      short loc_4CD806
-                push    edi
-
-loc_4CD7E0:                             ; CODE XREF: sub_4CD7D0+33j
-                mov     edx, esi
-                shr     esi, 1
-                mov     edi, [ecx+esi*4]
-                and     edx, 1
-                sub     edi, edx
-                neg     edx
-                xor     edi, edx
-                shr     edi, 2
-                and     edi, 1FFh
-                add     eax, dword_550998[edi*4]
-                cmp     esi, 1
-                jnz     short loc_4CD7E0
-                pop     edi
-
-loc_4CD806:                             ; CODE XREF: sub_4CD7D0+Dj
-                pop     esi
-                retn    4
-sub_4CD7D0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CD810      proc near               ; CODE XREF: CEncoder_FillAlignPrices+17p
-
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-
-                push    ecx
-                push    ebx
-                push    ebp
-                push    esi
-                xor     eax, eax
-                push    edi
-                mov     edi, [esp+14h+arg_0]
-                mov     [esp+14h+var_4], ecx
-                lea     esi, [eax+1]
-                lea     ebx, [eax+4]
-
-loc_4CD825:                             ; CODE XREF: sub_4CD810+42j
-                mov     ecx, [esp+14h+var_4]
-                mov     ecx, [ecx+esi*4]
-                mov     edx, edi
-                and     edx, 1
-                sub     ecx, edx
-                mov     ebp, edx
-                neg     ebp
-                xor     ecx, ebp
-                shr     ecx, 2
-                and     ecx, 1FFh
-                add     eax, dword_550998[ecx*4]
-                add     esi, esi
-                shr     edi, 1
-                or      esi, edx
-                sub     ebx, 1
-                jnz     short loc_4CD825
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn    4
-sub_4CD810      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CD860      proc near               ; CODE XREF: CEncoder_FillDistancesPrices+6Bp
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                push    edi
-                mov     edi, [esp+4+arg_4]
-                xor     eax, eax
-                test    edi, edi
-                lea     edx, [eax+1]
-                jz      short loc_4CD8A7
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+10h+arg_8]
-
-loc_4CD875:                             ; CODE XREF: sub_4CD860+42j
-                mov     ebx, [esp+10h+arg_0]
-                mov     ebx, [ebx+edx*4]
-                mov     ecx, esi
-                and     ecx, 1
-                sub     ebx, ecx
-                mov     ebp, ecx
-                neg     ebp
-                xor     ebx, ebp
-                shr     ebx, 2
-                and     ebx, 1FFh
-                add     eax, dword_550998[ebx*4]
-                add     edx, edx
-                shr     esi, 1
-                or      edx, ecx
-                sub     edi, 1
-                jnz     short loc_4CD875
-                pop     esi
-                pop     ebp
-                pop     ebx
-
-loc_4CD8A7:                             ; CODE XREF: sub_4CD860+Cj
-                pop     edi
-                retn
-sub_4CD860      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CD8B0      proc near               ; CODE XREF: CEncoder_CodeOneBlock+7B8p
-                mov     eax, [ecx+24h]
-                mov     edx, [ecx+1Ch]
-                push    ebx
-                push    esi
-                mov     esi, [ecx+30h]
-                xor     ebx, ebx
-                push    edi
-                mov     edi, [ecx+34h]
-                sub     esi, eax
-                sbb     edi, ebx
-                add     esi, edx
-                adc     edi, ebx
-                cmp     eax, edx
-                jbe     short loc_4CD8D4
-                mov     eax, [ecx+28h]
-                add     esi, eax
-                adc     edi, ebx
-
-loc_4CD8D4:                             ; CODE XREF: sub_4CD8B0+1Bj
-                mov     eax, [ecx]
-                xor     edx, edx
-                add     eax, esi
-                adc     edx, edi
-                pop     edi
-                add     eax, 4
-                pop     esi
-                adc     edx, ebx
-                pop     ebx
-                retn
-sub_4CD8B0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CD8F0      proc near               ; CODE XREF: sub_4CD940+21p
-                                        ; .text:loc_4CF730j ...
-                mov     eax, dword_553598
-                test    eax, eax
-                push    esi
-                mov     esi, ecx
-                push    edi
-                mov     edi, [esi]
-                jnz     short loc_4CD92A
-                push    0Ch             ; Size
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                test    eax, eax
-                jz      short loc_4CD923
-                mov     dword ptr [eax], 0
-                mov     dword ptr [eax+4], 0
-                mov     dword ptr [eax+8], 0
-                jmp     short loc_4CD925
-; ---------------------------------------------------------------------------
-
-loc_4CD923:                             ; CODE XREF: sub_4CD8F0+1Bj
-                xor     eax, eax
-
-loc_4CD925:                             ; CODE XREF: sub_4CD8F0+31j
-                mov     dword_553598, eax
-
-loc_4CD92A:                             ; CODE XREF: sub_4CD8F0+Dj
-                mov     eax, [eax+4]
-                test    eax, eax
-                jz      short loc_4CD937
-                push    edi
-                call    eax
-                add     esp, 4
-
-loc_4CD937:                             ; CODE XREF: sub_4CD8F0+3Fj
-                pop     edi
-                mov     dword ptr [esi], 0
-                pop     esi
-                retn
-sub_4CD8F0      endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CD940      proc near               ; CODE XREF: sub_4D0270+74p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                mov     ebx, [esp+4+arg_4]
-                push    esi
-                mov     esi, ecx
-                cmp     dword ptr [esi], 0
-                push    edi
-                mov     edi, [esp+0Ch+arg_0]
-                jz      short loc_4CD95F
-                mov     eax, [esi+8]
-                add     eax, [esi+4]
-                lea     ecx, [edi+ebx]
-                cmp     ecx, eax
-                jz      short loc_4CD981
-
-loc_4CD95F:                             ; CODE XREF: sub_4CD940+10j
-                mov     ecx, esi
-                call    sub_4CD8F0
-                lea     ecx, [edi+ebx]
-                mov     edx, 1
-                shl     edx, cl
-                imul    edx, 0C00h
-                push    edx
-                call    sub_4CB8A0
-                add     esp, 4
-                mov     [esi], eax
-
-loc_4CD981:                             ; CODE XREF: sub_4CD940+1Dj
-                mov     ecx, edi
-                mov     eax, 1
-                shl     eax, cl
-                mov     [esi+8], edi
-                pop     edi
-                mov     [esi+4], ebx
-                sub     eax, 1
-                mov     [esi+0Ch], eax
-                xor     eax, eax
-                cmp     [esi], eax
-                pop     esi
-                setnz   al
-                pop     ebx
-                retn    8
-sub_4CD940      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CD9B0      proc near               ; CODE XREF: CEncoder_GetOptimum+436p
-                                        ; CEncoder_GetOptimum+AE1p
-
-arg_0           = dword ptr  4
-arg_4           = byte ptr  8
-arg_8           = dword ptr  0Ch
-
-                mov     edx, [esp+arg_0]
-                test    edx, edx
-                push    esi
-                jnz     short loc_4CD9F2
-                movzx   eax, [esp+4+arg_4]
-                mov     edx, eax
-                shl     edx, 4
-                add     edx, [esp+4+arg_8]
-                mov     esi, 800h
-                sub     esi, [ecx+edx*4+284B0h]
-                mov     ecx, [ecx+eax*4+28420h]
-                shr     esi, 2
-                mov     eax, dword_550998[esi*4]
-                shr     ecx, 2
-                add     eax, dword_550998[ecx*4]
-                pop     esi
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CD9F2:                             ; CODE XREF: sub_4CD9B0+7j
-                movzx   esi, [esp+4+arg_4]
-                mov     eax, 800h
-                sub     eax, [ecx+esi*4+28420h]
-                shr     eax, 2
-                cmp     edx, 1
-                mov     eax, dword_550998[eax*4]
-                jnz     short loc_4CDA27
-                mov     ecx, [ecx+esi*4+28450h]
-                shr     ecx, 2
-                add     eax, dword_550998[ecx*4]
-                pop     esi
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CDA27:                             ; CODE XREF: sub_4CD9B0+60j
-                push    edi
-                add     edx, 0FFFFFFFEh
-                mov     edi, 800h
-                sub     edi, [ecx+esi*4+28450h]
-                mov     ecx, [ecx+esi*4+28480h]
-                sub     ecx, edx
-                neg     edx
-                xor     ecx, edx
-                shr     edi, 2
-                mov     edx, dword_550998[edi*4]
-                shr     ecx, 2
-                and     ecx, 1FFh
-                add     edx, dword_550998[ecx*4]
-                pop     edi
-                add     eax, edx
-                pop     esi
-                retn    0Ch
-sub_4CD9B0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CDA70      proc near               ; CODE XREF: CEncoder_CodeReal+10Cp
-                                        ; CEncoder_CodeReal+134p ...
-                push    esi
-                mov     esi, [ecx]
-                cmp     dword ptr [esi+80h], 0
-                jz      short loc_4CDA8C
-                cmp     byte ptr [esi+33B95h], 0
-                jz      short loc_4CDA8C
-                mov     byte ptr [esi+33B95h], 0
-
-loc_4CDA8C:                             ; CODE XREF: sub_4CDA70+Aj
-                                        ; sub_4CDA70+13j
-                mov     eax, [esi+33B8Ch]
-                test    eax, eax
-                jz      short loc_4CDAA8
-                mov     ecx, [eax]
-                mov     edx, [ecx+8]
-                push    eax
-                call    edx
-                mov     dword ptr [esi+33B8Ch], 0
-
-loc_4CDAA8:                             ; CODE XREF: sub_4CDA70+24j
-                mov     ecx, [esi+4]
-                mov     edx, [ecx+10h]
-                lea     eax, [esi+4]
-                push    eax
-                call    edx
-                pop     esi
-                retn
-sub_4CDA70      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CDAC0      proc near               ; CODE XREF: CEncoder_GetOptimum+2C4p
-                                        ; CEncoder_GetOptimum+7ACp ...
-
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = byte ptr  8
-arg_8           = byte ptr  0Ch
-
-                push    ecx
-                push    ebx
-                push    ebp
-                xor     ebp, ebp
-                cmp     byte ptr [esp+0Ch+arg_0], 0
-                push    esi
-                mov     eax, ecx
-                push    edi
-                mov     [esp+14h+var_4], eax
-                lea     edi, [ebp+1]
-                lea     ebx, [ebp+8]
-                jz      short loc_4CDB3B
-                movzx   ecx, [esp+14h+arg_8]
-                mov     [esp+14h+arg_0], ecx
-
-loc_4CDAE3:                             ; CODE XREF: sub_4CDAC0+71j
-                movzx   esi, [esp+14h+arg_4]
-                mov     edx, [esp+14h+arg_0]
-                sub     ebx, 1
-                movzx   ecx, bl
-                shr     esi, cl
-                shr     edx, cl
-                and     esi, 1
-                mov     ecx, esi
-                shl     ecx, 8
-                add     ecx, edi
-                mov     eax, [eax+ecx*4+400h]
-                and     edx, 1
-                sub     eax, edx
-                mov     ecx, edx
-                neg     ecx
-                xor     eax, ecx
-                shr     eax, 2
-                and     eax, 1FFh
-                add     ebp, dword_550998[eax*4]
-                add     edi, edi
-                or      edi, edx
-                cmp     esi, edx
-                jnz     short loc_4CDB33
-                test    ebx, ebx
-                jz      short loc_4CDB75
-                mov     eax, [esp+14h+var_4]
-                jmp     short loc_4CDAE3
-; ---------------------------------------------------------------------------
-
-loc_4CDB33:                             ; CODE XREF: sub_4CDAC0+67j
-                test    ebx, ebx
-                jz      short loc_4CDB75
-                mov     eax, [esp+14h+var_4]
-
-loc_4CDB3B:                             ; CODE XREF: sub_4CDAC0+18j
-                movzx   edx, [esp+14h+arg_8]
-                mov     [esp+14h+arg_0], edx
-
-loc_4CDB44:                             ; CODE XREF: sub_4CDAC0+B3j
-                mov     edx, [esp+14h+arg_0]
-                sub     ebx, 1
-                mov     cl, bl
-                shr     edx, cl
-                mov     ecx, [eax+edi*4]
-                add     edi, edi
-                and     edx, 1
-                sub     ecx, edx
-                mov     esi, edx
-                neg     esi
-                xor     ecx, esi
-                shr     ecx, 2
-                and     ecx, 1FFh
-                add     ebp, dword_550998[ecx*4]
-                or      edi, edx
-                test    ebx, ebx
-                jnz     short loc_4CDB44
-
-loc_4CDB75:                             ; CODE XREF: sub_4CDAC0+6Bj
-                                        ; sub_4CDAC0+75j
-                pop     edi
-                pop     esi
-                mov     eax, ebp
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn    0Ch
-sub_4CDAC0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CDB80      proc near               ; CODE XREF: sub_4CDEA0+11Ep
-                                        ; sub_4CDEA0+137p
-
-arg_0           = dword ptr  4
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                test    esi, esi
-                mov     edx, 400h
-                push    edi
-                mov     [ecx], edx
-                mov     [ecx+4], edx
-                jbe     short loc_4CDBE6
-                lea     eax, [ecx+20Ch]
-                lea     ebx, [ebx+0]
-
-loc_4CDBA0:                             ; CODE XREF: sub_4CDB80+64j
-                mov     [eax-200h], edx
-                mov     [eax-1FCh], edx
-                mov     [eax-1F8h], edx
-                mov     [eax-1F4h], edx
-                mov     [eax-1F0h], edx
-                mov     [eax-1ECh], edx
-                mov     [eax-1E8h], edx
-                mov     [eax], edx
-                mov     [eax+4], edx
-                mov     [eax+8], edx
-                mov     [eax+0Ch], edx
-                mov     [eax+10h], edx
-                mov     [eax+14h], edx
-                mov     [eax+18h], edx
-                add     eax, 20h
-                sub     esi, 1
-                jnz     short loc_4CDBA0
-
-loc_4CDBE6:                             ; CODE XREF: sub_4CDB80+12j
-                lea     edi, [ecx+40Ch]
-                mov     ecx, 0FFh
-                mov     eax, edx
-                rep stosd
-                pop     edi
-                pop     esi
-                retn    4
-sub_4CDB80      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CDC00      proc near               ; CODE XREF: sub_4CF740+22p
-                                        ; sub_4CF780+2Bp
-
-var_C           = dword ptr -0Ch
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                sub     esp, 0Ch
-                push    ebx
-                push    ebp
-                push    esi
-                push    edi
-                mov     edi, ecx
-                mov     eax, [edi]
-                mov     ebx, [esp+1Ch+arg_0]
-                mov     ecx, eax
-                shr     ecx, 2
-                mov     edx, dword_550998[ecx*4]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 2
-                mov     eax, dword_550998[ecx*4]
-                mov     ecx, [edi+4]
-                mov     [esp+1Ch+var_C], edx
-                mov     edx, ecx
-                shr     edx, 2
-                mov     ebp, dword_550998[edx*4]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 2
-                mov     ecx, dword_550998[edx*4]
-                add     ebp, eax
-                add     ecx, eax
-                mov     [esp+1Ch+var_8], ebp
-                mov     [esp+1Ch+var_4], ecx
-                xor     esi, esi
-                mov     edi, edi
-
-loc_4CDC60:                             ; CODE XREF: sub_4CDC00+8Aj
-                cmp     esi, [esp+1Ch+arg_4]
-                jnb     loc_4CDD62
-                mov     eax, ebx
-                shl     eax, 5
-                push    esi
-                lea     ecx, [eax+edi+8]
-                call    sub_4CD7D0
-                add     eax, [esp+1Ch+var_C]
-                mov     ecx, [esp+1Ch+arg_8]
-                mov     [ecx+esi*4], eax
-                add     esi, 1
-                cmp     esi, 8
-                jb      short loc_4CDC60
-                cmp     esi, 10h
-                jnb     short loc_4CDD00
-                lea     ecx, [esi-8]
-                mov     [esp+1Ch+arg_0], ecx
-                jmp     short loc_4CDCA0
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CDCA0:                             ; CODE XREF: sub_4CDC00+98j
-                                        ; sub_4CDC00+FEj
-                cmp     esi, [esp+1Ch+arg_4]
-                jnb     loc_4CDD62
-                or      ecx, 8
-                xor     edx, edx
-                cmp     ecx, 1
-                jz      short loc_4CDCE4
-
-loc_4CDCB4:                             ; CODE XREF: sub_4CDC00+DEj
-                mov     eax, ecx
-                shr     ecx, 1
-                and     eax, 1
-                lea     ebp, [ecx+ebx*8]
-                mov     ebp, [edi+ebp*4+208h]
-                sub     ebp, eax
-                neg     eax
-                xor     ebp, eax
-                shr     ebp, 2
-                and     ebp, 1FFh
-                add     edx, dword_550998[ebp*4]
-                cmp     ecx, 1
-                jnz     short loc_4CDCB4
-                mov     ebp, [esp+1Ch+var_8]
-
-loc_4CDCE4:                             ; CODE XREF: sub_4CDC00+B2j
-                mov     eax, [esp+1Ch+arg_8]
-                mov     ecx, [esp+1Ch+arg_0]
-                add     edx, ebp
-                mov     [eax+esi*4], edx
-                add     esi, 1
-                add     ecx, 1
-                cmp     esi, 10h
-                mov     [esp+1Ch+arg_0], ecx
-                jb      short loc_4CDCA0
-
-loc_4CDD00:                             ; CODE XREF: sub_4CDC00+8Fj
-                cmp     esi, [esp+1Ch+arg_4]
-                jnb     short loc_4CDD62
-                lea     ebx, [esi-10h]
-                lea     esp, [esp+0]
-
-loc_4CDD10:                             ; CODE XREF: sub_4CDC00+160j
-                mov     ecx, ebx
-                or      ecx, 100h
-                xor     edx, edx
-                cmp     ecx, 1
-                jz      short loc_4CDD49
-                nop
-
-loc_4CDD20:                             ; CODE XREF: sub_4CDC00+147j
-                mov     eax, ecx
-                shr     ecx, 1
-                mov     ebp, [edi+ecx*4+408h]
-                and     eax, 1
-                sub     ebp, eax
-                neg     eax
-                xor     ebp, eax
-                shr     ebp, 2
-                and     ebp, 1FFh
-                add     edx, dword_550998[ebp*4]
-                cmp     ecx, 1
-                jnz     short loc_4CDD20
-
-loc_4CDD49:                             ; CODE XREF: sub_4CDC00+11Dj
-                mov     ecx, [esp+1Ch+var_4]
-                mov     eax, [esp+1Ch+arg_8]
-                add     edx, ecx
-                mov     [eax+esi*4], edx
-                add     esi, 1
-                add     ebx, 1
-                cmp     esi, [esp+1Ch+arg_4]
-                jb      short loc_4CDD10
-
-loc_4CDD62:                             ; CODE XREF: sub_4CDC00+64j
-                                        ; sub_4CDC00+A4j ...
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                add     esp, 0Ch
-                retn    0Ch
-sub_4CDC00      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-; int __cdecl sub_4CDD70(SIZE_T dwSize)
-sub_4CDD70      proc near               ; DATA XREF: .data:off_546E20o
-
-dwSize          = dword ptr  4
-
-                mov     eax, [esp+dwSize]
-                test    eax, eax
-                jnz     short loc_4CDD79
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4CDD79:                             ; CODE XREF: sub_4CDD70+6j
-                push    4               ; flProtect
-                push    1000h           ; flAllocationType
-                push    eax             ; dwSize
-                push    0               ; lpAddress
-                call    ds:VirtualAlloc
-                retn
-sub_4CDD70      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-; int __cdecl sub_4CDD90(void * lpAddress)
-sub_4CDD90      proc near               ; CODE XREF: sub_4CF810+53p
-                                        ; sub_4CF810+73p
-                                        ; DATA XREF: ...
-
-lpAddress       = dword ptr  4
-
-                mov     eax, [esp+lpAddress]
-                test    eax, eax
-                jz      short locret_4CDDA6
-                push    8000h           ; dwFreeType
-                push    0               ; dwSize
-                push    eax             ; lpAddress
-                call    ds:VirtualFree
-
-locret_4CDDA6:                          ; CODE XREF: sub_4CDD90+6j
-                retn
-sub_4CDD90      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CDDB0      proc near               ; DATA XREF: .rdata:00517AC8o
-
-var_10          = dword ptr -10h
-var_C           = byte ptr -0Ch
-var_B           = byte ptr -0Bh
-var_A           = byte ptr -0Ah
-var_9           = byte ptr -9
-var_8           = byte ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                sub     esp, 10h
-                mov     eax, dword_544960
-                xor     eax, esp
-                mov     [esp+10h+var_4], eax
-                mov     ecx, [esp+10h+arg_0]
-                mov     al, [ecx+33B50h]
-                mov     dl, 5
-                imul    dl
-                add     al, [ecx+33B58h]
-                mov     dl, 9
-                imul    dl
-                add     al, [ecx+33B5Ch]
-                push    ebp
-                mov     ebp, [esp+14h+arg_4]
-                mov     [esp+14h+var_C], al
-                mov     eax, [ecx+33B60h]
-                mov     ecx, eax
-                mov     edx, eax
-                push    esi
-                shr     ecx, 8
-                shr     edx, 10h
-                mov     [esp+18h+var_B], al
-                shr     eax, 18h
-                push    edi
-                mov     [esp+1Ch+var_A], cl
-                mov     [esp+1Ch+var_9], dl
-                mov     [esp+1Ch+var_8], al
-                mov     esi, 5
-                lea     edi, [esp+1Ch+var_C]
-
-loc_4CDE13:                             ; CODE XREF: sub_4CDDB0+85j
-                mov     eax, [ebp+0]
-                mov     edx, [eax+0Ch]
-                lea     ecx, [esp+1Ch+var_10]
-                push    ecx
-                push    esi
-                push    edi
-                push    ebp
-                call    edx
-                mov     ecx, [esp+1Ch+var_10]
-                add     edi, ecx
-                sub     esi, ecx
-                test    eax, eax
-                jnz     short loc_4CDE37
-                test    ecx, ecx
-                jz      short loc_4CDE4B
-                test    esi, esi
-                jnz     short loc_4CDE13
-
-loc_4CDE37:                             ; CODE XREF: sub_4CDDB0+7Dj
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     ecx, [esp+10h+var_4]
-                xor     ecx, esp
-                call    sub_4A0686
-                add     esp, 10h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CDE4B:                             ; CODE XREF: sub_4CDDB0+81j
-                mov     ecx, [esp+1Ch+var_4]
-                pop     edi
-                pop     esi
-                pop     ebp
-                xor     ecx, esp
-                mov     eax, 80004005h
-                call    sub_4A0686
-                add     esp, 10h
-                retn    8
-sub_4CDDB0      endp
-
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CDE70      proc near               ; DATA XREF: .rdata:00517AF4o
-
-arg_0           = dword ptr  4
-
-                push    esi
-                mov     esi, [esp+4+arg_0]
-                mov     eax, [esi+50h]
-                test    eax, eax
-                jz      short loc_4CDE8B
-                mov     ecx, [eax]
-                mov     edx, [ecx+8]
-                push    eax
-                call    edx
-                mov     dword ptr [esi+50h], 0
-
-loc_4CDE8B:                             ; CODE XREF: sub_4CDE70+Aj
-                xor     eax, eax
-                pop     esi
-                retn    4
-sub_4CDE70      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CDEA0      proc near               ; CODE XREF: CEncoder_SetStreams+3Cp
-
-var_4           = dword ptr -4
-
-                push    ecx
-                push    ebx
-                xor     ebx, ebx
-                push    ebp
-                push    esi
-                mov     esi, ecx
-                mov     byte ptr [esi+10h], 0
-                mov     byte ptr [esi+11h], 0
-                mov     [esi+14h], ebx
-                mov     [esi+18h], ebx
-                mov     [esi+1Ch], ebx
-                mov     [esi+20h], ebx
-                mov     eax, [esi+50h]
-                mov     [esi+4Ch], ebx
-                mov     [esi+48h], eax
-                mov     [esi+44h], ebx
-                mov     [esi+58h], ebx
-                mov     [esi+5Ch], ebx
-                mov     [esi+64h], bl
-                push    edi
-                mov     [esi+30h], ebx
-                mov     [esi+34h], ebx
-                mov     dword ptr [esi+38h], 0FFFFFFFFh
-                mov     dword ptr [esi+28h], 1
-                mov     [esi+2Ch], bl
-                lea     ecx, [esi+28420h]
-                lea     edi, [esi+284B0h]
-                mov     [esp+14h+var_4], 0Ch
-                mov     ebp, 400h
-
-loc_4CDF02:                             ; CODE XREF: sub_4CDEA0+9Cj
-                xor     edx, edx
-                mov     eax, edi
-                jmp     short loc_4CDF10
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CDF10:                             ; CODE XREF: sub_4CDEA0+66j
-                                        ; sub_4CDEA0+84j
-                mov     [eax-3C0h], ebp
-                mov     [eax], ebp
-                add     edx, 1
-                add     eax, 4
-                cmp     edx, [esi+33B60h]
-                jbe     short loc_4CDF10
-                mov     [ecx-30h], ebp
-                mov     [ecx], ebp
-                mov     [ecx+30h], ebp
-                mov     [ecx+60h], ebp
-                add     ecx, 4
-                add     edi, 40h
-                sub     [esp+14h+var_4], 1
-                jnz     short loc_4CDF02
-                mov     ecx, [esi+32658h]
-                add     ecx, [esi+32654h]
-                mov     eax, 1
-                shl     eax, cl
-                cmp     eax, ebx
-                jbe     short loc_4CDF7C
-                xor     edx, edx
-                mov     ebx, eax
-                lea     esp, [esp+0]
-
-loc_4CDF60:                             ; CODE XREF: sub_4CDEA0+DAj
-                mov     edi, [esi+32650h]
-                add     edi, edx
-                mov     ecx, 300h
-                mov     eax, ebp
-                add     edx, 0C00h
-                sub     ebx, 1
-                rep stosd
-                jnz     short loc_4CDF60
-
-loc_4CDF7C:                             ; CODE XREF: sub_4CDEA0+B3j
-                lea     edx, [esi+287B4h]
-                mov     ebx, 4
-
-loc_4CDF87:                             ; CODE XREF: sub_4CDEA0+FBj
-                mov     edi, edx
-                mov     ecx, 3Fh
-                mov     eax, ebp
-                add     edx, 100h
-                sub     ebx, 1
-                rep stosd
-                jnz     short loc_4CDF87
-                lea     edi, [esi+28BB0h]
-                mov     ecx, 72h
-                rep stosd
-                mov     ecx, [esi+33B5Ch]
-                mov     edx, 1
-                shl     edx, cl
-                lea     ecx, [esi+28DB8h]
-                push    edx
-                call    sub_4CDB80
-                mov     ecx, [esi+33B5Ch]
-                mov     eax, 1
-                shl     eax, cl
-                lea     ecx, [esi+2DA04h]
-                push    eax
-                call    sub_4CDB80
-                mov     eax, ebp
-                mov     [esi+28D7Ch], eax
-                mov     [esi+28D80h], eax
-                mov     [esi+28D84h], eax
-                mov     [esi+28D88h], eax
-                mov     [esi+28D8Ch], eax
-                mov     [esi+28D90h], eax
-                mov     [esi+28D94h], eax
-                mov     [esi+28D98h], eax
-                mov     [esi+28D9Ch], eax
-                mov     [esi+28DA0h], eax
-                mov     [esi+28DA4h], eax
-                mov     [esi+28DA8h], eax
-                mov     [esi+28DACh], eax
-                mov     [esi+28DB0h], eax
-                mov     [esi+28DB4h], eax
-                xor     eax, eax
-                pop     edi
-                mov     [esi+32F10h], bl
-                mov     [esi+32F08h], eax
-                mov     [esi+32F0Ch], eax
-                mov     [esi+32F04h], eax
-                pop     esi
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn
-sub_4CDEA0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CF450      proc near               ; CODE XREF: .text:004CF692p
-                                        ; CEncoder_Flush+42p
-
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-
-                sub     esp, 8
-                push    esi
-                mov     esi, ecx
-                mov     eax, [esi+0Ch]
-                push    edi
-                mov     edi, [esi+4]
-                cmp     eax, edi
-                jb      short loc_4CF464
-                mov     edi, [esi+10h]
-
-loc_4CF464:                             ; CODE XREF: sub_4CF450+Fj
-                push    ebp
-                mov     ebp, [esi+20h]
-                xor     edx, edx
-                sub     edi, eax
-                cmp     ebp, edx
-                mov     [esp+14h+var_4], edx
-                jz      short loc_4CF4BA
-                push    ebx
-                mov     ebx, [esi]
-                add     ebx, eax
-                mov     eax, dword_553598
-                cmp     eax, edx
-                jnz     short loc_4CF4A5
-                push    0Ch             ; Size
-                call    _operator_new    ; operator new(uint)
-                xor     ecx, ecx
-                add     esp, 4
-                cmp     eax, ecx
-                jz      short loc_4CF49C
-                mov     [eax], ecx
-                mov     [eax+4], ecx
-                mov     [eax+8], ecx
-                jmp     short loc_4CF49E
-; ---------------------------------------------------------------------------
-
-loc_4CF49C:                             ; CODE XREF: sub_4CF450+40j
-                xor     eax, eax
-
-loc_4CF49E:                             ; CODE XREF: sub_4CF450+4Aj
-                mov     dword_553598, eax
-                xor     edx, edx
-
-loc_4CF4A5:                             ; CODE XREF: sub_4CF450+30j
-                mov     eax, [eax+8]
-                cmp     eax, edx
-                jz      short loc_4CF4B6
-                push    edi
-                push    ebx
-                push    ebp
-                call    eax
-                add     esp, 0Ch
-                xor     edx, edx
-
-loc_4CF4B6:                             ; CODE XREF: sub_4CF450+5Aj
-                add     [esi+20h], edi
-                pop     ebx
-
-loc_4CF4BA:                             ; CODE XREF: sub_4CF450+22j
-                mov     eax, [esi+14h]
-                cmp     eax, edx
-                pop     ebp
-                jz      short loc_4CF4E4
-                mov     [esp+10h+var_8], edx
-                mov     ecx, [eax]
-                lea     edx, [esp+10h+var_8]
-                push    edx
-                mov     edx, [esi]
-                add     edx, [esi+0Ch]
-                push    edi
-                push    edx
-                push    eax
-                mov     eax, [ecx+0Ch]
-                call    eax
-                mov     edi, [esp+10h+var_8]
-                mov     [esp+10h+var_4], eax
-                xor     edx, edx
-
-loc_4CF4E4:                             ; CODE XREF: sub_4CF450+70j
-                add     [esi+0Ch], edi
-                mov     ecx, [esi+0Ch]
-                mov     eax, [esi+10h]
-                cmp     ecx, eax
-                jnz     short loc_4CF4F4
-                mov     [esi+0Ch], edx
-
-loc_4CF4F4:                             ; CODE XREF: sub_4CF450+9Fj
-                cmp     [esi+4], eax
-                jnz     short loc_4CF500
-                mov     byte ptr [esi+24h], 1
-                mov     [esi+4], edx
-
-loc_4CF500:                             ; CODE XREF: sub_4CF450+A7j
-                mov     ecx, [esi+0Ch]
-                cmp     ecx, [esi+4]
-                jbe     short loc_4CF50A
-                mov     eax, ecx
-
-loc_4CF50A:                             ; CODE XREF: sub_4CF450+B6j
-                add     [esi+18h], edi
-                mov     [esi+8], eax
-                mov     eax, [esp+10h+var_4]
-                adc     [esi+1Ch], edx
-                pop     edi
-                pop     esi
-                add     esp, 8
-                retn
-sub_4CF450      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-
-; ---------------------------------------------------------------------------
-
-; int __stdcall Interface1_QueryInterface(int, void *Buf1, int)
-Interface1_QueryInterface      proc near               ; DATA XREF: .rdata:off_517A90o
-; sub_4CF520
-
-arg_0           = dword ptr  4
-Buf1            = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                mov     eax, [esp+Buf1]
-                push    offset dword_512730 ; Buf2
-                push    eax             ; Buf1
-                call    unknown_libname_324 ; MFC 3.1/4.0/4.2/8.0 32bit
-                add     esp, 8
-                test    eax, eax
-                jz      short loc_4CF54D
-                mov     eax, [esp+arg_0]
-                mov     ecx, [esp+arg_8]
-                mov     [ecx], eax
-                mov     edx, [eax]
-                push    eax
-                mov     eax, [edx+4]
-                call    eax
-                xor     eax, eax
-                retn    0Ch
-loc_4CF54D:                             ; CODE XREF: Interface1_QueryInterface+14j
-                mov     eax, 80004002h
-                retn    0Ch
-Interface1_QueryInterface      endp
-
-; ---------------------------------------------------------------------------
-
-; int __stdcall Interface1_Release(void *pUnknown)
-Interface1_Release         proc near               ; DATA XREF: .rdata:00517A98o
-
-pUnknown        = dword ptr  4
-
-                mov     ecx, [esp+pUnknown]
-                add     dword ptr [ecx+4], 0FFFFFFFFh
-                mov     eax, [ecx+4]
-                jnz     short locret_4CF585
-                push    ecx             ; Memory
-                mov     dword ptr [ecx], offset off_517A90
-                mov     dword ptr [ecx+8], 0
-                call    j__free
-                add     esp, 4
-                xor     eax, eax
-
-locret_4CF585:                          ; CODE XREF: Interface1_Release+Bj
-                retn    4
-Interface1_Release         endp
-
-; ---------------------------------------------------------------------------
-
-sub_4CF590      proc near               ; DATA XREF: .rdata:00517AB4o
-
-arg_0           = dword ptr  4
-arg_4           = byte ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-
-                mov     eax, [esp+arg_0]
-                mov     edx, [eax+10h]
-                sub     edx, [eax+18h]
-                mov     ecx, [eax+14h]
-                sbb     ecx, [eax+1Ch]
-                push    ebx
-                mov     ebx, [esp+4+arg_8]
-                push    edi
-                mov     edi, [esp+8+arg_C]
-                cmp     edi, ecx
-                jb      short loc_4CF5C2
-                ja      short loc_4CF5B4
-                cmp     ebx, edx
-                jbe     short loc_4CF5C2
-
-loc_4CF5B4:                             ; CODE XREF: sub_4CF590+1Ej
-                pop     edi
-                mov     byte ptr [eax+20h], 1
-                mov     eax, 80004005h
-                pop     ebx
-                retn    10h
-; ---------------------------------------------------------------------------
-
-loc_4CF5C2:                             ; CODE XREF: sub_4CF590+1Cj
-                                        ; sub_4CF590+22j
-                push    esi
-                xor     esi, esi
-                xor     ecx, ecx
-                test    edi, edi
-                jb      short loc_4CF5FA
-                ja      short loc_4CF5D1
-                test    ebx, ebx
-                jbe     short loc_4CF5FA
-
-loc_4CF5D1:                             ; CODE XREF: sub_4CF590+3Bj
-                mov     dl, [esp+0Ch+arg_4]
-                push    ebp
-
-loc_4CF5D6:                             ; CODE XREF: sub_4CF590+5Fj
-                                        ; sub_4CF590+67j
-                mov     ebp, [eax+18h]
-                mov     ebx, [eax+8]
-                mov     [ebx+ebp], dl
-                add     dword ptr [eax+18h], 1
-                adc     dword ptr [eax+1Ch], 0
-                add     esi, 1
-                adc     ecx, 0
-                cmp     ecx, edi
-                jb      short loc_4CF5D6
-                ja      short loc_4CF5F9
-                cmp     esi, [esp+10h+arg_8]
-                jb      short loc_4CF5D6
-
-loc_4CF5F9:                             ; CODE XREF: sub_4CF590+61j
-                pop     ebp
-
-loc_4CF5FA:                             ; CODE XREF: sub_4CF590+39j
-                                        ; sub_4CF590+3Fj
-                pop     esi
-                pop     edi
-                xor     eax, eax
-                pop     ebx
-                retn    10h
-sub_4CF590      endp
-
-; =============== S U B R O U T I N E =======================================
-
-; int __stdcall Interface2_Release(void *pUnknown)
-Interface2_Release proc near            ; DATA XREF: .rdata:00517AACo
-; sub_4CF610
-
-pUnknown        = dword ptr  4
-
-                mov     ecx, [esp+pUnknown]
-                add     dword ptr [ecx+4], 0FFFFFFFFh
-                mov     eax, [ecx+4]
-                jnz     short locret_4CF635
-                push    ecx             ; Memory
-                mov     dword ptr [ecx], offset off_517AA4
-                mov     dword ptr [ecx+8], 0
-                call    j__free
-                add     esp, 4
-                xor     eax, eax
-
-locret_4CF635:                          ; CODE XREF: Interface2_Release+Bj
-                retn    4
-Interface2_Release endp
-
-; =============== S U B R O U T I N E =======================================
-
-loc_4CF640:                             ; CODE XREF: sub_4CF6E0+39p
-                                        ; sub_4CFAC0+57p ...
-                push    ecx
-                push    ebx
-                push    esi
-                push    edi
-                mov     edi, ecx
-                mov     esi, [edi+8]
-                cmp     esi, 0FF000000h
-                jb      short loc_4CF661
-                mov     edx, [edi+0Ch]
-                mov     eax, esi
-                mov     cl, 20h
-                call    __allshr         ; Microsoft VisualC 2-8/net runtime
-                test    eax, eax
-                jz      short loc_4CF6B6
-
-loc_4CF661:                             ; CODE XREF: .text:004CF64Fj
-                mov     bl, [edi+4]
-                lea     esi, [edi+18h]
-
-loc_4CF667:                             ; CODE XREF: .text:004CF6A9j
-                mov     eax, [edi+8]
-                mov     edx, [edi+0Ch]
-                mov     cl, 20h
-                call    __allshr         ; Microsoft VisualC 2-8/net runtime
-                mov     ecx, [esi+4]
-                mov     edx, [esi]
-                add     al, bl
-                mov     [ecx+edx], al
-                add     dword ptr [esi+4], 1
-                mov     eax, [esi+4]
-                cmp     eax, [esi+8]
-                jnz     short loc_4CF6A3
-                cmp     [esi+0Ch], eax
-                jz      short loc_4CF6A3
-                nop
-
-loc_4CF690:                             ; CODE XREF: .text:004CF6A1j
-                mov     ecx, esi
-                call    sub_4CF450
-                test    eax, eax
-                jnz     short loc_4CF6CB
-                mov     eax, [esi+0Ch]
-                cmp     eax, [esi+4]
-                jnz     short loc_4CF690
-
-loc_4CF6A3:                             ; CODE XREF: .text:004CF688j
-                                        ; .text:004CF68Dj
-                or      bl, 0FFh
-                add     dword ptr [edi], 0FFFFFFFFh
-                jnz     short loc_4CF667
-                mov     esi, [edi+8]
-                mov     edx, esi
-                shr     edx, 18h
-                mov     [edi+4], dl
-
-loc_4CF6B6:                             ; CODE XREF: .text:004CF65Fj
-                add     dword ptr [edi], 1
-                shl     esi, 8
-                mov     [edi+8], esi
-                mov     dword ptr [edi+0Ch], 0
-                pop     edi
-                pop     esi
-                pop     ebx
-                pop     ecx
-                retn
-                
-; ---------------------------------------------------------------------------
-
-loc_4CF6CB:                             ; CODE XREF: .text:004CF699j
-                push    offset dword_526DD0
-                lea     ecx, [esp+10h]
-                push    ecx
-                mov     [esp+14h], eax
-                int     3
-;               call    __CxxThrowException@8 ; _CxxThrowException(x,x)
-; ---------------------------------------------------------------------------
-
-                db 2 dup(0CCh)
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CF6E0      proc near               ; CODE XREF: sub_4D0770+FBp
-                                        ; CEncoder_CodeOneBlock+6C5p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    esi
-                push    edi
-                mov     edi, [esp+8+arg_4]
-                add     edi, 0FFFFFFFFh
-                mov     esi, ecx
-                js      short loc_4CF724
-                push    ebp
-                mov     ebp, [esp+0Ch+arg_0]
-
-loc_4CF6F2:                             ; CODE XREF: sub_4CF6E0+41j
-                shr     dword ptr [esi+10h], 1
-                mov     eax, [esi+10h]
-                mov     edx, ebp
-                mov     ecx, edi
-                shr     edx, cl
-                test    dl, 1
-                jz      short loc_4CF70A
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-
-loc_4CF70A:                             ; CODE XREF: sub_4CF6E0+21j
-                cmp     eax, 1000000h
-                jnb     short loc_4CF71E
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4CF71E:                             ; CODE XREF: sub_4CF6E0+2Fj
-                sub     edi, 1
-                jns     short loc_4CF6F2
-                pop     ebp
-
-loc_4CF724:                             ; CODE XREF: sub_4CF6E0+Bj
-                pop     edi
-                pop     esi
-                retn    8
-sub_4CF6E0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CF740      proc near               ; CODE XREF: sub_4D0770+DFp
-                                        ; CEncoder_CodeOneBlock+58Ap ...
-
-arg_0           = dword ptr  4
-
-                push    esi
-                push    edi
-                mov     edi, [esp+8+arg_0]
-                mov     eax, edi
-                imul    eax, 440h
-                mov     esi, ecx
-                mov     edx, [esi+4C08h]
-                lea     ecx, [eax+esi+808h]
-                push    ecx
-                push    edx
-                push    edi
-                mov     ecx, esi
-                call    sub_4CDC00
-                mov     eax, [esi+4C08h]
-                mov     [esi+edi*4+4C0Ch], eax
-                pop     edi
-                pop     esi
-                retn    4
-sub_4CF740      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-              
-sub_4CF780      proc near               ; CODE XREF: CEncoder_SetStreams+7Ep
-                                        ; CEncoder_SetStreams+A6p
-
-arg_0           = dword ptr  4
-
-                push    esi
-                push    edi
-                xor     edi, edi
-                cmp     [esp+8+arg_0], edi
-                mov     esi, ecx
-                jbe     short loc_4CF7CC
-                push    ebx
-                push    ebp
-                lea     ebx, [esi+4C0Ch]
-                lea     ebp, [esi+808h]
-                lea     ebx, [ebx+0]
-
-loc_4CF7A0:                             ; CODE XREF: sub_4CF780+48j
-                mov     eax, [esi+4C08h]
-                push    ebp
-                push    eax
-                push    edi
-                mov     ecx, esi
-                call    sub_4CDC00
-                mov     ecx, [esi+4C08h]
-                mov     [ebx], ecx
-                add     edi, 1
-                add     ebx, 4
-                add     ebp, 440h
-                cmp     edi, [esp+10h+arg_0]
-                jb      short loc_4CF7A0
-                pop     ebp
-                pop     ebx
-
-loc_4CF7CC:                             ; CODE XREF: sub_4CF780+Aj
-                pop     edi
-                pop     esi
-                retn    4
-sub_4CF780      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-CEncoder_GetOptimum proc near           ; CODE XREF: CEncoder_CodeOneBlock+201p
-
-var_7D          = byte ptr -7Dh
-var_7C          = dword ptr -7Ch
-var_78          = dword ptr -78h
-var_74          = dword ptr -74h
-var_70          = dword ptr -70h
-var_6C          = dword ptr -6Ch
-var_68          = dword ptr -68h
-var_64          = dword ptr -64h
-var_60          = dword ptr -60h
-var_5C          = dword ptr -5Ch
-var_58          = dword ptr -58h
-var_54          = dword ptr -54h
-var_50          = dword ptr -50h
-var_4C          = dword ptr -4Ch
-var_48          = dword ptr -48h
-var_44          = dword ptr -44h
-var_40          = dword ptr -40h
-var_3C          = dword ptr -3Ch
-var_38          = dword ptr -38h
-var_34          = dword ptr -34h
-var_30          = dword ptr -30h
-var_2C          = dword ptr -2Ch
-var_28          = dword ptr -28h
-var_24          = dword ptr -24h
-var_20          = dword ptr -20h
-var_1C          = dword ptr -1Ch
-var_18          = dword ptr -18h
-var_14          = dword ptr -14h
-var_10          = dword ptr -10h
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                sub     esp, 80h
-                push    ebp
-                mov     ebp, ecx
-                mov     edx, [ebp+32F0Ch]
-                cmp     [ebp+32F08h], edx
-                push    esi
-                jz      short loc_4CE0A5
-                mov     esi, [esp+88h+arg_4]
-                lea     eax, [edx+edx*4+1Eh]
-                lea     ecx, [ebp+eax*8+0]
-                mov     eax, [ecx+10h]
-                sub     eax, edx
-                mov     edx, [ecx+14h]
-                mov     [esi], edx
-                mov     ecx, [ecx+10h]
-                pop     esi
-                mov     [ebp+32F0Ch], ecx
-                pop     ebp
-                add     esp, 80h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CE0A5:                             ; CODE XREF: CEncoder_GetOptimum+16j
-                mov     edx, [ebp+80h]
-                mov     eax, [ebp+70h]
-                push    ebx
-                xor     esi, esi
-                push    edx
-                mov     [ebp+32F08h], esi
-                mov     [ebp+32F0Ch], esi
-                call    eax
-                add     esp, 4
-                cmp     byte ptr [ebp+32F10h], 0
-                mov     ebx, eax
-                mov     [esp+8Ch+var_60], eax
-                jnz     short loc_4CE0E4
-                lea     ecx, [esp+8Ch+var_70]
-                push    ecx
-                mov     ecx, ebp
-                call    sub_4CB3B0
-                mov     [esp+8Ch+var_68], eax
-                jmp     short loc_4CE0FF
-; ---------------------------------------------------------------------------
-
-loc_4CE0E4:                             ; CODE XREF: CEncoder_GetOptimum+70j
-                mov     edx, [ebp+32EFCh]
-                mov     eax, [ebp+32F00h]
-                mov     [esp+8Ch+var_68], edx
-                mov     [esp+8Ch+var_70], eax
-                mov     byte ptr [ebp+32F10h], 0
-
-loc_4CE0FF:                             ; CODE XREF: CEncoder_GetOptimum+82j
-                mov     ecx, [ebp+80h]
-                mov     edx, [ebp+74h]
-                push    edi
-                push    ecx
-                call    edx
-                mov     edi, eax
-                add     esp, 4
-                sub     edi, 1
-                cmp     ebx, 2
-                jnb     short loc_4CE138
-                mov     eax, [esp+90h+arg_4]
-                pop     edi
-                pop     ebx
-                pop     esi
-                mov     dword ptr [eax], 0FFFFFFFFh
-                mov     eax, 1
-                pop     ebp
-                add     esp, 80h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CE138:                             ; CODE XREF: CEncoder_GetOptimum+B7j
-                cmp     ebx, 111h
-                jbe     short loc_4CE149
-                mov     ebx, 111h
-                mov     [esp+90h+var_60], ebx
-
-loc_4CE149:                             ; CODE XREF: CEncoder_GetOptimum+DEj
-                lea     ecx, [ebp+14h]
-                mov     [esp+90h+var_50], esi
-                mov     [esp+90h+var_64], esi
-                xor     edx, edx
-                mov     [esp+90h+var_4C], esi
-                mov     [esp+90h+var_6C], ecx
-                mov     edi, edi
-
-loc_4CE160:                             ; CODE XREF: CEncoder_GetOptimum+180j
-                mov     eax, [esp+90h+var_6C]
-                mov     eax, [eax]
-                mov     ecx, edi
-                sub     ecx, eax
-                mov     [esp+edx+90h+var_20], eax
-                mov     al, [edi]
-                sub     ecx, 1
-                cmp     al, [ecx]
-                jnz     short loc_4CE1C9
-                mov     al, [edi+1]
-                cmp     al, [ecx+1]
-                jnz     short loc_4CE1C9
-                mov     eax, 2
-                cmp     ebx, eax
-                jbe     short loc_4CE1A7
-                lea     esi, [edi+2]
-                sub     ecx, edi
-                lea     ecx, [ecx+0]
-
-loc_4CE190:                             ; CODE XREF: CEncoder_GetOptimum+143j
-                mov     bl, [esi]
-                cmp     bl, [ecx+esi]
-                mov     ebx, [esp+90h+var_60]
-                jnz     short loc_4CE1A5
-                add     eax, 1
-                add     esi, 1
-                cmp     eax, ebx
-                jb      short loc_4CE190
-
-loc_4CE1A5:                             ; CODE XREF: CEncoder_GetOptimum+139j
-                xor     esi, esi
-
-loc_4CE1A7:                             ; CODE XREF: CEncoder_GetOptimum+126j
-                mov     ecx, [esp+90h+var_4C]
-                mov     [esp+edx+90h+var_10], eax
-                cmp     eax, [esp+ecx+90h+var_10]
-                jbe     short loc_4CE1D0
-                mov     eax, [esp+90h+var_64]
-                mov     [esp+90h+var_50], eax
-                mov     [esp+90h+var_4C], edx
-                jmp     short loc_4CE1D0
-; ---------------------------------------------------------------------------
-
-loc_4CE1C9:                             ; CODE XREF: CEncoder_GetOptimum+115j
-                                        ; CEncoder_GetOptimum+11Dj
-                mov     [esp+edx+90h+var_10], esi
-
-loc_4CE1D0:                             ; CODE XREF: CEncoder_GetOptimum+159j
-                                        ; CEncoder_GetOptimum+167j
-                add     [esp+90h+var_64], 1
-                add     [esp+90h+var_6C], 4
-                add     edx, 4
-                cmp     edx, 10h
-                jb      loc_4CE160
-                mov     ecx, [esp+90h+var_50]
-                mov     ebx, [esp+ecx*4+90h+var_10]
-                mov     eax, [ebp+32EF8h]
-                cmp     ebx, eax
-                mov     [esp+90h+var_40], ebx
-                jb      short loc_4CE234
-                mov     edx, [esp+90h+arg_4]
-                lea     eax, [ebx-1]
-                cmp     eax, esi
-                mov     [edx], ecx
-                jz      short loc_4CE225
-                add     [ebp+32F04h], eax
-                mov     ecx, [ebp+7Ch]
-                push    eax
-                mov     eax, [ebp+80h]
-                push    eax
-                call    ecx
-                add     esp, 8
-
-loc_4CE225:                             ; CODE XREF: CEncoder_GetOptimum+1ADj
-                pop     edi
-                mov     eax, ebx
-                pop     ebx
-                pop     esi
-                pop     ebp
-                add     esp, 80h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CE234:                             ; CODE XREF: CEncoder_GetOptimum+19Dj
-                mov     esi, [esp+90h+var_68]
-                cmp     esi, eax
-                jb      short loc_4CE27F
-                mov     edx, [esp+90h+var_70]
-                mov     eax, [ebp+edx*4+3265Ch]
-                mov     ecx, [esp+90h+arg_4]
-                add     eax, 4
-                mov     [ecx], eax
-                lea     eax, [esi-1]
-                test    eax, eax
-                jz      short loc_4CE270
-                mov     edx, [ebp+80h]
-                add     [ebp+32F04h], eax
-                push    eax
-                mov     eax, [ebp+7Ch]
-                push    edx
-                call    eax
-                add     esp, 8
-
-loc_4CE270:                             ; CODE XREF: CEncoder_GetOptimum+1F8j
-                pop     edi
-                pop     ebx
-                mov     eax, esi
-                pop     esi
-                pop     ebp
-                add     esp, 80h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CE27F:                             ; CODE XREF: CEncoder_GetOptimum+1DAj
-                mov     al, [edi]
-                mov     esi, [esp+90h+var_20]
-                sub     edi, esi
-                cmp     [esp+90h+var_68], 2
-                mov     cl, [edi-1]
-                mov     byte ptr [esp+90h+var_4C], al
-                mov     byte ptr [esp+90h+var_50], cl
-                jnb     short loc_4CE2C1
-                cmp     al, cl
-                jz      short loc_4CE2C1
-                cmp     ebx, 2
-                jnb     short loc_4CE2C1
-                mov     ecx, [esp+90h+arg_4]
-                pop     edi
-                pop     ebx
-                pop     esi
-                mov     dword ptr [ecx], 0FFFFFFFFh
-                mov     eax, 1
-                pop     ebp
-                add     esp, 80h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CE2C1:                             ; CODE XREF: CEncoder_GetOptimum+237j
-                                        ; CEncoder_GetOptimum+23Bj ...
-                mov     edx, [esp+90h+var_4C]
-                mov     bl, [ebp+10h]
-                mov     edi, [ebp+33B60h]
-                and     edi, [esp+90h+arg_0]
-                mov     ecx, [esp+90h+var_50]
-                push    edx
-                cmp     bl, 7
-                setnb   dl
-                push    ecx
-                mov     [ebp+0F0h], bl
-                mov     eax, [ebp+32654h]
-                mov     ecx, 8
-                sub     cl, al
-                push    edx
-                movzx   edx, byte ptr [ebp+11h]
-                shr     edx, cl
-                mov     ecx, [ebp+3265Ch]
-                and     ecx, [esp+9Ch+arg_0]
-                mov     [esp+9Ch+var_3C], ecx
-                mov     ecx, eax
-                mov     eax, [esp+9Ch+var_3C]
-                shl     eax, cl
-                add     edx, eax
-                imul    edx, 0C00h
-                add     edx, [ebp+32650h]
-                mov     ecx, edx
-                call    sub_4CDAC0
-                movzx   ecx, bl
-                shl     ecx, 4
-                add     ecx, edi
-                mov     edx, [ebp+ecx*4+280F0h]
-                shr     edx, 2
-                add     eax, dword_550998[edx*4]
-                mov     ebx, 800h
-                mov     [ebp+124h], eax
-                mov     dword ptr [ebp+12Ch], 0FFFFFFFFh
-                mov     byte ptr [ebp+119h], 0
-                mov     cl, [ebp+10h]
-                movzx   eax, cl
-                mov     edx, eax
-                shl     edx, 4
-                add     edx, edi
-                sub     ebx, [ebp+edx*4+280F0h]
-                mov     edx, 800h
-                sub     edx, [ebp+eax*4+283F0h]
-                mov     al, byte ptr [esp+90h+var_4C]
-                shr     edx, 2
-                mov     edx, dword_550998[edx*4]
-                shr     ebx, 2
-                mov     ebx, dword_550998[ebx*4]
-                add     edx, ebx
-                cmp     byte ptr [esp+90h+var_50], al
-                mov     [esp+90h+var_44], ebx
-                mov     [esp+90h+var_3C], edx
-                jnz     short loc_4CE3F3
-                movzx   eax, cl
-                mov     ebx, [ebp+eax*4+28420h]
-                mov     ecx, eax
-                shl     ecx, 4
-                add     ecx, edi
-                mov     ecx, [ebp+ecx*4+284B0h]
-                shr     ecx, 2
-                mov     eax, dword_550998[ecx*4]
-                shr     ebx, 2
-                add     eax, dword_550998[ebx*4]
-                add     eax, edx
-                cmp     eax, [ebp+124h]
-                jnb     short loc_4CE3F3
-                mov     [ebp+124h], eax
-                mov     dword ptr [ebp+12Ch], 0
-                mov     byte ptr [ebp+119h], 0
-
-loc_4CE3F3:                             ; CODE XREF: CEncoder_GetOptimum+344j
-                                        ; CEncoder_GetOptimum+37Aj
-                mov     eax, [esp+90h+var_68]
-                mov     ecx, [esp+90h+var_40]
-                cmp     eax, ecx
-                jb      short loc_4CE405
-                mov     [esp+90h+var_7C], eax
-                jmp     short loc_4CE40B
-; ---------------------------------------------------------------------------
-
-loc_4CE405:                             ; CODE XREF: CEncoder_GetOptimum+39Dj
-                mov     [esp+90h+var_7C], ecx
-                mov     eax, ecx
-
-loc_4CE40B:                             ; CODE XREF: CEncoder_GetOptimum+3A3j
-                cmp     eax, 2
-                jnb     short loc_4CE431
-                mov     edx, [ebp+12Ch]
-                mov     eax, [esp+90h+arg_4]
-                pop     edi
-                pop     ebx
-                pop     esi
-                mov     [eax], edx
-                mov     eax, 1
-                pop     ebp
-                add     esp, 80h
-                retn    8
-; ---------------------------------------------------------------------------
-
-loc_4CE431:                             ; CODE XREF: CEncoder_GetOptimum+3AEj
-                mov     ecx, [esp+90h+var_1C]
-                mov     edx, [esp+90h+var_18]
-                xor     ebx, ebx
-                mov     [ebp+128h], ebx
-                mov     [ebp+10Ch], ecx
-                mov     ecx, [esp+90h+var_14]
-                mov     [ebp+110h], edx
-                lea     edx, [eax+eax*4]
-                mov     [ebp+114h], ecx
-                mov     [ebp+108h], esi
-                lea     ecx, [ebp+edx*8+0FCh]
-                jmp     short loc_4CE470
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CE470:                             ; CODE XREF: CEncoder_GetOptimum+407j
-                                        ; CEncoder_GetOptimum+41Fj
-                mov     dword ptr [ecx], 0FFFFFFFh
-                sub     eax, 1
-                sub     ecx, 28h
-                cmp     eax, 2
-                jnb     short loc_4CE470
-
-loc_4CE481:                             ; CODE XREF: CEncoder_GetOptimum+48Ej
-                mov     esi, [esp+ebx*4+90h+var_10]
-                cmp     esi, 2
-                jb      short loc_4CE4E8
-                movzx   eax, byte ptr [ebp+10h]
-                push    edi
-                push    eax
-                push    ebx
-                mov     ecx, ebp
-                call    sub_4CD9B0
-                add     eax, [esp+90h+var_3C]
-                mov     ecx, edi
-                imul    ecx, 110h
-                add     ecx, esi
-                mov     [esp+90h+var_40], eax
-                lea     edx, [esi+esi*4]
-                lea     eax, [ebp+ecx*4+2E204h]
-                lea     ecx, [ebp+edx*8+0FCh]
-                mov     edi, edi
-
-loc_4CE4C0:                             ; CODE XREF: CEncoder_GetOptimum+486j
-                mov     edx, [eax]
-                add     edx, [esp+90h+var_40]
-                cmp     edx, [ecx]
-                jnb     short loc_4CE4DA
-                mov     [ecx], edx
-                mov     dword ptr [ecx+4], 0
-                mov     [ecx+8], ebx
-                mov     byte ptr [ecx-0Bh], 0
-
-loc_4CE4DA:                             ; CODE XREF: CEncoder_GetOptimum+468j
-                sub     esi, 1
-                sub     eax, 4
-                sub     ecx, 28h
-                cmp     esi, 2
-                jnb     short loc_4CE4C0
-
-loc_4CE4E8:                             ; CODE XREF: CEncoder_GetOptimum+42Bj
-                add     ebx, 1
-                cmp     ebx, 4
-                jb      short loc_4CE481
-                movzx   eax, byte ptr [ebp+10h]
-                mov     ecx, [ebp+eax*4+283F0h]
-                shr     ecx, 2
-                mov     eax, dword_550998[ecx*4]
-                add     eax, [esp+90h+var_44]
-                mov     [esp+90h+var_3C], eax
-                mov     eax, [esp+90h+var_10]
-                cmp     eax, 2
-                lea     ebx, [eax+1]
-                jnb     short loc_4CE521
-                mov     ebx, 2
-
-loc_4CE521:                             ; CODE XREF: CEncoder_GetOptimum+4BAj
-                cmp     ebx, [esp+90h+var_68]
-                ja      loc_4CE5BA
-                xor     eax, eax
-                cmp     ebx, [ebp+32660h]
-                mov     [esp+90h+var_60], eax
-                jbe     short loc_4CE550
-                lea     esp, [esp+0]
-
-loc_4CE540:                             ; CODE XREF: CEncoder_GetOptimum+4EAj
-                add     eax, 2
-                cmp     ebx, [ebp+eax*4+32660h]
-                ja      short loc_4CE540
-                mov     [esp+90h+var_60], eax
-
-loc_4CE550:                             ; CODE XREF: CEncoder_GetOptimum+4D7j
-                lea     edx, [ebx+ebx*4]
-                lea     esi, [ebp+edx*8+0FCh]
-                lea     ebx, [ebx+0]
-
-loc_4CE560:                             ; CODE XREF: CEncoder_GetOptimum+558j
-                mov     eax, [esp+90h+var_60]
-                mov     eax, [ebp+eax*4+32664h]
-                push    edi
-                push    ebx
-                push    eax
-                mov     ecx, ebp
-                mov     [esp+9Ch+var_40], eax
-                call    sub_4CAEC0
-                add     eax, [esp+90h+var_3C]
-                cmp     eax, [esi]
-                jnb     short loc_4CE598
-                mov     ecx, [esp+90h+var_40]
-                add     ecx, 4
-                mov     [esi], eax
-                mov     dword ptr [esi+4], 0
-                mov     [esi+8], ecx
-                mov     byte ptr [esi-0Bh], 0
-
-loc_4CE598:                             ; CODE XREF: CEncoder_GetOptimum+51Fj
-                mov     eax, [esp+90h+var_60]
-                cmp     ebx, [ebp+eax*4+32660h]
-                jnz     short loc_4CE5B2
-                add     eax, 2
-                cmp     eax, [esp+90h+var_70]
-                mov     [esp+90h+var_60], eax
-                jz      short loc_4CE5BA
-
-loc_4CE5B2:                             ; CODE XREF: CEncoder_GetOptimum+543j
-                add     ebx, 1
-                add     esi, 28h
-                jmp     short loc_4CE560
-; ---------------------------------------------------------------------------
-
-loc_4CE5BA:                             ; CODE XREF: CEncoder_GetOptimum+4C5j
-                                        ; CEncoder_GetOptimum+550j
-                mov     eax, 1
-                cmp     [esp+90h+var_7C], eax
-                mov     [esp+90h+var_78], eax
-                jz      loc_4CF1D0
-                mov     esi, eax
-                jmp     short loc_4CE5D5
-; ---------------------------------------------------------------------------
-
-loc_4CE5D1:                             ; CODE XREF: CEncoder_GetOptimum+116Aj
-                mov     esi, [esp+90h+var_78]
-
-loc_4CE5D5:                             ; CODE XREF: CEncoder_GetOptimum+56Fj
-                mov     edx, [ebp+80h]
-                mov     eax, [ebp+70h]
-                push    edx
-                call    eax
-                add     esp, 4
-                lea     ecx, [esp+90h+var_4C]
-                push    ecx
-                mov     ecx, ebp
-                mov     [esp+94h+var_60], eax
-                call    sub_4CB3B0
-                cmp     eax, [ebp+32EF8h]
-                mov     [esp+90h+var_28], eax
-                jnb     loc_4CF1D7
-                add     [esp+90h+arg_0], 1
-                lea     edx, [esi+esi*4+1Eh]
-                mov     bl, [ebp+edx*8+1]
-                test    bl, bl
-                lea     eax, [ebp+edx*8+0]
-                mov     edx, [eax+10h]
-                jz      short loc_4CE673
-                sub     edx, 1
-                cmp     byte ptr [eax+2], 0
-                jz      short loc_4CE660
-                mov     ecx, [eax+4]
-                add     ecx, 6
-                cmp     dword ptr [eax+8], 4
-                lea     ecx, [ecx+ecx*4]
-                mov     cl, [ebp+ecx*8+0]
-                movzx   ecx, cl
-                jnb     short loc_4CE64F
-                mov     cl, ds:kRepNextStates[ecx]
-                movzx   ecx, cl
-                mov     cl, ds:kLiteralNextStates[ecx]
-                jmp     short loc_4CE67B
-; ---------------------------------------------------------------------------
-
-loc_4CE64F:                             ; CODE XREF: CEncoder_GetOptimum+5DCj
-                mov     cl, ds:kMatchNextStates[ecx]
-                movzx   ecx, cl
-                mov     cl, ds:kLiteralNextStates[ecx]
-                jmp     short loc_4CE67B
-; ---------------------------------------------------------------------------
-
-loc_4CE660:                             ; CODE XREF: CEncoder_GetOptimum+5C6j
-                lea     ecx, [edx+edx*4+1Eh]
-                mov     cl, [ebp+ecx*8+0]
-                movzx   ecx, cl
-                mov     cl, ds:kLiteralNextStates[ecx]
-                jmp     short loc_4CE67B
-; ---------------------------------------------------------------------------
-
-loc_4CE673:                             ; CODE XREF: CEncoder_GetOptimum+5BDj
-                lea     ecx, [edx+edx*4+1Eh]
-                mov     cl, [ebp+ecx*8+0]
-
-loc_4CE67B:                             ; CODE XREF: CEncoder_GetOptimum+5EDj
-                                        ; CEncoder_GetOptimum+5FEj ...
-                add     esi, 0FFFFFFFFh
-                cmp     edx, esi
-                jnz     short loc_4CE6AC
-                cmp     dword ptr [eax+14h], 0
-                jnz     short loc_4CE69A
-                movzx   edx, cl
-                mov     bl, ds:kShortRepNextStates[edx]
-                mov     byte ptr [esp+90h+var_64], bl
-                jmp     loc_4CE754
-; ---------------------------------------------------------------------------
-
-loc_4CE69A:                             ; CODE XREF: CEncoder_GetOptimum+626j
-                movzx   ecx, cl
-                mov     bl, ds:kLiteralNextStates[ecx]
-                mov     byte ptr [esp+90h+var_64], bl
-                jmp     loc_4CE754
-; ---------------------------------------------------------------------------
-
-loc_4CE6AC:                             ; CODE XREF: CEncoder_GetOptimum+620j
-                test    bl, bl
-                jz      short loc_4CE6CB
-                cmp     byte ptr [eax+2], 0
-                jz      short loc_4CE6CB
-                mov     edi, [eax+8]
-                mov     edx, [eax+4]
-                movzx   ecx, cl
-                mov     bl, ds:kRepNextStates[ecx]
-                mov     [esp+90h+var_68], edi
-                jmp     short loc_4CE6EA
-; ---------------------------------------------------------------------------
-
-loc_4CE6CB:                             ; CODE XREF: CEncoder_GetOptimum+64Ej
-                                        ; CEncoder_GetOptimum+654j
-                mov     esi, [eax+14h]
-                cmp     esi, 4
-                mov     [esp+90h+var_68], esi
-                movzx   ecx, cl
-                mov     edi, esi
-                jnb     short loc_4CE6E4
-                mov     bl, ds:kRepNextStates[ecx]
-                jmp     short loc_4CE6EA
-; ---------------------------------------------------------------------------
-
-loc_4CE6E4:                             ; CODE XREF: CEncoder_GetOptimum+67Aj
-                mov     bl, ds:kMatchNextStates[ecx]
-
-loc_4CE6EA:                             ; CODE XREF: CEncoder_GetOptimum+669j
-                                        ; CEncoder_GetOptimum+682j
-                cmp     edi, 4
-                lea     edx, [edx+edx*4+1Eh]
-                mov     byte ptr [esp+90h+var_64], bl
-                lea     edx, [ebp+edx*8+0]
-                jnb     short loc_4CE738
-                mov     ecx, [edx+edi*4+18h]
-                mov     esi, 1
-                cmp     edi, esi
-                mov     [esp+90h+var_20], ecx
-                jb      short loc_4CE723
-                mov     ecx, edi
-                lea     esi, [edx+18h]
-                lea     edi, [esp+90h+var_1C]
-                rep movsd
-                mov     esi, [esp+90h+var_68]
-                add     esi, 1
-                cmp     esi, 4
-                jnb     short loc_4CE754
-
-loc_4CE723:                             ; CODE XREF: CEncoder_GetOptimum+6AAj
-                lea     edx, [edx+esi*4+18h]
-                mov     ecx, 4
-                lea     edi, [esp+esi*4+90h+var_20]
-                sub     ecx, esi
-                mov     esi, edx
-                rep movsd
-                jmp     short loc_4CE754
-; ---------------------------------------------------------------------------
-
-loc_4CE738:                             ; CODE XREF: CEncoder_GetOptimum+699j
-                mov     ecx, [edx+18h]
-                mov     [esp+90h+var_1C], ecx
-                mov     ecx, [edx+1Ch]
-                mov     edx, [edx+20h]
-                add     edi, 0FFFFFFFCh
-                mov     [esp+90h+var_20], edi
-                mov     [esp+90h+var_18], ecx
-                mov     [esp+90h+var_14], edx
-
-loc_4CE754:                             ; CODE XREF: CEncoder_GetOptimum+635j
-                                        ; CEncoder_GetOptimum+647j ...
-                mov     ecx, [esp+90h+var_1C]
-                mov     edx, [esp+90h+var_18]
-                mov     edi, [esp+90h+var_20]
-                mov     [eax], bl
-                mov     [eax+1Ch], ecx
-                mov     ecx, [esp+90h+var_14]
-                mov     [eax+18h], edi
-                mov     [eax+20h], edx
-                mov     [eax+24h], ecx
-                mov     esi, [eax+0Ch]
-                mov     edx, [ebp+80h]
-                mov     eax, [ebp+74h]
-                push    edx
-                mov     [esp+94h+var_3C], esi
-                call    eax
-                movzx   ecx, byte ptr [eax-1]
-                sub     eax, 1
-                mov     edx, eax
-                mov     byte ptr [esp+94h+var_5C], cl
-                sub     edx, edi
-                movzx   ecx, byte ptr [edx-1]
-                lea     edi, [edx-1]
-                mov     edx, [ebp+32654h]
-                mov     byte ptr [esp+94h+var_58], cl
-                mov     ecx, [ebp+33B60h]
-                and     ecx, [esp+94h+arg_0]
-                mov     [esp+94h+var_40], edi
-                movzx   edi, bl
-                mov     [esp+94h+var_54], ecx
-                mov     [esp+94h+var_68], edi
-                add     esp, 4
-                shl     edi, 4
-                add     edi, ecx
-                mov     ecx, [esp+90h+var_5C]
-                push    ecx
-                mov     ecx, [esp+94h+var_58]
-                push    ecx
-                cmp     bl, 7
-                mov     ebx, [ebp+3265Ch]
-                setnb   cl
-                and     ebx, [esp+98h+arg_0]
-                mov     [esp+98h+var_74], eax
-                movzx   eax, byte ptr [eax-1]
-                push    ecx
-                mov     ecx, 8
-                sub     cl, dl
-                shr     eax, cl
-                mov     ecx, edx
-                shl     ebx, cl
-                add     eax, ebx
-                imul    eax, 0C00h
-                add     eax, [ebp+32650h]
-                mov     ecx, eax
-                call    sub_4CDAC0
-                mov     ecx, [ebp+edi*4+280F0h]
-                shr     ecx, 2
-                add     eax, dword_550998[ecx*4]
-                mov     ecx, [esp+90h+var_78]
-                add     eax, esi
-                lea     edx, [ecx+ecx*4+23h]
-                cmp     eax, [ebp+edx*8+0Ch]
-                lea     esi, [ebp+edx*8+0]
-                mov     [esp+90h+var_7D], 0
-                jnb     short loc_4CE851
-                mov     [esi+0Ch], eax
-                mov     [esi+10h], ecx
-                mov     dword ptr [esi+14h], 0FFFFFFFFh
-                mov     byte ptr [esi+1], 0
-                mov     [esp+90h+var_7D], 1
-
-loc_4CE851:                             ; CODE XREF: CEncoder_GetOptimum+7D9j
-                mov     ebx, [esp+90h+var_68]
-                mov     edx, 800h
-                sub     edx, [ebp+edi*4+280F0h]
-                shr     edx, 2
-                mov     ecx, dword_550998[edx*4]
-                add     ecx, [esp+90h+var_3C]
-                mov     edx, 800h
-                sub     edx, [ebp+ebx*4+283F0h]
-                mov     ebx, [esp+90h+var_78]
-                shr     edx, 2
-                mov     edx, dword_550998[edx*4]
-                add     edx, ecx
-                mov     [esp+90h+var_24], ecx
-                mov     cl, byte ptr [esp+90h+var_58]
-                cmp     cl, byte ptr [esp+90h+var_5C]
-                mov     [esp+90h+var_38], edx
-                jnz     short loc_4CE8EB
-                cmp     [esi+10h], ebx
-                jnb     short loc_4CE8A8
-                cmp     dword ptr [esi+14h], 0
-                jz      short loc_4CE8EB
-
-loc_4CE8A8:                             ; CODE XREF: CEncoder_GetOptimum+840j
-                mov     ecx, [esp+90h+var_68]
-                mov     ecx, [ebp+ecx*4+28420h]
-                mov     edi, [ebp+edi*4+284B0h]
-                shr     ecx, 2
-                mov     ecx, dword_550998[ecx*4]
-                shr     edi, 2
-                add     ecx, dword_550998[edi*4]
-                add     ecx, edx
-                cmp     ecx, [esi+0Ch]
-                ja      short loc_4CE8EB
-                mov     [esi+0Ch], ecx
-                mov     [esi+10h], ebx
-                mov     dword ptr [esi+14h], 0
-                mov     byte ptr [esi+1], 0
-                mov     [esp+90h+var_7D], 1
-
-loc_4CE8EB:                             ; CODE XREF: CEncoder_GetOptimum+83Bj
-                                        ; CEncoder_GetOptimum+846j ...
-                mov     edx, [esp+90h+var_60]
-                mov     ecx, 0FFFh
-                sub     ecx, ebx
-                cmp     ecx, edx
-                jnb     short loc_4CE900
-                mov     edx, ecx
-                mov     [esp+90h+var_60], edx
-
-loc_4CE900:                             ; CODE XREF: CEncoder_GetOptimum+898j
-                cmp     edx, 2
-                mov     ebx, edx
-                mov     [esp+90h+var_6C], ebx
-                jb      loc_4CF1BB
-                mov     esi, [ebp+32EF8h]
-                mov     edi, [esp+90h+var_60]
-                cmp     edi, esi
-                jbe     short loc_4CE923
-                mov     ebx, esi
-                mov     [esp+90h+var_6C], esi
-
-loc_4CE923:                             ; CODE XREF: CEncoder_GetOptimum+8BBj
-                cmp     [esp+90h+var_7D], 0
-                jnz     loc_4CEA90
-                mov     dl, byte ptr [esp+90h+var_5C]
-                cmp     byte ptr [esp+90h+var_58], dl
-                jz      loc_4CEA90
-                lea     ecx, [esi+1]
-                cmp     edi, ecx
-                jb      short loc_4CE945
-                mov     edi, ecx
-
-loc_4CE945:                             ; CODE XREF: CEncoder_GetOptimum+8E1j
-                mov     esi, 1
-                cmp     edi, esi
-                jbe     short loc_4CE975
-                mov     ebx, [esp+90h+var_74]
-                mov     edx, [esp+90h+var_40]
-                lea     ecx, [ebx+1]
-                sub     edx, ebx
-                jmp     short loc_4CE960
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CE960:                             ; CODE XREF: CEncoder_GetOptimum+8FBj
-                                        ; CEncoder_GetOptimum+90Fj
-                mov     bl, [ecx]
-                cmp     bl, [edx+ecx]
-                jnz     short loc_4CE971
-                add     esi, 1
-                add     ecx, 1
-                cmp     esi, edi
-                jb      short loc_4CE960
-
-loc_4CE971:                             ; CODE XREF: CEncoder_GetOptimum+905j
-                mov     ebx, [esp+90h+var_6C]
-
-loc_4CE975:                             ; CODE XREF: CEncoder_GetOptimum+8ECj
-                add     esi, 0FFFFFFFFh
-                cmp     esi, 2
-                mov     [esp+90h+var_50], esi
-                jb      loc_4CEA90
-                mov     ecx, [esp+90h+var_68]
-                mov     dl, ds:kLiteralNextStates[ecx]
-                mov     ecx, [esp+90h+arg_0]
-                movzx   ebx, dl
-                add     ecx, 1
-                and     ecx, [ebp+33B60h]
-                mov     edx, ebx
-                shl     edx, 4
-                lea     esi, [edx+ecx]
-                mov     edx, 800h
-                sub     edx, [ebp+ebx*4+283F0h]
-                mov     edi, 800h
-                sub     edi, [ebp+esi*4+280F0h]
-                shr     edx, 2
-                mov     edx, dword_550998[edx*4]
-                shr     edi, 2
-                add     edx, dword_550998[edi*4]
-                mov     edi, [esp+90h+var_78]
-                add     edx, eax
-                mov     eax, [esp+90h+var_50]
-                lea     edi, [eax+edi+1]
-                mov     eax, [esp+90h+var_7C]
-                cmp     eax, edi
-                mov     [esp+90h+var_40], esi
-                jnb     short loc_4CEA22
-                mov     esi, [esp+90h+var_7C]
-                lea     eax, [eax+eax*4]
-                lea     eax, [ebp+eax*8+0FCh]
-                mov     [esp+90h+var_3C], eax
-                mov     eax, edi
-                sub     eax, esi
-                add     esi, eax
-                mov     [esp+90h+var_7C], esi
-                mov     esi, [esp+90h+var_3C]
-
-loc_4CEA10:                             ; CODE XREF: CEncoder_GetOptimum+9BCj
-                add     esi, 28h
-                sub     eax, 1
-                mov     dword ptr [esi], 0FFFFFFFh
-                jnz     short loc_4CEA10
-                mov     esi, [esp+90h+var_40]
-
-loc_4CEA22:                             ; CODE XREF: CEncoder_GetOptimum+98Ej
-                imul    ecx, 110h
-                add     ecx, [esp+90h+var_50]
-                mov     eax, 800h
-                sub     eax, [ebp+esi*4+284B0h]
-                mov     esi, [ebp+ebx*4+28420h]
-                mov     ebx, [esp+90h+var_6C]
-                shr     eax, 2
-                mov     eax, dword_550998[eax*4]
-                shr     esi, 2
-                add     eax, dword_550998[esi*4]
-                mov     esi, [esp+90h+var_7C]
-                add     eax, [ebp+ecx*4+2E204h]
-                lea     ecx, [edi+edi*4+1Eh]
-                add     eax, edx
-                cmp     eax, [ebp+ecx*8+0Ch]
-                lea     ecx, [ebp+ecx*8+0]
-                jnb     short loc_4CEA94
-                mov     edx, [esp+90h+var_78]
-                add     edx, 1
-                mov     [ecx+0Ch], eax
-                mov     [ecx+10h], edx
-                mov     dword ptr [ecx+14h], 0
-                mov     byte ptr [ecx+1], 1
-                mov     byte ptr [ecx+2], 0
-                jmp     short loc_4CEA94
-; ---------------------------------------------------------------------------
-
-loc_4CEA90:                             ; CODE XREF: CEncoder_GetOptimum+8C8j
-                                        ; CEncoder_GetOptimum+8D6j ...
-                mov     esi, [esp+90h+var_7C]
-
-loc_4CEA94:                             ; CODE XREF: CEncoder_GetOptimum+A10j
-                                        ; CEncoder_GetOptimum+A2Ej
-                mov     [esp+90h+var_70], 0
-                mov     ecx, [esp+90h+var_70]
-                mov     [esp+90h+var_40], 2
-                jmp     short loc_4CEAB8
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CEAB0:                             ; CODE XREF: CEncoder_GetOptimum+D63j
-                mov     ebx, [esp+90h+var_6C]
-                mov     esi, [esp+90h+var_7C]
-
-loc_4CEAB8:                             ; CODE XREF: CEncoder_GetOptimum+A48j
-                mov     edx, [esp+90h+var_74]
-                mov     eax, edx
-                sub     eax, [esp+ecx*4+90h+var_20]
-                mov     cl, [edx]
-                sub     eax, 1
-                cmp     cl, [eax]
-                mov     [esp+90h+var_48], eax
-                jnz     loc_4CEDB5
-                mov     cl, [edx+1]
-                cmp     cl, [eax+1]
-                jnz     loc_4CEDB5
-                mov     edi, 2
-                cmp     ebx, edi
-                jbe     short loc_4CEB01
-                lea     ecx, [edx+2]
-                sub     eax, edx
-                lea     ecx, [ecx+0]
-
-loc_4CEAF0:                             ; CODE XREF: CEncoder_GetOptimum+A9Fj
-                mov     dl, [ecx]
-                cmp     dl, [eax+ecx]
-                jnz     short loc_4CEB01
-                add     edi, 1
-                add     ecx, 1
-                cmp     edi, ebx
-                jb      short loc_4CEAF0
-
-loc_4CEB01:                             ; CODE XREF: CEncoder_GetOptimum+A86j
-                                        ; CEncoder_GetOptimum+A95j
-                mov     eax, [esp+90h+var_78]
-                lea     ebx, [edi+eax]
-                cmp     esi, ebx
-                jnb     short loc_4CEB2E
-                mov     eax, ebx
-                lea     ecx, [esi+esi*4]
-                sub     eax, esi
-                add     esi, eax
-                lea     ecx, [ebp+ecx*8+0FCh]
-                mov     [esp+90h+var_7C], esi
-
-loc_4CEB20:                             ; CODE XREF: CEncoder_GetOptimum+ACCj
-                add     ecx, 28h
-                sub     eax, 1
-                mov     dword ptr [ecx], 0FFFFFFFh
-                jnz     short loc_4CEB20
-
-loc_4CEB2E:                             ; CODE XREF: CEncoder_GetOptimum+AAAj
-                mov     edx, [esp+90h+var_54]
-                mov     eax, [esp+90h+var_64]
-                mov     ecx, [esp+90h+var_70]
-                push    edx
-                push    eax
-                push    ecx
-                mov     ecx, ebp
-                mov     esi, edi
-                call    sub_4CD9B0
-                add     eax, [esp+90h+var_38]
-                mov     ecx, [esp+90h+var_54]
-                imul    ecx, 110h
-                lea     edx, [edi+ecx]
-                mov     [esp+90h+var_34], ecx
-                lea     ecx, [ebp+edx*4+2E204h]
-                mov     [esp+90h+var_50], ecx
-                lea     edx, [ebx+ebx*4]
-                mov     ebx, [esp+90h+var_50]
-                mov     [esp+90h+var_2C], eax
-                lea     ecx, [ebp+edx*8+0FCh]
-
-loc_4CEB78:                             ; CODE XREF: CEncoder_GetOptimum+B40j
-                mov     edx, [ebx]
-                add     edx, eax
-                cmp     edx, [ecx]
-                jnb     short loc_4CEB94
-                mov     [ecx], edx
-                mov     edx, [esp+90h+var_78]
-                mov     [ecx+4], edx
-                mov     edx, [esp+90h+var_70]
-                mov     [ecx+8], edx
-                mov     byte ptr [ecx-0Bh], 0
-
-loc_4CEB94:                             ; CODE XREF: CEncoder_GetOptimum+B1Ej
-                sub     edi, 1
-                sub     ebx, 4
-                sub     ecx, 28h
-                cmp     edi, 2
-                jnb     short loc_4CEB78
-                cmp     [esp+90h+var_70], 0
-                jnz     short loc_4CEBB0
-                lea     eax, [esi+1]
-                mov     [esp+90h+var_40], eax
-
-loc_4CEBB0:                             ; CODE XREF: CEncoder_GetOptimum+B47j
-                mov     ecx, [ebp+32EF8h]
-                mov     edx, [esp+90h+var_60]
-                lea     eax, [esi+1]
-                add     ecx, eax
-                cmp     edx, ecx
-                jnb     short loc_4CEBC5
-                mov     ecx, edx
-
-loc_4CEBC5:                             ; CODE XREF: CEncoder_GetOptimum+B61j
-                cmp     eax, ecx
-                jnb     short loc_4CEBE7
-                mov     ebx, [esp+90h+var_74]
-                mov     edi, [esp+90h+var_48]
-                lea     edx, [eax+ebx]
-                sub     edi, ebx
-
-loc_4CEBD6:                             ; CODE XREF: CEncoder_GetOptimum+B85j
-                mov     bl, [edx]
-                cmp     bl, [edx+edi]
-                jnz     short loc_4CEBE7
-                add     eax, 1
-                add     edx, 1
-                cmp     eax, ecx
-                jb      short loc_4CEBD6
-
-loc_4CEBE7:                             ; CODE XREF: CEncoder_GetOptimum+B67j
-                                        ; CEncoder_GetOptimum+B7Bj
-                or      ecx, 0FFFFFFFFh
-                sub     ecx, esi
-                add     eax, ecx
-                cmp     eax, 2
-                mov     [esp+90h+var_44], eax
-                jb      loc_4CEDB5
-                mov     edx, [esp+90h+var_68]
-                mov     cl, ds:kRepNextStates[edx]
-                mov     eax, [ebp+33B60h]
-                mov     edi, [esp+90h+arg_0]
-                movzx   ecx, cl
-                mov     ebx, eax
-                lea     edx, [esi+edi]
-                and     ebx, edx
-                mov     edx, ecx
-                mov     cl, ds:kLiteralNextStates[ecx]
-                shl     edx, 4
-                add     ebx, edx
-                mov     edx, [ebp+ebx*4+280F0h]
-                movzx   ebx, cl
-                shr     edx, 2
-                mov     edx, dword_550998[edx*4]
-                mov     [esp+90h+var_30], edx
-                lea     edi, [esi+edi+1]
-                and     edi, eax
-                mov     eax, [ebp+32654h]
-                mov     ecx, ebx
-                shl     ecx, 4
-                add     ecx, edi
-                mov     [esp+90h+var_50], ecx
-                mov     ecx, [esp+90h+var_74]
-                movzx   edx, byte ptr [esi+ecx]
-                push    edx
-                mov     edx, [esp+94h+var_48]
-                movzx   edx, byte ptr [esi+edx]
-                push    edx
-                movzx   edx, byte ptr [ecx+esi-1]
-                mov     ecx, 8
-                sub     cl, al
-                shr     edx, cl
-                mov     ecx, [esp+98h+arg_0]
-                lea     eax, [esi+ecx]
-                mov     ecx, [ebp+3265Ch]
-                and     ecx, eax
-                mov     eax, ecx
-                mov     ecx, [ebp+32654h]
-                shl     eax, cl
-                push    1
-                add     edx, eax
-                imul    edx, 0C00h
-                add     edx, [ebp+32650h]
-                mov     ecx, edx
-                call    sub_4CDAC0
-                mov     ecx, [esp+90h+var_50]
-                mov     edx, 800h
-                sub     edx, [ebp+ecx*4+280F0h]
-                mov     ecx, [esp+90h+var_34]
-                shr     edx, 2
-                add     eax, dword_550998[edx*4]
-                mov     edx, 800h
-                sub     edx, [ebp+ebx*4+283F0h]
-                shr     edx, 2
-                add     eax, dword_550998[edx*4]
-                lea     edx, [esi+ecx]
-                add     eax, [ebp+edx*4+2E204h]
-                mov     ecx, [esp+90h+var_44]
-                add     eax, [esp+90h+var_30]
-                mov     edx, [esp+90h+var_78]
-                add     eax, [esp+90h+var_2C]
-                add     ecx, esi
-                lea     ecx, [ecx+edx+1]
-                cmp     [esp+90h+var_7C], ecx
-                mov     [esp+90h+var_30], ecx
-                jnb     short loc_4CED3E
-                mov     edx, [esp+90h+var_7C]
-                lea     edx, [edx+edx*4]
-                lea     edx, [ebp+edx*8+0FCh]
-                mov     [esp+90h+var_2C], edx
-                mov     edx, [esp+90h+var_7C]
-                sub     ecx, edx
-                add     edx, ecx
-                mov     [esp+90h+var_7C], edx
-                mov     edx, [esp+90h+var_2C]
-                jmp     short loc_4CED30
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CED30:                             ; CODE XREF: CEncoder_GetOptimum+CCBj
-                                        ; CEncoder_GetOptimum+CDCj
-                add     edx, 28h
-                sub     ecx, 1
-                mov     dword ptr [edx], 0FFFFFFFh
-                jnz     short loc_4CED30
-
-loc_4CED3E:                             ; CODE XREF: CEncoder_GetOptimum+CA7j
-                mov     edx, [esp+90h+var_50]
-                imul    edi, 110h
-                add     edi, [esp+90h+var_44]
-                mov     ecx, 800h
-                sub     ecx, [ebp+edx*4+284B0h]
-                mov     edx, [ebp+ebx*4+28420h]
-                shr     ecx, 2
-                mov     ecx, dword_550998[ecx*4]
-                shr     edx, 2
-                add     ecx, dword_550998[edx*4]
-                add     ecx, [ebp+edi*4+2E204h]
-                add     ecx, eax
-                mov     eax, [esp+90h+var_30]
-                lea     eax, [eax+eax*4+1Eh]
-                cmp     ecx, [ebp+eax*8+0Ch]
-                lea     eax, [ebp+eax*8+0]
-                jnb     short loc_4CEDB5
-                mov     [eax+0Ch], ecx
-                mov     ecx, [esp+90h+var_78]
-                lea     edx, [esi+ecx+1]
-                mov     [eax+4], ecx
-                mov     ecx, [esp+90h+var_70]
-                mov     [eax+10h], edx
-                mov     dword ptr [eax+14h], 0
-                mov     byte ptr [eax+1], 1
-                mov     byte ptr [eax+2], 1
-                mov     [eax+8], ecx
-
-loc_4CEDB5:                             ; CODE XREF: CEncoder_GetOptimum+A6Dj
-                                        ; CEncoder_GetOptimum+A79j ...
-                mov     ecx, [esp+90h+var_70]
-                add     ecx, 1
-                cmp     ecx, 4
-                mov     [esp+90h+var_70], ecx
-                jb      loc_4CEAB0
-                mov     edx, [esp+90h+var_28]
-                mov     ecx, [esp+90h+var_6C]
-                cmp     edx, ecx
-                jbe     short loc_4CEDFB
-                xor     eax, eax
-                cmp     ecx, [ebp+32660h]
-                mov     edx, ecx
-                jbe     short loc_4CEDED
-
-loc_4CEDE1:                             ; CODE XREF: CEncoder_GetOptimum+D8Bj
-                add     eax, 2
-                cmp     ecx, [ebp+eax*4+32660h]
-                ja      short loc_4CEDE1
-
-loc_4CEDED:                             ; CODE XREF: CEncoder_GetOptimum+D7Fj
-                mov     [ebp+eax*4+32660h], ecx
-                add     eax, 2
-                mov     [esp+90h+var_4C], eax
-
-loc_4CEDFB:                             ; CODE XREF: CEncoder_GetOptimum+D73j
-                mov     esi, [esp+90h+var_40]
-                cmp     edx, esi
-                jb      loc_4CF1BB
-                mov     eax, [esp+90h+var_68]
-                mov     ecx, [ebp+eax*4+283F0h]
-                shr     ecx, 2
-                mov     eax, dword_550998[ecx*4]
-                add     eax, [esp+90h+var_24]
-                mov     ecx, [esp+90h+var_7C]
-                mov     [esp+90h+var_40], eax
-                mov     eax, [esp+90h+var_78]
-                add     eax, edx
-                cmp     ecx, eax
-                jnb     short loc_4CEE52
-                lea     edx, [ecx+ecx*4]
-                sub     eax, ecx
-                add     ecx, eax
-                lea     edx, [ebp+edx*8+0FCh]
-                mov     [esp+90h+var_7C], ecx
-
-loc_4CEE44:                             ; CODE XREF: CEncoder_GetOptimum+DF0j
-                add     edx, 28h
-                sub     eax, 1
-                mov     dword ptr [edx], 0FFFFFFFh
-                jnz     short loc_4CEE44
-
-loc_4CEE52:                             ; CODE XREF: CEncoder_GetOptimum+DD0j
-                xor     eax, eax
-                cmp     esi, [ebp+32660h]
-                mov     [esp+90h+var_70], eax
-                jbe     short loc_4CEE70
-
-loc_4CEE60:                             ; CODE XREF: CEncoder_GetOptimum+E0Aj
-                add     eax, 2
-                cmp     esi, [ebp+eax*4+32660h]
-                ja      short loc_4CEE60
-                mov     [esp+90h+var_70], eax
-
-loc_4CEE70:                             ; CODE XREF: CEncoder_GetOptimum+DFEj
-                lea     ebx, ds:0[eax*4]
-                mov     edx, [ebx+ebp+32664h]
-                mov     ecx, 7FFFFh
-                sub     ecx, edx
-                sar     ecx, 1Fh
-                and     ecx, 0Ch
-                add     ecx, 6
-                mov     eax, edx
-                shr     eax, cl
-                mov     [esp+90h+var_6C], edx
-                lea     edi, [esi+1]
-                movzx   eax, byte ptr dword_551198[eax]
-                lea     ecx, [eax+ecx*2]
-                mov     eax, [esp+90h+var_54]
-                imul    eax, 110h
-                add     eax, esi
-                lea     eax, [ebp+eax*4+295B8h]
-                mov     [esp+90h+var_3C], ecx
-                mov     ecx, [esp+90h+var_78]
-                mov     [esp+90h+var_54], eax
-                lea     eax, [esi+ecx]
-                lea     eax, [eax+eax*4]
-                lea     ecx, [ebp+eax*8+0FCh]
-                mov     [esp+90h+var_50], ecx
-
-loc_4CEED3:                             ; CODE XREF: CEncoder_GetOptimum+1156j
-                lea     eax, [edi-3]
-                cmp     eax, 4
-                jb      short loc_4CEEE0
-                mov     eax, 3
-
-loc_4CEEE0:                             ; CODE XREF: CEncoder_GetOptimum+E79j
-                cmp     edx, 80h
-                jnb     short loc_4CEEF6
-                shl     eax, 7
-                add     eax, edx
-                mov     eax, [ebp+eax*4+33314h]
-                jmp     short loc_4CEF10
-; ---------------------------------------------------------------------------
-
-loc_4CEEF6:                             ; CODE XREF: CEncoder_GetOptimum+E86j
-                shl     eax, 6
-                add     eax, [esp+90h+var_3C]
-                mov     esi, edx
-                mov     eax, [ebp+eax*4+32F14h]
-                and     esi, 0Fh
-                add     eax, [ebp+esi*4+33B14h]
-
-loc_4CEF10:                             ; CODE XREF: CEncoder_GetOptimum+E94j
-                add     eax, [esp+90h+var_40]
-                mov     esi, [esp+90h+var_54]
-                add     eax, [esi]
-                cmp     eax, [ecx]
-                mov     [esp+90h+var_2C], eax
-                jnb     short loc_4CEF35
-                mov     [ecx], eax
-                mov     eax, [esp+90h+var_78]
-                add     edx, 4
-                mov     [ecx+4], eax
-                mov     [ecx+8], edx
-                mov     byte ptr [ecx-0Bh], 0
-
-loc_4CEF35:                             ; CODE XREF: CEncoder_GetOptimum+EC0j
-                lea     eax, [edi-1]
-                cmp     eax, [ebx+ebp+32660h]
-                jnz     loc_4CF1A1
-                mov     ebx, [esp+90h+var_74]
-                mov     eax, [ebp+32EF8h]
-                mov     esi, [esp+90h+var_60]
-                mov     edx, ebx
-                sub     edx, [esp+90h+var_6C]
-                add     eax, edi
-                sub     edx, 1
-                cmp     esi, eax
-                mov     ecx, edi
-                jnb     short loc_4CEF6C
-                mov     eax, esi
-                mov     [esp+90h+var_44], esi
-                jmp     short loc_4CEF70
-; ---------------------------------------------------------------------------
-
-loc_4CEF6C:                             ; CODE XREF: CEncoder_GetOptimum+F02j
-                mov     [esp+90h+var_44], eax
-
-loc_4CEF70:                             ; CODE XREF: CEncoder_GetOptimum+F0Aj
-                cmp     edi, eax
-                jnb     short loc_4CEF93
-                lea     esi, [edi+edx]
-                sub     ebx, edx
-                lea     esp, [esp+0]
-
-loc_4CEF80:                             ; CODE XREF: CEncoder_GetOptimum+F31j
-                mov     al, [ebx+esi]
-                cmp     al, [esi]
-                jnz     short loc_4CEF93
-                add     ecx, 1
-                add     esi, 1
-                cmp     ecx, [esp+90h+var_44]
-                jb      short loc_4CEF80
-
-loc_4CEF93:                             ; CODE XREF: CEncoder_GetOptimum+F12j
-                                        ; CEncoder_GetOptimum+F25j
-                or      esi, 0FFFFFFFFh
-                lea     eax, [edi-1]
-                sub     esi, eax
-                add     ecx, esi
-                cmp     ecx, 2
-                mov     [esp+90h+var_48], ecx
-                jb      loc_4CF157
-                mov     ecx, [esp+90h+var_68]
-                mov     bl, ds:kMatchNextStates[ecx]
-                mov     ecx, [ebp+33B60h]
-                mov     eax, [esp+90h+arg_0]
-                lea     esi, [edi+eax-1]
-                mov     eax, ecx
-                and     eax, esi
-                movzx   esi, bl
-                movzx   edx, byte ptr [edi+edx-1]
-                mov     ebx, esi
-                shl     ebx, 4
-                add     ebx, eax
-                mov     ebx, [ebp+ebx*4+280F0h]
-                shr     ebx, 2
-                mov     ebx, dword_550998[ebx*4]
-                mov     [esp+90h+var_28], ebx
-                mov     bl, ds:kLiteralNextStates[esi]
-                lea     esi, [eax+1]
-                mov     eax, [ebp+32654h]
-                and     esi, ecx
-                movzx   ebx, bl
-                mov     ecx, ebx
-                shl     ecx, 4
-                add     ecx, esi
-                mov     [esp+90h+var_44], ecx
-                mov     ecx, [esp+90h+var_74]
-                movzx   ecx, byte ptr [ecx+edi-1]
-                push    ecx
-                mov     ecx, [esp+94h+var_74]
-                push    edx
-                movzx   edx, byte ptr [edi+ecx-2]
-                mov     ecx, 8
-                sub     cl, al
-                shr     edx, cl
-                mov     ecx, [esp+98h+arg_0]
-                lea     eax, [edi+ecx-1]
-                mov     ecx, [ebp+3265Ch]
-                and     ecx, eax
-                mov     eax, ecx
-                mov     ecx, [ebp+32654h]
-                shl     eax, cl
-                push    1
-                add     edx, eax
-                imul    edx, 0C00h
-                add     edx, [ebp+32650h]
-                mov     ecx, edx
-                call    sub_4CDAC0
-                mov     edx, 800h
-                sub     edx, [ebp+ebx*4+283F0h]
-                mov     ecx, 800h
-                shr     edx, 2
-                add     eax, dword_550998[edx*4]
-                mov     edx, [esp+90h+var_44]
-                sub     ecx, [ebp+edx*4+280F0h]
-                mov     edx, [esp+90h+var_78]
-                shr     ecx, 2
-                add     eax, dword_550998[ecx*4]
-                mov     ecx, [esp+90h+var_48]
-                add     eax, [esp+90h+var_28]
-                add     ecx, edx
-                add     eax, [esp+90h+var_2C]
-                add     ecx, edi
-                cmp     [esp+90h+var_7C], ecx
-                mov     [esp+90h+var_28], ecx
-                jnb     short loc_4CF0DE
-                mov     edx, [esp+90h+var_7C]
-                lea     edx, [edx+edx*4]
-                lea     edx, [ebp+edx*8+0FCh]
-                mov     [esp+90h+var_24], edx
-                mov     edx, [esp+90h+var_7C]
-                sub     ecx, edx
-                add     edx, ecx
-                mov     [esp+90h+var_7C], edx
-                mov     edx, [esp+90h+var_24]
-                lea     ecx, [ecx+0]
-
-loc_4CF0D0:                             ; CODE XREF: CEncoder_GetOptimum+107Cj
-                add     edx, 28h
-                sub     ecx, 1
-                mov     dword ptr [edx], 0FFFFFFFh
-                jnz     short loc_4CF0D0
-
-loc_4CF0DE:                             ; CODE XREF: CEncoder_GetOptimum+1049j
-                mov     edx, [esp+90h+var_44]
-                imul    esi, 110h
-                add     esi, [esp+90h+var_48]
-                mov     ecx, 800h
-                sub     ecx, [ebp+edx*4+284B0h]
-                mov     edx, [ebp+ebx*4+28420h]
-                shr     ecx, 2
-                mov     ecx, dword_550998[ecx*4]
-                shr     edx, 2
-                add     ecx, dword_550998[edx*4]
-                add     ecx, [ebp+esi*4+2E204h]
-                add     ecx, eax
-                mov     eax, [esp+90h+var_28]
-                lea     eax, [eax+eax*4+1Eh]
-                cmp     ecx, [ebp+eax*8+0Ch]
-                lea     eax, [ebp+eax*8+0]
-                jnb     short loc_4CF157
-                mov     [eax+0Ch], ecx
-                mov     ecx, [esp+90h+var_78]
-                lea     edx, [ecx+edi]
-                mov     [eax+4], ecx
-                mov     ecx, [esp+90h+var_6C]
-                add     ecx, 4
-                mov     [eax+10h], edx
-                mov     dword ptr [eax+14h], 0
-                mov     byte ptr [eax+1], 1
-                mov     byte ptr [eax+2], 1
-                mov     [eax+8], ecx
-
-loc_4CF157:                             ; CODE XREF: CEncoder_GetOptimum+F44j
-                                        ; CEncoder_GetOptimum+10CCj
-                mov     eax, [esp+90h+var_70]
-                add     eax, 2
-                cmp     eax, [esp+90h+var_4C]
-                mov     [esp+90h+var_70], eax
-                jz      short loc_4CF1BB
-                lea     ebx, ds:0[eax*4]
-                mov     eax, [ebx+ebp+32664h]
-                cmp     eax, 80h
-                mov     [esp+90h+var_6C], eax
-                jb      short loc_4CF1A1
-                mov     ecx, 7FFFFh
-                sub     ecx, eax
-                sar     ecx, 1Fh
-                and     ecx, 0Ch
-                add     ecx, 6
-                shr     eax, cl
-                movzx   edx, byte ptr dword_551198[eax]
-                lea     eax, [edx+ecx*2]
-                mov     [esp+90h+var_3C], eax
-
-loc_4CF1A1:                             ; CODE XREF: CEncoder_GetOptimum+EDFj
-                                        ; CEncoder_GetOptimum+111Fj
-                add     [esp+90h+var_50], 28h
-                add     [esp+90h+var_54], 4
-                mov     ecx, [esp+90h+var_50]
-                mov     edx, [esp+90h+var_6C]
-                add     edi, 1
-                jmp     loc_4CEED3
-; ---------------------------------------------------------------------------
-
-loc_4CF1BB:                             ; CODE XREF: CEncoder_GetOptimum+8A9j
-                                        ; CEncoder_GetOptimum+DA1j ...
-                mov     eax, [esp+90h+var_78]
-                add     eax, 1
-                cmp     eax, [esp+90h+var_7C]
-                mov     [esp+90h+var_78], eax
-                jnz     loc_4CE5D1
-
-loc_4CF1D0:                             ; CODE XREF: CEncoder_GetOptimum+567j
-                mov     ecx, [esp+90h+var_78]
-                push    ecx
-                jmp     short loc_4CF1EF
-; ---------------------------------------------------------------------------
-
-loc_4CF1D7:                             ; CODE XREF: CEncoder_GetOptimum+59Ej
-                mov     ecx, [esp+90h+var_4C]
-                mov     [ebp+32F00h], ecx
-                mov     [ebp+32EFCh], eax
-                mov     byte ptr [ebp+32F10h], 1
-                push    esi
-
-loc_4CF1EF:                             ; CODE XREF: CEncoder_GetOptimum+1175j
-                mov     edx, [esp+94h+arg_4]
-                push    edx
-                mov     ecx, ebp
-                call    sub_4CB2E0
-                pop     edi
-                pop     ebx
-                pop     esi
-                pop     ebp
-                add     esp, 80h
-                retn    8
-CEncoder_GetOptimum endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CF210:                             ; DATA XREF: CEncoder_CodeOneBlock+44o
-                mov     edx, [esp+10h]
-                mov     eax, [esp+4]
-                mov     eax, [eax+4]
-                mov     ecx, [eax]
-                push    edx
-                mov     edx, [esp+10h]
-                push    edx
-                mov     edx, [esp+10h]
-                push    edx
-                push    eax
-                mov     eax, [ecx+0Ch]
-                call    eax
-                retn
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-CEncoder_FillDistancesPrices proc near  ; CODE XREF: CEncoder_SetStreams+4Fp
-                                        ; CEncoder_CodeOneBlock+751p
-
-var_20C         = dword ptr -20Ch
-var_208         = dword ptr -208h
-var_204         = dword ptr -204h
-var_200         = dword ptr -200h
-
-                sub     esp, 20Ch
-                push    ebx
-                push    ebp
-                push    esi
-                push    edi
-                mov     ebx, ecx
-                mov     esi, 4
-
-loc_4CF241:                             ; CODE XREF: CEncoder_FillDistancesPrices+80j
-                cmp     esi, 2000h
-                jnb     short loc_4CF252
-                movzx   edx, byte ptr dword_551198[esi]
-                jmp     short loc_4CF27A
-; ---------------------------------------------------------------------------
-
-loc_4CF252:                             ; CODE XREF: CEncoder_FillDistancesPrices+17j
-                cmp     esi, 2000000h
-                jnb     short loc_4CF26B
-                mov     eax, esi
-                shr     eax, 0Ch
-                movzx   edx, byte ptr dword_551198[eax]
-                add     edx, 18h
-                jmp     short loc_4CF27A
-; ---------------------------------------------------------------------------
-
-loc_4CF26B:                             ; CODE XREF: CEncoder_FillDistancesPrices+28j
-                mov     ecx, esi
-                shr     ecx, 18h
-                movzx   edx, byte ptr dword_551198[ecx]
-                add     edx, 30h
-
-loc_4CF27A:                             ; CODE XREF: CEncoder_FillDistancesPrices+20j
-                                        ; CEncoder_FillDistancesPrices+39j
-                mov     ecx, edx
-                mov     eax, edx
-                and     eax, 1
-                shr     ecx, 1
-                sub     ecx, 1
-                or      eax, 2
-                shl     eax, cl
-                mov     edi, esi
-                sub     edi, eax
-                push    edi
-                sub     eax, edx
-                push    ecx
-                lea     edx, [ebx+eax*4+28BACh]
-                push    edx
-                call    sub_4CD860
-                mov     [esp+esi*4+228h+var_200], eax
-                add     esi, 1
-                add     esp, 0Ch
-                cmp     esi, 80h
-                jb      short loc_4CF241
-                lea     ebp, [esp+21Ch+var_200]
-                sub     ebp, ebx
-                lea     esi, [ebx+3331Ch]
-                sub     ebp, 33314h
-                lea     edx, [ebx+32F14h]
-                mov     [esp+21Ch+var_20C], esi
-                mov     [esp+21Ch+var_208], ebp
-                mov     [esp+21Ch+var_204], 4
-                jmp     short loc_4CF2E4
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CF2E0:                             ; CODE XREF: CEncoder_FillDistancesPrices+1BDj
-                mov     esi, [esp+21Ch+var_20C]
-
-loc_4CF2E4:                             ; CODE XREF: CEncoder_FillDistancesPrices+AAj
-                xor     edi, edi
-                cmp     [ebx+33B58h], edi
-                jbe     short loc_4CF33F
-                mov     edi, edi
-
-loc_4CF2F0:                             ; CODE XREF: CEncoder_FillDistancesPrices+109j
-                mov     ecx, edi
-                or      ecx, 40h
-                xor     esi, esi
-                cmp     ecx, 1
-                jz      short loc_4CF32D
-                lea     esp, [esp+0]
-
-loc_4CF300:                             ; CODE XREF: CEncoder_FillDistancesPrices+F7j
-                mov     eax, ecx
-                shr     ecx, 1
-                mov     ebp, [edx+ecx*4-0A764h]
-                and     eax, 1
-                sub     ebp, eax
-                neg     eax
-                xor     ebp, eax
-                shr     ebp, 2
-                and     ebp, 1FFh
-                add     esi, dword_550998[ebp*4]
-                cmp     ecx, 1
-                jnz     short loc_4CF300
-                mov     ebp, [esp+21Ch+var_208]
-
-loc_4CF32D:                             ; CODE XREF: CEncoder_FillDistancesPrices+CAj
-                mov     [edx+edi*4], esi
-                add     edi, 1
-                cmp     edi, [ebx+33B58h]
-                jb      short loc_4CF2F0
-                mov     esi, [esp+21Ch+var_20C]
-
-loc_4CF33F:                             ; CODE XREF: CEncoder_FillDistancesPrices+BCj
-                mov     eax, 0Eh
-                cmp     [ebx+33B58h], eax
-                jbe     short loc_4CF368
-                lea     esp, [esp+0]
-
-loc_4CF350:                             ; CODE XREF: CEncoder_FillDistancesPrices+136j
-                mov     ecx, eax
-                shr     ecx, 1
-                sub     ecx, 5
-                shl     ecx, 6
-                add     [edx+eax*4], ecx
-                add     eax, 1
-                cmp     eax, [ebx+33B58h]
-                jb      short loc_4CF350
-
-loc_4CF368:                             ; CODE XREF: CEncoder_FillDistancesPrices+11Aj
-                mov     eax, [edx]
-                mov     [esi-8], eax
-                mov     ecx, [edx+4]
-                mov     [esi-4], ecx
-                mov     eax, [edx+8]
-                mov     [esi], eax
-                mov     ecx, [edx+0Ch]
-                mov     [esi+4], ecx
-                mov     eax, 4
-                add     esi, 8
-
-loc_4CF386:                             ; CODE XREF: CEncoder_FillDistancesPrices+19Ej
-                cmp     eax, 2000h
-                jnb     short loc_4CF396
-                movzx   ecx, byte ptr dword_551198[eax]
-                jmp     short loc_4CF3BB
-; ---------------------------------------------------------------------------
-
-loc_4CF396:                             ; CODE XREF: CEncoder_FillDistancesPrices+15Bj
-                cmp     eax, 2000000h
-                mov     ecx, eax
-                jnb     short loc_4CF3AE
-                shr     ecx, 0Ch
-                movzx   ecx, byte ptr dword_551198[ecx]
-                add     ecx, 18h
-                jmp     short loc_4CF3BB
-; ---------------------------------------------------------------------------
-
-loc_4CF3AE:                             ; CODE XREF: CEncoder_FillDistancesPrices+16Dj
-                shr     ecx, 18h
-                movzx   ecx, byte ptr dword_551198[ecx]
-                add     ecx, 30h
-
-loc_4CF3BB:                             ; CODE XREF: CEncoder_FillDistancesPrices+164j
-                                        ; CEncoder_FillDistancesPrices+17Cj
-                mov     ecx, [edx+ecx*4]
-                add     ecx, [esi+ebp]
-                add     eax, 1
-                mov     [esi], ecx
-                add     esi, 4
-                cmp     eax, 80h
-                jb      short loc_4CF386
-                add     [esp+21Ch+var_20C], 200h
-                sub     ebp, 200h
-                add     edx, 100h
-                sub     [esp+21Ch+var_204], 1
-                mov     [esp+21Ch+var_208], ebp
-                jnz     loc_4CF2E0
-                pop     edi
-                pop     esi
-                pop     ebp
-                mov     dword ptr [ebx+33B70h], 0
-                pop     ebx
-                add     esp, 20Ch
-                retn
-CEncoder_FillDistancesPrices endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-CEncoder_FillAlignPrices proc near      ; CODE XREF: CEncoder_SetStreams+56p
-                                        ; CEncoder_CodeOneBlock+761p
-                push    ebx
-                push    ebp
-                push    esi
-                mov     ebp, ecx
-                push    edi
-                xor     esi, esi
-                lea     ebx, [ebp+28D78h]
-                lea     edi, [ebp+33B14h]
-
-loc_4CF424:                             ; CODE XREF: CEncoder_FillAlignPrices+27j
-                push    esi
-                mov     ecx, ebx
-                call    sub_4CD810
-                mov     [edi], eax
-                add     esi, 1
-                add     edi, 4
-                cmp     esi, 10h
-                jb      short loc_4CF424
-                pop     edi
-                pop     esi
-                mov     dword ptr [ebp+33B54h], 0
-                pop     ebp
-                pop     ebx
-                retn
-CEncoder_FillAlignPrices endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CF810      proc near               ; CODE XREF: sub_4D0250+3p
-
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_4           = dword ptr -4
-
-                push    0FFFFFFFFh
-                push    offset loc_4DA0C9
-                mov     eax, dword ptr fs:[0]
-                push    eax
-                push    ecx
-                push    ebx
-                push    esi
-                mov     eax, dword_544960
-                xor     eax, esp
-                push    eax
-                lea     eax, [esp+1Ch+var_C]
-                mov     dword ptr fs:[0], eax
-                mov     esi, ecx
-                mov     [esp+1Ch+var_10], esi
-                mov     dword ptr [esi], offset NCompress_NLZMA_CEncoder_vftable
-                mov     dword ptr [esi+4], offset NCompress_NLZMA_CEncoder_vftable_ICompressSetOutStream
-                mov     dword ptr [esi+8], offset NCompress_NLZMA_CEncoder_vftable_ICompressSetCoderProperties
-                mov     dword ptr [esi+0Ch], offset NCompress_NLZMA_CEncoder_vftable_ICompressWriteCoderProperties
-                mov     eax, [esi+0A4h]
-                push    eax             ; lpAddress
-                mov     [esp+20h+var_4], 1
-                call    off_546E24
-                xor     ebx, ebx
-                add     esp, 4
-                cmp     [esi+0D0h], ebx
-                mov     [esi+0A4h], ebx
-                jnz     short loc_4CF892
-                mov     ecx, [esi+0B4h]
-                push    ecx             ; lpAddress
-                call    off_546E24
-                add     esp, 4
-                mov     [esi+0B4h], ebx
-
-loc_4CF892:                             ; CODE XREF: sub_4CF810+6Aj
-                mov     eax, [esi+33B8Ch]
-                cmp     eax, ebx
-                jz      short loc_4CF8A4
-                mov     edx, [eax]
-                push    eax
-                mov     eax, [edx+8]
-                call    eax
-
-loc_4CF8A4:                             ; CODE XREF: sub_4CF810+8Aj
-                lea     ecx, [esi+32650h]
-                mov     byte ptr [esp+1Ch+var_4], bl
-                call    sub_4CD8F0
-                mov     eax, [esi+40h]
-                cmp     eax, ebx
-                mov     [esp+1Ch+var_4], 0FFFFFFFFh
-                jz      short loc_4CF8CF
-                push    8000h           ; dwFreeType
-                push    ebx             ; dwSize
-                push    eax             ; lpAddress
-                call    ds:VirtualFree
-
-loc_4CF8CF:                             ; CODE XREF: sub_4CF810+B0j
-                mov     [esi+40h], ebx
-                mov     esi, [esi+54h]
-                cmp     esi, ebx
-                jz      short loc_4CF8E1
-                mov     ecx, [esi]
-                mov     edx, [ecx+8]
-                push    esi
-                call    edx
-
-loc_4CF8E1:                             ; CODE XREF: sub_4CF810+C7j
-                mov     ecx, [esp+1Ch+var_C]
-                mov     dword ptr fs:[0], ecx
-                pop     ecx
-                pop     esi
-                pop     ebx
-                add     esp, 10h
-                retn
-sub_4CF810      endp
-
-; =============== S U B R O U T I N E =======================================
-
-; int __stdcall sub_4CF900(int, void *Buf1, int)
-sub_4CF900      proc near               ; CODE XREF: sub_4CFA20+5j
-                                        ; ICompressSetCoderProperties_QueryInterface+5j ...
-
-arg_0           = dword ptr  4
-Buf1            = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                push    esi
-                mov     esi, [esp+4+Buf1]
-                push    offset dword_512730 ; Buf2
-                push    esi             ; Buf1
-                call    unknown_libname_324 ; MFC 3.1/4.0/4.2/8.0 32bit
-                add     esp, 8
-                test    eax, eax
-                jz      short loc_4CF94C
-
-loc_4CF917:                             ; CODE XREF: sub_4CF900+5Cj
-                mov     eax, [esp+4+arg_0]
-                test    eax, eax
-                jz      short loc_4CF936
-                mov     edx, [esp+4+arg_8]
-                lea     ecx, [eax+4]
-                mov     [edx], ecx
-                mov     ecx, [eax]
-                mov     edx, [ecx+4]
-                push    eax
-                call    edx
-                xor     eax, eax
-                pop     esi
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CF936:                             ; CODE XREF: sub_4CF900+1Dj
-                                        ; sub_4CF900+76j ...
-                mov     edx, [esp+4+arg_8]
-                xor     ecx, ecx
-                mov     [edx], ecx
-                mov     ecx, [eax]
-                mov     edx, [ecx+4]
-                push    eax
-                call    edx
-                xor     eax, eax
-                pop     esi
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CF94C:                             ; CODE XREF: sub_4CF900+15j
-                push    offset dword_5535A0 ; Buf2
-                push    esi             ; Buf1
-                call    unknown_libname_324 ; MFC 3.1/4.0/4.2/8.0 32bit
-                add     esp, 8
-                test    eax, eax
-                jnz     short loc_4CF917
-                push    offset dword_5535B0 ; Buf2
-                push    esi             ; Buf1
-                call    unknown_libname_324 ; MFC 3.1/4.0/4.2/8.0 32bit
-                add     esp, 8
-                test    eax, eax
-                jz      short loc_4CF98F
-                mov     eax, [esp+4+arg_0]
-                test    eax, eax
-                jz      short loc_4CF936
-                mov     edx, [esp+4+arg_8]
-                lea     ecx, [eax+8]
-                mov     [edx], ecx
-                mov     ecx, [eax]
-                mov     edx, [ecx+4]
-                push    eax
-                call    edx
-                xor     eax, eax
-                pop     esi
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CF98F:                             ; CODE XREF: sub_4CF900+6Ej
-                push    offset dword_5535C0 ; Buf2
-                push    esi             ; Buf1
-                call    unknown_libname_324 ; MFC 3.1/4.0/4.2/8.0 32bit
-                add     esp, 8
-                test    eax, eax
-                jz      short loc_4CF9C0
-                mov     eax, [esp+4+arg_0]
-                test    eax, eax
-                jz      short loc_4CF936
-                mov     edx, [esp+4+arg_8]
-                lea     ecx, [eax+0Ch]
-                mov     [edx], ecx
-                mov     ecx, [eax]
-                mov     edx, [ecx+4]
-                push    eax
-                call    edx
-                xor     eax, eax
-                pop     esi
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CF9C0:                             ; CODE XREF: sub_4CF900+9Fj
-                mov     eax, 80004002h
-                pop     esi
-                retn    0Ch
-sub_4CF900      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CF9D0      proc near               ; CODE XREF: ICompressSetCoderProperties_AddRef+5j
-                                        ; sub_4CFA10+5j ...
-
-arg_0           = dword ptr  4
-
-                mov     eax, [esp+arg_0]
-                add     dword ptr [eax+24h], 1
-                mov     eax, [eax+24h]
-                retn    4
-sub_4CF9D0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CF9E0      proc near               ; CODE XREF: sub_4CFA40+5j
-                                        ; ICompressSetCoderProperties_Release+5j ...
-
-arg_0           = dword ptr  4
-
-                mov     ecx, [esp+arg_0]
-                add     dword ptr [ecx+24h], 0FFFFFFFFh
-                mov     eax, [ecx+24h]
-                jnz     short locret_4CF9F8
-                mov     eax, [ecx]
-                mov     edx, [eax+10h]
-                push    1
-                call    edx
-                xor     eax, eax
-
-locret_4CF9F8:                          ; CODE XREF: sub_4CF9E0+Bj
-                retn    4
-sub_4CF9E0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-ICompressSetCoderProperties_AddRef      proc near               ; DATA XREF: .rdata:00517AD4o
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 8
-                jmp     sub_4CF9D0
-ICompressSetCoderProperties_AddRef      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA10      proc near               ; DATA XREF: .rdata:00517AC0o
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 0Ch
-                jmp     sub_4CF9D0
-sub_4CFA10      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA20      proc near               ; DATA XREF: .rdata:NCompress_NLZMA_CEncoder_vftable_ICompressSetOutStreamo
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 4
-                jmp     sub_4CF900
-sub_4CFA20      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-ICompressSetCoderProperties_QueryInterface      proc near               ; DATA XREF: .rdata:NCompress_NLZMA_CEncoder_vftable_ICompressSetCoderPropertieso
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 8
-                jmp     sub_4CF900
-ICompressSetCoderProperties_QueryInterface      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA40      proc near               ; DATA XREF: .rdata:00517AECo
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 4
-                jmp     sub_4CF9E0
-sub_4CFA40      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA50      proc near               ; DATA XREF: .rdata:NCompress_NLZMA_CEncoder_vftable_ICompressWriteCoderPropertieso
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                sub     [esp+arg_0], 0Ch
-                jmp     sub_4CF900
-sub_4CFA50      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-ICompressSetCoderProperties_Release      proc near               ; DATA XREF: .rdata:00517AD8o
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 8
-                jmp     sub_4CF9E0
-ICompressSetCoderProperties_Release      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA70      proc near               ; DATA XREF: .rdata:00517AC4o
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 0Ch
-                jmp     sub_4CF9E0
-sub_4CFA70      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA80      proc near               ; DATA XREF: .rdata:00517AE8o
-
-arg_0           = dword ptr  4
-
-                sub     [esp+arg_0], 4
-                jmp     sub_4CF9D0
-sub_4CFA80      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFA90      proc near               ; DATA XREF: .rdata:00517AF0o
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    esi
-                mov     esi, [esp+4+arg_4]
-                test    esi, esi
-                push    edi
-                mov     edi, [esp+8+arg_0]
-                jz      short loc_4CFAA6
-                mov     eax, [esi]
-                mov     ecx, [eax+4]
-                push    esi
-                call    ecx
-
-loc_4CFAA6:                             ; CODE XREF: sub_4CFA90+Cj
-                mov     eax, [edi+50h]
-                test    eax, eax
-                jz      short loc_4CFAB5
-                mov     edx, [eax]
-                push    eax
-                mov     eax, [edx+8]
-                call    eax
-
-loc_4CFAB5:                             ; CODE XREF: sub_4CFA90+1Bj
-                mov     [edi+50h], esi
-                pop     edi
-                xor     eax, eax
-                pop     esi
-                retn    8
-sub_4CFA90      endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4CFAC0      proc near               ; CODE XREF: CEncoder_CodeOneBlock+42Ap
-                                        ; CEncoder_CodeOneBlock+517p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                mov     eax, [esp+arg_0]
-                push    esi
-                mov     esi, [eax+10h]
-                mov     edx, esi
-                shr     edx, 0Bh
-                imul    edx, [ecx]
-                cmp     [esp+4+arg_4], 0
-                jnz     short loc_4CFAEC
-                mov     [eax+10h], edx
-                mov     edx, [ecx]
-                mov     esi, 800h
-                sub     esi, edx
-                shr     esi, 5
-                add     esi, edx
-                mov     [ecx], esi
-                jmp     short loc_4CFB03
-; ---------------------------------------------------------------------------
-
-loc_4CFAEC:                             ; CODE XREF: sub_4CFAC0+15j
-                add     [eax+8], edx
-                adc     dword ptr [eax+0Ch], 0
-                sub     esi, edx
-                mov     [eax+10h], esi
-                mov     edx, [ecx]
-                mov     esi, edx
-                shr     esi, 5
-                sub     edx, esi
-                mov     [ecx], edx
-
-loc_4CFB03:                             ; CODE XREF: sub_4CFAC0+2Aj
-                mov     ecx, [eax+10h]
-                cmp     ecx, 1000000h
-                pop     esi
-                jnb     short locret_4CFB1C
-                shl     ecx, 8
-                mov     [eax+10h], ecx
-                mov     ecx, eax
-                call    loc_4CF640
-
-locret_4CFB1C:                          ; CODE XREF: sub_4CFAC0+4Dj
-                retn    8
-sub_4CFAC0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFB20      proc near               ; CODE XREF: sub_4D0020+52p
-                                        ; sub_4D0020+E4p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     ebp, ecx
-                mov     ebx, 1
-                mov     edx, 3
-
-loc_4CFB34:                             ; CODE XREF: sub_4CFB20+8Cj
-                mov     edi, [esp+10h+arg_4]
-                sub     edx, 1
-                mov     ecx, edx
-                shr     edi, cl
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebp+ebx*4+0]
-                and     edi, 1
-                test    edi, edi
-                mov     [esp+10h+arg_0], edx
-                jnz     short loc_4CFB70
-                mov     [esi+10h], eax
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebp+ebx*4+0], ecx
-                jmp     short loc_4CFB8B
-; ---------------------------------------------------------------------------
-
-loc_4CFB70:                             ; CODE XREF: sub_4CFB20+35j
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [ebp+ebx*4+0], eax
-
-loc_4CFB8B:                             ; CODE XREF: sub_4CFB20+4Ej
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFBA6
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-                mov     edx, [esp+10h+arg_0]
-
-loc_4CFBA6:                             ; CODE XREF: sub_4CFB20+73j
-                add     ebx, ebx
-                or      ebx, edi
-                test    edx, edx
-                jnz     short loc_4CFB34
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn    8
-sub_4CFB20      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFBC0      proc near               ; CODE XREF: sub_4D0020+136p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     ebp, ecx
-                mov     ebx, 1
-                mov     edx, 8
-
-loc_4CFBD4:                             ; CODE XREF: sub_4CFBC0+8Cj
-                mov     edi, [esp+10h+arg_4]
-                sub     edx, 1
-                mov     ecx, edx
-                shr     edi, cl
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebp+ebx*4+0]
-                and     edi, 1
-                test    edi, edi
-                mov     [esp+10h+arg_0], edx
-                jnz     short loc_4CFC10
-                mov     [esi+10h], eax
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebp+ebx*4+0], ecx
-                jmp     short loc_4CFC2B
-; ---------------------------------------------------------------------------
-
-loc_4CFC10:                             ; CODE XREF: sub_4CFBC0+35j
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [ebp+ebx*4+0], eax
-
-loc_4CFC2B:                             ; CODE XREF: sub_4CFBC0+4Ej
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFC46
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-                mov     edx, [esp+10h+arg_0]
-
-loc_4CFC46:                             ; CODE XREF: sub_4CFBC0+73j
-                add     ebx, ebx
-                or      ebx, edi
-                test    edx, edx
-                jnz     short loc_4CFBD4
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn    8
-sub_4CFBC0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFC60      proc near               ; CODE XREF: sub_4D0770+EDp
-                                        ; CEncoder_CodeOneBlock+67Cp
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     ebp, ecx
-                mov     ebx, 1
-                mov     edx, 6
-
-loc_4CFC74:                             ; CODE XREF: sub_4CFC60+8Cj
-                mov     edi, [esp+10h+arg_4]
-                sub     edx, 1
-                mov     ecx, edx
-                shr     edi, cl
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebp+ebx*4+0]
-                and     edi, 1
-                test    edi, edi
-                mov     [esp+10h+arg_0], edx
-                jnz     short loc_4CFCB0
-                mov     [esi+10h], eax
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebp+ebx*4+0], ecx
-                jmp     short loc_4CFCCB
-; ---------------------------------------------------------------------------
-
-loc_4CFCB0:                             ; CODE XREF: sub_4CFC60+35j
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [ebp+ebx*4+0], eax
-
-loc_4CFCCB:                             ; CODE XREF: sub_4CFC60+4Ej
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFCE6
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-                mov     edx, [esp+10h+arg_0]
-
-loc_4CFCE6:                             ; CODE XREF: sub_4CFC60+73j
-                add     ebx, ebx
-                or      ebx, edi
-                test    edx, edx
-                jnz     short loc_4CFC74
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn    8
-sub_4CFC60      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFD00      proc near               ; CODE XREF: sub_4D0770+109p
-                                        ; CEncoder_CodeOneBlock+6D5p
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     ebp, ecx
-                mov     edi, 1
-                mov     [esp+10h+arg_0], 4
-
-loc_4CFD17:                             ; CODE XREF: sub_4CFD00+87j
-                mov     ecx, [esi+10h]
-                mov     ebx, [esp+10h+arg_4]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebp+edi*4+0]
-                and     ebx, 1
-                test    ebx, ebx
-                jnz     short loc_4CFD48
-                mov     [esi+10h], eax
-                mov     eax, [ebp+edi*4+0]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebp+edi*4+0], ecx
-                jmp     short loc_4CFD63
-; ---------------------------------------------------------------------------
-
-loc_4CFD48:                             ; CODE XREF: sub_4CFD00+2Dj
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebp+edi*4+0]
-                mov     edx, eax
-                shr     edx, 5
-                sub     eax, edx
-                mov     [ebp+edi*4+0], eax
-
-loc_4CFD63:                             ; CODE XREF: sub_4CFD00+46j
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFD7A
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4CFD7A:                             ; CODE XREF: sub_4CFD00+6Bj
-                shr     [esp+10h+arg_4], 1
-                add     edi, edi
-                or      edi, ebx
-                sub     [esp+10h+arg_0], 1
-                jnz     short loc_4CFD17
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn    8
-sub_4CFD00      endp
-
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFD90      proc near               ; CODE XREF: CEncoder_CodeOneBlock+6AFp
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-arg_C           = dword ptr  10h
-
-                mov     eax, [esp+arg_8]
-                test    eax, eax
-                push    edi
-                mov     edi, 1
-                jle     loc_4CFE26
-                push    ebx
-                push    ebp
-                mov     ebp, [esp+0Ch+arg_0]
-                push    esi
-                mov     esi, [esp+10h+arg_4]
-                mov     [esp+10h+arg_8], eax
-
-loc_4CFDB1:                             ; CODE XREF: sub_4CFD90+91j
-                mov     ecx, [esi+10h]
-                mov     ebx, [esp+10h+arg_C]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebp+edi*4+0]
-                and     ebx, 1
-                test    ebx, ebx
-                jnz     short loc_4CFDE2
-                mov     [esi+10h], eax
-                mov     eax, [ebp+edi*4+0]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebp+edi*4+0], ecx
-                jmp     short loc_4CFDFD
-; ---------------------------------------------------------------------------
-
-loc_4CFDE2:                             ; CODE XREF: sub_4CFD90+37j
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebp+edi*4+0]
-                mov     edx, eax
-                shr     edx, 5
-                sub     eax, edx
-                mov     [ebp+edi*4+0], eax
-
-loc_4CFDFD:                             ; CODE XREF: sub_4CFD90+50j
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFE14
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4CFE14:                             ; CODE XREF: sub_4CFD90+75j
-                shr     [esp+10h+arg_C], 1
-                add     edi, edi
-                or      edi, ebx
-                sub     [esp+10h+arg_8], 1
-                jnz     short loc_4CFDB1
-                pop     esi
-                pop     ebp
-                pop     ebx
-
-loc_4CFE26:                             ; CODE XREF: sub_4CFD90+Cj
-                pop     edi
-                retn
-sub_4CFD90      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-
-; =============== S U B R O U T I N E =======================================
-
-
-sub_4CFE30      proc near               ; CODE XREF: CEncoder_CodeOneBlock+190p
-                                        ; CEncoder_CodeOneBlock+2CCp
-
-arg_0           = dword ptr  4
-arg_4           = byte ptr  8
-
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+0Ch+arg_0]
-                push    edi
-                mov     ebx, ecx
-                mov     ebp, 1
-                mov     edx, 8
-
-loc_4CFE44:                             ; CODE XREF: sub_4CFE30+88j
-                movzx   edi, [esp+10h+arg_4]
-                sub     edx, 1
-                mov     cl, dl
-                shr     edi, cl
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebx+ebp*4]
-                and     edi, 1
-                test    edi, edi
-                mov     [esp+10h+arg_0], edx
-                jnz     short loc_4CFE7E
-                mov     [esi+10h], eax
-                mov     eax, [ebx+ebp*4]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebx+ebp*4], ecx
-                jmp     short loc_4CFE97
-; ---------------------------------------------------------------------------
-
-loc_4CFE7E:                             ; CODE XREF: sub_4CFE30+35j
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebx+ebp*4]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [ebx+ebp*4], eax
-
-loc_4CFE97:                             ; CODE XREF: sub_4CFE30+4Cj
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFEB2
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-                mov     edx, [esp+10h+arg_0]
-
-loc_4CFEB2:                             ; CODE XREF: sub_4CFE30+6Fj
-                add     ebp, ebp
-                or      ebp, edi
-                test    edx, edx
-                jnz     short loc_4CFE44
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                retn    8
-sub_4CFE30      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4CFED0      proc near               ; CODE XREF: CEncoder_CodeOneBlock+300p
-
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = byte ptr  8
-arg_8           = byte ptr  0Ch
-
-                push    ecx
-                push    ebx
-                push    ebp
-                push    esi
-                mov     esi, [esp+10h+arg_0]
-                push    edi
-                mov     [esp+14h+var_4], ecx
-                mov     ebx, 1
-                mov     edx, 8
-                jmp     short loc_4CFEF0
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4CFEF0:                             ; CODE XREF: sub_4CFED0+17j
-                                        ; sub_4CFED0+ADj
-                movzx   ebp, [esp+14h+arg_4]
-                movzx   edi, [esp+14h+arg_8]
-                sub     edx, 1
-                movzx   ecx, dl
-                shr     ebp, cl
-                shr     edi, cl
-                mov     ecx, [esp+14h+var_4]
-                mov     [esp+14h+arg_0], edx
-                mov     edx, [esi+10h]
-                and     ebp, 1
-                lea     eax, [ebp+1]
-                shl     eax, 8
-                add     eax, ebx
-                lea     ecx, [ecx+eax*4]
-                mov     eax, edx
-                shr     eax, 0Bh
-                imul    eax, [ecx]
-                and     edi, 1
-                test    edi, edi
-                jnz     short loc_4CFF41
-                mov     [esi+10h], eax
-                mov     eax, [ecx]
-                mov     edx, 800h
-                sub     edx, eax
-                shr     edx, 5
-                add     edx, eax
-                mov     [ecx], edx
-                jmp     short loc_4CFF58
-; ---------------------------------------------------------------------------
-
-loc_4CFF41:                             ; CODE XREF: sub_4CFED0+5Aj
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     edx, eax
-                mov     [esi+10h], edx
-                mov     eax, [ecx]
-                mov     edx, eax
-                shr     edx, 5
-                sub     eax, edx
-                mov     [ecx], eax
-
-loc_4CFF58:                             ; CODE XREF: sub_4CFED0+6Fj
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4CFF6F
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4CFF6F:                             ; CODE XREF: sub_4CFED0+90j
-                mov     edx, [esp+14h+arg_0]
-                add     ebx, ebx
-                or      ebx, edi
-                cmp     ebp, edi
-                jnz     short loc_4CFF8B
-                test    edx, edx
-                jnz     loc_4CFEF0
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4CFF8B:                             ; CODE XREF: sub_4CFED0+A9j
-                test    edx, edx
-                jz      loc_4D0012
-
-loc_4CFF93:                             ; CODE XREF: sub_4CFED0+140j
-                movzx   edi, [esp+14h+arg_8]
-                mov     ebp, [esp+14h+var_4]
-                sub     edx, 1
-                mov     cl, dl
-                shr     edi, cl
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [ebp+ebx*4+0]
-                and     edi, 1
-                test    edi, edi
-                mov     [esp+14h+arg_0], edx
-                jnz     short loc_4CFFD4
-                mov     [esi+10h], eax
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [ebp+ebx*4+0], ecx
-                jmp     short loc_4CFFEF
-; ---------------------------------------------------------------------------
-
-loc_4CFFD4:                             ; CODE XREF: sub_4CFED0+E9j
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [ebp+ebx*4+0]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [ebp+ebx*4+0], eax
-
-loc_4CFFEF:                             ; CODE XREF: sub_4CFED0+102j
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D000A
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-                mov     edx, [esp+14h+arg_0]
-
-loc_4D000A:                             ; CODE XREF: sub_4CFED0+127j
-                add     ebx, ebx
-                or      ebx, edi
-                test    edx, edx
-                jnz     short loc_4CFF93
-
-loc_4D0012:                             ; CODE XREF: sub_4CFED0+BDj
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                pop     ecx
-                retn    0Ch
-sub_4CFED0      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4D0020      proc near               ; CODE XREF: sub_4D0770+C6p
-                                        ; CEncoder_CodeOneBlock+56Dp ...
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                push    ebp
-                mov     ebp, [esp+4+arg_4]
-                cmp     ebp, 8
-                push    esi
-                mov     esi, [esp+8+arg_0]
-                push    edi
-                mov     edi, ecx
-                jnb     short loc_4D007D
-                mov     eax, [esi+10h]
-                shr     eax, 0Bh
-                imul    eax, [edi]
-                mov     [esi+10h], eax
-                mov     eax, [edi]
-                mov     ecx, 800h
-                sub     ecx, eax
-
-loc_4D0047:                             ; DATA XREF: .rdata:0050C3BCo
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [edi], ecx
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0065
-                shl     eax, 8
-
-loc_4D005B:                             ; DATA XREF: .rdata:005064B0o
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4D0065:                             ; CODE XREF: sub_4D0020+36j
-                mov     edx, [esp+0Ch+arg_8]
-                push    ebp
-                shl     edx, 5
-                push    esi
-                lea     ecx, [edx+edi+8]
-                call    sub_4CFB20
-                pop     edi
-                pop     esi
-                pop     ebp
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4D007D:                             ; CODE XREF: sub_4D0020+10j
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [edi]
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [edi]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edi], eax
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D00B6
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4D00B6:                             ; CODE XREF: sub_4D0020+87j
-                cmp     ebp, 10h
-                jnb     short loc_4D010F
-                mov     edx, [esi+10h]
-                shr     edx, 0Bh
-                imul    edx, [edi+4]
-                mov     [esi+10h], edx
-                mov     eax, [edi+4]
-                mov     ecx, 800h
-                sub     ecx, eax
-                shr     ecx, 5
-                add     ecx, eax
-                mov     [edi+4], ecx
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D00F1
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4D00F1:                             ; CODE XREF: sub_4D0020+C2j
-                mov     edx, [esp+0Ch+arg_8]
-                add     ebp, 0FFFFFFF8h
-                push    ebp
-                shl     edx, 5
-                push    esi
-                lea     ecx, [edx+edi+208h]
-                call    sub_4CFB20
-                pop     edi
-                pop     esi
-                pop     ebp
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4D010F:                             ; CODE XREF: sub_4D0020+99j
-                mov     ecx, [esi+10h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [edi+4]
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [edi+4]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edi+4], eax
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D014B
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4D014B:                             ; CODE XREF: sub_4D0020+11Cj
-                add     ebp, 0FFFFFFF0h
-                push    ebp
-                push    esi
-                lea     ecx, [edi+408h]
-                call    sub_4CFBC0
-                pop     edi
-                pop     esi
-                pop     ebp
-                retn    0Ch
-sub_4D0020      endp
-
-; =============== S U B R O U T I N E =======================================
-
-NCompress_NLZMA_CEncoder_CEncoder      proc near               ; CODE XREF: Compress_lzma_internal+149p
-                mov     eax, ecx
-                mov     dword ptr [eax+4], offset ICompressSetOutStream_vftable
-                mov     dword ptr [eax+8], offset ICompressSetCoderProperties_vftable
-                mov     dword ptr [eax+0Ch], offset ICompressWriteCoderProperties_vftable
-                xor     ecx, ecx
-                mov     [eax+24h], ecx
-                mov     dword ptr [eax], offset NCompress_NLZMA_CEncoder_vftable
-                mov     dword ptr [eax+4], offset NCompress_NLZMA_CEncoder_vftable_ICompressSetOutStream
-                mov     dword ptr [eax+8], offset NCompress_NLZMA_CEncoder_vftable_ICompressSetCoderProperties
-                mov     dword ptr [eax+0Ch], offset NCompress_NLZMA_CEncoder_vftable_ICompressWriteCoderProperties
-                mov     [eax+40h], ecx
-                mov     [eax+44h], ecx
-                mov     [eax+54h], ecx
-                mov     [eax+60h], ecx
-                mov     [eax+32650h], ecx
-                mov     dword ptr [eax+32EF8h], 20h
-                mov     dword ptr [eax+33B58h], 2Ch
-                mov     dword ptr [eax+33B5Ch], 2
-                mov     [eax+33B64h], ecx
-                mov     dword ptr [eax+33B6Ch], 00400000h
-                mov     edx, 3
-                mov     [eax+33B60h], edx
-                mov     [eax+33B68h], edx
-                mov     [eax+33B8Ch], ecx
-                mov     [eax+33B90h], ecx
-                mov     [eax+33B94h], cl
-                mov     [eax+0B4h], ecx
-                mov     [eax+0A4h], ecx
-                mov     dword ptr [eax+0B0h], 20h
-                mov     dword ptr [eax+0D4h], 1
-                mov     dword ptr [eax+0CCh], 4
-                mov     [eax+0D0h], ecx
-                mov     [eax+0D8h], ecx
-                mov     [eax+32EF4h], cl
-                retn
-NCompress_NLZMA_CEncoder_CEncoder      endp
-
-; =============== S U B R O U T I N E =======================================
-
-; int __thiscall sub_4D0250(void *Memory, char)
-sub_4D0250      proc near               ; DATA XREF: .rdata:00517B0Co
-
-arg_0           = byte ptr  4
-
-                push    esi
-                mov     esi, ecx
-                call    sub_4CF810
-                test    [esp+4+arg_0], 1
-                jz      short loc_4D0268
-                push    esi             ; Memory
-                call    j__free
-                add     esp, 4
-
-loc_4D0268:                             ; CODE XREF: sub_4D0250+Dj
-                mov     eax, esi
-                pop     esi
-                retn    4
-sub_4D0250      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-sub_4D0270      proc near               ; CODE XREF: CEncoder_SetStreams+14p
-                push    esi
-                mov     esi, ecx
-                mov     eax, [esi+40h]
-                test    eax, eax
-                push    edi
-                mov     edi, 100000h
-                jz      short loc_4D0297
-                cmp     [esi+50h], edi
-                jz      short loc_4D02C5
-                test    eax, eax
-                jz      short loc_4D0297
-                push    8000h           ; dwFreeType
-                push    0               ; dwSize
-                push    eax             ; lpAddress
-                call    ds:VirtualFree
-
-loc_4D0297:                             ; CODE XREF: sub_4D0270+Ej
-                                        ; sub_4D0270+17j
-                push    4               ; flProtect
-                push    1000h           ; flAllocationType
-                push    edi             ; dwSize
-                push    0               ; lpAddress
-                mov     dword ptr [esi+40h], 0
-                mov     [esi+50h], edi
-                call    ds:VirtualAlloc
-                test    eax, eax
-                mov     [esi+40h], eax
-                setnz   al
-                test    al, al
-                jnz     short loc_4D02C5
-                pop     edi
-                mov     eax, 8007000Eh
-                pop     esi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4D02C5:                             ; CODE XREF: sub_4D0270+13j
-                                        ; sub_4D0270+4Bj
-                mov     eax, [esi+33B68h]
-                mov     ecx, [esi+33B64h]
-                cmp     dword ptr [esi+0D4h], 0
-                push    ebx
-                push    eax
-                push    ecx
-                lea     ecx, [esi+32650h]
-                setnz   bl
-                call    sub_4CD940
-                test    al, al
-                jz      short loc_4D034F
-                mov     ecx, [esi+33B6Ch]
-                mov     edx, 1000000h
-                cmp     edx, ecx
-                sbb     eax, eax
-                neg     eax
-                push    ebp
-                mov     ebp, [esi+32EF8h]
-                mov     [esi+0D8h], eax
-                mov     eax, ebp
-                shr     eax, 1
-                add     eax, 10h
-                test    bl, bl
-                jnz     short loc_4D0318
-                shr     eax, 1
-
-loc_4D0318:                             ; CODE XREF: sub_4D0270+A4j
-                mov     edx, [esi+33B90h]
-                test    edx, edx
-                jz      short loc_4D0324
-                mov     eax, edx
-
-loc_4D0324:                             ; CODE XREF: sub_4D0270+B0j
-                push    offset off_546E20
-                push    111h
-                push    ebp
-                push    1000h
-                push    ecx
-                lea     edi, [esi+84h]
-                push    edi
-                mov     [esi+0B0h], eax
-                call    sub_4CBA60
-                add     esp, 18h
-                test    eax, eax
-                pop     ebp
-                jnz     short loc_4D0358
-
-loc_4D034F:                             ; CODE XREF: sub_4D0270+7Bj
-                pop     ebx
-                pop     edi
-                mov     eax, 8007000Eh
-                pop     esi
-                retn
-; ---------------------------------------------------------------------------
-
-loc_4D0358:                             ; CODE XREF: sub_4D0270+DDj
-                mov     [esi+80h], edi
-                add     esi, 68h
-                push    esi
-                push    edi
-                call    sub_4CCAA0
-                add     esp, 8
-                pop     ebx
-                pop     edi
-                xor     eax, eax
-                pop     esi
-                retn
-sub_4D0270      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-CEncoder_SetStreams proc near           ; CODE XREF: CEncoder_CodeReal+4Ap
-
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-
-                mov     eax, [esp+arg_0]
-                push    esi
-                mov     esi, ecx
-                mov     [esi+33B84h], eax
-                mov     byte ptr [esi+33B80h], 0
-                call    sub_4D0270
-                test    eax, eax
-                jnz     loc_4D0441
-                mov     edx, [esp+4+arg_4]
-                mov     ecx, [esi+4]
-                lea     eax, [esi+4]
-                push    edx
-                push    eax
-                mov     eax, [ecx+0Ch]
-                call    eax
-                test    eax, eax
-                jnz     loc_4D0441
-                mov     ecx, esi
-                call    sub_4CDEA0
-                test    eax, eax
-                jnz     short loc_4D0441
-                cmp     [esi+32EF4h], al
-                jnz     short loc_4D03DB
-                mov     ecx, esi
-                call    CEncoder_FillDistancesPrices
-                mov     ecx, esi
-                call    CEncoder_FillAlignPrices
-
-loc_4D03DB:                             ; CODE XREF: CEncoder_SetStreams+4Bj
-                mov     ecx, [esi+32EF8h]
-                sub     ecx, 1
-                mov     [esi+2D9C0h], ecx
-                mov     ecx, [esi+33B5Ch]
-                mov     edx, 1
-                shl     edx, cl
-                lea     ecx, [esi+28DB8h]
-                push    edx
-                call    sub_4CF780
-                mov     ecx, [esi+33B5Ch]
-                mov     eax, [esi+32EF8h]
-                mov     edx, 1
-                shl     edx, cl
-                sub     eax, 1
-                lea     ecx, [esi+2DA04h]
-                mov     [esi+3260Ch], eax
-                push    edx
-                call    sub_4CF780
-                mov     dword ptr [esi+33B78h], 0
-                mov     dword ptr [esi+33B7Ch], 0
-                xor     eax, eax
-
-loc_4D0441:                             ; CODE XREF: CEncoder_SetStreams+1Bj
-                                        ; CEncoder_SetStreams+34j ...
-                pop     esi
-                retn    10h
-CEncoder_SetStreams endp
-
-;Compress_lzma_internal proc near        ; CODE XREF: Compress_lzma+34p
-_starcraft_compress_lzma proc near        ; CODE XREF: Compress_lzma+34p
-; sub_4D0450
-
-var_58          = dword ptr -58h
-var_54          = dword ptr -54h
-var_50          = dword ptr -50h
-var_4C          = dword ptr -4Ch
-var_48          = dword ptr -48h
-var_44          = dword ptr -44h
-var_40          = dword ptr -40h
-var_3C          = word ptr -3Ch
-var_34          = dword ptr -34h
-var_2C          = word ptr -2Ch
-var_24          = dword ptr -24h
-var_1C          = dword ptr -1Ch
-var_14          = dword ptr -14h
-var_C           = dword ptr -0Ch
-var_4           = dword ptr -4
-pbInBuffer      = dword ptr  4
-cbInBuffer      = dword ptr  8
-pcbInBuffer     = dword ptr  0Ch
-pbOutBuffer     = dword ptr  10h
-cbOutBuffer     = dword ptr  14h
-dummy           = dword ptr  18h
-pcbOutBuffer    = dword ptr  1Ch
-pfnAllocateMemory= dword ptr  20h
-pfnFreeMemory   = dword ptr  24h
-pfnGiveData     = dword ptr  28h
-
-                push    0FFFFFFFFh
-                push    offset loc_4DA0FB
-                mov     eax, dword ptr fs:[0]
-                push    eax
-                sub     esp, 4Ch
-                push    ebx
-                push    ebp
-                push    esi
-                push    edi
-                mov     eax, dword_544960
-                xor     eax, esp
-                push    eax
-                lea     eax, [esp+6Ch+var_C]
-                mov     dword ptr fs:[0], eax   
-                mov     eax, dword_553598
-                xor     ebx, ebx
-                cmp     eax, ebx
-                jnz     short loc_4D04A1
-                push    0Ch             ; Size
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                cmp     eax, ebx
-                jz      short loc_4D049A
-                mov     [eax], ebx
-                mov     [eax+4], ebx
-                mov     [eax+8], ebx
-                jmp     short loc_4D049C
-; ---------------------------------------------------------------------------
-
-loc_4D049A:                             ; CODE XREF: Compress_lzma_internal+3Ej
-                xor     eax, eax
-
-loc_4D049C:                             ; CODE XREF: Compress_lzma_internal+48j
-                mov     dword ptr dword_553598, eax
-
-loc_4D04A1:                             ; CODE XREF: Compress_lzma_internal+30j
-                cmp     [eax], ebx
-                jnz     short loc_4D04B3
-                mov     ecx, [esp+6Ch+pfnAllocateMemory]
-                mov     [eax], ecx
-                mov     eax, dword_553598
-
-loc_4D04B3:                             ; CODE XREF: Compress_lzma_internal+53j
-                cmp     eax, ebx
-                jnz     short loc_4D04D6
-                push    0Ch             ; Size
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                cmp     eax, ebx
-                jz      short loc_4D04CF
-                mov     [eax], ebx
-                mov     [eax+4], ebx
-                mov     [eax+8], ebx
-                jmp     short loc_4D04D1
-; ---------------------------------------------------------------------------
-
-loc_4D04CF:                             ; CODE XREF: Compress_lzma_internal+73j
-                xor     eax, eax
-
-loc_4D04D1:                             ; CODE XREF: Compress_lzma_internal+7Dj
-                mov     dword_553598, eax
-
-loc_4D04D6:                             ; CODE XREF: Compress_lzma_internal+65j
-                cmp     [eax+4], ebx
-                jnz     short loc_4D04EA
-                mov     edx, [esp+6Ch+pfnFreeMemory]
-                mov     [eax+4], edx
-                mov     eax, dword_553598
-
-loc_4D04EA:                             ; CODE XREF: Compress_lzma_internal+89j
-                cmp     [eax+8], ebx
-                jnz     short loc_4D04F9
-                mov     ecx, [esp+6Ch+pfnGiveData]
-                mov     [eax+8], ecx
-
-loc_4D04F9:                             ; CODE XREF: Compress_lzma_internal+9Dj
-                mov     edx, [esp+6Ch+pcbOutBuffer]
-                mov     ebp, [esp+6Ch+pcbInBuffer]
-                cmp     ebp, ebx
-                mov     esi, [esp+6Ch+cbInBuffer]
-                mov     [edx], ebx
-                mov     edx, 1
-                mov     eax, esi
-                mov     ecx, ebp
-                ja      short loc_4D0520
-                cmp     esi, ebx
-                jbe     short loc_4D053A
-                jmp     short loc_4D0520
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4D0520:                             ; CODE XREF: Compress_lzma_internal+C5j
-                                        ; Compress_lzma_internal+CBj ...
-                shrd    eax, ecx, 1
-                add     edx, edx
-                shr     ecx, 1
-                cmp     edx, 2000000h
-                ja      short loc_4D053A
-                cmp     ecx, ebx
-                ja      short loc_4D0520
-                jb      short loc_4D053A
-                cmp     eax, ebx
-                ja      short loc_4D0520
-
-loc_4D053A:                             ; CODE XREF: Compress_lzma_internal+C9j
-                                        ; Compress_lzma_internal+DEj ...
-                mov     eax, 13h
-                push    33B98h          ; Size
-                mov     [esp+70h+var_48], 470h
-                mov     [esp+70h+var_44], 400h
-                mov     [esp+70h+var_40], 450h
-                mov     [esp+70h+var_3C], ax
-                mov     [esp+70h+var_2C], ax
-                mov     word ptr [esp+70h+var_1C], ax
-                mov     [esp+70h+var_34], 2
-                mov     [esp+70h+var_24], edx
-                mov     [esp+70h+var_14], 40h
-                mov     [esp+70h+var_58], ebx
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                mov     [esp+6Ch+var_4C], eax
-                cmp     eax, ebx
-                mov     [esp+6Ch+var_4], ebx
-                jz      short loc_4D05A4
-                mov     ecx, eax
-                call    NCompress_NLZMA_CEncoder_CEncoder
-                mov     [esp+6Ch+var_54], eax
-                jmp     short loc_4D05AA
-; ---------------------------------------------------------------------------
-
-loc_4D05A4:                             ; CODE XREF: Compress_lzma_internal+145j
-                mov     [esp+6Ch+var_54], ebx
-                mov     eax, ebx
-
-loc_4D05AA:                             ; CODE XREF: Compress_lzma_internal+152j
-                or      edi, 0FFFFFFFFh
-                cmp     eax, ebx
-                mov     [esp+6Ch+var_4], edi
-                jz      short loc_4D05D1
-                mov     ecx, [eax+8]
-                push    3
-                lea     edx, [esp+70h+var_3C]
-                push    edx
-                add     eax, 8
-                lea     edx, [esp+74h+var_48]
-                push    edx
-                push    eax
-                mov     eax, [ecx+0Ch]
-                call    eax             ; ICompressSetCodeProperties::SetCoderProperties
-                test    eax, eax
-                jz      short loc_4D05D5
-
-loc_4D05D1:                             ; CODE XREF: Compress_lzma_internal+163j
-                mov     [esp+6Ch+var_58], edi
-
-loc_4D05D5:                             ; CODE XREF: Compress_lzma_internal+17Fj
-                push    28h             ; Size
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                cmp     eax, ebx
-                jz      short loc_4D060E
-                mov     ecx, [esp+6Ch+pbInBuffer]
-                mov     [eax+4], ebx
-                add     dword ptr [eax+4], 1
-                mov     dword ptr [eax], offset off_517A90
-                mov     [eax+8], ecx
-                mov     [eax+10h], esi
-                mov     [eax+14h], ebp
-                mov     [eax+18h], ebx
-                mov     [eax+1Ch], ebx
-                mov     [eax+20h], bl
-                mov     edi, eax                ; EDI = pInStreamMemory
-                mov     [esp+6Ch+var_50], eax
-                jmp     short loc_4D0614
-; ---------------------------------------------------------------------------
-
-loc_4D060E:                             ; CODE XREF: Compress_lzma_internal+191j
-                xor     edi, edi
-                mov     [esp+6Ch+var_50], edi
-
-loc_4D0614:                             ; CODE XREF: Compress_lzma_internal+1BCj
-                push    28h             ; Size
-                call    _operator_new    ; operator new(uint)
-                add     esp, 4
-                cmp     eax, ebx
-                jz      short loc_4D0657
-                mov     edx, [esp+6Ch+pbOutBuffer]
-                mov     ecx, [esp+6Ch+cbOutBuffer]
-                mov     [eax+4], ebx
-                add     dword ptr [eax+4], 1
-                mov     [eax+8], edx
-                mov     edx, [esp+6Ch+dummy]
-                mov     dword ptr [eax], offset off_517AA4
-                mov     [eax+10h], ecx
-                mov     [eax+14h], edx
-                mov     [eax+18h], ebx
-                mov     [eax+1Ch], ebx
-                mov     [eax+20h], bl
-                mov     esi, eax        ; ESI = pOutStreamMemory
-                jmp     short loc_4D0659
-; ---------------------------------------------------------------------------
-
-loc_4D0657:                             ; CODE XREF: Compress_lzma_internal+1D0j
-                xor     esi, esi
-
-loc_4D0659:                             ; CODE XREF: Compress_lzma_internal+205j
-                cmp     edi, ebx
-                jz      short loc_4D0661
-                cmp     esi, ebx
-                jnz     short loc_4D0669
-
-loc_4D0661:                             ; CODE XREF: Compress_lzma_internal+20Bj
-                mov     [esp+6Ch+var_58], 0FFFFFFFFh
-
-loc_4D0669:                             ; CODE XREF: Compress_lzma_internal+20Fj
-                mov     eax, [esi]      ; EAX = pOutStreamMemory->vftable
-                mov     ecx, [eax+10h]  ; ECX = 
-                push    ebx
-                mov     edi, 1
-                push    edi
-                push    ebx
-                push    esi
-                call    ecx
-                test    eax, eax
-                jz      short loc_4D0681
-                mov     [esp+6Ch+var_58], edi
-
-loc_4D0681:                             ; CODE XREF: Compress_lzma_internal+22Bj
-                mov     eax, [esp+6Ch+var_54]
-                mov     edx, [eax+0Ch]
-                add     eax, 0Ch
-                push    esi
-                push    eax
-                mov     eax, [edx+0Ch]
-                call    eax
-                test    eax, eax
-                jz      short loc_4D069A
-                mov     [esp+6Ch+var_58], edi
-
-loc_4D069A:                             ; CODE XREF: Compress_lzma_internal+244j
-                xor     edi, edi
-                jmp     short loc_4D06A4
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4D06A0:                             ; CODE XREF: Compress_lzma_internal+27Fj
-                mov     ebp, [esp+6Ch+pcbInBuffer]
-
-loc_4D06A4:                             ; CODE XREF: Compress_lzma_internal+24Cj
-                mov     eax, [esp+6Ch+cbInBuffer]
-                push    ebx
-                push    1
-                mov     edx, ebp
-                mov     ecx, edi
-                call    __allshr         ; Microsoft VisualC 2-8/net runtime
-                push    eax
-                mov     eax, [esi]
-                mov     ecx, [eax+10h]
-                push    esi
-                call    ecx
-                test    eax, eax
-                jz      short loc_4D06C9
-                mov     [esp+6Ch+var_58], 1
-
-loc_4D06C9:                             ; CODE XREF: Compress_lzma_internal+26Fj
-                add     edi, 8
-                cmp     edi, 40h
-                jl      short loc_4D06A0
-                mov     ebp, [esp+6Ch+var_54]
-                xor     edi, edi
-                cmp     [esp+6Ch+var_58], ebx
-                jnz     short loc_4D0723
-                mov     eax, [esp+6Ch+var_50]
-                mov     edx, [ebp+0]
-                mov     ecx, [edx+0Ch]
-                push    ebx
-                push    ebx
-                push    ebx
-                push    esi
-                push    eax
-                push    ebp
-                call    ecx
-                mov     ecx, [esi+18h]
-                mov     edi, eax
-                mov     eax, [esi+1Ch]
-                cmp     eax, ebx
-                ja      short loc_4D0700
-                cmp     ecx, 0FFFFFFFFh
-                jbe     short loc_4D0709
-
-loc_4D0700:                             ; CODE XREF: Compress_lzma_internal+2A9j
-                or      ecx, 0FFFFFFFFh
-                mov     [esp+6Ch+pcbInBuffer], ebx
-                jmp     short loc_4D070D
-; ---------------------------------------------------------------------------
-
-loc_4D0709:                             ; CODE XREF: Compress_lzma_internal+2AEj
-                mov     [esp+6Ch+pcbInBuffer], eax
-
-loc_4D070D:                             ; CODE XREF: Compress_lzma_internal+2B7j
-                mov     edx, [esp+6Ch+pcbOutBuffer]
-                mov     [edx], ecx
-                cmp     [esi+20h], bl
-                jz      short loc_4D0723
-                mov     [esp+6Ch+var_58], 1
-
-loc_4D0723:                             ; CODE XREF: Compress_lzma_internal+28Bj
-                                        ; Compress_lzma_internal+2C9j
-                mov     eax, [esp+6Ch+var_50]
-                cmp     eax, ebx
-                jz      short loc_4D0733
-                mov     ecx, [eax]
-                mov     edx, [ecx+8]
-                push    eax
-                call    edx
-
-loc_4D0733:                             ; CODE XREF: Compress_lzma_internal+2D9j
-                mov     eax, [esi]
-                mov     ecx, [eax+8]
-                push    esi
-                call    ecx
-                mov     edx, [ebp+0]
-                mov     eax, [edx+10h]
-                push    1
-                mov     ecx, ebp
-                call    eax
-                mov     eax, [esp+6Ch+var_58]
-                cmp     eax, ebx
-                jnz     short loc_4D0755
-                neg     edi
-                sbb     edi, edi
-                mov     eax, edi
-
-loc_4D0755:                             ; CODE XREF: Compress_lzma_internal+2FDj
-                mov     ecx, [esp+6Ch+var_C]
-                mov     dword ptr fs:[0], ecx
-                pop     ecx
-                pop     edi
-                pop     esi
-                pop     ebp
-                pop     ebx
-                add     esp, 58h
-                retn
-_starcraft_compress_lzma endp
-;Compress_lzma_internal endp
-
-; =============== S U B R O U T I N E =======================================
-
-Compress_lzma   proc near               ; DATA XREF: .rdata:00509684o
-
-pbOutBuffer     = dword ptr  4
-pcbOutBuffer    = dword ptr  8
-pbInBuffer      = dword ptr  0Ch
-cbInBuffer      = dword ptr  10h
-
-                push    esi
-                push    edi
-;                call    sub_47F198
-                mov     esi, [esp+8+pcbOutBuffer] ; ESI = pcbOutBuffer
-                mov     edi, [esp+8+cbInBuffer] ; EDI = cbInBuffer
-;                push    offset GiveDataToCompress
-;                push    offset FreeMemory_47F3AB
-;                push    offset AllocateMemory_47F396
-                push    esi             ; pcbOutBuffer
-                push    0
-                mov     [eax+493E0h], eax
-                push    dword ptr [esi] ; cbOutBuffer
-                push    [esp+20h+pbOutBuffer] ; pbOutBuffer
-                push    0
-                push    edi             ; cbInBuffer
-                push    [esp+2Ch+pbInBuffer] ; pbInBuffer
-;                call    Compress_lzma_internal
-                add     esp, 28h
-                sub     eax, 0
-                jz      short loc_47F401
-                mov     [esi], edi
-                dec     eax
-
-loc_47F401:                             ; CODE XREF: Compress_lzma+3Fj
-                pop     edi
-                pop     esi
-                retn
-Compress_lzma  endp
-
-; =============== S U B R O U T I N E =======================================
-
-sub_4D0770      proc near               ; CODE XREF: CEncoder_Flush+1Ap
-
-arg_0           = dword ptr  4
-
-                push    edi
-                mov     edi, ecx
-                cmp     byte ptr [edi+33B94h], 0
-                jz      loc_4D0881
-                movzx   eax, byte ptr [edi+10h]
-                mov     ecx, [edi+38h]
-                shl     eax, 4
-                push    ebx
-                mov     ebx, [esp+8+arg_0]
-                add     eax, ebx
-                lea     edx, [edi+eax*4+280F0h]
-                push    ebp
-                push    esi
-                lea     esi, [edi+28h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [edx]
-                add     [esi+8], eax
-                adc     dword ptr [esi+0Ch], 0
-                sub     ecx, eax
-                mov     [esi+10h], ecx
-                mov     eax, [edx]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edx], eax
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D07D3
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4D07D3:                             ; CODE XREF: sub_4D0770+54j
-                movzx   edx, byte ptr [edi+10h]
-                mov     ecx, [esi+10h]
-                lea     eax, [edi+edx*4+283F0h]
-                shr     ecx, 0Bh
-                imul    ecx, [eax]
-                mov     [esi+10h], ecx
-                mov     ecx, [eax]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 5
-                add     edx, ecx
-                mov     [eax], edx
-                mov     eax, [esi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0811
-                shl     eax, 8
-                mov     ecx, esi
-                mov     [esi+10h], eax
-                call    loc_4CF640
-
-loc_4D0811:                             ; CODE XREF: sub_4D0770+92j
-                movzx   eax, byte ptr [edi+10h]
-                mov     cl, ds:kMatchNextStates[eax]
-                push    ebx
-                mov     [edi+10h], cl
-                cmp     byte ptr [edi+32EF4h], 0
-                push    0
-                lea     ebp, [edi+28DB8h]
-                push    esi
-                mov     ecx, ebp
-                setz    byte ptr [esp+1Ch+arg_0]
-                call    sub_4D0020
-                cmp     byte ptr [esp+10h+arg_0], 0
-                jz      short loc_4D0854
-                add     dword ptr [ebp+ebx*4+4C0Ch], 0FFFFFFFFh
-                jnz     short loc_4D0854
-                push    ebx
-                mov     ecx, ebp
-                call    sub_4CF740
-
-loc_4D0854:                             ; CODE XREF: sub_4D0770+D0j
-                                        ; sub_4D0770+DAj
-                push    3Fh
-                push    esi
-                lea     ecx, [edi+287B0h]
-                call    sub_4CFC60
-                push    1Ah
-                push    3FFFFFFh
-                mov     ecx, esi
-                call    sub_4CF6E0
-                push    0Fh
-                push    esi
-                lea     ecx, [edi+28D78h]
-                call    sub_4CFD00
-                pop     esi
-                pop     ebp
-                pop     ebx
-
-loc_4D0881:                             ; CODE XREF: sub_4D0770+Aj
-                pop     edi
-                retn    4
-sub_4D0770      endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-CEncoder_Flush  proc near               ; CODE XREF: CEncoder_CodeOneBlock+BAp
-                                        ; CEncoder_CodeOneBlock+1D0p ...
-
-arg_0           = dword ptr  4
-
-                push    esi
-                mov     esi, ecx
-                mov     eax, [esi+0ECh]
-                test    eax, eax
-                jnz     short loc_4D08E5
-                mov     eax, [esi+33B60h]
-                and     eax, [esp+4+arg_0]
-                push    ebx
-                push    edi
-                push    eax
-                call    sub_4D0770
-                lea     ebx, [esi+28h]
-                mov     edi, 5
-
-loc_4D08B7:                             ; CODE XREF: CEncoder_Flush+31j
-                mov     ecx, ebx
-                call    loc_4CF640
-                sub     edi, 1
-                jnz     short loc_4D08B7
-                mov     ecx, [esi+4Ch]
-                add     esi, 40h
-                cmp     ecx, [esi+4]
-                pop     edi
-                pop     ebx
-                jz      short loc_4D08E3
-
-loc_4D08D0:                             ; CODE XREF: CEncoder_Flush+51j
-                mov     ecx, esi
-                call    sub_4CF450
-                test    eax, eax
-                jnz     short loc_4D08E5
-                mov     edx, [esi+0Ch]
-                cmp     edx, [esi+4]
-                jnz     short loc_4D08D0
-
-loc_4D08E3:                             ; CODE XREF: CEncoder_Flush+3Ej
-                xor     eax, eax
-
-loc_4D08E5:                             ; CODE XREF: CEncoder_Flush+Bj
-                                        ; CEncoder_Flush+49j
-                pop     esi
-                retn    4
-CEncoder_Flush  endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-; =============== S U B R O U T I N E =======================================
-
-CEncoder_CodeOneBlock proc near         ; CODE XREF: CEncoder_CodeReal+B1p
-                                        ; CEncoder_CodeReal+F5p
-
-var_20          = byte ptr -20h
-var_1C          = dword ptr -1Ch
-var_18          = dword ptr -18h
-var_14          = dword ptr -14h
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_8           = dword ptr -8
-var_4           = dword ptr -4
-arg_0           = dword ptr  4
-arg_4           = dword ptr  8
-arg_8           = dword ptr  0Ch
-
-                sub     esp, 20h
-                push    ebp
-                push    esi
-                mov     esi, ecx
-                push    edi
-                mov     edi, [esi+33B84h]
-                xor     ebp, ebp
-                cmp     edi, ebp
-                jz      short loc_4D0952
-                mov     eax, [edi]
-                mov     ecx, [eax+4]
-                push    edi
-                call    ecx
-                mov     eax, [esi+33B8Ch]
-                cmp     eax, ebp
-                jz      short loc_4D091E
-                mov     edx, [eax]
-                push    eax
-                mov     eax, [edx+8]
-                call    eax
-
-loc_4D091E:                             ; CODE XREF: CEncoder_CodeOneBlock+24j
-                mov     [esi+33B8Ch], edi
-                mov     ecx, [esi+80h]
-                mov     edx, [esi+68h]
-                lea     eax, [esi+33B88h]
-                push    ecx
-                mov     dword ptr [eax], offset loc_4CF210
-                mov     [esi+0B8h], eax
-                call    edx
-                add     esp, 4
-                mov     byte ptr [esi+33B95h], 1
-                mov     [esi+33B84h], ebp
-
-loc_4D0952:                             ; CODE XREF: CEncoder_CodeOneBlock+12j
-                mov     eax, [esp+2Ch+arg_8]
-                mov     dword ptr [eax], 1
-                cmp     byte ptr [esi+33B80h], 0
-                jz      short loc_4D0974
-                mov     eax, [esi+0ECh]
-                pop     edi
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4D0974:                             ; CODE XREF: CEncoder_CodeOneBlock+73j
-                mov     ecx, [esi+33B78h]
-                or      ecx, [esi+33B7Ch]
-                push    ebx
-                mov     byte ptr [esi+33B80h], 1
-                jnz     loc_4D0A9C
-                mov     edx, [esi+80h]
-                mov     eax, [esi+70h]
-                push    edx
-                call    eax
-                add     esp, 4
-                test    eax, eax
-                jnz     short loc_4D09B9
-                mov     ecx, [esi+33B78h]
-                push    ecx
-                mov     ecx, esi
-                call    CEncoder_Flush
-                pop     ebx
-                pop     edi
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4D09B9:                             ; CODE XREF: CEncoder_CodeOneBlock+AFj
-                lea     edx, [esp+30h+var_4]
-                push    edx
-                mov     ecx, esi
-                call    sub_4CB3B0
-                movzx   ecx, byte ptr [esi+10h]
-                mov     eax, [esi+33B60h]
-                and     eax, [esi+33B78h]
-                mov     edx, [esi+38h]
-                lea     edi, [esi+28h]
-                shl     ecx, 4
-                add     eax, ecx
-                shr     edx, 0Bh
-                imul    edx, [esi+eax*4+280F0h]
-                lea     eax, [esi+eax*4+280F0h]
-                mov     [edi+10h], edx
-                mov     ecx, [eax]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 5
-                add     edx, ecx
-                mov     [eax], edx
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0A1C
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0A1C:                             ; CODE XREF: CEncoder_CodeOneBlock+11Dj
-                movzx   eax, byte ptr [esi+10h]
-                mov     cl, ds:kLiteralNextStates[eax]
-                mov     [esi+10h], cl
-                mov     edx, [esi+32F04h]
-                mov     eax, [esi+80h]
-                mov     ecx, [esi+6Ch]
-                neg     edx
-                push    edx
-                push    eax
-                call    ecx
-                mov     bl, al
-                mov     eax, [esi+32654h]
-                add     esp, 8
-                mov     byte ptr [esp+30h+var_10], bl
-                mov     edx, [esp+30h+var_10]
-                push    edx
-                movzx   edx, byte ptr [esi+11h]
-                push    edi
-                mov     edi, [esi+3265Ch]
-                and     edi, [esi+33B78h]
-                mov     ecx, 8
-                sub     cl, al
-                shr     edx, cl
-                mov     ecx, eax
-                shl     edi, cl
-                add     edx, edi
-                imul    edx, 0C00h
-                add     edx, [esi+32650h]
-                mov     ecx, edx
-                call    sub_4CFE30
-                add     dword ptr [esi+32F04h], 0FFFFFFFFh
-                add     dword ptr [esi+33B78h], 1
-                mov     [esi+11h], bl
-                adc     [esi+33B7Ch], ebp
-
-loc_4D0A9C:                             ; CODE XREF: CEncoder_CodeOneBlock+98j
-                mov     edi, [esi+33B78h]
-                mov     eax, [esi+80h]
-                mov     ecx, [esi+70h]
-                push    eax
-                mov     [esp+34h+var_14], edi
-                mov     [esp+34h+var_4], edi
-                call    ecx
-                add     esp, 4
-                test    eax, eax
-                jnz     short loc_4D0AD4
-                push    edi
-                mov     ecx, esi
-                call    CEncoder_Flush
-                pop     ebx
-                pop     edi
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    0Ch
-; ---------------------------------------------------------------------------
-                align 10h
-
-loc_4D0AD0:                             ; CODE XREF: CEncoder_CodeOneBlock+735j
-                                        ; CEncoder_CodeOneBlock+78Bj
-                mov     edi, [esp+30h+var_14]
-
-loc_4D0AD4:                             ; CODE XREF: CEncoder_CodeOneBlock+1CBj
-                cmp     byte ptr [esi+32EF4h], 0
-                mov     ecx, esi
-                jz      short loc_4D0AEB
-                lea     edx, [esp+30h+var_1C]
-                push    edx
-                call    CEncoder_GetOptimumFast
-                jmp     short loc_4D0AF6
-; ---------------------------------------------------------------------------
-
-loc_4D0AEB:                             ; CODE XREF: CEncoder_CodeOneBlock+1EDj
-                lea     eax, [esp+30h+var_1C]
-                push    eax
-                push    edi
-                call    CEncoder_GetOptimum
-
-loc_4D0AF6:                             ; CODE XREF: CEncoder_CodeOneBlock+1F9j
-                mov     ebx, [esi+33B60h]
-                and     ebx, edi
-                cmp     eax, 1
-                mov     [esp+30h+var_18], eax
-                jnz     loc_4D0C0E
-                cmp     [esp+30h+var_1C], 0FFFFFFFFh
-                jnz     loc_4D0C0E
-                movzx   ecx, byte ptr [esi+10h]
-                mov     edx, [esi+38h]
-                lea     ebp, [esi+28h]
-                shl     ecx, 4
-                shr     edx, 0Bh
-                add     ecx, ebx
-                imul    edx, [esi+ecx*4+280F0h]
-                lea     eax, [esi+ecx*4+280F0h]
-                mov     [ebp+10h], edx
-                mov     ecx, [eax]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 5
-                add     edx, ecx
-                mov     [eax], edx
-                mov     eax, [ebp+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0B61
-                shl     eax, 8
-                mov     ecx, ebp
-                mov     [ebp+10h], eax
-                call    loc_4CF640
-
-loc_4D0B61:                             ; CODE XREF: CEncoder_CodeOneBlock+262j
-                mov     eax, [esi+32F04h]
-                mov     ecx, [esi+80h]
-                mov     edx, [esi+6Ch]
-                neg     eax
-                push    eax
-                push    ecx
-                call    edx
-                movzx   edi, byte ptr [esi+11h]
-                mov     edx, [esi+3265Ch]
-                and     edx, [esp+38h+var_14]
-                mov     bl, al
-                mov     eax, [esi+32654h]
-                mov     ecx, 8
-                sub     cl, al
-                shr     edi, cl
-                mov     ecx, eax
-                shl     edx, cl
-                add     esp, 8
-                mov     byte ptr [esp+30h+var_10], bl
-                add     edi, edx
-                imul    edi, 0C00h
-                add     edi, [esi+32650h]
-                cmp     byte ptr [esi+10h], 7
-                jnb     short loc_4D0BC3
-                mov     eax, [esp+30h+var_10]
-                push    eax
-                push    ebp
-                mov     ecx, edi
-                call    sub_4CFE30
-                jmp     short loc_4D0BF5
-; ---------------------------------------------------------------------------
-
-loc_4D0BC3:                             ; CODE XREF: CEncoder_CodeOneBlock+2C2j
-                mov     edx, [esi+80h]
-                mov     eax, [esi+6Ch]
-                or      ecx, 0FFFFFFFFh
-                sub     ecx, [esi+14h]
-                sub     ecx, [esi+32F04h]
-                push    ecx
-                push    edx
-                call    eax
-                mov     ecx, [esp+38h+var_10]
-                add     esp, 8
-                mov     byte ptr [esp+30h+var_C], al
-                mov     edx, [esp+30h+var_C]
-                push    ecx
-                push    edx
-                push    ebp
-                mov     ecx, edi
-                call    sub_4CFED0
-
-loc_4D0BF5:                             ; CODE XREF: CEncoder_CodeOneBlock+2D1j
-                movzx   eax, byte ptr [esi+10h]
-                mov     cl, ds:kLiteralNextStates[eax]
-                mov     ebp, [esp+30h+var_18]
-                mov     [esi+10h], cl
-                mov     [esi+11h], bl
-                jmp     loc_4D1013
-; ---------------------------------------------------------------------------
-
-loc_4D0C0E:                             ; CODE XREF: CEncoder_CodeOneBlock+215j
-                                        ; CEncoder_CodeOneBlock+220j
-                movzx   edx, byte ptr [esi+10h]
-                mov     ecx, [esi+38h]
-                lea     edi, [esi+28h]
-                shl     edx, 4
-                mov     eax, ecx
-                shr     eax, 0Bh
-                add     edx, ebx
-                imul    eax, [esi+edx*4+280F0h]
-                add     [edi+8], eax
-                lea     edx, [esi+edx*4+280F0h]
-                mov     ebp, 0
-                adc     [edi+0Ch], ebp
-                sub     ecx, eax
-                mov     [edi+10h], ecx
-                mov     eax, [edx]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edx], eax
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0C63
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0C63:                             ; CODE XREF: CEncoder_CodeOneBlock+364j
-                cmp     [esp+30h+var_1C], 4
-                movzx   edx, byte ptr [esi+10h]
-                mov     ecx, [edi+10h]
-                jnb     loc_4D0E91
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [esi+edx*4+283F0h]
-                add     [edi+8], eax
-                lea     edx, [esi+edx*4+283F0h]
-                adc     [edi+0Ch], ebp
-                sub     ecx, eax
-                mov     [edi+10h], ecx
-                mov     eax, [edx]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edx], eax
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0CB6
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0CB6:                             ; CODE XREF: CEncoder_CodeOneBlock+3B7j
-                mov     eax, [esp+30h+var_1C]
-                cmp     eax, ebp
-                mov     ecx, [edi+10h]
-                jnz     short loc_4D0D24
-                movzx   edx, byte ptr [esi+10h]
-                lea     eax, [esi+edx*4+28420h]
-                shr     ecx, 0Bh
-                imul    ecx, [eax]
-                mov     [edi+10h], ecx
-                mov     ecx, [eax]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 5
-                add     edx, ecx
-                mov     [eax], edx
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0CFC
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0CFC:                             ; CODE XREF: CEncoder_CodeOneBlock+3FDj
-                mov     ebp, [esp+30h+var_18]
-                movzx   ecx, byte ptr [esi+10h]
-                xor     eax, eax
-                cmp     ebp, 1
-                setnz   al
-                shl     ecx, 4
-                add     ecx, ebx
-                lea     ecx, [esi+ecx*4+284B0h]
-                push    eax
-                push    edi
-                call    sub_4CFAC0
-                jmp     loc_4D0E2E
-; ---------------------------------------------------------------------------
-
-loc_4D0D24:                             ; CODE XREF: CEncoder_CodeOneBlock+3CFj
-                mov     edx, [esi+eax*4+14h]
-                movzx   eax, byte ptr [esi+10h]
-                mov     [esp+30h+var_8], edx
-                lea     edx, [esi+eax*4+28420h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [edx]
-                add     [edi+8], eax
-                adc     [edi+0Ch], ebp
-                sub     ecx, eax
-                mov     [edi+10h], ecx
-                mov     eax, [edx]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edx], eax
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0D6C
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0D6C:                             ; CODE XREF: CEncoder_CodeOneBlock+46Dj
-                cmp     [esp+30h+var_1C], 1
-                mov     ecx, [edi+10h]
-                jnz     short loc_4D0DB3
-                movzx   edx, byte ptr [esi+10h]
-                lea     eax, [esi+edx*4+28450h]
-                shr     ecx, 0Bh
-                imul    ecx, [eax]
-                mov     [edi+10h], ecx
-                mov     ecx, [eax]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 5
-                add     edx, ecx
-                mov     [eax], edx
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0E1D
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-                jmp     short loc_4D0E1D
-; ---------------------------------------------------------------------------
-
-loc_4D0DB3:                             ; CODE XREF: CEncoder_CodeOneBlock+484j
-                movzx   eax, byte ptr [esi+10h]
-                lea     edx, [esi+eax*4+28450h]
-                mov     eax, ecx
-                shr     eax, 0Bh
-                imul    eax, [edx]
-                add     [edi+8], eax
-                adc     [edi+0Ch], ebp
-                sub     ecx, eax
-                mov     [edi+10h], ecx
-                mov     eax, [edx]
-                mov     ecx, eax
-                shr     ecx, 5
-                sub     eax, ecx
-                mov     [edx], eax
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0DF3
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0DF3:                             ; CODE XREF: CEncoder_CodeOneBlock+4F4j
-                mov     ebp, [esp+30h+var_1C]
-                movzx   eax, byte ptr [esi+10h]
-                lea     edx, [ebp-2]
-                push    edx
-                push    edi
-                lea     ecx, [esi+eax*4+28480h]
-                call    sub_4CFAC0
-                cmp     ebp, 3
-                jnz     short loc_4D0E17
-                mov     ecx, [esi+1Ch]
-                mov     [esi+20h], ecx
-
-loc_4D0E17:                             ; CODE XREF: CEncoder_CodeOneBlock+51Fj
-                mov     edx, [esi+18h]
-                mov     [esi+1Ch], edx
-
-loc_4D0E1D:                             ; CODE XREF: CEncoder_CodeOneBlock+4B2j
-                                        ; CEncoder_CodeOneBlock+4C1j
-                mov     eax, [esi+14h]
-                mov     ecx, [esp+30h+var_8]
-                mov     ebp, [esp+30h+var_18]
-                mov     [esi+18h], eax
-                mov     [esi+14h], ecx
-
-loc_4D0E2E:                             ; CODE XREF: CEncoder_CodeOneBlock+42Fj
-                cmp     ebp, 1
-                jnz     short loc_4D0E45
-                movzx   edx, byte ptr [esi+10h]
-                mov     al, ds:kShortRepNextStates[edx]
-                mov     [esi+10h], al
-                jmp     loc_4D0FF5
-; ---------------------------------------------------------------------------
-
-loc_4D0E45:                             ; CODE XREF: CEncoder_CodeOneBlock+541j
-                cmp     byte ptr [esi+32EF4h], 0
-                push    ebx
-                lea     edx, [ebp-2]
-                push    edx
-                lea     ecx, [esi+2DA04h]
-                push    edi
-                setz    [esp+3Ch+var_20]
-                call    sub_4D0020
-                cmp     [esp+30h+var_20], 0
-                jz      short loc_4D0E7F
-                add     dword ptr [esi+ebx*4+32610h], 0FFFFFFFFh
-                lea     ecx, [esi+2DA04h]
-                jnz     short loc_4D0E7F
-                push    ebx
-                call    sub_4CF740
-
-loc_4D0E7F:                             ; CODE XREF: CEncoder_CodeOneBlock+577j
-                                        ; CEncoder_CodeOneBlock+587j
-                movzx   eax, byte ptr [esi+10h]
-                mov     cl, ds:kRepNextStates[eax]
-                mov     [esi+10h], cl
-                jmp     loc_4D0FF5
-; ---------------------------------------------------------------------------
-
-loc_4D0E91:                             ; CODE XREF: CEncoder_CodeOneBlock+37Fj
-                lea     eax, [esi+edx*4+283F0h]
-                shr     ecx, 0Bh
-                imul    ecx, [eax]
-                mov     [edi+10h], ecx
-                mov     ecx, [eax]
-                mov     edx, 800h
-                sub     edx, ecx
-                shr     edx, 5
-                add     edx, ecx
-                mov     [eax], edx
-                mov     eax, [edi+10h]
-                cmp     eax, 1000000h
-                jnb     short loc_4D0EC8
-                shl     eax, 8
-                mov     ecx, edi
-                mov     [edi+10h], eax
-                call    loc_4CF640
-
-loc_4D0EC8:                             ; CODE XREF: CEncoder_CodeOneBlock+5C9j
-                movzx   eax, byte ptr [esi+10h]
-                mov     cl, ds:kMatchNextStates[eax]
-                mov     eax, [esp+30h+var_18]
-                mov     [esi+10h], cl
-                cmp     byte ptr [esi+32EF4h], 0
-                push    ebx
-                setz    [esp+34h+var_20]
-                add     eax, 0FFFFFFFEh
-                push    eax
-                lea     ebp, [esi+28DB8h]
-                push    edi
-                mov     ecx, ebp
-                call    sub_4D0020
-                cmp     [esp+30h+var_20], 0
-                jz      short loc_4D0F11
-                add     dword ptr [ebp+ebx*4+4C0Ch], 0FFFFFFFFh
-                jnz     short loc_4D0F11
-                push    ebx
-                mov     ecx, ebp
-                call    sub_4CF740
-
-loc_4D0F11:                             ; CODE XREF: CEncoder_CodeOneBlock+60Dj
-                                        ; CEncoder_CodeOneBlock+617j
-                mov     eax, [esp+30h+var_1C]
-                sub     eax, 4
-                cmp     eax, 2000h
-                mov     [esp+30h+var_1C], eax
-                jnb     short loc_4D0F2C
-                movzx   ebp, byte ptr dword_551198[eax]
-                jmp     short loc_4D0F4F
-; ---------------------------------------------------------------------------
-
-loc_4D0F2C:                             ; CODE XREF: CEncoder_CodeOneBlock+631j
-                cmp     eax, 2000000h
-                jnb     short loc_4D0F42
-                shr     eax, 0Ch
-                movzx   ebp, byte ptr dword_551198[eax]
-                add     ebp, 18h
-                jmp     short loc_4D0F4F
-; ---------------------------------------------------------------------------
-
-loc_4D0F42:                             ; CODE XREF: CEncoder_CodeOneBlock+641j
-                shr     eax, 18h
-                movzx   ebp, byte ptr dword_551198[eax]
-                add     ebp, 30h
-
-loc_4D0F4F:                             ; CODE XREF: CEncoder_CodeOneBlock+63Aj
-                                        ; CEncoder_CodeOneBlock+650j
-                mov     eax, [esp+30h+var_18]
-                add     eax, 0FFFFFFFEh
-                cmp     eax, 4
-                jb      short loc_4D0F60
-                mov     eax, 3
-
-loc_4D0F60:                             ; CODE XREF: CEncoder_CodeOneBlock+669j
-                push    ebp
-                shl     eax, 8
-                push    edi
-                lea     ecx, [eax+esi+287B0h]
-                call    sub_4CFC60
-                cmp     ebp, 4
-                jb      short loc_4D0FD1
-                mov     ebx, [esp+30h+var_1C]
-                mov     ecx, ebp
-                mov     eax, ebp
-                and     eax, 1
-                shr     ecx, 1
-                sub     ecx, 1
-                or      eax, 2
-                shl     eax, cl
-                sub     ebx, eax
-                cmp     ebp, 0Eh
-                jnb     short loc_4D0FA9
-                push    ebx
-                push    ecx
-                sub     eax, ebp
-                lea     edx, [esi+eax*4+28BACh]
-                push    edi
-                push    edx
-                call    sub_4CFD90
-                add     esp, 10h
-                jmp     short loc_4D0FD1
-; ---------------------------------------------------------------------------
-
-loc_4D0FA9:                             ; CODE XREF: CEncoder_CodeOneBlock+6A0j
-                add     ecx, 0FFFFFFFCh
-                push    ecx
-                mov     eax, ebx
-                shr     eax, 4
-                push    eax
-                mov     ecx, edi
-                call    sub_4CF6E0
-                and     ebx, 0Fh
-                push    ebx
-                push    edi
-                lea     ecx, [esi+28D78h]
-                call    sub_4CFD00
-                add     dword ptr [esi+33B54h], 1
-
-loc_4D0FD1:                             ; CODE XREF: CEncoder_CodeOneBlock+684j
-                                        ; CEncoder_CodeOneBlock+6B7j
-                mov     ecx, [esi+1Ch]
-                mov     edx, [esi+18h]
-                mov     eax, [esi+14h]
-                add     dword ptr [esi+33B70h], 1
-                mov     ebp, [esp+30h+var_18]
-                mov     [esi+20h], ecx
-                mov     ecx, [esp+30h+var_1C]
-                mov     [esi+1Ch], edx
-                mov     [esi+18h], eax
-                mov     [esi+14h], ecx
-
-loc_4D0FF5:                             ; CODE XREF: CEncoder_CodeOneBlock+550j
-                                        ; CEncoder_CodeOneBlock+59Cj
-                mov     eax, [esi+80h]
-                mov     ecx, [esi+6Ch]
-                mov     edx, ebp
-                sub     edx, [esi+32F04h]
-                sub     edx, 1
-                push    edx
-                push    eax
-                call    ecx
-                add     esp, 8
-                mov     [esi+11h], al
-
-loc_4D1013:                             ; CODE XREF: CEncoder_CodeOneBlock+319j
-                sub     [esi+32F04h], ebp
-                mov     eax, [esi+32F04h]
-                add     [esp+30h+var_14], ebp
-                test    eax, eax
-                jnz     loc_4D0AD0
-                cmp     [esi+32EF4h], al
-                jnz     short loc_4D1056
-                cmp     dword ptr [esi+33B70h], 80h
-                jb      short loc_4D1046
-                mov     ecx, esi
-                call    CEncoder_FillDistancesPrices
-
-loc_4D1046:                             ; CODE XREF: CEncoder_CodeOneBlock+74Dj
-                cmp     dword ptr [esi+33B54h], 10h
-                jb      short loc_4D1056
-                mov     ecx, esi
-                call    CEncoder_FillAlignPrices
-
-loc_4D1056:                             ; CODE XREF: CEncoder_CodeOneBlock+741j
-                                        ; CEncoder_CodeOneBlock+75Dj
-                mov     edx, [esi+80h]
-                mov     eax, [esi+70h]
-                push    edx
-                call    eax
-                add     esp, 4
-                test    eax, eax
-                mov     eax, [esp+30h+var_14]
-                jz      short loc_4D10D7
-                mov     ecx, [esp+30h+var_4]
-                mov     edx, eax
-                sub     edx, ecx
-                cmp     edx, 4000h
-                jb      loc_4D0AD0
-                sub     eax, ecx
-                add     [esi+33B78h], eax
-                mov     ecx, [esi+33B78h]
-                mov     eax, [esp+30h+arg_0]
-                adc     dword ptr [esi+33B7Ch], 0
-                mov     [eax], ecx
-                mov     edx, [esi+33B7Ch]
-                lea     ecx, [esi+28h]
-                mov     [eax+4], edx
-                call    sub_4CD8B0
-                mov     ecx, [esp+30h+arg_4]
-                mov     [ecx], eax
-                mov     eax, [esp+30h+arg_8]
-                mov     [ecx+4], edx
-                pop     ebx
-                mov     byte ptr [esi+33B80h], 0
-                pop     edi
-                mov     dword ptr [eax], 0
-                mov     eax, [esi+0ECh]
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    0Ch
-; ---------------------------------------------------------------------------
-
-loc_4D10D7:                             ; CODE XREF: CEncoder_CodeOneBlock+77Bj
-                push    eax
-                mov     ecx, esi
-                call    CEncoder_Flush
-                pop     ebx
-                pop     edi
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    0Ch
-CEncoder_CodeOneBlock endp
-
-; ---------------------------------------------------------------------------
-                align 10h
-CEncoder_CodeReal proc near             ; CODE XREF: CEncoder_Code+49p
-
-var_20          = dword ptr -20h
-processedOutSize= byte ptr -1Ch
-processedInSize = byte ptr -14h
-var_C           = dword ptr -0Ch
-var_4           = dword ptr -4
-inStream        = dword ptr  4
-outStream       = dword ptr  8
-inSize          = dword ptr  0Ch
-outSize         = dword ptr  10h
-progress        = dword ptr  14h
-
-                push    0FFFFFFFFh
-                push    offset loc_4DA128
-                mov     eax, dword ptr fs:[0]
-                push    eax
-                sub     esp, 14h
-                push    ebp
-                push    esi
-                push    edi
-                mov     eax, dword_544960
-                xor     eax, esp
-                push    eax
-                lea     eax, [esp+30h+var_C]
-                mov     dword ptr fs:[0], eax
-                mov     esi, ecx
-                mov     [esp+30h+var_20], esi
-                mov     eax, [esp+30h+outSize]
-                mov     ecx, [esp+30h+inSize]
-                mov     edx, [esp+30h+outStream]
-                push    eax
-                mov     eax, [esp+34h+inStream]
-                push    ecx
-                push    edx
-                push    eax
-                mov     ecx, esi
-                mov     [esp+40h+var_4], 0
-                call    CEncoder_SetStreams
-                mov     edi, eax
-                test    edi, edi
-                jz      short loc_4D1190
-                cmp     dword ptr [esi+80h], 0
-                mov     [esp+30h+var_4], 0FFFFFFFFh
-                jz      short loc_4D1166
-                cmp     byte ptr [esi+33B95h], 0
-                jz      short loc_4D1166
-                mov     byte ptr [esi+33B95h], 0
-
-loc_4D1166:                             ; CODE XREF: CEncoder_CodeReal+64j
-                                        ; CEncoder_CodeReal+6Dj
-                mov     eax, [esi+33B8Ch]
-                test    eax, eax
-                jz      short loc_4D1182
-                mov     ecx, [eax]
-                mov     edx, [ecx+8]
-                push    eax
-                call    edx
-                mov     dword ptr [esi+33B8Ch], 0
-
-loc_4D1182:                             ; CODE XREF: CEncoder_CodeReal+7Ej
-                mov     ecx, [esi+4]
-                mov     edx, [ecx+10h]
-                lea     eax, [esi+4]
-                push    eax
-                call    edx
-                jmp     short loc_4D1201
-; ---------------------------------------------------------------------------
-
-loc_4D1190:                             ; CODE XREF: CEncoder_CodeReal+53j
-                lea     eax, [esp+30h+outSize]
-                push    eax
-                lea     ecx, [esp+34h+processedOutSize]
-                push    ecx
-                lea     edx, [esp+38h+processedInSize]
-                push    edx
-                mov     ecx, esi
-                call    CEncoder_CodeOneBlock
-                mov     edi, eax
-                test    edi, edi
-                jnz     short loc_4D11F0
-                mov     ebp, [esp+30h+progress]
-
-loc_4D11B0:                             ; CODE XREF: CEncoder_CodeReal+FEj
-                cmp     [esp+30h+outSize], 0
-                jnz     short loc_4D1218
-                test    ebp, ebp
-                jz      short loc_4D11D4
-                mov     eax, [ebp+0]
-                mov     eax, [eax+0Ch]
-                lea     ecx, [esp+30h+processedOutSize]
-                push    ecx
-                lea     edx, [esp+34h+processedInSize]
-                push    edx
-                push    ebp
-                call    eax             ; SetRatioInfo
-                mov     edi, eax
-                test    edi, edi
-                jnz     short loc_4D11F0
-
-loc_4D11D4:                             ; CODE XREF: CEncoder_CodeReal+C9j
-                lea     ecx, [esp+30h+outSize]
-                push    ecx
-                lea     edx, [esp+34h+processedOutSize]
-                push    edx
-                lea     eax, [esp+38h+processedInSize]
-                push    eax
-                mov     ecx, esi
-                call    CEncoder_CodeOneBlock
-                mov     edi, eax
-                test    edi, edi
-                jz      short loc_4D11B0
-
-loc_4D11F0:                             ; CODE XREF: CEncoder_CodeReal+BAj
-                                        ; CEncoder_CodeReal+E2j
-                lea     ecx, [esp+30h+var_20]
-                mov     [esp+30h+var_4], 0FFFFFFFFh
-                call    sub_4CDA70
-
-loc_4D1201:                             ; CODE XREF: CEncoder_CodeReal+9Ej
-                mov     eax, edi
-                mov     ecx, [esp+30h+var_C]
-                mov     dword ptr fs:[0], ecx
-                pop     ecx
-                pop     edi
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    14h
-; ---------------------------------------------------------------------------
-
-loc_4D1218:                             ; CODE XREF: CEncoder_CodeReal+C5j
-                lea     ecx, [esp+30h+var_20]
-                mov     [esp+30h+var_4], 0FFFFFFFFh
-                call    sub_4CDA70
-                xor     eax, eax
-                mov     ecx, [esp+30h+var_C]
-                mov     dword ptr fs:[0], ecx
-                pop     ecx
-                pop     edi
-                pop     esi
-                pop     ebp
-                add     esp, 20h
-                retn    14h
-CEncoder_CodeReal endp
-
-; =============== S U B R O U T I N E =======================================
-; Attributes: bp-based frame
-
-CEncoder_Code   proc near               ; DATA XREF: .rdata:00517B08o
-; sub_4D1240
-
-var_10          = dword ptr -10h
-var_C           = dword ptr -0Ch
-var_4           = dword ptr -4
-pThis           = dword ptr  8
-pInStream       = dword ptr  0Ch
-pOutStream      = dword ptr  10h
-pInSize         = dword ptr  14h
-pOutSize        = dword ptr  18h
-progress        = dword ptr  1Ch
-
-                push    ebp
-                mov     ebp, esp
-                push    0FFFFFFFFh
-                push    offset loc_4DA150
-                mov     eax, dword ptr fs:[0]
-                push    eax
-                sub     esp, 8
-                push    ebx
-                push    esi
-                push    edi
-                mov     eax, dword_544960
-                xor     eax, ebp
-                push    eax
-                lea     eax, [ebp+var_C]
-                mov     dword ptr fs:[0], eax
-                mov     [ebp+var_10], esp
-                mov     eax, [ebp+progress]
-                mov     ecx, [ebp+pOutSize]
-                mov     edx, [ebp+pInSize]
-                push    eax
-                mov     eax, [ebp+pOutStream]
-                push    ecx
-                mov     ecx, [ebp+pInStream]
-                push    edx
-                push    eax
-                push    ecx
-                mov     ecx, [ebp+pThis]
-                mov     [ebp+var_4], 0
-                call    CEncoder_CodeReal
-                mov     ecx, [ebp+var_C]
-                mov     dword ptr fs:[0], ecx
-                pop     ecx
-                pop     edi
-                pop     esi
-                pop     ebx
-                mov     esp, ebp
-                pop     ebp
-                retn    18h
-CEncoder_Code   endp
-
-; ---------------------------------------------------------------------------
-
-loc_4DA0FB:                             ; DATA XREF: Compress_lzma_internal+2o
-                mov     edx, [esp+8]
-                lea     eax, [edx-5Ch]
-                mov     ecx, [edx-60h]
-                xor     ecx, eax
-                call    sub_4A0686
-                mov     eax, 0  ; offset dword_526E44
-                int 3;
-;               jmp     ___CxxFrameHandler3
-
-loc_4DA0C9:                             ; DATA XREF: sub_4CF810+2o
-                mov     edx, [esp+8]
-                lea     eax, [edx-0Ch]
-                mov     ecx, [edx-10h]
-                xor     ecx, eax
-                call    sub_4A0686
-                mov     eax, 0  ; offset dword_526E18
-                int 3;
-;               jmp     ___CxxFrameHandler3
-
-loc_4DA128:                             ; DATA XREF: CEncoder_CodeReal+2o
-                mov     edx, [esp+8]
-                lea     eax, [edx-20h]
-                mov     ecx, [edx-24h]
-                xor     ecx, eax
-                call    sub_4A0686
-                mov     eax, 0  ; offset unk_526E70
-                int 3;
-;               jmp     ___CxxFrameHandler3
-
-loc_4DA150:                             ; DATA XREF: CEncoder_Code+5o
-                mov     edx, [esp+8]
-                lea     eax, [edx+0Ch]
-                mov     ecx, [edx-18h]
-                xor     ecx, eax
-                call    sub_4A0686
-                mov     eax, 0  ; offset unk_526ED8
-                int 3;
-;               jmp     ___CxxFrameHandler3
-
-END
diff --git a/dep/acelite/CMakeLists.txt b/dep/acelite/CMakeLists.txt
index db2915b29..7b24f491c 100644
--- a/dep/acelite/CMakeLists.txt
+++ b/dep/acelite/CMakeLists.txt
@@ -1,11 +1,19 @@
-# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
 #
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
+# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 add_subdirectory(ace)
diff --git a/dep/acelite/COPYING b/dep/acelite/COPYING
index 226708461..a8a5eda0c 100644
--- a/dep/acelite/COPYING
+++ b/dep/acelite/COPYING
@@ -8,7 +8,7 @@
    (henceforth referred to as "DOC software") are copyrighted by
    [5]Douglas C. Schmidt and his [6]research group at [7]Washington
    University, [8]University of California, Irvine, and [9]Vanderbilt
-   University, Copyright (c) 1993-2012, all rights reserved. Since DOC
+   University, Copyright (c) 1993-2014, all rights reserved. Since DOC
    software is open-source, freely available software, you are free to
    use, modify, copy, and distribute--perpetually and irrevocably--the
    DOC software source code and object code produced from the source, as
diff --git a/dep/acelite/ChangeLog b/dep/acelite/ChangeLog
index 7381bdcca..28f4fc60d 100644
--- a/dep/acelite/ChangeLog
+++ b/dep/acelite/ChangeLog
@@ -1,2587 +1,253 @@
-Wed Aug 29 08:16:04 CEST 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Nov 14 08:38:16 CET 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ACE version 6.1.4 released.
+        * ACE version 6.3.0 released.
 
-Mon Aug 27 20:38:00 UTC 2012  Steve Huston  <shuston@riverace.com>
+Thu Nov 13 11:31:37 UTC 2014  Steve Huston  <shuston@riverace.com>
 
-        * include/makeinclude/platform_linux.GNU: Make CC and CXX setting
-          conditional again. Conditional behavior is relied upon by users.
-          Reverts the following:
-          Tue Mar  1 11:31:55 UTC 2011  Olli Savia  <ops@iki.fi>
+        * ace/config-lite.h: Adjust ACE_DECLARE_STL_REVERSE_ITERATORS to
+          work with Solaris Studio 12.4.
 
-Mon Aug 27 09:43:43 UTC 2012  johnny  <jwillemsen@remedy.nl>
+        * NEWS: Note support for Solaris Studio 12.4.
 
-        * apps/JAWS/clients/WebSTONE/src/config.cache:
-        * apps/JAWS/clients/WebSTONE/src/config.log:
-        * apps/JAWS/clients/WebSTONE/src/config.status:
-          Removed these files, generated by configure and
-          shouldn't be stored in the repository
-
-Fri Aug 24 10:27:22 UTC 2012  johnny  <jwillemsen@remedy.nl>
-
-        * examples/APG/Streams/CommandModule.h:
-        * tests/Service_Config_Stream_Test.cpp:
-          Add ACE_System_Time_Policy as second template argument
-          to ACE_Module, the default template argument doesn't
-          work with clang which seems to be a bug in that
-          compiler
-
-Thu Aug 23 12:33:35 UTC 2012  johnny  <johnny@>
-
-        * ace/Condition_Attributes.inl:
-        * ace/config-hpux-11.00.h:
-          Another fix for hpux ia64 v3
-
-Thu Aug 23 06:35:20 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Condition_Attributes.inl:
-          Only check for ACE_LACKS_MONOTONIC_TIME
-
-        * ace/Monotonic_Time_Policy.inl:
-          Layout change
-
-        * ace/config-hpux-11.00.h:
-          Added ACE_LACKS_MONOTONIC_TIME
-
-Wed Aug 22 11:50:22 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-win32-common.h:
-          Added ACE_LACKS_CLOCK_MONOTONIC and
-          ACE_LACKS_CLOCK_REALTIME
-
-Wed Aug 22 06:13:12 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_time.h:
-          Fixed incorrect check in this file
-
-Tue Aug 21 16:55:13 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_time.h:
-          Introduced new ACE_LACKS_CLOCKID_T which is used to determine whether
-          we need to define clockid_t in ACE. Moved CLOCK_MONOTONIC and
-          CLOCK_REALTIME to file below
-
-        * ace/os_include/sys/os_types.h:
-          Added CLOCK_MONOTONIC and CLOCK_REALTIME here and introduced new
-          ACE_LACKS_CLOCK_REALTIME and ACE_LACKS_CLOCK_MONOTONIC because on
-          for example HPUX CLOCK_REALTIME is not a define but part of an enum
-
-        * ace/config-win32-common.h:
-          Added ACE_LACKS_CLOCKID_T
-
-Tue Aug 21 14:38:00 UTC 2012  Simon Massey  <simon dot massey at prismtech dot com>
-
-        * protocols/ace/INet/SSL_CallbackManager.h:
-          Spelling in comment.
-
-Tue Aug 21 12:25:45 UTC 2012  Simon Massey  <simon dot massey at prismtech dot com>
-
-        * ace/SSL/SSL_Context.h:
-        * ace/SSL/SSL_Context.inl:
-
-          Solaris studio compilers amongst others were issuing warnings due to an
-          incorrect type of function pointer (i.e. not extern "C", but standard
-          C++ type) being stored/used of the form:
-
-            Warning (Anachronism): Formal argument callback of type
-              extern "C" int(*)(int,x509_store_ctx_st*)
-            in call to
-              SSL_CTX_set_verify(ssl_ctx_st*, int, extern "C" int(*)(int,x509_store_ctx_st*))
-            is being passed
-              int(*)(int,x509_store_ctx_st*)
-
-          when the C++ code was providing callback functions to certain C system SSL
-          library calls.
-
-          Unfortunatly you cannot specify extern "C" linkage anywhere inside a
-          class declaration or inside a function prototype for individual
-          parameters. I.e:
-
-            class { extern "C" int (*callback_) (int, void *); };
-
-          to store an extern "C" function pointer as a data member of the
-          class is illegal, as is:
-
-            void function (extern "C" int (*callback) (int, void *);
-
-          to declare a function (or a class member) that takes a extern "C"
-          function pointer as a parameter.
-
-          Since we need to specify an extern "C" function pointer as a parameter
-          to be stored in the class and handled by member functions, we are forced
-          to declare a typedef of that extern "C" function pointer outside of the
-          class that we can then use. Unfortunatly you also are not allowed to
-          simply add the extern "C" to the typedef itself, like this:
-
-            typedef extern "C" int (*extern_C_callback_t) (int, void *);
-
-          instead you have to place the typedef declaration inside an extern "C"
-          block, thus:
-
-            extern "C" {
-              typedef int (*extern_C_callback_t) (int, void *);
-            }
-
-          This then results in the correct call type associated with the
-          function pointer which may then be used inside the function and
-          class declarations to remove these warnings and possiable incorrect
-          call methods undertaken via the STL C functions. A lot of different
-          compilers ignore extern "C" where it is not allowed, the only way
-          I have found to be universally understood is as stated above.
-
-        * protocols/ace/INet/SSL_CallbackManager.h:
-        * protocols/ace/INet/SSL_CallbackManager.cpp:
-
-          Similar problems and interfacing to the changed calling type of the above
-          extern "C" function pointers. NOTE: just declaring a static function for
-          the class is NOT sufficient to obtain the correct extern "C" calling type.
-          We are therefore forced to declare friend functions external to the class
-          (as again we cannot have a extern "C" declaration inside a class even for
-          a static method) to do this job. Since these are extern "C" functions they
-          also of course cannot be overloaded, i.e. they are required to be unique
-          names. They also cannot be non-class static functions to make them private
-          to the cpp file as they need to actually be seen by the class declaration
-          to be made friends and therefore have to be included in the header file.
-
-Tue Aug 21 12:20:43 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_types.h:
-          Fixed HPUX problem
-
-Tue Aug 21 02:45:07 UTC 2012  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/config-macosx-leopard.h:
-          setclock not supported on current macs.
-
-Mon Aug 20 18:07:25 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Global_Macros.h:
-          Doxyen fixes
-
-        * bin/valgrind.supp:
-          Added another needed suppression
-
-Mon Aug 20 10:03:23 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/ACE-monotonic-timer.html:
-          Fixed fuzz
-
-Mon Aug 20 09:03:22 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Module.cpp:
-          Fixed possible memory leak and dead code, uncovered by Coverity scan
-
-Mon Aug 20 08:36:46 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/ACE-monotonic-timer.html:
-          New document describing the ACE monotonic timer support for conditions,
-          message queues and tasks
-
-        * docs/index.html:
-          Added new page, removed link to site that doesn't work anymore
-
-Mon Aug 20 08:21:00 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_types.h:
-          Define CLOCK_MONOTONIC to 1 when it is not defined, should fix
-          hpux problems
-
-Mon Aug 20 07:57:53 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Condition_Attributes.h:
-        * ace/Condition_Attributes.inl:
-          Added accessor for attributes and removed friend declaration,
-          that hopefully fixes the Sun Studio 11 problems
-
-        * ace/Condition_Recursive_Thread_Mutex.cpp:
-        * ace/Condition_T.cpp:
-        * ace/Condition_Thread_Mutex.cpp:
-          Use accessor of the attributes.
-
-Sat Aug 18 19:25:38 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Null_Condition.h:
-          Fix for single threaded builds
-
-Sat Aug 18 19:23:21 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Condition_Attributes.h:
-          Added forward declaration, maybe this fixes solaris 9
-
-Fri Aug 17 18:05:54 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_Thread.inl:
-          Attempt to fix clang warning
-
-Fri Aug 17 13:38:05 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Condition_Recursive_Thread_Mutex.h:
-        * ace/Condition_Thread_Mutex.h:
-        * ace/Null_Condition.h:
-        * ace/Synch_Traits.h:
-          Changes to attempt to fix Solaris9 SUNStudio11 problems.
-
-Fri Aug 17 12:28:32 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-hpux-11.00.h:
-        * ace/config-linux.h:
-          Fixes (hopefully) for non-compliant POSIX platforms.
-
-Fri Aug 17 11:19:01 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Monotonic_Message_Queue_Test.cpp:
-        * tests/Monotonic_Task_Test.cpp:
-          Added include files because of compile errors in certain
-          builds.
-
-Fri Aug 17 09:04:50 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Message_Queue_T.h:
-        * ace/Message_Queue_T.cpp:
-        * ace/Stream.h:
-        * ace/Stream.cpp:
-        * tests/Bug_4055_Regression_Test.cpp:
-        * tests/Monotonic_Task_Test.cpp:
-          Fixed compile errors for a bunch of crappy compilers
-          like the one on RHEL53 and AIX.
-
-Thu Aug 16 18:47:59 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ace.mpc:
-        * ace/ace_for_tao.mpc:
-          List Time_Value_T files
-
-Thu Aug 16 13:43:39 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Message_Queue_T.cpp:
-        * ace/Stream.cpp:
-        * ace/Thread_Manager.cpp:
-        * tests/Bug_4055_Regression_Test.cpp:
-          Fixed problems with single threaded builds.
-
-Thu Aug 16 12:44:05 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Task_T.inl:
-        * ace/Time_Policy_T.inl:
-          Fuzz fixes.
-
-Thu Aug 16 09:43:00 UTC 2012  Simon Massey <sma at prismtech dot com>
-
-        * test/Bug_3943_Regression_Test.cpp:
-
-          Another cast required to remove warning.
-
-Thu Aug 16 09:22:31 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Condition_Attributes.h:
-        * ace/Condition_Attributes.inl:
-        * ace/Condition_Attributes.cpp:
-        * ace/Condition_Recursive_Thread_Mutex.h:
-        * ace/Condition_Recursive_Thread_Mutex.cpp:
-        * ace/Condition_T.h:
-        * ace/Condition_T.cpp:
-        * ace/Condition_Thread_Mutex.h:
-        * ace/Condition_Thread_Mutex.inl:
-        * ace/Condition_Thread_Mutex.cpp:
-        * ace/Message_Queue.h:
-        * ace/Message_Queue_T.h:
-        * ace/Message_Queue_T.cpp:
-        * ace/Module.h:
-        * ace/Module.inl:
-        * ace/Module.cpp:
-        * ace/Monotonic_Time_Policy.h:
-        * ace/Monotonic_Time_Policy.inl:
-        * ace/Monotonic_Time_Policy.cpp:
-        * ace/Null_Condition.h:
-        * ace/OS_NS_Thread.h:
-        * ace/OS_NS_Thread.inl:
-        * ace/OS_NS_Thread.cpp:
-        * ace/Stream.h:
-        * ace/Stream.inl:
-        * ace/Stream.cpp:
-        * ace/Stream_Modules.h:
-        * ace/Stream_Modules.cpp:
-        * ace/Synch_Traits.h:
-        * ace/Task_Ex_T.h:
-        * ace/Task_Ex_T.inl:
-        * ace/Task_Ex_T.cpp:
-        * ace/Task_T.h:
-        * ace/Task_T.inl:
-        * ace/Task_T.cpp:
-        * ace/Thread_Manager.h:
-        * ace/Thread_Manager.cpp:
-        * ace/Thread_Mutex.h:
-        * ace/Time_Policy.h:
-        * ace/Time_Policy.inl:
-        * ace/Time_Policy.cpp:
-        * ace/Time_Policy_T.h:
-        * ace/Time_Policy_T.inl:
-        * ace/Time_Policy_T.cpp:
-        * ace/Time_Value.h:
-        * ace/Time_Value.cpp:
-        * ace/Time_Value_T.h:
-        * ace/Time_Value_T.inl:
-        * ace/Time_Value_T.cpp:
-        * ace/ace.mpc:
-        * ace/ace_for_tao.mpc:
-          Added a Monotonic time policy and a Time_Value template
-          supporting time policies. Refactored OS_NS_Thread time
-          calculations to use new time policy aware functionality
-          of time values. Added support for monotonic timers with
-          condition variables in message queues, tasks and related
-          classes. See NEWS file and new regression tests for more
-          details.
-          Full backward compatibility is maintained.
-
-        * tests/Bug_4055_Regression_Test.cpp:
-          Updated to fixed state.
-
-        * tests/Monotonic_Message_Queue_Test.cpp:
-        * tests/Monotonic_Task_Test.cpp:
-        * tests/run_test.lst:
-        * tests/tests.mpc:
-          Added new monotonic timer regression tests.
-
-        * NEWS:
-          Added detailed update descriptions.
-
-Thu Aug 16 09:24:00 UTC 2012  Simon Massey <sma at prismtech dot com>
-
-        * bin/PerlACE/Process_Win32.pm:
-        * bin/PerlACE/ProcessVX_Win32.pm:
-
-          If we wait for a process to exit, and it does, set the RUNNING status to false.
-
-Thu Aug 16 08:26:12 UTC 2012  Olli Savia  <ops@iki.fi>
-
-        * tests/tests.mpc:
-          Bug_4055_Regression_Test uses threads.
-
-Wed Aug 15 14:10:00 UTC 2012  Simon Massey <sma at prismtech dot com>
-
-        * test/Bug_3911_Regression_Test.cpp:
-        * test/Bug_3943_Regression_Test.cpp:
-
-          Some compilers warning against ordering pointers with integers.
-
-Wed Aug 15 11:42:28 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_linux_clang.GNU:
-          Support for c++0x flag
-
-Wed Aug 15 11:29:48 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_clang_common.GNU:
-          Support for c++0x flag
-
-Tue Aug 14 22:22:05 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * ace/config-vxworks6.8.h:
-
-          When building for VxWorks kernel mode, define ACE_LACKS_STD_WSTRING.
-
-Tue Aug 14 06:35:54 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/valgrind.supp:
-          Extended suppression list
-
-Thu Aug  9 07:03:10 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/bczar/bczar.html:
-          Added packages
-
-        * include/makeinclude/platform_g++_common.GNU:
-          Use -Wno-deprecated with C++11 due to the heavy usage of auto_ptr
-
-        * tests/randomize.h:
-          Doxygen fix
-
-Wed Aug  8 22:13:55 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * ace/ACE.cpp:
-        * ace/ACE_crc_ccitt.cpp:
-        * ace/Basic_Types.h:
-        * ace/Configuration_Import_Export.cpp:
-        * ace/Handle_Set.inl:
-        * ace/INET_Addr.inl:
-        * ace/Message_Queue_Vx.inl:
-        * ace/Name_Request_Reply.cpp:
-        * ace/OS_NS_stdlib.cpp:
-        * ace/OS_NS_unistd.inl:
-        * ace/Select_Reactor_T.inl:
-        * ace/Service_Config.cpp:
-        * ace/Stack_Trace.cpp:
-        * ace/UUID.cpp:
-        * ace/config-vxworks6.9.h:
-        * include/makeinclude/platform_vxworks6.8.GNU:
-        * include/makeinclude/platform_vxworks6.9.GNU:
-
-          Enable compiling for 64-bit VxWorks 6.9 (x86 RTP static).
-
-Wed Aug  8 15:30:00 UTC 2012  Simon Massey  <sma at prismtech dot com>
-
-        * ace/config-linux.h:
-
-          According to man pages Linux uses different (compared to UNIX systems) types
-          for setting IP_MULTICAST_TTL and IPV6_MULTICAST_LOOP / IP_MULTICAST_LOOP
-          in setsockopt/getsockopt.
-          In the current (circa 2012) kernel source however there is an explicit check
-          for IPV6_MULTICAST_LOOP being sizeof(int). Anything else is rejected so it must
-          not be a passed a bool, irrespective of what the man pages (still) say.
-          i.e. #define ACE_HAS_IPV6_MULTICAST_LOOP_AS_BOOL 1 is wrong.
-
-        * ace/SOCK_Dgram_Mcast.h:
-        * ace/SOCK_Dgram_Mcast.inl:
-
-          Override read/write acessor for the constructor options
-          This class is typically default instantiated in a connection handler templated
-          framework so these cannot be specified on construction.
-
-Mon Aug  6 20:54:17 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * bin/PerlACE/TestTarget.pm:
-
-          Updated fix from Fri Jul 20 17:37:27 UTC 2012 to work when
-          one of source or destination is a relative path and other is not.
-
-Sat Jul 28 19:22:06 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/make_release.py:
-          Fixed exclude
-
-Fri Jul 27 10:55:51 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/ace.doxygen:
-        * etc/ace_inet.doxygen:
-        * etc/ace_qos.doxygen:
-        * etc/ace_rmcast.doxygen:
-        * etc/ace_ssl.doxygen:
-        * etc/acexml.doxygen:
-          Generate UML diagrams, assume stl is buildin
-
-Fri Jul 27 08:57:07 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/ace.doxygen:
-        * etc/ace_inet.doxygen:
-        * etc/ace_qos.doxygen:
-        * etc/ace_rmcast.doxygen:
-        * etc/ace_ssl.doxygen:
-        * etc/acexml.doxygen:
-          Upgraded with doxygen -u
-
-Thu Jul 26 16:22:35 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/make_release.py:
-        * docs/bczar/bczar.html:
-          Improved instructions
-
-Thu Jul 26 14:40:45 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/bczar/bczar.html:
-          Set all environment variables explicitly before running the doxygen
-          script
-
-Thu Jul 26 10:19:34 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ARGV.h:
-        * ace/Arg_Shifter.h:
-          Doxygen improvements
-
-        * rpmbuild/ace-tao.spec:
-          Removed ACE_XML_Utils, only compiled when xercesc is enabled
-
-Thu Jul 26 09:31:19 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * NEWS:
-          Updated for next release
-
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-        * bin/make_release.py:
-        * docs/Download.html:
-        * docs/bczar/bczar.html:
-          Updated for x.1.3 release
-
-        * etc/ace.doxygen:
-        * etc/ace_inet.doxygen:
-        * etc/ace_qos.doxygen:
-        * etc/ace_rmcast.doxygen:
-        * etc/ace_ssl.doxygen:
-        * etc/acexml.doxygen:
-        * etc/index.html:
-          Removed deprecated tag
-
-Thu Jul 26 09:12:26 CEST 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE version 6.1.3 released.
-
-Fri Jul 20 17:37:27 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * ace/config-vxworks6.8.h:
-        * ace/config-vxworks6.9.h:
-
-          Changes to build for VxWorks 6.8 kernel mode.
-
-        * bin/PerlACE/ProcessVX_Win32.pm:
-        * tests/run_test.lst:
-
-          Changes for VxWorks testing.
-
-        * bin/PerlACE/TestTarget.pm
-
-          Fixed a Perl bug (ne vs. !=).
-
-Wed Jul 18 15:40:05 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * Happy 50th Birthday to me!
-
-Tue Jun 26 21:47:18 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * bin/valgrind.supp:
-
-          Made the suppression for dlopen more generic, so that it
-          can work for different linux/glibc versions.
-
-Tue Jun 26 13:18:13 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_4055_Regression_Test.cpp:
-          Added commented out way to get the hr time
-
-Mon Jun 25 17:40:35 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_4055_Regression_Test.cpp:
-        * tests/run_test.lst:
-        * tests/tests.mpc:
-          Added new unit test which currently fails. The ACE condition
-          variables use an absolute timeout. If we for example wait for a
-          timeout 3 seconds in the future and the system time is changed 10
-          seconds back we are really waiting 13 seconds now. The ACE timer
-          queues have support for using a monotonic time source using the
-          time policies but this support is not available for conditions at
-          this moment. When that is added, than in the ACE threading code
-          the monotonic time source can be set on the pthread condition
-          to control that we want to use a monotonic time source.
-
-Mon Jun 25 09:31:34 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Condition_Attributes.h:
-        * ace/Condition_Attributes.inl:
-        * ace/Condition_Attributes.cpp:
-        * ace/Condition_Recursive_Thread_Mutex.h:
-        * ace/Condition_Thread_Mutex.h:
-        * ace/Condition_Thread_Mutex.inl:
-        * ace/ace.mpc:
-        * ace/ace_for_tao.mpc:
-          Moved condition attributes to its own file
-
-Fri Jun 22 00:30:11 UTC 2012  James H. Hill  <hillj at cs dot iupui dot edu>
-
-        * tests/CDR_Test.cpp:
-
-          Fixed compilation warnings on CentOS 3.9 and vc9
-
-Thu Jun 21 17:08:55 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/DLL.h:
-        * ace/DLL_Manager.h:
-        * ace/DLL_Manager.cpp:
-          Changed the order that the ACE_DLL_Manager attempts to open a library
-          Foo so that it will try <prefix>Foo<decorator>.<suffix> before
-          Foo<decorator>.<suffix>. This makes library loading using ACE succeed
-          on the first try instead of the fourth on any platform requiring a
-          library prefix, like Linux. For platforms that don't have a prefix
-          it will also succeed on the first time. Thanks to Trent Nadeau
-          <Trent dot Nadeau at ngc dot com> for providing this improvement
-
-Wed Jun 20 12:54:29 UTC 2012  James H. Hill  <hillj at cs dot iupui dot edu>
-
-        * tests/CDR_Test.cpp:
-
-          Fixed error in test execution.
-
-Mon Jun 18 20:40:29 UTC 2012  James H. Hill  <hillj at cs dot iupui dot edu>
+Mon Nov 10 15:45:42 UTC 2014  Johnny Willemsen  <willemsen_j@remedy.nl>
 
         * ace/CDR_Stream.h:
-        * ace/CDR_Stream.cpp:
-        * tests/CDR_Test.cpp:
-
-          Extended ACE_OutputCDR placeholders to support all ACE_CDR
-          simple types.
-
-Mon Jun 18 13:20:32 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/auto_run_tests.pl:
-          Use -z for debug mode
-
-Mon Jun 18 06:44:11 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * debian/*:
-          Updated with latest files from debian packaging
-
-Thu Jun 14 14:05:13 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/XML_Utils/XML_Error_Handler.cpp:
-          Only print errors on cerr when we have ACE::debug enabled
-
-Wed Jun 13 05:57:16 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/bczar/bczar.html:
-          Added another package
-
-Tue Jun 12 17:30:47 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/make_release.py:
-          Exclude CIAO_*_OpenDDS workspaces for the moment
-
-Mon Jun 11 21:45:19 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * NEWS:
-        * ace/config-lite.h:
-        * include/makeinclude/platform_sunos5_sunc++.GNU:
-
-          Added support for Oracle Solaris Studio 12 Update 3 (SunCC 5.12).
-
-Mon Jun 11 17:05:36 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/auto_run_tests.pl:
-          Added option -d to run OpenDDS tests also
-
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-          Also check OpenDDS lst files
-
-Thu Jun  7 10:13:13 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Condition_Thread_Mutex.h:
-        * ace/Dynamic_Message_Strategy.h:
-        * ace/Message_Queue.h:
-        * ace/Metrics_Cache_T.h:
           Doxygen fixes
 
-Wed Jun  6 14:46:53 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Nov 10 12:39:18 UTC 2014  Martin Corino  <mcorino@remedy.nl>
 
-        * ace/XML_Utils/XSCRT/Traversal.hpp:
-        * ace/XML_Utils/XSCRT/Traversal.tpp:
-          Readded tpp file, shouldn't have been deleted
+        * NEWS:
+          Updated.
 
-Wed Jun  6 13:09:02 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Nov  6 19:45:38 UTC 2014  Johnny Willemsen  <willemsen_j@remedy.nl>
 
-        * ace/XML_Utils/XMLSchema/Traversal.hpp:
-        * ace/XML_Utils/XMLSchema/Types.hpp:
-        * ace/XML_Utils/XMLSchema/Writer.hpp:
-        * ace/XML_Utils/XSCRT/Elements.hpp:
-        * ace/XML_Utils/XSCRT/Parser.hpp:
-        * ace/XML_Utils/XSCRT/Traversal.hpp:
-        * ace/XML_Utils/XSCRT/Writer.hpp:
-        * ace/XML_Utils/XSCRT/XML.hpp:
-          Removed includes
+        * bin/MakeProjectCreator/config/vc_warnings.mpb:
+          Visual Studio 2013 Update 3 gives a lot of warnings on deprecated
+          ascii winsock calls but they just work, so no need to change our
+          code. Added new feature vc_avoid_winsock_warnings which is enabled
+          by default, this adds _WINSOCK_DEPRECATED_NO_WARNINGS to the
+          compiler falgs. If you want to see all warnings, set
+          vc_avoid_winsock_warnings to 0 in your default.features file before
+          generatin the project files
 
-        * ace/XML_Utils/XMLSchema/Traversal.tpp:
-        * ace/XML_Utils/XMLSchema/Types.tpp:
-        * ace/XML_Utils/XMLSchema/Writer.tpp:
-        * ace/XML_Utils/XSCRT/Elements.tpp:
-        * ace/XML_Utils/XSCRT/Parser.tpp:
-        * ace/XML_Utils/XSCRT/Traversal.tpp:
-        * ace/XML_Utils/XSCRT/Writer.tpp:
-        * ace/XML_Utils/XSCRT/XML.tpp:
-          Removed these files.
+Tue Nov  4 14:37:56 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Jun  6 10:27:33 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * etc/ace_inet.doxygen:
+        * etc/ace_qos.doxygen:
+        * etc/ace_rmcast.doxygen:
+        * etc/ace_ssl.doxygen:
+        * etc/acexml.doxygen:
+          Set UML_LOOK to NO, with UML look all members/methods are shown
+          in the diagrams making them unusable
 
-        * ace/XML_Utils/XML.mpc:
-          Install fixes
+Mon Nov  3 12:50:28 UTC 2014  Martin Corino  <mcorino@remedy.nl>
 
-Wed Jun  6 08:12:22 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/WIN32_Asynch_IO.cpp:
+          Do not pass holder for bytes written when using OVERLAPPED IO.
+          Pass NULL instead. Recommended by MSDN.
 
-        * ace/XML_Utils/XML.mpc:
-          Install fixes
+        * tests/Proactor_File_Test.cpp:
+          Circumvent problems with unreliable Async IO on older Win32
+          (WinXP, Win2003/2008).
 
-Fri Jun  1 12:43:48 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Condition_Thread_Mutex.cpp:
-        * ace/Message_Queue_T.h:
-        * ace/Message_Queue_T.cpp:
-        * ace/Thread_Semaphore.h:
-        * ace/Time_Policy.h:
-        * ace/Timer_Hash_T.h:
-          Doxygen fixes
-
-Thu May 31 14:05:51 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Oct 31 14:10:52 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * rpmbuild/ace-tao.spec:
-          Added new library
+          No need for lsb
 
-Thu May 31 12:31:38 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Oct 31 13:49:11 UTC 2014  Martin Corino  <mcorino@remedy.nl>
 
-        * ace/XML_Utils/XMLSchema:
-        * ace/XML_Utils/XMLSchema/Traversal.hpp:
-        * ace/XML_Utils/XMLSchema/TypeInfo.hpp:
-        * ace/XML_Utils/XMLSchema/Types.hpp:
-        * ace/XML_Utils/XMLSchema/Writer.hpp:
-        * ace/XML_Utils/XMLSchema/id_map.hpp:
-        * ace/XML_Utils/XSCRT:
-        * ace/XML_Utils/XSCRT/Elements.hpp:
-        * ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp:
-        * ace/XML_Utils/XSCRT/Parser.hpp:
-        * ace/XML_Utils/XSCRT/Traversal.hpp:
-        * ace/XML_Utils/XSCRT/Writer.hpp:
-        * ace/XML_Utils/XSCRT/XML.hpp:
-        * ace/XML_Utils/XSCRT/XMLSchema.hpp:
-          Moved these files from DAnCE to ACE
-
-        * ace/XML_Utils/XSCRT/Elements.ipp:
-        * ace/XML_Utils/XSCRT/Parser.ipp:
-        * ace/XML_Utils/XSCRT/Traversal.ipp:
-        * ace/XML_Utils/XSCRT/Writer.ipp:
-        * ace/XML_Utils/XSCRT/XML.ipp:
-          Removed these files.
-
-Thu May 31 09:12:07 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/XML_Utils:
-        * ace/XML_Utils/XML.mpc:
-        * ace/XML_Utils/XML_Error_Handler.h:
-        * ace/XML_Utils/XML_Helper.h:
-        * ace/XML_Utils/XML_Schema_Resolver.h:
-        * bin/MakeProjectCreator/config/ace_xml_utils.mpb:
-          New ACE_XML_Utils library. This is coming from DAnCe and had to
-          move to ACE because it is now used in more places and soon will
-          also be used by OpenDDS
-
-Thu May 31 07:57:59 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/High_Res_Timer.h:
-        * ace/Message_Block.h:
-          Doxygen improvements
-
-        * ace/High_Res_Timer.inl:
-          Use gsf type to prevent overflow
-
-        * docs/bczar/bczar.html:
-          Added some more packages
-
-Thu May 24 14:35:04 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * ace/Cache_Map_Manager_T.cpp (find): Remove extraneous () from
-          'second' - leftover from ACE_Pair days.
-
-        * tests/Cache_Map_Manager_Test.cpp: Add call to the above method.
-
-        * THANKS: Thanks to Milind Pangarkar for the above test, and fix.
-
-Thu May 24 07:58:53 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/High_Res_Timer.h:
-        * ace/config-win32-msvc.h:
-          Documentation updates
-
-        * ace/High_Res_Timer.inl:
-          Layout changes
-
-        * ace/High_Res_Timer.cpp:
-          Use this
-
-Thu May 24 05:56:27 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/MPC.cfg:
-          Added XSC_ROOT
-
-        * bin/valgrind.supp:
-          Simplified this file
-
-Mon May 21 18:05:32 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/INTEGRITY.ld:
-          Removed this file.
-
-Mon May 21 07:15:10 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * NEWS:
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-        * docs/Download.html:
-        * docs/bczar/bczar.html:
-        * etc/index.html:
-          Updated for new release
-
-Sat May 19 14:28:57 CEST 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE version 6.1.2 released.
-
-Thu May 17 16:16:09 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * ACE-INSTALL.html:
-
-          Replaced the make flag static_libs with static_libs_only.
-          Using static_libs implies that both static and shared can
-          be built at the same time, which is not true in general.
-
-Thu May 17 15:42:36 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * ace/Reactor.h: Clarified the timeout conditions on
-          run_reactor_event_loop(). Thank you to Mohsin Zaidi for this
-          clarification.
-
-        * THANKS: Added Mohsin Zaidi to the Hall of Fame.
-
-Wed May 16 17:41:21 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_Thread.cpp (ACE_Thread_ID::to_string): Use string literals
-          for the sprintf formats rather than build them up. Things have
-          simplified to the point we don't need that any longer. Thanks to
-          Rick Ohnemus for providing the patch. Fixes Bugzilla #4021.
-
-Wed May 16 06:44:23 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/WIN32_Asynch_IO.h:
+        * ace/WIN32_Asynch_IO.cpp:
+          Changed ACE_WIN32_Asynch_Write classes to not use shared_write() method
+          for Stream and File IO but use specific write() implementations instead.
+          This fixes Asynch File IO support (specifically writing) for Windows.
+          Fixes Bugzilla #3762 and #3992.
 
+        * tests/Proactor_File_Test.cpp:
         * tests/run_test.lst:
         * tests/tests.mpc:
-        * tests/Bug_4008_Regression_Test.cpp:
-          Removed bug 4008 test, it was testing incorrect assumptions
+          Added new example/regression test for Asynch File IO using Proactor.
 
-Wed May 16 06:42:45 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Oct 29 20:22:38 UTC 2014  Steve Huston  <shuston@riverace.com>
 
-        * ace/Basic_Types.h:
-        * ace/Basic_Types.cpp:
-        * ace/Functor.inl:
-        * ace/High_Res_Timer.inl:
-        * ace/OS_NS_time.h:
-        * ace/OS_NS_time.inl:
-        * tests/Basic_Types_Test.cpp:
-        * tests/Bug_2434_Regression_Test.cpp:
-        * tests/Time_Value_Test.cpp:
-          More cleanup due to removal of NSK
+        * bin/MakeProjectCreator/templates/gnu.mpd: Change LDFLAGS for HP-UX to do install_rpath correctly.
+          Fixes Bugzilla #4170.
 
-        * ace/Basic_Types.inl:
-          Removed this file.
-
-Tue May 15 18:16:09 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ACE.inl:
-        * ace/Atomic_Op_T.h:
-        * ace/Basic_Types.h:
-        * ace/Basic_Types.inl:
-        * ace/Basic_Types.cpp:
-        * ace/CDR_Base.h:
-        * ace/Functor.h:
-        * ace/Functor.inl:
-        * ace/Handle_Set.cpp:
-        * ace/High_Res_Timer.cpp:
-        * ace/Log_Msg.cpp:
-        * ace/Numeric_Limits.h:
-        * ace/OS_NS_Thread.inl:
-        * ace/OS_NS_Thread.cpp:
-        * ace/OS_NS_stdlib.inl:
-        * ace/OS_NS_sys_select.inl:
-        * ace/OS_NS_sys_wait.inl:
-        * ace/OS_NS_time.h:
-        * ace/OS_NS_time.inl:
-        * ace/OS_NS_unistd.inl:
-        * ace/Profile_Timer.cpp:
-        * ace/Sched_Params.cpp:
-        * ace/Stats.cpp:
-        * ace/Task.cpp:
-        * ace/Throughput_Stats.cpp:
-        * ace/Time_Value.h:
-        * ace/Time_Value.inl:
-        * ace/Truncate.h:
-        * ace/UUID.cpp:
-        * ace/os_include/os_pthread.h:
-        * performance-tests/Server_Concurrency/Latency_Stats.h:
-        * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp:
-        * performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp:
-        * performance-tests/UDP/udp_test.cpp:
-        * tests/Atomic_Op_Test.cpp:
-        * tests/Basic_Types_Test.cpp:
-        * tests/CDR_Array_Test.cpp:
-          Removed support for Tandem NSK. That was the last platform that
-          needed the emulated versions of ACE_INT64 and ACE_UINT64, that
-          emulation has now been removed
-
-        * ace/config-tandem-nsk-mips-v2.h:
-        * ace/config-tandem-nsk-mips-v3.h:
-          Removed these files.
-
-Mon May 14 18:48:14 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/Server_Concurrency/Latency_Stats.h:
-          Fixed conversion warnings
-
-Sun May 13 17:13:31 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Sample_History.h:
-        * ace/Sample_History.inl:
-        * ace/Sample_History.cpp:
-          Introduced scale_factor_type traits to handle the fact that the
-          ACE HighResTimer scale factor is now ACE_UINT64
-
-Sun May 13 12:27:03 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/High_Res_Timer.h:
-          Fixed typo
-
-        * ace/Basic_Stats.h:
-        * ace/Basic_Stats.cpp:
-        * ace/Throughput_Stats.h:
-        * ace/Throughput_Stats.cpp:
-          Introduced scale_factor_type traits to handle the fact that the
-          ACE HighResTimer scale factor is now ACE_UINT64
-
-        * ace/Timeprobe_T.cpp:
-          Use correct trait for the scale factor
-
-        * performance-tests/RPC/client.cpp:
-        * performance-tests/SCTP/SOCK_SEQPACK_clt.cpp:
-        * performance-tests/SCTP/SOCK_STREAM_clt.cpp:
-        * performance-tests/Server_Concurrency/Latency_Stats.h:
-        * performance-tests/TCP/tcp_test.cpp:
-          Use ACE_High_Res_Timer::global_scale_factor_type
-
-Sat May 12 11:11:45 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Time_Value.h:
-        * ace/Time_Value.cpp:
-          None of the windows compilers define ACE_LACKS_LONGLONG_T
-
-        * ace/High_Res_Timer.h:
-        * ace/High_Res_Timer.inl:
-        * ace/High_Res_Timer.cpp:
-          Integrated patches from bugzilla 3703 increasing the precision
-          of the high resolution timers on windows
-
-Sat May 12 11:03:57 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ASNMP/asnmp/transaction.cpp:
-        * Kokyu/Dispatch_Deferrer.cpp:
-          Compare return value of schedule_timer with -1
-
-        * ace/OS_NS_time.h:
-          None of the windows compilers define ACE_LACKS_LONGLONG_T
-
-        * bin/PerlACE/TestTarget_WinCE.pm:
-          Typo fix
-
-Sat May 12 11:01:50 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-win32-common.h:
-          None of the windows compilers define ACE_LACKS_LONGLONG_T
-
-Sat May 12 10:54:24 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Numeric_Limits.h:
-          Fixed typo
-
-Fri May 11 17:42:08 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * ace/Dev_Poll_Reactor.cpp (mask_ops_i): Return -1 if epoll_ctl
-          fails and we don't recover from it. Fixes Bugzilla #4019. Thanks
-          to David Simmonds for this fix.
-
-Fri May  4 17:25:53 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Acceptor.cpp:
-          Fixed incorrect check of the return value of schedule_timer,
-          an error is indicated with -1, not 0. Thanks to Deux deVille
-          <dev2 at weitling dot net> for reporting this
-
-Thu May  3 07:15:54 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_3673_Regression_Test.cpp:
-          Fixed typo
-
-Wed May  2 18:36:25 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_math.h:
-          Fixed compile warning with WinCE
-
-Wed May  2 17:08:28 UTC 2012  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * THANKS:
-
-          Added Markus Manck <Markus dot Manck at Philotech dot de>
-
-Tue May  1 17:38:13 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_mpc_auto_compile.pl:
-          Added -project_root to override $ACE_ROOT as root to search for
-          solutions. This is needed when using this script in a flat directory
-          layout
-
-Tue May  1 12:52:45 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_sys_time.cpp:
-        * ace/config-win32-msvc-10.h:
-        * ace/config-win32-msvc-8.h:
-        * ace/config-win32-msvc-9.h:
-          WinCE also has non conformant timeval. When _USE_32BIT_TIME_T is not
-          defined we have to use our workaround in all cases
-
-Tue May  1 11:42:22 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_stat.h:
-          Fixed compile error
-
-Tue May  1 10:25:37 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_stat.h:
-          Compile fix for WinCE 7
-
-Tue May  1 07:48:30 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Mem_Map.cpp:
-          Layout changes
-
-        * ace/config-win32-msvc-9.h:
-          Removed wince comment
-
-Sun Apr 29 19:17:29 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_mpc_auto_compile.pl:
-          More improvements to this script
-
-Sun Apr 29 19:01:08 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_mpc_auto_compile.pl:
-          Support flat layout
-
-Fri Apr 27 18:43:31 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/msvc_mpc_auto_compile.pl:
-          Corrected output messages
-
-Fri Apr 27 18:40:51 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_time.h:
-        * ace/config-win32-msvc-9.h:
-          First fixes for WinCE 7
-
-Wed Apr 25 07:02:16 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Get_Opt.cpp:
-          Reverted Wed Apr 18 08:51:31 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-Tue Apr 24 01:18:27 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/String_Base.h (template): Zapped the 'explicit' keywords
-          introduced by the change in
-
-          Tue Apr 17 19:09:30 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-          since it was breaking too much code.
-
-Wed Apr 18 08:51:31 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/String_Base.h:
-          Reverted 'explicit' declaration for single arg constructor for
-          const ACE_TCHAR* as implicit conversion of this arg type to
-          ACE string class is the expected behaviour (similar to the
-          STL std::string).
-
-        * ace/Get_Opt.cpp:
-          Introduced explicit ACE_CString constructor call for single
-          arg ACE_TCHAR (not pointer) constructor.
-
-Wed Apr 18 06:31:56 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Future.cpp:
-          Fixed commented out guard. Thanks to Andreas Dröscher
-          <ace at anticat dot ch> for reporting this.
-
-Tue Apr 17 19:09:30 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/String_Base.h: Made the single parameter constructors
-          explicit to avoid problems with implict conversions.  Thanks to
-          Adam Rymarczuk <adam dot rymarczuk at suntradingllc dot com> for
-          reporting this.
-
-Thu Apr 12 11:25:25 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_linux_icc.GNU:
-          Added support for c++0x
-
-Tue Apr 10 20:09:23 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Dev_Poll_Reactor.cpp (ACE_Dev_Poll_Reactor::resumable_handler):
-          Changed this method to return 1 instead of 0.  Thanks to David
-          Simmonds <david dot simmonds at iggroup dot com> for providing
-          this fix.  This fixes bugid 4015.
-
-          Added David to the ACE hall of fame.
-
-Tue Apr 10 20:10:06 UTC 2012  Adam Mitz  <mitza@ociweb.com>
+Tue Oct 28 09:51:14 UTC 2014  Martin Corino  <mcorino@remedy.nl>
 
+        * bin/MakeProjectCreator/docs/templates/gnu.txt:
         * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Install the Inline_Files even with inline=0.  Many of these files
-          are still needed, especially *_T.inl.  This resolves bug #4002.
-
-Mon Apr  9 21:57:39 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * ace/Timer_Queue_T.cpp (calculate_timeout): Lock the mutex before
-          accessing timer queue elements to calculate the timeout. Thanks to
-          Kannan Ramaswamy for this fix.
-
-Sun Apr  8 14:25:23 UTC 2012  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/ace.mpc:
-
-          Move ace_wchar.inl to the header section so that it is always
-          installed even when the library is built with inline=0. This is
-          required because ace_wchar is always inlined.
-
-Fri Apr  6 11:58:40 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Download.html:
-          Added another rpm
-
-Fri Apr  6 10:48:03 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * NEWS:
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-        * docs/Download.html:
-        * docs/bczar/bczar.html:
-        * etc/index.html:
-          Updated for next release
-
-Fri Apr 06 09:03:19 CEST 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE version 6.1.1 released.
-
-Tue Apr  3 22:49:11 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * ace/SOCK_Dgram_Mcast.cpp (subscribe_ifs): Set the error code when
-          a Windows API call fails. Also, when calling GetAdaptersAddresses()
-          to both check size and get the info, supply GAA_FLAG_SKIP_MULTICAST
-          as the flag value. This avoids obtaining info for joined multicast
-          addresses, not multicastable interfaces. Without the flag, and if
-          some other process does a join between the size-check call and the
-          info-gathering call, the size will be wrong.
-
-Tue Apr  3 17:01:33 UTC 2012  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * THANKS:
-
-          Added Thomas Stegemann <Thomas dot Stegemann at materna dot de>.
-
-Tue Apr  3 16:18:35 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/ACE.cpp (ACE::timestamp): Fixed an "off-by-one" error that
-          caused corruption of timestamps when using
-          ACE_LOG_TIMESTAMP="TIME" env var.  Thanks to Andrea Sormanni
-          <andrea dot sormanni at gmail dot com> for reporting this and
-          providing a fix.
-
-          Added Andrea to the Hall of Fame!
-
-Fri Mar 30 14:33:58 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: Changed
-          use of ::sscanf_s() to only those platforms with the setting
-          ACE_HAS_TR24731_2005_CRT (VC8 and up).
-
-Fri Mar 30 13:39:25 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * include/makeinclude/platform_win32_msvc.GNU:
-
-          Added iphlpapi to the list of system libraries.
-
-Thu Mar 29 21:50:17 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Postbuild steps need a dependency on the executable or library
-          so that parallel make will run them at the right time.
-
-Wed Mar 28 22:03:45 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: Changed
-          the +H handle value scan to know this is a hex value on Windows, but
-          a decimal value on everything else. Thanks to Andy Gokhale for this.
-
-Wed Mar 28 21:44:20 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * tests/Multicast_Test.cpp: Removed the forced set_nic to "lo" for
-          Linux. It's not needed with the changes from:
-          Wed Mar 21 21:57:40 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-Mon Mar 26 11:27:11 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_mingw32.GNU:
-          Added iphlpapi
-
-Sat Mar 24 21:53:13  UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * ace/SOCK_Dgram_Mcast.cpp (subscribe_ifs): For Windows, handle IPv6
-          and IPv4 differently. The make_multicast_ifaddr() call that will end
-          up being made for IPv4 wants the interface's IP address, not name.
-
-        * bin/MakeProjectCreator/config/acedefaults.mpb:
-        * bin/MakeProjectCreator/config/ipv6.mpb: Moved the lit_lib for iphlpapi
-          on Windows from the IPv6 base to acedefaults. SOCK_Dgram_Mcast.cpp
-          uses it for both IPv4 and IPv6 now.
-
-Fri Mar 23 22:06:11 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * ace/WIN32_Asynch_IO.cpp: Fixed possible heap corruption in
-          ACE_SOCK_Dgram_Read_Dgram::recv(). Thank you to
-          Dmytro Ovdiienko <dmitriy.ovdienko@gmail.com> for unconvering this.
-
-        * THANKS: Added Dmytro to the Hall of Fame.
-
-Thu Mar 22 16:23:14 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * ace/SOCK_Dgram_Mcast.h: Corrected the description of conditions
-          under which using OPT_NULLIFACE_ALL works and neatened things up.
-
-        * tests/Multicast_Test.cpp: Turn on IP_MULTICAST_LOOP all the time.
-          This test requires it and it's not universally the default.
-
-Thu Mar 22 13:03:46 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ARGV.cpp:
-        * ace/Acceptor.cpp:
-        * ace/Asynch_Acceptor.cpp:
-        * ace/Cached_Connect_Strategy_T.cpp:
-        * ace/Lib_Find.cpp:
-        * ace/Strategies_T.cpp:
-        * ace/Timer_Heap_T.cpp:
-          Fixed coverity errors
-
-Wed Mar 21 21:57:40 UTC 2012  Steve Huston  <shuston@riverace.com>
-
-        * ace/SOCK_Dgram_Mcast.cpp (subscribe_ifs): Expanded the use of
-          code to scan interfaces to be always, not just for IPv6, when
-          subscribing with OPT_NULLIFACE_ALL and no specific interface.
-          Also replaced use of ACE_OS::if_nameindex with getifaddr() when
-          it's available (which was only on Linux anyway) so checks
-          for interface up and multicastable can be made before joining.
-          The code now works for systems with ACE_HAS_GETIFDADDR (incl.
-          Linux, which was my main issue driving this) and Win32. The others
-          end up in the old get_ip_interfaces code which will never work
-          anywhere as far as I can tell because it tries to subscribe to an
-          interface named with the IP address in string form.
-
-        * tests/Multicast_Test.cpp: Removed hack force of interface "lo0"
-          on join(). No need for that with the fix above. For background, this
-          was added at:
-          Thu Jan 21 15:25:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Sock_Connect.cpp (get_ip_interfaces_getifaddr): Will no longer
-          return an interface marked 'down'. Partially fixes Bugzilla #1990
-          but other platform-specific changes are needed to resolve it
-          completely.
-
-Sat Mar 17 12:16:15 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Download.html:
-          Added link to the mailing lists with an advice for people to subscribe
-
-Sat Mar 17 12:11:15 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/cleanbuilds.sh:
-        * bin/diff-builds.pl:
-          Updated teststat links
-
-Wed Mar 14 10:04:06 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Download.html:
-          Added link to ORBZone as community site for CORBA/CCM
-
-        * tests/run_test.lst:
-          Mark 4008 as not fixed
-
-Tue Mar 13 11:24:33 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Service_Gestalt.cpp:
-          Reverted change below, breaks Missing_Svc_Conf_Test test
-
-Tue Mar 13 09:36:18 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Service_Gestalt.cpp:
-          Fixed bugzilla 4008, thanks to Derek Dominish
-          <derek dot dominish at dsto dot defence dot gov dot au> for
-          creating the fix
-
-Tue Mar 13 09:29:56 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_4008_Regression_Test.cpp:
-        * tests/run_test.lst:
-        * tests/tests.mpc:
-          New test for bugzilla 4008. Thanks to Derek Dominish
-          <derek dot dominish at dsto dot defence dot gov dot au> for
-          creating this test
-
-Mon Mar 12 20:22:17 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * include/makeinclude/rules.local.GNU:
-
-          Revert this part of Friday's change, with a comment added
-          to describe why this use of 'pwd' is different.
-
-Fri Mar  9 20:38:22 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * include/makeinclude/rules.lib.GNU:
-
-          When creating an archive library, use all object files instead of
-          just modified object files.  This fixes a bug that can occur when
-          two different subdirectories have objects files with the same name.
-          The archive dosn't track directory names so "replacing" one changed
-          object could actually be clobbering another one.
-
-        * include/makeinclude/rules.local.GNU:
-
-          Use the $(PWD) make variable for current directory.
-
-Wed Mar  7 14:58:07 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Download.html:
-          Added new download link for latest minor with versioned namespaces
-
-Wed Mar  7 14:37:18 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao.spec:
-          Fix for ppc64
-
-Wed Mar  7 13:31:58 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Base_Thread_Adapter.h:
-        * ace/Base_Thread_Adapter.cpp:
-        * ace/ETCL/ETCL_Constraint.inl:
-        * ace/Module.cpp:
-        * ace/Stream.cpp:
-        * ace/Thread_Manager.h:
-        * ace/Timer_Hash_T.cpp:
-          Fixed coverity errors
-
-Wed Mar  7 10:55:28 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao.spec:
-          Added new libraries
-
-Wed Mar  7 10:02:49 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * NEWS:
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-        * docs/Download.html:
-        * docs/bczar/bczar.html:
-        * etc/index.html:
-          Updated for release
-
-Wed Mar 07 09:04:40 CET 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE version 6.1.0 released.
-
-Sat Mar  3 20:48:15 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Thread_Manager.cpp:
-          Coverity fix
-
-Sat Mar  3 20:45:30 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Event_Handler_Handle_Timeout_Upcall.cpp:
-          Coverity fix
-
-Sat Mar  3 20:22:09 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Compression/rle/RLECompressor.h:
-          Fixed export macro
-
-Fri Mar  2 12:41:21 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Compression/rle/RLECompressor.h:
-          Fixed export macro
-
-Wed Feb 29 16:30:00 UTC 2012  Simon Massey <simon dot massey at prismtech dot com>
-
-        * ace/CDR_Stream.cpp:
-          Allow strings to be indirected (required for ValueType RepoIDs).
-
-Wed Feb 29 07:25:21 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Handle_Set.cpp:
-        * ace/Select_Reactor_Base.cpp:
-        * ace/Service_Types.cpp:
-          Fixed coverity errors
-
-Tue Feb 28 14:35:36 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Process.cpp:
-          Fixed coverity error
-
-Tue Feb 28 03:27:28 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        *
-          apps/JAWS3/jaws3/Reactive_IO.cpp (JAWS_IO_Reactive_Transmit::handle_output_source):
-          Check mb == 0 before using it.  Thanks to Andrey Karpov <karpov
-          at viva64 dot com> for reporting this.
-
-Tue Feb 28 03:18:56 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Throughput_Stats.cpp (ACE_Throughput_Stats::sample): Zapped
-          a redundant else statement.  Thanks to Andrey Karpov <karpov at
-          viva64 dot com> for reporting this.
-
-Tue Feb 28 03:15:37 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * protocols/ace/INet/URLBase.cpp (ACE): Changed
-
-          if (pos > 0 && url_string[pos+1] == '/' && url_string[pos+1] == '/')
-
-          to
-
-          if (pos > 0 && url_string[pos+1] == '/' && url_string[pos+2] == '/')
-
-          Thanks to Andrey Karpov <karpov at viva64 dot com> for reporting
-          this.
-
-Mon Feb 27 08:11:06 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Compression/rle/RLECompressor.h:
-          Doxygen fix
-
-        * ace/Compression/rle/RLECompressor.cpp:
-          Fixed gcc warning
-
-Fri Feb 24 09:19:40 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Compression/Compressor.h:
-          Fixed compile warning
-
-Fri Feb 24 09:14:22 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Compression/Compressor.h:
-        * ace/Compression/Compressor.cpp:
-        * ace/Compression/rle/RLECompressor.h:
-        * ace/Compression/rle/RLECompressor.cpp:
-          Added virtual destructors
-
-Fri Feb 24 08:45:08 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Compression/ACE_Compression.mpc:
-        * ace/Compression/rle/ACE_RLECompression.mpc:
-          Fixed id and install problems
-
-        * bin/fuzz.pl:
-          Extended check for incorrect id tags
-
-Thu Feb 23 08:20:56 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Compression/Compressor.h:
-        * ace/Compression/rle/RLECompressor.h:
-        * bin/MakeProjectCreator/config/ace_compressionlib.mpb:
-        * bin/MakeProjectCreator/config/ace_rlecompressionlib.mpb:
-          Fuzz fixes
-
-Thu Feb 23 07:52:58 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Compression:
-        * ace/Compression/ACE_Compression.mpc:
-        * ace/Compression/ACE_Compression_export.h:
-        * ace/Compression/Compressor.h:
-        * ace/Compression/Compressor.inl:
-        * ace/Compression/Compressor.cpp:
-        * ace/Compression/rle:
-        * ace/Compression/rle/ACE_RLECompression.mpc:
-        * ace/Compression/rle/ACE_RLECompression_export.h:
-        * ace/Compression/rle/RLECompressor.h:
-        * ace/Compression/rle/RLECompressor.cpp:
-        * bin/MakeProjectCreator/config/ace_compressionlib.mpb:
-        * bin/MakeProjectCreator/config/ace_rlecompressionlib.mpb:
-          Added new ACE compression and rle compressor libraries. This code
-          was first part of TAO, but now moved to ACE because it provides
-          a basic run length encoding compressor that makes it possible to
-          compress data without depending on any external library
-
-        * docs/bczar/bczar.html:
-          Added package
-
-Tue Feb 21 14:52:02 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * ace/OS_NS_Thread.inl:
-        * ace/config-vxworks6.9.h:
-
-          Fixed errors from fuzz script.
-
-Tue Feb 21 14:37:47 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * PROBLEM-REPORT-FORM:
-          Removed build method question
-
-Fri Feb 17 23:10:37 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * NEWS:
-        * ace/Message_Queue_T.cpp:
-        * ace/Message_Queue_Vx.cpp:
-        * ace/OS_NS_Thread.inl:
-        * ace/OS_NS_arpa_inet.cpp:
-        * ace/OS_NS_unistd.inl:
-        * ace/Stack_Trace.cpp:
-        * ace/config-vxworks.h:
-        * ace/config-vxworks6.9.h:
-        * ace/os_include/sys/os_types.h:
-        * include/makeinclude/platform_vxworks.GNU:
-        * include/makeinclude/platform_vxworks6.9.GNU:
-        * tests/Bug_3943_Regression_Test.cpp:
-
-          Added support for VxWorks version 6.9.
-
-Tue Feb 14 22:57:00 UTC 2012  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * ace/ACE.cpp:
-        * ace/Dev_Poll_Reactor.cpp:
-        * ace/Handle_Set.cpp:
-        * ace/High_Res_Timer.h:
-        * ace/High_Res_Timer.cpp:
-        * ace/INET_Addr.h:
-        * ace/INET_Addr.cpp:
-        * ace/Monitor_Control/Bytes_Received_Monitor.h:
-        * ace/Monitor_Control/Bytes_Received_Monitor.cpp:
-        * ace/Monitor_Control/Bytes_Sent_Monitor.h:
-        * ace/Monitor_Control/Bytes_Sent_Monitor.cpp:
-        * ace/Monitor_Control/CPU_Load_Monitor.h:
-        * ace/Monitor_Control/CPU_Load_Monitor.cpp:
-        * ace/Monitor_Control/Linux_Network_Interface_Monitor.h:
-        * ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp:
-        * ace/Monitor_Control/Num_Threads_Monitor.h:
-        * ace/Monitor_Control/Num_Threads_Monitor.cpp:
-        * ace/Monitor_Control/Packets_Received_Monitor.h:
-        * ace/Monitor_Control/Packets_Received_Monitor.cpp:
-        * ace/Monitor_Control/Packets_Sent_Monitor.h:
-        * ace/Monitor_Control/Packets_Sent_Monitor.cpp:
-        * ace/OS_NS_netdb.cpp:
-        * ace/OS_NS_sys_socket.h:
-        * ace/OS_NS_sys_socket.inl:
-        * ace/OS_NS_time.inl:
-        * ace/OS_NS_unistd.inl:
-        * ace/SOCK_Dgram.cpp:
-        * ace/SOCK_Dgram_Mcast.cpp:
-        * ace/Select_Reactor_T.cpp:
-        * ace/config-linux.h:
-        * ace/os_include/os_pthread.h:
-        * apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h:
-        * examples/APG/Signals/SigInfo.cpp:
-        * tests/INET_Addr_Test_IPV6.cpp:
-        * tests/MT_Reference_Counted_Event_Handler_Test.cpp:
-        * tests/Malloc_Test.cpp:
-        * tests/Multicast_Test.cpp:
-        * tests/Naming_Test.cpp:
-        * tests/Proactor_Test.cpp:
-        * tests/Proactor_Test_IPV6.cpp:
-        * tests/Proactor_UDP_Test.cpp:
-        * tests/Process_Test.cpp:
-        * tests/SSL/Bug_2912_Regression_Test.cpp:
-
-          Created a new macro, ACE_LINUX, which replaces all non-standard
-          tests for linux, __linux, and __linux__.
-
-Mon Feb 13 16:38:15 UTC 2012  Adam Mitz  <mitza@ociweb.com>
-
-        * include/makeinclude/platform_gnuwin32_common.GNU:
-
-          Set DCCFLAGS and OCCFLAGS to get debug=X and optimize=X to work.
-
-Tue Feb  7 12:56:41 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/XtReactor/XtReactor.cpp:
-          Use C++ cast to silence warning
-
-Tue Jan 31 20:19:16 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Web_Crawler/Iterators.cpp:
-        * performance-tests/Misc/context_switch_time.cpp:
-          Fixed gcc 4.7 warning
-
-Tue Jan 31 20:17:35 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp:
-          Fixed gcc 4.7 warning
-
-Mon Jan 30 09:48:00 UTC 2012  Simon Massey  <simon dot massey at prismtech dot com>
-
-        * ace/Default_Constants.h:
-          Redefined ACE_MAX_UDP_PACKET_SIZE to 65507 bytes. The actual field size
-          sets a theoretical limit of 65,535 bytes (so 65536 was completly wrong)
-          which is composed of 8 byte header +65,527 bytes of data for a UDP datagram.
-          However the practical limit for the data length which is imposed by the
-          underlying IPv4 protocol is only 65,507 bytes (65507 bytes of data +8 bytes
-          UDP header +20 bytes IP header).
-
-Fri Jan 27 09:39:57 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/FlReactor/FlReactor.cpp:
-          Const change
-
-        * bin/valgrind.supp:
-          Added another suppress
-
-Fri Jan 27 09:01:51 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * NEWS:
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-        * bin/make_release.py:
-        * docs/Download.html:
-        * docs/bczar/bczar.html:
-        * etc/index.html:
-          Updated for next release
-
-Fri Jan 27 08:58:54 CET 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE version 6.0.8 released.
-
-Thu Jan 26 20:38:47 UTC 2012  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Condition_T.cpp:
-
-          In order to allow building with inlining on MacOSX Lion,
-          Condition_T.cpp needs to explicitly include Time_Value.h. In many
-          cases, Time_Value.h was being incidentally included, such as
-          through Atomic_Op_GCC_T.cpp, but that is specifically excluded for
-          Lion builds using the clang compiler.
-
-Tue Jan 24 16:44:22 UTC 2012  Chip Jones  <jonesc@ociweb.com>
-
-        * NEWS:
-          Added information about IDL dependency generation.
-
-Tue Jan 24 15:26:24 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/conv_lib.mpb:
-          Fixed cleanup bug
-
-Tue Jan 24 14:40:00 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/fuzz.pl:
-          Can't check mpc files, when they contain gnuace specific stuff they
-          need tabs
-
-Tue Jan 24 14:29:18 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/fuzz.pl:
-          Fixed problem
-
-Tue Jan 24 13:52:20 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/fuzz.pl:
-          Also check mpc files for tabs
-
-Tue Jan 24 13:48:49 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/HTTPU/httpu.mpc:
-        * apps/JAWS2/JAWS/jaws2.mpc:
-        * apps/JAWS3/jaws3/jaws3.mpc:
-        * apps/gperf/tests/gperf_test.mpb:
-        * bin/MakeProjectCreator/config/ace_bzip2.mpb:
-        * bin/MakeProjectCreator/config/ace_fl.mpb:
-        * bin/MakeProjectCreator/config/ace_fox.mpb:
-        * bin/MakeProjectCreator/config/ace_openssl.mpb:
-        * bin/MakeProjectCreator/config/ace_output.mpb:
-        * bin/MakeProjectCreator/config/ace_qt.mpb:
-        * bin/MakeProjectCreator/config/ace_tk.mpb:
-        * bin/MakeProjectCreator/config/ace_x11.mpb:
-        * bin/MakeProjectCreator/config/ace_xt.mpb:
-        * bin/MakeProjectCreator/config/ace_zlib.mpb:
-        * bin/MakeProjectCreator/config/ace_zzip.mpb:
-        * bin/MakeProjectCreator/config/acedefaults.mpb:
-        * bin/MakeProjectCreator/config/conv_lib.mpb:
-        * bin/MakeProjectCreator/config/wxwindows.mpb:
-        * netsvcs/servers/servers.mpc:
-        * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc:
-        * performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc:
-        * tests/tests.mpc:
-          Removed left over from automake removal
-
-Tue Jan 24 13:31:49 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Reactor/WFMO_Reactor/Network_Events.cpp:
-          Fixed gcc warning
-
-Mon Jan 23 20:21:50 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-          Fixed support for idl3toxmi and idl3toidl2 flags
-
-Mon Jan 23 12:02:07 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-          Added support for idl3toxmi and idl3toidl2 flags
-
-Sun Jan 22 19:41:27 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Reactor/WFMO_Reactor/APC.cpp:
-        * examples/Reactor/WFMO_Reactor/Abandoned.cpp:
-        * examples/Reactor/WFMO_Reactor/Directory_Changes.cpp:
-        * examples/Reactor/WFMO_Reactor/Handle_Close.cpp:
-        * examples/Reactor/WFMO_Reactor/Network_Events.cpp:
-        * examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp:
-        * examples/Reactor/WFMO_Reactor/Registration.cpp:
-        * examples/Reactor/WFMO_Reactor/Registry_Changes.cpp:
-        * examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp:
-        * examples/Reactor/WFMO_Reactor/Talker.cpp:
-        * examples/Reactor/WFMO_Reactor/Window_Messages.cpp:
-          Fixed GCC 4.6.2 release warnings
-
-Sun Jan 22 12:35:11 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/make_release.py:
-          Use the new MPC -workers option to speedup the release process
-
-Fri Jan 20 19:30:51 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/APG/Processes/Process_Mutex.cpp:
-          Use ACE_TEST_ASSERT instead of ACE_ASSERT to fix warnings in gcc 4.6
-          release builds
-
-Fri Jan 20 19:06:02 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/APG/Containers/Allocator.cpp:
-        * examples/Reactor/Misc/test_timer_queue.cpp:
-          Use ACE_TEST_ASSERT instead of ACE_ASSERT to fix warnings in gcc 4.6
-          release builds
-
-Wed Jan 18 09:02:18 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/fuzz.pl:
-          Added suppress option to selectively disable checks.
-
-Tue Jan 17 17:36:31 UTC 2012  Chip Jones  <jonesc@ociweb.com>
-
-        * include/makeinclude/rules.local.GNU:
-          Fixed 'no filename for -include' warning.
-
-Mon Jan 16 21:58:44 UTC 2012  Chip Jones  <jonesc@ociweb.com>
-
-        * bin/DependencyGenerator/GNUIDLDependencyWriter.pm:
-        * bin/DependencyGenerator/GNUIDLObjectGenerator.pm:
-        * bin/MakeProjectCreator/config/ace_idl_dependencies.mpb:
-
-          Added these files to support generation of IDL dependencies
-          for gnuace projects.
-
-        * bin/MakeProjectCreator/config/acedefaults.mpb:
-        * bin/MakeProjectCreator/config/global.features:
-
-          Added IDL dependency as a feature defaulted to off.
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Modified gnuace template to generate IDL dependency rules.
-
-        * include/makeinclude/rules.common.GNU:
-        * include/makeinclude/rules.local.GNU:
         * include/makeinclude/wrapper_macros.GNU:
+          Added (optional) support for per project output directories for
+          object files. Fixes Bugzilla #3868.
 
-          Added depend_idl.local rule.
+Tue Oct 28 08:00:15 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          This is a merge of work done in the 'ace-mpc_performance'
-          branch.
+        * tests/Bug_4189_Regression_Test.cpp:
+          Use PF_INET, that is the default argument of ACE_SOCK_Dgram_Bcast
 
-Mon Jan 16 10:33:37 UTC 2012  Martin Corino  <mcorino@remedy.nl>
+Mon Oct 27 18:06:17 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/config-win32-common.h:
-        * ace/config-win32-mingw.h:
-          Moved MinGW specific block to common because the macros
-          it concerns are tested there already.
+          Don't define SO_REUSEPORT when it is not defined, the code
+          that uses this as argument to call ACE_OS::setsockopt only works
+          when this has been defined. Defining it here to a dummy value
+          causes us to call the Windows API with an invalid argument
 
-Mon Jan 16 09:01:20 UTC 2012  Martin Corino  <mcorino@remedy.nl>
+Mon Oct 27 12:32:17 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-win32-mingw.h:
-          Fixed incorrectly placed macro test.
-
-Sun Jan 15 19:15:48 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-win32-mingw.h:
-          Add some customizations and corrections to support using
-          --std=c++0x with MinGW32.
-
-Fri Jan 13 23:25:59 UTC 2012  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * THANKS:
-
-          Added Michael Frommberger <michael dot frommberger at gmx dot net>
-
-Wed Jan 11 20:43:47 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-freebsd.h:
         * ace/config-win32-common.h:
-        * ace/config-win32-mingw.h:
-        * ace/os_include/os_signal.h:
-          Added ACE_LACKS_SIGSET_T to be able to distinguish between the
-          type and the functions being provided or not.
+        * ace/os_include/sys/os_types.h:
+          Introduce new ACE_LACKS_PID_T which is set on Windows, but
+          not with MinGW
 
-Wed Jan 11 18:43:50 UTC 2012  Martin Corino  <mcorino@remedy.nl>
+Mon Oct 27 07:57:57 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-win32-mingw.h:
-          Fixed typo.
+        * ace/OS_NS_sys_socket.inl:
+          Removed the ignore of SO_REUSEADDR on windows, this is needed
+          for ACE_SOCK_Dgram_Bcast to work, see bugzilla 4189. Also removed
+          the Windows specific change of SO_REUSEPORT to SO_REUSEADDR, this
+          are different flags that we should not merge at this level.
 
-Wed Jan 11 15:41:00 UTC 2012  Simon Massey  <simon dot massey at prismtech dot com>
-
-        * ace/config-sunos5.10.h:
-        Is supposed to define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII and ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII
-        correctly for this platform. The old logic was "If already defined - redefine, but if not
-        defined don't define" and wrong. The point of providing the definition of these SIZE_T format
-        specifiers is to provide them if they are not set.
-
-Wed Jan 11 14:36:43 UTC 2012  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-win32-mingw.h:
-        * ace/os_include/os_signal.h:
-          Changes to support MinGW64 compiler.
-
-Mon Jan  9 11:07:54 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Netlink_Addr.h:
-        * ace/Notification_Queue.h:
-          Doxygen fixes
+Fri Oct 24 18:41:42 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
+        * tests/Bug_4189_Regression_Test.cpp:
         * tests/run_test.lst:
-          Removed several old config labels
-
-Fri Jan  6 11:16:03 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * html/Stats/configuration.shtml:
-        * html/Stats/index.shtml:
-        * html/Stats/simple_footprint.shtml:
-          Extended data to be shown and updated links
-
-Fri Jan  6 10:28:35 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Stream.cpp:
-          Fixed coverity errors
-
-Wed Jan  4 13:02:12 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/generate_compile_stats.sh:
-          Added link for DAnCE
-
-Wed Jan  4 11:45:43 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * html/Stats/index.shtml:
-          Fixed link
-
-Wed Jan  4 11:42:13 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/generate_compile_stats.sh:
-          Work with flat layout and added DAnCE
-
-Wed Jan  4 11:06:50 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/generate_compile_stats.sh:
-          Updated title to include DAnCE
-
-Wed Jan  4 08:50:18 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/cleanbuilds.sh:
-        * bin/mail_test_stats.sh:
-          Accept date and email as arguments
-
-Tue Jan  3 18:47:23 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/performance_stats.sh:
-        * bin/topinfo_iorsize_stats.sh:
-        * bin/topinfo_simple_stats.sh:
-        * bin/topinfo_stats.sh:
-          Assume ACE_ROOT is set before running the script, simplified the usage
-
-Tue Jan  3 18:34:18 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/valgrind.supp:
-          Added default suppress file that can be used for valgrind when using
-          valgrind for ACE/TAO/CIAO/DAnCE
-
-        * docs/bczar/bczar.html:
-          Added package
-
-Tue Jan  3 13:51:18 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/performance_stats.sh:
-          Create source directory
-
-Tue Jan  3 12:52:04 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/performance_stats.sh:
-        * bin/topinfo_iorsize_stats.sh:
-        * bin/topinfo_simple_stats.sh:
-        * bin/topinfo_stats.sh:
-        * bin/footprint_stats.sh:
-          Converting them to support a flat layout
-
-Tue Jan  3 12:40:43 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * html/Stats/detailed_footprint.shtml:
-        * html/Stats/detailed_performance.shtml:
-        * html/Stats/footer.html:
-        * html/Stats/index.shtml:
-        * html/Stats/navigation.html:
-          Updated links, docu, status
-
-        * html/Stats/compilation.shtml:
-          Removed this file.
-
-Sat Dec 31 22:12:53 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Timer_Wheel_T.cpp: Changed the call to "delete root" in the
-          destructor to "this->free_node (root)" so the ACE_Timer_Wheel_T
-          will work properly when provided a custom allocator.  Thanks to
-          Koh <k_onishi at mtj dot biglobe dot ne dot jp> for reporting
-          this bug and providing a fix.
-
-Fri Dec 30 10:13:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-linux.h:
-          Added support for ulibc, thanks to Chong Wuk Pak
-          <chong dot pak at lmco dot com> for providing the patch. This fixes
-          bugzilla 3999
-
-Thu Dec 29 17:29:06 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Mem_Map.cpp (ACE_Mem_Map::map_it): Fixed a missing '('.  Thanks to Johnny for reporting this.
-
-Thu Dec 29 15:14:45 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Mem_Map.cpp (ACE_Mem_Map::map_it): Further improved the
-          error checking.  Thanks to JaeSung Lee <berise at gmail dot
-          com> for suggesting this.
-
-Tue Dec 27 15:19:56 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Mem_Map.cpp (ACE_Mem_Map::map_it): mmap through character
-          device doesn't care about it's size, so map with /dev/* is done
-          with a special case.  Thanks to JaeSung Lee <berise at gmail dot
-          com> for reporting this and providing a fix.
-
-Tue Dec 27 11:39:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * NEWS:
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-        * docs/Download.html:
-        * docs/bczar/bczar.html:
-        * etc/index.html:
-          Updated for next release
-
-Tue Dec 27 10:06:28 CET 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE version 6.0.7 released.
-
-Wed Dec 21 11:25:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Task_Wait_Test.cpp:
-          Fixed compile issue on Solaris 10.
-
-Wed Dec 21 09:41:54 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        * examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp:
-
-          Added timer queue reset on global reactor instance.
-
-Tue Dec 20 15:43:39 UTC 2011  Steve Huston  <shuston@riverace.com>
-
-        * tests/Task_Wait_Test.cpp:
         * tests/tests.mpc:
-        * tests/run_test.lst:
-          New test program that tests the ACE_Thread_Manager::wait() from a
-          called-back ACE_Task::close() on thread exit.
+          New test for bugzilla 4189, on Windows it is not possible
+          at this moment to open a ACE_SOCK_Dgram_Bcast multiple times
+          on the same port, even when reuse_addr has been set to 1
 
-Tue Dec 20 15:36:24 UTC 2011  Steve Huston  <shuston@riverace.com>
+Thu Oct 23 19:41:00 UTC 2014  Steve Huston  <shuston@riverace.com>
 
-        * ace/Thread.inl (disablecancel): Correct size pased to memset.
-        * ace/Thread_Manager.cpp (ACE_Thread_Descriptor::terminate): Don't
-          dereference potentially invalid pointer.
+        * tests/Naming_Test.cpp: Fixed data type warning for conversion on
+          %d formatting for Mingw.
 
-          Resolves Coverity warnings.
+Tue Oct 21 15:45:59 UTC 2014  Phil Mesnier  <mesnier_p@ociweb.com>
 
-Mon Dec 19 19:00:07 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/ETCL/ETCL_l.cpp:
+          Scoreboard cleanup.
+
+Mon Oct 20 15:37:35 UTC 2014  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ACEXML/common/XMLFilterImpl.h:
+        * ACEXML/common/XMLFilterImpl.cpp:
+        * ACEXML/parser/parser/Entity_Manager.h:
+        * ace/ETCL/ETCL_l.cpp:
+        * protocols/ace/RMCast/Flow.h:
+        * protocols/ace/RMCast/Flow.cpp:
+        * protocols/ace/RMCast/Reassemble.h:
+        * protocols/ace/RMCast/Reassemble.cpp:
+        * protocols/ace/TMCast/TransactionController.hpp:
+          Clean up unused member warnings identified by clang 6.0.
+
+        * bin/PerlACE/Process_Unix.pm:
+          increase the valgrind wait factor to accommodate slower machines.
+
+Mon Oct 13 18:59:00 UTC 2014  Steve Huston  <shuston@riverace.com>
+
+        * apps/mkcsregdb/mkcsregdb.cpp: Fix data type error on Windows.
+
+Mon Oct 13 17:24:21 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * docs/bczar/bczar.html:
-          Added another package
+          Added package for killall
 
-Mon Dec 19 13:28:16 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+Sat Oct 11 21:09:07 UTC 2014  Steve Huston  <shuston@.riverace.com>
 
-        * ace/Abstract_Timer_Queue.h:
-        * ace/Timer_Hash_T.h:
-        * ace/Timer_Hash_T.cpp:
-        * ace/Timer_Heap_T.h:
-        * ace/Timer_Heap_T.cpp:
-        * ace/Timer_List_T.h:
-        * ace/Timer_List_T.cpp:
-        * ace/Timer_Queue_Adapters.inl:
-        * ace/Timer_Queue_Adapters.cpp:
-        * ace/Timer_Wheel_T.h:
-        * ace/Timer_Wheel_T.cpp:
+        * ace/Process.cpp (ACE_Process_Options::setenv (const ACE_TCHAR *, ...):
+          Avoid the secret, magic number buried in ACE_OS::vsprintf() for
+          platforms that support ACE_OS::vsnprintf. Allows full use of
+          DEFAULT_COMMAND_LINE_BUF_LEN as well as customizing that value
+          to a higher size. Thanks to John Lilley for this improvement.
 
-          Added close() method.
+Sat Oct 11 20:45:03 UTC 2014  Steve Huston  <shuston@riverace.com>
 
-        * ace/Dev_Poll_Reactor.cpp:
-        * ace/Proactor.cpp:
-        * ace/Select_Reactor_T.cpp:
-        * ace/WFMO_Reactor.cpp:
+        * apps/drwho/File_Manager.cpp: Fixed const-ness compile warning.
 
-          Implemented support for timer queue close ().
+Thu Oct  9 16:21:38 UTC 2014  Steve Huston  <shuston@riverace.com>
 
-        The rationale for these changes is that when using reactors with
-        user defined timer queues the reactor does not delete the timer queue
-        when being deleted itself. Without any other cleanup this created the
-        possibility (as encountered in TAO/tests/Bug_3837_Regression after
-        introduction of the TIME_POLICY changes) of outstanding timer handlers
-        in the queue being triggered and attempting to access the reactor after
-        the reactor has been destroyed.
-        Calling close () for timer queues the reactor does not delete solves
-        this potential problem.
+        * NEWS: Add description of the below changes.
 
-Mon Dec 19 12:12:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/OS_NS_stdlib.{h inl cpp}:
+        * ace/OS_NS_stdio.{h inl}:
+        * ace/README:
+          Added new feature config macros ACE_DISABLE_MKTEMP and
+          ACE_DISABLE_TEMPNAM. These disable the ACE wrappers for
+          mktemp() and tempnam(), respectively. Those functions are
+          considered insecure and better replaced by the use of mkstemp().
 
-        * bin/fuzz.pl:
-          Simplified check
+        * ace/FILE_Addr.cpp (set): Call to set(const ACE_FILE_Addr&) using
+          the default "any" address will now fail if ACE_DISABLE_MKTEMP is
+          set.
 
-Mon Dec 19 09:17:33 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/FILE_Connector.cpp (connect): Specifying 'any' for the
+          address now uses ACE_OS::mkstemp(). Contrast this with setting a
+          ACE_FILE_Addr with 'any', above.
 
-        * ace/ace_for_tao.mpc:
-          Added missing files
+        * ace/MMAP_Memory_Pool.cpp (constructor): Using the 'unique' option
+          will no longer work if ACE_DISABLE_MKTEMP is set.
 
-Sun Dec 18 11:56:00 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/MM_Shared_Memory_Test.cpp:
+          Will not work if ACE_DISABLE_MKTEMP is set.
 
-        * ace/Timer_Queue_T.h:
-          Fixed CentOS warning
+        * tests/Naming_Test.cpp:
+          Changed to avoid use of ACE_OS::tempnam.
 
-Sun Dec 18 11:41:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Svc_Handler_Test.cpp: Modified to work with or without
+          ACE_DISABLE_MKTEMP.
 
-        * ace/ace_for_tao.mpc:
-          Removed obsolete file
+        * apps/mkcsregdb/mkcsregdb.cpp:
+        * apps/drwho/File_Manager.cpp:
+          Use ACE_OS::mkstemp.
 
-Sun Dec 18 11:35:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * examples/OS/Process/imore.cpp:
+        * examples/Service_Configurator/IPC-tests/client/local_dgram_client.cpp:
+          Won't work if ACE_DISABLE_TEMPNAM is set.
 
-        * bin/generate_compile_stats.sh:
-          Fixed incorrect command
+Tue Oct  7 21:55:51 UTC 2014  Steve Huston  <shuston@riverace.com>
 
-Sun Dec 18 10:29:12 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+        Set of changes applicable to VxWorks, particularly 6.9. These changes
+        were contributed by Jeff Fowler and Gordon Hulpieu at NetApp. Feel
+        free to contact me with any issues.
 
-        * ace/Abstract_Timer_Queue.h:
+        * ace/OS_NS_Thread.{h cpp inl}: Change from using the VxWorks TCB
+          spare4 value to a new static member of ACE_TSS_Emulation. This
+          mechanism covers both VxWorks multicore (SMP) using the __thread
+          attribute and single core using Task Var. This change gets ACE out
+          of the way of the applications that use spare4 for their own
+          purposes.
+          Also fixes for various compiler warnings.
 
-          Added missing abstract method dump().
+        * ace/OS_NS_sys_socket.inl (accept): Add IPv6 case to the
+          ACE_HAS_BROKEN_ACCEPT_ADDR case.
 
-Fri Dec 16 08:03:07 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        * ace/config-vxworks6.9.h: Correct the ACE_HAS_BROKEN_ACCEPT_ADDR
+          setting for VxWorks 6.9+.
 
-        * ace/Time_Policy_T.h:
-          No dllimport/export in template classes.
+        * ace/OS_NS_dlfcn.inl (dlsym): For VxWorks, use the symFind() call
+          instead of the deprecated symFindByName().
 
-Thu Dec 15 19:45:30 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Process.cpp: Fix a weird compile diagnostic by adding what should
+          be a needless space.
 
-        * ace/Countdown_Time_T.h:
-          No need for an export macro with a C++ template
+        * include/makeinclude/platform_vxworks6.9.GNU: Update MUNCH_FLAGS
+          for this version.
 
-Thu Dec 15 13:22:07 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+Tue Sep 30 13:34:34 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Event_Handler_Handle_Timeout_Upcall.inl:
-        * tests/Timer_Queue_Test.cpp:
-          Fuzz. Removed tab character
+        * include/makeinclude/platform_g++_common.GNU:
+          Add -Wnon-virtual-dtor to the default CCFLAGS
 
-Thu Dec 15 13:12:39 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+Fri Sep 26 09:58:57 UTC 2014  Olli Savia  <ops@iki.fi>
 
-        * ace/Event_Handler_Handle_Timeout_Upcall.inl:
-        * ace/Event_Handler_Handle_Timeout_Upcall.cpp:
-        * ace/Proactor.cpp:
-        * ace/Timer_Hash.h:
-        * ace/Timer_Hash_T.h:
-        * ace/Timer_Hash_T.cpp:
-        * ace/Timer_Heap.h:
-        * ace/Timer_Heap_T.h:
-        * ace/Timer_Heap_T.cpp:
-        * ace/Timer_List.h:
-        * ace/Timer_List_T.h:
-        * ace/Timer_List_T.cpp:
-        * ace/Timer_Queue_Adapters.cpp:
-        * ace/Timer_Queue_T.h:
-        * ace/Timer_Queue_T.cpp:
-        * ace/Timer_Wheel.h:
-        * ace/Timer_Wheel_T.h:
-          Fuzz. Removed tab character
+        * tests/Message_Block_Large_Copy_Test.cpp:
+          Fixed compile error on LynxOS.
 
-Thu Dec 15 12:52:18 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+Wed Sep 24 19:51:44 CEST 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/Abstract_Timer_Queue.h:
-        * ace/Abstract_Timer_Queue.cpp:
-        * ace/Event_Handler_Handle_Timeout_Upcall.h:
-        * ace/Timer_Queue_Iterator.h:
-        * ace/Timer_Queue_Iterator.cpp:
-          Fuzz. Added Id-tags.
-
-Thu Dec 15 11:00:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        Merged timer_policy branch.
-
-        === start changelog ===
-
-        Thu Dec 15 09:45:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-                * NEWS:
-
-                  Added description of new TIME_POLICY features.
-
-                * tests/Timer_Queue_Test.cpp:
-
-                  Added explicit test of specific TIME_POLICY feature.
-
-        Mon Dec 12 21:28:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-                * ace/Abstract_Timer_Queue.h:
-                * ace/Time_Policy.h:
-                * ace/Time_Policy.inl:
-                * ace/Time_Policy_T.h:
-                * ace/Time_Policy_T.inl:
-                * ace/Timer_Queue_T.cpp:
-                * ace/Timer_Queue_T.h:
-                * tests/Timer_Queue_Test.cpp:
-
-                  Added backwards compatibility support.
-
-        Mon Dec 05 10:26:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-                * ace/Time_Policy.inl
-
-                  Prevent setting delegate to null pointer.
-
-        Sun Dec 04 15:40:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-                * ace/Countdown_Time.cpp:
-                * ace/Countdown_Time.inl:
-
-                  Renamed to *_T.*
-
-                * ace/Countdown_Time.h
-                * ace/Countdown_Time_T.cpp
-                * ace/Countdown_Time_T.h
-                * ace/Countdown_Time_T.inl
-
-                  Changed ACE_Countdown_Time to TIME_POLICY based
-                  template class ACE_Countdown_Time_T,
-                  Created typedef for default template instantiation
-                  as ACE_Countdown_Time.
-
-                * ace/Time_Policy.cpp
-                * ace/Time_Policy.h
-                * ace/Time_Policy.inl
-                * ace/Time_Policy_T.cpp
-                * ace/Time_Policy_T.h
-                * ace/Time_Policy_T.inl
-
-                  Added support for dynamically loadable/shared time
-                  policies.
-
-                * ace/ace.mpc
-
-                  Updated for file changes.
-
-        Fri Dec 02 11:48:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-                * ace/Timer_Queue_T.h:
-                * ace/Timer_Queue_T.inl:
-
-                  Reverting set_time_policy() change. Interpretation error.
-
-        Thu Dec 01 17:52:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-                * ace/Time_Policy.h:
-                * ace/Time_Policy.inl:
-
-                  Added ACE_HR_Time_Policy.
-
-                * ace/Timer_Queue_T.h:
-                * ace/Timer_Queue_T.inl:
-
-                  Replaced set_time_policy() by get_time_policy() since setting
-                  the policy is not possible but configuring might be.
-
-        Thu Dec 01 14:05:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-                * ace/Proactor.cpp:
-                * ace/Timer_Queue_T.cpp:
-                * ace/Timer_Queue_T.h:
-
-                  Fixed compile errors.
-
-        Thu Dec 01 13:34:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-                * ace/Timer_Hash_T.cpp:
-                * ace/Timer_Hash_T.h:
-                * ace/Timer_Heap_T.h:
-                * ace/Timer_Wheel_T.h:
-
-                  Small cleanup to prevent potential compiler warnings.
-
-        Mon Aug 24 02:27:36 UTC 2009  Carlos O'Ryan  <coryan@glamdring>
-
-                * ace/Timer_Queue_T.cpp:
-                  Need to release the internal timer queue lock before dispatching
-                  calls in expire_single(), otherwise we get nasty deadlocks in
-                  the TP_Reactor implementation.
-
-        Thu Jul  2 02:55:09 UTC 2009  Carlos O'Ryan  <coryan@glamdring>
-
-                * ace/Abstract_Timer_Queue.h:
-                * ace/Timer_Queue_T.h:
-                * ace/Timer_Queue_T.inl:
-                * ace/Timer_Queue_T.cpp:
-                  I wanted to use gettimeofday() for the pure virtual function and
-                  some other name for the inline function used in the timer queue
-                  internals.
-                  This is the second and final pass to get that change in.  This
-                  time, I renamed the internal function to gettimeofday_static(),
-                  used the compiler (and grep) to find all uses.  Once that
-                  compiled I renamed the virtual function from
-                  gettimeofday_abstract() to the gettimeofday() function.
-                  I know it is convoluted, but it gets the job done without me
-                  having to think too much.
-
-                * ace/Timer_Hash_T.h:
-                * ace/Timer_Hash_T.cpp:
-                * ace/Select_Reactor_T.cpp:
-                * ace/Dev_Poll_Reactor.cpp:
-                * ace/Proactor.cpp:
-                * ace/Timer_Queue_Adapters.cpp:
-                * tests/Timer_Queue_Reference_Counting_Test.cpp:
-                * tests/Timer_Queue_Test.cpp:
-                * examples/APG/Timers/Timers.cpp:
-                * examples/APG/Timers/TimerDispatcher.cpp:
-                * examples/C++NPv2/Logging_Event_Handler_Ex.cpp:
-                  Fixed users and tests to use the real name for gettimeofday() in
-                  ACE_Abstract_Timer_Queue<>
-
-        Wed Jul  1 02:09:44 UTC 2009  Carlos O'Ryan  <coryan@glamdring>
-
-                * ace/ace.mpc:
-                * ace/Makefile.am:
-                * ace/Event_Handler_Handle_Timeout_Upcall.h:
-                * ace/Event_Handler_Handle_Timeout_Upcall.inl:
-                * ace/Event_Handler_Handle_Timeout_Upcall.cpp:
-                  First I noticed that this class did not depend on the lock type
-                  at all, this was fortunate because I wanted to use it in a
-                  generic way.  So, change the class from a template class to a
-                  regular class.  That required moving the class to its own file too.
-
-                * ace/Timer_List_T.h:
-                * ace/Timer_List_T.cpp:
-                * ace/Timer_Wheel_T.h:
-                * ace/Timer_Wheel_T.cpp:
-                * ace/Timer_Hash_T.h:
-                * ace/Timer_Hash_T.cpp:
-                * ace/Timer_Heap_T.h:
-                * ace/Timer_Heap_T.cpp:
-                  Fixed several inconsistencies across these classes, for example,
-                  most of them had typedef as a shorthand for the base class, but
-                  the name of this typedef was not consistent.
-                  Likewise, not all of the classes made the TIME_POLICY parameter
-                  a default template parameter.
-
-                * ace/Timer_Queue_T.h:
-                * ace/Timer_Queue_T.inl:
-                * ace/Timer_Queue_T.cpp:
-                  Introduced an intermediate class between Abstract_Timer_Queue<>
-                  and Timer_Queue_T<>.  This is ugly, but the Proactor "needs" to
-                  set a back-pointer from the FUNCTOR to the Proacter instance
-                  whenever a timer queue is assigned to the Proactor.
-                  This code smells funny.  Either the API is wrong (the Proactor
-                  should always create the functor with the backpointer,) or the
-                  need for the back pointer is suspicious (I think there is a
-                  thread in the Proactor that signals timers, but maybe it should
-                  be contained in the Upcall object itself?)
-                  The more I look here, the uglier the smell.
-
-                * ace/Select_Reactor_T.cpp:
-                * ace/Timer_Queue_Adapters.cpp:
-                * tests/Timer_Queue_Reference_Counting_Test.cpp:
-                * tests/Timer_Queue_Test.cpp:
-                  As a temporary measure, I appended "_abstract" to the
-                  gettimeofday() function name in Abstract_Timer_Queue<>.
-                  Shortly, I will change the Timer_Queue_T<> class to use
-                  gettimeofday_non_virtual() or _static() or something similar.
-                  Had to make the change in two steps to find all the uses of the
-                  original function.
-                  There was probably an easier/cleaner way to do this.
-
-                * tests/Timer_Queue_Test.cpp:
-                  Take advantage of the new ACE_Abstract_Timer_Queue<> to make the
-                  different types of queues more compatible in ths test, including
-                  queues with different time source policies.
-
-                * ace/Proactor.h:
-                  As with the Reactive version, I noticed that
-                  ACE_Proactor_Handle_Timeout_Upcall did not depend on its
-                  template parameter, so I changed the class to a non-template
-                  version.
-
-                * ace/Proactor.cpp:
-                  Instead of making the Proactor a friend of the Timer_Handler
-                  task, expose a safe interface to do what the proactor wants to
-                  do.
-                  The proactor needed access to timer queue internal details to
-                  implement schedule(), but the reactor did not... hmmm... well,
-                  turns out the Reactor had nicely refactor that work to the
-                  upcall functor.  So I did the same in the Proactor case.
-
-
-                * ace/Timer_List.h:
-                * ace/Timer_Wheel.h:
-                * ace/Timer_Hash.h:
-                * ace/Timer_Heap.h:
-                  Use Event_Handler_Handle_Timeout_Upcall without the template
-                  parameter.
-
-                * ace/Abstract_Timer_Queue.h:
-                  Remove the setter for getimeofday(), this is implemented by the
-                  TIME_POLICY template parameter in Timer_Queue_T<>
-
-                * tests/Reactor_Timer_Test.cpp:
-                * tests/Network_Adapters_Test.cpp:
-                * tests/Proactor_Timer_Test.cpp:
-                  Use a different idiom to set the time policy for this test.
-
-                * examples/Timer_Queue/Thread_Timer_Queue_Test.h:
-                * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h:
-                * examples/APG/Timers/Timers.cpp:
-                * examples/APG/Timers/TimerDispatcher.cpp:
-                * examples/Reactor/Misc/test_timer_queue.cpp:
-                * examples/C++NPv2/Logging_Event_Handler_Ex.cpp:
-                  Need an additional #include for ACE_Event_Handler_Handle_Timeout
-                  Said class class is no longer a template class, so use it
-                  correctly.
-                  Changed name of gettimeofday() in timer queue to
-                  gettimeofday_abstract()  This is a temporary change to find all
-                  the uses, will revert again soon.
-
-                * Merged in changes from bug-3607 branch.
-
-                * ace/ace.mpc:
-                * ace/Abstract_Timer_Queue.h:
-                * ace/Abstract_Timer_Queue.cpp:
-                * ace/Timer_Queue_Iterator.h:
-                * ace/Timer_Queue_Iterator.inl:
-                * ace/Timer_Queue_Iterator.cpp:
-                * ace/Timer_Queuefwd.h:
-                * ace/Timer_Queue.h:
-                * ace/Timer_Queue_T.h:
-                * ace/Timer_Queue_T.inl:
-                * ace/Timer_Queue_T.cpp:
-                * ace/Timer_List_T.h:
-                * ace/Timer_List_T.cpp:
-                * ace/Timer_Wheel_T.h:
-                * ace/Timer_Wheel_T.cpp:
-                * ace/Timer_Hash_T.h:
-                * ace/Timer_Hash_T.cpp:
-                * ace/Timer_Heap_T.h:
-                * ace/Timer_Heap_T.cpp:
-                  Heavy refactoring in ACE_Timer_Queue_T class and friends.
-                  First, created a template base class (ACE_Abstract_Timer_Queue) that:
-                  1) Only depends on the type held by the timer queue, not to lock
-                    or upcall strategy.
-                  2) It is a pure abstract class, i.e., none of its member
-                    functions have any implementation.
-                  3) Provides new pure virtual functions to encapsulates some
-                    logic that was spread between tests, TP_Reactor and
-                    Dev_Poll_Reactor.
-                  Then I re-wrote all the standard timer queue objects in terms of
-                  this class.  In particular, the reactors use only the abstract
-                  interface.
-                  I also re-factored the Timer_Queue_Iterator to only depend on
-                  the type of objects held by the timer queue.  The rest of the
-                  parameters where not used either.
-                  Implement functionality that was spread in Dev_Poll_Reactor,
-                  TP_Reactor and a test into expire_single.
-
-                * ace/Proactor.h:
-                * ace/TP_Reactor.cpp:
-                * ace/Dev_Poll_Reactor.cpp:
-                  Both classes implemented the logic to dispatch a single timer
-                  but release a mutex before the upcall.  This was confusing as
-                  well as required exposing too much detail about the Timer_Queue
-                  classes.
-                  The new mechanism is a single function in (expire_single)
-                  ACE_Abstract_Timer_Queue<> (implemented in ACE_Timer_Queue_T<>)
-                  which receives a command object to encapsulate the mutex release.
-
-                * ace/Functor.h:
-                * ace/Functor.cpp:
-                * ace/Functor_T.h:
-                * ace/Functor_T.inl:
-                  Add helper ACE_Command_* objects.  One is a no-op, for the test
-                  below.  The other is a callback that ignores the silly void*
-                  argument in the ACE_Command_Base::execute() member function.
-
-                * tests/Timer_Queue_Reference_Counting_Test.cpp:
-                  Re-factored test in terms of expire_single()
-
-        Tue Jun 30 01:10:04 UTC 2009  Carlos O'Ryan  <coryan@glamdring>
-
-                * This is a temporary commit into the 3707 branch.  I realized too
-                  late that the changes from 3706 will be needed to make this work.
-
-                * ace/ace.mpc:
-                * ace/Time_Policy.h:
-                * ace/Time_Policy.inl:
-                * ace/Time_Policy.cpp:
-                  New classes to encapsulate how "now" is computed in the Timer
-                  Queues.   This will be an additional template parameter, so the
-                  default configuration has zero overhead.
-
-                * ace/Timer_Queuefwd.h:
-                * ace/Timer_List.h:
-                * ace/Timer_List_T.h:
-                * ace/Timer_List_T.cpp:
-                * ace/Timer_Queue_T.h:
-                * ace/Timer_Queue_T.inl:
-                * ace/Timer_Queue_T.cpp:
-                * ace/Timer_Wheel.h:
-                * ace/Timer_Wheel_T.h:
-                * ace/Timer_Wheel_T.cpp:
-                * ace/Timer_Hash.h:
-                * ace/Timer_Hash_T.h:
-                * ace/Timer_Hash_T.cpp:
-                * ace/Timer_Heap.h:
-                * ace/Timer_Heap_T.h:
-                * ace/Timer_Heap_T.cpp:
-                  Re-factor timer queue classes to use new TIMER_POLICY
-                  parameter.
-
-                * tests/Timer_Queue_Test.cpp:
-                  Modify test to use TIMER_POLICY.  But here is the rub, the test
-                  does not compile because all timer queue types are "different"
-                  to each other.  I need to introduce the base class from the
-                  bug-3706 branch to make things work.
-
-        Sun Jun 28 22:15:47 UTC 2009  Carlos O'Ryan  <coryan@glamdring>
-
-                * ace/ace.mpc:
-                * ace/Abstract_Timer_Queue.h:
-                * ace/Abstract_Timer_Queue.cpp:
-                * ace/Timer_Queue_Iterator.h:
-                * ace/Timer_Queue_Iterator.inl:
-                * ace/Timer_Queue_Iterator.cpp:
-                * ace/Timer_Queuefwd.h:
-                * ace/Timer_Queue.h:
-                * ace/Timer_Queue_T.h:
-                * ace/Timer_Queue_T.inl:
-                * ace/Timer_Queue_T.cpp:
-                * ace/Timer_List_T.h:
-                * ace/Timer_List_T.cpp:
-                * ace/Timer_Wheel_T.h:
-                * ace/Timer_Wheel_T.cpp:
-                * ace/Timer_Hash_T.h:
-                * ace/Timer_Hash_T.cpp:
-                * ace/Timer_Heap_T.h:
-                * ace/Timer_Heap_T.cpp:
-                  Heavy refactoring in ACE_Timer_Queue_T class and friends.
-                  First, created a template base class (ACE_Abstract_Timer_Queue) that:
-                  1) Only depends on the type held by the timer queue, not to lock
-                    or upcall strategy.
-                  2) It is a pure abstract class, i.e., none of its member
-                    functions have any implementation.
-                  3) Provides new pure virtual functions to encapsulates some
-                    logic that was spread between tests, TP_Reactor and
-                    Dev_Poll_Reactor.
-                  Then I re-wrote all the standard timer queue objects in terms of
-                  this class.  In particular, the reactors use only the abstract
-                  interface.
-                  I also re-factored the Timer_Queue_Iterator to only depend on
-                  the type of objects held by the timer queue.  The rest of the
-                  parameters where not used either.
-                  Implement functionality that was spread in Dev_Poll_Reactor,
-                  TP_Reactor and a test into expire_single.
-
-                * ace/Proactor.h:
-                * ace/TP_Reactor.cpp:
-                * ace/Dev_Poll_Reactor.cpp:
-                  Both classes implemented the logic to dispatch a single timer
-                  but release a mutex before the upcall.  This was confusing as
-                  well as required exposing too much detail about the Timer_Queue
-                  classes.
-                  The new mechanism is a single function in (expire_single)
-                  ACE_Abstract_Timer_Queue<> (implemented in ACE_Timer_Queue_T<>)
-                  which receives a command object to encapsulate the mutex release.
-
-                * ace/Functor.h:
-                * ace/Functor.cpp:
-                * ace/Functor_T.h:
-                * ace/Functor_T.inl:
-                  Add helper ACE_Command_* objects.  One is a no-op, for the test
-                  below.  The other is a callback that ignores the silly void*
-                  argument in the ACE_Command_Base::execute() member function.
-
-                * tests/Timer_Queue_Reference_Counting_Test.cpp:
-                  Re-factored test in terms of expire_single()
-
-        === end changelog ===
-
-Wed Dec 14 16:09:22 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/auto_run_tests.pl:
-          Fixed DANCE_ROOT
-
-Mon Dec 12 19:04:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/vc11.features:
-        * bin/MakeProjectCreator/config/vc11nmake.mpb:
-          New files for vc11
-
-Mon Dec 12 07:33:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        === start changelog ===
-
-        Fri Dec  9 10:41:02 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * docs/svn/config:
-                  Subversion should ignore *_svnt_T.*.
-
-        === end changelog ===
-
-Mon Dec  5 22:23:25 UTC 2011  Steve Huston  <shuston@riverace.com>
-
-        * ace/DLL.h:
-        * ace/DLL_Manager.h: Corrected and expanded the descriptions of how
-          DLL/library names are handled, decorated, and located.
-
-Mon Dec  5 20:16:51 UTC 2011  Steve Huston  <shuston@riverace.com>
-
-        * ace/Atomic_Op.{h inl}:
-        * ace/Atomic_Op_T.{h inl}:
-        * ace/Atomic_Op_GCC_T.{h inl}:
-          Added new method TYPE exchange (TYPE newval) which exchanges the
-          ACE_Atomic_Op's value with the specified new value. Thanks to John
-          Lilley for contributing this addition.
-
-        * tests/Atomic_Op_Test.cpp: Added test for exchange().
-
-        * NEWS: Added description of the new exchange() method.
-
-Mon Dec  5 12:27:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/TTY_IO.h:
-          Doxygen fix
-
-        * ace/config-linux.h:
-          Layout changes
-
-        * tests/Cached_Accept_Conn_Test.h:
-        * tests/Cached_Accept_Conn_Test.cpp:
-        * tests/MEM_Stream_Test.cpp:
-        * tests/QtReactor_Test.cpp:
-          Layout changes and removed some ACE_UNUSED_ARG usage
-
-Mon Dec  5 11:25:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/cleanbuilds.sh:
-        * bin/mail_test_stats.sh:
-          Extended our daily test stats with another email, the failing tests
-          for today excluding the not fixed ones
-
-Mon Dec  5 08:35:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Download.html:
-          Release has vc9/vc10
-
-Mon Dec  5 08:22:11 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-        * docs/Download.html:
-        * etc/index.html:
-          Made 6.0.6 publicly available
-
-        * docs/bczar/bczar.html:
-          Updated for next release and added wget step to get subversion config
-          file to make sure we checkout using commit timestamps
+        * ACE version 6.2.8 released.
 
 Local Variables:
 mode: change-log
diff --git a/dep/acelite/NEWS b/dep/acelite/NEWS
index cf60110b5..e6d4d3dbb 100644
--- a/dep/acelite/NEWS
+++ b/dep/acelite/NEWS
@@ -1,3 +1,198 @@
+USER VISIBLE CHANGES BETWEEN ACE-6.2.8 and ACE-6.3.0
+====================================================
+
+. ACE now supports Oracle Solaris Studio 12.4 on Solaris.
+
+. New config macros were added:
+  ACE_DISABLE_MKTEMP:  Disables the availability of ACE_OS::mktemp().
+  ACE_DISABLE_TEMPNAM: Disables the availability of ACE_OS::tempnam().
+  These can be added to your $ACE_ROOT/ace/config.h to disable these
+  wrappers which are considered to be a potential security risk. Disabling
+  one or both will also disable the following:
+    - ACE_FILE_Addr::set () with the 'any' address specified.
+    - ACE_MMAP_Memory_Pool use of the 'unique' option.
+
+. Reduced size of all doxygen documentation by changing the
+  type of diagrams shown
+
+. Removed Windows specific workarounds from ACE_OS::setsockopt, as a
+  result SO_REUSEPORT is not defined anymore on Windows and SO_REUSEADDR
+  is passed directly to the OS
+
+. By adding a 'specific' section to a MPC (base) project it is now possible
+  to have object file output directories per project for GNUACE projects.
+  The following should be added to MPC projects (bugzilla #3868):
+  specific(gnuace) {
+    build_dir_per_project=1
+  }
+
+. ACE_Asynch_Write_File will now correctly accept non-socket (file, TTY ..)
+  handles (bugzilla #3762 and #3992)
+
+. Fixes for VxWorks 6.9
+
+USER VISIBLE CHANGES BETWEEN ACE-6.2.7 and ACE-6.2.8
+====================================================
+
+. Add new ACE::make_event_handler<T>() which is similar
+  to std::make_shared but than for allocation of ACE
+  event handlers. This template method is only enabled
+  when ACE_HAS_CPP11 has been defined, which is set
+  automatically when a C++ compiler with adequate
+  C++11 support is used. Also ACE_Event_Handler_var is
+  extended with some C++11 specific operations
+
+. For all reactor types calling cancel_timer with a
+  nullptr is now allowed, will result in a return of 0
+
+. ACE_DLL and ACE_DLL_Manager have been extended with
+  the support to retrieve any dynamic loader errors
+
+USER VISIBLE CHANGES BETWEEN ACE-6.2.6 and ACE-6.2.7
+====================================================
+
+. Added configuration files for Microsoft Visual Studio 2014
+
+. Added configuration files for MacOSX Yosemite
+
+. Added configuration files for IBM AIX XL C++ 12.1
+
+USER VISIBLE CHANGES BETWEEN ACE-6.2.5 and ACE-6.2.6
+====================================================
+
+. Resolved several data races reported by Intel Inspector XE
+
+. Added optional socket connection optimization for Windows
+
+. Improve functionality and stability of running tests on
+  Android Virtual Device (AVD).
+
+USER VISIBLE CHANGES BETWEEN ACE-6.2.4 and ACE-6.2.5
+====================================================
+
+. Added the ability to build RPMs for just ACE, using an ACE-src tarball.
+  To do this add "--without tao" to the rpmbuild command line.
+
+. Added support for Embarcadero C++Builder XE5 using
+  bcc32 in debug and release mode
+
+. Added support for Embarcadero C++Builder XE6 using
+  bcc32 in debug and release mode
+
+. When Intel C++ 2013 SP1 Update 2 is used with C++11 enabled
+  as compiler feature now also ACE_HAS_CPP11 will be defined,
+  this compiler is now able to compile all our C++11 feature
+  tests
+
+. Fixed several boundary bugs in the ACE RLE Compressor
+
+USER VISIBLE CHANGES BETWEEN ACE-6.2.3 and ACE-6.2.4
+====================================================
+
+. Added support for FC20 and ended support for FC19
+
+. Extended C++11 feature test suite
+
+. Improved support for MingW64
+
+. Improvements to IPv6 support on Windows
+
+USER VISIBLE CHANGES BETWEEN ACE-6.2.2 and ACE-6.2.3
+====================================================
+
+. The ACE_OS::thr_join() method will detect if the thread to be waited on is
+  the calling thread and avert that deadlock. The support needed for this
+  method is available at Vista/Windows Server 2003 and higher; to enable
+  the deadlock prevention, compile ACE with _WIN32_WINNT=0x0502 or higher.
+
+. Ended maintenance and support for FC12 CEEL
+
+. Further improvements of the Android port: Added new define
+  ACE_HAS_EXPLICIT_TEMPLATE_CLASS_INSTANTIATION and related macros
+  ACE_SINGLETON_TEMPLATE_INSTANTIATION and ACE_SINGLETON_TEMPLATE_INSTANTIATE
+  providing a cleaner way to support explicit template (static member or class)
+  instantiation.
+
+' Improvements of the test framework for running tests in a mixed environment
+  where different targets run on different physiscal devices (possibly having
+  different OS).
+
+USER VISIBLE CHANGES BETWEEN ACE-6.2.1 and ACE-6.2.2
+====================================================
+
+. The max_len argument to ACE_Process::command_line_buf changed from int*
+  to size_t*. This corrects a mismatch between the argument type and the
+  data member in ACE_Process from which the value comes.
+
+. Removed some include files from ACE.h. These were not required for ACE.
+  The removed includes are OS_NS_math, Flag_Manip, Handle_Ops, Lib_Find,
+  Init_ACE, Sock_Connect.h. You may have to explicitly add one of these
+  in your own code to restore compiling.
+
+. Further improvements of the Android port, still work in progress.
+
+USER VISIBLE CHANGES BETWEEN ACE-6.2.0 and ACE-6.2.1
+====================================================
+
+. Added support for Fedora 19, ended daily maintenance
+  for Fedora 17 and 18
+
+. Added support for Embarcadero C++BuilderXE4 using
+  bcc32 in debug and release mode
+
+. Improved support for Android
+
+USER VISIBLE CHANGES BETWEEN ACE-6.1.9 and ACE-6.2.0
+====================================================
+
+. None
+
+USER VISIBLE CHANGES BETWEEN ACE-6.1.8 and ACE-6.1.9
+====================================================
+
+. Added MinGW64 as supported platform
+
+. Added support for GCC 4.8.0
+
+USER VISIBLE CHANGES BETWEEN ACE-6.1.7 and ACE-6.1.8
+====================================================
+
+. Small bug fixes
+
+USER VISIBLE CHANGES BETWEEN ACE-6.1.6 and ACE-6.1.7
+====================================================
+
+. Integrated several patches to simplify Debian/Ubuntu
+  packaging
+
+USER VISIBLE CHANGES BETWEEN ACE-6.1.5 and ACE-6.1.6
+====================================================
+
+. Added new event and sema initialization methods to OS_NS_Thread
+  to allow passing pre-initialized condition attributes providing
+  basic support for using time policies in ACE Event classes.
+
+. Added TIME_POLICY support to ACE_Event classes to allow for
+  monotonic timer support for ACE Events.
+
+. Added new regression test:
+  Monotonic_Manual_Event_Test
+
+USER VISIBLE CHANGES BETWEEN ACE-6.1.4 and ACE-6.1.5
+====================================================
+
+. When a ACE_Event_Handler registered for signals is unregistered,
+  whether by unregistering, returning -1 from handle_signal(), or by
+  the reactor closing, the ACE_Event_Handler::handle_close() hook will
+  be called. The close_mask passed will be ACE_Event_Handler::SIGNAL_MASK.
+  In previous versions, handle_close() would only be called when the
+  handle_signal() callback returned -1. This resolves Bugzilla #2368.
+
+. Some initial ACE unit tests to validate the C++11 support of various
+  compilers
+
+. Added support for OpenSuSE 12.2
+
 USER VISIBLE CHANGES BETWEEN ACE-6.1.3 and ACE-6.1.4
 ====================================================
 
diff --git a/dep/acelite/PROBLEM-REPORT-FORM b/dep/acelite/PROBLEM-REPORT-FORM
new file mode 100644
index 000000000..139fa83ad
--- /dev/null
+++ b/dep/acelite/PROBLEM-REPORT-FORM
@@ -0,0 +1,87 @@
+[Please use the PRF form below to submit bug reports, problem reports,
+ etc., to the ACE developers and interested users.  Send it to
+ ace-bugs@list.isis.vanderbilt.edu, you must be subscribed to the list
+ in order to be able to post to it. If you are using OCI, PrismTech, or
+ Riverace's versions of ACE do not send bugs to this mailing list, but
+ instead contact those companies for support.  Please also send your
+ PRF as plain ASCII text, _not_ uuencoded or as an attachment.
+
+ We prefer that all bug reports be submitted through our bug tracking
+ system.  See $ACE_ROOT/docs/usage-bugzilla.html for more information
+ about how to do this.  If you are unsure as to whether your problem
+ is a real bug or not then please submit your question to the mailing
+ list using the following form.  Not using the problem report form
+ will make it harder or impossible to identify the problem, and in
+ many cases we will be unable to help at all.  Also please try to
+ browse bugzilla and the ChangeLog files to find out if your problem
+ has been solved in a more recent version of ACE.
+
+ To subscribe to the list see
+  http://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html
+
+ Replace/remove all the explanatory text in brackets before mailing.
+
+ Please send this form as ASCII text only.  Do _not_ send it as an
+ attachment, or as tar'ed, compressed and/or uuencoded text.  And
+ limit line lengths to less than 80 characters.
+
+ PLEASE make your Subject: line as descriptive as possible.
+ Subjects like "ACE bug" or "bug report" are not helpful!
+ Also, do _not_ include the word "help" in the Subject!]
+
+ When including your config.h and platform_macros.GNU files as requested
+ below, only include the contents if you use the recommended method of
+ including the platform-specific file in your file. If you use a link
+ to the platform-specific file, simply state which one - DO NOT
+ include an entire platform-specific configuration file in the form.
+
+8<----------8<----------8<----------8<----------8<----------8<----------8<----
+
+To: ace-bugs@list.isis.vanderbilt.edu
+Subject: [area]: [synopsis]
+
+    ACE VERSION: 6.3.0
+
+    HOST MACHINE and OPERATING SYSTEM:
+        If on Windows based OS's, which version of WINSOCK do you
+        use?:
+
+    TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
+    COMPILER NAME AND VERSION (AND PATCHLEVEL):
+
+    THE $ACE_ROOT/ace/config.h FILE [if you use a link to a platform-
+    specific file, simply state which one]:
+
+    THE $ACE_ROOT/include/makeinclude/platform_macros.GNU FILE [if you
+    use a link to a platform-specific file, simply state which one
+    (unless this isn't used in this case, e.g., with Microsoft Visual
+    C++)]:
+
+    CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features
+    (used by MPC when you generate your own makefiles):
+
+    AREA/CLASS/EXAMPLE AFFECTED:
+[What example failed?  What module failed to compile?]
+
+    DOES THE PROBLEM AFFECT:
+        COMPILATION?
+        LINKING?
+            On Unix systems, did you run make realclean first?
+        EXECUTION?
+        OTHER (please specify)?
+[Please indicate whether ACE, your application, or both are affected.]
+
+    SYNOPSIS:
+[Brief description of the problem]
+
+    DESCRIPTION:
+[Detailed description of problem.  Don't just say "<blah>
+doesn't work, here's a fix," explain what your program does
+to get to the <blah> state. ]
+
+    REPEAT BY:
+[What you did to get the error; include test program or session
+transcript if at all possible.  ]
+
+    SAMPLE FIX/WORKAROUND:
+[If available ]
diff --git a/dep/acelite/README b/dep/acelite/README
index 35198116b..fe9a7d2d9 100644
--- a/dep/acelite/README
+++ b/dep/acelite/README
@@ -1,11 +1,11 @@
-$Id: README 94611 2011-10-06 11:54:28Z msmit $
+$Id: README 96983 2013-04-11 11:14:11Z schmidt $
 
 This document is also available at the following URL:
 
-http://www.cs.wustl.edu/~schmidt/ACE.html
+http://www.dre.vanderbilt.edu/~schmidt/ACE.html
 
 All software and documentation is available via both anonymous ftp and
-the World Wide Web.]
+the http.]
 
 THE ADAPTIVE COMMUNICATION ENVIRONMENT (ACE)
 
@@ -149,17 +149,15 @@ applications provided with the ACE release include:
 
 OBTAINING ACE
 
-The current ACE release is provided as a tar file that is around 3 Meg
-compressed using GNU gzip.  ACE may be obtained electronically from
-http://www.cs.wustl.edu/~schmidt/ACE-obtain.html.  This release
-contains the source code, test drivers, and example applications
-(including JAWS) for C++ wrapper libraries and the higher-level ACE
-network programming framework developed as part of the ADAPTIVE
-project at the University of California, Irvine and at Washington
-University, St. Louis.
+ACE may be obtained electronically from
+http://download.dre.vanderbilt.edu.  This release contains the source
+code, test drivers, and example applications (including JAWS) for C++
+wrapper libraries and the higher-level ACE network programming
+framework developed as part of the ADAPTIVE project at the University
+of California, Irvine, Washington University, St. Louis, and
+Vanderbilt University.
 
-You can get The ACE ORB (TAO) in a companion release at
-http://www.cs.wustl.edu/~schmidt/TAO.html.
+You can get The ACE ORB (TAO) in a companion release at the same URL.
 
 ----------------------------------------
 
@@ -170,45 +168,45 @@ described in issues of the C++ Report, as well as in proceedings of
 many journals, conferences, and workshops.
 
 A collection of white papers and tutorial handouts are included at
-ftp://wuarchive.wustl.edu/languages/c++/ACE/ACE-documentation.  This
-directory contains postscript versions of various papers that describe
-different aspects of ACE.
 
-I update these papers periodically to reflect changes to the ACE
-architecture.  Therefore, you might want to check the date on the
-files to make sure that you have read the most recent versions of
-these papers.
+http://www.dre.vanderbilt.edu/~schmidt/ACE-papers.html
+
+This page contains PDF versions of various papers that describe
+different aspects of ACE.
 
 This material is also available available via the WWW at URL:
 
-http://www.cs.wustl.edu/~schmidt/ACE.html
+http://www.dre.vanderbilt.edu/~schmidt/ACE.html
 
 ----------------------------------------
 
 ACE MAILING LIST AND NEWSGROUP
 
-A mailing list, ace-users@list.isis.vanderbilt.edu, is available for discussing
-bug fixes, enhancements, and porting issues regarding ACE.  Please
-send mail to me at the ace-users-request@list.isis.vanderbilt.edu
-if you'd like to join the mailing list.  There is also a USENET newsgroup
-called comp.soft-sys.ace. Please see
-http://www.cs.wustl.edu/~schmidt/ACE-mail.html for details on how to
-subscribe to the mailing list.
+A mailing list, ace-users@list.isis.vanderbilt.edu, is available for
+discussing bug fixes, enhancements, and porting issues regarding ACE.
+Please send mail to me at the
+ace-users-request@list.isis.vanderbilt.edu if you'd like to join the
+mailing list.  There is also a USENET newsgroup called
+comp.soft-sys.ace. Please see
+http://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html for details on
+how to subscribe to the mailing list.
 
 ----------------------------------------
 
 BUILDING AND INSTALLING ACE
 
-Please refer to the http://www.cs.wustl.edu/~schmidt/ACE-install.html
-file for information on how to build and test the ACE wrappers.  The
+Please refer to the
+http://www.dre.vanderbilt.edu/~schmidt/ACE-install.html file for
+information on how to build and test the ACE wrappers.  The
 BIBLIOGRAPHY file contains information on where to obtain articles
 that describe the ACE wrappers and the ADAPTIVE system in more detail.
 
 The current release has been tested extensively, but if you find any
 bugs, please report them to the ACE mailing list
-ace-users@cs.wustl.edu using the $ACE_ROOT/PROBLEM-REPORT-FORM.
-Please use the same form to submit questions, comments, etc.
-To ensure that you see responses, please do one of the following:
+ace-users@list.isis.vanderbilt.edu using the
+$ACE_ROOT/PROBLEM-REPORT-FORM.  Please use the same form to submit
+questions, comments, etc.  To ensure that you see responses, please do
+one of the following:
 
     1) Subscribe to the ace-users mail list, by sending email with
        contents "subscribe ace-users" to
diff --git a/dep/acelite/THANKS b/dep/acelite/THANKS
index dd9480b47..360df16d7 100644
--- a/dep/acelite/THANKS
+++ b/dep/acelite/THANKS
@@ -2061,7 +2061,7 @@ Sandro Santos Andrade <sandros at dcc dot ufba dot br>
 Richard Spence <richard dot spence dot extern at icn dot siemens dot de>
 Thomas E Lackey <telackey at bozemanpass dot com>
 luxi78 at gmail dot com
-John Lilley <jlilley at datalever dot com>
+John Lilley <john dot lilley at redpoint dot net>
 Abdullah Sowayan <abdullah dot sowayan at lmco dot com>
 Nathan Bamford <nbamford at datalever dot com>
 Zoltan Molnar <zolmol at isis dot vanderbilt dot edu>
@@ -2369,6 +2369,29 @@ Deux deVille <dev2 at weitling dot net>
 Mohsin Zaidi <mohsinrzaidi at gmail dot com>
 Milind Pangarkar <Milind dot Pangarkar at amdocs dot com>
 Ali Akbar Zarezadeh <akzare at cs dot uni-potsdam dot de>
+Andrés Senac González <andres at senac dot es>
+Peng Xu <pengxu7 at gmail dot com>
+Sergey Onuchin <sonuchin at parallels dot com>
+Michael Ganz <michael_ganz at t-online dot de>
+Phillip LaBanca <labancap at ociweb dot com>
+Journeyer J. Joh <oosaprogrammer at gmail dot com>
+Rudy Pot <rpot at aweta dot nl>
+Neil Youngman <ny at youngman dot org dot uk>
+Andreas Florath <andreas at florath dot org>
+Clyde Gerber <clyde_gerber at symantec dot com>
+George Chen <ace dot gc dot pthzfoldr at gmail dot com>
+Piotr Kow <pkow88776 at onet dot pl>
+Yogesh Sharma <Yogesh dot Sharma at saabsensis dot com>
+Mike McKnerney <michael dot mcknerney at baesystems dot com>
+Mike Ketchen <mketchen at broadsoft dot com>
+Erik Sohns <erik dot sohns at web dot de>
+Winston Jenks <Winston dot JENKS at capesoftware dot com>
+Colin Shen <cshen at manh dot com>
+Alexey Zubko <alexey dot zubko at gmail dot com>
+Michael Dille <mdille3 at andrew dot cmu dot edu>
+Sebastian Perk <Sebastian dot Perk at hydrometer dot de>
+David Lifshitz <dlifshitz at macadamian dot com>
+Milo H. Fields <mfields at paladin-sys dot com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/dep/acelite/VERSION b/dep/acelite/VERSION
index 144300e42..85eb6995d 100644
--- a/dep/acelite/VERSION
+++ b/dep/acelite/VERSION
@@ -1,8 +1,8 @@
-This is ACE version 6.1.4, released Wed Aug 29 08:16:04 CEST 2012
+This is ACE version 6.3.0, released Fri Nov 14 08:38:16 CET 2014
 
 If you have any problems with or questions about ACE, please send
 e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
 using the form found in the file PROBLEM-REPORT-FORM. In order
 to post to the list you must subscribe to it.
 
-See http://www.cs.wustl.edu/~schmidt/ACE-mail.html
+See http://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html
diff --git a/dep/acelite/ace/ACE.cpp b/dep/acelite/ace/ACE.cpp
index a965eff09..36c153c21 100644
--- a/dep/acelite/ace/ACE.cpp
+++ b/dep/acelite/ace/ACE.cpp
@@ -1,4 +1,4 @@
-// $Id: ACE.cpp 96017 2012-08-08 22:18:09Z mitza $
+// $Id: ACE.cpp 97355 2013-09-27 22:16:09Z shuston $
 
 #include "ace/ACE.h"
 
@@ -8,7 +8,8 @@
 #include "ace/SString.h"
 #include "ace/Version.h"
 #include "ace/Message_Block.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
+#include "ace/Flag_Manip.h"
 #include "ace/OS_NS_sys_select.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_strings.h"
@@ -159,7 +160,7 @@ ACE::nibble2hex (u_int n)
 bool
 ACE::debug (void)
 {
-  static const char* debug = ACE_OS::getenv ("ACE_DEBUG");
+  static const char* debug = ACE_OS::getenv ("ACELIB_DEBUG");
   return (ACE::debug_ != 0) ? ACE::debug_ : (debug != 0 ? (*debug != '0') : false);
 }
 
@@ -1013,7 +1014,8 @@ ACE::recvv_n_i (ACE_HANDLE handle,
         {
           char *base = static_cast<char *> (iov[s].iov_base);
           iov[s].iov_base = base + n;
-          iov[s].iov_len = iov[s].iov_len - n;
+          // This blind cast is safe because n < iov_len, after above loop.
+          iov[s].iov_len = iov[s].iov_len - static_cast<u_long> (n);
         }
     }
 
@@ -1079,7 +1081,8 @@ ACE::recvv_n_i (ACE_HANDLE handle,
         {
           char *base = reinterpret_cast<char *> (iov[s].iov_base);
           iov[s].iov_base = base + n;
-          iov[s].iov_len = iov[s].iov_len - n;
+          // This blind cast is safe because n < iov_len, after above loop.
+          iov[s].iov_len = iov[s].iov_len - static_cast<u_long> (n);
         }
     }
 
@@ -1791,7 +1794,8 @@ ACE::sendv_n_i (ACE_HANDLE handle,
         {
           char *base = reinterpret_cast<char *> (iov[s].iov_base);
           iov[s].iov_base = base + n;
-          iov[s].iov_len = iov[s].iov_len - n;
+          // This blind cast is safe because n < iov_len, after above loop.
+          iov[s].iov_len = iov[s].iov_len - static_cast<u_long> (n);
         }
     }
 
@@ -1863,7 +1867,8 @@ ACE::sendv_n_i (ACE_HANDLE handle,
         {
           char *base = reinterpret_cast<char *> (iov[s].iov_base);
           iov[s].iov_base = base + n;
-          iov[s].iov_len = iov[s].iov_len - n;
+          // This blind cast is safe because n < iov_len, after above loop.
+          iov[s].iov_len = iov[s].iov_len - static_cast<u_long> (n);
         }
     }
 
@@ -2105,7 +2110,8 @@ ACE::readv_n (ACE_HANDLE handle,
         {
           char *base = reinterpret_cast<char *> (iov[s].iov_base);
           iov[s].iov_base = base + n;
-          iov[s].iov_len = iov[s].iov_len - n;
+          // This blind cast is safe because n < iov_len, after above loop.
+          iov[s].iov_len = iov[s].iov_len - static_cast<u_long> (n);
         }
     }
 
@@ -2147,7 +2153,8 @@ ACE::writev_n (ACE_HANDLE handle,
         {
           char *base = reinterpret_cast<char *> (iov[s].iov_base);
           iov[s].iov_base = base + n;
-          iov[s].iov_len = iov[s].iov_len - n;
+          // This blind cast is safe because n < iov_len, after above loop.
+          iov[s].iov_len = iov[s].iov_len - static_cast<u_long> (n);
         }
     }
 
@@ -2548,7 +2555,13 @@ ACE::handle_timed_complete (ACE_HANDLE h,
 
   else
 # if defined (ACE_HAS_POLL)
-    need_to_check = (fds.revents & POLLIN);
+    {
+      // The "official" bit for failed connect is POLLIN. However, POLLERR
+      // is often set and there are occasional cases seen with some kernels
+      // where only POLLERR is set on a failed connect.
+      need_to_check = (fds.revents & POLLIN) || (fds.revents & POLLERR);
+      known_failure = (fds.revents & POLLERR);
+    }
 # else
     need_to_check = true;
 # endif /* ACE_HAS_POLL */
diff --git a/dep/acelite/ace/ACE.h b/dep/acelite/ace/ACE.h
index 58eb1f689..82edaf1a0 100644
--- a/dep/acelite/ace/ACE.h
+++ b/dep/acelite/ace/ACE.h
@@ -4,7 +4,7 @@
 /**
  * @file    ACE.h
  *
- * $Id: ACE.h 93276 2011-02-04 20:03:53Z olli $
+ * $Id: ACE.h 97308 2013-09-01 00:58:08Z mesnier_p $
  *
  * This file contains value added ACE functions that extend the
  * behavior of the UNIX and Win32 OS calls.
@@ -22,18 +22,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/OS_NS_math.h"
-#include "ace/Flag_Manip.h"
-#include "ace/Handle_Ops.h"
-#include "ace/Lib_Find.h"
-#include "ace/Init_ACE.h"
-#include "ace/Sock_Connect.h"
+#include "ace/Basic_Types.h"
 #include "ace/Default_Constants.h"
 
 #if defined (ACE_EXPORT_MACRO)
diff --git a/dep/acelite/ace/ACE_export.h b/dep/acelite/ace/ACE_export.h
index 74c62ec34..6129a9250 100644
--- a/dep/acelite/ace/ACE_export.h
+++ b/dep/acelite/ace/ACE_export.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: ACE_export.h 91683 2010-09-09 09:07:49Z johnnyw $
+// $Id: ACE_export.h 97262 2013-08-09 08:32:10Z johnnyw $
 // Definition for Win32 Export directives.
 // This file is generated automatically by
 // generate_export_file.pl
@@ -8,7 +8,7 @@
 #ifndef ACE_EXPORT_H
 #define ACE_EXPORT_H
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if defined (ACE_AS_STATIC_LIBS)
 
diff --git a/dep/acelite/ace/ARGV.cpp b/dep/acelite/ace/ARGV.cpp
index e64c5d869..ed6e5e3e8 100644
--- a/dep/acelite/ace/ARGV.cpp
+++ b/dep/acelite/ace/ARGV.cpp
@@ -1,9 +1,9 @@
-// $Id: ARGV.cpp 95630 2012-03-22 13:04:47Z johnnyw $
+// $Id: ARGV.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_ARGV_CPP
 #define ACE_ARGV_CPP
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Memory.h"
@@ -25,10 +25,10 @@ ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_ARGV_Queue_Entry_T::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("arg_ = %s"), this->arg_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("quote_arg_ = %d"), (int)this->quote_arg_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("arg_ = %s"), this->arg_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("quote_arg_ = %d"), (int)this->quote_arg_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -39,20 +39,20 @@ ACE_ARGV_T<CHAR_TYPE>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_ARGV_T::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("argc_ = %d"), this->argc_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("argc_ = %d"), this->argc_));
 
   ACE_ARGV *this_obj = const_cast<ACE_ARGV *> (this);
 
   for (int i = 0; i < this->argc_; i++)
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("\nargv_[%i] = %s"),
                 i,
                 this_obj->argv ()[i]));
 
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nbuf = %s\n"), this->buf_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nbuf = %s\n"), this->buf_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -96,7 +96,7 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (const CHAR_TYPE buf[],
 
   // Create this->argv_.
   if (this->string_to_argv () == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("string_to_argv")));
 }
@@ -249,7 +249,7 @@ ACE_ARGV_T<CHAR_TYPE>::add (const CHAR_TYPE *next_arg, bool quote_arg)
 
   // Put the new argument at the end of the queue.
   if (this->queue_.enqueue_tail (ACE_ARGV_Queue_Entry_T<CHAR_TYPE> (next_arg, quote_arg)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Can't add more to ARGV queue")),
                       -1);
 
diff --git a/dep/acelite/ace/ATM_Acceptor.cpp b/dep/acelite/ace/ATM_Acceptor.cpp
index a225cbf17..e0807d26e 100644
--- a/dep/acelite/ace/ATM_Acceptor.cpp
+++ b/dep/acelite/ace/ATM_Acceptor.cpp
@@ -1,4 +1,4 @@
-// $Id: ATM_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: ATM_Acceptor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/ATM_Acceptor.h"
 
@@ -75,7 +75,7 @@ ACE_ATM_Acceptor::get_local_addr (ACE_ATM_Addr &local_addr)
   if (ACE_OS::getsockname (acceptor_.get_handle (),
  (struct sockaddr *) & (myaddr->sockaddratmsvc),
                           &addrlen) < 0) {
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                ACE_TEXT ("ATM_Acceptor (get_local_addr): ioctl: %d\n"),
                errno));
     return -1;
@@ -172,7 +172,7 @@ ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap,
                                 params.get_flags ()
                                ))
       == ACE_INVALID_HANDLE) {
-    ACE_DEBUG (LM_DEBUG,
+    ACELIB_DEBUG (LM_DEBUG,
               ACE_TEXT ("Acceptor (socket): socket %d\n"),
               errno);
     return (ACE_INVALID_HANDLE);
@@ -209,7 +209,7 @@ ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap,
                       &(local_sap_addr->sockaddratmsvc)),
                     sizeof (local_sap_addr->sockaddratmsvc)
                    ) == -1) {
-    ACE_DEBUG (LM_DEBUG,
+    ACELIB_DEBUG (LM_DEBUG,
               ACE_TEXT ("Acceptor (open): bind %d\n"),
               errno);
     return -1;
@@ -218,7 +218,7 @@ ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap,
   if (ACE_OS::listen (handle,
                       backlog)
       == -1) {
-    ACE_DEBUG (LM_DEBUG,
+    ACELIB_DEBUG (LM_DEBUG,
               ACE_TEXT ("Acceptor (listen): listen %d\n"),
               errno);
     return -1;
diff --git a/dep/acelite/ace/ATM_Acceptor.inl b/dep/acelite/ace/ATM_Acceptor.inl
index fa60c4ad8..18f84e550 100644
--- a/dep/acelite/ace/ATM_Acceptor.inl
+++ b/dep/acelite/ace/ATM_Acceptor.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: ATM_Acceptor.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: ATM_Acceptor.inl 96985 2013-04-11 15:50:32Z huangh $
 
 // Open versioned namespace, if enabled by the user.
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -23,7 +23,7 @@ ACE_ATM_Acceptor::ACE_ATM_Acceptor (const ACE_Addr &remote_sap,
   //FUZZ: disable check_for_lack_ACE_OS
   if (open (remote_sap, backlog, params) < 0)
   //FUZZ: enable check_for_lack_ACE_OS
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_ATM_Acceptor::ACE_ATM_Acceptor")));
 }
diff --git a/dep/acelite/ace/ATM_Addr.cpp b/dep/acelite/ace/ATM_Addr.cpp
index 47e47e835..24bffa632 100644
--- a/dep/acelite/ace/ATM_Addr.cpp
+++ b/dep/acelite/ace/ATM_Addr.cpp
@@ -1,11 +1,11 @@
-// $Id: ATM_Addr.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: ATM_Addr.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 // Defines the Internet domain address family address format.
 
 #include "ace/ATM_Addr.h"
 #if defined (ACE_HAS_ATM)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if defined (ACE_HAS_FORE_ATM_WS2)
 #include /**/ "forews2.h"
@@ -353,7 +353,7 @@ ACE_ATM_Addr::string_to_addr (const ACE_TCHAR sap[])
  (struct sockaddr *)& (atm_addr_.sockaddratmsvc),
                  sizeof (atm_addr_.sockaddratmsvc),
                  T2A_SVC | T2A_NAME) < 0) {
-     ACE_DEBUG (LM_DEBUG,
+     ACELIB_DEBUG (LM_DEBUG,
                "Error : text2atm failed!\n");
      errno = EINVAL;
      return -1;
@@ -420,7 +420,7 @@ ACE_ATM_Addr::addr_to_string (ACE_TCHAR addr[],
                             sizeof buffer,
  (struct sockaddr *)& (atm_addr_.sockaddratmsvc),
                             A2T_PRETTY)) < 0) {
-    ACE_DEBUG ((LM_DEBUG,"ACE_ATM_Addr (addr_to_string): atm2text failed\n"));
+    ACELIB_DEBUG ((LM_DEBUG,"ACE_ATM_Addr (addr_to_string): atm2text failed\n"));
     return -1;
   }
   if (addrlen < (size_t)total_len)
@@ -506,14 +506,14 @@ ACE_ATM_Addr::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_ATM_Addr::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   ACE_TCHAR s[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16];
   ACE_OS::sprintf (s,
                    ACE_TEXT ("%s"),
                    this->addr_to_string ());
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), s));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), s));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/ATM_Connector.cpp b/dep/acelite/ace/ATM_Connector.cpp
index 5328436f8..c734b2036 100644
--- a/dep/acelite/ace/ATM_Connector.cpp
+++ b/dep/acelite/ace/ATM_Connector.cpp
@@ -1,5 +1,5 @@
 // ATM_Connector.cpp
-// $Id: ATM_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: ATM_Connector.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/ATM_Connector.h"
 #if defined (ACE_HAS_ATM)
@@ -52,7 +52,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream,
                             params.get_user_data(),
                             &options.get_qos());
 #elif defined (ACE_HAS_FORE_ATM_WS2)
-  ACE_DEBUG(LM_DEBUG,
+  ACELIB_DEBUG(LM_DEBUG,
             ACE_TEXT ("ATM_Connector(connect): set QoS parameters\n" ));
 
   ACE_HANDLE s = new_stream.get_handle();
@@ -65,7 +65,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream,
                                              0,
                                              0);
 
-  ACE_DEBUG(LM_DEBUG,
+  ACELIB_DEBUG(LM_DEBUG,
             ACE_TEXT ("ATM_Connector(connect): connecting...\n"));
 
   int result = ACE_OS::connect( s,
@@ -103,7 +103,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream,
                          SO_ATMQOS,
                          reinterpret_cast<char*> (&qos),
                          sizeof(qos)) < 0) {
-    ACE_DEBUG((LM_DEBUG,ACE_TEXT ("ATM_Connector(connect): unable to set qos %d\n"),
+    ACELIB_DEBUG((LM_DEBUG,ACE_TEXT ("ATM_Connector(connect): unable to set qos %d\n"),
                errno));
     return -1;
   }
@@ -113,7 +113,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream,
                                sizeof( remote_addr->sockaddratmsvc));
 
   if ( result != 0 )
-    ACE_DEBUG(LM_DEBUG,
+    ACELIB_DEBUG(LM_DEBUG,
               ACE_TEXT ("ATM_Connector(connect): connection failed, %d\n"),
               errno);
 
diff --git a/dep/acelite/ace/ATM_Connector.inl b/dep/acelite/ace/ATM_Connector.inl
index 10d1623f6..8e462d85c 100644
--- a/dep/acelite/ace/ATM_Connector.inl
+++ b/dep/acelite/ace/ATM_Connector.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: ATM_Connector.inl 84565 2009-02-23 08:20:39Z johnnyw $
+// $Id: ATM_Connector.inl 96985 2013-04-11 15:50:32Z huangh $
 
 // Open versioned namespace, if enabled by the user.
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -35,7 +35,7 @@ ACE_ATM_Connector::ACE_ATM_Connector (ACE_ATM_Stream &new_stream,
                                  flags,
                                  perms) == ACE_INVALID_HANDLE
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_ATM_Stream::ACE_ATM_Stream")));
 }
 
diff --git a/dep/acelite/ace/ATM_QoS.cpp b/dep/acelite/ace/ATM_QoS.cpp
index 841d57f21..f711fb816 100644
--- a/dep/acelite/ace/ATM_QoS.cpp
+++ b/dep/acelite/ace/ATM_QoS.cpp
@@ -1,4 +1,4 @@
-// $Id: ATM_QoS.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: ATM_QoS.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/ATM_QoS.h"
 
@@ -117,7 +117,7 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate,
 
   qos_.ProviderSpecific.buf = (char *) ACE_OS::malloc(size);
   if (qos_.ProviderSpecific.buf == 0) {
-    ACE_ERROR((LM_ERROR,
+    ACELIB_ERROR((LM_ERROR,
                ACE_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"),
                size));
     return;
@@ -297,7 +297,7 @@ ACE_ATM_QoS::set_cbr_rate (int rate,
 
   qos_.ProviderSpecific.buf = (char *) ACE_OS::malloc(size);
   if (qos_.ProviderSpecific.buf == 0) {
-    ACE_ERROR((LM_ERROR,
+    ACELIB_ERROR((LM_ERROR,
                ACE_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"),
                size));
     return;
@@ -467,7 +467,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd,
   buf = (char *) ACE_OS::malloc (info.options);
 
   if (buf == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Unable to allocate %d bytes for options\n"),
                        info.options),
                       0);
@@ -503,7 +503,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd,
                             LOCALNAME) < 0)
         {
           ACE_OS::t_error("t_getname (local_address)");
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("Can't get local address!\n")));
           ACE_OS::free (buf);
           return 0;
diff --git a/dep/acelite/ace/ATM_Stream.cpp b/dep/acelite/ace/ATM_Stream.cpp
index 270afab05..b114c3b12 100644
--- a/dep/acelite/ace/ATM_Stream.cpp
+++ b/dep/acelite/ace/ATM_Stream.cpp
@@ -1,9 +1,11 @@
-// $Id: ATM_Stream.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: ATM_Stream.cpp 97461 2013-12-12 16:30:01Z shuston $
 
 #include "ace/ATM_Stream.h"
 
 #if defined (ACE_HAS_ATM)
 
+#include "ace/OS_NS_string.h"
+
 #if !defined (__ACE_INLINE__)
 #include "ace/ATM_Stream.inl"
 #endif /* __ACE_INLINE__ */
@@ -116,7 +118,7 @@ ACE_ATM_Stream::get_peer_name (void) const
   if ((total_len = atm2text (buffer,sizeof buffer,
  (struct sockaddr *) & (name.sockaddratmsvc),
                             A2T_PRETTY|A2T_NAME)) < 0) {
-    ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("ACE_ATM_Stream (get_peer_name) :%d"),errno));
+    ACELIB_DEBUG ((LM_DEBUG,ACE_TEXT ("ACE_ATM_Stream (get_peer_name) :%d"),errno));
     return 0;
   }
 
@@ -245,7 +247,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi,
                          SO_ATMPVC,
                          reinterpret_cast<char*> (&mypvcaddr),
                          &addrpvclen) < 0) {
-    ACE_DEBUG (LM_DEBUG,
+    ACELIB_DEBUG (LM_DEBUG,
               ACE_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"),
               errno);
     return -1;
@@ -261,7 +263,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi,
                          SOL_ATM,SO_VCID,
                          reinterpret_cast<char*> (&mypvcid),
                          &pvcidlen) < 0) {
-    ACE_DEBUG (LM_DEBUG,
+    ACELIB_DEBUG (LM_DEBUG,
               ACE_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"),
               errno);
     return -1;
@@ -271,7 +273,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi,
 
   return 0;
 #else
-  ACE_DEBUG (LM_DEBUG,
+  ACELIB_DEBUG (LM_DEBUG,
             ACE_TEXT ("ACE_ATM_Stream::get_vpi_vci: Not implemented in this ATM version. Update to >= 0.62\n Or patch 0.59"));
   ACE_UNUSED_ARG (vci);
   ACE_UNUSED_ARG (vpi);
diff --git a/dep/acelite/ace/Acceptor.cpp b/dep/acelite/ace/Acceptor.cpp
index 72bebfd78..1b0188b07 100644
--- a/dep/acelite/ace/Acceptor.cpp
+++ b/dep/acelite/ace/Acceptor.cpp
@@ -1,4 +1,4 @@
-// $Id: Acceptor.cpp 95730 2012-05-04 17:28:19Z johnnyw $
+// $Id: Acceptor.cpp 97075 2013-04-24 15:01:48Z schmidt $
 
 #ifndef ACE_ACCEPTOR_CPP
 #define ACE_ACCEPTOR_CPP
@@ -19,38 +19,38 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Acceptor)
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->peer_acceptor_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPTOR & () const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR & () const
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPTOR &");
-  return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_;
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR &");
+  return (PEER_ACCEPTOR &) this->peer_acceptor_;
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_PEER_ACCEPTOR &
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor (void) const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> PEER_ACCEPTOR &
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor");
-  return const_cast<ACE_PEER_ACCEPTOR &> (this->peer_acceptor_);
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor");
+  return const_cast<PEER_ACCEPTOR &> (this->peer_acceptor_);
 }
 
 // Returns ACE_HANDLE of the underlying Acceptor_Strategy.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_HANDLE
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> ACE_HANDLE
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle (void) const
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle");
   return this->peer_acceptor_.get_handle ();
 }
 
@@ -59,15 +59,15 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const
 // with the Reactor and listen for connection requests at the
 // designated <local_addr>.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
-  (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open
+  (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr,
    ACE_Reactor *reactor,
    int flags,
    int use_select,
    int reuse_addr)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open");
   this->flags_ = flags;
   this->use_select_ = use_select;
   this->reuse_addr_ = reuse_addr;
@@ -81,6 +81,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
       return -1;
     }
 
+  // Open the underlying PEER_ACCEPTOR.
   if (this->peer_acceptor_.open (local_addr, reuse_addr) == -1)
     return -1;
 
@@ -104,69 +105,69 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
 
 // Simple constructor.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Acceptor (ACE_Reactor *reactor,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Acceptor (ACE_Reactor *reactor,
                                                               int use_select)
   :flags_ (0),
    use_select_ (use_select),
    reuse_addr_ (1)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Acceptor");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Acceptor");
 
   this->reactor (reactor);
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Acceptor
-  (const ACE_PEER_ACCEPTOR_ADDR &addr,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Acceptor
+  (const typename PEER_ACCEPTOR::PEER_ADDR &addr,
    ACE_Reactor *reactor,
    int flags,
    int use_select,
    int reuse_addr)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Acceptor");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Acceptor");
 
   if (this->open (addr,
                   reactor,
                   flags,
                   use_select,
                   reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Acceptor::ACE_Acceptor")));
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Acceptor (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Acceptor (void)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Acceptor");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Acceptor");
   this->handle_close ();
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::fini (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::fini");
-  return ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close ();
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini");
+  return ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close ();
 }
 
 // Hook called by the explicit dynamic linking facility.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::init (int, ACE_TCHAR *[])
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::init (int, ACE_TCHAR *[])
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::init");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::init");
   return -1;
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp,
                                                       size_t length) const
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info");
   ACE_TCHAR buf[BUFSIZ];
   ACE_TCHAR addr_str[BUFSIZ];
-  ACE_PEER_ACCEPTOR_ADDR addr;
+  typename PEER_ACCEPTOR::PEER_ADDR addr;
 
   if (this->acceptor ().get_local_addr (addr) == -1)
     return -1;
@@ -186,42 +187,42 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp,
   return static_cast<int> (ACE_OS::strlen (buf));
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend");
   return this->reactor ()->suspend_handler (this);
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume");
   return this->reactor ()->resume_handler (this);
 }
 
 // Perform termination activities when <this> is removed from the
 // <reactor>.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close (void)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close");
   return this->handle_close ();
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_accept_error (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_accept_error (void)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_accept_error");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_accept_error");
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (ACE_HANDLE,
                                                               ACE_Reactor_Mask)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close");
   // Guard against multiple closes.
   if (this->reactor () != 0)
     {
@@ -235,7 +236,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE,
 
       // Shut down the listen socket to recycle the handles.
       if (this->peer_acceptor_.close () == -1)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("close\n")));
       // Set the Reactor to 0 so that we don't try to close down
       // again.
@@ -252,10 +253,10 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE,
 // subclass instances of SVC_HANDLER, using a singleton, dynamically
 // linking the handler, etc.).
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler (SVC_HANDLER *&sh)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::make_svc_handler (SVC_HANDLER *&sh)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::make_svc_handler");
 
   if (sh == 0)
     ACE_NEW_RETURN (sh,
@@ -272,11 +273,11 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler (SVC_HANDLER *&
 // <svc_handler>.  The default behavior delegates to the
 // <PEER_ACCEPTOR::accept> in the Acceptor_Strategy.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept_svc_handler
   (SVC_HANDLER *svc_handler)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept_svc_handler");
 
   // Try to find out if the implementation of the reactor that we are
   // using requires us to reset the event association for the newly
@@ -288,7 +289,9 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler
   bool reset_new_handle;
 
   if (reactor)
-    reset_new_handle = reactor->uses_event_associations ();
+    {
+      reset_new_handle = reactor->uses_event_associations ();
+    }
   else
     {
       // Acceptor is closed, so reject this call
@@ -324,11 +327,11 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler
 // concurrency activations (such as creating the SVC_HANDLER as an
 // "active object" via multi-threading or multi-processing).
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler
   (SVC_HANDLER *svc_handler)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler");
 
   int result = 0;
 
@@ -359,10 +362,10 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler
 // creation strategy), accept the connection into the SVC_HANDLER, and
 // then activate the SVC_HANDLER.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listener)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_input (ACE_HANDLE listener)
 {
-  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input");
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_input");
 
   // Default is "timeout (0, 0)," which means "poll."
   ACE_Time_Value timeout;
@@ -397,7 +400,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene
         {
           if (ACE::debug ())
             {
-              ACE_DEBUG ((LM_DEBUG,
+              ACELIB_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("make_svc_handler")));
             }
@@ -410,7 +413,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene
           // on failure.
           if (ACE::debug ())
             {
-              ACE_DEBUG ((LM_DEBUG,
+              ACELIB_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("accept_svc_handler")));
             }
@@ -433,7 +436,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene
 
           if (ACE::debug ())
             {
-              ACE_DEBUG ((LM_DEBUG,
+              ACELIB_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("activate_svc_handler")));
             }
@@ -448,75 +451,75 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Strategy_Acceptor)
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend");
 
   // First suspend the SVC_HANDLER's we've created.
   if (this->scheduling_strategy_->suspend () == -1)
     return -1;
   else   // Then suspend ourselves.
-    return ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend ();
+    return ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend ();
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume");
 
   // First resume ourselves.
-  if (ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume () == -1)
+  if (ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume () == -1)
     return -1;
   else // Then resume the SVC_HANDLER's we've created.
     return this->scheduling_strategy_->resume ();
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump ();
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump ();
   this->creation_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_));
   this->accept_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_));
   this->concurrency_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_));
   this->scheduling_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_name_ = %s"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_name_ = %s"),
               this->service_name_ == 0 ? ACE_TEXT ("<unknown>") : this->service_name_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_description_ = %s"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_description_ = %s"),
               this->service_description_ == 0 ? ACE_TEXT ("<unknown>") : this->service_description_));
   this->service_addr_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_PEER_ACCEPTOR &
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor (void) const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> PEER_ACCEPTOR &
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor");
   return this->accept_strategy_->acceptor ();
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPTOR & () const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR & () const
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPTOR &");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR &");
   return this->accept_strategy_->acceptor ();
 }
 
 // Returns ACE_HANDLE of the underlying Acceptor_Strategy.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_HANDLE
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> ACE_HANDLE
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle (void) const
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle");
   return this->accept_strategy_->get_handle ();
 }
 
@@ -524,26 +527,26 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const
 // connection acceptance, and concurrency, and then register <this>
 // with the Reactor and listen for connection requests at the
 // designated <local_addr>.
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
-  (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open
+  (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr,
    ACE_Reactor *reactor,
    int /* flags unused */,
    int use_select,
    int reuse_addr)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open");
   return this->open
     (local_addr, reactor, 0, 0, 0, 0, 0, 0, use_select, reuse_addr);
 }
 
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
-  (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open
+  (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr,
    ACE_Reactor *reactor,
    ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
-   ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> *acc_s,
+   ACE_Accept_Strategy<SVC_HANDLER, PEER_ACCEPTOR> *acc_s,
    ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
    ACE_Scheduling_Strategy<SVC_HANDLER> *sch_s,
    const ACE_TCHAR *service_name,
@@ -551,7 +554,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
    int use_select,
    int reuse_addr)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open");
 
   if (this->service_name_ == 0 && service_name != 0)
     ACE_ALLOCATOR_RETURN (this->service_name_,
@@ -635,8 +638,8 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
 
 // Simple constructor.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Strategy_Acceptor
   (const ACE_TCHAR service_name[],
    const ACE_TCHAR service_description[],
    int use_select,
@@ -652,7 +655,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
       service_name_ (0),
       service_description_ (0)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Strategy_Acceptor");
 
   if (service_name != 0)
     ACE_ALLOCATOR (this->service_name_,
@@ -664,12 +667,12 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
   this->reuse_addr_ = reuse_addr;
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
-  (const ACE_PEER_ACCEPTOR_ADDR &addr,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Strategy_Acceptor
+  (const typename PEER_ACCEPTOR::PEER_ADDR &addr,
    ACE_Reactor *reactor,
    ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
-   ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> *acc_s,
+   ACE_Accept_Strategy<SVC_HANDLER, PEER_ACCEPTOR> *acc_s,
    ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
    ACE_Scheduling_Strategy<SVC_HANDLER> *sch_s,
    const ACE_TCHAR service_name[],
@@ -687,7 +690,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
       service_name_ (0),
       service_description_ (0)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Strategy_Acceptor");
 
   if (this->open (addr,
                   reactor,
@@ -699,7 +702,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
                   service_description,
                   use_select,
                   reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Strategy_Acceptor::ACE_Strategy_Acceptor")));
 }
@@ -707,11 +710,11 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
 // Perform termination activities when <this> is removed from the
 // <ACE_Reactor>.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (ACE_HANDLE,
                                                                        ACE_Reactor_Mask)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close");
   // Guard against multiple closes.
   if (this->reactor () != 0)
     {
@@ -759,10 +762,10 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDL
 // creating subclass instances of <SVC_HANDLER>, using a singleton,
 // dynamically linking the handler, etc.).
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler (SVC_HANDLER *&sh)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::make_svc_handler (SVC_HANDLER *&sh)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::make_svc_handler");
   return this->creation_strategy_->make_svc_handler (sh);
 }
 
@@ -770,11 +773,11 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler (SVC_H
 // <svc_handler>.  The default behavior delegates to the
 // <Strategy_Acceptor::accept> in the Acceptor_Strategy.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept_svc_handler
   (SVC_HANDLER *svc_handler)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept_svc_handler");
   return this->accept_strategy_->accept_svc_handler (svc_handler);
 }
 
@@ -786,20 +789,20 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler
 // concurrency activations (such as creating the SVC_HANDLER as an
 // "active object" via multi-threading or multi-processing).
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler
   (SVC_HANDLER *svc_handler)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler");
   return this->concurrency_strategy_->activate_svc_handler
     (svc_handler,
      (void *) this);
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Strategy_Acceptor (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Strategy_Acceptor (void)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Strategy_Acceptor");
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Strategy_Acceptor");
   ACE_OS::free ((void *) this->service_name_);
   ACE_OS::free ((void *) this->service_description_);
   this->handle_close ();
@@ -807,22 +810,22 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Strategy_Acceptor
 
 // Signal the server to shutdown gracefully.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_signal (int, siginfo_t *, ucontext_t *)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_signal (int, siginfo_t *, ucontext_t *)
 {
   ACE_Reactor::instance()->end_reactor_event_loop ();
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp,
                                                                size_t length) const
 {
   ACE_TRACE ("ACE_Strategy_Acceptor::info");
 
   ACE_TCHAR buf[BUFSIZ];
   ACE_TCHAR service_addr_str[BUFSIZ];
-  ACE_PEER_ACCEPTOR_ADDR addr;
+  typename PEER_ACCEPTOR::PEER_ADDR addr;
 
   if (this->acceptor ().get_local_addr (addr) == -1)
     return -1;
@@ -848,39 +851,39 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp,
   return static_cast<int> (ACE_OS::strlen (buf));
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::fini (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::fini");
-  return this->ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close ();
+  ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini");
+  return this->ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close ();
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Oneshot_Acceptor)
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nsvc_handler_ = %x"), this->svc_handler_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nrestart_ = %d"), this->restart_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nsvc_handler_ = %x"), this->svc_handler_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nrestart_ = %d"), this->restart_));
   this->peer_acceptor_.dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("delete_concurrency_strategy_ = %d"),
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("delete_concurrency_strategy_ = %d"),
               delete_concurrency_strategy_));
   this->concurrency_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
-  (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open
+  (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr,
    ACE_Reactor *reactor,
    ACE_Concurrency_Strategy<SVC_HANDLER> *con_s)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open");
   this->reactor (reactor);
 
   // Initialize the concurrency strategy.
@@ -898,20 +901,20 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
   return this->peer_acceptor_.open (local_addr, 1);
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor (void)
   : svc_handler_ (0),
     restart_ (false),
     concurrency_strategy_ (0),
     delete_concurrency_strategy_ (false)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor");
   this->reactor (0);
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor
-  (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor
+  (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr,
    ACE_Reactor *reactor,
    ACE_Concurrency_Strategy<SVC_HANDLER> *cs)
     : svc_handler_ (0),
@@ -919,32 +922,32 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor
       concurrency_strategy_ (0),
       delete_concurrency_strategy_ (false)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor");
   if (this->open (local_addr, reactor, cs) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Oneshot_Acceptor::ACE_Oneshot_Acceptor")));
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Oneshot_Acceptor (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Oneshot_Acceptor (void)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Oneshot_Acceptor");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Oneshot_Acceptor");
   this->handle_close ();
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close (void)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close");
   return this->handle_close ();
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE,
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (ACE_HANDLE,
                                                                       ACE_Reactor_Mask)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close");
 
   // Guard against multiple closes.
   if (this->delete_concurrency_strategy_)
@@ -962,17 +965,17 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE
        ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL);
 
   if (this->peer_acceptor_.close () == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("close\n")));
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_timeout
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_timeout
   (const ACE_Time_Value &tv,
    const void *arg)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_timeout");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_timeout");
   errno = ETIME;
 
   if (this->svc_handler_->handle_timeout (tv, arg) == -1)
@@ -987,20 +990,20 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_timeout
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::cancel (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::cancel (void)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::cancel");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::cancel");
   return this->reactor () && this->reactor ()->cancel_timer (this);
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::register_handler
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::register_handler
   (SVC_HANDLER *svc_handler,
    const ACE_Synch_Options &synch_options,
    bool restart)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::register_handler");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::register_handler");
   // Can't do this if we don't have a Reactor.
   if (this->reactor () == 0)
     {
@@ -1033,11 +1036,11 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::register_handler
 // concurrency activations (such as creating the SVC_HANDLER as an
 // "active object" via multi-threading or multi-processing).
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler
   (SVC_HANDLER *svc_handler)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler");
   return this->concurrency_strategy_->activate_svc_handler
     (svc_handler,
      (void *) this);
@@ -1046,15 +1049,15 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler
 // Factors out the code shared between the <accept> and <handle_input>
 // methods.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_accept
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::shared_accept
   (SVC_HANDLER *svc_handler,
-   ACE_PEER_ACCEPTOR_ADDR *remote_addr,
+   typename PEER_ACCEPTOR::PEER_ADDR *remote_addr,
    ACE_Time_Value *timeout,
    bool restart,
    bool reset_new_handle)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_accept");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::shared_accept");
   if (svc_handler == 0)
     return -1;
 
@@ -1083,15 +1086,15 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_accept
 // then activate the SVC_HANDLER.  Note that SVC_HANDLER::open()
 // decides what type of concurrency strategy to use.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept
   (SVC_HANDLER *svc_handler,
-   ACE_PEER_ACCEPTOR_ADDR *remote_addr,
+   typename PEER_ACCEPTOR::PEER_ADDR *remote_addr,
    const ACE_Synch_Options &synch_options,
    bool restart,
    bool reset_new_handle)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept");
   // Note that if timeout == ACE_Time_Value (x, y) where (x > 0 || y >
   // 0) then this->connector_.connect() will block synchronously.  If
   // <use_reactor> is set then we don't want this to happen (since we
@@ -1128,10 +1131,10 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept
 // Accepts one pending connection from a client (since we're the
 // "oneshot" Acceptor).
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_input (ACE_HANDLE)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_input");
   int result = 0;
 
   // Cancel any timer that might be pending.
@@ -1142,16 +1145,20 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE
   // created handle.  This is because the newly created handle will
   // inherit the properties of the listen handle, including its event
   // associations.
-  bool const reset_new_handle = this->reactor ()->uses_event_associations ();
+  ACE_Reactor *reactor = this->reactor ();
+  bool reset_new_handle = false;
 
   // There is a use-case whereby this object will be gone upon return
   // from shared_accept - if the Svc_Handler deletes this Oneshot_Acceptor
   // during the shared_accept/activation steps. So, do whatever we need
   // to do with this object before calling shared_accept.
-  if (this->reactor ())
-    this->reactor ()->remove_handler
-      (this,
-       ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL);
+  if (reactor)
+    {
+      reset_new_handle = reactor->uses_event_associations ();
+      reactor->remove_handler
+        (this,
+        ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL);
+    }
 
   if (this->shared_accept (this->svc_handler_, // stream
                            0, // remote address
@@ -1166,28 +1173,28 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE
 
 // Hook called by the explicit dynamic linking facility.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::init (int, ACE_TCHAR *[])
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::init (int, ACE_TCHAR *[])
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::init");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::init");
   return -1;
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::fini (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::fini");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini");
   return this->handle_close ();
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp,
-                                                              size_t length) const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp,
+                                                        size_t length) const
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info");
   ACE_TCHAR buf[BUFSIZ];
   ACE_TCHAR addr_str[BUFSIZ];
-  ACE_PEER_ACCEPTOR_ADDR addr;
+  typename PEER_ACCEPTOR::PEER_ADDR addr;
 
   if (this->peer_acceptor_.get_local_addr (addr) == -1)
     return -1;
@@ -1207,41 +1214,41 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp,
   return static_cast<int> (ACE_OS::strlen (buf));
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend");
   return this->reactor () && this->reactor ()->suspend_handler (this);
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume (void)
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void)
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume");
   return this->reactor () && this->reactor ()->resume_handler (this);
 }
 
 // Returns ACE_HANDLE of the underlying peer_acceptor.
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_HANDLE
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> ACE_HANDLE
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle (void) const
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle");
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle");
   return this->peer_acceptor_.get_handle ();
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_PEER_ACCEPTOR &
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor (void) const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR> PEER_ACCEPTOR &
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor");
-  return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_;
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor");
+  return (PEER_ACCEPTOR &) this->peer_acceptor_;
 }
 
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPTOR & () const
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
+ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR & () const
 {
-  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPTOR &");
-  return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_;
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR &");
+  return (PEER_ACCEPTOR &) this->peer_acceptor_;
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Acceptor.h b/dep/acelite/ace/Acceptor.h
index fdd00d5a0..ee340547b 100644
--- a/dep/acelite/ace/Acceptor.h
+++ b/dep/acelite/ace/Acceptor.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Acceptor.h
  *
- *  $Id: Acceptor.h 93624 2011-03-22 21:14:05Z johnnyw $
+ *  $Id: Acceptor.h 97084 2013-04-26 20:42:28Z schmidt $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -34,30 +34,38 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * activating the SVC_HANDLER.
  *
  * Implements the basic strategy for passively establishing
- * connections with clients.  An ACE_Acceptor is parameterized
- * by concrete types that conform to the interfaces of
- * PEER_ACCEPTOR and SVC_HANDLER.  The PEER_ACCEPTOR is
- * instantiated with a transport mechanism that passively
- * establishes connections.  The SVC_HANDLER is instantiated
- * with a concrete type that performs the application-specific
- * service.  An ACE_Acceptor inherits from ACE_Service_Object,
- * which in turn inherits from ACE_Event_Handler.  This enables
- * the ACE_Reactor to dispatch the ACE_Acceptor's handle_input
- * method when connection events occur.  The handle_input method
- * performs the ACE_Acceptor's default creation, connection
- * establishment, and service activation strategies.  These
- * strategies can be overridden by subclasses individually or as
- * a group.
+ * connections with clients.  An ACE_Acceptor inherits from
+ * ACE_Service_Object, which in turn inherits from ACE_Event_Handler.
+ * This enables the ACE_Reactor to dispatch the ACE_Acceptor's
+ * handle_input method when connection events occur.  The handle_input
+ * method performs the ACE_Acceptor's default creation, connection
+ * establishment, and service activation strategies.  These strategies
+ * can be overridden by subclasses individually or as a group.
+ *
+ * An ACE_Acceptor is parameterized by concrete types that conform to
+ * the interfaces of SVC_HANDLER and PEER_ACCEPTOR described below.
+ *
+ * @tparam SVC_HANDLER The name of the concrete type that performs the
+ *         application-specific service.  The SVC_HANDLER typically
+ *         inherits from ACE_Svc_Handler.  @see Svc_Handler.h.
+ *
+ * @tparam PEER_ACCEPTOR The name of the class that implements the
+ *         PEER_ACCEPTOR endpoint (e.g., ACE_SOCK_Acceptor) to
+ *         passively establish connections.  A PEER_ACCEPTOR
+ *         implementation must provide a PEER_STREAM and PEER_ADDR
+ *         trait to identify the type of stream (e.g.,
+ *         ACE_SOCK_Stream) and type of address (e.g., ACE_INET_Addr)
+ *         used by the endpoint.
  */
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
 class ACE_Acceptor : public ACE_Service_Object
 {
 public:
 
   // Useful STL-style traits.
-  typedef ACE_PEER_ACCEPTOR_ADDR            addr_type;
-  typedef ACE_PEER_ACCEPTOR                 acceptor_type;
-  typedef SVC_HANDLER                       handler_type;
+  typedef typename PEER_ACCEPTOR::PEER_ADDR addr_type;
+  typedef PEER_ACCEPTOR acceptor_type;
+  typedef SVC_HANDLER handler_type;
   typedef typename SVC_HANDLER::stream_type stream_type;
 
   /// "Do-nothing" constructor.
@@ -97,7 +105,7 @@ public:
    *                   @p local_addr.  Generally used to request that the
    *                   OS allow reuse of the listen port.  The default is 1.
    */
-  ACE_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+  ACE_Acceptor (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr,
                 ACE_Reactor *reactor = ACE_Reactor::instance (),
                 int flags = 0,
                 int use_select = 1,
@@ -139,7 +147,7 @@ public:
    * @retval 0  Success
    * @retval -1 Failure, @c errno contains an error code.
    */
-  virtual int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+  virtual int open (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr,
                     ACE_Reactor *reactor = ACE_Reactor::instance (),
                     int flags = 0,
                     int use_select = 1,
@@ -149,10 +157,10 @@ public:
   virtual ~ACE_Acceptor (void);
 
   /// Return the underlying PEER_ACCEPTOR object.
-  virtual operator ACE_PEER_ACCEPTOR &() const;
+  virtual operator PEER_ACCEPTOR &() const;
 
   /// Return the underlying PEER_ACCEPTOR object.
-  virtual ACE_PEER_ACCEPTOR &acceptor (void) const;
+  virtual PEER_ACCEPTOR &acceptor (void) const;
 
   /// Returns the listening acceptor's {ACE_HANDLE}.
   virtual ACE_HANDLE get_handle (void) const;
@@ -235,10 +243,10 @@ public:
 
 protected:
   /// Concrete factory for accepting connections from clients...
-  ACE_PEER_ACCEPTOR peer_acceptor_;
+  PEER_ACCEPTOR peer_acceptor_;
 
   /// Needed to reopen the socket if {accept} fails.
-  ACE_PEER_ACCEPTOR_ADDR peer_acceptor_addr_;
+  typename PEER_ACCEPTOR::PEER_ADDR peer_acceptor_addr_;
 
   /**
    * Flags that indicate how {SVC_HANDLER}'s should be initialized
@@ -270,26 +278,26 @@ protected:
  * SVC_HANDLER, and (3) activating the SVC_HANDLER with a
  * particular concurrency mechanism.
  */
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
 class ACE_Strategy_Acceptor
-  : public ACE_Acceptor <SVC_HANDLER, ACE_PEER_ACCEPTOR_2>
+  : public ACE_Acceptor <SVC_HANDLER, PEER_ACCEPTOR>
 {
 public:
 
   // Useful STL-style traits.
   typedef ACE_Creation_Strategy<SVC_HANDLER>
           creation_strategy_type;
-  typedef ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>
+  typedef ACE_Accept_Strategy<SVC_HANDLER, PEER_ACCEPTOR>
           accept_strategy_type;
   typedef ACE_Concurrency_Strategy<SVC_HANDLER>
           concurrency_strategy_type;
   typedef ACE_Scheduling_Strategy<SVC_HANDLER> scheduling_strategy_type;
-  typedef ACE_Acceptor <SVC_HANDLER, ACE_PEER_ACCEPTOR_2>
+  typedef ACE_Acceptor <SVC_HANDLER, PEER_ACCEPTOR>
           base_type;
 
   // = Define some useful (old style) traits.
   typedef ACE_Creation_Strategy<SVC_HANDLER> CREATION_STRATEGY;
-  typedef ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> ACCEPT_STRATEGY;
+  typedef ACE_Accept_Strategy<SVC_HANDLER, PEER_ACCEPTOR> ACCEPT_STRATEGY;
   typedef ACE_Concurrency_Strategy<SVC_HANDLER> CONCURRENCY_STRATEGY;
   typedef ACE_Scheduling_Strategy<SVC_HANDLER> SCHEDULING_STRATEGY;
 
@@ -305,10 +313,10 @@ public:
    * with the Reactor and listen for connection requests at the
    * designated {local_addr}.
    */
-  ACE_Strategy_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+  ACE_Strategy_Acceptor (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr,
                          ACE_Reactor * = ACE_Reactor::instance (),
                          ACE_Creation_Strategy<SVC_HANDLER> * = 0,
-                         ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> * = 0,
+                         ACE_Accept_Strategy<SVC_HANDLER, PEER_ACCEPTOR> * = 0,
                          ACE_Concurrency_Strategy<SVC_HANDLER> * = 0,
                          ACE_Scheduling_Strategy<SVC_HANDLER> * = 0,
                          const ACE_TCHAR service_name[] = 0,
@@ -350,7 +358,7 @@ public:
    * @retval 0  Success
    * @retval -1 Failure, @c errno contains an error code.
    */
-  virtual int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+  virtual int open (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr,
                     ACE_Reactor *reactor,
                     int flags = 0,
                     int use_select = 1,
@@ -362,10 +370,10 @@ public:
    * with the Reactor and listen for connection requests at the
    * designated {local_addr}.
    */
-  virtual int open (const ACE_PEER_ACCEPTOR_ADDR &,
+  virtual int open (const typename PEER_ACCEPTOR::PEER_ADDR &,
                     ACE_Reactor * = ACE_Reactor::instance (),
                     ACE_Creation_Strategy<SVC_HANDLER> * = 0,
-                    ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> * =0,
+                    ACE_Accept_Strategy<SVC_HANDLER, PEER_ACCEPTOR> * =0,
                     ACE_Concurrency_Strategy<SVC_HANDLER> * = 0,
                     ACE_Scheduling_Strategy<SVC_HANDLER> * = 0,
                     const ACE_TCHAR *service_name = 0,
@@ -377,10 +385,10 @@ public:
   virtual ~ACE_Strategy_Acceptor (void);
 
   /// Return the underlying PEER_ACCEPTOR object.
-  virtual operator ACE_PEER_ACCEPTOR &() const;
+  virtual operator PEER_ACCEPTOR &() const;
 
   /// Return the underlying PEER_ACCEPTOR object.
-  virtual ACE_PEER_ACCEPTOR &acceptor (void) const;
+  virtual PEER_ACCEPTOR &acceptor (void) const;
 
   /// Returns the listening acceptor's {ACE_HANDLE}.
   virtual ACE_HANDLE get_handle (void) const;
@@ -496,7 +504,7 @@ protected:
 
   /// Address that the {Strategy_Acceptor} uses to listen for
   /// connections.
-  ACE_PEER_ACCEPTOR_ADDR service_addr_;
+  typename PEER_ACCEPTOR::PEER_ADDR service_addr_;
 };
 
 /**
@@ -528,15 +536,15 @@ protected:
  *    immediately. If there is no immediately available connection to accept,
  *    behavior is governed by the ACE_Synch_Options argument passed to open().
  */
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
+template <typename SVC_HANDLER, typename PEER_ACCEPTOR>
 class ACE_Oneshot_Acceptor : public ACE_Service_Object
 {
 public:
 
   // Useful STL-style traits.
-  typedef ACE_PEER_ACCEPTOR_ADDR            addr_type;
-  typedef ACE_PEER_ACCEPTOR                 acceptor_type;
-  typedef SVC_HANDLER                       handler_type;
+  typedef typename PEER_ACCEPTOR::PEER_ADDR addr_type;
+  typedef PEER_ACCEPTOR acceptor_type;
+  typedef SVC_HANDLER handler_type;
   typedef typename SVC_HANDLER::stream_type stream_type;
 
   /// Constructor.
@@ -550,7 +558,7 @@ public:
    * this point -- the @a reactor parameter is saved in case it's
    * needed later.
    */
-  ACE_Oneshot_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+  ACE_Oneshot_Acceptor (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr,
                         ACE_Reactor *reactor = ACE_Reactor::instance (),
                         ACE_Concurrency_Strategy<SVC_HANDLER> * = 0);
 
@@ -562,7 +570,7 @@ public:
    * this point -- the @a reactor parameter is saved in case it's
    * needed later.
    */
-  int open (const ACE_PEER_ACCEPTOR_ADDR &,
+  int open (const typename PEER_ACCEPTOR::PEER_ADDR &,
             ACE_Reactor *reactor = ACE_Reactor::instance (),
             ACE_Concurrency_Strategy<SVC_HANDLER> * = 0);
 
@@ -573,7 +581,7 @@ public:
   /// Create a {SVC_HANDLER}, accept the connection into the
   /// {SVC_HANDLER}, and activate the {SVC_HANDLER}.
   virtual int accept (SVC_HANDLER * = 0,
-                      ACE_PEER_ACCEPTOR_ADDR *remote_addr = 0,
+                      typename PEER_ACCEPTOR::PEER_ADDR *remote_addr = 0,
                       const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults,
                       bool restart = true,
                       bool reset_new_handle = false);
@@ -582,10 +590,10 @@ public:
   virtual int cancel (void);
 
   /// Return the underlying {PEER_ACCEPTOR} object.
-  virtual operator ACE_PEER_ACCEPTOR &() const;
+  virtual operator PEER_ACCEPTOR &() const;
 
   /// Return the underlying {PEER_ACCEPTOR} object.
-  virtual ACE_PEER_ACCEPTOR &acceptor (void) const;
+  virtual PEER_ACCEPTOR &acceptor (void) const;
 
   /// Close down the {Oneshot_Acceptor}.
   virtual int close (void);
@@ -610,7 +618,7 @@ protected:
   /// Factors out the code shared between the {accept} and
   /// {handle_input} methods.
   int shared_accept (SVC_HANDLER *svc_handler,
-                     ACE_PEER_ACCEPTOR_ADDR *remote_addr,
+                     typename PEER_ACCEPTOR::PEER_ADDR *remote_addr,
                      ACE_Time_Value *timeout,
                      bool restart,
                      bool reset_new_handle);
@@ -670,7 +678,7 @@ private:
   bool restart_;
 
   /// Factory that establishes connections passively.
-  ACE_PEER_ACCEPTOR peer_acceptor_;
+  PEER_ACCEPTOR peer_acceptor_;
 
   /// Concurrency strategy for an Acceptor.
   ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy_;
diff --git a/dep/acelite/ace/Activation_Queue.cpp b/dep/acelite/ace/Activation_Queue.cpp
index 777dc3ad0..d2677e7c2 100644
--- a/dep/acelite/ace/Activation_Queue.cpp
+++ b/dep/acelite/ace/Activation_Queue.cpp
@@ -1,4 +1,4 @@
-// $Id: Activation_Queue.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Activation_Queue.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Activation_Queue.h"
 
@@ -6,7 +6,7 @@
 #include "ace/Activation_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Method_Request.h"
 #include "ace/Malloc_Base.h"
 #include "ace/Time_Value.h"
@@ -17,19 +17,19 @@ void
 ACE_Activation_Queue::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("delete_queue_ = %d\n"),
               this->delete_queue_));
-  ACE_DEBUG ((LM_INFO, ACE_TEXT ("queue_:\n")));
+  ACELIB_DEBUG ((LM_INFO, ACE_TEXT ("queue_:\n")));
   if (this->queue_)
     this->queue_->dump();
   else
     //FUZZ: disable check_for_NULL
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(NULL)\n")));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(NULL)\n")));
     //FUZZ: enable check_for_NULL
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Activation_Queue.h b/dep/acelite/ace/Activation_Queue.h
index ab58eedb5..758ad56ae 100644
--- a/dep/acelite/ace/Activation_Queue.h
+++ b/dep/acelite/ace/Activation_Queue.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Activation_Queue.h
  *
- *  $Id: Activation_Queue.h 91066 2010-07-12 11:05:04Z johnnyw $
+ *  $Id: Activation_Queue.h 97436 2013-11-25 10:48:49Z johnnyw $
  *
  *  @author Andres Kruse <Andres.Kruse@cern.ch>
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
@@ -49,7 +49,7 @@ class ACE_Method_Request;
  *
  * @sa ACE_Method_Request
  */
-class ACE_Export ACE_Activation_Queue : private ACE_Copy_Disabled
+class ACE_Export ACE_Activation_Queue
 {
 public:
   /// Constructor.
@@ -156,6 +156,8 @@ private:
   /// Allocation strategy of the message blocks.
   ACE_Allocator *data_block_allocator_;
 
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Activation_Queue &))
+  ACE_UNIMPLEMENTED_FUNC (ACE_Activation_Queue (const ACE_Activation_Queue &))
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Addr.cpp b/dep/acelite/ace/Addr.cpp
index 1caf3f6ae..86f49a4f0 100644
--- a/dep/acelite/ace/Addr.cpp
+++ b/dep/acelite/ace/Addr.cpp
@@ -1,4 +1,4 @@
-// $Id: Addr.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Addr.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Addr.h"
 
@@ -6,7 +6,7 @@
 #include "ace/Addr.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/os_include/sys/os_socket.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -57,10 +57,10 @@ ACE_Addr::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Addr::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("addr_type_ = %d"), this->addr_type_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\naddr_size_ = %d"), this->addr_size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("addr_type_ = %d"), this->addr_type_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\naddr_size_ = %d"), this->addr_size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Array_Map.h b/dep/acelite/ace/Array_Map.h
index 0bd3b1ffe..5fe7f5268 100644
--- a/dep/acelite/ace/Array_Map.h
+++ b/dep/acelite/ace/Array_Map.h
@@ -4,7 +4,7 @@
 /**
  * @file    Array_Map.h
  *
- * $Id: Array_Map.h 92386 2010-10-28 07:44:37Z johnnyw $
+ * $Id: Array_Map.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  * Light weight array-based map with fast iteration but linear
  * (i.e. O(n)) search times.  STL-style interface is exposed.
@@ -22,7 +22,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/Assert.cpp b/dep/acelite/ace/Assert.cpp
index 526899621..ee8d56740 100644
--- a/dep/acelite/ace/Assert.cpp
+++ b/dep/acelite/ace/Assert.cpp
@@ -1,7 +1,7 @@
-// $Id: Assert.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Assert.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Assert.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dep/acelite/ace/Asynch_Acceptor.cpp b/dep/acelite/ace/Asynch_Acceptor.cpp
index 916b250b7..498f9fdbb 100644
--- a/dep/acelite/ace/Asynch_Acceptor.cpp
+++ b/dep/acelite/ace/Asynch_Acceptor.cpp
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-// $Id: Asynch_Acceptor.cpp 95630 2012-03-22 13:04:47Z johnnyw $
+// $Id: Asynch_Acceptor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_ASYNCH_ACCEPTOR_C
 #define ACE_ASYNCH_ACCEPTOR_C
@@ -16,7 +16,7 @@
 #include "ace/OS_Errno.h"
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_sys_socket.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Message_Block.h"
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Stream.h"
@@ -69,7 +69,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
   // Create the listener socket
   this->listen_handle_ = ACE_OS::socket (address.get_type (), SOCK_STREAM, 0);
   if (this->listen_handle_ == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("ACE_OS::socket")),
                       -1);
@@ -80,7 +80,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
                                  this->proactor ()) == -1)
     {
       ACE_Errno_Guard g (errno);
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p\n"),
                   ACE_TEXT ("ACE_Asynch_Accept::open")));
       ACE_OS::closesocket (this->listen_handle_);
@@ -99,7 +99,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
                               sizeof one) == -1)
         {
           ACE_Errno_Guard g (errno);
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("ACE_OS::setsockopt")));
           ACE_OS::closesocket (this->listen_handle_);
@@ -117,7 +117,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
                       address.get_type()) == -1)
     {
       ACE_Errno_Guard g (errno);
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p\n"),
                   ACE_TEXT ("ACE::bind_port")));
       ACE_OS::closesocket (this->listen_handle_);
@@ -131,7 +131,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
                     address.get_size ()) == -1)
     {
       ACE_Errno_Guard g (errno);
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p\n"),
                   ACE_TEXT ("ACE_OS::bind")));
       ACE_OS::closesocket (this->listen_handle_);
@@ -143,7 +143,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
   if (ACE_OS::listen (this->listen_handle_, backlog) == -1)
     {
       ACE_Errno_Guard g (errno);
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p\n"),
                   ACE_TEXT ("ACE_OS::listen")));
       ACE_OS::closesocket (this->listen_handle_);
@@ -161,7 +161,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
       if (this->accept (bytes_to_read) == -1)
         {
           ACE_Errno_Guard g (errno);
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("ACE_Asynch_Acceptor::accept")));
           ACE_OS::closesocket (this->listen_handle_);
@@ -186,7 +186,7 @@ ACE_Asynch_Acceptor<HANDLER>::set_handle (ACE_HANDLE listen_handle)
                                  this->listen_handle_,
                                  0,
                                  this->proactor ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("ACE_Asynch_Accept::open")),
                       -1);
diff --git a/dep/acelite/ace/Asynch_Connector.cpp b/dep/acelite/ace/Asynch_Connector.cpp
index 466d48646..5876c0751 100644
--- a/dep/acelite/ace/Asynch_Connector.cpp
+++ b/dep/acelite/ace/Asynch_Connector.cpp
@@ -1,4 +1,4 @@
-// $Id: Asynch_Connector.cpp 92069 2010-09-28 11:38:59Z johnnyw $
+// $Id: Asynch_Connector.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_ASYNCH_CONNECTOR_CPP
 #define ACE_ASYNCH_CONNECTOR_CPP
@@ -15,7 +15,7 @@
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/OS_Memory.h"
 #include "ace/Flag_Manip.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Message_Block.h"
 #include "ace/INET_Addr.h"
 
@@ -48,7 +48,7 @@ ACE_Asynch_Connector<HANDLER>::open (bool pass_addresses,
                                   ACE_INVALID_HANDLE,
                                   0,
                                   this->proactor ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("ACE_Asynch_Connect::open")),
                       -1);
@@ -67,7 +67,7 @@ ACE_Asynch_Connector<HANDLER>::connect (const ACE_INET_Addr & remote_sap,
                                      local_sap,
                                      reuse_addr,
                                      act) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("ACE_Asynch_Connect::connect")),
                       -1);
@@ -98,7 +98,7 @@ ACE_Asynch_Connector<HANDLER>::handle_connect (const ACE_Asynch_Connect::Result
         (result.connect_handle (), ACE_NONBLOCK) != 0)
     {
       error = 1;
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p\n"),
                   ACE_TEXT ("ACE_Asynch_Connector::handle_connect : Set blocking mode")));
     }
@@ -128,7 +128,7 @@ ACE_Asynch_Connector<HANDLER>::handle_connect (const ACE_Asynch_Connect::Result
       if (new_handler == 0)
         {
           error = 1;
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("ACE_Asynch_Connector::handle_connect : Making of new handler failed")));
         }
@@ -203,7 +203,7 @@ ACE_Asynch_Connector<HANDLER>::parse_address (const ACE_Asynch_Connect::Result &
   if (ACE_OS::getsockname (result.connect_handle (),
                            reinterpret_cast<sockaddr *> (&local_addr),
                            &local_size) < 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT("%p\n"),
                 ACE_TEXT("ACE_Asynch_Connector::<getsockname> failed")));
 
@@ -211,7 +211,7 @@ ACE_Asynch_Connector<HANDLER>::parse_address (const ACE_Asynch_Connect::Result &
   if (ACE_OS::getpeername (result.connect_handle (),
                            reinterpret_cast<sockaddr *> (&remote_addr),
                            &remote_size) < 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT("%p\n"),
                 ACE_TEXT("ACE_Asynch_Connector::<getpeername> failed")));
 
diff --git a/dep/acelite/ace/Asynch_IO.h b/dep/acelite/ace/Asynch_IO.h
index 641e22a8d..058b83f69 100644
--- a/dep/acelite/ace/Asynch_IO.h
+++ b/dep/acelite/ace/Asynch_IO.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Asynch_IO.h
  *
- *  $Id: Asynch_IO.h 84837 2009-03-16 13:01:15Z johnnyw $
+ *  $Id: Asynch_IO.h 97246 2013-08-07 07:10:20Z johnnyw $
  *
  *  This works on Win32 (defined (ACE_WIN32) && !defined
  *  (ACE_HAS_WINCE)) platforms and on POSIX4 platforms with {aio_*}
@@ -1697,6 +1697,7 @@ protected:
   /// Refers to proxy for this handler.
   ACE_Refcounted_Auto_Ptr<Proxy, ACE_SYNCH_MUTEX> proxy_;
 
+private:
   ACE_UNIMPLEMENTED_FUNC (ACE_Handler (const ACE_Handler &))
   ACE_UNIMPLEMENTED_FUNC (ACE_Handler operator= (const ACE_Handler &))
 };
diff --git a/dep/acelite/ace/Asynch_Pseudo_Task.cpp b/dep/acelite/ace/Asynch_Pseudo_Task.cpp
index e5d4b3b4e..ff8da27db 100644
--- a/dep/acelite/ace/Asynch_Pseudo_Task.cpp
+++ b/dep/acelite/ace/Asynch_Pseudo_Task.cpp
@@ -1,4 +1,4 @@
-// $Id: Asynch_Pseudo_Task.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Asynch_Pseudo_Task.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Asynch_Pseudo_Task.h"
 
@@ -22,7 +22,7 @@ int
 ACE_Asynch_Pseudo_Task::start (void)
 {
   if (this->reactor_.initialized () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%N:%l:%p\n"),
                        ACE_TEXT ("start reactor is not initialized")),
                        -1);
@@ -56,7 +56,7 @@ ACE_Asynch_Pseudo_Task::svc (void)
     sigaddset (&RT_signals, si);
 
   if (ACE_OS::pthread_sigmask (SIG_BLOCK, &RT_signals, 0) != 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("Error:(%P | %t):%p\n"),
                 ACE_TEXT ("pthread_sigmask")));
 #endif
@@ -86,7 +86,7 @@ ACE_Asynch_Pseudo_Task::register_io_handler (ACE_HANDLE handle,
   // by the application.
   if (this->reactor_.suspend_handler (handle) == -1)
     {
-      ACE_ERROR
+      ACELIB_ERROR
         ((LM_ERROR,
           ACE_TEXT ("%N:%l:%p\n"),
           ACE_TEXT ("register_io_handler (suspended)")));
diff --git a/dep/acelite/ace/Atomic_Op.cpp b/dep/acelite/ace/Atomic_Op.cpp
index 32e5c1136..15be89e51 100644
--- a/dep/acelite/ace/Atomic_Op.cpp
+++ b/dep/acelite/ace/Atomic_Op.cpp
@@ -1,4 +1,4 @@
-// $Id: Atomic_Op.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Atomic_Op.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Atomic_Op.h"
 #include "ace/OS_NS_unistd.h"
@@ -263,8 +263,8 @@ void
 ACE_Atomic_Op<ACE_Thread_Mutex, long>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -296,8 +296,8 @@ void
 ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Atomic_Op.h b/dep/acelite/ace/Atomic_Op.h
index e2f477fbb..5c8673ebe 100644
--- a/dep/acelite/ace/Atomic_Op.h
+++ b/dep/acelite/ace/Atomic_Op.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Atomic_Op.h
  *
- *  $Id: Atomic_Op.h 95225 2011-12-05 20:25:15Z shuston $
+ *  $Id: Atomic_Op.h 96147 2012-09-15 01:13:21Z shuston $
  *
  *  @author Douglas C. Schmidt <schmidt@uci.edu>
  */
@@ -312,6 +312,31 @@ public:
   ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &operator= (unsigned long rhs);
 };
 
+// The long long intrinsics are not available on PPC
+#if !defined (__powerpc__)
+template<>
+class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, long long>
+: public ACE_Atomic_Op_GCC<long long>
+{
+public:
+  ACE_Atomic_Op (void);
+  ACE_Atomic_Op (long long c);
+  ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, long long> &c);
+  ACE_Atomic_Op<ACE_Thread_Mutex, long long> &operator= (long long rhs);
+};
+
+template<>
+class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>
+: public ACE_Atomic_Op_GCC<unsigned long long>
+{
+public:
+  ACE_Atomic_Op (void);
+  ACE_Atomic_Op (unsigned long long c);
+  ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> &c);
+  ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> &operator= (unsigned long long rhs);
+};
+#endif /* !__powerpc__ */
+
 #if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_2)
 template<>
 class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, short>
diff --git a/dep/acelite/ace/Atomic_Op.inl b/dep/acelite/ace/Atomic_Op.inl
index e1f1ca211..711147864 100644
--- a/dep/acelite/ace/Atomic_Op.inl
+++ b/dep/acelite/ace/Atomic_Op.inl
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: Atomic_Op.inl 95225 2011-12-05 20:25:15Z shuston $
+// $Id: Atomic_Op.inl 96147 2012-09-15 01:13:21Z shuston $
 
 #if defined (ACE_HAS_INTRINSIC_INTERLOCKED)
 # include "ace/os_include/os_intrin.h"
@@ -525,6 +525,61 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator= (unsigned long rhs)
   return *this;
 }
 
+// The long long intrinsics are not available on PPC
+#if !defined (__powerpc__)
+ACE_INLINE
+ACE_Atomic_Op<ACE_Thread_Mutex, long long>::ACE_Atomic_Op (void) :
+  ACE_Atomic_Op_GCC<long long>()
+{
+}
+
+ACE_INLINE
+ACE_Atomic_Op<ACE_Thread_Mutex, long long>::ACE_Atomic_Op (long long c) :
+  ACE_Atomic_Op_GCC<long long>(c)
+{
+}
+
+ACE_INLINE
+ACE_Atomic_Op<ACE_Thread_Mutex, long long>::ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, long long> &c) :
+  ACE_Atomic_Op_GCC<long long>(c)
+{
+}
+
+ACE_INLINE
+ACE_Atomic_Op<ACE_Thread_Mutex, long long>&
+ACE_Atomic_Op<ACE_Thread_Mutex, long long>::operator= (long long rhs)
+{
+  ACE_Atomic_Op_GCC<long long>::operator= (rhs);
+  return *this;
+}
+
+ACE_INLINE
+ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>::ACE_Atomic_Op (void) :
+  ACE_Atomic_Op_GCC<unsigned long  long> ()
+{
+}
+
+ACE_INLINE
+ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long  long>::ACE_Atomic_Op (unsigned long long c) :
+  ACE_Atomic_Op_GCC<unsigned long long>(c)
+{
+}
+
+ACE_INLINE
+ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>::ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> &c) :
+  ACE_Atomic_Op_GCC<unsigned long long>(c)
+{
+}
+
+ACE_INLINE
+ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>&
+ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>::operator= (unsigned long long rhs)
+{
+  ACE_Atomic_Op_GCC<unsigned long long>::operator= (rhs);
+  return *this;
+}
+#endif /* !__powerpc__ */
+
 #if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_2)
 ACE_INLINE
 ACE_Atomic_Op<ACE_Thread_Mutex, short>::ACE_Atomic_Op (void) :
diff --git a/dep/acelite/ace/Atomic_Op_GCC_T.cpp b/dep/acelite/ace/Atomic_Op_GCC_T.cpp
index 6b1eb60a2..d273f6e73 100644
--- a/dep/acelite/ace/Atomic_Op_GCC_T.cpp
+++ b/dep/acelite/ace/Atomic_Op_GCC_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Atomic_Op_GCC_T.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Atomic_Op_GCC_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/OS_NS_unistd.h"
 
@@ -15,8 +15,8 @@ void
 ACE_Atomic_Op_GCC<T>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Atomic_Op_T.cpp b/dep/acelite/ace/Atomic_Op_T.cpp
index de1fd7dd0..24a5e45c7 100644
--- a/dep/acelite/ace/Atomic_Op_T.cpp
+++ b/dep/acelite/ace/Atomic_Op_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Atomic_Op_T.cpp 92052 2010-09-27 14:20:22Z vzykov $
+// $Id: Atomic_Op_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_ATOMIC_OP_T_CPP
 #define ACE_ATOMIC_OP_T_CPP
@@ -6,7 +6,7 @@
 #include "ace/Atomic_Op_T.h"
 
 #ifdef ACE_HAS_DUMP
-# include "ace/Log_Msg.h"
+# include "ace/Log_Category.h"
 #endif  /* ACE_HAS_DUMP */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -36,9 +36,9 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->mutex_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Auto_Event.cpp b/dep/acelite/ace/Auto_Event.cpp
index 331edb4bf..7fb27c497 100644
--- a/dep/acelite/ace/Auto_Event.cpp
+++ b/dep/acelite/ace/Auto_Event.cpp
@@ -1,4 +1,4 @@
-// $Id: Auto_Event.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: Auto_Event.cpp 96220 2012-11-06 10:03:41Z mcorino $
 
 #include "ace/Auto_Event.h"
 
@@ -8,37 +8,42 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Auto_Event::ACE_Auto_Event (int initial_state,
-                                int type,
-                                const char *name,
-                                void *arg)
-  : ACE_Event (0,
-               initial_state,
-               type,
-               ACE_TEXT_CHAR_TO_TCHAR (name),
-               arg)
+template <class TIME_POLICY>
+ACE_Auto_Event_T<TIME_POLICY>::ACE_Auto_Event_T (
+    int initial_state,
+    int type,
+    const char *name,
+    void *arg)
+  : ACE_Event_T<TIME_POLICY> (0,
+                              initial_state,
+                              type,
+                              ACE_TEXT_CHAR_TO_TCHAR (name),
+                              arg)
 {
 }
 
 #if defined (ACE_HAS_WCHAR)
-ACE_Auto_Event::ACE_Auto_Event (int initial_state,
-                                int type,
-                                const wchar_t *name,
-                                void *arg)
-  : ACE_Event (0,
-               initial_state,
-               type,
-               ACE_TEXT_WCHAR_TO_TCHAR (name),
-               arg)
+template <class TIME_POLICY>
+ACE_Auto_Event_T<TIME_POLICY>::ACE_Auto_Event_T (
+    int initial_state,
+    int type,
+    const wchar_t *name,
+    void *arg)
+  : ACE_Event_T<TIME_POLICY> (0,
+                              initial_state,
+                              type,
+                              ACE_TEXT_WCHAR_TO_TCHAR (name),
+                              arg)
 {
 }
 #endif /* ACE_HAS_WCHAR */
 
+template <class TIME_POLICY>
 void
-ACE_Auto_Event::dump (void) const
+ACE_Auto_Event_T<TIME_POLICY>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_Event::dump ();
+  ACE_Event_T<TIME_POLICY>::dump ();
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Auto_Event.h b/dep/acelite/ace/Auto_Event.h
index 9699759ad..a75bd78e7 100644
--- a/dep/acelite/ace/Auto_Event.h
+++ b/dep/acelite/ace/Auto_Event.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Auto_Event.h
  *
- *  $Id: Auto_Event.h 91781 2010-09-15 12:49:15Z johnnyw $
+ *  $Id: Auto_Event.h 96749 2013-02-02 19:08:38Z johnnyw $
  *
  *   Moved from Synch.h.
  *
@@ -36,25 +36,26 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * support.  However, only Win32 platforms support global naming and
  * system-scope locking support.
  */
-class ACE_Export ACE_Auto_Event : public ACE_Event
+template <class TIME_POLICY = ACE_System_Time_Policy>
+class ACE_Auto_Event_T : public ACE_Event_T<TIME_POLICY>
 {
 public:
   /// Constructor which will create auto event
-  ACE_Auto_Event (int initial_state = 0,
-                  int type = USYNC_THREAD,
-                  const char *name = 0,
-                  void *arg = 0);
+  ACE_Auto_Event_T (int initial_state = 0,
+                    int type = USYNC_THREAD,
+                    const char *name = 0,
+                    void *arg = 0);
 
 #if defined (ACE_HAS_WCHAR)
   /// Constructor which will create auto event (wchar_t version)
-  ACE_Auto_Event (int initial_state,
-                  int type,
-                  const wchar_t *name,
-                  void *arg = 0);
+  ACE_Auto_Event_T (int initial_state,
+                    int type,
+                    const wchar_t *name,
+                    void *arg = 0);
 #endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
-  ~ACE_Auto_Event (void);
+  virtual ~ACE_Auto_Event_T (void);
 
   /// Dump the state of an object.
   void dump (void) const;
@@ -63,11 +64,49 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+class ACE_Auto_Event :
+  public ACE_Auto_Event_T<ACE_System_Time_Policy>
+{
+public:
+  /// Constructor which will create auto event
+  ACE_Auto_Event (int initial_state = 0,
+                  int type = USYNC_THREAD,
+                  const char *name = 0,
+                  void *arg = 0)
+  : ACE_Auto_Event_T<ACE_System_Time_Policy> (initial_state, type, name, arg)
+  {
+  }
+
+#if defined (ACE_HAS_WCHAR)
+  /// Constructor which will create auto event (wchar_t version)
+  ACE_Auto_Event (int initial_state,
+                  int type,
+                  const wchar_t *name,
+                  void *arg = 0)
+  : ACE_Auto_Event_T<ACE_System_Time_Policy> (initial_state, type, name, arg)
+  {
+  }
+#endif /* ACE_HAS_WCHAR */
+
+  /// Default dtor.
+  virtual ~ACE_Auto_Event (void)
+  {
+  }
+};
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Auto_Event.inl"
 #endif /* __ACE_INLINE__ */
 
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "ace/Auto_Event.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Auto_Event.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
 #include /**/ "ace/post.h"
 #endif /* ACE_AUTO_EVENT_H */
diff --git a/dep/acelite/ace/Auto_Event.inl b/dep/acelite/ace/Auto_Event.inl
index b614e0b0d..73427df33 100644
--- a/dep/acelite/ace/Auto_Event.inl
+++ b/dep/acelite/ace/Auto_Event.inl
@@ -1,11 +1,12 @@
 // -*- C++ -*-
 //
-// $Id: Auto_Event.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Auto_Event.inl 96220 2012-11-06 10:03:41Z mcorino $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+template <class TIME_POLICY>
 ACE_INLINE
-ACE_Auto_Event::~ACE_Auto_Event (void)
+ACE_Auto_Event_T<TIME_POLICY>::~ACE_Auto_Event_T (void)
 {
 }
 
diff --git a/dep/acelite/ace/Auto_IncDec_T.cpp b/dep/acelite/ace/Auto_IncDec_T.cpp
index ccef122ed..137d8ff48 100644
--- a/dep/acelite/ace/Auto_IncDec_T.cpp
+++ b/dep/acelite/ace/Auto_IncDec_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Auto_IncDec_T.cpp 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Auto_IncDec_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_AUTO_INCDEC_T_CPP
 #define ACE_AUTO_INCDEC_T_CPP
@@ -8,7 +8,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Auto_IncDec_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Auto_IncDec_T.inl"
@@ -24,8 +24,8 @@ ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>::dump (void) const
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Auto_IncDec_T.h b/dep/acelite/ace/Auto_IncDec_T.h
index 86fa65523..ef2709c14 100644
--- a/dep/acelite/ace/Auto_IncDec_T.h
+++ b/dep/acelite/ace/Auto_IncDec_T.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Auto_IncDec_T.h
  *
- *  $Id: Auto_IncDec_T.h 92353 2010-10-25 06:34:35Z johnnyw $
+ *  $Id: Auto_IncDec_T.h 97879 2014-09-08 13:29:28Z johnnyw $
  *
  *  @author Edan Ayal <EdanA@cti2.com>
  */
@@ -38,7 +38,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * must provide at least operators ++ and --.
  */
 template <class ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>
-class ACE_Auto_IncDec : private ACE_Copy_Disabled
+class ACE_Auto_IncDec
 {
 public:
   /// Implicitly increment the counter.
@@ -54,6 +54,9 @@ protected:
   /// Reference to the @c ACE_SAFELY_INCREMENTABLE_DECREMENTABLE counter
   /// we're incrementing/decrementing.
   ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter_;
+private:
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> &))
+  ACE_UNIMPLEMENTED_FUNC (ACE_Auto_IncDec (const ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> &))
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Barrier.cpp b/dep/acelite/ace/Barrier.cpp
index b55ee1c41..4c963bbd7 100644
--- a/dep/acelite/ace/Barrier.cpp
+++ b/dep/acelite/ace/Barrier.cpp
@@ -1,4 +1,4 @@
-// $Id: Barrier.cpp 92069 2010-09-28 11:38:59Z johnnyw $
+// $Id: Barrier.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Barrier.h"
 
@@ -12,7 +12,7 @@
 #include "ace/OS_NS_errno.h"
 
 #if defined (ACE_HAS_DUMP)
-#  include "ace/Log_Msg.h"
+#  include "ace/Log_Category.h"
 #endif /* ACE_HAS_DUMP */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -25,10 +25,10 @@ ACE_Sub_Barrier::dump (void) const
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Sub_Barrier::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->barrier_finished_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("running_threads_ = %d\n"), this->running_threads_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("running_threads_ = %d\n"), this->running_threads_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -50,13 +50,13 @@ ACE_Barrier::dump (void) const
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Barrier::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_generation_ = %d"), this->current_generation_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncount_ = %d"), this->count_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("current_generation_ = %d"), this->current_generation_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncount_ = %d"), this->count_));
   this->sub_barrier_1_.dump ();
   this->sub_barrier_2_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Based_Pointer_Repository.cpp b/dep/acelite/ace/Based_Pointer_Repository.cpp
index 4ebe8b82c..6143c4bd8 100644
--- a/dep/acelite/ace/Based_Pointer_Repository.cpp
+++ b/dep/acelite/ace/Based_Pointer_Repository.cpp
@@ -1,4 +1,4 @@
-// $Id: Based_Pointer_Repository.cpp 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Based_Pointer_Repository.cpp 97383 2013-10-23 08:44:20Z mhengstmengel $
 
 #include "ace/Map_Manager.h"
 #include "ace/Based_Pointer_Repository.h"
@@ -111,9 +111,7 @@ ACE_Based_Pointer_Repository::unbind (void *addr)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-template ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX> *
-  ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX);
+
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Based_Pointer_T.cpp b/dep/acelite/ace/Based_Pointer_T.cpp
index b85774db4..d2fd33531 100644
--- a/dep/acelite/ace/Based_Pointer_T.cpp
+++ b/dep/acelite/ace/Based_Pointer_T.cpp
@@ -1,11 +1,11 @@
-// $Id: Based_Pointer_T.cpp 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Based_Pointer_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_BASED_POINTER_T_CPP
 #define ACE_BASED_POINTER_T_CPP
 
 #include "ace/Based_Pointer_T.h"
 #include "ace/Based_Pointer_Repository.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #   define ACE_TRACEX(X) ACE_Trace ____ (ACE_TEXT (X), __LINE__, ACE_TEXT (__FILE__))
 
@@ -27,12 +27,12 @@ ACE_Based_Pointer_Basic<CONCRETE>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntarget_ = %d\n"), this->target_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base_offset_ = %d\n"), this->base_offset_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("computed pointer = %x\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntarget_ = %d\n"), this->target_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("base_offset_ = %d\n"), this->base_offset_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("computed pointer = %x\n"),
               (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this))));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Basic_Stats.cpp b/dep/acelite/ace/Basic_Stats.cpp
index 93c4c0bdd..9565ce494 100644
--- a/dep/acelite/ace/Basic_Stats.cpp
+++ b/dep/acelite/ace/Basic_Stats.cpp
@@ -1,7 +1,7 @@
-// $Id: Basic_Stats.cpp 95743 2012-05-13 12:29:28Z johnnyw $
+// $Id: Basic_Stats.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Basic_Stats.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Basic_Stats.inl"
@@ -49,7 +49,7 @@ ACE_Basic_Stats::dump_results (
 #ifndef ACE_NLOGGING
   if (this->samples_count () == 0u)
     {
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("%s : no data collected\n"), msg));
       return;
     }
@@ -60,7 +60,7 @@ ACE_Basic_Stats::dump_results (
   ACE_UINT64 l_max = this->max_ / sf;
   ACE_UINT64 l_avg = avg / sf;
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("%s latency   : %Q[%d]/%Q/%Q[%d] (min/avg/max)\n"),
               msg,
               l_min, this->min_at_,
diff --git a/dep/acelite/ace/Basic_Types.h b/dep/acelite/ace/Basic_Types.h
index fc275ee31..f674dcce2 100644
--- a/dep/acelite/ace/Basic_Types.h
+++ b/dep/acelite/ace/Basic_Types.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Basic_Types.h
  *
- *  $Id: Basic_Types.h 96017 2012-08-08 22:18:09Z mitza $
+ *  $Id: Basic_Types.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author David L. Levine
  *
@@ -39,7 +39,7 @@
  */
 //=============================================================================
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #ifndef ACE_BASIC_TYPES_H
 # define ACE_BASIC_TYPES_H
@@ -55,6 +55,7 @@
 # include "ace/os_include/os_float.h"      // Floating point limits
 # include "ace/os_include/os_stdlib.h"     // Other types
 # include "ace/os_include/os_stddef.h"     // Get ptrdiff_t - see further comments below
+# include "ace/os_include/arpa/os_inet.h"  // For htons
 
 # include "ace/os_include/sys/os_types.h"
 
@@ -311,53 +312,53 @@ typedef unsigned char ACE_Byte;
 // Define a pseudo wide character type when wchar is not supported so we
 // can support basic wide character string operations.
 
-# if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
-#   define ACE_WINT_T wint_t
-#   define ACE_WCHAR_T wchar_t
-# else
-#   define ACE_WINT_T ACE_UINT16
-#   define ACE_WCHAR_T ACE_UINT16
-# endif /* ACE_HAS_WCHAR */
+#if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
+#  define ACE_WINT_T wint_t
+#  define ACE_WCHAR_T wchar_t
+#else
+#  define ACE_WINT_T ACE_UINT16
+#  define ACE_WCHAR_T ACE_UINT16
+#endif /* ACE_HAS_WCHAR */
 
 // The number of bytes in a void *.
-# ifndef ACE_SIZEOF_VOID_P
-#   define ACE_SIZEOF_VOID_P ACE_SIZEOF_LONG
-# endif /* ACE_SIZEOF_VOID_P */
+#ifndef ACE_SIZEOF_VOID_P
+#  define ACE_SIZEOF_VOID_P ACE_SIZEOF_LONG
+#endif /* ACE_SIZEOF_VOID_P */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 // Byte-order (endian-ness) determination.
-# if defined (BYTE_ORDER)
-#   if (BYTE_ORDER == LITTLE_ENDIAN)
-#     define ACE_LITTLE_ENDIAN 0x0123
-#     define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN
-#   elif (BYTE_ORDER == BIG_ENDIAN)
-#     define ACE_BIG_ENDIAN 0x3210
-#     define ACE_BYTE_ORDER ACE_BIG_ENDIAN
-#   else
-#     error: unknown BYTE_ORDER!
-#   endif /* BYTE_ORDER */
-# elif defined (_BYTE_ORDER)
-#   if (_BYTE_ORDER == _LITTLE_ENDIAN)
-#     define ACE_LITTLE_ENDIAN 0x0123
-#     define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN
-#   elif (_BYTE_ORDER == _BIG_ENDIAN)
-#     define ACE_BIG_ENDIAN 0x3210
-#     define ACE_BYTE_ORDER ACE_BIG_ENDIAN
-#   else
-#     error: unknown _BYTE_ORDER!
-#   endif /* _BYTE_ORDER */
-# elif defined (__BYTE_ORDER)
-#   if (__BYTE_ORDER == __LITTLE_ENDIAN)
-#     define ACE_LITTLE_ENDIAN 0x0123
-#     define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN
-#   elif (__BYTE_ORDER == __BIG_ENDIAN)
-#     define ACE_BIG_ENDIAN 0x3210
-#     define ACE_BYTE_ORDER ACE_BIG_ENDIAN
-#   else
-#     error: unknown __BYTE_ORDER!
-#   endif /* __BYTE_ORDER */
-# else /* ! BYTE_ORDER && ! __BYTE_ORDER */
+#if defined (BYTE_ORDER)
+#  if (BYTE_ORDER == LITTLE_ENDIAN)
+#    define ACE_LITTLE_ENDIAN 0x0123
+#    define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN
+#  elif (BYTE_ORDER == BIG_ENDIAN)
+#    define ACE_BIG_ENDIAN 0x3210
+#    define ACE_BYTE_ORDER ACE_BIG_ENDIAN
+#  else
+#    error: unknown BYTE_ORDER!
+#  endif /* BYTE_ORDER */
+#elif defined (_BYTE_ORDER)
+#  if (_BYTE_ORDER == _LITTLE_ENDIAN)
+#    define ACE_LITTLE_ENDIAN 0x0123
+#    define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN
+#  elif (_BYTE_ORDER == _BIG_ENDIAN)
+#    define ACE_BIG_ENDIAN 0x3210
+#    define ACE_BYTE_ORDER ACE_BIG_ENDIAN
+#  else
+#    error: unknown _BYTE_ORDER!
+#  endif /* _BYTE_ORDER */
+#elif defined (__BYTE_ORDER)
+#  if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#    define ACE_LITTLE_ENDIAN 0x0123
+#    define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN
+#  elif (__BYTE_ORDER == __BIG_ENDIAN)
+#    define ACE_BIG_ENDIAN 0x3210
+#    define ACE_BYTE_ORDER ACE_BIG_ENDIAN
+#  else
+#    error: unknown __BYTE_ORDER!
+#  endif /* __BYTE_ORDER */
+#else /* ! BYTE_ORDER && ! __BYTE_ORDER */
   // We weren't explicitly told, so we have to figure it out . . .
   // Note that Itanium hardware (IA64) can run in either byte order. It's
   // selected by the OS when loading; Windows runs little, HP-UX runs big.
@@ -374,7 +375,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #     define ACE_BIG_ENDIAN 0x3210
 #     define ACE_BYTE_ORDER ACE_BIG_ENDIAN
 #   endif
-# endif /* ! BYTE_ORDER && ! __BYTE_ORDER */
+#endif /* ! BYTE_ORDER && ! __BYTE_ORDER */
 
 // Byte swapping macros to deal with differences between little endian
 // and big endian machines.  Note that "long" here refers to 32 bit
@@ -383,25 +384,19 @@ ACE_END_VERSIONED_NAMESPACE_DECL
             | ACE_SWAP_WORD(((L) >> 16) & 0xFFFF))
 # define ACE_SWAP_WORD(L) ((((L) & 0x00FF) << 8) | (((L) & 0xFF00) >> 8))
 
+# define ACE_HTONL(X) htonl (X)
+# define ACE_NTOHL(X) ntohl (X)
+
 # if defined (ACE_LITTLE_ENDIAN)
-#   define ACE_HTONL(X) ACE_SWAP_LONG (X)
-#   define ACE_NTOHL(X) ACE_SWAP_LONG (X)
 #   define ACE_IDL_NCTOHL(X) (X)
 #   define ACE_IDL_NSTOHL(X) (X)
 # else
-#   define ACE_HTONL(X) X
-#   define ACE_NTOHL(X) X
 #   define ACE_IDL_NCTOHL(X) (X << 24)
 #   define ACE_IDL_NSTOHL(X) ((X) << 16)
 # endif /* ACE_LITTLE_ENDIAN */
 
-# if defined (ACE_LITTLE_ENDIAN)
-#   define ACE_HTONS(x) ACE_SWAP_WORD(x)
-#   define ACE_NTOHS(x) ACE_SWAP_WORD(x)
-# else
-#   define ACE_HTONS(x) x
-#   define ACE_NTOHS(x) x
-# endif /* ACE_LITTLE_ENDIAN */
+#define ACE_HTONS(x) htons(x)
+#define ACE_NTOHS(x) ntohs(x)
 
 # define ACE_LONGLONG_TO_PTR(PTR_TYPE, L) \
      reinterpret_cast<PTR_TYPE> (static_cast<intptr_t> (L))
diff --git a/dep/acelite/ace/Bound_Ptr.inl b/dep/acelite/ace/Bound_Ptr.inl
index 06f03abd8..83a8dbfdf 100644
--- a/dep/acelite/ace/Bound_Ptr.inl
+++ b/dep/acelite/ace/Bound_Ptr.inl
@@ -1,11 +1,11 @@
 /* -*- C++ -*- */
-// $Id: Bound_Ptr.inl 91626 2010-09-07 10:59:20Z johnnyw $
+// $Id: Bound_Ptr.inl 96985 2013-04-11 15:50:32Z huangh $
 
 // Bound_Ptr.i
 
 #include "ace/Guard_T.h"
 #if !defined (ACE_NEW_THROWS_EXCEPTIONS)
-#  include "ace/Log_Msg.h"
+#  include "ace/Log_Category.h"
 #endif /* ACE_NEW_THROWS_EXCEPTIONS */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/CDR_Base.cpp b/dep/acelite/ace/CDR_Base.cpp
index 04e87f65c..11e0da336 100644
--- a/dep/acelite/ace/CDR_Base.cpp
+++ b/dep/acelite/ace/CDR_Base.cpp
@@ -1,4 +1,4 @@
-// $Id: CDR_Base.cpp 94251 2011-06-22 18:03:25Z parsons $
+// $Id: CDR_Base.cpp 97884 2014-09-08 18:00:53Z johnnyw $
 
 #include "ace/CDR_Base.h"
 
@@ -101,25 +101,25 @@ ACE_CDR::swap_2_array (char const * orig, char* target, size_t n)
           __asm mov 4[edx], ebx;
 #elif ACE_SIZEOF_LONG == 8
           // 64 bit architecture.
-          register unsigned long a =
+          ACE_REGISTER unsigned long a =
             * reinterpret_cast<const unsigned long*> (orig);
 
-          register unsigned long a1 = (a & 0x00ff00ff00ff00ffUL) << 8;
-          register unsigned long a2 = (a & 0xff00ff00ff00ff00UL) >> 8;
+          ACE_REGISTER unsigned long a1 = (a & 0x00ff00ff00ff00ffUL) << 8;
+          ACE_REGISTER unsigned long a2 = (a & 0xff00ff00ff00ff00UL) >> 8;
 
           a = (a1 | a2);
 
           * reinterpret_cast<unsigned long*> (target) = a;
 #else
-          register ACE_UINT32 a =
+          ACE_REGISTER ACE_UINT32 a =
             * reinterpret_cast<const ACE_UINT32*> (orig);
-          register ACE_UINT32 b =
+          ACE_REGISTER ACE_UINT32 b =
             * reinterpret_cast<const ACE_UINT32*> (orig + 4);
 
-          register ACE_UINT32 a1 = (a & 0x00ff00ffU) << 8;
-          register ACE_UINT32 b1 = (b & 0x00ff00ffU) << 8;
-          register ACE_UINT32 a2 = (a & 0xff00ff00U) >> 8;
-          register ACE_UINT32 b2 = (b & 0xff00ff00U) >> 8;
+          ACE_REGISTER ACE_UINT32 a1 = (a & 0x00ff00ffU) << 8;
+          ACE_REGISTER ACE_UINT32 b1 = (b & 0x00ff00ffU) << 8;
+          ACE_REGISTER ACE_UINT32 a2 = (a & 0xff00ff00U) >> 8;
+          ACE_REGISTER ACE_UINT32 b2 = (b & 0xff00ff00U) >> 8;
 
           a = (a1 | a2);
           b = (b1 | b2);
@@ -172,11 +172,11 @@ ACE_CDR::swap_2_array (char const * orig, char* target, size_t n)
           __asm mov 4[edx], bx;
 #elif ACE_SIZEOF_LONG == 8
           // 64 bit architecture.
-          register unsigned long a =
+          ACE_REGISTER unsigned long a =
             * reinterpret_cast<const unsigned long*> (orig);
 
-          register unsigned long a1 = (a & 0x00ff00ff00ff00ffUL) << 8;
-          register unsigned long a2 = (a & 0xff00ff00ff00ff00UL) >> 8;
+          ACE_REGISTER unsigned long a1 = (a & 0x00ff00ff00ff00ffUL) << 8;
+          ACE_REGISTER unsigned long a2 = (a & 0xff00ff00ff00ff00UL) >> 8;
 
           a = (a1 | a2);
 
@@ -197,15 +197,15 @@ ACE_CDR::swap_2_array (char const * orig, char* target, size_t n)
           * reinterpret_cast<ACE_UINT16*> (target + 6) = b4;
 #endif
 #else
-          register ACE_UINT32 a =
+          ACE_REGISTER ACE_UINT32 a =
             * reinterpret_cast<const ACE_UINT32*> (orig);
-          register ACE_UINT32 b =
+          ACE_REGISTER ACE_UINT32 b =
             * reinterpret_cast<const ACE_UINT32*> (orig + 4);
 
-          register ACE_UINT32 a1 = (a & 0x00ff00ff) << 8;
-          register ACE_UINT32 b1 = (b & 0x00ff00ff) << 8;
-          register ACE_UINT32 a2 = (a & 0xff00ff00) >> 8;
-          register ACE_UINT32 b2 = (b & 0xff00ff00) >> 8;
+          ACE_REGISTER ACE_UINT32 a1 = (a & 0x00ff00ff) << 8;
+          ACE_REGISTER ACE_UINT32 b1 = (b & 0x00ff00ff) << 8;
+          ACE_REGISTER ACE_UINT32 a2 = (a & 0xff00ff00) >> 8;
+          ACE_REGISTER ACE_UINT32 b2 = (b & 0xff00ff00) >> 8;
 
           a = (a1 | a2);
           b = (b1 | b2);
@@ -287,9 +287,9 @@ ACE_CDR::swap_4_array (char const * orig, char* target, size_t n)
     {
       while (orig < end)
         {
-          register unsigned long a =
+          ACE_REGISTER unsigned long a =
             * reinterpret_cast<const long*> (orig);
-          register unsigned long b =
+          ACE_REGISTER unsigned long b =
             * reinterpret_cast<const long*> (orig + 8);
 
 #if defined(ACE_HAS_INTEL_ASSEMBLY)
@@ -298,14 +298,14 @@ ACE_CDR::swap_4_array (char const * orig, char* target, size_t n)
           asm ("rol $32, %1" : "=r" (a) : "0" (a));
           asm ("rol $32, %1" : "=r" (b) : "0" (b));
 #else
-          register unsigned long a84 = (a & 0x000000ff000000ffL) << 24;
-          register unsigned long b84 = (b & 0x000000ff000000ffL) << 24;
-          register unsigned long a73 = (a & 0x0000ff000000ff00L) << 8;
-          register unsigned long b73 = (b & 0x0000ff000000ff00L) << 8;
-          register unsigned long a62 = (a & 0x00ff000000ff0000L) >> 8;
-          register unsigned long b62 = (b & 0x00ff000000ff0000L) >> 8;
-          register unsigned long a51 = (a & 0xff000000ff000000L) >> 24;
-          register unsigned long b51 = (b & 0xff000000ff000000L) >> 24;
+          ACE_REGISTER unsigned long a84 = (a & 0x000000ff000000ffL) << 24;
+          ACE_REGISTER unsigned long b84 = (b & 0x000000ff000000ffL) << 24;
+          ACE_REGISTER unsigned long a73 = (a & 0x0000ff000000ff00L) << 8;
+          ACE_REGISTER unsigned long b73 = (b & 0x0000ff000000ff00L) << 8;
+          ACE_REGISTER unsigned long a62 = (a & 0x00ff000000ff0000L) >> 8;
+          ACE_REGISTER unsigned long b62 = (b & 0x00ff000000ff0000L) >> 8;
+          ACE_REGISTER unsigned long a51 = (a & 0xff000000ff000000L) >> 24;
+          ACE_REGISTER unsigned long b51 = (b & 0xff000000ff000000L) >> 24;
 
           a = (a84 | a73 | a62 | a51);
           b = (b84 | b73 | b62 | b51);
@@ -323,9 +323,9 @@ ACE_CDR::swap_4_array (char const * orig, char* target, size_t n)
       // We are out of luck, we have to write in 4 byte chunks.
       while (orig < end)
         {
-          register unsigned long a =
+          ACE_REGISTER unsigned long a =
             * reinterpret_cast<const long*> (orig);
-          register unsigned long b =
+          ACE_REGISTER unsigned long b =
             * reinterpret_cast<const long*> (orig + 8);
 
 #if defined(ACE_HAS_INTEL_ASSEMBLY)
@@ -334,14 +334,14 @@ ACE_CDR::swap_4_array (char const * orig, char* target, size_t n)
           asm ("rol $32, %1" : "=r" (a) : "0" (a));
           asm ("rol $32, %1" : "=r" (b) : "0" (b));
 #else
-          register unsigned long a84 = (a & 0x000000ff000000ffL) << 24;
-          register unsigned long b84 = (b & 0x000000ff000000ffL) << 24;
-          register unsigned long a73 = (a & 0x0000ff000000ff00L) << 8;
-          register unsigned long b73 = (b & 0x0000ff000000ff00L) << 8;
-          register unsigned long a62 = (a & 0x00ff000000ff0000L) >> 8;
-          register unsigned long b62 = (b & 0x00ff000000ff0000L) >> 8;
-          register unsigned long a51 = (a & 0xff000000ff000000L) >> 24;
-          register unsigned long b51 = (b & 0xff000000ff000000L) >> 24;
+          ACE_REGISTER unsigned long a84 = (a & 0x000000ff000000ffL) << 24;
+          ACE_REGISTER unsigned long b84 = (b & 0x000000ff000000ffL) << 24;
+          ACE_REGISTER unsigned long a73 = (a & 0x0000ff000000ff00L) << 8;
+          ACE_REGISTER unsigned long b73 = (b & 0x0000ff000000ff00L) << 8;
+          ACE_REGISTER unsigned long a62 = (a & 0x00ff000000ff0000L) >> 8;
+          ACE_REGISTER unsigned long b62 = (b & 0x00ff000000ff0000L) >> 8;
+          ACE_REGISTER unsigned long a51 = (a & 0xff000000ff000000L) >> 24;
+          ACE_REGISTER unsigned long b51 = (b & 0xff000000ff000000L) >> 24;
 
           a = (a84 | a73 | a62 | a51);
           b = (b84 | b73 | b62 | b51);
@@ -373,13 +373,13 @@ ACE_CDR::swap_4_array (char const * orig, char* target, size_t n)
   while (orig < end)
     {
 #if defined (ACE_HAS_PENTIUM) && defined (__GNUG__)
-      register unsigned int a =
+      ACE_REGISTER unsigned int a =
         *reinterpret_cast<const unsigned int*> (orig);
-      register unsigned int b =
+      ACE_REGISTER unsigned int b =
         *reinterpret_cast<const unsigned int*> (orig + 4);
-      register unsigned int c =
+      ACE_REGISTER unsigned int c =
         *reinterpret_cast<const unsigned int*> (orig + 8);
-      register unsigned int d =
+      ACE_REGISTER unsigned int d =
         *reinterpret_cast<const unsigned int*> (orig + 12);
 
       asm ("bswap %1" : "=r" (a) : "0" (a));
@@ -409,13 +409,13 @@ ACE_CDR::swap_4_array (char const * orig, char* target, size_t n)
       __asm mov 8[esi], ebx
       __asm mov 12[esi], eax
 #else
-      register ACE_UINT32 a =
+      ACE_REGISTER ACE_UINT32 a =
         * reinterpret_cast<const ACE_UINT32*> (orig);
-      register ACE_UINT32 b =
+      ACE_REGISTER ACE_UINT32 b =
         * reinterpret_cast<const ACE_UINT32*> (orig + 4);
-      register ACE_UINT32 c =
+      ACE_REGISTER ACE_UINT32 c =
         * reinterpret_cast<const ACE_UINT32*> (orig + 8);
-      register ACE_UINT32 d =
+      ACE_REGISTER ACE_UINT32 d =
         * reinterpret_cast<const ACE_UINT32*> (orig + 12);
 
       // Expect the optimizer reordering this A LOT.
diff --git a/dep/acelite/ace/CDR_Base.h b/dep/acelite/ace/CDR_Base.h
index f32415225..32aa1b88b 100644
--- a/dep/acelite/ace/CDR_Base.h
+++ b/dep/acelite/ace/CDR_Base.h
@@ -4,7 +4,7 @@
 /**
  *  @file   CDR_Base.h
  *
- *  $Id: CDR_Base.h 95761 2012-05-15 18:23:04Z johnnyw $
+ *  $Id: CDR_Base.h 97885 2014-09-09 06:39:00Z johnnyw $
  *
  * ACE Common Data Representation (CDR) basic types.
  *
@@ -38,6 +38,7 @@
 
 #include "ace/Basic_Types.h"
 #include "ace/Default_Constants.h"
+#include "ace/Global_Macros.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dep/acelite/ace/CDR_Base.inl b/dep/acelite/ace/CDR_Base.inl
index 85373170a..f3229691c 100644
--- a/dep/acelite/ace/CDR_Base.inl
+++ b/dep/acelite/ace/CDR_Base.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: CDR_Base.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: CDR_Base.inl 97884 2014-09-08 18:00:53Z johnnyw $
 
 #if defined (ACE_HAS_INTRINSIC_BYTESWAP)
 // Take advantage of MSVC++ byte swapping compiler intrinsics (found
@@ -90,8 +90,8 @@ ACE_CDR::swap_2 (const char *orig, char* target)
   __asm rol ax, 8;
   __asm mov [ecx], ax;
 #else
-  register ACE_UINT16 usrc = * reinterpret_cast<const ACE_UINT16*> (orig);
-  register ACE_UINT16* udst = reinterpret_cast<ACE_UINT16*> (target);
+  ACE_REGISTER ACE_UINT16 usrc = * reinterpret_cast<const ACE_UINT16*> (orig);
+  ACE_REGISTER ACE_UINT16* udst = reinterpret_cast<ACE_UINT16*> (target);
   *udst = (usrc << 8) | (usrc >> 8);
 #endif /* ACE_HAS_PENTIUM */
 }
@@ -112,7 +112,7 @@ ACE_CDR::swap_4 (const char* orig, char* target)
     bswap_32 (*reinterpret_cast<uint32_t const *> (orig));
 #elif defined(ACE_HAS_INTEL_ASSEMBLY)
   // We have ACE_HAS_PENTIUM, so we know the sizeof's.
-  register unsigned int j =
+  ACE_REGISTER unsigned int j =
     *reinterpret_cast<const unsigned int*> (orig);
   asm ("bswap %1" : "=r" (j) : "0" (j));
   *reinterpret_cast<unsigned int*> (target) = j;
@@ -125,7 +125,7 @@ ACE_CDR::swap_4 (const char* orig, char* target)
   __asm bswap eax;
   __asm mov [ecx], eax;
 #else
-  register ACE_UINT32 x = * reinterpret_cast<const ACE_UINT32*> (orig);
+  ACE_REGISTER ACE_UINT32 x = * reinterpret_cast<const ACE_UINT32*> (orig);
   x = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24);
   * reinterpret_cast<ACE_UINT32*> (target) = x;
 #endif /* ACE_HAS_INTRINSIC_BYTESWAP */
@@ -145,15 +145,17 @@ ACE_CDR::swap_8 (const char* orig, char* target)
 #elif defined (ACE_HAS_BSWAP_64)
   *reinterpret_cast<uint64_t *> (target) =
     bswap_64 (*reinterpret_cast<uint64_t const *> (orig));
-#elif (defined (__amd64__) || defined (__x86_64__)) && defined(__GNUG__)
-  register unsigned long x =
+#elif (defined (__amd64__) || defined (__x86_64__)) && defined(__GNUG__) \
+    && !defined(ACE_LACKS_INLINE_ASSEMBLY)
+  ACE_REGISTER unsigned long x =
     * reinterpret_cast<const unsigned long*> (orig);
   asm ("bswapq %1" : "=r" (x) : "0" (x));
   *reinterpret_cast<unsigned long*> (target) = x;
-#elif defined(ACE_HAS_PENTIUM) && defined(__GNUG__)
-  register unsigned int i =
+#elif defined(ACE_HAS_PENTIUM) && defined(__GNUG__) \
+    && !defined(ACE_LACKS_INLINE_ASSEMBLY)
+  ACE_REGISTER unsigned int i =
     *reinterpret_cast<const unsigned int*> (orig);
-  register unsigned int j =
+  ACE_REGISTER unsigned int j =
     *reinterpret_cast<const unsigned int*> (orig + 4);
   asm ("bswap %1" : "=r" (i) : "0" (i));
   asm ("bswap %1" : "=r" (j) : "0" (j));
@@ -172,19 +174,19 @@ ACE_CDR::swap_8 (const char* orig, char* target)
   __asm mov [edx], ebx;
 #elif ACE_SIZEOF_LONG == 8
   // 64 bit architecture.
-  register unsigned long x =
+  ACE_REGISTER unsigned long x =
     * reinterpret_cast<const unsigned long*> (orig);
-  register unsigned long x84 = (x & 0x000000ff000000ffUL) << 24;
-  register unsigned long x73 = (x & 0x0000ff000000ff00UL) << 8;
-  register unsigned long x62 = (x & 0x00ff000000ff0000UL) >> 8;
-  register unsigned long x51 = (x & 0xff000000ff000000UL) >> 24;
+  ACE_REGISTER unsigned long x84 = (x & 0x000000ff000000ffUL) << 24;
+  ACE_REGISTER unsigned long x73 = (x & 0x0000ff000000ff00UL) << 8;
+  ACE_REGISTER unsigned long x62 = (x & 0x00ff000000ff0000UL) >> 8;
+  ACE_REGISTER unsigned long x51 = (x & 0xff000000ff000000UL) >> 24;
   x = (x84 | x73 | x62 | x51);
   x = (x << 32) | (x >> 32);
   *reinterpret_cast<unsigned long*> (target) = x;
 #else
-  register ACE_UINT32 x =
+  ACE_REGISTER ACE_UINT32 x =
     * reinterpret_cast<const ACE_UINT32*> (orig);
-  register ACE_UINT32 y =
+  ACE_REGISTER ACE_UINT32 y =
     * reinterpret_cast<const ACE_UINT32*> (orig + 4);
   x = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24);
   y = (y << 24) | ((y & 0xff00) << 8) | ((y & 0xff0000) >> 8) | (y >> 24);
diff --git a/dep/acelite/ace/CDR_Size.h b/dep/acelite/ace/CDR_Size.h
index ccf453249..8c095e8b3 100644
--- a/dep/acelite/ace/CDR_Size.h
+++ b/dep/acelite/ace/CDR_Size.h
@@ -4,7 +4,7 @@
 /**
  *  @file   CDR_Size.h
  *
- *  $Id: CDR_Size.h 93359 2011-02-11 11:33:12Z mcorino $
+ *  $Id: CDR_Size.h 96688 2013-01-22 12:28:42Z johnnyw $
  *
  *
  * ACE Common Data Representation (CDR) size-calculating stream.
@@ -42,7 +42,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * @class ACE_SizeCDR
  *
  * @brief A CDR stream for calculating size of the representation.
- *
  */
 class ACE_Export ACE_SizeCDR
 {
@@ -54,15 +53,12 @@ public:
   /// Returns @c false if an error has ocurred.
   bool good_bit (void) const;
 
-
   /// Reset current size.
   void reset (void);
 
-
   /// Return current size.
   size_t total_length (void) const;
 
-
   // Return 0 on failure and 1 on success.
   //@{ @name Size-calculating pseudo-write operations
   ACE_CDR::Boolean write_boolean (ACE_CDR::Boolean x);
diff --git a/dep/acelite/ace/CDR_Stream.cpp b/dep/acelite/ace/CDR_Stream.cpp
index 0d674324f..48b6ab005 100644
--- a/dep/acelite/ace/CDR_Stream.cpp
+++ b/dep/acelite/ace/CDR_Stream.cpp
@@ -1,4 +1,4 @@
-// $Id: CDR_Stream.cpp 95896 2012-06-18 20:42:07Z hillj $
+// $Id: CDR_Stream.cpp 96411 2012-11-29 10:31:26Z johnnyw $
 
 #include "ace/CDR_Stream.h"
 #include "ace/SString.h"
@@ -531,22 +531,10 @@ ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x)
 
   if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0)
     {
-#if defined (__arm__) && !defined (ACE_HAS_IPHONE)
-      // Convert to Intel format (12345678 => 56781234)
-      const char *orig = reinterpret_cast<const char *> (x);
-      char *target = buf;
-      register ACE_UINT32 x =
-        *reinterpret_cast<const ACE_UINT32 *> (orig);
-      register ACE_UINT32 y =
-        *reinterpret_cast<const ACE_UINT32 *> (orig + 4);
-      *reinterpret_cast<ACE_UINT32 *> (target) = y;
-      *reinterpret_cast<ACE_UINT32 *> (target + 4) = x;
-      return true;
-#else
-#  if !defined (ACE_ENABLE_SWAP_ON_WRITE)
+#if !defined (ACE_ENABLE_SWAP_ON_WRITE)
       *reinterpret_cast<ACE_CDR::ULongLong *> (buf) = *x;
       return true;
-#  else
+#else
       if (!this->do_byte_swap_)
         {
           *reinterpret_cast<ACE_CDR::ULongLong *> (buf) = *x;
@@ -557,8 +545,7 @@ ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x)
           ACE_CDR::swap_8 (reinterpret_cast<const char*> (x), buf);
           return true;
         }
-#  endif /* ACE_ENABLE_SWAP_ON_WRITE */
-#endif /* !__arm__ */
+#endif /* ACE_ENABLE_SWAP_ON_WRITE */
      }
 
   return false;
@@ -1839,39 +1826,10 @@ ACE_InputCDR::read_8 (ACE_CDR::ULongLong *x)
   if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0)
     {
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
-#  if defined (__arm__) && !defined (ACE_HAS_IPHONE)
-      if (!this->do_byte_swap_)
-        {
-          // Convert from Intel format (12345678 => 56781234)
-          const char *orig = buf;
-          char *target = reinterpret_cast<char *> (x);
-          register ACE_UINT32 x =
-            *reinterpret_cast<const ACE_UINT32 *> (orig);
-          register ACE_UINT32 y =
-            *reinterpret_cast<const ACE_UINT32 *> (orig + 4);
-          *reinterpret_cast<ACE_UINT32 *> (target) = y;
-          *reinterpret_cast<ACE_UINT32 *> (target + 4) = x;
-        }
-      else
-        {
-          // Convert from Sparc format (12345678 => 43218765)
-          const char *orig = buf;
-          char *target = reinterpret_cast<char *> (x);
-          register ACE_UINT32 x =
-            *reinterpret_cast<const ACE_UINT32 *> (orig);
-          register ACE_UINT32 y =
-            *reinterpret_cast<const ACE_UINT32 *> (orig + 4);
-          x = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24);
-          y = (y << 24) | ((y & 0xff00) << 8) | ((y & 0xff0000) >> 8) | (y >> 24);
-          *reinterpret_cast<ACE_UINT32 *> (target) = x;
-          *reinterpret_cast<ACE_UINT32 *> (target + 4) = y;
-        }
-#  else
       if (!this->do_byte_swap_)
         *x = *reinterpret_cast<ACE_CDR::ULongLong *> (buf);
       else
         ACE_CDR::swap_8 (buf, reinterpret_cast<char *> (x));
-#  endif /* !__arm__ */
 #else
       *x = *reinterpret_cast<ACE_CDR::ULongLong *> (buf);
 #endif /* ACE_DISABLE_SWAP_ON_READ */
diff --git a/dep/acelite/ace/CDR_Stream.h b/dep/acelite/ace/CDR_Stream.h
index 256560dea..3334c9308 100644
--- a/dep/acelite/ace/CDR_Stream.h
+++ b/dep/acelite/ace/CDR_Stream.h
@@ -4,7 +4,7 @@
 /**
  *  @file   CDR_Stream.h
  *
- *  $Id: CDR_Stream.h 95896 2012-06-18 20:42:07Z hillj $
+ *  $Id: CDR_Stream.h 97972 2014-11-10 15:46:10Z johnnyw $
  *
  * ACE Common Data Representation (CDR) marshaling and demarshaling
  * classes.
@@ -426,7 +426,7 @@ public:
 
   /**
    * Utility function to allow the user more flexibility.
-   * Pads the stream up to the nearest <alignment>-byte boundary.
+   * Pads the stream up to the nearest @a alignment byte boundary.
    * Argument MUST be a power of 2.
    * Returns 0 on success and -1 on failure.
    */
@@ -488,7 +488,7 @@ public:
   /// gateway.
   void reset_byte_order (int byte_order);
 
-  /// set GIOP version info
+  /// Set GIOP version info
   void set_version (ACE_CDR::Octet major, ACE_CDR::Octet minor);
 
   /// Set the underlying GIOP version..
@@ -518,13 +518,13 @@ private:
 
   /**
    * write an array of @a length elements, each of @a size bytes and the
-   * start aligned at a multiple of <align>. The elements are assumed
+   * start aligned at a multiple of @a align. The elements are assumed
    * to be packed with the right alignment restrictions.  It is mostly
    * designed for buffers of the basic types.
    *
-   * This operation uses <memcpy>; as explained above it is expected
-   * that using assignment is faster that <memcpy> for one element,
-   * but for several elements <memcpy> should be more efficient, it
+   * This operation uses @c memcpy; as explained above it is expected
+   * that using assignment is faster that @c memcpy for one element,
+   * but for several elements @c memcpy should be more efficient, it
    * could be interesting to find the break even point and optimize
    * for that case, but that would be too platform dependent.
    */
@@ -541,7 +541,7 @@ private:
   /**
    * Grow the CDR stream. When it returns @a buf contains a pointer to
    * memory in the CDR stream, with at least @a size bytes ahead of it
-   * and aligned to an <align> boundary. It moved the <wr_ptr> to <buf
+   * and aligned to an @a align boundary. It moved the <wr_ptr> to <buf
    * + size>.
    */
   int grow_and_adjust (size_t size,
@@ -581,8 +581,9 @@ private:
    * for such a beast is that in some setting a few (fast) machines
    * can be serving hundreds of slow machines with the opposite byte
    * order, so it makes sense (as a load balancing device) to put the
-   * responsibility in the writers.  THIS IS NOT A STANDARD IN CORBA,
-   * USE AT YOUR OWN RISK
+   * responsibility in the writers.
+   *
+   * @warning THIS IS NOT A STANDARD IN CORBA, USE AT YOUR OWN RISK
    */
   bool do_byte_swap_;
 
@@ -737,7 +738,7 @@ public:
   ACE_InputCDR (Transfer_Contents rhs);
 
   /// Destructor
-  ~ACE_InputCDR (void);
+  virtual ~ACE_InputCDR (void);
 
   /// Disambiguate overloading when extracting octets, chars,
   /// booleans, and bounded strings
@@ -1050,13 +1051,13 @@ private:
 
   /**
    * Read an array of @a length elements, each of @a size bytes and the
-   * start aligned at a multiple of <align>. The elements are assumed
+   * start aligned at a multiple of @a align. The elements are assumed
    * to be packed with the right alignment restrictions.  It is mostly
    * designed for buffers of the basic types.
    *
-   * This operation uses <memcpy>; as explained above it is expected
-   * that using assignment is faster that <memcpy> for one element,
-   * but for several elements <memcpy> should be more efficient, it
+   * This operation uses @c memcpy; as explained above it is expected
+   * that using assignment is faster that @c memcpy for one element,
+   * but for several elements @c memcpy should be more efficient, it
    * could be interesting to find the break even point and optimize
    * for that case, but that would be too platform dependent.
    */
@@ -1146,7 +1147,7 @@ protected:
                             const ACE_CDR::Octet *x);
 
   /// Efficiently read @a length elements of size @a size each from
-  /// <input> into <x>; the data must be aligned to <align>.
+  /// @a input into @a x; the data must be aligned to @a align.
   ACE_CDR::Boolean read_array (ACE_InputCDR& input,
                                void* x,
                                size_t size,
@@ -1169,7 +1170,7 @@ protected:
    * Exposes the stream implementation of <adjust>, this is useful in
    * many cases to minimize memory allocations during marshaling.
    * On success @a buf will contain a contiguous area in the CDR stream
-   * that can hold @a size bytes aligned to <align>.
+   * that can hold @a size bytes aligned to @a align.
    * Results
    */
   int adjust (ACE_OutputCDR& out,
diff --git a/dep/acelite/ace/CE_Screen_Output.cpp b/dep/acelite/ace/CE_Screen_Output.cpp
index dfd3d717a..141ed2cf4 100644
--- a/dep/acelite/ace/CE_Screen_Output.cpp
+++ b/dep/acelite/ace/CE_Screen_Output.cpp
@@ -1,9 +1,9 @@
-// $Id: CE_Screen_Output.cpp 80826 2008-03-04 14:51:23Z wotte $
+// $Id: CE_Screen_Output.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/CE_Screen_Output.h"
 #if defined (ACE_HAS_WINCE)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dep/acelite/ace/CMakeLists.txt b/dep/acelite/ace/CMakeLists.txt
index 66d864faf..15ad469f8 100644
--- a/dep/acelite/ace/CMakeLists.txt
+++ b/dep/acelite/ace/CMakeLists.txt
@@ -1,15 +1,22 @@
-# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
 #
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
+# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# NOTE: Do not use glob here, it would include files we don't want
-set(ace_STAT_SRCS
+set(ace_STAT_SRCS 
   ACE.cpp
   ACE_crc32.cpp
   ACE_crc_ccitt.cpp
@@ -30,7 +37,6 @@ set(ace_STAT_SRCS
   ATM_Stream.cpp
   Atomic_Op.cpp
   Atomic_Op_Sparc.c
-  Auto_Event.cpp
   Barrier.cpp
   Base_Thread_Adapter.cpp
   Based_Pointer_Repository.cpp
@@ -70,7 +76,7 @@ set(ace_STAT_SRCS
   Dynamic_Service_Dependency.cpp
   Encoding_Converter.cpp
   Encoding_Converter_Factory.cpp
-  Event.cpp
+  Event_Base.cpp
   Event_Handler.cpp
   Event_Handler_Handle_Timeout_Upcall.cpp
   FIFO.cpp
@@ -105,6 +111,7 @@ set(ace_STAT_SRCS
   Local_Name_Space.cpp
   Local_Tokens.cpp
   Lock.cpp
+  Log_Category.cpp
   Log_Msg.cpp
   Log_Msg_Backend.cpp
   Log_Msg_Callback.cpp
@@ -121,7 +128,6 @@ set(ace_STAT_SRCS
   LSOCK_Stream.cpp
   Malloc.cpp
   Malloc_Allocator.cpp
-  Manual_Event.cpp
   MEM_Acceptor.cpp
   MEM_Addr.cpp
   MEM_Connector.cpp
@@ -142,6 +148,7 @@ set(ace_STAT_SRCS
   Monitor_Control_Types.cpp
   Monitor_Point_Registry.cpp
   Monitor_Size.cpp
+  Monotonic_Time_Policy.cpp
   Msg_WFMO_Reactor.cpp
   Multihomed_INET_Addr.cpp
   Mutex.cpp
@@ -156,6 +163,7 @@ set(ace_STAT_SRCS
   Obchunk.cpp
   Object_Manager.cpp
   Object_Manager_Base.cpp
+  Obstack.cpp
   OS_Errno.cpp
   OS_Log_Msg_Attributes.cpp
   OS_main.cpp
@@ -192,6 +200,7 @@ set(ace_STAT_SRCS
   OS_NS_time.cpp
   OS_NS_unistd.cpp
   OS_NS_wchar.cpp
+  OS_NS_wctype.cpp
   OS_QoS.cpp
   OS_Thread_Adapter.cpp
   OS_TLI.cpp
@@ -319,43 +328,22 @@ set(ace_STAT_SRCS
   XTI_ATM_Mcast.cpp
 )
 
-if (USE_COREPCH)
-  set(ace_PCH_HDR PrecompiledHeaders/WinAcePCH.h)
-  set(ace_PCH_SRC PrecompiledHeaders/WinAcePCH.cpp)
-endif()
-
-include_directories(
-  ${CMAKE_SOURCE_DIR}/dep/acelite
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
-  ${CMAKE_SOURCE_DIR}/dep/src/zlib
-)
-
-# Needed for PCH support
-set_source_files_properties(Atomic_Op_Sparc.c Rtems_init.c PROPERTIES LANGUAGE CXX)
+include_directories(${CMAKE_SOURCE_DIR}/dep/acelite)
 
 add_definitions(-DACE_BUILD_DLL)
 
-add_library(ace SHARED
-  ${ace_STAT_SRCS}
-  ${ace_PCH_SRC}
-)
+add_library(ace SHARED ${ace_STAT_SRCS})
 
-if (MINGW) # GCC ignores "#prama comment"
+if (MINGW)
   target_link_libraries(ace ws2_32 iphlpapi netapi32 mswsock)
 endif()
 
-# Generate precompiled header
-if( USE_COREPCH )
-  add_cxx_pch(ace ${ace_PCH_HDR} ${ace_PCH_SRC})
-endif()
-
 install(
     TARGETS ace
     RUNTIME DESTINATION "${BIN_DIR}"
-    #is lib/ correct?
     LIBRARY DESTINATION "${LIBS_DIR}"
 )
 
-if(WIN32 AND MSVC)
+if(WIN32)
   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/ace.pdb" DESTINATION "${BIN_DIR}" CONFIGURATIONS Debug)
-endif()
+endif()
\ No newline at end of file
diff --git a/dep/acelite/ace/Cache_Map_Manager_T.cpp b/dep/acelite/ace/Cache_Map_Manager_T.cpp
index 1527bce64..06664cd06 100644
--- a/dep/acelite/ace/Cache_Map_Manager_T.cpp
+++ b/dep/acelite/ace/Cache_Map_Manager_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Cache_Map_Manager_T.cpp 95790 2012-05-24 15:06:21Z shuston $
+// $Id: Cache_Map_Manager_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_CACHE_MAP_MANAGER_T_CPP
 #define ACE_CACHE_MAP_MANAGER_T_CPP
@@ -9,7 +9,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Malloc_Base.h"
 
 #if !defined (__ACE_INLINE__)
@@ -31,7 +31,7 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
   : caching_strategy_ (caching_s)
 {
   if (this->open (size, alloc) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Cache_Map_Manager::ACE_Cache_Map_Manager")));
 
diff --git a/dep/acelite/ace/Cached_Connect_Strategy_T.cpp b/dep/acelite/ace/Cached_Connect_Strategy_T.cpp
index a6f8acc77..646247b48 100644
--- a/dep/acelite/ace/Cached_Connect_Strategy_T.cpp
+++ b/dep/acelite/ace/Cached_Connect_Strategy_T.cpp
@@ -1,4 +1,4 @@
-//$Id: Cached_Connect_Strategy_T.cpp 95630 2012-03-22 13:04:47Z johnnyw $
+//$Id: Cached_Connect_Strategy_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_CACHED_CONNECT_STRATEGY_T_CPP
 #define ACE_CACHED_CONNECT_STRATEGY_T_CPP
@@ -29,7 +29,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
     connection_cache_ (caching_s)
 {
   if (this->open (cre_s, con_s, rec_s) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>\n")));
 }
@@ -643,7 +643,7 @@ ACE_Bounded_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_S
         {
           ACE_ASSERT (0); // just to see it coming
 
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("(%t)ACE_Bounded_Cached_Connect_Strategy<>::")
                       ACE_TEXT ("find_or_create_svc_handler_i - ")
                       ACE_TEXT ("error polling server socket state.\n")));
diff --git a/dep/acelite/ace/Caching_Strategies_T.cpp b/dep/acelite/ace/Caching_Strategies_T.cpp
index 2b0fd4e76..3841c253c 100644
--- a/dep/acelite/ace/Caching_Strategies_T.cpp
+++ b/dep/acelite/ace/Caching_Strategies_T.cpp
@@ -1,10 +1,10 @@
-//$Id: Caching_Strategies_T.cpp 80826 2008-03-04 14:51:23Z wotte $
+//$Id: Caching_Strategies_T.cpp 97844 2014-08-22 15:53:43Z mesnier_p $
 
 #ifndef ACE_CACHING_STRATEGIES_T_CPP
-#define ACECACHING_STRATEGIES_T_CPP
+#define ACE_CACHING_STRATEGIES_T_CPP
 
 #include "ace/Caching_Strategies_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Caching_Strategies_T.inl"
diff --git a/dep/acelite/ace/Caching_Strategies_T.inl b/dep/acelite/ace/Caching_Strategies_T.inl
index 41fa2d303..49364504d 100644
--- a/dep/acelite/ace/Caching_Strategies_T.inl
+++ b/dep/acelite/ace/Caching_Strategies_T.inl
@@ -1,6 +1,6 @@
 // -*-C++-*-
 //
-//$Id: Caching_Strategies_T.inl 80826 2008-03-04 14:51:23Z wotte $
+//$Id: Caching_Strategies_T.inl 96985 2013-04-11 15:50:32Z huangh $
 
 //////////////////////////////////////////////////////////////////////////////////
 
@@ -109,8 +109,8 @@ ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::dump
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Caching_Strategy_Adapter::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -198,9 +198,9 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LRU_Caching_Strategy::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("timer_ = %d "), this->timer_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("timer_ = %d "), this->timer_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -275,8 +275,8 @@ ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LFU_Caching_Strategy::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -363,9 +363,9 @@ ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("order_ = %d "), this->order_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("order_ = %d "), this->order_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -446,8 +446,8 @@ ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Null_Caching_Strategy::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Caching_Utility_T.h b/dep/acelite/ace/Caching_Utility_T.h
index 9340d73ac..fc3c53c84 100644
--- a/dep/acelite/ace/Caching_Utility_T.h
+++ b/dep/acelite/ace/Caching_Utility_T.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Caching_Utility_T.h
  *
- *  $Id: Caching_Utility_T.h 92085 2010-09-29 12:23:13Z johnnyw $
+ *  $Id: Caching_Utility_T.h 97436 2013-11-25 10:48:49Z johnnyw $
  *
  *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
  */
@@ -33,7 +33,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * @brief Defines a helper class for the Caching Strategies.
  *
  * This class defines the methods commonly used by the different
- * caching strategies. For instance: <clear_cache> method which
+ * caching strategies. For instance: clear_cache() method which
  * decides and purges the entry from the container.  @note This
  * class helps in the caching_strategies using a container
  * containing entries of <KEY, ACE_Pair<VALUE, attributes>>
@@ -82,7 +82,7 @@ protected:
  * @brief Defines a helper class for the Caching Strategies.
  *
  * This class defines the methods commonly used by the different
- * caching strategies. For instance: <clear_cache> method which
+ * caching strategies. For instance: clear_cache() method which
  * decides and purges the entry from the container.  @note This
  * class helps in the caching_strategies using a container
  * containing entries of <KEY, Svc_Handler> kind. The attributes
@@ -107,7 +107,7 @@ public:
   ~ACE_Recyclable_Handler_Caching_Utility (void);
 
   /**
-   * Purge entries from the <container>. The Cleanup_Strategy will do
+   * Purge entries from the @a container. The Cleanup_Strategy will do
    * the actual job of cleanup once the entries to be cleaned up are
    * decided.
    */
@@ -158,7 +158,7 @@ public:
   ~ACE_Refcounted_Recyclable_Handler_Caching_Utility (void);
 
   /**
-   * Purge entries from the <container>. The Cleanup_Strategy will do
+   * Purge entries from the @a container. The Cleanup_Strategy will do
    * the actual job of cleanup once the entries to be cleaned up are
    * decided.
    */
@@ -192,7 +192,7 @@ protected:
  * @brief Defines a helper class for the Caching Strategies.
  *
  * This class defines the methods commonly used by the different
- * caching strategies. For instance: <clear_cache> method which
+ * caching strategies. For instance: clear_cache() method which
  * decides and purges the entry from the container.  @note This
  * class helps in the caching_strategies using a container
  * containing entries of <KEY, HANDLER> kind where the HANDLER
@@ -216,7 +216,7 @@ public:
   ~ACE_Handler_Caching_Utility (void);
 
   /**
-   * Purge entries from the <container>. The Cleanup_Strategy will do
+   * Purge entries from the @a container. The Cleanup_Strategy will do
    * the actual job of cleanup once the entries to be cleaned up are
    * decided.
    */
@@ -249,7 +249,7 @@ protected:
  * @brief Defines a dummy helper class for the Caching Strategies.
  *
  * This class defines the methods commonly used by the different
- * caching strategies. For instance: <clear_cache> method which
+ * caching strategies. For instance: clear_cache() method which
  * decides and purges the entry from the container.  @note This
  * class is be used with the Null_Caching_Strategy. The
  * Cleanup_Strategy is the callback class to which the entries to
@@ -271,7 +271,7 @@ public:
   ~ACE_Null_Caching_Utility (void);
 
   /**
-   * Purge entries from the <container>. The Cleanup_Strategy will do
+   * Purge entries from the @a container. The Cleanup_Strategy will do
    * the actual job of cleanup once the entries to be cleaned up are
    * decided. @note Here it is a no-op.
    */
diff --git a/dep/acelite/ace/Capabilities.cpp b/dep/acelite/ace/Capabilities.cpp
index 7533f15f0..dbf9f6393 100644
--- a/dep/acelite/ace/Capabilities.cpp
+++ b/dep/acelite/ace/Capabilities.cpp
@@ -1,4 +1,4 @@
-// $Id: Capabilities.cpp 91287 2010-08-05 10:30:49Z johnnyw $
+// $Id: Capabilities.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Capabilities.h"
 #include "ace/OS_NS_ctype.h"
@@ -220,7 +220,7 @@ ACE_Capabilities::is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line)
         ++line;
       else
         {
-          ACE_DEBUG ((LM_DEBUG,
+          ACELIB_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Invalid entry\n")));
           break;
         }
@@ -311,7 +311,7 @@ ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name)
   FILE *fp = ACE_OS::fopen (fname, ACE_TEXT ("r"));
 
   if (fp == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Can't open %s file\n"),
                        fname),
                       -1);
diff --git a/dep/acelite/ace/Codecs.cpp b/dep/acelite/ace/Codecs.cpp
index f7107114a..d0579ab92 100644
--- a/dep/acelite/ace/Codecs.cpp
+++ b/dep/acelite/ace/Codecs.cpp
@@ -1,7 +1,7 @@
-// $Id: Codecs.cpp 91813 2010-09-17 07:52:52Z johnnyw $
+// $Id: Codecs.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Codecs.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_ctype.h"
 
@@ -179,7 +179,7 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len)
     {
       if (char_count)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("Decoding incomplete: atleast %d bits truncated\n"),
                       (4 - char_count) * 6));
           ++errors;
@@ -190,7 +190,7 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len)
       switch (char_count)
         {
         case 1:
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("Decoding incomplete: atleast 2 bits missing\n")));
           ++errors;
           break;
diff --git a/dep/acelite/ace/Compression/ACE_Compression_export.h b/dep/acelite/ace/Compression/ACE_Compression_export.h
deleted file mode 100644
index 119e14b16..000000000
--- a/dep/acelite/ace/Compression/ACE_Compression_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id: ACE_Compression_export.h 95545 2012-02-23 07:57:08Z johnnyw $
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl ACE_Compression
-// ------------------------------
-#ifndef ACE_COMPRESSION_EXPORT_H
-#define ACE_COMPRESSION_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_COMPRESSION_HAS_DLL)
-#  define ACE_COMPRESSION_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_COMPRESSION_HAS_DLL */
-
-#if !defined (ACE_COMPRESSION_HAS_DLL)
-#  define ACE_COMPRESSION_HAS_DLL 1
-#endif /* ! ACE_COMPRESSION_HAS_DLL */
-
-#if defined (ACE_COMPRESSION_HAS_DLL) && (ACE_COMPRESSION_HAS_DLL == 1)
-#  if defined (ACE_COMPRESSION_BUILD_DLL)
-#    define ACE_Compression_Export ACE_Proper_Export_Flag
-#    define ACE_COMPRESSION_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ACE_COMPRESSION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ACE_COMPRESSION_BUILD_DLL */
-#    define ACE_Compression_Export ACE_Proper_Import_Flag
-#    define ACE_COMPRESSION_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ACE_COMPRESSION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ACE_COMPRESSION_BUILD_DLL */
-#else /* ACE_COMPRESSION_HAS_DLL == 1 */
-#  define ACE_Compression_Export
-#  define ACE_COMPRESSION_SINGLETON_DECLARATION(T)
-#  define ACE_COMPRESSION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ACE_COMPRESSION_HAS_DLL == 1 */
-
-// Set ACE_COMPRESSION_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ACE_COMPRESSION_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ACE_COMPRESSION_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ACE_COMPRESSION_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ACE_COMPRESSION_NTRACE */
-
-#if (ACE_COMPRESSION_NTRACE == 1)
-#  define ACE_COMPRESSION_TRACE(X)
-#else /* (ACE_COMPRESSION_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ACE_COMPRESSION_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ACE_COMPRESSION_NTRACE == 1) */
-
-#endif /* ACE_COMPRESSION_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/Compression/Compressor.cpp b/dep/acelite/ace/Compression/Compressor.cpp
deleted file mode 100644
index 86d1a1f3d..000000000
--- a/dep/acelite/ace/Compression/Compressor.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id: Compressor.cpp 95556 2012-02-24 09:14:51Z johnnyw $
-
-#include "Compressor.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Compressor.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_Compressor::ACE_Compressor( ACE_CompressorId compressor_id,
-                                ACE_UINT32 compression_level )
-    : compressor_id_        (compressor_id)
-    , compression_level_    (compression_level)
-    , compressed_bytes_     (0)
-    , uncompressed_bytes_   (0)
-{}
-
-ACE_Compressor::~ACE_Compressor ()
-{
-}
-
-ACE_UINT64
-ACE_Compressor::compressed_bytes(void) const
-{
-    ACE_GUARD_RETURN( ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0 );
-    return this->compressed_bytes_;
-}
-
-ACE_UINT64
-ACE_Compressor::uncompressed_bytes(void) const
-{
-    ACE_GUARD_RETURN( ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0 );
-    return this->uncompressed_bytes_;
-}
-
-void
-ACE_Compressor::reset_stats(void)
-{
-    ACE_GUARD( ACE_SYNCH_MUTEX, ace_mon, this->mutex_ );
-    this->compressed_bytes_   = 0;
-    this->uncompressed_bytes_ = 0;
-}
-
-void
-ACE_Compressor::update_stats(ACE_UINT64 uncompressed_bytes, ACE_UINT64 compressed_bytes)
-{
-    ACE_GUARD( ACE_SYNCH_MUTEX, ace_mon, this->mutex_ );
-    this->compressed_bytes_   += compressed_bytes;
-    this->uncompressed_bytes_ += uncompressed_bytes;
-}
-
-float
-ACE_Compressor::compression_ratio(void) const
-{
-    ACE_GUARD_RETURN( ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0.0f );
-    if (this->uncompressed_bytes_ > 0) {
-        return static_cast<float>(this->compressed_bytes_) / this->uncompressed_bytes_;
-    }
-    return 0.0f;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Compression/Compressor.h b/dep/acelite/ace/Compression/Compressor.h
deleted file mode 100644
index eb71167a5..000000000
--- a/dep/acelite/ace/Compression/Compressor.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file   Compressor.h
- *
- *  $Id: Compressor.h
- *
- *  @author ACE version by
- *  @author Derek Dominish <derek.dominish@dsto.defence.gov.au>
- */
-//=============================================================================
-
-#ifndef ACE_COMPRESSOR_H
-#define ACE_COMPRESSOR_H
-
-#include /**/ "ace/pre.h"
-
-#include /**/ "ACE_Compression_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Guard_T.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Copy_Disabled.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * CompressorId from OMG Compression::CompressorId
- * see $(TAO_ROOT)/tao/Compression.pidl
- */
-enum ACE_CompressorId
-{
-    ACE_COMPRESSORID_NONE   = 0,
-    ACE_COMPRESSORID_GZIP   = 1,
-    ACE_COMPRESSORID_PKZIP  = 2,
-    ACE_COMPRESSORID_BZIP2  = 3,
-    ACE_COMPRESSORID_ZLIB   = 4,
-    ACE_COMPRESSORID_LZMA   = 5,
-    ACE_COMPRESSORID_LZO    = 6,
-    ACE_COMPRESSORID_RZIP   = 7,
-    ACE_COMPRESSORID_7X     = 8,
-    ACE_COMPRESSORID_XAR    = 9,
-    ACE_COMPRESSORID_RLE    = 10
-};
-
-class ACE_Compression_Export ACE_Compressor : private ACE_Copy_Disabled
-{
-public:
-
-  ACE_CompressorId    get_compressor_id(void) const;
-
-  ACE_UINT32          get_compression_level(void) const;
-
-  /**
-    * Compress the @a in_ptr buffer for @a in_len into the
-    * @a dest_ptr buffer with a maximum @a max_out_len. If the
-    * @a max_out_len is exhausted through the compress process
-    * then a value of -1 will be returned from the function,
-    * otherwise the return value will indicate the resultant
-    * @a out_ptr compressed buffer length.
-    *
-    * NOTE: it is advisable that the @max_out_len be slightly
-    * larger of the input @a in_len (i.e. x 1.1F) to cater
-    * for the possibility that a reduced compressed length
-    * is not possible.
-    */
-  virtual ACE_UINT64 compress( const void *in_ptr,
-                                ACE_UINT64 in_len,
-                                void *out_ptr,
-                                ACE_UINT64 max_out_len ) = 0;
-
-  /**
-    * DeCompress the @a in_ptr buffer for @a in_len into the
-    * @a out_ptr buffer with a maximum @a max_out_len. If the
-    * @a max_out_len is exhausted during decompression
-    * then a value of -1 will be returned from the function,
-    * otherwise the return value will indicate the resultant
-    * @a out_ptr decompressed buffer length.
-    */
-  virtual ACE_UINT64 decompress( const void *in_ptr,
-                                  ACE_UINT64 in_len,
-                                  void *out_ptr,
-                                  ACE_UINT64 max_out_len ) = 0;
-
-  /**
-    *  Return the current compressed bytes statistics counter.
-    */
-  virtual ACE_UINT64  compressed_bytes(void) const;
-
-  /**
-    *  Return the current uncompressed bytes statistics counter.
-    */
-  virtual ACE_UINT64  uncompressed_bytes(void) const;
-
-  /**
-    *  Return the current compression ratio statistics.
-    */
-  virtual float       compression_ratio(void) const;
-
-  /**
-    *  Reset the statistics to zero.
-    */
-  virtual void        reset_stats(void);
-
-  virtual ~ACE_Compressor (void);
-
-protected:
-  ACE_Compressor(ACE_CompressorId compressor_id,
-                  ACE_UINT32 compression_level = 0); // Must be inherited.
-
-  virtual void update_stats(  ACE_UINT64 uncompressed_bytes,
-                              ACE_UINT64 compressed_bytes );
-
-private:
-  ACE_CompressorId    compressor_id_;
-  ACE_UINT32          compression_level_;
-
-  // Ensure we can lock with imutability (i.e. const)
-  mutable ACE_SYNCH_MUTEX mutex_;
-
-  ACE_UINT64          compressed_bytes_;
-  ACE_UINT64          uncompressed_bytes_;
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "Compressor.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif // ACE_COMPRESSOR_H
diff --git a/dep/acelite/ace/Compression/Compressor.inl b/dep/acelite/ace/Compression/Compressor.inl
deleted file mode 100644
index b9809018e..000000000
--- a/dep/acelite/ace/Compression/Compressor.inl
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- C++ -*-
-// $Id: Compressor.inl 95545 2012-02-23 07:57:08Z johnnyw $
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE ACE_CompressorId
-ACE_Compressor::get_compressor_id(void) const
-{
-    return this->compressor_id_;
-}
-
-ACE_INLINE ACE_UINT32
-ACE_Compressor::get_compression_level(void) const
-{
-    return this->compression_level_;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Compression/rle/ACE_RLECompression_export.h b/dep/acelite/ace/Compression/rle/ACE_RLECompression_export.h
deleted file mode 100644
index f03645808..000000000
--- a/dep/acelite/ace/Compression/rle/ACE_RLECompression_export.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-// $Id: ACE_RLECompression_export.h 95545 2012-02-23 07:57:08Z johnnyw $
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl ACE_RLECompression
-// ------------------------------
-#ifndef ACE_RLECOMPRESSION_EXPORT_H
-#define ACE_RLECOMPRESSION_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_RLECOMPRESSION_HAS_DLL)
-#  define ACE_RLECOMPRESSION_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_RLECOMPRESSION_HAS_DLL */
-
-#if !defined (ACE_RLECOMPRESSION_HAS_DLL)
-#  define ACE_RLECOMPRESSION_HAS_DLL 1
-#endif /* ! ACE_RLECOMPRESSION_HAS_DLL */
-
-#if defined (ACE_RLECOMPRESSION_HAS_DLL) && (ACE_RLECOMPRESSION_HAS_DLL == 1)
-#  if defined (ACE_RLECOMPRESSION_BUILD_DLL)
-#    define ACE_RLECompression_Export ACE_Proper_Export_Flag
-#    define ACE_RLECOMPRESSION_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ACE_RLECOMPRESSION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ACE_RLECOMPRESSION_BUILD_DLL */
-#    define ACE_RLECompression_Export ACE_Proper_Import_Flag
-#    define ACE_RLECOMPRESSION_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ACE_RLECOMPRESSION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ACE_RLECOMPRESSION_BUILD_DLL */
-#else /* ACE_RLECOMPRESSION_HAS_DLL == 1 */
-#  define ACE_RLECompression_Export
-#  define ACE_RLECOMPRESSION_SINGLETON_DECLARATION(T)
-#  define ACE_RLECOMPRESSION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ACE_RLECOMPRESSION_HAS_DLL == 1 */
-
-// Set ACE_RLECOMPRESSION_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ACE_RLECOMPRESSION_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ACE_RLECOMPRESSION_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ACE_RLECOMPRESSION_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ACE_RLECOMPRESSION_NTRACE */
-
-#if (ACE_RLECOMPRESSION_NTRACE == 1)
-#  define ACE_RLECOMPRESSION_TRACE(X)
-#else /* (ACE_RLECOMPRESSION_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ACE_RLECOMPRESSION_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ACE_RLECOMPRESSION_NTRACE == 1) */
-
-#endif /* ACE_RLECOMPRESSION_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/Compression/rle/RLECompressor.cpp b/dep/acelite/ace/Compression/rle/RLECompressor.cpp
deleted file mode 100644
index 423d8a0f0..000000000
--- a/dep/acelite/ace/Compression/rle/RLECompressor.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-// $Id: RLECompressor.cpp 95560 2012-02-27 08:11:54Z johnnyw $
-
-#include "RLECompressor.h"
-#include "ace/OS_NS_string.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_RLECompressor::ACE_RLECompressor(void)
-    : ACE_Compressor(ACE_COMPRESSORID_RLE)
-{
-}
-
-ACE_RLECompressor::~ACE_RLECompressor(void)
-{
-}
-
-ACE_UINT64
-ACE_RLECompressor::compress( const void *in_ptr,
-                             ACE_UINT64 in_len,
-                             void *out_ptr,
-                             ACE_UINT64 max_out_len )
-{
-    const ACE_UINT8 *in_p   = static_cast<const ACE_UINT8*>(in_ptr);
-    ACE_UINT8 *out_p        = static_cast<ACE_UINT8*>(out_ptr);
-
-    ACE_UINT64  src_len     = in_len;  // Save for stats
-    ACE_UINT64  out_len     = 0;
-    ACE_UINT64  out_index   = 0;
-    ACE_UINT64  out_base    = 0;
-
-    ACE_UINT32  run_count   = 0;
-    ACE_UINT32  dup_count   = 0;
-
-    bool        run_code    = false;
-
-    ACE_UINT8   nxt_byte, cur_byte;
-
-    if (in_p && out_p) while (in_len-- > 0) {
-
-        if (run_code) switch (run_count) {
-
-        default:
-
-            out_p[out_index = out_base] = ACE_UINT8(run_count++ | 0x80);
-            out_p[++out_index] = cur_byte = *in_p++;
-
-            if (in_len ? cur_byte == (nxt_byte = *in_p) : true) {
-                continue;
-            }
-
-            // Fall Through
-
-        case 128:
-
-            if (++out_index >= max_out_len) {
-                return ACE_UINT64(-1); // Output Exhausted
-            } else if (in_len == 0) {
-                continue;
-            }
-
-            run_code  = false;
-            out_p[out_base = out_index] = 0;
-            dup_count = run_count = 0;
-            continue;
-        }
-
-        switch (run_count) {
-
-        case 128:
-
-            if (++out_index >= max_out_len) {
-                return ACE_UINT64(-1); // Output Exhausted
-            }
-            out_p[out_base = out_index] = 0;
-            dup_count = run_count = 0;
-
-            // Fall Through
-
-        default :
-
-            cur_byte = *in_p++;
-
-            if (in_len > 0) {
-                if (cur_byte == (nxt_byte = *in_p)) {
-                    if (dup_count++ == 1) {
-                        if (run_count >= dup_count) {
-                            out_p[out_base] = static_cast<ACE_UINT8>(run_count - dup_count);
-                            out_base += run_count;
-                        }
-                        run_code  = true;
-                        run_count = dup_count - 1;
-                        dup_count = 0;
-                        out_p[out_index = out_base] = static_cast<ACE_UINT8>(run_count++ | 0x80);
-                        break;
-                    }
-                } else dup_count = 0;
-            }
-            out_p[out_base] = char(run_count++);
-            break;
-        }
-
-        if (++out_index >= max_out_len) {
-            return ACE_UINT64(-1); // Output Exhausted
-        }
-
-        out_p[out_index] = cur_byte;
-    }
-
-    out_len = ++out_index;  // Update our output length
-
-    this->update_stats(src_len, out_len);
-
-    return out_len;
-}
-
-// Decompress using Run Length Encoding (RLE)
-ACE_UINT64
-ACE_RLECompressor::decompress( const void *in_ptr,
-                               ACE_UINT64 in_len,
-                               void *out_ptr,
-                               ACE_UINT64 max_out_len )
-{
-    ACE_UINT64  out_len     = 0;
-
-    const ACE_UINT8 *in_p   = static_cast<const ACE_UINT8*>(in_ptr);
-    ACE_UINT8 *out_p        = static_cast<ACE_UINT8*>(out_ptr);
-
-    if (in_p && out_p) while(in_len-- > 0) {
-
-        ACE_UINT8   cur_byte    = *in_p++;
-        ACE_UINT32  cpy_len     = ACE_UINT32((cur_byte & 0x7F) + 1);
-
-        if (cpy_len > max_out_len) {
-            return ACE_UINT64(-1); // Output Exhausted
-        } else if ((cur_byte & 0x80) != 0) {  // compressed
-            if (in_len-- > 0) {
-                ACE_OS::memset(out_p, *in_p++, cpy_len);
-            } else {
-                return ACE_UINT64(-1); // Output Exhausted
-            }
-        } else if (in_len >= cpy_len) {
-            ACE_OS::memcpy(out_p, in_p, cpy_len);
-            in_p    += cpy_len;
-            in_len  -= cpy_len;
-        } else {
-            return ACE_UINT64(-1); // Output Exhausted
-        }
-
-        out_p       += cpy_len;
-        max_out_len -= cpy_len;
-        out_len     += cpy_len;
-    }
-
-    return out_len;
-}
-
-// Close versioned namespace, if enabled by the user.
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Compression/rle/RLECompressor.h b/dep/acelite/ace/Compression/rle/RLECompressor.h
deleted file mode 100644
index 7371d22bf..000000000
--- a/dep/acelite/ace/Compression/rle/RLECompressor.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file   RLECompressor.h
- *
- *  $Id: RLECompressor.h
- *
- *  @author TAO version by
- *  @author Derek Dominish <derek.dominish@dsto.defence.gov.au>
- *  @author ACE version by
- *  @author Derek Dominish <derek.dominish@dsto.defence.gov.au>
- *
- *  Run-length encoding (RLE) is a very simple form of data compression
- *  in which runs of data (that is, sequences in which the same data value
- *  occurs in many consecutive data elements) are stored as a single data
- *  value and count, rather than as the original run. This is most useful
- *  on data that contains many such runs: for example, simple graphic
- *  images such as icons, line drawings, and animations. It is not useful
- *  with files that don't have many runs as it could slightly increase the
- *  output size.
- *  ALGORITHM: This algorithm is an optimized version of the traditional
- *  RLE algorithm in that it behaves better with very few runs.
- *
- *  With a run of a character where that run is >= 3 this is
- *  replaced with the repeat indicator 0X80 and then the repeat count OR'd
- *  over this ident.  This repeat count is therefore has a maximum value
- *  of 127 (0x7F) which is to be interpreted as the next character repeated
- *  another 'repeat count' times (i.e. a maximum of 128 characters can be
- *  represented in any single dupal). if the repeat ident is not present
- *  then the count is to be interpreted as a copy of the next repeat count
- *  characters + 1.
- *
- *  EXAMPLE: the following arbitary string of 67 bytes:-
- *  WWWWWWWWWWWWBWWWWWWWWWWWWBBBWWWWWWWWWWWWWWWWWWWWWWWWBWWWWWWWWWWWWWW
- *  will produce (as a HEXDUMP) of 14 bytes
- *  8B 57 00 42 8B 57 82 42  97 57 00 42 8D 57        .W.B.W.B.W.B.W
- */
-//=============================================================================
-
-#ifndef ACE_RLECOMPRESSOR_H
-#define ACE_RLECOMPRESSOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ACE_RLECompression_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Compression/Compressor.h"
-#include "ace/Singleton.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ACE_RLECompression_Export ACE_RLECompressor : public ACE_Compressor
-{
-public:
-  /**
-  * Default constructor. Should use instance() to get global instance.
-  */
-  ACE_RLECompressor(void);
-
-  virtual ~ACE_RLECompressor(void);
-
-  /**
-  * Compress the @a in_ptr buffer for @a in_len into the
-  * @a dest_ptr buffer with a maximum @a max_out_len using
-  * the Run Length Ecoding (RLE) algorithm. If the
-  * @a max_out_len is exhausted through the compress process
-  * then a value of -1 will be returned from the function,
-  * otherwise the return value will indicate the resultant
-  * @a out_ptr compressed buffer length.
-  *
-  * @note It is advisable that the @max_out_len be slightly
-  * larger of the input @a in_len (i.e. x 1.1F) to cater
-  * for the possibility that a reduced compressed length
-  * is not possible.
-  */
-  virtual ACE_UINT64 compress( const void *in_ptr,
-                                ACE_UINT64 in_len,
-                                void *out_ptr,
-                                ACE_UINT64 max_out_len );
-
-  /**
-  * DeCompress the @a in_ptr buffer for @a in_len into the
-  * @a out_ptr buffer with a maximum @a max_out_len using
-  * the Run Length Ecoding (RLE) algorithm. If the
-  * @a max_out_len is exhausted during decompression
-  * then a value of -1 will be returned from the function,
-  * otherwise the return value will indicate the resultant
-  * @a out_ptr decompressed buffer length.
-  */
-  virtual ACE_UINT64 decompress( const void *in_ptr,
-                                  ACE_UINT64 in_len,
-                                  void *out_ptr,
-                                  ACE_UINT64 max_out_len );
-};
-
-ACE_RLECOMPRESSION_SINGLETON_DECLARE(ACE_Singleton, ACE_RLECompressor, ACE_SYNCH_MUTEX);
-
-typedef class ACE_Singleton<ACE_RLECompressor, ACE_SYNCH_MUTEX> ACE_RLECompression;
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif // ACE_RLECOMPRESSOR_H
diff --git a/dep/acelite/ace/Condition_Attributes.cpp b/dep/acelite/ace/Condition_Attributes.cpp
index 49a02635b..bacc05b3c 100644
--- a/dep/acelite/ace/Condition_Attributes.cpp
+++ b/dep/acelite/ace/Condition_Attributes.cpp
@@ -2,7 +2,7 @@
 /**
  * @file Condition_Attributes.cpp
  *
- * $Id: Condition_Attributes.cpp 96061 2012-08-16 09:36:07Z mcorino $
+ * $Id: Condition_Attributes.cpp 96265 2012-11-13 13:31:10Z johnnyw $
  *
  * Originally in Synch.cpp
  *
@@ -12,10 +12,6 @@
 #include "ace/Condition_Thread_Mutex.h"
 #include "ace/Condition_Attributes.h"
 
-#if defined (ACE_HAS_THREADS)
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Condition_Attributes.inl"
 #endif /* __ACE_INLINE__ */
-
-#endif /* ACE_HAS_THREADS */
diff --git a/dep/acelite/ace/Condition_Attributes.h b/dep/acelite/ace/Condition_Attributes.h
index 0d53b2732..704c74d41 100644
--- a/dep/acelite/ace/Condition_Attributes.h
+++ b/dep/acelite/ace/Condition_Attributes.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Condition_Attributes.h
  *
- *  $Id: Condition_Attributes.h 96077 2012-08-20 08:13:23Z johnnyw $
+ *  $Id: Condition_Attributes.h 96265 2012-11-13 13:31:10Z johnnyw $
  *
  *   Moved from Synch.h.
  *
@@ -24,10 +24,6 @@
 
 #include "ace/OS_NS_Thread.h"
 
-#if defined (ACE_HAS_THREADS)
-
-// ACE platform supports some form of threading.
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class ACE_Export ACE_Condition_Attributes
@@ -95,7 +91,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Condition_Attributes.inl"
 #endif /* __ACE_INLINE__ */
 
-#endif /* !ACE_HAS_THREADS */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_CONDITION_ATTRIBUTES_H */
diff --git a/dep/acelite/ace/Condition_Attributes.inl b/dep/acelite/ace/Condition_Attributes.inl
index 12afde24c..8af4a14d3 100644
--- a/dep/acelite/ace/Condition_Attributes.inl
+++ b/dep/acelite/ace/Condition_Attributes.inl
@@ -1,6 +1,5 @@
 // -*- C++ -*-
-//
-// $Id: Condition_Attributes.inl 96096 2012-08-23 12:34:02Z johnnyw $
+// $Id: Condition_Attributes.inl 96265 2012-11-13 13:31:10Z johnnyw $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dep/acelite/ace/Condition_Recursive_Thread_Mutex.cpp b/dep/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
index 74922b65c..f49801447 100644
--- a/dep/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
+++ b/dep/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
@@ -3,7 +3,7 @@
 /**
  * @file Condition_Recursive_Thread_Mutex.cpp
  *
- * $Id: Condition_Recursive_Thread_Mutex.cpp 96077 2012-08-20 08:13:23Z johnnyw $
+ * $Id: Condition_Recursive_Thread_Mutex.cpp 96985 2013-04-11 15:50:32Z huangh $
  *
  * Originally in Synch.cpp
  *
@@ -14,7 +14,7 @@
 
 #if defined (ACE_HAS_THREADS)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -30,12 +30,12 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Condition<MUTEX>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   // No dump method for ACE_cond_t even in emulated mode.
   // cond_.dump ();
   this->mutex_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -48,7 +48,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition (ACE_Recursive_Thread_M
   : mutex_ (m)
 {
   if (ACE_OS::cond_init (&this->cond_) != 0)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition<ACE_Recursive_Thread_Mutex>")));
 }
 
@@ -58,7 +58,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition (ACE_Recursive_Thread_M
 {
   if (ACE_OS::cond_init (&this->cond_,
                          const_cast<ACE_condattr_t &> (attributes.attributes ())) != 0)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition<ACE_Recursive_Thread_Mutex>")));
 }
 
diff --git a/dep/acelite/ace/Condition_T.cpp b/dep/acelite/ace/Condition_T.cpp
index 4b5e32d09..8d45c9c77 100644
--- a/dep/acelite/ace/Condition_T.cpp
+++ b/dep/acelite/ace/Condition_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Condition_T.cpp 96077 2012-08-20 08:13:23Z johnnyw $
+// $Id: Condition_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_CONDITION_T_CPP
 #define ACE_CONDITION_T_CPP
@@ -11,7 +11,7 @@
 
 #if defined (ACE_HAS_THREADS)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Condition_T.inl"
@@ -28,9 +28,9 @@ ACE_Condition<MUTEX>::dump (void) const
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Condition<MUTEX>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -67,7 +67,7 @@ ACE_Condition<MUTEX>::ACE_Condition (MUTEX &m,
                          (short) type,
                          name,
                          arg) != 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Condition::ACE_Condition")));
 }
@@ -83,7 +83,7 @@ ACE_Condition<MUTEX>::ACE_Condition (MUTEX &m,
   if (ACE_OS::cond_init (&this->cond_,
                          const_cast<ACE_condattr_t &> (attributes.attributes ()),
                          name, arg) != 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Condition::ACE_Condition")));
 }
@@ -94,7 +94,7 @@ ACE_Condition<MUTEX>::~ACE_Condition (void)
   // ACE_TRACE ("ACE_Condition<MUTEX>::~ACE_Condition");
 
   if (this->remove () == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Condition::~ACE_Condition")));
 }
diff --git a/dep/acelite/ace/Condition_Thread_Mutex.cpp b/dep/acelite/ace/Condition_Thread_Mutex.cpp
index c3fcd7936..87cfe531c 100644
--- a/dep/acelite/ace/Condition_Thread_Mutex.cpp
+++ b/dep/acelite/ace/Condition_Thread_Mutex.cpp
@@ -2,7 +2,7 @@
 /**
  * @file Condition_Thread_Mutex.cpp
  *
- * $Id: Condition_Thread_Mutex.cpp 96077 2012-08-20 08:13:23Z johnnyw $
+ * $Id: Condition_Thread_Mutex.cpp 96985 2013-04-11 15:50:32Z huangh $
  *
  * Originally in Synch.cpp
  *
@@ -17,7 +17,7 @@
 #include "ace/Condition_Thread_Mutex.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -29,14 +29,14 @@ ACE_Condition<ACE_Thread_Mutex>::dump (void) const
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Condition<ACE_Thread_Mutex>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 #if defined (ACE_WIN32)
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("waiters = %d\n"),
               this->cond_.waiters ()));
 #endif /* ACE_WIN32 */
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -51,7 +51,7 @@ ACE_Condition<ACE_Thread_Mutex>::ACE_Condition (ACE_Thread_Mutex &m,
                          (short) USYNC_THREAD,
                          name,
                          arg) != 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Condition<ACE_Thread_Mutex>::ACE_Condition<ACE_Thread_Mutex>")));
 }
@@ -67,7 +67,7 @@ ACE_Condition<ACE_Thread_Mutex>::ACE_Condition (ACE_Thread_Mutex &m,
   if (ACE_OS::cond_init (&this->cond_,
                          const_cast<ACE_condattr_t &> (attributes.attributes ()),
                          name, arg) != 0)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Condition<ACE_Thread_Mutex>::ACE_Condition<ACE_Thread_Mutex>")));
 }
 
diff --git a/dep/acelite/ace/Condition_Thread_Mutex.inl b/dep/acelite/ace/Condition_Thread_Mutex.inl
index 76cbc82ea..f8c06f0ff 100644
--- a/dep/acelite/ace/Condition_Thread_Mutex.inl
+++ b/dep/acelite/ace/Condition_Thread_Mutex.inl
@@ -1,6 +1,5 @@
 // -*- C++ -*-
-//
-// $Id: Condition_Thread_Mutex.inl 96061 2012-08-16 09:36:07Z mcorino $
+// $Id: Condition_Thread_Mutex.inl 96174 2012-10-03 08:25:59Z johnnyw $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dep/acelite/ace/Configuration.cpp b/dep/acelite/ace/Configuration.cpp
index 85bbf1ca0..7ca5ad6d8 100644
--- a/dep/acelite/ace/Configuration.cpp
+++ b/dep/acelite/ace/Configuration.cpp
@@ -1,4 +1,4 @@
-// $Id: Configuration.cpp 92828 2010-12-08 09:38:57Z mcorino $
+// $Id: Configuration.cpp 97769 2014-06-05 06:37:53Z johnnyw $
 #include "ace/Configuration.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
@@ -1289,7 +1289,7 @@ ACE_Configuration_Heap::open (const ACE_TCHAR* file_name,
 #if !defined (ACE_LACKS_ACCESS)
   // Now check if the backing store has been created successfully.
   if (ACE_OS::access (file_name, F_OK) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("create_index\n")),
                       -1);
 #endif /* ACE_LACKS_ACCESS */
@@ -1320,7 +1320,7 @@ ACE_Configuration_Heap::create_index (void)
                                      section_index) == -1)
         {
           // Attempt to clean up.
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("create_index failed\n")));
           this->allocator_->remove ();
           return -1;
@@ -1608,15 +1608,15 @@ ACE_Configuration_Heap::remove_section (const ACE_Configuration_Section_Key& key
 
   if (recursive)
     {
-      ACE_Configuration_Section_Key section;
-      if (open_section (key, sub_section, 0, section))
+      ACE_Configuration_Section_Key recursive_section;
+      if (open_section (key, sub_section, 0, recursive_section))
         return -1;
 
       int index = 0;
       ACE_TString name;
-      while (!enumerate_sections (section, index, name))
+      while (!enumerate_sections (recursive_section, index, name))
         {
-          if (remove_section (section, name.fast_rep (), true))
+          if (remove_section (recursive_section, name.fast_rep (), true))
             return -1;
 
           ++index;
@@ -1808,9 +1808,9 @@ ACE_Configuration_Heap::set_string_value (const ACE_Configuration_Section_Key& k
       ACE_TCHAR* pers_value =
  (ACE_TCHAR *) allocator_->malloc ((value.length () + 1) * sizeof (ACE_TCHAR));
       ACE_OS::strcpy (pers_value, value.fast_rep ());
-      ACE_Configuration_ExtId item_name (pers_name);
+      ACE_Configuration_ExtId new_item_name (pers_name);
       ACE_Configuration_Value_IntId item_value (pers_value);
-      if (section_int.value_hash_map_->bind (item_name, item_value, allocator_))
+      if (section_int.value_hash_map_->bind (new_item_name, item_value, allocator_))
         {
           allocator_->free (pers_value);
           allocator_->free (pers_name);
diff --git a/dep/acelite/ace/Connection_Recycling_Strategy.cpp b/dep/acelite/ace/Connection_Recycling_Strategy.cpp
index cab307de8..1dd20479e 100644
--- a/dep/acelite/ace/Connection_Recycling_Strategy.cpp
+++ b/dep/acelite/ace/Connection_Recycling_Strategy.cpp
@@ -1,9 +1,13 @@
-// $Id: Connection_Recycling_Strategy.cpp 91287 2010-08-05 10:30:49Z johnnyw $
+// $Id: Connection_Recycling_Strategy.cpp 97246 2013-08-07 07:10:20Z johnnyw $
 
 #include "ace/Connection_Recycling_Strategy.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+ACE_Connection_Recycling_Strategy::ACE_Connection_Recycling_Strategy (void)
+{
+}
+
 ACE_Connection_Recycling_Strategy::~ACE_Connection_Recycling_Strategy (void)
 {
 }
diff --git a/dep/acelite/ace/Connection_Recycling_Strategy.h b/dep/acelite/ace/Connection_Recycling_Strategy.h
index 75169638d..bce8cf1c2 100644
--- a/dep/acelite/ace/Connection_Recycling_Strategy.h
+++ b/dep/acelite/ace/Connection_Recycling_Strategy.h
@@ -4,7 +4,7 @@
 /**
  *  @file   Connection_Recycling_Strategy.h
  *
- *  $Id: Connection_Recycling_Strategy.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: Connection_Recycling_Strategy.h 97246 2013-08-07 07:10:20Z johnnyw $
  *
  *  @author Doug Schmidt
  */
@@ -29,6 +29,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Connection_Recycling_Strategy
 {
 public:
+  ACE_Connection_Recycling_Strategy (void);
+
   /// Virtual Destructor
   virtual ~ACE_Connection_Recycling_Strategy (void);
 
diff --git a/dep/acelite/ace/Connector.cpp b/dep/acelite/ace/Connector.cpp
index a8399608c..15179c866 100644
--- a/dep/acelite/ace/Connector.cpp
+++ b/dep/acelite/ace/Connector.cpp
@@ -1,4 +1,4 @@
-// $Id: Connector.cpp 93433 2011-02-23 10:34:01Z vzykov $
+// $Id: Connector.cpp 97769 2014-06-05 06:37:53Z johnnyw $
 
 #ifndef ACE_CONNECTOR_CPP
 #define ACE_CONNECTOR_CPP
@@ -17,15 +17,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Connector)
 
-template <class SVC_HANDLER>
-ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::ACE_NonBlocking_Connect_Handler
-(ACE_Connector_Base<SVC_HANDLER> &connector,
- SVC_HANDLER *sh,
- long id)
-  : connector_ (connector)
-  , svc_handler_ (sh)
-  , cleanup_svc_handler_ (0)
-  , timer_id_ (id)
+template <typename SVC_HANDLER>
+ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::ACE_NonBlocking_Connect_Handler (ACE_Connector_Base<SVC_HANDLER> &connector,
+                                                                               SVC_HANDLER *sh,
+                                                                               long id)
+  : connector_ (connector),
+    svc_handler_ (sh),
+    cleanup_svc_handler_ (0),
+    timer_id_ (id)
 {
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::ACE_NonBlocking_Connect_Handler");
 
@@ -44,50 +43,48 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::ACE_NonBlocking_Connect_Handler
     }
 }
 
-template <class SVC_HANDLER>
+template <typename SVC_HANDLER>
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::~ACE_NonBlocking_Connect_Handler (void)
 {
   if (this->cleanup_svc_handler_)
-    {
-      this->cleanup_svc_handler_->remove_reference ();
-    }
+    this->cleanup_svc_handler_->remove_reference ();
 }
 
-template <class SVC_HANDLER> SVC_HANDLER *
+template <typename SVC_HANDLER> SVC_HANDLER *
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::svc_handler (void)
 {
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::svc_handler");
   return this->svc_handler_;
 }
 
-template <class SVC_HANDLER> long
+template <typename SVC_HANDLER> long
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id (void)
 {
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id");
   return this->timer_id_;
 }
 
-template <class SVC_HANDLER> void
+template <typename SVC_HANDLER> void
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id (long id)
 {
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id");
   this->timer_id_ = id;
 }
 
-template <class SVC_HANDLER> void
+template <typename SVC_HANDLER> void
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("svc_handler_ = %x"), this->svc_handler_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ntimer_id_ = %d"), this->timer_id_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("svc_handler_ = %x"), this->svc_handler_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ntimer_id_ = %d"), this->timer_id_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
-template <class SVC_HANDLER> bool
+template <typename SVC_HANDLER> bool
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::close (SVC_HANDLER *&sh)
 {
   // Make sure that we haven't already initialized the Svc_Handler.
@@ -131,7 +128,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::close (SVC_HANDLER *&sh)
 }
 
 
-template <class SVC_HANDLER> int
+template <typename SVC_HANDLER> int
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_timeout
 (const ACE_Time_Value &tv,
  const void *arg)
@@ -154,7 +151,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_timeout
 }
 
 
-template <class SVC_HANDLER> int
+template <typename SVC_HANDLER> int
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_input (ACE_HANDLE)
 {
   // Called when a failure occurs during asynchronous connection
@@ -173,7 +170,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_input (ACE_HANDLE)
   return retval;
 }
 
-template <class SVC_HANDLER> int
+template <typename SVC_HANDLER> int
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_close (ACE_HANDLE handle,
                                                             ACE_Reactor_Mask m)
 {
@@ -187,7 +184,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_close (ACE_HANDLE handle,
   return -1;
 }
 
-template <class SVC_HANDLER> int
+template <typename SVC_HANDLER> int
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_output (ACE_HANDLE handle)
 {
   // Called when a connection is establishment asynchronous.
@@ -206,7 +203,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_output (ACE_HANDLE handle)
   return retval;
 }
 
-template <class SVC_HANDLER> int
+template <typename SVC_HANDLER> int
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_exception (ACE_HANDLE h)
 {
   // On Win32, the except mask must also be set for asynchronous
@@ -215,28 +212,28 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_exception (ACE_HANDLE h)
   return this->handle_output (h);
 }
 
-template <class SVC_HANDLER> int
+template <typename SVC_HANDLER> int
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::resume_handler (void)
 {
   return ACE_Event_Handler::ACE_EVENT_HANDLER_NOT_RESUMED;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> void
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump (void) const
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> void
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nflags_ = %d"), this->flags_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nflags_ = %d"), this->flags_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::make_svc_handler (SVC_HANDLER *&sh)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::make_svc_handler (SVC_HANDLER *&sh)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::make_svc_handler");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::make_svc_handler");
 
   if (sh == 0)
     ACE_NEW_RETURN (sh,
@@ -249,10 +246,10 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::make_svc_handler (SVC_HANDLER
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::activate_svc_handler (SVC_HANDLER *svc_handler)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::activate_svc_handler (SVC_HANDLER *svc_handler)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::activate_svc_handler");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::activate_svc_handler");
   // No errors initially
   int error = 0;
 
@@ -281,23 +278,23 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::activate_svc_handler (SVC_HAND
     return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_PEER_CONNECTOR &
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connector (void) const
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> PEER_CONNECTOR &
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connector (void) const
 {
-  return const_cast<ACE_PEER_CONNECTOR &> (this->connector_);
+  return const_cast<PEER_CONNECTOR &> (this->connector_);
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_svc_handler
 (SVC_HANDLER *&svc_handler,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
  ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &local_addr,
  int reuse_addr,
  int flags,
  int perms)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_svc_handler");
 
   return this->connector_.connect (svc_handler->peer (),
                                    remote_addr,
@@ -308,18 +305,18 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
                                    perms);
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_svc_handler
 (SVC_HANDLER *&svc_handler,
  SVC_HANDLER *&sh_copy,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
  ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &local_addr,
  int reuse_addr,
  int flags,
  int perms)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_svc_handler");
 
   sh_copy = svc_handler;
   return this->connector_.connect (svc_handler->peer (),
@@ -331,29 +328,29 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
                                    perms);
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open (ACE_Reactor *r, int flags)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::open (ACE_Reactor *r, int flags)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::open");
   this->reactor (r);
   this->flags_ = flags;
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1>
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connector (ACE_Reactor *r,
+template <typename SVC_HANDLER, typename PEER_CONNECTOR>
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Connector (ACE_Reactor *r,
                                                                  int flags)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connector");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Connector");
   (void) this->open (r, flags);
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect
 (SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
  const ACE_Synch_Options &synch_options,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &local_addr,
  int reuse_addr,
  int flags,
  int perms)
@@ -369,13 +366,13 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect
                           perms);
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect
 (SVC_HANDLER *&sh,
  SVC_HANDLER *&sh_copy,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
  const ACE_Synch_Options &synch_options,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &local_addr,
  int reuse_addr,
  int flags,
  int perms)
@@ -391,18 +388,18 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect
                           perms);
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_i
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_i
 (SVC_HANDLER *&sh,
  SVC_HANDLER **sh_copy,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
  const ACE_Synch_Options &synch_options,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &local_addr,
  int reuse_addr,
  int flags,
  int perms)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_i");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_i");
 
   // If the user hasn't supplied us with a <SVC_HANDLER> we'll use the
   // factory method to create one.  Otherwise, things will remain as
@@ -449,8 +446,6 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_i
       // ACE_NonBlocking_Connect_Handler with the ACE_Reactor so that
       // it will call us back when the connection is complete or we
       // timeout, whichever comes first...
-      int result;
-
       if (sh_copy == 0)
         result = this->nonblocking_connect (sh, synch_options);
       else
@@ -481,11 +476,11 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_i
   return -1;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_n
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_n
 (size_t n,
  SVC_HANDLER *sh[],
- ACE_PEER_CONNECTOR_ADDR remote_addrs[],
+ typename PEER_CONNECTOR::PEER_ADDR remote_addrs[],
  ACE_TCHAR *failed_svc_handlers,
  const ACE_Synch_Options &synch_options)
 {
@@ -511,10 +506,10 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_n
 }
 
 // Cancel a <svc_handler> that was started asynchronously.
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::cancel (SVC_HANDLER *sh)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::cancel (SVC_HANDLER *sh)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::cancel");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::cancel");
 
   ACE_Event_Handler *handler =
     this->reactor ()->find_handler (sh->get_handle ());
@@ -539,12 +534,12 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::cancel (SVC_HANDLER *sh)
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::nonblocking_connect
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::nonblocking_connect
 (SVC_HANDLER *sh,
  const ACE_Synch_Options &synch_options)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::nonblocking_connect");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::nonblocking_connect");
 
   // Must have a valid Reactor for non-blocking connects to work.
   if (this->reactor () == 0)
@@ -617,16 +612,16 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::nonblocking_connect
   return -1;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1>
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Connector (void)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR>
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Connector (void)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Connector");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Connector");
 
   this->close ();
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> void
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::initialize_svc_handler
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> void
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::initialize_svc_handler
 (ACE_HANDLE handle,
  SVC_HANDLER *svc_handler)
 {
@@ -641,7 +636,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::initialize_svc_handler
   // Transfer ownership of the ACE_HANDLE to the SVC_HANDLER.
   svc_handler->set_handle (handle);
 
-  ACE_PEER_CONNECTOR_ADDR raddr;
+  typename PEER_CONNECTOR::PEER_ADDR raddr;
 
   // Check to see if we're connected.
   if (svc_handler->peer ().get_remote_addr (raddr) != -1)
@@ -662,26 +657,26 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::initialize_svc_handler
     }
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> void
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::reactor (ACE_Reactor *reactor)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> void
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::reactor (ACE_Reactor *reactor)
 {
   this->reactor_ = reactor;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_Reactor *
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::reactor (void) const
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Reactor *
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::reactor (void) const
 {
   return this->reactor_;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_Unbounded_Set<ACE_HANDLE> &
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::non_blocking_handles (void)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Unbounded_Set<ACE_HANDLE> &
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::non_blocking_handles (void)
 {
   return this->non_blocking_handles_;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::close (void)
 {
   // If there are no non-blocking handle pending, return immediately.
   if (this->non_blocking_handles ().size () == 0)
@@ -705,7 +700,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
         this->reactor ()->find_handler (*handle);
       if (handler == 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%t: Connector::close h %d, no handler\n"),
                       *handle));
           // Remove handle from the set of non-blocking handles.
@@ -718,7 +713,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
       NBCH *nbch = dynamic_cast<NBCH *> (handler);
       if (nbch == 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%t: Connector::close h %d handler %@ ")
                       ACE_TEXT ("not a legit handler\n"),
                       *handle,
@@ -739,41 +734,41 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::fini (void)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::fini (void)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::fini");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::fini");
 
   return this->close ();
 }
 
 // Hook called by the explicit dynamic linking facility.
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::init (int, ACE_TCHAR *[])
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::init (int, ACE_TCHAR *[])
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::init");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::init");
   return -1;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::suspend (void)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::suspend (void)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::suspend");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::suspend");
   return -1;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::resume (void)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::resume (void)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::resume");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::resume");
   return -1;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::info (ACE_TCHAR **strp, size_t length) const
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::info (ACE_TCHAR **strp, size_t length) const
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::info");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::info");
   ACE_TCHAR buf[BUFSIZ];
 
   ACE_OS::sprintf (buf,
@@ -788,23 +783,23 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::info (ACE_TCHAR **strp, size_t
   return static_cast<int> (ACE_OS::strlen (buf));
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open (ACE_Reactor *r,
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::open (ACE_Reactor *r,
                                                                  int flags)
 {
-  ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open");
+  ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::open");
   return this->open (r, 0, 0, 0, flags);
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::open
 (ACE_Reactor *r,
  ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
- ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> *conn_s,
+ ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> *conn_s,
  ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
  int flags)
 {
-  ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open");
+  ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::open");
 
   this->reactor (r);
 
@@ -880,11 +875,11 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open
   return 0;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1>
-ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Strategy_Connector
+template <typename SVC_HANDLER, typename PEER_CONNECTOR>
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Strategy_Connector
 (ACE_Reactor *reactor,
  ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
- ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> *conn_s,
+ ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> *conn_s,
  ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
  int flags)
   : base_type (reactor),
@@ -895,23 +890,23 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Strategy_Connecto
     concurrency_strategy_ (0),
     delete_concurrency_strategy_ (false)
 {
-  ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Strategy_Connector");
+  ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Strategy_Connector");
 
   if (this->open (reactor, cre_s, conn_s, con_s, flags) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_Strategy_Connector::ACE_Strategy_Connector")));
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_Strategy_Connector::ACE_Strategy_Connector")));
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1>
-ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Strategy_Connector (void)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR>
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Strategy_Connector (void)
 {
-  ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Strategy_Connector");
+  ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Strategy_Connector");
 
   // Close down
   this->close ();
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::close (void)
 {
   if (this->delete_creation_strategy_)
     delete this->creation_strategy_;
@@ -931,18 +926,18 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
   return SUPER::close ();
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::make_svc_handler (SVC_HANDLER *&sh)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::make_svc_handler (SVC_HANDLER *&sh)
 {
   return this->creation_strategy_->make_svc_handler (sh);
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_svc_handler
 (SVC_HANDLER *&sh,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
  ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &local_addr,
  int reuse_addr,
  int flags,
  int perms)
@@ -956,13 +951,13 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
                                                        perms);
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_svc_handler
 (SVC_HANDLER *&sh,
  SVC_HANDLER *&sh_copy,
- const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
  ACE_Time_Value *timeout,
- const ACE_PEER_CONNECTOR_ADDR &local_addr,
+ const typename PEER_CONNECTOR::PEER_ADDR &local_addr,
  int reuse_addr,
  int flags,
  int perms)
@@ -977,26 +972,26 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
                                                        perms);
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
-ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::activate_svc_handler (SVC_HANDLER *svc_handler)
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> int
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::activate_svc_handler (SVC_HANDLER *svc_handler)
 {
   return this->concurrency_strategy_->activate_svc_handler (svc_handler, this);
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_Creation_Strategy<SVC_HANDLER> *
-ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::creation_strategy (void) const
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Creation_Strategy<SVC_HANDLER> *
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::creation_strategy (void) const
 {
   return this->creation_strategy_;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> *
-ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_strategy (void) const
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> *
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_strategy (void) const
 {
   return this->connect_strategy_;
 }
 
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_Concurrency_Strategy<SVC_HANDLER> *
-ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::concurrency_strategy (void) const
+template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Concurrency_Strategy<SVC_HANDLER> *
+ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::concurrency_strategy (void) const
 {
   return this->concurrency_strategy_;
 }
diff --git a/dep/acelite/ace/Connector.h b/dep/acelite/ace/Connector.h
index 320867852..5a24daa01 100644
--- a/dep/acelite/ace/Connector.h
+++ b/dep/acelite/ace/Connector.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Connector.h
  *
- *  $Id: Connector.h 91527 2010-08-27 15:03:31Z shuston $
+ *  $Id: Connector.h 97180 2013-05-29 16:51:19Z schmidt $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -147,26 +147,36 @@ private:
  * service handlers (SVC_HANDLERs).
  *
  * Implements the strategy for actively establishing connections with
- * clients.  An ACE_Connector is parameterized by concrete types that
- * conform to the interfaces of PEER_CONNECTOR and SVC_HANDLER.  The
- * PEER_CONNECTOR is instantiated with a transport mechanism that
- * actively establishes connections.  The SVC_HANDLER is instantiated
- * with a concrete type that performs the application-specific
- * service.  Both blocking and non-blocking connects are supported.
- * Further, non-blocking connects support timeouts.
+ * clients.  Both blocking and non-blocking connects are supported.
+ * Moreover, non-blocking connects support timeouts.
+ *
+ * An ACE_Connector is parameterized by concrete types that conform to
+ * the interfaces of SVC_HANDLER and PEER_CONNECTOR described below.
+ *
+ * @tparam SVC_HANDLER The name of the concrete type that performs the
+ *         application-specific service.  The SVC_HANDLER typically
+ *         inherits from ACE_Svc_Handler.  @see Svc_Handler.h.
+ *
+ * @tparam PEER_CONNECTOR The name of the class that implements the
+ *         PEER_CONNECTOR endpoint (e.g., ACE_SOCK_Connector) to
+ *         passively establish connections.  A PEER_CONNECTOR
+ *         implementation must provide a PEER_STREAM and PEER_ADDR
+ *         trait to identify the type of stream (e.g.,
+ *         ACE_SOCK_Stream) and type of address (e.g., ACE_INET_Addr)
+ *         used by the endpoint.
  */
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1>
+template <typename SVC_HANDLER, typename PEER_CONNECTOR>
 class ACE_Connector : public ACE_Connector_Base<SVC_HANDLER>, public ACE_Service_Object
 {
 public:
 
   // Useful STL-style traits.
-  typedef typename SVC_HANDLER::addr_type        addr_type;
-  typedef ACE_PEER_CONNECTOR                     connector_type;
-  typedef SVC_HANDLER                            handler_type;
-  typedef typename SVC_HANDLER::stream_type      stream_type;
-  typedef typename ACE_PEER_CONNECTOR::PEER_ADDR peer_addr_type;
-  typedef ACE_PEER_CONNECTOR_ADDR                ACE_PEER_ADDR_TYPEDEF;
+  typedef typename SVC_HANDLER::addr_type addr_type;
+  typedef PEER_CONNECTOR connector_type;
+  typedef SVC_HANDLER handler_type;
+  typedef typename SVC_HANDLER::stream_type stream_type;
+  typedef typename PEER_CONNECTOR::PEER_ADDR peer_addr_type;
+  typedef typename PEER_CONNECTOR::PEER_ADDR PEER_ADDR_TYPEDEF;
 
   /**
    * Initialize a connector.  @a flags indicates how SVC_HANDLER's
@@ -203,10 +213,10 @@ public:
    * automatically to prevent resource leaks.
    */
   virtual int connect (SVC_HANDLER *&svc_handler,
-                       const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                       const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
                        const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults,
-                       const ACE_PEER_CONNECTOR_ADDR &local_addr
-                       = (peer_addr_type &) ACE_PEER_CONNECTOR_ADDR_ANY,
+                       const typename PEER_CONNECTOR::PEER_ADDR &local_addr
+                         = reinterpret_cast<const peer_addr_type &>(peer_addr_type::sap_any),
                        int reuse_addr = 0,
                        int flags = O_RDWR,
                        int perms = 0);
@@ -223,10 +233,10 @@ public:
    */
   virtual int connect (SVC_HANDLER *&svc_handler_hint,
                        SVC_HANDLER *&svc_handler,
-                       const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                       const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
                        const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults,
-                       const ACE_PEER_CONNECTOR_ADDR &local_addr
-                       = (peer_addr_type &) ACE_PEER_CONNECTOR_ADDR_ANY,
+                       const typename PEER_CONNECTOR::PEER_ADDR &local_addr
+                         = reinterpret_cast<const peer_addr_type &>(peer_addr_type::sap_any),
                        int reuse_addr = 0,
                        int flags = O_RDWR,
                        int perms = 0);
@@ -241,7 +251,7 @@ public:
    */
   virtual int connect_n (size_t n,
                          SVC_HANDLER *svc_handlers[],
-                         ACE_PEER_CONNECTOR_ADDR remote_addrs[],
+                         typename PEER_CONNECTOR::PEER_ADDR remote_addrs[],
                          ACE_TCHAR *failed_svc_handlers = 0,
                          const ACE_Synch_Options &synch_options =
                          ACE_Synch_Options::defaults);
@@ -259,7 +269,7 @@ public:
   virtual int close (void);
 
   /// Return the underlying PEER_CONNECTOR object.
-  virtual ACE_PEER_CONNECTOR &connector (void) const;
+  virtual PEER_CONNECTOR &connector (void) const;
 
   /// Initialize Svc_Handler.
   virtual void initialize_svc_handler (ACE_HANDLE handle,
@@ -301,17 +311,17 @@ protected:
    * <PEER_CONNECTOR::connect>.
    */
   virtual int connect_svc_handler (SVC_HANDLER *&svc_handler,
-                                   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                                   const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
                                    ACE_Time_Value *timeout,
-                                   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                                   const typename PEER_CONNECTOR::PEER_ADDR &local_addr,
                                    int reuse_addr,
                                    int flags,
                                    int perms);
   virtual int connect_svc_handler (SVC_HANDLER *&svc_handler,
                                    SVC_HANDLER *&sh_copy,
-                                   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                                   const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
                                    ACE_Time_Value *timeout,
-                                   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                                   const typename PEER_CONNECTOR::PEER_ADDR &local_addr,
                                    int reuse_addr,
                                    int flags,
                                    int perms);
@@ -335,9 +345,9 @@ protected:
   /// Implementation of the connect methods.
   virtual int connect_i (SVC_HANDLER *&svc_handler,
                          SVC_HANDLER **sh_copy,
-                         const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                         const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
                          const ACE_Synch_Options &synch_options,
-                         const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                         const typename PEER_CONNECTOR::PEER_ADDR &local_addr,
                          int reuse_addr,
                          int flags,
                          int perms);
@@ -368,7 +378,7 @@ protected:
 
 private:
   /// This is the peer connector factory.
-  ACE_PEER_CONNECTOR connector_;
+  PEER_CONNECTOR connector_;
 
   /**
    * Flags that indicate how SVC_HANDLER's should be initialized
@@ -400,30 +410,30 @@ private:
  * and (3) activating the SVC_HANDLER with a
  * particular concurrency mechanism after the connection is established.
  */
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1>
+template <class SVC_HANDLER, typename PEER_CONNECTOR>
 class ACE_Strategy_Connector
-  : public ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2>
+  : public ACE_Connector <SVC_HANDLER, PEER_CONNECTOR>
 {
 public:
 
   // Useful STL-style traits.
   typedef ACE_Creation_Strategy<SVC_HANDLER>
   creation_strategy_type;
-  typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>
+  typedef ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR>
   connect_strategy_type;
   typedef ACE_Concurrency_Strategy<SVC_HANDLER>
   concurrency_strategy_type;
-  typedef ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2>
+  typedef ACE_Connector <SVC_HANDLER, PEER_CONNECTOR>
   base_type;
 
   // = Define some useful (old style) traits.
   typedef ACE_Creation_Strategy<SVC_HANDLER>
   CREATION_STRATEGY;
-  typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>
+  typedef ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR>
   CONNECT_STRATEGY;
   typedef ACE_Concurrency_Strategy<SVC_HANDLER>
   CONCURRENCY_STRATEGY;
-  typedef ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2>
+  typedef ACE_Connector <SVC_HANDLER, PEER_CONNECTOR>
   SUPER;
 
   /**
@@ -434,7 +444,7 @@ public:
    */
   ACE_Strategy_Connector (ACE_Reactor *r = ACE_Reactor::instance (),
                           ACE_Creation_Strategy<SVC_HANDLER> * = 0,
-                          ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * = 0,
+                          ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> * = 0,
                           ACE_Concurrency_Strategy<SVC_HANDLER> * = 0,
                           int flags = 0);
 
@@ -456,7 +466,7 @@ public:
    */
   virtual int open (ACE_Reactor *r = ACE_Reactor::instance (),
                     ACE_Creation_Strategy<SVC_HANDLER> * = 0,
-                    ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * = 0,
+                    ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> * = 0,
                     ACE_Concurrency_Strategy<SVC_HANDLER> * = 0,
                     int flags = 0);
 
@@ -468,7 +478,7 @@ public:
 
   // = Strategies accessors
   virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy (void) const;
-  virtual ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> *connect_strategy (void) const;
+  virtual ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> *connect_strategy (void) const;
   virtual ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy (void) const;
 
 protected:
@@ -495,9 +505,9 @@ protected:
    * <PEER_CONNECTOR::connect> in the <Connect_Strategy>.
    */
   virtual int connect_svc_handler (SVC_HANDLER *&sh,
-                                   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                                   const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
                                    ACE_Time_Value *timeout,
-                                   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                                   const typename PEER_CONNECTOR::PEER_ADDR &local_addr,
                                    int reuse_addr,
                                    int flags,
                                    int perms);
@@ -514,9 +524,9 @@ protected:
    */
   virtual int connect_svc_handler (SVC_HANDLER *&sh,
                                    SVC_HANDLER *&sh_copy,
-                                   const ACE_PEER_CONNECTOR_ADDR &remote_addr,
+                                   const typename PEER_CONNECTOR::PEER_ADDR &remote_addr,
                                    ACE_Time_Value *timeout,
-                                   const ACE_PEER_CONNECTOR_ADDR &local_addr,
+                                   const typename PEER_CONNECTOR::PEER_ADDR &local_addr,
                                    int reuse_addr,
                                    int flags,
                                    int perms);
diff --git a/dep/acelite/ace/Containers_T.cpp b/dep/acelite/ace/Containers_T.cpp
index 411b26dc8..8f0621e03 100644
--- a/dep/acelite/ace/Containers_T.cpp
+++ b/dep/acelite/ace/Containers_T.cpp
@@ -1,9 +1,9 @@
-// $Id: Containers_T.cpp 92069 2010-09-28 11:38:59Z johnnyw $
+// $Id: Containers_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_CONTAINERS_T_CPP
 #define ACE_CONTAINERS_T_CPP
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Malloc_Base.h"
 #include "ace/OS_Memory.h"
 
@@ -442,9 +442,9 @@ ACE_Double_Linked_List_Iterator_Base<T>::do_retreat (void)
 template <class T> void
 ACE_Double_Linked_List_Iterator_Base<T>::dump_i (void) const
 {
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("current_ = %x"), this->current_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("current_ = %x"), this->current_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
 //--------------------------------------------------
@@ -1622,10 +1622,10 @@ ACE_Ordered_MultiSet<T>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   //  ACE_TRACE ("ACE_Ordered_MultiSet<T>::dump");
   //
-  //  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  //  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhead_ = %u"), this->head_));
-  //  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_));
-  //  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_));
+  //  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  //  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhead_ = %u"), this->head_));
+  //  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_));
+  //  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_));
   //
   //  T *item = 0;
   //  size_t count = 1;
@@ -1633,9 +1633,9 @@ ACE_Ordered_MultiSet<T>::dump (void) const
   //  for (ACE_Ordered_MultiSet_Iterator<T> iter (*(ACE_Ordered_MultiSet<T> *) this);
   //       iter.next (item) != 0;
   //       iter.advance ())
-  //    ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("count = %d\n"), count++));
+  //    ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("count = %d\n"), count++));
   //
-  //  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  //  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Countdown_Time_T.cpp b/dep/acelite/ace/Countdown_Time_T.cpp
index fd9a46662..fdac8216d 100644
--- a/dep/acelite/ace/Countdown_Time_T.cpp
+++ b/dep/acelite/ace/Countdown_Time_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Countdown_Time_T.cpp 95332 2011-12-15 11:09:41Z mcorino $
+// $Id: Countdown_Time_T.cpp 97130 2013-05-13 17:36:26Z mesnier_p $
 
 #ifndef ACE_COUNTDOWN_TIME_T_CPP
 #define ACE_COUNTDOWN_TIME_T_CPP
@@ -16,6 +16,7 @@ ACE_Countdown_Time_T<TIME_POLICY>::ACE_Countdown_Time_T (ACE_Time_Value *max_wai
                                                          TIME_POLICY const & time_policy)
   : time_policy_ (time_policy),
     max_wait_time_ (max_wait_time),
+    max_wait_value_ (ACE_Time_Value::zero),
     stopped_ (false)
 {
   this->start ();
@@ -32,6 +33,7 @@ ACE_Countdown_Time_T<TIME_POLICY>::start (void)
 {
   if (this->max_wait_time_ != 0)
     {
+      this->max_wait_value_ = *this->max_wait_time_;
       this->start_time_ = this->time_policy_ ();
       this->stopped_ = false;
     }
@@ -46,9 +48,9 @@ ACE_Countdown_Time_T<TIME_POLICY>::stop (void)
           this->time_policy_ () - this->start_time_;
 
       if (elapsed_time >= ACE_Time_Value::zero &&
-          *this->max_wait_time_ > elapsed_time)
+          this->max_wait_value_ > elapsed_time)
         {
-          *this->max_wait_time_ -= elapsed_time;
+          *this->max_wait_time_ = this->max_wait_value_ - elapsed_time;
         }
       else
         {
diff --git a/dep/acelite/ace/Countdown_Time_T.h b/dep/acelite/ace/Countdown_Time_T.h
index 74de8f27e..cbcab9f4b 100644
--- a/dep/acelite/ace/Countdown_Time_T.h
+++ b/dep/acelite/ace/Countdown_Time_T.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Countdown_Time_T.h
  *
- *  $Id: Countdown_Time_T.h 95345 2011-12-15 19:46:06Z johnnyw $
+ *  $Id: Countdown_Time_T.h 97130 2013-05-13 17:36:26Z mesnier_p $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -70,9 +70,12 @@ private:
   /// The policy to return the current time of day
   TIME_POLICY time_policy_;
 
-  /// Maximum time we were willing to wait.
+  /// Maximum time we are monitoring
   ACE_Time_Value *max_wait_time_;
 
+  /// Copy of the maximum time value, used to avoid nested decrements
+  ACE_Time_Value max_wait_value_;
+
   /// Beginning of the start time.
   ACE_Time_Value start_time_;
 
diff --git a/dep/acelite/ace/DEV_Addr.cpp b/dep/acelite/ace/DEV_Addr.cpp
index 90bfe0a57..037384388 100644
--- a/dep/acelite/ace/DEV_Addr.cpp
+++ b/dep/acelite/ace/DEV_Addr.cpp
@@ -1,11 +1,11 @@
-// $Id: DEV_Addr.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: DEV_Addr.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/DEV_Addr.h"
 #if !defined (__ACE_INLINE__)
 #include "ace/DEV_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_string.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -39,9 +39,9 @@ ACE_DEV_Addr::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DEV_Addr::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("devname_ = %s"), this->devname_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("devname_ = %s"), this->devname_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/DEV_Connector.h b/dep/acelite/ace/DEV_Connector.h
index 2f71f6088..a2dbc466b 100644
--- a/dep/acelite/ace/DEV_Connector.h
+++ b/dep/acelite/ace/DEV_Connector.h
@@ -4,7 +4,7 @@
 /**
  *  @file    DEV_Connector.h
  *
- *  $Id: DEV_Connector.h 82723 2008-09-16 09:35:44Z johnnyw $
+ *  $Id: DEV_Connector.h 96985 2013-04-11 15:50:32Z huangh $
  *
  *  @author Gerhard Lenzer and Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -15,7 +15,7 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/DEV_IO.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/os_include/os_fcntl.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/dep/acelite/ace/DEV_Connector.inl b/dep/acelite/ace/DEV_Connector.inl
index a57a38b71..c53421f3b 100644
--- a/dep/acelite/ace/DEV_Connector.inl
+++ b/dep/acelite/ace/DEV_Connector.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: DEV_Connector.inl 82723 2008-09-16 09:35:44Z johnnyw $
+// $Id: DEV_Connector.inl 96985 2013-04-11 15:50:32Z huangh $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -19,7 +19,7 @@ ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io,
   if (this->connect (new_io, remote_sap, timeout, local_sap,
                      reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"),
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"),
                     remote_sap.get_path_name (), ACE_TEXT ("ACE_DEV_IO")));
 }
 
diff --git a/dep/acelite/ace/DEV_IO.cpp b/dep/acelite/ace/DEV_IO.cpp
index a16aca006..59b76bd26 100644
--- a/dep/acelite/ace/DEV_IO.cpp
+++ b/dep/acelite/ace/DEV_IO.cpp
@@ -1,7 +1,7 @@
-// $Id: DEV_IO.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: DEV_IO.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/DEV_IO.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/DEV_IO.inl"
@@ -42,9 +42,9 @@ ACE_DEV_IO::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DEV_IO::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->addr_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/DLL.cpp b/dep/acelite/ace/DLL.cpp
index 1f9604678..c8b31e305 100644
--- a/dep/acelite/ace/DLL.cpp
+++ b/dep/acelite/ace/DLL.cpp
@@ -1,8 +1,8 @@
-// $Id: DLL.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: DLL.cpp 97888 2014-09-11 10:29:17Z mcorino $
 
 #include "ace/DLL.h"
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 #include "ace/DLL_Manager.h"
 #include "ace/OS_NS_string.h"
@@ -43,7 +43,7 @@ ACE_DLL::ACE_DLL (const ACE_DLL &rhs)
                      rhs.open_mode_,
                      rhs.close_handle_on_destruction_) != 0
       && ACE::debug ())
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
     ACE_TEXT ("ACE_DLL::copy_ctor: error: %s\n"),
     this->error ()));
 }
@@ -84,7 +84,7 @@ ACE_DLL::ACE_DLL (const ACE_TCHAR *dll_name,
 
   if (this->open (dll_name, this->open_mode_, close_handle_on_destruction) != 0
       && ACE::debug ())
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_DLL::open: error calling open: %s\n"),
                 this->error ()));
 }
@@ -136,11 +136,12 @@ ACE_DLL::open_i (const ACE_TCHAR *dll_filename,
   ACE_TRACE ("ACE_DLL::open_i");
 
   this->error_ = 0;
+  this->errmsg_.clear (true);
 
   if (!dll_filename)
     {
       if (ACE::debug ())
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("ACE_DLL::open_i: dll_name is %s\n"),
                     this->dll_name_ == 0 ? ACE_TEXT ("(null)")
         : this->dll_name_));
@@ -162,12 +163,24 @@ ACE_DLL::open_i (const ACE_TCHAR *dll_filename,
   this->open_mode_ = open_mode;
   this->close_handle_on_destruction_ = close_handle_on_destruction;
 
+  ACE_DLL_Handle::ERROR_STACK errors;
   this->dll_handle_ = ACE_DLL_Manager::instance()->open_dll (this->dll_name_,
                                                              this->open_mode_,
-                                                             handle);
+                                                             handle,
+                                                             &errors);
 
   if (!this->dll_handle_)
-    this->error_ = 1;
+    {
+      ACE_TString errtmp;
+      while (!errors.is_empty ())
+        {
+          errors.pop (errtmp);
+          if (this->errmsg_.length () > 0)
+            this->errmsg_ += ACE_TEXT ("\n");
+          this->errmsg_ += errtmp;
+        }
+      this->error_ = 1;
+    }
 
   return this->error_ ? -1 : 0;
 }
@@ -180,10 +193,11 @@ ACE_DLL::symbol (const ACE_TCHAR *sym_name, int ignore_errors)
   ACE_TRACE ("ACE_DLL::symbol");
 
   this->error_ = 0;
+  this->errmsg_.clear (true);
 
   void *sym = 0;
   if (this->dll_handle_)
-    sym = this->dll_handle_->symbol (sym_name, ignore_errors);
+    sym = this->dll_handle_->symbol (sym_name, ignore_errors, this->errmsg_);
 
   if (!sym)
     this->error_ = 1;
@@ -224,7 +238,7 @@ ACE_DLL::error (void) const
   ACE_TRACE ("ACE_DLL::error");
   if (this->error_)
     {
-      return ACE_OS::dlerror ();
+      return const_cast<ACE_TCHAR*> (this->errmsg_.c_str ());
     }
 
   return 0;
@@ -235,7 +249,7 @@ ACE_DLL::error (void) const
 // means the user temporarily wants to take the handle.
 
 ACE_SHLIB_HANDLE
-ACE_DLL::get_handle (int become_owner) const
+ACE_DLL::get_handle (bool become_owner) const
 {
   ACE_TRACE ("ACE_DLL::get_handle");
 
diff --git a/dep/acelite/ace/DLL.h b/dep/acelite/ace/DLL.h
index 4b1251eb7..57da5d324 100644
--- a/dep/acelite/ace/DLL.h
+++ b/dep/acelite/ace/DLL.h
@@ -4,7 +4,7 @@
 /**
  *  @file    DLL.h
  *
- *  $Id: DLL.h 95913 2012-06-21 17:14:36Z johnnyw $
+ *  $Id: DLL.h 97888 2014-09-11 10:29:17Z mcorino $
  *
  *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
  */
@@ -22,6 +22,7 @@
 
 #include "ace/Global_Macros.h"
 #include "ace/os_include/os_dlfcn.h"
+#include "ace/SString.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -50,7 +51,7 @@ public:
    * @param close_handle_on_destruction  Indicates whether or not the
    *        close() method will be called to close an open DLL when this
    *        object is destroyed. By default, close() will be called.
-   *        Set this parameter to 0 for situations where the DLL's lifetime
+   *        Set this parameter to false for situations where the DLL's lifetime
    *        is controlled in a scope other than that of this ACE_DLL object.
    *        For example, termination by ACE_DLL_Manager via ACE::fini().
    */
@@ -161,12 +162,12 @@ public:
   ACE_TCHAR *error (void) const;
 
   /**
-   * Return the handle to the caller.  If @a become_owner is non-0 then
+   * Return the handle to the caller.  If @a become_owner is true then
    * caller assumes ownership of the handle and the ACE_DLL object
    * won't call close() when it goes out of scope, even if
    * @c close_handle_on_destruction is set.
    */
-  ACE_SHLIB_HANDLE get_handle (int become_owner = 0) const;
+  ACE_SHLIB_HANDLE get_handle (bool become_owner = false) const;
 
   /// Set the handle for the DLL object. By default, the close()
   /// operation on / the object will be invoked before it is destroyed.
@@ -201,6 +202,8 @@ public:
   /// Flag to record if the last operation had an error.
   bool error_;
 
+  /// Any error messages encountered during last operation.
+  ACE_TString errmsg_;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/DLL_Manager.cpp b/dep/acelite/ace/DLL_Manager.cpp
index ebba7d64a..3c415052f 100644
--- a/dep/acelite/ace/DLL_Manager.cpp
+++ b/dep/acelite/ace/DLL_Manager.cpp
@@ -1,8 +1,8 @@
-// $Id: DLL_Manager.cpp 95913 2012-06-21 17:14:36Z johnnyw $
+// $Id: DLL_Manager.cpp 97888 2014-09-11 10:29:17Z mcorino $
 
 #include "ace/DLL_Manager.h"
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 #include "ace/Framework_Component.h"
 
@@ -43,7 +43,8 @@ ACE_DLL_Handle::dll_name (void) const
 int
 ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
                       int open_mode,
-                      ACE_SHLIB_HANDLE handle)
+                      ACE_SHLIB_HANDLE handle,
+                      ERROR_STACK *errors)
 {
   ACE_TRACE ("ACE_DLL_Handle::open");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0));
@@ -54,7 +55,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
       if (ACE_OS::strcmp (this->dll_name_, dll_name) != 0)
         {
           if (ACE::debug ())
-            ACE_ERROR ((LM_ERROR,
+            ACELIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("ACE (%P|%t) DLL_Handle::open: error, ")
                         ACE_TEXT ("tried to reopen %s with name %s\n"),
                         this->dll_name_,
@@ -121,7 +122,8 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
 
               if (ACE::debug ())
                 {
-                  ACE_DEBUG ((LM_DEBUG,
+                  ACE_TString err;
+                  ACELIB_DEBUG ((LM_DEBUG,
                               ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ")
                               ACE_TEXT ("(\"%s\", 0x%x) -> %s: %s\n"),
                               name->c_str (),
@@ -129,7 +131,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
                               ((this->handle_ != ACE_SHLIB_INVALID_HANDLE)
                                ? ACE_TEXT ("succeeded")
                                : ACE_TEXT ("failed")),
-                              this->error()->c_str()));
+                              this->error (err).c_str()));
                 }
 
               if (this->handle_ != ACE_SHLIB_INVALID_HANDLE)   // Good one?
@@ -141,14 +143,27 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
               // mask it.
               // @TODO: If we've found our DLL _and_ it's
               // broken, should we continue at all?
-              if ((errno != 0) && (errno != ENOENT) && ACE::debug ())
-                ACE_ERROR ((LM_ERROR,
-                            ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ")
-                            ACE_TEXT ("(\'%s\') failed, errno=")
-                            ACE_TEXT ("%d: <%s>\n"),
-                            name->c_str (),
-                            ACE_ERRNO_GET,
-                            this->error ()->c_str ()));
+              if ((errno != 0) && (errno != ENOENT) && (errors || ACE::debug ()))
+                {
+                  ACE_TString errtmp;
+                  if (errors)
+                    {
+                      errors->push (this->error (errtmp));
+                    }
+
+                  if (ACE::debug ())
+                    {
+                      if (!errors)
+                        this->error (errtmp);
+                      ACELIB_ERROR ((LM_ERROR,
+                                  ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ")
+                                  ACE_TEXT ("(\'%s\') failed, errno=")
+                                  ACE_TEXT ("%d: <%s>\n"),
+                                  name->c_str (),
+                                  ACE_ERRNO_GET,
+                                  errtmp.c_str ()));
+                    }
+                }
 
 #if defined (AIX)
               // AIX often puts the shared library file (most often named
@@ -166,7 +181,8 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
 
                   if (ACE::debug ())
                     {
-                      ACE_DEBUG ((LM_DEBUG,
+                      ACE_TString err;
+                      ACELIB_DEBUG ((LM_DEBUG,
                                   ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ")
                                   ACE_TEXT ("(\"%s\", 0x%x) -> %s: %s\n"),
                                   aix_pathname,
@@ -174,7 +190,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
                                   (this->handle_ != ACE_SHLIB_INVALID_HANDLE
                                                 ? ACE_TEXT ("succeeded")
                                                 : ACE_TEXT ("failed")),
-                                  this->error()->c_str()));
+                                  this->error(err).c_str()));
                     }
 
                   this->handle_ = ACE_OS::dlopen (aix_pathname, open_mode);
@@ -187,14 +203,27 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
                   //
                   // @TODO: If we've found our DLL _and_ it's broken,
                   // should we continue at all?
-                  if (ACE::debug () && (errno != 0) && (errno != ENOENT))
-                    ACE_ERROR ((LM_ERROR,
-                                ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ")
-                                ACE_TEXT ("(\'%s\') failed, errno=")
-                                ACE_TEXT ("%d: %s\n"),
-                                name->c_str (),
-                                errno,
-                                this->error ()->c_str ()));
+                  if ((errno != 0) && (errno != ENOENT) && (errors || ACE::debug ()))
+                    {
+                      ACE_TString errtmp;
+                      if (errors)
+                        {
+                          errors->push (this->error (errtmp));
+                        }
+
+                      if (ACE::debug ())
+                        {
+                          if (!errors)
+                            this->error (errtmp);
+                          ACELIB_ERROR ((LM_ERROR,
+                                      ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ")
+                                      ACE_TEXT ("(\'%s\') failed, errno=")
+                                      ACE_TEXT ("%d: <%s>\n"),
+                                      name->c_str (),
+                                      ACE_ERRNO_GET,
+                                      errtmp.c_str ()));
+                        }
+                    }
 
                 }
 #endif /* AIX */
@@ -204,12 +233,25 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
 
           if (this->handle_ == ACE_SHLIB_INVALID_HANDLE)
             {
-              if (ACE::debug ())
-                ACE_ERROR ((LM_ERROR,
-                            ACE_TEXT ("ACE (%P|%t) DLL_Handle::open (\"%s\"): ")
-                            ACE_TEXT ("Invalid handle error: %s\n"),
-                            this->dll_name_,
-                            this->error ()->c_str ()));
+              if (errors || ACE::debug ())
+                {
+                  ACE_TString errtmp;
+                  if (errors)
+                    {
+                      errors->push (this->error (errtmp));
+                    }
+
+                  if (ACE::debug ())
+                    {
+                      if (!errors)
+                        this->error (errtmp);
+                      ACELIB_ERROR ((LM_ERROR,
+                                  ACE_TEXT ("ACE (%P|%t) DLL_Handle::open (\"%s\"): ")
+                                  ACE_TEXT ("Invalid handle error: %s\n"),
+                                  this->dll_name_,
+                                  errtmp.c_str ()));
+                    }
+                }
 
               return -1;
             }
@@ -219,7 +261,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
   ++this->refcount_;
 
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) DLL_Handle::open - %s (%d), refcount=%d\n"),
                 this->dll_name_,
                 this->handle_,
@@ -251,7 +293,7 @@ ACE_DLL_Handle::close (int unload)
       this->refcount_ = 0;
 
     if (ACE::debug ())
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("ACE (%P|%t) DLL_Handle::close - ")
                   ACE_TEXT ("%s (handle=%d, refcount=%d)\n"),
                   this->dll_name_,
@@ -263,7 +305,7 @@ ACE_DLL_Handle::close (int unload)
         unload == 1)
       {
         if (ACE::debug ())
-          ACE_DEBUG ((LM_DEBUG,
+          ACELIB_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("ACE (%P|%t) DLL_Handle::close: ")
                       ACE_TEXT ("Unloading %s (handle=%d)\n"),
                       this->dll_name_,
@@ -286,10 +328,13 @@ ACE_DLL_Handle::close (int unload)
       retval = ACE_OS::dlclose (h);
 
       if (retval != 0 && ACE::debug ())
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ACE (%P|%t) DLL_Handle::close - ")
-                    ACE_TEXT ("Failed with: \"%s\".\n"),
-                    this->error ()->c_str ()));
+        {
+          ACE_TString err;
+          ACELIB_ERROR ((LM_ERROR,
+                      ACE_TEXT ("ACE (%P|%t) DLL_Handle::close - ")
+                      ACE_TEXT ("Failed with: \"%s\".\n"),
+                      this->error (err).c_str ()));
+        }
     }
 
   return retval;
@@ -302,7 +347,14 @@ ACE_DLL_Handle::refcount (void) const
 }
 
 void *
-ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, int ignore_errors)
+ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, bool ignore_errors)
+{
+  ACE_TString error;
+  return this->symbol (sym_name, ignore_errors, error);
+}
+
+void *
+ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, bool ignore_errors, ACE_TString &error)
 {
   ACE_TRACE ("ACE_DLL_Handle::symbol");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0));
@@ -322,14 +374,16 @@ ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, int ignore_errors)
       // error.  So you should check the error message also, but since
       // null symbols won't do us much good anyway, let's still report
       // an error.
-      if (!sym && ignore_errors != 1)
+      if (!sym && !ignore_errors)
         {
+          this->error (error);
+
           if (ACE::debug ())
-            ACE_ERROR ((LM_ERROR,
+            ACELIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("ACE (%P|%t) DLL_Handle::symbol (\"%s\") ")
                         ACE_TEXT (" failed with \"%s\".\n"),
                         auto_name.get (),
-                        this->error ()->c_str ()));
+                        error.c_str ()));
 
           return 0;
         }
@@ -339,15 +393,15 @@ ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, int ignore_errors)
 }
 
 ACE_SHLIB_HANDLE
-ACE_DLL_Handle::get_handle (int become_owner)
+ACE_DLL_Handle::get_handle (bool become_owner)
 {
   ACE_TRACE ("ACE_DLL_Handle::get_handle");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0));
 
-  if (this->refcount_ == 0 && become_owner != 0)
+  if (this->refcount_ == 0 && become_owner)
     {
       if (ACE::debug ())
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("ACE (%P|%t) DLL_Handle::get_handle: ")
                     ACE_TEXT ("cannot become owner, refcount == 0.\n")));
 
@@ -356,14 +410,14 @@ ACE_DLL_Handle::get_handle (int become_owner)
 
   ACE_SHLIB_HANDLE handle = this->handle_;
 
-  if (become_owner != 0)
+  if (become_owner)
     {
       if (--this->refcount_ == 0)
         this->handle_ = ACE_SHLIB_INVALID_HANDLE;
     }
 
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) DLL_Handle::get_handle: ")
                 ACE_TEXT ("post call: handle %s, refcount %d\n"),
                 this->handle_ == ACE_SHLIB_INVALID_HANDLE ?
@@ -375,14 +429,13 @@ ACE_DLL_Handle::get_handle (int become_owner)
 
 // This method is used return the last error of a library operation.
 
-auto_ptr <ACE_TString>
-ACE_DLL_Handle::error (void)
+ACE_TString &
+ACE_DLL_Handle::error (ACE_TString &err)
 {
   ACE_TRACE ("ACE_DLL_Handle::error");
   const ACE_TCHAR *error = ACE_OS::dlerror ();
-  auto_ptr<ACE_TString> str
-    (new ACE_TString (error ? error : ACE_TEXT ("no error")));
-  return str;
+  err = (error ? error : ACE_TEXT ("no error"));
+  return err;
 }
 
 void
@@ -530,7 +583,7 @@ ACE_DLL_Manager::ACE_DLL_Manager (int size)
   ACE_TRACE ("ACE_DLL_Manager::ACE_DLL_Manager");
 
   if (this->open (size) != 0 && ACE::debug ())
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE (%P|%t) DLL_Manager ctor failed to allocate ")
                 ACE_TEXT ("handle_vector_.\n")));
 }
@@ -540,7 +593,7 @@ ACE_DLL_Manager::~ACE_DLL_Manager (void)
   ACE_TRACE ("ACE_DLL_Manager::~ACE_DLL_Manager");
 
   if (this->close () != 0 && ACE::debug ())
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE (%P|%t) DLL_Manager dtor failed to close ")
                 ACE_TEXT ("properly.\n")));
 }
@@ -548,7 +601,8 @@ ACE_DLL_Manager::~ACE_DLL_Manager (void)
 ACE_DLL_Handle *
 ACE_DLL_Manager::open_dll (const ACE_TCHAR *dll_name,
                            int open_mode,
-                           ACE_SHLIB_HANDLE handle)
+                           ACE_SHLIB_HANDLE handle,
+                           ACE_DLL_Handle::ERROR_STACK *errors)
 {
   ACE_TRACE ("ACE_DLL_Manager::open_dll");
 
@@ -572,11 +626,11 @@ ACE_DLL_Manager::open_dll (const ACE_TCHAR *dll_name,
 
   if (dll_handle)
     {
-      if (dll_handle->open (dll_name, open_mode, handle) != 0)
+      if (dll_handle->open (dll_name, open_mode, handle, errors) != 0)
         {
           // Error while opening dll. Free temp handle
           if (ACE::debug ())
-            ACE_ERROR ((LM_ERROR,
+            ACELIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("ACE (%P|%t) DLL_Manager::open_dll: Could not ")
                         ACE_TEXT ("open dll %s.\n"),
                         dll_name));
@@ -759,7 +813,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload)
       if (dll_handle->close (unload) != 0)
         {
           if (ACE::debug ())
-            ACE_ERROR ((LM_ERROR,
+            ACELIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("ACE (%P|%t) DLL_Manager::unload error.\n")));
 
           return -1;
@@ -768,7 +822,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload)
   else
     {
       if (ACE::debug ())
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("ACE (%P|%t) DLL_Manager::unload_dll called with ")
                     ACE_TEXT ("null pointer.\n")));
 
diff --git a/dep/acelite/ace/DLL_Manager.h b/dep/acelite/ace/DLL_Manager.h
index 71d8f13c5..3ff163d9a 100644
--- a/dep/acelite/ace/DLL_Manager.h
+++ b/dep/acelite/ace/DLL_Manager.h
@@ -4,7 +4,7 @@
 /**
  *  @file    DLL_Manager.h
  *
- *  $Id: DLL_Manager.h 95913 2012-06-21 17:14:36Z johnnyw $
+ *  $Id: DLL_Manager.h 97888 2014-09-11 10:29:17Z mcorino $
  *
  *  @author Don Hinton <dhinton@ieee.org>
  */
@@ -22,7 +22,7 @@
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Containers_T.h"
-#include "ace/SStringfwd.h"
+#include "ace/SString.h"
 #include "ace/os_include/os_dlfcn.h"
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
@@ -58,6 +58,9 @@ class ACE_Export ACE_DLL_Handle
 {
 public:
 
+  /// Error stack. Fixed size should suffice. Ignores any errors exceeding the size.
+  typedef ACE_Fixed_Stack < ACE_TString, 10 >  ERROR_STACK;
+
   /// Default construtor.
   ACE_DLL_Handle (void);
 
@@ -104,12 +107,15 @@ public:
    * @param handle If a value other than @c ACE_INVALID_HANDLE is supplied,
    *        this object is assigned the specified handle instead of attempting
    *        to open the specified @a dll_name.
+   * @param errors Optional address of an error stack to collect any errors
+   *        encountered.
    * @retval -1 On failure
    * @retval 0 On success.
    */
   int open (const ACE_TCHAR *dll_name,
             int open_mode,
-            ACE_SHLIB_HANDLE handle);
+            ACE_SHLIB_HANDLE handle,
+            ERROR_STACK *errors = 0);
 
   /// Call to close the DLL object.  If unload = 0, it only decrements
   /// the refcount, but if unload = 1, then it will actually unload
@@ -124,21 +130,25 @@ public:
   /// ignore_errors flag to supress logging errors if symbol_name isn't
   /// found.  This is nice if you just want to probe a dll to see what's
   /// available, since missing functions in that case aren't really errors.
-  void *symbol (const ACE_TCHAR *symbol_name, int ignore_errors = 0);
+  void *symbol (const ACE_TCHAR *symbol_name, bool ignore_errors = false);
+
+  /// Resolves and returns any error encountered.
+  void *symbol (const ACE_TCHAR *symbol_name, bool ignore_errors,
+                ACE_TString &error);
 
   /**
-   * Return the handle to the caller.  If @a become_owner is non-0 then
+   * Return the handle to the caller.  If @a become_owner is true then
    * caller assumes ownership of the handle so we decrement the retcount.
    */
-  ACE_SHLIB_HANDLE get_handle (int become_owner = 0);
+  ACE_SHLIB_HANDLE get_handle (bool become_owner = false);
 
 private:
 
-  /// Returns a pointer to a string explaining why <symbol> or <open>
-  /// failed.  This is used internal to print out the error to the log,
+  /// Returns a string explaining why <symbol> or <open>
+  /// failed in @a err.  This is used internal to print out the error to the log,
   /// but since this object is shared, we can't store or return the error
   /// to the caller.
-  auto_ptr <ACE_TString> error (void);
+  ACE_TString& error (ACE_TString& err);
 
   /// Builds array of DLL names to try to dlopen, based on platform
   /// and configured DLL prefixes/suffixes.
@@ -227,7 +237,8 @@ public:
   /// its refcount is incremented.
   ACE_DLL_Handle *open_dll (const ACE_TCHAR *dll_name,
                             int openmode,
-                            ACE_SHLIB_HANDLE handle);
+                            ACE_SHLIB_HANDLE handle,
+                            ACE_DLL_Handle::ERROR_STACK *errors = 0);
 
   /// Close the underlying dll.  Decrements the refcount.
   int close_dll (const ACE_TCHAR *dll_name);
diff --git a/dep/acelite/ace/Dev_Poll_Reactor.cpp b/dep/acelite/ace/Dev_Poll_Reactor.cpp
index 011fe7883..6432b3c5a 100644
--- a/dep/acelite/ace/Dev_Poll_Reactor.cpp
+++ b/dep/acelite/ace/Dev_Poll_Reactor.cpp
@@ -1,9 +1,10 @@
-// $Id: Dev_Poll_Reactor.cpp 95738 2012-05-11 19:16:53Z shuston $
+// $Id: Dev_Poll_Reactor.cpp 97894 2014-09-16 18:11:56Z johnnyw $
 
 #include "ace/OS_NS_errno.h"
 #include "ace/Dev_Poll_Reactor.h"
 #include "ace/Signal.h"
 #include "ace/Sig_Handler.h"
+#include "ace/Flag_Manip.h"
 
 #if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL)
 
@@ -279,7 +280,7 @@ int
 ACE_Dev_Poll_Reactor_Notify::handle_input (ACE_HANDLE /*handle*/)
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::handle_input");
-  ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("SHOULD NOT BE HERE.\n")), -1);
+  ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("SHOULD NOT BE HERE.\n")), -1);
 }
 
 ACE_HANDLE
@@ -331,7 +332,7 @@ ACE_Dev_Poll_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
           break;
         default:
           // Should we bail out if we get an invalid mask?
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("dispatch_notify invalid mask = %d\n"),
                       buffer.mask_));
         }
@@ -386,12 +387,12 @@ ACE_Dev_Poll_Reactor_Notify::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("dp_reactor_ = %@"),
               this->dp_reactor_));
   this->notification_pipe_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -582,17 +583,14 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (ACE_Sig_Handler *sh,
   : initialized_ (false)
   , poll_fd_ (ACE_INVALID_HANDLE)
   // , ready_set_ ()
-#if defined (ACE_HAS_EVENT_POLL)
-  , epoll_wait_in_progress_ (false)
-#endif /* ACE_HAS_EVENT_POLL */
 #if defined (ACE_HAS_DEV_POLL)
   , dp_fds_ (0)
   , start_pfds_ (0)
   , end_pfds_ (0)
 #endif  /* ACE_HAS_DEV_POLL */
-  , deactivated_ (0)
   , token_ (*this, s_queue)
   , lock_adapter_ (token_)
+  , deactivated_ (0)
   , timer_queue_ (0)
   , delete_timer_queue_ (false)
   , signal_handler_ (0)
@@ -610,7 +608,7 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (ACE_Sig_Handler *sh,
                   tq,
                   disable_notify_pipe,
                   notify) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Dev_Poll_Reactor::open ")
                 ACE_TEXT ("failed inside ")
@@ -633,9 +631,9 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (size_t size,
   , start_pfds_ (0)
   , end_pfds_ (0)
 #endif  /* ACE_HAS_DEV_POLL */
-  , deactivated_ (0)
   , token_ (*this, s_queue)
   , lock_adapter_ (token_)
+  , deactivated_ (0)
   , timer_queue_ (0)
   , delete_timer_queue_ (false)
   , signal_handler_ (0)
@@ -651,7 +649,7 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (size_t size,
                   tq,
                   disable_notify_pipe,
                   notify) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Dev_Poll_Reactor::open ")
                 ACE_TEXT ("failed inside ACE_Dev_Poll_Reactor::CTOR")));
@@ -941,33 +939,11 @@ ACE_Dev_Poll_Reactor::work_pending_i (ACE_Time_Value * max_wait_time)
 
 #if defined (ACE_HAS_EVENT_POLL)
 
-  // See if there are handlers that have to be resumed before waiting.
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->to_be_resumed_lock_, -1);
-    this->epoll_wait_in_progress_ = true;
-    for (Resume_Map::iterator i = this->to_be_resumed_.begin ();
-         i != this->to_be_resumed_.end ();
-         ++i)
-      {
-        // Make sure that 1) the handle is still registered,
-        // 2) the registered handler is the one we're waiting to resume.
-        Event_Tuple *info = this->handler_rep_.find (i->first);
-        if (info != 0 && info->event_handler == i->second)
-          {
-            this->resume_handler_i (i->first);
-          }
-      }
-    this->to_be_resumed_.clear ();
-  }
-
   // Wait for an event.
   int const nfds = ::epoll_wait (this->poll_fd_,
                                  &this->event_,
                                  1,
                                  static_cast<int> (timeout));
-  // Count on this being an atomic update; at worst, we may get an
-  // extraneous notify() from dispatch_io_event.
-  this->epoll_wait_in_progress_ = false;
 
 #else
 
@@ -1042,7 +1018,7 @@ ACE_Dev_Poll_Reactor::handle_events_i (ACE_Time_Value *max_wait_time,
     {
       result = this->work_pending_i (max_wait_time);
       if (result == -1 && (this->restart_ == 0 || errno != EINTR))
-        ACE_ERROR ((LM_ERROR, ACE_TEXT("%t: %p\n"), ACE_TEXT("work_pending_i")));
+        ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%t: %p\n"), ACE_TEXT("work_pending_i")));
     }
   while (result == -1 && this->restart_ != 0 && errno == EINTR);
 
@@ -1188,85 +1164,96 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard)
          handler together with descriptor, instead of looking
          it up in a repository ? Could it boost performance ?
       */
-      Event_Tuple *info = this->handler_rep_.find (handle);
-      if (info == 0)   // No registered handler any longer
-        {
-#ifdef ACE_HAS_EVENT_POLL
-          this->event_.data.fd = ACE_INVALID_HANDLE;  // Dump the event
-#endif /* ACE_HAS_EVENT_POLL */
-          return 0;
-        }
 
-      // Figure out what to do first in order to make it easier to manage
-      // the bit twiddling and possible pfds increment before releasing
-      // the token for dispatch.
-      // Note that if there's an error (such as the handle was closed
-      // without being removed from the event set) the EPOLLHUP and/or
-      // EPOLLERR bits will be set in revents.
+      // Going to access handler repo, so lock it. If the lock is
+      // unobtainable, something is very wrong so bail out.
+      Event_Tuple *info = 0;
       ACE_Reactor_Mask disp_mask = 0;
-      ACE_Event_Handler *eh = info->event_handler;
+      ACE_Event_Handler *eh = 0;
       int (ACE_Event_Handler::*callback)(ACE_HANDLE) = 0;
-      if (ACE_BIT_ENABLED (revents, out_event))
-        {
-          disp_mask = ACE_Event_Handler::WRITE_MASK;
-          callback = &ACE_Event_Handler::handle_output;
-          ACE_CLR_BITS (revents, out_event);
-        }
-      else if (ACE_BIT_ENABLED (revents, exc_event))
-        {
-          disp_mask = ACE_Event_Handler::EXCEPT_MASK;
-          callback = &ACE_Event_Handler::handle_exception;
-          ACE_CLR_BITS (revents, exc_event);
-        }
-      else if (ACE_BIT_ENABLED (revents, in_event))
-        {
-          disp_mask = ACE_Event_Handler::READ_MASK;
-          callback = &ACE_Event_Handler::handle_input;
-          ACE_CLR_BITS (revents, in_event);
-        }
-      else if (ACE_BIT_ENABLED (revents, err_event))
-        {
-          this->remove_handler_i (handle,
-                                  ACE_Event_Handler::ALL_EVENTS_MASK,
-                                  info->event_handler);
-#ifdef ACE_HAS_DEV_POLL
-          ++pfds;
-#endif /* ACE_HAS_DEV_POLL */
-          return 1;
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%t) dispatch_io h %d unknown events 0x%x\n"),
-                      handle, revents));
-        }
-
-#ifdef ACE_HAS_DEV_POLL
-      // Increment the pointer to the next element before we
-      // release the token.  Otherwise event handlers end up being
-      // dispatched multiple times for the same poll.
-      if (revents == 0)
-        ++pfds;
-#else
-      // With epoll, events are registered with oneshot, so the handle is
-      // effectively suspended; future calls to epoll_wait() will select
-      // the next event, so they're not managed here.
-      // The hitch to this is that the notify handler is always registered
-      // WITHOUT oneshot and is never suspended/resumed. This avoids endless
-      // notify loops caused by the notify handler requiring a resumption
-      // which requires the token, which requires a notify, etc. described
-      // in Bugzilla 3714. So, never suspend the notify handler.
-
       bool reactor_resumes_eh = false;
-      if (eh != this->notify_handler_)
-        {
-          info->suspended = true;
+      {
+        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1);
+        info = this->handler_rep_.find (handle);
+        if (info == 0)   // No registered handler any longer
+          return 0;
 
-          reactor_resumes_eh =
-            eh->resume_handler () ==
-            ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER;
-        }
+        // It is possible another thread has changed (and possibly re-armed)
+        // this handle mask before current thread obtained the repo lock.
+        // If that did happen and this handler is still suspended, don't
+        // dispatch on top of another callback. See Bugzilla 4129.
+        if (info->suspended)
+          return 0;
+
+        // Figure out what to do first in order to make it easier to manage
+        // the bit twiddling and possible pfds increment before releasing
+        // the token for dispatch.
+        // Note that if there's an error (such as the handle was closed
+        // without being removed from the event set) the EPOLLHUP and/or
+        // EPOLLERR bits will be set in revents.
+        eh = info->event_handler;
+        if (ACE_BIT_ENABLED (revents, out_event))
+          {
+            disp_mask = ACE_Event_Handler::WRITE_MASK;
+            callback = &ACE_Event_Handler::handle_output;
+            ACE_CLR_BITS (revents, out_event);
+          }
+        else if (ACE_BIT_ENABLED (revents, exc_event))
+          {
+            disp_mask = ACE_Event_Handler::EXCEPT_MASK;
+            callback = &ACE_Event_Handler::handle_exception;
+            ACE_CLR_BITS (revents, exc_event);
+          }
+        else if (ACE_BIT_ENABLED (revents, in_event))
+          {
+            disp_mask = ACE_Event_Handler::READ_MASK;
+            callback = &ACE_Event_Handler::handle_input;
+            ACE_CLR_BITS (revents, in_event);
+          }
+        else if (ACE_BIT_ENABLED (revents, err_event))
+          {
+            this->remove_handler_i (handle,
+                                    ACE_Event_Handler::ALL_EVENTS_MASK,
+                                    grd,
+                                    info->event_handler);
+#ifdef ACE_HAS_DEV_POLL
+            ++pfds;
 #endif /* ACE_HAS_DEV_POLL */
+            return 1;
+          }
+        else
+          {
+            ACELIB_ERROR ((LM_ERROR,
+                           ACE_TEXT ("(%t) dispatch_io h %d unknown events 0x%x\n"),
+                           handle, revents));
+          }
+
+#ifdef ACE_HAS_DEV_POLL
+        // Increment the pointer to the next element before we
+        // release the token.  Otherwise event handlers end up being
+        // dispatched multiple times for the same poll.
+        if (revents == 0)
+          ++pfds;
+#else
+        // With epoll, events are registered with oneshot, so the handle is
+        // effectively suspended; future calls to epoll_wait() will select
+        // the next event, so they're not managed here.
+        // The hitch to this is that the notify handler is always registered
+        // WITHOUT oneshot and is never suspended/resumed. This avoids endless
+        // notify loops caused by the notify handler requiring a resumption
+        // which requires the token, which requires a notify, etc. described
+        // in Bugzilla 3714. So, never suspend the notify handler.
+        if (eh != this->notify_handler_)
+          {
+            info->suspended = true;
+
+            reactor_resumes_eh =
+              eh->resume_handler () ==
+              ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER;
+          }
+#endif /* ACE_HAS_DEV_POLL */
+
+      }     // End scope for ACE_GUARD holding repo lock
 
       int status = 0;   // gets callback status, below.
 
@@ -1305,10 +1292,6 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard)
 
         // If the callback returned 0, epoll-based needs to resume the
         // suspended handler but dev/poll doesn't.
-        // The epoll case is optimized to not acquire the token in order
-        // to resume the handler; the handler is added to a list of those
-        // that need to be resumed and is handled by the next leader
-        // that does an epoll_wait().
         // In both epoll and dev/poll cases, if the callback returns <0,
         // the token needs to be acquired and the handler checked and
         // removed if it hasn't already been.
@@ -1316,34 +1299,30 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard)
           {
 #ifdef ACE_HAS_EVENT_POLL
             // epoll-based effectively suspends handlers around the upcall.
-            // If the handler must be resumed, add it to the list.
+            // If the handler must be resumed, check to be sure it's the
+            // same handle/handler combination still.
             if (reactor_resumes_eh)
               {
-                ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
-                                  grd,
-                                  this->to_be_resumed_lock_,
-                                  -1);
-                bool map_was_empty = this->to_be_resumed_.empty();
-                this->to_be_resumed_.insert
-                  (Resume_Map::value_type (handle, eh));
-                if (this->epoll_wait_in_progress_ && map_was_empty)
-                  this->notify();
+                ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1);
+                info = this->handler_rep_.find (handle);
+                if (info != 0 && info->event_handler == eh)
+                  this->resume_handler_i (handle);
               }
 #endif /* ACE_HAS_EVENT_POLL */
             return 1;
           }
 
         // All state in the handler repository may have changed during the
-        // upcall while other threads had the token. Thus, reacquire the
-        // token and evaluate what's needed. If the upcalled handler is still
-        // the handler of record for handle, continue with checking whether
-        // or not to remove or resume the handler.
-        guard.acquire ();
+        // upcall. Thus, reacquire the repo lock and evaluate what's needed.
+        // If the upcalled handler is still the handler of record for handle,
+        // continue with checking whether or not to remove or resume the
+        // handler.
+        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, 1);
         info = this->handler_rep_.find (handle);
         if (info != 0 && info->event_handler == eh)
           {
             if (status < 0)
-              this->remove_handler_i (handle, disp_mask);
+              this->remove_handler_i (handle, disp_mask, grd);
           }
       }
       // Scope close handles eh ref count decrement, if needed.
@@ -1397,7 +1376,7 @@ ACE_Dev_Poll_Reactor::register_handler (ACE_Event_Handler *handler,
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::register_handler");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   return this->register_handler_i (handler->get_handle (),
                                    handler,
@@ -1411,7 +1390,7 @@ ACE_Dev_Poll_Reactor::register_handler (ACE_HANDLE handle,
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::register_handler");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   return this->register_handler_i (handle,
                                    event_handler,
@@ -1456,7 +1435,7 @@ ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle,
 
      if (::epoll_ctl (this->poll_fd_, op, handle, &epev) == -1)
        {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("epoll_ctl")));
+         ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("epoll_ctl")));
          (void) this->handler_rep_.unbind (handle);
          return -1;
        }
@@ -1470,7 +1449,7 @@ ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle,
      // again, possibly for different event.  Add new mask to the
      // current one.
      if (this->mask_ops_i (handle, mask, ACE_Reactor::ADD_MASK) == -1)
-       ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("mask_ops_i")),
+       ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("mask_ops_i")),
                          -1);
    }
 
@@ -1517,7 +1496,7 @@ ACE_Dev_Poll_Reactor::register_handler (const ACE_Handle_Set &handle_set,
 
   ACE_Handle_Set_Iterator handle_iter (handle_set);
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   // @@ It might be more efficient to construct a pollfd array and
   //    pass it to the write () call in register_handler_i () only once,
@@ -1584,9 +1563,8 @@ ACE_Dev_Poll_Reactor::remove_handler (ACE_Event_Handler *handler,
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
-
-  return this->remove_handler_i (handler->get_handle (), mask);
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1);
+  return this->remove_handler_i (handler->get_handle (), mask, grd);
 }
 
 int
@@ -1595,15 +1573,18 @@ ACE_Dev_Poll_Reactor::remove_handler (ACE_HANDLE handle,
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1);
 
-  return this->remove_handler_i (handle, mask);
+  return this->remove_handler_i (handle, mask, grd);
 }
 
+// FUZZ: disable check_for_ACE_Guard
 int
 ACE_Dev_Poll_Reactor::remove_handler_i (ACE_HANDLE handle,
                                         ACE_Reactor_Mask mask,
+                                        ACE_Guard<ACE_SYNCH_MUTEX> &repo_guard,
                                         ACE_Event_Handler *eh)
+// FUZZ: enable check_for_ACE_Guard
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler_i");
 
@@ -1627,7 +1608,12 @@ ACE_Dev_Poll_Reactor::remove_handler_i (ACE_HANDLE handle,
     ACE_Event_Handler::Reference_Counting_Policy::ENABLED;
 
   if (ACE_BIT_DISABLED (mask, ACE_Event_Handler::DONT_CALL))
-    (void) eh->handle_close (handle, mask);
+    {
+      // It would be great if ACE_Reverse_Lock worked with the Guard.
+      repo_guard.release ();
+      eh->handle_close (handle, mask);
+      repo_guard.acquire ();
+    }
 
   // If there are no longer any outstanding events on the given handle
   // then remove it from the handler repository.
@@ -1644,20 +1630,14 @@ ACE_Dev_Poll_Reactor::remove_handler (const ACE_Handle_Set &handle_set,
   ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler");
 
   ACE_Handle_Set_Iterator handle_iter (handle_set);
-
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
-
-  // @@ It might be more efficient to construct a pollfd array and
-  //    pass it to the write () call in register_handler_i () only once,
-  //    instead of calling write () (a system call) once for each file
-  //    descriptor.
-
   for (ACE_HANDLE h = handle_iter ();
        h != ACE_INVALID_HANDLE;
        h = handle_iter ())
-    if (this->remove_handler_i (h, mask) == -1)
-      return -1;
-
+    {
+      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1);
+      if (this->remove_handler_i (h, mask, grd) == -1)
+        return -1;
+    }
   return 0;
 }
 
@@ -1711,7 +1691,7 @@ ACE_Dev_Poll_Reactor::suspend_handler (ACE_Event_Handler *event_handler)
 
   ACE_HANDLE handle = event_handler->get_handle ();
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   return this->suspend_handler_i (handle);
 }
@@ -1721,7 +1701,7 @@ ACE_Dev_Poll_Reactor::suspend_handler (ACE_HANDLE handle)
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::suspend_handler");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   return this->suspend_handler_i (handle);
 }
@@ -1734,7 +1714,7 @@ ACE_Dev_Poll_Reactor::suspend_handler (const ACE_Handle_Set &handles)
   ACE_Handle_Set_Iterator handle_iter (handles);
   ACE_HANDLE h;
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   while ((h = handle_iter ()) != ACE_INVALID_HANDLE)
     if (this->suspend_handler_i (h) == -1)
@@ -1748,7 +1728,7 @@ ACE_Dev_Poll_Reactor::suspend_handlers (void)
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::suspend_handlers");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   size_t const len = this->handler_rep_.max_size ();
 
@@ -1822,7 +1802,7 @@ ACE_Dev_Poll_Reactor::resume_handler (ACE_Event_Handler *event_handler)
 
   ACE_HANDLE handle = event_handler->get_handle ();
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   return this->resume_handler_i (handle);
 }
@@ -1832,7 +1812,7 @@ ACE_Dev_Poll_Reactor::resume_handler (ACE_HANDLE handle)
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::resume_handler");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   return this->resume_handler_i (handle);
 }
@@ -1845,7 +1825,7 @@ ACE_Dev_Poll_Reactor::resume_handler (const ACE_Handle_Set &handles)
   ACE_Handle_Set_Iterator handle_iter (handles);
   ACE_HANDLE h;
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   while ((h = handle_iter ()) != ACE_INVALID_HANDLE)
     if (this->resume_handler_i (h) == -1)
@@ -1859,7 +1839,7 @@ ACE_Dev_Poll_Reactor::resume_handlers (void)
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::resume_handlers");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   size_t const len = this->handler_rep_.max_size ();
 
@@ -1981,17 +1961,17 @@ ACE_Dev_Poll_Reactor::reset_timer_interval (long timer_id,
 }
 
 int
-ACE_Dev_Poll_Reactor::cancel_timer (ACE_Event_Handler *event_handler,
+ACE_Dev_Poll_Reactor::cancel_timer (ACE_Event_Handler *handler,
                                     int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::cancel_timer");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
-
-  return (this->timer_queue_ == 0
-          ? 0
-          : this->timer_queue_->cancel (event_handler,
-                                        dont_call_handle_close));
+  // Don't bother waking the poll - the worse that will happen is it will
+  // wake up for a timer that doesn't exist then go back to waiting.
+  if ((this->timer_queue_ != 0) && (handler != 0))
+    return this->timer_queue_->cancel (handler, dont_call_handle_close);
+  else
+    return 0;
 }
 
 int
@@ -2001,8 +1981,8 @@ ACE_Dev_Poll_Reactor::cancel_timer (long timer_id,
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::cancel_timer");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
-
+  // Don't bother waking the poll - the worse that will happen is it will
+  // wake up for a timer that doesn't exist then go back to waiting.
   return (this->timer_queue_ == 0
           ? 0
           : this->timer_queue_->cancel (timer_id,
@@ -2097,7 +2077,7 @@ ACE_Dev_Poll_Reactor::purge_pending_notifications (ACE_Event_Handler * eh,
 ACE_Event_Handler *
 ACE_Dev_Poll_Reactor::find_handler (ACE_HANDLE handle)
 {
-  ACE_MT (ACE_READ_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, 0));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, 0));
 
   Event_Tuple *info = this->handler_rep_.find (handle);
   if (info)
@@ -2118,7 +2098,7 @@ ACE_Dev_Poll_Reactor::handler (ACE_HANDLE handle,
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::handler");
 
-  ACE_MT (ACE_READ_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   Event_Tuple *info = this->handler_rep_.find (handle);
 
@@ -2185,7 +2165,7 @@ ACE_Dev_Poll_Reactor::wakeup_all_threads (void)
   // it.
   this->notify (0,
                 ACE_Event_Handler::NULL_MASK,
- (ACE_Time_Value *) &ACE_Time_Value::zero);
+                (ACE_Time_Value *) &ACE_Time_Value::zero);
 }
 
 int
@@ -2254,7 +2234,7 @@ ACE_Dev_Poll_Reactor::mask_ops (ACE_Event_Handler *event_handler,
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::mask_ops");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   return this->mask_ops_i (event_handler->get_handle (), mask, ops);
 }
@@ -2266,7 +2246,7 @@ ACE_Dev_Poll_Reactor::mask_ops (ACE_HANDLE handle,
 {
   ACE_TRACE ("ACE_Dev_Poll_Reactor::mask_ops");
 
-  ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1));
 
   return this->mask_ops_i (handle, mask, ops);
 }
@@ -2304,7 +2284,7 @@ ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle,
     {
     case ACE_Reactor::GET_MASK:
       // The work for this operation is done in all cases at the
-      // begining of the function.
+      // beginning of the function.
       return old_mask;
 
     case ACE_Reactor::CLR_MASK:
@@ -2434,17 +2414,17 @@ ACE_Dev_Poll_Reactor::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dev_Poll_Reactor::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("restart_ = %d\n"), this->restart_));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("restart_ = %d\n"), this->restart_));
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("initialized_ = %d"),
               this->initialized_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("poll_fd_ = %d"), this->poll_fd_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %u"), this->handler_rep_.size ()));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("poll_fd_ = %d"), this->poll_fd_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %u"), this->handler_rep_.size ()));
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("deactivated_ = %d"),
               this->deactivated_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -2500,9 +2480,11 @@ ACE_Dev_Poll_Reactor::reactor_mask_to_poll_event (ACE_Reactor_Mask mask)
   return events;
 }
 
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 namespace {
   void polite_sleep_hook (void *) { }
 }
+#endif
 
 int
 ACE_Dev_Poll_Reactor::Token_Guard::acquire_quietly (ACE_Time_Value *max_wait)
@@ -2532,7 +2514,7 @@ ACE_Dev_Poll_Reactor::Token_Guard::acquire_quietly (ACE_Time_Value *max_wait)
         return 0;
       else
         {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT("%t: %p\n"), ACE_TEXT("token acquire_read")));
+          ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%t: %p\n"), ACE_TEXT("token acquire_read")));
           return -1;
         }
     }
diff --git a/dep/acelite/ace/Dev_Poll_Reactor.h b/dep/acelite/ace/Dev_Poll_Reactor.h
index b77d8b16a..1909c2e13 100644
--- a/dep/acelite/ace/Dev_Poll_Reactor.h
+++ b/dep/acelite/ace/Dev_Poll_Reactor.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Dev_Poll_Reactor.h
  *
- *  $Id: Dev_Poll_Reactor.h 94549 2011-10-03 06:31:27Z johnnyw $
+ *  $Id: Dev_Poll_Reactor.h 97130 2013-05-13 17:36:26Z mesnier_p $
  *
  *  @c /dev/poll (or Linux @c sys_epoll) based Reactor implementation.
  *
@@ -310,7 +310,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl
    *
    * @note Calls to any method in this class, and any modification to a
    *       Event_Tuple returned from this class's methods, must be made
-   *       while holding the reactor token.
+   *       while holding the repository lock.
    */
   class Handler_Repository
   {
@@ -809,7 +809,7 @@ public:
   /// table.
   virtual size_t size (void) const;
 
-  /// Returns a reference to the Reactor's internal lock.
+  /// Returns a reference to the Reactor's internal repository lock.
   virtual ACE_Lock &lock (void);
 
   /// Wake up all threads waiting in the event loop.
@@ -967,12 +967,18 @@ protected:
                           ACE_Reactor_Mask mask);
 
   /// Remove the event handler associated with the given handle and
-  /// event mask from the "interest set." If @a eh is supplied, only
-  /// do the remove if @eh matches the event handler that's registered
-  /// for @a handle.
+  /// event mask from the "interest set." If @a eh is supplied, only do the
+  /// remove if @eh matches the event handler that's registered for @a handle.
+  /// The caller is expected to be holding the repo token on entry and have
+  /// @repo_guard referencing that token. It will be temporarily released
+  /// during a handle_close() callback if needed; if it is released for the
+  //// callback it will be reacquired before return.
+  // FUZZ: disable check_for_ACE_Guard
   int remove_handler_i (ACE_HANDLE handle,
                         ACE_Reactor_Mask mask,
+                        ACE_Guard<ACE_SYNCH_MUTEX> &repo_guard,
                         ACE_Event_Handler *eh = 0);
+  // FUZZ: enable check_for_ACE_Guard
 
   /// Temporarily remove the given handle from the "interest set."
   int suspend_handler_i (ACE_HANDLE handle);
@@ -1015,17 +1021,6 @@ protected:
   /// epoll_wait() but not yet processed.
   struct epoll_event event_;
 
-  /// Event handlers that are suspended/resumed around upcalls are not
-  /// immediately resumed; they're added to this list for resumption at
-  /// the next epoll_wait() call. This avoids always needing to acquire the
-  /// token just to resume a handler. Of course, if there are no other
-  /// handlers in the to-be-resumed list and an epoll_wait is already in
-  /// progress, the reactor needs to be notified to force another run around
-  /// the epoll_wait() call.
-  typedef ACE_Array_Map<ACE_HANDLE, ACE_Event_Handler *> Resume_Map;
-  Resume_Map to_be_resumed_;
-  volatile bool epoll_wait_in_progress_;
-  ACE_SYNCH_MUTEX to_be_resumed_lock_;
 #else
   /// The pollfd array that `/dev/poll' will feed its results to.
   struct pollfd *dp_fds_;
@@ -1043,16 +1038,21 @@ protected:
   struct pollfd *end_pfds_;
 #endif  /* ACE_HAS_EVENT_POLL */
 
-  /// This flag is used to keep track of whether we are actively handling
-  /// events or not.
-  sig_atomic_t deactivated_;
-
-  /// Lock used for synchronization of reactor state.
+  /// Token serializing event waiter threads.
   ACE_Dev_Poll_Reactor_Token token_;
 
   /// Adapter used to return internal lock to outside world.
   ACE_Lock_Adapter<ACE_Dev_Poll_Reactor_Token> lock_adapter_;
 
+  /// This flag is used to keep track of whether we are actively handling
+  /// events or not.
+  sig_atomic_t deactivated_;
+
+  /// Token used to protect manipulation of the handler repository.
+  /// No need to hold the waiter token to change the repo.
+  //  ACE_DEV_POLL_TOKEN repo_token_;
+  ACE_SYNCH_MUTEX repo_lock_;
+
   /// The repository that contains all registered event handlers.
   Handler_Repository handler_rep_;
 
@@ -1123,8 +1123,7 @@ protected:
     /// 2) wait quietly for the token, not waking another thread. This
     /// is appropriate for cases where a thread wants to wait for and
     /// dispatch an event, not causing an existing waiter to relinquish the
-    /// token, and also queuing up behind other threads waiting to modify
-    /// event records.
+    /// token.
     int acquire_quietly (ACE_Time_Value *max_wait = 0);
 
     /// A helper method that acquires the token at a high priority, and
@@ -1147,7 +1146,6 @@ protected:
     int owner_;
 
   };
-
 };
 
 
diff --git a/dep/acelite/ace/Dev_Poll_Reactor.inl b/dep/acelite/ace/Dev_Poll_Reactor.inl
index 0e72b305c..ca16759e8 100644
--- a/dep/acelite/ace/Dev_Poll_Reactor.inl
+++ b/dep/acelite/ace/Dev_Poll_Reactor.inl
@@ -1,7 +1,7 @@
 // -*- C++ -*-
-// $Id: Dev_Poll_Reactor.inl 91066 2010-07-12 11:05:04Z johnnyw $
+// $Id: Dev_Poll_Reactor.inl 96985 2013-04-11 15:50:32Z huangh $
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dep/acelite/ace/Dirent.inl b/dep/acelite/ace/Dirent.inl
index 01ce3a96c..9e276cf8c 100644
--- a/dep/acelite/ace/Dirent.inl
+++ b/dep/acelite/ace/Dirent.inl
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// $Id: Dirent.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Dirent.inl 96985 2013-04-11 15:50:32Z huangh $
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -37,7 +37,7 @@ ACE_Dirent::ACE_Dirent (const ACE_TCHAR *dirname)
   : dirp_ (0)
 {
   if (this->open (dirname) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Dirent::ACE_Dirent")));
 }
diff --git a/dep/acelite/ace/Dump.cpp b/dep/acelite/ace/Dump.cpp
index 09ae92600..649755a8b 100644
--- a/dep/acelite/ace/Dump.cpp
+++ b/dep/acelite/ace/Dump.cpp
@@ -1,10 +1,10 @@
-// $Id: Dump.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Dump.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Dump.h"
 #include "ace/Guard_T.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/Object_Manager.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 
 
diff --git a/dep/acelite/ace/Dynamic.cpp b/dep/acelite/ace/Dynamic.cpp
index 40c1eeec5..59e9c79b8 100644
--- a/dep/acelite/ace/Dynamic.cpp
+++ b/dep/acelite/ace/Dynamic.cpp
@@ -1,4 +1,4 @@
-// $Id: Dynamic.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Dynamic.cpp 97391 2013-10-28 09:38:26Z mhengstmengel $
 
 #include "ace/Dynamic.h"
 #include "ace/Singleton.h"
@@ -26,9 +26,7 @@ ACE_Dynamic::instance (void)
   return ACE_TSS_Singleton<ACE_Dynamic, ACE_SYNCH_NULL_MUTEX>::instance ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-template ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex> *
-  ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_TSS_Singleton, ACE_Dynamic, ACE_Null_Mutex);
+
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Dynamic_Message_Strategy.cpp b/dep/acelite/ace/Dynamic_Message_Strategy.cpp
index b661ca1a7..de6e575c6 100644
--- a/dep/acelite/ace/Dynamic_Message_Strategy.cpp
+++ b/dep/acelite/ace/Dynamic_Message_Strategy.cpp
@@ -1,4 +1,4 @@
-// $Id: Dynamic_Message_Strategy.cpp 91287 2010-08-05 10:30:49Z johnnyw $
+// $Id: Dynamic_Message_Strategy.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Dynamic_Message_Strategy.h"
 
@@ -7,7 +7,7 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Malloc_Base.h"
 #include "ace/OS_NS_string.h"
 
@@ -89,9 +89,9 @@ ACE_Dynamic_Message_Strategy::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dynamic_Message_Strategy::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("static_bit_field_mask_ = %u\n")
               ACE_TEXT ("static_bit_field_shift_ = %u\n")
               ACE_TEXT ("dynamic_priority_max_ = %u\n")
@@ -110,7 +110,7 @@ ACE_Dynamic_Message_Strategy::dump (void) const
               this->pending_shift_.sec (),
               this->pending_shift_.usec ()));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -145,14 +145,14 @@ ACE_Deadline_Message_Strategy::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Deadline_Message_Strategy::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class:\n")));
   this->ACE_Dynamic_Message_Strategy::dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Deadline_Message_Strategy\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Deadline_Message_Strategy\n")));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -188,14 +188,14 @@ ACE_Laxity_Message_Strategy::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Laxity_Message_Strategy::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class:\n")));
   this->ACE_Dynamic_Message_Strategy::dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Laxity_Message_Strategy\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Laxity_Message_Strategy\n")));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
   // Dump the state of the strategy.
diff --git a/dep/acelite/ace/Dynamic_Message_Strategy.h b/dep/acelite/ace/Dynamic_Message_Strategy.h
index 5ff102ef6..ba1fee71d 100644
--- a/dep/acelite/ace/Dynamic_Message_Strategy.h
+++ b/dep/acelite/ace/Dynamic_Message_Strategy.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Dynamic_Message_Strategy.h
  *
- *  $Id: Dynamic_Message_Strategy.h 95839 2012-06-07 10:13:33Z johnnyw $
+ *  $Id: Dynamic_Message_Strategy.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 #include /**/ "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/dep/acelite/ace/Dynamic_Service_Base.cpp b/dep/acelite/ace/Dynamic_Service_Base.cpp
index b13e68612..70090732b 100644
--- a/dep/acelite/ace/Dynamic_Service_Base.cpp
+++ b/dep/acelite/ace/Dynamic_Service_Base.cpp
@@ -1,11 +1,11 @@
-// $Id: Dynamic_Service_Base.cpp 91813 2010-09-17 07:52:52Z johnnyw $
+// $Id: Dynamic_Service_Base.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Dynamic_Service_Base.h"
 #include "ace/ACE.h"
 #include "ace/Service_Config.h"
 #include "ace/Service_Repository.h"
 #include "ace/Service_Types.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -17,9 +17,9 @@ ACE_Dynamic_Service_Base::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dynamic_Service_Base::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -82,7 +82,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo,
 
       if (repo->repo_ != repo_found->repo_)
         {
-          ACE_DEBUG ((LM_DEBUG,
+          ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s")
                     ACE_TEXT (" type=%@ => %@")
                     ACE_TEXT (" [in repo=%@]\n"),
@@ -91,7 +91,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo,
         }
       else
         {
-          ACE_DEBUG ((LM_DEBUG,
+          ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s")
                     ACE_TEXT (" type=%@ => %@\n"),
                     repo->repo_, name, type, obj));
diff --git a/dep/acelite/ace/Dynamic_Service_Dependency.cpp b/dep/acelite/ace/Dynamic_Service_Dependency.cpp
index 32b1a275f..edd436473 100644
--- a/dep/acelite/ace/Dynamic_Service_Dependency.cpp
+++ b/dep/acelite/ace/Dynamic_Service_Dependency.cpp
@@ -1,10 +1,10 @@
-// $Id: Dynamic_Service_Dependency.cpp 91287 2010-08-05 10:30:49Z johnnyw $
+// $Id: Dynamic_Service_Dependency.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/ACE.h"
 #include "ace/DLL_Manager.h"
 #include "ace/Dynamic_Service_Dependency.h"
 #include "ace/Service_Config.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -23,7 +23,7 @@ ACE_Dynamic_Service_Dependency::ACE_Dynamic_Service_Dependency (const ACE_Servic
 ACE_Dynamic_Service_Dependency::~ACE_Dynamic_Service_Dependency (void)
 {
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%P|%t) DSD, this=%@ - destroying\n"),
                 this));
 }
@@ -36,7 +36,7 @@ ACE_Dynamic_Service_Dependency::init (const ACE_Service_Gestalt *cfg,
     ACE_Dynamic_Service_Base::find_i (cfg, principal,false);
   if (ACE::debug ())
     {
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
       ACE_TEXT ("(%P|%t) DSD, this=%@ - creating dependency on "), this));
       st->dump ();
     }
diff --git a/dep/acelite/ace/ETCL/ETCL_Constraint.cpp b/dep/acelite/ace/ETCL/ETCL_Constraint.cpp
deleted file mode 100644
index 638f7c509..000000000
--- a/dep/acelite/ace/ETCL/ETCL_Constraint.cpp
+++ /dev/null
@@ -1,655 +0,0 @@
-// -*- C++ -*-
-// $Id: ETCL_Constraint.cpp 92173 2010-10-07 12:36:17Z olli $
-
-#include "ace/ACE.h"
-
-#include "ace/ETCL/ETCL_Constraint.h"
-#include "ace/ETCL/ETCL_Constraint_Visitor.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "ace/ETCL/ETCL_Constraint.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ETCL_Constraint::ETCL_Constraint (void)
-{
-}
-
-ETCL_Constraint::~ETCL_Constraint (void)
-{
-}
-
-int
-ETCL_Constraint::accept (ETCL_Constraint_Visitor * /* visitor */)
-{
-  return 0;
-}
-
-// ****************************************************************
-
-ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    const ETCL_Literal_Constraint & lit
-  )
-  : ETCL_Constraint(),
-    type_ (ACE_ETCL_UNKNOWN)
-{
-  this->copy (lit);
-}
-
-ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    ACE_CDR::ULong uinteger) : type_ (ACE_ETCL_UNSIGNED)
-{
-  this->op_.uinteger_ = uinteger;
-}
-
-ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    ACE_CDR::Long integer) : type_ (ACE_ETCL_SIGNED)
-{
-  this->op_.integer_ = integer;
-}
-
-ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    ACE_CDR::Boolean boolean
-  )
-  : type_ (ACE_ETCL_BOOLEAN)
-{
-  this->op_.bool_ = boolean;
-}
-
-ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    ACE_CDR::Double doub) : type_ (ACE_ETCL_DOUBLE)
-{
-  this->op_.double_ = doub;
-}
-
-ETCL_Literal_Constraint::ETCL_Literal_Constraint (
-    const char* str) : type_ (ACE_ETCL_STRING)
-{
-  this->op_.str_ = ACE::strnew (str);
-}
-
-ETCL_Literal_Constraint::~ETCL_Literal_Constraint (void)
-{
-  if (this->type_ == ACE_ETCL_STRING)
-    {
-      ACE::strdelete (this->op_.str_);
-    }
-}
-
-int
-ETCL_Literal_Constraint::accept (ETCL_Constraint_Visitor* visitor)
-{
-  return visitor->visit_literal (this);
-}
-
-Literal_Type
-ETCL_Literal_Constraint::expr_type (void) const
-{
-  return this->type_;
-}
-
-void
-ETCL_Literal_Constraint::operator= (const ETCL_Literal_Constraint& co)
-{
-  this->copy (co);
-}
-
-ETCL_Literal_Constraint::operator ACE_CDR::Boolean (void) const
-{
-  return (this->type_ == ACE_ETCL_BOOLEAN) ? this->op_.bool_ : false;
-}
-
-ETCL_Literal_Constraint::operator ACE_CDR::ULong (void) const
-{
-  switch (this->type_)
-  {
-    case ACE_ETCL_UNSIGNED:
-      return this->op_.uinteger_;
-    case ACE_ETCL_SIGNED:
-    case ACE_ETCL_INTEGER:
-      return
-        (this->op_.integer_ > 0) ? (ACE_CDR::ULong) this->op_.integer_ : 0;
-    case ACE_ETCL_DOUBLE:
-      return
-        (this->op_.double_ > 0) ?
-        ((this->op_.double_ > ACE_UINT32_MAX) ?
-         ACE_UINT32_MAX :
-         (ACE_CDR::ULong) this->op_.double_)
-        : 0;
-    default:
-      return 0;
-  }
-}
-
-ETCL_Literal_Constraint::operator ACE_CDR::Long (void) const
-{
-  switch (this->type_)
-  {
-    case ACE_ETCL_SIGNED:
-    case ACE_ETCL_INTEGER:
-      return this->op_.integer_;
-    case ACE_ETCL_UNSIGNED:
-      return
-        (this->op_.uinteger_ > (ACE_CDR::ULong) ACE_INT32_MAX) ?
-        ACE_INT32_MAX : (ACE_CDR::Long) this->op_.uinteger_;
-    case ACE_ETCL_DOUBLE:
-      return
-        (this->op_.double_ > 0) ?
-         ((this->op_.double_ > ACE_INT32_MAX) ?
-          ACE_INT32_MAX :
-          (ACE_CDR::Long) this->op_.double_) :
-          ((this->op_.double_ < ACE_INT32_MIN) ?
-           ACE_INT32_MIN :
-           (ACE_CDR::Long) this->op_.double_);
-    default:
-      return 0;
-  }
-}
-
-ETCL_Literal_Constraint::operator ACE_CDR::Double (void) const
-{
-  switch (this->type_)
-  {
-    case ACE_ETCL_DOUBLE:
-      return this->op_.double_;
-    case ACE_ETCL_SIGNED:
-    case ACE_ETCL_INTEGER:
-      return (ACE_CDR::Double) this->op_.integer_;
-    case ACE_ETCL_UNSIGNED:
-      return (ACE_CDR::Double) this->op_.uinteger_;
-    default:
-      return 0.0;
-  }
-}
-
-ETCL_Literal_Constraint::operator const char* (void) const
-{
-  switch (this->type_)
-  {
-    case ACE_ETCL_STRING:
-      return this->op_.str_;
-    default:
-      return 0;
-  }
-}
-
-bool
-ETCL_Literal_Constraint::operator== (const ETCL_Literal_Constraint & rhs)
-{
-  bool return_value = false;
-  Literal_Type widest_type = this->widest_type (rhs);
-
-  switch (widest_type)
-    {
-    case ACE_ETCL_STRING:
-      return_value = (ACE_OS::strcmp ((const char*) *this, (const char*) rhs) == 0);
-      break;
-    case ACE_ETCL_DOUBLE:
-      return_value = ACE::is_equal ((ACE_CDR::Double) *this, (ACE_CDR::Double) rhs);
-      break;
-    case ACE_ETCL_INTEGER:
-    case ACE_ETCL_SIGNED:
-      return_value = (ACE_CDR::Long) *this == (ACE_CDR::Long) rhs;
-      break;
-    case ACE_ETCL_UNSIGNED:
-      return_value = (ACE_CDR::ULong) *this == (ACE_CDR::ULong) rhs;
-      break;
-    case ACE_ETCL_BOOLEAN:
-      return_value = (ACE_CDR::Boolean) *this == (ACE_CDR::Boolean) rhs;
-      break;
-    default:
-     break;
-    }
-
-  return return_value;
-}
-
-bool
-ETCL_Literal_Constraint::operator< (const ETCL_Literal_Constraint & rhs)
-{
-  bool return_value = false;
-  Literal_Type widest_type = this->widest_type (rhs);
-
-  switch (widest_type)
-    {
-    case ACE_ETCL_STRING:
-      return_value = (ACE_OS::strcmp ((const char*) *this, (const char*) rhs) < 0);
-      break;
-    case ACE_ETCL_DOUBLE:
-      return_value = (ACE_CDR::Double) *this < (ACE_CDR::Double) rhs;
-      break;
-    case ACE_ETCL_INTEGER:
-    case ACE_ETCL_SIGNED:
-      return_value = (ACE_CDR::Long) *this < (ACE_CDR::Long) rhs;
-      break;
-    case ACE_ETCL_UNSIGNED:
-      return_value = (ACE_CDR::ULong) *this < (ACE_CDR::ULong) rhs;
-      break;
-    case ACE_ETCL_BOOLEAN:
-      return_value = (ACE_CDR::Boolean) *this < (ACE_CDR::Boolean) rhs;
-      break;
-    default:
-      break;
-    }
-
-  return return_value;
-}
-
-bool
-ETCL_Literal_Constraint::operator> (const ETCL_Literal_Constraint & rhs)
-{
-  bool return_value = false;
-  Literal_Type widest_type = this->widest_type (rhs);
-
-  switch (widest_type)
-    {
-    case ACE_ETCL_STRING:
-      return_value = (ACE_OS::strcmp ((const char*) *this, (const char*) rhs) > 0);
-      break;
-    case ACE_ETCL_DOUBLE:
-      return_value = (ACE_CDR::Double) *this > (ACE_CDR::Double) rhs;
-      break;
-    case ACE_ETCL_INTEGER:
-    case ACE_ETCL_SIGNED:
-      return_value = (ACE_CDR::Long) *this > (ACE_CDR::Long) rhs;
-      break;
-    case ACE_ETCL_UNSIGNED:
-      return_value = (ACE_CDR::ULong) *this > (ACE_CDR::ULong) rhs;
-      break;
-    default:
-      break;
-    }
-
-  return return_value;
-}
-
-ETCL_Literal_Constraint
-ETCL_Literal_Constraint::operator+ (const ETCL_Literal_Constraint & rhs)
-{
-  Literal_Type widest_type = this->widest_type (rhs);
-
-  switch (widest_type)
-    {
-    case ACE_ETCL_DOUBLE:
-      {
-        ACE_CDR::Double result = (ACE_CDR::Double) *this + (ACE_CDR::Double) rhs;
-        return ETCL_Literal_Constraint ((ACE_CDR::Double) result);
-      }
-    case ACE_ETCL_INTEGER:
-    case ACE_ETCL_SIGNED:
-      {
-        ACE_CDR::Long result = (ACE_CDR::Long) *this + (ACE_CDR::Long) rhs;
-        return ETCL_Literal_Constraint ((ACE_CDR::Long) result);
-      }
-    case ACE_ETCL_UNSIGNED:
-      {
-        ACE_CDR::ULong result = (ACE_CDR::ULong) *this + (ACE_CDR::ULong) rhs;
-        return ETCL_Literal_Constraint ((ACE_CDR::ULong) result);
-      }
-    default:
-      return ETCL_Literal_Constraint ((ACE_CDR::Long) 0);
-    }
-}
-
-ETCL_Literal_Constraint
-ETCL_Literal_Constraint::operator- (const ETCL_Literal_Constraint & rhs)
-{
-  Literal_Type widest_type = this->widest_type (rhs);
-
-  switch (widest_type)
-    {
-    case ACE_ETCL_DOUBLE:
-      {
-        ACE_CDR::Double result = (ACE_CDR::Double) *this - (ACE_CDR::Double) rhs;
-        return ETCL_Literal_Constraint ((ACE_CDR::Double) result);
-      }
-    case ACE_ETCL_INTEGER:
-    case ACE_ETCL_SIGNED:
-      {
-        ACE_CDR::Long result = (ACE_CDR::Long) *this - (ACE_CDR::Long) rhs;
-        return ETCL_Literal_Constraint ((ACE_CDR::Long) result);
-      }
-    case ACE_ETCL_UNSIGNED:
-      {
-        ACE_CDR::ULong result = (ACE_CDR::ULong) *this - (ACE_CDR::ULong) rhs;
-        return ETCL_Literal_Constraint ((ACE_CDR::ULong) result);
-      }
-    default:
-      return ETCL_Literal_Constraint ((ACE_CDR::Long) 0);
-    }
-}
-
-ETCL_Literal_Constraint
-ETCL_Literal_Constraint::operator* (const ETCL_Literal_Constraint & rhs)
-{
-  Literal_Type widest_type = this->widest_type (rhs);
-
-  switch (widest_type)
-    {
-    case ACE_ETCL_DOUBLE:
-      {
-        ACE_CDR::Double result = (ACE_CDR::Double) *this * (ACE_CDR::Double) rhs;
-        return ETCL_Literal_Constraint ((ACE_CDR::Double) result);
-      }
-    case ACE_ETCL_INTEGER:
-    case ACE_ETCL_SIGNED:
-      {
-        ACE_CDR::Long result = (ACE_CDR::Long) *this * (ACE_CDR::Long) rhs;
-        return ETCL_Literal_Constraint ((ACE_CDR::Long) result);
-      }
-    case ACE_ETCL_UNSIGNED:
-      {
-        ACE_CDR::ULong result = (ACE_CDR::ULong) *this * (ACE_CDR::ULong) rhs;
-        return ETCL_Literal_Constraint ((ACE_CDR::ULong) result);
-      }
-    default:
-      return ETCL_Literal_Constraint ((ACE_CDR::Long) 0);
-    }
-}
-
-ETCL_Literal_Constraint
-ETCL_Literal_Constraint::operator/ (const ETCL_Literal_Constraint & rhs)
-{
-  Literal_Type widest_type = this->widest_type (rhs);
-
-  switch (widest_type)
-    {
-    case ACE_ETCL_DOUBLE:
-      {
-        if (ACE::is_equal ((ACE_CDR::Double) rhs, 0.0))
-          return ETCL_Literal_Constraint ((ACE_CDR::Double) 0.0);
-
-        ACE_CDR::Double result = (ACE_CDR::Double) *this / (ACE_CDR::Double) rhs;
-        return ETCL_Literal_Constraint ((ACE_CDR::Double) result);
-      }
-    case ACE_ETCL_INTEGER:
-    case ACE_ETCL_SIGNED:
-      {
-        if ((ACE_CDR::Long) rhs == 0)
-          return ETCL_Literal_Constraint ((ACE_CDR::Long) 0);
-
-        ACE_CDR::Long result = (ACE_CDR::Long) *this / (ACE_CDR::Long) rhs;
-        return ETCL_Literal_Constraint ((ACE_CDR::Long) result);
-      }
-    case ACE_ETCL_UNSIGNED:
-      {
-        if ((ACE_CDR::ULong) rhs == 0)
-          return ETCL_Literal_Constraint ((ACE_CDR::ULong) 0);
-
-        ACE_CDR::ULong result = (ACE_CDR::ULong) *this / (ACE_CDR::ULong) rhs;
-        return ETCL_Literal_Constraint ((ACE_CDR::ULong) result);
-      }
-    default:
-      return ETCL_Literal_Constraint ((ACE_CDR::Long) 0);
-    }
-}
-
-ETCL_Literal_Constraint
-ETCL_Literal_Constraint::operator- (void)
-{
-  switch (this->type_)
-  {
-    case ACE_ETCL_DOUBLE:
-      return ETCL_Literal_Constraint (- this->op_.double_);
-    case ACE_ETCL_INTEGER:
-    case ACE_ETCL_SIGNED:
-      return ETCL_Literal_Constraint (- this->op_.integer_);
-    case ACE_ETCL_UNSIGNED:
-      return ETCL_Literal_Constraint (- (ACE_CDR::Long) this->op_.uinteger_);
-    default:
-      return ETCL_Literal_Constraint ((ACE_CDR::Long) 0);
-  }
-}
-
-Literal_Type
-ETCL_Literal_Constraint::widest_type (const ETCL_Literal_Constraint & rhs)
-{
-  Literal_Type rhs_type = rhs.expr_type ();
-  Literal_Type return_value = rhs_type;
-
-  if (rhs_type != this->type_)
-    {
-      if (rhs_type > this->type_)
-        {
-          return_value = rhs_type;
-        }
-      else
-        {
-          return_value = this->type_;
-        }
-    }
-
-  return return_value;
-}
-
-void
-ETCL_Literal_Constraint::copy (const ETCL_Literal_Constraint &lit)
-{
-  if (this->type_ == ACE_ETCL_STRING)
-    {
-      ACE::strdelete (this->op_.str_);
-    }
-
-  this->type_ = lit.type_;
-
-  switch (this->type_)
-  {
-  case ACE_ETCL_STRING:
-    this->op_.str_ = ACE::strnew (lit.op_.str_);
-    break;
-  case ACE_ETCL_DOUBLE:
-    this->op_.double_ = lit.op_.double_;
-    break;
-  case ACE_ETCL_UNSIGNED:
-    this->op_.uinteger_ = lit.op_.uinteger_;
-    break;
-  case ACE_ETCL_INTEGER:
-  case ACE_ETCL_SIGNED:
-    this->op_.integer_ = lit.op_.integer_;
-    break;
-  case ACE_ETCL_BOOLEAN:
-    this->op_.bool_ = lit.op_.bool_;
-    break;
-  default:
-    this->type_ = ACE_ETCL_UNKNOWN;
-    break;
-  }
-}
-
-// ****************************************************************
-
-int
-ETCL_Identifier::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_identifier (this);
-}
-
-// ****************************************************************
-
-ETCL_Union_Value::~ETCL_Union_Value (void)
-{
-  delete this->string_;
-  delete this->integer_;
-}
-
-int
-ETCL_Union_Value::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_union_value (this);
-}
-
-// ****************************************************************
-
-ETCL_Union_Pos::~ETCL_Union_Pos (void)
-{
-  delete this->component_;
-  delete this->union_value_;
-}
-
-int
-ETCL_Union_Pos::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_union_pos (this);
-}
-
-// ****************************************************************
-
-ETCL_Component_Pos::~ETCL_Component_Pos (void)
-{
-  delete this->component_;
-  delete this->integer_;
-}
-
-int
-ETCL_Component_Pos::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_component_pos (this);
-}
-
-// ****************************************************************
-
-ETCL_Component_Assoc::~ETCL_Component_Assoc (void)
-{
-  delete this->component_;
-  delete this->identifier_;
-}
-
-int
-ETCL_Component_Assoc::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_component_assoc (this);
-}
-
-// ****************************************************************
-
-ETCL_Component_Array::~ETCL_Component_Array (void)
-{
-  delete this->component_;
-  delete this->integer_;
-}
-
-int
-ETCL_Component_Array::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_component_array (this);
-}
-
-// ****************************************************************
-
-ETCL_Special::~ETCL_Special (void)
-{}
-
-int
-ETCL_Special::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_special (this);
-}
-
-// ****************************************************************
-
-ETCL_Component::~ETCL_Component (void)
-{
-  delete this->component_;
-  delete this->identifier_;
-}
-
-int
-ETCL_Component::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_component (this);
-}
-
-// ****************************************************************
-
-ETCL_Dot::~ETCL_Dot (void)
-{
-  delete this->component_;
-}
-
-int
-ETCL_Dot::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_dot (this);
-}
-
-// ****************************************************************
-
-ETCL_Eval::~ETCL_Eval (void)
-{
-  delete this->component_;
-}
-
-int
-ETCL_Eval::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_eval (this);
-}
-
-// ****************************************************************
-
-ETCL_Default::~ETCL_Default (void)
-{
-  delete this->component_;
-}
-
-int
-ETCL_Default::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_default (this);
-}
-
-// ****************************************************************
-
-ETCL_Exist::~ETCL_Exist (void)
-{
-  delete this->component_;
-}
-
-int
-ETCL_Exist::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_exist (this);
-}
-
-// ****************************************************************
-
-ETCL_Unary_Expr::~ETCL_Unary_Expr (void)
-{
-  delete this->subexpr_;
-}
-
-int
-ETCL_Unary_Expr::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_unary_expr (this);
-}
-
-// ****************************************************************
-
-ETCL_Binary_Expr::~ETCL_Binary_Expr (void)
-{
-  delete this->lhs_;
-  delete this->rhs_;
-}
-
-int
-ETCL_Binary_Expr::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_binary_expr (this);
-}
-
-// ****************************************************************
-
-ETCL_Preference::~ETCL_Preference (void)
-{
-  delete this->subexpr_;
-}
-
-int
-ETCL_Preference::accept (ETCL_Constraint_Visitor *visitor)
-{
-  return visitor->visit_preference (this);
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/ETCL/ETCL_Constraint.h b/dep/acelite/ace/ETCL/ETCL_Constraint.h
deleted file mode 100644
index 0762d1908..000000000
--- a/dep/acelite/ace/ETCL/ETCL_Constraint.h
+++ /dev/null
@@ -1,416 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ETCL_Constraint.h
- *
- *  $Id: ETCL_Constraint.h 94030 2011-05-08 17:58:47Z johnnyw $
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- *  @author Jeff Parsons (j.parsons@vanderbilt.edu)
- */
-//=============================================================================
-
-#ifndef ACE_ETCL_CONSTRAINT_H
-#define ACE_ETCL_CONSTRAINT_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/SString.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CDR_Base.h"
-
-#include "ace/ETCL/ace_etcl_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-typedef unsigned long Literal_Type;
-
-class ETCL_Constraint_Visitor;
-
-class ACE_ETCL_Export ETCL_Constraint
-{
-public:
-  /// Constructor and destructor
-  ETCL_Constraint (void);
-  virtual ~ETCL_Constraint (void);
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-protected:
-  enum
-  {
-    ACE_ETCL_STRING,
-    ACE_ETCL_DOUBLE,
-    ACE_ETCL_UNSIGNED,
-    ACE_ETCL_SIGNED,
-    ACE_ETCL_INTEGER,
-    ACE_ETCL_BOOLEAN,
-    ACE_ETCL_COMPONENT,
-    ACE_ETCL_UNKNOWN
-  };
-};
-
-// ****************************************************************
-
-class ACE_ETCL_Export ETCL_Literal_Constraint
-  : public ETCL_Constraint
-{
-public:
-  ETCL_Literal_Constraint (void);
-
-  // = Constructors for each of the various types of literals.
-
-  explicit ETCL_Literal_Constraint (ACE_CDR::ULong uinteger);
-  explicit ETCL_Literal_Constraint (ACE_CDR::Long integer);
-  explicit ETCL_Literal_Constraint (ACE_CDR::Boolean boolean);
-  explicit ETCL_Literal_Constraint (ACE_CDR::Double doub);
-  explicit ETCL_Literal_Constraint (const char* str);
-
-  /// Copy constructor
-  ETCL_Literal_Constraint (const ETCL_Literal_Constraint& lit);
-
-  /// Destructor.
-  virtual ~ETCL_Literal_Constraint(void);
-
-  /// Visitor accept method.
-  virtual int accept (ETCL_Constraint_Visitor* visitor);
-
-  Literal_Type expr_type (void) const;
-
-  /// Assignment operator.
-  void operator= (const ETCL_Literal_Constraint& co);
-
-  // Conversion routines.
-  operator ACE_CDR::Boolean (void) const;
-  operator ACE_CDR::ULong (void) const;
-  operator ACE_CDR::Long (void) const;
-  operator ACE_CDR::Double (void) const;
-  operator const char* (void) const;
-
-  // Return the type represented by this MysteryOperand.
-
-  // = Boolean operators.
-
-  bool
-  operator< (const ETCL_Literal_Constraint& rhs);
-
-  bool
-  operator<= (const ETCL_Literal_Constraint& rhs);
-
-  bool
-  operator> (const ETCL_Literal_Constraint& rhs);
-
-  bool
-  operator>= (const ETCL_Literal_Constraint& rhs);
-
-  bool
-  operator== (const ETCL_Literal_Constraint& rhs);
-
-  bool
-  operator!= (const ETCL_Literal_Constraint& rhs);
-
-  // = Arithmetic operators.
-
-  ETCL_Literal_Constraint
-  operator+ (const ETCL_Literal_Constraint& rhs);
-
-  ETCL_Literal_Constraint
-  operator- (const ETCL_Literal_Constraint& rhs);
-
-  ETCL_Literal_Constraint
-  operator* (const ETCL_Literal_Constraint& rhs);
-
-  ETCL_Literal_Constraint
-  operator/ (const ETCL_Literal_Constraint& rhs);
-
-  // Unary minus.
-  ETCL_Literal_Constraint
-  operator- (void);
-
-  /// Ensure both operands are of the same simple numeric type.
-  virtual Literal_Type
-  widest_type (const ETCL_Literal_Constraint& rhs);
-
-protected:
-  /// Private copy method.
-  void copy (const ETCL_Literal_Constraint& co);
-
-  /// Union of the possible literal types.
-  union
-  {
-    char* str_;
-    ACE_CDR::ULong uinteger_;
-    ACE_CDR::Long integer_;
-    ACE_CDR::Boolean bool_;
-    ACE_CDR::Double double_;
-  } op_;
-
-  /// The actual types of the ETCL_Literal_Constraint.
-  Literal_Type type_;
-};
-
-// ****************************************************************
-
-class ACE_ETCL_Export ETCL_Identifier : public ETCL_Constraint
-{
-public:
-  ETCL_Identifier (const char *value);
-
-  /// Get the value
-  const char *value (void) const;
-
-  // = The Constraint methods.
-  int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  /// The value
-  ACE_CString string_;
-};
-
-// ****************************************************************
-
-class ACE_ETCL_Export ETCL_Union_Value : public ETCL_Constraint
-{
-public:
-  ETCL_Union_Value (int sign,
-                    ETCL_Constraint *integer);
-  explicit ETCL_Union_Value (ETCL_Constraint *string = 0);
-  virtual ~ETCL_Union_Value (void);
-
-  int sign (void) const;
-  ETCL_Literal_Constraint *integer (void) const;
-  ETCL_Literal_Constraint *string (void) const;
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  int sign_;
-  ETCL_Literal_Constraint *integer_;
-  ETCL_Literal_Constraint *string_;
-};
-
-class ACE_ETCL_Export ETCL_Union_Pos : public ETCL_Constraint
-{
-public:
-  ETCL_Union_Pos (ETCL_Constraint *union_value = 0,
-                  ETCL_Constraint *component = 0);
-  virtual ~ETCL_Union_Pos (void);
-
-  ETCL_Union_Value *union_value (void) const;
-  ETCL_Constraint *component (void) const;
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  ETCL_Union_Value *union_value_;
-  ETCL_Constraint *component_;
-};
-
-class ACE_ETCL_Export ETCL_Component_Pos : public ETCL_Constraint
-{
-public:
-  ETCL_Component_Pos (ETCL_Constraint *integer = 0,
-                      ETCL_Constraint *component = 0);
-  virtual ~ETCL_Component_Pos (void);
-
-  ETCL_Literal_Constraint *integer (void) const;
-  ETCL_Constraint *component (void) const;
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  ETCL_Literal_Constraint *integer_;
-  ETCL_Constraint *component_;
-};
-
-class ACE_ETCL_Export ETCL_Component_Assoc : public ETCL_Constraint
-{
-public:
-  ETCL_Component_Assoc (ETCL_Constraint *identifier = 0,
-                        ETCL_Constraint *component = 0);
-  virtual ~ETCL_Component_Assoc (void);
-
-  ETCL_Identifier *identifier (void) const;
-  ETCL_Constraint *component (void) const;
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  ETCL_Identifier *identifier_;
-  ETCL_Constraint *component_;
-};
-
-class ACE_ETCL_Export ETCL_Component_Array : public ETCL_Constraint
-{
-public:
-  ETCL_Component_Array (ETCL_Constraint *integer = 0,
-                        ETCL_Constraint *component = 0);
-  virtual ~ETCL_Component_Array (void);
-
-  ETCL_Literal_Constraint *integer (void) const;
-  ETCL_Constraint *component (void) const;
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  ETCL_Literal_Constraint *integer_;
-  ETCL_Constraint *component_;
-};
-
-class ACE_ETCL_Export ETCL_Special : public ETCL_Constraint
-{
-public:
-  ETCL_Special (void);
-  ETCL_Special (int type);
-  virtual ~ETCL_Special (void);
-
-  int type (void) const;
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  int type_;
-};
-
-class ACE_ETCL_Export ETCL_Component : public ETCL_Constraint
-{
-public:
-  ETCL_Component (ETCL_Constraint *identifier = 0,
-                  ETCL_Constraint *component = 0);
-  virtual ~ETCL_Component (void);
-
-  ETCL_Identifier *identifier (void) const;
-  ETCL_Constraint *component (void) const;
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  ETCL_Identifier *identifier_;
-  ETCL_Constraint *component_;
-};
-
-class ACE_ETCL_Export ETCL_Dot : public ETCL_Constraint
-{
-public:
-  explicit ETCL_Dot (ETCL_Constraint *component = 0);
-  virtual ~ETCL_Dot (void);
-
-  ETCL_Constraint *component (void) const;
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  ETCL_Constraint *component_;
-};
-
-class ACE_ETCL_Export ETCL_Eval : public ETCL_Constraint
-{
-public:
-  explicit ETCL_Eval (ETCL_Constraint *component = 0);
-  virtual ~ETCL_Eval (void);
-
-  ETCL_Constraint *component (void) const;
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  ETCL_Constraint *component_;
-};
-
-class ACE_ETCL_Export ETCL_Default : public ETCL_Constraint
-{
-public:
-  explicit ETCL_Default (ETCL_Constraint *component = 0);
-  virtual ~ETCL_Default (void);
-
-  ETCL_Constraint *component (void) const;
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  ETCL_Constraint *component_;
-};
-
-class ACE_ETCL_Export ETCL_Exist : public ETCL_Constraint
-{
-public:
-  explicit ETCL_Exist (ETCL_Constraint *component = 0);
-  virtual ~ETCL_Exist (void);
-
-  ETCL_Constraint *component (void) const;
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  ETCL_Constraint *component_;
-};
-
-class ACE_ETCL_Export ETCL_Unary_Expr : public ETCL_Constraint
-{
-public:
-  ETCL_Unary_Expr (int type,
-                   ETCL_Constraint *subexpr);
-  virtual ~ETCL_Unary_Expr (void);
-
-  int type (void) const;
-  ETCL_Constraint *subexpr (void) const;
-
-  int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  int type_;
-  ETCL_Constraint *subexpr_;
-};
-
-class ACE_ETCL_Export ETCL_Binary_Expr : public ETCL_Constraint
-{
-public:
-  ETCL_Binary_Expr (int type,
-                    ETCL_Constraint *lhs,
-                    ETCL_Constraint *rhs);
-  virtual ~ETCL_Binary_Expr (void);
-
-  int type (void) const;
-  ETCL_Constraint *rhs (void) const;
-  ETCL_Constraint *lhs (void) const;
-
-  int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  int type_;
-  ETCL_Constraint *lhs_;
-  ETCL_Constraint *rhs_;
-};
-
-class ACE_ETCL_Export ETCL_Preference : public ETCL_Constraint
-{
-public:
-  ETCL_Preference (void);
-  ETCL_Preference (int type,
-                   ETCL_Constraint *subexpr = 0);
-  virtual ~ETCL_Preference (void);
-
-  int type (void) const;
-  ETCL_Constraint *subexpr (void) const;
-
-  virtual int accept (ETCL_Constraint_Visitor *visitor);
-
-private:
-  int type_;
-  ETCL_Constraint *subexpr_;
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "ace/ETCL/ETCL_Constraint.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif // ACE_ETCL_CONSTRAINT_H
diff --git a/dep/acelite/ace/ETCL/ETCL_Constraint.inl b/dep/acelite/ace/ETCL/ETCL_Constraint.inl
deleted file mode 100644
index a56cf39aa..000000000
--- a/dep/acelite/ace/ETCL/ETCL_Constraint.inl
+++ /dev/null
@@ -1,349 +0,0 @@
-// -*- C++ -*-
-// $Id: ETCL_Constraint.inl 95595 2012-03-07 13:33:25Z johnnyw $
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Literal_Constraint::ETCL_Literal_Constraint (void)
-  : type_ (ACE_ETCL_UNKNOWN)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Identifier::ETCL_Identifier (const char *value)
-  : string_ (value)
-{
-}
-
-ACE_INLINE const char *
-ETCL_Identifier::value (void) const
-{
-  return this->string_.c_str ();
-}
-
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Union_Value::ETCL_Union_Value (int sign,
-                                    ETCL_Constraint *integer)
-  : sign_ (sign),
-    string_ (0)
-{
-  this->integer_ =
-    dynamic_cast<ETCL_Literal_Constraint*> (integer);
-}
-
-ACE_INLINE
-ETCL_Union_Value::ETCL_Union_Value (ETCL_Constraint *string)
-  :  sign_ (0),
-     integer_ (0)
-{
-  this->string_ =
-    dynamic_cast<ETCL_Literal_Constraint*> (string);
-}
-
-ACE_INLINE int
-ETCL_Union_Value::sign (void) const
-{
-  return this->sign_;
-}
-
-ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Union_Value::integer (void) const
-{
-  return this->integer_;
-}
-
-ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Union_Value::string (void) const
-{
-  return this->string_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Union_Pos::ETCL_Union_Pos (ETCL_Constraint *union_value,
-                                ETCL_Constraint *component)
-  : component_ (component)
-{
-  this->union_value_ =
-    dynamic_cast<ETCL_Union_Value*> (union_value);
-}
-
-ACE_INLINE ETCL_Union_Value *
-ETCL_Union_Pos::union_value (void) const
-{
-  return this->union_value_;
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Union_Pos::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Component_Pos::ETCL_Component_Pos (
-    ETCL_Constraint *integer,
-    ETCL_Constraint *component)
-  : component_ (component)
-{
-  this->integer_ =
-    dynamic_cast<ETCL_Literal_Constraint*> (integer);
-}
-
-ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Component_Pos::integer (void) const
-{
-  return this->integer_;
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Component_Pos::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Component_Assoc::ETCL_Component_Assoc (
-    ETCL_Constraint *identifier,
-    ETCL_Constraint *component)
-  : component_ (component)
-{
-  this->identifier_ =
-    dynamic_cast<ETCL_Identifier*> (identifier);
-}
-
-ACE_INLINE ETCL_Identifier *
-ETCL_Component_Assoc::identifier (void) const
-{
-  return this->identifier_;
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Component_Assoc::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Component_Array::ETCL_Component_Array (
-    ETCL_Constraint *integer,
-    ETCL_Constraint *component)
-  : component_ (component)
-{
-  this->integer_ =
-    dynamic_cast<ETCL_Literal_Constraint*> (integer);
-}
-
-ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Component_Array::integer (void) const
-{
-  return this->integer_;
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Component_Array::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Special::ETCL_Special (void)
-  : type_ (0)
-{}
-
-ACE_INLINE
-ETCL_Special::ETCL_Special (int type)
-  : type_ (type)
-{}
-
-ACE_INLINE int
-ETCL_Special::type (void) const
-{
-  return this->type_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Component::ETCL_Component (ETCL_Constraint *identifier,
-                                ETCL_Constraint *component)
-  : component_ (component)
-{
-  this->identifier_ =
-    dynamic_cast<ETCL_Identifier*> (identifier);
-}
-
-ACE_INLINE ETCL_Identifier *
-ETCL_Component::identifier (void) const
-{
-  return this->identifier_;
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Component::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Dot::ETCL_Dot (ETCL_Constraint *component)
-  : component_ (component)
-{
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Dot::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Eval::ETCL_Eval (ETCL_Constraint *component)
-  : component_ (component)
-{
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Eval::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Default::ETCL_Default (ETCL_Constraint *component)
-  : component_ (component)
-{
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Default::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Exist::ETCL_Exist (ETCL_Constraint *component)
-  : component_ (component)
-{
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Exist::component (void) const
-{
-  return this->component_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Unary_Expr::ETCL_Unary_Expr (int type,
-                                  ETCL_Constraint *subexpr)
-  :  type_ (type),
-     subexpr_ (subexpr)
-{}
-
-ACE_INLINE int
-ETCL_Unary_Expr::type (void) const
-{
-  return this->type_;
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Unary_Expr::subexpr (void) const
-{
-  return this->subexpr_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Binary_Expr::ETCL_Binary_Expr (int type,
-                                    ETCL_Constraint *lhs,
-                                    ETCL_Constraint *rhs)
-  :  type_ (type),
-     lhs_ (lhs),
-     rhs_ (rhs)
-{}
-
-ACE_INLINE int
-ETCL_Binary_Expr::type (void) const
-{
-  return this->type_;
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Binary_Expr::rhs (void) const
-{
-  return this->rhs_;
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Binary_Expr::lhs (void) const
-{
-  return this->lhs_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-ETCL_Preference::ETCL_Preference (void)
-{}
-
-ACE_INLINE
-ETCL_Preference::ETCL_Preference (int type,
-                                  ETCL_Constraint *subexpr)
-  : type_ (type),
-    subexpr_ (subexpr)
-{}
-
-ACE_INLINE int
-ETCL_Preference::type (void) const
-{
-  return this->type_;
-}
-
-ACE_INLINE ETCL_Constraint *
-ETCL_Preference::subexpr (void) const
-{
-  return this->subexpr_;
-}
-
-ACE_INLINE bool
-ETCL_Literal_Constraint::operator!= (const ETCL_Literal_Constraint & rhs)
-{
-  return !(*this == rhs);
-}
-
-ACE_INLINE bool
-ETCL_Literal_Constraint::operator<= (const ETCL_Literal_Constraint & rhs)
-{
-  return !(*this > rhs);
-}
-
-ACE_INLINE bool
-ETCL_Literal_Constraint::operator>= (const ETCL_Literal_Constraint & rhs)
-{
-  return !(*this < rhs);
-}
diff --git a/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp b/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp
deleted file mode 100644
index 66dbd8d09..000000000
--- a/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- * @file ETCL_Constraint_Visitor.cpp
- *
- * $Id: ETCL_Constraint_Visitor.cpp 81653 2008-05-08 21:08:49Z parsons $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#include "ace/ETCL/ETCL_Constraint_Visitor.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ETCL_Constraint_Visitor::~ETCL_Constraint_Visitor (void)
-{
-}
-
-int
-ETCL_Constraint_Visitor::visit_literal (ETCL_Literal_Constraint *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_identifier (ETCL_Identifier *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_union_value (ETCL_Union_Value *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_union_pos (ETCL_Union_Pos *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_component_pos (ETCL_Component_Pos *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_component_assoc (ETCL_Component_Assoc *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_component_array (ETCL_Component_Array *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_special (ETCL_Special *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_component (ETCL_Component *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_dot (ETCL_Dot *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_eval (ETCL_Eval *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_default (ETCL_Default *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_exist (ETCL_Exist *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_unary_expr (ETCL_Unary_Expr *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_binary_expr (ETCL_Binary_Expr *)
-{
-  return 0;
-}
-
-int
-ETCL_Constraint_Visitor::visit_preference (ETCL_Preference *)
-{
-  return 0;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
diff --git a/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.h b/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.h
deleted file mode 100644
index 2337f60e8..000000000
--- a/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- * @file ETCL_Constraint_Visitor.h
- *
- * $Id: ETCL_Constraint_Visitor.h 81653 2008-05-08 21:08:49Z parsons $
- *
- * @author Carlos O'Ryan <coryan@cs.wustl.edu>
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef ACE_ETCL_CONSTRAINT_VISITOR_H
-#define ACE_ETCL_CONSTRAINT_VISITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/ETCL/ace_etcl_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ETCL_Literal_Constraint;
-class ETCL_Identifier;
-class ETCL_Union_Value;
-class ETCL_Union_Pos;
-class ETCL_Component_Pos;
-class ETCL_Component_Assoc;
-class ETCL_Component_Array;
-class ETCL_Special;
-class ETCL_Component;
-class ETCL_Dot;
-class ETCL_Eval;
-class ETCL_Default;
-class ETCL_Exist;
-class ETCL_Unary_Expr;
-class ETCL_Binary_Expr;
-class ETCL_Preference;
-
-class ACE_ETCL_Export ETCL_Constraint_Visitor
-{
-public:
-  virtual ~ETCL_Constraint_Visitor (void);
-
-  virtual int visit_literal (ETCL_Literal_Constraint *);
-  virtual int visit_identifier (ETCL_Identifier *);
-  virtual int visit_union_value (ETCL_Union_Value *);
-  virtual int visit_union_pos (ETCL_Union_Pos *);
-  virtual int visit_component_pos (ETCL_Component_Pos *);
-  virtual int visit_component_assoc (ETCL_Component_Assoc *);
-  virtual int visit_component_array (ETCL_Component_Array *);
-  virtual int visit_special (ETCL_Special *);
-  virtual int visit_component (ETCL_Component *);
-  virtual int visit_dot (ETCL_Dot *);
-  virtual int visit_eval (ETCL_Eval *);
-  virtual int visit_default (ETCL_Default *);
-  virtual int visit_exist (ETCL_Exist *);
-  virtual int visit_unary_expr (ETCL_Unary_Expr *);
-  virtual int visit_binary_expr (ETCL_Binary_Expr *);
-  virtual int visit_preference (ETCL_Preference *);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif // ACE_ETCL_CONSTRAINT_VISITOR_H
diff --git a/dep/acelite/ace/ETCL/ETCL_Interpreter.cpp b/dep/acelite/ace/ETCL/ETCL_Interpreter.cpp
deleted file mode 100644
index 727bd2646..000000000
--- a/dep/acelite/ace/ETCL/ETCL_Interpreter.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// -*- C++ -*-
-// $Id: ETCL_Interpreter.cpp 91813 2010-09-17 07:52:52Z johnnyw $
-
-#include "ace/Guard_T.h"
-#include "ace/Truncate.h"
-
-#include "ace/ETCL/ETCL_Interpreter.h"
-#include "ace/ETCL/ETCL_Constraint.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ETCL_Parser_Export ACE_SYNCH_MUTEX ETCL_Interpreter::parserMutex__;
-
-ETCL_Interpreter::ETCL_Interpreter (void)
-  : root_ (0)
-{
-}
-
-ETCL_Interpreter::~ETCL_Interpreter (void)
-{
-  delete this->root_;
-}
-
-int
-ETCL_Interpreter::build_tree (const char* constraints)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
-                    guard,
-                    ETCL_Interpreter::parserMutex__,
-                    -1);
-
-  Lex_String_Input::reset ((char*)constraints);
-
-  yyval.constraint = 0;
-  int return_value = ::yyparse ();
-
-  if (return_value == 0 && yyval.constraint != 0)
-    {
-      this->root_ = yyval.constraint;
-    }
-  else
-    {
-      this->root_ = 0;
-    }
-
-  return return_value;
-}
-
-int
-ETCL_Interpreter::is_empty_string (const char* str)
-{
-  int return_value = 0;
-
-  if (str != 0)
-    {
-      int i = 0;
-
-      while (str[i] != '\0')
-        {
-          if (str[i] != ' ')
-            {
-              break;
-            }
-
-          ++i;
-        }
-
-      if (str[i] == '\0')
-        {
-          return_value = 1;
-        }
-    }
-
-  return return_value;
-}
-
-char* Lex_String_Input::string_ = 0;
-char* Lex_String_Input::current_ = 0;
-char* Lex_String_Input::end_ = 0;
-
-// Routine to have Lex read its input from the constraint string.
-
-int
-Lex_String_Input::copy_into (char* buf,
-                             int max_size)
-{
-  int const chars_left =
-    ACE_Utils::truncate_cast<int> (
-      Lex_String_Input::end_ - Lex_String_Input::current_);
-
-  int const n = max_size > chars_left ? chars_left : max_size;
-
-  if (n > 0)
-    {
-      ACE_OS::memcpy (buf,
-                      Lex_String_Input::current_,
-                      n);
-      Lex_String_Input::current_ += n;
-    }
-
-  return n;
-}
-
-void
-Lex_String_Input::reset (char* input_string)
-{
-  Lex_String_Input::string_ = input_string;
-  Lex_String_Input::current_ = input_string;
-  Lex_String_Input::end_ =
-    input_string + ACE_OS::strlen (Lex_String_Input::string_);
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/ETCL/ETCL_Interpreter.h b/dep/acelite/ace/ETCL/ETCL_Interpreter.h
deleted file mode 100644
index 8553c9b33..000000000
--- a/dep/acelite/ace/ETCL/ETCL_Interpreter.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ETCL_Interpreter.h
- *
- *  $Id: ETCL_Interpreter.h 82434 2008-07-28 11:40:36Z johnnyw $
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu> based on previous work by
- *  @author Seth Widoff <sbw1@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ETCL_INTERPRETER_H
-#define ETCL_INTERPRETER_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Thread_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Synch_Traits.h"
-
-#include "etcl_parser_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ETCL_Constraint;
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ETCL_Interpreter
- *
- * @brief ETCL_Interpreter is the superclass for all ETCL interpreters.
- * Its build tree method invokes the yacc parser to parse a constraint
- * or preference string.
- */
-class ETCL_Parser_Export ETCL_Interpreter
-{
-protected:
-  // = Initialization and termination methods.
-  /// Constructor.
-  ETCL_Interpreter (void);
-
-  /// Destructor.
-  virtual ~ETCL_Interpreter (void);
-
-  /// Using the Yacc generated parser, construct an expression tree
-  /// representing @a constraints from the tokens returned by it.
-  int build_tree (const char* constraints);
-
-  static int is_empty_string (const char* str);
-
-  /// The root of the expression tree, not equal to null if build_tree
-  /// successfully builds a tree from the constraints.
-  ETCL_Constraint* root_;
-private:
-  /// This mutex protects the <build_tree> method from reentrance.
-  static ACE_SYNCH_MUTEX parserMutex__;
-};
-
-
-// Functions we need for parsing.
-extern int yyparse (void);
-extern void yyrestart (FILE*);
-extern int yylex (void);
-
-// Have yylex read from the constraint string, not from stdin.
-#undef YY_INPUT
-#define YY_INPUT(b, r, ms) (r = Lex_String_Input::copy_into(b, ms))
-
-/**
- * @class Lex_String_Input
- *
- * @brief Have Lex read from a string and not from stdin. Essentially,
- * the interpreter needs to call yylex() until EOF, and call
- * TAO_Lex_String_Input::reset() with the new string, prior to
- * calling yyparse.
- */
-class Lex_String_Input
-{
-public:
-  /// Reset the lex input.
-  static void reset (char* input_string);
-
-  /// Method lex will call to read from the input string.
-  static int copy_into (char* buf, int max_size);
-
-private:
-
-  /// Pointers to keep track of the input string.
-  static char* string_;
-  static char* current_;
-  static char* end_;
-};
-
-/// The union used by lex and bison to build the Abstract Syntax Tree.
-typedef union
-{
-  ACE_VERSIONED_NAMESPACE_NAME::ETCL_Constraint* constraint;
-} YYSTYPE;
-
-extern YYSTYPE yylval;
-extern YYSTYPE yyval;
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif // ETCL_INTERPRETER_H
diff --git a/dep/acelite/ace/ETCL/ETCL_l.cpp b/dep/acelite/ace/ETCL/ETCL_l.cpp
deleted file mode 100644
index ed985de00..000000000
--- a/dep/acelite/ace/ETCL/ETCL_l.cpp
+++ /dev/null
@@ -1,1877 +0,0 @@
-
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-#include "ace/ETCL/ETCL_Constraint.h"
-
-#ifdef __cplusplus
-
-#include "ace/OS_NS_unistd.h"
-#include "ace/OS_NS_stdio.h"
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else  /* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif  /* __STDC__ */
-#endif  /* ! __cplusplus */
-
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 16384
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- *  if ( condition_holds )
- *    yyless( 5 );
- *  else
- *    do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-  do \
-    { \
-      /* Undo effects of setting up yytext. */ \
-      *yy_cp = yy_hold_char; \
-      YY_RESTORE_YY_MORE_OFFSET \
-      yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-      YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-    } \
-  while ( 0 )
-
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int yy_size_t;
-
-
-struct yy_buffer_state
-{
-  FILE *yy_input_file;
-
-  char *yy_ch_buf;    /* input buffer */
-  char *yy_buf_pos;   /* current position in input buffer */
-
-  /* Size of input buffer in bytes, not including room for EOB
-   * characters.
-   */
-  yy_size_t yy_buf_size;
-
-  /* Number of characters read into yy_ch_buf, not including EOB
-   * characters.
-   */
-  int yy_n_chars;
-
-  /* Whether we "own" the buffer - i.e., we know we created it,
-   * and can realloc() it to grow it, and should free() it to
-   * delete it.
-   */
-  int yy_is_our_buffer;
-
-  /* Whether this is an "interactive" input source; if so, and
-   * if we're using stdio for input, then we want to use getc()
-   * instead of fread(), to make sure we stop fetching input after
-   * each newline.
-   */
-  int yy_is_interactive;
-
-  /* Whether we're considered to be at the beginning of a line.
-   * If so, '^' rules will be active on the next match, otherwise
-   * not.
-   */
-  int yy_at_bol;
-
-  /* Whether to try to fill the input buffer when we reach the
-   * end of it.
-   */
-  int yy_fill_buffer;
-
-  int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-  /* When an EOF's been seen but there's still some text to process
-   * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-   * shouldn't try reading from the input source any more.  We might
-   * still have a bunch of tokens to match, though, because of
-   * possible backing-up.
-   *
-   * When we actually see the EOF, we change the status to "new"
-   * (via yyrestart()), so that the user can continue scanning by
-   * just pointing yyin at a new input file.
-   */
-#define YY_BUFFER_EOF_PENDING 2
-};
-
-static YY_BUFFER_STATE yy_current_buffer = 0;
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars;    /* number of characters read into yy_ch_buf */
-
-
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;   /* whether we need to initialize */
-static int yy_start = 0;  /* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart YY_PROTO(( FILE *input_file ));
-
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
-
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-  { \
-    if ( ! yy_current_buffer ) \
-      yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-    yy_current_buffer->yy_is_interactive = is_interactive; \
-  }
-
-#define yy_set_bol(at_bol) \
-  { \
-    if ( ! yy_current_buffer ) \
-      yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-    yy_current_buffer->yy_at_bol = at_bol; \
-  }
-
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
-
-typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-typedef int yy_state_type;
-extern char *yytext;
-#define yytext_ptr yytext
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-  yytext_ptr = yy_bp; \
-  yyleng = (int) (yy_cp - yy_bp); \
-  yy_hold_char = *yy_cp; \
-  *yy_cp = '\0'; \
-  yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 41
-#define YY_END_OF_BUFFER 42
-static yyconst short int yy_accept[118] =
-    {   0,
-        0,    0,   42,   40,   39,   41,   40,   24,   40,   22,
-       23,   14,   12,   13,   25,   15,   35,   16,   40,   18,
-       38,   38,   38,   31,   40,   32,   40,   38,   38,   38,
-       38,   38,   38,   38,   38,   38,   38,   11,   21,    0,
-       37,    0,   36,    0,   35,   17,   20,   19,   38,   38,
-       38,   38,   27,    0,    0,    0,   38,   38,   38,   38,
-       10,   38,   38,   38,    9,   38,   38,    0,    0,   38,
-       38,   38,    0,    0,    0,    8,   38,   38,   38,    2,
-        1,    7,   38,   38,    0,   36,   38,   33,    0,    0,
-        0,   38,   38,   38,   38,    5,   34,    0,    0,    0,
-
-       38,    6,    3,   38,    0,    0,    0,   38,    4,   30,
-        0,    0,   26,    0,   28,   29,    0
-    } ;
-
-static yyconst int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    4,    1,    1,    5,    1,    1,    6,    7,
-        8,    9,   10,    1,   11,   12,   13,   14,   14,   14,
-       14,   14,   14,   14,   14,   14,   14,    1,    1,   15,
-       16,   17,    1,    1,   18,   19,   19,   19,   20,   21,
-       19,   19,   19,   19,   19,   22,   19,   19,   19,   19,
-       19,   23,   24,   25,   26,   19,   19,   19,   19,   19,
-       27,   28,   29,    1,   30,    1,   31,   19,   19,   32,
-
-       33,   34,   35,   36,   37,   19,   19,   38,   39,   40,
-       41,   42,   19,   43,   44,   45,   46,   19,   47,   48,
-       49,   19,    1,    1,    1,   50,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst int yy_meta[51] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    2,    1,    1,    1,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    1,    1,    1,    2,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    1
-    } ;
-
-static yyconst short int yy_base[122] =
-    {   0,
-        0,    0,  146,  147,  147,  147,  129,  147,   45,  147,
-      147,  147,  147,  147,  130,  147,   40,  127,  126,  125,
-        0,  122,  116,  147,    0,  147,   21,   98,  104,   88,
-       98,   94,   24,   92,   89,  100,   93,  147,  147,   50,
-      147,   51,   48,  115,   46,  147,  147,  147,    0,  106,
-      101,    0,  147,   93,   92,   75,   91,   88,   84,   77,
-        0,   71,   78,   72,    0,   76,   70,   57,   60,   90,
-       93,    0,   72,   69,   68,    0,   78,   64,   63,    0,
-        0,    0,   74,   69,   90,   89,   82,    0,   66,   59,
-       66,   52,   52,   51,   54,    0,    0,   49,   49,   54,
-
-       45,    0,    0,   43,   44,   47,   39,   30,    0,  147,
-       35,   37,    0,   35,  147,  147,  147,   85,   87,   62,
-       89
-    } ;
-
-static yyconst short int yy_def[122] =
-    {   0,
-      117,    1,  117,  117,  117,  117,  117,  117,  118,  117,
-      117,  117,  117,  117,  117,  117,  117,  117,  117,  117,
-      119,  119,  119,  117,  120,  117,  117,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  117,  117,  118,
-      117,  117,  117,  117,  117,  117,  117,  117,  119,  119,
-      119,  121,  117,  117,  117,  117,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  118,  117,  119,
-      119,  121,  117,  117,  117,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  117,  117,  119,  119,  117,  117,
-      117,  119,  119,  119,  119,  119,  119,  117,  117,  117,
-
-      119,  119,  119,  119,  117,  117,  117,  119,  119,  117,
-      117,  117,  119,  117,  117,  117,    0,  117,  117,  117,
-      117
-    } ;
-
-static yyconst short int yy_nxt[198] =
-    {   0,
-        4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-       14,   15,   16,   17,   18,   19,   20,   21,   21,   21,
-       22,   21,   21,   21,   23,   21,   24,   25,   26,   27,
-       28,   29,   30,   31,   21,   21,   32,   21,   33,   34,
-       35,   21,   36,   21,   21,   21,   37,   21,   21,   38,
-       41,   44,   53,   45,   62,   41,   68,   44,   54,   45,
-       63,   43,   41,   55,   52,   56,  116,   69,  115,   85,
-       85,  114,   42,   86,  113,  112,  111,   42,   68,  110,
-       69,  109,  108,  107,   42,   40,   40,   40,   49,   49,
-       72,   72,  106,  105,  104,  103,  102,  101,  100,   99,
-
-       98,   97,   86,   86,   96,   95,   94,   93,   92,   91,
-       90,   89,   88,   87,   84,   83,   82,   81,   80,   79,
-       78,   77,   76,   75,   74,   73,   71,   70,   43,   67,
-       66,   65,   64,   61,   60,   59,   58,   57,   51,   50,
-       48,   47,   46,   43,   39,  117,    3,  117,  117,  117,
-      117,  117,  117,  117,  117,  117,  117,  117,  117,  117,
-      117,  117,  117,  117,  117,  117,  117,  117,  117,  117,
-      117,  117,  117,  117,  117,  117,  117,  117,  117,  117,
-      117,  117,  117,  117,  117,  117,  117,  117,  117,  117,
-      117,  117,  117,  117,  117,  117,  117
-
-    } ;
-
-static yyconst short int yy_chk[198] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        9,   17,   27,   17,   33,   40,   42,   45,   27,   45,
-       33,   43,   68,   27,  120,   27,  114,   43,  112,   69,
-       69,  111,    9,   69,  108,  107,  106,   40,   42,  105,
-       43,  104,  101,  100,   68,  118,  118,  118,  119,  119,
-      121,  121,   99,   98,   95,   94,   93,   92,   91,   90,
-
-       89,   87,   86,   85,   84,   83,   79,   78,   77,   75,
-       74,   73,   71,   70,   67,   66,   64,   63,   62,   60,
-       59,   58,   57,   56,   55,   54,   51,   50,   44,   37,
-       36,   35,   34,   32,   31,   30,   29,   28,   23,   22,
-       20,   19,   18,   15,    7,    3,  117,  117,  117,  117,
-      117,  117,  117,  117,  117,  117,  117,  117,  117,  117,
-      117,  117,  117,  117,  117,  117,  117,  117,  117,  117,
-      117,  117,  117,  117,  117,  117,  117,  117,  117,  117,
-      117,  117,  117,  117,  117,  117,  117,  117,  117,  117,
-      117,  117,  117,  117,  117,  117,  117
-
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#define INITIAL 0
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-//=============================================================================
-/**
- *  @file   ETCL_l.cpp
- *
- *  $Id: ETCL_l.cpp 93651 2011-03-28 08:49:11Z johnnyw $
- *
- *  @author Carlos O'Ryan <coryan@uci.edu> based on previous work by Seth Widoff <sbw1@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#include "ace/ETCL/ETCL_Interpreter.h"
-#include "ace/ETCL/ETCL_y.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-static const char* extract_string(char*);
-//static const char * extract_string(char*);
-
-#define YY_LEX_DEBUG
-
-#ifdef CONSTRAINT_DEBUG
-#define YY_LEX_DEBUG ACE_OS::fprintf(stderr, "%s\n", yytext)
-#endif /* CONSTRAINT_DEBUG */
-
-//#define YY_DECL int ETCL_yylex (ETCL_YYSTYPE *lvalp, void* state)
-
-#define YY_BREAK
-#define YY_NO_UNPUT
-
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
-#else
-extern int yywrap YY_PROTO(( void ));
-#endif
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
-#endif
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-//FUZZ: disable check_for_lack_ACE_OS
-#ifndef ETCL_ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ETCL_ECHO { size_t __dum_ret = fwrite( yytext, yyleng, 1, yyout ); (void) __dum_ret; }
-#endif
- //FUZZ: enable check_for_lack_ACE_OS
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-  if ( yy_current_buffer->yy_is_interactive ) \
-  { \
-    int c = '*', n; \
-    for ( n = 0; n < max_size && \
-          (c = ACE_OS::getc( yyin )) != EOF && c != '\n'; ++n ) \
-      buf[n] = (char) c; \
-    if ( c == '\n' ) \
-      buf[n++] = (char) c; \
-    if ( c == EOF && ferror( yyin ) ) \
-      YY_FATAL_ERROR( "input in flex scanner failed" ); \
-    result = n; \
-  } \
-  else if ( ((result = ACE_OS::fread( buf, 1, max_size, yyin )) == 0) \
-            && ferror( yyin ) ) \
-    YY_FATAL_ERROR( "input in flex scanner failed" );
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-  YY_USER_ACTION
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-YY_DECL
-  {
-  register yy_state_type yy_current_state;
-  register char *yy_cp = 0;
-  register char *yy_bp = 0;
-  register int yy_act;
-
-//#line 50 "ETCL/ETCL.ll"
-
-  if ( yy_init )
-    {
-    yy_init = 0;
-
-#ifdef YY_USER_INIT
-    YY_USER_INIT;
-#endif
-
-    if ( ! yy_start )
-      yy_start = 1; /* first start state */
-
-    if ( ! yyin )
-      yyin = stdin;
-
-    if ( ! yyout )
-      yyout = stdout;
-
-    if ( ! yy_current_buffer )
-      yy_current_buffer =
-        yy_create_buffer( yyin, YY_BUF_SIZE );
-
-    yy_load_buffer_state();
-    }
-
-  while ( 1 )   /* loops until end-of-file is reached */
-    {
-    yy_cp = yy_c_buf_p;
-
-    /* Support of yytext. */
-    *yy_cp = yy_hold_char;
-
-    /* yy_bp points to the position in yy_ch_buf of the start of
-     * the current run.
-     */
-    yy_bp = yy_cp;
-
-    yy_current_state = yy_start;
-yy_match:
-    do
-      {
-      register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-      if ( yy_accept[yy_current_state] )
-        {
-        yy_last_accepting_state = yy_current_state;
-        yy_last_accepting_cpos = yy_cp;
-        }
-      while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-        {
-        yy_current_state = (int) yy_def[yy_current_state];
-        if ( yy_current_state >= 118 )
-          yy_c = yy_meta[(unsigned int) yy_c];
-        }
-      yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-      ++yy_cp;
-      }
-    while ( yy_base[yy_current_state] != 147 );
-
-yy_find_action:
-    yy_act = yy_accept[yy_current_state];
-    if ( yy_act == 0 )
-      { /* have to back up */
-      yy_cp = yy_last_accepting_cpos;
-      yy_current_state = yy_last_accepting_state;
-      yy_act = yy_accept[yy_current_state];
-      }
-
-    YY_DO_BEFORE_ACTION;
-
-
-do_action:  /* This label is used only to access EOF actions. */
-
-
-    switch ( yy_act )
-  { /* beginning of action switch */
-      case 0: /* must back up */
-      /* undo the effects of YY_DO_BEFORE_ACTION */
-      *yy_cp = yy_hold_char;
-      yy_cp = yy_last_accepting_cpos;
-      yy_current_state = yy_last_accepting_state;
-      goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-//#line 52 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_MIN; }
-  YY_BREAK
-case 2:
-YY_RULE_SETUP
-//#line 53 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_MAX; }
-  YY_BREAK
-case 3:
-YY_RULE_SETUP
-//#line 54 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_FIRST; }
-  YY_BREAK
-case 4:
-YY_RULE_SETUP
-//#line 55 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_RANDOM; }
-  YY_BREAK
-case 5:
-YY_RULE_SETUP
-//#line 56 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_WITH; }
-  YY_BREAK
-case 6:
-YY_RULE_SETUP
-//#line 57 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_EXIST; }
-  YY_BREAK
-case 7:
-YY_RULE_SETUP
-//#line 58 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_NOT; }
-  YY_BREAK
-case 8:
-YY_RULE_SETUP
-//#line 59 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_AND; }
-  YY_BREAK
-case 9:
-YY_RULE_SETUP
-//#line 60 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_OR; }
-  YY_BREAK
-case 10:
-YY_RULE_SETUP
-//#line 61 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_IN; }
-  YY_BREAK
-case 11:
-YY_RULE_SETUP
-//#line 62 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_TWIDDLE; }
-  YY_BREAK
-case 12:
-YY_RULE_SETUP
-//#line 63 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_PLUS; }
-  YY_BREAK
-case 13:
-YY_RULE_SETUP
-//#line 64 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_MINUS; }
-  YY_BREAK
-case 14:
-YY_RULE_SETUP
-//#line 65 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_MULT; }
-  YY_BREAK
-case 15:
-YY_RULE_SETUP
-//#line 66 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_DIV; }
-  YY_BREAK
-case 16:
-YY_RULE_SETUP
-//#line 67 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_LT; }
-  YY_BREAK
-case 17:
-YY_RULE_SETUP
-//#line 68 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_LE; }
-  YY_BREAK
-case 18:
-YY_RULE_SETUP
-//#line 69 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_GT; }
-  YY_BREAK
-case 19:
-YY_RULE_SETUP
-//#line 70 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_GE; }
-  YY_BREAK
-case 20:
-YY_RULE_SETUP
-//#line 71 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_EQ; }
-  YY_BREAK
-case 21:
-YY_RULE_SETUP
-//#line 72 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_NE; }
-  YY_BREAK
-case 22:
-YY_RULE_SETUP
-//#line 73 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_LPAREN; }
-  YY_BREAK
-case 23:
-YY_RULE_SETUP
-//#line 74 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_RPAREN; }
-  YY_BREAK
-case 24:
-YY_RULE_SETUP
-//#line 75 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_DOLLAR; }
-  YY_BREAK
-case 25:
-YY_RULE_SETUP
-//#line 76 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_DOT; }
-  YY_BREAK
-case 26:
-YY_RULE_SETUP
-//#line 77 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_DEFAULT; }
-  YY_BREAK
-case 27:
-YY_RULE_SETUP
-//#line 78 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_DISCRIMINANT; }
-  YY_BREAK
-case 28:
-YY_RULE_SETUP
-//#line 79 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_TYPE_ID; }
-  YY_BREAK
-case 29:
-YY_RULE_SETUP
-//#line 80 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_REPOS_ID; }
-  YY_BREAK
-case 30:
-YY_RULE_SETUP
-//#line 81 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_LENGTH; }
-  YY_BREAK
-case 31:
-YY_RULE_SETUP
-//#line 82 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_LBRA; }
-  YY_BREAK
-case 32:
-YY_RULE_SETUP
-//#line 83 "ETCL/ETCL.ll"
-{ YY_LEX_DEBUG; return ETCL_RBRA; }
-  YY_BREAK
-case 33:
-YY_RULE_SETUP
-//#line 84 "ETCL/ETCL.ll"
-{
-      yylval.constraint =
-        new ETCL_Literal_Constraint ((ACE_CDR::Boolean) 1);
-      YY_LEX_DEBUG; return ETCL_BOOLEAN;
-    }
-  YY_BREAK
-case 34:
-YY_RULE_SETUP
-//#line 89 "ETCL/ETCL.ll"
-{
-      yylval.constraint =
-        new ETCL_Literal_Constraint ((ACE_CDR::Boolean) 0);
-      YY_LEX_DEBUG; return ETCL_BOOLEAN;
-    }
-  YY_BREAK
-case 35:
-YY_RULE_SETUP
-//#line 94 "ETCL/ETCL.ll"
-{
-      yylval.constraint =
-        new ETCL_Literal_Constraint (ACE_OS::atoi (yytext));
-      YY_LEX_DEBUG; return ETCL_INTEGER;
-    }
-  YY_BREAK
-case 36:
-YY_RULE_SETUP
-//#line 99 "ETCL/ETCL.ll"
-{
-      double v;
-      sscanf (yytext, "%lf", &v);
-      yylval.constraint =
-        new ETCL_Literal_Constraint (v);
-      YY_LEX_DEBUG; return ETCL_FLOAT;
-    }
-  YY_BREAK
-case 37:
-YY_RULE_SETUP
-//#line 106 "ETCL/ETCL.ll"
-{
-      yylval.constraint =
-        new ETCL_Literal_Constraint (extract_string(yytext));
-      YY_LEX_DEBUG; return ETCL_STRING;
-    }
-  YY_BREAK
-case 38:
-YY_RULE_SETUP
-//#line 111 "ETCL/ETCL.ll"
-{
-      yylval.constraint =
-        new ETCL_Identifier (yytext);
-      YY_LEX_DEBUG; return ETCL_IDENT;
-    }
-  YY_BREAK
-case 39:
-YY_RULE_SETUP
-//#line 116 "ETCL/ETCL.ll"
-{
-                  YY_LEX_DEBUG; break; // Ignore
-                }
-  YY_BREAK
-case 40:
-YY_RULE_SETUP
-//#line 119 "ETCL/ETCL.ll"
-{
-                  YY_LEX_DEBUG; break; // @@ TODO
-                }
-  YY_BREAK
-case 41:
-YY_RULE_SETUP
-//#line 122 "ETCL/ETCL.ll"
-ETCL_ECHO;
-  YY_BREAK
-case YY_STATE_EOF(INITIAL):
-  yyterminate();
-
-  case YY_END_OF_BUFFER:
-    {
-    /* Amount of text matched not including the EOB char. */
-    int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
-
-    /* Undo the effects of YY_DO_BEFORE_ACTION. */
-    *yy_cp = yy_hold_char;
-    YY_RESTORE_YY_MORE_OFFSET
-
-    if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
-      {
-      /* We're scanning a new file or input source.  It's
-       * possible that this happened because the user
-       * just pointed yyin at a new source and called
-       * yylex().  If so, then we have to assure
-       * consistency between yy_current_buffer and our
-       * globals.  Here is the right place to do so, because
-       * this is the first action (other than possibly a
-       * back-up) that will match for the new input source.
-       */
-      yy_n_chars = yy_current_buffer->yy_n_chars;
-      yy_current_buffer->yy_input_file = yyin;
-      yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
-      }
-
-    /* Note that here we test for yy_c_buf_p "<=" to the position
-     * of the first EOB in the buffer, since yy_c_buf_p will
-     * already have been incremented past the NUL character
-     * (since all states make transitions on EOB to the
-     * end-of-buffer state).  Contrast this with the test
-     * in input().
-     */
-    if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-      { /* This was really a NUL. */
-      yy_state_type yy_next_state;
-
-      yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-      yy_current_state = yy_get_previous_state();
-
-      /* Okay, we're now positioned to make the NUL
-       * transition.  We couldn't have
-       * yy_get_previous_state() go ahead and do it
-       * for us because it doesn't know how to deal
-       * with the possibility of jamming (and we don't
-       * want to build jamming into it because then it
-       * will run more slowly).
-       */
-
-      yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-      yy_bp = yytext_ptr + YY_MORE_ADJ;
-
-      if ( yy_next_state )
-        {
-        /* Consume the NUL. */
-        yy_cp = ++yy_c_buf_p;
-        yy_current_state = yy_next_state;
-        goto yy_match;
-        }
-
-      else
-        {
-        yy_cp = yy_c_buf_p;
-        goto yy_find_action;
-        }
-      }
-
-    else switch ( yy_get_next_buffer() )
-      {
-      case EOB_ACT_END_OF_FILE:
-        {
-        yy_did_buffer_switch_on_eof = 0;
-
-        if ( yywrap() )
-          {
-          /* Note: because we've taken care in
-           * yy_get_next_buffer() to have set up
-           * yytext, we can now set up
-           * yy_c_buf_p so that if some total
-           * hoser (like flex itself) wants to
-           * call the scanner after we return the
-           * YY_NULL, it'll still work - another
-           * YY_NULL will get returned.
-           */
-          yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
-          yy_act = YY_STATE_EOF(YY_START);
-          goto do_action;
-          }
-
-        else
-          {
-          if ( ! yy_did_buffer_switch_on_eof )
-            YY_NEW_FILE;
-          }
-        break;
-        }
-
-      case EOB_ACT_CONTINUE_SCAN:
-        yy_c_buf_p =
-          yytext_ptr + yy_amount_of_matched_text;
-
-        yy_current_state = yy_get_previous_state();
-
-        yy_cp = yy_c_buf_p;
-        yy_bp = yytext_ptr + YY_MORE_ADJ;
-        goto yy_match;
-
-      case EOB_ACT_LAST_MATCH:
-        yy_c_buf_p =
-        &yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-        yy_current_state = yy_get_previous_state();
-
-        yy_cp = yy_c_buf_p;
-        yy_bp = yytext_ptr + YY_MORE_ADJ;
-        goto yy_find_action;
-      }
-    break;
-    }
-
-  default:
-    YY_FATAL_ERROR(
-      "fatal flex scanner internal error--no action found" );
-  } /* end of action switch */
-    } /* end of scanning one token */
-  } /* end of yylex */
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *  EOB_ACT_LAST_MATCH -
- *  EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *  EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-  {
-  register char *dest = yy_current_buffer->yy_ch_buf;
-  register char *source = yytext_ptr;
-  register int number_to_move, i;
-  int ret_val;
-
-  if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-    YY_FATAL_ERROR(
-    "fatal flex scanner internal error--end of buffer missed" );
-
-  if ( yy_current_buffer->yy_fill_buffer == 0 )
-    { /* Don't try to fill the buffer, so this is an EOF. */
-    if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
-      {
-      /* We matched a single character, the EOB, so
-       * treat this as a final EOF.
-       */
-      return EOB_ACT_END_OF_FILE;
-      }
-
-    else
-      {
-      /* We matched some text prior to the EOB, first
-       * process it.
-       */
-      return EOB_ACT_LAST_MATCH;
-      }
-    }
-
-  /* Try to read more data. */
-
-  /* First move last chars to start of buffer. */
-  number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
-
-  for ( i = 0; i < number_to_move; ++i )
-    *(dest++) = *(source++);
-
-  if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-    /* don't do the read, it's not guaranteed to return an EOF,
-     * just force an EOF
-     */
-    yy_current_buffer->yy_n_chars = yy_n_chars = 0;
-
-  else
-    {
-    int num_to_read =
-      yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-    while ( num_to_read <= 0 )
-      { /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-      YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-      /* just a shorter name for the current buffer */
-      YY_BUFFER_STATE b = yy_current_buffer;
-
-      int yy_c_buf_p_offset =
-        (int) (yy_c_buf_p - b->yy_ch_buf);
-
-      if ( b->yy_is_our_buffer )
-        {
-        int new_size = b->yy_buf_size * 2;
-
-        if ( new_size <= 0 )
-          b->yy_buf_size += b->yy_buf_size / 8;
-        else
-          b->yy_buf_size *= 2;
-
-        b->yy_ch_buf = (char *)
-          /* Include room in for 2 EOB chars. */
-          yy_flex_realloc( (void *) b->yy_ch_buf,
-               b->yy_buf_size + 2 );
-        }
-      else
-        /* Can't grow it, we don't own it. */
-        b->yy_ch_buf = 0;
-
-      if ( ! b->yy_ch_buf )
-        YY_FATAL_ERROR(
-        "fatal error - scanner input buffer overflow" );
-
-      yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-      num_to_read = yy_current_buffer->yy_buf_size -
-            number_to_move - 1;
-#endif
-      }
-
-    if ( num_to_read > YY_READ_BUF_SIZE )
-      num_to_read = YY_READ_BUF_SIZE;
-
-    /* Read in more data. */
-    YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-      yy_n_chars, num_to_read );
-
-    yy_current_buffer->yy_n_chars = yy_n_chars;
-    }
-
-  if ( yy_n_chars == 0 )
-    {
-    if ( number_to_move == YY_MORE_ADJ )
-      {
-      ret_val = EOB_ACT_END_OF_FILE;
-      yyrestart( yyin );
-      }
-
-    else
-      {
-      ret_val = EOB_ACT_LAST_MATCH;
-      yy_current_buffer->yy_buffer_status =
-        YY_BUFFER_EOF_PENDING;
-      }
-    }
-
-  else
-    ret_val = EOB_ACT_CONTINUE_SCAN;
-
-  yy_n_chars += number_to_move;
-  yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-  yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-  yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
-
-  return ret_val;
-  }
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-static yy_state_type yy_get_previous_state()
-  {
-  register yy_state_type yy_current_state;
-  register char *yy_cp;
-
-  yy_current_state = yy_start;
-
-  for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-    {
-    register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-    if ( yy_accept[yy_current_state] )
-      {
-      yy_last_accepting_state = yy_current_state;
-      yy_last_accepting_cpos = yy_cp;
-      }
-    while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-      {
-      yy_current_state = (int) yy_def[yy_current_state];
-      if ( yy_current_state >= 118 )
-        yy_c = yy_meta[(unsigned int) yy_c];
-      }
-    yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-    }
-
-  return yy_current_state;
-  }
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *  next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-  {
-  register int yy_is_jam;
-  register char *yy_cp = yy_c_buf_p;
-
-  register YY_CHAR yy_c = 1;
-  if ( yy_accept[yy_current_state] )
-    {
-    yy_last_accepting_state = yy_current_state;
-    yy_last_accepting_cpos = yy_cp;
-    }
-  while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-    {
-    yy_current_state = (int) yy_def[yy_current_state];
-    if ( yy_current_state >= 118 )
-      yy_c = yy_meta[(unsigned int) yy_c];
-    }
-  yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-  yy_is_jam = (yy_current_state == 117);
-
-  return yy_is_jam ? 0 : yy_current_state;
-  }
-
-#if 0
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-  {
-  register char *yy_cp = yy_c_buf_p;
-
-  /* undo effects of setting up yytext */
-  *yy_cp = yy_hold_char;
-
-  if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-    { /* need to shift things up to make room */
-    /* +2 for EOB chars. */
-    register int number_to_move = yy_n_chars + 2;
-    register char *dest = &yy_current_buffer->yy_ch_buf[
-          yy_current_buffer->yy_buf_size + 2];
-    register char *source =
-        &yy_current_buffer->yy_ch_buf[number_to_move];
-
-    while ( source > yy_current_buffer->yy_ch_buf )
-      *--dest = *--source;
-
-    yy_cp += (int) (dest - source);
-    yy_bp += (int) (dest - source);
-    yy_current_buffer->yy_n_chars =
-      yy_n_chars = yy_current_buffer->yy_buf_size;
-
-    if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-      YY_FATAL_ERROR( "flex scanner push-back overflow" );
-    }
-
-  *--yy_cp = (char) c;
-
-
-  yytext_ptr = yy_bp;
-  yy_hold_char = *yy_cp;
-  yy_c_buf_p = yy_cp;
-  }
-#endif  /* ifndef YY_NO_UNPUT */
-#endif /* 0 */
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-  {
-  int c;
-
-  *yy_c_buf_p = yy_hold_char;
-
-  if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-    {
-    /* yy_c_buf_p now points to the character we want to return.
-     * If this occurs *before* the EOB characters, then it's a
-     * valid NUL; if not, then we've hit the end of the buffer.
-     */
-    if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-      /* This was really a NUL. */
-      *yy_c_buf_p = '\0';
-
-    else
-      { /* need more input */
-      int offset = yy_c_buf_p - yytext_ptr;
-      ++yy_c_buf_p;
-
-      switch ( yy_get_next_buffer() )
-        {
-        case EOB_ACT_LAST_MATCH:
-          /* This happens because yy_g_n_b()
-           * sees that we've accumulated a
-           * token and flags that we need to
-           * try matching the token before
-           * proceeding.  But for input(),
-           * there's no matching to consider.
-           * So convert the EOB_ACT_LAST_MATCH
-           * to EOB_ACT_END_OF_FILE.
-           */
-
-          /* Reset buffer status. */
-          yyrestart( yyin );
-
-          /* fall through */
-
-        case EOB_ACT_END_OF_FILE:
-          {
-          if ( yywrap() )
-            return EOF;
-
-          if ( ! yy_did_buffer_switch_on_eof )
-            YY_NEW_FILE;
-#ifdef __cplusplus
-          return yyinput();
-#else
-          return input();
-#endif
-          }
-
-        case EOB_ACT_CONTINUE_SCAN:
-          yy_c_buf_p = yytext_ptr + offset;
-          break;
-        }
-      }
-    }
-
-  c = *(unsigned char *) yy_c_buf_p;  /* cast for 8-bit char's */
-  *yy_c_buf_p = '\0'; /* preserve yytext */
-  yy_hold_char = *++yy_c_buf_p;
-
-
-  return c;
-  }
-
-void yyflush_current_buffer (void)
-{
-  YY_FLUSH_BUFFER;
-}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-  {
-  if ( ! yy_current_buffer )
-    yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-  yy_init_buffer( yy_current_buffer, input_file );
-  yy_load_buffer_state();
-  }
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-  {
-  if ( yy_current_buffer == new_buffer )
-    return;
-
-  if ( yy_current_buffer )
-    {
-    /* Flush out information for old buffer. */
-    *yy_c_buf_p = yy_hold_char;
-    yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-    yy_current_buffer->yy_n_chars = yy_n_chars;
-    }
-
-  yy_current_buffer = new_buffer;
-  yy_load_buffer_state();
-
-  /* We don't actually know whether we did this switch during
-   * EOF (yywrap()) processing, but the only time this flag
-   * is looked at is after yywrap() is called, so it's safe
-   * to go ahead and always set it.
-   */
-  yy_did_buffer_switch_on_eof = 1;
-  }
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-  {
-  yy_n_chars = yy_current_buffer->yy_n_chars;
-  yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-  yyin = yy_current_buffer->yy_input_file;
-  yy_hold_char = *yy_c_buf_p;
-  }
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-  {
-  YY_BUFFER_STATE b;
-
-  b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-  if ( ! b )
-    YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-  b->yy_buf_size = size;
-
-  /* yy_ch_buf has to be 2 characters longer than the size given because
-   * we need to put in 2 end-of-buffer characters.
-   */
-  b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-  if ( ! b->yy_ch_buf )
-    YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-  b->yy_is_our_buffer = 1;
-
-  yy_init_buffer( b, file );
-
-  return b;
-  }
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-  {
-  if ( ! b )
-    return;
-
-  if ( b == yy_current_buffer )
-    yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-  if ( b->yy_is_our_buffer )
-    yy_flex_free( (void *) b->yy_ch_buf );
-
-  yy_flex_free( (void *) b );
-  }
-
-
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
-  {
-  yy_flush_buffer( b );
-
-  b->yy_input_file = file;
-  b->yy_fill_buffer = 1;
-
-#if defined (ACE_HAS_WINCE)
-    // Mimic the behavior as WinCE does not have isatty().
-    if ((file != 0) && (file == ACE_OS::fileno(file))) {
-        b->yy_is_interactive = 1;
-    }
-    else {
-        b->yy_is_interactive = 0;
-    }
-#else
-  b->yy_is_interactive = file ? (ACE_OS::isatty( ACE_OS::fileno(file) ) > 0) : 0;
-#endif  // ACE_HAS_WINCE
-
-  }
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
-  {
-  if ( ! b )
-    return;
-
-  b->yy_n_chars = 0;
-
-  /* We always need two end-of-buffer characters.  The first causes
-   * a transition to the end-of-buffer state.  The second causes
-   * a jam in that state.
-   */
-  b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-  b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-  b->yy_buf_pos = &b->yy_ch_buf[0];
-
-  b->yy_at_bol = 1;
-  b->yy_buffer_status = YY_BUFFER_NEW;
-
-  if ( b == yy_current_buffer )
-    yy_load_buffer_state();
-  }
-
-
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-  {
-  YY_BUFFER_STATE b;
-
-  if ( size < 2 ||
-       base[size-2] != YY_END_OF_BUFFER_CHAR ||
-       base[size-1] != YY_END_OF_BUFFER_CHAR )
-    /* They forgot to leave room for the EOB's. */
-    return 0;
-
-  b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-  if ( ! b )
-    YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-  b->yy_buf_size = size - 2;  /* "- 2" to take care of EOB's */
-  b->yy_buf_pos = b->yy_ch_buf = base;
-  b->yy_is_our_buffer = 0;
-  b->yy_input_file = 0;
-  b->yy_n_chars = b->yy_buf_size;
-  b->yy_is_interactive = 0;
-  b->yy_at_bol = 1;
-  b->yy_fill_buffer = 0;
-  b->yy_buffer_status = YY_BUFFER_NEW;
-
-  yy_switch_to_buffer( b );
-
-  return b;
-  }
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-  {
-  int len;
-  for ( len = 0; yy_str[len]; ++len )
-    ;
-
-  return yy_scan_bytes( yy_str, len );
-  }
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-  {
-  YY_BUFFER_STATE b;
-  char *buf;
-  yy_size_t n;
-  int i;
-
-  /* Get memory for full buffer, including space for trailing EOB's. */
-  n = len + 2;
-  buf = (char *) yy_flex_alloc( n );
-  if ( ! buf )
-    YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-  for ( i = 0; i < len; ++i )
-    buf[i] = bytes[i];
-
-  buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
-  b = yy_scan_buffer( buf, n );
-  if ( ! b )
-    YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-  /* It's okay to grow etc. this buffer, and we should throw it
-   * away when we're done.
-   */
-  b->yy_is_our_buffer = 1;
-
-  return b;
-  }
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-  {
-  if ( yy_start_stack_ptr >= yy_start_stack_depth )
-    {
-    yy_size_t new_size;
-
-    yy_start_stack_depth += YY_START_STACK_INCR;
-    new_size = yy_start_stack_depth * sizeof( int );
-
-    if ( ! yy_start_stack )
-      yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-    else
-      yy_start_stack = (int *) yy_flex_realloc(
-          (void *) yy_start_stack, new_size );
-
-    if ( ! yy_start_stack )
-      YY_FATAL_ERROR(
-      "out of memory expanding start-condition stack" );
-    }
-
-  yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-  BEGIN(new_state);
-  }
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-  {
-  if ( --yy_start_stack_ptr < 0 )
-    YY_FATAL_ERROR( "start-condition stack underflow" );
-
-  BEGIN(yy_start_stack[yy_start_stack_ptr]);
-  }
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-  {
-  return yy_start_stack[yy_start_stack_ptr - 1];
-  }
-#endif
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-  {
-  (void) ACE_OS::fprintf( stderr, "%s\n", msg );
-  ACE_OS::exit( YY_EXIT_FAILURE );
-  }
-
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-  do \
-    { \
-    /* Undo effects of setting up yytext. */ \
-    yytext[yyleng] = yy_hold_char; \
-    yy_c_buf_p = yytext + n; \
-    yy_hold_char = *yy_c_buf_p; \
-    *yy_c_buf_p = '\0'; \
-    yyleng = n; \
-    } \
-  while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-  {
-  register int i;
-  for ( i = 0; i < n; ++i )
-    s1[i] = s2[i];
-  }
-#endif
-
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-  {
-  register int n;
-  for ( n = 0; s[n]; ++n )
-    ;
-
-  return n;
-  }
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-  {
-  return (void *) ACE_OS::malloc( size );
-  }
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-  {
-  /* The cast to (char *) in the following accommodates both
-   * implementations that use char* generic pointers, and those
-   * that use void* generic pointers.  It works with the latter
-   * because both ANSI C and C++ allow castless assignment from
-   * any pointer type to void*, and deal with argument conversions
-   * as though doing an assignment.
-   */
-  return (void *) ACE_OS::realloc( (char *) ptr, size );
-  }
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-  {
-  ACE_OS::free( ptr );
-  }
-
-#if YY_MAIN
-int main()
-  {
-  yylex();
-  return 0;
-  }
-#endif
-//#line 122 "ETCL/ETCL.ll"
-
-
-const char*
-extract_string(char* str)
-{
-  char *t = str;
-  for (char * i = str + 1; *i != '\''; ++i, ++t)
-    {
-      if (*i == '\\')
-        {
-          ++i;
-          if (*i == 0)
-            return 0;
-          else if (*i == 't')
-            *t = '\t';
-          else if (*i == 'n')
-            *t = '\n';
-          else if (*i == '\\')
-            *t = '\\';
-          else
-            *t = *i;
-          continue;
-        }
-
-      *t = *i;
-    }
-
-  *t = '\0';
-  return str;
-}
-
-int
-yywrap (void)
-{
-  return 1;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/ETCL/ETCL_y.cpp b/dep/acelite/ace/ETCL/ETCL_y.cpp
deleted file mode 100644
index 880b6300d..000000000
--- a/dep/acelite/ace/ETCL/ETCL_y.cpp
+++ /dev/null
@@ -1,1288 +0,0 @@
-
-/*  A Bison parser, made from ETCL/ETCL.yy
-    by GNU Bison version 1.28  */
-
-#define YYBISON 1  /* Identify Bison output.  */
-
-#define  ETCL_GT  257
-#define  ETCL_GE  258
-#define  ETCL_LT  259
-#define  ETCL_LE  260
-#define  ETCL_EQ  261
-#define  ETCL_NE  262
-#define  ETCL_EXIST 263
-#define  ETCL_DEFAULT 264
-#define  ETCL_AND 265
-#define  ETCL_OR  266
-#define  ETCL_NOT 267
-#define  ETCL_IN  268
-#define  ETCL_TWIDDLE 269
-#define  ETCL_BOOLEAN 270
-#define  ETCL_PLUS  271
-#define  ETCL_MINUS 272
-#define  ETCL_MULT  273
-#define  ETCL_DIV 274
-#define  ETCL_UMINUS  275
-#define  ETCL_INTEGER 276
-#define  ETCL_FLOAT 277
-#define  ETCL_STRING  278
-#define  ETCL_RPAREN  279
-#define  ETCL_LPAREN  280
-#define  ETCL_RBRA  281
-#define  ETCL_LBRA  282
-#define  ETCL_IDENT 283
-#define  ETCL_UNSIGNED  284
-#define  ETCL_SIGNED  285
-#define  ETCL_DOUBLE  286
-#define  ETCL_CONSTRAINT  287
-#define  ETCL_COMPONENT 288
-#define  ETCL_WITH  289
-#define  ETCL_MAX 290
-#define  ETCL_MIN 291
-#define  ETCL_FIRST 292
-#define  ETCL_RANDOM  293
-#define  ETCL_DOLLAR  294
-#define  ETCL_DOT 295
-#define  ETCL_DISCRIMINANT  296
-#define  ETCL_LENGTH  297
-#define  ETCL_TYPE_ID 298
-#define  ETCL_REPOS_ID  299
-
-
-//=============================================================================
-/**
- *  @file   ETCL_y.cpp
- *
- *  $Id: ETCL_y.cpp 93651 2011-03-28 08:49:11Z johnnyw $
- *
- *  @author Carlos O'Ryan <coryan@uci.edu> based on previous work by Seth Widoff <sbw1@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#include "ace/ETCL/ETCL_y.h"
-#include "ace/ETCL/ETCL_Constraint.h"
-#include "ace/ETCL/ETCL_Interpreter.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-extern int yylex (void);
-extern void yyflush_current_buffer (void);
-
-static void yyerror (const char *)
-{
-  // @@ TODO
-  // Ignore error messages
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include <stdio.h>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
-#endif
-
-
-
-#define  YYFINAL    114
-#define  YYFLAG   -32768
-#define  YYNTBASE 46
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 299 ? yytranslate[x] : 65)
-
-static const char yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
-     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-    17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-    27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-    37,    38,    39,    40,    41,    42,    43,    44,    45
-};
-
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     2,     4,     7,    10,    13,    15,    17,    21,    23,
-    27,    29,    33,    37,    41,    45,    49,    53,    55,    59,
-    64,    66,    70,    72,    76,    80,    82,    86,    90,    92,
-    95,    97,   101,   103,   106,   109,   111,   114,   117,   119,
-   121,   124,   128,   132,   135,   137,   138,   141,   144,   146,
-   148,   149,   152,   154,   156,   159,   161,   163,   165,   167,
-   169,   171,   176,   181,   184,   189,   190,   192,   195,   198
-};
-
-static const short yyrhs[] = {    48,
-     0,    47,     0,    37,    48,     0,    36,    48,     0,    35,
-    48,     0,    38,     0,    39,     0,    48,    12,    49,     0,
-    49,     0,    49,    11,    50,     0,    50,     0,    51,     7,
-    51,     0,    51,     8,    51,     0,    51,     3,    51,     0,
-    51,     4,    51,     0,    51,     5,    51,     0,    51,     6,
-    51,     0,    51,     0,    52,    14,    57,     0,    52,    14,
-    40,    57,     0,    52,     0,    53,    15,    53,     0,    53,
-     0,    53,    17,    54,     0,    53,    18,    54,     0,    54,
-     0,    54,    19,    55,     0,    54,    20,    55,     0,    55,
-     0,    13,    56,     0,    56,     0,    26,    48,    25,     0,
-    22,     0,    17,    22,     0,    18,    22,     0,    23,     0,
-    17,    23,     0,    18,    23,     0,    24,     0,    16,     0,
-     9,    29,     0,     9,    40,    57,     0,    10,    40,    57,
-     0,    40,    57,     0,    29,     0,     0,    41,    59,     0,
-    29,    58,     0,    60,     0,    61,     0,     0,    41,    59,
-     0,    60,     0,    61,     0,    29,    58,     0,    43,     0,
-    42,     0,    44,     0,    45,     0,    62,     0,    63,     0,
-    28,    22,    27,    58,     0,    26,    29,    25,    58,     0,
-    22,    58,     0,    26,    64,    25,    58,     0,     0,    22,
-     0,    17,    22,     0,    18,    22,     0,    24,     0
-};
-
-#endif
-
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-    92,    93,    96,    98,   100,   102,   104,   108,   110,   113,
-   115,   118,   120,   122,   124,   126,   128,   130,   133,   135,
-   137,   140,   142,   145,   147,   149,   152,   154,   156,   159,
-   161,   164,   166,   168,   170,   172,   174,   176,   178,   180,
-   182,   184,   186,   188,   190,   194,   196,   199,   202,   203,
-   206,   208,   211,   212,   215,   217,   219,   221,   223,   225,
-   226,   229,   233,   237,   241,   245,   247,   249,   251,   253
-};
-#endif
-
-
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
-
-static const char * const yytname[] = {   "$","error","$undefined.","ETCL_GT",
-"ETCL_GE","ETCL_LT","ETCL_LE","ETCL_EQ","ETCL_NE","ETCL_EXIST",
-"ETCL_DEFAULT","ETCL_AND","ETCL_OR","ETCL_NOT","ETCL_IN",
-"ETCL_TWIDDLE","ETCL_BOOLEAN","ETCL_PLUS","ETCL_MINUS","ETCL_MULT",
-"ETCL_DIV","ETCL_UMINUS","ETCL_INTEGER","ETCL_FLOAT","ETCL_STRING",
-"ETCL_RPAREN","ETCL_LPAREN","ETCL_RBRA","ETCL_LBRA","ETCL_IDENT",
-"ETCL_UNSIGNED","ETCL_SIGNED","ETCL_DOUBLE","ETCL_CONSTRAINT",
-"ETCL_COMPONENT","ETCL_WITH","ETCL_MAX","ETCL_MIN","ETCL_FIRST",
-"ETCL_RANDOM","ETCL_DOLLAR","ETCL_DOT","ETCL_DISCRIMINANT","ETCL_LENGTH",
-"ETCL_TYPE_ID","ETCL_REPOS_ID","constraint","preference","bool_or","bool_and",
-"bool_compare","expr_in","expr_twiddle","expr","term","factor_not","factor",
-"component","component_ext","component_dot","component_array","component_assoc",
-"component_pos","union_pos","union_val", 0
-};
-#endif
-
-static const short yyr1[] = {     0,
-    46,    46,    47,    47,    47,    47,    47,    48,    48,    49,
-    49,    50,    50,    50,    50,    50,    50,    50,    51,    51,
-    51,    52,    52,    53,    53,    53,    54,    54,    54,    55,
-    55,    56,    56,    56,    56,    56,    56,    56,    56,    56,
-    56,    56,    56,    56,    56,    57,    57,    57,    57,    57,
-    58,    58,    58,    58,    59,    59,    59,    59,    59,    59,
-    59,    60,    61,    62,    63,    64,    64,    64,    64,    64
-};
-
-static const short yyr2[] = {     0,
-     1,     1,     2,     2,     2,     1,     1,     3,     1,     3,
-     1,     3,     3,     3,     3,     3,     3,     1,     3,     4,
-     1,     3,     1,     3,     3,     1,     3,     3,     1,     2,
-     1,     3,     1,     2,     2,     1,     2,     2,     1,     1,
-     2,     3,     3,     2,     1,     0,     2,     2,     1,     1,
-     0,     2,     1,     1,     2,     1,     1,     1,     1,     1,
-     1,     4,     4,     2,     4,     0,     1,     2,     2,     1
-};
-
-static const short yydefact[] = {     0,
-     0,     0,     0,    40,     0,     0,    33,    36,    39,     0,
-    45,     0,     0,     0,     6,     7,    46,     2,     1,     9,
-    11,    18,    21,    23,    26,    29,    31,    41,    46,    46,
-    30,    34,    37,    35,    38,     0,     5,     4,     3,     0,
-     0,    51,     0,    44,    49,    50,     0,     0,     0,     0,
-     0,     0,     0,     0,    46,     0,     0,     0,     0,     0,
-    42,    43,    32,     0,     0,     0,    48,    53,    54,    51,
-    66,    51,    57,    56,    58,    59,    47,    60,    61,     8,
-    10,    14,    15,    16,    17,    12,    13,    46,    19,    22,
-    24,    25,    27,    28,    51,    51,    52,    64,     0,     0,
-    67,    70,     0,    55,    20,    63,    62,    68,    69,    51,
-    65,     0,     0,     0
-};
-
-static const short yydefgoto[] = {   112,
-    18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-    44,    67,    77,    68,    69,    78,    79,   103
-};
-
-static const short yypact[] = {    41,
-   -13,   -39,    94,-32768,    38,    46,-32768,-32768,-32768,    73,
--32768,    73,    73,    73,-32768,-32768,    -9,-32768,    -6,     7,
--32768,   121,    -5,    19,    55,-32768,-32768,-32768,    -9,    -9,
--32768,-32768,-32768,-32768,-32768,    21,    -6,    -6,    -6,     6,
-    25,    -2,    -1,-32768,-32768,-32768,    73,    73,    73,    73,
-    73,    73,    73,    73,   -18,    73,    73,    73,    73,    73,
--32768,-32768,-32768,    27,    29,    -1,-32768,-32768,-32768,    -2,
-    31,    -2,-32768,-32768,-32768,-32768,-32768,-32768,-32768,     7,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,    -9,-32768,    67,
-    55,    55,-32768,-32768,    -2,    -2,-32768,-32768,    44,    50,
--32768,-32768,    69,-32768,-32768,-32768,-32768,-32768,-32768,    -2,
--32768,    98,   100,-32768
-};
-
-static const short yypgoto[] = {-32768,
--32768,    95,    54,    58,    86,-32768,    59,    30,    33,   111,
-   -26,   -65,    53,   -17,   -15,-32768,-32768,-32768
-};
-
-
-#define  YYLAST   140
-
-
-static const short yytable[] = {    45,
-    30,    46,    61,    62,    98,    47,   104,    40,    55,    41,
-    42,    45,    45,    46,    46,    28,    40,    48,    41,    42,
-    70,    88,    43,    40,    71,    41,    29,    72,    89,   106,
-   107,    43,    47,    56,    64,    57,    58,    45,    66,    46,
-    73,    74,    75,    76,   111,    63,    65,    99,   100,     1,
-     2,    95,   101,     3,   102,    96,     4,     5,     6,    32,
-    33,   105,     7,     8,     9,   108,    10,    34,    35,    11,
-    45,   109,    46,    59,    60,    12,    13,    14,    15,    16,
-    17,     1,     2,    57,    58,     3,    91,    92,     4,     5,
-     6,    93,    94,   110,     7,     8,     9,   113,    10,   114,
-    80,    11,     1,     2,    36,    81,    37,    38,    39,     4,
-     5,     6,    17,    31,    90,     7,     8,     9,    97,    10,
-     0,     0,    11,    49,    50,    51,    52,    53,    54,     0,
-     0,     0,     0,    17,    82,    83,    84,    85,    86,    87
-};
-
-static const short yycheck[] = {    17,
-    40,    17,    29,    30,    70,    12,    72,    26,    14,    28,
-    29,    29,    30,    29,    30,    29,    26,    11,    28,    29,
-    22,    40,    41,    26,    26,    28,    40,    29,    55,    95,
-    96,    41,    12,    15,    29,    17,    18,    55,    41,    55,
-    42,    43,    44,    45,   110,    25,    22,    17,    18,     9,
-    10,    25,    22,    13,    24,    27,    16,    17,    18,    22,
-    23,    88,    22,    23,    24,    22,    26,    22,    23,    29,
-    88,    22,    88,    19,    20,    35,    36,    37,    38,    39,
-    40,     9,    10,    17,    18,    13,    57,    58,    16,    17,
-    18,    59,    60,    25,    22,    23,    24,     0,    26,     0,
-    47,    29,     9,    10,    10,    48,    12,    13,    14,    16,
-    17,    18,    40,     3,    56,    22,    23,    24,    66,    26,
-    -1,    -1,    29,     3,     4,     5,     6,     7,     8,    -1,
-    -1,    -1,    -1,    40,    49,    50,    51,    52,    53,    54
-};
-/* -*-C-*-  Note some compilers choke on comments on `//#line' lines.  */
-//#line 3 "/pkg/gnu/share/bison.simple"
-/* This file comes from bison-1.28.  */
-
-/* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-   instead, just don't use alloca.  */
-#include <malloc.h>
-#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-     and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
-#endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
-
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
-
-#define yyerrok   (yyerrstatus = 0)
-#define yyclearin  (yychar = YYEMPTY)
-#define YYEMPTY   -2
-#define YYEOF   0
-#define YYACCEPT  goto yyacceptlab
-#define YYABORT   goto yyabortlab
-#define YYERROR   goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-#define YYFAIL    goto yyerrlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
-do                \
-  if (yychar == YYEMPTY && yylen == 1)        \
-    { yychar = (token), yylval = (value);     \
-      yychar1 = YYTRANSLATE (yychar);       \
-      YYPOPSTACK;           \
-      goto yybackup;            \
-    }               \
-  else                \
-    { yyerror ("syntax error: cannot back up"); YYERROR; }  \
-while (0)
-
-#define YYTERROR  1
-#define YYERRCODE  256
-
-#ifndef YYPURE
-#define YYLEX   yylex()
-#endif
-
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX   yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX   yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-#define YYLEX   yylex(&yylval, YYLEX_PARAM)
-#else
-#define YYLEX   yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/* If nonreentrant, generate the variables here */
-
-#ifndef YYPURE
-
-int  yychar;      /*  the lookahead symbol    */
-YYSTYPE  yylval;      /*  the semantic value of the   */
-        /*  lookahead symbol      */
-YYSTYPE yyval;    /*  the variable used to return   */
-        /*  semantic values from the action */
-        /*  routines        */
-
-
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;     /*  location data for the lookahead */
-        /*  symbol        */
-#endif
-
-int yynerrs;      /*  number of parse errors so far       */
-#endif  /* not YYPURE */
-
-#if YYDEBUG != 0
-int yydebug;      /*  nonzero means print parse trace */
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
-#endif
-
-/*  YYINITDEPTH indicates the initial size of the parser's stacks  */
-
-#ifndef  YYINITDEPTH
-#define YYINITDEPTH 200
-#endif
-
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
-
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
-#endif
-
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
-
-#if __GNUC__ > 1    /* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)  __builtin_memcpy(TO,FROM,COUNT)
-#else       /* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#else /* __cplusplus */
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
-{
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#endif
-#endif
-
-//#line 217 "/pkg/gnu/share/bison.simple"
-
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-#ifdef YYPARSE_PARAM
-int yyparse (void *);
-#else
-int yyparse (void);
-#endif
-#endif
-
-int
-yyparse(YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;  /*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;    /*  lookahead token as an internal (translated) token number */
-
-  short  yyssa[YYINITDEPTH];  /*  the state stack     */
-  YYSTYPE yyvsa[YYINITDEPTH];  /*  the semantic value stack   */
-
-  short *yyss = yyssa;    /*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;  /*  to allow yyoverflow to reallocate them elsewhere */
-
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];  /*  the location stack     */
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
-
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
-
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
-
-  int yylen;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    ACE_OS::fprintf(stderr, "Starting parse\n");
-#endif
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;   /* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss - 1;
-  yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
-
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
-
-  *++yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
-      /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-   the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-   but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-     &yyss1, size * sizeof (*yyssp),
-     &yyvs1, size * sizeof (*yyvsp),
-     &yyls1, size * sizeof (*yylsp),
-     &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-     &yyss1, size * sizeof (*yyssp),
-     &yyvs1, size * sizeof (*yyvsp),
-     &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
-#else /* no yyoverflow */
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-  {
-    yyerror("parser stack overflow");
-    if (yyfree_stacks)
-      {
-        ACE_OS::free (yyss);
-        ACE_OS::free (yyvs);
-#ifdef YYLSP_NEEDED
-        ACE_OS::free (yyls);
-#endif
-      }
-    return 2;
-  }
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-  yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-       size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-       size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-       size * (unsigned int) sizeof (*yylsp));
-#endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
-
-#if YYDEBUG != 0
-      if (yydebug)
-        ACE_OS::fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
-
-      if (yyssp >= yyss + yystacksize - 1)
-  YYABORT;
-    }
-
-#if YYDEBUG != 0
-  if (yydebug)
-    ACE_OS::fprintf(stderr, "Entering state %d\n", yystate);
-#endif
-
-  goto yybackup;
- yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-#if YYDEBUG != 0
-      if (yydebug)
-        ACE_OS::fprintf(stderr, "Reading a token: ");
-#endif
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)    /* This means end of input. */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;   /* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-        ACE_OS::fprintf(stderr, "Now at end of input.\n");
-#endif
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
-      if (yydebug)
-  {
-    ACE_OS::fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-    /* Give the individual parser a way to print the precise meaning
-       of a token, for further debugging info.  */
-#ifdef YYPRINT
-    YYPRINT (stderr, yychar, yylval);
-#endif
-    ACE_OS::fprintf (stderr, ")\n");
-  }
-#endif
-    }
-
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
-    goto yydefault;
-
-  yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-  goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    ACE_OS::fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-/* Do the default action for the current state.  */
-yydefault:
-
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
-yyreduce:
-  yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      int i;
-
-      ACE_OS::fprintf (stderr, "Reducing via rule %d (line %d), ",
-                       yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-        ACE_OS::fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      ACE_OS::fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-
-  switch (yyn) {
-
-case 3:
-//#line 97 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Preference (ETCL_MIN, yyvsp[0].constraint); ;
-    break;}
-case 4:
-//#line 99 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Preference (ETCL_MAX, yyvsp[0].constraint); ;
-    break;}
-case 5:
-//#line 101 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Preference (ETCL_WITH, yyvsp[0].constraint); ;
-    break;}
-case 6:
-//#line 103 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Preference (ETCL_FIRST); ;
-    break;}
-case 7:
-//#line 105 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Preference (ETCL_RANDOM); ;
-    break;}
-case 8:
-//#line 109 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_OR, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 10:
-//#line 114 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_AND, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 12:
-//#line 119 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_EQ, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 13:
-//#line 121 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_NE, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 14:
-//#line 123 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_GT, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 15:
-//#line 125 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_GE, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 16:
-//#line 127 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_LT, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 17:
-//#line 129 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_LE, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 19:
-//#line 134 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_IN, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 20:
-//#line 136 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_IN, yyvsp[-3].constraint, yyvsp[0].constraint); ;
-    break;}
-case 22:
-//#line 141 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_TWIDDLE, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 24:
-//#line 146 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_PLUS, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 25:
-//#line 148 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_MINUS, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 27:
-//#line 153 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_MULT, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 28:
-//#line 155 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Binary_Expr (ETCL_DIV, yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 30:
-//#line 160 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Unary_Expr (ETCL_NOT, yyvsp[0].constraint); ;
-    break;}
-case 32:
-//#line 165 "ETCL/ETCL.yy"
-{ yyval.constraint = yyvsp[-1].constraint; ;
-    break;}
-case 33:
-//#line 167 "ETCL/ETCL.yy"
-{ yyval.constraint = yyvsp[0].constraint; ;
-    break;}
-case 34:
-//#line 169 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Unary_Expr (ETCL_PLUS, yyvsp[0].constraint); ;
-    break;}
-case 35:
-//#line 171 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Unary_Expr (ETCL_MINUS, yyvsp[0].constraint); ;
-    break;}
-case 36:
-//#line 173 "ETCL/ETCL.yy"
-{ yyval.constraint = yyvsp[0].constraint; ;
-    break;}
-case 37:
-//#line 175 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Unary_Expr (ETCL_PLUS, yyvsp[0].constraint); ;
-    break;}
-case 38:
-//#line 177 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Unary_Expr (ETCL_MINUS, yyvsp[0].constraint); ;
-    break;}
-case 39:
-//#line 179 "ETCL/ETCL.yy"
-{ yyval.constraint = yyvsp[0].constraint; ;
-    break;}
-case 40:
-//#line 181 "ETCL/ETCL.yy"
-{ yyval.constraint = yyvsp[0].constraint; ;
-    break;}
-case 41:
-//#line 183 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Exist (yyvsp[0].constraint); ;
-    break;}
-case 42:
-//#line 185 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Exist (yyvsp[0].constraint); ;
-    break;}
-case 43:
-//#line 187 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Default (yyvsp[0].constraint); ;
-    break;}
-case 44:
-//#line 189 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Eval (yyvsp[0].constraint); ;
-    break;}
-case 45:
-//#line 191 "ETCL/ETCL.yy"
-{ yyval.constraint = yyvsp[0].constraint; ;
-    break;}
-case 46:
-//#line 195 "ETCL/ETCL.yy"
-{ yyval.constraint = 0; ;
-    break;}
-case 47:
-//#line 197 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Dot (yyvsp[0].constraint); ;
-    break;}
-case 48:
-//#line 200 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Component (yyvsp[-1].constraint, yyvsp[0].constraint); ;
-    break;}
-case 51:
-//#line 207 "ETCL/ETCL.yy"
-{ yyval.constraint = 0; ;
-    break;}
-case 52:
-//#line 209 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Dot (yyvsp[0].constraint); ;
-    break;}
-case 55:
-//#line 216 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Component (yyvsp[-1].constraint, yyvsp[0].constraint); ;
-    break;}
-case 56:
-//#line 218 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Special (ETCL_LENGTH); ;
-    break;}
-case 57:
-//#line 220 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Special (ETCL_DISCRIMINANT); ;
-    break;}
-case 58:
-//#line 222 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Special (ETCL_TYPE_ID); ;
-    break;}
-case 59:
-//#line 224 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Special (ETCL_REPOS_ID); ;
-    break;}
-case 62:
-//#line 230 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Component_Array (yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 63:
-//#line 234 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Component_Assoc (yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 64:
-//#line 238 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Component_Pos (yyvsp[-1].constraint, yyvsp[0].constraint); ;
-    break;}
-case 65:
-//#line 242 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Union_Pos (yyvsp[-2].constraint, yyvsp[0].constraint); ;
-    break;}
-case 66:
-//#line 246 "ETCL/ETCL.yy"
-{ yyval.constraint = 0; ;
-    break;}
-case 67:
-//#line 248 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Union_Value (+1, yyvsp[0].constraint); ;
-    break;}
-case 68:
-//#line 250 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Union_Value (+1, yyvsp[0].constraint); ;
-    break;}
-case 69:
-//#line 252 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Union_Value (-1, yyvsp[0].constraint); ;
-    break;}
-case 70:
-//#line 254 "ETCL/ETCL.yy"
-{ yyval.constraint = new ETCL_Union_Value (yyvsp[0].constraint); ;
-    break;}
-}
-   /* the action file gets copied in in place of this dollarsign */
-//#line 543 "/pkg/gnu/share/bison.simple"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      ACE_OS::fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-        ACE_OS::fprintf (stderr, " %d", *++ssp1);
-      ACE_OS::fprintf (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
-#endif
-
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTBASE];
-
-  goto yynewstate;
-
-yyerrlab:   /* here on detecting error */
-
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
-    {
-      ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-  {
-    int size = 0;
-    char *msg;
-    int x, count;
-
-    count = 0;
-    /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-    for (x = (yyn < 0 ? -yyn : 0);
-         x < (sizeof(yytname) / sizeof(char *)); x++)
-      if (yycheck[x + yyn] == x)
-        size += ACE_OS::strlen(yytname[x]) + 15, count++;
-    msg = (char *) ACE_OS::malloc(size + 15);
-    if (msg != 0)
-      {
-        ACE_OS::strcpy(msg, "parse error");
-
-        if (count < 5)
-    {
-      count = 0;
-      for (x = (yyn < 0 ? -yyn : 0);
-           x < (sizeof(yytname) / sizeof(char *)); x++)
-        if (yycheck[x + yyn] == x)
-          {
-            ACE_OS::strcat(msg, count == 0 ? ", expecting `" : " or `");
-            ACE_OS::strcat(msg, yytname[x]);
-            ACE_OS::strcat(msg, "'");
-            count++;
-          }
-    }
-        yyerror(msg);
-        ACE_OS::free(msg);
-      }
-    else
-      yyerror ("parse error; also virtual memory exceeded");
-  }
-      else
-#endif /* YYERROR_VERBOSE */
-  yyerror("parse error");
-    }
-
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
-
-  if (yyerrstatus == 3)
-    {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-  YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-        ACE_OS::fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
-
-  yyerrstatus = 3;    /* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-yyerrdefault:  /* current state does not do anything special for the error token. */
-
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
-#endif
-
-yyerrpop:   /* pop the current state because it cannot handle the error token */
-
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      ACE_OS::fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-        ACE_OS::fprintf (stderr, " %d", *++ssp1);
-      ACE_OS::fprintf (stderr, "\n");
-    }
-#endif
-
-yyerrhandle:
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-  goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrpop;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    ACE_OS::fprintf(stderr, "Shifting error token, ");
-#endif
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  yystate = yyn;
-  goto yynewstate;
-
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      ACE_OS::free (yyss);
-      ACE_OS::free (yyvs);
-#ifdef YYLSP_NEEDED
-      ACE_OS::free (yyls);
-#endif
-    }
-  return 0;
-
- yyabortlab:
-  /* YYABORT comes here.  */
-
-  /* Flush out yy_current_buffer before next parse.  Since there is
-     no error recovery, the buffer could still contain tokens from this
-     parse. */
-  yyflush_current_buffer();
-
-  if (yyfree_stacks)
-    {
-      ACE_OS::free (yyss);
-      ACE_OS::free (yyvs);
-#ifdef YYLSP_NEEDED
-      ACE_OS::free (yyls);
-#endif
-    }
-  return 1;
-}
-//#line 257 "ETCL/ETCL.yy"
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/ETCL/ETCL_y.h b/dep/acelite/ace/ETCL/ETCL_y.h
deleted file mode 100644
index 577296e9e..000000000
--- a/dep/acelite/ace/ETCL/ETCL_y.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id: ETCL_y.h 81458 2008-04-28 11:31:49Z johnnyw $
-#define  ETCL_GT  257
-#define  ETCL_GE  258
-#define  ETCL_LT  259
-#define  ETCL_LE  260
-#define  ETCL_EQ  261
-#define  ETCL_NE  262
-#define  ETCL_EXIST 263
-#define  ETCL_DEFAULT 264
-#define  ETCL_AND 265
-#define  ETCL_OR  266
-#define  ETCL_NOT 267
-#define  ETCL_IN  268
-#define  ETCL_TWIDDLE 269
-#define  ETCL_BOOLEAN 270
-#define  ETCL_PLUS  271
-#define  ETCL_MINUS 272
-#define  ETCL_MULT  273
-#define  ETCL_DIV 274
-#define  ETCL_UMINUS  275
-#define  ETCL_INTEGER 276
-#define  ETCL_FLOAT 277
-#define  ETCL_STRING  278
-#define  ETCL_RPAREN  279
-#define  ETCL_LPAREN  280
-#define  ETCL_RBRA  281
-#define  ETCL_LBRA  282
-#define  ETCL_IDENT 283
-#define  ETCL_UNSIGNED  284
-#define  ETCL_SIGNED  285
-#define  ETCL_DOUBLE  286
-#define  ETCL_CONSTRAINT  287
-#define  ETCL_COMPONENT 288
-#define  ETCL_WITH  289
-#define  ETCL_MAX 290
-#define  ETCL_MIN 291
-#define  ETCL_FIRST 292
-#define  ETCL_RANDOM  293
-#define  ETCL_DOLLAR  294
-#define  ETCL_DOT 295
-#define  ETCL_DISCRIMINANT  296
-#define  ETCL_LENGTH  297
-#define  ETCL_TYPE_ID 298
-#define  ETCL_REPOS_ID  299
-
diff --git a/dep/acelite/ace/ETCL/ace_etcl_export.h b/dep/acelite/ace/ETCL/ace_etcl_export.h
deleted file mode 100644
index 561d99f85..000000000
--- a/dep/acelite/ace/ETCL/ace_etcl_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id: ace_etcl_export.h 81458 2008-04-28 11:31:49Z johnnyw $
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef ACE_ETCL_EXPORT_H
-#define ACE_ETCL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS)
-#  if !defined (ACE_ETCL_HAS_DLL)
-#    define ACE_ETCL_HAS_DLL 0
-#  endif /* ! ACE_ETCL_HAS_DLL */
-#else
-#  if !defined (ACE_ETCL_HAS_DLL)
-#    define ACE_ETCL_HAS_DLL 1
-#  endif /* ! ACE_ETCL_HAS_DLL */
-#endif
-
-#if defined (ACE_ETCL_HAS_DLL) && (ACE_ETCL_HAS_DLL == 1)
-#  if defined (ACE_ETCL_BUILD_DLL)
-#    define ACE_ETCL_Export ACE_Proper_Export_Flag
-#    define ACE_ETCL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ACE_ETCL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ACE_ETCL_BUILD_DLL */
-#    define ACE_ETCL_Export ACE_Proper_Import_Flag
-#    define ACE_ETCL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ACE_ETCL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ACE_ETCL_BUILD_DLL */
-#else /* ACE_ETCL_HAS_DLL == 1 */
-#  define ACE_ETCL_Export
-#  define ACE_ETCL_SINGLETON_DECLARATION(T)
-#  define ACE_ETCL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ACE_ETCL_HAS_DLL == 1 */
-
-#endif /* ACE_ETCL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/ETCL/etcl_parser_export.h b/dep/acelite/ace/ETCL/etcl_parser_export.h
deleted file mode 100644
index 678d25b46..000000000
--- a/dep/acelite/ace/ETCL/etcl_parser_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id: etcl_parser_export.h 81640 2008-05-07 19:04:11Z parsons $
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef ETCL_PARSER_EXPORT_H
-#define ETCL_PARSER_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS)
-#  if !defined (ETCL_PARSER_HAS_DLL)
-#    define ETCL_PARSER_HAS_DLL 0
-#  endif /* ! ETCL_PARSER_HAS_DLL */
-#else
-#  if !defined (ETCL_PARSER_HAS_DLL)
-#    define ETCL_PARSER_HAS_DLL 1
-#  endif /* ! ETCL_PARSER_HAS_DLL */
-#endif
-
-#if defined (ETCL_PARSER_HAS_DLL) && (ETCL_PARSER_HAS_DLL == 1)
-#  if defined (ETCL_PARSER_BUILD_DLL)
-#    define ETCL_Parser_Export ACE_Proper_Export_Flag
-#    define ETCL_PARSER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ETCL_PARSER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ETCL_PARSER_BUILD_DLL */
-#    define ETCL_Parser_Export ACE_Proper_Import_Flag
-#    define ETCL_PARSER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ETCL_PARSER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ETCL_PARSER_BUILD_DLL */
-#else /* ETCL_PARSER_HAS_DLL == 1 */
-#  define ETCL_Parser_Export
-#  define ETCL_PARSER_SINGLETON_DECLARATION(T)
-#  define ETCL_PARSER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ETCL_PARSER_HAS_DLL == 1 */
-
-#endif /* ETCL_PARSER_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/Event.cpp b/dep/acelite/ace/Event.cpp
index 40eef30b0..6352e2838 100644
--- a/dep/acelite/ace/Event.cpp
+++ b/dep/acelite/ace/Event.cpp
@@ -1,4 +1,4 @@
-// $Id: Event.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Event.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Event.h"
 
@@ -6,88 +6,37 @@
 #include "ace/Event.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
-
-
+#include "ace/Log_Category.h"
+#include "ace/Condition_Attributes.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Event::ACE_Event (int manual_reset,
-                      int initial_state,
-                      int type,
-                      const ACE_TCHAR *name,
-                      void *arg,
-                      LPSECURITY_ATTRIBUTES sa)
-  : removed_ (false)
+template <class TIME_POLICY>
+ACE_Event_T<TIME_POLICY>::ACE_Event_T (int manual_reset,
+                                       int initial_state,
+                                       int type,
+                                       const ACE_TCHAR *name,
+                                       void *arg,
+                                       LPSECURITY_ATTRIBUTES sa)
+  : ACE_Event_Base ()
 {
+  ACE_Condition_Attributes_T<TIME_POLICY> cond_attr (type);
   if (ACE_OS::event_init (&this->handle_,
+                          type,
+                          &const_cast<ACE_condattr_t&> (cond_attr.attributes ()),
                           manual_reset,
                           initial_state,
-                          type,
                           name,
                           arg,
                           sa) != 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
-                ACE_TEXT ("ACE_Event::ACE_Event")));
+                ACE_TEXT ("ACE_Event_T<TIME_POLICY>::ACE_Event_T")));
 }
 
-ACE_Event::~ACE_Event (void)
+template <class TIME_POLICY>
+ACE_Event_T<TIME_POLICY>::~ACE_Event_T (void)
 {
-  this->remove ();
-}
-
-int
-ACE_Event::remove (void)
-{
-  int result = 0;
-  if (!this->removed_)
-    {
-      this->removed_ = true;
-      result = ACE_OS::event_destroy (&this->handle_);
-    }
-  return result;
-}
-
-int
-ACE_Event::wait (void)
-{
-  return ACE_OS::event_wait (&this->handle_);
-}
-
-int
-ACE_Event::wait (const ACE_Time_Value *abstime, int use_absolute_time)
-{
-  return ACE_OS::event_timedwait (&this->handle_,
-                                  const_cast <ACE_Time_Value *> (abstime),
-                                  use_absolute_time);
-}
-
-int
-ACE_Event::signal (void)
-{
-  return ACE_OS::event_signal (&this->handle_);
-}
-
-int
-ACE_Event::pulse (void)
-{
-  return ACE_OS::event_pulse (&this->handle_);
-}
-
-int
-ACE_Event::reset (void)
-{
-  return ACE_OS::event_reset (&this->handle_);
-}
-
-void
-ACE_Event::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Event.h b/dep/acelite/ace/Event.h
index 887b504d8..9249b46d8 100644
--- a/dep/acelite/ace/Event.h
+++ b/dep/acelite/ace/Event.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Event.h
  *
- *  $Id: Event.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: Event.h 96220 2012-11-06 10:03:41Z mcorino $
  *
  *   Moved from Synch.h.
  *
@@ -22,12 +22,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/OS_NS_Thread.h"
+#include "ace/Event_Base.h"
+#include "ace/Time_Policy.h"
+#include "ace/Time_Value_T.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
- * @class ACE_Event
+ * @class ACE_Event_T
  *
  * @brief A wrapper around the Win32 event locking mechanism.
  *
@@ -36,108 +38,58 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * process-scope locking support.  However, only Win32 platforms
  * support global naming and system-scope locking support.
  */
-class ACE_Export ACE_Event
+template <class TIME_POLICY = ACE_System_Time_Policy>
+class ACE_Event_T : public ACE_Event_Base
 {
 public:
   /// Constructor that creates event.
-  ACE_Event (int manual_reset = 0,
-             int initial_state = 0,
-             int type = USYNC_THREAD,
-             const ACE_TCHAR *name = 0,
-             void *arg = 0,
-             LPSECURITY_ATTRIBUTES sa = 0);
+  ACE_Event_T (int manual_reset = 0,
+               int initial_state = 0,
+               int type = USYNC_THREAD,
+               const ACE_TCHAR *name = 0,
+               void *arg = 0,
+               LPSECURITY_ATTRIBUTES sa = 0);
 
   /// Implicitly destroy the event variable.
-  ~ACE_Event (void);
+  virtual ~ACE_Event_T (void);
 
-  /**
-   * Explicitly destroy the event variable.  Note that only one thread
-   * should call this method since it doesn't protect against race
-   * conditions.
-   */
-  int remove (void);
+  /// Get the current time of day according to the queue's TIME_POLICY.
+  /// Allows users to initialize timeout values using correct time policy.
+  ACE_Time_Value_T<TIME_POLICY> gettimeofday (void) const;
 
-  /// Underlying handle to event.
-  ACE_event_t handle (void) const;
-
-  /**
-   * Set the underlying handle to event. Note that this method assumes
-   * ownership of the <handle> and will close it down in <remove>.  If
-   * you want the <handle> to stay open when <remove> is called make
-   * sure to call <dup> on the <handle> before closing it.  You are
-   * responsible for the closing the existing <handle> before
-   * overwriting it.
-   */
-  void handle (ACE_event_t new_handle);
-
-  /**
-   * if MANUAL reset
-   *    sleep till the event becomes signaled
-   *    event remains signaled after wait() completes.
-   * else AUTO reset
-   *    sleep till the event becomes signaled
-   *    event resets wait() completes.
-   */
-  int wait (void);
-
-  /// Same as wait() above, but this one can be timed
-  /// @a abstime is absolute time-of-day if if @a use_absolute_time
-  /// is non-0, else it is relative time.
-  int wait (const ACE_Time_Value *abstime,
-            int use_absolute_time = 1);
-
-  /**
-   * if MANUAL reset
-   *    wake up all waiting threads
-   *    set to signaled state
-   * else AUTO reset
-   *    if no thread is waiting, set to signaled state
-   *    if thread(s) are waiting, wake up one waiting thread and
-   *    reset event
-   */
-  int signal (void);
-
-  /**
-   * if MANUAL reset
-   *    wakeup all waiting threads and
-   *    reset event
-   * else AUTO reset
-   *    wakeup one waiting thread (if present) and
-   *    reset event
-   */
-  int pulse (void);
-
-  /// Set to nonsignaled state.
-  int reset (void);
-
-  /// Dump the state of an object.
-  void dump (void) const;
+  /// Allows applications to control how the event gets the time
+  /// of day.
+  void set_time_policy (TIME_POLICY const & time_policy);
 
   /// Declare the dynamic allocation hooks
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
-  /// The underlying handle.
-  ACE_event_t handle_;
 
-  /// Keeps track of whether <remove> has been called yet to avoid
-  /// multiple <remove> calls, e.g., explicitly and implicitly in the
-  /// destructor.  This flag isn't protected by a lock, so make sure
-  /// that you don't have multiple threads simultaneously calling
-  /// <remove> on the same object, which is a bad idea anyway...
-  bool removed_;
+  /// The policy to return the current time of day
+  TIME_POLICY time_policy_;
 
 private:
   // = Prevent copying.
-  ACE_Event (const ACE_Event& event);
-  const ACE_Event &operator= (const ACE_Event &rhs);
+  ACE_Event_T (const ACE_Event_T<TIME_POLICY>& event);
+  const ACE_Event_T &operator= (const ACE_Event_T<TIME_POLICY> &rhs);
 };
 
+typedef ACE_Event_T<ACE_System_Time_Policy> ACE_Event;
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Event.inl"
 #endif /* __ACE_INLINE__ */
 
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "ace/Event.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Event.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
 #include /**/ "ace/post.h"
 #endif /* ACE_EVENT_H */
diff --git a/dep/acelite/ace/Event.inl b/dep/acelite/ace/Event.inl
index ae0805c95..5be6f513c 100644
--- a/dep/acelite/ace/Event.inl
+++ b/dep/acelite/ace/Event.inl
@@ -1,18 +1,20 @@
 // -*- C++ -*-
-// $Id: Event.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Event.inl 96220 2012-11-06 10:03:41Z mcorino $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_INLINE ACE_event_t
-ACE_Event::handle (void) const
+template <class TIME_POLICY>
+ACE_Time_Value_T<TIME_POLICY>
+ACE_Event_T<TIME_POLICY>::gettimeofday (void) const
 {
-  return this->handle_;
+  return this->time_policy_ ();
 }
 
-ACE_INLINE void
-ACE_Event::handle (ACE_event_t new_handle)
+template <class TIME_POLICY>
+void
+ACE_Event_T<TIME_POLICY>::set_time_policy (TIME_POLICY const & rhs)
 {
-  this->handle_ = new_handle;
+  this->time_policy_ = rhs;
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Event_Base.cpp b/dep/acelite/ace/Event_Base.cpp
new file mode 100644
index 000000000..221ccd515
--- /dev/null
+++ b/dep/acelite/ace/Event_Base.cpp
@@ -0,0 +1,76 @@
+// $Id: Event_Base.cpp 96985 2013-04-11 15:50:32Z huangh $
+
+#include "ace/Event_Base.h"
+
+#if !defined (__ACE_INLINE__)
+#include "ace/Event_Base.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/Log_Category.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_Event_Base::ACE_Event_Base ()
+  : removed_ (false)
+{
+}
+
+ACE_Event_Base::~ACE_Event_Base (void)
+{
+  this->remove ();
+}
+
+int
+ACE_Event_Base::remove (void)
+{
+  int result = 0;
+  if (!this->removed_)
+    {
+      this->removed_ = true;
+      result = ACE_OS::event_destroy (&this->handle_);
+    }
+  return result;
+}
+
+int
+ACE_Event_Base::wait (void)
+{
+  return ACE_OS::event_wait (&this->handle_);
+}
+
+int
+ACE_Event_Base::wait (const ACE_Time_Value *abstime, int use_absolute_time)
+{
+  return ACE_OS::event_timedwait (&this->handle_,
+                                  const_cast <ACE_Time_Value *> (abstime),
+                                  use_absolute_time);
+}
+
+int
+ACE_Event_Base::signal (void)
+{
+  return ACE_OS::event_signal (&this->handle_);
+}
+
+int
+ACE_Event_Base::pulse (void)
+{
+  return ACE_OS::event_pulse (&this->handle_);
+}
+
+int
+ACE_Event_Base::reset (void)
+{
+  return ACE_OS::event_reset (&this->handle_);
+}
+
+void
+ACE_Event_Base::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Event_Base.h b/dep/acelite/ace/Event_Base.h
new file mode 100644
index 000000000..ed90a13ba
--- /dev/null
+++ b/dep/acelite/ace/Event_Base.h
@@ -0,0 +1,141 @@
+// -*- C++ -*-
+
+//==========================================================================
+/**
+ *  @file    Event_Base.h
+ *
+ *  $Id: Event_Base.h 96220 2012-11-06 10:03:41Z mcorino $
+ *
+ *   Moved from Synch.h.
+ *
+ *  @author Martin Corino <mcorino@remedy.nl>
+ */
+//==========================================================================
+
+#ifndef ACE_EVENT_BASE_H
+#define ACE_EVENT_BASE_H
+#include /**/ "ace/pre.h"
+
+#include /**/ "ace/ACE_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/OS_NS_Thread.h"
+#include "ace/Time_Value.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class ACE_Event_Base
+ *
+ * @brief A base class for wrappers around the Win32 event locking
+ *        mechanism.
+ *
+ * Portable implementation of an Event mechanism, which is native to
+ * Win32, but must be emulated on UNIX.  All platforms support
+ * process-scope locking support.  However, only Win32 platforms
+ * support global naming and system-scope locking support.
+ */
+class ACE_Export ACE_Event_Base
+{
+public:
+  /// Implicitly destroy the event variable.
+  virtual ~ACE_Event_Base (void);
+
+  /**
+   * Explicitly destroy the event variable.  Note that only one thread
+   * should call this method since it doesn't protect against race
+   * conditions.
+   */
+  int remove (void);
+
+  /// Underlying handle to event.
+  ACE_event_t handle (void) const;
+
+  /**
+   * Set the underlying handle to event. Note that this method assumes
+   * ownership of the <handle> and will close it down in <remove>.  If
+   * you want the <handle> to stay open when <remove> is called make
+   * sure to call <dup> on the <handle> before closing it.  You are
+   * responsible for the closing the existing <handle> before
+   * overwriting it.
+   */
+  void handle (ACE_event_t new_handle);
+
+  /**
+   * if MANUAL reset
+   *    sleep till the event becomes signaled
+   *    event remains signaled after wait() completes.
+   * else AUTO reset
+   *    sleep till the event becomes signaled
+   *    event resets wait() completes.
+   */
+  int wait (void);
+
+  /// Same as wait() above, but this one can be timed
+  /// @a abstime is absolute time-of-day if if @a use_absolute_time
+  /// is non-0, else it is relative time.
+  int wait (const ACE_Time_Value *abstime,
+            int use_absolute_time = 1);
+
+  /**
+   * if MANUAL reset
+   *    wake up all waiting threads
+   *    set to signaled state
+   * else AUTO reset
+   *    if no thread is waiting, set to signaled state
+   *    if thread(s) are waiting, wake up one waiting thread and
+   *    reset event
+   */
+  int signal (void);
+
+  /**
+   * if MANUAL reset
+   *    wakeup all waiting threads and
+   *    reset event
+   * else AUTO reset
+   *    wakeup one waiting thread (if present) and
+   *    reset event
+   */
+  int pulse (void);
+
+  /// Set to nonsignaled state.
+  int reset (void);
+
+  /// Dump the state of an object.
+  void dump (void) const;
+
+  /// Declare the dynamic allocation hooks
+  ACE_ALLOC_HOOK_DECLARE;
+
+protected:
+  /// Only derived classes allowed to construct event.
+  ACE_Event_Base ();
+
+
+  /// The underlying handle.
+  ACE_event_t handle_;
+
+  /// Keeps track of whether <remove> has been called yet to avoid
+  /// multiple <remove> calls, e.g., explicitly and implicitly in the
+  /// destructor.  This flag isn't protected by a lock, so make sure
+  /// that you don't have multiple threads simultaneously calling
+  /// <remove> on the same object, which is a bad idea anyway...
+  bool removed_;
+
+private:
+  // = Prevent copying.
+  ACE_Event_Base (const ACE_Event_Base& event);
+  const ACE_Event_Base &operator= (const ACE_Event_Base &rhs);
+};
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
+#include "ace/Event_Base.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+#endif /* ACE_EVENT_BASE_H */
diff --git a/dep/acelite/ace/Event_Base.inl b/dep/acelite/ace/Event_Base.inl
new file mode 100644
index 000000000..1372f7e9f
--- /dev/null
+++ b/dep/acelite/ace/Event_Base.inl
@@ -0,0 +1,18 @@
+// -*- C++ -*-
+// $Id: Event_Base.inl 96220 2012-11-06 10:03:41Z mcorino $
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE ACE_event_t
+ACE_Event_Base::handle (void) const
+{
+  return this->handle_;
+}
+
+ACE_INLINE void
+ACE_Event_Base::handle (ACE_event_t new_handle)
+{
+  this->handle_ = new_handle;
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Event_Handler.cpp b/dep/acelite/ace/Event_Handler.cpp
index fdeacd6d7..c6ea62b6a 100644
--- a/dep/acelite/ace/Event_Handler.cpp
+++ b/dep/acelite/ace/Event_Handler.cpp
@@ -1,5 +1,5 @@
 // Event_Handler.cpp
-// $Id: Event_Handler.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Event_Handler.cpp 97856 2014-08-29 11:30:58Z johnnyw $
 
 #include "ace/Event_Handler.h"
 #include "ace/OS_Errno.h"
@@ -14,8 +14,6 @@
 
 #include <algorithm>
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Implement conceptually abstract virtual functions in the base class
@@ -374,6 +372,26 @@ ACE_Event_Handler_var::reset (ACE_Event_Handler *p)
   *this = p;
 }
 
+#if defined (ACE_HAS_CPP11)
+ACE_Event_Handler_var::operator bool() const
+{
+  return this->ptr_ == nullptr ? false : true;
+}
+
+bool
+ACE_Event_Handler_var::operator ==(std::nullptr_t) const
+{
+  return this->ptr_ == nullptr ? true : false;
+}
+
+bool
+ACE_Event_Handler_var::operator !=(std::nullptr_t) const
+{
+  return this->ptr_ == nullptr ? false : true;
+
+}
+#endif /* ACE_HAS_CPP11 */
+
 // ---------------------------------------------------------------------
 
 ACE_Notification_Buffer::ACE_Notification_Buffer (void)
diff --git a/dep/acelite/ace/Event_Handler.h b/dep/acelite/ace/Event_Handler.h
index fe5d1de74..559edd1c4 100644
--- a/dep/acelite/ace/Event_Handler.h
+++ b/dep/acelite/ace/Event_Handler.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Event_Handler.h
  *
- *  $Id: Event_Handler.h 92345 2010-10-24 12:39:33Z johnnyw $
+ *  $Id: Event_Handler.h 97856 2014-08-29 11:30:58Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -316,9 +316,7 @@ private:
  */
 class ACE_Export ACE_Event_Handler_var
 {
-
 public:
-
   /// Default constructor.
   ACE_Event_Handler_var (void);
 
@@ -349,16 +347,55 @@ public:
   /// Reset the handler.
   void reset (ACE_Event_Handler *p = 0);
 
+#if defined (ACE_HAS_CPP11)
+  /// Bool operator to check if the ACE_Event_Handler_var has a value
+  explicit operator bool() const;
+  /// Equality operator to compare with nullptr_t
+  bool operator ==(std::nullptr_t) const;
+  /// Not equal operator to compare with nullptr_t
+  bool operator !=(std::nullptr_t) const;
+#endif
+
 private:
 
   /// Handler.
   ACE_Event_Handler *ptr_;
 };
 
+#if defined ACE_HAS_CPP11
+
+/// Define that we can use in user code to check if this
+/// helper factory method is there
+#define ACE_HAS_ACE_MAKE_EVENT_HANDLER
+
+namespace ACE
+{
+  /// With C++11 it is common to not use C++ new and delete, but
+  /// use std::make_shared and std::make_unique. This will not
+  /// work for ACE event handlers so we introduce a new
+  /// ACE::make_event_handler which can be used in user code to
+  /// allocate a new ACE event handler instance and directly assign
+  /// it to a ACE_Event_Handler_var
+  /// As user this now makes it for example possible to implement
+  /// the following when Simple_Handler is derived from ACE_Event_Handler
+  /// ACE_Event_Handler_var v =
+  ///   ACE::make_event_handler<Simple_Handler> (reactor.get());
+  template<class T,
+           typename = typename
+             std::enable_if<std::is_base_of<ACE_Event_Handler, T>::value>::type,
+           typename ...Args> inline
+  ACE_Event_Handler_var make_event_handler (Args&& ...args)
+  {
+    return ACE_Event_Handler_var (new T (std::forward<Args> (args)...));
+  }
+}
+
+#endif
+
 /**
  * @class ACE_Notification_Buffer
  *
- * @brief Simple wrapper for passing <ACE_Event_Handler *>s and
+ * @brief Simple wrapper for passing ACE_Event_Handler *s and
  * ACE_Reactor_Masks between threads.
  */
 class ACE_Export ACE_Notification_Buffer
diff --git a/dep/acelite/ace/FIFO.cpp b/dep/acelite/ace/FIFO.cpp
index a4d7ba1d0..f7fc5fefb 100644
--- a/dep/acelite/ace/FIFO.cpp
+++ b/dep/acelite/ace/FIFO.cpp
@@ -1,4 +1,4 @@
-// $Id: FIFO.cpp 94034 2011-05-09 19:11:03Z johnnyw $
+// $Id: FIFO.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/FIFO.h"
 
@@ -6,7 +6,7 @@
 #include "ace/FIFO.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_sys_stat.h"
@@ -22,9 +22,9 @@ ACE_FIFO::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("rendezvous_ = %s"), this->rendezvous_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("rendezvous_ = %s"), this->rendezvous_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -51,7 +51,7 @@ ACE_FIFO::ACE_FIFO (const ACE_TCHAR *fifo_name,
 {
   ACE_TRACE ("ACE_FIFO::ACE_FIFO");
   if (this->open (fifo_name, flags, perms, sa) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_FIFO")));
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_FIFO")));
 }
 
 ACE_FIFO::ACE_FIFO (void)
diff --git a/dep/acelite/ace/FIFO_Recv.cpp b/dep/acelite/ace/FIFO_Recv.cpp
index 37700ddaf..1a573850a 100644
--- a/dep/acelite/ace/FIFO_Recv.cpp
+++ b/dep/acelite/ace/FIFO_Recv.cpp
@@ -1,7 +1,7 @@
-// $Id: FIFO_Recv.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: FIFO_Recv.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/FIFO_Recv.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_fcntl.h"
 
 #if !defined (__ACE_INLINE__)
@@ -19,10 +19,10 @@ ACE_FIFO_Recv::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO_Recv::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_FIFO::dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -82,7 +82,7 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (const ACE_TCHAR *fifo_name,
                                  perms,
                                  persistent,
                                  sa) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_FIFO_Recv")));
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_FIFO_Recv")));
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/FIFO_Recv_Msg.cpp b/dep/acelite/ace/FIFO_Recv_Msg.cpp
index 9d041d558..eb9d93dca 100644
--- a/dep/acelite/ace/FIFO_Recv_Msg.cpp
+++ b/dep/acelite/ace/FIFO_Recv_Msg.cpp
@@ -1,8 +1,8 @@
-// $Id: FIFO_Recv_Msg.cpp 93359 2011-02-11 11:33:12Z mcorino $
+// $Id: FIFO_Recv_Msg.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/FIFO_Recv_Msg.h"
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/FIFO_Recv_Msg.inl"
@@ -59,7 +59,7 @@ ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const ACE_TCHAR *fifo_name,
                                      perms,
                                      persistent,
                                      sa) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_FIFO_Recv_Msg")));
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_FIFO_Recv_Msg")));
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/FIFO_Recv_Msg.inl b/dep/acelite/ace/FIFO_Recv_Msg.inl
index d6dfc369d..d3215fb76 100644
--- a/dep/acelite/ace/FIFO_Recv_Msg.inl
+++ b/dep/acelite/ace/FIFO_Recv_Msg.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: FIFO_Recv_Msg.inl 91813 2010-09-17 07:52:52Z johnnyw $
+// $Id: FIFO_Recv_Msg.inl 97246 2013-08-07 07:10:20Z johnnyw $
 
 #include "ace/Min_Max.h"
 #include "ace/OS_NS_stropts.h"
@@ -32,7 +32,7 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg)
 #else /* Do the ol' 2-read trick... */
   if (ACE_OS::read (this->get_handle (),
                     (char *) &recv_msg.len,
-                    sizeof recv_msg.len) != sizeof recv_msg.len)
+                    sizeof recv_msg.len) != (ssize_t) sizeof recv_msg.len)
     {
       return -1;
     }
diff --git a/dep/acelite/ace/FIFO_Send.cpp b/dep/acelite/ace/FIFO_Send.cpp
index 93df476ae..64e1b9a72 100644
--- a/dep/acelite/ace/FIFO_Send.cpp
+++ b/dep/acelite/ace/FIFO_Send.cpp
@@ -1,7 +1,7 @@
-// $Id: FIFO_Send.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: FIFO_Send.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/FIFO_Send.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/FIFO_Send.inl"
@@ -50,7 +50,7 @@ ACE_FIFO_Send::ACE_FIFO_Send (const ACE_TCHAR *fifo_name,
                                  flags,
                                  perms,
                                  sa) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send")));
 }
diff --git a/dep/acelite/ace/FIFO_Send_Msg.cpp b/dep/acelite/ace/FIFO_Send_Msg.cpp
index a54295c27..bc63ef993 100644
--- a/dep/acelite/ace/FIFO_Send_Msg.cpp
+++ b/dep/acelite/ace/FIFO_Send_Msg.cpp
@@ -1,8 +1,8 @@
-// $Id: FIFO_Send_Msg.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: FIFO_Send_Msg.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/FIFO_Send_Msg.h"
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_sys_uio.h"
 
 #if !defined (__ACE_INLINE__)
@@ -74,7 +74,7 @@ ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const ACE_TCHAR *fifo_name,
 {
   ACE_TRACE ("ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg");
   if (this->ACE_FIFO_Send_Msg::open (fifo_name, flags, perms, sa) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_FIFO_Send_Msg")));
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_FIFO_Send_Msg")));
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/FILE_Addr.cpp b/dep/acelite/ace/FILE_Addr.cpp
index a20e2a974..4ab5db9e9 100644
--- a/dep/acelite/ace/FILE_Addr.cpp
+++ b/dep/acelite/ace/FILE_Addr.cpp
@@ -1,8 +1,8 @@
-// $Id: FILE_Addr.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: FILE_Addr.cpp 97921 2014-10-10 21:58:31Z shuston $
 
 #include "ace/FILE_Addr.h"
 #include "ace/Lib_Find.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/sys/os_socket.h"
@@ -28,15 +28,21 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa)
 {
   if (sa.get_type () == AF_ANY)
     {
-#if defined (ACE_DEFAULT_TEMP_FILE)
+#if defined (ACE_DISABLE_MKTEMP)
+      // Built without mktemp support; punt back to caller.
+      errno = ENOTSUP;
+      return -1;
+#else
+
+#  if defined (ACE_DEFAULT_TEMP_FILE)
       // Create a temporary file.
       ACE_OS::strcpy (this->filename_,
                       ACE_DEFAULT_TEMP_FILE);
-#else /* ACE_DEFAULT_TEMP_FILE */
+#  else /* ACE_DEFAULT_TEMP_FILE */
       if (ACE::get_temp_dir (this->filename_, MAXPATHLEN - 15) == -1)
         // -15 for ace-file-XXXXXX
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("Temporary path too long, ")
                       ACE_TEXT ("defaulting to current directory\n")));
           this->filename_[0] = 0;
@@ -45,12 +51,13 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa)
       // Add the filename to the end
       ACE_OS::strcat (this->filename_, ACE_TEXT ("ace-fileXXXXXX"));
 
-#endif /* ACE_DEFAULT_TEMP_FILE */
+#  endif /* ACE_DEFAULT_TEMP_FILE */
 
       if (ACE_OS::mktemp (this->filename_) == 0)
         return -1;
       this->base_set (AF_FILE,
                       static_cast<int> (ACE_OS::strlen (this->filename_) + 1));
+#endif /* ACE_DISABLE_MKTEMP */
     }
   else
     {
@@ -116,9 +123,9 @@ ACE_FILE_Addr::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FILE_Addr::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("filename_ = %s"), this->filename_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("filename_ = %s"), this->filename_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/FILE_Connector.cpp b/dep/acelite/ace/FILE_Connector.cpp
index c27a5cec6..834004d43 100644
--- a/dep/acelite/ace/FILE_Connector.cpp
+++ b/dep/acelite/ace/FILE_Connector.cpp
@@ -1,4 +1,4 @@
-// $Id: FILE_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: FILE_Connector.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/FILE_Connector.h"
 #include "ace/Handle_Ops.h"
@@ -20,9 +20,9 @@ ACE_FILE_Connector::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FILE_Connector::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/FILE_Connector.h b/dep/acelite/ace/FILE_Connector.h
index 624ab3d6a..81678dadb 100644
--- a/dep/acelite/ace/FILE_Connector.h
+++ b/dep/acelite/ace/FILE_Connector.h
@@ -4,7 +4,7 @@
 /**
  *  @file    FILE_Connector.h
  *
- *  $Id: FILE_Connector.h 82723 2008-09-16 09:35:44Z johnnyw $
+ *  $Id: FILE_Connector.h 96985 2013-04-11 15:50:32Z huangh $
  *
  *  @author Doug Schmidt <schmidt@cs.wustl.edu>
  */
@@ -15,7 +15,7 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/FILE_IO.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/os_include/os_fcntl.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/dep/acelite/ace/FILE_Connector.inl b/dep/acelite/ace/FILE_Connector.inl
index 953f661fb..5cde585f1 100644
--- a/dep/acelite/ace/FILE_Connector.inl
+++ b/dep/acelite/ace/FILE_Connector.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: FILE_Connector.inl 82723 2008-09-16 09:35:44Z johnnyw $
+// $Id: FILE_Connector.inl 96985 2013-04-11 15:50:32Z huangh $
 
 // Creates a Local ACE_FILE.
 
@@ -19,7 +19,7 @@ ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io,
   if (this->connect (new_io, remote_sap, timeout, local_sap,
                      reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("address %s, %p\n"),
                 remote_sap.get_path_name (),
                 ACE_TEXT ("ACE_FILE_IO")));
diff --git a/dep/acelite/ace/FILE_IO.cpp b/dep/acelite/ace/FILE_IO.cpp
index 37c412c24..21f431909 100644
--- a/dep/acelite/ace/FILE_IO.cpp
+++ b/dep/acelite/ace/FILE_IO.cpp
@@ -1,8 +1,8 @@
-// $Id: FILE_IO.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: FILE_IO.cpp 97355 2013-09-27 22:16:09Z shuston $
 
 #include "ace/FILE_IO.h"
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/OS_Memory.h"
 #include "ace/Truncate.h"
@@ -23,9 +23,9 @@ ACE_FILE_IO::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FILE_IO::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->addr_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -124,16 +124,17 @@ ACE_FILE_IO::recvv (iovec *io_vec)
   ACE_TRACE ("ACE_FILE_IO::recvv");
 
   io_vec->iov_base = 0;
-  size_t const length =
-    static_cast <size_t> (ACE_OS::filesize (this->get_handle ()));
+  ACE_OFF_T const length = ACE_OS::filesize (this->get_handle ());
 
   if (length > 0)
     {
+      // Restrict to max size we can record in iov_len.
+      size_t len = ACE_Utils::truncate_cast<u_long> (length);
       ACE_NEW_RETURN (io_vec->iov_base,
-                      char[length],
+                      char[len],
                       -1);
-      io_vec->iov_len = this->recv_n (io_vec->iov_base,
-                                      length);
+      io_vec->iov_len = static_cast<u_long> (this->recv_n (io_vec->iov_base,
+                                                           len));
       return io_vec->iov_len;
     }
   else
diff --git a/dep/acelite/ace/File_Lock.cpp b/dep/acelite/ace/File_Lock.cpp
index b67e8d50e..bff6153ff 100644
--- a/dep/acelite/ace/File_Lock.cpp
+++ b/dep/acelite/ace/File_Lock.cpp
@@ -1,7 +1,7 @@
-// $Id: File_Lock.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: File_Lock.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/File_Lock.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/File_Lock.inl"
@@ -19,9 +19,9 @@ ACE_File_Lock::dump (void) const
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_File_Lock::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -32,7 +32,7 @@ ACE_File_Lock::ACE_File_Lock (ACE_HANDLE h,
 {
 // ACE_TRACE ("ACE_File_Lock::ACE_File_Lock");
   if (ACE_OS::flock_init (&this->lock_) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_File_Lock::ACE_File_Lock")));
   this->set_handle (h);
@@ -47,7 +47,7 @@ ACE_File_Lock::ACE_File_Lock (const ACE_TCHAR *name,
 // ACE_TRACE ("ACE_File_Lock::ACE_File_Lock");
 
   if (this->open (name, flags, perms) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p %s\n"),
                 ACE_TEXT ("ACE_File_Lock::ACE_File_Lock"),
                 name));
diff --git a/dep/acelite/ace/Filecache.cpp b/dep/acelite/ace/Filecache.cpp
index 65e548c75..3a583962f 100644
--- a/dep/acelite/ace/Filecache.cpp
+++ b/dep/acelite/ace/Filecache.cpp
@@ -1,8 +1,8 @@
-// $Id: Filecache.cpp 94034 2011-05-09 19:11:03Z johnnyw $
+// $Id: Filecache.cpp 97202 2013-06-19 22:35:11Z mesnier_p $
 
 #include "ace/Filecache.h"
 #include "ace/Object_Manager.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 #include "ace/Guard_T.h"
 #include "ace/OS_NS_string.h"
@@ -52,14 +52,14 @@ ACE_Filecache_Handle::init (void)
 }
 
 ACE_Filecache_Handle::ACE_Filecache_Handle (void)
-  : file_ (0), handle_ (0), mapit_ (0)
+  : file_ (0), handle_ (0)
 {
   this->init ();
 }
 
 ACE_Filecache_Handle::ACE_Filecache_Handle (const ACE_TCHAR *filename,
                                             ACE_Filecache_Flag mapit)
-  : file_ (0), handle_ (0), mapit_ (mapit)
+  : file_ (0), handle_ (0)
 {
   this->init ();
   // Fetch the file from the Virtual_Filesystem let the
@@ -72,8 +72,8 @@ ACE_Filecache_Handle::ACE_Filecache_Handle (const ACE_TCHAR *filename,
 
 ACE_Filecache_Handle::ACE_Filecache_Handle (const ACE_TCHAR *filename,
                                             int size,
-                                            ACE_Filecache_Flag mapit)
-  : file_ (0), handle_ (0), mapit_ (mapit)
+                                            ACE_Filecache_Flag )
+  : file_ (0), handle_ (0)
 {
   this->init ();
 
@@ -247,7 +247,7 @@ ACE_Filecache::insert_i (const ACE_TCHAR *filename,
                       ACE_Filecache_Object (filename, filelock, 0, mapit),
                       0);
 
-      //      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("   (%t) CVF: creating %s\n"), filename));
+      //      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("   (%t) CVF: creating %s\n"), filename));
 
       if (this->hash_.bind (filename, handle) == -1)
         {
@@ -370,7 +370,7 @@ ACE_Filecache::fetch (const ACE_TCHAR *filename, int mapit)
               filelock.release ();
           }
         }
-      //      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("   (%t) CVF: found %s\n"), filename));
+      //      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("   (%t) CVF: found %s\n"), filename));
     }
 
   return handle;
@@ -691,8 +691,8 @@ ACE_Filecache_Object::error (void) const
 int
 ACE_Filecache_Object::error_i (int error_value, const ACE_TCHAR *s)
 {
-  s = s;
-  ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p.\n"), s));
+  ACE_UNUSED_ARG (s);
+  ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p.\n"), s));
   this->error_ = error_value;
   return error_value;
 }
diff --git a/dep/acelite/ace/Filecache.h b/dep/acelite/ace/Filecache.h
index 9165a70fc..2855e2023 100644
--- a/dep/acelite/ace/Filecache.h
+++ b/dep/acelite/ace/Filecache.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Filecache.h
  *
- *  $Id: Filecache.h 91066 2010-07-12 11:05:04Z johnnyw $
+ *  $Id: Filecache.h 97202 2013-06-19 22:35:11Z mesnier_p $
  *
  *  @author James Hu
  */
@@ -146,8 +146,6 @@ private:
 
   /// A dup'd version of the one from file_.
   ACE_HANDLE handle_;
-
-  int mapit_;
 };
 
 typedef ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
diff --git a/dep/acelite/ace/FlReactor/ACE_FlReactor_export.h b/dep/acelite/ace/FlReactor/ACE_FlReactor_export.h
deleted file mode 100644
index 282adb649..000000000
--- a/dep/acelite/ace/FlReactor/ACE_FlReactor_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id: ACE_FlReactor_export.h 80826 2008-03-04 14:51:23Z wotte $
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s ACE_FlReactor
-// ------------------------------
-#ifndef ACE_FLREACTOR_EXPORT_H
-#define ACE_FLREACTOR_EXPORT_H
-
-#include /**/ "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_FLREACTOR_HAS_DLL)
-#  define ACE_FLREACTOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_FLREACTOR_HAS_DLL */
-
-#if !defined (ACE_FLREACTOR_HAS_DLL)
-#  define ACE_FLREACTOR_HAS_DLL 1
-#endif /* ! ACE_FLREACTOR_HAS_DLL */
-
-#if defined (ACE_FLREACTOR_HAS_DLL) && (ACE_FLREACTOR_HAS_DLL == 1)
-#  if defined (ACE_FLREACTOR_BUILD_DLL)
-#    define ACE_FlReactor_Export ACE_Proper_Export_Flag
-#    define ACE_FLREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ACE_FLREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ACE_FLREACTOR_BUILD_DLL */
-#    define ACE_FlReactor_Export ACE_Proper_Import_Flag
-#    define ACE_FLREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ACE_FLREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ACE_FLREACTOR_BUILD_DLL */
-#else /* ACE_FLREACTOR_HAS_DLL == 1 */
-#  define ACE_FlReactor_Export
-#  define ACE_FLREACTOR_SINGLETON_DECLARATION(T)
-#  define ACE_FLREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ACE_FLREACTOR_HAS_DLL == 1 */
-
-// Set ACE_FLREACTOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ACE_FLREACTOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ACE_FLREACTOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ACE_FLREACTOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ACE_FLREACTOR_NTRACE */
-
-#if (ACE_FLREACTOR_NTRACE == 1)
-#  define ACE_FLREACTOR_TRACE(X)
-#else /* (ACE_FLREACTOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ACE_FLREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ACE_FLREACTOR_NTRACE == 1) */
-
-#endif /* ACE_FLREACTOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/FlReactor/FlReactor.cpp b/dep/acelite/ace/FlReactor/FlReactor.cpp
deleted file mode 100644
index 4cab9c9df..000000000
--- a/dep/acelite/ace/FlReactor/FlReactor.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-// $Id: FlReactor.cpp 95511 2012-01-27 09:40:38Z johnnyw $
-
-#include "ace/FlReactor/FlReactor.h"
-
-#include /**/ <FL/Fl.H>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE (ACE_FlReactor)
-
-// Must be called with lock held
-ACE_FlReactor::ACE_FlReactor (size_t size,
-                              bool restart,
-                              ACE_Sig_Handler *h)
-  : ACE_Select_Reactor (size, restart, h)
-{
-  // When the ACE_Select_Reactor is constructed it creates the notify
-  // pipe and registers it with the register_handler_i() method. The
-  // FlReactor overloads this method BUT because the
-  // register_handler_i occurs when constructing the base class
-  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
-  // is called not the FlReactor register_handler_i().  This means
-  // that the notify pipe is registered with the ACE_Select_Reactor
-  // event handling code not the FlReactor and so notfications don't
-  // work.  To get around this we simply close and re-opened the
-  // notification handler in the constructor of the FlReactor.
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  this->notify_handler_->close ();
-  this->notify_handler_->open (this, 0);
-#endif /* ACE_MT_SAFE */
-}
-
-ACE_FlReactor::~ACE_FlReactor (void)
-{
-}
-
-// This is just the <wait_for_multiple_events> from ace/Reactor.cpp
-// but we use the Fl functions to wait for an event, not <select>
-
-int
-ACE_FlReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-                                         ACE_Time_Value *max_wait_time)
-{
-  ACE_TRACE ("ACE_FlReactor::wait_for_multiple_events");
-  int nfound;
-
-  do
-    {
-      max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
-
-      size_t width = this->handler_rep_.max_handlep1 ();
-      handle_set.rd_mask_ = this->wait_set_.rd_mask_;
-      handle_set.wr_mask_ = this->wait_set_.wr_mask_;
-      handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-
-      // Check to make sure our handle's are all usable.
-      ACE_Select_Reactor_Handle_Set temp_set = handle_set;
-
-      ACE_Time_Value zero = ACE_Time_Value::zero;
-      if (ACE_OS::select (width,
-                          temp_set.rd_mask_,
-                          temp_set.wr_mask_,
-                          temp_set.ex_mask_,
-                          &zero) == -1)
-        return -1; // Bad file arguments...
-
-      // Instead of waiting using <select>, just use the Fl mechanism
-      // to wait for one or more events...
-
-      // Wait for something to happen.
-      double t = 0;
-      if (max_wait_time != 0)
-        t = max_wait_time->sec () + max_wait_time->usec () / 1000000.0F;
-
-      while (t > 0) {
-        t = Fl::wait (t);
-      }
-
-      // Reset the width, in case it changed during the upcalls.
-      width = this->handler_rep_.max_handlep1 ();
-
-      // Now actually read the result needed by the <Select_Reactor>
-      // using <select>.
-      zero = ACE_Time_Value::zero;
-      nfound = ACE_OS::select (width,
-                               handle_set.rd_mask_,
-                               handle_set.wr_mask_,
-                               handle_set.ex_mask_,
-                               &zero);
-
-    } while (nfound == -1 && this->handle_error () > 0);
-
-  if (nfound > 0)
-    {
-#if !defined (ACE_WIN32)
-      handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
-#endif /* ACE_WIN32 */
-    }
-  return nfound; // Timed out or input available
-}
-
-void
-ACE_FlReactor::fl_io_proc (int fd, void* reactor)
-{
-  ACE_FlReactor *self = static_cast<ACE_FlReactor *> (reactor);
-  ACE_HANDLE handle = (ACE_HANDLE)fd; //reinterpret_cast<ACE_HANDLE> (fd);
-
-  // my copy isn't const.
-  ACE_Time_Value zero = ACE_Time_Value::zero;
-
-  ACE_Select_Reactor_Handle_Set wait_set;
-
-  // Deal with one file event.
-
-  // - read which kind of event
-  if (self->wait_set_.rd_mask_.is_set (handle))
-    wait_set.rd_mask_.set_bit (handle);
-  if (self->wait_set_.wr_mask_.is_set (handle))
-    wait_set.wr_mask_.set_bit (handle);
-  if (self->wait_set_.ex_mask_.is_set (handle))
-    wait_set.ex_mask_.set_bit (handle);
-
-  int result = ACE_OS::select (fd + 1,
-                               wait_set.rd_mask_,
-                               wait_set.wr_mask_,
-                               wait_set.ex_mask_, &zero);
-
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  // - Use only that one file event (removes events for other files).
-  if (result > 0)
-    {
-      if (wait_set.rd_mask_.is_set (handle))
-        dispatch_set.rd_mask_.set_bit (handle);
-      if (wait_set.wr_mask_.is_set (handle))
-        dispatch_set.wr_mask_.set_bit (handle);
-      if (wait_set.ex_mask_.is_set (handle))
-        dispatch_set.ex_mask_.set_bit (handle);
-
-      self->dispatch (1, dispatch_set);
-    }
-}
-
-void
-ACE_FlReactor::fl_timeout_proc (void* reactor)
-{
-  ACE_FlReactor *self = static_cast<ACE_FlReactor *> (reactor);
-
-  // Deal with any timer events
-  ACE_Select_Reactor_Handle_Set handle_set;
-  self->dispatch (0, handle_set);
-  self->reset_timeout ();
-}
-
-
-int
-ACE_FlReactor::register_handler_i (ACE_HANDLE handle,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_FlReactor::register_handler_i");
-
-  int result = ACE_Select_Reactor::register_handler_i (handle,
-                                                       handler, mask);
-  if (result == -1)
-    return -1;
-
-  int condition = 0;
-
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, FL_READ);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, FL_WRITE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_SET_BITS (condition, FL_EXCEPT);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, FL_READ);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK))
-    {
-      ACE_SET_BITS (condition, FL_WRITE); // connected, you may write
-      ACE_SET_BITS (condition, FL_READ);  // connected, you have data/err
-    }
-
-  if (condition != 0)
-    {
-      Fl::add_fd ((int)handle, // reinterpret_cast<int> (handle),
-                  ACE_FlReactor::fl_io_proc,
-                  this);
-    }
-  return 0;
-}
-
-int
-ACE_FlReactor::register_handler_i (const ACE_Handle_Set &handles,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::register_handler_i (handles,
-                                                 handler,
-                                                 mask);
-}
-
-int
-ACE_FlReactor::remove_handler_i (ACE_HANDLE handle,
-                                 ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_FlReactor::remove_handler_i");
-
-  // In the registration phase we registered first with
-  // ACE_Select_Reactor and then with X.  Now we are now doing things
-  // in reverse order.
-
-  // First clean up the corresponding X11Input.
-  Fl::remove_fd ((int)handle); // reinterpret_cast<int> (handle);
-
-  // Now let the reactor do its work.
-  return ACE_Select_Reactor::remove_handler_i (handle,
-                                               mask);
-}
-
-int
-ACE_FlReactor::remove_handler_i (const ACE_Handle_Set &handles,
-                                 ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::remove_handler_i (handles,
-                                               mask);
-}
-
-// The following function ensures there's an Fl timeout for the first
-// timeout in the Reactor's Timer_Queue.
-
-void
-ACE_FlReactor::reset_timeout (void)
-{
-  ACE_Time_Value *max_wait_time =
-    this->timer_queue_->calculate_timeout (0);
-
-  if (max_wait_time != 0)
-    {
-      float t = max_wait_time->sec ()
-        + max_wait_time->usec () / 1000000.0F;
-      Fl::add_timeout (t,
-                       ACE_FlReactor::fl_timeout_proc,
-                       this);
-    }
-}
-
-int
-ACE_FlReactor::reset_timer_interval
-  (long timer_id,
-   const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_FlReactor::reset_timer_interval");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  int const result =
-    ACE_Select_Reactor::reset_timer_interval (timer_id,
-                                              interval);
-
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-long
-ACE_FlReactor::schedule_timer (ACE_Event_Handler *event_handler,
-                               const void *arg,
-                const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_FlReactor::schedule_timer");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  long result = ACE_Select_Reactor::schedule_timer (event_handler,
-                                                    arg,
-                                                    delay,
-                                                    interval);
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-int
-ACE_FlReactor::cancel_timer (ACE_Event_Handler *handler,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_FlReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (handler,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-int
-ACE_FlReactor::cancel_timer (long timer_id,
-                             const void **arg,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_FlReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (timer_id,
-                                        arg,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/FlReactor/FlReactor.h b/dep/acelite/ace/FlReactor/FlReactor.h
deleted file mode 100644
index 6f67de88c..000000000
--- a/dep/acelite/ace/FlReactor/FlReactor.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file   FlReactor.h
- *
- *  $Id: FlReactor.h 82723 2008-09-16 09:35:44Z johnnyw $
- *
- *  @author Carlos O'Ryan <coryan@cs.wustl.edu>
- *  @author Based in part in the ACE_XtReactor implementation by
- *  @author Eric C. Newton's <ecn@clark.net>
- *  @author Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch>
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_FLREACTOR_H
-#define ACE_FLREACTOR_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/FlReactor/ACE_FlReactor_export.h"
-#include "ace/Select_Reactor.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_FlReactor
- *
- * @brief A Reactor implementation that uses the Fast-Light (FL) toolkit
- * for event demultiplexing.  This will let us integrate the FL
- * toolkit with ACE and/or TAO.
- *
- * As many other GUI toolkits FL supports a minimal set of
- * callbacks to handle event demultiplexing, namely simple methods
- * to add file descriptors to the event demuxing set or timeout
- * events.  This class adapts this simple mechanisms so they are
- * compatible with ACE's Reactor.
- */
-class ACE_FlReactor_Export ACE_FlReactor : public ACE_Select_Reactor
-{
-
-public:
-  // = Initialization and termination methods.
-  ACE_FlReactor (size_t size = DEFAULT_SIZE,
-                 bool restart = false,
-                 ACE_Sig_Handler * = 0);
-  virtual ~ACE_FlReactor (void);
-
-  // = Timer operations.
-  virtual long schedule_timer (ACE_Event_Handler *event_handler,
-                               const void *arg,
-                               const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval);
-  virtual int reset_timer_interval (long timer_id,
-                                    const ACE_Time_Value &interval);
-  virtual int cancel_timer (ACE_Event_Handler *handler,
-                            int dont_call_handle_close = 1);
-  virtual int cancel_timer (long timer_id,
-                            const void **arg = 0,
-                            int dont_call_handle_close = 1);
-
-protected:
-  // = Register timers/handles with Fl.
-  /// Register a single @a handler.
-  virtual int register_handler_i (ACE_HANDLE handle,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Register a set of <handlers>.
-  virtual int register_handler_i (const ACE_Handle_Set &handles,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Remove the <handler> associated with this @a handle.
-  virtual int remove_handler_i (ACE_HANDLE handle,
-                                ACE_Reactor_Mask mask);
-
-  /// Remove a set of <handles>.
-  virtual int remove_handler_i (const ACE_Handle_Set &handles,
-                                ACE_Reactor_Mask);
-
-  /// Wait for events to occur.
-  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
-                                        ACE_Time_Value *);
-
-private:
-  /// This method ensures there's an Fl timeout for the first timeout
-  /// in the Reactor's Timer_Queue.
-  void reset_timeout (void);
-
-  // = Integrate with the FL callback function mechanism.
-  static void fl_io_proc (int fd, void*);
-  static void fl_timeout_proc (void*);
-
-  /// Deny access since member-wise won't work...
-  ACE_FlReactor (const ACE_FlReactor &);
-  ACE_FlReactor &operator = (const ACE_FlReactor &);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* ACE_FLREACTOR_H */
diff --git a/dep/acelite/ace/FoxReactor/ACE_FoxReactor_export.h b/dep/acelite/ace/FoxReactor/ACE_FoxReactor_export.h
deleted file mode 100644
index 641be964c..000000000
--- a/dep/acelite/ace/FoxReactor/ACE_FoxReactor_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id: ACE_FoxReactor_export.h 80826 2008-03-04 14:51:23Z wotte $
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s ACE_FoxReactor
-// ------------------------------
-#ifndef ACE_FOXREACTOR_EXPORT_H
-#define ACE_FOXREACTOR_EXPORT_H
-
-#include /**/ "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_FOXREACTOR_HAS_DLL)
-#  define ACE_FOXREACTOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_FOXREACTOR_HAS_DLL */
-
-#if !defined (ACE_FOXREACTOR_HAS_DLL)
-#  define ACE_FOXREACTOR_HAS_DLL 1
-#endif /* ! ACE_FOXREACTOR_HAS_DLL */
-
-#if defined (ACE_FOXREACTOR_HAS_DLL) && (ACE_FOXREACTOR_HAS_DLL == 1)
-#  if defined (ACE_FOXREACTOR_BUILD_DLL)
-#    define ACE_FoxReactor_Export ACE_Proper_Export_Flag
-#    define ACE_FOXREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ACE_FOXREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ACE_FOXREACTOR_BUILD_DLL */
-#    define ACE_FoxReactor_Export ACE_Proper_Import_Flag
-#    define ACE_FOXREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ACE_FOXREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ACE_FOXREACTOR_BUILD_DLL */
-#else /* ACE_FOXREACTOR_HAS_DLL == 1 */
-#  define ACE_FoxReactor_Export
-#  define ACE_FOXREACTOR_SINGLETON_DECLARATION(T)
-#  define ACE_FOXREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ACE_FOXREACTOR_HAS_DLL == 1 */
-
-// Set ACE_FOXREACTOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ACE_FOXREACTOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ACE_FOXREACTOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ACE_FOXREACTOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ACE_FOXREACTOR_NTRACE */
-
-#if (ACE_FOXREACTOR_NTRACE == 1)
-#  define ACE_FOXREACTOR_TRACE(X)
-#else /* (ACE_FOXREACTOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ACE_FOXREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ACE_FOXREACTOR_NTRACE == 1) */
-
-#endif /* ACE_FOXREACTOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/FoxReactor/FoxReactor.cpp b/dep/acelite/ace/FoxReactor/FoxReactor.cpp
deleted file mode 100644
index 61b59a16c..000000000
--- a/dep/acelite/ace/FoxReactor/FoxReactor.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-// $Id: FoxReactor.cpp 93117 2011-01-20 12:11:28Z mcorino $
-
-#include "ace/FoxReactor/FoxReactor.h"
-
-FXDEFMAP(ACE_FoxReactor) ACE_FoxReactorMap[]={
-  FXMAPFUNCS(SEL_IO_READ,0,MAXKEY,ACE_FoxReactor::onFileEvents),
-  FXMAPFUNCS(SEL_IO_WRITE,0,MAXKEY,ACE_FoxReactor::onFileEvents),
-  FXMAPFUNCS(SEL_IO_EXCEPT,0,MAXKEY,ACE_FoxReactor::onFileEvents),
-  FXMAPFUNCS(SEL_TIMEOUT,0,MAXKEY,ACE_FoxReactor::onTimerEvents),
-};
-
-FXIMPLEMENT(ACE_FoxReactor,FXObject,ACE_FoxReactorMap,ARRAYNUMBER(ACE_FoxReactorMap))
-
-ACE_ALLOC_HOOK_DEFINE (ACE_FoxReactor)
-
-// Must be called with lock held
-ACE_FoxReactor::ACE_FoxReactor (FXApp* a,
-                                size_t size,
-                                bool restart,
-                                ACE_Sig_Handler *h)
-  : ACE_Select_Reactor (size, restart, h), fxapp(a)
-{
-  // When the ACE_Select_Reactor is constructed it creates the notify
-  // pipe and registers it with the register_handler_i() method. The
-  // FoxReactor overloads this method BUT because the
-  // register_handler_i occurs when constructing the base class
-  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
-  // is called not the FoxReactor register_handler_i().  This means
-  // that the notify pipe is registered with the ACE_Select_Reactor
-  // event handling code not the FoxReactor and so notfications don't
-  // work.  To get around this we simply close and re-opened the
-  // notification handler in the constructor of the FoxReactor.
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  this->notify_handler_->close ();
-  this->notify_handler_->open (this, 0);
-#endif /* ACE_MT_SAFE */
-}
-
-ACE_FoxReactor::~ACE_FoxReactor (void)
-{
-}
-
-void ACE_FoxReactor::fxapplication(FXApp *a)
-{
-   fxapp=a;
-}
-
-// This is just the <wait_for_multiple_events> from ace/Reactor.cpp
-// but we use the Fox functions to wait for an event, not <select>
-
-int
-ACE_FoxReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-                                         ACE_Time_Value *max_wait_time)
-{
-  ACE_TRACE( "ACE_FoxReactor::wait_for_multiple_events" );
-
-  int nfound = 0;
-  do
-  {
-    max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
-    size_t width = this->handler_rep_.max_handlep1 ();
-    handle_set.rd_mask_ = this->wait_set_.rd_mask_;
-    handle_set.wr_mask_ = this->wait_set_.wr_mask_;
-    handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-
-    nfound = FoxWaitForMultipleEvents (width,
-                                      handle_set,
-                                      max_wait_time);
-
-  } while( nfound == -1 && this->handle_error () > 0 );
-
-  if (nfound > 0)
-  {
-#if !defined (ACE_WIN32)
-    handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
-    handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
-    handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
-#endif /* ACE_WIN32 */
-  }
-
-  return nfound;
-  // Timed out or input available
-}
-
-int
-ACE_FoxReactor::FoxWaitForMultipleEvents (int width,
-                                        ACE_Select_Reactor_Handle_Set &wait_set,
-                                        ACE_Time_Value */*max_wait_time*/)
-{
-  // Check to make sure our handle's are all usable.
-  ACE_Select_Reactor_Handle_Set temp_set = wait_set;
-
-  if (ACE_OS::select (width,
-                      temp_set.rd_mask_,
-                      temp_set.wr_mask_,
-                      temp_set.ex_mask_,
-                      (ACE_Time_Value *) &ACE_Time_Value::zero ) == -1)
-    return -1; // Bad file arguments...
-
-  // Qt processing.
-  this->fxapp->runOneEvent () ;
-
-  // Reset the width, in case it changed during the upcalls.
-  width = handler_rep_.max_handlep1 ();
-
-  // Now actually read the result needed by the <Select_Reactor> using
-  // <select>.
-  return ACE_OS::select(width,
-                        wait_set.rd_mask_,
-                        wait_set.wr_mask_,
-                        wait_set.ex_mask_,
-                        (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-
-long ACE_FoxReactor::onFileEvents(FXObject* /* ob */, FXSelector se, void* handle){
-  FXSelector sel=FXSELTYPE(se);
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-  bool f=false;
-  if(sel==SEL_IO_READ){
-    dispatch_set.rd_mask_.set_bit(ACE_HANDLE(reinterpret_cast<FXival>(handle)));
-    f=true;
-  }
-  else
-  if(sel==SEL_IO_WRITE){
-    dispatch_set.wr_mask_.set_bit(ACE_HANDLE(reinterpret_cast<FXival>(handle)));
-    f=true;
-  }
-  else
-  if(sel==SEL_IO_EXCEPT){
-    dispatch_set.ex_mask_.set_bit(ACE_HANDLE(reinterpret_cast<FXival>(handle)));
-    f=true;
-  };
-  if(f) dispatch (1, dispatch_set);
-
-  return 1;
-}
-
-long ACE_FoxReactor::onTimerEvents(FXObject* /* ob */, FXSelector /* sel */, void* /* handle */)
-{
-  // Deal with any timer events
-  ACE_Select_Reactor_Handle_Set handle_set;
-  this->dispatch (0, handle_set );
-
-  // Set next timeout signal
-  this->reset_timeout ();
-
-  return 0;
-}
-
-int
-ACE_FoxReactor::register_handler_i (ACE_HANDLE handle,
-                                    ACE_Event_Handler *handler,
-                                    ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_FoxReactor::register_handler_i");
-
-  int const result = ACE_Select_Reactor::register_handler_i (handle,
-                                                             handler, mask);
-  if (result == -1)
-    return -1;
-
-  unsigned long condition = 0;
-
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, FX::INPUT_READ);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, FX::INPUT_WRITE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_SET_BITS (condition, FX::INPUT_EXCEPT);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, FX::INPUT_READ);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK))
-    {
-      ACE_SET_BITS (condition, FX::INPUT_WRITE); // connected, you may write
-      ACE_SET_BITS (condition, FX::INPUT_READ);  // connected, you have data/err
-    }
-
-  if (condition != 0)
-    {
-     fxapp->addInput(handle, condition, this, 0);
-    }
-  return 0;
-}
-
-int
-ACE_FoxReactor::register_handler_i (const ACE_Handle_Set &handles,
-                                    ACE_Event_Handler *handler,
-                                    ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::register_handler_i (handles, handler, mask);
-}
-
-int
-ACE_FoxReactor::remove_handler_i (ACE_HANDLE handle, ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_FoxReactor::remove_handler_i");
-
-  // In the registration phase we registered first with
-  // ACE_Select_Reactor and then with X.  Now we are now doing things
-  // in reverse order.
-
-  int condition = 0;
-
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, FX::INPUT_READ);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, FX::INPUT_WRITE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_SET_BITS (condition, FX::INPUT_EXCEPT);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, FX::INPUT_READ);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK))
-    {
-      ACE_SET_BITS (condition, FX::INPUT_WRITE); // connected, you may write
-      ACE_SET_BITS (condition, FX::INPUT_READ);  // connected, you have data/err
-    }
-
-  // First clean up the corresponding X11Input.
-  fxapp->removeInput ((int)handle,condition); // ACE_reinterpret_cast(int,handle));
-
-  // Now let the reactor do its work.
-  return ACE_Select_Reactor::remove_handler_i (handle, mask);
-}
-
-int
-ACE_FoxReactor::remove_handler_i (const ACE_Handle_Set &handles,
-                               ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::remove_handler_i (handles, mask);
-}
-
-// The following function ensures there's an Fox timeout for the first
-// timeout in the Reactor's Timer_Queue.
-
-void
-ACE_FoxReactor::reset_timeout (void)
-{
-  ACE_Time_Value *max_wait_time =
-    this->timer_queue_->calculate_timeout (0);
-
-  if (max_wait_time != 0)
-    {
-      float t = max_wait_time->sec () +
-        max_wait_time->usec () / 1000000.0F;
-      fxapp->addTimeout (this, 0, t*1000);
-    }
-}
-
-int
-ACE_FoxReactor::reset_timer_interval
-  (long timer_id,
-   const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_FoxReactor::reset_timer_interval");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  int const result =
-    ACE_Select_Reactor::reset_timer_interval (timer_id,
-                                              interval);
-
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-long
-ACE_FoxReactor::schedule_timer (ACE_Event_Handler *event_handler,
-                                const void *arg,
-                                const ACE_Time_Value &delay,
-                                const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_FoxReactor::schedule_timer");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  long result = ACE_Select_Reactor::schedule_timer (event_handler,
-                                                    arg,
-                                                    delay,
-                                                    interval);
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-int
-ACE_FoxReactor::cancel_timer (ACE_Event_Handler *handler,
-                              int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_FoxReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (handler,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-int
-ACE_FoxReactor::cancel_timer (long timer_id,
-                              const void **arg,
-                              int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_FoxReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (timer_id,
-                                        arg,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
diff --git a/dep/acelite/ace/FoxReactor/FoxReactor.h b/dep/acelite/ace/FoxReactor/FoxReactor.h
deleted file mode 100644
index e284441e5..000000000
--- a/dep/acelite/ace/FoxReactor/FoxReactor.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- C-*- */
-
-//=============================================================================
-/**
- *  @file   FoxReactor.h
- *
- *  $Id: FoxReactor.h 93117 2011-01-20 12:11:28Z mcorino $
- *
- *  @author Dmitriy Nikitinskiy <nick@bel.ru>
- *  @author Based in part in the ACE_XtReactor implementation by
- *  @author Eric C. Newton's <ecn@clark.net>
- *  @author Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch>
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_FOXREACTOR_H
-#define ACE_FOXREACTOR_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Select_Reactor.h"
-#include "ace/FoxReactor/ACE_FoxReactor_export.h"
-
-#include <fx.h>
-
-/**
- * @class ACE_FoxReactor
- *
- * @brief A Reactor implementation that uses the FOX toolkit (www.fox-toolkit.org)
- * for event demultiplexing.  This will let us integrate the FOX
- * toolkit with ACE and/or TAO.
- *
- */
-class ACE_FoxReactor_Export ACE_FoxReactor : public FXObject, public ACE_Select_Reactor
-{
-  FXDECLARE(ACE_FoxReactor)
-public:
-  // = Initialization and termination methods.
-  ACE_FoxReactor (FXApp* a=0,
-                 size_t size = DEFAULT_SIZE,
-                 bool restart = false,
-                 ACE_Sig_Handler * = 0);
-  virtual ~ACE_FoxReactor (void);
-
-  void fxapplication(FXApp* a);
-
-  // = Timer operations.
-  virtual long schedule_timer (ACE_Event_Handler *event_handler,
-                               const void *arg,
-                               const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval);
-  virtual int reset_timer_interval (long timer_id,
-                                    const ACE_Time_Value &interval);
-  virtual int cancel_timer (ACE_Event_Handler *handler,
-                            int dont_call_handle_close = 1);
-  virtual int cancel_timer (long timer_id,
-                            const void **arg = 0,
-                            int dont_call_handle_close = 1);
-
-  // = Integrate with the Fox callback function mechanism.
-  long onFileEvents (FXObject*, FXSelector, void*);
-  long onTimerEvents (FXObject*, FXSelector, void*);
-
-
-protected:
-  // = Register timers/handles with Fox.
-  /// Register a single @a handler.
-  virtual int register_handler_i (ACE_HANDLE handle,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Register a set of <handlers>.
-  virtual int register_handler_i (const ACE_Handle_Set &handles,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Remove the <handler> associated with this @a handle.
-  virtual int remove_handler_i (ACE_HANDLE handle,
-                                ACE_Reactor_Mask mask);
-
-  /// Remove a set of <handles>.
-  virtual int remove_handler_i (const ACE_Handle_Set &handles,
-                                ACE_Reactor_Mask);
-
-  /// Wait for events to occur.
-  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
-                                        ACE_Time_Value *);
-
-  int FoxWaitForMultipleEvents (int,ACE_Select_Reactor_Handle_Set &,ACE_Time_Value *);
-
-private:
-  /// This method ensures there's an Fox timeout for the first timeout
-  /// in the Reactor's Timer_Queue.
-  void reset_timeout (void);
-
-  FXApp *fxapp;
-
-  /// Deny access since member-wise won't work...
-  ACE_FoxReactor (const ACE_FoxReactor &);
-  ACE_FoxReactor &operator = (const ACE_FoxReactor &);
-};
-
-#include /**/ "ace/post.h"
-#endif /* ACE_FOXREACTOR_H */
-
diff --git a/dep/acelite/ace/Framework_Component.cpp b/dep/acelite/ace/Framework_Component.cpp
index 36e69d099..8adcdb156 100644
--- a/dep/acelite/ace/Framework_Component.cpp
+++ b/dep/acelite/ace/Framework_Component.cpp
@@ -1,4 +1,4 @@
-// $Id: Framework_Component.cpp 92208 2010-10-13 06:20:39Z johnnyw $
+// $Id: Framework_Component.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Framework_Component.h"
 
@@ -7,7 +7,7 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Object_Manager.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/DLL_Manager.h"
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/OS_NS_string.h"
@@ -133,7 +133,7 @@ ACE_Framework_Repository::register_component (ACE_Framework_Component *fc)
     if (this->component_vector_[i] &&
         fc->this_ == this->component_vector_[i]->this_)
       {
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
           "AFR::register_component: error, compenent already registered\n"),
                           -1);
       }
@@ -193,7 +193,7 @@ ACE_Framework_Repository::remove_dll_components_i (const ACE_TCHAR *dll_name)
         ACE_OS::strcmp (this->component_vector_[i]->dll_name_, dll_name) == 0)
       {
           if (ACE::debug ())
-            ACE_DEBUG ((LM_DEBUG,
+            ACELIB_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("AFR::remove_dll_components_i (%s) ")
                         ACE_TEXT ("component \"%s\"\n"),
                         dll_name, this->component_vector_[i]->name_));
@@ -268,7 +268,7 @@ ACE_Framework_Repository::ACE_Framework_Repository (int size)
   ACE_TRACE ("ACE_Framework_Repository::ACE_Framework_Repository");
 
   if (this->open (size) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Framework_Repository")));
 }
diff --git a/dep/acelite/ace/Functor_T.h b/dep/acelite/ace/Functor_T.h
index 6dfbbcff6..9c2a4d5c3 100644
--- a/dep/acelite/ace/Functor_T.h
+++ b/dep/acelite/ace/Functor_T.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Functor_T.h
  *
- *  $Id: Functor_T.h 95332 2011-12-15 11:09:41Z mcorino $
+ *  $Id: Functor_T.h 96943 2013-03-30 09:42:31Z mcorino $
  *
  *   Templatized classes for implementing function objects that are
  *   used in various places in ACE.  There are currently two major
@@ -37,6 +37,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Functor_String.h"
+#include "ace/Truncate.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dep/acelite/ace/Functor_T.inl b/dep/acelite/ace/Functor_T.inl
index 1b303210c..bfad287ba 100644
--- a/dep/acelite/ace/Functor_T.inl
+++ b/dep/acelite/ace/Functor_T.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Functor_T.inl 95332 2011-12-15 11:09:41Z mcorino $
+// $Id: Functor_T.inl 96943 2013-03-30 09:42:31Z mcorino $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -40,7 +40,7 @@ ACE_Pointer_Hash<TYPE>::operator () (TYPE t) const
 #  pragma warning(push)
 #  pragma warning(disable : 4311)   /* Truncate pointer to unsigned long */
 #endif /* ACE_WIN64 */
-  return reinterpret_cast<unsigned long> (t);
+  return ACE_Utils::truncate_cast<unsigned long> ((intptr_t)t);
 #if defined (ACE_WIN64)
 #  pragma warning(pop)
 #endif /* ACE_WIN64 */
diff --git a/dep/acelite/ace/Future.cpp b/dep/acelite/ace/Future.cpp
index 6544c1185..e60f48a5c 100644
--- a/dep/acelite/ace/Future.cpp
+++ b/dep/acelite/ace/Future.cpp
@@ -1,4 +1,4 @@
- // $Id: Future.cpp 95706 2012-04-18 06:42:16Z johnnyw $
+ // $Id: Future.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_FUTURE_CPP
 #define ACE_FUTURE_CPP
@@ -48,23 +48,23 @@ template <class T> void
 ACE_Future_Rep<T>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,
               "ref_count_ = %d\n",
  (int) this->ref_count_));
-  ACE_DEBUG ((LM_INFO,"value_:\n"));
+  ACELIB_DEBUG ((LM_INFO,"value_:\n"));
   if (this->value_)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (NON-NULL)\n")));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (NON-NULL)\n")));
   else
     //FUZZ: disable check_for_NULL
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (NULL)\n")));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (NULL)\n")));
     //FUZZ: enable check_for_NULL
 
-  ACE_DEBUG ((LM_INFO,"value_ready_:\n"));
+  ACELIB_DEBUG ((LM_INFO,"value_ready_:\n"));
   this->value_ready_.dump ();
-  ACE_DEBUG ((LM_INFO,"value_ready_mutex_:\n"));
+  ACELIB_DEBUG ((LM_INFO,"value_ready_mutex_:\n"));
   this->value_ready_mutex_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -408,13 +408,13 @@ template <class T> void
 ACE_Future<T>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_BEGIN_DUMP, this));
 
   if (this->future_rep_)
     this->future_rep_->dump ();
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
diff --git a/dep/acelite/ace/Get_Opt.cpp b/dep/acelite/ace/Get_Opt.cpp
index 90355f91a..5182da4eb 100644
--- a/dep/acelite/ace/Get_Opt.cpp
+++ b/dep/acelite/ace/Get_Opt.cpp
@@ -1,4 +1,4 @@
-// $Id: Get_Opt.cpp 95710 2012-04-25 07:02:50Z johnnyw $
+// $Id: Get_Opt.cpp 97798 2014-07-03 10:57:43Z johnnyw $
 
 #include "ace/Get_Opt.h"
 
@@ -7,7 +7,7 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/ACE.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/SString.h"
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
@@ -130,7 +130,7 @@ ACE_Get_Opt::ACE_Get_Opt (int argc,
     this->ordering_ = REQUIRE_ORDER;
 
   // Now, check to see if any or the following were passed at
-  // the begining of optstring: '+' same as POSIXLY_CORRECT;
+  // the beginning of optstring: '+' same as POSIXLY_CORRECT;
   // '-' turns off POSIXLY_CORRECT; or ':' which signifies we
   // should return ':' if a parameter is missing for an option.
   // We use a loop here, since a combination of "{+|-}:" in any
@@ -280,7 +280,7 @@ ACE_Get_Opt::long_option_i (void)
       // Great, we found a match, but unfortunately we found more than
       // one and it wasn't exact.
       if (this->opterr)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("%s: option `%s' is ambiguous\n"),
                     this->argv_[0], this->argv_[this->optind]));
       this->nextchar_ = 0;
@@ -305,7 +305,7 @@ ACE_Get_Opt::long_option_i (void)
               // Whoops, we've got what looks like an argument, but we
               // don't want one.
               if (this->opterr)
-                  ACE_ERROR
+                  ACELIB_ERROR
                     ((LM_ERROR,
                       ACE_TEXT ("%s: long option `--%s' doesn't allow ")
                       ACE_TEXT ("an argument\n"),
@@ -326,7 +326,7 @@ ACE_Get_Opt::long_option_i (void)
             {
               // All out of elements, so we have to punt...
               if (this->opterr)
-                ACE_ERROR ((LM_ERROR,
+                ACELIB_ERROR ((LM_ERROR,
                             ACE_TEXT ("%s: long option '--%s' requires ")
                             ACE_TEXT ("an argument\n"),
                             this->argv_[0], pfound->name_));
@@ -350,7 +350,7 @@ ACE_Get_Opt::long_option_i (void)
       // signature was passed, e.g. "--", or it's not a short (not sure when
       // this could happen) it's an error.
       if (this->opterr)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("%s: illegal long option '--%s'\n"),
                     this->argv_[0], this->nextchar_));
       this->nextchar_ = 0;
@@ -381,7 +381,7 @@ ACE_Get_Opt::short_option_i (void)
   if (oli == 0 || opt == ':')
     {
       if (this->opterr)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("%s: illegal short option -- %c\n"),
                     this->argv_[0], opt));
       return '?';
@@ -422,7 +422,7 @@ ACE_Get_Opt::short_option_i (void)
             {
               // Ran out of arguments before finding required argument.
               if (this->opterr)
-                ACE_ERROR ((LM_ERROR,
+                ACELIB_ERROR ((LM_ERROR,
                             ACE_TEXT ("%s: short option requires ")
                             ACE_TEXT ("an argument -- %c\n"),
                             this->argv_[0], opt));
@@ -506,7 +506,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name,
                   if (has_arg != ARG_OPTIONAL)
                     {
                       if (this->opterr)
-                        ACE_ERROR
+                        ACELIB_ERROR
                           ((LM_ERROR,
                             ACE_TEXT ("Existing short option '%c' takes ")
                             ACE_TEXT ("optional argument; adding %s ")
@@ -519,7 +519,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name,
                 if (has_arg != ARG_REQUIRED)
                   {
                     if (this->opterr)
-                      ACE_ERROR
+                      ACELIB_ERROR
                         ((LM_ERROR,
                           ACE_TEXT ("Existing short option '%c' requires ")
                           ACE_TEXT ("an argument; adding %s ")
@@ -531,7 +531,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name,
           else if (has_arg != NO_ARG)
             {
               if (this->opterr)
-                ACE_ERROR
+                ACELIB_ERROR
                   ((LM_ERROR,
                     ACE_TEXT ("Existing short option '%c' does not ")
                     ACE_TEXT ("accept an argument; adding %s ")
@@ -563,7 +563,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name,
       || this->long_opts_.set (option, size) != 0)
     {
       delete option;
-      ACE_ERROR_RETURN
+      ACELIB_ERROR_RETURN
         ((LM_ERROR, ACE_TEXT ("Could not add long option to array.\n")),
          -1);
     }
@@ -597,8 +597,8 @@ ACE_Get_Opt::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Get_Opt::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")
               ACE_TEXT ("opstring_ = %s\n")
               ACE_TEXT ("long_only_ = %d\n")
               ACE_TEXT ("has_colon_ = %d\n")
@@ -618,7 +618,7 @@ ACE_Get_Opt::dump (void) const
   size_t size = this->long_opts_.size ();
   for (u_int i = 0; i < size ; ++i)
     {
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")
+      ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")
                   ACE_TEXT ("long_option name_ = %s\n")
                   ACE_TEXT ("has_arg_ = %d\n")
                   ACE_TEXT ("val_ = %d\n"),
@@ -626,7 +626,7 @@ ACE_Get_Opt::dump (void) const
                   this->long_opts_[i]->has_arg_,
                   this->long_opts_[i]->val_));
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Global_Macros.h b/dep/acelite/ace/Global_Macros.h
index b18a5482e..ecb94f0a8 100644
--- a/dep/acelite/ace/Global_Macros.h
+++ b/dep/acelite/ace/Global_Macros.h
@@ -4,7 +4,7 @@
 /**
  *  @file   Global_Macros.h
  *
- *  $Id: Global_Macros.h 96084 2012-08-20 18:07:57Z johnnyw $
+ *  $Id: Global_Macros.h 97884 2014-09-08 18:00:53Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
@@ -27,7 +27,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 #include "ace/Assert.h" // For ACE_ASSERT
 
 // Start Global Macros
@@ -101,24 +101,54 @@ ACE_END_VERSIONED_NAMESPACE_DECL
     // It just evaporated ;-)  Not pleasant.
 #   define ACE_UNIMPLEMENTED_FUNC(f)
 # else
-#   define ACE_UNIMPLEMENTED_FUNC(f) f;
+#   if defined (ACE_HAS_CPP11)
+#     define ACE_UNIMPLEMENTED_FUNC(f) f = delete;
+#   else
+#     define ACE_UNIMPLEMENTED_FUNC(f) f;
+#   endif
 # endif /* ACE_NEEDS_FUNC_DEFINITIONS */
 
+// C++11 has deprecated the register keyword
+#if defined (ACE_HAS_CPP11)
+# define ACE_REGISTER
+#else
+# define ACE_REGISTER register
+#endif
 // ----------------------------------------------------------------
 
 // FUZZ: disable check_for_ACE_Guard
 
-// Convenient macro for testing for deadlock, as well as for detecting
-// when mutexes fail.
-/* @warning
- *   Use of ACE_GUARD() is rarely correct.  ACE_GUARD() causes the current
- *   function to return if the lock is not acquired.  Since merely returning
- *   (no value) almost certainly fails to handle the acquisition failure
- *   and almost certainly fails to communicate the failure to the caller
- *   for the caller to handle, ACE_GUARD() is almost always the wrong
- *   thing to do.  The same goes for ACE_WRITE_GUARD() and ACE_READ_GUARD() .
- *   ACE_GUARD_REACTION() is better because it lets you specify error
- *   handling code.
+/* Convenient macro for testing for deadlock, as well as for detecting
+ * when mutexes fail.
+ *
+ * The parameters to the ACE_GUARD_XXX macros are used as follows:
+ *
+ * MUTEX - This is the type used as the template parameter for ACE_Guard
+ *
+ * OBJ - Name for the guard object. This name should not be declared
+ *       outside the macro.
+ *
+ * LOCK - The actual lock (mutex) variable. This should be a variable
+ *        of type MUTEX, see above.
+ *
+ * ACTION - Code segment to be run, if and only if the lock is
+ *          acquired.
+ *
+ * REACTION - Code segment to be run, if and only if the lock is not
+ *            acquired.
+ *
+ * RETURN - A value to be returned from the calling function, if and
+ *          only if the lock is not acquired.
+ *
+ * @warning
+ *   Use of ACE_GUARD() is rarely correct.  ACE_GUARD() causes the
+ *   current function to return if the lock is not acquired.  Since
+ *   merely returning (no value) almost certainly fails to handle the
+ *   acquisition failure and almost certainly fails to communicate the
+ *   failure to the caller for the caller to handle, ACE_GUARD() is
+ *   almost always the wrong thing to do.  The same goes for
+ *   ACE_WRITE_GUARD() and ACE_READ_GUARD() .  ACE_GUARD_REACTION() is
+ *   better because it lets you specify error handling code.
  */
 #if !defined (ACE_GUARD_ACTION)
 #define ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ACTION, REACTION) \
@@ -928,32 +958,35 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
 #endif /* ACE_WIN32 */
 
 // Handle ACE_Message_Queue.
-#   define ACE_SYNCH_DECL class _ACE_SYNCH
+#   define ACE_SYNCH_DECL typename _ACE_SYNCH
 #   define ACE_SYNCH_USE _ACE_SYNCH
 #   define ACE_SYNCH_MUTEX_T typename _ACE_SYNCH::MUTEX
 #   define ACE_SYNCH_CONDITION_T typename _ACE_SYNCH::CONDITION
 #   define ACE_SYNCH_SEMAPHORE_T typename _ACE_SYNCH::SEMAPHORE
 
 // Handle ACE_Malloc*
-#   define ACE_MEM_POOL_1 class _ACE_MEM_POOL
+#   define ACE_MEM_POOL_1 typename _ACE_MEM_POOL
 #   define ACE_MEM_POOL_2 _ACE_MEM_POOL
 #   define ACE_MEM_POOL _ACE_MEM_POOL
 #   define ACE_MEM_POOL_OPTIONS typename _ACE_MEM_POOL::OPTIONS
 
+// @deprecated These macros are not longer used in ACE_Svc_Handler.
 // Handle ACE_Svc_Handler
-#   define ACE_PEER_STREAM_1 class _ACE_PEER_STREAM
+#   define ACE_PEER_STREAM_1 typename _ACE_PEER_STREAM
 #   define ACE_PEER_STREAM_2 _ACE_PEER_STREAM
 #   define ACE_PEER_STREAM _ACE_PEER_STREAM
 #   define ACE_PEER_STREAM_ADDR typename _ACE_PEER_STREAM::PEER_ADDR
 
+// @deprecated These macros are not longer used in ACE_Acceptor.
 // Handle ACE_Acceptor
-#   define ACE_PEER_ACCEPTOR_1 class _ACE_PEER_ACCEPTOR
+#   define ACE_PEER_ACCEPTOR_1 typename _ACE_PEER_ACCEPTOR
 #   define ACE_PEER_ACCEPTOR_2 _ACE_PEER_ACCEPTOR
 #   define ACE_PEER_ACCEPTOR _ACE_PEER_ACCEPTOR
 #   define ACE_PEER_ACCEPTOR_ADDR typename _ACE_PEER_ACCEPTOR::PEER_ADDR
 
+// @deprecated These macros are not longer used in ACE_Connector.
 // Handle ACE_Connector
-#   define ACE_PEER_CONNECTOR_1 class _ACE_PEER_CONNECTOR
+#   define ACE_PEER_CONNECTOR_1 typename _ACE_PEER_CONNECTOR
 #   define ACE_PEER_CONNECTOR_2 _ACE_PEER_CONNECTOR
 #   define ACE_PEER_CONNECTOR _ACE_PEER_CONNECTOR
 #   define ACE_PEER_CONNECTOR_ADDR typename ACE_PEER_CONNECTOR::PEER_ADDR
diff --git a/dep/acelite/ace/Guard_T.cpp b/dep/acelite/ace/Guard_T.cpp
index 25c31ce03..8d26e2033 100644
--- a/dep/acelite/ace/Guard_T.cpp
+++ b/dep/acelite/ace/Guard_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Guard_T.cpp 93736 2011-04-05 12:38:35Z johnnyw $
+// $Id: Guard_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_GUARD_T_CPP
 #define ACE_GUARD_T_CPP
@@ -15,7 +15,7 @@
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_HAS_DUMP)
-# include "ace/Log_Msg.h"
+# include "ace/Log_Category.h"
 #endif /* ACE_HAS_DUMP */
 
 // ****************************************************************
@@ -30,10 +30,10 @@ ACE_Guard<ACE_LOCK>::dump (void) const
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Guard<ACE_LOCK>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_ = %x\n"), this->lock_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_ = %x\n"), this->lock_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Guard_T.h b/dep/acelite/ace/Guard_T.h
index da06e1573..43630f24d 100644
--- a/dep/acelite/ace/Guard_T.h
+++ b/dep/acelite/ace/Guard_T.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Guard_T.h
  *
- *  $Id: Guard_T.h 93792 2011-04-07 11:48:50Z mcorino $
+ *  $Id: Guard_T.h 97875 2014-09-08 12:22:43Z johnnyw $
  *
  *   Moved from Synch.h.
  *
@@ -243,7 +243,7 @@ public:
  * is released even if a thread exits via <thr_exit>!
  */
 template <class ACE_LOCK>
-class ACE_TSS_Guard : private ACE_Copy_Disabled
+class ACE_TSS_Guard
 {
 public:
   // = Initialization and termination methods.
@@ -293,6 +293,9 @@ private:
   // FUZZ: disable check_for_ACE_Guard
   typedef ACE_Guard<ACE_LOCK> Guard_Type;
   // FUZZ: enable check_for_ACE_Guard
+
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_Guard<ACE_LOCK> &))
+  ACE_UNIMPLEMENTED_FUNC (ACE_TSS_Guard (const ACE_TSS_Guard<ACE_LOCK> &))
 };
 
 /**
diff --git a/dep/acelite/ace/Handle_Set.cpp b/dep/acelite/ace/Handle_Set.cpp
index 4c9b6b560..aa2c53249 100644
--- a/dep/acelite/ace/Handle_Set.cpp
+++ b/dep/acelite/ace/Handle_Set.cpp
@@ -1,5 +1,5 @@
 // Handle_Set.cpp
-// $Id: Handle_Set.cpp 95761 2012-05-15 18:23:04Z johnnyw $
+// $Id: Handle_Set.cpp 97884 2014-09-08 18:00:53Z johnnyw $
 
 #include "ace/Handle_Set.h"
 
@@ -35,23 +35,23 @@ ACE_Handle_Set::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Handle_Set::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d"), this->size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_handle_ = %d"), this->max_handle_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n[ ")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d"), this->size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_handle_ = %d"), this->max_handle_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n[ ")));
 
 #if defined (ACE_WIN32)
   for (size_t i = 0; i < (size_t) this->mask_.fd_count + 1; i++)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %x "), this->mask_.fd_array[i]));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" %x "), this->mask_.fd_array[i]));
 #else /* !ACE_WIN32 */
   for (ACE_HANDLE i = 0; i < this->max_handle_ + 1; i++)
     if (this->is_set (i))
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %d "), i));
+      ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" %d "), i));
 #endif /* ACE_WIN32 */
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" ]\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" ]\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -118,12 +118,12 @@ ACE_Handle_Set::count_bits (u_long n)
 
  ACE_TRACE ("ACE_Handle_Set::count_bits");
 #if defined (ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT)
-  register int rval = 0;
+  ACE_REGISTER int rval = 0;
 
   // Count the number of enabled bits in <n>.  This algorithm is very
   // fast, i.e., O(enabled bits in n).
 
-  for (register u_long m = n;
+  for (ACE_REGISTER u_long m = n;
        m != 0;
        m &= m - 1)
     rval++;
@@ -144,8 +144,8 @@ ACE_Handle_Set::count_bits (u_long n)
 int
 ACE_Handle_Set::bitpos (u_long bit)
 {
-  register int l = 0;
-  register u_long n = bit - 1;
+  ACE_REGISTER int l = 0;
+  ACE_REGISTER u_long n = bit - 1;
 
   // This is a fast count method when have the most significative bit.
 
@@ -247,15 +247,15 @@ ACE_Handle_Set_Iterator::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Handle_Set_Iterator::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 #if defined(ACE_WIN32) || !defined(ACE_HAS_BIG_FD_SET)
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandle_index_ = %d"), this->handle_index_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandle_index_ = %d"), this->handle_index_));
 #elif defined(ACE_HAS_BIG_FD_SET)
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_max_ = %d"), this->word_max_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_val_ = %d"), this->word_val_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_max_ = %d"), this->word_max_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_val_ = %d"), this->word_val_));
 #endif
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_num_ = %d"), this->word_num_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_num_ = %d"), this->word_num_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -342,7 +342,7 @@ ACE_Handle_Set_Iterator::operator () (void)
     }
 #else /* !ACE_HAS_BIG_FD_SET */
    // Find the first word in fds_bits with bit on
-   register u_long lsb = this->word_val_;
+   ACE_REGISTER u_long lsb = this->word_val_;
 
    if (lsb == 0)
      {
@@ -383,7 +383,7 @@ ACE_Handle_Set_Iterator::operator () (void)
         // Remove least significative bit.
         this->word_val_ ^= lsb;
 
-        register u_long n = lsb - this->oldlsb_;
+        ACE_REGISTER u_long n = lsb - this->oldlsb_;
 
         // Move index to bit distance between new lsb and old lsb.
         do
diff --git a/dep/acelite/ace/Handle_Set.h b/dep/acelite/ace/Handle_Set.h
index 97b3042a6..13fd66324 100644
--- a/dep/acelite/ace/Handle_Set.h
+++ b/dep/acelite/ace/Handle_Set.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Handle_Set.h
  *
- *  $Id: Handle_Set.h 93736 2011-04-05 12:38:35Z johnnyw $
+ *  $Id: Handle_Set.h 97484 2013-12-20 08:09:58Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -30,6 +30,10 @@
 #  define ACE_FD_SETSIZE FD_SETSIZE
 #endif /* ACE_FD_SETSIZE */
 
+#if defined(FD_SETSIZE) && defined(__FD_SETSIZE) && (FD_SETSIZE > __FD_SETSIZE)
+#error FD_SETSIZE definition is too large, please correct!
+#endif
+
 #if !defined (ACE_DEFAULT_SELECT_REACTOR_SIZE)
 #  define ACE_DEFAULT_SELECT_REACTOR_SIZE ACE_FD_SETSIZE
 #endif /* ACE_DEFAULT_SELECT_REACTOR_SIZE */
diff --git a/dep/acelite/ace/Handle_Set.inl b/dep/acelite/ace/Handle_Set.inl
index fd401caa6..e6b961a7b 100644
--- a/dep/acelite/ace/Handle_Set.inl
+++ b/dep/acelite/ace/Handle_Set.inl
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// $Id: Handle_Set.inl 96017 2012-08-08 22:18:09Z mitza $
+// $Id: Handle_Set.inl 97138 2013-05-16 17:55:36Z mitza $
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 // AIX defines bzero() in this odd file... used by FD_ZERO
 #if defined (ACE_HAS_STRINGS)
@@ -76,7 +76,7 @@ ACE_Handle_Set::is_set (ACE_HANDLE handle) const
   return FD_ISSET (handle,
                    const_cast<fd_set*> (&this->mask_));
 #elif defined (ACE_VXWORKS) && ACE_VXWORKS >= 0x690
-  return static_cast<int> (FD_ISSET (handle, &this->mask_));
+  return FD_ISSET (handle, &this->mask_) != 0;
 #else
   return FD_ISSET (handle,
                    &this->mask_);
diff --git a/dep/acelite/ace/Hash_Map_Manager_T.cpp b/dep/acelite/ace/Hash_Map_Manager_T.cpp
index 457d7d903..86bb46633 100644
--- a/dep/acelite/ace/Hash_Map_Manager_T.cpp
+++ b/dep/acelite/ace/Hash_Map_Manager_T.cpp
@@ -3,7 +3,7 @@
 /**
  *  @file    Hash_Map_Manager_T.cpp
  *
- *  $Id: Hash_Map_Manager_T.cpp 84477 2009-02-16 13:30:38Z johnnyw $
+ *  $Id: Hash_Map_Manager_T.cpp 97062 2013-04-22 14:44:39Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cse.wustl.edu>
  */
@@ -80,10 +80,10 @@ template <class EXT_ID, class INT_ID> void
 ACE_Hash_Map_Entry<EXT_ID, INT_ID>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %d"), this->next_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("prev_ = %d"), this->prev_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %d"), this->next_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("prev_ = %d"), this->prev_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -91,13 +91,13 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class
 ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("total_size_ = %d\n"), this->total_size_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("cur_size_ = %d\n"), this->cur_size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("total_size_ = %d\n"), this->total_size_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("cur_size_ = %d\n"), this->cur_size_));
   this->table_allocator_->dump ();
   this->entry_allocator_->dump ();
   this->lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -277,7 +277,7 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class
 ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_i (const EXT_ID &ext_id,
                                                                                      INT_ID &int_id)
 {
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *temp;
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *temp = 0;
 
   size_t loc = 0;
   if (this->shared_find (ext_id, temp, loc) == -1)
@@ -398,10 +398,10 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:
 {
   ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("index_ = %d "), this->index_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %x"), this->next_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("index_ = %d "), this->index_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %x"), this->next_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
@@ -472,10 +472,10 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_
 {
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("index_ = %d "), this->index_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %x"), this->next_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("index_ = %d "), this->index_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %x"), this->next_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
diff --git a/dep/acelite/ace/Hash_Map_Manager_T.h b/dep/acelite/ace/Hash_Map_Manager_T.h
index 6b754341a..34d384b3b 100644
--- a/dep/acelite/ace/Hash_Map_Manager_T.h
+++ b/dep/acelite/ace/Hash_Map_Manager_T.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Hash_Map_Manager_T.h
  *
- *  $Id: Hash_Map_Manager_T.h 91626 2010-09-07 10:59:20Z johnnyw $
+ *  $Id: Hash_Map_Manager_T.h 96985 2013-04-11 15:50:32Z huangh $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -22,7 +22,7 @@
 
 #include "ace/Default_Constants.h"
 #include "ace/Functor_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include <iterator>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Hash_Map_Manager_T.inl b/dep/acelite/ace/Hash_Map_Manager_T.inl
index 9525b13a6..bd5674599 100644
--- a/dep/acelite/ace/Hash_Map_Manager_T.inl
+++ b/dep/acelite/ace/Hash_Map_Manager_T.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Hash_Map_Manager_T.inl 84477 2009-02-16 13:30:38Z johnnyw $
+// $Id: Hash_Map_Manager_T.inl 97062 2013-04-22 14:44:39Z johnnyw $
 
 #include "ace/Guard_T.h"
 
@@ -17,7 +17,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_H
     cur_size_ (0)
 {
   if (this->open (size, table_alloc, entry_alloc) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Map_Manager_Ex\n")));
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Map_Manager_Ex\n")));
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
@@ -30,7 +30,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_H
     cur_size_ (0)
 {
   if (this->open (ACE_DEFAULT_MAP_SIZE, table_alloc, entry_alloc) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Hash_Map_Manager_Ex open")));
 }
 
@@ -120,7 +120,7 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class
 ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::trybind_i (const EXT_ID &ext_id,
                                                                                       INT_ID &int_id)
 {
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *temp;
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *temp = 0;
 
   int result = this->trybind_i (ext_id, int_id, temp);
   if (result == 1)
@@ -204,7 +204,7 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class
 ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::find_i (const EXT_ID &ext_id,
                                                                                    INT_ID &int_id)
 {
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *entry;
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *entry = 0;
 
   size_t dummy;
   if (this->shared_find (ext_id, entry, dummy) == -1)
@@ -275,7 +275,7 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class
 ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
                                                                                      const INT_ID &int_id)
 {
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *node;
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *node = 0;
 
   return this->rebind_i (ext_id,
                          int_id,
@@ -287,7 +287,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rebin
                                                                                      const INT_ID &int_id,
                                                                                      INT_ID &old_int_id)
 {
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *node;
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *node = 0;
 
   return this->rebind_i (ext_id,
                          int_id,
@@ -301,7 +301,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rebin
                                                                                      EXT_ID &old_ext_id,
                                                                                      INT_ID &old_int_id)
 {
-  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *node;
+  ACE_Hash_Map_Entry<EXT_ID, INT_ID> *node = 0;
 
   return this->rebind_i (ext_id,
                          int_id,
diff --git a/dep/acelite/ace/Hash_Multi_Map_Manager_T.cpp b/dep/acelite/ace/Hash_Multi_Map_Manager_T.cpp
index 195e8ac03..6cf9d525f 100644
--- a/dep/acelite/ace/Hash_Multi_Map_Manager_T.cpp
+++ b/dep/acelite/ace/Hash_Multi_Map_Manager_T.cpp
@@ -3,7 +3,7 @@
 /**
  *  @file    Hash_Multi_Map_Manager_T.cpp
  *
- *  $Id: Hash_Multi_Map_Manager_T.cpp 93736 2011-04-05 12:38:35Z johnnyw $
+ *  $Id: Hash_Multi_Map_Manager_T.cpp 96985 2013-04-11 15:50:32Z huangh $
  *
  *  @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
  */
@@ -67,10 +67,10 @@ template <class EXT_ID, class INT_ID> void
 ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %d"), this->next_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("prev_ = %d"), this->prev_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %d"), this->next_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("prev_ = %d"), this->prev_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -78,13 +78,13 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class
 ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("total_size_ = %d"), this->total_size_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("total_size_ = %d"), this->total_size_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_));
   this->table_allocator_->dump ();
   this->entry_allocator_->dump ();
   this->lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -457,10 +457,10 @@ ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC
 {
   ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("index_ = %d "), this->index_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %x"), this->next_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("index_ = %d "), this->index_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %x"), this->next_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
@@ -531,10 +531,10 @@ ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A
 {
   ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("index_ = %d "), this->index_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %x"), this->next_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("index_ = %d "), this->index_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %x"), this->next_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
diff --git a/dep/acelite/ace/Hash_Multi_Map_Manager_T.h b/dep/acelite/ace/Hash_Multi_Map_Manager_T.h
index ddbb093bf..e5ded8746 100644
--- a/dep/acelite/ace/Hash_Multi_Map_Manager_T.h
+++ b/dep/acelite/ace/Hash_Multi_Map_Manager_T.h
@@ -4,7 +4,7 @@
 /**
  * @file    Hash_Multi_Map_Manager_T.h
  *
- * $Id: Hash_Multi_Map_Manager_T.h 91693 2010-09-09 12:57:54Z johnnyw $
+ * $Id: Hash_Multi_Map_Manager_T.h 96985 2013-04-11 15:50:32Z huangh $
  *
  * The code in Hash_Multi_Map_Manager_T.* was based on the code in
  * Hash_Map_Manager_T.*.
@@ -34,7 +34,7 @@
 
 #include "ace/Default_Constants.h"
 #include "ace/Functor_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #include "ace/Unbounded_Set.h"
 
diff --git a/dep/acelite/ace/Hash_Multi_Map_Manager_T.inl b/dep/acelite/ace/Hash_Multi_Map_Manager_T.inl
index 5bf8371ec..43a9fd3e1 100644
--- a/dep/acelite/ace/Hash_Multi_Map_Manager_T.inl
+++ b/dep/acelite/ace/Hash_Multi_Map_Manager_T.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Hash_Multi_Map_Manager_T.inl 94520 2011-09-22 14:55:20Z johnnyw $
+// $Id: Hash_Multi_Map_Manager_T.inl 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Guard_T.h"
 
@@ -17,7 +17,7 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::AC
     cur_size_ (0)
 {
   if (this->open (size, table_alloc, entry_alloc) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Multi_Map_Manager\n")));
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Multi_Map_Manager\n")));
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
@@ -30,7 +30,7 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::AC
     cur_size_ (0)
 {
   if (this->open (ACE_DEFAULT_MAP_SIZE, table_alloc, entry_alloc) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Multi_Map_Manager\n")));
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Multi_Map_Manager\n")));
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
diff --git a/dep/acelite/ace/High_Res_Timer.cpp b/dep/acelite/ace/High_Res_Timer.cpp
index 81f8415aa..e42c20a45 100644
--- a/dep/acelite/ace/High_Res_Timer.cpp
+++ b/dep/acelite/ace/High_Res_Timer.cpp
@@ -1,4 +1,4 @@
-// $Id: High_Res_Timer.cpp 95788 2012-05-24 07:59:51Z johnnyw $
+// $Id: High_Res_Timer.cpp 97530 2014-01-16 10:37:21Z johnnyw $
 
 // Be very carefull before changing the calculations inside
 // ACE_High_Res_Timer.  The precision matters and we are using integer
@@ -95,7 +95,7 @@ ACE_High_Res_Timer::get_cpuinfo (void)
     {
       char buf[128];
 
-      // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nReading /proc/cpuinfo...")));
+      // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nReading /proc/cpuinfo...")));
 
       while (ACE_OS::fgets (buf, sizeof buf, cpuinfo))
         {
@@ -162,12 +162,12 @@ ACE_High_Res_Timer::get_cpuinfo (void)
               if (supported)
                 {
                   scale_factor = (ACE_UINT32) (bmips + 0.5);
-                  // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" setting the clock scale factor to %u"), scale_factor));
+                  // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" setting the clock scale factor to %u"), scale_factor));
                 }
 #if 0
               else
                 {
-                  ACE_DEBUG ((LM_DEBUG,
+                  ACELIB_DEBUG ((LM_DEBUG,
                               ACE_TEXT ("\nThe BogoMIPS metric is not supported on this platform"
                                          "\n\tReport the results of the clock calibration and"
                                          "\n\tthe contents of /proc/cpuinfo to the ace-users mailing list")));
@@ -178,7 +178,7 @@ ACE_High_Res_Timer::get_cpuinfo (void)
 #endif /* __alpha__ */
         }
 
-      // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (done)\n")));
+      // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (done)\n")));
 
       ACE_OS::fclose (cpuinfo);
     }
@@ -209,33 +209,39 @@ ACE_High_Res_Timer::global_scale_factor (void)
       if (ACE_High_Res_Timer::global_scale_factor_status_ == 0)
         {
 #         if defined (ACE_WIN32)
-            // This a higher-precision version, specific for Windows systems
-            LARGE_INTEGER freq;
-            if (::QueryPerformanceFrequency (&freq))
-            {
-                ACE_High_Res_Timer::global_scale_factor(freq.QuadPart);
+          // This a higher-precision version, specific for Windows systems
+          LARGE_INTEGER freq;
+          if (::QueryPerformanceFrequency (&freq))
+          {
+            ACE_High_Res_Timer::global_scale_factor(freq.QuadPart);
 
-                ACE_High_Res_Timer::global_scale_factor_status_ = 1;
-            }
-            else
-            {
-              // High-Res timers not supported
-              ACE_High_Res_Timer::global_scale_factor_status_ = -1;
-            }
-            return ACE_High_Res_Timer::global_scale_factor_;
+            // Succeeded in setting the global scale factor
+            ACE_High_Res_Timer::global_scale_factor_status_ = 1;
+          }
+          else
+          {
+            // High-Res timers not supported
+            ACE_High_Res_Timer::global_scale_factor_status_ = -1;
+          }
 #         elif defined (ACE_LINUX)
-            ACE_High_Res_Timer::global_scale_factor (ACE_High_Res_Timer::get_cpuinfo ());
+          ACE_High_Res_Timer::global_scale_factor (ACE_High_Res_Timer::get_cpuinfo ());
 #         endif /* ! ACE_WIN32 && ! (ACE_LINUX && __alpha__) */
 
 #         if !defined (ACE_WIN32)
           if (ACE_High_Res_Timer::global_scale_factor_ <= 1u)
             // Failed to retrieve CPU speed from system, so calculate it.
             ACE_High_Res_Timer::calibrate ();
+
+          // We have set the global scale factor so set out status
+          // to 1, this way we only set the global_scale_factor_ once.
+          // Must be in the !ACE_WIN32 block to make sure that we
+          // not change a value of -1 (only done for ACE_WINC32) by accident
+          // to 1
+          ACE_High_Res_Timer::global_scale_factor_status_ = 1;
 #         endif // (ACE_WIN32)
         }
     }
 
-  ACE_High_Res_Timer::global_scale_factor_status_ = 1;
 #endif /* (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \
            ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER) && \
           ! ACE_HAS_HI_RES_TIMER &&
@@ -302,10 +308,10 @@ ACE_High_Res_Timer::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_High_Res_Timer::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nglobal_scale_factor_: %u\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nglobal_scale_factor_: %u\n"),
              global_scale_factor ()));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT (":\nstart_.hi ():     %8x; start_.lo ():      %8x;\n")
               ACE_TEXT ("end_.hi ():       %8x; end_.lo ():        %8x;\n")
               ACE_TEXT ("total_.hi ():     %8x; total_.lo ():      %8x;\n")
@@ -318,7 +324,7 @@ ACE_High_Res_Timer::dump (void) const
               static_cast<ACE_UINT32> (total_ & 0xfffffffful),
               static_cast<ACE_UINT32> (start_incr_ >> 32),
               static_cast<ACE_UINT32> (start_incr_ & 0xfffffffful)));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/ICMP_Socket.cpp b/dep/acelite/ace/ICMP_Socket.cpp
index 04ac2611d..810751d31 100644
--- a/dep/acelite/ace/ICMP_Socket.cpp
+++ b/dep/acelite/ace/ICMP_Socket.cpp
@@ -1,11 +1,12 @@
-// $Id: ICMP_Socket.cpp 93560 2011-03-16 13:54:49Z johnnyw $
+// $Id: ICMP_Socket.cpp 97309 2013-09-01 13:10:27Z mesnier_p $
 
 #include "ace/ICMP_Socket.h"
 
 #if defined (ACE_HAS_ICMP_SUPPORT) && (ACE_HAS_ICMP_SUPPORT == 1)
 
 #include "ace/ACE.h"
-#include "ace/Log_Msg.h"
+#include "ace/Sock_Connect.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_netdb.h"
 #include "ace/OS_NS_sys_socket.h"
 
@@ -89,7 +90,7 @@ ACE_ICMP_Socket::open (ACE_Addr const & local,
 
   if (! (proto = ACE_OS::getprotobyname ("icmp")))
     {
-      ACE_ERROR_RETURN
+      ACELIB_ERROR_RETURN
         ((LM_ERROR,
           ACE_TEXT ("(%P|%t) ACE_ICMP_Socket::open: %p; %s\n"),
           ACE_TEXT ("getprotobyname"),
@@ -101,7 +102,7 @@ ACE_ICMP_Socket::open (ACE_Addr const & local,
 
   if (proto_number != IPPROTO_ICMP || proto_number != protocol)
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("(%P|%t) ACE::ICMP_Socket::open - ")
                          ACE_TEXT ("only IPPROTO_ICMP protocol is ")
                          ACE_TEXT ("currently supported.\n")),
diff --git a/dep/acelite/ace/INET_Addr.cpp b/dep/acelite/ace/INET_Addr.cpp
index a41b0e440..6decc75fa 100644
--- a/dep/acelite/ace/INET_Addr.cpp
+++ b/dep/acelite/ace/INET_Addr.cpp
@@ -1,4 +1,4 @@
-// $Id: INET_Addr.cpp 95533 2012-02-14 22:59:17Z wotte $
+// $Id: INET_Addr.cpp 97355 2013-09-27 22:16:09Z shuston $
 
 // Defines the Internet domain address family address format.
 
@@ -8,7 +8,7 @@
 #include "ace/INET_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_stdlib.h"
@@ -17,6 +17,7 @@
 #include "ace/OS_NS_netdb.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_socket.h"
+#include "ace/Truncate.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -80,12 +81,12 @@ ACE_INET_Addr::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_INET_Addr::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   ACE_TCHAR s[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16];
   this->addr_to_string(s, ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), s));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), s));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -379,7 +380,8 @@ ACE_INET_Addr::set (u_short port_number,
       if ((error = ::getaddrinfo (host_name, 0, &hints, &res)) == 0)
         {
           this->set_type (res->ai_family);
-          this->set_addr (res->ai_addr, res->ai_addrlen);
+          this->set_addr (res->ai_addr,
+                          ACE_Utils::truncate_cast<int>(res->ai_addrlen));
           this->set_port_number (port_number, encode);
           ::freeaddrinfo (res);
           return 0;
@@ -541,7 +543,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
                  host_name,
                  1,
                  address_family) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"),
                 ACE_TEXT_CHAR_TO_TCHAR ((host_name == 0) ?
                                         "<unknown>" : host_name)));
@@ -559,7 +561,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
                  host_name,
                  1,
                  address_family) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"),
                 ACE_TEXT_WCHAR_TO_TCHAR ((host_name == 0) ?
                                          ACE_TEXT_WIDE ("<unknown>") :
@@ -666,7 +668,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->reset ();
   if (this->set (port_number, inet_address) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
 }
@@ -684,7 +686,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
   if (this->set (port_name,
                  host_name,
                  protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
 }
 
@@ -699,7 +701,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
   if (this->set (port_name,
                  host_name,
                  protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
 }
 #endif /* ACE_HAS_WCHAR */
@@ -716,7 +718,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
   if (this->set (port_name,
                  ACE_HTONL (inet_address),
                  protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
 }
 
@@ -731,7 +733,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
   if (this->set (port_name,
                  ACE_HTONL (inet_address),
                  protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
 }
 #endif /* ACE_HAS_WCHAR */
@@ -1127,7 +1129,7 @@ ACE_INET_Addr::get_ip_address (void) const
           return ACE_NTOHL (addr);
         }
 
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("ACE_INET_Addr::get_ip_address: address is a IPv6 address not IPv4\n")));
       errno = EAFNOSUPPORT;
       return 0;
diff --git a/dep/acelite/ace/IO_Cntl_Msg.inl b/dep/acelite/ace/IO_Cntl_Msg.inl
index 6b8558e08..8cfaad624 100644
--- a/dep/acelite/ace/IO_Cntl_Msg.inl
+++ b/dep/acelite/ace/IO_Cntl_Msg.inl
@@ -1,13 +1,15 @@
 // -*- C++ -*-
-//
-// $Id: IO_Cntl_Msg.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: IO_Cntl_Msg.inl 97589 2014-02-14 18:38:51Z johnnyw $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_IO_Cntl_Msg::ACE_IO_Cntl_Msg (ACE_IO_Cntl_Cmds c)
+ACE_IO_Cntl_Msg::ACE_IO_Cntl_Msg (ACE_IO_Cntl_Cmds c) :
+  cmd_ (c),
+  count_ (0),
+  error_ (0),
+  rval_ (0)
 {
-  this->cmd_ = c;
 }
 
 ACE_INLINE ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds
diff --git a/dep/acelite/ace/IO_SAP.cpp b/dep/acelite/ace/IO_SAP.cpp
index d4bca8c88..cebbc8ff3 100644
--- a/dep/acelite/ace/IO_SAP.cpp
+++ b/dep/acelite/ace/IO_SAP.cpp
@@ -1,8 +1,8 @@
-// $Id: IO_SAP.cpp 93736 2011-04-05 12:38:35Z johnnyw $
+// $Id: IO_SAP.cpp 97661 2014-03-17 09:52:07Z johnnyw $
 
 #include "ace/IO_SAP.h"
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_fcntl.h"
@@ -31,23 +31,16 @@ ACE_IO_SAP::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_IO_SAP::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d"), this->pid_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
-// Cache for the process ID.
-pid_t ACE_IO_SAP::pid_ = 0;
-
 int
 ACE_IO_SAP::enable (int value) const
 {
   ACE_TRACE ("ACE_IO_SAP::enable");
-  /* First-time in initialization. */
-  if (ACE_IO_SAP::pid_ == 0)
-    ACE_IO_SAP::pid_ = ACE_OS::getpid ();
 
   switch (value)
     {
@@ -57,7 +50,7 @@ ACE_IO_SAP::enable (int value) const
 #if defined (F_SETOWN)
       return ACE_OS::fcntl (this->handle_,
                             F_SETOWN,
-                            ACE_IO_SAP::pid_);
+                            ACE_OS::getpid ());
 #else
       ACE_NOTSUP_RETURN (-1);
 #endif /* F_SETOWN */
@@ -68,7 +61,7 @@ ACE_IO_SAP::enable (int value) const
 #if defined (F_SETOWN) && defined (FASYNC)
       if (ACE_OS::fcntl (this->handle_,
                          F_SETOWN,
-                         ACE_IO_SAP::pid_) == -1
+                         ACE_OS::getpid ()) == -1
           || ACE::set_flags (this->handle_,
                              FASYNC) == -1)
         return -1;
diff --git a/dep/acelite/ace/IO_SAP.h b/dep/acelite/ace/IO_SAP.h
index b460c2346..44f5202d1 100644
--- a/dep/acelite/ace/IO_SAP.h
+++ b/dep/acelite/ace/IO_SAP.h
@@ -4,7 +4,7 @@
 /**
  *  @file    IO_SAP.h
  *
- *  $Id: IO_SAP.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: IO_SAP.h 97661 2014-03-17 09:52:07Z johnnyw $
  *
  *  @author Doug Schmidt
  */
@@ -81,9 +81,6 @@ protected:
 private:
   /// Underlying I/O handle.
   ACE_HANDLE handle_;
-
-  /// Cache the process ID.
-  static pid_t pid_;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/IPC_SAP.cpp b/dep/acelite/ace/IPC_SAP.cpp
index bdd0f8a3c..edeae03fc 100644
--- a/dep/acelite/ace/IPC_SAP.cpp
+++ b/dep/acelite/ace/IPC_SAP.cpp
@@ -1,8 +1,8 @@
-// $Id: IPC_SAP.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: IPC_SAP.cpp 97661 2014-03-17 09:52:07Z johnnyw $
 
 #include "ace/IPC_SAP.h"
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_signal.h"
 #include "ace/OS_NS_errno.h"
@@ -24,16 +24,12 @@ ACE_IPC_SAP::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_IPC_SAP::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d"), this->pid_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
-// Cache for the process ID.
-pid_t ACE_IPC_SAP::pid_ = 0;
-
 // This is the do-nothing constructor.  It does not perform a
 // ACE_OS::socket system call.
 
@@ -48,10 +44,6 @@ ACE_IPC_SAP::enable (int value) const
 {
   ACE_TRACE ("ACE_IPC_SAP::enable");
 
-  // First-time in initialization.
-  if (ACE_IPC_SAP::pid_ == 0)
-    ACE_IPC_SAP::pid_ = ACE_OS::getpid ();
-
 #if defined (ACE_WIN32) || defined (ACE_VXWORKS)
   switch (value)
     {
@@ -76,7 +68,7 @@ ACE_IPC_SAP::enable (int value) const
 #if defined (F_SETOWN)
       return ACE_OS::fcntl (this->handle_,
                             F_SETOWN,
-                            ACE_IPC_SAP::pid_);
+                            ACE_OS::getpid ());
 #else
       ACE_NOTSUP_RETURN (-1);
 #endif /* F_SETOWN */
@@ -87,7 +79,7 @@ ACE_IPC_SAP::enable (int value) const
 #if defined (F_SETOWN) && defined (FASYNC)
       if (ACE_OS::fcntl (this->handle_,
                          F_SETOWN,
-                         ACE_IPC_SAP::pid_) == -1
+                         ACE_OS::getpid ()) == -1
           || ACE::set_flags (this->handle_,
                                         FASYNC) == -1)
         return -1;
diff --git a/dep/acelite/ace/IPC_SAP.h b/dep/acelite/ace/IPC_SAP.h
index 43a2125c5..c7576889e 100644
--- a/dep/acelite/ace/IPC_SAP.h
+++ b/dep/acelite/ace/IPC_SAP.h
@@ -4,7 +4,7 @@
 /**
  *  @file    IPC_SAP.h
  *
- *  $Id: IPC_SAP.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: IPC_SAP.h 97661 2014-03-17 09:52:07Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -81,9 +81,6 @@ protected:
 private:
   /// Underlying I/O handle.
   ACE_HANDLE handle_;
-
-  /// Cache the process ID.
-  static pid_t pid_;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/If_Then_Else.h b/dep/acelite/ace/If_Then_Else.h
index eca1d9dd8..a6b0a4df6 100644
--- a/dep/acelite/ace/If_Then_Else.h
+++ b/dep/acelite/ace/If_Then_Else.h
@@ -8,7 +8,7 @@
  *  template described in the book "C++ Templates" by Vandevoorde and
  *  Josuttis.
  *
- *  $Id: If_Then_Else.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: If_Then_Else.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
  */
@@ -17,7 +17,7 @@
 #ifndef ACE_IF_THEN_ELSE_H
 #define ACE_IF_THEN_ELSE_H
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dep/acelite/ace/Init_ACE.h b/dep/acelite/ace/Init_ACE.h
index 2bbaafc3e..5478139e4 100644
--- a/dep/acelite/ace/Init_ACE.h
+++ b/dep/acelite/ace/Init_ACE.h
@@ -4,7 +4,7 @@
 /**
  *  @file   Init_ACE.h
  *
- *  $Id: Init_ACE.h 88794 2010-02-01 19:15:36Z schmidt $
+ *  $Id: Init_ACE.h 97431 2013-11-19 14:28:52Z johnnyw $
  *
  *  Initialize and finalize the ACE library services.  You can
  *  generally execute the @a ACE::init() and @a ACE::fini() sequence
@@ -56,8 +56,8 @@ namespace ACE
   //  Used internally, so not exported.
 
   /**
-   * Counter to match <init()>/<fini()> calls.  <init()> must increment it;
-   * <fini()> must decrement it.  <fini()> then does nothing until it
+   * Counter to match init()/fini() calls.  init() must increment it;
+   * fini() must decrement it.  fini() then does nothing until it
    * reaches 0.
    */
   extern unsigned int init_fini_count_;
diff --git a/dep/acelite/ace/Intrusive_Auto_Ptr.inl b/dep/acelite/ace/Intrusive_Auto_Ptr.inl
index 4feb83db7..8216e7213 100644
--- a/dep/acelite/ace/Intrusive_Auto_Ptr.inl
+++ b/dep/acelite/ace/Intrusive_Auto_Ptr.inl
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 //
-// $Id: Intrusive_Auto_Ptr.inl 81219 2008-04-02 20:23:32Z iliyan $
+// $Id: Intrusive_Auto_Ptr.inl 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dep/acelite/ace/LSOCK.cpp b/dep/acelite/ace/LSOCK.cpp
index 71af23195..401001396 100644
--- a/dep/acelite/ace/LSOCK.cpp
+++ b/dep/acelite/ace/LSOCK.cpp
@@ -1,4 +1,4 @@
-// $Id: LSOCK.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: LSOCK.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/LSOCK.h"
 
@@ -6,7 +6,7 @@
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_sys_socket.h"
 
 #if !defined (__ACE_INLINE__)
@@ -23,9 +23,9 @@ ACE_LSOCK::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/LSOCK_Acceptor.cpp b/dep/acelite/ace/LSOCK_Acceptor.cpp
index 10c5acf55..e32f04d31 100644
--- a/dep/acelite/ace/LSOCK_Acceptor.cpp
+++ b/dep/acelite/ace/LSOCK_Acceptor.cpp
@@ -1,10 +1,10 @@
-// $Id: LSOCK_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: LSOCK_Acceptor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/LSOCK_Acceptor.h"
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_socket.h"
 
@@ -34,9 +34,9 @@ ACE_LSOCK_Acceptor::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK_Acceptor::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->local_addr_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -74,7 +74,7 @@ ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor (const ACE_Addr &remote_sap,
                   protocol_family,
                   backlog,
                   protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 "ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor"));
 }
 
diff --git a/dep/acelite/ace/LSOCK_CODgram.cpp b/dep/acelite/ace/LSOCK_CODgram.cpp
index 8c6e967ba..6c9ec3906 100644
--- a/dep/acelite/ace/LSOCK_CODgram.cpp
+++ b/dep/acelite/ace/LSOCK_CODgram.cpp
@@ -1,9 +1,9 @@
-// $Id: LSOCK_CODgram.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: LSOCK_CODgram.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/LSOCK_CODgram.h"
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 
 
@@ -21,10 +21,10 @@ ACE_LSOCK_CODgram::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK_CODgram::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_SOCK_CODgram::dump ();
   ACE_LSOCK::dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -54,7 +54,7 @@ ACE_LSOCK_CODgram::ACE_LSOCK_CODgram (const ACE_Addr &remote,
   ACE_TRACE ("ACE_LSOCK_CODgram::ACE_LSOCK_CODgram");
   if (this->open (remote, local, protocol_family,
                   protocol) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_LSOCK_CODgram")));
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_LSOCK_CODgram")));
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/LSOCK_Connector.cpp b/dep/acelite/ace/LSOCK_Connector.cpp
index 66e1d8851..273580dbd 100644
--- a/dep/acelite/ace/LSOCK_Connector.cpp
+++ b/dep/acelite/ace/LSOCK_Connector.cpp
@@ -1,9 +1,9 @@
-// $Id: LSOCK_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: LSOCK_Connector.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/LSOCK_Connector.h"
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 
 
@@ -21,9 +21,9 @@ ACE_LSOCK_Connector::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK_Connector::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/LSOCK_Dgram.cpp b/dep/acelite/ace/LSOCK_Dgram.cpp
index d681915f8..929b64504 100644
--- a/dep/acelite/ace/LSOCK_Dgram.cpp
+++ b/dep/acelite/ace/LSOCK_Dgram.cpp
@@ -1,9 +1,9 @@
-// $Id: LSOCK_Dgram.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: LSOCK_Dgram.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/LSOCK_Dgram.h"
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 
 
@@ -21,10 +21,10 @@ ACE_LSOCK_Dgram::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK_Dgram::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_SOCK_Dgram::dump ();
   ACE_LSOCK::dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -61,7 +61,7 @@ ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (const ACE_Addr &local,
   if (this->open (local,
                   protocol_family,
                   protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_LSOCK_Dgram")));
 }
diff --git a/dep/acelite/ace/LSOCK_Stream.cpp b/dep/acelite/ace/LSOCK_Stream.cpp
index 34475132d..060d4a5c1 100644
--- a/dep/acelite/ace/LSOCK_Stream.cpp
+++ b/dep/acelite/ace/LSOCK_Stream.cpp
@@ -1,9 +1,9 @@
-// $Id: LSOCK_Stream.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: LSOCK_Stream.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/LSOCK_Stream.h"
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_sys_socket.h"
 
 
@@ -50,10 +50,10 @@ ACE_LSOCK_Stream::dump (void) const
 {
   ACE_TRACE ("ACE_LSOCK_Stream::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_SOCK_Stream::dump ();
   ACE_LSOCK::dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
 #if defined (ACE_HAS_MSG)
diff --git a/dep/acelite/ace/Lib_Find.cpp b/dep/acelite/ace/Lib_Find.cpp
index 6c63df21b..724868932 100644
--- a/dep/acelite/ace/Lib_Find.cpp
+++ b/dep/acelite/ace/Lib_Find.cpp
@@ -1,7 +1,7 @@
-// $Id: Lib_Find.cpp 95630 2012-03-22 13:04:47Z johnnyw $
+// $Id: Lib_Find.cpp 97383 2013-10-23 08:44:20Z mhengstmengel $
 
 #include "ace/Lib_Find.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_stdio.h"
@@ -75,13 +75,13 @@ ACE_LD_Symbol_Registry::register_symbol (const ACE_TCHAR* symname,
   int const result = symbol_registry_.bind (symname, symaddr);
   if (result == 1)
     {
-      ACE_DEBUG((LM_INFO, ACE_TEXT ("ACE_LD_Symbol_Registry:")
+      ACELIB_DEBUG((LM_INFO, ACE_TEXT ("ACE_LD_Symbol_Registry:")
                           ACE_TEXT (" duplicate symbol %s registered\n"),
                           ACE_TEXT_ALWAYS_CHAR (symname)));
     }
   else if (result == -1)
     {
-      ACE_ERROR((LM_ERROR, ACE_TEXT ("ACE_LD_Symbol_Registry:")
+      ACELIB_ERROR((LM_ERROR, ACE_TEXT ("ACE_LD_Symbol_Registry:")
                            ACE_TEXT (" failed to register symbol %s\n"),
                            ACE_TEXT_ALWAYS_CHAR (symname)));
     }
@@ -104,10 +104,9 @@ ACE_SINGLETON_DECLARE (ACE_Singleton,
 typedef ACE_Singleton<ACE_LD_Symbol_Registry, ACE_Thread_Mutex>
         ACE_LD_SYMBOL_REGISTRY;
 
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-template ACE_Singleton<ACE_LD_Symbol_Registry, ACE_Thread_Mutex> *
-  ACE_Singleton<ACE_LD_Symbol_Registry, ACE_Thread_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_LD_Symbol_Registry, ACE_SYNCH_MUTEX);
+
+
 #endif
 
 
@@ -268,7 +267,7 @@ ACE::ldfind (const ACE_TCHAR* filename,
       if (ACE_OS::strcmp (s, dll_suffix) != 0)
 #endif /* ACE_WIN32 */
         {
-          ACE_ERROR ((LM_WARNING,
+          ACELIB_ERROR ((LM_WARNING,
                       ACE_TEXT ("Warning: improper suffix for a ")
                       ACE_TEXT ("shared library on this platform: %s\n"),
                       s));
diff --git a/dep/acelite/ace/Local_Memory_Pool.cpp b/dep/acelite/ace/Local_Memory_Pool.cpp
index abebb2546..cb76f297e 100644
--- a/dep/acelite/ace/Local_Memory_Pool.cpp
+++ b/dep/acelite/ace/Local_Memory_Pool.cpp
@@ -1,10 +1,10 @@
-// $Id: Local_Memory_Pool.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Local_Memory_Pool.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 // Local_Memory_Pool.cpp
 #include "ace/Local_Memory_Pool.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_Memory.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 
 
@@ -62,7 +62,7 @@ ACE_Local_Memory_Pool::acquire (size_t nbytes,
   ACE_Auto_Basic_Array_Ptr<char> cp (temp);
 
   if (this->allocated_chunks_.insert (cp.get ()) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("(%P|%t) insertion into set failed\n")),
                       0);
 
diff --git a/dep/acelite/ace/Local_Name_Space_T.cpp b/dep/acelite/ace/Local_Name_Space_T.cpp
index ee545e5df..d514214f9 100644
--- a/dep/acelite/ace/Local_Name_Space_T.cpp
+++ b/dep/acelite/ace/Local_Name_Space_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Local_Name_Space_T.cpp 83170 2008-10-13 07:21:38Z johnnyw $
+// $Id: Local_Name_Space_T.cpp 97590 2014-02-14 18:41:55Z johnnyw $
 
 #ifndef ACE_LOCAL_NAME_SPACE_T_CPP
 #define ACE_LOCAL_NAME_SPACE_T_CPP
@@ -368,11 +368,14 @@ template <ACE_MEM_POOL_1, class ACE_LOCK>
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Local_Name_Space (
   ACE_Naming_Context::Context_Scope_Type scope_in,
   ACE_Name_Options *name_options)
-  : name_options_ (name_options)
+  : allocator_ (0),
+    name_space_map_ (0),
+    name_options_ (name_options),
+    lock_ (0)
 {
   ACE_TRACE ("ACE_Local_Name_Space::ACE_Local_Name_Space");
   if (this->open (scope_in) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_Local_Name_Space::ACE_Local_Name_Space")));
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_Local_Name_Space::ACE_Local_Name_Space")));
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK>
@@ -469,7 +472,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void)
                              &options), -1);
 
   if (ACE_LOG_MSG->op_status ())
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Allocator::Allocator\n")),
                       -1);
 
@@ -480,7 +483,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void)
 #if !defined (ACE_LACKS_ACCESS)
   // Now check if the backing store has been created successfully
   if (ACE_OS::access (this->context_file_, F_OK) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("create_manager\n")),
                       -1);
 #endif /* ACE_LACKS_ACCESS */
@@ -493,7 +496,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void)
     {
       this->name_space_map_ = (ACE_Name_Space_Map <ALLOCATOR> *) ns_map;
       if (ACE::debug ())
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("name_space_map_ = %@, ns_map = %@\n"),
                     this->name_space_map_, ns_map));
     }
@@ -510,7 +513,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void)
         {
           this->name_space_map_ = (ACE_Name_Space_Map <ALLOCATOR> *) ns_map;
           if (ACE::debug ())
-            ACE_DEBUG ((LM_DEBUG,
+            ACELIB_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("name_space_map_ = %@, ns_map = %@\n"),
                         this->name_space_map_, ns_map));
         }
@@ -524,12 +527,12 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void)
             new (ns_map) ACE_Name_Space_Map <ALLOCATOR> (this->allocator_);
 
           if (this->allocator_->bind (ACE_NAME_SERVER_MAP, ns_map) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
+            ACELIB_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("create_manager\n")), -1);
         }
 
       if (ACE::debug ())
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("name_space_map_ = %@, ns_map = %@\n"),
                     this->name_space_map_, ns_map));
     }
@@ -798,7 +801,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const
 {
   ACE_TRACE ("ACE_Local_Name_Space::dump_i");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   MAP_MANAGER::ITERATOR map_iterator (*this->name_space_map_);
   MAP_MANAGER::ENTRY *map_entry;
@@ -813,7 +816,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const
       const char *type = map_entry->int_id_.type ();
 #endif /* ! ACE_NLOGGING */
 
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("key=%C\nvalue=%C\ntype=%C\n"),
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("key=%C\nvalue=%C\ntype=%C\n"),
                   key, value, type));
       // We need to delete key and value since char_rep allocates
       // memory for them
@@ -821,7 +824,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const
       delete [] value;
     }
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
diff --git a/dep/acelite/ace/Local_Tokens.cpp b/dep/acelite/ace/Local_Tokens.cpp
index 5901bb188..c7a79f882 100644
--- a/dep/acelite/ace/Local_Tokens.cpp
+++ b/dep/acelite/ace/Local_Tokens.cpp
@@ -1,4 +1,4 @@
-// $Id: Local_Tokens.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: Local_Tokens.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Local_Tokens.h"
 
@@ -20,14 +20,14 @@ ACE_Tokens::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Tokens::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Tokens::dump:\n")
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Tokens::dump:\n")
                         ACE_TEXT (" reference_cont_ = %d\n")
                         ACE_TEXT (" token_name_ = %s\n"),
                         reference_count_, token_name_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("waiters_\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("waiters_\n")));
   this->waiters_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -78,8 +78,8 @@ ACE_TPQ_Entry::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TPQ_Entry::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("ACE_TPQ_Entry::dump:\n")
               ACE_TEXT (" nesting_level_ = %d\n")
               ACE_TEXT (" client_id_ = %s\n"),
@@ -88,12 +88,12 @@ ACE_TPQ_Entry::dump (void) const
 
   if (next_ != 0)
     {
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next:.\n")));
+      ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("next:.\n")));
       next_->dump ();
     }
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TPQ_Entry::dump end.\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TPQ_Entry::dump end.\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -186,13 +186,13 @@ ACE_TSS_TPQ_Entry::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TSS_TPQ_Entry::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_TSS_TPQ_Entry::dump:\n")
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_TSS_TPQ_Entry::dump:\n")
                         ACE_TEXT (" client_id_ = %s\n"),
                         client_id_ == 0 ? ACE_TEXT ("0") : client_id_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
   ACE_TPQ_ENTRY::dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -270,12 +270,12 @@ ACE_TPQ_Iterator::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TPQ_Iterator::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_TPQ_Iterator::dump:\n")
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_TPQ_Iterator::dump:\n")
               ACE_TEXT (" current_ = %d\n"),
               (long) this->current_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("head_ and tail_\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("head_ and tail_\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -284,16 +284,16 @@ ACE_Token_Proxy_Queue::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token_Proxy_Queue::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy_Queue::dump:\n")
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy_Queue::dump:\n")
                         ACE_TEXT (" size_ = %d\n"),
                         size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ and tail_\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ and tail_\n")));
   if (this->head_ != 0)
     this->head_->dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy_Queue::dump end.\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy_Queue::dump end.\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -374,7 +374,7 @@ ACE_Token_Proxy_Queue::dequeue (void)
   --this->size_;
 
   if (this->head_ == 0 && this->size_ != 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("incorrect size = %d\n"),
                 this->size_));
 }
@@ -448,14 +448,14 @@ ACE_Mutex_Token::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Mutex_Token::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Mutex_Token::dump:\n")));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("lock_\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Mutex_Token::dump:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("lock_\n")));
   lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
   ACE_Tokens::dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Mutex_Token::dump end.\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Mutex_Token::dump end.\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -703,15 +703,15 @@ ACE_RW_Token::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_RW_Token::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_RW_Token::dump:\n")
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_RW_Token::dump:\n")
                         ACE_TEXT ("num_writers_ = %d\n"), num_writers_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("lock_\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("lock_\n")));
   this->lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
   ACE_Tokens::dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_RW_Token::dump end.\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_RW_Token::dump end.\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -1085,20 +1085,20 @@ ACE_Token_Proxy::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token_Proxy::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Token_Proxy::dump:\n")
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Token_Proxy::dump:\n")
                         ACE_TEXT (" type = %d\n")
                         ACE_TEXT (" ignore_deadlock_ = %d\n")
                         ACE_TEXT (" debug_ = %d\n"),
                         (int) this->type (), ignore_deadlock_, debug_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("mutex_, and waiter_\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("mutex_, and waiter_\n")));
 
   if (this->token_ != 0)
     this->token_->dump ();
 
   this->waiter_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy::dump end.\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy::dump end.\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -1203,7 +1203,7 @@ ACE_Token_Proxy::open (const ACE_TCHAR *token_name,
   if (this->token_ == 0)
     {
       errno = ENOMEM;
-      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Can't allocate mutex")), -1);
+      ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Can't allocate mutex")), -1);
     }
 
   return 0;
@@ -1218,7 +1218,7 @@ ACE_Token_Proxy::acquire (int notify,
   if (this->token_ == 0)
     {
       errno = ENOENT;
-      ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Not open.\n")), -1);
+      ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Not open.\n")), -1);
     }
 
   // Make sure no one calls our token_acquired until we have a chance
@@ -1247,7 +1247,7 @@ ACE_Token_Proxy::acquire (int notify,
 
         case EWOULDBLOCK :
           if (this->debug_)
-            ACE_DEBUG ((LM_DEBUG,
+            ACELIB_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("(%t) waiting for %s, owner is %s, ")
                         ACE_TEXT ("total waiters == %d\n"),
                         this->name (),
@@ -1268,7 +1268,7 @@ ACE_Token_Proxy::acquire (int notify,
 
         default :
           waiter_->cond_var_.mutex ().release ();
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("%p\n"),
                              ACE_TEXT ("Token Proxy acquire.")),
                             -1);
@@ -1278,7 +1278,7 @@ ACE_Token_Proxy::acquire (int notify,
     // we have the token
     {
       if (debug_)
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("(%t) acquired %s\n"),
                     this->name ()));
       waiter_->cond_var_.mutex ().release ();
@@ -1294,7 +1294,7 @@ ACE_Token_Proxy::tryacquire (void (*sleep_hook)(void *))
   if (this->token_ == 0)
     {
       errno = ENOENT;
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Not open.\n")),
                         -1);
     }
@@ -1312,7 +1312,7 @@ ACE_Token_Proxy::renew (int requeue_position,
   if (this->token_ == 0)
     {
       errno = ENOENT;
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Not open.\n")),
                         -1);
     }
@@ -1325,11 +1325,11 @@ ACE_Token_Proxy::renew (int requeue_position,
     {
       // check for error
       if (errno != EWOULDBLOCK)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p renew failed\n"), ACE_TEXT ("ACE_Token_Proxy")), -1);
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) renew blocking for %s, owner is %s\n"),
+        ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) renew blocking for %s, owner is %s\n"),
                     this->name (),
                     token_->owner_id ()));
 
@@ -1340,7 +1340,7 @@ ACE_Token_Proxy::renew (int requeue_position,
     // we have the token
     {
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) renewed %s\n"),
+        ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) renewed %s\n"),
                     this->name ()));
       waiter_->cond_var_.mutex ().release ();
       return 0;
@@ -1375,12 +1375,12 @@ ACE_Token_Proxy::handle_options (ACE_Synch_Options &options,
           // We come here if a timeout occurs or some serious
           // ACE_Condition object error.
           cv.mutex ().release ();
-          ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("condition variable wait")
+          ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("condition variable wait")
                              ACE_TEXT (" bombed.")), -1);
         }
 
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) unblocking %s.\n"),
+        ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) unblocking %s.\n"),
                     this->client_id ()));
       cv.mutex ().release ();
       return 0;       // operation succeeded
@@ -1396,7 +1396,7 @@ ACE_Token_Proxy::release (ACE_Synch_Options &)
     {
       errno = ENOENT;
       if (debug_)
-        ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("Must open before releasing.\n")));
+        ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("Must open before releasing.\n")));
       ACE_RETURN (-1);
     }
 
@@ -1405,13 +1405,13 @@ ACE_Token_Proxy::release (ACE_Synch_Options &)
       // Release failed.
       this->token_->remove (this->waiter_);
       if (debug_)
-        ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) %p.\n"), ACE_TEXT ("release failed")));
+        ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) %p.\n"), ACE_TEXT ("release failed")));
       return -1;
     }
   else
     {
       if (this->debug_)
-        ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) released %s, owner is %s\n"),
+        ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) released %s, owner is %s\n"),
                     this->name (),
                     token_->owner_id ()));
 
@@ -1510,11 +1510,11 @@ ACE_Token_Name::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token_Name::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Token_Name::dump:\n")
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Token_Name::dump:\n")
                         ACE_TEXT (" token_name_ = %s\n"),
               token_name_ == 0 ? ACE_TEXT ("no name") : token_name_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Local_Tokens.h b/dep/acelite/ace/Local_Tokens.h
index 72e528bfd..d7efb99e6 100644
--- a/dep/acelite/ace/Local_Tokens.h
+++ b/dep/acelite/ace/Local_Tokens.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Local_Tokens.h
  *
- *  $Id: Local_Tokens.h 93792 2011-04-07 11:48:50Z mcorino $
+ *  $Id: Local_Tokens.h 96985 2013-04-11 15:50:32Z huangh $
  *
  *  @author Karl-Heinz Dorn <kdorn@erlh.siemens.de>
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
@@ -59,7 +59,7 @@
 #include "ace/Containers.h"
 #include "ace/Synch_Options.h"
 #include "ace/Map_Manager.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
 
diff --git a/dep/acelite/ace/Local_Tokens.inl b/dep/acelite/ace/Local_Tokens.inl
index 0c599630f..a4c21ec67 100644
--- a/dep/acelite/ace/Local_Tokens.inl
+++ b/dep/acelite/ace/Local_Tokens.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Local_Tokens.inl 92069 2010-09-28 11:38:59Z johnnyw $
+// $Id: Local_Tokens.inl 96985 2013-04-11 15:50:32Z huangh $
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
@@ -74,7 +74,7 @@ ACE_Tokens::dec_reference (void)
   ACE_TRACE ("ACE_Tokens::dec_reference");
   if (this->reference_count_ == 0)
     {
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("dec_reference already zero")));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("dec_reference already zero")));
       return 0;
     }
 
diff --git a/dep/acelite/ace/Log_Category.cpp b/dep/acelite/ace/Log_Category.cpp
new file mode 100644
index 000000000..bf9c7c828
--- /dev/null
+++ b/dep/acelite/ace/Log_Category.cpp
@@ -0,0 +1,137 @@
+// $Id: Log_Category.cpp 97058 2013-04-19 14:41:18Z huangh $
+
+#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
+#include "ace/Atomic_Op.h"
+#include "ace/OS_NS_Thread.h"
+
+
+#if !defined (__ACE_INLINE__)
+#include "ace/Log_Category.inl"
+#endif /* __ACE_INLINE__ */
+
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#if defined (ACE_HAS_THREADS)
+extern "C" void
+ACE_Log_Category_tss_destroy(void * p)
+{
+  delete static_cast<ACE_Log_Category_TSS*>(p);
+}
+#endif // defined (ACE_HAS_THREADS)
+
+
+ACE_Log_Category::ACE_Log_Category(const char* name)
+  : name_(name)
+  , id_(0)
+/// Default per-process priority mask
+/// By default, all priorities are enabled.
+  , priority_mask_(LM_SHUTDOWN
+                   | LM_TRACE
+                   | LM_DEBUG
+                   | LM_INFO
+                   | LM_NOTICE
+                   | LM_WARNING
+                   | LM_STARTUP
+                   | LM_ERROR
+                   | LM_CRITICAL
+                   | LM_ALERT
+                   | LM_EMERGENCY)
+#if defined (ACE_HAS_THREADS)
+  , key_(ACE_OS::NULL_key)
+#else
+  , per_thr_obj_(this, 0)
+#endif
+{
+}
+
+ACE_Log_Category::~ACE_Log_Category()
+{
+#if defined (ACE_HAS_THREADS)
+  ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->keylock_);
+
+  if (this->id_ > 0)
+    {
+      void *temp = 0;
+      if (ACE_OS::thr_getspecific (this->key_, &temp) == -1)
+        {
+          return; // This should not happen!
+        }
+      if (temp != 0) {
+        delete static_cast <ACE_Log_Category_TSS *> (temp);
+        ACE_OS::thr_setspecific (this->key_, 0);
+      }
+      ACE_OS::thr_keyfree (this->key_);
+    }
+#endif
+}
+
+ACE_Log_Category_TSS::ACE_Log_Category_TSS(ACE_Log_Category* category, ACE_Log_Msg* logger)
+  : category_(category)
+  , logger_(logger)
+  , priority_mask_(0)
+{
+}
+
+ACE_Log_Category_TSS*
+ACE_Log_Category::per_thr_obj()
+{
+#if defined (ACE_HAS_THREADS)
+  {
+    // Ensure that we are serialized!
+    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->keylock_, 0);
+
+    // make sure we only create the key once!
+    if (this->id_ == 0)
+      {
+        static ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int> log_category_id_assigner(1);
+        id_ = log_category_id_assigner++; // for atomic integers, post increment is more efficient
+
+        if (ACE_OS::thr_keycreate (&this->key_,
+                                   &ACE_Log_Category_tss_destroy) != 0)
+          return 0; // Major problems, this should *never* happen!
+      }
+  }
+
+  void *temp = 0;
+  if (ACE_OS::thr_getspecific (this->key_, &temp) == -1)
+    {
+      return 0; // This should not happen!
+    }
+  if (temp != 0)
+    return static_cast <ACE_Log_Category_TSS *> (temp);
+
+  ACE_Log_Category_TSS * result;
+
+  ACE_NEW_RETURN(result,
+                 ACE_Log_Category_TSS(this, ACE_Log_Msg::instance()),
+                 0);
+
+ if (ACE_OS::thr_setspecific (this->key_,
+                              result) != 0)
+   {
+     return 0;
+   }
+
+  return result;
+#else // defined (ACE_HAS_THREADS)
+  if (this->id_ == 0) {
+    static unsigned int log_category_id_assigner = 0;
+    id_ = log_category_id_assigner++;
+    per_thr_obj_.logger_ = ACE_Log_Msg::instance();
+  }
+  return &per_thr_obj_;
+#endif // defined (ACE_HAS_THREADS)
+}
+
+
+
+ACE_Log_Category&
+ACE_Log_Category::ace_lib()
+{
+  static ACE_Log_Category ace_lib_category("ACE");
+  return ace_lib_category;
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Log_Category.h b/dep/acelite/ace/Log_Category.h
new file mode 100644
index 000000000..5d9219421
--- /dev/null
+++ b/dep/acelite/ace/Log_Category.h
@@ -0,0 +1,277 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Log_Category.h
+ *
+ *  $Id: Log_Category.h 97213 2013-06-27 17:06:10Z huangh $
+ *
+ *  @author Huang-Ming Huang <huangh@ociweb.com>
+ */
+//=============================================================================
+
+#ifndef ACE_LOG_CATEGORY_H
+#define ACE_LOG_CATEGORY_H
+
+#include /**/ "ace/pre.h"
+
+#include "ace/Log_Priority.h"
+#include "ace/Log_Msg.h"
+#include "ace/Thread_Mutex.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#if defined (ACE_NLOGGING)
+#if !defined (ACELIB_HEX_DUMP)
+# define ACELIB_HEX_DUMP(X) do {} while (0)
+#endif
+#if !defined (ACELIB_RETURN)
+# define ACELIB_RETURN(Y) do { return (Y); } while (0)
+#endif
+#if !defined (ACELIB_ERROR_RETURN)
+# define ACELIB_ERROR_RETURN(X, Y) return (Y)
+#endif
+#if !defined (ACELIB_ERROR_BREAK)
+# define ACELIB_ERROR_BREAK(X) { break; }
+#endif
+#if !defined (ACELIB_ERROR)
+# define ACELIB_ERROR(X) do {} while (0)
+#endif
+#if !defined (ACELIB_DEBUG)
+# define ACELIB_DEBUG(X) do {} while (0)
+#endif
+#if !defined (ACELIB_ERROR_INIT)
+# define ACELIB_ERROR_INIT(VALUE, FLAGS)
+#endif
+#else
+#if !defined (ACELIB_HEX_DUMP)
+#define ACELIB_HEX_DUMP(X) \
+  do { \
+    int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
+    ACE_Log_Category_TSS *ace___ = ACE_Log_Category::ace_lib().per_thr_obj(); \
+    if (ace___ == 0) break;\
+    ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \
+    ace___->log_hexdump X; \
+  } while (0)
+#endif
+#if !defined (ACELIB_RETURN)
+#define ACELIB_RETURN(Y) \
+  do { \
+    int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
+    ACE_Log_Msg *ace___ = ACE_Log_Msg::instance(); \
+    ace___->set (__FILE__, __LINE__, Y, __ace_error, ace___->restart (), \
+                 ace___->msg_ostream (), ace___->msg_callback ()); \
+    return Y; \
+  } while (0)
+#endif
+#if !defined (ACELIB_ERROR_RETURN)
+#define ACELIB_ERROR_RETURN(X, Y) \
+  do { \
+    int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
+    ACE_Log_Category_TSS *ace___ = ACE_Log_Category::ace_lib().per_thr_obj(); \
+    if (ace___ == 0) return Y;\
+    ace___->conditional_set (__FILE__, __LINE__, Y, __ace_error); \
+    ace___->log X; \
+    return Y; \
+  } while (0)
+#endif
+#if !defined (ACELIB_ERROR)
+#define ACELIB_ERROR(X) \
+  do { \
+    int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
+    ACE_Log_Category_TSS *ace___ = ACE_Log_Category::ace_lib().per_thr_obj(); \
+    if (ace___ == 0) break;\
+    ace___->conditional_set (__FILE__, __LINE__, -1, __ace_error); \
+    ace___->log X; \
+  } while (0)
+#endif
+#if !defined (ACELIB_DEBUG)
+#define ACELIB_DEBUG(X) \
+  do { \
+    int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
+    ACE_Log_Category_TSS *ace___ = ACE_Log_Category::ace_lib().per_thr_obj(); \
+    if (ace___ == 0) break;\
+    ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \
+    ace___->log X; \
+  } while (0)
+#endif
+#if !defined (ACELIB_ERROR_BREAK)
+#define ACELIB_ERROR_BREAK(X) { ACELIB_ERROR (X); break; }
+#endif
+#endif /* ACE_NLOGGING */
+
+
+class ACE_Log_Msg;
+class ACE_Log_Category;
+
+
+/**
+ * @class ACE_Log_Category_TSS
+ *
+ * @brief The thread specific object for a ACE_Log_Categy object.
+ *
+ * @see ACE_Log_Categy
+ */
+
+class ACE_Export ACE_Log_Category_TSS
+{
+public:
+  ACE_Log_Category_TSS(ACE_Log_Category* category, ACE_Log_Msg* logger);
+
+  const char* name();
+  unsigned int id();
+
+  ACE_Log_Msg* logger();
+  /// Get the current ACE_Log_Priority mask.
+  u_long priority_mask ();
+
+  /// Set the ACE_Log_Priority mask, returns original mask.
+  u_long priority_mask (u_long);
+  /// Return true if the requested priority is enabled.
+  int log_priority_enabled (ACE_Log_Priority log_priority);
+
+  /**
+   * Set the line number, file name, operational status, error number,
+   * restart flag, ostream, and the callback object.  This combines
+   * all the other set methods into a single method.
+   */
+  void set (const char *file,
+            int         line,
+            int         op_status = -1,
+            int         errnum = 0);
+
+  /// These values are only actually set if the requested priority is
+  /// enabled.
+  void conditional_set (const char *file,
+                        int         line,
+                        int         op_status,
+                        int         errnum);
+
+  ssize_t log (ACE_Log_Priority priority, const ACE_TCHAR *format, ...);
+
+#if defined (ACE_HAS_WCHAR)
+  ssize_t log (ACE_Log_Priority priority, const ACE_ANTI_TCHAR *format, ...);
+#endif /* ACE_HAS_WCHAR */
+
+  ssize_t log (const ACE_TCHAR *format,
+               ACE_Log_Priority priority,
+               va_list          argp);
+
+  /**
+   * Method to log hex dump.  This is useful for debugging.  Calls
+   * log() to do the actual print, but formats first to make the chars
+   * printable.
+   */
+  int log_hexdump (ACE_Log_Priority log_priority,
+                   const char *     buffer,
+                   size_t           size,
+                   const ACE_TCHAR *text = 0);
+
+private:
+  friend class ACE_Log_Category;
+  ACE_Log_Category* category_;
+  ACE_Log_Msg* logger_;
+  u_long priority_mask_;
+};
+
+/**
+ * @class ACE_Log_Category
+ *
+ * @brief Provides a categorized message logging
+ * abstraction.
+ *
+ * This class added another level of abstraction to
+ * @c ACE_Log_Msg to separate log messages into different
+ * categories. Logs in different categories can be independently
+ * enabled or disabled. However, they will all be affected by the
+ * priority_mask setting in ACE_Log_Msg. That is to say, if a
+ * given priority level is disabled using @c ACE_Log_Msg::priority_mask(),
+ * all messages of that priority level logged via any @c ACE_Log_Category
+ * object would also be disabled regardless of the @c priority_mask
+ * setting in the  @c ACE_Log_Category object.
+ *
+ * Each cateogry can have a name which
+ * is fixed at construction. The name is not used for
+ * formating the messages. However, it can be used by a
+ * message backend object for identification and reformat
+ * accordingly.
+ *
+ * To log a message into a category. Create a new @c ACE_Log_Category
+ * and then use @c per_thr_obj() for logging. For example,
+ *
+ * \code{.cpp}
+ *  ACE_Log_Category test_catogory("Test");
+ *  test_cateogry.per_thr_obj()->log(LM_DEBUG, "Log into the Test category.");
+ *
+ *  // set the process wide priority mask
+ *  test_catogory.priority_mask(LM_DEBUG|LM_ERROR);
+ *
+ *  // set the thread specific priority mask
+ *  test_cateogry.per_thr_obj()->priority_mask(LM_DEBUG);
+ * \endcode
+ */
+class ACE_Export ACE_Log_Category
+{
+public:
+
+  /**
+   * Initialize the logger with a name.
+   *
+   * Notice that ACE_Log_Category does not
+   * deep copy the passed \a name; therefore,
+   * you must keep the lifetime of \a name
+   * longer than the newly create ACE_Log_Category
+   * object. The rational for the design is to avoid
+   * static initialization problem when the ACE_Log_Category
+   * is created in static storage.
+   */
+  ACE_Log_Category(const char* name);
+  ~ACE_Log_Category();
+
+  unsigned int id();
+  const char* name();
+
+  ACE_Log_Category_TSS* per_thr_obj();
+
+  /// Get the process  ACE_Log_Priority mask.
+  u_long priority_mask ();
+
+  /// Set the process ACE_Log_Priority mask, returns original mask.
+  u_long priority_mask (u_long);
+
+
+  static ACE_Log_Category& ace_lib();
+
+private:
+  friend class ACE_Log_Category_TSS;
+
+  // disable copying
+  ACE_Log_Category(const ACE_Log_Category&);
+  ACE_Log_Category& operator = (const ACE_Log_Category&);
+
+  const char* name_;
+  unsigned int id_;
+  u_long priority_mask_;
+
+  /// we couldn't directly use ACE_TSS because it would
+  /// create circular dependency
+#if defined (ACE_HAS_THREADS)
+  /// Avoid race conditions during initialization.
+  ACE_Thread_Mutex keylock_;
+  /// "First time in" flag.
+  /// Key for the thread-specific error data.
+  ACE_thread_key_t key_;
+#else // defined (ACE_HAS_THREADS)
+  ACE_Log_Category_TSS per_thr_obj_;
+#endif // defined (ACE_HAS_THREADS)
+};
+
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
+#include "ace/Log_Category.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+#endif /* ACE_LOG_CATEGORY_H */
diff --git a/dep/acelite/ace/Log_Category.inl b/dep/acelite/ace/Log_Category.inl
new file mode 100644
index 000000000..2c22df5e4
--- /dev/null
+++ b/dep/acelite/ace/Log_Category.inl
@@ -0,0 +1,159 @@
+// -*- C++ -*-
+//
+// $Id: Log_Category.inl 97026 2013-04-15 17:48:38Z huangh $
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE unsigned int
+ACE_Log_Category::id()
+{
+  return id_;
+}
+
+ACE_INLINE const char*
+ACE_Log_Category::name ()
+{
+  return name_;
+}
+
+ACE_INLINE unsigned int
+ACE_Log_Category_TSS::id()
+{
+  return category_->id_;
+}
+
+ACE_INLINE const char*
+ACE_Log_Category_TSS::name ()
+{
+  return category_->name_;
+}
+
+ACE_INLINE ACE_Log_Msg*
+ACE_Log_Category_TSS::logger ()
+{
+  return logger_;
+}
+
+/// Get the current ACE_Log_Priority mask.
+ACE_INLINE u_long
+ACE_Log_Category_TSS::priority_mask ()
+{
+  return priority_mask_;
+}
+
+/// Set the ACE_Log_Priority mask, returns original mask.
+ACE_INLINE u_long
+ACE_Log_Category_TSS::priority_mask (u_long n_mask)
+{
+  u_long o_mask = this->priority_mask_;
+  this->priority_mask_ = n_mask;
+  return o_mask;
+}
+/// Return true if the requested priority is enabled.
+ACE_INLINE int
+ACE_Log_Category_TSS::log_priority_enabled (ACE_Log_Priority log_priority)
+{
+  return ACE_BIT_ENABLED (this->priority_mask_ |
+                          category_->priority_mask(),
+                          log_priority);
+}
+
+ACE_INLINE void
+ACE_Log_Category_TSS::set (const char *file,
+                           int line,
+                           int op_status,
+                           int errnum)
+{
+  logger_->set(file, line, op_status, errnum, logger_->restart (), logger_->msg_ostream (), logger_->msg_callback ());
+}
+
+/// These values are only actually set if the requested priority is
+/// enabled.
+ACE_INLINE
+void ACE_Log_Category_TSS::conditional_set (const char *file,
+                                            int line,
+                                            int op_status,
+                                            int errnum)
+{
+  logger_->conditional_set(file, line, op_status, errnum);
+}
+
+ACE_INLINE ssize_t
+ACE_Log_Category_TSS::log (ACE_Log_Priority priority, const ACE_TCHAR *format_str, ...)
+{
+  // Start of variable args section.
+  va_list argp;
+
+  va_start (argp, format_str);
+
+  ssize_t const result = this->log (format_str,
+                                    priority,
+                                    argp);
+  va_end (argp);
+
+  return result;
+}
+
+#if defined (ACE_HAS_WCHAR)
+ACE_INLINE ssize_t
+ACE_Log_Category_TSS::log (ACE_Log_Priority priority, const ACE_ANTI_TCHAR *format_str, ...)
+{
+  // Start of variable args section.
+  va_list argp;
+
+  va_start (argp, format_str);
+
+  ssize_t const result = this->log (ACE_TEXT_ANTI_TO_TCHAR (format_str),
+                                    priority,
+                                    argp);
+  va_end (argp);
+
+  return result;
+}
+#endif /* ACE_HAS_WCHAR */
+
+/**
+ * An alternative logging mechanism that makes it possible to
+ * integrate variable argument lists from other logging mechanisms
+ * into the ACE mechanism.
+ */
+
+ACE_INLINE ssize_t
+ACE_Log_Category_TSS::log (const ACE_TCHAR *format,
+                           ACE_Log_Priority priority,
+                           va_list argp)
+{
+  if (this->log_priority_enabled (priority) == 0)
+    return 0;
+  return logger_->log(format, priority, argp, this);
+}
+
+
+ACE_INLINE int
+ACE_Log_Category_TSS::log_hexdump (ACE_Log_Priority priority,
+                                   const char *buffer,
+                                   size_t size,
+                                   const ACE_TCHAR *text)
+{
+  if (this->log_priority_enabled (priority) == 0)
+    return 0;
+  return logger_->log_hexdump(priority, buffer, size, text, this);
+}
+
+/// Get the current ACE_Log_Priority mask.
+ACE_INLINE u_long
+ACE_Log_Category::priority_mask ()
+{
+  return priority_mask_;
+}
+
+/// Set the ACE_Log_Priority mask, returns original mask.
+ACE_INLINE u_long
+ACE_Log_Category::priority_mask (u_long n_mask)
+{
+  u_long o_mask = this->priority_mask_;
+  this->priority_mask_ = n_mask;
+  return o_mask;
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Log_Msg.cpp b/dep/acelite/ace/Log_Msg.cpp
index 676236b72..b500d25b7 100644
--- a/dep/acelite/ace/Log_Msg.cpp
+++ b/dep/acelite/ace/Log_Msg.cpp
@@ -1,4 +1,4 @@
-// $Id: Log_Msg.cpp 95761 2012-05-15 18:23:04Z johnnyw $
+// $Id: Log_Msg.cpp 97662 2014-03-17 10:11:16Z johnnyw $
 
 // We need this to get the status of ACE_NTRACE...
 #include "ace/config-all.h"
@@ -192,7 +192,6 @@ ACE_Log_Msg_Manager::get_lock (void)
   // This function is called by the first thread to create an ACE_Log_Msg
   // instance.  It makes the call while holding a mutex, so we don't have
   // to grab another one here.
-
   if (ACE_Log_Msg_Manager::lock_ == 0)
     {
       ACE_NO_HEAP_CHECK;
@@ -393,7 +392,7 @@ ACE_Log_Msg::instance (void)
 }
 
 // Not inlined to help prevent having to include OS.h just to
-// get ACE_DEBUG, et al, macros.
+// get ACELIB_DEBUG, et al, macros.
 int
 ACE_Log_Msg::last_error_adapter (void)
 {
@@ -437,9 +436,6 @@ const ACE_TCHAR *ACE_Log_Msg::program_name_ = 0;
 /// Default is to use stderr.
 u_long ACE_Log_Msg::flags_ = ACE_Log_Msg::STDERR;
 
-/// Process id of the current process.
-pid_t ACE_Log_Msg::pid_ = -2;
-
 /// Current offset of msg_[].
 ptrdiff_t ACE_Log_Msg::msg_off_ = 0;
 
@@ -481,7 +477,8 @@ ACE_Log_Msg::close (void)
         reinterpret_cast<ACE_thread_mutex_t *>
   (ACE_OS_Object_Manager::preallocated_object
    [ACE_OS_Object_Manager::ACE_LOG_MSG_INSTANCE_LOCK]);
-     ACE_OS::thread_mutex_lock (lock);
+      if (lock)
+        ACE_OS::thread_mutex_lock (lock);
 
      if (ACE_Log_Msg::key_created_)
        {
@@ -513,7 +510,8 @@ ACE_Log_Msg::close (void)
          ACE_Log_Msg::key_created_ = false;
        }
 
-     ACE_OS::thread_mutex_unlock (lock);
+     if (lock)
+       ACE_OS::thread_mutex_unlock (lock);
     }
 #endif /* (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) && ACE_MT_SAFE */
 }
@@ -552,7 +550,6 @@ ACE_Log_Msg::sync (const ACE_TCHAR *prog_name)
       }
     }
 
-  ACE_Log_Msg::pid_ = ACE_OS::getpid ();
   ACE_Log_Msg::msg_off_ = 0;
 }
 
@@ -969,7 +966,8 @@ ACE_Log_Msg::log (ACE_Log_Priority log_priority,
 ssize_t
 ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   ACE_Log_Priority log_priority,
-                  va_list argp)
+                  va_list argp,
+                  ACE_Log_Category_TSS* category)
 {
   ACE_TRACE ("ACE_Log_Msg::log");
   // External decls.
@@ -1007,6 +1005,8 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                              ACE_OS::gettimeofday (),
                              this->getpid ());
 
+  log_record.category(category);
+
   // bp is pointer to where to put next part of logged message.
   // bspace is the number of characters remaining in msg_.
   ACE_TCHAR *bp = const_cast<ACE_TCHAR *> (this->msg ());
@@ -1025,10 +1025,14 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
   bool abort_prog = false;
   int exit_value = 0;
 
-  if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::VERBOSE))
+  // Retrieve the flags in a local variable on the stack, it is
+  // accessed by multiple threads and within this operation we
+  // check it several times, so this way we only lock once
+  u_long flags = this->flags ();
+
+  if (ACE_BIT_ENABLED (flags, ACE_Log_Msg::VERBOSE))
     {
       // Prepend the program name onto this message
-
       if (ACE_Log_Msg::program_name_ != 0)
         {
           for (const ACE_TCHAR *s = ACE_Log_Msg::program_name_;
@@ -1602,7 +1606,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   {
                     ptrdiff_t const osave = ACE_Log_Msg::msg_off_;
 
-                    if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_,
+                    if (ACE_BIT_ENABLED (flags,
                                          ACE_Log_Msg::SILENT) &&
                         bspace > 1)
                       {
@@ -1613,7 +1617,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 
                     (*va_arg (argp, PTF))();
 
-                    if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_,
+                    if (ACE_BIT_ENABLED (flags,
                                          ACE_Log_Msg::SILENT) &&
                         bspace > (1 + ACE_OS::strlen (bp)))
                       {
@@ -2067,7 +2071,11 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   {
                     // skip the frame that we're currently in
                     ACE_Stack_Trace t(2);
+#if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+                    ACE_OS::strcpy (fp, ACE_TEXT ("S"));
+#else /* ACE_WIN32 && ACE_USES_WCHAR */
                     ACE_OS::strcpy (fp, ACE_TEXT ("s"));
+#endif /* ACE_WIN32 && ACE_USES_WCHAR */
                     if (can_check)
                       this_len = ACE_OS::snprintf
                         (bp, bspace, format, t.c_str ());
@@ -2206,11 +2214,15 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record,
 {
   ssize_t result = 0;
 
+  // Retrieve the flags in a local variable on the stack, it is
+  // accessed by multiple threads and within this operation we
+  // check it several times, so this way we only lock once
+  u_long flags = this->flags ();
+
   // Format the message and print it to stderr and/or ship it off to
   // the log_client daemon, and/or print it to the ostream.  Of
   // course, only print the message if "SILENT" mode is disabled.
-  if (ACE_BIT_DISABLED (ACE_Log_Msg::flags_,
-                        ACE_Log_Msg::SILENT))
+  if (ACE_BIT_DISABLED (flags, ACE_Log_Msg::SILENT))
     {
       bool tracing = this->tracing_enabled ();
       this->stop_tracing ();
@@ -2223,40 +2235,40 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record,
       // Do the callback, if needed, before acquiring the lock
       // to avoid holding the lock during the callback so we don't
       // have deadlock if the callback uses the logger.
-      if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_,
-                           ACE_Log_Msg::MSG_CALLBACK)
+      if (ACE_BIT_ENABLED (flags, ACE_Log_Msg::MSG_CALLBACK)
           && this->msg_callback () != 0)
-        this->msg_callback ()->log (log_record);
+        {
+          this->msg_callback ()->log (log_record);
+        }
 
       // Make sure that the lock is held during all this.
       ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
                                 *ACE_Log_Msg_Manager::get_lock (),
                                 -1));
 
-      if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_,
+      if (ACE_BIT_ENABLED (flags,
                            ACE_Log_Msg::STDERR)
           && !suppress_stderr) // This is taken care of by our caller.
         log_record.print (ACE_Log_Msg::local_host_,
-                          ACE_Log_Msg::flags_,
+                          flags,
                           stderr);
 
-      if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::CUSTOM) ||
-          ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG) ||
-          ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER))
+      if (ACE_BIT_ENABLED (flags, ACE_Log_Msg::CUSTOM) ||
+          ACE_BIT_ENABLED (flags, ACE_Log_Msg::SYSLOG) ||
+          ACE_BIT_ENABLED (flags, ACE_Log_Msg::LOGGER))
         {
           // Be sure that there is a message_queue_, with multiple threads.
           ACE_MT (ACE_Log_Msg_Manager::init_backend ());
         }
 
-
-      if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER) ||
-          ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG))
+      if (ACE_BIT_ENABLED (flags, ACE_Log_Msg::LOGGER) ||
+          ACE_BIT_ENABLED (flags, ACE_Log_Msg::SYSLOG))
         {
           result =
             ACE_Log_Msg_Manager::log_backend_->log (log_record);
         }
 
-      if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::CUSTOM) &&
+      if (ACE_BIT_ENABLED (flags, ACE_Log_Msg::CUSTOM) &&
           ACE_Log_Msg_Manager::custom_backend_ != 0)
         {
           result =
@@ -2265,11 +2277,11 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record,
 
       // This must come last, after the other two print operations
       // (see the <ACE_Log_Record::print> method for details).
-      if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_,
+      if (ACE_BIT_ENABLED (flags,
                            ACE_Log_Msg::OSTREAM)
           && this->msg_ostream () != 0)
         log_record.print (ACE_Log_Msg::local_host_,
-                          ACE_Log_Msg::flags_,
+                          flags,
 #if defined (ACE_LACKS_IOSTREAM_TOTALLY)
                           static_cast<FILE *> (this->msg_ostream ())
 #else  /* ! ACE_LACKS_IOSTREAM_TOTALLY */
@@ -2290,61 +2302,73 @@ int
 ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority,
                           const char *buffer,
                           size_t size,
-                          const ACE_TCHAR *text)
+                          const ACE_TCHAR *text,
+                          ACE_Log_Category_TSS* category)
 {
   // Only print the message if <priority_mask_> hasn't been reset to
   // exclude this logging priority.
   if (this->log_priority_enabled (log_priority) == 0)
     return 0;
 
-  ACE_TCHAR* buf = 0;
-  size_t const buf_sz =
-    ACE_Log_Record::MAXLOGMSGLEN - ACE_Log_Record::VERBOSE_LEN - 58;
-  ACE_NEW_RETURN (buf, ACE_TCHAR[buf_sz], -1);
+  size_t text_sz = 0;
+  if (text)
+    text_sz = ACE_OS::strlen (text);
 
-  ACE_TCHAR *msg_buf = 0;
-  const size_t text_sz = text ? ACE_OS::strlen(text) : 0;
-  ACE_NEW_RETURN (msg_buf,
-                  ACE_TCHAR[text_sz + 58],
-                 -1);
+  size_t const total_buffer_size =
+    ACE_Log_Record::MAXLOGMSGLEN - ACE_Log_Record::VERBOSE_LEN + text_sz;
 
-  buf[0] = 0; // in case size = 0
+  ACE_Array<ACE_TCHAR> msg_buf(total_buffer_size);
+  if (msg_buf.size() == 0)
+    return -1;
 
-  size_t const len = ACE::format_hexdump
-    (buffer, size, buf, buf_sz / sizeof (ACE_TCHAR) - text_sz);
-
-  int sz = 0;
+  ACE_TCHAR* end_ptr = &msg_buf[0] + total_buffer_size;
+  ACE_TCHAR* wr_ptr = &msg_buf[0];
+  msg_buf[0] = 0; // in case size = 0
 
   if (text)
-    sz = ACE_OS::sprintf (msg_buf,
+    wr_ptr += ACE_OS::snprintf (wr_ptr,
+                                  end_ptr - wr_ptr,
 #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                          ACE_TEXT ("%ls - "),
+                                  ACE_TEXT ("%ls - "),
 #else
-                          ACE_TEXT ("%s - "),
+                                  ACE_TEXT ("%s - "),
 #endif
-                          text);
+                                  text);
 
-  sz += ACE_OS::sprintf (msg_buf + sz,
-                         ACE_TEXT ("HEXDUMP ")
-                         ACE_SIZE_T_FORMAT_SPECIFIER
-                         ACE_TEXT (" bytes"),
-                         size);
+  wr_ptr += ACE_OS::snprintf (wr_ptr,
+                            end_ptr - wr_ptr,
+                            ACE_TEXT ("HEXDUMP ")
+                            ACE_SIZE_T_FORMAT_SPECIFIER
+                            ACE_TEXT (" bytes"),
+                            size);
 
-  if (len < size)
-    ACE_OS::sprintf (msg_buf + sz,
-                     ACE_TEXT (" (showing first ")
-                     ACE_SIZE_T_FORMAT_SPECIFIER
-                     ACE_TEXT (" bytes)"),
-                     len);
+  // estimate how many bytes can be output
+  // We can fit 16 bytes output in text mode per line, 4 chars per byte;
+  // i.e. we need 68 bytes of buffer per line.
+  size_t hexdump_size = (end_ptr - wr_ptr -58)/68*16;
+
+  if (hexdump_size < size) {
+    wr_ptr += ACE_OS::snprintf (wr_ptr,
+                        end_ptr - wr_ptr,
+                        ACE_TEXT (" (showing first ")
+                        ACE_SIZE_T_FORMAT_SPECIFIER
+                        ACE_TEXT (" bytes)"),
+                        hexdump_size);
+    size = hexdump_size;
+  }
+
+  *wr_ptr++ = '\n';
+  ACE::format_hexdump(buffer, size, wr_ptr, end_ptr - wr_ptr);
 
   // Now print out the formatted buffer.
-  this->log (log_priority,
-             ACE_TEXT ("%s\n%s"),
-             msg_buf,
-             buf);
+  ACE_Log_Record log_record (log_priority,
+                             ACE_OS::gettimeofday (),
+                             this->getpid ());
 
-  delete [] msg_buf;
-  delete [] buf;
+  log_record.category(category);
+  log_record.msg_data(&msg_buf[0]);
+
+  this->log (log_record, false);
   return 0;
 }
 
@@ -2386,36 +2410,35 @@ ACE_Log_Msg::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Log_Msg::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("status_ = %d\n"), this->status_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nerrnum_ = %d\n"), this->errnum_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlinenum_ = %d\n"), this->linenum_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfile_ = %C\n"), this->file_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_ = %s\n"), this->msg_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nrestart_ = %d\n"), this->restart_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nostream_ = %@\n"), this->ostream_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_callback_ = %@\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("status_ = %d\n"), this->status_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nerrnum_ = %d\n"), this->errnum_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlinenum_ = %d\n"), this->linenum_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfile_ = %C\n"), this->file_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_ = %s\n"), this->msg_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nrestart_ = %d\n"), this->restart_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nostream_ = %@\n"), this->ostream_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_callback_ = %@\n"),
               this->msg_callback_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nprogram_name_ = %s\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nprogram_name_ = %s\n"),
               this->program_name_ ? this->program_name_
                                   : ACE_TEXT ("<unknown>")));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlocal_host_ = %s\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlocal_host_ = %s\n"),
               this->local_host_ ? this->local_host_
                                 : ACE_TEXT ("<unknown>")));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d\n"), this->getpid ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = 0x%x\n"), this->flags_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntrace_depth_ = %d\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = 0x%x\n"), this->flags_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntrace_depth_ = %d\n"),
               this->trace_depth_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntrace_active_ = %d\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntrace_active_ = %d\n"),
               this->trace_active_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntracing_enabled_ = %d\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntracing_enabled_ = %d\n"),
               this->tracing_enabled_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npriority_mask_ = 0x%x\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\npriority_mask_ = 0x%x\n"),
               this->priority_mask_));
   if (this->thr_desc_ != 0 && this->thr_desc_->state () != 0)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d\n"),
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d\n"),
                 this->thr_desc_->state ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_off_ = %d\n"), this->msg_off_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_off_ = %d\n"), this->msg_off_));
 
   // Be sure that there is a message_queue_, with multiple threads.
   ACE_MT (ACE_Log_Msg_Manager::init_backend ());
@@ -2423,7 +2446,7 @@ ACE_Log_Msg::dump (void) const
   ACE_MT (ACE_Log_Msg_Manager::get_lock ()->dump ());
   // Synchronize output operations.
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Log_Msg.h b/dep/acelite/ace/Log_Msg.h
index 28d594493..0df963fcf 100644
--- a/dep/acelite/ace/Log_Msg.h
+++ b/dep/acelite/ace/Log_Msg.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Log_Msg.h
  *
- *  $Id: Log_Msg.h 95128 2011-11-27 21:22:15Z johnnyw $
+ *  $Id: Log_Msg.h 97662 2014-03-17 10:11:16Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -143,6 +143,7 @@ class ACE_Log_Msg_Backend;
 // Forward declaration
 class ACE_Thread_Descriptor;
 class ACE_Log_Record;
+class ACE_Log_Category_TSS;
 template<typename M, typename T> class ACE_Atomic_Op;
 
 /**
@@ -539,7 +540,8 @@ public:
    */
   ssize_t log (const ACE_TCHAR *format,
                ACE_Log_Priority priority,
-               va_list argp);
+               va_list argp,
+               ACE_Log_Category_TSS* category=0);
 
   /// Log a custom built log record to the currently enabled logging
   /// sinks.
@@ -554,7 +556,8 @@ public:
   int log_hexdump (ACE_Log_Priority log_priority,
                    const char *buffer,
                    size_t size,
-                   const ACE_TCHAR *text = 0);
+                   const ACE_TCHAR *text = 0,
+                   ACE_Log_Category_TSS* category=0);
 
   /**
    * Init hook, create a Log_Msg_Attribute object, initialize its
@@ -665,9 +668,6 @@ private:
   /// Name of the local host (used when printing messages).
   static const ACE_TCHAR *local_host_;
 
-  /// Process id of the current process.
-  static pid_t pid_;
-
   /// Options flags used to hold the logger flag options, e.g.,
   /// STDERR, LOGGER, OSTREAM, MSG_CALLBACK, etc.
   static u_long flags_;
@@ -743,6 +743,7 @@ ACE_TSS_CLEANUP_NAME (void *ptr);
 # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */
 #endif /* ACE_MT_SAFE */
 
+
 #if defined (__ACE_INLINE__)
 #include "ace/Log_Msg.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/dep/acelite/ace/Log_Msg.inl b/dep/acelite/ace/Log_Msg.inl
index bb5290331..2f73c897d 100644
--- a/dep/acelite/ace/Log_Msg.inl
+++ b/dep/acelite/ace/Log_Msg.inl
@@ -1,6 +1,5 @@
 // -*- C++ -*-
-//
-// $Id: Log_Msg.inl 82723 2008-09-16 09:35:44Z johnnyw $
+// $Id: Log_Msg.inl 97662 2014-03-17 10:11:16Z johnnyw $
 
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
@@ -223,13 +222,7 @@ ACE_INLINE
 pid_t
 ACE_Log_Msg::getpid (void) const
 {
-  if (ACE_Log_Msg::pid_ == -2)
-    ACE_Log_Msg::pid_ = ACE_OS::getpid ();
-
-  return ACE_Log_Msg::pid_;
+  return ACE_OS::getpid ();
 }
 
-
-
 ACE_END_VERSIONED_NAMESPACE_DECL
-
diff --git a/dep/acelite/ace/Log_Msg_Callback.cpp b/dep/acelite/ace/Log_Msg_Callback.cpp
index 62ae542cf..a32626596 100644
--- a/dep/acelite/ace/Log_Msg_Callback.cpp
+++ b/dep/acelite/ace/Log_Msg_Callback.cpp
@@ -1,13 +1,15 @@
-// $Id: Log_Msg_Callback.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Log_Msg_Callback.cpp 97246 2013-08-07 07:10:20Z johnnyw $
 
 #include "ace/Log_Msg_Callback.h"
 
-
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+ACE_Log_Msg_Callback::ACE_Log_Msg_Callback (void)
+{
+}
+
 ACE_Log_Msg_Callback::~ACE_Log_Msg_Callback (void)
 {
 }
+
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Log_Msg_Callback.h b/dep/acelite/ace/Log_Msg_Callback.h
index a67407459..c88f06529 100644
--- a/dep/acelite/ace/Log_Msg_Callback.h
+++ b/dep/acelite/ace/Log_Msg_Callback.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Log_Msg_Callback.h
  *
- *  $Id: Log_Msg_Callback.h 91064 2010-07-12 10:11:24Z johnnyw $
+ *  $Id: Log_Msg_Callback.h 97246 2013-08-07 07:10:20Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -54,6 +54,9 @@ class ACE_Log_Record;
 class ACE_Export ACE_Log_Msg_Callback
 {
 public:
+  /// Default constructor
+  ACE_Log_Msg_Callback (void);
+
   /// No-op virtual destructor.
   virtual ~ACE_Log_Msg_Callback (void);
 
diff --git a/dep/acelite/ace/Log_Msg_NT_Event_Log.cpp b/dep/acelite/ace/Log_Msg_NT_Event_Log.cpp
index 2e7ff49fa..192de5f27 100644
--- a/dep/acelite/ace/Log_Msg_NT_Event_Log.cpp
+++ b/dep/acelite/ace/Log_Msg_NT_Event_Log.cpp
@@ -1,11 +1,11 @@
-// $Id: Log_Msg_NT_Event_Log.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Log_Msg_NT_Event_Log.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/config-all.h"
 
 #if defined (ACE_HAS_LOG_MSG_NT_EVENT_LOG)
 
 #include "ace/Log_Msg_NT_Event_Log.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Log_Record.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
diff --git a/dep/acelite/ace/Log_Msg_UNIX_Syslog.cpp b/dep/acelite/ace/Log_Msg_UNIX_Syslog.cpp
index ae4e307ec..1ccd438b4 100644
--- a/dep/acelite/ace/Log_Msg_UNIX_Syslog.cpp
+++ b/dep/acelite/ace/Log_Msg_UNIX_Syslog.cpp
@@ -1,11 +1,11 @@
-// $Id: Log_Msg_UNIX_Syslog.cpp 92791 2010-12-04 16:25:22Z shuston $
+// $Id: Log_Msg_UNIX_Syslog.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_UNIX_SYSLOG)
 
 #include "ace/ACE.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Log_Msg_UNIX_Syslog.h"
 #include "ace/Log_Record.h"
 #include "ace/OS_NS_string.h"
diff --git a/dep/acelite/ace/Log_Priority.h b/dep/acelite/ace/Log_Priority.h
index 3801ef398..80a09800e 100644
--- a/dep/acelite/ace/Log_Priority.h
+++ b/dep/acelite/ace/Log_Priority.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Log_Priority.h
  *
- *  $Id: Log_Priority.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: Log_Priority.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dep/acelite/ace/Log_Record.cpp b/dep/acelite/ace/Log_Record.cpp
index b626533b5..fadd0f1e6 100644
--- a/dep/acelite/ace/Log_Record.cpp
+++ b/dep/acelite/ace/Log_Record.cpp
@@ -1,4 +1,4 @@
-// $Id: Log_Record.cpp 92791 2010-12-04 16:25:22Z shuston $
+// $Id: Log_Record.cpp 97058 2013-04-19 14:41:18Z huangh $
 
 #include "ace/Log_Record.h"
 
@@ -8,6 +8,7 @@
 #include "ace/CDR_Stream.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Truncate.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 # include "ace/Log_Record.inl"
@@ -105,17 +106,17 @@ ACE_Log_Record::dump (void) const
 #if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Log_Record::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("length_ = %d\n"), this->length_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntype_ = %u\n"), this->type_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntime_stamp_ = (%:, %d)\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("length_ = %d\n"), this->length_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntype_ = %u\n"), this->type_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntime_stamp_ = (%:, %d)\n"),
               this->secs_, this->usecs_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %u\n"), this->pid_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_data_ (0x%@) = %s\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %u\n"), this->pid_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_data_ (0x%@) = %s\n"),
               this->msg_data_, this->msg_data_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_data_size_ = %B\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_data_size_ = %B\n"),
               this->msg_data_size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -146,7 +147,8 @@ ACE_Log_Record::ACE_Log_Record (ACE_Log_Priority lp,
     usecs_ (0),
     pid_ (ACE_UINT32 (p)),
     msg_data_ (0),
-    msg_data_size_ (0)
+    msg_data_size_ (0),
+    category_(0)
 {
   // ACE_TRACE ("ACE_Log_Record::ACE_Log_Record");
   ACE_NEW_NORETURN (this->msg_data_, ACE_TCHAR[MAXLOGMSGLEN]);
@@ -166,7 +168,8 @@ ACE_Log_Record::ACE_Log_Record (ACE_Log_Priority lp,
     usecs_ ((ACE_UINT32) ts.usec ()),
     pid_ (ACE_UINT32 (p)),
     msg_data_ (0),
-    msg_data_size_ (0)
+    msg_data_size_ (0),
+    category_(0)
 {
   // ACE_TRACE ("ACE_Log_Record::ACE_Log_Record");
   ACE_NEW_NORETURN (this->msg_data_, ACE_TCHAR[MAXLOGMSGLEN]);
@@ -197,7 +200,8 @@ ACE_Log_Record::ACE_Log_Record (void)
     usecs_ (0),
     pid_ (0),
     msg_data_ (0),
-    msg_data_size_ (0)
+    msg_data_size_ (0),
+    category_(0)
 {
   // ACE_TRACE ("ACE_Log_Record::ACE_Log_Record");
   ACE_NEW_NORETURN (this->msg_data_, ACE_TCHAR[MAXLOGMSGLEN]);
@@ -269,12 +273,20 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
   return 0;
 }
 
+inline bool
+log_priority_enabled(ACE_Log_Category_TSS* category, ACE_Log_Priority priority)
+{
+  if (category && !category->log_priority_enabled (priority))
+    return false;
+  return ACE_LOG_MSG->log_priority_enabled (priority);
+}
+
 int
 ACE_Log_Record::print (const ACE_TCHAR host_name[],
                        u_long verbose_flag,
                        FILE *fp)
 {
-  if (ACE_LOG_MSG->log_priority_enabled (ACE_Log_Priority (this->type_)))
+  if ( log_priority_enabled(this->category(), ACE_Log_Priority (this->type_)) )
     {
       ACE_TCHAR *verbose_msg = 0;
       ACE_NEW_RETURN (verbose_msg, ACE_TCHAR[MAXVERBOSELOGMSGLEN], -1);
@@ -374,7 +386,7 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[],
                        u_long verbose_flag,
                        ACE_OSTREAM_TYPE &s)
 {
-  if (ACE_LOG_MSG->log_priority_enabled (ACE_Log_Priority (this->type_)))
+  if ( log_priority_enabled(this->category(), ACE_Log_Priority (this->type_)) )
     {
       ACE_TCHAR* verbose_msg = 0;
       ACE_NEW_RETURN (verbose_msg, ACE_TCHAR[MAXVERBOSELOGMSGLEN], -1);
diff --git a/dep/acelite/ace/Log_Record.h b/dep/acelite/ace/Log_Record.h
index fb2e9ddcc..04338c07a 100644
--- a/dep/acelite/ace/Log_Record.h
+++ b/dep/acelite/ace/Log_Record.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Log_Record.h
  *
- *  $Id: Log_Record.h 91764 2010-09-14 13:04:37Z johnnyw $
+ *  $Id: Log_Record.h 96984 2013-04-11 15:22:24Z huangh $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -32,6 +32,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class ACE_Time_Value;
+class ACE_Log_Category_TSS;
 
 /// Defines the structure of an ACE logging record.
 class ACE_Export ACE_Log_Record
@@ -109,6 +110,11 @@ public:
   /// Set the type of the Log_Record.
   void type (ACE_UINT32);
 
+  /// Get the category of the Log_Record.
+  ACE_Log_Category_TSS* category (void) const;
+  /// Set the category of the Log_Record.
+  void category (ACE_Log_Category_TSS*);
+
   /**
    * Get the priority of the Log_Record <type_>.  This is computed
    * as the base 2 logarithm of <type_> (which must be a power of 2,
@@ -186,6 +192,9 @@ private:
   /// Allocated size of msg_data_ in ACE_TCHARs
   size_t msg_data_size_;
 
+  ///
+  ACE_Log_Category_TSS* category_;
+
   /// disallow copying...
   ACE_Log_Record (const ACE_Log_Record& rhs);
   ACE_Log_Record& operator= (const ACE_Log_Record& rhs);
diff --git a/dep/acelite/ace/Log_Record.inl b/dep/acelite/ace/Log_Record.inl
index dda0993c2..d0371b661 100644
--- a/dep/acelite/ace/Log_Record.inl
+++ b/dep/acelite/ace/Log_Record.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Log_Record.inl 91764 2010-09-14 13:04:37Z johnnyw $
+// $Id: Log_Record.inl 97017 2013-04-15 14:00:52Z mitza $
 
 #include "ace/Global_Macros.h"
 #include "ace/os_include/arpa/os_inet.h"
@@ -23,6 +23,21 @@ ACE_Log_Record::type (void) const
   return this->type_;
 }
 
+ACE_INLINE void
+ACE_Log_Record::category (ACE_Log_Category_TSS* t)
+{
+  ACE_TRACE ("ACE_Log_Record::category");
+  this->category_ = t;
+}
+
+
+ACE_INLINE ACE_Log_Category_TSS*
+ACE_Log_Record::category (void) const
+{
+  ACE_TRACE ("ACE_Log_Record::category");
+  return this->category_;
+}
+
 ACE_INLINE void
 ACE_Log_Record::type (ACE_UINT32 t)
 {
diff --git a/dep/acelite/ace/Logging_Strategy.cpp b/dep/acelite/ace/Logging_Strategy.cpp
index 67b62465c..e2aca7bff 100644
--- a/dep/acelite/ace/Logging_Strategy.cpp
+++ b/dep/acelite/ace/Logging_Strategy.cpp
@@ -1,4 +1,4 @@
-// $Id: Logging_Strategy.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: Logging_Strategy.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Logging_Strategy.h"
 #include "ace/Service_Config.h"
@@ -10,7 +10,7 @@
 #include "ace/streams.h"
 
 #include "ace/Lib_Find.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Reactor.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdio.h"
@@ -251,7 +251,7 @@ ACE_Logging_Strategy::ACE_Logging_Strategy (void)
       (this->filename_,
        MAXPATHLEN - 7) == -1) // 7 for "logfile"
     {
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("Temporary path too long, ")
                   ACE_TEXT ("defaulting to current directory\n")));
       this->filename_[0] = 0;
@@ -406,7 +406,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &,
     {
       // Lock out any other logging.
       if (this->log_msg_->acquire ())
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("Cannot acquire lock!\n")),
                           -1);
 
@@ -519,7 +519,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &,
           ACE_OS::rename (this->filename_, backup);
         }
       else
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("Backup file name too long; ")
                     ACE_TEXT ("backup logfile not saved.\n")));
 
diff --git a/dep/acelite/ace/Logging_Strategy.h b/dep/acelite/ace/Logging_Strategy.h
index 7792c1061..69c277852 100644
--- a/dep/acelite/ace/Logging_Strategy.h
+++ b/dep/acelite/ace/Logging_Strategy.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Logging_Strategy.h
  *
- *  $Id: Logging_Strategy.h 91064 2010-07-12 10:11:24Z johnnyw $
+ *  $Id: Logging_Strategy.h 96985 2013-04-11 15:50:32Z huangh $
  *
  *  @author Prashant Jain <pjain@cs.wustl.edu>
  *  @author Orlando Ribeiro <oribeiro@inescporto.pt>
@@ -15,7 +15,7 @@
 #define ACE_LOGGING_STRATEGY_H
 
 #include "ace/Service_Object.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/MEM_Acceptor.cpp b/dep/acelite/ace/MEM_Acceptor.cpp
index 66c1c8996..c1a9113a4 100644
--- a/dep/acelite/ace/MEM_Acceptor.cpp
+++ b/dep/acelite/ace/MEM_Acceptor.cpp
@@ -1,6 +1,7 @@
-// $Id: MEM_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: MEM_Acceptor.cpp 97308 2013-09-01 00:58:08Z mesnier_p $
 
 #include "ace/MEM_Acceptor.h"
+#include "ace/Lib_Find.h"
 
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
@@ -58,7 +59,7 @@ ACE_MEM_Acceptor::ACE_MEM_Acceptor (const ACE_MEM_Addr &remote_sap,
                   reuse_addr,
                   backlog,
                   protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_MEM_Acceptor::ACE_MEM_Acceptor")));
 }
 
@@ -150,7 +151,7 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream,
       // - 24 is so we can append name to the end.
       if (ACE::get_temp_dir (buf, MAXPATHLEN - 24) == -1)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("Temporary path too long, ")
                       ACE_TEXT ("defaulting to current directory\n")));
           buf[0] = 0;
@@ -184,14 +185,14 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream,
 #endif /* ACE_WIN32 || !_ACE_USE_SV_SEM */
   if (ACE::send (new_handle, &client_signaling,
                  sizeof (ACE_INT16)) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
+    ACELIB_ERROR_RETURN ((LM_DEBUG,
                        ACE_TEXT ("ACE_MEM_Acceptor::accept error sending strategy\n")),
                       -1);
 
   //   Now we get the signaling strategy the client support.
   if (ACE::recv (new_handle, &client_signaling,
                  sizeof (ACE_INT16)) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
+    ACELIB_ERROR_RETURN ((LM_DEBUG,
                        ACE_TEXT ("ACE_MEM_Acceptor::%p error receiving strategy\n"),
                        ACE_TEXT ("accept")),
                       -1);
diff --git a/dep/acelite/ace/MEM_Addr.cpp b/dep/acelite/ace/MEM_Addr.cpp
index 062f59eef..b7ca94dfd 100644
--- a/dep/acelite/ace/MEM_Addr.cpp
+++ b/dep/acelite/ace/MEM_Addr.cpp
@@ -1,4 +1,4 @@
-// $Id: MEM_Addr.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: MEM_Addr.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 // Defines the Internet domain address family address format.
 
@@ -10,7 +10,7 @@
 #include "ace/MEM_Addr.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_netdb.h"
@@ -154,10 +154,10 @@ ACE_MEM_Addr::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_Addr::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->external_.dump ();
   this->internal_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/MEM_Addr.h b/dep/acelite/ace/MEM_Addr.h
index 35887b5cc..3a3d09095 100644
--- a/dep/acelite/ace/MEM_Addr.h
+++ b/dep/acelite/ace/MEM_Addr.h
@@ -4,7 +4,7 @@
 /**
  *  @file    MEM_Addr.h
  *
- *  $Id: MEM_Addr.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: MEM_Addr.h 97326 2013-09-11 07:52:09Z johnnyw $
  *
  *  @author Nanbor Wang <nanbor@cs.wustl.edu>
  */
@@ -71,7 +71,7 @@ public:
   int set (u_short port_number, int encode = 1);
 
   /// Uses <getservbyname> to initialize an ACE_MEM_Addr from a
-  /// <port_name>, the remote <host_name>, and the <protocol>.
+  /// @a port_name, the remote <host_name>, and the <protocol>.
   int set (const ACE_TCHAR port_name[]);
 
   /// Return a pointer to the underlying network address.
diff --git a/dep/acelite/ace/MEM_Connector.cpp b/dep/acelite/ace/MEM_Connector.cpp
index 4b0b272da..613ba87c6 100644
--- a/dep/acelite/ace/MEM_Connector.cpp
+++ b/dep/acelite/ace/MEM_Connector.cpp
@@ -1,10 +1,7 @@
-// MEM_Connector.cpp
-// $Id: MEM_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: MEM_Connector.cpp 97326 2013-09-11 07:52:09Z johnnyw $
 
 #include "ace/MEM_Connector.h"
 
-
-
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
 #if !defined (__ACE_INLINE__)
@@ -21,9 +18,9 @@ ACE_MEM_Connector::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_Connector::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -69,7 +66,7 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream,
   ACE_TRACE ("ACE_MEM_Connector::connect");
 
   if (!this->address_.same_host (remote_sap))
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("(%P|%t) MEM_Connector can't connect ")
                        ACE_TEXT ("to %C:%d which is not a local endpoint ")
                        ACE_TEXT ("(local address is %C:%d)\n"),
@@ -88,7 +85,7 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream,
                                    this->address_.get_local_addr (),
                                    timeout, local_sap,
                                    reuse_addr, flags, perms) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
+    ACELIB_ERROR_RETURN ((LM_DEBUG,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("ACE_MEM_Connector::connect")),
                       -1);
@@ -107,7 +104,7 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream,
   // Receive the signaling strategy theserver support.
   if (ACE::recv (new_handle, &server_strategy,
                  sizeof (ACE_INT16)) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
+    ACELIB_ERROR_RETURN ((LM_DEBUG,
                        ACE_TEXT ("ACE_MEM_Connector::connect error receiving strategy\n")),
                       -1);
 
@@ -120,19 +117,19 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream,
 
   if (ACE::send (new_handle, &server_strategy,
                  sizeof (ACE_INT16)) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
+    ACELIB_ERROR_RETURN ((LM_DEBUG,
                        ACE_TEXT ("ACE_MEM_Connector::connect error sending strategy\n")),
                       -1);
 
   ACE_INT16 buf_len;
   // Byte-order is not a problem for this read.
   if (ACE::recv (new_handle, &buf_len, sizeof (buf_len)) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
+    ACELIB_ERROR_RETURN ((LM_DEBUG,
                        ACE_TEXT ("ACE_MEM_Connector::connect error receiving shm filename length\n")),
                       -1);
 
   if (ACE::recv (new_handle, buf, buf_len) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
+    ACELIB_ERROR_RETURN ((LM_DEBUG,
                        ACE_TEXT ("ACE_MEM_Connector::connect error receiving shm filename.\n")),
                       -1);
 
diff --git a/dep/acelite/ace/MEM_IO.cpp b/dep/acelite/ace/MEM_IO.cpp
index 679c91d31..1064f3e6c 100644
--- a/dep/acelite/ace/MEM_IO.cpp
+++ b/dep/acelite/ace/MEM_IO.cpp
@@ -1,5 +1,5 @@
 // MEM_IO.cpp
-// $Id: MEM_IO.cpp 92069 2010-09-28 11:38:59Z johnnyw $
+// $Id: MEM_IO.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/MEM_IO.h"
 #include "ace/Handle_Set.h"
@@ -50,7 +50,7 @@ ACE_Reactive_MEM_IO::recv_buf (ACE_MEM_SAP_Node *&buf,
 
   if (retv == 0)
     {
-      //      ACE_DEBUG ((LM_INFO, "MEM_Stream closed\n"));
+      //      ACELIB_DEBUG ((LM_INFO, "MEM_Stream closed\n"));
       buf = 0;
       return 0;
     }
diff --git a/dep/acelite/ace/MEM_SAP.cpp b/dep/acelite/ace/MEM_SAP.cpp
index f6209d4f4..1d3312d36 100644
--- a/dep/acelite/ace/MEM_SAP.cpp
+++ b/dep/acelite/ace/MEM_SAP.cpp
@@ -1,4 +1,4 @@
-// $Id: MEM_SAP.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: MEM_SAP.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/MEM_SAP.h"
 
@@ -20,12 +20,12 @@ ACE_MEM_SAP::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_SAP::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   if (this->shm_malloc_ != 0)
     this->shm_malloc_->dump ();
   else
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_MEM_SAP uninitialized.\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_MEM_SAP uninitialized.\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/MMAP_Memory_Pool.cpp b/dep/acelite/ace/MMAP_Memory_Pool.cpp
index f1a651007..bae6f7cbc 100644
--- a/dep/acelite/ace/MMAP_Memory_Pool.cpp
+++ b/dep/acelite/ace/MMAP_Memory_Pool.cpp
@@ -1,4 +1,4 @@
-// $Id: MMAP_Memory_Pool.cpp 93974 2011-04-22 07:26:59Z msmit $
+// $Id: MMAP_Memory_Pool.cpp 97921 2014-10-10 21:58:31Z shuston $
 
 // MMAP_Memory_Pool.cpp
 #include "ace/MMAP_Memory_Pool.h"
@@ -6,8 +6,9 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_stat.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Truncate.h"
+#include "ace/Lib_Find.h"
 
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 #include "ace/Based_Pointer_T.h"
@@ -168,7 +169,7 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (
                              MAXPATHLEN - 17) == -1)
         // -17 for ace-malloc-XXXXXX
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("Temporary path too long, ")
                       ACE_TEXT ("defaulting to current directory\n")));
           this->backing_store_name_[0] = 0;
@@ -180,7 +181,16 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (
 
       // If requested an unique filename, use mktemp to get a random file.
       if (options && options->unique_)
+#  if defined (ACE_DISABLE_MKTEMP)
+        {
+          ACELIB_ERROR ((LM_ERROR,
+                         ACE_TEXT ("mktemp disabled; ")
+                         ACE_TEXT ("can't generate unique name")));
+          this->backing_store_name_[0] = 0;
+        }
+#  else
         ACE_OS::mktemp(this->backing_store_name_);
+#  endif /* ACE_DISABLE_MKTEMP */
 #endif /* ACE_DEFAULT_BACKING_STORE */
     }
   else
@@ -192,7 +202,7 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (
   if (this->install_signal_handler_)
     {
       if (this->signal_handler_.register_handler (SIGSEGV, this) == -1)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT("%p\n"), this->backing_store_name_));
     }
 #endif /* ACE_WIN32 */
@@ -241,7 +251,7 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
           || ACE_OS::write (this->mmap_.handle (),
                             "",
                             1) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("(%P|%t) %p\n"),
                            this->backing_store_name_),
                           -1);
@@ -293,7 +303,7 @@ ACE_MMAP_Memory_Pool::map_file (size_t map_size)
 #endif  // ACE_HAS_WINCE
     {
 #if 0
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t) addr = %@, base_addr = %@, map_size = %B, %p\n"),
                   this->mmap_.addr (),
                   this->base_addr_,
@@ -330,7 +340,7 @@ ACE_MMAP_Memory_Pool::acquire (size_t nbytes,
   ACE_TRACE ("ACE_MMAP_Memory_Pool::acquire");
   rounded_bytes = this->round_up (nbytes);
 
-  // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquiring more chunks, nbytes =
+  // ACELIB_DEBUG ((LM_DEBUG, "(%P|%t) acquiring more chunks, nbytes =
   // %B, rounded_bytes = %B\n", nbytes, rounded_bytes));
 
   size_t map_size;
@@ -341,7 +351,7 @@ ACE_MMAP_Memory_Pool::acquire (size_t nbytes,
   else if (this->map_file (map_size) == -1)
     return 0;
 
-  // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquired more chunks, nbytes = %B,
+  // ACELIB_DEBUG ((LM_DEBUG, "(%P|%t) acquired more chunks, nbytes = %B,
   // rounded_bytes = %B, map_size = %B\n", nbytes, rounded_bytes,
   // map_size));
 
@@ -391,7 +401,7 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes,
                            this->base_addr_,
                            0,
                            this->sa_) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
                            ACE_TEXT ("MMAP_Memory_Pool::init_acquire, EEXIST")),
                           0);
@@ -410,7 +420,7 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes,
       return this->mmap_.addr ();
     }
   else
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("MMAP_Memory_Pool::init_acquire")),
                       0);
@@ -439,7 +449,7 @@ int
 ACE_MMAP_Memory_Pool::remap (void *addr)
 {
   ACE_TRACE ("ACE_MMAP_Memory_Pool::remap");
-  //  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("Remapping with fault address at: %@\n"), addr));
+  //  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("Remapping with fault address at: %@\n"), addr));
   size_t const current_map_size =
     ACE_Utils::truncate_cast<size_t> (ACE_OS::filesize (this->mmap_.handle ()));
   // ACE_OS::lseek (this->mmap_.handle (), 0, SEEK_END);
@@ -475,7 +485,7 @@ ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options (
     install_signal_handler_ (install_signal_handler)
 {
   ACE_TRACE ("ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options");
-  // for backwards compatability
+  // for backwards compatibility
   if (base_addr_ == 0 && use_fixed_addr_ == ALWAYS_FIXED)
     use_fixed_addr_ = FIRSTCALL_FIXED;
 }
@@ -488,9 +498,9 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t
     return -1;
 #if 0
   else
-    ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) received %S\n"), signum));
+    ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) received %S\n"), signum));
 #endif
-  // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) new mapping address = %@\n"), (char *) this->base_addr_ + current_map_size));
+  // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) new mapping address = %@\n"), (char *) this->base_addr_ + current_map_size));
 
 #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR)
   // Make sure that the pointer causing the problem is within the
@@ -498,10 +508,10 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t
 
   if (siginfo != 0)
     {
-      // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %@\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr));
+      // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %@\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr));
       if (this->remap ((void *) siginfo->si_addr) == -1)
         return -1;
-      // ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %@ out of range\n",
+      // ACELIB_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %@ out of range\n",
       // siginfo->si_addr), -1);
       return 0;
     }
diff --git a/dep/acelite/ace/Malloc.cpp b/dep/acelite/ace/Malloc.cpp
index c332dde80..a3fd3176e 100644
--- a/dep/acelite/ace/Malloc.cpp
+++ b/dep/acelite/ace/Malloc.cpp
@@ -1,4 +1,4 @@
-// $Id: Malloc.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: Malloc.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Malloc.h"
 
@@ -27,10 +27,10 @@ ACE_Control_Block::ACE_Malloc_Header::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Control_Block::ACE_Malloc_Header::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %@"), (ACE_Malloc_Header *) this->next_block_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %@"), (ACE_Malloc_Header *) this->next_block_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -39,8 +39,8 @@ ACE_Control_Block::print_alignment_info (void)
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Control_Block::print_alignment_info");
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_Control_Block::print_alignment_info:\n")));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_Control_Block::print_alignment_info:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Sizeof ptr: %d\n")
               ACE_TEXT ("Sizeof size_t: %d\n")
               ACE_TEXT ("Sizeof long: %d\n")
@@ -66,7 +66,7 @@ ACE_Control_Block::print_alignment_info (void)
               sizeof (ACE_Malloc_Header),
               sizeof (ACE_Control_Block)
               ));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_Control_Block::print_alignment_info:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_Control_Block::print_alignment_info:\n")));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -76,28 +76,32 @@ ACE_Control_Block::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Control_Block::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n")));
   for (ACE_Name_Node *nextn = this->name_head_;
        nextn != 0;
        nextn = nextn->next_)
     nextn->dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %@"), (ACE_Malloc_Header *) this->freep_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %@"), (ACE_Malloc_Header *) this->freep_));
   this->base_.dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n")));
   for (ACE_Malloc_Header *nexth = ((ACE_Malloc_Header *)this->freep_)->next_block_;
        nexth != 0 && nexth != &this->base_;
        nexth = nexth->next_block_)
     nexth->dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
 ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (void)
+  : name_ (0),
+    pointer_ (0),
+    next_ (0),
+    prev_ (0)
 {
   ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::ACE_Name_Node");
 }
@@ -136,14 +140,14 @@ ACE_Control_Block::ACE_Name_Node::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("pointer = %@"), (const char *) this->pointer_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %@"), (ACE_Name_Node *) this->next_));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("pointer = %@"), (const char *) this->pointer_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %@"), (ACE_Name_Node *) this->next_));
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\nname_ = (%@, %C)\n"),
               (const char *) this->name_,
               (const char *) this->name_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -163,16 +167,16 @@ ACE_Malloc_Stats::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Malloc_Stats::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   int const nblocks = this->nblocks_.value ();
   int const ninuse  = this->ninuse_.value ();
   int const nchunks = this->nchunks_.value ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("nblocks = %d"), nblocks));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nninuse = %d"), ninuse));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nnchunks = %d"), nchunks));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("nblocks = %d"), nblocks));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("\nninuse = %d"), ninuse));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("\nnchunks = %d"), nchunks));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Malloc.h b/dep/acelite/ace/Malloc.h
index 7b59f8ae1..988c8b90e 100644
--- a/dep/acelite/ace/Malloc.h
+++ b/dep/acelite/ace/Malloc.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Malloc.h
  *
- *  $Id: Malloc.h 81796 2008-05-28 13:46:21Z sma $
+ *  $Id: Malloc.h 96985 2013-04-11 15:50:32Z huangh $
  *
  *  @author Doug Schmidt and Irfan Pyarali
  */
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if defined (ACE_HAS_MALLOC_STATS)
 #  include "ace/Atomic_Op.h"
diff --git a/dep/acelite/ace/Malloc_Allocator.cpp b/dep/acelite/ace/Malloc_Allocator.cpp
index 53a81d0d3..06df196f8 100644
--- a/dep/acelite/ace/Malloc_Allocator.cpp
+++ b/dep/acelite/ace/Malloc_Allocator.cpp
@@ -1,4 +1,4 @@
-// $Id: Malloc_Allocator.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Malloc_Allocator.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Malloc_Allocator.h"
 #include "ace/Object_Manager.h"
@@ -9,7 +9,7 @@
 
 #include "ace/Guard_T.h"
 #include "ace/Recursive_Thread_Mutex.h"
-#include "ace/Log_Msg.h"  // for ACE_ASSERT
+#include "ace/Log_Category.h"  // for ACE_ASSERT
 #include "ace/OS_NS_string.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -346,13 +346,13 @@ ACE_Static_Allocator_Base::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Static_Allocator_Base::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\noffset_ = %d"), this->offset_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d\n"), this->size_));
-  ACE_HEX_DUMP ((LM_DEBUG, this->buffer_, this->size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\noffset_ = %d"), this->offset_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d\n"), this->size_));
+  ACELIB_HEX_DUMP ((LM_DEBUG, this->buffer_, this->size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Malloc_Allocator.h b/dep/acelite/ace/Malloc_Allocator.h
index 1a562108f..1757cd275 100644
--- a/dep/acelite/ace/Malloc_Allocator.h
+++ b/dep/acelite/ace/Malloc_Allocator.h
@@ -4,7 +4,7 @@
 /**
  *  @file   Malloc_Allocator.h
  *
- *  $Id: Malloc_Allocator.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: Malloc_Allocator.h 97185 2013-05-30 18:51:35Z johnnyw $
  *
  *  @author Based on code that formerly existed in another ACE file.
  */
@@ -44,8 +44,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * This class uses the new/delete operators to allocate and free up
  * memory.  Please note that the only methods that are supported are
- * <malloc>, <calloc>, and <free>. All other methods are no-ops that
- * return -1 and set @c errno to <ENOTSUP>.  If you require this
+ * malloc(), calloc(), and free(). All other methods are no-ops that
+ * return -1 and set @c errno to @c ENOTSUP.  If you require this
  * functionality, please use: ACE_Allocator_Adapter <ACE_Malloc
  * <ACE_LOCAL_MEMORY_POOL, MUTEX> >, which will allow you to use the
  * added functionality of bind/find/etc. while using the new/delete
@@ -88,11 +88,11 @@ private:
  * @brief Defines a class that provided a highly optimized memory
  * management scheme for allocating memory statically.
  *
- * This class manages a fixed-size <POOL_SIZE> of memory.  Every
- * time <malloc>/<calloc> is called, it simply moves an internal
+ * This class manages a fixed-size @c POOL_SIZE of memory.  Every
+ * time malloc()/calloc() is called, it simply moves an internal
  * index forward and returns a pointer to the requested chunk.
  * All memory is allocated statically (typically via the
- * ACE_Static_Allocator template) and <free> is a no-op.  This
+ * ACE_Static_Allocator template) and free() is a no-op.  This
  * behavior is useful for use-cases where all the memory
  * allocation needs are known in advance and no deletions ever
  * occur.
diff --git a/dep/acelite/ace/Malloc_T.cpp b/dep/acelite/ace/Malloc_T.cpp
index be56870f3..666e789b8 100644
--- a/dep/acelite/ace/Malloc_T.cpp
+++ b/dep/acelite/ace/Malloc_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Malloc_T.cpp 94341 2011-07-22 12:33:43Z schmidt $
+// $Id: Malloc_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_MALLOC_T_CPP
 #define ACE_MALLOC_T_CPP
@@ -363,15 +363,15 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->memory_pool_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("cb_ptr_ = %@\n"), this->cb_ptr_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("cb_ptr_ = %@\n"), this->cb_ptr_));
   this->cb_ptr_->dump ();
 #if defined (ACE_HAS_MALLOC_STATS)
   if (this->cb_ptr_ != 0)
     this->cb_ptr_->malloc_stats_.dump ();
 #endif /* ACE_HAS_MALLOC_STATS */
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -386,14 +386,14 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::print_stats (void) const
   if (this->cb_ptr_ == 0)
     return;
   this->cb_ptr_->malloc_stats_.dump ();
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) contents of freelist:\n")));
 
   for (MALLOC_HEADER *currp = this->cb_ptr_->freep_->next_block_;
        ;
        currp = currp->next_block_)
     {
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) ptr = %@, MALLOC_HEADER units = %d, byte units = %d\n"),
                   currp,
                   currp->size_,
@@ -436,13 +436,13 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open (void)
                                      rounded_bytes,
                                      first_time);
   if (this->cb_ptr_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("(%P|%t) %p\n"),
                        ACE_TEXT ("init_acquire failed")),
                       -1);
   else if (first_time)
     {
-      // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) first time in, control block = %@\n"), this->cb_ptr_));
+      // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) first time in, control block = %@\n"), this->cb_ptr_));
 
       MALLOC_HEADER::init_ptr (&this->cb_ptr_->freep_,
                                &this->cb_ptr_->base_,
@@ -513,7 +513,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p
   this->bad_flag_ = this->open ();
 
   if (this->bad_flag_ == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T")));
 }
@@ -537,7 +537,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p
 
   this->bad_flag_ = this->open ();
   if (this->bad_flag_ == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T")));
 }
@@ -564,7 +564,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p
 
   this->bad_flag_ = this->open ();
   if (this->bad_flag_ == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T")));
 }
@@ -586,7 +586,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int
 ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove (void)
 {
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove");
-  // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) destroying ACE_Malloc_T\n")));
+  // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) destroying ACE_Malloc_T\n")));
 
 #if defined (ACE_HAS_MALLOC_STATS)
   this->print_stats ();
@@ -714,10 +714,10 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_malloc (size_t nbytes)
               else
                 return 0;
                 // Shouldn't do this here because of errors with the wchar ver
-                // This is because ACE_ERROR_RETURN converts the __FILE__ to
+                // This is because ACELIB_ERROR_RETURN converts the __FILE__ to
                 // wchar before printing out.  The compiler will complain
                 // about this since a destructor would present in a SEH block
-                //ACE_ERROR_RETURN ((LM_ERROR,
+                //ACELIB_ERROR_RETURN ((LM_ERROR,
                 //                   ACE_TEXT ("(%P|%t) %p\n"),
                 //                   ACE_TEXT ("malloc")),
                 //                  0);
@@ -1051,11 +1051,11 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->curr_->dump ();
   this->guard_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %C\n"), this->name_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %C\n"), this->name_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -1145,11 +1145,11 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->curr_->dump ();
   this->guard_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s\n"), this->name_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s\n"), this->name_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Manual_Event.cpp b/dep/acelite/ace/Manual_Event.cpp
index 5fb4a84c9..fc1c94a97 100644
--- a/dep/acelite/ace/Manual_Event.cpp
+++ b/dep/acelite/ace/Manual_Event.cpp
@@ -1,4 +1,4 @@
-// $Id: Manual_Event.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Manual_Event.cpp 96220 2012-11-06 10:03:41Z mcorino $
 
 #include "ace/Manual_Event.h"
 
@@ -6,42 +6,44 @@
 #include "ace/Manual_Event.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Manual_Event::ACE_Manual_Event (int initial_state,
-                                    int type,
-                                    const char *name,
-                                    void *arg)
-  : ACE_Event (1,
-               initial_state,
-               type,
-               ACE_TEXT_CHAR_TO_TCHAR (name),
-               arg)
+template <class TIME_POLICY>
+ACE_Manual_Event_T<TIME_POLICY>::ACE_Manual_Event_T (
+    int initial_state,
+    int type,
+    const char *name,
+    void *arg)
+  : ACE_Event_T<TIME_POLICY> (1,
+                              initial_state,
+                              type,
+                              ACE_TEXT_CHAR_TO_TCHAR (name),
+                              arg)
 {
 }
 
 #if defined (ACE_HAS_WCHAR)
-ACE_Manual_Event::ACE_Manual_Event (int initial_state,
-                                    int type,
-                                    const wchar_t *name,
-                                    void *arg)
-  : ACE_Event (1,
-               initial_state,
-               type,
-               ACE_TEXT_WCHAR_TO_TCHAR (name),
-               arg)
+template <class TIME_POLICY>
+ACE_Manual_Event_T<TIME_POLICY>::ACE_Manual_Event_T (
+    int initial_state,
+    int type,
+    const wchar_t *name,
+    void *arg)
+  : ACE_Event_T<TIME_POLICY> (1,
+                              initial_state,
+                              type,
+                              ACE_TEXT_WCHAR_TO_TCHAR (name),
+                              arg)
 {
 }
 #endif /* ACE_HAS_WCHAR */
 
+template <class TIME_POLICY>
 void
-ACE_Manual_Event::dump (void) const
+ACE_Manual_Event_T<TIME_POLICY>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_Event::dump ();
+  ACE_Event_T<TIME_POLICY>::dump ();
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Manual_Event.h b/dep/acelite/ace/Manual_Event.h
index 5242ef17c..43aa5e493 100644
--- a/dep/acelite/ace/Manual_Event.h
+++ b/dep/acelite/ace/Manual_Event.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Manual_Event.h
  *
- *  $Id: Manual_Event.h 91066 2010-07-12 11:05:04Z johnnyw $
+ *  $Id: Manual_Event.h 96220 2012-11-06 10:03:41Z mcorino $
  *
  *   Moved from Synch.h.
  *
@@ -36,25 +36,26 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * support.  However, only Win32 platforms support global naming and
  * system-scope locking support.
  */
-class ACE_Export ACE_Manual_Event : public ACE_Event
+template <class TIME_POLICY = ACE_System_Time_Policy>
+class ACE_Manual_Event_T : public ACE_Event_T<TIME_POLICY>
 {
 public:
   /// Constructor which will create manual event
-  ACE_Manual_Event (int initial_state = 0,
-                    int type = USYNC_THREAD,
-                    const char *name = 0,
-                    void *arg = 0);
+  ACE_Manual_Event_T (int initial_state = 0,
+                      int type = USYNC_THREAD,
+                      const char *name = 0,
+                      void *arg = 0);
 
 #if defined (ACE_HAS_WCHAR)
   /// Constructor which will create manual event (wchar_t version)
-  ACE_Manual_Event (int initial_state,
-                    int type,
-                    const wchar_t *name,
-                    void *arg = 0);
+  ACE_Manual_Event_T (int initial_state,
+                      int type,
+                      const wchar_t *name,
+                      void *arg = 0);
 #endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
-  ~ACE_Manual_Event (void);
+  ~ACE_Manual_Event_T (void);
 
   /// Dump the state of an object.
   void dump (void) const;
@@ -63,12 +64,45 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 };
 
+class ACE_Manual_Event :
+  public ACE_Manual_Event_T<ACE_System_Time_Policy>
+{
+public:
+  /// Constructor which will create auto event
+  ACE_Manual_Event (int initial_state = 0,
+                    int type = USYNC_THREAD,
+                    const char *name = 0,
+                    void *arg = 0)
+  : ACE_Manual_Event_T<ACE_System_Time_Policy> (initial_state, type, name, arg)
+  {}
+
+#if defined (ACE_HAS_WCHAR)
+  /// Constructor which will create auto event (wchar_t version)
+  ACE_Manual_Event (int initial_state,
+                    int type,
+                    const wchar_t *name,
+                    void *arg = 0)
+  : ACE_Manual_Event_T<ACE_System_Time_Policy> (initial_state, type, name, arg)
+  {}
+#endif /* ACE_HAS_WCHAR */
+
+  /// Default dtor.
+  virtual ~ACE_Manual_Event (void) {}
+};
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Manual_Event.inl"
 #endif /* __ACE_INLINE__ */
 
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "ace/Manual_Event.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Manual_Event.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_MANUAL_EVENT_H */
diff --git a/dep/acelite/ace/Manual_Event.inl b/dep/acelite/ace/Manual_Event.inl
index 9872973f4..7a9cedd5c 100644
--- a/dep/acelite/ace/Manual_Event.inl
+++ b/dep/acelite/ace/Manual_Event.inl
@@ -1,11 +1,12 @@
 // -*- C++ -*-
 //
-// $Id: Manual_Event.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Manual_Event.inl 96220 2012-11-06 10:03:41Z mcorino $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+template <class TIME_POLICY>
 ACE_INLINE
-ACE_Manual_Event::~ACE_Manual_Event (void)
+ACE_Manual_Event_T<TIME_POLICY>::~ACE_Manual_Event_T (void)
 {
 }
 
diff --git a/dep/acelite/ace/Map_Manager.cpp b/dep/acelite/ace/Map_Manager.cpp
index 54b7faf95..14abd0ad1 100644
--- a/dep/acelite/ace/Map_Manager.cpp
+++ b/dep/acelite/ace/Map_Manager.cpp
@@ -1,4 +1,4 @@
-// $Id: Map_Manager.cpp 91809 2010-09-17 07:20:41Z johnnyw $
+// $Id: Map_Manager.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_MAP_MANAGER_CPP
 #define ACE_MAP_MANAGER_CPP
@@ -595,15 +595,15 @@ template <class EXT_ID, class INT_ID> void
 ACE_Map_Entry<EXT_ID, INT_ID>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %d"), this->next_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("prev_ = %d"), this->prev_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %d"), this->next_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("prev_ = %d"), this->prev_));
 
 #if defined (ACE_HAS_LAZY_MAP_MANAGER)
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("free_ = %d"), this->free_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("free_ = %d"), this->free_));
 #endif /* ACE_HAS_LAZY_MAP_MANAGER */
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -611,12 +611,12 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> void
 ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("total_size_ = %d"), this->total_size_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("total_size_ = %d"), this->total_size_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_));
   this->allocator_->dump ();
   this->lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -624,9 +624,9 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> void
 ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %d"), this->next_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %d"), this->next_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -634,9 +634,9 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> void
 ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %d"), this->next_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("next_ = %d"), this->next_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Map_Manager.h b/dep/acelite/ace/Map_Manager.h
index 4423fa026..fcdee28fb 100644
--- a/dep/acelite/ace/Map_Manager.h
+++ b/dep/acelite/ace/Map_Manager.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Map_Manager.h
  *
- *  $Id: Map_Manager.h 91626 2010-09-07 10:59:20Z johnnyw $
+ *  $Id: Map_Manager.h 97505 2014-01-06 15:38:30Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -83,9 +83,7 @@ public:
 
   /// Is this entry free?
   bool free_;
-
 #endif /* ACE_HAS_LAZY_MAP_MANAGER */
-
 };
 
 // Forward decl.
diff --git a/dep/acelite/ace/Map_Manager.inl b/dep/acelite/ace/Map_Manager.inl
index 9aafdd854..7c45d5d8c 100644
--- a/dep/acelite/ace/Map_Manager.inl
+++ b/dep/acelite/ace/Map_Manager.inl
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 //
-// $Id: Map_Manager.inl 91809 2010-09-17 07:20:41Z johnnyw $
+// $Id: Map_Manager.inl 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -56,7 +56,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Manager (size_t size,
     cur_size_ (0)
 {
   if (this->open (size, alloc) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Map_Manager\n")));
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Map_Manager\n")));
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
@@ -67,7 +67,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Manager (ACE_Allocator *alloc
     cur_size_ (0)
 {
   if (this->open (ACE_DEFAULT_MAP_SIZE, alloc) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Map_Manager\n")));
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Map_Manager\n")));
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
diff --git a/dep/acelite/ace/Mem_Map.cpp b/dep/acelite/ace/Mem_Map.cpp
index c4e689ec8..fe9b81840 100644
--- a/dep/acelite/ace/Mem_Map.cpp
+++ b/dep/acelite/ace/Mem_Map.cpp
@@ -1,4 +1,4 @@
-// $Id: Mem_Map.cpp 95716 2012-05-01 07:49:04Z johnnyw $
+// $Id: Mem_Map.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 // Defines the member functions for the memory mapping facility.
 
@@ -11,7 +11,7 @@
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_string.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Truncate.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -24,14 +24,14 @@ ACE_Mem_Map::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Mem_Map::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("base_addr_ = %x"), this->base_addr_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nfilename_ = %s"), this->filename_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nlength_ = %d"), this->length_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhandle_ = %d"), this->handle_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nfile_mapping_ = %d"), this->file_mapping_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nclose_handle_ = %d"), this->close_handle_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("base_addr_ = %x"), this->base_addr_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nfilename_ = %s"), this->filename_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nlength_ = %d"), this->length_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhandle_ = %d"), this->handle_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nfile_mapping_ = %d"), this->file_mapping_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nclose_handle_ = %d"), this->close_handle_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -273,7 +273,7 @@ ACE_Mem_Map::ACE_Mem_Map (const ACE_TCHAR *file_name,
                  addr,
                  offset,
                  sa) < 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Mem_Map::ACE_Mem_Map")));
 }
@@ -306,7 +306,7 @@ ACE_Mem_Map::ACE_Mem_Map (ACE_HANDLE handle,
                  addr,
                  offset,
                  sa) < 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Mem_Map::ACE_Mem_Map")));
 }
diff --git a/dep/acelite/ace/Mem_Map.inl b/dep/acelite/ace/Mem_Map.inl
index 3fd3235db..ac659d1c9 100644
--- a/dep/acelite/ace/Mem_Map.inl
+++ b/dep/acelite/ace/Mem_Map.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Mem_Map.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Mem_Map.inl 96760 2013-02-05 21:11:03Z stanleyk $
 
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_mman.h"
@@ -122,7 +122,7 @@ ACE_Mem_Map::unmap (ssize_t len)
   if (this->base_addr_ != MAP_FAILED)
     {
       int const result = ACE_OS::munmap (this->base_addr_,
-                                         len < 0 ? this->length_ : len);
+                                         len < 0 ? this->length_ : (size_t)len);
       this->base_addr_ = MAP_FAILED;
       return result;
     }
@@ -140,7 +140,7 @@ ACE_Mem_Map::unmap (void *addr, ssize_t len)
   this->close_filemapping_handle ();
 
   return ACE_OS::munmap (addr,
-                         len < 0 ? this->length_ : len);
+                         len < 0 ? this->length_ : (size_t)len);
 }
 
 // Sync <len> bytes of the memory region to the backing store starting
diff --git a/dep/acelite/ace/Message_Block.cpp b/dep/acelite/ace/Message_Block.cpp
index 3ce71d6c5..2f564ad67 100644
--- a/dep/acelite/ace/Message_Block.cpp
+++ b/dep/acelite/ace/Message_Block.cpp
@@ -1,4 +1,4 @@
-// $Id: Message_Block.cpp 94516 2011-09-21 14:51:23Z johnnyw $
+// $Id: Message_Block.cpp 96985 2013-04-11 15:50:32Z huangh $
 #include "ace/Message_Block.h"
 
 #if !defined (__ACE_INLINE__)
@@ -6,7 +6,7 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Malloc_Base.h"
 #include "ace/OS_NS_string.h"
 
@@ -144,8 +144,8 @@ ACE_Data_Block::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Data_Block::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("-----( Data Block )-----\n")
               ACE_TEXT ("type_ = %d\n")
               ACE_TEXT ("cur_size_ = %u\n")
@@ -163,7 +163,7 @@ ACE_Data_Block::dump (void) const
               this->locking_strategy_,
               this->reference_count_));
   this->allocator_strategy_->dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -172,8 +172,8 @@ ACE_Message_Block::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Message_Block::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("-----( Message Block )-----\n")
               ACE_TEXT ("priority_ = %d\n")
               ACE_TEXT ("next_ = %@\n")
@@ -189,7 +189,7 @@ ACE_Message_Block::dump (void) const
               this->rd_ptr_,
               this->wr_ptr_));
   this->data_block ()->dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -404,7 +404,7 @@ ACE_Message_Block::ACE_Message_Block (const char *data,
                     0,  // data block
                     0,  // data_block allocator
                     0) == -1) // message_block allocator
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_Message_Block")));
 }
 
@@ -427,7 +427,7 @@ ACE_Message_Block::ACE_Message_Block (ACE_Allocator *message_block_allocator)
                     0, // data block
                     0, // data_block allocator
                     message_block_allocator) == -1) // message_block allocator
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_Message_Block")));
 }
 
@@ -460,7 +460,7 @@ ACE_Message_Block::ACE_Message_Block (size_t size,
                     0, // data block
                     data_block_allocator,
                     message_block_allocator) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_Message_Block")));
 }
 
@@ -547,7 +547,7 @@ ACE_Message_Block::ACE_Message_Block (size_t size,
                     db,
                     data_block_allocator,
                     message_block_allocator) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_Message_Block")));
 }
 
@@ -572,7 +572,7 @@ ACE_Message_Block::ACE_Message_Block (ACE_Data_Block *data_block,
                     data_block, // data block
                     data_block->data_block_allocator (),
                     message_block_allocator) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_Message_Block")));
 }
 
@@ -599,7 +599,7 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb,
                         mb.data_block ()->duplicate (), // data block
                         mb.data_block ()->data_block_allocator (),
                         mb.message_block_allocator_) == -1)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("ACE_Message_Block")));
 #if !defined (ACE_LACKS_CDR_ALIGNMENT)
       // Align ourselves
@@ -629,7 +629,7 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb,
                         mb.data_block ()->clone_nocopy (),// data block
                         mb.data_block ()->data_block_allocator (),
                         mb.message_block_allocator_) == -1)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("ACE_Message_Block")));
 
 #if !defined (ACE_LACKS_CDR_ALIGNMENT)
@@ -1016,78 +1016,96 @@ ACE_Message_Block::duplicate (void) const
 {
   ACE_TRACE ("ACE_Message_Block::duplicate");
 
+  ACE_Message_Block *nb_top = 0;
   ACE_Message_Block *nb = 0;
 
-  // Create a new <ACE_Message_Block> that contains unique copies of
-  // the message block fields, but a reference counted duplicate of
-  // the <ACE_Data_Block>.
-
-  // If there is no allocator, use the standard new and delete calls.
-  if (this->message_block_allocator_ == 0)
-    ACE_NEW_RETURN (nb,
-                    ACE_Message_Block (0, // size
-                                       ACE_Message_Type (0), // type
-                                       0, // cont
-                                       0, // data
-                                       0, // allocator
-                                       0, // locking strategy
-                                       0, // flags
-                                       this->priority_, // priority
-                                       ACE_EXECUTION_TIME,
-                                       ACE_DEADLINE_TIME,
-                                       // Get a pointer to a
-                                       // "duplicated" <ACE_Data_Block>
-                                       // (will simply increment the
-                                       // reference count).
-                                       this->data_block ()->duplicate  (),
-                                       this->data_block ()->data_block_allocator (),
-                                       this->message_block_allocator_),
-                  0);
-  else // Otherwise, use the message_block_allocator passed in.
-    ACE_NEW_MALLOC_RETURN (nb,
-                           static_cast<ACE_Message_Block*> (
-                             message_block_allocator_->malloc (sizeof (ACE_Message_Block))),
-                           ACE_Message_Block (0, // size
-                                              ACE_Message_Type (0), // type
-                                              0, // cont
-                                              0, // data
-                                              0, // allocator
-                                              0, // locking strategy
-                                              0, // flags
-                                              this->priority_, // priority
-                                              ACE_EXECUTION_TIME,
-                                              ACE_DEADLINE_TIME,
-                                              // Get a pointer to a
-                                              // "duplicated" <ACE_Data_Block>
-                                              // (will simply increment the
-                                              // reference count).
-                                              this->data_block ()->duplicate  (),
-                                              this->data_block ()->data_block_allocator (),
-                                              this->message_block_allocator_),
-                           0);
-
-  // Set the read and write pointers in the new <Message_Block> to the
-  // same relative offset as in the existing <Message_Block>.  Note
-  // that we are assuming that the data_block()->base() pointer
-  // doesn't change when it's duplicated.
-  nb->rd_ptr (this->rd_ptr_);
-  nb->wr_ptr (this->wr_ptr_);
+  const ACE_Message_Block *current = this;
 
   // Increment the reference counts of all the continuation messages.
-  if (this->cont_)
+  while (current)
     {
-      nb->cont_ = this->cont_->duplicate ();
+      ACE_Message_Block* cur_dup = 0;
 
-      // If things go wrong, release all of our resources and return
-      // 0.
-      if (nb->cont_ == 0)
+      // Create a new <ACE_Message_Block> that contains unique copies of
+      // the message block fields, but a reference counted duplicate of
+      // the <ACE_Data_Block>.
+
+      // If there is no allocator, use the standard new and delete calls.
+      if (current->message_block_allocator_ == 0)
+        ACE_NEW_NORETURN (cur_dup,
+                          ACE_Message_Block (0, // size
+                                             ACE_Message_Type (0), // type
+                                             0, // cont
+                                             0, // data
+                                             0, // allocator
+                                             0, // locking strategy
+                                             0, // flags
+                                             current->priority_, // priority
+                                             ACE_EXECUTION_TIME,
+                                             ACE_DEADLINE_TIME,
+                                             // Get a pointer to a
+                                             // "duplicated" <ACE_Data_Block>
+                                             // (will simply increment the
+                                             // reference count).
+                                             current->data_block ()->duplicate  (),
+                                             current->data_block ()->data_block_allocator (),
+                                             current->message_block_allocator_));
+      else // Otherwise, use the message_block_allocator passed in.
+        ACE_NEW_MALLOC_NORETURN (cur_dup,
+                                 static_cast<ACE_Message_Block*> (
+                                      current->message_block_allocator_->malloc (sizeof (ACE_Message_Block))),
+                                 ACE_Message_Block (0, // size
+                                                    ACE_Message_Type (0), // type
+                                                    0, // cont
+                                                    0, // data
+                                                    0, // allocator
+                                                    0, // locking strategy
+                                                    0, // flags
+                                                    current->priority_, // priority
+                                                    ACE_EXECUTION_TIME,
+                                                    ACE_DEADLINE_TIME,
+                                                    // Get a pointer to a
+                                                    // "duplicated" <ACE_Data_Block>
+                                                    // (will simply increment the
+                                                    // reference count).
+                                                    current->data_block ()->duplicate  (),
+                                                    current->data_block ()->data_block_allocator (),
+                                                    current->message_block_allocator_));
+
+
+      // If allocation failed above, release everything done so far and return NULL
+      if (cur_dup == 0)
         {
-          nb->release ();
-          nb = 0;
+          if (nb_top != 0)
+            {
+              nb_top->release ();
+            }
+          return 0;
         }
+
+      // Set the read and write pointers in the new <Message_Block> to the
+      // same relative offset as in the existing <Message_Block>.  Note
+      // that we are assuming that the data_block()->base() pointer
+      // doesn't change when it's duplicated.
+      cur_dup->rd_ptr (current->rd_ptr_);
+      cur_dup->wr_ptr (current->wr_ptr_);
+
+      if (!nb)
+        {
+          /* First in the list: set leading pointers */
+          nb_top = nb = cur_dup;
+        }
+      else
+        {
+          /* Continuing on: append to nb and walk down the list */
+          nb->cont_ = cur_dup;
+          nb = nb->cont_;
+        }
+
+      current = current->cont_;
     }
 
-  return nb;
+  return nb_top;
 }
 
 ACE_Message_Block *
@@ -1216,7 +1234,7 @@ ACE_Message_Block::clone (Message_Flags mask) const
           // the cloned data block that was created above. If we used
           // ACE_NEW_MALLOC_RETURN, there would be a memory leak because the
           // above db pointer would be left dangling.
-          new_message_block = static_cast<ACE_Message_Block*> (message_block_allocator_->malloc (sizeof (ACE_Message_Block)));
+          new_message_block = static_cast<ACE_Message_Block*> (old_message_block->message_block_allocator_->malloc (sizeof (ACE_Message_Block)));
           if (new_message_block != 0)
             new (new_message_block) ACE_Message_Block (0, // size
                                                        ACE_Message_Type (0), // type
diff --git a/dep/acelite/ace/Message_Block.h b/dep/acelite/ace/Message_Block.h
index 516f6fd42..058e7fe2d 100644
--- a/dep/acelite/ace/Message_Block.h
+++ b/dep/acelite/ace/Message_Block.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Message_Block.h
  *
- *  $Id: Message_Block.h 95798 2012-05-31 07:58:55Z johnnyw $
+ *  $Id: Message_Block.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 #include /**/ "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/dep/acelite/ace/Message_Queue.cpp b/dep/acelite/ace/Message_Queue.cpp
index ff781d097..7b32a48b1 100644
--- a/dep/acelite/ace/Message_Queue.cpp
+++ b/dep/acelite/ace/Message_Queue.cpp
@@ -1,7 +1,7 @@
-// $Id: Message_Queue.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Message_Queue.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Message_Queue.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Message_Queue.inl"
diff --git a/dep/acelite/ace/Message_Queue.h b/dep/acelite/ace/Message_Queue.h
index 2a70a1046..a4448a24b 100644
--- a/dep/acelite/ace/Message_Queue.h
+++ b/dep/acelite/ace/Message_Queue.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Message_Queue.h
  *
- *  $Id: Message_Queue.h 96061 2012-08-16 09:36:07Z mcorino $
+ *  $Id: Message_Queue.h 97201 2013-06-18 07:17:34Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -190,10 +190,10 @@ public:
   /// and 0 if the queue's state is ACTIVATED or PULSED.
   virtual int deactivated (void) = 0;
 
-  /// Get the notification strategy for the <Message_Queue>
+  /// Get the notification strategy for the Message_Queue
   virtual ACE_Notification_Strategy *notification_strategy (void) = 0;
 
-  /// Set the notification strategy for the <Message_Queue>
+  /// Set the notification strategy for the Message_Queue
   virtual void notification_strategy (ACE_Notification_Strategy *s) = 0;
 
   // = Notification hook.
@@ -213,7 +213,6 @@ protected:
   /// Indicates the state of the queue, which can be
   /// <ACTIVATED>, <DEACTIVATED>, or <PULSED>.
   int state_;
-
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Message_Queue_NT.cpp b/dep/acelite/ace/Message_Queue_NT.cpp
index 385af2c1b..870175a9f 100644
--- a/dep/acelite/ace/Message_Queue_NT.cpp
+++ b/dep/acelite/ace/Message_Queue_NT.cpp
@@ -1,8 +1,8 @@
-// $Id: Message_Queue_NT.cpp 92900 2010-12-17 14:45:11Z mcorino $
+// $Id: Message_Queue_NT.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Message_Queue.h"
 #include "ace/Message_Queue_NT.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Message_Queue_NT.inl"
@@ -197,24 +197,24 @@ ACE_Message_Queue_NT::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Message_Queue_NT::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   switch (this->state_)
     {
     case ACE_Message_Queue_Base::ACTIVATED:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("state = ACTIVATED\n")));
       break;
     case ACE_Message_Queue_Base::DEACTIVATED:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("state = DEACTIVATED\n")));
       break;
     case ACE_Message_Queue_Base::PULSED:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("state = PULSED\n")));
       break;
     }
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("max_cthrs_ = %d\n")
               ACE_TEXT ("cur_thrs_ = %d\n")
               ACE_TEXT ("cur_bytes = %d\n")
@@ -227,7 +227,7 @@ ACE_Message_Queue_NT::dump (void) const
               this->cur_length_,
               this->cur_count_,
               this->completion_port_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Message_Queue_T.cpp b/dep/acelite/ace/Message_Queue_T.cpp
index 710df2c43..0e4dd8e36 100644
--- a/dep/acelite/ace/Message_Queue_T.cpp
+++ b/dep/acelite/ace/Message_Queue_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Message_Queue_T.cpp 96070 2012-08-17 09:07:16Z mcorino $
+// $Id: Message_Queue_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_MESSAGE_QUEUE_T_CPP
 #define ACE_MESSAGE_QUEUE_T_CPP
@@ -7,7 +7,7 @@
 // circular include problems.
 #include "ace/Message_Queue.h"
 #include "ace/Message_Queue_Vx.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_sys_time.h"
 
 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
@@ -69,7 +69,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue_Ex");
 
   if (this->queue_.open (high_water_mark, low_water_mark, ns) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_Message_Queue_Ex")));
 }
 
@@ -984,23 +984,23 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   switch (this->state_)
     {
     case ACE_Message_Queue_Base::ACTIVATED:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("state = ACTIVATED\n")));
       break;
     case ACE_Message_Queue_Base::DEACTIVATED:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("state = DEACTIVATED\n")));
       break;
     case ACE_Message_Queue_Base::PULSED:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("state = PULSED\n")));
       break;
     }
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("low_water_mark = %d\n")
               ACE_TEXT ("high_water_mark = %d\n")
               ACE_TEXT ("cur_bytes = %d\n")
@@ -1015,11 +1015,11 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
               this->cur_count_,
               this->head_,
               this->tail_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_full_cond:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("not_full_cond:\n")));
   not_full_cond_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_empty_cond:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("not_empty_cond:\n")));
   not_empty_cond_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -1056,7 +1056,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue (size_t hwm,
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue");
 
   if (this->open (hwm, lwm, ns) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("open")));
 
 #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1)
@@ -1087,7 +1087,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue (void)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue");
   if (this->head_ != 0 && this->close () == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("close")));
 
 #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1)
@@ -1478,7 +1478,7 @@ template <ACE_SYNCH_DECL, class TIME_POLICY> int
 ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_head_i (ACE_Message_Block *&first_item)
 {
   if (this->head_ ==0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Attempting to dequeue from empty queue")),
                       -1);
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_head_i");
@@ -1604,7 +1604,7 @@ template <ACE_SYNCH_DECL, class TIME_POLICY> int
 ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_tail_i (ACE_Message_Block *&dequeued)
 {
   if (this->head_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Attempting to dequeue from empty queue")),
                       -1);
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_tail_i");
@@ -1654,7 +1654,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_deadline_i (ACE_Message_B
 {
 #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS)
   if (this->head_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Attempting to dequeue from empty queue")),
                       -1);
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_deadline_i");
@@ -2267,12 +2267,12 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> (base class):\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> (base class):\n")));
   this->ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump ();
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("pending_head_ = %u\n")
               ACE_TEXT ("pending_tail_ = %u\n")
               ACE_TEXT ("late_head_ = %u\n")
@@ -2286,10 +2286,10 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
               this->beyond_late_head_,
               this->beyond_late_tail_));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("message_strategy_ :\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("message_strategy_ :\n")));
   message_strategy_.dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
   // dump the state of the queue
@@ -2712,7 +2712,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_pending_queue (co
               else if (current_status != ACE_Dynamic_Message_Strategy::LATE)
                 {
                   // if we got here, something is *seriously* wrong with the queue
-                  ACE_ERROR_RETURN ((LM_ERROR,
+                  ACELIB_ERROR_RETURN ((LM_ERROR,
                                      ACE_TEXT ("Unexpected message priority status [%d] (expected LATE)"),
                                      (int) current_status),
                                     -1);
@@ -2754,7 +2754,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_pending_queue (co
             {
               if (current_status != ACE_Dynamic_Message_Strategy::PENDING)
                 // if we got here, something is *seriously* wrong with the queue
-                ACE_ERROR_RETURN((LM_ERROR,
+                ACELIB_ERROR_RETURN((LM_ERROR,
                                   ACE_TEXT ("Unexpected message priority status [%d] (expected PENDING)"),
                                   (int) current_status),
                                  -1);
@@ -2776,7 +2776,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_pending_queue (co
           break; // switch
         default:
           // if we got here, something is *seriously* wrong with the queue
-          ACE_ERROR_RETURN((LM_ERROR,
+          ACELIB_ERROR_RETURN((LM_ERROR,
                             ACE_TEXT ("Unknown message priority status [%d]"),
                             (int) current_status),
                            -1);
@@ -2832,7 +2832,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_late_queue (const
                 }
               else if (current_status != ACE_Dynamic_Message_Strategy::LATE)
                 // if we got here, something is *seriously* wrong with the queue
-                ACE_ERROR_RETURN ((LM_ERROR,
+                ACELIB_ERROR_RETURN ((LM_ERROR,
                                    ACE_TEXT ("Unexpected message priority status [%d] (expected LATE)"),
                                    (int) current_status),
                                   -1);
@@ -2853,14 +2853,14 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_late_queue (const
 
         case ACE_Dynamic_Message_Strategy::PENDING:
           // if we got here, something is *seriously* wrong with the queue
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("Unexpected message priority status ")
                              ACE_TEXT ("[%d] (expected LATE or BEYOND_LATE)"),
                              (int) current_status),
                             -1);
         default:
           // if we got here, something is *seriously* wrong with the queue
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("Unknown message priority status [%d]"),
                              (int) current_status),
                             -1);
diff --git a/dep/acelite/ace/Message_Queue_Vx.cpp b/dep/acelite/ace/Message_Queue_Vx.cpp
index a42b1fe65..51d6f292f 100644
--- a/dep/acelite/ace/Message_Queue_Vx.cpp
+++ b/dep/acelite/ace/Message_Queue_Vx.cpp
@@ -1,8 +1,8 @@
-// $Id: Message_Queue_Vx.cpp 95534 2012-02-17 23:19:33Z mitza $
+// $Id: Message_Queue_Vx.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Message_Queue.h"
 #include "ace/Message_Queue_Vx.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Message_Queue_Vx.inl"
@@ -21,23 +21,23 @@ ACE_Message_Queue_Vx::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Message_Queue_Vx::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   switch (this->state_)
     {
     case ACE_Message_Queue_Base::ACTIVATED:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("state = ACTIVATED\n")));
       break;
     case ACE_Message_Queue_Base::DEACTIVATED:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("state = DEACTIVATED\n")));
       break;
     case ACE_Message_Queue_Base::PULSED:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("state = PULSED\n")));
       break;
     }
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("low_water_mark = %d\n")
               ACE_TEXT ("high_water_mark = %d\n")
               ACE_TEXT ("cur_bytes = %d\n")
@@ -52,7 +52,7 @@ ACE_Message_Queue_Vx::dump (void) const
               this->cur_count_,
               this->head_,
               this->tail_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -66,7 +66,7 @@ ACE_Message_Queue_Vx::ACE_Message_Queue_Vx (size_t max_messages,
   ACE_TRACE ("ACE_Message_Queue_Vx::ACE_Message_Queue_Vx");
 
   if (this->open (max_messages_, max_message_length_, ns) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("open")));
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("open")));
 }
 
 ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx (void)
@@ -74,7 +74,7 @@ ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx (void)
   ACE_TRACE ("ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx");
 
   if (this->tail_ != 0  &&  this->close () == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("close")));
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("close")));
 }
 
 // Don't bother locking since if someone calls this function more than
diff --git a/dep/acelite/ace/Message_Queue_Vx.inl b/dep/acelite/ace/Message_Queue_Vx.inl
index 03bcc36ee..c509b1837 100644
--- a/dep/acelite/ace/Message_Queue_Vx.inl
+++ b/dep/acelite/ace/Message_Queue_Vx.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Message_Queue_Vx.inl 96017 2012-08-08 22:18:09Z mitza $
+// $Id: Message_Queue_Vx.inl 96860 2013-02-25 16:55:51Z schmidt $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -11,7 +11,17 @@ ACE_INLINE MSG_Q_ID
 ACE_Message_Queue_Vx::msgq (void)
 {
   // Hijack the tail_ field to store the MSG_Q_ID.
-  return static_cast<MSG_Q_ID> (reinterpret_cast<long> (tail_));
+  return static_cast<MSG_Q_ID> (
+#if defined __LP64__ && defined __RTP__
+  // In RTP-mode only MSG_Q_ID is an int; in a 64-bit build the size of MSG_Q_ID
+  // doesn't match the size of a pointer, tail_, so first treat it as 64-bit.
+                                reinterpret_cast<long> (tail_)
+#elif defined __RTP__
+                                reinterpret_cast<int> (tail_)
+#else
+                                reinterpret_cast<MSG_Q_ID> (tail_)
+#endif /* __RTP__ */
+                                );
 }
 
 #endif /* ACE_VXWORKS */
diff --git a/dep/acelite/ace/Module.cpp b/dep/acelite/ace/Module.cpp
index 376ed8367..e1907a5cd 100644
--- a/dep/acelite/ace/Module.cpp
+++ b/dep/acelite/ace/Module.cpp
@@ -1,4 +1,4 @@
-// $Id: Module.cpp 96080 2012-08-20 09:04:14Z johnnyw $
+// $Id: Module.cpp 97548 2014-01-24 10:04:58Z johnnyw $
 
 #ifndef ACE_MODULE_CPP
 #define ACE_MODULE_CPP
@@ -185,7 +185,8 @@ ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::ACE_Module (const ACE_TCHAR *module_name
                                        ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *reader_q,
                                        void *args,
                                        int flags /* = M_DELETE */)
-  : flags_ (M_FLAGS_NOT_SET)
+  : next_ (0),
+    flags_ (M_FLAGS_NOT_SET)
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::ACE_Module");
 
@@ -193,7 +194,7 @@ ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::ACE_Module (const ACE_TCHAR *module_name
   this->q_pair_[1] = 0;
 
   if (this->open (module_name, writer_q, reader_q, args, flags) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Module")));
 }
diff --git a/dep/acelite/ace/Monitor_Admin.cpp b/dep/acelite/ace/Monitor_Admin.cpp
index 5c60b2b90..37693b516 100644
--- a/dep/acelite/ace/Monitor_Admin.cpp
+++ b/dep/acelite/ace/Monitor_Admin.cpp
@@ -1,4 +1,4 @@
-// $Id: Monitor_Admin.cpp 81753 2008-05-21 19:02:47Z parsons $
+// $Id: Monitor_Admin.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Monitor_Admin.h"
 
@@ -58,7 +58,7 @@ namespace ACE
 
       if (!good_reg_add)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              "registration of %s failed\n",
                              monitor_point->name ()),
                              good_reg_add);
diff --git a/dep/acelite/ace/Monitor_Base.cpp b/dep/acelite/ace/Monitor_Base.cpp
index a4f3b847e..e1c0a3f27 100644
--- a/dep/acelite/ace/Monitor_Base.cpp
+++ b/dep/acelite/ace/Monitor_Base.cpp
@@ -1,4 +1,4 @@
-// $Id: Monitor_Base.cpp 82328 2008-07-15 17:20:17Z parsons $
+// $Id: Monitor_Base.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Monitor_Base.h"
 
@@ -53,7 +53,7 @@ namespace ACE
     {
       if (this->data_.type_ == Monitor_Control_Types::MC_LIST)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("receive: can't store numeric value - ")
                       ACE_TEXT ("%s is a string type monitor\n"),
                       this->name_.c_str ()));
@@ -108,7 +108,7 @@ namespace ACE
     {
       if (this->data_.type_ != Monitor_Control_Types::MC_LIST)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("receive: can't store string values - ")
                       ACE_TEXT ("%s is a numeric type monitor\n"),
                       this->name_.c_str ()));
@@ -211,7 +211,7 @@ namespace ACE
 
       if (!mgr->admin ().monitor_point (this, time))
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       "monitor point %s registration failed\n",
                       this->name ()));
         }
@@ -228,7 +228,7 @@ namespace ACE
 //      is using malloc with placement, then free, which may bypass the
 //      normal destructors. In any case, it happens only at shutdown
 //      and there seems to be no memory leak.
-//          ACE_ERROR ((LM_ERROR,
+//          ACELIB_ERROR ((LM_ERROR,
 //                      "monitor point %s unregistration failed\n",
 //                      this->name ()));
         }
@@ -241,7 +241,7 @@ namespace ACE
           || this->data_.type_ == Monitor_Control_Types::MC_GROUP
           || this->data_.type_ == Monitor_Control_Types::MC_LIST)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("average: %s is wrong monitor type\n"),
                              this->name_.c_str ()),
                             0);
@@ -261,7 +261,7 @@ namespace ACE
           || this->data_.type_ == Monitor_Control_Types::MC_GROUP
           || this->data_.type_ == Monitor_Control_Types::MC_LIST)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("sum_of_squares: %s ")
                              ACE_TEXT ("is wrong monitor type\n"),
                              this->name_.c_str ()),
@@ -278,7 +278,7 @@ namespace ACE
     {
       if (this->data_.type_ == Monitor_Control_Types::MC_GROUP)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("count: %s is a monitor group\n"),
                              this->name_.c_str ()),
                             0UL);
@@ -297,7 +297,7 @@ namespace ACE
       if (this->data_.type_ == Monitor_Control_Types::MC_GROUP
           || this->data_.type_ == Monitor_Control_Types::MC_LIST)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("minimum_sample: %s ")
                              ACE_TEXT ("is wrong monitor type\n"),
                              this->name_.c_str ()),
@@ -315,7 +315,7 @@ namespace ACE
       if (this->data_.type_ == Monitor_Control_Types::MC_GROUP
           || this->data_.type_ == Monitor_Control_Types::MC_LIST)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("maximum_sample: %s ")
                              ACE_TEXT ("is wrong monitor type\n"),
                              this->name_.c_str ()),
@@ -333,7 +333,7 @@ namespace ACE
       if (this->data_.type_ == Monitor_Control_Types::MC_GROUP
           || this->data_.type_ == Monitor_Control_Types::MC_LIST)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("last_sample: %s ")
                              ACE_TEXT ("is wrong monitor type\n"),
                              this->name_.c_str ()),
@@ -352,7 +352,7 @@ namespace ACE
 
       if (this->data_.type_ != Monitor_Control_Types::MC_LIST)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("get_list: %s is not a ")
                       ACE_TEXT ("list monitor type\n"),
                       this->name_.c_str ()));
diff --git a/dep/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp b/dep/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp
deleted file mode 100644
index 5c4b02d79..000000000
--- a/dep/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Id: Auto_Update_Starter.cpp 86518 2009-08-18 12:30:56Z olli $
-
-#include "ace/Monitor_Control/Auto_Update_Starter.h"
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#include "ace/Reactor.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Monitor_Admin_Manager.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    int
-    Auto_Update_Starter::svc (void)
-    {
-      MC_ADMINMANAGER* mgr =
-        ACE_Dynamic_Service<MC_ADMINMANAGER>::instance ("MC_ADMINMANAGER");
-
-      /// We want the thread in which the event loop is started to
-      /// own the reactor, otherwise the handle_timeout() calls
-      /// aren't triggerd.
-      mgr->admin ().reactor ()->owner (ACE_Thread::self ());
-
-      return mgr->admin ().reactor ()->run_reactor_event_loop ();
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/dep/acelite/ace/Monitor_Control/Auto_Update_Starter.h b/dep/acelite/ace/Monitor_Control/Auto_Update_Starter.h
deleted file mode 100644
index 720141016..000000000
--- a/dep/acelite/ace/Monitor_Control/Auto_Update_Starter.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Auto_Update_Starter.h
- *
- * $Id: Auto_Update_Starter.h 85297 2009-05-07 01:40:41Z parsons $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef AUTO_UPDATE_STARTER_H
-#define AUTO_UPDATE_STARTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Task.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Auto_Update_Starter
-     *
-     * @brief Starts reactor event loop that handles registered timers.
-     *
-     * For all the monitors that are periodically updated, the reactor
-     * event loop that calls their associated registered timers must
-     * be started in a separate thread so the rest of the application
-     * isn't blocked. A very simple class inheriting from ACE_Task_Base
-     * and overriding the svc() method suffices.
-     */
-    class MONITOR_CONTROL_Export Auto_Update_Starter : public ACE_Task_Base
-    {
-    public:
-      int svc (void);
-    };
-  }
-}
-
-typedef ACE::Monitor_Control::Auto_Update_Starter STARTER;
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // AUTO_UPDATE_STARTER_H
diff --git a/dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp b/dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
deleted file mode 100644
index 97467dfd9..000000000
--- a/dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// $Id: BSD_Network_Interface_Monitor.cpp 91813 2010-09-17 07:52:52Z johnnyw $
-
-#include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
-
-#if defined (__NetBSD__) || defined (__OpenBSD__)
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_stdio.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <ifaddrs.h>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    BSD_Network_Interface_Monitor::BSD_Network_Interface_Monitor (
-      const ACE_TCHAR *lookup_str)
-      : value_ (0UL),
-        start_ (0UL),
-        lookup_str_ (lookup_str)
-    {
-      this->init();
-    }
-
-    void
-    BSD_Network_Interface_Monitor::update_i (void)
-    {
-      this->fetch(this->value_);
-      this->value_ -= this->start_;
-    }
-
-    void
-    BSD_Network_Interface_Monitor::clear_impl (void)
-    {
-      this->init();
-    }
-
-    void
-    BSD_Network_Interface_Monitor::init (void)
-    {
-      this->fetch(this->start_);
-      this->value_ = 0UL;
-    }
-
-    void
-    BSD_Network_Interface_Monitor::fetch (ACE_UINT64& value) const
-    {
-      ACE_UINT64 count = 0;
-      int fd = socket (AF_INET, SOCK_DGRAM, 0);
-
-      if (fd == -1)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("socket failed\n")));
-          return;
-        }
-
-      struct ifaddrs *ifa, *ifap;
-
-      if (getifaddrs (&ifap) < 0)
-        {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("getifaddrs failed\n")));
-          close (fd);
-          return;
-        }
-
-      char *p = 0;
-
-      for (ifa = ifap; ifa != 0; ifa = ifa->ifa_next)
-        {
-          if (p && strcmp (p, ifa->ifa_name) == 0)
-            {
-              continue;
-            }
-
-          p = ifa->ifa_name;
-
-#if defined (__OpenBSD__)
-          struct ifreq ifdr;
-#else
-          struct ifdatareq ifdr;
-#endif
-          memset (&ifdr, 0, sizeof (ifdr));
-
-#if defined (__OpenBSD__)
-          struct if_data if_data;
-          ifdr.ifr_data = reinterpret_cast<caddr_t> (&if_data);
-          strncpy (ifdr.ifr_name, ifa->ifa_name, IFNAMSIZ-1);
-#else
-          strncpy (ifdr.ifdr_name, ifa->ifa_name, sizeof (ifdr));
-#endif
-          if (ioctl (fd, SIOCGIFDATA, &ifdr) == -1)
-            {
-              ACE_ERROR ((LM_ERROR, ACE_TEXT ("SIOCGIFDATA failed\n")));
-            }
-
-#if defined (__OpenBSD__)
-          struct if_data * const ifi = &if_data;
-#else
-          struct if_data * const ifi = &ifdr.ifdr_data;
-#endif
-
-          if (this->lookup_str_ == "ibytes")
-            {
-              count += ifi->ifi_ibytes;
-            }
-          else if (this->lookup_str_ == "ipackets")
-            {
-              count += ifi->ifi_ipackets;
-            }
-          else if (this->lookup_str_ == "obytes")
-            {
-              count += ifi->ifi_obytes;
-            }
-          else if (this->lookup_str_ == "opackets")
-            {
-              count += ifi->ifi_opackets;
-            }
-        }
-
-      freeifaddrs (ifap);
-      close (fd);
-
-      value = count;
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* defined (__NetBSD__) || defined (__OpenBSD__) */
diff --git a/dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h b/dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
deleted file mode 100644
index df4ab5d71..000000000
--- a/dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file BSD_Network_Interface_Monitor.h
- *
- * $Id: BSD_Network_Interface_Monitor.h 91743 2010-09-13 18:24:51Z johnnyw $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef BSD_NETWORK_INTERFACE_MONITOR_H
-#define BSD_NETWORK_INTERFACE_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/SString.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-#if defined (__NetBSD__) || defined (__OpenBSD__)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class BSD_Network_Interface_Monitor
-     *
-     * @brief Mixin class for network interface monitors compiled on
-     *        xxxBSD machines.
-     */
-    class MONITOR_CONTROL_Export BSD_Network_Interface_Monitor
-    {
-    protected:
-      BSD_Network_Interface_Monitor (const ACE_TCHAR *lookup_str);
-
-      /// Platform-specific implementation.
-      void update_i (void);
-
-      /// Platform-specific reset.
-      void clear_impl (void);
-
-    protected:
-      ACE_UINT64 value_;
-
-    private:
-      void init (void);
-      void fetch (ACE_UINT64& value) const;
-
-      ACE_UINT64 start_;
-      ACE_CString lookup_str_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* defined (__NetBSD__) || defined (__OpenBSD__) */
-
-#include /**/ "ace/post.h"
-
-#endif // BSD_NETWORK_INTERFACE_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp b/dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp
deleted file mode 100644
index a1ef6b6e3..000000000
--- a/dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id: Bytes_Received_Monitor.cpp 95533 2012-02-14 22:59:17Z wotte $
-
-#include "ace/Monitor_Control/Bytes_Received_Monitor.h"
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    const char* Bytes_Received_Monitor::default_name_ =
-      "OS/Network/BytesReceived";
-
-    Bytes_Received_Monitor::Bytes_Received_Monitor (const char* name)
-      : Monitor_Base (name, Monitor_Control_Types::MC_NUMBER)
-#if defined (ACE_HAS_WIN32_PDH)
-      , Windows_Multi_Instance_Monitor (
-            ACE_TEXT ("\\Network Interface(*)\\Bytes Received/sec"))
-#elif defined (ACE_LINUX) || defined (AIX)
-      , Linux_Network_Interface_Monitor (
-            " %*[^:]: %lu %*u %*u %*u %*u %*u %*u %*u %*u %*u")
-            /// Scan format for /proc/net/dev
-#elif defined (ACE_HAS_KSTAT)
-      , Solaris_Network_Interface_Monitor (ACE_TEXT ("rbytes"))
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
-      , BSD_Network_Interface_Monitor (ACE_TEXT ("ibytes"))
-#elif defined (__FreeBSD__) || defined (__Lynx__)
-      , FreeBSD_Network_Interface_Monitor (ACE_TEXT ("ibytes"))
-#endif
-    {}
-
-    void
-    Bytes_Received_Monitor::update (void)
-    {
-      this->update_i ();
-
-      /// On some platforms, value_ is an ACE_UINT64.
-      this->receive (static_cast<double> (this->value_));
-    }
-
-    const char*
-    Bytes_Received_Monitor::default_name (void)
-    {
-      return Bytes_Received_Monitor::default_name_;
-    }
-
-    void
-    Bytes_Received_Monitor::clear_i (void)
-    {
-      this->clear_impl ();
-      this->Monitor_Base::clear_i ();
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h b/dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h
deleted file mode 100644
index 1490293c0..000000000
--- a/dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Bytes_Received_Monitor.h
- *
- * $Id: Bytes_Received_Monitor.h 95533 2012-02-14 22:59:17Z wotte $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef BYTES_RECEIVED_MONITOR_H
-#define BYTES_RECEIVED_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Monitor_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H)
-#include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h"
-#elif defined (ACE_LINUX) || defined (AIX)
-#include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h"
-#elif defined (ACE_HAS_KSTAT)
-#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
-#elif defined (__FreeBSD__) || defined (__Lynx__)
-#include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
-#include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
-#else
-#include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"
-#endif
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Bytes_Received_Monitor
-     *
-     * @brief Monitors total bytes received over all network interfaces.
-     */
-    class MONITOR_CONTROL_Export Bytes_Received_Monitor
-      : public Monitor_Base
-#if defined (ACE_HAS_WIN32_PDH)
-      , public Windows_Multi_Instance_Monitor
-#elif defined (ACE_LINUX) || defined (AIX)
-      , public Linux_Network_Interface_Monitor
-#elif defined (ACE_HAS_KSTAT)
-      , public Solaris_Network_Interface_Monitor
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
-      , public BSD_Network_Interface_Monitor
-#elif defined (__FreeBSD__) || defined (__Lynx__)
-      , public FreeBSD_Network_Interface_Monitor
-#else
-      , public Null_Network_Interface_Monitor
-#endif
-    {
-    public:
-      Bytes_Received_Monitor (const char* name);
-
-      /// Implementation of the pure virtual method.
-      virtual void update (void);
-
-      /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
-
-    private:
-      /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
-
-    private:
-      static const char* default_name_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // BYTES_RECEIVED_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp b/dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
deleted file mode 100644
index 03e8f6f4f..000000000
--- a/dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id: Bytes_Sent_Monitor.cpp 95533 2012-02-14 22:59:17Z wotte $
-
-#include "ace/Monitor_Control/Bytes_Sent_Monitor.h"
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    const char* Bytes_Sent_Monitor::default_name_ =
-      "OS/Network/BytesSent";
-
-    Bytes_Sent_Monitor::Bytes_Sent_Monitor (const char* name)
-      : Monitor_Base (name, Monitor_Control_Types::MC_NUMBER)
-#if defined (ACE_HAS_WIN32_PDH)
-      , Windows_Multi_Instance_Monitor (
-            ACE_TEXT ("\\Network Interface(*)\\Bytes Sent/sec"))
-#elif defined (ACE_LINUX) || defined (AIX)
-      , Linux_Network_Interface_Monitor (
-            " %*[^:]: %*u %*u %*u %*u %*u %*u %*u %*u %lu %*u")
-            /// Scan format for /proc/net/dev
-#elif defined (ACE_HAS_KSTAT)
-      , Solaris_Network_Interface_Monitor (ACE_TEXT ("obytes"))
-#elif defined (__FreeBSD__) || defined (__Lynx__)
-      , FreeBSD_Network_Interface_Monitor (ACE_TEXT ("obytes"))
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
-      , BSD_Network_Interface_Monitor (ACE_TEXT ("obytes"))
-#endif
-    {}
-
-    void
-    Bytes_Sent_Monitor::update (void)
-    {
-      this->update_i ();
-
-      /// On some platforms, value_ is an ACE_UINT64.
-      this->receive (static_cast<double> (this->value_));
-    }
-
-    const char*
-    Bytes_Sent_Monitor::default_name (void)
-    {
-      return Bytes_Sent_Monitor::default_name_;
-    }
-
-    void
-    Bytes_Sent_Monitor::clear_i (void)
-    {
-      this->clear_impl ();
-      this->Monitor_Base::clear_i ();
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h b/dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h
deleted file mode 100644
index 8023195c3..000000000
--- a/dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Bytes_Sent_Monitor.h
- *
- * $Id: Bytes_Sent_Monitor.h 95533 2012-02-14 22:59:17Z wotte $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef BYTES_SENT_MONITOR_H
-#define BYTES_SENT_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Monitor_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H)
-#include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h"
-#elif defined (ACE_LINUX) || defined (AIX)
-#include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h"
-#elif defined (ACE_HAS_KSTAT)
-#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
-#elif defined (__FreeBSD__) || defined (__Lynx__)
-#include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
-#include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
-#else
-#include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"
-#endif
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Bytes_Sent_Monitor
-     *
-     * @brief Monitors total bytes sent over all network interfaces.
-     */
-    class MONITOR_CONTROL_Export Bytes_Sent_Monitor
-      : public Monitor_Base
-#if defined (ACE_HAS_WIN32_PDH)
-      , public Windows_Multi_Instance_Monitor
-#elif defined (ACE_LINUX) || defined (AIX)
-      , public Linux_Network_Interface_Monitor
-#elif defined (ACE_HAS_KSTAT)
-      , public Solaris_Network_Interface_Monitor
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
-      , public BSD_Network_Interface_Monitor
-#elif defined (__FreeBSD__) || defined (__Lynx__)
-      , public FreeBSD_Network_Interface_Monitor
-#else
-      , public Null_Network_Interface_Monitor
-#endif
-    {
-    public:
-      Bytes_Sent_Monitor (const char* name);
-
-      /// Implementation of the pure virtual method.
-      virtual void update (void);
-
-      /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
-
-    private:
-      /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
-
-    private:
-      static const char* default_name_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // BYTESSENTMONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp b/dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp
deleted file mode 100644
index 5e016777c..000000000
--- a/dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-// $Id: CPU_Load_Monitor.cpp 95533 2012-02-14 22:59:17Z wotte $
-
-#include "ace/Monitor_Control/CPU_Load_Monitor.h"
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#if defined (ACE_HAS_KSTAT)
-#include <sys/sysinfo.h>
-#endif
-
-#if defined (ACE_LINUX)
-#include "ace/OS_NS_stdio.h"
-#endif
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    const char* CPU_Load_Monitor::default_name_ =
-      "OS/Processor/CPULoad";
-
-    CPU_Load_Monitor::CPU_Load_Monitor (const char* name)
-      : Monitor_Base (name, Monitor_Control_Types::MC_NUMBER)
-#if defined (ACE_HAS_WIN32_PDH)
-      , Windows_Monitor (ACE_TEXT("\\Processor(_Total)\\% Processor Time"))
-#endif
-#if defined (ACE_LINUX) || defined (ACE_HAS_KSTAT)
-      , user_ (0)
-      , wait_ (0)
-      , kernel_ (0)
-      , idle_ (0)
-      , prev_idle_ (0)
-      , prev_total_ (0.0)
-#endif
-#if defined (ACE_LINUX)
-      , file_ptr_ (0)
-#elif defined (ACE_HAS_KSTAT)
-      , kstats_ (0)
-      , kstat_ (0)
-      , kstat_id_ (0)
-#endif
-    {
-      this->init ();
-    }
-
-    void
-    CPU_Load_Monitor::update (void)
-    {
-#if defined (ACE_HAS_WIN32_PDH)
-      this->update_i ();
-      this->receive (this->value_);
-#elif defined (ACE_LINUX)
-      this->access_proc_stat (&this->idle_);
-#elif defined (ACE_HAS_KSTAT)
-      this->access_kstats (&this->idle_);
-#endif
-
-#if defined (ACE_LINUX) || defined (ACE_HAS_KSTAT)
-      double delta_idle = this->idle_ - this->prev_idle_;
-      double total =
-        this->user_ + this->wait_ + this->kernel_ + this->idle_;
-      double delta_total = total - this->prev_total_;
-
-      if (ACE::is_equal (delta_total, 0.0))
-        {
-          /// The system hasn't updated /proc/stat since the last call
-          /// to update(), we must avoid dividing by 0.
-          return;
-        }
-
-      double percent_cpu_load = 100.0 - (delta_idle / delta_total * 100.0);
-
-      /// Stores value and timestamp with thread-safety.
-      this->receive (percent_cpu_load);
-
-      this->prev_idle_ = this->idle_;
-      this->prev_total_ = total;
-#endif
-    }
-
-    const char*
-    CPU_Load_Monitor::default_name (void)
-    {
-      return CPU_Load_Monitor::default_name_;
-    }
-
-    void
-    CPU_Load_Monitor::clear_i (void)
-    {
-#if defined (ACE_HAS_WIN32_PDH)
-      this->clear_impl ();
-#endif
-
-      this->init ();
-      this->Monitor_Base::clear_i ();
-    }
-
-    void
-    CPU_Load_Monitor::init (void)
-    {
-#if defined (ACE_LINUX)
-      /// All data in this file are stored as running 'jiffy' totals, so we
-      /// get values here in the constructor to subtract for the difference
-      /// in subsequent calls.
-      this->access_proc_stat (&this->prev_idle_);
-
-      this->prev_total_ =
-        this->user_ + this->wait_ + this->kernel_ + this->prev_idle_;
-#elif defined (ACE_HAS_KSTAT)
-      /// Stored similarly to Linux, in a system file.
-      this->access_kstats (&this->prev_idle_);
-
-      this->prev_total_ =
-        this->user_ + this->wait_ + this->kernel_ + this->prev_idle_;
-#endif
-    }
-
-#if defined (ACE_LINUX)
-    void
-    CPU_Load_Monitor::access_proc_stat (unsigned long *which_idle)
-    {
-      this->file_ptr_ = ACE_OS::fopen (ACE_TEXT ("/proc/stat"),
-                                       ACE_TEXT ("r"));
-
-      if (this->file_ptr_ == 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("CPU load - opening /proc/stat failed\n")));
-          return;
-        }
-
-      char *item = 0;
-      char *arg = 0;
-
-      while ((ACE_OS::fgets (buf_, sizeof (buf_), file_ptr_)) != 0)
-        {
-          item = ACE_OS::strtok (this->buf_, " \t\n");
-          arg = ACE_OS::strtok (0, "\n");
-
-          if (item == 0 || arg == 0)
-            {
-              continue;
-            }
-
-          if (ACE_OS::strcmp (item, "cpu") == 0)
-            {
-              sscanf (arg,
-                      "%lu %lu %lu %lu",
-                      &this->user_,
-                      &this->wait_,
-                      &this->kernel_,
-                      which_idle);
-              break;
-            }
-        }
-
-      ACE_OS::fclose (this->file_ptr_);
-    }
-#endif
-
-#if defined (ACE_HAS_KSTAT)
-    void
-    CPU_Load_Monitor::access_kstats (unsigned long *which_idle)
-    {
-      this->kstats_ = kstat_open ();
-
-      if (this->kstats_ == 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("opening kstats file failed\n")));
-          return;
-        }
-
-      this->kstat_id_ = this->kstats_->kc_chain_id;
-
-      while (true)
-        {
-          this->kernel_ = 0UL;
-          this->wait_ = 0UL;
-          this->user_ = 0UL;
-          (*which_idle) = 0UL;
-
-          /// Unlike Linux's "/proc/stat", there is no entry for total CPU
-          /// stats, so we have to sum them manually.
-          for (this->kstat_ = this->kstats_->kc_chain;
-               this->kstat_ != 0;
-               this->kstat_ = this->kstat_->ks_next)
-            {
-              int result = ACE_OS::strncmp (this->kstat_->ks_name,
-                                            "cpu_stat",
-                                            ACE_OS::strlen ("cpu_stat"));
-
-              if (result == 0)
-                {
-                  /// Because the kstat chain can change dynamically,
-                  /// watch the chain ID and restart the walk if the ID
-                  /// differs from what we saw during the walk. The restart
-                  /// is done by breaking from the cycle with kstat_ not 0.
-
-                  kid_t kstat_id = kstat_read (this->kstats_, this->kstat_, 0);
-
-                  if (kstat_id != this->kstat_id_)
-                    {
-                      break;
-                    }
-
-                  cpu_stat_t &kstat_cpu =
-                    *((cpu_stat_t *) this->kstat_->ks_data);
-
-                  this->kernel_ += kstat_cpu.cpu_sysinfo.cpu[CPU_KERNEL];
-                  this->wait_ += kstat_cpu.cpu_sysinfo.cpu[CPU_WAIT];
-                  this->user_ += kstat_cpu.cpu_sysinfo.cpu[CPU_USER];
-                  (*which_idle) += kstat_cpu.cpu_sysinfo.cpu[CPU_IDLE];
-                }
-            }
-
-          if (this->kstat_ != 0)
-            {
-              /// The ID changed underneath us, so get the new one and
-              /// start again.
-              this->kstat_id_ = kstat_chain_update (this->kstats_);
-
-              if (! this->kstat_id_ > 0)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("kstat chain update ")
-                              ACE_TEXT ("returned null id\n")));
-                  return;
-                }
-            }
-          else
-            {
-              /// Clean run, exit the WHILE loop.
-              break;
-            }
-        }
-
-      int status = kstat_close (this->kstats_);
-
-      if (status != 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("closing kstats file failed\n")));
-        }
-    }
-#endif
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.h b/dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.h
deleted file mode 100644
index 6481a1a66..000000000
--- a/dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file CPU_Load_Monitor.h
- *
- * $Id: CPU_Load_Monitor.h 95533 2012-02-14 22:59:17Z wotte $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef CPU_LOAD_MONITOR_H
-#define CPU_LOAD_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Monitor_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H)
-#include "ace/Monitor_Control/Windows_Monitor.h"
-#elif defined (ACE_HAS_KSTAT)
-#include "ace/os_include/os_kstat.h"
-#endif
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class CPU_Load_Monitor
-     *
-     * @brief Monitors percentage CPU utilization.
-     */
-    class MONITOR_CONTROL_Export CPU_Load_Monitor
-      : public Monitor_Base
-#if defined (ACE_HAS_WIN32_PDH)
-      , public Windows_Monitor
-#endif
-    {
-    public:
-      CPU_Load_Monitor (const char* name);
-
-      /// Implementation of the pure virtual method.
-      virtual void update (void);
-
-      /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
-
-    private:
-      /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
-
-      /// Common code to the constructor and to clear_i().
-      void init (void);
-
-    private:
-#if defined (ACE_LINUX)
-      void access_proc_stat (unsigned long *which_idle);
-#endif
-
-#if defined (ACE_HAS_KSTAT)
-      void access_kstats (unsigned long *which_idle);
-#endif
-
-    private:
-      static const char* default_name_;
-
-      /// Common to Linux and Solaris implementations.
-#if defined (ACE_LINUX) || defined (ACE_HAS_KSTAT)
-      unsigned long user_;
-      unsigned long wait_;
-      unsigned long kernel_;
-      unsigned long idle_;
-      unsigned long prev_idle_;
-      double prev_total_;
-#endif
-#if defined (ACE_LINUX)
-      FILE *file_ptr_;
-      char buf_[1024];
-#elif defined (ACE_HAS_KSTAT)
-      kstat_ctl_t *kstats_;
-      kstat_t *kstat_;
-      kid_t kstat_id_;
-#endif
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // CPU_LOAD_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp b/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp
deleted file mode 100644
index 189165225..000000000
--- a/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// $Id: Constraint_Interpreter.cpp 86518 2009-08-18 12:30:56Z olli $
-
-#include "ace/Monitor_Control/Constraint_Interpreter.h"
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#include "ace/Log_Msg.h"
-
-#include "ace/ETCL/ETCL_Constraint.h"
-
-#include "ace/Monitor_Control/Constraint_Visitor.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    Constraint_Interpreter::Constraint_Interpreter (void)
-    {
-    }
-
-    Constraint_Interpreter::~Constraint_Interpreter (void)
-    {
-    }
-
-    int
-    Constraint_Interpreter::build_tree (const char *constraints)
-    {
-      if (ETCL_Interpreter::is_empty_string (constraints))
-        {
-          /// Root is deleted in the interpreter's destructor.
-          ACE_NEW_RETURN (this->root_,
-                          ETCL_Literal_Constraint (true),
-                          -1);
-        }
-      else
-        {
-          /// root_ is set in this base class call.
-          if (ETCL_Interpreter::build_tree (constraints) != 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Constraint_Interpreter::build_tree() - "
-                                 "ETCL_Interpreter::build_tree() failed\n"),
-                                -1);
-            }
-        }
-
-      return 0;
-    }
-
-    ACE_CDR::Boolean
-    Constraint_Interpreter::evaluate (Constraint_Visitor &evaluator)
-    {
-      return evaluator.evaluate_constraint (this->root_);
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.h b/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.h
deleted file mode 100644
index e75981980..000000000
--- a/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Constraint_Interpreter.h
- *
- *  $Id: Constraint_Interpreter.h 81753 2008-05-21 19:02:47Z parsons $
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef CONSTRAINT_INTERPRETER_H
-#define CONSTRAINT_INTERPRETER_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/CDR_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#include "ace/ETCL/ETCL_Interpreter.h"
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    class Constraint_Visitor;
-
-    /**
-     * @class Constraint_Interpreter
-     *
-     * @brief "ETCL" Interpreter for MonitorControl constraints,
-              specialized to encapsulate MonitorControl-specific
-              knowledge of types and visitors.
-     */
-    class MONITOR_CONTROL_Export Constraint_Interpreter
-      : public ETCL_Interpreter
-    {
-    public:
-      Constraint_Interpreter (void);
-
-      virtual ~Constraint_Interpreter (void);
-
-      /**
-       * This method builds an expression tree representing the
-       * constraint specified in <constraints>, and returns -1 with
-       * an error message if the constraint given has syntax errors or
-       * semantic errors, such as mismatched types.
-       */
-      int build_tree (const char* constraints);
-
-      /// Returns true if the constraint is evaluated successfully by
-      /// the evaluator.
-      ACE_CDR::Boolean evaluate (Constraint_Visitor &evaluator);
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* CONSTRAINT_INTERPRETER_H */
diff --git a/dep/acelite/ace/Monitor_Control/Constraint_Visitor.cpp b/dep/acelite/ace/Monitor_Control/Constraint_Visitor.cpp
deleted file mode 100644
index d37ad53cc..000000000
--- a/dep/acelite/ace/Monitor_Control/Constraint_Visitor.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-// $Id: Constraint_Visitor.cpp 86518 2009-08-18 12:30:56Z olli $
-
-#include "ace/Monitor_Control/Constraint_Visitor.h"
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#include "ace/ETCL/ETCL_y.h"
-#include "ace/ETCL/ETCL_Constraint.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    Constraint_Visitor::Constraint_Visitor (
-      const Monitor_Control_Types::Data& data)
-      : data_ (data)
-    {}
-
-    Constraint_Visitor::~Constraint_Visitor (void)
-    {}
-
-    ACE_CDR::Boolean
-    Constraint_Visitor::evaluate_constraint (ETCL_Constraint *root)
-    {
-      ACE_CDR::Boolean result = false;
-      this->queue_.reset ();
-
-      // Evaluate the constraint in root_;
-      if (root != 0)
-      {
-        if (root->accept (this) == 0 && !this->queue_.is_empty ())
-        {
-          ETCL_Literal_Constraint top;
-          this->queue_.dequeue_head (top);
-          result = (ACE_CDR::Boolean) top;
-        }
-      }
-
-      // If a property couldn't be evaluated we must return FALSE.
-      return result;
-    }
-
-    int
-    Constraint_Visitor::visit_literal (ETCL_Literal_Constraint *constraint)
-    {
-      this->queue_.enqueue_head (*constraint);
-      return 0;
-    }
-
-    int
-    Constraint_Visitor::visit_identifier (ETCL_Identifier *ident)
-    {
-      /// TODO - check for strings related to other identifiers
-      /// relevant in MonitorControl, for example the data timestamp.
-      if (ACE_OS::strcmp (ident->value (), "value") == 0)
-        {
-          this->queue_.enqueue_head (
-            ETCL_Literal_Constraint (this->data_.value_));
-
-          return 0;
-        }
-
-      return -1;
-    }
-
-    int
-    Constraint_Visitor::visit_unary_expr (ETCL_Unary_Expr *unary_expr)
-    {
-      ETCL_Constraint *subexpression = unary_expr->subexpr ();
-
-      /// Call to accept() puts the subexpression's evaluation on our queue.
-      if (subexpression->accept (this) == 0)
-        {
-          ETCL_Literal_Constraint subexpr_result;
-          ACE_CDR::Boolean result = 0;
-          int op_type = unary_expr->type ();
-
-          switch (op_type)
-          {
-            case ETCL_NOT:
-              this->queue_.dequeue_head (subexpr_result);
-              result = ! (ACE_CDR::Boolean) subexpr_result;
-              this->queue_.enqueue_head (ETCL_Literal_Constraint (result));
-              return 0;
-            case ETCL_MINUS:
-              /// The leading '-' was parsed separately, so we have to pull
-              /// the literal constraint off the queue, apply the class' own
-              /// unary minus operator, and put it back.
-              this->queue_.dequeue_head (subexpr_result);
-              this->queue_.enqueue_head (-subexpr_result);
-              return 0;
-            case ETCL_PLUS:
-              /// Leave the literal constraint on the queue. The leading
-              /// '+' was just syntactic sugar - no action is necessary.
-              return 0;
-            default:
-              /// The parser should never construct a ETCL_Unary_Constraint
-              /// behind any operators except the above three.
-              return -1;
-          }
-        }
-
-      return -1;
-    }
-
-    int
-    Constraint_Visitor::visit_binary_expr (ETCL_Binary_Expr *binary_expr)
-    {
-      int bin_op_type = binary_expr->type ();
-
-      switch (bin_op_type)
-        {
-          case ETCL_OR:
-            return this->visit_or (binary_expr);
-          case ETCL_AND:
-            return this->visit_and (binary_expr);
-          case ETCL_LT:
-          case ETCL_LE:
-          case ETCL_GT:
-          case ETCL_GE:
-          case ETCL_EQ:
-          case ETCL_NE:
-          case ETCL_PLUS:
-          case ETCL_MINUS:
-          case ETCL_MULT:
-          case ETCL_DIV:
-            return this->visit_binary_op (binary_expr, bin_op_type);
-          /// These last two are not supported in non_CORBA ETCL.
-          case ETCL_TWIDDLE:
-          case ETCL_IN:
-          default:
-            return -1;
-        }
-    }
-
-    int
-    Constraint_Visitor::visit_or (ETCL_Binary_Expr *binary)
-    {
-      int return_value = -1;
-      ACE_CDR::Boolean result = false;
-      ETCL_Constraint *lhs = binary->lhs ();
-
-      /// Call to accept() puts the lhs (or its evaluation) on our queue.
-      if (lhs->accept (this) == 0)
-        {
-          ETCL_Literal_Constraint lhs_result;
-          this->queue_.dequeue_head (lhs_result);
-          result = (ACE_CDR::Boolean) lhs_result;
-
-          /// Short-circuiting OR.
-          if (!result)
-            {
-              ETCL_Constraint *rhs = binary->rhs ();
-
-              if (rhs->accept (this) == 0)
-              {
-                ETCL_Literal_Constraint rhs_result;
-                this->queue_.dequeue_head (rhs_result);
-                result = (ACE_CDR::Boolean) rhs_result;
-                return_value = 0;
-              }
-            }
-          else
-            {
-              return_value = 0;
-            }
-        }
-
-      if (return_value == 0)
-        {
-          this->queue_.enqueue_head (ETCL_Literal_Constraint (result));
-        }
-
-      return return_value;
-    }
-
-    int
-    Constraint_Visitor::visit_and (ETCL_Binary_Expr *binary)
-    {
-      int return_value = -1;
-      ACE_CDR::Boolean result = false;
-      ETCL_Constraint *lhs = binary->lhs ();
-
-      /// Call to accept() puts the lhs (or its evaluation) on our queue.
-      if (lhs->accept (this) == 0)
-        {
-          ETCL_Literal_Constraint lhs_result;
-          this->queue_.dequeue_head (lhs_result);
-          result = (ACE_CDR::Boolean) lhs_result;
-
-          /// Short-circuiting AND.
-          if (result == true)
-            {
-              ETCL_Constraint *rhs = binary->rhs ();
-
-              if (rhs->accept (this) == 0)
-              {
-                ETCL_Literal_Constraint rhs_result;
-                this->queue_.dequeue_head (rhs_result);
-                result = (ACE_CDR::Boolean) rhs_result;
-                return_value = 0;
-              }
-            }
-          else
-            {
-              return_value = 0;
-            }
-        }
-
-      if (return_value == 0)
-        {
-          this->queue_.enqueue_head (ETCL_Literal_Constraint (result));
-        }
-
-      return return_value;
-    }
-
-    int
-    Constraint_Visitor::visit_binary_op (ETCL_Binary_Expr *binary,
-                                         int op_type)
-    {
-      int return_value = -1;
-      ETCL_Constraint *lhs = binary->lhs ();
-      ACE_CDR::Boolean result = false;
-
-      /// Perform an operation on the results of evaluating the left and
-      /// right branches of this subtree. The evaluations go on our queue.
-      if (lhs->accept (this) == 0)
-        {
-          ETCL_Literal_Constraint left_operand;
-          this->queue_.dequeue_head (left_operand);
-          ETCL_Constraint *rhs = binary->rhs ();
-
-          if (rhs->accept (this) == 0)
-            {
-              ETCL_Literal_Constraint right_operand;
-              this->queue_.dequeue_head (right_operand);
-              return_value = 0;
-
-              switch (op_type)
-                {
-                  case ETCL_LT:
-                    result = left_operand < right_operand;
-                    this->queue_.enqueue_head (
-                      ETCL_Literal_Constraint (result));
-                    break;
-                  case ETCL_LE:
-                    result = left_operand <= right_operand;
-                    this->queue_.enqueue_head (
-                      ETCL_Literal_Constraint (result));
-                    break;
-                  case ETCL_GT:
-                    result = left_operand > right_operand;
-                    this->queue_.enqueue_head (
-                      ETCL_Literal_Constraint (result));
-                    break;
-                  case ETCL_GE:
-                    result = left_operand >= right_operand;
-                    this->queue_.enqueue_head (
-                      ETCL_Literal_Constraint (result));
-                    break;
-                  case ETCL_EQ:
-                    result = left_operand == right_operand;
-                    this->queue_.enqueue_head (
-                      ETCL_Literal_Constraint (result));
-                    break;
-                  case ETCL_NE:
-                    result = left_operand != right_operand;
-                    this->queue_.enqueue_head (
-                      ETCL_Literal_Constraint (result));
-                    break;
-                  case ETCL_PLUS:
-                    this->queue_.enqueue_head (
-                      left_operand + right_operand);
-                    break;
-                  case ETCL_MINUS:
-                    this->queue_.enqueue_head (
-                      left_operand - right_operand);
-                    break;
-                  case ETCL_MULT:
-                    this->queue_.enqueue_head (
-                      left_operand * right_operand);
-                    break;
-                  case ETCL_DIV:
-                    this->queue_.enqueue_head (
-                      left_operand / right_operand);
-                    break;
-                  default:
-                    return_value = -1;
-                    break;
-                }
-            }
-        }
-
-      return return_value;
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/dep/acelite/ace/Monitor_Control/Constraint_Visitor.h b/dep/acelite/ace/Monitor_Control/Constraint_Visitor.h
deleted file mode 100644
index 582ee1ab1..000000000
--- a/dep/acelite/ace/Monitor_Control/Constraint_Visitor.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Constraint_Visitor.h
- *
- * $Id: Constraint_Visitor.h 86518 2009-08-18 12:30:56Z olli $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef CONSTRAINT_VISITOR_H
-#define CONSTRAINT_VISITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/CDR_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#include "ace/Monitor_Control_Types.h"
-
-#include "ace/ETCL/ETCL_Constraint.h"
-#include "ace/ETCL/ETCL_Constraint_Visitor.h"
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ETCL_Literal_Constraint;
-class ETCL_Identifier;
-class ETCL_Unary_Expr;
-class ETCL_Binary_Expr;
-class ETCL_Constraint;
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Constraint_Visitor
-     *
-     * @brief Backend for the non-CORBA ETCL frontend, specific to
-     *        MonitorControl and supporting only basic types not
-              specific to CORBA.
-     */
-    class MONITOR_CONTROL_Export Constraint_Visitor
-      : public ETCL_Constraint_Visitor
-    {
-    public:
-      Constraint_Visitor (const Monitor_Control_Types::Data& data);
-      virtual ~Constraint_Visitor (void);
-
-      ACE_CDR::Boolean evaluate_constraint (ETCL_Constraint *root);
-
-      virtual int visit_literal (ETCL_Literal_Constraint *);
-      virtual int visit_identifier (ETCL_Identifier *);
-      virtual int visit_unary_expr (ETCL_Unary_Expr *);
-      virtual int visit_binary_expr (ETCL_Binary_Expr *);
-
-    private:
-      /// Sub-methods for visit_binary_expr().
-      int visit_or (ETCL_Binary_Expr *);
-      int visit_and (ETCL_Binary_Expr *);
-      int visit_binary_op (ETCL_Binary_Expr *binary_expr,
-                           int op_type);
-
-    private:
-      const Monitor_Control_Types::Data& data_;
-      ACE_Unbounded_Queue<ETCL_Literal_Constraint> queue_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // CONSTRAINT_VISITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp b/dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
deleted file mode 100644
index 87a3cffdd..000000000
--- a/dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-// $Id: FreeBSD_Network_Interface_Monitor.cpp 86518 2009-08-18 12:30:56Z olli $
-
-#include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
-
-#if defined (__FreeBSD__) || defined (__Lynx__)
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_stdio.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <net/if.h>
-#include <net/if_mib.h>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    FreeBSD_Network_Interface_Monitor::FreeBSD_Network_Interface_Monitor (
-      const ACE_TCHAR *lookup_str)
-      : value_ (0UL),
-        start_ (0UL),
-        lookup_str_ (lookup_str)
-    {
-      this->init();
-    }
-
-    void
-    FreeBSD_Network_Interface_Monitor::update_i (void)
-    {
-      this->fetch(this->value_);
-      this->value_ -= this->start_;
-    }
-
-    void
-    FreeBSD_Network_Interface_Monitor::clear_impl (void)
-    {
-      this->init();
-    }
-
-    void
-    FreeBSD_Network_Interface_Monitor::init (void)
-    {
-      this->fetch(this->start_);
-      this->value_ = 0UL;
-    }
-
-    void
-    FreeBSD_Network_Interface_Monitor::fetch (ACE_UINT64& value) const
-    {
-      ACE_UINT64 count = 0;
-
-      int req_name[5];
-      int ifcount;
-      size_t ifcount_len = sizeof(ifcount);
-
-      req_name[0] = CTL_NET;
-      req_name[1] = PF_LINK;
-      req_name[2] = NETLINK_GENERIC;
-      req_name[3] = IFMIB_SYSTEM;
-      req_name[4] = IFMIB_IFCOUNT;
-
-      if (::sysctl(req_name, 5, &ifcount, &ifcount_len, (void *)0, 0) == -1)
-      {
-        ACE_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) %p\n"),
-                  ACE_TEXT("sysctl failed")));
-
-        return;
-      }
-
-      for (int i = 1; i <= ifcount; i++)
-      {
-        int name[6];
-        struct ifmibdata ifmd;
-        size_t len = sizeof(ifmd);
-
-        name[0] = CTL_NET;
-        name[1] = PF_LINK;
-        name[2] = NETLINK_GENERIC;
-        name[3] = IFMIB_IFDATA;
-        name[4] = i;
-        name[5] = IFDATA_GENERAL;
-
-        if(::sysctl(name, 6, &ifmd, &len, (void *)0, 0) == -1)
-        {
-          ACE_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) %p\n"),
-               ACE_TEXT("sysctl failed")));
-
-          break;
-        }
-
-        struct if_data * const ifi = &ifmd.ifmd_data;
-
-        if(this->lookup_str_ == "ibytes")
-        {
-          count += ifi->ifi_ibytes;
-        }
-        else if(this->lookup_str_ == "ipackets")
-        {
-          count += ifi->ifi_ipackets;
-        }
-        else if(this->lookup_str_ == "obytes")
-        {
-          count += ifi->ifi_obytes;
-        }
-        else if(this->lookup_str_ == "opackets")
-        {
-          count += ifi->ifi_opackets;
-        }
-
-      } // for
-
-      value = count;
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* defined (__FreeBSD__) || defined (__Lynx__) */
diff --git a/dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h b/dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
deleted file mode 100644
index b820b3b0e..000000000
--- a/dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file FreeBSD_Network_Interface_Monitor.h
- *
- * $Id: FreeBSD_Network_Interface_Monitor.h 86518 2009-08-18 12:30:56Z olli $
- *
- * @author Boyan Kasarov
- */
-//=============================================================================
-
-#ifndef FREEBSD_NETWORK_INTERFACE_MONITOR_H
-#define FREEBSD_NETWORK_INTERFACE_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/SString.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-#if defined (__FreeBSD__) || defined (__Lynx__)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class FreeBSD_Network_Interface_Monitor
-     *
-     * @brief Mixin class for network interface monitors compiled on
-     *        FreeBSD machines.
-     */
-    class MONITOR_CONTROL_Export FreeBSD_Network_Interface_Monitor
-    {
-    protected:
-      FreeBSD_Network_Interface_Monitor (const ACE_TCHAR *lookup_str);
-
-      /// Platform-specific implementation.
-      void update_i (void);
-
-      /// Platform-specific reset.
-      void clear_impl (void);
-
-    protected:
-      ACE_UINT64 value_;
-
-    private:
-      void init (void);
-      void fetch (ACE_UINT64& value) const;
-
-      ACE_UINT64 start_;
-      ACE_CString lookup_str_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* defined (__FreeBSD__) || defined (__Lynx__) */
-
-#include /**/ "ace/post.h"
-
-#endif // FREEBSD_NETWORK_INTERFACE_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp b/dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
deleted file mode 100644
index ffcdc054d..000000000
--- a/dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-// $Id: Linux_Network_Interface_Monitor.cpp 95533 2012-02-14 22:59:17Z wotte $
-
-#include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h"
-
-#if defined (ACE_LINUX) || defined (AIX)
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_stdio.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    Linux_Network_Interface_Monitor::Linux_Network_Interface_Monitor (
-      const char *scan_format)
-      : value_ (0UL),
-        start_ (0UL),
-        scan_format_ (scan_format)
-    {
-      this->init ();
-    }
-
-    void
-    Linux_Network_Interface_Monitor::update_i (void)
-    {
-      char buf[1024];
-      FILE* fp = ACE_OS::fopen (ACE_TEXT ("/proc/net/dev"),
-                                ACE_TEXT ("r"));
-
-      if (fp == 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("bytes sent - opening ")
-                      ACE_TEXT ("/proc/net/dev failed\n")));
-          return;
-        }
-
-      /// Ignore the first 2 lines of the file, which are file
-      /// and column headers.
-      void* dummy = ACE_OS::fgets (buf, sizeof (buf), fp);
-      ACE_UNUSED_ARG (dummy);
-      dummy = ACE_OS::fgets (buf, sizeof (buf), fp);
-      ACE_UNUSED_ARG (dummy);
-
-      unsigned long iface_value = 0UL;
-      ACE_UINT32 iface_index = 0UL;
-      ACE_UINT64 total_value = 0UL;
-
-      while (ACE_OS::fgets (buf, sizeof (buf), fp) != 0)
-        {
-          sscanf (buf, this->scan_format_.c_str (), &iface_value);
-
-          /// If the monitor runs long enough, the system counters will
-          /// wrap around, the statement below is an attempt to correct
-          /// for that.
-          this->value_array_[iface_index] +=
-            iface_value
-            - static_cast<unsigned long> (this->value_array_[iface_index]);
-          total_value += this->value_array_[iface_index];
-
-          ++iface_index;
-        }
-
-      this->value_ = total_value - this->start_;
-      (void) ACE_OS::fclose (fp);
-    }
-
-    void
-    Linux_Network_Interface_Monitor::clear_impl (void)
-    {
-      this->init ();
-    }
-
-    void
-    Linux_Network_Interface_Monitor::init (void)
-    {
-      for (unsigned long i = 0UL; i < MAX_INTERFACES; ++i)
-        {
-          this->value_array_[i] = 0UL;
-        }
-
-      /// Read the file once to get a base value that we can subtract
-      /// from subsequent readings to get bytes sent since we started
-      /// monitoring.
-      char buf[1024];
-      FILE* fp = ACE_OS::fopen (ACE_TEXT ("/proc/net/dev"),
-                                ACE_TEXT ("r"));
-
-      if (fp == 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("bytes sent - opening ")
-                      ACE_TEXT ("/proc/net/dev failed\n")));
-          return;
-        }
-
-      /// Ignore the first 2 lines of the file, which are file
-      /// and column headers.
-      void* dummy = ACE_OS::fgets (buf, sizeof (buf), fp);
-      ACE_UNUSED_ARG (dummy);
-      dummy = ACE_OS::fgets (buf, sizeof (buf), fp);
-      ACE_UNUSED_ARG (dummy);
-
-      unsigned long iface_value = 0UL;
-      ACE_UINT32 iface_index = 0UL;
-
-      while (ACE_OS::fgets (buf, sizeof (buf), fp) != 0)
-        {
-          sscanf (buf, this->scan_format_.c_str (), &iface_value);
-          this->start_ += iface_value;
-
-          ++iface_index;
-        }
-
-      (void) ACE_OS::fclose (fp);
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* defined (ACE_LINUX) || defined (AIX) */
diff --git a/dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h b/dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
deleted file mode 100644
index b2e522600..000000000
--- a/dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Linux_Network_Interface_Monitor.h
- *
- * $Id: Linux_Network_Interface_Monitor.h 95533 2012-02-14 22:59:17Z wotte $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef LINUX_NETWORK_INTERFACE_MONITOR_H
-#define LINUX_NETWORK_INTERFACE_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/SString.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-#if defined (ACE_LINUX) || defined (AIX)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Linux_Network_Interface_Monitor
-     *
-     * @brief Mixin class for network interface monitors compiled on
-     *        Linux machines.
-     */
-    class MONITOR_CONTROL_Export Linux_Network_Interface_Monitor
-    {
-    protected:
-      /// The Linux system file /proc/net/dev stores a wealth of
-      /// network information about the system. To get the specific
-      /// value we want to monitor, we just vary the scan format string.
-      Linux_Network_Interface_Monitor (const char *scan_format);
-
-      /// Platform-specific implementation.
-      void update_i (void);
-
-      /// Platform-specific reset.
-      void clear_impl (void);
-
-    protected:
-      ACE_UINT64 value_;
-
-    private:
-      /// Common code.
-      void init (void);
-
-    private:
-      static const unsigned long MAX_INTERFACES = 10UL;
-      ACE_UINT64 value_array_[MAX_INTERFACES];
-      ACE_UINT64 start_;
-      ACE_CString scan_format_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* defined (ACE_LINUX) || defined (AIX) */
-
-#include /**/ "ace/post.h"
-
-#endif // LINUX_NETWORK_INTERFACE_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp b/dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp
deleted file mode 100644
index cc8a2c769..000000000
--- a/dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// $Id: Memory_Usage_Monitor.cpp 91813 2010-09-17 07:52:52Z johnnyw $
-
-#if defined (ACE_HAS_KSTAT)
-#include <sys/sysinfo.h>
-#endif
-
-#include "ace/Monitor_Control/Memory_Usage_Monitor.h"
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    const char* Memory_Usage_Monitor::default_name_ =
-      "OS/Memory/TotalUsage";
-
-    Memory_Usage_Monitor::Memory_Usage_Monitor (const char* name)
-      : Monitor_Base (name, Monitor_Control_Types::MC_NUMBER)
-#if defined (ACE_HAS_WIN32_PDH)
-      , Windows_Monitor (ACE_TEXT ("\\Memory\\% Committed Bytes In Use"))
-#endif
-    {
-    }
-
-    void
-    Memory_Usage_Monitor::update (void)
-    {
-#if defined (ACE_HAS_WIN32_PDH)
-      this->update_i ();
-      this->receive (this->value_);
-#elif defined (ACE_HAS_LINUX_SYSINFO)
-      if (::sysinfo (&this->sysinfo_) != 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Memory usage - sysinfo() failed\n")));
-          return;
-        }
-
-      double used_ram = this->sysinfo_.totalram - this->sysinfo_.freeram;
-      double percent_mem_usage = used_ram / this->sysinfo_.totalram * 100.0;
-
-      this->receive (percent_mem_usage);
-#elif defined (ACE_HAS_KSTAT)
-      unsigned long page_size = sysconf (_SC_PAGE_SIZE);
-      unsigned long total = sysconf (_SC_PHYS_PAGES) * page_size;
-      unsigned long free = sysconf (_SC_AVPHYS_PAGES) * page_size;
-
-      double used = total - free;
-      double percent_mem_usage = used / total * 100.0;
-
-      this->receive (percent_mem_usage);
-#endif
-    }
-
-    const char*
-    Memory_Usage_Monitor::default_name (void)
-    {
-      return Memory_Usage_Monitor::default_name_;
-    }
-
-    void
-    Memory_Usage_Monitor::clear_i (void)
-    {
-#if defined (ACE_HAS_WIN32_PDH)
-      this->clear_impl ();
-#endif
-
-      this->Monitor_Base::clear_i ();
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h b/dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h
deleted file mode 100644
index 7da7f531f..000000000
--- a/dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Memory_Usage_Monitor.h
- *
- * $Id: Memory_Usage_Monitor.h 91743 2010-09-13 18:24:51Z johnnyw $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef MEMORY_USAGE_MONITOR_H
-#define MEMORY_USAGE_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Monitor_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H)
-#include "ace/Monitor_Control/Windows_Monitor.h"
-#elif defined (ACE_HAS_LINUX_SYSINFO)
-#include "ace/os_include/sys/os_sysinfo.h"
-#endif
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Memory_Usage_Monitor
-     *
-     * @brief Monitor percentage of total available memory used.
-     */
-    class MONITOR_CONTROL_Export Memory_Usage_Monitor
-      : public Monitor_Base
-#if defined (ACE_HAS_WIN32_PDH)
-      , public Windows_Monitor
-#endif
-    {
-    public:
-      Memory_Usage_Monitor (const char* name);
-
-      /// Implementation of the pure virtual method.
-      virtual void update (void);
-
-      /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
-
-    private:
-      /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
-
-    private:
-      static const char* default_name_;
-
-#if defined (ACE_HAS_LINUX_SYSINFO)
-      struct sysinfo sysinfo_;
-#endif
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // MEMORY_USAGE_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/Monitor_Control.h b/dep/acelite/ace/Monitor_Control/Monitor_Control.h
deleted file mode 100644
index 482e0662a..000000000
--- a/dep/acelite/ace/Monitor_Control/Monitor_Control.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Monitor_Control.h
- *
- * $Id: Monitor_Control.h 81753 2008-05-21 19:02:47Z parsons $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef MONITOR_CONTROL_H
-#define MONITOR_CONTROL_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Monitor_Point_Registry.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#include "ace/Monitor_Admin_Manager.h"
-
-#include "ace/Monitor_Control/CPU_Load_Monitor.h"
-#include "ace/Monitor_Control/Memory_Usage_Monitor.h"
-#include "ace/Monitor_Control/Num_Threads_Monitor.h"
-#include "ace/Monitor_Control/Bytes_Sent_Monitor.h"
-#include "ace/Monitor_Control/Packets_Sent_Monitor.h"
-#include "ace/Monitor_Control/Bytes_Received_Monitor.h"
-#include "ace/Monitor_Control/Packets_Received_Monitor.h"
-#include "ace/Monitor_Control/Monitor_Group.h"
-#include "ace/Monitor_Control/Monitor_Query.h"
-#include "ace/Monitor_Control/Monitor_Control_utils.h"
-
-static int
-ACE_Requires_MC_Initializer = MC_ADMINMANAGER::Initializer ();
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // MONITOR_CONTROL_H
diff --git a/dep/acelite/ace/Monitor_Control/Monitor_Control_export.h b/dep/acelite/ace/Monitor_Control/Monitor_Control_export.h
deleted file mode 100644
index 2cae02103..000000000
--- a/dep/acelite/ace/Monitor_Control/Monitor_Control_export.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Monitor_Control_export.h
- *
- *  $Id: Monitor_Control_export.h 81753 2008-05-21 19:02:47Z parsons $
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef MONITOR_CONTROL_EXPORT_H
-#define MONITOR_CONTROL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS)
-# if !defined (MONITOR_CONTROL_HAS_DLL)
-#   define MONITOR_CONTROL_HAS_DLL 0
-# endif /* ! MONITOR_CONTROL_HAS_DLL */
-#else
-# if !defined (MONITOR_CONTROL_HAS_DLL)
-#   define MONITOR_CONTROL_HAS_DLL 1
-# endif /* ! MONITOR_CONTROL_HAS_DLL */
-#endif /* ACE_AS_STATIC_LIB */
-
-#if defined (MONITOR_CONTROL_HAS_DLL) && (MONITOR_CONTROL_HAS_DLL == 1)
-#  if defined (MONITOR_CONTROL_BUILD_DLL)
-#    define MONITOR_CONTROL_Export ACE_Proper_Export_Flag
-#    define MONITOR_CONTROL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define MONITOR_CONTROL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* MONITOR_CONTROL_BUILD_DLL */
-#    define MONITOR_CONTROL_Export ACE_Proper_Import_Flag
-#    define MONITOR_CONTROL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define MONITOR_CONTROL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* MONITOR_CONTROL_BUILD_DLL */
-#else /* MONITOR_CONTROL_HAS_DLL == 1 */
-#  define MONITOR_CONTROL_Export
-#  define MONITOR_CONTROL_SINGLETON_DECLARATION(T)
-#  define MONITOR_CONTROL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* MONITOR_CONTROL_HAS_DLL == 1 */
-
-#endif /* MONITOR_CONTROL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/Monitor_Control/Monitor_Control_utils.h b/dep/acelite/ace/Monitor_Control/Monitor_Control_utils.h
deleted file mode 100644
index d0d21c0f5..000000000
--- a/dep/acelite/ace/Monitor_Control/Monitor_Control_utils.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Monitor_Control_utils.h
- *
- * $Id: Monitor_Control_utils.h 81753 2008-05-21 19:02:47Z parsons $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef MONITOR_CONTROL_UTILS_H
-#define MONITOR_CONTROL_UTILS_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#include "ace/Service_Config.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Reactor.h"
-
-#include "ace/Monitor_Control/Auto_Update_Starter.h"
-
-typedef ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control::CPU_Load_Monitor
-  CPU_LOAD_MONITOR;
-typedef ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control::Memory_Usage_Monitor
-  MEMORY_USAGE_MONITOR;
-typedef ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control::Num_Threads_Monitor
-  NUM_THREADS_MONITOR;
-typedef ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control::Bytes_Sent_Monitor
-  BYTES_SENT_MONITOR;
-typedef ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control::Packets_Sent_Monitor
-  PACKETS_SENT_MONITOR;
-typedef ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control::Bytes_Received_Monitor
-  BYTES_RECEIVED_MONITOR;
-typedef ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control::Packets_Received_Monitor
-  PACKETS_RECEIVED_MONITOR;
-
-using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control;
-
-template<typename OS_MP_TYPE>
-Monitor_Base*
-create_os_monitor (const char* name = 0,
-                   ACE_Time_Value period = ACE_Time_Value::zero)
-{
-  Monitor_Base* retval = 0;
-
-  ACE_VERSIONED_NAMESPACE_NAME::MC_ADMINMANAGER *mgr =
-    ACE_VERSIONED_NAMESPACE_NAME::ACE_Dynamic_Service<
-      ACE_VERSIONED_NAMESPACE_NAME::MC_ADMINMANAGER>::instance (
-        "MC_ADMINMANAGER");
-
-  const char* working_name =
-    (name == 0 ? OS_MP_TYPE::default_name () : name);
-
-  retval = mgr->admin ().monitor_point (working_name);
-
-  if (retval == 0)
-    {
-      ACE_NEW_RETURN (retval, OS_MP_TYPE (working_name), 0);
-      (void) mgr->admin ().monitor_point (retval, period);
-    }
-
-  return retval;
-}
-
-#define START_PERIODIC_MONITORS \
-  ACE_VERSIONED_NAMESPACE_NAME::STARTER starter; \
-  starter.activate ()
-
-#define STOP_PERIODIC_MONITORS \
-  ACE_VERSIONED_NAMESPACE_NAME::ACE_Dynamic_Service< \
-    ACE_VERSIONED_NAMESPACE_NAME::MC_ADMINMANAGER>::instance ( \
-      "MC_ADMINMANAGER")->admin ().reactor ()->end_reactor_event_loop (); \
-  ACE_VERSIONED_NAMESPACE_NAME::ACE_Thread_Manager::instance ()->wait ()
-
-#define ADD_PERIODIC_QUERY(HANDLER,QUERY,INTERVAL_SEC) \
-  ACE_VERSIONED_NAMESPACE_NAME::ACE_Dynamic_Service< \
-    ACE_VERSIONED_NAMESPACE_NAME::MC_ADMINMANAGER>::instance ( \
-      "MC_ADMINMANAGER")->admin ().auto_query (HANDLER, QUERY, INTERVAL_SEC)
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // MONITOR_CONTROL_UTILS_H
diff --git a/dep/acelite/ace/Monitor_Control/Monitor_Group.cpp b/dep/acelite/ace/Monitor_Control/Monitor_Group.cpp
deleted file mode 100644
index 1d6a49765..000000000
--- a/dep/acelite/ace/Monitor_Control/Monitor_Group.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id: Monitor_Group.cpp 93390 2011-02-15 14:44:58Z johnnyw $
-
-#include "ace/Monitor_Control/Monitor_Group.h"
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    Monitor_Group::Monitor_Group (const char* name)
-      : Monitor_Base (name, Monitor_Control_Types::MC_GROUP)
-    {}
-
-    void
-    Monitor_Group::add_member (Monitor_Base* member)
-    {
-      this->members_.enqueue_tail (member);
-    }
-
-    void
-    Monitor_Group::update (void)
-    {
-      for (MEMBERS_ITERATOR i (this->members_); !i.done (); i.advance ())
-        {
-          Monitor_Base **member;
-          i.next (member);
-          (*member)->update ();
-        }
-    }
-
-    void
-    Monitor_Group::receive (double /* data */)
-    {
-      /// No-op, should always call update().
-    }
-
-    void
-    Monitor_Group::receive (size_t /* data */)
-    {
-      /// No-op, should always call update().
-    }
-
-    void
-    Monitor_Group::receive (const Monitor_Control_Types::NameList& /* data */)
-    {
-      /// No-op, should always call update().
-    }
-
-    void
-    Monitor_Group::clear (void)
-    {
-      for (MEMBERS_ITERATOR i (this->members_); !i.done (); i.advance ())
-        {
-          Monitor_Base **member = 0;
-          i.next (member);
-          (*member)->clear ();
-        }
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/dep/acelite/ace/Monitor_Control/Monitor_Group.h b/dep/acelite/ace/Monitor_Control/Monitor_Group.h
deleted file mode 100644
index 99eb7d675..000000000
--- a/dep/acelite/ace/Monitor_Control/Monitor_Group.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Monitor_Group.h
- *
- * $Id: Monitor_Group.h 91743 2010-09-13 18:24:51Z johnnyw $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef MONITOR_GROUP_H
-#define MONITOR_GROUP_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Monitor_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Monitor_Group
-     *
-     * @brief Updates and/or clears a group of monitors with a single call.
-     */
-    class MONITOR_CONTROL_Export Monitor_Group : public Monitor_Base
-    {
-    public:
-      Monitor_Group (const char* name);
-
-      void add_member (Monitor_Base* member);
-
-      virtual void update (void);
-
-      /// These are overridden to be no-ops.
-      virtual void receive (double data);
-      virtual void receive (size_t data);
-      virtual void receive (const Monitor_Control_Types::NameList& data);
-
-      virtual void clear (void);
-
-    private:
-      typedef ACE_Unbounded_Queue<Monitor_Base *>
-        MEMBERS;
-      typedef ACE_Unbounded_Queue_Const_Iterator<Monitor_Base *>
-        MEMBERS_ITERATOR;
-
-      MEMBERS members_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // MONITOR_GROUP_H
diff --git a/dep/acelite/ace/Monitor_Control/Monitor_Query.cpp b/dep/acelite/ace/Monitor_Control/Monitor_Query.cpp
deleted file mode 100644
index f37b3290f..000000000
--- a/dep/acelite/ace/Monitor_Control/Monitor_Query.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// $Id: Monitor_Query.cpp 86518 2009-08-18 12:30:56Z olli $
-
-#include "ace/Monitor_Point_Registry.h"
-#include "ace/Monitor_Base.h"
-#include "ace/Monitor_Control_Action.h"
-
-#include "ace/Monitor_Control/Monitor_Query.h"
-#include "ace/Monitor_Control/Constraint_Interpreter.h"
-#include "ace/Monitor_Control/Constraint_Visitor.h"
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    int
-    Monitor_Point_Auto_Query::handle_timeout (
-      const ACE_Time_Value& /* current */,
-      const void* monitor_query)
-    {
-      const Monitor_Query* const_mq =
-        reinterpret_cast<const Monitor_Query*> (monitor_query);
-
-      Monitor_Query* mq = const_cast<Monitor_Query*> (const_mq);
-
-      mq->query ();
-
-      return 0;
-    }
-
-    //=========================================================
-
-    Monitor_Query::Monitor_Query (const char* monitor_name)
-      : monitor_ (0)
-    {
-      ACE_CString name_str (monitor_name, 0, false);
-      this->monitor_ = Monitor_Point_Registry::instance ()->get (name_str);
-
-      if (this->monitor_ == 0)
-        {
-          ACE_ERROR ((LM_ERROR, "Monitor_Query - monitor lookup failed\n"));
-        }
-    }
-
-    void
-    Monitor_Query::query (void)
-    {
-      if (this->monitor_ == 0)
-        {
-          ACE_ERROR ((LM_ERROR, "Monitor_Query::query - null monitor\n"));
-          return;
-        }
-
-      Monitor_Base::CONSTRAINTS& list = this->monitor_->constraints ();
-
-      for (Monitor_Base::CONSTRAINT_ITERATOR i (list.begin ());
-           i != list.end ();
-           ++i)
-        {
-          Constraint_Interpreter interpreter;
-          interpreter.build_tree (i->second.expr.fast_rep ());
-
-          Monitor_Control_Types::Data data (this->monitor_->type ());
-          this->monitor_->retrieve (data);
-          Constraint_Visitor visitor (data);
-          bool satisfied = interpreter.evaluate (visitor);
-
-          if (satisfied && i->second.control_action != 0)
-            {
-              i->second.control_action->execute ();
-            }
-        }
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/dep/acelite/ace/Monitor_Control/Monitor_Query.h b/dep/acelite/ace/Monitor_Control/Monitor_Query.h
deleted file mode 100644
index 4f841bee3..000000000
--- a/dep/acelite/ace/Monitor_Control/Monitor_Query.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Monitor_Query.h
- *
- * $Id: Monitor_Query.h 81753 2008-05-21 19:02:47Z parsons $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef MONITOR_QUERY_H
-#define MONITOR_QUERY_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Event_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Monitor_Point_Auto_Query
-     *
-     * @brief Automates periodic querying of monitor point classes.
-     *
-     */
-    class MONITOR_CONTROL_Export Monitor_Point_Auto_Query
-      : public ACE_Event_Handler
-    {
-    public:
-      /// Override of ACE base class method.
-      virtual int handle_timeout (const ACE_Time_Value& current,
-                                  const void* monitor_query);
-    };
-
-    /**
-     * @class Monitor_Query
-     *
-     * @brief Handles queries for a specific monitor point, and
-     *        evaluates its constraint(s) with each query.
-     *
-     */
-    class MONITOR_CONTROL_Export Monitor_Query
-    {
-    public:
-      Monitor_Query (const char* monitor_name);
-
-      void query (void);
-
-    private:
-      Monitor_Base* monitor_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // MONITOR_QUERY_H
diff --git a/dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp b/dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
deleted file mode 100644
index 6c9025140..000000000
--- a/dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id: Null_Network_Interface_Monitor.cpp 91813 2010-09-17 07:52:52Z johnnyw $
-
-#include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    Null_Network_Interface_Monitor::Null_Network_Interface_Monitor (void)
-      : value_ (0UL)
-    {
-    }
-
-    void
-    Null_Network_Interface_Monitor::update_i (void)
-    {
-      /// No-op.
-    }
-
-    void
-    Null_Network_Interface_Monitor::clear_impl (void)
-    {
-      /// No-op.
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h b/dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h
deleted file mode 100644
index 9fa241969..000000000
--- a/dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Null_Network_Interface_Monitor.h
- *
- * $Id: Null_Network_Interface_Monitor.h 91743 2010-09-13 18:24:51Z johnnyw $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef NULL_NETWORK_INTERFACE_MONITOR_H
-#define NULL_NETWORK_INTERFACE_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Basic_Types.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Null_Network_Interface_Monitor
-     *
-     * @brief Mixin class for network interface monitors compiled on
-     *        platforms without any native OS monitor support, or on
-              a platform with such support when the platform-specific
-              OS monitor flag is not set.
-     */
-    class MONITOR_CONTROL_Export Null_Network_Interface_Monitor
-    {
-    protected:
-      Null_Network_Interface_Monitor (void);
-
-      /// Platform-specific implementation.
-      void update_i (void);
-
-      /// Platform-specific reset.
-      void clear_impl (void);
-
-    protected:
-      ACE_UINT64 value_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif // NULL_NETWORK_INTERFACE_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp b/dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp
deleted file mode 100644
index 8d21e7e45..000000000
--- a/dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// $Id: Num_Threads_Monitor.cpp 95533 2012-02-14 22:59:17Z wotte $
-
-#include "ace/Monitor_Control/Num_Threads_Monitor.h"
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#if defined (ACE_LINUX)
-#include "ace/OS_NS_stdio.h"
-#endif
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    const char* Num_Threads_Monitor::default_name_ =
-      "OS/System/NumThreads";
-
-    Num_Threads_Monitor::Num_Threads_Monitor (const char* name)
-      : Monitor_Base (name, Monitor_Control_Types::MC_NUMBER)
-#if defined (ACE_HAS_WIN32_PDH)
-      , Windows_Monitor (ACE_TEXT ("\\System\\Threads"))
-#elif defined (ACE_LINUX)
-      , file_ptr_ (0)
-      , nthreads_ (0UL)
-#endif
-    {
-    }
-
-    void
-    Num_Threads_Monitor::update (void)
-    {
-#if defined (ACE_HAS_WIN32_PDH)
-      this->update_i ();
-      this->receive (this->value_);
-#elif defined (ACE_LINUX)
-      this->file_ptr_ = ACE_OS::fopen (ACE_TEXT ("/proc/self/status"),
-                                       ACE_TEXT ("r"));
-
-      if (this->file_ptr_ == 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Num threads - opening ")
-                      ACE_TEXT ("/proc/self/status failed\n")));
-          return;
-        }
-
-      char *item = 0;
-      char *arg = 0;
-
-      while ((ACE_OS::fgets (buf_, sizeof (buf_), file_ptr_)) != 0)
-        {
-          item = ACE_OS::strtok (this->buf_, " \t\n");
-          arg = ACE_OS::strtok (0, "\n");
-
-          if (item == 0 || arg == 0)
-            {
-              continue;
-            }
-
-          if (ACE_OS::strcmp (item, "Threads:") == 0)
-            {
-              sscanf (arg, "%lu", &this->nthreads_);
-              break;
-            }
-        }
-
-      /// Stores value and timestamp with thread-safety.
-      this->receive (static_cast<double> (this->nthreads_));
-
-      ACE_OS::fclose (this->file_ptr_);
-#endif
-    }
-
-    const char*
-    Num_Threads_Monitor::default_name (void)
-    {
-      return Num_Threads_Monitor::default_name_;
-    }
-
-    void
-    Num_Threads_Monitor::clear_i (void)
-    {
-#if defined (ACE_HAS_WIN32_PDH)
-      this->clear_impl ();
-#endif
-
-      this->Monitor_Base::clear_i ();
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.h b/dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.h
deleted file mode 100644
index 094df0b47..000000000
--- a/dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Num_Threads_Monitor.h
- *
- * $Id: Num_Threads_Monitor.h 95533 2012-02-14 22:59:17Z wotte $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef NUM_THREADS_MONITOR_H
-#define NUM_THREADS_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Monitor_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H)
-#include "ace/Monitor_Control/Windows_Monitor.h"
-#elif defined (ACE_HAS_KSTAT)
-/// There is apparently no way to query the number of threads on the
-/// Solaris platform. The only benchmark I've seen had to put hooks
-/// in the thread creation functions to keep track of the highest
-/// thread ID, then check all the IDs less than that to see if the
-/// threads still exist. Since we don't have that option in this
-/// framework, which is to be used by existing applications, this
-/// particular OS monitor is left unimplemented on Solaris.
-#endif
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Num_Threads_Monitor
-     *
-     * @brief Monitor total number of threads in the system.
-     */
-    class MONITOR_CONTROL_Export Num_Threads_Monitor
-      : public Monitor_Base
-#if defined (ACE_HAS_WIN32_PDH)
-      , public Windows_Monitor
-#endif
-    {
-    public:
-      Num_Threads_Monitor (const char* name);
-
-      /// Implementation of the pure virtual method.
-      virtual void update (void);
-
-      /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
-
-    private:
-      /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
-
-    private:
-      static const char* default_name_;
-
-#if defined (ACE_LINUX)
-      FILE *file_ptr_;
-      char buf_[1024];
-      unsigned long nthreads_;
-#endif
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // NUM_THREADS_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp b/dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp
deleted file mode 100644
index 960f32bda..000000000
--- a/dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id: Packets_Received_Monitor.cpp 95533 2012-02-14 22:59:17Z wotte $
-
-#include "ace/Monitor_Control/Packets_Received_Monitor.h"
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    const char* Packets_Received_Monitor::default_name_ =
-      "OS/Network/PacketsReceived";
-
-    Packets_Received_Monitor::Packets_Received_Monitor (const char* name)
-      : Monitor_Base (name, Monitor_Control_Types::MC_NUMBER)
-#if defined (ACE_HAS_WIN32_PDH)
-      , Windows_Multi_Instance_Monitor (
-            ACE_TEXT ("\\Network Interface(*)\\Packets Received/sec"))
-#elif defined (ACE_LINUX) || defined (AIX)
-      , Linux_Network_Interface_Monitor (
-            " %*[^:]: %*u %lu %*u %*u %*u %*u %*u %*u %*u %*u")
-            /// Scan format for /proc/net/dev
-#elif defined (ACE_HAS_KSTAT)
-      , Solaris_Network_Interface_Monitor (ACE_TEXT ("ipackets"))
-#elif defined (__FreeBSD__) || defined (__Lynx__)
-      , FreeBSD_Network_Interface_Monitor (ACE_TEXT ("ipackets"))
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
-      , BSD_Network_Interface_Monitor (ACE_TEXT ("ipackets"))
-#endif
-    {}
-
-    void
-    Packets_Received_Monitor::update (void)
-    {
-      this->update_i ();
-
-      /// On some platforms, value_ is an ACE_UINT64.
-      this->receive (static_cast<double> (this->value_));
-    }
-
-    const char*
-    Packets_Received_Monitor::default_name (void)
-    {
-      return Packets_Received_Monitor::default_name_;
-    }
-
-    void
-    Packets_Received_Monitor::clear_i (void)
-    {
-      this->clear_impl ();
-      this->Monitor_Base::clear_i ();
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.h b/dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.h
deleted file mode 100644
index 64aeef971..000000000
--- a/dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Packets_Received_Monitor.h
- *
- * $Id: Packets_Received_Monitor.h 95533 2012-02-14 22:59:17Z wotte $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef PACKETS_RECEIVED_MONITOR_H
-#define PACKETS_RECEIVED_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Monitor_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H)
-#include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h"
-#elif defined (ACE_LINUX) || defined (AIX)
-#include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h"
-#elif defined (ACE_HAS_KSTAT)
-#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
-#elif defined (__FreeBSD__) || defined (__Lynx__)
-#include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
-#include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
-#else
-#include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"
-#endif
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Packets_Received_Monitor
-     *
-     * @brief Monitors total packets received over all network interfaces.
-     */
-    class MONITOR_CONTROL_Export Packets_Received_Monitor
-      : public Monitor_Base
-#if defined (ACE_HAS_WIN32_PDH)
-      , public Windows_Multi_Instance_Monitor
-#elif defined (ACE_LINUX) || defined (AIX)
-      , public Linux_Network_Interface_Monitor
-#elif defined (ACE_HAS_KSTAT)
-      , public Solaris_Network_Interface_Monitor
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
-      , public BSD_Network_Interface_Monitor
-#elif defined (__FreeBSD__) || defined (__Lynx__)
-      , public FreeBSD_Network_Interface_Monitor
-#else
-      , public Null_Network_Interface_Monitor
-#endif
-    {
-    public:
-      Packets_Received_Monitor (const char* name);
-
-      /// Implementation of the pure virtual method.
-      virtual void update (void);
-
-      /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
-
-    private:
-      /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
-
-    private:
-      static const char* default_name_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // PACKETS_RECEIVED_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp b/dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp
deleted file mode 100644
index 0e6ead400..000000000
--- a/dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id: Packets_Sent_Monitor.cpp 95533 2012-02-14 22:59:17Z wotte $
-
-#include "ace/Monitor_Control/Packets_Sent_Monitor.h"
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    const char* Packets_Sent_Monitor::default_name_ =
-      "OS/Network/PacketsSent";
-
-    Packets_Sent_Monitor::Packets_Sent_Monitor (const char* name)
-      : Monitor_Base (name, Monitor_Control_Types::MC_NUMBER)
-#if defined (ACE_HAS_WIN32_PDH)
-      , Windows_Multi_Instance_Monitor (
-          ACE_TEXT ("\\Network Interface(*)\\Packets Sent/sec"))
-#elif defined (ACE_LINUX) || defined (AIX)
-      , Linux_Network_Interface_Monitor (
-            " %*[^:]: %*u %*u %*u %*u %*u %*u %*u %*u %*u %lu")
-            /// Scan format for /proc/net/dev
-#elif defined (ACE_HAS_KSTAT)
-      , Solaris_Network_Interface_Monitor (ACE_TEXT ("opackets"))
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
-      , BSD_Network_Interface_Monitor (ACE_TEXT ("opackets"))
-#elif defined (__FreeBSD__) || defined (__Lynx__)
-      , FreeBSD_Network_Interface_Monitor (ACE_TEXT ("opackets"))
-#endif
-    {}
-
-    void
-    Packets_Sent_Monitor::update (void)
-    {
-      this->update_i ();
-
-      /// On some platforms, value_ is an ACE_UINT64.
-      this->receive (static_cast<double> (this->value_));
-    }
-
-    const char*
-    Packets_Sent_Monitor::default_name (void)
-    {
-      return Packets_Sent_Monitor::default_name_;
-    }
-
-    void
-    Packets_Sent_Monitor::clear_i (void)
-    {
-      this->clear_impl ();
-      this->Monitor_Base::clear_i ();
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
diff --git a/dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h b/dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h
deleted file mode 100644
index bccea8f89..000000000
--- a/dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Packets_Sent_Monitor.h
- *
- * $Id: Packets_Sent_Monitor.h 95533 2012-02-14 22:59:17Z wotte $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef PACKETS_SENT_MONITOR_H
-#define PACKETS_SENT_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Monitor_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
-
-#if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H)
-#include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h"
-#elif defined (ACE_LINUX) || defined (AIX)
-#include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h"
-#elif defined (ACE_HAS_KSTAT)
-#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
-#elif defined (__FreeBSD__) || defined (__Lynx__)
-#include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
-#include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
-#else
-#include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"
-#endif
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Packets_Sent_Monitor
-     *
-     * @brief Monitors total packets sent over all network interfaces.
-     */
-    class MONITOR_CONTROL_Export Packets_Sent_Monitor
-      : public Monitor_Base
-#if defined (ACE_HAS_WIN32_PDH)
-      , public Windows_Multi_Instance_Monitor
-#elif defined (ACE_LINUX) || defined (AIX)
-      , public Linux_Network_Interface_Monitor
-#elif defined (ACE_HAS_KSTAT)
-      , public Solaris_Network_Interface_Monitor
-#elif defined (__NetBSD__) || defined (__OpenBSD__)
-      , public BSD_Network_Interface_Monitor
-#elif defined (__FreeBSD__) || defined (__Lynx__)
-      , public FreeBSD_Network_Interface_Monitor
-#else
-      , public Null_Network_Interface_Monitor
-#endif
-    {
-    public:
-      Packets_Sent_Monitor (const char* name);
-
-      /// Implementation of the pure virtual method.
-      virtual void update (void);
-
-      /// Stores the default name, used if none is supplied by the user.
-      static const char* default_name (void);
-
-    private:
-      /// Overridden reset, calls platform-specific reset.
-      virtual void clear_i (void);
-
-    private:
-      static const char* default_name_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
-#include /**/ "ace/post.h"
-
-#endif // PACKETS_SENT_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp b/dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
deleted file mode 100644
index 63ec6b747..000000000
--- a/dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-// $Id: Solaris_Network_Interface_Monitor.cpp 91813 2010-09-17 07:52:52Z johnnyw $
-
-#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
-
-#if defined (ACE_HAS_KSTAT)
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_stdio.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    Solaris_Network_Interface_Monitor::Solaris_Network_Interface_Monitor (
-      const ACE_TCHAR *lookup_str)
-      : value_ (0UL),
-        start_ (0UL),
-        lookup_str_ (lookup_str)
-    {
-      this->init ();
-    }
-
-    void
-    Solaris_Network_Interface_Monitor::update_i (void)
-    {
-      this->access_kstats (this->value_);
-      this->value_ -= this->start_;
-    }
-
-    void
-    Solaris_Network_Interface_Monitor::clear_impl (void)
-    {
-      this->init ();
-    }
-
-    void
-    Solaris_Network_Interface_Monitor::init (void)
-    {
-      unsigned long i;
-
-      for (i = 0UL; i < MAX_LO_INTERFACES; ++i)
-        {
-          this->value_array_lo_[i] = 0UL;
-        }
-
-      for (i = 0UL; i < MAX_HME_INTERFACES; ++i)
-        {
-          this->value_array_hme_[i] = 0UL;
-        }
-
-      this->access_kstats (this->start_);
-    }
-
-    void
-    Solaris_Network_Interface_Monitor::access_kstats (
-      ACE_UINT64 &which_member)
-    {
-      this->kstats_ = kstat_open ();
-
-      if (this->kstats_ == 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("opening kstats file failed\n")));
-          return;
-        }
-
-      this->kstat_id_ = this->kstats_->kc_chain_id;
-      int status = 0;
-
-      while (true)
-        {
-          /// We have to sum the network interfaces manually.
-          for (this->kstat_ = this->kstats_->kc_chain;
-               this->kstat_ != 0;
-               this->kstat_ = this->kstat_->ks_next)
-            {
-              if (ACE_OS::strcmp (this->kstat_->ks_class, "net") != 0)
-                {
-                  continue;
-                }
-
-              unsigned long ks_instance = this->kstat_->ks_instance;
-
-              if (ACE_OS::strcmp (this->kstat_->ks_module, "lo") == 0)
-                {
-                  /// Interfaces 'lo' have only packet counters.
-                  if (this->lookup_str_ == ACE_TEXT ("obytes")
-                      || this->lookup_str_ == ACE_TEXT ("rbytes"))
-                    {
-                      continue;
-                    }
-
-                  status = this->check_ks_module (ks_instance,
-                                                  MAX_LO_INTERFACES,
-                                                  "MAX_LO_INTERFACES",
-                                                  this->value_array_lo_,
-                                                  which_member);
-
-                  if (status == -1)
-                    {
-                      /// Unrecoverable error, diagnostic already output.
-                      (void) kstat_close (this->kstats_);
-                      return;
-                    }
-                  else if (status == 1)
-                    {
-                      /// The kstat_id changed underneath us, start over.
-                      break;
-                    }
-                }
-              else if (ACE_OS::strcmp (this->kstat_->ks_module, "hme") == 0
-                       || ACE_OS::strcmp (this->kstat_->ks_module, "bge") == 0)
-                {
-                  status = this->check_ks_module (ks_instance,
-                                                  MAX_HME_INTERFACES,
-                                                  "MAX_HME_INTERFACES",
-                                                  this->value_array_hme_,
-                                                  which_member);
-
-                  if (status == -1)
-                    {
-                      /// Unrecoverable error, diagnostic already output.
-                      (void) kstat_close (this->kstats_);
-                      return;
-                    }
-                  else if (status == 1)
-                    {
-                      /// The kstat_id changed underneath us, start over.
-                      break;
-                    }
-                }
-            }
-
-          if (this->kstat_)
-            {
-              this->kstat_id_ = kstat_chain_update (this->kstats_);
-
-              if (! this->kstat_id_ > 0)
-                {
-                  ACE_ERROR ((LM_ERROR, "kstat is is not > 0.\n"));
-                  break;
-                }
-            }
-          else
-            {
-              break;
-            }
-        }
-
-      status = kstat_close (this->kstats_);
-
-      if (status != 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("closing kstats file failed\n")));
-        }
-    }
-
-    int
-    Solaris_Network_Interface_Monitor::check_ks_module (
-      const unsigned long ks_instance,
-      const unsigned long which_max,
-      const char *max_str,
-      ACE_UINT64 *value_array,
-      ACE_UINT64 &which_member)
-    {
-      if (! (ks_instance < which_max))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "%s exceeded.\n",
-                             max_str),
-                            -1);
-        }
-
-      /// Because the kstat chain can change dynamically,
-      /// watch the chain ID and restart the walk if the ID
-      /// differs from what we saw during the walk. The restart
-      /// is done by breaking from the cycle with kstat_ not 0.
-
-      kid_t kstat_id =
-        kstat_read (this->kstats_, this->kstat_, 0);
-
-      if (kstat_id != this->kstat_id_)
-        {
-          /// This return value restarts the walk as described above.
-          return 1;
-        }
-
-      kstat_named_t *value =
-        (kstat_named_t *) kstat_data_lookup (
-          this->kstat_,
-          ACE_TEXT_ALWAYS_CHAR (this->lookup_str_.rep ()));
-
-      if (value == 0)
-        {
-          /// Just return and let the calling FOR loop advance.
-          return 0;
-        }
-
-      if (value->data_type != KSTAT_DATA_UINT32)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Wrong data type.\n"),
-                            -1);
-        }
-
-      /// Guard against overflow.
-      value_array[ks_instance] +=
-        value->value.ui32
-        - static_cast<ACE_UINT32> (value_array[ks_instance]);
-
-      which_member += value_array[ks_instance];
-
-      return 0;
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* defined (ACE_HAS_KSTAT) */
diff --git a/dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h b/dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
deleted file mode 100644
index 98ce5a67d..000000000
--- a/dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Solaris_Network_Interface_Monitor.h
- *
- * $Id: Solaris_Network_Interface_Monitor.h 91743 2010-09-13 18:24:51Z johnnyw $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef SOLARIS_NETWORK_INTERFACE_MONITOR_H
-#define SOLARIS_NETWORK_INTERFACE_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/SString.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-#if defined (ACE_HAS_KSTAT)
-
-#include "ace/os_include/os_kstat.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Solaris_Network_Interface_Monitor
-     *
-     * @brief Mixin class for network interface monitors compiled on
-     *        Solaris machines.
-     */
-    class MONITOR_CONTROL_Export Solaris_Network_Interface_Monitor
-    {
-    protected:
-      /// The kstat interface can access a wealth of
-      /// network information about the system. To get the specific
-      /// value we want to monitor, we just vary the lookup string.
-      Solaris_Network_Interface_Monitor (const ACE_TCHAR *lookup_str);
-
-      /// Platform-specific implementation.
-      void update_i (void);
-
-      /// Platform-specific reset.
-      void clear_impl (void);
-
-    protected:
-      ACE_UINT64 value_;
-
-    private:
-      /// Common code.
-
-      void init (void);
-      void access_kstats (ACE_UINT64 &which_member);
-      int check_ks_module (const unsigned long ks_instance,
-                           const unsigned long which_max,
-                           const char *max_str,
-                           ACE_UINT64 *value_array,
-                           ACE_UINT64 &which_member);
-
-
-    private:
-      static const unsigned long MAX_LO_INTERFACES = 5UL;
-      static const unsigned long MAX_HME_INTERFACES = 10UL;
-      ACE_UINT64 value_array_lo_[MAX_LO_INTERFACES];
-      ACE_UINT64 value_array_hme_[MAX_HME_INTERFACES];
-      ACE_UINT64 start_;
-      ACE_TString lookup_str_;
-      kstat_ctl_t *kstats_;
-      kstat_t *kstat_;
-      kid_t kstat_id_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* defined (ACE_HAS_KSTAT) */
-
-#include /**/ "ace/post.h"
-
-#endif // SOLARIS_NETWORK_INTERFACE_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/Windows_Monitor.cpp b/dep/acelite/ace/Monitor_Control/Windows_Monitor.cpp
deleted file mode 100644
index a3883ece6..000000000
--- a/dep/acelite/ace/Monitor_Control/Windows_Monitor.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id: Windows_Monitor.cpp 91813 2010-09-17 07:52:52Z johnnyw $
-
-#include "ace/Monitor_Control/Windows_Monitor.h"
-
-#if defined (ACE_HAS_WIN32_PDH)
-
-#include "ace/Log_Msg.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    Windows_Monitor::Windows_Monitor (const ACE_TCHAR *path)
-      : value_ (0.0)
-      , path_ (path)
-      , query_ (0)
-      , counter_ (0)
-      , status_ (ERROR_SUCCESS)
-    {
-      this->init ();
-    }
-
-    void
-    Windows_Monitor::update_i (void)
-    {
-      PdhCollectQueryData (this->query_);
-      PDH_FMT_COUNTERVALUE pdh_value;
-
-      PdhGetFormattedCounterValue (this->counter_,
-                                   PDH_FMT_DOUBLE,
-                                   0,
-                                   &pdh_value);
-
-      this->value_ = pdh_value.doubleValue;
-    }
-
-    void
-    Windows_Monitor::clear_impl (void)
-    {
-      this->init ();
-    }
-
-    void
-    Windows_Monitor::init (void)
-    {
-      /// Create a query and a counter here so it doesn't have
-      /// to be done with each update.
-
-      this->status_ = ACE_TEXT_PdhOpenQuery (0, 0, &this->query_);
-
-      if (ERROR_SUCCESS != this->status_)
-        {
-          ACE_ERROR ((LM_DEBUG, ACE_TEXT ("PdhOpenQuery failed\n")));
-        }
-
-      this->status_ =
-        ACE_TEXT_PdhAddCounter (this->query_,
-                                this->path_.c_str (),
-                                0,
-                                &this->counter_);
-
-      if (ERROR_SUCCESS != this->status_)
-        {
-          ACE_ERROR ((LM_DEBUG,
-                      ACE_TEXT ("PdhAddCounter %s failed\n"),
-                      this->path_.c_str ()));
-        }
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* defined (ACE_HAS_WIN32_PDH) */
diff --git a/dep/acelite/ace/Monitor_Control/Windows_Monitor.h b/dep/acelite/ace/Monitor_Control/Windows_Monitor.h
deleted file mode 100644
index cd39d81fe..000000000
--- a/dep/acelite/ace/Monitor_Control/Windows_Monitor.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Windows_Monitor.h
- *
- * $Id: Windows_Monitor.h 91743 2010-09-13 18:24:51Z johnnyw $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef WINDOWS_MONITOR_H
-#define WINDOWS_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/SString.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/os_include/os_pdh.h"
-
-#include "ace/Monitor_Control/Monitor_Control_export.h"
-
-#if defined (ACE_HAS_WIN32_PDH)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Windows_Monitor
-     *
-     * @brief Mixin class for concrete monitors compiled on Windows machines.
-     */
-    class MONITOR_CONTROL_Export Windows_Monitor
-    {
-      friend class Windows_Multi_Instance_Monitor;
-
-    protected:
-      Windows_Monitor (const ACE_TCHAR *path);
-
-      /// Platform-specific implementation.
-      void update_i (void);
-
-      /// Platform-specific reset.
-      void clear_impl (void);
-
-    protected:
-      double value_;
-
-    private:
-      /// Code common to constructor and clear_impl().
-      void init (void);
-
-    /// Make these persistent as members so they don't have to be
-    /// created & destroyed with each update.
-    private:
-      ACE_TString path_;
-      HQUERY query_;
-      HCOUNTER counter_;
-      PDH_STATUS status_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* defined (ACE_HAS_WIN32_PDH) */
-
-#endif // WINDOWS_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp b/dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
deleted file mode 100644
index c54926409..000000000
--- a/dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-// $Id: Windows_Multi_Instance_Monitor.cpp 91813 2010-09-17 07:52:52Z johnnyw $
-
-#include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h"
-
-#if defined (ACE_HAS_WIN32_PDH)
-
-#include "ace/Log_Msg.h"
-#include "ace/SString.h"
-#include "ace/os_include/os_pdhmsg.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    Windows_Multi_Instance_Monitor::Windows_Multi_Instance_Monitor (
-      const ACE_TCHAR *wildcard_path)
-      : value_ (0.0)
-      , instances_ (0)
-      , n_instances_ (0)
-      , status_ (ERROR_SUCCESS)
-    {
-      /// Create a string which is a concatentation of the path
-      /// name of each 'instance' we need to monitor.
-
-      DWORD paths_size = 4096;
-      ACE_LPSTR paths = (ACE_LPSTR) GlobalAlloc (GPTR, paths_size);
-
-      this->status_ = ACE_TEXT_PdhExpandCounterPath (wildcard_path,
-                                                     paths,
-                                                     &paths_size);
-
-      if (PDH_MORE_DATA == static_cast<DWORD> (this->status_))
-        {
-          ++paths_size;
-          GlobalFree (paths);
-          paths = (ACE_LPSTR) GlobalAlloc (GPTR, paths_size);
-
-          this->status_ = ACE_TEXT_PdhExpandCounterPath (wildcard_path,
-                                                         paths,
-                                                         &paths_size);
-        }
-
-      if (PDH_CSTATUS_VALID_DATA != static_cast<DWORD> (this->status_))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("%s: PdhExpandCounterPath failed\n"),
-                      wildcard_path));
-        }
-
-      ACE_LPSTR path = paths;
-
-      /// Create a regular Windows monitor for each path name.
-      while (*path != 0)
-        {
-          Windows_Monitor *instance = new Windows_Monitor (path);
-          this->instances_.enqueue_tail (instance);
-          path += ACE_OS::strlen (path) + 1;
-        }
-
-      GlobalFree (paths);
-    }
-
-    Windows_Multi_Instance_Monitor::~Windows_Multi_Instance_Monitor (void)
-    {
-      Windows_Monitor *instance = 0;
-
-      /// Destroy the single instance monitors created in the constructor.
-      while (this->instances_.dequeue_head (instance) == 0)
-        {
-          delete instance;
-        }
-    }
-
-    void
-    Windows_Multi_Instance_Monitor::update_i (void)
-    {
-      Windows_Monitor **current_instance = 0;
-
-      /// Sum the values of each single instance monitor.
-      for (INSTANCES_ITERATOR i (this->instances_); !i.done (); i.advance ())
-        {
-          i.next (current_instance);
-
-          (*current_instance)->update_i ();
-
-          this->value_ += (*current_instance)->value_;
-        }
-    }
-
-    void
-    Windows_Multi_Instance_Monitor::clear_impl (void)
-    {
-      Windows_Monitor **current_instance = 0;
-
-      /// Sum the values of each single instance monitor.
-      for (INSTANCES_ITERATOR i (this->instances_); !i.done (); i.advance ())
-        {
-          i.next (current_instance);
-
-          (*current_instance)->clear_impl ();
-        }
-    }
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* defined (ACE_HAS_WIN32_PDH) */
diff --git a/dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h b/dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h
deleted file mode 100644
index ec4e17a4a..000000000
--- a/dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Windows_Multi_Instance_Monitor.h
- *
- * $Id: Windows_Multi_Instance_Monitor.h 82115 2008-06-20 20:43:13Z parsons $
- *
- * @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef WINDOWS_MULTI_INSTANCE_MONITOR_H
-#define WINDOWS_MULTI_INSTANCE_MONITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Unbounded_Queue.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Monitor_Control/Windows_Monitor.h"
-
-#if defined (ACE_HAS_WIN32_PDH)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace ACE
-{
-  namespace Monitor_Control
-  {
-    /**
-     * @class Windows_Multi_Instance_Monitor
-     *
-     * @brief Mixin class for concrete monitors compiled on Windows machines
-     *        where the Performance Data Helper object of interest has more
-     *        than once instance, for example multiple CPUs or network cards.
-     */
-    class MONITOR_CONTROL_Export Windows_Multi_Instance_Monitor
-    {
-    protected:
-      Windows_Multi_Instance_Monitor (const ACE_TCHAR *wildcard_path);
-      virtual ~Windows_Multi_Instance_Monitor (void);
-
-      /// Platform-specific implementation.
-      void update_i (void);
-
-      /// Platform-specific reset.
-      void clear_impl (void);
-
-    protected:
-      double value_;
-
-    private:
-      typedef ACE_Unbounded_Queue<Windows_Monitor *>
-        INSTANCES;
-      typedef ACE_Unbounded_Queue_Const_Iterator<Windows_Monitor *>
-        INSTANCES_ITERATOR;
-
-      INSTANCES instances_;
-      DWORD n_instances_;
-      PDH_STATUS status_;
-    };
-  }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* defined (ACE_HAS_WIN32_PDH) */
-
-#endif // WINDOWS_MULTI_INSTANCE_MONITOR_H
diff --git a/dep/acelite/ace/Monitor_Point_Registry.cpp b/dep/acelite/ace/Monitor_Point_Registry.cpp
index 81764432a..3f33e834b 100644
--- a/dep/acelite/ace/Monitor_Point_Registry.cpp
+++ b/dep/acelite/ace/Monitor_Point_Registry.cpp
@@ -1,4 +1,4 @@
-// $Id: Monitor_Point_Registry.cpp 91813 2010-09-17 07:52:52Z johnnyw $
+// $Id: Monitor_Point_Registry.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Monitor_Point_Registry.h"
 
@@ -29,7 +29,7 @@ namespace ACE
     {
       if (type == 0)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              "registry add: null type\n"),
                             false);
         }
@@ -44,12 +44,12 @@ namespace ACE
         status = this->map_.bind (type->name (), type);
 
         /// Temporary debugging code.
-//        ACE_DEBUG ((LM_DEBUG, "adding %s\n", type->name ()));
+//        ACELIB_DEBUG ((LM_DEBUG, "adding %s\n", type->name ()));
       }
 
       if (status == -1)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              "registry add: map bind failed\n"),
                             false);
         }
@@ -62,7 +62,7 @@ namespace ACE
     {
       if (name == 0)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              "registry remove: null name\n"),
                             false);
         }
@@ -77,7 +77,7 @@ namespace ACE
         status = this->map_.unbind (name_str, mp);
 
         /// Temporary debugging code.
-//        ACE_DEBUG ((LM_DEBUG, "removing %s\n", name_str.c_str ()));
+//        ACELIB_DEBUG ((LM_DEBUG, "removing %s\n", name_str.c_str ()));
       }
 
       if (status == -1)
@@ -88,7 +88,7 @@ namespace ACE
 //      is using malloc with placement, then free, which may bypass the
 //      normal destructors. In any case, it happens only at shutdown
 //      and there seems to be no memory leak.
-//          ACE_ERROR_RETURN ((LM_ERROR,
+//          ACELIB_ERROR_RETURN ((LM_ERROR,
 //                             "registry remove: unbind failed for %s\n",
 //                             name),
 //                            false);
diff --git a/dep/acelite/ace/Multihomed_INET_Addr.cpp b/dep/acelite/ace/Multihomed_INET_Addr.cpp
index b8b769652..629351d37 100644
--- a/dep/acelite/ace/Multihomed_INET_Addr.cpp
+++ b/dep/acelite/ace/Multihomed_INET_Addr.cpp
@@ -1,9 +1,9 @@
-// $Id: Multihomed_INET_Addr.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: Multihomed_INET_Addr.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 // Extends ACE_INET_Addr with support for multi-homed addresses.
 
 #include "ace/Multihomed_INET_Addr.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #  include "ace/Multihomed_INET_Addr.inl"
@@ -49,7 +49,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
                                                        encode,
                                                        address_family);
       if (ret) {
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("Invalid INET addr (%C:%u) will be ignored\n"),
                     secondary_host_names[i], port_number));
         this->secondaries_.size(this->secondaries_.size() - 1);
@@ -85,7 +85,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
                                                        encode,
                                                        address_family);
       if (ret) {
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"),
                     ACE_TEXT_WCHAR_TO_TCHAR (secondary_host_names[i]), port_number));
         this->secondaries_.size(this->secondaries_.size() - 1);
@@ -120,7 +120,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
                                                               encode);
 
       if (ret) {
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     "Invalid INET addr (%u:%u) will be ignored\n",
                     secondary_ip_addrs[i], port_number));
         this->secondaries_.size(this->secondaries_.size() - 1);
diff --git a/dep/acelite/ace/Mutex.cpp b/dep/acelite/ace/Mutex.cpp
index 5106f0272..14d2661ef 100644
--- a/dep/acelite/ace/Mutex.cpp
+++ b/dep/acelite/ace/Mutex.cpp
@@ -1,4 +1,4 @@
-// $Id: Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Mutex.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Mutex.h"
 
@@ -6,7 +6,7 @@
 #include "ace/Mutex.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/sys/os_mman.h"
 
@@ -20,13 +20,13 @@ ACE_Mutex::dump (void) const
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Mutex::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 #if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS)
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lockname_ = %s\n"), this->lockname_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("process_lock_ = %x\n"), this->process_lock_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("lockname_ = %s\n"), this->lockname_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("process_lock_ = %x\n"), this->process_lock_));
 #endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -88,7 +88,7 @@ ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name,
                                  name,
                                  arg) != 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("ACE_Mutex::ACE_Mutex")));
           return;
@@ -105,7 +105,7 @@ ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name,
                               type,
                               name,
                               arg) != 0)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("%p\n"),
                     ACE_TEXT ("ACE_Mutex::ACE_Mutex")));
 #if defined(ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS)
diff --git a/dep/acelite/ace/NT_Service.cpp b/dep/acelite/ace/NT_Service.cpp
index 6323bb1e2..e70550b40 100644
--- a/dep/acelite/ace/NT_Service.cpp
+++ b/dep/acelite/ace/NT_Service.cpp
@@ -1,4 +1,4 @@
-// $Id: NT_Service.cpp 81862 2008-06-09 10:41:41Z sma $
+// $Id: NT_Service.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/config-all.h"
 #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
@@ -9,7 +9,7 @@
 #include "ace/NT_Service.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Service_Object.h"
 #include "ace/OS_NS_errno.h"
 
diff --git a/dep/acelite/ace/Name_Proxy.cpp b/dep/acelite/ace/Name_Proxy.cpp
index b96bb0219..b2f459829 100644
--- a/dep/acelite/ace/Name_Proxy.cpp
+++ b/dep/acelite/ace/Name_Proxy.cpp
@@ -1,7 +1,7 @@
-// $Id: Name_Proxy.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Name_Proxy.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Name_Proxy.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/os_include/arpa/os_inet.h"
 
 
@@ -14,11 +14,11 @@ ACE_Name_Proxy::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Name_Proxy::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->connector_.dump ();
   this->peer_.dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("reactor_ = %x"), this->reactor_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("reactor_ = %x"), this->reactor_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -58,7 +58,7 @@ ACE_Name_Proxy::ACE_Name_Proxy (
   ACE_TRACE ("ACE_Name_Proxy::ACE_Name_Proxy");
   if (this->open (remote_addr, options) == -1
       && options[ACE_Synch_Options::USE_TIMEOUT] && errno != EWOULDBLOCK)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Name_Proxy::ACE_Name_Proxy")));
 }
@@ -80,7 +80,7 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request)
   ssize_t length = request.encode (buffer);
 
   if (length == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("encode failed")),
                       -1);
@@ -88,7 +88,7 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request)
   // Transmit request via a blocking send.
 
   if (this->peer_.send_n (buffer, length) != length)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("send_n failed")),
                       -1);
@@ -100,12 +100,12 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request)
 
       if (this->peer_.recv_n (&reply,
                               sizeof reply) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
                            ACE_TEXT ("recv failed")),
                           -1);
       else if (reply.decode () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
                            ACE_TEXT ("decode failed")),
                           -1);
@@ -122,7 +122,7 @@ ACE_Name_Proxy::send_request (ACE_Name_Request &request)
   ssize_t length = request.encode (buffer);
 
   if (length == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("encode failed")),
                       -1);
@@ -130,7 +130,7 @@ ACE_Name_Proxy::send_request (ACE_Name_Request &request)
   // Transmit request via a blocking send.
 
   else if (this->peer_.send_n (buffer, length) != length)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("send_n failed")),
                       -1);
@@ -150,10 +150,10 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply)
     {
     case -1:
       // FALLTHROUGH
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("****************** recv_reply returned -1\n")));
     default:
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p got %d bytes, expected %d bytes\n"),
                   ACE_TEXT ("recv failed"),
                   n,
@@ -177,7 +177,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply)
         // Subtract off the size of the part we skipped over...
         if (n != ssize_t (length - sizeof (ACE_UINT32)))
           {
-            ACE_ERROR ((LM_ERROR,
+            ACELIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("%p expected %d, got %d\n"),
                         ACE_TEXT ("invalid length"),
                         length,
@@ -188,7 +188,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply)
         // Decode the request into host byte order.
         if (reply.decode () == -1)
           {
-            ACE_ERROR ((LM_ERROR,
+            ACELIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("%p\n"),
                         ACE_TEXT ("decode failed")));
             return -1;
diff --git a/dep/acelite/ace/Name_Request_Reply.cpp b/dep/acelite/ace/Name_Request_Reply.cpp
index 40ef90ccb..e67604093 100644
--- a/dep/acelite/ace/Name_Request_Reply.cpp
+++ b/dep/acelite/ace/Name_Request_Reply.cpp
@@ -1,9 +1,9 @@
-// $Id: Name_Request_Reply.cpp 96017 2012-08-08 22:18:09Z mitza $
+// $Id: Name_Request_Reply.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Name_Request_Reply.h"
 #include "ace/Basic_Types.h"
 #include "ace/CDR_Base.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Time_Value.h"
 #include "ace/Truncate.h"
 #include "ace/OS_NS_string.h"
@@ -333,82 +333,82 @@ ACE_Name_Request::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Name_Request::dump");
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("*******\nlength = %d\n"),
               this->length ()));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("message-type = ")));
 
   switch (this->msg_type ())
     {
     case ACE_Name_Request::BIND:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("BIND\n")));
       break;
     case ACE_Name_Request::REBIND:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("REBIND\n")));
       break;
     case ACE_Name_Request::RESOLVE:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("RESOLVE\n")));
       break;
     case ACE_Name_Request::UNBIND:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("UNBIND\n")));
       break;
     case ACE_Name_Request::LIST_NAMES:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("LIST_NAMES\n")));
       break;
     case ACE_Name_Request::LIST_VALUES:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("LIST_VALUES\n")));
       break;
     case ACE_Name_Request::LIST_TYPES:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("LIST_TYPES\n")));
       break;
     case ACE_Name_Request::LIST_NAME_ENTRIES:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("LIST_NAME_ENTRIES\n")));
       break;
     case ACE_Name_Request::LIST_VALUE_ENTRIES:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("LIST_VALUE_ENTRIES\n")));
       break;
     case ACE_Name_Request::LIST_TYPE_ENTRIES:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("LIST_TYPE_ENTRIES\n")));
       break;
     default:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("<unknown type> = %d\n"),
                   this->msg_type ()));
       break;
     }
 
   if (this->block_forever ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("blocking forever\n")));
   else
     {
 #if !defined (ACE_NLOGGING)
       ACE_Time_Value tv = this->timeout ();
 #endif /* ! ACE_NLOGGING */
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("waiting for %d secs and %d usecs\n"),
                   tv.sec (),
                   tv.usec ()));
     }
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("*******\nname_len = %d\n"),
               this->name_len ()));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("*******\nvalue_len = %d\n"),
               this->value_len ()));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("+++++++\n")));
 #endif /* ACE_HAS_DUMP */
 }
@@ -548,24 +548,24 @@ ACE_Name_Reply::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Name_Reply::dump");
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("*******\nlength = %d\nerrnum = %d"),
               this->length (),
               this->errnum ()));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("type = ")));
   switch (this->msg_type ())
     {
     case 0:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("SUCCESS\n")));
       break;
     case -1:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("FAILURE\n")));
       break;
     default:
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("<unknown type> = %d\n"),
                   this->msg_type ()));
       break;
diff --git a/dep/acelite/ace/Naming_Context.cpp b/dep/acelite/ace/Naming_Context.cpp
index bca3b9b87..fdc88a66e 100644
--- a/dep/acelite/ace/Naming_Context.cpp
+++ b/dep/acelite/ace/Naming_Context.cpp
@@ -1,4 +1,4 @@
-// $Id: Naming_Context.cpp 93539 2011-03-13 09:40:44Z vzykov $
+// $Id: Naming_Context.cpp 97308 2013-09-01 00:58:08Z mesnier_p $
 
 #include "ace/Get_Opt.h"
 #include "ace/Naming_Context.h"
@@ -6,6 +6,7 @@
 #include "ace/Local_Name_Space_T.h"
 #include "ace/Registry_Name_Space.h"
 #include "ace/MMAP_Memory_Pool.h"
+#include "ace/Lib_Find.h"
 #include "ace/RW_Process_Mutex.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
@@ -110,7 +111,7 @@ ACE_Naming_Context::open (Context_Scope_Type scope_in, int lite)
     }
 
   if (ACE_LOG_MSG->op_status () != 0 || this->name_space_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("NAME_SPACE::NAME_SPACE\n")),
                       -1);
   return 0;
@@ -140,7 +141,8 @@ ACE_Naming_Context::close (void)
 
 ACE_Naming_Context::ACE_Naming_Context (void)
   : name_options_ (0),
-    name_space_ (0)
+    name_space_ (0),
+    netnameserver_host_ (0)
 {
   ACE_TRACE ("ACE_Naming_Context::ACE_Naming_Context");
 
@@ -161,7 +163,7 @@ ACE_Naming_Context::ACE_Naming_Context (Context_Scope_Type scope_in,
 
   // Initialize.
   if (this->open (scope_in, lite) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Naming_Context::ACE_Naming_Context")));
 }
@@ -398,7 +400,7 @@ int
 ACE_Naming_Context::init (int argc, ACE_TCHAR *argv[])
 {
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE_Naming_Context::init\n")));
   this->name_options_->parse_args (argc, argv);
   return this->open (this->name_options_->context ());
@@ -408,7 +410,7 @@ int
 ACE_Naming_Context::fini (void)
 {
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE_Naming_Context::fini\n")));
   this->close_down ();
   return 0;
@@ -434,7 +436,7 @@ ACE_Name_Options::ACE_Name_Options (void)
 
   if (ACE::get_temp_dir (this->namespace_dir_, MAXPATHLEN) == -1)
     {
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("Temporary path too long, ")
                   ACE_TEXT ("defaulting to current directory\n")));
       ACE_OS::strcpy (this->namespace_dir_, ACE_TEXT ("."));
diff --git a/dep/acelite/ace/Naming_Context.h b/dep/acelite/ace/Naming_Context.h
index 15a20a6bf..861f771bc 100644
--- a/dep/acelite/ace/Naming_Context.h
+++ b/dep/acelite/ace/Naming_Context.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Naming_Context.h
  *
- *  $Id: Naming_Context.h 93359 2011-02-11 11:33:12Z mcorino $
+ *  $Id: Naming_Context.h 96261 2012-11-12 19:27:25Z johnnyw $
  *
  *  @author Gerhard Lenzer
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
@@ -269,7 +269,6 @@ private:
 
   /// 1 if we're on the same local machine as the name server, else 0.
   int local (void);
-
 };
 
 /**
diff --git a/dep/acelite/ace/OS.h b/dep/acelite/ace/OS.h
index 1d52d2faa..f5baa84ed 100644
--- a/dep/acelite/ace/OS.h
+++ b/dep/acelite/ace/OS.h
@@ -4,7 +4,7 @@
 /**
  *  @file  OS.h
  *
- *  $Id: OS.h 95319 2011-12-13 14:54:44Z mhengstmengel $
+ *  $Id: OS.h 97130 2013-05-13 17:36:26Z mesnier_p $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
diff --git a/dep/acelite/ace/OS_Log_Msg_Attributes.h b/dep/acelite/ace/OS_Log_Msg_Attributes.h
index 65c11ab61..ee59c0830 100644
--- a/dep/acelite/ace/OS_Log_Msg_Attributes.h
+++ b/dep/acelite/ace/OS_Log_Msg_Attributes.h
@@ -4,7 +4,7 @@
 /**
  *  @file    OS_Log_Msg_Attributes.h
  *
- *  $Id: OS_Log_Msg_Attributes.h 91066 2010-07-12 11:05:04Z johnnyw $
+ *  $Id: OS_Log_Msg_Attributes.h 97874 2014-09-08 12:10:55Z johnnyw $
  *
  *  @author Carlos O'Ryan
  */
@@ -23,7 +23,7 @@
 #include /**/ "ace/ACE_export.h"
 #include "ace/os_include/os_stdio.h"
 #include "ace/iosfwd.h"
-#include "ace/Copy_Disabled.h"
+#include "ace/Global_Macros.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -40,7 +40,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * The contents of the class must be made available to the OS layer,
  * because they are part of the thread descriptor.
  */
-class ACE_Export ACE_OS_Log_Msg_Attributes : private ACE_Copy_Disabled
+class ACE_Export ACE_OS_Log_Msg_Attributes
 {
 public:
   /// Constructor
@@ -71,6 +71,10 @@ protected:
   ACE_SEH_EXCEPT_HANDLER seh_except_selector_;
   ACE_SEH_EXCEPT_HANDLER seh_except_handler_;
 #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
+
+private:
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_OS_Log_Msg_Attributes &))
+  ACE_UNIMPLEMENTED_FUNC (ACE_OS_Log_Msg_Attributes (const ACE_OS_Log_Msg_Attributes &))
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/OS_NS_Thread.cpp b/dep/acelite/ace/OS_NS_Thread.cpp
index c450bc813..358b43476 100644
--- a/dep/acelite/ace/OS_NS_Thread.cpp
+++ b/dep/acelite/ace/OS_NS_Thread.cpp
@@ -1,4 +1,4 @@
-// $Id: OS_NS_Thread.cpp 96061 2012-08-16 09:36:07Z mcorino $
+// $Id: OS_NS_Thread.cpp 97911 2014-10-07 21:58:25Z shuston $
 
 #include "ace/OS_NS_Thread.h"
 
@@ -14,7 +14,7 @@
 #include "ace/Object_Manager_Base.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_ctype.h"
-#include "ace/Log_Msg.h" // for ACE_ASSERT
+#include "ace/Log_Category.h" // for ACE_ASSERT
 // This is necessary to work around nasty problems with MVS C++.
 #include "ace/Auto_Ptr.h"
 #include "ace/Thread_Mutex.h"
@@ -54,12 +54,11 @@ ACE_Thread_ID::to_string (char *thr_string) const
   ACE_OS::sprintf (thr_string, "%u",
                    static_cast <unsigned> (this->thread_id_));
 #else
-  // Yes, this is an ugly C-style cast, but the
-  // correct C++ cast is different depending on
-  // whether the t_id is an integral type or a pointer
-  // type. FreeBSD uses a pointer type, but doesn't
-  // have a _np function to get an integral type like
-  // other OSes, so use the bigger hammer.
+  // Yes, this is an ugly C-style cast, but the correct C++ cast is
+  // different depending on whether the t_id is an integral type or a
+  // pointer type. FreeBSD uses a pointer type, but doesn't have a _np
+  // function to get an integral type like other OSes, so use the
+  // bigger hammer.
   ACE_OS::sprintf (thr_string, "%lu",
                    (unsigned long) thread_handle_);
 #endif /* ACE_WIN32 */
@@ -78,7 +77,15 @@ ACE_TSS_Emulation::ACE_TSS_DESTRUCTOR
 ACE_TSS_Emulation::tss_destructor_[ACE_TSS_Emulation::ACE_TSS_THREAD_KEYS_MAX]
  = { 0 };
 
-#  if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+#  if !defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) && defined (ACE_HAS_VXTHREADS)
+
+#     if (defined (_WRS_CONFIG_SMP) || defined (INCLUDE_AMP_CPU))
+__thread void* ACE_TSS_Emulation::ace_tss_keys = 0;
+#     else  /* ! VxWorks SMP */
+void* ACE_TSS_Emulation::ace_tss_keys = 0;
+#     endif /* ! VxWorks SMP */
+
+#  elif defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
 
 bool ACE_TSS_Emulation::key_created_ = false;
 
@@ -400,10 +407,10 @@ ACE_TSS_Info::dump (void)
   //  ACE_OS_TRACE ("ACE_TSS_Info::dump");
 
 #   if 0
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %u\n"), this->key_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("destructor_ = %u\n"), this->destructor_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %u\n"), this->key_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("destructor_ = %u\n"), this->destructor_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #   endif /* 0 */
 # endif /* ACE_HAS_DUMP */
 }
@@ -889,8 +896,8 @@ ACE_TSS_Cleanup::thread_detach_key (ACE_thread_key_t key)
     // If this entry was never set, just bug out. If it is set, but is the
     // wrong key, assert.
     if (this->table_[key_index].key_ == 0)
-        return 0;
-    ACE_ASSERT(this->table_[key_index].key_ == key);
+      return 0;
+    ACE_ASSERT (this->table_[key_index].key_ == key);
     ACE_TSS_Info &info = this->table_ [key_index];
 
     // sanity check
@@ -1472,7 +1479,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
     return -1;
 
 #     if defined (ACE_WIN32)
-  if (result != WAIT_OBJECT_0)
+  if (result != (int)WAIT_OBJECT_0)
     {
       switch (result)
         {
@@ -1655,7 +1662,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
   if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0)
     return -1;
 
-  if (result != WAIT_OBJECT_0)
+  if (result != (int)WAIT_OBJECT_0)
     {
       switch (result)
         {
@@ -1747,7 +1754,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv,
   if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0)
     return -1;
 
-  if (result != WAIT_OBJECT_0)
+  if (result != (int)WAIT_OBJECT_0)
     {
       switch (result)
         {
@@ -2500,15 +2507,17 @@ ACE_OS::event_destroy (ACE_event_t *event)
 
 int
 ACE_OS::event_init (ACE_event_t *event,
+                    int type,
+                    ACE_condattr_t *attributes,
                     int manual_reset,
                     int initial_state,
-                    int type,
                     const char *name,
                     void *arg,
                     LPSECURITY_ATTRIBUTES sa)
 {
 #if defined (ACE_WIN32)
   ACE_UNUSED_ARG (type);
+  ACE_UNUSED_ARG (attributes);
   ACE_UNUSED_ARG (arg);
   SECURITY_ATTRIBUTES sa_buffer;
   SECURITY_DESCRIPTOR sd_buffer;
@@ -2616,10 +2625,15 @@ ACE_OS::event_init (ACE_event_t *event,
 # if (defined (ACE_HAS_PTHREADS) && defined (_POSIX_THREAD_PROCESS_SHARED) && !defined (ACE_LACKS_CONDATTR_PSHARED)) || \
     (!defined (ACE_USES_FIFO_SEM) && \
       (!defined (ACE_HAS_POSIX_SEM) || !defined (ACE_HAS_POSIX_SEM_TIMEOUT) || defined (ACE_LACKS_NAMED_POSIX_SEM)))
-          int result = ACE_OS::cond_init (&event->eventdata_->condition_,
-                                          static_cast<short> (type),
-                                          name,
-                                          arg);
+          int result = attributes == 0 ?
+                          ACE_OS::cond_init (&event->eventdata_->condition_,
+                                             type,
+                                             name,
+                                             arg) :
+                          ACE_OS::cond_init (&event->eventdata_->condition_,
+                                             *attributes,
+                                             name,
+                                             arg);
 # else
           char   sem_name[128];
           ACE_OS::strncpy (sem_name,
@@ -2629,6 +2643,7 @@ ACE_OS::event_init (ACE_event_t *event,
           int result = ACE_OS::sema_init (&event->semaphore_,
                                           0,
                                           type,
+                                          attributes,
                                           sem_name,
                                           arg);
 # endif
@@ -2652,6 +2667,7 @@ ACE_OS::event_init (ACE_event_t *event,
             result = ACE_OS::sema_init (&event->lock_,
                                         0,
                                         type,
+                                        attributes,
                                         lck_name,
                                         arg);
             if (result == 0)
@@ -2666,9 +2682,9 @@ ACE_OS::event_init (ACE_event_t *event,
 
           event->name_ = 0;
           event->eventdata_ = evtdata;
-#if (!defined (ACE_HAS_PTHREADS) || !defined (_POSIX_THREAD_PROCESS_SHARED) || defined (ACE_LACKS_CONDATTR_PSHARED)) && \
-  (defined (ACE_USES_FIFO_SEM) || \
-    (defined (ACE_HAS_POSIX_SEM) && defined (ACE_HAS_POSIX_SEM_TIMEOUT) && !defined (ACE_LACKS_NAMED_POSIX_SEM)))
+# if (!defined (ACE_HAS_PTHREADS) || !defined (_POSIX_THREAD_PROCESS_SHARED) || defined (ACE_LACKS_CONDATTR_PSHARED)) && \
+      (defined (ACE_USES_FIFO_SEM) || \
+      (defined (ACE_HAS_POSIX_SEM) && defined (ACE_HAS_POSIX_SEM_TIMEOUT) && !defined (ACE_LACKS_NAMED_POSIX_SEM)))
           char   sem_name[128];
           ACE_OS::strncpy (sem_name,
                            name,
@@ -2677,6 +2693,7 @@ ACE_OS::event_init (ACE_event_t *event,
           result = ACE_OS::sema_init(&event->semaphore_,
                                      0,
                                      type,
+                                     attributes,
                                      sem_name,
                                      arg);
 # endif
@@ -2696,6 +2713,7 @@ ACE_OS::event_init (ACE_event_t *event,
               result = ACE_OS::sema_init (&event->lock_,
                                           0,
                                           type,
+                                          attributes,
                                           lck_name,
                                           arg);
             }
@@ -2718,14 +2736,20 @@ ACE_OS::event_init (ACE_event_t *event,
 # if (defined (ACE_HAS_PTHREADS) && defined (_POSIX_THREAD_PROCESS_SHARED) && !defined (ACE_LACKS_CONDATTR_PSHARED)) || \
     (!defined (ACE_USES_FIFO_SEM) && \
       (!defined (ACE_HAS_POSIX_SEM) || !defined (ACE_HAS_POSIX_SEM_TIMEOUT) || defined (ACE_LACKS_NAMED_POSIX_SEM)))
-      int result = ACE_OS::cond_init (&event->eventdata_->condition_,
-                                      static_cast<short> (type),
-                                      name,
-                                      arg);
+      int result = attributes == 0 ?
+                      ACE_OS::cond_init (&event->eventdata_->condition_,
+                                         type,
+                                         name,
+                                         arg) :
+                      ACE_OS::cond_init (&event->eventdata_->condition_,
+                                         *attributes,
+                                         name,
+                                         arg);
 # else
       int result = ACE_OS::sema_init (&event->semaphore_,
                                       0,
                                       type,
+                                      attributes,
                                       name,
                                       arg);
 # endif
@@ -2742,6 +2766,7 @@ ACE_OS::event_init (ACE_event_t *event,
       result = ACE_OS::sema_init (&event->lock_,
                                   0,
                                   type,
+                                  attributes,
                                   name,
                                   arg);
       if (result == 0)
@@ -2755,6 +2780,7 @@ ACE_OS::event_init (ACE_event_t *event,
   ACE_UNUSED_ARG (manual_reset);
   ACE_UNUSED_ARG (initial_state);
   ACE_UNUSED_ARG (type);
+  ACE_UNUSED_ARG (attributes);
   ACE_UNUSED_ARG (name);
   ACE_UNUSED_ARG (arg);
   ACE_UNUSED_ARG (sa);
@@ -4108,14 +4134,11 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
       if (ACE_BIT_ENABLED (flags, THR_SCOPE_SYSTEM)
           || ACE_BIT_ENABLED (flags, THR_SCOPE_PROCESS))
         {
-#     if defined (ACE_CONFIG_LINUX_H) || defined (HPUX) || defined (ACE_VXWORKS)
-          // LinuxThreads do not have support for PTHREAD_SCOPE_PROCESS.
-          // Neither does HPUX (up to HP-UX 11.00, as far as I know).
-          // Also VxWorks only delivers scope system
+#     if defined (ACE_LACKS_PTHREAD_SCOPE_PROCESS)
           int scope = PTHREAD_SCOPE_SYSTEM;
-#     else /* ACE_CONFIG_LINUX_H */
+#     else /* ACE_LACKS_PTHREAD_SCOPE_PROCESS */
           int scope = PTHREAD_SCOPE_PROCESS;
-#     endif /* ACE_CONFIG_LINUX_H */
+#     endif /* ACE_LACKS_PTHREAD_SCOPE_PROCESS */
           if (ACE_BIT_ENABLED (flags, THR_SCOPE_SYSTEM))
             scope = PTHREAD_SCOPE_SYSTEM;
 
@@ -4714,6 +4737,7 @@ ACE_OS::thr_set_affinity (ACE_hthread_t thr_id,
     }
   return 0;
 #elif defined (ACE_HAS_TASKCPUAFFINITYSET)
+  ACE_UNUSED_ARG (cpu_set_size);
   int result = 0;
   if (ACE_ADAPT_RETVAL (::taskCpuAffinitySet (thr_id, *cpu_mask), result) == -1)
     {
@@ -5110,13 +5134,13 @@ int
 spa (FUNCPTR entry, ...)
 {
   static const unsigned int ACE_MAX_ARGS = 10;
-  static char *argv[ACE_MAX_ARGS];
+  static char *argv[ACE_MAX_ARGS] = { 0 };
   va_list pvar;
   unsigned int argc;
 
   // Hardcode a program name because the real one isn't available
   // through the VxWorks shell.
-  argv[0] = "ace_main";
+  argv[0] = const_cast<char*> ("ace_main");
 
   // Peel off arguments to spa () and put into argv.  va_arg () isn't
   // necessarily supposed to return 0 when done, though since the
@@ -5245,7 +5269,7 @@ spae (FUNCPTR entry, ...)
 {
   static int const WINDSH_ARGS = 10;
   static int const ACE_MAX_ARGS    = 128;
-  static char* argv[ACE_MAX_ARGS]  = { "ace_main", 0 };
+  static char* argv[ACE_MAX_ARGS]  = { const_cast<char*> ("ace_main"), 0 };
   va_list pvar;
   int argc = 1;
 
@@ -5299,7 +5323,7 @@ spaef (FUNCPTR entry, ...)
 {
   static int const WINDSH_ARGS = 10;
   static int const ACE_MAX_ARGS    = 128;
-  static char* argv[ACE_MAX_ARGS]  = { "ace_main", 0 };
+  static char* argv[ACE_MAX_ARGS]  = { const_cast<char*> ("ace_main"), 0 };
   va_list pvar;
   int argc = 1;
 
@@ -5351,7 +5375,7 @@ int
 vx_execae (FUNCPTR entry, char* arg, int prio, int opt, int stacksz, ...)
 {
   static int const ACE_MAX_ARGS    = 128;
-  static char* argv[ACE_MAX_ARGS]  = { "ace_main", 0 };
+  static char* argv[ACE_MAX_ARGS]  = { const_cast<char*> ("ace_main"), 0 };
   int argc = 1;
 
   // Peel off arguments to run_main () and put into argv.
diff --git a/dep/acelite/ace/OS_NS_Thread.h b/dep/acelite/ace/OS_NS_Thread.h
index ee73b5bd3..6103168c4 100644
--- a/dep/acelite/ace/OS_NS_Thread.h
+++ b/dep/acelite/ace/OS_NS_Thread.h
@@ -4,7 +4,7 @@
 /**
  *  @file   OS_NS_Thread.h
  *
- *  $Id: OS_NS_Thread.h 96061 2012-08-16 09:36:07Z mcorino $
+ *  $Id: OS_NS_Thread.h 97911 2014-10-07 21:58:25Z shuston $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
@@ -38,6 +38,12 @@
 # include "ace/ACE_export.h"
 # include "ace/Object_Manager_Base.h"
 
+#if defined (ACE_HAS_TSS_EMULATION) && !defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+# if defined (ACE_HAS_VXTHREADS) && !defined (_WRS_CONFIG_SMP) && !defined (INCLUDE_AMP_CPU)
+#  include "taskVarLib.h" /* used by VxWorks < 6.9 */
+# endif /* VxWorks and ! SMP */
+#endif
+
 # if defined (ACE_EXPORT_MACRO)
 #   undef ACE_EXPORT_MACRO
 # endif
@@ -875,6 +881,15 @@ private:
 #   else  /* ! ACE_HAS_THREAD_SPECIFIC_STORAGE */
   /// Location of current thread's TSS array.
   static void **&tss_base ();
+
+#     if defined (ACE_HAS_VXTHREADS)
+#       if (defined (_WRS_CONFIG_SMP) || defined (INCLUDE_AMP_CPU))
+  static __thread void* ace_tss_keys;
+#       else  /* ! VxWorks SMP */
+  static void* ace_tss_keys;
+#       endif /* ! VxWorks SMP */
+#     endif /* ACE_HAS_VXTHREADS */
+
 #   endif /* ! ACE_HAS_THREAD_SPECIFIC_STORAGE */
 
 #   if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
@@ -1085,6 +1100,9 @@ namespace ACE_OS {
   int condattr_init (ACE_condattr_t &attributes,
                      int type = ACE_DEFAULT_SYNCH_TYPE);
 
+  ACE_NAMESPACE_INLINE_FUNCTION
+  int condattr_synctype (ACE_condattr_t &attributes, int& type);
+
   ACE_NAMESPACE_INLINE_FUNCTION
   int condattr_destroy (ACE_condattr_t &attributes);
 
@@ -1184,7 +1202,7 @@ namespace ACE_OS {
   extern ACE_Export
   int event_destroy (ACE_event_t *event);
 
-  extern ACE_Export
+  ACE_NAMESPACE_INLINE_FUNCTION
   int event_init (ACE_event_t *event,
                   int manual_reset = 0,
                   int initial_state = 0,
@@ -1193,6 +1211,16 @@ namespace ACE_OS {
                   void *arg = 0,
                   LPSECURITY_ATTRIBUTES sa = 0);
 
+  extern ACE_Export
+  int event_init (ACE_event_t *event,
+                  int type,
+                  ACE_condattr_t *attributes,
+                  int manual_reset = 0,
+                  int initial_state = 0,
+                  const char *name = 0,
+                  void *arg = 0,
+                  LPSECURITY_ATTRIBUTES sa = 0);
+
 # if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int event_init (ACE_event_t *event,
@@ -1202,6 +1230,16 @@ namespace ACE_OS {
                   const wchar_t *name,
                   void *arg = 0,
                   LPSECURITY_ATTRIBUTES sa = 0);
+
+  ACE_NAMESPACE_INLINE_FUNCTION
+  int event_init (ACE_event_t *event,
+                  int type,
+                  ACE_condattr_t *attributes,
+                  int manual_reset,
+                  int initial_state,
+                  const wchar_t *name,
+                  void *arg = 0,
+                  LPSECURITY_ATTRIBUTES sa = 0);
 # endif /* ACE_HAS_WCHAR */
 
   extern ACE_Export
@@ -1421,6 +1459,16 @@ namespace ACE_OS {
                  int max = 0x7fffffff,
                  LPSECURITY_ATTRIBUTES sa = 0);
 
+  ACE_NAMESPACE_INLINE_FUNCTION
+  int sema_init (ACE_sema_t *s,
+                 u_int count,
+                 int type,
+                 ACE_condattr_t *attributes,
+                 const char *name = 0,
+                 void *arg = 0,
+                 int max = 0x7fffffff,
+                 LPSECURITY_ATTRIBUTES sa = 0);
+
 # if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int sema_init (ACE_sema_t *s,
@@ -1430,6 +1478,16 @@ namespace ACE_OS {
                  void *arg = 0,
                  int max = 0x7fffffff,
                  LPSECURITY_ATTRIBUTES sa = 0);
+
+  ACE_NAMESPACE_INLINE_FUNCTION
+  int sema_init (ACE_sema_t *s,
+                 u_int count,
+                 int type,
+                 ACE_condattr_t *attributes,
+                 const wchar_t *name,
+                 void *arg = 0,
+                 int max = 0x7fffffff,
+                 LPSECURITY_ATTRIBUTES sa = 0);
 # endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -1677,6 +1735,11 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   const char* thr_name (void);
 
+  /// Stores a string version of the current thread id into buffer and
+  /// returns the size of this thread id in bytes.
+  ACE_NAMESPACE_INLINE_FUNCTION
+  ssize_t thr_id (char buffer[], size_t buffer_length);
+
   /// State is THR_CANCEL_ENABLE or THR_CANCEL_DISABLE
   ACE_NAMESPACE_INLINE_FUNCTION
   int thr_setcancelstate (int new_state, int *old_state);
@@ -1833,12 +1896,18 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_event_t
 {
   friend int ACE_OS::event_init(ACE_event_t*, int, int, int, const char*, void*,int);
+  friend int ACE_OS::event_init(ACE_event_t*, int, ACE_condattr_t*, int, int, const char*, void*,int);
   friend int ACE_OS::event_destroy(ACE_event_t*);
   friend int ACE_OS::event_wait(ACE_event_t*);
   friend int ACE_OS::event_timedwait(ACE_event_t*, ACE_Time_Value*, int);
   friend int ACE_OS::event_signal(ACE_event_t*);
   friend int ACE_OS::event_pulse(ACE_event_t*);
   friend int ACE_OS::event_reset(ACE_event_t*);
+
+public:
+  /// Constructor initializing all pointer fields to null
+  ACE_event_t (void);
+
 protected:
 
   /// Event name if process shared.
diff --git a/dep/acelite/ace/OS_NS_Thread.inl b/dep/acelite/ace/OS_NS_Thread.inl
index 460e80f2a..fad40fd24 100644
--- a/dep/acelite/ace/OS_NS_Thread.inl
+++ b/dep/acelite/ace/OS_NS_Thread.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: OS_NS_Thread.inl 96074 2012-08-17 18:06:56Z johnnyw $
+// $Id: OS_NS_Thread.inl 97911 2014-10-07 21:58:25Z shuston $
 
 #include "ace/OS_NS_macros.h"
 // for timespec_t, perhaps move it to os_time.h
@@ -45,12 +45,11 @@ void **&
 ACE_TSS_Emulation::tss_base ()
 {
 #    if defined (ACE_HAS_VXTHREADS)
-  #if (ACE_VXWORKS <= 0x680)
-  int &spare = taskIdCurrent->ACE_VXWORKS_SPARE;
-  #else // VxWorks 6.9 updated datatype (WIND00241209) see taskLib.h
-  long  &spare = taskIdCurrent->ACE_VXWORKS_SPARE;
-  #endif
-  return reinterpret_cast <void **&> (spare);
+#      if (!defined (_WRS_CONFIG_SMP) && !defined (INCLUDE_AMP_CPU))
+  if (taskVarGet(0, reinterpret_cast<int*>(&ace_tss_keys)) == ERROR)
+    taskVarAdd(0, reinterpret_cast<int*>(&ace_tss_keys));
+#      endif
+  return reinterpret_cast <void **&> (ace_tss_keys);
 #    else
   // Uh oh.
   ACE_NOTSUP_RETURN (0);
@@ -81,15 +80,13 @@ ACE_TSS_Emulation::ts_object (const ACE_thread_key_t key)
     /* If someone wants tss_base make sure they get one.  This
        gets used if someone spawns a VxWorks task directly, not
        through ACE.  The allocated array will never be deleted! */
-    if (0 == taskIdCurrent->ACE_VXWORKS_SPARE)
+    if (ace_tss_keys == 0)
       {
-        taskIdCurrent->ACE_VXWORKS_SPARE =
-          reinterpret_cast<int> (new void *[ACE_TSS_THREAD_KEYS_MAX]);
+        ace_tss_keys = new void *[ACE_TSS_THREAD_KEYS_MAX];
 
         // Zero the entire TSS array.  Do it manually instead of using
         // memset, for optimum speed.  Though, memset may be faster :-)
-        void **tss_base_p =
-          reinterpret_cast<void **> (taskIdCurrent->ACE_VXWORKS_SPARE);
+        void **tss_base_p = reinterpret_cast<void **> (ace_tss_keys);
         for (u_int i = 0; i < ACE_TSS_THREAD_KEYS_MAX; ++i, ++tss_base_p)
           {
             *tss_base_p = 0;
@@ -183,6 +180,40 @@ ACE_OS::condattr_init (ACE_condattr_t &attributes, int type)
 # endif /* ACE_HAS_THREADS */
 }
 
+ACE_INLINE int
+ACE_OS::condattr_synctype (ACE_condattr_t &attributes, int& type)
+{
+# if defined (ACE_HAS_THREADS)
+#   if defined (ACE_HAS_PTHREADS)
+#   if !defined (ACE_LACKS_CONDATTR) && defined (_POSIX_THREAD_PROCESS_SHARED) && !defined (ACE_LACKS_CONDATTR_PSHARED)
+  int result = -1;
+
+  if (
+      ACE_ADAPT_RETVAL (pthread_condattr_getpshared (&attributes, &type),
+                           result) == 0
+     )
+    {
+      result = 0;
+    }
+#   else
+  ACE_UNUSED_ARG (attributes);
+  int result = 0;
+  type = USYNC_THREAD;
+#   endif /* !ACE_LACKS_CONDATTR && _POSIX_THREAD_PROCESS_SHARED && ! ACE_LACKS_CONDATTR_PSHARED */
+
+  return result;
+#   else
+  type = attributes.type;
+  return 0;
+#   endif /* ACE_HAS_PTHREADS */
+
+# else
+  ACE_UNUSED_ARG (attributes);
+  ACE_UNUSED_ARG (type);
+  ACE_NOTSUP_RETURN (-1);
+# endif /* ACE_HAS_THREADS */
+}
+
 ACE_INLINE int
 ACE_OS::condattr_setclock (ACE_condattr_t &attributes, clockid_t clock_id)
 {
@@ -453,6 +484,19 @@ ACE_OS::mutex_lock (ACE_mutex_t *m,
   return timeout == 0 ? ACE_OS::mutex_lock (m) : ACE_OS::mutex_lock (m, *timeout);
 }
 
+ACE_INLINE int
+ACE_OS::event_init (ACE_event_t *event,
+                    int manual_reset,
+                    int initial_state,
+                    int type,
+                    const char *name,
+                    void *arg,
+                    LPSECURITY_ATTRIBUTES sa)
+{
+  ACE_condattr_t *pattr = 0;
+  return ACE_OS::event_init (event, type, pattr, manual_reset, initial_state, name, arg, sa);
+}
+
 #if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::event_init (ACE_event_t *event,
@@ -489,6 +533,45 @@ ACE_OS::event_init (ACE_event_t *event,
                              sa);
 #endif /* ACE_WIN32 */
 }
+
+ACE_INLINE int
+ACE_OS::event_init (ACE_event_t *event,
+                    int type,
+                    ACE_condattr_t *attributes,
+                    int manual_reset,
+                    int initial_state,
+                    const wchar_t *name,
+                    void *arg,
+                    LPSECURITY_ATTRIBUTES sa)
+{
+#if defined (ACE_WIN32)
+  ACE_UNUSED_ARG (type);
+  ACE_UNUSED_ARG (attributes);
+  ACE_UNUSED_ARG (arg);
+  SECURITY_ATTRIBUTES sa_buffer;
+  SECURITY_DESCRIPTOR sd_buffer;
+  *event = ::CreateEventW (ACE_OS::default_win32_security_attributes_r
+      (sa, &sa_buffer, &sd_buffer),
+  manual_reset,
+  initial_state,
+  name);
+  if (*event == 0)
+    ACE_FAIL_RETURN (-1);
+
+  // Make sure to set errno to ERROR_ALREADY_EXISTS if necessary.
+  ACE_OS::set_errno_to_last_error ();
+  return 0;
+#else  /* ACE_WIN32 */
+  return ACE_OS::event_init (event,
+                             type,
+                             attributes,
+                             manual_reset,
+                             initial_state,
+                             ACE_Wide_To_Ascii (name).char_rep (),
+                             arg,
+                             sa);
+#endif /* ACE_WIN32 */
+}
 #endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE long
@@ -1426,6 +1509,20 @@ ACE_OS::sema_init (ACE_sema_t *s,
                    void *arg,
                    int max,
                    LPSECURITY_ATTRIBUTES sa)
+{
+  ACE_condattr_t *pattr = 0;
+  return ACE_OS::sema_init (s, count, type, pattr, name, arg, max, sa);
+}
+
+ACE_INLINE int
+ACE_OS::sema_init (ACE_sema_t *s,
+                   u_int count,
+                   int type,
+                   ACE_condattr_t *attributes,
+                   const char *name,
+                   void *arg,
+                   int max,
+                   LPSECURITY_ATTRIBUTES sa)
 {
   ACE_OS_TRACE ("ACE_OS::sema_init");
 #if defined (ACE_HAS_POSIX_SEM)
@@ -1435,12 +1532,15 @@ ACE_OS::sema_init (ACE_sema_t *s,
   s->name_ = 0;
 #  if defined (ACE_HAS_POSIX_SEM_TIMEOUT) || defined (ACE_DISABLE_POSIX_SEM_TIMEOUT_EMULATION)
   ACE_UNUSED_ARG (arg);
+  ACE_UNUSED_ARG (attributes);
 #  else
   int result = -1;
 
   if (ACE_OS::mutex_init (&s->lock_, type, name,
                           (ACE_mutexattr_t *) arg) == 0
-      && ACE_OS::cond_init (&s->count_nonzero_, (short)type, name, arg) == 0
+      && (attributes == 0 ?
+            ACE_OS::cond_init (&s->count_nonzero_, type, name, arg) :
+            ACE_OS::cond_init (&s->count_nonzero_, *attributes, name, arg)) == 0
       && ACE_OS::mutex_lock (&s->lock_) == 0)
     {
       if (ACE_OS::mutex_unlock (&s->lock_) == 0)
@@ -1644,6 +1744,7 @@ ACE_OS::sema_init (ACE_sema_t *s,
   ACE_UNUSED_ARG (name);
   ACE_UNUSED_ARG (max);
   ACE_UNUSED_ARG (sa);
+  ACE_UNUSED_ARG (attributes);
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_init (s, count, type, arg), result),
                      int, -1);
@@ -1654,7 +1755,9 @@ ACE_OS::sema_init (ACE_sema_t *s,
 
   if (ACE_OS::mutex_init (&s->lock_, type, name,
                           (ACE_mutexattr_t *) arg) == 0
-      && ACE_OS::cond_init (&s->count_nonzero_, type, name, arg) == 0
+      && (attributes == 0 ?
+            ACE_OS::cond_init (&s->count_nonzero_, type, name, arg) :
+            ACE_OS::cond_init (&s->count_nonzero_, *attributes, name, arg)) == 0
       && ACE_OS::mutex_lock (&s->lock_) == 0)
     {
       s->count_ = count;
@@ -1671,6 +1774,7 @@ ACE_OS::sema_init (ACE_sema_t *s,
     }
   return result;
 #  elif defined (ACE_HAS_WTHREADS)
+  ACE_UNUSED_ARG (attributes);
 #    if ! defined (ACE_USES_WINCE_SEMA_SIMULATION)
   ACE_UNUSED_ARG (type);
   ACE_UNUSED_ARG (arg);
@@ -1728,6 +1832,7 @@ ACE_OS::sema_init (ACE_sema_t *s,
   return result;
 #    endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #  elif defined (ACE_VXWORKS)
+  ACE_UNUSED_ARG (attributes);
   ACE_UNUSED_ARG (name);
   ACE_UNUSED_ARG (arg);
   ACE_UNUSED_ARG (max);
@@ -1740,6 +1845,7 @@ ACE_OS::sema_init (ACE_sema_t *s,
   ACE_UNUSED_ARG (s);
   ACE_UNUSED_ARG (count);
   ACE_UNUSED_ARG (type);
+  ACE_UNUSED_ARG (attributes);
   ACE_UNUSED_ARG (name);
   ACE_UNUSED_ARG (arg);
   ACE_UNUSED_ARG (max);
@@ -1757,8 +1863,23 @@ ACE_OS::sema_init (ACE_sema_t *s,
                    void *arg,
                    int max,
                    LPSECURITY_ATTRIBUTES sa)
+{
+  ACE_condattr_t *pattr = 0;
+  return ACE_OS::sema_init (s, count, type, pattr, name, arg, max, sa);
+}
+
+ACE_INLINE int
+ACE_OS::sema_init (ACE_sema_t *s,
+                   u_int count,
+                   int type,
+                   ACE_condattr_t *attributes,
+                   const wchar_t *name,
+                   void *arg,
+                   int max,
+                   LPSECURITY_ATTRIBUTES sa)
 {
 # if defined (ACE_HAS_WTHREADS)
+  ACE_UNUSED_ARG (attributes);
 #   if ! defined (ACE_USES_WINCE_SEMA_SIMULATION)
   ACE_UNUSED_ARG (type);
   ACE_UNUSED_ARG (arg);
@@ -1817,7 +1938,7 @@ ACE_OS::sema_init (ACE_sema_t *s,
 #   endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 # else /* ACE_HAS_WTHREADS */
   // Just call the normal char version.
-  return ACE_OS::sema_init (s, count, type, ACE_Wide_To_Ascii (name).char_rep (), arg, max, sa);
+  return ACE_OS::sema_init (s, count, type, attributes, ACE_Wide_To_Ascii (name).char_rep (), arg, max, sa);
 # endif /* ACE_HAS_WTHREADS */
 }
 #endif /* ACE_HAS_WCHAR */
@@ -2819,6 +2940,22 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle,
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_join (thr_handle, status), result),
                      int, -1);
 # elif defined (ACE_HAS_WTHREADS)
+  // Waiting on the calling thread will deadlock, so try to avoid that. The
+  // direct access to the needed info (GetThreadId) was added at Vista.
+  // Win Server 2003 is 5.2; Vista is 6.0
+#   if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0502)
+  const ACE_TEXT_OSVERSIONINFO &info = ACE_OS::get_win32_versioninfo ();
+  if (info.dwMajorVersion >= 6 ||
+      (info.dwMajorVersion == 5 && info.dwMinorVersion == 2))
+    {
+      if (::GetThreadId (thr_handle) == ::GetCurrentThreadId ())
+        {
+          errno = ERROR_POSSIBLE_DEADLOCK;
+          return -1;
+        }
+    }
+#   endif /* _WIN32_WINNT */
+
   ACE_THR_FUNC_RETURN local_status = 0;
 
   // Make sure that status is non-NULL.
@@ -2956,6 +3093,38 @@ ACE_OS::thr_min_stack (void)
 #endif /* ACE_HAS_THREADS */
 }
 
+ACE_INLINE ssize_t
+ACE_OS::thr_id (char buffer[], size_t buffer_length)
+{
+#if defined (ACE_WIN32)
+#if defined (ACE_HAS_SNPRINTF)
+  return ACE_OS::snprintf (buffer,
+                           buffer_length,
+                           "%u",
+                           static_cast <unsigned> (ACE_OS::thr_self ()));
+#else
+  ACE_UNUSED_ARG (buffer_length);
+  return ACE_OS::sprintf (buffer,
+                          "%u",
+                          static_cast <unsigned> (ACE_OS::thr_self ()));
+#endif /* ACE_HAS_SNPRINTF */
+#else
+  ACE_hthread_t t_id;
+  ACE_OS::thr_self (t_id);
+#if defined (ACE_HAS_SNPRINTF)
+  return ACE_OS::snprintf (buffer,
+                           buffer_length,
+                           "%lu",
+                           (unsigned long) t_id);
+#else
+  ACE_UNUSED_ARG (buffer_length);
+  return ACE_OS::sprintf (buffer,
+                          "%lu",
+                          (unsigned long) t_id);
+#endif /* ACE_HAS_SNPRINTF */
+#endif /* WIN32 */
+}
+
 ACE_INLINE ACE_thread_t
 ACE_OS::thr_self (void)
 {
@@ -3522,7 +3691,9 @@ ACE_OS::thread_mutex_trylock (ACE_thread_mutex_t *m)
 #   if defined (ACE_HAS_WIN32_TRYLOCK)
   BOOL result = ::TryEnterCriticalSection (m);
   if (result == TRUE)
-    return 0;
+    {
+      return 0;
+    }
   else
     {
       errno = EBUSY;
@@ -3720,4 +3891,15 @@ ACE_Thread_ID::operator!= (const ACE_Thread_ID &rhs) const
   return !(*this == rhs);
 }
 
+#if !defined (ACE_WIN32)
+
+ACE_INLINE
+ACE_event_t::ACE_event_t (void) :
+  name_ (0),
+  eventdata_ (0)
+{
+}
+
+#endif /* !ACE_WIN32 */
+
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/OS_NS_dirent.cpp b/dep/acelite/ace/OS_NS_dirent.cpp
index 67ffabe4f..a742b5a9e 100644
--- a/dep/acelite/ace/OS_NS_dirent.cpp
+++ b/dep/acelite/ace/OS_NS_dirent.cpp
@@ -1,4 +1,4 @@
-// $Id: OS_NS_dirent.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: OS_NS_dirent.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/OS_NS_dirent.h"
 
@@ -10,7 +10,7 @@
 
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_string.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_stdlib.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/OS_NS_dlfcn.inl b/dep/acelite/ace/OS_NS_dlfcn.inl
index 522166bef..3df2c6f0a 100644
--- a/dep/acelite/ace/OS_NS_dlfcn.inl
+++ b/dep/acelite/ace/OS_NS_dlfcn.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: OS_NS_dlfcn.inl 92474 2010-11-02 13:29:39Z johnnyw $
+// $Id: OS_NS_dlfcn.inl 97911 2014-10-07 21:58:25Z shuston $
 
 #include "ace/OS_NS_macros.h"
 #include "ace/OS_NS_errno.h"
@@ -154,6 +154,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname,
   ACE_OSCALL_RETURN (::cxxshl_load(fname, mode, 0L), ACE_SHLIB_HANDLE, 0);
 #   endif  /* aC++ vs. Hp C++ */
 # elif defined (ACE_VXWORKS) && !defined (__RTP__)
+  ACE_UNUSED_ARG (mode);
   MODULE* handle = 0;
   // Open readonly
   ACE_HANDLE filehandle = ACE_OS::open (fname,
@@ -252,14 +253,19 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
 # elif defined (ACE_VXWORKS) && !defined (__RTP__)
 
   // For now we use the VxWorks global symbol table
-  // which resolves the most recently loaded symbols .. which resolve mostly what we want..
+  // which resolves the most recently loaded symbols, which resolve
+  // mostly what we want..
   ACE_UNUSED_ARG (handle);
-  SYM_TYPE symtype;
-  char *value = 0;
   STATUS status;
-  ACE_OSCALL (::symFindByName(sysSymTbl, symbolname, &value, &symtype), int, -1, status);
 
-  return status == OK ? reinterpret_cast <void*>(value) : 0;
+  SYMBOL_DESC symbolDesc;     /* symFind() descriptor */
+  ACE_OS::memset (&symbolDesc, 0, sizeof (SYMBOL_DESC));
+  symbolDesc.mask = SYM_FIND_BY_NAME;
+  symbolDesc.name = symbolname;
+
+  ACE_OSCALL (::symFind(sysSymTbl, &symbolDesc), int, -1, status);
+
+  return status == OK ? reinterpret_cast <void*>(symbolDesc.value) : 0;
 
 # else
 
diff --git a/dep/acelite/ace/OS_NS_netdb.cpp b/dep/acelite/ace/OS_NS_netdb.cpp
index 6de2b74e5..680dc4dfe 100644
--- a/dep/acelite/ace/OS_NS_netdb.cpp
+++ b/dep/acelite/ace/OS_NS_netdb.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: OS_NS_netdb.cpp 95533 2012-02-14 22:59:17Z wotte $
+// $Id: OS_NS_netdb.cpp 97320 2013-09-05 07:53:58Z johnnyw $
 
 #include "ace/OS_NS_netdb.h"
 
@@ -15,6 +15,10 @@
 #include "ace/OS_NS_stropts.h"
 #include "ace/OS_NS_sys_socket.h"
 
+#if defined (ACE_LINUX) && !defined (ACE_LACKS_NETWORKING)
+#  include "ace/os_include/os_ifaddrs.h"
+#endif /* ACE_LINUX && !ACE_LACKS_NETWORKING */
+
 // Include if_arp so that getmacaddr can use the
 // arp structure.
 #if defined (sun)
@@ -166,7 +170,34 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
 
 #elif defined (ACE_LINUX) && !defined (ACE_LACKS_NETWORKING)
 
+  // It's easiest to know the first MAC-using interface. Use the BSD
+  // getifaddrs function that simplifies access to connected interfaces.
+  struct ifaddrs *ifap = 0;
+  struct ifaddrs *p_if = 0;
+
+  if (::getifaddrs (&ifap) != 0)
+    return -1;
+
+  for (p_if = ifap; p_if != 0; p_if = p_if->ifa_next)
+    {
+      if (p_if->ifa_addr == 0)
+        continue;
+
+      // Check to see if it's up and is not either PPP or loopback
+      if ((p_if->ifa_flags & IFF_UP) == IFF_UP &&
+          (p_if->ifa_flags & (IFF_LOOPBACK | IFF_POINTOPOINT)) == 0)
+        break;
+    }
+  if (p_if == 0)
+    {
+      errno = ENODEV;
+      ::freeifaddrs (ifap);
+      return -1;
+    }
+
   struct ifreq ifr;
+  ACE_OS::strcpy (ifr.ifr_name, p_if->ifa_name);
+  ::freeifaddrs (ifap);
 
   ACE_HANDLE handle =
     ACE_OS::socket (PF_INET, SOCK_DGRAM, 0);
@@ -174,8 +205,6 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
   if (handle == ACE_INVALID_HANDLE)
     return -1;
 
-  ACE_OS::strcpy (ifr.ifr_name, "eth0");
-
   if (ACE_OS::ioctl (handle/*s*/, SIOCGIFHWADDR, &ifr) < 0)
     {
       ACE_OS::close (handle);
@@ -193,7 +222,78 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
 
   return 0;
 
-#elif defined (ACE_HAS_SIOCGIFCONF)
+#elif defined (__ANDROID_API__) && defined (ACE_HAS_SIOCGIFCONF) && !defined (ACE_LACKS_NETWORKING)
+
+  struct ifconf ifc;
+  struct ifreq ifr_buf[32];
+
+
+  ACE_HANDLE handle =
+    ACE_OS::socket (AF_INET, SOCK_DGRAM, 0);
+
+  if (handle == ACE_INVALID_HANDLE)
+    {
+      return -1;
+    }
+
+
+  ifc.ifc_len = sizeof(ifr_buf);
+  ifc.ifc_req = &ifr_buf[0];
+
+  if (ACE_OS::ioctl (handle, SIOCGIFCONF, &ifc) < 0)
+    {
+      ACE_OS::close (handle);
+      return -1;
+    }
+
+  int numif = ifc.ifc_len / sizeof(struct ifreq);
+
+  // find first eligible device
+  struct ifreq* ifr = 0;
+  for (int i=0; i< numif ;++i)
+    {
+      ifr = &ifr_buf[i];
+
+      // get device flags
+      if (ACE_OS::ioctl (handle, SIOCGIFFLAGS, ifr) < 0)
+        {
+          ACE_OS::close (handle);
+          return -1;
+        }
+
+      // Check to see if it's up and is not either PPP or loopback
+      if ((ifr->ifr_flags & IFF_UP) == IFF_UP &&
+          (ifr->ifr_flags & (IFF_LOOPBACK | IFF_POINTOPOINT)) == 0)
+        break;
+
+      ifr = 0;
+    }
+  // did we find any?
+  if (ifr == 0)
+    {
+      ACE_OS::close (handle);
+      errno = ENODEV;
+      return -1;
+    }
+
+  if (ACE_OS::ioctl (handle, SIOCGIFHWADDR, ifr) < 0)
+    {
+      ACE_OS::close (handle);
+      return -1;
+    }
+
+  struct sockaddr* sa =
+    (struct sockaddr *) &ifr->ifr_hwaddr;
+
+  ACE_OS::close (handle);
+
+  ACE_OS::memcpy (node->node,
+                  sa->sa_data,
+                  6);
+
+  return 0;
+
+#elif defined (ACE_HAS_SIOCGIFCONF) && !defined (__ANDROID_API__)
 
   const long BUFFERSIZE = 4000;
   char buffer[BUFFERSIZE];
diff --git a/dep/acelite/ace/OS_NS_netdb.inl b/dep/acelite/ace/OS_NS_netdb.inl
index 2db9779a3..d3d2baaf2 100644
--- a/dep/acelite/ace/OS_NS_netdb.inl
+++ b/dep/acelite/ace/OS_NS_netdb.inl
@@ -1,13 +1,13 @@
 // -*- C++ -*-
 //
-// $Id: OS_NS_netdb.inl 93597 2011-03-21 12:54:52Z johnnyw $
+// $Id: OS_NS_netdb.inl 97130 2013-05-13 17:36:26Z mesnier_p $
 
 #include "ace/OS_NS_macros.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_errno.h"
 
 #if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && !defined (HPUX_11)
 #   define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \
   do \
   { \
@@ -25,7 +25,7 @@
         return ace_result_; \
       } \
   } while(0)
-# else /* ! (ACE_MT_SAFE && ACE_MT_SAFE != 0) */
+# else /* ! (ACE_MT_SAFE && ACE_MT_SAFE != 0 && !HPUX_11) */
 #   define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \
   do \
   { \
diff --git a/dep/acelite/ace/OS_NS_signal.cpp b/dep/acelite/ace/OS_NS_signal.cpp
index e4690ce34..c7c3d85dc 100644
--- a/dep/acelite/ace/OS_NS_signal.cpp
+++ b/dep/acelite/ace/OS_NS_signal.cpp
@@ -1,4 +1,4 @@
-// $Id: OS_NS_signal.cpp 91809 2010-09-17 07:20:41Z johnnyw $
+// $Id: OS_NS_signal.cpp 97246 2013-08-07 07:10:20Z johnnyw $
 
 #include "ace/OS_NS_signal.h"
 
@@ -8,17 +8,7 @@
 
 #if !defined (ACE_HAS_SIGINFO_T)
 siginfo_t::siginfo_t (ACE_HANDLE handle)
-  : si_handle_ (handle),
-    si_handles_ (&handle)
-{
-}
-
-siginfo_t::siginfo_t (ACE_HANDLE *handles)
-  : si_handle_ (handles[0]),
-    si_handles_ (handles)
+  : si_handle_ (handle)
 {
 }
 #endif /* ACE_HAS_SIGINFO_T */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/OS_NS_signal.h b/dep/acelite/ace/OS_NS_signal.h
index 123011f1e..07c3c516a 100644
--- a/dep/acelite/ace/OS_NS_signal.h
+++ b/dep/acelite/ace/OS_NS_signal.h
@@ -4,7 +4,7 @@
 /**
  *  @file   OS_NS_signal.h
  *
- *  $Id: OS_NS_signal.h 93481 2011-03-04 14:59:09Z olli $
+ *  $Id: OS_NS_signal.h 97246 2013-08-07 07:10:20Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
@@ -129,13 +129,9 @@ inline int ace_sigsuspend_helper (const sigset_t *s)
 struct ACE_Export siginfo_t
 {
   siginfo_t (ACE_HANDLE handle);
-  siginfo_t (ACE_HANDLE *handles);      // JCEJ 12/23/96
 
   /// Win32 HANDLE that has become signaled.
   ACE_HANDLE si_handle_;
-
-  /// Array of Win32 HANDLEs all of which have become signaled.
-  ACE_HANDLE *si_handles_;
 };
 # endif /* ACE_HAS_SIGINFO_T */
 
diff --git a/dep/acelite/ace/OS_NS_stdio.cpp b/dep/acelite/ace/OS_NS_stdio.cpp
index 7ecebf1e3..76ade88cc 100644
--- a/dep/acelite/ace/OS_NS_stdio.cpp
+++ b/dep/acelite/ace/OS_NS_stdio.cpp
@@ -1,4 +1,4 @@
-// $Id: OS_NS_stdio.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: OS_NS_stdio.cpp 97246 2013-08-07 07:10:20Z johnnyw $
 
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_Thread.h"
@@ -37,36 +37,41 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID)
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+namespace ACE_OS
+{
+
 void
-ACE_OS::ace_flock_t::dump (void) const
+ace_flock_t::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_OS_TRACE ("ACE_OS::ace_flock_t::dump");
 
 # if 0
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %u"), this->handle_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %u"), this->handle_));
 #   if defined (ACE_WIN32)
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nInternal = %d"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nInternal = %d"),
               this->overlapped_.Internal));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nInternalHigh = %d"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nInternalHigh = %d"),
               this->overlapped_.InternalHigh));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nOffsetHigh = %d"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nOffsetHigh = %d"),
               this->overlapped_.OffsetHigh));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhEvent = %d"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhEvent = %d"),
               this->overlapped_.hEvent));
 #   else
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_whence = %d"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_whence = %d"),
               this->lock_.l_whence));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_start = %d"), this->lock_.l_start));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_len = %d"), this->lock_.l_len));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_type = %d"), this->lock_.l_type));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_start = %d"), this->lock_.l_start));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_len = %d"), this->lock_.l_len));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_type = %d"), this->lock_.l_type));
 #   endif /* ACE_WIN32 */
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 # endif /* 0 */
 #endif /* ACE_HAS_DUMP */
 }
 
+} /* namespace ACE_OS */
+
 /*****************************************************************************/
 
 
diff --git a/dep/acelite/ace/OS_NS_stdio.h b/dep/acelite/ace/OS_NS_stdio.h
index bbb30ca82..ba8faabdf 100644
--- a/dep/acelite/ace/OS_NS_stdio.h
+++ b/dep/acelite/ace/OS_NS_stdio.h
@@ -4,7 +4,7 @@
 /**
  *  @file   OS_NS_stdio.h
  *
- *  $Id: OS_NS_stdio.h 93500 2011-03-07 16:19:27Z vzykov $
+ *  $Id: OS_NS_stdio.h 97921 2014-10-10 21:58:31Z shuston $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
@@ -27,6 +27,7 @@
 
 #include "ace/os_include/os_stdio.h"
 #include "ace/os_include/os_fcntl.h"
+#include "ace/os_include/os_inttypes.h"
 #include /**/ "ace/ACE_export.h"
 
 /* OPENVMS needs unistd for cuserid() */
@@ -117,7 +118,7 @@ inline ACE_HANDLE ace_fileno_helper (FILE *fp)
   return (ACE_HANDLE)fileno (fp);
 # undef fileno
 # else
-  return (ACE_HANDLE)ACE_STD_NAMESPACE::fileno (fp);
+  return (ACE_HANDLE)(intptr_t)ACE_STD_NAMESPACE::fileno (fp);
 # endif /* defined (fileno) */
 }
 #endif /* !ACE_FILENO_EQUIVALENT */
@@ -488,15 +489,17 @@ namespace ACE_OS {
   int sprintf (wchar_t *buf, const wchar_t *format, ...);
 # endif /* ACE_HAS_WCHAR */
 
+# if !defined (ACE_DISABLE_TEMPNAM)
   ACE_NAMESPACE_INLINE_FUNCTION
   char *tempnam (const char *dir = 0,
                  const char *pfx = 0);
 
-#if defined (ACE_HAS_WCHAR)
+#   if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *tempnam (const wchar_t *dir,
                     const wchar_t *pfx = 0);
-#endif /* ACE_HAS_WCHAR */
+#   endif /* ACE_HAS_WCHAR */
+# endif /* !ACE_DISABLE_TEMPNAM */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int vasprintf (char **bufp, const char *format, va_list argptr)
diff --git a/dep/acelite/ace/OS_NS_stdio.inl b/dep/acelite/ace/OS_NS_stdio.inl
index 22bd1fbe1..c766b0881 100644
--- a/dep/acelite/ace/OS_NS_stdio.inl
+++ b/dep/acelite/ace/OS_NS_stdio.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: OS_NS_stdio.inl 92182 2010-10-08 08:21:27Z olli $
+// $Id: OS_NS_stdio.inl 97921 2014-10-10 21:58:31Z shuston $
 
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_stdlib.h"
@@ -583,7 +583,7 @@ ACE_INLINE ACE_HANDLE
 ACE_OS::fileno (FILE *stream)
 {
 #if defined ACE_FILENO_EQUIVALENT
-  return (ACE_HANDLE)ACE_FILENO_EQUIVALENT (stream);
+  return (ACE_HANDLE)((intptr_t)ACE_FILENO_EQUIVALENT (stream));
 #else
   return ace_fileno_helper (stream);
 #endif
@@ -873,6 +873,7 @@ ACE_OS::rewind (FILE *fp)
 #endif /* ACE_HAS_WINCE */
 }
 
+#if !defined (ACE_DISABLE_TEMPNAM)
 ACE_INLINE char *
 ACE_OS::tempnam (const char *dir, const char *pfx)
 {
@@ -924,6 +925,7 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx)
 #endif /* ACE_LACKS_TEMPNAM */
 }
 #endif /* ACE_HAS_WCHAR */
+#endif /* !ACE_DISABLE_TEMPNAM */
 
 ACE_INLINE int
 ACE_OS::vasprintf (char **bufp, const char* format, va_list argptr)
@@ -1014,6 +1016,12 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
   // ACE_OS::snprintf().
   return vswprintf (buffer, 4096, format, argptr);
 
+# elif defined (__MINGW64_VERSION_MAJOR) && !defined (WIN64)
+  // the MingW64 32bit version causes link errors when using the
+  // 'standard' vswprint(). Luckily they have a mingw special.
+
+  return __mingw_vswprintf (buffer, format, argptr);
+
 # elif defined (ACE_WIN32)
   // Windows has vswprintf, but the pre-VC8 signature is from the older
   // ISO C standard. Also see ACE_OS::snprintf() for more info on this.
@@ -1035,14 +1043,7 @@ ACE_OS::vsnprintf (char *buffer, size_t maxlen, const char *format, va_list ap)
 {
 #if !defined (ACE_LACKS_VSNPRINTF)
   int result;
-#  if 0 /* defined (ACE_HAS_TR24731_2005_CRT) */
-  // _vsnprintf_s() doesn't report the length needed when it truncates. This
-  // info is needed and relied on by others things in ACE+TAO, so don't use
-  // this. There's adequate protection via the maxlen.
-  result = _vsnprintf_s (buffer, maxlen, _TRUNCATE, format, ap);
-#  elif !defined (ACE_WIN32)
-  result = ::vsnprintf (buffer, maxlen, format, ap);
-#  else
+# if defined (ACE_WIN32) && !defined (ACE_HAS_C99_VSNPRINTF)
   result = ::_vsnprintf (buffer, maxlen, format, ap);
 
   // Win32 doesn't regard a full buffer with no 0-terminate as an overrun.
@@ -1052,6 +1053,8 @@ ACE_OS::vsnprintf (char *buffer, size_t maxlen, const char *format, va_list ap)
   // Win32 doesn't 0-terminate the string if it overruns maxlen.
   if (result == -1 && maxlen > 0)
     buffer[maxlen-1] = '\0';
+# else
+  result = ::vsnprintf (buffer, maxlen, format, ap);
 # endif
   // In out-of-range conditions, C99 defines vsnprintf() to return the number
   // of characters that would have been written if enough space was available.
@@ -1087,7 +1090,7 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis
 
   int result;
 
-# if defined (ACE_WIN32)
+# if defined (ACE_WIN32) && !defined (ACE_HAS_C99_VSNWPRINTF)
   // Microsoft's vswprintf() doesn't have the maxlen argument that
   // XPG4/UNIX98 define. They do, however, recommend use of _vsnwprintf()
   // as a substitute, which does have the same signature as the UNIX98 one.
@@ -1109,19 +1112,18 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis
   // was available.  Earlier variants of the vsnprintf() (e.g. UNIX98)
   // defined it to return -1. This method follows the C99 standard,
   // but needs to guess at the value; uses maxlen + 1.
-  if (result == -1)
+  // Note that a formatting failure also returns -1. On RHEL this is
+  // errno EINVAL. Don't indicate a simple memory shortage for that.
+  if (result == -1 && errno != EINVAL)
     result = static_cast <int> (maxlen + 1);
 
   return result;
-
 # else
-
   ACE_UNUSED_ARG (buffer);
   ACE_UNUSED_ARG (maxlen);
   ACE_UNUSED_ARG (format);
   ACE_UNUSED_ARG (ap);
   ACE_NOTSUP_RETURN (-1);
-
 # endif /* platforms with a variant of vswprintf */
 }
 #endif /* ACE_HAS_WCHAR */
diff --git a/dep/acelite/ace/OS_NS_stdlib.cpp b/dep/acelite/ace/OS_NS_stdlib.cpp
index c9ce0fe66..2b19794b3 100644
--- a/dep/acelite/ace/OS_NS_stdlib.cpp
+++ b/dep/acelite/ace/OS_NS_stdlib.cpp
@@ -1,4 +1,4 @@
-// $Id: OS_NS_stdlib.cpp 96017 2012-08-08 22:18:09Z mitza $
+// $Id: OS_NS_stdlib.cpp 97921 2014-10-10 21:58:31Z shuston $
 
 #include "ace/OS_NS_stdlib.h"
 
@@ -277,7 +277,7 @@ ACE_OS::malloc (size_t nbytes)
   return ACE_MALLOC_FUNC (nbytes);
 }
 
-#if defined (ACE_LACKS_MKTEMP)
+#if defined (ACE_LACKS_MKTEMP) && !defined (ACE_DISBALE_MKTEMP)
 ACE_TCHAR *
 ACE_OS::mktemp (ACE_TCHAR *s)
 {
@@ -325,7 +325,7 @@ ACE_OS::mktemp (ACE_TCHAR *s)
       return s;
     }
 }
-#endif /* ACE_LACKS_MKTEMP */
+#endif /* ACE_LACKS_MKTEMP &7 !ACE_DISABLE_MKTEMP */
 
 void *
 ACE_OS::realloc (void *ptr, size_t nbytes)
@@ -510,11 +510,11 @@ ACE_OS::realpath (const char *file_name,
 long
 ACE_OS::strtol_emulation (const char *nptr, char **endptr, int base)
 {
-  register const char *s = nptr;
-  register unsigned long acc;
-  register int c;
-  register unsigned long cutoff;
-  register int neg = 0, any, cutlim;
+  ACE_REGISTER const char *s = nptr;
+  ACE_REGISTER unsigned long acc;
+  ACE_REGISTER int c;
+  ACE_REGISTER unsigned long cutoff;
+  ACE_REGISTER int neg = 0, any, cutlim;
 
   /*
    * Skip white space and pick up leading +/- sign if any.
@@ -592,11 +592,11 @@ ACE_OS::wcstol_emulation (const wchar_t *nptr,
         wchar_t **endptr,
         int base)
 {
-  register const wchar_t *s = nptr;
-  register unsigned long acc;
-  register int c;
-  register unsigned long cutoff;
-  register int neg = 0, any, cutlim;
+  ACE_REGISTER const wchar_t *s = nptr;
+  ACE_REGISTER unsigned long acc;
+  ACE_REGISTER int c;
+  ACE_REGISTER unsigned long cutoff;
+  ACE_REGISTER int neg = 0, any, cutlim;
 
   /*
    * Skip white space and pick up leading +/- sign if any.
@@ -658,13 +658,13 @@ ACE_OS::wcstol_emulation (const wchar_t *nptr,
 unsigned long
 ACE_OS::strtoul_emulation (const char *nptr,
                            char **endptr,
-                           register int base)
+                           ACE_REGISTER int base)
 {
-  register const char *s = nptr;
-  register unsigned long acc;
-  register int c;
-  register unsigned long cutoff;
-  register int neg = 0, any, cutlim;
+  ACE_REGISTER const char *s = nptr;
+  ACE_REGISTER unsigned long acc;
+  ACE_REGISTER int c;
+  ACE_REGISTER unsigned long cutoff;
+  ACE_REGISTER int neg = 0, any, cutlim;
 
   /*
    * See strtol for comments as to the logic used.
@@ -730,11 +730,11 @@ ACE_OS::wcstoul_emulation (const wchar_t *nptr,
          wchar_t **endptr,
          int base)
 {
-  register const wchar_t *s = nptr;
-  register unsigned long acc;
-  register int c;
-  register unsigned long cutoff;
-  register int neg = 0, any, cutlim;
+  ACE_REGISTER const wchar_t *s = nptr;
+  ACE_REGISTER unsigned long acc;
+  ACE_REGISTER int c;
+  ACE_REGISTER unsigned long cutoff;
+  ACE_REGISTER int neg = 0, any, cutlim;
 
   /*
    * See strtol for comments as to the logic used.
@@ -797,13 +797,13 @@ ACE_OS::wcstoul_emulation (const wchar_t *nptr,
 ACE_INT64
 ACE_OS::strtoll_emulation (const char *nptr,
          char **endptr,
-         register int base)
+         ACE_REGISTER int base)
 {
-  register const char *s = nptr;
-  register ACE_UINT64 acc;
-  register int c;
-  register ACE_UINT64 cutoff;
-  register int neg = 0, any, cutlim;
+  ACE_REGISTER const char *s = nptr;
+  ACE_REGISTER ACE_UINT64 acc;
+  ACE_REGISTER int c;
+  ACE_REGISTER ACE_UINT64 cutoff;
+  ACE_REGISTER int neg = 0, any, cutlim;
 
   /*
    * Skip white space and pick up leading +/- sign if any.
@@ -867,11 +867,11 @@ ACE_OS::wcstoll_emulation (const wchar_t *nptr,
          wchar_t **endptr,
          int base)
 {
-  register const wchar_t *s = nptr;
-  register ACE_UINT64 acc;
-  register int c;
-  register ACE_UINT64 cutoff;
-  register int neg = 0, any, cutlim;
+  ACE_REGISTER const wchar_t *s = nptr;
+  ACE_REGISTER ACE_UINT64 acc;
+  ACE_REGISTER int c;
+  ACE_REGISTER ACE_UINT64 cutoff;
+  ACE_REGISTER int neg = 0, any, cutlim;
 
   /*
    * Skip white space and pick up leading +/- sign if any.
@@ -934,13 +934,13 @@ ACE_OS::wcstoll_emulation (const wchar_t *nptr,
 ACE_UINT64
 ACE_OS::strtoull_emulation (const char *nptr,
                             char **endptr,
-                            register int base)
+                            ACE_REGISTER int base)
 {
-  register const char *s = nptr;
-  register ACE_UINT64 acc;
-  register int c;
-  register ACE_UINT64 cutoff;
-  register int neg = 0, any, cutlim;
+  ACE_REGISTER const char *s = nptr;
+  ACE_REGISTER ACE_UINT64 acc;
+  ACE_REGISTER int c;
+  ACE_REGISTER ACE_UINT64 cutoff;
+  ACE_REGISTER int neg = 0, any, cutlim;
 
   /*
    * See strtol for comments as to the logic used.
@@ -1006,11 +1006,11 @@ ACE_OS::wcstoull_emulation (const wchar_t *nptr,
           wchar_t **endptr,
           int base)
 {
-  register const wchar_t *s = nptr;
-  register ACE_UINT64 acc;
-  register int c;
-  register ACE_UINT64 cutoff;
-  register int neg = 0, any, cutlim;
+  ACE_REGISTER const wchar_t *s = nptr;
+  ACE_REGISTER ACE_UINT64 acc;
+  ACE_REGISTER int c;
+  ACE_REGISTER ACE_UINT64 cutoff;
+  ACE_REGISTER int neg = 0, any, cutlim;
 
   /*
    * See strtol for comments as to the logic used.
diff --git a/dep/acelite/ace/OS_NS_stdlib.h b/dep/acelite/ace/OS_NS_stdlib.h
index 4a35fe9d8..ac02a585f 100644
--- a/dep/acelite/ace/OS_NS_stdlib.h
+++ b/dep/acelite/ace/OS_NS_stdlib.h
@@ -4,7 +4,7 @@
 /**
  *  @file   OS_NS_stdlib.h
  *
- *  $Id: OS_NS_stdlib.h 93571 2011-03-17 07:37:11Z olli $
+ *  $Id: OS_NS_stdlib.h 97921 2014-10-10 21:58:31Z shuston $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
@@ -231,18 +231,20 @@ namespace ACE_OS {
   ACE_HANDLE mkstemp_emulation (ACE_TCHAR * s);
 #endif /* ACE_LACKS_MKSTEMP */
 
-#if !defined (ACE_LACKS_MKTEMP)
+#if !defined (ACE_DISABLE_MKTEMP)
+#  if !defined (ACE_LACKS_MKTEMP)
   ACE_NAMESPACE_INLINE_FUNCTION
   char *mktemp (char *s);
 
-#  if defined (ACE_HAS_WCHAR)
+#    if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *mktemp (wchar_t *s);
-#  endif /* ACE_HAS_WCHAR */
-#else
+#    endif /* ACE_HAS_WCHAR */
+#  else
   extern ACE_Export
   ACE_TCHAR *mktemp (ACE_TCHAR *s);
-#endif /* !ACE_LACKS_MKTEMP */
+#  endif /* !ACE_LACKS_MKTEMP */
+#endif /* !ACE_DISABLE_MKTEMP */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int putenv (const char *string);
diff --git a/dep/acelite/ace/OS_NS_stdlib.inl b/dep/acelite/ace/OS_NS_stdlib.inl
index 65e005f9b..f65a9675c 100644
--- a/dep/acelite/ace/OS_NS_stdlib.inl
+++ b/dep/acelite/ace/OS_NS_stdlib.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: OS_NS_stdlib.inl 95761 2012-05-15 18:23:04Z johnnyw $
+// $Id: OS_NS_stdlib.inl 97921 2014-10-10 21:58:31Z shuston $
 
 #include "ace/config-all.h"           /* Need ACE_TRACE */
 #include "ace/Object_Manager_Base.h"
@@ -8,6 +8,9 @@
 #include "ace/Global_Macros.h"
 #include "ace/os_include/os_errno.h"
 #include "ace/os_include/os_search.h"
+#if defined (ACE_ANDROID) && (__ANDROID_API__ < 19)
+# include "ace/os_include/os_signal.h"
+#endif
 
 #if defined (ACE_WCHAR_IN_STD_NAMESPACE)
 # define ACE_WCHAR_STD_NAMESPACE std
@@ -35,7 +38,9 @@ ACE_OS::_exit (int status)
 ACE_INLINE void
 ACE_OS::abort (void)
 {
-#if !defined (ACE_LACKS_ABORT)
+#if defined (ACE_ANDROID) && (__ANDROID_API__ < 19)
+  ACE_OS::_exit (128 + SIGABRT);
+#elif !defined (ACE_LACKS_ABORT)
   ::abort ();
 #else
   exit (1);
@@ -267,24 +272,26 @@ ACE_OS::mkstemp (wchar_t *s)
 }
 #endif /* ACE_HAS_WCHAR */
 
-#if !defined (ACE_LACKS_MKTEMP)
+#if !defined (ACE_DISABLE_MKTEMP)
+
+#  if !defined (ACE_LACKS_MKTEMP)
 ACE_INLINE char *
 ACE_OS::mktemp (char *s)
 {
-# if defined (ACE_WIN32)
+#    if defined (ACE_WIN32)
   return ::_mktemp (s);
-# else /* ACE_WIN32 */
+#    else /* ACE_WIN32 */
   return ::mktemp (s);
-# endif /* ACE_WIN32 */
+#    endif /* ACE_WIN32 */
 }
 
-#  if defined (ACE_HAS_WCHAR)
+#    if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::mktemp (wchar_t *s)
 {
-#    if defined (ACE_WIN32)
+#      if defined (ACE_WIN32)
   return ::_wmktemp (s);
-#    else
+#      else
   // For narrow-char filesystems, we must convert the wide-char input to
   // a narrow-char string for mktemp (), then convert the name back to
   // wide-char for the caller.
@@ -294,11 +301,12 @@ ACE_OS::mktemp (wchar_t *s)
   ACE_Ascii_To_Wide wide_s (narrow_s.char_rep ());
   ACE_OS::strcpy (s, wide_s.wchar_rep ());
   return s;
-#    endif
+#      endif
 }
 #  endif /* ACE_HAS_WCHAR */
 
-#endif /* !ACE_LACKS_MKTEMP */
+#  endif /* !ACE_LACKS_MKTEMP */
+#endif /* !ACE_DISABLE_MKTEMP */
 
 ACE_INLINE int
 ACE_OS::putenv (const char *string)
diff --git a/dep/acelite/ace/OS_NS_string.cpp b/dep/acelite/ace/OS_NS_string.cpp
index 067bb1c66..d63cd9f36 100644
--- a/dep/acelite/ace/OS_NS_string.cpp
+++ b/dep/acelite/ace/OS_NS_string.cpp
@@ -1,6 +1,7 @@
-// $Id: OS_NS_string.cpp 93549 2011-03-15 19:50:24Z olli $
+// $Id: OS_NS_string.cpp 97884 2014-09-08 18:00:53Z johnnyw $
 
 #include "ace/ACE.h"
+#include "ace/Global_Macros.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_stdlib.h"
@@ -61,8 +62,8 @@ ACE_OS::strdup_emulation (const wchar_t *s)
 char *
 ACE_OS::strecpy (char *s, const char *t)
 {
-  register char *dscan = s;
-  register const char *sscan = t;
+  ACE_REGISTER char *dscan = s;
+  ACE_REGISTER const char *sscan = t;
 
   while ((*dscan++ = *sscan++) != '\0')
     continue;
@@ -74,8 +75,8 @@ ACE_OS::strecpy (char *s, const char *t)
 wchar_t *
 ACE_OS::strecpy (wchar_t *s, const wchar_t *t)
 {
-  register wchar_t *dscan = s;
-  register const wchar_t *sscan = t;
+  ACE_REGISTER wchar_t *dscan = s;
+  ACE_REGISTER const wchar_t *sscan = t;
 
   while ((*dscan++ = *sscan++) != ACE_TEXT_WIDE ('\0'))
     continue;
@@ -319,9 +320,9 @@ ACE_OS::strrchr_emulation (const char *s, int c)
 char *
 ACE_OS::strsncpy (char *dst, const char *src, size_t maxlen)
 {
-  register char *rdst = dst;
-  register const char *rsrc = src;
-  register size_t rmaxlen = maxlen;
+  ACE_REGISTER char *rdst = dst;
+  ACE_REGISTER const char *rsrc = src;
+  ACE_REGISTER size_t rmaxlen = maxlen;
 
   if (rmaxlen > 0)
     {
@@ -345,9 +346,9 @@ ACE_OS::strsncpy (char *dst, const char *src, size_t maxlen)
 ACE_WCHAR_T *
 ACE_OS::strsncpy (ACE_WCHAR_T *dst, const ACE_WCHAR_T *src, size_t maxlen)
 {
-  register ACE_WCHAR_T *rdst = dst;
-  register const ACE_WCHAR_T *rsrc = src;
-  register size_t rmaxlen = maxlen;
+  ACE_REGISTER ACE_WCHAR_T *rdst = dst;
+  ACE_REGISTER const ACE_WCHAR_T *rsrc = src;
+  ACE_REGISTER size_t rmaxlen = maxlen;
 
   if (rmaxlen > 0)
     {
diff --git a/dep/acelite/ace/OS_NS_sys_mman.inl b/dep/acelite/ace/OS_NS_sys_mman.inl
index 2e9460b50..da823032f 100644
--- a/dep/acelite/ace/OS_NS_sys_mman.inl
+++ b/dep/acelite/ace/OS_NS_sys_mman.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: OS_NS_sys_mman.inl 92464 2010-11-01 14:58:30Z mitza $
+// $Id: OS_NS_sys_mman.inl 97286 2013-08-12 18:11:28Z johnnyw $
 
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
@@ -106,7 +106,7 @@ ACE_OS::mmap (void *addr,
       const DWORD len_low = static_cast<DWORD>(len),
         len_high = static_cast<DWORD>(len >> 32);
 #  else
-      const DWORD len_low = len, len_high = 0;
+      const DWORD len_low = static_cast<DWORD>(len), len_high = 0;
 #  endif
 
       *file_mapping = ACE_TEXT_CreateFileMapping (file_handle,
diff --git a/dep/acelite/ace/OS_NS_sys_shm.cpp b/dep/acelite/ace/OS_NS_sys_shm.cpp
index 3ceebcb68..eba6ee239 100644
--- a/dep/acelite/ace/OS_NS_sys_shm.cpp
+++ b/dep/acelite/ace/OS_NS_sys_shm.cpp
@@ -1,9 +1,7 @@
-// $Id: OS_NS_sys_shm.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: OS_NS_sys_shm.cpp 96519 2012-12-17 10:00:00Z johnnyw $
 
 #include "ace/OS_NS_sys_shm.h"
 
-
-
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_NS_sys_shm.inl"
 #endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/dep/acelite/ace/OS_NS_sys_socket.cpp b/dep/acelite/ace/OS_NS_sys_socket.cpp
index 8e64d6635..eb0159cba 100644
--- a/dep/acelite/ace/OS_NS_sys_socket.cpp
+++ b/dep/acelite/ace/OS_NS_sys_socket.cpp
@@ -1,9 +1,7 @@
-// $Id: OS_NS_sys_socket.cpp 93822 2011-04-08 21:56:45Z mesnier_p $
+// $Id: OS_NS_sys_socket.cpp 96519 2012-12-17 10:00:00Z johnnyw $
 
 #include "ace/OS_NS_sys_socket.h"
 
-
-
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_NS_sys_socket.inl"
 #endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/dep/acelite/ace/OS_NS_sys_socket.inl b/dep/acelite/ace/OS_NS_sys_socket.inl
index c4ca35820..ce200bb37 100644
--- a/dep/acelite/ace/OS_NS_sys_socket.inl
+++ b/dep/acelite/ace/OS_NS_sys_socket.inl
@@ -1,6 +1,5 @@
 // -*- C++ -*-
-//
-// $Id: OS_NS_sys_socket.inl 95533 2012-02-14 22:59:17Z wotte $
+// $Id: OS_NS_sys_socket.inl 97938 2014-10-27 07:56:26Z johnnyw $
 
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_macros.h"
@@ -57,7 +56,11 @@ ACE_OS::accept (ACE_HANDLE handle,
   // Apparently some platforms like VxWorks can't correctly deal with
   // a NULL addr.
 
+#    if defined (ACE_HAS_IPV6)
+   sockaddr_in6 fake_addr;
+#    else
    sockaddr_in fake_addr;
+#    endif /* ACE_HAS_IPV6 */
    int fake_addrlen;
 
    if (addrlen == 0)
@@ -866,27 +869,6 @@ ACE_OS::setsockopt (ACE_HANDLE handle,
   ACE_UNUSED_ARG (optlen);
   ACE_NOTSUP_RETURN (-1);
 #else
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && defined(SO_REUSEPORT)
-  // To work around an inconsistency with Microsofts implementation of
-  // sockets, we will check for SO_REUSEADDR, and ignore it. Winsock
-  // always behaves as if SO_REUSEADDR=1. Some implementations have
-  // the same behaviour as Winsock, but use a new name for
-  // it. SO_REUSEPORT.  If you want the normal behaviour for
-  // SO_REUSEADDR=0, then NT 4 sp4 and later supports
-  // SO_EXCLUSIVEADDRUSE. This also requires using an updated Platform
-  // SDK so it was decided to ignore the option for now. (Especially
-  // since Windows always sets SO_REUSEADDR=1, which we can mimic by doing
-  // nothing.)
-  if (level == SOL_SOCKET) {
-    if (optname == SO_REUSEADDR) {
-      return 0; // Not supported by Winsock
-    }
-    if (optname == SO_REUSEPORT) {
-      optname = SO_REUSEADDR;
-    }
-  }
-#endif /*ACE_HAS_WINSOCK2*/
-
   int result;
   ACE_SOCKCALL (::setsockopt ((ACE_SOCKET) handle,
                               level,
diff --git a/dep/acelite/ace/OS_NS_sys_stat.cpp b/dep/acelite/ace/OS_NS_sys_stat.cpp
index ad43dd67c..ed372a046 100644
--- a/dep/acelite/ace/OS_NS_sys_stat.cpp
+++ b/dep/acelite/ace/OS_NS_sys_stat.cpp
@@ -1,9 +1,7 @@
-// $Id: OS_NS_sys_stat.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: OS_NS_sys_stat.cpp 96519 2012-12-17 10:00:00Z johnnyw $
 
 #include "ace/OS_NS_sys_stat.h"
 
-
-
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_NS_sys_stat.inl"
 #endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/dep/acelite/ace/OS_NS_sys_stat.inl b/dep/acelite/ace/OS_NS_sys_stat.inl
index 21ab6ed73..c868a0ed2 100644
--- a/dep/acelite/ace/OS_NS_sys_stat.inl
+++ b/dep/acelite/ace/OS_NS_sys_stat.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: OS_NS_sys_stat.inl 84373 2009-02-10 18:21:50Z johnnyw $
+// $Id: OS_NS_sys_stat.inl 96943 2013-03-30 09:42:31Z mcorino $
 
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
@@ -262,7 +262,7 @@ namespace ACE_OS
     return 0;
 #elif defined (__BORLANDC__) \
       || defined (_MSC_VER) \
-      || defined (__MINGW32__)
+      || (defined (__MINGW32__) && !defined (__MINGW64_VERSION_MAJOR))
     ACE_OSCALL_RETURN (ACE_WSTAT_FUNC_NAME (file, stp), int, -1);
 #else /* ACE_HAS_WINCE */
     ACE_Wide_To_Ascii nfile (file);
diff --git a/dep/acelite/ace/OS_NS_sys_uio.cpp b/dep/acelite/ace/OS_NS_sys_uio.cpp
index 1b26f17d2..ef8ae318f 100644
--- a/dep/acelite/ace/OS_NS_sys_uio.cpp
+++ b/dep/acelite/ace/OS_NS_sys_uio.cpp
@@ -1,9 +1,7 @@
-// $Id: OS_NS_sys_uio.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: OS_NS_sys_uio.cpp 96519 2012-12-17 10:00:00Z johnnyw $
 
 #include "ace/OS_NS_sys_uio.h"
 
-
-
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_NS_sys_uio.inl"
 #endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/dep/acelite/ace/OS_NS_time.inl b/dep/acelite/ace/OS_NS_time.inl
index 0d99bb880..1c2673f16 100644
--- a/dep/acelite/ace/OS_NS_time.inl
+++ b/dep/acelite/ace/OS_NS_time.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: OS_NS_time.inl 95763 2012-05-16 06:43:51Z johnnyw $
+// $Id: OS_NS_time.inl 97769 2014-06-05 06:37:53Z johnnyw $
 
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_errno.h"
@@ -374,7 +374,7 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res)
   ACE_OS_TRACE ("ACE_OS::gmtime_r");
 #if defined (ACE_HAS_REENTRANT_FUNCTIONS)
   ACE_OSCALL_RETURN (::gmtime_r (t, res), struct tm *, 0);
-#elif defined (ACE_HAS_TR24731_2005_CRT)
+#elif defined (ACE_HAS_TR24731_2005_CRT) && !defined (ACE_WIN32_VC14)
   struct tm *tm_p = res;
   ACE_SECURECRTCALL (gmtime_s (res, t), struct tm *, 0, tm_p);
   return tm_p;
diff --git a/dep/acelite/ace/OS_NS_unistd.cpp b/dep/acelite/ace/OS_NS_unistd.cpp
index 1d2b56a35..d028b0bb1 100644
--- a/dep/acelite/ace/OS_NS_unistd.cpp
+++ b/dep/acelite/ace/OS_NS_unistd.cpp
@@ -1,4 +1,4 @@
-// $Id: OS_NS_unistd.cpp 94448 2011-09-08 08:20:29Z johnnyw $
+// $Id: OS_NS_unistd.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/OS_NS_unistd.h"
 
@@ -344,7 +344,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
           if (ACE_OS::execv (argv[0], argv) == -1)
             {
               // The OS layer should not print stuff out
-              // ACE_ERROR ((LM_ERROR,
+              // ACELIB_ERROR ((LM_ERROR,
               //             "%p Exec failed\n"));
 
               // If the execv fails, this child needs to exit.
diff --git a/dep/acelite/ace/OS_NS_unistd.inl b/dep/acelite/ace/OS_NS_unistd.inl
index cf23b8322..64f929938 100644
--- a/dep/acelite/ace/OS_NS_unistd.inl
+++ b/dep/acelite/ace/OS_NS_unistd.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: OS_NS_unistd.inl 96017 2012-08-08 22:18:09Z mitza $
+// $Id: OS_NS_unistd.inl 97304 2013-08-29 21:14:43Z shuston $
 
 #include "ace/OS_NS_sys_utsname.h"
 #include "ace/OS_NS_string.h"
@@ -498,7 +498,7 @@ ACE_OS::getpid (void)
 #elif defined (ACE_WIN32)
   return ::GetCurrentProcessId ();
 #else
-  ACE_OSCALL_RETURN (::getpid (), int, -1);
+  ACE_OSCALL_RETURN (::getpid (), pid_t, -1);
 #endif /* ACE_LACKS_GETPID */
 }
 
@@ -1009,7 +1009,12 @@ ACE_OS::swab (const void *src,
   const char *tmp = static_cast<const char*> (src);
   char *from = const_cast<char *> (tmp);
   char *to = static_cast<char *> (dest);
+#  if defined (ACE_HAS_INT_SWAB)
+  int ilength = ACE_Utils::truncate_cast<int> (length);
+  ::swab (from, to, ilength);
+#  else
   ::swab (from, to, length);
+#  endif /* ACE_HAS_INT_SWAB */
 #elif defined (ACE_HAS_CONST_CHAR_SWAB)
   const char *from = static_cast<const char*> (src);
   char *to = static_cast<char *> (dest);
diff --git a/dep/acelite/ace/OS_main.cpp b/dep/acelite/ace/OS_main.cpp
index 982effa1f..6bff13af4 100644
--- a/dep/acelite/ace/OS_main.cpp
+++ b/dep/acelite/ace/OS_main.cpp
@@ -1,9 +1,7 @@
-// $Id: OS_main.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: OS_main.cpp 97431 2013-11-19 14:28:52Z johnnyw $
 
 #include "ace/OS_main.h"
 
-
-
 #if !defined (ACE_DOESNT_DEFINE_MAIN)
 
 #if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
diff --git a/dep/acelite/ace/Obchunk.cpp b/dep/acelite/ace/Obchunk.cpp
index 98b33e524..137c548d7 100644
--- a/dep/acelite/ace/Obchunk.cpp
+++ b/dep/acelite/ace/Obchunk.cpp
@@ -1,4 +1,4 @@
-// $Id: Obchunk.cpp 92580 2010-11-15 09:48:02Z johnnyw $
+// $Id: Obchunk.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Obchunk.h"
 
@@ -16,10 +16,10 @@ ACE_Obchunk::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Obchunk::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("end_ = %x\n"), this->end_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("cur_ = %x\n"), this->cur_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("end_ = %x\n"), this->end_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("cur_ = %x\n"), this->cur_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Obchunk.h b/dep/acelite/ace/Obchunk.h
index b76a7f7e3..07b3abae8 100644
--- a/dep/acelite/ace/Obchunk.h
+++ b/dep/acelite/ace/Obchunk.h
@@ -4,13 +4,12 @@
 /**
  *  @file    Obchunk.h
  *
- *  $Id: Obchunk.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: Obchunk.h 96230 2012-11-06 22:18:13Z schmidt $
  *
  *  @author Doug Schmidt
  */
 //=============================================================================
 
-
 #ifndef ACE_OBCHUNK_H
 #define ACE_OBCHUNK_H
 #include /**/ "ace/pre.h"
diff --git a/dep/acelite/ace/Object_Manager.cpp b/dep/acelite/ace/Object_Manager.cpp
index 92ef37f4f..012df81ff 100644
--- a/dep/acelite/ace/Object_Manager.cpp
+++ b/dep/acelite/ace/Object_Manager.cpp
@@ -1,4 +1,4 @@
-// $Id: Object_Manager.cpp 93159 2011-01-25 10:52:44Z mcorino $
+// $Id: Object_Manager.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Object_Manager.h"
 #if !defined (ACE_LACKS_ACE_TOKEN)
@@ -10,7 +10,7 @@
 #  include "ace/Service_Config.h"
 #endif /* ! ACE_LACKS_ACE_SVCCONF */
 #include "ace/Signal.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Malloc.h"
 #include "ace/Sig_Adapter.h"
 #include "ace/Framework_Component.h"
@@ -170,9 +170,9 @@ LONG _stdcall ACE_UnhandledExceptionFilter (PEXCEPTION_POINTERS pExceptionInfo)
   DWORD dwExceptionCode = pExceptionInfo->ExceptionRecord->ExceptionCode;
 
   if (dwExceptionCode == EXCEPTION_ACCESS_VIOLATION)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("\nERROR: ACCESS VIOLATION\n")));
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("\nERROR: ACCESS VIOLATION\n")));
   else
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("\nERROR: UNHANDLED EXCEPTION\n")));
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("\nERROR: UNHANDLED EXCEPTION\n")));
 
   return EXCEPTION_EXECUTE_HANDLER;
 }
diff --git a/dep/acelite/ace/Object_Manager_Base.h b/dep/acelite/ace/Object_Manager_Base.h
index 66df51d96..a613f3c63 100644
--- a/dep/acelite/ace/Object_Manager_Base.h
+++ b/dep/acelite/ace/Object_Manager_Base.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Object_Manager_Base.h
  *
- *  $Id: Object_Manager_Base.h 84163 2009-01-15 07:57:27Z johnnyw $
+ *  $Id: Object_Manager_Base.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
@@ -18,7 +18,7 @@
 #define ACE_OBJECT_MANAGER_BASE_H
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/Obstack.cpp b/dep/acelite/ace/Obstack.cpp
new file mode 100644
index 000000000..fefb5cf96
--- /dev/null
+++ b/dep/acelite/ace/Obstack.cpp
@@ -0,0 +1,10 @@
+// -*- C++ -*-
+// $Id: Obstack.cpp 97400 2013-10-31 10:44:50Z mhengstmengel $
+
+#include "ace/Obstack.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_SINGLETON_TEMPLATE_INSTANTIATION(ACE_Obstack_T <char>;);
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Obstack_T.cpp b/dep/acelite/ace/Obstack_T.cpp
index 65e07167a..5dc36ac9e 100644
--- a/dep/acelite/ace/Obstack_T.cpp
+++ b/dep/acelite/ace/Obstack_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Obstack_T.cpp 88793 2010-02-01 17:50:34Z cleeland $
+// $Id: Obstack_T.cpp 97400 2013-10-31 10:44:50Z mhengstmengel $
 
 #ifndef ACE_OBSTACK_T_CPP
 #define ACE_OBSTACK_T_CPP
@@ -25,11 +25,11 @@ ACE_Obstack_T<ACE_CHAR_T>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("size_ = %d\n"), this->size_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("head_ = %x\n"), this->head_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("curr_ = %x\n"), this->curr_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("size_ = %d\n"), this->size_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("head_ = %x\n"), this->head_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("curr_ = %x\n"), this->curr_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -54,8 +54,8 @@ ACE_Obstack_T<ACE_CHAR_T>::request (size_t len)
   // chunk or will need a new one.
   if (this->curr_->cur_ + len >= this->curr_->end_)
     {
-      // Need a new chunk. Save the current one so the current string can be
-      // copied to the new chunk.
+      // Need a new chunk. Save the current one so the current string
+      // can be copied to the new chunk.
       ACE_Obchunk *temp = this->curr_;
       if (this->curr_->next_ == 0)
         {
@@ -122,7 +122,7 @@ ACE_Obstack_T<ACE_CHAR_T>::new_chunk (void)
 
 template <class ACE_CHAR_T>
 ACE_Obstack_T<ACE_CHAR_T>::ACE_Obstack_T (size_t size,
-                                    ACE_Allocator *allocator_strategy)
+                                          ACE_Allocator *allocator_strategy)
   : allocator_strategy_ (allocator_strategy),
     size_ (size),
     head_ (0),
@@ -156,7 +156,7 @@ ACE_Obstack_T<ACE_CHAR_T>::~ACE_Obstack_T (void)
 
 template <class ACE_CHAR_T> ACE_CHAR_T *
 ACE_Obstack_T<ACE_CHAR_T>::copy (const ACE_CHAR_T *s,
-                           size_t len)
+                                 size_t len)
 {
   ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::copy");
 
@@ -190,7 +190,7 @@ ACE_Obstack_T<ACE_CHAR_T>::unwind_i (void* obj)
       this->curr_->block_ = this->curr_->cur_ = reinterpret_cast<char*> (obj);
     }
   else if (obj != 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("Deletion of non-existent object.\n%a")));
 }
 
diff --git a/dep/acelite/ace/Obstack_T.h b/dep/acelite/ace/Obstack_T.h
index f191934fd..f83817edc 100644
--- a/dep/acelite/ace/Obstack_T.h
+++ b/dep/acelite/ace/Obstack_T.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Obstack_T.h
  *
- *  $Id: Obstack_T.h 91688 2010-09-09 11:21:50Z johnnyw $
+ *  $Id: Obstack_T.h 96230 2012-11-06 22:18:13Z schmidt $
  *
  *  @author Doug Schmidt <schmidt@cs.wustl.edu>
  *  @author Nanbor Wang <nanbor@cs.wustl.edu>
@@ -47,11 +47,11 @@ public:
   /// a new string.  Return -1 if fail, 0 if success.
   int request (size_t len);
 
-  /// Inserting a new ACE_CHAR_T \a c into the current building
-  /// block without freezing (null terminating) the block.
-  /// This function will create new chunk by checking the
-  /// boundary of current Obchunk.  Return
-  /// the location \a c gets inserted to, or 0 if error.
+  /// Inserting a new ACE_CHAR_T \a c into the current building block
+  /// without freezing (null terminating) the block.  This function
+  /// will create new chunk by checking the boundary of current
+  /// Obchunk.  Return the location \a c gets inserted to, or 0 if
+  /// error.
   ACE_CHAR_T *grow (ACE_CHAR_T c);
 
   /// Inserting a new ACE_CHAR_T \a c into the current building
@@ -78,7 +78,7 @@ public:
   /// in the stack is released. Otherwise, @a obj must be an address of an
   /// object allocated in the stack. In this case, @a obj is released along
   /// with everthing allocated in the Obstack since @a obj.
-  void unwind (void* obj);
+  void unwind (void *obj);
 
   /// "Release" the entire stack of Obchunks, putting it back on the free
   /// list.
@@ -95,7 +95,7 @@ protected:
 
   /// Search through the list of Obchunks and release them. Helper funtion
   /// used by unwind.
-  void unwind_i (void* obj);
+  void unwind_i (void *obj);
 
   /// Pointer to the allocator used by this Obstack.
   ACE_Allocator *allocator_strategy_;
diff --git a/dep/acelite/ace/PI_Malloc.cpp b/dep/acelite/ace/PI_Malloc.cpp
index 471f4ed90..8c19fa75d 100644
--- a/dep/acelite/ace/PI_Malloc.cpp
+++ b/dep/acelite/ace/PI_Malloc.cpp
@@ -1,4 +1,4 @@
-// $Id: PI_Malloc.cpp 91287 2010-08-05 10:30:49Z johnnyw $
+// $Id: PI_Malloc.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_PI_MALLOC_CPP
 #define ACE_PI_MALLOC_CPP
@@ -23,10 +23,10 @@ ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_PI_Control_Block::ACE_Malloc_Header::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -35,8 +35,8 @@ ACE_PI_Control_Block::print_alignment_info (void)
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_PI_Control_Block::ACE_Control_Block::print_alignment_info");
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_PI_Control_Block::print_alignment_info:\n")));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_PI_Control_Block::print_alignment_info:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Sizeof ptr: %d\n")
               ACE_TEXT ("Sizeof size_t: %d\n")
               ACE_TEXT ("Sizeof long: %d\n")
@@ -62,7 +62,7 @@ ACE_PI_Control_Block::print_alignment_info (void)
               sizeof (ACE_Malloc_Header),
               sizeof (ACE_PI_Control_Block)
               ));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_PI_Control_Block::print_alignment_info:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_PI_Control_Block::print_alignment_info:\n")));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -72,24 +72,24 @@ ACE_PI_Control_Block::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_PI_Control_Block::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n")));
   for (ACE_Name_Node *nextn = this->name_head_;
        nextn != 0;
        nextn = nextn->next_)
     nextn->dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %x"), (ACE_Malloc_Header *) this->freep_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %x"), (ACE_Malloc_Header *) this->freep_));
   this->base_.dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n")));
   for (ACE_Malloc_Header *nexth = ((ACE_Malloc_Header *)this->freep_)->next_block_;
        nexth != 0 && nexth != &this->base_;
        nexth = nexth->next_block_)
     nexth->dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -144,15 +144,15 @@ ACE_PI_Control_Block::ACE_Name_Node::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("pointer = %x"), (const char *) this->pointer_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nnext_ = %x"), (ACE_Name_Node *) this->next_));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("pointer = %x"), (const char *) this->pointer_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("\nnext_ = %x"), (ACE_Name_Node *) this->next_));
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT("\nname_ = (%x, %s)"),
               (const char *) this->name_,
               (const char *) this->name_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/POSIX_Asynch_IO.cpp b/dep/acelite/ace/POSIX_Asynch_IO.cpp
index b28894ac1..d24f93f9a 100644
--- a/dep/acelite/ace/POSIX_Asynch_IO.cpp
+++ b/dep/acelite/ace/POSIX_Asynch_IO.cpp
@@ -1,4 +1,4 @@
-// $Id: POSIX_Asynch_IO.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: POSIX_Asynch_IO.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/POSIX_Asynch_IO.h"
 
@@ -97,7 +97,7 @@ ACE_POSIX_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor_impl)
   ACE_POSIX_Proactor *posix_proactor = dynamic_cast<ACE_POSIX_Proactor *> (proactor_impl);
 
   if (posix_proactor == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "Dynamic cast to POSIX Proactor failed\n"), -1);
+    ACELIB_ERROR_RETURN ((LM_ERROR, "Dynamic cast to POSIX Proactor failed\n"), -1);
 
   // Post myself.
   return posix_proactor->post_completion (this);
@@ -411,7 +411,7 @@ ACE_POSIX_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
      bytes_to_write = len;
 
   if (bytes_to_write == 0)
-    ACE_ERROR_RETURN
+    ACELIB_ERROR_RETURN
       ((LM_ERROR,
         ACE_TEXT ("ACE_POSIX_Asynch_Write_Stream::write:")
         ACE_TEXT ("Attempt to write 0 bytes\n")),
@@ -522,7 +522,7 @@ ACE_POSIX_Asynch_Read_File::read (ACE_Message_Block &message_block,
      bytes_to_read=space;
 
   if ( bytes_to_read == 0 )
-    ACE_ERROR_RETURN
+    ACELIB_ERROR_RETURN
       ((LM_ERROR,
         ACE_TEXT ("ACE_POSIX_Asynch_Read_File::read:")
         ACE_TEXT ("Attempt to read 0 bytes or no space in the message block\n")),
@@ -649,7 +649,7 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block,
      bytes_to_write = len;
 
   if (bytes_to_write == 0)
-    ACE_ERROR_RETURN
+    ACELIB_ERROR_RETURN
       ((LM_ERROR,
         ACE_TEXT ("ACE_POSIX_Asynch_Write_File::write:")
         ACE_TEXT ("Attempt to write 0 bytes\n")),
@@ -808,7 +808,7 @@ ACE_POSIX_Asynch_Accept::open (const ACE_Handler::Proxy_Ptr &handler_proxy,
   // if we are already opened,
   // we could not create a new handler without closing the previous
   if (this->flg_open_)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT("%N:%l:ACE_POSIX_Asynch_Accept::open:")
                        ACE_TEXT("acceptor already open\n")),
                       -1);
@@ -849,7 +849,7 @@ ACE_POSIX_Asynch_Accept::accept (ACE_Message_Block &message_block,
   ACE_TRACE ("ACE_POSIX_Asynch_Accept::accept");
 
   if (!this->flg_open_)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT("%N:%l:ACE_POSIX_Asynch_Accept::accept")
                        ACE_TEXT("acceptor was not opened before\n")),
                       -1);
@@ -892,7 +892,7 @@ ACE_POSIX_Asynch_Accept::accept (ACE_Message_Block &message_block,
     ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1));
     if (this->result_queue_.enqueue_tail (result) == -1)
       {
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("ACE_POSIX_Asynch_Accept::accept: %p\n")
                     ACE_TEXT ("enqueue_tail")));
         delete result;  // to avoid memory  leak
@@ -950,7 +950,7 @@ ACE_POSIX_Asynch_Accept::cancel_uncompleted (int flg_notify)
           result->set_error (ECANCELED);
 
           if (this->posix_proactor ()->post_completion (result) == -1)
-            ACE_ERROR ((LM_ERROR,
+            ACELIB_ERROR ((LM_ERROR,
                         ACE_TEXT("(%P | %t):%p\n"),
                         ACE_TEXT("ACE_POSIX_Asynch_Accept::")
                         ACE_TEXT("cancel_uncompleted")
@@ -1077,7 +1077,7 @@ ACE_POSIX_Asynch_Accept::handle_input (ACE_HANDLE /* fd */)
 
     // Deregister this info pertaining to this accept call.
     if (this->result_queue_.dequeue_head (result) != 0)
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT("%N:%l:(%P | %t):%p\n"),
                   ACE_TEXT("ACE_POSIX_Asynch_Accept::handle_input:")
                   ACE_TEXT( " dequeueing failed")));
@@ -1107,7 +1107,7 @@ ACE_POSIX_Asynch_Accept::handle_input (ACE_HANDLE /* fd */)
   if (new_handle == ACE_INVALID_HANDLE)
     {
       result->set_error (errno);
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT("%N:%l:(%P | %t):%p\n"),
                   ACE_TEXT("ACE_POSIX_Asynch_Accept::handle_input: ")
                   ACE_TEXT("accept")));
@@ -1121,7 +1121,7 @@ ACE_POSIX_Asynch_Accept::handle_input (ACE_HANDLE /* fd */)
   // Notify the main process about this completion
   // Send the Result through the notification pipe.
   if (this->posix_proactor ()->post_completion (result) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT("Error:(%P | %t):%p\n"),
                 ACE_TEXT("ACE_POSIX_Asynch_Accept::handle_input: ")
                 ACE_TEXT(" <post_completion> failed")));
@@ -1247,7 +1247,7 @@ ACE_POSIX_Asynch_Connect::connect (ACE_HANDLE connect_handle,
   ACE_TRACE ("ACE_POSIX_Asynch_Connect::connect");
 
   if (this->flg_open_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT("%N:%l:ACE_POSIX_Asynch_Connect::connect")
                        ACE_TEXT("connector was not opened before\n")),
                       -1);
@@ -1281,7 +1281,7 @@ ACE_POSIX_Asynch_Connect::connect (ACE_HANDLE connect_handle,
 
     if (this->result_map_.bind (connect_handle, result) == -1)
       {
-        ACE_ERROR  ((LM_ERROR,
+        ACELIB_ERROR  ((LM_ERROR,
                      ACE_TEXT ("%N:%l:%p\n"),
                      ACE_TEXT ("ACE_POSIX_Asynch_Connect::connect:")
                      ACE_TEXT ("bind")));
@@ -1327,7 +1327,7 @@ int ACE_POSIX_Asynch_Connect::post_result (ACE_POSIX_Asynch_Connect_Result * res
       if (this->posix_proactor ()->post_completion (result) == 0)
         return 0;
 
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT("Error:(%P | %t):%p\n"),
                   ACE_TEXT("ACE_POSIX_Asynch_Connect::post_result: ")
                   ACE_TEXT(" <post_completion> failed")));
@@ -1371,7 +1371,7 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result,
       if (handle == ACE_INVALID_HANDLE)
         {
           result->set_error (errno);
-          ACE_ERROR_RETURN
+          ACELIB_ERROR_RETURN
             ((LM_ERROR,
               ACE_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n"),
               ACE_TEXT("socket")),
@@ -1389,7 +1389,7 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result,
                               sizeof one) == -1 )
         {
           result->set_error (errno);
-          ACE_ERROR_RETURN
+          ACELIB_ERROR_RETURN
             ((LM_ERROR,
               ACE_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n"),
               ACE_TEXT("setsockopt")),
@@ -1405,7 +1405,7 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result,
       if (ACE_OS::bind (handle, laddr, size) == -1)
         {
            result->set_error (errno);
-           ACE_ERROR_RETURN
+           ACELIB_ERROR_RETURN
              ((LM_ERROR,
                ACE_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n"),
                ACE_TEXT("bind")),
@@ -1417,7 +1417,7 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result,
   if (ACE::set_flags (handle, ACE_NONBLOCK) != 0)
     {
       result->set_error (errno);
-      ACE_ERROR_RETURN
+      ACELIB_ERROR_RETURN
         ((LM_ERROR,
           ACE_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n")
           ACE_TEXT("set_flags")),
@@ -1841,7 +1841,7 @@ ACE_POSIX_Asynch_Transmit_Handler::transmit (void)
                       this->result_->file (),
                       0,
                       0) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        "ACE_Asynch_Transmit_Handler:read_file open failed\n"),
                       -1);
 
@@ -1850,7 +1850,7 @@ ACE_POSIX_Asynch_Transmit_Handler::transmit (void)
                       this->result_->socket (),
                       0,
                       0) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        "ACE_Asynch_Transmit_Handler:write_stream open failed\n"),
                       -1);
 
@@ -1859,7 +1859,7 @@ ACE_POSIX_Asynch_Transmit_Handler::transmit (void)
                        this->result_->header_and_trailer ()->header_bytes (),
                        reinterpret_cast<void *> (&this->header_act_),
                        0) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        "Asynch_Transmit_Handler:transmitting header:write_stream failed\n"),
                       -1);
   return 0;
@@ -1876,7 +1876,7 @@ ACE_POSIX_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_Write_S
     {
       // Failure.
 
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   "Asynch_Transmit_File failed.\n"));
 
       ACE_SEH_TRY
@@ -1900,7 +1900,7 @@ ACE_POSIX_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_Write_S
   size_t unsent_data = result.bytes_to_write () - result.bytes_transferred ();
   if (unsent_data != 0)
     {
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   "%N:%l:Partial write to socket: Asynch_write called again\n"));
 
       // Duplicate the message block and retry remaining data
@@ -1911,7 +1911,7 @@ ACE_POSIX_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_Write_S
                            this->result_->signal_number ()) == -1)
         {
           // @@ Handle this error.
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       "Asynch_Transmit_Handler:write_stream failed\n"));
           return;
         }
@@ -1953,13 +1953,13 @@ ACE_POSIX_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_Write_S
       // If header/data was sent, initiate the file data transmission.
       if (this->initiate_read_file () == -1)
         // @@ Handle this error.
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     "Error:Asynch_Transmit_Handler:read_file couldnt be initiated\n"));
       break;
 
     default:
       // @@ Handle this error.
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   "Error:ACE_Asynch_Transmit_Handler::handle_write_stream::Unexpected act\n"));
     }
 }
@@ -2000,7 +2000,7 @@ ACE_POSIX_Asynch_Transmit_Handler::handle_read_file (const ACE_Asynch_Read_File:
                        this->result_->signal_number ()) == -1)
     {
       // @@ Handle this error.
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   "Error:ACE_Asynch_Transmit_File : write to the stream failed\n"));
       return;
     }
@@ -2018,7 +2018,7 @@ ACE_POSIX_Asynch_Transmit_Handler::initiate_read_file (void)
                            (void *)&this->trailer_act_,
                            this->result_->priority (),
                            this->result_->signal_number ()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            "Error:Asynch_Transmit_Handler:write_stream writing trailer failed\n"),
                           -1);
       return 0;
@@ -2039,7 +2039,7 @@ ACE_POSIX_Asynch_Transmit_Handler::initiate_read_file (void)
                           0, // Act
                           this->result_->priority (),
                           this->result_->signal_number ()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            "Error:Asynch_Transmit_Handler::read from file failed\n"),
                           -1);
       return 0;
@@ -2069,7 +2069,7 @@ ACE_POSIX_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
   ssize_t file_size = ACE_OS::filesize (file);
 
   if (file_size == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT("Error:%N:%l:%p\n"),
                        ACE_TEXT("POSIX_Asynch_Transmit_File:filesize failed")),
                       -1);
@@ -2078,7 +2078,7 @@ ACE_POSIX_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
     bytes_to_write = file_size;
 
   if (offset > (size_t) file_size)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT("Error:%p\n"),
                        ACE_TEXT("Asynch_Transmit_File:File size is less than offset")),
                       -1);
@@ -2378,7 +2378,7 @@ ACE_POSIX_Asynch_Write_Dgram::send (ACE_Message_Block *message_block,
 {
   size_t len = message_block->length ();
   if (len == 0)
-    ACE_ERROR_RETURN
+    ACELIB_ERROR_RETURN
       ((LM_ERROR,
         ACE_TEXT ("ACE_POSIX_Asynch_Write_Stream::write:")
         ACE_TEXT ("Attempt to write 0 bytes\n")),
diff --git a/dep/acelite/ace/POSIX_CB_Proactor.cpp b/dep/acelite/ace/POSIX_CB_Proactor.cpp
index 55d0fb79d..dcc1cd674 100644
--- a/dep/acelite/ace/POSIX_CB_Proactor.cpp
+++ b/dep/acelite/ace/POSIX_CB_Proactor.cpp
@@ -1,11 +1,11 @@
-// $Id: POSIX_CB_Proactor.cpp 91683 2010-09-09 09:07:49Z johnnyw $
+// $Id: POSIX_CB_Proactor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/POSIX_CB_Proactor.h"
 
 #if defined (ACE_HAS_AIO_CALLS) && !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT)
 
 #include "ace/Task_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Object_Manager.h"
 #include "ace/OS_NS_sys_time.h"
 
@@ -125,7 +125,7 @@ ACE_POSIX_CB_Proactor::handle_events_i (u_long milli_seconds)
       int const lerror = errno;
       if (lerror != ETIME &&   // timeout
           lerror != EINTR )    // interrupted system call
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT("%N:%l:(%P | %t)::%p\n"),
                     ACE_TEXT("ACE_POSIX_CB_Proactor::handle_events:")
                     ACE_TEXT("semaphore acquire failed")
@@ -164,7 +164,7 @@ ACE_POSIX_CB_Proactor::handle_events_i (u_long milli_seconds)
 
   // Uncomment this  if you want to test
   // and research the behavior of you system
-  // ACE_DEBUG ((LM_DEBUG,
+  // ACELIB_DEBUG ((LM_DEBUG,
   //            "(%t) NumAIO=%d NumQueue=%d\n",
   //             ret_aio, ret_que));
 
diff --git a/dep/acelite/ace/POSIX_Proactor.cpp b/dep/acelite/ace/POSIX_Proactor.cpp
index 635661d9e..fb5ba08f0 100644
--- a/dep/acelite/ace/POSIX_Proactor.cpp
+++ b/dep/acelite/ace/POSIX_Proactor.cpp
@@ -1,4 +1,4 @@
-// $Id: POSIX_Proactor.cpp 92069 2010-09-28 11:38:59Z johnnyw $
+// $Id: POSIX_Proactor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/POSIX_Proactor.h"
 
@@ -15,7 +15,7 @@
 #include "ace/ACE.h"
 #include "ace/Flag_Manip.h"
 #include "ace/Task_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Object_Manager.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/OS_NS_signal.h"
@@ -630,7 +630,11 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr
     read_stream_ (posix_aiocb_proactor)
 {
   // Open the pipe.
-  this->pipe_.open ();
+  if (this->pipe_.open () == -1)
+    ACELIB_ERROR ((LM_ERROR,
+                ACE_TEXT("%N:%l:%p\n"),
+                ACE_TEXT("ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:")
+                ACE_TEXT("Open of pipe failed")));
 
   // Set write side in NONBLOCK mode
   ACE::set_flags (this->pipe_.write_handle (), ACE_NONBLOCK);
@@ -647,7 +651,7 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr
                                0, // Completion Key
                                0) // Proactor
       == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT("%N:%l:%p\n"),
                 ACE_TEXT("ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:")
                 ACE_TEXT("Open on Read Stream failed")));
@@ -658,7 +662,7 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr
                                0, // ACT
                                0) // Priority
       == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT("%N:%l:%p\n"),
                 ACE_TEXT("ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:")
                 ACE_TEXT("Read from pipe failed")));
@@ -703,7 +707,7 @@ ACE_AIOCB_Notify_Pipe_Manager::notify ()
     {
       if (errno != EWOULDBLOCK)
 #if 0
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P %t):%p\n"),
                     ACE_TEXT ("ACE_AIOCB_Notify_Pipe_Manager::notify")
                     ACE_TEXT ("Error:Writing on to notify pipe failed")));
@@ -731,7 +735,7 @@ ACE_AIOCB_Notify_Pipe_Manager::handle_read_stream
                                      1,   // enough to read 1 byte
                                      0,   // ACT
                                      0))  // Priority
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%N:%l:(%P | %t):%p\n"),
                 ACE_TEXT ("ACE_AIOCB_Notify_Pipe_Manager::handle_read_stream:")
                 ACE_TEXT ("Read from pipe failed")));
@@ -878,7 +882,7 @@ int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void)
             "WRITE":"READ" ;
 
 
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT("slot=%d op=%s status=%d xfercnt=%d %s\n"),
                       ai,
                       op,
@@ -900,7 +904,7 @@ int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void)
   // and complain about POSIX implementation.
   // We know that we have memory leaks, but it is better than
   // segmentation fault!
-  ACE_DEBUG
+  ACELIB_DEBUG
     ((LM_DEBUG,
       ACE_TEXT("ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list\n")
       ACE_TEXT(" number pending AIO=%d\n"),
@@ -962,13 +966,13 @@ void ACE_POSIX_AIOCB_Proactor::check_max_aio_num ()
       && aiocb_list_max_size_ > (unsigned long) max_num_files)
     aiocb_list_max_size_ = (unsigned long) max_num_files;
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
              "(%P | %t) ACE_POSIX_AIOCB_Proactor::Max Number of AIOs=%d\n",
               aiocb_list_max_size_));
 
 #if defined(__sgi)
 
-   ACE_DEBUG((LM_DEBUG,
+   ACELIB_DEBUG((LM_DEBUG,
               ACE_TEXT( "SGI IRIX specific: aio_init!\n")));
 
 //typedef struct aioinit {
@@ -1067,7 +1071,7 @@ ACE_POSIX_AIOCB_Proactor::putq_result (ACE_POSIX_Asynch_Result *result)
   int ret_val = this->result_queue_.enqueue_tail (result);
 
   if (ret_val == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        "%N:%l:ACE_POSIX_AIOCB_Proactor::putq_result failed\n"),
                       -1);
 
@@ -1088,7 +1092,7 @@ ACE_POSIX_Asynch_Result * ACE_POSIX_AIOCB_Proactor::getq_result (void)
 
 //  don't waste time if queue is empty - it is normal
 //  or check queue size before dequeue_head
-//    ACE_ERROR_RETURN ((LM_ERROR,
+//    ACELIB_ERROR_RETURN ((LM_ERROR,
 //                       ACE_TEXT("%N:%l:(%P | %t):%p\n"),
 //                       ACE_TEXT("ACE_POSIX_AIOCB_Proactor::getq_result failed")),
 //                      0);
@@ -1156,7 +1160,7 @@ ACE_POSIX_AIOCB_Proactor::handle_events_i (u_long milli_seconds)
     {
       if (errno != EAGAIN &&   // Timeout
           errno != EINTR )    // Interrupted call
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%N:%l:(%P|%t)::%p\n"),
                       ACE_TEXT ("handle_events: aio_suspend failed")));
       // let continue work
@@ -1292,7 +1296,7 @@ ACE_POSIX_AIOCB_Proactor::start_aio (ACE_POSIX_Asynch_Result *result,
       break;
 
     default:
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("%N:%l:(%P|%t)::")
                          ACE_TEXT ("start_aio: Invalid op code %d\n"),
                          op),
@@ -1350,7 +1354,7 @@ ACE_POSIX_AIOCB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result)
       if (result_list_[i] != 0)           // only 1 request
         {                                   // is allowed
           errno   = EAGAIN;
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                      "%N:%l:(%P | %t)::\n"
                      "ACE_POSIX_AIOCB_Proactor::allocate_aio_slot:"
                      "internal Proactor error 0\n"),
@@ -1365,7 +1369,7 @@ ACE_POSIX_AIOCB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result)
     }
 
   if (i >= this->aiocb_list_max_size_)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
               "%N:%l:(%P | %t)::\n"
               "ACE_POSIX_AIOCB_Proactor::allocate_aio_slot:"
               "internal Proactor error 1\n"),
@@ -1419,7 +1423,7 @@ ACE_POSIX_AIOCB_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result)
       if (errno == EAGAIN || errno == ENOMEM)  //Ok, it will be deferred AIO
         ret_val = 1;
       else
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("%N:%l:(%P | %t)::start_aio_i: aio_%s %p\n"),
                     ptype,
                     ACE_TEXT ("queueing failed")));
@@ -1453,7 +1457,7 @@ ACE_POSIX_AIOCB_Proactor::start_deferred_aio ()
       break;
 
   if (i >= this->aiocb_list_max_size_)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                  "%N:%l:(%P | %t)::\n"
                  "start_deferred_aio:"
                  "internal Proactor error 3\n"),
@@ -1597,7 +1601,7 @@ ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (size_t max_aio_operations)
 
   // Add the signal number to the signal set.
   if (ACE_OS::sigaddset (&this->RT_completion_signals_, ACE_SIGRTMIN) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_POSIX_SIG_Proactor: %p\n"),
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_POSIX_SIG_Proactor: %p\n"),
                 ACE_TEXT ("sigaddset")));
   this->block_signals ();
   // Set up the signal action for SIGRTMIN.
@@ -1623,7 +1627,7 @@ ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (const sigset_t signal_set,
 
   // Empty the signal set first.
   if (sigemptyset (&this->RT_completion_signals_) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT("Error:(%P | %t):%p\n"),
                 ACE_TEXT("sigemptyset failed")));
 
@@ -1636,7 +1640,7 @@ ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (const sigset_t signal_set,
       member = sigismember (&signal_set,
                             si);
       if (member == -1)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT("%N:%l:(%P | %t)::%p\n"),
                     ACE_TEXT("ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor:")
                     ACE_TEXT("sigismember failed")));
@@ -1691,7 +1695,7 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num)
   // Get this process id.
   pid_t const pid = ACE_OS::getpid ();
   if (pid == (pid_t) -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT("Error:%N:%l(%P | %t):%p"),
                        ACE_TEXT("<getpid> failed")),
                       -1);
@@ -1709,7 +1713,7 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num)
     return 0;
 
   if (errno != EAGAIN)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT("Error:%N:%l:(%P | %t):%p\n"),
                        ACE_TEXT("<sigqueue> failed")),
                       -1);
@@ -1738,7 +1742,7 @@ ACE_POSIX_SIG_Proactor::create_asynch_timer
           is_member = sigismember (&this->RT_completion_signals_,
                                    si);
           if (is_member == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
+            ACELIB_ERROR_RETURN ((LM_ERROR,
                                "%N:%l:(%P | %t)::%s\n",
                                "ACE_POSIX_SIG_Proactor::create_asynch_timer:"
                                "sigismember failed"),
@@ -1746,7 +1750,7 @@ ACE_POSIX_SIG_Proactor::create_asynch_timer
         }
 
       if (is_member == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            "Error:%N:%l:(%P | %t)::%s\n",
                            "ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor:"
                            "Signal mask set empty"),
@@ -1773,7 +1777,7 @@ static void
 sig_handler (int sig_num, siginfo_t *, ucontext_t *)
 {
   // Should never be called
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               "%N:%l:(%P | %t)::sig_handler received signal: %d\n",
                sig_num));
 }
@@ -1801,7 +1805,7 @@ ACE_POSIX_SIG_Proactor::setup_signal_handler (int signal_number) const
                                             &reaction,
                                             0);
   if (sigaction_return == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT("Error:%p\n"),
                        ACE_TEXT("Proactor couldnt do sigaction for the RT SIGNAL")),
                       -1);
@@ -1829,7 +1833,7 @@ ACE_POSIX_SIG_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result)
       break;
 
   if (i >= this->aiocb_list_max_size_)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
               "%N:%l:(%P | %t)::\n"
               "ACE_POSIX_SIG_Proactor::allocate_aio_slot "
               "internal Proactor error 1\n"),
@@ -1918,7 +1922,7 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout)
       // may some other third-party libraries could send it
       // or message queue could also generate it !
       // So print the message and check our completions
-      ACE_ERROR ((LM_DEBUG,
+      ACELIB_ERROR ((LM_DEBUG,
                   ACE_TEXT ("%N:%l:(%P | %t): ")
                   ACE_TEXT ("ACE_POSIX_SIG_Proactor::handle_events: ")
                   ACE_TEXT ("Unexpected signal code (%d) returned ")
@@ -1955,7 +1959,7 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout)
   // Uncomment this  if you want to test
   // and research the behavior of you system
 #if 0
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               "(%t) NumAIO=%d NumQueue=%d\n",
               ret_aio, ret_que));
 #endif
diff --git a/dep/acelite/ace/Pagefile_Memory_Pool.cpp b/dep/acelite/ace/Pagefile_Memory_Pool.cpp
index fb012ef5d..907dc23c7 100644
--- a/dep/acelite/ace/Pagefile_Memory_Pool.cpp
+++ b/dep/acelite/ace/Pagefile_Memory_Pool.cpp
@@ -1,4 +1,4 @@
-// $Id: Pagefile_Memory_Pool.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Pagefile_Memory_Pool.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 // Pagefile_Memory_Pool.cpp
 #include "ace/Pagefile_Memory_Pool.h"
@@ -7,7 +7,7 @@
 #include "ace/Pagefile_Memory_Pool.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/OS_NS_sys_mman.h"
diff --git a/dep/acelite/ace/Parse_Node.cpp b/dep/acelite/ace/Parse_Node.cpp
index 0b225ba81..19b55951d 100644
--- a/dep/acelite/ace/Parse_Node.cpp
+++ b/dep/acelite/ace/Parse_Node.cpp
@@ -1,4 +1,4 @@
-// $Id: Parse_Node.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: Parse_Node.cpp 96985 2013-04-11 15:50:32Z huangh $
 #include "ace/Parse_Node.h"
 
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
@@ -69,7 +69,7 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
         {
           if (ACE::debug ())
             {
-              ACE_ERROR ((LM_ERROR,
+              ACELIB_ERROR ((LM_ERROR,
                           ACE_TEXT ("dynamic initialization failed for Module %s\n"),
                           module->name ()));
             }
@@ -86,7 +86,7 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
         {
           if (ACE::debug ())
             {
-              ACE_ERROR ((LM_ERROR,
+              ACELIB_ERROR ((LM_ERROR,
                           ACE_TEXT ("dynamic initialization failed for Stream %s\n"),
                           this->node_->name ()));
             }
@@ -97,7 +97,7 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%P|%t) Did stream on %s, error = %d\n"),
                 this->node_->name (),
                 yyerrno));
@@ -181,7 +181,7 @@ ACE_Parse_Node::print (void) const
 {
   ACE_TRACE ("ACE_Parse_Node::print");
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("svc = %s\n"),
               this->name ()));
 
@@ -247,7 +247,7 @@ ACE_Suspend_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("did suspend on %s, error = %d\n"),
                 this->name (),
                 yyerrno));
@@ -264,7 +264,7 @@ ACE_Resume_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("did resume on %s, error = %d\n"),
                 this->name (),
                 yyerrno));
@@ -301,7 +301,7 @@ ACE_Remove_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) Remove_Node::apply")
                 ACE_TEXT (" - did remove on %s, error = %d\n"),
                 this->name (),
@@ -329,7 +329,7 @@ ACE_Dynamic_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) Dynamic_Node::apply")
                 ACE_TEXT (" - Did dynamic on %s (yyerrno=%d)\n"),
                 this->name (),
@@ -399,7 +399,7 @@ ACE_Static_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) Static_Node::apply -")
                 ACE_TEXT (" Did static on %s (yyerrno=%d)\n"),
                 this->name (),
@@ -426,6 +426,7 @@ ACE_Location_Node::dump (void) const
 
 ACE_Location_Node::ACE_Location_Node (void)
   : pathname_ (0),
+    must_delete_ (0),
     dll_ (),
     symbol_ (0)
 {
@@ -471,7 +472,7 @@ ACE_Location_Node::open_dll (int & yyerrno)
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) LN::open_dll - path=%s\n"),
                 this->pathname ()));
 #endif /* ACE_NLOGGING */
@@ -484,7 +485,7 @@ ACE_Location_Node::open_dll (int & yyerrno)
       if (ACE::debug ())
         {
           ACE_TCHAR *errmsg = this->dll_.error ();
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("ACE (%P|%t) LN::open_dll - Failed to open %s: %s\n"),
                       this->pathname (),
                       errmsg ? errmsg : ACE_TEXT ("no error reported")));
@@ -543,7 +544,7 @@ ACE_Object_Node::symbol (ACE_Service_Gestalt *,
           if (ACE::debug ())
             {
               ACE_TCHAR *errmsg = this->dll_.error ();
-              ACE_ERROR ((LM_ERROR,
+              ACELIB_ERROR ((LM_ERROR,
                           ACE_TEXT ("ACE (%P|%t) DLL::symbol -")
                           ACE_TEXT (" Failed for object %s: %s\n"),
                           object_name,
@@ -672,7 +673,7 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *,
           if (ACE::debug ())
             {
               ACE_TCHAR * const errmsg = this->dll_.error ();
-              ACE_ERROR ((LM_ERROR,
+              ACELIB_ERROR ((LM_ERROR,
                           ACE_TEXT ("DLL::symbol failed for function %s: ")
                           ACE_TEXT ("%s\n"),
                           function_name,
@@ -700,7 +701,7 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *,
           ++yyerrno;
           if (ACE::debug ())
             {
-              ACE_ERROR ((LM_ERROR,
+              ACELIB_ERROR ((LM_ERROR,
                          ACE_TEXT ("%p\n"),
                          this->function_name_));
             }
@@ -743,7 +744,7 @@ ACE_Dummy_Node::apply (ACE_Service_Gestalt *, int &yyerrno)
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("did operations on stream %s, error = %d\n"),
                 this->name (),
                 yyerrno));
@@ -796,7 +797,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config,
       ++yyerrno;
       if (ACE::debug ())
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                      ACE_TEXT ("(%P|%t) No static service ")
                      ACE_TEXT ("registered for function %s\n"),
                      this->function_name_));
@@ -814,7 +815,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config,
 
           if (ACE::debug ())
             {
-              ACE_ERROR ((LM_ERROR,
+              ACELIB_ERROR ((LM_ERROR,
                           ACE_TEXT ("(%P|%t) No static service factory ")
                           ACE_TEXT ("function registered for function %s\n"),
                           this->function_name_));
@@ -831,7 +832,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config,
       ++yyerrno;
       if (ACE::debug ())
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       this->function_name_));
         }
@@ -903,7 +904,7 @@ ACE_Service_Type_Factory::make_service_type (ACE_Service_Gestalt *cfg) const
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
     {
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("ACE (%P|%t) Unable to create ")
                   ACE_TEXT ("service object for %s\n"),
                   this->name ()));
diff --git a/dep/acelite/ace/Ping_Socket.cpp b/dep/acelite/ace/Ping_Socket.cpp
index 6fe92fb37..cbc64ff58 100644
--- a/dep/acelite/ace/Ping_Socket.cpp
+++ b/dep/acelite/ace/Ping_Socket.cpp
@@ -1,11 +1,11 @@
-// $Id: Ping_Socket.cpp 92069 2010-09-28 11:38:59Z johnnyw $
+// $Id: Ping_Socket.cpp 97355 2013-09-27 22:16:09Z shuston $
 
 #include "ace/Ping_Socket.h"
 
 #if defined (ACE_HAS_ICMP_SUPPORT) && (ACE_HAS_ICMP_SUPPORT == 1)
 
 #include "ace/INET_Addr.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_sys_socket.h"
@@ -109,7 +109,7 @@ ACE_Ping_Socket::ACE_Ping_Socket (ACE_Addr const & local,
 
   if (this->open (local, protocol, reuse_addr) == -1)
     {
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("ACE_Ping_Socket::ACE_Ping_Socket: %p\n"),
                   ACE_TEXT ("open")));
       return;
@@ -154,10 +154,10 @@ ACE_Ping_Socket::receive_echo_reply (ACE_Time_Value const * timeout)
 
   do
     {
-      int rval_recv = inherited::recv (icmp_recv_buff_,
-                                       sizeof icmp_recv_buff_,
-                                       0,
-                                       wait_time);
+      ssize_t rval_recv = inherited::recv (icmp_recv_buff_,
+                                           sizeof icmp_recv_buff_,
+                                           0,
+                                           wait_time);
       if (rval_recv < 0)
         {
           if (errno == EINTR)
@@ -203,7 +203,7 @@ int
 ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len)
 {
   unsigned char hlen1;
-  int icmplen;
+  ssize_t icmplen;
   struct ip * ip;
   struct icmp * icmp;
 
@@ -221,12 +221,12 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len)
 
   if ((icmplen = len - hlen1) < ICMP_MIN)
     {
-      ACE_DEBUG
+      ACELIB_DEBUG
         ((LM_DEBUG,
           ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram")
-          ACE_TEXT (" - ICMP length is %d < 8.\n"),
+          ACE_TEXT (" - ICMP length is %b < 8.\n"),
           icmplen));
-      ACE_ERROR_RETURN
+      ACELIB_ERROR_RETURN
         ((LM_ERROR,
           ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram - ")
           ACE_TEXT ("The ICMP header either not received or is corrupted.")),
@@ -235,14 +235,14 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len)
 
   if (icmp->icmp_type == ICMP_ECHOREPLY)
     {
-      ACE_DEBUG
+      ACELIB_DEBUG
         ((LM_DEBUG,
           ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram")
           ACE_TEXT (" - ICMP_ECHOREPLY received.\n")));
 
       if (icmp->icmp_id != (ACE_OS::getpid () & 0xFFFF))
         {
-          ACE_ERROR_RETURN
+          ACELIB_ERROR_RETURN
             ((LM_ERROR,
               ACE_TEXT ("(%P|%t) ACE_Ping_Socket::")
               ACE_TEXT ("process_incoming_dgram ")
@@ -253,27 +253,27 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len)
         }
       if (icmplen < 16)
         {
-          ACE_ERROR_RETURN
+          ACELIB_ERROR_RETURN
             ((LM_ERROR,
               ACE_TEXT ("(%P|%t) ACE_Ping_Socket::")
               ACE_TEXT ("process_incoming_dgram - ICMP length ")
-              ACE_TEXT ("is %d < 16."),
+              ACE_TEXT ("is %b < 16."),
               icmplen),
              -1);
         }
 
-      ACE_DEBUG
+      ACELIB_DEBUG
         ((LM_DEBUG,
           ACE_TEXT ("(%P|%t) ACE::Ping_Socket::process_incoming_dgram - ")
           ACE_TEXT ("received ")
-          ACE_TEXT ("ICMP datagram with length of %d bytes (not counting ")
+          ACE_TEXT ("ICMP datagram with length of %b bytes (not counting ")
           ACE_TEXT ("IP-header): seq=%u, ttl=%d.\n"),
           icmplen, icmp->icmp_seq, ip->ip_ttl));
 
       return 0; //= success
     }
 
-  ACE_DEBUG
+  ACELIB_DEBUG
     ((LM_DEBUG,
       ACE_TEXT ("(%P|%t) ACE::Ping_Socket::process_incoming_dgram - ")
       ACE_TEXT ("received datagram that is not ICMP_ECHOREPLY.\n")));
@@ -335,7 +335,7 @@ ACE_Ping_Socket::send_echo_check (ACE_INET_Addr &remote_addr,
   _icmp->icmp_cksum = 0;
   _icmp->icmp_cksum = inherited::calculate_checksum ((u_short *) _icmp,
                                                      length_icmp);
-  int rval_send = -1;
+  ssize_t rval_send = -1;
 
   if ((rval_send = send ((void const *) icmp_send_buff_,
                          length_icmp,
@@ -357,7 +357,7 @@ ACE_Ping_Socket::make_echo_check (ACE_INET_Addr & remote_addr,
                                           to_connect)) == -1)
     return -1;
 
-  ACE_DEBUG
+  ACELIB_DEBUG
     ((LM_DEBUG,
       ACE_TEXT ("(%P|%t) ACE_Ping_Socket::make_echo_check - sent %d.\n"),
       rval_send));
diff --git a/dep/acelite/ace/Pipe.cpp b/dep/acelite/ace/Pipe.cpp
index bb8a851ea..98b4ff95a 100644
--- a/dep/acelite/ace/Pipe.cpp
+++ b/dep/acelite/ace/Pipe.cpp
@@ -1,9 +1,9 @@
-// $Id: Pipe.cpp 92010 2010-09-24 14:54:19Z shuston $
+// $Id: Pipe.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Pipe.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Connector.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/OS_Memory.h"
 #include "ace/Truncate.h"
@@ -27,10 +27,10 @@ ACE_Pipe::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Pipe::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handles_[0] = %d"), this->handles_[0]));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandles_[1] = %d\n"), this->handles_[1]));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("handles_[0] = %d"), this->handles_[0]));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandles_[1] = %d\n"), this->handles_[1]));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -125,7 +125,7 @@ ACE_Pipe::open (int buffer_size)
 #elif defined (ACE_HAS_STREAM_PIPES) || defined (__QNX__)
   ACE_UNUSED_ARG (buffer_size);
   if (ACE_OS::pipe (this->handles_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("pipe")),
                       -1);
@@ -143,7 +143,7 @@ ACE_Pipe::open (int buffer_size)
                         (void *) arg) == -1)
     {
       this->close ();
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("%p\n"),
                          ACE_TEXT ("ioctl")), -1);
     }
@@ -154,7 +154,7 @@ ACE_Pipe::open (int buffer_size)
                           SOCK_STREAM,
                           0,
                           this->handles_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("socketpair")),
                       -1);
@@ -237,7 +237,7 @@ ACE_Pipe::ACE_Pipe (ACE_HANDLE handles[2])
   ACE_TRACE ("ACE_Pipe::ACE_Pipe");
 
   if (this->open (handles) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_Pipe::ACE_Pipe")));
 }
 
diff --git a/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp b/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
deleted file mode 100644
index bd7cb3d4e..000000000
--- a/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "WinAcePCH.h"
-
-
diff --git a/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.h b/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.h
deleted file mode 100644
index 6ff97bfcf..000000000
--- a/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#ifndef WIN_ACE_PCH
-#define WIN_ACE_PCH
-
-#include "ace/ACE.h"
-
-#include "ace/Synch_Traits.h"
-#include "ace/Svc_Handler.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/Acceptor.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Guard_T.h"
-#include "ace/Unbounded_Queue.h"
-#include "ace/Message_Block.h"
-
-#endif
diff --git a/dep/acelite/ace/Priority_Reactor.cpp b/dep/acelite/ace/Priority_Reactor.cpp
index 445f5d912..4564cadd1 100644
--- a/dep/acelite/ace/Priority_Reactor.cpp
+++ b/dep/acelite/ace/Priority_Reactor.cpp
@@ -1,4 +1,4 @@
-// $Id: Priority_Reactor.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Priority_Reactor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Priority_Reactor.h"
 #include "ace/Malloc_T.h"
@@ -177,11 +177,11 @@ ACE_Priority_Reactor::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Priority_Reactor::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   ACE_Select_Reactor::dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Proactor.cpp b/dep/acelite/ace/Proactor.cpp
index dffacd218..d793a937a 100644
--- a/dep/acelite/ace/Proactor.cpp
+++ b/dep/acelite/ace/Proactor.cpp
@@ -1,6 +1,6 @@
-// $Id: Proactor.cpp 95368 2011-12-19 13:38:49Z mcorino $
+// $Id: Proactor.cpp 97262 2013-08-09 08:32:10Z johnnyw $
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 #include "ace/Proactor.h"
 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
@@ -18,7 +18,7 @@
 
 
 #include "ace/Task_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Framework_Component.h"
 
 #if defined (ACE_HAS_AIO_CALLS)
@@ -168,7 +168,7 @@ ACE_Proactor_Timer_Handler::svc (void)
               break;
             default:
               // Error.
-              ACE_ERROR_RETURN ((LM_ERROR,
+              ACELIB_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("%N:%l:(%P | %t):%p\n"),
                                  ACE_TEXT ("ACE_Proactor_Timer_Handler::svc:wait failed")),
                                 -1);
@@ -224,7 +224,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (ACE_Proactor_Timer_Queue &,
                                              const ACE_Time_Value &time)
 {
   if (this->proactor_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("(%t) No Proactor set in ACE_Proactor_Handle_Timeout_Upcall,")
                        ACE_TEXT (" no completion port to post timeout to?!@\n")),
                       -1);
@@ -239,7 +239,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (ACE_Proactor_Timer_Queue &,
                                           -1);
 
   if (asynch_timer == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%N:%l:(%P | %t):%p\n"),
                        ACE_TEXT ("ACE_Proactor_Handle_Timeout_Upcall::timeout:")
                        ACE_TEXT ("create_asynch_timer failed")),
@@ -250,7 +250,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (ACE_Proactor_Timer_Queue &,
   // Post a completion.
   if (-1 == safe_asynch_timer->post_completion
       (this->proactor_->implementation ()))
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Failure in dealing with timers: ")
                        ACE_TEXT ("PostQueuedCompletionStatus failed\n")),
                       -1);
@@ -300,7 +300,7 @@ ACE_Proactor_Handle_Timeout_Upcall::proactor (ACE_Proactor &proactor)
       return 0;
     }
   else
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("ACE_Proactor_Handle_Timeout_Upcall is only suppose")
                        ACE_TEXT (" to be used with ONE (and only one) Proactor\n")),
                       -1);
@@ -358,7 +358,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
 
   // Activate <timer_handler>.
   if (this->timer_handler_->activate () == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%N:%l:(%P | %t):%p\n"),
                 ACE_TEXT ("Task::activate:could not create thread\n")));
 }
@@ -613,7 +613,7 @@ ACE_Proactor::close (void)
 {
   // Close the implementation.
   if (this->implementation ()->close () == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%N:%l:(%P | %t):%p\n"),
                 ACE_TEXT ("ACE_Proactor::close: implementation close")));
 
diff --git a/dep/acelite/ace/Process.cpp b/dep/acelite/ace/Process.cpp
index 22a49a4a9..e97564ab9 100644
--- a/dep/acelite/ace/Process.cpp
+++ b/dep/acelite/ace/Process.cpp
@@ -1,4 +1,4 @@
-// $Id: Process.cpp 95567 2012-02-28 14:36:02Z johnnyw $
+// $Id: Process.cpp 97924 2014-10-11 21:15:17Z shuston $
 
 #include "ace/Process.h"
 
@@ -10,7 +10,7 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Signal.h"
 #include "ace/SString.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_sys_socket.h"
@@ -102,9 +102,8 @@ ACE_Process::spawn (ACE_Process_Options &options)
   if (set_p && !ACE_BIT_ENABLED (options.creation_flags (),
                                  ACE_Process_Options::NO_EXEC))
     {
-      int maxlen = 0;
-      ACE_TCHAR *cmd_line_buf = options.command_line_buf (&maxlen);
-      size_t max_len = static_cast<size_t> (maxlen);
+      size_t max_len = 0;
+      ACE_TCHAR *cmd_line_buf = options.command_line_buf (&max_len);
       size_t curr_len = ACE_OS::strlen (cmd_line_buf);
       ACE_Handle_Set_Iterator h_iter (*set_p);
       // Because the length of the to-be-formatted +H option is not
@@ -116,9 +115,18 @@ ACE_Process::spawn (ACE_Process_Options &options)
         {
 #if defined (ACE_WIN32)
 # if defined (ACE_WIN64)
+// silence warnings coming from MinGW64 compilers
+#  if defined (__GNUC__)
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wformat"
+#   pragma GCC diagnostic ignored "-Wformat-extra-args"
+#  endif /* __GNUC__ */
           curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len],
                                        ACE_TEXT (" +H %I64p"),
                                        h);
+#  if defined (__GNUC__)
+#   pragma GCC diagnostic pop
+#  endif /* __GNUC__ */
 # else
           curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len],
                                        ACE_TEXT (" +H %p"),
@@ -373,10 +381,10 @@ ACE_Process::spawn (ACE_Process_Options &options)
                               options.getgroup ()) < 0)
         {
 #if !defined (ACE_HAS_THREADS)
-          // We can't emit this log message because ACE_ERROR(), etc.
+          // We can't emit this log message because ACELIB_ERROR(), etc.
           // will invoke async signal unsafe functions, which results
           // in undefined behavior in threaded programs.
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p.\n"),
                       ACE_TEXT ("ACE_Process::spawn: setpgid failed.")));
 #endif
@@ -390,10 +398,10 @@ ACE_Process::spawn (ACE_Process_Options &options)
                               options.getegid ()) == -1)
           {
 #if !defined (ACE_HAS_THREADS)
-            // We can't emit this log message because ACE_ERROR(), etc.
+            // We can't emit this log message because ACELIB_ERROR(), etc.
             // will invoke async signal unsafe functions, which results
             // in undefined behavior in threaded programs.
-            ACE_ERROR ((LM_ERROR,
+            ACELIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("%p.\n"),
                         ACE_TEXT ("ACE_Process::spawn: setregid failed.")));
 #endif
@@ -408,10 +416,10 @@ ACE_Process::spawn (ACE_Process_Options &options)
                               options.geteuid ()) == -1)
           {
 #if !defined (ACE_HAS_THREADS)
-            // We can't emit this log message because ACE_ERROR(), etc.
+            // We can't emit this log message because ACELIB_ERROR(), etc.
             // will invoke async signal unsafe functions, which results
             // in undefined behavior in threaded programs.
-            ACE_ERROR ((LM_ERROR,
+            ACELIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("%p.\n"),
                         ACE_TEXT ("ACE_Process::spawn: setreuid failed.")));
 #endif
@@ -616,7 +624,7 @@ ACE_Process::wait (const ACE_Time_Value &tv,
 # if defined (ACE_VXWORKS)
     {
       pid_t retv;
-      while ((retv = this->wait (status)) == ACE_INVALID_PID && errno == EINTR);
+      while ((retv = this->wait (status)) == ACE_INVALID_PID && errno == EINTR) ;
       return retv;
     }
 # else
@@ -901,7 +909,7 @@ ACE_Process_Options::inherit_environment (void)
       // Add the string to our env buffer.
       if (this->setenv_i (existing_environment + slot, len) == -1)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p.\n"),
                       ACE_TEXT ("ACE_Process_Options::ACE_Process_Options")));
           break;
@@ -954,17 +962,32 @@ ACE_Process_Options::setenv (const ACE_TCHAR *format, ...)
 {
   ACE_TCHAR stack_buf[DEFAULT_COMMAND_LINE_BUF_LEN];
 
+  int status;
   // Start varargs.
   va_list argp;
   va_start (argp, format);
 
   // Add the rest of the varargs.
-  ACE_OS::vsprintf (stack_buf,
-                    format,
-                    argp);
+  // At the time of this writing, only one platform does not support
+  // vsnprintf (LynxOS). Should we get to the point where no platform
+  // sets ACE_LACKS_VSNPRINTF, this condition can be removed.
+#if defined (ACE_LACKS_VSNPRINTF)
+  status = ACE_OS::vsprintf (stack_buf,
+                             format,
+                             argp);
+#else
+  status = ACE_OS::vsnprintf (stack_buf,
+                              DEFAULT_COMMAND_LINE_BUF_LEN,
+                              format,
+                              argp);
+#endif /* ACE_LACKS_VSNPRINTF */
+
   // End varargs.
   va_end (argp);
 
+  if (status == -1)
+    return -1;
+
   // Append the string to are environment buffer.
   if (this->setenv_i (stack_buf,
                       ACE_OS::strlen (stack_buf)) == -1)
@@ -989,16 +1012,18 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
   ACE_NEW_RETURN (newformat, ACE_TCHAR[buflen], -1);
   ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe_newformat (newformat);
 
+# if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+  const ACE_TCHAR *fmt = ACE_TEXT ("%ls=%ls");
+# else
+  const ACE_TCHAR *fmt = ACE_TEXT ("%s=%s");
+# endif
+
   // Add in the variable name.
   ACE_OS::sprintf (safe_newformat.get (),
-                   ACE_TEXT ("%s=%s"),
+                   fmt,
                    variable_name,
                    format);
 
-  // Start varargs.
-  va_list argp;
-  va_start (argp, format);
-
   // Add the rest of the varargs.
   size_t tmp_buflen = buflen;
   if (DEFAULT_COMMAND_LINE_BUF_LEN > buflen)
@@ -1013,7 +1038,15 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
 
   do
     {
+      // Must restart varargs on each time through this loop,
+      va_list argp;
+      va_start (argp, format);
+
       retval = ACE_OS::vsnprintf (safe_stack_buf.get (), tmp_buflen, safe_newformat.get (), argp);
+
+      // End varargs.
+      va_end (argp);
+
       if (retval > ACE_Utils::truncate_cast<int> (tmp_buflen))
         {
           tmp_buflen *= 2;
@@ -1035,7 +1068,10 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
           // ALERT: Since we have to use vsprintf here, there is still a chance that
           // the stack_buf overflows, i.e., the length of the resulting string
           // can still possibly go beyond the allocated stack_buf.
+          va_list argp;
+          va_start (argp, format);
           retval = ACE_OS::vsprintf (safe_stack_buf.get (), safe_newformat.get (), argp);
+          va_end (argp);
           if (retval == -1)
             // vsprintf is failed.
             return -1;
@@ -1045,9 +1081,6 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
         return -1;
     }
 
-  // End varargs.
-  va_end (argp);
-
   // Append the string to our environment buffer.
   if (this->setenv_i (safe_stack_buf.get (),
                       ACE_OS::strlen (safe_stack_buf.get ())) == -1)
@@ -1198,7 +1231,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *const argv[])
 
           if (cur_len > command_line_buf_len_)
             {
-              ACE_ERROR_RETURN ((LM_ERROR,
+              ACELIB_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("ACE_Process:command_line: ")
                                  ACE_TEXT ("command line is ")
                                  ACE_TEXT ("longer than %d\n"),
diff --git a/dep/acelite/ace/Process.h b/dep/acelite/ace/Process.h
index ba5f70185..c66ecc6f6 100644
--- a/dep/acelite/ace/Process.h
+++ b/dep/acelite/ace/Process.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Process.h
  *
- *  $Id: Process.h 93506 2011-03-09 10:42:51Z vzykov $
+ *  $Id: Process.h 97553 2014-01-30 17:01:44Z shuston $
  *
  *  @author Tim Harrison <harrison@cs.wustl.edu>
  */
@@ -206,7 +206,7 @@ public:
   /// same as the single string in the prior case and can be obtained by
   /// providing max_len. @arg max_len, if non-zero, provides a location
   /// into which the total length of the command line buffer is returned.
-  ACE_TCHAR *command_line_buf (int *max_len = 0);
+  ACE_TCHAR *command_line_buf (size_t *max_len = 0);
 
   /**
    * argv-style command-line options.  Parses and modifies the string
@@ -469,93 +469,117 @@ protected:
 /**
  * @class ACE_Process
  *
- * @brief Process
+ * @brief A portable encapsulation for creating and managing new processes.
  *
- * A Portable encapsulation for creating new processes.
- * Notice that on UNIX platforms, if the <setenv> is used, the
- * <spawn> is using the <execve> system call. It means that the
- * <command_line> should include a full path to the program file
- * (<execve> does not search the PATH).  If <setenv> is not used
- * then, the <spawn> is using the <execvp> which searches for the
- * program file in the PATH variable.
+ * ACE_Process provides a convenient way to:
+ *  - Spawn child processes, with convenient hooks for pre- and post-spawn
+ *    actions
+ *  - Check if a spawned process is still running
+ *  - Kill a spawned child process
+ *  - Wait for a spawned child process to exit.
+ *
+ * @see ACE_Process_Options because it is used to
+ * pass options when spawning child processes.
+ *
+ * @see ACE_Process_Manager for additional ways to manage spawned
+ * processes.
  */
 class ACE_Export ACE_Process
 {
 public:
   friend class ACE_Process_Manager;
 
-  /// Default construction.  Must use <ACE_Process::spawn> to start.
+  /// Default construction.  Use ACE_Process::spawn() to start a process.
   ACE_Process (void);
 
   /// Destructor.
   virtual ~ACE_Process (void);
 
   /**
-   * Called just before <ACE_OS::fork> in the <spawn>.  If this
-   * returns non-zero, the <spawn> is aborted (and returns
-   * ACE_INVALID_PID).  The default simply returns zero.
+   * Called back from spawn() just before spawning the child.  If this
+   * returns non-zero, the spawn is aborted (and returns ACE_INVALID_PID).
+   * The default returns zero.
    */
   virtual int prepare (ACE_Process_Options &options);
 
   /**
-   * Launch a new process as described by @a options. On success,
-   * returns 1 if the option avoid_zombies is set, else returns the
-   * process id of the newly spawned child. Returns -1 on
-   * failure. This will be fixed in the future versions of ACE when
-   * the process id of the child will be returned regardless of the option.
+   * Launch a new process as described by @a options.
+   *
+   * @retval -1 on failure; check @c errno for error code.
+   * @retval 1 on success if the option @c avoid_zombies is set.
+   * @retval other the process id of the newly spawned child.
+   *
+   * @note The return value 1 may be changed in future versions of ACE to be
+   * the process id of the child will be returned regardless of the
+   * @c avoid_zombies option.
+   *
+   * @note On UNIX platforms, spawn() uses the execvp() system call if
+   * ACE_Process_Options::inherit_environment() returns true (which is the
+   * default) and execve() if not. Since execve() does not search PATH, the
+   * ACE_Process_Options::command_line() should include a full path to the
+   * program file.
    */
   virtual pid_t spawn (ACE_Process_Options &options);
 
-  /// Called just after <ACE_OS::fork> in the parent's context, if the
-  /// <fork> succeeds.  The default is to do nothing.
+  /// Called back from spawn() in the parent's context just after forking,
+  /// if the fork succeeds.  The default simply returns.
   virtual void parent (pid_t child);
 
   /**
-   * Called just after <ACE_OS::fork> in the child's context.  The
-   * default does nothing.  This function is *not* called on Win32
+   * Called back from spawn() in the child's context just after forking.  The
+   * default does nothing.
+   *
+   * @note This function is *not* called on Windows
    * because the process-creation scheme does not allow it.
    */
   virtual void child (pid_t parent);
 
-  /// Called by a Process_Manager that is removing this Process from
-  /// its table of managed Processes.  Default is to do nothing.
+  /// Called by a ACE_Process_Manager that is removing this object from
+  /// its table of managed processes. Default is to do nothing.
   virtual void unmanage (void);
 
   /**
-   * Wait for the process we've created to exit.  If @a status != 0, it
-   * points to an integer where the function store the exit status of
-   * child process to.  If @a wait_options == @c WNOHANG then return 0
-   * and don't block if the child process hasn't exited yet.  A return
-   * value of -1 represents the <wait> operation failed, otherwise,
-   * the child process id is returned.
+   * Wait for a previously spawned process to exit.
+   *
+   * @arg status Points to a location to receive the exit status of the
+   *      spawned process. Ignored if the value is 0.
+   * @arg wait_options If @c WNOHANG then return 0 and don't block if the
+   *      child process hasn't exited yet.
+   *
+   * @retval -1 the wait operation failed; consult @c errno for details.
+   * @retval other the child process id is returned on success.
    */
   pid_t wait (ACE_exitcode *status = 0,
               int wait_options = 0);
 
   /**
-   * Timed wait for the process we've created to exit.  A return value
-   * of -1 indicates that the something failed; 0 indicates that a
-   * timeout occurred.  Otherwise, the child's process id is returned.
-   * If @a status != 0, it points to an integer where the function
-   * stores the child's exit status.
+   * Timed wait for a previously spawned process to exit.
    *
-   * @note On UNIX platforms this function uses <ualarm>, i.e., it
+   * @arg tv A relative amount of time to wait for the process to exit.
+   * @arg status Points to a location to receive the exit status of the
+   *      spawned process. Ignored if the value is 0.
+   *
+   * @retval 0 the specified time period elapsed before the process exited.
+   * @retval -1 the wait operation failed; consult @c errno for details.
+   * @retval other the child process id is returned on success.
+   *
+   * @note On UNIX platforms this function uses @c ualarm(), i.e., it
    * overwrites any existing alarm.  In addition, it steals all
-   * <SIGCHLD>s during the timeout period, which will break another
-   * <ACE_Process_Manager> in the same process that's expecting
-   * <SIGCHLD> to kick off process reaping.
+   * @c SIGCHLD signals during the timeout period, which will break another
+   * ACE_Process_Manager in the same process that's expecting
+   * @c SIGCHLD to kick off process reaping.
    */
   pid_t wait (const ACE_Time_Value &tv,
               ACE_exitcode *status = 0);
 
-  /// Send the process a signal.  This is only portable to operating
+  /// Send the process a signal.  This only has an effect on operating
   /// systems that support signals, such as UNIX/POSIX.
   int kill (int signum = SIGINT);
 
   /**
    * Terminate the process abruptly using ACE::terminate_process().
    * This call doesn't give the process a chance to cleanup, so use it
-   * with caution...
+   * with caution.
    */
   int terminate (void);
 
@@ -568,23 +592,22 @@ public:
   /// Return 1 if running; 0 otherwise.
   int running (void) const;
 
-  /// Return the Process' exit code.  This method returns the raw
-  /// exit status returned from system APIs (such as <wait> or
-  /// <waitpid>).  This value is system dependent.
+  /// Return the process's exit code.  This method returns the raw
+  /// exit status returned from system APIs (such as @c wait() or
+  /// @c waitpid() ).  This value is system dependent.
   ACE_exitcode exit_code (void) const;
 
-  /// Return the Process' return value.  This method returns the
-  /// actual return value that a child process returns or <exit>s.
+  /// Return the process's return value.  This method returns the
+  /// actual return value that a child process returns or exits with.
   int return_value (void) const;
 
   /// Close all the handles in the set obtained from the
-  /// @arg ACE_Process_Options::dup_handles object used to spawn
+  /// @a ACE_Process_Options::dup_handles object used to spawn
   /// the process.
   void close_dup_handles (void);
 
-  /// Close all the handles in the set obtained from the
-  /// @arg ACE_Process_Options::passed_handles object used to spawn
-  /// the process.
+  /// Close all the passed handles in the set obtained from the
+  /// ACE_Process_Options object used to spawn the process.
   void close_passed_handles (void);
 
 #if defined (ACE_WIN32)
@@ -598,8 +621,8 @@ private:
   void operator= (const ACE_Process &);
 
 protected:
-  /// Set this process' <exit_code_>.  ACE_Process_Manager uses this
-  /// method to set the <exit_code_> after successfully waiting for
+  /// Set this process's exit code.  ACE_Process_Manager uses this
+  /// method to set the exit code after successfully waiting for
   /// this process to exit.
   void exit_code (ACE_exitcode code);
 
diff --git a/dep/acelite/ace/Process.inl b/dep/acelite/ace/Process.inl
index 8b68efc0c..bb0722d2c 100644
--- a/dep/acelite/ace/Process.inl
+++ b/dep/acelite/ace/Process.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Process.inl 83405 2008-10-23 06:30:06Z johnnyw $
+// $Id: Process.inl 97660 2014-03-17 09:49:33Z johnnyw $
 
 #include "ace/ACE.h"
 #include "ace/OS_NS_sys_wait.h"
@@ -48,8 +48,7 @@ ACE_Process::gethandle (void) const
 }
 
 ACE_INLINE pid_t
-ACE_Process::getpid (void)
-    const
+ACE_Process::getpid (void) const
 {
 #if defined (ACE_WIN32)
   return process_info_.dwProcessId;
@@ -327,7 +326,7 @@ ACE_Process_Options::getegid (void) const
 #endif /* ACE_WIN32 */
 
 ACE_INLINE ACE_TCHAR *
-ACE_Process_Options::command_line_buf (int *max_lenp)
+ACE_Process_Options::command_line_buf (size_t *max_lenp)
 {
   if (max_lenp != 0)
     *max_lenp = this->command_line_buf_len_;
diff --git a/dep/acelite/ace/Process_Manager.cpp b/dep/acelite/ace/Process_Manager.cpp
index 7687e1ed8..b08ac9367 100644
--- a/dep/acelite/ace/Process_Manager.cpp
+++ b/dep/acelite/ace/Process_Manager.cpp
@@ -1,4 +1,4 @@
-// $Id: Process_Manager.cpp 94454 2011-09-08 17:36:56Z johnnyw $
+// $Id: Process_Manager.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 // Process_Manager.cpp
 #include "ace/Process_Manager.h"
@@ -12,7 +12,7 @@
 #include "ace/Process.h"
 #include "ace/Signal.h"
 #include "ace/Object_Manager.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Reactor.h"
 #include "ace/Countdown_Time.h"
 #include "ace/OS_NS_sys_wait.h"
@@ -69,12 +69,12 @@ ACE_Process_Manager::Process_Descriptor::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Process_Manager::Process_Descriptor::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nproc_id_ = %d"),
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nproc_id_ = %d"),
                           this->process_->getpid( )));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -84,15 +84,15 @@ ACE_Process_Manager::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Process_Manager::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nmax_process_table_size_ = %d"), this->max_process_table_size_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncurrent_count_ = %d"), this->current_count_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nmax_process_table_size_ = %d"), this->max_process_table_size_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncurrent_count_ = %d"), this->current_count_));
 
   for (size_t i = 0; i < this->current_count_; i++)
     this->process_table_[i].dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -259,7 +259,7 @@ ACE_Process_Manager::ACE_Process_Manager (size_t size,
 
   if (this->open (size, r) == -1)
     {
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p\n"),
                   ACE_TEXT ("ACE_Process_Manager")));
     }
@@ -329,6 +329,19 @@ ACE_Process_Manager::handle_input (ACE_HANDLE)
   return 0;
 }
 
+int
+ACE_Process_Manager::handle_close (ACE_HANDLE /* handle */,
+                                   ACE_Reactor_Mask close_mask)
+{
+  ACE_TRACE ("ACE_Process_Manager::handle_close");
+  if (close_mask == ACE_Event_Handler::SIGNAL_MASK)
+    {
+      // Reactor is telling us we're gone; don't unregister again later.
+      this->reactor (0);
+    }
+  return 0;
+}
+
 #endif /* !ACE_WIN32 */
 
 // On Unix, this routine is called asynchronously when a SIGCHLD is
@@ -369,7 +382,7 @@ ACE_Process_Manager::handle_signal (int,
           return -1; // remove this HANDLE/Event_Handler combination
         }
       else
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("Process still active")
                            ACE_TEXT (" -- shouldn't have been called yet!\n")),
                           0); // return 0 : stay registered
@@ -377,7 +390,7 @@ ACE_Process_Manager::handle_signal (int,
   else
     {
       // <GetExitCodeProcess> failed.
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("GetExitCodeProcess failed")),
                         -1); // return -1: unregister
     }
@@ -868,7 +881,7 @@ ACE_Process_Manager::wait (pid_t pid,
               // uh oh...handle removed from process_table_, even though
               // we're holding a lock!
               delete [] handles;
-              ACE_ERROR_RETURN ((LM_ERROR,
+              ACELIB_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("Process removed")
                                  ACE_TEXT (" -- somebody's ignoring the lock!\n")),
                                 -1);
@@ -951,7 +964,7 @@ ACE_Process_Manager::wait (pid_t pid,
       if (idx == -1)
         {
           // oops, reaped an unmanaged process!
-          ACE_DEBUG ((LM_DEBUG,
+          ACELIB_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%P|%t) oops, reaped unmanaged %d\n"),
                       pid));
           return pid;
@@ -998,7 +1011,7 @@ ACE_Process_Manager::notify_proc_handler (size_t i,
     }
   else
     {
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P:%t|%T) ACE_Process_Manager::notify_proc_handler:")
                   ACE_TEXT (" unknown/unmanaged process reaped\n")));
       return 0;
diff --git a/dep/acelite/ace/Process_Manager.h b/dep/acelite/ace/Process_Manager.h
index 2f50e7618..2a72c0204 100644
--- a/dep/acelite/ace/Process_Manager.h
+++ b/dep/acelite/ace/Process_Manager.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Process_Manager.h
  *
- *  $Id: Process_Manager.h 92489 2010-11-05 00:33:37Z shuston $
+ *  $Id: Process_Manager.h 97551 2014-01-29 20:54:06Z shuston $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -39,9 +39,9 @@ class ACE_Reactor;
  * @brief Manages a group of processes.
  *
  * This class allows applications to control groups of processes,
- * similar to how the ACE_Thread_Manager controls groups of
+ * similar to the way ACE_Thread_Manager controls groups of
  * threads.  Naturally, it doesn't work at all on platforms, such
- * as VxWorks or pSoS, that don't support process.
+ * as VxWorks or pSoS, that don't support multiple processes.
  * There are two main ways of using ACE_Process_Manager,
  * depending on how involved you wish to be with the termination
  * of managed processes.  If you want processes to simply
@@ -82,7 +82,7 @@ class ACE_Reactor;
  * spawned process exits, or when any process without a specific
  * ACE_Event_Handler exits.  When a process exits, the
  * appropriate ACE_Event_Handler's handle_input() method is called; the
- * ACE_HANDLE passed is either the process's HANDLE (on Win32),
+ * ACE_HANDLE passed is either the process's HANDLE (on Windows),
  * or its pid cast to an ACE_HANDLE (on POSIX).
  * It is also possible to call the wait() functions even when the
  * ACE_Process_Manager is registered with a reactor.
@@ -167,6 +167,8 @@ public:
   /**
    * Create a new process with specified @a options.
    * Register @a event_handler to be called back when the process exits.
+   * The @a proc object's ACE_Process::unmanage() method is called when
+   * the process is removed from ACE_Process_Manager.
    *
    * On success, returns the process id of the child that was created.
    * On failure, returns ACE_INVALID_PID.
@@ -354,6 +356,12 @@ protected:
 #if !defined(ACE_WIN32)
   /// Collect one (or more, on unix) process exit status.
   virtual int handle_input (ACE_HANDLE proc);
+
+  /// If registered with a reactor for SIGCHLD and the reactor closes, this
+  /// will get called to notify.
+  virtual int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask close_mask);
+
 #endif // !defined(ACE_WIN32)
 
   /**
diff --git a/dep/acelite/ace/Process_Mutex.cpp b/dep/acelite/ace/Process_Mutex.cpp
index 28d414d05..ac5b2a157 100644
--- a/dep/acelite/ace/Process_Mutex.cpp
+++ b/dep/acelite/ace/Process_Mutex.cpp
@@ -1,7 +1,7 @@
-// $Id: Process_Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Process_Mutex.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Process_Mutex.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 #include "ace/Guard_T.h"
 #include "ace/Process_Mutex.h"
@@ -22,9 +22,9 @@ ACE_Process_Mutex::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Process_Mutex::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Process_Semaphore.cpp b/dep/acelite/ace/Process_Semaphore.cpp
index 6b94f0efa..9bed1fc17 100644
--- a/dep/acelite/ace/Process_Semaphore.cpp
+++ b/dep/acelite/ace/Process_Semaphore.cpp
@@ -1,7 +1,7 @@
-// $Id: Process_Semaphore.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Process_Semaphore.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Process_Semaphore.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_Memory.h"
 
 #if !defined (__ACE_INLINE__)
@@ -19,9 +19,9 @@ ACE_Process_Semaphore::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Process_Semaphore::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Profile_Timer.cpp b/dep/acelite/ace/Profile_Timer.cpp
index 013d40e08..8bf7a1a1d 100644
--- a/dep/acelite/ace/Profile_Timer.cpp
+++ b/dep/acelite/ace/Profile_Timer.cpp
@@ -1,4 +1,4 @@
-// $Id: Profile_Timer.cpp 95761 2012-05-15 18:23:04Z johnnyw $
+// $Id: Profile_Timer.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Profile_Timer.h"
 
@@ -6,7 +6,7 @@
 # include "ace/Profile_Timer.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (ACE_HAS_PRUSAGE_T)
@@ -49,7 +49,7 @@ ACE_Profile_Timer::ACE_Profile_Timer (void)
 
   this->proc_handle_ = ACE_OS::open (buf, O_RDONLY, 0);
   if (this->proc_handle_ == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 buf));
 #  elif defined (ACE_HAS_GETRUSAGE)
@@ -65,7 +65,7 @@ ACE_Profile_Timer::~ACE_Profile_Timer (void)
   ACE_TRACE ("ACE_Profile_Timer::~ACE_Profile_Timer");
 #  if defined (ACE_HAS_PRUSAGE_T)
   if (ACE_OS::close (this->proc_handle_) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_Profile_Timer::~ACE_Profile_Timer")));
 #  endif /* ACE_HAS_PRUSAGE_T */
 }
diff --git a/dep/acelite/ace/QoS/ACE_QoS_Export.h b/dep/acelite/ace/QoS/ACE_QoS_Export.h
deleted file mode 100644
index 501d4be64..000000000
--- a/dep/acelite/ace/QoS/ACE_QoS_Export.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-// $Id: ACE_QoS_Export.h 80826 2008-03-04 14:51:23Z wotte $
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
-// ------------------------------
-#if !defined (ACE_QOS_EXPORT_H)
-#define ACE_QOS_EXPORT_H
-
-#include /**/ "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS)
-# if !defined (ACE_QoS_HAS_DLL)
-#   define ACE_QoS_HAS_DLL 0
-# endif /* ! ACE_QoS_HAS_DLL */
-#else
-# if !defined (ACE_QoS_HAS_DLL)
-#   define ACE_QoS_HAS_DLL 1
-# endif /* ! ACE_QoS_HAS_DLL */
-#endif /* ACE_AS_STATIC_LIB */
-
-#if defined (ACE_QoS_HAS_DLL)
-#  if (ACE_QoS_HAS_DLL == 1)
-#    if defined (ACE_QoS_BUILD_DLL)
-#      define ACE_QoS_Export ACE_Proper_Export_Flag
-#      define ACE_QoS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define ACE_QoS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    else
-#      define ACE_QoS_Export ACE_Proper_Import_Flag
-#      define ACE_QoS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define ACE_QoS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    endif /* ACE_QoS_BUILD_DLL */
-#  else
-#    define ACE_QoS_Export
-#    define ACE_QoS_SINGLETON_DECLARATION(T)
-#    define ACE_QoS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif   /* ! ACE_QoS_HAS_DLL == 1 */
-#else
-#  define ACE_QoS_Export
-#  define ACE_QoS_SINGLETON_DECLARATION(T)
-#  define ACE_QoS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif     /* ACE_QoS_HAS_DLL */
-
-#endif     /* ACE_QOS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/QoS/QoS_Decorator.cpp b/dep/acelite/ace/QoS/QoS_Decorator.cpp
deleted file mode 100644
index 64aefeecc..000000000
--- a/dep/acelite/ace/QoS/QoS_Decorator.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-// QoS_Decorator.cpp
-// $Id: QoS_Decorator.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-
-#include "QoS_Decorator.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_QOS_DECORATOR)
-
-// Constructor.
-ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base (void)
-{}
-
-// Constructor.
-ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base (ACE_Event_Handler
-                                                *event_handler)
-  : event_handler_ (event_handler)
-{
-}
-
-// Destructor.
-ACE_QoS_Decorator_Base::~ACE_QoS_Decorator_Base (void)
-{
-}
-
-// Forward the call to ACE_Event_Handler component.
-ACE_HANDLE
-ACE_QoS_Decorator_Base::get_handle (void) const
-{
- return this->event_handler_->get_handle ();
-}
-
-// Forward the call to ACE_Event_Handler component.
-int
-ACE_QoS_Decorator_Base::handle_input (ACE_HANDLE fd)
-{
-  return this->event_handler_->handle_input (fd);
-}
-
-// Forward the call to ACE_Event_Handler component.
-int
-ACE_QoS_Decorator_Base::handle_qos (ACE_HANDLE fd)
-{
-  return this->event_handler_->handle_qos (fd);
-}
-
-// Constructor.
-ACE_QoS_Decorator::ACE_QoS_Decorator (void)
-{}
-
-// Constructor.
-ACE_QoS_Decorator::ACE_QoS_Decorator (ACE_Event_Handler *event_handler,
-                                      ACE_QoS_Session *qos_session,
-                                      ACE_Reactor *reactor)
-  : qos_session_ (qos_session),
-    reactor_ (reactor)
-{
-  ACE_NEW (this->decorator_base_,
-           ACE_QoS_Decorator_Base (event_handler));
-
-  ACE_NEW (this->qos_event_handler_,
-           ACE_QoS_Event_Handler (this->decorator_base_));
-}
-
-// Destructor.
-ACE_QoS_Decorator::~ACE_QoS_Decorator (void)
-{
-  delete this->decorator_base_;
-  delete this->qos_event_handler_;
-}
-
-// Implements the undecorated functionality. This is sufficient for
-// GQoS. RAPI needs additional QoS decoration. This is done by the
-// ACE_QoS_Event_Handler class.
-ACE_HANDLE
-ACE_QoS_Decorator::get_handle (void) const
-{
-  return this->decorator_base_->get_handle ();
-}
-
-// Implements the undecorated functionality. This is sufficient for
-// GQoS. RAPI needs additional QoS decoration. This is done by the
-// ACE_QoS_Event_Handler class.
-int
-ACE_QoS_Decorator::handle_input (ACE_HANDLE fd)
-{
-  return this->decorator_base_->handle_input (fd);
-}
-
-// Implements the undecorated functionality. This is sufficient for
-// GQoS. RAPI needs additional QoS decoration. This is done by the
-// ACE_QoS_Event_Handler class.
-int
-ACE_QoS_Decorator::handle_qos (ACE_HANDLE fd)
-{
-  return this->decorator_base_->handle_qos (fd);
-}
-
-// This method registers the RAPI QoS event handler with the reactor
-// if the application is using RAPI. Note that it is a no-op for GQoS
-// because an extra socket for handling QoS events is not required.
-int
-ACE_QoS_Decorator::init (void)
-{
-#if defined (ACE_HAS_RAPI)
-
-  // Pass the QoS session to QoS Event Handler.
-  this->qos_event_handler_->qos_session (this->qos_session_);
-
-  // Register the QoS Event Handler with the Reactor.
-  return this->reactor_->register_handler (this->qos_event_handler_,
-                                           ACE_Event_Handler::READ_MASK);
-#endif
-  return 0;
-
-}
-
-// Constructor.
-ACE_QoS_Event_Handler::ACE_QoS_Event_Handler (void)
-{
-}
-
-// Constructor.
-ACE_QoS_Event_Handler::ACE_QoS_Event_Handler (ACE_QoS_Decorator_Base
-                                              *decorator_base)
-  : decorator_base_ (decorator_base)
-{
-}
-
-// Destructor.
-ACE_QoS_Event_Handler::~ACE_QoS_Event_Handler (void)
-{
-}
-
-// Set the QoS session.
-void
-ACE_QoS_Event_Handler::qos_session (ACE_QoS_Session *qos_session)
-{
-  this->qos_session_ = qos_session;
-}
-
-// Returns the RAPI file descriptor for listening to RAPI evnets.
-ACE_HANDLE
-ACE_QoS_Event_Handler::get_handle (void) const
-{
-  return this->qos_session_->rsvp_events_handle ();
-}
-
-// Note, here the handle_input () calls the handle_qos () of the
-// Decorator Base which then calls handle_qos () of the
-// ACE_Event_Handler component within it. This helps to translate the
-// normal read events into qos events in case of RAPI so the
-// application using the API is oblivious to the fact that in RAPI,
-// QoS events are received on a different socket. This helps to
-// maintain a uniform design for the application irrespective of
-// whether it is using RAPI or GQoS.
-int
-ACE_QoS_Event_Handler::handle_input (ACE_HANDLE fd)
-{
-  return this->decorator_base_->handle_qos (fd);
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/QoS/QoS_Decorator.h b/dep/acelite/ace/QoS/QoS_Decorator.h
deleted file mode 100644
index 216f248c9..000000000
--- a/dep/acelite/ace/QoS/QoS_Decorator.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    QoS_Decorator.h
- *
- *  $Id: QoS_Decorator.h 80826 2008-03-04 14:51:23Z wotte $
- *
- *  @author Vishal Kachroo <vishal@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef QOS_DECORATOR_H
-#define QOS_DECORATOR_H
-#include /**/ "ace/pre.h"
-
-#include "ace/Reactor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/INET_Addr.h"
-#include "ace/Event_Handler.h"
-#include "SOCK_Dgram_Mcast_QoS.h"
-#include "ACE_QoS_Export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_QoS_Decorator_Base
- *
- * @brief This class is the Decorator Pattern Base class for decorating
- * ACE_Event_Handler.
- *
- * It simply forwards the requests for get_handle (),
- * handle_input () and handle_qos () to its event_handler_
- * component. Concrete decorators for ACE_Event_Handler will use
- * this class to access the basic event handler functionality and
- * decorate that by their own implementation.
- */
-class ACE_QoS_Export ACE_QoS_Decorator_Base : public ACE_Event_Handler
-{
-
-public:
-
-  // Initialization and termination methods.
-  /// Constructor.
-  ACE_QoS_Decorator_Base (void);
-
-  /// Constructor.
-  ACE_QoS_Decorator_Base (ACE_Event_Handler *event_handler);
-
-  /// Destructor.
-  ~ACE_QoS_Decorator_Base (void);
-
-  /// Forwards the request to its event_handler_ component.
-  virtual ACE_HANDLE get_handle (void) const;
-
-  /// Forwards the request to its event_handler_ component.
-  virtual int handle_input (ACE_HANDLE fd);
-
-  /// Forwards the request to its event_handler_ component.
-  virtual int handle_qos (ACE_HANDLE fd);
-
-private:
-
-  /// The event handler that is decorated by this class.
-  ACE_Event_Handler *event_handler_;
-
-};
-
-/**
- * @class ACE_QoS_Event_Handler
- *
- * @brief This Handler is registered with the Reactor for QoS events.
- *
- * Concrete QoS decorator uses this class to receive QoS events
- * for RAPI.  It hides the application from knowing that it is
- * receiving QoS events on a different socket so the application
- * doesnt have to be designed differently for RAPI and GQoS.
- */
-class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler
-{
-
-  /// Destructor.
-  ~ACE_QoS_Event_Handler (void);
-
-  /// Returns the RAPI file descriptor for receiving QoS events.
-  virtual ACE_HANDLE get_handle (void) const;
-
-  /// Calls the base class handle_input ().
-  virtual int handle_input (ACE_HANDLE fd);
-
-  /// Sets the QoS session.
-  void qos_session (ACE_QoS_Session *qos_session);
-
-  friend class ACE_QoS_Decorator;
-
-private:
-
-  /// Constructor is private because only ACE_QoS_Decorator should
-  /// create this object.
-  ACE_QoS_Event_Handler (void);
-
-  /// The QoS Decorator passes in its base for this handler to use.
-  ACE_QoS_Event_Handler (ACE_QoS_Decorator_Base *decorator_base);
-
-  /// Used to get to the RAPI file descriptor for QoS Events.
-  ACE_QoS_Session *qos_session_;
-
-  /// Requests on the class are forwarded to this base class;
-  ACE_QoS_Decorator_Base *decorator_base_;
-
-};
-
-/**
- * @class ACE_QoS_Decorator
- *
- * @brief Concrete QoS Decorator.
- *
- * Decorates the ACE_Event_Handler to additionally handle QoS
- * events uniformly for different QoS mechanisms like RAPI and
- * GQoS.
- */
-class ACE_QoS_Export ACE_QoS_Decorator : public ACE_QoS_Decorator_Base
-{
-
-public:
-
-  // Initialization and termination methods.
-  /// Constructor.
-  ACE_QoS_Decorator (void);
-
-  /// Constructor.
-  ACE_QoS_Decorator (ACE_Event_Handler *event_handler,
-                     ACE_QoS_Session *qos_session,
-                     ACE_Reactor *reactor = ACE_Reactor::instance ());
-
-  /// Destructor.
-  ~ACE_QoS_Decorator (void);
-
-  /// Calls the base class get_handle ().
-  virtual ACE_HANDLE get_handle (void) const;
-
-  /// Calls the base class handle_input ().
-  virtual int handle_input (ACE_HANDLE fd);
-
-  /// Calls the base class handle_qos ().
-  virtual int handle_qos (ACE_HANDLE fd);
-
-  /// This method registers the QoS Event Handler with the Reactor
-  /// to receive RAPI events.
-  int init (void);
-
-private:
-
-  /// Requests on the class are forwarded to this base class;
-  ACE_QoS_Decorator_Base *decorator_base_;
-
-  /// Handles the QoS events and in that sense decorates the usual
-  /// ACE_Event_Handler.
-  ACE_QoS_Event_Handler *qos_event_handler_;
-
-  /// Passed to the ACE_QoS_Event_Handler for retrieving the RAPI
-  /// session specific information like rapi_fd.
-  ACE_QoS_Session *qos_session_;
-
-  /// If the application wants to use an instance of Reactor other
-  /// than the Singleton one.
-  ACE_Reactor *reactor_;
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif  /* QOS_DECORATOR_H */
diff --git a/dep/acelite/ace/QoS/QoS_Manager.cpp b/dep/acelite/ace/QoS/QoS_Manager.cpp
deleted file mode 100644
index a11bd71a0..000000000
--- a/dep/acelite/ace/QoS/QoS_Manager.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// QoS_Manager.cpp
-// $Id: QoS_Manager.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-
-#include "QoS_Manager.h"
-#include "ace/Log_Msg.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_QOS_MANAGER)
-
-ACE_QoS_Manager::ACE_QoS_Manager (void)
-{}
-
-ACE_QoS_Manager::~ACE_QoS_Manager (void)
-{}
-
-// Adds the given session to the list of session objects joined by
-// this socket.
-
-int
-ACE_QoS_Manager::join_qos_session (ACE_QoS_Session *qos_session)
-{
-  if (this->qos_session_set ().insert (qos_session) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Error in adding a new session to the ")
-                       ACE_TEXT ("socket session set\n")),
-                      -1);
-  return 0;
-}
-
-// Returns the QoS session set for this socket.
-
-ACE_Unbounded_Set <ACE_QoS_Session *>
-ACE_QoS_Manager::qos_session_set (void)
-{
-  return this->qos_session_set_;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/QoS/QoS_Manager.h b/dep/acelite/ace/QoS/QoS_Manager.h
deleted file mode 100644
index c9a3654a5..000000000
--- a/dep/acelite/ace/QoS/QoS_Manager.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    QoS_Manager.h
- *
- *  $Id: QoS_Manager.h 80826 2008-03-04 14:51:23Z wotte $
- *
- *  @author Vishal Kachroo
- */
-//=============================================================================
-
-
-#ifndef ACE_QOS_MANAGER_H
-#define ACE_QOS_MANAGER_H
-#include /**/ "ace/pre.h"
-
-#include "ace/Addr.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/IPC_SAP.h"
-#include "ace/Containers_T.h"
-#include "ACE_QoS_Export.h"
-#include "QoS_Session.h"
-
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_QoS_Manager
- *
- * @brief This class manages the QoS sessions associated with ACE_SOCK.
- *
- * This class provides functions to manage the QoS
- * associated with a socket.  The idea is to keep the management of
- * QoS for a socket separate from the socket itself. Currently, the
- * manager is used to manage the QoS session set. It will handle more
- * responsibilities in the future.
- */
-class ACE_QoS_Export ACE_QoS_Manager
-{
-
-public:
-  /// Default constructor.
-  ACE_QoS_Manager (void);
-
-  /// Default destructor.
-  ~ACE_QoS_Manager (void);
-
-  /**
-   * Join the given QoS session. A socket can join multiple QoS
-   * sessions.  This call adds the given QoS session to the list of
-   * QoS sessions that the socket has already joined.
-   */
-  int join_qos_session (ACE_QoS_Session *qos_session);
-
-  typedef ACE_Unbounded_Set <ACE_QoS_Session *> ACE_QOS_SESSION_SET;
-
-  /// Get the QoS session set.
-  ACE_QOS_SESSION_SET qos_session_set (void);
-
-private:
-
-  /// Set of QoS sessions that this socket has joined.
-  ACE_QOS_SESSION_SET qos_session_set_;
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* ACE_QOS_MANAGER_H */
diff --git a/dep/acelite/ace/QoS/QoS_Session.h b/dep/acelite/ace/QoS/QoS_Session.h
deleted file mode 100644
index 7ed9fb2ce..000000000
--- a/dep/acelite/ace/QoS/QoS_Session.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    QoS_Session.h
- *
- *  $Id: QoS_Session.h 91743 2010-09-13 18:24:51Z johnnyw $
- *
- *  @author Vishal Kachroo <vishal@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_QOS_SESSION_H
-#define ACE_QOS_SESSION_H
-#include /**/ "ace/pre.h"
-
-#include "ACE_QoS_Export.h"
-#include "ace/INET_Addr.h"
-#include "ace/OS_QoS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ACE_SOCK;
-class ACE_QoS_Manager;
-
-typedef int ACE_Protocol_ID;
-// IPPROTO_UDP or IPPROTO_TCP.
-
-/**
- * @class ACE_QoS_Session
- *
- * @brief A QoS Session object.
- *
- * This class defines the interface for a QoS Session. It abstracts the
- * notion of QoS on different platforms and presents a simple, easy-to-use
- * API. Current [RAPI,GQoS] and future implementations will conform to this
- * interface.
- */
-class ACE_QoS_Export ACE_QoS_Session
-{
-
-public:
-
-  enum RSVP_Event_Type
-  {
-    RSVP_PATH_EVENT,
-    RSVP_RESV_EVENT,
-    RSVP_RESV_CONFIRM,
-    RSVP_RESV_ERROR,
-    RSVP_PATH_ERROR
-  };
-
-  /// A flag to indicate if this endpoint is a sender or a receiver or
-  /// both.
-  enum ACE_End_Point_Type
-  {
-    ACE_QOS_SENDER,
-    ACE_QOS_RECEIVER,
-    ACE_QOS_BOTH
-  };
-
-
-  /// to shutup g++.
-  virtual ~ACE_QoS_Session (void) {};
-
-  /// Open a QoS session [dest IP, dest port, Protocol ID].
-  virtual int open (ACE_INET_Addr dest_addr,
-                    ACE_Protocol_ID protocol_id) = 0;
-
-  /// Close the QoS Session.
-  virtual int close (void) = 0;
-
-  /// Returns the QoS in the current session.
-  virtual ACE_QoS qos (void) const = 0;
-
-  /// Set QoS for the current session. The qos manager is used to
-  /// confirm if this QoS session was subscribed to by the socket.
-  virtual int qos (ACE_SOCK *socket,
-                   ACE_QoS_Manager *qos_manager,
-                   const ACE_QoS &ace_qos) = 0;
-
-  /**
-   * Sets the QoS for this session object to ace_qos. Does not
-   * interfere with the QoS in the underlying socket. This call is
-   * useful to update the QoS object when the underlying socket QoS is
-   * being set through a mechanism other than the previous qos ()
-   * method e.g. inside the dgram_mcast.subscribe () where the QoS for
-   * the socket is set through ACE_OS::join_leaf ().
-   */
-  virtual void qos (const ACE_QoS &ace_qos) = 0;
-
-  /**
-   * This is called from handle_qos () method of the the QoS Event
-   * Handler.  Invoking this method is an indication of a QoS event
-   * occurring, that may have resulted in a change of QoS for the
-   * underlying session. This method updates the QoS object associated
-   * with this session.
-   */
-  virtual int update_qos (void) = 0;
-
-  /// Get/Set methods for the flags_.
-  virtual ACE_End_Point_Type flags (void) const = 0;
-  virtual void flags (const ACE_End_Point_Type flags) = 0;
-
-  /// Get the session id.
-  virtual int session_id (void) const = 0;
-
-  /// Set the session id.
-  virtual void session_id (const int session_id) = 0;
-
-  /// Get the file descriptor on which RSVP events will occur.
-  virtual ACE_HANDLE rsvp_events_handle (void) = 0;
-
-  virtual void  rsvp_event_type (RSVP_Event_Type event_type) = 0;
-  ///Set the RAPI event that last occured
-
-  virtual RSVP_Event_Type rsvp_event_type (void) = 0;
-  ///Get the RAPI event that last occured
-
-
-  /// Get the destination address for this session.
-  virtual ACE_INET_Addr dest_addr (void) const = 0;
-
-  /// Set the destination address for this session.
-  virtual void dest_addr (const ACE_INET_Addr &dest_addr) = 0;
-
-  /// Get the source port for this session.
-  virtual u_short source_port (void) const = 0;
-
-  /// Set the source port for this session.
-  virtual void source_port (const u_short &source_port) = 0;
-
-  //Set the source host
-  virtual ACE_INET_Addr* source_addr (void) const = 0;
-
-  /// Set the source port for this session.
-  virtual void source_addr (ACE_INET_Addr* source_addr) = 0;
-
-
-  /**
-   * Returns the version of the underlying RSVP implementation. Is
-   * meaningful only when the underlying implementation has
-   * versioning.
-   */
-  virtual int version (void) = 0;
-
-protected:
-
-  /// Source port if this is a Sender session. Used for rapi_sender ().
-  u_short source_port_;
-
-  /// session id for the session.
-  int session_id_;
-
-  /// Destination address for this session.
-  ACE_INET_Addr dest_addr_;
-
-  /// Source address for this session.
-  ACE_INET_Addr* src_addr_;
-
-  /// Is this a TCP or a UDP session.
-  ACE_Protocol_ID protocol_id_;
-
-  /// QoS for this session.
-  ACE_QoS qos_;
-
-  /// Specifies if this is a sending/receiving/both session.
-  ACE_End_Point_Type flags_;
-
-  RSVP_Event_Type rsvp_event_type_;
-  //Has the last rsvp event that occured
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* ACE_QOS_SESSION_H */
diff --git a/dep/acelite/ace/QoS/QoS_Session_Factory.cpp b/dep/acelite/ace/QoS/QoS_Session_Factory.cpp
deleted file mode 100644
index 54716e97c..000000000
--- a/dep/acelite/ace/QoS/QoS_Session_Factory.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// QoS_Session_Factory.cpp
-// $Id: QoS_Session_Factory.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-
-#include "QoS_Session_Factory.h"
-#include "QoS_Session_Impl.h"
-#include "ace/Log_Msg.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_QoS_Session_Factory)
-
-#if defined(ACE_HAS_RAPI)
-const enum ACE_QoS_Session_Factory::ACE_QoS_Session_Type
-  ACE_QoS_Session_Factory::ACE_DEFAULT_QOS_SESSION = ACE_QoS_Session_Factory::ACE_RAPI_SESSION;
-#elif defined(ACE_HAS_WINSOCK2_GQOS)
-  const enum ACE_QoS_Session_Factory::ACE_QoS_Session_Type
-  ACE_QoS_Session_Factory::ACE_DEFAULT_QOS_SESSION = ACE_QoS_Session_Factory::ACE_GQOS_SESSION;
-#else
-#  error "QoS type not supported.  Cannot build."
-#endif /* ACE_HAS_RAPI */
-
-ACE_QoS_Session_Factory::ACE_QoS_Session_Factory (void)
-{
-  ACE_TRACE ("ACE_QoS_Session_Factory::ACE_QoS_Session_Factory");
-}
-
-ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory (void)
-{
-  ACE_TRACE ("ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory");
-}
-
-// Create a QoS session of the given type (RAPI or GQoS).
-ACE_QoS_Session *
-ACE_QoS_Session_Factory::create_session (ACE_QoS_Session_Type qos_session_type)
-{
-
-  ACE_QoS_Session * qos_session = 0;
-
-#if defined (ACE_HAS_RAPI)
-  if (qos_session_type == ACE_RAPI_SESSION)
-    ACE_NEW_RETURN (qos_session,
-                    ACE_RAPI_Session,
-                    0);
-#endif /* ACE_HAS_RAPI */
-
-  if (qos_session_type == ACE_GQOS_SESSION)
-    ACE_NEW_RETURN (qos_session,
-                    ACE_GQoS_Session,
-                    0);
-
-  if (this->add_session (qos_session) == -1)
-    {
-      delete qos_session;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Error in adding session\n")),
-                        0);
-    }
-
-  return qos_session;
-}
-
-// Destroy the QoS Session.
-int
-ACE_QoS_Session_Factory::destroy_session (ACE_QoS_Session *qos_session)
-{
-
-  if ((qos_session != 0) && (this->remove_session (qos_session) == -1))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Error in destroying session\n")),
-                      -1);
-
-  return 0;
-}
-
-// Add a session to the set of sessions created by this factory. This is a
-// private method called by the create_session ().
-int
-ACE_QoS_Session_Factory::add_session (ACE_QoS_Session *qos_session)
-{
-  if (this->qos_session_set_.insert (qos_session) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Error in adding a new session")
-                       ACE_TEXT ("to the session set\n")),
-                      -1);
-
-  return 0;
-}
-
-// Remove a session from the set of sessions created by this factory. This is
-// a private method called by the destroy_session ().
-int
-ACE_QoS_Session_Factory::remove_session (ACE_QoS_Session *qos_session)
-{
-  if (this->qos_session_set_.remove (qos_session) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Error in removing a session")
-                       ACE_TEXT ("from the session set\n")),
-                      -1);
-
-  return 0;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/QoS/QoS_Session_Factory.h b/dep/acelite/ace/QoS/QoS_Session_Factory.h
deleted file mode 100644
index f0840d418..000000000
--- a/dep/acelite/ace/QoS/QoS_Session_Factory.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    QoS_Session_Factory.h
- *
- *  $Id: QoS_Session_Factory.h 80826 2008-03-04 14:51:23Z wotte $
- *
- *  @author Vishal Kachroo <vishal@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_QOS_SESSION_FACTORY_H
-#define ACE_QOS_SESSION_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "ace/QoS/QoS_Session.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Containers_T.h"
-#include "ACE_QoS_Export.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Forward declare this, so the factory uses only references to this.
-class ACE_QoS_Session;
-
-/**
- * @class ACE_QoS_Session_Factory
- *
- * @brief Concrete factory for the QoS Session objects.
- *
- * This class manages the life cycle of QoS Session objects. These
- * objects are currently either RAPI session objects or GQoS session
- * objects. It stores the sessions in an unbounded set.
- */
-class ACE_QoS_Export ACE_QoS_Session_Factory
-{
-
-public :
-
-  // = Initialization and termination methods.
-  /// Default constructor.
-  ACE_QoS_Session_Factory (void);
-
-  /// Default destructor.
-  ~ACE_QoS_Session_Factory (void);
-
-
-  /// Types of sessions for this factory to manage.
-  enum ACE_QoS_Session_Type
-  {
-    /// ACE_RAPI_SESSION on Unix platforms with RAPI support
-    ACE_RAPI_SESSION,
-
-    /// ACE_GQOS_SESSION on Windows platforms with GQOS support
-    ACE_GQOS_SESSION
-  };
-
-  /**  The default QoS type supported on this platform.
-    *
-    *       ACE_DEFAULT_QOS_SESSION = ACE_RAPI_SESSION on Unix platforms with RAPI support
-    *                               = ACE_GQOS_SESSION on Windows platforms with GQOS support
-    */
-  static const enum ACE_QoS_Session_Type ACE_DEFAULT_QOS_SESSION;
-
-  /// Create a QoS session of the given type (RAPI or GQoS).
-  ACE_QoS_Session * create_session (ACE_QoS_Session_Type qos_session_type = ACE_DEFAULT_QOS_SESSION );
-
-  /// Destroy the QoS Session.
-  int destroy_session (ACE_QoS_Session *qos_session);
-
-private:
-
-  /// Used by the create_session () to add new sessions to the
-  /// set of sessions created by this factory.
-  int add_session (ACE_QoS_Session *qos_session);
-
-  /// Used by the destroy_session () to remove a session from the set
-  /// of sessions created by this factory.
-  int remove_session (ACE_QoS_Session *qos_session);
-
-  /// Unordered set of QoS Sessions.
-  typedef ACE_Unbounded_Set <ACE_QoS_Session *> QOS_SESSION_SET;
-  QOS_SESSION_SET qos_session_set_;
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* ACE_QOS_SESSION_FACTORY_H */
diff --git a/dep/acelite/ace/QoS/QoS_Session_Impl.cpp b/dep/acelite/ace/QoS/QoS_Session_Impl.cpp
deleted file mode 100644
index 301d71d1f..000000000
--- a/dep/acelite/ace/QoS/QoS_Session_Impl.cpp
+++ /dev/null
@@ -1,716 +0,0 @@
-// QoS_Session_Impl.cpp
-// $Id: QoS_Session_Impl.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-
-#include "ace/OS_NS_arpa_inet.h"
-#include "ace/SOCK.h"
-#include "QoS_Manager.h"
-#include "QoS_Session_Impl.h"
-#include "ace/Log_Msg.h"
-
-#if !defined (__ACE_INLINE__)
-#include "QoS_Session_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_QoS_Session_Impl)
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (ACE_HAS_RAPI)
-#include "rapi_err.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-int ACE_RAPI_Session::rsvp_error = 0;
-
-// Call back function used by RAPI to report RSVP events. This
-// function translates the RAPI QoS parameters into the more generic
-// ACE_QoS parameters for the underlying RAPI session.
-int
-rsvp_callback (rapi_sid_t /* sid */,
-               rapi_eventinfo_t eventype,
-               int /* style_id */,
-               int errcode,
-               int errvalue,
-               sockaddr * errnode,
-               u_char /* errflags */,
-               int /* filter_spec_no */,
-               rapi_filter_t * /* filter_spec_list */,
-               int flow_spec_no,
-               rapi_flowspec_t *flow_spec_list,
-               int /* ad_spec_no */,
-               rapi_adspec_t * /* ad_spec_list */,
-               void *args
-               )
-{
-  if (args == 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Argument in the call back function is null\n\n"));
-
-  ACE_QoS_Session *qos_session = (ACE_QoS_Session *) args;
-
-  qos_flowspecx_t *csxp = 0;
-
-  if (!flow_spec_list)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%N|%l) Null flow_spec_list\n"));
-    }
-  else
-    {
-      // Extended Legacy format.
-      csxp = &flow_spec_list->specbody_qosx;
-      if(!csxp)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "(%N|%l) Null csxp\n"),
-                            -1);
-        }
-    }
-
-  ACE_QoS ace_qos = qos_session->qos ();
-
-  switch(eventype)
-    {
-    case RAPI_PATH_EVENT:
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "RSVP PATH Event received\n"
-                    "No. of TSpecs received : %d %d\n",
-                    flow_spec_no, &flow_spec_list->len));
-
-        ACE_Flow_Spec *receiving_fs = 0;
-
-        if (flow_spec_no != 0)
-          {
-            ACE_NEW_RETURN (receiving_fs,
-                            ACE_Flow_Spec,
-                            -1);
-
-            ACE_NEW_RETURN (receiving_fs,
-                            ACE_Flow_Spec ((u_long)csxp->xspec_r,
-                                           (u_long)csxp->xspec_b,
-                                           (u_long)csxp->xspec_p,
-                                           0,
-                                           csxp->xspec_S,
-                                           1,
-                                           csxp->xspec_M,
-                                           csxp->xspec_m,
-                                           25,
-                                           0),
-                            -1);
-
-            ACE_DEBUG ((LM_DEBUG,
-                        "\nTSpec :\n"
-                        "\t Spec Type = %d\n"
-                        "\t Rate = %f\n"
-                        "\t Bucket = %f\n"
-                        "\t Peak = %f\n"
-                        "\t MPU = %d\n"
-                        "\t MDU = %d\n"
-                        "\t TTL = %d\n",
-                        csxp->spec_type,
-                        csxp->xspec_r,
-                        csxp->xspec_b,
-                        csxp->xspec_p,
-                        csxp->xspec_m,
-                        csxp->xspec_M,
-                        25));
-          }
-
-        // Set the sending flowspec QoS of the given session.
-        ace_qos.receiving_flowspec (receiving_fs);
-
-        qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_PATH_EVENT);
-      }
-    break;
-
-    case RAPI_RESV_EVENT:
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "RSVP RESV Event received\n"
-                    "No. of FlowSpecs received : %d\n",
-                    flow_spec_no));
-
-        ACE_Flow_Spec *sending_flow = 0;
-
-        if (flow_spec_no != 0)
-          {
-            ACE_NEW_RETURN (sending_flow,
-                            ACE_Flow_Spec,
-                            -1);
-
-            // Choose based on the service type : [QOS_GUARANTEEDX/QOS_CNTR_LOAD].
-            switch (csxp->spec_type)
-              {
-              case QOS_GUARANTEEDX:
-                // Slack term in MICROSECONDS
-                sending_flow->delay_variation (csxp->xspec_S);
-
-                // @@How does the guaranteed rate parameter map to the ACE_Flow_Spec.
-                // Note there is no break !!
-
-              case QOS_CNTR_LOAD:
-                // qos_service_type.
-                sending_flow->service_type (csxp->spec_type);
-                // Token Bucket Average Rate (B/s)
-                sending_flow->token_rate ((u_long)csxp->xspec_r);
-                // Token Bucket Rate (B)
-                sending_flow->token_bucket_size ((u_long)csxp->xspec_b);
-                // Peak Data Rate (B/s)
-                sending_flow->peak_bandwidth ((u_long)csxp->xspec_p);
-                // Minimum Policed Unit (B)
-                sending_flow->minimum_policed_size (csxp->xspec_m);
-                // Max Packet Size (B)
-                sending_flow->max_sdu_size (csxp->xspec_M);
-                break;
-
-              default:
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                  "(%N|%l) Unknown flowspec type: %u.\n", csxp->spec_type),
-                                  -1);
-            }
-          }
-
-        ace_qos.sending_flowspec (sending_flow);
-        qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_EVENT);
-      }
-      break;
-
-    case RAPI_PATH_ERROR:
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "PATH ERROR Event received\n"
-                    "Code=%d  Val=%d  Node= %s\n",
-                    errcode,
-                    errvalue,
-                    ACE_OS::inet_ntoa(((sockaddr_in *)errnode)->sin_addr)));
-        qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_PATH_ERROR);
-      }
-      break;
-
-    case RAPI_RESV_ERROR:
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "RESV ERROR Event received\n"
-                    "Code=%d  Val=%d  Node= %s\n",
-                    errcode,
-                    errvalue,
-                    ACE_OS::inet_ntoa(((sockaddr_in *)errnode)->sin_addr)));
-        qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_ERROR);
-      }
-      break;
-
-    case RAPI_RESV_CONFIRM:
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "RESV CONFIRM Event received\n"));
-        qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_CONFIRM);
-      }
-      break;
-
-    default:
-      ACE_DEBUG ((LM_DEBUG,
-                  "Unknown RSVP Event Received\n"));
-      break;
-
-    }
-
-  // Set the updated ACE_QoS for the RSVP callback argument(QoS session).
-  qos_session->qos (ace_qos);
-
-  // @@ what is the meaning of the return value. RAPI docs don't say anything!
-  return 0;
-}
-
-// Constructor.
-ACE_RAPI_Session::ACE_RAPI_Session (void)
-{
-  ACE_TRACE ("ACE_RAPI_Session::ACE_RAPI_Session");
-  //this->source_port (DEFAULT_SOURCE_SENDER_PORT);
-  ACE_NEW (this->src_addr_,
-           ACE_INET_Addr ("0"));
-}
-
-// Open a RAPI QoS session [dest IP, dest port, Protocol ID].
-int
-ACE_RAPI_Session::open (ACE_INET_Addr dest_addr,
-                        ACE_Protocol_ID protocol_id)
-{
-  char buf [BUFSIZ];
-  dest_addr.addr_to_string (buf,
-                            BUFSIZ);
-  ACE_DEBUG ((LM_DEBUG,
-              "In RAPI SESSION OPEN %s\n",
-              buf));
-
-  this->dest_addr_ = dest_addr;
-  this->protocol_id_ = protocol_id;
-
-  // Open a RAPI session. Note "this" is being passed as an argument to
-  // the callback function. The callback function uses this argument to
-  // update the QoS of this session based on the RSVP event it receives.
-
-  if ((this->session_id_ = rapi_session((struct sockaddr *) dest_addr.get_addr (),
-                                        protocol_id,
-                                        0,
-                                        rsvp_callback,
-                                        (void *) this,
-                                        &rsvp_error)) == NULL_SID)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "rapi_session () call fails. Error\n"),
-                      -1);
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "rapi_session () call succeeds. "
-                "Session ID = %d\n",
-                this->session_id_));
-
-  return 0;
-}
-
-// Close the RAPI QoS Session.
-int
-ACE_RAPI_Session::close (void)
-{
-  this->rsvp_error = rapi_release(this->session_id_);
-
-  if (rsvp_error == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Can't release RSVP session:\n\t%s\n",
-                       rapi_errlist[rsvp_error]),
-                      -1);
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "rapi session with id %d released successfully.\n",
-                this->session_id_));
-  return 0;
-}
-
-//Get the most recent RSVP event that occured
-ACE_QoS_Session::RSVP_Event_Type
-ACE_RAPI_Session::rsvp_event_type (void)
-{
-  return this->rsvp_event_type_;
-}
-
-//Set the most recent RSVP event that occured
-void
-ACE_RAPI_Session::rsvp_event_type (ACE_QoS_Session::RSVP_Event_Type event_type)
-{
-  this->rsvp_event_type_ = event_type;
-}
-
-int
-ACE_RAPI_Session::qos (ACE_SOCK * /* socket */,
-                       ACE_QoS_Manager * /* qos_manager */,
-                       const ACE_QoS &ace_qos)
-{
-
-  // If sender : call sending_qos ()
-  // If receiver : call receiving_qos ()
-  // If both : call sending_qos () and receiving_qos ()
-
-  if (this->flags_ != ACE_QOS_RECEIVER)
-    return this->sending_qos (ace_qos);
-
-  if (this->flags_ != ACE_QOS_SENDER)
-    return this->receiving_qos (ace_qos);
-
-  return 0;
-}
-
-// Set sending QoS for this RAPI session.
-int
-ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos)
-{
-  ACE_Flow_Spec *sending_flowspec = ace_qos.sending_flowspec ();
-
-  if (sending_flowspec == 0)
-    {
-      int result = rapi_sender (this->session_id_,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                25);
-      if (result != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N|%l) rapi_sender error %d:\n\tPATH Generation can't be started\n",
-                           result),
-                          -1);
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    "rapi_sender () call succeeds with PATH Tear!\n"));
-
-      return 0;
-    }
-
-  rapi_tspec_t *t_spec = this->init_tspec_simplified (*sending_flowspec);
-  if (t_spec == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%N|%l) Error in translating from ACE Flow Spec to"
-                       " RAPI TSpec\n"),
-                      -1);
-
-  char buffer[BUFSIZ];
-
-  // This formats the t_spec in a visually intuitive char * that can
-  // be printed.
-
-  (void) rapi_fmt_tspec(t_spec, buffer, sizeof(buffer));
-  ACE_DEBUG ((LM_DEBUG,
-              "\nSender TSpec : %s\n",
-              buffer));
-
-  // Print out all the fields separately.
-  ACE_DEBUG ((LM_DEBUG,
-              "\nTSpec :\n"
-              "\t Spec Type = %d\n"
-              "\t Rate = %f\n"
-              "\t Bucket = %f\n"
-              "\t Peak = %f\n"
-              "\t MPU = %d\n"
-              "\t MDU = %d\n"
-              "\t TTL = %d\n",
-              t_spec->tspecbody_qosx.spec_type,
-              t_spec->tspecbody_qosx.xtspec_r,
-              t_spec->tspecbody_qosx.xtspec_b,
-              t_spec->tspecbody_qosx.xtspec_p,
-              t_spec->tspecbody_qosx.xtspec_m,
-              t_spec->tspecbody_qosx.xtspec_M,
-              sending_flowspec->ttl ()));
-
-  // This the source sender port.
-  //  ACE_INET_Addr sender_addr (this->source_port ());
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Making the rapi_sender () call\n"));
-
-  // Set the Sender TSpec for this QoS session.
-
-
-  int result = rapi_sender(this->session_id_,
-                           0,
-                           (sockaddr *) this->src_addr_->get_addr (),
-                           0,
-                           t_spec,
-                           0,
-                           0,
-                           sending_flowspec->ttl ()) ;
-
-  /*
-  int result = rapi_sender(this->session_id_,
-                           0,
-                           (sockaddr *) sender_addr.get_addr (),
-                           0,
-                           t_spec,
-                           0,
-                           0,
-                           sending_flowspec->ttl ()) ;
-  */
-  if(result!= 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%N|%l) rapi_sender error %d:\n\tPATH Generation can't be started\n",
-                      result),
-                      -1);
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "rapi_sender () call succeeds !\n"));
-  return 0;
-}
-
-// Set receiving QoS for this RAPI session.
-int
-ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos)
-{
-
-  ACE_Flow_Spec *receiving_flowspec = ace_qos.receiving_flowspec ();
-  if (receiving_flowspec == 0)
-    {
-      if (rapi_reserve(this->session_id_,
-                       0,
-                       // Setting the RAPI_REQ_CONFIRM flag requests confirmation
-                       // of the resevation, by means of a confirmation upcall of
-                       // type RAPI_RESV_CONFIRM.
-                       //                   (sockaddr *)receiver_addr.get_addr (),
-                       0,
-                       RAPI_RSTYLE_WILDCARD,
-                       // This applies the flowspec to all the senders. Given this,
-                       // @@I am passing the filter_spec to be null, hoping this will work.
-                       0,
-                       0,
-                       0,
-                       0,
-                       // The filter spec is NULL. This should work since the RSTYLE is
-                       // WILDCARD.
-                       0,
-                       0) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N|%l)rapi_reserve () error:\n\tRESV Generation can't be started\n"),
-                          -1);
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    "rapi_reserve () for RESV Tear call succeeds\n"));
-
-      return 0;
-    }
-
-
-  rapi_flowspec_t *flow_spec = init_flowspec_simplified (*receiving_flowspec);
-
-  if (flow_spec == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%N|%l) Error in translating from ACE Flow Spec to"
-                       " RAPI FlowSpec\n"),
-                      -1);
-
-  char buffer[BUFSIZ];
-
-  // This formats the flow_spec in a visually intuitive char * that can
-  // be printed.
-  (void)rapi_fmt_flowspec(flow_spec, buffer, sizeof(buffer));
-  ACE_DEBUG ((LM_DEBUG,
-              "\nReceiver FlowSpec : %s\n",
-              buffer));
-
-  // Print out all the fields separately.
-  ACE_DEBUG ((LM_DEBUG,
-              "\nFlowSpec :\n"
-              "\t Spec Type = %d\n"
-              "\t Rate = %f\n"
-              "\t Bucket = %f\n"
-              "\t Peak = %f\n"
-              "\t MPU = %d\n"
-              "\t MDU = %d\n",
-              flow_spec->specbody_qosx.spec_type,
-              flow_spec->specbody_qosx.xspec_r,
-              flow_spec->specbody_qosx.xspec_b,
-              flow_spec->specbody_qosx.xspec_p,
-              flow_spec->specbody_qosx.xspec_m,
-              flow_spec->specbody_qosx.xspec_M));
-
-  sockaddr_in Receiver_host;
-
-  Receiver_host.sin_addr.s_addr = INADDR_ANY;
-
-  // Set the Receiver FlowSpec for this QoS session.
-  // @@The filter style is hardcoded to WildCard. This can be changed later.
-  if (rapi_reserve(this->session_id_,
-                   RAPI_REQ_CONFIRM,
-                   // Setting the RAPI_REQ_CONFIRM flag requests confirmation
-                   // of the resevation, by means of a confirmation upcall of
-                   // type RAPI_RESV_CONFIRM.
-                   //                   (sockaddr *)receiver_addr.get_addr (),
-                   (sockaddr *)&Receiver_host,
-                   RAPI_RSTYLE_WILDCARD,
-                   // This applies the flowspec to all the senders. Given this,
-                   // @@I am passing the filter_spec to be null, hoping this will work.
-                   0,
-                   0,
-                   0,
-                   0,
-                   // The filter spec is NULL. This should work since the RSTYLE is
-                   // WILDCARD.
-                   1,
-                   flow_spec) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "rapi_reserve () error:\n\tRESV Generation can't be started\n"),
-                      -1);
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "rapi_reserve () call succeeds\n"));
-
-  return 0;
-}
-
-int
-ACE_RAPI_Session::update_qos (void)
-{
-  // Update the session QoS Parameters based on the RSVP Event Received.
-  if ((rsvp_error = rapi_dispatch ()) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error in rapi_dispatch () : %s\n",
-                       rapi_errlist[rsvp_error]),
-                      -1);
-  return 0;
-}
-
-// Construct a simplified RAPI Sender TSpec object
-// from an ACE_Flow_Spec. Note the form of the TSpec is
-// simplified as against the full bodied IntServ version.
-
-rapi_tspec_t *
-ACE_RAPI_Session::init_tspec_simplified (const ACE_Flow_Spec &flow_spec)
-{
-  rapi_tspec_t *t_spec;
-
-  ACE_NEW_RETURN (t_spec,
-                  rapi_tspec_t,
-                  0);
-
-  qos_tspecx_t *ctxp = &(t_spec->tspecbody_qosx);
-
-  // There may be some type incompatibility here.
-  // Note the types of the LHS are float32_t, uint32_t etc.
-
-  ctxp->spec_type = flow_spec.service_type ();//QOS_TSPEC;
-  ctxp->xtspec_r  = flow_spec.token_rate ();           // Token Rate (B/s)
-  ctxp->xtspec_b  = flow_spec.token_bucket_size ();    // Token Bucket Depth (B)
-  ctxp->xtspec_p  = flow_spec.peak_bandwidth ();       // Peak Data Rate (B/s)
-  ctxp->xtspec_m  = flow_spec.minimum_policed_size (); // Minimum policed unit.
-  ctxp->xtspec_M  = flow_spec.max_sdu_size();          // Maximum SDU size.
-  t_spec->len = sizeof(rapi_hdr_t) + sizeof(qos_tspecx_t);
-  t_spec->form = RAPI_TSPECTYPE_Simplified;
-
-  return (t_spec);
-}
-
-
-// Construct a simplified RAPI flowspec object from ACE_Flow_Spec.
-// Note the form of the FlowSpec is simplified as against the
-// full bodied IntServ version.
-
-rapi_flowspec_t *
-ACE_RAPI_Session::init_flowspec_simplified(const ACE_Flow_Spec &flow_spec)
-{
-  rapi_flowspec_t *flowsp;
-  ACE_NEW_RETURN (flowsp,
-                  rapi_flowspec_t,
-                  0);
-
-  // Extended Legacy format.
-  qos_flowspecx_t *csxp = &flowsp->specbody_qosx;
-
-  // Choose based on the service type : [QOS_GUARANTEEDX/QOS_CNTR_LOAD].
-
-  switch (flow_spec.service_type ())
-    {
-    case QOS_GUARANTEEDX:
-      csxp->xspec_R = 0 ; // Guaranteed Rate B/s. @@How does this map to the
-                          // ACE Flow Spec Parameters.
-
-      csxp->xspec_S = flow_spec.delay_variation () ; // Slack term in MICROSECONDS
-
-      // Note there is no break !!
-
-    case QOS_CNTR_LOAD:
-      csxp->spec_type = flow_spec.service_type ();        // qos_service_type
-      csxp->xspec_r = flow_spec.token_rate ();            // Token Bucket Average Rate (B/s)
-      csxp->xspec_b = flow_spec.token_bucket_size ();     // Token Bucket Rate (B)
-      csxp->xspec_p = flow_spec.peak_bandwidth ();        // Peak Data Rate (B/s)
-      csxp->xspec_m = flow_spec.minimum_policed_size ();  // Minimum Policed Unit (B)
-
-      csxp->xspec_M = flow_spec.max_sdu_size();          // Max Packet Size (B)
-
-      flowsp->form = RAPI_FLOWSTYPE_Simplified;
-      break;
-
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N|%l) Unknown flowspec type: %u\n",flow_spec.service_type () ),
-                        0);
-    }
-
-  flowsp->len = sizeof(rapi_flowspec_t);
-  return flowsp;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_RAPI */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// This is a GQoS session ID generator.
-int ACE_GQoS_Session::GQoS_session_id = 0;
-
-// Constructor.
-ACE_GQoS_Session::ACE_GQoS_Session (void)
-{
-  ACE_TRACE ("ACE_GQoS_Session::ACE_GQoS_Session");
-}
-
-// Open a GQoS session [dest IP, dest port, Protocol ID].
-int
-ACE_GQoS_Session::open (ACE_INET_Addr dest_addr,
-                        ACE_Protocol_ID protocol_id)
-{
-  this->dest_addr_ = dest_addr;
-  this->protocol_id_ = protocol_id;
-
-  this->session_id_ = GQoS_session_id++;
-
-  return 0;
-}
-
-// Close the GQoS Session.
-int
-ACE_GQoS_Session::close (void)
-{
-  // TBD.
-  return 0;
-}
-
-// Set the QoS for this GQoS session.
-int
-ACE_GQoS_Session::qos (ACE_SOCK *socket,
-                       ACE_QoS_Manager *qos_manager,
-                       const ACE_QoS &ace_qos)
-{
-
-  // Confirm if the current session is one of the QoS sessions
-  // subscribed to by the given socket.
-
-  if (qos_manager->qos_session_set ().find (this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("This QoS session was not subscribed to")
-                       ACE_TEXT (" by the socket\n")),
-                      -1);
-
-  // Set the QOS according to the supplied ACE_QoS. The I/O control
-  // code used under the hood is SIO_SET_QOS.
-
-  u_long ret_bytes = 0;
-
-  ACE_QoS qos = ace_qos;
-  if (ACE_OS::ioctl (socket->get_handle (),
-                     ACE_SIO_SET_QOS,
-                     qos,
-                     &ret_bytes) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("Error in Qos set ACE_OS::ioctl() %d\n"),
-                       ret_bytes),
-                      -1);
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Setting QoS with ACE_OS::ioctl () succeeds\n")));
-
-  return 0;
-}
-
-int
-ACE_GQoS_Session::update_qos (void)
-{
-  // WSAIoctl (GET_QOS) call goes here...
-  return 0;
-}
-
-//Get the most recent RSVP event that occured
-ACE_QoS_Session::RSVP_Event_Type
-ACE_GQoS_Session::rsvp_event_type (void)
-{
-  return this->rsvp_event_type_;
-}
-
-//Set the most recent RSVP event that occured
-void
-ACE_GQoS_Session::rsvp_event_type (ACE_QoS_Session::RSVP_Event_Type event_type)
-{
-  this->rsvp_event_type_ = event_type;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/QoS/QoS_Session_Impl.h b/dep/acelite/ace/QoS/QoS_Session_Impl.h
deleted file mode 100644
index 04976db9e..000000000
--- a/dep/acelite/ace/QoS/QoS_Session_Impl.h
+++ /dev/null
@@ -1,265 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    QoS_Session_Impl.h
- *
- *  $Id: QoS_Session_Impl.h 91743 2010-09-13 18:24:51Z johnnyw $
- *
- *  @author Vishal Kachroo <vishal@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_QOS_SESSION_IMPL_H
-#define ACE_QOS_SESSION_IMPL_H
-#include /**/ "ace/pre.h"
-
-#include "ace/QoS/QoS_Session.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined (ACE_HAS_RAPI)
-#include "rapi_lib.h"
-
-#define DEFAULT_SOURCE_SENDER_PORT 10001
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_RAPI_Session
- *
- * @brief A RAPI QoS session object.
- *
- * This class is a RAPI (RSVP API, an implementation of RSVP on UNIX)
- * implementation of the ACE_QoS_Session interface.
- */
-class ACE_QoS_Export ACE_RAPI_Session : public ACE_QoS_Session
-{
-
-public:
-
-  /// Default destructor.
-  ~ACE_RAPI_Session (void);
-
-  /// Error handling for RSVP callback
-  static int rsvp_error;
-
-  /// Open a RAPI QoS session [dest IP, dest port, Protocol ID].
-  virtual int open (ACE_INET_Addr dest_addr,
-                    ACE_Protocol_ID protocol_id);
-
-  /// Close the RAPI QoS Session.
-  virtual int close (void);
-
-  /// Returns the QoS for this RAPI session.
-  virtual ACE_QoS qos (void) const;
-
-  /// Set QoS for this RAPI session. The socket parameter is used to confirm if
-  /// this QoS session was subscribed to by the socket.
-  virtual int qos (ACE_SOCK *socket,
-                   ACE_QoS_Manager *qos_manager,
-                   const ACE_QoS &ace_qos);
-
-  /**
-   * Sets the QoS for this session object to ace_qos. Does not interfere with the
-   * QoS in the underlying socket. This call is useful to update the QoS object
-   * when the underlying socket QoS is being set through a mechanism other than
-   * the previous qos () method e.g. inside the dgram_mcast.subscribe () where the
-   * QoS for the socket is set through ACE_OS::join_leaf ().
-   */
-  virtual void qos (const ACE_QoS &ace_qos);
-
-  /**
-   * Calls rapi_dispatch () that further triggers the call back function.
-   * It is a mechanism of updating the QoS for this session asynchronously, as
-   * RSVP events occur.
-   */
-  virtual int update_qos (void);
-
-  /// Get methods for the flags_.
-  virtual ACE_End_Point_Type flags (void) const;
-
-  /// Set methods for the flags_.
-  virtual void flags (const ACE_End_Point_Type flags);
-
-  /// Get the RAPI session id.
-  virtual int session_id (void) const;
-
-  /// Set the RAPI session id.
-  virtual void session_id (const int session_id);
-
-  /// Get the RAPI file descriptor for RSVP events.
-  virtual ACE_HANDLE rsvp_events_handle (void);
-
-  ///Set the RAPI event that last occured
-  virtual void  rsvp_event_type (RSVP_Event_Type event_type);
-
-  ///Get the RAPI event that last occured
-  virtual RSVP_Event_Type rsvp_event_type (void);
-
-  /// Get the destination address for this RAPI session.
-  virtual ACE_INET_Addr dest_addr (void) const;
-
-  /// Set the destination address for this RAPI session.
-  virtual void dest_addr (const ACE_INET_Addr &dest_addr);
-
-  /// Get the source port for this session.
-  virtual u_short source_port (void) const;
-
-  /// Set the source port for this session.
-  virtual void source_port (const u_short &source_port);
-
-  //Set the source host
-  virtual ACE_INET_Addr* source_addr (void) const;
-
-  /// Set the source port for this session.
-  virtual void source_addr (ACE_INET_Addr* source_addr);
-
-  /// RAPI version. Returned value = 100 * major-version + minor-version.
-  virtual int version ();
-
-  /// The factory is a friend so it can create this object through
-  /// the only private constructor.
-  friend class ACE_QoS_Session_Factory;
-
-private:
-
-  /// Default constuctor. Constructor is defined private so that only
-  /// the friend factory can instantiate this class.
-  ACE_RAPI_Session (void);
-
-  /// Construct a simplified RAPI Sender TSpec object
-  /// from an ACE_Flow_Spec object. Used internally by this class.
-  rapi_tspec_t *init_tspec_simplified (const ACE_Flow_Spec &flow_spec);
-
-  /// Construct a simplified RAPI Receiver FlowSpec object
-  /// from an ACE_Flow_Spec object. Used internally by the class.
-  rapi_flowspec_t *init_flowspec_simplified(const ACE_Flow_Spec &flow_spec);
-
-  /// Set sending QoS for this RAPI session.
-  int sending_qos (const ACE_QoS &ace_qos);
-
-  /// Set receiving  QoS for this RAPI session.
-  int receiving_qos (const ACE_QoS &ace_qos);
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_RAPI */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_GQoS_Session
- *
- * @brief A GQoS session object.
- *
- * This class is a GQoS (Generic QoS, an implementation of RSVP on
- * Win2K) implementation of the ACE_QoS_Session interface.
- */
-class ACE_QoS_Export ACE_GQoS_Session : public ACE_QoS_Session
-{
-
-public:
-
-  /// Default destructor.
-  ~ACE_GQoS_Session (void);
-
-  /// This is a session ID generator. It does a lot more than expected
-  /// from an int!.
-  static int GQoS_session_id;
-
-  /// Open a GQoS session [dest IP, dest port, Protocol ID].
-  virtual int open (ACE_INET_Addr dest_addr,
-                    ACE_Protocol_ID protocol_id);
-
-  /// Close the GQoS Session.
-  virtual int close (void);
-
-  /// Returns the QoS for this GQoS session.
-  virtual ACE_QoS qos (void) const;
-
-  /// Set QoS for this GQoS session. The socket parameter is used to confirm if
-  /// this QoS session was subscribed to by the socket.
-  virtual int qos (ACE_SOCK *socket,
-                   ACE_QoS_Manager *qos_manager,
-                   const ACE_QoS &ace_qos);
-
-  /**
-   * Sets the QoS for this session object to ace_qos. Does not interfere with the
-   * QoS in the underlying socket. This call is useful to update the QoS object
-   * when the underlying socket QoS is being set through a mechanism other than
-   * the previous qos () method e.g. inside the dgram_mcast.subscribe () where the
-   * QoS for the socket is set through ACE_OS::join_leaf ().
-   */
-  virtual void qos (const ACE_QoS &ace_qos);
-
-  /// Calls the ioctl (ACE_SIO_GET_QOS). It is a mechanism of updating the
-  /// QoS for this session asynchronously, as RSVP events occur.
-  virtual int update_qos (void);
-
-  /// Get/Set methods for the flags_.
-  virtual ACE_End_Point_Type flags (void) const;
-  virtual void flags (const ACE_End_Point_Type flags);
-
-  /// Get the destination address for this GQoS session.
-  virtual ACE_INET_Addr dest_addr (void) const;
-
-  /// Set the destination address for this GQoS session.
-  virtual void dest_addr (const ACE_INET_Addr &dest_addr);
-
-  /// Get the source port for this session.
-  virtual u_short source_port (void) const;
-
-  /// Set the source port for this session.
-  virtual void source_port (const u_short &source_port);
-
-  //Set the source host
-  virtual ACE_INET_Addr* source_addr (void) const;
-
-  /// Set the source port for this session.
-  virtual void source_addr (ACE_INET_Addr* source_addr);
-
-  /// Get the GQoS session id.
-  virtual int session_id (void) const;
-
-  /// Set the GQoS session id.
-  virtual void session_id (const int session_id);
-
-  /// Get the file descriptor of the underlying socket.
-  virtual ACE_HANDLE rsvp_events_handle (void);
-
-  virtual void  rsvp_event_type (RSVP_Event_Type event_type);
-  ///Set the RAPI event that last occured
-
-  virtual RSVP_Event_Type rsvp_event_type (void);
-  ///Get the RAPI event that last occured
-
-  /// GQoS version.
-  virtual int version ();
-
-  /// The factory is a friend so it can create this object through
-  /// the only private constructor.
-  friend class ACE_QoS_Session_Factory;
-
-private:
-
-  /// Default constructor. Constructor is defined private so that only
-  /// the friend factory can instantiate this class.
-  ACE_GQoS_Session (void);
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "QoS_Session_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_QOS_SESSION_IMPL_H */
diff --git a/dep/acelite/ace/QoS/QoS_Session_Impl.inl b/dep/acelite/ace/QoS/QoS_Session_Impl.inl
deleted file mode 100644
index 0ca1319c5..000000000
--- a/dep/acelite/ace/QoS/QoS_Session_Impl.inl
+++ /dev/null
@@ -1,229 +0,0 @@
-// -*- C++ -*-
-//
-// $Id: QoS_Session_Impl.inl 91813 2010-09-17 07:52:52Z johnnyw $
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-#if defined (ACE_HAS_RAPI)
-
-ACE_INLINE
-ACE_RAPI_Session::~ACE_RAPI_Session (void)
-{
-  ACE_TRACE ("ACE_RAPI_Session::~ACE_RAPI_Session");
-}
-
-// Returns the QoS for this RAPI session.
-ACE_INLINE ACE_QoS
-ACE_RAPI_Session::qos (void) const
-{
-  return this->qos_;
-}
-
-// Overloaded method to set the QoS for this session object. Does not
-// interfere with the underlying socket QoS.
-ACE_INLINE void
-ACE_RAPI_Session::qos (const ACE_QoS &ace_qos)
-{
-  this->qos_ = ace_qos;
-}
-
-// Get the RAPI session id.
-ACE_INLINE int
-ACE_RAPI_Session::session_id (void) const
-{
-  return this->session_id_;
-}
-
-// Set the RAPI session id.
-ACE_INLINE void
-ACE_RAPI_Session::session_id (const int session_id)
-{
-  this->session_id_ = session_id;
-}
-
-// Get the RAPI file desciptor for RSVP events.
-ACE_INLINE ACE_HANDLE
-ACE_RAPI_Session::rsvp_events_handle (void)
-{
-  int rapi_fd = rapi_getfd (this->session_id ());
-  if (rapi_fd == -1)
-    {
-      this->close ();
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Error in rapi_getfd ()\n"),
-                        -1);
-    }
-
-  return rapi_fd;
-}
-
-// Get the End Point Type (Sender/Receiver/Both).
-ACE_INLINE ACE_QoS_Session::ACE_End_Point_Type
-ACE_RAPI_Session::flags (void) const
-{
-  return this->flags_;
-}
-
-// Set the End Point Type (Sender/Receiver/Both).
-ACE_INLINE void
-ACE_RAPI_Session::flags (const ACE_End_Point_Type flags)
-{
-  this->flags_ = flags;
-}
-
-
-// Get the destination address for this RAPI session.
-ACE_INLINE ACE_INET_Addr
-ACE_RAPI_Session::dest_addr (void) const
-{
-  return this->dest_addr_;
-}
-
-// Set the destination address for this RAPI session.
-ACE_INLINE void
-ACE_RAPI_Session::dest_addr (const ACE_INET_Addr &dest_addr)
-{
-  this->dest_addr_ = dest_addr;
-}
-
-// Get the source port for this RAPI session.
-ACE_INLINE u_short
-ACE_RAPI_Session::source_port (void) const
-{
-  return this->source_port_;
-}
-
-// Set the source port for this RAPI session.
-ACE_INLINE void
-ACE_RAPI_Session::source_port (const u_short &source_port)
-{
-  this->source_port_ = source_port;
-}
-
-ACE_INLINE ACE_INET_Addr*
-ACE_RAPI_Session::source_addr (void) const
-{
-  return this->src_addr_;
-}
-
-ACE_INLINE void
-ACE_RAPI_Session::source_addr (ACE_INET_Addr* source_addr)
-{
-  this->src_addr_ = source_addr;
-}
-
-// RAPI version. Returned value = 100 * major-version + minor-version.
-ACE_INLINE int
-ACE_RAPI_Session::version (void)
-{
-  return 0;
-}
-
-#endif /* ACE_HAS_RAPI */
-
-ACE_INLINE
-ACE_GQoS_Session::~ACE_GQoS_Session (void)
-{
-  ACE_TRACE ("ACE_GQoS_Session::~ACE_GQoS_Session");
-}
-
-// Returns the QoS for this GQoS session.
-ACE_INLINE ACE_QoS
-ACE_GQoS_Session::qos (void) const
-{
-  return this->qos_;
-}
-
-// Overloaded method to set the QoS for this session object. Does not
-// interfere with the underlying socket QoS.
-ACE_INLINE void
-ACE_GQoS_Session::qos (const ACE_QoS &ace_qos)
-{
-  this->qos_ = ace_qos;
-}
-
-// Get the GQoS session id.
-ACE_INLINE int
-ACE_GQoS_Session::session_id (void) const
-{
-  return this->session_id_;
-}
-
-// Set the GQoS session id.
-ACE_INLINE void
-ACE_GQoS_Session::session_id (const int session_id)
-{
-  this->session_id_ = session_id;
-}
-
-// Get the underlying file desciptor for RSVP events.
-// Currently returns 0 because GQoS does not have a special
-// descriptor for QoS events.
-ACE_INLINE ACE_HANDLE
-ACE_GQoS_Session::rsvp_events_handle (void)
-{
-  return 0;
-}
-
-// Get the End Point Type (Sender/Receiver/Both).
-ACE_INLINE ACE_QoS_Session::ACE_End_Point_Type
-ACE_GQoS_Session::flags (void) const
-{
-  return this->flags_;
-}
-
-// Set the End Point Type (Sender/Receiver/Both).
-ACE_INLINE void
-ACE_GQoS_Session::flags (const ACE_End_Point_Type flags)
-{
-  this->flags_ = flags;
-}
-
-// Get the destination address for this GQoS session.
-ACE_INLINE ACE_INET_Addr
-ACE_GQoS_Session::dest_addr (void) const
-{
-  return this->dest_addr_;
-}
-
-// Set the destination address for this GQoS session.
-ACE_INLINE void
-ACE_GQoS_Session::dest_addr (const ACE_INET_Addr &dest_addr)
-{
-  this->dest_addr_ = dest_addr;
-}
-
-// Get the source port for this RAPI session.
-ACE_INLINE u_short
-ACE_GQoS_Session::source_port (void) const
-{
-  return this->source_port_;
-}
-
-// Set the source port for this RAPI session.
-ACE_INLINE void
-ACE_GQoS_Session::source_port (const u_short &source_port)
-{
-  this->source_port_ = source_port;
-}
-
-ACE_INLINE ACE_INET_Addr*
-ACE_GQoS_Session::source_addr (void) const
-{
-  return this->src_addr_;
-}
-
-ACE_INLINE void
-ACE_GQoS_Session::source_addr (ACE_INET_Addr* source_addr)
-{
-  this->src_addr_ = source_addr;
-}
-
-// GQoS version.
-ACE_INLINE int
-ACE_GQoS_Session::version (void)
-{
-  return 0;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/QoS/README b/dep/acelite/ace/QoS/README
deleted file mode 100644
index e7f533c81..000000000
--- a/dep/acelite/ace/QoS/README
+++ /dev/null
@@ -1,55 +0,0 @@
-$Id: README 94641 2011-10-06 15:06:16Z johnnyw $
-
-ACE QoS API (AQoSA)
-===================
-
-This directory contains the implementation for the ACE QoS API (AQoSA).
-
-BUILD REQUIREMENTS
-==================
-WIN2K :
-
-AQoSA makes use of the GQOS API under Windows 2000.  The minimum
-requirements are:
-
-1. June98 Platform SDK or later.
-2. Link with ws2_32.lib
-
-More information about GQOS is available from the MSDN website:
-http://msdn.microsoft.com/msdn-files/026/002/258/Search.asp
-
--------------------------------------------------------------------------------
-
-UNIX :
-
-AQoSA makes use of the RSVP API (RAPI) under UNIX.
-RAPI can be obtained from: ftp://ftp.isi.edu/rsvp/release/.
-rsvpd.rel4.2a4-1 may require patches in order to compile
-under current versions of Linux.  Contact Craig Rodrigues <crodrigu@bbn.com>
-to obtain these patches.
-
-The following lines should be added to your platform_macros.GNU file
-before building AQoSA:
-
-PLATFORM_RAPI_CPPFLAGS += -I[path to RAPI header files]
-PLATFORM_RAPI_LIBS += -lrsvp
-PLATFORM_RAPI_LDFLAGS += -L[path to RAPI library files]
-
-1. Compile AQoSA with
-
-   make rapi=1
-
-More information about RAPI can be found at:
-
-http://www.opengroup.org/onlinepubs/9619099/toc.htm
-http://www.cs.wustl.edu/~vishal/qos.html
-http://www.sun.com/software/bandwidth/rsvp/docs/
-http://www.tru64unix.compaq.com/faqs/publications/base_doc/DOCUMENTATION/V51_HTML/ARH9UCTE/TOC.HTM#RSVPCHXX
-
--------------------------------------------------------------------------------
-
-TEST
-====
-
-The test for AQoSA is located in $ACE_ROOT/examples/QOS
-
diff --git a/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
deleted file mode 100644
index 32099d924..000000000
--- a/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-// $Id: SOCK_Dgram_Mcast_QoS.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-
-#include "SOCK_Dgram_Mcast_QoS.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_sys_socket.h"
-
-#if defined (ACE_WIN32)
-#include "ace/Sock_Connect.h"  // needed for subscribe_ifs()
-#endif /* ACE_WIN32 */
-
-#if !defined (__ACE_INLINE__)
-#include "SOCK_Dgram_Mcast_QoS.inl"
-#endif /* __ACE_INLINE__ */
-
-// This is a workaround for platforms with non-standard
-// definitions of the ip_mreq structure
-#if ! defined (IMR_MULTIADDR)
-#define IMR_MULTIADDR imr_multiaddr
-#endif /* ! defined (IMR_MULTIADDR) */
-
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Mcast_QoS)
-
-// Dummy default constructor...
-
-ACE_SOCK_Dgram_Mcast_QoS::ACE_SOCK_Dgram_Mcast_QoS (options opts)
-  : ACE_SOCK_Dgram_Mcast (opts)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast_QoS::ACE_SOCK_Dgram_Mcast_QoS");
-}
-
-int
-ACE_SOCK_Dgram_Mcast_QoS::open (const ACE_INET_Addr &addr,
-                                const ACE_QoS_Params &qos_params,
-                                int protocol_family,
-                                int protocol,
-                                ACE_Protocol_Info *protocolinfo,
-                                ACE_SOCK_GROUP g,
-                                u_long flags,
-                                int reuse_addr)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast_QoS::open");
-
-  ACE_UNUSED_ARG (qos_params);
-
-  // Only perform the <open> initialization if we haven't been opened
-  // earlier.
-  if (this->get_handle () != ACE_INVALID_HANDLE)
-    return 0;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Get Handle Returns Invalid Handle\n"));
-
-  if (ACE_SOCK::open (SOCK_DGRAM,
-                      protocol_family,
-                      protocol,
-                      protocolinfo,
-                      g,
-                      flags,
-                      reuse_addr) == -1)
-    return -1;
-
-  return this->open_i (addr, 0, reuse_addr);
-}
-
-
-int
-ACE_SOCK_Dgram_Mcast_QoS::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                                         const ACE_QoS_Params &qos_params,
-                                         const ACE_TCHAR *net_if,
-                                         int protocol_family,
-                                         int protocol,
-                                         int reuse_addr,
-                                         ACE_Protocol_Info *protocolinfo)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast_QoS::subscribe_ifs");
-#if defined (ACE_WIN32)
-  // Windows NT's winsock has trouble with multicast subscribes in the
-  // presence of multiple network interfaces when the IP address is
-  // given as INADDR_ANY.  It will pick the first interface and only
-  // accept mcast there.  So, to work around this, cycle through all
-  // of the interfaces known and subscribe to all the non-loopback
-  // ones.
-  //
-  // Note that this only needs to be done on NT, but there's no way to
-  // tell at this point if the code will be running on NT - only if it
-  // is compiled for NT-only or for NT/95, and that doesn't really
-  // help us.  It doesn't hurt to do this on Win95, it's just a little
-  // slower than it normally would be.
-  //
-  // NOTE - <ACE_Sock_Connect::get_ip_interfaces> doesn't always get all
-  // of the interfaces.  In particular, it may not get a PPP interface.  This
-  // is a limitation of the way <ACE_Sock_Connect::get_ip_interfaces> works
-  // with MSVC.  The reliable way of getting the interface list is
-  // available only with MSVC 5.
-
-  if (net_if == 0)
-    {
-      ACE_INET_Addr *if_addrs = 0;
-      size_t if_cnt;
-
-      if (ACE::get_ip_interfaces (if_cnt, if_addrs) != 0)
-        return -1;
-
-      size_t nr_subscribed = 0;
-
-      if (if_cnt < 2)
-        {
-          if (this->subscribe (mcast_addr,
-                               qos_params,
-                               reuse_addr,
-                               ACE_TEXT ("0.0.0.0"),
-                               protocol_family,
-                               protocol,
-                               protocolinfo) == 0)
-            ++nr_subscribed;
-        }
-      else
-        // Iterate through all the interfaces, figure out which ones
-        // offer multicast service, and subscribe to them.
-        while (if_cnt > 0)
-          {
-            --if_cnt;
-
-            // Convert to 0-based for indexing, next loop check.
-            if (if_addrs[if_cnt].is_loopback())
-              continue;
-            if (this->subscribe (mcast_addr,
-                                 qos_params,
-                                 reuse_addr,
-                                 ACE_TEXT_CHAR_TO_TCHAR
-                                   (if_addrs[if_cnt].get_host_addr()),
-                                 protocol_family,
-                                 protocol,
-                                 protocolinfo) == 0)
-              ++nr_subscribed;
-          }
-
-      delete [] if_addrs;
-
-      if (nr_subscribed == 0)
-        {
-          errno = ENODEV;
-          return -1;
-        }
-      else
-        // 1 indicates a "short-circuit" return.  This handles the
-        // rather bizarre semantics of checking all the interfaces on
-        // NT.
-        return 1;
-    }
-#else
-  ACE_UNUSED_ARG (mcast_addr);
-  ACE_UNUSED_ARG (qos_params);
-  ACE_UNUSED_ARG (protocol_family);
-  ACE_UNUSED_ARG (protocol);
-  ACE_UNUSED_ARG (reuse_addr);
-  ACE_UNUSED_ARG (protocolinfo);
-#endif /* ACE_WIN32 */
-  // Otherwise, do it like everyone else...
-
-  // Create multicast request.
-  if (this->make_multicast_ifaddr (0,
-                                   mcast_addr,
-                                   net_if) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-int
-ACE_SOCK_Dgram_Mcast_QoS::subscribe (const ACE_INET_Addr &mcast_addr,
-                                     const ACE_QoS_Params &qos_params,
-                                     int reuse_addr,
-                                     const ACE_TCHAR *net_if,
-                                     int protocol_family,
-                                     int protocol,
-                                     ACE_Protocol_Info *protocolinfo,
-                                     ACE_SOCK_GROUP g,
-                                     u_long flags,
-                                     ACE_QoS_Session *qos_session)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast_QoS::subscribe");
-
-  if (this->open (mcast_addr,
-                  qos_params,
-                  protocol_family,
-                  protocol,
-                  protocolinfo,
-                  g,
-                  flags,
-                  reuse_addr) == -1)
-    return -1;
-
-  // The following method call only applies to Win32 currently.
-  int result = this->subscribe_ifs (mcast_addr,
-                                    qos_params,
-                                    net_if,
-                                    protocol_family,
-                                    protocol,
-                                    reuse_addr,
-                                    protocolinfo);
-  // Check for the "short-circuit" return value of 1 (for NT).
-  if (result != 0)
-    return result;
-
-  // Tell network device driver to read datagrams with a
-  // <mcast_request_if_> IP interface.
-  else
-    {
-      // Check if the mcast_addr passed into this method is the
-      // same as the QoS session address.
-      if (qos_session != 0 && mcast_addr == qos_session->dest_addr ())
-        {
-          // Subscribe to the QoS session.
-          if (this->qos_manager_.join_qos_session (qos_session) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("Unable to join QoS Session\n")),
-                              -1);
-        }
-      else
-        {
-          if (this->close () != 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("Unable to close socket\n")));
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("Dest Addr in the QoS Session does")
-                               ACE_TEXT (" not match the address passed into")
-                               ACE_TEXT (" subscribe\n")),
-                              -1);
-        }
-
-      ip_mreq ret_mreq;
-      this->make_multicast_ifaddr (&ret_mreq, mcast_addr, net_if);
-
-      // XX This is windows stuff only. fredk
-      if (ACE_OS::join_leaf (this->get_handle (),
-                             reinterpret_cast<const sockaddr *> (&ret_mreq.IMR_MULTIADDR.s_addr),
-                             sizeof ret_mreq.IMR_MULTIADDR.s_addr,
-                             qos_params) == ACE_INVALID_HANDLE
-          && errno != ENOTSUP)
-        return -1;
-
-      else
-        if (qos_params.socket_qos () != 0 && qos_session != 0)
-          qos_session->qos (*(qos_params.socket_qos ()));
-
-      return 0;
-    }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h
deleted file mode 100644
index c3383a909..000000000
--- a/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    SOCK_Dgram_Mcast_QoS.h
- *
- *  $Id: SOCK_Dgram_Mcast_QoS.h 80826 2008-03-04 14:51:23Z wotte $
- *
- *  @author Vishal Kachroo <vishal@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_SOCK_DGRAM_MCAST_QOS_H
-#define ACE_SOCK_DGRAM_MCAST_QOS_H
-#include /**/ "ace/pre.h"
-
-#include "ace/SOCK_Dgram_Mcast.h"
-#include "QoS_Manager.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_SOCK_Dgram_Mcast_QoS
- *
- * @brief Defines the member functions for the ACE QoS enabled socket
- * wrapper for UDP/IP multicast.
- */
-class ACE_QoS_Export ACE_SOCK_Dgram_Mcast_QoS : public ACE_SOCK_Dgram_Mcast
-{
-
-public:
-  // = Initialization routines.
-  /// Ctor, has same defaults as ACE_SOCK_Dgram_Mcast
-  ACE_SOCK_Dgram_Mcast_QoS (options opts = DEFOPTS);
-
-  // Note that there is no public <open> method.  Therefore, this
-  // class cannot be used unless you <subscribe> to a multicast group.
-  // If you just want to send (and not listen) to a multicast group,
-  // use <ACE_SOCK_Dgram> or <ACE_SOCK_CODgram> instead.
-
-  /// Default dtor.
-  ~ACE_SOCK_Dgram_Mcast_QoS (void);
-
-  // = Multicast group management routines.
-  /**
-   * This is a QoS-enabled method for joining a multicast group, which
-   * passes <qos_params> via <ACE_OS::join_leaf>.  The network
-   * interface device driver is instructed to accept datagrams with
-   * <mcast_addr> multicast addresses.  If the socket has already been
-   * opened, <subscribe> closes the socket and opens a new socket
-   * bound to the <mcast_addr>. The session object specifies the QoS
-   * session that the socket wants to subscribe to. A socket may
-   * subscribe to multiple QoS sessions by calling this method multiple
-   * times with different session objects.
-   *
-   * The <net_if> interface is hardware specific, e.g., use "netstat
-   * -i" to find whether your interface is, such as "le0" or something
-   * else.  If net_if == 0, <subscribe> uses the default mcast
-   * interface.  Returns: -1 if the call fails.
-   *
-   * Note that some platforms, such as pSoS, support only number, not
-   * names, for network interfaces.  For these platforms, just give
-   * these numbers in alphanumeric form and <subscribe> will convert
-   * them into numbers via <ACE_OS::atoi>.
-   */
-  int subscribe (const ACE_INET_Addr &mcast_addr,
-                 const ACE_QoS_Params &qos_params,
-                 int reuse_addr = 1,
-                 const ACE_TCHAR *net_if = 0,
-                 int protocol_family = PF_INET,
-                 int protocol = 0,
-                 ACE_Protocol_Info *protocolinfo = 0,
-                 ACE_SOCK_GROUP g = 0,
-                 u_long flags = 0,
-                 ACE_QoS_Session *qos_session = 0);
-
-  // = Data transfer routines.
-
-  /// Send <buffer_count> worth of @a buffers to @a addr using overlapped
-  /// I/O (uses <WSASentTo>).  Returns 0 on success.
-  ssize_t send (const iovec buffers[],
-                int buffer_count,
-                size_t &number_of_bytes_sent,
-                int flags,
-                const ACE_Addr &addr,
-                ACE_OVERLAPPED *overlapped,
-                ACE_OVERLAPPED_COMPLETION_FUNC func) const;
-
-  /// Send an @a n byte @a buf to the datagram socket (uses <WSASentTo>).
-  ssize_t send (const void *buf,
-                size_t n,
-                const ACE_Addr &addr,
-                int flags,
-                ACE_OVERLAPPED *overlapped,
-                ACE_OVERLAPPED_COMPLETION_FUNC func) const;
-
-  /// Returns the QoS manager for this socket.
-  ACE_QoS_Manager qos_manager (void);
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-  int open (const ACE_INET_Addr &addr,
-            const ACE_QoS_Params &qos_params,
-            int protocol_family = PF_INET,
-            int protocol = 0,
-            ACE_Protocol_Info *protocolinfo = 0,
-            ACE_SOCK_GROUP g = 0,
-            u_long flags = 0,
-            int reuse_addr = 0);
-
-private:
-  // = Disable public <open> method to ensure class used properly.
-
-
-  /// Subscribe to the multicast interface using QoS-enabled semantics.
-  int subscribe_ifs (const ACE_INET_Addr &mcast_addr,
-                     const ACE_QoS_Params &qos_params,
-                     const ACE_TCHAR *net_if,
-                     int protocol_family,
-                     int protocol,
-                     int reuse_addr,
-                     ACE_Protocol_Info *protocolinfo);
-
-  /// Manages the QoS sessions that this socket subscribes to.
-  ACE_QoS_Manager qos_manager_;
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "SOCK_Dgram_Mcast_QoS.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_SOCK_DGRAM_MCAST_QOS_H */
diff --git a/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl b/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
deleted file mode 100644
index 1a2eed3b7..000000000
--- a/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-//
-// $Id: SOCK_Dgram_Mcast_QoS.inl 80826 2008-03-04 14:51:23Z wotte $
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-ACE_SOCK_Dgram_Mcast_QoS::~ACE_SOCK_Dgram_Mcast_QoS (void)
-{
-}
-
-ACE_INLINE ssize_t
-ACE_SOCK_Dgram_Mcast_QoS::send (const iovec buffers[],
-                                int buffer_count,
-                                size_t &number_of_bytes_sent,
-                                int flags,
-                                const ACE_Addr &addr,
-                                ACE_OVERLAPPED *overlapped,
-                                ACE_OVERLAPPED_COMPLETION_FUNC func) const
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast_QoS::send");
-
-  return ACE_SOCK_Dgram::send (buffers,
-                               buffer_count,
-                               number_of_bytes_sent,
-                               flags,
-                               addr,
-                               overlapped,
-                               func);
-
-}
-
-ACE_INLINE ssize_t
-ACE_SOCK_Dgram_Mcast_QoS::send (const void *buf,
-                                size_t n,
-                                const ACE_Addr &addr,
-                                int flags,
-                                ACE_OVERLAPPED *overlapped,
-                                ACE_OVERLAPPED_COMPLETION_FUNC func) const
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast_QoS::send");
-
-  return ACE_SOCK_Dgram::send (buf,
-                               n,
-                               addr,
-                               flags,
-                               overlapped,
-                               func);
-}
-
-ACE_INLINE ACE_QoS_Manager
-ACE_SOCK_Dgram_Mcast_QoS::qos_manager (void)
-{
-  return this->qos_manager_;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/QtReactor/ACE_QtReactor_export.h b/dep/acelite/ace/QtReactor/ACE_QtReactor_export.h
deleted file mode 100644
index 29494c921..000000000
--- a/dep/acelite/ace/QtReactor/ACE_QtReactor_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id: ACE_QtReactor_export.h 80826 2008-03-04 14:51:23Z wotte $
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s ACE_QtReactor
-// ------------------------------
-#ifndef ACE_QTREACTOR_EXPORT_H
-#define ACE_QTREACTOR_EXPORT_H
-
-#include /**/ "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_QTREACTOR_HAS_DLL)
-#  define ACE_QTREACTOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_QTREACTOR_HAS_DLL */
-
-#if !defined (ACE_QTREACTOR_HAS_DLL)
-#  define ACE_QTREACTOR_HAS_DLL 1
-#endif /* ! ACE_QTREACTOR_HAS_DLL */
-
-#if defined (ACE_QTREACTOR_HAS_DLL) && (ACE_QTREACTOR_HAS_DLL == 1)
-#  if defined (ACE_QTREACTOR_BUILD_DLL)
-#    define ACE_QtReactor_Export ACE_Proper_Export_Flag
-#    define ACE_QTREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ACE_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ACE_QTREACTOR_BUILD_DLL */
-#    define ACE_QtReactor_Export ACE_Proper_Import_Flag
-#    define ACE_QTREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ACE_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ACE_QTREACTOR_BUILD_DLL */
-#else /* ACE_QTREACTOR_HAS_DLL == 1 */
-#  define ACE_QtReactor_Export
-#  define ACE_QTREACTOR_SINGLETON_DECLARATION(T)
-#  define ACE_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ACE_QTREACTOR_HAS_DLL == 1 */
-
-// Set ACE_QTREACTOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ACE_QTREACTOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ACE_QTREACTOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ACE_QTREACTOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ACE_QTREACTOR_NTRACE */
-
-#if (ACE_QTREACTOR_NTRACE == 1)
-#  define ACE_QTREACTOR_TRACE(X)
-#else /* (ACE_QTREACTOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ACE_QTREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ACE_QTREACTOR_NTRACE == 1) */
-
-#endif /* ACE_QTREACTOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/QtReactor/QtReactor.cpp b/dep/acelite/ace/QtReactor/QtReactor.cpp
deleted file mode 100644
index eb0dc70b6..000000000
--- a/dep/acelite/ace/QtReactor/QtReactor.cpp
+++ /dev/null
@@ -1,644 +0,0 @@
-//$Id: QtReactor.cpp 82723 2008-09-16 09:35:44Z johnnyw $
-
-#include "ace/QtReactor/QtReactor.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE (ACE_QtReactor)
-
-// Must be called with lock held
-
-ACE_QtReactor::ACE_QtReactor (QApplication *qapp ,
-    ACE_Sig_Handler *sh,
-    ACE_Timer_Queue *tq,
-    int disable_notify_pipe,
-    ACE_Reactor_Notify *notify,
-    bool mask_signals,
-    int s_queue ):
-    ACE_Select_Reactor( sh, tq, disable_notify_pipe,
-        notify, mask_signals, s_queue),
-    qapp_(qapp),
-    qtime_ (0)
-{
-    reopen_notification_pipe();
-}
-
-// Must be called with lock held
-ACE_QtReactor::ACE_QtReactor (size_t size,
-    QApplication *qapp,
-    bool restart,
-    ACE_Sig_Handler *sh,
-    ACE_Timer_Queue *tq,
-    int disable_notify_pipe,
-    ACE_Reactor_Notify *notify,
-    bool mask_signals,
-    int s_queue):
-    ACE_Select_Reactor( size, restart, sh, tq,
-        disable_notify_pipe, notify, mask_signals,
-        s_queue ),
-    qapp_(qapp),
-    qtime_ (0)
-
-{
-    reopen_notification_pipe();
-}
-
-void ACE_QtReactor::reopen_notification_pipe( void)
-{
-  // When the ACE_Select_Reactor is constructed it creates the notify
-  // pipe and registers it with the register_handler_i() method. The
-  // QtReactor overloads this method BUT because the
-  // register_handler_i occurs when constructing the base class
-  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
-  // is called not the QtReactor register_handler_i().  This means
-  // that the notify pipe is registered with the ACE_Select_Reactor
-  // event handling code not the QtReactor and so notfications don't
-  // work.  To get around this we simply close and re-opened the
-  // notification handler in the constructor of the QtReactor.
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-    if ( initialized_ )
-    {
-        this->notify_handler_->close ();
-
-        // Patch for MS Windows: close and open doesn't clear the read
-        // fd_set, so reset it manually
-        this->wait_set_.rd_mask_.reset ();
-
-        this->notify_handler_->open (this, 0);
-    }
-#endif /* ACE_MT_SAFE */
-}
-
-ACE_QtReactor::~ACE_QtReactor (void)
-{
-    // iterate over QSocketNotifiers for read and release them
-    MAP::ITERATOR iter = this->read_notifier_.begin ();
-    MAP::ITERATOR iterEnd = this->read_notifier_.end ();
-    while( iter != iterEnd )
-    {
-        MAP::ENTRY &entry = *iter;
-        // QOBject destructor notifies qapplication (hopefully) on delete
-        delete entry.int_id_;
-        ++iter;
-    }
-
-    // iterate over QSocketNotifiers for write and release them
-    this->write_notifier_.begin ();
-    this->write_notifier_.end ();
-    while( iter != iterEnd )
-    {
-        MAP::ENTRY &entry = *iter;
-        // QOBject destructor notifies qapplication (hopefully) on delete
-        delete entry.int_id_;
-        ++iter;
-    }
-
-    // iterate over QSocketNotifiers for exceptions and release them
-    this->exception_notifier_.begin ();
-    this->exception_notifier_.end ();
-    while( iter != iterEnd )
-    {
-        MAP::ENTRY &entry = *iter;
-        // QOBject destructor notifies qapplication (hopefully) on delete
-        delete entry.int_id_;
-        ++iter;
-    }
-
-    // QOBject destructor notifies qapplication (hopefully) on delete
-    delete qtime_;
-}
-
-void
-ACE_QtReactor::qapplication (QApplication *qapp)
-{
-  // reparent QSocketNotifiers and QTimer
-  qapp_ = qapp ;
-}
-
-void
-ACE_QtReactor::timeout_event (void)
-{
-  // Deal with any timer events
-  ACE_Select_Reactor_Handle_Set handle_set;
-  this->dispatch (0, handle_set );
-
-  // Set next timeout signal
-  this->reset_timeout ();
-}
-
-void
-ACE_QtReactor::read_event (int p_handle)
-{
-  ACE_TRACE ("ACE_QtReactor::read_event");
-
-  ACE_HANDLE handle = ACE_HANDLE( p_handle );
-
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
-  // disable socket notifier to clear pending events
-  QSocketNotifier *qsock_notifier = 0;
-  if ( ( this->read_notifier_.find( handle,
-             qsock_notifier) != -1) )
-    qsock_notifier->setEnabled( false );
-#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
-
-  // The core of read event handling
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  dispatch_set.rd_mask_.set_bit ( handle );
-  this->dispatch (1, dispatch_set);
-
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
-  // enable socket notifier according to current mask
-  ACE_Reactor_Mask mask = 0;
-  mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
-  if ( -1 != mask )
-        set_enable_flag_by_mask ( 1, handle, mask);
-#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
-}
-
-void
-ACE_QtReactor::write_event (int p_handle)
-{
-  ACE_TRACE ("ACE_QtReactor::write_event");
-
-  ACE_HANDLE handle = ACE_HANDLE( p_handle );
-
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
-  // disable socket notifier to clear pending events
-  QSocketNotifier *qsock_notifier = 0;
-  if ( ( this->write_notifier_.find( handle, qsock_notifier) != -1) )
-    qsock_notifier->setEnabled( false );
-#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
-
-  // The core of write event handling
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  dispatch_set.wr_mask_.set_bit( handle );
-  this->dispatch (1, dispatch_set);
-
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
-  // enable socket notifier according to current mask
-  ACE_Reactor_Mask mask = 0;
-  mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
-  if ( -1 != mask )
-        set_enable_flag_by_mask ( 1, handle, mask);
-#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
-}
-
-void
-ACE_QtReactor::exception_event (int p_handle)
-{
-  ACE_TRACE ("ACE_QtReactor::exception_event");
-
-  ACE_HANDLE handle = ACE_HANDLE( p_handle );
-
-
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
-  // disable socket notifier to clear pending events
-  QSocketNotifier *qsock_notifier = 0;
-  if ( ( this->exception_notifier_.find( handle, qsock_notifier) != -1) )
-    qsock_notifier->setEnabled( false );
-#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
-
-  // The core of exception event handling
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  dispatch_set.ex_mask_.set_bit( handle );
-  dispatch (1, dispatch_set);
-
-#ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS
-  // enable socket notifier according to current mask
-  ACE_Reactor_Mask mask = 0;
-  mask = mask_ops( handle, mask, ACE_Reactor::GET_MASK );
-  if ( -1 != mask )
-        set_enable_flag_by_mask ( 1, handle, mask);
-#endif /* ACE_QTREACTOR_CLEAR_PENDING_EVENTS  */
-}
-
-int
-ACE_QtReactor::set_enable_flag_by_mask (int flag_value,
-                                        ACE_HANDLE handle,
-                                        ACE_Reactor_Mask mask)
-{
-  QSocketNotifier *qs_not;
-
-  if (ACE_BIT_ENABLED(mask, ACE_Event_Handler::READ_MASK) ||
-      ACE_BIT_ENABLED( mask, ACE_Event_Handler::ACCEPT_MASK))
-    {
-      // Find the current notifier
-      qs_not = 0;
-      if ((this->read_notifier_.find (handle, qs_not) == -1))
-        return -1;
-
-      qs_not->setEnabled (flag_value);
-    }
-
-  if (ACE_BIT_ENABLED( mask, ACE_Event_Handler::WRITE_MASK) ||
-      ACE_BIT_ENABLED( mask, ACE_Event_Handler::ACCEPT_MASK) ||
-      ACE_BIT_ENABLED( mask, ACE_Event_Handler::CONNECT_MASK))
-    {
-      qs_not = 0;
-      if ((this->write_notifier_.find (handle, qs_not) == -1))
-        return -1;
-
-      qs_not->setEnabled (flag_value);
-    }
-
-  if (ACE_BIT_ENABLED( mask,
-                       ACE_Event_Handler::EXCEPT_MASK))
-    {
-      qs_not = 0;
-      if ((this->exception_notifier_.find (handle, qs_not) == -1))
-        return -1;
-
-      qs_not->setEnabled (flag_value);
-    }
-
-  return 0;
-}
-
-int
-ACE_QtReactor::bit_ops (ACE_HANDLE handle,
-                        ACE_Reactor_Mask mask,
-                        ACE_Select_Reactor_Handle_Set &handle_set,
-                        int ops)
-{
-  int result;
-  ACE_Select_Reactor_Handle_Set preserved_handle_set = handle_set;
-
-  // Call regular bit_ops
-  if ((result = ACE_Select_Reactor::bit_ops (handle, mask, handle_set, ops)) == -1)
-    return -1;
-
-  // disable or enable the notifiers based on handle_set and mask
-  int enableFlag = -1;
-  if (&handle_set == &this->suspend_set_)
-    enableFlag = 0;
-  else if (&handle_set == &this->wait_set_)
-    enableFlag = 1;
-  else
-    // We have no work to do here, so just return
-    return result;
-
-  switch (ops)
-    {
-    case ACE_Reactor::SET_MASK:
-    case ACE_Reactor::ADD_MASK:
-      // Enable or disable notifiers based on the specified masks
-      if (this->set_enable_flag_by_mask (enableFlag, handle, mask) == -1)
-        {
-          // We can't just return -1 here because we'll have half-changed things.
-          // So, we need to restore the old handle_set, then return -1.
-          handle_set = preserved_handle_set;
-          return -1;
-        }
-      break;
-
-    case ACE_Reactor::CLR_MASK:
-      if (this->set_enable_flag_by_mask (!enableFlag, handle, mask) == -1)
-        {
-          handle_set = preserved_handle_set;
-          return -1;
-        }
-      break;
-
-    default:
-      // we take no action for any other operations
-      break;
-    }
-
-  return result;
-}
-
-void
-ACE_QtReactor::create_notifiers_for_handle (ACE_HANDLE handle)
-{
-    QSocketNotifier *qsock_notifier = 0;
-
-    // if there is already a read socket notifier for this handle, do nothing
-    // otherwise create read notifier
-    if ( ( this->read_notifier_.find (handle,
-               qsock_notifier) == -1) )
-    {
-        ACE_NEW (qsock_notifier,
-            QSocketNotifier (int(handle), QSocketNotifier::Read, this));
-        this->read_notifier_.bind (handle,
-            qsock_notifier);
-        QObject::connect (qsock_notifier,
-            SIGNAL (activated (int)),
-            this,
-            SLOT (read_event (int))) ;
-        // disable; it will be enabled by the regular register_handler_i if
-        // necessary
-        qsock_notifier->setEnabled (0);
-    }
-
-    qsock_notifier = 0;
-
-
-    // if there is already a write socket notifier for this handle, do nothing
-    // otherwise create read notifier
-    if ((this->write_notifier_.find (handle,
-             qsock_notifier) == -1))
-    {
-        ACE_NEW (qsock_notifier,
-            QSocketNotifier (int(handle), QSocketNotifier::Write, this));
-
-        this->write_notifier_.bind (handle,
-            qsock_notifier);
-
-        QObject::connect (qsock_notifier,
-            SIGNAL (activated (int)),
-            this,
-            SLOT (write_event (int)));
-        // disable; it will be enabled by the regular register_handler_i if
-        // necessary
-        qsock_notifier->setEnabled (0);
-    }
-
-
-    qsock_notifier = 0;
-
-    // if there is already a write socket notifier for this handle, do nothing
-    // otherwise create read notifier
-    if ((this->exception_notifier_.find (handle,
-             qsock_notifier) == -1))
-    {
-
-        ACE_NEW (qsock_notifier,
-            QSocketNotifier (int(handle), QSocketNotifier::Exception, this));
-
-        this->exception_notifier_.bind (handle,
-            qsock_notifier);
-
-        QObject::connect (qsock_notifier,
-            SIGNAL (activated (int)),
-            this,
-            SLOT (exception_event (int))) ;
-        // disable; it will be enabled by the regular register_handler_i if
-        // necessary
-        qsock_notifier->setEnabled (0);
-    }
-}
-
-void
-ACE_QtReactor::destroy_notifiers_for_handle (ACE_HANDLE handle)
-{
-  QSocketNotifier *qsock_notifier = 0;
-
-  // Looks for the handle in the maps and removes them.
-
-  if ((this->read_notifier_.find (handle,
-                                  qsock_notifier) != -1))
-    {
-      this->read_notifier_.unbind (handle,
-                                   qsock_notifier);
-      delete qsock_notifier;
-    }
-
-  if ((this->write_notifier_.find (handle,
-                                   qsock_notifier) != -1))
-    {
-      this->write_notifier_.unbind (handle,
-                                    qsock_notifier);
-      delete qsock_notifier;
-    }
-
-
-  if ((this->exception_notifier_.find (handle,
-                                       qsock_notifier) != -1))
-    {
-      this->exception_notifier_.unbind (handle,
-                                        qsock_notifier);
-      delete qsock_notifier;
-    }
-}
-
-int
-ACE_QtReactor::register_handler_i (ACE_HANDLE handle ,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_QtReactor::register_handler_i");
-
-  this->create_notifiers_for_handle (handle);
-
-  int result;
-  if ((result = ACE_Select_Reactor::register_handler_i(handle,
-                                                       handler,
-                                                       mask ))
-      == -1)
-    {
-        // destroy notifiers only when there is no handler for handle
-        if ( !ACE_Select_Reactor::find_handler( handle ) )
-            this->destroy_notifiers_for_handle (handle);
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-ACE_QtReactor::register_handler_i (const ACE_Handle_Set &handles,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::register_handler_i(handles,
-                                                handler,
-                                                mask);
-}
-
-int ACE_QtReactor::remove_handler_i (ACE_HANDLE handle ,
-                                     ACE_Reactor_Mask mask   )
-{
-  ACE_TRACE ("ACE_QtReactor::remove_handler_i");
-
-  int result = ACE_Select_Reactor::remove_handler_i (handle, mask);
-  // destroy notifiers only when there is no handler for handle
-  if ( !ACE_Select_Reactor::find_handler( handle ) )
-      this->destroy_notifiers_for_handle (handle);
-  return result;
-}
-
-
-int
-ACE_QtReactor::remove_handler_i (const ACE_Handle_Set &handles,
-                                 ACE_Reactor_Mask  mask)
-{
-  return ACE_Select_Reactor::remove_handler_i (handles,
-                                               mask);
-}
-
-// The following functions ensure that there is an Qt timeout for the
-// first timeout in the Reactor's Timer_Queue.
-
-void
-ACE_QtReactor::reset_timeout (void)
-{
-  if (this->qtime_ != 0)
-    {
-      delete this->qtime_;
-      this->qtime_ = 0;
-    }
-
-  ACE_Time_Value *max_wait_time =
-    this->timer_queue_->calculate_timeout (0) ;
-
-  if (max_wait_time)
-  {
-    ACE_NEW (this->qtime_,
-             QTimer);
-
-    QObject::connect (qtime_,
-                      SIGNAL (timeout ()),
-                      this,
-                      SLOT (timeout_event ()));
-
-#if QT_VERSION >= 0x040000
-    qtime_->setSingleShot (1);
-    qtime_->start(max_wait_time->msec());
-#else
-    qtime_->start(max_wait_time->msec(), 1);
-#endif
-  }
-
-}
-
-
-long
-ACE_QtReactor::schedule_timer (ACE_Event_Handler *handler,
-                               const void *arg,
-                               const ACE_Time_Value &delay_time,
-                               const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_QtReactor::schedule_timer");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token,
-                            ace_mon,
-                            this->token_,
-                            -1));
-
-  long result;
-  if ((result = ACE_Select_Reactor::schedule_timer(handler,
-                                                   arg,
-                                                   delay_time,
-                                                   interval)) == -1 )
-    return -1;
-  else
-  {
-    this->reset_timeout ();
-    return result;
-  }
-}
-
-int
-ACE_QtReactor::cancel_timer (ACE_Event_Handler *handler,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_QtReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (handler,
-                                        dont_call_handle_close ) == -1 )
-    return -1 ;
-  else
-  {
-    this->reset_timeout( ) ;
-    return 0 ;
-  }
-}
-
-int ACE_QtReactor::cancel_timer (long  timer_id,
-                                 const void **arg,
-                                 int dont_call_handle_close )
-{
-  ACE_TRACE ("ACE_QtReactor::cancel_timer") ;
-
-  if (ACE_Select_Reactor::cancel_timer (timer_id,
-                                        arg,
-                                        dont_call_handle_close ) == -1 )
-    return -1 ;
-  else
-  {
-    this->reset_timeout( ) ;
-    return 0 ;
-  }
-}
-
-// mbrudka: who needs QtWaitForMultipleEvents? It seems it's cargo load now!
-int
-ACE_QtReactor::QtWaitForMultipleEvents (int width,
-                                        ACE_Select_Reactor_Handle_Set &wait_set,
-                                        ACE_Time_Value * /*max_wait_time*/)
-{
-  // Keep a copy of the wait set in case the wait_set be changed
-  // between the two select calls in this function. It could happen
-  // while waiting for an event, another event is handled and dispatched
-  // which changes the dispatch_set_/wait_set.
-  ACE_Select_Reactor_Handle_Set orig_wait_set = wait_set;
-
-  // Check to make sure our handle's are all usable.
-  ACE_Select_Reactor_Handle_Set temp_set = wait_set;
-
-  if (ACE_OS::select (width,
-                      temp_set.rd_mask_,
-                      temp_set.wr_mask_,
-                      temp_set.ex_mask_,
-                      (ACE_Time_Value *) &ACE_Time_Value::zero ) == -1)
-    return -1; // Bad file arguments...
-
-  // Qt processing.
-#if QT_VERSION >= 0x040000
-  this->qapp_->processEvents();
-#else
-  this->qapp_->processOneEvent ();
-#endif
-
-  // Reset the width, in case it changed during the upcalls.
-  width = handler_rep_.max_handlep1 ();
-
-  // Now actually read the result needed by the <Select_Reactor> using
-  // <select>.
-  return ACE_OS::select(width,
-                        orig_wait_set.rd_mask_,
-                        orig_wait_set.wr_mask_,
-                        orig_wait_set.ex_mask_,
-                        (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-// mbrudka: who needs wait_for_multiple_events? It seems it's cargo load now!
-int
-ACE_QtReactor::wait_for_multiple_events (
-  ACE_Select_Reactor_Handle_Set &handle_set,
-  ACE_Time_Value *max_wait_time)
-{
-  ACE_TRACE ("ACE_QtReactor::wait_for_multiple_events");
-
-  int nfound = 0;
-  do
-  {
-    max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
-    size_t width = this->handler_rep_.max_handlep1 ();
-    handle_set.rd_mask_ = this->wait_set_.rd_mask_;
-    handle_set.wr_mask_ = this->wait_set_.wr_mask_;
-    handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-
-    nfound = QtWaitForMultipleEvents (width,
-                                      handle_set,
-                                      max_wait_time);
-
-  } while( nfound == -1 && this->handle_error () > 0 );
-
-  if (nfound > 0)
-  {
-#if !defined (ACE_WIN32)
-    handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
-    handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
-    handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
-#endif /* ACE_WIN32 */
-  }
-
-  return nfound;
-  // Timed out or input available
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/QtReactor/QtReactor.h b/dep/acelite/ace/QtReactor/QtReactor.h
deleted file mode 100644
index 72fe6d984..000000000
--- a/dep/acelite/ace/QtReactor/QtReactor.h
+++ /dev/null
@@ -1,226 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    QtReactor.h
- *
- *  $Id: QtReactor.h 94053 2011-05-11 13:44:41Z mhengstmengel $
- *
- *  @author Hamish Friedlander <ullexco@wave.co.nz>
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef ACE_QTREACTOR_H
-#define ACE_QTREACTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/QtReactor/ACE_QtReactor_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Select_Reactor.h"
-#include "ace/Map_Manager.h"
-
-#if defined (ACE_HAS_QT4)
-# include "QtCore/qglobal.h"
-#endif
-
-// QT toolkit specific includes.
-#include /**/ <QtGui/QApplication>
-#include /**/ <QtCore/QObject>
-#include /**/ <QtCore/QSocketNotifier>
-#include /**/ <QtCore/QTimer>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_QtReactor
- *
- * @brief An object-oriented event demultiplexor and event handler
- * dispatcher that uses the Qt Library. This class declaration
- * also uses the extension facilities  provided by the Qt. So,
- * readers  of the class declaration should not be upset with
- * the appearence of the Keywords like Q_OBJECT, private slots
- * etc. They are specific to Qt which uses these as a call back
- * methods implementation mechanism.
- *
- * \note Marek Brudka <mbrudka@elka.pw.edu.pl>: ACE_QtReactor was
- * quickly bugfixed to meet ACE 5.4.2 (6.0.0?) deadline.
- * While it passes QtReactor_Test now, there is a great
- * room for improvements as the implementation is rather inefficient
- * and obfuscated
- * To be more specific:
- * - reset_timeout always creates and removes qtimer after each
- * timeout event! Obviously, for fast triggering timers this may
- * lead to excessive memory management.
- * - create/destroy_notifiers_for_handle may also be reworked to
- * establish more clean relations between handles and QSocketNotifiers.
- * - read/write_exception_event disable now SocketNotifier for a while
- * to clear pending events. The cost of this operation is high: two hash
- * acces in ACE and at least two next ones in Qt. This makes QtReator slow,
- * but how clear pending events another way ?
- * - there is qapplication() mutator, which sets new qapplication for
- * QtReactor. This mutator violates implicit assumption about the
- * relations between QTimer and QSocketNotifiers and QApplication for
- * this reactor, namely one may expect that after qapplication(), none
- * of QtReactor artifacts is bound to old qapplication. That's not true
- * now, as QTimer and QSocketNotifiers are not reparent to new
- * QApplication. As a result, the sequence:
- * QApplication *old_qapp = new QApplication(..);
- * QtReactor qreactor( old_qapp);
- * // .. register handlers, schedule_timers etc
- * QApplication *new_qapp = new QApplication(..);
- * qreactor.qpplication( new_qapp );
- * delete old_qapp;
- * almost always leads to problems and memory violation, because
- * QSocketNotifiers are released by old_qapp. Therefore QtReactor
- * should not be reparent now by setting new qapplication.
- * - the lifecycle of Qt objects in ACE contects is rather mysterious
- * and should be made more explicit.
- * - valgrind reports a small memory leak in QtReactor_Test, though as for now
- * it is not clear if the leak is introduced by  QtReactor, or rather incorrect
- * memory management in QtReactor_Test.
- */
-class ACE_QtReactor_Export ACE_QtReactor
-  : public QObject,
-    public ACE_Select_Reactor
-{
-
-    Q_OBJECT
-
-public:
-    /** \brief Constructor follows  @ACE_Select_Reactor
-        \param QApplication *qapp, qapplication which runs events loop
-    */
-    ACE_QtReactor (QApplication *qapp = 0,
-        ACE_Sig_Handler * = 0,
-        ACE_Timer_Queue * = 0,
-        int disable_notify_pipe = 0,
-        ACE_Reactor_Notify *notify = 0,
-        bool mask_signals = true,
-        int s_queue = ACE_SELECT_TOKEN::FIFO);
-
-    /** \brief Constructor follows @ACE_Select_Reactor
-        \param QApplication *qapp, qapplication which runs events loop
-    */
-    ACE_QtReactor (size_t size,
-        QApplication *qapp = 0,
-        bool restart = false,
-        ACE_Sig_Handler * = 0,
-        ACE_Timer_Queue * = 0,
-        int disable_notify_pipe = 0,
-        ACE_Reactor_Notify *notify = 0,
-        bool mask_signals = true,
-        int s_queue = ACE_SELECT_TOKEN::FIFO);
-
-    virtual ~ACE_QtReactor (void);
-
-    void qapplication (QApplication *qapp);
-
-    // = Timer operations.
-    virtual long schedule_timer (ACE_Event_Handler *handler,
-        const void *arg,
-        const ACE_Time_Value &delay_time,
-        const ACE_Time_Value &interval);
-
-    virtual int  cancel_timer (ACE_Event_Handler *handler,
-        int dont_call_handle_close = 1);
-
-    virtual int  cancel_timer (long timer_id,
-        const void **arg = 0,
-        int dont_call_handle_close = 1);
-
-protected:
-
-    // = Register timers/handles with Qt
-
-    /// Register a single @a handler.
-    virtual int register_handler_i (ACE_HANDLE handle,
-        ACE_Event_Handler *handler,
-        ACE_Reactor_Mask mask);
-
-    /// Register a set of <handlers> with Qt.
-    virtual int register_handler_i (const ACE_Handle_Set &handles,
-        ACE_Event_Handler *handler,
-        ACE_Reactor_Mask mask);
-
-
-    /// Remove the <handler> associated with this @a handle.
-    virtual int remove_handler_i (ACE_HANDLE handle,
-        ACE_Reactor_Mask mask);
-
-    /// Remove a set of <handles>.
-    virtual int remove_handler_i (const ACE_Handle_Set &handles,
-        ACE_Reactor_Mask mask);
-
-    /// Wait for events to occur.
-    virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-        ACE_Time_Value *max_wait_time);
-
-    virtual int QtWaitForMultipleEvents (int width,
-        ACE_Select_Reactor_Handle_Set &wait_set,
-        ACE_Time_Value *max_wait_time);
-
-    virtual int bit_ops (ACE_HANDLE handle,
-        ACE_Reactor_Mask mask,
-        ACE_Select_Reactor_Handle_Set &handle_set,
-        int ops);
-
-    int set_enable_flag_by_mask (int flag_value, ACE_HANDLE handle, ACE_Reactor_Mask mask);
-    void create_notifiers_for_handle (ACE_HANDLE handle);
-    void destroy_notifiers_for_handle (ACE_HANDLE handle);
-
-    // Wait for Qt events to occur
-
-    /// Some Qt stuff that we need to have
-    QApplication *qapp_ ;
-
-    /// Typedef of a map.
-    typedef ACE_Map_Manager<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex> MAP;
-
-    /// A notifier for a read
-    MAP read_notifier_;
-
-    /// A write notifier
-    MAP write_notifier_;
-
-    /// An exception notifier
-    MAP exception_notifier_;
-
-    /// The timer class that would provide timer-sgnals & single-shot timers
-    QTimer *qtime_ ;
-
-private:
-    /// This method ensures there's an Qt timeout for the first timeout
-    /// in the Reactor's Timer_Queue.
-    void reset_timeout (void);
-    /// reopens notification pipe to create SocketNotifier for it
-    void reopen_notification_pipe(void);
-    /// Deny access since member-wise won't work...
-    ACE_QtReactor (const ACE_QtReactor &);
-    ACE_QtReactor &operator= (const ACE_QtReactor &);
-
-private slots:
-
-    // These are all part of the communication mechanism adopted in Qt.
-    /// Dispatch a Read Event
-    void read_event (int FD);
-
-    /// Dispatch a Write Event
-    void write_event (int FD);
-
-    /// Dispatch an exception event
-    void exception_event (int FD);
-
-    /// Dispatch a timeout event
-    void timeout_event (void);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* ACE_QTREACTOR_H */
diff --git a/dep/acelite/ace/RB_Tree.cpp b/dep/acelite/ace/RB_Tree.cpp
index e9953b3ac..a762e9095 100644
--- a/dep/acelite/ace/RB_Tree.cpp
+++ b/dep/acelite/ace/RB_Tree.cpp
@@ -1,4 +1,4 @@
-// $Id: RB_Tree.cpp 94171 2011-06-09 01:49:08Z schmidt $
+// $Id: RB_Tree.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_RB_TREE_CPP
 #define ACE_RB_TREE_CPP
@@ -15,7 +15,7 @@
 #include "ace/RB_Tree.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -52,7 +52,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (ACE_Allocator
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (ACE_Allocator *alloc)");
   allocator_ = alloc;
   if (this->open (alloc) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n")));
 }
 
@@ -149,12 +149,12 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tre
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right");
 
   if (!x)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("\nerror: x is a null pointer in ")
                 ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
   else if (! (x->left()))
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("\nerror: x->left () is a null pointer in ")
                 ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
@@ -188,12 +188,12 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left");
 
   if (! x)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("\nerror: x is a null pointer in ")
                 ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
   else if (! (x->right()))
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("\nerror: x->right () is a null pointer ")
                 ACE_TEXT ("in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
@@ -398,7 +398,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rebalance (ACE_RB_Tree_N
       if (! x->parent ()->parent ())
         {
           // If we got here, something is drastically wrong!
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("\nerror: parent's parent is null in ")
                       ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n")));
@@ -632,7 +632,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
           if (current->right ())
             {
               // If there is already a right subtree, complain.
-              ACE_ERROR_RETURN ((LM_ERROR,
+              ACELIB_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("%p\n"),
                                  ACE_TEXT ("\nright subtree already present in ")
                                  ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
@@ -668,7 +668,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
         {
           if (current->left ())
             // If there is already a left subtree, complain.
-            ACE_ERROR_RETURN ((LM_ERROR,
+            ACELIB_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("%p\n"),
                                ACE_TEXT ("\nleft subtree already present in ")
                                ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
@@ -748,7 +748,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
           if (current->right ())
             {
               // If there is already a right subtree, complain.
-              ACE_ERROR_RETURN ((LM_ERROR,
+              ACELIB_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("%p\n"),
                                  ACE_TEXT ("\nright subtree already present in ")
                                  ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
@@ -783,7 +783,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k,
         {
           if (current->left ())
             // If there is already a left subtree, complain.
-            ACE_ERROR_RETURN ((LM_ERROR,
+            ACELIB_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("%p\n"),
                                ACE_TEXT ("\nleft subtree already present in ")
                                ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")),
@@ -865,17 +865,17 @@ dump_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> *node) const
     {
       dump_node_i (*node);
 
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ndown left\n")));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ndown left\n")));
       this->dump_i (node->left ());
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nup left\n")));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nup left\n")));
 
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ndown right\n")));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ndown right\n")));
       this->dump_i (node->right ());
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nup right\n")));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nup right\n")));
     }
   else
     {
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nNULL POINTER (BLACK)\n")));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nNULL POINTER (BLACK)\n")));
     }
 #else /* !ACE_HAS_DUMP */
   ACE_UNUSED_ARG (node);
@@ -894,7 +894,7 @@ dump_node_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> &node) const
   const char * color_str = (node.color () == ACE_RB_Tree_Node_Base::RED)
                            ? "RED" : "BLACK";
 
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT (" color=[%s]\n"), color_str));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT (" color=[%s]\n"), color_str));
 #else /* !ACE_HAS_DUMP */
   ACE_UNUSED_ARG (node);
 #endif /* ACE_HAS_DUMP */
@@ -916,7 +916,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant (void)
   int expected_black_height = -1;
   if (this->test_invariant_recurse (this->root_, expected_black_height, 0) == 0)
     {
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("invariant holds\n")));
+      ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("invariant holds\n")));
       return 0;
     }
 
@@ -943,7 +943,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant_recurse (ACE
         }
       else if (expected_black_height != measured_black_height)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("\nexpected_black_height = %d but ")
                              ACE_TEXT ("\nmeasured_black_height = %d in ")
                              ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::test_invariant_recurse\n"),
@@ -959,7 +959,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant_recurse (ACE
     {
       if (x->left () && x->left ()->color () == ACE_RB_Tree_Node_Base::RED)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("%p\n"),
                              ACE_TEXT ("\nRED parent has RED left child in ")
                              ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::test_invariant_recurse\n")),
@@ -968,7 +968,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant_recurse (ACE
 
       if (x->right () && x->right ()->color () == ACE_RB_Tree_Node_Base::RED)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("%p\n"),
                              ACE_TEXT ("\nRED parent has RED right child in ")
                              ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::test_invariant_recurse\n")),
@@ -1170,9 +1170,9 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i (void)
 {
   ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nnode_ = %x\n"), this->node_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nnode_ = %x\n"), this->node_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
 
diff --git a/dep/acelite/ace/RB_Tree.inl b/dep/acelite/ace/RB_Tree.inl
index 6f085fd62..1b4b366f5 100644
--- a/dep/acelite/ace/RB_Tree.inl
+++ b/dep/acelite/ace/RB_Tree.inl
@@ -1,10 +1,10 @@
 // -*- C++ -*-
 //
-// $Id: RB_Tree.inl 94310 2011-07-09 19:10:06Z schmidt $
+// $Id: RB_Tree.inl 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Guard_T.h"
 #include "ace/Malloc_Base.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -568,13 +568,13 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncurrent_size_ = %d\n"), this->current_size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncurrent_size_ = %d\n"), this->current_size_));
   this->allocator_->dump ();
   this->lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nDumping nodes from root\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nDumping nodes from root\n")));
   this->dump_i (this->root_);
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/README b/dep/acelite/ace/README
index 56321ab2a..3fb701566 100644
--- a/dep/acelite/ace/README
+++ b/dep/acelite/ace/README
@@ -1,4 +1,4 @@
-// $Id: README 93588 2011-03-18 05:18:06Z olli $
+// $Id: README 97921 2014-10-10 21:58:31Z shuston $
 
 ACE Portability Macros
 ----------------------
@@ -32,6 +32,10 @@ ACE_DEFINES_DEFAULT_WIN32_SECURITY_ATTRIBUTES
                                         ACE_OS::default_win32_security_attributes
                                         as the default security
                                         object.
+ACE_DISABLE_MKTEMP                      Disable availability of
+                                        ACE_OS::mktemp().
+ACE_DISABLE_TEMPNAM                     Disable availability of
+                                        ACE_OS::tempnam().
 ACE_DISABLE_DEBUG_DLL_CHECK             Define this if you don't want
                                         debug version ACE search for
                                         debug version DLLs first
@@ -235,7 +239,7 @@ ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
                                         "ace/OS.h" for details.
 ACE_HAS_BROKEN_ACCEPT_ADDR              Platform can't correctly deal
                                         with a NULL addr to accept()
-                                        (e.g, VxWorks).
+                                        (e.g, VxWorks < 6.9).
 ACE_HAS_BROKEN_DGRAM_SENDV              Platform sendv() does not work
                                         properly with datagrams,
                                         i.e. it fails when the iovec
@@ -332,6 +336,8 @@ ACE_HAS_IDTYPE_T                        Compiler/platform supports
 ACE_HAS_INLINED_OSCALLS                 Inline all the static class OS
                                         methods to remove call
                                         overhead
+ACE_HAS_INT_SWAB                        Platform's swab function has length
+                                        argument of type int, not ssize_t.
 ACE_HAS_IP_MULTICAST                    Platform supports IP multicast
 ACE_HAS_IPV6                            Platform supports IPv6.
 ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED   gethostbyaddr does not handle
@@ -339,8 +345,6 @@ ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED   gethostbyaddr does not handle
 ACE_USES_IPV4_IPV6_MIGRATION            Enable IPv6 support in ACE on
                                         platforms that don't have IPv6
                                         turned on by default.
-ACE_HAS_IPV6_V6ONLY                     Platform supports the IPPROTO_IPV6
-                                        level IPV6_V6ONLY socket option.
 ACE_HAS_NONSTATIC_OBJECT_MANAGER        Causes the ACE_Object_Manager
                                         instance to be created in main
                                         (int, char *[]), instead of as
@@ -471,7 +475,7 @@ ACE_HAS_PTHREADS                        Platform supports POSIX
 ACE_HAS_PTHREADS_UNIX98_EXT             Platform has the UNIX98 extensions to
                                         Pthreads (rwlocks)
 ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP  Platform has
-					pthread_attr_setcreatesuspend_np().
+                                        pthread_attr_setcreatesuspend_np().
 ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP     Platform has pthread_condattr_setkind_np().
 ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP    Platform has
                                         pthread_mutexattr_setkind_np().
@@ -534,10 +538,10 @@ ACE_HAS_SIG_C_FUNC                      Compiler requires extern "C"
 ACE_HAS_SIZET_SOCKET_LEN                OS/compiler uses size_t *
                                         rather than int * for socket
                                         lengths
-ACE_HAS_SOCKADDR_IN_SIN_LEN		Platform has sin_len member in struct
-					sockaddr_in.
-ACE_HAS_SOCKADDR_IN6_SIN_LEN		Platform has sin6_len member in struct
-					sockaddr_in6.
+ACE_HAS_SOCKADDR_IN_SIN_LEN             Platform has sin_len member in struct
+                                        sockaddr_in.
+ACE_HAS_SOCKADDR_IN6_SIN_LEN            Platform has sin6_len member in struct
+                                        sockaddr_in6.
 ACE_HAS_SOCKADDR_MSG_NAME               Platform requires (struct
                                         sockaddr *) for msg_name field
                                         of struct msghdr.
@@ -561,13 +565,13 @@ ACE_HAS_STDCPP_STL_INCLUDES             Standard C++ headers can be
 ACE_HAS_STRBUF_T                        Compiler/platform supports
                                         struct strbuf
 ACE_HAS_STRDUP_EMULATION                Use ACE's strdup() emulation (even
-					if platform has a native strdup()).
-				        This is useful if you need control
-					over what memory allocator is used.
+                                        if platform has a native strdup()).
+                                        This is useful if you need control
+                                        over what memory allocator is used.
 ACE_HAS_WCSDUP_EMULATION                Use ACE's wcsdup() emulation (even
-					if platform has a native wcsdup()).
-				        This is useful if you need control
-					over what memory allocator is used.
+                                        if platform has a native wcsdup()).
+                                        This is useful if you need control
+                                        over what memory allocator is used.
 ACE_HAS_STRNLEN                         Platform supports strnlen(3).
 ACE_HAS_STREAMS                         Platform supports STREAMS
 ACE_HAS_STREAM_PIPES                    Platform supports STREAM pipes
@@ -690,9 +694,9 @@ ACE_HAS_VERSIONED_NAMESPACE             Wrap all library code within a
                                         ACE_VERSIONED_NAMESPACE_NAME
                                         to desired name.
 ACE_LACKS_INTMAX_T                      Platform lacks the intmax_t type
-ACE_LACKS_UINTMAX_T			Platform lacks the uintmax_t type.
+ACE_LACKS_UINTMAX_T                     Platform lacks the uintmax_t type.
 ACE_LACKS_INTPTR_T                      Platform lacks the intptr_t type
-ACE_LACKS_UINTPTR_T			Platform lacks the uintptr_t type.
+ACE_LACKS_UINTPTR_T                     Platform lacks the uintptr_t type.
 
 ACE_HAS_INT8_T                          Platform provides the int8_t type.
 ACE_HAS_INT16_T                         Platform provides the int16_t type.
@@ -887,7 +891,7 @@ ACE_LACKS_MKTEMP                        Platform lacks the mktemp() function.
 ACE_LACKS_MKTEMP_PROTOTYPE              Platform/compiler lacks the
                                         mktemp() prototype (e.g.,
                                         LynxOS)
-ACE_LACKS_MKSTEMP			Platform lacks the mkstemp() function.
+ACE_LACKS_MKSTEMP      Platform lacks the mkstemp() function.
 ACE_LACKS_MKSTEMP_PROTOTYPE             Platform/compiler lacks the
                                         mkstemp() prototype (e.g.,
                                         LynxOS)
@@ -922,7 +926,7 @@ ACE_LACKS_NEW_H                         OS doesn't have, or we don't want to
                                         use, new.h.
 ACE_LACKS_NULL_PTHREAD_STATUS           OS requires non-null status pointer
                                         for ::pthread_join ().
-ACE_LACKS_NUMERIC_LIMITS		Platform lacks std::numeric_limits<>.
+ACE_LACKS_NUMERIC_LIMITS    Platform lacks std::numeric_limits<>.
 ACE_LACKS_PERFECT_MULTICAST_FILTERING   Platform lacks IGMPv3 "perfect" filtering
                                         of multicast dgrams at the socket level.
                                         If == 1, ACE_SOCK_Dgram_Mcast will bind
@@ -934,6 +938,8 @@ ACE_LACKS_PRI_T                         Platform lacks pri_t (e.g.,
                                         Tandem NonStop UNIX).
 ACE_LACKS_PTHREAD_CANCEL                Platform lacks
                                         pthread_cancel().
+ACE_LACKS_PTHREAD_SCOPE_PROCESS         Platform lacks support for
+                                        PTHREAD_SCOPE_PROCESS
 ACE_LACKS_PTHREAD_SIGMASK               Platform lacks pthread_sigmask ().
 ACE_LACKS_PTHREAD_THR_SIGSETMASK        Platform lacks
                                         pthread_thr_sigsetmask (e.g.,
@@ -993,9 +999,9 @@ ACE_LACKS_SIGSET                        Platform lacks signal sets
                                         (e.g., Chorus and Win32)
 ACE_LACKS_STRPTIME                      Platform/compiler lacks the strptime()
                                         function.
-ACE_LACKS_WCSCHR			Platform/compiler lacks wcschr()
-ACE_LACKS_STRDUP			Platform/compiler lacks strdup()
-ACE_LACKS_WCSDUP			Platform/compiler lacks wcsdup()
+ACE_LACKS_WCSCHR                        Platform/compiler lacks wcschr()
+ACE_LACKS_STRDUP                        Platform/compiler lacks strdup()
+ACE_LACKS_WCSDUP                        Platform/compiler lacks wcsdup()
 ACE_LACKS_STRRCHR                       Platform/compiler lacks strrchr()
 ACE_LACKS_WCSRCHR                       Platform/compiler lacks wcsrchr()
 ACE_LACKS_SWAB                          Platform/compiler lacks
@@ -1043,17 +1049,17 @@ ACE_LACKS_TELLDIR                       Platform uses ACE_HAS_DIRENT
 ACE_LACKS_THREAD_STACK_SIZE             Platform lacks
                                         pthread_attr_setstacksize()
                                         (e.g., Linux pthreads)
-ACE_LACKS_THR_CONCURRENCY_FUNCS		(ONLY APPLIES TO SOLARIS)
-					Platform does not support
-					thr_getconcurrency/thr_setconcurrency
-					functions, or their implementation
-					is effectively a "no-op".  This
-					notably applies for Solaris >= 5.9.
-					Note that if you build on Solaris 8
-					and run on Solaris 9+, you can
-					encounter thread creation errors
-					unless you rebuild on the target
-					platform.
+ACE_LACKS_THR_CONCURRENCY_FUNCS    (ONLY APPLIES TO SOLARIS)
+                                        Platform does not support
+                                        thr_getconcurrency/thr_setconcurrency
+                                        functions, or their implementation
+                                        is effectively a "no-op".  This
+                                        notably applies for Solaris >= 5.9.
+                                        Note that if you build on Solaris 8
+                                        and run on Solaris 9+, you can
+                                        encounter thread creation errors
+                                        unless you rebuild on the target
+                                        platform.
 ACE_LACKS_TIMEDWAIT_PROTOTYPES          MIT pthreads platform lacks
                                         the timedwait prototypes
 ACE_LACKS_TIMESPEC_T                    Platform does not define
diff --git a/dep/acelite/ace/RW_Mutex.cpp b/dep/acelite/ace/RW_Mutex.cpp
index a7459f045..37124eda3 100644
--- a/dep/acelite/ace/RW_Mutex.cpp
+++ b/dep/acelite/ace/RW_Mutex.cpp
@@ -1,7 +1,7 @@
 /**
  * @file RW_Mutex.cpp
  *
- * $Id: RW_Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+ * $Id: RW_Mutex.cpp 96985 2013-04-11 15:50:32Z huangh $
  *
  * Originally in Synch.cpp
  *
@@ -16,7 +16,7 @@
 #include "ace/RW_Mutex.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 
 
@@ -28,9 +28,9 @@ ACE_RW_Mutex::dump (void) const
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_RW_Mutex::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -39,7 +39,7 @@ ACE_RW_Mutex::ACE_RW_Mutex (int type, const ACE_TCHAR *name, void *arg)
 {
 // ACE_TRACE ("ACE_RW_Mutex::ACE_RW_Mutex");
   if (ACE_OS::rwlock_init (&this->lock_, type, name, arg) != 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_RW_Mutex::ACE_RW_Mutex")));
 }
diff --git a/dep/acelite/ace/RW_Process_Mutex.cpp b/dep/acelite/ace/RW_Process_Mutex.cpp
index 74cf98145..6c5ffc30a 100644
--- a/dep/acelite/ace/RW_Process_Mutex.cpp
+++ b/dep/acelite/ace/RW_Process_Mutex.cpp
@@ -1,7 +1,7 @@
-// $Id: RW_Process_Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: RW_Process_Mutex.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/RW_Process_Mutex.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 
 
@@ -45,9 +45,9 @@ ACE_RW_Process_Mutex::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_RW_Process_Mutex::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Reactor.h b/dep/acelite/ace/Reactor.h
index 57d2ec7ea..653c989aa 100644
--- a/dep/acelite/ace/Reactor.h
+++ b/dep/acelite/ace/Reactor.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Reactor.h
  *
- *  $Id: Reactor.h 95774 2012-05-17 15:45:58Z shuston $
+ *  $Id: Reactor.h 97894 2014-09-16 18:11:56Z johnnyw $
  *
  *  @author Irfan Pyarali <irfan@cs.wustl.edu>
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
@@ -462,15 +462,12 @@ public:
    * Install the new disposition (if given) and return the previous
    * disposition (if desired by the caller).
    *
-   * Note that, unlike removing handler for I/O events,
-   * ACE_Event_Handler::handle_close() will not be called when the
-   * handler is removed. Neither will any reference-counting activity be
-   * involved.
-   *
-   * @note There's an existing enhancement request in Bugzilla,
-   * #2368, to change this behavior so that ACE_Event_Handler::handle_close()
-   * is called when the signal handler is removed. Thus, there's some chance
-   * this behavior will change in a future version of ACE.
+   * Note that the registered handler's ACE_Event_Handler::handle_close ()
+   * callback will be called to indicate the signal handler has been removed.
+   * Unlike with I/O handles, there is no way to prevent this callback. The
+   * handle_close() callback can check the passed mask for the value
+   * ACE_Event_Handler::SIGNAL_MASK to tell when the callback is the result
+   * of a signal handler removal.
    */
   int remove_handler (int signum,
                       ACE_Sig_Action *new_disp,
@@ -628,6 +625,9 @@ public:
    * ACE_Event_Handler::remove_reference() will also be called once
    * for every timer associated with the event handler.
    *
+   * In case this operation is called with a nil event_handler
+   * it returns with 0 as the number of handlers cancelled.
+   *
    * Returns number of handlers cancelled.
    */
   virtual int cancel_timer (ACE_Event_Handler *event_handler,
diff --git a/dep/acelite/ace/Reactor_Token_T.cpp b/dep/acelite/ace/Reactor_Token_T.cpp
index 2c8b64528..d083fc67f 100644
--- a/dep/acelite/ace/Reactor_Token_T.cpp
+++ b/dep/acelite/ace/Reactor_Token_T.cpp
@@ -1,6 +1,6 @@
-// $Id: Reactor_Token_T.cpp 82917 2008-10-03 19:10:56Z dai_y $
+// $Id: Reactor_Token_T.cpp 97645 2014-03-07 12:01:21Z johnnyw $
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Reactor_Token_T.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -11,9 +11,9 @@ ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Reactor_Token_T::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -61,7 +61,7 @@ template <class ACE_TOKEN_TYPE> void
 ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::sleep_hook (void)
 {
   ACE_TRACE ("ACE_Reactor_Token_T::sleep_hook");
-  ACE_Time_Value ping = ACE_Time_Value::zero;
+  ACE_Time_Value ping (ACE_Time_Value::zero);
   if (this->reactor_->notify (0, ACE_Event_Handler::EXCEPT_MASK, &ping) == -1)
     {
       if (errno == ETIME)
@@ -70,7 +70,7 @@ ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::sleep_hook (void)
         }
       else
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("sleep_hook failed")));
         }
diff --git a/dep/acelite/ace/Read_Buffer.cpp b/dep/acelite/ace/Read_Buffer.cpp
index 5ad8fcf1c..46dbefc63 100644
--- a/dep/acelite/ace/Read_Buffer.cpp
+++ b/dep/acelite/ace/Read_Buffer.cpp
@@ -1,4 +1,4 @@
-// $Id: Read_Buffer.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Read_Buffer.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Read_Buffer.h"
 
@@ -8,14 +8,11 @@
 #include "ace/Read_Buffer.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Malloc_Base.h"
 #include "ace/Service_Config.h"
 #include "ace/OS_NS_stdio.h"
 
-
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
@@ -23,19 +20,21 @@ ACE_Read_Buffer::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Read_Buffer::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("size_ = %d"), this->size_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\noccurrences_ = %d"), this->occurrences_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nstream_ = %x"), this->stream_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nallocator_ = %x"), this->allocator_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("size_ = %d"), this->size_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\noccurrences_ = %d"), this->occurrences_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nstream_ = %x"), this->stream_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nallocator_ = %x"), this->allocator_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
 ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp,
                                   bool close_on_delete,
                                   ACE_Allocator *alloc)
-  : stream_ (fp),
+  : size_ (0),
+    occurrences_ (0),
+    stream_ (fp),
     close_on_delete_ (close_on_delete),
     allocator_ (alloc)
 {
@@ -48,7 +47,9 @@ ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp,
 ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle,
                                   bool close_on_delete,
                                   ACE_Allocator *alloc)
-  : stream_ (ACE_OS::fdopen (handle, ACE_TEXT ("r"))),
+  : size_ (0),
+    occurrences_ (0),
+    stream_ (ACE_OS::fdopen (handle, ACE_TEXT ("r"))),
     close_on_delete_ (close_on_delete),
     allocator_ (alloc)
 {
diff --git a/dep/acelite/ace/Recursive_Thread_Mutex.cpp b/dep/acelite/ace/Recursive_Thread_Mutex.cpp
index 6130642d5..3fe0f9c5c 100644
--- a/dep/acelite/ace/Recursive_Thread_Mutex.cpp
+++ b/dep/acelite/ace/Recursive_Thread_Mutex.cpp
@@ -1,7 +1,7 @@
 /**
  * @file Recursive_Thread_Mutex.cpp
  *
- * $Id: Recursive_Thread_Mutex.cpp 91688 2010-09-09 11:21:50Z johnnyw $
+ * $Id: Recursive_Thread_Mutex.cpp 96985 2013-04-11 15:50:32Z huangh $
  *
  * Originally in Synch.cpp
  *
@@ -16,7 +16,7 @@
 #include "ace/Recursive_Thread_Mutex.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -30,7 +30,7 @@ ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (const ACE_TCHAR *name,
    if (ACE_OS::recursive_mutex_init (&this->lock_,
                                      name,
                                      arg) == -1)
-     ACE_ERROR ((LM_ERROR,
+     ACELIB_ERROR ((LM_ERROR,
                  ACE_TEXT ("%p\n"),
                  ACE_TEXT ("recursive_mutex_init")));
 }
@@ -103,18 +103,14 @@ ACE_Recursive_Thread_Mutex::get_nesting_level (void)
 #endif /* !ACE_HAS_WINCE */
 }
 
-ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (const ACE_Recursive_Thread_Mutex &)
-{
-}
-
 void
 ACE_Recursive_Thread_Mutex::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Recursive_Thread_Mutex::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Refcounted_Auto_Ptr.inl b/dep/acelite/ace/Refcounted_Auto_Ptr.inl
index d9aacfacc..cf55bfdf4 100644
--- a/dep/acelite/ace/Refcounted_Auto_Ptr.inl
+++ b/dep/acelite/ace/Refcounted_Auto_Ptr.inl
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 //
-// $Id: Refcounted_Auto_Ptr.inl 81179 2008-03-31 19:00:29Z iliyan $
+// $Id: Refcounted_Auto_Ptr.inl 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dep/acelite/ace/Registry_Name_Space.cpp b/dep/acelite/ace/Registry_Name_Space.cpp
index 594e8032f..e109b2526 100644
--- a/dep/acelite/ace/Registry_Name_Space.cpp
+++ b/dep/acelite/ace/Registry_Name_Space.cpp
@@ -1,4 +1,4 @@
-// $Id: Registry_Name_Space.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Registry_Name_Space.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Registry_Name_Space.h"
 
@@ -16,7 +16,7 @@ ACE_Registry_Name_Space::ACE_Registry_Name_Space (void)
 ACE_Registry_Name_Space::ACE_Registry_Name_Space (ACE_Name_Options *name_options)
 {
   if (this->open (name_options) != 0)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Registry_Name_Space::open")));
 }
 
@@ -36,7 +36,7 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options)
                                                         HKEY_LOCAL_MACHINE,
                                                         host);
   if (result != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,  ACE_TEXT ("%p\n"),
+    ACELIB_ERROR_RETURN ((LM_ERROR,  ACE_TEXT ("%p\n"),
                        ACE_TEXT ("ACE_Predefined_Naming_Context::connect")),
                       result);
   else
@@ -52,7 +52,7 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options)
       result = predefined.bind_context (name,
                                         this->context_);
       if (result != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_Registry::Naming_Context::bind_context")), result);
+        ACELIB_ERROR_RETURN ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_Registry::Naming_Context::bind_context")), result);
     }
   return 0;
 }
@@ -254,7 +254,7 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set,
                                   value,
                                   type);
           if (result != 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
+            ACELIB_ERROR_RETURN ((LM_ERROR,
                               ACE_TEXT ("%p\n"),
                               ACE_TEXT ("ACE_Registry::Naming_Context::resolve")),
                               result);
diff --git a/dep/acelite/ace/Remote_Name_Space.cpp b/dep/acelite/ace/Remote_Name_Space.cpp
index fd99feb84..b8c6190af 100644
--- a/dep/acelite/ace/Remote_Name_Space.cpp
+++ b/dep/acelite/ace/Remote_Name_Space.cpp
@@ -1,7 +1,7 @@
-// $Id: Remote_Name_Space.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: Remote_Name_Space.cpp 96985 2013-04-11 15:50:32Z huangh $
 #include "ace/Remote_Name_Space.h"
 #include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_string.h"
 
@@ -34,7 +34,7 @@ ACE_Remote_Name_Space::ACE_Remote_Name_Space (const ACE_TCHAR *hostname,
 {
   ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space");
   if (this->open (hostname, port) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space")));
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space")));
 }
 
 int
@@ -150,7 +150,7 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
   while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
     {
       if (this->ns_proxy_.recv_reply (reply) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
                            ACE_TEXT ("ACE_Remote_Name_Space::list_names")),
                            -1);
@@ -184,7 +184,7 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
   while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
     {
       if (this->ns_proxy_.recv_reply (reply) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
                            ACE_TEXT ("ACE_Remote_Name_Space::list_values")),
                            -1);
@@ -220,7 +220,7 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set,
   while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
     {
       if (this->ns_proxy_.recv_reply (reply) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
                            ACE_TEXT ("ACE_Remote_Name_Space::list_values")),
                            -1);
@@ -255,7 +255,7 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
   while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
     {
       if (this->ns_proxy_.recv_reply (reply) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
                            ACE_TEXT ("ACE_Remote_Name_Space::list_names")),
                            -1);
@@ -296,7 +296,7 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
   while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
     {
       if (this->ns_proxy_.recv_reply (reply) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
                            ACE_TEXT ("ACE_Remote_Name_Space::list_values")),
                            -1);
@@ -337,7 +337,7 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
   while (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
     {
       if (this->ns_proxy_.recv_reply (reply) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
                            ACE_TEXT ("ACE_Remote_Name_Space::list_values")),
                           -1);
@@ -368,9 +368,9 @@ ACE_Remote_Name_Space::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Remote_Name_Space::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->ns_proxy_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Remote_Tokens.cpp b/dep/acelite/ace/Remote_Tokens.cpp
index 07d3b6816..3915dde7a 100644
--- a/dep/acelite/ace/Remote_Tokens.cpp
+++ b/dep/acelite/ace/Remote_Tokens.cpp
@@ -1,4 +1,4 @@
-// $Id: Remote_Tokens.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Remote_Tokens.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Remote_Tokens.h"
 
@@ -69,7 +69,7 @@ ACE_TSS_Connection::make_TSS_TYPE (void) const
       return 0;
     }
 
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_TSS_Connection new connection\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_TSS_Connection new connection\n")));
   return stream;
 }
 
@@ -83,13 +83,13 @@ ACE_TSS_Connection::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TSS_Connection::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_TSS_Connection::dump:\n")));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("server_address_\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_TSS_Connection::dump:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("server_address_\n")));
   server_address_.dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
   ACE_TSS<ACE_SOCK_Stream>::dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -127,7 +127,7 @@ ACE_Remote_Token_Proxy::initiate_connection (void)
   if (token_ == 0)
     {
       errno = ENOENT;
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("ACE_Remote_Token_Proxy not open.\n")), -1);
     }
 
@@ -146,19 +146,19 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request,
   ssize_t length;
 
   if ((length = request.encode (buffer)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("encode failed")), -1);
+    ACELIB_ERROR_RETURN ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("encode failed")), -1);
 
   ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection ();
 
   if (peer == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                       ACE_TEXT("(%P|%t) %p\n"),
                       ACE_TEXT("BIG PROBLEMS with get_connection")), -1);
 
   // Transmit request via a blocking send.
 
   if (peer->send_n (buffer, length) != length)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("send_n failed")), -1);
   else
@@ -168,10 +168,10 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request,
       // Receive reply via blocking read.
 
       if (peer->recv (&reply, sizeof reply) != sizeof reply)
-        ACE_ERROR_RETURN ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("recv failed")), -1);
+        ACELIB_ERROR_RETURN ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("recv failed")), -1);
 
       if (reply.decode () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("decode failed")), -1);
+        ACELIB_ERROR_RETURN ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("decode failed")), -1);
 
       errno = int (reply.errnum ());
       if (errno != 0)
@@ -199,14 +199,14 @@ ACE_Remote_Token_Proxy::acquire (int notify,
         case EWOULDBLOCK :
           // Whoah, we detected wouldblock via the shadow mutex!
           if (debug_)
-            ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) shadow: acquire will block, owner is %s\n"),
+            ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) shadow: acquire will block, owner is %s\n"),
                         this->token_->owner_id ()));
           // No error, but would block,
           break;
 
         case EDEADLK :
           if (debug_)
-            ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) shadow: deadlock detected\n")));
+            ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) shadow: deadlock detected\n")));
 
           if (ignore_shadow_deadlock_)
             break;
@@ -217,7 +217,7 @@ ACE_Remote_Token_Proxy::acquire (int notify,
             }
 
         default :
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("(%t) %p shadow acquire failed\n"),
                              ACE_TEXT ("ACE_Remote_Token_Proxy")),
                             -1);
@@ -238,12 +238,12 @@ ACE_Remote_Token_Proxy::acquire (int notify,
   if (result == -1)
     {
       // Update the local shadow copy.
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("error on remote acquire, releasing shadow mutex.\n")));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("error on remote acquire, releasing shadow mutex.\n")));
       ACE_Token_Proxy::release ();
     }
   else
     {
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) acquired %s remotely.\n"), this->name ()));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) acquired %s remotely.\n"), this->name ()));
       // Our shadow call may have failed.  However, it's still a race
       // to the remote server.  If we beat the client which holds the
       // local token, we need to fix things locally to reflect the
@@ -268,7 +268,7 @@ ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *))
         {
           // Save/restore errno.
           ACE_Errno_Guard error (errno);
-          ACE_DEBUG ((LM_DEBUG,
+          ACELIB_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("shadow try acquire failed\n")));
         }
 
@@ -299,7 +299,7 @@ ACE_Remote_Token_Proxy::renew (int requeue_position,
       if (errno != EWOULDBLOCK)
         return -1;
       else if (debug_)
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("(%t) shadow: renew would block. owner %s.\n"),
                     this->token_->owner_id ()));
     }
@@ -322,14 +322,14 @@ ACE_Remote_Token_Proxy::renew (int requeue_position,
         ACE_Errno_Guard error (errno);
         ACE_Token_Proxy::release ();
       }
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("%p error on remote renew, releasing shadow mutex.\n"),
                          ACE_TEXT ("ACE_Remote_Token_Proxy")), -1);
     }
   else
     {
       if (debug_)
-        ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) renewed %s remotely.\n"), this->name ()));
+        ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) renewed %s remotely.\n"), this->name ()));
       // Make sure that the local shadow reflects our new ownership.
       token_->make_owner (waiter_);
       return result;
@@ -350,13 +350,13 @@ ACE_Remote_Token_Proxy::release (ACE_Synch_Options &options)
 
   int result = this->request_reply (request, options);
   if (result == 0)
-    ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) released %s remotely.\n"), this->name ()));
+    ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) released %s remotely.\n"), this->name ()));
 
   // whether success or failure, we're going to release the shadow.
   // If race conditions exist such that we are no longer the owner,
   // this release will perform a remove.
   if (ACE_Token_Proxy::release () == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) shadow: release failed\n")));
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%t) shadow: release failed\n")));
 
   return result;
 }
@@ -372,7 +372,7 @@ void
 ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *)
 {
   ACE_TRACE ("ACE_Remote_Token_Proxy::token_acquired");
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) %s shadow token %s acquired\n"),
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) %s shadow token %s acquired\n"),
               this->client_id (),
               this->name ()));
   // ACE_Token_Proxy::token_acquired (vp);
@@ -382,7 +382,7 @@ const ACE_TCHAR*
 ACE_Remote_Token_Proxy::owner_id (void)
 {
   ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id");
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("owner_id called\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("owner_id called\n")));
   // @@ special operation
   return 0;
 }
@@ -392,13 +392,13 @@ ACE_Remote_Token_Proxy::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Remote_Token_Proxy::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Tokens::dump:\n")
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Tokens::dump:\n")
               ACE_TEXT (" ignore_shadow_deadlock_ = %d\n"),
               ignore_shadow_deadlock_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
   ACE_Token_Proxy::dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -429,11 +429,11 @@ ACE_Remote_Mutex::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Remote_Mutex::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Remote_Mutex::dump:\n")));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Remote_Mutex::dump:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
   ACE_Remote_Token_Proxy::dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -470,11 +470,11 @@ ACE_Remote_RLock::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Remote_RLock::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Remote_RLock::dump:\n")));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Remote_RLock::dump:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
   ACE_Remote_Token_Proxy::dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -512,11 +512,11 @@ ACE_Remote_WLock::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Remote_WLock::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Remote_WLock::dump:\n")));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Remote_WLock::dump:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
   ACE_Remote_Token_Proxy::dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/SOCK.cpp b/dep/acelite/ace/SOCK.cpp
index fadc85042..57bcb550e 100644
--- a/dep/acelite/ace/SOCK.cpp
+++ b/dep/acelite/ace/SOCK.cpp
@@ -1,7 +1,7 @@
-// $Id: SOCK.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: SOCK.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SOCK.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/SOCK.inl"
@@ -122,7 +122,7 @@ ACE_SOCK::ACE_SOCK (int type,
                   protocol_family,
                   protocol,
                   reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK::ACE_SOCK")));
 }
@@ -177,7 +177,7 @@ ACE_SOCK::ACE_SOCK (int type,
                   g,
                   flags,
                   reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK::ACE_SOCK")));
 }
diff --git a/dep/acelite/ace/SOCK_Acceptor.cpp b/dep/acelite/ace/SOCK_Acceptor.cpp
index d6aa2bd5f..891013bab 100644
--- a/dep/acelite/ace/SOCK_Acceptor.cpp
+++ b/dep/acelite/ace/SOCK_Acceptor.cpp
@@ -1,8 +1,8 @@
-// $Id: SOCK_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: SOCK_Acceptor.cpp 97459 2013-12-12 00:22:03Z mesnier_p $
 
 #include "ace/SOCK_Acceptor.h"
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_Errno.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_socket.h"
@@ -242,6 +242,19 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap,
       else
         local_inet6_addr = *reinterpret_cast<sockaddr_in6 *> (local_sap.get_addr ());
 
+# if defined (ACE_WIN32)
+      // on windows vista and later, Winsock can support dual stack sockets
+      // but this must be explicitly set prior to the bind. Since this
+      // behavior is the default on *nix platforms, it should be benigh to
+      // just do it here. On older platforms the setsockopt will fail, but
+      // that should be OK.
+      int zero = 0;
+      ACE_OS::setsockopt (this->get_handle (),
+                          IPPROTO_IPV6,
+                          IPV6_V6ONLY,
+                          (char *)&zero,
+                          sizeof (zero));
+# endif /* ACE_WIN32 */
       // We probably don't need a bind_port written here.
       // There are currently no supported OS's that define
       // ACE_LACKS_WILDCARD_BIND.
@@ -340,7 +353,7 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
                   protocol_family,
                   backlog,
                   protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_Acceptor")));
 }
@@ -392,7 +405,7 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
                   protocol_family,
                   backlog,
                   protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_Acceptor")));
 }
diff --git a/dep/acelite/ace/SOCK_CODgram.cpp b/dep/acelite/ace/SOCK_CODgram.cpp
index 9d9873acf..09e5506f4 100644
--- a/dep/acelite/ace/SOCK_CODgram.cpp
+++ b/dep/acelite/ace/SOCK_CODgram.cpp
@@ -1,7 +1,7 @@
-// $Id: SOCK_CODgram.cpp 91287 2010-08-05 10:30:49Z johnnyw $
+// $Id: SOCK_CODgram.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SOCK_CODgram.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_sys_socket.h"
 
 #if !defined (__ACE_INLINE__)
@@ -34,7 +34,7 @@ ACE_SOCK_CODgram::ACE_SOCK_CODgram (const ACE_Addr &remote,
                   protocol_family,
                   protocol,
                   reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_CODgram")));
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_CODgram")));
 }
 
 /* This is the general-purpose open routine.  Note that it performs
diff --git a/dep/acelite/ace/SOCK_Connector.cpp b/dep/acelite/ace/SOCK_Connector.cpp
index 2cb0ce577..ef846cab3 100644
--- a/dep/acelite/ace/SOCK_Connector.cpp
+++ b/dep/acelite/ace/SOCK_Connector.cpp
@@ -1,8 +1,8 @@
-// $Id: SOCK_Connector.cpp 91626 2010-09-07 10:59:20Z johnnyw $
+// $Id: SOCK_Connector.cpp 97699 2014-04-08 20:08:26Z mesnier_p $
 
 #include "ace/SOCK_Connector.h"
 #include "ace/INET_Addr.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/os_include/os_fcntl.h"
@@ -251,7 +251,7 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
   // We failed to get connected.
   if (h == ACE_INVALID_HANDLE)
     {
-#if defined (ACE_WIN32)
+#if defined (ACE_NON_BLOCKING_BUG_DELAY) && ACE_NON_BLOCKING_BUG_DELAY > 0
       // Win32 has a timing problem - if you check to see if the
       // connection has completed too fast, it will fail - so wait
       // <ACE_NON_BLOCKING_BUG_DELAY> microseconds to let it catch up
@@ -261,14 +261,14 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
       h = ACE::handle_timed_complete (new_stream.get_handle (), tv);
       if (h == ACE_INVALID_HANDLE)
         {
-#endif /* ACE_WIN32 */
+#endif /* ACE_NON_BLOCKING_BUG_DELAY */
       // Save/restore errno.
       ACE_Errno_Guard error (errno);
       new_stream.close ();
       return -1;
-#if defined (ACE_WIN32)
+#if defined (ACE_NON_BLOCKING_BUG_DELAY) && ACE_NON_BLOCKING_BUG_DELAY > 0
         }
-#endif /* ACE_WIN32 */
+#endif /* ACE_NON_BLOCKING_BUG_DELAY */
     }
 
   if (remote_sap != 0)
@@ -312,7 +312,7 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
                      protocol) == -1
       && timeout != 0
       && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT))
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector")));
 }
@@ -343,7 +343,7 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
                      perms) == -1
       && timeout != 0
       && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT))
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector")));
 }
diff --git a/dep/acelite/ace/SOCK_Dgram.cpp b/dep/acelite/ace/SOCK_Dgram.cpp
index 3706d780a..8eaadb35b 100644
--- a/dep/acelite/ace/SOCK_Dgram.cpp
+++ b/dep/acelite/ace/SOCK_Dgram.cpp
@@ -1,8 +1,8 @@
-// $Id: SOCK_Dgram.cpp 95533 2012-02-14 22:59:17Z wotte $
+// $Id: SOCK_Dgram.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SOCK_Dgram.h"
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/INET_Addr.h"
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
@@ -203,7 +203,7 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local,
                   protocol_family,
                   protocol,
                   reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_Dgram")));
 }
@@ -224,7 +224,7 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local,
                   g,
                   flags,
                   reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_Dgram")));
 }
@@ -530,7 +530,7 @@ ACE_SOCK_Dgram::set_nic (const ACE_TCHAR *net_if,
   // a non-null interface parameter in this function.)
   ACE_UNUSED_ARG (net_if);
   ACE_UNUSED_ARG (addr_family);
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Send interface specification not ")
               ACE_TEXT ("supported - IGNORED.\n")));
 #endif /* !IP_MULTICAST_IF */
@@ -543,7 +543,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq,
                                        const ACE_INET_Addr &mcast_addr,
                                        const ACE_TCHAR *net_if)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::make_multicast_ifaddr");
+  ACE_TRACE ("ACE_SOCK_Dgram::make_multicast_ifaddr");
   ip_mreq  lmreq;       // Scratch copy.
   if (net_if != 0)
     {
@@ -556,17 +556,29 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq,
         ACE_HTONL (interface_addr.get_ip_address ());
 #else
       ifreq if_address;
-
       ACE_OS::strcpy (if_address.ifr_name, ACE_TEXT_ALWAYS_CHAR (net_if));
-
       if (ACE_OS::ioctl (this->get_handle (),
                          SIOCGIFADDR,
                          &if_address) == -1)
-        return -1;
-
-      sockaddr_in *socket_address =
-        reinterpret_cast<sockaddr_in*> (&if_address.ifr_addr);
-      lmreq.imr_interface.s_addr = socket_address->sin_addr.s_addr;
+        {
+          // The net_if name failed to be found. It seems that older linux
+          // kernals only support the actual interface name (eg. "eth0"),
+          // not the IP address string of the interface (eg. "192.168.0.1"),
+          // which newer kernals seem to automatically translate.
+          // So assume that we have been given an IP Address and translate
+          // that instead, similar to the above for windows.
+          ACE_INET_Addr interface_addr;
+          if (interface_addr.set (mcast_addr.get_port_number (), net_if) == -1)
+            return -1;  // Still doesn't work, unknown device specified.
+          lmreq.imr_interface.s_addr =
+            ACE_HTONL (interface_addr.get_ip_address ());
+        }
+      else
+        {
+          sockaddr_in *socket_address =
+            reinterpret_cast<sockaddr_in*> (&if_address.ifr_addr);
+          lmreq.imr_interface.s_addr = socket_address->sin_addr.s_addr;
+        }
 #endif /* ACE_WIN32 || __INTERIX */
     }
   else
@@ -589,7 +601,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq,
                                         const ACE_INET_Addr &mcast_addr,
                                         const ACE_TCHAR *net_if)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::make_multicast_ifaddr6");
+  ACE_TRACE ("ACE_SOCK_Dgram::make_multicast_ifaddr6");
   ipv6_mreq  lmreq;       // Scratch copy.
 
   ACE_OS::memset (&lmreq,
diff --git a/dep/acelite/ace/SOCK_Dgram_Bcast.cpp b/dep/acelite/ace/SOCK_Dgram_Bcast.cpp
index f6226665e..33e4a8b30 100644
--- a/dep/acelite/ace/SOCK_Dgram_Bcast.cpp
+++ b/dep/acelite/ace/SOCK_Dgram_Bcast.cpp
@@ -1,8 +1,8 @@
-// $Id: SOCK_Dgram_Bcast.cpp 93359 2011-02-11 11:33:12Z mcorino $
+// $Id: SOCK_Dgram_Bcast.cpp 97798 2014-07-03 10:57:43Z johnnyw $
 
 #include "ace/SOCK_Dgram_Bcast.h"
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/net/os_if.h"
@@ -80,7 +80,7 @@ ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (const ACE_Addr &local,
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast");
 
   if (this->mk_broadcast (host_name) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_Dgram_Bcast")));
 }
@@ -117,7 +117,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
                           SO_BROADCAST,
                           (char *) &one,
                           sizeof one) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"),
+    ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"),
                       ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: setsockopt failed")),
                       -1);
 
@@ -135,7 +135,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
   if (ACE_OS::ioctl (s,
                      SIOCGIFCONF,
                      (char *) &ifc) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"),
+    ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"),
                       ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface configuration)")),
                       ACE_INVALID_HANDLE);
 
@@ -203,7 +203,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
           // in "debugging" mode.
           if (ifr->ifr_addr.sa_family != 0
               || ACE::debug ())
-          ACE_DEBUG ((LM_DEBUG,
+          ACELIB_DEBUG ((LM_DEBUG,
                       ACE_TEXT("warning %p: sa_family: %d\n"),
                       ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Not AF_INET"),
                       ifr->ifr_addr.sa_family));
@@ -217,7 +217,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
                          SIOCGIFFLAGS,
                          (char *) &flags) == -1)
         {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
+          ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
                      ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)"),
                      flags.ifr_name));
           continue;
@@ -226,7 +226,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
       if (ACE_BIT_ENABLED (flags.ifr_flags,
                            IFF_UP) == 0)
         {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
+          ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
                      ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up"),
                      flags.ifr_name));
           continue;
@@ -242,7 +242,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
           if (ACE_OS::ioctl (s,
                              SIOCGIFBRDADDR,
                              (char *) &if_req) == -1)
-            ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
+            ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
                        ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)"),
                        flags.ifr_name));
           else
@@ -259,8 +259,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
       else
         {
           if (host_name != 0)
-            ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
-                        ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface."),
+            ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
+                        ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enabled for this interface."),
                         flags.ifr_name));
         }
     }
diff --git a/dep/acelite/ace/SOCK_Dgram_Mcast.cpp b/dep/acelite/ace/SOCK_Dgram_Mcast.cpp
index 91167e0ac..985722d88 100644
--- a/dep/acelite/ace/SOCK_Dgram_Mcast.cpp
+++ b/dep/acelite/ace/SOCK_Dgram_Mcast.cpp
@@ -1,4 +1,4 @@
-// $Id: SOCK_Dgram_Mcast.cpp 95679 2012-04-03 22:55:46Z shuston $
+// $Id: SOCK_Dgram_Mcast.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SOCK_Dgram_Mcast.h"
 
@@ -28,7 +28,7 @@
 #include "ace/SOCK_Dgram_Mcast.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 // This is a workaround for platforms with non-standard
 // definitions of the ip_mreq structure
@@ -74,12 +74,12 @@ ACE_SOCK_Dgram_Mcast::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
 # if defined (ACE_SOCK_DGRAM_MCAST_DUMPABLE)
   ACE_TCHAR addr_string[MAXNAMELEN + 1];
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\nOptions: bindaddr=%s, nulliface=%s\n"),
               ACE_BIT_ENABLED (this->opts_, OPT_BINDADDR_YES) ?
                 ACE_TEXT ("<Bound>") : ACE_TEXT ("<Not Bound>"),
@@ -89,14 +89,14 @@ ACE_SOCK_Dgram_Mcast::dump (void) const
   // Show default send addr, port#, and interface.
   ACE_SDM_helpers::addr_to_string (this->send_addr_, addr_string,
                                    sizeof addr_string, 0);
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Send addr=%s iface=%s\n"),
               addr_string,
               this->send_net_if_ ? this->send_net_if_
                                  : ACE_TEXT ("<default>")));
 
   // Show list of subscribed addresses.
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Subscription list:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Subscription list:\n")));
 
   ACE_MT (ACE_GUARD (ACE_SDM_LOCK, guard, this->subscription_list_lock_));
   subscription_list_iter_t  iter (this->subscription_list_);
@@ -122,13 +122,13 @@ ACE_SOCK_Dgram_Mcast::dump (void) const
         ACE_OS::strcpy (iface_string, ACE_TEXT ("<default>"));
 
       // Dump info.
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("\taddr=%s iface=%s\n"),
                   addr_string,
                   iface_string));
     }
 # endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -484,7 +484,7 @@ ACE_SOCK_Dgram_Mcast::join (const ACE_INET_Addr &mcast_addr,
       && def_port_number != 0
       && sub_port_number != def_port_number)
     {
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("Subscribed port# (%u) different than bound ")
                   ACE_TEXT ("port# (%u).\n"),
                   (u_int) sub_port_number,
@@ -507,7 +507,7 @@ ACE_SOCK_Dgram_Mcast::join (const ACE_INET_Addr &mcast_addr,
                                        sizeof sub_addr_string, 1);
       ACE_SDM_helpers::addr_to_string (this->send_addr_, bound_addr_string,
                                        sizeof bound_addr_string, 1);
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("Subscribed address (%s) different than ")
                   ACE_TEXT ("bound address (%s).\n"),
                   sub_addr_string,
diff --git a/dep/acelite/ace/SOCK_IO.h b/dep/acelite/ace/SOCK_IO.h
index 1541f5ed0..391f77cb8 100644
--- a/dep/acelite/ace/SOCK_IO.h
+++ b/dep/acelite/ace/SOCK_IO.h
@@ -4,7 +4,7 @@
 /**
  *  @file    SOCK_IO.h
  *
- *  $Id: SOCK_IO.h 81014 2008-03-19 11:41:31Z johnnyw $
+ *  $Id: SOCK_IO.h 97075 2013-04-24 15:01:48Z schmidt $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -29,7 +29,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * @class ACE_SOCK_IO
  *
  * @brief Defines the methods for the ACE socket wrapper I/O routines
- * (e.g., send/recv).
+ * described below.
  *
  * If @a timeout == 0, then the call behaves as a normal
  * send/recv call, i.e., for blocking sockets, the call will
diff --git a/dep/acelite/ace/SOCK_Netlink.cpp b/dep/acelite/ace/SOCK_Netlink.cpp
index aa1eca8b9..a2c40583f 100644
--- a/dep/acelite/ace/SOCK_Netlink.cpp
+++ b/dep/acelite/ace/SOCK_Netlink.cpp
@@ -1,10 +1,10 @@
-// $Id: SOCK_Netlink.cpp 80826 2008-03-04 14:51:23Z wotte $
+// $Id: SOCK_Netlink.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include /* */  "ace/SOCK_Netlink.h"
 
 #ifdef ACE_HAS_NETLINK
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
@@ -51,7 +51,7 @@ ACE_SOCK_Netlink::ACE_SOCK_Netlink (ACE_Netlink_Addr &local,
   if (this->open (local,
                   protocol_family,
                   protocol)  == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_Netlink")));
 }
diff --git a/dep/acelite/ace/SOCK_SEQPACK_Acceptor.cpp b/dep/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
index 2a39527c3..34ea5dd8e 100644
--- a/dep/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
+++ b/dep/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
@@ -1,9 +1,9 @@
-// $Id: SOCK_SEQPACK_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: SOCK_SEQPACK_Acceptor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SOCK_SEQPACK_Acceptor.h"
 
 #include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_socket.h"
@@ -470,7 +470,7 @@ ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap,
                   protocol_family,
                   backlog,
                   protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_SEQPACK_Acceptor")));
 }
@@ -563,7 +563,7 @@ ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap,
                   protocol_family,
                   backlog,
                   protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_SEQPACK_Acceptor")));
 }
@@ -582,7 +582,7 @@ ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Multihomed_INET_
                   protocol_family,
                   backlog,
                   protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_SEQPACK_Acceptor")));
 }
diff --git a/dep/acelite/ace/SOCK_SEQPACK_Association.cpp b/dep/acelite/ace/SOCK_SEQPACK_Association.cpp
index 8df2b125b..a382a2f3e 100644
--- a/dep/acelite/ace/SOCK_SEQPACK_Association.cpp
+++ b/dep/acelite/ace/SOCK_SEQPACK_Association.cpp
@@ -1,9 +1,9 @@
-// $Id: SOCK_SEQPACK_Association.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: SOCK_SEQPACK_Association.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SOCK_SEQPACK_Association.h"
 
 #include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/dep/acelite/ace/SOCK_SEQPACK_Connector.cpp b/dep/acelite/ace/SOCK_SEQPACK_Connector.cpp
index 25b2bfe41..5b14925d1 100644
--- a/dep/acelite/ace/SOCK_SEQPACK_Connector.cpp
+++ b/dep/acelite/ace/SOCK_SEQPACK_Connector.cpp
@@ -1,9 +1,9 @@
-// $Id: SOCK_SEQPACK_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: SOCK_SEQPACK_Connector.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SOCK_SEQPACK_Connector.h"
 
 #include "ace/INET_Addr.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Time_Value.h"
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
@@ -407,7 +407,7 @@ ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Associa
                      protocol) == -1
       && timeout != 0
       && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT))
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector")));
 }
@@ -434,7 +434,7 @@ ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Associa
                      protocol) == -1
       && timeout != 0
       && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT))
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector")));
 }
diff --git a/dep/acelite/ace/SPIPE_Acceptor.cpp b/dep/acelite/ace/SPIPE_Acceptor.cpp
index 6325e9259..6a9148a98 100644
--- a/dep/acelite/ace/SPIPE_Acceptor.cpp
+++ b/dep/acelite/ace/SPIPE_Acceptor.cpp
@@ -1,7 +1,7 @@
-// $Id: SPIPE_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: SPIPE_Acceptor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SPIPE_Acceptor.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/OS_NS_sys_time.h"
 
@@ -237,7 +237,7 @@ ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap,
   ACE_TRACE ("ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor");
 
   if (this->open (local_sap, reuse_addr, perms, sa, pipe_mode) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SPIPE_Acceptor")));
 }
diff --git a/dep/acelite/ace/SPIPE_Connector.cpp b/dep/acelite/ace/SPIPE_Connector.cpp
index 269a2a19b..af0ee6094 100644
--- a/dep/acelite/ace/SPIPE_Connector.cpp
+++ b/dep/acelite/ace/SPIPE_Connector.cpp
@@ -1,7 +1,8 @@
-// $Id: SPIPE_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: SPIPE_Connector.cpp 97308 2013-09-01 00:58:08Z mesnier_p $
 
 #include "ace/SPIPE_Connector.h"
-#include "ace/Log_Msg.h"
+#include "ace/Handle_Ops.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
@@ -32,7 +33,7 @@ ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io,
   if (this->connect (new_io, remote_sap, timeout, local_sap,
                      reuse_addr, flags, perms, sa, pipe_mode) == -1
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"),
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"),
                remote_sap.get_path_name (), ACE_TEXT ("ACE_SPIPE_Connector")));
 }
 
diff --git a/dep/acelite/ace/SSL/SSL_Asynch_BIO.cpp b/dep/acelite/ace/SSL/SSL_Asynch_BIO.cpp
deleted file mode 100644
index 21c83287f..000000000
--- a/dep/acelite/ace/SSL/SSL_Asynch_BIO.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-// -*- C++ -*-
-// $Id: SSL_Asynch_BIO.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-#include "SSL_Asynch_BIO.h"
-
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
-
-#include "SSL_Asynch_Stream.h"
-#include "ace/OS_NS_string.h"
-#include "ace/Truncate.h"
-
-#if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
-# define ACE_ASYNCH_BIO_WRITE_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_write)
-# define ACE_ASYNCH_BIO_READ_NAME  ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_read)
-# define ACE_ASYNCH_BIO_PUTS_NAME  ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_puts)
-# define ACE_ASYNCH_BIO_CTRL_NAME  ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_ctrl)
-# define ACE_ASYNCH_BIO_NEW_NAME   ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_new)
-# define ACE_ASYNCH_BIO_FREE_NAME  ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_free)
-#else
-# define ACE_ASYNCH_BIO_WRITE_NAME ACE_Asynch_BIO_write
-# define ACE_ASYNCH_BIO_READ_NAME  ACE_Asynch_BIO_read
-# define ACE_ASYNCH_BIO_PUTS_NAME  ACE_Asynch_BIO_puts
-# define ACE_ASYNCH_BIO_CTRL_NAME  ACE_Asynch_BIO_ctrl
-# define ACE_ASYNCH_BIO_NEW_NAME   ACE_Asynch_BIO_new
-# define ACE_ASYNCH_BIO_FREE_NAME  ACE_Asynch_BIO_free
-#endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
-
-/**
- * @name OpenSSL BIO Helper Methods for use with ACE's Asynchronous
- *       SSL I/O support.
- */
-//@{
-extern "C"
-{
-  int  ACE_ASYNCH_BIO_WRITE_NAME (BIO *pBIO, const char *buf, int len);
-  int  ACE_ASYNCH_BIO_READ_NAME  (BIO *pBIO, char *buf, int len);
-  int  ACE_ASYNCH_BIO_PUTS_NAME  (BIO *pBIO, const char *str);
-  long ACE_ASYNCH_BIO_CTRL_NAME  (BIO *pBIO, int cmd, long arg1, void *arg2);
-  int  ACE_ASYNCH_BIO_NEW_NAME   (BIO *pBIO);
-  int  ACE_ASYNCH_BIO_FREE_NAME  (BIO *pBIO);
-}
-//@}
-
-#define BIO_TYPE_ACE  ( 21 | BIO_TYPE_SOURCE_SINK )
-
-static BIO_METHOD methods_ACE =
-  {
-    BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER,
-    "ACE_Asynch_BIO",
-    ACE_ASYNCH_BIO_WRITE_NAME,
-    ACE_ASYNCH_BIO_READ_NAME,
-    ACE_ASYNCH_BIO_PUTS_NAME,
-    0, /* ACE_ASYNCH_BIO_GETS_NAME, */
-    ACE_ASYNCH_BIO_CTRL_NAME,
-    ACE_ASYNCH_BIO_NEW_NAME,
-    ACE_ASYNCH_BIO_FREE_NAME,
-    0
-  };
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-BIO *
-ACE_SSL_make_BIO (void * ssl_asynch_stream)
-{
-  BIO * const pBIO = BIO_new (&methods_ACE);
-
-  if (pBIO)
-    BIO_ctrl (pBIO,
-              BIO_C_SET_FILE_PTR,
-              0,
-              ssl_asynch_stream);
-
-  return pBIO;
-}
-
-/**
- * @struct @c ACE_SSL_Asynch_Stream_Accessor
- *
- * @brief Privileged @c ACE_SSL_Asynch_Stream accessor.
- *
- * This structure is a @c friend to the @c ACE_SSL_Asynch_Stream
- * class so that it can gain access to the protected
- * ssl_bio_{read,write}() methods in that class.  It is full declared
- * in this implementation file to hide its interface from users to
- * prevent potential abuse of the friend relationship between it and
- * the @c ACE_SSL_Asynch_Stream class.
- */
-struct ACE_SSL_Asynch_Stream_Accessor
-{
-  static int read (ACE_SSL_Asynch_Stream * stream,
-               char * buf,
-               size_t len,
-               int & errval)
-  {
-    return stream->ssl_bio_read (buf, len, errval);
-  }
-
-  static int write (ACE_SSL_Asynch_Stream * stream,
-                    const char * buf,
-                    size_t len,
-                    int & errval)
-  {
-    return stream->ssl_bio_write (buf, len, errval);
-  }
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-int
-ACE_ASYNCH_BIO_NEW_NAME (BIO * pBIO)
-{
-  pBIO->init  = 0;    // not initialized
-  pBIO->num   = 0;    // still zero ( we can use it )
-  pBIO->ptr   = 0;    // will be pointer to ACE_SSL_Asynch_Stream
-  pBIO->flags = 0;    //
-
-  return 1;
-}
-
-int
-ACE_ASYNCH_BIO_FREE_NAME (BIO * pBIO)
-{
-  if (pBIO && pBIO->shutdown)
-    {
-      pBIO->ptr   = 0;
-      pBIO->init  = 0;
-      pBIO->num   = 0;
-      pBIO->flags = 0;
-
-      return 1;
-    }
-
-  return 0;
-}
-
-int
-ACE_ASYNCH_BIO_READ_NAME (BIO * pBIO, char * buf, int len)
-{
-  BIO_clear_retry_flags (pBIO);
-
-  ACE_SSL_Asynch_Stream * const p_stream =
-    static_cast<ACE_SSL_Asynch_Stream *> (pBIO->ptr);
-
-  if (pBIO->init == 0 || p_stream == 0 || buf == 0 || len <= 0)
-    return -1;
-
-  BIO_clear_retry_flags (pBIO);
-
-  int errval = 0;
-
-  int retval =
-    ACE_SSL_Asynch_Stream_Accessor::read (p_stream,
-                                          buf,
-                                          len,
-                                          errval);
-
-  if (retval >= 0)
-    return retval;
-
-  if (errval == EINPROGRESS)
-    BIO_set_retry_read (pBIO);
-
-  return -1;
-}
-
-int
-ACE_ASYNCH_BIO_WRITE_NAME (BIO * pBIO, const char * buf, int len)
-{
-  BIO_clear_retry_flags (pBIO);
-
-  ACE_SSL_Asynch_Stream * p_stream =
-    static_cast<ACE_SSL_Asynch_Stream *> (pBIO->ptr);
-
-  if (pBIO->init == 0 || p_stream == 0 || buf == 0 || len <= 0)
-    return -1;
-
-  BIO_clear_retry_flags (pBIO);
-
-  int errval = 0;
-
-  int retval =
-    ACE_SSL_Asynch_Stream_Accessor::write (p_stream,
-                                           buf,
-                                           len,
-                                           errval);
-
-  if (retval >= 0)
-    return retval;
-
-  if (errval == EINPROGRESS)
-    BIO_set_retry_write (pBIO);
-
-  return -1;
-}
-
-long
-ACE_ASYNCH_BIO_CTRL_NAME (BIO * pBIO, int cmd, long num, void *ptr)
-{
-  long ret = 1;
-
-  switch (cmd)
-    {
-    case BIO_C_SET_FILE_PTR:
-      pBIO->shutdown = static_cast<int> (num);
-      pBIO->ptr = ptr;
-      pBIO->init = 1;
-      break;
-
-    case BIO_CTRL_INFO:
-      ret = 0;
-      break;
-
-    case BIO_CTRL_GET_CLOSE:
-      ret = pBIO->shutdown;
-      break;
-
-    case BIO_CTRL_SET_CLOSE:
-      pBIO->shutdown = static_cast<int> (num);
-      break;
-
-    case BIO_CTRL_PENDING:
-    case BIO_CTRL_WPENDING:
-      ret = 0;
-      break;
-
-    case BIO_CTRL_DUP:
-    case BIO_CTRL_FLUSH:
-      ret = 1;
-      break;
-
-    default:
-      ret = 0;
-      break;
-  }
-
-  return ret;
-}
-
-int
-ACE_ASYNCH_BIO_PUTS_NAME (BIO *pBIO, const char *str)
-{
-  size_t const n = ACE_OS::strlen (str);
-
-  return ACE_ASYNCH_BIO_WRITE_NAME (pBIO,
-                                    str,
-                                    ACE_Utils::truncate_cast<int> (n));
-}
-
-#endif  /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 ||
-           ACE_HAS_AIO_CALLS) */
diff --git a/dep/acelite/ace/SSL/SSL_Asynch_BIO.h b/dep/acelite/ace/SSL/SSL_Asynch_BIO.h
deleted file mode 100644
index b40632177..000000000
--- a/dep/acelite/ace/SSL/SSL_Asynch_BIO.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   SSL_Asynch_BIO.h
- *
- *  $Id: SSL_Asynch_BIO.h 80826 2008-03-04 14:51:23Z wotte $
- *
- *  @author Alexander Libman <alibman@baltimore.com>
- *  @author Ossama Othman <ossama@uci.edu>
- *
- */
-//=============================================================================
-
-#ifndef ACE_SSL_ASYNCH_BIO_H
-#define ACE_SSL_ASYNCH_BIO_H
-
-#include /**/ "ace/pre.h"
-
-#include "SSL_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// This must be included before any <openssl> include on LynxOS
-#include "ace/os_include/os_stdio.h"
-
-#include <openssl/bio.h>
-
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-extern BIO * ACE_SSL_make_BIO (void * ssl_asynch_stream);
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* OPENSSL_VERSION_NUMBER > 0x0090581fL (ACE_WIN32 ||
-           ACE_HAS_AIO_CALLS) */
-
-#include /**/ "ace/post.h"
-
-#endif  /* ACE_SSL_ASYNCH_BIO_H */
diff --git a/dep/acelite/ace/SSL/SSL_Asynch_Stream.cpp b/dep/acelite/ace/SSL/SSL_Asynch_Stream.cpp
deleted file mode 100644
index 8569c78c5..000000000
--- a/dep/acelite/ace/SSL/SSL_Asynch_Stream.cpp
+++ /dev/null
@@ -1,1082 +0,0 @@
-// $Id: SSL_Asynch_Stream.cpp 91813 2010-09-17 07:52:52Z johnnyw $
-#include "SSL_Asynch_Stream.h"
-
-// This only works on platforms with Asynchronous IO support.
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
-
-#if defined (ACE_WIN32)
-# include "ace/WIN32_Proactor.h"
-#else
-# include "ace/POSIX_Proactor.h"
-#endif  /* ACE_WIN32 */
-
-#include "ace/OS_NS_string.h"
-#include "ace/Proactor.h"
-#include "ace/Truncate.h"
-
-#if !defined(__ACE_INLINE__)
-#include "SSL_Asynch_Stream.inl"
-#endif /* __ACE_INLINE__ */
-
-#include <openssl/err.h>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_SSL_Asynch_Write_Stream_Result::ACE_SSL_Asynch_Write_Stream_Result
-  (ACE_Handler &       handler,
-   ACE_HANDLE          handle,
-   ACE_Message_Block & message_block,
-   size_t              bytes_to_write,
-   const void *        act,
-   ACE_HANDLE          event,
-   int                 priority,
-   int                 signal_number
- )
-  : AWS_RESULT (handler.proxy (),
-                handle,
-                message_block,
-                bytes_to_write,
-                act,
-                event,
-                priority,
-                signal_number
-                )
-{
-}
-
-ACE_SSL_Asynch_Read_Stream_Result::ACE_SSL_Asynch_Read_Stream_Result
-  (ACE_Handler &        handler,
-   ACE_HANDLE           handle,
-   ACE_Message_Block &  message_block,
-   size_t               bytes_to_read,
-   const void *         act,
-   ACE_HANDLE           event,
-   int                  priority,
-   int                  signal_number
- )
-  : ARS_RESULT (handler.proxy (),
-                handle,
-                message_block,
-                bytes_to_read,
-                act,
-                event,
-                priority,
-                signal_number
-                )
-{
-}
-
-ACE_SSL_Asynch_Result::ACE_SSL_Asynch_Result (ACE_Handler & handler)
-  : A_RESULT (handler.proxy (),
-              0,          // act,
-              ACE_INVALID_HANDLE,
-              0,           // Offset
-              0,           // OffsetHigh
-              0,           // Priority
-              ACE_SIGRTMIN //signal_number
-              )
-{
-}
-
-void
-ACE_SSL_Asynch_Result::complete (size_t /* bytes_transferred */,
-                                 int    /* success */,
-                                 const  void * /* completion_key */,
-                                 u_long /* error */)
-{
-  this->handler_proxy_->handler ()->handle_wakeup ();
-}
-
-// ************************************************************
-//  ACE_SSL_Asynch_Stream Constructor / Destructor
-// ************************************************************
-ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream (
-  ACE_SSL_Asynch_Stream::Stream_Type s_type,
-  ACE_SSL_Context * context)
-  : type_         (s_type),
-    proactor_     (0),
-    ext_handler_  (0),
-    ext_read_result_ (0),
-    ext_write_result_(0),
-    flags_        (0),
-    ssl_          (0),
-    handshake_complete_(false),
-    bio_          (0),
-    bio_istream_  (),
-    bio_inp_msg_  (),
-    bio_inp_errno_(0),
-    bio_inp_flag_ (0),
-    bio_ostream_  (),
-    bio_out_msg_  (),
-    bio_out_errno_(0),
-    bio_out_flag_ (0),
-    mutex_ ()
-{
-  ACE_TRACE ("ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream");
-  // was honestly copied from ACE_SSL_SOCK_Stream :)
-
-  ACE_SSL_Context * ctx =
-    (context == 0 ? ACE_SSL_Context::instance () : context);
-
-  this->ssl_ = ::SSL_new (ctx->context ());
-
-  if (this->ssl_ == 0)
-    ACE_ERROR
-      ((LM_ERROR,
-        ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-        ACE_TEXT ("- cannot allocate new SSL structure")
-     ));
-
-}
-
-ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void)
-{
-  ACE_TRACE ("ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream");
-
-
-  // It is safe to delete stream if all notifications are received,
-  // i.e., state is SF_DELETE_ENABLE or if proactor event loop is
-  // done.
-  if (this->flags_ & SF_STREAM_OPEN)             // open
-    if ((this->flags_ & SF_DELETE_ENABLE) == 0)  // but ..
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT("ACE_SSL_Asynch_Stream::DTOR-")
-                  ACE_TEXT("possible access violation ")
-                  ACE_TEXT("if proactor still handles events\n")));
-
-  ::SSL_free (this->ssl_);
-
-  // Was honestly copied from ACE_SSL_SOCK_Stream :)
-
-  // @@ Question: should we reference count the Context object or
-  // leave that to the application developer? We do not reference
-  // count reactors (for example) and following some simple rules
-  // seems to work fine!
-}
-
-// ************************************************************
-//  close ()
-//  returns :
-//  0  - Stream is in the state SF_DELETE_ENABLE,
-//       so  it is safe to delete stream
-//  -1 - Stream has pending AIO requests,
-//       close should be repeated later one more
-// ************************************************************
-
-int
-ACE_SSL_Asynch_Stream::close (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1));
-
-  if ((flags_ & SF_STREAM_OPEN) == 0) // not open
-    flags_ |= SF_DELETE_ENABLE;
-
-  if (flags_ & SF_DELETE_ENABLE)
-    return 0;
-
-  flags_ |= SF_REQ_SHUTDOWN;
-
-  this->do_SSL_state_machine ();
-
-  return -1;
-}
-
-// ************************************************************
-//  Asynch_Operation interface
-//    cancel
-// ************************************************************
-int
-ACE_SSL_Asynch_Stream::cancel (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1));
-
-  if ((flags_ & SF_STREAM_OPEN) == 0) // not open
-    {
-      return 1;   //   AIO_ALLDONE
-    }
-
-  // attempt to cancel internal, i.e. user's read/write
-  int rc_r_int = bio_istream_.cancel();
-  int rc_w_int = bio_ostream_.cancel();
-
-  // attempt to cancel external, i.e. bio_ssl read/write
-  int rc_r_ext = notify_read (0, ERR_CANCELED);
-  int rc_w_ext = notify_write (0, ERR_CANCELED);
-
-  if ((rc_r_int < 0 || rc_w_int < 0)
-      && (rc_r_ext < 0 || rc_w_ext < 0))
-    {
-      return -1;  // at least one error
-    }
-
-  if (rc_r_int == 1 && rc_w_int == 1
-      && rc_r_ext == 1 && rc_w_ext == 1)
-    {
-      return 1;  // AIO_ALLDONE
-    }
-
-  if ((rc_r_int == 2 || rc_w_int == 2)
-      && (rc_r_ext == 2 || rc_w_ext == 2))
-    {
-      return 2;  // AIO_NOT_CANCELED , at least one not canceled
-    }
-
-  return 0;    // AIO_CANCELED, at least will be one notification
-}
-
-// ************************************************************
-//  Asynch_Operation interface
-//    open
-// ************************************************************
-int
-ACE_SSL_Asynch_Stream::open (ACE_Handler & handler,
-                             ACE_HANDLE handle,
-                             const void * completion_key,
-                             ACE_Proactor * proactor)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1));
-
-  if (this->flags_ & SF_STREAM_OPEN)
-    ACE_ERROR_RETURN
-      ((LM_ERROR,
-        ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
-        ACE_TEXT ("- already opened")),
-       -1);
-
-  if (this->ssl_ == 0)
-    ACE_ERROR_RETURN
-      ((LM_ERROR,
-        ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
-        ACE_TEXT ("- SSL structure is absent")),
-       -1);
-
-  if (handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN
-      ((LM_ERROR,
-        ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
-        ACE_TEXT ("- invalid handle")),
-       -1);
-
-
-  // Get a proactor for/from the user.
-  this->proactor_    = this->get_proactor (proactor, handler);
-  this->ext_handler_ = & handler;
-  this->handle (handle);
-
-  // Open internal input stream
-  if (this->bio_istream_.open (*this,   // real callbacks to this
-                               handle,
-                               completion_key,
-                               this->proactor_) != 0)
-    return -1;
-
-  // Open internal output stream
-  if (this->bio_ostream_.open (*this,  // real callbacks to this
-                               handle,
-                               completion_key,
-                               this->proactor_) != 0)
-    return -1;
-
-  this->bio_ = ACE_SSL_make_BIO (this);
-
-  if (this->bio_ == 0)
-    ACE_ERROR_RETURN
-      ((LM_ERROR,
-        ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
-        ACE_TEXT ("- cannot allocate new BIO structure")),
-       -1);
-
-  ::SSL_set_bio (this->ssl_ , this->bio_ , this->bio_);
-
-  switch (this->type_)
-    {
-    case ST_CLIENT:
-      ::SSL_set_connect_state (this->ssl_);
-      break;
-
-    case ST_SERVER:
-      ::SSL_set_accept_state (this->ssl_);
-      break;
-
-    default:
-      ACE_ERROR_RETURN
-        ((LM_ERROR,
-          ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
-          ACE_TEXT ("- invalid stream type")),
-         -1);
-    }
-
-  this->flags_ |= SF_STREAM_OPEN;
-
-  this->do_SSL_state_machine ();
-
-  return 0;
-}
-
-
-// ************************************************************
-//  Asynch_Operation interface
-//    read
-// ************************************************************
-int
-ACE_SSL_Asynch_Stream::read (ACE_Message_Block & message_block,
-                             size_t bytes_to_read,
-                             const void * act,
-                             int priority,
-                             int signal_number)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1));
-
-  if ((this->flags_ & SF_STREAM_OPEN) == 0)  // not open
-    return -1;
-
-  if (this->flags_ & SF_REQ_SHUTDOWN)
-    return -1;
-
-  // only one read operation is allowed now
-  // later it will be possible to make a queue
-
-  if (this->ext_read_result_ != 0)
-    return -1;
-
-  // create result for future notification
-  ACE_NEW_RETURN (this->ext_read_result_,
-                  ACE_SSL_Asynch_Read_Stream_Result (
-                    *this->ext_handler_,
-                    this->handle (),
-                    message_block,
-                    bytes_to_read,
-                    act,
-                    this->proactor_->get_handle(),
-                    priority,
-                    signal_number),
-                  -1);
-
-  this->do_SSL_state_machine (); // ignore return code
-
-  return 0;
-}
-
-// ************************************************************
-//  Asynch_Operation interface
-//    write
-// ************************************************************
-int
-ACE_SSL_Asynch_Stream::write (ACE_Message_Block & message_block,
-                              size_t bytes_to_write,
-                              const void * act,
-                              int priority,
-                              int signal_number)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1));
-
-  if ((this->flags_ & SF_STREAM_OPEN) == 0)  // not open
-    return -1;
-
-  if (this->flags_ & SF_REQ_SHUTDOWN)
-    return -1;
-
-  // only one read operation is allowed now
-  // later it will be possible to make a queue
-
-  if (this->ext_write_result_ != 0)
-    return -1;
-
-  // create result for future notification
-  ACE_NEW_RETURN (this->ext_write_result_,
-                  ACE_SSL_Asynch_Write_Stream_Result (
-                    *this->ext_handler_,
-                    this->handle (),
-                    message_block,
-                    bytes_to_write,
-                    act,
-                    this->proactor_->get_handle(),
-                    priority,
-                    signal_number),
-                  -1);
-
-  this->do_SSL_state_machine ();
-
-  return 0;
-}
-
-// ************************************************************
-//  Main SSL engine
-// ************************************************************
-int
-ACE_SSL_Asynch_Stream::do_SSL_state_machine (void)
-{
-  // this protected member should be called
-  // with locked mutex_
-
-  int retval = this->do_SSL_handshake ();
-
-  if (retval == 0)          // handshake in progress ?
-    return 0;
-
-  if (retval < 0)
-    this->flags_ |= SF_REQ_SHUTDOWN;
-
-  this->do_SSL_read ();  // execute user read request
-  this->do_SSL_write (); // execute user write request
-
-  if ((this->flags_ & SF_REQ_SHUTDOWN) == 0)     // Do we have any errors
-    return 0;
-
-  this->do_SSL_shutdown ();
-
-  this->notify_close ();
-
-  return 0;
-}
-
-// ************************************************************
-// do_SSL_shutdown
-// return code:
-// 1   SSL shutdown is finished already, success
-// 0   SSL shutdown in progress
-// -1  failure
-// ************************************************************
-int
-ACE_SSL_Asynch_Stream::do_SSL_shutdown (void)
-{
-  if (this->flags_ & SF_SHUTDOWN_DONE) // already done
-    return 1;
-
-  this->flags_ |= SF_REQ_SHUTDOWN;
-
-  // if we have any uncompleted user requests
-  // than cancel its
-  this->notify_read  (0, ERR_CANCELED);
-  this->notify_write (0, ERR_CANCELED);
-
-  int retval = ::SSL_shutdown (this->ssl_);
-
-  int status = ::SSL_get_error (this->ssl_, retval);
-
-  switch (status)
-    {
-    case SSL_ERROR_NONE:
-    case SSL_ERROR_ZERO_RETURN:
-    case SSL_ERROR_SYSCALL:
-      retval = 1;
-      break;
-
-    case SSL_ERROR_WANT_READ:
-    case SSL_ERROR_WANT_WRITE:
-    case SSL_ERROR_WANT_CONNECT:
-    //   case SSL_ERROR_WANT_ACCEPT:
-    case SSL_ERROR_WANT_X509_LOOKUP:
-      return 0;
-
-    default:
-      this->print_error (status,
-                         ACE_TEXT ("Shutdown error"));
-      retval = -1;
-      break;
-    }
-
-  this->flags_ |= SF_SHUTDOWN_DONE;
-
-  return retval;
-}
-
-// ************************************************************
-// Do SSL handshake if necessary
-// return code:
-// 1   SSL handshake is finished already, success
-// 0   SSL handshake in progress
-// -1  failure
-// ************************************************************
-int
-ACE_SSL_Asynch_Stream::do_SSL_handshake (void)
-{
-  if (SSL_is_init_finished (this->ssl_))
-    {
-      if (!handshake_complete_)
-        {
-          handshake_complete_ = true;
-
-          if (!post_handshake_check ())
-            {
-              return -1;
-            }
-        }
-      return 1;
-    }
-
-  if (this->flags_ & SF_REQ_SHUTDOWN)
-    return -1;
-
-  int retval = -1;
-
-  switch (this->type_)
-    {
-    case ST_CLIENT:
-      retval = ::SSL_connect (this->ssl_);
-      break;
-
-    case ST_SERVER:
-      retval = ::SSL_accept (this->ssl_);
-      break;
-
-    default:
-      ACE_ERROR_RETURN
-        ((LM_ERROR,
-          ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("- invalid stream type")),
-         -1);
-    }
-
-  int status = ::SSL_get_error (this->ssl_, retval);
-
-  switch (status)
-    {
-    case SSL_ERROR_NONE:
-      break;
-
-    case SSL_ERROR_WANT_READ:
-    case SSL_ERROR_WANT_WRITE:
-    case SSL_ERROR_WANT_CONNECT:
-    //case SSL_ERROR_WANT_ACCEPT:
-    case SSL_ERROR_WANT_X509_LOOKUP:
-      return 0;
-
-    case SSL_ERROR_ZERO_RETURN:
-    case SSL_ERROR_SYSCALL:
-    default:
-      this->print_error (status,
-                         ACE_TEXT ("Handshake error"));
-      return -1;
-    }
-
-  return 1;
-}
-
-
-bool
-ACE_SSL_Asynch_Stream::post_handshake_check (void)
-{
-  return true;
-}
-
-// ************************************************************
-// Perform SSL_read call if necessary and notify user
-// ************************************************************
-int
-ACE_SSL_Asynch_Stream::do_SSL_read (void)
-{
-  if (this->ext_read_result_ == 0)  // nothing to do
-    {
-      return 0;
-    }
-
-  if (this->flags_ & SF_REQ_SHUTDOWN)
-    {
-      this->notify_read (0, ERR_CANCELED);
-      return -1;
-    }
-
-  ACE_Message_Block & mb = this->ext_read_result_->message_block ();
-  size_t bytes_req = this->ext_read_result_->bytes_to_read ();
-
-  ERR_clear_error ();
-
-  const int bytes_trn =
-    ::SSL_read (this->ssl_,
-                mb.wr_ptr (),
-                ACE_Utils::truncate_cast<int> (bytes_req));
-
-  int const status = ::SSL_get_error (this->ssl_, bytes_trn);
-
-  switch (status)
-    {
-    case SSL_ERROR_NONE:
-      this->notify_read (bytes_trn, 0);
-      return 1;
-
-    case SSL_ERROR_WANT_READ:
-    case SSL_ERROR_WANT_WRITE:
-      return 0;
-
-    case SSL_ERROR_ZERO_RETURN:
-      this->notify_read (0, 0);
-      return 1;
-
-    case SSL_ERROR_SYSCALL:
-      if (bytes_trn == 0)
-        {
-          this->notify_read (0, 0);
-          return 1;
-        }
-      // If not an EOF, then fall through to "default" case.
-
-    default:
-      break;
-    }
-
- this->notify_read (0, EFAULT);
- this->print_error (status,
-                    ACE_TEXT ("SSL_read error"));
-
- return -1;
-}
-
-// ************************************************************
-// Perform SSL_write call if necessary  and notify user
-// ************************************************************
-int
-ACE_SSL_Asynch_Stream::do_SSL_write (void)
-{
-  if (this->ext_write_result_ == 0)  // nothing to do
-    {
-      return 0;
-    }
-
-  if (this->flags_ & SF_REQ_SHUTDOWN)
-    {
-      this->notify_write (0, ERR_CANCELED);
-      return -1;
-    }
-
-  ACE_Message_Block & mb = this->ext_write_result_->message_block ();
-  size_t       bytes_req = this->ext_write_result_->bytes_to_write ();
-
-  ERR_clear_error ();
-
-  const int bytes_trn =
-    ::SSL_write (this->ssl_,
-                 mb.rd_ptr (),
-                 ACE_Utils::truncate_cast<int> (bytes_req));
-
-  int const status = ::SSL_get_error (this->ssl_, bytes_trn);
-
-  switch (status)
-    {
-    case SSL_ERROR_NONE:
-      this->notify_write (bytes_trn, 0);
-      return 1;
-
-    case SSL_ERROR_WANT_READ:
-    case SSL_ERROR_WANT_WRITE:
-      return 0;
-
-    case SSL_ERROR_ZERO_RETURN:
-      this->notify_write (bytes_trn, 0);
-      return 1;
-
-    case SSL_ERROR_SYSCALL:
-    default:
-      break;
-    }
-
- this->notify_write(0, EFAULT);
- this->print_error (status,
-                    ACE_TEXT ("SSL_write error"));
-
- return -1;
-}
-
-// ************************************************************
-//  notify external user handler that
-//  it is now to safe destroy stream
-//  Return code  looks like cancel() return code
-//  0  - notified               NOTIFIED
-//  1  - nothing to notify      ALLDONE
-//  2  - unable to notify       NOT NOTIFIED
-// ************************************************************
-int
-ACE_SSL_Asynch_Stream::notify_close (void)
-{
-  if (this->flags_ & SF_CLOSE_NTF_SENT)  // already sent
-    return 1;
-
-  if ((this->flags_ & SF_SHUTDOWN_DONE) == 0)  // only after shutdown
-    return 2;    // too early , we will do later
-
-  if (this->pending_BIO_count () != 0)   // wait for all internal IO
-    return 2;   // too early , we will do later
-
-  // create result for future notification
-  ACE_SSL_Asynch_Result * close_result = 0;
-
-  ACE_NEW_RETURN (close_result,
-                  ACE_SSL_Asynch_Result (*this),
-                  2);
-  //@@ Not exception safe!
-
- int retval =
-   close_result->post_completion (this->proactor_->implementation ());
-
- if (retval == 0)
-   {
-     this->flags_ |= SF_CLOSE_NTF_SENT;
-     return 0;
-   }
-
- delete close_result;
- return 2;
-}
-
-// ************************************************************
-//  notify external user handler about user write completion
-//  Return code  looks like cancel() return code
-//  0  - notified               NOTIFIED/CANCELED
-//  1  - nothing to notify      ALLDONE
-//  2  - unable to notify       NOT NOTIFIED/CANCELED
-// ************************************************************
-
-int
-ACE_SSL_Asynch_Stream::notify_read (int bytes_transferred,
-                                    int error)
-{
-  if (ext_read_result_ == 0) //nothing to notify
-    return 1;
-
-  this->ext_read_result_->set_bytes_transferred (bytes_transferred);
-  this->ext_read_result_->set_error (error);
-
-  int retval =
-    this->ext_read_result_->post_completion (proactor_->implementation ());
-
-  if (retval == 0)
-    {
-      this->ext_read_result_ = 0;
-      return 0;  // success
-    }
-
-  return 2; // unable to notify
-}
-
-// ************************************************************
-//  notify external user handler about user write completion
-//  Return code  looks like cancel() return code
-//  0  - notified               NOTIFIED/CANCELED
-//  1  - nothing to notify      ALLDONE
-//  2  - unable to notify       NOT NOTIFIED/CANCELED
-// ************************************************************
-
-int
-ACE_SSL_Asynch_Stream::notify_write (int bytes_transferred,
-                                     int error)
-{
-  if (this->ext_write_result_ == 0) //nothing to notify
-    return 1;
-
-  this->ext_write_result_->set_bytes_transferred (bytes_transferred);
-  this->ext_write_result_->set_error (error);
-
-  int retval =
-    this->ext_write_result_->post_completion (
-      this->proactor_->implementation ());
-
-  if (retval == 0)
-    {
-      this->ext_write_result_ = 0;
-      return 0;  // success
-    }
-
-  return 2; // unable to notify
-}
-
-// ************************************************************
-// Print SSL errors
-// ************************************************************
-void
-ACE_SSL_Asynch_Stream::print_error (int err_ssl,
-                                    const ACE_TCHAR * pText)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT("SSL-error:%d %s\n"),
-              err_ssl,
-              pText));
-
-#if OPENSSL_VERSION_NUMBER >= 0x0090601fL
-  // OpenSSL < 0.9.6a doesn't have ERR_error_string_n() function.
-  unsigned long lerr = 0;
-  char buf[1024];
-
-  while ((lerr = ERR_get_error()) != 0)
-    {
-      ERR_error_string_n (lerr, buf, sizeof buf);
-
-      ACE_DEBUG ((LM_DEBUG, "%C\n", buf));
-    }
-#endif  /* OPENSSL_VERSION_NUMBER */
-}
-
-// ************************************************************
-//  BIO helper functions
-//  SSL library will ask BIO to do raw I/O
-//  BIO will call us to do this
-// ************************************************************
-int
-ACE_SSL_Asynch_Stream::ssl_bio_read (char * buf,
-                                     size_t len,
-                                     int & errval)
-{
-  // We do not have to acquire mutex
-  // as we called already with locked mutex
-  // from do_SSL_state_machine()
-
-  errval = 0;
-
-  size_t cur_len = this->bio_inp_msg_.length ();
-
-  if (cur_len > 0) // there are more data buffered
-    {
-      const char * rd_ptr = this->bio_inp_msg_.rd_ptr ();
-
-      if (cur_len > len)
-        {
-          cur_len = len;
-        }
-
-      ACE_OS::memcpy (buf, rd_ptr, cur_len);
-
-      this->bio_inp_msg_.rd_ptr (cur_len); // go ahead
-
-      return ACE_Utils::truncate_cast<int> (cur_len);
-    }
-
-  if (this->bio_inp_errno_ != 0)     // if was error - it is permanent !
-    {
-      errval = this->bio_inp_errno_;
-      return -1;
-    }
-
-  if (this->bio_inp_flag_ & BF_EOS)  // End of stream
-    {
-      return 0;
-    }
-
-  errval = EINPROGRESS;          // SSL will try later
-
-  if (this->bio_inp_flag_ & BF_AIO)  // we are busy
-    {
-      return -1;
-    }
-
-  if (this->bio_inp_msg_.size (len) != 0)
-    {
-      ACE_ERROR
-        ((LM_ERROR,
-          ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("error in ACE_Message_Block::size() ")
-          ));
-
-      errval = EINVAL;
-      return -1;
-    }
-
-  char * base = this->bio_inp_msg_.base ();
-
-  this->bio_inp_msg_.rd_ptr (base);
-  this->bio_inp_msg_.wr_ptr (base);
-
-  if (this->bio_istream_.read (
-        bio_inp_msg_,  // message block
-        len,           // priority
-        0,             // act
-        0,             // priority
-        ACE_SIGRTMIN   // default signal
-        ) == -1)
-    {
-      ACE_ERROR
-        ((LM_ERROR,
-          ACE_TEXT ("%N:%l (%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("attempt read failed")
-          ));
-
-      errval = EINVAL;  // may be leave EINPROGRESS ??
-      return -1;        // to try later
-    }
-
-  this->bio_inp_flag_ |= BF_AIO;  // AIO is active
-
-  return -1;
-}
-
-
-int
-ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf,
-                                      size_t len,
-                                      int & errval)
-{
-  // We do not have to acquire mutex
-  // as we called already with locked mutex
-  // from do_SSL_state_machine
-
-  errval = 0;
-
-  if (this->bio_out_flag_ & BF_AIO)  // sorry, we are busy
-    {
-      errval = EINPROGRESS;   // try later
-      return -1;
-    }
-
-  if (this->bio_out_errno_ != 0)      // no recovery
-    {
-      errval = this->bio_out_errno_;
-      return -1;
-    }
-
-  if (this->bio_out_msg_.size (len) != 0)
-    {
-      ACE_ERROR
-        ((LM_ERROR,
-          ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("error in ACE_Message_Block::size() ")
-          ));
-
-      errval = EINVAL;
-      return -1;
-    }
-
-  char * base = this->bio_out_msg_.base ();
-
-  this->bio_out_msg_.rd_ptr (base);
-  this->bio_out_msg_.wr_ptr (base);
-
-  if (this->bio_out_msg_.copy (buf, len) == -1)
-    {
-      ACE_ERROR
-        ((LM_ERROR,
-          ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("error in ACE_Message_Block::copy() ")
-          ));
-
-      errval = EINVAL;
-      return -1;
-    }
-
-
-  if (this->bio_ostream_.write (
-        this->bio_out_msg_, // message block
-        len,          // priority
-        0,            // act
-        0,            // priority
-        ACE_SIGRTMIN  // default signal
-        ) == -1)
-    {
-      ACE_ERROR
-        ((LM_ERROR,
-          ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("attempt write failed")
-          ));
-
-      errval = EINVAL;  // may be leave EINPROGRESS ??
-      return -1;        // to try later
-    }
-
-  this->bio_out_flag_ |= BF_AIO;  // AIO is active
-  errval = 0;               // Ok, go ahead
-
-  return ACE_Utils::truncate_cast<int> (len);
-}
-
-// ************************************************************
-//  Internal IO handlers
-//  virtual from ACE_Service_Handler
-// ************************************************************
-void
-ACE_SSL_Asynch_Stream::handle_write_stream (
-  const ACE_Asynch_Write_Stream::Result &result)
-{
-  ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_));
-
-  this->bio_out_flag_ &= ~BF_AIO;
-
-  ACE_Message_Block & mb = result.message_block ();
-
-  size_t bytes_req = result.bytes_to_write ();
-  size_t bytes_trn = result.bytes_transferred ();
-  u_long errval    = result.error ();
-  size_t len       = bytes_req - bytes_trn;
-
-  if (errval != 0)                    // error ?
-    this->bio_out_errno_ = errval;    // save err code
-  else if (len > 0)                   // TCP/IP overloaded ?
-    {                                 // continue, rd_ptr at right place
-      if (this->bio_ostream_.write (
-            mb,          // message block
-            len,         // priority
-            0,           // act
-            0,           // priority
-            ACE_SIGRTMIN // default signal
-            ) == 0)
-        {
-          this->bio_out_flag_ |= BF_AIO;
-          return;
-        }
-
-      ACE_ERROR
-        ((LM_ERROR,
-          ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("attempt write failed")
-          ));
-
-      this->bio_out_errno_ = EINVAL;
-    }
-
-  this->do_SSL_state_machine ();
-
-  return;
-}
-
-void
-ACE_SSL_Asynch_Stream::handle_read_stream (
-  const ACE_Asynch_Read_Stream::Result &result)
-{
-  ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_));
-
-  this->bio_inp_flag_ &= ~BF_AIO;
-
-  size_t bytes_trn = result.bytes_transferred ();
-  u_long errval    = result.error ();
-
-  if (errval != 0)                     // error ?
-     this->bio_inp_errno_ = errval;    // save err code
-  else if (bytes_trn == 0)             // end of stream ?
-     this->bio_inp_flag_ |= BF_EOS;    // set flag EOS
-
-  this->do_SSL_state_machine ();
-
-  return;
-}
-
-void
-ACE_SSL_Asynch_Stream::handle_wakeup (void)
-{
-  ACE_Handler * user_handler = 0;
-
-  {
-    ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_));
-
-    this->flags_ |= SF_DELETE_ENABLE;
-
-    user_handler = this->ext_handler_;
-  }
-
-  if (user_handler != 0)
-    user_handler->handle_wakeup();
-}
-
-int
-ACE_SSL_Asynch_Stream::pending_BIO_count (void)
-{
-  int ret = 0;
-
-  if (this->bio_inp_flag_ & BF_AIO)
-    ++ret;
-
-  if (this->bio_out_flag_ & BF_AIO)
-    ++ret;
-
-  return ret;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 ||
-           ACE_HAS_AIO_CALLS) */
diff --git a/dep/acelite/ace/SSL/SSL_Asynch_Stream.h b/dep/acelite/ace/SSL/SSL_Asynch_Stream.h
deleted file mode 100644
index 221546f35..000000000
--- a/dep/acelite/ace/SSL/SSL_Asynch_Stream.h
+++ /dev/null
@@ -1,466 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   SSL_Asynch_Stream.h
- *
- *  $Id: SSL_Asynch_Stream.h 91743 2010-09-13 18:24:51Z johnnyw $
- *
- *  @author Alexander Libman <alibman@baltimore.com>
- */
-//=============================================================================
-
-#ifndef ACE_SSL_ASYNCH_STREAM_H
-#define ACE_SSL_ASYNCH_STREAM_H
-
-#include /**/ "ace/pre.h"
-#include "SSL_Context.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
-
-#include "SSL_Asynch_BIO.h"
-
-#include "ace/Asynch_IO_Impl.h"
-#include "ace/Message_Block.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-
-/*
- * This facility doesn't follow the normal ACE asynch I/O support classes'
- * interface/implementation arrangement. It's not needed because rather than
- * branching off to platform-specific APIs, all platforms use the OpenSSL
- * API. Thus, you can think of this class as the implementation class (for
- * OpenSSL) and there's no separate interface class.
- * Also, since both read and write operations are defined in one I/O
- * factory, there's no single Result class defined as there is for
- * ACE_Asynch_Read_Stream, et al. There are separate result classes defined
- * for read and write operations.
- */
-
-#if defined (ACE_WIN32)
-#  include "ace/WIN32_Asynch_IO.h"
-typedef ACE_WIN32_Asynch_Result              A_RESULT;
-typedef ACE_WIN32_Asynch_Read_Stream_Result  ARS_RESULT;
-typedef ACE_WIN32_Asynch_Write_Stream_Result AWS_RESULT;
-
-# define ERR_CANCELED ERROR_OPERATION_ABORTED
-
-#else
-#  include "ace/POSIX_Asynch_IO.h"
-typedef ACE_POSIX_Asynch_Result              A_RESULT;
-typedef ACE_POSIX_Asynch_Read_Stream_Result  ARS_RESULT;
-typedef ACE_POSIX_Asynch_Write_Stream_Result AWS_RESULT;
-
-# define ERR_CANCELED ECANCELED
-
-#endif  /* ACE_WIN32 */
-
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ACE_SSL_Asynch_Stream;     // Forward decl for use in result class def.
-
-/**
- * @class ACE_SSL_Asynch_Read_Stream_Result
- *
- * Result class that communicates result of read operations initiated on
- * an ACE_SSL_Asynch_Stream object.
- */
-class ACE_SSL_Asynch_Read_Stream_Result : public ARS_RESULT
-{
-  /// Factory class will have special permissions.
-  friend class ACE_SSL_Asynch_Stream;
-
-protected:
-  ACE_SSL_Asynch_Read_Stream_Result (ACE_Handler &handler,
-                                     ACE_HANDLE handle,
-                                     ACE_Message_Block &message_block,
-                                     size_t bytes_to_read,
-                                     const void* act,
-                                     ACE_HANDLE event,
-                                     int priority,
-                                     int signal_number);
-};
-
-/**
- * @class ACE_SSL_Asynch_Write_Stream_Result
- *
- * Result class that communicates result of write operations initiated on
- * an ACE_SSL_Asynch_Stream object.
- */
-class ACE_SSL_Asynch_Write_Stream_Result : public AWS_RESULT
-{
-  /// Factory class will have special permissions.
-  friend class ACE_SSL_Asynch_Stream;
-
-protected:
-  ACE_SSL_Asynch_Write_Stream_Result (ACE_Handler &handler,
-                                      ACE_HANDLE handle,
-                                      ACE_Message_Block &message_block,
-                                      size_t bytes_to_read,
-                                      const void* act,
-                                      ACE_HANDLE event,
-                                      int priority,
-                                      int signal_number);
-};
-
-
-/**
- * @class ACE_SSL_Asynch_Result
- *
- * Result class that is used internally for socket close notifications.
- */
-class ACE_SSL_Asynch_Result : public A_RESULT
-{
-public:
-    ACE_SSL_Asynch_Result (ACE_Handler &handler);
-
-    void complete (size_t bytes_transferred,
-                   int    success,
-                   const  void * completion_key,
-                   u_long error);
-};
-
-
-// Only provide forward declarations to prevent possible abuse of the
-// friend declarations in ACE_SSL_Asynch_Stream.
-struct ACE_SSL_Asynch_Stream_Accessor;
-
-/**
- * @class ACE_SSL_Asynch_Stream
- *
- * @brief This class is a factory for initiating asynchronous reads
- * and writes on an SSL stream.
- *
- * Once open() is called, multiple asynchronous read and write operations
- * can be started using this class.  The handler object (derived from
- * ACE_Handler) specified in open() will receive completion events for the
- * operations initiated via this class.
- */
-class ACE_SSL_Export ACE_SSL_Asynch_Stream
-  : public ACE_Asynch_Operation,
-    public ACE_Handler
-{
-public:
-
-  // Use a class/struct to work around scoping
-  // problems for extern "C" free functions with some compilers.  For
-  // example, some can't handle
-  //
-  //   friend ::some_extern_c_free_function (...)
-  //
-  // Note that we could use a straight C++ (i.e. not extern "C") free
-  // function, but using a class or struct allows us to hide the
-  // interface from the user, which prevents abuse of this friend
-  // relationship.
-  friend struct ACE_SSL_Asynch_Stream_Accessor;
-
-  enum Stream_Type
-    {
-      ST_CLIENT = 0x0001,
-      ST_SERVER = 0x0002
-    };
-
-  /// Constructor.
-  /**
-   * @arg context  Pointer to an ACE_SSL_Context instance containing
-   *               the OpenSSL information to be associated with this
-   *               ACE_SSL_Asynch_Stream.  The needed SSL data will be
-   *               copied before return. Therefore, this object can be
-   *               reused, modified, or deleted upon return. If a 0 pointer
-   *               is passed, the ACE_SSL_Context::instance() method will
-   *               be called to get access to a singleton.
-   */
-  ACE_SSL_Asynch_Stream (Stream_Type s_type = ST_SERVER,
-                         ACE_SSL_Context * context = 0);
-
-  /// Destructor
-  virtual ~ACE_SSL_Asynch_Stream (void);
-
-  int cancel (void);
-
-  int close (void);
-
-  /// Return a pointer to the underlying SSL structure.
-  SSL *ssl (void) const;
-
-  /**
-   * Initializes the factory with information which will be used with
-   * each asynchronous call.
-   *
-   * @arg handler The ACE_Handler that will be called to handle completions
-   *              for operations initiated using this factory.
-   * @arg handle  The handle that future read/write operations will use.
-   *
-   * @retval 0    for success.
-   * @retval -1   for failure; consult @c errno for further information.
-   */
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle = ACE_INVALID_HANDLE,
-            const void *completion_key = 0,
-            ACE_Proactor *proactor = 0);
-
-  /**
-   * Initiates an asynchronous read. If the operation is successfully
-   * initiated, the handle_read_stream() method will be called on the
-   * ACE_Handler object passed to open() when the operation completes.
-   * Data is read into the specified ACE_Message_Block beginning at its
-   * write pointer; the block's write pointer is updated to reflect any
-   * added data when the operation completes.
-   *
-   * @arg message_block      The specified ACE_Message_Block will receive any
-   *                         data that is read. Data will be read into the
-   *                         block beginning at the block's write pointer.
-   * @arg num_bytes_to_read  The maximum number of bytes to read. The actual
-   *                         amount read may be less.
-   * @arg act                ACT which is passed to the completion handler in
-   *                         the result object.
-   * @arg priority           Specifies the operation priority. This has an
-   *                         affect on POSIX only. Works like @i nice in Unix.
-   *                         Negative values are not allowed. 0 means priority
-   *                         of the operation same as the process priority.
-   *                         1 means priority of the operation is one less than
-   *                         process, and so forth. This parameter has no
-   *                         affect on Win32.
-   * @arg signal_number      The POSIX4 real-time signal number to be used
-   *                         for the operation. signal_number ranges from
-   *                         ACE_SIGRTMIN to ACE_SIGRTMAX. This argument is
-   *                         unused on non-POSIX4 systems.
-   *
-   * @retval 0    for success.
-   * @retval -1   for failure; consult @c errno for further information.
-   */
-  int read (ACE_Message_Block &message_block,
-            size_t num_bytes_to_read,
-            const void *act = 0,
-            int priority = 0,
-            int signal_number = ACE_SIGRTMIN);
-
-  /**
-   * Initiates an asynchronous write. If the operation is successfully
-   * initiated, the handle_write_stream() method will be called on the
-   * ACE_Handler object passed to open() when the operation completes.
-   * Data is taken from the specified ACE_Message_Block beginning at its
-   * read pointer; the block's read pointer is updated to reflect any
-   * data successfully sent when the operation completes.
-   *
-   * @arg message_block      The specified ACE_Message_Block is the source of
-   *                         data that is written. Data will be taken from the
-   *                         block beginning at the block's read pointer.
-   * @arg bytes_to_write     The maximum number of bytes to write. The actual
-   *                         amount written may be less.
-   * @arg act                ACT which is passed to the completion handler in
-   *                         the result object.
-   * @arg priority           Specifies the operation priority. This has an
-   *                         affect on POSIX only. Works like @i nice in Unix.
-   *                         Negative values are not allowed. 0 means priority
-   *                         of the operation same as the process priority.
-   *                         1 means priority of the operation is one less than
-   *                         process, and so forth. This parameter has no
-   *                         affect on Win32.
-   * @arg signal_number      The POSIX4 real-time signal number to be used
-   *                         for the operation. signal_number ranges from
-   *                         ACE_SIGRTMIN to ACE_SIGRTMAX. This argument is
-   *                         unused on non-POSIX4 systems.
-   *
-   * @retval 0    for success.
-   * @retval -1   for failure; consult @c errno for further information.
-   */
-  int write (ACE_Message_Block &message_block,
-             size_t bytes_to_write,
-             const void *act = 0,
-             int priority = 0,
-             int signal_number = ACE_SIGRTMIN);
-
-protected:
-  /// Virtual from ACE_Asynch_Operation. Since this class is essentially an
-  /// implementation class, simply return 0.
-  virtual ACE_Asynch_Operation_Impl *implementation (void) const { return 0; }
-
-  /// virtual from ACE_Handler
-
-  /// This method is called when BIO write request is completed. It
-  /// processes the IO completion and calls do_SSL_state_machine().
-  virtual void handle_write_stream
-               (const ACE_Asynch_Write_Stream::Result &result);
-
-  /// This method is called when BIO read request is completed. It
-  /// processes the IO completion and calls do_SSL_state_machine().
-  virtual void handle_read_stream
-               (const ACE_Asynch_Read_Stream::Result &result);
-
-  /// This method is called when all SSL sessions are closed and no
-  /// more pending AIOs exist.  It also calls users handle_wakeup().
-  virtual void handle_wakeup (void);
-
-  /**
-   * This method will be called after a successful SSL handshake indicating
-   * that the peer's certificate chain (if any) has been verified and the key
-   * exchange has completed.  When a peer certificate is required, this
-   * method must be used to perform additional checks beyond the verification
-   * performed by OpenSSL.
-   *
-   * Check 1:
-   *
-   * SSL clients that require a peer certificate must specify SSL_VERIFY_PEER
-   * via ACE_SSL_Context::default_verify_mode.  If the peer sends an invalid
-   * certificate, the SSL handshake will fail; however, if the peer does not
-   * send a certificate, the SSL handshake will complete successfully which
-   * may not be acceptable.  In this case, you must override this method in a
-   * subclass and return false if the call to SSL_get_peer_certificate returns
-   * null.
-   *
-   * Check 2:
-   *
-   * An additional post handshake check that you should perform is to verify
-   * the certificate's FQDN against the host address you intended to connect
-   * to.  This check will prevent an attacker from using a certificate signed
-   * by your CA to usurp your session.  For further info on this check, see
-   * the post_connection_check method in Example 5-8 of 'Network Security with
-   * OpenSSL' by Viega, et. al.
-   *
-   * Return:
-   *
-   * false - Terminate the connection.  Outstanding IO complete with ERR_CANCELED.
-   *
-   * true  - Proceed with connection.  The default implementation returns true.
-   */
-  virtual bool post_handshake_check (void);
-
-  /**
-   * @name SSL State Machine
-   */
-  //@{
-  int do_SSL_state_machine (void);
-  int do_SSL_handshake (void);
-  int do_SSL_read (void);
-  int do_SSL_write(void);
-  int do_SSL_shutdown(void);
-  //@}
-
-  void print_error (int err_ssl,
-                    const ACE_TCHAR *pText);
-
-  int pending_BIO_count (void);
-
-  /// This method is called to notify user handler when user's read in
-  /// done.
-  int notify_read (int bytes_transferred, int error);
-
-  /// This method is called to notify user handler when user's write
-  /// in done.
-  int notify_write (int bytes_transferred, int error);
-
-  /// This method is called to notify ourself that SSL session is
-  /// shutdown and that there is no more I/O activity now and in the
-  /// future.
-  int notify_close(void);
-
-  /**
-   * @name BIO Helpers
-   */
-  //@{
-  int ssl_bio_read (char * buf, size_t len, int & errval);
-  int ssl_bio_write (const char * buf, size_t len, int & errval);
-  //@}
-
-private:
-
-  // Preventing copying through construction or assignment.
-  ACE_SSL_Asynch_Stream (ACE_SSL_Asynch_Stream const &);
-  ACE_SSL_Asynch_Stream & operator= (ACE_SSL_Asynch_Stream const &);
-
-protected:
-
-  /// Stream Type ST_CLIENT/ST_SERVER
-  Stream_Type type_;
-
-  /// The proactor
-  ACE_Proactor * proactor_;
-
-  /// External,i.e user  handler
-  ACE_Handler * ext_handler_;
-
-  /// External, i.e. read result faked for user
-  ACE_SSL_Asynch_Read_Stream_Result *  ext_read_result_ ;
-
-  /// External, i.e. write result faked for user
-  ACE_SSL_Asynch_Write_Stream_Result * ext_write_result_ ;
-
-  /// Stream state/flags
-  enum Stream_Flag
-    {
-      /// istream_ open OK
-      SF_STREAM_OPEN    = 0x0001,
-      /// request to SSL shutdown
-      SF_REQ_SHUTDOWN   = 0x0002,
-      /// SSL shutdown finished
-      SF_SHUTDOWN_DONE  = 0x0004,
-      /// Close notification sent
-      SF_CLOSE_NTF_SENT = 0x0008,
-      /// Stream can be safely destroyed
-      SF_DELETE_ENABLE  = 0x0010
-    };
-
-  int flags_;
-
-  /// The SSL session.
-  SSL * ssl_;
-
-  /// Flag ensures that post_connection_check() is called at most one time.
-  bool handshake_complete_;
-
-  /// The BIO implementation
-  BIO * bio_;
-
-  /// The real streams which work under the ssl connection.
-  /// BIO performs I/O via this streams
-  enum BIO_Flag  // internal IO flags
-    {
-      /// End of stream
-      BF_EOS   = 0x01,
-      /// Real AIO in progress
-      BF_AIO   = 0x02
-    };
-
-  /**
-   * @name Internal stream, buffer and info for BIO read
-   */
-  //@{
-  ACE_Asynch_Read_Stream  bio_istream_;
-  ACE_Message_Block       bio_inp_msg_;
-  int                     bio_inp_errno_;
-  int                     bio_inp_flag_;
-  //@}
-
-  /**
-   * @name Internal stream, buffer and info for BIO write
-   */
-  //@{
-  ACE_Asynch_Write_Stream bio_ostream_;
-  ACE_Message_Block       bio_out_msg_;
-  int                     bio_out_errno_;
-  int                     bio_out_flag_;
-  //@}
-
-  /// Mutex to protect work
-  ACE_SYNCH_MUTEX mutex_;
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined(__ACE_INLINE__)
-#include "SSL_Asynch_Stream.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif  /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 ||
-           ACE_HAS_AIO_CALLS) */
-
-#include /**/ "ace/post.h"
-
-#endif  /* ACE_SSL_ASYNCH_STREAM_H */
diff --git a/dep/acelite/ace/SSL/SSL_Asynch_Stream.inl b/dep/acelite/ace/SSL/SSL_Asynch_Stream.inl
deleted file mode 100644
index d9d0db955..000000000
--- a/dep/acelite/ace/SSL/SSL_Asynch_Stream.inl
+++ /dev/null
@@ -1,13 +0,0 @@
-// -*- C++ -*-
-//
-// $Id: SSL_Asynch_Stream.inl 83916 2008-11-28 16:32:21Z johnnyw $
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE SSL *
-ACE_SSL_Asynch_Stream::ssl (void) const
-{
-  return this->ssl_;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/SSL/SSL_Context.cpp b/dep/acelite/ace/SSL/SSL_Context.cpp
deleted file mode 100644
index c6cf6adcd..000000000
--- a/dep/acelite/ace/SSL/SSL_Context.cpp
+++ /dev/null
@@ -1,649 +0,0 @@
-// $Id: SSL_Context.cpp 93497 2011-03-07 09:43:36Z vzykov $
-#include "SSL_Context.h"
-
-#include "sslconf.h"
-
-#if !defined(__ACE_INLINE__)
-#include "SSL_Context.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Guard_T.h"
-#include "ace/Object_Manager.h"
-#include "ace/Log_Msg.h"
-#include "ace/Singleton.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Truncate.h"
-#include "ace/ACE.h"
-#include "ace/OS_NS_errno.h"
-#include "ace/OS_NS_string.h"
-
-#ifdef ACE_HAS_THREADS
-# include "ace/Thread_Mutex.h"
-# include "ace/OS_NS_Thread.h"
-#endif  /* ACE_HAS_THREADS */
-
-#include <openssl/x509.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/safestack.h>
-
-namespace
-{
-  /// Reference count of the number of times the ACE_SSL_Context was
-  /// initialized.
-  int ssl_library_init_count = 0;
-
-  // @@ This should also be done with a singleton, otherwise it is not
-  //    thread safe and/or portable to some weird platforms...
-
-#ifdef ACE_HAS_THREADS
-  /// Array of mutexes used internally by OpenSSL when the SSL
-  /// application is multithreaded.
-  ACE_SSL_Context::lock_type * ssl_locks = 0;
-
-  // @@ This should also be managed by a singleton.
-#endif
-}
-
-#ifdef ACE_HAS_THREADS
-
-# if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
-#  define ACE_SSL_LOCKING_CALLBACK_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_SSL_locking_callback)
-#  define ACE_SSL_THREAD_ID_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_SSL_thread_id)
-# else
-#  define ACE_SSL_LOCKING_CALLBACK_NAME ACE_SSL_locking_callback
-#  define ACE_SSL_THREAD_ID_NAME ACE_SSL_thread_id
-# endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
-
-
-
-extern "C"
-{
-  void
-  ACE_SSL_LOCKING_CALLBACK_NAME (int mode,
-                                 int type,
-                                 const char * /* file */,
-                                 int /* line */)
-  {
-    // #ifdef undef
-    //   fprintf(stderr,"thread=%4d mode=%s lock=%s %s:%d\n",
-    //           CRYPTO_thread_id(),
-    //           (mode&CRYPTO_LOCK)?"l":"u",
-    //           (type&CRYPTO_READ)?"r":"w",file,line);
-    // #endif
-    //   /*
-    //     if (CRYPTO_LOCK_SSL_CERT == type)
-    //     fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n",
-    //     CRYPTO_thread_id(),
-    //     mode,file,line);
-    //   */
-    if (mode & CRYPTO_LOCK)
-      (void) ssl_locks[type].acquire ();
-    else
-      (void) ssl_locks[type].release ();
-  }
-
-  // -------------------------------
-
-  // Return the current thread ID.  OpenSSL uses this on platforms
-  // that need it.
-  unsigned long
-  ACE_SSL_THREAD_ID_NAME (void)
-  {
-    return (unsigned long) ACE_VERSIONED_NAMESPACE_NAME::ACE_OS::thr_self ();
-  }
-}
-#endif  /* ACE_HAS_THREADS */
-
-
-// ****************************************************************
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-#ifdef ACE_HAS_THREADS
-ACE_SSL_Context::lock_type * ACE_SSL_Context::locks_ = 0;
-#endif  /* ACE_HAS_THREADS */
-
-ACE_SSL_Context::ACE_SSL_Context (void)
-  : context_ (0),
-    mode_ (-1),
-    default_verify_mode_ (SSL_VERIFY_NONE),
-    default_verify_callback_ (0),
-    have_ca_ (0)
-{
-  ACE_SSL_Context::ssl_library_init ();
-}
-
-ACE_SSL_Context::~ACE_SSL_Context (void)
-{
-  if (this->context_)
-    {
-      ::SSL_CTX_free (this->context_);
-      this->context_ = 0;
-    }
-
-  ACE_SSL_Context::ssl_library_fini ();
-}
-
-ACE_SSL_Context *
-ACE_SSL_Context::instance (void)
-{
-  return ACE_Unmanaged_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::instance ();
-}
-
-void
-ACE_SSL_Context::ssl_library_init (void)
-{
-  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex,
-                     ace_ssl_mon,
-                     *ACE_Static_Object_Lock::instance ()));
-
-  if (ssl_library_init_count == 0)
-    {
-      // Initialize the locking callbacks before initializing anything
-      // else.
-#ifdef ACE_HAS_THREADS
-      int const num_locks = ::CRYPTO_num_locks ();
-
-      this->locks_ = new lock_type[num_locks];
-      ssl_locks    = this->locks_;
-
-# if !defined (WIN32)
-      // This call isn't necessary on some platforms.  See the CRYPTO
-      // library's threads(3) man page for details.
-      ::CRYPTO_set_id_callback (ACE_SSL_THREAD_ID_NAME);
-# endif  /* !WIN32 */
-      ::CRYPTO_set_locking_callback (ACE_SSL_LOCKING_CALLBACK_NAME);
-#endif  /* ACE_HAS_THREADS */
-
-      ::SSLeay_add_ssl_algorithms ();
-      ::SSL_load_error_strings ();
-
-      // Seed the random number generator.  Note that the random
-      // number generator can be seeded more than once to "stir" its
-      // state.
-
-#ifdef WIN32
-      // Seed the random number generator by sampling the screen.
-      ::RAND_screen ();
-#endif  /* WIN32 */
-
-#if OPENSSL_VERSION_NUMBER >= 0x00905100L
-      // OpenSSL < 0.9.5 doesn't have EGD support.
-
-      const char *egd_socket_file =
-        ACE_OS::getenv (ACE_SSL_EGD_FILE_ENV);
-
-      if (egd_socket_file != 0)
-        (void) this->egd_file (egd_socket_file);
-#endif  /* OPENSSL_VERSION_NUMBER */
-
-      const char *rand_file = ACE_OS::getenv (ACE_SSL_RAND_FILE_ENV);
-
-      if (rand_file != 0)
-        {
-          (void) this->seed_file (rand_file);
-        }
-
-      // Initialize the mutexes that will be used by the SSL and
-      // crypto library.
-    }
-
-  ++ssl_library_init_count;
-}
-
-void
-ACE_SSL_Context::ssl_library_fini (void)
-{
-  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex,
-                     ace_ssl_mon,
-                     *ACE_Static_Object_Lock::instance ()));
-
-  --ssl_library_init_count;
-  if (ssl_library_init_count == 0)
-    {
-      ::ERR_free_strings ();
-      ::EVP_cleanup ();
-
-      // Clean up the locking callbacks after everything else has been
-      // cleaned up.
-#ifdef ACE_HAS_THREADS
-      ::CRYPTO_set_locking_callback (0);
-      ssl_locks = 0;
-
-      delete [] this->locks_;
-      this->locks_ = 0;
-#endif  /* ACE_HAS_THREADS */
-    }
-}
-
-int
-ACE_SSL_Context::set_mode (int mode)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex,
-                            ace_ssl_mon,
-                            *ACE_Static_Object_Lock::instance (),
-                            -1));
-
-  if (this->context_ != 0)
-    return -1;
-
-#if OPENSSL_VERSION_NUMBER >= 0x10000002
-  const SSL_METHOD *method = 0;
-#else
-  SSL_METHOD *method = 0;
-#endif
-
-  switch (mode)
-    {
-    case ACE_SSL_Context::SSLv2_client:
-      method = ::SSLv2_client_method ();
-      break;
-    case ACE_SSL_Context::SSLv2_server:
-      method = ::SSLv2_server_method ();
-      break;
-    case ACE_SSL_Context::SSLv2:
-      method = ::SSLv2_method ();
-      break;
-    case ACE_SSL_Context::SSLv3_client:
-      method = ::SSLv3_client_method ();
-      break;
-    case ACE_SSL_Context::SSLv3_server:
-      method = ::SSLv3_server_method ();
-      break;
-    case ACE_SSL_Context::SSLv3:
-      method = ::SSLv3_method ();
-      break;
-    case ACE_SSL_Context::SSLv23_client:
-      method = ::SSLv23_client_method ();
-      break;
-    case ACE_SSL_Context::SSLv23_server:
-      method = ::SSLv23_server_method ();
-      break;
-    case ACE_SSL_Context::SSLv23:
-      method = ::SSLv23_method ();
-      break;
-    case ACE_SSL_Context::TLSv1_client:
-      method = ::TLSv1_client_method ();
-      break;
-    case ACE_SSL_Context::TLSv1_server:
-      method = ::TLSv1_server_method ();
-      break;
-    case ACE_SSL_Context::TLSv1:
-      method = ::TLSv1_method ();
-      break;
-    default:
-      method = ::SSLv3_method ();
-      break;
-    }
-
-  this->context_ = ::SSL_CTX_new (method);
-  if (this->context_ == 0)
-    return -1;
-
-  this->mode_ = mode;
-
-  // Load the trusted certificate authority (default) certificate
-  // locations. But do not return -1 on error, doing so confuses CTX
-  // allocation (severe error) with the less important loading of CA
-  // certificate location error.  If it is important for your
-  // application then call ACE_SSL_Context::have_trusted_ca(),
-  // immediately following this call to set_mode().
-  (void) this->load_trusted_ca ();
-
-  return 0;
-}
-
-int
-ACE_SSL_Context::load_trusted_ca (const char* ca_file,
-                                  const char* ca_dir,
-                                  bool use_env_defaults)
-{
-  this->check_context ();
-
-  if (ca_file == 0 && use_env_defaults)
-    {
-      // Use the default environment settings.
-      ca_file = ACE_OS::getenv (ACE_SSL_CERT_FILE_ENV);
-#ifdef ACE_DEFAULT_SSL_CERT_FILE
-      if (ca_file == 0)
-        ca_file = ACE_DEFAULT_SSL_CERT_FILE;
-#endif
-    }
-
-  if (ca_dir == 0 && use_env_defaults)
-    {
-      // Use the default environment settings.
-      ca_dir = ACE_OS::getenv (ACE_SSL_CERT_DIR_ENV);
-#ifdef ACE_DEFAULT_SSL_CERT_DIR
-      if (ca_dir == 0)
-        ca_dir = ACE_DEFAULT_SSL_CERT_DIR;
-#endif
-    }
-
-  // NOTE: SSL_CTX_load_verify_locations() returns 0 on error.
-  if (::SSL_CTX_load_verify_locations (this->context_,
-                                       ca_file,
-                                       ca_dir) <= 0)
-    {
-      if (ACE::debug ())
-        ACE_SSL_Context::report_error ();
-      return -1;
-    }
-
-  ++this->have_ca_;
-
-  // For TLS/SSL servers scan all certificates in ca_file and ca_dir and
-  // list them as acceptable CAs when requesting a client certificate.
-  if (mode_ == SSLv23
-      || mode_ == SSLv23_server
-      || mode_ == TLSv1
-      || mode_ == TLSv1_server
-      || mode_ == SSLv3
-      || mode_ == SSLv3_server
-      || mode_ == SSLv2
-      || mode_ == SSLv2_server)
-    {
-      // Note: The STACK_OF(X509_NAME) pointer is a copy of the pointer in
-      // the CTX; any changes to it by way of these function calls will
-      // change the CTX directly.
-      STACK_OF (X509_NAME) * cert_names = 0;
-      cert_names = ::SSL_CTX_get_client_CA_list (this->context_);
-      bool error = false;
-
-      // Add CAs from both the file and dir, if specified. There should
-      // already be a STACK_OF(X509_NAME) in the CTX, but if not, we create
-      // one.
-      if (ca_file)
-        {
-          if (cert_names == 0)
-            {
-              if ((cert_names = ::SSL_load_client_CA_file (ca_file)) != 0)
-                ::SSL_CTX_set_client_CA_list (this->context_, cert_names);
-              else
-                error = true;
-            }
-          else
-            {
-              // Add new certificate names to the list.
-              error = (0 == ::SSL_add_file_cert_subjects_to_stack (cert_names,
-                                                                   ca_file));
-            }
-
-          if (error)
-            {
-              if (ACE::debug ())
-                ACE_SSL_Context::report_error ();
-              return -1;
-            }
-        }
-
-      // SSL_add_dir_cert_subjects_to_stack is defined at 0.9.8a (but not
-      // on OpenVMS or Mac Classic); it may be available earlier. Change
-      // this comparison if so.
-#if defined (OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090801fL)
-#  if !defined (OPENSSL_SYS_VMS) && !defined (OPENSSL_SYS_MACINTOSH_CLASSIC)
-#    if !defined (OPENSSL_SYS_WIN32) || (OPENSSL_VERSION_NUMBER > 0x0090807fL)
-
-      if (ca_dir != 0)
-        {
-          if (cert_names == 0)
-            {
-              if ((cert_names = sk_X509_NAME_new_null ()) == 0)
-                {
-                  if (ACE::debug ())
-                    ACE_SSL_Context::report_error ();
-                  return -1;
-                }
-              ::SSL_CTX_set_client_CA_list (this->context_, cert_names);
-            }
-          if (0 == ::SSL_add_dir_cert_subjects_to_stack (cert_names, ca_dir))
-            {
-              if (ACE::debug ())
-                ACE_SSL_Context::report_error ();
-              return -1;
-            }
-        }
-#    endif /* !OPENSSL_SYS_WIN32 || OPENSSL_VERSION_NUMBER >= 0x0090807fL */
-#  endif /* !OPENSSL_SYS_VMS && !OPENSSL_SYS_MACINTOSH_CLASSIC */
-#endif /* OPENSSL_VERSION_NUMBER >= 0.9.8a release */
-
-    }
-
-  return 0;
-}
-
-
-int
-ACE_SSL_Context::private_key (const char *file_name,
-                              int type)
-{
-  if (this->private_key_.type () != -1)
-    return 0;
-
-  this->check_context ();
-
-  this->private_key_ = ACE_SSL_Data_File (file_name, type);
-
-  if (::SSL_CTX_use_PrivateKey_file (this->context_,
-                                     this->private_key_.file_name (),
-                                     this->private_key_.type ()) <= 0)
-    {
-      this->private_key_ = ACE_SSL_Data_File ();
-      return -1;
-    }
-  else
-    return this->verify_private_key ();
-}
-
-int
-ACE_SSL_Context::verify_private_key (void)
-{
-  this->check_context ();
-
-  return (::SSL_CTX_check_private_key (this->context_) <= 0 ? -1 : 0);
-}
-
-int
-ACE_SSL_Context::certificate (const char *file_name,
-                              int type)
-{
-  if (this->certificate_.type () != -1)
-    return 0;
-
-  this->certificate_ = ACE_SSL_Data_File (file_name, type);
-
-  this->check_context ();
-
-  if (::SSL_CTX_use_certificate_file (this->context_,
-                                      this->certificate_.file_name (),
-                                      this->certificate_.type ()) <= 0)
-    {
-      this->certificate_ = ACE_SSL_Data_File ();
-      return -1;
-    }
-  else
-    return 0;
-}
-
-int
-ACE_SSL_Context::certificate (X509* cert)
-{
-  // Is it really a good idea to return 0 if we're not setting the
-  // certificate?
-  if (this->certificate_.type () != -1)
-      return 0;
-
-  this->check_context();
-
-  if (::SSL_CTX_use_certificate (this->context_, cert) <= 0)
-    {
-      return -1;
-    }
-  else
-    {
-      // No file is associated with the certificate, set this to a fictional
-      // value so we don't reset it later.
-      this->certificate_ = ACE_SSL_Data_File ("MEMORY CERTIFICATE");
-
-      return 0;
-    }
-}
-
-void
-ACE_SSL_Context::set_verify_peer (int strict, int once, int depth)
-{
-  this->check_context ();
-
-  // Setup the peer verififcation mode.
-
-  int verify_mode = SSL_VERIFY_PEER;
-  if (once)
-    verify_mode |= SSL_VERIFY_CLIENT_ONCE;
-  if (strict)
-    verify_mode |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT;
-
-  // set the default verify mode
-  this->default_verify_mode (verify_mode);
-
-  // Set the max certificate depth but later let the verify_callback
-  // catch the depth error by adding one to the required depth.
-  if (depth > 0)
-    ::SSL_CTX_set_verify_depth (this->context_, depth + 1);
-}
-
-
-int
-ACE_SSL_Context::random_seed (const char * seed)
-{
-  int len = ACE_Utils::truncate_cast<int> (ACE_OS::strlen (seed));
-  ::RAND_seed (seed, len);
-
-#if OPENSSL_VERSION_NUMBER >= 0x00905100L
-  // RAND_status() returns 1 if the PRNG has enough entropy.
-  return (::RAND_status () == 1 ? 0 : -1);
-#else
-  return 0;  // Ugly, but OpenSSL <= 0.9.4 doesn't have RAND_status().
-#endif  /* OPENSSL_VERSION_NUMBER >= 0x00905100L */
-}
-
-int
-ACE_SSL_Context::egd_file (const char * socket_file)
-{
-#if OPENSSL_VERSION_NUMBER < 0x00905100L
-  // OpenSSL < 0.9.5 doesn't have EGD support.
-  ACE_UNUSED_ARG (socket_file);
-  ACE_NOTSUP_RETURN (-1);
-#else
-  // RAND_egd() returns the amount of entropy used to seed the random
-  // number generator.  The actual value should be greater than 16,
-  // i.e. 128 bits.
-  if (::RAND_egd (socket_file) > 0)
-    return 0;
-  else
-    return -1;
-#endif  /* OPENSSL_VERSION_NUMBER >= 0x00905100L */
-}
-
-int
-ACE_SSL_Context::seed_file (const char * seed_file, long bytes)
-{
-  // RAND_load_file() returns the number of bytes used to seed the
-  // random number generator. If the file reads ok, check RAND_status to
-  // see if it got enough entropy.
-  if (::RAND_load_file (seed_file, bytes) > 0)
-#if OPENSSL_VERSION_NUMBER >= 0x00905100L
-    // RAND_status() returns 1 if the PRNG has enough entropy.
-    return (::RAND_status () == 1 ? 0 : -1);
-#else
-    return 0;  // Ugly, but OpenSSL <= 0.9.4 doesn't have RAND_status().
-#endif  /* OPENSSL_VERSION_NUMBER >= 0x00905100L */
-  else
-    return -1;
-}
-
-void
-ACE_SSL_Context::report_error (unsigned long error_code)
-{
-  if (error_code == 0)
-    return;
-
-  char error_string[256];
-
-// OpenSSL < 0.9.6a doesn't have ERR_error_string_n() function.
-#if OPENSSL_VERSION_NUMBER >= 0x0090601fL
-  (void) ::ERR_error_string_n (error_code, error_string, sizeof error_string);
-#else /* OPENSSL_VERSION_NUMBER >= 0x0090601fL */
-  (void) ::ERR_error_string (error_code, error_string);
-#endif /* OPENSSL_VERSION_NUMBER >= 0x0090601fL */
-
-  ACE_ERROR ((LM_ERROR,
-              ACE_TEXT ("ACE_SSL (%P|%t) error code: %u - %C\n"),
-              error_code,
-              error_string));
-}
-
-void
-ACE_SSL_Context::report_error (void)
-{
-  unsigned long err = ::ERR_get_error ();
-  ACE_SSL_Context::report_error (err);
-  ACE_OS::last_error (err);
-}
-
-int
-ACE_SSL_Context::dh_params (const char *file_name,
-                            int type)
-{
-  if (this->dh_params_.type () != -1)
-    return 0;
-
-  // For now we only support PEM encodings
-  if (type != SSL_FILETYPE_PEM)
-    return -1;
-
-  this->dh_params_ = ACE_SSL_Data_File (file_name, type);
-
-  this->check_context ();
-
-  {
-    // Swiped from Rescorla's examples and the OpenSSL s_server.c app
-    DH * ret=0;
-    BIO * bio = 0;
-
-    if ((bio = ::BIO_new_file (this->dh_params_.file_name (), "r")) == 0)
-      {
-        this->dh_params_ = ACE_SSL_Data_File ();
-        return -1;
-      }
-
-    ret = PEM_read_bio_DHparams (bio, 0, 0, 0);
-    BIO_free (bio);
-
-    if (ret == 0)
-      {
-        this->dh_params_ = ACE_SSL_Data_File ();
-        return -1;
-      }
-
-    if (::SSL_CTX_set_tmp_dh (this->context_, ret) < 0)
-      {
-        this->dh_params_ = ACE_SSL_Data_File ();
-        return -1;
-      }
-    DH_free (ret);
-  }
-
-  return 0;
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-
-template ACE_Unmanaged_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX> *
-  ACE_Unmanaged_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::singleton_;
-
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/SSL/SSL_Context.h b/dep/acelite/ace/SSL/SSL_Context.h
deleted file mode 100644
index 4ad127557..000000000
--- a/dep/acelite/ace/SSL/SSL_Context.h
+++ /dev/null
@@ -1,411 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    SSL_Context.h
- *
- *  $Id: SSL_Context.h 96087 2012-08-21 12:26:44Z sma $
- *
- *  @author Carlos O'Ryan <coryan@ece.uci.edu>
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef ACE_SSL_CONTEXT_H
-#define ACE_SSL_CONTEXT_H
-
-#include /**/ "ace/pre.h"
-
-#include "SSL_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-
-#ifdef ACE_HAS_THREADS
-# include "ace/Synch_Traits.h"
-#endif  /* ACE_HAS_THREADS */
-
-#include <openssl/ssl.h>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ACE_SSL_Export ACE_SSL_Data_File
-{
-public:
-  /// Default constructor
-  ACE_SSL_Data_File (void);
-
-  /// Contructor from a file name and the file type.
-  ACE_SSL_Data_File (const char *file_name,
-                     int type = SSL_FILETYPE_PEM);
-
-  /// The file name
-  const char *file_name (void) const;
-
-  /// The type
-  int type (void) const;
-
-private:
-  /// The file name
-  ACE_CString file_name_;
-
-  /// The type, used by the SSL library to parse the file contents.
-  int type_;
-};
-
-// ****************************************************************
-
-// NOTE: Solaris studio compilers amongst others will issue warnings if the
-// the correct type of function pointer (i.e. extern "C" ) is not stored/used
-// of the form:
-// Warning (Anachronism): Formal argument callback of type
-//   extern "C" int(*)(int,x509_store_ctx_st*) in call to
-//   SSL_CTX_set_verify(ssl_ctx_st*, int, extern "C" int(*)(int,x509_store_ctx_st*))
-//   is being passed int(*)(int,x509_store_ctx_st*)
-// when C library routines are passed CallBack functions pointers that are
-// actually C++ functions.
-//
-// Unfortunatly you can not specify extern "C" linkage anywhere inside a class
-// declaration or inside a function prototype for individual parameters. I.e:
-//   class { extern "C" int (*callback_) (int, void *); };
-// to store a function pointer as a data member of the class is illegal as is:
-//   void function (extern "C" int (*callback) (int, void *);
-// to declare function (or a class member) that takes a extern "C" function
-// pointer as a parameter.
-//
-// Since we need an extern "C" function pointer as a parameter to be stored
-// in the class and handled by member functions, we are forced to declare
-// a typedef of that extern "C" function pointer that we can then use.
-// Again unfortunatly you also are not allowed to simply add the extern "C"
-// to the typedef itself, instead you have to place the typedef declaration
-// inside an extern "C" block, thus:
-
-extern "C" {
-  typedef int (*extern_C_CallBackVerify_t) (int, X509_STORE_CTX *);
-}
-
-/**
- * @class ACE_SSL_Context
- *
- * @brief A wrapper for the OpenSSL SSL_CTX related functions.
- *
- * This class provides a wrapper for the SSL_CTX data structure.
- * Since most applications have a single SSL_CTX structure, this class
- * can be used as a singleton.
- */
-class ACE_SSL_Export ACE_SSL_Context
-{
-public:
-#ifdef ACE_HAS_THREADS
-  typedef ACE_SYNCH_MUTEX lock_type;
-#endif  /* ACE_HAS_THREADS */
-
-  enum {
-    INVALID_METHOD = -1,
-    SSLv2_client = 1,
-    SSLv2_server,
-    SSLv2,
-    SSLv3_client,
-    SSLv3_server,
-    SSLv3,
-    SSLv23_client,
-    SSLv23_server,
-    SSLv23,
-    TLSv1_client,
-    TLSv1_server,
-    TLSv1
-  };
-
-  /// Constructor
-  ACE_SSL_Context (void);
-
-  /// Destructor
-  ~ACE_SSL_Context (void);
-
-  /// The Singleton context, the SSL components use the singleton if
-  /// nothing else is available.
-  static ACE_SSL_Context *instance (void);
-
-  /**
-   * Set the CTX mode.  The mode can be set only once, afterwards the
-   * function has no effect and returns -1.
-   * Once the mode is set the underlying SSL_CTX is initialized and
-   * the class can be used.
-   * If the mode is not set, then the class automatically initializes
-   * itself to the default mode.
-   */
-  int set_mode (int mode = ACE_SSL_Context::SSLv23);
-
-  int get_mode (void) const;
-
-  /// Get the SSL context
-  SSL_CTX *context (void);
-
-  /// Get the file name and file format used for the private key
-  int private_key_type (void) const;
-  const char *private_key_file_name (void) const;
-
-  /// Set the private key file.
-  /**
-   * @note This method should only be called after a certificate has
-   *       been set since key verification is performed against the
-   *       certificate, among other things.
-   */
-  int private_key (const char *file_name, int type = SSL_FILETYPE_PEM);
-
-  /// Verify that the private key is valid.
-  /**
-   * @note This method should only be called after a certificate has
-   *       been set since key verification is performed against the
-   *       certificate, among other things.
-   */
-  int verify_private_key (void);
-
-  /// Get the file name and file format used for the certificate file
-  int certificate_type (void) const;
-  const char *certificate_file_name (void) const;
-
-  /// Set the certificate file.
-  int certificate (const char *file_name,
-                   int type = SSL_FILETYPE_PEM);
-
-  /// Load certificate from memory rather than a file.
-  int certificate (X509* cert);
-
-  /**
-   *  Load the location of the trusted certification authority
-   *  certificates.  Note that CA certificates are stored in PEM format
-   *  as a sequence of certificates in @a ca_file or as a set of
-   *  individual certificates in @a ca_dir (or both).
-   *
-   *  Note this method is called by set_mode() to load the default
-   *  environment settings for @a ca_file and @a ca_dir, if any. This
-   *  allows for automatic service configuration (and backward
-   *  compatibility with previous versions).
-   *
-   *  Note that the underlying SSL function will add valid file and
-   *  directory names to the load location lists maintained as part of
-   *  the SSL_CTX table.  It therefore doesn't make sense to keep a
-   *  copy of the file and path name of the most recently added
-   *  @a ca_file or @a ca_path.
-   *
-   *  @param[in] ca_file           CA file pathname. Passed to
-   *                               @c SSL_CTX_load_verify_locations() if not
-   *                               0. If 0, behavior depends on the value of
-   *                               @a use_env_defaults.
-   *  @param[in] ca_dir            CA directory pathname. Passed to
-   *                               @c SSL_CTX_load_verify_locations() if not
-   *                               0. If 0, behavior depends on the value of
-   *                               @a use_env_defaults.
-   *  @param[in] use_env_defaults  If false, the specified @a ca_file argument
-   *                               is passed to
-   *                               @c SSL_CTX_load_verify_locations(),
-   *                               regardless of its value.
-   *                               If true (the default), additional defaults
-   *                               can be applied to either @a ca_file,
-   *                               @a ca_dir, or both. The following
-   *                               additional defaults are applied when the
-   *                               @a ca_file argument is 0:
-   *                                - The @c SSL_CERT_FILE environment variable
-   *                                  will be queried for a file name to use as
-   *                                  the @a ca_file argument. The environment
-   *                                  variable name to query can be changed by
-   *                                  supplying a @c ACE_SSL_CERT_FILE_ENV
-   *                                  configuration item when building ACE.
-   *                                - If there is no @c SSL_CERT_FILE in the
-   *                                  current environment, the file specified
-   *                                  by the @c ACE_DEFAULT_SSL_CERT_FILE ACE
-   *                                  configuration item will be used. The
-   *                                  default value is "cert.pem" on Windows
-   *                                  and "/etc/ssl/cert.pem" on all other
-   *                                  platforms.
-   *                               The following additional defaults are
-   *                               applied when the @a ca_dir argument is 0:
-   *                                - The @c SSL_CERT_DIR environment variable
-   *                                  will be queried for a file name to use as
-   *                                  the @a ca_dir argument. The environment
-   *                                  variable name to query can be changed by
-   *                                  supplying a @c ACE_SSL_CERT_DIR_ENV
-   *                                  configuration item when building ACE.
-   *                                - If there is no @c SSL_CERT_DIR in the
-   *                                  current environment, the directory
-   *                                  specified by the @c
-   *                                  ACE_DEFAULT_SSL_CERT_DIR ACE
-   *                                  configuration item will be used. The
-   *                                  default value is "certs" on Windows
-   *                                  and "/etc/ssl/certs" on all other
-   *                                  platforms.
-   *
-   *  @return 0 for success or -1 on error.
-   *
-   *  @see OpenSSL manual SSL_CTX_load_verify_locations(3) for a
-   *  detailed description of the CA file and directory requirements
-   *  and processing.
-   */
-  int load_trusted_ca (const char* ca_file = 0,
-                       const char* ca_dir = 0,
-                       bool use_env_defaults = true);
-
-  /**
-   *  Test whether any CA locations have been successfully loaded and
-   *  return the number of successful attempts.
-   *
-   *  @retval >0  The number of successful CA load attempts.
-   *  @retval  0  If all CA load attempts have failed.
-   */
-  int have_trusted_ca (void) const;
-
-  /**
-   *  @todo Complete this documentation where elipses(...) are used
-   *
-   *  @doc Use this method when certificate chain verification is
-   *  required.  The default server behaviour is SSL_VERIFY_NONE
-   *  i.e. client certicates are requested for verified. This method
-   *  can be used to configure server to request client certificates
-   *  and perform the certificate verification. If <strict> is set
-   *  true the client connection is rejected when certificate
-   *  verification fails.  Otherwise the session is accepted with a
-   *  warning, which is the default behaviour.  If <once> is set true
-   *  (default), certificates are requested only once per session.
-   *  The last parameter <depth> can be used to set the verification
-   *  depth.
-   *
-   *  Note for verification to work correctly there should be a valid
-   *  CA name list set using load_trusted_ca().
-   *
-   *  @see OpenSSL documentation of SSL_CTX_set_verify(3) for details of
-   *  the verification process.
-   *
-   *  @see OpenSSL documentation ... set_verify_depth(3) ...
-   *
-   *  Note that this method overrides the use of the
-   *  default_verify_mode() method.
-   */
-  void set_verify_peer (int strict = 0, int once = 1, int depth = 0);
-
-  /// TODO: a implementation that will lookup the CTX table for the list
-  /// of files and paths etc.
-  /// Query the location of trusted certification authority
-  /// certificates.
-  // const char* ca_file_name(void) const;
-  // const char* ca_dir_name(void) const;
-
-  /**
-   * Set and query the default verify mode for this context, it is
-   * inherited by all the ACE_SSL objects created using the context.
-   * It can be overriden on a per-ACE_SSL object.
-   */
-  void default_verify_mode (int mode);
-  int default_verify_mode (void) const;
-
-  /**
-   * Set and query the default verify callback for this context, it is
-   * inherited by all the ACE_SSL objects created using the context.
-   * It can be overriden on a per-ACE_SSL object.
-   */
-  void default_verify_callback (extern_C_CallBackVerify_t);
-  extern_C_CallBackVerify_t  default_verify_callback (void) const;
-
-  /**
-   * @name OpenSSL Random Number Generator Seed Related Methods
-   *
-   * These are methods that can be used to seed OpenSSL's
-   * pseudo-random number generator.  These methods can be called more
-   * than once.
-   */
-  //@{
-  /// Seed the underlying random number generator.  This value should
-  /// have at least 128 bits of entropy.
-  static int random_seed (const char * seed);
-
-  /// Set the Entropy Gathering Daemon (EGD) UNIX domain socket file to
-  /// read random seed values from.
-  static int egd_file (const char * socket_file);
-
-  /**
-   * Set the file that contains the random seed value state, and the
-   * amount of bytes to read.  "-1" bytes causes the entire file to be
-   * read.
-   */
-  static int seed_file (const char * seed_file, long bytes = -1);
-  //@}
-
-  /// Print SSL error corresponding to the given error code.
-  static void report_error (unsigned long error_code);
-
-  /// Print the last SSL error for the current thread.
-  static void report_error (void);
-
-  /**
-   * @name Diffie-Hellman (DH) Parameters
-   *
-   * When using DSS-based certificates, Diffie-Hellman keys need to be
-   * exchanged.  These must be provided in the form of DH key
-   * generation parameters loaded in, or as fixed keys hardcoded into
-   * the code itself.  ACE_SSL supports loaded parameters.
-   *
-   */
-  //@{
-  /**
-   * Load Diffie-Hellman parameters from file_name.  The specified file can be
-   * a standalone file containing only DH parameters (e.g., as created
-   * by <code>openssl dhparam</code>), or it can be a certificate which has
-   * a PEM-encoded set of DH params concatenated on to i.
-   */
-  int dh_params (const char *file_name, int type = SSL_FILETYPE_PEM);
-  const char *dh_params_file_name () const;
-  int dh_params_file_type () const;
-  //@}
-
-private:
-  /// Verify if the context has been initialized or not.
-  void check_context (void);
-
-  /// @@ More to document
-  void ssl_library_init ();
-  void ssl_library_fini ();
-
-  // = Prevent assignment and copy initialization.
-  //@{
-  ACE_SSL_Context (const ACE_SSL_Context &);
-  ACE_SSL_Context & operator= (const ACE_SSL_Context &);
-  //@}
-
-private:
-  /// The SSL_CTX structure
-  SSL_CTX *context_;
-
-  /// Cache the mode so we can answer fast
-  int mode_;
-
-  /// The private key, certificate, and Diffie-Hellman parameters files
-  ACE_SSL_Data_File private_key_;
-  ACE_SSL_Data_File certificate_;
-  ACE_SSL_Data_File dh_params_;
-
-  /// The default verify mode.
-  int default_verify_mode_;
-
-  /// The default verify callback.
-  extern_C_CallBackVerify_t  default_verify_callback_;
-
-  /// count of successful CA load attempts
-  int have_ca_;
-
-#ifdef ACE_HAS_THREADS
-  /// Array of mutexes used internally by OpenSSL when the SSL
-  /// application is multithreaded.
-  static lock_type * locks_;
-#endif  /* ACE_HAS_THREADS */
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined(__ACE_INLINE__)
-#include "SSL_Context.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif  /* ACE_SSL_CONTEXT_H */
diff --git a/dep/acelite/ace/SSL/SSL_Context.inl b/dep/acelite/ace/SSL/SSL_Context.inl
deleted file mode 100644
index 65370672a..000000000
--- a/dep/acelite/ace/SSL/SSL_Context.inl
+++ /dev/null
@@ -1,125 +0,0 @@
-// -*- C++ -*-
-//
-// $Id: SSL_Context.inl 96087 2012-08-21 12:26:44Z sma $
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-ACE_SSL_Data_File::ACE_SSL_Data_File (void)
-  : type_ (-1)
-{
-}
-
-ACE_INLINE
-ACE_SSL_Data_File::ACE_SSL_Data_File (const char *file_name,
-                                      int type)
-  : file_name_ (file_name),
-    type_ (type)
-{
-}
-
-ACE_INLINE const char *
-ACE_SSL_Data_File::file_name (void) const
-{
-  return this->file_name_.c_str ();
-}
-
-ACE_INLINE int
-ACE_SSL_Data_File::type (void) const
-{
-  return this->type_;
-}
-
-// ****************************************************************
-
-ACE_INLINE void
-ACE_SSL_Context::check_context (void)
-{
-  if (this->context_ == 0)
-    {
-      this->set_mode ();
-    }
-
-  ::SSL_CTX_set_verify (this->context_, this->default_verify_mode (),
-                        this->default_verify_callback ());
-}
-
-ACE_INLINE SSL_CTX *
-ACE_SSL_Context::context (void)
-{
-  this->check_context ();
-  return this->context_;
-}
-
-ACE_INLINE int
-ACE_SSL_Context::private_key_type (void) const
-{
-  return this->private_key_.type ();
-}
-
-ACE_INLINE const char*
-ACE_SSL_Context::private_key_file_name (void) const
-{
-  return this->private_key_.file_name ();
-}
-
-ACE_INLINE int
-ACE_SSL_Context::certificate_type (void) const
-{
-  return this->certificate_.type ();
-}
-
-ACE_INLINE const char*
-ACE_SSL_Context::certificate_file_name (void) const
-{
-  return this->certificate_.file_name ();
-}
-
-ACE_INLINE int
-ACE_SSL_Context::dh_params_file_type (void) const
-{
-  return this->dh_params_.type ();
-}
-
-ACE_INLINE const char*
-ACE_SSL_Context::dh_params_file_name (void) const
-{
-  return this->dh_params_.file_name ();
-}
-
-ACE_INLINE void
-ACE_SSL_Context::default_verify_mode (int mode)
-{
-  this->default_verify_mode_ = mode;
-}
-
-ACE_INLINE int
-ACE_SSL_Context::default_verify_mode (void) const
-{
-  return this->default_verify_mode_;
-}
-
-ACE_INLINE void
-ACE_SSL_Context::default_verify_callback (extern_C_CallBackVerify_t  callback)
-{
-  this->default_verify_callback_ = callback;
-}
-
-ACE_INLINE extern_C_CallBackVerify_t  ACE_SSL_Context::default_verify_callback(void) const
-{
-  return this->default_verify_callback_;
-}
-
-ACE_INLINE int
-ACE_SSL_Context::get_mode (void) const
-{
-  return this->mode_;
-}
-
-ACE_INLINE int
-ACE_SSL_Context::have_trusted_ca (void) const
-{
-  return this->have_ca_;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/SSL/SSL_Export.h b/dep/acelite/ace/SSL/SSL_Export.h
deleted file mode 100644
index 9e0028a9d..000000000
--- a/dep/acelite/ace/SSL/SSL_Export.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-// $Id: SSL_Export.h 80826 2008-03-04 14:51:23Z wotte $
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
-// ------------------------------
-#if !defined (ACE_SSL_EXPORT_H)
-#define ACE_SSL_EXPORT_H
-
-#include /**/ "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_SSL_HAS_DLL)
-#  define ACE_SSL_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_SSL_HAS_DLL */
-
-#if !defined (ACE_SSL_HAS_DLL)
-#define ACE_SSL_HAS_DLL 1
-#endif /* ! ACE_SSL_HAS_DLL */
-
-#if defined (ACE_SSL_HAS_DLL)
-#  if (ACE_SSL_HAS_DLL == 1)
-#    if defined (ACE_SSL_BUILD_DLL)
-#      define ACE_SSL_Export ACE_Proper_Export_Flag
-#      define ACE_SSL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define ACE_SSL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    else
-#      define ACE_SSL_Export ACE_Proper_Import_Flag
-#      define ACE_SSL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define ACE_SSL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    endif /* ACE_SSL_BUILD_DLL */
-#  else
-#    define ACE_SSL_Export
-#    define ACE_SSL_SINGLETON_DECLARATION(T)
-#    define ACE_SSL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif   /* ! ACE_SSL_HAS_DLL == 1 */
-#else
-#  define ACE_SSL_Export
-#  define ACE_SSL_SINGLETON_DECLARATION(T)
-#  define ACE_SSL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif     /* ACE_SSL_HAS_DLL */
-
-#endif     /* ACE_SSL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/SSL/SSL_Initializer.cpp b/dep/acelite/ace/SSL/SSL_Initializer.cpp
deleted file mode 100644
index 4903e6081..000000000
--- a/dep/acelite/ace/SSL/SSL_Initializer.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id: SSL_Initializer.cpp 93497 2011-03-07 09:43:36Z vzykov $
-
-#include "SSL_Initializer.h"
-#include "SSL_Context.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-int
-ACE_SSL_Initializer::static_init (void)
-{
-  ACE_Service_Config::process_directive (ace_svc_desc_ACE_SSL_Initializer);
-  return 0;
-}
-
-int
-ACE_SSL_Initializer::init (int, ACE_TCHAR *[])
-{
-  // Initialize ACE_SSL_Context singleton.
-  ACE_SSL_Context * ssl_ctx = ACE_SSL_Context::instance ();
-  ACE_ASSERT (ssl_ctx != 0);
-  ACE_UNUSED_ARG (ssl_ctx);
-
-  return 0;
-}
-
-int
-ACE_SSL_Initializer::fini (void)
-{
-  // Explicitly close the ACE_SSL_Context singleton.
-  ACE_Unmanaged_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::close();
-
-  return 0;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DEFINE (ACE_SSL_Initializer,
-                       ACE_TEXT ("ACE_SSL_Initializer"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (ACE_SSL_Initializer),
-                       ACE_Service_Type::DELETE_THIS |
-                         ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (ACE_SSL, ACE_SSL_Initializer)
diff --git a/dep/acelite/ace/SSL/SSL_Initializer.h b/dep/acelite/ace/SSL/SSL_Initializer.h
deleted file mode 100644
index 1d15a7315..000000000
--- a/dep/acelite/ace/SSL/SSL_Initializer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    SSL_Initializer.h
- *
- *  $Id: SSL_Initializer.h 93497 2011-03-07 09:43:36Z vzykov $
- *
- *  @author Vladimir Zykov <vz@prismtech.com>
- */
-//=============================================================================
-
-#ifndef ACE_SSL_INITIALIZER_H
-#define ACE_SSL_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "SSL_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "ace/Service_Object.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ACE_SSL_Export ACE_SSL_Initializer
-  : public ACE_Service_Object
-{
-public:
-  /// Used to force the initialization of ACE_SSL.
-  static int static_init (void);
-
-  /// Create ACE_SSL_Context singleton.
-  virtual int init (int argc, ACE_TCHAR *argv[]);
-
-  /// Do cleanup of SSL library.
-  virtual int fini (void);
-};
-
-static int ACE_Force_ACE_SSL_Initializer = ACE_SSL_Initializer::static_init ();
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE (ACE_SSL_Initializer)
-ACE_FACTORY_DECLARE (ACE_SSL, ACE_SSL_Initializer)
-
-#include /**/ "ace/post.h"
-
-#endif  /* ACE_SSL_INITIALIZER_H */
diff --git a/dep/acelite/ace/SSL/SSL_SOCK.cpp b/dep/acelite/ace/SSL/SSL_SOCK.cpp
deleted file mode 100644
index 366bec523..000000000
--- a/dep/acelite/ace/SSL/SSL_SOCK.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id: SSL_SOCK.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-
-#include "SSL_SOCK.h"
-
-#if !defined (__ACE_INLINE__)
-#include "SSL_SOCK.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/OS_NS_errno.h"
-#include "ace/os_include/os_signal.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_SSL_SOCK::ACE_SSL_SOCK (void)
-{
-  ACE_TRACE ("ACE_SSL_SOCK::ACE_SSL_SOCK");
-}
-
-ACE_SSL_SOCK::~ACE_SSL_SOCK (void)
-{
-  ACE_TRACE ("ACE_SSL_SOCK::~ACE_SSL_SOCK");
-}
-
-int
-ACE_SSL_SOCK::enable (int value) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK::enable");
-
-  switch (value)
-    {
-#ifdef SIGURG
-    case SIGURG:
-    case ACE_SIGURG:
-#endif  /* SIGURG */
-    case SIGIO:
-    case ACE_SIGIO:
-    case ACE_CLOEXEC:
-      ACE_NOTSUP_RETURN (-1);
-    case ACE_NONBLOCK:
-      return ACE_IPC_SAP::enable (value);
-    default:
-      return -1;
-    }
-}
-
-int
-ACE_SSL_SOCK::disable (int value) const
-{
-  ACE_TRACE("ACE_SSL_SOCK::disable");
-  switch (value)
-    {
-#ifdef SIGURG
-    case SIGURG:
-    case ACE_SIGURG:
-#endif  /* SIGURG */
-    case SIGIO:
-    case ACE_SIGIO:
-    case ACE_CLOEXEC:
-      ACE_NOTSUP_RETURN (-1);
-    case ACE_NONBLOCK:
-      return ACE_IPC_SAP::disable (value);
-    default:
-      return -1;
-    }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/SSL/SSL_SOCK.h b/dep/acelite/ace/SSL/SSL_SOCK.h
deleted file mode 100644
index 676bad7aa..000000000
--- a/dep/acelite/ace/SSL/SSL_SOCK.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    SSL_SOCK.h
- *
- *  $Id: SSL_SOCK.h 91685 2010-09-09 09:35:14Z johnnyw $
- *
- *  @author Ossama Othman <ossama@ece.uci.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_SSL_SOCK_H
-#define ACE_SSL_SOCK_H
-
-#include /**/ "ace/pre.h"
-
-#include "SSL_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SOCK.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_SSL_SOCK
- *
- * @brief An abstract class that forms the basis for more specific
- * classes, such as "ACE_SSL_SOCK_Acceptor" and
- * "ACE_SSL_SOCK_Stream".  Do not instantiate this class.
- *
- * This class provides functions that are common to all of the
- * ACE_SSL_SOCK_* classes.  ACE_SSL_SOCK provides the ability
- * to get and set socket options, get the local and remote
- * addresses, and close the socket.
- */
-class ACE_SSL_Export ACE_SSL_SOCK : public ACE_SOCK
-{
-public:
-
-  /**
-   * Override ACE_SOCK base class implementations with these SSL
-   * specific ones.
-   */
-  //@{
-  int set_option (int level,
-                  int option,
-                  void *optval,
-                  int optlen) const;
-  int get_option (int level,
-                  int option,
-                  void *optval,
-                  int *optlen) const;
-  int enable (int value) const;
-  int disable (int value) const;
-  void set_handle (ACE_HANDLE);
-  ACE_HANDLE get_handle (void) const;
-  int control (int cmd, void *arg) const;
-  //@}
-
-protected:
-
-  /// Default constructor is private to prevent instances of this class
-  /// from being defined.
-  ACE_SSL_SOCK (void);
-
-  /// Destructor
-  /**
-   * Not a virtual destructor.  Protected destructor to prevent
-   * operator delete() from being called through a base class
-   * ACE_SSL_SOCK pointer/reference.
-   */
-  ~ACE_SSL_SOCK (void);
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "SSL_SOCK.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ACE_SSL_SOCK_H */
-
-
-
-
diff --git a/dep/acelite/ace/SSL/SSL_SOCK.inl b/dep/acelite/ace/SSL/SSL_SOCK.inl
deleted file mode 100644
index e24e12b92..000000000
--- a/dep/acelite/ace/SSL/SSL_SOCK.inl
+++ /dev/null
@@ -1,71 +0,0 @@
-// -*- C++ -*-
-//
-// $Id: SSL_SOCK.inl 80826 2008-03-04 14:51:23Z wotte $
-
-#include "ace/OS_NS_sys_socket.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE void
-ACE_SSL_SOCK::set_handle (ACE_HANDLE fd)
-{
-  this->ACE_SOCK::set_handle (fd);
-}
-
-ACE_INLINE ACE_HANDLE
-ACE_SSL_SOCK::get_handle (void) const
-{
-  // return this->ssl_ ? (ACE_HANDLE) ::SSL_get_fd (this->ssl_) : ACE_INVALID_HANDLE;
-  return this->ACE_SOCK::get_handle ();
-}
-
-
-ACE_INLINE int
-ACE_SSL_SOCK::control (int cmd, void *arg) const
-{
-  return ACE_OS::ioctl (this->get_handle (), cmd, arg);
-}
-
-ACE_INLINE int
-ACE_SSL_SOCK::set_option (int level,
-                     int option,
-                     void *optval,
-                     int optlen) const
-{
-//   switch (option)
-//     {
-//     case SO_SNDBUF:
-//       return ::BIO_set_write_buffer_size (this->io_bio_, *((int *) optval));
-//     case SO_RCVCBUF:
-//       return ::BIO_set_read_buffer_size (this->io_bio_, *((int *) optval));
-//     default:
-      return ACE_OS::setsockopt (this->get_handle (),
-                                 level,
-                                 option, (char *) optval,
-                                 optlen);
-//    }
-}
-
-// Provides access to the ACE_OS::getsockopt system call.
-
-ACE_INLINE int
-ACE_SSL_SOCK::get_option (int level,
-                     int option,
-                     void *optval,
-                     int *optlen) const
-{
-//  switch (option)
-//    {
-//     case SO_SNDBUF:
-//       return ::BIO_get_write_buffer_size (this->io_bio_, *((int *) optval));
-//     case SO_RCVCBUF:
-//       return ::BIO_get_read_buffer_size (this->io_bio_, *((int *) optval));
-//    default:
-      return ACE_OS::getsockopt (this->get_handle (),
-                                 level,
-                                 option, (char *) optval,
-                                 optlen);
-//    }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp b/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
deleted file mode 100644
index a02099bdf..000000000
--- a/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-// -*- C++ -*-
-//
-// $Id: SSL_SOCK_Acceptor.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-
-
-#include "SSL_SOCK_Acceptor.h"
-
-#include "ace/Handle_Set.h"
-#include "ace/OS_Errno.h"
-#include "ace/OS_NS_errno.h"
-#include "ace/Log_Msg.h"
-#include "ace/Time_Value.h"
-#include "ace/Countdown_Time.h"
-#include "ace/Truncate.h"
-
-#if !defined (__ACE_INLINE__)
-#include "SSL_SOCK_Acceptor.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Acceptor)
-
-ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor (void)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor");
-}
-
-
-int
-ACE_SSL_SOCK_Acceptor::ssl_accept (ACE_SSL_SOCK_Stream &new_stream,
-                                   ACE_Time_Value *timeout) const
-{
-  SSL *ssl = new_stream.ssl ();
-
-  if (SSL_is_init_finished (ssl))
-    return 0;
-
-  if (!SSL_in_accept_init (ssl))
-    ::SSL_set_accept_state (ssl);
-
-  ACE_HANDLE handle = new_stream.get_handle ();
-
-  // We're going to call SSL_accept, optionally doing ACE::select and
-  // retrying the SSL_accept, until the SSL handshake is done or
-  // it fails.
-  // To get the timeout affect, set the socket to nonblocking mode
-  // before beginning if there is a timeout specified. If the timeout
-  // is 0 (wait as long as it takes) then don't worry about the blocking
-  // status; we'll block in SSL_accept if the socket is blocking, and
-  // block in ACE::select if not.
-  int reset_blocking_mode = 0;
-  if (timeout != 0)
-    {
-      reset_blocking_mode = ACE_BIT_DISABLED (ACE::get_flags (handle),
-                                              ACE_NONBLOCK);
-          // Set the handle into non-blocking mode if it's not already
-          // in it.
-          if (reset_blocking_mode
-              && ACE::set_flags (handle,
-                                 ACE_NONBLOCK) == -1)
-            return -1;
-    }
-
-  // Take into account the time between each select() call below.
-  ACE_Countdown_Time countdown (timeout);
-
-  int status;
-  do
-    {
-      // These handle sets are used to set up for whatever SSL_accept
-      // says it wants next. They're reset on each pass around the loop.
-      ACE_Handle_Set rd_handle;
-      ACE_Handle_Set wr_handle;
-
-      status = ::SSL_accept (ssl);
-      switch (::SSL_get_error (ssl, status))
-        {
-        case SSL_ERROR_NONE:
-          status = 0;               // To tell caller about success
-          break;                    // Done
-
-        case SSL_ERROR_WANT_WRITE:
-          wr_handle.set_bit (handle);
-          status = 1;               // Wait for more activity
-          break;
-
-        case SSL_ERROR_WANT_READ:
-          rd_handle.set_bit (handle);
-          status = 1;               // Wait for more activity
-          break;
-
-        case SSL_ERROR_ZERO_RETURN:
-          // The peer has notified us that it is shutting down via
-          // the SSL "close_notify" message so we need to
-          // shutdown, too.
-          status = -1;
-          break;
-
-        case SSL_ERROR_SYSCALL:
-          // On some platforms (e.g. MS Windows) OpenSSL does not
-          // store the last error in errno so explicitly do so.
-          //
-          // Explicitly check for EWOULDBLOCK since it doesn't get
-          // converted to an SSL_ERROR_WANT_{READ,WRITE} on some
-          // platforms. If SSL_accept failed outright, though, don't
-          // bother checking more. This can happen if the socket gets
-          // closed during the handshake.
-          if (ACE_OS::set_errno_to_last_error () == EWOULDBLOCK &&
-              status == -1)
-            {
-              // Although the SSL_ERROR_WANT_READ/WRITE isn't getting
-              // set correctly, the read/write state should be valid.
-              // Use that to decide what to do.
-              status = 1;               // Wait for more activity
-              if (SSL_want_write (ssl))
-                wr_handle.set_bit (handle);
-              else if (SSL_want_read (ssl))
-                rd_handle.set_bit (handle);
-              else
-                status = -1;            // Doesn't want anything - bail out
-            }
-          else
-            status = -1;
-          break;
-
-        default:
-          ACE_SSL_Context::report_error ();
-          status = -1;
-          break;
-        }
-
-      if (status == 1)
-        {
-          // Must have at least one handle to wait for at this point.
-          ACE_ASSERT (rd_handle.num_set() == 1 || wr_handle.num_set () == 1);
-          status = ACE::select (int (handle) + 1,
-                                &rd_handle,
-                                &wr_handle,
-                                0,
-                                timeout);
-
-          (void) countdown.update ();
-
-          // 0 is timeout, so we're done.
-          // -1 is error, so we're done.
-          // Could be both handles set (same handle in both masks) so
-          // set to 1.
-          if (status >= 1)
-            status = 1;
-          else                   // Timeout or failure
-            status = -1;
-        }
-
-    } while (status == 1 && !SSL_is_init_finished (ssl));
-
-  if (reset_blocking_mode)
-    {
-      ACE_Errno_Guard eguard (errno);
-      ACE::clr_flags (handle, ACE_NONBLOCK);
-    }
-
-  return (status == -1 ? -1 : 0);
-
-}
-
-// General purpose routine for accepting new connections.
-// Since our underlying acceptor is of the plain old ACE_SOCK_Acceptor
-// variety, get the basic socket setup done with it, then take care of
-// the SSL handshake if the socket is accepted.
-int
-ACE_SSL_SOCK_Acceptor::accept (ACE_SSL_SOCK_Stream &new_stream,
-                               ACE_Addr *remote_addr,
-                               ACE_Time_Value *timeout,
-                               bool restart,
-                               bool reset_new_handle) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Acceptor::accept");
-
-  // Take into account the time to complete the basic TCP handshake
-  // and the SSL handshake.
-  ACE_Countdown_Time countdown (timeout);
-
-  ACE_SOCK_Stream temp_stream;
-  if (-1 == this->acceptor_.accept (temp_stream,
-                                    remote_addr,
-                                    timeout,
-                                    restart,
-                                    reset_new_handle))
-    return -1;
-
-  (void) countdown.update ();
-
-  new_stream.set_handle (temp_stream.get_handle ());
-  temp_stream.set_handle (ACE_INVALID_HANDLE);
-
-  if (this->ssl_accept (new_stream, timeout) == -1)
-    {
-      new_stream.close ();
-      new_stream.set_handle (ACE_INVALID_HANDLE);
-      return -1;
-    }
-
-  return 0;
-
-}
-
-int
-ACE_SSL_SOCK_Acceptor::accept (ACE_SSL_SOCK_Stream &new_stream,
-                               ACE_Accept_QoS_Params qos_params,
-                               ACE_Addr *remote_addr,
-                               ACE_Time_Value *timeout,
-                               bool restart,
-                               bool reset_new_handle) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Acceptor::accept");
-
-  // Take into account the time to complete the basic TCP handshake
-  // and the SSL handshake.
-  ACE_Countdown_Time countdown (timeout);
-
-  ACE_SOCK_Stream temp_stream;
-  if (-1 == this->acceptor_.accept (temp_stream,
-                                    qos_params,
-                                    remote_addr,
-                                    timeout,
-                                    restart,
-                                    reset_new_handle))
-    return -1;
-
-  (void) countdown.update ();
-
-  new_stream.set_handle (temp_stream.get_handle ());
-  temp_stream.set_handle (ACE_INVALID_HANDLE);
-
-  if (this->ssl_accept (new_stream, timeout) == -1)
-    {
-      new_stream.close ();
-      new_stream.set_handle (ACE_INVALID_HANDLE);
-      return -1;
-    }
-
-  return 0;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.h b/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.h
deleted file mode 100644
index 11f00651a..000000000
--- a/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    SSL_SOCK_Acceptor.h
- *
- *  $Id: SSL_SOCK_Acceptor.h 82723 2008-09-16 09:35:44Z johnnyw $
- *
- *  @author John Heitmann
- *  @author Chris Zimman
- *  @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef ACE_SSL_SOCK_ACCEPTOR_H
-#define ACE_SSL_SOCK_ACCEPTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "SSL_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "SSL_SOCK_Stream.h"
-
-#include "ace/SOCK_Acceptor.h"
-#include "ace/OS_QoS.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_SSL_SOCK_Acceptor
- *
- * @brief Defines a factory that creates new @c ACE_SSL_SOCK_Stream
- * objects passively.
- *
- * The ACE_SSL_SOCK_Acceptor has its own @c ACE_SOCK_Acceptor
- * which handles the basic socket acceptance.  This class is a
- * wrapper which adds the SSL acceptance handshake handling.
- * Since SSL is record oriented, some additional steps must be taken
- * after the basic socket acceptance to complete the SSL handshake that
- * takes place at session establishment.
- *
- * @note The user must currently ensure that only one thread services
- *       a given SSL session at any given time since some underlying
- *       SSL implementations, such as OpenSSL, are not entirely
- *       thread-safe or reentrant.
- */
-class ACE_SSL_Export ACE_SSL_SOCK_Acceptor : public ACE_SSL_SOCK
-{
-public:
-
-  /// Default constructor.
-  ACE_SSL_SOCK_Acceptor (void);
-
-  /// Default destructor.
-  ~ACE_SSL_SOCK_Acceptor (void);
-
-  /**
-   * Initiate a passive mode SSL/BSD-style acceptor socket.
-   * @param local_sap  The address that we're going to listen for
-   *                   connections on. If this is @c ACE_Addr::sap_any,
-   *                   this socket listens on an the "any" IP address
-   *                   and selects an unused port. To find out what port
-   *                   was selected, call this object's
-   *                   @c ACE_SOCK::get_local_addr(ACE_Addr&) method
-   *                   upon return.
-   */
-  ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap,
-                         int reuse_addr = 0,
-                         int protocol_family = PF_UNSPEC,
-                         int backlog = ACE_DEFAULT_BACKLOG,
-                         int protocol = 0);
-
-  /**
-   * Initiate a passive-mode QoS-enabled acceptor socket.
-   * @param local_sap  The address that we're going to listen for
-   *                   connections on. If this is @c ACE_Addr::sap_any,
-   *                   this socket listens on an the "any" IP address
-   *                   and selects an unused port. To find out what port
-   *                   was selected, call this object's
-   *                   @c ACE_SOCK::get_local_addr(ACE_Addr&) method
-   *                   upon return.
-   */
-  ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap,
-                         ACE_Protocol_Info *protocolinfo,
-                         ACE_SOCK_GROUP g,
-                         u_long flags,
-                         int reuse_addr,
-                         int protocol_family = PF_UNSPEC,
-                         int backlog = ACE_DEFAULT_BACKLOG,
-                         int protocol = 0);
-
-  /**
-   * Initiate a passive mode SSL/BSD-style acceptor socket.
-   * @param local_sap  The address that we're going to listen for
-   *                   connections on. If this is @c ACE_Addr::sap_any,
-   *                   this socket listens on an the "any" IP address
-   *                   and selects an unused port. To find out what port
-   *                   was selected, call this object's
-   *                   @c ACE_SOCK::get_local_addr(ACE_Addr&) method
-   *                   upon return.
-   *
-   * @return 0 if success; -1 for failure (errno contains error code).
-   */
-  int open (const ACE_Addr &local_sap,
-            int reuse_addr = 0,
-            int protocol_family = PF_UNSPEC,
-            int backlog = ACE_DEFAULT_BACKLOG,
-            int protocol = 0);
-
-  /// Close the listening socket.
-  int close (void);
-
-  /**
-   * @name Passive Connection "accept" Methods
-   *
-   * These are the canonical methods exposed by the Acceptor pattern.
-   */
-  //@{
-  /**
-   * Accept a new ACE_SSL_SOCK_Stream connection. On successful return,
-   * the socket has been accepted and the SSL handshake has been completed.
-   * @param new_stream  The @c ACE_SSL_SOCK_Stream object that will receive
-   *                    the new SSL socket.
-   * @param remote_addr Pointer to an @c ACE_INET_Addr object that will
-   *                    receive the address of the peer that connected.
-   * @param timeout     The maximum time to wait for the combined socket
-   *                    acceptance and handshake completion. 0 means
-   *                    block forever, a timeout of {0, 0} means poll.
-   * @param restart     1 means "restart if interrupted," that is,
-   *                    if errno == EINTR.
-   *
-   * @return 0 if success; -1 for failure (errno contains error code).
-   */
-  int accept (ACE_SSL_SOCK_Stream &new_stream,
-              ACE_Addr *remote_addr = 0,
-              ACE_Time_Value *timeout = 0,
-              bool restart = true,
-              bool reset_new_handle = false) const;
-
-  /**
-   * Accept a new ACE_SSL_SOCK_Stream connection using the RVSP QoS
-   * information in qos_params.
-   * @param new_stream  The @c ACE_SSL_SOCK_Stream object that will receive
-   *                    the new SSL socket.
-   * @param remote_addr Pointer to an @c ACE_INET_Addr object that will
-   *                    receive the address of the peer that connected.
-   * @param timeout     The maximum time to wait for the combined socket
-   *                    acceptance and handshake completion. 0 means
-   *                    block forever, a timeout of {0, 0} means poll.
-   * @param restart     1 means "restart if interrupted," that is,
-   *                    if errno == EINTR.
-   *
-   * @return 0 if success; -1 for failure (errno contains error code).
-   */
-  int accept (ACE_SSL_SOCK_Stream &new_stream,
-              ACE_Accept_QoS_Params qos_params,
-              ACE_Addr *remote_addr = 0,
-              ACE_Time_Value *timeout = 0,
-              bool restart = true,
-              bool reset_new_handle = false) const;
-  //@}
-
-  /// Meta-type info
-  //@{
-  typedef ACE_INET_Addr PEER_ADDR;
-  typedef ACE_SSL_SOCK_Stream PEER_STREAM;
-  //@}
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-protected:
-
-  /// Complete SSL passive connection establishment.
-  int ssl_accept (ACE_SSL_SOCK_Stream &new_stream,
-                  ACE_Time_Value *timeout) const;
-
-private:
-
-  /// The BSD-socket workhorse
-  ACE_SOCK_Acceptor acceptor_;
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "SSL_SOCK_Acceptor.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ACE_SSL_SOCK_ACCEPTOR_H */
diff --git a/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.inl b/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.inl
deleted file mode 100644
index d0833a309..000000000
--- a/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.inl
+++ /dev/null
@@ -1,85 +0,0 @@
-// -*- C++ -*-
-//
-// $Id: SSL_SOCK_Acceptor.inl 84619 2009-02-26 12:26:16Z johnnyw $
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (void)
-  : acceptor_ ()
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor");
-}
-
-ACE_INLINE
-ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap,
-                                              int reuse_addr,
-                                              int protocol_family,
-                                              int backlog,
-                                              int protocol)
-  : acceptor_ (local_sap,
-               reuse_addr,
-               protocol_family,
-               backlog,
-               protocol)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor");
-
-  this->set_handle (this->acceptor_.get_handle ());
-}
-
-ACE_INLINE
-ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap,
-                                              ACE_Protocol_Info *protocolinfo,
-                                              ACE_SOCK_GROUP g,
-                                              u_long flags,
-                                              int reuse_addr,
-                                              int protocol_family,
-                                              int backlog,
-                                              int protocol)
-  : acceptor_ (local_sap,
-               protocolinfo,
-               g,
-               flags,
-               reuse_addr,
-               protocol_family,
-               backlog,
-               protocol)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor");
-
-  this->set_handle (this->acceptor_.get_handle ());
-}
-
-ACE_INLINE int
-ACE_SSL_SOCK_Acceptor::open (const ACE_Addr &local_sap,
-                             int reuse_addr,
-                             int protocol_family,
-                             int backlog,
-                             int protocol)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Acceptor::open");
-  if (this->acceptor_.open (local_sap,
-                            reuse_addr,
-                            protocol_family,
-                            backlog,
-                            protocol) != 0)
-    return -1;
-  else
-    this->set_handle (this->acceptor_.get_handle ());
-
-  return 0;
-}
-
-ACE_INLINE int
-ACE_SSL_SOCK_Acceptor::close (void)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Acceptor::close ()");
-
-  int const result = this->acceptor_.close ();
-  this->set_handle (ACE_INVALID_HANDLE);
-
-  return result;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/SSL/SSL_SOCK_Connector.cpp b/dep/acelite/ace/SSL/SSL_SOCK_Connector.cpp
deleted file mode 100644
index cc19d3690..000000000
--- a/dep/acelite/ace/SSL/SSL_SOCK_Connector.cpp
+++ /dev/null
@@ -1,421 +0,0 @@
-// -*- C++ -*-
-//
-// $Id: SSL_SOCK_Connector.cpp 91813 2010-09-17 07:52:52Z johnnyw $
-
-#include "SSL_SOCK_Connector.h"
-
-#include "ace/OS_NS_errno.h"
-#include "ace/Handle_Set.h"
-#include "ace/INET_Addr.h"
-#include "ace/Log_Msg.h"
-#include "ace/Countdown_Time.h"
-#include "ace/Truncate.h"
-
-#include <openssl/err.h>
-
-#if !defined (__ACE_INLINE__)
-#include "SSL_SOCK_Connector.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Connector)
-
-ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector (void)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector");
-}
-
-int
-ACE_SSL_SOCK_Connector::ssl_connect (ACE_SSL_SOCK_Stream &new_stream,
-                                     const ACE_Time_Value *timeout)
-{
-  SSL *ssl = new_stream.ssl ();
-
-  if (SSL_is_init_finished (ssl))
-    return 0;
-
-  // Check if a connection is already pending for the given SSL
-  // structure.
-  if (!SSL_in_connect_init (ssl))
-    ::SSL_set_connect_state (ssl);
-
-  ACE_HANDLE handle = new_stream.get_handle ();
-
-  // We're going to call SSL_connect, optionally doing ACE::select and
-  // retrying the SSL_connect, until the SSL handshake is done or
-  // it fails.
-  // To get the timeout affect, set the socket to nonblocking mode
-  // before beginning if there is a timeout specified. If the timeout
-  // is 0 (wait as long as it takes) then don't worry about the blocking
-  // status; we'll block in SSL_connect if the socket is blocking, and
-  // block in ACE::select if not.
-  int reset_blocking_mode = 0;
-  if (timeout != 0)
-    {
-      reset_blocking_mode = ACE_BIT_DISABLED (ACE::get_flags (handle),
-                                              ACE_NONBLOCK);
-          // Set the handle into non-blocking mode if it's not already
-          // in it.
-          if (reset_blocking_mode
-              && ACE::set_flags (handle,
-                                 ACE_NONBLOCK) == -1)
-            return -1;
-    }
-
-  ACE_Time_Value t;
-  if (timeout != 0)
-    t = *timeout;   // Need a non-const copy.
-
-  // Take into account the time between each select() call below.
-  ACE_Countdown_Time countdown ((timeout == 0 ? 0 : &t));
-
-  int status;
-
-  do
-    {
-      // These handle sets are used to set up for whatever SSL_connect
-      // says it wants next. They're reset on each pass around the loop.
-      ACE_Handle_Set rd_handle;
-      ACE_Handle_Set wr_handle;
-
-      status = ::SSL_connect (ssl);
-      switch (::SSL_get_error (ssl, status))
-        {
-        case SSL_ERROR_NONE:
-          // Start out with non-blocking disabled on the SSL stream.
-          new_stream.disable (ACE_NONBLOCK);
-          status = 0;               // To tell caller about success
-          break;                    // Done
-
-        case SSL_ERROR_WANT_WRITE:
-          wr_handle.set_bit (handle);
-          status = 1;               // Wait for more activity
-          break;
-
-        case SSL_ERROR_WANT_READ:
-          rd_handle.set_bit (handle);
-          status = 1;               // Wait for more activity
-          break;
-
-        case SSL_ERROR_ZERO_RETURN:
-          // The peer has notified us that it is shutting down via
-          // the SSL "close_notify" message so we need to
-          // shutdown, too.
-          status = -1;
-          break;
-
-        case SSL_ERROR_SYSCALL:
-          // On some platforms (e.g. MS Windows) OpenSSL does not
-          // store the last error in errno so explicitly do so.
-          //
-          // Explicitly check for EWOULDBLOCK since it doesn't get
-          // converted to an SSL_ERROR_WANT_{READ,WRITE} on some
-          // platforms. If SSL_connect failed outright, though, don't
-          // bother checking more. This can happen if the socket gets
-          // closed during the handshake.
-          if (ACE_OS::set_errno_to_last_error () == EWOULDBLOCK &&
-              status == -1)
-            {
-              // Although the SSL_ERROR_WANT_READ/WRITE isn't getting
-              // set correctly, the read/write state should be valid.
-              // Use that to decide what to do.
-              status = 1;               // Wait for more activity
-              if (SSL_want_write (ssl))
-                {
-                  wr_handle.set_bit (handle);
-                }
-              else if (SSL_want_read (ssl))
-                {
-                  rd_handle.set_bit (handle);
-                }
-              else
-                {
-                  status = -1;            // Doesn't want anything - bail out
-                }
-            }
-          else
-            {
-              status = -1;
-            }
-
-          break;
-
-        default:
-          ACE_SSL_Context::report_error ();
-          status = -1;
-          break;
-        }
-
-      if (status == 1)
-        {
-          // Must have at least one handle to wait for at this point.
-          ACE_ASSERT (rd_handle.num_set () == 1 || wr_handle.num_set () == 1);
-
-          // Block indefinitely if timeout pointer is zero.
-          status = ACE::select (int (handle) + 1,
-                                &rd_handle,
-                                &wr_handle,
-                                0,
-                                (timeout == 0 ? 0 : &t));
-
-          (void) countdown.update ();
-
-          // 0 is timeout, so we're done.
-          // -1 is error, so we're done.
-          // Could be both handles set (same handle in both masks) so set to 1.
-          if (status >= 1)
-            {
-              status = 1;
-            }
-          else                 // Timeout or socket failure
-            {
-              status = -1;
-            }
-        }
-
-    } while (status == 1 && !SSL_is_init_finished (ssl));
-
-  if (reset_blocking_mode)
-    {
-      ACE_Errno_Guard eguard (errno);
-      ACE::clr_flags (handle, ACE_NONBLOCK);
-    }
-
-  return (status == -1 ? -1 : 0);
-}
-
-int
-ACE_SSL_SOCK_Connector::connect (ACE_SSL_SOCK_Stream &new_stream,
-                                 const ACE_Addr &remote_sap,
-                                 const ACE_Time_Value *timeout,
-                                 const ACE_Addr &local_sap,
-                                 int reuse_addr,
-                                 int flags,
-                                 int perms)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Connector::connect");
-
-  // Take into account the time to complete the basic TCP handshake
-  // and the SSL handshake.
-  ACE_Time_Value time_copy;
-  ACE_Countdown_Time countdown (&time_copy);
-  if (timeout != 0)
-    {
-      time_copy += *timeout;
-      countdown.start ();
-    }
-
-  int result =
-    this->connector_.connect (new_stream.peer (),
-                              remote_sap,
-                              timeout,
-                              local_sap,
-                              reuse_addr,
-                              flags,
-                              perms);
-
-  int error = 0;
-  if (result == -1)
-    error = errno;  // Save us some TSS accesses.
-
-  // Obtain the handle from the underlying SOCK_Stream and set it in
-  // the SSL_SOCK_Stream.  Note that the case where a connection is in
-  // progress is also handled.  In that case, the handle must also be
-  // set in the SSL_SOCK_Stream so that the correct handle is returned
-  // when performing non-blocking connect()s.
-  if (new_stream.get_handle () == ACE_INVALID_HANDLE
-      && (result == 0
-          || (result == -1 && (error == EWOULDBLOCK
-                               || error == EINPROGRESS))))
-    new_stream.set_handle (new_stream.peer ().get_handle ());
-
-  if (result == -1)
-    return result;
-
-  // If using a timeout, update the countdown timer to reflect the time
-  // spent on the connect itself, then pass the remaining time to
-  // ssl_connect to bound the time on the handshake.
-  if (timeout != 0)
-    {
-      countdown.update ();
-      timeout = &time_copy;
-    }
-
-  result = this->ssl_connect (new_stream, timeout);
-
-  if (result == -1)
-    new_stream.close ();
-
-  return result;
-}
-
-int
-ACE_SSL_SOCK_Connector::connect (ACE_SSL_SOCK_Stream &new_stream,
-                                 const ACE_Addr &remote_sap,
-                                 ACE_QoS_Params qos_params,
-                                 const ACE_Time_Value *timeout,
-                                 const ACE_Addr &local_sap,
-                                 ACE_Protocol_Info *protocolinfo,
-                                 ACE_SOCK_GROUP g,
-                                 u_long flags,
-                                 int reuse_addr,
-                                 int perms)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Connector::connect");
-
-  // Take into account the time to complete the basic TCP handshake
-  // and the SSL handshake.
-  ACE_Time_Value time_copy;
-  ACE_Countdown_Time countdown (&time_copy);
-  if (timeout != 0)
-    {
-      time_copy += *timeout;
-      countdown.start ();
-    }
-
-  int result = this->connector_.connect (new_stream.peer (),
-                                         remote_sap,
-                                         qos_params,
-                                         timeout,
-                                         local_sap,
-                                         protocolinfo,
-                                         g,
-                                         flags,
-                                         reuse_addr,
-                                         perms);
-
-  int error = 0;
-  if (result == -1)
-    error = errno;  // Save us some TSS accesses.
-
-  // Obtain the handle from the underlying SOCK_Stream and set it in
-  // the SSL_SOCK_Stream.  Note that the case where a connection is in
-  // progress is also handled.  In that case, the handle must also be
-  // set in the SSL_SOCK_Stream so that the correct handle is returned
-  // when performing non-blocking connect()s.
-  if (new_stream.get_handle () == ACE_INVALID_HANDLE
-      && (result == 0
-          || (result == -1 && (error == EWOULDBLOCK
-                               || error == EINPROGRESS))))
-    new_stream.set_handle (new_stream.peer ().get_handle ());
-
-  if (result == -1)
-    return result;
-
-  // If using a timeout, update the countdown timer to reflect the time
-  // spent on the connect itself, then pass the remaining time to
-  // ssl_connect to bound the time on the handshake.
-  if (timeout != 0)
-    {
-      countdown.update ();
-      timeout = &time_copy;
-    }
-
-  result = this->ssl_connect (new_stream, timeout);
-
-  if (result == -1)
-    new_stream.close ();
-
-  return result;
-}
-
-// Try to complete a non-blocking connection.
-
-int
-ACE_SSL_SOCK_Connector::complete (ACE_SSL_SOCK_Stream &new_stream,
-                                  ACE_Addr *remote_sap,
-                                  const ACE_Time_Value *tv)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Connector::complete");
-
-  // Take into account the time to complete the basic TCP handshake
-  // and the SSL handshake.
-  ACE_Time_Value time_copy;
-  ACE_Countdown_Time countdown (&time_copy);
-  if (tv != 0)
-    {
-      time_copy += *tv;
-      countdown.start ();
-    }
-
-  // Only attempt to complete the TCP connection if it that hasn't
-  // already been done.
-  ACE_INET_Addr raddr;
-  if (new_stream.peer ().get_remote_addr (raddr) != 0
-      && this->connector_.complete (new_stream.peer (),
-                                    remote_sap,
-                                    tv) == -1)
-    return -1;
-
-  // The handle in the SSL_SOCK_Stream should have already been set in
-  // the connect() method.
-
-  // If using a timeout, update the countdown timer to reflect the time
-  // spent on the connect itself, then pass the remaining time to
-  // ssl_connect to bound the time on the handshake.
-  if (tv != 0)
-    {
-      countdown.update ();
-      tv = &time_copy;
-    }
-
-  if (this->ssl_connect (new_stream, tv) == -1)
-    {
-      new_stream.close ();
-      return -1;
-    }
-
-  return 0;
-
-}
-
-
-ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector (
-  ACE_SSL_SOCK_Stream &new_stream,
-  const ACE_Addr &remote_sap,
-  const ACE_Time_Value *timeout,
-  const ACE_Addr &local_sap,
-  int reuse_addr,
-  int flags,
-  int perms)
-  : connector_ ()
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector");
-  this->connect (new_stream,
-                 remote_sap,
-                 timeout,
-                 local_sap,
-                 reuse_addr,
-                 flags,
-                 perms);
-}
-
-ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector (
-  ACE_SSL_SOCK_Stream &new_stream,
-  const ACE_Addr &remote_sap,
-  ACE_QoS_Params qos_params,
-  const ACE_Time_Value *timeout,
-  const ACE_Addr &local_sap,
-  ACE_Protocol_Info *protocolinfo,
-  ACE_SOCK_GROUP g,
-  u_long flags,
-  int reuse_addr,
-  int perms)
-  : connector_ ()
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector");
-
-  this->connect (new_stream,
-                 remote_sap,
-                 qos_params,
-                 timeout,
-                 local_sap,
-                 protocolinfo,
-                 g,
-                 flags,
-                 reuse_addr,
-                 perms);
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/SSL/SSL_SOCK_Connector.h b/dep/acelite/ace/SSL/SSL_SOCK_Connector.h
deleted file mode 100644
index 2641bb6f7..000000000
--- a/dep/acelite/ace/SSL/SSL_SOCK_Connector.h
+++ /dev/null
@@ -1,318 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    SSL_SOCK_Connector.h
- *
- *  $Id: SSL_SOCK_Connector.h 84816 2009-03-13 08:16:32Z johnnyw $
- *
- *  @author Ossama Othman <ossama@uci.edu>
- *  @author Carlos O'Ryan <coryan@uci.edu>
- *  @author John Heitmann
- *  @author Chris Zimman
- */
-//=============================================================================
-
-
-#ifndef ACE_SSL_SOCK_CONNECTOR_H
-#define ACE_SSL_SOCK_CONNECTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "SSL_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "SSL_SOCK_Stream.h"
-
-#include "ace/SOCK_Connector.h"
-#include "ace/OS_QoS.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_SSL_SOCK_Connector
- *
- * @brief Defines a factory that creates new <ACE_SSL_SOCK_Stream>s
- *        actively.
- *
- * The ACE_SSL_SOCK_Connector doesn't have a socket of its own,
- * i.e., it simply "borrows" the one from the ACE_SSL_SOCK_Stream
- * that's being connected.  The reason for this is that the
- * underlying socket API doesn't use a "factory" socket to connect
- * "data-mode" sockets.  Therefore, there's no need to inherit
- * ACE_SSL_SOCK_Connector from ACE_SSL_SOCK.
- *
- * Since SSL is record-oriented, some additional work is done after
- * the plain socket is connected.
- *
- * @note The user must currently ensure that only one thread services
- *       a given SSL session at any given time since some underlying
- *       SSL implementations, such as OpenSSL, are not entirely
- *       thread-safe or reentrant.
- */
-class ACE_SSL_Export ACE_SSL_SOCK_Connector
-{
-
-public:
-
-  /// Default constructor.
-  ACE_SSL_SOCK_Connector (void);
-
-  /**
-   * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream
-   * object if the connection succeeds. This method performs both the
-   * initial socket connect and the SSL handshake.
-   *
-   * @param new_stream  The @c ACE_SSL_SOCK_Stream object that will be
-   *                    connected to the peer.
-   * @param remote_sap  The address that we are trying to connect to.
-   *                    The protocol family of @c remote_sap is used for
-   *                    the connected socket. That is, if @c remote_sap
-   *                    contains an IPv6 address, a socket with family
-   *                    PF_INET6 will be used, else it will be PF_INET.
-   * @param timeout     Pointer to an @c ACE_Time_Value object with amount
-   *                    of time to wait to connect. If the pointer is 0
-   *                    then the call blocks until the connection attempt
-   *                    is complete, whether it succeeds or fails.  If
-   *                    *timeout == {0, 0} then the connection is done
-   *                    using nonblocking mode.  In this case, if the
-   *                    connection can't be made immediately, this method
-   *                    returns -1 and errno == EWOULDBLOCK.
-   *                    If *timeout > {0, 0} then this is the maximum amount
-   *                    of time to wait before timing out; if the specified
-   *                    amount of time passes before the connection is made,
-   *                    this method returns -1 and errno == ETIME. Note
-   *                    the difference between this case and when a blocking
-   *                    connect is attempted that TCP times out - in the latter
-   *                    case, errno will be ETIMEDOUT.
-   * @param local_sap   (optional) The local address to bind to.  If it's
-   *                    the default value of @c ACE_Addr::sap_any then the
-   *                    OS will choose an unused port.
-   * @param reuse_addr  (optional) If the value is 1, the local address
-   *                    (@c local_sap) is reused, even if it hasn't been
-   *                    cleaned up yet.
-   * @param flags       Ignored.
-   * @param perms       Ignored.
-   *
-   * @return            Returns 0 if the connection succeeds. If it fails,
-   *                    -1 is returned and errno contains a specific error
-   *                    code.
-   */
-  ACE_SSL_SOCK_Connector (ACE_SSL_SOCK_Stream &new_stream,
-                          const ACE_Addr &remote_sap,
-                          const ACE_Time_Value *timeout = 0,
-                          const ACE_Addr &local_sap = ACE_Addr::sap_any,
-                          int reuse_addr = 0,
-                          int flags = 0,
-                          int perms = 0);
-
-  /**
-   * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream
-   * object if the connection succeeds. This method performs both the
-   * initial socket connect and the SSL handshake.
-   *
-   * @param new_stream  The @c ACE_SSL_SOCK_Stream object that will be
-   *                    connected to the peer.
-   * @param remote_sap  The address that we are trying to connect to.
-   *                    The protocol family of @c remote_sap is used for
-   *                    the connected socket. That is, if @c remote_sap
-   *                    contains an IPv6 address, a socket with family
-   *                    PF_INET6 will be used, else it will be PF_INET.
-   * @param qos_params  Contains QoS parameters that are passed to the
-   *                    IntServ (RSVP) and DiffServ protocols.
-   *                    @see ACE_QoS_Params.
-   * @param timeout     Pointer to an @c ACE_Time_Value object with amount
-   *                    of time to wait to connect. If the pointer is 0
-   *                    then the call blocks until the connection attempt
-   *                    is complete, whether it succeeds or fails.  If
-   *                    *timeout == {0, 0} then the connection is done
-   *                    using nonblocking mode.  In this case, if the
-   *                    connection can't be made immediately, this method
-   *                    returns -1 and errno == EWOULDBLOCK.
-   *                    If *timeout > {0, 0} then this is the maximum amount
-   *                    of time to wait before timing out; if the specified
-   *                    amount of time passes before the connection is made,
-   *                    this method returns -1 and errno == ETIME. Note
-   *                    the difference between this case and when a blocking
-   *                    connect is attempted that TCP times out - in the latter
-   *                    case, errno will be ETIMEDOUT.
-   * @param local_sap   (optional) The local address to bind to.  If it's
-   *                    the default value of @c ACE_Addr::sap_any then the
-   *                    OS will choose an unused port.
-   * @param reuse_addr  (optional) If the value is 1, the local address
-   *                    (@c local_sap) is reused, even if it hasn't been
-   *                    cleaned up yet.
-   * @param flags       Ignored.
-   * @param perms       Ignored.
-   *
-   * @return            Returns 0 if the connection succeeds. If it fails,
-   *                    -1 is returned and errno contains a specific error
-   *                    code.
-   */
-  ACE_SSL_SOCK_Connector (ACE_SSL_SOCK_Stream &new_stream,
-                          const ACE_Addr &remote_sap,
-                          ACE_QoS_Params qos_params,
-                          const ACE_Time_Value *timeout = 0,
-                          const ACE_Addr &local_sap = ACE_Addr::sap_any,
-                          ACE_Protocol_Info *protocolinfo = 0,
-                          ACE_SOCK_GROUP g = 0,
-                          u_long flags = 0,
-                          int reuse_addr = 0,
-                          int perms = 0);
-
-  /// Default dtor.
-  ~ACE_SSL_SOCK_Connector (void);
-
-  /**
-   * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream
-   * object if the connection succeeds. This method performs both the
-   * initial socket connect and the SSL handshake.
-   *
-   * @param new_stream  The @c ACE_SSL_SOCK_Stream object that will be
-   *                    connected to the peer.
-   * @param remote_sap  The address that we are trying to connect to.
-   *                    The protocol family of @c remote_sap is used for
-   *                    the connected socket. That is, if @c remote_sap
-   *                    contains an IPv6 address, a socket with family
-   *                    PF_INET6 will be used, else it will be PF_INET.
-   * @param timeout     Pointer to an @c ACE_Time_Value object with amount
-   *                    of time to wait to connect. If the pointer is 0
-   *                    then the call blocks until the connection attempt
-   *                    is complete, whether it succeeds or fails.  If
-   *                    *timeout == {0, 0} then the connection is done
-   *                    using nonblocking mode.  In this case, if the
-   *                    connection can't be made immediately, this method
-   *                    returns -1 and errno == EWOULDBLOCK.
-   *                    If *timeout > {0, 0} then this is the maximum amount
-   *                    of time to wait before timing out; if the specified
-   *                    amount of time passes before the connection is made,
-   *                    this method returns -1 and errno == ETIME. Note
-   *                    the difference between this case and when a blocking
-   *                    connect is attempted that TCP times out - in the latter
-   *                    case, errno will be ETIMEDOUT.
-   * @param local_sap   (optional) The local address to bind to.  If it's
-   *                    the default value of @c ACE_Addr::sap_any then the
-   *                    OS will choose an unused port.
-   * @param reuse_addr  (optional) If the value is 1, the local address
-   *                    (@c local_sap) is reused, even if it hasn't been
-   *                    cleaned up yet.
-   * @param flags       Ignored.
-   * @param perms       Ignored.
-   *
-   * @return            Returns 0 if the connection succeeds. If it fails,
-   *                    -1 is returned and errno contains a specific error
-   *                    code.
-   */
-  int connect (ACE_SSL_SOCK_Stream &new_stream,
-               const ACE_Addr &remote_sap,
-               const ACE_Time_Value *timeout = 0,
-               const ACE_Addr &local_sap = ACE_Addr::sap_any,
-               int reuse_addr = 0,
-               int flags = 0,
-               int perms = 0);
-
-  /**
-   * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream
-   * object if the connection succeeds. This method performs both the
-   * initial socket connect and the SSL handshake.
-   *
-   * @param new_stream  The @c ACE_SSL_SOCK_Stream object that will be
-   *                    connected to the peer.
-   * @param remote_sap  The address that we are trying to connect to.
-   *                    The protocol family of @c remote_sap is used for
-   *                    the connected socket. That is, if @c remote_sap
-   *                    contains an IPv6 address, a socket with family
-   *                    PF_INET6 will be used, else it will be PF_INET.
-   * @param qos_params  Contains QoS parameters that are passed to the
-   *                    IntServ (RSVP) and DiffServ protocols.
-   *                    @see ACE_QoS_Params.
-   * @param timeout     Pointer to an @c ACE_Time_Value object with amount
-   *                    of time to wait to connect. If the pointer is 0
-   *                    then the call blocks until the connection attempt
-   *                    is complete, whether it succeeds or fails.  If
-   *                    *timeout == {0, 0} then the connection is done
-   *                    using nonblocking mode.  In this case, if the
-   *                    connection can't be made immediately, this method
-   *                    returns -1 and errno == EWOULDBLOCK.
-   *                    If *timeout > {0, 0} then this is the maximum amount
-   *                    of time to wait before timing out; if the specified
-   *                    amount of time passes before the connection is made,
-   *                    this method returns -1 and errno == ETIME. Note
-   *                    the difference between this case and when a blocking
-   *                    connect is attempted that TCP times out - in the latter
-   *                    case, errno will be ETIMEDOUT.
-   * @param local_sap   (optional) The local address to bind to.  If it's
-   *                    the default value of @c ACE_Addr::sap_any then the
-   *                    OS will choose an unused port.
-   * @param reuse_addr  (optional) If the value is 1, the local address
-   *                    (@c local_sap) is reused, even if it hasn't been
-   *                    cleaned up yet.
-   * @param flags       Ignored.
-   * @param perms       Ignored.
-   *
-   * @return            Returns 0 if the connection succeeds. If it fails,
-   *                    -1 is returned and errno contains a specific error
-   *                    code.
-   */
-  int connect (ACE_SSL_SOCK_Stream &new_stream,
-               const ACE_Addr &remote_sap,
-               ACE_QoS_Params qos_params,
-               const ACE_Time_Value *timeout = 0,
-               const ACE_Addr &local_sap = ACE_Addr::sap_any,
-               ACE_Protocol_Info *protocolinfo = 0,
-               ACE_SOCK_GROUP g = 0,
-               u_long flags = 0,
-               int reuse_addr = 0,
-               int perms = 0);
-
-  /**
-   * Try to complete a non-blocking connection.
-   * If connection completion is successful then <new_stream> contains
-   * the connected ACE_SSL_SOCK_Stream.  If <remote_sap> is non-NULL
-   * then it will contain the address of the connected peer.
-   */
-  int complete (ACE_SSL_SOCK_Stream &new_stream,
-                ACE_Addr *remote_sap = 0,
-                const ACE_Time_Value *timeout = 0);
-
-  /// Resets any event associations on this handle
-  bool reset_new_handle (ACE_HANDLE handle);
-
-  /// Meta-type info
-  //@{
-  typedef ACE_INET_Addr PEER_ADDR;
-  typedef ACE_SSL_SOCK_Stream PEER_STREAM;
-  //@}
-
-  /// Dump the state of an object.
-  void dump (void) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-protected:
-
-  /// Complete non-blocking SSL active connection.
-  int ssl_connect (ACE_SSL_SOCK_Stream &new_stream,
-                   const ACE_Time_Value *timeout);
-
-private:
-
-  /// The class that does all of the non-secure socket connection.
-  /// It is default contructed, and subsequently used by connect().
-  ACE_SOCK_Connector connector_;
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "SSL_SOCK_Connector.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ACE_SSL_SOCK_CONNECTOR_H */
diff --git a/dep/acelite/ace/SSL/SSL_SOCK_Connector.inl b/dep/acelite/ace/SSL/SSL_SOCK_Connector.inl
deleted file mode 100644
index b2be51dd1..000000000
--- a/dep/acelite/ace/SSL/SSL_SOCK_Connector.inl
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id: SSL_SOCK_Connector.inl 82728 2008-09-16 10:22:28Z johnnyw $
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector (void)
-  : connector_ ()
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector");
-}
-
-ACE_INLINE bool
-ACE_SSL_SOCK_Connector::reset_new_handle (ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Connector::reset_new_handle");
-  return this->connector_.reset_new_handle (handle);
-}
-
-ACE_INLINE void
-ACE_SSL_SOCK_Connector::dump (void) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Connector::dump");
-  this->connector_.dump ();
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/SSL/SSL_SOCK_Stream.cpp b/dep/acelite/ace/SSL/SSL_SOCK_Stream.cpp
deleted file mode 100644
index 6e636124e..000000000
--- a/dep/acelite/ace/SSL/SSL_SOCK_Stream.cpp
+++ /dev/null
@@ -1,626 +0,0 @@
-// $Id: SSL_SOCK_Stream.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-
-#include "ace/Handle_Set.h"
-#include "ace/Log_Msg.h"
-#include "ace/Countdown_Time.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_sys_select.h"
-#include "ace/OS_Memory.h"
-
-#include <openssl/err.h>
-
-#include "SSL_SOCK_Stream.h"
-
-#if !defined (__ACE_INLINE__)
-#include "SSL_SOCK_Stream.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Stream)
-
-ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context)
-  : ssl_ (0),
-    stream_ ()
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream");
-
-  ACE_SSL_Context * ctx =
-    (context == 0 ? ACE_SSL_Context::instance () : context);
-
-  this->ssl_ = ::SSL_new (ctx->context ());
-
-  if (this->ssl_ == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) ACE_SSL_SOCK_Stream "
-                  "- cannot allocate new SSL structure %p\n",
-                  ACE_TEXT ("")));
-    }
-}
-
-ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream (void)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream");
-
-  ::SSL_free (this->ssl_);
-
-  // @@ Question: should we reference count the Context object or
-  // leave that to the application developer? We do not reference
-  // count reactors (for example) and following some simple rules
-  // seems to work fine!
-}
-
-ssize_t
-ACE_SSL_SOCK_Stream::sendv (const iovec iov[],
-                            size_t n,
-                            const ACE_Time_Value *max_wait_time) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::sendv");
-
-  // There is subtle problem in this method that occurs when using
-  // non-blocking IO.  The semantics of a non-blocking scatter write
-  // (sendv()) are not possible to retain with the emulation in this
-  // method.
-
-  ssize_t bytes_sent = 0;
-
-  ACE_Time_Value t;
-  ACE_Time_Value *timeout = const_cast<ACE_Time_Value *> (max_wait_time);
-
-  if (max_wait_time != 0)
-    {
-      // Make a copy since ACE_Countdown_Time modifies the
-      // ACE_Time_Value.
-      t = *max_wait_time;
-      timeout = &t;
-    }
-
-  // Take into account the time between each send.
-  ACE_Countdown_Time countdown (timeout);
-
-  for (size_t i = 0; i < n; ++i)
-    {
-      ssize_t const result = this->send (iov[i].iov_base,
-                                         iov[i].iov_len,
-                                         timeout);
-
-      if (result == -1)
-        {
-          // There is a subtle difference in behaviour depending on
-          // whether or not any data was sent.  If no data was sent,
-          // then always return -1.  Otherwise return bytes_sent.
-          // This gives the caller an opportunity to keep track of
-          if (bytes_sent > 0)
-            break;
-          else
-            return -1;
-        }
-      else
-        {
-          bytes_sent += result;
-
-          // Do not continue on to the next loop iteration if the
-          // amount of data sent was less than the amount data given.
-          // This avoids a subtle problem where "holes" in the data
-          // stream would occur if partial sends of a given buffer in
-          // the iovec array occured.
-          if (static_cast<size_t> (result) < static_cast<size_t> (iov[i].iov_len))
-            break;
-        }
-
-      (void) countdown.update ();
-    }
-
-  return bytes_sent;
-}
-
-ssize_t
-ACE_SSL_SOCK_Stream::recvv (iovec *io_vec,
-                            const ACE_Time_Value *timeout) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::recvv");
-
-  // From ACE_SOCK_IO::recvv().
-#if defined (FIONREAD)
-  ACE_Handle_Set handle_set;
-  handle_set.reset ();
-  handle_set.set_bit (this->get_handle ());
-
-  io_vec->iov_base = 0;
-
-  // Check the status of the current socket.
-  switch (
-    ACE_OS::select (int (this->get_handle ()) + 1,
-                    handle_set,
-                    0,
-                    0,
-                    timeout))
-    {
-    case -1:
-      return -1;
-      /* NOTREACHED */
-    case 0:
-      errno = ETIME;
-      return -1;
-      /* NOTREACHED */
-    default:
-      // Goes fine, fallthrough to get data
-      break;
-    }
-
-  int inlen;
-
-  if (ACE_OS::ioctl (this->get_handle (),
-                     FIONREAD,
-                     &inlen) == -1)
-    return -1;
-  else if (inlen > 0)
-    {
-      ACE_NEW_RETURN (io_vec->iov_base,
-                      char[inlen],
-                      -1);
-      io_vec->iov_len = this->recv (io_vec->iov_base,
-                                    inlen);
-      return io_vec->iov_len;
-    }
-  else
-    return 0;
-#else
-  ACE_UNUSED_ARG (io_vec);
-  ACE_UNUSED_ARG (timeout);
-  ACE_NOTSUP_RETURN (-1);
-#endif /* FIONREAD */
-}
-
-ssize_t
-ACE_SSL_SOCK_Stream::send (const void *buf,
-                           size_t len,
-                           int flags,
-                           const ACE_Time_Value *timeout) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::send");
-
-  // If SSL has data in the buffer, i.e. SSL_pending() returns a
-  // non-zero value, then don't block on select().
-  if (timeout == 0 || ::SSL_pending (this->ssl_))
-    return this->send (buf, len, flags);
-
-  int val = 0;
-  if (ACE::enter_send_timedwait (this->get_handle (),
-                                 timeout,
-                                 val) == -1)
-    return -1;
-
-  ssize_t const bytes_transferred = this->send (buf, len, flags);
-
-  ACE::restore_non_blocking_mode (this->get_handle (), val);
-
-  return bytes_transferred;
-}
-
-ssize_t
-ACE_SSL_SOCK_Stream::recv (void *buf,
-                           size_t n,
-                           int flags,
-                           const ACE_Time_Value *timeout) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::recv");
-
-  return this->recv_i (buf, n, flags, timeout);
-}
-
-
-ssize_t
-ACE_SSL_SOCK_Stream::send (size_t n, ...) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::send");
-
-  size_t const total_tuples = n / 2;
-
-  va_list argp;
-  va_start (argp, n);
-
-  ssize_t bytes_sent = 0;
-
-  // NOTE: This method used to fill an IO vector (e.g. iovec) and then
-  //       send it using a scatter write (sendv()).  However, it is
-  //       not possible to emulate a non-blocking scatter write over
-  //       SSL.  As such, there is no point in attempting to use
-  //       scatter writes over SSL.
-  for (size_t i = 0; i < total_tuples; ++i)
-    {
-      ssize_t const data_len = va_arg (argp, ssize_t);
-      ssize_t const result = this->send (va_arg (argp, char *), data_len);
-
-      if (result == -1)
-        {
-          // There is a subtle difference in behaviour depending on
-          // whether or not any data was sent.  If no data was sent,
-          // then always return -1.  Otherwise return bytes_sent.
-          // This gives the caller an opportunity to keep track of
-          // which data was actually sent.
-          if (bytes_sent > 0)
-            break;
-          else
-            {
-              va_end (argp);
-              return -1;
-            }
-        }
-      else
-        {
-          bytes_sent += result;
-
-          // Do not continue on to the next loop iteration if the
-          // amount of data sent was less than the amount of data
-          // given.  This avoids a subtle problem where "holes" in the
-          // data stream would occur if partial sends of a given
-          // buffer in the varargs occured.
-          if (result < data_len)
-            break;
-
-        }
-    }
-
-  va_end (argp);
-
-  return bytes_sent;
-}
-
-ssize_t
-ACE_SSL_SOCK_Stream::recv (size_t n, ...) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::recv");
-
-  size_t const total_tuples = n / 2;
-
-  va_list argp;
-  va_start (argp, n);
-
-  ssize_t bytes_recv = 0;
-
-  for (size_t i = 0; i < total_tuples; ++i)
-    {
-      ssize_t const data_len = va_arg (argp, ssize_t);
-      ssize_t const result = this->recv (va_arg (argp, char *), data_len);
-
-      if (result == -1)
-        {
-          // There is a subtle difference in behaviour depending on
-          // whether or not any data was received.  If no data was
-          // received, then always return -1.  Otherwise return
-          // bytes_received.  This gives the caller an opportunity to
-          // keep track of which data was actually received.
-          if (bytes_recv > 0)
-            {
-              break;
-            }
-          else
-            {
-              va_end (argp);
-              return -1;
-            }
-        }
-      else
-        {
-          bytes_recv += result;
-
-          // Do not continue on to the next loop iteration if the
-          // amount of data received was less than the amount of data
-          // desired.  This avoids a subtle problem where "holes" in
-          // the data stream would occur if partial receives of a
-          // given buffer in the varargs occured.
-          if (result < data_len)
-            {
-              break;
-            }
-        }
-    }
-
-  va_end (argp);
-
-  return bytes_recv;
-}
-
-ssize_t
-ACE_SSL_SOCK_Stream::send_n (const void *buf,
-                             size_t len,
-                             int flags,
-                             const ACE_Time_Value *timeout,
-                             size_t *bt) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::send_n");
-
-  // No support for send flags in SSL.
-  if (flags != 0)
-    {
-      ACE_NOTSUP_RETURN (-1);
-    }
-
-  /* This code mimics ACE::send_n */
-  // Total number of bytes written.
-  size_t temp = 0;
-  size_t &bytes_transferred = ((bt == 0) ? temp : *bt);
-
-  // Actual number of bytes written in each <send> attempt
-  ssize_t n = 0;
-
-  for (bytes_transferred = 0;
-       bytes_transferred < len;
-       bytes_transferred += n)
-    {
-      n = this->send ((const char*) buf + bytes_transferred,
-                      len - bytes_transferred,
-                      flags,
-                      timeout);
-
-      if (n < 0)
-        {
-          if (errno == EWOULDBLOCK)
-            {
-              // If blocked, try again.
-              n = 0;
-              continue;
-            }
-          else
-            {
-              return -1;
-            }
-        }
-      else if (n == 0)
-        {
-          break;
-        }
-    }
-
-  return ACE_Utils::truncate_cast<ssize_t> (bytes_transferred);
-}
-
-ssize_t
-ACE_SSL_SOCK_Stream::recv_n (void *buf,
-                             size_t len,
-                             int flags,
-                             const ACE_Time_Value *timeout,
-                             size_t *bt) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_n");
-
-  if (flags != 0)
-    {
-      if ((flags | MSG_PEEK) != MSG_PEEK)
-        {
-          ACE_NOTSUP_RETURN (-1);
-        }
-    }
-
-  size_t temp = 0;
-  size_t &bytes_transferred = ((bt == 0) ? temp : *bt);
-
-  ssize_t n = 0;
-
-  for (bytes_transferred = 0;
-       bytes_transferred < len;
-       bytes_transferred += n)
-    {
-      n = this->recv ((char*) buf + bytes_transferred,
-                      len - bytes_transferred,
-                      flags,
-                      timeout);
-
-      if (n < 0)
-        {
-          if (errno == EWOULDBLOCK)
-            {
-              // If blocked, try again.
-              n = 0;
-              continue;
-            }
-          else
-            {
-              return -1;
-            }
-        }
-      else if (n == 0)
-        {
-          break;
-        }
-    }
-
-  return ACE_Utils::truncate_cast<ssize_t> (bytes_transferred);
-}
-
-ssize_t
-ACE_SSL_SOCK_Stream::recv_n (void *buf, int len, int flags) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_n");
-
-  if (flags != 0)
-    {
-      if ((flags | MSG_PEEK) != MSG_PEEK)
-        {
-          ACE_NOTSUP_RETURN (-1);
-        }
-    }
-
-  ssize_t bytes_transferred = 0;
-  ssize_t n = 0;
-
-  for (bytes_transferred = 0;
-       bytes_transferred < len;
-       bytes_transferred += n)
-    {
-      n = this->recv ((char*) buf + bytes_transferred,
-                      len - bytes_transferred,
-                      flags);
-
-      if (n < 0)
-        {
-          if (errno == EWOULDBLOCK)
-            {
-              // If blocked, try again.
-              n = 0;
-              continue;
-            }
-          else
-            {
-              return -1;
-            }
-        }
-      else if (n == 0)
-        {
-          break;
-        }
-    }
-
-  return ACE_Utils::truncate_cast<ssize_t> (bytes_transferred);
-}
-
-ssize_t
-ACE_SSL_SOCK_Stream::send_n (const void *buf, int len, int flags) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::send_n");
-
-  // Send flags are unsupported in SSL
-  if (flags != 0)
-    {
-      ACE_NOTSUP_RETURN (-1);
-    }
-
-  /*  The following code mimics <ACE::send_n> */
-  size_t bytes_transferred = 0;
-  ssize_t n = 0;
-
-  for (bytes_transferred = 0;
-       bytes_transferred < (size_t) len;
-       bytes_transferred += n)
-    {
-      n = this->send ((const char*) buf + bytes_transferred,
-                      len - bytes_transferred,
-                      flags);
-
-      if (n < 0)
-        {
-          if (errno == EWOULDBLOCK)
-            {
-              // If blocked, try again.
-              n = 0;
-              continue;
-            }
-          else
-            {
-              return -1;
-            }
-        }
-      else if (n == 0)
-        {
-          break;
-        }
-    }
-
-  return ACE_Utils::truncate_cast<ssize_t> (bytes_transferred);
-}
-
-ssize_t
-ACE_SSL_SOCK_Stream::sendv_n (const iovec iov[], size_t iovcnt) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::sendv_n");
-
-  ssize_t bytes_sent = 0;
-
-  for (size_t i = 0; i < iovcnt; ++i)
-    {
-      ssize_t result = this->send_n (iov[i].iov_base,
-                                     iov[i].iov_len);
-
-
-      if (result == -1)
-        {
-          // There is a subtle difference in behaviour depending on
-          // whether or not any data was sent.  If no data was sent,
-          // then always return -1.  Otherwise return bytes_sent.
-          // This gives the caller an opportunity to keep track of
-          // which data was actually sent.
-          if (bytes_sent > 0)
-            {
-              break;
-            }
-          else
-            {
-              return -1;
-            }
-        }
-      else
-        {
-          bytes_sent += result;
-        }
-    }
-
-  return bytes_sent;
-}
-
-ssize_t
-ACE_SSL_SOCK_Stream::recvv_n (iovec iov[], size_t iovcnt) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::recvv_n");
-
-  ssize_t bytes_read = 0;
-
-  for (size_t i = 0; i < iovcnt; ++i)
-    {
-      ssize_t const result = this->recv_n (iov[i].iov_base,
-                                           iov[i].iov_len);
-
-      if (result == -1)
-        {
-          // There is a subtle difference in behaviour depending on
-          // whether or not any data was read.  If no data was read,
-          // then always return -1.  Otherwise return bytes_read.
-          // This gives the caller an opportunity to keep track of
-          // which data was actually read.
-          if (bytes_read > 0)
-            {
-              break;
-            }
-          else
-            {
-              return -1;
-            }
-        }
-      else
-        {
-          bytes_read += result;
-        }
-    }
-
-  return bytes_read;
-}
-
-int
-ACE_SSL_SOCK_Stream::get_remote_addr (ACE_Addr &addr) const
-{
-  // Some applications use get_remote_addr() as a way of determining
-  // whether or not a connection has been established.  In SSL's case,
-  // the remote addr will be available once the TCP handshake has been
-  // complete.  Despite that fact, the SSL connection may not have
-  // been completed.  In such a case, a successful return from
-  // get_remote_addr() would be misleading.
-
-  if (SSL_is_init_finished (this->ssl_))
-    {
-      return this->ACE_SSL_SOCK::get_remote_addr (addr);
-    }
-
-  if (this->get_handle () == ACE_INVALID_HANDLE)
-    {
-      errno = EBADF;
-    }
-  else
-    {
-      errno = ENOTCONN;
-    }
-
-  return -1;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/SSL/SSL_SOCK_Stream.h b/dep/acelite/ace/SSL/SSL_SOCK_Stream.h
deleted file mode 100644
index 0ce31989b..000000000
--- a/dep/acelite/ace/SSL/SSL_SOCK_Stream.h
+++ /dev/null
@@ -1,348 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    SSL_SOCK_Stream.h
- *
- *  $Id: SSL_SOCK_Stream.h 91743 2010-09-13 18:24:51Z johnnyw $
- *
- *  @author Ossama Othman <ossama@uci.edu>
- *  @author Carlos O'Ryan <coryan@uci.edu>
- *  @author John Heitmann
- */
-//=============================================================================
-
-
-#ifndef ACE_SSL_SOCK_STREAM_H
-#define ACE_SSL_SOCK_STREAM_H
-
-#include /**/ "ace/pre.h"
-
-#include "SSL_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// This must be included before any <openssl> include on LynxOS
-#include "ace/os_include/os_stdio.h"
-
-#include <openssl/err.h>
-
-#include "SSL_SOCK.h"
-#include "SSL_Context.h"
-
-#include "ace/SOCK_Stream.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_SSL_SOCK_Stream
- *
- * @brief Defines methods in the ACE_SSL_SOCK_Stream abstraction.
- *
- * This class encapsulates the methods and functionality necessary to
- * send and receive data over TLS/SSL.
- * @par
- * Since SSL is record-oriented, some additional steps must be taken
- * to make the ACE_SSL_SOCK_Stream interact properly with the
- * Reactor (if one is used) when performing non-blocking IO.  In
- * particular, if ::SSL_pending (ssl), where "ssl" is a pointer to the
- * SSL data structure returned from ACE_SSL_SOCK_Stream::ssl(),
- * returns a non-zero value then the event handler that calls the IO
- * methods in this class should return a value greater than zero to
- * force the Reactor to invoke the event handler before polling for
- * additional events (e.g. blocking on select()).
- *
- * @note The user must currently ensure that only one thread services
- *       a given SSL session at any given time since underlying SSL
- *       implementations, such as OpenSSL, are not entirely
- *       thread-safe or reentrant.
- */
-class ACE_SSL_Export ACE_SSL_SOCK_Stream : public ACE_SSL_SOCK
-{
-public:
-
-  /// Constructor
-  /**
-   * @param context Pointer to @c ACE_SSL_Context instance containing
-   *                the OpenSSL @c SSL data structure to be associated
-   *                with this @c ACE_SSL_SOCK_Stream.  The @c SSL data
-   *                structure will be copied to make it at least
-   *                logically independent of the supplied @a context.
-   */
-  ACE_SSL_SOCK_Stream (ACE_SSL_Context *context =
-                       ACE_SSL_Context::instance ());
-
-  /// Destructor
-  ~ACE_SSL_SOCK_Stream (void);
-
-  /// Send an n byte buffer to the ssl socket using the semantics of
-  /// send(3n).
-  /**
-   * ACE_SSL supports no flags for sending at this time.
-   */
-  ssize_t send (const void *buf,
-                size_t n,
-                int flags) const;
-
-  /// Recv an n byte buffer from the ssl socket using the semantics of
-  /// recv(3n).
-  /**
-   * ACE_SSL supports MSG_PEEK, but no other flags at this time.
-   */
-  ssize_t recv (void *buf,
-                size_t n,
-                int flags) const;
-
-  /// Send an n byte buffer to the ssl socket using the semantics of
-  /// write(2).
-  ssize_t send (const void *buf,
-                size_t n) const;
-
-  /// Recv an n byte buffer from the ssl socket using the semantics of
-  /// read(2).
-  ssize_t recv (void *buf,
-                size_t n) const;
-
-  /// Send an iovec of size n to the ssl socket.
-  /**
-   * Note that it is not possible to perform a "scattered" write with
-   * the underlying OpenSSL implementation.  As such, the expected
-   * semantics are not fully reproduced with this implementation.
-   */
-  ssize_t sendv (const iovec iov[],
-                 size_t n,
-                 const ACE_Time_Value *timeout = 0) const;
-
-  /**
-   * Allows a client to read from a socket without having to provide a
-   * buffer to read.  This method determines how much data is in the
-   * socket, allocates a buffer of this size, reads in the data, and
-   * returns the number of bytes read.  The caller is responsible for
-   * deleting the member in the iov_base field of io_vec using
-   * delete [] io_vec->iov_base.
-   */
-  ssize_t recvv (iovec *io_vec,
-                 const ACE_Time_Value *timeout = 0) const;
-
-  /**
-   * Wait to timeout amount of time to send up to n bytes into buf
-   * (uses the send() call).  If send() times out -1 is returned with
-   * errno == ETIME.  If it succeeds the number of bytes sent is
-   * returned. No flags are supported.
-   */
-  ssize_t send (const void *buf,
-                size_t n,
-                int flags,
-                const ACE_Time_Value *timeout) const;
-
-  /**
-   * Wait up to timeout amount of time to receive up to n bytes into
-   * buf (uses the recv() call).  If recv() times out -1 is returned
-   * with errno == ETIME.  If it succeeds the number of bytes received
-   * is returned.  MSG_PEEK is the only supported flag.
-   */
-  ssize_t recv (void *buf,
-                size_t n,
-                int flags,
-                const ACE_Time_Value *timeout) const;
-
-  /**
-   * Wait to to timeout amount of time to send up to n bytes into
-   * buf (uses the send() call).  If send() times out
-   * a -1 is returned with errno == ETIME.  If it succeeds the
-   * number of bytes sent is returned.
-   */
-  ssize_t send (const void *buf,
-                size_t n,
-                const ACE_Time_Value *timeout) const;
-
-  /**
-   * Wait up to timeout amount of time to receive up to n bytes
-   * into buf (uses the recv() call).  If recv() times
-   * out a -1 is returned with @c errno == ETIME.  If it succeeds the
-   * number of bytes received is returned.
-   */
-  ssize_t recv (void *buf,
-                size_t n,
-                const ACE_Time_Value *timeout) const;
-
-  /// Send n varargs messages to the connected ssl socket.
-  ssize_t send (size_t n,
-                ...) const;
-
-  /// Recv n varargs messages to the connected ssl socket.
-  ssize_t recv (size_t n,
-                ...) const;
-
-  /// Send n bytes, keep trying until n are sent.
-  ssize_t send_n (const void *buf, int n) const;
-
-  /// Recv n bytes, keep trying until n are received.
-  ssize_t recv_n (void *buf, int n) const;
-
-  /**
-   * @note In the following four methods, only MSG_PEEK is supported
-   * for recv_n(), and no flags are supported for send_n().
-   */
-  //@{
-  /// Send n bytes, keep trying until n are sent.
-  ssize_t send_n (const void *buf, int n, int flags) const;
-
-  /// Recv n bytes, keep trying until n are sent.
-  ssize_t recv_n (void *buf, int n, int flags) const;
-
-  /**
-   * Try to send exactly len bytes into buf (uses the send() call).
-   * If send() blocks for longer than timeout the number of bytes
-   * actually sent is returned with errno == ETIME.  If a timeout does
-   * not occur, send_n() return len (i.e., the number of bytes
-   * requested to be sent).
-   */
-  ssize_t send_n (const void *buf,
-                  size_t len,
-                  int flags,
-                  const ACE_Time_Value *timeout,
-                  size_t *bytes_transferred = 0) const;
-
-  /**
-   * Try to send exactly len bytes into buf (uses the send() call).
-   * If send() blocks for longer than timeout the number of bytes
-   * actually sent is returned with errno == ETIME.  If a timeout does
-   * not occur, send_n() return len (i.e., the number of bytes
-   * requested to be sent).
-   */
-  ssize_t send_n (const void *buf,
-                  size_t len,
-                  const ACE_Time_Value *timeout,
-                  size_t *bytes_transferred = 0) const;
-
-  /**
-   * Try to receive exactly len bytes into buf (uses the recv() call).
-   * The ACE_Time_Value indicates how long to blocking trying to
-   * receive.  If timeout == 0, the caller will block until action is
-   * possible, else will wait until the relative time specified in
-   * timeout elapses).  If recv() blocks for longer than timeout the
-   * number of bytes actually read is returned with errno == ETIME.
-   * If a timeout does not occur, recv_n return len (i.e., the number
-   * of bytes requested to be read).
-   */
-  ssize_t recv_n (void *buf,
-                  size_t len,
-                  int flags,
-                  const ACE_Time_Value *timeout,
-                  size_t *bytes_transferred = 0) const;
-
-  /**
-   * Try to receive exactly len bytes into buf (uses the recv() call).
-   * The ACE_Time_Value indicates how long to blocking trying to
-   * receive.  If timeout == 0, the caller will block until action is
-   * possible, else will wait until the relative time specified in
-   * timeout elapses).  If recv() blocks for longer than timeout the
-   * number of bytes actually read is returned with errno == ETIME.
-   * If a timeout does not occur, recv_n return len (i.e., the number
-   * of bytes requested to be read).
-   */
-  ssize_t recv_n (void *buf,
-                  size_t len,
-                  const ACE_Time_Value *timeout,
-                  size_t *bytes_transferred = 0) const;
-  //@}
-
-  /**
-   * Send an iovec of size n to the connected socket.  Will block
-   * until all bytes are sent or an error occurs.
-   */
-  ssize_t sendv_n (const iovec iov[],
-                   size_t n) const;
-
-  /// Receive an iovec of size n to the connected socket.
-  ssize_t recvv_n (iovec iov[],
-                   size_t n) const;
-
-
-  /**
-   * Selectively close endpoints.
-   */
-  //@{
-  /// Close down the reader.
-  int close_reader (void);
-
-  /// Close down the writer.
-  int close_writer (void);
-  //@}
-
-  ///Close down the socket.
-  int close (void);
-
-  /// Meta-type info
-  typedef ACE_INET_Addr PEER_ADDR;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-  /// Overridden set_handle() method.
-  /**
-   * Only an ACE_SSL_SOCK_Acceptor or ACE_SSL_SOCK_Connector should
-   * access this method since some state in the underlying "ssl_" data
-   * structure is set during SSL connection establishment.
-   */
-  void set_handle (ACE_HANDLE fd);
-
-  /// Return a pointer to the underlying SSL structure.
-  SSL *ssl (void) const;
-
-  /**
-   * Return the address of the remotely connected peer (if there is
-   * one), in the referenced <ACE_Addr>. Returns 0 if successful, else
-   * -1.
-   *
-   * @note If the TCP connection has been completed but the SSL
-   *       connection has not been completed yet, -1 will be
-   *       returned.
-   */
-  int get_remote_addr (ACE_Addr &) const;
-
-  /// Return the underlying ACE_SOCK_Stream which ACE_SSL runs atop of.
-  ACE_SOCK_Stream & peer (void);
-
-protected:
-
-  /// Underlying send() helper method common to all public send()
-  /// methods.
-  ssize_t send_i (const void *buf,
-                  size_t n,
-                  int flags) const;
-
-  /// Underlying send() helper method common to all public send()
-  /// methods.
-  ssize_t recv_i (void *buf,
-                  size_t n,
-                  int flags,
-                  const ACE_Time_Value *timeout) const;
-
-private:
-
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_SSL_SOCK_Stream &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_SSL_SOCK_Stream (const ACE_SSL_SOCK_Stream &))
-
-protected:
-
-  /// The SSL session.
-  SSL *ssl_;
-
-  /// The stream which works under the ssl connection.
-  ACE_SOCK_Stream stream_;
-
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "SSL_SOCK_Stream.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ACE_SSL_SOCK_STREAM_H */
diff --git a/dep/acelite/ace/SSL/SSL_SOCK_Stream.inl b/dep/acelite/ace/SSL/SSL_SOCK_Stream.inl
deleted file mode 100644
index 9f071cf41..000000000
--- a/dep/acelite/ace/SSL/SSL_SOCK_Stream.inl
+++ /dev/null
@@ -1,350 +0,0 @@
-// -*- C++ -*-
-//
-// $Id: SSL_SOCK_Stream.inl 91103 2010-07-15 12:36:57Z mcorino $
-
-#include "ace/OS_NS_errno.h"
-#include "ace/Truncate.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE void
-ACE_SSL_SOCK_Stream::set_handle (ACE_HANDLE fd)
-{
-  if (this->ssl_ == 0 || fd == ACE_INVALID_HANDLE)
-    {
-      this->ACE_SSL_SOCK::set_handle (ACE_INVALID_HANDLE);
-      return;
-    }
-  else
-    {
-      (void) ::SSL_set_fd (this->ssl_, (int) fd);
-      this->ACE_SSL_SOCK::set_handle (fd);
-      this->stream_.set_handle (fd);
-    }
-}
-
-ACE_INLINE ssize_t
-ACE_SSL_SOCK_Stream::send_i (const void *buf,
-                             size_t n,
-                             int flags) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::send_i");
-
-  // NOTE: Caller must provide thread-synchronization.
-
-  // No send flags are supported in SSL.
-  if (flags != 0)
-    {
-      ACE_NOTSUP_RETURN (-1);
-    }
-
-  int const bytes_sent = ::SSL_write (this->ssl_,
-                                      static_cast<const char *> (buf),
-                                      ACE_Utils::truncate_cast<int> (n));
-
-  switch (::SSL_get_error (this->ssl_, bytes_sent))
-    {
-    case SSL_ERROR_NONE:
-      return bytes_sent;
-
-    case SSL_ERROR_WANT_READ:
-    case SSL_ERROR_WANT_WRITE:
-      errno = EWOULDBLOCK;
-
-      return -1;
-
-    case SSL_ERROR_ZERO_RETURN:
-      // The peer has notified us that it is shutting down via the SSL
-      // "close_notify" message so we need to shutdown, too.
-      (void) ::SSL_shutdown (this->ssl_);
-
-      return bytes_sent;
-
-    case SSL_ERROR_SYSCALL:
-      if (bytes_sent == 0)
-        // An EOF occured but the SSL "close_notify" message was not
-        // sent.  This is a protocol error, but we ignore it.
-        return 0;
-
-      // If not an EOF, then fall through to "default" case.
-
-      // On some platforms (e.g. MS Windows) OpenSSL does not store
-      // the last error in errno so explicitly do so.
-      ACE_OS::set_errno_to_last_error ();
-
-      break;
-
-    default:
-      // Reset errno to prevent previous values (e.g. EWOULDBLOCK)
-      // from being associated with fatal SSL errors.
-      errno = 0;
-
-      ACE_SSL_Context::report_error ();
-
-      break;
-    }
-
-  return -1;
-}
-
-ACE_INLINE ssize_t
-ACE_SSL_SOCK_Stream::send (const void *buf,
-                           size_t n,
-                           int flags) const
-{
-  return this->send_i (buf, n, flags);
-}
-
-ACE_INLINE ssize_t
-ACE_SSL_SOCK_Stream::recv_i (void *buf,
-                             size_t n,
-                             int flags,
-                             const ACE_Time_Value *timeout) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_i");
-
-  // NOTE: Caller must provide thread-synchronization.
-
-  int bytes_read = 0;
-  ACE_HANDLE const handle = this->get_handle ();
-
-  // Value for current I/O mode (blocking/non-blocking)
-  int val = 0;
-
-  if (timeout != 0)
-    ACE::record_and_set_non_blocking_mode (handle,
-                                           val);
-
-  // Only block on select() with a timeout if no data in the
-  // internal OpenSSL buffer is pending read completion for
-  // the same reasons stated above, i.e. all data must be read
-  // before blocking on select().
-  if (timeout != 0
-      && !::SSL_pending (this->ssl_))
-    {
-      if (ACE::enter_recv_timedwait (handle,
-                                     timeout,
-                                     val) == -1)
-        return -1;
-    }
-
-  if (flags)
-    {
-      if (ACE_BIT_ENABLED (flags, MSG_PEEK))
-        {
-          bytes_read = ::SSL_peek (this->ssl_,
-                                   static_cast<char *> (buf),
-                                   ACE_Utils::truncate_cast<int> (n));
-        }
-      else
-        {
-          ACE_NOTSUP_RETURN (-1);
-        }
-    }
-  else
-    {
-      bytes_read = ::SSL_read (this->ssl_,
-                               static_cast<char *> (buf),
-                               ACE_Utils::truncate_cast<int> (n));
-    }
-
-  int const status = ::SSL_get_error (this->ssl_, bytes_read);
-  switch (status)
-    {
-    case SSL_ERROR_NONE:
-      if (timeout != 0)
-        ACE::restore_non_blocking_mode (handle, val);
-
-      return bytes_read;
-
-    case SSL_ERROR_WANT_READ:
-    case SSL_ERROR_WANT_WRITE:
-      errno = EWOULDBLOCK;
-
-      return -1;
-
-    case SSL_ERROR_ZERO_RETURN:
-      if (timeout != 0)
-        ACE::restore_non_blocking_mode (handle, val);
-
-      // The peer has notified us that it is shutting down via the SSL
-      // "close_notify" message so we need to shutdown, too.
-      (void) ::SSL_shutdown (this->ssl_);
-
-      return bytes_read;
-
-    case SSL_ERROR_SYSCALL:
-      if (bytes_read == 0)
-        // An EOF occured but the SSL "close_notify" message was not
-        // sent.  This is a protocol error, but we ignore it.
-        return 0;
-
-      // If not an EOF, then fall through to "default" case.
-
-      // On some platforms (e.g. MS Windows) OpenSSL does not store
-      // the last error in errno so explicitly do so.
-      ACE_OS::set_errno_to_last_error ();
-
-      break;
-
-    default:
-      // Reset errno to prevent previous values (e.g. EWOULDBLOCK)
-      // from being associated with a fatal SSL error.
-      errno = 0;
-
-      ACE_SSL_Context::report_error ();
-
-      break;
-    }
-
-  return -1;
-}
-
-ACE_INLINE ssize_t
-ACE_SSL_SOCK_Stream::recv (void *buf,
-                           size_t n,
-                           int flags) const
-{
-  return this->recv_i (buf, n, flags, 0);
-}
-
-ACE_INLINE ssize_t
-ACE_SSL_SOCK_Stream::send (const void *buf,
-                           size_t n) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::send");
-
-  return this->send_i (buf, n, 0);
-}
-
-ACE_INLINE ssize_t
-ACE_SSL_SOCK_Stream::recv (void *buf,
-                           size_t n) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::recv");
-
-  return this->recv_i (buf, n, 0, 0);
-}
-
-ACE_INLINE ssize_t
-ACE_SSL_SOCK_Stream::send (const void *buf,
-                           size_t len,
-                           const ACE_Time_Value *timeout) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::send");
-  return this->send (buf, len, 0, timeout);
-}
-
-ACE_INLINE ssize_t
-ACE_SSL_SOCK_Stream::recv (void *buf,
-                           size_t n,
-                           const ACE_Time_Value *timeout) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::recv");
-  return this->recv (buf, n, 0, timeout);
-}
-
-ACE_INLINE ssize_t
-ACE_SSL_SOCK_Stream::recv_n (void *buf, int buf_size) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_n");
-  return this->recv_n (buf, buf_size, 0);
-}
-
-ACE_INLINE ssize_t
-ACE_SSL_SOCK_Stream::recv_n (void *buf,
-                             size_t len,
-                             const ACE_Time_Value *timeout,
-                             size_t *bytes_transferred) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::recv_n");
-  return this->recv_n (buf, len, 0, timeout, bytes_transferred);
-}
-
-ACE_INLINE ssize_t
-ACE_SSL_SOCK_Stream::send_n (const void *buf, int len) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::send_n");
-  return this->send_n (buf, len, 0);
-}
-
-ACE_INLINE ssize_t
-ACE_SSL_SOCK_Stream::send_n (const void *buf,
-                             size_t len,
-                             const ACE_Time_Value *timeout,
-                             size_t *bytes_transferred) const
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::send_n");
-  return this->send_n (buf, len, 0, timeout, bytes_transferred);
-}
-
-ACE_INLINE int
-ACE_SSL_SOCK_Stream::close_reader (void)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::close_reader");
-  return this->stream_.close_reader ();
-}
-
-ACE_INLINE int
-ACE_SSL_SOCK_Stream::close_writer (void)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::close_writer");
-  return this->stream_.close_writer ();
-}
-
-ACE_INLINE int
-ACE_SSL_SOCK_Stream::close (void)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::close");
-
-  if (this->ssl_ == 0 || this->get_handle () == ACE_INVALID_HANDLE)
-    return 0;  // SSL_SOCK_Stream was never opened.
-
-  // SSL_shutdown() returns 1 on successful shutdown of the SSL
-  // connection, not 0.
-  int const status = ::SSL_shutdown (this->ssl_);
-
-  switch (::SSL_get_error (this->ssl_, status))
-    {
-    case SSL_ERROR_NONE:
-    case SSL_ERROR_SYSCALL:  // Ignore this error condition.
-
-      // Reset the SSL object to allow another connection to be made
-      // using this ACE_SSL_SOCK_Stream instance.  This prevents the
-      // previous SSL session state from being associated with the new
-      // SSL session/connection.
-      (void) ::SSL_clear (this->ssl_);
-      this->set_handle (ACE_INVALID_HANDLE);
-      return this->stream_.close ();
-
-    case SSL_ERROR_WANT_READ:
-    case SSL_ERROR_WANT_WRITE:
-      errno = EWOULDBLOCK;
-      break;
-
-    default:
-      ACE_SSL_Context::report_error ();
-
-      ACE_Errno_Guard error (errno);   // Save/restore errno
-      (void) this->stream_.close ();
-
-      return -1;
-    }
-
-  return -1;
-}
-
-ACE_INLINE ACE_SOCK_Stream &
-ACE_SSL_SOCK_Stream::peer (void)
-{
-  ACE_TRACE ("ACE_SSL_SOCK_Stream::peer");
-  return this->stream_;
-}
-
-ACE_INLINE SSL *
-ACE_SSL_SOCK_Stream::ssl (void) const
-{
-  return this->ssl_;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/SSL/sslconf.h b/dep/acelite/ace/SSL/sslconf.h
deleted file mode 100644
index 4da812cbc..000000000
--- a/dep/acelite/ace/SSL/sslconf.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     sslconf.h
- *
- *  $Id: sslconf.h 83879 2008-11-26 10:46:30Z smcqueen $
- *
- *  @author   Carlos O'Ryan <coryan@ece.uci.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_SSLCONF_H
-#define ACE_SSLCONF_H
-
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_DEFAULT_SSL_CERT_FILE)
-// Define a default CA certificate filename here if required e.g.:
-// #  ifdef WIN32
-// #    define ACE_DEFAULT_SSL_CERT_FILE "cert.pem"
-// #  else
-// #    define ACE_DEFAULT_SSL_CERT_FILE "/etc/ssl/cert.pem"
-// #  endif  /* WIN32 */
-#endif /* ACE_DEFAULT_SSL_CERT_FILE */
-
-#if !defined (ACE_DEFAULT_SSL_CERT_DIR)
-// Define a default CA certificate files directory here if required. e.g.:
-// #  ifdef WIN32
-// #    define ACE_DEFAULT_SSL_CERT_DIR "certs"
-// #  else
-// #    define ACE_DEFAULT_SSL_CERT_DIR "/etc/ssl/certs"
-// #  endif  /* WIN32 */
-#endif /* ACE_DEFAULT_SSL_CERT_DIR */
-
-#if !defined (ACE_SSL_CERT_FILE_ENV)
-#define ACE_SSL_CERT_FILE_ENV "SSL_CERT_FILE"
-#endif /* ACE_SSL_CERT_FILE_ENV */
-
-#if !defined (ACE_SSL_CERT_DIR_ENV)
-#define ACE_SSL_CERT_DIR_ENV  "SSL_CERT_DIR"
-#endif /* ACE_SSL_CERT_DIR_ENV */
-
-#if !defined (ACE_SSL_EGD_FILE_ENV)
-#define ACE_SSL_EGD_FILE_ENV  "SSL_EGD_FILE"
-#endif /* ACE_SSL_EGD_FILE_ENV */
-
-#if !defined (ACE_SSL_RAND_FILE_ENV)
-#define ACE_SSL_RAND_FILE_ENV  "SSL_RAND_FILE"
-#endif /* ACE_SSL_RAND_FILE_ENV */
-
-#include /**/ "ace/post.h"
-
-#endif /* ACE_SSLCONF_H */
diff --git a/dep/acelite/ace/SUN_Proactor.cpp b/dep/acelite/ace/SUN_Proactor.cpp
index ae7184494..ca4f928eb 100644
--- a/dep/acelite/ace/SUN_Proactor.cpp
+++ b/dep/acelite/ace/SUN_Proactor.cpp
@@ -1,11 +1,11 @@
-// $Id: SUN_Proactor.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: SUN_Proactor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SUN_Proactor.h"
 
 #if defined (ACE_HAS_AIO_CALLS) && defined (sun)
 
 #include "ace/Task_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Object_Manager.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -105,7 +105,7 @@ ACE_SUN_Proactor::handle_events_i (ACE_Time_Value *delta)
          break;         // we should process "post_completed" queue
 
        default:         // EFAULT
-         ACE_ERROR_RETURN ((LM_ERROR,
+         ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT("%N:%l:(%P | %t)::%p \nNumAIO=%d\n"),
                        ACE_TEXT("ACE_SUN_Proactor::handle_events: aiowait failed"),
                         num_started_aio_),
@@ -195,7 +195,7 @@ ACE_SUN_Proactor::find_completed_aio (aio_result_t *result,
                                error_status,
                                transfer_count) == 0)
     { // should never be
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT("%N:%l:(%P | %t)::%p\n"),
                   ACE_TEXT("ACE_SUN_Proactor::find_completed_aio:")
                   ACE_TEXT("should never be !!!\n")));
@@ -277,7 +277,7 @@ ACE_SUN_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result)
       if (errno == EAGAIN || errno == ENOMEM) // Defer - retry this later.
         ret_val = 1;
       else
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("%N:%l:(%P | %t)::start_aio: aio%s %p\n"),
                     ptype,
                     ACE_TEXT ("queueing failed\n")));
diff --git a/dep/acelite/ace/SV_Message_Queue.cpp b/dep/acelite/ace/SV_Message_Queue.cpp
index 82cd14cc6..15410170e 100644
--- a/dep/acelite/ace/SV_Message_Queue.cpp
+++ b/dep/acelite/ace/SV_Message_Queue.cpp
@@ -1,7 +1,7 @@
-// $Id: SV_Message_Queue.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: SV_Message_Queue.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SV_Message_Queue.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/SV_Message_Queue.inl"
@@ -21,7 +21,8 @@ ACE_SV_Message_Queue::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-ACE_SV_Message_Queue::ACE_SV_Message_Queue (void)
+ACE_SV_Message_Queue::ACE_SV_Message_Queue (void) :
+  internal_id_ (-1)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::ACE_SV_Message_Queue");
 }
@@ -37,7 +38,7 @@ ACE_SV_Message_Queue::ACE_SV_Message_Queue (key_t external_id,
 {
   ACE_TRACE ("ACE_SV_Message_Queue::ACE_SV_Message_Queue");
   if (this->open (external_id, create, perms) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SV_Message_Queue::ACE_SV_Message_Queue")));
 }
 
diff --git a/dep/acelite/ace/SV_Message_Queue.inl b/dep/acelite/ace/SV_Message_Queue.inl
index f8118bd76..507fed9f5 100644
--- a/dep/acelite/ace/SV_Message_Queue.inl
+++ b/dep/acelite/ace/SV_Message_Queue.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: SV_Message_Queue.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: SV_Message_Queue.inl 96483 2012-12-09 14:38:45Z johnnyw $
 
 #include "ace/Global_Macros.h"
 #include "ace/OS_NS_sys_msg.h"
@@ -38,7 +38,7 @@ ACE_INLINE int
 ACE_SV_Message_Queue::remove (void)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::remove");
-  int result = this->control (IPC_RMID);
+  int const result = this->control (IPC_RMID);
   this->internal_id_ = -1;
   return result;
 }
diff --git a/dep/acelite/ace/SV_Semaphore_Complex.cpp b/dep/acelite/ace/SV_Semaphore_Complex.cpp
index c2f4f94d4..6127a3a42 100644
--- a/dep/acelite/ace/SV_Semaphore_Complex.cpp
+++ b/dep/acelite/ace/SV_Semaphore_Complex.cpp
@@ -1,7 +1,7 @@
-// $Id: SV_Semaphore_Complex.cpp 91321 2010-08-09 06:38:18Z johnnyw $
+// $Id: SV_Semaphore_Complex.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SV_Semaphore_Complex.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_Thread.h"
 
 #if !defined (__ACE_INLINE__)
@@ -218,7 +218,7 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (key_t k,
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex");
   if (this->open (k, flags, initial_value, nsems, perms) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_SV_Semaphore_Complex")));
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_SV_Semaphore_Complex")));
 }
 
 ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name,
@@ -237,7 +237,7 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name,
     key = this->name_2_key (name);
 
   if (this->open (key, flags, initial_value, nsems, perms) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_SV_Semaphore_Complex")));
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_SV_Semaphore_Complex")));
 }
 
 ACE_SV_Semaphore_Complex::~ACE_SV_Semaphore_Complex (void)
diff --git a/dep/acelite/ace/SV_Semaphore_Complex.h b/dep/acelite/ace/SV_Semaphore_Complex.h
index fc01ba467..01d613e38 100644
--- a/dep/acelite/ace/SV_Semaphore_Complex.h
+++ b/dep/acelite/ace/SV_Semaphore_Complex.h
@@ -4,7 +4,7 @@
 /**
  *  @file   SV_Semaphore_Complex.h
  *
- *  $Id: SV_Semaphore_Complex.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: SV_Semaphore_Complex.h 97314 2013-09-03 13:11:59Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -33,20 +33,20 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * 0-13-949876-1 - 1990).  We provide a simpler and easier to
  * understand interface to the System V Semaphore system calls.
  * We create and use a 2 + n-member set for the requested
- * <ACE_SV_Semaphore_Complex>. The first member, [0], is a
+ * ACE_SV_Semaphore_Complex. The first member, [0], is a
  * counter used to know when all processes have finished with
- * the <ACE_SV_Semaphore_Complex>.  The counter is initialized
+ * the ACE_SV_Semaphore_Complex.  The counter is initialized
  * to a large number, decremented on every create or open and
  * incremented on every close. This way we can use the "adjust"
  * feature provided by System V so that any process that exit's
  * without calling <close> is accounted for. It doesn't help us
  * if the last process does this (as we have no way of getting
- * control to remove the <ACE_SV_Semaphore_Complex>) but it
+ * control to remove the ACE_SV_Semaphore_Complex) but it
  * will work if any process other than the last does an exit
  * (intentional or unintentional).
  * The second member, [1], of the semaphore is used as a lock
- * variable to avoid any race conditions in the <create> and
- * <close> functions.
+ * variable to avoid any race conditions in the create() and
+ * close() functions.
  * The members beyond [1] are actual semaphore values in the
  * array of semaphores, which may be sized by the user in the
  * constructor.
@@ -91,7 +91,7 @@ public:
             mode_t perms = ACE_DEFAULT_FILE_PERMS);
 
   /**
-   * Close an ACE_SV_Semaphore. Unlike the <remove> method, this
+   * Close an ACE_SV_Semaphore. Unlike the remove() method, this
    * method is for a process to call before it exits, when it is done
    * with the ACE_SV_Semaphore. We "decrement" the counter of
    * processes using the ACE_SV_Semaphore, and if this was the last
diff --git a/dep/acelite/ace/SV_Semaphore_Simple.cpp b/dep/acelite/ace/SV_Semaphore_Simple.cpp
index 643cbce3c..f16ad96fa 100644
--- a/dep/acelite/ace/SV_Semaphore_Simple.cpp
+++ b/dep/acelite/ace/SV_Semaphore_Simple.cpp
@@ -1,7 +1,7 @@
-// $Id: SV_Semaphore_Simple.cpp 91287 2010-08-05 10:30:49Z johnnyw $
+// $Id: SV_Semaphore_Simple.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SV_Semaphore_Simple.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 #include "ace/os_include/sys/os_sem.h"
 
@@ -112,7 +112,7 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k,
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple");
   if (this->open (k, flags, initial_value, n, perms) == -1)
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_SV_Semaphore::ACE_SV_Semaphore")));
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_SV_Semaphore::ACE_SV_Semaphore")));
 }
 
 // Convert name to key.  This function is used internally to create keys
@@ -141,7 +141,7 @@ ACE_SV_Semaphore_Simple::name_2_key (const char *name)
 #  pragma warning(push)
 #  pragma warning(disable : 4312)
 #endif /* defined (ACE_WIN32) && defined (_MSC_VER) */
-  return (key_t) ACE::crc32 (name);
+  return (key_t)(intptr_t)ACE::crc32 (name);
 #if defined (ACE_WIN32) && defined (_MSC_VER)
 #  pragma warning(pop)
 #endif /* defined (ACE_WIN32) && defined (_MSC_VER) */
@@ -181,7 +181,7 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name,
                   initial_value,
                   n,
                   perms) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple")));
 }
@@ -199,7 +199,7 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const wchar_t *name,
                   initial_value,
                   nsems,
                   perms) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple")));
 }
@@ -211,7 +211,8 @@ ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple (void)
   this->close ();
 }
 
-ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (void)
+ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (void) :
+  sem_number_ (0)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple");
   this->init ();
diff --git a/dep/acelite/ace/SV_Semaphore_Simple.h b/dep/acelite/ace/SV_Semaphore_Simple.h
index 4bf2121aa..799df8fae 100644
--- a/dep/acelite/ace/SV_Semaphore_Simple.h
+++ b/dep/acelite/ace/SV_Semaphore_Simple.h
@@ -4,7 +4,7 @@
 /**
  *  @file    SV_Semaphore_Simple.h
  *
- *  $Id: SV_Semaphore_Simple.h 86494 2009-08-13 19:09:03Z johnnyw $
+ *  $Id: SV_Semaphore_Simple.h 97314 2013-09-03 13:11:59Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -110,7 +110,7 @@ public:
    * call is intended to be called from a server, for example, when it
    * is being shut down, as we do an IPC_RMID on the ACE_SV_Semaphore,
    * regardless of whether other processes may be using it or not.
-   * Most other processes should use <close> below.
+   * Most other processes should use close() below.
    */
   int remove (void) const;
 
diff --git a/dep/acelite/ace/SV_Shared_Memory.cpp b/dep/acelite/ace/SV_Shared_Memory.cpp
index 406204746..6674d9a64 100644
--- a/dep/acelite/ace/SV_Shared_Memory.cpp
+++ b/dep/acelite/ace/SV_Shared_Memory.cpp
@@ -1,7 +1,7 @@
-// $Id: SV_Shared_Memory.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: SV_Shared_Memory.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/SV_Shared_Memory.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/SV_Shared_Memory.inl"
@@ -53,7 +53,7 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (key_t external_id,
   ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory");
   if (this->open_and_attach (external_id, sz, create,
                              perms, virtual_addr, flags) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory")));
 }
 
@@ -81,7 +81,7 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (ACE_HANDLE int_id,
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory");
   if (this->attach (0, flags) == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+    ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory")));
 }
 
diff --git a/dep/acelite/ace/Sample_History.cpp b/dep/acelite/ace/Sample_History.cpp
index 5c9e24417..d0acac482 100644
--- a/dep/acelite/ace/Sample_History.cpp
+++ b/dep/acelite/ace/Sample_History.cpp
@@ -1,4 +1,4 @@
-// $Id: Sample_History.cpp 95747 2012-05-13 17:14:12Z johnnyw $
+// $Id: Sample_History.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Sample_History.h"
 
@@ -7,7 +7,7 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Basic_Stats.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_Memory.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -33,7 +33,7 @@ ACE_Sample_History::dump_samples (
   for (size_t i = 0; i != this->sample_count_; ++i)
     {
       ACE_UINT64 const val = this->samples_[i] / scale_factor;
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("%s: ")
                   ACE_SIZE_T_FORMAT_SPECIFIER
                   ACE_TEXT ("\t%Q\n"),
diff --git a/dep/acelite/ace/Sbrk_Memory_Pool.cpp b/dep/acelite/ace/Sbrk_Memory_Pool.cpp
index bee21bdd2..d0653b175 100644
--- a/dep/acelite/ace/Sbrk_Memory_Pool.cpp
+++ b/dep/acelite/ace/Sbrk_Memory_Pool.cpp
@@ -1,8 +1,8 @@
-// $Id: Sbrk_Memory_Pool.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Sbrk_Memory_Pool.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/OS_NS_unistd.h"
 #include "ace/Sbrk_Memory_Pool.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 
 
@@ -20,16 +20,16 @@ ACE_Sbrk_Memory_Pool::acquire (size_t nbytes,
 {
   ACE_TRACE ("ACE_Sbrk_Memory_Pool::acquire");
   rounded_bytes = this->round_up (nbytes);
-  // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes));
+  // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes));
   void *cp = ACE_OS::sbrk (rounded_bytes);
 
   if (cp == MAP_FAILED)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        "(%P|%t) cp = %u\n",
                        cp),
                       0);
   else
-    // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n"), nbytes, rounded_bytes, cp));
+    // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n"), nbytes, rounded_bytes, cp));
   return cp;
 }
 
diff --git a/dep/acelite/ace/Select_Reactor_Base.cpp b/dep/acelite/ace/Select_Reactor_Base.cpp
index d160c5c12..15f2f95e5 100644
--- a/dep/acelite/ace/Select_Reactor_Base.cpp
+++ b/dep/acelite/ace/Select_Reactor_Base.cpp
@@ -1,4 +1,4 @@
-// $Id: Select_Reactor_Base.cpp 95574 2012-02-29 07:26:08Z johnnyw $
+// $Id: Select_Reactor_Base.cpp 97798 2014-07-03 10:57:43Z johnnyw $
 
 #include "ace/Select_Reactor_Base.h"
 #include "ace/Reactor.h"
@@ -6,7 +6,7 @@
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/Timer_Queue.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Signal.h"
 #include "ace/OS_NS_fcntl.h"
 
@@ -475,15 +475,15 @@ ACE_Select_Reactor_Handler_Repository_Iterator::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Select_Reactor_Handler_Repository_Iterator::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("rep_ = %u"), this->rep_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("rep_ = %u"), this->rep_));
 # ifdef ACE_WIN32
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = ")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = ")));
   this->current_.dump ();
 # else
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = %@"), this->current_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = %@"), this->current_));
 # endif  /* ACE_WIN32 */
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -501,20 +501,20 @@ ACE_Select_Reactor_Handler_Repository::dump (void) const
 #  define ACE_MAX_HANDLEP1_FORMAT_SPECIFIER ACE_TEXT("%d")
 # endif  /* ACE_WIN32 */
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("max_handlep1_ = ")
               ACE_MAX_HANDLEP1_FORMAT_SPECIFIER
               ACE_TEXT ("\n"),
               this->max_handlep1 ()));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("[")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("[")));
 
   ACE_Event_Handler *event_handler = 0;
 
   for (ACE_Select_Reactor_Handler_Repository_Iterator iter (this);
        iter.next (event_handler) != 0;
        iter.advance ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT (" (event_handler = %@,")
                 ACE_TEXT (" event_handler->handle_ = ")
                 ACE_HANDLE_FORMAT_SPECIFIER
@@ -522,8 +522,8 @@ ACE_Select_Reactor_Handler_Repository::dump (void) const
                 event_handler,
                 event_handler->get_handle ()));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" ]\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" ]\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -584,10 +584,10 @@ ACE_Select_Reactor_Notify::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Select_Reactor_Notify::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("select_reactor_ = %x"), this->select_reactor_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("select_reactor_ = %x"), this->select_reactor_));
   this->notification_pipe_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -844,7 +844,7 @@ ACE_Select_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
           break;
         default:
           // Should we bail out if we get an invalid mask?
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("invalid mask = %d\n"),
                       buffer.mask_));
         }
@@ -892,7 +892,7 @@ ACE_Select_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle,
   if (n > 0)
     {
       // Check to see if we've got a short read.
-      if (n != sizeof buffer)
+      if ((size_t)n != sizeof buffer)
         {
           ssize_t const remainder = sizeof buffer - n;
 
@@ -1013,7 +1013,7 @@ ACE_Select_Reactor_Impl::bit_ops (ACE_HANDLE handle,
     {
     case ACE_Reactor::GET_MASK:
       // The work for this operation is done in all cases at the
-      // begining of the function.
+      // beginning of the function.
       break;
     case ACE_Reactor::CLR_MASK:
       ptmf = &ACE_Handle_Set::clr_bit;
diff --git a/dep/acelite/ace/Select_Reactor_T.cpp b/dep/acelite/ace/Select_Reactor_T.cpp
index fde3ea3fc..d1e4d4ac1 100644
--- a/dep/acelite/ace/Select_Reactor_T.cpp
+++ b/dep/acelite/ace/Select_Reactor_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Select_Reactor_T.cpp 95533 2012-02-14 22:59:17Z wotte $
+// $Id: Select_Reactor_T.cpp 97894 2014-09-16 18:11:56Z johnnyw $
 
 #ifndef ACE_SELECT_REACTOR_T_CPP
 #define ACE_SELECT_REACTOR_T_CPP
@@ -11,7 +11,7 @@
 
 #include "ace/ACE.h"
 #include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Signal.h"
 #include "ace/Sig_Handler.h"
 #include "ace/Thread.h"
@@ -425,7 +425,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::open
                                         0,
                                         disable_notify_pipe) == -1)
     {
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p\n"),
                   ACE_TEXT ("notification pipe open failed")));
       result = -1;
@@ -518,7 +518,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T
                      tq,
                      disable_notify_pipe,
                      notify) == -1)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("%p\n"),
                     ACE_TEXT ("ACE_Select_Reactor_T::open ")
                     ACE_TEXT ("failed inside ")
@@ -552,7 +552,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T
                   tq,
                   disable_notify_pipe,
                   notify) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Select_Reactor_T::open ")
                 ACE_TEXT ("failed inside ACE_Select_Reactor_T::CTOR")));
@@ -703,7 +703,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::cancel_timer (ACE_Event_Handler
   ACE_TRACE ("ACE_Select_Reactor_T::cancel_timer");
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1));
 
-  if (this->timer_queue_ != 0)
+  if ((this->timer_queue_ != 0) && (handler != 0))
     return this->timer_queue_->cancel (handler, dont_call_handle_close);
   else
     return 0;
@@ -1254,7 +1254,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_handlers
       return -1;
     }
 
-  // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Select_Reactor_T::dispatch - EXCEPT\n")));
+  // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Select_Reactor_T::dispatch - EXCEPT\n")));
   if (this->dispatch_io_set (number_of_active_handles,
                              number_of_handlers_dispatched,
                              ACE_Event_Handler::EXCEPT_MASK,
@@ -1266,7 +1266,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_handlers
       return -1;
     }
 
-  // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Select_Reactor_T::dispatch - READ\n")));
+  // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Select_Reactor_T::dispatch - READ\n")));
   if (this->dispatch_io_set (number_of_active_handles,
                              number_of_handlers_dispatched,
                              ACE_Event_Handler::READ_MASK,
@@ -1531,6 +1531,9 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void)
         {
           result = 1;
           this->remove_handler_i (h, ACE_Event_Handler::ALL_EVENTS_MASK);
+          this->wait_set_.rd_mask_.clr_bit (h);
+          this->wait_set_.wr_mask_.clr_bit (h);
+          this->wait_set_.ex_mask_.clr_bit (h);
         }
       rd_mask.clr_bit (h);
 #else /* !ACE_WIN32 && !MVS && !VXWORKS */
@@ -1553,12 +1556,12 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Select_Reactor_T::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   this->timer_queue_->dump ();
   this->handler_rep_.dump ();
   this->signal_handler_->dump ();
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("delete_signal_handler_ = %d\n"),
               this->delete_signal_handler_));
 
@@ -1566,51 +1569,51 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const
 
   for (ACE_Handle_Set_Iterator handle_iter_wr (this->wait_set_.wr_mask_);
        (h = handle_iter_wr ()) != ACE_INVALID_HANDLE;)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle = %d\n"), h));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle = %d\n"), h));
 
   for (ACE_Handle_Set_Iterator handle_iter_rd (this->wait_set_.rd_mask_);
        (h = handle_iter_rd ()) != ACE_INVALID_HANDLE;)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle = %d\n"), h));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle = %d\n"), h));
 
   for (ACE_Handle_Set_Iterator handle_iter_ex (this->wait_set_.ex_mask_);
        (h = handle_iter_ex ()) != ACE_INVALID_HANDLE;)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle = %d\n"), h));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle = %d\n"), h));
 
   for (ACE_Handle_Set_Iterator handle_iter_wr_ready (this->ready_set_.wr_mask_);
        (h = handle_iter_wr_ready ()) != ACE_INVALID_HANDLE;)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle_ready = %d\n"), h));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle_ready = %d\n"), h));
 
   for (ACE_Handle_Set_Iterator handle_iter_rd_ready (this->ready_set_.rd_mask_);
        (h = handle_iter_rd_ready ()) != ACE_INVALID_HANDLE;)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle_ready = %d\n"), h));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle_ready = %d\n"), h));
 
   for (ACE_Handle_Set_Iterator handle_iter_ex_ready (this->ready_set_.ex_mask_);
        (h = handle_iter_ex_ready ()) != ACE_INVALID_HANDLE;)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle_ready = %d\n"), h));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle_ready = %d\n"), h));
 
   for (ACE_Handle_Set_Iterator handle_iter_su_ready (this->suspend_set_.wr_mask_);
        (h = handle_iter_su_ready ()) != ACE_INVALID_HANDLE;)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle_suspend = %d\n"), h));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle_suspend = %d\n"), h));
 
   for (ACE_Handle_Set_Iterator handle_iter_su_ready (this->suspend_set_.rd_mask_);
        (h = handle_iter_su_ready ()) != ACE_INVALID_HANDLE;)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle_suspend = %d\n"), h));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle_suspend = %d\n"), h));
 
   for (ACE_Handle_Set_Iterator handle_iter_su_ready (this->suspend_set_.ex_mask_);
        (h = handle_iter_su_ready ()) != ACE_INVALID_HANDLE;)
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle_suspend = %d\n"), h));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle_suspend = %d\n"), h));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("restart_ = %d\n"), this->restart_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("requeue_position_ = %d\n"), this->requeue_position_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("initialized_ = %d\n"), this->initialized_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("restart_ = %d\n"), this->restart_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("requeue_position_ = %d\n"), this->requeue_position_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("initialized_ = %d\n"), this->initialized_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_));
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   this->notify_handler_->dump ();
   this->token_.dump ();
 #endif /* ACE_MT_SAFE */
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Semaphore.cpp b/dep/acelite/ace/Semaphore.cpp
index 04588668b..dc533ee0b 100644
--- a/dep/acelite/ace/Semaphore.cpp
+++ b/dep/acelite/ace/Semaphore.cpp
@@ -1,4 +1,4 @@
-// $Id: Semaphore.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Semaphore.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Semaphore.h"
 
@@ -6,7 +6,7 @@
 #include "ace/Semaphore.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -19,9 +19,9 @@ ACE_Semaphore::dump (void) const
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Semaphore::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -45,7 +45,7 @@ ACE_Semaphore::ACE_Semaphore (unsigned int count,
   if (ACE_OS::sema_init (&this->semaphore_, count, type,
                          name, arg, max) != 0)
 #endif
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Semaphore::ACE_Semaphore")));
 }
diff --git a/dep/acelite/ace/Service_Config.cpp b/dep/acelite/ace/Service_Config.cpp
index 9149e98e4..cc2cd7c55 100644
--- a/dep/acelite/ace/Service_Config.cpp
+++ b/dep/acelite/ace/Service_Config.cpp
@@ -1,4 +1,4 @@
-// $Id: Service_Config.cpp 96017 2012-08-08 22:18:09Z mitza $
+// $Id: Service_Config.cpp 97326 2013-09-11 07:52:09Z johnnyw $
 
 #include "ace/Service_Config.h"
 
@@ -21,7 +21,7 @@
 #include "ace/Thread.h"
 #include "ace/Get_Opt.h"
 #include "ace/ARGV.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 
 
@@ -42,7 +42,7 @@ ACE_Threading_Helper<ACE_Thread_Mutex>::ACE_Threading_Helper (void)
 
   if (ACE_Thread::keycreate (&key_, 0) == -1)
     {
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t) Failed to create thread key: %p\n"),
                   ACE_TEXT ("")));
     }
@@ -52,7 +52,7 @@ void
 ACE_Threading_Helper<ACE_Thread_Mutex>::set (void* p)
 {
   if (ACE_Thread::setspecific (key_, p) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                ACE_TEXT ("(%P|%t) Service Config failed to set thread key value: %p\n"),
                ACE_TEXT("")));
 }
@@ -62,7 +62,7 @@ ACE_Threading_Helper<ACE_Thread_Mutex>::get (void)
 {
   void* temp = 0;
   if (ACE_Thread::getspecific (key_, &temp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("(%P|%t) Service Config failed to get thread key value: %p\n"),
                        ACE_TEXT("")),
                       0);
@@ -106,7 +106,7 @@ ACE_Service_Config_Guard::ACE_Service_Config_Guard (ACE_Service_Gestalt * psg)
   : saved_ (ACE_Service_Config::current ())
 {
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) - SCG:<ctor=%@>")
                 ACE_TEXT (" - config=%@ repo=%@ superceded by repo=%@\n"),
                 this,
@@ -126,7 +126,7 @@ ACE_Service_Config_Guard::~ACE_Service_Config_Guard (void)
   ACE_Service_Config::current (s);
 
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SCG:<dtor=%@>")
                 ACE_TEXT (" - new repo=%@\n"),
                 this,
@@ -202,7 +202,7 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[])
           if (ACE_Reactor::instance ()->register_handler
               (ACE_Service_Config::signum_,
                ACE_Service_Config::signal_handler_) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
+            ACELIB_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("cannot obtain signal handler\n")),
                               -1);
 #endif /* ACE_LACKS_UNIX_SIGNALS */
@@ -229,7 +229,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[],
   ACE_Log_Msg *log_msg = ACE_LOG_MSG;
 
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SC::open_i - this=%@, opened=%d\n"),
                 this, this->is_opened_));
 
@@ -244,7 +244,12 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[],
 
   // Become a daemon before doing anything else.
   if (ACE_Service_Config::be_a_daemon_)
-    ACE::daemonize ();
+    {
+      // If we have to become a daemn and that fails
+      // return -1 here
+      if (ACE::daemonize () == -1)
+        return -1;
+    }
 
   // Write process id to file.
   if (this->pid_file_name_ != 0)
@@ -287,7 +292,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[],
     return -1;
 
   if (ACE::debug ())
-    ACE_DEBUG ((LM_STARTUP,
+    ACELIB_DEBUG ((LM_STARTUP,
                 ACE_TEXT ("starting up daemon %n\n")));
 
   // Initialize the Service Repository (this will still work if
@@ -310,7 +315,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[],
       if ((ACE_Reactor::instance () != 0) &&
           (ACE_Reactor::instance ()->register_handler
            (ss, ACE_Service_Config::signal_handler_) == -1))
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("can't register signal handler\n")));
     }
 #endif /* ACE_LACKS_UNIX_SIGNALS */
@@ -407,7 +412,7 @@ ACE_Service_Config::ACE_Service_Config (const ACE_TCHAR program_name[],
     {
       // Only print out an error if it wasn't the svc.conf file that was
       // missing.
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t) SC failed to open: %p\n"),
                   program_name));
     }
@@ -497,7 +502,7 @@ ACE_Service_Config::create_service_type_impl (const ACE_TCHAR *name,
                       0);
       break;
     default:
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("unknown case\n")));
       break;
     }
@@ -535,12 +540,12 @@ ACE_Service_Config::reconfigure (void)
       time_t t = ACE_OS::time (0);
 #endif /* ! ACE_NLOGGING */
       if (ACE::debug ())
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("beginning reconfiguration at %s"),
                     ACE_OS::ctime (&t)));
     }
   if (ACE_Service_Config::process_directives () == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("process_directives")));
 }
diff --git a/dep/acelite/ace/Service_Config.h b/dep/acelite/ace/Service_Config.h
index 56be51fde..f4969144a 100644
--- a/dep/acelite/ace/Service_Config.h
+++ b/dep/acelite/ace/Service_Config.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Service_Config.h
  *
- *  $Id: Service_Config.h 94385 2011-08-10 12:19:36Z johnnyw $
+ *  $Id: Service_Config.h 96605 2013-01-02 19:33:30Z tgirard $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -57,6 +57,33 @@ class ACE_DLL;
   ACE_TEXT ("() \"") \
   ACE_TEXT (parameters) \
   ACE_TEXT ("\"")
+#if defined (ACE_VERSIONED_SO) && (ACE_VERSIONED_SO == 2)
+#define ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(ident, libpathname, version, objectclass, parameters) \
+  ACE_TEXT ("dynamic ") \
+  ACE_TEXT (ident) \
+  ACE_TEXT (" Service_Object * ") \
+  ACE_DLL_PREFIX \
+  ACE_TEXT (libpathname) \
+  ACE_TEXT ("-") \
+  ACE_TEXT (version) \
+  ACE_DLL_SUFFIX \
+  ACE_TEXT (":") \
+  ACE_TEXT (objectclass) \
+  ACE_TEXT ("() \"") \
+  ACE_TEXT (parameters) \
+  ACE_TEXT ("\"")
+#else
+#define ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(ident, libpathname, version, objectclass, parameters) \
+  ACE_TEXT ("dynamic ") \
+  ACE_TEXT (ident) \
+  ACE_TEXT (" Service_Object * ") \
+  ACE_TEXT (libpathname) \
+  ACE_TEXT (":") \
+  ACE_TEXT (objectclass) \
+  ACE_TEXT ("() \"") \
+  ACE_TEXT (parameters) \
+  ACE_TEXT ("\"")
+#endif /* ACE_VERSIONED_SO */
 #define ACE_REMOVE_SERVICE_DIRECTIVE(ident) \
   ACE_TEXT ("remove ") \
   ACE_TEXT (ident)
@@ -80,6 +107,37 @@ class ACE_Svc_Conf_Param;
   ACE_TEXT (" params=\"") \
   ACE_TEXT (parameters) \
   ACE_TEXT ("\"/></dynamic></ACE_Svc_Conf>")
+#if defined (ACE_VERSIONED_SO) && (ACE_VERSIONED_SO == 2)
+#define ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(ident, libpathname, version, objectclass, parameters) \
+  ACE_TEXT ("<ACE_Svc_Conf><dynamic id=\"") \
+  ACE_TEXT (ident) \
+  ACE_TEXT ("\" type=\"Service_Object\">") \
+  ACE_TEXT ("<initializer path=\"") \
+  ACE_DLL_PREFIX \
+  ACE_TEXT (libpathname) \
+  ACE_TEXT ("-") \
+  ACE_TEXT (version) \
+  ACE_DLL_SUFFIX \
+  ACE_TEXT ("\" init=\"") \
+  ACE_TEXT (objectclass) \
+  ACE_TEXT ("\"") \
+  ACE_TEXT (" params=\"") \
+  ACE_TEXT (parameters) \
+  ACE_TEXT ("\"/></dynamic></ACE_Svc_Conf>")
+#else
+#define ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(ident, libpathname, version, objectclass, parameters) \
+  ACE_TEXT ("<ACE_Svc_Conf><dynamic id=\"") \
+  ACE_TEXT (ident) \
+  ACE_TEXT ("\" type=\"Service_Object\">") \
+  ACE_TEXT ("<initializer path=\"") \
+  ACE_TEXT (libpathname) \
+  ACE_TEXT ("\" init=\"") \
+  ACE_TEXT (objectclass) \
+  ACE_TEXT ("\"") \
+  ACE_TEXT (" params=\"") \
+  ACE_TEXT (parameters) \
+  ACE_TEXT ("\"/></dynamic></ACE_Svc_Conf>")
+#endif
 #define ACE_REMOVE_SERVICE_DIRECTIVE(ident) \
   ACE_TEXT ("<ACE_Svc_Conf><remove id=\"") \
   ACE_TEXT (ident) \
diff --git a/dep/acelite/ace/Service_Gestalt.cpp b/dep/acelite/ace/Service_Gestalt.cpp
index f177260ca..496533e76 100644
--- a/dep/acelite/ace/Service_Gestalt.cpp
+++ b/dep/acelite/ace/Service_Gestalt.cpp
@@ -1,4 +1,4 @@
-// $Id: Service_Gestalt.cpp 95610 2012-03-13 11:26:31Z johnnyw $
+// $Id: Service_Gestalt.cpp 97798 2014-07-03 10:57:43Z johnnyw $
 
 #include "ace/Svc_Conf.h"
 #include "ace/Get_Opt.h"
@@ -58,9 +58,9 @@ ACE_Service_Type_Dynamic_Guard::ACE_Service_Type_Dynamic_Guard
 #endif
 {
     if (ACE::debug ())
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("ACE (%P|%t) STDG::<ctor>, repo=%@")
-                    ACE_TEXT(", name=%s - begining at [%d]\n"),
+                    ACE_TEXT(", name=%s - beginning at [%d]\n"),
                     &this->repo_,
                     this->name_,
                     this->repo_begin_));
@@ -84,7 +84,7 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void)
   if ((ret < 0 && ret != -2) || tmp == 0)
     {
       if (ACE::debug ())
-        ACE_ERROR ((LM_WARNING,
+        ACELIB_ERROR ((LM_WARNING,
                     ACE_TEXT ("ACE (%P|%t) STDG::<dtor> - Failed (%d) to find %s -> %@\n"),
                     ret, this->name_, tmp));
       return;
@@ -96,7 +96,7 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void)
       // the same name as our dummy.
 
       if (ACE::debug ())
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@ [%d], ")
                     ACE_TEXT ("name=%s - updating dependents [%d - %d)\n"),
                     &this->repo_,
@@ -112,7 +112,7 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void)
       this->repo_.relocate_i (this->repo_begin_, this->repo_.current_size (), tmp->dll());
 
       if (ACE::debug ())
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@ [%d], ")
                     ACE_TEXT ("name=%s - loaded (type=%@, impl=%@, object=%@, active=%d)\n"),
                     &this->repo_,
@@ -179,7 +179,7 @@ ACE_Service_Gestalt::~ACE_Service_Gestalt (void)
   // Delete the dynamically allocated static_svcs instance.
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SG::~SG - this=%@, pss = %@\n"),
                 this, this->processed_static_svcs_));
 #endif
@@ -225,7 +225,7 @@ ACE_Service_Gestalt::ACE_Service_Gestalt (size_t size,
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SG::ctor - this = %@, pss = %@\n"),
                 this, this->processed_static_svcs_));
 #endif
@@ -381,7 +381,7 @@ ACE_Service_Gestalt::add_processed_static_svc
   this->processed_static_svcs_->insert(tmp);
 
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SG::add_processed_static_svc, ")
                 ACE_TEXT ("repo=%@ - %s\n"),
                 this->repo_,
@@ -427,7 +427,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name,
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
     {
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("ACE (%P|%t) SG::initialize - () repo=%@, ")
                   ACE_TEXT ("looking up static ")
                   ACE_TEXT ("service \'%s\' to initialize\n"),
@@ -448,7 +448,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name,
         }
       else
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("ACE (%P|%t) ERROR: SG::initialize - service \'%s\'")
                              ACE_TEXT (" was not located.\n"),
                              svc_name),
@@ -456,7 +456,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name,
         }
     }
   if (srp == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("ACE (%P|%t) ERROR: SG::initialize - service \'%s\'")
                        ACE_TEXT (" was not located.\n"),
                        svc_name),
@@ -467,7 +467,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name,
                           args.argv ()) == -1)
     {
       // ... report and remove this entry.
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("ACE (%P|%t) ERROR: SG::initialize - static init of \'%s\'")
                   ACE_TEXT (" failed (%p)\n"),
                   svc_name, ACE_TEXT ("error")));
@@ -490,7 +490,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf,
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@, name=%s")
                 ACE_TEXT (" - looking up in the repo\n"),
                 this->repo_,
@@ -507,7 +507,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf,
     {
 #ifndef ACE_NLOGGING
       if (ACE::debug ())
-        ACE_DEBUG ((LM_WARNING,
+        ACELIB_DEBUG ((LM_WARNING,
                     ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@,")
                     ACE_TEXT (" name=%s - removing a pre-existing namesake.\n"),
                     this->repo_,
@@ -527,7 +527,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf,
   // DLL_Manager was re-entrant we would have entered an infinite
   // recursion here.
   if (retv == -2 && srp->type () == 0)
-    ACE_ERROR_RETURN ((LM_WARNING,
+    ACELIB_ERROR_RETURN ((LM_WARNING,
                        ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@,")
                        ACE_TEXT (" name=%s - forward-declared; ")
                        ACE_TEXT (" recursive initialization requests are")
@@ -583,7 +583,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type *sr,
   ACE_TRACE ("ACE_Service_Gestalt::initialize");
 
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@, name=%s")
                 ACE_TEXT (" - looking up in the repo\n"),
                 this->repo_,
@@ -594,7 +594,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type *sr,
                          (const ACE_Service_Type **) &srp) >= 0)
     {
 #ifndef ACE_NLOGGING
-      ACE_DEBUG ((LM_WARNING,
+      ACELIB_DEBUG ((LM_WARNING,
                   ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@, name=%s")
                   ACE_TEXT (" - removing a pre-existing namesake.\n"),
                   this->repo_,
@@ -625,7 +625,7 @@ ACE_Service_Gestalt::initialize_i (const ACE_Service_Type *sr,
 #ifndef ACE_NLOGGING
       // Not using LM_ERROR here to avoid confusing the test harness
       if (ACE::debug ())
-        ACE_ERROR_RETURN ((LM_WARNING,
+        ACELIB_ERROR_RETURN ((LM_WARNING,
                            ACE_TEXT ("ACE (%P|%t) SG::initialize_i -")
                            ACE_TEXT (" repo=%@, name=%s - remove failed: %m\n"),
                            this->repo_,
@@ -640,7 +640,7 @@ ACE_Service_Gestalt::initialize_i (const ACE_Service_Type *sr,
 #ifndef ACE_NLOGGING
       // Not using LM_ERROR here to avoid confusing the test harness
       if (ACE::debug ())
-        ACE_ERROR_RETURN ((LM_WARNING,
+        ACELIB_ERROR_RETURN ((LM_WARNING,
                            ACE_TEXT ("ACE (%P|%t) SG::initialize_i -")
                            ACE_TEXT (" repo=%@, name=%s - insert failed: %m\n"),
                            this->repo_,
@@ -753,7 +753,7 @@ ACE_Service_Gestalt::process_directive_i (const ACE_Static_Svc_Descriptor &ssd,
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SG::process_directive_i, ")
                 ACE_TEXT ("repo=%@ - %s, dll=%s, force=%d\n"),
                 this->repo_,
@@ -772,7 +772,7 @@ ACE_Service_Gestalt::process_directives_i (ACE_Svc_Conf_Param *param)
 {
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SG::process_directives_i, ")
                 ACE_TEXT ("repo=%@ - %s\n"),
                 this->repo_,
@@ -818,7 +818,7 @@ ACE_XML_Svc_Conf *
 ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll)
 {
   if (xmldll.open (ACE_TEXT ("ACEXML_XML_Svc_Conf_Parser")) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("ACE (%P|%t) Failure to open ACEXML_XML_Svc_Conf_Parser: %p\n"),
                        ACE_TEXT("ACE_Service_Config::get_xml_svc_conf")),
                       0);
@@ -835,7 +835,7 @@ ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll)
   ACE_XML_Svc_Conf::Factory factory = reinterpret_cast<ACE_XML_Svc_Conf::Factory> (temp_p);
 
   if (factory == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("ACE (%P|%t) Unable to resolve factory: %p\n"),
                        xmldll.error ()),
                       0);
@@ -856,7 +856,7 @@ ACE_Service_Gestalt::process_file (const ACE_TCHAR file[])
   // service with a matching name.
   if (this->repo_->find (file, 0, 0) >=0)
     {
-      ACE_DEBUG ((LM_WARNING,
+      ACELIB_DEBUG ((LM_WARNING,
                   ACE_TEXT ("ACE (%P|%t) Configuration file %s is currently")
                   ACE_TEXT (" being processed. Ignoring recursive process_file().\n"),
                   file));
@@ -882,7 +882,7 @@ ACE_Service_Gestalt::process_file (const ACE_TCHAR file[])
       // Invalid svc.conf file.  We'll report it here and break out of
       // the method.
       if (ACE::debug ())
-        ACE_DEBUG ((LM_ERROR,
+        ACELIB_DEBUG ((LM_ERROR,
                     ACE_TEXT ("ACE (%P|%t): %p\n"),
                     file));
 
@@ -926,7 +926,7 @@ ACE_Service_Gestalt::process_directive (const ACE_TCHAR directive[])
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SG::process_directive, repo=%@ - %s\n"),
                 this->repo_,
                 directive));
@@ -975,7 +975,7 @@ ACE_Service_Gestalt::init_svc_conf_file_queue (void)
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SG::init_svc_conf_file_queue ")
                 ACE_TEXT ("- this=%@, repo=%@\n"),
                 this, this->repo_));
@@ -1008,7 +1008,7 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[],
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SG::open_i - this=%@, ")
                 ACE_TEXT ("opened=%d, loadstatics=%d\n"),
                 this, this->is_opened_, this->no_static_svcs_));
@@ -1095,7 +1095,7 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[],
           (ACE_TString (ACE_DEFAULT_SVC_CONF)) == -1)
         {
           errno = ENOENT;
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("%p\n"),
                              ACE_TEXT ("enqueuing ")
                              ACE_DEFAULT_SVC_CONF
@@ -1157,7 +1157,7 @@ ACE_Service_Gestalt::process_commandline_directives (void)
           // Process just a single directive.
           if (this->process_directive ((sptr->fast_rep ())) != 0)
             {
-              ACE_ERROR ((LM_ERROR,
+              ACELIB_ERROR ((LM_ERROR,
                           ACE_TEXT ("ACE (%P|%t) %p\n"),
                           ACE_TEXT ("process_directive")));
               result = -1;
@@ -1203,7 +1203,7 @@ ACE_Service_Gestalt::parse_args_i (int argc,
         break;
       case 'f':
         if (this->svc_conf_file_queue_->enqueue_tail (ACE_TString (get_opt.opt_arg ())) == -1)
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("%p\n"),
                              ACE_TEXT ("enqueue_tail")),
                             -1);
@@ -1231,14 +1231,14 @@ ACE_Service_Gestalt::parse_args_i (int argc,
           }
 
         if (this->svc_queue_->enqueue_tail (ACE_TString (get_opt.opt_arg ())) == -1)
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("%p\n"),
                              ACE_TEXT ("enqueue_tail")),
                             -1);
         break;
       default:
         if (ACE::debug ())
-          ACE_DEBUG ((LM_DEBUG,
+          ACELIB_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("ACE (%P|%t) %c is not a ACE_Service_Config option\n"),
                       c));
       }
@@ -1307,7 +1307,7 @@ ACE_Service_Gestalt::close (void)
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SG::close - complete this=%@, repo=%@, owned=%d\n"),
                 this, this->repo_, this->svc_repo_is_owned_));
 #endif
diff --git a/dep/acelite/ace/Service_Manager.cpp b/dep/acelite/ace/Service_Manager.cpp
index 38bd0e576..ba5a6ce99 100644
--- a/dep/acelite/ace/Service_Manager.cpp
+++ b/dep/acelite/ace/Service_Manager.cpp
@@ -1,9 +1,9 @@
-// $Id: Service_Manager.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Service_Manager.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Service_Manager.h"
 
 #include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Service_Repository.h"
 #include "ace/Service_Config.h"
 #include "ace/Service_Types.h"
@@ -127,7 +127,7 @@ ACE_Service_Manager::init (int argc, ACE_TCHAR *argv[])
   if (this->get_handle () == ACE_INVALID_HANDLE &&
       this->open (local_addr) == -1)
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("%p\n"),
                          ACE_TEXT ("open")), -1);
     }
@@ -135,7 +135,7 @@ ACE_Service_Manager::init (int argc, ACE_TCHAR *argv[])
            (this,
             ACE_Event_Handler::ACCEPT_MASK) == -1)
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("registering service with ACE_Reactor\n")),
                         -1);
     }
@@ -213,7 +213,7 @@ ACE_Service_Manager::list_services (void)
 
       if (this->debug_)
         {
-          ACE_DEBUG ((LM_DEBUG,
+          ACELIB_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("len = %d, info = %s%s"),
                       len,
                       buf,
@@ -226,7 +226,7 @@ ACE_Service_Manager::list_services (void)
 
           if (n <= 0 && errno != EPIPE)
             {
-              ACE_ERROR ((LM_ERROR,
+              ACELIB_ERROR ((LM_ERROR,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("send_n")));
             }
@@ -326,7 +326,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
 
   if (this->debug_)
     {
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("client_stream fd = %d\n"),
                  this->client_stream_.get_handle ()));
       ACE_INET_Addr sa;
@@ -336,7 +336,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
           return -1;
         }
 
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("accepted from host %C at port %d\n"),
                   sa.get_host_name (),
                   sa.get_port_number ()));
@@ -372,7 +372,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
         {
           if ((remaining -= result) <= 0)
             {
-              ACE_DEBUG ((LM_ERROR,
+              ACELIB_DEBUG ((LM_ERROR,
                           ACE_TEXT ("Request buffer overflow.\n")));
               result = 0;
               break;
@@ -395,7 +395,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
     case -1:
       if (this->debug_)
         {
-          ACE_DEBUG ((LM_ERROR,
+          ACELIB_DEBUG ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("recv")));
         }
@@ -422,7 +422,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
 
   if (this->client_stream_.close () == -1 && this->debug_)
     {
-      ACE_DEBUG ((LM_ERROR,
+      ACELIB_DEBUG ((LM_ERROR,
                   ACE_TEXT ("%p\n"),
                   ACE_TEXT ("close")));
     }
diff --git a/dep/acelite/ace/Service_Object.cpp b/dep/acelite/ace/Service_Object.cpp
index 4a9ace402..b182e86c2 100644
--- a/dep/acelite/ace/Service_Object.cpp
+++ b/dep/acelite/ace/Service_Object.cpp
@@ -1,4 +1,4 @@
-// $Id: Service_Object.cpp 93539 2011-03-13 09:40:44Z vzykov $
+// $Id: Service_Object.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/config-all.h"
 
@@ -12,7 +12,7 @@
 #include "ace/Service_Types.h"
 #include "ace/DLL.h"
 #include "ace/ACE.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #if defined (ACE_OPENVMS)
 # include "ace/Lib_Find.h"
 #endif
@@ -84,7 +84,7 @@ int
 ACE_Service_Type::fini (void)
 {
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) ST::fini - destroying name=%s, dll=%s\n"),
                 this->name_,
                 this->dll_.dll_name_));
diff --git a/dep/acelite/ace/Service_Repository.cpp b/dep/acelite/ace/Service_Repository.cpp
index 1f4f5c3b3..022b14352 100644
--- a/dep/acelite/ace/Service_Repository.cpp
+++ b/dep/acelite/ace/Service_Repository.cpp
@@ -1,4 +1,4 @@
-// $Id: Service_Repository.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Service_Repository.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Service_Repository.h"
 
@@ -8,7 +8,7 @@
 
 #include "ace/Service_Types.h"
 #include "ace/Object_Manager.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_errno.h"
@@ -132,7 +132,7 @@ ACE_Service_Repository::fini (void)
       ACE_Service_Type *s =
         const_cast<ACE_Service_Type *> (this->service_array_[i]);
       if (s == 0)
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("ACE (%P|%t) SR::fini, repo=%@ [%d] -> 0\n"),
                     this,
                     i));
@@ -155,7 +155,7 @@ ACE_Service_Repository::fini (void)
 #ifndef ACE_NLOGGING
       if (ACE::debug ())
       {
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("ACE (%P|%t) SR::fini, repo=%@ [%d], ")
                     ACE_TEXT ("name=%s, type=%@, object=%@, active=%d\n"),
                     this,
@@ -187,7 +187,7 @@ ACE_Service_Repository::fini (void)
 #ifndef ACE_NLOGGING
       if (ACE::debug ())
       {
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("ACE (%P|%t) SR::fini, repo=%@ [%d], ")
                     ACE_TEXT ("name=%s, type=%@, object=%@, active=%d\n"),
                     this,
@@ -215,7 +215,7 @@ ACE_Service_Repository::close (void)
 
 #ifndef ACE_NLOGGING
   if(ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SR::close - repo=%@, size=%d\n"),
                 this,
                 this->service_array_.size()));
@@ -233,12 +233,12 @@ ACE_Service_Repository::close (void)
       if(ACE::debug ())
         {
           if (s == 0)
-            ACE_DEBUG ((LM_DEBUG,
+            ACELIB_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("ACE (%P|%t) SR::close - repo=%@ [%d] -> 0\n"),
                         this,
                         i));
           else
-            ACE_DEBUG ((LM_DEBUG,
+            ACELIB_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("ACE (%P|%t) SR::close - repo=%@ [%d], name=%s, object=%@\n"),
                         this,
                         i,
@@ -259,7 +259,7 @@ ACE_Service_Repository::~ACE_Service_Repository (void)
   ACE_TRACE ("ACE_Service_Repository::~ACE_Service_Repository");
 #ifndef ACE_NLOGGING
   if(ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG, "ACE (%P|%t) SR::<dtor>, this=%@\n", this));
+    ACELIB_DEBUG ((LM_DEBUG, "ACE (%P|%t) SR::<dtor>, this=%@\n", this));
 #endif
   this->close ();
 }
@@ -341,13 +341,13 @@ ACE_Service_Repository::relocate_i (size_t begin,
       if (ACE::debug ())
         {
           if (type == 0)
-            ACE_DEBUG ((LM_DEBUG,
+            ACELIB_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("ACE (%P|%t) SR::relocate_i - repo=%@ [%d]")
                         ACE_TEXT (": skipping empty slot\n"),
                         this,
                         i));
           else
-            ACE_DEBUG ((LM_DEBUG,
+            ACELIB_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("ACE (%P|%t) SR::relocate_i - repo=%@ [%d]")
                         ACE_TEXT (": trying name=%s, handle: %d -> %d\n"),
                         this,
@@ -364,7 +364,7 @@ ACE_Service_Repository::relocate_i (size_t begin,
         {
 #ifndef ACE_NLOGGING
           if (ACE::debug ())
-            ACE_DEBUG ((LM_DEBUG,
+            ACELIB_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("ACE (%P|%t) SR::relocate_i - repo=%@ [%d]")
                         ACE_TEXT (": relocating name=%s, handle: %d -> %d\n"),
                         this,
@@ -437,7 +437,7 @@ ACE_Service_Repository::insert (const ACE_Service_Type *sr)
   }
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SR::insert - repo=%@ [%d],")
                 ACE_TEXT (" name=%s (%C) (type=%@, object=%@, active=%d)\n"),
                 this,
@@ -545,7 +545,7 @@ ACE_Service_Repository::remove_i (const ACE_TCHAR name[], ACE_Service_Type **ps)
 
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SR::remove_i - repo=%@ [%d],")
                 ACE_TEXT (" name=%s (removed) (type=%@, active=%d)\n"),
                 this,
diff --git a/dep/acelite/ace/Shared_Memory_Pool.cpp b/dep/acelite/ace/Shared_Memory_Pool.cpp
index 72e272517..df93cb166 100644
--- a/dep/acelite/ace/Shared_Memory_Pool.cpp
+++ b/dep/acelite/ace/Shared_Memory_Pool.cpp
@@ -1,9 +1,9 @@
-// $Id: Shared_Memory_Pool.cpp 91685 2010-09-09 09:35:14Z johnnyw $
+// $Id: Shared_Memory_Pool.cpp 97185 2013-05-30 18:51:35Z johnnyw $
 
 // Shared_Memory_Pool.cpp
 #include "ace/Shared_Memory_Pool.h"
 #include "ace/OS_NS_sys_shm.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 
 
@@ -49,12 +49,12 @@ ACE_Shared_Memory_Pool::in_use (ACE_OFF_T &offset,
        counter++)
     {
       if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("(%P|%t) %p\n"),
                            ACE_TEXT ("shmctl")),
                           -1);
       offset += buf.shm_segsz;
-      // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset));
+      // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset));
     }
 
   return 0;
@@ -75,7 +75,7 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr,
        counter++)
     {
       if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("(%P|%t) %p\n"),
                            ACE_TEXT ("shmctl")),
                           -1);
@@ -90,7 +90,7 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr,
           offset -= buf.shm_segsz;
           return 0;
         }
-      // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset));
+      // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset));
     }
 
   return 0;
@@ -109,7 +109,7 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
     return -1;
 
   if (counter == this->max_segments_)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                       "exceeded max number of segments = %d, base = %u, offset = %u\n",
                        counter,
                        this->base_addr_,
@@ -121,7 +121,7 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
                                   rounded_bytes,
                                   this->file_perms_ | IPC_CREAT | IPC_EXCL);
       if (shmid == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("(%P|%t) %p\n"),
                            ACE_TEXT ("shmget")),
                           -1);
@@ -134,7 +134,7 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
                                    0);
 
       if (shmem != address)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("(%P|%t) %p, shmem = %u, address = %u\n"),
                            ACE_TEXT("shmat"),
                            shmem,
@@ -144,37 +144,39 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
   return 0;
 }
 
-// Handle SIGSEGV and SIGBUS signals to remap shared memory properly.
-
+/// Handle SIGSEGV and SIGBUS signals to remap shared memory properly.
 int
-ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *)
+ACE_Shared_Memory_Pool::handle_signal (int, siginfo_t *siginfo, ucontext_t *)
 {
   ACE_TRACE ("ACE_Shared_Memory_Pool::handle_signal");
-  // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("signal %S occurred\n"), signum));
 
   // While FreeBSD 5.X has a siginfo_t struct with a si_addr field,
   // it does not define SEGV_MAPERR.
 #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR) && \
         (defined (SEGV_MAPERR) || defined (SEGV_MEMERR))
+  if (siginfo == 0)
+    return -1;
+
   ACE_OFF_T offset;
+
   // Make sure that the pointer causing the problem is within the
   // range of the backing store.
-
-  if (siginfo != 0)
+  // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr));
+  size_t counter = 0;
+  if (this->in_use (offset, counter) == -1)
     {
-      // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr));
-      size_t counter;
-      if (this->in_use (offset, counter) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) %p\n"),
-                    ACE_TEXT ("in_use")));
-      else if (!(siginfo->si_code == SEGV_MAPERR
-           && siginfo->si_addr < (((char *) this->base_addr_) + offset)
-           && siginfo->si_addr >= ((char *) this->base_addr_)))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) address %u out of range\n",
-                           siginfo->si_addr),
-                          -1);
+      ACELIB_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("in_use")));
+    }
+  else if (!(siginfo->si_code == SEGV_MAPERR
+        && siginfo->si_addr < (((char *) this->base_addr_) + offset)
+        && siginfo->si_addr >= ((char *) this->base_addr_)))
+    {
+      ACELIB_ERROR_RETURN ((LM_ERROR,
+                          "(%P|%t) address %u out of range\n",
+                          siginfo->si_addr),
+                        -1);
     }
 
   // The above if case will check to see that the address is in the
@@ -182,10 +184,9 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *)
   // pointer wants to point into.  Find the segment that someone else
   // has used and attach to it (flabar@vais.net)
 
-  size_t counter; // ret value to get shmid from the st table.
-
+  counter = 0; // ret value to get shmid from the st table.
   if (this->find_seg (siginfo->si_addr, offset, counter) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("(%P|%t) %p\n"),
                          ACE_TEXT ("in_use")),
                         -1);
@@ -196,7 +197,7 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *)
   void *shmem = ACE_OS::shmat (st[counter].shmid_, (char *) address, 0);
 
   if (shmem != address)
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT("(%P|%t) %p, shmem = %u, address = %u\n"),
                          ACE_TEXT("shmat"),
                          shmem,
@@ -260,7 +261,7 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (
     this->base_shm_key_ = ACE_DEFAULT_SHM_KEY;
 
   if (this->signal_handler_.register_handler (SIGSEGV, this) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Sig_Handler::register_handler")));
 }
@@ -279,14 +280,14 @@ ACE_Shared_Memory_Pool::acquire (size_t nbytes,
 
   rounded_bytes = this->round_up (nbytes);
 
-  // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes));
+  // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes));
 
   ACE_OFF_T offset;
 
   if (this->commit_backing_store_name (rounded_bytes, offset) == -1)
     return 0;
 
-  // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes));
+  // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes));
   return ((char *) this->base_addr_) + offset;
 }
 
@@ -313,7 +314,7 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes,
   if (shmid == -1)
     {
       if (errno != EEXIST)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("(%P|%t) %p\n"),
                            ACE_TEXT ("shmget")),
                           0);
@@ -322,7 +323,7 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes,
       shmid = ACE_OS::shmget (this->base_shm_key_, 0, 0);
 
       if (shmid == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("(%P|%t) %p\n"),
                            ACE_TEXT ("shmget")),
                           0);
@@ -334,7 +335,7 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes,
                        reinterpret_cast<char *> (this->base_addr_),
                        0);
       if (this->base_addr_ == reinterpret_cast<void *> (-1))
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("(%P|%t) %p, base_addr = %u\n"),
                            ACE_TEXT("shmat"),
                            this->base_addr_),
@@ -351,7 +352,7 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes,
                        reinterpret_cast<char *> (this->base_addr_),
                        0);
       if (this->base_addr_ == reinterpret_cast<char *> (-1))
-        ACE_ERROR_RETURN ((LM_ERROR,
+        ACELIB_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("(%P|%t) %p, base_addr = %u\n"),
                            ACE_TEXT("shmat"),
                            this->base_addr_), 0);
diff --git a/dep/acelite/ace/Shared_Memory_Pool.h b/dep/acelite/ace/Shared_Memory_Pool.h
index 79cb970e7..dbf5dac91 100644
--- a/dep/acelite/ace/Shared_Memory_Pool.h
+++ b/dep/acelite/ace/Shared_Memory_Pool.h
@@ -4,7 +4,7 @@
 /**
  *  @file     Shared_Memory_Pool.h
  *
- *  $Id: Shared_Memory_Pool.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: Shared_Memory_Pool.h 97185 2013-05-30 18:51:35Z johnnyw $
  *
  *  @author Dougls C. Schmidt <schmidt@cs.wustl.edu>
  *  @author Prashant Jain <pjain@cs.wustl.edu>
@@ -142,7 +142,7 @@ protected:
 
   /**
    * Commits a new shared memory segment if necessary after an
-   * <acquire> or a signal.  @a offset is set to the new offset into
+   * acquire() or a signal.  @a offset is set to the new offset into
    * the backing store.
    */
   virtual int commit_backing_store_name (size_t rounded_bytes,
@@ -198,7 +198,7 @@ protected:
 
   /// Handle SIGSEGV and SIGBUS signals to remap shared memory
   /// properly.
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
+  virtual int handle_signal (int, siginfo_t *siginfo, ucontext_t *);
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Sig_Adapter.cpp b/dep/acelite/ace/Sig_Adapter.cpp
index 856d61155..3861dbaa1 100644
--- a/dep/acelite/ace/Sig_Adapter.cpp
+++ b/dep/acelite/ace/Sig_Adapter.cpp
@@ -1,14 +1,13 @@
-// $Id: Sig_Adapter.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Sig_Adapter.cpp 96257 2012-11-12 13:35:09Z johnnyw $
 
 #include "ace/Sig_Adapter.h"
 
-
-
-
 ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Action &sa, int sigkey)
   : sigkey_ (sigkey),
     type_ (SIG_ACTION),
-    sa_ (sa)
+    sa_ (sa),
+    eh_ (0),
+    sig_func_ (0)
 {
   // ACE_TRACE ("ACE_Sig_Adapter::ACE_Sig_Adapter");
 }
@@ -17,7 +16,8 @@ ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Event_Handler *eh,
                                   int sigkey)
   : sigkey_ (sigkey),
     type_ (ACE_HANDLER),
-    eh_ (eh)
+    eh_ (eh),
+    sig_func_ (0)
 {
   // ACE_TRACE ("ACE_Sig_Adapter::ACE_Sig_Adapter");
 }
@@ -26,6 +26,7 @@ ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Handler_Ex sig_func,
                                   int sigkey)
   : sigkey_ (sigkey),
     type_ (C_FUNCTION),
+    eh_ (0),
     sig_func_ (sig_func)
 {
   // ACE_TRACE ("ACE_Sig_Adapter::ACE_Sig_Adapter");
diff --git a/dep/acelite/ace/Sig_Handler.cpp b/dep/acelite/ace/Sig_Handler.cpp
index 82ff19ebf..da84cbd14 100644
--- a/dep/acelite/ace/Sig_Handler.cpp
+++ b/dep/acelite/ace/Sig_Handler.cpp
@@ -1,4 +1,4 @@
-// $Id: Sig_Handler.cpp 91626 2010-09-07 10:59:20Z johnnyw $
+// $Id: Sig_Handler.cpp 97246 2013-08-07 07:10:20Z johnnyw $
 
 #include "ace/Sig_Handler.h"
 #include "ace/Sig_Adapter.h"
@@ -54,6 +54,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handler)
 
 ACE_Sig_Handler::~ACE_Sig_Handler (void)
 {
+  for (int s = 1; s < ACE_NSIG; ++s)
+    if (ACE_Sig_Handler::signal_handlers_[s])
+      ACE_Sig_Handler::remove_handler_i (s);
 }
 
 void
@@ -194,6 +197,33 @@ ACE_Sig_Handler::register_handler (int signum,
                                               old_disp);
 }
 
+int
+ACE_Sig_Handler::remove_handler_i (int signum,
+                                   ACE_Sig_Action *new_disp,
+                                   ACE_Sig_Action *old_disp,
+                                   int)
+{
+  ACE_TRACE ("ACE_Sig_Handler::remove_handler_i");
+
+  ACE_Sig_Action sa (SIG_DFL, (sigset_t *) 0); // Reset to default disposition.
+
+  if (new_disp == 0)
+    new_disp = &sa;
+
+  ACE_Event_Handler *eh = ACE_Sig_Handler::signal_handlers_[signum];
+  ACE_Sig_Handler::signal_handlers_[signum] = 0;
+
+  // Allow the event handler to close down if necessary.
+  if (eh)
+    {
+      eh->handle_close (ACE_INVALID_HANDLE,
+                        ACE_Event_Handler::SIGNAL_MASK);
+    }
+
+  // Register either the new disposition or restore the default.
+  return new_disp->register_action (signum, old_disp);
+}
+
 // Remove an ACE_Event_Handler.
 
 int
@@ -209,17 +239,7 @@ ACE_Sig_Handler::remove_handler (int signum,
     ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1));
 
   if (ACE_Sig_Handler::in_range (signum))
-    {
-      ACE_Sig_Action sa (SIG_DFL, (sigset_t *) 0); // Define the default disposition.
-
-      if (new_disp == 0)
-        new_disp = &sa;
-
-      ACE_Sig_Handler::signal_handlers_[signum] = 0;
-
-      // Register either the new disposition or restore the default.
-      return new_disp->register_action (signum, old_disp);
-    }
+    return ACE_Sig_Handler::remove_handler_i (signum, new_disp, old_disp);
 
   return -1;
 }
@@ -249,20 +269,7 @@ ACE_Sig_Handler::dispatch (int signum,
   if (eh != 0)
     {
       if (eh->handle_signal (signum, siginfo, ucontext) == -1)
-        {
-          // Define the default disposition.
-          ACE_Sig_Action sa ((ACE_SignalHandler) SIG_DFL, (sigset_t *) 0);
-
-          ACE_Sig_Handler::signal_handlers_[signum] = 0;
-
-          // Remove the current disposition by registering the default
-          // disposition.
-          sa.register_action (signum);
-
-          // Allow the event handler to close down if necessary.
-          eh->handle_close (ACE_INVALID_HANDLE,
-                            ACE_Event_Handler::SIGNAL_MASK);
-        }
+        ACE_Sig_Handler::remove_handler_i (signum);
 #if defined (ACE_WIN32)
       else
         // Win32 is weird in the sense that it resets the signal
@@ -322,6 +329,10 @@ ACE_Sig_Handlers_Set::instance (int signum)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handlers)
 
+ACE_Sig_Handlers::ACE_Sig_Handlers (void)
+{
+}
+
 void
 ACE_Sig_Handlers::dump (void) const
 {
diff --git a/dep/acelite/ace/Sig_Handler.h b/dep/acelite/ace/Sig_Handler.h
index df1f0bfc4..214efa73f 100644
--- a/dep/acelite/ace/Sig_Handler.h
+++ b/dep/acelite/ace/Sig_Handler.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Sig_Handler.h
  *
- *  $Id: Sig_Handler.h 84727 2009-03-05 19:22:29Z johnnyw $
+ *  $Id: Sig_Handler.h 97246 2013-08-07 07:10:20Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -131,6 +131,11 @@ protected:
                                  ACE_Event_Handler **old_sh = 0,
                                  ACE_Sig_Action *old_disp = 0);
 
+  static int remove_handler_i (int signum,
+                               ACE_Sig_Action *new_disp = 0,
+                               ACE_Sig_Action *old_disp = 0,
+                               int sigkey = -1);
+
   /// Check whether the SIGNUM is within the legal range of signals.
   static int in_range (int signum);
 
@@ -160,6 +165,9 @@ private:
 class ACE_Export ACE_Sig_Handlers : public ACE_Sig_Handler
 {
 public:
+  /// Default constructor
+  ACE_Sig_Handlers (void);
+
   // = Registration and removal methods.
   /**
    * Add a new ACE_Event_Handler and a new sigaction associated with
diff --git a/dep/acelite/ace/Sig_Handler.inl b/dep/acelite/ace/Sig_Handler.inl
index de02c09ab..a7f9c73ab 100644
--- a/dep/acelite/ace/Sig_Handler.inl
+++ b/dep/acelite/ace/Sig_Handler.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Sig_Handler.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Sig_Handler.inl 96181 2012-10-08 13:30:13Z shuston $
 
 ACE_INLINE
 ACE_Sig_Handler::ACE_Sig_Handler (void)
diff --git a/dep/acelite/ace/Signal.cpp b/dep/acelite/ace/Signal.cpp
index 69f0d29b5..6bdae8409 100644
--- a/dep/acelite/ace/Signal.cpp
+++ b/dep/acelite/ace/Signal.cpp
@@ -1,7 +1,7 @@
-// $Id: Signal.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Signal.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Signal.h"
-// #include "ace/Log_Msg.h"
+// #include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Signal.inl"
diff --git a/dep/acelite/ace/Signal.h b/dep/acelite/ace/Signal.h
index 5dc26ff71..4a95c98ba 100644
--- a/dep/acelite/ace/Signal.h
+++ b/dep/acelite/ace/Signal.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Signal.h
  *
- *  $Id: Signal.h 94454 2011-09-08 17:36:56Z johnnyw $
+ *  $Id: Signal.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -14,7 +14,7 @@
 #define ACE_SIGNAL_H
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if defined (ACE_DONT_INCLUDE_ACE_SIGNAL_H)
 # error ace/Signal.h was #included instead of signal.h by ace/OS_NS_signal.h:  fix!!!!
@@ -28,7 +28,7 @@
 
 #include "ace/OS_NS_signal.h"
 
-// Type of the extended signal handler.
+/// Type of the extended signal handler.
 typedef void (*ACE_Sig_Handler_Ex) (int, siginfo_t *siginfo, ucontext_t *ucontext);
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Singleton.cpp b/dep/acelite/ace/Singleton.cpp
index 80cacc991..d84ab928f 100644
--- a/dep/acelite/ace/Singleton.cpp
+++ b/dep/acelite/ace/Singleton.cpp
@@ -1,4 +1,4 @@
-// $Id: Singleton.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: Singleton.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_SINGLETON_CPP
 #define ACE_SINGLETON_CPP
@@ -14,7 +14,7 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Object_Manager.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Framework_Component.h"
 #include "ace/Guard_T.h"
 #include "ace/os_include/os_typeinfo.h"
@@ -28,9 +28,9 @@ ACE_Singleton<TYPE, ACE_LOCK>::dump (void)
   ACE_TRACE ("ACE_Singleton<TYPE, ACE_LOCK>::dump");
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
               ACE_Singleton<TYPE, ACE_LOCK>::instance_i ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 #endif /* ACE_HAS_DUMP */
 }
@@ -138,9 +138,9 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void)
   ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump");
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
               ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 #endif /* ACE_HAS_DUMP */
 }
@@ -228,9 +228,9 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
   ACE_TRACE ("ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump");
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
               ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 #endif /* ACE_HAS_DUMP */
 }
@@ -316,9 +316,9 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
   ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump");
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
               ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 #endif /* ACE_HAS_DUMP */
 }
@@ -422,9 +422,9 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump (void)
   ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump");
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
               ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance_i ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 #endif /* ACE_HAS_DUMP */
 }
diff --git a/dep/acelite/ace/Sock_Connect.cpp b/dep/acelite/ace/Sock_Connect.cpp
index 77c5e4af9..de7215f37 100644
--- a/dep/acelite/ace/Sock_Connect.cpp
+++ b/dep/acelite/ace/Sock_Connect.cpp
@@ -1,8 +1,8 @@
-// $Id: Sock_Connect.cpp 95628 2012-03-21 22:10:02Z shuston $
+// $Id: Sock_Connect.cpp 97798 2014-07-03 10:57:43Z johnnyw $
 
 #include "ace/Sock_Connect.h"
 #include "ace/INET_Addr.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Handle_Set.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
@@ -182,7 +182,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
     s = ACE_OS::socket (AF_INET, SOCK_STREAM, 0);
 
   if (s == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("ACE_OS::socket")),
                       -1);
@@ -196,7 +196,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
   // Get interface structure and initialize the addresses using UNIX
   // techniques
   if (ACE_OS::ioctl (s, SIOCGIFCONF_CMD, (char *) &ifc) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("ACE::get_bcast_addr:")
                        ACE_TEXT ("ioctl (get interface configuration)")),
@@ -253,7 +253,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
 
       if (ifr->ifr_addr.sa_family != AF_INET)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("ACE::get_bcast_addr:")
                       ACE_TEXT ("Not AF_INET")));
@@ -265,7 +265,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
 
       if (ACE_OS::ioctl (s, SIOCGIFFLAGS, (char *) &flags) == -1)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("ACE::get_bcast_addr:")
                       ACE_TEXT (" ioctl (get interface flags)")));
@@ -274,7 +274,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
 
       if (ACE_BIT_DISABLED (flags.ifr_flags, IFF_UP))
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("ACE::get_bcast_addr:")
                       ACE_TEXT ("Network interface is not up")));
@@ -289,7 +289,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
           if (ACE_OS::ioctl (s,
                              SIOCGIFBRDADDR,
                              (char *) &if_req) == -1)
-            ACE_ERROR ((LM_ERROR,
+            ACELIB_ERROR ((LM_ERROR,
                         ACE_TEXT ("%p\n"),
                         ACE_TEXT ("ACE::get_bcast_addr:")
                         ACE_TEXT ("ioctl (get broadaddr)")));
@@ -311,10 +311,10 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
             }
         }
       else
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("%p\n"),
                     ACE_TEXT ("ACE::get_bcast_addr:")
-                    ACE_TEXT ("Broadcast is not enable for this interface.")));
+                    ACE_TEXT ("Broadcast is not enabled for this interface.")));
 
       if (handle == ACE_INVALID_HANDLE)
         ACE_OS::close (s);
@@ -376,7 +376,7 @@ ACE::get_fqdn (ACE_INET_Addr const & addr,
      return -1;
 
    if (ACE::debug())
-     ACE_DEBUG ((LM_DEBUG,
+     ACELIB_DEBUG ((LM_DEBUG,
                  ACE_TEXT ("(%P|%t) - ACE::get_fqdn, ")
                  ACE_TEXT ("canonical host name is %C\n"),
                  hp->h_name));
@@ -409,7 +409,7 @@ ACE::get_fqdn (ACE_INET_Addr const & addr,
                      continue;
 
                    if (ACE::debug ())
-                     ACE_DEBUG ((LM_DEBUG,
+                     ACELIB_DEBUG ((LM_DEBUG,
                                  ACE_TEXT ("(%P|%t) - ACE::get_fqdn, ")
                                  ACE_TEXT ("found fqdn within alias as %C\n"),
                                  *q));
@@ -744,6 +744,7 @@ get_ip_interfaces_win32 (size_t &count,
 
 # endif /* ACE_HAS_WINCE */
 }
+
 #elif defined (ACE_HAS_GETIFADDRS)
 static int
 get_ip_interfaces_getifaddrs (size_t &count,
@@ -833,7 +834,7 @@ get_ip_interfaces_hpux (size_t &count,
   ACE_HANDLE handle_ipv6 = ACE_INVALID_HANDLE;
 
   if (handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("ACE::get_ip_interfaces:open")),
                       -1);
@@ -897,7 +898,7 @@ get_ip_interfaces_hpux (size_t &count,
                      (char *) &ifcfg) == -1)
     {
       ACE_OS::close (handle);
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("%p\n"),
                          ACE_TEXT ("ACE::get_ip_interfaces:")
                          ACE_TEXT ("ioctl - SIOCGIFCONF failed")),
@@ -962,7 +963,7 @@ get_ip_interfaces_hpux (size_t &count,
                          (char *) &lifcfg) == -1)
         {
           ACE_OS::close (handle);
-          ACE_ERROR_RETURN ((LM_ERROR,
+          ACELIB_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("%p\n"),
                              ACE_TEXT ("ACE::get_ip_interfaces:")
                              ACE_TEXT ("ioctl - SIOCGLIFCONF failed")),
@@ -1001,7 +1002,7 @@ get_ip_interfaces_aix (size_t &count,
   struct ifconf ifc;
 
   if (handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("ACE::get_ip_interfaces_aix:")),
                       -1);
@@ -1011,7 +1012,7 @@ get_ip_interfaces_aix (size_t &count,
                      (caddr_t)&ifc.ifc_len) == -1)
   {
       ACE_OS::close (handle);
-      ACE_ERROR_RETURN((LM_ERROR,
+      ACELIB_ERROR_RETURN((LM_ERROR,
                         ACE_TEXT ("%p\n"),
                         ACE_TEXT ("get ifconf size")),
                        -1);
@@ -1025,7 +1026,7 @@ get_ip_interfaces_aix (size_t &count,
   if (ACE_OS::ioctl(handle, SIOCGIFCONF, (caddr_t)&ifc) == -1)
   {
       ACE_OS::close (handle);
-      ACE_ERROR_RETURN((LM_ERROR,
+      ACELIB_ERROR_RETURN((LM_ERROR,
                         ACE_TEXT ("%p\n"),
                         ACE_TEXT ("get ifconf")),
                        -1);
@@ -1101,7 +1102,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs)
   ACE_HANDLE handle = ACE::get_handle();
 
   if (handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("ACE::get_ip_interfaces:open")),
                       -1);
@@ -1149,7 +1150,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs)
                      (caddr_t) &ifcfg) == -1)
     {
       ACE_OS::close (handle);
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("%p\n"),
                          ACE_TEXT ("ACE::get_ip_interfaces:")
                          ACE_TEXT ("ioctl - SIOCGIFCONF failed")),
@@ -1293,7 +1294,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
   int if_num = 0;
 # endif /* SIOCGLIFNUM */
   if (ACE_OS::ioctl (handle, cmd, (caddr_t)&if_num) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("ACE::count_interfaces:")
                        ACE_TEXT ("ioctl - SIOCGLIFNUM failed")),
@@ -1312,10 +1313,10 @@ return 0;
   // algorithm
 
   // Probably hard to put this many ifs in a unix box..
-  int const MAX_IF = 50;
+  int const MAX_INTERFACES = 50;
 
   // HACK - set to an unreasonable number
-  int const num_ifs = MAX_IF;
+  int const num_ifs = MAX_INTERFACES;
 
   struct ifconf ifcfg;
   size_t ifreq_size = num_ifs * sizeof (struct ifreq);
@@ -1338,7 +1339,7 @@ return 0;
                      (caddr_t) &ifcfg) == -1)
     {
       ACE_OS::free (ifcfg.ifc_req);
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("%p\n"),
                          ACE_TEXT ("ACE::count_interfaces:")
                          ACE_TEXT ("ioctl - SIOCGIFCONF failed")),
@@ -1430,8 +1431,26 @@ ip_check (int &ipvn_enabled, int pf)
 
   if (ipvn_enabled == -1)
     {
+
+#if defined (ACE_WIN32)
+      // as of the release of Windows 2008, even hosts that have IPv6 interfaces disabled
+      // will still permit the creation of a PF_INET6 socket, thus rendering the socket
+      // creation test inconsistent. The reccommended solution is to get the list of
+      // endpoint addresses and see if any match the desired family.
+      ACE_INET_Addr *if_addrs = 0;
+      size_t if_cnt = 0;
+
+      ipvn_enabled = 1; // assume enabled to avoid recursion during interface lookup.
+      ACE::get_ip_interfaces (if_cnt, if_addrs);
+      ipvn_enabled = 0;
+      for (size_t i = 0; ipvn_enabled == 0 && i < if_cnt; i++)
+        {
+          ipvn_enabled = (if_addrs[i].get_type () == pf);
+        }
+      delete [] if_addrs;
+#else
       // Determine if the kernel has IPv6 support by attempting to
-      // create a PF_INET socket and see if it fails.
+      // create a PF_INET6 socket and see if it fails.
       ACE_HANDLE const s = ACE_OS::socket (pf, SOCK_DGRAM, 0);
       if (s == ACE_INVALID_HANDLE)
         {
@@ -1442,6 +1461,7 @@ ip_check (int &ipvn_enabled, int pf)
           ipvn_enabled = 1;
           ACE_OS::closesocket (s);
         }
+#endif
     }
   return ipvn_enabled;
 }
diff --git a/dep/acelite/ace/Stack_Trace.h b/dep/acelite/ace/Stack_Trace.h
index 09febe40c..bfef0ab64 100644
--- a/dep/acelite/ace/Stack_Trace.h
+++ b/dep/acelite/ace/Stack_Trace.h
@@ -3,7 +3,7 @@
 /**
  *  @file   Stack_Trace.h
  *
- *  $Id: Stack_Trace.h 91743 2010-09-13 18:24:51Z johnnyw $
+ *  $Id: Stack_Trace.h 97426 2013-11-12 09:59:19Z johnnyw $
  *
  *  @author Chris Cleeland (cleeland.ociweb.com)
  */
@@ -40,10 +40,10 @@
  *  it in an ACE logging message.  The following are functionally equivalent:
  *
  *  \code
- *     ACE_DEBUG((LM_DEBUG, "%?"));
+ *     ACELIB_DEBUG((LM_DEBUG, "%?"));
  *
  *     ACE_Stack_Trace st;
- *     ACE_DEBUG ((LM_DEBUG, "%s", st.c_str() ));
+ *     ACELIB_DEBUG ((LM_DEBUG, "%C", st.c_str() ));
  *  \endcode
  *
  *  These usage examples were shown in $ACE_ROOT/tests/Stack_Trace_Test.cpp.
diff --git a/dep/acelite/ace/Stats.h b/dep/acelite/ace/Stats.h
index 2590ec95c..f529a90d3 100644
--- a/dep/acelite/ace/Stats.h
+++ b/dep/acelite/ace/Stats.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Stats.h
  *
- *  $Id: Stats.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: Stats.h 96985 2013-04-11 15:50:32Z huangh $
  *
  *  @author David L. Levine
  */
@@ -23,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Unbounded_Queue.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Basic_Stats.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Stats.inl b/dep/acelite/ace/Stats.inl
index 4c76838c2..a27b0d6ba 100644
--- a/dep/acelite/ace/Stats.inl
+++ b/dep/acelite/ace/Stats.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Stats.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Stats.inl 96985 2013-04-11 15:50:32Z huangh $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -59,7 +59,7 @@ void
 ACE_Stats_Value::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("precision: %u digits; whole: %u, fractional: %u\n"),
               precision_, whole_, fractional_));
 #endif /* ACE_HAS_DUMP */
diff --git a/dep/acelite/ace/Strategies_T.cpp b/dep/acelite/ace/Strategies_T.cpp
index 28d786489..e205ca359 100644
--- a/dep/acelite/ace/Strategies_T.cpp
+++ b/dep/acelite/ace/Strategies_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Strategies_T.cpp 95630 2012-03-22 13:04:47Z johnnyw $
+// $Id: Strategies_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_STRATEGIES_T_CPP
 #define ACE_STRATEGIES_T_CPP
@@ -276,7 +276,7 @@ ACE_Thread_Strategy<SVC_HANDLER>::open (ACE_Thread_Manager *thr_mgr,
 
   // Must have a thread manager!
   if (this->thr_mgr_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("error: must have a non-NULL thread manager\n")),
                       -1);
   else
@@ -314,7 +314,9 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open
   // socket handle is "ready" and when we call <accept>.  During this
   // interval, the client can shutdown the connection, in which case,
   // the <accept> call can hang!
-  this->peer_acceptor_.enable (ACE_NONBLOCK);
+  if (this->peer_acceptor_.enable (ACE_NONBLOCK) == -1)
+    return -1;
+
   return 0;
 }
 
@@ -328,7 +330,7 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy
   ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy");
 
   if (this->open (local_addr, reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("open")));
 }
@@ -441,7 +443,7 @@ ACE_Process_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handle
         ACE_Errno_Guard error (errno);
         svc_handler->close ();
       }
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("%p\n"),
                          ACE_TEXT ("fork")),
                         -1);
@@ -499,7 +501,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cache
   if (this->open (cre_s,
                   con_s,
                   rec_s) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Cached_Connect_Strategy::ACE_Cached_Connect_Strategy")));
 }
@@ -1380,8 +1382,8 @@ ACE_Scheduling_Strategy<SVC_HANDLER>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Strategies_T.h b/dep/acelite/ace/Strategies_T.h
index 25cd265f6..67906f4a7 100644
--- a/dep/acelite/ace/Strategies_T.h
+++ b/dep/acelite/ace/Strategies_T.h
@@ -4,7 +4,7 @@
 /**
  *  @file   Strategies_T.h
  *
- *  $Id: Strategies_T.h 91688 2010-09-09 11:21:50Z johnnyw $
+ *  $Id: Strategies_T.h 97110 2013-05-10 08:03:33Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
diff --git a/dep/acelite/ace/Strategies_T.inl b/dep/acelite/ace/Strategies_T.inl
index b13479286..22fa2c763 100644
--- a/dep/acelite/ace/Strategies_T.inl
+++ b/dep/acelite/ace/Strategies_T.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Strategies_T.inl 91688 2010-09-09 11:21:50Z johnnyw $
+// $Id: Strategies_T.inl 96985 2013-04-11 15:50:32Z huangh $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -12,7 +12,7 @@ ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy (SVC_HANDLER *sh,
 {
   ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy");
   if (this->open (sh, tm) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Singleton_Strategy")));
 }
@@ -33,7 +33,7 @@ ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy (ACE_Thread_Manager *t
 {
   ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy");
   if (this->open (thr_mgr, reactor) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Creation_Strategy")));
 }
@@ -51,7 +51,7 @@ ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const ACE_TCHAR dll_name[],
                   svc_name,
                   svc_rep,
                   thr_mgr) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("open")));
 }
@@ -79,7 +79,7 @@ ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (ACE_Reactor *reactor,
   if (this->open (reactor,
                   mask,
                   flags) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy")));
 }
@@ -105,7 +105,7 @@ ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (ACE_Thread_Manager *thr_m
                   thr_flags,
                   n_threads,
                   flags) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy")));
 }
@@ -144,7 +144,7 @@ ACE_Process_Strategy<SVC_HANDLER>::ACE_Process_Strategy (size_t n_processes,
                   acceptor,
                   reactor,
                   avoid_zombies) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Process_Strategy")));
 }
diff --git a/dep/acelite/ace/Stream.cpp b/dep/acelite/ace/Stream.cpp
index 6f30f8636..d74aca51f 100644
--- a/dep/acelite/ace/Stream.cpp
+++ b/dep/acelite/ace/Stream.cpp
@@ -1,5 +1,5 @@
 // Stream.cpp
-// $Id: Stream.cpp 96070 2012-08-17 09:07:16Z mcorino $
+// $Id: Stream.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_STREAM_CPP
 #define ACE_STREAM_CPP
@@ -30,18 +30,18 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::dump");
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("-------- module links --------\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("-------- module links --------\n")));
 
   for (ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *mp = this->stream_head_;
        ;
        mp = mp->next ())
     {
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("module name = %s\n"), mp->name ()));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("module name = %s\n"), mp->name ()));
       if (mp == this->stream_tail_)
         break;
     }
 
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("-------- writer links --------\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("-------- writer links --------\n")));
 
   ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *tp;
 
@@ -49,21 +49,21 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
        ;
        tp = tp->next ())
     {
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("writer queue name = %s\n"), tp->name ()));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("writer queue name = %s\n"), tp->name ()));
       tp->dump ();
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("-------\n")));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("-------\n")));
       if (tp == this->stream_tail_->writer ()
           || (this->linked_us_
               && tp == this->linked_us_->stream_head_->reader ()))
         break;
     }
 
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("-------- reader links --------\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("-------- reader links --------\n")));
   for (tp = this->stream_tail_->reader (); ; tp = tp->next ())
     {
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("reader queue name = %s\n"), tp->name ()));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("reader queue name = %s\n"), tp->name ()));
       tp->dump ();
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("-------\n")));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("-------\n")));
       if (tp == this->stream_head_->reader ()
           || (this->linked_us_
               && tp == this->linked_us_->stream_head_->writer ()))
@@ -246,7 +246,7 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::remove (const ACE_TCHAR *name,
 #ifndef ACE_NLOGGING
     if (ACE::debug ())
     {
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
         ACE_TEXT ("ACE_Stream::remove - comparing existing module :%s: with :%s:\n"),
         mod->name (),
         name));
@@ -276,7 +276,7 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::remove (const ACE_TCHAR *name,
       prev = mod;
   }
 
-  ACE_DEBUG ((LM_WARNING,  ACE_TEXT ("ACE_Stream::remove failed to find module with name %s to remove\n"),name));
+  ACELIB_DEBUG ((LM_WARNING,  ACE_TEXT ("ACE_Stream::remove failed to find module with name %s to remove\n"),name));
   return -1;
 }
 
@@ -612,7 +612,7 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream (void * a,
 {
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream");
   if (this->open (a, head, tail) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::open (%s, %s)\n"),
                head->name (), tail->name ()));
 }
diff --git a/dep/acelite/ace/Svc_Conf_y.cpp b/dep/acelite/ace/Svc_Conf_y.cpp
index 8aa656ff3..125e148ae 100644
--- a/dep/acelite/ace/Svc_Conf_y.cpp
+++ b/dep/acelite/ace/Svc_Conf_y.cpp
@@ -1,4 +1,4 @@
-// $Id: Svc_Conf_y.cpp 94034 2011-05-09 19:11:03Z johnnyw $
+// $Id: Svc_Conf_y.cpp 96985 2013-04-11 15:50:32Z huangh $
 /* A Bison parser, made by GNU Bison 2.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
@@ -105,7 +105,7 @@
 /* Copy the first part of user declarations.  */
 
 
-// $Id: Svc_Conf_y.cpp 94034 2011-05-09 19:11:03Z johnnyw $
+// $Id: Svc_Conf_y.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Svc_Conf.h"
 
@@ -1573,7 +1573,7 @@ ace_yyreduce:
 
       if (((ACE_Stream_Type *) sn->record (ACE_SVC_CONF_PARAM->config)->type ())->push (mt) == -1)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("Problem with static\n")));
           ACE_SVC_CONF_PARAM->yyerrno++;
         }
@@ -1617,7 +1617,7 @@ ace_yyreduce:
         dynamic_cast<ACE_Stream_Type *> (const_cast<ACE_Service_Type_Impl *> (stream->record (ACE_SVC_CONF_PARAM->config)->type ()));
       if (!st || (mt != 0 && st->remove (mt) == -1))
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"),
                       module->name (),
                       stream->name ()));
@@ -1934,7 +1934,7 @@ ace_yyerror (int ace_yyerrno, int ace_yylineno, ACE_TCHAR const * s)
   ACE_UNUSED_ARG (s);
 #endif /* ACE_NLOGGING */
 
-  ACE_ERROR ((LM_ERROR,
+  ACELIB_ERROR ((LM_ERROR,
               ACE_TEXT ("ACE (%P|%t) [error %d] on line %d: %C\n"),
               ace_yyerrno,
               ace_yylineno,
@@ -1963,7 +1963,7 @@ ace_get_module (ACE_Service_Type const * sr,
 
   if (sr == 0 || st == 0 || mt == 0)
     {
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("cannot locate Module_Type %s ")
                   ACE_TEXT ("in STREAM_Type %s\n"),
                   svc_name,
diff --git a/dep/acelite/ace/Svc_Handler.cpp b/dep/acelite/ace/Svc_Handler.cpp
index 565d96c5c..76fb03170 100644
--- a/dep/acelite/ace/Svc_Handler.cpp
+++ b/dep/acelite/ace/Svc_Handler.cpp
@@ -1,4 +1,4 @@
-// $Id: Svc_Handler.cpp 94310 2011-07-09 19:10:06Z schmidt $
+// $Id: Svc_Handler.cpp 97075 2013-04-24 15:01:48Z schmidt $
 
 #ifndef ACE_SVC_HANDLER_CPP
 #define ACE_SVC_HANDLER_CPP
@@ -15,31 +15,28 @@
 
 #include "ace/Dynamic.h"
 
-#define PR_ST_1 ACE_PEER_STREAM_1
-#define PR_ST_2 ACE_PEER_STREAM_2
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template <PR_ST_1, ACE_SYNCH_DECL> void *
-ACE_Svc_Handler<PR_ST_2,  ACE_SYNCH_USE>::operator new (size_t, void *p)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void *
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new (size_t, void *p)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (NOOP, 2 parameters)");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new (NOOP, 2 parameters)");
   return p;
 }
 
 #if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
-template <PR_ST_1, ACE_SYNCH_DECL> void
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *, void *)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (void *, void *)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (NOOP, 2 parameters)");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (NOOP, 2 parameters)");
   return;
 }
 #endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
 
-template <PR_ST_1, ACE_SYNCH_DECL> void *
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (size_t n)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void *
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new (size_t n)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new");
 
   ACE_Dynamic *const dynamic_instance = ACE_Dynamic::instance ();
 
@@ -63,11 +60,11 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (size_t n)
 }
 
 #if defined (ACE_HAS_NEW_NOTHROW)
-template <PR_ST_1, ACE_SYNCH_DECL> void *
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (size_t n,
-                                                       const ACE_nothrow_t&) throw()
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void *
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new (size_t n,
+                                                          const ACE_nothrow_t&) throw()
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new(nothrow)");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new(nothrow)");
 
   ACE_Dynamic *const dynamic_instance = ACE_Dynamic::instance ();
 
@@ -91,21 +88,21 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (size_t n,
 }
 
 #if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
-template <PR_ST_1, ACE_SYNCH_DECL> void
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *p,
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (void *p,
                                          const ACE_nothrow_t&) throw()
 {
-  ACE_TRACE("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete(nothrow)");
+  ACE_TRACE("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete(nothrow)");
   ::delete [] static_cast <char *> (p);
 }
 #endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
 
 #endif /* ACE_HAS_NEW_NOTHROW */
 
-template <PR_ST_1, ACE_SYNCH_DECL> void
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::destroy (void)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::destroy (void)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::destroy");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::destroy");
 
   // Only delete ourselves if we're not owned by a module and have
   // been allocated dynamically.
@@ -117,10 +114,10 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::destroy (void)
     delete this;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> void
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *obj)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (void *obj)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete");
   // You cannot delete a 'void*' (X3J16/95-0087 5.3.5.3), but we know
   // the pointer was created using new char[] (see operator new code),
   // so we use a cast:
@@ -129,16 +126,16 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *obj)
 
 // Default constructor.
 
-template <PR_ST_1, ACE_SYNCH_DECL>
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Svc_Handler (ACE_Thread_Manager *tm,
-                                                          ACE_Message_Queue<ACE_SYNCH_USE> *mq,
+template <typename PEER_STREAM, typename SYNCH_TRAITS>
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::ACE_Svc_Handler (ACE_Thread_Manager *tm,
+                                                          ACE_Message_Queue<SYNCH_TRAITS> *mq,
                                                           ACE_Reactor *reactor)
-  : ACE_Task<ACE_SYNCH_USE> (tm, mq),
+  : ACE_Task<SYNCH_TRAITS> (tm, mq),
     closing_ (false),
     recycler_ (0),
     recycling_act_ (0)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Svc_Handler");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::ACE_Svc_Handler");
 
   this->reactor (reactor);
 
@@ -159,34 +156,34 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Svc_Handler (ACE_Thread_Manager *tm
 // Default behavior for a ACE_Svc_Handler object is to be registered
 // with the ACE_Reactor (thereby ensuring single threading).
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::open (void *)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open");
-#if defined (ACE_DEBUGGING)
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::open");
+#if defined (ACELIB_DEBUGGING)
   ACE_TCHAR buf[BUFSIZ];
   ACE_PEER_STREAM_ADDR client_addr;
 
   if (this->peer_.get_remote_addr (client_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("get_remote_addr")),
                       -1);
   else if (client_addr.addr_to_string (buf, sizeof buf) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("can't obtain peer's address")),
                       -1);
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("connected to %s on fd %d\n"),
               buf,
               this->peer_.get_handle ()));
-#endif /* ACE_DEBUGGING */
+#endif /* ACELIB_DEBUGGING */
   if (this->reactor ()
       && this->reactor ()->register_handler
       (this,
        ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("unable to register client handler")),
                       -1);
@@ -195,10 +192,10 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *)
 
 // Perform termination activities.
 
-template <PR_ST_1, ACE_SYNCH_DECL> void
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::shutdown (void)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::shutdown (void)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::shutdown");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::shutdown");
 
   // Deregister this handler with the ACE_Reactor.
   if (this->reactor ())
@@ -221,10 +218,10 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::shutdown (void)
   this->peer ().close ();
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> void
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::cleanup_hint (void **act_holder)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::cleanup_hint (void **act_holder)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::cleanup_hint");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::cleanup_hint");
 
   // Remove as hint.
   if (this->recycler ())
@@ -232,57 +229,57 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::cleanup_hint (void **act_holder)
                                      act_holder);
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> void
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump (void) const
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump");
 
   this->peer_.dump ();
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               "dynamic_ = %d\n",
               this->dynamic_));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               "closing_ = %d\n",
               this->closing_));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               "recycler_ = %d\n",
               this->recycler_));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               "recycling_act_ = %d\n",
               this->recycling_act_));
 #endif /* ACE_HAS_DUMP */
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> ACE_PEER_STREAM &
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::peer (void) const
+template <typename PEER_STREAM, typename SYNCH_TRAITS> PEER_STREAM &
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::peer (void) const
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::peer");
-  return (ACE_PEER_STREAM &) this->peer_;
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::peer");
+  return (PEER_STREAM &) this->peer_;
 }
 
 // Extract the underlying I/O descriptor.
 
-template <PR_ST_1, ACE_SYNCH_DECL> ACE_HANDLE
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::get_handle (void) const
+template <typename PEER_STREAM, typename SYNCH_TRAITS> ACE_HANDLE
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::get_handle (void) const
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::get_handle");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::get_handle");
   return this->peer_.get_handle ();
 }
 
 // Set the underlying I/O descriptor.
 
-template <PR_ST_1, ACE_SYNCH_DECL> void
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::set_handle (ACE_HANDLE h)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::set_handle (ACE_HANDLE h)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::set_handle");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::set_handle");
   this->peer_.set_handle (h);
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL>
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::~ACE_Svc_Handler (void)
+template <typename PEER_STREAM, typename SYNCH_TRAITS>
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Svc_Handler (void)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::~ACE_Svc_Handler");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Svc_Handler");
 
   if (this->closing_ == false)
     {
@@ -295,11 +292,11 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::~ACE_Svc_Handler (void)
     }
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_close (ACE_HANDLE,
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::handle_close (ACE_HANDLE,
                                                        ACE_Reactor_Mask)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_close");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::handle_close");
 
   if (this->reference_counting_policy ().value () ==
       ACE_Event_Handler::Reference_Counting_Policy::DISABLED)
@@ -310,45 +307,45 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_close (ACE_HANDLE,
   return 0;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout (const ACE_Time_Value &,
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::handle_timeout (const ACE_Time_Value &,
                                                          const void *)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::handle_timeout");
   return this->handle_close ();
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::close (u_long)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::close (u_long)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::close");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::close");
   return this->handle_close ();
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::init (int /* argc */,
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::init (int /* argc */,
                                                ACE_TCHAR * /* argv */[])
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::init");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::init");
   return -1;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::fini (void)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::fini (void)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::fini");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::fini");
   return -1;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::info (ACE_TCHAR **, size_t) const
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::info (ACE_TCHAR **, size_t) const
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::info");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::info");
   return -1;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::idle (u_long flags)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::idle (u_long flags)
 {
   if (this->recycler ())
     return this->recycler ()->cache (this->recycling_act_);
@@ -356,8 +353,8 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::idle (u_long flags)
     return this->close (flags);
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle_state (ACE_Recyclable_State new_state)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle_state (ACE_Recyclable_State new_state)
 {
   if (this->recycler ())
     return this->recycler ()->recycle_state (this->recycling_act_,
@@ -366,8 +363,8 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle_state (ACE_Recyclable_State new
   return 0;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> ACE_Recyclable_State
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle_state (void) const
+template <typename PEER_STREAM, typename SYNCH_TRAITS> ACE_Recyclable_State
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle_state (void) const
 {
   if (this->recycler ())
     return this->recycler ()->recycle_state (this->recycling_act_);
@@ -375,55 +372,55 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle_state (void) const
   return ACE_RECYCLABLE_UNKNOWN;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> void
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycler (ACE_Connection_Recycling_Strategy *recycler,
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler (ACE_Connection_Recycling_Strategy *recycler,
                                                    const void *recycling_act)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycler");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler");
   this->recycler_ = recycler;
   this->recycling_act_ = recycling_act;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> ACE_Connection_Recycling_Strategy *
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycler (void) const
+template <typename PEER_STREAM, typename SYNCH_TRAITS> ACE_Connection_Recycling_Strategy *
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler (void) const
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycler");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler");
   return this->recycler_;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> const void *
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycling_act (void) const
+template <typename PEER_STREAM, typename SYNCH_TRAITS> const void *
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycling_act (void) const
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycling_act");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycling_act");
   return this->recycling_act_;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle (void *)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle (void *)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle");
+  ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle");
   // By default, the object is ready and willing to be recycled.
   return 0;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL>
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::~ACE_Buffered_Svc_Handler (void)
+template <typename PEER_STREAM, typename SYNCH_TRAITS>
+ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Buffered_Svc_Handler (void)
 {
   this->flush ();
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL>
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Buffered_Svc_Handler (ACE_Thread_Manager *tm,
-                                                                            ACE_Message_Queue<ACE_SYNCH_USE> *mq,
+template <typename PEER_STREAM, typename SYNCH_TRAITS>
+ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::ACE_Buffered_Svc_Handler (ACE_Thread_Manager *tm,
+                                                                            ACE_Message_Queue<SYNCH_TRAITS> *mq,
                                                                             ACE_Reactor *reactor,
                                                                             size_t maximum_buffer_size,
                                                                             ACE_Time_Value *timeout)
-  : ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE> (tm, mq, reactor),
+  : ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS> (tm, mq, reactor),
     maximum_buffer_size_ (maximum_buffer_size),
     current_buffer_size_ (0),
     timeoutp_ (timeout)
 {
-  ACE_TRACE ("ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Buffered_Svc_Handler");
+  ACE_TRACE ("ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::ACE_Buffered_Svc_Handler");
 
   if (this->timeoutp_ != 0)
     {
@@ -432,11 +429,11 @@ ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Buffered_Svc_Handler (ACE_
     }
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::put (ACE_Message_Block *mb,
-                                                       ACE_Time_Value *tv)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::put (ACE_Message_Block *mb,
+                                                          ACE_Time_Value *tv)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->msg_queue ()->lock (), -1);
+  ACE_GUARD_RETURN (typename SYNCH_TRAITS::MUTEX, m, this->msg_queue ()->lock (), -1);
 
   // Enqueue <mb> onto the message queue.
   if (this->putq (mb, tv) == -1)
@@ -459,18 +456,18 @@ ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::put (ACE_Message_Block *mb,
 
 // Flush the buffer.
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::flush (void)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush (void)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->msg_queue ()->lock (), -1);
+  ACE_GUARD_RETURN (typename SYNCH_TRAITS::MUTEX, m, this->msg_queue ()->lock (), -1);
 
   return this->flush_i ();
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::flush_i (void)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush_i (void)
 {
-  ACE_Message_Queue_Iterator<ACE_SYNCH_USE> iterator (*this->msg_queue ());
+  ACE_Message_Queue_Iterator<SYNCH_TRAITS> iterator (*this->msg_queue ());
   ACE_Message_Block *mblk = 0;
   ssize_t result = 0;
 
@@ -492,37 +489,35 @@ ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::flush_i (void)
   return result;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> void
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump (void) const
+template <typename PEER_STREAM, typename SYNCH_TRAITS> void
+ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump");
+  ACE_TRACE ("ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump");
 
-  ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump ();
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump ();
+  ACELIB_DEBUG ((LM_DEBUG,
               "maximum_buffer_size_ = %d\n",
               this->maximum_buffer_size_));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               "current_buffer_size_ = %d\n",
               this->current_buffer_size_));
   if (this->timeoutp_ != 0)
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 "next_timeout_.sec = %d, next_timeout_.usec = %d\n",
                 this->next_timeout_.sec (),
                 this->next_timeout_.usec ()));
 #endif /* ACE_HAS_DUMP */
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout (const ACE_Time_Value &,
-                                                                  const void *)
+template <typename PEER_STREAM, typename SYNCH_TRAITS> int
+ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::handle_timeout (const ACE_Time_Value &,
+                                                                     const void *)
 {
-  ACE_TRACE ("ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout");
+  ACE_TRACE ("ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::handle_timeout");
   return 0;
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#undef PR_ST_1
-#undef PR_ST_2
 #endif /* ACE_SVC_HANDLER_CPP */
diff --git a/dep/acelite/ace/Svc_Handler.h b/dep/acelite/ace/Svc_Handler.h
index cf1d0ecce..3b42ea848 100644
--- a/dep/acelite/ace/Svc_Handler.h
+++ b/dep/acelite/ace/Svc_Handler.h
@@ -4,7 +4,7 @@
 /**
  *  @file   Svc_Handler.h
  *
- *  $Id: Svc_Handler.h 81740 2008-05-20 17:56:02Z elliott_c $
+ *  $Id: Svc_Handler.h 97084 2013-04-26 20:42:28Z schmidt $
  *
  *  @author Douglas Schmidt <schmidt@uci.edu>
  *  @author Irfan Pyarali <irfan@cs.wustl.edu>
@@ -43,24 +43,38 @@ enum ACE_Svc_Handler_Close { NORMAL_CLOSE_OPERATION = 0x00,
  * @brief Defines the interface for a service that exchanges data with
  * its connected peer.
  *
- * This class provides a well-defined interface that the
- * Acceptor and Connector pattern factories use as their target.
- * Typically, client applications will subclass ACE_Svc_Handler
- * and do all the interesting work in the subclass.  One thing
- * that the ACE_Svc_Handler does contain is a PEER_STREAM
- * endpoint that is initialized by an ACE_Acceptor or
- * ACE_Connector when a connection is established successfully.
- * This endpoint is used to exchange data between a
- * ACE_Svc_Handler and the peer it is connected with.
+ * This class provides a well-defined interface that the ACE_Acceptor
+ * and ACE_Connector factories use as their target.  Typically, client
+ * applications will subclass ACE_Svc_Handler and do all the
+ * interesting work in the subclass.  An ACE_Svc_Handler is
+ * parameterized by concrete types that conform to the interfaces of
+ * PEER_ACCEPTOR and SYNCH_TRAITS described below.
+ *
+ * @tparam PEER_STREAM The name of the class that implements the
+ *         PEER_STREAM endpoint (e.g., ACE_SOCK_Stream) that is
+ *         contained in an ACE_Svc_Handler and initialized by an
+ *         ACE_Acceptor or ACE_Connector when a connection is
+ *         established successfully.  A PEER_STREAM implementation
+ *         must provide a PEER_ADDR trait (e.g., ACE_INET_Addr to
+ *         identify the type of address used by the endpoint.  This
+ *         endpoint is used to exchange data between a ACE_Svc_Handler
+ *         and the peer it is connected with.
+ *
+ * @tparam SYNCH_TRAITS The name of the synchronization traits class
+ *         that will be used by the ACE_Svc_Handler (e.g.,
+ *         ACE_NULL_SYNCH or ACE_MT_SYNCH). The synchronization traits
+ *         class provides typedefs for the mutex, condition, and
+ *         semaphore implementations the ACE_Svc_Handler will
+ *         use. @see Synch_Traits.h.
  */
-template <ACE_PEER_STREAM_1, ACE_SYNCH_DECL>
-class ACE_Svc_Handler : public ACE_Task<ACE_SYNCH_USE>
+template <typename PEER_STREAM, typename SYNCH_TRAITS>
+class ACE_Svc_Handler : public ACE_Task<SYNCH_TRAITS>
 {
 public:
 
   // Useful STL-style traits.
-  typedef ACE_PEER_STREAM_ADDR addr_type;
-  typedef ACE_PEER_STREAM      stream_type;
+  typedef typename PEER_STREAM::PEER_ADDR addr_type;
+  typedef PEER_STREAM stream_type;
 
   /**
    * Constructor initializes the @a thr_mgr and @a mq by passing them
@@ -68,15 +82,17 @@ public:
    * the ACE_Event_Handler.
    */
   ACE_Svc_Handler (ACE_Thread_Manager *thr_mgr = 0,
-                   ACE_Message_Queue<ACE_SYNCH_USE> *mq = 0,
+                   ACE_Message_Queue<SYNCH_TRAITS> *mq = 0,
                    ACE_Reactor *reactor = ACE_Reactor::instance ());
 
   /// Destructor.
   virtual ~ACE_Svc_Handler (void);
 
   /// Activate the client handler.  This is typically called by the
-  /// ACE_Acceptor or ACE_Connector.
-  virtual int open (void * = 0);
+  /// ACE_Acceptor or ACE_Connector, which passes "this" in as the
+  /// parameter to open.  If this method returns -1 the Svc_Handler's
+  /// close() method is automatically called.
+  virtual int open (void *acceptor_or_connector = 0);
 
   /**
    * Object termination hook -- application-specific cleanup code goes
@@ -148,8 +164,8 @@ public:
   virtual void set_handle (ACE_HANDLE);
 
   /// Returns the underlying PEER_STREAM.  Used by
-  /// <ACE_Acceptor::accept> and <ACE_Connector::connect> factories
-  ACE_PEER_STREAM &peer (void) const;
+  /// <ACE_Acceptor::accept> and <ACE_Connector::connect> factories.
+  PEER_STREAM &peer (void) const;
 
   /// Overloaded new operator.  This method unobtrusively records if a
   /// <Svc_Handler> is allocated dynamically, which allows it to clean
@@ -234,7 +250,7 @@ public:
 
 protected:
   /// Maintain connection with client.
-  ACE_PEER_STREAM peer_;
+  PEER_STREAM peer_;
 
   /// Have we been dynamically created?
   bool dynamic_;
@@ -262,8 +278,8 @@ protected:
  * queue is "full" or (2) a period of time elapses, at which
  * point the queue is "flushed" via <sendv_n> to the peer.
  */
-template <ACE_PEER_STREAM_1, ACE_SYNCH_DECL>
-class ACE_Buffered_Svc_Handler : public ACE_Svc_Handler<ACE_PEER_STREAM_2, ACE_SYNCH_USE>
+template <typename PEER_STREAM, typename SYNCH_TRAITS>
+class ACE_Buffered_Svc_Handler : public ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>
 {
 public:
   // = Initialization and termination methods.
@@ -277,7 +293,7 @@ public:
    * relative to the current time returned by <ACE_OS::gettimeofday>.
    */
   ACE_Buffered_Svc_Handler (ACE_Thread_Manager *thr_mgr = 0,
-                            ACE_Message_Queue<ACE_SYNCH_USE> *mq = 0,
+                            ACE_Message_Queue<SYNCH_TRAITS> *mq = 0,
                             ACE_Reactor *reactor = ACE_Reactor::instance (),
                             size_t max_buffer_size = 0,
                             ACE_Time_Value *relative_timeout = 0);
diff --git a/dep/acelite/ace/System_Time.cpp b/dep/acelite/ace/System_Time.cpp
index 1a270dc7f..0780eaa08 100644
--- a/dep/acelite/ace/System_Time.cpp
+++ b/dep/acelite/ace/System_Time.cpp
@@ -1,10 +1,12 @@
-// $Id: System_Time.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: System_Time.cpp 97308 2013-09-01 00:58:08Z mesnier_p $
 
 #include "ace/System_Time.h"
 #include "ace/MMAP_Memory_Pool.h"
 #include "ace/Malloc_T.h"
 #include "ace/Null_Mutex.h"
 #include "ace/Time_Value.h"
+#include "ace/Lib_Find.h"
+
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_time.h"
 
@@ -31,7 +33,7 @@ ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname)
                                       MAXPATHLEN - 17) == -1)
         // -17 for ace-malloc-XXXXXX
         {
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("Temporary path too long, ")
                       ACE_TEXT ("defaulting to current directory\n")));
           this->poolname_[0] = 0;
diff --git a/dep/acelite/ace/TLI.cpp b/dep/acelite/ace/TLI.cpp
index 6198d29f8..3db3ec29b 100644
--- a/dep/acelite/ace/TLI.cpp
+++ b/dep/acelite/ace/TLI.cpp
@@ -1,10 +1,10 @@
-// $Id: TLI.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: TLI.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 // Defines the member functions for the base class of the ACE_TLI
 // abstraction.
 
 #include "ace/TLI.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_Memory.h"
 #include "ace/OS_TLI.h"
 #include "ace/OS_NS_string.h"
@@ -85,7 +85,7 @@ ACE_TLI::ACE_TLI (const char device[], int oflag, struct t_info *info)
 {
   ACE_TRACE ("ACE_TLI::ACE_TLI");
   if (this->open (device, oflag, info) == ACE_INVALID_HANDLE)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_TLI::ACE_TLI")));
 }
diff --git a/dep/acelite/ace/TLI.h b/dep/acelite/ace/TLI.h
index 076f59640..10ba78ad9 100644
--- a/dep/acelite/ace/TLI.h
+++ b/dep/acelite/ace/TLI.h
@@ -4,7 +4,7 @@
 /**
  *  @file    TLI.h
  *
- *  $Id: TLI.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: TLI.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Doug Schmidt
  */
@@ -15,7 +15,7 @@
 #define ACE_TLI_H
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/TLI_Acceptor.cpp b/dep/acelite/ace/TLI_Acceptor.cpp
index 0ed2f0046..bbb6fe8f8 100644
--- a/dep/acelite/ace/TLI_Acceptor.cpp
+++ b/dep/acelite/ace/TLI_Acceptor.cpp
@@ -1,7 +1,7 @@
-// $Id: TLI_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: TLI_Acceptor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/TLI_Acceptor.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Memory.h"
@@ -400,7 +400,7 @@ ACE_TLI_Acceptor::ACE_TLI_Acceptor (const ACE_Addr &remote_sap,
                   info,
                   back,
                   dev) == ACE_INVALID_HANDLE)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_TLI_Acceptor::ACE_TLI_Acceptor")));
 }
diff --git a/dep/acelite/ace/TLI_Connector.h b/dep/acelite/ace/TLI_Connector.h
index 425390fc3..c5f5a1d7c 100644
--- a/dep/acelite/ace/TLI_Connector.h
+++ b/dep/acelite/ace/TLI_Connector.h
@@ -4,7 +4,7 @@
 /**
  *  @file    TLI_Connector.h
  *
- *  $Id: TLI_Connector.h 82723 2008-09-16 09:35:44Z johnnyw $
+ *  $Id: TLI_Connector.h 96985 2013-04-11 15:50:32Z huangh $
  *
  *  @author Doug Schmidt
  */
@@ -16,7 +16,7 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/TLI_Stream.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/TLI_Connector.inl b/dep/acelite/ace/TLI_Connector.inl
index 8299c6954..328409686 100644
--- a/dep/acelite/ace/TLI_Connector.inl
+++ b/dep/acelite/ace/TLI_Connector.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: TLI_Connector.inl 82723 2008-09-16 09:35:44Z johnnyw $
+// $Id: TLI_Connector.inl 96985 2013-04-11 15:50:32Z huangh $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -32,7 +32,7 @@ ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream,
                      udata,
                      opt) == -1
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream")));
 }
diff --git a/dep/acelite/ace/TLI_Stream.h b/dep/acelite/ace/TLI_Stream.h
index 096c7af69..a37505bbe 100644
--- a/dep/acelite/ace/TLI_Stream.h
+++ b/dep/acelite/ace/TLI_Stream.h
@@ -4,7 +4,7 @@
 /**
  *  @file    TLI_Stream.h
  *
- *  $Id: TLI_Stream.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: TLI_Stream.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Doug Schmidt
  */
@@ -15,7 +15,7 @@
 #define ACE_TLI_STREAM_H
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/TP_Reactor.cpp b/dep/acelite/ace/TP_Reactor.cpp
index 70998e604..0108f69b8 100644
--- a/dep/acelite/ace/TP_Reactor.cpp
+++ b/dep/acelite/ace/TP_Reactor.cpp
@@ -1,10 +1,10 @@
-// $Id: TP_Reactor.cpp 95332 2011-12-15 11:09:41Z mcorino $
+// $Id: TP_Reactor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/TP_Reactor.h"
 #include "ace/Thread.h"
 #include "ace/Timer_Queue.h"
 #include "ace/Sig_Handler.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Functor_T.h"
 #include "ace/OS_NS_sys_time.h"
 
@@ -625,7 +625,7 @@ ACE_TP_Reactor::notify_handle (ACE_HANDLE,
                                ACE_Event_Handler *eh,
                                ACE_EH_PTMF)
 {
-  ACE_ERROR ((LM_ERROR,
+  ACELIB_ERROR ((LM_ERROR,
               ACE_TEXT ("ACE_TP_Reactor::notify_handle: ")
               ACE_TEXT ("Wrong version of notify_handle() got called\n")));
 
diff --git a/dep/acelite/ace/TSS_T.cpp b/dep/acelite/ace/TSS_T.cpp
index 8c6f30e11..cb6a2e03c 100644
--- a/dep/acelite/ace/TSS_T.cpp
+++ b/dep/acelite/ace/TSS_T.cpp
@@ -1,4 +1,4 @@
-// $Id: TSS_T.cpp 93792 2011-04-07 11:48:50Z mcorino $
+// $Id: TSS_T.cpp 97130 2013-05-13 17:36:26Z mesnier_p $
 
 #ifndef ACE_TSS_T_CPP
 #define ACE_TSS_T_CPP
@@ -14,7 +14,7 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Thread.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Guard_T.h"
 #include "ace/OS_NS_stdio.h"
 
@@ -84,11 +84,11 @@ ACE_TSS<TYPE>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
 #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->keylock_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nonce_ = %d\n"), this->once_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nonce_ = %d\n"), this->once_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */
 #endif /* ACE_HAS_DUMP */
 }
@@ -338,9 +338,9 @@ template <class ACE_LOCK> void
 ACE_TSS_Guard<ACE_LOCK>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -350,11 +350,11 @@ ACE_TSS_Guard<ACE_LOCK>::init_key (void)
   this->key_ = ACE_OS::NULL_key;
   ACE_Thread::keycreate (&this->key_,
 #if defined (ACE_HAS_THR_C_DEST)
-                         &ACE_TSS_C_cleanup,
+                         &ACE_TSS_C_cleanup
 #else
-                         &ACE_TSS_Guard<ACE_LOCK>::cleanup,
+                         &ACE_TSS_Guard<ACE_LOCK>::cleanup
 #endif /* ACE_HAS_THR_C_DEST */
-                         (void *) this);
+                         );
 }
 
 template <class ACE_LOCK>
diff --git a/dep/acelite/ace/TSS_T.inl b/dep/acelite/ace/TSS_T.inl
index 16c7b5de4..947e6bd95 100644
--- a/dep/acelite/ace/TSS_T.inl
+++ b/dep/acelite/ace/TSS_T.inl
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 //
-// $Id: TSS_T.inl 91124 2010-07-19 11:54:35Z vzykov $
+// $Id: TSS_T.inl 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Thread.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -74,9 +74,9 @@ ACE_TSS<TYPE>::ts_value (ACE_TSS_Adapter *new_tss_adapter) const
   if (ACE_Thread::setspecific (this->key_,
                                (void *) new_tss_adapter) != 0)
     {
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p\n"),
-                  ACE_TEXT ("ACE_Thread::setspecific() failed!")));
+                  ACE_TEXT ("Error: ACE_Thread::setspecific() failed!")));
       return -1;
     }
 
@@ -88,9 +88,9 @@ ACE_TSS<TYPE>::ts_value (TYPE *new_ts_obj) const
 {
   if (ACE_Thread::setspecific (this->key_, (void *) new_ts_obj) != 0)
     {
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("%p\n"),
-                  ACE_TEXT ("ACE_Thread::setspecific() failed!")));
+                  ACE_TEXT ("Error: ACE_Thread::setspecific() failed!")));
       return -1;
     }
 
diff --git a/dep/acelite/ace/TTY_IO.cpp b/dep/acelite/ace/TTY_IO.cpp
index 696794ba5..a64519abf 100644
--- a/dep/acelite/ace/TTY_IO.cpp
+++ b/dep/acelite/ace/TTY_IO.cpp
@@ -1,4 +1,4 @@
-// $Id: TTY_IO.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: TTY_IO.cpp 97246 2013-08-07 07:10:20Z johnnyw $
 
 #include "ace/TTY_IO.h"
 #include "ace/OS_NS_errno.h"
@@ -26,6 +26,10 @@ namespace
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+ACE_TTY_IO::ACE_TTY_IO (void)
+{
+}
+
 ACE_TTY_IO::Serial_Params::Serial_Params (void)
 {
   baudrate = 9600;
diff --git a/dep/acelite/ace/TTY_IO.h b/dep/acelite/ace/TTY_IO.h
index 39de5f8d2..3245ce516 100644
--- a/dep/acelite/ace/TTY_IO.h
+++ b/dep/acelite/ace/TTY_IO.h
@@ -4,7 +4,7 @@
 /**
  *  @file    TTY_IO.h
  *
- *  $Id: TTY_IO.h 95212 2011-12-05 12:29:55Z johnnyw $
+ *  $Id: TTY_IO.h 97246 2013-08-07 07:10:20Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@uci.edu>
  */
@@ -36,6 +36,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_TTY_IO : public ACE_DEV_IO
 {
 public:
+  ACE_TTY_IO (void);
+
   enum Control_Mode
   {
     SETPARAMS,              ///< Set control parameters.
diff --git a/dep/acelite/ace/Task_Ex_T.cpp b/dep/acelite/ace/Task_Ex_T.cpp
index bcc0ff0be..a90ef95a7 100644
--- a/dep/acelite/ace/Task_Ex_T.cpp
+++ b/dep/acelite/ace/Task_Ex_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Task_Ex_T.cpp 96061 2012-08-16 09:36:07Z mcorino $
+// $Id: Task_Ex_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_TASK_EX_T_CPP
 #define ACE_TASK_EX_T_CPP
@@ -24,20 +24,20 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_));
   this->msg_queue_->dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nflags = %x"), this->flags_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nmod_ = %x"), this->mod_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nnext_ = %x"), this->next_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nthr_count_ = %d"), this->thr_count_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nflags = %x"), this->flags_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nmod_ = %x"), this->mod_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nnext_ = %x"), this->next_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nthr_count_ = %d"), this->thr_count_));
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   this->lock_.dump ();
 #endif /* ACE_MT_SAFE */
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Task_T.cpp b/dep/acelite/ace/Task_T.cpp
index e2481ae2b..78bc59704 100644
--- a/dep/acelite/ace/Task_T.cpp
+++ b/dep/acelite/ace/Task_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Task_T.cpp 96061 2012-08-16 09:36:07Z mcorino $
+// $Id: Task_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_TASK_T_CPP
 #define ACE_TASK_T_CPP
@@ -23,20 +23,20 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_));
   this->msg_queue_->dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nflags = %x"), this->flags_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nmod_ = %x"), this->mod_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nnext_ = %x"), this->next_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nthr_count_ = %d"), this->thr_count_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nflags = %x"), this->flags_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nmod_ = %x"), this->mod_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nnext_ = %x"), this->next_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nthr_count_ = %d"), this->thr_count_));
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   this->lock_.dump ();
 #endif /* ACE_MT_SAFE */
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Test_and_Set.h b/dep/acelite/ace/Test_and_Set.h
index 062de0bc8..b1e558f6d 100644
--- a/dep/acelite/ace/Test_and_Set.h
+++ b/dep/acelite/ace/Test_and_Set.h
@@ -4,7 +4,7 @@
 /**
  *  @file   Test_and_Set.h
  *
- *  $Id: Test_and_Set.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: Test_and_Set.h 96230 2012-11-06 22:18:13Z schmidt $
  */
 //=============================================================================
 
@@ -26,13 +26,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * @brief Implements the classic ``test and set'' operation.
  *
- *
- *     This class keeps track of the status of <is_set_>, which can
- *     be set based on various events (such as receipt of a
- *     signal).  This class is derived from ACE_Event_Handler so
- *     that it can be "signaled" by a Reactor when a signal occurs.
- *     We assume that <TYPE> is a data type that can be assigned the
- *     value 0 or 1.
+ *     This class keeps track of the status of <is_set_>, which can be
+ *     set based on various events (such as receipt of a signal).
+ *     This class is derived from ACE_Event_Handler so that it can be
+ *     "signaled" by a Reactor when a signal occurs.  We assume that
+ *     <TYPE> is a data type that can be assigned the value 0 or 1.
  */
 template <class ACE_LOCK, class TYPE>
 class ACE_Test_and_Set : public ACE_Event_Handler
diff --git a/dep/acelite/ace/Thread_Hook.cpp b/dep/acelite/ace/Thread_Hook.cpp
index 03b2fd74c..549e51e39 100644
--- a/dep/acelite/ace/Thread_Hook.cpp
+++ b/dep/acelite/ace/Thread_Hook.cpp
@@ -1,10 +1,14 @@
-// $Id: Thread_Hook.cpp 94054 2011-05-11 18:28:20Z johnnyw $
+// $Id: Thread_Hook.cpp 97246 2013-08-07 07:10:20Z johnnyw $
 
 #include "ace/Thread_Hook.h"
 #include "ace/Object_Manager_Base.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+ACE_Thread_Hook::ACE_Thread_Hook()
+{
+}
+
 ACE_Thread_Hook::~ACE_Thread_Hook ()
 {
 }
diff --git a/dep/acelite/ace/Thread_Hook.h b/dep/acelite/ace/Thread_Hook.h
index df0d0293c..ff0f03a4d 100644
--- a/dep/acelite/ace/Thread_Hook.h
+++ b/dep/acelite/ace/Thread_Hook.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Thread_Hook.h
  *
- *  $Id: Thread_Hook.h 94054 2011-05-11 18:28:20Z johnnyw $
+ *  $Id: Thread_Hook.h 97246 2013-08-07 07:10:20Z johnnyw $
  *
  *  @author Carlos O'Ryan <coryan@uci.edu>
  */
@@ -34,6 +34,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Thread_Hook
 {
 public:
+  /// Default constructor
+  ACE_Thread_Hook (void);
+
   /// Destructor.
   virtual ~ACE_Thread_Hook (void);
 
diff --git a/dep/acelite/ace/Thread_Manager.cpp b/dep/acelite/ace/Thread_Manager.cpp
index f26c7adbd..d5cd969c4 100644
--- a/dep/acelite/ace/Thread_Manager.cpp
+++ b/dep/acelite/ace/Thread_Manager.cpp
@@ -1,4 +1,4 @@
-// $Id: Thread_Manager.cpp 96067 2012-08-16 13:45:10Z mcorino $
+// $Id: Thread_Manager.cpp 97769 2014-06-05 06:37:53Z johnnyw $
 
 #include "ace/TSS_T.h"
 #include "ace/Thread_Manager.h"
@@ -66,10 +66,10 @@ ACE_Thread_Manager::dump (void)
   ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon,
                      ((ACE_Thread_Manager *) this)->lock_));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->thr_list_.size ()));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->thr_list_.size ()));
 
   for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_);
        !iter.done ();
@@ -78,7 +78,7 @@ ACE_Thread_Manager::dump (void)
       iter.next ()->dump ();
     }
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -246,15 +246,15 @@ ACE_Thread_Descriptor::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Thread_Descriptor::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_id_ = %d"), this->thr_id_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_handle_ = %d"), this->thr_handle_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d"), this->thr_state_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %x\n"), this->flags_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_id_ = %d"), this->thr_id_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_handle_ = %d"), this->thr_handle_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d"), this->thr_state_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %x\n"), this->flags_));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -1447,12 +1447,12 @@ ACE_Thread_Manager::join (ACE_thread_t tid, ACE_THR_FUNC_RETURN *status)
       {
         if (ACE_OS::thr_equal (biter.next ()->thr_id_, tid))
           {
-            ACE_Thread_Descriptor_Base *tdb = biter.advance_and_remove (false);
-            if (ACE_Thread::join (tdb->thr_handle_, status) == -1)
+            ACE_Thread_Descriptor_Base *tdbl = biter.advance_and_remove (false);
+            if (ACE_Thread::join (tdbl->thr_handle_, status) == -1)
               {
                 return -1;
               }
-            delete tdb;
+            delete tdbl;
 
             // return immediately if we've found the thread we want to join.
             return 0;
diff --git a/dep/acelite/ace/Thread_Manager.h b/dep/acelite/ace/Thread_Manager.h
index 59d81fd19..b1465ebb2 100644
--- a/dep/acelite/ace/Thread_Manager.h
+++ b/dep/acelite/ace/Thread_Manager.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Thread_Manager.h
  *
- *  $Id: Thread_Manager.h 96061 2012-08-16 09:36:07Z mcorino $
+ *  $Id: Thread_Manager.h 96985 2013-04-11 15:50:32Z huangh $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -27,7 +27,7 @@
 #include "ace/Containers.h"
 #include "ace/Free_List.h"
 #include "ace/Singleton.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Basic_Types.h"
 
diff --git a/dep/acelite/ace/Thread_Mutex.cpp b/dep/acelite/ace/Thread_Mutex.cpp
index a56ef66e3..482b45fca 100644
--- a/dep/acelite/ace/Thread_Mutex.cpp
+++ b/dep/acelite/ace/Thread_Mutex.cpp
@@ -1,7 +1,7 @@
 /**
  * @file Thread_Mutex.cpp
  *
- * $Id: Thread_Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+ * $Id: Thread_Mutex.cpp 96985 2013-04-11 15:50:32Z huangh $
  *
  * Originally in Synch.cpp
  *
@@ -16,7 +16,7 @@
 #include "ace/Thread_Mutex.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Malloc_T.h"
 
 
@@ -31,9 +31,9 @@ ACE_Thread_Mutex::dump (void) const
 #if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Thread_Mutex::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -52,7 +52,7 @@ ACE_Thread_Mutex::ACE_Thread_Mutex (const ACE_TCHAR *name, ACE_mutexattr_t *arg)
                                  0,
                                  name,
                                  arg) != 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_Thread_Mutex::ACE_Thread_Mutex")));
 }
diff --git a/dep/acelite/ace/Throughput_Stats.cpp b/dep/acelite/ace/Throughput_Stats.cpp
index f8e27fba8..d86121a47 100644
--- a/dep/acelite/ace/Throughput_Stats.cpp
+++ b/dep/acelite/ace/Throughput_Stats.cpp
@@ -1,11 +1,11 @@
-// $Id: Throughput_Stats.cpp 95761 2012-05-15 18:23:04Z johnnyw $
+// $Id: Throughput_Stats.cpp 97628 2014-02-24 11:29:43Z johnnyw $
 
 #include "ace/Throughput_Stats.h"
 
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 #include "ace/High_Res_Timer.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 
 
@@ -40,11 +40,11 @@ ACE_Throughput_Stats::accumulate (const ACE_Throughput_Stats &rhs)
   if (this->samples_count () == 0u)
     {
       this->throughput_last_   = rhs.throughput_last_;
-      return;
     }
-
-  if (this->throughput_last_ < rhs.throughput_last_)
-    this->throughput_last_ = rhs.throughput_last_;
+  else if (this->throughput_last_ < rhs.throughput_last_)
+    {
+      this->throughput_last_ = rhs.throughput_last_;
+    }
 }
 
 void
@@ -53,7 +53,7 @@ ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg,
 {
   if (this->samples_count () == 0u)
     {
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("%s : no data collected\n"), msg));
       return;
     }
@@ -76,9 +76,13 @@ ACE_Throughput_Stats::dump_throughput (const ACE_TCHAR *msg,
     static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (elapsed_time / sf));
   seconds /= ACE_HR_SCALE_CONVERSION;
 
-  const double t_avg = samples_count / seconds;
+  double t_avg = 0.0;
+  if (seconds > 0.0)
+    {
+      t_avg = samples_count / seconds;
+    }
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("%s throughput: %.2f (events/second)\n"),
               msg, t_avg));
 #else
diff --git a/dep/acelite/ace/Time_Value.cpp b/dep/acelite/ace/Time_Value.cpp
index 0b13cdeda..32b9b80dd 100644
--- a/dep/acelite/ace/Time_Value.cpp
+++ b/dep/acelite/ace/Time_Value.cpp
@@ -1,4 +1,4 @@
-// $Id: Time_Value.cpp 96061 2012-08-16 09:36:07Z mcorino $
+// $Id: Time_Value.cpp 97886 2014-09-09 06:43:37Z johnnyw $
 
 #include "ace/Time_Value.h"
 
@@ -12,10 +12,14 @@
 #include "ace/Time_Policy.h"
 
 #ifdef ACE_HAS_CPP98_IOSTREAMS
-#include <ostream>
-#include <iomanip>
+# include <ostream>
+# include <iomanip>
 #endif /* ACE_HAS_CPP98_IOSTREAMS */
 
+#ifdef ACE_HAS_CPP11
+# include <cmath>
+#endif /* ACE_HAS_CPP11 */
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Static constant representing `zero-time'.
@@ -338,7 +342,11 @@ ostream &operator<<(ostream &o, const ACE_Time_Value &v)
     {
       o << tv->tv_sec;
       if (tv->tv_usec)
+#ifdef ACE_HAS_CPP11
+        o << '.' << std::setw (6) << std::abs (tv->tv_usec);
+#else
         o << '.' << std::setw (6) << ACE_STD_NAMESPACE::abs (tv->tv_usec);
+#endif
     }
   else if (tv->tv_usec < 0)
     o << "-0." << std::setw (6) << - tv->tv_usec;
diff --git a/dep/acelite/ace/Timeprobe.h b/dep/acelite/ace/Timeprobe.h
index ac2abe38d..1ede92b39 100644
--- a/dep/acelite/ace/Timeprobe.h
+++ b/dep/acelite/ace/Timeprobe.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Timeprobe.h
  *
- *  $Id: Timeprobe.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: Timeprobe.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Irfan Pyarali
  *
@@ -39,7 +39,7 @@
 #define ACE_TIMEPROBE_H
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 #include /**/ "ace/ACE_export.h"
 #include "ace/Malloc_Allocator.h"
 
diff --git a/dep/acelite/ace/Timeprobe_T.cpp b/dep/acelite/ace/Timeprobe_T.cpp
index f440c7eda..235abb2e5 100644
--- a/dep/acelite/ace/Timeprobe_T.cpp
+++ b/dep/acelite/ace/Timeprobe_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Timeprobe_T.cpp 95743 2012-05-13 12:29:28Z johnnyw $
+// $Id: Timeprobe_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_TIMEPROBE_T_CPP
 #define ACE_TIMEPROBE_T_CPP
@@ -68,7 +68,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::ACE_Timeprobe_Ex (const ACE_Timeprobe_Ex<
   // Stupid MSVC is forcing me to define this; please don't use it.
   //
 
-  ACE_ERROR ((LM_ERROR,
+  ACELIB_ERROR ((LM_ERROR,
               ACE_TEXT ("ACE_NOTSUP: %N, line %l\n")));
   errno = ENOTSUP;
 }
@@ -237,14 +237,14 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void)
   u_long size = this->report_buffer_full_ ? this->max_size_
                                           : this->current_size_;
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               "\nACE_Timeprobe_Ex; %u timestamps were recorded:\n",
               size));
 
   if (size == 0)
     return;
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               "\n%-50.50s %8.8s %13.13s\n\n",
               "Event",
               "thread",
@@ -257,7 +257,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void)
   // First element
   i = this->report_buffer_full_ ? this->current_size_ : 0;
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               "%-50.50s %8.8x %13.13s\n",
               this->find_description_i (i),
               this->timeprobes_[i].thread_,
@@ -290,7 +290,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void)
       // Convert to microseconds.
       time_difference /= gsf;
 
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   "%-50.50s %8.8x %14.3f\n",
                   this->find_description_i (i),
                   this->timeprobes_[i].thread_,
@@ -305,7 +305,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void)
   if (!inversion_warning_printed && has_timestamp_inversion)
     {
       inversion_warning_printed = true;
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   "\nWARNING: The timestamps recorded by gethrtime() on"
                   " this platform are\n"
                   "not monotonic across different threads.\n"));
@@ -323,14 +323,14 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_absolute_times (void)
   u_long size = this->report_buffer_full_ ? this->max_size_
                                           : this->current_size_;
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               "\nACE_Timeprobe_Ex; %u timestamps were recorded:\n",
               size));
 
   if (size == 0)
     return;
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               "\n%-50.50s %8.8s %13.13s\n\n",
               "Event",
               "thread",
@@ -343,7 +343,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_absolute_times (void)
     {
       ACE_High_Res_Timer::hrtime_to_tv (tv, this->timeprobes_ [i].time_);
 
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   "%-50.50s %8.8x %12.12u\n",
                   this->find_description_i (i),
                   this->timeprobes_ [i].thread_,
diff --git a/dep/acelite/ace/Timer_Hash_T.cpp b/dep/acelite/ace/Timer_Hash_T.cpp
index 55bbdb86d..2c10eda44 100644
--- a/dep/acelite/ace/Timer_Hash_T.cpp
+++ b/dep/acelite/ace/Timer_Hash_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Timer_Hash_T.cpp 95595 2012-03-07 13:33:25Z johnnyw $
+// $Id: Timer_Hash_T.cpp 97646 2014-03-07 12:35:48Z johnnyw $
 
 #ifndef ACE_TIMER_HASH_T_CPP
 #define ACE_TIMER_HASH_T_CPP
@@ -11,7 +11,7 @@
 
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -284,7 +284,8 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::ACE_Timer_Hash_T
     size_ (0),
     table_size_ (table_size),
     table_functor_ (this),
-    earliest_position_ (0)
+    earliest_position_ (0),
+    iterator_ (0)
 #if defined (ACE_WIN64)
   , pointer_base_ (0)
 #endif /* ACE_WIN64 */
@@ -409,16 +410,16 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::dump (void) cons
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Hash_T::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntable_size_ = %d"), this->table_size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nearliest_position_ = %d"), this->earliest_position_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntable_size_ = %d"), this->table_size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nearliest_position_ = %d"), this->earliest_position_));
 
   for (size_t i = 0; i < this->table_size_; ++i)
     if (!this->table_[i]->is_empty ())
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nBucket %d contains nodes"), i));
+      ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nBucket %d contains nodes"), i));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Timer_Hash_T.h b/dep/acelite/ace/Timer_Hash_T.h
index d634536e5..123b973b7 100644
--- a/dep/acelite/ace/Timer_Hash_T.h
+++ b/dep/acelite/ace/Timer_Hash_T.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Timer_Hash_T.h
  *
- *  $Id: Timer_Hash_T.h 95807 2012-06-01 12:44:19Z johnnyw $
+ *  $Id: Timer_Hash_T.h 97645 2014-03-07 12:01:21Z johnnyw $
  *
  *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
  */
@@ -29,6 +29,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME
 class ACE_Timer_Hash_T;
 template <typename TYPE>
 class Hash_Token;
+class ACE_Event_Handler;
 
 /**
  * @class ACE_Timer_Hash_Upcall
@@ -232,11 +233,11 @@ public:
    * was returned from the <schedule> method).  If act is non-NULL
    * then it will be set to point to the ``magic cookie'' argument
    * passed in when the timer was registered.  This makes it possible
-   * to free up the memory and avoid memory leaks.  If <dont_call> is
-   * 0 then the <functor> will be invoked.  Returns 1 if cancellation
-   * succeeded and 0 if the @a timer_id wasn't found.  If any valid
-   * timer is not cancelled before destruction of this instance of
-   * ACE_Timer_Hash_T then user will get a memory leak.
+   * to free up the memory and avoid memory leaks.  If
+   * @a dont_call_handle_close is 0 then the <functor> will be invoked.
+   * Returns 1 if cancellation succeeded and 0 if the @a timer_id wasn't
+   * found.  If any valid timer is not cancelled before destruction of
+   * this instance of ACE_Timer_Hash_T then user will get a memory leak.
    */
   virtual int cancel (long timer_id,
                       const void **act = 0,
diff --git a/dep/acelite/ace/Timer_Heap_T.cpp b/dep/acelite/ace/Timer_Heap_T.cpp
index 93ce13417..4bd6b6824 100644
--- a/dep/acelite/ace/Timer_Heap_T.cpp
+++ b/dep/acelite/ace/Timer_Heap_T.cpp
@@ -1,10 +1,10 @@
-// $Id: Timer_Heap_T.cpp 95630 2012-03-22 13:04:47Z johnnyw $
+// $Id: Timer_Heap_T.cpp 97645 2014-03-07 12:01:21Z johnnyw $
 
 #ifndef ACE_TIMER_HEAP_T_CPP
 #define ACE_TIMER_HEAP_T_CPP
 
 #include "ace/Timer_Heap_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Guard_T.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_string.h"
@@ -330,6 +330,7 @@ bool
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty (void) const
 {
   ACE_TRACE ("ACE_Timer_Heap_T::is_empty");
+
   return this->cur_size_ == 0;
 }
 
@@ -356,35 +357,35 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Heap_T::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_size_ = %d"), this->max_size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_limbo_= %d"), this->cur_limbo_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nids_curr_ = %d"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_size_ = %d"), this->max_size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_limbo_= %d"), this->cur_limbo_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nids_curr_ = %d"),
               this->timer_ids_curr_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmin_free_ = %d"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmin_free_ = %d"),
               this->timer_ids_min_free_));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nheap_ =\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nheap_ =\n")));
 
   for (size_t i = 0; i < this->cur_size_; ++i)
     {
-      ACE_DEBUG ((LM_DEBUG,
+      ACELIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("%d\n"),
                   i));
       this->heap_[i]->dump ();
     }
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_ids_ =\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_ids_ =\n")));
 
   for (size_t j = 0; j < this->max_size_; ++j)
-    ACE_DEBUG ((LM_DEBUG,
+    ACELIB_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("%d\t%d\n"),
                 j,
                 this->timer_ids_[j]));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Timer_List_T.cpp b/dep/acelite/ace/Timer_List_T.cpp
index d45b71e00..1aee3d2a7 100644
--- a/dep/acelite/ace/Timer_List_T.cpp
+++ b/dep/acelite/ace/Timer_List_T.cpp
@@ -1,11 +1,11 @@
-// $Id: Timer_List_T.cpp 95368 2011-12-19 13:38:49Z mcorino $
+// $Id: Timer_List_T.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_TIMER_LIST_T_C
 #define ACE_TIMER_LIST_T_C
 
 #include "ace/Timer_List_T.h"
 #include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -170,7 +170,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_List_T::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   int count = 0;
 
@@ -181,8 +181,8 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const
     }
   }
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d"), count));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d"), count));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Timer_List_T.h b/dep/acelite/ace/Timer_List_T.h
index 918ba2cb9..8b7c783f4 100644
--- a/dep/acelite/ace/Timer_List_T.h
+++ b/dep/acelite/ace/Timer_List_T.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Timer_List_T.h
  *
- *  $Id: Timer_List_T.h 95368 2011-12-19 13:38:49Z mcorino $
+ *  $Id: Timer_List_T.h 97645 2014-03-07 12:01:21Z johnnyw $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -127,8 +127,8 @@ public:
                               const ACE_Time_Value& interval);
 
   /**
-   * Cancel all timers associated with @a type.  If dont_call_handle_close is 0
-   * then the @a functor will be invoked.  Returns the number of timers
+   * Cancel all timers associated with @a type.  If @a dont_call_handle_close
+   * is 0 then the @a functor will be invoked.  Returns the number of timers
    * cancelled.
    */
   virtual int cancel (const TYPE& type,
@@ -176,8 +176,8 @@ private:
    * in as the value to the <functor>.  If @a interval is != to
    * ACE_Time_Value::zero then it is used to reschedule the @a type
    * automatically, using relative time to the current <gettimeofday>.
-   * This method returns a <timer_id> that uniquely identifies the the
-   * @a type entry in an internal list.  This <timer_id> can be used to
+   * This method returns a timer_id that uniquely identifies the the
+   * @a type entry in an internal list.  This timer_id can be used to
    * cancel the timer before it expires.  The cancellation ensures
    * that <timer_ids> are unique up to values of greater than 2
    * billion timers.  As long as timers don't stay around longer than
diff --git a/dep/acelite/ace/Timer_Queue_Adapters.cpp b/dep/acelite/ace/Timer_Queue_Adapters.cpp
index e4e233739..5753cfc6c 100644
--- a/dep/acelite/ace/Timer_Queue_Adapters.cpp
+++ b/dep/acelite/ace/Timer_Queue_Adapters.cpp
@@ -1,4 +1,4 @@
-// $Id: Timer_Queue_Adapters.cpp 95368 2011-12-19 13:38:49Z mcorino $
+// $Id: Timer_Queue_Adapters.cpp 97493 2013-12-31 07:45:27Z johnnyw $
 
 #ifndef ACE_TIMER_QUEUE_ADAPTERS_CPP
 #define ACE_TIMER_QUEUE_ADAPTERS_CPP
@@ -86,7 +86,7 @@ ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::schedule (TYPE eh,
   long tid = this->timer_queue_.schedule (eh, act, future_time);
 
   if (tid == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("schedule_timer")),
                       -1);
@@ -112,7 +112,7 @@ ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::ACE_Async_Timer_Queue_Adapter (ACE_Sig_
                      SA_RESTART);
 
   if (this->sig_handler_.register_handler (SIGALRM, this, &sa) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("register_handler")));
 }
@@ -147,7 +147,7 @@ ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::handle_signal (int signum,
         /* NOTREACHED */
       }
     default:
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          "unexpected signal %S\n",
                          signum),
                         -1);
@@ -276,11 +276,10 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::svc (void)
 
           if (tv_earl > tv_curr)
             {
-              // The earliest time on the Timer_Queue is in future, so
-              // use ACE_OS::gettimeofday() to convert the tv to the
-              // absolute time.
-              ACE_Time_Value const tv = ACE_OS::gettimeofday () + (tv_earl - tv_curr);
-              // ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("waiting until %u.%3.3u secs\n"),
+              // The earliest time on the Timer_Queue lies in future;
+              // convert the tv to an absolute time.
+              ACE_Time_Value const tv = this->timer_queue_->gettimeofday () + (tv_earl - tv_curr);
+              // ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("waiting until %u.%3.3u secs\n"),
               // tv.sec(), tv.msec()));
               this->condition_.wait (&tv);
             }
diff --git a/dep/acelite/ace/Timer_Queue_Iterator.cpp b/dep/acelite/ace/Timer_Queue_Iterator.cpp
index cc95cbdcb..e5a89d023 100644
--- a/dep/acelite/ace/Timer_Queue_Iterator.cpp
+++ b/dep/acelite/ace/Timer_Queue_Iterator.cpp
@@ -1,4 +1,4 @@
-//$Id: Timer_Queue_Iterator.cpp 95334 2011-12-15 12:52:50Z msmit $
+//$Id: Timer_Queue_Iterator.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_TIMER_QUEUE_ITERATOR_CPP
 #define ACE_TIMER_QUEUE_ITERATOR_CPP
@@ -20,19 +20,23 @@ ACE_Timer_Node_T<TYPE>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Node_T::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nact_ = %x"), this->act_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nact_ = %x"), this->act_));
   this->timer_value_.dump ();
   this->interval_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nprev_ = %x"), this->prev_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_id_ = %d\n"), this->timer_id_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nprev_ = %x"), this->prev_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_id_ = %d\n"), this->timer_id_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
 template <class TYPE>
 ACE_Timer_Node_T<TYPE>::ACE_Timer_Node_T (void)
+  : act_ (0),
+    prev_ (0),
+    next_ (0),
+    timer_id_ (-1)
 {
   ACE_TRACE ("ACE_Timer_Node_T::ACE_Timer_Node_T");
 }
diff --git a/dep/acelite/ace/Timer_Queue_Iterator.h b/dep/acelite/ace/Timer_Queue_Iterator.h
index 56433e4b3..8f1a2ea30 100644
--- a/dep/acelite/ace/Timer_Queue_Iterator.h
+++ b/dep/acelite/ace/Timer_Queue_Iterator.h
@@ -1,4 +1,4 @@
-//$Id: Timer_Queue_Iterator.h 95334 2011-12-15 12:52:50Z msmit $
+//$Id: Timer_Queue_Iterator.h 96333 2012-11-23 08:08:31Z johnnyw $
 
 #ifndef ACE_TIMER_QUEUE_ITERATOR_H
 #define ACE_TIMER_QUEUE_ITERATOR_H
@@ -115,9 +115,9 @@ public:
   void set_timer_id (long timer_id);
 
   /// Get the dispatch info. The dispatch information is got
-  /// through <info>. This form helps us in preventing allocation and
+  /// through @a info. This form helps us in preventing allocation and
   /// deleting data along the criticl path.
-  /// @@TODO: We may want to have a copying version too, so that our
+  /// @todo We may want to have a copying version too, so that our
   /// interface will be complete..
   void get_dispatch_info (ACE_Timer_Node_Dispatch_Info_T <TYPE> &info);
 
diff --git a/dep/acelite/ace/Timer_Queue_T.cpp b/dep/acelite/ace/Timer_Queue_T.cpp
index eafb4a244..ba48fc05f 100644
--- a/dep/acelite/ace/Timer_Queue_T.cpp
+++ b/dep/acelite/ace/Timer_Queue_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Timer_Queue_T.cpp 95690 2012-04-09 22:00:03Z shuston $
+// $Id: Timer_Queue_T.cpp 97644 2014-03-07 11:59:51Z johnnyw $
 
 #ifndef ACE_TIMER_QUEUE_T_CPP
 #define ACE_TIMER_QUEUE_T_CPP
@@ -17,7 +17,7 @@
 #include "ace/Timer_Queue_T.h"
 #include "ace/Guard_T.h"
 #include "ace/Reverse_Lock_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Functor.h"
@@ -169,10 +169,10 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Queue_T::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->timeout_.dump ();
   this->timer_skew_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -250,6 +250,16 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::schedule (const TYPE &t
   return result;
 }
 
+template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> int
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire (void)
+{
+  // We can't check here is the timer queue is empty, in some
+  // implementations (like the timer heap) calling is_empty()
+  // would at that moment access member variables without having
+  // locked ourself for thread safety
+  return this->expire (this->gettimeofday_static () + timer_skew_);
+}
+
 // Run the <handle_timeout> method for all Timers whose values are <=
 // <cur_time>.
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> int
diff --git a/dep/acelite/ace/Timer_Queue_T.h b/dep/acelite/ace/Timer_Queue_T.h
index ffd0a3726..47652d25e 100644
--- a/dep/acelite/ace/Timer_Queue_T.h
+++ b/dep/acelite/ace/Timer_Queue_T.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Timer_Queue_T.h
  *
- *  $Id: Timer_Queue_T.h 95362 2011-12-18 11:56:24Z johnnyw $
+ *  $Id: Timer_Queue_T.h 97644 2014-03-07 11:59:51Z johnnyw $
  *
  *  @author Doug Schmidt <schmidt@cs.wustl.edu>
  *  @author Irfan Pyarali <irfan@cs.wustl.edu> and
@@ -117,9 +117,6 @@ public:
    */
   virtual int dispatch_info (const ACE_Time_Value &current_time,
                              ACE_Timer_Node_Dispatch_Info_T<TYPE> &info);
-
-
-
   //@{
   /**
    * Implement the gettimeofday() virtual function
diff --git a/dep/acelite/ace/Timer_Queue_T.inl b/dep/acelite/ace/Timer_Queue_T.inl
index eb896b6b8..5ea413da7 100644
--- a/dep/acelite/ace/Timer_Queue_T.inl
+++ b/dep/acelite/ace/Timer_Queue_T.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Timer_Queue_T.inl 95332 2011-12-15 11:09:41Z mcorino $
+// $Id: Timer_Queue_T.inl 97644 2014-03-07 11:59:51Z johnnyw $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -22,15 +22,6 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_skew (void) const
   return timer_skew_;
 }
 
-template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_INLINE int
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire (void)
-{
-  if (!this->is_empty ())
-    return this->expire (this->gettimeofday_static () + timer_skew_);
-  else
-    return 0;
-}
-
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> int
 ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dispatch_info (const ACE_Time_Value &cur_time,
                                                            ACE_Timer_Node_Dispatch_Info_T<TYPE> &info)
diff --git a/dep/acelite/ace/Timer_Wheel_T.cpp b/dep/acelite/ace/Timer_Wheel_T.cpp
index 4d596ed2c..08537902f 100644
--- a/dep/acelite/ace/Timer_Wheel_T.cpp
+++ b/dep/acelite/ace/Timer_Wheel_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Timer_Wheel_T.cpp 95401 2011-12-31 22:17:35Z schmidt $
+// $Id: Timer_Wheel_T.cpp 97817 2014-07-28 17:27:29Z johnnyw $
 
 #ifndef ACE_TIMER_WHEEL_T_CPP
 #define ACE_TIMER_WHEEL_T_CPP
@@ -10,7 +10,8 @@
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Guard_T.h"
 #include "ace/Timer_Wheel_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
+#include "ace/Truncate.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -240,7 +241,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::find_node (long timer_i
   if (n != 0)
     return n;
 
-  //ACE_ERROR((LM_ERROR, "Node not found in original spoke.\n"));
+  //ACELIB_ERROR((LM_ERROR, "Node not found in original spoke.\n"));
 
   // Search the rest of the spokes
   for (u_int i = 0; i < this->spoke_count_; ++i)
@@ -253,7 +254,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::find_node (long timer_i
         }
     }
 
-  //ACE_ERROR((LM_ERROR, "Node not found.\n"));
+  //ACELIB_ERROR((LM_ERROR, "Node not found.\n"));
   return 0;
 }
 
@@ -321,7 +322,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::generate_timer_id (u_in
 #  pragma warning(push)
 #  pragma warning(disable : 4311)
 #endif /* ACE_WIN64 */
-  long next_cnt = reinterpret_cast<long> (root->get_act ());
+  long next_cnt = ACE_Utils::truncate_cast<long> ((intptr_t)root->get_act ());
 #if defined (ACE_WIN64)
 #  pragma warning(pop)
 #endif /* ACE_WIN64 */
@@ -348,7 +349,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::generate_timer_id (u_in
       return (cnt << this->spoke_bits_) | spoke;
     }
 
-  //ACE_ERROR((LM_ERROR, "Timer id overflow. We have to search now.\n"));
+  //ACELIB_ERROR((LM_ERROR, "Timer id overflow. We have to search now.\n"));
 
   // We've run out of consecutive id numbers so now we have to search
   // for a unique id.
@@ -415,7 +416,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::schedule_i (const TYPE&
       u_int spoke = calculate_spoke (future_time);
       long id = generate_timer_id (spoke);
 
-      //ACE_ERROR((LM_ERROR, "Scheduling %x spoke:%d id:%d\n", (long) n, spoke, id));
+      //ACELIB_ERROR((LM_ERROR, "Scheduling %x spoke:%d id:%d\n", (long) n, spoke, id));
 
       if (id != -1)
         {
@@ -698,7 +699,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::recalc_earliest
     }
 
   this->earliest_spoke_ = es;
-  //ACE_ERROR((LM_ERROR, "We had to search the whole wheel.\n"));
+  //ACELIB_ERROR((LM_ERROR, "We had to search the whole wheel.\n"));
 }
 
 /**
@@ -710,18 +711,18 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Wheel_T::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
     ACE_TEXT ("\nspoke_count_ = %d"), this->spoke_count_));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
     ACE_TEXT ("\nresolution_ = %d"), 1 << this->res_bits_));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
     ACE_TEXT ("\nwheel_ =\n")));
 
   for (u_int i = 0; i < this->spoke_count_; ++i)
     {
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%d\n"), i));
+      ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%d\n"), i));
       ACE_Timer_Node_T<TYPE>* root = this->spokes_[i];
       for (ACE_Timer_Node_T<TYPE>* n = root->get_next ();
            n != root;
@@ -731,7 +732,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const
         }
     }
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -808,14 +809,10 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter (void)
   return *this->iterator_;
 }
 
-/**
-* Dummy version of expire to get rid of warnings in Sun CC 4.2
-* Just call the expire of the base class.
-*/
 template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> int
 ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire ()
 {
-  return ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK>::expire ();
+  return ACE_Timer_Queue_T<TYPE,FUNCTOR,ACE_LOCK,TIME_POLICY>::expire ();
 }
 
 /**
@@ -841,7 +838,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire (const ACE_Time_
     {
       ++expcount;
 
-      //ACE_ERROR((LM_ERROR, "Expiring %x\n", (long) n));
+      //ACELIB_ERROR((LM_ERROR, "Expiring %x\n", (long) n));
 
       ACE_Timer_Node_Dispatch_Info_T<TYPE> info;
 
diff --git a/dep/acelite/ace/TkReactor/ACE_TkReactor_export.h b/dep/acelite/ace/TkReactor/ACE_TkReactor_export.h
deleted file mode 100644
index bbb6a52a1..000000000
--- a/dep/acelite/ace/TkReactor/ACE_TkReactor_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id: ACE_TkReactor_export.h 80826 2008-03-04 14:51:23Z wotte $
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s ACE_TkReactor
-// ------------------------------
-#ifndef ACE_TKREACTOR_EXPORT_H
-#define ACE_TKREACTOR_EXPORT_H
-
-#include /**/ "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_TKREACTOR_HAS_DLL)
-#  define ACE_TKREACTOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_TKREACTOR_HAS_DLL */
-
-#if !defined (ACE_TKREACTOR_HAS_DLL)
-#  define ACE_TKREACTOR_HAS_DLL 1
-#endif /* ! ACE_TKREACTOR_HAS_DLL */
-
-#if defined (ACE_TKREACTOR_HAS_DLL) && (ACE_TKREACTOR_HAS_DLL == 1)
-#  if defined (ACE_TKREACTOR_BUILD_DLL)
-#    define ACE_TkReactor_Export ACE_Proper_Export_Flag
-#    define ACE_TKREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ACE_TKREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ACE_TKREACTOR_BUILD_DLL */
-#    define ACE_TkReactor_Export ACE_Proper_Import_Flag
-#    define ACE_TKREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ACE_TKREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ACE_TKREACTOR_BUILD_DLL */
-#else /* ACE_TKREACTOR_HAS_DLL == 1 */
-#  define ACE_TkReactor_Export
-#  define ACE_TKREACTOR_SINGLETON_DECLARATION(T)
-#  define ACE_TKREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ACE_TKREACTOR_HAS_DLL == 1 */
-
-// Set ACE_TKREACTOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ACE_TKREACTOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ACE_TKREACTOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ACE_TKREACTOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ACE_TKREACTOR_NTRACE */
-
-#if (ACE_TKREACTOR_NTRACE == 1)
-#  define ACE_TKREACTOR_TRACE(X)
-#else /* (ACE_TKREACTOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ACE_TKREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ACE_TKREACTOR_NTRACE == 1) */
-
-#endif /* ACE_TKREACTOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/TkReactor/TkReactor.cpp b/dep/acelite/ace/TkReactor/TkReactor.cpp
deleted file mode 100644
index 1d73e0f6f..000000000
--- a/dep/acelite/ace/TkReactor/TkReactor.cpp
+++ /dev/null
@@ -1,438 +0,0 @@
-// $Id: TkReactor.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-#include "ace/TkReactor/TkReactor.h"
-
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Connector.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE (ACE_TkReactor)
-
-// Must be called with lock held
-ACE_TkReactor::ACE_TkReactor (size_t size,
-                              bool restart,
-                              ACE_Sig_Handler *h)
-  : ACE_Select_Reactor (size, restart, h),
-    ids_ (0),
-    timeout_ (0)
-{
-  // When the ACE_Select_Reactor is constructed it creates the notify
-  // pipe and registers it with the register_handler_i() method. The
-  // TkReactor overloads this method BUT because the
-  // register_handler_i occurs when constructing the base class
-  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
-  // is called not the TkReactor register_handler_i().  This means
-  // that the notify pipe is registered with the ACE_Select_Reactor
-  // event handling code not the TkReactor and so notfications don't
-  // work.  To get around this we simply close and re-opened the
-  // notification handler in the constructor of the TkReactor.
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  this->notify_handler_->close ();
-  this->notify_handler_->open (this, 0);
-#endif /* ACE_MT_SAFE */
-}
-
-ACE_TkReactor::~ACE_TkReactor (void)
-{
-  // Delete the remaining items in the linked list.
-
-  while (this->ids_)
-    {
-      ACE_TkReactorID *TkID = this->ids_->next_;
-      delete this->ids_;
-      this->ids_ = TkID;
-    }
-}
-
-// This is just the <wait_for_multiple_events> from ace/Reactor.cpp
-// but we use the Tk functions to wait for an event, not <select>
-
-int
-ACE_TkReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-                                         ACE_Time_Value *max_wait_time)
-{
-  ACE_TRACE ("ACE_TkReactor::wait_for_multiple_events");
-  int nfound;
-
-  do
-    {
-      max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
-
-      size_t width = this->handler_rep_.max_handlep1 ();
-      handle_set.rd_mask_ = this->wait_set_.rd_mask_;
-      handle_set.wr_mask_ = this->wait_set_.wr_mask_;
-      handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-      nfound = TkWaitForMultipleEvents (width,
-                                        handle_set,
-                                        max_wait_time);
-
-    } while (nfound == -1 && this->handle_error () > 0);
-
-  if (nfound > 0)
-    {
-#if !defined (ACE_WIN32)
-      handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
-#endif /* ACE_WIN32 */
-    }
-  return nfound; // Timed out or input available
-}
-
-void
-ACE_TkReactor::TimerCallbackProc (ClientData cd)
-{
-  ACE_TkReactor *self = (ACE_TkReactor *) cd;
-  self->timeout_ = 0;
-
-  // Deal with any timer events
-  ACE_Select_Reactor_Handle_Set handle_set;
-  self->dispatch (0, handle_set);
-  self->reset_timeout ();
-}
-
-/**
- * @todo the unused mask argument is probably quite useful, but we
- *       ignore it, why?  In fact the following comment probably
- *       relates to that:
- *       This could be made shorter if we know which *kind* of event
- *       we were about to get.  Here we use <select> to find out which
- *       one might be available.
- */
-void
-ACE_TkReactor::InputCallbackProc (ClientData cd,
-                                  int /* mask */)
-{
-  ACE_TkReactor_Input_Callback *callback = (ACE_TkReactor_Input_Callback *) cd;
-  ACE_TkReactor *self = callback->reactor_;
-  ACE_HANDLE handle = callback->handle_;
-
-  // my copy isn't const.
-  ACE_Time_Value zero = ACE_Time_Value::zero;
-
-  ACE_Select_Reactor_Handle_Set wait_set;
-
-  // Deal with one file event.
-
-  // - read which kind of event
-  if (self->wait_set_.rd_mask_.is_set (handle))
-    wait_set.rd_mask_.set_bit (handle);
-  if (self->wait_set_.wr_mask_.is_set (handle))
-    wait_set.wr_mask_.set_bit (handle);
-  if (self->wait_set_.ex_mask_.is_set (handle))
-    wait_set.ex_mask_.set_bit (handle);
-
-  int result = ACE_OS::select (handle + 1,
-                               wait_set.rd_mask_,
-                               wait_set.wr_mask_,
-                               wait_set.ex_mask_, &zero);
-
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  // - Use only that one file event (removes events for other files).
-  if (result > 0)
-    {
-      if (wait_set.rd_mask_.is_set (handle))
-        dispatch_set.rd_mask_.set_bit (handle);
-      if (wait_set.wr_mask_.is_set (handle))
-        dispatch_set.wr_mask_.set_bit (handle);
-      if (wait_set.ex_mask_.is_set (handle))
-        dispatch_set.ex_mask_.set_bit (handle);
-
-      self->dispatch (1, dispatch_set);
-    }
-}
-
-int
-ACE_TkReactor::TkWaitForMultipleEvents (int width,
-                                        ACE_Select_Reactor_Handle_Set &wait_set,
-                                        ACE_Time_Value *)
-{
-  // Check to make sure our handle's are all usable.
-  ACE_Select_Reactor_Handle_Set temp_set = wait_set;
-
-  if (ACE_OS::select (width,
-                      temp_set.rd_mask_,
-                      temp_set.wr_mask_,
-                      temp_set.ex_mask_,
-                      (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-    return -1; // Bad file arguments...
-
-  // Instead of waiting using <select>, just use the Tk mechanism to
-  // wait for a single event.
-
-  // Wait for something to happen.
-  ::Tcl_DoOneEvent (0);
-
-  // Reset the width, in case it changed during the upcalls.
-  width = this->handler_rep_.max_handlep1 ();
-
-  // Now actually read the result needed by the <Select_Reactor> using
-  // <select>.
-  return ACE_OS::select (width,
-                         wait_set.rd_mask_,
-                         wait_set.wr_mask_,
-                         wait_set.ex_mask_,
-                         (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-int
-ACE_TkReactor::register_handler_i (ACE_HANDLE handle,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_TkReactor::register_handler_i");
-
-  int result = ACE_Select_Reactor::register_handler_i (handle,
-                                                       handler, mask);
-  if (result == -1)
-    return -1;
-
-  int condition = 0;
-
-#if !defined ACE_WIN32
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, TK_READABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, TK_WRITABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_SET_BITS (condition, TK_EXCEPTION);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, TK_READABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){
-      ACE_SET_BITS (condition, TK_READABLE); // connected, you may write
-      ACE_SET_BITS (condition, TK_WRITABLE);  // connected, you have data/err
-  }
-#else
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, TK_READABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, TK_WRITABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_NOTSUP_RETURN(-1);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, TK_READABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){
-      ACE_SET_BITS (condition, TK_READABLE); // connected, you may write
-      ACE_SET_BITS (condition, TK_WRITABLE);  // connected, you have data/err
-  }
-#endif /* !ACE_WIN32 */
-
-  if (condition != 0)
-    {
-      ACE_TkReactorID *TkID = this->ids_;
-
-      while(TkID)
-        {
-          if (TkID->handle_ == handle)
-            {
-              ::Tk_DeleteFileHandler (TkID->handle_);
-
-              ACE_TkReactor_Input_Callback *callback;
-              ACE_NEW_RETURN (callback,
-                              ACE_TkReactor_Input_Callback,
-                              -1);
-              callback->reactor_ = this;
-              callback->handle_ = handle;
-              ::Tk_CreateFileHandler ((int) handle,
-                                      condition,
-                                      InputCallbackProc,
-                                      (ClientData) callback);
-              return 0;
-            }
-          else
-            TkID = TkID->next_;
-        }
-
-      ACE_NEW_RETURN (TkID,
-                      ACE_TkReactorID,
-                      -1);
-      TkID->next_ = this->ids_;
-      TkID->handle_ = handle;
-      ACE_TkReactor_Input_Callback *callback;
-      ACE_NEW_RETURN (callback,
-                      ACE_TkReactor_Input_Callback,
-                      -1);
-      callback->reactor_ = this;
-      callback->handle_ = handle;
-
-      ::Tk_CreateFileHandler ((int) handle,
-                              condition,
-                              InputCallbackProc,
-                              (ClientData) callback);
-      this->ids_ = TkID;
-    }
-  return 0;
-}
-
-int
-ACE_TkReactor::register_handler_i (const ACE_Handle_Set &handles,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::register_handler_i (handles,
-                                                 handler,
-                                                 mask);
-}
-
-int
-ACE_TkReactor::remove_handler_i (ACE_HANDLE handle,
-                                 ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_TkReactor::remove_handler_i");
-
-  // In the registration phase we registered first with
-  // ACE_Select_Reactor and then with X.  Now we are now doing things
-  // in reverse order.
-
-  // First clean up the corresponding X11Input.
-  this->remove_TkFileHandler (handle);
-
-  // Now let the reactor do its work.
-  return ACE_Select_Reactor::remove_handler_i (handle,
-                                               mask);
-}
-
-void
-ACE_TkReactor::remove_TkFileHandler (ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_TkReactor::remove_TkFileHandler");
-
-  ACE_TkReactorID *TkID = this->ids_;
-
-  if (TkID)
-    {
-      if (TkID->handle_ == handle)
-        {
-          ::Tk_DeleteFileHandler (TkID->handle_);
-          this->ids_ = TkID->next_;
-          delete TkID;
-          return;
-        }
-
-      ACE_TkReactorID *NextID = TkID->next_;
-
-      while (NextID)
-        {
-          if (NextID->handle_ == handle)
-            {
-              ::Tk_DeleteFileHandler (NextID->handle_);
-              TkID->next_ = NextID->next_;
-              delete NextID;
-              return;
-            }
-          else
-            {
-              TkID = NextID;
-              NextID = NextID->next_;
-            }
-        }
-    }
-}
-
-int
-ACE_TkReactor::remove_handler_i (const ACE_Handle_Set &handles,
-                                 ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::remove_handler_i (handles,
-                                               mask);
-}
-
-// The following functions ensure that there is an Tk timeout for the
-// first timeout in the Reactor's Timer_Queue.
-
-void
-ACE_TkReactor::reset_timeout (void)
-{
-  if (this->timeout_)
-    ::Tk_DeleteTimerHandler (this->timeout_);
-  timeout_ = 0;
-
-  ACE_Time_Value *max_wait_time =
-    this->timer_queue_->calculate_timeout (0);
-
-  if (max_wait_time)
-    timeout_ = ::Tk_CreateTimerHandler (max_wait_time->msec (),
-                                        TimerCallbackProc,
-                                        (ClientData) this);
-}
-
-int
-ACE_TkReactor::reset_timer_interval
-  (long timer_id,
-   const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_TkReactor::reset_timer_interval");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  int result = ACE_Select_Reactor::timer_queue_->reset_interval
-    (timer_id,
-     interval);
-
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-long
-ACE_TkReactor::schedule_timer (ACE_Event_Handler *event_handler,
-                               const void *arg,
-                const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_TkReactor::schedule_timer");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  long result = ACE_Select_Reactor::schedule_timer (event_handler,
-                                                    arg,
-                                                    delay,
-                                                    interval);
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-int
-ACE_TkReactor::cancel_timer (ACE_Event_Handler *handler,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_TkReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (handler,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-int
-ACE_TkReactor::cancel_timer (long timer_id,
-                             const void **arg,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_TkReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (timer_id,
-                                        arg,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/TkReactor/TkReactor.h b/dep/acelite/ace/TkReactor/TkReactor.h
deleted file mode 100644
index 60ad54dd4..000000000
--- a/dep/acelite/ace/TkReactor/TkReactor.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TkReactor.h
- *
- *  $Id: TkReactor.h 82723 2008-09-16 09:35:44Z johnnyw $
- *
- *  @author Nagarajan Surendran <naga@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_TKREACTOR_H
-#define ACE_TKREACTOR_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/TkReactor/ACE_TkReactor_export.h"
-#include "ace/Select_Reactor.h"
-#include /**/ <tk.h>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_TkReactorID
- *
- * @brief This little class is necessary due to the way that Microsoft
- * implements sockets to be pointers rather than indices.
- */
-class ACE_TkReactor_Export ACE_TkReactorID
-{
-public:
-  /// Underlying handle.
-  ACE_HANDLE handle_;
-
-  /// Pointer to next node in the linked list.
-  ACE_TkReactorID *next_;
-};
-
-class ACE_TkReactor;
-
-class ACE_TkReactor_Export ACE_TkReactor_Input_Callback
-{
-public:
-  ACE_TkReactor *reactor_;
-  ACE_HANDLE handle_;
-};
-
-/**
- * @class ACE_TkReactor
- *
- * @brief An object-oriented event demultiplexor and event handler
- * dispatcher that uses the Tk functions.
- */
-class ACE_TkReactor_Export ACE_TkReactor : public ACE_Select_Reactor
-{
-public:
-  // = Initialization and termination methods.
-  ACE_TkReactor (size_t size = DEFAULT_SIZE,
-                 bool restart = false,
-                 ACE_Sig_Handler * = 0);
-
-  virtual ~ACE_TkReactor (void);
-
-  // = Timer operations.
-  virtual long schedule_timer (ACE_Event_Handler *event_handler,
-                               const void *arg,
-                               const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval);
-  virtual int reset_timer_interval (long timer_id,
-                                    const ACE_Time_Value &interval);
-  virtual int cancel_timer (ACE_Event_Handler *handler,
-                            int dont_call_handle_close = 1);
-  virtual int cancel_timer (long timer_id,
-                            const void **arg = 0,
-                            int dont_call_handle_close = 1);
-
-protected:
-  // = Register timers/handles with Tk.
-  /// Register a single @a handler.
-  virtual int register_handler_i (ACE_HANDLE handle,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Register a set of <handlers>.
-  virtual int register_handler_i (const ACE_Handle_Set &handles,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Remove the @a handler associated with this @a handle.
-  virtual int remove_handler_i (ACE_HANDLE handle,
-                                ACE_Reactor_Mask mask);
-
-  /// Remove a set of <handles>.
-  virtual int remove_handler_i (const ACE_Handle_Set &handles,
-                                ACE_Reactor_Mask);
-
-  /// Removes an Tk FileHandler.
-  virtual void remove_TkFileHandler (ACE_HANDLE handle);
-
-  /// Wait for events to occur.
-  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
-                                        ACE_Time_Value *);
-
-  ///Wait for Tk events to occur.
-  virtual int TkWaitForMultipleEvents (int,
-                                       ACE_Select_Reactor_Handle_Set &,
-                                       ACE_Time_Value *);
-
-  ACE_TkReactorID *ids_;
-  Tk_TimerToken timeout_;
-
-private:
-  /// This method ensures there's a Tk timeout for the first timeout in
-  /// the Reactor's Timer_Queue.
-  void reset_timeout (void);
-
-  // = Integrate with the X callback function mechanism.
-  static void TimerCallbackProc (ClientData cd);
-  static void InputCallbackProc (ClientData cd,int mask);
-
-  /// Deny access since member-wise won't work...
-  ACE_TkReactor (const ACE_TkReactor &);
-  ACE_TkReactor &operator = (const ACE_TkReactor &);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* ACE_TK_REACTOR_H */
diff --git a/dep/acelite/ace/Token.cpp b/dep/acelite/ace/Token.cpp
index 909f14c16..cc9a24a44 100644
--- a/dep/acelite/ace/Token.cpp
+++ b/dep/acelite/ace/Token.cpp
@@ -1,4 +1,4 @@
-// $Id: Token.cpp 96024 2012-08-09 19:42:19Z schmidt $
+// $Id: Token.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Token.h"
 
@@ -11,7 +11,7 @@
 #if defined (ACE_HAS_THREADS)
 
 #include "ace/Thread.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if defined (ACE_TOKEN_DEBUGGING)
 // FUZZ: disable check_for_streams_include
@@ -28,16 +28,16 @@ ACE_Token::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthread = %d"), ACE_Thread::self ()));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthread = %d"), ACE_Thread::self ()));
   // @@ Is there a portable way to do this?
-  // ACE_DEBUG ((LM_DEBUG, "\nowner_ = %d", (long) this->owner_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nowner_ addr = %x"), &this->owner_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nwaiters_ = %d"), this->waiters_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nin_use_ = %d"), this->in_use_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnesting level = %d"), this->nesting_level_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  // ACELIB_DEBUG ((LM_DEBUG, "\nowner_ = %d", (long) this->owner_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nowner_ addr = %x"), &this->owner_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nwaiters_ = %d"), this->waiters_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nin_use_ = %d"), this->in_use_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnesting level = %d"), this->nesting_level_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -293,7 +293,7 @@ ACE_Token::shared_acquire (void (*sleep_hook_func)(void *),
   queue->remove_entry (&my_entry);
 
 #if defined (ACE_TOKEN_DEBUGGING)
-  ACE_DEBUG ((LM_DEBUG, "(%t) ACE_Token::shared_acquire (UNBLOCKED)\n"));
+  ACELIB_DEBUG ((LM_DEBUG, "(%t) ACE_Token::shared_acquire (UNBLOCKED)\n"));
 #endif /* ACE_TOKEN_DEBUGGING */
 
   // If timeout occured
@@ -439,7 +439,7 @@ ACE_Token::renew (int requeue_position,
   this_threads_queue->remove_entry (&my_entry);
 
 #if defined (ACE_TOKEN_DEBUGGING)
-  ACE_DEBUG ((LM_DEBUG, "(%t) ACE_Token::renew (UNBLOCKED)\n"));
+  ACELIB_DEBUG ((LM_DEBUG, "(%t) ACE_Token::renew (UNBLOCKED)\n"));
 #endif /* ACE_TOKEN_DEBUGGING */
 
   // If timeout occured
diff --git a/dep/acelite/ace/Token_Collection.cpp b/dep/acelite/ace/Token_Collection.cpp
index 4e124b892..cbd20588a 100644
--- a/dep/acelite/ace/Token_Collection.cpp
+++ b/dep/acelite/ace/Token_Collection.cpp
@@ -1,4 +1,4 @@
-// $Id: Token_Collection.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: Token_Collection.cpp 96985 2013-04-11 15:50:32Z huangh $
 #include "ace/Token_Collection.h"
 
 #if defined (ACE_HAS_TOKENS_LIBRARY)
@@ -40,7 +40,7 @@ ACE_Token_Collection::insert (ACE_Token_Proxy &new_token)
   ACE_Token_Proxy *temp = new_token.clone ();
 
   if (collection_.bind (name, temp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("bind failed\n")), -1);
+    ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("bind failed\n")), -1);
   return 0;
 }
 
@@ -84,7 +84,7 @@ ACE_Token_Collection::acquire (int notify,
        iterator.advance ())
     {
       if (debug_)
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("collection acquiring %s\n"),
                     temp->int_id_->name ()));
       if (temp->int_id_->acquire (notify,
@@ -149,7 +149,7 @@ ACE_Token_Collection::tryacquire (void (*sleep_hook)(void *))
        iterator.advance ())
     {
       if (debug_)
-        ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("collection acquiring %s\n"),
+        ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("collection acquiring %s\n"),
                     temp->int_id_->name ()));
       // We will fail if _any_ token is not free.
       if (temp->int_id_->tryacquire (sleep_hook) == -1)
@@ -172,7 +172,7 @@ ACE_Token_Collection::renew (int requeue_position,
        iterator.advance ())
     {
       if (debug_)
-        ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("collection renewing %s\n"),
+        ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("collection renewing %s\n"),
                     temp->int_id_->name ()));
       if (temp->int_id_->renew (requeue_position, options) == -1)
         return -1;
@@ -195,7 +195,7 @@ ACE_Token_Collection::renew (const ACE_TCHAR *token_name,
 
   // Did we find it?
   if (result == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("%p %s\n"),
+    ACELIB_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("%p %s\n"),
                        ACE_TEXT ("not in collection "),
                        token_name), -1);
   // perform the operation
@@ -214,7 +214,7 @@ ACE_Token_Collection::release (ACE_Synch_Options &)
        iterator.advance ())
     {
       if (debug_)
-        ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("collection releasing %s\n"),
+        ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("collection releasing %s\n"),
                     temp->int_id_->name ()));
       temp->int_id_->release ();
     }
@@ -275,14 +275,14 @@ ACE_Token_Collection::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token_Collection::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Token_Collection::dump:\n")
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Token_Collection::dump:\n")
               ACE_TEXT (" debug_ = %d\n"), debug_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("collection_\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("collection_\n")));
   collection_.dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("base:\n")));
   ACE_Token_Proxy::dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Token_Invariants.cpp b/dep/acelite/ace/Token_Invariants.cpp
index 11d29fb1f..dc4196bf0 100644
--- a/dep/acelite/ace/Token_Invariants.cpp
+++ b/dep/acelite/ace/Token_Invariants.cpp
@@ -1,4 +1,4 @@
-// $Id: Token_Invariants.cpp 91287 2010-08-05 10:30:49Z johnnyw $
+// $Id: Token_Invariants.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Token_Invariants.h"
 
@@ -140,12 +140,12 @@ ACE_Token_Invariant_Manager::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token_Invariant_Manager::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("mutex_collection_:\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("mutex_collection_:\n")));
   mutex_collection_.dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("rwlock_collection_:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("rwlock_collection_:\n")));
   rwlock_collection_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -267,9 +267,9 @@ ACE_Mutex_Invariants::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Mutex_Invariants::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("owners_ = %d\n"), owners_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("owners_ = %d\n"), owners_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -342,10 +342,10 @@ ACE_RWLock_Invariants::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_RWLock_Invariants::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("writers_ = %d readers_ = %d\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("writers_ = %d readers_ = %d\n"),
               writers_, readers_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Token_Manager.cpp b/dep/acelite/ace/Token_Manager.cpp
index 7492b675d..72f4ed983 100644
--- a/dep/acelite/ace/Token_Manager.cpp
+++ b/dep/acelite/ace/Token_Manager.cpp
@@ -1,4 +1,4 @@
-// $Id: Token_Manager.cpp 91287 2010-08-05 10:30:49Z johnnyw $
+// $Id: Token_Manager.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Token_Manager.h"
 
@@ -153,8 +153,8 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy)
       // The caller is an owner, so we have a deadlock situation.
       if (debug_)
         {
-          ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) Deadlock detected.\n")));
-          ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("%s owns %s and is waiting for %s.\n"),
+          ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) Deadlock detected.\n")));
+          ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("%s owns %s and is waiting for %s.\n"),
                       proxy->client_id (),
                       token->name (),
                       proxy->token_->name ()));
@@ -175,7 +175,7 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy)
             {
               if (debug_)
                 {
-                  ACE_DEBUG ((LM_DEBUG,
+                  ACELIB_DEBUG ((LM_DEBUG,
                               ACE_TEXT ("%s owns %s and is waiting for %s.\n"),
                               e->client_id (),
                               token->name (),
@@ -231,7 +231,7 @@ ACE_Token_Manager::release_token (ACE_Tokens *&token)
         // we did not find one in the collection
         {
           errno = ENOENT;
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Token Manager could not release %s:%d\n"),
+          ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Token Manager could not release %s:%d\n"),
                       token->name (), token->type ()));
           // @@ bad
         }
@@ -257,13 +257,13 @@ ACE_Token_Manager::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token_Manager::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Token_Manager::dump:\n")));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("lock_\n")));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACE_Token_Manager::dump:\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("lock_\n")));
   lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("collection_\n")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("collection_\n")));
   collection_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Token_Request_Reply.cpp b/dep/acelite/ace/Token_Request_Reply.cpp
index 6d842ed2b..ffe4c41e8 100644
--- a/dep/acelite/ace/Token_Request_Reply.cpp
+++ b/dep/acelite/ace/Token_Request_Reply.cpp
@@ -1,4 +1,4 @@
-// $Id: Token_Request_Reply.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Token_Request_Reply.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Token_Request_Reply.h"
 
@@ -94,46 +94,46 @@ void
 ACE_Token_Request::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"),
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"),
              this->length (), this->token_name (), this->client_id ()));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("type = ")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("type = ")));
 
   if (this->token_type () == ACE_Tokens::MUTEX)
-    ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("MUTEX\n")));
+    ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("MUTEX\n")));
   else // == ACE_Tokens::RWLOCK
     {
       if (this->proxy_type () == ACE_RW_Token::READER)
-        ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("RLOCK\n")));
+        ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("RLOCK\n")));
       else // == WRITER
-        ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("WLOCK\n")));
+        ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("WLOCK\n")));
     }
 
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("operation = ")));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("operation = ")));
   switch (this->operation_type ())
     {
     case ACE_Token_Request::ACQUIRE:
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACQUIRE\n")));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("ACQUIRE\n")));
       break;
     case ACE_Token_Request::RELEASE:
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("RELEASE\n")));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("RELEASE\n")));
       break;
     case ACE_Token_Request::RENEW:
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("RENEW\n")));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("RENEW\n")));
       break;
     default:
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("<unknown operation type> = %d\n"), this->operation_type ()));
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("<unknown operation type> = %d\n"), this->operation_type ()));
       break;
     }
 
   if (this->options ()[ACE_Synch_Options::USE_TIMEOUT] == 0)
-    ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("blocking forever\n")));
+    ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("blocking forever\n")));
   else
     {
-      ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("waiting for %d secs and %d usecs\n"),
+      ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("waiting for %d secs and %d usecs\n"),
                  this->options ().timeout ().sec (), this->options ().timeout ().usec ()));
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -175,9 +175,9 @@ void
 ACE_Token_Reply::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("*******\nlength = %d\nerrnum = %d"),
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("*******\nlength = %d\nerrnum = %d"),
              this->length (), this->errnum ()));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("arg = %d"), this->arg ()));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("arg = %d"), this->arg ()));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Trace.cpp b/dep/acelite/ace/Trace.cpp
index 8acbb6342..beaa4f1b6 100644
--- a/dep/acelite/ace/Trace.cpp
+++ b/dep/acelite/ace/Trace.cpp
@@ -1,4 +1,4 @@
-// $Id: Trace.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: Trace.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/Trace.h"
 
@@ -8,7 +8,7 @@
 #endif /* ACE_NTRACE */
 #define ACE_NTRACE 1
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Object_Manager_Base.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -93,7 +93,7 @@ ACE_Trace::ACE_Trace (const ACE_TCHAR *n,
           && lm->trace_active () == 0)
         {
           lm->trace_active (1);
-          ACE_DEBUG ((LM_TRACE,
+          ACELIB_DEBUG ((LM_TRACE,
                       ACE_TEXT ("%*s(%t) calling %s in file `%s' on line %d\n"),
                       ACE_Trace::nesting_indent_ * lm->inc (),
                       ACE_TEXT (""),
@@ -119,7 +119,7 @@ ACE_Trace::~ACE_Trace (void)
           && lm->trace_active () == 0)
         {
           lm->trace_active (1);
-          ACE_DEBUG ((LM_TRACE,
+          ACELIB_DEBUG ((LM_TRACE,
                       ACE_TEXT ("%*s(%t) leaving %s\n"),
                       ACE_Trace::nesting_indent_ * lm->dec (),
                       ACE_TEXT (""),
diff --git a/dep/acelite/ace/Typed_SV_Message_Queue.cpp b/dep/acelite/ace/Typed_SV_Message_Queue.cpp
index 0adb589e6..88cd1b848 100644
--- a/dep/acelite/ace/Typed_SV_Message_Queue.cpp
+++ b/dep/acelite/ace/Typed_SV_Message_Queue.cpp
@@ -1,4 +1,4 @@
-// $Id: Typed_SV_Message_Queue.cpp 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Typed_SV_Message_Queue.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_TYPED_SV_MESSAGE_QUEUE_CPP
 #define ACE_TYPED_SV_MESSAGE_QUEUE_CPP
@@ -10,7 +10,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Typed_SV_Message_Queue.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Typed_SV_Message_Queue.inl"
@@ -41,7 +41,7 @@ ACE_Typed_SV_Message_Queue<T>::ACE_Typed_SV_Message_Queue (key_t external_id,
 {
   ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::ACE_Typed_SV_Message_Queue");
   if (this->open (external_id, create, perms) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 "ACE_Typed_SV_Message_Queue::ACE_Typed_SV_Message_Queue"));
 }
 
diff --git a/dep/acelite/ace/UNIX_Addr.h b/dep/acelite/ace/UNIX_Addr.h
index 887529fe1..e60465528 100644
--- a/dep/acelite/ace/UNIX_Addr.h
+++ b/dep/acelite/ace/UNIX_Addr.h
@@ -4,7 +4,7 @@
 /**
  *  @file    UNIX_Addr.h
  *
- *  $Id: UNIX_Addr.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: UNIX_Addr.h 96985 2013-04-11 15:50:32Z huangh $
  *
  *  @author Doug Schmidt
  */
@@ -25,7 +25,7 @@
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
 #include "ace/Addr.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/ACE.h"
 #include "ace/os_include/sys/os_un.h"
 
diff --git a/dep/acelite/ace/UPIPE_Acceptor.cpp b/dep/acelite/ace/UPIPE_Acceptor.cpp
index 3cdf6e2f5..6d6366cd0 100644
--- a/dep/acelite/ace/UPIPE_Acceptor.cpp
+++ b/dep/acelite/ace/UPIPE_Acceptor.cpp
@@ -1,4 +1,4 @@
-// $Id: UPIPE_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: UPIPE_Acceptor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/UPIPE_Acceptor.h"
 
@@ -63,7 +63,7 @@ ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr,
   ACE_TRACE ("ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor");
 
   if (this->open (local_addr, reuse_addr) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("ACE_UPIPE_Acceptor")));
 }
@@ -103,16 +103,16 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream,
       if (ACE_OS::read (new_stream.get_handle (),
                         (char *) &remote_stream,
                         sizeof remote_stream) == -1)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("ACE_UPIPE_Acceptor: %p\n"),
                     ACE_TEXT ("read stream address failed")));
       else if (new_stream.stream_.link (remote_stream->stream_) == -1)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("ACE_UPIPE_Acceptor: %p\n"),
                     ACE_TEXT ("link streams failed")));
       // Send a message over the new streampipe to confirm acceptance.
       else if (new_stream.send (&mb_, 0) == -1)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("ACE_UPIPE_Acceptor: %p\n"),
                     ACE_TEXT ("linked stream.put failed")));
 
diff --git a/dep/acelite/ace/UPIPE_Connector.cpp b/dep/acelite/ace/UPIPE_Connector.cpp
index ce03c0fae..07fc462a0 100644
--- a/dep/acelite/ace/UPIPE_Connector.cpp
+++ b/dep/acelite/ace/UPIPE_Connector.cpp
@@ -1,4 +1,4 @@
-// $Id: UPIPE_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: UPIPE_Connector.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #include "ace/UPIPE_Connector.h"
 
@@ -70,7 +70,7 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream,
                                       (const char *) &ustream,
                                       sizeof ustream);
       if (result == -1)
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("ACE_UPIPE_Connector %p\n"),
                     ACE_TEXT ("write to pipe failed")));
 
@@ -83,7 +83,7 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream,
       // Do *not* coalesce the following two checks for result == -1.
       // They perform different checks and cannot be merged.
       if (result == -1)
-          ACE_ERROR ((LM_ERROR,
+          ACELIB_ERROR ((LM_ERROR,
                       ACE_TEXT ("ACE_UPIPE_Connector %p\n"),
                       ACE_TEXT ("no confirmation from server")));
       else
diff --git a/dep/acelite/ace/UPIPE_Connector.inl b/dep/acelite/ace/UPIPE_Connector.inl
index 07b7502cc..b44ac6e6f 100644
--- a/dep/acelite/ace/UPIPE_Connector.inl
+++ b/dep/acelite/ace/UPIPE_Connector.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: UPIPE_Connector.inl 82723 2008-09-16 09:35:44Z johnnyw $
+// $Id: UPIPE_Connector.inl 96985 2013-04-11 15:50:32Z huangh $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -18,7 +18,7 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream,
   if (this->connect (new_stream, addr, timeout, local_sap,
                      reuse_addr, flags, perms) == -1
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("address %s, %p\n"),
                 addr.get_path_name (),
                 ACE_TEXT ("ACE_UPIPE_Connector")));
diff --git a/dep/acelite/ace/UUID.cpp b/dep/acelite/ace/UUID.cpp
index 09855ca67..a08a0e7f3 100644
--- a/dep/acelite/ace/UUID.cpp
+++ b/dep/acelite/ace/UUID.cpp
@@ -1,4 +1,4 @@
-//$Id: UUID.cpp 96017 2012-08-08 22:18:09Z mitza $
+//$Id: UUID.cpp 97383 2013-10-23 08:44:20Z mhengstmengel $
 
 #include "ace/UUID.h"
 #include "ace/Guard_T.h"
@@ -7,7 +7,7 @@
 #include "ace/UUID.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_time.h"
@@ -131,7 +131,7 @@ namespace ACE_Utils
   {
     if (uuid_string.length () < NIL_UUID.to_string ()->length ())
       {
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     "%N ACE_UUID::from_string_i - "
                     "IllegalArgument (incorrect string length)\n"));
         return;
@@ -182,7 +182,7 @@ namespace ACE_Utils
 
         if (nScanned != 11)
           {
-            ACE_DEBUG ((LM_DEBUG,
+            ACELIB_DEBUG ((LM_DEBUG,
                         "UUID::from_string_i - "
                         "IllegalArgument (invalid string representation)\n"));
             return;
@@ -228,7 +228,7 @@ namespace ACE_Utils
 
         if (nScanned != 12)
           {
-            ACE_DEBUG ((LM_DEBUG,
+            ACELIB_DEBUG ((LM_DEBUG,
                         "ACE_UUID::from_string_i - "
                         "IllegalArgument (invalid string representation)\n"));
             return;
@@ -248,7 +248,7 @@ namespace ACE_Utils
     if ((this->uuid_.clock_seq_hi_and_reserved_ & 0xc0) != 0x80 &&
         (this->uuid_.clock_seq_hi_and_reserved_ & 0xc0) != 0xc0)
       {
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     "ACE_UUID::from_string_i - "
                     "IllegalArgument (unsupported variant)\n"));
         return;
@@ -261,7 +261,7 @@ namespace ACE_Utils
         (V1 & 0xF000) != 0x3000 &&
         (V1 & 0xF000) != 0x4000)
       {
-        ACE_DEBUG ((LM_DEBUG,
+        ACELIB_DEBUG ((LM_DEBUG,
                     "ACE_UUID::from_string_i - "
                     "IllegalArgument (unsupported version)\n"));
         return;
@@ -271,7 +271,7 @@ namespace ACE_Utils
       {
         if (uuid_string.length () == NIL_UUID.to_string ()->length ())
           {
-            ACE_DEBUG ((LM_DEBUG,
+            ACELIB_DEBUG ((LM_DEBUG,
                       "ACE_UUID::from_string_i - "
                         "IllegalArgument (Missing Thread and Process Id)\n"));
             return;
@@ -279,7 +279,7 @@ namespace ACE_Utils
         ACE_CString thr_pid_str (thr_pid_buf);
         ssize_t pos = static_cast<ssize_t> (thr_pid_str.find ('-'));
         if (pos == -1)
-          ACE_DEBUG ((LM_DEBUG,
+          ACELIB_DEBUG ((LM_DEBUG,
                       "ACE_UUID::from_string_i - "
                       "IllegalArgument (Thread and Process Id format incorrect)\n"));
 
@@ -348,8 +348,8 @@ namespace ACE_Utils
   UUID_Generator::
   generate_UUID (UUID& uuid, ACE_UINT16 version, u_char variant)
   {
-    UUID_Time timestamp;
-    ACE_UINT16 clock_sequence;
+    UUID_Time timestamp = 0;
+    ACE_UINT16 clock_sequence = 0;
 
     this->get_timestamp_and_clocksequence (timestamp,
                                            clock_sequence);
@@ -487,9 +487,6 @@ namespace ACE_Utils
   }
 }
 
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-  template ACE_Singleton <ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX> *
-  ACE_Singleton <ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX);
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/Unbounded_Queue.cpp b/dep/acelite/ace/Unbounded_Queue.cpp
index 2890650fb..317458469 100644
--- a/dep/acelite/ace/Unbounded_Queue.cpp
+++ b/dep/acelite/ace/Unbounded_Queue.cpp
@@ -1,4 +1,4 @@
-// $Id: Unbounded_Queue.cpp 82723 2008-09-16 09:35:44Z johnnyw $
+// $Id: Unbounded_Queue.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_UNBOUNDED_QUEUE_CPP
 #define ACE_UNBOUNDED_QUEUE_CPP
@@ -14,7 +14,7 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Malloc_Base.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/os_include/os_errno.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -89,10 +89,10 @@ ACE_Unbounded_Queue<T>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   //   ACE_TRACE ("ACE_Unbounded_Queue<T>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhead_ = %u"), this->head_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhead_ = %u"), this->head_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_));
 
   T *item = 0;
 #if !defined (ACE_NLOGGING)
@@ -102,9 +102,9 @@ ACE_Unbounded_Queue<T>::dump (void) const
   for (ACE_Unbounded_Queue_Iterator<T> iter (*(ACE_Unbounded_Queue<T> *) this);
        iter.next (item) != 0;
        iter.advance ())
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %d\n"), count++));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %d\n"), count++));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Unbounded_Set.cpp b/dep/acelite/ace/Unbounded_Set.cpp
index c54e3fcfa..a452eb339 100644
--- a/dep/acelite/ace/Unbounded_Set.cpp
+++ b/dep/acelite/ace/Unbounded_Set.cpp
@@ -1,11 +1,11 @@
-// $Id: Unbounded_Set.cpp 81624 2008-05-06 17:14:57Z wotte $
+// $Id: Unbounded_Set.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_UNBOUNDED_SET_CPP
 #define ACE_UNBOUNDED_SET_CPP
 
 #include "ace/Unbounded_Set.h"
 #include "ace/Malloc_Base.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/Unbounded_Set_Ex.cpp b/dep/acelite/ace/Unbounded_Set_Ex.cpp
index 763d7aa01..81fd7e48c 100644
--- a/dep/acelite/ace/Unbounded_Set_Ex.cpp
+++ b/dep/acelite/ace/Unbounded_Set_Ex.cpp
@@ -1,11 +1,11 @@
-// $Id: Unbounded_Set_Ex.cpp 94304 2011-07-07 15:25:58Z johnnyw $
+// $Id: Unbounded_Set_Ex.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 #ifndef ACE_UNBOUNDED_SET_EX_CPP
 #define ACE_UNBOUNDED_SET_EX_CPP
 
 #include "ace/Unbounded_Set.h"
 #include "ace/Malloc_Base.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -64,10 +64,10 @@ ACE_Unbounded_Set_Ex<T, C>::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhead_ = %u"), this->head_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhead_ = %u"), this->head_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_));
+  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_));
 
   T *item = 0;
 #if !defined (ACE_NLOGGING)
@@ -78,9 +78,9 @@ ACE_Unbounded_Set_Ex<T, C>::dump (void) const
   for (const_iterator i (this->begin ());
        i != the_end;
        ++i)
-    ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("count = %u\n"), count++));
+    ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("count = %u\n"), count++));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/Value_Ptr.h b/dep/acelite/ace/Value_Ptr.h
index dbcd20a0f..c7acc1251 100644
--- a/dep/acelite/ace/Value_Ptr.h
+++ b/dep/acelite/ace/Value_Ptr.h
@@ -4,7 +4,7 @@
 /**
  *  @file Value_Ptr.h
  *
- *  $Id: Value_Ptr.h 92386 2010-10-28 07:44:37Z johnnyw $
+ *  $Id: Value_Ptr.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  Value_Ptr implementation based on code in Herb Sutter's book "More
  *  Exceptional C++".
@@ -16,7 +16,7 @@
 #ifndef ACE_VALUE_PTR_H
 #define ACE_VALUE_PTR_H
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #include <algorithm>
 
diff --git a/dep/acelite/ace/Version.h b/dep/acelite/ace/Version.h
index 33a98834b..98c7edd50 100644
--- a/dep/acelite/ace/Version.h
+++ b/dep/acelite/ace/Version.h
@@ -1,9 +1,9 @@
 
 // -*- C++ -*-
-// $Id: Version.h 96107 2012-08-29 06:17:32Z johnnyw $
+// $Id: Version.h 97979 2014-11-14 07:38:51Z johnnyw $
 // This is file was automatically generated by \$ACE_ROOT/bin/make_release.py
 
 #define ACE_MAJOR_VERSION 6
-#define ACE_MINOR_VERSION 1
-#define ACE_BETA_VERSION 4
-#define ACE_VERSION "6.1.4"
+#define ACE_MINOR_VERSION 3
+#define ACE_BETA_VERSION 0
+#define ACE_VERSION "6.3.0"
diff --git a/dep/acelite/ace/WFMO_Reactor.cpp b/dep/acelite/ace/WFMO_Reactor.cpp
index dd4086ffd..db245afb0 100644
--- a/dep/acelite/ace/WFMO_Reactor.cpp
+++ b/dep/acelite/ace/WFMO_Reactor.cpp
@@ -1,4 +1,4 @@
-// $Id: WFMO_Reactor.cpp 95368 2011-12-19 13:38:49Z mcorino $
+// $Id: WFMO_Reactor.cpp 97798 2014-07-03 10:57:43Z johnnyw $
 
 #include "ace/WFMO_Reactor.h"
 
@@ -14,8 +14,6 @@
 #include "ace/WFMO_Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 #include "ace/Auto_Ptr.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -29,7 +27,7 @@ int
 ACE_WFMO_Reactor_Handler_Repository::open (size_t size)
 {
   if (size > MAXIMUM_WAIT_OBJECTS)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%d exceeds MAXIMUM_WAIT_OBJECTS (%d)\n"),
                        size,
                        MAXIMUM_WAIT_OBJECTS),
@@ -175,7 +173,7 @@ ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks,
     case ACE_Reactor::GET_MASK:
 
       // The work for this operation is done in all cases at the
-      // begining of the function.
+      // beginning of the function.
 
       ACE_UNUSED_ARG (change_masks);
 
@@ -991,59 +989,59 @@ ACE_WFMO_Reactor_Handler_Repository::dump (void) const
 
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Max size = %d\n"),
               this->max_size_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Current info table\n\n")));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\tSize = %d\n"),
               this->max_handlep1_));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\tHandles to be suspended = %d\n"),
               this->handles_to_be_suspended_));
 
   for (i = 0; i < this->max_handlep1_; ++i)
     this->current_info_[i].dump (this->current_handles_[i]);
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n")));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("To-be-added info table\n\n")));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\tSize = %d\n"),
               this->handles_to_be_added_));
 
   for (i = 0; i < this->handles_to_be_added_; ++i)
     this->to_be_added_info_[i].dump ();
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n")));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Suspended info table\n\n")));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\tSize = %d\n"),
               this->suspended_handles_));
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\tHandles to be resumed = %d\n"),
               this->handles_to_be_resumed_));
 
   for (i = 0; i < this->suspended_handles_; ++i)
     this->current_suspended_info_[i].dump ();
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n")));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Total handles to be deleted = %d\n"),
               this->handles_to_be_deleted_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
@@ -1086,7 +1084,7 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh,
     deactivated_ (0)
 {
   if (this->open (ACE_WFMO_Reactor::DEFAULT_SIZE, 0, sh, tq, 0, notify) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("WFMO_Reactor")));
 }
@@ -1121,7 +1119,7 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size,
   ACE_UNUSED_ARG (unused);
 
   if (this->open (size, 0, sh, tq, 0, notify) == -1)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("WFMO_Reactor")));
 }
@@ -1208,7 +1206,7 @@ ACE_WFMO_Reactor::open (size_t size,
   // Open the handle repository.  Two additional handles for internal
   // purposes
   if (this->handler_rep_.open (size + 2) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+    ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
                        ACE_TEXT ("opening handler repository")),
                       -1);
   else
@@ -1236,7 +1234,7 @@ ACE_WFMO_Reactor::open (size_t size,
 
   // Open the notification handler
   if (this->notify_handler_->open (this, this->timer_queue_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("opening notify handler ")),
                       -1);
@@ -1244,7 +1242,7 @@ ACE_WFMO_Reactor::open (size_t size,
   // Register for <wakeup_all_threads> event
   if (this->register_handler (&this->wakeup_all_threads_handler_,
                               this->wakeup_all_threads_.handle ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
                        ACE_TEXT ("registering thread wakeup handler")),
                       -1);
@@ -1313,19 +1311,9 @@ ACE_WFMO_Reactor::close (void)
   // This will unregister all handles
   this->handler_rep_.close ();
 
-  return 0;
-}
-
-ACE_WFMO_Reactor::~ACE_WFMO_Reactor (void)
-{
-  // Assumption: No threads are left in the Reactor when this method
-  // is called (i.e., active_threads_ == 0)
-
-  // Close down
-  this->close ();
-
   // Make necessary changes to the handler repository that we caused
-  // by <close>.
+  // by the above actions. Someone who called close() is expecting that
+  // things will be tidied up upon return.
   this->handler_rep_.make_changes ();
 
   if (this->delete_timer_queue_)
@@ -1353,6 +1341,17 @@ ACE_WFMO_Reactor::~ACE_WFMO_Reactor (void)
       this->notify_handler_ = 0;
       this->delete_notify_handler_ = false;
     }
+
+  return 0;
+}
+
+ACE_WFMO_Reactor::~ACE_WFMO_Reactor (void)
+{
+  // Assumption: No threads are left in the Reactor when this method
+  // is called (i.e., active_threads_ == 0)
+
+  // Close down
+  this->close ();
 }
 
 int
@@ -2342,13 +2341,13 @@ ACE_WFMO_Reactor::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_WFMO_Reactor::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Count of currently active threads = %d\n"),
               this->active_threads_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("ID of owner thread = %d\n"),
               this->owner_));
 
@@ -2356,7 +2355,7 @@ ACE_WFMO_Reactor::dump (void) const
   this->signal_handler_->dump ();
   this->timer_queue_->dump ();
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -2437,7 +2436,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
 
   // This will get called when <WFMO_Reactor->wakeup_one_thread_> event
   // is signaled.
-  //  ACE_DEBUG ((LM_DEBUG,
+  //  ACELIB_DEBUG ((LM_DEBUG,
   //             ACE_TEXT ("(%t) waking up to handle internal notifications\n")));
 
   for (int i = 1; ; ++i)
@@ -2493,7 +2492,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
                   result = event_handler->handle_group_qos (ACE_INVALID_HANDLE);
                   break;
                 default:
-                  ACE_ERROR ((LM_ERROR,
+                  ACELIB_ERROR ((LM_ERROR,
                               ACE_TEXT ("invalid mask = %d\n"),
                               buffer->mask_));
                   break;
@@ -2692,12 +2691,12 @@ ACE_WFMO_Reactor_Notify::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_WFMO_Reactor_Notify::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->timer_queue_->dump ();
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Max. iteration: %d\n"),
               this->max_notify_iterations_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
diff --git a/dep/acelite/ace/WFMO_Reactor.h b/dep/acelite/ace/WFMO_Reactor.h
index e15643e3b..f56b27416 100644
--- a/dep/acelite/ace/WFMO_Reactor.h
+++ b/dep/acelite/ace/WFMO_Reactor.h
@@ -4,7 +4,7 @@
 /**
  *  @file    WFMO_Reactor.h
  *
- *  $Id: WFMO_Reactor.h 93792 2011-04-07 11:48:50Z mcorino $
+ *  $Id: WFMO_Reactor.h 97645 2014-03-07 12:01:21Z johnnyw $
  *
  *  @author Irfan Pyarali <irfan@cs.wustl.edu>
  *  @author Tim Harrison <harrison@cs.wustl.edu>
@@ -310,7 +310,7 @@ public:
 
   // = Search structure operations.
 
-  /// Bind the <ACE_Event_Handler *> to the ACE_HANDLE. This is for
+  /// Bind the ACE_Event_Handler * to the ACE_HANDLE. This is for
   /// the simple event entry.
   int bind (ACE_HANDLE, ACE_Event_Handler *);
 
@@ -327,7 +327,7 @@ public:
   int unbind (ACE_HANDLE,
               ACE_Reactor_Mask mask);
 
-  /// Non-lock-grabbing version of <unbind>
+  /// Non-lock-grabbing version of unbind
   int unbind_i (ACE_HANDLE,
                 ACE_Reactor_Mask mask,
                 bool &changes_required);
@@ -482,11 +482,11 @@ protected:
 /**
  * @class ACE_WFMO_Reactor_Notify
  *
- * @brief Unblock the <ACE_WFMO_Reactor> from its event loop, passing
+ * @brief Unblock the ACE_WFMO_Reactor from its event loop, passing
  * it an optional ACE_Event_Handler to dispatch.
  *
  * This implementation is necessary for cases where the
- * <ACE_WFMO_Reactor> is run in a multi-threaded program.  In
+ * ACE_WFMO_Reactor is run in a multi-threaded program.  In
  * this case, we need to be able to unblock
  * <WaitForMultipleObjects> when updates occur other than in the
  * main <ACE_WFMO_Reactor> thread.  To do this, we signal an
@@ -500,7 +500,7 @@ public:
   /// Constructor
   ACE_WFMO_Reactor_Notify (size_t max_notifies = 1024);
 
-  /// Initialization. <timer_queue> is stored to call <gettimeofday>.
+  /// Initialization. @a timer_queue is stored to call <gettimeofday>.
   virtual int open (ACE_Reactor_Impl *wfmo_reactor,
                     ACE_Timer_Queue *timer_queue,
                     int disable_notify = 0);
@@ -525,7 +525,7 @@ public:
   virtual int dispatch_notifications (int &number_of_active_handles,
                                       ACE_Handle_Set &rd_mask);
 
-  /// Returns a handle to the <ACE_Auto_Event>.
+  /// Returns a handle to the ACE_Auto_Event.
   virtual ACE_HANDLE get_handle (void) const;
 
   /// Returns the ACE_HANDLE of the notify pipe on which the reactor
diff --git a/dep/acelite/ace/WFMO_Reactor.inl b/dep/acelite/ace/WFMO_Reactor.inl
index 6d3e43db6..ef8c6dc10 100644
--- a/dep/acelite/ace/WFMO_Reactor.inl
+++ b/dep/acelite/ace/WFMO_Reactor.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: WFMO_Reactor.inl 82949 2008-10-06 22:32:10Z shuston $
+// $Id: WFMO_Reactor.inl 97894 2014-09-16 18:11:56Z johnnyw $
 
 #include "ace/Handle_Set.h"
 #include "ace/Reactor.h"
@@ -19,7 +19,7 @@ ACE_Wakeup_All_Threads_Handler::handle_signal (int /* signum */,
 {
   // This will get called when <WFMO_Reactor->wakeup_all_threads_> event
   // is signaled. There is nothing to be done here.
-  //  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) waking up to get updated handle set info\n")));
+  //  ACELIB_DEBUG ((LM_DEBUG,  ACE_TEXT ("(%t) waking up to get updated handle set info\n")));
   return 0;
 }
 
@@ -81,37 +81,37 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("I/O Entry = %d\n"),
               this->io_entry_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Event Handler = %d\n"),
               this->event_handler_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("I/O Handle = %d\n"),
               this->io_handle_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Network Events = %d\n"),
               this->network_events_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delete Event = %d\n"),
               this->delete_event_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delete Entry = %d\n"),
               this->delete_entry_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Close Masks = %d\n"),
               this->close_masks_));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -164,19 +164,19 @@ ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump (ACE_HANDLE event_handle
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   Common_Info::dump ();
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Event Handle = %d\n"),
               event_handle));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Suspend Entry = %d\n"),
               this->suspend_entry_));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #else /* !ACE_HAS_DUMP */
   ACE_UNUSED_ARG (event_handle);
 #endif /* ACE_HAS_DUMP */
@@ -237,19 +237,19 @@ ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   Common_Info::dump ();
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Event Handle = %d\n"),
               this->event_handle_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Suspend Entry = %d\n"),
               this->suspend_entry_));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -308,19 +308,19 @@ ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump (void) const
 #if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump");
 
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   Common_Info::dump ();
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Event Handle = %d\n"),
               this->event_handle_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACELIB_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Resume Entry = %d\n"),
               this->resume_entry_));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
 }
 
@@ -499,7 +499,7 @@ ACE_WFMO_Reactor::cancel_timer (ACE_Event_Handler *handler,
                                 int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_WFMO_Reactor::cancel_timer");
-  if (0 != this->timer_queue_)
+  if ((0 != this->timer_queue_) && (0 != handler))
     return this->timer_queue_->cancel (handler, dont_call_handle_close);
   return 0;
 }
diff --git a/dep/acelite/ace/WIN32_Asynch_IO.cpp b/dep/acelite/ace/WIN32_Asynch_IO.cpp
index 8eaf745ed..a27d47aed 100644
--- a/dep/acelite/ace/WIN32_Asynch_IO.cpp
+++ b/dep/acelite/ace/WIN32_Asynch_IO.cpp
@@ -1,4 +1,4 @@
-// $Id: WIN32_Asynch_IO.cpp 95652 2012-03-23 22:11:35Z shuston $
+// $Id: WIN32_Asynch_IO.cpp 97957 2014-11-04 17:45:11Z johnnyw $
 
 #include "ace/WIN32_Asynch_IO.h"
 
@@ -9,6 +9,7 @@
 #include "ace/Proactor.h"
 #include "ace/Message_Block.h"
 #include "ace/Service_Config.h"
+#include "ace/Flag_Manip.h"
 #include "ace/INET_Addr.h"
 #include "ace/Task_T.h"
 #include "ace/OS_NS_errno.h"
@@ -84,7 +85,7 @@ ACE_WIN32_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor)
   ACE_WIN32_Proactor *win32_proactor = dynamic_cast<ACE_WIN32_Proactor *> (proactor);
 
   if (win32_proactor == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Dynamic cast to WIN32 Proactor failed\n")),
                       -1);
 
@@ -443,7 +444,7 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block,
 
     // OS should correctly process zero length buffers
     // if ( msg_space == 0 )
-    //   ACE_ERROR_RETURN ((LM_ERROR,
+    //   ACELIB_ERROR_RETURN ((LM_ERROR,
     //                      ACE_TEXT ("ACE_WIN32_Asynch_Read_Stream::readv:")
     //                      ACE_TEXT ("No space in the message block\n")),
     //                     -1);
@@ -486,7 +487,7 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block,
     bytes_to_read += iov[i].iov_len;
 
   if (bytes_to_read == 0)
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("ACE_WIN32_Asynch_Read_Stream::readv:")
                          ACE_TEXT ("Attempt to read 0 bytes\n")),
                         -1);
@@ -542,7 +543,7 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block,
 
       if (ACE::debug ())
       {
-        ACE_DEBUG ((LM_ERROR,
+        ACELIB_DEBUG ((LM_ERROR,
                     ACE_TEXT ("%p\n"),
                     ACE_TEXT ("WSARecv")));
       }
@@ -577,7 +578,6 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result *
       return -1;
     }
   DWORD bytes_to_read = static_cast<DWORD> (result->bytes_to_read ());
-  u_long bytes_read;
 
   result->set_error (0); // Clear error before starting IO.
 
@@ -585,7 +585,7 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result *
   int initiate_result = ::ReadFile (result->handle (),
                                     result->message_block ().wr_ptr (),
                                     bytes_to_read,
-                                    &bytes_read,
+                                    0,
                                     result);
   if (initiate_result == 1)
     // Immediate success: the OVERLAPPED will still get queued.
@@ -608,7 +608,7 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result *
 
       if (ACE::debug ())
         {
-          ACE_DEBUG ((LM_ERROR,
+          ACELIB_DEBUG ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("ReadFile")));
         }
@@ -824,12 +824,18 @@ ACE_WIN32_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
      bytes_to_write = len ;
 
   if (bytes_to_write == 0)
-    ACE_ERROR_RETURN
+    ACELIB_ERROR_RETURN
       ((LM_ERROR,
         ACE_TEXT ("ACE_WIN32_Asynch_Write_Stream::write:")
         ACE_TEXT ("Attempt to write 0 bytes\n")),
        -1);
 
+  if (bytes_to_write > MAXDWORD)
+    {
+      errno = ERANGE;
+      return -1;
+    }
+
   ACE_WIN32_Asynch_Write_Stream_Result *result = 0;
   ACE_NEW_RETURN (result,
                   ACE_WIN32_Asynch_Write_Stream_Result (this->handler_proxy_,
@@ -842,16 +848,61 @@ ACE_WIN32_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
                                                         signal_number),
                   -1);
 
-  // Shared write
-  int const return_val = this->shared_write (result);
+  u_long bytes_written;
 
-  // Upon errors
-  if (return_val == -1)
+  result->set_error (0); // Clear error before starting IO.
+
+  // Initiate the write; Winsock 2 is required for the higher-performing
+  // WSASend() function. For Winsock 1, fall back to the slower WriteFile().
+  int initiate_result = 0;
+#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
+  WSABUF iov;
+  iov.buf = result->message_block ().rd_ptr ();
+  iov.len = static_cast<DWORD> (bytes_to_write);
+  initiate_result = ::WSASend (reinterpret_cast<SOCKET> (result->handle ()),
+                               &iov,
+                               1,
+                               &bytes_written,
+                               0, // flags
+                               result,
+                               0);
+  if (initiate_result == 0)
+#else
+  initiate_result = ::WriteFile (result->handle (),
+                                 result->message_block ().rd_ptr (),
+                                 static_cast<DWORD> (bytes_to_write),
+                                 &bytes_written,
+                                 result);
+  if (initiate_result == 1)
+#endif /* ACE_HAS_WINSOCK2 */
+  {
+    // Immediate success: the OVERLAPPED will still get queued.
+    return 0;
+  }
+
+  // If initiate failed, check for a bad error.
+  ACE_OS::set_errno_to_last_error ();
+  switch (errno)
     {
+    case ERROR_IO_PENDING:
+      // The IO will complete proactively: the OVERLAPPED will still
+      // get queued.
+      initiate_result = 0;
+      break;
+
+    default:
+      // Something else went wrong: the OVERLAPPED will not get
+      // queued.
+
+      if (ACE::debug ())
+        ACELIB_DEBUG ((LM_ERROR,
+                    ACE_TEXT ("%p\n"),
+                    ACE_TEXT ("Initiating write")));
       delete result;
+      initiate_result = -1;
     }
 
-  return return_val;
+  return initiate_result;
 }
 
 int
@@ -916,7 +967,7 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block,
     bytes_to_write += iov[i].iov_len;
 
   if ( bytes_to_write == 0 )
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("ACE_WIN32_Asynch_Write_Stream::writev:")
                          ACE_TEXT ("Attempt to write 0 bytes\n")),
                         -1);
@@ -969,7 +1020,7 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block,
 
       if (ACE::debug ())
       {
-        ACE_DEBUG ((LM_ERROR,
+        ACELIB_DEBUG ((LM_ERROR,
                     ACE_TEXT ("%p\n"),
                     ACE_TEXT ("WSASend")));
       }
@@ -994,70 +1045,6 @@ ACE_WIN32_Asynch_Write_Stream::~ACE_WIN32_Asynch_Write_Stream (void)
 {
 }
 
-int
-ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Result *result)
-{
-  u_long bytes_written;
-  if (result->bytes_to_write () > MAXDWORD)
-    {
-      errno = ERANGE;
-      return -1;
-    }
-  DWORD bytes_to_write = static_cast<DWORD> (result->bytes_to_write ());
-
-  result->set_error (0); // Clear error before starting IO.
-
-  // Initiate the write; Winsock 2 is required for the higher-performing
-  // WSASend() function. For Winsock 1, fall back to the slower WriteFile().
-  int initiate_result = 0;
-#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
-  WSABUF iov;
-  iov.buf = result->message_block ().rd_ptr ();
-  iov.len = bytes_to_write;
-  initiate_result = ::WSASend (reinterpret_cast<SOCKET> (result->handle ()),
-                               &iov,
-                               1,
-                               &bytes_written,
-                               0, // flags
-                               result,
-                               0);
-  if (initiate_result == 0)
-    {
-      // Immediate success: the OVERLAPPED will still get queued.
-      return 0;
-    }
-#else
-  initiate_result = ::WriteFile (result->handle (),
-                                 result->message_block ().rd_ptr (),
-                                 bytes_to_write,
-                                 &bytes_written,
-                                 result);
-  if (initiate_result == 1)
-    // Immediate success: the OVERLAPPED will still get queued.
-    return 0;
-#endif /* ACE_HAS_WINSOCK2 */
-
-  // If initiate failed, check for a bad error.
-  ACE_OS::set_errno_to_last_error ();
-  switch (errno)
-    {
-    case ERROR_IO_PENDING:
-      // The IO will complete proactively: the OVERLAPPED will still
-      // get queued.
-      return 0;
-
-    default:
-      // Something else went wrong: the OVERLAPPED will not get
-      // queued.
-
-      if (ACE::debug ())
-        ACE_DEBUG ((LM_ERROR,
-                    ACE_TEXT ("%p\n"),
-                    ACE_TEXT ("Initiating write")));
-      return -1;
-    }
-}
-
 // Methods belong to ACE_WIN32_Asynch_Operation base class. These
 // methods are defined here to avoid VC++ warnings. They route the
 // call to the ACE_WIN32_Asynch_Operation base class.
@@ -1282,7 +1269,7 @@ ACE_WIN32_Asynch_Read_File::read (ACE_Message_Block &message_block,
     bytes_to_read = space;
 
   if ( bytes_to_read == 0 )
-    ACE_ERROR_RETURN
+    ACELIB_ERROR_RETURN
       ((LM_ERROR,
         ACE_TEXT ("ACE_WIN32_Asynch_Read_File::read:")
         ACE_TEXT ("Attempt to read 0 bytes or no space in the message block\n")),
@@ -1343,7 +1330,7 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block,
     size_t msg_space = msg->space ();
 
     if (msg_space < page_size)
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("ACE_WIN32_Asynch_Read_File::readv:")
                          ACE_TEXT ("Invalid message block size\n")),
                         -1);
@@ -1411,7 +1398,7 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block,
 
       if (ACE::debug ())
       {
-        ACE_DEBUG ((LM_ERROR,
+        ACELIB_DEBUG ((LM_ERROR,
                     ACE_TEXT ("%p\n"),
                     ACE_TEXT ("ReadFileScatter")));
       }
@@ -1683,12 +1670,18 @@ ACE_WIN32_Asynch_Write_File::write (ACE_Message_Block &message_block,
      bytes_to_write = len;
 
   if ( bytes_to_write == 0 )
-    ACE_ERROR_RETURN
+    ACELIB_ERROR_RETURN
       ((LM_ERROR,
         ACE_TEXT ("ACE_WIN32_Asynch_Write_File::write:")
-        ACE_TEXT ("Attempt to read 0 bytes\n")),
+        ACE_TEXT ("Attempt to write 0 bytes\n")),
        -1);
 
+  if (bytes_to_write > MAXDWORD)
+    {
+      errno = ERANGE;
+      return -1;
+    }
+
   ACE_WIN32_Asynch_Write_File_Result *result = 0;
   ACE_NEW_RETURN (result,
                   ACE_WIN32_Asynch_Write_File_Result (this->handler_proxy_,
@@ -1703,14 +1696,46 @@ ACE_WIN32_Asynch_Write_File::write (ACE_Message_Block &message_block,
                                                       signal_number),
                   -1);
 
-  // Shared write
-  int return_val = this->shared_write (result);
+  u_long bytes_written;
 
-  // Upon errors
-  if (return_val == -1)
-    delete result;
+  result->set_error (0); // Clear error before starting IO.
 
-  return return_val;
+  // Initiate the write
+  int initiate_result = 0;
+  initiate_result = ::WriteFile (result->handle (),
+                                 result->message_block ().rd_ptr (),
+                                 static_cast<DWORD> (bytes_to_write),
+                                 &bytes_written,
+                                 result);
+  if (initiate_result == 1)
+  {
+    // Immediate success: the OVERLAPPED will still get queued.
+    return 0;
+  }
+
+  // If initiate failed, check for a bad error.
+  ACE_OS::set_errno_to_last_error ();
+  switch (errno)
+    {
+    case ERROR_IO_PENDING:
+      // The IO will complete proactively: the OVERLAPPED will still
+      // get queued.
+      initiate_result = 0;
+      break;
+
+    default:
+      // Something else went wrong: the OVERLAPPED will not get
+      // queued.
+
+      if (ACE::debug ())
+        ACELIB_DEBUG ((LM_ERROR,
+                    ACE_TEXT ("%p\n"),
+                    ACE_TEXT ("Initiating write")));
+      delete result;
+      initiate_result = -1;
+    }
+
+  return initiate_result;
 }
 
 int
@@ -1749,7 +1774,7 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block,
     if (msg_len < page_size &&
         (msg->size () - (msg->rd_ptr () - msg->base ()) < page_size || // message block too small
          bytes_to_write - total_len > page_size ))// NOT last chunk
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("ACE_WIN32_Asynch_Write_File::writev:")
                          ACE_TEXT ("Invalid message block length\n")),
                         -1);
@@ -1816,7 +1841,7 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block,
 
       if (ACE::debug ())
       {
-        ACE_DEBUG ((LM_ERROR,
+        ACELIB_DEBUG ((LM_ERROR,
                     ACE_TEXT ("%p\n"),
                     ACE_TEXT ("WriteFileGather")));
       }
@@ -1846,11 +1871,12 @@ ACE_WIN32_Asynch_Write_File::write (ACE_Message_Block &message_block,
                                     int priority,
                                     int signal_number)
 {
-  return ACE_WIN32_Asynch_Write_Stream::write (message_block,
-                                               bytes_to_write,
-                                               act,
-                                               priority,
-                                               signal_number);
+  return this->write (message_block,
+                      bytes_to_write,
+                      0, 0,
+                      act,
+                      priority,
+                      signal_number);
 }
 
 int
@@ -1860,11 +1886,12 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block,
                                      int priority,
                                      int signal_number)
 {
-  return ACE_WIN32_Asynch_Write_Stream::writev (message_block,
-                                                bytes_to_write,
-                                                act,
-                                                priority,
-                                                signal_number);
+  return this->writev (message_block,
+                       bytes_to_write,
+                       0, 0,
+                       act,
+                       priority,
+                       signal_number);
 }
 
 // Methods belong to ACE_WIN32_Asynch_Operation base class. These
@@ -2077,7 +2104,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block,
   size_t available_space = message_block.space ();
   size_t space_needed = bytes_to_read + 2 * address_size;
   if (available_space < space_needed)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Buffer too small\n")), -1);
+    ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Buffer too small\n")), -1);
 
   // WIN Specific.
 
@@ -2100,7 +2127,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block,
         {
           if (ACE::debug ())
             {
-              ACE_DEBUG ((LM_ERROR,
+              ACELIB_DEBUG ((LM_ERROR,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("ACE_OS::socket")));
             }
@@ -2162,7 +2189,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block,
 
       if (ACE::debug ())
         {
-          ACE_DEBUG ((LM_ERROR,
+          ACELIB_DEBUG ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("AcceptEx")));
         }
@@ -2383,7 +2410,7 @@ ACE_WIN32_Asynch_Connect::open (const ACE_Handler::Proxy_Ptr &handler_proxy,
   // if we are already opened,
   // we could not create a new handler without closing the previous
   if (this->flg_open_)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::open:")
                        ACE_TEXT ("connector already open\n")),
                       -1);
@@ -2415,7 +2442,7 @@ ACE_WIN32_Asynch_Connect::connect (ACE_HANDLE connect_handle,
   ACE_TRACE ("ACE_WIN32_Asynch_Connect::connect");
 
   if (!this->flg_open_)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACELIB_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::connect")
                        ACE_TEXT ("connector was not opened before\n")),
                       -1);
@@ -2449,7 +2476,7 @@ ACE_WIN32_Asynch_Connect::connect (ACE_HANDLE connect_handle,
 
     if (this->result_map_.bind (connect_handle, result) == -1)
       {
-        ACE_ERROR ((LM_ERROR,
+        ACELIB_ERROR ((LM_ERROR,
                     ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect: %p\n"),
                     ACE_TEXT ("bind")));
         result->set_error (EFAULT);
@@ -2492,7 +2519,7 @@ int ACE_WIN32_Asynch_Connect::post_result (ACE_WIN32_Asynch_Connect_Result * res
       if (this->win32_proactor_ ->post_completion (result) == 0)
         return 0;
 
-      ACE_ERROR ((LM_ERROR,
+      ACELIB_ERROR ((LM_ERROR,
                   ACE_TEXT ("Error:(%P | %t):%p\n"),
                   ACE_TEXT ("ACE_WIN32_Asynch_Connect::post_result: ")
                   ACE_TEXT (" <post_completion> failed")));
@@ -2536,7 +2563,7 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result,
       if (handle == ACE_INVALID_HANDLE)
         {
           result->set_error (errno);
-          ACE_ERROR_RETURN
+          ACELIB_ERROR_RETURN
             ((LM_ERROR,
               ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"),
               ACE_TEXT ("socket")),
@@ -2554,7 +2581,7 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result,
                               sizeof one) == -1)
         {
           result->set_error (errno);
-          ACE_ERROR_RETURN
+          ACELIB_ERROR_RETURN
             ((LM_ERROR,
               ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"),
               ACE_TEXT ("setsockopt")),
@@ -2569,7 +2596,7 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result,
       if (ACE_OS::bind (handle, laddr, size) == -1)
         {
            result->set_error (errno);
-           ACE_ERROR_RETURN
+           ACELIB_ERROR_RETURN
              ((LM_ERROR,
                ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"),
                ACE_TEXT ("bind")),
@@ -2581,7 +2608,7 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result,
   if (ACE::set_flags (handle, ACE_NONBLOCK) != 0)
     {
       result->set_error (errno);
-      ACE_ERROR_RETURN
+      ACELIB_ERROR_RETURN
         ((LM_ERROR,
           ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"),
           ACE_TEXT ("set_flags")),
@@ -3041,7 +3068,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
 
       if (ACE::debug ())
         {
-          ACE_DEBUG ((LM_ERROR,
+          ACELIB_DEBUG ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("TransmitFile")));
         }
@@ -3311,7 +3338,7 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block,
 
     // OS should correctly process zero length buffers
     // if ( msg_space == 0 )
-    //   ACE_ERROR_RETURN ((LM_ERROR,
+    //   ACELIB_ERROR_RETURN ((LM_ERROR,
     //                      ACE_TEXT ("ACE_WIN32_Asynch_Read_Dgram::recv:")
     //                      ACE_TEXT ("No space in the message block\n")),
     //                     -1);
@@ -3346,7 +3373,7 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block,
   }
 
   if (bytes_to_read == 0)
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACELIB_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("ACE_WIN32_Asynch_Read_Dgram::recv:")
                          ACE_TEXT ("Attempt to read 0 bytes\n")),
                         -1);
@@ -3398,7 +3425,7 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block,
 
         if (ACE::debug ())
         {
-          ACE_DEBUG ((LM_ERROR,
+          ACELIB_DEBUG ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("WSARecvFrom")));
         }
@@ -3723,7 +3750,7 @@ ACE_WIN32_Asynch_Write_Dgram::send (ACE_Message_Block *message_block,
 
         if (ACE::debug ())
         {
-          ACE_DEBUG ((LM_ERROR,
+          ACELIB_DEBUG ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("WSASendTo")));
         }
diff --git a/dep/acelite/ace/WIN32_Asynch_IO.h b/dep/acelite/ace/WIN32_Asynch_IO.h
index 2c8495a17..dee891c65 100644
--- a/dep/acelite/ace/WIN32_Asynch_IO.h
+++ b/dep/acelite/ace/WIN32_Asynch_IO.h
@@ -4,7 +4,7 @@
 /**
  *  @file    WIN32_Asynch_IO.h
  *
- *  $Id: WIN32_Asynch_IO.h 92298 2010-10-21 11:15:17Z johnnyw $
+ *  $Id: WIN32_Asynch_IO.h 97946 2014-10-31 14:07:41Z mcorino $
  *
  *
  *  These classes only works on Win32 platforms.
@@ -548,11 +548,6 @@ public:
 
   /// Return the underlying proactor.
   ACE_Proactor* proactor (void) const;
-
-protected:
-  /// This is the method which does the real work and is there so that
-  /// the ACE_Asynch_Write_File class can use it too.
-  int shared_write (ACE_WIN32_Asynch_Write_Stream_Result *result);
 };
 
 /**
@@ -943,7 +938,7 @@ private:
   /**
    * This method belongs to ACE_WIN32_Asynch_Write_Stream. It is here
    * to avoid compiler warnings. This method is forwarded to the
-   * ACE_WIN32_Asynch_Write_Stream class.
+   * Write_File specific method with 0 offset values.
    */
   int write (ACE_Message_Block &message_block,
              size_t bytes_to_write,
diff --git a/dep/acelite/ace/WIN32_Proactor.cpp b/dep/acelite/ace/WIN32_Proactor.cpp
index 3d1d3fcfa..c26c59a08 100644
--- a/dep/acelite/ace/WIN32_Proactor.cpp
+++ b/dep/acelite/ace/WIN32_Proactor.cpp
@@ -1,4 +1,4 @@
-// $Id: WIN32_Proactor.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+// $Id: WIN32_Proactor.cpp 96985 2013-04-11 15:50:32Z huangh $
 
 //
 
@@ -7,7 +7,7 @@
 #if defined (ACE_WIN32) && defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 // WIN implemenatation of the Proactor.
 
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
 #include "ace/Object_Manager.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
@@ -55,7 +55,7 @@ ACE_WIN32_Proactor::ACE_WIN32_Proactor (size_t number_of_threads,
                                                      0,
                                                      this->number_of_threads_);
   if (this->completion_port_ == 0)
-    ACE_ERROR ((LM_ERROR,
+    ACELIB_ERROR ((LM_ERROR,
                 ACE_TEXT ("%p\n"),
                 ACE_TEXT ("CreateIoCompletionPort")));
 
@@ -134,7 +134,7 @@ ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle,
         {
           if (ACE::debug ())
             {
-              ACE_DEBUG ((LM_ERROR,
+              ACELIB_DEBUG ((LM_ERROR,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("CreateIoCompletionPort")));
             }
@@ -588,7 +588,7 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds)
 
         default:
           if (ACE::debug ())
-            ACE_DEBUG ((LM_ERROR,
+            ACELIB_DEBUG ((LM_ERROR,
                         ACE_TEXT ("%p\n"),
                         ACE_TEXT ("GetQueuedCompletionStatus")));
           return -1;
@@ -689,7 +689,7 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result)
 
       if (ACE::debug ())
         {
-          ACE_DEBUG ((LM_ERROR,
+          ACELIB_DEBUG ((LM_ERROR,
                       ACE_TEXT ("%p\n"),
                       ACE_TEXT ("PostQueuedCompletionStatus failed")));
         }
diff --git a/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp b/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp
deleted file mode 100644
index 6c13fc94d..000000000
--- a/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// file      : XMLSchema/Traversal.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: Traversal.hpp 95832 2012-06-06 13:09:50Z johnnyw $
-
-#ifndef XMLSCHEMA_TRAVERSAL_HPP
-#define XMLSCHEMA_TRAVERSAL_HPP
-
-#include <ace/XML_Utils/XSCRT/Traversal.hpp>
-#include <ace/XML_Utils/XMLSchema/Types.hpp>
-
-namespace XMLSchema
-{
-  namespace Traversal
-  {
-    // Automatic traversal of IDREFs.
-    //
-    //
-    struct IDREF :
-    XSCRT::Traversal::Traverser<XMLSchema::IDREF_Base, XSCRT::Type>
-    {
-      virtual void
-      traverse (XMLSchema::IDREF_Base& r)
-      {
-        if (r.get ()) dispatch (*(r.get ()));
-      }
-
-      virtual void
-      traverse (XMLSchema::IDREF_Base const& r)
-      {
-        if (r.get ()) dispatch (*(r.get ()));
-      }
-    };
-
-
-    template <typename T>
-    struct Traverser : XSCRT::Traversal::Traverser<T, XSCRT::Type>
-    {
-    };
-
-    typedef Traverser<byte> byte;
-    typedef Traverser<unsignedByte> unsignedByte;
-
-    typedef Traverser<short_> short_;
-    typedef Traverser<unsignedShort> unsignedShort;
-
-    typedef Traverser<int_> int_;
-    typedef Traverser<unsignedInt> unsignedInt;
-
-    typedef Traverser<long_> long_;
-    typedef Traverser<unsignedLong> unsignedLong;
-
-    typedef Traverser<boolean> boolean;
-
-    typedef Traverser<float_> float_;
-    typedef Traverser<double_> double_;
-
-    template <typename C>
-    struct string : Traverser<XMLSchema::string<C> >
-    {
-    };
-
-    template <typename C>
-    struct ID : Traverser<XMLSchema::ID<C> >
-    {
-    };
-
-    template <typename C>
-    struct anyURI : Traverser <XMLSchema::anyURI<C> >
-    {
-    };
-  }
-}
-
-#include <ace/XML_Utils/XMLSchema/Traversal.ipp>
-
-#endif  // XMLSCHEMA_TRAVERSAL_HPP
diff --git a/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp b/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp
deleted file mode 100644
index 8d467fa31..000000000
--- a/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp
+++ /dev/null
@@ -1,10 +0,0 @@
-// file      : XMLSchema/Traversal.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: Traversal.ipp 86462 2009-08-12 13:31:27Z wotte $
-
-namespace XMLSchema
-{
-  namespace Traversal
-  {
-  }
-}
diff --git a/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp b/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp
deleted file mode 100644
index 7825bf673..000000000
--- a/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// file      : XMLSchema/TypeInfo.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: TypeInfo.hpp 95802 2012-05-31 12:37:36Z johnnyw $
-
-#ifndef XMLSCHEMA_TYPE_INFO_HPP
-#define XMLSCHEMA_TYPE_INFO_HPP
-
-#include <ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp>
-
-namespace XMLSchema
-{
-  template <typename C>
-  struct TypeInfoInitializer
-  {
-    TypeInfoInitializer (XSCRT::ExtendedTypeInfoMap&);
-  };
-}
-
-#include <ace/XML_Utils/XMLSchema/TypeInfo.ipp>
-#include <ace/XML_Utils/XMLSchema/TypeInfo.tpp>
-
-#endif  // XMLSCHEMA_TYPE_INFO_HPP
diff --git a/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp b/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp
deleted file mode 100644
index 8f8487311..000000000
--- a/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp
+++ /dev/null
@@ -1,7 +0,0 @@
-// file      : XMLSchema/TypeInfo.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: TypeInfo.ipp 86462 2009-08-12 13:31:27Z wotte $
-
-namespace XMLSchema
-{
-}
diff --git a/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp b/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp
deleted file mode 100644
index 1be4df0cf..000000000
--- a/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// file      : XMLSchema/TypeInfo.tpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: TypeInfo.tpp 91814 2010-09-17 08:33:40Z johnnyw $
-
-namespace XMLSchema
-{
-  //@@ VC6
-  //
-  template<typename T>
-  void
-  add_info (XSCRT::ExtendedTypeInfoMap& map, T*)
-  {
-    using XSCRT::TypeId;
-    using XSCRT::ExtendedTypeInfo;
-
-    TypeId id (typeid (T));
-    ExtendedTypeInfo info (id);
-
-    info.add_base (ExtendedTypeInfo::Access::public_,
-                   false,
-                   typeid (XSCRT::Type));
-
-    map.insert (std::make_pair (id, info));
-  }
-
-
-  template <typename C>
-  inline
-  TypeInfoInitializer<C>::
-  TypeInfoInitializer (XSCRT::ExtendedTypeInfoMap& map)
-  {
-    using XSCRT::TypeId;
-    using XSCRT::ExtendedTypeInfo;
-
-    // XSCRT::Type
-    //
-    {
-      TypeId id (typeid (XSCRT::Type));
-      map.insert (std::make_pair (id, ExtendedTypeInfo (id)));
-    }
-
-    //@@ VC6
-
-    add_info<byte> (map, 0);
-    add_info<unsignedByte> (map, 0);
-
-    add_info<short_> (map, 0);
-    add_info<unsignedShort> (map, 0);
-
-    add_info<int_> (map, 0);
-    add_info<unsignedInt> (map, 0);
-
-    add_info<long_> (map, 0);
-    add_info<unsignedLong> (map, 0);
-
-    add_info<boolean> (map, 0);
-
-    add_info<float_> (map, 0);;
-    add_info<double_> (map, 0);
-
-    add_info<string<C> > (map, 0);
-
-    add_info<normalizedString<C> > (map, 0);
-    add_info<token<C> > (map, 0);
-    add_info<NMTOKEN<C> > (map, 0);
-    add_info<Name<C> > (map, 0);
-    add_info<NCName<C> > (map, 0);
-    add_info<QName<C> > (map, 0);
-
-    add_info<ID<C> > (map, 0);
-
-    // IDREF_Base
-    //
-    {
-      TypeId id (typeid (IDREF_Base));
-      ExtendedTypeInfo info (id);
-
-      info.add_base (ExtendedTypeInfo::Access::public_,
-                     false,
-                     typeid (XSCRT::Type));
-
-      map.insert (std::make_pair (id, info));
-    }
-
-    // IDREF
-    //
-    {
-      TypeId id (typeid (IDREF<C>));
-      ExtendedTypeInfo info (id);
-
-      info.add_base (ExtendedTypeInfo::Access::public_,
-                     false,
-                     typeid (IDREF_Base));
-
-      map.insert (std::make_pair (id, info));
-    }
-  }
-}
diff --git a/dep/acelite/ace/XML_Utils/XMLSchema/Types.hpp b/dep/acelite/ace/XML_Utils/XMLSchema/Types.hpp
deleted file mode 100644
index fdbcdb439..000000000
--- a/dep/acelite/ace/XML_Utils/XMLSchema/Types.hpp
+++ /dev/null
@@ -1,669 +0,0 @@
-// file      : XMLSchema/Types.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: Types.hpp 95832 2012-06-06 13:09:50Z johnnyw $
-
-#ifndef XMLSCHEMA_TYPES_HPP
-#define XMLSCHEMA_TYPES_HPP
-
-#include <string>
-#include "ace/XML_Utils/XSCRT/Elements.hpp"
-
-#include "ace/Basic_Types.h"
-/**
- * @@ HACK: VC7
- *
- * Disabled the warning about using this in the base member initialization section.
- * Our use in this file is fine.
- */
-#ifdef _MSC_VER
-# pragma warning ( disable: 4355 )
-#endif
-namespace XMLSchema
-{
-  typedef XSCRT::FundamentalType<ACE_INT8> byte;
-  typedef XSCRT::FundamentalType<ACE_UINT8> unsignedByte;
-
-  typedef XSCRT::FundamentalType<ACE_INT16> short_;
-  typedef XSCRT::FundamentalType<ACE_UINT16> unsignedShort;
-
-  typedef XSCRT::FundamentalType<ACE_INT32> int_;
-  typedef XSCRT::FundamentalType<ACE_UINT32> unsignedInt;
-
-  typedef XSCRT::FundamentalType<ACE_INT64> long_;
-  typedef XSCRT::FundamentalType<ACE_UINT64> unsignedLong;
-
-  //@@ It would be nice to use some arbitrary-length integer class.
-  //
-  typedef long_ decimal;
-  typedef decimal integer;
-  typedef integer nonPositiveInteger;
-  typedef integer nonNegativeInteger;
-  typedef nonNegativeInteger positiveInteger;
-  typedef nonPositiveInteger negativeInteger;
-
-
-  typedef XSCRT::FundamentalType<bool> boolean;
-
-  typedef XSCRT::FundamentalType<float> float_;
-  typedef XSCRT::FundamentalType<double> double_;
-
-  // Just to make GCC 3.3 and other broken compilers shutup.
-  //
-  using std::basic_string;
-
-
-  template <typename C>
-  class string : public XSCRT::Type, public basic_string<C>
-  {
-  protected:
-    typedef basic_string<C> Base__ ;
-
-  public:
-    //    typedef ACE_Refcounted_Auto_Ptr < string, ACE_Null_Mutex > _ptr;
-
-    //@@ VC6 does not inject XSCRT::Type into the scope so I have
-    //   to qualify it all the time.
-    //
-
-    string ()
-    {
-    }
-
-    string (XSCRT::XML::Element<C> const& e)
-        : Base__ (e.value ())
-    {
-    }
-
-    string (XSCRT::XML::Attribute<C> const& a)
-        : Base__ (a.value ())
-    {
-    }
-
-    string (Base__ const& x)
-        : Base__ (x)
-    {
-    }
-
-    string (C const* x)
-        : Base__ (x)
-    {
-    }
-
-    string&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-
-  template <typename C>
-  class normalizedString : public string<C>
-  {
-  protected:
-    typedef typename string<C>::Base__ Base__;
-
-  public:
-    normalizedString ()
-    {
-    }
-
-    normalizedString (XSCRT::XML::Element<C> const& e)
-        : string<C> (e)
-    {
-    }
-
-    normalizedString (XSCRT::XML::Attribute<C> const& a)
-        : string<C> (a)
-    {
-    }
-
-    normalizedString (Base__ const& x)
-        : string<C> (x)
-    {
-    }
-
-    normalizedString (C const* x)
-        : string<C> (x)
-    {
-    }
-
-    normalizedString&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-
-  template <typename C>
-  class token : public normalizedString<C>
-  {
-  protected:
-    typedef typename normalizedString<C>::Base__ Base__;
-
-  public:
-    token ()
-    {
-    }
-
-    token (XSCRT::XML::Element<C> const& e)
-        : normalizedString<C> (e)
-    {
-    }
-
-    token (XSCRT::XML::Attribute<C> const& a)
-        : normalizedString<C> (a)
-    {
-    }
-
-    token (Base__ const& x)
-        : normalizedString<C> (x)
-    {
-    }
-
-    token (C const* x)
-        : normalizedString<C> (x)
-    {
-    }
-
-    token&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-
-  template <typename C>
-  class NMTOKEN : public token<C>
-  {
-  protected:
-    typedef typename token<C>::Base__ Base__;
-
-  public:
-    NMTOKEN ()
-    {
-    }
-
-    NMTOKEN (XSCRT::XML::Element<C> const& e)
-        : token<C> (e)
-    {
-    }
-
-    NMTOKEN (XSCRT::XML::Attribute<C> const& a)
-        : token<C> (a)
-    {
-    }
-
-    NMTOKEN (Base__ const& x)
-        : token<C> (x)
-    {
-    }
-
-    NMTOKEN (C const* x)
-        : token<C> (x)
-    {
-    }
-
-    NMTOKEN&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-  template <typename C>
-  class Name: public token<C>
-  {
-  protected:
-    typedef typename token<C>::Base__ Base__;
-
-  public:
-    Name()
-    {
-    }
-
-    Name(XSCRT::XML::Element<C> const& e)
-        : token<C> (e)
-    {
-    }
-
-    Name(XSCRT::XML::Attribute<C> const& a)
-        : token<C> (a)
-    {
-    }
-
-    Name(Base__ const& x)
-        : token<C> (x)
-    {
-    }
-
-    Name (C const* x)
-        : token<C> (x)
-    {
-    }
-
-    Name&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-
-  template <typename C>
-  class NCName: public Name<C>
-  {
-  protected:
-    typedef typename Name<C>::Base__ Base__;
-
-  public:
-    NCName()
-    {
-    }
-
-    NCName(XSCRT::XML::Element<C> const& e)
-        : Name<C> (e)
-    {
-    }
-
-    NCName(XSCRT::XML::Attribute<C> const& a)
-        : Name<C> (a)
-    {
-    }
-
-    NCName(Base__ const& x)
-        : Name<C> (x)
-    {
-    }
-
-    NCName (C const* x)
-        : Name<C> (x)
-    {
-    }
-
-    NCName&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-  template <typename C>
-  class QName: public Name<C>
-  {
-  protected:
-    typedef typename Name<C>::Base__ Base__;
-
-  public:
-    QName()
-    {
-    }
-
-    QName(XSCRT::XML::Element<C> const& e)
-        : Name<C> (e)
-    {
-    }
-
-    QName(XSCRT::XML::Attribute<C> const& a)
-        : Name<C> (a)
-    {
-    }
-
-    QName(Base__ const& x)
-        : Name<C> (x)
-    {
-    }
-
-    QName (C const* x)
-        : Name<C> (x)
-    {
-    }
-
-    QName&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-  template <typename C>
-  struct IdentityProvider : XSCRT::IdentityProvider
-  {
-    IdentityProvider (NCName<C> const& id)
-        : id_ (id)
-    {
-    }
-
-    virtual ~IdentityProvider (void)
-    {
-    }
-
-    virtual bool
-    before (XSCRT::IdentityProvider const& y) const
-    {
-      return id_ < dynamic_cast<IdentityProvider const&> (y).id_;
-    }
-
-  private:
-    NCName<C> const& id_;
-
-  private:
-    IdentityProvider (IdentityProvider const&);
-
-    IdentityProvider&
-    operator= (IdentityProvider const&);
-  };
-
-
-  template <typename C>
-  class ID : public NCName<C>
-  {
-  protected:
-    typedef typename NCName<C>::Base__ Base__;
-
-  public:
-    ~ID()
-    {
-      unregister_id ();
-    }
-
-    ID ()
-        : id_provider_ (*this)
-    {
-    }
-
-    ID (XSCRT::XML::Element<C> const& e)
-        : NCName<C> (e), id_provider_ (*this)
-    {
-    }
-
-    ID (XSCRT::XML::Attribute<C> const& a)
-        : NCName<C> (a), id_provider_ (*this)
-    {
-    }
-
-    ID (ID const& x)
-        :  NCName<C> (x), id_provider_ (*this)
-    {
-    }
-
-    ID (Base__ const& x)
-        :  NCName<C> (x), id_provider_ (*this)
-    {
-    }
-
-    ID (C const* x)
-        : NCName<C> (x), id_provider_ (*this)
-    {
-    }
-
-    ID&
-    operator= (Base__ const& x)
-    {
-      unregister_id ();
-
-      static_cast<NCName<C>&>(*this) = x;
-
-      register_id ();
-
-      return *this;
-    }
-
-    ID&
-    operator= (ID const& x)
-    {
-      unregister_id ();
-
-      static_cast<NCName<C>&>(*this) = static_cast<NCName<C> const&>(x);
-
-      register_id ();
-
-      return *this;
-    }
-
-  public:
-    using NCName<C>::container;
-
-    virtual void
-    container (XSCRT::Type* c)
-    {
-      unregister_id ();
-
-      NCName<C>::container (c);
-
-      register_id ();
-    }
-
-  private:
-    using NCName<C>::empty;
-    using NCName<C>::root;
-
-    void
-    register_id ()
-    {
-      if (NCName<C>::container () != this && !empty ())
-      {
-        //std::wcerr << "registering " << container ()
-        //           << " as '" << *this
-        //           << "' on " << container () << std::endl;
-        NCName<C>::container ()->register_id (id_provider_,
-                                              NCName<C>::container ());
-      }
-    }
-
-    void
-    unregister_id ()
-    {
-      if (NCName<C>::container () != this && !empty ())
-      {
-        //std::wcerr << "un-registering " << container ()
-        //           << " as '" << *this
-        //           << "' on " << container () << std::endl;
-        NCName<C>::container ()->unregister_id (id_provider_);
-      }
-    }
-
-  private:
-    IdentityProvider<C> id_provider_;
-  };
-
-  struct IDREF_Base : public XSCRT::Type
-  {
-    virtual XSCRT::Type const*
-    get () const = 0;
-
-    virtual XSCRT::Type*
-    get () = 0;
-  };
-
-  template <typename C>
-  class IDREF : public IDREF_Base
-  {
-  public:
-    typedef C CDR_Type__;
-    IDREF ()
-        : id_provider_ (id_)
-    {
-    }
-
-    IDREF (XSCRT::XML::Element<C> const& e)
-        : id_ (e), id_provider_ (id_)
-    {
-    }
-
-    IDREF (XSCRT::XML::Attribute<C> const& a)
-        : id_ (a), id_provider_ (id_)
-    {
-    }
-
-    IDREF (IDREF const& x)
-      : XMLSchema::IDREF_Base (),
-        id_ (x.id_), id_provider_ (id_)
-    {
-    }
-
-    IDREF (basic_string<C> const& id)
-        : id_ (id), id_provider_ (id_)
-    {
-    }
-
-    IDREF (C const* id)
-        : id_ (id), id_provider_ (id_)
-    {
-    }
-
-    IDREF&
-    operator= (IDREF const& x)
-    {
-      id_ = x.id_;
-      return *this;
-    }
-
-    IDREF&
-    operator= (basic_string<C> const& x)
-    {
-      id_ = x;
-      return *this;
-    }
-
-  public:
-    NCName<C>
-    id () const
-    {
-      return id_;
-    }
-
-  public:
-    XSCRT::Type const*
-    operator-> () const
-    {
-      return get ();
-    }
-
-    XSCRT::Type*
-    operator-> ()
-    {
-      return get ();
-    }
-
-    XSCRT::Type const&
-    operator* () const
-    {
-      return *(get ());
-    }
-
-    XSCRT::Type&
-    operator* ()
-    {
-      return *(get ());
-    }
-
-    virtual XSCRT::Type const*
-    get () const
-    {
-      if (!id_.empty () && container () != this)
-      {
-        return root ()->lookup_id (id_provider_);
-      }
-      else
-      {
-        return 0;
-      }
-    }
-
-    virtual XSCRT::Type*
-    get ()
-    {
-      if (!id_.empty () && container () != this)
-      {
-        return root ()->lookup_id (id_provider_);
-      }
-      else
-      {
-        return 0;
-      }
-    }
-
-    // conversion to bool
-    //
-    typedef void (IDREF::*bool_convertable)();
-
-    operator bool_convertable () const
-    {
-      return get () ? &IDREF::true_ : 0;
-    }
-
-  private:
-    void true_ ()
-    {
-    }
-
-  private:
-    NCName<C> id_;
-    IdentityProvider<C> id_provider_;
-  };
-
-  template <typename C>
-  class anyURI : public XSCRT::Type, public basic_string <C>
-  {
-  protected:
-    typedef basic_string <C> Base__ ;
-
-  public:
-    // Trait for marshaling string
-    typedef C CDR_Type__;
-
-    //@@ VC6 does not inject XSCRT::Type into the scope so I have
-    //   to qualify it all the time.
-    //
-
-    anyURI (void)
-    {
-    }
-
-    anyURI (XSCRT::XML::Element<C> const& e)
-        : Base__ (e.value ())
-    {
-    }
-
-    anyURI (XSCRT::XML::Attribute<C> const& a)
-        : Base__ (a.value ())
-    {
-    }
-
-    anyURI (Base__ const& x)
-        : Base__ (x)
-    {
-    }
-
-    anyURI (C const * x)
-        : Base__ (x)
-    {
-    }
-
-    anyURI (const anyURI& s)
-      : Base__ (s)
-    {
-
-    }
-
-    anyURI & operator= (Base__ const& x)
-    {
-      static_cast <Base__ &> (*this) = x;
-      return *this;
-    }
-  };
-}
-
-#include "ace/XML_Utils/XMLSchema/Types.ipp"
-
-#endif  // XMLSCHEMA_TYPES_HPP
diff --git a/dep/acelite/ace/XML_Utils/XMLSchema/Types.ipp b/dep/acelite/ace/XML_Utils/XMLSchema/Types.ipp
deleted file mode 100644
index 9362a5b00..000000000
--- a/dep/acelite/ace/XML_Utils/XMLSchema/Types.ipp
+++ /dev/null
@@ -1,8 +0,0 @@
-// file      : XMLSchema/Types.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: Types.ipp 86462 2009-08-12 13:31:27Z wotte $
-
-namespace XMLSchema
-{
-
-}
diff --git a/dep/acelite/ace/XML_Utils/XMLSchema/Writer.hpp b/dep/acelite/ace/XML_Utils/XMLSchema/Writer.hpp
deleted file mode 100644
index f54737a28..000000000
--- a/dep/acelite/ace/XML_Utils/XMLSchema/Writer.hpp
+++ /dev/null
@@ -1,158 +0,0 @@
-// file      : XMLSchema/Writer.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: Writer.hpp 95832 2012-06-06 13:09:50Z johnnyw $
-
-#ifndef XMLSCHEMA_WRITER_HPP
-#define XMLSCHEMA_WRITER_HPP
-
-#include <sstream>
-
-#include <ace/XML_Utils/XSCRT/Writer.hpp>
-
-#include <ace/XML_Utils/XMLSchema/Types.hpp>
-#include <ace/XML_Utils/XMLSchema/Traversal.hpp>
-
-#include <iostream>
-
-namespace XMLSchema
-{
-  namespace Writer
-  {
-    template <typename T, typename C>
-    struct FundamentalType : Traversal::Traverser<T>,
-                             virtual XSCRT::Writer<C>
-    {
-      FundamentalType (XSCRT::XML::Element<C>& e)
-          : XSCRT::Writer<C> (e)
-      {
-      }
-
-      using XSCRT::Writer<C>::top_;
-      using XSCRT::Writer<C>::attr_;
-
-      virtual void
-      traverse (T const& o)
-      {
-        using namespace XSCRT::XML;
-
-        std::basic_ostringstream<C> os;
-
-        os << o;
-
-        if (Attribute<C>* a = attr_ ())
-        {
-          a->value (os.str ());
-        }
-        else
-        {
-          top_().value (os.str ());
-        }
-      }
-
-    protected:
-      virtual void
-      traverse (T &t)
-      {
-        Traversal::Traverser<T>::traverse (t);
-      }
-
-      FundamentalType ()
-      {
-      }
-    };
-
-    template<typename C>
-    struct FundamentalType <XSCRT::FundamentalType<bool>, C> :
-      Traversal::Traverser<XSCRT::FundamentalType<bool> >,
-      virtual XSCRT::Writer<C>
-    {
-      FundamentalType (XSCRT::XML::Element<C> &e)
-        : XSCRT::Writer<C> (e)
-      {
-      }
-
-      using XSCRT::Writer<C>::top_;
-      using XSCRT::Writer<C>::attr_;
-
-      virtual void
-      traverse (XSCRT::FundamentalType<bool> const &o)
-      {
-        using namespace XSCRT::XML;
-
-        std::basic_ostringstream<C> os;
-
-        if (o)
-          {
-            os << "true";
-          }
-        else
-          {
-            os << "false";
-          }
-
-        if (Attribute<C>* a = attr_ ())
-        {
-          a->value (os.str ());
-        }
-        else
-        {
-          top_().value (os.str ());
-        }
-      }
-
-    protected:
-      virtual void
-      traverse (XSCRT::FundamentalType<bool> &t)
-      {
-        Traversal::Traverser<XSCRT::FundamentalType<bool> >::traverse (t);
-      }
-
-      FundamentalType ()
-      {
-      }
-    };
-
-
-    template <typename C>
-    struct IDREF : Traversal::Traverser<XMLSchema::IDREF<C> >,
-                   virtual XSCRT::Writer<C>
-    {
-      IDREF (XSCRT::XML::Element<C>& e)
-          : XSCRT::Writer<C> (e)
-      {
-      }
-
-      virtual void
-      traverse (
-        typename Traversal::Traverser<XMLSchema::IDREF<C> >::Type const& o)
-      {
-        using namespace XSCRT::XML;
-
-        if (Attribute<C>* a = XSCRT::Writer<C>::attr_ ())
-        {
-          a->value (o.id ());
-        }
-        else
-        {
-          XSCRT::Writer<C>::top_().value (o.id ());
-        }
-      }
-
-    protected:
-
-      virtual void
-      traverse (typename Traversal::Traverser<XMLSchema::IDREF<C> >::Type &o)
-      {
-        Traversal::Traverser<XMLSchema::IDREF<C> >::traverse (o);
-      }
-
-      IDREF ()
-      {
-      }
-    };
-  }
-}
-
-#include <ace/XML_Utils/XMLSchema/Writer.ipp>
-
-#endif  // XMLSCHEMA_WRITER_HPP
diff --git a/dep/acelite/ace/XML_Utils/XMLSchema/Writer.ipp b/dep/acelite/ace/XML_Utils/XMLSchema/Writer.ipp
deleted file mode 100644
index 04019b1b1..000000000
--- a/dep/acelite/ace/XML_Utils/XMLSchema/Writer.ipp
+++ /dev/null
@@ -1,10 +0,0 @@
-// file      : XMLSchema/Writer.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: Writer.ipp 84406 2009-02-11 14:59:08Z wotte $
-
-namespace XMLSchema
-{
-  namespace Writer
-  {
-  }
-}
diff --git a/dep/acelite/ace/XML_Utils/XMLSchema/id_map.hpp b/dep/acelite/ace/XML_Utils/XMLSchema/id_map.hpp
deleted file mode 100644
index 0356e250c..000000000
--- a/dep/acelite/ace/XML_Utils/XMLSchema/id_map.hpp
+++ /dev/null
@@ -1,144 +0,0 @@
-// -*- C++ -*-
-// $Id: id_map.hpp 95802 2012-05-31 12:37:36Z johnnyw $
-
-//=============================================================================
-/**
- * @file    id_map.hpp
- *
- * This file contains the ID_Map class which has the responsibility of linking
- * XML IDREF objects to their XML ID counterparts.  In the output files, this
- * means that a <IDREF name>_ptr() will return a pointer to the identified
- * object.
- *
- * Exception NULL_PTR_Entry is thrown when a program attempts to add a NULL_PTR
- * to either the id_map or idref_map.
- *
- * Exception Unresolved_IDREF is thrown if an element in an XML document attempts
- * to reference an ID that does not exist.
- *
- * @author Jason R. Cody <jason.r.cody@vanderbilt.edu; jason.r.cody@gmail.com>
- */
-//=============================================================================
-
-#ifndef _ID_MAP_H
-#define _ID_MAP_H
-
-//ID_Map makes use of the Types::idref_ data member to set it to the appropriate
-//object created during parsing
-#include "ace/XML_Utils/XMLSchema/Types.hpp"
-
-//The ID_Map is a Thread Specific Storage element.
-#include "ace/TSS_T.h"
-#include "ace/ace_wchar.h"
-
- /**
- * @class ID_Map
- *
- * @brief A class that handles the mapping of IDREF objects to objects with the
- *  respective ID.
- */
-  class ID_Map
-  {
-    public:
-
-    //Trait to allow for ease of thread specific storage.
-    typedef ACE_TSS<ID_Map> TSS_ID_Map;
-    typedef std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator id_iterator;
-    typedef std::multimap<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator idref_iterator;
-    typedef std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*> ID_MAP;
-    typedef std::multimap<std::basic_string<ACE_TCHAR>, XSCRT::Type*> IDREF_MAP;
-
-
-    //Exception Classes
-    //NULL_PTR_Entry thrown when a NULL PTR is added to the
-    //ID_Map
-    class NULL_PTR_Entry {};
-
-    //Unresolved_IDREF thrown when there are IDREF's in the
-    //XML document.
-    class Unresolved_IDREF {};
-
-    //Only a default constructor and destructor are needed
-    //Constructor
-    ID_Map ()
-    {
-    }
-
-    //Destructor
-    ~ID_Map ()
-    {
-    }
-
-    //Add an ID to the ID map
-    void add_id (std::basic_string<ACE_TCHAR> id, XSCRT::Type *obj_ref)
-    {
-      if (obj_ref)
-      {
-        this->id_map_.insert (ID_MAP::value_type(id, obj_ref));
-      }
-      else
-      {
-        throw NULL_PTR_Entry();
-      }
-        return;
-    }
-
-    //Add an IDREF to the IDREF map
-    void add_idref (std::basic_string<ACE_TCHAR> idref, XSCRT::Type *obj_ref)
-    {
-      if (obj_ref)
-      {
-          this->idref_map_.insert (IDREF_MAP::value_type(idref, obj_ref));
-      }
-      else
-      {
-        throw NULL_PTR_Entry();
-      }
-      return;
-    }
-
-    //Sets the referencing elements XSCRT::Type::idref_ to point to the
-    //referenced element.
-    //Note: The pointer is of type "XSCRT::Type*"
-    void resolve_idref ( void )
-    {
-      //Declare iterators to navigate the maps
-      ID_Map::id_iterator id_iterator;
-      ID_Map::idref_iterator idref_iterator;
-
-      for (idref_iterator = this->idref_map_.begin();
-           idref_iterator != this->idref_map_.end();
-           ++idref_iterator)
-      {
-        //Find the ID that matches the IDREF element
-        id_iterator = this->id_map_.find(idref_iterator->first);
-        if (id_iterator != this->id_map_.end())
-        {
-          //Add the IDREF identifier and the reference to the
-          //identified object
-          std::basic_string<ACE_TCHAR> temp_id = id_iterator->first;
-          idref_iterator->second->set_idref(temp_id, id_iterator->second);
-        }
-        else
-        {
-          //throw Unresolved_IDREF();
-        }
-      }
-    }
-
-    void reset (void)
-    {
-      id_map_.clear ();
-      idref_map_.clear ();
-    }
-
-    private:
-    //id_map_: maps the ID string to the element with the
-    //         ID attribute
-    //idref_map_: multimap that maps the IDREF string to the
-    //            element with the IDREF attribute
-    ID_MAP id_map_;
-    IDREF_MAP idref_map_;
-  };
-
-#endif /* _ID_MAP_HPP */
diff --git a/dep/acelite/ace/XML_Utils/XML_Error_Handler.cpp b/dep/acelite/ace/XML_Utils/XML_Error_Handler.cpp
deleted file mode 100644
index 093a85ec9..000000000
--- a/dep/acelite/ace/XML_Utils/XML_Error_Handler.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// $Id: XML_Error_Handler.cpp 95885 2012-06-14 14:05:44Z johnnyw $
-
-#include "XML_Error_Handler.h"
-#include "ace/Log_Msg.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/ACE.h"
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/dom/DOMLocator.hpp>
-#include <xercesc/sax/SAXParseException.hpp>
-#include "XercesString.h"
-#include <iostream>
-
-using xercesc::SAXParseException;
-
-namespace XML
-{
-  XML_Error_Handler::XML_Error_Handler (void)
-    : errors_ (false)
-  {
-  }
-
-  XML_Error_Handler::~XML_Error_Handler()
-  {
-  }
-
-  void XML_Error_Handler::warning(const SAXParseException& toCatch)
-  {
-    if (ACE::debug ())
-      {
-        XStr file (toCatch.getSystemId ());
-        XStr msg (toCatch.getMessage ());
-
-        std::cerr << "Warning: " << file << ':' << toCatch.getLineNumber ()
-                  << ':' << toCatch.getColumnNumber () << " - "
-                  << msg << std::endl;
-      }
-  }
-
-  void XML_Error_Handler::error(const SAXParseException& toCatch)
-  {
-    if (ACE::debug ())
-      {
-        XStr file (toCatch.getSystemId ());
-        XStr msg (toCatch.getMessage ());
-
-        std::cerr << "Error: " << file << ':' << toCatch.getLineNumber ()
-                  << ':' << toCatch.getColumnNumber () << " - "
-                  << msg << std::endl;
-      }
-    this->errors_ = true;
-  }
-
-  void XML_Error_Handler::fatalError(const SAXParseException& toCatch)
-  {
-    if (ACE::debug ())
-      {
-        XStr file (toCatch.getSystemId ());
-        XStr msg (toCatch.getMessage ());
-
-        std::cerr << "Fatal Error: " << file << ':' << toCatch.getLineNumber ()
-                  << ':' << toCatch.getColumnNumber () << " - "
-                  << msg << std::endl;
-      }
-    this->errors_ = true;
-  }
-
-  void XML_Error_Handler::resetErrors()
-  {
-    this->errors_ = false;
-  }
-
-  bool
-  XML_Error_Handler::getErrors (void) const
-  {
-    return this->errors_;
-  }
-}
diff --git a/dep/acelite/ace/XML_Utils/XML_Error_Handler.h b/dep/acelite/ace/XML_Utils/XML_Error_Handler.h
deleted file mode 100644
index 4047df6a0..000000000
--- a/dep/acelite/ace/XML_Utils/XML_Error_Handler.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//==============================================================
-/**
- *  @file  XML_Error_Handler.h
- *
- *  $Id: XML_Error_Handler.h 95801 2012-05-31 09:14:36Z johnnyw $
- *
- *  @brief Error handler for Xerces
- *
- *  @author Bala Natarajan <bala@dre.vanderbilt.edu>
- */
-//================================================================
-#ifndef ACE_XML_ERROR_HANDLER_H
-#define ACE_XML_ERROR_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "XML_Utils_Export.h"
-
-#include <xercesc/sax/ErrorHandler.hpp>
-
-using xercesc::SAXParseException;
-
-namespace XML
-{
-  /**
-    * @class XML_Error_Hander
-    *
-    * @brief Error handler for XERCES
-    *
-    */
-  class XML_Utils_Export XML_Error_Handler
-    : public xercesc::ErrorHandler
-  {
-  public:
-
-    XML_Error_Handler (void);
-
-    ~XML_Error_Handler (void);
-
-    void warning(const SAXParseException& toCatch);
-    void error(const SAXParseException& toCatch);
-    void fatalError(const SAXParseException& toCatch);
-    void resetErrors();
-    bool getErrors (void) const;
-  private :
-    // Disallow copying
-    XML_Error_Handler (const XML_Error_Handler&);
-    XML_Error_Handler& operator= (const XML_Error_Handler&);
-
-    bool errors_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ACE_XML_ERROR_HANDLER_H */
diff --git a/dep/acelite/ace/XML_Utils/XML_Helper.h b/dep/acelite/ace/XML_Utils/XML_Helper.h
deleted file mode 100644
index 4bb0e8161..000000000
--- a/dep/acelite/ace/XML_Utils/XML_Helper.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// $Id: XML_Helper.h 95801 2012-05-31 09:14:36Z johnnyw $
-//============================================================
-/**
- * @file XML_Helper.h
- *
- * @brief Some helper functions for XML
- *
- * @author Bala Natarajan <bala@dre.vanderbilt.edu>
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- */
-//============================================================
-#ifndef ACE_XML_HELPER_H
-#define ACE_XML_HELPER_H
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "XML_Error_Handler.h"
-#include "XML_Schema_Resolver.h"
-
-#include "xercesc/util/XercesDefs.hpp"
-#include "xercesc/parsers/XercesDOMParser.hpp"
-
-#include <memory>
-
-namespace XERCES_CPP_NAMESPACE
-{
-  class DOMDocument;
-  class DOMWriter;
-  class DOMImplementation;
-  class DOMDocumentType;
-}
-
-namespace XML
-{
-  /**
-    * @class XML_Helper
-    *
-    * @brief Helper class for some routine XML stuff.
-    */
-  template <typename Resolver = XML_Schema_Resolver <>,
-            typename Error_Handler = XML_Error_Handler>
-  class XML_Helper
-  {
-  public:
-    //      XML_Helper (void);
-    XML_Helper (Resolver *resolver = 0, Error_Handler *eh = 0);
-
-    ~XML_Helper (void);
-
-    /// Create a DOM tree
-    XERCES_CPP_NAMESPACE::DOMDocument *
-    create_dom (const ACE_TCHAR *uri) const;
-
-    XERCES_CPP_NAMESPACE::DOMDocument *
-    create_dom (const ACE_TCHAR *root,
-                const ACE_TCHAR *ns,
-                XERCES_CPP_NAMESPACE::DOMDocumentType * doctype = 0) const;
-
-    XERCES_CPP_NAMESPACE::DOMDocumentType *
-    create_doctype (const ACE_TCHAR *qn,
-                    const ACE_TCHAR *pid,
-                    const ACE_TCHAR *sid) const;
-
-    /// Writes out a DOMDocument to an XML file
-    bool write_DOM (XERCES_CPP_NAMESPACE::DOMDocument *doc,
-                    const ACE_TCHAR *file) const;
-
-    bool is_initialized (void) const;
-
-    /// Terminate the parser
-    void terminate_parser (void);
-
-    Resolver &get_resolver (void);
-
-    Error_Handler &get_error_handler (void);
-
-  protected:
-    /// Intialize the parser
-    void init_parser (void);
-
-  private:
-    bool initialized_;
-    XERCES_CPP_NAMESPACE::DOMImplementation *impl_;
-    mutable std::auto_ptr<XERCES_CPP_NAMESPACE::XercesDOMParser> parser_;
-
-    Resolver *resolver_;
-    bool release_resolver_;
-    Error_Handler *e_handler_;
-    bool release_e_handler_;
-  };
-}
-
-#include "XML_Helper.tpp"
-
-#include /**/ "ace/post.h"
-#endif/*ACE_XML_HELPER_H*/
diff --git a/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp b/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp
deleted file mode 100644
index 26914d994..000000000
--- a/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// $Id: XML_Schema_Resolver.cpp 95760 2012-05-15 13:46:19Z msmit $
-#include "XML_Schema_Resolver.h"
-
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-
-#include "XercesString.h"
-
-#include "ace/Env_Value_T.h"
-
-#include <iostream>
-
-namespace XML
-{
-  Basic_Resolver::Basic_Resolver (const ACE_TCHAR *path)
-    : path_ (path)
-  {
-  }
-
-  XMLCh *
-  Basic_Resolver::operator() (const XMLCh *const,
-                              const XMLCh *const systemId) const
-  {
-    XStr path (path_);
-    path.append (systemId);
-    return path.release ();
-  }
-
-  Environment_Resolver::Environment_Resolver (void)
-  {
-  }
-
-  Environment_Resolver::Environment_Resolver (const ACE_TCHAR *variable,
-                                              const ACE_TCHAR *relpath)
-  {
-    this->add_path (variable, relpath);
-  }
-
-  using xercesc::XMLPlatformUtils;
-
-  void
-  Environment_Resolver::add_path (const ACE_TCHAR *variable,
-                                  const ACE_TCHAR *relpath)
-  {
-    ACE_Env_Value <const ACE_TCHAR *> path_env (variable,
-                                                ACE_TEXT(""));
-
-    XStr xpath (path_env);
-    XStr xrelpath (relpath);
-
-    xpath.append (xrelpath);
-
-    paths_.push_back (xpath);
-  }
-
-  XMLCh *
-  Environment_Resolver::operator() (const XMLCh *const,
-                                    const XMLCh *const systemId) const
-  {
-    for (std::vector<XStr>::const_iterator i = this->paths_.begin ();
-          i != this->paths_.end ();
-          ++i)
-      {
-        XStr path (*i);
-        path.append(systemId);
-
-        FileHandle file (XMLPlatformUtils::openFile (path));
-
-        if (file != 0)
-          {
-            XMLPlatformUtils::closeFile (file);
-            return path.release ();
-          }
-      }
-    return 0;
-  }
-}
diff --git a/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.h b/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.h
deleted file mode 100644
index 174e3ea56..000000000
--- a/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * @file XML_Schema_Resolver.h
- * @author Will Otte <wotte@dre.vanderbilt.edu>
- *
- * $Id: XML_Schema_Resolver.h 95801 2012-05-31 09:14:36Z johnnyw $
- *
- * Resolves schema locations.
- */
-
-#ifndef ACE_XML_SCHEMA_RESOLVER_H
-#define ACE_XML_SCHEMA_RESOLVER_H
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "XML_Utils_Export.h"
-#include "XercesString.h"
-
-#include <xercesc/sax/EntityResolver.hpp>
-#include <vector>
-#include <string>
-
-using namespace xercesc;
-
-namespace XML
-{
-  // forward decl.
-  struct NoOp_Resolver;
-
-  /**
-    * @class XML_Schema_Resolver
-    * @brief Resolves schema locations
-    *
-    * Template argument Resolver should be a functor with an operation
-    * const ACE_TCHAR * operator () (...arguments from resolveEntity...)
-    */
-  template <typename Resolver = NoOp_Resolver>
-  class XML_Schema_Resolver
-    : public virtual EntityResolver
-  {
-  public:
-    XML_Schema_Resolver (void);
-
-    XML_Schema_Resolver (Resolver &resolver);
-
-    /// This function is called by the Xerces infrastructure to
-    /// actually resolve the location of a schema.
-    virtual InputSource * resolveEntity (const XMLCh *const publicId,
-                                          const XMLCh *const systemId);
-
-    Resolver &get_resolver (void);
-
-  private:
-    XML_Schema_Resolver (XML_Schema_Resolver<Resolver> &);
-
-    Resolver resolver_;
-  };
-
-  /**
-    * @class NoOp_Resolver
-    * @brief Resolver that does nothing.
-    */
-  struct NoOp_Resolver
-  {
-    const XMLCh* operator() (const XMLCh *const,
-                              const XMLCh *const systemId) const
-    { return systemId; };
-  };
-
-  /**
-    * @class Basic_Resolver
-    * @brief Resolves a schema location from a fixed path.
-    */
-  struct Basic_Resolver
-  {
-    Basic_Resolver (const ACE_TCHAR *path);
-
-    XMLCh* operator() (const XMLCh *const publicId,
-                        const XMLCh *const systemId) const;
-    XStr path_;
-  };
-
-  /**
-    * @class Environment_Resolver
-    * @brief Resolves a schema location from a path from an environment variable.
-    */
-  struct XML_Utils_Export Environment_Resolver
-  {
-    Environment_Resolver (void);
-
-    Environment_Resolver (const ACE_TCHAR *variable,
-                          const ACE_TCHAR *path);
-
-    void add_path (const ACE_TCHAR *variable,
-                    const ACE_TCHAR *path);
-
-    XMLCh* operator() (const XMLCh *const publicId,
-                        const XMLCh *const systemId) const;
-
-    std::vector<XStr> paths_;
-  };
-}
-
-#include "XML_Schema_Resolver.tpp"
-
-#include /**/ "ace/post.h"
-
-#endif /*  ACE_XML_SCHEMA_RESOLVER_H */
diff --git a/dep/acelite/ace/XML_Utils/XML_Typedefs.cpp b/dep/acelite/ace/XML_Utils/XML_Typedefs.cpp
deleted file mode 100644
index aad41d82e..000000000
--- a/dep/acelite/ace/XML_Utils/XML_Typedefs.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id: XML_Typedefs.cpp 95760 2012-05-15 13:46:19Z msmit $
-
-#include "XML_Typedefs.h"
-
-namespace XML
-{
-  XML_Typedef::HELPER XML_Typedef::XML_HELPER;
-}
diff --git a/dep/acelite/ace/XML_Utils/XML_Typedefs.h b/dep/acelite/ace/XML_Utils/XML_Typedefs.h
deleted file mode 100644
index c41da608f..000000000
--- a/dep/acelite/ace/XML_Utils/XML_Typedefs.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @file XML_Typedefs.h
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * $Id: XML_Typedefs.h 95760 2012-05-15 13:46:19Z msmit $
- * Typedefs from the XML Utilities.
- */
-#ifndef XML_TYPEDEFS_H
-#define XML_TYPEDEFS_H
-
-#include "XML_Utils_Export.h"
-#include "XML_Helper.h"
-#include "XML_Schema_Resolver.h"
-#include "XML_Error_Handler.h"
-
-namespace XML
-{
-  class XML_Utils_Export XML_Typedef
-  {
-  public:
-    typedef ::XML::Environment_Resolver PATH_RESOLVER;
-    typedef ::XML::XML_Schema_Resolver< ::XML::Environment_Resolver > XML_RESOLVER;
-    typedef ::XML::XML_Error_Handler ERROR_HANDLER;
-    typedef ::XML::XML_Helper< XML_RESOLVER, ERROR_HANDLER > HELPER;
-
-    static ERROR_HANDLER _xml_error_handler;
-
-  public:
-    static HELPER XML_HELPER;
-  };
-}
-
-#endif /* XML_TYPEDEFS_H */
diff --git a/dep/acelite/ace/XML_Utils/XML_Utils_Export.h b/dep/acelite/ace/XML_Utils/XML_Utils_Export.h
deleted file mode 100644
index 56ea76a24..000000000
--- a/dep/acelite/ace/XML_Utils/XML_Utils_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id: XML_Utils_Export.h 95760 2012-05-15 13:46:19Z msmit $
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl XML_Utils
-// ------------------------------
-#ifndef XML_UTILS_EXPORT_H
-#define XML_UTILS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (XML_UTILS_HAS_DLL)
-#  define XML_UTILS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && XML_UTILS_HAS_DLL */
-
-#if !defined (XML_UTILS_HAS_DLL)
-#  define XML_UTILS_HAS_DLL 1
-#endif /* ! XML_UTILS_HAS_DLL */
-
-#if defined (XML_UTILS_HAS_DLL) && (XML_UTILS_HAS_DLL == 1)
-#  if defined (XML_UTILS_BUILD_DLL)
-#    define XML_Utils_Export ACE_Proper_Export_Flag
-#    define XML_UTILS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define XML_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* XML_UTILS_BUILD_DLL */
-#    define XML_Utils_Export ACE_Proper_Import_Flag
-#    define XML_UTILS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define XML_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* XML_UTILS_BUILD_DLL */
-#else /* XML_UTILS_HAS_DLL == 1 */
-#  define XML_Utils_Export
-#  define XML_UTILS_SINGLETON_DECLARATION(T)
-#  define XML_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* XML_UTILS_HAS_DLL == 1 */
-
-// Set XML_UTILS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (XML_UTILS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define XML_UTILS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define XML_UTILS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !XML_UTILS_NTRACE */
-
-#if (XML_UTILS_NTRACE == 1)
-#  define XML_UTILS_TRACE(X)
-#else /* (XML_UTILS_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define XML_UTILS_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (XML_UTILS_NTRACE == 1) */
-
-#endif /* XML_UTILS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/XML_Utils/XSCRT/Elements.hpp b/dep/acelite/ace/XML_Utils/XSCRT/Elements.hpp
deleted file mode 100644
index d0afe1aaf..000000000
--- a/dep/acelite/ace/XML_Utils/XSCRT/Elements.hpp
+++ /dev/null
@@ -1,569 +0,0 @@
-// file      : XSCRT/Elements.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: Elements.hpp 95832 2012-06-06 13:09:50Z johnnyw $
-
-#ifndef XSCRT_ELEMENTS_HPP
-#define XSCRT_ELEMENTS_HPP
-
-#include <map>
-#include <string>
-#include <sstream>
-#include "ace/ace_wchar.h"
-// #include <iostream> //@@ tmp
-
-#include <ace/XML_Utils/XSCRT/Parser.hpp>
-#include "ace/Refcounted_Auto_Ptr.h"
-
-namespace XSCRT
-{
-  struct IdentityProvider
-  {
-    virtual bool
-    before (IdentityProvider const&) const = 0;
-
-    virtual ~IdentityProvider (void)
-    {
-
-    }
-  };
-
-  class Type
-  {
-  public:
-
-    virtual ~Type (void)
-    {
-    }
-
-  protected:
-    Type (void)
-        : container_ (0)
-    {
-    }
-
-    template <typename C>
-    Type (XML::Element<C> const&)
-        : container_ (0)
-    {
-    }
-
-    template <typename C>
-    Type (XML::Attribute<C> const&)
-        : container_ (0)
-    {
-    }
-
-    Type (Type const&)
-        : container_ (0)
-    {
-    }
-
-    Type&
-    operator= (Type const&)
-    {
-      //@@ I don't need this.
-      //if (map_.get ()) map_->clear (); // Flush the map.
-      return *this;
-    }
-
-  public:
-    Type const*
-    container () const
-    {
-      return container_ ? container_ : this;
-    }
-
-    Type*
-    container ()
-    {
-      return container_ ? container_ : this;
-    }
-
-
-    Type const*
-    root () const
-    {
-      Type const* r = container ();
-
-      //@@ VC6 can't handle this inside the loop.
-      //
-      Type const* c = r->container ();
-
-      for (; c != r; c = c->container ()) r = c;
-
-      return r;
-    }
-
-    Type*
-    root ()
-    {
-      Type* r = container ();
-
-      for (Type* c = r->container (); c != r; c = c->container ()) r = c;
-
-      return r;
-    }
-
-    //@@
-    //protected:
-
-  public:
-    virtual void
-    container (Type* c)
-    {
-      if (container_ == c) return;
-
-      // Revoke registrations from our old container.
-      //
-      if (container_ != 0 && map_.get ())
-      {
-        for (Map_::iterator i (map_->begin ()); i != map_->end (); ++i)
-        {
-          //std::wcerr << "revoking " << i->second
-          //           << " to " << container_ << std::endl;
-
-          container_->unregister_id (*(i->first));
-        }
-      }
-
-      // Copy registrations to our new container.
-      //
-      if (c != 0 && map_.get ())
-      {
-        for (Map_::iterator i (map_->begin ()); i != map_->end (); ++i)
-        {
-          //std::wcerr << "copying " << i->second
-          //           << " to " << c << std::endl;
-
-          c->register_id (*(i->first), i->second);
-        }
-      }
-
-      container_  = c;
-    }
-
-    //@@
-    //protected:
-
-  public:
-    void
-    register_id (IdentityProvider const& id, Type* t)
-    {
-      if (map_.get () == 0)
-      {
-        map_ = std::auto_ptr<Map_> (new Map_);
-      }
-
-      if (!map_->insert (
-            std::pair<IdentityProvider const*, Type*> (&id, t)).second)
-      {
-        throw 1;
-      }
-
-      if (container () != this) container ()->register_id (id, t);
-    }
-
-    void
-    unregister_id (IdentityProvider const& id)
-    {
-      if (map_.get ())
-      {
-        Map_::iterator it (map_->find (&id));
-
-        if (it != map_->end ())
-        {
-          map_->erase (it);
-
-          if (container () != this) container ()->unregister_id (id);
-
-          return;
-        }
-      }
-
-      throw 1;
-    }
-
-    Type*
-    lookup_id (IdentityProvider const& id) const
-    {
-      if (map_.get ())
-      {
-        Map_::const_iterator it (map_->find (&id));
-
-        if (it != map_->end ())
-        {
-          return it->second;
-        }
-      }
-
-      return 0;
-    }
-
-    //Get and set methods for the idref_map_ data member
-    Type* get_idref (const char* name)
-    {
-      std::basic_string<ACE_TCHAR> name_string (ACE_TEXT_CHAR_TO_TCHAR(name));
-      std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i =
-          this->idref_map_.find(name_string);
-      if (i != idref_map_.end())
-      {
-        return i->second;
-      }
-      else
-      {
-        return 0;
-      }
-    }
-
-    Type* get_idref (const wchar_t *name)
-    {
-      std::basic_string<ACE_TCHAR> name_string (ACE_TEXT_WCHAR_TO_TCHAR(name));
-      std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i =
-          this->idref_map_.find(name_string);
-      if (i != idref_map_.end())
-      {
-        return i->second;
-      }
-      else
-      {
-        return 0;
-      }
-    }
-
-
-    void set_idref (std::basic_string<ACE_TCHAR> name, Type* new_idref)
-    {
-      this->idref_map_.insert(std::pair<std::basic_string<ACE_TCHAR>,Type*>(name, new_idref));
-      return;
-    }
-
-  private:
-
-    //Data member to handle unbounded IDREF attributes and elements
-    std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*> idref_map_;
-
-    Type* container_;
-
-    struct IdentityComparator
-    {
-      bool operator () (IdentityProvider const* x,
-                        IdentityProvider const* y) const
-      {
-        return x->before (*y);
-      }
-    };
-
-    typedef
-    std::map<IdentityProvider const*, Type*, IdentityComparator>
-    Map_;
-
-    std::auto_ptr<Map_> map_;
-  };
-
-  // Fundamental types template.
-  //
-  //
-  template <typename X>
-  class FundamentalType : public Type
-  {
-  public:
-    // Trait for marshaling a FundamentalType X
-    typedef X CDR_Type__;
-#if !defined (__BORLANDC__) || (__BORLANDC__ >= 0x620)
-    typedef ACE_Refcounted_Auto_Ptr < FundamentalType, ACE_Null_Mutex > _ptr;
-#endif /* !__BORLANDC__ */
-
-    FundamentalType ()
-    {
-    }
-
-    template<typename C>
-    FundamentalType (XML::Element<C> const& e)
-    {
-      std::basic_stringstream<C> s;
-      s << e.value ();
-      s >> x_;
-    }
-
-    template<typename C>
-    FundamentalType (XML::Attribute<C> const& a)
-    {
-      std::basic_stringstream<C> s;
-      s << a.value ();
-      s >> x_;
-    }
-
-    FundamentalType (X const& x)
-        : x_ (x)
-    {
-    }
-
-    FundamentalType&
-    operator= (X const& x)
-    {
-      x_ = x;
-      return *this;
-    }
-
-  public:
-    operator X const& () const
-    {
-      return x_;
-    }
-
-    operator X& ()
-    {
-      return x_;
-    }
-
-  protected:
-    X x_;
-  };
-
-#if !((defined (__GNUC__) && (__GNUC__ == 3 && (__GNUC_MINOR__ < 3))) || \
- (defined (__BORLANDC__) && (__BORLANDC__ < 0x620)) || \
- (defined (__SUNPRO_CC) && (__SUNPRO_CC <= 0x5100)))
-
-  // Stuff for normal compilers.
-  //
-
-  // Specialization for `signed char'
-  //
-  //
-  template<>
-  template<typename C>
-  inline
-  FundamentalType<signed char>::
-  FundamentalType (XML::Element<C> const& e)
-  {
-    std::basic_stringstream<C> s;
-    s << e.value ();
-
-    short t;
-    s >> t;
-
-    x_ = static_cast<signed char> (t);
-  }
-
-  template<>
-  template<typename C>
-  inline
-  FundamentalType<signed char>::
-  FundamentalType (XML::Attribute<C> const& a)
-  {
-    std::basic_stringstream<C> s;
-    s << a.value ();
-
-    short t;
-    s >> t;
-
-    x_ = static_cast<signed char> (t);
-  }
-
-  // Specialization for `unsigned char'
-  //
-  //
-  template<>
-  template<typename C>
-  inline
-  FundamentalType<unsigned char>::
-  FundamentalType (XML::Element<C> const& e)
-  {
-    std::basic_stringstream<C> s;
-    s << e.value ();
-
-    unsigned short t;
-    s >> t;
-
-    x_ = static_cast<unsigned char> (t);
-  }
-
-  template<>
-  template<typename C>
-  inline
-  FundamentalType<unsigned char>::
-  FundamentalType (XML::Attribute<C> const& a)
-  {
-    std::basic_stringstream<C> s;
-    s << a.value ();
-
-    unsigned short t;
-    s >> t;
-
-    x_ = static_cast<unsigned char> (t);
-  }
-
-#else
-
-  // Stuff for broken VC6 & gcc < 3.3. Don't like what you see - use better
-  // compiler!
-  //
-
-  // Specialization for signed char.
-  //
-  template <>
-  class FundamentalType<signed char> : public Type
-  {
-  public:
-    FundamentalType ()
-    {
-    }
-
-    template<typename C>
-    FundamentalType (XML::Element<C> const& e)
-    {
-      std::basic_stringstream<C> s;
-      s << e.value ();
-
-      short t;
-      s >> t;
-
-      x_ = static_cast<signed char> (t);
-    }
-
-    template<typename C>
-    FundamentalType (XML::Attribute<C> const& a)
-    {
-      std::basic_stringstream<C> s;
-      s << a.value ();
-
-      short t;
-      s >> t;
-
-      x_ = static_cast<signed char> (t);
-    }
-
-    FundamentalType (signed char const& x)
-        : x_ (x)
-    {
-    }
-
-    FundamentalType&
-    operator= (signed char const& x)
-    {
-      x_ = x;
-      return *this;
-    }
-
-  public:
-    operator signed char const& () const
-    {
-      return x_;
-    }
-
-    operator signed char& ()
-    {
-      return x_;
-    }
-
-  protected:
-    signed char x_;
-  };
-
-  // Specialization for unsigned char.
-  //
-  template <>
-  class FundamentalType<unsigned char> : public Type
-  {
-  public:
-    FundamentalType ()
-    {
-    }
-
-    template<typename C>
-    FundamentalType (XML::Element<C> const& e)
-    {
-      std::basic_stringstream<C> s;
-      s << e.value ();
-
-      unsigned short t;
-      s >> t;
-
-      x_ = static_cast<unsigned char> (t);
-    }
-
-    template<typename C>
-    FundamentalType (XML::Attribute<C> const& a)
-    {
-      std::basic_stringstream<C> s;
-      s << a.value ();
-
-      unsigned short t;
-      s >> t;
-
-      x_ = static_cast<unsigned char> (t);
-    }
-
-    FundamentalType (unsigned char const& x)
-        : x_ (x)
-    {
-    }
-
-    FundamentalType&
-    operator= (unsigned char const& x)
-    {
-      x_ = x;
-      return *this;
-    }
-
-  public:
-    operator unsigned char const& () const
-    {
-      return x_;
-    }
-
-    operator unsigned char& ()
-    {
-      return x_;
-    }
-
-  protected:
-    unsigned char x_;
-  };
-
-#endif
-
-
-  // Specialization for bool.
-  //
-  //
-
-  template<>
-  template<>
-  inline
-  FundamentalType<bool>::
-  FundamentalType (XML::Element<char> const& e)
-  {
-    x_ = (e.value () == "true") || (e.value () == "1");
-  }
-
-  template<>
-  template<>
-  inline
-  FundamentalType<bool>::
-  FundamentalType (XML::Element<wchar_t> const& e)
-  {
-    x_ = (e.value () == L"true") || (e.value () == L"1");
-  }
-
-  template<>
-  template<>
-  inline
-  FundamentalType<bool>::
-  FundamentalType (XML::Attribute<char> const& a)
-  {
-    x_ = (a.value () == "true") || (a.value () == "1");
-  }
-
-  template<>
-  template<>
-  inline
-  FundamentalType<bool>::
-  FundamentalType (XML::Attribute<wchar_t> const& a)
-  {
-    x_ = (a.value () == L"true") || (a.value () == L"1");
-  }
-
-}
-
-#endif  // XSCRT_ELEMENTS_HPP
diff --git a/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp b/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp
deleted file mode 100644
index 89f6da81f..000000000
--- a/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp
+++ /dev/null
@@ -1,182 +0,0 @@
-// file      : XSCRT/ExtendedTypeInfo.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: ExtendedTypeInfo.hpp 95802 2012-05-31 12:37:36Z johnnyw $
-
-#ifndef XSCRT_EXTENDED_TYPE_INFO_HPP
-#define XSCRT_EXTENDED_TYPE_INFO_HPP
-
-#include <map>
-#include <vector>
-#include <typeinfo>
-
-namespace XSCRT
-{
-  //
-  //
-  //
-  class TypeId
-  {
-  public:
-    template<typename T>
-    TypeId (T const& t);
-
-    TypeId (std::type_info const& tid);
-
-  public:
-    bool
-    operator == (TypeId const& other) const;
-
-    bool
-    operator != (TypeId const& other) const;
-
-    bool
-    operator < (TypeId const& other) const;
-
-    /*
-    friend std::ostream&
-    operator << (std::ostream& os, TypeId const& t);
-    */
-
-  public:
-    char const*
-    name () const
-    {
-      return tid_->name ();
-    }
-
-  private:
-    std::type_info const* tid_;
-  };
-
-
-  //
-  //
-  //
-  class ExtendedTypeInfo
-  {
-  public:
-
-    //
-    //
-    //
-    struct Access
-    {
-      enum Value
-      {
-        private_,
-        protected_,
-        public_
-      };
-    };
-
-
-    //
-    //
-    //
-    class BaseInfo
-    {
-    public:
-      BaseInfo (Access::Value access, bool virtual_base, TypeId const& tid);
-
-    public:
-      ExtendedTypeInfo const&
-      type_info () const;
-
-      Access::Value
-      access () const;
-
-      bool
-      virtual_base () const;
-
-    private:
-      TypeId tid_;
-      mutable ExtendedTypeInfo const* ti_;
-      bool virtual_base_;
-      Access::Value access_;
-    };
-
-  private:
-    typedef
-    std::vector<BaseInfo>
-    BaseInfoList;
-
-  public:
-    typedef
-    BaseInfoList::const_iterator
-    BaseIterator;
-
-  public:
-    ExtendedTypeInfo (TypeId const& tid);
-
-    TypeId
-    type_id () const;
-
-    BaseIterator
-    begin_base () const;
-
-    BaseIterator
-    end_base () const;
-
-    void
-    add_base (Access::Value access, bool virtual_base, TypeId const& tid);
-
-  private:
-    TypeId tid_;
-    BaseInfoList base_;
-  };
-
-  typedef
-  std::map<TypeId, ExtendedTypeInfo>
-  ExtendedTypeInfoMap;
-
-
-  ExtendedTypeInfoMap&
-  extended_type_info_map ();
-
-
-  class NotAvailable {};
-
-
-  template<typename T>
-  ExtendedTypeInfo const&
-  extended_type_info (T const& t)
-  {
-    return extended_type_info (typeid (t));
-  }
-
-  template<typename T>
-  ExtendedTypeInfo const&
-  extended_type_info ()
-  {
-    return extended_type_info (typeid (T));
-  }
-
-  //@@ Had to use function template specialization because VC6
-  //   cannot handle simply overloaded functions.
-  //
-
-  template <>
-  inline
-  ExtendedTypeInfo const&
-  extended_type_info<TypeId> (TypeId const& tid)
-  {
-    ExtendedTypeInfoMap::const_iterator i (
-      extended_type_info_map ().find (tid));
-
-    if (i == extended_type_info_map ().end ()) throw NotAvailable ();
-
-    return i->second;
-  }
-
-  template <>
-  inline
-  ExtendedTypeInfo const&
-  extended_type_info<std::type_info> (std::type_info const& tid)
-  {
-    return extended_type_info (TypeId (tid));
-  }
-}
-
-#include <ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp>
-
-#endif  // XSCRT_EXTENDED_TYPE_INFO_HPP
diff --git a/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp b/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp
deleted file mode 100644
index 5d6282134..000000000
--- a/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp
+++ /dev/null
@@ -1,141 +0,0 @@
-// file      : XSCRT/ExtendedTypeInfo.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: ExtendedTypeInfo.ipp 86462 2009-08-12 13:31:27Z wotte $
-
-
-/*
- *  @@HACK: Visual Studio.
- *  I think the return value for operator== for type_info
- *  in VC7 (perhaps others) is int when is should be bool.
- *  This causes a warning about converting the return value from
- *  int to bool.
- */
-#ifdef _MSC_VER
-# pragma warning( disable: 4800 )
-#endif
-
-namespace XSCRT
-{
-  // TypeId
-  //
-  //
-  inline
-  TypeId::
-  TypeId (std::type_info const& tid)
-      : tid_ (&tid)
-  {
-  }
-
-  inline
-  bool TypeId::
-  operator == (TypeId const& other) const
-  {
-    return *tid_ == *other.tid_;
-  }
-
-  inline
-  bool TypeId::
-  operator != (TypeId const& other) const
-  {
-    return *tid_ != *other.tid_;
-  }
-
-  inline
-  bool TypeId::
-  operator < (TypeId const& other) const
-  {
-    return tid_->before (*other.tid_);
-  }
-
-
-  // ExtendedTypeInfo::BaseInfo
-  //
-  //
-
-  inline
-  ExtendedTypeInfo::BaseInfo::
-  BaseInfo (Access::Value access, bool virtual_base, TypeId const& tid)
-      : tid_ (tid),
-        ti_ (0),
-        virtual_base_ (virtual_base),
-        access_ (access)
-  {
-  }
-
-  inline
-  ExtendedTypeInfo const& ExtendedTypeInfo::BaseInfo::
-  type_info () const
-  {
-    if (ti_ == 0) ti_ = &(extended_type_info (tid_));
-
-    return *ti_;
-  }
-
-
-  inline
-  ExtendedTypeInfo::Access::Value ExtendedTypeInfo::BaseInfo::
-  access () const
-  {
-    return access_;
-  }
-
-  inline
-  bool ExtendedTypeInfo::BaseInfo::
-  virtual_base () const
-  {
-    return virtual_base_;
-  }
-
-
-  // ExtendedTypeInfo
-  //
-  //
-  inline
-  ExtendedTypeInfo::
-  ExtendedTypeInfo (TypeId const& tid)
-      : tid_ (tid)
-  {
-  }
-
-  inline
-  TypeId ExtendedTypeInfo::
-  type_id () const
-  {
-    return tid_;
-  }
-
-  inline
-  ExtendedTypeInfo::BaseIterator ExtendedTypeInfo::
-  begin_base () const
-  {
-    return base_.begin ();
-  }
-
-
-  inline
-  ExtendedTypeInfo::BaseIterator ExtendedTypeInfo::
-  end_base () const
-  {
-    return base_.end ();
-  }
-
-  inline
-  void ExtendedTypeInfo::
-  add_base (Access::Value access, bool virtual_base, TypeId const& tid)
-  {
-    base_.push_back (BaseInfo (access, virtual_base, tid));
-  }
-
-  // ExtendedTypeInfoMap
-  //
-  //
-
-  inline
-  ExtendedTypeInfoMap&
-  extended_type_info_map ()
-  {
-    static ExtendedTypeInfoMap extended_type_info_map_;
-
-    return extended_type_info_map_;
-  }
-}
diff --git a/dep/acelite/ace/XML_Utils/XSCRT/Parser.hpp b/dep/acelite/ace/XML_Utils/XSCRT/Parser.hpp
deleted file mode 100644
index 52f7c6dcb..000000000
--- a/dep/acelite/ace/XML_Utils/XSCRT/Parser.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// file      : XSCRT/Parser.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: Parser.hpp 95832 2012-06-06 13:09:50Z johnnyw $
-
-#ifndef XSCRT_PARSER_HPP
-#define XSCRT_PARSER_HPP
-
-#include <string>
-
-#include "ace/XML_Utils/XSCRT/XML.hpp"
-
-namespace XSCRT
-{
-  template <typename C>
-  class Parser
-  {
-  public:
-    Parser (XML::Element<C> const& e)
-        : e_ (e.dom_element ()->getChildNodes ()), ei_ (0),
-          a_ (e.dom_element ()->getAttributes ()), ai_ (0)
-    {
-    }
-
-    bool
-    more_elements () const
-    {
-      return e_->getLength () > ei_;
-    }
-
-    XML::Element<C>
-    next_element ()
-    {
-      return XML::Element<C> (XML::dom_cast <xercesc::DOMElement*> (e_->item (ei_++)));
-    }
-
-    bool
-    more_attributes () const
-    {
-      return a_->getLength () > ai_;
-    }
-
-    XML::Attribute<C>
-    next_attribute ()
-    {
-      return XML::Attribute<C> (
-        XML::dom_cast <xercesc::DOMAttr*> (a_->item (ai_++)));
-    }
-
-  private:
-    xercesc::DOMNodeList const* e_;
-    unsigned long ei_;
-
-    xercesc::DOMNamedNodeMap const* a_;
-    unsigned long ai_;
-
-  private:
-    Parser (Parser const&);
-
-    void
-    operator= (Parser const&);
-  };
-}
-
-#endif  // XSCRT_PARSER_HPP
diff --git a/dep/acelite/ace/XML_Utils/XSCRT/Traversal.hpp b/dep/acelite/ace/XML_Utils/XSCRT/Traversal.hpp
deleted file mode 100644
index ea04567fe..000000000
--- a/dep/acelite/ace/XML_Utils/XSCRT/Traversal.hpp
+++ /dev/null
@@ -1,265 +0,0 @@
-// file      : XSCRT/Traversal.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: Traversal.hpp 95833 2012-06-06 14:53:45Z johnnyw $
-
-#ifndef XSCRT_TRAVERSAL_HPP
-#define XSCRT_TRAVERSAL_HPP
-
-#include <map>
-#include <set>
-#include <vector>
-
-#include "ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp"
-
-namespace XSCRT
-{
-  namespace Traversal
-  {
-    //
-    //
-    //
-    template<typename B>
-    class TraverserBase
-    {
-    protected:
-      virtual
-      ~TraverserBase ();
-
-      //@@ VC6
-    public:
-      virtual void
-      trampoline (B& n) = 0;
-
-      virtual void
-      trampoline (B const& n) = 0;
-    };
-
-
-    //
-    //
-    //
-    template <typename B>
-    class DispatcherBase
-    {
-    public:
-      virtual
-      ~DispatcherBase ();
-
-      virtual void
-      dispatch (B& n);
-
-      virtual void
-      dispatch (B const& n);
-
-      void
-      map (TypeId id, TraverserBase<B>& t)
-      {
-        //wcerr << "map for " << id.name () << " to " << &t
-    //      << " in " << &traversal_map_ << endl;
-
-        //@@ VC6
-        Traversers& traversers = traversal_map_[id];
-        traversers.push_back (&t);
-      }
-
-    public:
-      typedef
-      std::vector<TraverserBase<B>*>
-      Traversers;
-
-      typedef
-      std::map<TypeId, Traversers>
-      TraversalMap;
-
-      typedef
-      typename TraversalMap::const_iterator
-      Iterator;
-
-      Iterator
-      begin () const
-      {
-        return traversal_map_.begin ();
-      }
-
-      Iterator
-      end () const
-      {
-        return traversal_map_.end ();
-      }
-
-    private:
-      struct TypeInfoComparator
-      {
-        bool
-        operator () (ExtendedTypeInfo const& x,
-                     ExtendedTypeInfo const& y) const
-        {
-          return x.type_id () < y.type_id ();
-        }
-      };
-
-      typedef
-      std::map<ExtendedTypeInfo, unsigned long, TypeInfoComparator>
-      LevelMap;
-
-      typedef
-      std::set<ExtendedTypeInfo, TypeInfoComparator>
-      TypeInfoSet;
-
-      static unsigned long
-      compute_levels (ExtendedTypeInfo const& ti,
-                      unsigned long cur,
-                      LevelMap& map);
-
-      static void
-      flatten_tree (ExtendedTypeInfo const& ti, TypeInfoSet& set);
-
-    private:
-      TraversalMap traversal_map_;
-    };
-
-
-    //
-    //
-    //
-    template <typename B>
-    class Dispatcher : public virtual DispatcherBase<B>
-    {
-    public:
-      Dispatcher ()
-          : merge_ (true)
-      {
-      }
-
-      void
-      traverser (DispatcherBase<B>& d)
-      {
-        for (typename DispatcherBase<B>::Iterator
-               i (d.begin ()), end (d.end ());
-             i != end; ++i)
-        {
-          for (typename DispatcherBase<B>::Traversers::const_iterator
-                 t (i->second.begin ()), end (i->second.end ());
-               t != end; ++t)
-          {
-            dispatcher_.map (i->first, **t);
-          }
-        }
-      }
-
-    public:
-      virtual void
-      dispatch (B& n)
-      {
-        merge ();
-        dispatcher_.dispatch (n);
-      }
-
-      virtual void
-      dispatch (B const& n)
-      {
-        merge ();
-        dispatcher_.dispatch (n);
-      }
-
-      using DispatcherBase<B>::begin;
-      using DispatcherBase<B>::end;
-
-    private:
-      void
-      merge ()
-      {
-        if (merge_)
-        {
-          for (typename DispatcherBase<B>::Iterator
-                 i (begin ()), e (end ()); i != e; ++i)
-          {
-            for (typename DispatcherBase<B>::Traversers::const_iterator
-                   t (i->second.begin ()), e (i->second.end ()); t != e; ++t)
-            {
-              dispatcher_.map (i->first, **t);
-            }
-          }
-
-          merge_ = false;
-        }
-      }
-
-    protected:
-      // DispatcherBase<B>&
-      // traverser ()
-      // {
-      //   return dispatcher_;
-      // }
-
-      template <typename X, typename A, typename I>
-      void
-      iterate_and_dispatch (I begin, I end, X& x, void (X::*next)(A&), A& a)
-      {
-        for (; begin != end;)
-        {
-          dispatch (*begin);
-
-          if (++begin != end) (x.*next) (a);
-        }
-      }
-
-    private:
-      bool merge_;
-      DispatcherBase<B> dispatcher_;
-    };
-
-
-
-    //
-    //
-    //
-    template <typename T, typename B>
-    struct Traverser : TraverserBase<B>, virtual Dispatcher<B>
-    {
-      typedef
-      T
-      Type;
-
-      Traverser ()
-      {
-        DispatcherBase<B>::map (typeid (Type), *this);
-      }
-
-      virtual void
-      traverse (Type&)
-      {
-        abort ();
-      }
-
-      virtual void
-      traverse (Type const&)
-      {
-        abort ();
-      }
-
-    protected:
-      virtual void
-      trampoline (B& n)
-      {
-        //wcerr << "trampoline for " << &n << " to type "
-        //      << typeid (Type).name () << endl;
-
-        traverse (dynamic_cast<Type&> (n));
-      }
-
-      virtual void
-      trampoline (B const& n)
-      {
-        //wcerr << "trampoline for " << &n << " to type "
-        //      << typeid (Type).name () << endl;
-
-        traverse (dynamic_cast<Type const&> (n));
-      }
-    };
-  }
-}
-
-#include <ace/XML_Utils/XSCRT/Traversal.tpp>
-
-#endif  // XSCRT_TRAVERSAL_HPP
diff --git a/dep/acelite/ace/XML_Utils/XSCRT/Traversal.tpp b/dep/acelite/ace/XML_Utils/XSCRT/Traversal.tpp
deleted file mode 100644
index f4e3d96fc..000000000
--- a/dep/acelite/ace/XML_Utils/XSCRT/Traversal.tpp
+++ /dev/null
@@ -1,195 +0,0 @@
-// file      : XSCRT/Traversal.tpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: Traversal.tpp 95833 2012-06-06 14:53:45Z johnnyw $
-
-namespace XSCRT
-{
-  namespace Traversal
-  {
-    // TraverserBase
-    //
-    //
-
-    template<typename B>
-    TraverserBase<B>::
-    ~TraverserBase ()
-    {
-    }
-
-    // DispatcherBase
-    //
-    //
-
-    template <typename B>
-    DispatcherBase<B>::
-    ~DispatcherBase ()
-    {
-    }
-
-    //@@ merge after dropping VC6
-    //
-    //
-    template <typename B>
-    void DispatcherBase<B>::
-    dispatch (B& n)
-    {
-      LevelMap levels;
-
-      //@@ VC6
-      ExtendedTypeInfo const& ti = extended_type_info (n);
-
-      unsigned long max = compute_levels (ti, 0, levels);
-
-
-      //wcerr << "starting dispatch process for "
-      //      << typeid (n).name () << " with "
-      //      << max << " levels" << endl;
-
-      for (unsigned long l = 0; l < max + 1; ++l)
-      {
-        TypeInfoSet dispatched;
-
-        for (typename LevelMap::const_iterator
-               i (levels.begin ()), e (levels.end ());
-             i != e; ++i)
-        {
-          if (i->second == l)
-          {
-            typename TraversalMap::const_iterator v (
-              traversal_map_.find (i->first.type_id ()));
-
-            if (v != traversal_map_.end ())
-            {
-              //wcerr << "dispatching traversers for "
-              //      << typeid (n).name () << " as "
-              //      << i->first.type_id ().name () << endl;
-
-              //@@ VC6
-              Traversers const& traversers  = v->second;
-              for (typename Traversers::const_iterator
-                     ti (traversers.begin ()), te (traversers.end ());
-                   ti != te; ++ti)
-              {
-                (*ti)->trampoline (n);
-              }
-
-              flatten_tree (i->first, dispatched);
-            }
-          }
-        }
-
-        // Remove traversed types from the level map.
-        //
-    //@@ VC6
-        {
-          for (typename TypeInfoSet::const_iterator i = dispatched.begin ();
-               i != dispatched.end ();
-               ++i)
-          {
-            levels.erase (*i);
-          }
-    }
-      }
-    }
-
-    template <typename B>
-    void DispatcherBase<B>::
-    dispatch (B const& n)
-    {
-      LevelMap levels;
-
-      //@@ VC6
-      ExtendedTypeInfo const& ti = extended_type_info (n);
-
-      unsigned long max = compute_levels (ti, 0, levels);
-
-
-      //wcerr << "starting dispatch process for "
-      //      << typeid (n).name () << " with "
-      //      << max << " levels" << endl;
-
-      //wcerr << "using " << &traversal_map_ << " traversal map" << endl;
-
-      for (unsigned long l = 0; l < max + 1; ++l)
-      {
-        TypeInfoSet dispatched;
-
-        for (typename LevelMap::const_iterator
-               i (levels.begin ()), e (levels.end ());
-             i != e; ++i)
-        {
-          if (i->second == l)
-          {
-            typename TraversalMap::const_iterator v (
-              traversal_map_.find (i->first.type_id ()));
-
-            if (v != traversal_map_.end ())
-            {
-              //wcerr << "dispatching traversers for "
-              //      << typeid (n).name () << " as "
-              //      << i->first.type_id ().name () << endl;
-
-              //@@ VC6
-              Traversers const& traversers  = v->second;
-              for (typename Traversers::const_iterator
-                     ti (traversers.begin ()), te (traversers.end ());
-                   ti != te; ++ti)
-              {
-                (*ti)->trampoline (n);
-              }
-
-              flatten_tree (i->first, dispatched);
-            }
-          }
-        }
-
-        // Remove traversed types from the level map.
-        //
-    //@@ VC6
-        {
-          for (typename TypeInfoSet::const_iterator i = dispatched.begin ();
-               i != dispatched.end ();
-               ++i)
-          {
-            levels.erase (*i);
-          }
-    }
-      }
-    }
-
-    template <typename B>
-    unsigned long DispatcherBase<B>::
-    compute_levels (ExtendedTypeInfo const& ti,
-                    unsigned long cur,
-                    LevelMap& map)
-    {
-      unsigned long ret = cur;
-
-      if (map.find (ti) == map.end () || map[ti] < cur) map[ti] = cur;
-
-      for (ExtendedTypeInfo::BaseIterator i = ti.begin_base ();
-           i != ti.end_base ();
-           i++)
-      {
-        unsigned long t = compute_levels (i->type_info (), cur + 1, map);
-        if (t > ret) ret = t;
-      }
-
-      return ret;
-    }
-
-    template <typename B>
-    void DispatcherBase<B>::
-    flatten_tree (ExtendedTypeInfo const& ti, TypeInfoSet& set)
-    {
-      set.insert (ti);
-
-      for (ExtendedTypeInfo::BaseIterator i = ti.begin_base ();
-           i != ti.end_base ();
-           i++)
-      {
-        flatten_tree (i->type_info (), set);
-      }
-    }
-  }
-}
diff --git a/dep/acelite/ace/XML_Utils/XSCRT/Writer.hpp b/dep/acelite/ace/XML_Utils/XSCRT/Writer.hpp
deleted file mode 100644
index 10dd39230..000000000
--- a/dep/acelite/ace/XML_Utils/XSCRT/Writer.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// file      : XSCRT/Writer.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: Writer.hpp 95832 2012-06-06 13:09:50Z johnnyw $
-
-#ifndef XSCRT_WRITER_HPP
-#define XSCRT_WRITER_HPP
-
-#include <stack>
-#include <string>
-
-#include "ace/XML_Utils/XSCRT/XML.hpp"
-
-namespace XSCRT
-{
-  template <typename C>
-  class Writer
-  {
-  public:
-    Writer (XML::Element<C>& e)
-        : attr__ (0)
-    {
-      push_ (e);
-    }
-
-  protected:
-    // This c-tor should never be called.
-    //
-    Writer ()
-    {
-      abort ();
-    }
-
-  public:
-    void
-    push_ (XML::Element<C> const& e)
-    {
-      stack_.push (e);
-    }
-
-    void
-    pop_ ()
-    {
-      stack_.pop ();
-    }
-
-    XML::Element<C>&
-    top_ ()
-    {
-      return stack_.top ();
-    }
-
-  public:
-    XML::Attribute<C>*
-    attr_ ()
-    {
-      return attr__;
-    }
-
-    void
-    attr_ (XML::Attribute<C>* a)
-    {
-      attr__ = a;
-    }
-
-  private:
-    std::stack<XML::Element<C> > stack_;
-
-    XML::Attribute<C>* attr__;
-
-  private:
-    Writer (Writer const&);
-
-    void
-    operator= (Writer const&);
-  };
-}
-
-#endif  // XSCRT_WRITER_HPP
diff --git a/dep/acelite/ace/XML_Utils/XSCRT/XML.hpp b/dep/acelite/ace/XML_Utils/XSCRT/XML.hpp
deleted file mode 100644
index 24f1968ba..000000000
--- a/dep/acelite/ace/XML_Utils/XSCRT/XML.hpp
+++ /dev/null
@@ -1,490 +0,0 @@
-// file      : XSCRT/XML.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: XML.hpp 95832 2012-06-06 13:09:50Z johnnyw $
-
-
-#ifndef XSCRT_XML_HPP
-#define XSCRT_XML_HPP
-
-#include <string>
-
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLString.hpp>
-
-namespace XSCRT
-{
-  namespace XML
-  {
-    //@@ VC6
-    //
-    template <typename C>
-    std::basic_string<C>
-    transcode (XMLCh const* s, C*);
-
-    template <typename C>
-    XMLCh*
-    transcode (std::basic_string<C> const& s);
-
-    //
-    //
-    //
-    class string
-    {
-    public :
-      template <typename C>
-      string (std::basic_string<C> const& s)
-          : s_ (XSCRT::XML::transcode<C> (s))
-      {
-      }
-
-      template <typename C>
-      string (C const* s)
-          : s_ (XSCRT::XML::transcode<C> (s))
-      {
-      }
-
-      ~string ()
-      {
-        delete[] s_;
-      }
-
-      XMLCh const*
-      c_str () const
-      {
-        return s_;
-      }
-
-    private :
-      XMLCh* s_;
-    };
-
-
-    template <>
-    inline
-    std::basic_string<char>
-    transcode<char> (XMLCh const* s, char*)
-    {
-      if (s == 0) return std::basic_string<char> ();
-
-      char* buf = xercesc::XMLString::transcode (s);
-
-      std::basic_string<char> r (buf);
-
-      xercesc::XMLString::release (&buf);
-
-      return r;
-    }
-
-    template <>
-    inline
-    std::basic_string<wchar_t>
-    transcode<wchar_t> (XMLCh const* s, wchar_t*)
-    {
-      if (s == 0) return std::basic_string<wchar_t> ();
-
-      // std::wcerr << s << std::endl;
-
-      std::basic_string<wchar_t> r (xercesc::XMLString::stringLen (s), L'0');
-
-      for (std::size_t i (0); *s != XMLCh (0); ++s, ++i)
-      {
-        r[i] = *s;
-      }
-
-      return r;
-    }
-
-    template <>
-    inline
-    XMLCh*
-    transcode (std::basic_string<char> const& s)
-    {
-      return xercesc::XMLString::transcode (s.c_str ());
-    }
-
-    template <>
-    inline
-    XMLCh*
-    transcode (std::basic_string<wchar_t> const& s)
-    {
-      //@@ VC6
-      std::size_t l = s.length ();
-
-      //@@ VC6
-      XMLCh* r = new XMLCh[l + 1];
-      XMLCh* ir = r;
-
-      for (std::size_t i (0); i < l; ++ir, ++i)
-      {
-        *ir = static_cast<XMLCh>(s[i]);
-        //std::wcerr << s[i] << "->" << *ir << std::endl;
-      }
-
-      *ir = XMLCh (0);
-
-      // std::wcerr << r << std::endl;
-
-      return r;
-    }
-
-
-    template <typename C>
-    class Element;
-
-    template <typename C>
-    std::basic_string<C>
-    ns_prefix (std::basic_string<C> const& ns, Element<C> const& e);
-
-    // Casting helpers, made necessary by the Xerces project's braindead
-    // avoidance of RTTI.
-    template <typename DERIVED> struct dom_traits;
-
-    // Specializations for different node types
-    template <>
-    struct dom_traits<xercesc::DOMElement *>
-    {
-      static const xercesc::DOMNode::NodeType node_type = xercesc::DOMNode::ELEMENT_NODE;
-    };
-
-    template <>
-    struct dom_traits<xercesc::DOMAttr *>
-    {
-      static const xercesc::DOMNode::NodeType node_type = xercesc::DOMNode::ATTRIBUTE_NODE;
-    };
-
-    template <typename DERIVED_PTR>
-    DERIVED_PTR dom_cast (xercesc::DOMNode *node)
-    {
-      DERIVED_PTR elem = 0;
-      if ((node != 0) &&
-          (node->getNodeType () == dom_traits<DERIVED_PTR>::node_type))
-        {
-          elem = reinterpret_cast <DERIVED_PTR> (node);
-        }
-      return elem;
-    }
-
-    template <typename C>
-    class Element
-    {
-      typedef std::basic_string<C> string_;
-
-    public:
-      Element (xercesc::DOMElement const* e)
-          : e_ (0),
-            ce_ (e),
-            name_ (transcode<C> (e->getLocalName (), 0)),
-            namespace__ (transcode<C> (e->getNamespaceURI (), 0))
-      {
-      }
-
-      Element (xercesc::DOMElement* e)
-          : e_ (e),
-            ce_ (e),
-            name_ (transcode<C> (e->getLocalName (), 0)),
-            namespace__ (transcode<C> (e->getNamespaceURI (), 0))
-      {
-      }
-
-      Element (string_ const& name, Element& parent)
-          : e_ (0),
-            ce_ (0),
-            name_ (name)
-      {
-        xercesc::DOMDocument* doc (
-          parent.dom_element ()->getOwnerDocument ());
-
-        e_ = doc->createElement (string (name).c_str ());
-
-        parent.dom_element ()->appendChild (e_);
-
-        ce_ = e_;
-      }
-
-      Element (string_ const& name, string_ const& ns, Element& parent)
-          : e_ (0),
-            ce_ (0),
-            name_ (name),
-            namespace__ (ns)
-      {
-        string_ prefix (ns_prefix (ns, parent));
-
-        xercesc::DOMDocument* doc (
-          parent.dom_element ()->getOwnerDocument ());
-
-        e_ = doc->createElementNS (
-          string (ns).c_str (),
-          string (prefix.empty ()
-                ? name
-                : prefix + string_ (1, ':') + name).c_str ());
-
-        parent.dom_element ()->appendChild (e_);
-
-        ce_ = e_;
-      }
-
-    public:
-      string_
-      name () const
-      {
-        return name_;
-      }
-
-      string_
-      namespace_ () const
-      {
-        return namespace__;
-      }
-
-    public:
-      Element<C>
-      parent () const
-      {
-        return dom_cast <xercesc::DOMElement const*>(ce_->getParentNode ());
-      }
-
-    public:
-      string_
-      value () const
-      {
-        return XML::transcode<C> (dom_element ()->getTextContent (), 0);
-      }
-
-      void
-      value (string_ const& v)
-      {
-        xercesc::DOMText* text (
-          dom_element ()->getOwnerDocument ()->createTextNode(
-            string (v).c_str ()));
-
-        dom_element ()->appendChild (text);
-      }
-
-    public:
-      string_
-      operator[] (string_ const& s) const
-      {
-        //@@ VC6
-        XMLCh const* value = ce_->getAttribute (string (s).c_str ());
-
-        return transcode<C> (value, 0);
-      }
-
-    public:
-      xercesc::DOMElement const*
-      dom_element () const
-      {
-        return ce_;
-      }
-
-      xercesc::DOMElement*
-      dom_element ()
-      {
-        return e_;
-      }
-
-    private:
-      xercesc::DOMElement* e_;
-      xercesc::DOMElement const* ce_;
-
-      string_ name_;
-      string_ namespace__;
-    };
-
-
-    template <typename C>
-    class Attribute
-    {
-      typedef std::basic_string<C> string_;
-
-    public:
-      Attribute (xercesc::DOMAttr const* a)
-          : a_ (0),
-            ca_ (a),
-            name_ (transcode<C> (a->getLocalName (), 0)),
-            value_ (transcode<C> (a->getValue (), 0))
-      {
-      }
-
-      Attribute (xercesc::DOMAttr* a)
-          : a_ (a),
-            ca_ (a),
-            name_ (transcode<C> (a->getLocalName (), 0)),
-            value_ (transcode<C> (a->getValue (), 0))
-      {
-      }
-
-      Attribute (string_ const& name,
-                 string_ const& v,
-                 Element<C>& parent)
-          : a_ (0),
-            ca_ (0),
-            name_ (name),
-            value_ ()
-      {
-        xercesc::DOMDocument* doc (
-          parent.dom_element ()->getOwnerDocument ());
-
-        a_ = doc->createAttribute (string (name).c_str ());
-
-        value (v);
-
-        parent.dom_element ()->setAttributeNode (a_);
-
-        ca_ = a_;
-      }
-
-      Attribute (string_ const& name,
-                 string_ const& ns,
-                 string_ const& v,
-                 Element<C>& parent)
-          : a_ (0),
-            ca_ (0),
-            name_ (name),
-            value_ ()
-      {
-        string_ prefix (ns_prefix (ns, parent));
-
-        xercesc::DOMDocument* doc (
-          parent.dom_element ()->getOwnerDocument ());
-
-        a_ = doc->createAttributeNS (
-          string (ns).c_str (),
-          string (prefix.empty ()
-                ? name
-                : prefix + string_ (1, ':') + name).c_str ());
-
-        value (v);
-
-        parent.dom_element ()->setAttributeNodeNS (a_);
-
-        ca_ = a_;
-      }
-
-      string_
-      name () const
-      {
-        return name_;
-      }
-
-      string_
-      value () const
-      {
-        return value_;
-      }
-
-      void
-      value (string_ const& v)
-      {
-        value_ = v;
-        a_->setValue (string (v).c_str ());
-      }
-
-    public:
-      xercesc::DOMAttr const*
-      dom_attribute () const
-      {
-        return ca_;
-      }
-
-      xercesc::DOMAttr*
-      dom_attribute ()
-      {
-        return a_;
-      }
-
-    private:
-
-    private:
-      xercesc::DOMAttr* a_;
-      xercesc::DOMAttr const* ca_;
-
-      string_ name_;
-      string_ value_;
-    };
-
-    template <typename C>
-    std::basic_string<C>
-    prefix (std::basic_string<C> const& n)
-    {
-      std::size_t i (0);
-      while (i < n.length () && n[i] != ':') ++i;
-
-      //std::wcerr << "prefix " << n << " "
-      //           << std::wstring (n, i == n.length () ? i : 0, i) << std::endl;
-
-      return std::basic_string<C> (n, i == n.length () ? i : 0, i);
-    }
-
-    template <typename C>
-    std::basic_string<C>
-    uq_name (std::basic_string<C> const& n)
-    {
-      std::size_t i (0);
-      while (i < n.length () && n[i] != ':') ++i;
-
-      return std::basic_string<C> (n.c_str () + (i == n.length () ? 0 : i + 1));
-    }
-
-    template <typename C>
-    std::basic_string<C>
-    ns_name (Element<C> const& e, std::basic_string<C> const& n)
-    {
-      std::basic_string<C> wp (prefix (n));
-
-      //@@ VC6
-      XMLCh const* xns = e.dom_element ()->lookupNamespaceURI (
-        wp.empty () ? 0 : string (wp).c_str ());
-
-
-      std::basic_string<C> ns (
-        xns ? transcode<C> (xns, 0) : std::basic_string<C> ());
-
-      return ns;
-
-    }
-
-    template <typename C>
-    std::basic_string<C>
-    fq_name (Element<C> const& e, std::basic_string<C> const& n)
-    {
-      std::basic_string<C> ns (ns_name (e, n));
-      std::basic_string<C> un (uq_name (n));
-
-      return ns.empty () ? un : (ns + C ('#') + un);
-    }
-
-    class no_prefix {};
-
-    template <typename C>
-    std::basic_string<C>
-    ns_prefix (std::basic_string<C> const& ns, Element<C> const& e)
-    {
-      string xns (ns);
-
-#if defined(XERCES_VERSION_MAJOR) && XERCES_VERSION_MAJOR > 2
-      XMLCh const* p (e.dom_element ()->lookupPrefix (xns.c_str ()));
-#else
-      XMLCh const* p (e.dom_element ()->lookupNamespacePrefix (xns.c_str (), false));
-#endif
-
-      if (p == 0)
-      {
-        bool r (e.dom_element ()->isDefaultNamespace (xns.c_str ()));
-
-        if (r)
-        {
-          return std::basic_string<C> ();
-        }
-        else
-        {
-          throw no_prefix ();
-        }
-      }
-
-      return transcode<C> (p, 0);
-    }
-  }
-}
-
-#endif  // XSCRT_XML_HPP
diff --git a/dep/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp b/dep/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp
deleted file mode 100644
index f975238f3..000000000
--- a/dep/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp
+++ /dev/null
@@ -1,588 +0,0 @@
-// file      : XSCRT/XMLSchema.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id: XMLSchema.hpp 95802 2012-05-31 12:37:36Z johnnyw $
-
-#ifndef XSCRT_XMLSCHEMA_HPP
-#define XSCRT_XMLSCHEMA_HPP
-
-#include <string>
-// #include <iostream> //@@ tmp
-
-#include "ace/XML_Utils/XMLSchema/XSCRT/Elements.hpp"
-
-namespace XMLSchema
-{
-  typedef XSCRT::FundamentalType<signed char> byte;
-  typedef XSCRT::FundamentalType<unsigned char> unsignedByte;
-
-  typedef XSCRT::FundamentalType<short> short_;
-  typedef XSCRT::FundamentalType<unsigned short> unsignedShort;
-
-  typedef XSCRT::FundamentalType<int> int_;
-  typedef XSCRT::FundamentalType<unsigned int> unsignedInt;
-
-  typedef XSCRT::FundamentalType<long long> long_;
-  typedef XSCRT::FundamentalType<unsigned long long> unsignedLong;
-
-  //@@ It would be nice to use some arbitrary-length integer class.
-  //
-  typedef long_ decimal;
-  typedef decimal integer;
-  typedef integer nonPositiveInteger;
-  typedef integer nonNegativeInteger;
-  typedef nonNegativeInteger positiveInteger;
-  typedef nonPositiveInteger negativeInteger;
-
-
-  typedef XSCRT::FundamentalType<bool> boolean;
-
-  typedef XSCRT::FundamentalType<float> float_;
-  typedef XSCRT::FundamentalType<double> double_;
-
-  // Just to make GCC 3.3 and other broken compilers shutup.
-  //
-  using std::basic_string;
-
-
-  template <typename C>
-  class string : public XSCRT::Type, public basic_string<C>
-  {
-  protected:
-    typedef basic_string<C> Base__ ;
-
-  public:
-
-    //@@ VC6 does not inject XSCRT::Type into the scope so I have
-    //   to qualify it all the time.
-    //
-
-    string ()
-    {
-    }
-
-    string (XSCRT::XML::Element<C> const& e)
-        : Base__ (e.value ())
-    {
-    }
-
-    string (XSCRT::XML::Attribute<C> const& a)
-        : Base__ (a.value ())
-    {
-    }
-
-    string (Base__ const& x)
-        : Base__ (x)
-    {
-    }
-
-    string&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-
-  template <typename C>
-  class normalizedString : public string<C>
-  {
-  protected:
-    typedef typename string<C>::Base__ Base__;
-
-  public:
-    normalizedString ()
-    {
-    }
-
-    normalizedString (XSCRT::XML::Element<C> const& e)
-        : string<C> (e)
-    {
-    }
-
-    normalizedString (XSCRT::XML::Attribute<C> const& a)
-        : string<C> (a)
-    {
-    }
-
-    normalizedString (Base__ const& x)
-        : string<C> (x)
-    {
-    }
-
-    normalizedString&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-
-  template <typename C>
-  class token : public normalizedString<C>
-  {
-  protected:
-    typedef typename normalizedString<C>::Base__ Base__;
-
-  public:
-    token ()
-    {
-    }
-
-    token (XSCRT::XML::Element<C> const& e)
-        : normalizedString<C> (e)
-    {
-    }
-
-    token (XSCRT::XML::Attribute<C> const& a)
-        : normalizedString<C> (a)
-    {
-    }
-
-    token (Base__ const& x)
-        : normalizedString<C> (x)
-    {
-    }
-
-    token&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-
-  template <typename C>
-  class NMTOKEN : public token<C>
-  {
-  protected:
-    typedef typename token<C>::Base__ Base__;
-
-  public:
-    NMTOKEN ()
-    {
-    }
-
-    NMTOKEN (XSCRT::XML::Element<C> const& e)
-        : token<C> (e)
-    {
-    }
-
-    NMTOKEN (XSCRT::XML::Attribute<C> const& a)
-        : token<C> (a)
-    {
-    }
-
-    NMTOKEN (Base__ const& x)
-        : token<C> (x)
-    {
-    }
-
-    NMTOKEN&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-  template <typename C>
-  class Name: public token<C>
-  {
-  protected:
-    typedef typename token<C>::Base__ Base__;
-
-  public:
-    Name()
-    {
-    }
-
-    Name(XSCRT::XML::Element<C> const& e)
-        : token<C> (e)
-    {
-    }
-
-    Name(XSCRT::XML::Attribute<C> const& a)
-        : token<C> (a)
-    {
-    }
-
-    Name(Base__ const& x)
-        : token<C> (x)
-    {
-    }
-
-    Name&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-
-  template <typename C>
-  class NCName: public Name<C>
-  {
-  protected:
-    typedef typename Name<C>::Base__ Base__;
-
-  public:
-    NCName()
-    {
-    }
-
-    NCName(XSCRT::XML::Element<C> const& e)
-        : Name<C> (e)
-    {
-    }
-
-    NCName(XSCRT::XML::Attribute<C> const& a)
-        : Name<C> (a)
-    {
-    }
-
-    NCName(Base__ const& x)
-        : Name<C> (x)
-    {
-    }
-
-    NCName&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-  template <typename C>
-  class QName: public Name<C>
-  {
-  protected:
-    typedef typename Name<C>::Base__ Base__;
-
-  public:
-    QName()
-    {
-    }
-
-    QName(XSCRT::XML::Element<C> const& e)
-        : Name<C> (e)
-    {
-    }
-
-    QName(XSCRT::XML::Attribute<C> const& a)
-        : Name<C> (a)
-    {
-    }
-
-    QName(Base__ const& x)
-        : Name<C> (x)
-    {
-    }
-
-    QName&
-    operator= (Base__ const& x)
-    {
-      static_cast<Base__&> (*this) = x;
-      return *this;
-    }
-  };
-
-  template <typename C>
-  struct IdentityProvider : XSCRT::IdentityProvider
-  {
-    IdentityProvider (NCName<C> const& id)
-        : id_ (id)
-    {
-    }
-
-    virtual bool
-    before (XSCRT::IdentityProvider const& y) const
-    {
-      return id_ < dynamic_cast<IdentityProvider const&> (y).id_;
-    }
-
-  private:
-    NCName<C> const& id_;
-
-  private:
-    IdentityProvider (IdentityProvider const&);
-
-    IdentityProvider&
-    operator= (IdentityProvider const&);
-  };
-
-
-  template <typename C>
-  class ID : public NCName<C>
-  {
-  protected:
-    typedef typename NCName<C>::Base__ Base__;
-
-  public:
-    ~ID()
-    {
-      unregister_id ();
-    }
-
-    ID ()
-        : id_provider_ (*this)
-    {
-    }
-
-    ID (XSCRT::XML::Element<C> const& e)
-        : NCName<C> (e), id_provider_ (*this)
-    {
-    }
-
-    ID (XSCRT::XML::Attribute<C> const& a)
-        : NCName<C> (a), id_provider_ (*this)
-    {
-    }
-
-    ID (ID const& x)
-        :  NCName<C> (x), id_provider_ (*this)
-    {
-    }
-
-    ID (Base__ const& x)
-        :  NCName<C> (x), id_provider_ (*this)
-    {
-    }
-
-    ID&
-    operator= (Base__ const& x)
-    {
-      unregister_id ();
-
-      static_cast<NCName<C>&>(*this) = x;
-
-      register_id ();
-
-      return *this;
-    }
-
-    ID&
-    operator= (ID const& x)
-    {
-      unregister_id ();
-
-      static_cast<NCName<C>&>(*this) = static_cast<NCName<C> const&>(x);
-
-      register_id ();
-
-      return *this;
-    }
-
-  public:
-    using NCName<C>::container;
-
-    virtual void
-    container (XSCRT::Type* c)
-    {
-      unregister_id ();
-
-      NCName<C>::container (c);
-
-      register_id ();
-    }
-
-  private:
-    using NCName<C>::empty;
-    using NCName<C>::root;
-
-    void
-    register_id ()
-    {
-      if (container () != this && !empty ())
-      {
-        //std::wcerr << "registering " << container ()
-        //           << " as '" << *this
-        //           << "' on " << container () << std::endl;
-        container ()->register_id (id_provider_, container ());
-      }
-    }
-
-    void
-    unregister_id ()
-    {
-      if (container () != this && !empty ())
-      {
-        //std::wcerr << "un-registering " << container ()
-        //           << " as '" << *this
-        //           << "' on " << container () << std::endl;
-        container ()->unregister_id (id_provider_);
-      }
-    }
-
-  private:
-    IdentityProvider<C> id_provider_;
-  };
-
-  struct IDREF_Base : public XSCRT::Type
-  {
-    virtual XSCRT::Type*
-    get () const = 0;
-  };
-
-  template <typename C>
-  class IDREF : public IDREF_Base
-  {
-  public:
-    IDREF ()
-        : id_provider_ (id_)
-    {
-    }
-
-    IDREF (XSCRT::XML::Element<C> const& e)
-        : id_ (e), id_provider_ (id_)
-    {
-    }
-
-    IDREF (XSCRT::XML::Attribute<C> const& a)
-        : id_ (a), id_provider_ (id_)
-    {
-    }
-
-    IDREF (IDREF const& x)
-        : id_ (x.id_), id_provider_ (id_)
-    {
-    }
-
-    IDREF (basic_string<C> const& id)
-        : id_ (id), id_provider_ (id_)
-    {
-    }
-
-    IDREF&
-    operator= (IDREF const& x)
-    {
-      id_ = x.id_;
-      return *this;
-    }
-
-    IDREF&
-    operator= (basic_string<C> const& x)
-    {
-      id_ = x;
-      return *this;
-    }
-
-  public:
-    XSCRT::Type*
-    operator-> () const
-    {
-      return get ();
-    }
-
-    XSCRT::Type&
-    operator* () const
-    {
-      return *(get ());
-    }
-
-    virtual XSCRT::Type*
-    get () const
-    {
-      if (!id_.empty () && container () != this)
-      {
-        return root ()->lookup_id (id_provider_);
-      }
-      else
-      {
-        return 0;
-      }
-    }
-
-    // conversion to bool
-    //
-    typedef XSCRT::Type* (IDREF::*bool_convertable)() const;
-
-    operator bool_convertable () const
-    {
-      return get () ? &IDREF::operator-> : 0;
-    }
-
-  private:
-    NCName<C> id_;
-    IdentityProvider<C> id_provider_;
-  };
-}
-
-// Traversal
-//
-//
-
-#include "ace/XML_Utils/XSCRT/Traversal.hpp"
-
-namespace XMLSchema
-{
-  namespace Traversal
-  {
-    template <typename T>
-    struct Traverser : XSCRT::Traversal::Traverser<T, XSCRT::Type>,
-                       XSCRT::Traversal::Traverser<IDREF_Base, XSCRT::Type>
-    {
-      typedef
-      T
-      Type;
-
-      virtual void
-      traverse (XMLSchema::IDREF_Base& r)
-      {
-        if (r.get ()) dispatch (*(r.get ()));
-      }
-    };
-
-    typedef Traverser<byte> byte;
-    typedef Traverser<unsignedByte> unsignedByte;
-
-    typedef Traverser<short_> short_;
-    typedef Traverser<unsignedShort> unsignedShort;
-
-    typedef Traverser<int_> int_;
-    typedef Traverser<unsignedInt> unsignedInt;
-
-    typedef Traverser<long_> long_;
-    typedef Traverser<unsignedLong> unsignedLong;
-
-    typedef Traverser<boolean> boolean;
-
-    typedef Traverser<float_> float_;
-    typedef Traverser<double_> double_;
-
-    template <typename C>
-    struct string : Traverser<XMLSchema::string<C> >
-    {
-    };
-
-    template <typename C>
-    struct ID : Traverser<XMLSchema::ID<C> >
-    {
-    };
-  }
-}
-
-
-// ExtendedTypeInfo for XML Schema types
-//
-//
-
-#include "ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp"
-
-namespace XMLSchema
-{
-  template <typename C>
-  struct TypeInfoInitializer
-  {
-    TypeInfoInitializer (XSCRT::ExtendedTypeInfoMap&);
-  };
-}
-
-#include "ace/XML_Utils/XSCRT/XMLSchema.ipp"
-#include "ace/XML_Utils/XSCRT/XMLSchema.tpp"
-
-#endif  // XSCRT_XMLSCHEMA_HPP
diff --git a/dep/acelite/ace/XML_Utils/XercesString.cpp b/dep/acelite/ace/XML_Utils/XercesString.cpp
deleted file mode 100644
index 41cfa49d9..000000000
--- a/dep/acelite/ace/XML_Utils/XercesString.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-// $Id: XercesString.cpp 95760 2012-05-15 13:46:19Z msmit $
-
-#include <ostream>
-#include <algorithm>
-
-#include "XercesString.h"
-#include "xercesc/util/PlatformUtils.hpp"
-
-using xercesc::XMLString;
-using xercesc::XMLPlatformUtils;
-
-namespace XML
-{
-// On unicode windows, ACE_TCHAR == XMLCh
-#if !defined (_MSC_VER) || !defined (ACE_USES_WCHAR)
-  XStr::XStr (const ACE_TCHAR* str)
-    : _wstr(0)
-  {
-    _wstr = XMLString::transcode(ACE_TEXT_ALWAYS_CHAR (str));
-  }
-#endif
-
-  XStr::XStr (XMLCh *wstr)
-    : _wstr(wstr)
-  {
-
-  }
-
-  XStr::XStr (const XMLCh* wstr)
-    : _wstr(0)
-  {
-    _wstr = XMLString::replicate(wstr);
-  }
-
-  XStr::XStr (const XStr &right)
-    : _wstr(0)
-  {
-    _wstr = XMLString::replicate(right._wstr);
-  }
-
-  XStr& XStr::operator= (const XStr& rhs)
-  {
-    if (&rhs == this)
-      return *this;
-    XStr temp (rhs);
-    std::swap (this->_wstr, temp._wstr);
-    return *this;
-  }
-
-  XStr::~XStr ()
-  {
-    this->reset ();
-  }
-
-  const XMLCh* XStr::begin () const
-  {
-    return _wstr;
-  }
-
-  const XMLCh* XStr::end () const
-  {
-    return _wstr + size();
-  }
-
-  bool XStr::append(const XMLCh *tail)
-  {
-    int iTailLen = XMLString::stringLen(tail);
-    int iWorkLen = XMLString::stringLen(_wstr);
-
-    XMLSize_t bytes = (iWorkLen + iTailLen + 1) * sizeof (XMLCh);
-    void *tmp = XMLPlatformUtils::fgMemoryManager->allocate (bytes);
-    XMLCh *result = reinterpret_cast<XMLCh *> (tmp);
-
-    bool bOK = result != 0;
-    if (bOK)
-      {
-        XMLCh *target = result;
-        XMLString::moveChars(target, _wstr, iWorkLen);
-        target += iWorkLen;
-        XMLString::moveChars(target, tail, iTailLen);
-        target += iTailLen;
-        *target++ = 0;
-        XMLString::release(&_wstr);
-        _wstr = result;
-      }
-    return bOK;
-  }
-
-  bool XStr::erase(const XMLCh *head, const XMLCh *tail)
-  {
-    bool bOK = head <= tail && head >= begin() && tail <= end();
-    if (bOK)
-      {
-        XMLSize_t bytes = (size() - (tail - head) + 1 ) * sizeof (XMLCh);
-        void *tmp = XMLPlatformUtils::fgMemoryManager->allocate (bytes);
-        XMLCh *result = reinterpret_cast<XMLCh *> (tmp);
-
-        XMLCh *target = result;
-        bOK = target != 0;
-        if (bOK)
-          {
-            const XMLCh *cursor = begin();
-
-            while (cursor != head) *target++ = *cursor++;
-            cursor = tail;
-            while ( cursor != end() ) *target++ = *cursor++;
-            *target ++ = 0;
-            XMLString::release(&_wstr);
-            _wstr = result;
-          }
-      }
-    return bOK;
-  }
-
-  int XStr::size () const
-  {
-    return XMLString::stringLen(_wstr);
-  }
-
-  XMLCh XStr::operator [] (const int i)
-  {
-    return _wstr[i];
-  }
-
-  XMLCh XStr::operator [] (const int i) const
-  {
-    return _wstr[i];
-  }
-
-  XMLCh * XStr::release (void)
-  {
-    XMLCh* tmp = _wstr;
-    this->_wstr = 0;
-    return tmp;
-  }
-
-  void
-  XStr::reset (void)
-  {
-    if (_wstr)
-      XMLString::release(&_wstr);
-    _wstr = 0;
-  }
-
-  bool operator== (const XStr& lhs, const XStr& rhs)
-  {
-    return XMLString::compareIString (lhs,rhs) == 0;
-  }
-
-  bool operator!= (const XStr& lhs, const XStr& rhs)
-  {
-    return !operator==(lhs, rhs);
-  }
-
-
-  std::ostream&
-  operator<< (std::ostream& o, XStr const& str)
-  {
-    char* s = XMLString::transcode (str);
-
-    o << s;
-
-    XMLString::release (&s); // idiots?
-    return o;
-  }
-
-}
diff --git a/dep/acelite/ace/XML_Utils/XercesString.h b/dep/acelite/ace/XML_Utils/XercesString.h
deleted file mode 100644
index 7073184a4..000000000
--- a/dep/acelite/ace/XML_Utils/XercesString.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// $Id: XercesString.h 95760 2012-05-15 13:46:19Z msmit $
-
-#ifndef _XERCESSTRING_H
-#define _XERCESSTRING_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <iosfwd>
-
-#ifdef __BORLANDC__
-using std::memcpy;
-#endif
-
-#include <xercesc/util/XMLString.hpp>
-
-// Utility class that provides a std::string like facade to XMLString.
-// Doesn't implement all of the methods of std::string.
-#include "XML_Utils_Export.h"
-
-namespace XML
-{
-  class XML_Utils_Export XStr
-  {
-  public:
-    XStr() : _wstr(0L) { };
-
-// On unicode windows, ACE_TCHAR == XMLCh
-#if !defined (_MSC_VER) || !defined (ACE_USES_WCHAR)
-    XStr (const ACE_TCHAR* str);
-#endif
-
-    XStr (XMLCh* wstr);
-
-    XStr (const XMLCh* wstr);
-
-    XStr (const XStr& copy);
-
-    XStr& operator= (const XStr& rhs);
-
-    ~XStr();
-
-    const XMLCh* begin() const;
-
-    const XMLCh* end() const;
-
-    bool append(const XMLCh* tail);
-
-    bool erase (const XMLCh* head, const XMLCh* tail);
-
-    int size() const;
-
-    XMLCh operator [] (const int i);
-
-    XMLCh operator [] (const int i) const;
-
-    operator const XMLCh* () const { return _wstr; };
-
-    XMLCh * release (void);
-
-    /// Release the held string and free its memory.
-    void reset (void);
-  private:
-
-    XMLCh* _wstr; // Internal representation
-
-  };
-
-  XML_Utils_Export bool operator== (const XStr& lhs, const XStr& rhs);
-  XML_Utils_Export bool operator!= (const XStr& lhs, const XStr& rhs);
-
-  XML_Utils_Export std::ostream&
-  operator<< (std::ostream& o, XStr const& str);
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* _XERCESSTRING_H */
diff --git a/dep/acelite/ace/XTI_ATM_Mcast.inl b/dep/acelite/ace/XTI_ATM_Mcast.inl
index b182bb41b..de408a6a1 100644
--- a/dep/acelite/ace/XTI_ATM_Mcast.inl
+++ b/dep/acelite/ace/XTI_ATM_Mcast.inl
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: XTI_ATM_Mcast.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: XTI_ATM_Mcast.inl 96985 2013-04-11 15:50:32Z huangh $
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -24,7 +24,7 @@ ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream,
            info, rw_flag,
            udata, opt) == ACE_INVALID_HANDLE
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream")));
+    ACELIB_ERROR ((LM_ERROR,  ACE_TEXT ("%p\n"),  ACE_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream")));
 }
 
 // Connect the <new_stream> to the <remote_sap>, waiting up to
diff --git a/dep/acelite/ace/XtReactor/ACE_XtReactor_export.h b/dep/acelite/ace/XtReactor/ACE_XtReactor_export.h
deleted file mode 100644
index 323355be7..000000000
--- a/dep/acelite/ace/XtReactor/ACE_XtReactor_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id: ACE_XtReactor_export.h 80826 2008-03-04 14:51:23Z wotte $
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s ACE_XtReactor
-// ------------------------------
-#ifndef ACE_XTREACTOR_EXPORT_H
-#define ACE_XTREACTOR_EXPORT_H
-
-#include /**/ "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_XTREACTOR_HAS_DLL)
-#  define ACE_XTREACTOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_XTREACTOR_HAS_DLL */
-
-#if !defined (ACE_XTREACTOR_HAS_DLL)
-#  define ACE_XTREACTOR_HAS_DLL 1
-#endif /* ! ACE_XTREACTOR_HAS_DLL */
-
-#if defined (ACE_XTREACTOR_HAS_DLL) && (ACE_XTREACTOR_HAS_DLL == 1)
-#  if defined (ACE_XTREACTOR_BUILD_DLL)
-#    define ACE_XtReactor_Export ACE_Proper_Export_Flag
-#    define ACE_XTREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ACE_XTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ACE_XTREACTOR_BUILD_DLL */
-#    define ACE_XtReactor_Export ACE_Proper_Import_Flag
-#    define ACE_XTREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ACE_XTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ACE_XTREACTOR_BUILD_DLL */
-#else /* ACE_XTREACTOR_HAS_DLL == 1 */
-#  define ACE_XtReactor_Export
-#  define ACE_XTREACTOR_SINGLETON_DECLARATION(T)
-#  define ACE_XTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ACE_XTREACTOR_HAS_DLL == 1 */
-
-// Set ACE_XTREACTOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ACE_XTREACTOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ACE_XTREACTOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ACE_XTREACTOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ACE_XTREACTOR_NTRACE */
-
-#if (ACE_XTREACTOR_NTRACE == 1)
-#  define ACE_XTREACTOR_TRACE(X)
-#else /* (ACE_XTREACTOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define ACE_XTREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (ACE_XTREACTOR_NTRACE == 1) */
-
-#endif /* ACE_XTREACTOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/dep/acelite/ace/XtReactor/XtReactor.cpp b/dep/acelite/ace/XtReactor/XtReactor.cpp
deleted file mode 100644
index 1233a304d..000000000
--- a/dep/acelite/ace/XtReactor/XtReactor.cpp
+++ /dev/null
@@ -1,468 +0,0 @@
-// $Id: XtReactor.cpp 95528 2012-02-07 12:57:33Z johnnyw $
-
-#include "ace/XtReactor/XtReactor.h"
-
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Connector.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE (ACE_XtReactor)
-
-// Must be called with lock held
-ACE_XtReactor::ACE_XtReactor (XtAppContext context,
-                              size_t size,
-                              bool restart,
-                              ACE_Sig_Handler *h)
-  : ACE_Select_Reactor (size, restart, h),
-    context_ (context),
-    ids_ (0),
-    timeout_ (0)
-{
-  // When the ACE_Select_Reactor is constructed it creates the notify
-  // pipe and registers it with the register_handler_i() method. The
-  // XtReactor overloads this method BUT because the
-  // register_handler_i occurs when constructing the base class
-  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
-  // is called not the XtReactor register_handler_i().  This means
-  // that the notify pipe is registered with the ACE_Select_Reactor
-  // event handling code not the XtReactor and so notfications don't
-  // work.  To get around this we simply close and re-opened the
-  // notification handler in the constructor of the XtReactor.
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  this->notify_handler_->close ();
-  this->notify_handler_->open (this, 0);
-#endif /* ACE_MT_SAFE */
-}
-
-ACE_XtReactor::~ACE_XtReactor (void)
-{
-  // Delete the remaining items in the linked list.
-
-  while (this->ids_)
-    {
-      ACE_XtReactorID *XtID = this->ids_->next_;
-      delete this->ids_;
-      this->ids_ = XtID;
-    }
-}
-
-// This is just the <wait_for_multiple_events> from ace/Reactor.cpp
-// but we use the Xt functions to wait for an event, not <select>
-
-int
-ACE_XtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-                                         ACE_Time_Value *max_wait_time)
-{
-  ACE_TRACE ("ACE_XtReactor::wait_for_multiple_events");
-  int nfound;
-
-  do
-    {
-      max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
-
-      size_t width = this->handler_rep_.max_handlep1 ();
-      handle_set.rd_mask_ = this->wait_set_.rd_mask_;
-      handle_set.wr_mask_ = this->wait_set_.wr_mask_;
-      handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-      nfound = XtWaitForMultipleEvents (width,
-                                        handle_set,
-                                        max_wait_time);
-
-    } while (nfound == -1 && this->handle_error () > 0);
-
-  if (nfound > 0)
-    {
-#if !defined (ACE_WIN32)
-      handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
-#endif /* ACE_WIN32 */
-    }
-  return nfound; // Timed out or input available
-}
-
-void
-ACE_XtReactor::TimerCallbackProc (XtPointer closure, XtIntervalId * /* id */)
-{
-  ACE_XtReactor *self = (ACE_XtReactor *) closure;
-  self->timeout_ = 0;
-
-  // Deal with any timer events
-  ACE_Select_Reactor_Handle_Set handle_set;
-  self->dispatch (0, handle_set);
-  self->reset_timeout ();
-}
-
-// This could be made shorter if we know which *kind* of event we were
-// about to get.  Here we use <select> to find out which one might be
-// available.
-
-void
-ACE_XtReactor::InputCallbackProc (XtPointer closure,
-                                  int *source,
-                                  XtInputId *)
-{
-  ACE_XtReactor *self = (ACE_XtReactor *) closure;
-  ACE_HANDLE handle = (ACE_HANDLE) *source;
-
-  // my copy isn't const.
-  ACE_Time_Value zero = ACE_Time_Value::zero;
-
-  ACE_Select_Reactor_Handle_Set wait_set;
-
-  // Deal with one file event.
-
-  // - read which kind of event
-  if (self->wait_set_.rd_mask_.is_set (handle))
-    wait_set.rd_mask_.set_bit (handle);
-  if (self->wait_set_.wr_mask_.is_set (handle))
-    wait_set.wr_mask_.set_bit (handle);
-  if (self->wait_set_.ex_mask_.is_set (handle))
-    wait_set.ex_mask_.set_bit (handle);
-
-  int result = ACE_OS::select (*source + 1,
-                               wait_set.rd_mask_,
-                               wait_set.wr_mask_,
-                               wait_set.ex_mask_, &zero);
-
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  // - Use only that one file event (removes events for other files).
-  if (result > 0)
-    {
-      if (wait_set.rd_mask_.is_set (handle))
-        dispatch_set.rd_mask_.set_bit (handle);
-      if (wait_set.wr_mask_.is_set (handle))
-        dispatch_set.wr_mask_.set_bit (handle);
-      if (wait_set.ex_mask_.is_set (handle))
-        dispatch_set.ex_mask_.set_bit (handle);
-
-      self->dispatch (1, dispatch_set);
-    }
-}
-
-int
-ACE_XtReactor::XtWaitForMultipleEvents (int width,
-                                        ACE_Select_Reactor_Handle_Set &wait_set,
-                                        ACE_Time_Value *)
-{
-  // Make sure we have a valid context
-  ACE_ASSERT (this->context_ != 0);
-
-  // Check to make sure our handle's are all usable.
-  ACE_Select_Reactor_Handle_Set temp_set = wait_set;
-
-  if (ACE_OS::select (width,
-                      temp_set.rd_mask_,
-                      temp_set.wr_mask_,
-                      temp_set.ex_mask_,
-                      (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-    return -1; // Bad file arguments...
-
-  // Instead of waiting using <select>, just use the Xt mechanism to
-  // wait for a single event.
-
-  // Wait for something to happen.
-  ::XtAppProcessEvent (this->context_, XtIMAll);
-
-  // Reset the width, in case it changed during the upcalls.
-  width = this->handler_rep_.max_handlep1 ();
-
-  // Now actually read the result needed by the <Select_Reactor> using
-  // <select>.
-  return ACE_OS::select (width,
-                         wait_set.rd_mask_,
-                         wait_set.wr_mask_,
-                         wait_set.ex_mask_,
-                         (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-XtAppContext
-ACE_XtReactor::context (void) const
-{
-  return this->context_;
-}
-
-void
-ACE_XtReactor::context (XtAppContext context)
-{
-  this->context_ = context;
-}
-
-int
-ACE_XtReactor::register_handler_i (ACE_HANDLE handle,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_XtReactor::register_handler_i");
-
-  // Make sure we have a valid context
-  ACE_ASSERT (this->context_ != 0);
-
-#if defined ACE_WIN32
-  // Let's handle this special case before we do any real work.
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_NOTSUP_RETURN(-1);
-#endif /* ACE_WIN32 */
-
-  int result = ACE_Select_Reactor::register_handler_i (handle,
-                                                       handler, mask);
-  if (result == -1)
-    return -1;
-
-  synchronize_XtInput (handle);
-  return 0;
-}
-
-int
-ACE_XtReactor::register_handler_i (const ACE_Handle_Set &handles,
-                                   ACE_Event_Handler *handler,
-                                   ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::register_handler_i (handles,
-                                                 handler,
-                                                 mask);
-}
-
-int
-ACE_XtReactor::remove_handler_i (ACE_HANDLE handle,
-                                 ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_XtReactor::remove_handler_i");
-
-  int result  = ACE_Select_Reactor::remove_handler_i (handle,
-                                                      mask);
-  if (result == -1)
-    return -1;
-
-  synchronize_XtInput (handle);
-  return 0;
-}
-
-int
-ACE_XtReactor::remove_handler_i (const ACE_Handle_Set &handles,
-                                 ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::remove_handler_i (handles,
-                                               mask);
-}
-
-int
-ACE_XtReactor::suspend_i (ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_XtReactor::suspend_i");
-
-  int result  = ACE_Select_Reactor::suspend_i (handle);
-
-  if (result == -1)
-    return -1;
-
-  synchronize_XtInput (handle);
-  return 0;
-}
-
-int
-ACE_XtReactor::resume_i (ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_XtReactor::resume_i");
-
-  int result  =  ACE_Select_Reactor::resume_i (handle);
-
-  if (result == -1)
-    return -1;
-
-  synchronize_XtInput (handle);
-  return 0;
-}
-
-void
-ACE_XtReactor::synchronize_XtInput(ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_XtReactor::synchronize_XtInput");
-
-  // The idea here is to call this function after the base class has
-  // processed the register/remove/suspend/resume_handler request. The
-  // resulting mask is used to find out which XtInput mask we need.
-
-  // Find existing handler in linked list.
-  ACE_XtReactorID **XtID = &(this->ids_);
-
-  while (*XtID && (*XtID)->handle_ != handle)
-    XtID = &((*XtID)->next_);
-
-  // Remove existing input handler.
-  if (*XtID)
-    ::XtRemoveInput ((*XtID)->id_);
-
-  int condition = compute_Xt_condition (handle);
-
-  if (condition == 0) // No input handler needed.
-    {
-      if (*XtID)
-        {
-          // Remove linked list entry.
-          ACE_XtReactorID *toDelete  = *XtID;
-          *XtID = (*XtID)->next_;
-          delete toDelete;
-        }
-      return;
-    }
-
-  if (*XtID == 0)
-    {
-      // Create new node.
-      ACE_XtReactorID *tmp = new ACE_XtReactorID;
-      tmp->next_ = this->ids_;
-      tmp->handle_ = handle;
-      this->ids_ = tmp;
-      XtID = &(this->ids_);
-    }
-
-  // Finally, add input handler.
-  (*XtID)->id_ = ::XtAppAddInput (this->context_,
-                                  (int) handle,
-                                  reinterpret_cast <XtPointer> (condition),
-                                  InputCallbackProc,
-                                  (XtPointer) this);
-}
-
-int
-ACE_XtReactor::compute_Xt_condition(ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_XtReactor::compute_Xt_condition");
-
-  // Retrieve current wait mask from base class.
-  // The returned value is either a combination of READ/WRITE/EXCEPT_MASK
-  // or -1.
-  int mask =this->bit_ops(handle,
-                          0,
-                          this->wait_set_,
-                          ACE_Reactor::GET_MASK);
-
-  if (mask == -1) // No active mask.
-    return 0;
-
- int condition = 0;
-
-#if !defined ACE_WIN32
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, XtInputReadMask);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, XtInputWriteMask);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_SET_BITS (condition, XtInputExceptMask);
-#else
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, XtInputReadWinsock);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, XtInputWriteWinsock);
-  // EXCEPT_MASK is not supported for WIN32. As this was
-  // already handled in register_handler_i, no check here.
-#endif /* !ACE_WIN32 */
-
-  return condition;
-}
-
-// The following functions ensure that there is an Xt timeout for the
-// first timeout in the Reactor's Timer_Queue.
-
-void
-ACE_XtReactor::reset_timeout (void)
-{
-  // Make sure we have a valid context
-  ACE_ASSERT (this->context_ != 0);
-
-  if (timeout_)
-    ::XtRemoveTimeOut (timeout_);
-  timeout_ = 0;
-
-  ACE_Time_Value *max_wait_time =
-    this->timer_queue_->calculate_timeout (0);
-
-  if (max_wait_time)
-    timeout_ = ::XtAppAddTimeOut (this->context_,
-                                  max_wait_time->msec (),
-                                  TimerCallbackProc,
-                                  (XtPointer) this);
-}
-
-int
-ACE_XtReactor::reset_timer_interval
-  (long timer_id,
-   const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_XtReactor::reset_timer_interval");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  int const result = ACE_Select_Reactor::timer_queue_->reset_interval
-    (timer_id,
-     interval);
-
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-long
-ACE_XtReactor::schedule_timer (ACE_Event_Handler *event_handler,
-                const void *arg,
-                const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_XtReactor::schedule_timer");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  long const result = ACE_Select_Reactor::schedule_timer (event_handler,
-                                                          arg,
-                                                          delay,
-                                                          interval);
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-int
-ACE_XtReactor::cancel_timer (ACE_Event_Handler *handler,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_XtReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (handler,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-int
-ACE_XtReactor::cancel_timer (long timer_id,
-                             const void **arg,
-                             int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_XtReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (timer_id,
-                                        arg,
-                                        dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/dep/acelite/ace/XtReactor/XtReactor.h b/dep/acelite/ace/XtReactor/XtReactor.h
deleted file mode 100644
index a4082f0d3..000000000
--- a/dep/acelite/ace/XtReactor/XtReactor.h
+++ /dev/null
@@ -1,147 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    XtReactor.h
- *
- *  $Id: XtReactor.h 91743 2010-09-13 18:24:51Z johnnyw $
- *
- *  @author Eric C. Newton <ecn@clark.net>
- *  @author Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch>
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef ACE_XTREACTOR_H
-#define ACE_XTREACTOR_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "ace/XtReactor/ACE_XtReactor_export.h"
-#include "ace/Select_Reactor.h"
-
-#include /**/ <X11/Intrinsic.h>
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_XtReactorID
- *
- * @brief This little class is necessary due to the way that Microsoft
- * implements sockets to be pointers rather than indices.
- */
-class ACE_XtReactor_Export ACE_XtReactorID
-{
-public:
-  /// Magic cookie.
-  XtInputId id_;
-
-  /// Underlying handle.
-  ACE_HANDLE handle_;
-
-  /// Pointer to next node in the linked list.
-  ACE_XtReactorID *next_;
-};
-
-/**
- * @class ACE_XtReactor
- *
- * @brief An object-oriented event demultiplexor and event handler
- * dispatcher that uses the X Toolkit functions.
- */
-class ACE_XtReactor_Export ACE_XtReactor : public ACE_Select_Reactor
-{
-public:
-  // = Initialization and termination methods.
-  ACE_XtReactor (XtAppContext context = 0,
-                 size_t size = DEFAULT_SIZE,
-                 bool restart = false,
-                 ACE_Sig_Handler * = 0);
-  virtual ~ACE_XtReactor (void);
-
-  XtAppContext context (void) const;
-  void context (XtAppContext);
-
-  // = Timer operations.
-  virtual long schedule_timer (ACE_Event_Handler *event_handler,
-                               const void *arg,
-                               const ACE_Time_Value &delay,
-                               const ACE_Time_Value &interval);
-  virtual int reset_timer_interval (long timer_id,
-                                    const ACE_Time_Value &interval);
-  virtual int cancel_timer (ACE_Event_Handler *handler,
-                            int dont_call_handle_close = 1);
-
-  virtual int cancel_timer (long timer_id,
-                            const void **arg = 0,
-                            int dont_call_handle_close = 1);
-
-protected:
-  // = Register timers/handles with Xt.
-  /// Register a single @a handler.
-  virtual int register_handler_i (ACE_HANDLE handle,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Register a set of <handlers>.
-  virtual int register_handler_i (const ACE_Handle_Set &handles,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-
-  /// Remove the @a handler associated with this @a handle.
-  virtual int remove_handler_i (ACE_HANDLE handle,
-                                ACE_Reactor_Mask mask);
-
-  /// Remove a set of <handles>.
-  virtual int remove_handler_i (const ACE_Handle_Set &handles,
-                                ACE_Reactor_Mask);
-
-  /// Suspend the <Event_Handler> associated with @a handle
-  virtual int suspend_i (ACE_HANDLE handle);
-
-  /// Resume the <Event_Handler> associated with @a handle
-  virtual int resume_i (ACE_HANDLE handle);
-
-  /// Synchronize XtInputHandler for @a handle
-  virtual void synchronize_XtInput(ACE_HANDLE handle);
-
-  /// Compute needed Xt condition by looking at base class wait set.
-  virtual int compute_Xt_condition(ACE_HANDLE handle);
-
-  /// Wait for events to occur.
-  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
-                                        ACE_Time_Value *);
-
-  ///Wait for Xt events to occur.
-  virtual int XtWaitForMultipleEvents (int,
-                                       ACE_Select_Reactor_Handle_Set &,
-                                       ACE_Time_Value *);
-
-  XtAppContext context_;
-  ACE_XtReactorID *ids_;
-  XtIntervalId timeout_;
-
-private:
-  /// This method ensures there's an Xt timeout for the first timeout
-  /// in the Reactor's Timer_Queue.
-  void reset_timeout (void);
-
-  // = Integrate with the X callback function mechanism.
-  static void TimerCallbackProc (XtPointer closure, XtIntervalId *id);
-  static void InputCallbackProc (XtPointer closure, int* source, XtInputId *id);
-
-  /// Deny access since member-wise won't work...
-  ACE_XtReactor (const ACE_XtReactor &);
-  ACE_XtReactor &operator = (const ACE_XtReactor &);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ACE_XTREACTOR_H */
diff --git a/dep/acelite/ace/ace.rc b/dep/acelite/ace/ace.rc
deleted file mode 100644
index 547924919..000000000
--- a/dep/acelite/ace/ace.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "Version.h"
-
-1 VERSIONINFO
- FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0
- PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "ACE\0"
-            VALUE "FileVersion", ACE_VERSION "\0"
-            VALUE "InternalName", "ACEDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "ACE.DLL\0"
-            VALUE "ProductName", "ACE\0"
-            VALUE "ProductVersion", ACE_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-/*
- * The following resource is used by the ACE logger to write messages
- * to the NT event log. If you are statically linking to the ACE
- * library, and you wish to use the NT event log, you should copy this
- * message table to your application's resource script.
- */
-1 MESSAGETABLE ace_message_table.bin
diff --git a/dep/acelite/ace/config-all.h b/dep/acelite/ace/config-all.h
index e19caec8e..5c0bf0934 100644
--- a/dep/acelite/ace/config-all.h
+++ b/dep/acelite/ace/config-all.h
@@ -4,7 +4,7 @@
 /**
  *  @file   config-all.h
  *
- *  $Id: config-all.h 84216 2009-01-22 18:34:40Z johnnyw $
+ *  $Id: config-all.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author (Originally in OS.h)Doug Schmidt <schmidt@cs.wustl.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/config-android.h b/dep/acelite/ace/config-android.h
index 26be6ffec..3608b826d 100644
--- a/dep/acelite/ace/config-android.h
+++ b/dep/acelite/ace/config-android.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: config-android.h 94491 2011-09-12 11:17:33Z johnnyw $
+// $Id: config-android.h 97439 2013-11-27 08:11:17Z msmit $
 
 // The following configuration file is designed to work for Android
 // platforms using GNU C++.
@@ -16,6 +16,8 @@
 # error __ANDROID_API__ must be defined
 #endif
 
+#define ACE_ANDROID
+
 #define ACE_HAS_SSIZE_T
 
 // system errorno is a volatile int
@@ -59,7 +61,6 @@
 #define ACE_LACKS_SEEKDIR
 #define ACE_LACKS_SEMBUF_T
 #define ACE_LACKS_SETINHERITSCHED
-#define ACE_LACKS_STD_WSTRING
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_SWAB
 #define ACE_LACKS_SYSV_SHMEM
@@ -86,34 +87,13 @@
 // Needed to differentiate between libc 5 and libc 6 (aka glibc).
 #include <features.h>
 
-#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500)
-#  define ACE_HAS_PTHREADS_UNIX98_EXT
-#endif /* _XOPEN_SOURCE - 0 >= 500 */
+#define ACE_HAS_PTHREADS_UNIX98_EXT
 
-# include "ace/config-posix.h"
+#include "ace/config-posix.h"
 
-#if !defined (ACE_LACKS_LINUX_NPTL)
-
-  // Temporary fix because NPTL kernels do have shm_open but there is a problem
-  // with shm_open/shm_unlink pairing in ACE which needs to be fixed when I have time.
-# if defined (ACE_HAS_SHM_OPEN)
-#   undef ACE_HAS_SHM_OPEN
-# endif /* ACE_HAS_SHM_OPEN */
-
-# if defined (ACE_USES_FIFO_SEM)
-    // Don't use this for Linux NPTL since this has complete
-    // POSIX semaphores which are more efficient
-#   undef ACE_USES_FIFO_SEM
-# endif /* ACE_USES_FIFO_SEM */
-
-# if defined (ACE_HAS_POSIX_SEM)
-    // Linux NPTL may not define the right POSIX macro
-    // but they have the actual runtime support for this stuff
-#   if !defined (ACE_HAS_POSIX_SEM_TIMEOUT) && (((_POSIX_C_SOURCE - 0) >= 200112L) || (_XOPEN_SOURCE >= 600))
-#     define ACE_HAS_POSIX_SEM_TIMEOUT
-#   endif /* !ACE_HAS_POSIX_SEM_TIMEOUT && (((_POSIX_C_SOURCE - 0) >= 200112L) || (_XOPEN_SOURCE >= 600)) */
-# endif /* ACE_HAS_POSIX_SEM */
-#endif /* !ACE_LACKS_LINUX_NPTL */
+// @todo JW, test if this works
+// #define ACE_HAS_POSIX_SEM
+// #define ACE_HAS_POSIX_SEM_TIMEOUT
 
 // AIO support pulls in the rt library, which pulls in the pthread
 // library.  Disable AIO in single-threaded builds.
@@ -124,17 +104,10 @@
 #endif
 
 // First the machine specific part
-
 #if defined (__powerpc__) || defined (__x86_64__)
 # if !defined (ACE_DEFAULT_BASE_ADDR)
 #   define ACE_DEFAULT_BASE_ADDR ((char *) 0x40000000)
 # endif /* ! ACE_DEFAULT_BASE_ADDR */
-#elif defined (__ia64)
-# if !defined (ACE_DEFAULT_BASE_ADDR)
-// Zero base address should work fine for Linux of IA-64: it just lets
-// the kernel to choose the right value.
-#   define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000000000000000)
-# endif /* ! ACE_DEFAULT_BASE_ADDR */
 #endif /* ! __powerpc__  && ! __ia64 */
 
 #define ACE_HAS_SIGINFO_T
@@ -162,6 +135,13 @@
   // this must appear before its #include.
 # define ACE_HAS_STRING_CLASS
 # include "ace/config-g++-common.h"
+
+# define ACE_HAS_CUSTOM_EXPORT_MACROS
+# define ACE_Proper_Export_Flag
+# define ACE_IMPORT_SINGLETON_DECLARATION(T) __extension__ extern template class T
+# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>;
+# define ACE_HAS_EXPLICIT_TEMPLATE_CLASS_INSTANTIATION
+
 #elif defined (__GNUC__)
 /**
  * GNU C compiler.
@@ -220,10 +200,7 @@
 #define ACE_HAS_BYTESWAP_H
 #define ACE_HAS_BSWAP_16
 #define ACE_HAS_BSWAP_32
-
-#if defined (__GNUC__)
-#  define ACE_HAS_BSWAP_64
-#endif
+#define ACE_HAS_BSWAP_64
 
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 
@@ -303,14 +280,6 @@
 
 #define ACE_SIZEOF_WCHAR 4
 
-#if defined (__powerpc__) && !defined (ACE_SIZEOF_LONG_DOUBLE)
-// 32bit PowerPC Linux uses 128bit long double
-# define ACE_SIZEOF_LONG_DOUBLE 16
-#endif
-
-#define ACE_LACKS_GETIPNODEBYADDR
-#define ACE_LACKS_GETIPNODEBYNAME
-
 // Platform has POSIX terminal interface.
 #define ACE_HAS_TERMIOS
 
@@ -321,6 +290,8 @@
 
 #define ACE_HAS_VASPRINTF
 
+#define ACE_LACKS_PTHREAD_SCOPE_PROCESS
+
 // According to man pages Linux uses different (compared to UNIX systems) types
 // for setting IP_MULTICAST_TTL and IPV6_MULTICAST_LOOP / IP_MULTICAST_LOOP
 // in setsockopt/getsockopt.
@@ -328,11 +299,8 @@
 #define ACE_HAS_IPV6_MULTICAST_LOOP_AS_BOOL 1
 #define ACE_HAS_IP_MULTICAST_LOOP_AS_INT 1
 
-#if defined (ACE_LACKS_NETWORKING)
-# include "ace/config-posix-nonetworking.h"
-#else
-# define ACE_HAS_NETLINK
-#endif
+#define ACE_HAS_NETLINK
+#define ACE_HAS_SIOCGIFCONF
 
 #if !defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO)
 // Detect if getsockname() and getpeername() returns random values in
@@ -363,15 +331,75 @@
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 #define ACE_HAS_REENTRANT_FUNCTIONS
 
-#if __ANDROID_API__ == 8
+#if __ANDROID_API__ >= 9
+# define ACE_HAS_TIMEZONE
+#endif
+
+#if __ANDROID_API__ < 14
+# define ACE_LACKS_STD_WSTRING
+# define ACE_LACKS_GETIPNODEBYADDR
+# define ACE_LACKS_GETIPNODEBYNAME
+#endif
+
+#if __ANDROID_API__ == 3
+# error Unsupported Android release 3
+#elif __ANDROID_API__ == 8
 # define ACE_LACKS_REGEX_H 1
 # define ACE_LACKS_CONDATTR 1
 #elif __ANDROID_API__ == 9
-# define ACE_HAS_TIMEZONE
+#elif __ANDROID_API__ == 14
 #else
 # error Unsupported Android release
 #endif
 
+#if !defined ACE_DEFAULT_TEMP_DIR
+# define ACE_DEFAULT_TEMP_DIR "/data/tmp"
+#endif
+
+#if !defined TEST_DIR
+# define TEST_DIR "/data"
+#endif
+
+#if !defined (ACE_AS_STATIC_LIBS)
+# if (__GNUC__ == 4 && __GNUC_MINOR__ == 4)
+#  error Shared library support is not possible with GCC 4.4.x
+# endif
+#endif
+
+// The defines listed below might give compile issues when
+// users declare one letter (IDL) methods. To prevent this,
+// these defines are undefined here.
+// The defines are declared in ctype.h and are used in
+// ctype_base.h as well. That's why <ostream> is included
+// as well.
+#include "ctype.h"
+#include <ostream>
+
+#if defined (_U)
+# undef _U
+#endif
+#if defined (_L)
+# undef _L
+#endif
+#if defined (_N)
+# undef _N
+#endif
+#if defined (_S)
+# undef _S
+#endif
+#if defined (_P)
+# undef _P
+#endif
+#if defined (_C)
+# undef _C
+#endif
+#if defined (_X)
+# undef _X
+#endif
+#if defined (_B)
+# undef _B
+#endif
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_CONFIG_ANDROID_H */
diff --git a/dep/acelite/ace/config-g++-common.h b/dep/acelite/ace/config-g++-common.h
index 6bd902d6e..c8a0f9405 100644
--- a/dep/acelite/ace/config-g++-common.h
+++ b/dep/acelite/ace/config-g++-common.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: config-g++-common.h 93500 2011-03-07 16:19:27Z vzykov $
+// $Id: config-g++-common.h 97874 2014-09-08 12:10:55Z johnnyw $
 
 // This configuration file is designed to be included by another,
 // specific configuration file.  It provides config information common
@@ -34,6 +34,15 @@
 #  define ACE_HAS_NEW_NOTHROW
 #endif /* __GNUC__ >= 3.3 */
 
+#if (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
+# if __cplusplus > 199711L
+#  define ACE_HAS_CPP11
+# endif
+# if __cplusplus > 201103L
+#  define ACE_HAS_CPP14
+# endif
+#endif
+
 #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
 # define ACE_SIZEOF_LONG_DOUBLE 12
 #endif /* i386 */
@@ -104,8 +113,12 @@
 #  ifndef ACE_HAS_CUSTOM_EXPORT_MACROS
 #    define ACE_HAS_CUSTOM_EXPORT_MACROS
 #  endif  /* !ACE_HAS_CUSTOM_EXPORT_MACROS */
-#  define ACE_Proper_Export_Flag __attribute__ ((visibility("default")))
-#  define ACE_Proper_Import_Flag __attribute__ ((visibility("default")))
+#  ifndef ACE_Proper_Export_Flag
+#    define ACE_Proper_Export_Flag __attribute__ ((visibility("default")))
+#  endif /* !ACE_Proper_Export_Flag */
+#  ifndef ACE_Proper_Import_Flag
+#    define ACE_Proper_Import_Flag __attribute__ ((visibility("default")))
+#  endif /* !ACE_Proper_Import_Flag */
 
 #  if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
 // Sadly, G++ 4.x silently ignores visibility attributes on
diff --git a/dep/acelite/ace/config-hpux-11.00.h b/dep/acelite/ace/config-hpux-11.00.h
index 4f16be93b..bb69bac1a 100644
--- a/dep/acelite/ace/config-hpux-11.00.h
+++ b/dep/acelite/ace/config-hpux-11.00.h
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-// $Id: config-hpux-11.00.h 96096 2012-08-23 12:34:02Z johnnyw $
+// $Id: config-hpux-11.00.h 97326 2013-09-11 07:52:09Z johnnyw $
 
 // The following configuration file is designed to work for HP
 // platforms running HP-UX 11.00 using aC++ or gcc (2.95 and up).
@@ -167,6 +167,8 @@
 #define ACE_LACKS_CLOCK_MONOTONIC
 #define ACE_LACKS_MONOTONIC_TIME
 
+#define ACE_LACKS_PTHREAD_SCOPE_PROCESS
+
 // Prototypes for both signal() and struct sigaction are consistent.
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 
@@ -231,10 +233,9 @@
 
 // HP-UX 11 has reentrant netdb functions.  The catch is that the old
 // functions (gethostbyname, etc.) are thread-safe and the _r versions are
-// not used and will be removed at some point.  So, define things so
-// the _r versions are not used.  This will slow things down a bit due to
-// the extra mutex lock in the ACE_NETDBCALL_RETURN macro, and will be fixed
-// in the future (problem ID P64).
+// obsolescent.  So, define things so the _r versions are not used.
+// OS_NS_netdb.inl ensures no funny lock games are played in the
+// ACE_NETDBCALL_RETURN macro.
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
 
 /* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */
diff --git a/dep/acelite/ace/config-icc-common.h b/dep/acelite/ace/config-icc-common.h
index d55447f70..2b860d3ea 100644
--- a/dep/acelite/ace/config-icc-common.h
+++ b/dep/acelite/ace/config-icc-common.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: config-icc-common.h 91685 2010-09-09 09:35:14Z johnnyw $
+// $Id: config-icc-common.h 97642 2014-03-05 14:43:41Z johnnyw $
 
 #ifndef ACE_LINUX_ICC_COMMON_H
 #define ACE_LINUX_ICC_COMMON_H
@@ -79,11 +79,6 @@
 # define ACE_HAS_INTEL_ASSEMBLY
 #endif
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-  // We define it with a -D with make depend.
-# define ACE_LACKS_PRAGMA_ONCE
-#endif /* ! ACE_LACKS_PRAGMA_ONCE */
-
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 
 #if (__INTEL_COMPILER >= 910)
@@ -97,5 +92,21 @@
 # define ACE_HAS_IA32INTRIN_H
 #endif
 
+// We assume that Intel C++ 15 and higher do have correct C++11 support when
+// it runs with GCC 4.7 or higher emulation mode
+#if (__INTEL_COMPILER > 1400) && defined (__INTEL_CXX11_MODE__)
+# if (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
+#  define ACE_HAS_CPP11
+# endif
+#endif
+
+// Intel C++ 14 Update 2 has correct C++11 support when it runs with GCC 4.7
+// or higher emulation mode
+#if (__INTEL_COMPILER == 1400) && (__INTEL_COMPILER_UPDATE >= 2) && defined (__INTEL_CXX11_MODE__)
+# if (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
+#  define ACE_HAS_CPP11
+# endif
+#endif
+
 #include /**/ "ace/post.h"
 #endif /* ACE_LINUX_ICC_COMMON_H */
diff --git a/dep/acelite/ace/config-kfreebsd.h b/dep/acelite/ace/config-kfreebsd.h
index 1f607d13e..427d9bc45 100644
--- a/dep/acelite/ace/config-kfreebsd.h
+++ b/dep/acelite/ace/config-kfreebsd.h
@@ -1,4 +1,4 @@
-// $Id: config-kfreebsd.h 93550 2011-03-15 21:26:56Z olli $
+// $Id: config-kfreebsd.h 97326 2013-09-11 07:52:09Z johnnyw $
 
 #ifndef ACE_CONFIG_KFREEBSD_H
 #define ACE_CONFIG_KFREEBSDH
@@ -290,7 +290,7 @@
 #define ACE_HAS_SYSCTL 1
 
 /* Platform supports System V IPC (most versions of UNIX, but not Win32) */
-#define ACE_HAS_SYSV_IPC 1
+#define ACE_HAS_SYSV_IPC
 
 /* Platform/compiler supports _sys_errlist symbol */
 #define ACE_HAS_SYS_ERRLIST 1
diff --git a/dep/acelite/ace/config-linux.h b/dep/acelite/ace/config-linux.h
index 7283136d0..05f34fac1 100644
--- a/dep/acelite/ace/config-linux.h
+++ b/dep/acelite/ace/config-linux.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: config-linux.h 96072 2012-08-17 12:29:59Z mcorino $
+// $Id: config-linux.h 97326 2013-09-11 07:52:09Z johnnyw $
 
 // The following configuration file is designed to work for Linux
 // platforms using GNU C++.
@@ -72,20 +72,21 @@
 
 #if defined (__powerpc__) || defined (__x86_64__)
 # if !defined (ACE_DEFAULT_BASE_ADDR)
-#   define ACE_DEFAULT_BASE_ADDR ((char *) 0x40000000)
+#   define ACE_DEFAULT_BASE_ADDR (reinterpret_cast< char* >(0x40000000))
 # endif /* ! ACE_DEFAULT_BASE_ADDR */
 #elif defined (__ia64)
 # if !defined (ACE_DEFAULT_BASE_ADDR)
 // Zero base address should work fine for Linux of IA-64: it just lets
 // the kernel to choose the right value.
-#   define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000000000000000)
+#   define ACE_DEFAULT_BASE_ADDR (reinterpret_cast< char*>(0x0000000000000000))
 # endif /* ! ACE_DEFAULT_BASE_ADDR */
 #endif /* ! __powerpc__  && ! __ia64 */
 
 // Then glibc/libc5 specific parts
 
-#if defined(__GLIBC__)
-# if (__GLIBC__  < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 3)
+#if defined(__GLIBC__) || defined (__INTEL_COMPILER)
+# if !defined (__INTEL_COMPILER) && \
+     (__GLIBC__  < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 3)
 #   define ACE_HAS_RUSAGE_WHO_ENUM enum __rusage_who
 #   define ACE_HAS_RLIMIT_RESOURCE_ENUM enum __rlimit_resource
 #   define ACE_LACKS_ISCTYPE
@@ -202,7 +203,7 @@
 #define ACE_HAS_3_PARAM_READDIR_R
 
 #if !defined (ACE_DEFAULT_BASE_ADDR)
-#  define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
+#  define ACE_DEFAULT_BASE_ADDR (reinterpret_cast< char* >(0x80000000))
 #endif /* ! ACE_DEFAULT_BASE_ADDR */
 
 #define ACE_HAS_ALLOCA
@@ -323,6 +324,8 @@
 # define ACE_SIZEOF_LONG_DOUBLE 16
 #endif
 
+#define ACE_LACKS_PTHREAD_SCOPE_PROCESS
+
 #define ACE_LACKS_GETIPNODEBYADDR
 #define ACE_LACKS_GETIPNODEBYNAME
 
@@ -355,13 +358,14 @@
 # define ACE_HAS_GETIFADDRS
 #endif
 
+#if !defined (ACE_LACKS_LINUX_VERSION_H)
+# include <linux/version.h>
+#endif /* !ACE_LACKS_LINUX_VERSION_H */
+
 #if !defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO)
 // Detect if getsockname() and getpeername() returns random values in
 // the sockaddr_in::sin_zero field by evaluation of the kernel
 // version. Since version 2.5.47 this problem is fixed.
-#  if !defined (ACE_LACKS_LINUX_VERSION_H)
-#    include <linux/version.h>
-#  endif /* !ACE_LACKS_LINUX_VERSION_H */
 #  if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,47))
 #    define ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO 0
 #  else
@@ -370,14 +374,16 @@
 #endif  /* ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO */
 
 #if !defined (ACE_HAS_EVENT_POLL) && !defined (ACE_HAS_DEV_POLL)
-# if !defined (ACE_LACKS_LINUX_VERSION_H)
-#  include <linux/version.h>
-# endif /* !ACE_LACKS_LINUX_VERSION_H */
 # if (LINUX_VERSION_CODE > KERNEL_VERSION (2,6,0))
 #  define ACE_HAS_EVENT_POLL
 # endif
 #endif
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,8))
+# define ACE_HAS_SCHED_GETAFFINITY 1
+# define ACE_HAS_SCHED_SETAFFINITY 1
+#endif
+
 // This is ghastly, but as long as there are platforms supported
 // which define the right POSIX macros but lack actual support
 // we have no choice.
diff --git a/dep/acelite/ace/config-lite.h b/dep/acelite/ace/config-lite.h
index 7c0fab03e..889eca80a 100644
--- a/dep/acelite/ace/config-lite.h
+++ b/dep/acelite/ace/config-lite.h
@@ -4,7 +4,7 @@
 /**
  *  @file   config-lite.h
  *
- *  $Id: config-lite.h 95867 2012-06-11 21:46:38Z mitza $
+ *  $Id: config-lite.h 97976 2014-11-13 11:36:14Z shuston $
  *
  *  @author (Originally in OS.h)Doug Schmidt <schmidt@cs.wustl.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
@@ -116,7 +116,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 // Once all C++ compilers support the standard reverse_iterator
 // adapters, we can drop this generator macro or at least drop the
 // MSVC++ or Sun Studio preprocessor conditional blocks.
-#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5120 \
+#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5130 \
       && !defined (_STLPORT_VERSION)
   // If we're not using the stlport4 C++ library (which has standard
   // iterators), we need to ensure this is included in order to test
@@ -131,7 +131,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
   typedef std::reverse_iterator<iterator, value_type> reverse_iterator; \
   typedef std::reverse_iterator<const_iterator, \
                                 value_type const> const_reverse_iterator;
-#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5120 \
+#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5130 \
       && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC)
 # define ACE_DECLARE_STL_REVERSE_ITERATORS \
   typedef std::reverse_iterator<iterator, \
diff --git a/dep/acelite/ace/config-macosx-iOS-hardware.h b/dep/acelite/ace/config-macosx-iOS-hardware.h
index 927dacd74..d2750bf44 100644
--- a/dep/acelite/ace/config-macosx-iOS-hardware.h
+++ b/dep/acelite/ace/config-macosx-iOS-hardware.h
@@ -1,11 +1,11 @@
-// $Id: config-macosx-iOS-hardware.h 95319 2011-12-13 14:54:44Z mhengstmengel $
+// $Id: config-macosx-iOS-hardware.h 97580 2014-02-11 17:56:01Z sowayaa $
 #ifndef ACE_CONFIG_MACOSX_IPHONE_HARDWARE_H
 #define ACE_CONFIG_MACOSX_IPHONE_HARDWARE_H
 
 #define ACE_HAS_IPHONE
 #define ACE_SIZEOF_LONG_DOUBLE 8
 
-#include "ace/config-macosx-lion.h"
+#include "ace/config-macosx-mavericks.h"
 
 #ifdef ACE_HAS_SYSV_IPC
 #undef ACE_HAS_SYSV_IPC
diff --git a/dep/acelite/ace/config-macosx-iOS-simulator.h b/dep/acelite/ace/config-macosx-iOS-simulator.h
index 73d7e90a1..ba1e98c41 100644
--- a/dep/acelite/ace/config-macosx-iOS-simulator.h
+++ b/dep/acelite/ace/config-macosx-iOS-simulator.h
@@ -1,9 +1,9 @@
-// $Id: config-macosx-iOS-simulator.h 94431 2011-08-31 11:36:49Z sowayaa $
+// $Id: config-macosx-iOS-simulator.h 97580 2014-02-11 17:56:01Z sowayaa $
 #ifndef ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H
 #define ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H
 
 #define ACE_HAS_IPHONE
-#include "ace/config-macosx-lion.h"
+#include "ace/config-macosx-mavericks.h"
 
 #endif /* ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H */
 
diff --git a/dep/acelite/ace/config-macosx-leopard.h b/dep/acelite/ace/config-macosx-leopard.h
index 42229ebd2..77de5236d 100644
--- a/dep/acelite/ace/config-macosx-leopard.h
+++ b/dep/acelite/ace/config-macosx-leopard.h
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-// $Id: config-macosx-leopard.h 96085 2012-08-21 02:48:37Z mesnier_p $
+// $Id: config-macosx-leopard.h 97737 2014-05-02 14:30:47Z mesnier_p $
 
 // This configuration file is designed to work with the MacOS X operating system.
 
@@ -87,6 +87,8 @@
 
 #define ACE_HAS_AIO_CALLS
 
+#define ACE_HAS_ICMP_SUPPORT 1
+
 //Platform supports sigsuspend()
 #define ACE_HAS_SIGSUSPEND
 
@@ -205,6 +207,9 @@
 #endif
 
 #define ACE_LACKS_CONDATTR_SETCLOCK
+#define ACE_LACKS_CLOCKID_T
+#define ACE_LACKS_CLOCK_MONOTONIC
+#define ACE_LACKS_CLOCK_REALTIME
 
 // dlcompat package (not part of base Darwin) is needed for dlopen().
 // You may download directly from sourceforge and install or use fink
diff --git a/dep/acelite/ace/config-macosx-lion.h b/dep/acelite/ace/config-macosx-lion.h
index e4a56ae4e..894cae45c 100644
--- a/dep/acelite/ace/config-macosx-lion.h
+++ b/dep/acelite/ace/config-macosx-lion.h
@@ -1,18 +1,28 @@
-// $Id: config-macosx-lion.h 94764 2011-10-15 01:02:57Z sowayaa $
+// $Id: config-macosx-lion.h 97667 2014-03-17 12:38:46Z johnnyw $
 #ifndef ACE_CONFIG_MACOSX_LION_H
 #define ACE_CONFIG_MACOSX_LION_H
 
-
 #include "ace/config-macosx-leopard.h"
 
 #ifdef __clang__
-#ifdef ACE_HAS_GCC_ATOMIC_BUILTINS
-#undef ACE_HAS_GCC_ATOMIC_BUILTINS
-#endif
+# ifdef ACE_HAS_GCC_ATOMIC_BUILTINS
+# undef ACE_HAS_GCC_ATOMIC_BUILTINS
+# endif
 
-#define ACE_ANY_OPS_USE_NAMESPACE
+# define ACE_ANY_OPS_USE_NAMESPACE
+#endif /* __clang__ */
 
-#endif
+#if  defined (__x86_64__)
+// On 64 bit platforms, the "long" type is 64-bits.  Override the
+// default 32-bit platform-specific format specifiers appropriately.
+# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%ld"
+# define ACE_INT64_FORMAT_SPECIFIER "%ld"
+# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%lu"
+# define ACE_UINT64_FORMAT_SPECIFIER "%lu"
+# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%lu"
+# define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%ld"
+# define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu"
+#endif /* __x86_64__ */
 
 #define ACE_LACKS_UCONTEXT_H
 
diff --git a/dep/acelite/ace/config-macosx-mavericks.h b/dep/acelite/ace/config-macosx-mavericks.h
new file mode 100644
index 000000000..06b1ff16c
--- /dev/null
+++ b/dep/acelite/ace/config-macosx-mavericks.h
@@ -0,0 +1,17 @@
+// $Id: config-macosx-mavericks.h 97579 2014-02-11 09:40:17Z johnnyw $
+#ifndef ACE_CONFIG_MACOSX_MAVERICKS_H
+#define ACE_CONFIG_MACOSX_MAVERICKS_H
+
+// Mac OS X has broken symbol visibility.  Unless we're told otherwise,
+// disable it by default.
+#ifndef ACE_HAS_CUSTOM_EXPORT_MACROS
+#define ACE_HAS_CUSTOM_EXPORT_MACROS 0
+#endif
+
+#ifndef ACE_HAS_SSIZE_T
+#define ACE_HAS_SSIZE_T
+#endif
+
+#include "ace/config-macosx-mountainlion.h"
+
+#endif // ACE_CONFIG_MAVERICKS_H
diff --git a/dep/acelite/ace/config-macosx-mountainlion.h b/dep/acelite/ace/config-macosx-mountainlion.h
new file mode 100644
index 000000000..c27bf0c05
--- /dev/null
+++ b/dep/acelite/ace/config-macosx-mountainlion.h
@@ -0,0 +1,17 @@
+// $Id: config-macosx-mountainlion.h 97579 2014-02-11 09:40:17Z johnnyw $
+#ifndef ACE_CONFIG_MACOSX_MOUNTAINLION_H
+#define ACE_CONFIG_MACOSX_MOUNTAINLION_H
+
+// Deprecated
+#ifndef ACE_LACKS_SBRK
+#define ACE_LACKS_SBRK
+#endif
+
+// Deprecated
+#ifndef ACE_LACKS_TEMPNAM
+#define ACE_LACKS_TEMPNAM
+#endif
+
+#include "ace/config-macosx-lion.h"
+
+#endif // ACE_CONFIG_MACOSX_MOUNTAIN_LION_H
diff --git a/dep/acelite/ace/config-macosx-snowleopard.h b/dep/acelite/ace/config-macosx-snowleopard.h
index a60b8c40a..49d83a67d 100644
--- a/dep/acelite/ace/config-macosx-snowleopard.h
+++ b/dep/acelite/ace/config-macosx-snowleopard.h
@@ -1,8 +1,7 @@
-// $Id: config-macosx-snowleopard.h 91693 2010-09-09 12:57:54Z johnnyw $
+// $Id: config-macosx-snowleopard.h 96711 2013-01-28 07:59:03Z johnnyw $
 #ifndef ACE_CONFIG_MACOSX_SNOWLEOPARD_H
 #define ACE_CONFIG_MACOSX_SNOWLEOPARD_H
 
-
 #include "ace/config-macosx-leopard.h"
 
 #ifdef __clang__
diff --git a/dep/acelite/ace/config-macosx-yosemite.h b/dep/acelite/ace/config-macosx-yosemite.h
new file mode 100644
index 000000000..f67e2bfe0
--- /dev/null
+++ b/dep/acelite/ace/config-macosx-yosemite.h
@@ -0,0 +1,7 @@
+// $Id: config-macosx-yosemite.h 97777 2014-06-06 06:43:29Z johnnyw $
+#ifndef ACE_CONFIG_MACOSX_YOSEMITE_H
+#define ACE_CONFIG_MACOSX_YOSEMITE_H
+
+#include "ace/config-macosx-mavericks.h"
+
+#endif // ACE_CONFIG_MACOSX_YOSEMITE_H
diff --git a/dep/acelite/ace/config-macosx.h b/dep/acelite/ace/config-macosx.h
index e39e27e0e..8eb499117 100644
--- a/dep/acelite/ace/config-macosx.h
+++ b/dep/acelite/ace/config-macosx.h
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-// $Id: config-macosx.h 93359 2011-02-11 11:33:12Z mcorino $
+// $Id: config-macosx.h 97326 2013-09-11 07:52:09Z johnnyw $
 
 // This configuration file is designed to work with the MacOS X operating system, version 10.2 (Jaguar).
 
@@ -77,9 +77,6 @@
 
 #define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
 
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-//#define ACE_HAS_SYSV_IPC
-
 // Compiler/platform contains the <sys/syscall.h> file.
 #define ACE_HAS_SYS_SYSCALL_H
 
diff --git a/dep/acelite/ace/config-macros.h b/dep/acelite/ace/config-macros.h
index 1de1a2e9b..199a7a44e 100644
--- a/dep/acelite/ace/config-macros.h
+++ b/dep/acelite/ace/config-macros.h
@@ -4,7 +4,7 @@
 /**
  *  @file   config-macros.h
  *
- *  $Id: config-macros.h 94386 2011-08-10 12:42:53Z johnnyw $
+ *  $Id: config-macros.h 97400 2013-10-31 10:44:50Z mhengstmengel $
  *
  *  @author (Originally in OS.h)Doug Schmidt <schmidt@cs.wustl.edu>
  *  @author Jesper S. M|ller<stophph@diku.dk>
@@ -21,10 +21,13 @@
 #ifndef ACE_CONFIG_MACROS_H
 #define ACE_CONFIG_MACROS_H
 
+#define ACE_HAS_IPV6 1 
+#define ACE_USES_IPV4_IPV6_MIGRATION 1 
+
 #ifdef _WIN32
-  #include "ace/config-win32.h"
+#include "ace/config-win32.h"
 #else
-  #include "ace/config-linux.h"
+#include "ace/config-linux.h"
 #endif
 
 #include "ace/Version.h"
@@ -186,6 +189,25 @@
 
 #endif /* !ACE_HAS_CUSTOM_EXPORT_MACROS */
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_CLASS_INSTANTIATION)
+# define ACE_SINGLETON_TEMPLATE_INSTANTIATION(T) \
+  template class T;
+# define ACE_SINGLETON_TEMPLATE_INSTANTIATE(SINGLETON_TYPE, CLASS, LOCK) \
+  template class SINGLETON_TYPE < CLASS, LOCK >;
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+# define ACE_SINGLETON_TEMPLATE_INSTANTIATION(T) \
+  template T * T::singleton_;
+# define ACE_SINGLETON_TEMPLATE_INSTANTIATE(SINGLETON_TYPE, CLASS, LOCK) \
+  template SINGLETON_TYPE < CLASS, LOCK > * SINGLETON_TYPE < CLASS, LOCK >::singleton_;
+#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+
+#if !defined(ACE_SINGLETON_TEMPLATE_INSTANTIATION)
+# define ACE_SINGLETON_TEMPLATE_INSTANTIATION(T)
+#endif
+#if !defined(ACE_SINGLETON_TEMPLATE_INSTANTIATE)
+# define ACE_SINGLETON_TEMPLATE_INSTANTIATE(SINGLETON_TYPE, CLASS, LOCK)
+#endif
+
 // This is a whim of mine -- that instead of annotating a class with
 // ACE_Export in its declaration, we make the declaration near the TOP
 // of the file with ACE_DECLARE_EXPORT.
@@ -227,7 +249,7 @@
 // ============================================================================
 
 #if !defined (ACE_UNUSED_ARG)
-# if defined (__GNUC__) && ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)))
+# if defined (__GNUC__) && ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))) || (defined (__BORLANDC__) && defined (__clang__))
 #   define ACE_UNUSED_ARG(a) (void) (a)
 # elif defined (__GNUC__) || defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM)
 // Some compilers complain about "statement with no effect" with (a).
diff --git a/dep/acelite/ace/config-netbsd.h b/dep/acelite/ace/config-netbsd.h
index 227c10832..5d10c725f 100644
--- a/dep/acelite/ace/config-netbsd.h
+++ b/dep/acelite/ace/config-netbsd.h
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-// $Id: config-netbsd.h 93530 2011-03-11 12:12:40Z olli $
+// $Id: config-netbsd.h 97326 2013-09-11 07:52:09Z johnnyw $
 
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
@@ -71,7 +71,7 @@
 #define ACE_HAS_STRINGS 1
 #define ACE_HAS_STRING_CLASS 1
 #define ACE_HAS_SVR4_DYNAMIC_LINKING 1
-#define ACE_HAS_SYSV_IPC 1
+#define ACE_HAS_SYSV_IPC
 #define ACE_HAS_SYS_FILIO_H 1
 #define ACE_HAS_STRSIGNAL
 #define ACE_HAS_SYS_SOCKIO_H 1
diff --git a/dep/acelite/ace/config-qnx.h b/dep/acelite/ace/config-qnx.h
index 73353d4ff..07e90a5b2 100644
--- a/dep/acelite/ace/config-qnx.h
+++ b/dep/acelite/ace/config-qnx.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: config-qnx.h 94293 2011-07-01 08:47:39Z mcorino $
+// $Id: config-qnx.h 97326 2013-09-11 07:52:09Z johnnyw $
 // The following configuration file is designed to work for QNX RTP
 // GNU C++ and the POSIX (pthread) threads package. You can get QNX
 // RTP at http://get.qnx.com.
@@ -139,6 +139,7 @@
 #define ACE_HAS_SYS_SOCKIO_H 1
 #define ACE_HAS_SYSCTL
 #define ACE_HAS_SIGACTION_CONSTP2 1
+#define ACE_LACKS_PTHREAD_SCOPE_PROCESS
 
 #if _NTO_VERSION < 650
 # define ACE_LACKS_NFDBITS
diff --git a/dep/acelite/ace/config-sunos5.7.h b/dep/acelite/ace/config-sunos5.7.h
index 720fbbd43..7c472ec16 100644
--- a/dep/acelite/ace/config-sunos5.7.h
+++ b/dep/acelite/ace/config-sunos5.7.h
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-// $Id: config-sunos5.7.h 93543 2011-03-14 08:25:46Z johnnyw $
+// $Id: config-sunos5.7.h 97175 2013-05-29 06:59:19Z johnnyw $
 
 // The following configuration file is designed to work for SunOS 5.7
 // (Solaris 7) platforms using the SunC++ 4.x, 5.x, or g++ compilers.
@@ -51,7 +51,9 @@
 #define ACE_HAS_SOCKLEN_T
 
 #if defined (__sparcv9)
-#define _LP64
+#if !defined (_LP64)
+# define _LP64
+#endif /* _LP64 */
 #define ACE_SIZEOF_LONG 8 /* Needed to circumvent compiler bug #4294969 */
 #endif /* __sparcv9 */
 
diff --git a/dep/acelite/ace/config-vxworks6.4.h b/dep/acelite/ace/config-vxworks6.4.h
index 4ed50a7a1..4b6a56d4a 100644
--- a/dep/acelite/ace/config-vxworks6.4.h
+++ b/dep/acelite/ace/config-vxworks6.4.h
@@ -1,5 +1,5 @@
 //* -*- C++ -*- */
-// $Id: config-vxworks6.4.h 93571 2011-03-17 07:37:11Z olli $
+// $Id: config-vxworks6.4.h 97326 2013-09-11 07:52:09Z johnnyw $
 
 // The following configuration file is designed to work for VxWorks
 // 6.4 platforms using one of these compilers:
@@ -202,6 +202,8 @@
 #define ACE_LACKS_SYMLINKS
 #define ACE_LACKS_ISCTYPE
 
+#define ACE_LACKS_PTHREAD_SCOPE_PROCESS
+
 #if defined __RTP__
   // We are building for RTP mode
   #if !defined (ACE_AS_STATIC_LIBS)
diff --git a/dep/acelite/ace/config-vxworks6.9.h b/dep/acelite/ace/config-vxworks6.9.h
index f15b23046..9a15936a6 100644
--- a/dep/acelite/ace/config-vxworks6.9.h
+++ b/dep/acelite/ace/config-vxworks6.9.h
@@ -1,5 +1,5 @@
 //* -*- C++ -*- */
-// $Id: config-vxworks6.9.h 96017 2012-08-08 22:18:09Z mitza $
+// $Id: config-vxworks6.9.h 97911 2014-10-07 21:58:25Z shuston $
 
 // The following configuration file is designed to work for VxWorks
 // 6.9 platforms using one of these compilers:
@@ -26,6 +26,17 @@
 #if defined(__RTP__)
 // bzero is in strings.h
 # define ACE_HAS_STRINGS 1
+# if defined ACE_HAS_PTHREADS
+#  define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
+# endif
+#endif
+
+// As of VxWorks 6.9, the networking APIs have been made conformant with
+// the POSIX sockets prototypes. See IEEE Std 1003.1 and Section 6.3.3 Socket
+// Functional Interface in the VxWorks reference document -
+// wr_net_stack_programmers_guide_vol3_6.9.pdf.
+#if defined (ACE_HAS_BROKEN_ACCEPT_ADDR)
+#  undef ACE_HAS_BROKEN_ACCEPT_ADDR
 #endif
 
 #include /**/ "ace/post.h"
diff --git a/dep/acelite/ace/config-win32-borland.h b/dep/acelite/ace/config-win32-borland.h
new file mode 100644
index 000000000..ef64bc3c7
--- /dev/null
+++ b/dep/acelite/ace/config-win32-borland.h
@@ -0,0 +1,181 @@
+//-*- C++ -*-
+//$Id: config-win32-borland.h 97641 2014-02-28 09:24:49Z johnnyw $
+
+// The following configuration file contains defines for Borland compilers.
+
+#ifndef ACE_CONFIG_WIN32_BORLAND_H
+#define ACE_CONFIG_WIN32_BORLAND_H
+#include /**/ "ace/pre.h"
+
+#ifndef ACE_CONFIG_WIN32_H
+#error Use config-win32.h in config.h instead of this header
+#endif /* ACE_CONFIG_WIN32_H */
+
+#define ACE_HAS_CUSTOM_EXPORT_MACROS 1
+#define ACE_Proper_Export_Flag __declspec (dllexport)
+#define ACE_Proper_Import_Flag __declspec (dllimport)
+#define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T
+#define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE<CLASS, LOCK>;
+#define ACE_IMPORT_SINGLETON_DECLARATION(T) template class __declspec (dllimport) T
+#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllimport) SINGLETON_TYPE <CLASS, LOCK>;
+
+// In later versions of C++Builder we will prefer inline functions by
+// default. The debug configuration of ACE is built with functions
+// out-of-line, so when linking your application against a debug ACE
+// build, you can choose to use the out-of-line functions by adding
+// ACE_NO_INLINE=1 to your project settings.
+# if !defined (__ACE_INLINE__)
+#  define __ACE_INLINE__ 1
+# endif /* __ACE_INLINE__ */
+
+# define ACE_CC_NAME ACE_TEXT ("Embarcadero C++ Builder")
+# define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100)
+# define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100)
+# define ACE_CC_BETA_VERSION (0)
+
+#if (__BORLANDC__ >= 0x620)
+# define ACE_CC_PREPROCESSOR_ARGS "-q -Sl -o%s"
+#endif
+
+// Automatically define WIN32 macro if the compiler tells us it is our
+// target platform.
+# if defined (__WIN32__) && !defined (WIN32)
+#  define WIN32 1
+# endif
+
+// When building a VCL application, the main VCL header file should be
+// included before anything else. You can define ACE_HAS_VCL=1 in your
+// project settings to have this file included for you automatically.
+# if defined (ACE_HAS_VCL) && (ACE_HAS_VCL != 0)
+#  include /**/ <vcl.h>
+# endif
+
+#if defined (__clang__)
+# define ACE_HAS_BCC64
+#else
+# define ACE_HAS_BCC32
+#endif
+
+#if defined (ACE_HAS_BCC64)
+// Use 32bit pre processor because cpp64 doesn't have the same
+// options
+# define ACE_CC_PREPROCESSOR "CPP32.EXE"
+#else
+# define ACE_CC_PREPROCESSOR "CPP32.EXE"
+#endif
+
+# include "ace/config-win32-common.h"
+
+# define ACE_WSTRING_HAS_USHORT_SUPPORT 1
+# define ACE_HAS_DIRENT
+
+#define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 1
+
+#define ACE_LACKS_TERMIOS_H
+#define ACE_LACKS_NETINET_TCP_H
+#define ACE_LACKS_REGEX_H
+#define ACE_LACKS_SYS_MSG_H
+#define ACE_LACKS_PWD_H
+#define ACE_LACKS_POLL_H
+#define ACE_LACKS_SYS_SHM_H
+#define ACE_LACKS_STRINGS_H
+#define ACE_LACKS_SEMAPHORE_H
+#define ACE_LACKS_INTTYPES_H
+#define ACE_LACKS_UCONTEXT_H
+#define ACE_LACKS_SYS_SELECT_H
+#define ACE_LACKS_SYS_TIME_H
+#define ACE_LACKS_SYS_RESOURCE_H
+#define ACE_LACKS_SYS_WAIT_H
+#define ACE_LACKS_DLFCN_H
+#define ACE_LACKS_SYS_MMAN_H
+#define ACE_LACKS_SYS_UIO_H
+#define ACE_LACKS_SYS_SOCKET_H
+#define ACE_LACKS_NETINET_IN_H
+#define ACE_LACKS_NETDB_H
+#define ACE_LACKS_NET_IF_H
+#define ACE_LACKS_SYS_IPC_H
+#define ACE_LACKS_SYS_SEM_H
+#define ACE_LACKS_SYS_IOCTL_H
+#define ACE_LACKS_STROPTS_H
+
+#undef ACE_LACKS_STRUCT_DIR
+#undef ACE_LACKS_CLOSEDIR
+#undef ACE_LACKS_OPENDIR
+#undef ACE_LACKS_READDIR
+#undef ACE_LACKS_REWINDDIR
+
+#define ACE_HAS_WOPENDIR
+#define ACE_HAS_WCLOSEDIR
+#define ACE_HAS_WREADDIR
+#define ACE_HAS_WREWINDDIR
+
+#define ACE_LACKS_STRRECVFD
+#define ACE_USES_EXPLICIT_STD_NAMESPACE
+
+#if defined (ACE_HAS_BCC64)
+# define ACE_HAS_TIME_T_LONG_MISMATCH
+#endif
+
+#define ACE_EXPORT_NESTED_CLASSES 1
+#define ACE_HAS_CPLUSPLUS_HEADERS 1
+#define ACE_HAS_NONCONST_SELECT_TIMEVAL
+#define ACE_HAS_SIG_ATOMIC_T
+#define ACE_HAS_STANDARD_CPP_LIBRARY 1
+#define ACE_HAS_STDCPP_STL_INCLUDES 1
+#define ACE_HAS_STRING_CLASS 1
+#define ACE_HAS_USER_MODE_MASKS 1
+#define ACE_LACKS_ACE_IOSTREAM 1
+#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
+#define ACE_HAS_NEW_NOTHROW
+#define ACE_TEMPLATES_REQUIRE_SOURCE 1
+#define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Lu"
+#define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld"
+#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+#define ACE_USES_STD_NAMESPACE_FOR_ABS 1
+#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS)
+
+#if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+// must have _MT defined to include multithreading
+// features from win32 headers
+# if !defined(__MT__)
+// *** DO NOT *** defeat this error message by defining __MT__ yourself.
+// You must link with the multi threaded libraries. Add -tWM to your
+// compiler options
+#  error You must link against multi-threaded libraries when using ACE (check your project settings)
+# endif /* !__MT__ */
+#endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
+
+#if (__BORLANDC__ <= 0x680)
+# define ACE_LACKS_ISWCTYPE
+# define ACE_LACKS_ISCTYPE
+#endif
+
+#if (__BORLANDC__ >= 0x650) && (__BORLANDC__ <= 0x680)
+# define ACE_LACKS_STRTOK_R
+#endif
+
+#if (__BORLANDC__ <= 0x680)
+# define ACE_LACKS_LOCALTIME_R
+#endif
+
+#define ACE_WCSDUP_EQUIVALENT ::_wcsdup
+#define ACE_STRCASECMP_EQUIVALENT ::stricmp
+#define ACE_STRNCASECMP_EQUIVALENT ::strnicmp
+#define ACE_WTOF_EQUIVALENT ::_wtof
+#define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X)))
+#define ACE_HAS_ITOA 1
+
+#if defined (ACE_HAS_BCC64)
+# if (__BORLANDC__ < 0x680)
+#  define ACE_LACKS_SWAB
+# endif
+#endif
+
+#if defined (ACE_HAS_BCC32)
+# define ACE_SIZEOF_LONG_DOUBLE 10
+# define ACE_NEEDS_DL_UNDERSCORE
+#endif
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_WIN32_BORLAND_H */
+
diff --git a/dep/acelite/ace/config-win32-common.h b/dep/acelite/ace/config-win32-common.h
index 098ddbd57..f74577b7d 100644
--- a/dep/acelite/ace/config-win32-common.h
+++ b/dep/acelite/ace/config-win32-common.h
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-// $Id: config-win32-common.h 96094 2012-08-22 11:51:11Z johnnyw $
+// $Id: config-win32-common.h 97940 2014-10-27 18:11:13Z johnnyw $
 
 
 #ifndef ACE_CONFIG_WIN32_COMMON_H
@@ -134,7 +134,7 @@
 //  #endif
 
 // Define the special export macros needed to export symbols outside a dll
-#if !defined(__BORLANDC__) && (!defined (ACE_HAS_CUSTOM_EXPORT_MACROS) || (ACE_HAS_CUSTOM_EXPORT_MACROS == 0))
+#if !defined (ACE_HAS_CUSTOM_EXPORT_MACROS) || (ACE_HAS_CUSTOM_EXPORT_MACROS == 0)
 #if defined (ACE_HAS_CUSTOM_EXPORT_MACROS)
 #undef ACE_HAS_CUSTOM_EXPORT_MACROS
 #endif
@@ -310,6 +310,9 @@
 #if !defined(__MINGW32__) && !defined (__BORLANDC__)
 # define ACE_LACKS_MODE_T
 #endif
+#if !defined(__MINGW32__)
+# define ACE_LACKS_PID_T
+#endif
 #if !defined (__BORLANDC__)
 # define ACE_LACKS_NLINK_T
 # define ACE_LACKS_UID_T
@@ -527,9 +530,9 @@
 #  else
 #    pragma comment(lib, "ws2_32.lib")
 #    pragma comment(lib, "mswsock.lib")
-// #    if defined (ACE_HAS_IPV6)
+#    if defined (ACE_HAS_IPV6)
 #      pragma comment(lib, "iphlpapi.lib")
-// #    endif
+#    endif
 #  endif /* ACE_HAS_WINCE */
 # endif /* _MSC_VER */
 
@@ -603,21 +606,14 @@
 #define ACE_LACKS_ALPHASORT
 #define ACE_LACKS_MKSTEMP
 #define ACE_LACKS_LSTAT
-// Looks like Win32 has a non-const swab function
+// Looks like Win32 has a non-const swab function, and it takes the
+// non-standard int len (rather than ssize_t).
 #define ACE_HAS_NONCONST_SWAB
+#define ACE_HAS_INT_SWAB
 
 // gethostbyaddr does not handle IPv6-mapped-IPv4 addresses
 #define ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED
 
-// If we are using winsock2 then the SO_REUSEADDR feature is broken
-// SO_REUSEADDR=1 behaves like SO_REUSEPORT=1. (SO_REUSEPORT is an
-// extension to sockets on some platforms)
-// We define SO_REUSEPORT here so that ACE_OS::setsockopt() can still
-// allow the user to specify that a socketaddr can *always* be reused.
-#if defined (ACE_HAS_WINSOCK2) && ACE_HAS_WINSOCK2 != 0 && ! defined(SO_REUSEPORT)
-#define SO_REUSEPORT 0x0400  // We just have to pick a value that won't conflict
-#endif
-
 #if defined (ACE_WIN64)
 // Data must be aligned on 8-byte boundaries, at a minimum.
 #  define ACE_MALLOC_ALIGN 8
diff --git a/dep/acelite/ace/config-win32-mingw.h b/dep/acelite/ace/config-win32-mingw.h
index a34ff605b..5d1ca07b1 100644
--- a/dep/acelite/ace/config-win32-mingw.h
+++ b/dep/acelite/ace/config-win32-mingw.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: config-win32-mingw.h 95438 2012-01-16 10:35:03Z mcorino $
+// $Id: config-win32-mingw.h 96943 2013-03-30 09:42:31Z mcorino $
 
 //
 // The following configuration file is designed to work for win32
@@ -28,7 +28,7 @@
 
 #define ACE_HAS_USER_MODE_MASKS
 
-#if (__MINGW32_MAJOR_VERSION < 2) && (__MINGW64_VERSION_MAJOR < 3)
+#if (__MINGW32_MAJOR_VERSION < 2)
 #  error You need a newer version (>= 2.0) of mingw32/w32api
 #endif
 
@@ -38,7 +38,7 @@
 # define ACE_FILENO_EQUIVALENT ::_fileno
 #endif
 
-#if (__MINGW32_MAJOR_VERSION >= 3) || (__MINGW64_VERSION_MAJOR >= 3)
+#if (__MINGW32_MAJOR_VERSION >= 3)
 #  define ACE_HAS_SSIZE_T
 #  undef ACE_LACKS_STRUCT_DIR
 #  undef ACE_LACKS_OPENDIR
@@ -51,21 +51,8 @@
 #  define ACE_LACKS_DIRENT_H
 #endif
 
-#if (__MINGW32_MAJOR_VERSION > 3)  || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION >= 15))
+#if (__MINGW32_MAJOR_VERSION > 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION >= 15))
 # undef ACE_LACKS_USECONDS_T
-#elif (__MINGW64_VERSION_MAJOR >= 3)
-# undef ACE_LACKS_USECONDS_T
-#endif
-
-#if (__MINGW64_VERSION_MAJOR >= 3)
-# define ACE_HAS_POSIX_TIME 1
-# define ACE_LACKS_TIMESPEC_T 1
-
-# include <stdlib.h>
-# if defined (strtod)
-#  undef strtod
-# endif
-#else
 # if defined (ACE_LACKS_SIGSET_T)
 #   undef ACE_LACKS_SIGSET_T
 # endif
diff --git a/dep/acelite/ace/config-win32-mingw64.h b/dep/acelite/ace/config-win32-mingw64.h
new file mode 100644
index 000000000..504e70ddc
--- /dev/null
+++ b/dep/acelite/ace/config-win32-mingw64.h
@@ -0,0 +1,138 @@
+// -*- C++ -*-
+// $Id: config-win32-mingw64.h 97440 2013-11-27 12:16:41Z mcorino $
+
+//
+// The following configuration file is designed to work for win32 and win64
+// platforms using gcc/g++ with mingw64 (http://http://mingw-w64.sourceforge.net/).
+//
+
+#ifndef ACE_CONFIG_WIN32_MINGW64_H
+#define ACE_CONFIG_WIN32_MINGW64_H
+#include /**/ "ace/pre.h"
+
+#ifndef ACE_CONFIG_WIN32_H
+#  error Use config-win32.h in config.h instead of this header
+#endif /* ACE_CONFIG_WIN32_H */
+
+#define ACE_CC_PREPROCESSOR "cpp"
+#define ACE_CC_PREPROCESOR_ARGS ""
+
+#if !defined(__MINGW32__) || !defined (__MINGW64_VERSION_MAJOR)
+#  error You do not seem to be using mingw64
+#endif
+
+#if defined (WIN64) || defined (__WIN64__)
+# define ACE_SIZEOF_LONG_DOUBLE 16
+#else
+# define ACE_SIZEOF_LONG_DOUBLE 12
+#endif
+
+#include "ace/config-g++-common.h"
+
+#include /**/ <_mingw.h>
+#include /**/ <w32api.h>
+
+#if defined (exception_info)
+# undef exception_info
+#endif
+
+#define ACE_HAS_USER_MODE_MASKS
+
+#if (!defined (__MINGW64_VERSION_MAJOR) || (__MINGW64_VERSION_MAJOR < 2))
+# error You need a newer version (>= 2.0) of mingw32/w32api
+#endif
+
+#include <stdio.h>
+
+#if defined (fileno)
+# undef fileno
+#endif
+#if (__MINGW64_VERSION_MAJOR >= 3)
+# define ACE_FILENO_EQUIVALENT ::_fileno
+
+// Latest version of MingW64 (GCC 4.8.2) with Win32 threading
+// defines a 'pthread_sigmask' macro when including signal.h.
+// We have to remove that one since ACE declares a (non-functional)
+// pthread_sigmask method in ACE_OS.
+# include <signal.h>
+# if defined (pthread_sigmask)
+#   undef pthread_sigmask
+# endif
+#endif
+
+#if (__MINGW64_VERSION_MAJOR >= 2)
+
+# define ACE_HAS_SSIZE_T
+# undef ACE_LACKS_STRUCT_DIR
+# undef ACE_LACKS_OPENDIR
+# undef ACE_LACKS_CLOSEDIR
+# undef ACE_LACKS_READDIR
+# undef ACE_LACKS_TELLDIR
+# undef ACE_LACKS_SEEKDIR
+# undef ACE_LACKS_REWINDDIR
+# undef ACE_LACKS_USECONDS_T
+
+# define ACE_HAS_POSIX_TIME 1
+# define ACE_LACKS_TIMESPEC_T 1
+# define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
+
+# if defined (ACE_HAS_QOS) && !defined (ACE_HAS_WINSOCK2_GQOS)
+#   define ACE_HAS_WINSOCK2_GQOS
+# endif
+
+# if defined (WIN64) || defined (__WIN64__)
+#   define ACE_LACKS_INLINE_ASSEMBLY
+# endif
+
+# include <stdlib.h>
+# if defined (strtod)
+#  undef strtod
+# endif
+
+#else
+#  define ACE_LACKS_DIRENT_H
+#endif // __MINGW64_VERSION_MAJOR >= 3
+
+#undef ACE_HAS_WTOF
+
+#define ACE_LACKS_SYS_SHM_H
+#define ACE_LACKS_TERMIOS_H
+#define ACE_LACKS_NETINET_TCP_H
+#define ACE_LACKS_STRRECVFD
+#define ACE_LACKS_STRPTIME
+#define ACE_LACKS_POLL_H
+#define ACE_LACKS_REGEX_H
+#define ACE_LACKS_SYS_MSG_H
+#define ACE_LACKS_PWD_H
+#define ACE_LACKS_SEMAPHORE_H
+#define ACE_LACKS_UCONTEXT_H
+#define ACE_LACKS_SYS_SELECT_H
+#define ACE_LACKS_SYS_RESOURCE_H
+#define ACE_LACKS_SYS_WAIT_H
+#define ACE_LACKS_DLFCN_H
+#define ACE_LACKS_SYS_MMAN_H
+#define ACE_LACKS_SYS_UIO_H
+#define ACE_LACKS_SYS_SOCKET_H
+#define ACE_LACKS_NETINET_IN_H
+#define ACE_LACKS_NETDB_H
+#define ACE_LACKS_NET_IF_H
+#define ACE_LACKS_SYS_IPC_H
+#define ACE_LACKS_SYS_SEM_H
+#define ACE_LACKS_STROPTS_H
+#define ACE_LACKS_SYS_IOCTL_H
+#define ACE_LACKS_PDH_H
+#define ACE_LACKS_PDHMSG_H
+#define ACE_LACKS_STRTOK_R
+#define ACE_LACKS_LOCALTIME_R
+#define ACE_HAS_NONCONST_WCSDUP
+#define ACE_ISCTYPE_EQUIVALENT ::_isctype
+
+#define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d"
+#define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u"
+
+#define ACE_ENDTHREADEX(STATUS)  ::_endthreadex ((DWORD) (STATUS))
+
+#define ACE_DLL_PREFIX ACE_TEXT ("lib")
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_WIN32_MINGW64_H */
diff --git a/dep/acelite/ace/config-win32-msvc-10.h b/dep/acelite/ace/config-win32-msvc-10.h
index 2cbcd941a..01e9585f2 100644
--- a/dep/acelite/ace/config-win32-msvc-10.h
+++ b/dep/acelite/ace/config-win32-msvc-10.h
@@ -3,7 +3,7 @@
 /**
  *  @file   config-win32-msvc-10.h
  *
- *  $Id: config-win32-msvc-10.h 95719 2012-05-01 12:54:01Z johnnyw $
+ *  $Id: config-win32-msvc-10.h 97431 2013-11-19 14:28:52Z johnnyw $
  *
  *  @brief  Microsoft Visual C++ 10.0 configuration file.
  *
@@ -137,11 +137,12 @@
 # define ACE_NEEDS_FUNC_DEFINITIONS
 
 // Windows Vista and Windows Server 2008 and newer do have native condition
-// variables
-#if defined (WIN32_WINNT) && (WIN32_WINNT >= 0x0600)
-# define ACE_HAS_WTHREADS_CONDITION_VARIABLE
-# undef ACE_LACKS_COND_T
-#endif
+// variables, but this is commented out because the support in ACE hasn't
+// been completed
+// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
+// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE
+// # undef ACE_LACKS_COND_T
+// #endif
 
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_WIN32_MSVC_10_H */
diff --git a/dep/acelite/ace/config-win32-msvc-11.h b/dep/acelite/ace/config-win32-msvc-11.h
new file mode 100644
index 000000000..3142f579b
--- /dev/null
+++ b/dep/acelite/ace/config-win32-msvc-11.h
@@ -0,0 +1,32 @@
+/* -*- C++ -*- */
+//=============================================================================
+/**
+ *  @file   config-win32-msvc-11.h
+ *
+ *  $Id: config-win32-msvc-11.h 97766 2014-06-04 10:08:40Z johnnyw $
+ *
+ *  @brief  Microsoft Visual C++ 11.0 configuration file.
+ *
+ *  This file is the ACE configuration file for Microsoft Visual C++ version 11.
+ *
+ *  @note Do not include this file directly, include config-win32.h instead.
+ */
+//=============================================================================
+
+#ifndef ACE_CONFIG_WIN32_MSVC_11_H
+#define ACE_CONFIG_WIN32_MSVC_11_H
+#include /**/ "ace/pre.h"
+
+#ifndef ACE_CONFIG_WIN32_H
+#error Use config-win32.h in config.h instead of this header
+#endif /* ACE_CONFIG_WIN32_H */
+
+#ifndef ACE_WIN32_VC11
+#  define ACE_WIN32_VC11
+#endif
+
+// Until we have specific msvc11 settings, include the msvc10 file
+#include "ace/config-win32-msvc-10.h"
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_WIN32_MSVC_10_H */
diff --git a/dep/acelite/ace/config-win32-msvc-12.h b/dep/acelite/ace/config-win32-msvc-12.h
new file mode 100644
index 000000000..6e41ebc5a
--- /dev/null
+++ b/dep/acelite/ace/config-win32-msvc-12.h
@@ -0,0 +1,32 @@
+/* -*- C++ -*- */
+//=============================================================================
+/**
+ *  @file   config-win32-msvc-12.h
+ *
+ *  $Id: config-win32-msvc-12.h 97766 2014-06-04 10:08:40Z johnnyw $
+ *
+ *  @brief  Microsoft Visual C++ 12.0 configuration file.
+ *
+ *  This file is the ACE configuration file for Microsoft Visual C++ version 12.
+ *
+ *  @note Do not include this file directly, include config-win32.h instead.
+ */
+//=============================================================================
+
+#ifndef ACE_CONFIG_WIN32_MSVC_12_H
+#define ACE_CONFIG_WIN32_MSVC_12_H
+#include /**/ "ace/pre.h"
+
+#ifndef ACE_CONFIG_WIN32_H
+#error Use config-win32.h in config.h instead of this header
+#endif /* ACE_CONFIG_WIN32_H */
+
+#ifndef ACE_WIN32_VC12
+#  define ACE_WIN32_VC12
+#endif
+
+// Until we have specific msvc12 settings, include the msvc11 file
+#include "ace/config-win32-msvc-11.h"
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_WIN32_MSVC_10_H */
diff --git a/dep/acelite/ace/config-win32-msvc-14.h b/dep/acelite/ace/config-win32-msvc-14.h
new file mode 100644
index 000000000..85f0acfd2
--- /dev/null
+++ b/dep/acelite/ace/config-win32-msvc-14.h
@@ -0,0 +1,41 @@
+/* -*- C++ -*- */
+//=============================================================================
+/**
+ *  @file   config-win32-msvc-14.h
+ *
+ *  $Id: config-win32-msvc-14.h 97798 2014-07-03 10:57:43Z johnnyw $
+ *
+ *  @brief  Microsoft Visual C++ 14.0 configuration file.
+ *
+ *  This file is the ACE configuration file for Microsoft Visual C++ version 14.
+ *
+ *  @note Do not include this file directly, include config-win32.h instead.
+ */
+//=============================================================================
+
+#ifndef ACE_CONFIG_WIN32_MSVC_14_H
+#define ACE_CONFIG_WIN32_MSVC_14_H
+#include /**/ "ace/pre.h"
+
+#ifndef ACE_CONFIG_WIN32_H
+#error Use config-win32.h in config.h instead of this header
+#endif /* ACE_CONFIG_WIN32_H */
+
+#ifndef ACE_WIN32_VC14
+#  define ACE_WIN32_VC14
+#endif
+
+// Until we have specific msvc14 settings, include the msvc12 file
+#include "ace/config-win32-msvc-12.h"
+
+#define ACE_HAS_POSIX_TIME 1
+#define ACE_LACKS_TIMESPEC_T 1
+
+// According to MS the Visual Studio 2014 C-runtime has a
+// C99 compliant vsnprintf/vsnwprintf, this is a change compared to
+// previous versions
+#define ACE_HAS_C99_VSNPRINTF
+#define ACE_HAS_C99_VSNWPRINTF
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_WIN32_MSVC_14_H */
diff --git a/dep/acelite/ace/config-win32-msvc-9.h b/dep/acelite/ace/config-win32-msvc-9.h
index 551b80f76..3992d0d39 100644
--- a/dep/acelite/ace/config-win32-msvc-9.h
+++ b/dep/acelite/ace/config-win32-msvc-9.h
@@ -3,7 +3,7 @@
 /**
  *  @file   config-win32-msvc-9.h
  *
- *  $Id: config-win32-msvc-9.h 95719 2012-05-01 12:54:01Z johnnyw $
+ *  $Id: config-win32-msvc-9.h 97431 2013-11-19 14:28:52Z johnnyw $
  *
  *  @brief  Microsoft Visual C++ 9.0 configuration file.
  *
@@ -136,11 +136,12 @@
 # define ACE_NEEDS_FUNC_DEFINITIONS
 
 // Windows Vista and Windows Server 2008 and newer do have native condition
-// variables
-#if defined (WIN32_WINNT) && (WIN32_WINNT >= 0x0600)
-# define ACE_HAS_WTHREADS_CONDITION_VARIABLE
-# undef ACE_LACKS_COND_T
-#endif
+// variables, but this is commented out because the support in ACE hasn't
+// been completed
+// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
+// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE
+// # undef ACE_LACKS_COND_T
+// #endif
 
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_WIN32_MSVC_9_H */
diff --git a/dep/acelite/ace/config-win32-msvc.h b/dep/acelite/ace/config-win32-msvc.h
index d6ec650e5..86a7e62c0 100644
--- a/dep/acelite/ace/config-win32-msvc.h
+++ b/dep/acelite/ace/config-win32-msvc.h
@@ -2,7 +2,7 @@
 /**
  *  @file   config-win32-msvc.h
  *
- *  $Id: config-win32-msvc.h 95788 2012-05-24 07:59:51Z johnnyw $
+ *  $Id: config-win32-msvc.h 97766 2014-06-04 10:08:40Z johnnyw $
  *
  *  @brief  Microsoft Visual C++ configuration file.
  *
@@ -40,7 +40,13 @@
 #endif /* _WIN32_WCE */
 
 //FUZZ: disable check_for_msc_ver
-#if (_MSC_VER >= 1600)
+#if (_MSC_VER >= 1900)
+# include "ace/config-win32-msvc-14.h"
+#elif (_MSC_VER >= 1800)
+# include "ace/config-win32-msvc-12.h"
+#elif (_MSC_VER >= 1700)
+# include "ace/config-win32-msvc-11.h"
+#elif (_MSC_VER >= 1600)
 # include "ace/config-win32-msvc-10.h"
 #elif (_MSC_VER >= 1500)
 # include "ace/config-win32-msvc-9.h"
diff --git a/dep/acelite/ace/config-win32.h b/dep/acelite/ace/config-win32.h
index 3f8caefb6..f2b2d2d96 100644
--- a/dep/acelite/ace/config-win32.h
+++ b/dep/acelite/ace/config-win32.h
@@ -3,7 +3,7 @@
 /**
  *  @file   config-win32.h
  *
- *  $Id: config-win32.h 94388 2011-08-10 17:14:40Z johnnyw $
+ *  $Id: config-win32.h 97246 2013-08-07 07:10:20Z johnnyw $
  *
  *  @brief  Microsoft Windows configuration file.
  *
@@ -22,19 +22,31 @@
 // NOTE: Please do not add anything besides #include's here.  Put other stuff
 //       (definitions, etc.) in the included headers
 
-#include "ace/config-win32-common.h"
+// We need to ensure that for Borland vcl.h can be included before
+// windows.h.  So we will not include config-win32-common.h from here,
+// but instead let it be included at the appropriate place in
+// config-win32-borland.h.
+#if !defined (__BORLANDC__)
+#  include "ace/config-win32-common.h"
+#endif /* !__BORLANDC__ */
 
 // Include the config-win32-* file specific to the compiler
-#if defined (_MSC_VER)
-#    include "ace/config-win32-msvc.h"
+#if defined (__BORLANDC__)
+#  include "ace/config-win32-borland.h"
+#elif defined (_MSC_VER)
+#  include "ace/config-win32-msvc.h"
 #elif defined (ACE_HAS_CEGCC) //need to be prior to MINGW32
-#    include "ace/config-win32-cegcc.h"
+#  include "ace/config-win32-cegcc.h"
 #elif defined (__MINGW32__)
+#  if defined (__MINGW64_VERSION_MAJOR)
+#    include "ace/config-win32-mingw64.h"
+#  else
 #    include "ace/config-win32-mingw.h"
+#  endif
 #elif defined (__DMC__)
-#    include "ace/config-win32-dmc.h"
+#  include "ace/config-win32-dmc.h"
 #else
-#    error Compiler is not supported
+#  error Compiler is not supported
 #endif
 
 #include /**/ "ace/post.h"
diff --git a/dep/acelite/ace/os_include/arpa/os_inet.h b/dep/acelite/ace/os_include/arpa/os_inet.h
index b97f7c6e4..d3212781a 100644
--- a/dep/acelite/ace/os_include/arpa/os_inet.h
+++ b/dep/acelite/ace/os_include/arpa/os_inet.h
@@ -6,7 +6,7 @@
  *
  *  definitions for internet operations
  *
- *  $Id: os_inet.h 85015 2009-04-03 12:27:59Z johnnyw $
+ *  $Id: os_inet.h 97259 2013-08-09 08:14:31Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "ace/config-all.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/netinet/os_in.h b/dep/acelite/ace/os_include/netinet/os_in.h
index dff894aad..61e00accd 100644
--- a/dep/acelite/ace/os_include/netinet/os_in.h
+++ b/dep/acelite/ace/os_include/netinet/os_in.h
@@ -7,7 +7,7 @@
  *
  *  Internet address family
  *
- *  $Id: os_in.h 85438 2009-05-26 06:56:46Z johnnyw $
+ *  $Id: os_in.h 97259 2013-08-09 08:14:31Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "ace/config-all.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/netinet/os_tcp.h b/dep/acelite/ace/os_include/netinet/os_tcp.h
index aca6590bc..69a6be6e8 100644
--- a/dep/acelite/ace/os_include/netinet/os_tcp.h
+++ b/dep/acelite/ace/os_include/netinet/os_tcp.h
@@ -6,7 +6,7 @@
  *
  *  definitions for the Internet Transmission Control Protocol (TCP)
  *
- *  $Id: os_tcp.h 88499 2010-01-12 19:34:34Z olli $
+ *  $Id: os_tcp.h 97259 2013-08-09 08:14:31Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "ace/config-all.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/os_assert.h b/dep/acelite/ace/os_include/os_assert.h
index fdca573fe..8bbd1fa22 100644
--- a/dep/acelite/ace/os_include/os_assert.h
+++ b/dep/acelite/ace/os_include/os_assert.h
@@ -6,7 +6,7 @@
  *
  *  verify program assertion
  *
- *  $Id: os_assert.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_assert.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,19 +28,5 @@
 # include /**/ <assert.h>
 #endif /* !ACE_LACKS_ASSERT_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#if defined (ACE_LACKS_ASSERT_MACRO)
-#  define assert(expr)
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_ASSERT_H */
diff --git a/dep/acelite/ace/os_include/os_byteswap.h b/dep/acelite/ace/os_include/os_byteswap.h
index b55754ee8..cc95110aa 100644
--- a/dep/acelite/ace/os_include/os_byteswap.h
+++ b/dep/acelite/ace/os_include/os_byteswap.h
@@ -6,7 +6,7 @@
  *
  *  Byteswap methods
  *
- *  $Id: os_byteswap.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_byteswap.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
  */
@@ -27,15 +27,5 @@
 # include /**/ <byteswap.h>
 #endif /* !ACE_HAS_INTRIN_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_BYTESWAP_H */
diff --git a/dep/acelite/ace/os_include/os_complex.h b/dep/acelite/ace/os_include/os_complex.h
index 5e6546f82..db0aa3b48 100644
--- a/dep/acelite/ace/os_include/os_complex.h
+++ b/dep/acelite/ace/os_include/os_complex.h
@@ -6,7 +6,7 @@
  *
  *  complex arithmetic
  *
- *  $Id: os_complex.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_complex.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 # include /**/ <complex.h>
 #endif /* !ACE_LACKS_COMPLEX_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_COMPLEX_H */
diff --git a/dep/acelite/ace/os_include/os_cpio.h b/dep/acelite/ace/os_include/os_cpio.h
index 2c06e8eb2..273e73429 100644
--- a/dep/acelite/ace/os_include/os_cpio.h
+++ b/dep/acelite/ace/os_include/os_cpio.h
@@ -6,7 +6,7 @@
  *
  *  cpio archive values
  *
- *  $Id: os_cpio.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_cpio.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 # include /**/ <cpio.h>
 #endif /* !ACE_LACKS_CPIO_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_CPIO_H */
diff --git a/dep/acelite/ace/os_include/os_errno.h b/dep/acelite/ace/os_include/os_errno.h
index 4f5cfe695..bc49e03cd 100644
--- a/dep/acelite/ace/os_include/os_errno.h
+++ b/dep/acelite/ace/os_include/os_errno.h
@@ -6,7 +6,7 @@
  *
  *  system error numbers
  *
- *  $Id: os_errno.h 91076 2010-07-13 14:20:35Z johnnyw $
+ *  $Id: os_errno.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/os_fenv.h b/dep/acelite/ace/os_include/os_fenv.h
index cbf5ab411..f5ee57482 100644
--- a/dep/acelite/ace/os_include/os_fenv.h
+++ b/dep/acelite/ace/os_include/os_fenv.h
@@ -6,7 +6,7 @@
  *
  *  floating-point environment
  *
- *  $Id: os_fenv.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_fenv.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 # include /**/ <fenv.h>
 #endif /* !ACE_LACKS_FENV_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_FENV_H */
diff --git a/dep/acelite/ace/os_include/os_float.h b/dep/acelite/ace/os_include/os_float.h
index ac4b2f8f9..1cc45b675 100644
--- a/dep/acelite/ace/os_include/os_float.h
+++ b/dep/acelite/ace/os_include/os_float.h
@@ -6,7 +6,7 @@
  *
  *  floating types
  *
- *  $Id: os_float.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_float.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,15 +28,5 @@
 # include /**/ <float.h>
 #endif /* !ACE_LACKS_FLOAT_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_FLOAT_H */
diff --git a/dep/acelite/ace/os_include/os_fmtmsg.h b/dep/acelite/ace/os_include/os_fmtmsg.h
index 74251a950..aa37b391c 100644
--- a/dep/acelite/ace/os_include/os_fmtmsg.h
+++ b/dep/acelite/ace/os_include/os_fmtmsg.h
@@ -6,7 +6,7 @@
  *
  *  message display structures
  *
- *  $Id: os_fmtmsg.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_fmtmsg.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 # include /**/ <fmtmsg.h>
 #endif /* !ACE_LACKS_FMTMSG_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_FMTMSG_H */
diff --git a/dep/acelite/ace/os_include/os_fnmatch.h b/dep/acelite/ace/os_include/os_fnmatch.h
index 36726e293..d83fd12cc 100644
--- a/dep/acelite/ace/os_include/os_fnmatch.h
+++ b/dep/acelite/ace/os_include/os_fnmatch.h
@@ -6,7 +6,7 @@
  *
  *  filename-matching types
  *
- *  $Id: os_fnmatch.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_fnmatch.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 # include /**/ <fnmatch.h>
 #endif /* !ACE_LACKS_FNMATCH_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_FNMATCH_H */
diff --git a/dep/acelite/ace/os_include/os_ftw.h b/dep/acelite/ace/os_include/os_ftw.h
index 225d32513..df8a9ca59 100644
--- a/dep/acelite/ace/os_include/os_ftw.h
+++ b/dep/acelite/ace/os_include/os_ftw.h
@@ -6,7 +6,7 @@
  *
  *  file tree traversal
  *
- *  $Id: os_ftw.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_ftw.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 # include /**/ <ftw.h>
 #endif /* !ACE_LACKS_FTW_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_FTW_H */
diff --git a/dep/acelite/ace/os_include/os_glob.h b/dep/acelite/ace/os_include/os_glob.h
index 0ced3a362..9d1db790d 100644
--- a/dep/acelite/ace/os_include/os_glob.h
+++ b/dep/acelite/ace/os_include/os_glob.h
@@ -6,7 +6,7 @@
  *
  *  pathname pattern-matching types
  *
- *  $Id: os_glob.h 81692 2008-05-14 12:25:02Z johnnyw $
+ *  $Id: os_glob.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 # include /**/ <glob.h>
 #endif /* !ACE_LACKS_GLOB_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_GLOB_H */
diff --git a/dep/acelite/ace/os_include/os_grp.h b/dep/acelite/ace/os_include/os_grp.h
index 74bb6e647..b776e960f 100644
--- a/dep/acelite/ace/os_include/os_grp.h
+++ b/dep/acelite/ace/os_include/os_grp.h
@@ -6,7 +6,7 @@
  *
  *  group structure
  *
- *  $Id: os_grp.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_grp.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 # include /**/ <grp.h>
 #endif /* !ACE_LACKS_GRP_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_GRP_H */
diff --git a/dep/acelite/ace/os_include/os_iconv.h b/dep/acelite/ace/os_include/os_iconv.h
index 33b061cd7..bf245e9a7 100644
--- a/dep/acelite/ace/os_include/os_iconv.h
+++ b/dep/acelite/ace/os_include/os_iconv.h
@@ -6,7 +6,7 @@
  *
  *  codeset conversion facility
  *
- *  $Id: os_iconv.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_iconv.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 # include /**/ <iconv.h>
 #endif /* !ACE_LACKS_ICONV_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_ICONV_H */
diff --git a/dep/acelite/ace/os_include/os_ifaddrs.h b/dep/acelite/ace/os_include/os_ifaddrs.h
index 1009c592a..80cc773eb 100644
--- a/dep/acelite/ace/os_include/os_ifaddrs.h
+++ b/dep/acelite/ace/os_include/os_ifaddrs.h
@@ -6,7 +6,7 @@
  *
  *  os_ifaddrs.h include
  *
- *  $Id: os_ifaddrs.h 93622 2011-03-22 15:45:57Z johnnyw $
+ *  $Id: os_ifaddrs.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
  */
@@ -29,15 +29,5 @@
 #  include /**/ <ifaddrs.h>
 #endif /*ACE_VXWORKS */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_IFADDRS_H */
diff --git a/dep/acelite/ace/os_include/os_inttypes.h b/dep/acelite/ace/os_include/os_inttypes.h
index 2f0c18869..570cbe5c5 100644
--- a/dep/acelite/ace/os_include/os_inttypes.h
+++ b/dep/acelite/ace/os_include/os_inttypes.h
@@ -6,7 +6,7 @@
  *
  *  fixed size integer types
  *
- *  $Id: os_inttypes.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_inttypes.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,17 +30,5 @@
 # include /**/ <inttypes.h>
 #endif /* !ACE_LACKS_INTTYPES_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-// @todo if needbe, we can define the macros if they aren't available.
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_INTTYPES_H */
diff --git a/dep/acelite/ace/os_include/os_iso646.h b/dep/acelite/ace/os_include/os_iso646.h
index 0c5ab2ae4..998b7e98e 100644
--- a/dep/acelite/ace/os_include/os_iso646.h
+++ b/dep/acelite/ace/os_include/os_iso646.h
@@ -6,7 +6,7 @@
  *
  *  alternative spellings
  *
- *  $Id: os_iso646.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_iso646.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 # include /**/ <iso646.h>
 #endif /* !ACE_LACKS_ISO646_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_ISO646_H */
diff --git a/dep/acelite/ace/os_include/os_kstat.h b/dep/acelite/ace/os_include/os_kstat.h
index 31836cd27..e311ccf56 100644
--- a/dep/acelite/ace/os_include/os_kstat.h
+++ b/dep/acelite/ace/os_include/os_kstat.h
@@ -4,7 +4,7 @@
 /**
  *  @file    os_kstat.h
  *
- *  $Id: os_kstat.h 81692 2008-05-14 12:25:02Z johnnyw $
+ *  $Id: os_kstat.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
  */
@@ -29,15 +29,5 @@
 # include <kstat.h>
 #endif /* ACE_HAS_KSTAT_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_KSTAT_H */
diff --git a/dep/acelite/ace/os_include/os_langinfo.h b/dep/acelite/ace/os_include/os_langinfo.h
index bfcd67cc2..e7274e844 100644
--- a/dep/acelite/ace/os_include/os_langinfo.h
+++ b/dep/acelite/ace/os_include/os_langinfo.h
@@ -6,7 +6,7 @@
  *
  *  language information constants
  *
- *  $Id: os_langinfo.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_langinfo.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystem.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 # include /**/ <langinfo.h>
 #endif /* !ACE_LACKS_LANGINFO_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_LANGINFO_H */
diff --git a/dep/acelite/ace/os_include/os_libgen.h b/dep/acelite/ace/os_include/os_libgen.h
index ca24a4d7f..db0027b24 100644
--- a/dep/acelite/ace/os_include/os_libgen.h
+++ b/dep/acelite/ace/os_include/os_libgen.h
@@ -6,7 +6,7 @@
  *
  *  definitions for pattern matching functions
  *
- *  $Id: os_libgen.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_libgen.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 # include /**/ <libgen.h>
 #endif /* !ACE_LACKS_LIBGEN_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_LIBGEN_H */
diff --git a/dep/acelite/ace/os_include/os_limits.h b/dep/acelite/ace/os_include/os_limits.h
index c0e5e2391..7fe6fa251 100644
--- a/dep/acelite/ace/os_include/os_limits.h
+++ b/dep/acelite/ace/os_include/os_limits.h
@@ -6,7 +6,7 @@
  *
  *  implementation-defined constants
  *
- *  $Id: os_limits.h 93359 2011-02-11 11:33:12Z mcorino $
+ *  $Id: os_limits.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/os_local.h b/dep/acelite/ace/os_include/os_local.h
index b5752f9ab..2900be95b 100644
--- a/dep/acelite/ace/os_include/os_local.h
+++ b/dep/acelite/ace/os_include/os_local.h
@@ -6,7 +6,7 @@
  *
  *  category macros
  *
- *  $Id: os_local.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_local.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 # include /**/ <local.h>
 #endif /* !ACE_LACKS_LOCAL_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_LOCAL_H */
diff --git a/dep/acelite/ace/os_include/os_math.h b/dep/acelite/ace/os_include/os_math.h
index 6fb53cb15..ee2dc69f2 100644
--- a/dep/acelite/ace/os_include/os_math.h
+++ b/dep/acelite/ace/os_include/os_math.h
@@ -6,7 +6,7 @@
  *
  *  mathematical declarations
  *
- *  $Id: os_math.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_math.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 # include /**/ <math.h>
 #endif /* !ACE_LACKS_MATH_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_MATH_H */
diff --git a/dep/acelite/ace/os_include/os_monetary.h b/dep/acelite/ace/os_include/os_monetary.h
index 6e956885a..4fc2815ba 100644
--- a/dep/acelite/ace/os_include/os_monetary.h
+++ b/dep/acelite/ace/os_include/os_monetary.h
@@ -6,7 +6,7 @@
  *
  *  monetary types
  *
- *  $Id: os_monetary.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_monetary.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 # include /**/ <monetary.h>
 #endif /* !ACE_LACKS_MONETARY_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_MONETARY_H */
diff --git a/dep/acelite/ace/os_include/os_mqueue.h b/dep/acelite/ace/os_include/os_mqueue.h
index 7b3cbb920..9577d9eb2 100644
--- a/dep/acelite/ace/os_include/os_mqueue.h
+++ b/dep/acelite/ace/os_include/os_mqueue.h
@@ -6,7 +6,7 @@
  *
  *  message queues (REALTIME)
  *
- *  $Id: os_mqueue.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_mqueue.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 # include /**/ <mqueue.h>
 #endif /* !ACE_LACKS_MQUEUE_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_MQUEUE_H */
diff --git a/dep/acelite/ace/os_include/os_ndbm.h b/dep/acelite/ace/os_include/os_ndbm.h
index 042dcebf2..7d934ec1f 100644
--- a/dep/acelite/ace/os_include/os_ndbm.h
+++ b/dep/acelite/ace/os_include/os_ndbm.h
@@ -6,7 +6,7 @@
  *
  *  definitions for ndbm database operations
  *
- *  $Id: os_ndbm.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_ndbm.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 # include /**/ <ndbm.h>
 #endif /* !ACE_LACKS_NDBM_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_NDBM_H */
diff --git a/dep/acelite/ace/os_include/os_nl_types.h b/dep/acelite/ace/os_include/os_nl_types.h
index e043f6ae6..bb199a107 100644
--- a/dep/acelite/ace/os_include/os_nl_types.h
+++ b/dep/acelite/ace/os_include/os_nl_types.h
@@ -6,7 +6,7 @@
  *
  *  data types
  *
- *  $Id: os_nl_types.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_nl_types.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 # include /**/ <nl_types.h>
 #endif /* !ACE_LACKS_nl_types_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_NL_TYPES_H */
diff --git a/dep/acelite/ace/os_include/os_pdh.h b/dep/acelite/ace/os_include/os_pdh.h
index 5c60c60d1..6eed83408 100644
--- a/dep/acelite/ace/os_include/os_pdh.h
+++ b/dep/acelite/ace/os_include/os_pdh.h
@@ -6,7 +6,7 @@
  *
  *  definitions for the windows pdh API
  *
- *  $Id: os_pdh.h 81614 2008-05-05 14:04:25Z johnnyw $
+ *  $Id: os_pdh.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
  */
@@ -31,15 +31,5 @@
 # define ACE_HAS_WIN32_PDH
 #endif
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_PDH_H */
diff --git a/dep/acelite/ace/os_include/os_pdhmsg.h b/dep/acelite/ace/os_include/os_pdhmsg.h
index 2156236e0..467f3c3bf 100644
--- a/dep/acelite/ace/os_include/os_pdhmsg.h
+++ b/dep/acelite/ace/os_include/os_pdhmsg.h
@@ -6,7 +6,7 @@
  *
  *  definitions for the windows pdh API
  *
- *  $Id: os_pdhmsg.h 81693 2008-05-14 12:35:01Z johnnyw $
+ *  $Id: os_pdhmsg.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
  */
@@ -27,15 +27,5 @@
 # include /**/ <pdhmsg.h>
 #endif /* ACE_HAS_PDH_H && !ACE_LACKS_PDH_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_PDHMSG_H */
diff --git a/dep/acelite/ace/os_include/os_poll.h b/dep/acelite/ace/os_include/os_poll.h
index 646c1bb85..9f491f79a 100644
--- a/dep/acelite/ace/os_include/os_poll.h
+++ b/dep/acelite/ace/os_include/os_poll.h
@@ -6,7 +6,7 @@
  *
  *  definitions for the poll() function
  *
- *  $Id: os_poll.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_poll.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 # include /**/ <poll.h>
 #endif /* !ACE_LACKS_POLL_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_POLL_H */
diff --git a/dep/acelite/ace/os_include/os_pwd.h b/dep/acelite/ace/os_include/os_pwd.h
index a478a770b..74817c45b 100644
--- a/dep/acelite/ace/os_include/os_pwd.h
+++ b/dep/acelite/ace/os_include/os_pwd.h
@@ -6,7 +6,7 @@
  *
  *  password structure
  *
- *  $Id: os_pwd.h 93564 2011-03-16 14:35:58Z olli $
+ *  $Id: os_pwd.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,16 +30,5 @@
 # include /**/ <pwd.h>
 #endif /* !ACE_LACKS_PWD_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_PWD_H */
diff --git a/dep/acelite/ace/os_include/os_regex.h b/dep/acelite/ace/os_include/os_regex.h
index 1c856da26..338ac9d40 100644
--- a/dep/acelite/ace/os_include/os_regex.h
+++ b/dep/acelite/ace/os_include/os_regex.h
@@ -6,7 +6,7 @@
  *
  *  regular expression matching types
  *
- *  $Id: os_regex.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_regex.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -34,15 +34,5 @@
 #  include /**/ <regexpr.h>
 #endif /* ACE_HAS_REGEX */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_REGEX_H */
diff --git a/dep/acelite/ace/os_include/os_search.h b/dep/acelite/ace/os_include/os_search.h
index 605fd365c..dc846aae8 100644
--- a/dep/acelite/ace/os_include/os_search.h
+++ b/dep/acelite/ace/os_include/os_search.h
@@ -6,7 +6,7 @@
  *
  *  search tables
  *
- *  $Id: os_search.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_search.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 # include /**/ <search.h>
 #endif /* !ACE_LACKS_SEARCH_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_SEARCH_H */
diff --git a/dep/acelite/ace/os_include/os_setjmp.h b/dep/acelite/ace/os_include/os_setjmp.h
index 2ab4a18a9..2d347e678 100644
--- a/dep/acelite/ace/os_include/os_setjmp.h
+++ b/dep/acelite/ace/os_include/os_setjmp.h
@@ -6,7 +6,7 @@
  *
  *  stack environment declarations
  *
- *  $Id: os_setjmp.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_setjmp.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 # include /**/ <setjmp.h>
 #endif /* !ACE_LACKS_SETJMP_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_SETJMP_H */
diff --git a/dep/acelite/ace/os_include/os_signal.h b/dep/acelite/ace/os_include/os_signal.h
index 14e12a811..46e390289 100644
--- a/dep/acelite/ace/os_include/os_signal.h
+++ b/dep/acelite/ace/os_include/os_signal.h
@@ -6,7 +6,7 @@
  *
  *  signals
  *
- *  $Id: os_signal.h 95430 2012-01-11 20:45:28Z mcorino $
+ *  $Id: os_signal.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/os_spawn.h b/dep/acelite/ace/os_include/os_spawn.h
index 0f825640f..64f84db20 100644
--- a/dep/acelite/ace/os_include/os_spawn.h
+++ b/dep/acelite/ace/os_include/os_spawn.h
@@ -6,7 +6,7 @@
  *
  *  spawn (ADVANCED REALTIME)
  *
- *  $Id: os_spawn.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_spawn.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -32,15 +32,5 @@
 # include /**/ <spawn.h>
 #endif /* !ACE_LACKS_SPAWN_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_SPAWN_H */
diff --git a/dep/acelite/ace/os_include/os_stdarg.h b/dep/acelite/ace/os_include/os_stdarg.h
index 0e9d234b5..19dfc60cd 100644
--- a/dep/acelite/ace/os_include/os_stdarg.h
+++ b/dep/acelite/ace/os_include/os_stdarg.h
@@ -6,7 +6,7 @@
  *
  *  handle variable argument list
  *
- *  $Id: os_stdarg.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_stdarg.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -36,15 +36,5 @@
 #endif
 #endif
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_STDARG_H */
diff --git a/dep/acelite/ace/os_include/os_stdbool.h b/dep/acelite/ace/os_include/os_stdbool.h
index ddb3f8e0d..4fb257a6d 100644
--- a/dep/acelite/ace/os_include/os_stdbool.h
+++ b/dep/acelite/ace/os_include/os_stdbool.h
@@ -6,7 +6,7 @@
  *
  *  boolean type and values
  *
- *  $Id: os_stdbool.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_stdbool.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 # include /**/ <stdbool.h>
 #endif /* !ACE_LACKS_STDBOOL_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_STDBOOL_H */
diff --git a/dep/acelite/ace/os_include/os_stddef.h b/dep/acelite/ace/os_include/os_stddef.h
index 55ec50192..6ea31640f 100644
--- a/dep/acelite/ace/os_include/os_stddef.h
+++ b/dep/acelite/ace/os_include/os_stddef.h
@@ -6,7 +6,7 @@
  *
  *  standard type definitions
  *
- *  $Id: os_stddef.h 89759 2010-04-06 06:07:24Z johnnyw $
+ *  $Id: os_stddef.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -20,7 +20,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/os_stdint.h b/dep/acelite/ace/os_include/os_stdint.h
index ac6fec664..53114e9ae 100644
--- a/dep/acelite/ace/os_include/os_stdint.h
+++ b/dep/acelite/ace/os_include/os_stdint.h
@@ -6,7 +6,7 @@
  *
  *  integer types
  *
- *  $Id: os_stdint.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_stdint.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/os_stdio.h b/dep/acelite/ace/os_include/os_stdio.h
index fe2a7e305..fcaaa69f0 100644
--- a/dep/acelite/ace/os_include/os_stdio.h
+++ b/dep/acelite/ace/os_include/os_stdio.h
@@ -6,7 +6,7 @@
  *
  *  standard buffered input/output
  *
- *  $Id: os_stdio.h 93597 2011-03-21 12:54:52Z johnnyw $
+ *  $Id: os_stdio.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/os_stdlib.h b/dep/acelite/ace/os_include/os_stdlib.h
index 5576b142c..293212871 100644
--- a/dep/acelite/ace/os_include/os_stdlib.h
+++ b/dep/acelite/ace/os_include/os_stdlib.h
@@ -6,7 +6,7 @@
  *
  *  standard library definitions
  *
- *  $Id: os_stdlib.h 93573 2011-03-17 07:53:03Z olli $
+ *  $Id: os_stdlib.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/os_string.h b/dep/acelite/ace/os_include/os_string.h
index 779e97cf9..a74d7119f 100644
--- a/dep/acelite/ace/os_include/os_string.h
+++ b/dep/acelite/ace/os_include/os_string.h
@@ -6,7 +6,7 @@
  *
  *  string operations
  *
- *  $Id: os_string.h 93117 2011-01-20 12:11:28Z mcorino $
+ *  $Id: os_string.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,20 +30,5 @@
 # include /**/ <string.h>
 #endif /* !ACE_LACKS_STRING_H */
 
-
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#if defined (ACE_LACKS_STRTOK_R_PROTOTYPE) && !defined (_POSIX_SOURCE)
-  char *strtok_r (char *s, const char *delim, char **save_ptr);
-#endif  /* ACE_LACKS_STRTOK_R_PROTOTYPE */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_STRING_H */
diff --git a/dep/acelite/ace/os_include/os_stropts.h b/dep/acelite/ace/os_include/os_stropts.h
index daf7d41a2..3e347eff0 100644
--- a/dep/acelite/ace/os_include/os_stropts.h
+++ b/dep/acelite/ace/os_include/os_stropts.h
@@ -6,7 +6,7 @@
  *
  *  STREAMS interface (STREAMS)
  *
- *  $Id: os_stropts.h 92179 2010-10-08 07:50:07Z olli $
+ *  $Id: os_stropts.h 97874 2014-09-08 12:10:55Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -78,7 +78,7 @@ extern "C"
 #endif /* __cplusplus */
 
 #if defined (ACE_LACKS_STRRECVFD)
-   struct strrecvfd {};
+   struct strrecvfd {  int dummy; };
 #endif /* ACE_LACKS_STRRECVFD */
 
 # if !defined (SIOCGIFBRDADDR)
diff --git a/dep/acelite/ace/os_include/os_syslog.h b/dep/acelite/ace/os_include/os_syslog.h
index d448b7491..c0bc75200 100644
--- a/dep/acelite/ace/os_include/os_syslog.h
+++ b/dep/acelite/ace/os_include/os_syslog.h
@@ -6,7 +6,7 @@
  *
  *  definitions for system error logging
  *
- *  $Id: os_syslog.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_syslog.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 #  include /**/ <syslog.h>
 #endif /* !ACE_LACKS_SYSLOG_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_SYSLOG_H */
diff --git a/dep/acelite/ace/os_include/os_tar.h b/dep/acelite/ace/os_include/os_tar.h
index 007925022..47054e9b4 100644
--- a/dep/acelite/ace/os_include/os_tar.h
+++ b/dep/acelite/ace/os_include/os_tar.h
@@ -6,7 +6,7 @@
  *
  *  extended tar definitions
  *
- *  $Id: os_tar.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_tar.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 #  include /**/ <tar.h>
 #endif /* !ACE_LACKS_TAR_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_TAR_H */
diff --git a/dep/acelite/ace/os_include/os_termios.h b/dep/acelite/ace/os_include/os_termios.h
index 9dfd38622..61e6988b4 100644
--- a/dep/acelite/ace/os_include/os_termios.h
+++ b/dep/acelite/ace/os_include/os_termios.h
@@ -6,7 +6,7 @@
  *
  *  define values for termios
  *
- *  $Id: os_termios.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_termios.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -32,15 +32,5 @@
 #  include /**/ <sys/modem.h>
 #endif /* HPUX */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_TERMIOS_H */
diff --git a/dep/acelite/ace/os_include/os_tgmath.h b/dep/acelite/ace/os_include/os_tgmath.h
index 6d9f2c2db..5f8c61392 100644
--- a/dep/acelite/ace/os_include/os_tgmath.h
+++ b/dep/acelite/ace/os_include/os_tgmath.h
@@ -6,7 +6,7 @@
  *
  *  type-generic macros
  *
- *  $Id: os_tgmath.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_tgmath.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -31,15 +31,5 @@
 #  include /**/ <tgmath.h>
 #endif /* !ACE_LACKS_TGMATH_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_TGMATH_H */
diff --git a/dep/acelite/ace/os_include/os_time.h b/dep/acelite/ace/os_include/os_time.h
index 65972496c..033ea26c5 100644
--- a/dep/acelite/ace/os_include/os_time.h
+++ b/dep/acelite/ace/os_include/os_time.h
@@ -6,7 +6,7 @@
  *
  *  time types
  *
- *  $Id: os_time.h 91683 2010-09-09 09:07:49Z johnnyw $
+ *  $Id: os_time.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/os_trace.h b/dep/acelite/ace/os_include/os_trace.h
index fd89d54b2..14a1ee1f4 100644
--- a/dep/acelite/ace/os_include/os_trace.h
+++ b/dep/acelite/ace/os_include/os_trace.h
@@ -6,7 +6,7 @@
  *
  *  tracing
  *
- *  $Id: os_trace.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_trace.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 #  include /**/ <trace.h>
 #endif /* !ACE_LACKS_TRACE_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_TRACE_H */
diff --git a/dep/acelite/ace/os_include/os_typeinfo.h b/dep/acelite/ace/os_include/os_typeinfo.h
index 3ad1b16ef..c74b703da 100644
--- a/dep/acelite/ace/os_include/os_typeinfo.h
+++ b/dep/acelite/ace/os_include/os_typeinfo.h
@@ -6,7 +6,7 @@
  *
  *  definitions for the typeinfo file
  *
- *  $Id: os_typeinfo.h 84160 2009-01-14 14:13:58Z johnnyw $
+ *  $Id: os_typeinfo.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton Johnny Willemsen  <jwillemsen@remedy.nl>
  */
@@ -25,15 +25,5 @@
 
 # include /**/ <typeinfo>
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_TYPEINFO_H */
diff --git a/dep/acelite/ace/os_include/os_ucontext.h b/dep/acelite/ace/os_include/os_ucontext.h
index f62be80e5..4ba4430f2 100644
--- a/dep/acelite/ace/os_include/os_ucontext.h
+++ b/dep/acelite/ace/os_include/os_ucontext.h
@@ -6,7 +6,7 @@
  *
  *  user context
  *
- *  $Id: os_ucontext.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_ucontext.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/os_ulimit.h b/dep/acelite/ace/os_include/os_ulimit.h
index 8593c0d95..e7256e19f 100644
--- a/dep/acelite/ace/os_include/os_ulimit.h
+++ b/dep/acelite/ace/os_include/os_ulimit.h
@@ -6,7 +6,7 @@
  *
  *  ulimit commands
  *
- *  $Id: os_ulimit.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_ulimit.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -28,15 +28,5 @@
 #  include /**/ <ulimit.h>
 #endif /* !ACE_LACKS_ULIMIT_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_ULIMIT_H */
diff --git a/dep/acelite/ace/os_include/os_unistd.h b/dep/acelite/ace/os_include/os_unistd.h
index 61b07cdd3..6c10ebf1e 100644
--- a/dep/acelite/ace/os_include/os_unistd.h
+++ b/dep/acelite/ace/os_include/os_unistd.h
@@ -6,7 +6,7 @@
  *
  *  standard symbolic constants and types
  *
- *  $Id: os_unistd.h 92183 2010-10-08 08:44:15Z olli $
+ *  $Id: os_unistd.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/os_utime.h b/dep/acelite/ace/os_include/os_utime.h
index 703da8b14..4aa411998 100644
--- a/dep/acelite/ace/os_include/os_utime.h
+++ b/dep/acelite/ace/os_include/os_utime.h
@@ -6,7 +6,7 @@
  *
  *  access and modification times structure
  *
- *  $Id: os_utime.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_utime.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 #  include /**/ <utime.h>
 #endif /* !ACE_LACKS_UTIME_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_UTIME_H */
diff --git a/dep/acelite/ace/os_include/os_utmpx.h b/dep/acelite/ace/os_include/os_utmpx.h
index 74ef305d4..dd97c07dd 100644
--- a/dep/acelite/ace/os_include/os_utmpx.h
+++ b/dep/acelite/ace/os_include/os_utmpx.h
@@ -6,7 +6,7 @@
  *
  *  user accounting database definitions
  *
- *  $Id: os_utmpx.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_utmpx.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 #  include /**/ <utmpx.h>
 #endif /* !ACE_LACKS_UTMPX_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_UTMPX_H */
diff --git a/dep/acelite/ace/os_include/os_wchar.h b/dep/acelite/ace/os_include/os_wchar.h
index 86f6572bc..d215ab79e 100644
--- a/dep/acelite/ace/os_include/os_wchar.h
+++ b/dep/acelite/ace/os_include/os_wchar.h
@@ -6,7 +6,7 @@
  *
  *  wide-character handling
  *
- *  $Id: os_wchar.h 93117 2011-01-20 12:11:28Z mcorino $
+ *  $Id: os_wchar.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -35,15 +35,5 @@
 #  include /**/ <wchar.h>
 #endif /* !ACE_LACKS_WCHAR_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_WCHAR_H */
diff --git a/dep/acelite/ace/os_include/os_wctype.h b/dep/acelite/ace/os_include/os_wctype.h
index 15aa295a6..c397ce8aa 100644
--- a/dep/acelite/ace/os_include/os_wctype.h
+++ b/dep/acelite/ace/os_include/os_wctype.h
@@ -6,7 +6,7 @@
  *
  *  wide-character classification and mapping utilities
  *
- *  $Id: os_wctype.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_wctype.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -31,15 +31,5 @@
 #  include /**/ <wctype.h>
 #endif /* !ACE_LACKS_WCTYPE_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_WCTYPE_H */
diff --git a/dep/acelite/ace/os_include/os_wordexp.h b/dep/acelite/ace/os_include/os_wordexp.h
index 76960076d..a82cbe1a4 100644
--- a/dep/acelite/ace/os_include/os_wordexp.h
+++ b/dep/acelite/ace/os_include/os_wordexp.h
@@ -6,7 +6,7 @@
  *
  *  word-expansion types
  *
- *  $Id: os_wordexp.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_wordexp.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -30,15 +30,5 @@
 #  include /**/ <wordexp.h>
 #endif /* !ACE_LACKS_WORDEXP_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_WORDEXP_H */
diff --git a/dep/acelite/ace/os_include/sys/os_ipc.h b/dep/acelite/ace/os_include/sys/os_ipc.h
index bea65e5e7..883f5d148 100644
--- a/dep/acelite/ace/os_include/sys/os_ipc.h
+++ b/dep/acelite/ace/os_include/sys/os_ipc.h
@@ -6,7 +6,7 @@
  *
  *  XSI interprocess communication access structure
  *
- *  $Id: os_ipc.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_ipc.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/sys/os_loadavg.h b/dep/acelite/ace/os_include/sys/os_loadavg.h
index 6eeeb69be..7a675aac7 100644
--- a/dep/acelite/ace/os_include/sys/os_loadavg.h
+++ b/dep/acelite/ace/os_include/sys/os_loadavg.h
@@ -6,7 +6,7 @@
  *
  *  loadavg functions
  *
- *  $Id: os_loadavg.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_loadavg.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
  */
@@ -27,15 +27,5 @@
 # include /**/ <sys/loadavg.h>
 #endif /* ACE_HAS_SYS_LOADAVG_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_SYS_OS_LOADAVG_H */
diff --git a/dep/acelite/ace/os_include/sys/os_mman.h b/dep/acelite/ace/os_include/sys/os_mman.h
index 5a8337d21..f91f5b4a1 100644
--- a/dep/acelite/ace/os_include/sys/os_mman.h
+++ b/dep/acelite/ace/os_include/sys/os_mman.h
@@ -6,7 +6,7 @@
  *
  *  memory management declarations
  *
- *  $Id: os_mman.h 91688 2010-09-09 11:21:50Z johnnyw $
+ *  $Id: os_mman.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/sys/os_msg.h b/dep/acelite/ace/os_include/sys/os_msg.h
index fa7edad1e..c1b2c9a01 100644
--- a/dep/acelite/ace/os_include/sys/os_msg.h
+++ b/dep/acelite/ace/os_include/sys/os_msg.h
@@ -6,7 +6,7 @@
  *
  *  XSI message queue structures
  *
- *  $Id: os_msg.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_msg.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/sys/os_pstat.h b/dep/acelite/ace/os_include/sys/os_pstat.h
index dcb3467b6..8b3da508e 100644
--- a/dep/acelite/ace/os_include/sys/os_pstat.h
+++ b/dep/acelite/ace/os_include/sys/os_pstat.h
@@ -6,7 +6,7 @@
  *
  *  pstat functions
  *
- *  $Id: os_pstat.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_pstat.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
  */
@@ -28,15 +28,5 @@
 #  include /**/ <sys/pstat.h>
 #endif /* ACE_HAS_SYS_PSTAT_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_SYS_OS_PSTAT_H */
diff --git a/dep/acelite/ace/os_include/sys/os_resource.h b/dep/acelite/ace/os_include/sys/os_resource.h
index 3ee101438..ca44c88e1 100644
--- a/dep/acelite/ace/os_include/sys/os_resource.h
+++ b/dep/acelite/ace/os_include/sys/os_resource.h
@@ -6,7 +6,7 @@
  *
  *  definitions for XSI resource operations
  *
- *  $Id: os_resource.h 93895 2011-04-14 07:59:18Z olli $
+ *  $Id: os_resource.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/sys/os_select.h b/dep/acelite/ace/os_include/sys/os_select.h
index d6f7a36f7..8cfced1f6 100644
--- a/dep/acelite/ace/os_include/sys/os_select.h
+++ b/dep/acelite/ace/os_include/sys/os_select.h
@@ -6,7 +6,7 @@
  *
  *  select types
  *
- *  $Id: os_select.h 93359 2011-02-11 11:33:12Z mcorino $
+ *  $Id: os_select.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/sys/os_sem.h b/dep/acelite/ace/os_include/sys/os_sem.h
index 926092b7d..f11b8cab2 100644
--- a/dep/acelite/ace/os_include/sys/os_sem.h
+++ b/dep/acelite/ace/os_include/sys/os_sem.h
@@ -6,7 +6,7 @@
  *
  *  XSI semaphore facility
  *
- *  $Id: os_sem.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_sem.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/sys/os_shm.h b/dep/acelite/ace/os_include/sys/os_shm.h
index 79d502fec..cb592fca6 100644
--- a/dep/acelite/ace/os_include/sys/os_shm.h
+++ b/dep/acelite/ace/os_include/sys/os_shm.h
@@ -6,7 +6,7 @@
  *
  *  XSI shared memory facility
  *
- *  $Id: os_shm.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_shm.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/sys/os_socket.h b/dep/acelite/ace/os_include/sys/os_socket.h
index 9a2ff009f..a8bf06b94 100644
--- a/dep/acelite/ace/os_include/sys/os_socket.h
+++ b/dep/acelite/ace/os_include/sys/os_socket.h
@@ -6,7 +6,7 @@
  *
  *  main sockets header
  *
- *  $Id: os_socket.h 91781 2010-09-15 12:49:15Z johnnyw $
+ *  $Id: os_socket.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/sys/os_stat.h b/dep/acelite/ace/os_include/sys/os_stat.h
index d49872466..77d246fff 100644
--- a/dep/acelite/ace/os_include/sys/os_stat.h
+++ b/dep/acelite/ace/os_include/sys/os_stat.h
@@ -6,7 +6,7 @@
  *
  *  data returned by the stat() function
  *
- *  $Id: os_stat.h 95718 2012-05-01 11:42:47Z johnnyw $
+ *  $Id: os_stat.h 97491 2013-12-30 11:17:48Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -101,6 +101,11 @@ extern "C"
 # endif /* S_IFLNK */
 #endif /* S_ISLNK */
 
+// Visual Studio doesn't define S_ISDIR
+#if !defined (S_ISDIR)
+# define S_ISDIR(mode)   ((mode&S_IFMT) == S_IFDIR)
+#endif
+
 #if defined (ACE_HAS_WINCE)
 
 // Translate the WinCE bits into names expected by our callers.
diff --git a/dep/acelite/ace/os_include/sys/os_statvfs.h b/dep/acelite/ace/os_include/sys/os_statvfs.h
index 7988c4f50..fd9326450 100644
--- a/dep/acelite/ace/os_include/sys/os_statvfs.h
+++ b/dep/acelite/ace/os_include/sys/os_statvfs.h
@@ -6,7 +6,7 @@
  *
  *  VFS File System information structure
  *
- *  $Id: os_statvfs.h 81692 2008-05-14 12:25:02Z johnnyw $
+ *  $Id: os_statvfs.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,15 +28,5 @@
 #  include /**/ <sys/statvfs.h>
 #endif /* !ACE_LACKS_SYS_STATVFS_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_SYS_OS_STATVFS_H */
diff --git a/dep/acelite/ace/os_include/sys/os_sysctl.h b/dep/acelite/ace/os_include/sys/os_sysctl.h
index ee51cd7db..a9b51c640 100644
--- a/dep/acelite/ace/os_include/sys/os_sysctl.h
+++ b/dep/acelite/ace/os_include/sys/os_sysctl.h
@@ -6,7 +6,7 @@
  *
  *  declarations for sysctl
  *
- *  $Id: os_sysctl.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_sysctl.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
  */
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,15 +27,5 @@
 #  include /**/ <sys/sysctl.h>
 #endif /* !ACE_LACKS_SYS_SYSCTL_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_SYS_OS_SYSCTL_H */
diff --git a/dep/acelite/ace/os_include/sys/os_sysinfo.h b/dep/acelite/ace/os_include/sys/os_sysinfo.h
index 7aca1f44d..fef29fd81 100644
--- a/dep/acelite/ace/os_include/sys/os_sysinfo.h
+++ b/dep/acelite/ace/os_include/sys/os_sysinfo.h
@@ -4,7 +4,7 @@
 /**
  *  @file    os_sysinfo.h
  *
- *  $Id: os_sysinfo.h 81692 2008-05-14 12:25:02Z johnnyw $
+ *  $Id: os_sysinfo.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
  */
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,15 +25,5 @@
 #  include /**/ <sys/sysinfo.h>
 #endif /* ACE_HAS_SYS_SYSINFO_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_SYS_OS_SYSINFO_H */
diff --git a/dep/acelite/ace/os_include/sys/os_time.h b/dep/acelite/ace/os_include/sys/os_time.h
index 29e317d58..f2141d048 100644
--- a/dep/acelite/ace/os_include/sys/os_time.h
+++ b/dep/acelite/ace/os_include/sys/os_time.h
@@ -6,7 +6,7 @@
  *
  *  time types
  *
- *  $Id: os_time.h 96090 2012-08-22 06:13:38Z johnnyw $
+ *  $Id: os_time.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/sys/os_timeb.h b/dep/acelite/ace/os_include/sys/os_timeb.h
index cf10566ed..47dc36932 100644
--- a/dep/acelite/ace/os_include/sys/os_timeb.h
+++ b/dep/acelite/ace/os_include/sys/os_timeb.h
@@ -6,7 +6,7 @@
  *
  *  additional definitions for date and time
  *
- *  $Id: os_timeb.h 83306 2008-10-17 12:19:53Z johnnyw $
+ *  $Id: os_timeb.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,15 +30,5 @@
 #  include /**/ <sys/timeb.h>
 #endif /* !ACE_LACKS_SYS_TIMEB_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_SYS_OS_TIMEB_H */
diff --git a/dep/acelite/ace/os_include/sys/os_times.h b/dep/acelite/ace/os_include/sys/os_times.h
index 617b416ec..77ce9fa08 100644
--- a/dep/acelite/ace/os_include/sys/os_times.h
+++ b/dep/acelite/ace/os_include/sys/os_times.h
@@ -6,7 +6,7 @@
  *
  *  file access and modification times structure
  *
- *  $Id: os_times.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_times.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,15 +30,5 @@
 #  include /**/ <sys/times.h>
 #endif /* !ACE_LACKS_SYS_TIMES_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_SYS_OS_TIMES_H */
diff --git a/dep/acelite/ace/os_include/sys/os_types.h b/dep/acelite/ace/os_include/sys/os_types.h
index d29208992..4fa5fac4a 100644
--- a/dep/acelite/ace/os_include/sys/os_types.h
+++ b/dep/acelite/ace/os_include/sys/os_types.h
@@ -6,7 +6,7 @@
  *
  *  data types
  *
- *  $Id: os_types.h 96089 2012-08-21 16:59:07Z johnnyw $
+ *  $Id: os_types.h 97939 2014-10-27 12:30:12Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -137,7 +137,7 @@ typedef DWORD nlink_t;
   typedef unsigned long useconds_t;
 #endif
 
-#if defined (ACE_WIN32) && !defined(__MINGW32__)
+#if defined (ACE_LACKS_PID_T)
    typedef int pid_t;
 #endif /* ACE_WIN32 */
 
diff --git a/dep/acelite/ace/os_include/sys/os_uio.h b/dep/acelite/ace/os_include/sys/os_uio.h
index 7baaec57e..a771ad1c9 100644
--- a/dep/acelite/ace/os_include/sys/os_uio.h
+++ b/dep/acelite/ace/os_include/sys/os_uio.h
@@ -6,7 +6,7 @@
  *
  *  definitions for vector I/O operations
  *
- *  $Id: os_uio.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_uio.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/sys/os_un.h b/dep/acelite/ace/os_include/sys/os_un.h
index 04a4da0bd..dad04646a 100644
--- a/dep/acelite/ace/os_include/sys/os_un.h
+++ b/dep/acelite/ace/os_include/sys/os_un.h
@@ -6,7 +6,7 @@
  *
  *  definitions for UNIX domain sockets
  *
- *  $Id: os_un.h 85015 2009-04-03 12:27:59Z johnnyw $
+ *  $Id: os_un.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/os_include/sys/os_utsname.h b/dep/acelite/ace/os_include/sys/os_utsname.h
index d78d1e346..95e3f7c7a 100644
--- a/dep/acelite/ace/os_include/sys/os_utsname.h
+++ b/dep/acelite/ace/os_include/sys/os_utsname.h
@@ -6,7 +6,7 @@
  *
  *  system name structure
  *
- *  $Id: os_utsname.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_utsname.h 97827 2014-08-02 17:34:32Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,15 +28,5 @@
 #  include /**/ <sys/utsname.h>
 #endif /* !ACE_LACKS_SYS_UTSNAME_H */
 
-// Place all additions (especially function declarations) within extern "C" {}
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_OS_INCLUDE_SYS_OS_UTSNAME_H */
diff --git a/dep/acelite/ace/os_include/sys/os_wait.h b/dep/acelite/ace/os_include/sys/os_wait.h
index b7a219ac8..be5347ef0 100644
--- a/dep/acelite/ace/os_include/sys/os_wait.h
+++ b/dep/acelite/ace/os_include/sys/os_wait.h
@@ -6,7 +6,7 @@
  *
  *  declarations for waiting
  *
- *  $Id: os_wait.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: os_wait.h 97262 2013-08-09 08:32:10Z johnnyw $
  *
  *  @author Don Hinton <dhinton@dresystems.com>
  *  @author This code was originally in various places including ace/OS.h.
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/config-lite.h"
+#include /**/ "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/dep/acelite/ace/post.h b/dep/acelite/ace/post.h
index c393dfe50..e78627744 100644
--- a/dep/acelite/ace/post.h
+++ b/dep/acelite/ace/post.h
@@ -4,7 +4,7 @@
 /**
  *  @file    post.h
  *
- *  $Id: post.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: post.h 97602 2014-02-19 20:24:30Z johnnyw $
  *
  *  @author Christopher Kohlhoff <chris@kohlhoff.com>
  *
@@ -17,6 +17,9 @@
 # pragma pack (pop)
 #elif defined (__BORLANDC__)
 # pragma option pop
+# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x680)
+#  pragma option pop
+# endif
 # pragma nopushoptwarn
 # pragma nopackwarning
 #endif
diff --git a/dep/acelite/ace/pre.h b/dep/acelite/ace/pre.h
index 7cc32d8ff..dc4aef9ac 100644
--- a/dep/acelite/ace/pre.h
+++ b/dep/acelite/ace/pre.h
@@ -4,7 +4,7 @@
 /**
  *  @file    pre.h
  *
- *  $Id: pre.h 80826 2008-03-04 14:51:23Z wotte $
+ *  $Id: pre.h 97602 2014-02-19 20:24:30Z johnnyw $
  *
  *  @author Christopher Kohlhoff <chris@kohlhoff.com>
  *
@@ -19,6 +19,11 @@
 # pragma pack (push, 8)
 #elif defined (__BORLANDC__)
 # pragma option push -a8 -b -Ve- -Vx- -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl -w-sig
+# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x680)
+// False warning: Function defined with different linkage, reported to
+// Embarcadero as QC 117740
+#  pragma option push -w-8127
+# endif
 # pragma nopushoptwarn
 # pragma nopackwarning
 #endif
diff --git a/dep/src/bzip2/CMakeLists.txt b/dep/bzip2/CMakeLists.txt
similarity index 100%
rename from dep/src/bzip2/CMakeLists.txt
rename to dep/bzip2/CMakeLists.txt
index a3fc9fd62..d7da81449 100644
--- a/dep/src/bzip2/CMakeLists.txt
+++ b/dep/bzip2/CMakeLists.txt
@@ -1,3 +1,3 @@
 file(GLOB sources_bzip2 ./*.c)
-add_library(bzip2 ${sources_bzip2})
 
+add_library(bzip2 ${sources_bzip2})
diff --git a/dep/StormLibOld/src/bzip2/blocksort.c b/dep/bzip2/blocksort.c
similarity index 100%
rename from dep/StormLibOld/src/bzip2/blocksort.c
rename to dep/bzip2/blocksort.c
diff --git a/dep/StormLibOld/src/bzip2/bzlib.c b/dep/bzip2/bzlib.c
similarity index 99%
rename from dep/StormLibOld/src/bzip2/bzlib.c
rename to dep/bzip2/bzlib.c
index b98f3e586..245c3b8a0 100644
--- a/dep/StormLibOld/src/bzip2/bzlib.c
+++ b/dep/bzip2/bzlib.c
@@ -28,7 +28,6 @@
      bzBuffToBuffDecompress.  Fixed.
 */
 
-#define _CRT_SECURE_NO_WARNINGS
 #include "bzlib_private.h"
 
 
@@ -1377,6 +1376,7 @@ const char * BZ_API(BZ2_bzlibVersion)(void)
 #   include <fcntl.h>
 #   include <io.h>
 #   define SET_BINARY_MODE(file) _setmode(_fileno(file),O_BINARY)
+#   define fdopen(fd, mode) _fdopen((fd), (mode))
 #else
 #   define SET_BINARY_MODE(file)
 #endif
@@ -1429,7 +1429,7 @@ BZFILE * bzopen_or_bzdopen
 #ifdef BZ_STRICT_ANSI
       fp = NULL;
 #else
-      fp = _fdopen(fd,mode2);
+      fp = fdopen(fd,mode2);
 #endif
    }
    if (fp == NULL) return NULL;
diff --git a/dep/StormLibOld/src/bzip2/bzlib.h b/dep/bzip2/bzlib.h
similarity index 100%
rename from dep/StormLibOld/src/bzip2/bzlib.h
rename to dep/bzip2/bzlib.h
diff --git a/dep/StormLibOld/src/bzip2/bzlib_private.h b/dep/bzip2/bzlib_private.h
similarity index 100%
rename from dep/StormLibOld/src/bzip2/bzlib_private.h
rename to dep/bzip2/bzlib_private.h
diff --git a/dep/StormLibOld/src/bzip2/compress.c b/dep/bzip2/compress.c
similarity index 100%
rename from dep/StormLibOld/src/bzip2/compress.c
rename to dep/bzip2/compress.c
diff --git a/dep/StormLibOld/src/bzip2/crctable.c b/dep/bzip2/crctable.c
similarity index 100%
rename from dep/StormLibOld/src/bzip2/crctable.c
rename to dep/bzip2/crctable.c
diff --git a/dep/StormLibOld/src/bzip2/decompress.c b/dep/bzip2/decompress.c
similarity index 100%
rename from dep/StormLibOld/src/bzip2/decompress.c
rename to dep/bzip2/decompress.c
diff --git a/dep/StormLibOld/src/bzip2/huffman.c b/dep/bzip2/huffman.c
similarity index 100%
rename from dep/StormLibOld/src/bzip2/huffman.c
rename to dep/bzip2/huffman.c
diff --git a/dep/StormLibOld/src/bzip2/randtable.c b/dep/bzip2/randtable.c
similarity index 100%
rename from dep/StormLibOld/src/bzip2/randtable.c
rename to dep/bzip2/randtable.c
diff --git a/dep/g3dlite/CMakeLists.txt b/dep/g3dlite/CMakeLists.txt
new file mode 100644
index 000000000..e4b090f4e
--- /dev/null
+++ b/dep/g3dlite/CMakeLists.txt
@@ -0,0 +1,77 @@
+# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+set(LIBRARY_NAME g3dlite)
+
+set(LIBRARY_SRCS
+    G3D/AABox.cpp
+    G3D/Any.cpp
+    G3D/BinaryFormat.cpp
+    G3D/BinaryInput.cpp
+    G3D/BinaryOutput.cpp
+    G3D/Box.cpp
+    G3D/Capsule.cpp
+    G3D/CollisionDetection.cpp
+    G3D/CoordinateFrame.cpp
+    G3D/Crypto.cpp
+    G3D/Cylinder.cpp
+    G3D/FileSystem.cpp
+    G3D/Line.cpp
+    G3D/LineSegment.cpp
+    G3D/Log.cpp
+    G3D/Matrix3.cpp
+    G3D/Matrix4.cpp
+    G3D/MemoryManager.cpp
+    G3D/PhysicsFrame.cpp
+    G3D/Plane.cpp
+    G3D/Quat.cpp
+    G3D/Random.cpp
+    G3D/Ray.cpp
+    G3D/ReferenceCount.cpp
+    G3D/RegistryUtil.cpp
+    G3D/Sphere.cpp
+    G3D/System.cpp
+    G3D/TextInput.cpp
+    G3D/TextOutput.cpp
+    G3D/Triangle.cpp
+    G3D/UprightFrame.cpp
+    G3D/Vector2.cpp
+    G3D/Vector3.cpp
+    G3D/Vector4.cpp
+    G3D/debugAssert.cpp
+    G3D/fileutils.cpp
+    G3D/format.cpp
+    G3D/g3dfnmatch.cpp
+    G3D/g3dmath.cpp
+    G3D/prompt.cpp
+    G3D/stringutils.cpp
+    G3D/uint128.cpp
+)
+
+include_directories(
+  "${CMAKE_CURRENT_SOURCE_DIR}"
+  "${CMAKE_SOURCE_DIR}/dep/zlib"
+)
+
+add_library(${LIBRARY_NAME} STATIC
+  ${LIBRARY_SRCS}
+)
+
+if(WIN32)
+  target_link_libraries(${LIBRARY_NAME}
+    zlib
+  )
+endif()
diff --git a/dep/src/g3dlite/AABox.cpp b/dep/g3dlite/G3D/AABox.cpp
similarity index 82%
rename from dep/src/g3dlite/AABox.cpp
rename to dep/g3dlite/G3D/AABox.cpp
index 8e66456c0..60fd14829 100644
--- a/dep/src/g3dlite/AABox.cpp
+++ b/dep/g3dlite/G3D/AABox.cpp
@@ -140,9 +140,9 @@ bool AABox::intersects(const AABox& other) const {
 int AABox::dummy = 0;
 
 bool AABox::culledBy(
-    const Array<Plane>&	plane,
-    int&		cullingPlane,
-    const uint32	_inMask,
+    const Array<Plane>&    plane,
+    int&        cullingPlane,
+    const uint32    _inMask,
     uint32&             childMask) const {
 
     uint32 inMask = _inMask;
@@ -159,13 +159,13 @@ bool AABox::culledBy(
         (abs(hi.z) < G3D::finf());
 
     // See if there is one plane for which all of the
-	// vertices are in the negative half space.
+    // vertices are in the negative half space.
     for (int p = 0; p < plane.size(); ++p) {
 
-		// Only test planes that are not masked
-		if ((inMask & 1) != 0) {
-		
-			Vector3 corner;
+        // Only test planes that are not masked
+        if ((inMask & 1) != 0) {
+        
+            Vector3 corner;
 
             int numContained = 0;
             int v = 0;
@@ -173,12 +173,12 @@ bool AABox::culledBy(
             // We can early-out only if we have found one point on each
             // side of the plane (i.e. if we are straddling).  That
             // occurs when (numContained < v) && (numContained > 0)
-			for (v = 0; (v < 8) && ((numContained == v) || (numContained == 0)); ++v) {
+            for (v = 0; (v < 8) && ((numContained == v) || (numContained == 0)); ++v) {
                 // Unrolling these 3 if's into a switch decreases performance
                 // by about 2x
-				corner.x = (v & 1) ? hi.x : lo.x;
-				corner.y = (v & 2) ? hi.y : lo.y;
-				corner.z = (v & 4) ? hi.z : lo.z;
+                corner.x = (v & 1) ? hi.x : lo.x;
+                corner.y = (v & 2) ? hi.y : lo.y;
+                corner.z = (v & 4) ? hi.z : lo.z;
         
                 if (finite) { // this branch is highly predictable
                     if (plane[p].halfSpaceContainsFinite(corner)) {
@@ -189,43 +189,43 @@ bool AABox::culledBy(
                         ++numContained;
                     }
                 }
-			}
+            }
 
-			if (numContained == 0) {
-				// Plane p culled the box
-				cullingPlane = p;
+            if (numContained == 0) {
+                // Plane p culled the box
+                cullingPlane = p;
 
                 // The caller should not recurse into the children,
                 // since the parent is culled.  If they do recurse,
                 // make them only test against this one plane, which
                 // will immediately cull the volume.
                 childMask = 1 << p;
-				return true;
+                return true;
 
             } else if (numContained < v) {
                 // The bounding volume straddled the plane; we have
                 // to keep testing against this plane
                 childMask |= (1 << p);
             }
-		}
+        }
 
         // Move on to the next bit.
-		inMask = inMask >> 1;
+        inMask = inMask >> 1;
     }
 
     // None of the planes could cull this box
-	cullingPlane = -1;
+    cullingPlane = -1;
     return false;
 }
 
 
 bool AABox::culledBy(
     const Array<Plane>& plane,
-	int&				cullingPlane,
-	const uint32		_inMask) const {
+    int&                cullingPlane,
+    const uint32        _inMask) const {
 
-	uint32 inMask = _inMask;
-	assert(plane.size() < 31);
+    uint32 inMask = _inMask;
+    assert(plane.size() < 31);
     
     const bool finite = 
         (abs(lo.x) < G3D::finf()) &&
@@ -236,49 +236,49 @@ bool AABox::culledBy(
         (abs(hi.z) < G3D::finf());
 
     // See if there is one plane for which all of the
-	// vertices are in the negative half space.
+    // vertices are in the negative half space.
     for (int p = 0; p < plane.size(); ++p) {
 
-		// Only test planes that are not masked
-		if ((inMask & 1) != 0) {
-		
-			bool culled = true;
-			Vector3 corner;
+        // Only test planes that are not masked
+        if ((inMask & 1) != 0) {
+        
+            bool culled = true;
+            Vector3 corner;
 
             int v;
 
-			// Assume this plane culls all points.  See if there is a point
-			// not culled by the plane... early out when at least one point
+            // Assume this plane culls all points.  See if there is a point
+            // not culled by the plane... early out when at least one point
             // is in the positive half space.
-			for (v = 0; (v < 8) && culled; ++v) {
+            for (v = 0; (v < 8) && culled; ++v) {
 
                 // Unrolling these 3 if's into a switch decreases performance
                 // by about 2x
-				corner.x = (v & 1) ? hi.x : lo.x;
-				corner.y = (v & 2) ? hi.y : lo.y;
-				corner.z = (v & 4) ? hi.z : lo.z;
+                corner.x = (v & 1) ? hi.x : lo.x;
+                corner.y = (v & 2) ? hi.y : lo.y;
+                corner.z = (v & 4) ? hi.z : lo.z;
         
                 if (finite) { // this branch is highly predictable
                     culled = ! plane[p].halfSpaceContainsFinite(corner);
                 } else {
                     culled = ! plane[p].halfSpaceContains(corner);
                 }
-			}
-
-			if (culled) {
-				// Plane p culled the box
-				cullingPlane = p;
-
-				return true;
             }
-		}
+
+            if (culled) {
+                // Plane p culled the box
+                cullingPlane = p;
+
+                return true;
+            }
+        }
 
         // Move on to the next bit.
-		inMask = inMask >> 1;
+        inMask = inMask >> 1;
     }
 
     // None of the planes could cull this box
-	cullingPlane = -1;
+    cullingPlane = -1;
     return false;
 }
 
diff --git a/dep/include/g3dlite/G3D/AABox.h b/dep/g3dlite/G3D/AABox.h
similarity index 84%
rename from dep/include/g3dlite/G3D/AABox.h
rename to dep/g3dlite/G3D/AABox.h
index d57320d73..5b0181e1b 100644
--- a/dep/include/g3dlite/G3D/AABox.h
+++ b/dep/g3dlite/G3D/AABox.h
@@ -140,46 +140,46 @@ public:
      */
     void split(const Vector3::Axis& axis, float location, AABox& low, AABox& high) const;
 
-	/**
-	 Conservative culling test for up to 32 planes.	
-	 Returns true if there exists a <CODE>plane[p]</CODE> for
+    /**
+     Conservative culling test for up to 32 planes.    
+     Returns true if there exists a <CODE>plane[p]</CODE> for
      which the entire object is in the negative half space
      (opposite the plane normal).
 
-	 <CODE>testMask</CODE> and <CODE>childMask</CODE>
-	 are used for optimizing bounding volume hierarchies.
+     <CODE>testMask</CODE> and <CODE>childMask</CODE>
+     are used for optimizing bounding volume hierarchies.
      The version of this method that produces childMask
      is slower than the version without; it should only
      be used for parent nodes.
 
-	 @param cullingPlaneIndex The index of the first plane for which
-	  the entire object is in the negative half-space.  The function
-	  exits early when one plane is found.  -1 when the function
-	  returns false (i.e. when no plane culls the whole object).
+     @param cullingPlaneIndex The index of the first plane for which
+      the entire object is in the negative half-space.  The function
+      exits early when one plane is found.  -1 when the function
+      returns false (i.e. when no plane culls the whole object).
 
-	 @param testMask  If bit <I>p</I> is 0, the 
-	   bounding volume automatically passes the culling test for
-	   <CODE>plane[p]</CODE> (i.e. it is known that the volume
-	   is entirely within the positive half space).  The function
+     @param testMask  If bit <I>p</I> is 0, the 
+       bounding volume automatically passes the culling test for
+       <CODE>plane[p]</CODE> (i.e. it is known that the volume
+       is entirely within the positive half space).  The function
        must return false if testMask is 0 and test all planes
        when testMask is -1 (0xFFFFFFFF).
 
      @param childMask Test mask for the children of this volume.
        
-	 */
-	bool culledBy(
-		const Array<Plane>&		plane,
-		int32&					cullingPlaneIndex,
-		const uint32  			testMask,
+     */
+    bool culledBy(
+        const Array<Plane>&        plane,
+        int32&                    cullingPlaneIndex,
+        const uint32              testMask,
         uint32&                 childMask) const;
 
     /**
      Conservative culling test that does not produce a mask for children.
      */
-	bool culledBy(
-		const Array<Plane>&		plane,
-		int32&					cullingPlaneIndex = dummy,
-		const uint32  			testMask		  = 0xFFFFFFFF) const;
+    bool culledBy(
+        const Array<Plane>&        plane,
+        int32&                    cullingPlaneIndex = dummy,
+        const uint32              testMask          = 0xFFFFFFFF) const;
 
     /** less than or equal to containment */
     inline bool contains(const AABox& other) const {
diff --git a/dep/src/g3dlite/Any.cpp b/dep/g3dlite/G3D/Any.cpp
similarity index 99%
rename from dep/src/g3dlite/Any.cpp
rename to dep/g3dlite/G3D/Any.cpp
index 92159bb18..b421bb04a 100644
--- a/dep/src/g3dlite/Any.cpp
+++ b/dep/g3dlite/G3D/Any.cpp
@@ -1123,7 +1123,7 @@ void Any::readUntilCommaOrClose(TextInput& ti, Token& token) {
                 "Expected a comma or close paren");
         }
 
-	// Update checks
+    // Update checks
         atComma = isSeparator(token.string()[0]);
         atClose = (token.type() == Token::SYMBOL) && isClose(token.string()[0]);
     }
@@ -1162,7 +1162,7 @@ void Any::deserializeBody(TextInput& ti, Token& token) {
         }
 
         // Pointer the value being read
-        Any a = NULL;
+        Any a = 0;
         std::string key;
         
         if (m_type == TABLE) {
diff --git a/dep/include/g3dlite/G3D/Any.h b/dep/g3dlite/G3D/Any.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Any.h
rename to dep/g3dlite/G3D/Any.h
diff --git a/dep/src/g3dlite/AnyVal.cpp b/dep/g3dlite/G3D/AnyVal.cpp
similarity index 100%
rename from dep/src/g3dlite/AnyVal.cpp
rename to dep/g3dlite/G3D/AnyVal.cpp
diff --git a/dep/include/g3dlite/G3D/AnyVal.h b/dep/g3dlite/G3D/AnyVal.h
similarity index 100%
rename from dep/include/g3dlite/G3D/AnyVal.h
rename to dep/g3dlite/G3D/AnyVal.h
diff --git a/dep/src/g3dlite/AreaMemoryManager.cpp b/dep/g3dlite/G3D/AreaMemoryManager.cpp
similarity index 100%
rename from dep/src/g3dlite/AreaMemoryManager.cpp
rename to dep/g3dlite/G3D/AreaMemoryManager.cpp
diff --git a/dep/include/g3dlite/G3D/AreaMemoryManager.h b/dep/g3dlite/G3D/AreaMemoryManager.h
similarity index 100%
rename from dep/include/g3dlite/G3D/AreaMemoryManager.h
rename to dep/g3dlite/G3D/AreaMemoryManager.h
diff --git a/dep/include/g3dlite/G3D/Array.h b/dep/g3dlite/G3D/Array.h
similarity index 99%
rename from dep/include/g3dlite/G3D/Array.h
rename to dep/g3dlite/G3D/Array.h
index cc9e1d9dd..6744e8149 100644
--- a/dep/include/g3dlite/G3D/Array.h
+++ b/dep/g3dlite/G3D/Array.h
@@ -224,7 +224,7 @@ public:
 
    /**
     The array returned is only valid until the next append() or resize call, or 
-	the Array is deallocated.
+    the Array is deallocated.
     */
    T* getCArray() {
        return data;
@@ -232,7 +232,7 @@ public:
 
    /**
     The array returned is only valid until the next append() or resize call, or 
-	the Array is deallocated.
+    the Array is deallocated.
     */
    const T* getCArray() const {
        return data;
@@ -310,7 +310,7 @@ public:
        m_memoryManager->free(data);
        // Set to 0 in case this Array is global and gets referenced during app exit
        data = NULL;
-	   num = 0;
+       num = 0;
        numAllocated = 0;
    }
 
diff --git a/dep/include/g3dlite/G3D/AtomicInt32.h b/dep/g3dlite/G3D/AtomicInt32.h
similarity index 100%
rename from dep/include/g3dlite/G3D/AtomicInt32.h
rename to dep/g3dlite/G3D/AtomicInt32.h
diff --git a/dep/src/g3dlite/BinaryFormat.cpp b/dep/g3dlite/G3D/BinaryFormat.cpp
similarity index 100%
rename from dep/src/g3dlite/BinaryFormat.cpp
rename to dep/g3dlite/G3D/BinaryFormat.cpp
diff --git a/dep/include/g3dlite/G3D/BinaryFormat.h b/dep/g3dlite/G3D/BinaryFormat.h
similarity index 100%
rename from dep/include/g3dlite/G3D/BinaryFormat.h
rename to dep/g3dlite/G3D/BinaryFormat.h
diff --git a/dep/src/g3dlite/BinaryInput.cpp b/dep/g3dlite/G3D/BinaryInput.cpp
similarity index 97%
rename from dep/src/g3dlite/BinaryInput.cpp
rename to dep/g3dlite/G3D/BinaryInput.cpp
index 9d363fcb2..d7de47d1d 100644
--- a/dep/src/g3dlite/BinaryInput.cpp
+++ b/dep/g3dlite/G3D/BinaryInput.cpp
@@ -240,13 +240,13 @@ BinaryInput::BinaryInput(
         debugAssert(result == Z_OK); (void)result;
 
     } else {
-    	m_length = dataLen;
+        m_length = dataLen;
         m_bufferLength = m_length;
         if (! copyMemory) {
- 	        debugAssert(!m_freeBuffer);
+             debugAssert(!m_freeBuffer);
             m_buffer = const_cast<uint8*>(data);
         } else {
-	        debugAssert(m_freeBuffer);
+            debugAssert(m_freeBuffer);
             m_buffer = (uint8*)System::alignedMalloc(m_length, 16);
             System::memcpy(m_buffer, data, dataLen);
         }
@@ -346,13 +346,16 @@ BinaryInput::BinaryInput(
     }
     debugAssert(m_buffer);
     
-    fread(m_buffer, m_bufferLength, sizeof(int8), file);
+    size_t file_read = fread(m_buffer, m_bufferLength, sizeof(int8), file);
+    if (file_read <= 0) {
+        throw "Could not read compressed file. (2)";
+    }
     fclose(file);
     file = NULL;
 
     if (compressed) {
         if (m_bufferLength != m_length) {
-            throw "Not enough memory to load compressed file. (2)";
+            throw "Not enough memory to load compressed file. (3)";
         }
 
         decompress();
diff --git a/dep/include/g3dlite/G3D/BinaryInput.h b/dep/g3dlite/G3D/BinaryInput.h
similarity index 99%
rename from dep/include/g3dlite/G3D/BinaryInput.h
rename to dep/g3dlite/G3D/BinaryInput.h
index e8a9b8861..2bf2980cd 100644
--- a/dep/include/g3dlite/G3D/BinaryInput.h
+++ b/dep/g3dlite/G3D/BinaryInput.h
@@ -401,7 +401,7 @@ public:
       Returns true if the position is not at the end of the file
     */
     inline bool hasMore() const {
-	return m_pos + m_alreadyRead < m_length;
+    return m_pos + m_alreadyRead < m_length;
     }
 
     /** Prepares for bit reading via readBits.  Only readBits can be
diff --git a/dep/src/g3dlite/BinaryOutput.cpp b/dep/g3dlite/G3D/BinaryOutput.cpp
similarity index 100%
rename from dep/src/g3dlite/BinaryOutput.cpp
rename to dep/g3dlite/G3D/BinaryOutput.cpp
diff --git a/dep/include/g3dlite/G3D/BinaryOutput.h b/dep/g3dlite/G3D/BinaryOutput.h
similarity index 100%
rename from dep/include/g3dlite/G3D/BinaryOutput.h
rename to dep/g3dlite/G3D/BinaryOutput.h
diff --git a/dep/include/g3dlite/G3D/BoundsTrait.h b/dep/g3dlite/G3D/BoundsTrait.h
similarity index 100%
rename from dep/include/g3dlite/G3D/BoundsTrait.h
rename to dep/g3dlite/G3D/BoundsTrait.h
diff --git a/dep/src/g3dlite/Box.cpp b/dep/g3dlite/G3D/Box.cpp
similarity index 85%
rename from dep/src/g3dlite/Box.cpp
rename to dep/g3dlite/G3D/Box.cpp
index f7c112ae3..70fc00cab 100644
--- a/dep/src/g3dlite/Box.cpp
+++ b/dep/g3dlite/G3D/Box.cpp
@@ -33,28 +33,28 @@ Box::Box(const AABox& b) {
 }
 
 Box::Box(class BinaryInput& b) {
-	deserialize(b);	
+    deserialize(b);    
 }
 
 
 void Box::serialize(class BinaryOutput& b) const {
-	int i;
-	for (i = 0; i < 8; ++i) {
-		_corner[i].serialize(b);
-	}
+    int i;
+    for (i = 0; i < 8; ++i) {
+        _corner[i].serialize(b);
+    }
 
     // Other state can be reconstructed
 }
 
 
 void Box::deserialize(class BinaryInput& b) {
-	int i;
+    int i;
 
     _center = Vector3::zero();
     for (i = 0; i < 8; ++i) {
-		_corner[i].deserialize(b);
+        _corner[i].deserialize(b);
         _center += _corner[i];
-	}
+    }
 
     _center = _center / 8;
     
@@ -208,13 +208,13 @@ bool Box::culledBy(
     childMask = 0;
 
     // See if there is one plane for which all of the
-	// vertices are in the negative half space.
+    // vertices are in the negative half space.
     for (int p = 0; p < plane.size(); ++p) {
 
-		// Only test planes that are not masked
-		if ((inMask & 1) != 0) {
-		
-			Vector3 corner;
+        // Only test planes that are not masked
+        if ((inMask & 1) != 0) {
+        
+            Vector3 corner;
 
             int numContained = 0;
             int v = 0;
@@ -222,80 +222,80 @@ bool Box::culledBy(
             // We can early-out only if we have found one point on each
             // side of the plane (i.e. if we are straddling).  That
             // occurs when (numContained < v) && (numContained > 0)
-			for (v = 0; (v < 8) && ((numContained == v) || (numContained == 0)); ++v) {
+            for (v = 0; (v < 8) && ((numContained == v) || (numContained == 0)); ++v) {
                 if (plane[p].halfSpaceContains(_corner[v])) {
                     ++numContained;
                 }
-			}
+            }
 
-			if (numContained == 0) {
-				// Plane p culled the box
-				cullingPlane = p;
+            if (numContained == 0) {
+                // Plane p culled the box
+                cullingPlane = p;
 
                 // The caller should not recurse into the children,
                 // since the parent is culled.  If they do recurse,
                 // make them only test against this one plane, which
                 // will immediately cull the volume.
                 childMask = 1 << p;
-				return true;
+                return true;
 
             } else if (numContained < v) {
                 // The bounding volume straddled the plane; we have
                 // to keep testing against this plane
                 childMask |= (1 << p);
             }
-		}
+        }
 
         // Move on to the next bit.
-		inMask = inMask >> 1;
+        inMask = inMask >> 1;
     }
 
     // None of the planes could cull this box
-	cullingPlane = -1;
+    cullingPlane = -1;
     return false;
 }
 
 
 bool Box::culledBy(
     const Array<Plane>& plane,
-	int&				cullingPlane,
-	const uint32		_inMask) const {
+    int&                cullingPlane,
+    const uint32        _inMask) const {
 
-	uint32 inMask = _inMask;
-	assert(plane.size() < 31);
+    uint32 inMask = _inMask;
+    assert(plane.size() < 31);
 
     // See if there is one plane for which all of the
-	// vertices are in the negative half space.
+    // vertices are in the negative half space.
     for (int p = 0; p < plane.size(); ++p) {
 
-		// Only test planes that are not masked
-		if ((inMask & 1) != 0) {
-		
-			bool culled = true;
+        // Only test planes that are not masked
+        if ((inMask & 1) != 0) {
+        
+            bool culled = true;
 
             int v;
 
-			// Assume this plane culls all points.  See if there is a point
-			// not culled by the plane... early out when at least one point
+            // Assume this plane culls all points.  See if there is a point
+            // not culled by the plane... early out when at least one point
             // is in the positive half space.
-			for (v = 0; (v < 8) && culled; ++v) {
+            for (v = 0; (v < 8) && culled; ++v) {
                 culled = ! plane[p].halfSpaceContains(corner(v));
-			}
-
-			if (culled) {
-				// Plane p culled the box
-				cullingPlane = p;
-
-				return true;
             }
-		}
+
+            if (culled) {
+                // Plane p culled the box
+                cullingPlane = p;
+
+                return true;
+            }
+        }
 
         // Move on to the next bit.
-		inMask = inMask >> 1;
+        inMask = inMask >> 1;
     }
 
     // None of the planes could cull this box
-	cullingPlane = -1;
+    cullingPlane = -1;
     return false;
 }
 
diff --git a/dep/include/g3dlite/G3D/Box.h b/dep/g3dlite/G3D/Box.h
similarity index 92%
rename from dep/include/g3dlite/G3D/Box.h
rename to dep/g3dlite/G3D/Box.h
index 82af9125b..68144803b 100644
--- a/dep/include/g3dlite/G3D/Box.h
+++ b/dep/g3dlite/G3D/Box.h
@@ -86,12 +86,12 @@ public:
 
     static Box inf();
 
-	Box(class BinaryInput& b);
+    Box(class BinaryInput& b);
 
     Box(const class AABox& b);
 
-	void serialize(class BinaryOutput& b) const;
-	void deserialize(class BinaryInput& b);
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
 
     /**
      Returns the object to world transformation for 
@@ -150,14 +150,14 @@ public:
         Vector3&            v3) const;
 
 
-	/**
+    /**
       See AABox::culledBy
-	 */
+     */
     bool culledBy
     (
-     const Array<Plane>&		plane,
+     const Array<Plane>&        plane,
      int32&                             cullingPlaneIndex,
-     const uint32  			testMask,
+     const uint32              testMask,
      uint32&                            childMask) const;
 
     /**
@@ -165,9 +165,9 @@ public:
      */
     bool culledBy
     (
-     const Array<Plane>&		plane,
+     const Array<Plane>&        plane,
      int32&                             cullingPlaneIndex = dummy,
-     const uint32  			testMask	  = -1) const;
+     const uint32              testMask      = -1) const;
 
     bool contains(
         const Vector3&      point) const;
diff --git a/dep/src/g3dlite/Box2D.cpp b/dep/g3dlite/G3D/Box2D.cpp
similarity index 100%
rename from dep/src/g3dlite/Box2D.cpp
rename to dep/g3dlite/G3D/Box2D.cpp
diff --git a/dep/include/g3dlite/G3D/Box2D.h b/dep/g3dlite/G3D/Box2D.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Box2D.h
rename to dep/g3dlite/G3D/Box2D.h
diff --git a/dep/src/g3dlite/BumpMapPreprocess.cpp b/dep/g3dlite/G3D/BumpMapPreprocess.cpp
similarity index 100%
rename from dep/src/g3dlite/BumpMapPreprocess.cpp
rename to dep/g3dlite/G3D/BumpMapPreprocess.cpp
diff --git a/dep/include/g3dlite/G3D/BumpMapPreprocess.h b/dep/g3dlite/G3D/BumpMapPreprocess.h
similarity index 100%
rename from dep/include/g3dlite/G3D/BumpMapPreprocess.h
rename to dep/g3dlite/G3D/BumpMapPreprocess.h
diff --git a/dep/src/g3dlite/Capsule.cpp b/dep/g3dlite/G3D/Capsule.cpp
similarity index 86%
rename from dep/src/g3dlite/Capsule.cpp
rename to dep/g3dlite/G3D/Capsule.cpp
index 2ad3891c9..e11c29941 100644
--- a/dep/src/g3dlite/Capsule.cpp
+++ b/dep/g3dlite/G3D/Capsule.cpp
@@ -22,7 +22,7 @@
 namespace G3D {
 
 Capsule::Capsule(class BinaryInput& b) {
-	deserialize(b);
+    deserialize(b);
 }
 
 
@@ -31,47 +31,47 @@ Capsule::Capsule() {
 
 
 Capsule::Capsule(const Vector3& _p1, const Vector3& _p2, float _r) 
-	: p1(_p1), p2(_p2), _radius(_r) {
+    : p1(_p1), p2(_p2), _radius(_r) {
 }
 
 
 void Capsule::serialize(class BinaryOutput& b) const {
-	p1.serialize(b);
-	p2.serialize(b);
-	b.writeFloat64(_radius);
+    p1.serialize(b);
+    p2.serialize(b);
+    b.writeFloat64(_radius);
 }
 
 
 void Capsule::deserialize(class BinaryInput& b) {
-	p1.deserialize(b);
-	p2.deserialize(b);
-	_radius = b.readFloat64();
+    p1.deserialize(b);
+    p2.deserialize(b);
+    _radius = b.readFloat64();
 }
 
 
 Line Capsule::axis() const {
-	return Line::fromTwoPoints(p1, p2);
+    return Line::fromTwoPoints(p1, p2);
 }
 
 
 float Capsule::volume() const {
-	return 
-		// Sphere volume
-		pow(_radius, 3) * pi() * 4 / 3 +
+    return 
+        // Sphere volume
+        pow(_radius, 3) * pi() * 4 / 3 +
 
-		// Cylinder volume
-		pow(_radius, 2) * (p1 - p2).magnitude();
+        // Cylinder volume
+        pow(_radius, 2) * (p1 - p2).magnitude();
 }
 
 
 float Capsule::area() const {
 
-	return
-		// Sphere area
-		pow(_radius, 2) * 4 * pi() +
+    return
+        // Sphere area
+        pow(_radius, 2) * 4 * pi() +
 
-		// Cylinder area
-		twoPi() * _radius * (p1 - p2).magnitude();
+        // Cylinder area
+        twoPi() * _radius * (p1 - p2).magnitude();
 }
 
 
diff --git a/dep/include/g3dlite/G3D/Capsule.h b/dep/g3dlite/G3D/Capsule.h
similarity index 73%
rename from dep/include/g3dlite/G3D/Capsule.h
rename to dep/g3dlite/G3D/Capsule.h
index baeea3aa8..3f10743cc 100644
--- a/dep/include/g3dlite/G3D/Capsule.h
+++ b/dep/g3dlite/G3D/Capsule.h
@@ -26,32 +26,32 @@ class AABox;
  */
 class Capsule {
 private:
-	Vector3			p1;
-	Vector3			p2;
+    Vector3            p1;
+    Vector3            p2;
 
-	float			_radius;
+    float            _radius;
 public:
 
 
     /** Uninitialized */
     Capsule();
     Capsule(class BinaryInput& b);
-	Capsule(const Vector3& _p1, const Vector3& _p2, float _r);
-	void serialize(class BinaryOutput& b) const;
-	void deserialize(class BinaryInput& b);
-	
-	/** The line down the center of the capsule */
-	Line axis() const;
+    Capsule(const Vector3& _p1, const Vector3& _p2, float _r);
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
+    
+    /** The line down the center of the capsule */
+    Line axis() const;
 
-	inline float radius() const {
-		return _radius;
-	}
+    inline float radius() const {
+        return _radius;
+    }
 
-	/** Argument may be 0 or 1 */
-	inline Vector3 point(int i) const {
-		debugAssert(i == 0 || i == 1);
-		return (i == 0) ? p1 : p2;
-	}
+    /** Argument may be 0 or 1 */
+    inline Vector3 point(int i) const {
+        debugAssert(i == 0 || i == 1);
+        return (i == 0) ? p1 : p2;
+    }
 
     /** Distance between the sphere centers.  The total extent of the cylinder is 
         2r + h. */
diff --git a/dep/src/g3dlite/CollisionDetection.cpp b/dep/g3dlite/G3D/CollisionDetection.cpp
similarity index 92%
rename from dep/src/g3dlite/CollisionDetection.cpp
rename to dep/g3dlite/G3D/CollisionDetection.cpp
index 77eef0a55..198602fa7 100644
--- a/dep/src/g3dlite/CollisionDetection.cpp
+++ b/dep/g3dlite/G3D/CollisionDetection.cpp
@@ -37,7 +37,7 @@
 namespace G3D {
 
 bool CollisionDetection::ignoreBool;
-Vector3	CollisionDetection::ignore;
+Vector3    CollisionDetection::ignore;
 Array<Vector3> CollisionDetection::ignoreArray;
 
 
@@ -251,7 +251,7 @@ bool CollisionDetection::conservativeBoxBoxTest(
 bool CollisionDetection::fixedSolidBoxIntersectsFixedSolidBox(
     const Box&      box1,
     const Box&      box2,
-	const int		lastSeparatingAxis) {
+    const int        lastSeparatingAxis) {
     // for explanations of the variable please refer to the
     // paper and fillSolidBoxSolidBoxInfo()
     Vector3 a;
@@ -388,7 +388,7 @@ float CollisionDetection::penetrationDepthForFixedBoxFixedBox(
     // test if the boxes can be separated by a plane normal to
     // any of the three axes of box1, any of the three axes of box2,
     // (test 9 possible cross products later)
-	float penetration = -finf();
+    float penetration = -finf();
     int penetrationAxisIndex = -1;
 
     for (int i = 0; i < 6; i++) {
@@ -411,44 +411,44 @@ float CollisionDetection::penetrationDepthForFixedBoxFixedBox(
     // for each edge-edge case we have to adjust the magnitude of
     // penetration since we did not include the dot(L, L) denominator
     // that can be smaller than 1.0 for the edge-edge cases.
-	if (!parallelAxes) {
-	    double edgeDistances[9];
+    if (!parallelAxes) {
+        double edgeDistances[9];
 
-		// run through edge-edge cases to see if we can find a separating axis
-		for (int i = 6; i < 15; i++) {
-			float projectedDistance =
-				projectedDistanceForSolidBoxSolidBox(i, a, b, D, c, ca, ad, bd);
+        // run through edge-edge cases to see if we can find a separating axis
+        for (int i = 6; i < 15; i++) {
+            float projectedDistance =
+                projectedDistanceForSolidBoxSolidBox(i, a, b, D, c, ca, ad, bd);
 
-			// found a separating axis, the boxes do not intersect,
-			// correct magnitude and return projected distance
-			if (projectedDistance > 0.0) {
-				Vector3 L = separatingAxisForSolidBoxSolidBox(i, box1, box2);
-				projectedDistance /= dot(L, L);
-				return -projectedDistance;
-			}
+            // found a separating axis, the boxes do not intersect,
+            // correct magnitude and return projected distance
+            if (projectedDistance > 0.0) {
+                Vector3 L = separatingAxisForSolidBoxSolidBox(i, box1, box2);
+                projectedDistance /= dot(L, L);
+                return -projectedDistance;
+            }
 
-			edgeDistances[i - 6] = projectedDistance;
-		}
+            edgeDistances[i - 6] = projectedDistance;
+        }
 
-		// no separating axis found, the boxes do intersect,
-		// correct the magnitudes of the projectedDistance values
-		for (int i = 6; i < 15; i++) {
-			// find the negative penetration value with the smallest magnitude,
-			// the adjustment done for the edge-edge cases only increases
-			// magnitude by dividing by a number smaller than 1 and greater than 0
-			float projectedDistance = (float)edgeDistances[i - 6];
-			if (projectedDistance > penetration) {
-				Vector3 L = separatingAxisForSolidBoxSolidBox(i, box1, box2);
-				projectedDistance /= dot(L, L);
-				if (projectedDistance > penetration) {
-					penetration = projectedDistance;
-					penetrationAxisIndex = i;
-				}
-			}
-		}
-	}
+        // no separating axis found, the boxes do intersect,
+        // correct the magnitudes of the projectedDistance values
+        for (int i = 6; i < 15; i++) {
+            // find the negative penetration value with the smallest magnitude,
+            // the adjustment done for the edge-edge cases only increases
+            // magnitude by dividing by a number smaller than 1 and greater than 0
+            float projectedDistance = (float)edgeDistances[i - 6];
+            if (projectedDistance > penetration) {
+                Vector3 L = separatingAxisForSolidBoxSolidBox(i, box1, box2);
+                projectedDistance /= dot(L, L);
+                if (projectedDistance > penetration) {
+                    penetration = projectedDistance;
+                    penetrationAxisIndex = i;
+                }
+            }
+        }
+    }
 
-	// get final separating axis vector
+    // get final separating axis vector
     Vector3 L = separatingAxisForSolidBoxSolidBox(penetrationAxisIndex,
             box1, box2);
 
@@ -921,7 +921,7 @@ bool __fastcall CollisionDetection::rayAABox(
     // Find candidate planes.
     for (int i = 0; i < 3; ++i) {
         if (ray.origin()[i] < MinB[i]) {
-            location[i]	= MinB[i];
+            location[i]    = MinB[i];
             inside      = false;
             
             // Calculate T distances to candidate planes
@@ -929,7 +929,7 @@ bool __fastcall CollisionDetection::rayAABox(
                 MaxT[i] = (MinB[i] - ray.origin()[i]) * invDir[i];
             }
         } else if (ray.origin()[i] > MaxB[i]) {
-            location[i]	= MaxB[i];
+            location[i]    = MaxB[i];
             inside      = false;
 
             // Calculate T distances to candidate planes
@@ -940,7 +940,7 @@ bool __fastcall CollisionDetection::rayAABox(
     }
 
     if (inside) {
-    	// Ray origin inside bounding box
+        // Ray origin inside bounding box
         location = ray.origin();
         return true;
     }
@@ -1065,10 +1065,10 @@ float CollisionDetection::collisionTimeForMovingSphereFixedSphere(
 
 /*
 float CollisionDetection::collisionTimeForMovingPointFixedTriangle(
-    const Vector3&			point,
-    const Vector3&			velocity,
+    const Vector3&            point,
+    const Vector3&            velocity,
     const Triangle&       triangle,
-    Vector3&				outLocation,
+    Vector3&                outLocation,
     Vector3&                outNormal) {
 
     double time = collisionTimeForMovingPointFixedPlane(point, velocity, triangle.plane(), outLocation, outNormal);
@@ -1234,73 +1234,73 @@ bool CollisionDetection::collisionLocationForMovingPointFixedAABox(
     Vector3&                normal) {
 
     // Integer representation of a floating-point value.
-    #define IR(x)	((uint32&)x)
+    #define IR(x)    ((uint32&)x)
 
     Inside = true;
-	const Vector3& MinB = box.low();
-	const Vector3& MaxB = box.high();
-	Vector3 MaxT(-1.0f, -1.0f, -1.0f);
+    const Vector3& MinB = box.low();
+    const Vector3& MaxB = box.high();
+    Vector3 MaxT(-1.0f, -1.0f, -1.0f);
 
-	// Find candidate planes.
+    // Find candidate planes.
     for (int i = 0; i < 3; ++i) {
-		if (origin[i] < MinB[i]) {
-			location[i]	= MinB[i];
-			Inside      = false;
+        if (origin[i] < MinB[i]) {
+            location[i]    = MinB[i];
+            Inside      = false;
 
-			// Calculate T distances to candidate planes
+            // Calculate T distances to candidate planes
             if (IR(dir[i])) {
                 MaxT[i] = (MinB[i] - origin[i]) / dir[i];
             }
         } else if (origin[i] > MaxB[i]) {
-			location[i]	= MaxB[i];
-			Inside	    = false;
+            location[i]    = MaxB[i];
+            Inside        = false;
 
-			// Calculate T distances to candidate planes
+            // Calculate T distances to candidate planes
             if (IR(dir[i])) {
                 MaxT[i] = (MaxB[i] - origin[i]) / dir[i];
             }
-		}
-	}
+        }
+    }
 
-	if (Inside) {
-    	// Ray origin inside bounding box
+    if (Inside) {
+        // Ray origin inside bounding box
         location = origin;
-		return false;
-	}
+        return false;
+    }
 
-	// Get largest of the maxT's for final choice of intersection
-	int WhichPlane = 0;
-    if (MaxT[1] > MaxT[WhichPlane])	{
+    // Get largest of the maxT's for final choice of intersection
+    int WhichPlane = 0;
+    if (MaxT[1] > MaxT[WhichPlane])    {
         WhichPlane = 1;
     }
 
-    if (MaxT[2] > MaxT[WhichPlane])	{
+    if (MaxT[2] > MaxT[WhichPlane])    {
         WhichPlane = 2;
     }
 
-	// Check final candidate actually inside box
+    // Check final candidate actually inside box
     if (IR(MaxT[WhichPlane]) & 0x80000000) {
         // Miss the box
         return false;
     }
 
-	for (int i = 0; i < 3; ++i) {
+    for (int i = 0; i < 3; ++i) {
         if (i != WhichPlane) {
-			location[i] = origin[i] + MaxT[WhichPlane] * dir[i];
+            location[i] = origin[i] + MaxT[WhichPlane] * dir[i];
             if ((location[i] < MinB[i]) ||
                 (location[i] > MaxB[i])) {
                 // On this plane we're outside the box extents, so
                 // we miss the box
                 return false;
             }
-		}
-	}
+        }
+    }
 
     // Choose the normal to be the plane normal facing into the ray
     normal = Vector3::zero();
     normal[WhichPlane] = (dir[WhichPlane] > 0) ? -1.0 : 1.0;
 
-	return true;
+    return true;
 
     #undef IR
 }
@@ -1338,12 +1338,12 @@ float CollisionDetection::collisionTimeForMovingPointFixedRectangle(
 /** Used by findRayCapsuleIntersection.
     @cite From magic software http://www.magic-software.com/Source/Intersection3D/MgcIntr3DLinCap.cpp */
 static int findRayCapsuleIntersectionAux(
-	const Vector3&		rkOrigin,
-	const Vector3&		rkDirection,
-    const Capsule&		rkCapsule,
-	double   			afT[2]) {
+    const Vector3&        rkOrigin,
+    const Vector3&        rkDirection,
+    const Capsule&        rkCapsule,
+    double               afT[2]) {
 
-	Vector3 capsuleDirection = rkCapsule.point(1) - rkCapsule.point(0);
+    Vector3 capsuleDirection = rkCapsule.point(1) - rkCapsule.point(0);
 
     // set up quadratic Q(t) = a*t^2 + 2*b*t + c
     Vector3 kU, kV, kW = capsuleDirection;
@@ -1406,14 +1406,14 @@ static int findRayCapsuleIntersectionAux(
         if ((0.0f <= fTmp) && (fTmp <= fWLength)) {
             afT[iQuantity] = fT * fInvDLength;
             iQuantity++;
-		}
+        }
 
         fT = (-fB + fRoot)*fInv;
         fTmp = kP.z + fT*kD.z;
         
-		if ((0.0f <= fTmp) && (fTmp <= fWLength)) {
+        if ((0.0f <= fTmp) && (fTmp <= fWLength)) {
             afT[iQuantity++] = fT*fInvDLength;
-		}
+        }
 
         if (iQuantity == 2) {
             // line intersects capsule wall in two places
@@ -1442,7 +1442,7 @@ static int findRayCapsuleIntersectionAux(
             afT[iQuantity++] = fT*fInvDLength;
             if (iQuantity == 2) {
                 return 2;
-			}
+            }
         }
 
         fT = -fB + fRoot;
@@ -1451,7 +1451,7 @@ static int findRayCapsuleIntersectionAux(
             afT[iQuantity++] = fT*fInvDLength;
             if (iQuantity == 2) {
                 return 2;
-			}
+            }
         }
     } else if (fDiscr == 0.0f) {
         fT = -fB;
@@ -1460,7 +1460,7 @@ static int findRayCapsuleIntersectionAux(
             afT[iQuantity++] = fT*fInvDLength;
             if (iQuantity == 2) {
                 return 2;
-			}
+            }
         }
     }
 
@@ -1478,7 +1478,7 @@ static int findRayCapsuleIntersectionAux(
             afT[iQuantity++] = fT*fInvDLength;
             if (iQuantity == 2) {
                 return 2;
-			}
+            }
         }
 
         fT = -fB + fRoot;
@@ -1487,7 +1487,7 @@ static int findRayCapsuleIntersectionAux(
             afT[iQuantity++] = fT*fInvDLength;
             if (iQuantity == 2) {
                 return 2;
-			}
+            }
         }
     } else if (fDiscr == 0.0f) {
         fT = -fB;
@@ -1496,7 +1496,7 @@ static int findRayCapsuleIntersectionAux(
             afT[iQuantity++] = fT*fInvDLength;
             if (iQuantity == 2) {
                 return 2;
-			}
+            }
         }
     }
 
@@ -1506,25 +1506,25 @@ static int findRayCapsuleIntersectionAux(
 
 /** Used by collisionTimeForMovingPointFixedCapsule.
     @cite From magic software http://www.magic-software.com/Source/Intersection3D/MgcIntr3DLinCap.cpp
-	
-	@param rkRay      The ray
-	@param rkCapsule  The capsule
-	@param riQuantity The number of intersections found
-	@param akPoint    The intersections found
-	@return           True if there is at least one intersection
-	*/
+    
+    @param rkRay      The ray
+    @param rkCapsule  The capsule
+    @param riQuantity The number of intersections found
+    @param akPoint    The intersections found
+    @return           True if there is at least one intersection
+    */
 static bool findRayCapsuleIntersection(
-	const Ray&			rkRay,
-	const Capsule&		rkCapsule,
-	int&				riQuantity,
-	Vector3				akPoint[2]) {
+    const Ray&            rkRay,
+    const Capsule&        rkCapsule,
+    int&                riQuantity,
+    Vector3                akPoint[2]) {
 
     double afT[2];
     riQuantity = findRayCapsuleIntersectionAux(rkRay.origin(), rkRay.direction(), rkCapsule, afT);
 
     // Only return intersections that occur in the future
     int iClipQuantity = 0;
-	int i;
+    int i;
     for (i = 0; i < riQuantity; ++i) {
         if (afT[i] >= 0.0f) {
             akPoint[iClipQuantity] = rkRay.origin() + afT[i] * rkRay.direction();
@@ -1537,30 +1537,30 @@ static bool findRayCapsuleIntersection(
 }
 
 float CollisionDetection::collisionTimeForMovingPointFixedCapsule(
-	const Vector3&		_point,
-	const Vector3&		velocity,
-	const Capsule&		capsule,
-	Vector3&		    location,
+    const Vector3&        _point,
+    const Vector3&        velocity,
+    const Capsule&        capsule,
+    Vector3&            location,
     Vector3&            outNormal) {
 
-	float timeScale = velocity.magnitude();
+    float timeScale = velocity.magnitude();
 
     if (timeScale == 0.0f) {
         timeScale = 1;
     }
 
-	Vector3 direction = velocity / timeScale;
-	int numIntersections;
-	Vector3 intersection[2];
-	findRayCapsuleIntersection(Ray::fromOriginAndDirection(_point, direction), capsule, numIntersections, intersection);
+    Vector3 direction = velocity / timeScale;
+    int numIntersections;
+    Vector3 intersection[2];
+    findRayCapsuleIntersection(Ray::fromOriginAndDirection(_point, direction), capsule, numIntersections, intersection);
 
-	if (numIntersections == 2) {
-		// A collision can only occur if there are two intersections.  If there is one
-		// intersection, that one is exiting the capsule.  
+    if (numIntersections == 2) {
+        // A collision can only occur if there are two intersections.  If there is one
+        // intersection, that one is exiting the capsule.  
 
-		// Find the entering intersection (the first one that occurs).
-		float d0 = (intersection[0] - _point).squaredMagnitude();
-		float d1 = (intersection[1] - _point).squaredMagnitude();
+        // Find the entering intersection (the first one that occurs).
+        float d0 = (intersection[0] - _point).squaredMagnitude();
+        float d1 = (intersection[1] - _point).squaredMagnitude();
 
         // Compute the surface normal (if we aren't ignoring the result)
         if (&outNormal != &ignore) {
@@ -1569,31 +1569,31 @@ float CollisionDetection::collisionTimeForMovingPointFixedCapsule(
         }
 
         if (d0 > d1) {
-			location = intersection[1];
-			return sqrt(d1) / timeScale;
-		} else {
-			location = intersection[0];
-			return sqrt(d0) / timeScale;
-		}
-	} else {
-		// No entering intersection discovered; return no intersection.
-		location = Vector3::inf();
-		return finf();
-	}
+            location = intersection[1];
+            return sqrt(d1) / timeScale;
+        } else {
+            location = intersection[0];
+            return sqrt(d0) / timeScale;
+        }
+    } else {
+        // No entering intersection discovered; return no intersection.
+        location = Vector3::inf();
+        return finf();
+    }
 }
 
 
 float CollisionDetection::collisionTimeForMovingSphereFixedPlane(
-    const Sphere&		sphere,
-    const Vector3&		velocity,
-    const Plane&		plane,
-    Vector3&			location,
+    const Sphere&        sphere,
+    const Vector3&        velocity,
+    const Plane&        plane,
+    Vector3&            location,
     Vector3&            outNormal) {
 
-	if (sphere.radius == 0) {
-		// Optimization for zero radius sphere
+    if (sphere.radius == 0) {
+        // Optimization for zero radius sphere
         return collisionTimeForMovingPointFixedPlane(sphere.center, velocity, plane, location, outNormal);
-	}
+    }
 
     // The collision point on the sphere will be the point at
     // center - (radius * normal).  Collisions only occur when
@@ -1630,7 +1630,7 @@ float CollisionDetection::collisionTimeForMovingSphereFixedPlane(
 
 
 float CollisionDetection::collisionTimeForMovingSphereFixedTriangle(
-    const class Sphere&		sphere,
+    const class Sphere&        sphere,
     const Vector3&              velocity,
     const Triangle&             triangle,
     Vector3&                    outLocation,
@@ -1817,18 +1817,18 @@ float CollisionDetection::collisionTimeForMovingSphereFixedBox(
 
 
 float CollisionDetection::collisionTimeForMovingSphereFixedCapsule(
-	const Sphere&		sphere,
-	const Vector3&		velocity,
-	const Capsule&		capsule,
-	Vector3&		    location,
+    const Sphere&        sphere,
+    const Vector3&        velocity,
+    const Capsule&        capsule,
+    Vector3&            location,
     Vector3&            outNormal) {
 
     (void)outNormal;
 
-	Capsule _capsule(capsule.point(0), capsule.point(1), capsule.radius() + sphere.radius);
+    Capsule _capsule(capsule.point(0), capsule.point(1), capsule.radius() + sphere.radius);
 
     Vector3 normal;
-	double time = collisionTimeForMovingPointFixedCapsule(sphere.center, velocity, _capsule, location, normal);
+    double time = collisionTimeForMovingPointFixedCapsule(sphere.center, velocity, _capsule, location, normal);
     
     if (time < finf()) {
         // Location is now the position of the center of the sphere at the time of collision.
@@ -1847,7 +1847,7 @@ Vector3 CollisionDetection::bounceDirection(
     const Vector3&  collisionLocation,
     const Vector3&  collisionNormal) {
 
-	// Location when the collision occurs
+    // Location when the collision occurs
     Vector3 sphereLocation  = sphere.center + velocity * collisionTime;
 
     Vector3 normal          = (sphereLocation - collisionLocation);
@@ -1926,10 +1926,10 @@ Vector3 CollisionDetection::closestPointOnLineSegment(
 
 
 Vector3 CollisionDetection::closestPointOnTrianglePerimeter(
-    const Vector3&			v0, 
-    const Vector3&			v1,
-    const Vector3&			v2,
-    const Vector3&			point) {
+    const Vector3&            v0, 
+    const Vector3&            v1,
+    const Vector3&            v2,
+    const Vector3&            point) {
     
     Vector3 v[3] = {v0, v1, v2};
     Vector3 edgeDirection[3] = {(v1 - v0), (v2 - v1), (v0 - v2)};
@@ -2000,11 +2000,11 @@ Vector3 CollisionDetection::closestPointOnTrianglePerimeter(
 
 
 bool CollisionDetection::isPointInsideTriangle(
-    const Vector3&			v0,
-    const Vector3&			v1,
-    const Vector3&			v2,
-    const Vector3&			normal,
-    const Vector3&			point,
+    const Vector3&            v0,
+    const Vector3&            v1,
+    const Vector3&            v2,
+    const Vector3&            normal,
+    const Vector3&            point,
     float                   b[3],
     Vector3::Axis           primaryAxis) {
     
diff --git a/dep/g3dlite/G3D/CollisionDetection.h b/dep/g3dlite/G3D/CollisionDetection.h
new file mode 100644
index 000000000..cda438a73
--- /dev/null
+++ b/dep/g3dlite/G3D/CollisionDetection.h
@@ -0,0 +1,1205 @@
+/**
+  @file CollisionDetection.h
+
+
+  Moving collision detection for simple primitives.
+
+  @author Morgan McGuire, http://graphics.cs.williams.edu
+  @cite Spherical collision based on Paul Nettle's
+  ftp://ftp.3dmaileffects.com/pub/FluidStudios/CollisionDetection/Fluid_Studios_Generic_Collision_Detection_for_Games_Using_Ellipsoids.pdf
+  and comments by Max McGuire.  Ray-sphere intersection by Eric Haines.
+  Box-Box intersection written by Kevin Egan.
+  Thanks to Max McGuire of Iron Lore for various bug fixes.
+  Box-Triangle by Tomas Akenine-Moller
+
+  @created 2001-11-19
+  @edited  2008-12-19
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_COLLISIONDETECTION_H
+#define G3D_COLLISIONDETECTION_H
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+#include "G3D/Plane.h"
+#include "G3D/Box.h"
+#include "G3D/Triangle.h"
+#include "G3D/Array.h"
+#include "G3D/Ray.h"
+#include "G3D/Line.h"
+
+namespace G3D {
+
+
+/**
+  Collision detection primitives and tools for building
+  higher order collision detection schemes.
+
+  These routines provide <I>moving</I> and static collision detection.
+  Moving collision detection allows the calculation of collisions that
+  occur during a period of time -- as opposed to the intersection of 
+  two static bodies.
+  
+  Moving collision detection routines detect collisions between
+  <I>only</I> static primitives and moving spheres or points.  Since the 
+  reference frame can be user defined, these functions can be used to
+  detect the collision between two moving bodies by subtracting
+  the velocity vector of one object from the velocity vector of the 
+  sphere or point the detection is to occur with.  This unified 
+  velocity vector will act as if both objects are moving simultaneously.
+
+  Collisions are detected for single-sided objects only.  That is,
+  no collision is detected when <I>leaving</I> a primitive or passing
+  through a plane or triangle opposite the normal... except for the 
+  point-sphere calculation or when otherwise noted.
+
+  For a sphere, the collision location returned is the point in world
+  space where the surface of the sphere and the fixed object meet.
+  It is <B>not</B> the position of the center of the sphere at
+  the time of the collision.
+
+  The collision normal returned is the surface normal to the fixed
+  object at the collision location.
+
+  <p>
+  <b>Static Collision Detection:</b> (Neither object is moving)
+
+  <table>
+  <tr><td></td><td><b>Vector3</b></td><td><b>LineSegment</b></td><td><b>Ray *</b></td><td><b>Line</b></td><td><b>Plane</b></td><td><b>Triangle</b></td><td><b>Sphere</b></td><td><b>Cylinder</b></td><td><b>Capsule</b></td><td><b>AABox</b></td><td><b>Box</b></td></tr>
+  <tr><td><b>Vector3</b></td><td>\link Vector3::operator== V3::==\endlink \link Vector3::fuzzyEq V3::fuzzy \endlink \link G3D::distance distance \endlink</td><td bgcolor=#C0C0C0 colspan=10 ></td></tr>
+  <tr><td><b>LineSegment</b></td><td>\link LineSegment::closestPoint LS::closestPoint\endlink \link LineSegment::distance LS::distance\endlink \link CollisionDetection::closestPointOnLineSegment CD\endlink</td><td></td><td bgcolor=#C0C0C0 colspan=9 ></td></tr>
+  <tr><td><b>Ray *</b></td><td>Ray::closestPoint Ray::distance</td><td></td><td></td><td bgcolor=#C0C0C0 colspan=8 ></td></tr>
+  <tr><td><b>Line</b></td><td>Line::closestPoint Line::distance</td><td></td><td>\link CollisionDetection::closestPointsBetweenLineAndLine CD\endlink</td><td></td><td bgcolor=#C0C0C0 colspan=7 ></td></tr>
+  <tr><td><b>Plane</b></td><td></td><td></td><td></td><td></td><td></td><td bgcolor=#C0C0C0 colspan=6 ></td></tr>
+  <tr><td><b>Triangle</b></td><td></td><td></td><td></td><td></td><td></td><td></td><td bgcolor=#C0C0C0 colspan=5 ></td></tr>
+  <tr><td><b>Sphere</b></td><td>Sphere::contains</td><td></td><td>\link CollisionDetection::collisionTimeForMovingPointFixedSphere CD \endlink, \link Ray::intersectionTime R::time\endlink</td><td></td><td></td><td></td><td></td><td bgcolor=#C0C0C0 colspan=4 ></td></tr>
+  <tr><td><b>Cylinder</b></td><td>Cylinder::contains</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td bgcolor=#C0C0C0 colspan=3 ></td></tr>
+  <tr><td><b>Capsule</b></td><td>Capsule::contains</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td bgcolor=#C0C0C0 colspan=2 ></td></tr>
+  <tr><td><b>AABox</b></td><td>AABox::contains</td><td></td><td></td><td></td><td></td><td>\link CollisionDetection::fixedSolidBoxIntersectsFixedTriangle CD\endlink</td><td></td><td></td><td></td><td></td><td bgcolor=#C0C0C0 colspan=1 ></td></tr>
+  <tr><td><b>Box</b></td><td>Box::contains</td><td>(treat as Ray)</td><td>\link CollisionDetection::collisionTimeForMovingPointFixedBox CD\endlink</td><td>(treat as Ray)</td><td>\link CollisionDetection::penetrationDepthForFixedBoxFixedPlane CD \endlink</td><td>\link CollisionDetection::penetrationDepthForFixedBoxFixedPlane CD\endlink</td><td>\link CollisionDetection::penetrationDepthForFixedSphereFixedBox CD\endlink</td><td>None (use OPCODE)</td><td>\link CollisionDetection::movingSpherePassesThroughFixedBox CD \endlink</td><td>\link CollisionDetection::penetrationDepthForFixedBoxFixedBox CD\endlink</td><td>\link CollisionDetection::penetrationDepthForFixedBoxFixedBox CD\endlink</td></tr>
+  </table>
+
+  <p>
+  <b>Moving Collision Detection:</b>
+
+  <i>* Note: Moving collision detection against certain primitives is equivalent to static collision
+   detection against a bigger primitive.  Ray, Line Segment == ``moving Point''; Capsule ==``moving Sphere''; Plane == ``moving Line''</i>
+
+   @deprecated Routines moving to the G3D::Intersect class in G3D 8.0
+ */
+class CollisionDetection {
+private:
+
+    /**
+     Default parameter if value passed to a function as reference is
+     not to be calculated.  Must be explicitly supported by function.
+     */
+    static Vector3 ignore;
+
+    /**
+     Default parameter if value passed to a function as reference is
+     not to be calculated.  Must be explicitly supported by function.
+     */
+    static bool    ignoreBool;
+
+    /**
+     Default parameter if value passed to a function as reference is
+     not to be calculated.  Must be explicitly supported by function.
+     */
+    static Array<Vector3> ignoreArray;
+
+
+    // Static class!
+    CollisionDetection() {}
+    virtual ~CollisionDetection() {}
+
+public:
+
+    /**
+      Converts an index [0, 15] to the corresponding separating axis.
+      Does not return normalized vector in the edge-edge case
+      (indices 6 through 15).
+
+      @param separatingAxisIndex    Separating axis.
+      @param box1                    Box 1.
+      @param box2                    Box 2.
+
+       @return Axis that separates the two boxes.
+       */
+    static Vector3 separatingAxisForSolidBoxSolidBox(
+            const int       separatingAxisIndex,
+            const Box &     box1,
+            const Box &     box2);
+
+    /**
+      Tests whether two boxes have axes that are parallel to
+      each other.  If they are, axis1 and axis2 are set to be
+      the parallel axes for both box1 and box2 respectively.
+
+      @param ca            Dot products of each of the boxes axes
+      @param epsilon    Fudge factor (small unit by which the dot
+                          products may vary and still be considered
+                          zero).
+      @param axis1        Parallel Axis 1. [Post Condition]
+      @param axis2        Parallel Axis 2. [Post Condition]
+
+      @return true  - If boxes have a parallel axis
+      @return false - otherwise.
+      */
+    static bool parallelAxisForSolidBoxSolidBox(
+            const double*   ca,
+            const double    epsilon,
+            int &           axis1,
+            int &           axis2);
+
+    /**
+      Calculates the projected distance between the two boxes along
+      the specified separating axis, negative distances correspond
+      to an overlap along that separating axis.  The distance is not
+      divided by denominator dot(L, L), see
+      penetrationDepthForFixedSphereFixedBox() for more details
+
+      @param separatingAxisIndex
+      @param a Box 1's bounding sphere vector
+      @param b Box 2's bounding sphere vector
+      @param D Vector between Box 1 and Box 2's center points
+      @param c Pointer to array of dot products of the axes of Box 1
+               and Box 2.
+      @param ca Pointer to array of unsigned dot products of the axes
+                of Box 1 and Box 2.
+      @param ad Pointer to array of dot products of Box 1 axes and D.
+      @param bd Pointer to array of dot products of Box 2 axes and D.
+
+      @return Projected distance between the two boxes along the
+      specified separating axis.
+     */
+    static float projectedDistanceForSolidBoxSolidBox(
+            const int           separatingAxisIndex,
+            const Vector3 &     a,
+            const Vector3 &     b,
+            const Vector3 &     D,
+            const double*       c,
+            const double*       ca,
+            const double*       ad,
+            const double*       bd);
+
+
+    /**
+      Creates a set of standard information about two boxes in order to
+      solve for their collision.  This information includes a vector to
+      the radius of the bounding sphere for each box, the vector between
+      each boxes' center and a series of dot products between differing
+      important vectors.  These dot products include those between the axes
+      of both boxes (signed and unsigned values), and the dot products
+      between all the axes of box1 and the boxes' center vector and box2
+      and the boxes' center vector.
+
+      @pre The following space requirements must be met:
+              - c[]  9 elements
+              - ca[] 9 elements
+              - ad[] 3 elements
+              - bd[] 3 elements
+
+      @cite dobted from David Eberly's papers, variables used in this function
+      correspond to variables used in pages 6 and 7 in the pdf
+      http://www.magic-software.com/Intersection.html
+      http://www.magic-software.com/Documentation/DynamicCollisionDetection.pdf
+
+      @note Links are out-dated. (Kept to preserve origin and authorship)
+
+      @param box1 Box 1
+      @param box2 Box 2
+      @param a Box 1's bounding sphere vector
+      @param b Box 2's bounding sphere vector
+      @param D Vector between Box 1 and Box 2's center points
+      @param c Pointer to array of dot products of the axes of Box 1
+               and Box 2.
+      @param ca Pointer to array of unsigned dot products of the axes
+                of Box 1 and Box 2.
+      @param ad Pointer to array of dot products of Box 1 axes and D.
+      @param bd Pointer to array of dot products of Box 2 axes and D.
+     */
+    static void fillSolidBoxSolidBoxInfo(
+            const Box &     box1,
+            const Box &     box2,
+            Vector3 &       a,
+            Vector3 &       b,
+            Vector3 &       D,
+            double*         c,
+            double*         ca,
+            double*         ad,
+            double*         bd);
+
+    /**
+      Performs a simple bounding sphere check between two boxes to determine
+      whether these boxes could <i>possibly</i> intersect.  This is a very
+      cheap operation (three dot products, two sqrts and a few others).  If
+      it returns true, an intersection is possible, but not necessarily
+      guaranteed.
+
+      @param a Vector from box A's center to an outer vertex
+      @param b Vector from box B's center to an outer vertex
+      @param D Distance between the centers of the two boxes
+
+      @return true - if possible intersection
+      @return false - otherwise (This does not guarantee an intersection)
+     */
+    static bool conservativeBoxBoxTest(
+            const Vector3 &     a,
+            const Vector3 &     b,
+            const Vector3 &     D);
+
+    /**
+       Determines whether two fixed solid boxes intersect.
+
+      @note To speed up collision detection, the lastSeparatingAxis from
+      the previous time step can be passed in and that plane can be
+      checked first.  If the separating axis was not saved, or if the
+      two boxes intersected then lastSeparatingAxis should equal -1.
+
+      @cite Adobted from David Eberly's papers, variables used in this function
+      correspond to variables used in pages 6 and 7 in the pdf
+      http://www.magic-software.com/Intersection.html
+      http://www.magic-software.com/Documentation/DynamicCollisionDetection.pdf
+
+       @param box1                Box 1.
+       @param box2                Box 2.
+       @param lastSeparatingAxis    Last separating axis.
+                                   (optimization - see note)
+
+      @return true  - Intersection.
+      @return false - otherwise.
+     */
+    static bool fixedSolidBoxIntersectsFixedSolidBox(
+        const Box&      box1,
+        const Box&      box2,
+        const int       lastSeparatingAxis = -1);
+
+    /**
+      Calculates the closest points on two lines with each other.   If the
+      lines are parallel then using the starting point, else calculate the
+      closest point on each line to the other.
+
+      @note This is very similiar to calculating the intersection of two lines.
+      Logically then, the two points calculated would be identical if calculated
+      with inifinite precision, but with the finite precision of floating point
+      calculations, these values could (will) differ as the line slope approaches
+      zero or inifinity.
+
+      @cite variables and algorithm based on derivation at the following website:
+              http://softsurfer.com/Archive/algorithm_0106/algorithm_0106.htm
+
+      @param line1        Line 1.
+      @param line2        Line 2.
+      @param closest1    Closest point on line 1.
+      @param closest2    Closest point on line 2.
+     */
+    static void closestPointsBetweenLineAndLine(
+            const Line &    line1,
+            const Line &    line2,
+            Vector3 &       closest1,
+            Vector3 &       closest2);
+
+    /**
+      Calculates the depth of penetration between two fixed boxes.
+      Contact normal faces away from box1 and into box2.  If there is
+      contact, only one contact point is returned.  The minimally
+      violated separating plane is computed
+         - if the separating axis corresponds to a face
+              the contact point is half way between the deepest vertex
+              and the face
+         - if the separating axis corresponds to two edges
+              the contact point is the midpoint of the smallest line
+              segment between the two edge lines
+
+      @note This is very similiar to calculating the intersection of two lines.
+      Logically then, the two points calculated would be identical if calculated
+      with inifinite precision, but with the finite precision of floating point
+      calculations, these values could (will) differ as the line slope approaches
+      zero or inifinity.
+
+      @cite adobted from David Eberly's papers, variables used in this function
+      correspond to variables used in pages 6 and 7 in the pdf
+      http://www.magic-software.com/Intersection.html
+      http://www.magic-software.com/Documentation/DynamicCollisionDetection.pdf
+
+      @param box1                Box 1
+      @param box2                Box 2
+      @param contactPoints        Contact point between boxes. [Post Condition]
+      @param contactNormals        Surface normal at contact point. [Post Condition]
+      @param lastSeparatingAxis    Last separating axis. (Used for optimization)
+
+      @return Depth of penetration between the two boxes.  If there is no
+        intersection between the boxes, then a negative value is returned.
+     */
+    static float penetrationDepthForFixedBoxFixedBox(
+        const Box&          box1,
+        const Box&          box2,
+        Array<Vector3>&     contactPoints,
+        Array<Vector3>&     contactNormals,
+        const int           lastSeparatingAxis = -1);
+
+    /**
+      Calculates the depth of penetration between two fixed spheres as well
+      as the deepest point of Sphere A that penetrates Sphere B. The normal
+      returned points <B>away</B> from the object A, although it may
+      represent a perpendicular to either the faces of object B or object A
+      depending on their relative orientations.
+
+      @param sphereA        Fixed Sphere A.
+      @param sphereB        Fixed Sphere B.
+      @param contactPoints    Sphere A's deepest point that penetrates Sphere B.
+                             [Post Condition]
+      @param contactNormals    Normal at penetration point. [Post Condition]
+
+      @return Depth of penetration.  If there is no intersection between the
+              objects then the depth will be a negative value.
+     */
+    static float penetrationDepthForFixedSphereFixedSphere(
+        const class Sphere& sphereA,
+        const Sphere&       sphereB,
+        Array<Vector3>&     contactPoints,
+        Array<Vector3>&     contactNormals = ignoreArray);
+
+    /**
+      Calculates the depth of penetration between a fixed sphere and a fixed
+      box as well as the deepest point of the sphere that penetrates the box
+      and the normal at that intersection.
+
+      @note There are three possible intersections between a sphere and box.
+      - Sphere completely contained in the box
+      - Sphere intersects one edge
+      - Sphere intersects one vertex
+
+      The contact point and contact normal vary for each of these situations.
+      - Sphere contained in Box:
+         - Normal is based on side of least penetration (as is the depth calculation).
+         - Point is based on center of sphere
+      - Sphere intersects one edge
+         - Normal is based on vector from the box center to the point of depth.
+         - Point is closest point to the sphere on the line
+      - Sphere intersects one vertex
+         - Normal is based on vector from the box center to the vertex of penetration.
+         - Point is vertex of penetration.
+
+      @cite Adapted from Jim Arvo's method in Graphics Gems
+      See also http://www.win.tue.nl/~gino/solid/gdc2001depth.pdf
+
+      @param sphere            Fixed Sphere.
+      @param box            Fixed Box.
+      @param contactPoints    Sphere point that penetrates the box. [Post Condition]
+      @param contactNormals    Normal at the penetration point. [Post Condition]
+
+      @return Depth of penetration.  If there is no intersection between the
+               objects then the depth will be a negative value.
+      */
+    static float penetrationDepthForFixedSphereFixedBox(
+        const Sphere&       sphere,
+        const Box&          box,
+        Array<Vector3>&     contactPoints,
+        Array<Vector3>&     contactNormals = ignoreArray);
+
+    /**
+      Calculates the depth of penetration between a Fixed Sphere and a Fixed
+      Plane as well as the deepest point of the sphere that penetrates the plane
+      and the plane normal at that intersection.
+
+      @param sphereA        Fixed Sphere.
+      @param planeB         Fixed Plane.
+      @param contactPoints  Sphere point that penetrates the plane.
+                             [Post Condition]
+      @param contactNormals Normal at penetration point. [Post Condition]
+
+       @return Depth of penetration.  If there is no intersection between the
+               objects then the depth will be a negative value.
+      */
+    static float penetrationDepthForFixedSphereFixedPlane(
+        const Sphere&       sphereA,
+        const class Plane&  planeB,
+        Array<Vector3>&     contactPoints,
+        Array<Vector3>&     contactNormals = ignoreArray);
+
+    /**
+      Calculates the depth of penetration between a fixed box and a fixed
+      plane as well as the vertexes of the box that penetrate the plane
+      and the plane normals at those intersections.
+
+      @param box            Fixed Box.
+      @param plane            Fixed Plane.
+      @param contactPoints    Box points that penetrate the plane.
+                             [Post Condition]
+      @param contactNormals    Normals at penetration points [Post Condition]
+
+      @return Depth of penetration.  If there is no intersection between the
+              objects then the depth will be a negative value.
+     */
+    static float penetrationDepthForFixedBoxFixedPlane(
+        const Box&          box,
+        const Plane&        plane,
+        Array<Vector3>&     contactPoints,
+        Array<Vector3>&     contactNormals = ignoreArray);
+
+    /**
+       Calculates time between the intersection of a moving point and a fixed
+       plane.
+
+       @note This is only a one sided collision test.   The side defined by
+       the plane's surface normal is the only one tested.  For a two sided
+       collision, call the function once for each side's surface normal.
+
+       @param point        Moving point.
+       @param velocity    Point's velocity.
+       @param plane        Fixed plane.
+       @param location    Location of collision. [Post Condition]
+                           (Infinite vector on no collision)
+       @param outNormal    Plane's surface normal. [Post Condition]
+
+       @return Time til collision.  If there is no collision then the return
+               value will be inf().
+     */
+    static float collisionTimeForMovingPointFixedPlane(
+        const Vector3&            point,
+        const Vector3&            velocity,
+        const class Plane&        plane,
+        Vector3&                outLocation,
+        Vector3&                outNormal = ignore);
+
+    /**
+       Calculates time between the intersection of a moving point and a fixed
+       triangle.
+
+       @note This is only a one sided collision test.   The side defined by
+       the triangle's surface normal is the only one tested.  For a two sided
+       collision, call the function once for each side's surface normal.
+
+       @param orig        Moving point.
+       @param dir        Point's velocity.
+      @param v0         Triangle vertex 1.
+      @param v1         Triangle vertex 2.
+      @param v2         Triangle vertex 3
+
+       @return Time til collision.  If there is no collision then the return
+               value will be inf().
+     */
+    inline static float collisionTimeForMovingPointFixedTriangle(
+        const Vector3& orig,
+        const Vector3& dir,
+        const Vector3& v0,
+        const Vector3& v1,
+        const Vector3& v2) {
+        return Ray::fromOriginAndDirection(orig, dir).intersectionTime(v0, v1, v2);
+    }
+
+    /**
+       Calculates time between the intersection of a moving point and a fixed
+       triangle.
+
+       @note This is only a one sided collision test.   The side defined by
+       the triangle's surface normal is the only one tested.  For a two sided
+       collision, call the function once for each side's surface normal.
+
+       @param orig        Moving point.
+       @param dir        Point's velocity.
+      @param v0         Triangle vertex 1.
+      @param v1         Triangle vertex 2.
+      @param v2         Triangle vertex 3
+       @param location    Location of collision. [Post Condition]
+                           (Infinite vector on no collision)
+
+       @return Time til collision.  If there is no collision then the return
+               value will be inf().
+     */
+    inline static float collisionTimeForMovingPointFixedTriangle(
+        const Vector3& orig,
+        const Vector3& dir,
+        const Vector3& v0,
+        const Vector3& v1,
+        const Vector3& v2,
+        Vector3&       location) {
+        float t = collisionTimeForMovingPointFixedTriangle(orig, dir, v0, v1, v2);
+        if (t < finf()) {
+            location = orig + dir * t;
+        }
+        return t;
+    }
+
+    /**
+       Calculates time between the intersection of a moving point and a fixed
+       triangle.
+
+       @note This is only a one sided collision test.   The side defined by
+       the triangle's surface normal is the only one tested.  For a two sided
+       collision, call the function once for each side's surface normal.
+
+       @param orig        Moving point.
+       @param dir        Point's velocity.
+       @param tri        Fixed triangle.
+       @param location    Location of collision. [Post Condition]
+                           (Infinite vector on no collision)
+       @param normal        Triangle's surface normal. [Post Condition]
+
+       @return Time til collision.  If there is no collision then the return
+               value will be inf().
+     */
+    inline static float collisionTimeForMovingPointFixedTriangle(
+        const Vector3&  orig,
+        const Vector3&  dir,
+        const Triangle& tri,
+        Vector3&        location = ignore,
+        Vector3&        normal   = ignore) {
+
+        float t = collisionTimeForMovingPointFixedTriangle(
+            orig, dir, tri.vertex(0), tri.vertex(1), tri.vertex(2));
+        
+        if ((t < finf()) && (&location != &ignore)) {
+            location = orig + dir * t;
+            normal   = tri.normal();
+        }
+        return t;
+    }
+
+    /**
+       Calculates time between the intersection of a moving point and a fixed
+       triangle.
+
+       @note This is only a one sided collision test.   The side defined by
+       the triangle's surface normal is the only one tested.  For a two sided
+       collision, call the function once for each side's surface normal.
+
+       @param orig        Moving point.
+       @param dir        Point's velocity.
+      @param v0         Triangle vertex 1.
+      @param v1         Triangle vertex 2.
+      @param v2         Triangle vertex 3
+       @param location    Location of collision. [Post Condition]
+                           (Infinite vector on no collision)
+       @param normal        Triangle's surface normal. [Post Condition]
+
+       @return Time til collision.  If there is no collision then the return
+               value will be inf().
+     */
+    inline static float collisionTimeForMovingPointFixedTriangle(
+        const Vector3& orig,
+        const Vector3& dir,
+        const Vector3& v0,
+        const Vector3& v1,
+        const Vector3& v2,
+        Vector3&       location,
+        Vector3&       normal) {
+        float t = collisionTimeForMovingPointFixedTriangle(orig, dir, v0, v1, v2);
+        if (t < finf()) {
+            location = orig + dir * t;
+            normal   = (v1 - v0).cross(v2 - v0).direction();
+        }
+        return t;
+    }
+
+    /**
+     If the ray origin is inside the box, returns inf() but inside
+     is set to true.
+     <B>Beta API</B>
+
+     @cite Andrew Woo, from "Graphics Gems", Academic Press, 1990
+       @cite Optimized code by Pierre Terdiman, 2000 (~20-30% faster on Celeron 500)
+     @cite Epsilon value added by Klaus Hartmann
+     @cite http://www.codercorner.com/RayAABB.cpp
+     */
+    static float collisionTimeForMovingPointFixedAABox(
+        const Vector3&            point,
+        const Vector3&            velocity,
+        const class AABox&      box,
+        Vector3&                outLocation,
+        bool&                   inside = ignoreBool,
+        Vector3&                outNormal = ignore);
+
+    /**
+     Calculates time between the intersection of a moving point and a fixed
+     Axis-Aligned Box (AABox).
+
+     @note Avoids the sqrt from collisionTimeForMovingPointFixedAABox.
+
+     @param point        Moving point.
+     @param velocity    Sphere's velocity.
+     @param box            Fixed AAbox.
+     @param location    Location of collision. [Post Condition]
+     @param Inside        Does the ray originate inside the box? [Post Condition]
+     @param normal        Box's surface normal to collision [Post Condition]
+
+     @return Time til collision.  If there is no collision then the return
+             value will be inf().
+     */
+    static bool collisionLocationForMovingPointFixedAABox(
+        const Vector3&            point,
+        const Vector3&            velocity,
+        const class AABox&      box,
+        Vector3&                outLocation,
+        bool&                   inside = ignoreBool,
+        Vector3&                normal = ignore);
+
+
+    /**
+     @brief Calculates intersection of a ray and a static
+     Axis-Aligned Box (AABox).
+
+     @note Avoids the sqrt from collisionTimeForMovingPointFixedAABox; 
+      early-out branches and operations optimized for Intel Core2 architecture.
+     
+     @param invDir      1/dir
+     @param location    Location of collision. [Post Condition]
+     @param inside        Does the ray originate inside the box? [Post Condition]
+
+     @return True if the ray hits the box
+    */
+    static bool __fastcall rayAABox(
+        const Ray&              ray,
+        const Vector3&          invDir,
+        const AABox&            box,
+        const Vector3&          boxCenter,
+        float                   boundingRadiusSquared,
+        Vector3&                location,
+        bool&                   inside);
+
+    /**
+     Calculates time between the intersection of a moving point and a fixed
+     sphere.
+
+     @note When ray is starts inside the rectangle, the exiting intersection
+     is detected.
+
+     @param point        Moving point.
+     @param velocity    Point's velocity.
+     @param sphere        Fixed Sphere.
+     @param outLocation    Location of collision. [Post Condition]
+     @param outNormal    Sphere's surface normal to collision [Post Condition]
+     \param solid If true, rays inside the sphere immediately intersect (good for collision detection).  If false, they hit the opposite side of the sphere (good for ray tracing).
+
+     @return Time until collision.  If there is no collision then the return
+             value will be inf().
+     */
+    static float collisionTimeForMovingPointFixedSphere(
+        const Vector3&            point,
+        const Vector3&            velocity,
+        const class Sphere&        sphere,
+        Vector3&                outLocation,
+        Vector3&                outNormal = ignore,
+        bool                    solid = false);
+
+    /**
+     Calculates time between the intersection of a moving point and a fixed
+     box.
+
+     @note If the point is already inside the box, no collision: inf is returned.
+
+     @param point        Moving point.
+     @param velocity    Sphere's velocity.
+     @param box            Fixed box.
+     @param location    Position of collision. [Post Condition]
+     @param outNormal    Box's surface normal to collision [Post Condition]
+
+     @return Time til collision.  If there is no collision then the return
+             value will be inf().
+     */
+    static float collisionTimeForMovingPointFixedBox(
+        const Vector3&            point,
+        const Vector3&            velocity,
+        const class  Box&        box,
+        Vector3&                outLocation,
+        Vector3&                outNormal = ignore);
+
+    /**
+     Calculates time between the intersection of a moving point and a fixed
+     rectangle defined by the points v0, v1, v2, & v3.
+
+     @note This is only a one sided collision test.   The side defined by
+     the rectangle's surface normal is the only one tested.  For a two sided
+     collision, call the function once for each side's surface normal.
+
+     @param point        Moving point.
+     @param velocity    Sphere's velocity.
+     @param v0             Rectangle vertex 1.
+     @param v1             Rectangle vertex 2.
+     @param v2             Rectangle vertex 3
+     @param v3             Rectangle vertex 4.
+     @param location    Location of collision [Post Condition]
+     @param outNormal    Rectangle's surface normal. [Post Condition]
+
+     @return Time til collision.  If there is no collision then the return
+             value will be inf().
+     */
+    static float collisionTimeForMovingPointFixedRectangle(
+        const Vector3&            point,
+        const Vector3&            velocity,
+        const Vector3&            v0,
+        const Vector3&            v1,
+        const Vector3&            v2,
+        const Vector3&            v3,
+        Vector3&                outLocation,
+        Vector3&                outNormal = ignore);
+
+    /**
+     Calculates time between the intersection of a moving point and a fixed
+     capsule.
+
+     @param point        Moving point.
+     @param velocity    Point's velocity.
+     @param capsule        Fixed capsule.
+     @param outLocation    Location of collision. [Post Condition]
+     @param outNormal    Capsule's surface normal to collision [Post Condition]
+
+     @return Time til collision.  If there is no collision then the return
+             value will be inf().
+     */
+    static float collisionTimeForMovingPointFixedCapsule(
+        const Vector3&            point,
+        const Vector3&            velocity,
+        const class Capsule&    capsule,
+        Vector3&                outLocation,
+        Vector3&                outNormal = ignore);
+
+    /**
+     Calculates time between the intersection of a moving sphere and a fixed
+     triangle.
+
+     @param sphere        Moving sphere.
+     @param velocity    Sphere's velocity.
+     @param plane        Fixed Plane.
+     @param outLocation    Location of collision -- not center position of sphere
+                         at the collision time. [Post Condition]
+     @param outNormal    Box's surface normal to collision [Post Condition]
+
+     @return Time til collision.  If there is no collision then the return
+             value will be inf().
+     */
+    static float collisionTimeForMovingSphereFixedPlane(
+        const class Sphere&        sphere,
+        const Vector3&            velocity,
+        const class Plane&        plane,
+        Vector3&                outLocation,
+        Vector3&                outNormal = ignore);
+
+    /**
+     Calculates time between the intersection of a moving sphere and a fixed
+     triangle.
+
+     @param sphere        Moving sphere.
+     @param velocity    Sphere's velocity.
+     @param triangle    Fixed Triangle.  (collisions can happen on the back side of the triangle)
+     @param outLocation    Location of collision, if collision occurs -- not center position of sphere
+                         at the collision time. If there is interpenetration at the start, this point may be inside
+                        the sphere.
+     @param b           Barycentric coordinates. These are not valid unless collision occurs.
+
+     @return Time til collision.  If there is no collision then the return
+             value will be inf().
+    */
+    static float collisionTimeForMovingSphereFixedTriangle(
+        const class Sphere&        sphere,
+        const Vector3&            velocity,
+        const Triangle&         triangle,
+        Vector3&                outLocation,
+        float                   b[3] = (float*)&ignore);
+
+    /**
+     Calculates time between the intersection of a moving sphere and a fixed
+     rectangle defined by the points v0, v1, v2, & v3.
+
+     @param sphere        Moving sphere.
+     @param velocity    Sphere's velocity.
+     @param v0             Rectangle vertex 1.
+     @param v1             Rectangle vertex 2.
+     @param v2             Rectangle vertex 3
+     @param v3             Rectangle vertex 4.
+     @param outLocation    Location of collision -- not center position of sphere
+                         at the collision time. [Post Condition]
+     @param outNormal    Box's surface normal to collision [Post Condition]
+
+     @return Time til collision.  If there is no collision then the return
+             value will be inf().
+     */
+    static float collisionTimeForMovingSphereFixedRectangle(
+        const class Sphere&        sphere,
+        const Vector3&            velocity,
+        const Vector3&            v0,
+        const Vector3&            v1,
+        const Vector3&            v2,
+        const Vector3&            v3,
+        Vector3&                outLocation,
+        Vector3&                outNormal = ignore);
+
+    /**
+     Calculates time between the intersection of a moving sphere and a fixed
+     box.
+
+     @note This function will not detect an intersection between a moving object
+     that is already interpenetrating the fixed object.
+
+     @param sphere        Moving sphere.
+     @param velocity    Sphere's velocity.
+     @param box            Fixed box.
+     @param location    Location of collision -- not center position of sphere
+                         at the collision time. [Post Condition]
+     @param outNormal    Box's surface normal to collision [Post Condition]
+
+     @return Time til collision.  If there is no collision then the return
+             value will be inf().
+     */
+    static float collisionTimeForMovingSphereFixedBox(
+        const class Sphere&        sphere,
+        const Vector3&            velocity,
+        const class Box&        box,
+        Vector3&                outLocation,
+        Vector3&                outNormal = ignore);
+
+    /** Calculates time between the intersection of a moving sphere
+        and a fixed sphere. 
+
+        If they are already interpenetrating, returns 0 and @a
+        location is the closest point on the surface of the fixed sphere
+        to the center of the moving sphere.
+        
+        @param sphere            Moving sphere.
+        @param velocity         Sphere's velocity.
+        @param fixedSphere        Fixed Sphere.
+        @param outLocation        Location of collision -- not center position of sphere
+        at the collision time. [Post Condition]
+        @param outNormal        Moving sphere's surface normal to collision [Post Condition]
+        
+        @return Time until collision.  If there is no collision then the return
+        value will be inf().
+    */
+    static float collisionTimeForMovingSphereFixedSphere(
+        const Sphere&        sphere,
+        const Vector3&        velocity,
+        const Sphere&        fixedSphere,
+        Vector3&            outLocation,
+        Vector3&            outNormal = ignore);
+
+    /**
+     Calculates time between the intersection of a moving sphere and a fixed
+     capsule.
+
+     @note This won't detect a collision if the sphere is already
+           interpenetrating the capsule.
+
+     @param sphere        Moving sphere.
+     @param velocity    Sphere's velocity.
+     @param capsule        Fixed capsule.
+     @param location    Location of collision -- not center position of sphere
+                         at the collision time. [Post Condition]
+     @param outNormal    Capsule's surface normal to the collision [Post Condition]
+
+     @return Time til collision.  If there is no collision then the return
+             value will be inf().
+     */
+    static float collisionTimeForMovingSphereFixedCapsule(
+        const class Sphere&        sphere,
+        const Vector3&            velocity,
+        const class Capsule&    capsule,
+        Vector3&                outLocation,
+        Vector3&                outNormal = ignore);
+
+    /**
+     Finds the direction of bounce that a sphere would have when it 
+     intersects an object with the  given time of collision, the 
+     collision location and the collision normal.
+
+     @note This function works like a pong style ball bounce.
+
+     @param sphere                Moving sphere.
+     @param velocity            Sphere's velocity.
+     @param collisionTime        Time of collision.
+     @param collisionLocation    Collision location.
+     @param collisionNormal        Surface collision normal.
+
+     @return Direction of bounce.
+     */
+    static Vector3 bounceDirection(
+        const class Sphere&        sphere,
+        const Vector3&            velocity,
+        const float                collisionTime,
+        const Vector3&            collisionLocation,
+        const Vector3&          collisionNormal);
+
+    /**
+     Finds the direction of slide given a moving sphere, its velocity, the
+     time of collision and the collision location.  This function works as
+     if the sphere intersects the surface and continues to hug it.
+
+     @note The result will work well for calculating the movement of a player
+     who collides with an object and continues moving along the object instead
+     of just bouncing off it.
+
+     @param sphere                Moving sphere.
+     @param velocity            Sphere's velocity.
+     @param collisionTime        Time of collision
+     @param collisionLocation    Collision location.
+
+     @return Direction of slide.
+     */
+    static Vector3 slideDirection(
+        const class Sphere&        sphere,
+        const Vector3&            velocity,
+        const float                collisionTime,
+        const Vector3&            collisionLocation);
+
+    /**
+     Finds the closest point on a line segment to a given point.
+
+     @param v0 line vertex 1.
+     @param v1 line vertex 2.
+     @param point External point.
+
+     @return Closests point to <code>point</code> on the line segment.
+     */
+    static Vector3 closestPointOnLineSegment(
+        const Vector3&            v0,
+        const Vector3&            v1,
+        const Vector3&            point);
+
+    /**
+     Finds the closest point on a line segment to a given point.
+
+     @note This is an optimization to closestPointOnLineSegment.  Edge length
+     and direction can be used in this function if already pre-calculated.  This
+     prevents doing the same work twice.
+
+     @param v0 line vertex 0.
+     @param v1 line vertex 1.
+     @param edgeDirection The direction of the segment (unit length).
+     @param edgeLength The length of the segment.
+     @param point External point.
+
+     @return Closests point to <code>point</code> on the line segment.
+     */
+    static Vector3 closestPointOnLineSegment(
+        const Vector3&            v0,
+        const Vector3&            v1,
+        const Vector3&          edgeDirection,
+        float                   edgeLength,
+        const Vector3&            point);
+
+    /**
+     Finds the closest point on the perimeter of the triangle to an external point;
+     given a triangle defined by three points v0, v1, & v2, and the external point.
+
+     @param v0 Triangle vertex 0.
+     @param v1 Triangle vertex 1.
+     @param v2 Triangle vertex 2.
+     @param point External point.
+
+     @return Closests point to <code>point</code> on the perimeter of the
+     triangle.
+     */
+    static Vector3 closestPointOnTrianglePerimeter(
+        const Vector3&            v0,
+        const Vector3&            v1,
+        const Vector3&            v2,
+        const Vector3&            point);
+
+    /**
+     Finds the closest point on the perimeter of the triangle to an external point;
+     given a triangle defined by the array of points v, its edge directions and
+     their lengths, as well as the external point.
+
+     @note This is an optimization to closestPointToTrianglePerimeter.  Edge length
+     and direction can be used in this function if already pre-calculated.  This
+     prevents doing the same work twice.
+
+     @param v           Triangle vertices.
+     @param point       External point.
+     @param edgeIndex   The point lies on the edge between v[edgeIndex] and v[(edgeIndex + 1) % 3]
+
+     @return Closest point to <code>point</code> on the perimeter of the
+     triangle.
+     */
+    static Vector3 closestPointOnTrianglePerimeter(
+        const Vector3           v[3],
+        const Vector3           edgeDirection[3],
+        const float             edgeLength[3],
+        const Vector3&            point,
+        int&                    edgeIndex);
+
+    /**
+     Tests whether a point is contained within the triangle defined by
+     v0, v1, and v2 and its plane's normal.
+
+     @param v0 Triangle vertex 0.
+     @param v1 Triangle vertex 1.
+     @param v2 Triangle vertex 2.
+     @param normal Normal to triangle's plane.
+     @param point The point in question.
+     @param primaryAxis Primary axis of triangle.  This will be detected
+            if not given. This parameter is provided as an optimization.
+     @param b Barycentric coordinates; b[i] is the weight on v[i]
+
+     @return true  - if point is inside the triangle.
+     @return false - otherwise
+     */
+    static bool isPointInsideTriangle(
+        const Vector3&            v0,
+        const Vector3&            v1,
+        const Vector3&            v2,
+        const Vector3&            normal,
+        const Vector3&          point,
+        float                   b[3],
+        Vector3::Axis           primaryAxis = Vector3::DETECT_AXIS);
+
+    inline static bool isPointInsideTriangle(
+        const Vector3&            v0,
+        const Vector3&            v1,
+        const Vector3&            v2,
+        const Vector3&            normal,
+        const Vector3&            point,
+        Vector3::Axis           primaryAxis = Vector3::DETECT_AXIS) {
+
+        float b[3];
+        return isPointInsideTriangle(v0, v1, v2, normal, point, b, primaryAxis);
+    }
+
+     /**
+      Tests for the intersection of a moving sphere and a fixed box in a
+      given time limit.
+
+      @note Returns true if any part of the sphere is inside the box
+             during the time period (inf means "ever").  Useful for
+            performing bounding-box collision detection.
+
+      @param sphere         Moving sphere.
+      @param velocity     Velocity of moving sphere.
+      @param box         Fixed box.
+      @param timeLimit     Time limit for intersection test.
+
+      @return true  -  if the two objects will touch.
+      @return false - if there is no intersection.
+     */
+    static bool movingSpherePassesThroughFixedBox(
+        const Sphere&           sphere,
+        const Vector3&          velocity,
+        const Box&              box,
+        double                  timeLimit = inf());
+
+    /**
+     Tests for the intersection of a moving sphere and a fixed sphere in a
+     given time limit.
+
+     @note This function will not detect an intersection between a moving object
+     that is already interpenetrating the fixed object.
+
+     @param sphere         Moving sphere.
+     @param velocity     Velocity of moving sphere.
+     @param fixedSphere Fixed sphere.
+     @param timeLimit     Time limit for intersection test.
+
+     @return true  -  if the two spheres will touch.
+     @return false - if there is no intersection.
+     */
+    static bool movingSpherePassesThroughFixedSphere(
+        const Sphere&           sphere,
+        const Vector3&          velocity,
+        const Sphere&           fixedSphere,
+        double                  timeLimit = inf());
+
+    /**
+     Tests for the intersection of two fixed spheres.
+
+     @param sphere1 Fixed sphere 1.
+     @param sphere2 Fixed sphere 2.
+
+     @return true -  if the two spheres touch.
+     @return false - if there is no intersection.
+     */
+    static bool fixedSolidSphereIntersectsFixedSolidSphere(
+        const Sphere&           sphere1,
+        const Sphere&           sphere2);
+
+    /**
+     Tests for the intersection of a fixed sphere and a fixed box.
+
+     @param sphere Fixed sphere.
+     @param box    Fixed box.
+
+     @return true  -  if the two objects touch.
+     @return false - if there is no intersection.
+     */
+    static bool fixedSolidSphereIntersectsFixedSolidBox(
+        const Sphere&           sphere,
+        const Box&              box);
+
+    static bool fixedSolidSphereIntersectsFixedTriangle(
+        const Sphere&           sphere,
+        const Triangle&         triangle);
+
+    static bool fixedSolidBoxIntersectsFixedTriangle(
+        const AABox&            box, 
+        const Triangle&         triangle);
+
+    /**
+     Tests whether a point is inside a rectangle defined by the vertexes
+     v0, v1, v2, & v3, and the rectangle's plane normal.
+
+     @param v0 Rectangle vertex 1.
+     @param v1 Rectangle vertex 2.
+     @param v2 Rectangle vertex 3.
+     @param v3 Rectangle vertex 4.
+     @param normal Normal to rectangle's plane.
+     @param point The point in question.
+
+     @return true  - if point is inside the rectangle.
+     @return false - otherwise
+     */
+    static bool isPointInsideRectangle(
+        const Vector3&            v0,
+        const Vector3&            v1,
+        const Vector3&            v2,
+        const Vector3&            v3,
+        const Vector3&            normal,
+        const Vector3&            point);
+
+    /**
+     Finds the closest point on the perimeter of the rectangle to an
+     external point; given a rectangle defined by four points v0, v1,
+     v2, & v3, and the external point.
+
+     @param v0 Rectangle vertex 1.
+     @param v1 Rectangle vertex 2.
+     @param v2 Rectangle vertex 3.
+     @param v3 Rectangle vertex 4.
+     @param point External point.
+
+     @return Closests point to <code>point</code> on the perimeter of the
+      rectangle.
+      */
+    static Vector3 closestPointToRectanglePerimeter(
+        const Vector3&            v0,
+        const Vector3&            v1,
+        const Vector3&            v2,
+        const Vector3&            v3,
+        const Vector3&            point);
+
+     /**
+      Finds the closest point in the rectangle to an external point; Given
+      a rectangle defined by four points v0, v1, v2, & v3, and the external
+      point.
+
+      @param v0 Rectangle vertex 1.
+      @param v1 Rectangle vertex 2.
+      @param v2 Rectangle vertex 3
+      @param v3 Rectangle vertex 4.
+      @param point External point.
+
+      @return Closet point in the rectangle to the external point.
+      */
+     static Vector3 closestPointToRectangle(
+        const Vector3&            v0,
+        const Vector3&            v1,
+        const Vector3&            v2,
+        const Vector3&            v3,
+        const Vector3&            point);
+};
+
+} // namespace
+
+#endif // G3D_COLLISIONDETECTION_H
diff --git a/dep/src/g3dlite/Color1.cpp b/dep/g3dlite/G3D/Color1.cpp
similarity index 100%
rename from dep/src/g3dlite/Color1.cpp
rename to dep/g3dlite/G3D/Color1.cpp
diff --git a/dep/include/g3dlite/G3D/Color1.h b/dep/g3dlite/G3D/Color1.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Color1.h
rename to dep/g3dlite/G3D/Color1.h
diff --git a/dep/src/g3dlite/Color1uint8.cpp b/dep/g3dlite/G3D/Color1uint8.cpp
similarity index 100%
rename from dep/src/g3dlite/Color1uint8.cpp
rename to dep/g3dlite/G3D/Color1uint8.cpp
diff --git a/dep/include/g3dlite/G3D/Color1uint8.h b/dep/g3dlite/G3D/Color1uint8.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Color1uint8.h
rename to dep/g3dlite/G3D/Color1uint8.h
diff --git a/dep/src/g3dlite/Color3.cpp b/dep/g3dlite/G3D/Color3.cpp
similarity index 83%
rename from dep/src/g3dlite/Color3.cpp
rename to dep/g3dlite/G3D/Color3.cpp
index deb0bd87e..82deef576 100644
--- a/dep/src/g3dlite/Color3.cpp
+++ b/dep/g3dlite/G3D/Color3.cpp
@@ -247,7 +247,7 @@ Color3 Color3::random() {
 //----------------------------------------------------------------------------
 Color3& Color3::operator/= (float fScalar) {
     if (fScalar != 0.0f) {
-		float fInvScalar = 1.0f / fScalar;
+        float fInvScalar = 1.0f / fScalar;
         r *= fInvScalar;
         g *= fInvScalar;
         b *= fInvScalar;
@@ -262,10 +262,10 @@ Color3& Color3::operator/= (float fScalar) {
 
 //----------------------------------------------------------------------------
 float Color3::unitize (float fTolerance) {
-	float fLength = length();
+    float fLength = length();
 
     if ( fLength > fTolerance ) {
-		float fInvLength = 1.0f / fLength;
+        float fInvLength = 1.0f / fLength;
         r *= fInvLength;
         g *= fInvLength;
         b *= fInvLength;
@@ -313,56 +313,56 @@ Color3 Color3::fromHSV(const Vector3& _hsv) {
 
 
 Vector3 Color3::toHSV(const Color3& _rgb) {
-	debugAssertM((_rgb.r <= 1.0f && _rgb.r >= 0.0f) 
-			&& (_rgb.g <= 1.0f && _rgb.g >= 0.0f)
-			&& (_rgb.b <= 1.0f && _rgb.b >= 0.0f), "R,G,B must be between [0,1]");
-	Vector3 hsv = Vector3::zero();
-	hsv.z = G3D::max(G3D::max(_rgb.r, _rgb.g), _rgb.b);
-	if (G3D::fuzzyEq(hsv.z, 0.0f)) {
-		return hsv;
-	}
-	
+    debugAssertM((_rgb.r <= 1.0f && _rgb.r >= 0.0f) 
+            && (_rgb.g <= 1.0f && _rgb.g >= 0.0f)
+            && (_rgb.b <= 1.0f && _rgb.b >= 0.0f), "R,G,B must be between [0,1]");
+    Vector3 hsv = Vector3::zero();
+    hsv.z = G3D::max(G3D::max(_rgb.r, _rgb.g), _rgb.b);
+    if (G3D::fuzzyEq(hsv.z, 0.0f)) {
+        return hsv;
+    }
+    
     const float x =  G3D::min(G3D::min(_rgb.r, _rgb.g), _rgb.b);
-	hsv.y = (hsv.z - x) / hsv.z; 
+    hsv.y = (hsv.z - x) / hsv.z; 
 
     if (G3D::fuzzyEq(hsv.y, 0.0f)) {
-		return hsv;
-	}
+        return hsv;
+    }
 
-	Vector3 rgbN;
-	rgbN.x = (hsv.z - _rgb.r) / (hsv.z - x);
-	rgbN.y = (hsv.z - _rgb.g) / (hsv.z - x);
-	rgbN.z = (hsv.z - _rgb.b) / (hsv.z - x);
+    Vector3 rgbN;
+    rgbN.x = (hsv.z - _rgb.r) / (hsv.z - x);
+    rgbN.y = (hsv.z - _rgb.g) / (hsv.z - x);
+    rgbN.z = (hsv.z - _rgb.b) / (hsv.z - x);
 
-	if (_rgb.r == hsv.z) {  // note from the max we know that it exactly equals one of the three.
-		hsv.x = (_rgb.g == x)? 5.0f + rgbN.z : 1.0f - rgbN.y;
-	} else if (_rgb.g == hsv.z) {
-		hsv.x = (_rgb.b == x)? 1.0f + rgbN.x : 3.0f - rgbN.z;
-	} else {
-		hsv.x = (_rgb.r == x)? 3.0f + rgbN.y : 5.0f - rgbN.x;
-	}
-	
+    if (_rgb.r == hsv.z) {  // note from the max we know that it exactly equals one of the three.
+        hsv.x = (_rgb.g == x)? 5.0f + rgbN.z : 1.0f - rgbN.y;
+    } else if (_rgb.g == hsv.z) {
+        hsv.x = (_rgb.b == x)? 1.0f + rgbN.x : 3.0f - rgbN.z;
+    } else {
+        hsv.x = (_rgb.r == x)? 3.0f + rgbN.y : 5.0f - rgbN.x;
+    }
+    
     hsv.x /= 6.0f;
 
-	return hsv;
+    return hsv;
 }
 
 Color3 Color3::jetColorMap(const float& val) {
-	debugAssertM(val <= 1.0f && val >= 0.0f , "value should be in [0,1]");
+    debugAssertM(val <= 1.0f && val >= 0.0f , "value should be in [0,1]");
 
-	//truncated triangles where sides have slope 4
-	Color3 jet;
+    //truncated triangles where sides have slope 4
+    Color3 jet;
 
-	jet.r = G3D::min(4.0f * val - 1.5f,-4.0f * val + 4.5f) ;
-	jet.g = G3D::min(4.0f * val - 0.5f,-4.0f * val + 3.5f) ;
-	jet.b = G3D::min(4.0f * val + 0.5f,-4.0f * val + 2.5f) ;
+    jet.r = G3D::min(4.0f * val - 1.5f,-4.0f * val + 4.5f) ;
+    jet.g = G3D::min(4.0f * val - 0.5f,-4.0f * val + 3.5f) ;
+    jet.b = G3D::min(4.0f * val + 0.5f,-4.0f * val + 2.5f) ;
 
 
-	jet.r = G3D::clamp(jet.r, 0.0f, 1.0f);
-	jet.g = G3D::clamp(jet.g, 0.0f, 1.0f);
-	jet.b = G3D::clamp(jet.b, 0.0f, 1.0f);
+    jet.r = G3D::clamp(jet.r, 0.0f, 1.0f);
+    jet.g = G3D::clamp(jet.g, 0.0f, 1.0f);
+    jet.b = G3D::clamp(jet.b, 0.0f, 1.0f);
 
-	return jet;
+    return jet;
 }
 
 
diff --git a/dep/include/g3dlite/G3D/Color3.h b/dep/g3dlite/G3D/Color3.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Color3.h
rename to dep/g3dlite/G3D/Color3.h
diff --git a/dep/src/g3dlite/Color3uint8.cpp b/dep/g3dlite/G3D/Color3uint8.cpp
similarity index 100%
rename from dep/src/g3dlite/Color3uint8.cpp
rename to dep/g3dlite/G3D/Color3uint8.cpp
diff --git a/dep/include/g3dlite/G3D/Color3uint8.h b/dep/g3dlite/G3D/Color3uint8.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Color3uint8.h
rename to dep/g3dlite/G3D/Color3uint8.h
diff --git a/dep/src/g3dlite/Color4.cpp b/dep/g3dlite/G3D/Color4.cpp
similarity index 98%
rename from dep/src/g3dlite/Color4.cpp
rename to dep/g3dlite/G3D/Color4.cpp
index eab09eb9c..4eb5f9a80 100644
--- a/dep/src/g3dlite/Color4.cpp
+++ b/dep/g3dlite/G3D/Color4.cpp
@@ -148,7 +148,7 @@ Color4 Color4::operator/ (float fScalar) const {
     Color4 kQuot;
 
     if (fScalar != 0.0f) {
-		float fInvScalar = 1.0f / fScalar;
+        float fInvScalar = 1.0f / fScalar;
         kQuot.r = fInvScalar * r;
         kQuot.g = fInvScalar * g;
         kQuot.b = fInvScalar * b;
@@ -165,7 +165,7 @@ Color4 Color4::operator/ (float fScalar) const {
 
 Color4& Color4::operator/= (float fScalar) {
     if (fScalar != 0.0f) {
-		float fInvScalar = 1.0f / fScalar;
+        float fInvScalar = 1.0f / fScalar;
         r *= fInvScalar;
         g *= fInvScalar;
         b *= fInvScalar;
diff --git a/dep/include/g3dlite/G3D/Color4.h b/dep/g3dlite/G3D/Color4.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Color4.h
rename to dep/g3dlite/G3D/Color4.h
diff --git a/dep/src/g3dlite/Color4uint8.cpp b/dep/g3dlite/G3D/Color4uint8.cpp
similarity index 100%
rename from dep/src/g3dlite/Color4uint8.cpp
rename to dep/g3dlite/G3D/Color4uint8.cpp
diff --git a/dep/include/g3dlite/G3D/Color4uint8.h b/dep/g3dlite/G3D/Color4uint8.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Color4uint8.h
rename to dep/g3dlite/G3D/Color4uint8.h
diff --git a/dep/src/g3dlite/Cone.cpp b/dep/g3dlite/G3D/Cone.cpp
similarity index 100%
rename from dep/src/g3dlite/Cone.cpp
rename to dep/g3dlite/G3D/Cone.cpp
diff --git a/dep/include/g3dlite/G3D/Cone.h b/dep/g3dlite/G3D/Cone.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Cone.h
rename to dep/g3dlite/G3D/Cone.h
diff --git a/dep/src/g3dlite/ConvexPolyhedron.cpp b/dep/g3dlite/G3D/ConvexPolyhedron.cpp
similarity index 99%
rename from dep/src/g3dlite/ConvexPolyhedron.cpp
rename to dep/g3dlite/G3D/ConvexPolyhedron.cpp
index 5fa76e3ed..ec0c7b705 100644
--- a/dep/src/g3dlite/ConvexPolyhedron.cpp
+++ b/dep/g3dlite/G3D/ConvexPolyhedron.cpp
@@ -210,7 +210,7 @@ void ConvexPolygon::removeDuplicateVertices(){
                 --i; // Don't move forward.
             }
         }
-	
+    
         // Check the last vertex against the first.
         if (_vertex[_vertex.size()-1].fuzzyEq(_vertex[0])){
             _vertex.pop();
diff --git a/dep/include/g3dlite/G3D/ConvexPolyhedron.h b/dep/g3dlite/G3D/ConvexPolyhedron.h
similarity index 99%
rename from dep/include/g3dlite/G3D/ConvexPolyhedron.h
rename to dep/g3dlite/G3D/ConvexPolyhedron.h
index a6fdd62cf..ea38c02ba 100644
--- a/dep/include/g3dlite/G3D/ConvexPolyhedron.h
+++ b/dep/g3dlite/G3D/ConvexPolyhedron.h
@@ -34,7 +34,7 @@ private:
 
     friend class ConvexPolyhedron;
 
-    Array<Vector3>			_vertex;
+    Array<Vector3>            _vertex;
 
 public:
 
diff --git a/dep/src/g3dlite/CoordinateFrame.cpp b/dep/g3dlite/G3D/CoordinateFrame.cpp
similarity index 100%
rename from dep/src/g3dlite/CoordinateFrame.cpp
rename to dep/g3dlite/G3D/CoordinateFrame.cpp
diff --git a/dep/include/g3dlite/G3D/CoordinateFrame.h b/dep/g3dlite/G3D/CoordinateFrame.h
similarity index 94%
rename from dep/include/g3dlite/G3D/CoordinateFrame.h
rename to dep/g3dlite/G3D/CoordinateFrame.h
index c83754abb..9c9971b06 100644
--- a/dep/include/g3dlite/G3D/CoordinateFrame.h
+++ b/dep/g3dlite/G3D/CoordinateFrame.h
@@ -59,10 +59,10 @@ class CoordinateFrame {
 public:
 
     /**  Takes object space points to world space.  */
-    Matrix3							rotation;
+    Matrix3                            rotation;
 
     /** Takes object space points to world space. */
-    Vector3							translation;
+    Vector3                            translation;
 
     /** \param any Must be in one of the following forms: 
         - CFrame((matrix3 expr), (vector3 expr))
@@ -189,9 +189,9 @@ public:
      */
     inline Vector3 pointToWorldSpace(const Vector3& v) const {
         return Vector3(
-			rotation[0][0] * v[0] + rotation[0][1] * v[1] + rotation[0][2] * v[2] + translation[0],
-			rotation[1][0] * v[0] + rotation[1][1] * v[1] + rotation[1][2] * v[2] + translation[1],
-			rotation[2][0] * v[0] + rotation[2][1] * v[1] + rotation[2][2] * v[2] + translation[2]);
+            rotation[0][0] * v[0] + rotation[0][1] * v[1] + rotation[0][2] * v[2] + translation[0],
+            rotation[1][0] * v[0] + rotation[1][1] * v[1] + rotation[1][2] * v[2] + translation[1],
+            rotation[2][0] * v[0] + rotation[2][1] * v[1] + rotation[2][2] * v[2] + translation[2]);
     }
 
     /**
@@ -294,9 +294,9 @@ public:
         Vector3         up);
 
     /** The direction this camera is looking (its negative z axis)*/
-	inline Vector3 lookVector() const {
-		return -rotation.column(2);
-	}
+    inline Vector3 lookVector() const {
+        return -rotation.column(2);
+    }
 
     /** Returns the ray starting at the camera origin travelling in direction CoordinateFrame::lookVector. */
     class Ray lookRay() const;
@@ -307,15 +307,15 @@ public:
     }
 
     inline Vector3 rightVector() const {
-		return rotation.column(0);
-	}
+        return rotation.column(0);
+    }
 
     /**
      If a viewer looks along the look vector, this is the viewer's "left".
      Useful for strafing motions and building alternative coordinate frames.
      */
     inline Vector3 leftVector() const {
-		return -rotation.column(0);
+        return -rotation.column(0);
     }
 
     /**
diff --git a/dep/src/g3dlite/Crypto.cpp b/dep/g3dlite/G3D/Crypto.cpp
similarity index 100%
rename from dep/src/g3dlite/Crypto.cpp
rename to dep/g3dlite/G3D/Crypto.cpp
diff --git a/dep/include/g3dlite/G3D/Crypto.h b/dep/g3dlite/G3D/Crypto.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Crypto.h
rename to dep/g3dlite/G3D/Crypto.h
diff --git a/dep/src/g3dlite/Crypto_md5.cpp b/dep/g3dlite/G3D/Crypto_md5.cpp
similarity index 84%
rename from dep/src/g3dlite/Crypto_md5.cpp
rename to dep/g3dlite/G3D/Crypto_md5.cpp
index c7ee535d6..d9184e9bc 100644
--- a/dep/src/g3dlite/Crypto_md5.cpp
+++ b/dep/g3dlite/G3D/Crypto_md5.cpp
@@ -38,9 +38,9 @@ typedef unsigned int md5_word_t; /* 32-bit word */
 
 /* Define the state of the MD5 Algorithm. */
 typedef struct md5_state_s {
-    md5_word_t count[2];	/* message length in bits, lsw first */
-    md5_word_t abcd[4];		/* digest buffer */
-    md5_byte_t buf[64];		/* accumulate block */
+    md5_word_t count[2];    /* message length in bits, lsw first */
+    md5_word_t abcd[4];        /* digest buffer */
+    md5_byte_t buf[64];        /* accumulate block */
 } md5_state_t;
 
 #ifdef __cplusplus
@@ -100,7 +100,7 @@ MD5Hash Crypto::md5(const void* data, size_t n) {
 
   This code implements the MD5 Algorithm defined in RFC 1321, whose
   text is available at
-	http://www.ietf.org/rfc/rfc1321.txt
+    http://www.ietf.org/rfc/rfc1321.txt
   The code is derived from the text of the RFC, including the test suite
   (section A.5) but excluding the rest of Appendix A.  It does not include
   any code or documentation that is identified in the RFC as being
@@ -111,14 +111,14 @@ MD5Hash Crypto::md5(const void* data, size_t n) {
   that follows (in reverse chronological order):
 
   2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
-	either statically or dynamically; added missing #include <string.h>
-	in library.
+    either statically or dynamically; added missing #include <string.h>
+    in library.
   2002-03-11 lpd Corrected argument list for main(), and added int return
-	type, in test program and T value program.
+    type, in test program and T value program.
   2002-02-21 lpd Added missing #include <stdio.h> in test program.
   2000-07-03 lpd Patched to eliminate warnings about "constant is
-	unsigned in ANSI C, signed in traditional"; made test program
-	self-checking.
+    unsigned in ANSI C, signed in traditional"; made test program
+    self-checking.
   1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
   1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
   1999-05-03 lpd Original version.
@@ -220,8 +220,8 @@ static void
 md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
 {
     md5_word_t
-	a = pms->abcd[0], b = pms->abcd[1],
-	c = pms->abcd[2], d = pms->abcd[3];
+    a = pms->abcd[0], b = pms->abcd[1],
+    c = pms->abcd[2], d = pms->abcd[3];
     md5_word_t t;
 #if BYTE_ORDER > 0
     /* Define storage only for big-endian CPUs. */
@@ -234,51 +234,51 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
 
     {
 #if BYTE_ORDER == 0
-	/*
-	 * Determine dynamically whether this is a big-endian or
-	 * little-endian machine, since we can use a more efficient
-	 * algorithm on the latter.
-	 */
-	static const int w = 1;
+    /*
+     * Determine dynamically whether this is a big-endian or
+     * little-endian machine, since we can use a more efficient
+     * algorithm on the latter.
+     */
+    static const int w = 1;
 
-	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
+    if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
 #endif
-#if BYTE_ORDER <= 0		/* little-endian */
-	{
-	    /*
-	     * On little-endian machines, we can process properly aligned
-	     * data without copying it.
-	     */
-	    if (!((data - (const md5_byte_t *)0) & 3)) {
-		/* data are properly aligned */
-		X = (const md5_word_t *)data;
-	    } else {
-		/* not aligned */
-		memcpy(xbuf, data, 64);
-		X = xbuf;
-	    }
-	}
+#if BYTE_ORDER <= 0        /* little-endian */
+    {
+        /*
+         * On little-endian machines, we can process properly aligned
+         * data without copying it.
+         */
+        if (!((data - (const md5_byte_t *)0) & 3)) {
+        /* data are properly aligned */
+        X = (const md5_word_t *)data;
+        } else {
+        /* not aligned */
+        memcpy(xbuf, data, 64);
+        X = xbuf;
+        }
+    }
 #endif
 #if BYTE_ORDER == 0
-	else			/* dynamic big-endian */
+    else            /* dynamic big-endian */
 #endif
-#if BYTE_ORDER >= 0		/* big-endian */
-	{
-	    /*
-	     * On big-endian machines, we must arrange the bytes in the
-	     * right order.
-	     */
-	    const md5_byte_t *xp = data;
-	    int i;
+#if BYTE_ORDER >= 0        /* big-endian */
+    {
+        /*
+         * On big-endian machines, we must arrange the bytes in the
+         * right order.
+         */
+        const md5_byte_t *xp = data;
+        int i;
 
 #  if BYTE_ORDER == 0
-	    X = xbuf;		/* (dynamic only) */
+        X = xbuf;        /* (dynamic only) */
 #  else
-#    define xbuf X		/* (static only) */
+#    define xbuf X        /* (static only) */
 #  endif
-	    for (i = 0; i < 16; ++i, xp += 4)
-		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
-	}
+        for (i = 0; i < 16; ++i, xp += 4)
+        xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+    }
 #endif
     }
 
@@ -416,56 +416,56 @@ md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
     md5_word_t nbits = (md5_word_t)(nbytes << 3);
 
     if (nbytes <= 0)
-	return;
+    return;
 
     /* Update the message length. */
     pms->count[1] += nbytes >> 29;
     pms->count[0] += nbits;
     if (pms->count[0] < nbits)
-	pms->count[1]++;
+    pms->count[1]++;
 
     /* Process an initial partial block. */
     if (offset) {
-	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+    int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
 
-	memcpy(pms->buf + offset, p, copy);
-	if (offset + copy < 64)
-	    return;
-	p += copy;
-	left -= copy;
-	md5_process(pms, pms->buf);
+    memcpy(pms->buf + offset, p, copy);
+    if (offset + copy < 64)
+        return;
+    p += copy;
+    left -= copy;
+    md5_process(pms, pms->buf);
     }
 
     /* Process full blocks. */
     for (; left >= 64; p += 64, left -= 64)
-	md5_process(pms, p);
+    md5_process(pms, p);
 
     /* Process a final partial block. */
     if (left)
-	memcpy(pms->buf, p, left);
+    memcpy(pms->buf, p, left);
 }
 
 void
 md5_finish(md5_state_t *pms, md5_byte_t digest[16])
 {
     static const md5_byte_t pad[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     };
     md5_byte_t data[8];
     int i;
 
     /* Save the length before padding. */
     for (i = 0; i < 8; ++i)
-	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+    data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
     /* Pad to 56 bytes mod 64. */
     md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
     /* Append the length. */
     md5_append(pms, data, 8);
     for (i = 0; i < 16; ++i)
-	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+    digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
 }
 
 }
diff --git a/dep/src/g3dlite/Cylinder.cpp b/dep/g3dlite/G3D/Cylinder.cpp
similarity index 90%
rename from dep/src/g3dlite/Cylinder.cpp
rename to dep/g3dlite/G3D/Cylinder.cpp
index 7a7b9f944..e2a3ca358 100644
--- a/dep/src/g3dlite/Cylinder.cpp
+++ b/dep/g3dlite/G3D/Cylinder.cpp
@@ -22,7 +22,7 @@
 namespace G3D {
 
 Cylinder::Cylinder(class BinaryInput& b) {
-	deserialize(b);
+    deserialize(b);
 }
 
 
@@ -31,45 +31,45 @@ Cylinder::Cylinder() {
 
 
 Cylinder::Cylinder(const Vector3& _p1, const Vector3& _p2, float _r) 
-	: p1(_p1), p2(_p2), mRadius(_r) {
+    : p1(_p1), p2(_p2), mRadius(_r) {
 }
 
 
 void Cylinder::serialize(class BinaryOutput& b) const {
-	p1.serialize(b);
-	p2.serialize(b);
-	b.writeFloat64(mRadius);
+    p1.serialize(b);
+    p2.serialize(b);
+    b.writeFloat64(mRadius);
 }
 
 
 void Cylinder::deserialize(class BinaryInput& b) {
-	p1.deserialize(b);
-	p2.deserialize(b);
-	mRadius = b.readFloat64();
+    p1.deserialize(b);
+    p2.deserialize(b);
+    mRadius = b.readFloat64();
 }
 
 
 Line Cylinder::axis() const {
-	return Line::fromTwoPoints(p1, p2);
+    return Line::fromTwoPoints(p1, p2);
 }
 
 
 
 float Cylinder::radius() const {
-	return mRadius;
+    return mRadius;
 }
 
 
 float Cylinder::volume() const {
-	return
-		(float)pi() * square(mRadius) * (p1 - p2).magnitude();
+    return
+        (float)pi() * square(mRadius) * (p1 - p2).magnitude();
 }
 
 
 float Cylinder::area() const {
-	return
+    return
         // Sides
-		(twoPi() * mRadius) * height() +
+        (twoPi() * mRadius) * height() +
 
          // Caps
          twoPi() * square(mRadius);
diff --git a/dep/include/g3dlite/G3D/Cylinder.h b/dep/g3dlite/G3D/Cylinder.h
similarity index 84%
rename from dep/include/g3dlite/G3D/Cylinder.h
rename to dep/g3dlite/G3D/Cylinder.h
index 85eba77b7..ef049e108 100644
--- a/dep/include/g3dlite/G3D/Cylinder.h
+++ b/dep/g3dlite/G3D/Cylinder.h
@@ -26,22 +26,22 @@ class AABox;
  */
 class Cylinder {
 private:
-	Vector3			p1;
-	Vector3			p2;
+    Vector3            p1;
+    Vector3            p2;
 
-	float           mRadius;
+    float           mRadius;
 
 public:
 
     /** Uninitialized */
     Cylinder();
     Cylinder(class BinaryInput& b);
-	Cylinder(const Vector3& _p1, const Vector3& _p2, float _r);
-	void serialize(class BinaryOutput& b) const;
-	void deserialize(class BinaryInput& b);
-	
-	/** The line down the center of the Cylinder */
-	Line axis() const;
+    Cylinder(const Vector3& _p1, const Vector3& _p2, float _r);
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
+    
+    /** The line down the center of the Cylinder */
+    Line axis() const;
 
     /** 
       A reference frame in which the center of mass is at the origin and
diff --git a/dep/include/g3dlite/G3D/EqualsTrait.h b/dep/g3dlite/G3D/EqualsTrait.h
similarity index 100%
rename from dep/include/g3dlite/G3D/EqualsTrait.h
rename to dep/g3dlite/G3D/EqualsTrait.h
diff --git a/dep/src/g3dlite/FileSystem.cpp b/dep/g3dlite/G3D/FileSystem.cpp
similarity index 99%
rename from dep/src/g3dlite/FileSystem.cpp
rename to dep/g3dlite/G3D/FileSystem.cpp
index e74295c9e..0fba35705 100644
--- a/dep/src/g3dlite/FileSystem.cpp
+++ b/dep/g3dlite/G3D/FileSystem.cpp
@@ -31,7 +31,7 @@
 #   include <dirent.h>
 #   include <fnmatch.h>
 #   include <unistd.h>
-#   define O_LARGEFILE      0100000
+#   define O_LARGEFILE 0100000
 #   define stat64 stat
 #   define _stat stat
 #   define _getcwd getcwd
@@ -297,8 +297,12 @@ bool FileSystem::_isZipfile(const std::string& filename) {
         return false;
     }
     uint8 header[4];
-    fread(header, 4, 1, f);
-    
+    size_t file_read = fread(header, 4, 1, f);
+    if (file_read <= 0)
+    {
+        fclose(f);
+        return false;
+    }
     const uint8 zipHeader[4] = {0x50, 0x4b, 0x03, 0x04};
     for (int i = 0; i < 4; ++i) {
         if (header[i] != zipHeader[i]) {
diff --git a/dep/include/g3dlite/G3D/FileSystem.h b/dep/g3dlite/G3D/FileSystem.h
similarity index 100%
rename from dep/include/g3dlite/G3D/FileSystem.h
rename to dep/g3dlite/G3D/FileSystem.h
diff --git a/dep/include/g3dlite/G3D/G3D.h b/dep/g3dlite/G3D/G3D.h
similarity index 100%
rename from dep/include/g3dlite/G3D/G3D.h
rename to dep/g3dlite/G3D/G3D.h
diff --git a/dep/include/g3dlite/G3D/G3DAll.h b/dep/g3dlite/G3D/G3DAll.h
similarity index 100%
rename from dep/include/g3dlite/G3D/G3DAll.h
rename to dep/g3dlite/G3D/G3DAll.h
diff --git a/dep/include/g3dlite/G3D/G3DGameUnits.h b/dep/g3dlite/G3D/G3DGameUnits.h
similarity index 100%
rename from dep/include/g3dlite/G3D/G3DGameUnits.h
rename to dep/g3dlite/G3D/G3DGameUnits.h
diff --git a/dep/src/g3dlite/GCamera.cpp b/dep/g3dlite/G3D/GCamera.cpp
similarity index 99%
rename from dep/src/g3dlite/GCamera.cpp
rename to dep/g3dlite/G3D/GCamera.cpp
index 0ffc7eb73..bd05f5ecb 100644
--- a/dep/src/g3dlite/GCamera.cpp
+++ b/dep/g3dlite/G3D/GCamera.cpp
@@ -153,7 +153,7 @@ Ray GCamera::worldRay(float x, float y, const Rect2D& viewport) const {
     float vw = viewportWidth(viewport);
     float vh = viewportHeight(viewport);
 
-	Vector3 direction = Vector3( (x - cx) * vw / screenWidth,
+    Vector3 direction = Vector3( (x - cx) * vw / screenWidth,
                             -(y - cy) * vh / screenHeight,
                              m_nearPlaneZ);
 
@@ -382,7 +382,7 @@ void GCamera::frustum(const Rect2D& viewport, Frustum& fr) const {
 
     // Far plane
     if (-m_farPlaneZ < finf()) {
-    	face.plane = Plane(Vector3(0, 0, 1), Vector3(0, 0, m_farPlaneZ));
+        face.plane = Plane(Vector3(0, 0, 1), Vector3(0, 0, m_farPlaneZ));
         face.vertexIndex[0] = 4;
         face.vertexIndex[1] = 5;
         face.vertexIndex[2] = 6;
diff --git a/dep/include/g3dlite/G3D/GCamera.h b/dep/g3dlite/G3D/GCamera.h
similarity index 100%
rename from dep/include/g3dlite/G3D/GCamera.h
rename to dep/g3dlite/G3D/GCamera.h
diff --git a/dep/src/g3dlite/GImage.cpp b/dep/g3dlite/G3D/GImage.cpp
similarity index 99%
rename from dep/src/g3dlite/GImage.cpp
rename to dep/g3dlite/G3D/GImage.cpp
index 19a2b1e71..1c95f756f 100644
--- a/dep/src/g3dlite/GImage.cpp
+++ b/dep/g3dlite/G3D/GImage.cpp
@@ -317,7 +317,7 @@ void GImage::decodePCX(
         throw GImage::Error("Only 8-bit paletted and 24-bit PCX files supported.", input.getFilename());
     }
 
-	// Prepare the pointer object for the pixel data
+    // Prepare the pointer object for the pixel data
     m_byte = (uint8*)m_memMan->alloc(m_width * m_height * 3);
 
     if ((paletteType == 1) && (planes == 3)) {
@@ -1091,10 +1091,10 @@ void GImage::convertToRGB() {
         break;
 
     case 3:
-		return;
+        return;
 
     case 4:
-		// Strip alpha
+        // Strip alpha
         {            
             Color4uint8* old = (Color4uint8*)m_byte;
             m_byte = NULL;
diff --git a/dep/include/g3dlite/G3D/GImage.h b/dep/g3dlite/G3D/GImage.h
similarity index 99%
rename from dep/include/g3dlite/G3D/GImage.h
rename to dep/g3dlite/G3D/GImage.h
index 9a6851d32..265daf79b 100644
--- a/dep/include/g3dlite/G3D/GImage.h
+++ b/dep/g3dlite/G3D/GImage.h
@@ -543,9 +543,9 @@ public:
 
     Particularly useful as part of the idiom:
     <PRE>
- 	    GImage normal;
-	    computeNormalMap(GImage(filename), normal);
-	    return Texture::fromGImage(filename, normal);
+         GImage normal;
+        computeNormalMap(GImage(filename), normal);
+        return Texture::fromGImage(filename, normal);
     </PRE>
 
       */
diff --git a/dep/src/g3dlite/GImage_bayer.cpp b/dep/g3dlite/G3D/GImage_bayer.cpp
similarity index 100%
rename from dep/src/g3dlite/GImage_bayer.cpp
rename to dep/g3dlite/G3D/GImage_bayer.cpp
diff --git a/dep/src/g3dlite/GImage_bmp.cpp b/dep/g3dlite/G3D/GImage_bmp.cpp
similarity index 86%
rename from dep/src/g3dlite/GImage_bmp.cpp
rename to dep/g3dlite/G3D/GImage_bmp.cpp
index 425a7e1a1..0b0b283bc 100644
--- a/dep/src/g3dlite/GImage_bmp.cpp
+++ b/dep/g3dlite/G3D/GImage_bmp.cpp
@@ -53,7 +53,7 @@ void GImage::encodeBMP(
     out.writeUInt16(0);
     out.writeUInt16(0);
 
-	// The offset, in bytes, from the BITMAPFILEHEADER structure
+    // The offset, in bytes, from the BITMAPFILEHEADER structure
     // to the bitmap bits.
     out.writeUInt32(infoHeaderSize + fileHeaderSize);
 
@@ -75,7 +75,7 @@ void GImage::encodeBMP(
     out.writeUInt32(infoHeaderSize);
  
     // Width and height of the image
-	out.writeUInt32(m_width);
+    out.writeUInt32(m_width);
     out.writeUInt32(m_height);
 
     // Planes ("must be set to 1")
@@ -169,14 +169,14 @@ void GImage::decodeBMP(
     }
 
     m_channels = 3;
-	// Skip to the BITMAPINFOHEADER's width and height
-	input.skip(16);
+    // Skip to the BITMAPINFOHEADER's width and height
+    input.skip(16);
 
     m_width  = input.readUInt32();
     m_height = input.readUInt32();
 
-	// Skip to the bit count and compression type
-	input.skip(2);
+    // Skip to the bit count and compression type
+    input.skip(2);
 
     uint16 bitCount        = input.readUInt16();
     uint32 compressionType = input.readUInt32();
@@ -186,14 +186,14 @@ void GImage::decodeBMP(
     uint8 blue;
     uint8 blank;
 
-	// Only uncompressed bitmaps are supported by this code
+    // Only uncompressed bitmaps are supported by this code
     if ((int32)compressionType != BI_RGB) {
         throw Error("BMP images must be uncompressed", input.getFilename());
     }
 
     uint8* palette = NULL;
 
-	// Create the palette if needed
+    // Create the palette if needed
     if (bitCount <= 8) {
 
         // Skip to the palette color count in the header
@@ -220,7 +220,7 @@ void GImage::decodeBMP(
             palette[c + 1] = green;
             palette[c + 2] = blue;
         }
-	}
+    }
 
     int hStart = 0;
     int hEnd   = 0;
@@ -294,7 +294,7 @@ void GImage::decodeBMP(
             }
         }
 
-	} else if (bitCount == 4) {
+    } else if (bitCount == 4) {
 
         flags = PICTURE_BITMAP | PICTURE_UNCOMPRESSED | PICTURE_4BIT;
 
@@ -338,7 +338,7 @@ void GImage::decodeBMP(
             }
         }
 
-	} else if (bitCount == 8) {
+    } else if (bitCount == 8) {
         
         flags = PICTURE_BITMAP | PICTURE_UNCOMPRESSED | PICTURE_8BIT;
 
@@ -375,9 +375,9 @@ void GImage::decodeBMP(
         m_byte = NULL;
         System::free(palette); 
         palette = NULL;
-    	throw Error("16-bit bitmaps not supported", input.getFilename());
+        throw Error("16-bit bitmaps not supported", input.getFilename());
 
-	} else if (bitCount == 24) {
+    } else if (bitCount == 24) {
         input.skip(20);
 
         flags = PICTURE_BITMAP | PICTURE_UNCOMPRESSED | PICTURE_24BIT;
@@ -411,13 +411,13 @@ void GImage::decodeBMP(
             }
         }
 
-	} else if (bitCount == 32) {
+    } else if (bitCount == 32) {
 
         m_memMan->free(m_byte);
         m_byte = NULL;
         System::free(palette); 
         palette = NULL;
-    	throw Error("32 bit bitmaps not supported", input.getFilename());
+        throw Error("32 bit bitmaps not supported", input.getFilename());
     
     } else {
         // We support all possible bit depths, so if the
@@ -425,7 +425,7 @@ void GImage::decodeBMP(
         m_memMan->free(m_byte);
         m_byte = NULL;
         throw Error("Not a bitmap!", input.getFilename());
-	}
+    }
 
     System::free(palette); 
     palette = NULL;
@@ -435,19 +435,19 @@ void GImage::decodeBMP(
 void GImage::decodeICO(
     BinaryInput&            input) {
 
-	// Header
-	uint16 r = input.readUInt16();
-	debugAssert(r == 0);
-	r = input.readUInt16();
-	debugAssert(r == 1);
+    // Header
+    uint16 r = input.readUInt16();
+    debugAssert(r == 0);
+    r = input.readUInt16();
+    debugAssert(r == 1);
 
-	// Read the number of icons, although we'll only load the
-	// first one.
-	int count = input.readUInt16();
+    // Read the number of icons, although we'll only load the
+    // first one.
+    int count = input.readUInt16();
 
-	m_channels = 4;
+    m_channels = 4;
 
-	debugAssert(count > 0);
+    debugAssert(count > 0);
 
     const uint8* headerBuffer = input.getCArray() + input.getPosition();
     int maxWidth = 0, maxHeight = 0;
@@ -470,7 +470,7 @@ void GImage::decodeICO(
     m_width = input.readUInt8();
     m_height = input.readUInt8();
     int numColors = input.readUInt8();
-	
+    
     m_byte = (uint8*)m_memMan->alloc(m_width * m_height * m_channels);
     debugAssert(m_byte);
 
@@ -497,7 +497,7 @@ void GImage::decodeICO(
         break;
 
     default:
-    	throw Error("Unsupported ICO color count.", input.getFilename());
+        throw Error("Unsupported ICO color count.", input.getFilename());
     }
 
     input.skip(5);
@@ -521,35 +521,35 @@ void GImage::decodeICO(
         palette[c].a = input.readUInt8();
     }
 
-	// The actual image and mask follow
+    // The actual image and mask follow
 
-	// The XOR Bitmap is stored as 1-bit, 4-bit or 8-bit uncompressed Bitmap 
-	// using the same encoding as BMP files. The AND Bitmap is stored in as 
-	// 1-bit uncompressed Bitmap.
-	// 
-	// Pixels are stored bottom-up, left-to-right. Pixel lines are padded 
-	// with zeros to end on a 32bit (4byte) boundary. Every line will have the 
-	// same number of bytes. Color indices are zero based, meaning a pixel color 
-	// of 0 represents the first color table entry, a pixel color of 255 (if there
-	// are that many) represents the 256th entry.
+    // The XOR Bitmap is stored as 1-bit, 4-bit or 8-bit uncompressed Bitmap 
+    // using the same encoding as BMP files. The AND Bitmap is stored in as 
+    // 1-bit uncompressed Bitmap.
+    // 
+    // Pixels are stored bottom-up, left-to-right. Pixel lines are padded 
+    // with zeros to end on a 32bit (4byte) boundary. Every line will have the 
+    // same number of bytes. Color indices are zero based, meaning a pixel color 
+    // of 0 represents the first color table entry, a pixel color of 255 (if there
+    // are that many) represents the 256th entry.
 /*
-	int bitsPerRow  = width * bitsPerPixel;
-	int bytesPerRow = iCeil((double)bitsPerRow / 8);
-	// Rows are padded to 32-bit boundaries
-	bytesPerRow += bytesPerRow % 4;
+    int bitsPerRow  = width * bitsPerPixel;
+    int bytesPerRow = iCeil((double)bitsPerRow / 8);
+    // Rows are padded to 32-bit boundaries
+    bytesPerRow += bytesPerRow % 4;
 
-	// Read the XOR values into the color channel
-	for (int y = height - 1; y >= 0; --y) {
-		int x = 0;
-		// Read the row
-		for (int i = 0; i < bytesPerRow; ++i) {
-			uint8 byte = input.readUInt8();
-			for (int j = 0; (j < 8) && (x < width); ++x, j += bitsPerPixel) {
-				int bit = ((byte << j) >> (8 - bitsPerPixel)) & mask;
-				pixel4(x, y) = colorTable[bit];
-			}
-		}
-	}
+    // Read the XOR values into the color channel
+    for (int y = height - 1; y >= 0; --y) {
+        int x = 0;
+        // Read the row
+        for (int i = 0; i < bytesPerRow; ++i) {
+            uint8 byte = input.readUInt8();
+            for (int j = 0; (j < 8) && (x < width); ++x, j += bitsPerPixel) {
+                int bit = ((byte << j) >> (8 - bitsPerPixel)) & mask;
+                pixel4(x, y) = colorTable[bit];
+            }
+        }
+    }
 */
     int hStart = 0;
     int hEnd   = 0;
@@ -617,7 +617,7 @@ void GImage::decodeICO(
             }
         }
 
-	} else if (bitsPerPixel == 4) {
+    } else if (bitsPerPixel == 4) {
 
         // For bitmaps, each scanline is dword-aligned.
         int BMScanWidth = (m_width + 1) >> 1;
@@ -659,7 +659,7 @@ void GImage::decodeICO(
             }
         }
 
-	} else if (bitsPerPixel == 8) {
+    } else if (bitsPerPixel == 8) {
         
         // For bitmaps, each scanline is dword-aligned.
         BMScanWidth = m_width;
@@ -689,9 +689,9 @@ void GImage::decodeICO(
         }
     }
 
-	// Read the mask into the alpha channel
-	int bitsPerRow  = m_width;
-	int bytesPerRow = iCeil((double)bitsPerRow / 8);
+    // Read the mask into the alpha channel
+    int bitsPerRow  = m_width;
+    int bytesPerRow = iCeil((double)bitsPerRow / 8);
 
     // For bitmaps, each scanline is dword-aligned.
     //BMScanWidth = (width + 1) >> 1;
@@ -700,16 +700,16 @@ void GImage::decodeICO(
     }
     
     for (int y = m_height - 1; y >= 0; --y) {
-		int x = 0;
-		// Read the row
-		for (int i = 0; i < bytesPerRow; ++i) {
-			uint8 byte = input.readUInt8();
-			for (int j = 0; (j < 8) && (x < m_width); ++x, ++j) {
-				int bit = (byte >> (7 - j)) & 0x01;
-				pixel4(x, y).a = (1 - bit) * 0xFF;
-			}
-		}
-	}
+        int x = 0;
+        // Read the row
+        for (int i = 0; i < bytesPerRow; ++i) {
+            uint8 byte = input.readUInt8();
+            for (int j = 0; (j < 8) && (x < m_width); ++x, ++j) {
+                int bit = (byte >> (7 - j)) & 0x01;
+                pixel4(x, y).a = (1 - bit) * 0xFF;
+            }
+        }
+    }
 
 }
 
diff --git a/dep/src/g3dlite/GImage_jpeg.cpp b/dep/g3dlite/G3D/GImage_jpeg.cpp
similarity index 57%
rename from dep/src/g3dlite/GImage_jpeg.cpp
rename to dep/g3dlite/G3D/GImage_jpeg.cpp
index 0b0521f31..d37574d3f 100644
--- a/dep/src/g3dlite/GImage_jpeg.cpp
+++ b/dep/g3dlite/G3D/GImage_jpeg.cpp
@@ -35,10 +35,10 @@ const int jpegQuality = 96;
  */ 
 class memory_destination_mgr {
 public:
-	struct jpeg_destination_mgr pub;
-	JOCTET*                     buffer;
-	int                         size;
-	int                         count;
+    struct jpeg_destination_mgr pub;
+    JOCTET*                     buffer;
+    int                         size;
+    int                         count;
 };
 
 typedef memory_destination_mgr* mem_dest_ptr;
@@ -49,11 +49,11 @@ typedef memory_destination_mgr* mem_dest_ptr;
 static void init_destination (
     j_compress_ptr              cinfo) {
 
-	mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
+    mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
 
-	dest->pub.next_output_byte = dest->buffer;
-	dest->pub.free_in_buffer = dest->size;
-	dest->count=0;
+    dest->pub.next_output_byte = dest->buffer;
+    dest->pub.free_in_buffer = dest->size;
+    dest->count=0;
 }
 
 /**
@@ -62,12 +62,12 @@ static void init_destination (
 static boolean empty_output_buffer (
     j_compress_ptr              cinfo) {
 
-	mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
+    mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
 
-	dest->pub.next_output_byte = dest->buffer;
-	dest->pub.free_in_buffer = dest->size;
+    dest->pub.next_output_byte = dest->buffer;
+    dest->pub.free_in_buffer = dest->size;
 
-	return TRUE;
+    return TRUE;
 }
 
 /**
@@ -76,8 +76,8 @@ static boolean empty_output_buffer (
 static void term_destination (
     j_compress_ptr              cinfo) {
 
-	mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
-	dest->count = dest->size - dest->pub.free_in_buffer;
+    mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
+    dest->count = dest->size - dest->pub.free_in_buffer;
 }
 
 /**
@@ -88,23 +88,23 @@ static void jpeg_memory_dest (
     JOCTET*                     buffer,
     int                         size) {
 
-	mem_dest_ptr dest;
+    mem_dest_ptr dest;
 
-	if (cinfo->dest == NULL) {
+    if (cinfo->dest == NULL) {
         // First time for this JPEG object; call the
         // IJG allocator to get space.
-		cinfo->dest = (struct jpeg_destination_mgr*)
-			(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
+        cinfo->dest = (struct jpeg_destination_mgr*)
+            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
                                         JPOOL_PERMANENT,
-                       				    sizeof(memory_destination_mgr));
-	}
+                                           sizeof(memory_destination_mgr));
+    }
 
-	dest                            = (mem_dest_ptr) cinfo->dest;
-	dest->size                      = size;
-	dest->buffer                    = buffer;
-	dest->pub.init_destination      = init_destination;
-	dest->pub.empty_output_buffer   = empty_output_buffer;
-	dest->pub.term_destination      = term_destination;
+    dest                            = (mem_dest_ptr) cinfo->dest;
+    dest->size                      = size;
+    dest->buffer                    = buffer;
+    dest->pub.init_destination      = init_destination;
+    dest->pub.empty_output_buffer   = empty_output_buffer;
+    dest->pub.term_destination      = term_destination;
 }
   
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -117,10 +117,10 @@ static void jpeg_memory_dest (
 class memory_source_mgr {
 public:
     struct jpeg_source_mgr  pub;
-	int                     source_size;
-	unsigned char*          source_data;
-	boolean                 start_of_data;
-	JOCTET*                 buffer;
+    int                     source_size;
+    unsigned char*          source_data;
+    boolean                 start_of_data;
+    JOCTET*                 buffer;
 };
 
 
@@ -145,26 +145,26 @@ static void init_source(
 static boolean fill_input_buffer(
     j_decompress_ptr        cinfo) {
 
-	mem_src_ptr src = (mem_src_ptr) cinfo->src;
+    mem_src_ptr src = (mem_src_ptr) cinfo->src;
 
-	size_t bytes_read = 0;
+    size_t bytes_read = 0;
 
-	if (src->source_size > INPUT_BUF_SIZE)
-		bytes_read = INPUT_BUF_SIZE;
-	else
-		bytes_read = src->source_size;
+    if (src->source_size > INPUT_BUF_SIZE)
+        bytes_read = INPUT_BUF_SIZE;
+    else
+        bytes_read = src->source_size;
 
-	memcpy (src->buffer, src->source_data, bytes_read);
+    memcpy (src->buffer, src->source_data, bytes_read);
 
-	src->source_data += bytes_read;
-	src->source_size -= bytes_read;
+    src->source_data += bytes_read;
+    src->source_size -= bytes_read;
 
-	src->pub.next_input_byte = src->buffer;
-	src->pub.bytes_in_buffer = bytes_read;
-	src->start_of_data = FALSE;
+    src->pub.next_input_byte = src->buffer;
+    src->pub.bytes_in_buffer = bytes_read;
+    src->start_of_data = FALSE;
 
 
-	return TRUE;
+    return TRUE;
 }
 
 
@@ -175,18 +175,18 @@ static void skip_input_data(
     j_decompress_ptr        cinfo,
     long                    num_bytes) {
 
-	mem_src_ptr src = (mem_src_ptr)cinfo->src;
+    mem_src_ptr src = (mem_src_ptr)cinfo->src;
 
-	if (num_bytes > 0) {
-		while (num_bytes > (long) src->pub.bytes_in_buffer) {
-			num_bytes -= (long) src->pub.bytes_in_buffer;
-			boolean s = fill_input_buffer(cinfo);
+    if (num_bytes > 0) {
+        while (num_bytes > (long) src->pub.bytes_in_buffer) {
+            num_bytes -= (long) src->pub.bytes_in_buffer;
+            boolean s = fill_input_buffer(cinfo);
             debugAssert(s); (void)s;
-		}
+        }
 
-		src->pub.next_input_byte += (size_t) num_bytes;
-		src->pub.bytes_in_buffer -= (size_t) num_bytes;
-	}
+        src->pub.next_input_byte += (size_t) num_bytes;
+        src->pub.bytes_in_buffer -= (size_t) num_bytes;
+    }
 }
 
 
@@ -196,7 +196,7 @@ static void skip_input_data(
 static void term_source (
     j_decompress_ptr        cinfo) {
     (void)cinfo;
-	// Intentionally empty
+    // Intentionally empty
 }
 
 
@@ -208,38 +208,38 @@ static void jpeg_memory_src (
     JOCTET*                 buffer,
     int                     size) {
 
-	mem_src_ptr src;
+    mem_src_ptr src;
 
-	if (cinfo->src == NULL) {
+    if (cinfo->src == NULL) {
         // First time for this JPEG object
-		cinfo->src = (struct jpeg_source_mgr*)
-			(*cinfo->mem->alloc_small)(
+        cinfo->src = (struct jpeg_source_mgr*)
+            (*cinfo->mem->alloc_small)(
                 (j_common_ptr) cinfo,
                 JPOOL_PERMANENT,
-				sizeof(memory_source_mgr));
-		
+                sizeof(memory_source_mgr));
+        
         src = (mem_src_ptr)cinfo->src;
-		
+        
         src->buffer = (JOCTET*)
-			(*cinfo->mem->alloc_small)(
+            (*cinfo->mem->alloc_small)(
                 (j_common_ptr) cinfo,
                 JPOOL_PERMANENT,
-				INPUT_BUF_SIZE * sizeof(JOCTET));
-	}
+                INPUT_BUF_SIZE * sizeof(JOCTET));
+    }
 
-	src = (mem_src_ptr)cinfo->src;
-	src->pub.init_source        = init_source;
-	src->pub.fill_input_buffer  = fill_input_buffer;
-	src->pub.skip_input_data    = skip_input_data;
+    src = (mem_src_ptr)cinfo->src;
+    src->pub.init_source        = init_source;
+    src->pub.fill_input_buffer  = fill_input_buffer;
+    src->pub.skip_input_data    = skip_input_data;
 
     // use default method
-	src->pub.resync_to_restart  = jpeg_resync_to_restart;
-	src->pub.term_source        = term_source;
-	src->source_data            = buffer;
-	src->source_size            = size;
+    src->pub.resync_to_restart  = jpeg_resync_to_restart;
+    src->pub.term_source        = term_source;
+    src->source_data            = buffer;
+    src->source_size            = size;
 
     // forces fill_input_buffer on first read
-	src->pub.bytes_in_buffer    = 0;
+    src->pub.bytes_in_buffer    = 0;
     
     // until buffer loaded
     src->pub.next_input_byte = NULL; 
@@ -249,13 +249,13 @@ static void jpeg_memory_src (
 void GImage::encodeJPEG(
     BinaryOutput&           out) const {
 
-	if (m_channels != 3) {
-		// Convert to three channel
-		GImage tmp = *this;
-		tmp.convertToRGB();
-		tmp.encodeJPEG(out);
-		return;
-	}
+    if (m_channels != 3) {
+        // Convert to three channel
+        GImage tmp = *this;
+        tmp.convertToRGB();
+        tmp.encodeJPEG(out);
+        return;
+    }
 
     debugAssert(m_channels == 3);
     out.setEndian(G3D_LITTLE_ENDIAN);
@@ -264,20 +264,20 @@ void GImage::encodeJPEG(
     jpeg_compress_struct    cinfo;
     jpeg_error_mgr          jerr;
 
-	cinfo.err = jpeg_std_error(&jerr);
-	jpeg_create_compress(&cinfo);
+    cinfo.err = jpeg_std_error(&jerr);
+    jpeg_create_compress(&cinfo);
 
     // Specify the destination for the compressed data.
     // (Overestimate the size)
     int buffer_size = m_width * m_height * 3 + 200;
     JOCTET* compressed_data = (JOCTET*)System::malloc(buffer_size);
-	jpeg_memory_dest(&cinfo, compressed_data, buffer_size);
+    jpeg_memory_dest(&cinfo, compressed_data, buffer_size);
 
 
     cinfo.image_width       = m_width;
     cinfo.image_height      = m_height;
 
-	// # of color components per pixel
+    // # of color components per pixel
     cinfo.input_components  = 3;
 
     // colorspace of input image
@@ -297,14 +297,14 @@ void GImage::encodeJPEG(
     jpeg_start_compress(&cinfo, TRUE);
 
     // Iterate over all scanlines from top to bottom
-	// pointer to a single row
+    // pointer to a single row
     JSAMPROW row_pointer[1];
     
     // JSAMPLEs per row in image_buffer
     int row_stride = cinfo.image_width * 3;
     while (cinfo.next_scanline < cinfo.image_height) {
-	    row_pointer[0] = &(m_byte[cinfo.next_scanline * row_stride]);
-	    jpeg_write_scanlines(&cinfo, row_pointer, 1);
+        row_pointer[0] = &(m_byte[cinfo.next_scanline * row_stride]);
+        jpeg_write_scanlines(&cinfo, row_pointer, 1);
     }
 
     // Shut down the compressor
@@ -313,7 +313,7 @@ void GImage::encodeJPEG(
     // Figure out how big the result was.
     int outLength = ((mem_dest_ptr)cinfo.dest)->count;
 
-    //	Release the JPEG compression object
+    //    Release the JPEG compression object
     jpeg_destroy_compress(&cinfo);
 
     // Copy into an appropriately sized output buffer.
@@ -328,53 +328,53 @@ void GImage::encodeJPEG(
 void GImage::decodeJPEG(
     BinaryInput&                input) {
 
-	struct jpeg_decompress_struct   cinfo;
-	struct jpeg_error_mgr           jerr;
+    struct jpeg_decompress_struct   cinfo;
+    struct jpeg_error_mgr           jerr;
     int                             loc = 0;
 
     m_channels = 3;
     // We have to set up the error handler, in case initialization fails.
-	cinfo.err = jpeg_std_error(&jerr);
+    cinfo.err = jpeg_std_error(&jerr);
 
     // Initialize the JPEG decompression object.
-	jpeg_create_decompress(&cinfo);
+    jpeg_create_decompress(&cinfo);
 
-	// Specify data source (eg, a file, for us, memory)
-	jpeg_memory_src(&cinfo, const_cast<uint8*>(input.getCArray()), input.size());
+    // Specify data source (eg, a file, for us, memory)
+    jpeg_memory_src(&cinfo, const_cast<uint8*>(input.getCArray()), input.size());
 
-	// Read the parameters with jpeg_read_header()
-	jpeg_read_header(&cinfo, TRUE);
+    // Read the parameters with jpeg_read_header()
+    jpeg_read_header(&cinfo, TRUE);
 
-	// Set parameters for decompression
-	// (We do nothing here since the defaults are fine)
+    // Set parameters for decompression
+    // (We do nothing here since the defaults are fine)
 
-	// Start decompressor
-	jpeg_start_decompress(&cinfo);
+    // Start decompressor
+    jpeg_start_decompress(&cinfo);
 
-	// Get and set the values of interest to this object
-	m_width     = cinfo.output_width;
-	m_height    = cinfo.output_height;
+    // Get and set the values of interest to this object
+    m_width     = cinfo.output_width;
+    m_height    = cinfo.output_height;
 
-	// Prepare the pointer object for the pixel data
+    // Prepare the pointer object for the pixel data
     m_byte = (uint8*)m_memMan->alloc(m_width * m_height * 3);
 
- 	// JSAMPLEs per row in output buffer
+     // JSAMPLEs per row in output buffer
     int bpp         = cinfo.output_components;
     int row_stride  = cinfo.output_width * bpp;
 
-	// Make a one-row-high sample array that will go away when done with image
+    // Make a one-row-high sample array that will go away when done with image
     JSAMPARRAY temp = (*cinfo.mem->alloc_sarray)
-		((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+        ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
 
     // Read data on a scanline by scanline basis
-	while (cinfo.output_scanline < cinfo.output_height) {
+    while (cinfo.output_scanline < cinfo.output_height) {
 
         // We may need to adjust the output based on the
         // number of channels it has.
         switch (bpp) {
-	    case 1:
+        case 1:
             // Grayscale; decompress to temp.
-    		jpeg_read_scanlines(&cinfo, temp, 1);
+            jpeg_read_scanlines(&cinfo, temp, 1);
 
             // Expand to three channels
             {
@@ -394,21 +394,21 @@ void GImage::decodeJPEG(
                     t       += 1;
                 }
             }
-		    break;
+            break;
 
-	    case 3:
+        case 3:
             // Read directly into the array
             {
                 // Need one extra level of indirection.
                 uint8*     scan = m_byte + loc;
                 JSAMPARRAY ptr  = &scan;
-    		    jpeg_read_scanlines(&cinfo, ptr, 1);
+                jpeg_read_scanlines(&cinfo, ptr, 1);
             }
-		    break;
+            break;
 
-	    case 4:
+        case 4:
             // RGBA; decompress to temp.
-    		jpeg_read_scanlines(&cinfo, temp, 1);
+            jpeg_read_scanlines(&cinfo, temp, 1);
 
             // Drop the 3rd channel
             {
@@ -425,21 +425,21 @@ void GImage::decodeJPEG(
                     t       += 4;
                 }
             }
-		    break;
+            break;
 
-	    default:
-		    throw Error("Unexpected number of channels.", input.getFilename());
-	    }
+        default:
+            throw Error("Unexpected number of channels.", input.getFilename());
+        }
 
-		loc += row_stride;
-	}
+        loc += row_stride;
+    }
 
-	// Finish decompression
-	jpeg_finish_decompress(&cinfo);
+    // Finish decompression
+    jpeg_finish_decompress(&cinfo);
 
     alwaysAssertM(this, "Corrupt GImage");
-	// Release JPEG decompression object
-	jpeg_destroy_decompress(&cinfo);
+    // Release JPEG decompression object
+    jpeg_destroy_decompress(&cinfo);
 }
 
 
diff --git a/dep/src/g3dlite/GImage_png.cpp b/dep/g3dlite/G3D/GImage_png.cpp
similarity index 100%
rename from dep/src/g3dlite/GImage_png.cpp
rename to dep/g3dlite/G3D/GImage_png.cpp
diff --git a/dep/src/g3dlite/GImage_ppm.cpp b/dep/g3dlite/G3D/GImage_ppm.cpp
similarity index 100%
rename from dep/src/g3dlite/GImage_ppm.cpp
rename to dep/g3dlite/G3D/GImage_ppm.cpp
diff --git a/dep/src/g3dlite/GImage_tga.cpp b/dep/g3dlite/G3D/GImage_tga.cpp
similarity index 99%
rename from dep/src/g3dlite/GImage_tga.cpp
rename to dep/g3dlite/G3D/GImage_tga.cpp
index fdcd59af7..e2b2d2d9f 100644
--- a/dep/src/g3dlite/GImage_tga.cpp
+++ b/dep/g3dlite/G3D/GImage_tga.cpp
@@ -129,12 +129,12 @@ void GImage::decodeTGA(
     int imageType    = input.readUInt8();
 
     (void)colorMapType;
-	
+    
     // 2 is the type supported by this routine.
     if (imageType != 2 && imageType != 10) {
         throw Error("TGA images must be type 2 (Uncompressed truecolor) or 10 (Run-length truecolor)", input.getFilename());
     }
-	
+    
     // Color map specification
     input.skip(5);
 
@@ -162,13 +162,13 @@ void GImage::decodeTGA(
     // as data indicating where the origin is
     int imageDescriptor = input.readUInt8();
     (void)imageDescriptor;
-	
+    
     // Image ID
     input.skip(IDLength);
 
     m_byte = (uint8*)m_memMan->alloc(m_width * m_height * m_channels);
     debugAssert(m_byte);
-	
+    
     // Pixel data
     int x;
     int y;
diff --git a/dep/src/g3dlite/GLight.cpp b/dep/g3dlite/G3D/GLight.cpp
similarity index 100%
rename from dep/src/g3dlite/GLight.cpp
rename to dep/g3dlite/G3D/GLight.cpp
diff --git a/dep/include/g3dlite/G3D/GLight.h b/dep/g3dlite/G3D/GLight.h
similarity index 100%
rename from dep/include/g3dlite/G3D/GLight.h
rename to dep/g3dlite/G3D/GLight.h
diff --git a/dep/include/g3dlite/G3D/GMutex.h b/dep/g3dlite/G3D/GMutex.h
similarity index 100%
rename from dep/include/g3dlite/G3D/GMutex.h
rename to dep/g3dlite/G3D/GMutex.h
diff --git a/dep/src/g3dlite/GThread.cpp b/dep/g3dlite/G3D/GThread.cpp
similarity index 100%
rename from dep/src/g3dlite/GThread.cpp
rename to dep/g3dlite/G3D/GThread.cpp
diff --git a/dep/include/g3dlite/G3D/GThread.h b/dep/g3dlite/G3D/GThread.h
similarity index 100%
rename from dep/include/g3dlite/G3D/GThread.h
rename to dep/g3dlite/G3D/GThread.h
diff --git a/dep/src/g3dlite/GUniqueID.cpp b/dep/g3dlite/G3D/GUniqueID.cpp
similarity index 100%
rename from dep/src/g3dlite/GUniqueID.cpp
rename to dep/g3dlite/G3D/GUniqueID.cpp
diff --git a/dep/include/g3dlite/G3D/GUniqueID.h b/dep/g3dlite/G3D/GUniqueID.h
similarity index 100%
rename from dep/include/g3dlite/G3D/GUniqueID.h
rename to dep/g3dlite/G3D/GUniqueID.h
diff --git a/dep/include/g3dlite/G3D/HashTrait.h b/dep/g3dlite/G3D/HashTrait.h
similarity index 99%
rename from dep/include/g3dlite/G3D/HashTrait.h
rename to dep/g3dlite/G3D/HashTrait.h
index 72de3da52..179320a07 100644
--- a/dep/include/g3dlite/G3D/HashTrait.h
+++ b/dep/g3dlite/G3D/HashTrait.h
@@ -83,7 +83,7 @@ template <> struct HashTrait<G3D::uint128> {
             hash ^= (mask & key);
             key >>= 8;
         }
-	
+    
         G3D::uint64 foldedHash = hash.hi ^ hash.lo;
         return static_cast<size_t>((foldedHash >> 32) ^ (foldedHash & 0xFFFFFFFF));
     }
diff --git a/dep/src/g3dlite/Image1.cpp b/dep/g3dlite/G3D/Image1.cpp
similarity index 100%
rename from dep/src/g3dlite/Image1.cpp
rename to dep/g3dlite/G3D/Image1.cpp
diff --git a/dep/include/g3dlite/G3D/Image1.h b/dep/g3dlite/G3D/Image1.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Image1.h
rename to dep/g3dlite/G3D/Image1.h
diff --git a/dep/src/g3dlite/Image1uint8.cpp b/dep/g3dlite/G3D/Image1uint8.cpp
similarity index 100%
rename from dep/src/g3dlite/Image1uint8.cpp
rename to dep/g3dlite/G3D/Image1uint8.cpp
diff --git a/dep/include/g3dlite/G3D/Image1uint8.h b/dep/g3dlite/G3D/Image1uint8.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Image1uint8.h
rename to dep/g3dlite/G3D/Image1uint8.h
diff --git a/dep/src/g3dlite/Image3.cpp b/dep/g3dlite/G3D/Image3.cpp
similarity index 100%
rename from dep/src/g3dlite/Image3.cpp
rename to dep/g3dlite/G3D/Image3.cpp
diff --git a/dep/include/g3dlite/G3D/Image3.h b/dep/g3dlite/G3D/Image3.h
similarity index 95%
rename from dep/include/g3dlite/G3D/Image3.h
rename to dep/g3dlite/G3D/Image3.h
index 13cb8fa7f..c3e354c33 100644
--- a/dep/include/g3dlite/G3D/Image3.h
+++ b/dep/g3dlite/G3D/Image3.h
@@ -57,7 +57,7 @@ public:
 
     static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT);
     
-	static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
     static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
     static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
     static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
diff --git a/dep/src/g3dlite/Image3uint8.cpp b/dep/g3dlite/G3D/Image3uint8.cpp
similarity index 100%
rename from dep/src/g3dlite/Image3uint8.cpp
rename to dep/g3dlite/G3D/Image3uint8.cpp
diff --git a/dep/include/g3dlite/G3D/Image3uint8.h b/dep/g3dlite/G3D/Image3uint8.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Image3uint8.h
rename to dep/g3dlite/G3D/Image3uint8.h
diff --git a/dep/src/g3dlite/Image4.cpp b/dep/g3dlite/G3D/Image4.cpp
similarity index 100%
rename from dep/src/g3dlite/Image4.cpp
rename to dep/g3dlite/G3D/Image4.cpp
diff --git a/dep/include/g3dlite/G3D/Image4.h b/dep/g3dlite/G3D/Image4.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Image4.h
rename to dep/g3dlite/G3D/Image4.h
diff --git a/dep/src/g3dlite/Image4uint8.cpp b/dep/g3dlite/G3D/Image4uint8.cpp
similarity index 100%
rename from dep/src/g3dlite/Image4uint8.cpp
rename to dep/g3dlite/G3D/Image4uint8.cpp
diff --git a/dep/include/g3dlite/G3D/Image4uint8.h b/dep/g3dlite/G3D/Image4uint8.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Image4uint8.h
rename to dep/g3dlite/G3D/Image4uint8.h
diff --git a/dep/src/g3dlite/ImageFormat.cpp b/dep/g3dlite/G3D/ImageFormat.cpp
similarity index 93%
rename from dep/src/g3dlite/ImageFormat.cpp
rename to dep/g3dlite/G3D/ImageFormat.cpp
index 46618c644..c35fa8a6a 100644
--- a/dep/src/g3dlite/ImageFormat.cpp
+++ b/dep/g3dlite/G3D/ImageFormat.cpp
@@ -546,21 +546,21 @@ DEFINE_TEXTUREFORMAT_METHOD(RGBA_DXT3,  4, COMP_FORMAT,     GL_COMPRESSED_RGBA_S
 
 DEFINE_TEXTUREFORMAT_METHOD(RGBA_DXT5,  4, COMP_FORMAT,     GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,   GL_RGBA,    0, 0, 0, 0, 0, 0, 0, 128, 128,  GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_RGBA_DXT5, ImageFormat::COLOR_SPACE_RGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(SRGB8,      3, UNCOMP_FORMAT,   GL_SRGB8,                           GL_RGB,				0,  0,  8,  8,  8,  0,  0, 32, 24,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_SRGB8, ImageFormat::COLOR_SPACE_SRGB);
+DEFINE_TEXTUREFORMAT_METHOD(SRGB8,      3, UNCOMP_FORMAT,   GL_SRGB8,                           GL_RGB,                0,  0,  8,  8,  8,  0,  0, 32, 24,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_SRGB8, ImageFormat::COLOR_SPACE_SRGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(SRGBA8,     4, UNCOMP_FORMAT,   GL_SRGB8_ALPHA8,                    GL_RGBA,			0,  8,  8,  8,  8,  0,  0, 32, 24,      GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_SRGBA8, ImageFormat::COLOR_SPACE_SRGB);
+DEFINE_TEXTUREFORMAT_METHOD(SRGBA8,     4, UNCOMP_FORMAT,   GL_SRGB8_ALPHA8,                    GL_RGBA,            0,  8,  8,  8,  8,  0,  0, 32, 24,      GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_SRGBA8, ImageFormat::COLOR_SPACE_SRGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(SL8,        1, UNCOMP_FORMAT,   GL_SLUMINANCE8,                     GL_LUMINANCE,		8,  0,  0,  0,  0,  0,  0, 8, 8,        GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_SL8, ImageFormat::COLOR_SPACE_SRGB);
+DEFINE_TEXTUREFORMAT_METHOD(SL8,        1, UNCOMP_FORMAT,   GL_SLUMINANCE8,                     GL_LUMINANCE,        8,  0,  0,  0,  0,  0,  0, 8, 8,        GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_SL8, ImageFormat::COLOR_SPACE_SRGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(SLA8,       2, UNCOMP_FORMAT,   GL_SLUMINANCE8_ALPHA8,              GL_LUMINANCE_ALPHA,	8,  8,  0,  0,  0,  0,  0, 16, 16,      GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_SLA8, ImageFormat::COLOR_SPACE_SRGB);
+DEFINE_TEXTUREFORMAT_METHOD(SLA8,       2, UNCOMP_FORMAT,   GL_SLUMINANCE8_ALPHA8,              GL_LUMINANCE_ALPHA,    8,  8,  0,  0,  0,  0,  0, 16, 16,      GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_SLA8, ImageFormat::COLOR_SPACE_SRGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(SRGB_DXT1,  3, COMP_FORMAT,     GL_COMPRESSED_SRGB_S3TC_DXT1_EXT,       GL_RGB,			0, 0, 0, 0, 0, 0, 0, 64, 64,    GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_SRGB_DXT1, ImageFormat::COLOR_SPACE_SRGB);
+DEFINE_TEXTUREFORMAT_METHOD(SRGB_DXT1,  3, COMP_FORMAT,     GL_COMPRESSED_SRGB_S3TC_DXT1_EXT,       GL_RGB,            0, 0, 0, 0, 0, 0, 0, 64, 64,    GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_SRGB_DXT1, ImageFormat::COLOR_SPACE_SRGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(SRGBA_DXT1, 4, COMP_FORMAT,     GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, GL_RGBA,		0, 0, 0, 0, 0, 0, 0, 64, 64,    GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_SRGBA_DXT1, ImageFormat::COLOR_SPACE_SRGB);
+DEFINE_TEXTUREFORMAT_METHOD(SRGBA_DXT1, 4, COMP_FORMAT,     GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, GL_RGBA,        0, 0, 0, 0, 0, 0, 0, 64, 64,    GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_SRGBA_DXT1, ImageFormat::COLOR_SPACE_SRGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(SRGBA_DXT3, 4, COMP_FORMAT,     GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, GL_RGBA,		0, 0, 0, 0, 0, 0, 0, 128, 128,  GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_SRGBA_DXT3, ImageFormat::COLOR_SPACE_SRGB);
+DEFINE_TEXTUREFORMAT_METHOD(SRGBA_DXT3, 4, COMP_FORMAT,     GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, GL_RGBA,        0, 0, 0, 0, 0, 0, 0, 128, 128,  GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_SRGBA_DXT3, ImageFormat::COLOR_SPACE_SRGB);
 
-DEFINE_TEXTUREFORMAT_METHOD(SRGBA_DXT5, 4, COMP_FORMAT,     GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, GL_RGBA,		0, 0, 0, 0, 0, 0, 0, 128, 128,  GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_SRGBA_DXT5, ImageFormat::COLOR_SPACE_SRGB);
+DEFINE_TEXTUREFORMAT_METHOD(SRGBA_DXT5, 4, COMP_FORMAT,     GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, GL_RGBA,        0, 0, 0, 0, 0, 0, 0, 128, 128,  GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_SRGBA_DXT5, ImageFormat::COLOR_SPACE_SRGB);
 
 DEFINE_TEXTUREFORMAT_METHOD(DEPTH16,    1, UNCOMP_FORMAT,   GL_DEPTH_COMPONENT16_ARB,           GL_DEPTH_COMPONENT, 0, 0, 0, 0, 0, 16, 0, 16, 16,   GL_UNSIGNED_SHORT, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_DEPTH16, ImageFormat::COLOR_SPACE_NONE);
 
diff --git a/dep/include/g3dlite/G3D/ImageFormat.h b/dep/g3dlite/G3D/ImageFormat.h
similarity index 98%
rename from dep/include/g3dlite/G3D/ImageFormat.h
rename to dep/g3dlite/G3D/ImageFormat.h
index 15d256433..be52d695f 100644
--- a/dep/include/g3dlite/G3D/ImageFormat.h
+++ b/dep/g3dlite/G3D/ImageFormat.h
@@ -359,7 +359,7 @@ public:
 
     static const ImageFormat* YUV444();
 
-	/**
+    /**
      NULL pointer; indicates that the G3D::Texture class should choose
      either RGBA8 or RGB8 depending on the presence of an alpha channel
      in the input.
@@ -420,8 +420,8 @@ public:
         Returns true if a conversion was available, false if none occurred.
     */
     static bool convert(const Array<const void*>& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits,
-	                    const Array<void*>& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits,
-	                    bool invertY = false, BayerAlgorithm bayerAlg = BayerAlgorithm::MHC);
+                        const Array<void*>& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits,
+                        bool invertY = false, BayerAlgorithm bayerAlg = BayerAlgorithm::MHC);
 
     /* Checks if a conversion between two formats is available. */
     static bool conversionAvailable(const ImageFormat* srcFormat, int srcRowPadBits, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY = false);
diff --git a/dep/src/g3dlite/ImageFormat_convert.cpp b/dep/g3dlite/G3D/ImageFormat_convert.cpp
similarity index 88%
rename from dep/src/g3dlite/ImageFormat_convert.cpp
rename to dep/g3dlite/G3D/ImageFormat_convert.cpp
index ecefe6319..3214c2a91 100644
--- a/dep/src/g3dlite/ImageFormat_convert.cpp
+++ b/dep/g3dlite/G3D/ImageFormat_convert.cpp
@@ -520,7 +520,7 @@ static void rgba32f_to_rgb32f(const Array<const void*>& srcBytes, int srcWidth,
         }
         for (int x = 0; x < srcWidth; ++x, ++srcIndex, dstByteOffset += 3 * sizeof(float)) {
             Color3& d = *reinterpret_cast<Color3*>(dst + dstByteOffset);
-            const Color4& s = src[srcIndex];	    
+            const Color4& s = src[srcIndex];        
             d = s.rgb();
         }
         dstByteOffset += dstRowPadBytes;
@@ -800,11 +800,11 @@ static const float R_BGB[5][5] =
 
 /** Applies a 5x5 filter to monochrome image I (wrapping at the boundaries) */
 static uint8 applyFilter(const uint8*    I,
-			 int             x,
-			 int             y,
-			 int             w,
-			 int             h,
-			 const float     filter[5][5]) {
+             int             x,
+             int             y,
+             int             w,
+             int             h,
+             const float     filter[5][5]) {
     
     debugAssert(isEven(w));
     debugAssert(isEven(h));
@@ -813,13 +813,13 @@ static uint8 applyFilter(const uint8*    I,
     float denom = 0.0f;
     
     for (int dy = 0; dy < 5; ++dy) {
-	int offset = ((y + dy + h - 2) % h) * w;
+    int offset = ((y + dy + h - 2) % h) * w;
     
-	for (int dx = 0; dx < 5; ++dx) {
-	    float f = filter[dy][dx];
-	    sum += f * I[((x + dx + w - 2) % w) + offset];
-	    denom += f;
-	}
+    for (int dx = 0; dx < 5; ++dx) {
+        float f = filter[dy][dx];
+        sum += f * I[((x + dx + w - 2) % w) + offset];
+        denom += f;
+    }
     }
     
     return (uint8)iClamp(iRound(sum / denom), 0, 255);
@@ -828,9 +828,9 @@ static uint8 applyFilter(const uint8*    I,
 /** Helper method for Bayer grbg and bggr --> rgb8 */
 static void swapRedAndBlue(int N, Color3uint8* out) {
     for (int i = N - 1; i >= 0; --i) {
-	uint8 tmp = out[i].r;
-	out[i].r = out[i].b;
-	out[i].b = tmp;
+    uint8 tmp = out[i].r;
+    out[i].r = out[i].b;
+    out[i].b = tmp;
     }
 }
 
@@ -840,149 +840,149 @@ static void swapRedAndBlue(int N, Color3uint8* out) {
 // rgb8 --> bayer helpers
 // =====================================================================
 static void rgb8_to_bayer_rggb8(const int w, const int h, 
-				const uint8* src, uint8* dst) {
+                const uint8* src, uint8* dst) {
     Color3uint8* srcColor = (Color3uint8*)src;
     Color1uint8* dstColor = (Color1uint8*)dst;
 
     // Top row pixels
     for (int y = 0; y < h - 1; y += 2) {
-	int offset = y * w;
+    int offset = y * w;
 
-	// Top left pixels
-	for(int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].r);
-	}
+    // Top left pixels
+    for(int x = 0; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].r);
+    }
 
-	// Top right pixels
-	for(int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
+    // Top right pixels
+    for(int x = 1; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].g);
+    }
     }
 
     // Bottom row pixels
     for (int y = 1; y < h - 1; y += 2) {
-	int offset = y * w;
+    int offset = y * w;
 
-	// Bottom left pixels
-	for (int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
+    // Bottom left pixels
+    for (int x = 0; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].g);
+    }
 
-	// Bottom right pixels
-	for (int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].b);
-	}
+    // Bottom right pixels
+    for (int x = 1; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].b);
+    }
     }
 }
 
 
 static void rgb8_to_bayer_grbg8(const int w, const int h, 
-				const uint8* src, uint8* dst) {
+                const uint8* src, uint8* dst) {
     Color3uint8* srcColor = (Color3uint8*)src;
     Color1uint8* dstColor = (Color1uint8*)dst;
 
     // Top row pixels
     for (int y = 0; y < h - 1; y += 2) {
-	int offset = y * w;
+    int offset = y * w;
 
-	// Top left pixels
-	for (int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
+    // Top left pixels
+    for (int x = 0; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].g);
+    }
 
-	// Top right pixels
-	for (int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].r);
-	}
+    // Top right pixels
+    for (int x = 1; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].r);
+    }
     }
 
     // Bottom row pixels
     for (int y = 1; y < h - 1; y += 2) {
-	int offset = y * w;
+    int offset = y * w;
 
-	// Bottom left pixels
-	for (int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].b);
-	}
+    // Bottom left pixels
+    for (int x = 0; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].b);
+    }
 
-	// Bottom right pixels
-	for (int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
+    // Bottom right pixels
+    for (int x = 1; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].g);
+    }
     }
 }
 
 
 static void rgb8_to_bayer_bggr8(const int w, const int h, 
-				const uint8* src, uint8* dst) {
+                const uint8* src, uint8* dst) {
     Color3uint8* srcColor = (Color3uint8*)src;
     Color1uint8* dstColor = (Color1uint8*)dst;
 
     // Top row pixels
     for (int y = 0; y < h - 1; y += 2) {
-	int offset = y * w;
+    int offset = y * w;
 
-	// Top left pixels
-	for (int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].b);
-	}
+    // Top left pixels
+    for (int x = 0; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].b);
+    }
 
-	// Top right pixels
-	for (int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
+    // Top right pixels
+    for (int x = 1; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].g);
+    }
     }
 
     // Bottom row pixels
     for (int y = 1; y < h - 1; y += 2) {
-	int offset = y * w;
+    int offset = y * w;
 
-	// Bottom left pixels
-	for(int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
+    // Bottom left pixels
+    for(int x = 0; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].g);
+    }
 
-	// Bottom right pixels
-	for(int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].r);
-	}
+    // Bottom right pixels
+    for(int x = 1; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].r);
+    }
     }
 }
 
 
 static void rgb8_to_bayer_gbrg8(const int w, const int h, 
-				const uint8* src, uint8* dst) {
+                const uint8* src, uint8* dst) {
     Color3uint8* srcColor = (Color3uint8*)src;
     Color1uint8* dstColor = (Color1uint8*)dst;
 
     // Top row pixels
     for(int y = 0; y < h - 1; y += 2) {
-	int offset = y * w;
+    int offset = y * w;
 
-	// Top left pixels
-	for(int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
+    // Top left pixels
+    for(int x = 0; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].g);
+    }
 
-	// Top right pixels
-	for(int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].b);
-	}
+    // Top right pixels
+    for(int x = 1; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].b);
+    }
     }
 
     // Bottom row pixels
     for(int y = 1; y < h - 1; y += 2) {
-	int offset = y * w;
+    int offset = y * w;
 
-	// Bottom left pixels
-	for(int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].r);
-	}
+    // Bottom left pixels
+    for(int x = 0; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].r);
+    }
 
-	// Bottom right pixels
-	for(int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
+    // Bottom right pixels
+    for(int x = 1; x < w - 1; x += 2) {
+        dstColor[x + offset] = Color1(srcColor[x + offset].g);
+    }
     }
 }
 
@@ -1035,61 +1035,61 @@ static void rgba32f_to_bayer_bggr8(const Array<const void*>& srcBytes, int srcWi
 // bayer --> rgb8 helpers
 // =====================================================================
 static void bayer_rggb8_to_rgb8_mhc(int w, int h, 
-				    const uint8* in, uint8* _out) {
+                    const uint8* in, uint8* _out) {
     debugAssert(in != _out);
 
     Color3uint8* out = (Color3uint8*)_out;
 
     for (int y = 0; y < h; ++y) {
 
-	// Row beginning in the input array.
-	int offset = y * w;
+    // Row beginning in the input array.
+    int offset = y * w;
 
-	// RG row
-	for (int x = 0; x < w; ++x, ++out) {
-	    // R pixel
-	    {
-		out->r = in[x + offset];
-		out->g = applyFilter(in, x, y, w, h, G_GRR);
-		out->b = applyFilter(in, x, y, w, h, B_GRR);
-	    }
-	    ++x; ++out;
+    // RG row
+    for (int x = 0; x < w; ++x, ++out) {
+        // R pixel
+        {
+        out->r = in[x + offset];
+        out->g = applyFilter(in, x, y, w, h, G_GRR);
+        out->b = applyFilter(in, x, y, w, h, B_GRR);
+        }
+        ++x; ++out;
 
-	    // G pixel
-	    {
-		out->r = applyFilter(in, x, y, w, h, R_GRG);
-		out->g = in[x + offset];
-		out->b = applyFilter(in, x, y, w, h, B_GRG);
-	    }
-	}
+        // G pixel
+        {
+        out->r = applyFilter(in, x, y, w, h, R_GRG);
+        out->g = in[x + offset];
+        out->b = applyFilter(in, x, y, w, h, B_GRG);
+        }
+    }
 
-	++y;
-	offset += w;
+    ++y;
+    offset += w;
 
-	// GB row
-	for (int x = 0; x < w; ++x, ++out) {
-	    // G pixel
-	    {
-		out->r = applyFilter(in, x, y, w, h, R_BGG);
-		out->g = in[x + offset];
-		out->b = applyFilter(in, x, y, w, h, B_BGG);
-	    }
-	    ++x; ++out;
+    // GB row
+    for (int x = 0; x < w; ++x, ++out) {
+        // G pixel
+        {
+        out->r = applyFilter(in, x, y, w, h, R_BGG);
+        out->g = in[x + offset];
+        out->b = applyFilter(in, x, y, w, h, B_BGG);
+        }
+        ++x; ++out;
 
-	    // B pixel
-	    {
-		out->r = applyFilter(in, x, y, w, h, R_BGB);
-		out->g = applyFilter(in, x, y, w, h, G_BGB);
-		out->b = in[x + offset];
-	    }
-	}
+        // B pixel
+        {
+        out->r = applyFilter(in, x, y, w, h, R_BGB);
+        out->g = applyFilter(in, x, y, w, h, G_BGB);
+        out->b = in[x + offset];
+        }
+    }
     }
 }
 
 
 
 static void bayer_gbrg8_to_rgb8_mhc(int w, int h, 
-				    const uint8* in, uint8* _out) {
+                    const uint8* in, uint8* _out) {
 
     debugAssert(in != _out);
 
@@ -1097,32 +1097,32 @@ static void bayer_gbrg8_to_rgb8_mhc(int w, int h,
 
     for (int y = 0; y < h; ++y) {
 
-	// Row beginning in the input array.
-	int offset = y * w;
+    // Row beginning in the input array.
+    int offset = y * w;
 
-	// GB row
-	for (int x = 0; x < w; ++x, ++out) {
-	    // G pixel
-	    {
-		out->r = applyFilter(in, x, y, w, h, R_BGG);
-		out->g = in[x + offset];
-		out->b = applyFilter(in, x, y, w, h, B_BGG);
-	    }
-	    ++x; ++out;
+    // GB row
+    for (int x = 0; x < w; ++x, ++out) {
+        // G pixel
+        {
+        out->r = applyFilter(in, x, y, w, h, R_BGG);
+        out->g = in[x + offset];
+        out->b = applyFilter(in, x, y, w, h, B_BGG);
+        }
+        ++x; ++out;
 
-	    // B pixel
-	    {
-		out->r = applyFilter(in, x, y, w, h, R_BGB);
-		out->g = applyFilter(in, x, y, w, h, G_BGB);
-		out->b = in[x + offset];
-	    }
-	}
+        // B pixel
+        {
+        out->r = applyFilter(in, x, y, w, h, R_BGB);
+        out->g = applyFilter(in, x, y, w, h, G_BGB);
+        out->b = in[x + offset];
+        }
+    }
     }
 }
 
 
 static void bayer_grbg8_to_rgb8_mhc(int w, int h, 
-				    const uint8* in, uint8* _out) {
+                    const uint8* in, uint8* _out) {
     // Run the equivalent function for red
     bayer_gbrg8_to_rgb8_mhc(w, h, in, _out);
 
@@ -1132,7 +1132,7 @@ static void bayer_grbg8_to_rgb8_mhc(int w, int h,
 
 
 static void bayer_bggr8_to_rgb8_mhc(int w, int h, 
-				    const uint8* in, uint8* _out) {
+                    const uint8* in, uint8* _out) {
     // Run the equivalent function for red
     bayer_rggb8_to_rgb8_mhc(w, h, in, _out);
 
@@ -1198,60 +1198,60 @@ static void bayer_bggr8_to_rgba32f(const Array<const void*>& srcBytes, int srcWi
 // // =====================================================================
 
 // static void bayer_rggb8_to_bgr8_mhc(int w, int h, 
-// 				    const uint8* in, uint8* _out) {
+//                     const uint8* in, uint8* _out) {
 //     debugAssert(in != _out);
 
 //     Color3uint8* out = (Color3uint8*)_out;
 
 //     for (int y = 0; y < h; ++y) {
 
-// 	// Row beginning in the input array.
-// 	int offset = y * w;
+//     // Row beginning in the input array.
+//     int offset = y * w;
 
-// 	// RG row
-// 	for (int x = 0; x < w; ++x, ++out) {
-// 	    // R pixel
-// 	    {
-// 		out->b = in[x + offset];
-// 		out->g = applyFilter(in, x, y, w, h, G_GRR);
-// 		out->r = applyFilter(in, x, y, w, h, B_GRR);
-// 	    }
-// 	    ++x; ++out;
+//     // RG row
+//     for (int x = 0; x < w; ++x, ++out) {
+//         // R pixel
+//         {
+//         out->b = in[x + offset];
+//         out->g = applyFilter(in, x, y, w, h, G_GRR);
+//         out->r = applyFilter(in, x, y, w, h, B_GRR);
+//         }
+//         ++x; ++out;
 
-// 	    // G pixel
-// 	    {
-// 		out->b = applyFilter(in, x, y, w, h, R_GRG);
-// 		out->g = in[x + offset];
-// 		out->r = applyFilter(in, x, y, w, h, B_GRG);
-// 	    }
-// 	}
+//         // G pixel
+//         {
+//         out->b = applyFilter(in, x, y, w, h, R_GRG);
+//         out->g = in[x + offset];
+//         out->r = applyFilter(in, x, y, w, h, B_GRG);
+//         }
+//     }
 
-// 	++y;
-// 	offset += w;
+//     ++y;
+//     offset += w;
 
-// 	// GB row
-// 	for (int x = 0; x < w; ++x, ++out) {
-// 	    // G pixel
-// 	    {
-// 		out->b = applyFilter(in, x, y, w, h, R_BGG);
-// 		out->g = in[x + offset];
-// 		out->r = applyFilter(in, x, y, w, h, B_BGG);
-// 	    }
-// 	    ++x; ++out;
+//     // GB row
+//     for (int x = 0; x < w; ++x, ++out) {
+//         // G pixel
+//         {
+//         out->b = applyFilter(in, x, y, w, h, R_BGG);
+//         out->g = in[x + offset];
+//         out->r = applyFilter(in, x, y, w, h, B_BGG);
+//         }
+//         ++x; ++out;
 
-// 	    // B pixel
-// 	    {
-// 		out->b = applyFilter(in, x, y, w, h, R_BGB);
-// 		out->g = applyFilter(in, x, y, w, h, G_BGB);
-// 		out->r = in[x + offset];
-// 	    }
-// 	}
+//         // B pixel
+//         {
+//         out->b = applyFilter(in, x, y, w, h, R_BGB);
+//         out->g = applyFilter(in, x, y, w, h, G_BGB);
+//         out->r = in[x + offset];
+//         }
+//     }
 //     }
 // }
 
 
 // static void bayer_gbrg8_to_bgr8_mhc(int w, int h, 
-// 				    const uint8* in, uint8* _out) {
+//                     const uint8* in, uint8* _out) {
 
 //     debugAssert(in != _out);
 
@@ -1259,31 +1259,31 @@ static void bayer_bggr8_to_rgba32f(const Array<const void*>& srcBytes, int srcWi
 
 //     for (int y = 0; y < h; ++y) {
 
-// 	// Row beginning in the input array.
-// 	int offset = y * w;
+//     // Row beginning in the input array.
+//     int offset = y * w;
 
-// 	// GB row
-// 	for (int x = 0; x < srcWidth; ++x, ++out) {
-// 	    // G pixel
-// 	    {
-// 		out->b = applyFilter(in, x, y, w, h, R_BGG);
-// 		out->g = in[x + offset];
-// 		out->r = applyFilter(in, x, y, w, h, B_BGG);
-// 	    }
-// 	    ++x; ++out;
+//     // GB row
+//     for (int x = 0; x < srcWidth; ++x, ++out) {
+//         // G pixel
+//         {
+//         out->b = applyFilter(in, x, y, w, h, R_BGG);
+//         out->g = in[x + offset];
+//         out->r = applyFilter(in, x, y, w, h, B_BGG);
+//         }
+//         ++x; ++out;
 
-// 	    // B pixel
-// 	    {
-// 		out->b = applyFilter(in, x, y, w, h, R_BGB);
-// 		out->g = applyFilter(in, x, y, w, h, G_BGB);
-// 		out->r = in[x + offset];
-// 	    }
-// 	}
+//         // B pixel
+//         {
+//         out->b = applyFilter(in, x, y, w, h, R_BGB);
+//         out->g = applyFilter(in, x, y, w, h, G_BGB);
+//         out->r = in[x + offset];
+//         }
+//     }
 //     }
 // }
 
 // static void bayer_grbg8_to_bgr8_mhc(int w, int h, 
-// 				    const uint8* in, uint8* _out) {
+//                     const uint8* in, uint8* _out) {
 //     // Run the equivalent function for red
 //     bayer_gbrg8_to_bgr8_mhc(w, h, in, _out);
 
@@ -1292,7 +1292,7 @@ static void bayer_bggr8_to_rgba32f(const Array<const void*>& srcBytes, int srcWi
 // }
 
 // static void bayer_bggr8_to_bgr8_mhc(int w, int h, 
-// 				    const uint8* in, uint8* _out) {
+//                     const uint8* in, uint8* _out) {
 //     // Run the equivalent function for red
 //     bayer_rggb8_to_bgr8_mhc(w, h, in, _out);
 
diff --git a/dep/g3dlite/G3D/Intersect.cpp b/dep/g3dlite/G3D/Intersect.cpp
new file mode 100644
index 000000000..f2f7580da
--- /dev/null
+++ b/dep/g3dlite/G3D/Intersect.cpp
@@ -0,0 +1,844 @@
+/**
+ @file Intersect.cpp
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  
+ @created 2009-06-29
+ @edited  2009-06-29
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+
+ From the G3D Innovation Engine
+ http://g3d.sf.net
+ */
+#include "G3D/Intersect.h"
+
+namespace G3D {
+
+#ifdef _MSC_VER
+// Turn on fast floating-point optimizations
+#pragma float_control( push )
+#pragma fp_contract( on )
+#pragma fenv_access( off )
+#pragma float_control( except, off )
+#pragma float_control( precise, off )
+#endif
+
+bool __fastcall Intersect::rayAABox(const Ray& ray, const AABox& box) {
+    switch (ray.classification) {
+    case Ray::MMM:
+        
+        if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z < box.lo.z)
+            || (ray.jbyi * box.lo.x - box.hi.y + ray.c_xy > 0)
+            || (ray.ibyj * box.lo.y - box.hi.x + ray.c_yx > 0)
+            || (ray.jbyk * box.lo.z - box.hi.y + ray.c_zy > 0)
+            || (ray.kbyj * box.lo.y - box.hi.z + ray.c_yz > 0)
+            || (ray.kbyi * box.lo.x - box.hi.z + ray.c_xz > 0)
+            || (ray.ibyk * box.lo.z - box.hi.x + ray.c_zx > 0)
+            )
+            return false;
+        
+        return true;
+
+    case Ray::MMP:
+        
+        if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z > box.hi.z)
+            || (ray.jbyi * box.lo.x - box.hi.y + ray.c_xy > 0)
+            || (ray.ibyj * box.lo.y - box.hi.x + ray.c_yx > 0)
+            || (ray.jbyk * box.hi.z - box.hi.y + ray.c_zy > 0)
+            || (ray.kbyj * box.lo.y - box.lo.z + ray.c_yz < 0)
+            || (ray.kbyi * box.lo.x - box.lo.z + ray.c_xz < 0)
+            || (ray.ibyk * box.hi.z - box.hi.x + ray.c_zx > 0)
+            )
+            return false;
+        
+        return true;
+
+    case Ray::MPM:
+        
+        if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z < box.lo.z)
+            || (ray.jbyi * box.lo.x - box.lo.y + ray.c_xy < 0) 
+            || (ray.ibyj * box.hi.y - box.hi.x + ray.c_yx > 0)
+            || (ray.jbyk * box.lo.z - box.lo.y + ray.c_zy < 0) 
+            || (ray.kbyj * box.hi.y - box.hi.z + ray.c_yz > 0)
+            || (ray.kbyi * box.lo.x - box.hi.z + ray.c_xz > 0)
+            || (ray.ibyk * box.lo.z - box.hi.x + ray.c_zx > 0)
+            )
+            return false;
+        
+        return true;
+
+    case Ray::MPP:
+    
+        if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z > box.hi.z)
+            || (ray.jbyi * box.lo.x - box.lo.y + ray.c_xy < 0) 
+            || (ray.ibyj * box.hi.y - box.hi.x + ray.c_yx > 0)
+            || (ray.jbyk * box.hi.z - box.lo.y + ray.c_zy < 0)
+            || (ray.kbyj * box.hi.y - box.lo.z + ray.c_yz < 0)
+            || (ray.kbyi * box.lo.x - box.lo.z + ray.c_xz < 0)
+            || (ray.ibyk * box.hi.z - box.hi.x + ray.c_zx > 0)
+            )
+            return false;
+        
+        return true;
+
+    case Ray::PMM:
+
+        if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z < box.lo.z)
+            || (ray.jbyi * box.hi.x - box.hi.y + ray.c_xy > 0)
+            || (ray.ibyj * box.lo.y - box.lo.x + ray.c_yx < 0)
+            || (ray.jbyk * box.lo.z - box.hi.y + ray.c_zy > 0)
+            || (ray.kbyj * box.lo.y - box.hi.z + ray.c_yz > 0)
+            || (ray.kbyi * box.hi.x - box.hi.z + ray.c_xz > 0)
+            || (ray.ibyk * box.lo.z - box.lo.x + ray.c_zx < 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::PMP:
+
+        if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z > box.hi.z)
+            || (ray.jbyi * box.hi.x - box.hi.y + ray.c_xy > 0)
+            || (ray.ibyj * box.lo.y - box.lo.x + ray.c_yx < 0)
+            || (ray.jbyk * box.hi.z - box.hi.y + ray.c_zy > 0)
+            || (ray.kbyj * box.lo.y - box.lo.z + ray.c_yz < 0)
+            || (ray.kbyi * box.hi.x - box.lo.z + ray.c_xz < 0)
+            || (ray.ibyk * box.hi.z - box.lo.x + ray.c_zx < 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::PPM:
+
+        if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z < box.lo.z)
+            || (ray.jbyi * box.hi.x - box.lo.y + ray.c_xy < 0)
+            || (ray.ibyj * box.hi.y - box.lo.x + ray.c_yx < 0)
+            || (ray.jbyk * box.lo.z - box.lo.y + ray.c_zy < 0) 
+            || (ray.kbyj * box.hi.y - box.hi.z + ray.c_yz > 0)
+            || (ray.kbyi * box.hi.x - box.hi.z + ray.c_xz > 0)
+            || (ray.ibyk * box.lo.z - box.lo.x + ray.c_zx < 0)
+            )
+            return false;
+        
+        return true;
+
+    case Ray::PPP:
+
+        if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z > box.hi.z)
+            || (ray.jbyi * box.hi.x - box.lo.y + ray.c_xy < 0)
+            || (ray.ibyj * box.hi.y - box.lo.x + ray.c_yx < 0)
+            || (ray.jbyk * box.hi.z - box.lo.y + ray.c_zy < 0)
+            || (ray.kbyj * box.hi.y - box.lo.z + ray.c_yz < 0)
+            || (ray.kbyi * box.hi.x - box.lo.z + ray.c_xz < 0)
+            || (ray.ibyk * box.hi.z - box.lo.x + ray.c_zx < 0)) {
+            return false;
+        }
+        
+        return true;
+
+    case Ray::OMM:
+
+        if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z < box.lo.z)
+            || (ray.jbyk * box.lo.z - box.hi.y + ray.c_zy > 0)
+            || (ray.kbyj * box.lo.y - box.hi.z + ray.c_yz > 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::OMP:
+
+        if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z > box.hi.z)
+            || (ray.jbyk * box.hi.z - box.hi.y + ray.c_zy > 0)
+            || (ray.kbyj * box.lo.y - box.lo.z + ray.c_yz < 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::OPM:
+
+        if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z < box.lo.z)
+            || (ray.jbyk * box.lo.z - box.lo.y + ray.c_zy < 0) 
+            || (ray.kbyj * box.hi.y - box.hi.z + ray.c_yz > 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::OPP:
+
+        if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z > box.hi.z)
+            || (ray.jbyk * box.hi.z - box.lo.y + ray.c_zy < 0)
+            || (ray.kbyj * box.hi.y - box.lo.z + ray.c_yz < 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::MOM:
+
+        if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.z < box.lo.z) 
+            || (ray.kbyi * box.lo.x - box.hi.z + ray.c_xz > 0)
+            || (ray.ibyk * box.lo.z - box.hi.x + ray.c_zx > 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::MOP:
+
+        if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.z > box.hi.z) 
+            || (ray.kbyi * box.lo.x - box.lo.z + ray.c_xz < 0)
+            || (ray.ibyk * box.hi.z - box.hi.x + ray.c_zx > 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::POM:
+
+        if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.x > box.hi.x) || (ray.m_origin.z < box.lo.z)
+            || (ray.kbyi * box.hi.x - box.hi.z + ray.c_xz > 0)
+            || (ray.ibyk * box.lo.z - box.lo.x + ray.c_zx < 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::POP:
+
+        if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.x > box.hi.x) || (ray.m_origin.z > box.hi.z)
+            || (ray.kbyi * box.hi.x - box.lo.z + ray.c_xz < 0)
+            || (ray.ibyk * box.hi.z - box.lo.x + ray.c_zx < 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::MMO:
+
+        if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.y < box.lo.y) 
+            || (ray.jbyi * box.lo.x - box.hi.y + ray.c_xy > 0)
+            || (ray.ibyj * box.lo.y - box.hi.x + ray.c_yx > 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::MPO:
+
+        if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.y > box.hi.y) 
+            || (ray.jbyi * box.lo.x - box.lo.y + ray.c_xy < 0) 
+            || (ray.ibyj * box.hi.y - box.hi.x + ray.c_yx > 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::PMO:
+
+        if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
+            || (ray.m_origin.x > box.hi.x) || (ray.m_origin.y < box.lo.y) 
+            || (ray.jbyi * box.hi.x - box.hi.y + ray.c_xy > 0)
+            || (ray.ibyj * box.lo.y - box.lo.x + ray.c_yx < 0)  
+            )
+            return false;
+
+        return true;
+
+    case Ray::PPO:
+
+        if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
+            || (ray.m_origin.x > box.hi.x) || (ray.m_origin.y > box.hi.y)
+            || (ray.jbyi * box.hi.x - box.lo.y + ray.c_xy < 0)
+            || (ray.ibyj * box.hi.y - box.lo.x + ray.c_yx < 0)
+            )
+            return false;
+
+        return true;
+
+    case Ray::MOO:
+
+        if((ray.m_origin.x < box.lo.x)
+            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
+            )
+            return false;
+
+        return true;
+
+    case Ray::POO:
+
+        if((ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
+            )
+            return false;
+
+        return true;
+
+    case Ray::OMO:
+
+        if((ray.m_origin.y < box.lo.y)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
+            )
+            return false;
+
+    case Ray::OPO:
+
+        if((ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
+            )
+            return false;
+
+    case Ray::OOM:
+
+        if((ray.m_origin.z < box.lo.z)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            )
+            return false;
+
+    case Ray::OOP:
+
+        if((ray.m_origin.z > box.hi.z)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            )
+            return false;
+
+        return true;
+    
+    }
+
+    return false;
+}
+
+
+bool __fastcall Intersect::rayAABox(const Ray& ray, const AABox& box, float& time) {
+
+    switch (ray.classification) {
+    case Ray::MMM:
+        {
+        if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z < box.lo.z)
+            || (ray.jbyi * box.lo.x - box.hi.y + ray.c_xy > 0)
+            || (ray.ibyj * box.lo.y - box.hi.x + ray.c_yx > 0)
+            || (ray.jbyk * box.lo.z - box.hi.y + ray.c_zy > 0)
+            || (ray.kbyj * box.lo.y - box.hi.z + ray.c_yz > 0)
+            || (ray.kbyi * box.lo.x - box.hi.z + ray.c_xz > 0)
+            || (ray.ibyk * box.lo.z - box.hi.x + ray.c_zx > 0)) {
+            return false;
+        }
+
+        // compute the intersection distance
+
+        time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t1 = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
+        if (t1 > time) {
+                time = t1;
+        }
+
+        float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+
+    case Ray::MMP:
+        {        
+        if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z > box.hi.z)
+            || (ray.jbyi * box.lo.x - box.hi.y + ray.c_xy > 0)
+            || (ray.ibyj * box.lo.y - box.hi.x + ray.c_yx > 0)
+            || (ray.jbyk * box.hi.z - box.hi.y + ray.c_zy > 0)
+            || (ray.kbyj * box.lo.y - box.lo.z + ray.c_yz < 0)
+            || (ray.kbyi * box.lo.x - box.lo.z + ray.c_xz < 0)
+            || (ray.ibyk * box.hi.z - box.hi.x + ray.c_zx > 0)) {
+            return false;
+        }
+        
+        time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t1 = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
+        if (t1 > time) {
+            time = t1;
+        }
+        float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+    
+        return true;
+        }
+
+    case Ray::MPM:
+        {        
+        if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z < box.lo.z)
+            || (ray.jbyi * box.lo.x - box.lo.y + ray.c_xy < 0) 
+            || (ray.ibyj * box.hi.y - box.hi.x + ray.c_yx > 0)
+            || (ray.jbyk * box.lo.z - box.lo.y + ray.c_zy < 0) 
+            || (ray.kbyj * box.hi.y - box.hi.z + ray.c_yz > 0)
+            || (ray.kbyi * box.lo.x - box.hi.z + ray.c_xz > 0)
+            || (ray.ibyk * box.lo.z - box.hi.x + ray.c_zx > 0)) {
+            return false;
+        }
+        
+        time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t1 = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
+        if (t1 > time) {
+            time = t1;
+        }
+        float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+
+    case Ray::MPP:
+        {
+        if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z > box.hi.z)
+            || (ray.jbyi * box.lo.x - box.lo.y + ray.c_xy < 0) 
+            || (ray.ibyj * box.hi.y - box.hi.x + ray.c_yx > 0)
+            || (ray.jbyk * box.hi.z - box.lo.y + ray.c_zy < 0)
+            || (ray.kbyj * box.hi.y - box.lo.z + ray.c_yz < 0) 
+            || (ray.kbyi * box.lo.x - box.lo.z + ray.c_xz < 0)
+            || (ray.ibyk * box.hi.z - box.hi.x + ray.c_zx > 0)) {
+            return false;
+        }
+        
+        time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t1 = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
+        if (t1 > time) {
+            time = t1;
+        }
+        float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+
+    case Ray::PMM:
+        {
+        if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z < box.lo.z)
+            || (ray.jbyi * box.hi.x - box.hi.y + ray.c_xy > 0)
+            || (ray.ibyj * box.lo.y - box.lo.x + ray.c_yx < 0)
+            || (ray.jbyk * box.lo.z - box.hi.y + ray.c_zy > 0)
+            || (ray.kbyj * box.lo.y - box.hi.z + ray.c_yz > 0)
+            || (ray.kbyi * box.hi.x - box.hi.z + ray.c_xz > 0)
+            || (ray.ibyk * box.lo.z - box.lo.x + ray.c_zx < 0)) {
+            return false;
+        }
+        
+        time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t1 = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
+        if (t1 > time) {
+            time = t1;
+        }
+        float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+        
+
+    case Ray::PMP:
+        {
+        if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z > box.hi.z)
+            || (ray.jbyi * box.hi.x - box.hi.y + ray.c_xy > 0)
+            || (ray.ibyj * box.lo.y - box.lo.x + ray.c_yx < 0)
+            || (ray.jbyk * box.hi.z - box.hi.y + ray.c_zy > 0)
+            || (ray.kbyj * box.lo.y - box.lo.z + ray.c_yz < 0)
+            || (ray.kbyi * box.hi.x - box.lo.z + ray.c_xz < 0)
+            || (ray.ibyk * box.hi.z - box.lo.x + ray.c_zx < 0)) {
+            return false;
+        }
+
+        time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t1 = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
+        if (t1 > time) {
+            time = t1;
+        }
+        float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+
+    case Ray::PPM:
+        {
+        if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z < box.lo.z)
+            || (ray.jbyi * box.hi.x - box.lo.y + ray.c_xy < 0)
+            || (ray.ibyj * box.hi.y - box.lo.x + ray.c_yx < 0)
+            || (ray.jbyk * box.lo.z - box.lo.y + ray.c_zy < 0) 
+            || (ray.kbyj * box.hi.y - box.hi.z + ray.c_yz > 0)
+            || (ray.kbyi * box.hi.x - box.hi.z + ray.c_xz > 0)
+            || (ray.ibyk * box.lo.z - box.lo.x + ray.c_zx < 0))    {
+            return false;
+        }
+        
+        time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t1 = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
+        if (t1 > time) {
+            time = t1;
+        }
+        float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+
+    case Ray::PPP:
+        {
+        if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z > box.hi.z)
+            || (ray.jbyi * box.hi.x - box.lo.y + ray.c_xy < 0)
+            || (ray.ibyj * box.hi.y - box.lo.x + ray.c_yx < 0)
+            || (ray.jbyk * box.hi.z - box.lo.y + ray.c_zy < 0)
+            || (ray.kbyj * box.hi.y - box.lo.z + ray.c_yz < 0)
+            || (ray.kbyi * box.hi.x - box.lo.z + ray.c_xz < 0)
+            || (ray.ibyk * box.hi.z - box.lo.x + ray.c_zx < 0)) {
+            return false;
+        }
+        
+        time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t1 = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
+        if (t1 > time) {
+            time = t1;
+        }
+        float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+
+    case Ray::OMM:
+        {
+        if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z < box.lo.z)
+            || (ray.jbyk * box.lo.z - box.hi.y + ray.c_zy > 0)
+            || (ray.kbyj * box.lo.y - box.hi.z + ray.c_yz > 0)) {
+            return false;
+        }
+
+        time = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
+        float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+
+    case Ray::OMP:
+        {
+        if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z > box.hi.z)
+            || (ray.jbyk * box.hi.z - box.hi.y + ray.c_zy > 0)
+            || (ray.kbyj * box.lo.y - box.lo.z + ray.c_yz < 0)) {
+            return false;
+        }
+
+        time = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
+        float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+
+    case Ray::OPM:
+        {
+        if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z < box.lo.z)
+            || (ray.jbyk * box.lo.z - box.lo.y + ray.c_zy < 0) 
+            || (ray.kbyj * box.hi.y - box.hi.z + ray.c_yz > 0)) {
+            return false;
+        }
+
+        time = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;        
+        float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+
+    case Ray::OPP:
+        {
+        if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z > box.hi.z)
+            || (ray.jbyk * box.hi.z - box.lo.y + ray.c_zy < 0)
+            || (ray.kbyj * box.hi.y - box.lo.z + ray.c_yz < 0)) {
+            return false;
+        }
+        
+        time = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;        
+        float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+        
+
+    case Ray::MOM:
+        {
+        if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.z < box.lo.z) 
+            || (ray.kbyi * box.lo.x - box.hi.z + ray.c_xz > 0)
+            || (ray.ibyk * box.lo.z - box.hi.x + ray.c_zx > 0)) {
+            return false;
+        }
+        
+        time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+        
+
+    case Ray::MOP:
+        {
+        if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.z > box.hi.z) 
+            || (ray.kbyi * box.lo.x - box.lo.z + ray.c_xz < 0)
+            || (ray.ibyk * box.hi.z - box.hi.x + ray.c_zx > 0)) {
+            return false;
+        }
+
+        time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+
+    case Ray::POM:
+        {
+        if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.x > box.hi.x) || (ray.m_origin.z < box.lo.z)
+            || (ray.kbyi * box.hi.x - box.hi.z + ray.c_xz > 0)
+            || (ray.ibyk * box.lo.z - box.lo.x + ray.c_zx < 0)) {
+            return false;
+        }
+        
+        time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }
+            
+
+    case Ray::POP:
+        {
+        if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.x > box.hi.x) || (ray.m_origin.z > box.hi.z)
+            || (ray.kbyi * box.hi.x - box.lo.z + ray.c_xz < 0)
+            || (ray.ibyk * box.hi.z - box.lo.x + ray.c_zx < 0)) {
+            return false;
+        }
+
+        time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
+        if (t2 > time) {
+            time = t2;
+        }
+
+        return true;
+        }    
+
+    case Ray::MMO:
+        {
+        if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.y < box.lo.y)  
+            || (ray.jbyi * box.lo.x - box.hi.y + ray.c_xy > 0)
+            || (ray.ibyj * box.lo.y - box.hi.x + ray.c_yx > 0)) {
+            return false;
+        }
+
+        time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t1 = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
+        if (t1 > time) {
+            time = t1;
+        }
+
+        return true;
+        }    
+
+    case Ray::MPO:
+        {
+        if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.y > box.hi.y) 
+            || (ray.jbyi * box.lo.x - box.lo.y + ray.c_xy < 0) 
+            || (ray.ibyj * box.hi.y - box.hi.x + ray.c_yx > 0))    {
+            return false;
+        }
+        
+        time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t1 = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
+        if (t1 > time) {
+            time = t1;
+        }
+        
+        return true;
+        }
+        
+
+    case Ray::PMO:
+        {
+        if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
+            || (ray.m_origin.x > box.hi.x) || (ray.m_origin.y < box.lo.y) 
+            || (ray.jbyi * box.hi.x - box.hi.y + ray.c_xy > 0)
+            || (ray.ibyj * box.lo.y - box.lo.x + ray.c_yx < 0)) {
+            return false;
+        }
+
+        time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t1 = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
+        if (t1 > time) {
+            time = t1;
+        }
+        
+        return true;
+        }
+
+    case Ray::PPO:
+        {
+        if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
+            || (ray.m_origin.x > box.hi.x) || (ray.m_origin.y > box.hi.y) 
+            || (ray.jbyi * box.hi.x - box.lo.y + ray.c_xy < 0)
+            || (ray.ibyj * box.hi.y - box.lo.x + ray.c_yx < 0)) {
+            return false;
+        }
+    
+        time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
+        float t1 = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
+        if (t1 > time) {
+            time = t1;
+        }
+
+        return true;
+        }
+        
+
+    case Ray::MOO:
+        {
+        if((ray.m_origin.x < box.lo.x)
+            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)) {
+            return false;
+        }
+
+        time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
+        return true;
+        }
+
+    case Ray::POO:
+        {
+        if ((ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)) {
+            return false;
+        }
+
+        time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
+        return true;
+        }
+
+    case Ray::OMO:
+        {
+        if ((ray.m_origin.y < box.lo.y)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)) {
+            return false;
+        }
+        
+        time = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
+        return true;
+        }
+
+    case Ray::OPO:
+        {
+        if ((ray.m_origin.y > box.hi.y)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)) {
+            return false;
+        }
+
+        time = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
+        return true;
+        }
+
+
+    case Ray::OOM:
+        {
+        if ((ray.m_origin.z < box.lo.z)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)) {
+            return false;
+        }
+
+        time = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
+        return true;
+        }
+
+    case Ray::OOP:
+        {
+        if ((ray.m_origin.z > box.hi.z)
+            || (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
+            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)) {
+            return false;
+        }
+
+        time = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
+        return true;
+        }    
+    }
+
+    return false;
+}
+
+#ifdef _MSC_VER
+// Turn off fast floating-point optimizations
+#pragma float_control( pop )
+#endif
+
+}
diff --git a/dep/include/g3dlite/G3D/Intersect.h b/dep/g3dlite/G3D/Intersect.h
similarity index 78%
rename from dep/include/g3dlite/G3D/Intersect.h
rename to dep/g3dlite/G3D/Intersect.h
index 4a3c8fb45..cc841d650 100644
--- a/dep/include/g3dlite/G3D/Intersect.h
+++ b/dep/g3dlite/G3D/Intersect.h
@@ -27,17 +27,17 @@ namespace G3D {
 class Intersect {
 public:
 
-	/** \brief Returns true if the intersection of the ray and the solid box is non-empty. 
+    /** \brief Returns true if the intersection of the ray and the solid box is non-empty. 
 
       \cite "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
       by Martin Eisemann, Thorsten Grosch, Stefan Müller and Marcus Magnor
       Computer Graphics Lab, TU Braunschweig, Germany and
       University of Koblenz-Landau, Germany
     */
-	static bool __fastcall rayAABox(const Ray& ray, const AABox& box);
+    static bool __fastcall rayAABox(const Ray& ray, const AABox& box);
 
-	/** \brief Returns true if the intersection of the ray and the solid box is non-empty. 
-	 
+    /** \brief Returns true if the intersection of the ray and the solid box is non-empty. 
+     
      \param time If there is an intersection, set to the time to that intersection. If the ray origin is inside the box,
      this is a negative value indicating the distance backwards from the ray origin to the first intersection.
      \a time is not set if there is no intersection.
@@ -47,7 +47,7 @@ public:
       Computer Graphics Lab, TU Braunschweig, Germany and
       University of Koblenz-Landau, Germany
       */
- 	static bool __fastcall rayAABox(const Ray& ray, const AABox& box, float& time);
+     static bool __fastcall rayAABox(const Ray& ray, const AABox& box, float& time);
 };
 
 }
diff --git a/dep/include/g3dlite/G3D/KDTree.h b/dep/g3dlite/G3D/KDTree.h
similarity index 96%
rename from dep/include/g3dlite/G3D/KDTree.h
rename to dep/g3dlite/G3D/KDTree.h
index 4785ef2ba..877ef6169 100644
--- a/dep/include/g3dlite/G3D/KDTree.h
+++ b/dep/g3dlite/G3D/KDTree.h
@@ -260,11 +260,11 @@ protected:
     /** Compares centers */
     class CenterComparator {
     public:
-	    Vector3::Axis sortAxis;
+        Vector3::Axis sortAxis;
 
-	    CenterComparator(Vector3::Axis a) : sortAxis(a) {}
+        CenterComparator(Vector3::Axis a) : sortAxis(a) {}
 
-	    inline int operator()(Handle* A, const Handle* B) const {
+        inline int operator()(Handle* A, const Handle* B) const {
             float a = A->center[sortAxis];
             float b = B->center[sortAxis];
 
@@ -275,18 +275,18 @@ protected:
             } else {
                 return 0;
             }
-	    }
+        }
     };
 
 
     /** Compares bounds for strict >, <, or overlap*/
     class BoundsComparator {
     public:
-	    Vector3::Axis sortAxis;
+        Vector3::Axis sortAxis;
 
-	    BoundsComparator(Vector3::Axis a) : sortAxis(a) {}
+        BoundsComparator(Vector3::Axis a) : sortAxis(a) {}
 
-	    inline int operator()(Handle* A, const Handle* B) const {
+        inline int operator()(Handle* A, const Handle* B) const {
             const AABox& a = A->bounds;
             const AABox& b = B->bounds;
 
@@ -297,34 +297,34 @@ protected:
             } else {
                 return 0;
             }
-	    }
+        }
     };
 
 
     /** Compares bounds to the sort location */
     class Comparator {
     public:
-	    Vector3::Axis sortAxis;
-	    float sortLocation;
+        Vector3::Axis sortAxis;
+        float sortLocation;
 
-	    Comparator(Vector3::Axis a, float l) : sortAxis(a), sortLocation(l) {}
+        Comparator(Vector3::Axis a, float l) : sortAxis(a), sortLocation(l) {}
 
-	    inline int operator()(Handle* ignore, const Handle* handle) const {
+        inline int operator()(Handle* ignore, const Handle* handle) const {
             (void)ignore;
             const AABox& box = handle->bounds;
             debugAssert(ignore == NULL);
 
-		    if (box.high()[sortAxis] < sortLocation) {
+            if (box.high()[sortAxis] < sortLocation) {
                 // Box is strictly below the sort location
                 return -1;
-		    } else if (box.low()[sortAxis] > sortLocation) {
+            } else if (box.low()[sortAxis] > sortLocation) {
                 // Box is strictly above the sort location
-			    return 1;
-		    } else {
+                return 1;
+            } else {
                 // Box overlaps the sort location
-			    return 0;
-		    }
-	    }
+                return 0;
+            }
+        }
     };
 
     // Using System::malloc with this class provided no speed improvement.
@@ -433,8 +433,8 @@ protected:
         }
 
         void verifyNode(const Vector3& lo, const Vector3& hi) {
-            //		debugPrintf("Verifying: split %d @ %f [%f, %f, %f], [%f, %f, %f]\n",
-            //			    splitAxis, splitLocation, lo.x, lo.y, lo.z, hi.x, hi.y, hi.z);
+            //        debugPrintf("Verifying: split %d @ %f [%f, %f, %f], [%f, %f, %f]\n",
+            //                splitAxis, splitLocation, lo.x, lo.y, lo.z, hi.x, hi.y, hi.z);
             
             debugAssertM(lo == splitBounds.low(),
                          format("lo = %s, splitBounds.lo = %s",
@@ -714,27 +714,27 @@ protected:
         int numMeanSplits,
         Array<Handle*>& temp)  {
 
-	    Node* node = NULL;
-	    
-	    if (source.size() <= valuesPerNode) {
-		    // Make a new leaf node
-		    node = new Node(source);
-		    
-		    // Set the pointers in the memberTable
-		    for (int i = 0; i < source.size(); ++i) {
-			    memberTable.set(Member(source[i]), node);
-		    }
+        Node* node = NULL;
+        
+        if (source.size() <= valuesPerNode) {
+            // Make a new leaf node
+            node = new Node(source);
+            
+            // Set the pointers in the memberTable
+            for (int i = 0; i < source.size(); ++i) {
+                memberTable.set(Member(source[i]), node);
+            }
             source.clear();
-		    
+            
         } else {
-		    // Make a new internal node
-		    node = new Node();
-		    
+            // Make a new internal node
+            node = new Node();
+            
             const AABox& bounds = computeBounds(source, 0, source.size() - 1);
-		    const Vector3& extent = bounds.high() - bounds.low();
-		    
-		    Vector3::Axis splitAxis = extent.primaryAxis();
-		    
+            const Vector3& extent = bounds.high() - bounds.low();
+            
+            Vector3::Axis splitAxis = extent.primaryAxis();
+            
             float splitLocation;
 
             // Arrays for holding the children
@@ -829,20 +829,20 @@ protected:
             for (int i = 0; i < node->valueArray.size(); ++i) {
                 Handle* v = node->valueArray[i];
                 node->boundsArray[i] = v->bounds;
-			    memberTable.set(Member(v), node);
+                memberTable.set(Member(v), node);
             }
 
-            if (lt.size() > 0) {		    
-			    node->child[0] = makeNode(lt, valuesPerNode, numMeanSplits - 1, temp);
-		    }
-		    
-		    if (gt.size() > 0) {
-			    node->child[1] = makeNode(gt, valuesPerNode, numMeanSplits - 1, temp);
-		    }
-		    
-	    }
-	    
-	    return node;
+            if (lt.size() > 0) {            
+                node->child[0] = makeNode(lt, valuesPerNode, numMeanSplits - 1, temp);
+            }
+            
+            if (gt.size() > 0) {
+                node->child[1] = makeNode(gt, valuesPerNode, numMeanSplits - 1, temp);
+            }
+            
+        }
+        
+        return node;
     }
 
     /**
diff --git a/dep/src/g3dlite/Line.cpp b/dep/g3dlite/G3D/Line.cpp
similarity index 91%
rename from dep/src/g3dlite/Line.cpp
rename to dep/g3dlite/G3D/Line.cpp
index 195ae7197..e4f2ee8fd 100644
--- a/dep/src/g3dlite/Line.cpp
+++ b/dep/g3dlite/G3D/Line.cpp
@@ -33,19 +33,19 @@ Vector3 Line::intersection(const Plane& plane) const {
 
 
 Line::Line(class BinaryInput& b) {
-	deserialize(b);
+    deserialize(b);
 }
 
 
 void Line::serialize(class BinaryOutput& b) const {
-	_point.serialize(b);
-	_direction.serialize(b);
+    _point.serialize(b);
+    _direction.serialize(b);
 }
 
 
 void Line::deserialize(class BinaryInput& b) {
-	_point.deserialize(b);
-	_direction.deserialize(b);
+    _point.deserialize(b);
+    _direction.deserialize(b);
 }
 
 
diff --git a/dep/include/g3dlite/G3D/Line.h b/dep/g3dlite/G3D/Line.h
similarity index 94%
rename from dep/include/g3dlite/G3D/Line.h
rename to dep/g3dlite/G3D/Line.h
index 3579a6bec..2686474c4 100644
--- a/dep/include/g3dlite/G3D/Line.h
+++ b/dep/g3dlite/G3D/Line.h
@@ -38,11 +38,11 @@ public:
     /** Undefined (provided for creating Array<Line> only) */
     inline Line() {}
 
-	Line(class BinaryInput& b);
+    Line(class BinaryInput& b);
 
-	void serialize(class BinaryOutput& b) const;
+    void serialize(class BinaryOutput& b) const;
 
-	void deserialize(class BinaryInput& b);
+    void deserialize(class BinaryInput& b);
 
     virtual ~Line() {}
 
diff --git a/dep/src/g3dlite/LineSegment.cpp b/dep/g3dlite/G3D/LineSegment.cpp
similarity index 97%
rename from dep/src/g3dlite/LineSegment.cpp
rename to dep/g3dlite/G3D/LineSegment.cpp
index 754600ad5..63a28fce6 100644
--- a/dep/src/g3dlite/LineSegment.cpp
+++ b/dep/g3dlite/G3D/LineSegment.cpp
@@ -80,19 +80,19 @@ bool LineSegment::intersectsSolidSphere(const class Sphere& s) const {
 
 
 LineSegment::LineSegment(class BinaryInput& b) {
-	deserialize(b);
+    deserialize(b);
 }
 
 
 void LineSegment::serialize(class BinaryOutput& b) const {
-	_point.serialize(b);
-	direction.serialize(b);
+    _point.serialize(b);
+    direction.serialize(b);
 }
 
 
 void LineSegment::deserialize(class BinaryInput& b) {
-	_point.deserialize(b);
-	direction.deserialize(b);
+    _point.deserialize(b);
+    direction.deserialize(b);
 }
 
 
diff --git a/dep/include/g3dlite/G3D/LineSegment.h b/dep/g3dlite/G3D/LineSegment.h
similarity index 93%
rename from dep/include/g3dlite/G3D/LineSegment.h
rename to dep/g3dlite/G3D/LineSegment.h
index 70210ec7e..2d5399da5 100644
--- a/dep/include/g3dlite/G3D/LineSegment.h
+++ b/dep/g3dlite/G3D/LineSegment.h
@@ -33,11 +33,11 @@ public:
 
     inline LineSegment() : _point(Vector3::zero()), direction(Vector3::zero()) {}
 
-	LineSegment(class BinaryInput& b);
+    LineSegment(class BinaryInput& b);
 
-	void serialize(class BinaryOutput& b) const;
+    void serialize(class BinaryOutput& b) const;
 
-	void deserialize(class BinaryInput& b);
+    void deserialize(class BinaryInput& b);
 
     virtual ~LineSegment() {}
 
@@ -48,7 +48,7 @@ public:
         return LineSegment(point1, point2 - point1);
     }
 
-	/** Call with 0 or 1 */
+    /** Call with 0 or 1 */
     Vector3 point(int i) const;
 
     inline float length() const {
diff --git a/dep/src/g3dlite/Log.cpp b/dep/g3dlite/G3D/Log.cpp
similarity index 96%
rename from dep/src/g3dlite/Log.cpp
rename to dep/g3dlite/G3D/Log.cpp
index f437351cf..46be1b76e 100644
--- a/dep/src/g3dlite/Log.cpp
+++ b/dep/g3dlite/G3D/Log.cpp
@@ -23,16 +23,16 @@
 namespace G3D {
 
 void logPrintf(const char* fmt, ...) {
-	va_list arg_list;
-	va_start(arg_list, fmt);
+    va_list arg_list;
+    va_start(arg_list, fmt);
     Log::common()->vprintf(fmt, arg_list);
     va_end(arg_list);
 }
 
 
 void logLazyPrintf(const char* fmt, ...) {
-	va_list arg_list;
-	va_start(arg_list, fmt);
+    va_list arg_list;
+    va_start(arg_list, fmt);
     Log::common()->lazyvprintf(fmt, arg_list);
     va_end(arg_list);
 }
diff --git a/dep/include/g3dlite/G3D/Log.h b/dep/g3dlite/G3D/Log.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Log.h
rename to dep/g3dlite/G3D/Log.h
diff --git a/dep/include/g3dlite/G3D/Map2D.h b/dep/g3dlite/G3D/Map2D.h
similarity index 95%
rename from dep/include/g3dlite/G3D/Map2D.h
rename to dep/g3dlite/G3D/Map2D.h
index 9af9f7242..f9f9e643b 100644
--- a/dep/include/g3dlite/G3D/Map2D.h
+++ b/dep/g3dlite/G3D/Map2D.h
@@ -448,37 +448,37 @@ public:
         }
     }
 
-	virtual void flipVertical() {
-		int halfHeight = h/2;
-		Storage* d = data.getCArray();
-		for (int y = 0; y < halfHeight; ++y) {
-			int o1 = y * w;
-			int o2 = (h - y - 1) * w;
-			for (int x = 0; x < (int)w; ++x) {
-				int i1 = o1 + x;
-				int i2 = o2 + x;
-				Storage temp = d[i1];
-				d[i1] = d[i2];
-				d[i2] = temp;
-			}
-		}
+    virtual void flipVertical() {
+        int halfHeight = h/2;
+        Storage* d = data.getCArray();
+        for (int y = 0; y < halfHeight; ++y) {
+            int o1 = y * w;
+            int o2 = (h - y - 1) * w;
+            for (int x = 0; x < (int)w; ++x) {
+                int i1 = o1 + x;
+                int i2 = o2 + x;
+                Storage temp = d[i1];
+                d[i1] = d[i2];
+                d[i2] = temp;
+            }
+        }
         setChanged(true);
-	}
+    }
 
-	virtual void flipHorizontal() {
-		int halfWidth = w / 2;
-		Storage* d = data.getCArray();
-		for (int x = 0; x < halfWidth; ++x) {
-			for (int y = 0; y < (int)h; ++y) {
-				int i1 = y * w + x;
-				int i2 = y * w + (w - x - 1);
-				Storage temp = d[i1];
-				d[i1] = d[i2];
-				d[i2] = temp;
-			}
-		}
+    virtual void flipHorizontal() {
+        int halfWidth = w / 2;
+        Storage* d = data.getCArray();
+        for (int x = 0; x < halfWidth; ++x) {
+            for (int y = 0; y < (int)h; ++y) {
+                int i1 = y * w + x;
+                int i2 = y * w + (w - x - 1);
+                Storage temp = d[i1];
+                d[i1] = d[i2];
+                d[i2] = temp;
+            }
+        }
         setChanged(true);
-	}
+    }
 
     /**
      Crops this map so that it only contains pixels between (x, y) and (x + w - 1, y + h - 1) inclusive.
diff --git a/dep/src/g3dlite/Matrix.cpp b/dep/g3dlite/G3D/Matrix.cpp
similarity index 97%
rename from dep/src/g3dlite/Matrix.cpp
rename to dep/g3dlite/G3D/Matrix.cpp
index 7a668e59e..c4885decb 100644
--- a/dep/src/g3dlite/Matrix.cpp
+++ b/dep/g3dlite/G3D/Matrix.cpp
@@ -43,21 +43,21 @@ void Matrix::serialize(TextOutput& t) const {
 
 
 std::string Matrix::toString(const std::string& name) const {
-	std::string s;
+    std::string s;
 
     if (name != "") {
         s += format("%s = \n", name.c_str());
     }
 
-	s += "[";
+    s += "[";
     for (int r = 0; r < rows(); ++r) {
         for (int c = 0; c < cols(); ++c) {
             double v = impl->get(r, c);
 
-			if (::fabs(v) < 0.00001) {
-				// Don't print "negative zero"
+            if (::fabs(v) < 0.00001) {
+                // Don't print "negative zero"
                 s += format("% 10.04g", 0.0);
-			} else if (v == iRound(v)) {
+            } else if (v == iRound(v)) {
                 // Print integers nicely
                 s += format("% 10.04g", v);
             } else {
@@ -68,12 +68,12 @@ std::string Matrix::toString(const std::string& name) const {
                 s += ",";
             } else if (r < rows() - 1) {
                 s += ";\n ";
-			} else {
-				s += "]\n";
-			}
+            } else {
+                s += "]\n";
+            }
         }
     }
-	return s;
+    return s;
 }
 
 
@@ -746,7 +746,7 @@ void Matrix::Impl::inverseViaAdjoint(Impl& out) const {
         det += elt[0][r] * out.elt[r][0];
     }
 
-	out.div(Matrix::T(det), out);
+    out.div(Matrix::T(det), out);
 }
 
 
@@ -848,7 +848,7 @@ Matrix::T Matrix::Impl::determinant() const {
           float cofactor10 = elt[1][2] * elt[2][0] - elt[1][0] * elt[2][2];
           float cofactor20 = elt[1][0] * elt[2][1] - elt[1][1] * elt[2][0];
       
-		  return Matrix::T(
+          return Matrix::T(
             elt[0][0] * cofactor00 +
             elt[0][1] * cofactor10 +
             elt[0][2] * cofactor20);
@@ -897,9 +897,9 @@ Matrix Matrix::pseudoInverse(float tolerance) const {
     nonsingular matrices with at least one small (<5) dimension.
 */
 Matrix Matrix::svdPseudoInverse(float tolerance) const {
-   	if (cols() > rows()) {
-		return transpose().svdPseudoInverse(tolerance).transpose();
-	}
+       if (cols() > rows()) {
+        return transpose().svdPseudoInverse(tolerance).transpose();
+    }
 
     // Matrices from SVD
     Matrix U, V;
@@ -907,32 +907,32 @@ Matrix Matrix::svdPseudoInverse(float tolerance) const {
     // Diagonal elements
     Array<T> d;
 
-	svd(U, d, V);
+    svd(U, d, V);
 
     if (rows() == 1) {
         d.resize(1, false);
     }
 
-	if (tolerance < 0) {
-		// TODO: Should be eps(d[0]), which is the largest diagonal
-		tolerance = G3D::max(rows(), cols()) * 0.0001f;
-	}
+    if (tolerance < 0) {
+        // TODO: Should be eps(d[0]), which is the largest diagonal
+        tolerance = G3D::max(rows(), cols()) * 0.0001f;
+    }
 
-	Matrix X;
+    Matrix X;
 
-	int r = 0;
-	for (int i = 0; i < d.size(); ++i) {
-		if (d[i] > tolerance) {
-			d[i] = Matrix::T(1) / d[i];
-			++r;
-		}
-	}
+    int r = 0;
+    for (int i = 0; i < d.size(); ++i) {
+        if (d[i] > tolerance) {
+            d[i] = Matrix::T(1) / d[i];
+            ++r;
+        }
+    }
 
-	if (r == 0) {
-		// There were no non-zero elements
-		X = zero(cols(), rows());
-	} else {
-		// Use the first r columns
+    if (r == 0) {
+        // There were no non-zero elements
+        X = zero(cols(), rows());
+    } else {
+        // Use the first r columns
         
         // Test code (the rest is below)
         /*
@@ -1003,7 +1003,7 @@ Matrix Matrix::svdPseudoInverse(float tolerance) const {
         debugAssert(n < 0.0001);
         */
     }
-	return X;
+    return X;
 }
 
 // Computes pseudoinverse for a vector
@@ -1426,7 +1426,7 @@ void Matrix::Impl::inverseInPlaceGaussJordan() {
         elt[col][col] = 1.0;
 
         for (int k = 0; k < R; ++k) {
-			elt[col][k] *= Matrix::T(pivotInverse);
+            elt[col][k] *= Matrix::T(pivotInverse);
         }
 
         // Reduce all rows
@@ -1438,7 +1438,7 @@ void Matrix::Impl::inverseInPlaceGaussJordan() {
                 elt[r][col] = 0.0;
 
                 for (int k = 0; k < R; ++k) {
-					elt[r][k] -= Matrix::T(elt[col][k] * oldValue);
+                    elt[r][k] -= Matrix::T(elt[col][k] * oldValue);
                 }
             }
         }
diff --git a/dep/include/g3dlite/G3D/Matrix.h b/dep/g3dlite/G3D/Matrix.h
similarity index 99%
rename from dep/include/g3dlite/G3D/Matrix.h
rename to dep/g3dlite/G3D/Matrix.h
index 3c5394d9a..33bb3f1c4 100644
--- a/dep/include/g3dlite/G3D/Matrix.h
+++ b/dep/g3dlite/G3D/Matrix.h
@@ -576,7 +576,7 @@ public:
     /** Serializes in Matlab source format */
     void serialize(TextOutput& t) const;
 
-	std::string toString(const std::string& name) const;
+    std::string toString(const std::string& name) const;
 
     std::string toString() const {
         static const std::string name = "";
diff --git a/dep/include/g3dlite/G3D/Matrix2.h b/dep/g3dlite/G3D/Matrix2.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Matrix2.h
rename to dep/g3dlite/G3D/Matrix2.h
diff --git a/dep/src/g3dlite/Matrix3.cpp b/dep/g3dlite/G3D/Matrix3.cpp
similarity index 99%
rename from dep/src/g3dlite/Matrix3.cpp
rename to dep/g3dlite/G3D/Matrix3.cpp
index 7e4de9962..947e4667e 100644
--- a/dep/src/g3dlite/Matrix3.cpp
+++ b/dep/g3dlite/G3D/Matrix3.cpp
@@ -116,7 +116,7 @@ bool Matrix3::isOrthonormal() const {
 //----------------------------------------------------------------------------
 Matrix3::Matrix3(const Quat& _q) {
     // Implementation from Watt and Watt, pg 362
-	// See also http://www.flipcode.com/documents/matrfaq.html#Q54
+    // See also http://www.flipcode.com/documents/matrfaq.html#Q54
     Quat q = _q;
     q.unitize();
     float xx = 2.0f * q.x * q.x;
@@ -1046,19 +1046,19 @@ void Matrix3::polarDecomposition(Matrix3 &R, Matrix3 &S) const{
       Xit = tmp.transpose();
       
       if (resid < BigEps) {
-	// close enough use simple iteration
-	X += Xit;
-	X *= 0.5f;
+    // close enough use simple iteration
+    X += Xit;
+    X *= 0.5f;
       }
       else {
-	// not close to convergence, compute acceleration factor
+    // not close to convergence, compute acceleration factor
         float gamma = sqrt( sqrt(
                   (Xit.l1Norm()* Xit.lInfNorm())/(X.l1Norm()*X.lInfNorm()) ) );
 
-	X *= 0.5f * gamma;
-	tmp = Xit;
-	tmp *= 0.5f / gamma;
-	X += tmp;
+    X *= 0.5f * gamma;
+    tmp = Xit;
+    tmp *= 0.5f / gamma;
+    X += tmp;
       }
       
       resid = X.diffOneNorm(Xit);
@@ -1215,7 +1215,7 @@ float Matrix3::l1Norm() const {
       float f = fabs(elt[0][c])+ fabs(elt[1][c]) + fabs(elt[2][c]);
       
       if (f > oneNorm) {
-	oneNorm = f;
+    oneNorm = f;
       }
     }
     return oneNorm;
@@ -1231,7 +1231,7 @@ float Matrix3::lInfNorm() const {
       float f = fabs(elt[r][0]) + fabs(elt[r][1])+ fabs(elt[r][2]);
       
       if (f > infNorm) {
-	infNorm = f;
+    infNorm = f;
       }
     }
     return infNorm;
@@ -1244,10 +1244,10 @@ float Matrix3::diffOneNorm(const Matrix3 &y) const{
     for (int c = 0; c < 3; ++c){
     
       float f = fabs(elt[0][c] - y[0][c]) + fabs(elt[1][c] - y[1][c])
-	+ fabs(elt[2][c] - y[2][c]);
+    + fabs(elt[2][c] - y[2][c]);
       
       if (f > oneNorm) {
-	oneNorm = f;
+    oneNorm = f;
       }
     }
     return oneNorm;
@@ -1922,9 +1922,9 @@ void Matrix3::_transpose(const Matrix3& A, Matrix3& out) {
 //-----------------------------------------------------------------------------
 std::string Matrix3::toString() const {
     return G3D::format("[%g, %g, %g; %g, %g, %g; %g, %g, %g]", 
-			elt[0][0], elt[0][1], elt[0][2],
-			elt[1][0], elt[1][1], elt[1][2],
-			elt[2][0], elt[2][1], elt[2][2]);
+            elt[0][0], elt[0][1], elt[0][2],
+            elt[1][0], elt[1][1], elt[1][2],
+            elt[2][0], elt[2][1], elt[2][2]);
 }
 
 
diff --git a/dep/include/g3dlite/G3D/Matrix3.h b/dep/g3dlite/G3D/Matrix3.h
similarity index 99%
rename from dep/include/g3dlite/G3D/Matrix3.h
rename to dep/g3dlite/G3D/Matrix3.h
index 06ec7e674..0d33b4a1d 100644
--- a/dep/include/g3dlite/G3D/Matrix3.h
+++ b/dep/g3dlite/G3D/Matrix3.h
@@ -62,11 +62,11 @@ public:
              float fEntry10, float fEntry11, float fEntry12,
              float fEntry20, float fEntry21, float fEntry22);
 
-	bool fuzzyEq(const Matrix3& b) const;
+    bool fuzzyEq(const Matrix3& b) const;
 
     /** Constructs a matrix from a quaternion.
         @cite Graphics Gems II, p. 351--354
- 	    @cite Implementation from Watt and Watt, pg 362*/
+         @cite Implementation from Watt and Watt, pg 362*/
     Matrix3(const class Quat& q);
 
     void serialize(class BinaryOutput& b) const;
diff --git a/dep/src/g3dlite/Matrix4.cpp b/dep/g3dlite/G3D/Matrix4.cpp
similarity index 94%
rename from dep/src/g3dlite/Matrix4.cpp
rename to dep/g3dlite/G3D/Matrix4.cpp
index 2ce14f6c5..319911e0a 100644
--- a/dep/src/g3dlite/Matrix4.cpp
+++ b/dep/g3dlite/G3D/Matrix4.cpp
@@ -382,9 +382,9 @@ bool Matrix4::operator==(const Matrix4& other) const {
     // If the bit patterns are identical, they must be
     // the same matrix.  If not, they *might* still have
     // equal elements due to floating point weirdness.
-    if (memcmp(this, &other, sizeof(Matrix4) == 0)) {
+    if (memcmp(this, &other, sizeof(Matrix4)) == 0) {
         return true;
-    } 
+    }
 
     for (int r = 0; r < 4; ++r) {
         for (int c = 0; c < 4; ++c) {
@@ -401,7 +401,7 @@ bool Matrix4::operator==(const Matrix4& other) const {
 float Matrix4::determinant() const {
     // Determinant is the dot product of the first row and the first row
     // of cofactors (i.e. the first col of the adjoint matrix)
-	return cofactor().row(0).dot(row(0));
+    return cofactor().row(0).dot(row(0));
 }
 
 
@@ -417,14 +417,14 @@ Matrix4 Matrix4::inverse() const {
 
     // Determinant is the dot product of the first row and the first row
     // of cofactors (i.e. the first col of the adjoint matrix)
-	float det = A.column(0).dot(row(0));
+    float det = A.column(0).dot(row(0));
 
-	return A * (1.0f / det);
+    return A * (1.0f / det);
 }
 
 
 Matrix4 Matrix4::cofactor() const {
-	Matrix4 out;
+    Matrix4 out;
 
     // We'll use i to incrementally compute -1 ^ (r+c)
     int i = 1;
@@ -482,19 +482,19 @@ float Matrix4::subDeterminant(int excludeRow, int excludeCol) const {
 
 
 CoordinateFrame Matrix4::approxCoordinateFrame() const {
-	CoordinateFrame cframe;
+    CoordinateFrame cframe;
 
-	for (int r = 0; r < 3; ++r) {
-		for (int c = 0; c < 3; ++c) {
-			cframe.rotation[r][c] = elt[r][c];
-		}
-		cframe.translation[r] = elt[r][3];
-	}
+    for (int r = 0; r < 3; ++r) {
+        for (int c = 0; c < 3; ++c) {
+            cframe.rotation[r][c] = elt[r][c];
+        }
+        cframe.translation[r] = elt[r][3];
+    }
 
-	// Ensure that the rotation matrix is orthonormal
-	cframe.rotation.orthonormalize();
+    // Ensure that the rotation matrix is orthonormal
+    cframe.rotation.orthonormalize();
 
-	return cframe;
+    return cframe;
 }
 
 
@@ -517,10 +517,10 @@ void Matrix4::deserialize(class BinaryInput& b) {
 
 std::string Matrix4::toString() const {
     return G3D::format("[%g, %g, %g, %g; %g, %g, %g, %g; %g, %g, %g, %g; %g, %g, %g, %g]", 
-			elt[0][0], elt[0][1], elt[0][2], elt[0][3],
-			elt[1][0], elt[1][1], elt[1][2], elt[1][3],
-			elt[2][0], elt[2][1], elt[2][2], elt[2][3],
-			elt[3][0], elt[3][1], elt[3][2], elt[3][3]);
+            elt[0][0], elt[0][1], elt[0][2], elt[0][3],
+            elt[1][0], elt[1][1], elt[1][2], elt[1][3],
+            elt[2][0], elt[2][1], elt[2][2], elt[2][3],
+            elt[3][0], elt[3][1], elt[3][2], elt[3][3]);
 }
 
 } // namespace
diff --git a/dep/include/g3dlite/G3D/Matrix4.h b/dep/g3dlite/G3D/Matrix4.h
similarity index 98%
rename from dep/include/g3dlite/G3D/Matrix4.h
rename to dep/g3dlite/G3D/Matrix4.h
index 6b810ba77..69a124f88 100644
--- a/dep/include/g3dlite/G3D/Matrix4.h
+++ b/dep/g3dlite/G3D/Matrix4.h
@@ -66,9 +66,9 @@ public:
      */
     Matrix4(const float* init);
     
-	/**
-		a is the upper left 3x3 submatrix and b is the upper right 3x1 submatrix. The last row of the created matrix is (0,0,0,1).
-	*/
+    /**
+        a is the upper left 3x3 submatrix and b is the upper right 3x1 submatrix. The last row of the created matrix is (0,0,0,1).
+    */
     Matrix4(const class Matrix3& upper3x3, const class Vector3& lastCol = Vector3::zero());
 
     Matrix4(const class CoordinateFrame& c);
diff --git a/dep/src/g3dlite/MemoryManager.cpp b/dep/g3dlite/G3D/MemoryManager.cpp
similarity index 100%
rename from dep/src/g3dlite/MemoryManager.cpp
rename to dep/g3dlite/G3D/MemoryManager.cpp
diff --git a/dep/include/g3dlite/G3D/MemoryManager.h b/dep/g3dlite/G3D/MemoryManager.h
similarity index 100%
rename from dep/include/g3dlite/G3D/MemoryManager.h
rename to dep/g3dlite/G3D/MemoryManager.h
diff --git a/dep/src/g3dlite/MeshAlg.cpp b/dep/g3dlite/G3D/MeshAlg.cpp
similarity index 95%
rename from dep/src/g3dlite/MeshAlg.cpp
rename to dep/g3dlite/G3D/MeshAlg.cpp
index 626fed929..7ae99eb5e 100644
--- a/dep/src/g3dlite/MeshAlg.cpp
+++ b/dep/g3dlite/G3D/MeshAlg.cpp
@@ -441,29 +441,29 @@ void MeshAlg::computeBounds(
         const Vector3& vertex = vertexArray[v];
 
         if (vertex.x < xmin.x) {
-    		xmin = vertex;
+            xmin = vertex;
         }
 
         if (vertex.x > xmax.x) {
-    		xmax = vertex;
+            xmax = vertex;
         }
 
         if (vertex.y < ymin.y) {
-    		ymin = vertex;
+            ymin = vertex;
         }
 
         if (vertex.y > ymax.y) {
-		    ymax = vertex;
+            ymax = vertex;
         }
 
         if (vertex.z < zmin.z) {
-		    zmin = vertex;
+            zmin = vertex;
         }
 
         if (vertex.z > zmax.z) {
-		    zmax = vertex;
+            zmax = vertex;
         }
-	}
+    }
 
     // Set points dia1 & dia2 to the maximally separated pair
     Vector3 dia1 = xmin; 
@@ -479,16 +479,16 @@ void MeshAlg::computeBounds(
         double maxspan = xspan;
 
         if (yspan > maxspan) {
-	        maxspan = yspan;
-	        dia1    = ymin;
+            maxspan = yspan;
+            dia1    = ymin;
             dia2    = ymax;
-	    }
+        }
 
         if (zspan > maxspan) {
             maxspan = zspan;
-    	    dia1    = zmin;
+            dia1    = zmin;
             dia2    = zmax;
-	    }
+        }
     }
 
 
@@ -513,39 +513,39 @@ void MeshAlg::computeBounds(
 
         double old_to_p_sq = d.squaredMagnitude();
 
-    	// do r^2 test first 
+        // do r^2 test first 
         if (old_to_p_sq > radSq) {
-		 	// this point is outside of current sphere
-    		old_to_p = sqrt(old_to_p_sq);
+             // this point is outside of current sphere
+            old_to_p = sqrt(old_to_p_sq);
 
-    		// calc radius of new sphere
-		    rad = (rad + old_to_p) / 2.0;
+            // calc radius of new sphere
+            rad = (rad + old_to_p) / 2.0;
 
             // for next r^2 compare
-		    radSq = rad * rad; 	
-		    old_to_new = old_to_p - rad;
+            radSq = rad * rad;     
+            old_to_new = old_to_p - rad;
 
-		    // calc center of new sphere
+            // calc center of new sphere
             center = (rad * center + old_to_new * vertex) / old_to_p;
-		}	
-	}
+        }    
+    }
 
-	const Vector3 min(xmin.x, ymin.y, zmin.z);
-	const Vector3 max(xmax.x, ymax.y, zmax.z);
+    const Vector3 min(xmin.x, ymin.y, zmin.z);
+    const Vector3 max(xmax.x, ymax.y, zmax.z);
 
         box = AABox(min, max);
 
-	const float boxRadSq = (max - min).squaredMagnitude() * 0.25f;
+    const float boxRadSq = (max - min).squaredMagnitude() * 0.25f;
 
-	if (boxRadSq >= radSq){
+    if (boxRadSq >= radSq){
             if (isNaN(center.x) || ! isFinite(rad)) {
                 sphere = Sphere(Vector3::zero(), finf());
             } else {
                 sphere = Sphere(center, rad);
             }
-	} else {
+    } else {
             sphere = Sphere((max + min) * 0.5f, sqrt(boxRadSq));
-	}
+    }
 }
 
 void MeshAlg::computeTangentSpaceBasis(
diff --git a/dep/include/g3dlite/G3D/MeshAlg.h b/dep/g3dlite/G3D/MeshAlg.h
similarity index 100%
rename from dep/include/g3dlite/G3D/MeshAlg.h
rename to dep/g3dlite/G3D/MeshAlg.h
diff --git a/dep/src/g3dlite/MeshAlgAdjacency.cpp b/dep/g3dlite/G3D/MeshAlgAdjacency.cpp
similarity index 100%
rename from dep/src/g3dlite/MeshAlgAdjacency.cpp
rename to dep/g3dlite/G3D/MeshAlgAdjacency.cpp
diff --git a/dep/src/g3dlite/MeshAlgWeld.cpp b/dep/g3dlite/G3D/MeshAlgWeld.cpp
similarity index 100%
rename from dep/src/g3dlite/MeshAlgWeld.cpp
rename to dep/g3dlite/G3D/MeshAlgWeld.cpp
diff --git a/dep/src/g3dlite/MeshBuilder.cpp b/dep/g3dlite/G3D/MeshBuilder.cpp
similarity index 95%
rename from dep/src/g3dlite/MeshBuilder.cpp
rename to dep/g3dlite/G3D/MeshBuilder.cpp
index 1bf2bab5d..c8cd5fbdf 100644
--- a/dep/src/g3dlite/MeshBuilder.cpp
+++ b/dep/g3dlite/G3D/MeshBuilder.cpp
@@ -94,9 +94,9 @@ void MeshBuilder::computeBounds(Vector3& min, Vector3& max) {
 void MeshBuilder::addTriangle(const Vector3& a, const Vector3& b, const Vector3& c) {
     triList.append(a, b, c);
 
-	if (_twoSided) {
-	    triList.append(c, b, a);
-	}
+    if (_twoSided) {
+        triList.append(c, b, a);
+    }
 }
 
 
@@ -107,7 +107,7 @@ void MeshBuilder::addQuad(const Vector3& a, const Vector3& b, const Vector3& c,
 
 
 void MeshBuilder::addTriangle(const Triangle& t) {
-	addTriangle(t.vertex(0), t.vertex(1), t.vertex(2));
+    addTriangle(t.vertex(0), t.vertex(1), t.vertex(2));
 }
 
 } // namespace
diff --git a/dep/include/g3dlite/G3D/MeshBuilder.h b/dep/g3dlite/G3D/MeshBuilder.h
similarity index 94%
rename from dep/include/g3dlite/G3D/MeshBuilder.h
rename to dep/g3dlite/G3D/MeshBuilder.h
index 9920d59d7..56af42215 100644
--- a/dep/include/g3dlite/G3D/MeshBuilder.h
+++ b/dep/g3dlite/G3D/MeshBuilder.h
@@ -43,14 +43,14 @@ private:
     void centerTriList();
     void computeBounds(Vector3& min, Vector3& max);
 
-	bool _twoSided;
+    bool _twoSided;
 
     /** Collapse radius */
     double close;
 
 public:
 
-	inline MeshBuilder(bool twoSided = false) : _twoSided(twoSided), close(AUTO_WELD) {}
+    inline MeshBuilder(bool twoSided = false) : _twoSided(twoSided), close(AUTO_WELD) {}
 
     /** Writes the model to the arrays, which can then be used with
         G3D::IFSModel::save and G3D::MeshAlg */
diff --git a/dep/src/g3dlite/NetAddress.cpp b/dep/g3dlite/G3D/NetAddress.cpp
similarity index 98%
rename from dep/src/g3dlite/NetAddress.cpp
rename to dep/g3dlite/G3D/NetAddress.cpp
index 64d692d47..e636c3a83 100644
--- a/dep/src/g3dlite/NetAddress.cpp
+++ b/dep/g3dlite/G3D/NetAddress.cpp
@@ -77,7 +77,7 @@ void NetAddress::init(
         addr = inet_addr(hostname.c_str());
     }
 
-	// The address wasn't in numeric form, resolve it
+    // The address wasn't in numeric form, resolve it
     if (addr == INADDR_NONE) {
         // Get the IP address of the server and store it in host
         struct hostent* host = gethostbyname(hostname.c_str());
diff --git a/dep/include/g3dlite/G3D/NetAddress.h b/dep/g3dlite/G3D/NetAddress.h
similarity index 97%
rename from dep/include/g3dlite/G3D/NetAddress.h
rename to dep/g3dlite/G3D/NetAddress.h
index fd5a19959..63fb819dc 100644
--- a/dep/include/g3dlite/G3D/NetAddress.h
+++ b/dep/g3dlite/G3D/NetAddress.h
@@ -95,7 +95,7 @@ namespace G3D {
  they have different IP's.
  */
 inline bool operator==(const NetAddress& a, const NetAddress& b) {
-	return (a.ip() == b.ip()) && (a.port() == b.port());
+    return (a.ip() == b.ip()) && (a.port() == b.port());
 }
 
 
diff --git a/dep/src/g3dlite/NetworkDevice.cpp b/dep/g3dlite/G3D/NetworkDevice.cpp
similarity index 99%
rename from dep/src/g3dlite/NetworkDevice.cpp
rename to dep/g3dlite/G3D/NetworkDevice.cpp
index 1fc794479..49f5030b0 100644
--- a/dep/src/g3dlite/NetworkDevice.cpp
+++ b/dep/g3dlite/G3D/NetworkDevice.cpp
@@ -250,7 +250,7 @@ bool NetworkDevice::init() {
 
     logPrintf("Network Startup");
     logPrintf("Starting WinSock networking.\n");
-    WSADATA wsda;		    
+    WSADATA wsda;            
     WSAStartup(MAKEWORD(G3D_WINSOCK_MAJOR_VERSION, G3D_WINSOCK_MINOR_VERSION), &wsda);
         
     std::string hostname = "localhost";
diff --git a/dep/include/g3dlite/G3D/NetworkDevice.h b/dep/g3dlite/G3D/NetworkDevice.h
similarity index 98%
rename from dep/include/g3dlite/G3D/NetworkDevice.h
rename to dep/g3dlite/G3D/NetworkDevice.h
index 7a3f8ed4a..049fff105 100644
--- a/dep/include/g3dlite/G3D/NetworkDevice.h
+++ b/dep/g3dlite/G3D/NetworkDevice.h
@@ -512,13 +512,13 @@ public:
     bool receive(NetAddress& sender);
 
     template<typename T> inline bool receive(NetAddress& sender, T& message) {
-		bool r = receive(sender);
-		if (r) {
-			BinaryInput b((messageBuffer.getCArray() + 4), 
-						  messageBuffer.size() - 4, 
-						  G3D_LITTLE_ENDIAN, BinaryInput::NO_COPY);
-			message.deserialize(b);
-		}
+        bool r = receive(sender);
+        if (r) {
+            BinaryInput b((messageBuffer.getCArray() + 4), 
+                          messageBuffer.size() - 4, 
+                          G3D_LITTLE_ENDIAN, BinaryInput::NO_COPY);
+            message.deserialize(b);
+        }
 
         return r;
     }
diff --git a/dep/include/g3dlite/G3D/ParseError.h b/dep/g3dlite/G3D/ParseError.h
similarity index 100%
rename from dep/include/g3dlite/G3D/ParseError.h
rename to dep/g3dlite/G3D/ParseError.h
diff --git a/dep/src/g3dlite/PhysicsFrame.cpp b/dep/g3dlite/G3D/PhysicsFrame.cpp
similarity index 100%
rename from dep/src/g3dlite/PhysicsFrame.cpp
rename to dep/g3dlite/G3D/PhysicsFrame.cpp
diff --git a/dep/include/g3dlite/G3D/PhysicsFrame.h b/dep/g3dlite/G3D/PhysicsFrame.h
similarity index 100%
rename from dep/include/g3dlite/G3D/PhysicsFrame.h
rename to dep/g3dlite/G3D/PhysicsFrame.h
diff --git a/dep/src/g3dlite/PhysicsFrameSpline.cpp b/dep/g3dlite/G3D/PhysicsFrameSpline.cpp
similarity index 100%
rename from dep/src/g3dlite/PhysicsFrameSpline.cpp
rename to dep/g3dlite/G3D/PhysicsFrameSpline.cpp
diff --git a/dep/include/g3dlite/G3D/PhysicsFrameSpline.h b/dep/g3dlite/G3D/PhysicsFrameSpline.h
similarity index 100%
rename from dep/include/g3dlite/G3D/PhysicsFrameSpline.h
rename to dep/g3dlite/G3D/PhysicsFrameSpline.h
diff --git a/dep/src/g3dlite/Plane.cpp b/dep/g3dlite/G3D/Plane.cpp
similarity index 95%
rename from dep/src/g3dlite/Plane.cpp
rename to dep/g3dlite/G3D/Plane.cpp
index 9b7991c03..81d5a7bbd 100644
--- a/dep/src/g3dlite/Plane.cpp
+++ b/dep/g3dlite/G3D/Plane.cpp
@@ -16,19 +16,19 @@
 namespace G3D {
 
 Plane::Plane(class BinaryInput& b) {
-	deserialize(b);
+    deserialize(b);
 }
 
 
 void Plane::serialize(class BinaryOutput& b) const {
-	_normal.serialize(b);
-	b.writeFloat64(_distance);
+    _normal.serialize(b);
+    b.writeFloat64(_distance);
 }
 
 
 void Plane::deserialize(class BinaryInput& b) {
-	_normal.deserialize(b);
-	_distance = (float)b.readFloat64();
+    _normal.deserialize(b);
+    _distance = (float)b.readFloat64();
 }
 
 
diff --git a/dep/include/g3dlite/G3D/Plane.h b/dep/g3dlite/G3D/Plane.h
similarity index 92%
rename from dep/include/g3dlite/G3D/Plane.h
rename to dep/g3dlite/G3D/Plane.h
index 360bcd2bc..b40fd55bf 100644
--- a/dep/include/g3dlite/G3D/Plane.h
+++ b/dep/g3dlite/G3D/Plane.h
@@ -26,8 +26,8 @@ class Plane {
 private:
 
     /** normal.Dot(x,y,z) = distance */
-    Vector3						_normal;
-    float						_distance;
+    Vector3                        _normal;
+    float                        _distance;
 
     /**
      Assumes the normal has unit length.
@@ -66,9 +66,9 @@ public:
 
     static Plane fromEquation(float a, float b, float c, float d);
 
-	Plane(class BinaryInput& b);
-	void serialize(class BinaryOutput& b) const;
-	void deserialize(class BinaryInput& b);
+    Plane(class BinaryInput& b);
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
 
     virtual ~Plane() {}
 
@@ -113,9 +113,9 @@ public:
         return fuzzyEq(point.dot(_normal), _distance);
     }
 
-	inline const Vector3& normal() const {
-		return _normal;
-	}
+    inline const Vector3& normal() const {
+        return _normal;
+    }
 
     /**
       Returns distance from point to plane. Distance is negative if point is behind (not in plane in direction opposite normal) the plane.
diff --git a/dep/include/g3dlite/G3D/PointHashGrid.h b/dep/g3dlite/G3D/PointHashGrid.h
similarity index 99%
rename from dep/include/g3dlite/G3D/PointHashGrid.h
rename to dep/g3dlite/G3D/PointHashGrid.h
index d0b60a88a..ed20fb844 100644
--- a/dep/include/g3dlite/G3D/PointHashGrid.h
+++ b/dep/g3dlite/G3D/PointHashGrid.h
@@ -72,8 +72,8 @@ private:
     /** A value annotated with precomputed position and hash code.*/
     class Entry {
     public:
-        Vector3			 position;
-        Value			 value;
+        Vector3             position;
+        Value             value;
     };
 
     /** One cell of the grid. */
@@ -197,7 +197,7 @@ public:
        about 5 values in each grid cell (which means about 27 * 5 
        values for each beginIntersection call).
     */
-    PointHashGrid(const Array<Value>& init, float radiusHint = -1.0f, const MemoryManager::Ref& m = MemoryManager::create()) : m_size(0), m_memoryManager(m) {		
+    PointHashGrid(const Array<Value>& init, float radiusHint = -1.0f, const MemoryManager::Ref& m = MemoryManager::create()) : m_size(0), m_memoryManager(m) {        
         initOffsetArray();
         m_data.clearAndSetMemoryManager(m_memoryManager);
 
@@ -677,13 +677,13 @@ public:
             m_isEnd(false),
             m_sphere(sphere),
             m_boxIterator(grid, false, getBoundingBox(sphere)) {
-			
+            
             // Find the first element that is actually in the sphere,
             // not just the box.
             advance();
         }
 
-        const Value& value() const {			
+        const Value& value() const {            
             return *m_boxIterator;
         }
 
@@ -710,7 +710,7 @@ public:
             return !(*this != other);
         }
 
-	
+    
 
         /** Preincrement */
         SphereIterator& operator++() {
@@ -760,7 +760,7 @@ public:
 
        Example:
        <pre>
-       for(PointHashGrid<Vector3>::CellIterator iter = grid.beginCells(); iter != grid.endCells(); ++iter) {	
+       for(PointHashGrid<Vector3>::CellIterator iter = grid.beginCells(); iter != grid.endCells(); ++iter) {    
        entriesFound += iter->size();
        }
        </pre>
@@ -897,7 +897,7 @@ public:
         This is a helper to avoid requiring you to iterate through the data 
         structure, removing and deleting each one. Clears the PointHashGrid at the
         end.
-		
+        
         Using objects (instead of pointers) or reference counted pointers is 
         recommended over using pointers and this deleteAll method.*/
     void deleteAll() {
diff --git a/dep/include/g3dlite/G3D/PointKDTree.h b/dep/g3dlite/G3D/PointKDTree.h
similarity index 91%
rename from dep/include/g3dlite/G3D/PointKDTree.h
rename to dep/g3dlite/G3D/PointKDTree.h
index 151cbd5f2..95443b861 100644
--- a/dep/include/g3dlite/G3D/PointKDTree.h
+++ b/dep/g3dlite/G3D/PointKDTree.h
@@ -234,36 +234,36 @@ protected:
         }
 
 
-	    void verifyNode(const Vector3& lo, const Vector3& hi) {
-            //		debugPrintf("Verifying: split %d @ %f [%f, %f, %f], [%f, %f, %f]\n",
-            //			    splitAxis, splitLocation, lo.x, lo.y, lo.z, hi.x, hi.y, hi.z);
+        void verifyNode(const Vector3& lo, const Vector3& hi) {
+            //        debugPrintf("Verifying: split %d @ %f [%f, %f, %f], [%f, %f, %f]\n",
+            //                splitAxis, splitLocation, lo.x, lo.y, lo.z, hi.x, hi.y, hi.z);
 
             debugAssert(lo == splitBounds.low());
             debugAssert(hi == splitBounds.high());
 
-		    for (int i = 0; i < valueArray.length(); ++i) {
-			    const Vector3& b = valueArray[i].position();
+            for (int i = 0; i < valueArray.length(); ++i) {
+                const Vector3& b = valueArray[i].position();
                 debugAssert(splitBounds.contains(b));
-		    }
+            }
 
-		    if (child[0] || child[1]) {
-			    debugAssert(lo[splitAxis] < splitLocation);
-			    debugAssert(hi[splitAxis] > splitLocation);
-		    }
+            if (child[0] || child[1]) {
+                debugAssert(lo[splitAxis] < splitLocation);
+                debugAssert(hi[splitAxis] > splitLocation);
+            }
 
-		    Vector3 newLo = lo;
-		    newLo[splitAxis] = splitLocation;
-		    Vector3 newHi = hi;
-		    newHi[splitAxis] = splitLocation;
+            Vector3 newLo = lo;
+            newLo[splitAxis] = splitLocation;
+            Vector3 newHi = hi;
+            newHi[splitAxis] = splitLocation;
 
-		    if (child[0] != NULL) {
-			    child[0]->verifyNode(lo, newHi);
-		    }
+            if (child[0] != NULL) {
+                child[0]->verifyNode(lo, newHi);
+            }
 
-		    if (child[1] != NULL) {
-			    child[1]->verifyNode(newLo, hi);
-		    }
-	    }
+            if (child[1] != NULL) {
+                child[1]->verifyNode(newLo, hi);
+            }
+        }
 
 
         /**
@@ -525,10 +525,10 @@ protected:
             for(int i = 0; i < node->valueArray.size(); ++i) {
                 memberTable.set(node->valueArray[i].value, node);
             }
-		    
-	    }
-	    
-	    return node;
+            
+        }
+        
+        return node;
     }
 
     /**
@@ -960,51 +960,51 @@ public:
         BoxIntersectionIterator& operator++() {
             ++nextValueArrayIndex;
 
-			bool foundIntersection = false;
+            bool foundIntersection = false;
             while (! isEnd && ! foundIntersection) {
 
-				// Search for the next node if we've exhausted this one
+                // Search for the next node if we've exhausted this one
                 while ((! isEnd) &&  (nextValueArrayIndex >= node->valueArray.length())) {
-					// If we entered this loop, then the iterator has exhausted the elements at 
-					// node (possibly because it just switched to a child node with no members).
-					// This loop continues until it finds a node with members or reaches
-					// the end of the whole intersection search.
+                    // If we entered this loop, then the iterator has exhausted the elements at 
+                    // node (possibly because it just switched to a child node with no members).
+                    // This loop continues until it finds a node with members or reaches
+                    // the end of the whole intersection search.
 
-					// If the right child overlaps the box, push it onto the stack for
-					// processing.
-					if ((node->child[1] != NULL) &&
-						(box.high()[node->splitAxis] > node->splitLocation)) {
-						stack.push(node->child[1]);
-					}
+                    // If the right child overlaps the box, push it onto the stack for
+                    // processing.
+                    if ((node->child[1] != NULL) &&
+                        (box.high()[node->splitAxis] > node->splitLocation)) {
+                        stack.push(node->child[1]);
+                    }
                 
-					// If the left child overlaps the box, push it onto the stack for
-					// processing.
-					if ((node->child[0] != NULL) &&
-						(box.low()[node->splitAxis] < node->splitLocation)) {
-						stack.push(node->child[0]);
-					}
+                    // If the left child overlaps the box, push it onto the stack for
+                    // processing.
+                    if ((node->child[0] != NULL) &&
+                        (box.low()[node->splitAxis] < node->splitLocation)) {
+                        stack.push(node->child[0]);
+                    }
 
-					if (stack.length() > 0) {
-						// Go on to the next node (which may be either one of the ones we 
-						// just pushed, or one from farther back the tree).
-						node = stack.pop();
-						nextValueArrayIndex = 0;
-					} else {
-						// That was the last node; we're done iterating
-						isEnd = true;
-					}
-				}
+                    if (stack.length() > 0) {
+                        // Go on to the next node (which may be either one of the ones we 
+                        // just pushed, or one from farther back the tree).
+                        node = stack.pop();
+                        nextValueArrayIndex = 0;
+                    } else {
+                        // That was the last node; we're done iterating
+                        isEnd = true;
+                    }
+                }
 
-				// Search for the next intersection at this node until we run out of children
-				while (! isEnd && ! foundIntersection && (nextValueArrayIndex < node->valueArray.length())) {
-					if (box.intersects(node->valueArray[nextValueArrayIndex].bounds)) {
-						foundIntersection = true;
-					} else {
-						++nextValueArrayIndex;
-						// If we exhaust this node, we'll loop around the master loop 
-						// to find a new node.
-					}
-				}
+                // Search for the next intersection at this node until we run out of children
+                while (! isEnd && ! foundIntersection && (nextValueArrayIndex < node->valueArray.length())) {
+                    if (box.intersects(node->valueArray[nextValueArrayIndex].bounds)) {
+                        foundIntersection = true;
+                    } else {
+                        ++nextValueArrayIndex;
+                        // If we exhaust this node, we'll loop around the master loop 
+                        // to find a new node.
+                    }
+                }
             }
 
             return *this;
diff --git a/dep/include/g3dlite/G3D/Pointer.h b/dep/g3dlite/G3D/Pointer.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Pointer.h
rename to dep/g3dlite/G3D/Pointer.h
diff --git a/dep/include/g3dlite/G3D/PositionTrait.h b/dep/g3dlite/G3D/PositionTrait.h
similarity index 100%
rename from dep/include/g3dlite/G3D/PositionTrait.h
rename to dep/g3dlite/G3D/PositionTrait.h
diff --git a/dep/src/g3dlite/PrecomputedRandom.cpp b/dep/g3dlite/G3D/PrecomputedRandom.cpp
similarity index 100%
rename from dep/src/g3dlite/PrecomputedRandom.cpp
rename to dep/g3dlite/G3D/PrecomputedRandom.cpp
diff --git a/dep/include/g3dlite/G3D/PrecomputedRandom.h b/dep/g3dlite/G3D/PrecomputedRandom.h
similarity index 100%
rename from dep/include/g3dlite/G3D/PrecomputedRandom.h
rename to dep/g3dlite/G3D/PrecomputedRandom.h
diff --git a/dep/src/g3dlite/Quat.cpp b/dep/g3dlite/G3D/Quat.cpp
similarity index 95%
rename from dep/src/g3dlite/Quat.cpp
rename to dep/g3dlite/G3D/Quat.cpp
index e06483b44..8ed5cddeb 100644
--- a/dep/src/g3dlite/Quat.cpp
+++ b/dep/g3dlite/G3D/Quat.cpp
@@ -50,45 +50,45 @@ Quat::Quat(const Matrix3& rot) {
     static const int plus1mod3[] = {1, 2, 0};
 
     // Find the index of the largest diagonal component
-	// These ? operations hopefully compile to conditional
-	// move instructions instead of branches.
+    // These ? operations hopefully compile to conditional
+    // move instructions instead of branches.
     int i = (rot[1][1] > rot[0][0]) ? 1 : 0;
     i = (rot[2][2] > rot[i][i]) ? 2 : i;
 
-	// Find the indices of the other elements
+    // Find the indices of the other elements
     int j = plus1mod3[i];
     int k = plus1mod3[j];
 
-	// Index the elements of the vector part of the quaternion as a float*
+    // Index the elements of the vector part of the quaternion as a float*
     float* v = (float*)(this);
 
-	// If we attempted to pre-normalize and trusted the matrix to be
-	// perfectly orthonormal, the result would be:
-	//
+    // If we attempted to pre-normalize and trusted the matrix to be
+    // perfectly orthonormal, the result would be:
+    //
     //   double c = sqrt((rot[i][i] - (rot[j][j] + rot[k][k])) + 1.0)
     //   v[i] = -c * 0.5
     //   v[j] = -(rot[i][j] + rot[j][i]) * 0.5 / c
     //   v[k] = -(rot[i][k] + rot[k][i]) * 0.5 / c
     //   w    =  (rot[j][k] - rot[k][j]) * 0.5 / c
-	//
-	// Since we're going to pay the sqrt anyway, we perform a post normalization, which also
-	// fixes any poorly normalized input.  Multiply all elements by 2*c in the above, giving:
+    //
+    // Since we're going to pay the sqrt anyway, we perform a post normalization, which also
+    // fixes any poorly normalized input.  Multiply all elements by 2*c in the above, giving:
 
-	// nc2 = -c^2
+    // nc2 = -c^2
     double nc2 = ((rot[j][j] + rot[k][k]) - rot[i][i]) - 1.0;
     v[i] =  nc2;
     w    =  (rot[j][k] - rot[k][j]);
     v[j] = -(rot[i][j] + rot[j][i]);
     v[k] = -(rot[i][k] + rot[k][i]);
 
-	// We now have the correct result with the wrong magnitude, so normalize it:
+    // We now have the correct result with the wrong magnitude, so normalize it:
     float s = sqrt(x*x + y*y + z*z + w*w);
     if (s > 0.00001f) {
-	    s = 1.0f / s;
-	    x *= s;
-	    y *= s;
-	    z *= s;
-	    w *= s;
+        s = 1.0f / s;
+        x *= s;
+        y *= s;
+        z *= s;
+        w *= s;
     } else {
         // The quaternion is nearly zero.  Make it 0 0 0 1
         x = 0.0f;
@@ -116,25 +116,25 @@ void Quat::toAxisAngleRotation(
 
     // Reduce the range of the angle.
 
-    if (angle < 0) {		
-		angle = -angle;
-		axis = -axis;
+    if (angle < 0) {        
+        angle = -angle;
+        axis = -axis;
     }
 
-	while (angle > twoPi()) {
+    while (angle > twoPi()) {
         angle -= twoPi();
     }
 
-	if (abs(angle) > pi()) {
-		angle -= twoPi();
+    if (abs(angle) > pi()) {
+        angle -= twoPi();
     }
 
     // Make the angle positive.
 
-	if (angle < 0.0f) {		
-		angle = -angle;
+    if (angle < 0.0f) {        
+        angle = -angle;
         axis = -axis;
-	}
+    }
 }
 
 
@@ -161,10 +161,10 @@ Quat Quat::slerp(
 
     // From: Game Physics -- David Eberly pg 538-540
     // Modified to include lerp for small angles, which
-	// is a common practice.
+    // is a common practice.
 
-	// See also:
-	// http://number-none.com/product/Understanding%20Slerp,%20Then%20Not%20Using%20It/index.html
+    // See also:
+    // http://number-none.com/product/Understanding%20Slerp,%20Then%20Not%20Using%20It/index.html
 
     const Quat& quat0 = *this;
     Quat quat1 = _quat1;
@@ -194,7 +194,7 @@ Quat Quat::slerp(
         return ( (quat0 * scale0) + (quat1 * scale1) ) / sin(phi);
     } else {
         // For small angles, linear interpolate
-		return quat0.nlerp(quat1, alpha);
+        return quat0.nlerp(quat1, alpha);
     }
 }
 
@@ -204,7 +204,7 @@ Quat Quat::nlerp(
     float               alpha) const {
 
     Quat result = (*this) * (1.0f - alpha) + quat1 * alpha;
-	return result / result.magnitude();
+    return result / result.magnitude();
 }
 
 
diff --git a/dep/include/g3dlite/G3D/Quat.h b/dep/g3dlite/G3D/Quat.h
similarity index 97%
rename from dep/include/g3dlite/G3D/Quat.h
rename to dep/g3dlite/G3D/Quat.h
index d8fdfafec..dc7951baa 100644
--- a/dep/include/g3dlite/G3D/Quat.h
+++ b/dep/g3dlite/G3D/Quat.h
@@ -92,9 +92,9 @@ public:
         return w;
     }
 
-	Quat operator-() const {
-		return Quat(-x, -y, -z, -w);
-	}
+    Quat operator-() const {
+        return Quat(-x, -y, -z, -w);
+    }
 
     Quat operator-(const Quat& other) const {
         return Quat(x - other.x, y - other.y, z - other.z, w - other.w);
@@ -148,7 +148,7 @@ public:
     }
 
 
-	/** @cite Based on Watt & Watt, page 360 */
+    /** @cite Based on Watt & Watt, page 360 */
     friend Quat operator* (float s, const Quat& q);
 
     inline Quat operator/(float s) const {
@@ -196,10 +196,10 @@ public:
     void toAxisAngleRotation(
         Vector3&            axis,
         float&              angle) const {
-		double d;
-		toAxisAngleRotation(axis, d);
-		angle = (float)d;
-	}
+        double d;
+        toAxisAngleRotation(axis, d);
+        angle = (float)d;
+    }
 
     Matrix3 toRotationMatrix() const;
 
@@ -214,16 +214,16 @@ public:
 
      @cite Based on Game Physics -- David Eberly pg 538-540
      @param threshold Critical angle between between rotations at which
-	        the algorithm switches to normalized lerp, which is more
-			numerically stable in those situations. 0.0 will always slerp. 
+            the algorithm switches to normalized lerp, which is more
+            numerically stable in those situations. 0.0 will always slerp. 
      */
     Quat slerp(
         const Quat&         other,
         float               alpha,
         float               threshold = 0.05f) const;
 
-	/** Normalized linear interpolation of quaternion components. */
-	Quat nlerp(const Quat& other, float alpha) const;
+    /** Normalized linear interpolation of quaternion components. */
+    Quat nlerp(const Quat& other, float alpha) const;
 
 
 
@@ -348,7 +348,7 @@ public:
     float& operator[] (int i);
 
     /** Generate uniform random unit quaternion (i.e. random "direction") 
-	@cite From "Uniform Random Rotations", Ken Shoemake, Graphics Gems III.
+    @cite From "Uniform Random Rotations", Ken Shoemake, Graphics Gems III.
    */
     static Quat unitRandom();
 
diff --git a/dep/include/g3dlite/G3D/Queue.h b/dep/g3dlite/G3D/Queue.h
similarity index 99%
rename from dep/include/g3dlite/G3D/Queue.h
rename to dep/g3dlite/G3D/Queue.h
index 36573265d..625157328 100644
--- a/dep/include/g3dlite/G3D/Queue.h
+++ b/dep/g3dlite/G3D/Queue.h
@@ -346,7 +346,7 @@ public:
         FIND_ENDS;
         
         int i;
-    	for (i = 0; i < secondEnd; ++i) {
+        for (i = 0; i < secondEnd; ++i) {
             delete data[i];
         }
 
diff --git a/dep/src/g3dlite/Random.cpp b/dep/g3dlite/G3D/Random.cpp
similarity index 100%
rename from dep/src/g3dlite/Random.cpp
rename to dep/g3dlite/G3D/Random.cpp
diff --git a/dep/include/g3dlite/G3D/Random.h b/dep/g3dlite/G3D/Random.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Random.h
rename to dep/g3dlite/G3D/Random.h
diff --git a/dep/g3dlite/G3D/Ray.cpp b/dep/g3dlite/G3D/Ray.cpp
new file mode 100644
index 000000000..a96101c76
--- /dev/null
+++ b/dep/g3dlite/G3D/Ray.cpp
@@ -0,0 +1,218 @@
+/**
+ @file Ray.cpp 
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2002-07-12
+ @edited  2004-03-19
+ */
+
+#include "G3D/platform.h"
+#include "G3D/Ray.h"
+#include "G3D/Plane.h"
+#include "G3D/Sphere.h"
+#include "G3D/CollisionDetection.h"
+
+namespace G3D {
+
+void Ray::set(const Vector3& origin, const Vector3& direction) {
+    m_origin = origin;
+    m_direction = direction;
+    debugAssert(direction.isUnit());
+
+    m_invDirection = Vector3::one() / direction;
+
+    // ray slope
+    ibyj = m_direction.x * m_invDirection.y;
+    jbyi = m_direction.y * m_invDirection.x;
+    jbyk = m_direction.y * m_invDirection.z;
+    kbyj = m_direction.z * m_invDirection.y;
+    ibyk = m_direction.x * m_invDirection.z;
+    kbyi = m_direction.z * m_invDirection.x;
+
+    // precomputed terms
+    c_xy = m_origin.y - jbyi * m_origin.x;
+    c_xz = m_origin.z - kbyi * m_origin.x;
+    c_yx = m_origin.x - ibyj * m_origin.y;
+    c_yz = m_origin.z - kbyj * m_origin.y;
+    c_zx = m_origin.x - ibyk * m_origin.z;
+    c_zy = m_origin.y - jbyk * m_origin.z;    
+
+    //ray slope classification
+    if (m_direction.x < 0) {
+        if (m_direction.y < 0) {
+            if (m_direction.z < 0) {
+                classification = MMM;
+            } else if (m_direction.z > 0) {
+                classification = MMP;
+            } else { //(m_direction.z >= 0)
+                classification = MMO;
+            }
+        } else { //(m_direction.y >= 0)
+            if (m_direction.z < 0) {
+                if (m_direction.y == 0) {
+                    classification = MOM;
+                } else {
+                    classification = MPM;
+                }
+            } else { //(m_direction.z >= 0)
+                if ((m_direction.y == 0) && (m_direction.z == 0)) {
+                    classification = MOO;
+                } else if (m_direction.z == 0) {
+                    classification = MPO;
+                } else if (m_direction.y == 0) {
+                    classification = MOP;
+                } else {
+                    classification = MPP;
+                }
+            }
+        }
+    } else { //(m_direction.x >= 0)
+        if (m_direction.y < 0) {
+            if (m_direction.z < 0) {
+                if (m_direction.x == 0) {
+                    classification = OMM;
+                } else {
+                    classification = PMM;
+                }
+            } else { //(m_direction.z >= 0)
+                if ((m_direction.x == 0) && (m_direction.z == 0)) {
+                    classification = OMO;
+                } else if (m_direction.z == 0) {
+                    classification = PMO;
+                } else if (m_direction.x == 0) {
+                    classification = OMP;
+                } else {
+                    classification = PMP;
+                }
+            }
+        } else { //(m_direction.y >= 0)
+            if (m_direction.z < 0) {
+                if ((m_direction.x == 0) && (m_direction.y == 0)) {
+                    classification = OOM;
+                } else if (m_direction.x == 0) {
+                    classification = OPM;
+                } else if (m_direction.y == 0) {
+                    classification = POM;
+                } else {
+                    classification = PPM;
+                }
+            } else { //(m_direction.z > 0)
+                if (m_direction.x == 0) {
+                    if (m_direction.y == 0) {
+                        classification = OOP;
+                    } else if (m_direction.z == 0) {
+                        classification = OPO;
+                    } else {
+                        classification = OPP;
+                    }
+                } else {
+                    if ((m_direction.y == 0) && (m_direction.z == 0)) {
+                        classification = POO;
+                    } else if (m_direction.y == 0) {
+                        classification = POP;
+                    } else if (m_direction.z == 0) {
+                        classification = PPO;
+                    } else {
+                        classification = PPP;
+                    }
+                }
+            }            
+        }
+    }
+}
+
+Ray::Ray(class BinaryInput& b) {
+    deserialize(b);
+}
+
+
+void Ray::serialize(class BinaryOutput& b) const {
+    m_origin.serialize(b);
+    m_direction.serialize(b);
+}
+
+
+void Ray::deserialize(class BinaryInput& b) {
+    m_origin.deserialize(b);
+    m_direction.deserialize(b);
+    set(m_origin, m_direction);
+}
+
+
+Ray Ray::refract(
+    const Vector3&  newOrigin,
+    const Vector3&  normal,
+    float           iInside,
+    float           iOutside) const {
+
+    Vector3 D = m_direction.refractionDirection(normal, iInside, iOutside);
+    return Ray(newOrigin + (m_direction + normal * (float)sign(m_direction.dot(normal))) * 0.001f, D);
+}
+
+
+Ray Ray::reflect(
+    const Vector3&  newOrigin,
+    const Vector3&  normal) const {
+
+    Vector3 D = m_direction.reflectionDirection(normal);
+    return Ray(newOrigin + (D + normal) * 0.001f, D);
+}
+
+
+Vector3 Ray::intersection(const Plane& plane) const {
+    float d;
+    Vector3 normal = plane.normal();
+    plane.getEquation(normal, d);
+    float rate = m_direction.dot(normal);
+
+    if (rate >= 0.0f) {
+        return Vector3::inf();
+    } else {
+        float t = -(d + m_origin.dot(normal)) / rate;
+        return m_origin + m_direction * t;
+    }
+}
+
+
+float Ray::intersectionTime(const class Sphere& sphere, bool solid) const {
+    Vector3 dummy;
+    return CollisionDetection::collisionTimeForMovingPointFixedSphere(
+            m_origin, m_direction, sphere, dummy, dummy, solid);
+}
+
+
+float Ray::intersectionTime(const class Plane& plane) const {
+    Vector3 dummy;
+    return CollisionDetection::collisionTimeForMovingPointFixedPlane(
+            m_origin, m_direction, plane, dummy);
+}
+
+
+float Ray::intersectionTime(const class Box& box) const {
+    Vector3 dummy;
+    float time = CollisionDetection::collisionTimeForMovingPointFixedBox(
+            m_origin, m_direction, box, dummy);
+
+    if ((time == finf()) && (box.contains(m_origin))) {
+        return 0.0f;
+    } else {
+        return time;
+    }
+}
+
+
+float Ray::intersectionTime(const class AABox& box) const {
+    Vector3 dummy;
+    bool inside;
+    float time = CollisionDetection::collisionTimeForMovingPointFixedAABox(
+            m_origin, m_direction, box, dummy, inside);
+
+    if ((time == finf()) && inside) {
+        return 0.0f;
+    } else {
+        return time;
+    }
+}
+
+}
diff --git a/dep/include/g3dlite/G3D/Ray.h b/dep/g3dlite/G3D/Ray.h
similarity index 80%
rename from dep/include/g3dlite/G3D/Ray.h
rename to dep/g3dlite/G3D/Ray.h
index 80df5828a..b725d4cfe 100644
--- a/dep/include/g3dlite/G3D/Ray.h
+++ b/dep/g3dlite/G3D/Ray.h
@@ -25,56 +25,56 @@ class Ray {
 private:
     friend class Intersect;
 
-	Vector3			m_origin;
+    Vector3            m_origin;
 
-	/** Unit length */
-	Vector3			m_direction;
+    /** Unit length */
+    Vector3            m_direction;
 
-	/** 1.0 / direction */
-	Vector3         m_invDirection;
+    /** 1.0 / direction */
+    Vector3         m_invDirection;
 
 
-	// The following are for the "ray slope" optimization from
-	//  "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
-	//  by Martin Eisemann, Thorsten Grosch, Stefan Müller and Marcus Magnor
-	//  Computer Graphics Lab, TU Braunschweig, Germany and
-	//  University of Koblenz-Landau, Germany*/
-	enum Classification {MMM, MMP, MPM, MPP, PMM, PMP, PPM, PPP, POO, MOO, OPO, OMO, OOP, OOM, OMM, OMP, OPM, OPP, MOM, MOP, POM, POP, MMO, MPO, PMO, PPO};	Classification classification;
-	// ray slope
-	float ibyj, jbyi, kbyj, jbyk, ibyk, kbyi;
-	// Precomputed components
-	float c_xy, c_xz, c_yx, c_yz, c_zx, c_zy;
+    // The following are for the "ray slope" optimization from
+    //  "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
+    //  by Martin Eisemann, Thorsten Grosch, Stefan Müller and Marcus Magnor
+    //  Computer Graphics Lab, TU Braunschweig, Germany and
+    //  University of Koblenz-Landau, Germany*/
+    enum Classification {MMM, MMP, MPM, MPP, PMM, PMP, PPM, PPP, POO, MOO, OPO, OMO, OOP, OOM, OMM, OMP, OPM, OPP, MOM, MOP, POM, POP, MMO, MPO, PMO, PPO};    Classification classification;
+    // ray slope
+    float ibyj, jbyi, kbyj, jbyk, ibyk, kbyi;
+    // Precomputed components
+    float c_xy, c_xz, c_yx, c_yz, c_zx, c_zy;
 
 public:
 
-	void set(const Vector3& origin, const Vector3& direction);
+    void set(const Vector3& origin, const Vector3& direction);
 
-	inline const Vector3& origin() const {
-		return m_origin;
-	}
+    inline const Vector3& origin() const {
+        return m_origin;
+    }
 
-	/** Unit direction vector. */
-	inline const Vector3& direction() const {
-		return m_direction;
-	}
+    /** Unit direction vector. */
+    inline const Vector3& direction() const {
+        return m_direction;
+    }
 
-	/** Component-wise inverse of direction vector.  May have inf() components */
-	inline const Vector3& invDirection() const {
-		return m_invDirection;
-	}
+    /** Component-wise inverse of direction vector.  May have inf() components */
+    inline const Vector3& invDirection() const {
+        return m_invDirection;
+    }
 
-	inline Ray() {
-		set(Vector3::zero(), Vector3::unitX());
-	}
+    inline Ray() {
+        set(Vector3::zero(), Vector3::unitX());
+    }
 
-	inline Ray(const Vector3& origin, const Vector3& direction) {
-		set(origin, direction);
-	}
+    inline Ray(const Vector3& origin, const Vector3& direction) {
+        set(origin, direction);
+    }
 
-	Ray(class BinaryInput& b);
+    Ray(class BinaryInput& b);
 
-	void serialize(class BinaryOutput& b) const;
-	void deserialize(class BinaryInput& b);
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
 
     /**
      Creates a Ray from a origin and a (nonzero) unit direction.
@@ -83,15 +83,15 @@ public:
         return Ray(point, direction);
     }
 
-	/** Advances the origin along the direction by @a distance */
-	inline Ray bump(float distance) const {
-		return Ray(m_origin + m_direction * distance, m_direction);
-	}
+    /** Advances the origin along the direction by @a distance */
+    inline Ray bump(float distance) const {
+        return Ray(m_origin + m_direction * distance, m_direction);
+    }
 
-	/** Advances the origin along the @a bumpDirection by @a distance and returns the new ray*/
-	inline Ray bump(float distance, const Vector3& bumpDirection) const {
-		return Ray(m_origin + bumpDirection * distance, m_direction);
-	}
+    /** Advances the origin along the @a bumpDirection by @a distance and returns the new ray*/
+    inline Ray bump(float distance, const Vector3& bumpDirection) const {
+        return Ray(m_origin + bumpDirection * distance, m_direction);
+    }
 
     /**
      Returns the closest point on the Ray to point.
diff --git a/dep/src/g3dlite/Rect2D.cpp b/dep/g3dlite/G3D/Rect2D.cpp
similarity index 100%
rename from dep/src/g3dlite/Rect2D.cpp
rename to dep/g3dlite/G3D/Rect2D.cpp
diff --git a/dep/include/g3dlite/G3D/Rect2D.h b/dep/g3dlite/G3D/Rect2D.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Rect2D.h
rename to dep/g3dlite/G3D/Rect2D.h
diff --git a/dep/src/g3dlite/ReferenceCount.cpp b/dep/g3dlite/G3D/ReferenceCount.cpp
similarity index 100%
rename from dep/src/g3dlite/ReferenceCount.cpp
rename to dep/g3dlite/G3D/ReferenceCount.cpp
diff --git a/dep/include/g3dlite/G3D/ReferenceCount.h b/dep/g3dlite/G3D/ReferenceCount.h
similarity index 99%
rename from dep/include/g3dlite/G3D/ReferenceCount.h
rename to dep/g3dlite/G3D/ReferenceCount.h
index 84591c6d8..0995e772d 100644
--- a/dep/include/g3dlite/G3D/ReferenceCount.h
+++ b/dep/g3dlite/G3D/ReferenceCount.h
@@ -225,7 +225,7 @@ private:
             if (x != NULL) {
                 debugAssert(G3D::isValidHeapPointer(x));
 
-		        m_pointer = x;
+                m_pointer = x;
 
                 // Note that the ref count can be zero if this is the
                 // first pointer to it
diff --git a/dep/src/g3dlite/RegistryUtil.cpp b/dep/g3dlite/G3D/RegistryUtil.cpp
similarity index 100%
rename from dep/src/g3dlite/RegistryUtil.cpp
rename to dep/g3dlite/G3D/RegistryUtil.cpp
diff --git a/dep/include/g3dlite/G3D/RegistryUtil.h b/dep/g3dlite/G3D/RegistryUtil.h
similarity index 100%
rename from dep/include/g3dlite/G3D/RegistryUtil.h
rename to dep/g3dlite/G3D/RegistryUtil.h
diff --git a/dep/include/g3dlite/G3D/Set.h b/dep/g3dlite/G3D/Set.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Set.h
rename to dep/g3dlite/G3D/Set.h
diff --git a/dep/include/g3dlite/G3D/SmallArray.h b/dep/g3dlite/G3D/SmallArray.h
similarity index 96%
rename from dep/include/g3dlite/G3D/SmallArray.h
rename to dep/g3dlite/G3D/SmallArray.h
index 900d2335e..1459c6c6f 100644
--- a/dep/include/g3dlite/G3D/SmallArray.h
+++ b/dep/g3dlite/G3D/SmallArray.h
@@ -148,13 +148,13 @@ public:
         return *this;
     }
 
-	inline const T& last() const {
-		return (*this)[size() - 1];
-	}
+    inline const T& last() const {
+        return (*this)[size() - 1];
+    }
 
-	inline T& last() {
-		return (*this)[size() - 1];
-	}
+    inline T& last() {
+        return (*this)[size() - 1];
+    }
 };
 
 }
diff --git a/dep/src/g3dlite/Sphere.cpp b/dep/g3dlite/G3D/Sphere.cpp
similarity index 76%
rename from dep/src/g3dlite/Sphere.cpp
rename to dep/g3dlite/G3D/Sphere.cpp
index 4ed0811cb..8470bb5fc 100644
--- a/dep/src/g3dlite/Sphere.cpp
+++ b/dep/g3dlite/G3D/Sphere.cpp
@@ -82,19 +82,19 @@ void Sphere::merge(const Sphere& other) {
 
 
 bool Sphere::culledBy(
-    const Array<Plane>&		plane,
-    int&				    cullingPlaneIndex,
-    const uint32			inMask,
-    uint32&					outMask) const {
+    const Array<Plane>&        plane,
+    int&                    cullingPlaneIndex,
+    const uint32            inMask,
+    uint32&                    outMask) const {
     
     return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask, outMask);
 }
     
 
 bool Sphere::culledBy(
-                      const Array<Plane>&		plane,
-                      int&				    cullingPlaneIndex,
-                      const uint32			inMask) const {
+                      const Array<Plane>&        plane,
+                      int&                    cullingPlaneIndex,
+                      const uint32            inMask) const {
     
     return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask);
 }
@@ -103,8 +103,8 @@ bool Sphere::culledBy(
 bool Sphere::culledBy(
     const class Plane*  plane,
     int                 numPlanes,
-    int&				cullingPlane,
-    const uint32		_inMask,
+    int&                cullingPlane,
+    const uint32        _inMask,
     uint32&             childMask) const {
 
     if (radius == finf()) {
@@ -112,45 +112,45 @@ bool Sphere::culledBy(
         return false;
     }
 
-	uint32 inMask = _inMask;
-	assert(numPlanes < 31);
+    uint32 inMask = _inMask;
+    assert(numPlanes < 31);
 
     childMask = 0;
 
     // See if there is one plane for which all of the
-	// vertices are in the negative half space.
+    // vertices are in the negative half space.
     for (int p = 0; p < numPlanes; p++) {
 
-		// Only test planes that are not masked
-		if ((inMask & 1) != 0) {
-		
+        // Only test planes that are not masked
+        if ((inMask & 1) != 0) {
+        
             bool culledLow = ! plane[p].halfSpaceContainsFinite(center + plane[p].normal() * radius);
             bool culledHigh = ! plane[p].halfSpaceContainsFinite(center - plane[p].normal() * radius);
 
-			if (culledLow) {
-				// Plane p culled the sphere
-				cullingPlane = p;
+            if (culledLow) {
+                // Plane p culled the sphere
+                cullingPlane = p;
 
                 // The caller should not recurse into the children,
                 // since the parent is culled.  If they do recurse,
                 // make them only test against this one plane, which
                 // will immediately cull the volume.
                 childMask = 1 << p;
-				return true;
+                return true;
 
             } else if (culledHigh) {
                 // The bounding volume straddled the plane; we have
                 // to keep testing against this plane
                 childMask |= (1 << p);
             }
-		}
+        }
 
         // Move on to the next bit.
-		inMask = inMask >> 1;
+        inMask = inMask >> 1;
     }
 
     // None of the planes could cull this box
-	cullingPlane = -1;
+    cullingPlane = -1;
     return false;
 }
 
@@ -158,32 +158,32 @@ bool Sphere::culledBy(
 bool Sphere::culledBy(
     const class Plane*  plane,
     int                 numPlanes,
-	int&				cullingPlane,
-	const uint32		_inMask) const {
+    int&                cullingPlane,
+    const uint32        _inMask) const {
 
-	uint32 inMask = _inMask;
-	assert(numPlanes < 31);
+    uint32 inMask = _inMask;
+    assert(numPlanes < 31);
 
     // See if there is one plane for which all of the
-	// vertices are in the negative half space.
+    // vertices are in the negative half space.
     for (int p = 0; p < numPlanes; p++) {
 
-		// Only test planes that are not masked
-		if ((inMask & 1) != 0) {
-			bool culled = ! plane[p].halfSpaceContains(center + plane[p].normal() * radius);
-			if (culled) {
-				// Plane p culled the sphere
-				cullingPlane = p;
-				return true;
+        // Only test planes that are not masked
+        if ((inMask & 1) != 0) {
+            bool culled = ! plane[p].halfSpaceContains(center + plane[p].normal() * radius);
+            if (culled) {
+                // Plane p culled the sphere
+                cullingPlane = p;
+                return true;
             }
-		}
+        }
 
         // Move on to the next bit.
-		inMask = inMask >> 1;
+        inMask = inMask >> 1;
     }
 
     // None of the planes could cull this box
-	cullingPlane = -1;
+    cullingPlane = -1;
     return false;
 }
 
diff --git a/dep/include/g3dlite/G3D/Sphere.h b/dep/g3dlite/G3D/Sphere.h
similarity index 87%
rename from dep/include/g3dlite/G3D/Sphere.h
rename to dep/g3dlite/G3D/Sphere.h
index d1448261d..13370c222 100644
--- a/dep/include/g3dlite/G3D/Sphere.h
+++ b/dep/g3dlite/G3D/Sphere.h
@@ -71,7 +71,7 @@ public:
     bool culledBy(
                   const class Plane*  plane,
                   int                 numPlanes,
-                  int32&	          cullingPlaneIndex,
+                  int32&              cullingPlaneIndex,
                   const uint32        testMask,
                   uint32&             childMask) const;
     
@@ -88,18 +88,18 @@ public:
        See AABox::culledBy
     */
     bool culledBy(
-                  const Array<Plane>&		plane,
-                  int32&					cullingPlaneIndex,
-                  const uint32  			testMask,
+                  const Array<Plane>&        plane,
+                  int32&                    cullingPlaneIndex,
+                  const uint32              testMask,
                   uint32&                 childMask) const;
     
     /**
      Conservative culling test that does not produce a mask for children.
      */
     bool culledBy(
-                  const Array<Plane>&		plane,
-                  int32&					cullingPlaneIndex = dummy,
-                  const uint32  			testMask		  = 0xFFFFFFFF) const;
+                  const Array<Plane>&        plane,
+                  int32&                    cullingPlaneIndex = dummy,
+                  const uint32              testMask          = 0xFFFFFFFF) const;
 
     virtual std::string toString() const;
 
diff --git a/dep/include/g3dlite/G3D/Spline.h b/dep/g3dlite/G3D/Spline.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Spline.h
rename to dep/g3dlite/G3D/Spline.h
diff --git a/dep/src/g3dlite/SplineBase.cpp b/dep/g3dlite/G3D/SplineBase.cpp
similarity index 100%
rename from dep/src/g3dlite/SplineBase.cpp
rename to dep/g3dlite/G3D/SplineBase.cpp
diff --git a/dep/src/g3dlite/Stopwatch.cpp b/dep/g3dlite/G3D/Stopwatch.cpp
similarity index 100%
rename from dep/src/g3dlite/Stopwatch.cpp
rename to dep/g3dlite/G3D/Stopwatch.cpp
diff --git a/dep/include/g3dlite/G3D/Stopwatch.h b/dep/g3dlite/G3D/Stopwatch.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Stopwatch.h
rename to dep/g3dlite/G3D/Stopwatch.h
diff --git a/dep/src/g3dlite/System.cpp b/dep/g3dlite/G3D/System.cpp
similarity index 98%
rename from dep/src/g3dlite/System.cpp
rename to dep/g3dlite/G3D/System.cpp
index ce190d067..f64310c98 100644
--- a/dep/src/g3dlite/System.cpp
+++ b/dep/g3dlite/G3D/System.cpp
@@ -261,12 +261,15 @@ void System::init() {
 
             int len = 100;
             char* r = (char*)::malloc(len * sizeof(char));
-            fgets(r, len, f);
-            // Remove trailing newline
-            if (r[strlen(r) - 1] == '\n') {
-                r[strlen(r) - 1] = '\0';
+            if(f != NULL)
+            {
+                fgets(r, len, f);
+                // Remove trailing newline
+                if (r[strlen(r) - 1] == '\n') {
+                    r[strlen(r) - 1] = '\0';
+                }
+                fclose(f);
             }
-            fclose(f);
 
             m_operatingSystem = r;
             ::free(r);
@@ -294,30 +297,30 @@ void System::init() {
         m_secondsPerNS = 1.0 / 1.0e9;
         
         // System Architecture:
-	const NXArchInfo* pInfo = NXGetLocalArchInfo();
-		
-	if (pInfo) {
-	    m_cpuArch = pInfo->description;
-			
-	    switch (pInfo->cputype) {
-	    case CPU_TYPE_POWERPC:
-	        switch(pInfo->cpusubtype){
-		case CPU_SUBTYPE_POWERPC_750:
-		case CPU_SUBTYPE_POWERPC_7400:
-		case CPU_SUBTYPE_POWERPC_7450:
-		    m_cpuVendor = "Motorola";
-		    break;
-		case CPU_SUBTYPE_POWERPC_970:
-		    m_cpuVendor = "IBM";
-		    break;
-		}
-		break;
-	    
+    const NXArchInfo* pInfo = NXGetLocalArchInfo();
+        
+    if (pInfo) {
+        m_cpuArch = pInfo->description;
+            
+        switch (pInfo->cputype) {
+        case CPU_TYPE_POWERPC:
+            switch(pInfo->cpusubtype){
+        case CPU_SUBTYPE_POWERPC_750:
+        case CPU_SUBTYPE_POWERPC_7400:
+        case CPU_SUBTYPE_POWERPC_7450:
+            m_cpuVendor = "Motorola";
+            break;
+        case CPU_SUBTYPE_POWERPC_970:
+            m_cpuVendor = "IBM";
+            break;
+        }
+        break;
+        
             case CPU_TYPE_I386:
                 m_cpuVendor = "Intel";
                 break;
-	    }
-	}
+        }
+    }
 #   endif
 
     initTime();
@@ -1669,7 +1672,7 @@ std::string System::getClipboardText() {
             if (h) {
                 char* temp = (char*)GlobalLock(h);
                 if (temp) {
-    	            s = temp;
+                    s = temp;
                 }
                 temp = NULL;
                 GlobalUnlock(h);
@@ -1698,7 +1701,7 @@ void System::cpuid(CPUIDFunction func, uint32& areg, uint32& breg, uint32& creg,
 
     // Intel assembler syntax
     __asm {
-        mov	  eax, func      //  eax <- func
+        mov      eax, func      //  eax <- func
         mov   ecx, 0
         cpuid              
         mov   a, eax   
diff --git a/dep/include/g3dlite/G3D/System.h b/dep/g3dlite/G3D/System.h
similarity index 97%
rename from dep/include/g3dlite/G3D/System.h
rename to dep/g3dlite/G3D/System.h
index dff7fffed..467a40366 100644
--- a/dep/include/g3dlite/G3D/System.h
+++ b/dep/g3dlite/G3D/System.h
@@ -24,8 +24,8 @@
 #   include <CoreServices/CoreServices.h>
 #endif
 
-#ifdef G3D_FREEBSD
-#   include <sys/time.h>
+#if defined(__FreeBSD__)
+    #include <sys/_timeval.h>
 #endif
 
 namespace G3D {
@@ -407,7 +407,7 @@ public:
 
     /** Set an environment variable for the current process */
     static void setEnv(const std::string& name, const std::string& value);
-	
+    
     /** Get an environment variable for the current process.  Returns NULL if the variable doesn't exist. */
     static const char* getEnv(const std::string& name);
 
@@ -479,13 +479,13 @@ public:
 #elif defined(G3D_OSX)
 
     inline uint64 System::getCycleCount() {
-		//Note:  To put off extra processing until the end, this does not 
-		//return the actual clock cycle count.  It is a bus cycle count.
-		//When endCycleCount() is called, it converts the two into a difference
-		//of clock cycles
-		
+        //Note:  To put off extra processing until the end, this does not 
+        //return the actual clock cycle count.  It is a bus cycle count.
+        //When endCycleCount() is called, it converts the two into a difference
+        //of clock cycles
+        
         return (uint64) UnsignedWideToUInt64(UpTime());
-		//return (uint64) mach_absolute_time();
+        //return (uint64) mach_absolute_time();
     }
 
 #endif
diff --git a/dep/include/g3dlite/G3D/Table.h b/dep/g3dlite/G3D/Table.h
similarity index 99%
rename from dep/include/g3dlite/G3D/Table.h
rename to dep/g3dlite/G3D/Table.h
index ab0b114b1..3ecfac6f0 100644
--- a/dep/include/g3dlite/G3D/Table.h
+++ b/dep/g3dlite/G3D/Table.h
@@ -520,9 +520,9 @@ public:
             return &(node->entry);
         }
 
-		bool hasMore() const {
-			return ! isDone;
-		}
+        bool hasMore() const {
+            return ! isDone;
+        }
     };
 
 
diff --git a/dep/src/g3dlite/TextInput.cpp b/dep/g3dlite/G3D/TextInput.cpp
similarity index 99%
rename from dep/src/g3dlite/TextInput.cpp
rename to dep/g3dlite/G3D/TextInput.cpp
index 354d0de13..3bf3a6955 100644
--- a/dep/src/g3dlite/TextInput.cpp
+++ b/dep/g3dlite/G3D/TextInput.cpp
@@ -656,7 +656,7 @@ numLabel:
             }
 
         } else {
-			// Non-hex number
+            // Non-hex number
 
             // Read the part before the decimal.
             while (isDigit(c)) {
diff --git a/dep/include/g3dlite/G3D/TextInput.h b/dep/g3dlite/G3D/TextInput.h
similarity index 99%
rename from dep/include/g3dlite/G3D/TextInput.h
rename to dep/g3dlite/G3D/TextInput.h
index 7aefb50ff..cf6f08512 100644
--- a/dep/include/g3dlite/G3D/TextInput.h
+++ b/dep/g3dlite/G3D/TextInput.h
@@ -398,7 +398,7 @@ public:
 
         Settings();
     };
-	
+    
 private:
 
     std::deque<Token>       stack;
diff --git a/dep/src/g3dlite/TextOutput.cpp b/dep/g3dlite/G3D/TextOutput.cpp
similarity index 98%
rename from dep/src/g3dlite/TextOutput.cpp
rename to dep/g3dlite/G3D/TextOutput.cpp
index 3257f6fb9..89af06bf6 100644
--- a/dep/src/g3dlite/TextOutput.cpp
+++ b/dep/g3dlite/G3D/TextOutput.cpp
@@ -17,11 +17,11 @@
 namespace G3D {
 
 TextOutput::TextOutput(const TextOutput::Settings& opt) :
-	startingNewLine(true),
+    startingNewLine(true),
     currentColumn(0),
-	inDQuote(false),
-	filename(""),
-	indentLevel(0)
+    inDQuote(false),
+    filename(""),
+    indentLevel(0)
 {
     setOptions(opt);
 }
@@ -30,9 +30,9 @@ TextOutput::TextOutput(const TextOutput::Settings& opt) :
 TextOutput::TextOutput(const std::string& fil, const TextOutput::Settings& opt) :
     startingNewLine(true),
     currentColumn(0),
-	inDQuote(false),
-	filename(fil),
-	indentLevel(0) 
+    inDQuote(false),
+    filename(fil),
+    indentLevel(0) 
 {
 
     setOptions(opt);
diff --git a/dep/include/g3dlite/G3D/TextOutput.h b/dep/g3dlite/G3D/TextOutput.h
similarity index 100%
rename from dep/include/g3dlite/G3D/TextOutput.h
rename to dep/g3dlite/G3D/TextOutput.h
diff --git a/dep/src/g3dlite/ThreadSet.cpp b/dep/g3dlite/G3D/ThreadSet.cpp
similarity index 100%
rename from dep/src/g3dlite/ThreadSet.cpp
rename to dep/g3dlite/G3D/ThreadSet.cpp
diff --git a/dep/include/g3dlite/G3D/ThreadSet.h b/dep/g3dlite/G3D/ThreadSet.h
similarity index 100%
rename from dep/include/g3dlite/G3D/ThreadSet.h
rename to dep/g3dlite/G3D/ThreadSet.h
diff --git a/dep/src/g3dlite/Triangle.cpp b/dep/g3dlite/G3D/Triangle.cpp
similarity index 100%
rename from dep/src/g3dlite/Triangle.cpp
rename to dep/g3dlite/G3D/Triangle.cpp
diff --git a/dep/include/g3dlite/G3D/Triangle.h b/dep/g3dlite/G3D/Triangle.h
similarity index 97%
rename from dep/include/g3dlite/G3D/Triangle.h
rename to dep/g3dlite/G3D/Triangle.h
index 590dbaad9..50975f21b 100644
--- a/dep/include/g3dlite/G3D/Triangle.h
+++ b/dep/g3dlite/G3D/Triangle.h
@@ -55,10 +55,10 @@ private:
     void init(const Vector3& v0, const Vector3& v1, const Vector3& v2);
 
 public:
-	
+    
     Triangle(class BinaryInput& b);
-	void serialize(class BinaryOutput& b);
-	void deserialize(class BinaryInput& b);
+    void serialize(class BinaryOutput& b);
+    void deserialize(class BinaryInput& b);
 
     Triangle();
     
diff --git a/dep/src/g3dlite/UprightFrame.cpp b/dep/g3dlite/G3D/UprightFrame.cpp
similarity index 100%
rename from dep/src/g3dlite/UprightFrame.cpp
rename to dep/g3dlite/G3D/UprightFrame.cpp
diff --git a/dep/include/g3dlite/G3D/UprightFrame.h b/dep/g3dlite/G3D/UprightFrame.h
similarity index 100%
rename from dep/include/g3dlite/G3D/UprightFrame.h
rename to dep/g3dlite/G3D/UprightFrame.h
diff --git a/dep/src/g3dlite/Vector2.cpp b/dep/g3dlite/G3D/Vector2.cpp
similarity index 93%
rename from dep/src/g3dlite/Vector2.cpp
rename to dep/g3dlite/G3D/Vector2.cpp
index ec0737c37..dcabe0828 100644
--- a/dep/src/g3dlite/Vector2.cpp
+++ b/dep/g3dlite/G3D/Vector2.cpp
@@ -70,26 +70,26 @@ const Vector2& Vector2::unitY() {
 }
 
 const Vector2& Vector2::inf() { 
-	static Vector2 v((float)G3D::finf(), (float)G3D::finf());
-	return v; 
+    static Vector2 v((float)G3D::finf(), (float)G3D::finf());
+    return v; 
 }
 
 
 const Vector2& Vector2::nan() { 
-	static Vector2 v((float)G3D::fnan(), (float)G3D::fnan()); 
-	return v; 
+    static Vector2 v((float)G3D::fnan(), (float)G3D::fnan()); 
+    return v; 
 }
 
 
 const Vector2& Vector2::minFinite() {
-	static Vector2 v(-FLT_MAX, -FLT_MAX); 
-	return v; 
+    static Vector2 v(-FLT_MAX, -FLT_MAX); 
+    return v; 
 }
 
 
 const Vector2& Vector2::maxFinite() {
-	static Vector2 v(FLT_MAX, FLT_MAX); 
-	return v; 
+    static Vector2 v(FLT_MAX, FLT_MAX); 
+    return v; 
 }
 
 
@@ -163,10 +163,10 @@ Vector2& Vector2::operator/= (float k) {
 
 //----------------------------------------------------------------------------
 float Vector2::unitize (float fTolerance) {
-	float fLength = length();
+    float fLength = length();
 
     if (fLength > fTolerance) {
-		float fInvLength = 1.0f / fLength;
+        float fInvLength = 1.0f / fLength;
         x *= fInvLength;
         y *= fInvLength;
     } else {
diff --git a/dep/include/g3dlite/G3D/Vector2.h b/dep/g3dlite/G3D/Vector2.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Vector2.h
rename to dep/g3dlite/G3D/Vector2.h
diff --git a/dep/src/g3dlite/Vector2int16.cpp b/dep/g3dlite/G3D/Vector2int16.cpp
similarity index 100%
rename from dep/src/g3dlite/Vector2int16.cpp
rename to dep/g3dlite/G3D/Vector2int16.cpp
diff --git a/dep/include/g3dlite/G3D/Vector2int16.h b/dep/g3dlite/G3D/Vector2int16.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Vector2int16.h
rename to dep/g3dlite/G3D/Vector2int16.h
diff --git a/dep/src/g3dlite/Vector3.cpp b/dep/g3dlite/G3D/Vector3.cpp
similarity index 97%
rename from dep/src/g3dlite/Vector3.cpp
rename to dep/g3dlite/G3D/Vector3.cpp
index 55343e96e..1f49da9b8 100644
--- a/dep/src/g3dlite/Vector3.cpp
+++ b/dep/g3dlite/G3D/Vector3.cpp
@@ -13,21 +13,21 @@
 
 #include <limits>
 #include <stdlib.h>
-#include "G3D/Vector3.h"
-#include "G3D/g3dmath.h"
-#include "G3D/stringutils.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/TextInput.h"
-#include "G3D/TextOutput.h"
-#include "G3D/Vector3int16.h"
-#include "G3D/Matrix3.h"
-#include "G3D/Vector2.h"
-#include "G3D/Color3.h"
-#include "G3D/Vector4int8.h"
-#include "G3D/Vector4.h"
-#include "G3D/Vector3int32.h"
-#include "G3D/Any.h"
+#include "Vector3.h"
+#include "g3dmath.h"
+#include "stringutils.h"
+#include "BinaryInput.h"
+#include "BinaryOutput.h"
+#include "TextInput.h"
+#include "TextOutput.h"
+#include "Vector3int16.h"
+#include "Matrix3.h"
+#include "Vector2.h"
+#include "Color3.h"
+#include "Vector4int8.h"
+#include "Vector4.h"
+#include "Vector3int32.h"
+#include "Any.h"
  
 namespace G3D {
 
@@ -120,7 +120,7 @@ double frand() {
 }
 
 Vector3::Vector3(TextInput& t) {
-	deserialize(t);
+    deserialize(t);
 }
 
 Vector3::Vector3(BinaryInput& b) {
@@ -313,12 +313,12 @@ void Vector3::orthonormalize (Vector3 akVector[3]) {
     akVector[0].unitize();
 
     // compute u1
-	float fDot0 = akVector[0].dot(akVector[1]);
+    float fDot0 = akVector[0].dot(akVector[1]);
     akVector[1] -= akVector[0] * fDot0;
     akVector[1].unitize();
 
     // compute u2
-	float fDot1 = akVector[1].dot(akVector[2]);
+    float fDot1 = akVector[1].dot(akVector[2]);
     fDot0 = akVector[0].dot(akVector[2]);
     akVector[2] -= akVector[0] * fDot0 + akVector[1] * fDot1;
     akVector[2].unitize();
diff --git a/dep/include/g3dlite/G3D/Vector3.h b/dep/g3dlite/G3D/Vector3.h
similarity index 99%
rename from dep/include/g3dlite/G3D/Vector3.h
rename to dep/g3dlite/G3D/Vector3.h
index b4e684b92..e7a5e696b 100644
--- a/dep/include/g3dlite/G3D/Vector3.h
+++ b/dep/g3dlite/G3D/Vector3.h
@@ -87,14 +87,14 @@ public:
     explicit Vector3(float coordinate[3]);
     explicit Vector3(double coordinate[3]);
     Vector3(const class Vector3int16& v);
-	explicit Vector3(class TextInput& t);
+    explicit Vector3(class TextInput& t);
     explicit Vector3(const class Color3& c);
 
-	/** Format is three float32's */
+    /** Format is three float32's */
     void serialize(class BinaryOutput& b) const;
     void deserialize(class BinaryInput& b);
 
-	/** Format is "(%f, %f, %f)" */
+    /** Format is "(%f, %f, %f)" */
     void serialize(class TextOutput& t) const;
     void deserialize(class TextInput& t);
 
@@ -153,7 +153,7 @@ public:
     Vector3& __fastcall operator/= (const Vector3& v);
 
     /** Same as magnitude */
-	float length() const;
+    float length() const;
 
     float magnitude() const;
     
@@ -265,7 +265,7 @@ public:
     float squaredLength() const;
 
     float squaredMagnitude () const;
-	
+    
     float __fastcall dot(const Vector3& rkVector) const;
     
     float unitize(float tolerance = 1e-06);
diff --git a/dep/src/g3dlite/Vector3int16.cpp b/dep/g3dlite/G3D/Vector3int16.cpp
similarity index 100%
rename from dep/src/g3dlite/Vector3int16.cpp
rename to dep/g3dlite/G3D/Vector3int16.cpp
diff --git a/dep/include/g3dlite/G3D/Vector3int16.h b/dep/g3dlite/G3D/Vector3int16.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Vector3int16.h
rename to dep/g3dlite/G3D/Vector3int16.h
diff --git a/dep/src/g3dlite/Vector3int32.cpp b/dep/g3dlite/G3D/Vector3int32.cpp
similarity index 100%
rename from dep/src/g3dlite/Vector3int32.cpp
rename to dep/g3dlite/G3D/Vector3int32.cpp
diff --git a/dep/include/g3dlite/G3D/Vector3int32.h b/dep/g3dlite/G3D/Vector3int32.h
similarity index 99%
rename from dep/include/g3dlite/G3D/Vector3int32.h
rename to dep/g3dlite/G3D/Vector3int32.h
index 2f256ea03..c1a6b21e1 100644
--- a/dep/include/g3dlite/G3D/Vector3int32.h
+++ b/dep/g3dlite/G3D/Vector3int32.h
@@ -74,7 +74,7 @@ public:
     inline Vector3int32& operator+=(const Vector3int32& other) {
         x += other.x;
         y += other.y;
-        z += other.y;
+        z += other.z;
         return *this;
     }
 
diff --git a/dep/src/g3dlite/Vector4.cpp b/dep/g3dlite/G3D/Vector4.cpp
similarity index 99%
rename from dep/src/g3dlite/Vector4.cpp
rename to dep/g3dlite/G3D/Vector4.cpp
index b5f23d699..2c5895c3f 100644
--- a/dep/src/g3dlite/Vector4.cpp
+++ b/dep/g3dlite/G3D/Vector4.cpp
@@ -134,7 +134,7 @@ Vector4 Vector4::operator/ (float fScalar) const {
     Vector4 kQuot;
 
     if ( fScalar != 0.0 ) {
-		float fInvScalar = 1.0f / fScalar;
+        float fInvScalar = 1.0f / fScalar;
         kQuot.x = fInvScalar * x;
         kQuot.y = fInvScalar * y;
         kQuot.z = fInvScalar * z;
@@ -148,13 +148,13 @@ Vector4 Vector4::operator/ (float fScalar) const {
 //----------------------------------------------------------------------------
 Vector4& Vector4::operator/= (float fScalar) {
     if (fScalar != 0.0f) {
-		float fInvScalar = 1.0f / fScalar;
+        float fInvScalar = 1.0f / fScalar;
         x *= fInvScalar;
         y *= fInvScalar;
         z *= fInvScalar;
         w *= fInvScalar;
     } else {
-		*this = Vector4::inf();
+        *this = Vector4::inf();
     }
 
     return *this;
diff --git a/dep/include/g3dlite/G3D/Vector4.h b/dep/g3dlite/G3D/Vector4.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Vector4.h
rename to dep/g3dlite/G3D/Vector4.h
diff --git a/dep/src/g3dlite/Vector4int8.cpp b/dep/g3dlite/G3D/Vector4int8.cpp
similarity index 100%
rename from dep/src/g3dlite/Vector4int8.cpp
rename to dep/g3dlite/G3D/Vector4int8.cpp
diff --git a/dep/include/g3dlite/G3D/Vector4int8.h b/dep/g3dlite/G3D/Vector4int8.h
similarity index 100%
rename from dep/include/g3dlite/G3D/Vector4int8.h
rename to dep/g3dlite/G3D/Vector4int8.h
diff --git a/dep/include/g3dlite/G3D/WeakCache.h b/dep/g3dlite/G3D/WeakCache.h
similarity index 100%
rename from dep/include/g3dlite/G3D/WeakCache.h
rename to dep/g3dlite/G3D/WeakCache.h
diff --git a/dep/src/g3dlite/Welder.cpp b/dep/g3dlite/G3D/Welder.cpp
similarity index 100%
rename from dep/src/g3dlite/Welder.cpp
rename to dep/g3dlite/G3D/Welder.cpp
diff --git a/dep/include/g3dlite/G3D/Welder.h b/dep/g3dlite/G3D/Welder.h
similarity index 95%
rename from dep/include/g3dlite/G3D/Welder.h
rename to dep/g3dlite/G3D/Welder.h
index 2c2554da7..1a31db782 100644
--- a/dep/include/g3dlite/G3D/Welder.h
+++ b/dep/g3dlite/G3D/Welder.h
@@ -22,9 +22,9 @@ public:
         /** Surfaces with normals that are within this angle of each
             other are considered to be curved.  Default value is toRadians(70.0f).*/
         float   normalSmoothingAngle;
-        float  	vertexWeldRadius;
-        float  	textureWeldRadius;
-        float  	normalWeldRadius;
+        float      vertexWeldRadius;
+        float      textureWeldRadius;
+        float      normalWeldRadius;
 
         inline Settings(float normalSmoothAngle = toRadians(70.0f)) : 
             normalSmoothingAngle(normalSmoothAngle),
diff --git a/dep/src/g3dlite/WinMain.cpp b/dep/g3dlite/G3D/WinMain.cpp
similarity index 100%
rename from dep/src/g3dlite/WinMain.cpp
rename to dep/g3dlite/G3D/WinMain.cpp
diff --git a/dep/include/g3dlite/G3D/WrapMode.h b/dep/g3dlite/G3D/WrapMode.h
similarity index 100%
rename from dep/include/g3dlite/G3D/WrapMode.h
rename to dep/g3dlite/G3D/WrapMode.h
diff --git a/dep/src/g3dlite/XML.cpp b/dep/g3dlite/G3D/XML.cpp
similarity index 100%
rename from dep/src/g3dlite/XML.cpp
rename to dep/g3dlite/G3D/XML.cpp
diff --git a/dep/include/g3dlite/G3D/XML.h b/dep/g3dlite/G3D/XML.h
similarity index 100%
rename from dep/include/g3dlite/G3D/XML.h
rename to dep/g3dlite/G3D/XML.h
diff --git a/dep/src/g3dlite/constants.cpp b/dep/g3dlite/G3D/constants.cpp
similarity index 100%
rename from dep/src/g3dlite/constants.cpp
rename to dep/g3dlite/G3D/constants.cpp
diff --git a/dep/include/g3dlite/G3D/constants.h b/dep/g3dlite/G3D/constants.h
similarity index 100%
rename from dep/include/g3dlite/G3D/constants.h
rename to dep/g3dlite/G3D/constants.h
diff --git a/dep/include/g3dlite/G3D/debug.h b/dep/g3dlite/G3D/debug.h
similarity index 100%
rename from dep/include/g3dlite/G3D/debug.h
rename to dep/g3dlite/G3D/debug.h
diff --git a/dep/src/g3dlite/debugAssert.cpp b/dep/g3dlite/G3D/debugAssert.cpp
similarity index 98%
rename from dep/src/g3dlite/debugAssert.cpp
rename to dep/g3dlite/G3D/debugAssert.cpp
index 3d1390e32..0b47aa286 100644
--- a/dep/src/g3dlite/debugAssert.cpp
+++ b/dep/g3dlite/G3D/debugAssert.cpp
@@ -106,9 +106,9 @@ static void createErrorMessage(
             realLastErr = _T("Last error code does not exist.");
         }
 
-		if (lastErr != 0) {
-	        le = G3D::format("Last Error (0x%08X): %s\r\n\r\n", lastErr, (LPCSTR)realLastErr);
-		}
+        if (lastErr != 0) {
+            le = G3D::format("Last Error (0x%08X): %s\r\n\r\n", lastErr, (LPCSTR)realLastErr);
+        }
 
         // Get rid of the allocated memory from FormatMessage.
         if (NULL != formatMsg) {
@@ -307,7 +307,7 @@ void setAssertionHook(AssertionHook hook) {
 }
 
 AssertionHook assertionHook() {
-    return 	G3D::_internal::_debugHook;
+    return     G3D::_internal::_debugHook;
 }
 
 void setFailureHook(AssertionHook hook) {
diff --git a/dep/include/g3dlite/G3D/debugAssert.h b/dep/g3dlite/G3D/debugAssert.h
similarity index 100%
rename from dep/include/g3dlite/G3D/debugAssert.h
rename to dep/g3dlite/G3D/debugAssert.h
diff --git a/dep/include/g3dlite/G3D/debugPrintf.h b/dep/g3dlite/G3D/debugPrintf.h
similarity index 100%
rename from dep/include/g3dlite/G3D/debugPrintf.h
rename to dep/g3dlite/G3D/debugPrintf.h
diff --git a/dep/include/g3dlite/G3D/enumclass.h b/dep/g3dlite/G3D/enumclass.h
similarity index 99%
rename from dep/include/g3dlite/G3D/enumclass.h
rename to dep/g3dlite/G3D/enumclass.h
index 2874a630a..182fb8a47 100644
--- a/dep/include/g3dlite/G3D/enumclass.h
+++ b/dep/g3dlite/G3D/enumclass.h
@@ -95,7 +95,7 @@ public:\
     /** Support cast back to the Value type, which is needed to allow implicit assignment inside unions. */\
     /*inline operator Value() const {
         return value;
-	}*/\
+    }*/\
 \
     operator int() const {\
         return (int)value;\
diff --git a/dep/src/g3dlite/fileutils.cpp b/dep/g3dlite/G3D/fileutils.cpp
similarity index 91%
rename from dep/src/g3dlite/fileutils.cpp
rename to dep/g3dlite/G3D/fileutils.cpp
index 66fe0eacb..2eb3a6dcf 100644
--- a/dep/src/g3dlite/fileutils.cpp
+++ b/dep/g3dlite/G3D/fileutils.cpp
@@ -92,8 +92,8 @@ std::string resolveFilename(const std::string& filename) {
 }
 
 bool zipfileExists(const std::string& filename) {
-	std::string	outZipfile;
-	std::string	outInternalFile;
+    std::string    outZipfile;
+    std::string    outInternalFile;
     return zipfileExists(filename, outZipfile, outInternalFile);
 }
 
@@ -115,7 +115,7 @@ std::string readWholeFile(
         FILE* f = FileSystem::fopen(filename.c_str(), "rb");
         debugAssert(f);
         int ret = fread(buffer, 1, length, f);
-	    debugAssert(ret == length);(void)ret;
+        debugAssert(ret == length);(void)ret;
         FileSystem::fclose(f);
 
         buffer[length] = '\0';    
@@ -177,7 +177,7 @@ void zipRead(const std::string& file,
 
 
 void zipClose(void* data) {
-	System::alignedFree(data);
+    System::alignedFree(data);
 }
 
 
@@ -187,25 +187,25 @@ int64 fileLength(const std::string& filename) {
     
     if (result == -1) {
 #if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
-		std::string zip, contents;
-		if(zipfileExists(filename, zip, contents)){
-			int64 requiredMem;
+        std::string zip, contents;
+        if(zipfileExists(filename, zip, contents)){
+            int64 requiredMem;
 
                         struct zip *z = zip_open( zip.c_str(), ZIP_CHECKCONS, NULL );
                         debugAssertM(z != NULL, zip + ": zip open failed.");
-			{
+            {
                                 struct zip_stat info;
                                 zip_stat_init( &info );    // TODO: Docs unclear if zip_stat_init is required.
                                 int success = zip_stat( z, contents.c_str(), ZIP_FL_NOCASE, &info );
-				(void)success;
+                (void)success;
                                 debugAssertM(success == 0, zip + ": " + contents + ": zip stat failed.");
                                 requiredMem = info.size;
-			}
+            }
                         zip_close( z );
-			return requiredMem;
-		} else {
+            return requiredMem;
+        } else {
         return -1;
-		}
+        }
 #else /* G3DFIX: Use ZIP-library only if defined */
  return -1;
 #endif /* G3DFIX: Use ZIP-library only if defined */
@@ -252,9 +252,9 @@ void writeWholeFile(
 void createDirectory(
     const std::string&  dir) {
     
-	if (dir == "") {
-		return;
-	}
+    if (dir == "") {
+        return;
+    }
 
     std::string d;
 
@@ -295,9 +295,9 @@ void createDirectory(
             // where as unix also requires the permissions.
 #           ifndef G3D_WIN32
                 mkdir(p.c_str(), 0777);
-#	        else
+#            else
                 _mkdir(p.c_str());
-#	        endif
+#            endif
         }
     }
 }
@@ -309,35 +309,35 @@ void createDirectory(
 /* Helper methods for zipfileExists()*/
 // Given a string (the drive) and an array (the path), computes the directory
 static void _zip_resolveDirectory(std::string& completeDir, const std::string& drive, const Array<std::string>& path, const int length){
-	completeDir = drive;
-	int tempLength;
-	// if the given length is longer than the array, we correct it
-	if(length > path.length()){
-		tempLength = path.length();
-	} else{
-		tempLength = length;
-	}
+    completeDir = drive;
+    int tempLength;
+    // if the given length is longer than the array, we correct it
+    if(length > path.length()){
+        tempLength = path.length();
+    } else{
+        tempLength = length;
+    }
 
-	for(int t = 0; t < tempLength; ++t){
-		if(t > 0){
-			completeDir += "/";
-		}
-		completeDir += path[t];
-	}
+    for(int t = 0; t < tempLength; ++t){
+        if(t > 0){
+            completeDir += "/";
+        }
+        completeDir += path[t];
+    }
 }
 
 
 // assumes that zipDir references a .zip file
 static bool _zip_zipContains(const std::string& zipDir, const std::string& desiredFile){
         struct zip *z = zip_open( zipDir.c_str(), ZIP_CHECKCONS, NULL );
-	//the last parameter, an int, determines case sensitivity:
-	//1 is sensitive, 2 is not, 0 is default
+    //the last parameter, an int, determines case sensitivity:
+    //1 is sensitive, 2 is not, 0 is default
         int test = zip_name_locate( z, desiredFile.c_str(), ZIP_FL_NOCASE );
         zip_close( z );
-	if(test == -1){
-		return false;
-	}
-	return true;
+    if(test == -1){
+        return false;
+    }
+    return true;
 }
 #endif /* G3DFIX: Use ZIP-library only if defined */
 
@@ -411,7 +411,7 @@ bool zipfileExists(const std::string& filename, std::string& outZipfile,
     // not a valid directory structure ever, 
     // obviously no .zip was found within the path 
     return false;
-}	
+}    
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -578,9 +578,9 @@ void parseFilename(
  @param includePath     If true, the names include paths
  */
 static void getFileOrDirListNormal
-(const std::string&	filespec,
- Array<std::string>&	files,
- bool			wantFiles,
+(const std::string&    filespec,
+ Array<std::string>&    files,
+ bool            wantFiles,
  bool                   includePath) {
     
     bool test = wantFiles ? true : false;
@@ -698,10 +698,10 @@ static void getFileOrDirListNormal
  */
 static void _zip_addEntry(const std::string& path,
                           const std::string& prefix,
-						  const std::string& file,
-						  Set<std::string>& files,
-						  bool wantFiles,
-						  bool includePath) {
+                          const std::string& file,
+                          Set<std::string>& files,
+                          bool wantFiles,
+                          bool includePath) {
 
     // Make certain we are within the desired parent folder (prefix)
     if (beginsWith(file, prefix)) {
@@ -769,13 +769,13 @@ static void getFileOrDirListZip(const std::string& path,
 
 
 static void determineFileOrDirList(
-	const std::string&			filespec,
-	Array<std::string>&			files,
-	bool						wantFiles,
-	bool						includePath) {
+    const std::string&            filespec,
+    Array<std::string>&            files,
+    bool                        wantFiles,
+    bool                        includePath) {
 
-	// if it is a .zip, prefix will specify the folder within
-	// whose contents we want to see
+    // if it is a .zip, prefix will specify the folder within
+    // whose contents we want to see
     std::string prefix = "";
     std::string path = filenamePath(filespec);
 
@@ -803,20 +803,20 @@ static void determineFileOrDirList(
 }
 
 
-void getFiles(const std::string&			filespec,
-              Array<std::string>&			files,
-              bool					includePath) {
+void getFiles(const std::string&            filespec,
+              Array<std::string>&            files,
+              bool                    includePath) {
     
     determineFileOrDirList(filespec, files, true, includePath);
 }
 
 
 void getDirs(
-	const std::string&			filespec,
-	Array<std::string>&			files,
-	bool						includePath) {
+    const std::string&            filespec,
+    Array<std::string>&            files,
+    bool                        includePath) {
 
-	determineFileOrDirList(filespec, files, false, includePath);
+    determineFileOrDirList(filespec, files, false, includePath);
 }
 
 
@@ -889,23 +889,27 @@ std::string filenamePath(const std::string& filename) {
 
 bool isZipfile(const std::string& filename) {
 
-	FILE* f = fopen(filename.c_str(), "r");
-	if (f == NULL) {
-		return false;
-	}
-	uint8 header[4];
-	fread(header, 4, 1, f);
-	
-	const uint8 zipHeader[4] = {0x50, 0x4b, 0x03, 0x04};
-	for (int i = 0; i < 4; ++i) {
-		if (header[i] != zipHeader[i]) {
-			fclose(f);
-			return false;
-		}
-	}
+    FILE* f = fopen(filename.c_str(), "r");
+    if (f == NULL) {
+        return false;
+    }
+    uint8 header[4];
+    size_t file_read = fread(header, 4, 1, f);
+        if (file_read <= 0) {
+                fclose(f);
+                return false;
+        }
+    
+    const uint8 zipHeader[4] = {0x50, 0x4b, 0x03, 0x04};
+    for (int i = 0; i < 4; ++i) {
+        if (header[i] != zipHeader[i]) {
+            fclose(f);
+            return false;
+        }
+    }
 
-	fclose(f);
-	return true;
+    fclose(f);
+    return true;
 }
 
 
diff --git a/dep/include/g3dlite/G3D/fileutils.h b/dep/g3dlite/G3D/fileutils.h
similarity index 85%
rename from dep/include/g3dlite/G3D/fileutils.h
rename to dep/g3dlite/G3D/fileutils.h
index 89b416902..73afb58dd 100644
--- a/dep/include/g3dlite/G3D/fileutils.h
+++ b/dep/g3dlite/G3D/fileutils.h
@@ -39,22 +39,22 @@ std::string readWholeFile(
 
 
 /** Reads from a zip file and decompresses the desired contents
-	into memory.  Does not support recursive zip calls (i.e. a .zip
-	stored within another .zip)
+    into memory.  Does not support recursive zip calls (i.e. a .zip
+    stored within another .zip)
 
-	@param file the path, of the format C:\\...\\something.zip\\...\\desiredfile.ext
-	@param data a pointer to the memory where the file will be stored
-	@param length the size of the file decompressed to memory */
+    @param file the path, of the format C:\\...\\something.zip\\...\\desiredfile.ext
+    @param data a pointer to the memory where the file will be stored
+    @param length the size of the file decompressed to memory */
 void zipRead(const std::string& file,
-			 void*& data,
-			 size_t& length);
+             void*& data,
+             size_t& length);
 
 
 /** Closes the contents of a zip file that had been decompressed to
-	memory.  Must be called in tandem with zipRead() to avoid memory
-	leaks.
+    memory.  Must be called in tandem with zipRead() to avoid memory
+    leaks.
 
-	@param data the pointer to the decompressed file in memory */
+    @param data the pointer to the decompressed file in memory */
 void zipClose(void* data);
 
 
@@ -88,8 +88,8 @@ FILE* createTempFile();
  */
 bool zipfileExists
 (const std::string&          filename,
- std::string&		     outZipfile,
- std::string&		     outInternalFile);
+ std::string&             outZipfile,
+ std::string&             outInternalFile);
 
 bool zipfileExists(const std::string& filename);
 
diff --git a/dep/src/g3dlite/filter.cpp b/dep/g3dlite/G3D/filter.cpp
similarity index 100%
rename from dep/src/g3dlite/filter.cpp
rename to dep/g3dlite/G3D/filter.cpp
diff --git a/dep/include/g3dlite/G3D/filter.h b/dep/g3dlite/G3D/filter.h
similarity index 100%
rename from dep/include/g3dlite/G3D/filter.h
rename to dep/g3dlite/G3D/filter.h
diff --git a/dep/src/g3dlite/format.cpp b/dep/g3dlite/G3D/format.cpp
similarity index 92%
rename from dep/src/g3dlite/format.cpp
rename to dep/g3dlite/G3D/format.cpp
index d9d1b5163..b77b30c73 100644
--- a/dep/src/g3dlite/format.cpp
+++ b/dep/g3dlite/G3D/format.cpp
@@ -43,7 +43,7 @@ std::string vformat(const char *fmt, va_list argPtr) {
     // allocate it on the stack because this saves
     // the malloc/free time.
     const int bufSize = 161;
-	char stackBuffer[bufSize];
+    char stackBuffer[bufSize];
 
     // MSVC does not support va_copy
     int actualSize = _vscprintf(fmt, argPtr) + 1;
@@ -83,12 +83,12 @@ std::string vformat(const char *fmt, va_list argPtr) {
     // allocate it on the stack because this saves
     // the malloc/free time.
     const int bufSize = 161;
-	char stackBuffer[bufSize];
+    char stackBuffer[bufSize];
 
-	// MSVC6 doesn't support va_copy, however it also seems to compile
-	// correctly if we just pass our argument list along.  Note that 
-	// this whole code block is only compiled if we're on MSVC6 anyway
-	int actualWritten = _vsnprintf(stackBuffer, bufSize, fmt, argPtr);
+    // MSVC6 doesn't support va_copy, however it also seems to compile
+    // correctly if we just pass our argument list along.  Note that 
+    // this whole code block is only compiled if we're on MSVC6 anyway
+    int actualWritten = _vsnprintf(stackBuffer, bufSize, fmt, argPtr);
 
     // Not a big enough buffer, bufSize characters written
     if (actualWritten == -1) {
diff --git a/dep/include/g3dlite/G3D/format.h b/dep/g3dlite/G3D/format.h
similarity index 100%
rename from dep/include/g3dlite/G3D/format.h
rename to dep/g3dlite/G3D/format.h
diff --git a/dep/g3dlite/G3D/g3dfnmatch.cpp b/dep/g3dlite/G3D/g3dfnmatch.cpp
new file mode 100644
index 000000000..0e4e7aa5c
--- /dev/null
+++ b/dep/g3dlite/G3D/g3dfnmatch.cpp
@@ -0,0 +1,223 @@
+/* $Id: g3dfnmatch.cpp,v 1.3 2010/03/15 05:01:23 morgan3d Exp $ */
+
+/*    $OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp $    */
+
+/*
+ * Copyright (c) 1989, 1993, 1994
+ *    The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Guido van Rossum.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    This product includes software developed by the University of
+ *    California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include "G3D/g3dfnmatch.h"
+
+#ifdef G3D_WIN32
+
+#include <ctype.h>
+#include <string.h>
+#include <stdio.h>
+
+namespace G3D {
+
+#define    EOS    '\0'
+
+#define    RANGE_MATCH    1
+#define    RANGE_NOMATCH    0
+#define    RANGE_ERROR    (-1)
+
+static int rangematch(const char *, char, int, char **);
+
+int
+g3dfnmatch(const char *pattern, const char *string, int flags)
+{
+    const char *stringstart;
+    char *newp;
+    char c, test;
+
+    for (stringstart = string;;)
+        switch (c = *pattern++) {
+        case EOS:
+            if ((flags & FNM_LEADING_DIR) && *string == '/')
+                return (0);
+            return (*string == EOS ? 0 : FNM_NOMATCH);
+        case '?':
+            if (*string == EOS)
+                return (FNM_NOMATCH);
+            if (*string == '/' && (flags & FNM_PATHNAME))
+                return (FNM_NOMATCH);
+            if (*string == '.' && (flags & FNM_PERIOD) &&
+                (string == stringstart ||
+                ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
+                return (FNM_NOMATCH);
+            ++string;
+            break;
+        case '*':
+            c = *pattern;
+            /* Collapse multiple stars. */
+            while (c == '*')
+                c = *++pattern;
+
+            if (*string == '.' && (flags & FNM_PERIOD) &&
+                (string == stringstart ||
+                ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
+                return (FNM_NOMATCH);
+
+            /* Optimize for pattern with * at end or before /. */
+            if (c == EOS) {
+                if (flags & FNM_PATHNAME)
+                    return ((flags & FNM_LEADING_DIR) ||
+                        strchr(string, '/') == NULL ?
+                        0 : FNM_NOMATCH);
+                else
+                    return (0);
+            } else if (c == '/' && (flags & FNM_PATHNAME)) {
+                if ((string = strchr(string, '/')) == NULL)
+                    return (FNM_NOMATCH);
+                break;
+            }
+
+            /* General case, use recursion. */
+            while ((test = *string) != EOS) {
+                if (!g3dfnmatch(pattern, string, flags & ~FNM_PERIOD))
+                    return (0);
+                if (test == '/' && (flags & FNM_PATHNAME))
+                    break;
+                ++string;
+            }
+            return (FNM_NOMATCH);
+        case '[':
+            if (*string == EOS)
+                return (FNM_NOMATCH);
+            if (*string == '/' && (flags & FNM_PATHNAME))
+                return (FNM_NOMATCH);
+            if (*string == '.' && (flags & FNM_PERIOD) &&
+                (string == stringstart ||
+                ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
+                return (FNM_NOMATCH);
+
+            switch (rangematch(pattern, *string, flags, &newp)) {
+            case RANGE_ERROR:
+                /* not a good range, treat as normal text */
+                goto normal;
+            case RANGE_MATCH:
+                pattern = newp;
+                break;
+            case RANGE_NOMATCH:
+                return (FNM_NOMATCH);
+            }
+            ++string;
+            break;
+        case '\\':
+            if (!(flags & FNM_NOESCAPE)) {
+                if ((c = *pattern++) == EOS) {
+                    c = '\\';
+                    --pattern;
+                }
+            }
+            /* FALLTHROUGH */
+        default:
+        normal:
+            if (c != *string && !((flags & FNM_CASEFOLD) &&
+                 (tolower((unsigned char)c) ==
+                 tolower((unsigned char)*string))))
+                return (FNM_NOMATCH);
+            ++string;
+            break;
+        }
+    /* NOTREACHED */
+}
+
+static int
+rangematch(const char *pattern, char test, int flags, char **newp)
+{
+    int negate, ok;
+    char c, c2;
+
+    /*
+     * A bracket expression starting with an unquoted circumflex
+     * character produces unspecified results (IEEE 1003.2-1992,
+     * 3.13.2).  This implementation treats it like '!', for
+     * consistency with the regular expression syntax.
+     * J.T. Conklin (conklin@ngai.kaleida.com)
+     */
+    if ((negate = (*pattern == '!' || *pattern == '^')))
+        ++pattern;
+
+    if (flags & FNM_CASEFOLD)
+        test = tolower((unsigned char)test);
+
+    /*
+     * A right bracket shall lose its special meaning and represent
+     * itself in a bracket expression if it occurs first in the list.
+     * -- POSIX.2 2.8.3.2
+     */
+    ok = 0;
+    c = *pattern++;
+    do {
+        if (c == '\\' && !(flags & FNM_NOESCAPE))
+            c = *pattern++;
+        if (c == EOS)
+            return (RANGE_ERROR);
+        if (c == '/' && (flags & FNM_PATHNAME))
+            return (RANGE_NOMATCH);
+        if ((flags & FNM_CASEFOLD))
+            c = tolower((unsigned char)c);
+        if (*pattern == '-'
+            && (c2 = *(pattern+1)) != EOS && c2 != ']') {
+            pattern += 2;
+            if (c2 == '\\' && !(flags & FNM_NOESCAPE))
+                c2 = *pattern++;
+            if (c2 == EOS)
+                return (RANGE_ERROR);
+            if (flags & FNM_CASEFOLD)
+                c2 = tolower((unsigned char)c2);
+            if (c <= test && test <= c2)
+                ok = 1;
+        } else if (c == test)
+            ok = 1;
+    } while ((c = *pattern++) != ']');
+
+    *newp = (char *)pattern;
+    return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH);
+}
+
+}
+
+#else
+
+namespace G3D {
+int g3dfnmatch(const char * a, const char *b, int c) {
+    return fnmatch(a, b, c);
+}
+}
+
+#endif
+
diff --git a/dep/include/g3dlite/G3D/g3dfnmatch.h b/dep/g3dlite/G3D/g3dfnmatch.h
similarity index 100%
rename from dep/include/g3dlite/G3D/g3dfnmatch.h
rename to dep/g3dlite/G3D/g3dfnmatch.h
diff --git a/dep/src/g3dlite/g3dmath.cpp b/dep/g3dlite/G3D/g3dmath.cpp
similarity index 96%
rename from dep/src/g3dlite/g3dmath.cpp
rename to dep/g3dlite/G3D/g3dmath.cpp
index 84e8345bf..da0217112 100644
--- a/dep/src/g3dlite/g3dmath.cpp
+++ b/dep/g3dlite/G3D/g3dmath.cpp
@@ -41,7 +41,7 @@ double inf() {
 }
 
 bool isNaN(float x) {
-    static const float n = nan();
+    static const float n = static_cast<float>(nan());
     return memcmp(&x, &n, sizeof(float)) == 0;
 }
 
@@ -75,7 +75,7 @@ int highestBit(uint32 x) {
     // Binary search.
     int base = 0;
 
-    if (x & 0xffff0000)	{
+    if (x & 0xffff0000)    {
         base = 16;
         x >>= 16;
     }
diff --git a/dep/include/g3dlite/G3D/g3dmath.h b/dep/g3dlite/G3D/g3dmath.h
similarity index 96%
rename from dep/include/g3dlite/G3D/g3dmath.h
rename to dep/g3dlite/G3D/g3dmath.h
index c68a125e3..4d5a9b7b6 100644
--- a/dep/include/g3dlite/G3D/g3dmath.h
+++ b/dep/g3dlite/G3D/g3dmath.h
@@ -147,7 +147,7 @@ inline double twoPi() {
 }
 
 typedef signed char     int8;
-typedef unsigned char	uint8;
+typedef unsigned char    uint8;
 typedef short           int16;
 typedef unsigned short  uint16;
 typedef int             int32;
@@ -525,59 +525,59 @@ inline int iCeil (double fValue) {
 
 inline int iClamp(int val, int low, int hi) {
     debugAssert(low <= hi);
-	if (val <= low) {
-		return low;
-	} else if (val >= hi) {
-		return hi;
-	} else {
-		return val;
-	}
+    if (val <= low) {
+        return low;
+    } else if (val >= hi) {
+        return hi;
+    } else {
+        return val;
+    }
 }
 
 //----------------------------------------------------------------------------
 
 inline int16 iClamp(int16 val, int16 low, int16 hi) {
     debugAssert(low <= hi);
-	if (val <= low) {
-		return low;
-	} else if (val >= hi) {
-		return hi;
-	} else {
-		return val;
-	}
+    if (val <= low) {
+        return low;
+    } else if (val >= hi) {
+        return hi;
+    } else {
+        return val;
+    }
 }
 
 //----------------------------------------------------------------------------
 
 inline double clamp(double val, double low, double hi) {
     debugAssert(low <= hi);
-	if (val <= low) {
-		return low;
-	} else if (val >= hi) {
-		return hi;
-	} else {
-		return val;
-	}
+    if (val <= low) {
+        return low;
+    } else if (val >= hi) {
+        return hi;
+    } else {
+        return val;
+    }
 }
 
 inline float clamp(float val, float low, float hi) {
     debugAssert(low <= hi);
-	if (val <= low) {
-		return low;
-	} else if (val >= hi) {
-		return hi;
-	} else {
-		return val;
-	}
+    if (val <= low) {
+        return low;
+    } else if (val >= hi) {
+        return hi;
+    } else {
+        return val;
+    }
 }
 //----------------------------------------------------------------------------
 
 inline int iWrap(int val, int hi) {
-	if (val < 0) {
-		return ((val % hi) + hi) % hi;
-	} else {
-		return val % hi;
-	}
+    if (val < 0) {
+        return ((val % hi) + hi) % hi;
+    } else {
+        return val % hi;
+    }
 }
 
 //----------------------------------------------------------------------------
@@ -650,11 +650,11 @@ inline double aTan2 (double fY, double fX) {
 inline double sign (double fValue) {
     if (fValue > 0.0) {
         return 1.0;
-	}
+    }
 
     if (fValue < 0.0) {
         return -1.0;
-	}
+    }
 
     return 0.0;
 }
@@ -662,11 +662,11 @@ inline double sign (double fValue) {
 inline float sign (float fValue) {
     if (fValue > 0.0f) {
         return 1.0f;
-	}
+    }
 
     if (fValue < 0.0f) {
         return -1.0f;
-	}
+    }
 
     return 0.0f;
 }
diff --git a/dep/src/g3dlite/license.cpp b/dep/g3dlite/G3D/license.cpp
similarity index 95%
rename from dep/src/g3dlite/license.cpp
rename to dep/g3dlite/G3D/license.cpp
index 5049184cf..3ddb633e6 100644
--- a/dep/src/g3dlite/license.cpp
+++ b/dep/g3dlite/G3D/license.cpp
@@ -1,8 +1,8 @@
 /**
  @file license.cpp
- 
+
  @author Morgan McGuire, graphics3d.com
- 
+
  @created 2004-04-15
  @edited  2004-04-15
 */
@@ -18,13 +18,13 @@ std::string license() {
 "This software is based in part on the PNG Reference Library which is\n"
 "Copyright (c) 2004 Glenn Randers-Pehrson\n\n"
 "This software is based in part on the work of the Independent JPEG Group.\n\n"
-"This software is based on part on the FFmpeg libavformat and libavcodec libraries\n" 
-"(\"FFmpeg\", http://ffmpeg.mplayerhq.hu), which are included under the terms of the\n" 
+"This software is based on part on the FFmpeg libavformat and libavcodec libraries\n"
+"(\"FFmpeg\", http://ffmpeg.mplayerhq.hu), which are included under the terms of the\n"
 "GNU Lesser General Public License (LGPL), (http://www.gnu.org/copyleft/lesser.html).\n\n"
 "%s"
 "This program uses the G3D Library (http://g3d.sf.net), which\n"
 "is licensed under the \"Modified BSD\" Open Source license.  The G3D library\n"
-"source code is Copyright © 2000-2010, Morgan McGuire, All rights reserved.\n"
+"source code is Copyright (c) 2000-2010, Morgan McGuire, All rights reserved.\n"
 "This program uses The OpenGL Extension Wrangler Library, which \n"
 "is licensed under the \"Modified BSD\" Open Source license.  \n"
 "The OpenGL Extension Wrangler Library source code is\n"
@@ -57,7 +57,7 @@ std::string license() {
 "ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\n"
 "THE POSSIBILITY OF SUCH DAMAGE.\n"
 "\n\n"
-"G3D VERSION %d\n", 
+"G3D VERSION %d\n",
 
 #ifdef G3D_WIN32
     "" // Win32 doesn't use SDL
diff --git a/dep/src/g3dlite/license.html b/dep/g3dlite/G3D/license.html
similarity index 100%
rename from dep/src/g3dlite/license.html
rename to dep/g3dlite/G3D/license.html
diff --git a/dep/include/g3dlite/G3D/netheaders.h b/dep/g3dlite/G3D/netheaders.h
similarity index 100%
rename from dep/include/g3dlite/G3D/netheaders.h
rename to dep/g3dlite/G3D/netheaders.h
diff --git a/dep/include/g3dlite/G3D/networkHelpers.h b/dep/g3dlite/G3D/networkHelpers.h
similarity index 100%
rename from dep/include/g3dlite/G3D/networkHelpers.h
rename to dep/g3dlite/G3D/networkHelpers.h
diff --git a/dep/include/g3dlite/G3D/platform.h b/dep/g3dlite/G3D/platform.h
similarity index 96%
rename from dep/include/g3dlite/G3D/platform.h
rename to dep/g3dlite/G3D/platform.h
index c6018bb67..196433134 100644
--- a/dep/include/g3dlite/G3D/platform.h
+++ b/dep/g3dlite/G3D/platform.h
@@ -92,7 +92,7 @@
 #    ifndef __GNUC__
 #        error G3D only supports the gcc compiler on OS X.
 #    endif
-	
+    
 #    if defined(__i386__)
 #        define G3D_OSX_INTEL
 #    elif defined(__PPC__)
@@ -106,10 +106,10 @@
 
 #ifdef _MSC_VER
 // Microsoft Visual C++ 8.0 ("Express")       = 1400
-// Microsoft Visual C++ 7.1	("2003") _MSC_VER = 1310
-// Microsoft Visual C++ 7.0	("2002") _MSC_VER = 1300
-// Microsoft Visual C++ 6.0	_MSC_VER          = 1200
-// Microsoft Visual C++ 5.0	_MSC_VER          = 1100
+// Microsoft Visual C++ 7.1    ("2003") _MSC_VER = 1310
+// Microsoft Visual C++ 7.0    ("2002") _MSC_VER = 1300
+// Microsoft Visual C++ 6.0    _MSC_VER          = 1200
+// Microsoft Visual C++ 5.0    _MSC_VER          = 1100
 
 // Turn off warnings about deprecated C routines
 #   pragma warning (disable : 4996)
@@ -165,17 +165,17 @@
 
     // DLL runtime
     #ifndef _DLL
-	    #define _DLL
+        #define _DLL
     #endif
 
     // Multithreaded runtime
     #ifndef _MT
-	    #define _MT 1
+        #define _MT 1
     #endif
 
     // Ensure that we aren't forced into the static lib
     #ifdef _STATIC_CPPLIB
-	    #undef _STATIC_CPPLIB
+        #undef _STATIC_CPPLIB
     #endif
 
     #ifdef _DEBUG
@@ -200,7 +200,7 @@
         // zlib was linked against the release MSVCRT; force
         // the debug version.
 #        pragma comment(linker, "/NODEFAULTLIB:MSVCRT.LIB")
-#	 endif
+#     endif
 
 
 #    ifndef WIN32_LEAN_AND_MEAN
diff --git a/dep/src/g3dlite/prompt.cpp b/dep/g3dlite/G3D/prompt.cpp
similarity index 92%
rename from dep/src/g3dlite/prompt.cpp
rename to dep/g3dlite/G3D/prompt.cpp
index d78f8b75a..3e18d4ca6 100644
--- a/dep/src/g3dlite/prompt.cpp
+++ b/dep/g3dlite/G3D/prompt.cpp
@@ -541,14 +541,14 @@ static int textPrompt(
 
 // See http://developer.apple.com/documentation/Carbon/Reference/Carbon_Event_Manager_Ref/index.html
 
-#define CARBON_COMMANDID_START	128
-#define CARBON_BUTTON_SPACING	12
-#define CARBON_BUTTON_HEIGHT	20
-#define CARBON_BUTTON_MINWIDTH	69
-#define CARBON_WINDOW_PADDING	20
+#define CARBON_COMMANDID_START    128
+#define CARBON_BUTTON_SPACING    12
+#define CARBON_BUTTON_HEIGHT    20
+#define CARBON_BUTTON_MINWIDTH    69
+#define CARBON_WINDOW_PADDING    20
 
 struct CallbackData {
-    WindowRef	refWindow;
+    WindowRef    refWindow;
 
     /** Index of this particular button */
     int         myIndex;
@@ -567,12 +567,12 @@ static pascal OSStatus DoCommandEvent(EventHandlerCallRef handlerRef, EventRef e
     CallbackData& callbackData = *(CallbackData*)userData;
 
 #   pragma unused(handlerRef)
-	
+    
     callbackData.whichButton[0] = callbackData.myIndex;
-	
+    
     // If we get here we can close the window
     ::QuitAppModalLoopForWindow(callbackData.refWindow);
-	
+    
     // Return noErr to indicate that we handled the event
     return noErr;
 }
@@ -583,11 +583,11 @@ static int guiPrompt
  const char**        choice,
  int                 numChoices) {
 
-    WindowRef	 window;
+    WindowRef     window;
 
-    int          iNumButtonRows	= 0;
+    int          iNumButtonRows    = 0;
     int          iButtonWidth   = -1;
-    OSStatus	 err            = noErr;
+    OSStatus     err            = noErr;
     
     // Determine number of rows of buttons
     while (iButtonWidth < CARBON_BUTTON_MINWIDTH) {
@@ -597,10 +597,10 @@ static int guiPrompt
                     (CARBON_BUTTON_SPACING*numChoices))) / 
             (numChoices/iNumButtonRows);
     }
-	
+    
     // Window Variables
-    Rect	rectWin = {0, 0, 200 + ((iNumButtonRows-1) * (CARBON_BUTTON_HEIGHT+CARBON_BUTTON_SPACING)), 550};			// top, left, bottom, right
-    CFStringRef	szWindowTitle = CFStringCreateWithCString(kCFAllocatorDefault, windowTitle, kCFStringEncodingUTF8);
+    Rect    rectWin = {0, 0, 200 + ((iNumButtonRows-1) * (CARBON_BUTTON_HEIGHT+CARBON_BUTTON_SPACING)), 550};            // top, left, bottom, right
+    CFStringRef    szWindowTitle = CFStringCreateWithCString(kCFAllocatorDefault, windowTitle, kCFStringEncodingUTF8);
 
     window = NULL;
 
@@ -610,28 +610,28 @@ static int guiPrompt
     assert(err == noErr);
     
     // Event Handler Variables
-    EventTypeSpec	buttonSpec[] = {{ kEventClassControl, kEventControlHit }, { kEventClassCommand, kEventCommandProcess }};
-    EventHandlerUPP	buttonHandler = NewEventHandlerUPP(DoCommandEvent);
+    EventTypeSpec    buttonSpec[] = {{ kEventClassControl, kEventControlHit }, { kEventClassCommand, kEventCommandProcess }};
+    EventHandlerUPP    buttonHandler = NewEventHandlerUPP(DoCommandEvent);
     
     // Static Text Variables
-    Rect		rectStatic = {20, 20, 152, 530};
-    CFStringRef		szStaticText = CFStringCreateWithCString(kCFAllocatorDefault, prompt, kCFStringEncodingUTF8);
-    ControlRef		refStaticText = NULL;
+    Rect        rectStatic = {20, 20, 152, 530};
+    CFStringRef        szStaticText = CFStringCreateWithCString(kCFAllocatorDefault, prompt, kCFStringEncodingUTF8);
+    ControlRef        refStaticText = NULL;
     err = CreateStaticTextControl(window, &rectStatic, szStaticText, NULL, &refStaticText);
     
     // Button Variables
-    Rect		bounds[numChoices];
-    CFStringRef		caption[numChoices];
-    ControlRef		button[numChoices];
+    Rect        bounds[numChoices];
+    CFStringRef        caption[numChoices];
+    ControlRef        button[numChoices];
 
     int whichButton=-1;
     CallbackData        callbackData[numChoices];
-	
+    
     // Create the Buttons and assign event handlers
     for (int i = 0; i < numChoices; ++i) {
-        bounds[i].top	 = 160 + ((CARBON_BUTTON_HEIGHT+CARBON_BUTTON_SPACING)*(i%iNumButtonRows));
-        bounds[i].right	 = 530 - ((iButtonWidth+CARBON_BUTTON_SPACING)*(i/iNumButtonRows));
-        bounds[i].left	 = bounds[i].right - iButtonWidth;
+        bounds[i].top     = 160 + ((CARBON_BUTTON_HEIGHT+CARBON_BUTTON_SPACING)*(i%iNumButtonRows));
+        bounds[i].right     = 530 - ((iButtonWidth+CARBON_BUTTON_SPACING)*(i/iNumButtonRows));
+        bounds[i].left     = bounds[i].right - iButtonWidth;
         bounds[i].bottom = bounds[i].top + CARBON_BUTTON_HEIGHT;
         
         // Convert the button captions to Apple strings
diff --git a/dep/include/g3dlite/G3D/prompt.h b/dep/g3dlite/G3D/prompt.h
similarity index 100%
rename from dep/include/g3dlite/G3D/prompt.h
rename to dep/g3dlite/G3D/prompt.h
diff --git a/dep/include/g3dlite/G3D/serialize.h b/dep/g3dlite/G3D/serialize.h
similarity index 100%
rename from dep/include/g3dlite/G3D/serialize.h
rename to dep/g3dlite/G3D/serialize.h
diff --git a/dep/include/g3dlite/G3D/splinefunc.h b/dep/g3dlite/G3D/splinefunc.h
similarity index 100%
rename from dep/include/g3dlite/G3D/splinefunc.h
rename to dep/g3dlite/G3D/splinefunc.h
diff --git a/dep/src/g3dlite/stringutils.cpp b/dep/g3dlite/G3D/stringutils.cpp
similarity index 100%
rename from dep/src/g3dlite/stringutils.cpp
rename to dep/g3dlite/G3D/stringutils.cpp
diff --git a/dep/include/g3dlite/G3D/stringutils.h b/dep/g3dlite/G3D/stringutils.h
similarity index 100%
rename from dep/include/g3dlite/G3D/stringutils.h
rename to dep/g3dlite/G3D/stringutils.h
diff --git a/dep/src/g3dlite/uint128.cpp b/dep/g3dlite/G3D/uint128.cpp
similarity index 100%
rename from dep/src/g3dlite/uint128.cpp
rename to dep/g3dlite/G3D/uint128.cpp
diff --git a/dep/include/g3dlite/G3D/uint128.h b/dep/g3dlite/G3D/uint128.h
similarity index 65%
rename from dep/include/g3dlite/G3D/uint128.h
rename to dep/g3dlite/G3D/uint128.h
index da1af3ec2..5b7901874 100644
--- a/dep/include/g3dlite/G3D/uint128.h
+++ b/dep/g3dlite/G3D/uint128.h
@@ -20,24 +20,24 @@ namespace G3D {
 class uint128 {
 public:
 
-	G3D::uint64 hi;
-	G3D::uint64 lo;
+    G3D::uint64 hi;
+    G3D::uint64 lo;
 
     uint128(const uint64& lo);
 
-	uint128(const uint64& hi, const uint64& lo);
+    uint128(const uint64& hi, const uint64& lo);
 
-	uint128& operator+=(const uint128& x);
+    uint128& operator+=(const uint128& x);
 
-	uint128& operator*=(const uint128& x);
+    uint128& operator*=(const uint128& x);
 
-	uint128& operator^=(const uint128& x);
+    uint128& operator^=(const uint128& x);
 
-	uint128& operator&=(const uint128& x);
+    uint128& operator&=(const uint128& x);
 
-	uint128& operator|=(const uint128& x);
+    uint128& operator|=(const uint128& x);
 
-	bool operator==(const uint128& x);
+    bool operator==(const uint128& x);
 
     uint128& operator>>=(const int x);
 
diff --git a/dep/include/g3dlite/G3D/units.h b/dep/g3dlite/G3D/units.h
similarity index 100%
rename from dep/include/g3dlite/G3D/units.h
rename to dep/g3dlite/G3D/units.h
diff --git a/dep/include/g3dlite/G3D/vectorMath.h b/dep/g3dlite/G3D/vectorMath.h
similarity index 100%
rename from dep/include/g3dlite/G3D/vectorMath.h
rename to dep/g3dlite/G3D/vectorMath.h
diff --git a/dep/src/gsoap/CMakeLists.txt b/dep/gsoap/CMakeLists.txt
similarity index 78%
rename from dep/src/gsoap/CMakeLists.txt
rename to dep/gsoap/CMakeLists.txt
index 08daedc73..d8ccc2bfd 100644
--- a/dep/src/gsoap/CMakeLists.txt
+++ b/dep/gsoap/CMakeLists.txt
@@ -16,17 +16,12 @@
 
 set(LIBRARY_NAME gsoap)
 
-set(LIBRARY_SRCS
-    stdsoap2.cpp
-)
+file(GLOB_RECURSE GSOAP_LIBRARY_SRCS *.cpp *.h)
 
 include_directories(
-  "${CMAKE_CURRENT_SOURCE_DIR}"
-  "${CMAKE_SOURCE_DIR}/dep/include/gsoap"
-  # Used to get access to config.h
-  "${CMAKE_BINARY_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+    # Used to get access to config.h
+    "${CMAKE_BINARY_DIR}"
 )
 
-add_library(${LIBRARY_NAME} STATIC
-  ${LIBRARY_SRCS}
-)
+add_library(${LIBRARY_NAME} STATIC ${GSOAP_LIBRARY_SRCS})
diff --git a/src/mangosd/soapC.cpp b/dep/gsoap/soapC.cpp
similarity index 100%
rename from src/mangosd/soapC.cpp
rename to dep/gsoap/soapC.cpp
diff --git a/src/mangosd/soapH.h b/dep/gsoap/soapH.h
similarity index 100%
rename from src/mangosd/soapH.h
rename to dep/gsoap/soapH.h
diff --git a/src/mangosd/soapServer.cpp b/dep/gsoap/soapServer.cpp
similarity index 100%
rename from src/mangosd/soapServer.cpp
rename to dep/gsoap/soapServer.cpp
diff --git a/src/mangosd/soapStub.h b/dep/gsoap/soapStub.h
similarity index 100%
rename from src/mangosd/soapStub.h
rename to dep/gsoap/soapStub.h
diff --git a/dep/src/gsoap/stdsoap2.cpp b/dep/gsoap/stdsoap2.cpp
similarity index 99%
rename from dep/src/gsoap/stdsoap2.cpp
rename to dep/gsoap/stdsoap2.cpp
index a882aee45..872949ffc 100644
--- a/dep/src/gsoap/stdsoap2.cpp
+++ b/dep/gsoap/stdsoap2.cpp
@@ -1,7 +1,7 @@
 /*
-	stdsoap2.c[pp] 2.7.15
+    stdsoap2.c[pp] 2.7.15
 
-	gSOAP runtime engine
+    gSOAP runtime engine
 
 gSOAP XML Web services tools
 Copyright (C) 2000-2009, Robert van Engelen, Genivia Inc., All Rights Reserved.
@@ -64,7 +64,7 @@ when locally allocated data exceeds 64K.
 */
 
 #ifdef AS400
-# pragma convert(819)	/* EBCDIC to ASCII */
+# pragma convert(819)    /* EBCDIC to ASCII */
 #endif
 
 #include "stdsoap2.h"
@@ -101,13 +101,13 @@ SOAP_SOURCE_STAMP("@(#) stdsoap2.c ver 2.7.15 2009-11-07 00:00:00 GMT")
 #define SOAP_QT (soap_wchar)(-5) /* XML character '"' */
 #define SOAP_AP (soap_wchar)(-6) /* XML character ''' */
 
-#define soap_blank(c)		((c) >= 0 && (c) <= 32)
-#define soap_notblank(c)	((c) > 32)
+#define soap_blank(c)        ((c) >= 0 && (c) <= 32)
+#define soap_notblank(c)    ((c) > 32)
 
 #if defined(WIN32) && !defined(UNDER_CE)
-#define soap_hash_ptr(p)	((PtrToUlong(p) >> 3) & (SOAP_PTRHASH - 1))
+#define soap_hash_ptr(p)    ((PtrToUlong(p) >> 3) & (SOAP_PTRHASH - 1))
 #else
-#define soap_hash_ptr(p)	((size_t)(((unsigned long)(p) >> 3) & (SOAP_PTRHASH-1)))
+#define soap_hash_ptr(p)    ((size_t)(((unsigned long)(p) >> 3) & (SOAP_PTRHASH-1)))
 #endif
 
 #ifndef PALM_1
@@ -488,14 +488,14 @@ static const struct soap_code_map h_ssl_error_codes[] =
 
 #ifndef WITH_LEANER
 static const struct soap_code_map mime_codes[] =
-{ { SOAP_MIME_7BIT,		"7bit" },
-  { SOAP_MIME_8BIT,		"8bit" },
-  { SOAP_MIME_BINARY,		"binary" },
+{ { SOAP_MIME_7BIT,        "7bit" },
+  { SOAP_MIME_8BIT,        "8bit" },
+  { SOAP_MIME_BINARY,        "binary" },
   { SOAP_MIME_QUOTED_PRINTABLE, "quoted-printable" },
-  { SOAP_MIME_BASE64,		"base64" },
-  { SOAP_MIME_IETF_TOKEN,	"ietf-token" },
-  { SOAP_MIME_X_TOKEN,		"x-token" },
-  { 0,				NULL }
+  { SOAP_MIME_BASE64,        "base64" },
+  { SOAP_MIME_IETF_TOKEN,    "ietf-token" },
+  { SOAP_MIME_X_TOKEN,        "x-token" },
+  { 0,                NULL }
 };
 #endif
 
@@ -539,8 +539,8 @@ fsend(struct soap *soap, const char *s, size_t n)
             break;
           if (!r)
             return SOAP_EOF;
-	  err = soap->errnum;
-	  if (!err)
+      err = soap->errnum;
+      if (!err)
             return soap->error;
           if (err != SOAP_EINTR && err != SOAP_EAGAIN && err != SOAP_EWOULDBLOCK)
             return SOAP_EOF;
@@ -613,9 +613,9 @@ fsend(struct soap *soap, const char *s, size_t n)
 #else
           r = tcp_select(soap, soap->socket, SOAP_TCP_SELECT_SND | SOAP_TCP_SELECT_ERR, soap->send_timeout ? soap->send_timeout : -10000);
 #endif
-	  if (!r && soap->send_timeout)
+      if (!r && soap->send_timeout)
             return SOAP_EOF;
-	  if (r < 0 && soap->errnum != SOAP_EINTR)
+      if (r < 0 && soap->errnum != SOAP_EINTR)
             return SOAP_EOF;
 #endif
         }
@@ -854,7 +854,7 @@ frecv(struct soap *soap, char *s, size_t n)
             break;
           if (!r)
             return 0;
-	  r = soap->errnum;
+      r = soap->errnum;
           if (r != SOAP_EINTR && r != SOAP_EAGAIN && r != SOAP_EWOULDBLOCK)
             return 0;
         }
@@ -882,7 +882,7 @@ frecv(struct soap *soap, char *s, size_t n)
         if ((soap->omode & SOAP_IO_UDP))
         { SOAP_SOCKLEN_T k = (SOAP_SOCKLEN_T)sizeof(soap->peer);
           memset((void*)&soap->peer, 0, sizeof(soap->peer));
-          r = recvfrom(soap->socket, s, (SOAP_WINSOCKINT)n, soap->socket_flags, (struct sockaddr*)&soap->peer, &k);	/* portability note: see SOAP_SOCKLEN_T definition in stdsoap2.h */
+          r = recvfrom(soap->socket, s, (SOAP_WINSOCKINT)n, soap->socket_flags, (struct sockaddr*)&soap->peer, &k);    /* portability note: see SOAP_SOCKLEN_T definition in stdsoap2.h */
           soap->peerlen = (size_t)k;
 #ifndef WITH_IPV6
           soap->ip = ntohl(soap->peer.sin_addr.s_addr);
@@ -1004,7 +1004,7 @@ soap_recv_raw(struct soap *soap)
       soap->d_stream->avail_out = SOAP_BUFLEN;
       r = inflate(soap->d_stream, Z_NO_FLUSH);
       if (r == Z_NEED_DICT && soap->z_dict)
-	r = inflateSetDictionary(soap->d_stream, (const Bytef*)soap->z_dict, soap->z_dict_len);
+    r = inflateSetDictionary(soap->d_stream, (const Bytef*)soap->z_dict, soap->z_dict_len);
       if (r == Z_OK || r == Z_STREAM_END)
       { soap->bufidx = 0;
         ret = soap->buflen = SOAP_BUFLEN - soap->d_stream->avail_out;
@@ -1085,7 +1085,7 @@ zlib_again:
           c = soap_getchunkchar(soap);
         ret = 0;
         soap->ahead = EOF;
-	break;
+    break;
       }
       soap->buflen = soap->bufidx + soap->chunksize;
       DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Moving buf len to idx=%u len=%u (%s)\n", (unsigned int)soap->bufidx, (unsigned int)soap->buflen, tmp));
@@ -2367,7 +2367,7 @@ soap_end_block(struct soap *soap, struct soap_blist *b)
       for (bp = soap->blist; bp; bp = bp->next)
       { if (bp->next == b)
         { bp->next = b->next;
-	  break;
+      break;
         }
       }
     }
@@ -2856,7 +2856,7 @@ soap_match_array(struct soap *soap, const char *type)
 
 /******************************************************************************\
  *
- *	SSL
+ *    SSL
  *
 \******************************************************************************/
 
@@ -3810,7 +3810,7 @@ again:
 #endif
             return SOAP_INVALID_SOCKET;
           }
-	  r = soap->errnum;
+      r = soap->errnum;
           if (r != SOAP_EINTR)
           { DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Could not connect to host\n"));
             soap_set_sender_error(soap, tcp_error(soap), "connect failed in tcp_connect()", SOAP_TCP_ERROR);
@@ -3822,7 +3822,7 @@ again:
           }
         }
         k = (SOAP_SOCKLEN_T)sizeof(soap->errnum);
-        if (!getsockopt(fd, SOL_SOCKET, SO_ERROR, (char*)&soap->errnum, &k) && !soap->errnum)	/* portability note: see SOAP_SOCKLEN_T definition in stdsoap2.h */
+        if (!getsockopt(fd, SOL_SOCKET, SO_ERROR, (char*)&soap->errnum, &k) && !soap->errnum)    /* portability note: see SOAP_SOCKLEN_T definition in stdsoap2.h */
           break;
         DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Could not connect to host\n"));
         if (!soap->errnum)
@@ -3964,7 +3964,7 @@ again:
       { int err = SSL_get_error(soap->ssl, r);
         if (err == SSL_ERROR_WANT_CONNECT || err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE)
         { register int s;
-	  if (err == SSL_ERROR_WANT_READ)
+      if (err == SSL_ERROR_WANT_READ)
             s = tcp_select(soap, soap->socket, SOAP_TCP_SELECT_RCV | SOAP_TCP_SELECT_ERR, -100000);
           else
             s = tcp_select(soap, soap->socket, SOAP_TCP_SELECT_SND | SOAP_TCP_SELECT_ERR, -100000);
@@ -3974,14 +3974,14 @@ again:
             soap->fclosesocket(soap, fd);
             return SOAP_INVALID_SOCKET;
           }
-	  if (s == 0 && retries-- <= 0)
+      if (s == 0 && retries-- <= 0)
           { DBGLOG(TEST, SOAP_MESSAGE(fdebug, "SSL connect timeout\n"));
             soap_set_sender_error(soap, "Timeout", "SSL connect failed in tcp_connect()", SOAP_TCP_ERROR);
             soap->fclosesocket(soap, fd);
             return SOAP_INVALID_SOCKET;
           }
         }
-	else
+    else
         { soap_set_sender_error(soap, soap_ssl_error(soap, r), "SSL_connect error in tcp_connect()", SOAP_SSL_ERROR);
           soap->fclosesocket(soap, fd);
           return SOAP_INVALID_SOCKET;
@@ -4047,7 +4047,7 @@ again:
 #endif
               if (ext_data)
               { val = meth->i2v(meth, ext_data, NULL);
-		if (val)
+        if (val)
                 { for (j = 0; j < sk_CONF_VALUE_num(val); j++)
                   { CONF_VALUE *nval = sk_CONF_VALUE_value(val, j);
                     if (nval && !strcmp(nval->name, "DNS") && !strcmp(nval->value, host))
@@ -4065,7 +4065,7 @@ again:
 #else
                 meth->ext_free(ext_data);
 #endif
-	      }
+          }
             }
             if (ok)
               break;
@@ -4490,14 +4490,14 @@ soap_accept(struct soap *soap)
           { soap_set_receiver_error(soap, "Timeout", "accept failed in soap_accept()", SOAP_TCP_ERROR);
             return SOAP_INVALID_SOCKET;
           }
-	  if (r < 0)
+      if (r < 0)
           { r = soap->errnum;
             if (r != SOAP_EINTR)
             { soap_closesock(soap);
               soap_set_sender_error(soap, tcp_error(soap), "accept failed in soap_accept()", SOAP_TCP_ERROR);
               return SOAP_INVALID_SOCKET;
             }
-	  }
+      }
         }
       }
       if (soap->accept_timeout || soap->send_timeout || soap->recv_timeout)
@@ -4614,7 +4614,7 @@ tcp_disconnect(struct soap *soap)
     { SSL_read(soap->ssl, NULL, 0);
       if (soap_socket_errno(soap->socket) != SOAP_EAGAIN)
       { r = SSL_shutdown(soap->ssl);
-	break;
+    break;
       }
     }
     if (r == 0)
@@ -4973,7 +4973,7 @@ soap_begin_count(struct soap *soap)
     soap->mode &= ~SOAP_ENC_MTOM;
   if (soap->mode & SOAP_ENC_MIME)
     soap_select_mime_boundary(soap);
-  soap->dime.list = soap->dime.last;	/* keep track of last DIME attachment */
+  soap->dime.list = soap->dime.last;    /* keep track of last DIME attachment */
 #endif
   soap->count = 0;
   soap->ns = 0;
@@ -5726,7 +5726,7 @@ soap_delegate_deletion(struct soap *soap, struct soap *soap_to)
     { if ((*mp)->ptr == p)
       { mq = *mp;
         *mp = mq->next;
-	mq->next = soap_to->mht[h];
+    mq->next = soap_to->mht[h];
         soap_to->mht[h] = mq;
         break;
       }
@@ -5872,7 +5872,7 @@ soap_id_lookup(struct soap *soap, const char *id, void **p, int t, size_t n, uns
       while (q)
       { *r = (void*)soap_malloc(soap, sizeof(void*));
         if (!*r)
-	  return NULL;
+      return NULL;
         s = *q;
         *q = *r;
         r = (void**)*r;
@@ -7490,7 +7490,7 @@ soap_element_start_end_out(struct soap *soap, const char *tag)
       return SOAP_OK;
     }
 #endif
-    soap->level--;	/* decrement level just before /> */
+    soap->level--;    /* decrement level just before /> */
     if (soap_send_raw(soap, "/>", 2))
       return soap->error;
     return SOAP_OK;
@@ -7534,7 +7534,7 @@ soap_element_end_out(struct soap *soap, const char *tag)
   if (soap_send_raw(soap, "</", 2)
    || soap_send(soap, tag))
     return soap->error;
-  soap->level--;	/* decrement level just before > */
+  soap->level--;    /* decrement level just before > */
   return soap_send_raw(soap, ">", 1);
 }
 #endif
@@ -8421,7 +8421,7 @@ soap_peek_element(struct soap *soap)
         }
         else
 #endif
-	if (!soap_match_tag(soap, tp->name, "SOAP-ENC:itemType"))
+    if (!soap_match_tag(soap, tp->name, "SOAP-ENC:itemType"))
           strncpy(soap->arrayType, tp->value, sizeof(soap->arrayType) - 1);
         else if (!soap_match_tag(soap, tp->name, "SOAP-ENC:arraySize"))
           strncpy(soap->arraySize, tp->value, sizeof(soap->arraySize) - 1);
@@ -8623,7 +8623,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
   if (!flag)
   { register int state = 0;
 #ifdef WITH_FAST
-    soap->labidx = 0;			/* use look-aside buffer */
+    soap->labidx = 0;            /* use look-aside buffer */
 #else
     if (soap_new_block(soap) == NULL)
       return NULL;
@@ -8632,11 +8632,11 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
     {
 #ifdef WITH_FAST
       register size_t k;
-      if (soap_append_lab(soap, NULL, 0))	/* allocate more space in look-aside buffer if necessary */
+      if (soap_append_lab(soap, NULL, 0))    /* allocate more space in look-aside buffer if necessary */
         return NULL;
-      s = soap->labbuf + soap->labidx;	/* space to populate */
-      k = soap->lablen - soap->labidx;	/* number of bytes available */
-      soap->labidx = soap->lablen;	/* claim this space */
+      s = soap->labbuf + soap->labidx;    /* space to populate */
+      k = soap->lablen - soap->labidx;    /* number of bytes available */
+      soap->labidx = soap->lablen;    /* claim this space */
 #else
       register size_t k = SOAP_BLKLEN;
       if (!(s = (char*)soap_push_block(soap, NULL, k)))
@@ -8644,7 +8644,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
 #endif
       for (i = 0; i < k; i++)
       { if (m > 0)
-        { *s++ = *t++;	/* copy multibyte characters */
+        { *s++ = *t++;    /* copy multibyte characters */
           m--;
           continue;
         }
@@ -8751,8 +8751,8 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
           m = 1;
           break;
         case SOAP_LT:
-	  if (f && n == 0)
-	    goto end;
+      if (f && n == 0)
+        goto end;
           n++;
           *s++ = '<';
           break;
@@ -8803,11 +8803,11 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
           else if (c == '?')
             state = 3;
           else if (f && n == 0)
-	  { soap_revget1(soap);
-	    c = '<';
-	    goto end;
-	  }
-	  else
+      { soap_revget1(soap);
+        c = '<';
+        goto end;
+      }
+      else
             n++;
           soap_unget(soap, c);
           *s++ = '<';
@@ -8849,7 +8849,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
   }
 #endif
 #ifdef WITH_FAST
-  soap->labidx = 0;			/* use look-aside buffer */
+  soap->labidx = 0;            /* use look-aside buffer */
 #else
   if (soap_new_block(soap) == NULL)
     return NULL;
@@ -8858,11 +8858,11 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
   {
 #ifdef WITH_FAST
     register size_t k;
-    if (soap_append_lab(soap, NULL, 0))	/* allocate more space in look-aside buffer if necessary */
+    if (soap_append_lab(soap, NULL, 0))    /* allocate more space in look-aside buffer if necessary */
       return NULL;
-    s = soap->labbuf + soap->labidx;	/* space to populate */
-    k = soap->lablen - soap->labidx;	/* number of bytes available */
-    soap->labidx = soap->lablen;	/* claim this space */
+    s = soap->labbuf + soap->labidx;    /* space to populate */
+    k = soap->lablen - soap->labidx;    /* number of bytes available */
+    soap->labidx = soap->lablen;    /* claim this space */
 #else
     register size_t k = SOAP_BLKLEN;
     if (!(s = (char*)soap_push_block(soap, NULL, k)))
@@ -8870,7 +8870,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
 #endif
     for (i = 0; i < k; i++)
     { if (m > 0)
-      { *s++ = *t++;	/* copy multibyte characters */
+      { *s++ = *t++;    /* copy multibyte characters */
         m--;
         continue;
       }
@@ -8919,8 +8919,8 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
         m = 1;
         break;
       case SOAP_LT:
-	if (f && n == 0)
-	  goto end;
+    if (f && n == 0)
+      goto end;
         n++;
         *s++ = '<';
         break;
@@ -9199,7 +9199,7 @@ soap_wstring_in(struct soap *soap, int flag, long minlen, long maxlen)
         break;
       case SOAP_LT:
         if (f && n == 0)
-	  goto end;
+      goto end;
         n++;
         *s++ = '<';
         break;
@@ -9699,7 +9699,7 @@ soap_float2s(struct soap *soap, float n)
   sprintf_l(s, soap->c_locale, soap->float_format, n);
 #else
   sprintf(s, soap->float_format, n);
-  s = strchr(s, ',');	/* convert decimal comma to DP */
+  s = strchr(s, ',');    /* convert decimal comma to DP */
   if (s)
     *s = '.';
 #endif
@@ -9845,7 +9845,7 @@ soap_double2s(struct soap *soap, double n)
   sprintf_l(s, soap->c_locale, soap->double_format, n);
 #else
   sprintf(s, soap->double_format, n);
-  s = strchr(s, ',');	/* convert decimal comma to DP */
+  s = strchr(s, ',');    /* convert decimal comma to DP */
   if (s)
     *s = '.';
 #endif
@@ -10349,7 +10349,7 @@ soap_s2string(struct soap *soap, const char *s, char **t, long minlen, long maxl
       /* remove non-ASCII chars */
       for (s = *t; *s; s++)
         if (!(*s & 0x80))
-	  *r++ = *s;
+      *r++ = *s;
       *r = '\0';
     }
     if ((soap->mode & SOAP_XML_STRICT))
@@ -10393,7 +10393,7 @@ soap_s2QName(struct soap *soap, const char *s, char **t, long minlen, long maxle
       else /* we normalize the QName by replacing its prefix */
       { for (p = s; *p && p < s + n; p++)
           if (*p == ':')
-	    break;
+        break;
         if (*p == ':')
         { size_t k = p - s;
           while (np && (strncmp(np->id, s, k) || np->id[k]))
@@ -10425,9 +10425,9 @@ soap_s2QName(struct soap *soap, const char *s, char **t, long minlen, long maxle
         else if (s[n]) /* no namespace, part of string */
         { soap_append_lab(soap, s, n);
         }
-	else /* no namespace: assume "" namespace */
+    else /* no namespace: assume "" namespace */
         { soap_append_lab(soap, "\"\"", 2);
-	}
+    }
         soap_append_lab(soap, ":", 1);
         soap_append_lab(soap, p, n - (p-s));
       }
@@ -10906,7 +10906,7 @@ soap_s2dateTime(struct soap *soap, const char *s, time_t *p)
       { int h = 0, m = 0;
         if (s[3] == ':')
         { /* +hh:mm */
-	  sscanf(s, "%d:%d", &h, &m);
+      sscanf(s, "%d:%d", &h, &m);
           if (h < 0)
             m = -m;
         }
@@ -10915,22 +10915,22 @@ soap_s2dateTime(struct soap *soap, const char *s, time_t *p)
           h = m / 100;
           m = m % 100;
         }
-	T.tm_min -= m;
-	T.tm_hour -= h;
-	/* put hour and min in range */
+    T.tm_min -= m;
+    T.tm_hour -= h;
+    /* put hour and min in range */
         T.tm_hour += T.tm_min / 60;
         T.tm_min %= 60;
         if (T.tm_min < 0)
         { T.tm_min += 60;
-	  T.tm_hour--;
-	}
+      T.tm_hour--;
+    }
         T.tm_mday += T.tm_hour / 24;
         T.tm_hour %= 24;
         if (T.tm_hour < 0)
         { T.tm_hour += 24;
           T.tm_mday--;
-	}
-	/* note: day of the month may be out of range, timegm() handles it */
+    }
+    /* note: day of the month may be out of range, timegm() handles it */
       }
 #endif
       *p = soap_timegm(&T);
@@ -12194,7 +12194,7 @@ soap_valid_mime_boundary(struct soap *soap)
 
 /******************************************************************************\
  *
- *	HTTP cookie handling
+ *    HTTP cookie handling
  *
 \******************************************************************************/
 
@@ -12478,7 +12478,7 @@ soap_putsetcookies(struct soap *soap)
       { if (*t == '/')
           t++;
         if ((int)strlen(t) < tmp-s+4064)
-        { if (strchr(t, '%'))	/* already URL encoded? */
+        { if (strchr(t, '%'))    /* already URL encoded? */
           { strcpy(s, t);
             s += strlen(s);
           }
@@ -12921,7 +12921,7 @@ soap_begin_recv(struct soap *soap)
   soap->error = SOAP_OK;
   soap_free_temp(soap);
   soap_set_local_namespaces(soap);
-  soap->version = 0;	/* don't assume we're parsing SOAP content by default */
+  soap->version = 0;    /* don't assume we're parsing SOAP content by default */
 #ifndef WITH_NOIDREF
   soap_free_iht(soap);
 #endif
@@ -13266,8 +13266,8 @@ http_parse(struct soap *soap)
           case  3: soap->error = soap->fput(soap); break;
           case  4: soap->error = soap->fdel(soap); break;
           case  5: soap->error = soap->fhead(soap); break;
-	  default: soap->error = 405; break;
-	}
+      default: soap->error = 405; break;
+    }
         if (soap->error == SOAP_OK)
           soap->error = SOAP_STOP; /* prevents further processing */
         return soap->error;
@@ -13551,7 +13551,7 @@ soap_envelope_begin_out(struct soap *soap)
       return soap->error;
   }
   if (soap->mode & SOAP_IO_LENGTH)
-    soap->dime.size = soap->count;	/* DIME in MIME correction */
+    soap->dime.size = soap->count;    /* DIME in MIME correction */
   if (!(soap->mode & SOAP_IO_LENGTH) && (soap->mode & SOAP_ENC_DIME))
   { if (soap_putdimehdr(soap))
       return soap->error;
@@ -13572,7 +13572,7 @@ soap_envelope_end_out(struct soap *soap)
     return soap->error;
 #ifndef WITH_LEANER
   if ((soap->mode & SOAP_IO_LENGTH) && (soap->mode & SOAP_ENC_DIME) && !(soap->mode & SOAP_ENC_MTOM))
-  { soap->dime.size = soap->count - soap->dime.size;	/* DIME in MIME correction */
+  { soap->dime.size = soap->count - soap->dime.size;    /* DIME in MIME correction */
     sprintf(soap->id, soap->dime_id_format, 0);
     soap->dime.id = soap->id;
     if (soap->local_namespaces)
@@ -13610,7 +13610,7 @@ soap_get_http_body(struct soap *soap)
       return NULL;
   }
 #ifdef WITH_FAST
-  soap->labidx = 0;			/* use look-aside buffer */
+  soap->labidx = 0;            /* use look-aside buffer */
 #else
   if (soap_new_block(soap) == NULL)
     return NULL;
@@ -13619,11 +13619,11 @@ soap_get_http_body(struct soap *soap)
   {
 #ifdef WITH_FAST
     register size_t i, k;
-    if (soap_append_lab(soap, NULL, 0))	/* allocate more space in look-aside buffer if necessary */
+    if (soap_append_lab(soap, NULL, 0))    /* allocate more space in look-aside buffer if necessary */
       return NULL;
-    s = soap->labbuf + soap->labidx;	/* space to populate */
-    k = soap->lablen - soap->labidx;	/* number of bytes available */
-    soap->labidx = soap->lablen;	/* claim this space */
+    s = soap->labbuf + soap->labidx;    /* space to populate */
+    k = soap->lablen - soap->labidx;    /* number of bytes available */
+    soap->labidx = soap->lablen;    /* claim this space */
 #else
     register size_t i, k = SOAP_BLKLEN;
     if (!(s = (char*)soap_push_block(soap, NULL, k)))
@@ -14167,7 +14167,7 @@ soap_puthttphdr(struct soap *soap, int status, size_t count)
     { if (soap->mode & SOAP_ENC_MTOM)
       { if (soap->version == 2)
           r = "application/soap+xml";
-	else
+    else
           r = "text/xml";
         s = "application/xop+xml";
       }
@@ -14430,7 +14430,7 @@ http_response(struct soap *soap, int status, size_t count)
       if ((err = soap->fposthdr(soap, soap->tmpbuf, NULL)))
         return err;
     }
-    else if ((err = soap->fposthdr(soap, "Status", s)))	/* CGI */
+    else if ((err = soap->fposthdr(soap, "Status", s)))    /* CGI */
       return err;
   }
   if ((err = soap->fposthdr(soap, "Server", "gSOAP/2.7"))
@@ -14727,7 +14727,7 @@ soap_send_fault(struct soap *soap)
     { r = tcp_select(soap, soap->socket, SOAP_TCP_SELECT_RCV | SOAP_TCP_SELECT_SND, 0);
       if (r > 0)
       { if (!(r & SOAP_TCP_SELECT_SND)
-	 || ((r & SOAP_TCP_SELECT_RCV)
+     || ((r & SOAP_TCP_SELECT_RCV)
           && recv(soap->socket, soap->tmpbuf, 1, MSG_PEEK) < 0))
           r = 0;
       }
@@ -15155,7 +15155,7 @@ soap_lookup_plugin(struct soap *soap, const char *id)
 
 /******************************************************************************\
  *
- *	C++ soap struct methods
+ *    C++ soap struct methods
  *
 \******************************************************************************/
 
diff --git a/dep/include/gsoap/stdsoap2.h b/dep/gsoap/stdsoap2.h
similarity index 80%
rename from dep/include/gsoap/stdsoap2.h
rename to dep/gsoap/stdsoap2.h
index 8b1f92298..89ef2a14a 100644
--- a/dep/include/gsoap/stdsoap2.h
+++ b/dep/gsoap/stdsoap2.h
@@ -1,7 +1,7 @@
 /*
-	stdsoap2.h 2.7.15
+    stdsoap2.h 2.7.15
 
-	gSOAP runtime engine
+    gSOAP runtime engine
 
 gSOAP XML Web services tools
 Copyright (C) 2000-2009, Robert van Engelen, Genivia Inc., All Rights Reserved.
@@ -52,7 +52,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
 */
 
 #ifdef WITH_SOAPDEFS_H
-# include "soapdefs.h"		/* include user-defined stuff */
+# include "soapdefs.h"        /* include user-defined stuff */
 #endif
 
 #ifndef _THREAD_SAFE
@@ -65,43 +65,43 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
 # endif
 #endif
 
-#ifndef SOAP_FMAC1	/* stdsoap2.h declaration macro */
+#ifndef SOAP_FMAC1    /* stdsoap2.h declaration macro */
 # define SOAP_FMAC1
 #endif
 
-#ifndef SOAP_FMAC2	/* stdsoap2.h declaration macro */
+#ifndef SOAP_FMAC2    /* stdsoap2.h declaration macro */
 # define SOAP_FMAC2
 #endif
 
-#ifndef SOAP_FMAC3	/* (de)serializer declaration macro */
+#ifndef SOAP_FMAC3    /* (de)serializer declaration macro */
 # define SOAP_FMAC3
 #endif
 
-#ifndef SOAP_FMAC3S	/* string converter for (de)serializer declaration macro */
+#ifndef SOAP_FMAC3S    /* string converter for (de)serializer declaration macro */
 # define SOAP_FMAC3S SOAP_FMAC3
 #endif
 
-#ifndef SOAP_FMAC4	/* (de)serializer declaration macro */
+#ifndef SOAP_FMAC4    /* (de)serializer declaration macro */
 # define SOAP_FMAC4
 #endif
 
-#ifndef SOAP_FMAC4S	/* string converter for (de)serializer declaration macro */
+#ifndef SOAP_FMAC4S    /* string converter for (de)serializer declaration macro */
 # define SOAP_FMAC4S SOAP_FMAC4
 #endif
 
-#ifndef SOAP_FMAC5	/* stub/skeleton declaration macro */
+#ifndef SOAP_FMAC5    /* stub/skeleton declaration macro */
 # define SOAP_FMAC5
 #endif
 
-#ifndef SOAP_FMAC6	/* stub/skeleton declaration macro */
+#ifndef SOAP_FMAC6    /* stub/skeleton declaration macro */
 # define SOAP_FMAC6
 #endif
 
-#ifndef SOAP_CMAC	/* class declaration macro */
+#ifndef SOAP_CMAC    /* class declaration macro */
 # define SOAP_CMAC
 #endif
 
-#ifndef SOAP_NMAC	/* namespace table declaration macro */
+#ifndef SOAP_NMAC    /* namespace table declaration macro */
 # define SOAP_NMAC
 #endif
 
@@ -206,7 +206,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
 # if defined(WITH_OPENSSL)
 #  ifndef HAVE_OPENSSL_SSL_H
 #   undef WITH_OPENSSL
@@ -390,7 +389,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
 # elif defined(PALM)
 #  define WITH_LEAN
 #  define HAVE_STRTOD   /* strtod() is defined in palmFunctions.h */
-#  include <stdlib.h>	/* Needs to be included before unix headers */
+#  include <stdlib.h>    /* Needs to be included before unix headers */
 #  include <sys_types.h>
 #  define IGNORE_STDIO_STUBS
 #  include <StdIOPalm.h>
@@ -400,7 +399,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
 # elif defined(SYMBIAN)
 #  define WITH_LEAN
 #  define WITH_NONAMESPACES
-#  define HAVE_STRTOD	/* use STRTOD since sscanf doesn't seem to work */
+#  define HAVE_STRTOD    /* use STRTOD since sscanf doesn't seem to work */
 #  include <e32def.h>
 #  include <sys/ioctl.h>
 # elif defined(VXWORKS)
@@ -545,7 +544,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
 #  endif
 #  ifndef WITH_LEAN
 #   ifdef HAVE_SYS_TIMEB_H
-#    include <sys/timeb.h>		/* for ftime() */
+#    include <sys/timeb.h>        /* for ftime() */
 #   endif
 #   include <time.h>
 #  endif
@@ -575,8 +574,8 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
 #    endif
 #   endif
 #   ifdef SUN_OS
-#    include <sys/stream.h>		/* SUN */
-#    include <sys/socketvar.h>		/* SUN < 2.8 (?) */
+#    include <sys/stream.h>        /* SUN */
+#    include <sys/socketvar.h>        /* SUN < 2.8 (?) */
 #   endif
 #   ifdef VXWORKS
 #    ifdef _WRS_KERNEL
@@ -664,9 +663,9 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
 #endif
 
 #ifdef WITH_CASEINSENSITIVETAGS
-# define SOAP_STRCMP soap_tag_cmp	/* case insensitve XML element/attribute names */
+# define SOAP_STRCMP soap_tag_cmp    /* case insensitve XML element/attribute names */
 #else
-# define SOAP_STRCMP strcmp		/* case sensitive XML element/attribute names */
+# define SOAP_STRCMP strcmp        /* case sensitive XML element/attribute names */
 #endif
 
 #ifdef WITH_ZLIB
@@ -675,7 +674,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
 
 #ifndef WITH_NOSTDLIB
 # ifndef PALM
-#  include <math.h>	/* for isnan() */
+#  include <math.h>    /* for isnan() */
 # endif
 #endif
 
@@ -761,11 +760,11 @@ extern "C" {
 #endif
 
 #ifndef SOAP_LONG_FORMAT
-# define SOAP_LONG_FORMAT "%lld"	/* printf format for 64 bit ints */
+# define SOAP_LONG_FORMAT "%lld"    /* printf format for 64 bit ints */
 #endif
 
 #ifndef SOAP_ULONG_FORMAT
-# define SOAP_ULONG_FORMAT "%llu"	/* printf format for unsigned 64 bit ints */
+# define SOAP_ULONG_FORMAT "%llu"    /* printf format for unsigned 64 bit ints */
 #endif
 
 #if defined(WIN32) && !defined(CYGWIN)
@@ -877,14 +876,14 @@ extern "C" {
 #endif
 #ifndef SOAP_MAXDIMS
 # ifndef WITH_LEAN
-#  define SOAP_MAXDIMS	 (16) /* maximum array dimensions (array nestings) must be less than 64 to protect soap->tmpbuf */
+#  define SOAP_MAXDIMS     (16) /* maximum array dimensions (array nestings) must be less than 64 to protect soap->tmpbuf */
 # else
-#  define SOAP_MAXDIMS	  (4)
+#  define SOAP_MAXDIMS      (4)
 # endif
 #endif
 
 #ifndef SOAP_MAXLOGS
-# define SOAP_MAXLOGS	  (3) /* max number of debug logs per struct soap environment */
+# define SOAP_MAXLOGS      (3) /* max number of debug logs per struct soap environment */
 # define SOAP_INDEX_RECV  (0)
 # define SOAP_INDEX_SENT  (1)
 # define SOAP_INDEX_TEST  (2)
@@ -1007,55 +1006,55 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan;
 
 /* gSOAP error codes */
 
-#define SOAP_EOF			EOF
-#define SOAP_ERR			EOF
-#define SOAP_OK				0
-#define SOAP_CLI_FAULT			1
-#define SOAP_SVR_FAULT			2
-#define SOAP_TAG_MISMATCH		3
-#define SOAP_TYPE			4
-#define SOAP_SYNTAX_ERROR		5
-#define SOAP_NO_TAG			6
-#define SOAP_IOB			7
-#define SOAP_MUSTUNDERSTAND		8
-#define SOAP_NAMESPACE			9
-#define SOAP_USER_ERROR			10
-#define SOAP_FATAL_ERROR		11
-#define SOAP_FAULT			12
-#define SOAP_NO_METHOD			13
-#define SOAP_NO_DATA			14
-#define SOAP_GET_METHOD			15
-#define SOAP_PUT_METHOD			16
-#define SOAP_DEL_METHOD			17
-#define SOAP_HEAD_METHOD		18
-#define SOAP_HTTP_METHOD		19
-#define SOAP_EOM			20
-#define SOAP_MOE			21
-#define SOAP_HDR			22
-#define SOAP_NULL			23
-#define SOAP_DUPLICATE_ID		24
-#define SOAP_MISSING_ID			25
-#define SOAP_HREF			26
-#define SOAP_UDP_ERROR			27
-#define SOAP_TCP_ERROR			28
-#define SOAP_HTTP_ERROR			29
-#define SOAP_SSL_ERROR			30
-#define SOAP_ZLIB_ERROR			31
-#define SOAP_DIME_ERROR			32
-#define SOAP_DIME_HREF			33
-#define SOAP_DIME_MISMATCH		34
-#define SOAP_DIME_END			35
-#define SOAP_MIME_ERROR			36
-#define SOAP_MIME_HREF			37
-#define SOAP_MIME_END			38
-#define SOAP_VERSIONMISMATCH		39
-#define SOAP_PLUGIN_ERROR		40
-#define SOAP_DATAENCODINGUNKNOWN	41
-#define SOAP_REQUIRED			42
-#define SOAP_PROHIBITED			43
-#define SOAP_OCCURS			44
-#define SOAP_LENGTH			45
-#define SOAP_FD_EXCEEDED		46
+#define SOAP_EOF            EOF
+#define SOAP_ERR            EOF
+#define SOAP_OK                0
+#define SOAP_CLI_FAULT            1
+#define SOAP_SVR_FAULT            2
+#define SOAP_TAG_MISMATCH        3
+#define SOAP_TYPE            4
+#define SOAP_SYNTAX_ERROR        5
+#define SOAP_NO_TAG            6
+#define SOAP_IOB            7
+#define SOAP_MUSTUNDERSTAND        8
+#define SOAP_NAMESPACE            9
+#define SOAP_USER_ERROR            10
+#define SOAP_FATAL_ERROR        11
+#define SOAP_FAULT            12
+#define SOAP_NO_METHOD            13
+#define SOAP_NO_DATA            14
+#define SOAP_GET_METHOD            15
+#define SOAP_PUT_METHOD            16
+#define SOAP_DEL_METHOD            17
+#define SOAP_HEAD_METHOD        18
+#define SOAP_HTTP_METHOD        19
+#define SOAP_EOM            20
+#define SOAP_MOE            21
+#define SOAP_HDR            22
+#define SOAP_NULL            23
+#define SOAP_DUPLICATE_ID        24
+#define SOAP_MISSING_ID            25
+#define SOAP_HREF            26
+#define SOAP_UDP_ERROR            27
+#define SOAP_TCP_ERROR            28
+#define SOAP_HTTP_ERROR            29
+#define SOAP_SSL_ERROR            30
+#define SOAP_ZLIB_ERROR            31
+#define SOAP_DIME_ERROR            32
+#define SOAP_DIME_HREF            33
+#define SOAP_DIME_MISMATCH        34
+#define SOAP_DIME_END            35
+#define SOAP_MIME_ERROR            36
+#define SOAP_MIME_HREF            37
+#define SOAP_MIME_END            38
+#define SOAP_VERSIONMISMATCH        39
+#define SOAP_PLUGIN_ERROR        40
+#define SOAP_DATAENCODINGUNKNOWN    41
+#define SOAP_REQUIRED            42
+#define SOAP_PROHIBITED            43
+#define SOAP_OCCURS            44
+#define SOAP_LENGTH            45
+#define SOAP_FD_EXCEEDED        46
 
 #define soap_xml_error_check(e) ((e) == SOAP_TAG_MISMATCH || (e) == SOAP_NO_TAG || (e) == SOAP_SYNTAX_ERROR || (e) == SOAP_NAMESPACE || (e) == SOAP_DUPLICATE_ID || (e) == SOAP_MISSING_ID || (e) == SOAP_REQUIRED || (e) == SOAP_PROHIBITED || (e) == SOAP_OCCURS || (e) == SOAP_LENGTH || (e) == SOAP_NULL || (e) == SOAP_HREF)
 #define soap_soap_error_check(e) ((e) == SOAP_CLI_FAULT || (e) == SOAP_SVR_FAULT || (e) == SOAP_VERSIONMISMATCH || (e) == SOAP_MUSTUNDERSTAND || (e) == SOAP_FAULT || (e) == SOAP_NO_METHOD)
@@ -1070,124 +1069,124 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan;
 
 /* Exceptional gSOAP HTTP server response status codes >= 1000 */
 
-#define SOAP_STOP		1000	/* No HTTP response */
-#define SOAP_FORM		1001	/* Form request/response */
-#define SOAP_HTML		1002	/* Custom HTML response */
-#define SOAP_FILE		1003	/* Custom file-based response */
+#define SOAP_STOP        1000    /* No HTTP response */
+#define SOAP_FORM        1001    /* Form request/response */
+#define SOAP_HTML        1002    /* Custom HTML response */
+#define SOAP_FILE        1003    /* Custom file-based response */
 
 /* gSOAP HTTP method codes (client) */
 
-#define SOAP_POST		2000	/* POST request */
-#define SOAP_POST_FILE		2001	/* Custom file-based POST request */
-#define SOAP_GET		2002	/* GET request */
+#define SOAP_POST        2000    /* POST request */
+#define SOAP_POST_FILE        2001    /* Custom file-based POST request */
+#define SOAP_GET        2002    /* GET request */
 
 /* gSOAP DIME */
 
-#define SOAP_DIME_CF		0x01
-#define SOAP_DIME_ME		0x02
-#define SOAP_DIME_MB		0x04
-#define SOAP_DIME_VERSION	0x08 /* DIME version 1 */
-#define SOAP_DIME_MEDIA		0x10
-#define SOAP_DIME_ABSURI	0x20
+#define SOAP_DIME_CF        0x01
+#define SOAP_DIME_ME        0x02
+#define SOAP_DIME_MB        0x04
+#define SOAP_DIME_VERSION    0x08 /* DIME version 1 */
+#define SOAP_DIME_MEDIA        0x10
+#define SOAP_DIME_ABSURI    0x20
 
 /* gSOAP ZLIB */
 
-#define SOAP_ZLIB_NONE		0x00
-#define SOAP_ZLIB_DEFLATE	0x01
-#define SOAP_ZLIB_INFLATE	0x02
-#define SOAP_ZLIB_GZIP		0x02
+#define SOAP_ZLIB_NONE        0x00
+#define SOAP_ZLIB_DEFLATE    0x01
+#define SOAP_ZLIB_INFLATE    0x02
+#define SOAP_ZLIB_GZIP        0x02
 
 /* gSOAP transport, connection, and content encoding modes */
 
 typedef soap_int32 soap_mode;
 
-#define SOAP_IO			0x00000003	/* IO mask */
-#define SOAP_IO_FLUSH		0x00000000	/* flush output immediately, no buffering */
-#define SOAP_IO_BUFFER		0x00000001	/* buffer output in packets of size SOAP_BUFLEN */
-#define SOAP_IO_STORE		0x00000002	/* store entire output to determine length for transport */
-#define SOAP_IO_CHUNK		0x00000003	/* use HTTP chunked transfer AND buffer packets */
+#define SOAP_IO            0x00000003    /* IO mask */
+#define SOAP_IO_FLUSH        0x00000000    /* flush output immediately, no buffering */
+#define SOAP_IO_BUFFER        0x00000001    /* buffer output in packets of size SOAP_BUFLEN */
+#define SOAP_IO_STORE        0x00000002    /* store entire output to determine length for transport */
+#define SOAP_IO_CHUNK        0x00000003    /* use HTTP chunked transfer AND buffer packets */
 
-#define SOAP_IO_UDP		0x00000004	/* TCP or UDP */
+#define SOAP_IO_UDP        0x00000004    /* TCP or UDP */
 
-#define SOAP_IO_LENGTH		0x00000008	/* calc message length (internal) */
-#define SOAP_IO_KEEPALIVE	0x00000010	/* keep connection alive */
+#define SOAP_IO_LENGTH        0x00000008    /* calc message length (internal) */
+#define SOAP_IO_KEEPALIVE    0x00000010    /* keep connection alive */
 
-#define SOAP_ENC_LATIN		0x00000020	/* accept iso-8859-1 encoding */
-#define SOAP_ENC_XML		0x00000040	/* plain XML encoding, no HTTP header */
-#define SOAP_ENC_DIME		0x00000080
-#define SOAP_ENC_MIME		0x00000100
-#define SOAP_ENC_MTOM		0x00000200
-#define SOAP_ENC_ZLIB		0x00000400
-#define SOAP_ENC_SSL		0x00000800
+#define SOAP_ENC_LATIN        0x00000020    /* accept iso-8859-1 encoding */
+#define SOAP_ENC_XML        0x00000040    /* plain XML encoding, no HTTP header */
+#define SOAP_ENC_DIME        0x00000080
+#define SOAP_ENC_MIME        0x00000100
+#define SOAP_ENC_MTOM        0x00000200
+#define SOAP_ENC_ZLIB        0x00000400
+#define SOAP_ENC_SSL        0x00000800
 
-#define SOAP_ENC		0x00000FFF	/* IO and ENC mask */
+#define SOAP_ENC        0x00000FFF    /* IO and ENC mask */
 
-#define SOAP_XML_STRICT		0x00001000	/* apply strict validation */
-#define SOAP_XML_INDENT		0x00002000	/* emit indented XML */
-#define SOAP_XML_DEFAULTNS	0x00004000	/* emit xmlns="..." namesp. */
-#define SOAP_XML_CANONICAL	0x00008000	/* EXC C14N canonical XML */
-#define SOAP_XML_TREE		0x00010000	/* emit XML tree (no id/ref) */
-#define SOAP_XML_GRAPH		0x00020000	/* see DOM manual */
-#define SOAP_XML_NIL		0x00040000	/* serialize NULLs as xsi:nil */
-#define SOAP_XML_DOM		0x00080000
+#define SOAP_XML_STRICT        0x00001000    /* apply strict validation */
+#define SOAP_XML_INDENT        0x00002000    /* emit indented XML */
+#define SOAP_XML_DEFAULTNS    0x00004000    /* emit xmlns="..." namesp. */
+#define SOAP_XML_CANONICAL    0x00008000    /* EXC C14N canonical XML */
+#define SOAP_XML_TREE        0x00010000    /* emit XML tree (no id/ref) */
+#define SOAP_XML_GRAPH        0x00020000    /* see DOM manual */
+#define SOAP_XML_NIL        0x00040000    /* serialize NULLs as xsi:nil */
+#define SOAP_XML_DOM        0x00080000
 
-#define SOAP_C_NOIOB		0x00100000	/* don't fault on array index out of bounds (just ignore) */
-#define SOAP_C_UTFSTRING	0x00200000	/* (de)serialize strings with UTF8 content */
-#define SOAP_C_MBSTRING		0x00400000	/* (de)serialize strings with multi-byte content */
-#define SOAP_C_NILSTRING	0x00800000	/* serialize empty strings as nil (omitted) */
+#define SOAP_C_NOIOB        0x00100000    /* don't fault on array index out of bounds (just ignore) */
+#define SOAP_C_UTFSTRING    0x00200000    /* (de)serialize strings with UTF8 content */
+#define SOAP_C_MBSTRING        0x00400000    /* (de)serialize strings with multi-byte content */
+#define SOAP_C_NILSTRING    0x00800000    /* serialize empty strings as nil (omitted) */
 
-#define SOAP_DOM_TREE		0x01000000
-#define SOAP_DOM_NODE		0x02000000
-#define SOAP_DOM_ASIS		0x04000000
+#define SOAP_DOM_TREE        0x01000000
+#define SOAP_DOM_NODE        0x02000000
+#define SOAP_DOM_ASIS        0x04000000
 
-#define SOAP_MIME_POSTCHECK	0x10000000	/* MIME flag (internal) */
+#define SOAP_MIME_POSTCHECK    0x10000000    /* MIME flag (internal) */
 
-#define SOAP_XML_SEC		0x80000000	/* reserved for WS security */
+#define SOAP_XML_SEC        0x80000000    /* reserved for WS security */
 
 /* WITH_XMLNS backward compatibility: always use XML default namespaces */
 #ifdef WITH_XMLNS
-# define SOAP_IO_DEFAULT		(SOAP_IO_FLUSH | SOAP_XML_DEFAULTNS)
+# define SOAP_IO_DEFAULT        (SOAP_IO_FLUSH | SOAP_XML_DEFAULTNS)
 #else
-# define SOAP_IO_DEFAULT		SOAP_IO_FLUSH
+# define SOAP_IO_DEFAULT        SOAP_IO_FLUSH
 #endif
 
 /* SSL client/server authentication settings */
 
-#define SOAP_SSL_NO_AUTHENTICATION		0x00	/* for testing purposes */
-#define SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION	0x01	/* client requires server to authenticate */
-#define SOAP_SSL_REQUIRE_CLIENT_AUTHENTICATION	0x02	/* server requires client to authenticate */
-#define SOAP_SSL_SKIP_HOST_CHECK		0x04	/* client does not check the common name of the host in certificate */
-#define SOAP_SSL_ALLOW_EXPIRED_CERTIFICATE	0x08	/* client does not check the expiration date of the host certificate */
-#define SOAP_SSL_NO_DEFAULT_CA_PATH		0x10	/* don't use default_verify_paths */
-#define SOAP_SSL_RSA				0x20	/* use RSA */
-#define SOAP_SSLv3				0x40	/* SSL v3 only */
-#define SOAP_TLSv1				0x80	/* TLS v1 only */
-#define SOAP_SSLv3_TLSv1			0x00	/* SSL v3 and TLS v1 support by default */
+#define SOAP_SSL_NO_AUTHENTICATION        0x00    /* for testing purposes */
+#define SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION    0x01    /* client requires server to authenticate */
+#define SOAP_SSL_REQUIRE_CLIENT_AUTHENTICATION    0x02    /* server requires client to authenticate */
+#define SOAP_SSL_SKIP_HOST_CHECK        0x04    /* client does not check the common name of the host in certificate */
+#define SOAP_SSL_ALLOW_EXPIRED_CERTIFICATE    0x08    /* client does not check the expiration date of the host certificate */
+#define SOAP_SSL_NO_DEFAULT_CA_PATH        0x10    /* don't use default_verify_paths */
+#define SOAP_SSL_RSA                0x20    /* use RSA */
+#define SOAP_SSLv3                0x40    /* SSL v3 only */
+#define SOAP_TLSv1                0x80    /* TLS v1 only */
+#define SOAP_SSLv3_TLSv1            0x00    /* SSL v3 and TLS v1 support by default */
 
-#define SOAP_SSL_DEFAULT			(SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION | SOAP_SSLv3_TLSv1)
+#define SOAP_SSL_DEFAULT            (SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION | SOAP_SSLv3_TLSv1)
 
 /* state */
 
-#define SOAP_NONE	0
-#define SOAP_INIT	1
-#define SOAP_COPY	2
+#define SOAP_NONE    0
+#define SOAP_INIT    1
+#define SOAP_COPY    2
 
 #define soap_check_state(soap) (!(soap) || ((soap)->state != SOAP_INIT && (soap)->state != SOAP_COPY))
 
 /* part */
 
-#define SOAP_BEGIN		0
-#define SOAP_IN_ENVELOPE	2
-#define SOAP_IN_HEADER		3
-#define SOAP_END_HEADER		4
-#define SOAP_NO_BODY		5
-#define SOAP_IN_BODY		6
-#define SOAP_END_BODY		7
-#define SOAP_END_ENVELOPE	8
-#define SOAP_END		9
-#define SOAP_BEGIN_SECURITY	10
-#define SOAP_IN_SECURITY	11
-#define SOAP_END_SECURITY	12
+#define SOAP_BEGIN        0
+#define SOAP_IN_ENVELOPE    2
+#define SOAP_IN_HEADER        3
+#define SOAP_END_HEADER        4
+#define SOAP_NO_BODY        5
+#define SOAP_IN_BODY        6
+#define SOAP_END_BODY        7
+#define SOAP_END_ENVELOPE    8
+#define SOAP_END        9
+#define SOAP_BEGIN_SECURITY    10
+#define SOAP_IN_SECURITY    11
+#define SOAP_END_SECURITY    12
 
 /* DEBUG macros */
 
@@ -1211,11 +1210,11 @@ typedef soap_int32 soap_mode;
 # endif
 #endif
 
-#ifndef SOAP_MALLOC			/* use libc malloc */
+#ifndef SOAP_MALLOC            /* use libc malloc */
 # define SOAP_MALLOC(soap, size) malloc(size)
 #endif
 
-#ifndef SOAP_FREE			/* use libc free */
+#ifndef SOAP_FREE            /* use libc free */
 # define SOAP_FREE(soap, ptr) free(ptr)
 #endif
 
@@ -1365,13 +1364,13 @@ struct soap_cookie
   char *value;
   char *domain;
   char *path;
-  time_t expire;	/* client-side: local time to expire */
-  long maxage;		/* server-side: seconds to expire */
+  time_t expire;    /* client-side: local time to expire */
+  long maxage;        /* server-side: seconds to expire */
   unsigned int version;
   short secure;
-  short session;	/* server-side */
-  short env;		/* server-side: got cookie from client and should not be (re)send */
-  short modified;	/* server-side: client cookie was modified and should be send */
+  short session;    /* server-side */
+  short env;        /* server-side: got cookie from client and should not be (re)send */
+  short modified;    /* server-side: client cookie was modified and should be send */
 };
 #endif
 
@@ -1408,8 +1407,8 @@ struct soap_dime
   const char *id;
   const char *type;
   const char *options;
-  struct soap_multipart *list;		/* list of DIME attachments received */
-  struct soap_multipart *first, *last;	/* temporary in/out queue */
+  struct soap_multipart *list;        /* list of DIME attachments received */
+  struct soap_multipart *first, *last;    /* temporary in/out queue */
 #ifdef __cplusplus
   soap_multipart_iterator begin()
     { soap_multipart_iterator iter(list); return iter; };
@@ -1421,10 +1420,10 @@ struct soap_dime
 
 #ifndef WITH_LEANER
 struct soap_mime
-{ char *boundary;			/* MIME boundary */
-  const char *start;			/* MIME start ID */
-  struct soap_multipart *list;		/* list of MIME attachments received */
-  struct soap_multipart *first, *last;	/* temporary in/out queue */
+{ char *boundary;            /* MIME boundary */
+  const char *start;            /* MIME start ID */
+  struct soap_multipart *list;        /* list of MIME attachments received */
+  struct soap_multipart *first, *last;    /* temporary in/out queue */
 #ifdef __cplusplus
   soap_multipart_iterator begin()
     { soap_multipart_iterator iter(list); return iter; };
@@ -1452,14 +1451,14 @@ enum soap_mime_encoding
 /* DIME/MIME multipart list */
 struct soap_multipart
 { struct soap_multipart *next;
-  char *ptr;				/* points to raw data content */
-  size_t size;				/* size of data content */
-  const char *id;			/* DIME/MIME content ID or form data name */
-  const char *type;			/* DIME/MIME type (MIME type format) */
-  const char *options;			/* DIME options */
-  enum soap_mime_encoding encoding;	/* MIME Content-Transfer-Encoding */
-  const char *location;			/* MIME Content-Location (optional) */
-  const char *description;		/* MIME Content-Description (optional) */
+  char *ptr;                /* points to raw data content */
+  size_t size;                /* size of data content */
+  const char *id;            /* DIME/MIME content ID or form data name */
+  const char *type;            /* DIME/MIME type (MIME type format) */
+  const char *options;            /* DIME options */
+  enum soap_mime_encoding encoding;    /* MIME Content-Transfer-Encoding */
+  const char *location;            /* MIME Content-Location (optional) */
+  const char *description;        /* MIME Content-Description (optional) */
 #ifdef __cplusplus
   typedef soap_multipart_iterator iterator;
 #endif
@@ -1508,8 +1507,8 @@ struct soap_dom_attribute
   struct soap *soap;
 #ifdef __cplusplus
   typedef soap_dom_attribute_iterator iterator;
-  struct soap_dom_attribute &set(const char *nstr, const char *name);	/* set namespace and name */
-  struct soap_dom_attribute &set(const char *data);		/* set data */
+  struct soap_dom_attribute &set(const char *nstr, const char *name);    /* set namespace and name */
+  struct soap_dom_attribute &set(const char *data);        /* set data */
   soap_dom_attribute_iterator begin();
   soap_dom_attribute_iterator end();
   soap_dom_attribute_iterator find(const char *nstr, const char *name);
@@ -1543,19 +1542,19 @@ class soap_dom_element_iterator
 
 #ifndef WITH_LEANER
 struct soap_dom_element
-{ struct soap_dom_element *next;	/* next sibling */
-  struct soap_dom_element *prnt;	/* parent */
-  struct soap_dom_element *elts;	/* list of child elements */
-  struct soap_dom_attribute *atts;	/* list of attributes */
-  const char *nstr;			/* namespace string */
-  char *name;				/* element tag name */
-  char *data;				/* element content data (with SOAP_C_UTFSTRING flag set) */
-  wchar_t *wide;			/* element content data */
-  int type;				/* optional: serialized C/C++ data type */
-  void *node;				/* optional: pointer to serialized C/C++ data */
-  char *head;				/* leading content before start tag */
-  char *tail;				/* leading content before end tag */
-  struct soap *soap;			/* soap context that manages this node */
+{ struct soap_dom_element *next;    /* next sibling */
+  struct soap_dom_element *prnt;    /* parent */
+  struct soap_dom_element *elts;    /* list of child elements */
+  struct soap_dom_attribute *atts;    /* list of attributes */
+  const char *nstr;            /* namespace string */
+  char *name;                /* element tag name */
+  char *data;                /* element content data (with SOAP_C_UTFSTRING flag set) */
+  wchar_t *wide;            /* element content data */
+  int type;                /* optional: serialized C/C++ data type */
+  void *node;                /* optional: pointer to serialized C/C++ data */
+  char *head;                /* leading content before start tag */
+  char *tail;                /* leading content before end tag */
+  struct soap *soap;            /* soap context that manages this node */
 #ifdef __cplusplus
   typedef soap_dom_element_iterator iterator;
   struct soap_dom_element &set(const char *nstr, const char *name);
@@ -1602,45 +1601,45 @@ extern "C" {
 #endif
 
 struct SOAP_STD_API soap
-{ short state;			/* 0 = uninitialized, 1 = initialized, 2 = copy of another soap struct */
-  short version;		/* 1 = SOAP1.1 and 2 = SOAP1.2 (set automatically from namespace URI in nsmap table) */
+{ short state;            /* 0 = uninitialized, 1 = initialized, 2 = copy of another soap struct */
+  short version;        /* 1 = SOAP1.1 and 2 = SOAP1.2 (set automatically from namespace URI in nsmap table) */
   soap_mode mode;
   soap_mode imode;
   soap_mode omode;
-  const char *float_format;	/* user-definable format string for floats (<1024 chars) */
-  const char *double_format;	/* user-definable format string for doubles (<1024 chars) */
-  const char *dime_id_format;	/* user-definable format string for integer DIME id (<SOAP_TAGLEN chars) */
-  const char *http_version;	/* HTTP version used "1.0" or "1.1" */
-  const char *http_content;	/* optional custom response content type (with SOAP_FILE) */
-  const char *encodingStyle;	/* default = NULL which means that SOAP encoding is used */
-  const char *actor;		/* SOAP-ENV:actor or role attribute value */
-  const char *lang;		/* xml:lang attribute value of SOAP-ENV:Text */
-  int recv_timeout;		/* when > 0, gives socket recv timeout in seconds, < 0 in usec */
-  int send_timeout;		/* when > 0, gives socket send timeout in seconds, < 0 in usec */
-  int connect_timeout;		/* when > 0, gives socket connect() timeout in seconds, < 0 in usec */
-  int accept_timeout;		/* when > 0, gives socket accept() timeout in seconds, < 0 in usec */
-  int socket_flags;		/* socket recv() and send() flags, e.g. set to MSG_NOSIGNAL to disable sigpipe */
-  int connect_flags;		/* connect() SOL_SOCKET sockopt flags, e.g. set to SO_DEBUG to debug socket */
-  int bind_flags;		/* bind() SOL_SOCKET sockopt flags, e.g. set to SO_REUSEADDR to enable reuse */
-  int accept_flags;		/* accept() SOL_SOCKET sockopt flags */
-  unsigned short linger_time;	/* linger time for SO_LINGER option */
-  const struct Namespace *namespaces;	/* Pointer to global namespace mapping table */
-  struct Namespace *local_namespaces;	/* Local namespace mapping table */
-  struct soap_nlist *nlist;	/* namespace stack */
-  struct soap_blist *blist;	/* block allocation stack */
-  struct soap_clist *clist;	/* class instance allocation list */
-  void *alist;			/* memory allocation (malloc) list */
+  const char *float_format;    /* user-definable format string for floats (<1024 chars) */
+  const char *double_format;    /* user-definable format string for doubles (<1024 chars) */
+  const char *dime_id_format;    /* user-definable format string for integer DIME id (<SOAP_TAGLEN chars) */
+  const char *http_version;    /* HTTP version used "1.0" or "1.1" */
+  const char *http_content;    /* optional custom response content type (with SOAP_FILE) */
+  const char *encodingStyle;    /* default = NULL which means that SOAP encoding is used */
+  const char *actor;        /* SOAP-ENV:actor or role attribute value */
+  const char *lang;        /* xml:lang attribute value of SOAP-ENV:Text */
+  int recv_timeout;        /* when > 0, gives socket recv timeout in seconds, < 0 in usec */
+  int send_timeout;        /* when > 0, gives socket send timeout in seconds, < 0 in usec */
+  int connect_timeout;        /* when > 0, gives socket connect() timeout in seconds, < 0 in usec */
+  int accept_timeout;        /* when > 0, gives socket accept() timeout in seconds, < 0 in usec */
+  int socket_flags;        /* socket recv() and send() flags, e.g. set to MSG_NOSIGNAL to disable sigpipe */
+  int connect_flags;        /* connect() SOL_SOCKET sockopt flags, e.g. set to SO_DEBUG to debug socket */
+  int bind_flags;        /* bind() SOL_SOCKET sockopt flags, e.g. set to SO_REUSEADDR to enable reuse */
+  int accept_flags;        /* accept() SOL_SOCKET sockopt flags */
+  unsigned short linger_time;    /* linger time for SO_LINGER option */
+  const struct Namespace *namespaces;    /* Pointer to global namespace mapping table */
+  struct Namespace *local_namespaces;    /* Local namespace mapping table */
+  struct soap_nlist *nlist;    /* namespace stack */
+  struct soap_blist *blist;    /* block allocation stack */
+  struct soap_clist *clist;    /* class instance allocation list */
+  void *alist;            /* memory allocation (malloc) list */
   struct soap_ilist *iht[SOAP_IDHASH];
   struct soap_plist *pht[SOAP_PTRHASH];
-  struct soap_pblk *pblk;	/* plist block allocation */
-  short pidx;			/* plist block allocation */
+  struct soap_pblk *pblk;    /* plist block allocation */
+  short pidx;            /* plist block allocation */
   struct SOAP_ENV__Header *header;
   struct SOAP_ENV__Fault *fault;
   int idnum;
-  void *user;			/* to pass user-defined data */
-  struct soap_plugin *plugins;	/* linked list of plug-in data */
-  const char *userid;		/* HTTP Basic authorization userid */
-  const char *passwd;		/* HTTP Basic authorization passwd */
+  void *user;            /* to pass user-defined data */
+  struct soap_plugin *plugins;    /* linked list of plug-in data */
+  const char *userid;        /* HTTP Basic authorization userid */
+  const char *passwd;        /* HTTP Basic authorization passwd */
   int (*fpost)(struct soap*, const char*, const char*, int, const char*, const char*, size_t);
   int (*fget)(struct soap*);
   int (*fput)(struct soap*);
@@ -1692,8 +1691,8 @@ struct SOAP_STD_API soap
   std::ostream *os;
   std::istream *is;
 #else
-  void *os;		/* preserve struct size */
-  void *is;		/* preserve struct size */
+  void *os;        /* preserve struct size */
+  void *is;        /* preserve struct size */
 #endif
 #ifndef UNDER_CE
   int sendfd;
@@ -1702,20 +1701,20 @@ struct SOAP_STD_API soap
   FILE *sendfd;
   FILE *recvfd;
 #endif
-  size_t bufidx;	/* index in soap.buf[] */
-  size_t buflen;	/* length of soap.buf[] content */
-  soap_wchar ahead;	/* parser lookahead */
-  short cdata;		/* CDATA parser state */
-  short body;		/* parsed XML element has a body or not */
-  unsigned int level;	/* XML nesting level */
-  size_t count;		/* message length counter */
-  size_t length;	/* message length as set by HTTP header */
-  char *labbuf;		/* look-aside buffer */
-  size_t lablen;	/* look-aside buffer allocated length */
-  size_t labidx;	/* look-aside buffer index to available part */
+  size_t bufidx;    /* index in soap.buf[] */
+  size_t buflen;    /* length of soap.buf[] content */
+  soap_wchar ahead;    /* parser lookahead */
+  short cdata;        /* CDATA parser state */
+  short body;        /* parsed XML element has a body or not */
+  unsigned int level;    /* XML nesting level */
+  size_t count;        /* message length counter */
+  size_t length;    /* message length as set by HTTP header */
+  char *labbuf;        /* look-aside buffer */
+  size_t lablen;    /* look-aside buffer allocated length */
+  size_t labidx;    /* look-aside buffer index to available part */
   char buf[SOAP_BUFLEN];/* send and receive buffer */
-  char msgbuf[1024];	/* in/out buffer for HTTP/MIME headers >=1024 bytes */
-  char tmpbuf[1024];	/* in/out buffer for HTTP/MIME headers, simpleType values, element and attribute tag names, and DIME must be >=1024 bytes */
+  char msgbuf[1024];    /* in/out buffer for HTTP/MIME headers >=1024 bytes */
+  char tmpbuf[1024];    /* in/out buffer for HTTP/MIME headers, simpleType values, element and attribute tag names, and DIME must be >=1024 bytes */
   char tag[SOAP_TAGLEN];
   char id[SOAP_TAGLEN];
   char href[SOAP_TAGLEN];
@@ -1727,12 +1726,12 @@ struct SOAP_STD_API soap
   short position;
   int positions[SOAP_MAXDIMS];
   short root;
-  struct soap_attribute *attributes;	/* attribute list */
-  short encoding;	/* when set, output encodingStyle */
-  short mustUnderstand;	/* a mustUnderstand element was parsed or is output */
-  short null;		/* parsed XML is xsi:nil */
-  short ns;		/* when not set, output full xmlns bindings */
-  short part;		/* parsing state */
+  struct soap_attribute *attributes;    /* attribute list */
+  short encoding;    /* when set, output encodingStyle */
+  short mustUnderstand;    /* a mustUnderstand element was parsed or is output */
+  short null;        /* parsed XML is xsi:nil */
+  short ns;        /* when not set, output full xmlns bindings */
+  short part;        /* parsing state */
   short alloced;
   short peeked;
   size_t chunksize;
@@ -1741,23 +1740,23 @@ struct SOAP_STD_API soap
   char path[SOAP_TAGLEN];
   char host[SOAP_TAGLEN];
   char *action;
-  char *authrealm;		/* HTTP authentication realm */
-  char *prolog;			/* XML declaration prolog */
-  unsigned long ip;		/* IP number */
-  int port;			/* port number */
-  short keep_alive;		/* connection should be kept open */
-  short tcp_keep_alive;		/* enable SO_KEEPALIVE */
-  unsigned int tcp_keep_idle; 	/* set TCP_KEEPIDLE */
-  unsigned int tcp_keep_intvl; 	/* set TCP_KEEPINTVL */
-  unsigned int tcp_keep_cnt; 	/* set TCP_KEEPCNT */
+  char *authrealm;        /* HTTP authentication realm */
+  char *prolog;            /* XML declaration prolog */
+  unsigned long ip;        /* IP number */
+  int port;            /* port number */
+  short keep_alive;        /* connection should be kept open */
+  short tcp_keep_alive;        /* enable SO_KEEPALIVE */
+  unsigned int tcp_keep_idle;     /* set TCP_KEEPIDLE */
+  unsigned int tcp_keep_intvl;     /* set TCP_KEEPINTVL */
+  unsigned int tcp_keep_cnt;     /* set TCP_KEEPCNT */
   unsigned int max_keep_alive;  /* maximum keep-alive session (default=100) */
   const char *proxy_http_version;/* HTTP version of proxy "1.0" or "1.1" */
-  const char *proxy_host;	/* Proxy Server host name */
-  int proxy_port;		/* Proxy Server port (default = 8080) */
-  const char *proxy_userid;	/* Proxy Authorization user name */
-  const char *proxy_passwd;	/* Proxy Authorization password */
-  const char *proxy_from;	/* X-Forwarding-For header returned by proxy */
-  int status;			/* -1 when request, else error code to be returned by server */
+  const char *proxy_host;    /* Proxy Server host name */
+  int proxy_port;        /* Proxy Server port (default = 8080) */
+  const char *proxy_userid;    /* Proxy Authorization user name */
+  const char *proxy_passwd;    /* Proxy Authorization password */
+  const char *proxy_from;    /* X-Forwarding-For header returned by proxy */
+  int status;            /* -1 when request, else error code to be returned by server */
   int error;
   int errmode;
   int errnum;
@@ -1785,9 +1784,9 @@ struct SOAP_STD_API soap
   char* ipv4_multicast_if; /* always include this to keep the soap struct size the same in v4 and v6 */
   int ipv4_multicast_ttl; /* multicast scope */
 #ifdef WITH_IPV6
-  struct sockaddr_storage peer;	/* IPv6: set by soap_accept and by UDP recv */
+  struct sockaddr_storage peer;    /* IPv6: set by soap_accept and by UDP recv */
 #else
-  struct sockaddr_in peer;	/* IPv4: set by soap_connect/soap_accept and by UDP recv */
+  struct sockaddr_in peer;    /* IPv4: set by soap_connect/soap_accept and by UDP recv */
 #endif
 #endif
   size_t peerlen;
@@ -1799,7 +1798,7 @@ struct SOAP_STD_API soap
   SSL_CTX *ctx;
   SSL_SESSION *session;
 #else
-  void *fsslauth;		/* dummy members, to preserve struct size */
+  void *fsslauth;        /* dummy members, to preserve struct size */
   void *fsslverify;
   void *bio;
   void *ssl;
@@ -1817,27 +1816,27 @@ struct SOAP_STD_API soap
   char session_host[SOAP_TAGLEN];
   int session_port;
 #ifdef WITH_C_LOCALE
-  locale_t c_locale;		/* set to C locale by default */
+  locale_t c_locale;        /* set to C locale by default */
 #else
   void *c_locale;
 #endif
 #ifdef WITH_ZLIB
-  z_stream *d_stream;		/* decompression stream */
-  uLong z_crc;			/* internal gzip crc */
+  z_stream *d_stream;        /* decompression stream */
+  uLong z_crc;            /* internal gzip crc */
 #else
-  void *d_stream;		/* dummy members, to preserve struct size */
+  void *d_stream;        /* dummy members, to preserve struct size */
   soap_int32 z_crc;
 #endif
-  const char *z_dict;		/* support for zlib static dictionaries */
+  const char *z_dict;        /* support for zlib static dictionaries */
   unsigned int z_dict_len;
-  short zlib_state;		/* SOAP_ZLIB_NONE, SOAP_ZLIB_DEFLATE, or SOAP_ZLIB_INFLATE */
-  short zlib_in;		/* SOAP_ZLIB_NONE, SOAP_ZLIB_DEFLATE, or SOAP_ZLIB_GZIP */
-  short zlib_out;		/* SOAP_ZLIB_NONE, SOAP_ZLIB_DEFLATE, or SOAP_ZLIB_GZIP */
-  char *z_buf;			/* buffer */
+  short zlib_state;        /* SOAP_ZLIB_NONE, SOAP_ZLIB_DEFLATE, or SOAP_ZLIB_INFLATE */
+  short zlib_in;        /* SOAP_ZLIB_NONE, SOAP_ZLIB_DEFLATE, or SOAP_ZLIB_GZIP */
+  short zlib_out;        /* SOAP_ZLIB_NONE, SOAP_ZLIB_DEFLATE, or SOAP_ZLIB_GZIP */
+  char *z_buf;            /* buffer */
   size_t z_buflen;
-  unsigned short z_level;	/* compression level to be used (0=none, 1=fast to 9=best) */
-  float z_ratio_in;		/* detected compression ratio compressed_length/length of inbound message */
-  float z_ratio_out;		/* detected compression ratio compressed_length/length of outbound message */
+  unsigned short z_level;    /* compression level to be used (0=none, 1=fast to 9=best) */
+  float z_ratio_in;        /* detected compression ratio compressed_length/length of inbound message */
+  float z_ratio_out;        /* detected compression ratio compressed_length/length of outbound message */
 #ifdef WMW_RPM_IO
   void *rpmreqid;
 #endif
diff --git a/dep/include/bzip2/bzlib.h b/dep/include/bzip2/bzlib.h
deleted file mode 100644
index c5b75d6d8..000000000
--- a/dep/include/bzip2/bzlib.h
+++ /dev/null
@@ -1,282 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Public header file for the library.                   ---*/
-/*---                                               bzlib.h ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#ifndef _BZLIB_H
-#define _BZLIB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BZ_RUN               0
-#define BZ_FLUSH             1
-#define BZ_FINISH            2
-
-#define BZ_OK                0
-#define BZ_RUN_OK            1
-#define BZ_FLUSH_OK          2
-#define BZ_FINISH_OK         3
-#define BZ_STREAM_END        4
-#define BZ_SEQUENCE_ERROR    (-1)
-#define BZ_PARAM_ERROR       (-2)
-#define BZ_MEM_ERROR         (-3)
-#define BZ_DATA_ERROR        (-4)
-#define BZ_DATA_ERROR_MAGIC  (-5)
-#define BZ_IO_ERROR          (-6)
-#define BZ_UNEXPECTED_EOF    (-7)
-#define BZ_OUTBUFF_FULL      (-8)
-#define BZ_CONFIG_ERROR      (-9)
-
-typedef 
-   struct {
-      char *next_in;
-      unsigned int avail_in;
-      unsigned int total_in_lo32;
-      unsigned int total_in_hi32;
-
-      char *next_out;
-      unsigned int avail_out;
-      unsigned int total_out_lo32;
-      unsigned int total_out_hi32;
-
-      void *state;
-
-      void *(*bzalloc)(void *,int,int);
-      void (*bzfree)(void *,void *);
-      void *opaque;
-   } 
-   bz_stream;
-
-
-#ifndef BZ_IMPORT
-#define BZ_EXPORT
-#endif
-
-#ifndef BZ_NO_STDIO
-/* Need a definitition for FILE */
-#include <stdio.h>
-#endif
-
-#ifdef _WIN32
-#   include <windows.h>
-#   ifdef small
-      /* windows.h define small to char */
-#      undef small
-#   endif
-#   ifdef BZ_EXPORT
-#   define BZ_API(func) WINAPI func
-#   define BZ_EXTERN extern
-#   else
-   /* import windows dll dynamically */
-#   define BZ_API(func) (WINAPI * func)
-#   define BZ_EXTERN
-#   endif
-#else
-#   define BZ_API(func) func
-#   define BZ_EXTERN extern
-#endif
-
-
-/*-- Core (low-level) library functions --*/
-
-BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( 
-      bz_stream* strm, 
-      int        blockSize100k, 
-      int        verbosity, 
-      int        workFactor 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzCompress) ( 
-      bz_stream* strm, 
-      int action 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( 
-      bz_stream* strm 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( 
-      bz_stream *strm, 
-      int       verbosity, 
-      int       small
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( 
-      bz_stream* strm 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( 
-      bz_stream *strm 
-   );
-
-
-
-/*-- High(er) level library functions --*/
-
-#ifndef BZ_NO_STDIO
-#define BZ_MAX_UNUSED 5000
-
-typedef void BZFILE;
-
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( 
-      int*  bzerror,   
-      FILE* f, 
-      int   verbosity, 
-      int   small,
-      void* unused,    
-      int   nUnused 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( 
-      int*    bzerror, 
-      BZFILE* b 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void**  unused,  
-      int*    nUnused 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzRead) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( 
-      int*  bzerror,      
-      FILE* f, 
-      int   blockSize100k, 
-      int   verbosity, 
-      int   workFactor 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWrite) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in, 
-      unsigned int* nbytes_out 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in_lo32, 
-      unsigned int* nbytes_in_hi32, 
-      unsigned int* nbytes_out_lo32, 
-      unsigned int* nbytes_out_hi32
-   );
-#endif
-
-
-/*-- Utility functions --*/
-
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( 
-      char*         dest, 
-      unsigned int* destLen,
-      char*         source, 
-      unsigned int  sourceLen,
-      int           blockSize100k, 
-      int           verbosity, 
-      int           workFactor 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( 
-      char*         dest, 
-      unsigned int* destLen,
-      char*         source, 
-      unsigned int  sourceLen,
-      int           small, 
-      int           verbosity 
-   );
-
-
-/*--
-   Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp)
-   to support better zlib compatibility.
-   This code is not _officially_ part of libbzip2 (yet);
-   I haven't tested it, documented it, or considered the
-   threading-safeness of it.
-   If this code breaks, please contact both Yoshioka and me.
---*/
-
-BZ_EXTERN const char * BZ_API(BZ2_bzlibVersion) (
-      void
-   );
-
-#ifndef BZ_NO_STDIO
-BZ_EXTERN BZFILE * BZ_API(BZ2_bzopen) (
-      const char *path,
-      const char *mode
-   );
-
-BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) (
-      int        fd,
-      const char *mode
-   );
-         
-BZ_EXTERN int BZ_API(BZ2_bzread) (
-      BZFILE* b, 
-      void* buf, 
-      int len 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzwrite) (
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzflush) (
-      BZFILE* b
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzclose) (
-      BZFILE* b
-   );
-
-BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
-      BZFILE *b, 
-      int    *errnum
-   );
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/*-------------------------------------------------------------*/
-/*--- end                                           bzlib.h ---*/
-/*-------------------------------------------------------------*/
diff --git a/dep/include/g3dlite/G3D/CollisionDetection.h b/dep/include/g3dlite/G3D/CollisionDetection.h
deleted file mode 100644
index c8fcf5534..000000000
--- a/dep/include/g3dlite/G3D/CollisionDetection.h
+++ /dev/null
@@ -1,1205 +0,0 @@
-/**
-  @file CollisionDetection.h
-
-
-  Moving collision detection for simple primitives.
-
-  @author Morgan McGuire, http://graphics.cs.williams.edu
-  @cite Spherical collision based on Paul Nettle's
-  ftp://ftp.3dmaileffects.com/pub/FluidStudios/CollisionDetection/Fluid_Studios_Generic_Collision_Detection_for_Games_Using_Ellipsoids.pdf
-  and comments by Max McGuire.  Ray-sphere intersection by Eric Haines.
-  Box-Box intersection written by Kevin Egan.
-  Thanks to Max McGuire of Iron Lore for various bug fixes.
-  Box-Triangle by Tomas Akenine-Moller
-
-  @created 2001-11-19
-  @edited  2008-12-19
-
-  Copyright 2000-2009, Morgan McGuire.
-  All rights reserved.
- */
-
-#ifndef G3D_COLLISIONDETECTION_H
-#define G3D_COLLISIONDETECTION_H
-
-#include "G3D/platform.h"
-#include "G3D/Vector3.h"
-#include "G3D/Plane.h"
-#include "G3D/Box.h"
-#include "G3D/Triangle.h"
-#include "G3D/Array.h"
-#include "G3D/Ray.h"
-#include "G3D/Line.h"
-
-namespace G3D {
-
-
-/**
-  Collision detection primitives and tools for building
-  higher order collision detection schemes.
-
-  These routines provide <I>moving</I> and static collision detection.
-  Moving collision detection allows the calculation of collisions that
-  occur during a period of time -- as opposed to the intersection of 
-  two static bodies.
-  
-  Moving collision detection routines detect collisions between
-  <I>only</I> static primitives and moving spheres or points.  Since the 
-  reference frame can be user defined, these functions can be used to
-  detect the collision between two moving bodies by subtracting
-  the velocity vector of one object from the velocity vector of the 
-  sphere or point the detection is to occur with.  This unified 
-  velocity vector will act as if both objects are moving simultaneously.
-
-  Collisions are detected for single-sided objects only.  That is,
-  no collision is detected when <I>leaving</I> a primitive or passing
-  through a plane or triangle opposite the normal... except for the 
-  point-sphere calculation or when otherwise noted.
-
-  For a sphere, the collision location returned is the point in world
-  space where the surface of the sphere and the fixed object meet.
-  It is <B>not</B> the position of the center of the sphere at
-  the time of the collision.
-
-  The collision normal returned is the surface normal to the fixed
-  object at the collision location.
-
-  <p>
-  <b>Static Collision Detection:</b> (Neither object is moving)
-
-  <table>
-  <tr><td></td><td><b>Vector3</b></td><td><b>LineSegment</b></td><td><b>Ray *</b></td><td><b>Line</b></td><td><b>Plane</b></td><td><b>Triangle</b></td><td><b>Sphere</b></td><td><b>Cylinder</b></td><td><b>Capsule</b></td><td><b>AABox</b></td><td><b>Box</b></td></tr>
-  <tr><td><b>Vector3</b></td><td>\link Vector3::operator== V3::==\endlink \link Vector3::fuzzyEq V3::fuzzy \endlink \link G3D::distance distance \endlink</td><td bgcolor=#C0C0C0 colspan=10 ></td></tr>
-  <tr><td><b>LineSegment</b></td><td>\link LineSegment::closestPoint LS::closestPoint\endlink \link LineSegment::distance LS::distance\endlink \link CollisionDetection::closestPointOnLineSegment CD\endlink</td><td></td><td bgcolor=#C0C0C0 colspan=9 ></td></tr>
-  <tr><td><b>Ray *</b></td><td>Ray::closestPoint Ray::distance</td><td></td><td></td><td bgcolor=#C0C0C0 colspan=8 ></td></tr>
-  <tr><td><b>Line</b></td><td>Line::closestPoint Line::distance</td><td></td><td>\link CollisionDetection::closestPointsBetweenLineAndLine CD\endlink</td><td></td><td bgcolor=#C0C0C0 colspan=7 ></td></tr>
-  <tr><td><b>Plane</b></td><td></td><td></td><td></td><td></td><td></td><td bgcolor=#C0C0C0 colspan=6 ></td></tr>
-  <tr><td><b>Triangle</b></td><td></td><td></td><td></td><td></td><td></td><td></td><td bgcolor=#C0C0C0 colspan=5 ></td></tr>
-  <tr><td><b>Sphere</b></td><td>Sphere::contains</td><td></td><td>\link CollisionDetection::collisionTimeForMovingPointFixedSphere CD \endlink, \link Ray::intersectionTime R::time\endlink</td><td></td><td></td><td></td><td></td><td bgcolor=#C0C0C0 colspan=4 ></td></tr>
-  <tr><td><b>Cylinder</b></td><td>Cylinder::contains</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td bgcolor=#C0C0C0 colspan=3 ></td></tr>
-  <tr><td><b>Capsule</b></td><td>Capsule::contains</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td bgcolor=#C0C0C0 colspan=2 ></td></tr>
-  <tr><td><b>AABox</b></td><td>AABox::contains</td><td></td><td></td><td></td><td></td><td>\link CollisionDetection::fixedSolidBoxIntersectsFixedTriangle CD\endlink</td><td></td><td></td><td></td><td></td><td bgcolor=#C0C0C0 colspan=1 ></td></tr>
-  <tr><td><b>Box</b></td><td>Box::contains</td><td>(treat as Ray)</td><td>\link CollisionDetection::collisionTimeForMovingPointFixedBox CD\endlink</td><td>(treat as Ray)</td><td>\link CollisionDetection::penetrationDepthForFixedBoxFixedPlane CD \endlink</td><td>\link CollisionDetection::penetrationDepthForFixedBoxFixedPlane CD\endlink</td><td>\link CollisionDetection::penetrationDepthForFixedSphereFixedBox CD\endlink</td><td>None (use OPCODE)</td><td>\link CollisionDetection::movingSpherePassesThroughFixedBox CD \endlink</td><td>\link CollisionDetection::penetrationDepthForFixedBoxFixedBox CD\endlink</td><td>\link CollisionDetection::penetrationDepthForFixedBoxFixedBox CD\endlink</td></tr>
-  </table>
-
-  <p>
-  <b>Moving Collision Detection:</b>
-
-  <i>* Note: Moving collision detection against certain primitives is equivalent to static collision
-   detection against a bigger primitive.  Ray, Line Segment == ``moving Point''; Capsule ==``moving Sphere''; Plane == ``moving Line''</i>
-
-   @deprecated Routines moving to the G3D::Intersect class in G3D 8.0
- */
-class CollisionDetection {
-private:
-
-	/**
-	 Default parameter if value passed to a function as reference is
-	 not to be calculated.  Must be explicitly supported by function.
-	 */
-	static Vector3 ignore;
-
-	/**
-	 Default parameter if value passed to a function as reference is
-	 not to be calculated.  Must be explicitly supported by function.
-	 */
-    static bool    ignoreBool;
-
-	/**
-	 Default parameter if value passed to a function as reference is
-	 not to be calculated.  Must be explicitly supported by function.
-	 */
-    static Array<Vector3> ignoreArray;
-
-
-    // Static class!
-    CollisionDetection() {}
-    virtual ~CollisionDetection() {}
-
-public:
-
-    /**
-      Converts an index [0, 15] to the corresponding separating axis.
-      Does not return normalized vector in the edge-edge case
-      (indices 6 through 15).
-
-	  @param separatingAxisIndex	Separating axis.
-	  @param box1					Box 1.
-	  @param box2					Box 2.
-
- 	  @return Axis that separates the two boxes.
-  	 */
-    static Vector3 separatingAxisForSolidBoxSolidBox(
-            const int       separatingAxisIndex,
-            const Box &     box1,
-            const Box &     box2);
-
-    /**
-	  Tests whether two boxes have axes that are parallel to
-	  each other.  If they are, axis1 and axis2 are set to be
-	  the parallel axes for both box1 and box2 respectively.
-
-	  @param ca			Dot products of each of the boxes axes
-	  @param epsilon	Fudge factor (small unit by which the dot
-	  					products may vary and still be considered
-	  					zero).
-	  @param axis1		Parallel Axis 1. [Post Condition]
-	  @param axis2		Parallel Axis 2. [Post Condition]
-
-	  @return true  - If boxes have a parallel axis
-	  @return false - otherwise.
- 	 */
-    static bool parallelAxisForSolidBoxSolidBox(
-            const double*   ca,
-            const double    epsilon,
-            int &           axis1,
-            int &           axis2);
-
-    /**
-      Calculates the projected distance between the two boxes along
-      the specified separating axis, negative distances correspond
-      to an overlap along that separating axis.  The distance is not
-      divided by denominator dot(L, L), see
-      penetrationDepthForFixedSphereFixedBox() for more details
-
-      @param separatingAxisIndex
-	  @param a Box 1's bounding sphere vector
-	  @param b Box 2's bounding sphere vector
-	  @param D Vector between Box 1 and Box 2's center points
-	  @param c Pointer to array of dot products of the axes of Box 1
-	           and Box 2.
-	  @param ca Pointer to array of unsigned dot products of the axes
-	            of Box 1 and Box 2.
-	  @param ad Pointer to array of dot products of Box 1 axes and D.
-	  @param bd Pointer to array of dot products of Box 2 axes and D.
-
-      @return Projected distance between the two boxes along the
-      specified separating axis.
-     */
-    static float projectedDistanceForSolidBoxSolidBox(
-            const int           separatingAxisIndex,
-            const Vector3 &     a,
-            const Vector3 &     b,
-            const Vector3 &     D,
-            const double*       c,
-            const double*       ca,
-            const double*       ad,
-            const double*       bd);
-
-
-	/**
-	  Creates a set of standard information about two boxes in order to
-	  solve for their collision.  This information includes a vector to
-	  the radius of the bounding sphere for each box, the vector between
-	  each boxes' center and a series of dot products between differing
-	  important vectors.  These dot products include those between the axes
-	  of both boxes (signed and unsigned values), and the dot products
-	  between all the axes of box1 and the boxes' center vector and box2
-	  and the boxes' center vector.
-
-	  @pre The following space requirements must be met:
-      		- c[]  9 elements
-      		- ca[] 9 elements
-      		- ad[] 3 elements
-      		- bd[] 3 elements
-
-	  @cite dobted from David Eberly's papers, variables used in this function
-      correspond to variables used in pages 6 and 7 in the pdf
-      http://www.magic-software.com/Intersection.html
-      http://www.magic-software.com/Documentation/DynamicCollisionDetection.pdf
-
-      @note Links are out-dated. (Kept to preserve origin and authorship)
-
-	  @param box1 Box 1
-	  @param box2 Box 2
-	  @param a Box 1's bounding sphere vector
-	  @param b Box 2's bounding sphere vector
-	  @param D Vector between Box 1 and Box 2's center points
-	  @param c Pointer to array of dot products of the axes of Box 1
-	           and Box 2.
-	  @param ca Pointer to array of unsigned dot products of the axes
-	            of Box 1 and Box 2.
-	  @param ad Pointer to array of dot products of Box 1 axes and D.
-	  @param bd Pointer to array of dot products of Box 2 axes and D.
-	 */
-    static void fillSolidBoxSolidBoxInfo(
-            const Box &     box1,
-            const Box &     box2,
-            Vector3 &       a,
-            Vector3 &       b,
-            Vector3 &       D,
-            double*         c,
-            double*         ca,
-            double*         ad,
-            double*         bd);
-
-	/**
-	  Performs a simple bounding sphere check between two boxes to determine
-	  whether these boxes could <i>possibly</i> intersect.  This is a very
-	  cheap operation (three dot products, two sqrts and a few others).  If
-	  it returns true, an intersection is possible, but not necessarily
-	  guaranteed.
-
-	  @param a Vector from box A's center to an outer vertex
-	  @param b Vector from box B's center to an outer vertex
-	  @param D Distance between the centers of the two boxes
-
-	  @return true - if possible intersection
-	  @return false - otherwise (This does not guarantee an intersection)
-	 */
-    static bool conservativeBoxBoxTest(
-            const Vector3 &     a,
-            const Vector3 &     b,
-            const Vector3 &     D);
-
-	/**
- 	  Determines whether two fixed solid boxes intersect.
-
-      @note To speed up collision detection, the lastSeparatingAxis from
-      the previous time step can be passed in and that plane can be
-      checked first.  If the separating axis was not saved, or if the
-      two boxes intersected then lastSeparatingAxis should equal -1.
-
-	  @cite Adobted from David Eberly's papers, variables used in this function
-      correspond to variables used in pages 6 and 7 in the pdf
-      http://www.magic-software.com/Intersection.html
-      http://www.magic-software.com/Documentation/DynamicCollisionDetection.pdf
-
- 	  @param box1				Box 1.
- 	  @param box2				Box 2.
- 	  @param lastSeparatingAxis	Last separating axis.
- 	  							(optimization - see note)
-
-	  @return true  - Intersection.
-	  @return false - otherwise.
-	 */
-    static bool fixedSolidBoxIntersectsFixedSolidBox(
-        const Box&      box1,
-        const Box&      box2,
-        const int       lastSeparatingAxis = -1);
-
-    /**
-	  Calculates the closest points on two lines with each other.   If the
-	  lines are parallel then using the starting point, else calculate the
-	  closest point on each line to the other.
-
-	  @note This is very similiar to calculating the intersection of two lines.
-	  Logically then, the two points calculated would be identical if calculated
-	  with inifinite precision, but with the finite precision of floating point
-	  calculations, these values could (will) differ as the line slope approaches
-	  zero or inifinity.
-
-	  @cite variables and algorithm based on derivation at the following website:
-      	    http://softsurfer.com/Archive/algorithm_0106/algorithm_0106.htm
-
-	  @param line1		Line 1.
-	  @param line2		Line 2.
-	  @param closest1	Closest point on line 1.
-	  @param closest2	Closest point on line 2.
- 	*/
-    static void closestPointsBetweenLineAndLine(
-            const Line &    line1,
-            const Line &    line2,
-            Vector3 &       closest1,
-            Vector3 &       closest2);
-
-    /**
-	  Calculates the depth of penetration between two fixed boxes.
-      Contact normal faces away from box1 and into box2.  If there is
-      contact, only one contact point is returned.  The minimally
-      violated separating plane is computed
-         - if the separating axis corresponds to a face
-              the contact point is half way between the deepest vertex
-              and the face
-         - if the separating axis corresponds to two edges
-              the contact point is the midpoint of the smallest line
-              segment between the two edge lines
-
-	  @note This is very similiar to calculating the intersection of two lines.
-	  Logically then, the two points calculated would be identical if calculated
-	  with inifinite precision, but with the finite precision of floating point
-	  calculations, these values could (will) differ as the line slope approaches
-	  zero or inifinity.
-
-	  @cite adobted from David Eberly's papers, variables used in this function
-      correspond to variables used in pages 6 and 7 in the pdf
-      http://www.magic-software.com/Intersection.html
-      http://www.magic-software.com/Documentation/DynamicCollisionDetection.pdf
-
-	  @param box1				Box 1
-	  @param box2				Box 2
-	  @param contactPoints		Contact point between boxes. [Post Condition]
-	  @param contactNormals		Surface normal at contact point. [Post Condition]
-	  @param lastSeparatingAxis	Last separating axis. (Used for optimization)
-
-	  @return Depth of penetration between the two boxes.  If there is no
- 	   intersection between the boxes, then a negative value is returned.
- 	*/
-    static float penetrationDepthForFixedBoxFixedBox(
-        const Box&          box1,
-        const Box&          box2,
-        Array<Vector3>&     contactPoints,
-        Array<Vector3>&     contactNormals,
-        const int           lastSeparatingAxis = -1);
-
-    /**
-	  Calculates the depth of penetration between two fixed spheres as well
-	  as the deepest point of Sphere A that penetrates Sphere B. The normal
-      returned points <B>away</B> from the object A, although it may
-      represent a perpendicular to either the faces of object B or object A
-      depending on their relative orientations.
-
-	  @param sphereA		Fixed Sphere A.
-	  @param sphereB		Fixed Sphere B.
-	  @param contactPoints	Sphere A's deepest point that penetrates Sphere B.
-	 						[Post Condition]
-	  @param contactNormals	Normal at penetration point. [Post Condition]
-
-	  @return Depth of penetration.  If there is no intersection between the
-	 		 objects then the depth will be a negative value.
-	 */
-    static float penetrationDepthForFixedSphereFixedSphere(
-        const class Sphere& sphereA,
-        const Sphere&       sphereB,
-        Array<Vector3>&     contactPoints,
-        Array<Vector3>&     contactNormals = ignoreArray);
-
-    /**
-	  Calculates the depth of penetration between a fixed sphere and a fixed
-	  box as well as the deepest point of the sphere that penetrates the box
-	  and the normal at that intersection.
-
-	  @note There are three possible intersections between a sphere and box.
-	  - Sphere completely contained in the box
-	  - Sphere intersects one edge
-	  - Sphere intersects one vertex
-
-	  The contact point and contact normal vary for each of these situations.
-	  - Sphere contained in Box:
-	 	- Normal is based on side of least penetration (as is the depth calculation).
-	 	- Point is based on center of sphere
-	  - Sphere intersects one edge
-	 	- Normal is based on vector from the box center to the point of depth.
-	 	- Point is closest point to the sphere on the line
-	  - Sphere intersects one vertex
-	 	- Normal is based on vector from the box center to the vertex of penetration.
-	 	- Point is vertex of penetration.
-
-      @cite Adapted from Jim Arvo's method in Graphics Gems
-      See also http://www.win.tue.nl/~gino/solid/gdc2001depth.pdf
-
-	  @param sphere			Fixed Sphere.
-	  @param box			Fixed Box.
-	  @param contactPoints	Sphere point that penetrates the box. [Post Condition]
-	  @param contactNormals	Normal at the penetration point. [Post Condition]
-
-	  @return Depth of penetration.  If there is no intersection between the
-	 		  objects then the depth will be a negative value.
- 	 */
-    static float penetrationDepthForFixedSphereFixedBox(
-        const Sphere&       sphere,
-        const Box&          box,
-        Array<Vector3>&     contactPoints,
-        Array<Vector3>&     contactNormals = ignoreArray);
-
-	/**
-	  Calculates the depth of penetration between a Fixed Sphere and a Fixed
-	  Plane as well as the deepest point of the sphere that penetrates the plane
-	  and the plane normal at that intersection.
-
-	  @param sphereA        Fixed Sphere.
-	  @param planeB         Fixed Plane.
-	  @param contactPoints  Sphere point that penetrates the plane.
-	 						[Post Condition]
-	  @param contactNormals Normal at penetration point. [Post Condition]
-
- 	  @return Depth of penetration.  If there is no intersection between the
-	  		 objects then the depth will be a negative value.
- 	 */
-    static float penetrationDepthForFixedSphereFixedPlane(
-        const Sphere&       sphereA,
-        const class Plane&  planeB,
-        Array<Vector3>&     contactPoints,
-        Array<Vector3>&     contactNormals = ignoreArray);
-
-	/**
-	  Calculates the depth of penetration between a fixed box and a fixed
-	  plane as well as the vertexes of the box that penetrate the plane
-	  and the plane normals at those intersections.
-
-	  @param box			Fixed Box.
-	  @param plane			Fixed Plane.
-	  @param contactPoints	Box points that penetrate the plane.
-	 						[Post Condition]
-	  @param contactNormals	Normals at penetration points [Post Condition]
-
-	  @return Depth of penetration.  If there is no intersection between the
-	 		 objects then the depth will be a negative value.
- 	*/
-    static float penetrationDepthForFixedBoxFixedPlane(
-        const Box&          box,
-        const Plane&        plane,
-        Array<Vector3>&     contactPoints,
-        Array<Vector3>&     contactNormals = ignoreArray);
-
-	/**
- 	  Calculates time between the intersection of a moving point and a fixed
- 	  plane.
-
- 	  @note This is only a one sided collision test.   The side defined by
- 	  the plane's surface normal is the only one tested.  For a two sided
- 	  collision, call the function once for each side's surface normal.
-
- 	  @param point		Moving point.
- 	  @param velocity	Point's velocity.
- 	  @param plane		Fixed plane.
- 	  @param location	Location of collision. [Post Condition]
- 	  					(Infinite vector on no collision)
- 	  @param outNormal	Plane's surface normal. [Post Condition]
-
- 	  @return Time til collision.  If there is no collision then the return
- 	          value will be inf().
- 	*/
-    static float collisionTimeForMovingPointFixedPlane(
-        const Vector3&			point,
-        const Vector3&			velocity,
-        const class Plane&		plane,
-        Vector3&				outLocation,
-        Vector3&                outNormal = ignore);
-
-	/**
- 	  Calculates time between the intersection of a moving point and a fixed
- 	  triangle.
-
- 	  @note This is only a one sided collision test.   The side defined by
- 	  the triangle's surface normal is the only one tested.  For a two sided
- 	  collision, call the function once for each side's surface normal.
-
- 	  @param orig		Moving point.
- 	  @param dir		Point's velocity.
-	  @param v0 		Triangle vertex 1.
-	  @param v1 		Triangle vertex 2.
-	  @param v2 		Triangle vertex 3
-
- 	  @return Time til collision.  If there is no collision then the return
- 	          value will be inf().
- 	*/
-    inline static float collisionTimeForMovingPointFixedTriangle(
-        const Vector3& orig,
-        const Vector3& dir,
-        const Vector3& v0,
-        const Vector3& v1,
-        const Vector3& v2) {
-        return Ray::fromOriginAndDirection(orig, dir).intersectionTime(v0, v1, v2);
-    }
-
-	/**
- 	  Calculates time between the intersection of a moving point and a fixed
- 	  triangle.
-
- 	  @note This is only a one sided collision test.   The side defined by
- 	  the triangle's surface normal is the only one tested.  For a two sided
- 	  collision, call the function once for each side's surface normal.
-
- 	  @param orig		Moving point.
- 	  @param dir		Point's velocity.
-	  @param v0 		Triangle vertex 1.
-	  @param v1 		Triangle vertex 2.
-	  @param v2 		Triangle vertex 3
- 	  @param location	Location of collision. [Post Condition]
- 	  					(Infinite vector on no collision)
-
- 	  @return Time til collision.  If there is no collision then the return
- 	          value will be inf().
- 	*/
-    inline static float collisionTimeForMovingPointFixedTriangle(
-        const Vector3& orig,
-        const Vector3& dir,
-        const Vector3& v0,
-        const Vector3& v1,
-        const Vector3& v2,
-        Vector3&       location) {
-        float t = collisionTimeForMovingPointFixedTriangle(orig, dir, v0, v1, v2);
-        if (t < finf()) {
-            location = orig + dir * t;
-        }
-        return t;
-    }
-
-	/**
- 	  Calculates time between the intersection of a moving point and a fixed
- 	  triangle.
-
- 	  @note This is only a one sided collision test.   The side defined by
- 	  the triangle's surface normal is the only one tested.  For a two sided
- 	  collision, call the function once for each side's surface normal.
-
- 	  @param orig		Moving point.
- 	  @param dir		Point's velocity.
- 	  @param tri		Fixed triangle.
- 	  @param location	Location of collision. [Post Condition]
- 	  					(Infinite vector on no collision)
- 	  @param normal		Triangle's surface normal. [Post Condition]
-
- 	  @return Time til collision.  If there is no collision then the return
- 	          value will be inf().
- 	*/
-    inline static float collisionTimeForMovingPointFixedTriangle(
-        const Vector3&  orig,
-        const Vector3&  dir,
-        const Triangle& tri,
-        Vector3&        location = ignore,
-        Vector3&        normal   = ignore) {
-
-        float t = collisionTimeForMovingPointFixedTriangle(
-            orig, dir, tri.vertex(0), tri.vertex(1), tri.vertex(2));
-        
-        if ((t < finf()) && (&location != &ignore)) {
-            location = orig + dir * t;
-            normal   = tri.normal();
-        }
-        return t;
-    }
-
-	/**
- 	  Calculates time between the intersection of a moving point and a fixed
- 	  triangle.
-
- 	  @note This is only a one sided collision test.   The side defined by
- 	  the triangle's surface normal is the only one tested.  For a two sided
- 	  collision, call the function once for each side's surface normal.
-
- 	  @param orig		Moving point.
- 	  @param dir		Point's velocity.
-	  @param v0 		Triangle vertex 1.
-	  @param v1 		Triangle vertex 2.
-	  @param v2 		Triangle vertex 3
- 	  @param location	Location of collision. [Post Condition]
- 	  					(Infinite vector on no collision)
- 	  @param normal		Triangle's surface normal. [Post Condition]
-
- 	  @return Time til collision.  If there is no collision then the return
- 	          value will be inf().
- 	*/
-    inline static float collisionTimeForMovingPointFixedTriangle(
-        const Vector3& orig,
-        const Vector3& dir,
-        const Vector3& v0,
-        const Vector3& v1,
-        const Vector3& v2,
-        Vector3&       location,
-        Vector3&       normal) {
-        float t = collisionTimeForMovingPointFixedTriangle(orig, dir, v0, v1, v2);
-        if (t < finf()) {
-            location = orig + dir * t;
-            normal   = (v1 - v0).cross(v2 - v0).direction();
-        }
-        return t;
-    }
-
-    /**
-     If the ray origin is inside the box, returns inf() but inside
-     is set to true.
-     <B>Beta API</B>
-
-     @cite Andrew Woo, from "Graphics Gems", Academic Press, 1990
-  	 @cite Optimized code by Pierre Terdiman, 2000 (~20-30% faster on Celeron 500)
-     @cite Epsilon value added by Klaus Hartmann
-     @cite http://www.codercorner.com/RayAABB.cpp
-     */
-    static float collisionTimeForMovingPointFixedAABox(
-        const Vector3&			point,
-        const Vector3&			velocity,
-        const class AABox&      box,
-        Vector3&				outLocation,
-        bool&                   inside = ignoreBool,
-        Vector3&                outNormal = ignore);
-
-    /**
-	 Calculates time between the intersection of a moving point and a fixed
-	 Axis-Aligned Box (AABox).
-
-	 @note Avoids the sqrt from collisionTimeForMovingPointFixedAABox.
-
-	 @param point		Moving point.
-	 @param velocity	Sphere's velocity.
-	 @param box			Fixed AAbox.
-	 @param location	Location of collision. [Post Condition]
-	 @param Inside		Does the ray originate inside the box? [Post Condition]
-	 @param normal		Box's surface normal to collision [Post Condition]
-
-	 @return Time til collision.  If there is no collision then the return
-	         value will be inf().
- 	*/
-    static bool collisionLocationForMovingPointFixedAABox(
-        const Vector3&			point,
-        const Vector3&			velocity,
-        const class AABox&      box,
-        Vector3&				outLocation,
-        bool&                   inside = ignoreBool,
-        Vector3&                normal = ignore);
-
-
-    /**
-     @brief Calculates intersection of a ray and a static
-     Axis-Aligned Box (AABox).
-
-     @note Avoids the sqrt from collisionTimeForMovingPointFixedAABox; 
-      early-out branches and operations optimized for Intel Core2 architecture.
-     
-     @param invDir      1/dir
-     @param location	Location of collision. [Post Condition]
-     @param inside		Does the ray originate inside the box? [Post Condition]
-
-     @return True if the ray hits the box
-    */
-    static bool __fastcall rayAABox(
-        const Ray&              ray,
-        const Vector3&          invDir,
-        const AABox&            box,
-        const Vector3&          boxCenter,
-        float                   boundingRadiusSquared,
-        Vector3&                location,
-        bool&                   inside);
-
-    /**
-	 Calculates time between the intersection of a moving point and a fixed
-	 sphere.
-
-	 @note When ray is starts inside the rectangle, the exiting intersection
-	 is detected.
-
-	 @param point		Moving point.
-	 @param velocity	Point's velocity.
-	 @param sphere		Fixed Sphere.
-	 @param outLocation	Location of collision. [Post Condition]
-	 @param outNormal	Sphere's surface normal to collision [Post Condition]
-     \param solid If true, rays inside the sphere immediately intersect (good for collision detection).  If false, they hit the opposite side of the sphere (good for ray tracing).
-
-	 @return Time until collision.  If there is no collision then the return
-	         value will be inf().
- 	*/
-    static float collisionTimeForMovingPointFixedSphere(
-        const Vector3&			point,
-        const Vector3&			velocity,
-        const class Sphere&		sphere,
-        Vector3&				outLocation,
-        Vector3&                outNormal = ignore,
-        bool                    solid = false);
-
-    /**
-	 Calculates time between the intersection of a moving point and a fixed
-	 box.
-
-	 @note If the point is already inside the box, no collision: inf is returned.
-
-	 @param point		Moving point.
-	 @param velocity	Sphere's velocity.
-	 @param box			Fixed box.
-	 @param location	Position of collision. [Post Condition]
-	 @param outNormal	Box's surface normal to collision [Post Condition]
-
-	 @return Time til collision.  If there is no collision then the return
-	         value will be inf().
- 	*/
-    static float collisionTimeForMovingPointFixedBox(
-        const Vector3&			point,
-        const Vector3&			velocity,
-        const class  Box&		box,
-        Vector3&				outLocation,
-        Vector3&                outNormal = ignore);
-
-	/**
-	 Calculates time between the intersection of a moving point and a fixed
-	 rectangle defined by the points v0, v1, v2, & v3.
-
-	 @note This is only a one sided collision test.   The side defined by
-	 the rectangle's surface normal is the only one tested.  For a two sided
-	 collision, call the function once for each side's surface normal.
-
-	 @param point		Moving point.
-	 @param velocity	Sphere's velocity.
-	 @param v0 			Rectangle vertex 1.
-	 @param v1 			Rectangle vertex 2.
-	 @param v2 			Rectangle vertex 3
-	 @param v3 			Rectangle vertex 4.
-	 @param location	Location of collision [Post Condition]
-	 @param outNormal	Rectangle's surface normal. [Post Condition]
-
-	 @return Time til collision.  If there is no collision then the return
-	         value will be inf().
- 	*/
-    static float collisionTimeForMovingPointFixedRectangle(
-        const Vector3&			point,
-        const Vector3&			velocity,
-        const Vector3&			v0,
-        const Vector3&			v1,
-        const Vector3&			v2,
-        const Vector3&			v3,
-        Vector3&				outLocation,
-        Vector3&                outNormal = ignore);
-
-	/**
-	 Calculates time between the intersection of a moving point and a fixed
-	 capsule.
-
-	 @param point		Moving point.
-	 @param velocity	Point's velocity.
-	 @param capsule		Fixed capsule.
-	 @param outLocation	Location of collision. [Post Condition]
-	 @param outNormal	Capsule's surface normal to collision [Post Condition]
-
-	 @return Time til collision.  If there is no collision then the return
-	         value will be inf().
- 	*/
-	static float collisionTimeForMovingPointFixedCapsule(
-		const Vector3&		    point,
-		const Vector3&		    velocity,
-		const class Capsule&	capsule,
-        Vector3&				outLocation,
-        Vector3&                outNormal = ignore);
-
-	/**
-	 Calculates time between the intersection of a moving sphere and a fixed
-	 triangle.
-
-	 @param sphere		Moving sphere.
-	 @param velocity	Sphere's velocity.
-	 @param plane		Fixed Plane.
-	 @param outLocation	Location of collision -- not center position of sphere
-	 					at the collision time. [Post Condition]
-	 @param outNormal	Box's surface normal to collision [Post Condition]
-
-	 @return Time til collision.  If there is no collision then the return
-	         value will be inf().
-	 */
-    static float collisionTimeForMovingSphereFixedPlane(
-        const class Sphere&		sphere,
-        const Vector3&	    	velocity,
-        const class Plane&		plane,
-        Vector3&				outLocation,
-        Vector3&                outNormal = ignore);
-
-	/**
-	 Calculates time between the intersection of a moving sphere and a fixed
-	 triangle.
-
-	 @param sphere		Moving sphere.
-	 @param velocity	Sphere's velocity.
-	 @param triangle	Fixed Triangle.  (collisions can happen on the back side of the triangle)
-	 @param outLocation	Location of collision, if collision occurs -- not center position of sphere
-	 					at the collision time. If there is interpenetration at the start, this point may be inside
-                        the sphere.
-     @param b           Barycentric coordinates. These are not valid unless collision occurs.
-
-	 @return Time til collision.  If there is no collision then the return
-	         value will be inf().
-	*/
-    static float collisionTimeForMovingSphereFixedTriangle(
-        const class Sphere&		sphere,
-        const Vector3&		    velocity,
-        const Triangle&         triangle,
-        Vector3&				outLocation,
-        float                   b[3] = (float*)&ignore);
-
-	/**
-	 Calculates time between the intersection of a moving sphere and a fixed
-	 rectangle defined by the points v0, v1, v2, & v3.
-
-	 @param sphere		Moving sphere.
-	 @param velocity	Sphere's velocity.
-	 @param v0 			Rectangle vertex 1.
-	 @param v1 			Rectangle vertex 2.
-	 @param v2 			Rectangle vertex 3
-	 @param v3 			Rectangle vertex 4.
-	 @param outLocation	Location of collision -- not center position of sphere
-	 					at the collision time. [Post Condition]
-	 @param outNormal	Box's surface normal to collision [Post Condition]
-
-	 @return Time til collision.  If there is no collision then the return
-	         value will be inf().
- 	*/
-    static float collisionTimeForMovingSphereFixedRectangle(
-        const class Sphere&		sphere,
-        const Vector3&	    	velocity,
-        const Vector3&	    	v0,
-        const Vector3&	    	v1,
-        const Vector3&	    	v2,
-        const Vector3&	    	v3,
-        Vector3&				outLocation,
-        Vector3&                outNormal = ignore);
-
-	/**
-	 Calculates time between the intersection of a moving sphere and a fixed
-	 box.
-
-	 @note This function will not detect an intersection between a moving object
-	 that is already interpenetrating the fixed object.
-
-	 @param sphere		Moving sphere.
-	 @param velocity	Sphere's velocity.
-	 @param box			Fixed box.
-	 @param location	Location of collision -- not center position of sphere
-	 					at the collision time. [Post Condition]
-	 @param outNormal	Box's surface normal to collision [Post Condition]
-
-	 @return Time til collision.  If there is no collision then the return
-	         value will be inf().
- 	*/
-    static float collisionTimeForMovingSphereFixedBox(
-        const class Sphere&		sphere,
-        const Vector3&		    velocity,
-        const class Box&		box,
-        Vector3&				outLocation,
-        Vector3&                outNormal = ignore);
-
-    /** Calculates time between the intersection of a moving sphere
-        and a fixed sphere. 
-
-        If they are already interpenetrating, returns 0 and @a
-        location is the closest point on the surface of the fixed sphere
-        to the center of the moving sphere.
-        
-        @param sphere	        Moving sphere.
-        @param velocity         Sphere's velocity.
-        @param fixedSphere	    Fixed Sphere.
-        @param outLocation	    Location of collision -- not center position of sphere
-        at the collision time. [Post Condition]
-        @param outNormal	    Moving sphere's surface normal to collision [Post Condition]
-        
-        @return Time until collision.  If there is no collision then the return
-        value will be inf().
-    */
-    static float collisionTimeForMovingSphereFixedSphere(
-        const Sphere&	    sphere,
-        const Vector3&		velocity,
-        const Sphere&	    fixedSphere,
-        Vector3&	        outLocation,
-        Vector3&            outNormal = ignore);
-
-    /**
-	 Calculates time between the intersection of a moving sphere and a fixed
-	 capsule.
-
-	 @note This won't detect a collision if the sphere is already
-	       interpenetrating the capsule.
-
-	 @param sphere		Moving sphere.
-	 @param velocity	Sphere's velocity.
-	 @param capsule		Fixed capsule.
-	 @param location	Location of collision -- not center position of sphere
-	 					at the collision time. [Post Condition]
-	 @param outNormal	Capsule's surface normal to the collision [Post Condition]
-
-	 @return Time til collision.  If there is no collision then the return
-	         value will be inf().
- 	*/
-	static float collisionTimeForMovingSphereFixedCapsule(
-		const class Sphere&		sphere,
-		const Vector3&		    velocity,
-		const class Capsule&	capsule,
-        Vector3&				outLocation,
-        Vector3&                outNormal = ignore);
-
-    /**
-	 Finds the direction of bounce that a sphere would have when it 
-	 intersects an object with the  given time of collision, the 
-	 collision location and the collision normal.
-
-	 @note This function works like a pong style ball bounce.
-
-	 @param sphere				Moving sphere.
-	 @param velocity			Sphere's velocity.
-	 @param collisionTime		Time of collision.
-	 @param collisionLocation	Collision location.
-	 @param collisionNormal		Surface collision normal.
-
-	 @return Direction of bounce.
- 	*/
-    static Vector3 bounceDirection(
-        const class Sphere&		sphere,
-        const Vector3&			velocity,
-        const float				collisionTime,
-        const Vector3&			collisionLocation,
-        const Vector3&          collisionNormal);
-
-    /**
-	 Finds the direction of slide given a moving sphere, its velocity, the
-	 time of collision and the collision location.  This function works as
-	 if the sphere intersects the surface and continues to hug it.
-
-	 @note The result will work well for calculating the movement of a player
-	 who collides with an object and continues moving along the object instead
-	 of just bouncing off it.
-
-	 @param sphere				Moving sphere.
-	 @param velocity			Sphere's velocity.
-	 @param collisionTime		Time of collision
-	 @param collisionLocation	Collision location.
-
-	 @return Direction of slide.
- 	*/
-    static Vector3 slideDirection(
-        const class Sphere&		sphere,
-        const Vector3&			velocity,
-        const float				collisionTime,
-        const Vector3&			collisionLocation);
-
-	/**
-	 Finds the closest point on a line segment to a given point.
-
-	 @param v0 line vertex 1.
-	 @param v1 line vertex 2.
-	 @param point External point.
-
-	 @return Closests point to <code>point</code> on the line segment.
- 	*/
-	static Vector3 closestPointOnLineSegment(
-        const Vector3&			v0,
-        const Vector3&			v1,
-        const Vector3&			point);
-
-    /**
-	 Finds the closest point on a line segment to a given point.
-
-	 @note This is an optimization to closestPointOnLineSegment.  Edge length
-	 and direction can be used in this function if already pre-calculated.  This
-	 prevents doing the same work twice.
-
-	 @param v0 line vertex 0.
-	 @param v1 line vertex 1.
-     @param edgeDirection The direction of the segment (unit length).
-     @param edgeLength The length of the segment.
-     @param point External point.
-
-	 @return Closests point to <code>point</code> on the line segment.
- 	*/
-    static Vector3 closestPointOnLineSegment(
-        const Vector3&			v0,
-        const Vector3&			v1,
-        const Vector3&          edgeDirection,
-        float                   edgeLength,
-        const Vector3&			point);
-
-    /**
-	 Finds the closest point on the perimeter of the triangle to an external point;
-	 given a triangle defined by three points v0, v1, & v2, and the external point.
-
-	 @param v0 Triangle vertex 0.
-	 @param v1 Triangle vertex 1.
-	 @param v2 Triangle vertex 2.
-	 @param point External point.
-
-	 @return Closests point to <code>point</code> on the perimeter of the
-	 triangle.
- 	*/
-    static Vector3 closestPointOnTrianglePerimeter(
-        const Vector3&			v0,
-        const Vector3&			v1,
-        const Vector3&			v2,
-        const Vector3&			point);
-
-	/**
-	 Finds the closest point on the perimeter of the triangle to an external point;
-	 given a triangle defined by the array of points v, its edge directions and
-	 their lengths, as well as the external point.
-
-	 @note This is an optimization to closestPointToTrianglePerimeter.  Edge length
-	 and direction can be used in this function if already pre-calculated.  This
-	 prevents doing the same work twice.
-
-	 @param v           Triangle vertices.
-	 @param point       External point.
-     @param edgeIndex   The point lies on the edge between v[edgeIndex] and v[(edgeIndex + 1) % 3]
-
-	 @return Closest point to <code>point</code> on the perimeter of the
-	 triangle.
- 	*/
-    static Vector3 closestPointOnTrianglePerimeter(
-        const Vector3           v[3],
-        const Vector3           edgeDirection[3],
-        const float             edgeLength[3],
-        const Vector3&			point,
-        int&                    edgeIndex);
-
-    /**
-	 Tests whether a point is contained within the triangle defined by
-	 v0, v1, and v2 and its plane's normal.
-
-	 @param v0 Triangle vertex 0.
-	 @param v1 Triangle vertex 1.
-	 @param v2 Triangle vertex 2.
-	 @param normal Normal to triangle's plane.
-	 @param point The point in question.
-	 @param primaryAxis Primary axis of triangle.  This will be detected
-	        if not given. This parameter is provided as an optimization.
-     @param b Barycentric coordinates; b[i] is the weight on v[i]
-
-	 @return true  - if point is inside the triangle.
-	 @return false - otherwise
- 	*/
-    static bool isPointInsideTriangle(
-        const Vector3&			v0,
-        const Vector3&			v1,
-        const Vector3&			v2,
-        const Vector3&			normal,
-        const Vector3&          point,
-        float                   b[3],
-        Vector3::Axis           primaryAxis = Vector3::DETECT_AXIS);
-
-    inline static bool isPointInsideTriangle(
-        const Vector3&			v0,
-        const Vector3&			v1,
-        const Vector3&			v2,
-        const Vector3&			normal,
-        const Vector3&			point,
-        Vector3::Axis           primaryAxis = Vector3::DETECT_AXIS) {
-
-        float b[3];
-        return isPointInsideTriangle(v0, v1, v2, normal, point, b, primaryAxis);
-    }
-
-     /**
-	  Tests for the intersection of a moving sphere and a fixed box in a
-	  given time limit.
-
-	  @note Returns true if any part of the sphere is inside the box
-     		during the time period (inf means "ever").  Useful for
-		    performing bounding-box collision detection.
-
-	  @param sphere 		Moving sphere.
-	  @param velocity 	Velocity of moving sphere.
-	  @param box 		Fixed box.
-	  @param timeLimit 	Time limit for intersection test.
-
-	  @return true  -  if the two objects will touch.
-	  @return false - if there is no intersection.
- 	*/
-    static bool movingSpherePassesThroughFixedBox(
-        const Sphere&           sphere,
-        const Vector3&          velocity,
-        const Box&              box,
-        double                  timeLimit = inf());
-
-	/**
-	 Tests for the intersection of a moving sphere and a fixed sphere in a
-	 given time limit.
-
-	 @note This function will not detect an intersection between a moving object
-	 that is already interpenetrating the fixed object.
-
-	 @param sphere 		Moving sphere.
-	 @param velocity 	Velocity of moving sphere.
-	 @param fixedSphere Fixed sphere.
-	 @param timeLimit 	Time limit for intersection test.
-
-	 @return true  -  if the two spheres will touch.
-	 @return false - if there is no intersection.
- 	*/
-    static bool movingSpherePassesThroughFixedSphere(
-        const Sphere&           sphere,
-        const Vector3&          velocity,
-        const Sphere&           fixedSphere,
-        double                  timeLimit = inf());
-
-	/**
-	 Tests for the intersection of two fixed spheres.
-
-	 @param sphere1 Fixed sphere 1.
-	 @param sphere2 Fixed sphere 2.
-
-	 @return true -  if the two spheres touch.
-	 @return false - if there is no intersection.
- 	*/
-    static bool fixedSolidSphereIntersectsFixedSolidSphere(
-        const Sphere&           sphere1,
-        const Sphere&           sphere2);
-
-	/**
-	 Tests for the intersection of a fixed sphere and a fixed box.
-
-	 @param sphere Fixed sphere.
-	 @param box    Fixed box.
-
-	 @return true  -  if the two objects touch.
-	 @return false - if there is no intersection.
- 	*/
-    static bool fixedSolidSphereIntersectsFixedSolidBox(
-        const Sphere&           sphere,
-        const Box&              box);
-
-    static bool fixedSolidSphereIntersectsFixedTriangle(
-        const Sphere&           sphere,
-        const Triangle&         triangle);
-
-    static bool fixedSolidBoxIntersectsFixedTriangle(
-        const AABox&            box, 
-        const Triangle&         triangle);
-
-    /**
-	 Tests whether a point is inside a rectangle defined by the vertexes
-	 v0, v1, v2, & v3, and the rectangle's plane normal.
-
-	 @param v0 Rectangle vertex 1.
-	 @param v1 Rectangle vertex 2.
-	 @param v2 Rectangle vertex 3.
-	 @param v3 Rectangle vertex 4.
-	 @param normal Normal to rectangle's plane.
-	 @param point The point in question.
-
-	 @return true  - if point is inside the rectangle.
-	 @return false - otherwise
- 	*/
-    static bool isPointInsideRectangle(
-        const Vector3&			v0,
-        const Vector3&			v1,
-        const Vector3&			v2,
-        const Vector3&			v3,
-        const Vector3&			normal,
-        const Vector3&			point);
-
-    /**
-	 Finds the closest point on the perimeter of the rectangle to an
-	 external point; given a rectangle defined by four points v0, v1,
-	 v2, & v3, and the external point.
-
-	 @param v0 Rectangle vertex 1.
-	 @param v1 Rectangle vertex 2.
-	 @param v2 Rectangle vertex 3.
-	 @param v3 Rectangle vertex 4.
-	 @param point External point.
-
-	 @return Closests point to <code>point</code> on the perimeter of the
- 	 rectangle.
- 	 */
-    static Vector3 closestPointToRectanglePerimeter(
-        const Vector3&			v0,
-        const Vector3&			v1,
-        const Vector3&			v2,
-        const Vector3&			v3,
-        const Vector3&			point);
-
-     /**
-	  Finds the closest point in the rectangle to an external point; Given
-	  a rectangle defined by four points v0, v1, v2, & v3, and the external
-	  point.
-
-	  @param v0 Rectangle vertex 1.
-	  @param v1 Rectangle vertex 2.
-	  @param v2 Rectangle vertex 3
-	  @param v3 Rectangle vertex 4.
-	  @param point External point.
-
-      @return Closet point in the rectangle to the external point.
-	  */
-	 static Vector3 closestPointToRectangle(
-        const Vector3&			v0,
-        const Vector3&			v1,
-        const Vector3&			v2,
-        const Vector3&			v3,
-        const Vector3&			point);
-};
-
-} // namespace
-
-#endif // G3D_COLLISIONDETECTION_H
diff --git a/dep/include/mersennetwister/MersenneTwister.h b/dep/include/mersennetwister/MersenneTwister.h
deleted file mode 100644
index 5dca7e212..000000000
--- a/dep/include/mersennetwister/MersenneTwister.h
+++ /dev/null
@@ -1,414 +0,0 @@
-// MersenneTwister.h
-// Mersenne Twister random number generator -- a C++ class MTRand
-// Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus
-// Richard J. Wagner  v1.0  15 May 2003  rjwagner@writeme.com
-
-// The Mersenne Twister is an algorithm for generating random numbers.  It
-// was designed with consideration of the flaws in various other generators.
-// The period, 2^19937-1, and the order of equidistribution, 623 dimensions,
-// are far greater.  The generator is also fast; it avoids multiplication and
-// division, and it benefits from caches and pipelines.  For more information
-// see the inventors' web page at http://www.math.keio.ac.jp/~matumoto/emt.html
-
-// Reference
-// M. Matsumoto and T. Nishimura, "Mersenne Twister: A 623-Dimensionally
-// Equidistributed Uniform Pseudo-Random Number Generator", ACM Transactions on
-// Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30.
-
-// Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-// Copyright (C) 2000 - 2003, Richard J. Wagner
-// All rights reserved.                          
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//   1. Redistributions of source code must retain the above copyright
-//      notice, this list of conditions and the following disclaimer.
-//
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-//
-//   3. The names of its contributors may not be used to endorse or promote 
-//      products derived from this software without specific prior written 
-//      permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// The original code included the following notice:
-//
-//     When you use this, send an email to: matumoto@math.keio.ac.jp
-//     with an appropriate reference to your work.
-//
-// It would be nice to CC: rjwagner@writeme.com and Cokus@math.washington.edu
-// when you write.
-
-#ifndef MERSENNETWISTER_H
-#define MERSENNETWISTER_H
-
-// Not thread safe (unless auto-initialization is avoided and each thread has
-// its own MTRand object)
-
-#include"Platform/Define.h"
-
-#include <limits.h>
-#include <time.h>
-#include <math.h>
-
-class MTRand {
-// Data
-public:
-    typedef ::uint32 uint32;
-	enum { N = 624 };       // length of state vector
-	enum { SAVE = N + 1 };  // length of array for save()
-
-protected:
-	enum { M = 397 };  // period parameter
-	
-	uint32 state[N];   // internal state
-	uint32 *pNext;     // next value to get from state
-	int left;          // number of values left before reload needed
-
-
-//Methods
-public:
-	MTRand( const uint32& oneSeed );  // initialize with a simple uint32
-	MTRand( uint32 *const bigSeed, uint32 const seedLength = N );  // or an array
-	MTRand();                         // auto-initialize with /dev/urandom or time() and clock()
-	MTRand(const MTRand&);            // prevent copy constructor
-	MTRand& operator=(const MTRand&); // no-op operator=
-	
-	// Do NOT use for CRYPTOGRAPHY without securely hashing several returned
-	// values together, otherwise the generator state can be learned after
-	// reading 624 consecutive values.
-	
-	// Access to 32-bit random numbers
-	double rand();                          // real number in [0,1]
-	double rand( const double& n );         // real number in [0,n]
-	double randExc();                       // real number in [0,1)
-	double randExc( const double& n );      // real number in [0,n)
-	double randDblExc();                    // real number in (0,1)
-	double randDblExc( const double& n );   // real number in (0,n)
-	uint32 randInt();                       // integer in [0,2^32-1]
-	uint32 randInt( const uint32& n );      // integer in [0,n] for n < 2^32
-	double operator()() { return rand(); }  // same as rand()
-	
-	// Access to 53-bit random numbers (capacity of IEEE double precision)
-	double rand53();  // real number in [0,1)
-	
-	// Access to nonuniform random number distributions
-	double randNorm( const double& mean = 0.0, const double& variance = 0.0 );
-	
-	// Re-seeding functions with same behavior as initializers
-	void seed( const uint32 oneSeed );
-	void seed( uint32 *const bigSeed, const uint32 seedLength = N );
-	void seed();
-	
-	// Saving and loading generator state
-	void save( uint32* saveArray ) const;  // to array of size SAVE
-	void load( uint32 *const loadArray );  // from such array
-    /* Mangos not use streams for random values output
-	friend std::ostream& operator<<( std::ostream& os, const MTRand& mtrand );
-	friend std::istream& operator>>( std::istream& is, MTRand& mtrand );
-    */
-protected:
-	void initialize( const uint32 oneSeed );
-	void reload();
-	uint32 hiBit( const uint32& u ) const { return u & 0x80000000UL; }
-	uint32 loBit( const uint32& u ) const { return u & 0x00000001UL; }
-	uint32 loBits( const uint32& u ) const { return u & 0x7fffffffUL; }
-	uint32 mixBits( const uint32& u, const uint32& v ) const
-		{ return hiBit(u) | loBits(v); }
-	uint32 twist( const uint32& m, const uint32& s0, const uint32& s1 ) const
-		{ return m ^ (mixBits(s0,s1)>>1) ^ uint32(-(int32)(loBit(s1) & 0x9908b0dfUL)); }
-	static uint32 hash( time_t t, clock_t c );
-};
-
-inline MTRand::MTRand(const MTRand&)
-    { seed(); }
-
-inline MTRand& MTRand::operator=(const MTRand&) 
-    { return *this; }
-
-inline MTRand::MTRand( const uint32& oneSeed )
-	{ seed(oneSeed); }
-
-inline MTRand::MTRand( uint32 *const bigSeed, const uint32 seedLength )
-	{ seed(bigSeed,seedLength); }
-
-inline MTRand::MTRand()
-	{ seed(); }
-
-inline double MTRand::rand()
-	{ return double(randInt()) * (1.0/4294967295.0); }
-
-inline double MTRand::rand( const double& n )
-	{ return rand() * n; }
-
-inline double MTRand::randExc()
-	{ return double(randInt()) * (1.0/4294967296.0); }
-
-inline double MTRand::randExc( const double& n )
-	{ return randExc() * n; }
-
-inline double MTRand::randDblExc()
-	{ return ( double(randInt()) + 0.5 ) * (1.0/4294967296.0); }
-
-inline double MTRand::randDblExc( const double& n )
-	{ return randDblExc() * n; }
-
-inline double MTRand::rand53()
-{
-	uint32 a = randInt() >> 5, b = randInt() >> 6;
-	return ( a * 67108864.0 + b ) * (1.0/9007199254740992.0);  // by Isaku Wada
-}
-
-inline double MTRand::randNorm( const double& mean, const double& variance )
-{
-	// Return a real number from a normal (Gaussian) distribution with given
-	// mean and variance by Box-Muller method
-	double r = sqrt( -2.0 * log( 1.0-randDblExc()) ) * variance;
-	double phi = 2.0 * 3.14159265358979323846264338328 * randExc();
-	return mean + r * cos(phi);
-}
-
-inline MTRand::uint32 MTRand::randInt()
-{
-	// Pull a 32-bit integer from the generator state
-	// Every other access function simply transforms the numbers extracted here
-	
-	if( left == 0 ) reload();
-	--left;
-		
-	register uint32 s1;
-	s1 = *pNext++;
-	s1 ^= (s1 >> 11);
-	s1 ^= (s1 <<  7) & 0x9d2c5680UL;
-	s1 ^= (s1 << 15) & 0xefc60000UL;
-	return ( s1 ^ (s1 >> 18) );
-}
-
-inline MTRand::uint32 MTRand::randInt( const uint32& n )
-{
-	// Find which bits are used in n
-	// Optimized by Magnus Jonsson (magnus@smartelectronix.com)
-	uint32 used = n;
-	used |= used >> 1;
-	used |= used >> 2;
-	used |= used >> 4;
-	used |= used >> 8;
-	used |= used >> 16;
-	
-	// Draw numbers until one is found in [0,n]
-	uint32 i;
-	do
-		i = randInt() & used;  // toss unused bits to shorten search
-	while( i > n );
-	return i;
-}
-
-
-inline void MTRand::seed( const uint32 oneSeed )
-{
-	// Seed the generator with a simple uint32
-	initialize(oneSeed);
-	reload();
-}
-
-
-inline void MTRand::seed( uint32 *const bigSeed, const uint32 seedLength )
-{
-	// Seed the generator with an array of uint32's
-	// There are 2^19937-1 possible initial states.  This function allows
-	// all of those to be accessed by providing at least 19937 bits (with a
-	// default seed length of N = 624 uint32's).  Any bits above the lower 32
-	// in each element are discarded.
-	// Just call seed() if you want to get array from /dev/urandom
-	initialize(19650218UL);
-	register int i = 1;
-	register uint32 j = 0;
-	register int k = ( N > int(seedLength) ? N : int(seedLength) );
-	for( ; k; --k )
-	{
-		state[i] =
-			state[i] ^ ( (state[i-1] ^ (state[i-1] >> 30)) * 1664525UL );
-		state[i] += ( bigSeed[j] & 0xffffffffUL ) + j;
-		state[i] &= 0xffffffffUL;
-		++i;  ++j;
-		if( i >= N ) { state[0] = state[N-1];  i = 1; }
-		if( j >= seedLength ) j = 0;
-	}
-	for( k = N - 1; k; --k )
-	{
-		state[i] =
-			state[i] ^ ( (state[i-1] ^ (state[i-1] >> 30)) * 1566083941UL );
-		state[i] -= i;
-		state[i] &= 0xffffffffUL;
-		++i;
-		if( i >= N ) { state[0] = state[N-1];  i = 1; }
-	}
-	state[0] = 0x80000000UL;  // MSB is 1, assuring non-zero initial array
-	reload();
-}
-
-
-inline void MTRand::seed()
-{
-	// Seed the generator with hash of time() and clock() values
-	seed( hash( time(NULL), clock() ) );
-}
-
-
-inline void MTRand::initialize( const uint32 seed )
-{
-	// Initialize generator state with seed
-	// See Knuth TAOCP Vol 2, 3rd Ed, p.106 for multiplier.
-	// In previous versions, most significant bits (MSBs) of the seed affect
-	// only MSBs of the state array.  Modified 9 Jan 2002 by Makoto Matsumoto.
-	register uint32 *s = state;
-	register uint32 *r = state;
-	register int i = 1;
-	*s++ = seed & 0xffffffffUL;
-	for( ; i < N; ++i )
-	{
-		*s++ = ( 1812433253UL * ( *r ^ (*r >> 30) ) + i ) & 0xffffffffUL;
-		r++;
-	}
-}
-
-
-inline void MTRand::reload()
-{
-	// Generate N new values in state
-	// Made clearer and faster by Matthew Bellew (matthew.bellew@home.com)
-	register uint32 *p = state;
-	register int i;
-	for( i = N - M; i--; ++p )
-		*p = twist( p[M], p[0], p[1] );
-	for( i = M; --i; ++p )
-		*p = twist( p[M-N], p[0], p[1] );
-	*p = twist( p[M-N], p[0], state[0] );
-
-	left = N, pNext = state;
-}
-
-
-inline MTRand::uint32 MTRand::hash( time_t t, clock_t c )
-{
-	// Get a uint32 from t and c
-	// Better than uint32(x) in case x is floating point in [0,1]
-	// Based on code by Lawrence Kirby (fred@genesis.demon.co.uk)
-
-	static uint32 differ = 0;  // guarantee time-based seeds will change
-
-	uint32 h1 = 0;
-	unsigned char *p = (unsigned char *) &t;
-	for( size_t i = 0; i < sizeof(t); ++i )
-	{
-		h1 *= UCHAR_MAX + 2U;
-		h1 += p[i];
-	}
-	uint32 h2 = 0;
-	p = (unsigned char *) &c;
-	for( size_t j = 0; j < sizeof(c); ++j )
-	{
-		h2 *= UCHAR_MAX + 2U;
-		h2 += p[j];
-	}
-	return ( h1 + differ++ ) ^ h2;
-}
-
-
-inline void MTRand::save( uint32* saveArray ) const
-{
-	register uint32 *sa = saveArray;
-	register const uint32 *s = state;
-	register int i = N;
-	for( ; i--; *sa++ = *s++ ) {}
-	*sa = left;
-}
-
-
-inline void MTRand::load( uint32 *const loadArray )
-{
-	register uint32 *s = state;
-	register uint32 *la = loadArray;
-	register int i = N;
-	for( ; i--; *s++ = *la++ ) {}
-	left = *la;
-	pNext = &state[N-left];
-}
-
-/* Mangos not use streams for random values output
-inline std::ostream& operator<<( std::ostream& os, const MTRand& mtrand )
-{
-	register const MTRand::uint32 *s = mtrand.state;
-	register int i = mtrand.N;
-	for( ; i--; os << *s++ << "\t" ) {}
-	return os << mtrand.left;
-}
-
-
-inline std::istream& operator>>( std::istream& is, MTRand& mtrand )
-{
-	register MTRand::uint32 *s = mtrand.state;
-	register int i = mtrand.N;
-	for( ; i--; is >> *s++ ) {}
-	is >> mtrand.left;
-	mtrand.pNext = &mtrand.state[mtrand.N-mtrand.left];
-	return is;
-}
-*/
-
-#endif  // MERSENNETWISTER_H
-
-// Change log:
-//
-// v0.1 - First release on 15 May 2000
-//      - Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus
-//      - Translated from C to C++
-//      - Made completely ANSI compliant
-//      - Designed convenient interface for initialization, seeding, and
-//        obtaining numbers in default or user-defined ranges
-//      - Added automatic seeding from /dev/urandom or time() and clock()
-//      - Provided functions for saving and loading generator state
-//
-// v0.2 - Fixed bug which reloaded generator one step too late
-//
-// v0.3 - Switched to clearer, faster reload() code from Matthew Bellew
-//
-// v0.4 - Removed trailing newline in saved generator format to be consistent
-//        with output format of built-in types
-//
-// v0.5 - Improved portability by replacing static const int's with enum's and
-//        clarifying return values in seed(); suggested by Eric Heimburg
-//      - Removed MAXINT constant; use 0xffffffffUL instead
-//
-// v0.6 - Eliminated seed overflow when uint32 is larger than 32 bits
-//      - Changed integer [0,n] generator to give better uniformity
-//
-// v0.7 - Fixed operator precedence ambiguity in reload()
-//      - Added access for real numbers in (0,1) and (0,n)
-//
-// v0.8 - Included time.h header to properly support time_t and clock_t
-//
-// v1.0 - Revised seeding to match 26 Jan 2002 update of Nishimura and Matsumoto
-//      - Allowed for seeding with arrays of any length
-//      - Added access for real numbers in [0,1) with 53-bit resolution
-//      - Added access for real numbers from normal (Gaussian) distributions
-//      - Increased overall speed by optimizing twist()
-//      - Doubled speed of integer [0,n] generation
-//      - Fixed out-of-range number generation on 64-bit machines
-//      - Improved portability by substituting literal constants for long enum's
-//      - Changed license from GNU LGPL to BSD
diff --git a/dep/include/mysql/Libmysql.def b/dep/include/mysql/Libmysql.def
deleted file mode 100644
index 81f86dc87..000000000
--- a/dep/include/mysql/Libmysql.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY		LIBMYSQL
-VERSION		6.0
-EXPORTS
-	_dig_vec_lower
-	_dig_vec_upper
-	bmove_upp
-	delete_dynamic
-	free_defaults
-	getopt_compare_strings
-	getopt_ull_limit_value
-	handle_options
-	init_dynamic_array
-	insert_dynamic
-	int2str
-	is_prefix
-	list_add
-	list_delete
-	load_defaults
-	my_end
-	my_getopt_print_errors
-	my_init
-	my_malloc
-	my_memdup
-	my_no_flags_free
-	my_path
-	mysql_get_parameters
-	my_print_help
-	my_print_variables
-	my_realloc
-	my_strdup
-	mysql_thread_end
-	mysql_thread_init
-	myodbc_remove_escape
-	mysql_affected_rows
-	mysql_autocommit
-	mysql_stmt_bind_param
-	mysql_stmt_bind_result
-	mysql_change_user
-	mysql_character_set_name
-	mysql_close
-	mysql_commit
-	mysql_data_seek
-	mysql_debug
-	mysql_dump_debug_info
-	mysql_eof
-	mysql_errno
-	mysql_error
-	mysql_escape_string
-	mysql_hex_string
-	mysql_stmt_execute
-	mysql_stmt_fetch
-	mysql_stmt_fetch_column
-	mysql_fetch_field
-	mysql_fetch_field_direct
-	mysql_fetch_fields
-	mysql_fetch_lengths
-	mysql_fetch_row
-	mysql_field_count
-	mysql_field_seek
-	mysql_field_tell
-	mysql_free_result
-	mysql_get_client_info
-	mysql_get_host_info
-	mysql_get_proto_info
-	mysql_get_server_info
-	mysql_get_client_version
-	mysql_get_ssl_cipher
-	mysql_info
-	mysql_init
-	mysql_insert_id
-	mysql_kill
-	mysql_set_server_option
-	mysql_list_dbs
-	mysql_list_fields
-	mysql_list_processes
-	mysql_list_tables
-	mysql_more_results
-	mysql_next_result
-	mysql_num_fields
-	mysql_num_rows
-	mysql_options
-	mysql_stmt_param_count
-	mysql_stmt_param_metadata
-	mysql_ping
-	mysql_stmt_result_metadata
-	mysql_query
-	mysql_read_query_result
-	mysql_real_connect
-	mysql_real_escape_string
-	mysql_real_query
-	mysql_refresh
-	mysql_rollback
-	mysql_row_seek
-	mysql_row_tell
-	mysql_select_db
-	mysql_stmt_send_long_data
-	mysql_send_query
-	mysql_shutdown
-	mysql_ssl_set
-	mysql_stat
-	mysql_stmt_affected_rows
-	mysql_stmt_close
-	mysql_stmt_reset
-	mysql_stmt_data_seek
-	mysql_stmt_errno
-	mysql_stmt_error
-	mysql_stmt_free_result
-	mysql_stmt_num_rows
-	mysql_stmt_row_seek
-	mysql_stmt_row_tell
-	mysql_stmt_store_result
-	mysql_store_result
-	mysql_thread_id
-	mysql_thread_safe
-	mysql_use_result
-	mysql_warning_count
-	mysql_stmt_sqlstate
-	mysql_sqlstate
-	mysql_get_server_version
-	set_dynamic
-	strcend
-	strcont
-	strdup_root
-	strfill
-	strinstr
-	strmake
-	strmov
-	strxmov
-	mysql_stmt_prepare
-	mysql_stmt_init
-	mysql_stmt_insert_id
-	mysql_stmt_attr_get
-	mysql_stmt_attr_set
-	mysql_stmt_field_count
-	client_errors
-	mysql_set_local_infile_default
-	mysql_set_local_infile_handler
-	mysql_disable_reads_from_master
-	mysql_disable_rpl_parse
-	mysql_enable_reads_from_master
-	mysql_enable_rpl_parse
-	mysql_master_query
-	mysql_rpl_parse_enabled
-	mysql_rpl_probe
-	mysql_rpl_query_type
-	mysql_slave_query
-	mysql_embedded
-	mysql_server_init
-	mysql_server_end
-	mysql_set_character_set
-	mysql_get_character_set_info
-	get_defaults_options
-	modify_defaults_file
diff --git a/dep/include/mysql/config-win.h b/dep/include/mysql/config-win.h
deleted file mode 100644
index da9b1fc00..000000000
--- a/dep/include/mysql/config-win.h
+++ /dev/null
@@ -1,412 +0,0 @@
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* Defines for Win32 to make it compatible for MySQL */
-
-#define BIG_TABLES
-
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-/* Avoid endless warnings about sprintf() etc. being unsafe. */
-#define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-
-#include <sys/locking.h>
-#include <winsock2.h>
-#include <fcntl.h>
-#include <io.h>
-#include <malloc.h>
-
-#define HAVE_SMEM 1
-
-#if defined(_WIN64) || defined(WIN64) 
-#define SYSTEM_TYPE	"Win64" 
-#elif defined(_WIN32) || defined(WIN32) 
-#define SYSTEM_TYPE	"Win32" 
-#else
-#define SYSTEM_TYPE	"Windows"
-#endif
-
-#if defined(_M_IA64) 
-#define MACHINE_TYPE	"ia64" 
-#elif defined(_M_IX86) 
-#define MACHINE_TYPE	"ia32" 
-#elif defined(_M_ALPHA) 
-#define MACHINE_TYPE	"axp" 
-#else
-#define MACHINE_TYPE	"unknown"	/* Define to machine type name */
-#endif 
- 
-#if !(defined(_WIN64) || defined(WIN64)) 
-#ifndef _WIN32
-#define _WIN32				/* Compatible with old source */
-#endif
-#ifndef __WIN32__
-#define __WIN32__
-#endif
-#endif /* _WIN64 */
-#ifndef __WIN__
-#define __WIN__			      /* To make it easier in VC++ */
-#endif
-
-#ifndef MAX_INDEXES
-#define MAX_INDEXES 64
-#endif
-
-/* File and lock constants */
-#define O_SHARE		0x1000		/* Open file in sharing mode */
-#ifdef __BORLANDC__
-#define F_RDLCK		LK_NBLCK	/* read lock */
-#define F_WRLCK		LK_NBRLCK	/* write lock */
-#define F_UNLCK		LK_UNLCK	/* remove lock(s) */
-#else
-#define F_RDLCK		_LK_NBLCK	/* read lock */
-#define F_WRLCK		_LK_NBRLCK	/* write lock */
-#define F_UNLCK		_LK_UNLCK	/* remove lock(s) */
-#endif
-
-#define F_EXCLUSIVE	1		/* We have only exclusive locking */
-#define F_TO_EOF	(INT_MAX32/2)	/* size for lock of all file */
-#define F_OK		0		/* parameter to access() */
-#define W_OK		2
-
-#define S_IROTH		S_IREAD		/* for my_lib */
-
-#ifdef __BORLANDC__
-#define FILE_BINARY	O_BINARY	/* my_fopen in binary mode */
-#define O_TEMPORARY	0
-#define O_SHORT_LIVED	0
-#define SH_DENYNO	_SH_DENYNO
-#else
-#define O_BINARY	_O_BINARY	/* compability with older style names */
-#define FILE_BINARY	_O_BINARY	/* my_fopen in binary mode */
-#define O_TEMPORARY	_O_TEMPORARY
-#define O_SHORT_LIVED	_O_SHORT_LIVED
-#define SH_DENYNO	_SH_DENYNO
-#endif
-#define NO_OPEN_3			/* For my_create() */
-
-#define SIGQUIT		SIGTERM		/* No SIGQUIT */
-
-#undef _REENTRANT			/* Crashes something for win32 */
-#undef SAFE_MUTEX			/* Can't be used on windows */
-
-#if defined(_MSC_VER) && _MSC_VER >= 1310
-#define LL(A)           A##ll
-#define ULL(A)          A##ull
-#else
-#define LL(A)           ((__int64) A)
-#define ULL(A)          ((unsigned __int64) A)
-#endif
-
-#define LONGLONG_MIN	LL(0x8000000000000000)
-#define LONGLONG_MAX	LL(0x7FFFFFFFFFFFFFFF)
-#define ULONGLONG_MAX	ULL(0xFFFFFFFFFFFFFFFF)
-
-/* Type information */
-
-#if !defined(HAVE_UINT)
-#undef HAVE_UINT
-#define HAVE_UINT
-typedef unsigned short	ushort;
-typedef unsigned int	uint;
-#endif /* !defined(HAVE_UINT) */
-
-typedef unsigned __int64 ulonglong;	/* Microsofts 64 bit types */
-typedef __int64 longlong;
-#ifndef HAVE_SIGSET_T
-typedef int sigset_t;
-#endif
-#define longlong_defined
-/*
-  off_t should not be __int64 because of conflicts in header files;
-  Use my_off_t or os_off_t instead
-*/
-#ifndef HAVE_OFF_T
-typedef long off_t;
-#endif
-typedef __int64 os_off_t;
-#ifdef _WIN64
-typedef UINT_PTR rf_SetTimer;
-#else
-#ifndef HAVE_SIZE_T
-typedef unsigned int size_t;
-#endif
-typedef uint rf_SetTimer;
-#endif
-
-#define Socket_defined
-#define my_socket SOCKET
-#define SIGPIPE SIGINT
-#define RETQSORTTYPE void
-#define QSORT_TYPE_IS_VOID
-#define RETSIGTYPE void
-#define SOCKET_SIZE_TYPE int
-#define my_socket_defined
-#define byte_defined
-#define HUGE_PTR
-#define STDCALL __stdcall	    /* Used by libmysql.dll */
-#define isnan(X) _isnan(X)
-#define finite(X) _finite(X)
-
-#ifndef MYSQL_CLIENT_NO_THREADS
-#define THREAD
-#endif
-#define VOID_SIGHANDLER
-#define SIZEOF_CHAR		1
-#define SIZEOF_INT		4
-#define SIZEOF_LONG		4
-#define SIZEOF_LONG_LONG	8
-#define SIZEOF_OFF_T		8
-#ifdef _WIN64
-#define SIZEOF_CHARP		8
-#else
-#define SIZEOF_CHARP		4
-#endif
-#define HAVE_BROKEN_NETINET_INCLUDES
-#ifdef __NT__
-#define HAVE_NAMED_PIPE			/* We can only create pipes on NT */
-#endif
-
-/* ERROR is defined in wingdi.h */
-#undef ERROR
-
-/* We need to close files to break connections on shutdown */
-#ifndef SIGNAL_WITH_VIO_CLOSE
-#define SIGNAL_WITH_VIO_CLOSE
-#endif
-
-/* All windows servers should support .sym files */
-#undef USE_SYMDIR
-#define USE_SYMDIR
-
-/* If LOAD DATA LOCAL INFILE should be enabled by default */
-#define ENABLED_LOCAL_INFILE 1
-
-/* If query profiling should be enabled by default */
-#define ENABLED_PROFILING 1
-
-/* Convert some simple functions to Posix */
-
-#define my_sigset(A,B) signal((A),(B))
-#define finite(A) _finite(A)
-#define sleep(A)  Sleep((A)*1000)
-#define popen(A,B) _popen((A),(B))
-#define pclose(A) _pclose(A)
-
-#ifndef __BORLANDC__
-#define access(A,B) _access(A,B)
-#endif
-
-#if !defined(__cplusplus)
-#define inline __inline
-#endif /* __cplusplus */
-
-#ifdef _WIN64
-#define ulonglong2double(A) ((double) (ulonglong) (A))
-#define my_off_t2double(A)  ((double) (my_off_t) (A))
-
-#else
-inline double ulonglong2double(ulonglong value)
-{
-  longlong nr=(longlong) value;
-  if (nr >= 0)
-    return (double) nr;
-  return (18446744073709551616.0 + (double) nr);
-}
-#define my_off_t2double(A) ulonglong2double(A)
-#endif /* _WIN64 */
-
-inline ulonglong double2ulonglong(double d)
-{
-  double t= d - (double) 0x8000000000000000ULL;
-
-  if (t >= 0)
-    return  ((ulonglong) t) + 0x8000000000000000ULL;
-  return (ulonglong) d;
-}
-
-#if SIZEOF_OFF_T > 4
-#define lseek(A,B,C) _lseeki64((A),(longlong) (B),(C))
-#define tell(A) _telli64(A)
-#endif
-
-#define STACK_DIRECTION -1
-
-/* Difference between GetSystemTimeAsFileTime() and now() */
-#define OFFSET_TO_EPOCH ULL(116444736000000000)
-
-#define HAVE_PERROR
-#define HAVE_VFPRINT
-#define HAVE_RENAME		/* Have rename() as function */
-#define HAVE_BINARY_STREAMS	/* Have "b" flag in streams */
-#define HAVE_LONG_JMP		/* Have long jump function */
-#define HAVE_LOCKING		/* have locking() call */
-#define HAVE_ERRNO_AS_DEFINE	/* errno is a define */
-#define HAVE_STDLIB		/* everything is include in this file */
-#define HAVE_MEMCPY
-#define HAVE_MEMMOVE
-#define HAVE_GETCWD
-#define HAVE_TELL
-#define HAVE_TZNAME
-#define HAVE_PUTENV
-#define HAVE_SELECT
-#define HAVE_SETLOCALE
-#define HAVE_SOCKET		/* Giangi */
-#define HAVE_FLOAT_H
-#define HAVE_LIMITS_H
-#define HAVE_STDDEF_H
-#define NO_FCNTL_NONBLOCK	/* No FCNTL */
-#define HAVE_ALLOCA
-#define HAVE_STRPBRK
-#define HAVE_STRSTR
-#define HAVE_COMPRESS
-#define HAVE_CREATESEMAPHORE
-#define HAVE_ISNAN
-#define HAVE_FINITE
-#define HAVE_QUERY_CACHE
-#define SPRINTF_RETURNS_INT
-#define HAVE_SETFILEPOINTER
-#define HAVE_VIO_READ_BUFF
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-/* strnlen() appeared in Studio 2005 */
-#define HAVE_STRNLEN
-#endif
-#define HAVE_WINSOCK2
-
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-
-#ifndef __NT__
-#undef FILE_SHARE_DELETE
-#define FILE_SHARE_DELETE 0     /* Not implemented on Win 98/ME */
-#endif
-
-#ifdef NOT_USED
-#define HAVE_SNPRINTF		/* Gave link error */
-#define _snprintf snprintf
-#endif
-
-#ifdef _MSC_VER
-#define HAVE_LDIV		/* The optimizer breaks in zortech for ldiv */
-#define HAVE_ANSI_INCLUDE
-#define HAVE_SYS_UTIME_H
-#define HAVE_STRTOUL
-#endif
-#define my_reinterpret_cast(A) reinterpret_cast <A>
-#define my_const_cast(A) const_cast<A>
-
-
-/* MYSQL OPTIONS */
-
-#ifdef _CUSTOMCONFIG_
-#include <custom_conf.h>
-#else
-#ifndef CMAKE_CONFIGD
-#define DEFAULT_MYSQL_HOME	"c:\\mysql"
-#define MYSQL_DATADIR          "c:\\mysql\\data"
-#define PACKAGE			"mysql"
-#define DEFAULT_BASEDIR		"C:\\"
-#define SHAREDIR		"share"
-#define DEFAULT_CHARSET_HOME	"C:/mysql/"
-#endif
-#endif
-#ifndef DEFAULT_HOME_ENV
-#define DEFAULT_HOME_ENV MYSQL_HOME
-#endif
-#ifndef DEFAULT_GROUP_SUFFIX_ENV
-#define DEFAULT_GROUP_SUFFIX_ENV MYSQL_GROUP_SUFFIX
-#endif
-
-/* File name handling */
-
-#define FN_LIBCHAR	'\\'
-#define FN_ROOTDIR	"\\"
-#define FN_DEVCHAR	':'
-#define FN_NETWORK_DRIVES	/* Uses \\ to indicate network drives */
-#define FN_NO_CASE_SENCE	/* Files are not case-sensitive */
-#define OS_FILE_LIMIT	2048
-
-#define DO_NOT_REMOVE_THREAD_WRAPPERS
-#define thread_safe_increment(V,L) InterlockedIncrement((long*) &(V))
-#define thread_safe_decrement(V,L) InterlockedDecrement((long*) &(V))
-/* The following is only used for statistics, so it should be good enough */
-#ifdef __NT__  /* This should also work on Win98 but .. */
-#define thread_safe_add(V,C,L) InterlockedExchangeAdd((long*) &(V),(C))
-#define thread_safe_sub(V,C,L) InterlockedExchangeAdd((long*) &(V),-(long) (C))
-#endif
-
-#define shared_memory_buffer_length 16000
-#define default_shared_memory_base_name "MYSQL"
-
-#define HAVE_SPATIAL 1
-#define HAVE_RTREE_KEYS 1
-
-#define HAVE_OPENSSL 1
-#define HAVE_YASSL 1
-
-#define COMMUNITY_SERVER 1
-#define ENABLED_PROFILING 1
-
-/*
-  Our Windows binaries include all character sets which MySQL supports.
-  Any changes to the available character sets must also go into
-  config/ac-macros/character_sets.m4
-*/
-
-#define MYSQL_DEFAULT_CHARSET_NAME "latin1"
-#define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"
-
-#define USE_MB 1
-#define USE_MB_IDENT 1
-#define USE_STRCOLL 1
-
-#define HAVE_CHARSET_armscii8
-#define HAVE_CHARSET_ascii
-#define HAVE_CHARSET_big5 1
-#define HAVE_CHARSET_cp1250 1
-#define HAVE_CHARSET_cp1251
-#define HAVE_CHARSET_cp1256
-#define HAVE_CHARSET_cp1257
-#define HAVE_CHARSET_cp850
-#define HAVE_CHARSET_cp852
-#define HAVE_CHARSET_cp866
-#define HAVE_CHARSET_cp932 1
-#define HAVE_CHARSET_dec8
-#define HAVE_CHARSET_eucjpms 1
-#define HAVE_CHARSET_euckr 1
-#define HAVE_CHARSET_gb2312 1
-#define HAVE_CHARSET_gbk 1
-#define HAVE_CHARSET_geostd8
-#define HAVE_CHARSET_greek
-#define HAVE_CHARSET_hebrew
-#define HAVE_CHARSET_hp8
-#define HAVE_CHARSET_keybcs2
-#define HAVE_CHARSET_koi8r
-#define HAVE_CHARSET_koi8u
-#define HAVE_CHARSET_latin1 1
-#define HAVE_CHARSET_latin2 1
-#define HAVE_CHARSET_latin5
-#define HAVE_CHARSET_latin7
-#define HAVE_CHARSET_macce
-#define HAVE_CHARSET_macroman
-#define HAVE_CHARSET_sjis 1
-#define HAVE_CHARSET_swe7
-#define HAVE_CHARSET_tis620 1
-#define HAVE_CHARSET_ucs2 1
-#define HAVE_CHARSET_ujis 1
-#define HAVE_CHARSET_utf8 1
-
-#define HAVE_UCA_COLLATIONS 1
-#define HAVE_BOOL 1
diff --git a/dep/include/mysql/decimal.h b/dep/include/mysql/decimal.h
deleted file mode 100644
index 530ed9e17..000000000
--- a/dep/include/mysql/decimal.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef _decimal_h
-#define _decimal_h
-
-typedef enum
-{TRUNCATE=0, HALF_EVEN, HALF_UP, CEILING, FLOOR}
-  decimal_round_mode;
-typedef int32 decimal_digit_t;
-
-typedef struct st_decimal_t {
-  int    intg, frac, len;
-  my_bool sign;
-  decimal_digit_t *buf;
-} decimal_t;
-
-int internal_str2dec(const char *from, decimal_t *to, char **end,
-                     my_bool fixed);
-int decimal2string(decimal_t *from, char *to, int *to_len,
-                   int fixed_precision, int fixed_decimals,
-                   char filler);
-int decimal2ulonglong(decimal_t *from, ulonglong *to);
-int ulonglong2decimal(ulonglong from, decimal_t *to);
-int decimal2longlong(decimal_t *from, longlong *to);
-int longlong2decimal(longlong from, decimal_t *to);
-int decimal2double(decimal_t *from, double *to);
-int double2decimal(double from, decimal_t *to);
-int decimal_actual_fraction(decimal_t *from);
-int decimal2bin(decimal_t *from, uchar *to, int precision, int scale);
-int bin2decimal(const uchar *from, decimal_t *to, int precision, int scale);
-
-int decimal_size(int precision, int scale);
-int decimal_bin_size(int precision, int scale);
-int decimal_result_size(decimal_t *from1, decimal_t *from2, char op,
-                        int param);
-
-int decimal_intg(decimal_t *from);
-int decimal_add(decimal_t *from1, decimal_t *from2, decimal_t *to);
-int decimal_sub(decimal_t *from1, decimal_t *from2, decimal_t *to);
-int decimal_cmp(decimal_t *from1, decimal_t *from2);
-int decimal_mul(decimal_t *from1, decimal_t *from2, decimal_t *to);
-int decimal_div(decimal_t *from1, decimal_t *from2, decimal_t *to,
-                int scale_incr);
-int decimal_mod(decimal_t *from1, decimal_t *from2, decimal_t *to);
-int decimal_round(decimal_t *from, decimal_t *to, int new_scale,
-                  decimal_round_mode mode);
-int decimal_is_zero(decimal_t *from);
-void max_decimal(int precision, int frac, decimal_t *to);
-
-#define string2decimal(A,B,C) internal_str2dec((A), (B), (C), 0)
-#define string2decimal_fixed(A,B,C) internal_str2dec((A), (B), (C), 1)
-
-/* set a decimal_t to zero */
-
-#define decimal_make_zero(dec)        do {                \
-                                        (dec)->buf[0]=0;    \
-                                        (dec)->intg=1;      \
-                                        (dec)->frac=0;      \
-                                        (dec)->sign=0;      \
-                                      } while(0)
-
-/*
-  returns the length of the buffer to hold string representation
-  of the decimal (including decimal dot, possible sign and \0)
-*/
-
-#define decimal_string_size(dec) (((dec)->intg ? (dec)->intg : 1) + \
-				  (dec)->frac + ((dec)->frac > 0) + 2)
-
-/* negate a decimal */
-#define decimal_neg(dec) do { (dec)->sign^=1; } while(0)
-
-/*
-  conventions:
-
-    decimal_smth() == 0     -- everything's ok
-    decimal_smth() <= 1     -- result is usable, but precision loss is possible
-    decimal_smth() <= 2     -- result can be unusable, most significant digits
-                               could've been lost
-    decimal_smth() >  2     -- no result was generated
-*/
-
-#define E_DEC_OK                0
-#define E_DEC_TRUNCATED         1
-#define E_DEC_OVERFLOW          2
-#define E_DEC_DIV_ZERO          4
-#define E_DEC_BAD_NUM           8
-#define E_DEC_OOM              16
-
-#define E_DEC_ERROR            31
-#define E_DEC_FATAL_ERROR      30
-
-#endif
-
diff --git a/dep/include/mysql/errmsg.h b/dep/include/mysql/errmsg.h
deleted file mode 100644
index a6d8c770d..000000000
--- a/dep/include/mysql/errmsg.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* Error messages for MySQL clients */
-/* (Error messages for the daemon are in sql/share/errmsg.txt) */
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-void	init_client_errs(void);
-void	finish_client_errs(void);
-extern const char *client_errors[];	/* Error messages */
-#ifdef	__cplusplus
-}
-#endif
-
-#define CR_MIN_ERROR		2000	/* For easier client code */
-#define CR_MAX_ERROR		2999
-#if !defined(ER)
-#define ER(X) client_errors[(X)-CR_MIN_ERROR]
-#endif
-#define CLIENT_ERRMAP		2	/* Errormap used by my_error() */
-
-/* Do not add error numbers before CR_ERROR_FIRST. */
-/* If necessary to add lower numbers, change CR_ERROR_FIRST accordingly. */
-#define CR_ERROR_FIRST  	2000 /*Copy first error nr.*/
-#define CR_UNKNOWN_ERROR	2000
-#define CR_SOCKET_CREATE_ERROR	2001
-#define CR_CONNECTION_ERROR	2002
-#define CR_CONN_HOST_ERROR	2003
-#define CR_IPSOCK_ERROR		2004
-#define CR_UNKNOWN_HOST		2005
-#define CR_SERVER_GONE_ERROR	2006
-#define CR_VERSION_ERROR	2007
-#define CR_OUT_OF_MEMORY	2008
-#define CR_WRONG_HOST_INFO	2009
-#define CR_LOCALHOST_CONNECTION 2010
-#define CR_TCP_CONNECTION	2011
-#define CR_SERVER_HANDSHAKE_ERR 2012
-#define CR_SERVER_LOST		2013
-#define CR_COMMANDS_OUT_OF_SYNC 2014
-#define CR_NAMEDPIPE_CONNECTION 2015
-#define CR_NAMEDPIPEWAIT_ERROR  2016
-#define CR_NAMEDPIPEOPEN_ERROR  2017
-#define CR_NAMEDPIPESETSTATE_ERROR 2018
-#define CR_CANT_READ_CHARSET	2019
-#define CR_NET_PACKET_TOO_LARGE 2020
-#define CR_EMBEDDED_CONNECTION	2021
-#define CR_PROBE_SLAVE_STATUS   2022
-#define CR_PROBE_SLAVE_HOSTS    2023
-#define CR_PROBE_SLAVE_CONNECT  2024
-#define CR_PROBE_MASTER_CONNECT 2025
-#define CR_SSL_CONNECTION_ERROR 2026
-#define CR_MALFORMED_PACKET     2027
-#define CR_WRONG_LICENSE	2028
-
-/* new 4.1 error codes */
-#define CR_NULL_POINTER		2029
-#define CR_NO_PREPARE_STMT	2030
-#define CR_PARAMS_NOT_BOUND	2031
-#define CR_DATA_TRUNCATED	2032
-#define CR_NO_PARAMETERS_EXISTS 2033
-#define CR_INVALID_PARAMETER_NO 2034
-#define CR_INVALID_BUFFER_USE	2035
-#define CR_UNSUPPORTED_PARAM_TYPE 2036
-
-#define CR_SHARED_MEMORY_CONNECTION             2037
-#define CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR  2038
-#define CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR   2039
-#define CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR 2040
-#define CR_SHARED_MEMORY_CONNECT_MAP_ERROR      2041
-#define CR_SHARED_MEMORY_FILE_MAP_ERROR         2042
-#define CR_SHARED_MEMORY_MAP_ERROR              2043
-#define CR_SHARED_MEMORY_EVENT_ERROR     	2044
-#define CR_SHARED_MEMORY_CONNECT_ABANDONED_ERROR 2045
-#define CR_SHARED_MEMORY_CONNECT_SET_ERROR      2046
-#define CR_CONN_UNKNOW_PROTOCOL 		2047
-#define CR_INVALID_CONN_HANDLE			2048
-#define CR_SECURE_AUTH                          2049
-#define CR_FETCH_CANCELED                       2050
-#define CR_NO_DATA                              2051
-#define CR_NO_STMT_METADATA                     2052
-#define CR_NO_RESULT_SET                        2053
-#define CR_NOT_IMPLEMENTED                      2054
-#define CR_SERVER_LOST_EXTENDED			2055
-#define CR_STMT_CLOSED				2056
-#define CR_NEW_STMT_METADATA                    2057
-#define CR_ERROR_LAST  /*Copy last error nr:*/  2057
-/* Add error numbers before CR_ERROR_LAST and change it accordingly. */
-
diff --git a/dep/include/mysql/keycache.h b/dep/include/mysql/keycache.h
deleted file mode 100644
index a6005bae8..000000000
--- a/dep/include/mysql/keycache.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* Key cache variable structures */
-
-#ifndef _keycache_h
-#define _keycache_h
-C_MODE_START
-
-/* declare structures that is used by st_key_cache */
-
-struct st_block_link;
-typedef struct st_block_link BLOCK_LINK;
-struct st_keycache_page;
-typedef struct st_keycache_page KEYCACHE_PAGE;
-struct st_hash_link;
-typedef struct st_hash_link HASH_LINK;
-
-/* info about requests in a waiting queue */
-typedef struct st_keycache_wqueue
-{
-  struct st_my_thread_var *last_thread;  /* circular list of waiting threads */
-} KEYCACHE_WQUEUE;
-
-#define CHANGED_BLOCKS_HASH 128             /* must be power of 2 */
-
-/*
-  The key cache structure
-  It also contains read-only statistics parameters.
-*/   
-
-typedef struct st_key_cache
-{
-  my_bool key_cache_inited;
-  my_bool in_resize;             /* true during resize operation             */
-  my_bool resize_in_flush;       /* true during flush of resize operation    */
-  my_bool can_be_used;           /* usage of cache for read/write is allowed */
-  size_t key_cache_mem_size;      /* specified size of the cache memory       */
-  uint key_cache_block_size;     /* size of the page buffer of a cache block */
-  ulong min_warm_blocks;         /* min number of warm blocks;               */
-  ulong age_threshold;           /* age threshold for hot blocks             */
-  ulonglong keycache_time;       /* total number of block link operations    */
-  uint hash_entries;             /* max number of entries in the hash table  */
-  int hash_links;                /* max number of hash links                 */
-  int hash_links_used;           /* number of hash links currently used      */
-  int disk_blocks;               /* max number of blocks in the cache        */
-  ulong blocks_used; /* maximum number of concurrently used blocks */
-  ulong blocks_unused; /* number of currently unused blocks */
-  ulong blocks_changed;          /* number of currently dirty blocks         */
-  ulong warm_blocks;             /* number of blocks in warm sub-chain       */
-  ulong cnt_for_resize_op;       /* counter to block resize operation        */
-  long blocks_available;      /* number of blocks available in the LRU chain */
-  HASH_LINK **hash_root;         /* arr. of entries into hash table buckets  */
-  HASH_LINK *hash_link_root;     /* memory for hash table links              */
-  HASH_LINK *free_hash_list;     /* list of free hash links                  */
-  BLOCK_LINK *free_block_list;   /* list of free blocks */
-  BLOCK_LINK *block_root;        /* memory for block links                   */
-  uchar HUGE_PTR *block_mem;     /* memory for block buffers                 */
-  BLOCK_LINK *used_last;         /* ptr to the last block of the LRU chain   */
-  BLOCK_LINK *used_ins;          /* ptr to the insertion block in LRU chain  */
-  pthread_mutex_t cache_lock;    /* to lock access to the cache structure    */
-  KEYCACHE_WQUEUE resize_queue;  /* threads waiting during resize operation  */
-  /*
-    Waiting for a zero resize count. Using a queue for symmetry though
-    only one thread can wait here.
-  */
-  KEYCACHE_WQUEUE waiting_for_resize_cnt;
-  KEYCACHE_WQUEUE waiting_for_hash_link; /* waiting for a free hash link     */
-  KEYCACHE_WQUEUE waiting_for_block;    /* requests waiting for a free block */
-  BLOCK_LINK *changed_blocks[CHANGED_BLOCKS_HASH]; /* hash for dirty file bl.*/
-  BLOCK_LINK *file_blocks[CHANGED_BLOCKS_HASH];    /* hash for other file bl.*/
-
-  /*
-    The following variables are and variables used to hold parameters for
-    initializing the key cache.
-  */
-
-  ulonglong param_buff_size;    /* size the memory allocated for the cache  */
-  ulong param_block_size;       /* size of the blocks in the key cache      */
-  ulong param_division_limit;   /* min. percentage of warm blocks           */
-  ulong param_age_threshold;    /* determines when hot block is downgraded  */
-
-  /* Statistics variables. These are reset in reset_key_cache_counters(). */
-  ulong global_blocks_changed;	/* number of currently dirty blocks         */
-  ulonglong global_cache_w_requests;/* number of write requests (write hits) */
-  ulonglong global_cache_write;     /* number of writes from cache to files  */
-  ulonglong global_cache_r_requests;/* number of read requests (read hits)   */
-  ulonglong global_cache_read;      /* number of reads from files to cache   */
-
-  int blocks;                   /* max number of blocks in the cache        */
-  my_bool in_init;		/* Set to 1 in MySQL during init/resize     */
-} KEY_CACHE;
-
-/* The default key cache */
-extern KEY_CACHE dflt_key_cache_var, *dflt_key_cache;
-
-extern int init_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
-			  size_t use_mem, uint division_limit,
-			  uint age_threshold);
-extern int resize_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
-			    size_t use_mem, uint division_limit,
-			    uint age_threshold);
-extern void change_key_cache_param(KEY_CACHE *keycache, uint division_limit,
-				   uint age_threshold);
-extern uchar *key_cache_read(KEY_CACHE *keycache,
-                            File file, my_off_t filepos, int level,
-                            uchar *buff, uint length,
-			    uint block_length,int return_buffer);
-extern int key_cache_insert(KEY_CACHE *keycache,
-                            File file, my_off_t filepos, int level,
-                            uchar *buff, uint length);
-extern int key_cache_write(KEY_CACHE *keycache,
-                           File file, my_off_t filepos, int level,
-                           uchar *buff, uint length,
-			   uint block_length,int force_write);
-extern int flush_key_blocks(KEY_CACHE *keycache,
-                            int file, enum flush_type type);
-extern void end_key_cache(KEY_CACHE *keycache, my_bool cleanup);
-
-/* Functions to handle multiple key caches */
-extern my_bool multi_keycache_init(void);
-extern void multi_keycache_free(void);
-extern KEY_CACHE *multi_key_cache_search(uchar *key, uint length);
-extern my_bool multi_key_cache_set(const uchar *key, uint length,
-				   KEY_CACHE *key_cache);
-extern void multi_key_cache_change(KEY_CACHE *old_data,
-				   KEY_CACHE *new_data);
-extern int reset_key_cache_counters(const char *name,
-                                    KEY_CACHE *key_cache);
-C_MODE_END
-#endif /* _keycache_h */
diff --git a/dep/include/mysql/m_ctype.h b/dep/include/mysql/m_ctype.h
deleted file mode 100644
index 451c8db54..000000000
--- a/dep/include/mysql/m_ctype.h
+++ /dev/null
@@ -1,549 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/*
-  A better inplementation of the UNIX ctype(3) library.
-  Notes:   my_global.h should be included before ctype.h
-*/
-
-#ifndef _m_ctype_h
-#define _m_ctype_h
-
-#include <my_attribute.h>
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#define MY_CS_NAME_SIZE			32
-#define MY_CS_CTYPE_TABLE_SIZE		257
-#define MY_CS_TO_LOWER_TABLE_SIZE	256
-#define MY_CS_TO_UPPER_TABLE_SIZE	256
-#define MY_CS_SORT_ORDER_TABLE_SIZE	256
-#define MY_CS_TO_UNI_TABLE_SIZE		256
-
-#define CHARSET_DIR	"charsets/"
-
-#define my_wc_t ulong
-
-typedef struct unicase_info_st
-{
-  uint16 toupper;
-  uint16 tolower;
-  uint16 sort;
-} MY_UNICASE_INFO;
-
-
-extern MY_UNICASE_INFO *my_unicase_default[256];
-extern MY_UNICASE_INFO *my_unicase_turkish[256];
-
-typedef struct uni_ctype_st
-{
-  uchar  pctype;
-  uchar  *ctype;
-} MY_UNI_CTYPE;
-
-extern MY_UNI_CTYPE my_uni_ctype[256];
-
-/* wm_wc and wc_mb return codes */
-#define MY_CS_ILSEQ	0     /* Wrong by sequence: wb_wc                   */
-#define MY_CS_ILUNI	0     /* Cannot encode Unicode to charset: wc_mb    */
-#define MY_CS_TOOSMALL  -101  /* Need at least one byte:    wc_mb and mb_wc */
-#define MY_CS_TOOSMALL2 -102  /* Need at least two bytes:   wc_mb and mb_wc */
-#define MY_CS_TOOSMALL3 -103  /* Need at least three bytes: wc_mb and mb_wc */
-/* These following three are currently not really used */
-#define MY_CS_TOOSMALL4 -104  /* Need at least 4 bytes: wc_mb and mb_wc */
-#define MY_CS_TOOSMALL5 -105  /* Need at least 5 bytes: wc_mb and mb_wc */
-#define MY_CS_TOOSMALL6 -106  /* Need at least 6 bytes: wc_mb and mb_wc */
-/* A helper macros for "need at least n bytes" */
-#define MY_CS_TOOSMALLN(n)    (-100-(n))
-
-#define MY_SEQ_INTTAIL	1
-#define MY_SEQ_SPACES	2
-
-        /* My charsets_list flags */
-#define MY_CS_COMPILED  1      /* compiled-in sets               */
-#define MY_CS_CONFIG    2      /* sets that have a *.conf file   */
-#define MY_CS_INDEX     4      /* sets listed in the Index file  */
-#define MY_CS_LOADED    8      /* sets that are currently loaded */
-#define MY_CS_BINSORT	16     /* if binary sort order           */
-#define MY_CS_PRIMARY	32     /* if primary collation           */
-#define MY_CS_STRNXFRM	64     /* if strnxfrm is used for sort   */
-#define MY_CS_UNICODE	128    /* is a charset is full unicode   */
-#define MY_CS_READY	256    /* if a charset is initialized    */
-#define MY_CS_AVAILABLE	512    /* If either compiled-in or loaded*/
-#define MY_CS_CSSORT	1024   /* if case sensitive sort order   */	
-#define MY_CS_HIDDEN	2048   /* don't display in SHOW          */	
-#define MY_CS_PUREASCII 4096   /* if a charset is pure ascii     */
-#define MY_CHARSET_UNDEFINED 0
-
-/* Character repertoire flags */
-#define MY_REPERTOIRE_ASCII      1 /* Pure ASCII            U+0000..U+007F */
-#define MY_REPERTOIRE_EXTENDED   2 /* Extended characters:  U+0080..U+FFFF */
-#define MY_REPERTOIRE_UNICODE30  3 /* ASCII | EXTENDED:     U+0000..U+FFFF */
-
-
-typedef struct my_uni_idx_st
-{
-  uint16 from;
-  uint16 to;
-  uchar  *tab;
-} MY_UNI_IDX;
-
-typedef struct
-{
-  uint beg;
-  uint end;
-  uint mb_len;
-} my_match_t;
-
-enum my_lex_states
-{
-  MY_LEX_START, MY_LEX_CHAR, MY_LEX_IDENT, 
-  MY_LEX_IDENT_SEP, MY_LEX_IDENT_START,
-  MY_LEX_REAL, MY_LEX_HEX_NUMBER, MY_LEX_BIN_NUMBER,
-  MY_LEX_CMP_OP, MY_LEX_LONG_CMP_OP, MY_LEX_STRING, MY_LEX_COMMENT, MY_LEX_END,
-  MY_LEX_OPERATOR_OR_IDENT, MY_LEX_NUMBER_IDENT, MY_LEX_INT_OR_REAL,
-  MY_LEX_REAL_OR_POINT, MY_LEX_BOOL, MY_LEX_EOL, MY_LEX_ESCAPE, 
-  MY_LEX_LONG_COMMENT, MY_LEX_END_LONG_COMMENT, MY_LEX_SEMICOLON, 
-  MY_LEX_SET_VAR, MY_LEX_USER_END, MY_LEX_HOSTNAME, MY_LEX_SKIP, 
-  MY_LEX_USER_VARIABLE_DELIMITER, MY_LEX_SYSTEM_VAR,
-  MY_LEX_IDENT_OR_KEYWORD,
-  MY_LEX_IDENT_OR_HEX, MY_LEX_IDENT_OR_BIN, MY_LEX_IDENT_OR_NCHAR,
-  MY_LEX_STRING_OR_DELIMITER
-};
-
-struct charset_info_st;
-
-
-/* See strings/CHARSET_INFO.txt for information about this structure  */
-typedef struct my_collation_handler_st
-{
-  my_bool (*init)(struct charset_info_st *, void *(*alloc)(size_t));
-  /* Collation routines */
-  int     (*strnncoll)(struct charset_info_st *,
-		       const uchar *, size_t, const uchar *, size_t, my_bool);
-  int     (*strnncollsp)(struct charset_info_st *,
-                         const uchar *, size_t, const uchar *, size_t,
-                         my_bool diff_if_only_endspace_difference);
-  size_t     (*strnxfrm)(struct charset_info_st *,
-                         uchar *, size_t, const uchar *, size_t);
-  size_t    (*strnxfrmlen)(struct charset_info_st *, size_t); 
-  my_bool (*like_range)(struct charset_info_st *,
-			const char *s, size_t s_length,
-			pchar w_prefix, pchar w_one, pchar w_many, 
-			size_t res_length,
-			char *min_str, char *max_str,
-			size_t *min_len, size_t *max_len);
-  int     (*wildcmp)(struct charset_info_st *,
-  		     const char *str,const char *str_end,
-                     const char *wildstr,const char *wildend,
-                     int escape,int w_one, int w_many);
-
-  int  (*strcasecmp)(struct charset_info_st *, const char *, const char *);
-  
-  uint (*instr)(struct charset_info_st *,
-                const char *b, size_t b_length,
-                const char *s, size_t s_length,
-                my_match_t *match, uint nmatch);
-  
-  /* Hash calculation */
-  void (*hash_sort)(struct charset_info_st *cs, const uchar *key, size_t len,
-		    ulong *nr1, ulong *nr2); 
-  my_bool (*propagate)(struct charset_info_st *cs, const uchar *str, size_t len);
-} MY_COLLATION_HANDLER;
-
-extern MY_COLLATION_HANDLER my_collation_mb_bin_handler;
-extern MY_COLLATION_HANDLER my_collation_8bit_bin_handler;
-extern MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler;
-extern MY_COLLATION_HANDLER my_collation_ucs2_uca_handler;
-
-/* Some typedef to make it easy for C++ to make function pointers */
-typedef int (*my_charset_conv_mb_wc)(struct charset_info_st *, my_wc_t *,
-                                     const uchar *, const uchar *);
-typedef int (*my_charset_conv_wc_mb)(struct charset_info_st *, my_wc_t,
-                                     uchar *, uchar *);
-typedef size_t (*my_charset_conv_case)(struct charset_info_st *,
-                                       char *, size_t, char *, size_t);
-
-
-/* See strings/CHARSET_INFO.txt about information on this structure  */
-typedef struct my_charset_handler_st
-{
-  my_bool (*init)(struct charset_info_st *, void *(*alloc)(size_t));
-  /* Multibyte routines */
-  uint    (*ismbchar)(struct charset_info_st *, const char *, const char *);
-  uint    (*mbcharlen)(struct charset_info_st *, uint c);
-  size_t  (*numchars)(struct charset_info_st *, const char *b, const char *e);
-  size_t  (*charpos)(struct charset_info_st *, const char *b, const char *e,
-                     size_t pos);
-  size_t  (*well_formed_len)(struct charset_info_st *,
-                             const char *b,const char *e,
-                             size_t nchars, int *error);
-  size_t  (*lengthsp)(struct charset_info_st *, const char *ptr, size_t length);
-  size_t  (*numcells)(struct charset_info_st *, const char *b, const char *e);
-  
-  /* Unicode conversion */
-  my_charset_conv_mb_wc mb_wc;
-  my_charset_conv_wc_mb wc_mb;
-
-  /* CTYPE scanner */
-  int (*ctype)(struct charset_info_st *cs, int *ctype,
-               const uchar *s, const uchar *e);
-  
-  /* Functions for case and sort conversion */
-  size_t  (*caseup_str)(struct charset_info_st *, char *);
-  size_t  (*casedn_str)(struct charset_info_st *, char *);
-
-  my_charset_conv_case caseup;
-  my_charset_conv_case casedn;
-
-  /* Charset dependant snprintf() */
-  size_t (*snprintf)(struct charset_info_st *, char *to, size_t n,
-                     const char *fmt,
-                     ...) ATTRIBUTE_FORMAT_FPTR(printf, 4, 5);
-  size_t (*long10_to_str)(struct charset_info_st *, char *to, size_t n,
-                          int radix, long int val);
-  size_t (*longlong10_to_str)(struct charset_info_st *, char *to, size_t n,
-                              int radix, longlong val);
-  
-  void (*fill)(struct charset_info_st *, char *to, size_t len, int fill);
-  
-  /* String-to-number conversion routines */
-  long        (*strntol)(struct charset_info_st *, const char *s, size_t l,
-			 int base, char **e, int *err);
-  ulong      (*strntoul)(struct charset_info_st *, const char *s, size_t l,
-			 int base, char **e, int *err);
-  longlong   (*strntoll)(struct charset_info_st *, const char *s, size_t l,
-			 int base, char **e, int *err);
-  ulonglong (*strntoull)(struct charset_info_st *, const char *s, size_t l,
-			 int base, char **e, int *err);
-  double      (*strntod)(struct charset_info_st *, char *s, size_t l, char **e,
-			 int *err);
-  longlong    (*strtoll10)(struct charset_info_st *cs,
-                           const char *nptr, char **endptr, int *error);
-  ulonglong   (*strntoull10rnd)(struct charset_info_st *cs,
-                                const char *str, size_t length,
-                                int unsigned_fl,
-                                char **endptr, int *error);
-  size_t        (*scan)(struct charset_info_st *, const char *b, const char *e,
-                        int sq);
-} MY_CHARSET_HANDLER;
-
-extern MY_CHARSET_HANDLER my_charset_8bit_handler;
-extern MY_CHARSET_HANDLER my_charset_ucs2_handler;
-
-
-/* See strings/CHARSET_INFO.txt about information on this structure  */
-typedef struct charset_info_st
-{
-  uint      number;
-  uint      primary_number;
-  uint      binary_number;
-  uint      state;
-  const char *csname;
-  const char *name;
-  const char *comment;
-  const char *tailoring;
-  uchar    *ctype;
-  uchar    *to_lower;
-  uchar    *to_upper;
-  uchar    *sort_order;
-  uint16   *contractions;
-  uint16   **sort_order_big;
-  uint16      *tab_to_uni;
-  MY_UNI_IDX  *tab_from_uni;
-  MY_UNICASE_INFO **caseinfo;
-  uchar     *state_map;
-  uchar     *ident_map;
-  uint      strxfrm_multiply;
-  uchar     caseup_multiply;
-  uchar     casedn_multiply;
-  uint      mbminlen;
-  uint      mbmaxlen;
-  uint16    min_sort_char;
-  uint16    max_sort_char; /* For LIKE optimization */
-  uchar     pad_char;
-  my_bool   escape_with_backslash_is_dangerous;
-  
-  MY_CHARSET_HANDLER *cset;
-  MY_COLLATION_HANDLER *coll;
-  
-} CHARSET_INFO;
-#define ILLEGAL_CHARSET_INFO_NUMBER (~0U)
-
-
-extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_bin;
-extern CHARSET_INFO my_charset_big5_chinese_ci;
-extern CHARSET_INFO my_charset_big5_bin;
-extern CHARSET_INFO my_charset_cp932_japanese_ci;
-extern CHARSET_INFO my_charset_cp932_bin;
-extern CHARSET_INFO my_charset_eucjpms_japanese_ci;
-extern CHARSET_INFO my_charset_eucjpms_bin;
-extern CHARSET_INFO my_charset_euckr_korean_ci;
-extern CHARSET_INFO my_charset_euckr_bin;
-extern CHARSET_INFO my_charset_gb2312_chinese_ci;
-extern CHARSET_INFO my_charset_gb2312_bin;
-extern CHARSET_INFO my_charset_gbk_chinese_ci;
-extern CHARSET_INFO my_charset_gbk_bin;
-extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_latin1;
-extern CHARSET_INFO my_charset_latin1_german2_ci;
-extern CHARSET_INFO my_charset_latin1_bin;
-extern CHARSET_INFO my_charset_latin2_czech_ci;
-extern CHARSET_INFO my_charset_sjis_japanese_ci;
-extern CHARSET_INFO my_charset_sjis_bin;
-extern CHARSET_INFO my_charset_tis620_thai_ci;
-extern CHARSET_INFO my_charset_tis620_bin;
-extern CHARSET_INFO my_charset_ucs2_general_ci;
-extern CHARSET_INFO my_charset_ucs2_bin;
-extern CHARSET_INFO my_charset_ucs2_unicode_ci;
-extern CHARSET_INFO my_charset_ujis_japanese_ci;
-extern CHARSET_INFO my_charset_ujis_bin;
-extern CHARSET_INFO my_charset_utf8_general_ci;
-extern CHARSET_INFO my_charset_utf8_unicode_ci;
-extern CHARSET_INFO my_charset_utf8_bin;
-extern CHARSET_INFO my_charset_cp1250_czech_ci;
-extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_filename;
-
-/* declarations for simple charsets */
-extern size_t my_strnxfrm_simple(CHARSET_INFO *, uchar *, size_t,
-                                 const uchar *, size_t); 
-size_t  my_strnxfrmlen_simple(CHARSET_INFO *, size_t); 
-extern int  my_strnncoll_simple(CHARSET_INFO *, const uchar *, size_t,
-				const uchar *, size_t, my_bool);
-
-extern int  my_strnncollsp_simple(CHARSET_INFO *, const uchar *, size_t,
-                                  const uchar *, size_t,
-                                  my_bool diff_if_only_endspace_difference);
-
-extern void my_hash_sort_simple(CHARSET_INFO *cs,
-				const uchar *key, size_t len,
-				ulong *nr1, ulong *nr2); 
-
-extern size_t my_lengthsp_8bit(CHARSET_INFO *cs, const char *ptr, size_t length);
-
-extern uint my_instr_simple(struct charset_info_st *,
-                            const char *b, size_t b_length,
-                            const char *s, size_t s_length,
-                            my_match_t *match, uint nmatch);
-
-
-/* Functions for 8bit */
-extern size_t my_caseup_str_8bit(CHARSET_INFO *, char *);
-extern size_t my_casedn_str_8bit(CHARSET_INFO *, char *);
-extern size_t my_caseup_8bit(CHARSET_INFO *, char *src, size_t srclen,
-                             char *dst, size_t dstlen);
-extern size_t my_casedn_8bit(CHARSET_INFO *, char *src, size_t srclen,
-                             char *dst, size_t dstlen);
-
-extern int my_strcasecmp_8bit(CHARSET_INFO * cs, const char *, const char *);
-
-int my_mb_wc_8bit(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
-int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
-
-int my_mb_ctype_8bit(CHARSET_INFO *,int *, const uchar *,const uchar *);
-int my_mb_ctype_mb(CHARSET_INFO *,int *, const uchar *,const uchar *);
-
-size_t my_scan_8bit(CHARSET_INFO *cs, const char *b, const char *e, int sq);
-
-size_t my_snprintf_8bit(struct charset_info_st *, char *to, size_t n,
-                        const char *fmt, ...)
-  ATTRIBUTE_FORMAT(printf, 4, 5);
-
-long       my_strntol_8bit(CHARSET_INFO *, const char *s, size_t l, int base,
-                           char **e, int *err);
-ulong      my_strntoul_8bit(CHARSET_INFO *, const char *s, size_t l, int base,
-			    char **e, int *err);
-longlong   my_strntoll_8bit(CHARSET_INFO *, const char *s, size_t l, int base,
-			    char **e, int *err);
-ulonglong my_strntoull_8bit(CHARSET_INFO *, const char *s, size_t l, int base,
-			    char **e, int *err);
-double      my_strntod_8bit(CHARSET_INFO *, char *s, size_t l,char **e,
-			    int *err);
-size_t my_long10_to_str_8bit(CHARSET_INFO *, char *to, size_t l, int radix,
-                             long int val);
-size_t my_longlong10_to_str_8bit(CHARSET_INFO *, char *to, size_t l, int radix,
-                                 longlong val);
-
-longlong my_strtoll10_8bit(CHARSET_INFO *cs,
-                           const char *nptr, char **endptr, int *error);
-longlong my_strtoll10_ucs2(CHARSET_INFO *cs, 
-                           const char *nptr, char **endptr, int *error);
-
-ulonglong my_strntoull10rnd_8bit(CHARSET_INFO *cs,
-                                 const char *str, size_t length, int
-                                 unsigned_fl, char **endptr, int *error);
-ulonglong my_strntoull10rnd_ucs2(CHARSET_INFO *cs, 
-                                 const char *str, size_t length,
-                                 int unsigned_fl, char **endptr, int *error);
-
-void my_fill_8bit(CHARSET_INFO *cs, char* to, size_t l, int fill);
-
-my_bool  my_like_range_simple(CHARSET_INFO *cs,
-			      const char *ptr, size_t ptr_length,
-			      pbool escape, pbool w_one, pbool w_many,
-			      size_t res_length,
-			      char *min_str, char *max_str,
-			      size_t *min_length, size_t *max_length);
-
-my_bool  my_like_range_mb(CHARSET_INFO *cs,
-			  const char *ptr, size_t ptr_length,
-			  pbool escape, pbool w_one, pbool w_many,
-			  size_t res_length,
-			  char *min_str, char *max_str,
-			  size_t *min_length, size_t *max_length);
-
-my_bool  my_like_range_ucs2(CHARSET_INFO *cs,
-			    const char *ptr, size_t ptr_length,
-			    pbool escape, pbool w_one, pbool w_many,
-			    size_t res_length,
-			    char *min_str, char *max_str,
-			    size_t *min_length, size_t *max_length);
-
-
-int my_wildcmp_8bit(CHARSET_INFO *,
-		    const char *str,const char *str_end,
-		    const char *wildstr,const char *wildend,
-		    int escape, int w_one, int w_many);
-
-int my_wildcmp_bin(CHARSET_INFO *,
-		   const char *str,const char *str_end,
-		   const char *wildstr,const char *wildend,
-		   int escape, int w_one, int w_many);
-
-size_t my_numchars_8bit(CHARSET_INFO *, const char *b, const char *e);
-size_t my_numcells_8bit(CHARSET_INFO *, const char *b, const char *e);
-size_t my_charpos_8bit(CHARSET_INFO *, const char *b, const char *e, size_t pos);
-size_t my_well_formed_len_8bit(CHARSET_INFO *, const char *b, const char *e,
-                             size_t pos, int *error);
-uint my_mbcharlen_8bit(CHARSET_INFO *, uint c);
-
-
-/* Functions for multibyte charsets */
-extern size_t my_caseup_str_mb(CHARSET_INFO *, char *);
-extern size_t my_casedn_str_mb(CHARSET_INFO *, char *);
-extern size_t my_caseup_mb(CHARSET_INFO *, char *src, size_t srclen,
-                                         char *dst, size_t dstlen);
-extern size_t my_casedn_mb(CHARSET_INFO *, char *src, size_t srclen,
-                                         char *dst, size_t dstlen);
-extern int my_strcasecmp_mb(CHARSET_INFO * cs,const char *, const char *);
-
-int my_wildcmp_mb(CHARSET_INFO *,
-		  const char *str,const char *str_end,
-		  const char *wildstr,const char *wildend,
-		  int escape, int w_one, int w_many);
-size_t my_numchars_mb(CHARSET_INFO *, const char *b, const char *e);
-size_t my_numcells_mb(CHARSET_INFO *, const char *b, const char *e);
-size_t my_charpos_mb(CHARSET_INFO *, const char *b, const char *e, size_t pos);
-size_t my_well_formed_len_mb(CHARSET_INFO *, const char *b, const char *e,
-                             size_t pos, int *error);
-uint my_instr_mb(struct charset_info_st *,
-                 const char *b, size_t b_length,
-                 const char *s, size_t s_length,
-                 my_match_t *match, uint nmatch);
-
-int my_wildcmp_unicode(CHARSET_INFO *cs,
-                       const char *str, const char *str_end,
-                       const char *wildstr, const char *wildend,
-                       int escape, int w_one, int w_many,
-                       MY_UNICASE_INFO **weights);
-
-extern my_bool my_parse_charset_xml(const char *bug, size_t len,
-				    int (*add)(CHARSET_INFO *cs));
-extern char *my_strchr(CHARSET_INFO *cs, const char *str, const char *end,
-                       pchar c);
-
-my_bool my_propagate_simple(CHARSET_INFO *cs, const uchar *str, size_t len);
-my_bool my_propagate_complex(CHARSET_INFO *cs, const uchar *str, size_t len);
-
-
-uint my_string_repertoire(CHARSET_INFO *cs, const char *str, ulong len);
-my_bool my_charset_is_ascii_based(CHARSET_INFO *cs);
-my_bool my_charset_is_8bit_pure_ascii(CHARSET_INFO *cs);
-uint my_charset_repertoire(CHARSET_INFO *cs);
-
-
-#define	_MY_U	01	/* Upper case */
-#define	_MY_L	02	/* Lower case */
-#define	_MY_NMR	04	/* Numeral (digit) */
-#define	_MY_SPC	010	/* Spacing character */
-#define	_MY_PNT	020	/* Punctuation */
-#define	_MY_CTR	040	/* Control character */
-#define	_MY_B	0100	/* Blank */
-#define	_MY_X	0200	/* heXadecimal digit */
-
-
-#define	my_isascii(c)	(!((c) & ~0177))
-#define	my_toascii(c)	((c) & 0177)
-#define my_tocntrl(c)	((c) & 31)
-#define my_toprint(c)	((c) | 64)
-#define my_toupper(s,c)	(char) ((s)->to_upper[(uchar) (c)])
-#define my_tolower(s,c)	(char) ((s)->to_lower[(uchar) (c)])
-#define	my_isalpha(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_MY_U | _MY_L))
-#define	my_isupper(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_U)
-#define	my_islower(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_L)
-#define	my_isdigit(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_NMR)
-#define	my_isxdigit(s, c) (((s)->ctype+1)[(uchar) (c)] & _MY_X)
-#define	my_isalnum(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_MY_U | _MY_L | _MY_NMR))
-#define	my_isspace(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_SPC)
-#define	my_ispunct(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_PNT)
-#define	my_isprint(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR | _MY_B))
-#define	my_isgraph(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR))
-#define	my_iscntrl(s, c)  (((s)->ctype+1)[(uchar) (c)] & _MY_CTR)
-
-/* Some macros that should be cleaned up a little */
-#define my_isvar(s,c)                 (my_isalnum(s,c) || (c) == '_')
-#define my_isvar_start(s,c)           (my_isalpha(s,c) || (c) == '_')
-
-#define my_binary_compare(s)	      ((s)->state  & MY_CS_BINSORT)
-#define use_strnxfrm(s)               ((s)->state  & MY_CS_STRNXFRM)
-#define my_strnxfrm(s, a, b, c, d)    ((s)->coll->strnxfrm((s), (a), (b), (c), (d)))
-#define my_strnncoll(s, a, b, c, d) ((s)->coll->strnncoll((s), (a), (b), (c), (d), 0))
-#define my_like_range(s, a, b, c, d, e, f, g, h, i, j) \
-   ((s)->coll->like_range((s), (a), (b), (c), (d), (e), (f), (g), (h), (i), (j)))
-#define my_wildcmp(cs,s,se,w,we,e,o,m) ((cs)->coll->wildcmp((cs),(s),(se),(w),(we),(e),(o),(m)))
-#define my_strcasecmp(s, a, b)        ((s)->coll->strcasecmp((s), (a), (b)))
-#define my_charpos(cs, b, e, num)     (cs)->cset->charpos((cs), (const char*) (b), (const char *)(e), (num))
-
-
-#define use_mb(s)                     ((s)->cset->ismbchar != NULL)
-#define my_ismbchar(s, a, b)          ((s)->cset->ismbchar((s), (a), (b)))
-#ifdef USE_MB
-#define my_mbcharlen(s, a)            ((s)->cset->mbcharlen((s),(a)))
-#else
-#define my_mbcharlen(s, a)            1
-#endif
-
-#define my_caseup_str(s, a)           ((s)->cset->caseup_str((s), (a)))
-#define my_casedn_str(s, a)           ((s)->cset->casedn_str((s), (a)))
-#define my_strntol(s, a, b, c, d, e)  ((s)->cset->strntol((s),(a),(b),(c),(d),(e)))
-#define my_strntoul(s, a, b, c, d, e) ((s)->cset->strntoul((s),(a),(b),(c),(d),(e)))
-#define my_strntoll(s, a, b, c, d, e) ((s)->cset->strntoll((s),(a),(b),(c),(d),(e)))
-#define my_strntoull(s, a, b, c,d, e) ((s)->cset->strntoull((s),(a),(b),(c),(d),(e)))
-#define my_strntod(s, a, b, c, d)     ((s)->cset->strntod((s),(a),(b),(c),(d)))
-
-
-/* XXX: still need to take care of this one */
-#ifdef MY_CHARSET_TIS620
-#error The TIS620 charset is broken at the moment.  Tell tim to fix it.
-#define USE_TIS620
-#include "t_ctype.h"
-#endif
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _m_ctype_h */
diff --git a/dep/include/mysql/m_string.h b/dep/include/mysql/m_string.h
deleted file mode 100644
index b2a1d9ff2..000000000
--- a/dep/include/mysql/m_string.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* There may be prolems include all of theese. Try to test in
-   configure with ones are needed? */
-
-/*  This is needed for the definitions of strchr... on solaris */
-
-#ifndef _m_string_h
-#define _m_string_h
-#ifndef __USE_GNU
-#define __USE_GNU				/* We want to use stpcpy */
-#endif
-#if defined(HAVE_STRINGS_H)
-#include <strings.h>
-#endif
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#endif
-
-/* need by my_vsnprintf */
-#include <stdarg.h> 
-
-#ifdef _AIX
-#undef HAVE_BCMP
-#endif
-
-/*  This is needed for the definitions of bzero... on solaris */
-#if defined(HAVE_STRINGS_H)
-#include <strings.h>
-#endif
-
-/*  This is needed for the definitions of memcpy... on solaris */
-#if defined(HAVE_MEMORY_H) && !defined(__cplusplus)
-#include <memory.h>
-#endif
-
-#if !defined(HAVE_MEMCPY) && !defined(HAVE_MEMMOVE)
-# define memcpy(d, s, n)	bcopy ((s), (d), (n))
-# define memset(A,C,B)		bfill((A),(B),(C))
-# define memmove(d, s, n)	bmove ((d), (s), (n))
-#elif defined(HAVE_MEMMOVE)
-# define bmove(d, s, n)		memmove((d), (s), (n))
-#else
-# define memmove(d, s, n)	bmove((d), (s), (n)) /* our bmove */
-#endif
-
-/* Unixware 7 */
-#if !defined(HAVE_BFILL)
-# define bfill(A,B,C)           memset((A),(C),(B))
-# define bmove_align(A,B,C)    memcpy((A),(B),(C))
-#endif
-
-#if !defined(HAVE_BCMP)
-# define bcopy(s, d, n)		memcpy((d), (s), (n))
-# define bcmp(A,B,C)		memcmp((A),(B),(C))
-# define bzero(A,B)		memset((A),0,(B))
-# define bmove_align(A,B,C)     memcpy((A),(B),(C))
-#endif
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
-  my_str_malloc() and my_str_free() are assigned to implementations in
-  strings/alloc.c, but can be overridden in the calling program.
- */
-extern void *(*my_str_malloc)(size_t);
-extern void (*my_str_free)(void *);
-
-#if defined(HAVE_STPCPY)
-#define strmov(A,B) stpcpy((A),(B))
-#ifndef stpcpy
-extern char *stpcpy(char *, const char *);	/* For AIX with gcc 2.95.3 */
-#endif
-#endif
-
-/* Declared in int2str() */
-extern char NEAR _dig_vec_upper[];
-extern char NEAR _dig_vec_lower[];
-
-/* Defined in strtod.c */
-extern const double log_10[309];
-
-#ifndef strmov
-#define strmov_overlapp(A,B) strmov(A,B)
-#define strmake_overlapp(A,B,C) strmake(A,B,C)
-#endif
-
-#ifdef BAD_MEMCPY			/* Problem with gcc on Alpha */
-#define memcpy_fixed(A,B,C) bmove((A),(B),(C))
-#else
-#define memcpy_fixed(A,B,C) memcpy((A),(B),(C))
-#endif
-
-#if (!defined(USE_BMOVE512) || defined(HAVE_purify)) && !defined(bmove512)
-#define bmove512(A,B,C) memcpy(A,B,C)
-#endif
-
-	/* Prototypes for string functions */
-
-#if !defined(bfill) && !defined(HAVE_BFILL)
-extern	void bfill(uchar *dst,size_t len,pchar fill);
-#endif
-
-#if !defined(bzero) && !defined(HAVE_BZERO)
-extern	void bzero(uchar * dst,size_t len);
-#endif
-
-#if !defined(bcmp) && !defined(HAVE_BCMP)
-extern	size_t bcmp(const uchar *s1,const uchar *s2,size_t len);
-#endif
-#ifdef HAVE_purify
-extern	size_t my_bcmp(const uchar *s1,const uchar *s2,size_t len);
-#undef bcmp
-#define bcmp(A,B,C) my_bcmp((A),(B),(C))
-#endif /* HAVE_purify */
-
-#ifndef bmove512
-extern	void bmove512(uchar *dst,const uchar *src,size_t len);
-#endif
-
-#if !defined(HAVE_BMOVE) && !defined(bmove)
-extern	void bmove(uuchar *dst, const uchar *src,size_t len);
-#endif
-
-extern	void bmove_upp(uchar *dst,const uchar *src,size_t len);
-extern	void bchange(uchar *dst,size_t old_len,const uchar *src,
-		     size_t new_len,size_t tot_len);
-extern	void strappend(char *s,size_t len,pchar fill);
-extern	char *strend(const char *s);
-extern  char *strcend(const char *, pchar);
-extern	char *strfield(char *src,int fields,int chars,int blanks,
-			   int tabch);
-extern	char *strfill(char * s,size_t len,pchar fill);
-extern	size_t strinstr(const char *str,const char *search);
-extern  size_t r_strinstr(const char *str, size_t from, const char *search);
-extern	char *strkey(char *dst,char *head,char *tail,char *flags);
-extern	char *strmake(char *dst,const char *src,size_t length);
-
-#ifndef strmov
-extern	char *strmov(char *dst,const char *src);
-#else
-extern	char *strmov_overlapp(char *dst,const char *src);
-#endif
-extern	char *strnmov(char *dst,const char *src,size_t n);
-extern	char *strsuff(const char *src,const char *suffix);
-extern	char *strcont(const char *src,const char *set);
-extern	char *strxcat _VARARGS((char *dst,const char *src, ...));
-extern	char *strxmov _VARARGS((char *dst,const char *src, ...));
-extern	char *strxcpy _VARARGS((char *dst,const char *src, ...));
-extern	char *strxncat _VARARGS((char *dst,size_t len, const char *src, ...));
-extern	char *strxnmov _VARARGS((char *dst,size_t len, const char *src, ...));
-extern	char *strxncpy _VARARGS((char *dst,size_t len, const char *src, ...));
-
-/* Prototypes of normal stringfunctions (with may ours) */
-
-#ifdef WANT_STRING_PROTOTYPES
-extern char *strcat(char *, const char *);
-extern char *strchr(const char *, pchar);
-extern char *strrchr(const char *, pchar);
-extern char *strcpy(char *, const char *);
-extern int strcmp(const char *, const char *);
-#ifndef __GNUC__
-extern size_t strlen(const char *);
-#endif
-#endif
-#ifndef HAVE_STRNLEN
-extern size_t strnlen(const char *s, size_t n);
-#endif
-
-#if !defined(__cplusplus)
-#ifndef HAVE_STRPBRK
-extern char *strpbrk(const char *, const char *);
-#endif
-#ifndef HAVE_STRSTR
-extern char *strstr(const char *, const char *);
-#endif
-#endif
-extern int is_prefix(const char *, const char *);
-
-/* Conversion routines */
-double my_strtod(const char *str, char **end, int *error);
-double my_atof(const char *nptr);
-
-extern char *llstr(longlong value,char *buff);
-extern char *ullstr(longlong value,char *buff);
-#ifndef HAVE_STRTOUL
-extern long strtol(const char *str, char **ptr, int base);
-extern ulong strtoul(const char *str, char **ptr, int base);
-#endif
-
-extern char *int2str(long val, char *dst, int radix, int upcase);
-extern char *int10_to_str(long val,char *dst,int radix);
-extern char *str2int(const char *src,int radix,long lower,long upper,
-			 long *val);
-longlong my_strtoll10(const char *nptr, char **endptr, int *error);
-#if SIZEOF_LONG == SIZEOF_LONG_LONG
-#define longlong2str(A,B,C) int2str((A),(B),(C),1)
-#define longlong10_to_str(A,B,C) int10_to_str((A),(B),(C))
-#undef strtoll
-#define strtoll(A,B,C) strtol((A),(B),(C))
-#define strtoull(A,B,C) strtoul((A),(B),(C))
-#ifndef HAVE_STRTOULL
-#define HAVE_STRTOULL
-#endif
-#ifndef HAVE_STRTOLL
-#define HAVE_STRTOLL
-#endif
-#else
-#ifdef HAVE_LONG_LONG
-extern char *longlong2str(longlong val,char *dst,int radix);
-extern char *longlong10_to_str(longlong val,char *dst,int radix);
-#if (!defined(HAVE_STRTOULL) || defined(NO_STRTOLL_PROTO))
-extern longlong strtoll(const char *str, char **ptr, int base);
-extern ulonglong strtoull(const char *str, char **ptr, int base);
-#endif
-#endif
-#endif
-
-/* my_vsnprintf.c */
-
-extern size_t my_vsnprintf(char *str, size_t n,
-                           const char *format, va_list ap);
-extern size_t my_snprintf(char *to, size_t n, const char *fmt, ...)
-  ATTRIBUTE_FORMAT(printf, 3, 4);
-
-#if defined(__cplusplus)
-}
-#endif
-
-/*
-  LEX_STRING -- a pair of a C-string and its length.
-*/
-
-#ifndef _my_plugin_h
-/* This definition must match the one given in mysql/plugin.h */
-struct st_mysql_lex_string
-{
-  char *str;
-  size_t length;
-};
-#endif
-typedef struct st_mysql_lex_string LEX_STRING;
-
-#define STRING_WITH_LEN(X) (X), ((size_t) (sizeof(X) - 1))
-#define USTRING_WITH_LEN(X) ((uchar*) X), ((size_t) (sizeof(X) - 1))
-#define C_STRING_WITH_LEN(X) ((char *) (X)), ((size_t) (sizeof(X) - 1))
-
-#endif
diff --git a/dep/include/mysql/my_alloc.h b/dep/include/mysql/my_alloc.h
deleted file mode 100644
index 93b7438a1..000000000
--- a/dep/include/mysql/my_alloc.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* 
-   Data structures for mysys/my_alloc.c (root memory allocator)
-*/
-
-#ifndef _my_alloc_h
-#define _my_alloc_h
-
-#define ALLOC_MAX_BLOCK_TO_DROP			4096
-#define ALLOC_MAX_BLOCK_USAGE_BEFORE_DROP	10
-
-typedef struct st_used_mem
-{				   /* struct for once_alloc (block) */
-  struct st_used_mem *next;	   /* Next block in use */
-  unsigned int	left;		   /* memory left in block  */
-  unsigned int	size;		   /* size of block */
-} USED_MEM;
-
-
-typedef struct st_mem_root
-{
-  USED_MEM *free;                  /* blocks with free memory in it */
-  USED_MEM *used;                  /* blocks almost without free memory */
-  USED_MEM *pre_alloc;             /* preallocated block */
-  /* if block have less memory it will be put in 'used' list */
-  size_t min_malloc;
-  size_t block_size;               /* initial block size */
-  unsigned int block_num;          /* allocated blocks counter */
-  /* 
-     first free block in queue test counter (if it exceed 
-     MAX_BLOCK_USAGE_BEFORE_DROP block will be dropped in 'used' list)
-  */
-  unsigned int first_block_usage;
-
-  void (*error_handler)(void);
-} MEM_ROOT;
-#endif
diff --git a/dep/include/mysql/my_attribute.h b/dep/include/mysql/my_attribute.h
deleted file mode 100644
index 8309d85f2..000000000
--- a/dep/include/mysql/my_attribute.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright (C) 2000-2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/*
-  Helper macros used for setting different __attributes__
-  on functions in a portable fashion
-*/
-
-#ifndef _my_attribute_h
-#define _my_attribute_h
-
-/*
-  Disable __attribute__() on gcc < 2.7, g++ < 3.4, and non-gcc compilers.
-  Some forms of __attribute__ are actually supported in earlier versions of
-  g++, but we just disable them all because we only use them to generate
-  compilation warnings.
-*/
-#ifndef __attribute__
-# if !defined(__GNUC__)
-#  define __attribute__(A)
-# elif GCC_VERSION < 2008
-#  define __attribute__(A)
-# elif defined(__cplusplus) && GCC_VERSION < 3004
-#  define __attribute__(A)
-# endif
-#endif
-
-/*
-  __attribute__((format(...))) is only supported in gcc >= 2.8 and g++ >= 3.4
-  But that's already covered by the __attribute__ tests above, so this is
-  just a convenience macro.
-*/
-#ifndef ATTRIBUTE_FORMAT
-# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
-#endif
-
-/*
-
-   __attribute__((format(...))) on a function pointer is not supported
-   until  gcc 3.1
-*/
-#ifndef ATTRIBUTE_FORMAT_FPTR
-# if (GCC_VERSION >= 3001)
-#  define ATTRIBUTE_FORMAT_FPTR(style, m, n) ATTRIBUTE_FORMAT(style, m, n)
-# else
-#  define ATTRIBUTE_FORMAT_FPTR(style, m, n)
-# endif /* GNUC >= 3.1 */
-#endif
-
-
-#endif
diff --git a/dep/include/mysql/my_dbug.h b/dep/include/mysql/my_dbug.h
deleted file mode 100644
index 0ba72b221..000000000
--- a/dep/include/mysql/my_dbug.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef _dbug_h
-#define _dbug_h
-
-#if defined(__cplusplus) && !defined(DBUG_OFF)
-class Dbug_violation_helper
-{
-public:
-  inline Dbug_violation_helper() :
-    _entered(TRUE)
-  { }
-
-  inline ~Dbug_violation_helper()
-  {
-    assert(!_entered);
-  }
-
-  inline void leave()
-  {
-    _entered= FALSE;
-  }
-
-private:
-  bool _entered;
-};
-#endif /* C++ */
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-#if !defined(DBUG_OFF) && !defined(_lint)
-struct _db_code_state_;
-extern	int _db_keyword_(struct _db_code_state_ *cs, const char *keyword);
-extern  int _db_strict_keyword_(const char *keyword);
-extern  int _db_explain_(struct _db_code_state_ *cs, char *buf, size_t len);
-extern  int _db_explain_init_(char *buf, size_t len);
-extern	void _db_setjmp_(void);
-extern	void _db_longjmp_(void);
-extern  void _db_process_(const char *name);
-extern	void _db_push_(const char *control);
-extern	void _db_pop_(void);
-extern  void _db_set_(struct _db_code_state_ *cs, const char *control);
-extern  void _db_set_init_(const char *control);
-extern	void _db_enter_(const char *_func_,const char *_file_,uint _line_,
-			const char **_sfunc_,const char **_sfile_,
-			uint *_slevel_, char ***);
-extern	void _db_return_(uint _line_,const char **_sfunc_,const char **_sfile_,
-			 uint *_slevel_);
-extern	void _db_pargs_(uint _line_,const char *keyword);
-extern	void _db_doprnt_ _VARARGS((const char *format,...))
-  ATTRIBUTE_FORMAT(printf, 1, 2);
-extern	void _db_dump_(uint _line_,const char *keyword,
-                       const unsigned char *memory, size_t length);
-extern	void _db_end_(void);
-extern	void _db_lock_file_(void);
-extern	void _db_unlock_file_(void);
-extern FILE *_db_fp_(void);
-
-#ifdef __cplusplus
-
-#define DBUG_ENTER(a) \
-        const char *_db_func_, *_db_file_; \
-        uint _db_level_; \
-        char **_db_framep_; \
-        Dbug_violation_helper dbug_violation_helper; \
-        _db_enter_ (a, __FILE__, __LINE__, &_db_func_, &_db_file_, \
-                    &_db_level_, &_db_framep_)
-#define DBUG_VIOLATION_HELPER_LEAVE dbug_violation_helper.leave()
-
-#else /* C */
-
-#define DBUG_ENTER(a) \
-        const char *_db_func_, *_db_file_; \
-        uint _db_level_; \
-        char **_db_framep_; \
-        _db_enter_ (a, __FILE__, __LINE__, &_db_func_, &_db_file_, \
-                    &_db_level_, &_db_framep_)
-#define DBUG_VIOLATION_HELPER_LEAVE do { } while(0)
-
-#endif /* C++ */
-
-#define DBUG_LEAVE \
-        DBUG_VIOLATION_HELPER_LEAVE; \
-	_db_return_ (__LINE__, &_db_func_, &_db_file_, &_db_level_)
-#define DBUG_RETURN(a1) do {DBUG_LEAVE; return(a1);} while(0)
-#define DBUG_VOID_RETURN do {DBUG_LEAVE; return;} while(0)
-#define DBUG_EXECUTE(keyword,a1) \
-        do {if (_db_keyword_(0, (keyword))) { a1 }} while(0)
-#define DBUG_EXECUTE_IF(keyword,a1) \
-        do {if (_db_strict_keyword_ (keyword)) { a1 } } while(0)
-#define DBUG_EVALUATE(keyword,a1,a2) \
-        (_db_keyword_(0,(keyword)) ? (a1) : (a2))
-#define DBUG_EVALUATE_IF(keyword,a1,a2) \
-        (_db_strict_keyword_((keyword)) ? (a1) : (a2))
-#define DBUG_PRINT(keyword,arglist) \
-        do {_db_pargs_(__LINE__,keyword); _db_doprnt_ arglist;} while(0)
-#define DBUG_PUSH(a1) _db_push_ (a1)
-#define DBUG_POP() _db_pop_ ()
-#define DBUG_SET(a1) _db_set_ (0, (a1))
-#define DBUG_SET_INITIAL(a1) _db_set_init_ (a1)
-#define DBUG_PROCESS(a1) _db_process_(a1)
-#define DBUG_FILE _db_fp_()
-#define DBUG_SETJMP(a1) (_db_setjmp_ (), setjmp (a1))
-#define DBUG_LONGJMP(a1,a2) (_db_longjmp_ (), longjmp (a1, a2))
-#define DBUG_DUMP(keyword,a1,a2) _db_dump_(__LINE__,keyword,a1,a2)
-#define DBUG_END()  _db_end_ ()
-#define DBUG_LOCK_FILE _db_lock_file_()
-#define DBUG_UNLOCK_FILE _db_unlock_file_()
-#define DBUG_ASSERT(A) assert(A)
-#define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len))
-#define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len))
-#define IF_DBUG(A) A
-#else						/* No debugger */
-
-#define DBUG_ENTER(a1)
-#define DBUG_LEAVE
-#define DBUG_VIOLATION_HELPER_LEAVE
-#define DBUG_RETURN(a1)             do { return(a1); } while(0)
-#define DBUG_VOID_RETURN            do { return; } while(0)
-#define DBUG_EXECUTE(keyword,a1)    do { } while(0)
-#define DBUG_EXECUTE_IF(keyword,a1) do { } while(0)
-#define DBUG_EVALUATE(keyword,a1,a2) (a2)
-#define DBUG_EVALUATE_IF(keyword,a1,a2) (a2)
-#define DBUG_PRINT(keyword,arglist) do { } while(0)
-#define DBUG_PUSH(a1)
-#define DBUG_SET(a1)                do { } while(0)
-#define DBUG_SET_INITIAL(a1)        do { } while(0)
-#define DBUG_POP()
-#define DBUG_PROCESS(a1)
-#define DBUG_SETJMP(a1) setjmp(a1)
-#define DBUG_LONGJMP(a1) longjmp(a1)
-#define DBUG_DUMP(keyword,a1,a2)    do { } while(0)
-#define DBUG_END()
-#define DBUG_ASSERT(A)              do { } while(0)
-#define DBUG_LOCK_FILE
-#define DBUG_FILE (stderr)
-#define DBUG_UNLOCK_FILE
-#define DBUG_EXPLAIN(buf,len)
-#define DBUG_EXPLAIN_INITIAL(buf,len)
-#define IF_DBUG(A)
-#endif
-#ifdef	__cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/mysql/my_dir.h b/dep/include/mysql/my_dir.h
deleted file mode 100644
index 06509a3af..000000000
--- a/dep/include/mysql/my_dir.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef _my_dir_h
-#define _my_dir_h
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#ifndef MY_DIR_H
-#define MY_DIR_H
-
-#include <sys/stat.h>
-
-	/* Defines for my_dir and my_stat */
-
-#define MY_S_IFMT	S_IFMT	/* type of file */
-#define MY_S_IFDIR	S_IFDIR /* directory */
-#define MY_S_IFCHR	S_IFCHR /* character special */
-#define MY_S_IFBLK	S_IFBLK /* block special */
-#define MY_S_IFREG	S_IFREG /* regular */
-#define MY_S_IFIFO	S_IFIFO /* fifo */
-#define MY_S_ISUID	S_ISUID /* set user id on execution */
-#define MY_S_ISGID	S_ISGID /* set group id on execution */
-#define MY_S_ISVTX	S_ISVTX /* save swapped text even after use */
-#define MY_S_IREAD	S_IREAD /* read permission, owner */
-#define MY_S_IWRITE	S_IWRITE	/* write permission, owner */
-#define MY_S_IEXEC	S_IEXEC /* execute/search permission, owner */
-
-#define MY_S_ISDIR(m)	(((m) & MY_S_IFMT) == MY_S_IFDIR)
-#define MY_S_ISCHR(m)	(((m) & MY_S_IFMT) == MY_S_IFCHR)
-#define MY_S_ISBLK(m)	(((m) & MY_S_IFMT) == MY_S_IFBLK)
-#define MY_S_ISREG(m)	(((m) & MY_S_IFMT) == MY_S_IFREG)
-#define MY_S_ISFIFO(m)	(((m) & MY_S_IFMT) == MY_S_IFIFO)
-
-#define MY_DONT_SORT	512	/* my_lib; Don't sort files */
-#define MY_WANT_STAT	1024	/* my_lib; stat files */
-
-	/* typedefs for my_dir & my_stat */
-
-#ifdef USE_MY_STAT_STRUCT
-
-typedef struct my_stat
-{
-  dev_t		st_dev;		/* major & minor device numbers */
-  ino_t		st_ino;		/* inode number */
-  ushort	st_mode;	/* file permissons (& suid sgid .. bits) */
-  short		st_nlink;	/* number of links to file */
-  ushort	st_uid;		/* user id */
-  ushort	st_gid;		/* group id */
-  dev_t		st_rdev;	/* more major & minor device numbers (???) */
-  off_t		st_size;	/* size of file */
-  time_t	st_atime;	/* time for last read */
-  time_t	st_mtime;	/* time for last contens modify */
-  time_t	st_ctime;	/* time for last inode or contents modify */
-} MY_STAT;
-
-#else
-
-#define MY_STAT struct stat	/* Orginal struct have what we need */
-
-#endif /* USE_MY_STAT_STRUCT */
-
-/* Struct describing one file returned from my_dir */
-typedef struct fileinfo
-{
-  char			*name;
-  MY_STAT		*mystat;
-} FILEINFO;
-
-typedef struct st_my_dir	/* Struct returned from my_dir */
-{
-  /*
-    These members are just copies of parts of DYNAMIC_ARRAY structure, 
-    which is allocated right after the end of MY_DIR structure (MEM_ROOT
-    for storing names is also resides there). We've left them here because
-    we don't want to change code that uses my_dir.
-  */
-  struct fileinfo	*dir_entry;
-  uint			number_off_files;
-} MY_DIR;
-
-extern MY_DIR *my_dir(const char *path,myf MyFlags);
-extern void my_dirend(MY_DIR *buffer);
-extern MY_STAT *my_stat(const char *path, MY_STAT *stat_area, myf my_flags);
-extern int my_fstat(int filenr, MY_STAT *stat_area, myf MyFlags);
-
-#endif /* MY_DIR_H */
-
-#ifdef	__cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/mysql/my_getopt.h b/dep/include/mysql/my_getopt.h
deleted file mode 100644
index d7c996302..000000000
--- a/dep/include/mysql/my_getopt.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright (C) 2002-2004 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef _my_getopt_h
-#define _my_getopt_h
-
-C_MODE_START
-
-#define GET_NO_ARG     1
-#define GET_BOOL       2
-#define GET_INT        3
-#define GET_UINT       4
-#define GET_LONG       5
-#define GET_ULONG      6
-#define GET_LL         7
-#define GET_ULL        8
-#define GET_STR        9
-#define GET_STR_ALLOC 10
-#define GET_DISABLED  11
-#define GET_ENUM      12
-#define GET_SET       13
-#define GET_DOUBLE    14
-
-#define GET_ASK_ADDR	 128
-#define GET_TYPE_MASK	 127
-
-enum get_opt_arg_type { NO_ARG, OPT_ARG, REQUIRED_ARG };
-
-struct st_typelib;
-
-struct my_option
-{
-  const char *name;                     /* Name of the option */
-  int        id;                        /* unique id or short option */
-  const char *comment;                  /* option comment, for autom. --help */
-  void       *value;                    /* The variable value */
-  void       *u_max_value;              /* The user def. max variable value */
-  struct st_typelib *typelib;           /* Pointer to possible values */
-  ulong      var_type;                  /* Must match the variable type */
-  enum get_opt_arg_type arg_type;
-  longlong   def_value;                 /* Default value */
-  longlong   min_value;                 /* Min allowed value */
-  longlong   max_value;                 /* Max allowed value */
-  longlong   sub_size;                  /* Subtract this from given value */
-  long       block_size;                /* Value should be a mult. of this */
-  void       *app_type;                 /* To be used by an application */
-};
-
-typedef my_bool (*my_get_one_option)(int, const struct my_option *, char *);
-typedef void (*my_error_reporter)(enum loglevel level, const char *format, ...);
-/**
-  Used to retrieve a reference to the object (variable) that holds the value
-  for the given option. For example, if var_type is GET_UINT, the function
-  must return a pointer to a variable of type uint. A argument is stored in
-  the location pointed to by the returned pointer.
-*/
-typedef void *(*my_getopt_value)(const char *, uint, const struct my_option *,
-                                 int *);
-
-extern char *disabled_my_option;
-extern my_bool my_getopt_print_errors;
-extern my_bool my_getopt_skip_unknown;
-extern my_error_reporter my_getopt_error_reporter;
-
-extern int handle_options (int *argc, char ***argv, 
-			   const struct my_option *longopts, my_get_one_option);
-extern void my_cleanup_options(const struct my_option *options);
-extern void my_print_help(const struct my_option *options);
-extern void my_print_variables(const struct my_option *options);
-extern void my_getopt_register_get_addr(my_getopt_value);
-
-ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
-                                 my_bool *fix);
-longlong getopt_ll_limit_value(longlong, const struct my_option *,
-                               my_bool *fix);
-my_bool getopt_compare_strings(const char *s, const char *t, uint length);
-
-C_MODE_END
-
-#endif /* _my_getopt_h */
-
diff --git a/dep/include/mysql/my_global.h b/dep/include/mysql/my_global.h
deleted file mode 100644
index e13c7c37b..000000000
--- a/dep/include/mysql/my_global.h
+++ /dev/null
@@ -1,1606 +0,0 @@
-/* Copyright (C) 2000-2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* This is the include file that should be included 'first' in every C file. */
-
-#ifndef _global_h
-#define _global_h
-
-/*
-  InnoDB depends on some MySQL internals which other plugins should not
-  need.  This is because of InnoDB's foreign key support, "safe" binlog
-  truncation, and other similar legacy features.
-
-  We define accessors for these internals unconditionally, but do not
-  expose them in mysql/plugin.h.  They are declared in ha_innodb.h for
-  InnoDB's use.
-*/
-#define INNODB_COMPATIBILITY_HOOKS
-
-#ifdef __CYGWIN__
-/* We use a Unix API, so pretend it's not Windows */
-#undef WIN
-#undef WIN32
-#undef _WIN
-#undef _WIN32
-#undef _WIN64
-#undef __WIN__
-#undef __WIN32__
-#define HAVE_ERRNO_AS_DEFINE
-#endif /* __CYGWIN__ */
-
-#if defined(__QNXNTO__) && !defined(FD_SETSIZE)
-#define FD_SETSIZE 1024         /* Max number of file descriptor bits in
-                                   fd_set, used when calling 'select'
-                                   Must be defined before including
-                                   "sys/select.h" and "sys/time.h"
-                                 */
-#endif
-
-
-/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#define USE_PRAGMA_INTERFACE
-#endif
-
-#if defined(__OpenBSD__) && (OpenBSD >= 200411)
-#define HAVE_ERRNO_AS_DEFINE
-#endif
-
-#if defined(i386) && !defined(__i386__)
-#define __i386__
-#endif
-
-/* Macros to make switching between C and C++ mode easier */
-#ifdef __cplusplus
-#define C_MODE_START    extern "C" {
-#define C_MODE_END	}
-#else
-#define C_MODE_START
-#define C_MODE_END
-#endif
-
-#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
-#include <config-win.h>
-#elif defined(__NETWARE__)
-#include <my_config.h>
-#include <config-netware.h>
-#if defined(__cplusplus) && defined(inline)
-#undef inline				/* fix configure problem */
-#endif
-#else
-#include <my_config.h>
-#if defined(__cplusplus) && defined(inline)
-#undef inline				/* fix configure problem */
-#endif
-#endif /* _WIN32... */
-
-/* Make it easier to add conditionl code for windows */
-#ifdef __WIN__
-#define IF_WIN(A,B) (A)
-#else
-#define IF_WIN(A,B) (B)
-#endif
-
-#ifndef EMBEDDED_LIBRARY
-#ifdef WITH_NDB_BINLOG
-#define HAVE_NDB_BINLOG 1
-#endif
-#endif /* !EMBEDDED_LIBRARY */
-
-#ifndef EMBEDDED_LIBRARY
-#define HAVE_REPLICATION
-#define HAVE_EXTERNAL_CLIENT
-#endif
-
-/* Some defines to avoid ifdefs in the code */
-#ifndef NETWARE_YIELD
-#define NETWARE_YIELD
-#define NETWARE_SET_SCREEN_MODE(A)
-#endif
-
-/* Workaround for _LARGE_FILES and _LARGE_FILE_API incompatibility on AIX */
-#if defined(_AIX) && defined(_LARGE_FILE_API)
-#undef _LARGE_FILE_API
-#endif
-
-/*
-  The macros below are used to allow build of Universal/fat binaries of
-  MySQL and MySQL applications under darwin. 
-*/
-#if defined(__APPLE__) && defined(__MACH__)
-#  undef SIZEOF_CHARP 
-#  undef SIZEOF_SHORT 
-#  undef SIZEOF_INT 
-#  undef SIZEOF_LONG 
-#  undef SIZEOF_LONG_LONG 
-#  undef SIZEOF_OFF_T 
-#  undef WORDS_BIGENDIAN
-#  define SIZEOF_SHORT 2
-#  define SIZEOF_INT 4
-#  define SIZEOF_LONG_LONG 8
-#  define SIZEOF_OFF_T 8
-#  if defined(__i386__) || defined(__ppc__)
-#    define SIZEOF_CHARP 4
-#    define SIZEOF_LONG 4
-#  elif defined(__x86_64__) || defined(__ppc64__)
-#    define SIZEOF_CHARP 8
-#    define SIZEOF_LONG 8
-#  else
-#    error Building FAT binary for an unknown architecture.
-#  endif
-#  if defined(__ppc__) || defined(__ppc64__)
-#    define WORDS_BIGENDIAN
-#  endif
-#endif /* defined(__APPLE__) && defined(__MACH__) */
-
-
-/*
-  The macros below are borrowed from include/linux/compiler.h in the
-  Linux kernel. Use them to indicate the likelyhood of the truthfulness
-  of a condition. This serves two purposes - newer versions of gcc will be
-  able to optimize for branch predication, which could yield siginficant
-  performance gains in frequently executed sections of the code, and the
-  other reason to use them is for documentation
-*/
-
-#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
-#define __builtin_expect(x, expected_value) (x)
-#endif
-
-#define likely(x)	__builtin_expect((x),1)
-#define unlikely(x)	__builtin_expect((x),0)
-
-
-/*
-  The macros below are useful in optimising places where it has been
-  discovered that cache misses stall the process and where a prefetch
-  of the cache line can improve matters. This is available in GCC 3.1.1
-  and later versions.
-  PREFETCH_READ says that addr is going to be used for reading and that
-  it is to be kept in caches if possible for a while
-  PREFETCH_WRITE also says that the item to be cached is likely to be
-  updated.
-  The *LOCALITY scripts are also available for experimentation purposes
-  mostly and should only be used if they are verified to improve matters.
-  For more input see GCC manual (available in GCC 3.1.1 and later)
-*/
-
-#if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR > 10)
-#define PREFETCH_READ(addr) __builtin_prefetch(addr, 0, 3)
-#define PREFETCH_WRITE(addr) \
-  __builtin_prefetch(addr, 1, 3)
-#define PREFETCH_READ_LOCALITY(addr, locality) \
-  __builtin_prefetch(addr, 0, locality)
-#define PREFETCH_WRITE_LOCALITY(addr, locality) \
-  __builtin_prefetch(addr, 1, locality)
-#else
-#define PREFETCH_READ(addr)
-#define PREFETCH_READ_LOCALITY(addr, locality)
-#define PREFETCH_WRITE(addr)
-#define PREFETCH_WRITE_LOCALITY(addr, locality)
-#endif
-
-/*
-  The following macro is used to ensure that code often used in most
-  SQL statements and definitely for parts of the SQL processing are
-  kept in a code segment by itself. This has the advantage that the
-  risk of common code being overlapping in caches of the CPU is less.
-  This can be a cause of big performance problems.
-  Routines should be put in this category with care and when they are
-  put there one should also strive to make as much of the error handling
-  as possible (or uncommon code of the routine) to execute in a
-  separate method to avoid moving to much code to this code segment.
-
-  It is very easy to use, simply add HOT_METHOD at the end of the
-  function declaration.
-  For more input see GCC manual (available in GCC 2.95 and later)
-*/
-
-#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR > 94)
-#define HOT_METHOD \
-  __attribute__ ((section ("hot_code_section")))
-#else
-#define HOT_METHOD
-#endif
-
-/*
-  The following macro is used to ensure that popular global variables
-  are located next to each other to avoid that they contend for the
-  same cache lines.
-
-  It is very easy to use, simply add HOT_DATA at the end of the declaration
-  of the variable, the variable must be initialised because of the way
-  that linker works so a declaration using HOT_DATA should look like:
-  uint global_hot_data HOT_DATA = 0;
-  For more input see GCC manual (available in GCC 2.95 and later)
-*/
-
-#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR > 94)
-#define HOT_DATA \
-  __attribute__ ((section ("hot_data_section")))
-#else
-#define HOT_DATA
-#endif
-
-/*
-  now let's figure out if inline functions are supported
-  autoconf defines 'inline' to be empty, if not
-*/
-#define inline_test_1(X)        X ## 1
-#define inline_test_2(X)        inline_test_1(X)
-#if inline_test_2(inline) != 1
-#define HAVE_INLINE
-#endif
-#undef inline_test_2
-#undef inline_test_1
-/* helper macro for "instantiating" inline functions */
-#define STATIC_INLINE static inline
-
-/*
-  The following macros are used to control inlining a bit more than
-  usual. These macros are used to ensure that inlining always or
-  never occurs (independent of compilation mode).
-  For more input see GCC manual (available in GCC 3.1.1 and later)
-*/
-
-#if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR > 10)
-#define ALWAYS_INLINE __attribute__ ((always_inline))
-#define NEVER_INLINE __attribute__ ((noinline))
-#else
-#define ALWAYS_INLINE
-#define NEVER_INLINE
-#endif
-
-
-/* Fix problem with S_ISLNK() on Linux */
-#if defined(TARGET_OS_LINUX) || defined(__GLIBC__)
-#undef  _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-
-/*
-  Temporary solution to solve bug#7156. Include "sys/types.h" before
-  the thread headers, else the function madvise() will not be defined
-*/
-#if defined(HAVE_SYS_TYPES_H) && ( defined(sun) || defined(__sun) )
-#include <sys/types.h>
-#endif
-
-/* The client defines this to avoid all thread code */
-#if defined(MYSQL_CLIENT_NO_THREADS) || defined(UNDEF_THREADS_HACK)
-#undef THREAD
-#undef HAVE_LINUXTHREADS
-#undef HAVE_NPTL
-#endif
-
-#ifdef HAVE_THREADS_WITHOUT_SOCKETS
-/* MIT pthreads does not work with unix sockets */
-#undef HAVE_SYS_UN_H
-#endif
-
-#define __EXTENSIONS__ 1	/* We want some extension */
-#ifndef __STDC_EXT__
-#define __STDC_EXT__ 1          /* To get large file support on hpux */
-#endif
-
-/*
-  Solaris 9 include file <sys/feature_tests.h> refers to X/Open document
-
-    System Interfaces and Headers, Issue 5
-
-  saying we should define _XOPEN_SOURCE=500 to get POSIX.1c prototypes,
-  but apparently other systems (namely FreeBSD) don't agree.
-
-  On a newer Solaris 10, the above file recognizes also _XOPEN_SOURCE=600.
-  Furthermore, it tests that if a program requires older standard
-  (_XOPEN_SOURCE<600 or _POSIX_C_SOURCE<200112L) it cannot be
-  run on a new compiler (that defines _STDC_C99) and issues an #error.
-  It's also an #error if a program requires new standard (_XOPEN_SOURCE=600
-  or _POSIX_C_SOURCE=200112L) and a compiler does not define _STDC_C99.
-
-  To add more to this mess, Sun Studio C compiler defines _STDC_C99 while
-  C++ compiler does not!
-
-  So, in a desperate attempt to get correct prototypes for both
-  C and C++ code, we define either _XOPEN_SOURCE=600 or _XOPEN_SOURCE=500
-  depending on the compiler's announced C standard support.
-
-  Cleaner solutions are welcome.
-*/
-#ifdef __sun
-#if __STDC_VERSION__ - 0 >= 199901L
-#define _XOPEN_SOURCE 600
-#else
-#define _XOPEN_SOURCE 500
-#endif
-#endif
-
-#if defined(THREAD) && !defined(__WIN__)
-#ifndef _POSIX_PTHREAD_SEMANTICS
-#define _POSIX_PTHREAD_SEMANTICS /* We want posix threads */
-#endif
-
-#if !defined(SCO)
-#define _REENTRANT	1	/* Some thread libraries require this */
-#endif
-#if !defined(_THREAD_SAFE) && !defined(_AIX)
-#define _THREAD_SAFE            /* Required for OSF1 */
-#endif
-#if defined(HPUX10) || defined(HPUX11)
-C_MODE_START			/* HPUX needs this, signal.h bug */
-#include <pthread.h>
-C_MODE_END
-#else
-#include <pthread.h>		/* AIX must have this included first */
-#endif
-#if !defined(SCO) && !defined(_REENTRANT)
-#define _REENTRANT	1	/* Threads requires reentrant code */
-#endif
-#endif /* THREAD */
-
-/* Go around some bugs in different OS and compilers */
-#ifdef _AIX			/* By soren@t.dk */
-#define _H_STRINGS
-#define _SYS_STREAM_H
-/* #define _AIX32_CURSES */	/* XXX: this breaks AIX 4.3.3 (others?). */
-#define ulonglong2double(A) my_ulonglong2double(A)
-#define my_off_t2double(A)  my_ulonglong2double(A)
-C_MODE_START
-double my_ulonglong2double(unsigned long long A);
-C_MODE_END
-#endif /* _AIX */
-
-#ifdef HAVE_BROKEN_SNPRINTF	/* HPUX 10.20 don't have this defined */
-#undef HAVE_SNPRINTF
-#endif
-#ifdef HAVE_BROKEN_PREAD
-/*
-  pread()/pwrite() are not 64 bit safe on HP-UX 11.0 without
-  installing the kernel patch PHKL_20349 or greater
-*/
-#undef HAVE_PREAD
-#undef HAVE_PWRITE
-#endif
-#if defined(HAVE_BROKEN_INLINE) && !defined(__cplusplus)
-#undef inline
-#define inline
-#endif
-
-#ifdef UNDEF_HAVE_GETHOSTBYNAME_R		/* For OSF4.x */
-#undef HAVE_GETHOSTBYNAME_R
-#endif
-#ifdef UNDEF_HAVE_INITGROUPS			/* For AIX 4.3 */
-#undef HAVE_INITGROUPS
-#endif
-
-/* gcc/egcs issues */
-
-#if defined(__GNUC) && defined(__EXCEPTIONS)
-#error "Please add -fno-exceptions to CXXFLAGS and reconfigure/recompile"
-#endif
-
-
-/* Fix a bug in gcc 2.8.0 on IRIX 6.2 */
-#if SIZEOF_LONG == 4 && defined(__LONG_MAX__) && (__GNUC__ == 2 && __GNUC_MINOR__ == 8)
-#undef __LONG_MAX__             /* Is a longlong value in gcc 2.8.0 ??? */
-#define __LONG_MAX__ 2147483647
-#endif
-
-/* egcs 1.1.2 has a problem with memcpy on Alpha */
-#if defined(__GNUC__) && defined(__alpha__) && ! (__GNUC__ > 2 || (__GNUC__ == 2 &&  __GNUC_MINOR__ >= 95))
-#define BAD_MEMCPY
-#endif
-
-#if defined(_lint) && !defined(lint)
-#define lint
-#endif
-#if SIZEOF_LONG_LONG > 4 && !defined(_LONG_LONG)
-#define _LONG_LONG 1		/* For AIX string library */
-#endif
-
-#ifndef stdin
-#include <stdio.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
-#include <math.h>
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#ifdef HAVE_FLOAT_H
-#include <float.h>
-#endif
-#ifdef HAVE_FENV_H
-#include <fenv.h> /* For fesetround() */
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_TIMEB_H
-#include <sys/timeb.h>				/* Avoid warnings on SCO */
-#endif
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif /* TIME_WITH_SYS_TIME */
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)
-#undef HAVE_ALLOCA
-#undef HAVE_ALLOCA_H
-#endif
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#include <errno.h>				/* Recommended by debian */
-/* We need the following to go around a problem with openssl on solaris */
-#if defined(HAVE_CRYPT_H)
-#include <crypt.h>
-#endif
-
-/*
-  A lot of our programs uses asserts, so better to always include it
-  This also fixes a problem when people uses DBUG_ASSERT without including
-  assert.h
-*/
-#include <assert.h>
-
-/* an assert that works at compile-time. only for constant expression */
-#ifndef __GNUC__
-#define compile_time_assert(X)  do { } while(0)
-#else
-#define compile_time_assert(X)                                  \
-  do                                                            \
-  {                                                             \
-    char compile_time_assert[(X) ? 1 : -1]                      \
-                             __attribute__ ((unused));          \
-  } while(0)
-#endif
-
-/* Go around some bugs in different OS and compilers */
-#if defined (HPUX11) && defined(_LARGEFILE_SOURCE)
-#define _LARGEFILE64_SOURCE
-#endif
-#if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H)
-#include <sys/stream.h>		/* HPUX 10.20 defines ulong here. UGLY !!! */
-#define HAVE_ULONG
-#endif
-#if defined(HPUX10) && defined(_LARGEFILE64_SOURCE) && defined(THREAD)
-/* Fix bug in setrlimit */
-#undef setrlimit
-#define setrlimit cma_setrlimit64
-#endif
-/* Declare madvise where it is not declared for C++, like Solaris */
-#if HAVE_MADVISE && !HAVE_DECL_MADVISE && defined(__cplusplus)
-extern "C" int madvise(void *addr, size_t len, int behav);
-#endif
-
-#ifdef __QNXNTO__
-/* This has to be after include limits.h */
-#define HAVE_ERRNO_AS_DEFINE
-#define HAVE_FCNTL_LOCK
-#undef  HAVE_FINITE
-#undef  LONGLONG_MIN            /* These get wrongly defined in QNX 6.2 */
-#undef  LONGLONG_MAX            /* standard system library 'limits.h' */
-#ifdef __cplusplus
-#ifndef HAVE_RINT
-#define HAVE_RINT
-#endif                          /* rint() and isnan() functions are not */
-#define rint(a) std::rint(a)    /* visible in C++ scope due to an error */
-#define isnan(a) std::isnan(a)  /* in the usr/include/math.h on QNX     */
-#endif
-#endif
-
-/* We can not live without the following defines */
-
-#define USE_MYFUNC 1		/* Must use syscall indirection */
-#define MASTER 1		/* Compile without unireg */
-#define ENGLISH 1		/* Messages in English */
-#define POSIX_MISTAKE 1		/* regexp: Fix stupid spec error */
-#define USE_REGEX 1		/* We want the use the regex library */
-/* Do not define for ultra sparcs */
-#define USE_BMOVE512 1		/* Use this unless system bmove is faster */
-
-#define QUOTE_ARG(x)		#x	/* Quote argument (before cpp) */
-#define STRINGIFY_ARG(x) QUOTE_ARG(x)	/* Quote argument, after cpp */
-
-/* Paranoid settings. Define I_AM_PARANOID if you are paranoid */
-#ifdef I_AM_PARANOID
-#define DONT_ALLOW_USER_CHANGE 1
-#define DONT_USE_MYSQL_PWD 1
-#endif
-
-/* Does the system remember a signal handler after a signal ? */
-#if !defined(HAVE_BSD_SIGNALS) && !defined(HAVE_SIGACTION)
-#define SIGNAL_HANDLER_RESET_ON_DELIVERY
-#endif
-
-/* Define void to stop lint from generating "null effekt" comments */
-#ifndef DONT_DEFINE_VOID
-#ifdef _lint
-int	__void__;
-#define VOID(X)		(__void__ = (int) (X))
-#else
-#undef VOID
-#define VOID(X)		(X)
-#endif
-#endif /* DONT_DEFINE_VOID */
-
-#if defined(_lint) || defined(FORCE_INIT_OF_VARS)
-#define LINT_INIT(var)	var=0			/* No uninitialize-warning */
-#else
-#define LINT_INIT(var)
-#endif
-
-/* 
-   Suppress uninitialized variable warning without generating code.
-
-   The _cplusplus is a temporary workaround for C++ code pending a fix
-   for a g++ bug (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34772). 
-*/
-#if defined(_lint) || defined(FORCE_INIT_OF_VARS) || defined(__cplusplus) || \
-  !defined(__GNUC__)
-#define UNINIT_VAR(x) x= 0
-#else
-#define UNINIT_VAR(x) x= x
-#endif
-
-/* Define some useful general macros */
-#if !defined(max)
-#define max(a, b)	((a) > (b) ? (a) : (b))
-#define min(a, b)	((a) < (b) ? (a) : (b))
-#endif
-
-#if !defined(HAVE_UINT)
-#undef HAVE_UINT
-#define HAVE_UINT
-typedef unsigned int uint;
-typedef unsigned short ushort;
-#endif
-
-#define CMP_NUM(a,b)    (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1)
-#define sgn(a)		(((a) < 0) ? -1 : ((a) > 0) ? 1 : 0)
-#define swap_variables(t, a, b) { t dummy; dummy= a; a= b; b= dummy; }
-#define test(a)		((a) ? 1 : 0)
-#define set_if_bigger(a,b)  do { if ((a) < (b)) (a)=(b); } while(0)
-#define set_if_smaller(a,b) do { if ((a) > (b)) (a)=(b); } while(0)
-#define test_all_bits(a,b) (((a) & (b)) == (b))
-#define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1))
-#define array_elements(A) ((uint) (sizeof(A)/sizeof(A[0])))
-
-/* Define some general constants */
-#ifndef TRUE
-#define TRUE		(1)	/* Logical true */
-#define FALSE		(0)	/* Logical false */
-#endif
-
-#if defined(__GNUC__)
-#define function_volatile	volatile
-#define my_reinterpret_cast(A) reinterpret_cast<A>
-#define my_const_cast(A) const_cast<A>
-# ifndef GCC_VERSION
-#  define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
-# endif
-#elif !defined(my_reinterpret_cast)
-#define my_reinterpret_cast(A) (A)
-#define my_const_cast(A) (A)
-#endif
-
-#include <my_attribute.h>
-
-/*
-  Wen using the embedded library, users might run into link problems,
-  duplicate declaration of __cxa_pure_virtual, solved by declaring it a
-  weak symbol.
-*/
-#if defined(USE_MYSYS_NEW) && ! defined(DONT_DECLARE_CXA_PURE_VIRTUAL)
-C_MODE_START
-int __cxa_pure_virtual () __attribute__ ((weak));
-C_MODE_END
-#endif
-
-/* From old s-system.h */
-
-/*
-  Support macros for non ansi & other old compilers. Since such
-  things are no longer supported we do nothing. We keep then since
-  some of our code may still be needed to upgrade old customers.
-*/
-#define _VARARGS(X) X
-#define _STATIC_VARARGS(X) X
-
-/* The DBUG_ON flag always takes precedence over default DBUG_OFF */
-#if defined(DBUG_ON) && defined(DBUG_OFF)
-#undef DBUG_OFF
-#endif
-
-/* We might be forced to turn debug off, if not turned off already */
-#if (defined(FORCE_DBUG_OFF) || defined(_lint)) && !defined(DBUG_OFF)
-#  define DBUG_OFF
-#  ifdef DBUG_ON
-#    undef DBUG_ON
-#  endif
-#endif
-
-#include <my_dbug.h>
-
-#define MIN_ARRAY_SIZE	0	/* Zero or One. Gcc allows zero*/
-#define ASCII_BITS_USED 8	/* Bit char used */
-#define NEAR_F			/* No near function handling */
-
-/* Some types that is different between systems */
-
-typedef int	File;		/* File descriptor */
-#ifndef Socket_defined
-typedef int	my_socket;	/* File descriptor for sockets */
-#define INVALID_SOCKET -1
-#endif
-/* Type for fuctions that handles signals */
-#define sig_handler RETSIGTYPE
-C_MODE_START
-typedef void	(*sig_return)();/* Returns type from signal */
-C_MODE_END
-#if defined(__GNUC__) && !defined(_lint)
-typedef char	pchar;		/* Mixed prototypes can take char */
-typedef char	puchar;		/* Mixed prototypes can take char */
-typedef char	pbool;		/* Mixed prototypes can take char */
-typedef short	pshort;		/* Mixed prototypes can take short int */
-typedef float	pfloat;		/* Mixed prototypes can take float */
-#else
-typedef int	pchar;		/* Mixed prototypes can't take char */
-typedef uint	puchar;		/* Mixed prototypes can't take char */
-typedef int	pbool;		/* Mixed prototypes can't take char */
-typedef int	pshort;		/* Mixed prototypes can't take short int */
-typedef double	pfloat;		/* Mixed prototypes can't take float */
-#endif
-C_MODE_START
-typedef int	(*qsort_cmp)(const void *,const void *);
-typedef int	(*qsort_cmp2)(void*, const void *,const void *);
-C_MODE_END
-#define qsort_t RETQSORTTYPE	/* Broken GCC cant handle typedef !!!! */
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-typedef SOCKET_SIZE_TYPE size_socket;
-
-#ifndef SOCKOPT_OPTLEN_TYPE
-#define SOCKOPT_OPTLEN_TYPE size_socket
-#endif
-
-/* file create flags */
-
-#ifndef O_SHARE			/* Probably not windows */
-#define O_SHARE		0	/* Flag to my_open for shared files */
-#ifndef O_BINARY
-#define O_BINARY	0	/* Flag to my_open for binary files */
-#endif
-#ifndef FILE_BINARY
-#define FILE_BINARY	O_BINARY /* Flag to my_fopen for binary streams */
-#endif
-#ifdef HAVE_FCNTL
-#define HAVE_FCNTL_LOCK
-#define F_TO_EOF	0L	/* Param to lockf() to lock rest of file */
-#endif
-#endif /* O_SHARE */
-
-#ifndef O_TEMPORARY
-#define O_TEMPORARY	0
-#endif
-#ifndef O_SHORT_LIVED
-#define O_SHORT_LIVED	0
-#endif
-#ifndef O_NOFOLLOW
-#define O_NOFOLLOW      0
-#endif
-
-/* additional file share flags for win32 */
-#ifdef __WIN__
-#define _SH_DENYRWD     0x110    /* deny read/write mode & delete */
-#define _SH_DENYWRD     0x120    /* deny write mode & delete      */
-#define _SH_DENYRDD     0x130    /* deny read mode & delete       */
-#define _SH_DENYDEL     0x140    /* deny delete only              */
-#endif /* __WIN__ */
-
-
-/* #define USE_RECORD_LOCK	*/
-
-	/* Unsigned types supported by the compiler */
-#define UNSINT8			/* unsigned int8 (char) */
-#define UNSINT16		/* unsigned int16 */
-#define UNSINT32		/* unsigned int32 */
-
-	/* General constants */
-#define FN_LEN		256	/* Max file name len */
-#define FN_HEADLEN	253	/* Max length of filepart of file name */
-#define FN_EXTLEN	20	/* Max length of extension (part of FN_LEN) */
-#define FN_REFLEN	512	/* Max length of full path-name */
-#define FN_EXTCHAR	'.'
-#define FN_HOMELIB	'~'	/* ~/ is used as abbrev for home dir */
-#define FN_CURLIB	'.'	/* ./ is used as abbrev for current dir */
-#define FN_PARENTDIR	".."	/* Parent directory; Must be a string */
-
-#ifndef FN_LIBCHAR
-#define FN_LIBCHAR	'/'
-#define FN_ROOTDIR	"/"
-#endif
-#define MY_NFILE	64	/* This is only used to save filenames */
-#ifndef OS_FILE_LIMIT
-#define OS_FILE_LIMIT	UINT_MAX
-#endif
-
-/* #define EXT_IN_LIBNAME     */
-/* #define FN_NO_CASE_SENCE   */
-/* #define FN_UPPER_CASE TRUE */
-
-/*
-  Io buffer size; Must be a power of 2 and a multiple of 512. May be
-  smaller what the disk page size. This influences the speed of the
-  isam btree library. eg to big to slow.
-*/
-#define IO_SIZE			4096
-/*
-  How much overhead does malloc have. The code often allocates
-  something like 1024-MALLOC_OVERHEAD bytes
-*/
-#ifdef SAFEMALLOC
-#define MALLOC_OVERHEAD (8+24+4)
-#else
-#define MALLOC_OVERHEAD 8
-#endif
-	/* get memory in huncs */
-#define ONCE_ALLOC_INIT		(uint) (4096-MALLOC_OVERHEAD)
-	/* Typical record cash */
-#define RECORD_CACHE_SIZE	(uint) (64*1024-MALLOC_OVERHEAD)
-	/* Typical key cash */
-#define KEY_CACHE_SIZE		(uint) (8*1024*1024-MALLOC_OVERHEAD)
-	/* Default size of a key cache block  */
-#define KEY_CACHE_BLOCK_SIZE	(uint) 1024
-
-
-	/* Some things that this system doesn't have */
-
-#define NO_HASH			/* Not needed anymore */
-#ifdef __WIN__
-#define NO_DIR_LIBRARY		/* Not standar dir-library */
-#define USE_MY_STAT_STRUCT	/* For my_lib */
-#endif
-
-/* Some defines of functions for portability */
-
-#undef remove		/* Crashes MySQL on SCO 5.0.0 */
-#ifndef __WIN__
-#define closesocket(A)	close(A)
-#ifndef ulonglong2double
-#define ulonglong2double(A) ((double) (ulonglong) (A))
-#define my_off_t2double(A)  ((double) (my_off_t) (A))
-#endif
-#ifndef double2ulonglong
-#define double2ulonglong(A) ((ulonglong) (double) (A))
-#endif
-#endif
-
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-#endif
-#define ulong_to_double(X) ((double) (ulong) (X))
-#define SET_STACK_SIZE(X)	/* Not needed on real machines */
-
-#ifndef STACK_DIRECTION
-#error "please add -DSTACK_DIRECTION=1 or -1 to your CPPFLAGS"
-#endif
-
-#if !defined(HAVE_STRTOK_R)
-#define strtok_r(A,B,C) strtok((A),(B))
-#endif
-
-/* This is from the old m-machine.h file */
-
-#if SIZEOF_LONG_LONG > 4
-#define HAVE_LONG_LONG 1
-#endif
-
-/*
-  Some pre-ANSI-C99 systems like AIX 5.1 and Linux/GCC 2.95 define
-  ULONGLONG_MAX, LONGLONG_MIN, LONGLONG_MAX; we use them if they're defined.
-  Also on Windows we define these constants by hand in config-win.h.
-*/
-
-#if defined(HAVE_LONG_LONG) && !defined(LONGLONG_MIN)
-#define LONGLONG_MIN	((long long) 0x8000000000000000LL)
-#define LONGLONG_MAX	((long long) 0x7FFFFFFFFFFFFFFFLL)
-#endif
-
-#if defined(HAVE_LONG_LONG) && !defined(ULONGLONG_MAX)
-/* First check for ANSI C99 definition: */
-#ifdef ULLONG_MAX
-#define ULONGLONG_MAX  ULLONG_MAX
-#else
-#define ULONGLONG_MAX ((unsigned long long)(~0ULL))
-#endif
-#endif /* defined (HAVE_LONG_LONG) && !defined(ULONGLONG_MAX)*/
-
-#define INT_MIN32       (~0x7FFFFFFFL)
-#define INT_MAX32       0x7FFFFFFFL
-#define UINT_MAX32      0xFFFFFFFFL
-#define INT_MIN24       (~0x007FFFFF)
-#define INT_MAX24       0x007FFFFF
-#define UINT_MAX24      0x00FFFFFF
-#define INT_MIN16       (~0x7FFF)
-#define INT_MAX16       0x7FFF
-#define UINT_MAX16      0xFFFF
-#define INT_MIN8        (~0x7F)
-#define INT_MAX8        0x7F
-#define UINT_MAX8       0xFF
-
-/* From limits.h instead */
-#ifndef DBL_MIN
-#define DBL_MIN		4.94065645841246544e-324
-#define FLT_MIN		((float)1.40129846432481707e-45)
-#endif
-#ifndef DBL_MAX
-#define DBL_MAX		1.79769313486231470e+308
-#define FLT_MAX		((float)3.40282346638528860e+38)
-#endif
-#ifndef SIZE_T_MAX
-#define SIZE_T_MAX      (~((size_t) 0))
-#endif
-
-#ifndef isfinite
-#ifdef HAVE_FINITE
-#define isfinite(x) finite(x)
-#else
-#define finite(x) (1.0 / fabs(x) > 0.0)
-#endif /* HAVE_FINITE */
-#endif /* isfinite */
-
-#ifndef HAVE_ISNAN
-#define isnan(x) ((x) != (x))
-#endif
-
-#ifdef HAVE_ISINF
-/* Check if C compiler is affected by GCC bug #39228 */
-#if !defined(__cplusplus) && defined(HAVE_BROKEN_ISINF)
-/* Force store/reload of the argument to/from a 64-bit double */
-static inline double my_isinf(double x)
-{
-  volatile double t= x;
-  return isinf(t);
-}
-#else
-/* System-provided isinf() is available and safe to use */
-#define my_isinf(X) isinf(X)
-#endif
-#else /* !HAVE_ISINF */
-#define my_isinf(X) (!finite(X) && !isnan(X))
-#endif
-
-/* Define missing math constants. */
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-#ifndef M_E
-#define M_E 2.7182818284590452354
-#endif
-#ifndef M_LN2
-#define M_LN2 0.69314718055994530942
-#endif
-
-/*
-  Max size that must be added to a so that we know Size to make
-  adressable obj.
-*/
-#if SIZEOF_CHARP == 4
-typedef long		my_ptrdiff_t;
-#else
-typedef long long	my_ptrdiff_t;
-#endif
-
-#define MY_ALIGN(A,L)	(((A) + (L) - 1) & ~((L) - 1))
-#define ALIGN_SIZE(A)	MY_ALIGN((A),sizeof(double))
-/* Size to make adressable obj. */
-#define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A),sizeof(t)))
-			 /* Offset of field f in structure t */
-#define OFFSET(t, f)	((size_t)(char *)&((t *)0)->f)
-#define ADD_TO_PTR(ptr,size,type) (type) ((uchar*) (ptr)+size)
-#define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((uchar*) (A) - (uchar*) (B))
-
-#define MY_DIV_UP(A, B) (((A) + (B) - 1) / (B))
-#define MY_ALIGNED_BYTE_ARRAY(N, S, T) T N[MY_DIV_UP(S, sizeof(T))]
-
-/*
-  Custom version of standard offsetof() macro which can be used to get
-  offsets of members in class for non-POD types (according to the current
-  version of C++ standard offsetof() macro can't be used in such cases and
-  attempt to do so causes warnings to be emitted, OTOH in many cases it is
-  still OK to assume that all instances of the class has the same offsets
-  for the same members).
-
-  This is temporary solution which should be removed once File_parser class
-  and related routines are refactored.
-*/
-
-#define my_offsetof(TYPE, MEMBER) \
-        ((size_t)((char *)&(((TYPE *)0x10)->MEMBER) - (char*)0x10))
-
-#define NullS		(char *) 0
-/* Nowdays we do not support MessyDos */
-#ifndef NEAR
-#define NEAR				/* Who needs segments ? */
-#define FAR				/* On a good machine */
-#ifndef HUGE_PTR
-#define HUGE_PTR
-#endif
-#endif
-#if defined(__IBMC__) || defined(__IBMCPP__)
-/* This was  _System _Export but caused a lot of warnings on _AIX43 */
-#define STDCALL
-#elif !defined( STDCALL)
-#define STDCALL
-#endif
-
-/* Typdefs for easyier portability */
-
-#ifndef HAVE_UCHAR
-typedef unsigned char	uchar;	/* Short for unsigned char */
-#endif
-
-#ifndef HAVE_INT8
-typedef signed char int8;       /* Signed integer >= 8  bits */
-#endif
-#ifndef HAVE_UINT8
-typedef unsigned char uint8;    /* Unsigned integer >= 8  bits */
-#endif
-#ifndef HAVE_INT16
-typedef short int16;
-#endif
-#ifndef HAVE_UINT16
-typedef unsigned short uint16;
-#endif
-#if SIZEOF_INT == 4
-#ifndef HAVE_INT32
-typedef int int32;
-#endif
-#ifndef HAVE_UINT32
-typedef unsigned int uint32;
-#endif
-#elif SIZEOF_LONG == 4
-#ifndef HAVE_INT32
-typedef long int32;
-#endif
-#ifndef HAVE_UINT32
-typedef unsigned long uint32;
-#endif
-#else
-#error Neither int or long is of 4 bytes width
-#endif
-
-#if !defined(HAVE_ULONG) && !defined(__USE_MISC)
-typedef unsigned long	ulong;		  /* Short for unsigned long */
-#endif
-#ifndef longlong_defined
-/* 
-  Using [unsigned] long long is preferable as [u]longlong because we use 
-  [unsigned] long long unconditionally in many places, 
-  for example in constants with [U]LL suffix.
-*/
-#if defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8
-typedef unsigned long long int ulonglong; /* ulong or unsigned long long */
-typedef long long int	longlong;
-#else
-typedef unsigned long	ulonglong;	  /* ulong or unsigned long long */
-typedef long		longlong;
-#endif
-#endif
-#ifndef HAVE_INT64
-typedef longlong int64;
-#endif
-#ifndef HAVE_UINT64
-typedef ulonglong uint64;
-#endif
-
-#if defined(NO_CLIENT_LONG_LONG)
-typedef unsigned long my_ulonglong;
-#elif defined (__WIN__)
-typedef unsigned __int64 my_ulonglong;
-#else
-typedef unsigned long long my_ulonglong;
-#endif
-
-#if SIZEOF_CHARP == SIZEOF_INT
-typedef int intptr;
-#elif SIZEOF_CHARP == SIZEOF_LONG
-typedef long intptr;
-#elif SIZEOF_CHARP == SIZEOF_LONG_LONG
-typedef long long intptr;
-#else
-#error sizeof(void *) is neither sizeof(int) nor sizeof(long) nor sizeof(long long)
-#endif
-
-#define MY_ERRPTR ((void*)(intptr)1)
-
-#ifdef USE_RAID
-/*
-  The following is done with a if to not get problems with pre-processors
-  with late define evaluation
-*/
-#if SIZEOF_OFF_T == 4
-#define SYSTEM_SIZEOF_OFF_T 4
-#else
-#define SYSTEM_SIZEOF_OFF_T 8
-#endif
-#undef  SIZEOF_OFF_T
-#define SIZEOF_OFF_T	    8
-#else
-#define SYSTEM_SIZEOF_OFF_T SIZEOF_OFF_T
-#endif /* USE_RAID */
-
-#if SIZEOF_OFF_T > 4
-typedef ulonglong my_off_t;
-#else
-typedef unsigned long my_off_t;
-#endif
-#define MY_FILEPOS_ERROR	(~(my_off_t) 0)
-#if !defined(__WIN__)
-typedef off_t os_off_t;
-#endif
-
-#if defined(__WIN__)
-#define socket_errno	WSAGetLastError()
-#define SOCKET_EINTR	WSAEINTR
-#define SOCKET_EAGAIN	WSAEINPROGRESS
-#define SOCKET_ETIMEDOUT WSAETIMEDOUT
-#define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK
-#define SOCKET_EADDRINUSE WSAEADDRINUSE
-#define SOCKET_ENFILE	ENFILE
-#define SOCKET_EMFILE	EMFILE
-#else /* Unix */
-#define socket_errno	errno
-#define closesocket(A)	close(A)
-#define SOCKET_EINTR	EINTR
-#define SOCKET_EAGAIN	EAGAIN
-#define SOCKET_ETIMEDOUT SOCKET_EINTR
-#define SOCKET_EWOULDBLOCK EWOULDBLOCK
-#define SOCKET_EADDRINUSE EADDRINUSE
-#define SOCKET_ENFILE	ENFILE
-#define SOCKET_EMFILE	EMFILE
-#endif
-
-typedef uint8		int7;	/* Most effective integer 0 <= x <= 127 */
-typedef short		int15;	/* Most effective integer 0 <= x <= 32767 */
-typedef int		myf;	/* Type of MyFlags in my_funcs */
-typedef char		my_bool; /* Small bool */
-#if !defined(bool) && (!defined(HAVE_BOOL) || !defined(__cplusplus))
-typedef char		bool;	/* Ordinary boolean values 0 1 */
-#endif
-	/* Macros for converting *constants* to the right type */
-#define INT8(v)		(int8) (v)
-#define INT16(v)	(int16) (v)
-#define INT32(v)	(int32) (v)
-#define MYF(v)		(myf) (v)
-
-#ifndef LL
-#ifdef HAVE_LONG_LONG
-#define LL(A) A ## LL
-#else
-#define LL(A) A ## L
-#endif
-#endif
-
-#ifndef ULL
-#ifdef HAVE_LONG_LONG
-#define ULL(A) A ## ULL
-#else
-#define ULL(A) A ## UL
-#endif
-#endif
-
-/*
-  Defines to make it possible to prioritize register assignments. No
-  longer that important with modern compilers.
-*/
-#ifndef USING_X
-#define reg1 register
-#define reg2 register
-#define reg3 register
-#define reg4 register
-#define reg5 register
-#define reg6 register
-#define reg7 register
-#define reg8 register
-#define reg9 register
-#define reg10 register
-#define reg11 register
-#define reg12 register
-#define reg13 register
-#define reg14 register
-#define reg15 register
-#define reg16 register
-#endif
-
-/*
-  Sometimes we want to make sure that the variable is not put into
-  a register in debugging mode so we can see its value in the core
-*/
-
-#ifndef DBUG_OFF
-#define dbug_volatile volatile
-#else
-#define dbug_volatile
-#endif
-
-/* Some helper macros */
-#define YESNO(X) ((X) ? "yes" : "no")
-
-/* Defines for time function */
-#define SCALE_SEC	100
-#define SCALE_USEC	10000
-#define MY_HOW_OFTEN_TO_ALARM	2	/* How often we want info on screen */
-#define MY_HOW_OFTEN_TO_WRITE	1000	/* How often we want info on screen */
-
-
-
-/*
-  Define-funktions for reading and storing in machine independent format
-  (low byte first)
-*/
-
-/* Optimized store functions for Intel x86 */
-#if defined(__i386__) || defined(_WIN32)
-#define sint2korr(A)	(*((int16 *) (A)))
-#define sint3korr(A)	((int32) ((((uchar) (A)[2]) & 128) ? \
-				  (((uint32) 255L << 24) | \
-				   (((uint32) (uchar) (A)[2]) << 16) |\
-				   (((uint32) (uchar) (A)[1]) << 8) | \
-				   ((uint32) (uchar) (A)[0])) : \
-				  (((uint32) (uchar) (A)[2]) << 16) |\
-				  (((uint32) (uchar) (A)[1]) << 8) | \
-				  ((uint32) (uchar) (A)[0])))
-#define sint4korr(A)	(*((long *) (A)))
-#define uint2korr(A)	(*((uint16 *) (A)))
-#if defined(HAVE_purify) && !defined(_WIN32)
-#define uint3korr(A)	(uint32) (((uint32) ((uchar) (A)[0])) +\
-				  (((uint32) ((uchar) (A)[1])) << 8) +\
-				  (((uint32) ((uchar) (A)[2])) << 16))
-#else
-/*
-   ATTENTION !
-   
-    Please, note, uint3korr reads 4 bytes (not 3) !
-    It means, that you have to provide enough allocated space !
-*/
-#define uint3korr(A)	(long) (*((unsigned int *) (A)) & 0xFFFFFF)
-#endif /* HAVE_purify && !_WIN32 */
-#define uint4korr(A)	(*((uint32 *) (A)))
-#define uint5korr(A)	((ulonglong)(((uint32) ((uchar) (A)[0])) +\
-				    (((uint32) ((uchar) (A)[1])) << 8) +\
-				    (((uint32) ((uchar) (A)[2])) << 16) +\
-				    (((uint32) ((uchar) (A)[3])) << 24)) +\
-				    (((ulonglong) ((uchar) (A)[4])) << 32))
-#define uint6korr(A)	((ulonglong)(((uint32)    ((uchar) (A)[0]))          + \
-                                     (((uint32)    ((uchar) (A)[1])) << 8)   + \
-                                     (((uint32)    ((uchar) (A)[2])) << 16)  + \
-                                     (((uint32)    ((uchar) (A)[3])) << 24)) + \
-                         (((ulonglong) ((uchar) (A)[4])) << 32) +       \
-                         (((ulonglong) ((uchar) (A)[5])) << 40))
-#define uint8korr(A)	(*((ulonglong *) (A)))
-#define sint8korr(A)	(*((longlong *) (A)))
-#define int2store(T,A)	*((uint16*) (T))= (uint16) (A)
-#define int3store(T,A)  do { *(T)=  (uchar) ((A));\
-                            *(T+1)=(uchar) (((uint) (A) >> 8));\
-                            *(T+2)=(uchar) (((A) >> 16)); } while (0)
-#define int4store(T,A)	*((long *) (T))= (long) (A)
-#define int5store(T,A)  do { *(T)= (uchar)((A));\
-                             *((T)+1)=(uchar) (((A) >> 8));\
-                             *((T)+2)=(uchar) (((A) >> 16));\
-                             *((T)+3)=(uchar) (((A) >> 24)); \
-                             *((T)+4)=(uchar) (((A) >> 32)); } while(0)
-#define int6store(T,A)  do { *(T)=    (uchar)((A));          \
-                             *((T)+1)=(uchar) (((A) >> 8));  \
-                             *((T)+2)=(uchar) (((A) >> 16)); \
-                             *((T)+3)=(uchar) (((A) >> 24)); \
-                             *((T)+4)=(uchar) (((A) >> 32)); \
-                             *((T)+5)=(uchar) (((A) >> 40)); } while(0)
-#define int8store(T,A)	*((ulonglong *) (T))= (ulonglong) (A)
-
-typedef union {
-  double v;
-  long m[2];
-} doubleget_union;
-#define doubleget(V,M)	\
-do { doubleget_union _tmp; \
-     _tmp.m[0] = *((long*)(M)); \
-     _tmp.m[1] = *(((long*) (M))+1); \
-     (V) = _tmp.v; } while(0)
-#define doublestore(T,V) do { *((long *) T) = ((doubleget_union *)&V)->m[0]; \
-			     *(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; \
-                         } while (0)
-#define float4get(V,M)   do { *((float *) &(V)) = *((float*) (M)); } while(0)
-#define float8get(V,M)   doubleget((V),(M))
-#define float4store(V,M) memcpy((uchar*) V,(uchar*) (&M),sizeof(float))
-#define floatstore(T,V)  memcpy((uchar*)(T), (uchar*)(&V),sizeof(float))
-#define floatget(V,M)    memcpy((uchar*) &V,(uchar*) (M),sizeof(float))
-#define float8store(V,M) doublestore((V),(M))
-#else
-
-/*
-  We're here if it's not a IA-32 architecture (Win32 and UNIX IA-32 defines
-  were done before)
-*/
-#define sint2korr(A)	(int16) (((int16) ((uchar) (A)[0])) +\
-				 ((int16) ((int16) (A)[1]) << 8))
-#define sint3korr(A)	((int32) ((((uchar) (A)[2]) & 128) ? \
-				  (((uint32) 255L << 24) | \
-				   (((uint32) (uchar) (A)[2]) << 16) |\
-				   (((uint32) (uchar) (A)[1]) << 8) | \
-				   ((uint32) (uchar) (A)[0])) : \
-				  (((uint32) (uchar) (A)[2]) << 16) |\
-				  (((uint32) (uchar) (A)[1]) << 8) | \
-				  ((uint32) (uchar) (A)[0])))
-#define sint4korr(A)	(int32) (((int32) ((uchar) (A)[0])) +\
-				(((int32) ((uchar) (A)[1]) << 8)) +\
-				(((int32) ((uchar) (A)[2]) << 16)) +\
-				(((int32) ((int16) (A)[3]) << 24)))
-#define sint8korr(A)	(longlong) uint8korr(A)
-#define uint2korr(A)	(uint16) (((uint16) ((uchar) (A)[0])) +\
-				  ((uint16) ((uchar) (A)[1]) << 8))
-#define uint3korr(A)	(uint32) (((uint32) ((uchar) (A)[0])) +\
-				  (((uint32) ((uchar) (A)[1])) << 8) +\
-				  (((uint32) ((uchar) (A)[2])) << 16))
-#define uint4korr(A)	(uint32) (((uint32) ((uchar) (A)[0])) +\
-				  (((uint32) ((uchar) (A)[1])) << 8) +\
-				  (((uint32) ((uchar) (A)[2])) << 16) +\
-				  (((uint32) ((uchar) (A)[3])) << 24))
-#define uint5korr(A)	((ulonglong)(((uint32) ((uchar) (A)[0])) +\
-				    (((uint32) ((uchar) (A)[1])) << 8) +\
-				    (((uint32) ((uchar) (A)[2])) << 16) +\
-				    (((uint32) ((uchar) (A)[3])) << 24)) +\
-				    (((ulonglong) ((uchar) (A)[4])) << 32))
-#define uint6korr(A)	((ulonglong)(((uint32)    ((uchar) (A)[0]))          + \
-                                     (((uint32)    ((uchar) (A)[1])) << 8)   + \
-                                     (((uint32)    ((uchar) (A)[2])) << 16)  + \
-                                     (((uint32)    ((uchar) (A)[3])) << 24)) + \
-                         (((ulonglong) ((uchar) (A)[4])) << 32) +       \
-                         (((ulonglong) ((uchar) (A)[5])) << 40))
-#define uint8korr(A)	((ulonglong)(((uint32) ((uchar) (A)[0])) +\
-				    (((uint32) ((uchar) (A)[1])) << 8) +\
-				    (((uint32) ((uchar) (A)[2])) << 16) +\
-				    (((uint32) ((uchar) (A)[3])) << 24)) +\
-			(((ulonglong) (((uint32) ((uchar) (A)[4])) +\
-				    (((uint32) ((uchar) (A)[5])) << 8) +\
-				    (((uint32) ((uchar) (A)[6])) << 16) +\
-				    (((uint32) ((uchar) (A)[7])) << 24))) <<\
-				    32))
-#define int2store(T,A)       do { uint def_temp= (uint) (A) ;\
-                                  *((uchar*) (T))=  (uchar)(def_temp); \
-                                   *((uchar*) (T)+1)=(uchar)((def_temp >> 8)); \
-                             } while(0)
-#define int3store(T,A)       do { /*lint -save -e734 */\
-                                  *((uchar*)(T))=(uchar) ((A));\
-                                  *((uchar*) (T)+1)=(uchar) (((A) >> 8));\
-                                  *((uchar*)(T)+2)=(uchar) (((A) >> 16)); \
-                                  /*lint -restore */} while(0)
-#define int4store(T,A)       do { *((char *)(T))=(char) ((A));\
-                                  *(((char *)(T))+1)=(char) (((A) >> 8));\
-                                  *(((char *)(T))+2)=(char) (((A) >> 16));\
-                                  *(((char *)(T))+3)=(char) (((A) >> 24)); } while(0)
-#define int5store(T,A)       do { *((char *)(T))=     (char)((A));  \
-                                  *(((char *)(T))+1)= (char)(((A) >> 8)); \
-                                  *(((char *)(T))+2)= (char)(((A) >> 16)); \
-                                  *(((char *)(T))+3)= (char)(((A) >> 24)); \
-                                  *(((char *)(T))+4)= (char)(((A) >> 32)); \
-		                } while(0)
-#define int6store(T,A)       do { *((char *)(T))=     (char)((A)); \
-                                  *(((char *)(T))+1)= (char)(((A) >> 8)); \
-                                  *(((char *)(T))+2)= (char)(((A) >> 16)); \
-                                  *(((char *)(T))+3)= (char)(((A) >> 24)); \
-                                  *(((char *)(T))+4)= (char)(((A) >> 32)); \
-                                  *(((char *)(T))+5)= (char)(((A) >> 40)); \
-                                } while(0)
-#define int8store(T,A)       do { uint def_temp= (uint) (A), def_temp2= (uint) ((A) >> 32); \
-                                  int4store((T),def_temp); \
-                                  int4store((T+4),def_temp2); } while(0)
-#ifdef WORDS_BIGENDIAN
-#define float4store(T,A) do { *(T)= ((uchar *) &A)[3];\
-                              *((T)+1)=(char) ((uchar *) &A)[2];\
-                              *((T)+2)=(char) ((uchar *) &A)[1];\
-                              *((T)+3)=(char) ((uchar *) &A)[0]; } while(0)
-
-#define float4get(V,M)   do { float def_temp;\
-                              ((uchar*) &def_temp)[0]=(M)[3];\
-                              ((uchar*) &def_temp)[1]=(M)[2];\
-                              ((uchar*) &def_temp)[2]=(M)[1];\
-                              ((uchar*) &def_temp)[3]=(M)[0];\
-                              (V)=def_temp; } while(0)
-#define float8store(T,V) do { *(T)= ((uchar *) &V)[7];\
-                              *((T)+1)=(char) ((uchar *) &V)[6];\
-                              *((T)+2)=(char) ((uchar *) &V)[5];\
-                              *((T)+3)=(char) ((uchar *) &V)[4];\
-                              *((T)+4)=(char) ((uchar *) &V)[3];\
-                              *((T)+5)=(char) ((uchar *) &V)[2];\
-                              *((T)+6)=(char) ((uchar *) &V)[1];\
-                              *((T)+7)=(char) ((uchar *) &V)[0]; } while(0)
-
-#define float8get(V,M)   do { double def_temp;\
-                              ((uchar*) &def_temp)[0]=(M)[7];\
-                              ((uchar*) &def_temp)[1]=(M)[6];\
-                              ((uchar*) &def_temp)[2]=(M)[5];\
-                              ((uchar*) &def_temp)[3]=(M)[4];\
-                              ((uchar*) &def_temp)[4]=(M)[3];\
-                              ((uchar*) &def_temp)[5]=(M)[2];\
-                              ((uchar*) &def_temp)[6]=(M)[1];\
-                              ((uchar*) &def_temp)[7]=(M)[0];\
-                              (V) = def_temp; } while(0)
-#else
-#define float4get(V,M)   memcpy_fixed((uchar*) &V,(uchar*) (M),sizeof(float))
-#define float4store(V,M) memcpy_fixed((uchar*) V,(uchar*) (&M),sizeof(float))
-
-#if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN)
-#define doublestore(T,V) do { *(((char*)T)+0)=(char) ((uchar *) &V)[4];\
-                              *(((char*)T)+1)=(char) ((uchar *) &V)[5];\
-                              *(((char*)T)+2)=(char) ((uchar *) &V)[6];\
-                              *(((char*)T)+3)=(char) ((uchar *) &V)[7];\
-                              *(((char*)T)+4)=(char) ((uchar *) &V)[0];\
-                              *(((char*)T)+5)=(char) ((uchar *) &V)[1];\
-                              *(((char*)T)+6)=(char) ((uchar *) &V)[2];\
-                              *(((char*)T)+7)=(char) ((uchar *) &V)[3]; }\
-                         while(0)
-#define doubleget(V,M)   do { double def_temp;\
-                              ((uchar*) &def_temp)[0]=(M)[4];\
-                              ((uchar*) &def_temp)[1]=(M)[5];\
-                              ((uchar*) &def_temp)[2]=(M)[6];\
-                              ((uchar*) &def_temp)[3]=(M)[7];\
-                              ((uchar*) &def_temp)[4]=(M)[0];\
-                              ((uchar*) &def_temp)[5]=(M)[1];\
-                              ((uchar*) &def_temp)[6]=(M)[2];\
-                              ((uchar*) &def_temp)[7]=(M)[3];\
-                              (V) = def_temp; } while(0)
-#endif /* __FLOAT_WORD_ORDER */
-
-#define float8get(V,M)   doubleget((V),(M))
-#define float8store(V,M) doublestore((V),(M))
-#endif /* WORDS_BIGENDIAN */
-
-#endif /* __i386__ OR _WIN32 */
-
-/*
-  Macro for reading 32-bit integer from network byte order (big-endian)
-  from unaligned memory location.
-*/
-#define int4net(A)        (int32) (((uint32) ((uchar) (A)[3]))        |\
-				  (((uint32) ((uchar) (A)[2])) << 8)  |\
-				  (((uint32) ((uchar) (A)[1])) << 16) |\
-				  (((uint32) ((uchar) (A)[0])) << 24))
-/*
-  Define-funktions for reading and storing in machine format from/to
-  short/long to/from some place in memory V should be a (not
-  register) variable, M is a pointer to byte
-*/
-
-#ifdef WORDS_BIGENDIAN
-
-#define ushortget(V,M)  do { V = (uint16) (((uint16) ((uchar) (M)[1]))+\
-                                 ((uint16) ((uint16) (M)[0]) << 8)); } while(0)
-#define shortget(V,M)   do { V = (short) (((short) ((uchar) (M)[1]))+\
-                                 ((short) ((short) (M)[0]) << 8)); } while(0)
-#define longget(V,M)    do { int32 def_temp;\
-                             ((uchar*) &def_temp)[0]=(M)[0];\
-                             ((uchar*) &def_temp)[1]=(M)[1];\
-                             ((uchar*) &def_temp)[2]=(M)[2];\
-                             ((uchar*) &def_temp)[3]=(M)[3];\
-                             (V)=def_temp; } while(0)
-#define ulongget(V,M)   do { uint32 def_temp;\
-                            ((uchar*) &def_temp)[0]=(M)[0];\
-                            ((uchar*) &def_temp)[1]=(M)[1];\
-                            ((uchar*) &def_temp)[2]=(M)[2];\
-                            ((uchar*) &def_temp)[3]=(M)[3];\
-                            (V)=def_temp; } while(0)
-#define shortstore(T,A) do { uint def_temp=(uint) (A) ;\
-                             *(((char*)T)+1)=(char)(def_temp); \
-                             *(((char*)T)+0)=(char)(def_temp >> 8); } while(0)
-#define longstore(T,A)  do { *(((char*)T)+3)=((A));\
-                             *(((char*)T)+2)=(((A) >> 8));\
-                             *(((char*)T)+1)=(((A) >> 16));\
-                             *(((char*)T)+0)=(((A) >> 24)); } while(0)
-
-#define floatget(V,M)    memcpy_fixed((uchar*) &V,(uchar*) (M),sizeof(float))
-#define floatstore(T,V)  memcpy_fixed((uchar*) (T),(uchar*)(&V),sizeof(float))
-#define doubleget(V,M)	 memcpy_fixed((uchar*) &V,(uchar*) (M),sizeof(double))
-#define doublestore(T,V) memcpy_fixed((uchar*) (T),(uchar*) &V,sizeof(double))
-#define longlongget(V,M) memcpy_fixed((uchar*) &V,(uchar*) (M),sizeof(ulonglong))
-#define longlongstore(T,V) memcpy_fixed((uchar*) (T),(uchar*) &V,sizeof(ulonglong))
-
-#else
-
-#define ushortget(V,M)	do { V = uint2korr(M); } while(0)
-#define shortget(V,M)	do { V = sint2korr(M); } while(0)
-#define longget(V,M)	do { V = sint4korr(M); } while(0)
-#define ulongget(V,M)   do { V = uint4korr(M); } while(0)
-#define shortstore(T,V) int2store(T,V)
-#define longstore(T,V)	int4store(T,V)
-#ifndef floatstore
-#define floatstore(T,V)  memcpy_fixed((uchar*) (T),(uchar*) (&V),sizeof(float))
-#define floatget(V,M)    memcpy_fixed((uchar*) &V, (uchar*) (M), sizeof(float))
-#endif
-#ifndef doubleget
-#define doubleget(V,M)	 memcpy_fixed((uchar*) &V,(uchar*) (M),sizeof(double))
-#define doublestore(T,V) memcpy_fixed((uchar*) (T),(uchar*) &V,sizeof(double))
-#endif /* doubleget */
-#define longlongget(V,M) memcpy_fixed((uchar*) &V,(uchar*) (M),sizeof(ulonglong))
-#define longlongstore(T,V) memcpy_fixed((uchar*) (T),(uchar*) &V,sizeof(ulonglong))
-
-#endif /* WORDS_BIGENDIAN */
-
-/* sprintf does not always return the number of bytes :- */
-#ifdef SPRINTF_RETURNS_INT
-#define my_sprintf(buff,args) sprintf args
-#else
-#ifdef SPRINTF_RETURNS_PTR
-#define my_sprintf(buff,args) ((int)(sprintf args - buff))
-#else
-#define my_sprintf(buff,args) ((ulong) sprintf args, (ulong) strlen(buff))
-#endif
-#endif
-
-#ifndef THREAD
-#define thread_safe_increment(V,L) (V)++
-#define thread_safe_decrement(V,L) (V)--
-#define thread_safe_add(V,C,L)     (V)+=(C)
-#define thread_safe_sub(V,C,L)     (V)-=(C)
-#define statistic_increment(V,L)   (V)++
-#define statistic_decrement(V,L)   (V)--
-#define statistic_add(V,C,L)       (V)+=(C)
-#define statistic_sub(V,C,L)       (V)-=(C)
-#endif
-
-#ifdef HAVE_CHARSET_utf8
-#define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8"
-#else
-#define MYSQL_UNIVERSAL_CLIENT_CHARSET MYSQL_DEFAULT_CHARSET_NAME
-#endif
-
-#if defined(EMBEDDED_LIBRARY) && !defined(HAVE_EMBEDDED_PRIVILEGE_CONTROL)
-#define NO_EMBEDDED_ACCESS_CHECKS
-#endif
-
-#ifdef HAVE_DLOPEN
-#if defined(__WIN__)
-#define dlsym(lib, name) GetProcAddress((HMODULE)lib, name)
-#define dlopen(libname, unused) LoadLibraryEx(libname, NULL, 0)
-#define dlclose(lib) FreeLibrary((HMODULE)lib)
-#elif defined(HAVE_DLFCN_H)
-#include <dlfcn.h>
-#endif
-#endif
-
-/* FreeBSD 2.2.2 does not define RTLD_NOW) */
-#ifndef RTLD_NOW
-#define RTLD_NOW 1
-#endif
-
-#ifndef HAVE_DLERROR
-#define dlerror() ""
-#endif
-
-
-#ifndef __NETWARE__
-/*
- *  Include standard definitions of operator new and delete.
- */
-#ifdef __cplusplus
-#include <new>
-#endif
-#else
-/*
- *  Define placement versions of operator new and operator delete since
- *  we don't have <new> when building for Netware.
- */
-#ifdef __cplusplus
-inline void *operator new(size_t, void *ptr) { return ptr; }
-inline void *operator new[](size_t, void *ptr) { return ptr; }
-inline void  operator delete(void*, void*) { /* Do nothing */ }
-inline void  operator delete[](void*, void*) { /* Do nothing */ }
-#endif
-#endif
-
-/* Length of decimal number represented by INT32. */
-#define MY_INT32_NUM_DECIMAL_DIGITS 11
-
-/* Length of decimal number represented by INT64. */
-#define MY_INT64_NUM_DECIMAL_DIGITS 21
-
-/* Define some useful general macros (should be done after all headers). */
-#if !defined(max)
-#define max(a, b)	((a) > (b) ? (a) : (b))
-#define min(a, b)	((a) < (b) ? (a) : (b))
-#endif  
-/*
-  Only Linux is known to need an explicit sync of the directory to make sure a
-  file creation/deletion/renaming in(from,to) this directory durable.
-*/
-#ifdef TARGET_OS_LINUX
-#define NEED_EXPLICIT_SYNC_DIR 1
-#endif
-
-#if !defined(__cplusplus) && !defined(bool)
-#define bool In_C_you_should_use_my_bool_instead()
-#endif
-
-#ifndef HAVE_RINT
-/**
-   All integers up to this number can be represented exactly as double precision
-   values (DBL_MANT_DIG == 53 for IEEE 754 hardware).
-*/
-#define MAX_EXACT_INTEGER ((1LL << DBL_MANT_DIG) - 1)
-
-/**
-   rint(3) implementation for platforms that do not have it.
-   Always rounds to the nearest integer with ties being rounded to the nearest
-   even integer to mimic glibc's rint() behavior in the "round-to-nearest"
-   FPU mode. Hardware-specific optimizations are possible (frndint on x86).
-   Unlike this implementation, hardware will also honor the FPU rounding mode.
-*/
-
-static inline double rint(double x)
-{
-  double f, i;
-  f = modf(x, &i);
-  /*
-    All doubles with absolute values > MAX_EXACT_INTEGER are even anyway,
-    no need to check it.
-  */
-  if (x > 0.0)
-    i += (double) ((f > 0.5) || (f == 0.5 &&
-                                 i <= (double) MAX_EXACT_INTEGER &&
-                                 (longlong) i % 2));
-  else
-    i -= (double) ((f < -0.5) || (f == -0.5 &&
-                                  i >= (double) -MAX_EXACT_INTEGER &&
-                                  (longlong) i % 2));
-  return i;
-}
-#endif /* HAVE_RINT */
-
-/* 
-  MYSQL_PLUGIN_IMPORT macro is used to export mysqld data
-  (i.e variables) for usage in storage engine loadable plugins.
-  Outside of Windows, it is dummy.
-*/
-#ifndef MYSQL_PLUGIN_IMPORT
-#if (defined(_WIN32) && defined(MYSQL_DYNAMIC_PLUGIN))
-#define MYSQL_PLUGIN_IMPORT __declspec(dllimport)
-#else
-#define MYSQL_PLUGIN_IMPORT
-#endif
-#endif
-
-#endif /* my_global_h */
diff --git a/dep/include/mysql/my_list.h b/dep/include/mysql/my_list.h
deleted file mode 100644
index 775b56587..000000000
--- a/dep/include/mysql/my_list.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef _list_h_
-#define _list_h_
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-typedef struct st_list {
-  struct st_list *prev,*next;
-  void *data;
-} LIST;
-
-typedef int (*list_walk_action)(void *,void *);
-
-extern LIST *list_add(LIST *root,LIST *element);
-extern LIST *list_delete(LIST *root,LIST *element);
-extern LIST *list_cons(void *data,LIST *root);
-extern LIST *list_reverse(LIST *root);
-extern void list_free(LIST *root,unsigned int free_data);
-extern unsigned int list_length(LIST *);
-extern int list_walk(LIST *,list_walk_action action,unsigned char * argument);
-
-#define list_rest(a) ((a)->next)
-#define list_push(a,b) (a)=list_cons((b),(a))
-#define list_pop(A) {LIST *old=(A); (A)=list_delete(old,old) ; my_free((unsigned char *) old,MYF(MY_FAE)); }
-
-#ifdef	__cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/mysql/my_net.h b/dep/include/mysql/my_net.h
deleted file mode 100644
index 3af79ea3d..000000000
--- a/dep/include/mysql/my_net.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/*
-  thread safe version of some common functions:
-  my_inet_ntoa
-
-  This file is also used to make handling of sockets and ioctl()
-  portable accross systems.
-
-*/
-
-#ifndef _my_net_h
-#define _my_net_h
-C_MODE_START
-
-#include <errno.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_POLL
-#include <sys/poll.h>
-#endif
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-
-#if !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) && !defined(__NETWARE__)
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#if !defined(alpha_linux_port)
-#include <netinet/tcp.h>
-#endif
-#endif
-
-#if defined(__WIN__)
-#define O_NONBLOCK 1    /* For emulation of fcntl() */
-
-/*
-  SHUT_RDWR is called SD_BOTH in windows and
-  is defined to 2 in winsock2.h
-  #define SD_BOTH 0x02
-*/
-#define SHUT_RDWR 0x02
-
-#endif
-
-/*
-  On OSes which don't have the in_addr_t, we guess that using uint32 is the best
-  possible choice. We guess this from the fact that on HP-UX64bit & FreeBSD64bit
-  & Solaris64bit, in_addr_t is equivalent to uint32. And on Linux32bit too.
-*/
-#ifndef HAVE_IN_ADDR_T
-#define in_addr_t uint32
-#endif
-
-/* On some operating systems (e.g. Solaris) INADDR_NONE is not defined */
-#ifndef INADDR_NONE
-#define INADDR_NONE -1                          /* Error value from inet_addr */
-#endif
-
-/* Thread safe or portable version of some functions */
-
-void my_inet_ntoa(struct in_addr in, char *buf);
-
-/*
-  Handling of gethostbyname_r()
-*/
-
-#if !defined(HPUX10)
-struct hostent;
-#endif /* HPUX */
-#if !defined(HAVE_GETHOSTBYNAME_R)
-struct hostent *my_gethostbyname_r(const char *name,
-				   struct hostent *result, char *buffer,
-				   int buflen, int *h_errnop);
-void my_gethostbyname_r_free();
-#elif defined(HAVE_PTHREAD_ATTR_CREATE) || defined(_AIX) || defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE)
-struct hostent *my_gethostbyname_r(const char *name,
-				   struct hostent *result, char *buffer,
-				   int buflen, int *h_errnop);
-#define my_gethostbyname_r_free()
-#if !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) && !defined(HPUX10)
-#define GETHOSTBYNAME_BUFF_SIZE sizeof(struct hostent_data)
-#endif /* !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */
-
-#elif defined(HAVE_GETHOSTBYNAME_R_RETURN_INT)
-#define GETHOSTBYNAME_BUFF_SIZE sizeof(struct hostent_data)
-struct hostent *my_gethostbyname_r(const char *name,
-				   struct hostent *result, char *buffer,
-				   int buflen, int *h_errnop);
-#define my_gethostbyname_r_free()
-#else
-#define my_gethostbyname_r(A,B,C,D,E) gethostbyname_r((A),(B),(C),(D),(E))
-#define my_gethostbyname_r_free()
-#endif /* !defined(HAVE_GETHOSTBYNAME_R) */
-
-#ifndef GETHOSTBYNAME_BUFF_SIZE
-#define GETHOSTBYNAME_BUFF_SIZE 2048
-#endif
-
-/* On SCO you get a link error when refering to h_errno */
-#ifdef SCO
-#undef h_errno
-#define h_errno errno
-#endif
-
-C_MODE_END
-#endif
diff --git a/dep/include/mysql/my_no_pthread.h b/dep/include/mysql/my_no_pthread.h
deleted file mode 100644
index 511fac407..000000000
--- a/dep/include/mysql/my_no_pthread.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-
-#if !defined(_my_no_pthread_h) && !defined(THREAD)
-#define _my_no_pthread_h
-
-
-/*
-  This block is to access some thread-related type definitions
-  even in builds which do not need thread functions,
-  as some variables (based on these types) are declared
-  even in non-threaded builds.
-  Case in point: 'mf_keycache.c'
-*/
-#if defined(__WIN__)
-#else /* Normal threads */
-#include <pthread.h>
-
-#endif /* defined(__WIN__) */
-
-
-/*
-  This undefs some pthread mutex locks when one isn't using threads
-  to make thread safe code, that should also work in single thread
-  environment, easier to use.
-*/
-#define pthread_mutex_init(A,B)
-#define pthread_mutex_lock(A)
-#define pthread_mutex_unlock(A)
-#define pthread_mutex_destroy(A)
-#define my_rwlock_init(A,B)
-#define rw_rdlock(A)
-#define rw_wrlock(A)
-#define rw_unlock(A)
-#define rwlock_destroy(A)
-
-typedef int my_pthread_once_t;
-#define MY_PTHREAD_ONCE_INIT 0
-#define MY_PTHREAD_ONCE_DONE 1
-
-#define my_pthread_once(C,F) do { \
-    if (*(C) != MY_PTHREAD_ONCE_DONE) { F(); *(C)= MY_PTHREAD_ONCE_DONE; } \
-  } while(0)
-
-#endif
diff --git a/dep/include/mysql/my_pthread.h b/dep/include/mysql/my_pthread.h
deleted file mode 100644
index e9256610e..000000000
--- a/dep/include/mysql/my_pthread.h
+++ /dev/null
@@ -1,779 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* Defines to make different thread packages compatible */
-
-#ifndef _my_pthread_h
-#define _my_pthread_h
-
-#ifndef ETIME
-#define ETIME ETIMEDOUT				/* For FreeBSD */
-#endif
-
-#ifdef  __cplusplus
-#define EXTERNC extern "C"
-extern "C" {
-#else
-#define EXTERNC
-#endif /* __cplusplus */ 
-
-#if defined(__WIN__)
-typedef CRITICAL_SECTION pthread_mutex_t;
-typedef HANDLE		 pthread_t;
-typedef struct thread_attr {
-    DWORD dwStackSize ;
-    DWORD dwCreatingFlag ;
-    int priority ;
-} pthread_attr_t ;
-
-typedef struct { int dummy; } pthread_condattr_t;
-
-/* Implementation of posix conditions */
-
-typedef struct st_pthread_link {
-  DWORD thread_id;
-  struct st_pthread_link *next;
-} pthread_link;
-
-typedef struct {
-  uint32 waiting;
-  CRITICAL_SECTION lock_waiting;
- 
-  enum {
-    SIGNAL= 0,
-    BROADCAST= 1,
-    MAX_EVENTS= 2
-  } EVENTS;
-
-  HANDLE events[MAX_EVENTS];
-  HANDLE broadcast_block_event;
-
-} pthread_cond_t;
-
-
-typedef int pthread_mutexattr_t;
-#define win_pthread_self my_thread_var->pthread_self
-#define pthread_self() win_pthread_self
-#define pthread_handler_t EXTERNC void * __cdecl
-typedef void * (__cdecl *pthread_handler)(void *);
-
-typedef volatile LONG my_pthread_once_t;
-#define MY_PTHREAD_ONCE_INIT  0
-#define MY_PTHREAD_ONCE_INPROGRESS 1
-#define MY_PTHREAD_ONCE_DONE 2
-
-/*
-  Struct and macros to be used in combination with the
-  windows implementation of pthread_cond_timedwait
-*/
-
-/*
-   Declare a union to make sure FILETIME is properly aligned
-   so it can be used directly as a 64 bit value. The value
-   stored is in 100ns units.
- */
- union ft64 {
-  FILETIME ft;
-  __int64 i64;
- };
-struct timespec {
-  union ft64 tv;
-  /* The max timeout value in millisecond for pthread_cond_timedwait */
-  long max_timeout_msec;
-};
-#define set_timespec(ABSTIME,SEC) { \
-  GetSystemTimeAsFileTime(&((ABSTIME).tv.ft)); \
-  (ABSTIME).tv.i64+= (__int64)(SEC)*10000000; \
-  (ABSTIME).max_timeout_msec= (long)((SEC)*1000); \
-}
-#define set_timespec_nsec(ABSTIME,NSEC) { \
-  GetSystemTimeAsFileTime(&((ABSTIME).tv.ft)); \
-  (ABSTIME).tv.i64+= (__int64)(NSEC)/100; \
-  (ABSTIME).max_timeout_msec= (long)((NSEC)/1000000); \
-}
-
-void win_pthread_init(void);
-int win_pthread_setspecific(void *A,void *B,uint length);
-int win_pthread_mutex_trylock(pthread_mutex_t *mutex);
-int pthread_create(pthread_t *,pthread_attr_t *,pthread_handler,void *);
-int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr);
-int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
-int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-			   struct timespec *abstime);
-int pthread_cond_signal(pthread_cond_t *cond);
-int pthread_cond_broadcast(pthread_cond_t *cond);
-int pthread_cond_destroy(pthread_cond_t *cond);
-int pthread_attr_init(pthread_attr_t *connect_att);
-int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack);
-int pthread_attr_setprio(pthread_attr_t *connect_att,int priority);
-int pthread_attr_destroy(pthread_attr_t *connect_att);
-int my_pthread_once(my_pthread_once_t *once_control,void (*init_routine)(void));
-struct tm *localtime_r(const time_t *timep,struct tm *tmp);
-struct tm *gmtime_r(const time_t *timep,struct tm *tmp);
-
-
-void pthread_exit(void *a);	 /* was #define pthread_exit(A) ExitThread(A)*/
-
-#define ETIMEDOUT 145		    /* Win32 doesn't have this */
-#define getpid() GetCurrentThreadId()
-#define HAVE_LOCALTIME_R		1
-#define _REENTRANT			1
-#define HAVE_PTHREAD_ATTR_SETSTACKSIZE	1
-
-/*
-  Windows has two ways to use thread local storage. The most efficient
-  is using __declspec(thread), but that does not work properly when
-  used in a .dll that is loaded at runtime, after program load. So for
-  libmysql.dll and libmysqld.dll we define USE_TLS in order to use the
-  TlsXxx() API instead, which works in all cases.
-*/
-#ifdef USE_TLS					/* For LIBMYSQL.DLL */
-#undef SAFE_MUTEX				/* This will cause conflicts */
-#define pthread_key(T,V)  DWORD V
-#define pthread_key_create(A,B) ((*A=TlsAlloc())==0xFFFFFFFF)
-#define pthread_key_delete(A) TlsFree(A)
-#define pthread_getspecific(A) (TlsGetValue(A))
-#define my_pthread_getspecific(T,A) ((T) TlsGetValue(A))
-#define my_pthread_getspecific_ptr(T,V) ((T) TlsGetValue(V))
-#define my_pthread_setspecific_ptr(T,V) (!TlsSetValue((T),(V)))
-#define pthread_setspecific(A,B) (!TlsSetValue((A),(B)))
-#else
-#define pthread_key(T,V) __declspec(thread) T V
-#define pthread_key_create(A,B) pthread_dummy(0)
-#define pthread_key_delete(A) pthread_dummy(0)
-#define pthread_getspecific(A) (&(A))
-#define my_pthread_getspecific(T,A) (&(A))
-#define my_pthread_getspecific_ptr(T,V) (V)
-#define my_pthread_setspecific_ptr(T,V) ((T)=(V),0)
-#define pthread_setspecific(A,B) win_pthread_setspecific(&(A),(B),sizeof(A))
-#endif /* USE_TLS */
-
-#define pthread_equal(A,B) ((A) == (B))
-#define pthread_mutex_init(A,B)  (InitializeCriticalSection(A),0)
-#define pthread_mutex_lock(A)	 (EnterCriticalSection(A),0)
-#define pthread_mutex_trylock(A) win_pthread_mutex_trylock((A))
-#define pthread_mutex_unlock(A)  LeaveCriticalSection(A)
-#define pthread_mutex_destroy(A) DeleteCriticalSection(A)
-#define my_pthread_setprio(A,B)  SetThreadPriority(GetCurrentThread(), (B))
-#define pthread_kill(A,B) pthread_dummy((A) ? 0 : ESRCH)
-
-#define pthread_join(A,B) (WaitForSingleObject((A), INFINITE) != WAIT_OBJECT_0)
-
-/* Dummy defines for easier code */
-#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
-#define my_pthread_attr_setprio(A,B) pthread_attr_setprio(A,B)
-#define pthread_attr_setscope(A,B)
-#define pthread_detach_this_thread()
-#define pthread_condattr_init(A)
-#define pthread_condattr_destroy(A)
-
-#define my_pthread_getprio(thread_id) pthread_dummy(0)
-
-#else /* Normal threads */
-
-#ifdef HAVE_rts_threads
-#define sigwait org_sigwait
-#include <signal.h>
-#undef sigwait
-#endif
-#include <pthread.h>
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
-#ifdef HAVE_THR_SETCONCURRENCY
-#include <thread.h>			/* Probably solaris */
-#endif
-#ifdef HAVE_SCHED_H
-#include <sched.h>
-#endif
-#ifdef HAVE_SYNCH_H
-#include <synch.h>
-#endif
-
-#ifdef __NETWARE__
-void my_pthread_exit(void *status);
-#define pthread_exit(A) my_pthread_exit(A)
-#endif
-
-extern int my_pthread_getprio(pthread_t thread_id);
-
-#define pthread_key(T,V) pthread_key_t V
-#define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,(V))
-#define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,(void*) (V))
-#define pthread_detach_this_thread()
-#define pthread_handler_t EXTERNC void *
-typedef void *(* pthread_handler)(void *);
-
-#define my_pthread_once_t pthread_once_t
-#define MY_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
-#define my_pthread_once(C,F) pthread_once(C,F)
-
-/* Test first for RTS or FSU threads */
-
-#if defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM)
-#define HAVE_rts_threads
-extern int my_pthread_create_detached;
-#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
-#define PTHREAD_CREATE_DETACHED &my_pthread_create_detached
-#define PTHREAD_SCOPE_SYSTEM  PTHREAD_SCOPE_GLOBAL
-#define PTHREAD_SCOPE_PROCESS PTHREAD_SCOPE_LOCAL
-#define USE_ALARM_THREAD
-#endif /* defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM) */
-
-#if defined(_BSDI_VERSION) && _BSDI_VERSION < 199910
-int sigwait(sigset_t *set, int *sig);
-#endif
-
-#ifndef HAVE_NONPOSIX_SIGWAIT
-#define my_sigwait(A,B) sigwait((A),(B))
-#else
-int my_sigwait(const sigset_t *set,int *sig);
-#endif
-
-#ifdef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT
-#ifndef SAFE_MUTEX
-#define pthread_mutex_init(a,b) my_pthread_mutex_init((a),(b))
-extern int my_pthread_mutex_init(pthread_mutex_t *mp,
-				 const pthread_mutexattr_t *attr);
-#endif /* SAFE_MUTEX */
-#define pthread_cond_init(a,b) my_pthread_cond_init((a),(b))
-extern int my_pthread_cond_init(pthread_cond_t *mp,
-				const pthread_condattr_t *attr);
-#endif /* HAVE_NONPOSIX_PTHREAD_MUTEX_INIT */
-
-#if defined(HAVE_SIGTHREADMASK) && !defined(HAVE_PTHREAD_SIGMASK)
-#define pthread_sigmask(A,B,C) sigthreadmask((A),(B),(C))
-#endif
-
-#if !defined(HAVE_SIGWAIT) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX)
-int sigwait(sigset_t *setp, int *sigp);		/* Use our implemention */
-#endif
-
-
-/*
-  We define my_sigset() and use that instead of the system sigset() so that
-  we can favor an implementation based on sigaction(). On some systems, such
-  as Mac OS X, sigset() results in flags such as SA_RESTART being set, and
-  we want to make sure that no such flags are set.
-*/
-#if defined(HAVE_SIGACTION) && !defined(my_sigset)
-#define my_sigset(A,B) do { struct sigaction l_s; sigset_t l_set; int l_rc; \
-                            DBUG_ASSERT((A) != 0);                          \
-                            sigemptyset(&l_set);                            \
-                            l_s.sa_handler = (B);                           \
-                            l_s.sa_mask   = l_set;                          \
-                            l_s.sa_flags   = 0;                             \
-                            l_rc= sigaction((A), &l_s, (struct sigaction *) NULL);\
-                            DBUG_ASSERT(l_rc == 0);                         \
-                          } while (0)
-#elif defined(HAVE_SIGSET) && !defined(my_sigset)
-#define my_sigset(A,B) sigset((A),(B))
-#elif !defined(my_sigset)
-#define my_sigset(A,B) signal((A),(B))
-#endif
-
-#ifndef my_pthread_setprio
-#if defined(HAVE_PTHREAD_SETPRIO_NP)		/* FSU threads */
-#define my_pthread_setprio(A,B) pthread_setprio_np((A),(B))
-#elif defined(HAVE_PTHREAD_SETPRIO)
-#define my_pthread_setprio(A,B) pthread_setprio((A),(B))
-#elif defined(HAVE_PTHREAD_SETSCHEDPRIO)
-#define my_pthread_setprio(A,B) pthread_setschedprio((A),(B))
-#else
-extern void my_pthread_setprio(pthread_t thread_id,int prior);
-#endif
-#endif
-
-#ifndef my_pthread_attr_setprio
-#ifdef HAVE_PTHREAD_ATTR_SETPRIO
-#define my_pthread_attr_setprio(A,B) pthread_attr_setprio((A),(B))
-#else
-extern void my_pthread_attr_setprio(pthread_attr_t *attr, int priority);
-#endif
-#endif
-
-#if !defined(HAVE_PTHREAD_ATTR_SETSCOPE) || defined(HAVE_DEC_3_2_THREADS)
-#define pthread_attr_setscope(A,B)
-#undef	HAVE_GETHOSTBYADDR_R			/* No definition */
-#endif
-
-#if defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT) && !defined(SAFE_MUTEX)
-extern int my_pthread_cond_timedwait(pthread_cond_t *cond,
-				     pthread_mutex_t *mutex,
-				     struct timespec *abstime);
-#define pthread_cond_timedwait(A,B,C) my_pthread_cond_timedwait((A),(B),(C))
-#endif
-
-#if !defined( HAVE_NONPOSIX_PTHREAD_GETSPECIFIC)
-#define my_pthread_getspecific(A,B) ((A) pthread_getspecific(B))
-#else
-#define my_pthread_getspecific(A,B) ((A) my_pthread_getspecific_imp(B))
-void *my_pthread_getspecific_imp(pthread_key_t key);
-#endif
-
-#ifndef HAVE_LOCALTIME_R
-struct tm *localtime_r(const time_t *clock, struct tm *res);
-#endif
-
-#ifndef HAVE_GMTIME_R
-struct tm *gmtime_r(const time_t *clock, struct tm *res);
-#endif
-
-#ifdef HAVE_PTHREAD_CONDATTR_CREATE
-/* DCE threads on HPUX 10.20 */
-#define pthread_condattr_init pthread_condattr_create
-#define pthread_condattr_destroy pthread_condattr_delete
-#endif
-
-/* FSU THREADS */
-#if !defined(HAVE_PTHREAD_KEY_DELETE) && !defined(pthread_key_delete)
-#define pthread_key_delete(A) pthread_dummy(0)
-#endif
-
-#ifdef HAVE_CTHREADS_WRAPPER			/* For MacOSX */
-#define pthread_cond_destroy(A) pthread_dummy(0)
-#define pthread_mutex_destroy(A) pthread_dummy(0)
-#define pthread_attr_delete(A) pthread_dummy(0)
-#define pthread_condattr_delete(A) pthread_dummy(0)
-#define pthread_attr_setstacksize(A,B) pthread_dummy(0)
-#define pthread_equal(A,B) ((A) == (B))
-#define pthread_cond_timedwait(a,b,c) pthread_cond_wait((a),(b))
-#define pthread_attr_init(A) pthread_attr_create(A)
-#define pthread_attr_destroy(A) pthread_attr_delete(A)
-#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
-#define pthread_create(A,B,C,D) pthread_create((A),*(B),(C),(D))
-#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
-#define pthread_kill(A,B) pthread_dummy((A) ? 0 : ESRCH)
-#undef	pthread_detach_this_thread
-#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); }
-#endif
-
-#ifdef HAVE_DARWIN5_THREADS
-#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
-#define pthread_kill(A,B) pthread_dummy((A) ? 0 : ESRCH)
-#define pthread_condattr_init(A) pthread_dummy(0)
-#define pthread_condattr_destroy(A) pthread_dummy(0)
-#undef	pthread_detach_this_thread
-#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); }
-#endif
-
-#if ((defined(HAVE_PTHREAD_ATTR_CREATE) && !defined(HAVE_SIGWAIT)) || defined(HAVE_DEC_3_2_THREADS)) && !defined(HAVE_CTHREADS_WRAPPER)
-/* This is set on AIX_3_2 and Siemens unix (and DEC OSF/1 3.2 too) */
-#define pthread_key_create(A,B) \
-		pthread_keycreate(A,(B) ?\
-				  (pthread_destructor_t) (B) :\
-				  (pthread_destructor_t) pthread_dummy)
-#define pthread_attr_init(A) pthread_attr_create(A)
-#define pthread_attr_destroy(A) pthread_attr_delete(A)
-#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
-#define pthread_create(A,B,C,D) pthread_create((A),*(B),(C),(D))
-#ifndef pthread_sigmask
-#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
-#endif
-#define pthread_kill(A,B) pthread_dummy((A) ? 0 : ESRCH)
-#undef	pthread_detach_this_thread
-#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); }
-#elif !defined(__NETWARE__) /* HAVE_PTHREAD_ATTR_CREATE && !HAVE_SIGWAIT */
-#define HAVE_PTHREAD_KILL
-#endif
-
-#endif /* defined(__WIN__) */
-
-#if defined(HPUX10) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
-#undef pthread_cond_timedwait
-#define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c))
-int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-			      struct timespec *abstime);
-#endif
-
-#if defined(HPUX10)
-#define pthread_attr_getstacksize(A,B) my_pthread_attr_getstacksize(A,B)
-void my_pthread_attr_getstacksize(pthread_attr_t *attrib, size_t *size);
-#endif
-
-#if defined(HAVE_POSIX1003_4a_MUTEX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
-#undef pthread_mutex_trylock
-#define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a))
-int my_pthread_mutex_trylock(pthread_mutex_t *mutex);
-#endif
-
-/*
-  The defines set_timespec and set_timespec_nsec should be used
-  for calculating an absolute time at which
-  pthread_cond_timedwait should timeout
-*/
-#ifdef HAVE_TIMESPEC_TS_SEC
-#ifndef set_timespec
-#define set_timespec(ABSTIME,SEC) \
-{ \
-  (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \
-  (ABSTIME).ts_nsec=0; \
-}
-#endif /* !set_timespec */
-#ifndef set_timespec_nsec
-#define set_timespec_nsec(ABSTIME,NSEC) \
-{ \
-  ulonglong now= my_getsystime() + (NSEC/100); \
-  (ABSTIME).ts_sec=  (now / ULL(10000000)); \
-  (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \
-}
-#endif /* !set_timespec_nsec */
-#else
-#ifndef set_timespec
-#define set_timespec(ABSTIME,SEC) \
-{\
-  struct timeval tv;\
-  gettimeofday(&tv,0);\
-  (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\
-  (ABSTIME).tv_nsec=tv.tv_usec*1000;\
-}
-#endif /* !set_timespec */
-#ifndef set_timespec_nsec
-#define set_timespec_nsec(ABSTIME,NSEC) \
-{\
-  ulonglong now= my_getsystime() + (NSEC/100); \
-  (ABSTIME).tv_sec=  (time_t) (now / ULL(10000000));                  \
-  (ABSTIME).tv_nsec= (long) (now % ULL(10000000) * 100 + ((NSEC) % 100)); \
-}
-#endif /* !set_timespec_nsec */
-#endif /* HAVE_TIMESPEC_TS_SEC */
-
-	/* safe_mutex adds checking to mutex for easier debugging */
-
-#if defined(__NETWARE__) && !defined(SAFE_MUTEX_DETECT_DESTROY)
-#define SAFE_MUTEX_DETECT_DESTROY
-#endif
-
-typedef struct st_safe_mutex_t
-{
-  pthread_mutex_t global,mutex;
-  const char *file;
-  uint line,count;
-  pthread_t thread;
-#ifdef SAFE_MUTEX_DETECT_DESTROY
-  struct st_safe_mutex_info_t *info;	/* to track destroying of mutexes */
-#endif
-} safe_mutex_t;
-
-#ifdef SAFE_MUTEX_DETECT_DESTROY
-/*
-  Used to track the destroying of mutexes. This needs to be a seperate
-  structure because the safe_mutex_t structure could be freed before
-  the mutexes are destroyed.
-*/
-
-typedef struct st_safe_mutex_info_t
-{
-  struct st_safe_mutex_info_t *next;
-  struct st_safe_mutex_info_t *prev;
-  const char *init_file;
-  uint32 init_line;
-} safe_mutex_info_t;
-#endif /* SAFE_MUTEX_DETECT_DESTROY */
-
-int safe_mutex_init(safe_mutex_t *mp, const pthread_mutexattr_t *attr,
-                    const char *file, uint line);
-int safe_mutex_lock(safe_mutex_t *mp, my_bool try_lock, const char *file, uint line);
-int safe_mutex_unlock(safe_mutex_t *mp,const char *file, uint line);
-int safe_mutex_destroy(safe_mutex_t *mp,const char *file, uint line);
-int safe_cond_wait(pthread_cond_t *cond, safe_mutex_t *mp,const char *file,
-		   uint line);
-int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp,
-			struct timespec *abstime, const char *file, uint line);
-void safe_mutex_global_init(void);
-void safe_mutex_end(FILE *file);
-
-	/* Wrappers if safe mutex is actually used */
-#ifdef SAFE_MUTEX
-#undef pthread_mutex_init
-#undef pthread_mutex_lock
-#undef pthread_mutex_unlock
-#undef pthread_mutex_destroy
-#undef pthread_mutex_wait
-#undef pthread_mutex_timedwait
-#undef pthread_mutex_t
-#undef pthread_cond_wait
-#undef pthread_cond_timedwait
-#undef pthread_mutex_trylock
-#define pthread_mutex_init(A,B) safe_mutex_init((A),(B),__FILE__,__LINE__)
-#define pthread_mutex_lock(A) safe_mutex_lock((A), FALSE, __FILE__, __LINE__)
-#define pthread_mutex_unlock(A) safe_mutex_unlock((A),__FILE__,__LINE__)
-#define pthread_mutex_destroy(A) safe_mutex_destroy((A),__FILE__,__LINE__)
-#define pthread_cond_wait(A,B) safe_cond_wait((A),(B),__FILE__,__LINE__)
-#define pthread_cond_timedwait(A,B,C) safe_cond_timedwait((A),(B),(C),__FILE__,__LINE__)
-#define pthread_mutex_trylock(A) safe_mutex_lock((A), TRUE, __FILE__, __LINE__)
-#define pthread_mutex_t safe_mutex_t
-#define safe_mutex_assert_owner(mp) \
-          DBUG_ASSERT((mp)->count > 0 && \
-                      pthread_equal(pthread_self(), (mp)->thread))
-#define safe_mutex_assert_not_owner(mp) \
-          DBUG_ASSERT(! (mp)->count || \
-                      ! pthread_equal(pthread_self(), (mp)->thread))
-#else
-#define safe_mutex_assert_owner(mp)
-#define safe_mutex_assert_not_owner(mp)
-#endif /* SAFE_MUTEX */
-
-#if defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX)
-typedef struct st_my_pthread_fastmutex_t
-{
-  pthread_mutex_t mutex;
-  uint spins;
-  uint rng_state;
-} my_pthread_fastmutex_t;
-void fastmutex_global_init(void);
-
-int my_pthread_fastmutex_init(my_pthread_fastmutex_t *mp, 
-                              const pthread_mutexattr_t *attr);
-int my_pthread_fastmutex_lock(my_pthread_fastmutex_t *mp);
-
-#undef pthread_mutex_init
-#undef pthread_mutex_lock
-#undef pthread_mutex_unlock
-#undef pthread_mutex_destroy
-#undef pthread_mutex_wait
-#undef pthread_mutex_timedwait
-#undef pthread_mutex_t
-#undef pthread_cond_wait
-#undef pthread_cond_timedwait
-#undef pthread_mutex_trylock
-#define pthread_mutex_init(A,B) my_pthread_fastmutex_init((A),(B))
-#define pthread_mutex_lock(A) my_pthread_fastmutex_lock(A)
-#define pthread_mutex_unlock(A) pthread_mutex_unlock(&(A)->mutex)
-#define pthread_mutex_destroy(A) pthread_mutex_destroy(&(A)->mutex)
-#define pthread_cond_wait(A,B) pthread_cond_wait((A),&(B)->mutex)
-#define pthread_cond_timedwait(A,B,C) pthread_cond_timedwait((A),&(B)->mutex,(C))
-#define pthread_mutex_trylock(A) pthread_mutex_trylock(&(A)->mutex)
-#define pthread_mutex_t my_pthread_fastmutex_t
-#endif /* defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX) */
-
-	/* READ-WRITE thread locking */
-
-#ifdef HAVE_BROKEN_RWLOCK			/* For OpenUnix */
-#undef HAVE_PTHREAD_RWLOCK_RDLOCK
-#undef HAVE_RWLOCK_INIT
-#undef HAVE_RWLOCK_T
-#endif
-
-#if defined(USE_MUTEX_INSTEAD_OF_RW_LOCKS)
-/* use these defs for simple mutex locking */
-#define rw_lock_t pthread_mutex_t
-#define my_rwlock_init(A,B) pthread_mutex_init((A),(B))
-#define rw_rdlock(A) pthread_mutex_lock((A))
-#define rw_wrlock(A) pthread_mutex_lock((A))
-#define rw_tryrdlock(A) pthread_mutex_trylock((A))
-#define rw_trywrlock(A) pthread_mutex_trylock((A))
-#define rw_unlock(A) pthread_mutex_unlock((A))
-#define rwlock_destroy(A) pthread_mutex_destroy((A))
-#elif defined(HAVE_PTHREAD_RWLOCK_RDLOCK)
-#define rw_lock_t pthread_rwlock_t
-#define my_rwlock_init(A,B) pthread_rwlock_init((A),(B))
-#define rw_rdlock(A) pthread_rwlock_rdlock(A)
-#define rw_wrlock(A) pthread_rwlock_wrlock(A)
-#define rw_tryrdlock(A) pthread_rwlock_tryrdlock((A))
-#define rw_trywrlock(A) pthread_rwlock_trywrlock((A))
-#define rw_unlock(A) pthread_rwlock_unlock(A)
-#define rwlock_destroy(A) pthread_rwlock_destroy(A)
-#elif defined(HAVE_RWLOCK_INIT)
-#ifdef HAVE_RWLOCK_T				/* For example Solaris 2.6-> */
-#define rw_lock_t rwlock_t
-#endif
-#define my_rwlock_init(A,B) rwlock_init((A),USYNC_THREAD,0)
-#else
-/* Use our own version of read/write locks */
-typedef struct _my_rw_lock_t {
-	pthread_mutex_t lock;		/* lock for structure		*/
-	pthread_cond_t	readers;	/* waiting readers		*/
-	pthread_cond_t	writers;	/* waiting writers		*/
-	int		state;		/* -1:writer,0:free,>0:readers	*/
-	int		waiters;	/* number of waiting writers	*/
-} my_rw_lock_t;
-
-#define rw_lock_t my_rw_lock_t
-#define rw_rdlock(A) my_rw_rdlock((A))
-#define rw_wrlock(A) my_rw_wrlock((A))
-#define rw_tryrdlock(A) my_rw_tryrdlock((A))
-#define rw_trywrlock(A) my_rw_trywrlock((A))
-#define rw_unlock(A) my_rw_unlock((A))
-#define rwlock_destroy(A) my_rwlock_destroy((A))
-
-extern int my_rwlock_init(my_rw_lock_t *, void *);
-extern int my_rwlock_destroy(my_rw_lock_t *);
-extern int my_rw_rdlock(my_rw_lock_t *);
-extern int my_rw_wrlock(my_rw_lock_t *);
-extern int my_rw_unlock(my_rw_lock_t *);
-extern int my_rw_tryrdlock(my_rw_lock_t *);
-extern int my_rw_trywrlock(my_rw_lock_t *);
-#endif /* USE_MUTEX_INSTEAD_OF_RW_LOCKS */
-
-#define GETHOSTBYADDR_BUFF_SIZE 2048
-
-#ifndef HAVE_THR_SETCONCURRENCY
-#define thr_setconcurrency(A) pthread_dummy(0)
-#endif
-#if !defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE) && ! defined(pthread_attr_setstacksize)
-#define pthread_attr_setstacksize(A,B) pthread_dummy(0)
-#endif
-
-/* Define mutex types, see my_thr_init.c */
-#define MY_MUTEX_INIT_SLOW   NULL
-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
-extern pthread_mutexattr_t my_fast_mutexattr;
-#define MY_MUTEX_INIT_FAST &my_fast_mutexattr
-#else
-#define MY_MUTEX_INIT_FAST   NULL
-#endif
-#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
-extern pthread_mutexattr_t my_errorcheck_mutexattr;
-#define MY_MUTEX_INIT_ERRCHK &my_errorcheck_mutexattr
-#else
-#define MY_MUTEX_INIT_ERRCHK   NULL
-#endif
-
-#ifndef ESRCH
-/* Define it to something */
-#define ESRCH 1
-#endif
-
-typedef ulong my_thread_id;
-
-extern my_bool my_thread_global_init(void);
-extern void my_thread_global_end(void);
-extern my_bool my_thread_init(void);
-extern void my_thread_end(void);
-extern const char *my_thread_name(void);
-extern my_thread_id my_thread_dbug_id(void);
-extern int pthread_no_free(void *);
-extern int pthread_dummy(int);
-
-/* All thread specific variables are in the following struct */
-
-#define THREAD_NAME_SIZE 10
-#ifndef DEFAULT_THREAD_STACK
-#if SIZEOF_CHARP > 4
-/*
-  MySQL can survive with 32K, but some glibc libraries require > 128K stack
-  To resolve hostnames. Also recursive stored procedures needs stack.
-*/
-#define DEFAULT_THREAD_STACK	(256*1024L)
-#else
-#define DEFAULT_THREAD_STACK	(192*1024)
-#endif
-#endif
-
-struct st_my_thread_var
-{
-  int thr_errno;
-  pthread_cond_t suspend;
-  pthread_mutex_t mutex;
-  pthread_mutex_t * volatile current_mutex;
-  pthread_cond_t * volatile current_cond;
-  pthread_t pthread_self;
-  my_thread_id id;
-  int cmp_length;
-  int volatile abort;
-  my_bool init;
-  struct st_my_thread_var *next,**prev;
-  void *opt_info;
-#ifndef DBUG_OFF
-  void *dbug;
-  char name[THREAD_NAME_SIZE+1];
-#endif
-};
-
-extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const));
-extern uint my_thread_end_wait_time;
-#define my_thread_var (_my_thread_var())
-#define my_errno my_thread_var->thr_errno
-/*
-  Keep track of shutdown,signal, and main threads so that my_end() will not
-  report errors with them
-*/
-
-/* Which kind of thread library is in use */
-
-#define THD_LIB_OTHER 1
-#define THD_LIB_NPTL  2
-#define THD_LIB_LT    4
-
-extern uint thd_lib_detected;
-
-/*
-  thread_safe_xxx functions are for critical statistic or counters.
-  The implementation is guaranteed to be thread safe, on all platforms.
-  Note that the calling code should *not* assume the counter is protected
-  by the mutex given, as the implementation of these helpers may change
-  to use my_atomic operations instead.
-*/
-
-/*
-  Warning:
-  When compiling without threads, this file is not included.
-  See the *other* declarations of thread_safe_xxx in include/my_global.h
-
-  Second warning:
-  See include/config-win.h, for yet another implementation.
-*/
-#ifdef THREAD
-#ifndef thread_safe_increment
-#define thread_safe_increment(V,L) \
-        (pthread_mutex_lock((L)), (V)++, pthread_mutex_unlock((L)))
-#define thread_safe_decrement(V,L) \
-        (pthread_mutex_lock((L)), (V)--, pthread_mutex_unlock((L)))
-#endif
-
-#ifndef thread_safe_add
-#define thread_safe_add(V,C,L) \
-        (pthread_mutex_lock((L)), (V)+=(C), pthread_mutex_unlock((L)))
-#define thread_safe_sub(V,C,L) \
-        (pthread_mutex_lock((L)), (V)-=(C), pthread_mutex_unlock((L)))
-#endif
-#endif
-
-/*
-  statistics_xxx functions are for non critical statistic,
-  maintained in global variables.
-  When compiling with SAFE_STATISTICS:
-  - race conditions can not occur.
-  - some locking occurs, which may cause performance degradation.
-
-  When compiling without SAFE_STATISTICS:
-  - race conditions can occur, making the result slightly inaccurate.
-  - the lock given is not honored.
-*/
-#ifdef SAFE_STATISTICS
-#define statistic_increment(V,L) thread_safe_increment((V),(L))
-#define statistic_decrement(V,L) thread_safe_decrement((V),(L))
-#define statistic_add(V,C,L)     thread_safe_add((V),(C),(L))
-#define statistic_sub(V,C,L)     thread_safe_sub((V),(C),(L))
-#else
-#define statistic_decrement(V,L) (V)--
-#define statistic_increment(V,L) (V)++
-#define statistic_add(V,C,L)     (V)+=(C)
-#define statistic_sub(V,C,L)     (V)-=(C)
-#endif /* SAFE_STATISTICS */
-
-/*
-  No locking needed, the counter is owned by the thread
-*/
-#define status_var_increment(V) (V)++
-#define status_var_decrement(V) (V)--
-#define status_var_add(V,C)     (V)+=(C)
-#define status_var_sub(V,C)     (V)-=(C)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif /* _my_ptread_h */
diff --git a/dep/include/mysql/my_sys.h b/dep/include/mysql/my_sys.h
deleted file mode 100644
index 3a240cfc1..000000000
--- a/dep/include/mysql/my_sys.h
+++ /dev/null
@@ -1,1007 +0,0 @@
-/* Copyright (C) 2000-2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef _my_sys_h
-#define _my_sys_h
-C_MODE_START
-
-#ifdef HAVE_AIOWAIT
-#include <sys/asynch.h>			/* Used by record-cache */
-typedef struct my_aio_result {
-  aio_result_t result;
-  int	       pending;
-} my_aio_result;
-#endif
-
-#ifdef HAVE_VALGRIND
-# include <valgrind/memcheck.h>
-# define MEM_UNDEFINED(a,len) VALGRIND_MAKE_MEM_UNDEFINED(a,len)
-# define MEM_NOACCESS(a,len) VALGRIND_MAKE_MEM_NOACCESS(a,len)
-# define MEM_CHECK_ADDRESSABLE(a,len) VALGRIND_CHECK_MEM_IS_ADDRESSABLE(a,len)
-# define MEM_CHECK_DEFINED(a,len) VALGRIND_CHECK_MEM_IS_DEFINED(a,len)
-#else /* HAVE_VALGRIND */
-# define MEM_UNDEFINED(a,len) ((void) 0)
-# define MEM_NOACCESS(a,len) ((void) 0)
-# define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
-# define MEM_CHECK_DEFINED(a,len) ((void) 0)
-#endif /* HAVE_VALGRIND */
-
-#ifndef THREAD
-extern int NEAR my_errno;		/* Last error in mysys */
-#else
-#include <my_pthread.h>
-#endif
-
-#include <m_ctype.h>                    /* for CHARSET_INFO */
-#include <stdarg.h>
-#include <typelib.h>
-
-#define MYSYS_PROGRAM_USES_CURSES()  { error_handler_hook = my_message_curses;	mysys_uses_curses=1; }
-#define MYSYS_PROGRAM_DONT_USE_CURSES()  { error_handler_hook = my_message_no_curses; mysys_uses_curses=0;}
-#define MY_INIT(name)   { my_progname= name; my_init(); }
-
-#define MY_FILE_ERROR	((size_t) -1)
-
-	/* General bitmaps for my_func's */
-#define MY_FFNF		1	/* Fatal if file not found */
-#define MY_FNABP	2	/* Fatal if not all bytes read/writen */
-#define MY_NABP		4	/* Error if not all bytes read/writen */
-#define MY_FAE		8	/* Fatal if any error */
-#define MY_WME		16	/* Write message on error */
-#define MY_WAIT_IF_FULL 32	/* Wait and try again if disk full error */
-#define MY_IGNORE_BADFD 32      /* my_sync: ignore 'bad descriptor' errors */
-#define MY_SYNC_DIR     1024    /* my_create/delete/rename: sync directory */
-#define MY_RAID         64      /* Support for RAID */
-#define MY_FULL_IO     512      /* For my_read - loop intil I/O is complete */
-#define MY_DONT_CHECK_FILESIZE 128 /* Option to init_io_cache() */
-#define MY_LINK_WARNING 32	/* my_redel() gives warning if links */
-#define MY_COPYTIME	64	/* my_redel() copys time */
-#define MY_DELETE_OLD	256	/* my_create_with_symlink() */
-#define MY_RESOLVE_LINK 128	/* my_realpath(); Only resolve links */
-#define MY_HOLD_ORIGINAL_MODES 128  /* my_copy() holds to file modes */
-#define MY_REDEL_MAKE_BACKUP 256
-#define MY_SEEK_NOT_DONE 32	/* my_lock may have to do a seek */
-#define MY_DONT_WAIT	64	/* my_lock() don't wait if can't lock */
-#define MY_ZEROFILL	32	/* my_malloc(), fill array with zero */
-#define MY_ALLOW_ZERO_PTR 64	/* my_realloc() ; zero ptr -> malloc */
-#define MY_FREE_ON_ERROR 128	/* my_realloc() ; Free old ptr on error */
-#define MY_HOLD_ON_ERROR 256	/* my_realloc() ; Return old ptr on error */
-#define MY_DONT_OVERWRITE_FILE 1024	/* my_copy: Don't overwrite file */
-#define MY_THREADSAFE 2048      /* my_seek(): lock fd mutex */
-#define MY_SYNC       4096      /* my_copy(): sync dst file */
-
-#define MY_CHECK_ERROR	1	/* Params to my_end; Check open-close */
-#define MY_GIVE_INFO	2	/* Give time info about process*/
-#define MY_DONT_FREE_DBUG 4     /* Do not call DBUG_END() in my_end() */
-
-#define MY_REMOVE_NONE    0     /* Params for modify_defaults_file */
-#define MY_REMOVE_OPTION  1
-#define MY_REMOVE_SECTION 2
-
-#define ME_HIGHBYTE	8	/* Shift for colours */
-#define ME_NOCUR	1	/* Don't use curses message */
-#define ME_OLDWIN	2	/* Use old window */
-#define ME_BELL		4	/* Ring bell then printing message */
-#define ME_HOLDTANG	8	/* Don't delete last keys */
-#define ME_WAITTOT	16	/* Wait for errtime secs of for a action */
-#define ME_WAITTANG	32	/* Wait for a user action  */
-#define ME_NOREFRESH	64	/* Dont refresh screen */
-#define ME_NOINPUT	128	/* Dont use the input libary */
-#define ME_COLOUR1	((1 << ME_HIGHBYTE))	/* Possibly error-colours */
-#define ME_COLOUR2	((2 << ME_HIGHBYTE))
-#define ME_COLOUR3	((3 << ME_HIGHBYTE))
-#define ME_FATALERROR   1024    /* Fatal statement error */
-#define ME_NO_WARNING_FOR_ERROR 2048 /* Don't push a warning for error */
-#define ME_NO_SP_HANDLER 4096 /* Don't call stored routine error handlers */
-
-	/* Bits in last argument to fn_format */
-#define MY_REPLACE_DIR		1	/* replace dir in name with 'dir' */
-#define MY_REPLACE_EXT		2	/* replace extension with 'ext' */
-#define MY_UNPACK_FILENAME	4	/* Unpack name (~ -> home) */
-#define MY_PACK_FILENAME	8	/* Pack name (home -> ~) */
-#define MY_RESOLVE_SYMLINKS	16	/* Resolve all symbolic links */
-#define MY_RETURN_REAL_PATH	32	/* return full path for file */
-#define MY_SAFE_PATH		64	/* Return NULL if too long path */
-#define MY_RELATIVE_PATH	128	/* name is relative to 'dir' */
-#define MY_APPEND_EXT           256     /* add 'ext' as additional extension*/
-
-
-	/* My seek flags */
-#define MY_SEEK_SET	0
-#define MY_SEEK_CUR	1
-#define MY_SEEK_END	2
-
-	/* Some constants */
-#define MY_WAIT_FOR_USER_TO_FIX_PANIC	60	/* in seconds */
-#define MY_WAIT_GIVE_USER_A_MESSAGE	10	/* Every 10 times of prev */
-#define MIN_COMPRESS_LENGTH		50	/* Don't compress small bl. */
-#define DFLT_INIT_HITS  3
-
-	/* root_alloc flags */
-#define MY_KEEP_PREALLOC	1
-#define MY_MARK_BLOCKS_FREE     2  /* move used to free list and reuse them */
-
-	/* Internal error numbers (for assembler functions) */
-#define MY_ERRNO_EDOM		33
-#define MY_ERRNO_ERANGE		34
-
-	/* Bits for get_date timeflag */
-#define GETDATE_DATE_TIME	1
-#define GETDATE_SHORT_DATE	2
-#define GETDATE_HHMMSSTIME	4
-#define GETDATE_GMT		8
-#define GETDATE_FIXEDLENGTH	16
-
-	/* defines when allocating data */
-#ifdef SAFEMALLOC
-#define my_malloc(SZ,FLAG) _mymalloc((SZ), __FILE__, __LINE__, FLAG )
-#define my_malloc_ci(SZ,FLAG) _mymalloc((SZ), sFile, uLine, FLAG )
-#define my_realloc(PTR,SZ,FLAG) _myrealloc((PTR), (SZ), __FILE__, __LINE__, FLAG )
-#define my_checkmalloc() _sanity( __FILE__, __LINE__ )
-#define my_free(PTR,FLAG) _myfree((PTR), __FILE__, __LINE__,FLAG)
-#define my_memdup(A,B,C) _my_memdup((A),(B), __FILE__,__LINE__,C)
-#define my_strdup(A,C) _my_strdup((A), __FILE__,__LINE__,C)
-#define my_strndup(A,B,C) _my_strndup((A),(B),__FILE__,__LINE__,C)
-#define TRASH(A,B) do { bfill(A, B, 0x8F); MEM_UNDEFINED(A, B); } while (0)
-#define QUICK_SAFEMALLOC sf_malloc_quick=1
-#define NORMAL_SAFEMALLOC sf_malloc_quick=0
-extern uint sf_malloc_prehunc,sf_malloc_endhunc,sf_malloc_quick;
-extern ulonglong sf_malloc_mem_limit;
-
-#define CALLER_INFO_PROTO   , const char *sFile, uint uLine
-#define CALLER_INFO         , __FILE__, __LINE__
-#define ORIG_CALLER_INFO    , sFile, uLine
-#else
-#define my_checkmalloc()
-#undef TERMINATE
-#define TERMINATE(A,B) {}
-#define QUICK_SAFEMALLOC
-#define NORMAL_SAFEMALLOC
-extern void *my_malloc(size_t Size,myf MyFlags);
-#define my_malloc_ci(SZ,FLAG) my_malloc( SZ, FLAG )
-extern void *my_realloc(void *oldpoint, size_t Size, myf MyFlags);
-extern void my_no_flags_free(void *ptr);
-extern void *my_memdup(const void *from,size_t length,myf MyFlags);
-extern char *my_strdup(const char *from,myf MyFlags);
-extern char *my_strndup(const char *from, size_t length,
-				   myf MyFlags);
-/* we do use FG (as a no-op) in below so that a typo on FG is caught */
-#define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR))
-#define CALLER_INFO_PROTO   /* nothing */
-#define CALLER_INFO         /* nothing */
-#define ORIG_CALLER_INFO    /* nothing */
-#define TRASH(A,B) do{MEM_CHECK_ADDRESSABLE(A,B);MEM_UNDEFINED(A,B);} while (0)
-#endif
-
-#if defined(ENABLED_DEBUG_SYNC)
-extern void (*debug_sync_C_callback_ptr)(const char *, size_t);
-#define DEBUG_SYNC_C(_sync_point_name_) do {                            \
-    if (debug_sync_C_callback_ptr != NULL)                              \
-      (*debug_sync_C_callback_ptr)(STRING_WITH_LEN(_sync_point_name_)); } \
-  while(0)
-#else
-#define DEBUG_SYNC_C(_sync_point_name_)
-#endif /* defined(ENABLED_DEBUG_SYNC) */
-
-#ifdef HAVE_LARGE_PAGES
-extern uint my_get_large_page_size(void);
-extern uchar * my_large_malloc(size_t size, myf my_flags);
-extern void my_large_free(uchar * ptr, myf my_flags);
-#else
-#define my_get_large_page_size() (0)
-#define my_large_malloc(A,B) my_malloc_lock((A),(B))
-#define my_large_free(A,B) my_free_lock((A),(B))
-#endif /* HAVE_LARGE_PAGES */
-
-#ifdef HAVE_ALLOCA
-#if defined(_AIX) && !defined(__GNUC__) && !defined(_AIX43)
-#pragma alloca
-#endif /* _AIX */
-#if defined(__MWERKS__)
-#undef alloca
-#define alloca _alloca
-#endif /* __MWERKS__ */
-#if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca)
-#define alloca __builtin_alloca
-#endif /* GNUC */
-#define my_alloca(SZ) alloca((size_t) (SZ))
-#define my_afree(PTR) {}
-#else
-#define my_alloca(SZ) my_malloc(SZ,MYF(0))
-#define my_afree(PTR) my_free(PTR,MYF(MY_WME))
-#endif /* HAVE_ALLOCA */
-
-#ifndef errno				/* did we already get it? */
-#ifdef HAVE_ERRNO_AS_DEFINE
-#include <errno.h>			/* errno is a define */
-#else
-extern int errno;			/* declare errno */
-#endif
-#endif					/* #ifndef errno */
-extern char *home_dir;			/* Home directory for user */
-extern const char *my_progname;		/* program-name (printed in errors) */
-extern char NEAR curr_dir[];		/* Current directory for user */
-extern int (*error_handler_hook)(uint my_err, const char *str,myf MyFlags);
-extern int (*fatal_error_handler_hook)(uint my_err, const char *str,
-				       myf MyFlags);
-extern uint my_file_limit;
-extern ulong my_thread_stack_size;
-
-#ifdef HAVE_LARGE_PAGES
-extern my_bool my_use_large_pages;
-extern uint    my_large_page_size;
-#endif
-
-/* charsets */
-extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info;
-extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[256];
-extern CHARSET_INFO compiled_charsets[];
-
-/* statistics */
-extern ulong	my_file_opened,my_stream_opened, my_tmp_file_created;
-extern ulong    my_file_total_opened;
-extern uint	mysys_usage_id;
-extern my_bool	my_init_done;
-
-					/* Point to current my_message() */
-extern void (*my_sigtstp_cleanup)(void),
-					/* Executed before jump to shell */
-	    (*my_sigtstp_restart)(void),
-	    (*my_abort_hook)(int);
-					/* Executed when comming from shell */
-extern MYSQL_PLUGIN_IMPORT int NEAR my_umask;		/* Default creation mask  */
-extern int NEAR my_umask_dir,
-	   NEAR my_recived_signals,	/* Signals we have got */
-	   NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */
-	   NEAR my_dont_interrupt;	/* call remember_intr when set */
-extern my_bool NEAR mysys_uses_curses, my_use_symdir;
-extern size_t sf_malloc_cur_memory, sf_malloc_max_memory;
-
-extern ulong	my_default_record_cache_size;
-extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io,
-               NEAR my_disable_flush_key_blocks, NEAR my_disable_symlinks;
-extern char	wild_many,wild_one,wild_prefix;
-extern const char *charsets_dir;
-/* from default.c */
-extern char *my_defaults_extra_file;
-extern const char *my_defaults_group_suffix;
-extern const char *my_defaults_file;
-
-extern my_bool timed_mutexes;
-
-typedef struct wild_file_pack	/* Struct to hold info when selecting files */
-{
-  uint		wilds;		/* How many wildcards */
-  uint		not_pos;	/* Start of not-theese-files */
-  char *	*wild;		/* Pointer to wildcards */
-} WF_PACK;
-
-enum loglevel {
-   ERROR_LEVEL,
-   WARNING_LEVEL,
-   INFORMATION_LEVEL
-};
-
-enum cache_type
-{
-  TYPE_NOT_SET= 0, READ_CACHE, WRITE_CACHE,
-  SEQ_READ_APPEND		/* sequential read or append */,
-  READ_FIFO, READ_NET,WRITE_NET};
-
-enum flush_type
-{
-  FLUSH_KEEP,           /* flush block and keep it in the cache */
-  FLUSH_RELEASE,        /* flush block and remove it from the cache */
-  FLUSH_IGNORE_CHANGED, /* remove block from the cache */
-  /*
-    As my_disable_flush_pagecache_blocks is always 0, the following option
-    is strictly equivalent to FLUSH_KEEP
-  */
-  FLUSH_FORCE_WRITE
-};
-
-typedef struct st_record_cache	/* Used when cacheing records */
-{
-  File file;
-  int	rc_seek,error,inited;
-  uint	rc_length,read_length,reclength;
-  my_off_t rc_record_pos,end_of_file;
-  uchar *rc_buff,*rc_buff2,*rc_pos,*rc_end,*rc_request_pos;
-#ifdef HAVE_AIOWAIT
-  int	use_async_io;
-  my_aio_result aio_result;
-#endif
-  enum cache_type type;
-} RECORD_CACHE;
-
-enum file_type
-{
-  UNOPEN = 0, FILE_BY_OPEN, FILE_BY_CREATE, STREAM_BY_FOPEN, STREAM_BY_FDOPEN,
-  FILE_BY_MKSTEMP, FILE_BY_DUP
-};
-
-struct st_my_file_info
-{
-  char *		name;
-  enum file_type	type;
-#if defined(THREAD) && !defined(HAVE_PREAD)
-  pthread_mutex_t	mutex;
-#endif
-};
-
-extern struct st_my_file_info *my_file_info;
-
-typedef struct st_dynamic_array
-{
-  uchar *buffer;
-  uint elements,max_element;
-  uint alloc_increment;
-  uint size_of_element;
-} DYNAMIC_ARRAY;
-
-typedef struct st_my_tmpdir
-{
-  DYNAMIC_ARRAY full_list;
-  char **list;
-  uint cur, max;
-#ifdef THREAD
-  pthread_mutex_t mutex;
-#endif
-} MY_TMPDIR;
-
-typedef struct st_dynamic_string
-{
-  char *str;
-  size_t length,max_length,alloc_increment;
-} DYNAMIC_STRING;
-
-struct st_io_cache;
-typedef int (*IO_CACHE_CALLBACK)(struct st_io_cache*);
-
-#ifdef THREAD
-typedef struct st_io_cache_share
-{
-  pthread_mutex_t       mutex;           /* To sync on reads into buffer. */
-  pthread_cond_t        cond;            /* To wait for signals. */
-  pthread_cond_t        cond_writer;     /* For a synchronized writer. */
-  /* Offset in file corresponding to the first byte of buffer. */
-  my_off_t              pos_in_file;
-  /* If a synchronized write cache is the source of the data. */
-  struct st_io_cache    *source_cache;
-  uchar                 *buffer;         /* The read buffer. */
-  uchar                 *read_end;       /* Behind last valid byte of buffer. */
-  int                   running_threads; /* threads not in lock. */
-  int                   total_threads;   /* threads sharing the cache. */
-  int                   error;           /* Last error. */
-#ifdef NOT_YET_IMPLEMENTED
-  /* whether the structure should be free'd */
-  my_bool alloced;
-#endif
-} IO_CACHE_SHARE;
-#endif
-
-typedef struct st_io_cache		/* Used when cacheing files */
-{
-  /* Offset in file corresponding to the first byte of uchar* buffer. */
-  my_off_t pos_in_file;
-  /*
-    The offset of end of file for READ_CACHE and WRITE_CACHE.
-    For SEQ_READ_APPEND it the maximum of the actual end of file and
-    the position represented by read_end.
-  */
-  my_off_t end_of_file;
-  /* Points to current read position in the buffer */
-  uchar	*read_pos;
-  /* the non-inclusive boundary in the buffer for the currently valid read */
-  uchar  *read_end;
-  uchar  *buffer;				/* The read buffer */
-  /* Used in ASYNC_IO */
-  uchar  *request_pos;
-
-  /* Only used in WRITE caches and in SEQ_READ_APPEND to buffer writes */
-  uchar  *write_buffer;
-  /*
-    Only used in SEQ_READ_APPEND, and points to the current read position
-    in the write buffer. Note that reads in SEQ_READ_APPEND caches can
-    happen from both read buffer (uchar* buffer) and write buffer
-    (uchar* write_buffer).
-  */
-  uchar *append_read_pos;
-  /* Points to current write position in the write buffer */
-  uchar *write_pos;
-  /* The non-inclusive boundary of the valid write area */
-  uchar *write_end;
-
-  /*
-    Current_pos and current_end are convenience variables used by
-    my_b_tell() and other routines that need to know the current offset
-    current_pos points to &write_pos, and current_end to &write_end in a
-    WRITE_CACHE, and &read_pos and &read_end respectively otherwise
-  */
-  uchar  **current_pos, **current_end;
-#ifdef THREAD
-  /*
-    The lock is for append buffer used in SEQ_READ_APPEND cache
-    need mutex copying from append buffer to read buffer.
-  */
-  pthread_mutex_t append_buffer_lock;
-  /*
-    The following is used when several threads are reading the
-    same file in parallel. They are synchronized on disk
-    accesses reading the cached part of the file asynchronously.
-    It should be set to NULL to disable the feature.  Only
-    READ_CACHE mode is supported.
-  */
-  IO_CACHE_SHARE *share;
-#endif
-  /*
-    A caller will use my_b_read() macro to read from the cache
-    if the data is already in cache, it will be simply copied with
-    memcpy() and internal variables will be accordinging updated with
-    no functions invoked. However, if the data is not fully in the cache,
-    my_b_read() will call read_function to fetch the data. read_function
-    must never be invoked directly.
-  */
-  int (*read_function)(struct st_io_cache *,uchar *,size_t);
-  /*
-    Same idea as in the case of read_function, except my_b_write() needs to
-    be replaced with my_b_append() for a SEQ_READ_APPEND cache
-  */
-  int (*write_function)(struct st_io_cache *,const uchar *,size_t);
-  /*
-    Specifies the type of the cache. Depending on the type of the cache
-    certain operations might not be available and yield unpredicatable
-    results. Details to be documented later
-  */
-  enum cache_type type;
-  /*
-    Callbacks when the actual read I/O happens. These were added and
-    are currently used for binary logging of LOAD DATA INFILE - when a
-    block is read from the file, we create a block create/append event, and
-    when IO_CACHE is closed, we create an end event. These functions could,
-    of course be used for other things
-  */
-  IO_CACHE_CALLBACK pre_read;
-  IO_CACHE_CALLBACK post_read;
-  IO_CACHE_CALLBACK pre_close;
-  /*
-    Counts the number of times, when we were forced to use disk. We use it to
-    increase the binlog_cache_disk_use status variable.
-  */
-  ulong disk_writes;
-  void* arg;				/* for use by pre/post_read */
-  char *file_name;			/* if used with 'open_cached_file' */
-  char *dir,*prefix;
-  File file; /* file descriptor */
-  /*
-    seek_not_done is set by my_b_seek() to inform the upcoming read/write
-    operation that a seek needs to be preformed prior to the actual I/O
-    error is 0 if the cache operation was successful, -1 if there was a
-    "hard" error, and the actual number of I/O-ed bytes if the read/write was
-    partial.
-  */
-  int	seek_not_done,error;
-  /* buffer_length is memory size allocated for buffer or write_buffer */
-  size_t	buffer_length;
-  /* read_length is the same as buffer_length except when we use async io */
-  size_t  read_length;
-  myf	myflags;			/* Flags used to my_read/my_write */
-  /*
-    alloced_buffer is 1 if the buffer was allocated by init_io_cache() and
-    0 if it was supplied by the user.
-    Currently READ_NET is the only one that will use a buffer allocated
-    somewhere else
-  */
-  my_bool alloced_buffer;
-#ifdef HAVE_AIOWAIT
-  /*
-    As inidicated by ifdef, this is for async I/O, which is not currently
-    used (because it's not reliable on all systems)
-  */
-  uint inited;
-  my_off_t aio_read_pos;
-  my_aio_result aio_result;
-#endif
-} IO_CACHE;
-
-typedef int (*qsort2_cmp)(const void *, const void *, const void *);
-
-	/* defines for mf_iocache */
-
-	/* Test if buffer is inited */
-#define my_b_clear(info) (info)->buffer=0
-#define my_b_inited(info) (info)->buffer
-#define my_b_EOF INT_MIN
-
-#define my_b_read(info,Buffer,Count) \
-  ((info)->read_pos + (Count) <= (info)->read_end ?\
-   (memcpy(Buffer,(info)->read_pos,(size_t) (Count)), \
-    ((info)->read_pos+=(Count)),0) :\
-   (*(info)->read_function)((info),Buffer,Count))
-
-#define my_b_write(info,Buffer,Count) \
- ((info)->write_pos + (Count) <=(info)->write_end ?\
-  (memcpy((info)->write_pos, (Buffer), (size_t)(Count)),\
-   ((info)->write_pos+=(Count)),0) : \
-   (*(info)->write_function)((info),(uchar *)(Buffer),(Count)))
-
-#define my_b_get(info) \
-  ((info)->read_pos != (info)->read_end ?\
-   ((info)->read_pos++, (int) (uchar) (info)->read_pos[-1]) :\
-   _my_b_get(info))
-
-	/* my_b_write_byte dosn't have any err-check */
-#define my_b_write_byte(info,chr) \
-  (((info)->write_pos < (info)->write_end) ?\
-   ((*(info)->write_pos++)=(chr)) :\
-   (_my_b_write(info,0,0) , ((*(info)->write_pos++)=(chr))))
-
-#define my_b_fill_cache(info) \
-  (((info)->read_end=(info)->read_pos),(*(info)->read_function)(info,0,0))
-
-#define my_b_tell(info) ((info)->pos_in_file + \
-			 (size_t) (*(info)->current_pos - (info)->request_pos))
-
-#define my_b_get_buffer_start(info) (info)->request_pos 
-#define my_b_get_bytes_in_buffer(info) (char*) (info)->read_end -   \
-  (char*) my_b_get_buffer_start(info)
-#define my_b_get_pos_in_file(info) (info)->pos_in_file
-
-/* tell write offset in the SEQ_APPEND cache */
-int      my_b_copy_to_file(IO_CACHE *cache, FILE *file);
-my_off_t my_b_append_tell(IO_CACHE* info);
-my_off_t my_b_safe_tell(IO_CACHE* info); /* picks the correct tell() */
-
-#define my_b_bytes_in_cache(info) (size_t) (*(info)->current_end - \
-					  *(info)->current_pos)
-
-typedef uint32 ha_checksum;
-
-/* Define the type of function to be passed to process_default_option_files */
-typedef int (*Process_option_func)(void *ctx, const char *group_name,
-                                   const char *option);
-
-#include <my_alloc.h>
-
-
-	/* Prototypes for mysys and my_func functions */
-
-extern int my_copy(const char *from,const char *to,myf MyFlags);
-extern int my_append(const char *from,const char *to,myf MyFlags);
-extern int my_delete(const char *name,myf MyFlags);
-extern int my_getwd(char * buf,size_t size,myf MyFlags);
-extern int my_setwd(const char *dir,myf MyFlags);
-extern int my_lock(File fd,int op,my_off_t start, my_off_t length,myf MyFlags);
-extern void *my_once_alloc(size_t Size,myf MyFlags);
-extern void my_once_free(void);
-extern char *my_once_strdup(const char *src,myf myflags);
-extern void *my_once_memdup(const void *src, size_t len, myf myflags);
-extern File my_open(const char *FileName,int Flags,myf MyFlags);
-extern File my_register_filename(File fd, const char *FileName,
-				 enum file_type type_of_file,
-				 uint error_message_number, myf MyFlags);
-extern File my_create(const char *FileName,int CreateFlags,
-		      int AccessFlags, myf MyFlags);
-extern int my_close(File Filedes,myf MyFlags);
-extern File my_dup(File file, myf MyFlags);
-extern int my_mkdir(const char *dir, int Flags, myf MyFlags);
-extern int my_readlink(char *to, const char *filename, myf MyFlags);
-extern int my_is_symlink(const char *filename);
-extern int my_realpath(char *to, const char *filename, myf MyFlags);
-extern File my_create_with_symlink(const char *linkname, const char *filename,
-				   int createflags, int access_flags,
-				   myf MyFlags);
-extern int my_delete_with_symlink(const char *name, myf MyFlags);
-extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags);
-extern int my_symlink(const char *content, const char *linkname, myf MyFlags);
-extern size_t my_read(File Filedes,uchar *Buffer,size_t Count,myf MyFlags);
-extern size_t my_pread(File Filedes,uchar *Buffer,size_t Count,my_off_t offset,
-		     myf MyFlags);
-extern int my_rename(const char *from,const char *to,myf MyFlags);
-extern my_off_t my_seek(File fd,my_off_t pos,int whence,myf MyFlags);
-extern my_off_t my_tell(File fd,myf MyFlags);
-extern size_t my_write(File Filedes,const uchar *Buffer,size_t Count,
-		     myf MyFlags);
-extern size_t my_pwrite(File Filedes,const uchar *Buffer,size_t Count,
-		      my_off_t offset,myf MyFlags);
-extern size_t my_fread(FILE *stream,uchar *Buffer,size_t Count,myf MyFlags);
-extern size_t my_fwrite(FILE *stream,const uchar *Buffer,size_t Count,
-		      myf MyFlags);
-extern my_off_t my_fseek(FILE *stream,my_off_t pos,int whence,myf MyFlags);
-extern my_off_t my_ftell(FILE *stream,myf MyFlags);
-extern void *_mymalloc(size_t uSize,const char *sFile,
-                       uint uLine, myf MyFlag);
-extern void *_myrealloc(void *pPtr,size_t uSize,const char *sFile,
-		       uint uLine, myf MyFlag);
-extern void * my_multi_malloc _VARARGS((myf MyFlags, ...));
-extern void _myfree(void *pPtr,const char *sFile,uint uLine, myf MyFlag);
-extern int _sanity(const char *sFile, uint uLine);
-extern void *_my_memdup(const void *from, size_t length,
-                        const char *sFile, uint uLine,myf MyFlag);
-extern char * _my_strdup(const char *from, const char *sFile, uint uLine,
-                         myf MyFlag);
-extern char *_my_strndup(const char *from, size_t length,
-                         const char *sFile, uint uLine,
-                         myf MyFlag);
-
-/* implemented in my_memmem.c */
-extern void *my_memmem(const void *haystack, size_t haystacklen,
-                       const void *needle, size_t needlelen);
-
-
-#ifdef __WIN__
-extern int my_access(const char *path, int amode);
-extern File my_sopen(const char *path, int oflag, int shflag, int pmode);
-#else
-#define my_access access
-#endif
-extern int check_if_legal_filename(const char *path);
-extern int check_if_legal_tablename(const char *path);
-
-#if defined(__WIN__) && defined(__NT__)
-extern int nt_share_delete(const char *name,myf MyFlags);
-#define my_delete_allow_opened(fname,flags)  nt_share_delete((fname),(flags))
-#else
-#define my_delete_allow_opened(fname,flags)  my_delete((fname),(flags))
-#endif
-
-#ifndef TERMINATE
-extern void TERMINATE(FILE *file, uint flag);
-#endif
-extern void init_glob_errs(void);
-extern void wait_for_free_space(const char *filename, int errors);
-extern FILE *my_fopen(const char *FileName,int Flags,myf MyFlags);
-extern FILE *my_fdopen(File Filedes,const char *name, int Flags,myf MyFlags);
-extern int my_fclose(FILE *fd,myf MyFlags);
-extern int my_chsize(File fd,my_off_t newlength, int filler, myf MyFlags);
-extern int my_sync(File fd, myf my_flags);
-extern int my_sync_dir(const char *dir_name, myf my_flags);
-extern int my_sync_dir_by_file(const char *file_name, myf my_flags);
-extern int my_error _VARARGS((int nr,myf MyFlags, ...));
-extern int my_printf_error _VARARGS((uint my_err, const char *format,
-				     myf MyFlags, ...))
-				    ATTRIBUTE_FORMAT(printf, 2, 4);
-extern int my_error_register(const char **errmsgs, int first, int last);
-extern const char **my_error_unregister(int first, int last);
-extern int my_message(uint my_err, const char *str,myf MyFlags);
-extern int my_message_no_curses(uint my_err, const char *str,myf MyFlags);
-extern int my_message_curses(uint my_err, const char *str,myf MyFlags);
-extern my_bool my_init(void);
-extern void my_end(int infoflag);
-extern int my_redel(const char *from, const char *to, int MyFlags);
-extern int my_copystat(const char *from, const char *to, int MyFlags);
-extern char * my_filename(File fd);
-
-#ifndef THREAD
-extern void dont_break(void);
-extern void allow_break(void);
-#else
-#define dont_break()
-#define allow_break()
-#endif
-
-#ifdef EXTRA_DEBUG
-void my_print_open_files(void);
-#else
-#define my_print_open_files()
-#endif
-
-extern my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist);
-extern char *my_tmpdir(MY_TMPDIR *tmpdir);
-extern void free_tmpdir(MY_TMPDIR *tmpdir);
-
-extern void my_remember_signal(int signal_number,sig_handler (*func)(int));
-extern size_t dirname_part(char * to,const char *name, size_t *to_res_length);
-extern size_t dirname_length(const char *name);
-#define base_name(A) (A+dirname_length(A))
-extern int test_if_hard_path(const char *dir_name);
-extern my_bool has_path(const char *name);
-extern char *convert_dirname(char *to, const char *from, const char *from_end);
-extern void to_unix_path(char * name);
-extern char * fn_ext(const char *name);
-extern char * fn_same(char * toname,const char *name,int flag);
-extern char * fn_format(char * to,const char *name,const char *dir,
-			   const char *form, uint flag);
-extern size_t strlength(const char *str);
-extern void pack_dirname(char * to,const char *from);
-extern size_t normalize_dirname(char * to, const char *from);
-extern size_t unpack_dirname(char * to,const char *from);
-extern size_t cleanup_dirname(char * to,const char *from);
-extern size_t system_filename(char * to,const char *from);
-extern size_t unpack_filename(char * to,const char *from);
-extern char * intern_filename(char * to,const char *from);
-extern char * directory_file_name(char * dst, const char *src);
-extern int pack_filename(char * to, const char *name, size_t max_length);
-extern char * my_path(char * to,const char *progname,
-			 const char *own_pathname_part);
-extern char * my_load_path(char * to, const char *path,
-			      const char *own_path_prefix);
-extern int wild_compare(const char *str,const char *wildstr,
-                        pbool str_is_pattern);
-extern WF_PACK *wf_comp(char * str);
-extern int wf_test(struct wild_file_pack *wf_pack,const char *name);
-extern void wf_end(struct wild_file_pack *buffer);
-extern my_bool array_append_string_unique(const char *str,
-                                          const char **array, size_t size);
-extern void get_date(char * to,int timeflag,time_t use_time);
-extern void soundex(CHARSET_INFO *, char * out_pntr, char * in_pntr,
-                    pbool remove_garbage);
-extern int init_record_cache(RECORD_CACHE *info,size_t cachesize,File file,
-			     size_t reclength,enum cache_type type,
-			     pbool use_async_io);
-extern int read_cache_record(RECORD_CACHE *info,uchar *to);
-extern int end_record_cache(RECORD_CACHE *info);
-extern int write_cache_record(RECORD_CACHE *info,my_off_t filepos,
-			      const uchar *record,size_t length);
-extern int flush_write_cache(RECORD_CACHE *info);
-extern long my_clock(void);
-extern sig_handler sigtstp_handler(int signal_number);
-extern void handle_recived_signals(void);
-
-extern sig_handler my_set_alarm_variable(int signo);
-extern void my_string_ptr_sort(uchar *base,uint items,size_t size);
-extern void radixsort_for_str_ptr(uchar* base[], uint number_of_elements,
-				  size_t size_of_element,uchar *buffer[]);
-extern qsort_t my_qsort(void *base_ptr, size_t total_elems, size_t size,
-                        qsort_cmp cmp);
-extern qsort_t my_qsort2(void *base_ptr, size_t total_elems, size_t size,
-                         qsort2_cmp cmp, void *cmp_argument);
-extern qsort2_cmp get_ptr_compare(size_t);
-void my_store_ptr(uchar *buff, size_t pack_length, my_off_t pos);
-my_off_t my_get_ptr(uchar *ptr, size_t pack_length);
-extern int init_io_cache(IO_CACHE *info,File file,size_t cachesize,
-			 enum cache_type type,my_off_t seek_offset,
-			 pbool use_async_io, myf cache_myflags);
-extern my_bool reinit_io_cache(IO_CACHE *info,enum cache_type type,
-			       my_off_t seek_offset,pbool use_async_io,
-			       pbool clear_cache);
-extern void setup_io_cache(IO_CACHE* info);
-extern int _my_b_read(IO_CACHE *info,uchar *Buffer,size_t Count);
-#ifdef THREAD
-extern int _my_b_read_r(IO_CACHE *info,uchar *Buffer,size_t Count);
-extern void init_io_cache_share(IO_CACHE *read_cache, IO_CACHE_SHARE *cshare,
-                                IO_CACHE *write_cache, uint num_threads);
-extern void remove_io_thread(IO_CACHE *info);
-#endif
-extern int _my_b_seq_read(IO_CACHE *info,uchar *Buffer,size_t Count);
-extern int _my_b_net_read(IO_CACHE *info,uchar *Buffer,size_t Count);
-extern int _my_b_get(IO_CACHE *info);
-extern int _my_b_async_read(IO_CACHE *info,uchar *Buffer,size_t Count);
-extern int _my_b_write(IO_CACHE *info,const uchar *Buffer,size_t Count);
-extern int my_b_append(IO_CACHE *info,const uchar *Buffer,size_t Count);
-extern int my_b_safe_write(IO_CACHE *info,const uchar *Buffer,size_t Count);
-
-extern int my_block_write(IO_CACHE *info, const uchar *Buffer,
-			  size_t Count, my_off_t pos);
-extern int my_b_flush_io_cache(IO_CACHE *info, int need_append_buffer_lock);
-
-#define flush_io_cache(info) my_b_flush_io_cache((info),1)
-
-extern int end_io_cache(IO_CACHE *info);
-extern size_t my_b_fill(IO_CACHE *info);
-extern void my_b_seek(IO_CACHE *info,my_off_t pos);
-extern size_t my_b_gets(IO_CACHE *info, char *to, size_t max_length);
-extern my_off_t my_b_filelength(IO_CACHE *info);
-extern size_t my_b_printf(IO_CACHE *info, const char* fmt, ...);
-extern size_t my_b_vprintf(IO_CACHE *info, const char* fmt, va_list ap);
-extern my_bool open_cached_file(IO_CACHE *cache,const char *dir,
-				 const char *prefix, size_t cache_size,
-				 myf cache_myflags);
-extern my_bool real_open_cached_file(IO_CACHE *cache);
-extern void close_cached_file(IO_CACHE *cache);
-File create_temp_file(char *to, const char *dir, const char *pfx,
-		      int mode, myf MyFlags);
-#define my_init_dynamic_array(A,B,C,D) init_dynamic_array2(A,B,NULL,C,D CALLER_INFO)
-#define my_init_dynamic_array_ci(A,B,C,D) init_dynamic_array2(A,B,NULL,C,D ORIG_CALLER_INFO)
-#define my_init_dynamic_array2(A,B,C,D,E) init_dynamic_array2(A,B,C,D,E CALLER_INFO)
-#define my_init_dynamic_array2_ci(A,B,C,D,E) init_dynamic_array2(A,B,C,D,E ORIG_CALLER_INFO)
-extern my_bool init_dynamic_array2(DYNAMIC_ARRAY *array,uint element_size,
-                                   void *init_buffer, uint init_alloc, 
-                                   uint alloc_increment
-                                   CALLER_INFO_PROTO);
-/* init_dynamic_array() function is deprecated */
-extern my_bool init_dynamic_array(DYNAMIC_ARRAY *array,uint element_size,
-                                  uint init_alloc,uint alloc_increment
-                                  CALLER_INFO_PROTO);
-extern my_bool insert_dynamic(DYNAMIC_ARRAY *array,uchar * element);
-extern uchar *alloc_dynamic(DYNAMIC_ARRAY *array);
-extern uchar *pop_dynamic(DYNAMIC_ARRAY*);
-extern my_bool set_dynamic(DYNAMIC_ARRAY *array,uchar * element,uint array_index);
-extern my_bool allocate_dynamic(DYNAMIC_ARRAY *array, uint max_elements);
-extern void get_dynamic(DYNAMIC_ARRAY *array,uchar * element,uint array_index);
-extern void delete_dynamic(DYNAMIC_ARRAY *array);
-extern void delete_dynamic_element(DYNAMIC_ARRAY *array, uint array_index);
-extern void freeze_size(DYNAMIC_ARRAY *array);
-extern int  get_index_dynamic(DYNAMIC_ARRAY *array, uchar * element);
-#define dynamic_array_ptr(array,array_index) ((array)->buffer+(array_index)*(array)->size_of_element)
-#define dynamic_element(array,array_index,type) ((type)((array)->buffer) +(array_index))
-#define push_dynamic(A,B) insert_dynamic((A),(B))
-#define reset_dynamic(array) ((array)->elements= 0)
-#define sort_dynamic(A,cmp) my_qsort((A)->buffer, (A)->elements, (A)->size_of_element, (cmp))
-
-extern my_bool init_dynamic_string(DYNAMIC_STRING *str, const char *init_str,
-				   size_t init_alloc,size_t alloc_increment);
-extern my_bool dynstr_append(DYNAMIC_STRING *str, const char *append);
-my_bool dynstr_append_mem(DYNAMIC_STRING *str, const char *append,
-			  size_t length);
-extern my_bool dynstr_append_os_quoted(DYNAMIC_STRING *str, const char *append,
-                                       ...);
-extern my_bool dynstr_set(DYNAMIC_STRING *str, const char *init_str);
-extern my_bool dynstr_realloc(DYNAMIC_STRING *str, size_t additional_size);
-extern my_bool dynstr_trunc(DYNAMIC_STRING *str, size_t n);
-extern void dynstr_free(DYNAMIC_STRING *str);
-#ifdef HAVE_MLOCK
-extern void *my_malloc_lock(size_t length,myf flags);
-extern void my_free_lock(void *ptr,myf flags);
-#else
-#define my_malloc_lock(A,B) my_malloc((A),(B))
-#define my_free_lock(A,B) my_free((A),(B))
-#endif
-#define alloc_root_inited(A) ((A)->min_malloc != 0)
-#define ALLOC_ROOT_MIN_BLOCK_SIZE (MALLOC_OVERHEAD + sizeof(USED_MEM) + 8)
-#define clear_alloc_root(A) do { (A)->free= (A)->used= (A)->pre_alloc= 0; (A)->min_malloc=0;} while(0)
-extern void init_alloc_root(MEM_ROOT *mem_root, size_t block_size,
-			    size_t pre_alloc_size);
-extern void *alloc_root(MEM_ROOT *mem_root, size_t Size);
-extern void *multi_alloc_root(MEM_ROOT *mem_root, ...);
-extern void free_root(MEM_ROOT *root, myf MyFLAGS);
-extern void set_prealloc_root(MEM_ROOT *root, char *ptr);
-extern void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size,
-                                size_t prealloc_size);
-extern char *strdup_root(MEM_ROOT *root,const char *str);
-extern char *strmake_root(MEM_ROOT *root,const char *str,size_t len);
-extern void *memdup_root(MEM_ROOT *root,const void *str, size_t len);
-extern int get_defaults_options(int argc, char **argv,
-                                char **defaults, char **extra_defaults,
-                                char **group_suffix);
-extern int my_load_defaults(const char *conf_file, const char **groups,
-                            int *argc, char ***argv, const char ***);
-extern int load_defaults(const char *conf_file, const char **groups,
-                         int *argc, char ***argv);
-extern int modify_defaults_file(const char *file_location, const char *option,
-                                const char *option_value,
-                                const char *section_name, int remove_option);
-extern int my_search_option_files(const char *conf_file, int *argc,
-                                  char ***argv, uint *args_used,
-                                  Process_option_func func, void *func_ctx,
-                                  const char **default_directories);
-extern void free_defaults(char **argv);
-extern void my_print_default_files(const char *conf_file);
-extern void print_defaults(const char *conf_file, const char **groups);
-extern my_bool my_compress(uchar *, size_t *, size_t *);
-extern my_bool my_uncompress(uchar *, size_t , size_t *);
-extern uchar *my_compress_alloc(const uchar *packet, size_t *len,
-                                size_t *complen);
-extern int packfrm(uchar *, size_t, uchar **, size_t *);
-extern int unpackfrm(uchar **, size_t *, const uchar *);
-
-extern ha_checksum my_checksum(ha_checksum crc, const uchar *mem,
-                               size_t count);
-extern void my_sleep(ulong m_seconds);
-extern ulong crc32(ulong crc, const uchar *buf, uint len);
-extern uint my_set_max_open_files(uint files);
-void my_free_open_file_info(void);
-
-extern time_t my_time(myf flags);
-extern ulonglong my_getsystime(void);
-extern ulonglong my_micro_time();
-extern ulonglong my_micro_time_and_time(time_t *time_arg);
-time_t my_time_possible_from_micro(ulonglong microtime);
-extern my_bool my_gethwaddr(uchar *to);
-extern int my_getncpus();
-
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-
-#ifndef MAP_NOSYNC
-#define MAP_NOSYNC      0
-#endif
-#ifndef MAP_NORESERVE
-#define MAP_NORESERVE 0         /* For irix and AIX */
-#endif
-
-#ifdef HAVE_MMAP64
-#define my_mmap(a,b,c,d,e,f)    mmap64(a,b,c,d,e,f)
-#else
-#define my_mmap(a,b,c,d,e,f)    mmap(a,b,c,d,e,f)
-#endif
-#define my_munmap(a,b)          munmap((a),(b))
-
-#else
-/* not a complete set of mmap() flags, but only those that nesessary */
-#define PROT_READ        1
-#define PROT_WRITE       2
-#define MAP_NORESERVE    0
-#define MAP_SHARED       0x0001
-#define MAP_PRIVATE      0x0002
-#define MAP_NOSYNC       0x0800
-#define MAP_FAILED       ((void *)-1)
-#define MS_SYNC          0x0000
-
-#ifndef __NETWARE__
-#define HAVE_MMAP
-#endif
-
-void *my_mmap(void *, size_t, int, int, int, my_off_t);
-int my_munmap(void *, size_t);
-#endif
-
-/* my_getpagesize */
-#ifdef HAVE_GETPAGESIZE
-#define my_getpagesize()        getpagesize()
-#else
-int my_getpagesize(void);
-#endif
-
-int my_msync(int, void *, size_t, int);
-
-/* character sets */
-extern uint get_charset_number(const char *cs_name, uint cs_flags);
-extern uint get_collation_number(const char *name);
-extern const char *get_charset_name(uint cs_number);
-
-extern CHARSET_INFO *get_charset(uint cs_number, myf flags);
-extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
-extern CHARSET_INFO *get_charset_by_csname(const char *cs_name,
-					   uint cs_flags, myf my_flags);
-
-extern my_bool resolve_charset(const char *cs_name,
-                               CHARSET_INFO *default_cs,
-                               CHARSET_INFO **cs);
-extern my_bool resolve_collation(const char *cl_name,
-                                 CHARSET_INFO *default_cl,
-                                 CHARSET_INFO **cl);
-extern void free_charsets(void);
-extern char *get_charsets_dir(char *buf);
-extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);
-extern my_bool init_compiled_charsets(myf flags);
-extern void add_compiled_collation(CHARSET_INFO *cs);
-extern size_t escape_string_for_mysql(CHARSET_INFO *charset_info,
-                                      char *to, size_t to_length,
-                                      const char *from, size_t length);
-#ifdef __WIN__
-#define BACKSLASH_MBTAIL
-/* File system character set */
-extern CHARSET_INFO *fs_character_set(void);
-#endif
-extern size_t escape_quotes_for_mysql(CHARSET_INFO *charset_info,
-                                      char *to, size_t to_length,
-                                      const char *from, size_t length);
-
-extern void thd_increment_bytes_sent(ulong length);
-extern void thd_increment_bytes_received(ulong length);
-extern void thd_increment_net_big_packet_count(ulong length);
-
-#ifdef __WIN__
-extern my_bool have_tcpip;		/* Is set if tcpip is used */
-
-/* implemented in my_windac.c */
-
-int my_security_attr_create(SECURITY_ATTRIBUTES **psa, const char **perror,
-                            DWORD owner_rights, DWORD everybody_rights);
-
-void my_security_attr_free(SECURITY_ATTRIBUTES *sa);
-
-/* implemented in my_conio.c */
-char* my_cgets(char *string, size_t clen, size_t* plen);
-
-#endif
-#ifdef __NETWARE__
-void netware_reg_user(const char *ip, const char *user,
-		      const char *application);
-#endif
-
-C_MODE_END
-#endif /* _my_sys_h */
diff --git a/dep/include/mysql/my_xml.h b/dep/include/mysql/my_xml.h
deleted file mode 100644
index 6a453ee90..000000000
--- a/dep/include/mysql/my_xml.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  */
-
-
-#ifndef _my_xml_h
-#define _my_xml_h
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-
-#define MY_XML_OK	0
-#define MY_XML_ERROR	1
-
-/* 
-  A flag whether to use absolute tag names in call-back functions,
-  like "a", "a.b" and "a.b.c" (used in character set file parser),
-  or relative names like "a", "b" and "c".
-*/
-#define MY_XML_FLAG_RELATIVE_NAMES 1
-
-/*
-  A flag whether to skip normilization of text values before calling
-  call-back functions: i.e. skip leading/trailing spaces,
-  \r, \n, \t characters.
-*/
-#define MY_XML_FLAG_SKIP_TEXT_NORMALIZATION 2
-
-enum my_xml_node_type
-{
-  MY_XML_NODE_TAG,   /* can have TAG, ATTR and TEXT children */
-  MY_XML_NODE_ATTR,  /* can have TEXT children               */
-  MY_XML_NODE_TEXT   /* cannot have children                 */
-};
-
-typedef struct xml_stack_st
-{
-  int flags;
-  enum my_xml_node_type current_node_type;
-  char errstr[128];
-  char attr[128];
-  char *attrend;
-  const char *beg;
-  const char *cur;
-  const char *end;
-  void *user_data;
-  int  (*enter)(struct xml_stack_st *st,const char *val, size_t len);
-  int  (*value)(struct xml_stack_st *st,const char *val, size_t len);
-  int  (*leave_xml)(struct xml_stack_st *st,const char *val, size_t len);
-} MY_XML_PARSER;
-
-void my_xml_parser_create(MY_XML_PARSER *st);
-void my_xml_parser_free(MY_XML_PARSER *st);
-int  my_xml_parse(MY_XML_PARSER *st,const char *str, size_t len);
-
-void my_xml_set_value_handler(MY_XML_PARSER *st, int (*)(MY_XML_PARSER *,
-							 const char *,
-							 size_t len));
-void my_xml_set_enter_handler(MY_XML_PARSER *st, int (*)(MY_XML_PARSER *,
-							 const char *,
-							 size_t len));
-void my_xml_set_leave_handler(MY_XML_PARSER *st, int (*)(MY_XML_PARSER *,
-							 const char *,
-							 size_t len));
-void my_xml_set_user_data(MY_XML_PARSER *st, void *);
-
-size_t my_xml_error_pos(MY_XML_PARSER *st);
-uint my_xml_error_lineno(MY_XML_PARSER *st);
-
-const char *my_xml_error_string(MY_XML_PARSER *st);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _my_xml_h */
diff --git a/dep/include/mysql/mysql.h b/dep/include/mysql/mysql.h
deleted file mode 100644
index bd0439af5..000000000
--- a/dep/include/mysql/mysql.h
+++ /dev/null
@@ -1,880 +0,0 @@
-/* Copyright (C) 2000-2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/*
-  This file defines the client API to MySQL and also the ABI of the
-  dynamically linked libmysqlclient.
-
-  The ABI should never be changed in a released product of MySQL
-  thus you need to take great care when changing the file. In case
-  the file is changed so the ABI is broken, you must also
-  update the SHAREDLIB_MAJOR_VERSION in configure.in .
-
-*/
-
-#ifndef _mysql_h
-#define _mysql_h
-
-#ifdef _AIX           /* large-file support will break without this */
-#include <standards.h>
-#endif
-
-#ifdef __CYGWIN__     /* CYGWIN implements a UNIX API */
-#undef WIN
-#undef _WIN
-#undef _WIN32
-#undef _WIN64
-#undef __WIN__
-#endif
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#ifndef _global_h				/* If not standard header */
-#include <sys/types.h>
-#ifdef __LCC__
-#include <winsock2.h>				/* For windows */
-#endif
-typedef char my_bool;
-#if (defined(_WIN32) || defined(_WIN64)) && !defined(__WIN__)
-#define __WIN__
-#endif
-#if !defined(__WIN__)
-#define STDCALL
-#else
-#define STDCALL __stdcall
-#endif
-
-#ifndef my_socket_defined
-#ifdef __WIN__
-#define my_socket SOCKET
-#else
-typedef int my_socket;
-#endif /* __WIN__ */
-#endif /* my_socket_defined */
-#endif /* _global_h */
-
-#include "mysql_version.h"
-#include "mysql_com.h"
-#include "mysql_time.h"
-
-#include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */
-
-extern unsigned int mysql_port;
-extern char *mysql_unix_port;
-
-#define CLIENT_NET_READ_TIMEOUT		365*24*3600	/* Timeout on read */
-#define CLIENT_NET_WRITE_TIMEOUT	365*24*3600	/* Timeout on write */
-
-#ifdef __NETWARE__
-// GCC have alternative #pragma pack(8) syntax and old gcc version not support pack(push,8), also any gcc version not support it at some paltform
-#if defined( __GNUC__ )
-#pragma pack(8) 
-#else 
-#pragma pack(push,8) 
-#endif 
-
-#endif
-
-#define IS_PRI_KEY(n)	((n) & PRI_KEY_FLAG)
-#define IS_NOT_NULL(n)	((n) & NOT_NULL_FLAG)
-#define IS_BLOB(n)	((n) & BLOB_FLAG)
-#define IS_NUM(t)	((t) <= MYSQL_TYPE_INT24 || (t) == MYSQL_TYPE_YEAR || (t) == MYSQL_TYPE_NEWDECIMAL)
-#define IS_NUM_FIELD(f)	 ((f)->flags & NUM_FLAG)
-#define INTERNAL_NUM_FIELD(f) (((f)->type <= MYSQL_TYPE_INT24 && ((f)->type != MYSQL_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == MYSQL_TYPE_YEAR)
-#define IS_LONGDATA(t) ((t) >= MYSQL_TYPE_TINY_BLOB && (t) <= MYSQL_TYPE_STRING)
-
-
-typedef struct st_mysql_field {
-  char *name;                 /* Name of column */
-  char *org_name;             /* Original column name, if an alias */
-  char *table;                /* Table of column if column was a field */
-  char *org_table;            /* Org table name, if table was an alias */
-  char *db;                   /* Database for table */
-  char *catalog;	      /* Catalog for table */
-  char *def;                  /* Default value (set by mysql_list_fields) */
-  unsigned long length;       /* Width of column (create length) */
-  unsigned long max_length;   /* Max width for selected set */
-  unsigned int name_length;
-  unsigned int org_name_length;
-  unsigned int table_length;
-  unsigned int org_table_length;
-  unsigned int db_length;
-  unsigned int catalog_length;
-  unsigned int def_length;
-  unsigned int flags;         /* Div flags */
-  unsigned int decimals;      /* Number of decimals in field */
-  unsigned int charsetnr;     /* Character set */
-  enum enum_field_types type; /* Type of field. See mysql_com.h for types */
-  void *extension;
-} MYSQL_FIELD;
-
-typedef char **MYSQL_ROW;		/* return data as array of strings */
-typedef unsigned int MYSQL_FIELD_OFFSET; /* offset to current field */
-
-#ifndef _global_h
-#if defined(NO_CLIENT_LONG_LONG)
-typedef unsigned long my_ulonglong;
-#elif defined (__WIN__)
-typedef unsigned __int64 my_ulonglong;
-#else
-typedef unsigned long long my_ulonglong;
-#endif
-#endif
-
-#include "typelib.h"
-
-#define MYSQL_COUNT_ERROR (~(my_ulonglong) 0)
-
-/* backward compatibility define - to be removed eventually */
-#define ER_WARN_DATA_TRUNCATED WARN_DATA_TRUNCATED
-
-typedef struct st_mysql_rows {
-  struct st_mysql_rows *next;		/* list of rows */
-  MYSQL_ROW data;
-  unsigned long length;
-} MYSQL_ROWS;
-
-typedef MYSQL_ROWS *MYSQL_ROW_OFFSET;	/* offset to current row */
-
-#include "my_alloc.h"
-
-typedef struct embedded_query_result EMBEDDED_QUERY_RESULT;
-typedef struct st_mysql_data {
-  MYSQL_ROWS *data;
-  struct embedded_query_result *embedded_info;
-  MEM_ROOT alloc;
-  my_ulonglong rows;
-  unsigned int fields;
-  /* extra info for embedded library */
-  void *extension;
-} MYSQL_DATA;
-
-enum mysql_option 
-{
-  MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE,
-  MYSQL_INIT_COMMAND, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,
-  MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_OPT_LOCAL_INFILE,
-  MYSQL_OPT_PROTOCOL, MYSQL_SHARED_MEMORY_BASE_NAME, MYSQL_OPT_READ_TIMEOUT,
-  MYSQL_OPT_WRITE_TIMEOUT, MYSQL_OPT_USE_RESULT,
-  MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION,
-  MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH,
-  MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT,
-  MYSQL_OPT_SSL_VERIFY_SERVER_CERT
-};
-
-struct st_mysql_options {
-  unsigned int connect_timeout, read_timeout, write_timeout;
-  unsigned int port, protocol;
-  unsigned long client_flag;
-  char *host,*user,*password,*unix_socket,*db;
-  struct st_dynamic_array *init_commands;
-  char *my_cnf_file,*my_cnf_group, *charset_dir, *charset_name;
-  char *ssl_key;				/* PEM key file */
-  char *ssl_cert;				/* PEM cert file */
-  char *ssl_ca;					/* PEM CA file */
-  char *ssl_capath;				/* PEM directory of CA-s? */
-  char *ssl_cipher;				/* cipher to use */
-  char *shared_memory_base_name;
-  unsigned long max_allowed_packet;
-  my_bool use_ssl;				/* if to use SSL or not */
-  my_bool compress,named_pipe;
- /*
-   On connect, find out the replication role of the server, and
-   establish connections to all the peers
- */
-  my_bool rpl_probe;
- /*
-   Each call to mysql_real_query() will parse it to tell if it is a read
-   or a write, and direct it to the slave or the master
- */
-  my_bool rpl_parse;
- /*
-   If set, never read from a master, only from slave, when doing
-   a read that is replication-aware
- */
-  my_bool no_master_reads;
-#if !defined(CHECK_EMBEDDED_DIFFERENCES) || defined(EMBEDDED_LIBRARY)
-  my_bool separate_thread;
-#endif
-  enum mysql_option methods_to_use;
-  char *client_ip;
-  /* Refuse client connecting to server if it uses old (pre-4.1.1) protocol */
-  my_bool secure_auth;
-  /* 0 - never report, 1 - always report (default) */
-  my_bool report_data_truncation;
-
-  /* function pointers for local infile support */
-  int (*local_infile_init)(void **, const char *, void *);
-  int (*local_infile_read)(void *, char *, unsigned int);
-  void (*local_infile_end)(void *);
-  int (*local_infile_error)(void *, char *, unsigned int);
-  void *local_infile_userdata;
-  void *extension;
-};
-
-enum mysql_status 
-{
-  MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,MYSQL_STATUS_USE_RESULT
-};
-
-enum mysql_protocol_type 
-{
-  MYSQL_PROTOCOL_DEFAULT, MYSQL_PROTOCOL_TCP, MYSQL_PROTOCOL_SOCKET,
-  MYSQL_PROTOCOL_PIPE, MYSQL_PROTOCOL_MEMORY
-};
-/*
-  There are three types of queries - the ones that have to go to
-  the master, the ones that go to a slave, and the adminstrative
-  type which must happen on the pivot connectioin
-*/
-enum mysql_rpl_type 
-{
-  MYSQL_RPL_MASTER, MYSQL_RPL_SLAVE, MYSQL_RPL_ADMIN
-};
-
-typedef struct character_set
-{
-  unsigned int      number;     /* character set number              */
-  unsigned int      state;      /* character set state               */
-  const char        *csname;    /* collation name                    */
-  const char        *name;      /* character set name                */
-  const char        *comment;   /* comment                           */
-  const char        *dir;       /* character set directory           */
-  unsigned int      mbminlen;   /* min. length for multibyte strings */
-  unsigned int      mbmaxlen;   /* max. length for multibyte strings */
-} MY_CHARSET_INFO;
-
-struct st_mysql_methods;
-struct st_mysql_stmt;
-
-typedef struct st_mysql
-{
-  NET		net;			/* Communication parameters */
-  unsigned char	*connector_fd;		/* ConnectorFd for SSL */
-  char		*host,*user,*passwd,*unix_socket,*server_version,*host_info;
-  char          *info, *db;
-  struct charset_info_st *charset;
-  MYSQL_FIELD	*fields;
-  MEM_ROOT	field_alloc;
-  my_ulonglong affected_rows;
-  my_ulonglong insert_id;		/* id if insert on table with NEXTNR */
-  my_ulonglong extra_info;		/* Not used */
-  unsigned long thread_id;		/* Id for connection in server */
-  unsigned long packet_length;
-  unsigned int	port;
-  unsigned long client_flag,server_capabilities;
-  unsigned int	protocol_version;
-  unsigned int	field_count;
-  unsigned int 	server_status;
-  unsigned int  server_language;
-  unsigned int	warning_count;
-  struct st_mysql_options options;
-  enum mysql_status status;
-  my_bool	free_me;		/* If free in mysql_close */
-  my_bool	reconnect;		/* set to 1 if automatic reconnect */
-
-  /* session-wide random string */
-  char	        scramble[SCRAMBLE_LENGTH+1];
-
- /*
-   Set if this is the original connection, not a master or a slave we have
-   added though mysql_rpl_probe() or mysql_set_master()/ mysql_add_slave()
- */
-  my_bool rpl_pivot;
-  /*
-    Pointers to the master, and the next slave connections, points to
-    itself if lone connection.
-  */
-  struct st_mysql* master, *next_slave;
-
-  struct st_mysql* last_used_slave; /* needed for round-robin slave pick */
- /* needed for send/read/store/use result to work correctly with replication */
-  struct st_mysql* last_used_con;
-
-  LIST  *stmts;                     /* list of all statements */
-  const struct st_mysql_methods *methods;
-  void *thd;
-  /*
-    Points to boolean flag in MYSQL_RES  or MYSQL_STMT. We set this flag 
-    from mysql_stmt_close if close had to cancel result set of this object.
-  */
-  my_bool *unbuffered_fetch_owner;
-  /* needed for embedded server - no net buffer to store the 'info' */
-  char *info_buffer;
-  void *extension;
-} MYSQL;
-
-
-typedef struct st_mysql_res {
-  my_ulonglong  row_count;
-  MYSQL_FIELD	*fields;
-  MYSQL_DATA	*data;
-  MYSQL_ROWS	*data_cursor;
-  unsigned long *lengths;		/* column lengths of current row */
-  MYSQL		*handle;		/* for unbuffered reads */
-  const struct st_mysql_methods *methods;
-  MYSQL_ROW	row;			/* If unbuffered read */
-  MYSQL_ROW	current_row;		/* buffer to current row */
-  MEM_ROOT	field_alloc;
-  unsigned int	field_count, current_field;
-  my_bool	eof;			/* Used by mysql_fetch_row */
-  /* mysql_stmt_close() had to cancel this result */
-  my_bool       unbuffered_fetch_cancelled;  
-  void *extension;
-} MYSQL_RES;
-
-#define MAX_MYSQL_MANAGER_ERR 256  
-#define MAX_MYSQL_MANAGER_MSG 256
-
-#define MANAGER_OK           200
-#define MANAGER_INFO         250
-#define MANAGER_ACCESS       401
-#define MANAGER_CLIENT_ERR   450
-#define MANAGER_INTERNAL_ERR 500
-
-#if !defined(MYSQL_SERVER) && !defined(MYSQL_CLIENT)
-#define MYSQL_CLIENT
-#endif
-
-
-typedef struct st_mysql_manager
-{
-  NET net;
-  char *host, *user, *passwd;
-  char *net_buf, *net_buf_pos, *net_data_end;
-  unsigned int port;
-  int cmd_status;
-  int last_errno;
-  int net_buf_size;
-  my_bool free_me;
-  my_bool eof;
-  char last_error[MAX_MYSQL_MANAGER_ERR];
-  void *extension;
-} MYSQL_MANAGER;
-
-typedef struct st_mysql_parameters
-{
-  unsigned long *p_max_allowed_packet;
-  unsigned long *p_net_buffer_length;
-  void *extension;
-} MYSQL_PARAMETERS;
-
-#if !defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
-#define max_allowed_packet (*mysql_get_parameters()->p_max_allowed_packet)
-#define net_buffer_length (*mysql_get_parameters()->p_net_buffer_length)
-#endif
-
-/*
-  Set up and bring down the server; to ensure that applications will
-  work when linked against either the standard client library or the
-  embedded server library, these functions should be called.
-*/
-int STDCALL mysql_server_init(int argc, char **argv, char **groups);
-void STDCALL mysql_server_end(void);
-
-/*
-  mysql_server_init/end need to be called when using libmysqld or
-  libmysqlclient (exactly, mysql_server_init() is called by mysql_init() so
-  you don't need to call it explicitely; but you need to call
-  mysql_server_end() to free memory). The names are a bit misleading
-  (mysql_SERVER* to be used when using libmysqlCLIENT). So we add more general
-  names which suit well whether you're using libmysqld or libmysqlclient. We
-  intend to promote these aliases over the mysql_server* ones.
-*/
-#define mysql_library_init mysql_server_init
-#define mysql_library_end mysql_server_end
-
-MYSQL_PARAMETERS *STDCALL mysql_get_parameters(void);
-
-/*
-  Set up and bring down a thread; these function should be called
-  for each thread in an application which opens at least one MySQL
-  connection.  All uses of the connection(s) should be between these
-  function calls.
-*/
-my_bool STDCALL mysql_thread_init(void);
-void STDCALL mysql_thread_end(void);
-
-/*
-  Functions to get information from the MYSQL and MYSQL_RES structures
-  Should definitely be used if one uses shared libraries.
-*/
-
-my_ulonglong STDCALL mysql_num_rows(MYSQL_RES *res);
-unsigned int STDCALL mysql_num_fields(MYSQL_RES *res);
-my_bool STDCALL mysql_eof(MYSQL_RES *res);
-MYSQL_FIELD *STDCALL mysql_fetch_field_direct(MYSQL_RES *res,
-					      unsigned int fieldnr);
-MYSQL_FIELD * STDCALL mysql_fetch_fields(MYSQL_RES *res);
-MYSQL_ROW_OFFSET STDCALL mysql_row_tell(MYSQL_RES *res);
-MYSQL_FIELD_OFFSET STDCALL mysql_field_tell(MYSQL_RES *res);
-
-unsigned int STDCALL mysql_field_count(MYSQL *mysql);
-my_ulonglong STDCALL mysql_affected_rows(MYSQL *mysql);
-my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql);
-unsigned int STDCALL mysql_errno(MYSQL *mysql);
-const char * STDCALL mysql_error(MYSQL *mysql);
-const char *STDCALL mysql_sqlstate(MYSQL *mysql);
-unsigned int STDCALL mysql_warning_count(MYSQL *mysql);
-const char * STDCALL mysql_info(MYSQL *mysql);
-unsigned long STDCALL mysql_thread_id(MYSQL *mysql);
-const char * STDCALL mysql_character_set_name(MYSQL *mysql);
-int          STDCALL mysql_set_character_set(MYSQL *mysql, const char *csname);
-
-MYSQL *		STDCALL mysql_init(MYSQL *mysql);
-my_bool		STDCALL mysql_ssl_set(MYSQL *mysql, const char *key,
-				      const char *cert, const char *ca,
-				      const char *capath, const char *cipher);
-const char *    STDCALL mysql_get_ssl_cipher(MYSQL *mysql);
-my_bool		STDCALL mysql_change_user(MYSQL *mysql, const char *user, 
-					  const char *passwd, const char *db);
-MYSQL *		STDCALL mysql_real_connect(MYSQL *mysql, const char *host,
-					   const char *user,
-					   const char *passwd,
-					   const char *db,
-					   unsigned int port,
-					   const char *unix_socket,
-					   unsigned long clientflag);
-int		STDCALL mysql_select_db(MYSQL *mysql, const char *db);
-int		STDCALL mysql_query(MYSQL *mysql, const char *q);
-int		STDCALL mysql_send_query(MYSQL *mysql, const char *q,
-					 unsigned long length);
-int		STDCALL mysql_real_query(MYSQL *mysql, const char *q,
-					unsigned long length);
-MYSQL_RES *     STDCALL mysql_store_result(MYSQL *mysql);
-MYSQL_RES *     STDCALL mysql_use_result(MYSQL *mysql);
-
-/* perform query on master */
-my_bool		STDCALL mysql_master_query(MYSQL *mysql, const char *q,
-					   unsigned long length);
-my_bool		STDCALL mysql_master_send_query(MYSQL *mysql, const char *q,
-						unsigned long length);
-/* perform query on slave */  
-my_bool		STDCALL mysql_slave_query(MYSQL *mysql, const char *q,
-					  unsigned long length);
-my_bool		STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q,
-					       unsigned long length);
-void        STDCALL mysql_get_character_set_info(MYSQL *mysql,
-                           MY_CHARSET_INFO *charset);
-
-/* local infile support */
-
-#define LOCAL_INFILE_ERROR_LEN 512
-
-void
-mysql_set_local_infile_handler(MYSQL *mysql,
-                               int (*local_infile_init)(void **, const char *,
-                            void *),
-                               int (*local_infile_read)(void *, char *,
-							unsigned int),
-                               void (*local_infile_end)(void *),
-                               int (*local_infile_error)(void *, char*,
-							 unsigned int),
-                               void *);
-
-void
-mysql_set_local_infile_default(MYSQL *mysql);
-
-
-/*
-  enable/disable parsing of all queries to decide if they go on master or
-  slave
-*/
-void            STDCALL mysql_enable_rpl_parse(MYSQL* mysql);
-void            STDCALL mysql_disable_rpl_parse(MYSQL* mysql);
-/* get the value of the parse flag */  
-int             STDCALL mysql_rpl_parse_enabled(MYSQL* mysql);
-
-/*  enable/disable reads from master */
-void            STDCALL mysql_enable_reads_from_master(MYSQL* mysql);
-void            STDCALL mysql_disable_reads_from_master(MYSQL* mysql);
-/* get the value of the master read flag */  
-my_bool		STDCALL mysql_reads_from_master_enabled(MYSQL* mysql);
-
-enum mysql_rpl_type     STDCALL mysql_rpl_query_type(const char* q, int len);  
-
-/* discover the master and its slaves */  
-my_bool		STDCALL mysql_rpl_probe(MYSQL* mysql);
-
-/* set the master, close/free the old one, if it is not a pivot */
-int             STDCALL mysql_set_master(MYSQL* mysql, const char* host,
-					 unsigned int port,
-					 const char* user,
-					 const char* passwd);
-int             STDCALL mysql_add_slave(MYSQL* mysql, const char* host,
-					unsigned int port,
-					const char* user,
-					const char* passwd);
-
-int		STDCALL mysql_shutdown(MYSQL *mysql,
-                                       enum mysql_enum_shutdown_level
-                                       shutdown_level);
-int		STDCALL mysql_dump_debug_info(MYSQL *mysql);
-int		STDCALL mysql_refresh(MYSQL *mysql,
-				     unsigned int refresh_options);
-int		STDCALL mysql_kill(MYSQL *mysql,unsigned long pid);
-int		STDCALL mysql_set_server_option(MYSQL *mysql,
-						enum enum_mysql_set_option
-						option);
-int		STDCALL mysql_ping(MYSQL *mysql);
-const char *	STDCALL mysql_stat(MYSQL *mysql);
-const char *	STDCALL mysql_get_server_info(MYSQL *mysql);
-const char *	STDCALL mysql_get_client_info(void);
-unsigned long	STDCALL mysql_get_client_version(void);
-const char *	STDCALL mysql_get_host_info(MYSQL *mysql);
-unsigned long	STDCALL mysql_get_server_version(MYSQL *mysql);
-unsigned int	STDCALL mysql_get_proto_info(MYSQL *mysql);
-MYSQL_RES *	STDCALL mysql_list_dbs(MYSQL *mysql,const char *wild);
-MYSQL_RES *	STDCALL mysql_list_tables(MYSQL *mysql,const char *wild);
-MYSQL_RES *	STDCALL mysql_list_processes(MYSQL *mysql);
-int		STDCALL mysql_options(MYSQL *mysql,enum mysql_option option,
-				      const void *arg);
-void		STDCALL mysql_free_result(MYSQL_RES *result);
-void		STDCALL mysql_data_seek(MYSQL_RES *result,
-					my_ulonglong offset);
-MYSQL_ROW_OFFSET STDCALL mysql_row_seek(MYSQL_RES *result,
-						MYSQL_ROW_OFFSET offset);
-MYSQL_FIELD_OFFSET STDCALL mysql_field_seek(MYSQL_RES *result,
-					   MYSQL_FIELD_OFFSET offset);
-MYSQL_ROW	STDCALL mysql_fetch_row(MYSQL_RES *result);
-unsigned long * STDCALL mysql_fetch_lengths(MYSQL_RES *result);
-MYSQL_FIELD *	STDCALL mysql_fetch_field(MYSQL_RES *result);
-MYSQL_RES *     STDCALL mysql_list_fields(MYSQL *mysql, const char *table,
-					  const char *wild);
-unsigned long	STDCALL mysql_escape_string(char *to,const char *from,
-					    unsigned long from_length);
-unsigned long	STDCALL mysql_hex_string(char *to,const char *from,
-                                         unsigned long from_length);
-unsigned long STDCALL mysql_real_escape_string(MYSQL *mysql,
-					       char *to,const char *from,
-					       unsigned long length);
-void		STDCALL mysql_debug(const char *debug);
-void 		STDCALL myodbc_remove_escape(MYSQL *mysql,char *name);
-unsigned int	STDCALL mysql_thread_safe(void);
-my_bool		STDCALL mysql_embedded(void);
-MYSQL_MANAGER*  STDCALL mysql_manager_init(MYSQL_MANAGER* con);  
-MYSQL_MANAGER*  STDCALL mysql_manager_connect(MYSQL_MANAGER* con,
-					      const char* host,
-					      const char* user,
-					      const char* passwd,
-					      unsigned int port);
-void            STDCALL mysql_manager_close(MYSQL_MANAGER* con);
-int             STDCALL mysql_manager_command(MYSQL_MANAGER* con,
-						const char* cmd, int cmd_len);
-int             STDCALL mysql_manager_fetch_line(MYSQL_MANAGER* con,
-						  char* res_buf,
-						 int res_buf_size);
-my_bool         STDCALL mysql_read_query_result(MYSQL *mysql);
-
-
-/*
-  The following definitions are added for the enhanced 
-  client-server protocol
-*/
-
-/* statement state */
-enum enum_mysql_stmt_state
-{
-  MYSQL_STMT_INIT_DONE= 1, MYSQL_STMT_PREPARE_DONE, MYSQL_STMT_EXECUTE_DONE,
-  MYSQL_STMT_FETCH_DONE
-};
-
-
-/*
-  This structure is used to define bind information, and
-  internally by the client library.
-  Public members with their descriptions are listed below
-  (conventionally `On input' refers to the binds given to
-  mysql_stmt_bind_param, `On output' refers to the binds given
-  to mysql_stmt_bind_result):
-
-  buffer_type    - One of the MYSQL_* types, used to describe
-                   the host language type of buffer.
-                   On output: if column type is different from
-                   buffer_type, column value is automatically converted
-                   to buffer_type before it is stored in the buffer.
-  buffer         - On input: points to the buffer with input data.
-                   On output: points to the buffer capable to store
-                   output data.
-                   The type of memory pointed by buffer must correspond
-                   to buffer_type. See the correspondence table in
-                   the comment to mysql_stmt_bind_param.
-
-  The two above members are mandatory for any kind of bind.
-
-  buffer_length  - the length of the buffer. You don't have to set
-                   it for any fixed length buffer: float, double,
-                   int, etc. It must be set however for variable-length
-                   types, such as BLOBs or STRINGs.
-
-  length         - On input: in case when lengths of input values
-                   are different for each execute, you can set this to
-                   point at a variable containining value length. This
-                   way the value length can be different in each execute.
-                   If length is not NULL, buffer_length is not used.
-                   Note, length can even point at buffer_length if
-                   you keep bind structures around while fetching:
-                   this way you can change buffer_length before
-                   each execution, everything will work ok.
-                   On output: if length is set, mysql_stmt_fetch will
-                   write column length into it.
-
-  is_null        - On input: points to a boolean variable that should
-                   be set to TRUE for NULL values.
-                   This member is useful only if your data may be
-                   NULL in some but not all cases.
-                   If your data is never NULL, is_null should be set to 0.
-                   If your data is always NULL, set buffer_type
-                   to MYSQL_TYPE_NULL, and is_null will not be used.
-
-  is_unsigned    - On input: used to signify that values provided for one
-                   of numeric types are unsigned.
-                   On output describes signedness of the output buffer.
-                   If, taking into account is_unsigned flag, column data
-                   is out of range of the output buffer, data for this column
-                   is regarded truncated. Note that this has no correspondence
-                   to the sign of result set column, if you need to find it out
-                   use mysql_stmt_result_metadata.
-  error          - where to write a truncation error if it is present.
-                   possible error value is:
-                   0  no truncation
-                   1  value is out of range or buffer is too small
-
-  Please note that MYSQL_BIND also has internals members.
-*/
-
-typedef struct st_mysql_bind
-{
-  unsigned long	*length;          /* output length pointer */
-  my_bool       *is_null;	  /* Pointer to null indicator */
-  void		*buffer;	  /* buffer to get/put data */
-  /* set this if you want to track data truncations happened during fetch */
-  my_bool       *error;
-  unsigned char *row_ptr;         /* for the current data position */
-  void (*store_param_func)(NET *net, struct st_mysql_bind *param);
-  void (*fetch_result)(struct st_mysql_bind *, MYSQL_FIELD *,
-                       unsigned char **row);
-  void (*skip_result)(struct st_mysql_bind *, MYSQL_FIELD *,
-		      unsigned char **row);
-  /* output buffer length, must be set when fetching str/binary */
-  unsigned long buffer_length;
-  unsigned long offset;           /* offset position for char/binary fetch */
-  unsigned long	length_value;     /* Used if length is 0 */
-  unsigned int	param_number;	  /* For null count and error messages */
-  unsigned int  pack_length;	  /* Internal length for packed data */
-  enum enum_field_types buffer_type;	/* buffer type */
-  my_bool       error_value;      /* used if error is 0 */
-  my_bool       is_unsigned;      /* set if integer type is unsigned */
-  my_bool	long_data_used;	  /* If used with mysql_send_long_data */
-  my_bool	is_null_value;    /* Used if is_null is 0 */
-  void *extension;
-} MYSQL_BIND;
-
-
-/* statement handler */
-typedef struct st_mysql_stmt
-{
-  MEM_ROOT       mem_root;             /* root allocations */
-  LIST           list;                 /* list to keep track of all stmts */
-  MYSQL          *mysql;               /* connection handle */
-  MYSQL_BIND     *params;              /* input parameters */
-  MYSQL_BIND     *bind;                /* output parameters */
-  MYSQL_FIELD    *fields;              /* result set metadata */
-  MYSQL_DATA     result;               /* cached result set */
-  MYSQL_ROWS     *data_cursor;         /* current row in cached result */
-  /*
-    mysql_stmt_fetch() calls this function to fetch one row (it's different
-    for buffered, unbuffered and cursor fetch).
-  */
-  int            (*read_row_func)(struct st_mysql_stmt *stmt, 
-                                  unsigned char **row);
-  /* copy of mysql->affected_rows after statement execution */
-  my_ulonglong   affected_rows;
-  my_ulonglong   insert_id;            /* copy of mysql->insert_id */
-  unsigned long	 stmt_id;	       /* Id for prepared statement */
-  unsigned long  flags;                /* i.e. type of cursor to open */
-  unsigned long  prefetch_rows;        /* number of rows per one COM_FETCH */
-  /*
-    Copied from mysql->server_status after execute/fetch to know
-    server-side cursor status for this statement.
-  */
-  unsigned int   server_status;
-  unsigned int	 last_errno;	       /* error code */
-  unsigned int   param_count;          /* input parameter count */
-  unsigned int   field_count;          /* number of columns in result set */
-  enum enum_mysql_stmt_state state;    /* statement state */
-  char		 last_error[MYSQL_ERRMSG_SIZE]; /* error message */
-  char		 sqlstate[SQLSTATE_LENGTH+1];
-  /* Types of input parameters should be sent to server */
-  my_bool        send_types_to_server;
-  my_bool        bind_param_done;      /* input buffers were supplied */
-  unsigned char  bind_result_done;     /* output buffers were supplied */
-  /* mysql_stmt_close() had to cancel this result */
-  my_bool       unbuffered_fetch_cancelled;  
-  /*
-    Is set to true if we need to calculate field->max_length for 
-    metadata fields when doing mysql_stmt_store_result.
-  */
-  my_bool       update_max_length;     
-  void *extension;
-} MYSQL_STMT;
-
-enum enum_stmt_attr_type
-{
-  /*
-    When doing mysql_stmt_store_result calculate max_length attribute
-    of statement metadata. This is to be consistent with the old API, 
-    where this was done automatically.
-    In the new API we do that only by request because it slows down
-    mysql_stmt_store_result sufficiently.
-  */
-  STMT_ATTR_UPDATE_MAX_LENGTH,
-  /*
-    unsigned long with combination of cursor flags (read only, for update,
-    etc)
-  */
-  STMT_ATTR_CURSOR_TYPE,
-  /*
-    Amount of rows to retrieve from server per one fetch if using cursors.
-    Accepts unsigned long attribute in the range 1 - ulong_max
-  */
-  STMT_ATTR_PREFETCH_ROWS
-};
-
-
-typedef struct st_mysql_methods
-{
-  my_bool (*read_query_result)(MYSQL *mysql);
-  my_bool (*advanced_command)(MYSQL *mysql,
-			      enum enum_server_command command,
-			      const unsigned char *header,
-			      unsigned long header_length,
-			      const unsigned char *arg,
-			      unsigned long arg_length,
-			      my_bool skip_check,
-                              MYSQL_STMT *stmt);
-  MYSQL_DATA *(*read_rows)(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
-			   unsigned int fields);
-  MYSQL_RES * (*use_result)(MYSQL *mysql);
-  void (*fetch_lengths)(unsigned long *to, 
-			MYSQL_ROW column, unsigned int field_count);
-  void (*flush_use_result)(MYSQL *mysql);
-#if !defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY)
-  MYSQL_FIELD * (*list_fields)(MYSQL *mysql);
-  my_bool (*read_prepare_result)(MYSQL *mysql, MYSQL_STMT *stmt);
-  int (*stmt_execute)(MYSQL_STMT *stmt);
-  int (*read_binary_rows)(MYSQL_STMT *stmt);
-  int (*unbuffered_fetch)(MYSQL *mysql, char **row);
-  void (*free_embedded_thd)(MYSQL *mysql);
-  const char *(*read_statistics)(MYSQL *mysql);
-  my_bool (*next_result)(MYSQL *mysql);
-  int (*read_change_user_result)(MYSQL *mysql, char *buff, const char *passwd);
-  int (*read_rows_from_cursor)(MYSQL_STMT *stmt);
-#endif
-} MYSQL_METHODS;
-
-
-MYSQL_STMT * STDCALL mysql_stmt_init(MYSQL *mysql);
-int STDCALL mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query,
-                               unsigned long length);
-int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt);
-int STDCALL mysql_stmt_fetch(MYSQL_STMT *stmt);
-int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind_arg, 
-                                    unsigned int column,
-                                    unsigned long offset);
-int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt);
-unsigned long STDCALL mysql_stmt_param_count(MYSQL_STMT * stmt);
-my_bool STDCALL mysql_stmt_attr_set(MYSQL_STMT *stmt,
-                                    enum enum_stmt_attr_type attr_type,
-                                    const void *attr);
-my_bool STDCALL mysql_stmt_attr_get(MYSQL_STMT *stmt,
-                                    enum enum_stmt_attr_type attr_type,
-                                    void *attr);
-my_bool STDCALL mysql_stmt_bind_param(MYSQL_STMT * stmt, MYSQL_BIND * bnd);
-my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT * stmt, MYSQL_BIND * bnd);
-my_bool STDCALL mysql_stmt_close(MYSQL_STMT * stmt);
-my_bool STDCALL mysql_stmt_reset(MYSQL_STMT * stmt);
-my_bool STDCALL mysql_stmt_free_result(MYSQL_STMT *stmt);
-my_bool STDCALL mysql_stmt_send_long_data(MYSQL_STMT *stmt, 
-                                          unsigned int param_number,
-                                          const char *data, 
-                                          unsigned long length);
-MYSQL_RES *STDCALL mysql_stmt_result_metadata(MYSQL_STMT *stmt);
-MYSQL_RES *STDCALL mysql_stmt_param_metadata(MYSQL_STMT *stmt);
-unsigned int STDCALL mysql_stmt_errno(MYSQL_STMT * stmt);
-const char *STDCALL mysql_stmt_error(MYSQL_STMT * stmt);
-const char *STDCALL mysql_stmt_sqlstate(MYSQL_STMT * stmt);
-MYSQL_ROW_OFFSET STDCALL mysql_stmt_row_seek(MYSQL_STMT *stmt, 
-                                             MYSQL_ROW_OFFSET offset);
-MYSQL_ROW_OFFSET STDCALL mysql_stmt_row_tell(MYSQL_STMT *stmt);
-void STDCALL mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong offset);
-my_ulonglong STDCALL mysql_stmt_num_rows(MYSQL_STMT *stmt);
-my_ulonglong STDCALL mysql_stmt_affected_rows(MYSQL_STMT *stmt);
-my_ulonglong STDCALL mysql_stmt_insert_id(MYSQL_STMT *stmt);
-unsigned int STDCALL mysql_stmt_field_count(MYSQL_STMT *stmt);
-
-my_bool STDCALL mysql_commit(MYSQL * mysql);
-my_bool STDCALL mysql_rollback(MYSQL * mysql);
-my_bool STDCALL mysql_autocommit(MYSQL * mysql, my_bool auto_mode);
-my_bool STDCALL mysql_more_results(MYSQL *mysql);
-int STDCALL mysql_next_result(MYSQL *mysql);
-void STDCALL mysql_close(MYSQL *sock);
-
-
-/* status return codes */
-#define MYSQL_NO_DATA        100
-#define MYSQL_DATA_TRUNCATED 101
-
-#define mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT)
-
-#ifdef USE_OLD_FUNCTIONS
-MYSQL *		STDCALL mysql_connect(MYSQL *mysql, const char *host,
-				      const char *user, const char *passwd);
-int		STDCALL mysql_create_db(MYSQL *mysql, const char *DB);
-int		STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);
-#define	 mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT)
-#endif
-#define HAVE_MYSQL_REAL_CONNECT
-
-/*
-  The following functions are mainly exported because of mysqlbinlog;
-  They are not for general usage
-*/
-
-#define simple_command(mysql, command, arg, length, skip_check) \
-  (*(mysql)->methods->advanced_command)(mysql, command, 0,  \
-                                        0, arg, length, skip_check, NULL)
-#define stmt_command(mysql, command, arg, length, stmt) \
-  (*(mysql)->methods->advanced_command)(mysql, command, 0,  \
-                                        0, arg, length, 1, stmt)
-
-#ifdef __NETWARE__
-
-// GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some paltform
-#if defined( __GNUC__ )
-#pragma pack()
-#else
-#pragma pack(pop)
-#endif 
-
-#endif
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _mysql_h */
diff --git a/dep/include/mysql/mysql_com.h b/dep/include/mysql/mysql_com.h
deleted file mode 100644
index 7d3dd3d4f..000000000
--- a/dep/include/mysql/mysql_com.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/*
-** Common definition between mysql server & client
-*/
-
-#ifndef _mysql_com_h
-#define _mysql_com_h
-
-#define HOSTNAME_LENGTH 60
-#define SYSTEM_CHARSET_MBMAXLEN 3
-#define NAME_CHAR_LEN	64              /* Field/table name length */
-#define USERNAME_CHAR_LENGTH 16
-#define NAME_LEN                (NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN)
-#define USERNAME_LENGTH         (USERNAME_CHAR_LENGTH*SYSTEM_CHARSET_MBMAXLEN)
-
-#define SERVER_VERSION_LENGTH 60
-#define SQLSTATE_LENGTH 5
-
-/*
-  USER_HOST_BUFF_SIZE -- length of string buffer, that is enough to contain
-  username and hostname parts of the user identifier with trailing zero in
-  MySQL standard format:
-  user_name_part@host_name_part\0
-*/
-#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_LENGTH + 2
-
-#define LOCAL_HOST	"localhost"
-#define LOCAL_HOST_NAMEDPIPE "."
-
-
-#if defined(__WIN__) && !defined( _CUSTOMCONFIG_)
-#define MYSQL_NAMEDPIPE "MySQL"
-#define MYSQL_SERVICENAME "MySQL"
-#endif /* __WIN__ */
-
-/*
-  You should add new commands to the end of this list, otherwise old
-  servers won't be able to handle them as 'unsupported'.
-*/
-
-enum enum_server_command
-{
-  COM_SLEEP, COM_QUIT, COM_INIT_DB, COM_QUERY, COM_FIELD_LIST,
-  COM_CREATE_DB, COM_DROP_DB, COM_REFRESH, COM_SHUTDOWN, COM_STATISTICS,
-  COM_PROCESS_INFO, COM_CONNECT, COM_PROCESS_KILL, COM_DEBUG, COM_PING,
-  COM_TIME, COM_DELAYED_INSERT, COM_CHANGE_USER, COM_BINLOG_DUMP,
-  COM_TABLE_DUMP, COM_CONNECT_OUT, COM_REGISTER_SLAVE,
-  COM_STMT_PREPARE, COM_STMT_EXECUTE, COM_STMT_SEND_LONG_DATA, COM_STMT_CLOSE,
-  COM_STMT_RESET, COM_SET_OPTION, COM_STMT_FETCH, COM_DAEMON,
-  /* don't forget to update const char *command_name[] in sql_parse.cc */
-
-  /* Must be last */
-  COM_END
-};
-
-
-/*
-  Length of random string sent by server on handshake; this is also length of
-  obfuscated password, recieved from client
-*/
-#define SCRAMBLE_LENGTH 20
-#define SCRAMBLE_LENGTH_323 8
-/* length of password stored in the db: new passwords are preceeded with '*' */
-#define SCRAMBLED_PASSWORD_CHAR_LENGTH (SCRAMBLE_LENGTH*2+1)
-#define SCRAMBLED_PASSWORD_CHAR_LENGTH_323 (SCRAMBLE_LENGTH_323*2)
-
-
-#define NOT_NULL_FLAG	1		/* Field can't be NULL */
-#define PRI_KEY_FLAG	2		/* Field is part of a primary key */
-#define UNIQUE_KEY_FLAG 4		/* Field is part of a unique key */
-#define MULTIPLE_KEY_FLAG 8		/* Field is part of a key */
-#define BLOB_FLAG	16		/* Field is a blob */
-#define UNSIGNED_FLAG	32		/* Field is unsigned */
-#define ZEROFILL_FLAG	64		/* Field is zerofill */
-#define BINARY_FLAG	128		/* Field is binary   */
-
-/* The following are only sent to new clients */
-#define ENUM_FLAG	256		/* field is an enum */
-#define AUTO_INCREMENT_FLAG 512		/* field is a autoincrement field */
-#define TIMESTAMP_FLAG	1024		/* Field is a timestamp */
-#define SET_FLAG	2048		/* field is a set */
-#define NO_DEFAULT_VALUE_FLAG 4096	/* Field doesn't have default value */
-#define ON_UPDATE_NOW_FLAG 8192         /* Field is set to NOW on UPDATE */
-#define NUM_FLAG	32768		/* Field is num (for clients) */
-#define PART_KEY_FLAG	16384		/* Intern; Part of some key */
-#define GROUP_FLAG	32768		/* Intern: Group field */
-#define UNIQUE_FLAG	65536		/* Intern: Used by sql_yacc */
-#define BINCMP_FLAG	131072		/* Intern: Used by sql_yacc */
-#define GET_FIXED_FIELDS_FLAG (1 << 18) /* Used to get fields in item tree */
-#define FIELD_IN_PART_FUNC_FLAG (1 << 19)/* Field part of partition func */
-#define FIELD_IN_ADD_INDEX (1<< 20)	/* Intern: Field used in ADD INDEX */
-#define FIELD_IS_RENAMED (1<< 21)       /* Intern: Field is being renamed */
-
-#define REFRESH_GRANT		1	/* Refresh grant tables */
-#define REFRESH_LOG		2	/* Start on new log file */
-#define REFRESH_TABLES		4	/* close all tables */
-#define REFRESH_HOSTS		8	/* Flush host cache */
-#define REFRESH_STATUS		16	/* Flush status variables */
-#define REFRESH_THREADS		32	/* Flush thread cache */
-#define REFRESH_SLAVE           64      /* Reset master info and restart slave
-					   thread */
-#define REFRESH_MASTER          128     /* Remove all bin logs in the index
-					   and truncate the index */
-
-/* The following can't be set with mysql_refresh() */
-#define REFRESH_READ_LOCK	16384	/* Lock tables for read */
-#define REFRESH_FAST		32768	/* Intern flag */
-
-/* RESET (remove all queries) from query cache */
-#define REFRESH_QUERY_CACHE	65536
-#define REFRESH_QUERY_CACHE_FREE 0x20000L /* pack query cache */
-#define REFRESH_DES_KEY_FILE	0x40000L
-#define REFRESH_USER_RESOURCES	0x80000L
-
-#define CLIENT_LONG_PASSWORD	1	/* new more secure passwords */
-#define CLIENT_FOUND_ROWS	2	/* Found instead of affected rows */
-#define CLIENT_LONG_FLAG	4	/* Get all column flags */
-#define CLIENT_CONNECT_WITH_DB	8	/* One can specify db on connect */
-#define CLIENT_NO_SCHEMA	16	/* Don't allow database.table.column */
-#define CLIENT_COMPRESS		32	/* Can use compression protocol */
-#define CLIENT_ODBC		64	/* Odbc client */
-#define CLIENT_LOCAL_FILES	128	/* Can use LOAD DATA LOCAL */
-#define CLIENT_IGNORE_SPACE	256	/* Ignore spaces before '(' */
-#define CLIENT_PROTOCOL_41	512	/* New 4.1 protocol */
-#define CLIENT_INTERACTIVE	1024	/* This is an interactive client */
-#define CLIENT_SSL              2048	/* Switch to SSL after handshake */
-#define CLIENT_IGNORE_SIGPIPE   4096    /* IGNORE sigpipes */
-#define CLIENT_TRANSACTIONS	8192	/* Client knows about transactions */
-#define CLIENT_RESERVED         16384   /* Old flag for 4.1 protocol  */
-#define CLIENT_SECURE_CONNECTION 32768  /* New 4.1 authentication */
-#define CLIENT_MULTI_STATEMENTS (1UL << 16) /* Enable/disable multi-stmt support */
-#define CLIENT_MULTI_RESULTS    (1UL << 17) /* Enable/disable multi-results */
-
-#define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30)
-#define CLIENT_REMEMBER_OPTIONS (1UL << 31)
-
-/* Gather all possible capabilites (flags) supported by the server */
-#define CLIENT_ALL_FLAGS  (CLIENT_LONG_PASSWORD | \
-                           CLIENT_FOUND_ROWS | \
-                           CLIENT_LONG_FLAG | \
-                           CLIENT_CONNECT_WITH_DB | \
-                           CLIENT_NO_SCHEMA | \
-                           CLIENT_COMPRESS | \
-                           CLIENT_ODBC | \
-                           CLIENT_LOCAL_FILES | \
-                           CLIENT_IGNORE_SPACE | \
-                           CLIENT_PROTOCOL_41 | \
-                           CLIENT_INTERACTIVE | \
-                           CLIENT_SSL | \
-                           CLIENT_IGNORE_SIGPIPE | \
-                           CLIENT_TRANSACTIONS | \
-                           CLIENT_RESERVED | \
-                           CLIENT_SECURE_CONNECTION | \
-                           CLIENT_MULTI_STATEMENTS | \
-                           CLIENT_MULTI_RESULTS | \
-                           CLIENT_SSL_VERIFY_SERVER_CERT | \
-                           CLIENT_REMEMBER_OPTIONS)
-
-/*
-  Switch off the flags that are optional and depending on build flags
-  If any of the optional flags is supported by the build it will be switched
-  on before sending to the client during the connection handshake.
-*/
-#define CLIENT_BASIC_FLAGS (((CLIENT_ALL_FLAGS & ~CLIENT_SSL) \
-                                               & ~CLIENT_COMPRESS) \
-                                               & ~CLIENT_SSL_VERIFY_SERVER_CERT)
-
-#define SERVER_STATUS_IN_TRANS     1	/* Transaction has started */
-#define SERVER_STATUS_AUTOCOMMIT   2	/* Server in auto_commit mode */
-#define SERVER_MORE_RESULTS_EXISTS 8    /* Multi query - next query exists */
-#define SERVER_QUERY_NO_GOOD_INDEX_USED 16
-#define SERVER_QUERY_NO_INDEX_USED      32
-/**
-  The server was able to fulfill the clients request and opened a
-  read-only non-scrollable cursor for a query. This flag comes
-  in reply to COM_STMT_EXECUTE and COM_STMT_FETCH commands.
-*/
-#define SERVER_STATUS_CURSOR_EXISTS 64
-/**
-  This flag is sent when a read-only cursor is exhausted, in reply to
-  COM_STMT_FETCH command.
-*/
-#define SERVER_STATUS_LAST_ROW_SENT 128
-#define SERVER_STATUS_DB_DROPPED        256 /* A database was dropped */
-#define SERVER_STATUS_NO_BACKSLASH_ESCAPES 512
-/**
-  Sent to the client if after a prepared statement reprepare
-  we discovered that the new statement returns a different 
-  number of result set columns.
-*/
-#define SERVER_STATUS_METADATA_CHANGED 1024
-
-/**
-  Server status flags that must be cleared when starting
-  execution of a new SQL statement.
-  Flags from this set are only added to the
-  current server status by the execution engine, but 
-  never removed -- the execution engine expects them 
-  to disappear automagically by the next command.
-*/
-#define SERVER_STATUS_CLEAR_SET (SERVER_QUERY_NO_GOOD_INDEX_USED| \
-                                 SERVER_QUERY_NO_INDEX_USED|\
-                                 SERVER_MORE_RESULTS_EXISTS|\
-                                 SERVER_STATUS_METADATA_CHANGED)
-
-#define MYSQL_ERRMSG_SIZE	512
-#define NET_READ_TIMEOUT	30		/* Timeout on read */
-#define NET_WRITE_TIMEOUT	60		/* Timeout on write */
-#define NET_WAIT_TIMEOUT	8*60*60		/* Wait for new query */
-
-#define ONLY_KILL_QUERY         1
-
-
-struct st_vio;					/* Only C */
-typedef struct st_vio Vio;
-
-#define MAX_TINYINT_WIDTH       3       /* Max width for a TINY w.o. sign */
-#define MAX_SMALLINT_WIDTH      5       /* Max width for a SHORT w.o. sign */
-#define MAX_MEDIUMINT_WIDTH     8       /* Max width for a INT24 w.o. sign */
-#define MAX_INT_WIDTH           10      /* Max width for a LONG w.o. sign */
-#define MAX_BIGINT_WIDTH        20      /* Max width for a LONGLONG */
-#define MAX_CHAR_WIDTH		255	/* Max length for a CHAR colum */
-#define MAX_BLOB_WIDTH		16777216	/* Default width for blob */
-
-typedef struct st_net {
-#if !defined(CHECK_EMBEDDED_DIFFERENCES) || !defined(EMBEDDED_LIBRARY)
-  Vio *vio;
-  unsigned char *buff,*buff_end,*write_pos,*read_pos;
-  my_socket fd;					/* For Perl DBI/dbd */
-  /*
-    The following variable is set if we are doing several queries in one
-    command ( as in LOAD TABLE ... FROM MASTER ),
-    and do not want to confuse the client with OK at the wrong time
-  */
-  unsigned long remain_in_buf,length, buf_length, where_b;
-  unsigned long max_packet,max_packet_size;
-  unsigned int pkt_nr,compress_pkt_nr;
-  unsigned int write_timeout, read_timeout, retry_count;
-  int fcntl;
-  unsigned int *return_status;
-  unsigned char reading_or_writing;
-  char save_char;
-  my_bool unused0; /* Please remove with the next incompatible ABI change. */
-  my_bool unused; /* Please remove with the next incompatible ABI change */
-  my_bool compress;
-  my_bool unused1; /* Please remove with the next incompatible ABI change. */
-  /*
-    Pointer to query object in query cache, do not equal NULL (0) for
-    queries in cache that have not stored its results yet
-  */
-#endif
-  /*
-    'query_cache_query' should be accessed only via query cache
-    functions and methods to maintain proper locking.
-  */
-  unsigned char *query_cache_query;
-  unsigned int last_errno;
-  unsigned char error; 
-  my_bool unused2; /* Please remove with the next incompatible ABI change. */
-  my_bool return_errno;
-  /** Client library error message buffer. Actually belongs to struct MYSQL. */
-  char last_error[MYSQL_ERRMSG_SIZE];
-  /** Client library sqlstate buffer. Set along with the error message. */
-  char sqlstate[SQLSTATE_LENGTH+1];
-  void *extension;
-#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
-  /*
-    Controls whether a big packet should be skipped.
-
-    Initially set to FALSE by default. Unauthenticated sessions must have
-    this set to FALSE so that the server can't be tricked to read packets
-    indefinitely.
-  */
-  my_bool skip_big_packet;
-#endif
-} NET;
-
-
-#define packet_error (~(unsigned long) 0)
-
-enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY,
-			MYSQL_TYPE_SHORT,  MYSQL_TYPE_LONG,
-			MYSQL_TYPE_FLOAT,  MYSQL_TYPE_DOUBLE,
-			MYSQL_TYPE_NULL,   MYSQL_TYPE_TIMESTAMP,
-			MYSQL_TYPE_LONGLONG,MYSQL_TYPE_INT24,
-			MYSQL_TYPE_DATE,   MYSQL_TYPE_TIME,
-			MYSQL_TYPE_DATETIME, MYSQL_TYPE_YEAR,
-			MYSQL_TYPE_NEWDATE, MYSQL_TYPE_VARCHAR,
-			MYSQL_TYPE_BIT,
-                        MYSQL_TYPE_NEWDECIMAL=246,
-			MYSQL_TYPE_ENUM=247,
-			MYSQL_TYPE_SET=248,
-			MYSQL_TYPE_TINY_BLOB=249,
-			MYSQL_TYPE_MEDIUM_BLOB=250,
-			MYSQL_TYPE_LONG_BLOB=251,
-			MYSQL_TYPE_BLOB=252,
-			MYSQL_TYPE_VAR_STRING=253,
-			MYSQL_TYPE_STRING=254,
-			MYSQL_TYPE_GEOMETRY=255
-
-};
-
-/* For backward compatibility */
-#define CLIENT_MULTI_QUERIES    CLIENT_MULTI_STATEMENTS    
-#define FIELD_TYPE_DECIMAL     MYSQL_TYPE_DECIMAL
-#define FIELD_TYPE_NEWDECIMAL  MYSQL_TYPE_NEWDECIMAL
-#define FIELD_TYPE_TINY        MYSQL_TYPE_TINY
-#define FIELD_TYPE_SHORT       MYSQL_TYPE_SHORT
-#define FIELD_TYPE_LONG        MYSQL_TYPE_LONG
-#define FIELD_TYPE_FLOAT       MYSQL_TYPE_FLOAT
-#define FIELD_TYPE_DOUBLE      MYSQL_TYPE_DOUBLE
-#define FIELD_TYPE_NULL        MYSQL_TYPE_NULL
-#define FIELD_TYPE_TIMESTAMP   MYSQL_TYPE_TIMESTAMP
-#define FIELD_TYPE_LONGLONG    MYSQL_TYPE_LONGLONG
-#define FIELD_TYPE_INT24       MYSQL_TYPE_INT24
-#define FIELD_TYPE_DATE        MYSQL_TYPE_DATE
-#define FIELD_TYPE_TIME        MYSQL_TYPE_TIME
-#define FIELD_TYPE_DATETIME    MYSQL_TYPE_DATETIME
-#define FIELD_TYPE_YEAR        MYSQL_TYPE_YEAR
-#define FIELD_TYPE_NEWDATE     MYSQL_TYPE_NEWDATE
-#define FIELD_TYPE_ENUM        MYSQL_TYPE_ENUM
-#define FIELD_TYPE_SET         MYSQL_TYPE_SET
-#define FIELD_TYPE_TINY_BLOB   MYSQL_TYPE_TINY_BLOB
-#define FIELD_TYPE_MEDIUM_BLOB MYSQL_TYPE_MEDIUM_BLOB
-#define FIELD_TYPE_LONG_BLOB   MYSQL_TYPE_LONG_BLOB
-#define FIELD_TYPE_BLOB        MYSQL_TYPE_BLOB
-#define FIELD_TYPE_VAR_STRING  MYSQL_TYPE_VAR_STRING
-#define FIELD_TYPE_STRING      MYSQL_TYPE_STRING
-#define FIELD_TYPE_CHAR        MYSQL_TYPE_TINY
-#define FIELD_TYPE_INTERVAL    MYSQL_TYPE_ENUM
-#define FIELD_TYPE_GEOMETRY    MYSQL_TYPE_GEOMETRY
-#define FIELD_TYPE_BIT         MYSQL_TYPE_BIT
-
-
-/* Shutdown/kill enums and constants */ 
-
-/* Bits for THD::killable. */
-#define MYSQL_SHUTDOWN_KILLABLE_CONNECT    (unsigned char)(1 << 0)
-#define MYSQL_SHUTDOWN_KILLABLE_TRANS      (unsigned char)(1 << 1)
-#define MYSQL_SHUTDOWN_KILLABLE_LOCK_TABLE (unsigned char)(1 << 2)
-#define MYSQL_SHUTDOWN_KILLABLE_UPDATE     (unsigned char)(1 << 3)
-
-enum mysql_enum_shutdown_level {
-  /*
-    We want levels to be in growing order of hardness (because we use number
-    comparisons). Note that DEFAULT does not respect the growing property, but
-    it's ok.
-  */
-  SHUTDOWN_DEFAULT = 0,
-  /* wait for existing connections to finish */
-  SHUTDOWN_WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT,
-  /* wait for existing trans to finish */
-  SHUTDOWN_WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,
-  /* wait for existing updates to finish (=> no partial MyISAM update) */
-  SHUTDOWN_WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE,
-  /* flush InnoDB buffers and other storage engines' buffers*/
-  SHUTDOWN_WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1),
-  /* don't flush InnoDB buffers, flush other storage engines' buffers*/
-  SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1,
-  /* Now the 2 levels of the KILL command */
-#if MYSQL_VERSION_ID >= 50000
-  KILL_QUERY= 254,
-#endif
-  KILL_CONNECTION= 255
-};
-
-
-enum enum_cursor_type
-{
-  CURSOR_TYPE_NO_CURSOR= 0,
-  CURSOR_TYPE_READ_ONLY= 1,
-  CURSOR_TYPE_FOR_UPDATE= 2,
-  CURSOR_TYPE_SCROLLABLE= 4
-};
-
-
-/* options for mysql_set_option */
-enum enum_mysql_set_option
-{
-  MYSQL_OPTION_MULTI_STATEMENTS_ON,
-  MYSQL_OPTION_MULTI_STATEMENTS_OFF
-};
-
-#define net_new_transaction(net) ((net)->pkt_nr=0)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-my_bool	my_net_init(NET *net, Vio* vio);
-void	my_net_local_init(NET *net);
-void	net_end(NET *net);
-  void	net_clear(NET *net, my_bool clear_buffer);
-my_bool net_realloc(NET *net, size_t length);
-my_bool	net_flush(NET *net);
-my_bool	my_net_write(NET *net,const unsigned char *packet, size_t len);
-my_bool	net_write_command(NET *net,unsigned char command,
-			  const unsigned char *header, size_t head_len,
-			  const unsigned char *packet, size_t len);
-int	net_real_write(NET *net,const unsigned char *packet, size_t len);
-unsigned long my_net_read(NET *net);
-
-#ifdef _global_h
-void my_net_set_write_timeout(NET *net, uint timeout);
-void my_net_set_read_timeout(NET *net, uint timeout);
-#endif
-
-/*
-  The following function is not meant for normal usage
-  Currently it's used internally by manager.c
-*/
-struct sockaddr;
-int my_connect(my_socket s, const struct sockaddr *name, unsigned int namelen,
-	       unsigned int timeout);
-
-struct rand_struct {
-  unsigned long seed1,seed2,max_value;
-  double max_value_dbl;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-  /* The following is for user defined functions */
-
-enum Item_result {STRING_RESULT=0, REAL_RESULT, INT_RESULT, ROW_RESULT,
-                  DECIMAL_RESULT};
-
-typedef struct st_udf_args
-{
-  unsigned int arg_count;		/* Number of arguments */
-  enum Item_result *arg_type;		/* Pointer to item_results */
-  char **args;				/* Pointer to argument */
-  unsigned long *lengths;		/* Length of string arguments */
-  char *maybe_null;			/* Set to 1 for all maybe_null args */
-  char **attributes;                    /* Pointer to attribute name */
-  unsigned long *attribute_lengths;     /* Length of attribute arguments */
-  void *extension;
-} UDF_ARGS;
-
-  /* This holds information about the result */
-
-typedef struct st_udf_init
-{
-  my_bool maybe_null;          /* 1 if function can return NULL */
-  unsigned int decimals;       /* for real functions */
-  unsigned long max_length;    /* For string functions */
-  char *ptr;                   /* free pointer for function data */
-  my_bool const_item;          /* 1 if function always returns the same value */
-  void *extension;
-} UDF_INIT;
-/* 
-  TODO: add a notion for determinism of the UDF. 
-  See Item_udf_func::update_used_tables ()
-*/
-
-  /* Constants when using compression */
-#define NET_HEADER_SIZE 4		/* standard header size */
-#define COMP_HEADER_SIZE 3		/* compression header extra size */
-
-  /* Prototypes to password functions */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-  These functions are used for authentication by client and server and
-  implemented in sql/password.c
-*/
-
-void randominit(struct rand_struct *, unsigned long seed1,
-                unsigned long seed2);
-double my_rnd(struct rand_struct *);
-void create_random_string(char *to, unsigned int length, struct rand_struct *rand_st);
-
-void hash_password(unsigned long *to, const char *password, unsigned int password_len);
-void make_scrambled_password_323(char *to, const char *password);
-void scramble_323(char *to, const char *message, const char *password);
-my_bool check_scramble_323(const char *, const char *message,
-                           unsigned long *salt);
-void get_salt_from_password_323(unsigned long *res, const char *password);
-void make_password_from_salt_323(char *to, const unsigned long *salt);
-
-void make_scrambled_password(char *to, const char *password);
-void scramble(char *to, const char *message, const char *password);
-my_bool check_scramble(const char *reply, const char *message,
-                       const unsigned char *hash_stage2);
-void get_salt_from_password(unsigned char *res, const char *password);
-void make_password_from_salt(char *to, const unsigned char *hash_stage2);
-char *octet2hex(char *to, const char *str, unsigned int len);
-
-/* end of password.c */
-
-char *get_tty_password(const char *opt_message);
-const char *mysql_errno_to_sqlstate(unsigned int mysql_errno);
-
-/* Some other useful functions */
-
-my_bool my_thread_init(void);
-void my_thread_end(void);
-
-#ifdef _global_h
-ulong STDCALL net_field_length(uchar **packet);
-my_ulonglong net_field_length_ll(uchar **packet);
-uchar *net_store_length(uchar *pkg, ulonglong length);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#define NULL_LENGTH ((unsigned long) ~0) /* For net_store_length */
-#define MYSQL_STMT_HEADER       4
-#define MYSQL_LONG_DATA_HEADER  6
-
-#endif
diff --git a/dep/include/mysql/mysql_embed.h b/dep/include/mysql/mysql_embed.h
deleted file mode 100644
index 4a7fd3ef6..000000000
--- a/dep/include/mysql/mysql_embed.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* Defines that are unique to the embedded version of MySQL */
-
-#ifdef EMBEDDED_LIBRARY
-
-/* Things we don't need in the embedded version of MySQL */
-/* TODO HF add #undef HAVE_VIO if we don't want client in embedded library */
-
-#undef HAVE_PSTACK				/* No stacktrace */
-#undef HAVE_OPENSSL
-#undef HAVE_SMEM				/* No shared memory */
-#undef HAVE_NDBCLUSTER_DB /* No NDB cluster */
-
-#define DONT_USE_RAID
-
-#endif /* EMBEDDED_LIBRARY */
diff --git a/dep/include/mysql/mysql_time.h b/dep/include/mysql/mysql_time.h
deleted file mode 100644
index 0a3f17a81..000000000
--- a/dep/include/mysql/mysql_time.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright (C) 2004 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifndef _mysql_time_h_
-#define _mysql_time_h_
-
-/*
-  Time declarations shared between the server and client API:
-  you should not add anything to this header unless it's used
-  (and hence should be visible) in mysql.h.
-  If you're looking for a place to add new time-related declaration,
-  it's most likely my_time.h. See also "C API Handling of Date
-  and Time Values" chapter in documentation.
-*/
-
-enum enum_mysql_timestamp_type
-{
-  MYSQL_TIMESTAMP_NONE= -2, MYSQL_TIMESTAMP_ERROR= -1,
-  MYSQL_TIMESTAMP_DATE= 0, MYSQL_TIMESTAMP_DATETIME= 1, MYSQL_TIMESTAMP_TIME= 2
-};
-
-
-/*
-  Structure which is used to represent datetime values inside MySQL.
-
-  We assume that values in this structure are normalized, i.e. year <= 9999,
-  month <= 12, day <= 31, hour <= 23, hour <= 59, hour <= 59. Many functions
-  in server such as my_system_gmt_sec() or make_time() family of functions
-  rely on this (actually now usage of make_*() family relies on a bit weaker
-  restriction). Also functions that produce MYSQL_TIME as result ensure this.
-  There is one exception to this rule though if this structure holds time
-  value (time_type == MYSQL_TIMESTAMP_TIME) days and hour member can hold
-  bigger values.
-*/
-typedef struct st_mysql_time
-{
-  unsigned int  year, month, day, hour, minute, second;
-  unsigned long second_part;
-  my_bool       neg;
-  enum enum_mysql_timestamp_type time_type;
-} MYSQL_TIME;
-
-#endif /* _mysql_time_h_ */
diff --git a/dep/include/mysql/mysql_version.h b/dep/include/mysql/mysql_version.h
deleted file mode 100644
index 547ccd52a..000000000
--- a/dep/include/mysql/mysql_version.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright Abandoned 1996, 1999, 2001 MySQL AB
-   This file is public domain and comes with NO WARRANTY of any kind */
-
-/* Version numbers for protocol & mysqld */
-
-#ifndef _mysql_version_h
-#define _mysql_version_h
-#ifdef _CUSTOMCONFIG_
-#include <custom_conf.h>
-#else
-#define PROTOCOL_VERSION		10
-#define MYSQL_SERVER_VERSION		"5.1.49"
-#define MYSQL_BASE_VERSION		"mysqld-5.1"
-#define MYSQL_SERVER_SUFFIX_DEF		"-nt"
-#define FRM_VER				6
-#define MYSQL_VERSION_ID		50149
-#define MYSQL_PORT			3306
-#define MYSQL_PORT_DEFAULT		0
-#define MYSQL_UNIX_ADDR			"/tmp/mysql.sock"
-#define MYSQL_CONFIG_NAME		"my"
-#define MYSQL_COMPILATION_COMMENT	"From Sources"
-
-/* mysqld compile time options */
-#endif /* _CUSTOMCONFIG_ */
-
-#ifndef LICENSE
-#define LICENSE				GPL
-#endif /* LICENSE */
-
-#endif /* _mysql_version_h */
diff --git a/dep/include/mysql/mysqld_ername.h b/dep/include/mysql/mysqld_ername.h
deleted file mode 100644
index cc8b36ada..000000000
--- a/dep/include/mysql/mysqld_ername.h
+++ /dev/null
@@ -1,643 +0,0 @@
-/* Autogenerated file, please don't edit */
-
-{ "ER_HASHCHK", 1000 },
-{ "ER_NISAMCHK", 1001 },
-{ "ER_NO", 1002 },
-{ "ER_YES", 1003 },
-{ "ER_CANT_CREATE_FILE", 1004 },
-{ "ER_CANT_CREATE_TABLE", 1005 },
-{ "ER_CANT_CREATE_DB", 1006 },
-{ "ER_DB_CREATE_EXISTS", 1007 },
-{ "ER_DB_DROP_EXISTS", 1008 },
-{ "ER_DB_DROP_DELETE", 1009 },
-{ "ER_DB_DROP_RMDIR", 1010 },
-{ "ER_CANT_DELETE_FILE", 1011 },
-{ "ER_CANT_FIND_SYSTEM_REC", 1012 },
-{ "ER_CANT_GET_STAT", 1013 },
-{ "ER_CANT_GET_WD", 1014 },
-{ "ER_CANT_LOCK", 1015 },
-{ "ER_CANT_OPEN_FILE", 1016 },
-{ "ER_FILE_NOT_FOUND", 1017 },
-{ "ER_CANT_READ_DIR", 1018 },
-{ "ER_CANT_SET_WD", 1019 },
-{ "ER_CHECKREAD", 1020 },
-{ "ER_DISK_FULL", 1021 },
-{ "ER_DUP_KEY", 1022 },
-{ "ER_ERROR_ON_CLOSE", 1023 },
-{ "ER_ERROR_ON_READ", 1024 },
-{ "ER_ERROR_ON_RENAME", 1025 },
-{ "ER_ERROR_ON_WRITE", 1026 },
-{ "ER_FILE_USED", 1027 },
-{ "ER_FILSORT_ABORT", 1028 },
-{ "ER_FORM_NOT_FOUND", 1029 },
-{ "ER_GET_ERRNO", 1030 },
-{ "ER_ILLEGAL_HA", 1031 },
-{ "ER_KEY_NOT_FOUND", 1032 },
-{ "ER_NOT_FORM_FILE", 1033 },
-{ "ER_NOT_KEYFILE", 1034 },
-{ "ER_OLD_KEYFILE", 1035 },
-{ "ER_OPEN_AS_READONLY", 1036 },
-{ "ER_OUTOFMEMORY", 1037 },
-{ "ER_OUT_OF_SORTMEMORY", 1038 },
-{ "ER_UNEXPECTED_EOF", 1039 },
-{ "ER_CON_COUNT_ERROR", 1040 },
-{ "ER_OUT_OF_RESOURCES", 1041 },
-{ "ER_BAD_HOST_ERROR", 1042 },
-{ "ER_HANDSHAKE_ERROR", 1043 },
-{ "ER_DBACCESS_DENIED_ERROR", 1044 },
-{ "ER_ACCESS_DENIED_ERROR", 1045 },
-{ "ER_NO_DB_ERROR", 1046 },
-{ "ER_UNKNOWN_COM_ERROR", 1047 },
-{ "ER_BAD_NULL_ERROR", 1048 },
-{ "ER_BAD_DB_ERROR", 1049 },
-{ "ER_TABLE_EXISTS_ERROR", 1050 },
-{ "ER_BAD_TABLE_ERROR", 1051 },
-{ "ER_NON_UNIQ_ERROR", 1052 },
-{ "ER_SERVER_SHUTDOWN", 1053 },
-{ "ER_BAD_FIELD_ERROR", 1054 },
-{ "ER_WRONG_FIELD_WITH_GROUP", 1055 },
-{ "ER_WRONG_GROUP_FIELD", 1056 },
-{ "ER_WRONG_SUM_SELECT", 1057 },
-{ "ER_WRONG_VALUE_COUNT", 1058 },
-{ "ER_TOO_LONG_IDENT", 1059 },
-{ "ER_DUP_FIELDNAME", 1060 },
-{ "ER_DUP_KEYNAME", 1061 },
-{ "ER_DUP_ENTRY", 1062 },
-{ "ER_WRONG_FIELD_SPEC", 1063 },
-{ "ER_PARSE_ERROR", 1064 },
-{ "ER_EMPTY_QUERY", 1065 },
-{ "ER_NONUNIQ_TABLE", 1066 },
-{ "ER_INVALID_DEFAULT", 1067 },
-{ "ER_MULTIPLE_PRI_KEY", 1068 },
-{ "ER_TOO_MANY_KEYS", 1069 },
-{ "ER_TOO_MANY_KEY_PARTS", 1070 },
-{ "ER_TOO_LONG_KEY", 1071 },
-{ "ER_KEY_COLUMN_DOES_NOT_EXITS", 1072 },
-{ "ER_BLOB_USED_AS_KEY", 1073 },
-{ "ER_TOO_BIG_FIELDLENGTH", 1074 },
-{ "ER_WRONG_AUTO_KEY", 1075 },
-{ "ER_READY", 1076 },
-{ "ER_NORMAL_SHUTDOWN", 1077 },
-{ "ER_GOT_SIGNAL", 1078 },
-{ "ER_SHUTDOWN_COMPLETE", 1079 },
-{ "ER_FORCING_CLOSE", 1080 },
-{ "ER_IPSOCK_ERROR", 1081 },
-{ "ER_NO_SUCH_INDEX", 1082 },
-{ "ER_WRONG_FIELD_TERMINATORS", 1083 },
-{ "ER_BLOBS_AND_NO_TERMINATED", 1084 },
-{ "ER_TEXTFILE_NOT_READABLE", 1085 },
-{ "ER_FILE_EXISTS_ERROR", 1086 },
-{ "ER_LOAD_INFO", 1087 },
-{ "ER_ALTER_INFO", 1088 },
-{ "ER_WRONG_SUB_KEY", 1089 },
-{ "ER_CANT_REMOVE_ALL_FIELDS", 1090 },
-{ "ER_CANT_DROP_FIELD_OR_KEY", 1091 },
-{ "ER_INSERT_INFO", 1092 },
-{ "ER_UPDATE_TABLE_USED", 1093 },
-{ "ER_NO_SUCH_THREAD", 1094 },
-{ "ER_KILL_DENIED_ERROR", 1095 },
-{ "ER_NO_TABLES_USED", 1096 },
-{ "ER_TOO_BIG_SET", 1097 },
-{ "ER_NO_UNIQUE_LOGFILE", 1098 },
-{ "ER_TABLE_NOT_LOCKED_FOR_WRITE", 1099 },
-{ "ER_TABLE_NOT_LOCKED", 1100 },
-{ "ER_BLOB_CANT_HAVE_DEFAULT", 1101 },
-{ "ER_WRONG_DB_NAME", 1102 },
-{ "ER_WRONG_TABLE_NAME", 1103 },
-{ "ER_TOO_BIG_SELECT", 1104 },
-{ "ER_UNKNOWN_ERROR", 1105 },
-{ "ER_UNKNOWN_PROCEDURE", 1106 },
-{ "ER_WRONG_PARAMCOUNT_TO_PROCEDURE", 1107 },
-{ "ER_WRONG_PARAMETERS_TO_PROCEDURE", 1108 },
-{ "ER_UNKNOWN_TABLE", 1109 },
-{ "ER_FIELD_SPECIFIED_TWICE", 1110 },
-{ "ER_INVALID_GROUP_FUNC_USE", 1111 },
-{ "ER_UNSUPPORTED_EXTENSION", 1112 },
-{ "ER_TABLE_MUST_HAVE_COLUMNS", 1113 },
-{ "ER_RECORD_FILE_FULL", 1114 },
-{ "ER_UNKNOWN_CHARACTER_SET", 1115 },
-{ "ER_TOO_MANY_TABLES", 1116 },
-{ "ER_TOO_MANY_FIELDS", 1117 },
-{ "ER_TOO_BIG_ROWSIZE", 1118 },
-{ "ER_STACK_OVERRUN", 1119 },
-{ "ER_WRONG_OUTER_JOIN", 1120 },
-{ "ER_NULL_COLUMN_IN_INDEX", 1121 },
-{ "ER_CANT_FIND_UDF", 1122 },
-{ "ER_CANT_INITIALIZE_UDF", 1123 },
-{ "ER_UDF_NO_PATHS", 1124 },
-{ "ER_UDF_EXISTS", 1125 },
-{ "ER_CANT_OPEN_LIBRARY", 1126 },
-{ "ER_CANT_FIND_DL_ENTRY", 1127 },
-{ "ER_FUNCTION_NOT_DEFINED", 1128 },
-{ "ER_HOST_IS_BLOCKED", 1129 },
-{ "ER_HOST_NOT_PRIVILEGED", 1130 },
-{ "ER_PASSWORD_ANONYMOUS_USER", 1131 },
-{ "ER_PASSWORD_NOT_ALLOWED", 1132 },
-{ "ER_PASSWORD_NO_MATCH", 1133 },
-{ "ER_UPDATE_INFO", 1134 },
-{ "ER_CANT_CREATE_THREAD", 1135 },
-{ "ER_WRONG_VALUE_COUNT_ON_ROW", 1136 },
-{ "ER_CANT_REOPEN_TABLE", 1137 },
-{ "ER_INVALID_USE_OF_NULL", 1138 },
-{ "ER_REGEXP_ERROR", 1139 },
-{ "ER_MIX_OF_GROUP_FUNC_AND_FIELDS", 1140 },
-{ "ER_NONEXISTING_GRANT", 1141 },
-{ "ER_TABLEACCESS_DENIED_ERROR", 1142 },
-{ "ER_COLUMNACCESS_DENIED_ERROR", 1143 },
-{ "ER_ILLEGAL_GRANT_FOR_TABLE", 1144 },
-{ "ER_GRANT_WRONG_HOST_OR_USER", 1145 },
-{ "ER_NO_SUCH_TABLE", 1146 },
-{ "ER_NONEXISTING_TABLE_GRANT", 1147 },
-{ "ER_NOT_ALLOWED_COMMAND", 1148 },
-{ "ER_SYNTAX_ERROR", 1149 },
-{ "ER_DELAYED_CANT_CHANGE_LOCK", 1150 },
-{ "ER_TOO_MANY_DELAYED_THREADS", 1151 },
-{ "ER_ABORTING_CONNECTION", 1152 },
-{ "ER_NET_PACKET_TOO_LARGE", 1153 },
-{ "ER_NET_READ_ERROR_FROM_PIPE", 1154 },
-{ "ER_NET_FCNTL_ERROR", 1155 },
-{ "ER_NET_PACKETS_OUT_OF_ORDER", 1156 },
-{ "ER_NET_UNCOMPRESS_ERROR", 1157 },
-{ "ER_NET_READ_ERROR", 1158 },
-{ "ER_NET_READ_INTERRUPTED", 1159 },
-{ "ER_NET_ERROR_ON_WRITE", 1160 },
-{ "ER_NET_WRITE_INTERRUPTED", 1161 },
-{ "ER_TOO_LONG_STRING", 1162 },
-{ "ER_TABLE_CANT_HANDLE_BLOB", 1163 },
-{ "ER_TABLE_CANT_HANDLE_AUTO_INCREMENT", 1164 },
-{ "ER_DELAYED_INSERT_TABLE_LOCKED", 1165 },
-{ "ER_WRONG_COLUMN_NAME", 1166 },
-{ "ER_WRONG_KEY_COLUMN", 1167 },
-{ "ER_WRONG_MRG_TABLE", 1168 },
-{ "ER_DUP_UNIQUE", 1169 },
-{ "ER_BLOB_KEY_WITHOUT_LENGTH", 1170 },
-{ "ER_PRIMARY_CANT_HAVE_NULL", 1171 },
-{ "ER_TOO_MANY_ROWS", 1172 },
-{ "ER_REQUIRES_PRIMARY_KEY", 1173 },
-{ "ER_NO_RAID_COMPILED", 1174 },
-{ "ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE", 1175 },
-{ "ER_KEY_DOES_NOT_EXITS", 1176 },
-{ "ER_CHECK_NO_SUCH_TABLE", 1177 },
-{ "ER_CHECK_NOT_IMPLEMENTED", 1178 },
-{ "ER_CANT_DO_THIS_DURING_AN_TRANSACTION", 1179 },
-{ "ER_ERROR_DURING_COMMIT", 1180 },
-{ "ER_ERROR_DURING_ROLLBACK", 1181 },
-{ "ER_ERROR_DURING_FLUSH_LOGS", 1182 },
-{ "ER_ERROR_DURING_CHECKPOINT", 1183 },
-{ "ER_NEW_ABORTING_CONNECTION", 1184 },
-{ "ER_DUMP_NOT_IMPLEMENTED", 1185 },
-{ "ER_FLUSH_MASTER_BINLOG_CLOSED", 1186 },
-{ "ER_INDEX_REBUILD", 1187 },
-{ "ER_MASTER", 1188 },
-{ "ER_MASTER_NET_READ", 1189 },
-{ "ER_MASTER_NET_WRITE", 1190 },
-{ "ER_FT_MATCHING_KEY_NOT_FOUND", 1191 },
-{ "ER_LOCK_OR_ACTIVE_TRANSACTION", 1192 },
-{ "ER_UNKNOWN_SYSTEM_VARIABLE", 1193 },
-{ "ER_CRASHED_ON_USAGE", 1194 },
-{ "ER_CRASHED_ON_REPAIR", 1195 },
-{ "ER_WARNING_NOT_COMPLETE_ROLLBACK", 1196 },
-{ "ER_TRANS_CACHE_FULL", 1197 },
-{ "ER_SLAVE_MUST_STOP", 1198 },
-{ "ER_SLAVE_NOT_RUNNING", 1199 },
-{ "ER_BAD_SLAVE", 1200 },
-{ "ER_MASTER_INFO", 1201 },
-{ "ER_SLAVE_THREAD", 1202 },
-{ "ER_TOO_MANY_USER_CONNECTIONS", 1203 },
-{ "ER_SET_CONSTANTS_ONLY", 1204 },
-{ "ER_LOCK_WAIT_TIMEOUT", 1205 },
-{ "ER_LOCK_TABLE_FULL", 1206 },
-{ "ER_READ_ONLY_TRANSACTION", 1207 },
-{ "ER_DROP_DB_WITH_READ_LOCK", 1208 },
-{ "ER_CREATE_DB_WITH_READ_LOCK", 1209 },
-{ "ER_WRONG_ARGUMENTS", 1210 },
-{ "ER_NO_PERMISSION_TO_CREATE_USER", 1211 },
-{ "ER_UNION_TABLES_IN_DIFFERENT_DIR", 1212 },
-{ "ER_LOCK_DEADLOCK", 1213 },
-{ "ER_TABLE_CANT_HANDLE_FT", 1214 },
-{ "ER_CANNOT_ADD_FOREIGN", 1215 },
-{ "ER_NO_REFERENCED_ROW", 1216 },
-{ "ER_ROW_IS_REFERENCED", 1217 },
-{ "ER_CONNECT_TO_MASTER", 1218 },
-{ "ER_QUERY_ON_MASTER", 1219 },
-{ "ER_ERROR_WHEN_EXECUTING_COMMAND", 1220 },
-{ "ER_WRONG_USAGE", 1221 },
-{ "ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT", 1222 },
-{ "ER_CANT_UPDATE_WITH_READLOCK", 1223 },
-{ "ER_MIXING_NOT_ALLOWED", 1224 },
-{ "ER_DUP_ARGUMENT", 1225 },
-{ "ER_USER_LIMIT_REACHED", 1226 },
-{ "ER_SPECIFIC_ACCESS_DENIED_ERROR", 1227 },
-{ "ER_LOCAL_VARIABLE", 1228 },
-{ "ER_GLOBAL_VARIABLE", 1229 },
-{ "ER_NO_DEFAULT", 1230 },
-{ "ER_WRONG_VALUE_FOR_VAR", 1231 },
-{ "ER_WRONG_TYPE_FOR_VAR", 1232 },
-{ "ER_VAR_CANT_BE_READ", 1233 },
-{ "ER_CANT_USE_OPTION_HERE", 1234 },
-{ "ER_NOT_SUPPORTED_YET", 1235 },
-{ "ER_MASTER_FATAL_ERROR_READING_BINLOG", 1236 },
-{ "ER_SLAVE_IGNORED_TABLE", 1237 },
-{ "ER_INCORRECT_GLOBAL_LOCAL_VAR", 1238 },
-{ "ER_WRONG_FK_DEF", 1239 },
-{ "ER_KEY_REF_DO_NOT_MATCH_TABLE_REF", 1240 },
-{ "ER_OPERAND_COLUMNS", 1241 },
-{ "ER_SUBQUERY_NO_1_ROW", 1242 },
-{ "ER_UNKNOWN_STMT_HANDLER", 1243 },
-{ "ER_CORRUPT_HELP_DB", 1244 },
-{ "ER_CYCLIC_REFERENCE", 1245 },
-{ "ER_AUTO_CONVERT", 1246 },
-{ "ER_ILLEGAL_REFERENCE", 1247 },
-{ "ER_DERIVED_MUST_HAVE_ALIAS", 1248 },
-{ "ER_SELECT_REDUCED", 1249 },
-{ "ER_TABLENAME_NOT_ALLOWED_HERE", 1250 },
-{ "ER_NOT_SUPPORTED_AUTH_MODE", 1251 },
-{ "ER_SPATIAL_CANT_HAVE_NULL", 1252 },
-{ "ER_COLLATION_CHARSET_MISMATCH", 1253 },
-{ "ER_SLAVE_WAS_RUNNING", 1254 },
-{ "ER_SLAVE_WAS_NOT_RUNNING", 1255 },
-{ "ER_TOO_BIG_FOR_UNCOMPRESS", 1256 },
-{ "ER_ZLIB_Z_MEM_ERROR", 1257 },
-{ "ER_ZLIB_Z_BUF_ERROR", 1258 },
-{ "ER_ZLIB_Z_DATA_ERROR", 1259 },
-{ "ER_CUT_VALUE_GROUP_CONCAT", 1260 },
-{ "ER_WARN_TOO_FEW_RECORDS", 1261 },
-{ "ER_WARN_TOO_MANY_RECORDS", 1262 },
-{ "ER_WARN_NULL_TO_NOTNULL", 1263 },
-{ "ER_WARN_DATA_OUT_OF_RANGE", 1264 },
-{ "WARN_DATA_TRUNCATED", 1265 },
-{ "ER_WARN_USING_OTHER_HANDLER", 1266 },
-{ "ER_CANT_AGGREGATE_2COLLATIONS", 1267 },
-{ "ER_DROP_USER", 1268 },
-{ "ER_REVOKE_GRANTS", 1269 },
-{ "ER_CANT_AGGREGATE_3COLLATIONS", 1270 },
-{ "ER_CANT_AGGREGATE_NCOLLATIONS", 1271 },
-{ "ER_VARIABLE_IS_NOT_STRUCT", 1272 },
-{ "ER_UNKNOWN_COLLATION", 1273 },
-{ "ER_SLAVE_IGNORED_SSL_PARAMS", 1274 },
-{ "ER_SERVER_IS_IN_SECURE_AUTH_MODE", 1275 },
-{ "ER_WARN_FIELD_RESOLVED", 1276 },
-{ "ER_BAD_SLAVE_UNTIL_COND", 1277 },
-{ "ER_MISSING_SKIP_SLAVE", 1278 },
-{ "ER_UNTIL_COND_IGNORED", 1279 },
-{ "ER_WRONG_NAME_FOR_INDEX", 1280 },
-{ "ER_WRONG_NAME_FOR_CATALOG", 1281 },
-{ "ER_WARN_QC_RESIZE", 1282 },
-{ "ER_BAD_FT_COLUMN", 1283 },
-{ "ER_UNKNOWN_KEY_CACHE", 1284 },
-{ "ER_WARN_HOSTNAME_WONT_WORK", 1285 },
-{ "ER_UNKNOWN_STORAGE_ENGINE", 1286 },
-{ "ER_WARN_DEPRECATED_SYNTAX", 1287 },
-{ "ER_NON_UPDATABLE_TABLE", 1288 },
-{ "ER_FEATURE_DISABLED", 1289 },
-{ "ER_OPTION_PREVENTS_STATEMENT", 1290 },
-{ "ER_DUPLICATED_VALUE_IN_TYPE", 1291 },
-{ "ER_TRUNCATED_WRONG_VALUE", 1292 },
-{ "ER_TOO_MUCH_AUTO_TIMESTAMP_COLS", 1293 },
-{ "ER_INVALID_ON_UPDATE", 1294 },
-{ "ER_UNSUPPORTED_PS", 1295 },
-{ "ER_GET_ERRMSG", 1296 },
-{ "ER_GET_TEMPORARY_ERRMSG", 1297 },
-{ "ER_UNKNOWN_TIME_ZONE", 1298 },
-{ "ER_WARN_INVALID_TIMESTAMP", 1299 },
-{ "ER_INVALID_CHARACTER_STRING", 1300 },
-{ "ER_WARN_ALLOWED_PACKET_OVERFLOWED", 1301 },
-{ "ER_CONFLICTING_DECLARATIONS", 1302 },
-{ "ER_SP_NO_RECURSIVE_CREATE", 1303 },
-{ "ER_SP_ALREADY_EXISTS", 1304 },
-{ "ER_SP_DOES_NOT_EXIST", 1305 },
-{ "ER_SP_DROP_FAILED", 1306 },
-{ "ER_SP_STORE_FAILED", 1307 },
-{ "ER_SP_LILABEL_MISMATCH", 1308 },
-{ "ER_SP_LABEL_REDEFINE", 1309 },
-{ "ER_SP_LABEL_MISMATCH", 1310 },
-{ "ER_SP_UNINIT_VAR", 1311 },
-{ "ER_SP_BADSELECT", 1312 },
-{ "ER_SP_BADRETURN", 1313 },
-{ "ER_SP_BADSTATEMENT", 1314 },
-{ "ER_UPDATE_LOG_DEPRECATED_IGNORED", 1315 },
-{ "ER_UPDATE_LOG_DEPRECATED_TRANSLATED", 1316 },
-{ "ER_QUERY_INTERRUPTED", 1317 },
-{ "ER_SP_WRONG_NO_OF_ARGS", 1318 },
-{ "ER_SP_COND_MISMATCH", 1319 },
-{ "ER_SP_NORETURN", 1320 },
-{ "ER_SP_NORETURNEND", 1321 },
-{ "ER_SP_BAD_CURSOR_QUERY", 1322 },
-{ "ER_SP_BAD_CURSOR_SELECT", 1323 },
-{ "ER_SP_CURSOR_MISMATCH", 1324 },
-{ "ER_SP_CURSOR_ALREADY_OPEN", 1325 },
-{ "ER_SP_CURSOR_NOT_OPEN", 1326 },
-{ "ER_SP_UNDECLARED_VAR", 1327 },
-{ "ER_SP_WRONG_NO_OF_FETCH_ARGS", 1328 },
-{ "ER_SP_FETCH_NO_DATA", 1329 },
-{ "ER_SP_DUP_PARAM", 1330 },
-{ "ER_SP_DUP_VAR", 1331 },
-{ "ER_SP_DUP_COND", 1332 },
-{ "ER_SP_DUP_CURS", 1333 },
-{ "ER_SP_CANT_ALTER", 1334 },
-{ "ER_SP_SUBSELECT_NYI", 1335 },
-{ "ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG", 1336 },
-{ "ER_SP_VARCOND_AFTER_CURSHNDLR", 1337 },
-{ "ER_SP_CURSOR_AFTER_HANDLER", 1338 },
-{ "ER_SP_CASE_NOT_FOUND", 1339 },
-{ "ER_FPARSER_TOO_BIG_FILE", 1340 },
-{ "ER_FPARSER_BAD_HEADER", 1341 },
-{ "ER_FPARSER_EOF_IN_COMMENT", 1342 },
-{ "ER_FPARSER_ERROR_IN_PARAMETER", 1343 },
-{ "ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER", 1344 },
-{ "ER_VIEW_NO_EXPLAIN", 1345 },
-{ "ER_FRM_UNKNOWN_TYPE", 1346 },
-{ "ER_WRONG_OBJECT", 1347 },
-{ "ER_NONUPDATEABLE_COLUMN", 1348 },
-{ "ER_VIEW_SELECT_DERIVED", 1349 },
-{ "ER_VIEW_SELECT_CLAUSE", 1350 },
-{ "ER_VIEW_SELECT_VARIABLE", 1351 },
-{ "ER_VIEW_SELECT_TMPTABLE", 1352 },
-{ "ER_VIEW_WRONG_LIST", 1353 },
-{ "ER_WARN_VIEW_MERGE", 1354 },
-{ "ER_WARN_VIEW_WITHOUT_KEY", 1355 },
-{ "ER_VIEW_INVALID", 1356 },
-{ "ER_SP_NO_DROP_SP", 1357 },
-{ "ER_SP_GOTO_IN_HNDLR", 1358 },
-{ "ER_TRG_ALREADY_EXISTS", 1359 },
-{ "ER_TRG_DOES_NOT_EXIST", 1360 },
-{ "ER_TRG_ON_VIEW_OR_TEMP_TABLE", 1361 },
-{ "ER_TRG_CANT_CHANGE_ROW", 1362 },
-{ "ER_TRG_NO_SUCH_ROW_IN_TRG", 1363 },
-{ "ER_NO_DEFAULT_FOR_FIELD", 1364 },
-{ "ER_DIVISION_BY_ZERO", 1365 },
-{ "ER_TRUNCATED_WRONG_VALUE_FOR_FIELD", 1366 },
-{ "ER_ILLEGAL_VALUE_FOR_TYPE", 1367 },
-{ "ER_VIEW_NONUPD_CHECK", 1368 },
-{ "ER_VIEW_CHECK_FAILED", 1369 },
-{ "ER_PROCACCESS_DENIED_ERROR", 1370 },
-{ "ER_RELAY_LOG_FAIL", 1371 },
-{ "ER_PASSWD_LENGTH", 1372 },
-{ "ER_UNKNOWN_TARGET_BINLOG", 1373 },
-{ "ER_IO_ERR_LOG_INDEX_READ", 1374 },
-{ "ER_BINLOG_PURGE_PROHIBITED", 1375 },
-{ "ER_FSEEK_FAIL", 1376 },
-{ "ER_BINLOG_PURGE_FATAL_ERR", 1377 },
-{ "ER_LOG_IN_USE", 1378 },
-{ "ER_LOG_PURGE_UNKNOWN_ERR", 1379 },
-{ "ER_RELAY_LOG_INIT", 1380 },
-{ "ER_NO_BINARY_LOGGING", 1381 },
-{ "ER_RESERVED_SYNTAX", 1382 },
-{ "ER_WSAS_FAILED", 1383 },
-{ "ER_DIFF_GROUPS_PROC", 1384 },
-{ "ER_NO_GROUP_FOR_PROC", 1385 },
-{ "ER_ORDER_WITH_PROC", 1386 },
-{ "ER_LOGGING_PROHIBIT_CHANGING_OF", 1387 },
-{ "ER_NO_FILE_MAPPING", 1388 },
-{ "ER_WRONG_MAGIC", 1389 },
-{ "ER_PS_MANY_PARAM", 1390 },
-{ "ER_KEY_PART_0", 1391 },
-{ "ER_VIEW_CHECKSUM", 1392 },
-{ "ER_VIEW_MULTIUPDATE", 1393 },
-{ "ER_VIEW_NO_INSERT_FIELD_LIST", 1394 },
-{ "ER_VIEW_DELETE_MERGE_VIEW", 1395 },
-{ "ER_CANNOT_USER", 1396 },
-{ "ER_XAER_NOTA", 1397 },
-{ "ER_XAER_INVAL", 1398 },
-{ "ER_XAER_RMFAIL", 1399 },
-{ "ER_XAER_OUTSIDE", 1400 },
-{ "ER_XAER_RMERR", 1401 },
-{ "ER_XA_RBROLLBACK", 1402 },
-{ "ER_NONEXISTING_PROC_GRANT", 1403 },
-{ "ER_PROC_AUTO_GRANT_FAIL", 1404 },
-{ "ER_PROC_AUTO_REVOKE_FAIL", 1405 },
-{ "ER_DATA_TOO_LONG", 1406 },
-{ "ER_SP_BAD_SQLSTATE", 1407 },
-{ "ER_STARTUP", 1408 },
-{ "ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR", 1409 },
-{ "ER_CANT_CREATE_USER_WITH_GRANT", 1410 },
-{ "ER_WRONG_VALUE_FOR_TYPE", 1411 },
-{ "ER_TABLE_DEF_CHANGED", 1412 },
-{ "ER_SP_DUP_HANDLER", 1413 },
-{ "ER_SP_NOT_VAR_ARG", 1414 },
-{ "ER_SP_NO_RETSET", 1415 },
-{ "ER_CANT_CREATE_GEOMETRY_OBJECT", 1416 },
-{ "ER_FAILED_ROUTINE_BREAK_BINLOG", 1417 },
-{ "ER_BINLOG_UNSAFE_ROUTINE", 1418 },
-{ "ER_BINLOG_CREATE_ROUTINE_NEED_SUPER", 1419 },
-{ "ER_EXEC_STMT_WITH_OPEN_CURSOR", 1420 },
-{ "ER_STMT_HAS_NO_OPEN_CURSOR", 1421 },
-{ "ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG", 1422 },
-{ "ER_NO_DEFAULT_FOR_VIEW_FIELD", 1423 },
-{ "ER_SP_NO_RECURSION", 1424 },
-{ "ER_TOO_BIG_SCALE", 1425 },
-{ "ER_TOO_BIG_PRECISION", 1426 },
-{ "ER_M_BIGGER_THAN_D", 1427 },
-{ "ER_WRONG_LOCK_OF_SYSTEM_TABLE", 1428 },
-{ "ER_CONNECT_TO_FOREIGN_DATA_SOURCE", 1429 },
-{ "ER_QUERY_ON_FOREIGN_DATA_SOURCE", 1430 },
-{ "ER_FOREIGN_DATA_SOURCE_DOESNT_EXIST", 1431 },
-{ "ER_FOREIGN_DATA_STRING_INVALID_CANT_CREATE", 1432 },
-{ "ER_FOREIGN_DATA_STRING_INVALID", 1433 },
-{ "ER_CANT_CREATE_FEDERATED_TABLE", 1434 },
-{ "ER_TRG_IN_WRONG_SCHEMA", 1435 },
-{ "ER_STACK_OVERRUN_NEED_MORE", 1436 },
-{ "ER_TOO_LONG_BODY", 1437 },
-{ "ER_WARN_CANT_DROP_DEFAULT_KEYCACHE", 1438 },
-{ "ER_TOO_BIG_DISPLAYWIDTH", 1439 },
-{ "ER_XAER_DUPID", 1440 },
-{ "ER_DATETIME_FUNCTION_OVERFLOW", 1441 },
-{ "ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG", 1442 },
-{ "ER_VIEW_PREVENT_UPDATE", 1443 },
-{ "ER_PS_NO_RECURSION", 1444 },
-{ "ER_SP_CANT_SET_AUTOCOMMIT", 1445 },
-{ "ER_MALFORMED_DEFINER", 1446 },
-{ "ER_VIEW_FRM_NO_USER", 1447 },
-{ "ER_VIEW_OTHER_USER", 1448 },
-{ "ER_NO_SUCH_USER", 1449 },
-{ "ER_FORBID_SCHEMA_CHANGE", 1450 },
-{ "ER_ROW_IS_REFERENCED_2", 1451 },
-{ "ER_NO_REFERENCED_ROW_2", 1452 },
-{ "ER_SP_BAD_VAR_SHADOW", 1453 },
-{ "ER_TRG_NO_DEFINER", 1454 },
-{ "ER_OLD_FILE_FORMAT", 1455 },
-{ "ER_SP_RECURSION_LIMIT", 1456 },
-{ "ER_SP_PROC_TABLE_CORRUPT", 1457 },
-{ "ER_SP_WRONG_NAME", 1458 },
-{ "ER_TABLE_NEEDS_UPGRADE", 1459 },
-{ "ER_SP_NO_AGGREGATE", 1460 },
-{ "ER_MAX_PREPARED_STMT_COUNT_REACHED", 1461 },
-{ "ER_VIEW_RECURSIVE", 1462 },
-{ "ER_NON_GROUPING_FIELD_USED", 1463 },
-{ "ER_TABLE_CANT_HANDLE_SPKEYS", 1464 },
-{ "ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA", 1465 },
-{ "ER_REMOVED_SPACES", 1466 },
-{ "ER_AUTOINC_READ_FAILED", 1467 },
-{ "ER_USERNAME", 1468 },
-{ "ER_HOSTNAME", 1469 },
-{ "ER_WRONG_STRING_LENGTH", 1470 },
-{ "ER_NON_INSERTABLE_TABLE", 1471 },
-{ "ER_ADMIN_WRONG_MRG_TABLE", 1472 },
-{ "ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT", 1473 },
-{ "ER_NAME_BECOMES_EMPTY", 1474 },
-{ "ER_AMBIGUOUS_FIELD_TERM", 1475 },
-{ "ER_FOREIGN_SERVER_EXISTS", 1476 },
-{ "ER_FOREIGN_SERVER_DOESNT_EXIST", 1477 },
-{ "ER_ILLEGAL_HA_CREATE_OPTION", 1478 },
-{ "ER_PARTITION_REQUIRES_VALUES_ERROR", 1479 },
-{ "ER_PARTITION_WRONG_VALUES_ERROR", 1480 },
-{ "ER_PARTITION_MAXVALUE_ERROR", 1481 },
-{ "ER_PARTITION_SUBPARTITION_ERROR", 1482 },
-{ "ER_PARTITION_SUBPART_MIX_ERROR", 1483 },
-{ "ER_PARTITION_WRONG_NO_PART_ERROR", 1484 },
-{ "ER_PARTITION_WRONG_NO_SUBPART_ERROR", 1485 },
-{ "ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR", 1486 },
-{ "ER_NO_CONST_EXPR_IN_RANGE_OR_LIST_ERROR", 1487 },
-{ "ER_FIELD_NOT_FOUND_PART_ERROR", 1488 },
-{ "ER_LIST_OF_FIELDS_ONLY_IN_HASH_ERROR", 1489 },
-{ "ER_INCONSISTENT_PARTITION_INFO_ERROR", 1490 },
-{ "ER_PARTITION_FUNC_NOT_ALLOWED_ERROR", 1491 },
-{ "ER_PARTITIONS_MUST_BE_DEFINED_ERROR", 1492 },
-{ "ER_RANGE_NOT_INCREASING_ERROR", 1493 },
-{ "ER_INCONSISTENT_TYPE_OF_FUNCTIONS_ERROR", 1494 },
-{ "ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR", 1495 },
-{ "ER_PARTITION_ENTRY_ERROR", 1496 },
-{ "ER_MIX_HANDLER_ERROR", 1497 },
-{ "ER_PARTITION_NOT_DEFINED_ERROR", 1498 },
-{ "ER_TOO_MANY_PARTITIONS_ERROR", 1499 },
-{ "ER_SUBPARTITION_ERROR", 1500 },
-{ "ER_CANT_CREATE_HANDLER_FILE", 1501 },
-{ "ER_BLOB_FIELD_IN_PART_FUNC_ERROR", 1502 },
-{ "ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF", 1503 },
-{ "ER_NO_PARTS_ERROR", 1504 },
-{ "ER_PARTITION_MGMT_ON_NONPARTITIONED", 1505 },
-{ "ER_FOREIGN_KEY_ON_PARTITIONED", 1506 },
-{ "ER_DROP_PARTITION_NON_EXISTENT", 1507 },
-{ "ER_DROP_LAST_PARTITION", 1508 },
-{ "ER_COALESCE_ONLY_ON_HASH_PARTITION", 1509 },
-{ "ER_REORG_HASH_ONLY_ON_SAME_NO", 1510 },
-{ "ER_REORG_NO_PARAM_ERROR", 1511 },
-{ "ER_ONLY_ON_RANGE_LIST_PARTITION", 1512 },
-{ "ER_ADD_PARTITION_SUBPART_ERROR", 1513 },
-{ "ER_ADD_PARTITION_NO_NEW_PARTITION", 1514 },
-{ "ER_COALESCE_PARTITION_NO_PARTITION", 1515 },
-{ "ER_REORG_PARTITION_NOT_EXIST", 1516 },
-{ "ER_SAME_NAME_PARTITION", 1517 },
-{ "ER_NO_BINLOG_ERROR", 1518 },
-{ "ER_CONSECUTIVE_REORG_PARTITIONS", 1519 },
-{ "ER_REORG_OUTSIDE_RANGE", 1520 },
-{ "ER_PARTITION_FUNCTION_FAILURE", 1521 },
-{ "ER_PART_STATE_ERROR", 1522 },
-{ "ER_LIMITED_PART_RANGE", 1523 },
-{ "ER_PLUGIN_IS_NOT_LOADED", 1524 },
-{ "ER_WRONG_VALUE", 1525 },
-{ "ER_NO_PARTITION_FOR_GIVEN_VALUE", 1526 },
-{ "ER_FILEGROUP_OPTION_ONLY_ONCE", 1527 },
-{ "ER_CREATE_FILEGROUP_FAILED", 1528 },
-{ "ER_DROP_FILEGROUP_FAILED", 1529 },
-{ "ER_TABLESPACE_AUTO_EXTEND_ERROR", 1530 },
-{ "ER_WRONG_SIZE_NUMBER", 1531 },
-{ "ER_SIZE_OVERFLOW_ERROR", 1532 },
-{ "ER_ALTER_FILEGROUP_FAILED", 1533 },
-{ "ER_BINLOG_ROW_LOGGING_FAILED", 1534 },
-{ "ER_BINLOG_ROW_WRONG_TABLE_DEF", 1535 },
-{ "ER_BINLOG_ROW_RBR_TO_SBR", 1536 },
-{ "ER_EVENT_ALREADY_EXISTS", 1537 },
-{ "ER_EVENT_STORE_FAILED", 1538 },
-{ "ER_EVENT_DOES_NOT_EXIST", 1539 },
-{ "ER_EVENT_CANT_ALTER", 1540 },
-{ "ER_EVENT_DROP_FAILED", 1541 },
-{ "ER_EVENT_INTERVAL_NOT_POSITIVE_OR_TOO_BIG", 1542 },
-{ "ER_EVENT_ENDS_BEFORE_STARTS", 1543 },
-{ "ER_EVENT_EXEC_TIME_IN_THE_PAST", 1544 },
-{ "ER_EVENT_OPEN_TABLE_FAILED", 1545 },
-{ "ER_EVENT_NEITHER_M_EXPR_NOR_M_AT", 1546 },
-{ "ER_COL_COUNT_DOESNT_MATCH_CORRUPTED", 1547 },
-{ "ER_CANNOT_LOAD_FROM_TABLE", 1548 },
-{ "ER_EVENT_CANNOT_DELETE", 1549 },
-{ "ER_EVENT_COMPILE_ERROR", 1550 },
-{ "ER_EVENT_SAME_NAME", 1551 },
-{ "ER_EVENT_DATA_TOO_LONG", 1552 },
-{ "ER_DROP_INDEX_FK", 1553 },
-{ "ER_WARN_DEPRECATED_SYNTAX_WITH_VER", 1554 },
-{ "ER_CANT_WRITE_LOCK_LOG_TABLE", 1555 },
-{ "ER_CANT_LOCK_LOG_TABLE", 1556 },
-{ "ER_FOREIGN_DUPLICATE_KEY", 1557 },
-{ "ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE", 1558 },
-{ "ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR", 1559 },
-{ "ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT", 1560 },
-{ "ER_NDB_CANT_SWITCH_BINLOG_FORMAT", 1561 },
-{ "ER_PARTITION_NO_TEMPORARY", 1562 },
-{ "ER_PARTITION_CONST_DOMAIN_ERROR", 1563 },
-{ "ER_PARTITION_FUNCTION_IS_NOT_ALLOWED", 1564 },
-{ "ER_DDL_LOG_ERROR", 1565 },
-{ "ER_NULL_IN_VALUES_LESS_THAN", 1566 },
-{ "ER_WRONG_PARTITION_NAME", 1567 },
-{ "ER_CANT_CHANGE_TX_ISOLATION", 1568 },
-{ "ER_DUP_ENTRY_AUTOINCREMENT_CASE", 1569 },
-{ "ER_EVENT_MODIFY_QUEUE_ERROR", 1570 },
-{ "ER_EVENT_SET_VAR_ERROR", 1571 },
-{ "ER_PARTITION_MERGE_ERROR", 1572 },
-{ "ER_CANT_ACTIVATE_LOG", 1573 },
-{ "ER_RBR_NOT_AVAILABLE", 1574 },
-{ "ER_BASE64_DECODE_ERROR", 1575 },
-{ "ER_EVENT_RECURSION_FORBIDDEN", 1576 },
-{ "ER_EVENTS_DB_ERROR", 1577 },
-{ "ER_ONLY_INTEGERS_ALLOWED", 1578 },
-{ "ER_UNSUPORTED_LOG_ENGINE", 1579 },
-{ "ER_BAD_LOG_STATEMENT", 1580 },
-{ "ER_CANT_RENAME_LOG_TABLE", 1581 },
-{ "ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT", 1582 },
-{ "ER_WRONG_PARAMETERS_TO_NATIVE_FCT", 1583 },
-{ "ER_WRONG_PARAMETERS_TO_STORED_FCT", 1584 },
-{ "ER_NATIVE_FCT_NAME_COLLISION", 1585 },
-{ "ER_DUP_ENTRY_WITH_KEY_NAME", 1586 },
-{ "ER_BINLOG_PURGE_EMFILE", 1587 },
-{ "ER_EVENT_CANNOT_CREATE_IN_THE_PAST", 1588 },
-{ "ER_EVENT_CANNOT_ALTER_IN_THE_PAST", 1589 },
-{ "ER_SLAVE_INCIDENT", 1590 },
-{ "ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT", 1591 },
-{ "ER_BINLOG_UNSAFE_STATEMENT", 1592 },
-{ "ER_SLAVE_FATAL_ERROR", 1593 },
-{ "ER_SLAVE_RELAY_LOG_READ_FAILURE", 1594 },
-{ "ER_SLAVE_RELAY_LOG_WRITE_FAILURE", 1595 },
-{ "ER_SLAVE_CREATE_EVENT_FAILURE", 1596 },
-{ "ER_SLAVE_MASTER_COM_FAILURE", 1597 },
-{ "ER_BINLOG_LOGGING_IMPOSSIBLE", 1598 },
-{ "ER_VIEW_NO_CREATION_CTX", 1599 },
-{ "ER_VIEW_INVALID_CREATION_CTX", 1600 },
-{ "ER_SR_INVALID_CREATION_CTX", 1601 },
-{ "ER_TRG_CORRUPTED_FILE", 1602 },
-{ "ER_TRG_NO_CREATION_CTX", 1603 },
-{ "ER_TRG_INVALID_CREATION_CTX", 1604 },
-{ "ER_EVENT_INVALID_CREATION_CTX", 1605 },
-{ "ER_TRG_CANT_OPEN_TABLE", 1606 },
-{ "ER_CANT_CREATE_SROUTINE", 1607 },
-{ "ER_SLAVE_AMBIGOUS_EXEC_MODE", 1608 },
-{ "ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENT", 1609 },
-{ "ER_SLAVE_CORRUPT_EVENT", 1610 },
-{ "ER_LOAD_DATA_INVALID_COLUMN", 1611 },
-{ "ER_LOG_PURGE_NO_FILE", 1612 },
-{ "ER_XA_RBTIMEOUT", 1613 },
-{ "ER_XA_RBDEADLOCK", 1614 },
-{ "ER_NEED_REPREPARE", 1615 },
-{ "ER_DELAYED_NOT_SUPPORTED", 1616 },
-{ "WARN_NO_MASTER_INFO", 1617 },
-{ "WARN_OPTION_IGNORED", 1618 },
-{ "WARN_PLUGIN_DELETE_BUILTIN", 1619 },
-{ "WARN_PLUGIN_BUSY", 1620 },
-{ "ER_VARIABLE_IS_READONLY", 1621 },
-{ "ER_WARN_ENGINE_TRANSACTION_ROLLBACK", 1622 },
-{ "ER_SLAVE_HEARTBEAT_FAILURE", 1623 },
-{ "ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE", 1624 },
-{ "ER_NDB_REPLICATION_SCHEMA_ERROR", 1625 },
-{ "ER_CONFLICT_FN_PARSE_ERROR", 1626 },
-{ "ER_EXCEPTIONS_WRITE_ERROR", 1627 },
-{ "ER_TOO_LONG_TABLE_COMMENT", 1628 },
-{ "ER_TOO_LONG_FIELD_COMMENT", 1629 },
-{ "ER_FUNC_INEXISTENT_NAME_COLLISION", 1630 },
-{ "ER_DATABASE_NAME", 1631 },
-{ "ER_TABLE_NAME", 1632 },
-{ "ER_PARTITION_NAME", 1633 },
-{ "ER_SUBPARTITION_NAME", 1634 },
-{ "ER_TEMPORARY_NAME", 1635 },
-{ "ER_RENAMED_NAME", 1636 },
-{ "ER_TOO_MANY_CONCURRENT_TRXS", 1637 },
-{ "WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED", 1638 },
-{ "ER_DEBUG_SYNC_TIMEOUT", 1639 },
-{ "ER_DEBUG_SYNC_HIT_LIMIT", 1640 },
diff --git a/dep/include/mysql/mysqld_error.h b/dep/include/mysql/mysqld_error.h
deleted file mode 100644
index c35c25420..000000000
--- a/dep/include/mysql/mysqld_error.h
+++ /dev/null
@@ -1,645 +0,0 @@
-/* Autogenerated file, please don't edit */
-
-#define ER_ERROR_FIRST 1000
-#define ER_HASHCHK 1000
-#define ER_NISAMCHK 1001
-#define ER_NO 1002
-#define ER_YES 1003
-#define ER_CANT_CREATE_FILE 1004
-#define ER_CANT_CREATE_TABLE 1005
-#define ER_CANT_CREATE_DB 1006
-#define ER_DB_CREATE_EXISTS 1007
-#define ER_DB_DROP_EXISTS 1008
-#define ER_DB_DROP_DELETE 1009
-#define ER_DB_DROP_RMDIR 1010
-#define ER_CANT_DELETE_FILE 1011
-#define ER_CANT_FIND_SYSTEM_REC 1012
-#define ER_CANT_GET_STAT 1013
-#define ER_CANT_GET_WD 1014
-#define ER_CANT_LOCK 1015
-#define ER_CANT_OPEN_FILE 1016
-#define ER_FILE_NOT_FOUND 1017
-#define ER_CANT_READ_DIR 1018
-#define ER_CANT_SET_WD 1019
-#define ER_CHECKREAD 1020
-#define ER_DISK_FULL 1021
-#define ER_DUP_KEY 1022
-#define ER_ERROR_ON_CLOSE 1023
-#define ER_ERROR_ON_READ 1024
-#define ER_ERROR_ON_RENAME 1025
-#define ER_ERROR_ON_WRITE 1026
-#define ER_FILE_USED 1027
-#define ER_FILSORT_ABORT 1028
-#define ER_FORM_NOT_FOUND 1029
-#define ER_GET_ERRNO 1030
-#define ER_ILLEGAL_HA 1031
-#define ER_KEY_NOT_FOUND 1032
-#define ER_NOT_FORM_FILE 1033
-#define ER_NOT_KEYFILE 1034
-#define ER_OLD_KEYFILE 1035
-#define ER_OPEN_AS_READONLY 1036
-#define ER_OUTOFMEMORY 1037
-#define ER_OUT_OF_SORTMEMORY 1038
-#define ER_UNEXPECTED_EOF 1039
-#define ER_CON_COUNT_ERROR 1040
-#define ER_OUT_OF_RESOURCES 1041
-#define ER_BAD_HOST_ERROR 1042
-#define ER_HANDSHAKE_ERROR 1043
-#define ER_DBACCESS_DENIED_ERROR 1044
-#define ER_ACCESS_DENIED_ERROR 1045
-#define ER_NO_DB_ERROR 1046
-#define ER_UNKNOWN_COM_ERROR 1047
-#define ER_BAD_NULL_ERROR 1048
-#define ER_BAD_DB_ERROR 1049
-#define ER_TABLE_EXISTS_ERROR 1050
-#define ER_BAD_TABLE_ERROR 1051
-#define ER_NON_UNIQ_ERROR 1052
-#define ER_SERVER_SHUTDOWN 1053
-#define ER_BAD_FIELD_ERROR 1054
-#define ER_WRONG_FIELD_WITH_GROUP 1055
-#define ER_WRONG_GROUP_FIELD 1056
-#define ER_WRONG_SUM_SELECT 1057
-#define ER_WRONG_VALUE_COUNT 1058
-#define ER_TOO_LONG_IDENT 1059
-#define ER_DUP_FIELDNAME 1060
-#define ER_DUP_KEYNAME 1061
-#define ER_DUP_ENTRY 1062
-#define ER_WRONG_FIELD_SPEC 1063
-#define ER_PARSE_ERROR 1064
-#define ER_EMPTY_QUERY 1065
-#define ER_NONUNIQ_TABLE 1066
-#define ER_INVALID_DEFAULT 1067
-#define ER_MULTIPLE_PRI_KEY 1068
-#define ER_TOO_MANY_KEYS 1069
-#define ER_TOO_MANY_KEY_PARTS 1070
-#define ER_TOO_LONG_KEY 1071
-#define ER_KEY_COLUMN_DOES_NOT_EXITS 1072
-#define ER_BLOB_USED_AS_KEY 1073
-#define ER_TOO_BIG_FIELDLENGTH 1074
-#define ER_WRONG_AUTO_KEY 1075
-#define ER_READY 1076
-#define ER_NORMAL_SHUTDOWN 1077
-#define ER_GOT_SIGNAL 1078
-#define ER_SHUTDOWN_COMPLETE 1079
-#define ER_FORCING_CLOSE 1080
-#define ER_IPSOCK_ERROR 1081
-#define ER_NO_SUCH_INDEX 1082
-#define ER_WRONG_FIELD_TERMINATORS 1083
-#define ER_BLOBS_AND_NO_TERMINATED 1084
-#define ER_TEXTFILE_NOT_READABLE 1085
-#define ER_FILE_EXISTS_ERROR 1086
-#define ER_LOAD_INFO 1087
-#define ER_ALTER_INFO 1088
-#define ER_WRONG_SUB_KEY 1089
-#define ER_CANT_REMOVE_ALL_FIELDS 1090
-#define ER_CANT_DROP_FIELD_OR_KEY 1091
-#define ER_INSERT_INFO 1092
-#define ER_UPDATE_TABLE_USED 1093
-#define ER_NO_SUCH_THREAD 1094
-#define ER_KILL_DENIED_ERROR 1095
-#define ER_NO_TABLES_USED 1096
-#define ER_TOO_BIG_SET 1097
-#define ER_NO_UNIQUE_LOGFILE 1098
-#define ER_TABLE_NOT_LOCKED_FOR_WRITE 1099
-#define ER_TABLE_NOT_LOCKED 1100
-#define ER_BLOB_CANT_HAVE_DEFAULT 1101
-#define ER_WRONG_DB_NAME 1102
-#define ER_WRONG_TABLE_NAME 1103
-#define ER_TOO_BIG_SELECT 1104
-#define ER_UNKNOWN_ERROR 1105
-#define ER_UNKNOWN_PROCEDURE 1106
-#define ER_WRONG_PARAMCOUNT_TO_PROCEDURE 1107
-#define ER_WRONG_PARAMETERS_TO_PROCEDURE 1108
-#define ER_UNKNOWN_TABLE 1109
-#define ER_FIELD_SPECIFIED_TWICE 1110
-#define ER_INVALID_GROUP_FUNC_USE 1111
-#define ER_UNSUPPORTED_EXTENSION 1112
-#define ER_TABLE_MUST_HAVE_COLUMNS 1113
-#define ER_RECORD_FILE_FULL 1114
-#define ER_UNKNOWN_CHARACTER_SET 1115
-#define ER_TOO_MANY_TABLES 1116
-#define ER_TOO_MANY_FIELDS 1117
-#define ER_TOO_BIG_ROWSIZE 1118
-#define ER_STACK_OVERRUN 1119
-#define ER_WRONG_OUTER_JOIN 1120
-#define ER_NULL_COLUMN_IN_INDEX 1121
-#define ER_CANT_FIND_UDF 1122
-#define ER_CANT_INITIALIZE_UDF 1123
-#define ER_UDF_NO_PATHS 1124
-#define ER_UDF_EXISTS 1125
-#define ER_CANT_OPEN_LIBRARY 1126
-#define ER_CANT_FIND_DL_ENTRY 1127
-#define ER_FUNCTION_NOT_DEFINED 1128
-#define ER_HOST_IS_BLOCKED 1129
-#define ER_HOST_NOT_PRIVILEGED 1130
-#define ER_PASSWORD_ANONYMOUS_USER 1131
-#define ER_PASSWORD_NOT_ALLOWED 1132
-#define ER_PASSWORD_NO_MATCH 1133
-#define ER_UPDATE_INFO 1134
-#define ER_CANT_CREATE_THREAD 1135
-#define ER_WRONG_VALUE_COUNT_ON_ROW 1136
-#define ER_CANT_REOPEN_TABLE 1137
-#define ER_INVALID_USE_OF_NULL 1138
-#define ER_REGEXP_ERROR 1139
-#define ER_MIX_OF_GROUP_FUNC_AND_FIELDS 1140
-#define ER_NONEXISTING_GRANT 1141
-#define ER_TABLEACCESS_DENIED_ERROR 1142
-#define ER_COLUMNACCESS_DENIED_ERROR 1143
-#define ER_ILLEGAL_GRANT_FOR_TABLE 1144
-#define ER_GRANT_WRONG_HOST_OR_USER 1145
-#define ER_NO_SUCH_TABLE 1146
-#define ER_NONEXISTING_TABLE_GRANT 1147
-#define ER_NOT_ALLOWED_COMMAND 1148
-#define ER_SYNTAX_ERROR 1149
-#define ER_DELAYED_CANT_CHANGE_LOCK 1150
-#define ER_TOO_MANY_DELAYED_THREADS 1151
-#define ER_ABORTING_CONNECTION 1152
-#define ER_NET_PACKET_TOO_LARGE 1153
-#define ER_NET_READ_ERROR_FROM_PIPE 1154
-#define ER_NET_FCNTL_ERROR 1155
-#define ER_NET_PACKETS_OUT_OF_ORDER 1156
-#define ER_NET_UNCOMPRESS_ERROR 1157
-#define ER_NET_READ_ERROR 1158
-#define ER_NET_READ_INTERRUPTED 1159
-#define ER_NET_ERROR_ON_WRITE 1160
-#define ER_NET_WRITE_INTERRUPTED 1161
-#define ER_TOO_LONG_STRING 1162
-#define ER_TABLE_CANT_HANDLE_BLOB 1163
-#define ER_TABLE_CANT_HANDLE_AUTO_INCREMENT 1164
-#define ER_DELAYED_INSERT_TABLE_LOCKED 1165
-#define ER_WRONG_COLUMN_NAME 1166
-#define ER_WRONG_KEY_COLUMN 1167
-#define ER_WRONG_MRG_TABLE 1168
-#define ER_DUP_UNIQUE 1169
-#define ER_BLOB_KEY_WITHOUT_LENGTH 1170
-#define ER_PRIMARY_CANT_HAVE_NULL 1171
-#define ER_TOO_MANY_ROWS 1172
-#define ER_REQUIRES_PRIMARY_KEY 1173
-#define ER_NO_RAID_COMPILED 1174
-#define ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE 1175
-#define ER_KEY_DOES_NOT_EXITS 1176
-#define ER_CHECK_NO_SUCH_TABLE 1177
-#define ER_CHECK_NOT_IMPLEMENTED 1178
-#define ER_CANT_DO_THIS_DURING_AN_TRANSACTION 1179
-#define ER_ERROR_DURING_COMMIT 1180
-#define ER_ERROR_DURING_ROLLBACK 1181
-#define ER_ERROR_DURING_FLUSH_LOGS 1182
-#define ER_ERROR_DURING_CHECKPOINT 1183
-#define ER_NEW_ABORTING_CONNECTION 1184
-#define ER_DUMP_NOT_IMPLEMENTED 1185
-#define ER_FLUSH_MASTER_BINLOG_CLOSED 1186
-#define ER_INDEX_REBUILD 1187
-#define ER_MASTER 1188
-#define ER_MASTER_NET_READ 1189
-#define ER_MASTER_NET_WRITE 1190
-#define ER_FT_MATCHING_KEY_NOT_FOUND 1191
-#define ER_LOCK_OR_ACTIVE_TRANSACTION 1192
-#define ER_UNKNOWN_SYSTEM_VARIABLE 1193
-#define ER_CRASHED_ON_USAGE 1194
-#define ER_CRASHED_ON_REPAIR 1195
-#define ER_WARNING_NOT_COMPLETE_ROLLBACK 1196
-#define ER_TRANS_CACHE_FULL 1197
-#define ER_SLAVE_MUST_STOP 1198
-#define ER_SLAVE_NOT_RUNNING 1199
-#define ER_BAD_SLAVE 1200
-#define ER_MASTER_INFO 1201
-#define ER_SLAVE_THREAD 1202
-#define ER_TOO_MANY_USER_CONNECTIONS 1203
-#define ER_SET_CONSTANTS_ONLY 1204
-#define ER_LOCK_WAIT_TIMEOUT 1205
-#define ER_LOCK_TABLE_FULL 1206
-#define ER_READ_ONLY_TRANSACTION 1207
-#define ER_DROP_DB_WITH_READ_LOCK 1208
-#define ER_CREATE_DB_WITH_READ_LOCK 1209
-#define ER_WRONG_ARGUMENTS 1210
-#define ER_NO_PERMISSION_TO_CREATE_USER 1211
-#define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212
-#define ER_LOCK_DEADLOCK 1213
-#define ER_TABLE_CANT_HANDLE_FT 1214
-#define ER_CANNOT_ADD_FOREIGN 1215
-#define ER_NO_REFERENCED_ROW 1216
-#define ER_ROW_IS_REFERENCED 1217
-#define ER_CONNECT_TO_MASTER 1218
-#define ER_QUERY_ON_MASTER 1219
-#define ER_ERROR_WHEN_EXECUTING_COMMAND 1220
-#define ER_WRONG_USAGE 1221
-#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1222
-#define ER_CANT_UPDATE_WITH_READLOCK 1223
-#define ER_MIXING_NOT_ALLOWED 1224
-#define ER_DUP_ARGUMENT 1225
-#define ER_USER_LIMIT_REACHED 1226
-#define ER_SPECIFIC_ACCESS_DENIED_ERROR 1227
-#define ER_LOCAL_VARIABLE 1228
-#define ER_GLOBAL_VARIABLE 1229
-#define ER_NO_DEFAULT 1230
-#define ER_WRONG_VALUE_FOR_VAR 1231
-#define ER_WRONG_TYPE_FOR_VAR 1232
-#define ER_VAR_CANT_BE_READ 1233
-#define ER_CANT_USE_OPTION_HERE 1234
-#define ER_NOT_SUPPORTED_YET 1235
-#define ER_MASTER_FATAL_ERROR_READING_BINLOG 1236
-#define ER_SLAVE_IGNORED_TABLE 1237
-#define ER_INCORRECT_GLOBAL_LOCAL_VAR 1238
-#define ER_WRONG_FK_DEF 1239
-#define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1240
-#define ER_OPERAND_COLUMNS 1241
-#define ER_SUBQUERY_NO_1_ROW 1242
-#define ER_UNKNOWN_STMT_HANDLER 1243
-#define ER_CORRUPT_HELP_DB 1244
-#define ER_CYCLIC_REFERENCE 1245
-#define ER_AUTO_CONVERT 1246
-#define ER_ILLEGAL_REFERENCE 1247
-#define ER_DERIVED_MUST_HAVE_ALIAS 1248
-#define ER_SELECT_REDUCED 1249
-#define ER_TABLENAME_NOT_ALLOWED_HERE 1250
-#define ER_NOT_SUPPORTED_AUTH_MODE 1251
-#define ER_SPATIAL_CANT_HAVE_NULL 1252
-#define ER_COLLATION_CHARSET_MISMATCH 1253
-#define ER_SLAVE_WAS_RUNNING 1254
-#define ER_SLAVE_WAS_NOT_RUNNING 1255
-#define ER_TOO_BIG_FOR_UNCOMPRESS 1256
-#define ER_ZLIB_Z_MEM_ERROR 1257
-#define ER_ZLIB_Z_BUF_ERROR 1258
-#define ER_ZLIB_Z_DATA_ERROR 1259
-#define ER_CUT_VALUE_GROUP_CONCAT 1260
-#define ER_WARN_TOO_FEW_RECORDS 1261
-#define ER_WARN_TOO_MANY_RECORDS 1262
-#define ER_WARN_NULL_TO_NOTNULL 1263
-#define ER_WARN_DATA_OUT_OF_RANGE 1264
-#define WARN_DATA_TRUNCATED 1265
-#define ER_WARN_USING_OTHER_HANDLER 1266
-#define ER_CANT_AGGREGATE_2COLLATIONS 1267
-#define ER_DROP_USER 1268
-#define ER_REVOKE_GRANTS 1269
-#define ER_CANT_AGGREGATE_3COLLATIONS 1270
-#define ER_CANT_AGGREGATE_NCOLLATIONS 1271
-#define ER_VARIABLE_IS_NOT_STRUCT 1272
-#define ER_UNKNOWN_COLLATION 1273
-#define ER_SLAVE_IGNORED_SSL_PARAMS 1274
-#define ER_SERVER_IS_IN_SECURE_AUTH_MODE 1275
-#define ER_WARN_FIELD_RESOLVED 1276
-#define ER_BAD_SLAVE_UNTIL_COND 1277
-#define ER_MISSING_SKIP_SLAVE 1278
-#define ER_UNTIL_COND_IGNORED 1279
-#define ER_WRONG_NAME_FOR_INDEX 1280
-#define ER_WRONG_NAME_FOR_CATALOG 1281
-#define ER_WARN_QC_RESIZE 1282
-#define ER_BAD_FT_COLUMN 1283
-#define ER_UNKNOWN_KEY_CACHE 1284
-#define ER_WARN_HOSTNAME_WONT_WORK 1285
-#define ER_UNKNOWN_STORAGE_ENGINE 1286
-#define ER_WARN_DEPRECATED_SYNTAX 1287
-#define ER_NON_UPDATABLE_TABLE 1288
-#define ER_FEATURE_DISABLED 1289
-#define ER_OPTION_PREVENTS_STATEMENT 1290
-#define ER_DUPLICATED_VALUE_IN_TYPE 1291
-#define ER_TRUNCATED_WRONG_VALUE 1292
-#define ER_TOO_MUCH_AUTO_TIMESTAMP_COLS 1293
-#define ER_INVALID_ON_UPDATE 1294
-#define ER_UNSUPPORTED_PS 1295
-#define ER_GET_ERRMSG 1296
-#define ER_GET_TEMPORARY_ERRMSG 1297
-#define ER_UNKNOWN_TIME_ZONE 1298
-#define ER_WARN_INVALID_TIMESTAMP 1299
-#define ER_INVALID_CHARACTER_STRING 1300
-#define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301
-#define ER_CONFLICTING_DECLARATIONS 1302
-#define ER_SP_NO_RECURSIVE_CREATE 1303
-#define ER_SP_ALREADY_EXISTS 1304
-#define ER_SP_DOES_NOT_EXIST 1305
-#define ER_SP_DROP_FAILED 1306
-#define ER_SP_STORE_FAILED 1307
-#define ER_SP_LILABEL_MISMATCH 1308
-#define ER_SP_LABEL_REDEFINE 1309
-#define ER_SP_LABEL_MISMATCH 1310
-#define ER_SP_UNINIT_VAR 1311
-#define ER_SP_BADSELECT 1312
-#define ER_SP_BADRETURN 1313
-#define ER_SP_BADSTATEMENT 1314
-#define ER_UPDATE_LOG_DEPRECATED_IGNORED 1315
-#define ER_UPDATE_LOG_DEPRECATED_TRANSLATED 1316
-#define ER_QUERY_INTERRUPTED 1317
-#define ER_SP_WRONG_NO_OF_ARGS 1318
-#define ER_SP_COND_MISMATCH 1319
-#define ER_SP_NORETURN 1320
-#define ER_SP_NORETURNEND 1321
-#define ER_SP_BAD_CURSOR_QUERY 1322
-#define ER_SP_BAD_CURSOR_SELECT 1323
-#define ER_SP_CURSOR_MISMATCH 1324
-#define ER_SP_CURSOR_ALREADY_OPEN 1325
-#define ER_SP_CURSOR_NOT_OPEN 1326
-#define ER_SP_UNDECLARED_VAR 1327
-#define ER_SP_WRONG_NO_OF_FETCH_ARGS 1328
-#define ER_SP_FETCH_NO_DATA 1329
-#define ER_SP_DUP_PARAM 1330
-#define ER_SP_DUP_VAR 1331
-#define ER_SP_DUP_COND 1332
-#define ER_SP_DUP_CURS 1333
-#define ER_SP_CANT_ALTER 1334
-#define ER_SP_SUBSELECT_NYI 1335
-#define ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG 1336
-#define ER_SP_VARCOND_AFTER_CURSHNDLR 1337
-#define ER_SP_CURSOR_AFTER_HANDLER 1338
-#define ER_SP_CASE_NOT_FOUND 1339
-#define ER_FPARSER_TOO_BIG_FILE 1340
-#define ER_FPARSER_BAD_HEADER 1341
-#define ER_FPARSER_EOF_IN_COMMENT 1342
-#define ER_FPARSER_ERROR_IN_PARAMETER 1343
-#define ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER 1344
-#define ER_VIEW_NO_EXPLAIN 1345
-#define ER_FRM_UNKNOWN_TYPE 1346
-#define ER_WRONG_OBJECT 1347
-#define ER_NONUPDATEABLE_COLUMN 1348
-#define ER_VIEW_SELECT_DERIVED 1349
-#define ER_VIEW_SELECT_CLAUSE 1350
-#define ER_VIEW_SELECT_VARIABLE 1351
-#define ER_VIEW_SELECT_TMPTABLE 1352
-#define ER_VIEW_WRONG_LIST 1353
-#define ER_WARN_VIEW_MERGE 1354
-#define ER_WARN_VIEW_WITHOUT_KEY 1355
-#define ER_VIEW_INVALID 1356
-#define ER_SP_NO_DROP_SP 1357
-#define ER_SP_GOTO_IN_HNDLR 1358
-#define ER_TRG_ALREADY_EXISTS 1359
-#define ER_TRG_DOES_NOT_EXIST 1360
-#define ER_TRG_ON_VIEW_OR_TEMP_TABLE 1361
-#define ER_TRG_CANT_CHANGE_ROW 1362
-#define ER_TRG_NO_SUCH_ROW_IN_TRG 1363
-#define ER_NO_DEFAULT_FOR_FIELD 1364
-#define ER_DIVISION_BY_ZERO 1365
-#define ER_TRUNCATED_WRONG_VALUE_FOR_FIELD 1366
-#define ER_ILLEGAL_VALUE_FOR_TYPE 1367
-#define ER_VIEW_NONUPD_CHECK 1368
-#define ER_VIEW_CHECK_FAILED 1369
-#define ER_PROCACCESS_DENIED_ERROR 1370
-#define ER_RELAY_LOG_FAIL 1371
-#define ER_PASSWD_LENGTH 1372
-#define ER_UNKNOWN_TARGET_BINLOG 1373
-#define ER_IO_ERR_LOG_INDEX_READ 1374
-#define ER_BINLOG_PURGE_PROHIBITED 1375
-#define ER_FSEEK_FAIL 1376
-#define ER_BINLOG_PURGE_FATAL_ERR 1377
-#define ER_LOG_IN_USE 1378
-#define ER_LOG_PURGE_UNKNOWN_ERR 1379
-#define ER_RELAY_LOG_INIT 1380
-#define ER_NO_BINARY_LOGGING 1381
-#define ER_RESERVED_SYNTAX 1382
-#define ER_WSAS_FAILED 1383
-#define ER_DIFF_GROUPS_PROC 1384
-#define ER_NO_GROUP_FOR_PROC 1385
-#define ER_ORDER_WITH_PROC 1386
-#define ER_LOGGING_PROHIBIT_CHANGING_OF 1387
-#define ER_NO_FILE_MAPPING 1388
-#define ER_WRONG_MAGIC 1389
-#define ER_PS_MANY_PARAM 1390
-#define ER_KEY_PART_0 1391
-#define ER_VIEW_CHECKSUM 1392
-#define ER_VIEW_MULTIUPDATE 1393
-#define ER_VIEW_NO_INSERT_FIELD_LIST 1394
-#define ER_VIEW_DELETE_MERGE_VIEW 1395
-#define ER_CANNOT_USER 1396
-#define ER_XAER_NOTA 1397
-#define ER_XAER_INVAL 1398
-#define ER_XAER_RMFAIL 1399
-#define ER_XAER_OUTSIDE 1400
-#define ER_XAER_RMERR 1401
-#define ER_XA_RBROLLBACK 1402
-#define ER_NONEXISTING_PROC_GRANT 1403
-#define ER_PROC_AUTO_GRANT_FAIL 1404
-#define ER_PROC_AUTO_REVOKE_FAIL 1405
-#define ER_DATA_TOO_LONG 1406
-#define ER_SP_BAD_SQLSTATE 1407
-#define ER_STARTUP 1408
-#define ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR 1409
-#define ER_CANT_CREATE_USER_WITH_GRANT 1410
-#define ER_WRONG_VALUE_FOR_TYPE 1411
-#define ER_TABLE_DEF_CHANGED 1412
-#define ER_SP_DUP_HANDLER 1413
-#define ER_SP_NOT_VAR_ARG 1414
-#define ER_SP_NO_RETSET 1415
-#define ER_CANT_CREATE_GEOMETRY_OBJECT 1416
-#define ER_FAILED_ROUTINE_BREAK_BINLOG 1417
-#define ER_BINLOG_UNSAFE_ROUTINE 1418
-#define ER_BINLOG_CREATE_ROUTINE_NEED_SUPER 1419
-#define ER_EXEC_STMT_WITH_OPEN_CURSOR 1420
-#define ER_STMT_HAS_NO_OPEN_CURSOR 1421
-#define ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG 1422
-#define ER_NO_DEFAULT_FOR_VIEW_FIELD 1423
-#define ER_SP_NO_RECURSION 1424
-#define ER_TOO_BIG_SCALE 1425
-#define ER_TOO_BIG_PRECISION 1426
-#define ER_M_BIGGER_THAN_D 1427
-#define ER_WRONG_LOCK_OF_SYSTEM_TABLE 1428
-#define ER_CONNECT_TO_FOREIGN_DATA_SOURCE 1429
-#define ER_QUERY_ON_FOREIGN_DATA_SOURCE 1430
-#define ER_FOREIGN_DATA_SOURCE_DOESNT_EXIST 1431
-#define ER_FOREIGN_DATA_STRING_INVALID_CANT_CREATE 1432
-#define ER_FOREIGN_DATA_STRING_INVALID 1433
-#define ER_CANT_CREATE_FEDERATED_TABLE 1434
-#define ER_TRG_IN_WRONG_SCHEMA 1435
-#define ER_STACK_OVERRUN_NEED_MORE 1436
-#define ER_TOO_LONG_BODY 1437
-#define ER_WARN_CANT_DROP_DEFAULT_KEYCACHE 1438
-#define ER_TOO_BIG_DISPLAYWIDTH 1439
-#define ER_XAER_DUPID 1440
-#define ER_DATETIME_FUNCTION_OVERFLOW 1441
-#define ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG 1442
-#define ER_VIEW_PREVENT_UPDATE 1443
-#define ER_PS_NO_RECURSION 1444
-#define ER_SP_CANT_SET_AUTOCOMMIT 1445
-#define ER_MALFORMED_DEFINER 1446
-#define ER_VIEW_FRM_NO_USER 1447
-#define ER_VIEW_OTHER_USER 1448
-#define ER_NO_SUCH_USER 1449
-#define ER_FORBID_SCHEMA_CHANGE 1450
-#define ER_ROW_IS_REFERENCED_2 1451
-#define ER_NO_REFERENCED_ROW_2 1452
-#define ER_SP_BAD_VAR_SHADOW 1453
-#define ER_TRG_NO_DEFINER 1454
-#define ER_OLD_FILE_FORMAT 1455
-#define ER_SP_RECURSION_LIMIT 1456
-#define ER_SP_PROC_TABLE_CORRUPT 1457
-#define ER_SP_WRONG_NAME 1458
-#define ER_TABLE_NEEDS_UPGRADE 1459
-#define ER_SP_NO_AGGREGATE 1460
-#define ER_MAX_PREPARED_STMT_COUNT_REACHED 1461
-#define ER_VIEW_RECURSIVE 1462
-#define ER_NON_GROUPING_FIELD_USED 1463
-#define ER_TABLE_CANT_HANDLE_SPKEYS 1464
-#define ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA 1465
-#define ER_REMOVED_SPACES 1466
-#define ER_AUTOINC_READ_FAILED 1467
-#define ER_USERNAME 1468
-#define ER_HOSTNAME 1469
-#define ER_WRONG_STRING_LENGTH 1470
-#define ER_NON_INSERTABLE_TABLE 1471
-#define ER_ADMIN_WRONG_MRG_TABLE 1472
-#define ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT 1473
-#define ER_NAME_BECOMES_EMPTY 1474
-#define ER_AMBIGUOUS_FIELD_TERM 1475
-#define ER_FOREIGN_SERVER_EXISTS 1476
-#define ER_FOREIGN_SERVER_DOESNT_EXIST 1477
-#define ER_ILLEGAL_HA_CREATE_OPTION 1478
-#define ER_PARTITION_REQUIRES_VALUES_ERROR 1479
-#define ER_PARTITION_WRONG_VALUES_ERROR 1480
-#define ER_PARTITION_MAXVALUE_ERROR 1481
-#define ER_PARTITION_SUBPARTITION_ERROR 1482
-#define ER_PARTITION_SUBPART_MIX_ERROR 1483
-#define ER_PARTITION_WRONG_NO_PART_ERROR 1484
-#define ER_PARTITION_WRONG_NO_SUBPART_ERROR 1485
-#define ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR 1486
-#define ER_NO_CONST_EXPR_IN_RANGE_OR_LIST_ERROR 1487
-#define ER_FIELD_NOT_FOUND_PART_ERROR 1488
-#define ER_LIST_OF_FIELDS_ONLY_IN_HASH_ERROR 1489
-#define ER_INCONSISTENT_PARTITION_INFO_ERROR 1490
-#define ER_PARTITION_FUNC_NOT_ALLOWED_ERROR 1491
-#define ER_PARTITIONS_MUST_BE_DEFINED_ERROR 1492
-#define ER_RANGE_NOT_INCREASING_ERROR 1493
-#define ER_INCONSISTENT_TYPE_OF_FUNCTIONS_ERROR 1494
-#define ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR 1495
-#define ER_PARTITION_ENTRY_ERROR 1496
-#define ER_MIX_HANDLER_ERROR 1497
-#define ER_PARTITION_NOT_DEFINED_ERROR 1498
-#define ER_TOO_MANY_PARTITIONS_ERROR 1499
-#define ER_SUBPARTITION_ERROR 1500
-#define ER_CANT_CREATE_HANDLER_FILE 1501
-#define ER_BLOB_FIELD_IN_PART_FUNC_ERROR 1502
-#define ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF 1503
-#define ER_NO_PARTS_ERROR 1504
-#define ER_PARTITION_MGMT_ON_NONPARTITIONED 1505
-#define ER_FOREIGN_KEY_ON_PARTITIONED 1506
-#define ER_DROP_PARTITION_NON_EXISTENT 1507
-#define ER_DROP_LAST_PARTITION 1508
-#define ER_COALESCE_ONLY_ON_HASH_PARTITION 1509
-#define ER_REORG_HASH_ONLY_ON_SAME_NO 1510
-#define ER_REORG_NO_PARAM_ERROR 1511
-#define ER_ONLY_ON_RANGE_LIST_PARTITION 1512
-#define ER_ADD_PARTITION_SUBPART_ERROR 1513
-#define ER_ADD_PARTITION_NO_NEW_PARTITION 1514
-#define ER_COALESCE_PARTITION_NO_PARTITION 1515
-#define ER_REORG_PARTITION_NOT_EXIST 1516
-#define ER_SAME_NAME_PARTITION 1517
-#define ER_NO_BINLOG_ERROR 1518
-#define ER_CONSECUTIVE_REORG_PARTITIONS 1519
-#define ER_REORG_OUTSIDE_RANGE 1520
-#define ER_PARTITION_FUNCTION_FAILURE 1521
-#define ER_PART_STATE_ERROR 1522
-#define ER_LIMITED_PART_RANGE 1523
-#define ER_PLUGIN_IS_NOT_LOADED 1524
-#define ER_WRONG_VALUE 1525
-#define ER_NO_PARTITION_FOR_GIVEN_VALUE 1526
-#define ER_FILEGROUP_OPTION_ONLY_ONCE 1527
-#define ER_CREATE_FILEGROUP_FAILED 1528
-#define ER_DROP_FILEGROUP_FAILED 1529
-#define ER_TABLESPACE_AUTO_EXTEND_ERROR 1530
-#define ER_WRONG_SIZE_NUMBER 1531
-#define ER_SIZE_OVERFLOW_ERROR 1532
-#define ER_ALTER_FILEGROUP_FAILED 1533
-#define ER_BINLOG_ROW_LOGGING_FAILED 1534
-#define ER_BINLOG_ROW_WRONG_TABLE_DEF 1535
-#define ER_BINLOG_ROW_RBR_TO_SBR 1536
-#define ER_EVENT_ALREADY_EXISTS 1537
-#define ER_EVENT_STORE_FAILED 1538
-#define ER_EVENT_DOES_NOT_EXIST 1539
-#define ER_EVENT_CANT_ALTER 1540
-#define ER_EVENT_DROP_FAILED 1541
-#define ER_EVENT_INTERVAL_NOT_POSITIVE_OR_TOO_BIG 1542
-#define ER_EVENT_ENDS_BEFORE_STARTS 1543
-#define ER_EVENT_EXEC_TIME_IN_THE_PAST 1544
-#define ER_EVENT_OPEN_TABLE_FAILED 1545
-#define ER_EVENT_NEITHER_M_EXPR_NOR_M_AT 1546
-#define ER_COL_COUNT_DOESNT_MATCH_CORRUPTED 1547
-#define ER_CANNOT_LOAD_FROM_TABLE 1548
-#define ER_EVENT_CANNOT_DELETE 1549
-#define ER_EVENT_COMPILE_ERROR 1550
-#define ER_EVENT_SAME_NAME 1551
-#define ER_EVENT_DATA_TOO_LONG 1552
-#define ER_DROP_INDEX_FK 1553
-#define ER_WARN_DEPRECATED_SYNTAX_WITH_VER 1554
-#define ER_CANT_WRITE_LOCK_LOG_TABLE 1555
-#define ER_CANT_LOCK_LOG_TABLE 1556
-#define ER_FOREIGN_DUPLICATE_KEY 1557
-#define ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE 1558
-#define ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR 1559
-#define ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT 1560
-#define ER_NDB_CANT_SWITCH_BINLOG_FORMAT 1561
-#define ER_PARTITION_NO_TEMPORARY 1562
-#define ER_PARTITION_CONST_DOMAIN_ERROR 1563
-#define ER_PARTITION_FUNCTION_IS_NOT_ALLOWED 1564
-#define ER_DDL_LOG_ERROR 1565
-#define ER_NULL_IN_VALUES_LESS_THAN 1566
-#define ER_WRONG_PARTITION_NAME 1567
-#define ER_CANT_CHANGE_TX_ISOLATION 1568
-#define ER_DUP_ENTRY_AUTOINCREMENT_CASE 1569
-#define ER_EVENT_MODIFY_QUEUE_ERROR 1570
-#define ER_EVENT_SET_VAR_ERROR 1571
-#define ER_PARTITION_MERGE_ERROR 1572
-#define ER_CANT_ACTIVATE_LOG 1573
-#define ER_RBR_NOT_AVAILABLE 1574
-#define ER_BASE64_DECODE_ERROR 1575
-#define ER_EVENT_RECURSION_FORBIDDEN 1576
-#define ER_EVENTS_DB_ERROR 1577
-#define ER_ONLY_INTEGERS_ALLOWED 1578
-#define ER_UNSUPORTED_LOG_ENGINE 1579
-#define ER_BAD_LOG_STATEMENT 1580
-#define ER_CANT_RENAME_LOG_TABLE 1581
-#define ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT 1582
-#define ER_WRONG_PARAMETERS_TO_NATIVE_FCT 1583
-#define ER_WRONG_PARAMETERS_TO_STORED_FCT 1584
-#define ER_NATIVE_FCT_NAME_COLLISION 1585
-#define ER_DUP_ENTRY_WITH_KEY_NAME 1586
-#define ER_BINLOG_PURGE_EMFILE 1587
-#define ER_EVENT_CANNOT_CREATE_IN_THE_PAST 1588
-#define ER_EVENT_CANNOT_ALTER_IN_THE_PAST 1589
-#define ER_SLAVE_INCIDENT 1590
-#define ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT 1591
-#define ER_BINLOG_UNSAFE_STATEMENT 1592
-#define ER_SLAVE_FATAL_ERROR 1593
-#define ER_SLAVE_RELAY_LOG_READ_FAILURE 1594
-#define ER_SLAVE_RELAY_LOG_WRITE_FAILURE 1595
-#define ER_SLAVE_CREATE_EVENT_FAILURE 1596
-#define ER_SLAVE_MASTER_COM_FAILURE 1597
-#define ER_BINLOG_LOGGING_IMPOSSIBLE 1598
-#define ER_VIEW_NO_CREATION_CTX 1599
-#define ER_VIEW_INVALID_CREATION_CTX 1600
-#define ER_SR_INVALID_CREATION_CTX 1601
-#define ER_TRG_CORRUPTED_FILE 1602
-#define ER_TRG_NO_CREATION_CTX 1603
-#define ER_TRG_INVALID_CREATION_CTX 1604
-#define ER_EVENT_INVALID_CREATION_CTX 1605
-#define ER_TRG_CANT_OPEN_TABLE 1606
-#define ER_CANT_CREATE_SROUTINE 1607
-#define ER_SLAVE_AMBIGOUS_EXEC_MODE 1608
-#define ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENT 1609
-#define ER_SLAVE_CORRUPT_EVENT 1610
-#define ER_LOAD_DATA_INVALID_COLUMN 1611
-#define ER_LOG_PURGE_NO_FILE 1612
-#define ER_XA_RBTIMEOUT 1613
-#define ER_XA_RBDEADLOCK 1614
-#define ER_NEED_REPREPARE 1615
-#define ER_DELAYED_NOT_SUPPORTED 1616
-#define WARN_NO_MASTER_INFO 1617
-#define WARN_OPTION_IGNORED 1618
-#define WARN_PLUGIN_DELETE_BUILTIN 1619
-#define WARN_PLUGIN_BUSY 1620
-#define ER_VARIABLE_IS_READONLY 1621
-#define ER_WARN_ENGINE_TRANSACTION_ROLLBACK 1622
-#define ER_SLAVE_HEARTBEAT_FAILURE 1623
-#define ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE 1624
-#define ER_NDB_REPLICATION_SCHEMA_ERROR 1625
-#define ER_CONFLICT_FN_PARSE_ERROR 1626
-#define ER_EXCEPTIONS_WRITE_ERROR 1627
-#define ER_TOO_LONG_TABLE_COMMENT 1628
-#define ER_TOO_LONG_FIELD_COMMENT 1629
-#define ER_FUNC_INEXISTENT_NAME_COLLISION 1630
-#define ER_DATABASE_NAME 1631
-#define ER_TABLE_NAME 1632
-#define ER_PARTITION_NAME 1633
-#define ER_SUBPARTITION_NAME 1634
-#define ER_TEMPORARY_NAME 1635
-#define ER_RENAMED_NAME 1636
-#define ER_TOO_MANY_CONCURRENT_TRXS 1637
-#define WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED 1638
-#define ER_DEBUG_SYNC_TIMEOUT 1639
-#define ER_DEBUG_SYNC_HIT_LIMIT 1640
-#define ER_ERROR_LAST 1640
diff --git a/dep/include/mysql/sql_common.h b/dep/include/mysql/sql_common.h
deleted file mode 100644
index 9e43d076b..000000000
--- a/dep/include/mysql/sql_common.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright (C) 2003-2004, 2006 MySQL AB
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-
-extern const char	*unknown_sqlstate;
-extern const char	*cant_connect_sqlstate;
-extern const char	*not_error_sqlstate;
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-extern CHARSET_INFO *default_client_charset_info;
-MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
-			   my_bool default_value, uint server_capabilities);
-void free_rows(MYSQL_DATA *cur);
-void free_old_query(MYSQL *mysql);
-void end_server(MYSQL *mysql);
-my_bool mysql_reconnect(MYSQL *mysql);
-void mysql_read_default_options(struct st_mysql_options *options,
-				const char *filename,const char *group);
-my_bool
-cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
-		     const unsigned char *header, ulong header_length,
-		     const unsigned char *arg, ulong arg_length,
-                     my_bool skip_check, MYSQL_STMT *stmt);
-unsigned long cli_safe_read(MYSQL *mysql);
-void net_clear_error(NET *net);
-void set_stmt_errmsg(MYSQL_STMT *stmt, NET *net);
-void set_stmt_error(MYSQL_STMT *stmt, int errcode, const char *sqlstate,
-                    const char *err);
-void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate);
-#ifdef	__cplusplus
-}
-#endif
-
-#define protocol_41(A) ((A)->server_capabilities & CLIENT_PROTOCOL_41)
-
diff --git a/dep/include/mysql/sql_state.h b/dep/include/mysql/sql_state.h
deleted file mode 100644
index f14b1cf59..000000000
--- a/dep/include/mysql/sql_state.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/* Autogenerated file, please don't edit */
-
-{ ER_DUP_KEY                              ,"23000", "" },
-{ ER_OUTOFMEMORY                          ,"HY001", "S1001" },
-{ ER_OUT_OF_SORTMEMORY                    ,"HY001", "S1001" },
-{ ER_CON_COUNT_ERROR                      ,"08004", "" },
-{ ER_BAD_HOST_ERROR                       ,"08S01", "" },
-{ ER_HANDSHAKE_ERROR                      ,"08S01", "" },
-{ ER_DBACCESS_DENIED_ERROR                ,"42000", "" },
-{ ER_ACCESS_DENIED_ERROR                  ,"28000", "" },
-{ ER_NO_DB_ERROR                          ,"3D000", "" },
-{ ER_UNKNOWN_COM_ERROR                    ,"08S01", "" },
-{ ER_BAD_NULL_ERROR                       ,"23000", "" },
-{ ER_BAD_DB_ERROR                         ,"42000", "" },
-{ ER_TABLE_EXISTS_ERROR                   ,"42S01", "" },
-{ ER_BAD_TABLE_ERROR                      ,"42S02", "" },
-{ ER_NON_UNIQ_ERROR                       ,"23000", "" },
-{ ER_SERVER_SHUTDOWN                      ,"08S01", "" },
-{ ER_BAD_FIELD_ERROR                      ,"42S22", "S0022" },
-{ ER_WRONG_FIELD_WITH_GROUP               ,"42000", "S1009" },
-{ ER_WRONG_GROUP_FIELD                    ,"42000", "S1009" },
-{ ER_WRONG_SUM_SELECT                     ,"42000", "S1009" },
-{ ER_WRONG_VALUE_COUNT                    ,"21S01", "" },
-{ ER_TOO_LONG_IDENT                       ,"42000", "S1009" },
-{ ER_DUP_FIELDNAME                        ,"42S21", "S1009" },
-{ ER_DUP_KEYNAME                          ,"42000", "S1009" },
-{ ER_DUP_ENTRY                            ,"23000", "S1009" },
-{ ER_WRONG_FIELD_SPEC                     ,"42000", "S1009" },
-{ ER_PARSE_ERROR                          ,"42000", "s1009" },
-{ ER_EMPTY_QUERY                          ,"42000", "" },
-{ ER_NONUNIQ_TABLE                        ,"42000", "S1009" },
-{ ER_INVALID_DEFAULT                      ,"42000", "S1009" },
-{ ER_MULTIPLE_PRI_KEY                     ,"42000", "S1009" },
-{ ER_TOO_MANY_KEYS                        ,"42000", "S1009" },
-{ ER_TOO_MANY_KEY_PARTS                   ,"42000", "S1009" },
-{ ER_TOO_LONG_KEY                         ,"42000", "S1009" },
-{ ER_KEY_COLUMN_DOES_NOT_EXITS            ,"42000", "S1009" },
-{ ER_BLOB_USED_AS_KEY                     ,"42000", "S1009" },
-{ ER_TOO_BIG_FIELDLENGTH                  ,"42000", "S1009" },
-{ ER_WRONG_AUTO_KEY                       ,"42000", "S1009" },
-{ ER_FORCING_CLOSE                        ,"08S01", "" },
-{ ER_IPSOCK_ERROR                         ,"08S01", "" },
-{ ER_NO_SUCH_INDEX                        ,"42S12", "S1009" },
-{ ER_WRONG_FIELD_TERMINATORS              ,"42000", "S1009" },
-{ ER_BLOBS_AND_NO_TERMINATED              ,"42000", "S1009" },
-{ ER_CANT_REMOVE_ALL_FIELDS               ,"42000", "" },
-{ ER_CANT_DROP_FIELD_OR_KEY               ,"42000", "" },
-{ ER_BLOB_CANT_HAVE_DEFAULT               ,"42000", "" },
-{ ER_WRONG_DB_NAME                        ,"42000", "" },
-{ ER_WRONG_TABLE_NAME                     ,"42000", "" },
-{ ER_TOO_BIG_SELECT                       ,"42000", "" },
-{ ER_UNKNOWN_PROCEDURE                    ,"42000", "" },
-{ ER_WRONG_PARAMCOUNT_TO_PROCEDURE        ,"42000", "" },
-{ ER_UNKNOWN_TABLE                        ,"42S02", "" },
-{ ER_FIELD_SPECIFIED_TWICE                ,"42000", "" },
-{ ER_UNSUPPORTED_EXTENSION                ,"42000", "" },
-{ ER_TABLE_MUST_HAVE_COLUMNS              ,"42000", "" },
-{ ER_UNKNOWN_CHARACTER_SET                ,"42000", "" },
-{ ER_TOO_BIG_ROWSIZE                      ,"42000", "" },
-{ ER_WRONG_OUTER_JOIN                     ,"42000", "" },
-{ ER_NULL_COLUMN_IN_INDEX                 ,"42000", "" },
-{ ER_PASSWORD_ANONYMOUS_USER              ,"42000", "" },
-{ ER_PASSWORD_NOT_ALLOWED                 ,"42000", "" },
-{ ER_PASSWORD_NO_MATCH                    ,"42000", "" },
-{ ER_WRONG_VALUE_COUNT_ON_ROW             ,"21S01", "" },
-{ ER_INVALID_USE_OF_NULL                  ,"22004", "" },
-{ ER_REGEXP_ERROR                         ,"42000", "" },
-{ ER_MIX_OF_GROUP_FUNC_AND_FIELDS         ,"42000", "" },
-{ ER_NONEXISTING_GRANT                    ,"42000", "" },
-{ ER_TABLEACCESS_DENIED_ERROR             ,"42000", "" },
-{ ER_COLUMNACCESS_DENIED_ERROR            ,"42000", "" },
-{ ER_ILLEGAL_GRANT_FOR_TABLE              ,"42000", "" },
-{ ER_GRANT_WRONG_HOST_OR_USER             ,"42000", "" },
-{ ER_NO_SUCH_TABLE                        ,"42S02", "" },
-{ ER_NONEXISTING_TABLE_GRANT              ,"42000", "" },
-{ ER_NOT_ALLOWED_COMMAND                  ,"42000", "" },
-{ ER_SYNTAX_ERROR                         ,"42000", "" },
-{ ER_ABORTING_CONNECTION                  ,"08S01", "" },
-{ ER_NET_PACKET_TOO_LARGE                 ,"08S01", "" },
-{ ER_NET_READ_ERROR_FROM_PIPE             ,"08S01", "" },
-{ ER_NET_FCNTL_ERROR                      ,"08S01", "" },
-{ ER_NET_PACKETS_OUT_OF_ORDER             ,"08S01", "" },
-{ ER_NET_UNCOMPRESS_ERROR                 ,"08S01", "" },
-{ ER_NET_READ_ERROR                       ,"08S01", "" },
-{ ER_NET_READ_INTERRUPTED                 ,"08S01", "" },
-{ ER_NET_ERROR_ON_WRITE                   ,"08S01", "" },
-{ ER_NET_WRITE_INTERRUPTED                ,"08S01", "" },
-{ ER_TOO_LONG_STRING                      ,"42000", "" },
-{ ER_TABLE_CANT_HANDLE_BLOB               ,"42000", "" },
-{ ER_TABLE_CANT_HANDLE_AUTO_INCREMENT     ,"42000", "" },
-{ ER_WRONG_COLUMN_NAME                    ,"42000", "" },
-{ ER_WRONG_KEY_COLUMN                     ,"42000", "" },
-{ ER_DUP_UNIQUE                           ,"23000", "" },
-{ ER_BLOB_KEY_WITHOUT_LENGTH              ,"42000", "" },
-{ ER_PRIMARY_CANT_HAVE_NULL               ,"42000", "" },
-{ ER_TOO_MANY_ROWS                        ,"42000", "" },
-{ ER_REQUIRES_PRIMARY_KEY                 ,"42000", "" },
-{ ER_KEY_DOES_NOT_EXITS                   ,"42000", "S1009" },
-{ ER_CHECK_NO_SUCH_TABLE                  ,"42000", "" },
-{ ER_CHECK_NOT_IMPLEMENTED                ,"42000", "" },
-{ ER_CANT_DO_THIS_DURING_AN_TRANSACTION   ,"25000", "" },
-{ ER_NEW_ABORTING_CONNECTION              ,"08S01", "" },
-{ ER_MASTER_NET_READ                      ,"08S01", "" },
-{ ER_MASTER_NET_WRITE                     ,"08S01", "" },
-{ ER_TOO_MANY_USER_CONNECTIONS            ,"42000", "" },
-{ ER_READ_ONLY_TRANSACTION                ,"25000", "" },
-{ ER_NO_PERMISSION_TO_CREATE_USER         ,"42000", "" },
-{ ER_LOCK_DEADLOCK                        ,"40001", "" },
-{ ER_NO_REFERENCED_ROW                    ,"23000", "" },
-{ ER_ROW_IS_REFERENCED                    ,"23000", "" },
-{ ER_CONNECT_TO_MASTER                    ,"08S01", "" },
-{ ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT    ,"21000", "" },
-{ ER_USER_LIMIT_REACHED                   ,"42000", "" },
-{ ER_SPECIFIC_ACCESS_DENIED_ERROR         ,"42000", "" },
-{ ER_NO_DEFAULT                           ,"42000", "" },
-{ ER_WRONG_VALUE_FOR_VAR                  ,"42000", "" },
-{ ER_WRONG_TYPE_FOR_VAR                   ,"42000", "" },
-{ ER_CANT_USE_OPTION_HERE                 ,"42000", "" },
-{ ER_NOT_SUPPORTED_YET                    ,"42000", "" },
-{ ER_WRONG_FK_DEF                         ,"42000", "" },
-{ ER_OPERAND_COLUMNS                      ,"21000", "" },
-{ ER_SUBQUERY_NO_1_ROW                    ,"21000", "" },
-{ ER_ILLEGAL_REFERENCE                    ,"42S22", "" },
-{ ER_DERIVED_MUST_HAVE_ALIAS              ,"42000", "" },
-{ ER_SELECT_REDUCED                       ,"01000", "" },
-{ ER_TABLENAME_NOT_ALLOWED_HERE           ,"42000", "" },
-{ ER_NOT_SUPPORTED_AUTH_MODE              ,"08004", "" },
-{ ER_SPATIAL_CANT_HAVE_NULL               ,"42000", "" },
-{ ER_COLLATION_CHARSET_MISMATCH           ,"42000", "" },
-{ ER_WARN_TOO_FEW_RECORDS                 ,"01000", "" },
-{ ER_WARN_TOO_MANY_RECORDS                ,"01000", "" },
-{ ER_WARN_NULL_TO_NOTNULL                 ,"22004", "" },
-{ ER_WARN_DATA_OUT_OF_RANGE               ,"22003", "" },
-{ WARN_DATA_TRUNCATED                     ,"01000", "" },
-{ ER_WRONG_NAME_FOR_INDEX                 ,"42000", "" },
-{ ER_WRONG_NAME_FOR_CATALOG               ,"42000", "" },
-{ ER_UNKNOWN_STORAGE_ENGINE               ,"42000", "" },
-{ ER_TRUNCATED_WRONG_VALUE                ,"22007", "" },
-{ ER_SP_NO_RECURSIVE_CREATE               ,"2F003", "" },
-{ ER_SP_ALREADY_EXISTS                    ,"42000", "" },
-{ ER_SP_DOES_NOT_EXIST                    ,"42000", "" },
-{ ER_SP_LILABEL_MISMATCH                  ,"42000", "" },
-{ ER_SP_LABEL_REDEFINE                    ,"42000", "" },
-{ ER_SP_LABEL_MISMATCH                    ,"42000", "" },
-{ ER_SP_UNINIT_VAR                        ,"01000", "" },
-{ ER_SP_BADSELECT                         ,"0A000", "" },
-{ ER_SP_BADRETURN                         ,"42000", "" },
-{ ER_SP_BADSTATEMENT                      ,"0A000", "" },
-{ ER_UPDATE_LOG_DEPRECATED_IGNORED        ,"42000", "" },
-{ ER_UPDATE_LOG_DEPRECATED_TRANSLATED     ,"42000", "" },
-{ ER_QUERY_INTERRUPTED                    ,"70100", "" },
-{ ER_SP_WRONG_NO_OF_ARGS                  ,"42000", "" },
-{ ER_SP_COND_MISMATCH                     ,"42000", "" },
-{ ER_SP_NORETURN                          ,"42000", "" },
-{ ER_SP_NORETURNEND                       ,"2F005", "" },
-{ ER_SP_BAD_CURSOR_QUERY                  ,"42000", "" },
-{ ER_SP_BAD_CURSOR_SELECT                 ,"42000", "" },
-{ ER_SP_CURSOR_MISMATCH                   ,"42000", "" },
-{ ER_SP_CURSOR_ALREADY_OPEN               ,"24000", "" },
-{ ER_SP_CURSOR_NOT_OPEN                   ,"24000", "" },
-{ ER_SP_UNDECLARED_VAR                    ,"42000", "" },
-{ ER_SP_FETCH_NO_DATA                     ,"02000", "" },
-{ ER_SP_DUP_PARAM                         ,"42000", "" },
-{ ER_SP_DUP_VAR                           ,"42000", "" },
-{ ER_SP_DUP_COND                          ,"42000", "" },
-{ ER_SP_DUP_CURS                          ,"42000", "" },
-{ ER_SP_SUBSELECT_NYI                     ,"0A000", "" },
-{ ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG        ,"0A000", "" },
-{ ER_SP_VARCOND_AFTER_CURSHNDLR           ,"42000", "" },
-{ ER_SP_CURSOR_AFTER_HANDLER              ,"42000", "" },
-{ ER_SP_CASE_NOT_FOUND                    ,"20000", "" },
-{ ER_DIVISION_BY_ZERO                     ,"22012", "" },
-{ ER_ILLEGAL_VALUE_FOR_TYPE               ,"22007", "" },
-{ ER_PROCACCESS_DENIED_ERROR              ,"42000", "" },
-{ ER_XAER_NOTA                            ,"XAE04", "" },
-{ ER_XAER_INVAL                           ,"XAE05", "" },
-{ ER_XAER_RMFAIL                          ,"XAE07", "" },
-{ ER_XAER_OUTSIDE                         ,"XAE09", "" },
-{ ER_XAER_RMERR                           ,"XAE03", "" },
-{ ER_XA_RBROLLBACK                        ,"XA100", "" },
-{ ER_NONEXISTING_PROC_GRANT               ,"42000", "" },
-{ ER_DATA_TOO_LONG                        ,"22001", "" },
-{ ER_SP_BAD_SQLSTATE                      ,"42000", "" },
-{ ER_CANT_CREATE_USER_WITH_GRANT          ,"42000", "" },
-{ ER_SP_DUP_HANDLER                       ,"42000", "" },
-{ ER_SP_NOT_VAR_ARG                       ,"42000", "" },
-{ ER_SP_NO_RETSET                         ,"0A000", "" },
-{ ER_CANT_CREATE_GEOMETRY_OBJECT          ,"22003", "" },
-{ ER_TOO_BIG_SCALE                        ,"42000", "S1009" },
-{ ER_TOO_BIG_PRECISION                    ,"42000", "S1009" },
-{ ER_M_BIGGER_THAN_D                      ,"42000", "S1009" },
-{ ER_TOO_LONG_BODY                        ,"42000", "S1009" },
-{ ER_TOO_BIG_DISPLAYWIDTH                 ,"42000", "S1009" },
-{ ER_XAER_DUPID                           ,"XAE08", "" },
-{ ER_DATETIME_FUNCTION_OVERFLOW           ,"22008", "" },
-{ ER_ROW_IS_REFERENCED_2                  ,"23000", "" },
-{ ER_NO_REFERENCED_ROW_2                  ,"23000", "" },
-{ ER_SP_BAD_VAR_SHADOW                    ,"42000", "" },
-{ ER_SP_WRONG_NAME                        ,"42000", "" },
-{ ER_SP_NO_AGGREGATE                      ,"42000", "" },
-{ ER_MAX_PREPARED_STMT_COUNT_REACHED      ,"42000", "" },
-{ ER_NON_GROUPING_FIELD_USED              ,"42000", "" },
-{ ER_FOREIGN_DUPLICATE_KEY                ,"23000", "S1009" },
-{ ER_CANT_CHANGE_TX_ISOLATION             ,"25001", "" },
-{ ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT       ,"42000", "" },
-{ ER_WRONG_PARAMETERS_TO_NATIVE_FCT       ,"42000", "" },
-{ ER_WRONG_PARAMETERS_TO_STORED_FCT       ,"42000", "" },
-{ ER_DUP_ENTRY_WITH_KEY_NAME              ,"23000", "S1009" },
-{ ER_XA_RBTIMEOUT                         ,"XA106", "" },
-{ ER_XA_RBDEADLOCK                        ,"XA102", "" },
-{ ER_FUNC_INEXISTENT_NAME_COLLISION       ,"42000", "" },
diff --git a/dep/include/mysql/sslopt-case.h b/dep/include/mysql/sslopt-case.h
deleted file mode 100644
index adb9a2850..000000000
--- a/dep/include/mysql/sslopt-case.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifdef HAVE_OPENSSL
-    case OPT_SSL_KEY:
-    case OPT_SSL_CERT:
-    case OPT_SSL_CA:
-    case OPT_SSL_CAPATH:
-    case OPT_SSL_CIPHER:
-    /*
-      Enable use of SSL if we are using any ssl option
-      One can disable SSL later by using --skip-ssl or --ssl=0
-    */
-      opt_use_ssl= 1;
-      break;
-#endif
diff --git a/dep/include/mysql/sslopt-longopts.h b/dep/include/mysql/sslopt-longopts.h
deleted file mode 100644
index c038ece16..000000000
--- a/dep/include/mysql/sslopt-longopts.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifdef HAVE_OPENSSL
-
-  {"ssl", OPT_SSL_SSL,
-   "Enable SSL for connection (automatically enabled with other flags)."
-   "Disable with --skip-ssl.", &opt_use_ssl, &opt_use_ssl, 0, GET_BOOL,
-   NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"ssl-ca", OPT_SSL_CA,
-   "CA file in PEM format (check OpenSSL docs, implies --ssl).",
-   &opt_ssl_ca, &opt_ssl_ca, 0, GET_STR, REQUIRED_ARG,
-   0, 0, 0, 0, 0, 0},
-  {"ssl-capath", OPT_SSL_CAPATH,
-   "CA directory (check OpenSSL docs, implies --ssl).",
-   &opt_ssl_capath, &opt_ssl_capath, 0, GET_STR, REQUIRED_ARG,
-   0, 0, 0, 0, 0, 0},
-  {"ssl-cert", OPT_SSL_CERT, "X509 cert in PEM format (implies --ssl).",
-   &opt_ssl_cert, &opt_ssl_cert, 0, GET_STR, REQUIRED_ARG,
-   0, 0, 0, 0, 0, 0},
-  {"ssl-cipher", OPT_SSL_CIPHER, "SSL cipher to use (implies --ssl).",
-   &opt_ssl_cipher, &opt_ssl_cipher, 0, GET_STR, REQUIRED_ARG,
-   0, 0, 0, 0, 0, 0},
-  {"ssl-key", OPT_SSL_KEY, "X509 key in PEM format (implies --ssl).",
-   &opt_ssl_key, &opt_ssl_key, 0, GET_STR, REQUIRED_ARG,
-   0, 0, 0, 0, 0, 0},
-#ifdef MYSQL_CLIENT
-  {"ssl-verify-server-cert", OPT_SSL_VERIFY_SERVER_CERT,
-   "Verify server's \"Common Name\" in its cert against hostname used "
-   "when connecting. This option is disabled by default.",
-   &opt_ssl_verify_server_cert, &opt_ssl_verify_server_cert,
-    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-#endif
-#endif /* HAVE_OPENSSL */
diff --git a/dep/include/mysql/sslopt-vars.h b/dep/include/mysql/sslopt-vars.h
deleted file mode 100644
index 3369f870d..000000000
--- a/dep/include/mysql/sslopt-vars.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifdef HAVE_OPENSSL
-#ifdef SSL_VARS_NOT_STATIC
-#define SSL_STATIC
-#else
-#define SSL_STATIC static
-#endif
-SSL_STATIC my_bool opt_use_ssl  = 0;
-SSL_STATIC char *opt_ssl_ca     = 0;
-SSL_STATIC char *opt_ssl_capath = 0;
-SSL_STATIC char *opt_ssl_cert   = 0;
-SSL_STATIC char *opt_ssl_cipher = 0;
-SSL_STATIC char *opt_ssl_key    = 0;
-#ifdef MYSQL_CLIENT
-SSL_STATIC my_bool opt_ssl_verify_server_cert= 0;
-#endif
-#endif
diff --git a/dep/include/mysql/typelib.h b/dep/include/mysql/typelib.h
deleted file mode 100644
index 46106d1bd..000000000
--- a/dep/include/mysql/typelib.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-
-#ifndef _typelib_h
-#define _typelib_h
-
-#include "my_alloc.h"
-
-typedef struct st_typelib {	/* Different types saved here */
-  unsigned int count;		/* How many types */
-  const char *name;		/* Name of typelib */
-  const char **type_names;
-  unsigned int *type_lengths;
-} TYPELIB;
-
-extern my_ulonglong find_typeset(char *x, TYPELIB *typelib,int *error_position);
-extern int find_type_or_exit(const char *x, TYPELIB *typelib,
-                             const char *option);
-extern int find_type(char *x, const TYPELIB *typelib, unsigned int full_name);
-extern void make_type(char *to,unsigned int nr,TYPELIB *typelib);
-extern const char *get_type(TYPELIB *typelib,unsigned int nr);
-extern TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from);
-
-extern TYPELIB sql_protocol_typelib;
-
-#endif /* _typelib_h */
diff --git a/dep/include/openssl/aes.h b/dep/include/openssl/aes.h
deleted file mode 100644
index d2c99730f..000000000
--- a/dep/include/openssl/aes.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* crypto/aes/aes.h -*- mode:C; c-file-style: "eay" -*- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- */
-
-#ifndef HEADER_AES_H
-#define HEADER_AES_H
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_AES
-#error AES is disabled.
-#endif
-
-#include <stddef.h>
-
-#define AES_ENCRYPT	1
-#define AES_DECRYPT	0
-
-/* Because array size can't be a const in C, the following two are macros.
-   Both sizes are in bytes. */
-#define AES_MAXNR 14
-#define AES_BLOCK_SIZE 16
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* This should be a hidden type, but EVP requires that the size be known */
-struct aes_key_st {
-#ifdef AES_LONG
-    unsigned long rd_key[4 *(AES_MAXNR + 1)];
-#else
-    unsigned int rd_key[4 *(AES_MAXNR + 1)];
-#endif
-    int rounds;
-};
-typedef struct aes_key_st AES_KEY;
-
-const char *AES_options(void);
-
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-	AES_KEY *key);
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-	AES_KEY *key);
-
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-	const AES_KEY *key);
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-	const AES_KEY *key);
-
-void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
-	const AES_KEY *key, const int enc);
-void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-	size_t length, const AES_KEY *key,
-	unsigned char *ivec, const int enc);
-void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-	size_t length, const AES_KEY *key,
-	unsigned char *ivec, int *num, const int enc);
-void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-	size_t length, const AES_KEY *key,
-	unsigned char *ivec, int *num, const int enc);
-void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-	size_t length, const AES_KEY *key,
-	unsigned char *ivec, int *num, const int enc);
-void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-	size_t length, const AES_KEY *key,
-	unsigned char *ivec, int *num);
-void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-	size_t length, const AES_KEY *key,
-	unsigned char ivec[AES_BLOCK_SIZE],
-	unsigned char ecount_buf[AES_BLOCK_SIZE],
-	unsigned int *num);
-/* NB: the IV is _two_ blocks long */
-void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
-		     size_t length, const AES_KEY *key,
-		     unsigned char *ivec, const int enc);
-/* NB: the IV is _four_ blocks long */
-void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
-			size_t length, const AES_KEY *key,
-			const AES_KEY *key2, const unsigned char *ivec,
-			const int enc);
-
-int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
-		unsigned char *out,
-		const unsigned char *in, unsigned int inlen);
-int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
-		unsigned char *out,
-		const unsigned char *in, unsigned int inlen);
-
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* !HEADER_AES_H */
diff --git a/dep/include/openssl/applink.c b/dep/include/openssl/applink.c
deleted file mode 100644
index 54a0a6426..000000000
--- a/dep/include/openssl/applink.c
+++ /dev/null
@@ -1,94 +0,0 @@
-#define APPLINK_STDIN	1
-#define APPLINK_STDOUT	2
-#define APPLINK_STDERR	3
-#define APPLINK_FPRINTF	4
-#define APPLINK_FGETS	5
-#define APPLINK_FREAD	6
-#define APPLINK_FWRITE	7
-#define APPLINK_FSETMOD	8
-#define APPLINK_FEOF	9
-#define APPLINK_FCLOSE 	10	/* should not be used */
-
-#define APPLINK_FOPEN	11	/* solely for completeness */
-#define APPLINK_FSEEK	12
-#define APPLINK_FTELL	13
-#define APPLINK_FFLUSH	14
-#define APPLINK_FERROR	15
-#define APPLINK_CLEARERR 16
-#define APPLINK_FILENO	17	/* to be used with below */
-
-#define APPLINK_OPEN	18	/* formally can't be used, as flags can vary */
-#define APPLINK_READ	19
-#define APPLINK_WRITE	20
-#define APPLINK_LSEEK	21
-#define APPLINK_CLOSE	22
-#define APPLINK_MAX	22	/* always same as last macro */
-
-#ifndef APPMACROS_ONLY
-#include <stdio.h>
-#include <io.h>
-#include <fcntl.h>
-
-static void *app_stdin(void)		{ return stdin;  }
-static void *app_stdout(void)		{ return stdout; }
-static void *app_stderr(void)		{ return stderr; }
-static int   app_feof(FILE *fp)		{ return feof(fp); }
-static int   app_ferror(FILE *fp)	{ return ferror(fp); }
-static void  app_clearerr(FILE *fp)	{ clearerr(fp); }
-static int   app_fileno(FILE *fp)	{ return _fileno(fp); }
-static int   app_fsetmod(FILE *fp,char mod)
-{ return _setmode (_fileno(fp),mod=='b'?_O_BINARY:_O_TEXT); }
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-__declspec(dllexport)
-void **
-#if defined(__BORLANDC__)
-__stdcall	/* __stdcall appears to be the only way to get the name
-		 * decoration right with Borland C. Otherwise it works
-		 * purely incidentally, as we pass no parameters. */
-#else
-__cdecl
-#endif
-OPENSSL_Applink(void)
-{ static int once=1;
-  static void *OPENSSL_ApplinkTable[APPLINK_MAX+1]={(void *)APPLINK_MAX};
-
-    if (once)
-    {	OPENSSL_ApplinkTable[APPLINK_STDIN]	= app_stdin;
-	OPENSSL_ApplinkTable[APPLINK_STDOUT]	= app_stdout;
-	OPENSSL_ApplinkTable[APPLINK_STDERR]	= app_stderr;
-	OPENSSL_ApplinkTable[APPLINK_FPRINTF]	= fprintf;
-	OPENSSL_ApplinkTable[APPLINK_FGETS]	= fgets;
-	OPENSSL_ApplinkTable[APPLINK_FREAD]	= fread;
-	OPENSSL_ApplinkTable[APPLINK_FWRITE]	= fwrite;
-	OPENSSL_ApplinkTable[APPLINK_FSETMOD]	= app_fsetmod;
-	OPENSSL_ApplinkTable[APPLINK_FEOF]	= app_feof;
-	OPENSSL_ApplinkTable[APPLINK_FCLOSE]	= fclose;
-
-	OPENSSL_ApplinkTable[APPLINK_FOPEN]	= fopen;
-	OPENSSL_ApplinkTable[APPLINK_FSEEK]	= fseek;
-	OPENSSL_ApplinkTable[APPLINK_FTELL]	= ftell;
-	OPENSSL_ApplinkTable[APPLINK_FFLUSH]	= fflush;
-	OPENSSL_ApplinkTable[APPLINK_FERROR]	= app_ferror;
-	OPENSSL_ApplinkTable[APPLINK_CLEARERR]	= app_clearerr;
-	OPENSSL_ApplinkTable[APPLINK_FILENO]	= app_fileno;
-
-	OPENSSL_ApplinkTable[APPLINK_OPEN]	= _open;
-	OPENSSL_ApplinkTable[APPLINK_READ]	= _read;
-	OPENSSL_ApplinkTable[APPLINK_WRITE]	= _write;
-	OPENSSL_ApplinkTable[APPLINK_LSEEK]	= _lseek;
-	OPENSSL_ApplinkTable[APPLINK_CLOSE]	= _close;
-
-	once = 0;
-    }
-
-  return OPENSSL_ApplinkTable;
-}
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/asn1.h b/dep/include/openssl/asn1.h
deleted file mode 100644
index 59540e4e7..000000000
--- a/dep/include/openssl/asn1.h
+++ /dev/null
@@ -1,1402 +0,0 @@
-/* crypto/asn1/asn1.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_ASN1_H
-#define HEADER_ASN1_H
-
-#include <time.h>
-#include <openssl/e_os2.h>
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#include <openssl/stack.h>
-#include <openssl/safestack.h>
-
-#include <openssl/symhacks.h>
-
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
-
-#ifdef OPENSSL_BUILD_SHLIBCRYPTO
-# undef OPENSSL_EXTERN
-# define OPENSSL_EXTERN OPENSSL_EXPORT
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#define V_ASN1_UNIVERSAL		0x00
-#define	V_ASN1_APPLICATION		0x40
-#define V_ASN1_CONTEXT_SPECIFIC		0x80
-#define V_ASN1_PRIVATE			0xc0
-
-#define V_ASN1_CONSTRUCTED		0x20
-#define V_ASN1_PRIMITIVE_TAG		0x1f
-#define V_ASN1_PRIMATIVE_TAG		0x1f
-
-#define V_ASN1_APP_CHOOSE		-2	/* let the recipient choose */
-#define V_ASN1_OTHER			-3	/* used in ASN1_TYPE */
-#define V_ASN1_ANY			-4	/* used in ASN1 template code */
-
-#define V_ASN1_NEG			0x100	/* negative flag */
-
-#define V_ASN1_UNDEF			-1
-#define V_ASN1_EOC			0
-#define V_ASN1_BOOLEAN			1	/**/
-#define V_ASN1_INTEGER			2
-#define V_ASN1_NEG_INTEGER		(2 | V_ASN1_NEG)
-#define V_ASN1_BIT_STRING		3
-#define V_ASN1_OCTET_STRING		4
-#define V_ASN1_NULL			5
-#define V_ASN1_OBJECT			6
-#define V_ASN1_OBJECT_DESCRIPTOR	7
-#define V_ASN1_EXTERNAL			8
-#define V_ASN1_REAL			9
-#define V_ASN1_ENUMERATED		10
-#define V_ASN1_NEG_ENUMERATED		(10 | V_ASN1_NEG)
-#define V_ASN1_UTF8STRING		12
-#define V_ASN1_SEQUENCE			16
-#define V_ASN1_SET			17
-#define V_ASN1_NUMERICSTRING		18	/**/
-#define V_ASN1_PRINTABLESTRING		19
-#define V_ASN1_T61STRING		20
-#define V_ASN1_TELETEXSTRING		20	/* alias */
-#define V_ASN1_VIDEOTEXSTRING		21	/**/
-#define V_ASN1_IA5STRING		22
-#define V_ASN1_UTCTIME			23
-#define V_ASN1_GENERALIZEDTIME		24	/**/
-#define V_ASN1_GRAPHICSTRING		25	/**/
-#define V_ASN1_ISO64STRING		26	/**/
-#define V_ASN1_VISIBLESTRING		26	/* alias */
-#define V_ASN1_GENERALSTRING		27	/**/
-#define V_ASN1_UNIVERSALSTRING		28	/**/
-#define V_ASN1_BMPSTRING		30
-
-/* For use with d2i_ASN1_type_bytes() */
-#define B_ASN1_NUMERICSTRING	0x0001
-#define B_ASN1_PRINTABLESTRING	0x0002
-#define B_ASN1_T61STRING	0x0004
-#define B_ASN1_TELETEXSTRING	0x0004
-#define B_ASN1_VIDEOTEXSTRING	0x0008
-#define B_ASN1_IA5STRING	0x0010
-#define B_ASN1_GRAPHICSTRING	0x0020
-#define B_ASN1_ISO64STRING	0x0040
-#define B_ASN1_VISIBLESTRING	0x0040
-#define B_ASN1_GENERALSTRING	0x0080
-#define B_ASN1_UNIVERSALSTRING	0x0100
-#define B_ASN1_OCTET_STRING	0x0200
-#define B_ASN1_BIT_STRING	0x0400
-#define B_ASN1_BMPSTRING	0x0800
-#define B_ASN1_UNKNOWN		0x1000
-#define B_ASN1_UTF8STRING	0x2000
-#define B_ASN1_UTCTIME		0x4000
-#define B_ASN1_GENERALIZEDTIME	0x8000
-#define B_ASN1_SEQUENCE		0x10000
-
-/* For use with ASN1_mbstring_copy() */
-#define MBSTRING_FLAG		0x1000
-#define MBSTRING_UTF8		(MBSTRING_FLAG)
-#define MBSTRING_ASC		(MBSTRING_FLAG|1)
-#define MBSTRING_BMP		(MBSTRING_FLAG|2)
-#define MBSTRING_UNIV		(MBSTRING_FLAG|4)
-
-#define SMIME_OLDMIME		0x400
-#define SMIME_CRLFEOL		0x800
-#define SMIME_STREAM		0x1000
-
-struct X509_algor_st;
-DECLARE_STACK_OF(X509_ALGOR)
-
-#define DECLARE_ASN1_SET_OF(type) /* filled in by mkstack.pl */
-#define IMPLEMENT_ASN1_SET_OF(type) /* nothing, no longer needed */
-
-/* We MUST make sure that, except for constness, asn1_ctx_st and
-   asn1_const_ctx are exactly the same.  Fortunately, as soon as
-   the old ASN1 parsing macros are gone, we can throw this away
-   as well... */
-typedef struct asn1_ctx_st
-	{
-	unsigned char *p;/* work char pointer */
-	int eos;	/* end of sequence read for indefinite encoding */
-	int error;	/* error code to use when returning an error */
-	int inf;	/* constructed if 0x20, indefinite is 0x21 */
-	int tag;	/* tag from last 'get object' */
-	int xclass;	/* class from last 'get object' */
-	long slen;	/* length of last 'get object' */
-	unsigned char *max; /* largest value of p allowed */
-	unsigned char *q;/* temporary variable */
-	unsigned char **pp;/* variable */
-	int line;	/* used in error processing */
-	} ASN1_CTX;
-
-typedef struct asn1_const_ctx_st
-	{
-	const unsigned char *p;/* work char pointer */
-	int eos;	/* end of sequence read for indefinite encoding */
-	int error;	/* error code to use when returning an error */
-	int inf;	/* constructed if 0x20, indefinite is 0x21 */
-	int tag;	/* tag from last 'get object' */
-	int xclass;	/* class from last 'get object' */
-	long slen;	/* length of last 'get object' */
-	const unsigned char *max; /* largest value of p allowed */
-	const unsigned char *q;/* temporary variable */
-	const unsigned char **pp;/* variable */
-	int line;	/* used in error processing */
-	} ASN1_const_CTX;
-
-/* These are used internally in the ASN1_OBJECT to keep track of
- * whether the names and data need to be free()ed */
-#define ASN1_OBJECT_FLAG_DYNAMIC	 0x01	/* internal use */
-#define ASN1_OBJECT_FLAG_CRITICAL	 0x02	/* critical x509v3 object id */
-#define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04	/* internal use */
-#define ASN1_OBJECT_FLAG_DYNAMIC_DATA 	 0x08	/* internal use */
-typedef struct asn1_object_st
-	{
-	const char *sn,*ln;
-	int nid;
-	int length;
-	const unsigned char *data;	/* data remains const after init */
-	int flags;	/* Should we free this one */
-	} ASN1_OBJECT;
-
-#define ASN1_STRING_FLAG_BITS_LEFT 0x08 /* Set if 0x07 has bits left value */
-/* This indicates that the ASN1_STRING is not a real value but just a place
- * holder for the location where indefinite length constructed data should
- * be inserted in the memory buffer 
- */
-#define ASN1_STRING_FLAG_NDEF 0x010 
-
-/* This flag is used by the CMS code to indicate that a string is not
- * complete and is a place holder for content when it had all been 
- * accessed. The flag will be reset when content has been written to it.
- */
-
-#define ASN1_STRING_FLAG_CONT 0x020 
-/* This flag is used by ASN1 code to indicate an ASN1_STRING is an MSTRING
- * type.
- */
-#define ASN1_STRING_FLAG_MSTRING 0x040 
-/* This is the base type that holds just about everything :-) */
-typedef struct asn1_string_st
-	{
-	int length;
-	int type;
-	unsigned char *data;
-	/* The value of the following field depends on the type being
-	 * held.  It is mostly being used for BIT_STRING so if the
-	 * input data has a non-zero 'unused bits' value, it will be
-	 * handled correctly */
-	long flags;
-	} ASN1_STRING;
-
-/* ASN1_ENCODING structure: this is used to save the received
- * encoding of an ASN1 type. This is useful to get round
- * problems with invalid encodings which can break signatures.
- */
-
-typedef struct ASN1_ENCODING_st
-	{
-	unsigned char *enc;	/* DER encoding */
-	long len;		/* Length of encoding */
-	int modified;		 /* set to 1 if 'enc' is invalid */
-	} ASN1_ENCODING;
-
-/* Used with ASN1 LONG type: if a long is set to this it is omitted */
-#define ASN1_LONG_UNDEF	0x7fffffffL
-
-#define STABLE_FLAGS_MALLOC	0x01
-#define STABLE_NO_MASK		0x02
-#define DIRSTRING_TYPE	\
- (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_BMPSTRING|B_ASN1_UTF8STRING)
-#define PKCS9STRING_TYPE (DIRSTRING_TYPE|B_ASN1_IA5STRING)
-
-typedef struct asn1_string_table_st {
-	int nid;
-	long minsize;
-	long maxsize;
-	unsigned long mask;
-	unsigned long flags;
-} ASN1_STRING_TABLE;
-
-DECLARE_STACK_OF(ASN1_STRING_TABLE)
-
-/* size limits: this stuff is taken straight from RFC2459 */
-
-#define ub_name				32768
-#define ub_common_name			64
-#define ub_locality_name		128
-#define ub_state_name			128
-#define ub_organization_name		64
-#define ub_organization_unit_name	64
-#define ub_title			64
-#define ub_email_address		128
-
-/* Declarations for template structures: for full definitions
- * see asn1t.h
- */
-typedef struct ASN1_TEMPLATE_st ASN1_TEMPLATE;
-typedef struct ASN1_ITEM_st ASN1_ITEM;
-typedef struct ASN1_TLC_st ASN1_TLC;
-/* This is just an opaque pointer */
-typedef struct ASN1_VALUE_st ASN1_VALUE;
-
-/* Declare ASN1 functions: the implement macro in in asn1t.h */
-
-#define DECLARE_ASN1_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)
-
-#define DECLARE_ASN1_ALLOC_FUNCTIONS(type) \
-	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, type)
-
-#define DECLARE_ASN1_FUNCTIONS_name(type, name) \
-	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-	DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name)
-
-#define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \
-	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-	DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)
-
-#define	DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) \
-	type *d2i_##name(type **a, const unsigned char **in, long len); \
-	int i2d_##name(type *a, unsigned char **out); \
-	DECLARE_ASN1_ITEM(itname)
-
-#define	DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \
-	type *d2i_##name(type **a, const unsigned char **in, long len); \
-	int i2d_##name(const type *a, unsigned char **out); \
-	DECLARE_ASN1_ITEM(name)
-
-#define	DECLARE_ASN1_NDEF_FUNCTION(name) \
-	int i2d_##name##_NDEF(name *a, unsigned char **out);
-
-#define DECLARE_ASN1_FUNCTIONS_const(name) \
-	DECLARE_ASN1_ALLOC_FUNCTIONS(name) \
-	DECLARE_ASN1_ENCODE_FUNCTIONS_const(name, name)
-
-#define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-	type *name##_new(void); \
-	void name##_free(type *a);
-
-#define DECLARE_ASN1_PRINT_FUNCTION(stname) \
-	DECLARE_ASN1_PRINT_FUNCTION_fname(stname, stname)
-
-#define DECLARE_ASN1_PRINT_FUNCTION_fname(stname, fname) \
-	int fname##_print_ctx(BIO *out, stname *x, int indent, \
-					 const ASN1_PCTX *pctx);
-
-#define D2I_OF(type) type *(*)(type **,const unsigned char **,long)
-#define I2D_OF(type) int (*)(type *,unsigned char **)
-#define I2D_OF_const(type) int (*)(const type *,unsigned char **)
-
-#define CHECKED_D2I_OF(type, d2i) \
-    ((d2i_of_void*) (1 ? d2i : ((D2I_OF(type))0)))
-#define CHECKED_I2D_OF(type, i2d) \
-    ((i2d_of_void*) (1 ? i2d : ((I2D_OF(type))0)))
-#define CHECKED_NEW_OF(type, xnew) \
-    ((void *(*)(void)) (1 ? xnew : ((type *(*)(void))0)))
-#define CHECKED_PTR_OF(type, p) \
-    ((void*) (1 ? p : (type*)0))
-#define CHECKED_PPTR_OF(type, p) \
-    ((void**) (1 ? p : (type**)0))
-
-#define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,long)
-#define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type *,unsigned char **)
-#define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)
-
-TYPEDEF_D2I2D_OF(void);
-
-/* The following macros and typedefs allow an ASN1_ITEM
- * to be embedded in a structure and referenced. Since
- * the ASN1_ITEM pointers need to be globally accessible
- * (possibly from shared libraries) they may exist in
- * different forms. On platforms that support it the
- * ASN1_ITEM structure itself will be globally exported.
- * Other platforms will export a function that returns
- * an ASN1_ITEM pointer.
- *
- * To handle both cases transparently the macros below
- * should be used instead of hard coding an ASN1_ITEM
- * pointer in a structure.
- *
- * The structure will look like this:
- *
- * typedef struct SOMETHING_st {
- *      ...
- *      ASN1_ITEM_EXP *iptr;
- *      ...
- * } SOMETHING; 
- *
- * It would be initialised as e.g.:
- *
- * SOMETHING somevar = {...,ASN1_ITEM_ref(X509),...};
- *
- * and the actual pointer extracted with:
- *
- * const ASN1_ITEM *it = ASN1_ITEM_ptr(somevar.iptr);
- *
- * Finally an ASN1_ITEM pointer can be extracted from an
- * appropriate reference with: ASN1_ITEM_rptr(X509). This
- * would be used when a function takes an ASN1_ITEM * argument.
- *
- */
-
-#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-/* ASN1_ITEM pointer exported type */
-typedef const ASN1_ITEM ASN1_ITEM_EXP;
-
-/* Macro to obtain ASN1_ITEM pointer from exported type */
-#define ASN1_ITEM_ptr(iptr) (iptr)
-
-/* Macro to include ASN1_ITEM pointer from base type */
-#define ASN1_ITEM_ref(iptr) (&(iptr##_it))
-
-#define ASN1_ITEM_rptr(ref) (&(ref##_it))
-
-#define DECLARE_ASN1_ITEM(name) \
-	OPENSSL_EXTERN const ASN1_ITEM name##_it;
-
-#else
-
-/* Platforms that can't easily handle shared global variables are declared
- * as functions returning ASN1_ITEM pointers.
- */
-
-/* ASN1_ITEM pointer exported type */
-typedef const ASN1_ITEM * ASN1_ITEM_EXP(void);
-
-/* Macro to obtain ASN1_ITEM pointer from exported type */
-#define ASN1_ITEM_ptr(iptr) (iptr())
-
-/* Macro to include ASN1_ITEM pointer from base type */
-#define ASN1_ITEM_ref(iptr) (iptr##_it)
-
-#define ASN1_ITEM_rptr(ref) (ref##_it())
-
-#define DECLARE_ASN1_ITEM(name) \
-	const ASN1_ITEM * name##_it(void);
-
-#endif
-
-/* Parameters used by ASN1_STRING_print_ex() */
-
-/* These determine which characters to escape:
- * RFC2253 special characters, control characters and
- * MSB set characters
- */
-
-#define ASN1_STRFLGS_ESC_2253		1
-#define ASN1_STRFLGS_ESC_CTRL		2
-#define ASN1_STRFLGS_ESC_MSB		4
-
-
-/* This flag determines how we do escaping: normally
- * RC2253 backslash only, set this to use backslash and
- * quote.
- */
-
-#define ASN1_STRFLGS_ESC_QUOTE		8
-
-
-/* These three flags are internal use only. */
-
-/* Character is a valid PrintableString character */
-#define CHARTYPE_PRINTABLESTRING	0x10
-/* Character needs escaping if it is the first character */
-#define CHARTYPE_FIRST_ESC_2253		0x20
-/* Character needs escaping if it is the last character */
-#define CHARTYPE_LAST_ESC_2253		0x40
-
-/* NB the internal flags are safely reused below by flags
- * handled at the top level.
- */
-
-/* If this is set we convert all character strings
- * to UTF8 first 
- */
-
-#define ASN1_STRFLGS_UTF8_CONVERT	0x10
-
-/* If this is set we don't attempt to interpret content:
- * just assume all strings are 1 byte per character. This
- * will produce some pretty odd looking output!
- */
-
-#define ASN1_STRFLGS_IGNORE_TYPE	0x20
-
-/* If this is set we include the string type in the output */
-#define ASN1_STRFLGS_SHOW_TYPE		0x40
-
-/* This determines which strings to display and which to
- * 'dump' (hex dump of content octets or DER encoding). We can
- * only dump non character strings or everything. If we
- * don't dump 'unknown' they are interpreted as character
- * strings with 1 octet per character and are subject to
- * the usual escaping options.
- */
-
-#define ASN1_STRFLGS_DUMP_ALL		0x80
-#define ASN1_STRFLGS_DUMP_UNKNOWN	0x100
-
-/* These determine what 'dumping' does, we can dump the
- * content octets or the DER encoding: both use the
- * RFC2253 #XXXXX notation.
- */
-
-#define ASN1_STRFLGS_DUMP_DER		0x200
-
-/* All the string flags consistent with RFC2253,
- * escaping control characters isn't essential in
- * RFC2253 but it is advisable anyway.
- */
-
-#define ASN1_STRFLGS_RFC2253	(ASN1_STRFLGS_ESC_2253 | \
-				ASN1_STRFLGS_ESC_CTRL | \
-				ASN1_STRFLGS_ESC_MSB | \
-				ASN1_STRFLGS_UTF8_CONVERT | \
-				ASN1_STRFLGS_DUMP_UNKNOWN | \
-				ASN1_STRFLGS_DUMP_DER)
-
-DECLARE_STACK_OF(ASN1_INTEGER)
-DECLARE_ASN1_SET_OF(ASN1_INTEGER)
-
-DECLARE_STACK_OF(ASN1_GENERALSTRING)
-
-typedef struct asn1_type_st
-	{
-	int type;
-	union	{
-		char *ptr;
-		ASN1_BOOLEAN		boolean;
-		ASN1_STRING *		asn1_string;
-		ASN1_OBJECT *		object;
-		ASN1_INTEGER *		integer;
-		ASN1_ENUMERATED *	enumerated;
-		ASN1_BIT_STRING *	bit_string;
-		ASN1_OCTET_STRING *	octet_string;
-		ASN1_PRINTABLESTRING *	printablestring;
-		ASN1_T61STRING *	t61string;
-		ASN1_IA5STRING *	ia5string;
-		ASN1_GENERALSTRING *	generalstring;
-		ASN1_BMPSTRING *	bmpstring;
-		ASN1_UNIVERSALSTRING *	universalstring;
-		ASN1_UTCTIME *		utctime;
-		ASN1_GENERALIZEDTIME *	generalizedtime;
-		ASN1_VISIBLESTRING *	visiblestring;
-		ASN1_UTF8STRING *	utf8string;
-		/* set and sequence are left complete and still
-		 * contain the set or sequence bytes */
-		ASN1_STRING *		set;
-		ASN1_STRING *		sequence;
-		ASN1_VALUE *		asn1_value;
-		} value;
-	} ASN1_TYPE;
-
-DECLARE_STACK_OF(ASN1_TYPE)
-DECLARE_ASN1_SET_OF(ASN1_TYPE)
-
-typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
-
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY)
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SET_ANY)
-
-typedef struct NETSCAPE_X509_st
-	{
-	ASN1_OCTET_STRING *header;
-	X509 *cert;
-	} NETSCAPE_X509;
-
-/* This is used to contain a list of bit names */
-typedef struct BIT_STRING_BITNAME_st {
-	int bitnum;
-	const char *lname;
-	const char *sname;
-} BIT_STRING_BITNAME;
-
-
-#define M_ASN1_STRING_length(x)	((x)->length)
-#define M_ASN1_STRING_length_set(x, n)	((x)->length = (n))
-#define M_ASN1_STRING_type(x)	((x)->type)
-#define M_ASN1_STRING_data(x)	((x)->data)
-
-/* Macros for string operations */
-#define M_ASN1_BIT_STRING_new()	(ASN1_BIT_STRING *)\
-		ASN1_STRING_type_new(V_ASN1_BIT_STRING)
-#define M_ASN1_BIT_STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_BIT_STRING_dup(a) (ASN1_BIT_STRING *)\
-		ASN1_STRING_dup((const ASN1_STRING *)a)
-#define M_ASN1_BIT_STRING_cmp(a,b) ASN1_STRING_cmp(\
-		(const ASN1_STRING *)a,(const ASN1_STRING *)b)
-#define M_ASN1_BIT_STRING_set(a,b,c) ASN1_STRING_set((ASN1_STRING *)a,b,c)
-
-#define M_ASN1_INTEGER_new()	(ASN1_INTEGER *)\
-		ASN1_STRING_type_new(V_ASN1_INTEGER)
-#define M_ASN1_INTEGER_free(a)		ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_INTEGER_dup(a) (ASN1_INTEGER *)\
-		ASN1_STRING_dup((const ASN1_STRING *)a)
-#define M_ASN1_INTEGER_cmp(a,b)	ASN1_STRING_cmp(\
-		(const ASN1_STRING *)a,(const ASN1_STRING *)b)
-
-#define M_ASN1_ENUMERATED_new()	(ASN1_ENUMERATED *)\
-		ASN1_STRING_type_new(V_ASN1_ENUMERATED)
-#define M_ASN1_ENUMERATED_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_ENUMERATED_dup(a) (ASN1_ENUMERATED *)\
-		ASN1_STRING_dup((const ASN1_STRING *)a)
-#define M_ASN1_ENUMERATED_cmp(a,b)	ASN1_STRING_cmp(\
-		(const ASN1_STRING *)a,(const ASN1_STRING *)b)
-
-#define M_ASN1_OCTET_STRING_new()	(ASN1_OCTET_STRING *)\
-		ASN1_STRING_type_new(V_ASN1_OCTET_STRING)
-#define M_ASN1_OCTET_STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_OCTET_STRING_dup(a) (ASN1_OCTET_STRING *)\
-		ASN1_STRING_dup((const ASN1_STRING *)a)
-#define M_ASN1_OCTET_STRING_cmp(a,b) ASN1_STRING_cmp(\
-		(const ASN1_STRING *)a,(const ASN1_STRING *)b)
-#define M_ASN1_OCTET_STRING_set(a,b,c)	ASN1_STRING_set((ASN1_STRING *)a,b,c)
-#define M_ASN1_OCTET_STRING_print(a,b)	ASN1_STRING_print(a,(ASN1_STRING *)b)
-#define M_i2d_ASN1_OCTET_STRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_OCTET_STRING,\
-		V_ASN1_UNIVERSAL)
-
-#define B_ASN1_TIME \
-			B_ASN1_UTCTIME | \
-			B_ASN1_GENERALIZEDTIME
-
-#define B_ASN1_PRINTABLE \
-			B_ASN1_NUMERICSTRING| \
-			B_ASN1_PRINTABLESTRING| \
-			B_ASN1_T61STRING| \
-			B_ASN1_IA5STRING| \
-			B_ASN1_BIT_STRING| \
-			B_ASN1_UNIVERSALSTRING|\
-			B_ASN1_BMPSTRING|\
-			B_ASN1_UTF8STRING|\
-			B_ASN1_SEQUENCE|\
-			B_ASN1_UNKNOWN
-
-#define B_ASN1_DIRECTORYSTRING \
-			B_ASN1_PRINTABLESTRING| \
-			B_ASN1_TELETEXSTRING|\
-			B_ASN1_BMPSTRING|\
-			B_ASN1_UNIVERSALSTRING|\
-			B_ASN1_UTF8STRING
-
-#define B_ASN1_DISPLAYTEXT \
-			B_ASN1_IA5STRING| \
-			B_ASN1_VISIBLESTRING| \
-			B_ASN1_BMPSTRING|\
-			B_ASN1_UTF8STRING
-
-#define M_ASN1_PRINTABLE_new()	ASN1_STRING_type_new(V_ASN1_T61STRING)
-#define M_ASN1_PRINTABLE_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_PRINTABLE(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-		pp,a->type,V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_PRINTABLE(a,pp,l) \
-		d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-			B_ASN1_PRINTABLE)
-
-#define M_DIRECTORYSTRING_new() ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
-#define M_DIRECTORYSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_DIRECTORYSTRING(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-						pp,a->type,V_ASN1_UNIVERSAL)
-#define M_d2i_DIRECTORYSTRING(a,pp,l) \
-		d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-			B_ASN1_DIRECTORYSTRING)
-
-#define M_DISPLAYTEXT_new() ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
-#define M_DISPLAYTEXT_free(a) ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_DISPLAYTEXT(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-						pp,a->type,V_ASN1_UNIVERSAL)
-#define M_d2i_DISPLAYTEXT(a,pp,l) \
-		d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-			B_ASN1_DISPLAYTEXT)
-
-#define M_ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING *)\
-		ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
-#define M_ASN1_PRINTABLESTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_PRINTABLESTRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_PRINTABLESTRING,\
-		V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_PRINTABLESTRING(a,pp,l) \
-		(ASN1_PRINTABLESTRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_PRINTABLESTRING)
-
-#define M_ASN1_T61STRING_new()	(ASN1_T61STRING *)\
-		ASN1_STRING_type_new(V_ASN1_T61STRING)
-#define M_ASN1_T61STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_T61STRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_T61STRING,\
-		V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_T61STRING(a,pp,l) \
-		(ASN1_T61STRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_T61STRING)
-
-#define M_ASN1_IA5STRING_new()	(ASN1_IA5STRING *)\
-		ASN1_STRING_type_new(V_ASN1_IA5STRING)
-#define M_ASN1_IA5STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_IA5STRING_dup(a)	\
-		(ASN1_IA5STRING *)ASN1_STRING_dup((const ASN1_STRING *)a)
-#define M_i2d_ASN1_IA5STRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_IA5STRING,\
-			V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_IA5STRING(a,pp,l) \
-		(ASN1_IA5STRING *)d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l,\
-			B_ASN1_IA5STRING)
-
-#define M_ASN1_UTCTIME_new()	(ASN1_UTCTIME *)\
-		ASN1_STRING_type_new(V_ASN1_UTCTIME)
-#define M_ASN1_UTCTIME_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_UTCTIME_dup(a) (ASN1_UTCTIME *)\
-		ASN1_STRING_dup((const ASN1_STRING *)a)
-
-#define M_ASN1_GENERALIZEDTIME_new()	(ASN1_GENERALIZEDTIME *)\
-		ASN1_STRING_type_new(V_ASN1_GENERALIZEDTIME)
-#define M_ASN1_GENERALIZEDTIME_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_GENERALIZEDTIME_dup(a) (ASN1_GENERALIZEDTIME *)ASN1_STRING_dup(\
-	(const ASN1_STRING *)a)
-
-#define M_ASN1_TIME_new()	(ASN1_TIME *)\
-		ASN1_STRING_type_new(V_ASN1_UTCTIME)
-#define M_ASN1_TIME_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_ASN1_TIME_dup(a) (ASN1_TIME *)\
-	ASN1_STRING_dup((const ASN1_STRING *)a)
-
-#define M_ASN1_GENERALSTRING_new()	(ASN1_GENERALSTRING *)\
-		ASN1_STRING_type_new(V_ASN1_GENERALSTRING)
-#define M_ASN1_GENERALSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_GENERALSTRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_GENERALSTRING,\
-			V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_GENERALSTRING(a,pp,l) \
-		(ASN1_GENERALSTRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_GENERALSTRING)
-
-#define M_ASN1_UNIVERSALSTRING_new()	(ASN1_UNIVERSALSTRING *)\
-		ASN1_STRING_type_new(V_ASN1_UNIVERSALSTRING)
-#define M_ASN1_UNIVERSALSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_UNIVERSALSTRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UNIVERSALSTRING,\
-			V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_UNIVERSALSTRING(a,pp,l) \
-		(ASN1_UNIVERSALSTRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_UNIVERSALSTRING)
-
-#define M_ASN1_BMPSTRING_new()	(ASN1_BMPSTRING *)\
-		ASN1_STRING_type_new(V_ASN1_BMPSTRING)
-#define M_ASN1_BMPSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_BMPSTRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_BMPSTRING,\
-			V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_BMPSTRING(a,pp,l) \
-		(ASN1_BMPSTRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING)
-
-#define M_ASN1_VISIBLESTRING_new()	(ASN1_VISIBLESTRING *)\
-		ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
-#define M_ASN1_VISIBLESTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_VISIBLESTRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_VISIBLESTRING,\
-			V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_VISIBLESTRING(a,pp,l) \
-		(ASN1_VISIBLESTRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_VISIBLESTRING)
-
-#define M_ASN1_UTF8STRING_new()	(ASN1_UTF8STRING *)\
-		ASN1_STRING_type_new(V_ASN1_UTF8STRING)
-#define M_ASN1_UTF8STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_UTF8STRING(a,pp) \
-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UTF8STRING,\
-			V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_UTF8STRING(a,pp,l) \
-		(ASN1_UTF8STRING *)d2i_ASN1_type_bytes\
-		((ASN1_STRING **)a,pp,l,B_ASN1_UTF8STRING)
-
-  /* for the is_set parameter to i2d_ASN1_SET */
-#define IS_SEQUENCE	0
-#define IS_SET		1
-
-DECLARE_ASN1_FUNCTIONS_fname(ASN1_TYPE, ASN1_ANY, ASN1_TYPE)
-
-int ASN1_TYPE_get(ASN1_TYPE *a);
-void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);
-int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value);
-int            ASN1_TYPE_cmp(ASN1_TYPE *a, ASN1_TYPE *b);
-
-ASN1_OBJECT *	ASN1_OBJECT_new(void );
-void		ASN1_OBJECT_free(ASN1_OBJECT *a);
-int		i2d_ASN1_OBJECT(ASN1_OBJECT *a,unsigned char **pp);
-ASN1_OBJECT *	c2i_ASN1_OBJECT(ASN1_OBJECT **a,const unsigned char **pp,
-			long length);
-ASN1_OBJECT *	d2i_ASN1_OBJECT(ASN1_OBJECT **a,const unsigned char **pp,
-			long length);
-
-DECLARE_ASN1_ITEM(ASN1_OBJECT)
-
-DECLARE_STACK_OF(ASN1_OBJECT)
-DECLARE_ASN1_SET_OF(ASN1_OBJECT)
-
-ASN1_STRING *	ASN1_STRING_new(void);
-void		ASN1_STRING_free(ASN1_STRING *a);
-int		ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);
-ASN1_STRING *	ASN1_STRING_dup(const ASN1_STRING *a);
-ASN1_STRING *	ASN1_STRING_type_new(int type );
-int 		ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b);
-  /* Since this is used to store all sorts of things, via macros, for now, make
-     its data void * */
-int 		ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);
-void		ASN1_STRING_set0(ASN1_STRING *str, void *data, int len);
-int ASN1_STRING_length(const ASN1_STRING *x);
-void ASN1_STRING_length_set(ASN1_STRING *x, int n);
-int ASN1_STRING_type(ASN1_STRING *x);
-unsigned char * ASN1_STRING_data(ASN1_STRING *x);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING)
-int		i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a,unsigned char **pp);
-ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,const unsigned char **pp,
-			long length);
-int		ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d,
-			int length );
-int		ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);
-int		ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n);
-int            ASN1_BIT_STRING_check(ASN1_BIT_STRING *a,
-                                     unsigned char *flags, int flags_len);
-
-#ifndef OPENSSL_NO_BIO
-int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,
-				BIT_STRING_BITNAME *tbl, int indent);
-#endif
-int ASN1_BIT_STRING_num_asc(char *name, BIT_STRING_BITNAME *tbl);
-int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, char *name, int value,
-				BIT_STRING_BITNAME *tbl);
-
-int		i2d_ASN1_BOOLEAN(int a,unsigned char **pp);
-int 		d2i_ASN1_BOOLEAN(int *a,const unsigned char **pp,long length);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)
-int		i2c_ASN1_INTEGER(ASN1_INTEGER *a,unsigned char **pp);
-ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a,const unsigned char **pp,
-			long length);
-ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a,const unsigned char **pp,
-			long length);
-ASN1_INTEGER *	ASN1_INTEGER_dup(const ASN1_INTEGER *x);
-int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_ENUMERATED)
-
-int ASN1_UTCTIME_check(ASN1_UTCTIME *a);
-ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s,time_t t);
-ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
-				int offset_day, long offset_sec);
-int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);
-int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);
-#if 0
-time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s);
-#endif
-
-int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *a);
-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,time_t t);
-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,
-	     time_t t, int offset_day, long offset_sec);
-int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_OCTET_STRING)
-ASN1_OCTET_STRING *	ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *a);
-int 	ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a, const ASN1_OCTET_STRING *b);
-int 	ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *str, const unsigned char *data, int len);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_VISIBLESTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_UNIVERSALSTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_UTF8STRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_NULL)
-DECLARE_ASN1_FUNCTIONS(ASN1_BMPSTRING)
-
-int UTF8_getc(const unsigned char *str, int len, unsigned long *val);
-int UTF8_putc(unsigned char *str, int len, unsigned long value);
-
-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, ASN1_PRINTABLE)
-
-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, DIRECTORYSTRING)
-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, DISPLAYTEXT)
-DECLARE_ASN1_FUNCTIONS(ASN1_PRINTABLESTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_T61STRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_IA5STRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_GENERALSTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_UTCTIME)
-DECLARE_ASN1_FUNCTIONS(ASN1_GENERALIZEDTIME)
-DECLARE_ASN1_FUNCTIONS(ASN1_TIME)
-
-DECLARE_ASN1_ITEM(ASN1_OCTET_STRING_NDEF)
-
-ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s,time_t t);
-ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s,time_t t,
-				int offset_day, long offset_sec);
-int ASN1_TIME_check(ASN1_TIME *t);
-ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out);
-int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);
-
-int i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,
-		 i2d_of_void *i2d, int ex_tag, int ex_class,
-		 int is_set);
-STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
-			      const unsigned char **pp,
-			      long length, d2i_of_void *d2i,
-			      void (*free_func)(OPENSSL_BLOCK), int ex_tag,
-			      int ex_class);
-
-#ifndef OPENSSL_NO_BIO
-int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a);
-int a2i_ASN1_INTEGER(BIO *bp,ASN1_INTEGER *bs,char *buf,int size);
-int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a);
-int a2i_ASN1_ENUMERATED(BIO *bp,ASN1_ENUMERATED *bs,char *buf,int size);
-int i2a_ASN1_OBJECT(BIO *bp,ASN1_OBJECT *a);
-int a2i_ASN1_STRING(BIO *bp,ASN1_STRING *bs,char *buf,int size);
-int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type);
-#endif
-int i2t_ASN1_OBJECT(char *buf,int buf_len,ASN1_OBJECT *a);
-
-int a2d_ASN1_OBJECT(unsigned char *out,int olen, const char *buf, int num);
-ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data,int len,
-	const char *sn, const char *ln);
-
-int ASN1_INTEGER_set(ASN1_INTEGER *a, long v);
-long ASN1_INTEGER_get(const ASN1_INTEGER *a);
-ASN1_INTEGER *BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai);
-BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai,BIGNUM *bn);
-
-int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v);
-long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a);
-ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai);
-BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai,BIGNUM *bn);
-
-/* General */
-/* given a string, return the correct type, max is the maximum length */
-int ASN1_PRINTABLE_type(const unsigned char *s, int max);
-
-int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass);
-ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,
-	long length, int Ptag, int Pclass);
-unsigned long ASN1_tag2bit(int tag);
-/* type is one or more of the B_ASN1_ values. */
-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a,const unsigned char **pp,
-		long length,int type);
-
-/* PARSING */
-int asn1_Finish(ASN1_CTX *c);
-int asn1_const_Finish(ASN1_const_CTX *c);
-
-/* SPECIALS */
-int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
-	int *pclass, long omax);
-int ASN1_check_infinite_end(unsigned char **p,long len);
-int ASN1_const_check_infinite_end(const unsigned char **p,long len);
-void ASN1_put_object(unsigned char **pp, int constructed, int length,
-	int tag, int xclass);
-int ASN1_put_eoc(unsigned char **pp);
-int ASN1_object_size(int constructed, int length, int tag);
-
-/* Used to implement other functions */
-void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x);
-
-#define ASN1_dup_of(type,i2d,d2i,x) \
-    ((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \
-		     CHECKED_D2I_OF(type, d2i), \
-		     CHECKED_PTR_OF(type, x)))
-
-#define ASN1_dup_of_const(type,i2d,d2i,x) \
-    ((type*)ASN1_dup(CHECKED_I2D_OF(const type, i2d), \
-		     CHECKED_D2I_OF(type, d2i), \
-		     CHECKED_PTR_OF(const type, x)))
-
-void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
-
-/* ASN1 alloc/free macros for when a type is only used internally */
-
-#define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type))
-#define M_ASN1_free_of(x, type) \
-		ASN1_item_free(CHECKED_PTR_OF(type, x), ASN1_ITEM_rptr(type))
-
-#ifndef OPENSSL_NO_FP_API
-void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
-
-#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
-    ((type*)ASN1_d2i_fp(CHECKED_NEW_OF(type, xnew), \
-			CHECKED_D2I_OF(type, d2i), \
-			in, \
-			CHECKED_PPTR_OF(type, x)))
-
-void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
-int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);
-
-#define ASN1_i2d_fp_of(type,i2d,out,x) \
-    (ASN1_i2d_fp(CHECKED_I2D_OF(type, i2d), \
-		 out, \
-		 CHECKED_PTR_OF(type, x)))
-
-#define ASN1_i2d_fp_of_const(type,i2d,out,x) \
-    (ASN1_i2d_fp(CHECKED_I2D_OF(const type, i2d), \
-		 out, \
-		 CHECKED_PTR_OF(const type, x)))
-
-int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
-int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
-#endif
-
-int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in);
-
-#ifndef OPENSSL_NO_BIO
-void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
-
-#define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
-    ((type*)ASN1_d2i_bio( CHECKED_NEW_OF(type, xnew), \
-			  CHECKED_D2I_OF(type, d2i), \
-			  in, \
-			  CHECKED_PPTR_OF(type, x)))
-
-void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
-int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);
-
-#define ASN1_i2d_bio_of(type,i2d,out,x) \
-    (ASN1_i2d_bio(CHECKED_I2D_OF(type, i2d), \
-		  out, \
-		  CHECKED_PTR_OF(type, x)))
-
-#define ASN1_i2d_bio_of_const(type,i2d,out,x) \
-    (ASN1_i2d_bio(CHECKED_I2D_OF(const type, i2d), \
-		  out, \
-		  CHECKED_PTR_OF(const type, x)))
-
-int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
-int ASN1_UTCTIME_print(BIO *fp, const ASN1_UTCTIME *a);
-int ASN1_GENERALIZEDTIME_print(BIO *fp, const ASN1_GENERALIZEDTIME *a);
-int ASN1_TIME_print(BIO *fp, const ASN1_TIME *a);
-int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v);
-int ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned long flags);
-int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
-				unsigned char *buf, int off);
-int ASN1_parse(BIO *bp,const unsigned char *pp,long len,int indent);
-int ASN1_parse_dump(BIO *bp,const unsigned char *pp,long len,int indent,int dump);
-#endif
-const char *ASN1_tag2str(int tag);
-
-/* Used to load and write netscape format cert */
-
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_X509)
-
-int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);
-
-int ASN1_TYPE_set_octetstring(ASN1_TYPE *a,
-	unsigned char *data, int len);
-int ASN1_TYPE_get_octetstring(ASN1_TYPE *a,
-	unsigned char *data, int max_len);
-int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num,
-	unsigned char *data, int len);
-int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a,long *num,
-	unsigned char *data, int max_len);
-
-STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
-				 d2i_of_void *d2i, void (*free_func)(OPENSSL_BLOCK));
-unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,
-			     unsigned char **buf, int *len );
-void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);
-void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);
-ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
-			      ASN1_OCTET_STRING **oct);
-
-#define ASN1_pack_string_of(type,obj,i2d,oct) \
-    (ASN1_pack_string(CHECKED_PTR_OF(type, obj), \
-		      CHECKED_I2D_OF(type, i2d), \
-		      oct))
-
-ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);
-
-void ASN1_STRING_set_default_mask(unsigned long mask);
-int ASN1_STRING_set_default_mask_asc(const char *p);
-unsigned long ASN1_STRING_get_default_mask(void);
-int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len,
-					int inform, unsigned long mask);
-int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
-					int inform, unsigned long mask, 
-					long minsize, long maxsize);
-
-ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, 
-		const unsigned char *in, int inlen, int inform, int nid);
-ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid);
-int ASN1_STRING_TABLE_add(int, long, long, unsigned long, unsigned long);
-void ASN1_STRING_TABLE_cleanup(void);
-
-/* ASN1 template functions */
-
-/* Old API compatible functions */
-ASN1_VALUE *ASN1_item_new(const ASN1_ITEM *it);
-void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it);
-ASN1_VALUE * ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in, long len, const ASN1_ITEM *it);
-int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);
-int ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);
-
-void ASN1_add_oid_module(void);
-
-ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf);
-ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf);
-
-/* ASN1 Print flags */
-
-/* Indicate missing OPTIONAL fields */
-#define ASN1_PCTX_FLAGS_SHOW_ABSENT		0x001	
-/* Mark start and end of SEQUENCE */
-#define ASN1_PCTX_FLAGS_SHOW_SEQUENCE		0x002
-/* Mark start and end of SEQUENCE/SET OF */
-#define ASN1_PCTX_FLAGS_SHOW_SSOF		0x004
-/* Show the ASN1 type of primitives */
-#define ASN1_PCTX_FLAGS_SHOW_TYPE		0x008
-/* Don't show ASN1 type of ANY */
-#define ASN1_PCTX_FLAGS_NO_ANY_TYPE		0x010
-/* Don't show ASN1 type of MSTRINGs */
-#define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE		0x020
-/* Don't show field names in SEQUENCE */
-#define ASN1_PCTX_FLAGS_NO_FIELD_NAME		0x040
-/* Show structure names of each SEQUENCE field */
-#define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME	0x080
-/* Don't show structure name even at top level */
-#define ASN1_PCTX_FLAGS_NO_STRUCT_NAME		0x100
-
-int ASN1_item_print(BIO *out, ASN1_VALUE *ifld, int indent,
-				const ASN1_ITEM *it, const ASN1_PCTX *pctx);
-ASN1_PCTX *ASN1_PCTX_new(void);
-void ASN1_PCTX_free(ASN1_PCTX *p);
-unsigned long ASN1_PCTX_get_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_nm_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_nm_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_cert_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_cert_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_oid_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_oid_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_str_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags);
-
-BIO_METHOD *BIO_f_asn1(void);
-
-BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it);
-
-int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
-				const ASN1_ITEM *it);
-int PEM_write_bio_ASN1_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
-				const char *hdr,
-				const ASN1_ITEM *it);
-int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
-				int ctype_nid, int econt_nid,
-				STACK_OF(X509_ALGOR) *mdalgs,
-				const ASN1_ITEM *it);
-ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
-int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
-int SMIME_text(BIO *in, BIO *out);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ASN1_strings(void);
-
-/* Error codes for the ASN1 functions. */
-
-/* Function codes. */
-#define ASN1_F_A2D_ASN1_OBJECT				 100
-#define ASN1_F_A2I_ASN1_ENUMERATED			 101
-#define ASN1_F_A2I_ASN1_INTEGER				 102
-#define ASN1_F_A2I_ASN1_STRING				 103
-#define ASN1_F_APPEND_EXP				 176
-#define ASN1_F_ASN1_BIT_STRING_SET_BIT			 183
-#define ASN1_F_ASN1_CB					 177
-#define ASN1_F_ASN1_CHECK_TLEN				 104
-#define ASN1_F_ASN1_COLLATE_PRIMITIVE			 105
-#define ASN1_F_ASN1_COLLECT				 106
-#define ASN1_F_ASN1_D2I_EX_PRIMITIVE			 108
-#define ASN1_F_ASN1_D2I_FP				 109
-#define ASN1_F_ASN1_D2I_READ_BIO			 107
-#define ASN1_F_ASN1_DIGEST				 184
-#define ASN1_F_ASN1_DO_ADB				 110
-#define ASN1_F_ASN1_DUP					 111
-#define ASN1_F_ASN1_ENUMERATED_SET			 112
-#define ASN1_F_ASN1_ENUMERATED_TO_BN			 113
-#define ASN1_F_ASN1_EX_C2I				 204
-#define ASN1_F_ASN1_FIND_END				 190
-#define ASN1_F_ASN1_GENERALIZEDTIME_ADJ			 216
-#define ASN1_F_ASN1_GENERALIZEDTIME_SET			 185
-#define ASN1_F_ASN1_GENERATE_V3				 178
-#define ASN1_F_ASN1_GET_OBJECT				 114
-#define ASN1_F_ASN1_HEADER_NEW				 115
-#define ASN1_F_ASN1_I2D_BIO				 116
-#define ASN1_F_ASN1_I2D_FP				 117
-#define ASN1_F_ASN1_INTEGER_SET				 118
-#define ASN1_F_ASN1_INTEGER_TO_BN			 119
-#define ASN1_F_ASN1_ITEM_D2I_FP				 206
-#define ASN1_F_ASN1_ITEM_DUP				 191
-#define ASN1_F_ASN1_ITEM_EX_COMBINE_NEW			 121
-#define ASN1_F_ASN1_ITEM_EX_D2I				 120
-#define ASN1_F_ASN1_ITEM_I2D_BIO			 192
-#define ASN1_F_ASN1_ITEM_I2D_FP				 193
-#define ASN1_F_ASN1_ITEM_PACK				 198
-#define ASN1_F_ASN1_ITEM_SIGN				 195
-#define ASN1_F_ASN1_ITEM_UNPACK				 199
-#define ASN1_F_ASN1_ITEM_VERIFY				 197
-#define ASN1_F_ASN1_MBSTRING_NCOPY			 122
-#define ASN1_F_ASN1_OBJECT_NEW				 123
-#define ASN1_F_ASN1_OUTPUT_DATA				 214
-#define ASN1_F_ASN1_PACK_STRING				 124
-#define ASN1_F_ASN1_PCTX_NEW				 205
-#define ASN1_F_ASN1_PKCS5_PBE_SET			 125
-#define ASN1_F_ASN1_SEQ_PACK				 126
-#define ASN1_F_ASN1_SEQ_UNPACK				 127
-#define ASN1_F_ASN1_SIGN				 128
-#define ASN1_F_ASN1_STR2TYPE				 179
-#define ASN1_F_ASN1_STRING_SET				 186
-#define ASN1_F_ASN1_STRING_TABLE_ADD			 129
-#define ASN1_F_ASN1_STRING_TYPE_NEW			 130
-#define ASN1_F_ASN1_TEMPLATE_EX_D2I			 132
-#define ASN1_F_ASN1_TEMPLATE_NEW			 133
-#define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I			 131
-#define ASN1_F_ASN1_TIME_ADJ				 217
-#define ASN1_F_ASN1_TIME_SET				 175
-#define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING		 134
-#define ASN1_F_ASN1_TYPE_GET_OCTETSTRING		 135
-#define ASN1_F_ASN1_UNPACK_STRING			 136
-#define ASN1_F_ASN1_UTCTIME_ADJ				 218
-#define ASN1_F_ASN1_UTCTIME_SET				 187
-#define ASN1_F_ASN1_VERIFY				 137
-#define ASN1_F_B64_READ_ASN1				 209
-#define ASN1_F_B64_WRITE_ASN1				 210
-#define ASN1_F_BIO_NEW_NDEF				 208
-#define ASN1_F_BITSTR_CB				 180
-#define ASN1_F_BN_TO_ASN1_ENUMERATED			 138
-#define ASN1_F_BN_TO_ASN1_INTEGER			 139
-#define ASN1_F_C2I_ASN1_BIT_STRING			 189
-#define ASN1_F_C2I_ASN1_INTEGER				 194
-#define ASN1_F_C2I_ASN1_OBJECT				 196
-#define ASN1_F_COLLECT_DATA				 140
-#define ASN1_F_D2I_ASN1_BIT_STRING			 141
-#define ASN1_F_D2I_ASN1_BOOLEAN				 142
-#define ASN1_F_D2I_ASN1_BYTES				 143
-#define ASN1_F_D2I_ASN1_GENERALIZEDTIME			 144
-#define ASN1_F_D2I_ASN1_HEADER				 145
-#define ASN1_F_D2I_ASN1_INTEGER				 146
-#define ASN1_F_D2I_ASN1_OBJECT				 147
-#define ASN1_F_D2I_ASN1_SET				 148
-#define ASN1_F_D2I_ASN1_TYPE_BYTES			 149
-#define ASN1_F_D2I_ASN1_UINTEGER			 150
-#define ASN1_F_D2I_ASN1_UTCTIME				 151
-#define ASN1_F_D2I_AUTOPRIVATEKEY			 207
-#define ASN1_F_D2I_NETSCAPE_RSA				 152
-#define ASN1_F_D2I_NETSCAPE_RSA_2			 153
-#define ASN1_F_D2I_PRIVATEKEY				 154
-#define ASN1_F_D2I_PUBLICKEY				 155
-#define ASN1_F_D2I_RSA_NET				 200
-#define ASN1_F_D2I_RSA_NET_2				 201
-#define ASN1_F_D2I_X509					 156
-#define ASN1_F_D2I_X509_CINF				 157
-#define ASN1_F_D2I_X509_PKEY				 159
-#define ASN1_F_I2D_ASN1_BIO_STREAM			 211
-#define ASN1_F_I2D_ASN1_SET				 188
-#define ASN1_F_I2D_ASN1_TIME				 160
-#define ASN1_F_I2D_DSA_PUBKEY				 161
-#define ASN1_F_I2D_EC_PUBKEY				 181
-#define ASN1_F_I2D_PRIVATEKEY				 163
-#define ASN1_F_I2D_PUBLICKEY				 164
-#define ASN1_F_I2D_RSA_NET				 162
-#define ASN1_F_I2D_RSA_PUBKEY				 165
-#define ASN1_F_LONG_C2I					 166
-#define ASN1_F_OID_MODULE_INIT				 174
-#define ASN1_F_PARSE_TAGGING				 182
-#define ASN1_F_PKCS5_PBE2_SET_IV			 167
-#define ASN1_F_PKCS5_PBE_SET				 202
-#define ASN1_F_PKCS5_PBE_SET0_ALGOR			 215
-#define ASN1_F_SMIME_READ_ASN1				 212
-#define ASN1_F_SMIME_TEXT				 213
-#define ASN1_F_X509_CINF_NEW				 168
-#define ASN1_F_X509_CRL_ADD0_REVOKED			 169
-#define ASN1_F_X509_INFO_NEW				 170
-#define ASN1_F_X509_NAME_ENCODE				 203
-#define ASN1_F_X509_NAME_EX_D2I				 158
-#define ASN1_F_X509_NAME_EX_NEW				 171
-#define ASN1_F_X509_NEW					 172
-#define ASN1_F_X509_PKEY_NEW				 173
-
-/* Reason codes. */
-#define ASN1_R_ADDING_OBJECT				 171
-#define ASN1_R_ASN1_PARSE_ERROR				 203
-#define ASN1_R_ASN1_SIG_PARSE_ERROR			 204
-#define ASN1_R_AUX_ERROR				 100
-#define ASN1_R_BAD_CLASS				 101
-#define ASN1_R_BAD_OBJECT_HEADER			 102
-#define ASN1_R_BAD_PASSWORD_READ			 103
-#define ASN1_R_BAD_TAG					 104
-#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH		 214
-#define ASN1_R_BN_LIB					 105
-#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH			 106
-#define ASN1_R_BUFFER_TOO_SMALL				 107
-#define ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER		 108
-#define ASN1_R_DATA_IS_WRONG				 109
-#define ASN1_R_DECODE_ERROR				 110
-#define ASN1_R_DECODING_ERROR				 111
-#define ASN1_R_DEPTH_EXCEEDED				 174
-#define ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED	 198
-#define ASN1_R_ENCODE_ERROR				 112
-#define ASN1_R_ERROR_GETTING_TIME			 173
-#define ASN1_R_ERROR_LOADING_SECTION			 172
-#define ASN1_R_ERROR_PARSING_SET_ELEMENT		 113
-#define ASN1_R_ERROR_SETTING_CIPHER_PARAMS		 114
-#define ASN1_R_EXPECTING_AN_INTEGER			 115
-#define ASN1_R_EXPECTING_AN_OBJECT			 116
-#define ASN1_R_EXPECTING_A_BOOLEAN			 117
-#define ASN1_R_EXPECTING_A_TIME				 118
-#define ASN1_R_EXPLICIT_LENGTH_MISMATCH			 119
-#define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED		 120
-#define ASN1_R_FIELD_MISSING				 121
-#define ASN1_R_FIRST_NUM_TOO_LARGE			 122
-#define ASN1_R_HEADER_TOO_LONG				 123
-#define ASN1_R_ILLEGAL_BITSTRING_FORMAT			 175
-#define ASN1_R_ILLEGAL_BOOLEAN				 176
-#define ASN1_R_ILLEGAL_CHARACTERS			 124
-#define ASN1_R_ILLEGAL_FORMAT				 177
-#define ASN1_R_ILLEGAL_HEX				 178
-#define ASN1_R_ILLEGAL_IMPLICIT_TAG			 179
-#define ASN1_R_ILLEGAL_INTEGER				 180
-#define ASN1_R_ILLEGAL_NESTED_TAGGING			 181
-#define ASN1_R_ILLEGAL_NULL				 125
-#define ASN1_R_ILLEGAL_NULL_VALUE			 182
-#define ASN1_R_ILLEGAL_OBJECT				 183
-#define ASN1_R_ILLEGAL_OPTIONAL_ANY			 126
-#define ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE		 170
-#define ASN1_R_ILLEGAL_TAGGED_ANY			 127
-#define ASN1_R_ILLEGAL_TIME_VALUE			 184
-#define ASN1_R_INTEGER_NOT_ASCII_FORMAT			 185
-#define ASN1_R_INTEGER_TOO_LARGE_FOR_LONG		 128
-#define ASN1_R_INVALID_BMPSTRING_LENGTH			 129
-#define ASN1_R_INVALID_DIGIT				 130
-#define ASN1_R_INVALID_MIME_TYPE			 205
-#define ASN1_R_INVALID_MODIFIER				 186
-#define ASN1_R_INVALID_NUMBER				 187
-#define ASN1_R_INVALID_OBJECT_ENCODING			 216
-#define ASN1_R_INVALID_SEPARATOR			 131
-#define ASN1_R_INVALID_TIME_FORMAT			 132
-#define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH		 133
-#define ASN1_R_INVALID_UTF8STRING			 134
-#define ASN1_R_IV_TOO_LARGE				 135
-#define ASN1_R_LENGTH_ERROR				 136
-#define ASN1_R_LIST_ERROR				 188
-#define ASN1_R_MIME_NO_CONTENT_TYPE			 206
-#define ASN1_R_MIME_PARSE_ERROR				 207
-#define ASN1_R_MIME_SIG_PARSE_ERROR			 208
-#define ASN1_R_MISSING_EOC				 137
-#define ASN1_R_MISSING_SECOND_NUMBER			 138
-#define ASN1_R_MISSING_VALUE				 189
-#define ASN1_R_MSTRING_NOT_UNIVERSAL			 139
-#define ASN1_R_MSTRING_WRONG_TAG			 140
-#define ASN1_R_NESTED_ASN1_STRING			 197
-#define ASN1_R_NON_HEX_CHARACTERS			 141
-#define ASN1_R_NOT_ASCII_FORMAT				 190
-#define ASN1_R_NOT_ENOUGH_DATA				 142
-#define ASN1_R_NO_CONTENT_TYPE				 209
-#define ASN1_R_NO_DEFAULT_DIGEST			 201
-#define ASN1_R_NO_MATCHING_CHOICE_TYPE			 143
-#define ASN1_R_NO_MULTIPART_BODY_FAILURE		 210
-#define ASN1_R_NO_MULTIPART_BOUNDARY			 211
-#define ASN1_R_NO_SIG_CONTENT_TYPE			 212
-#define ASN1_R_NULL_IS_WRONG_LENGTH			 144
-#define ASN1_R_OBJECT_NOT_ASCII_FORMAT			 191
-#define ASN1_R_ODD_NUMBER_OF_CHARS			 145
-#define ASN1_R_PRIVATE_KEY_HEADER_MISSING		 146
-#define ASN1_R_SECOND_NUMBER_TOO_LARGE			 147
-#define ASN1_R_SEQUENCE_LENGTH_MISMATCH			 148
-#define ASN1_R_SEQUENCE_NOT_CONSTRUCTED			 149
-#define ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG		 192
-#define ASN1_R_SHORT_LINE				 150
-#define ASN1_R_SIG_INVALID_MIME_TYPE			 213
-#define ASN1_R_STREAMING_NOT_SUPPORTED			 202
-#define ASN1_R_STRING_TOO_LONG				 151
-#define ASN1_R_STRING_TOO_SHORT				 152
-#define ASN1_R_TAG_VALUE_TOO_HIGH			 153
-#define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 154
-#define ASN1_R_TIME_NOT_ASCII_FORMAT			 193
-#define ASN1_R_TOO_LONG					 155
-#define ASN1_R_TYPE_NOT_CONSTRUCTED			 156
-#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY			 157
-#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY		 158
-#define ASN1_R_UNEXPECTED_EOC				 159
-#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH		 215
-#define ASN1_R_UNKNOWN_FORMAT				 160
-#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM		 161
-#define ASN1_R_UNKNOWN_OBJECT_TYPE			 162
-#define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE			 163
-#define ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM		 199
-#define ASN1_R_UNKNOWN_TAG				 194
-#define ASN1_R_UNKOWN_FORMAT				 195
-#define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE		 164
-#define ASN1_R_UNSUPPORTED_CIPHER			 165
-#define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM		 166
-#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE		 167
-#define ASN1_R_UNSUPPORTED_TYPE				 196
-#define ASN1_R_WRONG_PUBLIC_KEY_TYPE			 200
-#define ASN1_R_WRONG_TAG				 168
-#define ASN1_R_WRONG_TYPE				 169
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/asn1_mac.h b/dep/include/openssl/asn1_mac.h
deleted file mode 100644
index 87bd0e9e1..000000000
--- a/dep/include/openssl/asn1_mac.h
+++ /dev/null
@@ -1,578 +0,0 @@
-/* crypto/asn1/asn1_mac.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_ASN1_MAC_H
-#define HEADER_ASN1_MAC_H
-
-#include <openssl/asn1.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifndef ASN1_MAC_ERR_LIB
-#define ASN1_MAC_ERR_LIB	ERR_LIB_ASN1
-#endif 
-
-#define ASN1_MAC_H_err(f,r,line) \
-	ERR_PUT_error(ASN1_MAC_ERR_LIB,(f),(r),__FILE__,(line))
-
-#define M_ASN1_D2I_vars(a,type,func) \
-	ASN1_const_CTX c; \
-	type ret=NULL; \
-	\
-	c.pp=(const unsigned char **)pp; \
-	c.q= *(const unsigned char **)pp; \
-	c.error=ERR_R_NESTED_ASN1_ERROR; \
-	if ((a == NULL) || ((*a) == NULL)) \
-		{ if ((ret=(type)func()) == NULL) \
-			{ c.line=__LINE__; goto err; } } \
-	else	ret=(*a);
-
-#define M_ASN1_D2I_Init() \
-	c.p= *(const unsigned char **)pp; \
-	c.max=(length == 0)?0:(c.p+length);
-
-#define M_ASN1_D2I_Finish_2(a) \
-	if (!asn1_const_Finish(&c)) \
-		{ c.line=__LINE__; goto err; } \
-	*(const unsigned char **)pp=c.p; \
-	if (a != NULL) (*a)=ret; \
-	return(ret);
-
-#define M_ASN1_D2I_Finish(a,func,e) \
-	M_ASN1_D2I_Finish_2(a); \
-err:\
-	ASN1_MAC_H_err((e),c.error,c.line); \
-	asn1_add_error(*(const unsigned char **)pp,(int)(c.q- *pp)); \
-	if ((ret != NULL) && ((a == NULL) || (*a != ret))) func(ret); \
-	return(NULL)
-
-#define M_ASN1_D2I_start_sequence() \
-	if (!asn1_GetSequence(&c,&length)) \
-		{ c.line=__LINE__; goto err; }
-/* Begin reading ASN1 without a surrounding sequence */
-#define M_ASN1_D2I_begin() \
-	c.slen = length;
-
-/* End reading ASN1 with no check on length */
-#define M_ASN1_D2I_Finish_nolen(a, func, e) \
-	*pp=c.p; \
-	if (a != NULL) (*a)=ret; \
-	return(ret); \
-err:\
-	ASN1_MAC_H_err((e),c.error,c.line); \
-	asn1_add_error(*pp,(int)(c.q- *pp)); \
-	if ((ret != NULL) && ((a == NULL) || (*a != ret))) func(ret); \
-	return(NULL)
-
-#define M_ASN1_D2I_end_sequence() \
-	(((c.inf&1) == 0)?(c.slen <= 0): \
-		(c.eos=ASN1_const_check_infinite_end(&c.p,c.slen)))
-
-/* Don't use this with d2i_ASN1_BOOLEAN() */
-#define M_ASN1_D2I_get(b, func) \
-	c.q=c.p; \
-	if (func(&(b),&c.p,c.slen) == NULL) \
-		{c.line=__LINE__; goto err; } \
-	c.slen-=(c.p-c.q);
-
-/* Don't use this with d2i_ASN1_BOOLEAN() */
-#define M_ASN1_D2I_get_x(type,b,func) \
-	c.q=c.p; \
-	if (((D2I_OF(type))func)(&(b),&c.p,c.slen) == NULL) \
-		{c.line=__LINE__; goto err; } \
-	c.slen-=(c.p-c.q);
-
-/* use this instead () */
-#define M_ASN1_D2I_get_int(b,func) \
-	c.q=c.p; \
-	if (func(&(b),&c.p,c.slen) < 0) \
-		{c.line=__LINE__; goto err; } \
-	c.slen-=(c.p-c.q);
-
-#define M_ASN1_D2I_get_opt(b,func,type) \
-	if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) \
-		== (V_ASN1_UNIVERSAL|(type)))) \
-		{ \
-		M_ASN1_D2I_get(b,func); \
-		}
-
-#define M_ASN1_D2I_get_int_opt(b,func,type) \
-	if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) \
-		== (V_ASN1_UNIVERSAL|(type)))) \
-		{ \
-		M_ASN1_D2I_get_int(b,func); \
-		}
-
-#define M_ASN1_D2I_get_imp(b,func, type) \
-	M_ASN1_next=(_tmp& V_ASN1_CONSTRUCTED)|type; \
-	c.q=c.p; \
-	if (func(&(b),&c.p,c.slen) == NULL) \
-		{c.line=__LINE__; M_ASN1_next_prev = _tmp; goto err; } \
-	c.slen-=(c.p-c.q);\
-	M_ASN1_next_prev=_tmp;
-
-#define M_ASN1_D2I_get_IMP_opt(b,func,tag,type) \
-	if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) == \
-		(V_ASN1_CONTEXT_SPECIFIC|(tag)))) \
-		{ \
-		unsigned char _tmp = M_ASN1_next; \
-		M_ASN1_D2I_get_imp(b,func, type);\
-		}
-
-#define M_ASN1_D2I_get_set(r,func,free_func) \
-		M_ASN1_D2I_get_imp_set(r,func,free_func, \
-			V_ASN1_SET,V_ASN1_UNIVERSAL);
-
-#define M_ASN1_D2I_get_set_type(type,r,func,free_func) \
-		M_ASN1_D2I_get_imp_set_type(type,r,func,free_func, \
-			V_ASN1_SET,V_ASN1_UNIVERSAL);
-
-#define M_ASN1_D2I_get_set_opt(r,func,free_func) \
-	if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-		V_ASN1_CONSTRUCTED|V_ASN1_SET)))\
-		{ M_ASN1_D2I_get_set(r,func,free_func); }
-
-#define M_ASN1_D2I_get_set_opt_type(type,r,func,free_func) \
-	if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-		V_ASN1_CONSTRUCTED|V_ASN1_SET)))\
-		{ M_ASN1_D2I_get_set_type(type,r,func,free_func); }
-
-#define M_ASN1_I2D_len_SET_opt(a,f) \
-	if ((a != NULL) && (sk_num(a) != 0)) \
-		M_ASN1_I2D_len_SET(a,f);
-
-#define M_ASN1_I2D_put_SET_opt(a,f) \
-	if ((a != NULL) && (sk_num(a) != 0)) \
-		M_ASN1_I2D_put_SET(a,f);
-
-#define M_ASN1_I2D_put_SEQUENCE_opt(a,f) \
-	if ((a != NULL) && (sk_num(a) != 0)) \
-		M_ASN1_I2D_put_SEQUENCE(a,f);
-
-#define M_ASN1_I2D_put_SEQUENCE_opt_type(type,a,f) \
-	if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-		M_ASN1_I2D_put_SEQUENCE_type(type,a,f);
-
-#define M_ASN1_D2I_get_IMP_set_opt(b,func,free_func,tag) \
-	if ((c.slen != 0) && \
-		(M_ASN1_next == \
-		(V_ASN1_CONTEXT_SPECIFIC|V_ASN1_CONSTRUCTED|(tag))))\
-		{ \
-		M_ASN1_D2I_get_imp_set(b,func,free_func,\
-			tag,V_ASN1_CONTEXT_SPECIFIC); \
-		}
-
-#define M_ASN1_D2I_get_IMP_set_opt_type(type,b,func,free_func,tag) \
-	if ((c.slen != 0) && \
-		(M_ASN1_next == \
-		(V_ASN1_CONTEXT_SPECIFIC|V_ASN1_CONSTRUCTED|(tag))))\
-		{ \
-		M_ASN1_D2I_get_imp_set_type(type,b,func,free_func,\
-			tag,V_ASN1_CONTEXT_SPECIFIC); \
-		}
-
-#define M_ASN1_D2I_get_seq(r,func,free_func) \
-		M_ASN1_D2I_get_imp_set(r,func,free_func,\
-			V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
-
-#define M_ASN1_D2I_get_seq_type(type,r,func,free_func) \
-		M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,\
-					    V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL)
-
-#define M_ASN1_D2I_get_seq_opt(r,func,free_func) \
-	if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-		V_ASN1_CONSTRUCTED|V_ASN1_SEQUENCE)))\
-		{ M_ASN1_D2I_get_seq(r,func,free_func); }
-
-#define M_ASN1_D2I_get_seq_opt_type(type,r,func,free_func) \
-	if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-		V_ASN1_CONSTRUCTED|V_ASN1_SEQUENCE)))\
-		{ M_ASN1_D2I_get_seq_type(type,r,func,free_func); }
-
-#define M_ASN1_D2I_get_IMP_set(r,func,free_func,x) \
-		M_ASN1_D2I_get_imp_set(r,func,free_func,\
-			x,V_ASN1_CONTEXT_SPECIFIC);
-
-#define M_ASN1_D2I_get_IMP_set_type(type,r,func,free_func,x) \
-		M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,\
-			x,V_ASN1_CONTEXT_SPECIFIC);
-
-#define M_ASN1_D2I_get_imp_set(r,func,free_func,a,b) \
-	c.q=c.p; \
-	if (d2i_ASN1_SET(&(r),&c.p,c.slen,(char *(*)())func,\
-		(void (*)())free_func,a,b) == NULL) \
-		{ c.line=__LINE__; goto err; } \
-	c.slen-=(c.p-c.q);
-
-#define M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,a,b) \
-	c.q=c.p; \
-	if (d2i_ASN1_SET_OF_##type(&(r),&c.p,c.slen,func,\
-				   free_func,a,b) == NULL) \
-		{ c.line=__LINE__; goto err; } \
-	c.slen-=(c.p-c.q);
-
-#define M_ASN1_D2I_get_set_strings(r,func,a,b) \
-	c.q=c.p; \
-	if (d2i_ASN1_STRING_SET(&(r),&c.p,c.slen,a,b) == NULL) \
-		{ c.line=__LINE__; goto err; } \
-	c.slen-=(c.p-c.q);
-
-#define M_ASN1_D2I_get_EXP_opt(r,func,tag) \
-	if ((c.slen != 0L) && (M_ASN1_next == \
-		(V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
-		{ \
-		int Tinf,Ttag,Tclass; \
-		long Tlen; \
-		\
-		c.q=c.p; \
-		Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \
-		if (Tinf & 0x80) \
-			{ c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
-			c.line=__LINE__; goto err; } \
-		if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
-					Tlen = c.slen - (c.p - c.q) - 2; \
-		if (func(&(r),&c.p,Tlen) == NULL) \
-			{ c.line=__LINE__; goto err; } \
-		if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
-			Tlen = c.slen - (c.p - c.q); \
-			if(!ASN1_const_check_infinite_end(&c.p, Tlen)) \
-				{ c.error=ERR_R_MISSING_ASN1_EOS; \
-				c.line=__LINE__; goto err; } \
-		}\
-		c.slen-=(c.p-c.q); \
-		}
-
-#define M_ASN1_D2I_get_EXP_set_opt(r,func,free_func,tag,b) \
-	if ((c.slen != 0) && (M_ASN1_next == \
-		(V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
-		{ \
-		int Tinf,Ttag,Tclass; \
-		long Tlen; \
-		\
-		c.q=c.p; \
-		Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \
-		if (Tinf & 0x80) \
-			{ c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
-			c.line=__LINE__; goto err; } \
-		if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
-					Tlen = c.slen - (c.p - c.q) - 2; \
-		if (d2i_ASN1_SET(&(r),&c.p,Tlen,(char *(*)())func, \
-			(void (*)())free_func, \
-			b,V_ASN1_UNIVERSAL) == NULL) \
-			{ c.line=__LINE__; goto err; } \
-		if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
-			Tlen = c.slen - (c.p - c.q); \
-			if(!ASN1_check_infinite_end(&c.p, Tlen)) \
-				{ c.error=ERR_R_MISSING_ASN1_EOS; \
-				c.line=__LINE__; goto err; } \
-		}\
-		c.slen-=(c.p-c.q); \
-		}
-
-#define M_ASN1_D2I_get_EXP_set_opt_type(type,r,func,free_func,tag,b) \
-	if ((c.slen != 0) && (M_ASN1_next == \
-		(V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
-		{ \
-		int Tinf,Ttag,Tclass; \
-		long Tlen; \
-		\
-		c.q=c.p; \
-		Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \
-		if (Tinf & 0x80) \
-			{ c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
-			c.line=__LINE__; goto err; } \
-		if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
-					Tlen = c.slen - (c.p - c.q) - 2; \
-		if (d2i_ASN1_SET_OF_##type(&(r),&c.p,Tlen,func, \
-			free_func,b,V_ASN1_UNIVERSAL) == NULL) \
-			{ c.line=__LINE__; goto err; } \
-		if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
-			Tlen = c.slen - (c.p - c.q); \
-			if(!ASN1_check_infinite_end(&c.p, Tlen)) \
-				{ c.error=ERR_R_MISSING_ASN1_EOS; \
-				c.line=__LINE__; goto err; } \
-		}\
-		c.slen-=(c.p-c.q); \
-		}
-
-/* New macros */
-#define M_ASN1_New_Malloc(ret,type) \
-	if ((ret=(type *)OPENSSL_malloc(sizeof(type))) == NULL) \
-		{ c.line=__LINE__; goto err2; }
-
-#define M_ASN1_New(arg,func) \
-	if (((arg)=func()) == NULL) return(NULL)
-
-#define M_ASN1_New_Error(a) \
-/*	err:	ASN1_MAC_H_err((a),ERR_R_NESTED_ASN1_ERROR,c.line); \
-		return(NULL);*/ \
-	err2:	ASN1_MAC_H_err((a),ERR_R_MALLOC_FAILURE,c.line); \
-		return(NULL)
-
-
-/* BIG UGLY WARNING!  This is so damn ugly I wanna puke.  Unfortunately,
-   some macros that use ASN1_const_CTX still insist on writing in the input
-   stream.  ARGH!  ARGH!  ARGH!  Let's get rid of this macro package.
-   Please?						-- Richard Levitte */
-#define M_ASN1_next		(*((unsigned char *)(c.p)))
-#define M_ASN1_next_prev	(*((unsigned char *)(c.q)))
-
-/*************************************************/
-
-#define M_ASN1_I2D_vars(a)	int r=0,ret=0; \
-				unsigned char *p; \
-				if (a == NULL) return(0)
-
-/* Length Macros */
-#define M_ASN1_I2D_len(a,f)	ret+=f(a,NULL)
-#define M_ASN1_I2D_len_IMP_opt(a,f)	if (a != NULL) M_ASN1_I2D_len(a,f)
-
-#define M_ASN1_I2D_len_SET(a,f) \
-		ret+=i2d_ASN1_SET(a,NULL,f,V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET);
-
-#define M_ASN1_I2D_len_SET_type(type,a,f) \
-		ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,V_ASN1_SET, \
-					    V_ASN1_UNIVERSAL,IS_SET);
-
-#define M_ASN1_I2D_len_SEQUENCE(a,f) \
-		ret+=i2d_ASN1_SET(a,NULL,f,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL, \
-				  IS_SEQUENCE);
-
-#define M_ASN1_I2D_len_SEQUENCE_type(type,a,f) \
-		ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,V_ASN1_SEQUENCE, \
-					    V_ASN1_UNIVERSAL,IS_SEQUENCE)
-
-#define M_ASN1_I2D_len_SEQUENCE_opt(a,f) \
-		if ((a != NULL) && (sk_num(a) != 0)) \
-			M_ASN1_I2D_len_SEQUENCE(a,f);
-
-#define M_ASN1_I2D_len_SEQUENCE_opt_type(type,a,f) \
-		if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-			M_ASN1_I2D_len_SEQUENCE_type(type,a,f);
-
-#define M_ASN1_I2D_len_IMP_SET(a,f,x) \
-		ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC,IS_SET);
-
-#define M_ASN1_I2D_len_IMP_SET_type(type,a,f,x) \
-		ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
-					    V_ASN1_CONTEXT_SPECIFIC,IS_SET);
-
-#define M_ASN1_I2D_len_IMP_SET_opt(a,f,x) \
-		if ((a != NULL) && (sk_num(a) != 0)) \
-			ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-					  IS_SET);
-
-#define M_ASN1_I2D_len_IMP_SET_opt_type(type,a,f,x) \
-		if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-			ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
-					       V_ASN1_CONTEXT_SPECIFIC,IS_SET);
-
-#define M_ASN1_I2D_len_IMP_SEQUENCE(a,f,x) \
-		ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-				  IS_SEQUENCE);
-
-#define M_ASN1_I2D_len_IMP_SEQUENCE_opt(a,f,x) \
-		if ((a != NULL) && (sk_num(a) != 0)) \
-			ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-					  IS_SEQUENCE);
-
-#define M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(type,a,f,x) \
-		if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-			ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
-						    V_ASN1_CONTEXT_SPECIFIC, \
-						    IS_SEQUENCE);
-
-#define M_ASN1_I2D_len_EXP_opt(a,f,mtag,v) \
-		if (a != NULL)\
-			{ \
-			v=f(a,NULL); \
-			ret+=ASN1_object_size(1,v,mtag); \
-			}
-
-#define M_ASN1_I2D_len_EXP_SET_opt(a,f,mtag,tag,v) \
-		if ((a != NULL) && (sk_num(a) != 0))\
-			{ \
-			v=i2d_ASN1_SET(a,NULL,f,tag,V_ASN1_UNIVERSAL,IS_SET); \
-			ret+=ASN1_object_size(1,v,mtag); \
-			}
-
-#define M_ASN1_I2D_len_EXP_SEQUENCE_opt(a,f,mtag,tag,v) \
-		if ((a != NULL) && (sk_num(a) != 0))\
-			{ \
-			v=i2d_ASN1_SET(a,NULL,f,tag,V_ASN1_UNIVERSAL, \
-				       IS_SEQUENCE); \
-			ret+=ASN1_object_size(1,v,mtag); \
-			}
-
-#define M_ASN1_I2D_len_EXP_SEQUENCE_opt_type(type,a,f,mtag,tag,v) \
-		if ((a != NULL) && (sk_##type##_num(a) != 0))\
-			{ \
-			v=i2d_ASN1_SET_OF_##type(a,NULL,f,tag, \
-						 V_ASN1_UNIVERSAL, \
-						 IS_SEQUENCE); \
-			ret+=ASN1_object_size(1,v,mtag); \
-			}
-
-/* Put Macros */
-#define M_ASN1_I2D_put(a,f)	f(a,&p)
-
-#define M_ASN1_I2D_put_IMP_opt(a,f,t)	\
-		if (a != NULL) \
-			{ \
-			unsigned char *q=p; \
-			f(a,&p); \
-			*q=(V_ASN1_CONTEXT_SPECIFIC|t|(*q&V_ASN1_CONSTRUCTED));\
-			}
-
-#define M_ASN1_I2D_put_SET(a,f) i2d_ASN1_SET(a,&p,f,V_ASN1_SET,\
-			V_ASN1_UNIVERSAL,IS_SET)
-#define M_ASN1_I2D_put_SET_type(type,a,f) \
-     i2d_ASN1_SET_OF_##type(a,&p,f,V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET)
-#define M_ASN1_I2D_put_IMP_SET(a,f,x) i2d_ASN1_SET(a,&p,f,x,\
-			V_ASN1_CONTEXT_SPECIFIC,IS_SET)
-#define M_ASN1_I2D_put_IMP_SET_type(type,a,f,x) \
-     i2d_ASN1_SET_OF_##type(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC,IS_SET)
-#define M_ASN1_I2D_put_IMP_SEQUENCE(a,f,x) i2d_ASN1_SET(a,&p,f,x,\
-			V_ASN1_CONTEXT_SPECIFIC,IS_SEQUENCE)
-
-#define M_ASN1_I2D_put_SEQUENCE(a,f) i2d_ASN1_SET(a,&p,f,V_ASN1_SEQUENCE,\
-					     V_ASN1_UNIVERSAL,IS_SEQUENCE)
-
-#define M_ASN1_I2D_put_SEQUENCE_type(type,a,f) \
-     i2d_ASN1_SET_OF_##type(a,&p,f,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL, \
-			    IS_SEQUENCE)
-
-#define M_ASN1_I2D_put_SEQUENCE_opt(a,f) \
-		if ((a != NULL) && (sk_num(a) != 0)) \
-			M_ASN1_I2D_put_SEQUENCE(a,f);
-
-#define M_ASN1_I2D_put_IMP_SET_opt(a,f,x) \
-		if ((a != NULL) && (sk_num(a) != 0)) \
-			{ i2d_ASN1_SET(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-				       IS_SET); }
-
-#define M_ASN1_I2D_put_IMP_SET_opt_type(type,a,f,x) \
-		if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-			{ i2d_ASN1_SET_OF_##type(a,&p,f,x, \
-						 V_ASN1_CONTEXT_SPECIFIC, \
-						 IS_SET); }
-
-#define M_ASN1_I2D_put_IMP_SEQUENCE_opt(a,f,x) \
-		if ((a != NULL) && (sk_num(a) != 0)) \
-			{ i2d_ASN1_SET(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-				       IS_SEQUENCE); }
-
-#define M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(type,a,f,x) \
-		if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-			{ i2d_ASN1_SET_OF_##type(a,&p,f,x, \
-						 V_ASN1_CONTEXT_SPECIFIC, \
-						 IS_SEQUENCE); }
-
-#define M_ASN1_I2D_put_EXP_opt(a,f,tag,v) \
-		if (a != NULL) \
-			{ \
-			ASN1_put_object(&p,1,v,tag,V_ASN1_CONTEXT_SPECIFIC); \
-			f(a,&p); \
-			}
-
-#define M_ASN1_I2D_put_EXP_SET_opt(a,f,mtag,tag,v) \
-		if ((a != NULL) && (sk_num(a) != 0)) \
-			{ \
-			ASN1_put_object(&p,1,v,mtag,V_ASN1_CONTEXT_SPECIFIC); \
-			i2d_ASN1_SET(a,&p,f,tag,V_ASN1_UNIVERSAL,IS_SET); \
-			}
-
-#define M_ASN1_I2D_put_EXP_SEQUENCE_opt(a,f,mtag,tag,v) \
-		if ((a != NULL) && (sk_num(a) != 0)) \
-			{ \
-			ASN1_put_object(&p,1,v,mtag,V_ASN1_CONTEXT_SPECIFIC); \
-			i2d_ASN1_SET(a,&p,f,tag,V_ASN1_UNIVERSAL,IS_SEQUENCE); \
-			}
-
-#define M_ASN1_I2D_put_EXP_SEQUENCE_opt_type(type,a,f,mtag,tag,v) \
-		if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-			{ \
-			ASN1_put_object(&p,1,v,mtag,V_ASN1_CONTEXT_SPECIFIC); \
-			i2d_ASN1_SET_OF_##type(a,&p,f,tag,V_ASN1_UNIVERSAL, \
-					       IS_SEQUENCE); \
-			}
-
-#define M_ASN1_I2D_seq_total() \
-		r=ASN1_object_size(1,ret,V_ASN1_SEQUENCE); \
-		if (pp == NULL) return(r); \
-		p= *pp; \
-		ASN1_put_object(&p,1,ret,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL)
-
-#define M_ASN1_I2D_INF_seq_start(tag,ctx) \
-		*(p++)=(V_ASN1_CONSTRUCTED|(tag)|(ctx)); \
-		*(p++)=0x80
-
-#define M_ASN1_I2D_INF_seq_end() *(p++)=0x00; *(p++)=0x00
-
-#define M_ASN1_I2D_finish()	*pp=p; \
-				return(r);
-
-int asn1_GetSequence(ASN1_const_CTX *c, long *length);
-void asn1_add_error(const unsigned char *address,int offset);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/asn1t.h b/dep/include/openssl/asn1t.h
deleted file mode 100644
index d230e4bf7..000000000
--- a/dep/include/openssl/asn1t.h
+++ /dev/null
@@ -1,960 +0,0 @@
-/* asn1t.h */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2000.
- */
-/* ====================================================================
- * Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_ASN1T_H
-#define HEADER_ASN1T_H
-
-#include <stddef.h>
-#include <openssl/e_os2.h>
-#include <openssl/asn1.h>
-
-#ifdef OPENSSL_BUILD_SHLIBCRYPTO
-# undef OPENSSL_EXTERN
-# define OPENSSL_EXTERN OPENSSL_EXPORT
-#endif
-
-/* ASN1 template defines, structures and functions */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
-#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-/* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
-#define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)(iptr))
-
-
-/* Macros for start and end of ASN1_ITEM definition */
-
-#define ASN1_ITEM_start(itname) \
-	OPENSSL_GLOBAL const ASN1_ITEM itname##_it = {
-
-#define ASN1_ITEM_end(itname) \
-		};
-
-#else
-
-/* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
-#define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)(iptr()))
-
-
-/* Macros for start and end of ASN1_ITEM definition */
-
-#define ASN1_ITEM_start(itname) \
-	const ASN1_ITEM * itname##_it(void) \
-	{ \
-		static const ASN1_ITEM local_it = { 
-
-#define ASN1_ITEM_end(itname) \
-		}; \
-	return &local_it; \
-	}
-
-#endif
-
-
-/* Macros to aid ASN1 template writing */
-
-#define ASN1_ITEM_TEMPLATE(tname) \
-	static const ASN1_TEMPLATE tname##_item_tt 
-
-#define ASN1_ITEM_TEMPLATE_END(tname) \
-	;\
-	ASN1_ITEM_start(tname) \
-		ASN1_ITYPE_PRIMITIVE,\
-		-1,\
-		&tname##_item_tt,\
-		0,\
-		NULL,\
-		0,\
-		#tname \
-	ASN1_ITEM_end(tname)
-
-
-/* This is a ASN1 type which just embeds a template */
- 
-/* This pair helps declare a SEQUENCE. We can do:
- *
- * 	ASN1_SEQUENCE(stname) = {
- * 		... SEQUENCE components ...
- * 	} ASN1_SEQUENCE_END(stname)
- *
- * 	This will produce an ASN1_ITEM called stname_it
- *	for a structure called stname.
- *
- * 	If you want the same structure but a different
- *	name then use:
- *
- * 	ASN1_SEQUENCE(itname) = {
- * 		... SEQUENCE components ...
- * 	} ASN1_SEQUENCE_END_name(stname, itname)
- *
- *	This will create an item called itname_it using
- *	a structure called stname.
- */
-
-#define ASN1_SEQUENCE(tname) \
-	static const ASN1_TEMPLATE tname##_seq_tt[] 
-
-#define ASN1_SEQUENCE_END(stname) ASN1_SEQUENCE_END_name(stname, stname)
-
-#define ASN1_SEQUENCE_END_name(stname, tname) \
-	;\
-	ASN1_ITEM_start(tname) \
-		ASN1_ITYPE_SEQUENCE,\
-		V_ASN1_SEQUENCE,\
-		tname##_seq_tt,\
-		sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-		NULL,\
-		sizeof(stname),\
-		#stname \
-	ASN1_ITEM_end(tname)
-
-#define ASN1_NDEF_SEQUENCE(tname) \
-	ASN1_SEQUENCE(tname)
-
-#define ASN1_NDEF_SEQUENCE_cb(tname, cb) \
-	ASN1_SEQUENCE_cb(tname, cb)
-
-#define ASN1_SEQUENCE_cb(tname, cb) \
-	static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \
-	ASN1_SEQUENCE(tname)
-
-#define ASN1_BROKEN_SEQUENCE(tname) \
-	static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_BROKEN, 0, 0, 0, 0}; \
-	ASN1_SEQUENCE(tname)
-
-#define ASN1_SEQUENCE_ref(tname, cb, lck) \
-	static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_REFCOUNT, offsetof(tname, references), lck, cb, 0}; \
-	ASN1_SEQUENCE(tname)
-
-#define ASN1_SEQUENCE_enc(tname, enc, cb) \
-	static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_ENCODING, 0, 0, cb, offsetof(tname, enc)}; \
-	ASN1_SEQUENCE(tname)
-
-#define ASN1_NDEF_SEQUENCE_END(tname) \
-	;\
-	ASN1_ITEM_start(tname) \
-		ASN1_ITYPE_NDEF_SEQUENCE,\
-		V_ASN1_SEQUENCE,\
-		tname##_seq_tt,\
-		sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-		NULL,\
-		sizeof(tname),\
-		#tname \
-	ASN1_ITEM_end(tname)
-
-#define ASN1_BROKEN_SEQUENCE_END(stname) ASN1_SEQUENCE_END_ref(stname, stname)
-
-#define ASN1_SEQUENCE_END_enc(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
-
-#define ASN1_SEQUENCE_END_cb(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
-
-#define ASN1_SEQUENCE_END_ref(stname, tname) \
-	;\
-	ASN1_ITEM_start(tname) \
-		ASN1_ITYPE_SEQUENCE,\
-		V_ASN1_SEQUENCE,\
-		tname##_seq_tt,\
-		sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-		&tname##_aux,\
-		sizeof(stname),\
-		#stname \
-	ASN1_ITEM_end(tname)
-
-#define ASN1_NDEF_SEQUENCE_END_cb(stname, tname) \
-	;\
-	ASN1_ITEM_start(tname) \
-		ASN1_ITYPE_NDEF_SEQUENCE,\
-		V_ASN1_SEQUENCE,\
-		tname##_seq_tt,\
-		sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-		&tname##_aux,\
-		sizeof(stname),\
-		#stname \
-	ASN1_ITEM_end(tname)
-
-
-/* This pair helps declare a CHOICE type. We can do:
- *
- * 	ASN1_CHOICE(chname) = {
- * 		... CHOICE options ...
- * 	ASN1_CHOICE_END(chname)
- *
- * 	This will produce an ASN1_ITEM called chname_it
- *	for a structure called chname. The structure
- *	definition must look like this:
- *	typedef struct {
- *		int type;
- *		union {
- *			ASN1_SOMETHING *opt1;
- *			ASN1_SOMEOTHER *opt2;
- *		} value;
- *	} chname;
- *	
- *	the name of the selector must be 'type'.
- * 	to use an alternative selector name use the
- *      ASN1_CHOICE_END_selector() version.
- */
-
-#define ASN1_CHOICE(tname) \
-	static const ASN1_TEMPLATE tname##_ch_tt[] 
-
-#define ASN1_CHOICE_cb(tname, cb) \
-	static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \
-	ASN1_CHOICE(tname)
-
-#define ASN1_CHOICE_END(stname) ASN1_CHOICE_END_name(stname, stname)
-
-#define ASN1_CHOICE_END_name(stname, tname) ASN1_CHOICE_END_selector(stname, tname, type)
-
-#define ASN1_CHOICE_END_selector(stname, tname, selname) \
-	;\
-	ASN1_ITEM_start(tname) \
-		ASN1_ITYPE_CHOICE,\
-		offsetof(stname,selname) ,\
-		tname##_ch_tt,\
-		sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
-		NULL,\
-		sizeof(stname),\
-		#stname \
-	ASN1_ITEM_end(tname)
-
-#define ASN1_CHOICE_END_cb(stname, tname, selname) \
-	;\
-	ASN1_ITEM_start(tname) \
-		ASN1_ITYPE_CHOICE,\
-		offsetof(stname,selname) ,\
-		tname##_ch_tt,\
-		sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
-		&tname##_aux,\
-		sizeof(stname),\
-		#stname \
-	ASN1_ITEM_end(tname)
-
-/* This helps with the template wrapper form of ASN1_ITEM */
-
-#define ASN1_EX_TEMPLATE_TYPE(flags, tag, name, type) { \
-	(flags), (tag), 0,\
-	#name, ASN1_ITEM_ref(type) }
-
-/* These help with SEQUENCE or CHOICE components */
-
-/* used to declare other types */
-
-#define ASN1_EX_TYPE(flags, tag, stname, field, type) { \
-	(flags), (tag), offsetof(stname, field),\
-	#field, ASN1_ITEM_ref(type) }
-
-/* used when the structure is combined with the parent */
-
-#define ASN1_EX_COMBINE(flags, tag, type) { \
-	(flags)|ASN1_TFLG_COMBINE, (tag), 0, NULL, ASN1_ITEM_ref(type) }
-
-/* implicit and explicit helper macros */
-
-#define ASN1_IMP_EX(stname, field, type, tag, ex) \
-		ASN1_EX_TYPE(ASN1_TFLG_IMPLICIT | ex, tag, stname, field, type)
-
-#define ASN1_EXP_EX(stname, field, type, tag, ex) \
-		ASN1_EX_TYPE(ASN1_TFLG_EXPLICIT | ex, tag, stname, field, type)
-
-/* Any defined by macros: the field used is in the table itself */
-
-#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-#define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, (const ASN1_ITEM *)&(tblname##_adb) }
-#define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, (const ASN1_ITEM *)&(tblname##_adb) }
-#else
-#define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, tblname##_adb }
-#define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, tblname##_adb }
-#endif
-/* Plain simple type */
-#define ASN1_SIMPLE(stname, field, type) ASN1_EX_TYPE(0,0, stname, field, type)
-
-/* OPTIONAL simple type */
-#define ASN1_OPT(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-
-/* IMPLICIT tagged simple type */
-#define ASN1_IMP(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, 0)
-
-/* IMPLICIT tagged OPTIONAL simple type */
-#define ASN1_IMP_OPT(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
-
-/* Same as above but EXPLICIT */
-
-#define ASN1_EXP(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, 0)
-#define ASN1_EXP_OPT(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
-
-/* SEQUENCE OF type */
-#define ASN1_SEQUENCE_OF(stname, field, type) \
-		ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, stname, field, type)
-
-/* OPTIONAL SEQUENCE OF */
-#define ASN1_SEQUENCE_OF_OPT(stname, field, type) \
-		ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-
-/* Same as above but for SET OF */
-
-#define ASN1_SET_OF(stname, field, type) \
-		ASN1_EX_TYPE(ASN1_TFLG_SET_OF, 0, stname, field, type)
-
-#define ASN1_SET_OF_OPT(stname, field, type) \
-		ASN1_EX_TYPE(ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-
-/* Finally compound types of SEQUENCE, SET, IMPLICIT, EXPLICIT and OPTIONAL */
-
-#define ASN1_IMP_SET_OF(stname, field, type, tag) \
-			ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
-
-#define ASN1_EXP_SET_OF(stname, field, type, tag) \
-			ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
-
-#define ASN1_IMP_SET_OF_OPT(stname, field, type, tag) \
-			ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL)
-
-#define ASN1_EXP_SET_OF_OPT(stname, field, type, tag) \
-			ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL)
-
-#define ASN1_IMP_SEQUENCE_OF(stname, field, type, tag) \
-			ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
-
-#define ASN1_IMP_SEQUENCE_OF_OPT(stname, field, type, tag) \
-			ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
-
-#define ASN1_EXP_SEQUENCE_OF(stname, field, type, tag) \
-			ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
-
-#define ASN1_EXP_SEQUENCE_OF_OPT(stname, field, type, tag) \
-			ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
-
-/* EXPLICIT using indefinite length constructed form */
-#define ASN1_NDEF_EXP(stname, field, type, tag) \
-			ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_NDEF)
-
-/* EXPLICIT OPTIONAL using indefinite length constructed form */
-#define ASN1_NDEF_EXP_OPT(stname, field, type, tag) \
-			ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_NDEF)
-
-/* Macros for the ASN1_ADB structure */
-
-#define ASN1_ADB(name) \
-	static const ASN1_ADB_TABLE name##_adbtbl[] 
-
-#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-#define ASN1_ADB_END(name, flags, field, app_table, def, none) \
-	;\
-	static const ASN1_ADB name##_adb = {\
-		flags,\
-		offsetof(name, field),\
-		app_table,\
-		name##_adbtbl,\
-		sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
-		def,\
-		none\
-	}
-
-#else
-
-#define ASN1_ADB_END(name, flags, field, app_table, def, none) \
-	;\
-	static const ASN1_ITEM *name##_adb(void) \
-	{ \
-	static const ASN1_ADB internal_adb = \
-		{\
-		flags,\
-		offsetof(name, field),\
-		app_table,\
-		name##_adbtbl,\
-		sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
-		def,\
-		none\
-		}; \
-		return (const ASN1_ITEM *) &internal_adb; \
-	} \
-	void dummy_function(void)
-
-#endif
-
-#define ADB_ENTRY(val, template) {val, template}
-
-#define ASN1_ADB_TEMPLATE(name) \
-	static const ASN1_TEMPLATE name##_tt 
-
-/* This is the ASN1 template structure that defines
- * a wrapper round the actual type. It determines the
- * actual position of the field in the value structure,
- * various flags such as OPTIONAL and the field name.
- */
-
-struct ASN1_TEMPLATE_st {
-unsigned long flags;		/* Various flags */
-long tag;			/* tag, not used if no tagging */
-unsigned long offset;		/* Offset of this field in structure */
-#ifndef NO_ASN1_FIELD_NAMES
-const char *field_name;		/* Field name */
-#endif
-ASN1_ITEM_EXP *item;		/* Relevant ASN1_ITEM or ASN1_ADB */
-};
-
-/* Macro to extract ASN1_ITEM and ASN1_ADB pointer from ASN1_TEMPLATE */
-
-#define ASN1_TEMPLATE_item(t) (t->item_ptr)
-#define ASN1_TEMPLATE_adb(t) (t->item_ptr)
-
-typedef struct ASN1_ADB_TABLE_st ASN1_ADB_TABLE;
-typedef struct ASN1_ADB_st ASN1_ADB;
-
-struct ASN1_ADB_st {
-	unsigned long flags;	/* Various flags */
-	unsigned long offset;	/* Offset of selector field */
-	STACK_OF(ASN1_ADB_TABLE) **app_items; /* Application defined items */
-	const ASN1_ADB_TABLE *tbl;	/* Table of possible types */
-	long tblcount;		/* Number of entries in tbl */
-	const ASN1_TEMPLATE *default_tt;  /* Type to use if no match */
-	const ASN1_TEMPLATE *null_tt;  /* Type to use if selector is NULL */
-};
-
-struct ASN1_ADB_TABLE_st {
-	long value;		/* NID for an object or value for an int */
-	const ASN1_TEMPLATE tt;		/* item for this value */
-};
-
-/* template flags */
-
-/* Field is optional */
-#define ASN1_TFLG_OPTIONAL	(0x1)
-
-/* Field is a SET OF */
-#define ASN1_TFLG_SET_OF	(0x1 << 1)
-
-/* Field is a SEQUENCE OF */
-#define ASN1_TFLG_SEQUENCE_OF	(0x2 << 1)
-
-/* Special case: this refers to a SET OF that
- * will be sorted into DER order when encoded *and*
- * the corresponding STACK will be modified to match
- * the new order.
- */
-#define ASN1_TFLG_SET_ORDER	(0x3 << 1)
-
-/* Mask for SET OF or SEQUENCE OF */
-#define ASN1_TFLG_SK_MASK	(0x3 << 1)
-
-/* These flags mean the tag should be taken from the
- * tag field. If EXPLICIT then the underlying type
- * is used for the inner tag.
- */
-
-/* IMPLICIT tagging */
-#define ASN1_TFLG_IMPTAG	(0x1 << 3)
-
-
-/* EXPLICIT tagging, inner tag from underlying type */
-#define ASN1_TFLG_EXPTAG	(0x2 << 3)
-
-#define ASN1_TFLG_TAG_MASK	(0x3 << 3)
-
-/* context specific IMPLICIT */
-#define ASN1_TFLG_IMPLICIT	ASN1_TFLG_IMPTAG|ASN1_TFLG_CONTEXT
-
-/* context specific EXPLICIT */
-#define ASN1_TFLG_EXPLICIT	ASN1_TFLG_EXPTAG|ASN1_TFLG_CONTEXT
-
-/* If tagging is in force these determine the
- * type of tag to use. Otherwise the tag is
- * determined by the underlying type. These 
- * values reflect the actual octet format.
- */
-
-/* Universal tag */ 
-#define ASN1_TFLG_UNIVERSAL	(0x0<<6)
-/* Application tag */ 
-#define ASN1_TFLG_APPLICATION	(0x1<<6)
-/* Context specific tag */ 
-#define ASN1_TFLG_CONTEXT	(0x2<<6)
-/* Private tag */ 
-#define ASN1_TFLG_PRIVATE	(0x3<<6)
-
-#define ASN1_TFLG_TAG_CLASS	(0x3<<6)
-
-/* These are for ANY DEFINED BY type. In this case
- * the 'item' field points to an ASN1_ADB structure
- * which contains a table of values to decode the
- * relevant type
- */
-
-#define ASN1_TFLG_ADB_MASK	(0x3<<8)
-
-#define ASN1_TFLG_ADB_OID	(0x1<<8)
-
-#define ASN1_TFLG_ADB_INT	(0x1<<9)
-
-/* This flag means a parent structure is passed
- * instead of the field: this is useful is a
- * SEQUENCE is being combined with a CHOICE for
- * example. Since this means the structure and
- * item name will differ we need to use the
- * ASN1_CHOICE_END_name() macro for example.
- */
-
-#define ASN1_TFLG_COMBINE	(0x1<<10)
-
-/* This flag when present in a SEQUENCE OF, SET OF
- * or EXPLICIT causes indefinite length constructed
- * encoding to be used if required.
- */
-
-#define ASN1_TFLG_NDEF		(0x1<<11)
-
-/* This is the actual ASN1 item itself */
-
-struct ASN1_ITEM_st {
-char itype;			/* The item type, primitive, SEQUENCE, CHOICE or extern */
-long utype;			/* underlying type */
-const ASN1_TEMPLATE *templates;	/* If SEQUENCE or CHOICE this contains the contents */
-long tcount;			/* Number of templates if SEQUENCE or CHOICE */
-const void *funcs;		/* functions that handle this type */
-long size;			/* Structure size (usually)*/
-#ifndef NO_ASN1_FIELD_NAMES
-const char *sname;		/* Structure name */
-#endif
-};
-
-/* These are values for the itype field and
- * determine how the type is interpreted.
- *
- * For PRIMITIVE types the underlying type
- * determines the behaviour if items is NULL.
- *
- * Otherwise templates must contain a single 
- * template and the type is treated in the
- * same way as the type specified in the template.
- *
- * For SEQUENCE types the templates field points
- * to the members, the size field is the
- * structure size.
- *
- * For CHOICE types the templates field points
- * to each possible member (typically a union)
- * and the 'size' field is the offset of the
- * selector.
- *
- * The 'funcs' field is used for application
- * specific functions. 
- *
- * For COMPAT types the funcs field gives a
- * set of functions that handle this type, this
- * supports the old d2i, i2d convention.
- *
- * The EXTERN type uses a new style d2i/i2d.
- * The new style should be used where possible
- * because it avoids things like the d2i IMPLICIT
- * hack.
- *
- * MSTRING is a multiple string type, it is used
- * for a CHOICE of character strings where the
- * actual strings all occupy an ASN1_STRING
- * structure. In this case the 'utype' field
- * has a special meaning, it is used as a mask
- * of acceptable types using the B_ASN1 constants.
- *
- * NDEF_SEQUENCE is the same as SEQUENCE except
- * that it will use indefinite length constructed
- * encoding if requested.
- *
- */
-
-#define ASN1_ITYPE_PRIMITIVE		0x0
-
-#define ASN1_ITYPE_SEQUENCE		0x1
-
-#define ASN1_ITYPE_CHOICE		0x2
-
-#define ASN1_ITYPE_COMPAT		0x3
-
-#define ASN1_ITYPE_EXTERN		0x4
-
-#define ASN1_ITYPE_MSTRING		0x5
-
-#define ASN1_ITYPE_NDEF_SEQUENCE	0x6
-
-/* Cache for ASN1 tag and length, so we
- * don't keep re-reading it for things
- * like CHOICE
- */
-
-struct ASN1_TLC_st{
-	char valid;	/* Values below are valid */
-	int ret;	/* return value */
-	long plen;	/* length */
-	int ptag;	/* class value */
-	int pclass;	/* class value */
-	int hdrlen;	/* header length */
-};
-
-/* Typedefs for ASN1 function pointers */
-
-typedef ASN1_VALUE * ASN1_new_func(void);
-typedef void ASN1_free_func(ASN1_VALUE *a);
-typedef ASN1_VALUE * ASN1_d2i_func(ASN1_VALUE **a, const unsigned char ** in, long length);
-typedef int ASN1_i2d_func(ASN1_VALUE * a, unsigned char **in);
-
-typedef int ASN1_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, const ASN1_ITEM *it,
-					int tag, int aclass, char opt, ASN1_TLC *ctx);
-
-typedef int ASN1_ex_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it, int tag, int aclass);
-typedef int ASN1_ex_new_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
-typedef void ASN1_ex_free_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
-
-typedef int ASN1_ex_print_func(BIO *out, ASN1_VALUE **pval, 
-						int indent, const char *fname, 
-						const ASN1_PCTX *pctx);
-
-typedef int ASN1_primitive_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it);
-typedef int ASN1_primitive_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype, char *free_cont, const ASN1_ITEM *it);
-typedef int ASN1_primitive_print(BIO *out, ASN1_VALUE **pval, const ASN1_ITEM *it, int indent, const ASN1_PCTX *pctx);
-
-typedef struct ASN1_COMPAT_FUNCS_st {
-	ASN1_new_func *asn1_new;
-	ASN1_free_func *asn1_free;
-	ASN1_d2i_func *asn1_d2i;
-	ASN1_i2d_func *asn1_i2d;
-} ASN1_COMPAT_FUNCS;
-
-typedef struct ASN1_EXTERN_FUNCS_st {
-	void *app_data;
-	ASN1_ex_new_func *asn1_ex_new;
-	ASN1_ex_free_func *asn1_ex_free;
-	ASN1_ex_free_func *asn1_ex_clear;
-	ASN1_ex_d2i *asn1_ex_d2i;
-	ASN1_ex_i2d *asn1_ex_i2d;
-	ASN1_ex_print_func *asn1_ex_print;
-} ASN1_EXTERN_FUNCS;
-
-typedef struct ASN1_PRIMITIVE_FUNCS_st {
-	void *app_data;
-	unsigned long flags;
-	ASN1_ex_new_func *prim_new;
-	ASN1_ex_free_func *prim_free;
-	ASN1_ex_free_func *prim_clear;
-	ASN1_primitive_c2i *prim_c2i;
-	ASN1_primitive_i2c *prim_i2c;
-	ASN1_primitive_print *prim_print;
-} ASN1_PRIMITIVE_FUNCS;
-
-/* This is the ASN1_AUX structure: it handles various
- * miscellaneous requirements. For example the use of
- * reference counts and an informational callback.
- *
- * The "informational callback" is called at various
- * points during the ASN1 encoding and decoding. It can
- * be used to provide minor customisation of the structures
- * used. This is most useful where the supplied routines
- * *almost* do the right thing but need some extra help
- * at a few points. If the callback returns zero then
- * it is assumed a fatal error has occurred and the 
- * main operation should be abandoned.
- *
- * If major changes in the default behaviour are required
- * then an external type is more appropriate.
- */
-
-typedef int ASN1_aux_cb(int operation, ASN1_VALUE **in, const ASN1_ITEM *it,
-				void *exarg);
-
-typedef struct ASN1_AUX_st {
-	void *app_data;
-	int flags;
-	int ref_offset;		/* Offset of reference value */
-	int ref_lock;		/* Lock type to use */
-	ASN1_aux_cb *asn1_cb;
-	int enc_offset;		/* Offset of ASN1_ENCODING structure */
-} ASN1_AUX;
-
-/* For print related callbacks exarg points to this structure */
-typedef struct ASN1_PRINT_ARG_st {
-	BIO *out;
-	int indent;
-	const ASN1_PCTX *pctx;
-} ASN1_PRINT_ARG;
-
-/* For streaming related callbacks exarg points to this structure */
-typedef struct ASN1_STREAM_ARG_st {
-	/* BIO to stream through */
-	BIO *out;
-	/* BIO with filters appended */
-	BIO *ndef_bio;
-	/* Streaming I/O boundary */
-	unsigned char **boundary;
-} ASN1_STREAM_ARG;
-
-/* Flags in ASN1_AUX */
-
-/* Use a reference count */
-#define ASN1_AFLG_REFCOUNT	1
-/* Save the encoding of structure (useful for signatures) */
-#define ASN1_AFLG_ENCODING	2
-/* The Sequence length is invalid */
-#define ASN1_AFLG_BROKEN	4
-
-/* operation values for asn1_cb */
-
-#define ASN1_OP_NEW_PRE		0
-#define ASN1_OP_NEW_POST	1
-#define ASN1_OP_FREE_PRE	2
-#define ASN1_OP_FREE_POST	3
-#define ASN1_OP_D2I_PRE		4
-#define ASN1_OP_D2I_POST	5
-#define ASN1_OP_I2D_PRE		6
-#define ASN1_OP_I2D_POST	7
-#define ASN1_OP_PRINT_PRE	8
-#define ASN1_OP_PRINT_POST	9
-#define ASN1_OP_STREAM_PRE	10
-#define ASN1_OP_STREAM_POST	11
-#define ASN1_OP_DETACHED_PRE	12
-#define ASN1_OP_DETACHED_POST	13
-
-/* Macro to implement a primitive type */
-#define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0)
-#define IMPLEMENT_ASN1_TYPE_ex(itname, vname, ex) \
-				ASN1_ITEM_start(itname) \
-					ASN1_ITYPE_PRIMITIVE, V_##vname, NULL, 0, NULL, ex, #itname \
-				ASN1_ITEM_end(itname)
-
-/* Macro to implement a multi string type */
-#define IMPLEMENT_ASN1_MSTRING(itname, mask) \
-				ASN1_ITEM_start(itname) \
-					ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname \
-				ASN1_ITEM_end(itname)
-
-/* Macro to implement an ASN1_ITEM in terms of old style funcs */
-
-#define IMPLEMENT_COMPAT_ASN1(sname) IMPLEMENT_COMPAT_ASN1_type(sname, V_ASN1_SEQUENCE)
-
-#define IMPLEMENT_COMPAT_ASN1_type(sname, tag) \
-	static const ASN1_COMPAT_FUNCS sname##_ff = { \
-		(ASN1_new_func *)sname##_new, \
-		(ASN1_free_func *)sname##_free, \
-		(ASN1_d2i_func *)d2i_##sname, \
-		(ASN1_i2d_func *)i2d_##sname, \
-	}; \
-	ASN1_ITEM_start(sname) \
-		ASN1_ITYPE_COMPAT, \
-		tag, \
-		NULL, \
-		0, \
-		&sname##_ff, \
-		0, \
-		#sname \
-	ASN1_ITEM_end(sname)
-
-#define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \
-	ASN1_ITEM_start(sname) \
-		ASN1_ITYPE_EXTERN, \
-		tag, \
-		NULL, \
-		0, \
-		&fptrs, \
-		0, \
-		#sname \
-	ASN1_ITEM_end(sname)
-
-/* Macro to implement standard functions in terms of ASN1_ITEM structures */
-
-#define IMPLEMENT_ASN1_FUNCTIONS(stname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, stname, stname)
-
-#define IMPLEMENT_ASN1_FUNCTIONS_name(stname, itname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, itname)
-
-#define IMPLEMENT_ASN1_FUNCTIONS_ENCODE_name(stname, itname) \
-			IMPLEMENT_ASN1_FUNCTIONS_ENCODE_fname(stname, itname, itname)
-
-#define IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(stname) \
-		IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(static, stname, stname, stname)
-
-#define IMPLEMENT_ASN1_ALLOC_FUNCTIONS(stname) \
-		IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, stname, stname)
-
-#define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(pre, stname, itname, fname) \
-	pre stname *fname##_new(void) \
-	{ \
-		return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \
-	} \
-	pre void fname##_free(stname *a) \
-	{ \
-		ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \
-	}
-
-#define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) \
-	stname *fname##_new(void) \
-	{ \
-		return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \
-	} \
-	void fname##_free(stname *a) \
-	{ \
-		ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \
-	}
-
-#define IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, fname) \
-	IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
-	IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
-
-#define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
-	stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
-	{ \
-		return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\
-	} \
-	int i2d_##fname(stname *a, unsigned char **out) \
-	{ \
-		return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
-	} 
-
-#define IMPLEMENT_ASN1_NDEF_FUNCTION(stname) \
-	int i2d_##stname##_NDEF(stname *a, unsigned char **out) \
-	{ \
-		return ASN1_item_ndef_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(stname));\
-	} 
-
-/* This includes evil casts to remove const: they will go away when full
- * ASN1 constification is done.
- */
-#define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
-	stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
-	{ \
-		return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\
-	} \
-	int i2d_##fname(const stname *a, unsigned char **out) \
-	{ \
-		return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
-	} 
-
-#define IMPLEMENT_ASN1_DUP_FUNCTION(stname) \
-	stname * stname##_dup(stname *x) \
-        { \
-        return ASN1_item_dup(ASN1_ITEM_rptr(stname), x); \
-        }
-
-#define IMPLEMENT_ASN1_PRINT_FUNCTION(stname) \
-	IMPLEMENT_ASN1_PRINT_FUNCTION_fname(stname, stname, stname)
-
-#define IMPLEMENT_ASN1_PRINT_FUNCTION_fname(stname, itname, fname) \
-	int fname##_print_ctx(BIO *out, stname *x, int indent, \
-						const ASN1_PCTX *pctx) \
-	{ \
-		return ASN1_item_print(out, (ASN1_VALUE *)x, indent, \
-			ASN1_ITEM_rptr(itname), pctx); \
-	} 
-
-#define IMPLEMENT_ASN1_FUNCTIONS_const(name) \
-		IMPLEMENT_ASN1_FUNCTIONS_const_fname(name, name, name)
-
-#define IMPLEMENT_ASN1_FUNCTIONS_const_fname(stname, itname, fname) \
-	IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
-	IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
-
-/* external definitions for primitive types */
-
-DECLARE_ASN1_ITEM(ASN1_BOOLEAN)
-DECLARE_ASN1_ITEM(ASN1_TBOOLEAN)
-DECLARE_ASN1_ITEM(ASN1_FBOOLEAN)
-DECLARE_ASN1_ITEM(ASN1_SEQUENCE)
-DECLARE_ASN1_ITEM(CBIGNUM)
-DECLARE_ASN1_ITEM(BIGNUM)
-DECLARE_ASN1_ITEM(LONG)
-DECLARE_ASN1_ITEM(ZLONG)
-
-DECLARE_STACK_OF(ASN1_VALUE)
-
-/* Functions used internally by the ASN1 code */
-
-int ASN1_item_ex_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
-void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
-int ASN1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
-int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
-
-void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
-int ASN1_template_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, const ASN1_TEMPLATE *tt);
-int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, const ASN1_ITEM *it,
-				int tag, int aclass, char opt, ASN1_TLC *ctx);
-
-int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it, int tag, int aclass);
-int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_TEMPLATE *tt);
-void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
-
-int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it);
-int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype, char *free_cont, const ASN1_ITEM *it);
-
-int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it);
-int asn1_set_choice_selector(ASN1_VALUE **pval, int value, const ASN1_ITEM *it);
-
-ASN1_VALUE ** asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
-
-const ASN1_TEMPLATE *asn1_do_adb(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt, int nullerr);
-
-int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it);
-
-void asn1_enc_init(ASN1_VALUE **pval, const ASN1_ITEM *it);
-void asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
-int asn1_enc_restore(int *len, unsigned char **out, ASN1_VALUE **pval, const ASN1_ITEM *it);
-int asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen, const ASN1_ITEM *it);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/bio.h b/dep/include/openssl/bio.h
deleted file mode 100644
index 152802fbd..000000000
--- a/dep/include/openssl/bio.h
+++ /dev/null
@@ -1,770 +0,0 @@
-/* crypto/bio/bio.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_BIO_H
-#define HEADER_BIO_H
-
-#include <openssl/e_os2.h>
-
-#ifndef OPENSSL_NO_FP_API
-# include <stdio.h>
-#endif
-#include <stdarg.h>
-
-#include <openssl/crypto.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* These are the 'types' of BIOs */
-#define BIO_TYPE_NONE		0
-#define BIO_TYPE_MEM		(1|0x0400)
-#define BIO_TYPE_FILE		(2|0x0400)
-
-#define BIO_TYPE_FD		(4|0x0400|0x0100)
-#define BIO_TYPE_SOCKET		(5|0x0400|0x0100)
-#define BIO_TYPE_NULL		(6|0x0400)
-#define BIO_TYPE_SSL		(7|0x0200)
-#define BIO_TYPE_MD		(8|0x0200)		/* passive filter */
-#define BIO_TYPE_BUFFER		(9|0x0200)		/* filter */
-#define BIO_TYPE_CIPHER		(10|0x0200)		/* filter */
-#define BIO_TYPE_BASE64		(11|0x0200)		/* filter */
-#define BIO_TYPE_CONNECT	(12|0x0400|0x0100)	/* socket - connect */
-#define BIO_TYPE_ACCEPT		(13|0x0400|0x0100)	/* socket for accept */
-#define BIO_TYPE_PROXY_CLIENT	(14|0x0200)		/* client proxy BIO */
-#define BIO_TYPE_PROXY_SERVER	(15|0x0200)		/* server proxy BIO */
-#define BIO_TYPE_NBIO_TEST	(16|0x0200)		/* server proxy BIO */
-#define BIO_TYPE_NULL_FILTER	(17|0x0200)
-#define BIO_TYPE_BER		(18|0x0200)		/* BER -> bin filter */
-#define BIO_TYPE_BIO		(19|0x0400)		/* (half a) BIO pair */
-#define BIO_TYPE_LINEBUFFER	(20|0x0200)		/* filter */
-#define BIO_TYPE_DGRAM		(21|0x0400|0x0100)
-#define BIO_TYPE_ASN1 		(22|0x0200)		/* filter */
-#define BIO_TYPE_COMP 		(23|0x0200)		/* filter */
-
-#define BIO_TYPE_DESCRIPTOR	0x0100	/* socket, fd, connect or accept */
-#define BIO_TYPE_FILTER		0x0200
-#define BIO_TYPE_SOURCE_SINK	0x0400
-
-/* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
- * BIO_set_fp(in,stdin,BIO_NOCLOSE); */
-#define BIO_NOCLOSE		0x00
-#define BIO_CLOSE		0x01
-
-/* These are used in the following macros and are passed to
- * BIO_ctrl() */
-#define BIO_CTRL_RESET		1  /* opt - rewind/zero etc */
-#define BIO_CTRL_EOF		2  /* opt - are we at the eof */
-#define BIO_CTRL_INFO		3  /* opt - extra tit-bits */
-#define BIO_CTRL_SET		4  /* man - set the 'IO' type */
-#define BIO_CTRL_GET		5  /* man - get the 'IO' type */
-#define BIO_CTRL_PUSH		6  /* opt - internal, used to signify change */
-#define BIO_CTRL_POP		7  /* opt - internal, used to signify change */
-#define BIO_CTRL_GET_CLOSE	8  /* man - set the 'close' on free */
-#define BIO_CTRL_SET_CLOSE	9  /* man - set the 'close' on free */
-#define BIO_CTRL_PENDING	10  /* opt - is their more data buffered */
-#define BIO_CTRL_FLUSH		11  /* opt - 'flush' buffered output */
-#define BIO_CTRL_DUP		12  /* man - extra stuff for 'duped' BIO */
-#define BIO_CTRL_WPENDING	13  /* opt - number of bytes still to write */
-/* callback is int cb(BIO *bio,state,ret); */
-#define BIO_CTRL_SET_CALLBACK	14  /* opt - set callback function */
-#define BIO_CTRL_GET_CALLBACK	15  /* opt - set callback function */
-
-#define BIO_CTRL_SET_FILENAME	30	/* BIO_s_file special */
-
-/* dgram BIO stuff */
-#define BIO_CTRL_DGRAM_CONNECT       31  /* BIO dgram special */
-#define BIO_CTRL_DGRAM_SET_CONNECTED 32  /* allow for an externally
-					  * connected socket to be
-					  * passed in */ 
-#define BIO_CTRL_DGRAM_SET_RECV_TIMEOUT 33 /* setsockopt, essentially */
-#define BIO_CTRL_DGRAM_GET_RECV_TIMEOUT 34 /* getsockopt, essentially */
-#define BIO_CTRL_DGRAM_SET_SEND_TIMEOUT 35 /* setsockopt, essentially */
-#define BIO_CTRL_DGRAM_GET_SEND_TIMEOUT 36 /* getsockopt, essentially */
-
-#define BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP 37 /* flag whether the last */
-#define BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP 38 /* I/O operation tiemd out */
-					
-/* #ifdef IP_MTU_DISCOVER */
-#define BIO_CTRL_DGRAM_MTU_DISCOVER       39 /* set DF bit on egress packets */
-/* #endif */
-
-#define BIO_CTRL_DGRAM_QUERY_MTU          40 /* as kernel for current MTU */
-#define BIO_CTRL_DGRAM_GET_MTU            41 /* get cached value for MTU */
-#define BIO_CTRL_DGRAM_SET_MTU            42 /* set cached value for
-					      * MTU. want to use this
-					      * if asking the kernel
-					      * fails */
-
-#define BIO_CTRL_DGRAM_MTU_EXCEEDED       43 /* check whether the MTU
-					      * was exceed in the
-					      * previous write
-					      * operation */
-
-#define BIO_CTRL_DGRAM_GET_PEER           46
-#define BIO_CTRL_DGRAM_SET_PEER           44 /* Destination for the data */
-
-#define BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT   45 /* Next DTLS handshake timeout to
-											  * adjust socket timeouts */
-
-/* modifiers */
-#define BIO_FP_READ		0x02
-#define BIO_FP_WRITE		0x04
-#define BIO_FP_APPEND		0x08
-#define BIO_FP_TEXT		0x10
-
-#define BIO_FLAGS_READ		0x01
-#define BIO_FLAGS_WRITE		0x02
-#define BIO_FLAGS_IO_SPECIAL	0x04
-#define BIO_FLAGS_RWS (BIO_FLAGS_READ|BIO_FLAGS_WRITE|BIO_FLAGS_IO_SPECIAL)
-#define BIO_FLAGS_SHOULD_RETRY	0x08
-#ifndef	BIO_FLAGS_UPLINK
-/* "UPLINK" flag denotes file descriptors provided by application.
-   It defaults to 0, as most platforms don't require UPLINK interface. */
-#define	BIO_FLAGS_UPLINK	0
-#endif
-
-/* Used in BIO_gethostbyname() */
-#define BIO_GHBN_CTRL_HITS		1
-#define BIO_GHBN_CTRL_MISSES		2
-#define BIO_GHBN_CTRL_CACHE_SIZE	3
-#define BIO_GHBN_CTRL_GET_ENTRY		4
-#define BIO_GHBN_CTRL_FLUSH		5
-
-/* Mostly used in the SSL BIO */
-/* Not used anymore
- * #define BIO_FLAGS_PROTOCOL_DELAYED_READ 0x10
- * #define BIO_FLAGS_PROTOCOL_DELAYED_WRITE 0x20
- * #define BIO_FLAGS_PROTOCOL_STARTUP	0x40
- */
-
-#define BIO_FLAGS_BASE64_NO_NL	0x100
-
-/* This is used with memory BIOs: it means we shouldn't free up or change the
- * data in any way.
- */
-#define BIO_FLAGS_MEM_RDONLY	0x200
-
-typedef struct bio_st BIO;
-
-void BIO_set_flags(BIO *b, int flags);
-int  BIO_test_flags(const BIO *b, int flags);
-void BIO_clear_flags(BIO *b, int flags);
-
-#define BIO_get_flags(b) BIO_test_flags(b, ~(0x0))
-#define BIO_set_retry_special(b) \
-		BIO_set_flags(b, (BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY))
-#define BIO_set_retry_read(b) \
-		BIO_set_flags(b, (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY))
-#define BIO_set_retry_write(b) \
-		BIO_set_flags(b, (BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY))
-
-/* These are normally used internally in BIOs */
-#define BIO_clear_retry_flags(b) \
-		BIO_clear_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-#define BIO_get_retry_flags(b) \
-		BIO_test_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-
-/* These should be used by the application to tell why we should retry */
-#define BIO_should_read(a)		BIO_test_flags(a, BIO_FLAGS_READ)
-#define BIO_should_write(a)		BIO_test_flags(a, BIO_FLAGS_WRITE)
-#define BIO_should_io_special(a)	BIO_test_flags(a, BIO_FLAGS_IO_SPECIAL)
-#define BIO_retry_type(a)		BIO_test_flags(a, BIO_FLAGS_RWS)
-#define BIO_should_retry(a)		BIO_test_flags(a, BIO_FLAGS_SHOULD_RETRY)
-
-/* The next three are used in conjunction with the
- * BIO_should_io_special() condition.  After this returns true,
- * BIO *BIO_get_retry_BIO(BIO *bio, int *reason); will walk the BIO 
- * stack and return the 'reason' for the special and the offending BIO.
- * Given a BIO, BIO_get_retry_reason(bio) will return the code. */
-/* Returned from the SSL bio when the certificate retrieval code had an error */
-#define BIO_RR_SSL_X509_LOOKUP		0x01
-/* Returned from the connect BIO when a connect would have blocked */
-#define BIO_RR_CONNECT			0x02
-/* Returned from the accept BIO when an accept would have blocked */
-#define BIO_RR_ACCEPT			0x03
-
-/* These are passed by the BIO callback */
-#define BIO_CB_FREE	0x01
-#define BIO_CB_READ	0x02
-#define BIO_CB_WRITE	0x03
-#define BIO_CB_PUTS	0x04
-#define BIO_CB_GETS	0x05
-#define BIO_CB_CTRL	0x06
-
-/* The callback is called before and after the underling operation,
- * The BIO_CB_RETURN flag indicates if it is after the call */
-#define BIO_CB_RETURN	0x80
-#define BIO_CB_return(a) ((a)|BIO_CB_RETURN))
-#define BIO_cb_pre(a)	(!((a)&BIO_CB_RETURN))
-#define BIO_cb_post(a)	((a)&BIO_CB_RETURN)
-
-long (*BIO_get_callback(const BIO *b)) (struct bio_st *,int,const char *,int, long,long);
-void BIO_set_callback(BIO *b, 
-	long (*callback)(struct bio_st *,int,const char *,int, long,long));
-char *BIO_get_callback_arg(const BIO *b);
-void BIO_set_callback_arg(BIO *b, char *arg);
-
-const char * BIO_method_name(const BIO *b);
-int BIO_method_type(const BIO *b);
-
-typedef void bio_info_cb(struct bio_st *, int, const char *, int, long, long);
-
-typedef struct bio_method_st
-	{
-	int type;
-	const char *name;
-	int (*bwrite)(BIO *, const char *, int);
-	int (*bread)(BIO *, char *, int);
-	int (*bputs)(BIO *, const char *);
-	int (*bgets)(BIO *, char *, int);
-	long (*ctrl)(BIO *, int, long, void *);
-	int (*create)(BIO *);
-	int (*destroy)(BIO *);
-        long (*callback_ctrl)(BIO *, int, bio_info_cb *);
-	} BIO_METHOD;
-
-struct bio_st
-	{
-	BIO_METHOD *method;
-	/* bio, mode, argp, argi, argl, ret */
-	long (*callback)(struct bio_st *,int,const char *,int, long,long);
-	char *cb_arg; /* first argument for the callback */
-
-	int init;
-	int shutdown;
-	int flags;	/* extra storage */
-	int retry_reason;
-	int num;
-	void *ptr;
-	struct bio_st *next_bio;	/* used by filter BIOs */
-	struct bio_st *prev_bio;	/* used by filter BIOs */
-	int references;
-	unsigned long num_read;
-	unsigned long num_write;
-
-	CRYPTO_EX_DATA ex_data;
-	};
-
-DECLARE_STACK_OF(BIO)
-
-typedef struct bio_f_buffer_ctx_struct
-	{
-	/* BIO *bio; */ /* this is now in the BIO struct */
-	int ibuf_size;	/* how big is the input buffer */
-	int obuf_size;	/* how big is the output buffer */
-
-	char *ibuf;		/* the char array */
-	int ibuf_len;		/* how many bytes are in it */
-	int ibuf_off;		/* write/read offset */
-
-	char *obuf;		/* the char array */
-	int obuf_len;		/* how many bytes are in it */
-	int obuf_off;		/* write/read offset */
-	} BIO_F_BUFFER_CTX;
-
-/* Prefix and suffix callback in ASN1 BIO */
-typedef int asn1_ps_func(BIO *b, unsigned char **pbuf, int *plen, void *parg);
-
-/* connect BIO stuff */
-#define BIO_CONN_S_BEFORE		1
-#define BIO_CONN_S_GET_IP		2
-#define BIO_CONN_S_GET_PORT		3
-#define BIO_CONN_S_CREATE_SOCKET	4
-#define BIO_CONN_S_CONNECT		5
-#define BIO_CONN_S_OK			6
-#define BIO_CONN_S_BLOCKED_CONNECT	7
-#define BIO_CONN_S_NBIO			8
-/*#define BIO_CONN_get_param_hostname	BIO_ctrl */
-
-#define BIO_C_SET_CONNECT			100
-#define BIO_C_DO_STATE_MACHINE			101
-#define BIO_C_SET_NBIO				102
-#define BIO_C_SET_PROXY_PARAM			103
-#define BIO_C_SET_FD				104
-#define BIO_C_GET_FD				105
-#define BIO_C_SET_FILE_PTR			106
-#define BIO_C_GET_FILE_PTR			107
-#define BIO_C_SET_FILENAME			108
-#define BIO_C_SET_SSL				109
-#define BIO_C_GET_SSL				110
-#define BIO_C_SET_MD				111
-#define BIO_C_GET_MD				112
-#define BIO_C_GET_CIPHER_STATUS			113
-#define BIO_C_SET_BUF_MEM			114
-#define BIO_C_GET_BUF_MEM_PTR			115
-#define BIO_C_GET_BUFF_NUM_LINES		116
-#define BIO_C_SET_BUFF_SIZE			117
-#define BIO_C_SET_ACCEPT			118
-#define BIO_C_SSL_MODE				119
-#define BIO_C_GET_MD_CTX			120
-#define BIO_C_GET_PROXY_PARAM			121
-#define BIO_C_SET_BUFF_READ_DATA		122 /* data to read first */
-#define BIO_C_GET_CONNECT			123
-#define BIO_C_GET_ACCEPT			124
-#define BIO_C_SET_SSL_RENEGOTIATE_BYTES		125
-#define BIO_C_GET_SSL_NUM_RENEGOTIATES		126
-#define BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT	127
-#define BIO_C_FILE_SEEK				128
-#define BIO_C_GET_CIPHER_CTX			129
-#define BIO_C_SET_BUF_MEM_EOF_RETURN		130/*return end of input value*/
-#define BIO_C_SET_BIND_MODE			131
-#define BIO_C_GET_BIND_MODE			132
-#define BIO_C_FILE_TELL				133
-#define BIO_C_GET_SOCKS				134
-#define BIO_C_SET_SOCKS				135
-
-#define BIO_C_SET_WRITE_BUF_SIZE		136/* for BIO_s_bio */
-#define BIO_C_GET_WRITE_BUF_SIZE		137
-#define BIO_C_MAKE_BIO_PAIR			138
-#define BIO_C_DESTROY_BIO_PAIR			139
-#define BIO_C_GET_WRITE_GUARANTEE		140
-#define BIO_C_GET_READ_REQUEST			141
-#define BIO_C_SHUTDOWN_WR			142
-#define BIO_C_NREAD0				143
-#define BIO_C_NREAD				144
-#define BIO_C_NWRITE0				145
-#define BIO_C_NWRITE				146
-#define BIO_C_RESET_READ_REQUEST		147
-#define BIO_C_SET_MD_CTX			148
-
-#define BIO_C_SET_PREFIX			149
-#define BIO_C_GET_PREFIX			150
-#define BIO_C_SET_SUFFIX			151
-#define BIO_C_GET_SUFFIX			152
-
-#define BIO_C_SET_EX_ARG			153
-#define BIO_C_GET_EX_ARG			154
-
-#define BIO_set_app_data(s,arg)		BIO_set_ex_data(s,0,arg)
-#define BIO_get_app_data(s)		BIO_get_ex_data(s,0)
-
-/* BIO_s_connect() and BIO_s_socks4a_connect() */
-#define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0,(char *)name)
-#define BIO_set_conn_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)
-#define BIO_set_conn_ip(b,ip)	  BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)ip)
-#define BIO_set_conn_int_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,3,(char *)port)
-#define BIO_get_conn_hostname(b)  BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0)
-#define BIO_get_conn_port(b)      BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1)
-#define BIO_get_conn_ip(b) 		 BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2)
-#define BIO_get_conn_int_port(b) BIO_int_ctrl(b,BIO_C_GET_CONNECT,3,0)
-
-
-#define BIO_set_nbio(b,n)	BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
-
-/* BIO_s_accept_socket() */
-#define BIO_set_accept_port(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)
-#define BIO_get_accept_port(b)	BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0)
-/* #define BIO_set_nbio(b,n)	BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */
-#define BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(n)?(void *)"a":NULL)
-#define BIO_set_accept_bios(b,bio) BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(char *)bio)
-
-#define BIO_BIND_NORMAL			0
-#define BIO_BIND_REUSEADDR_IF_UNUSED	1
-#define BIO_BIND_REUSEADDR		2
-#define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL)
-#define BIO_get_bind_mode(b,mode) BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL)
-
-#define BIO_do_connect(b)	BIO_do_handshake(b)
-#define BIO_do_accept(b)	BIO_do_handshake(b)
-#define BIO_do_handshake(b)	BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL)
-
-/* BIO_s_proxy_client() */
-#define BIO_set_url(b,url)	BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,0,(char *)(url))
-#define BIO_set_proxies(b,p)	BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,1,(char *)(p))
-/* BIO_set_nbio(b,n) */
-#define BIO_set_filter_bio(b,s) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,2,(char *)(s))
-/* BIO *BIO_get_filter_bio(BIO *bio); */
-#define BIO_set_proxy_cb(b,cb) BIO_callback_ctrl(b,BIO_C_SET_PROXY_PARAM,3,(void *(*cb)()))
-#define BIO_set_proxy_header(b,sk) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,4,(char *)sk)
-#define BIO_set_no_connect_return(b,bool) BIO_int_ctrl(b,BIO_C_SET_PROXY_PARAM,5,bool)
-
-#define BIO_get_proxy_header(b,skp) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,0,(char *)skp)
-#define BIO_get_proxies(b,pxy_p) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,1,(char *)(pxy_p))
-#define BIO_get_url(b,url)	BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,2,(char *)(url))
-#define BIO_get_no_connect_return(b)	BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,5,NULL)
-
-#define BIO_set_fd(b,fd,c)	BIO_int_ctrl(b,BIO_C_SET_FD,c,fd)
-#define BIO_get_fd(b,c)		BIO_ctrl(b,BIO_C_GET_FD,0,(char *)c)
-
-#define BIO_set_fp(b,fp,c)	BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp)
-#define BIO_get_fp(b,fpp)	BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp)
-
-#define BIO_seek(b,ofs)	(int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL)
-#define BIO_tell(b)	(int)BIO_ctrl(b,BIO_C_FILE_TELL,0,NULL)
-
-/* name is cast to lose const, but might be better to route through a function
-   so we can do it safely */
-#ifdef CONST_STRICT
-/* If you are wondering why this isn't defined, its because CONST_STRICT is
- * purely a compile-time kludge to allow const to be checked.
- */
-int BIO_read_filename(BIO *b,const char *name);
-#else
-#define BIO_read_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-		BIO_CLOSE|BIO_FP_READ,(char *)name)
-#endif
-#define BIO_write_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-		BIO_CLOSE|BIO_FP_WRITE,name)
-#define BIO_append_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-		BIO_CLOSE|BIO_FP_APPEND,name)
-#define BIO_rw_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-		BIO_CLOSE|BIO_FP_READ|BIO_FP_WRITE,name)
-
-/* WARNING WARNING, this ups the reference count on the read bio of the
- * SSL structure.  This is because the ssl read BIO is now pointed to by
- * the next_bio field in the bio.  So when you free the BIO, make sure
- * you are doing a BIO_free_all() to catch the underlying BIO. */
-#define BIO_set_ssl(b,ssl,c)	BIO_ctrl(b,BIO_C_SET_SSL,c,(char *)ssl)
-#define BIO_get_ssl(b,sslp)	BIO_ctrl(b,BIO_C_GET_SSL,0,(char *)sslp)
-#define BIO_set_ssl_mode(b,client)	BIO_ctrl(b,BIO_C_SSL_MODE,client,NULL)
-#define BIO_set_ssl_renegotiate_bytes(b,num) \
-	BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_BYTES,num,NULL);
-#define BIO_get_num_renegotiates(b) \
-	BIO_ctrl(b,BIO_C_GET_SSL_NUM_RENEGOTIATES,0,NULL);
-#define BIO_set_ssl_renegotiate_timeout(b,seconds) \
-	BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT,seconds,NULL);
-
-/* defined in evp.h */
-/* #define BIO_set_md(b,md)	BIO_ctrl(b,BIO_C_SET_MD,1,(char *)md) */
-
-#define BIO_get_mem_data(b,pp)	BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
-#define BIO_set_mem_buf(b,bm,c)	BIO_ctrl(b,BIO_C_SET_BUF_MEM,c,(char *)bm)
-#define BIO_get_mem_ptr(b,pp)	BIO_ctrl(b,BIO_C_GET_BUF_MEM_PTR,0,(char *)pp)
-#define BIO_set_mem_eof_return(b,v) \
-				BIO_ctrl(b,BIO_C_SET_BUF_MEM_EOF_RETURN,v,NULL)
-
-/* For the BIO_f_buffer() type */
-#define BIO_get_buffer_num_lines(b)	BIO_ctrl(b,BIO_C_GET_BUFF_NUM_LINES,0,NULL)
-#define BIO_set_buffer_size(b,size)	BIO_ctrl(b,BIO_C_SET_BUFF_SIZE,size,NULL)
-#define BIO_set_read_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,0)
-#define BIO_set_write_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,1)
-#define BIO_set_buffer_read_data(b,buf,num) BIO_ctrl(b,BIO_C_SET_BUFF_READ_DATA,num,buf)
-
-/* Don't use the next one unless you know what you are doing :-) */
-#define BIO_dup_state(b,ret)	BIO_ctrl(b,BIO_CTRL_DUP,0,(char *)(ret))
-
-#define BIO_reset(b)		(int)BIO_ctrl(b,BIO_CTRL_RESET,0,NULL)
-#define BIO_eof(b)		(int)BIO_ctrl(b,BIO_CTRL_EOF,0,NULL)
-#define BIO_set_close(b,c)	(int)BIO_ctrl(b,BIO_CTRL_SET_CLOSE,(c),NULL)
-#define BIO_get_close(b)	(int)BIO_ctrl(b,BIO_CTRL_GET_CLOSE,0,NULL)
-#define BIO_pending(b)		(int)BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
-#define BIO_wpending(b)		(int)BIO_ctrl(b,BIO_CTRL_WPENDING,0,NULL)
-/* ...pending macros have inappropriate return type */
-size_t BIO_ctrl_pending(BIO *b);
-size_t BIO_ctrl_wpending(BIO *b);
-#define BIO_flush(b)		(int)BIO_ctrl(b,BIO_CTRL_FLUSH,0,NULL)
-#define BIO_get_info_callback(b,cbp) (int)BIO_ctrl(b,BIO_CTRL_GET_CALLBACK,0, \
-						   cbp)
-#define BIO_set_info_callback(b,cb) (int)BIO_callback_ctrl(b,BIO_CTRL_SET_CALLBACK,cb)
-
-/* For the BIO_f_buffer() type */
-#define BIO_buffer_get_num_lines(b) BIO_ctrl(b,BIO_CTRL_GET,0,NULL)
-
-/* For BIO_s_bio() */
-#define BIO_set_write_buf_size(b,size) (int)BIO_ctrl(b,BIO_C_SET_WRITE_BUF_SIZE,size,NULL)
-#define BIO_get_write_buf_size(b,size) (size_t)BIO_ctrl(b,BIO_C_GET_WRITE_BUF_SIZE,size,NULL)
-#define BIO_make_bio_pair(b1,b2)   (int)BIO_ctrl(b1,BIO_C_MAKE_BIO_PAIR,0,b2)
-#define BIO_destroy_bio_pair(b)    (int)BIO_ctrl(b,BIO_C_DESTROY_BIO_PAIR,0,NULL)
-#define BIO_shutdown_wr(b) (int)BIO_ctrl(b, BIO_C_SHUTDOWN_WR, 0, NULL)
-/* macros with inappropriate type -- but ...pending macros use int too: */
-#define BIO_get_write_guarantee(b) (int)BIO_ctrl(b,BIO_C_GET_WRITE_GUARANTEE,0,NULL)
-#define BIO_get_read_request(b)    (int)BIO_ctrl(b,BIO_C_GET_READ_REQUEST,0,NULL)
-size_t BIO_ctrl_get_write_guarantee(BIO *b);
-size_t BIO_ctrl_get_read_request(BIO *b);
-int BIO_ctrl_reset_read_request(BIO *b);
-
-/* ctrl macros for dgram */
-#define BIO_ctrl_dgram_connect(b,peer)  \
-                     (int)BIO_ctrl(b,BIO_CTRL_DGRAM_CONNECT,0, (char *)peer)
-#define BIO_ctrl_set_connected(b, state, peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_CONNECTED, state, (char *)peer)
-#define BIO_dgram_recv_timedout(b) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP, 0, NULL)
-#define BIO_dgram_send_timedout(b) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP, 0, NULL)
-#define BIO_dgram_get_peer(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_PEER, 0, (char *)peer)
-#define BIO_dgram_set_peer(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, (char *)peer)
-
-/* These two aren't currently implemented */
-/* int BIO_get_ex_num(BIO *bio); */
-/* void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)()); */
-int BIO_set_ex_data(BIO *bio,int idx,void *data);
-void *BIO_get_ex_data(BIO *bio,int idx);
-int BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-unsigned long BIO_number_read(BIO *bio);
-unsigned long BIO_number_written(BIO *bio);
-
-/* For BIO_f_asn1() */
-int BIO_asn1_set_prefix(BIO *b, asn1_ps_func *prefix,
-					asn1_ps_func *prefix_free);
-int BIO_asn1_get_prefix(BIO *b, asn1_ps_func **pprefix,
-					asn1_ps_func **pprefix_free);
-int BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix,
-					asn1_ps_func *suffix_free);
-int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
-					asn1_ps_func **psuffix_free);
-
-# ifndef OPENSSL_NO_FP_API
-BIO_METHOD *BIO_s_file(void );
-BIO *BIO_new_file(const char *filename, const char *mode);
-BIO *BIO_new_fp(FILE *stream, int close_flag);
-# define BIO_s_file_internal	BIO_s_file
-# endif
-BIO *	BIO_new(BIO_METHOD *type);
-int	BIO_set(BIO *a,BIO_METHOD *type);
-int	BIO_free(BIO *a);
-void	BIO_vfree(BIO *a);
-int	BIO_read(BIO *b, void *data, int len);
-int	BIO_gets(BIO *bp,char *buf, int size);
-int	BIO_write(BIO *b, const void *data, int len);
-int	BIO_puts(BIO *bp,const char *buf);
-int	BIO_indent(BIO *b,int indent,int max);
-long	BIO_ctrl(BIO *bp,int cmd,long larg,void *parg);
-long BIO_callback_ctrl(BIO *b, int cmd, void (*fp)(struct bio_st *, int, const char *, int, long, long));
-char *	BIO_ptr_ctrl(BIO *bp,int cmd,long larg);
-long	BIO_int_ctrl(BIO *bp,int cmd,long larg,int iarg);
-BIO *	BIO_push(BIO *b,BIO *append);
-BIO *	BIO_pop(BIO *b);
-void	BIO_free_all(BIO *a);
-BIO *	BIO_find_type(BIO *b,int bio_type);
-BIO *	BIO_next(BIO *b);
-BIO *	BIO_get_retry_BIO(BIO *bio, int *reason);
-int	BIO_get_retry_reason(BIO *bio);
-BIO *	BIO_dup_chain(BIO *in);
-
-int BIO_nread0(BIO *bio, char **buf);
-int BIO_nread(BIO *bio, char **buf, int num);
-int BIO_nwrite0(BIO *bio, char **buf);
-int BIO_nwrite(BIO *bio, char **buf, int num);
-
-long BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi,
-	long argl,long ret);
-
-BIO_METHOD *BIO_s_mem(void);
-BIO *BIO_new_mem_buf(void *buf, int len);
-BIO_METHOD *BIO_s_socket(void);
-BIO_METHOD *BIO_s_connect(void);
-BIO_METHOD *BIO_s_accept(void);
-BIO_METHOD *BIO_s_fd(void);
-#ifndef OPENSSL_SYS_OS2
-BIO_METHOD *BIO_s_log(void);
-#endif
-BIO_METHOD *BIO_s_bio(void);
-BIO_METHOD *BIO_s_null(void);
-BIO_METHOD *BIO_f_null(void);
-BIO_METHOD *BIO_f_buffer(void);
-#ifdef OPENSSL_SYS_VMS
-BIO_METHOD *BIO_f_linebuffer(void);
-#endif
-BIO_METHOD *BIO_f_nbio_test(void);
-#ifndef OPENSSL_NO_DGRAM
-BIO_METHOD *BIO_s_datagram(void);
-#endif
-
-/* BIO_METHOD *BIO_f_ber(void); */
-
-int BIO_sock_should_retry(int i);
-int BIO_sock_non_fatal_error(int error);
-int BIO_dgram_non_fatal_error(int error);
-
-int BIO_fd_should_retry(int i);
-int BIO_fd_non_fatal_error(int error);
-int BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
-		void *u, const char *s, int len);
-int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
-		       void *u, const char *s, int len, int indent);
-int BIO_dump(BIO *b,const char *bytes,int len);
-int BIO_dump_indent(BIO *b,const char *bytes,int len,int indent);
-#ifndef OPENSSL_NO_FP_API
-int BIO_dump_fp(FILE *fp, const char *s, int len);
-int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent);
-#endif
-struct hostent *BIO_gethostbyname(const char *name);
-/* We might want a thread-safe interface too:
- * struct hostent *BIO_gethostbyname_r(const char *name,
- *     struct hostent *result, void *buffer, size_t buflen);
- * or something similar (caller allocates a struct hostent,
- * pointed to by "result", and additional buffer space for the various
- * substructures; if the buffer does not suffice, NULL is returned
- * and an appropriate error code is set).
- */
-int BIO_sock_error(int sock);
-int BIO_socket_ioctl(int fd, long type, void *arg);
-int BIO_socket_nbio(int fd,int mode);
-int BIO_get_port(const char *str, unsigned short *port_ptr);
-int BIO_get_host_ip(const char *str, unsigned char *ip);
-int BIO_get_accept_socket(char *host_port,int mode);
-int BIO_accept(int sock,char **ip_port);
-int BIO_sock_init(void );
-void BIO_sock_cleanup(void);
-int BIO_set_tcp_ndelay(int sock,int turn_on);
-
-BIO *BIO_new_socket(int sock, int close_flag);
-BIO *BIO_new_dgram(int fd, int close_flag);
-BIO *BIO_new_fd(int fd, int close_flag);
-BIO *BIO_new_connect(char *host_port);
-BIO *BIO_new_accept(char *host_port);
-
-int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
-	BIO **bio2, size_t writebuf2);
-/* If successful, returns 1 and in *bio1, *bio2 two BIO pair endpoints.
- * Otherwise returns 0 and sets *bio1 and *bio2 to NULL.
- * Size 0 uses default value.
- */
-
-void BIO_copy_next_retry(BIO *b);
-
-/*long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);*/
-
-#ifdef __GNUC__
-#  define __bio_h__attr__ __attribute__
-#else
-#  define __bio_h__attr__(x)
-#endif
-int BIO_printf(BIO *bio, const char *format, ...)
-	__bio_h__attr__((__format__(__printf__,2,3)));
-int BIO_vprintf(BIO *bio, const char *format, va_list args)
-	__bio_h__attr__((__format__(__printf__,2,0)));
-int BIO_snprintf(char *buf, size_t n, const char *format, ...)
-	__bio_h__attr__((__format__(__printf__,3,4)));
-int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
-	__bio_h__attr__((__format__(__printf__,3,0)));
-#undef __bio_h__attr__
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_BIO_strings(void);
-
-/* Error codes for the BIO functions. */
-
-/* Function codes. */
-#define BIO_F_ACPT_STATE				 100
-#define BIO_F_BIO_ACCEPT				 101
-#define BIO_F_BIO_BER_GET_HEADER			 102
-#define BIO_F_BIO_CALLBACK_CTRL				 131
-#define BIO_F_BIO_CTRL					 103
-#define BIO_F_BIO_GETHOSTBYNAME				 120
-#define BIO_F_BIO_GETS					 104
-#define BIO_F_BIO_GET_ACCEPT_SOCKET			 105
-#define BIO_F_BIO_GET_HOST_IP				 106
-#define BIO_F_BIO_GET_PORT				 107
-#define BIO_F_BIO_MAKE_PAIR				 121
-#define BIO_F_BIO_NEW					 108
-#define BIO_F_BIO_NEW_FILE				 109
-#define BIO_F_BIO_NEW_MEM_BUF				 126
-#define BIO_F_BIO_NREAD					 123
-#define BIO_F_BIO_NREAD0				 124
-#define BIO_F_BIO_NWRITE				 125
-#define BIO_F_BIO_NWRITE0				 122
-#define BIO_F_BIO_PUTS					 110
-#define BIO_F_BIO_READ					 111
-#define BIO_F_BIO_SOCK_INIT				 112
-#define BIO_F_BIO_WRITE					 113
-#define BIO_F_BUFFER_CTRL				 114
-#define BIO_F_CONN_CTRL					 127
-#define BIO_F_CONN_STATE				 115
-#define BIO_F_FILE_CTRL					 116
-#define BIO_F_FILE_READ					 130
-#define BIO_F_LINEBUFFER_CTRL				 129
-#define BIO_F_MEM_READ					 128
-#define BIO_F_MEM_WRITE					 117
-#define BIO_F_SSL_NEW					 118
-#define BIO_F_WSASTARTUP				 119
-
-/* Reason codes. */
-#define BIO_R_ACCEPT_ERROR				 100
-#define BIO_R_BAD_FOPEN_MODE				 101
-#define BIO_R_BAD_HOSTNAME_LOOKUP			 102
-#define BIO_R_BROKEN_PIPE				 124
-#define BIO_R_CONNECT_ERROR				 103
-#define BIO_R_EOF_ON_MEMORY_BIO				 127
-#define BIO_R_ERROR_SETTING_NBIO			 104
-#define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET	 105
-#define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET	 106
-#define BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET		 107
-#define BIO_R_INVALID_ARGUMENT				 125
-#define BIO_R_INVALID_IP_ADDRESS			 108
-#define BIO_R_IN_USE					 123
-#define BIO_R_KEEPALIVE					 109
-#define BIO_R_NBIO_CONNECT_ERROR			 110
-#define BIO_R_NO_ACCEPT_PORT_SPECIFIED			 111
-#define BIO_R_NO_HOSTNAME_SPECIFIED			 112
-#define BIO_R_NO_PORT_DEFINED				 113
-#define BIO_R_NO_PORT_SPECIFIED				 114
-#define BIO_R_NO_SUCH_FILE				 128
-#define BIO_R_NULL_PARAMETER				 115
-#define BIO_R_TAG_MISMATCH				 116
-#define BIO_R_UNABLE_TO_BIND_SOCKET			 117
-#define BIO_R_UNABLE_TO_CREATE_SOCKET			 118
-#define BIO_R_UNABLE_TO_LISTEN_SOCKET			 119
-#define BIO_R_UNINITIALIZED				 120
-#define BIO_R_UNSUPPORTED_METHOD			 121
-#define BIO_R_WRITE_TO_READ_ONLY_BIO			 126
-#define BIO_R_WSASTARTUP				 122
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/blowfish.h b/dep/include/openssl/blowfish.h
deleted file mode 100644
index b97e76f9a..000000000
--- a/dep/include/openssl/blowfish.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* crypto/bf/blowfish.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_BLOWFISH_H
-#define HEADER_BLOWFISH_H
-
-#include <openssl/e_os2.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef OPENSSL_NO_BF
-#error BF is disabled.
-#endif
-
-#define BF_ENCRYPT	1
-#define BF_DECRYPT	0
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! BF_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! BF_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-#if defined(__LP32__)
-#define BF_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#define BF_LONG unsigned long
-#define BF_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *					<appro@fy.chalmers.se>
- */
-#else
-#define BF_LONG unsigned int
-#endif
-
-#define BF_ROUNDS	16
-#define BF_BLOCK	8
-
-typedef struct bf_key_st
-	{
-	BF_LONG P[BF_ROUNDS+2];
-	BF_LONG S[4*256];
-	} BF_KEY;
-
- 
-void BF_set_key(BF_KEY *key, int len, const unsigned char *data);
-
-void BF_encrypt(BF_LONG *data,const BF_KEY *key);
-void BF_decrypt(BF_LONG *data,const BF_KEY *key);
-
-void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
-	const BF_KEY *key, int enc);
-void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-	const BF_KEY *schedule, unsigned char *ivec, int enc);
-void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length,
-	const BF_KEY *schedule, unsigned char *ivec, int *num, int enc);
-void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length,
-	const BF_KEY *schedule, unsigned char *ivec, int *num);
-const char *BF_options(void);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/bn.h b/dep/include/openssl/bn.h
deleted file mode 100644
index e484b7fc1..000000000
--- a/dep/include/openssl/bn.h
+++ /dev/null
@@ -1,858 +0,0 @@
-/* crypto/bn/bn.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by 
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the Eric Young open source
- * license provided above.
- *
- * The binary polynomial arithmetic software is originally written by 
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-#ifndef HEADER_BN_H
-#define HEADER_BN_H
-
-#include <openssl/e_os2.h>
-#ifndef OPENSSL_NO_FP_API
-#include <stdio.h> /* FILE */
-#endif
-#include <openssl/ossl_typ.h>
-#include <openssl/crypto.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* These preprocessor symbols control various aspects of the bignum headers and
- * library code. They're not defined by any "normal" configuration, as they are
- * intended for development and testing purposes. NB: defining all three can be
- * useful for debugging application code as well as openssl itself.
- *
- * BN_DEBUG - turn on various debugging alterations to the bignum code
- * BN_DEBUG_RAND - uses random poisoning of unused words to trip up
- * mismanagement of bignum internals. You must also define BN_DEBUG.
- */
-/* #define BN_DEBUG */
-/* #define BN_DEBUG_RAND */
-
-#ifndef OPENSSL_SMALL_FOOTPRINT
-#define BN_MUL_COMBA
-#define BN_SQR_COMBA
-#define BN_RECURSION
-#endif
-
-/* This next option uses the C libraries (2 word)/(1 word) function.
- * If it is not defined, I use my C version (which is slower).
- * The reason for this flag is that when the particular C compiler
- * library routine is used, and the library is linked with a different
- * compiler, the library is missing.  This mostly happens when the
- * library is built with gcc and then linked using normal cc.  This would
- * be a common occurrence because gcc normally produces code that is
- * 2 times faster than system compilers for the big number stuff.
- * For machines with only one compiler (or shared libraries), this should
- * be on.  Again this in only really a problem on machines
- * using "long long's", are 32bit, and are not using my assembler code. */
-#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || \
-    defined(OPENSSL_SYS_WIN32) || defined(linux)
-# ifndef BN_DIV2W
-#  define BN_DIV2W
-# endif
-#endif
-
-/* assuming long is 64bit - this is the DEC Alpha
- * unsigned long long is only 64 bits :-(, don't define
- * BN_LLONG for the DEC Alpha */
-#ifdef SIXTY_FOUR_BIT_LONG
-#define BN_ULLONG	unsigned long long
-#define BN_ULONG	unsigned long
-#define BN_LONG		long
-#define BN_BITS		128
-#define BN_BYTES	8
-#define BN_BITS2	64
-#define BN_BITS4	32
-#define BN_MASK		(0xffffffffffffffffffffffffffffffffLL)
-#define BN_MASK2	(0xffffffffffffffffL)
-#define BN_MASK2l	(0xffffffffL)
-#define BN_MASK2h	(0xffffffff00000000L)
-#define BN_MASK2h1	(0xffffffff80000000L)
-#define BN_TBIT		(0x8000000000000000L)
-#define BN_DEC_CONV	(10000000000000000000UL)
-#define BN_DEC_FMT1	"%lu"
-#define BN_DEC_FMT2	"%019lu"
-#define BN_DEC_NUM	19
-#define BN_HEX_FMT1	"%lX"
-#define BN_HEX_FMT2	"%016lX"
-#endif
-
-/* This is where the long long data type is 64 bits, but long is 32.
- * For machines where there are 64bit registers, this is the mode to use.
- * IRIX, on R4000 and above should use this mode, along with the relevant
- * assembler code :-).  Do NOT define BN_LLONG.
- */
-#ifdef SIXTY_FOUR_BIT
-#undef BN_LLONG
-#undef BN_ULLONG
-#define BN_ULONG	unsigned long long
-#define BN_LONG		long long
-#define BN_BITS		128
-#define BN_BYTES	8
-#define BN_BITS2	64
-#define BN_BITS4	32
-#define BN_MASK2	(0xffffffffffffffffLL)
-#define BN_MASK2l	(0xffffffffL)
-#define BN_MASK2h	(0xffffffff00000000LL)
-#define BN_MASK2h1	(0xffffffff80000000LL)
-#define BN_TBIT		(0x8000000000000000LL)
-#define BN_DEC_CONV	(10000000000000000000ULL)
-#define BN_DEC_FMT1	"%llu"
-#define BN_DEC_FMT2	"%019llu"
-#define BN_DEC_NUM	19
-#define BN_HEX_FMT1	"%llX"
-#define BN_HEX_FMT2	"%016llX"
-#endif
-
-#ifdef THIRTY_TWO_BIT
-#ifdef BN_LLONG
-# if defined(_WIN32) && !defined(__GNUC__)
-#  define BN_ULLONG	unsigned __int64
-#  define BN_MASK	(0xffffffffffffffffI64)
-# else
-#  define BN_ULLONG	unsigned long long
-#  define BN_MASK	(0xffffffffffffffffLL)
-# endif
-#endif
-#define BN_ULONG	unsigned int
-#define BN_LONG		int
-#define BN_BITS		64
-#define BN_BYTES	4
-#define BN_BITS2	32
-#define BN_BITS4	16
-#define BN_MASK2	(0xffffffffL)
-#define BN_MASK2l	(0xffff)
-#define BN_MASK2h1	(0xffff8000L)
-#define BN_MASK2h	(0xffff0000L)
-#define BN_TBIT		(0x80000000L)
-#define BN_DEC_CONV	(1000000000L)
-#define BN_DEC_FMT1	"%u"
-#define BN_DEC_FMT2	"%09u"
-#define BN_DEC_NUM	9
-#define BN_HEX_FMT1	"%X"
-#define BN_HEX_FMT2	"%08X"
-#endif
-
-#define BN_DEFAULT_BITS	1280
-
-#define BN_FLG_MALLOCED		0x01
-#define BN_FLG_STATIC_DATA	0x02
-#define BN_FLG_CONSTTIME	0x04 /* avoid leaking exponent information through timing,
-                                      * BN_mod_exp_mont() will call BN_mod_exp_mont_consttime,
-                                      * BN_div() will call BN_div_no_branch,
-                                      * BN_mod_inverse() will call BN_mod_inverse_no_branch.
-                                      */
-
-#ifndef OPENSSL_NO_DEPRECATED
-#define BN_FLG_EXP_CONSTTIME BN_FLG_CONSTTIME /* deprecated name for the flag */
-                                      /* avoid leaking exponent information through timings
-                                      * (BN_mod_exp_mont() will call BN_mod_exp_mont_consttime) */
-#endif
-
-#ifndef OPENSSL_NO_DEPRECATED
-#define BN_FLG_FREE		0x8000	/* used for debuging */
-#endif
-#define BN_set_flags(b,n)	((b)->flags|=(n))
-#define BN_get_flags(b,n)	((b)->flags&(n))
-
-/* get a clone of a BIGNUM with changed flags, for *temporary* use only
- * (the two BIGNUMs cannot not be used in parallel!) */
-#define BN_with_flags(dest,b,n)  ((dest)->d=(b)->d, \
-                                  (dest)->top=(b)->top, \
-                                  (dest)->dmax=(b)->dmax, \
-                                  (dest)->neg=(b)->neg, \
-                                  (dest)->flags=(((dest)->flags & BN_FLG_MALLOCED) \
-                                                 |  ((b)->flags & ~BN_FLG_MALLOCED) \
-                                                 |  BN_FLG_STATIC_DATA \
-                                                 |  (n)))
-
-/* Already declared in ossl_typ.h */
-#if 0
-typedef struct bignum_st BIGNUM;
-/* Used for temp variables (declaration hidden in bn_lcl.h) */
-typedef struct bignum_ctx BN_CTX;
-typedef struct bn_blinding_st BN_BLINDING;
-typedef struct bn_mont_ctx_st BN_MONT_CTX;
-typedef struct bn_recp_ctx_st BN_RECP_CTX;
-typedef struct bn_gencb_st BN_GENCB;
-#endif
-
-struct bignum_st
-	{
-	BN_ULONG *d;	/* Pointer to an array of 'BN_BITS2' bit chunks. */
-	int top;	/* Index of last used d +1. */
-	/* The next are internal book keeping for bn_expand. */
-	int dmax;	/* Size of the d array. */
-	int neg;	/* one if the number is negative */
-	int flags;
-	};
-
-/* Used for montgomery multiplication */
-struct bn_mont_ctx_st
-	{
-	int ri;        /* number of bits in R */
-	BIGNUM RR;     /* used to convert to montgomery form */
-	BIGNUM N;      /* The modulus */
-	BIGNUM Ni;     /* R*(1/R mod N) - N*Ni = 1
-	                * (Ni is only stored for bignum algorithm) */
-	BN_ULONG n0[2];/* least significant word(s) of Ni;
-	                  (type changed with 0.9.9, was "BN_ULONG n0;" before) */
-	int flags;
-	};
-
-/* Used for reciprocal division/mod functions
- * It cannot be shared between threads
- */
-struct bn_recp_ctx_st
-	{
-	BIGNUM N;	/* the divisor */
-	BIGNUM Nr;	/* the reciprocal */
-	int num_bits;
-	int shift;
-	int flags;
-	};
-
-/* Used for slow "generation" functions. */
-struct bn_gencb_st
-	{
-	unsigned int ver;	/* To handle binary (in)compatibility */
-	void *arg;		/* callback-specific data */
-	union
-		{
-		/* if(ver==1) - handles old style callbacks */
-		void (*cb_1)(int, int, void *);
-		/* if(ver==2) - new callback style */
-		int (*cb_2)(int, int, BN_GENCB *);
-		} cb;
-	};
-/* Wrapper function to make using BN_GENCB easier,  */
-int BN_GENCB_call(BN_GENCB *cb, int a, int b);
-/* Macro to populate a BN_GENCB structure with an "old"-style callback */
-#define BN_GENCB_set_old(gencb, callback, cb_arg) { \
-		BN_GENCB *tmp_gencb = (gencb); \
-		tmp_gencb->ver = 1; \
-		tmp_gencb->arg = (cb_arg); \
-		tmp_gencb->cb.cb_1 = (callback); }
-/* Macro to populate a BN_GENCB structure with a "new"-style callback */
-#define BN_GENCB_set(gencb, callback, cb_arg) { \
-		BN_GENCB *tmp_gencb = (gencb); \
-		tmp_gencb->ver = 2; \
-		tmp_gencb->arg = (cb_arg); \
-		tmp_gencb->cb.cb_2 = (callback); }
-
-#define BN_prime_checks 0 /* default: select number of iterations
-			     based on the size of the number */
-
-/* number of Miller-Rabin iterations for an error rate  of less than 2^-80
- * for random 'b'-bit input, b >= 100 (taken from table 4.4 in the Handbook
- * of Applied Cryptography [Menezes, van Oorschot, Vanstone; CRC Press 1996];
- * original paper: Damgaard, Landrock, Pomerance: Average case error estimates
- * for the strong probable prime test. -- Math. Comp. 61 (1993) 177-194) */
-#define BN_prime_checks_for_size(b) ((b) >= 1300 ?  2 : \
-                                (b) >=  850 ?  3 : \
-                                (b) >=  650 ?  4 : \
-                                (b) >=  550 ?  5 : \
-                                (b) >=  450 ?  6 : \
-                                (b) >=  400 ?  7 : \
-                                (b) >=  350 ?  8 : \
-                                (b) >=  300 ?  9 : \
-                                (b) >=  250 ? 12 : \
-                                (b) >=  200 ? 15 : \
-                                (b) >=  150 ? 18 : \
-                                /* b >= 100 */ 27)
-
-#define BN_num_bytes(a)	((BN_num_bits(a)+7)/8)
-
-/* Note that BN_abs_is_word didn't work reliably for w == 0 until 0.9.8 */
-#define BN_abs_is_word(a,w) ((((a)->top == 1) && ((a)->d[0] == (BN_ULONG)(w))) || \
-				(((w) == 0) && ((a)->top == 0)))
-#define BN_is_zero(a)       ((a)->top == 0)
-#define BN_is_one(a)        (BN_abs_is_word((a),1) && !(a)->neg)
-#define BN_is_word(a,w)     (BN_abs_is_word((a),(w)) && (!(w) || !(a)->neg))
-#define BN_is_odd(a)	    (((a)->top > 0) && ((a)->d[0] & 1))
-
-#define BN_one(a)	(BN_set_word((a),1))
-#define BN_zero_ex(a) \
-	do { \
-		BIGNUM *_tmp_bn = (a); \
-		_tmp_bn->top = 0; \
-		_tmp_bn->neg = 0; \
-	} while(0)
-#ifdef OPENSSL_NO_DEPRECATED
-#define BN_zero(a)	BN_zero_ex(a)
-#else
-#define BN_zero(a)	(BN_set_word((a),0))
-#endif
-
-const BIGNUM *BN_value_one(void);
-char *	BN_options(void);
-BN_CTX *BN_CTX_new(void);
-#ifndef OPENSSL_NO_DEPRECATED
-void	BN_CTX_init(BN_CTX *c);
-#endif
-void	BN_CTX_free(BN_CTX *c);
-void	BN_CTX_start(BN_CTX *ctx);
-BIGNUM *BN_CTX_get(BN_CTX *ctx);
-void	BN_CTX_end(BN_CTX *ctx);
-int     BN_rand(BIGNUM *rnd, int bits, int top,int bottom);
-int     BN_pseudo_rand(BIGNUM *rnd, int bits, int top,int bottom);
-int	BN_rand_range(BIGNUM *rnd, const BIGNUM *range);
-int	BN_pseudo_rand_range(BIGNUM *rnd, const BIGNUM *range);
-int	BN_num_bits(const BIGNUM *a);
-int	BN_num_bits_word(BN_ULONG);
-BIGNUM *BN_new(void);
-void	BN_init(BIGNUM *);
-void	BN_clear_free(BIGNUM *a);
-BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b);
-void	BN_swap(BIGNUM *a, BIGNUM *b);
-BIGNUM *BN_bin2bn(const unsigned char *s,int len,BIGNUM *ret);
-int	BN_bn2bin(const BIGNUM *a, unsigned char *to);
-BIGNUM *BN_mpi2bn(const unsigned char *s,int len,BIGNUM *ret);
-int	BN_bn2mpi(const BIGNUM *a, unsigned char *to);
-int	BN_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int	BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int	BN_uadd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int	BN_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int	BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-int	BN_sqr(BIGNUM *r, const BIGNUM *a,BN_CTX *ctx);
-/** BN_set_negative sets sign of a BIGNUM
- * \param  b  pointer to the BIGNUM object
- * \param  n  0 if the BIGNUM b should be positive and a value != 0 otherwise 
- */
-void	BN_set_negative(BIGNUM *b, int n);
-/** BN_is_negative returns 1 if the BIGNUM is negative
- * \param  a  pointer to the BIGNUM object
- * \return 1 if a < 0 and 0 otherwise
- */
-#define BN_is_negative(a) ((a)->neg != 0)
-
-int	BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
-	BN_CTX *ctx);
-#define BN_mod(rem,m,d,ctx) BN_div(NULL,(rem),(m),(d),(ctx))
-int	BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx);
-int	BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-int	BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m);
-int	BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-int	BN_mod_sub_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m);
-int	BN_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-	const BIGNUM *m, BN_CTX *ctx);
-int	BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-int	BN_mod_lshift1(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-int	BN_mod_lshift1_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *m);
-int	BN_mod_lshift(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m, BN_CTX *ctx);
-int	BN_mod_lshift_quick(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m);
-
-BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w);
-BN_ULONG BN_div_word(BIGNUM *a, BN_ULONG w);
-int	BN_mul_word(BIGNUM *a, BN_ULONG w);
-int	BN_add_word(BIGNUM *a, BN_ULONG w);
-int	BN_sub_word(BIGNUM *a, BN_ULONG w);
-int	BN_set_word(BIGNUM *a, BN_ULONG w);
-BN_ULONG BN_get_word(const BIGNUM *a);
-
-int	BN_cmp(const BIGNUM *a, const BIGNUM *b);
-void	BN_free(BIGNUM *a);
-int	BN_is_bit_set(const BIGNUM *a, int n);
-int	BN_lshift(BIGNUM *r, const BIGNUM *a, int n);
-int	BN_lshift1(BIGNUM *r, const BIGNUM *a);
-int	BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,BN_CTX *ctx);
-
-int	BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-	const BIGNUM *m,BN_CTX *ctx);
-int	BN_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-	const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
-	const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont);
-int	BN_mod_exp_mont_word(BIGNUM *r, BN_ULONG a, const BIGNUM *p,
-	const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int	BN_mod_exp2_mont(BIGNUM *r, const BIGNUM *a1, const BIGNUM *p1,
-	const BIGNUM *a2, const BIGNUM *p2,const BIGNUM *m,
-	BN_CTX *ctx,BN_MONT_CTX *m_ctx);
-int	BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-	const BIGNUM *m,BN_CTX *ctx);
-
-int	BN_mask_bits(BIGNUM *a,int n);
-#ifndef OPENSSL_NO_FP_API
-int	BN_print_fp(FILE *fp, const BIGNUM *a);
-#endif
-#ifdef HEADER_BIO_H
-int	BN_print(BIO *fp, const BIGNUM *a);
-#else
-int	BN_print(void *fp, const BIGNUM *a);
-#endif
-int	BN_reciprocal(BIGNUM *r, const BIGNUM *m, int len, BN_CTX *ctx);
-int	BN_rshift(BIGNUM *r, const BIGNUM *a, int n);
-int	BN_rshift1(BIGNUM *r, const BIGNUM *a);
-void	BN_clear(BIGNUM *a);
-BIGNUM *BN_dup(const BIGNUM *a);
-int	BN_ucmp(const BIGNUM *a, const BIGNUM *b);
-int	BN_set_bit(BIGNUM *a, int n);
-int	BN_clear_bit(BIGNUM *a, int n);
-char *	BN_bn2hex(const BIGNUM *a);
-char *	BN_bn2dec(const BIGNUM *a);
-int 	BN_hex2bn(BIGNUM **a, const char *str);
-int 	BN_dec2bn(BIGNUM **a, const char *str);
-int	BN_asc2bn(BIGNUM **a, const char *str);
-int	BN_gcd(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,BN_CTX *ctx);
-int	BN_kronecker(const BIGNUM *a,const BIGNUM *b,BN_CTX *ctx); /* returns -2 for error */
-BIGNUM *BN_mod_inverse(BIGNUM *ret,
-	const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx);
-BIGNUM *BN_mod_sqrt(BIGNUM *ret,
-	const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx);
-
-/* Deprecated versions */
-#ifndef OPENSSL_NO_DEPRECATED
-BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int safe,
-	const BIGNUM *add, const BIGNUM *rem,
-	void (*callback)(int,int,void *),void *cb_arg);
-int	BN_is_prime(const BIGNUM *p,int nchecks,
-	void (*callback)(int,int,void *),
-	BN_CTX *ctx,void *cb_arg);
-int	BN_is_prime_fasttest(const BIGNUM *p,int nchecks,
-	void (*callback)(int,int,void *),BN_CTX *ctx,void *cb_arg,
-	int do_trial_division);
-#endif /* !defined(OPENSSL_NO_DEPRECATED) */
-
-/* Newer versions */
-int	BN_generate_prime_ex(BIGNUM *ret,int bits,int safe, const BIGNUM *add,
-		const BIGNUM *rem, BN_GENCB *cb);
-int	BN_is_prime_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx, BN_GENCB *cb);
-int	BN_is_prime_fasttest_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx,
-		int do_trial_division, BN_GENCB *cb);
-
-BN_MONT_CTX *BN_MONT_CTX_new(void );
-void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
-int BN_mod_mul_montgomery(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,
-	BN_MONT_CTX *mont, BN_CTX *ctx);
-#define BN_to_montgomery(r,a,mont,ctx)	BN_mod_mul_montgomery(\
-	(r),(a),&((mont)->RR),(mont),(ctx))
-int BN_from_montgomery(BIGNUM *r,const BIGNUM *a,
-	BN_MONT_CTX *mont, BN_CTX *ctx);
-void BN_MONT_CTX_free(BN_MONT_CTX *mont);
-int BN_MONT_CTX_set(BN_MONT_CTX *mont,const BIGNUM *mod,BN_CTX *ctx);
-BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to,BN_MONT_CTX *from);
-BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,
-					const BIGNUM *mod, BN_CTX *ctx);
-
-/* BN_BLINDING flags */
-#define	BN_BLINDING_NO_UPDATE	0x00000001
-#define	BN_BLINDING_NO_RECREATE	0x00000002
-
-BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod);
-void BN_BLINDING_free(BN_BLINDING *b);
-int BN_BLINDING_update(BN_BLINDING *b,BN_CTX *ctx);
-int BN_BLINDING_convert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
-int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
-int BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *);
-int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *);
-#ifndef OPENSSL_NO_DEPRECATED
-unsigned long BN_BLINDING_get_thread_id(const BN_BLINDING *);
-void BN_BLINDING_set_thread_id(BN_BLINDING *, unsigned long);
-#endif
-CRYPTO_THREADID *BN_BLINDING_thread_id(BN_BLINDING *);
-unsigned long BN_BLINDING_get_flags(const BN_BLINDING *);
-void BN_BLINDING_set_flags(BN_BLINDING *, unsigned long);
-BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
-	const BIGNUM *e, BIGNUM *m, BN_CTX *ctx,
-	int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-			  const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx),
-	BN_MONT_CTX *m_ctx);
-
-#ifndef OPENSSL_NO_DEPRECATED
-void BN_set_params(int mul,int high,int low,int mont);
-int BN_get_params(int which); /* 0, mul, 1 high, 2 low, 3 mont */
-#endif
-
-void	BN_RECP_CTX_init(BN_RECP_CTX *recp);
-BN_RECP_CTX *BN_RECP_CTX_new(void);
-void	BN_RECP_CTX_free(BN_RECP_CTX *recp);
-int	BN_RECP_CTX_set(BN_RECP_CTX *recp,const BIGNUM *rdiv,BN_CTX *ctx);
-int	BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *x, const BIGNUM *y,
-	BN_RECP_CTX *recp,BN_CTX *ctx);
-int	BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-	const BIGNUM *m, BN_CTX *ctx);
-int	BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
-	BN_RECP_CTX *recp, BN_CTX *ctx);
-
-/* Functions for arithmetic over binary polynomials represented by BIGNUMs. 
- *
- * The BIGNUM::neg property of BIGNUMs representing binary polynomials is
- * ignored.
- *
- * Note that input arguments are not const so that their bit arrays can
- * be expanded to the appropriate size if needed.
- */
-
-int	BN_GF2m_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b); /*r = a + b*/
-#define BN_GF2m_sub(r, a, b) BN_GF2m_add(r, a, b)
-int	BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p); /*r=a mod p*/
-int	BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-	const BIGNUM *p, BN_CTX *ctx); /* r = (a * b) mod p */
-int	BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-	BN_CTX *ctx); /* r = (a * a) mod p */
-int	BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *b, const BIGNUM *p,
-	BN_CTX *ctx); /* r = (1 / b) mod p */
-int	BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-	const BIGNUM *p, BN_CTX *ctx); /* r = (a / b) mod p */
-int	BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-	const BIGNUM *p, BN_CTX *ctx); /* r = (a ^ b) mod p */
-int	BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-	BN_CTX *ctx); /* r = sqrt(a) mod p */
-int	BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-	BN_CTX *ctx); /* r^2 + r = a mod p */
-#define BN_GF2m_cmp(a, b) BN_ucmp((a), (b))
-/* Some functions allow for representation of the irreducible polynomials
- * as an unsigned int[], say p.  The irreducible f(t) is then of the form:
- *     t^p[0] + t^p[1] + ... + t^p[k]
- * where m = p[0] > p[1] > ... > p[k] = 0.
- */
-int	BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const int p[]);
-	/* r = a mod p */
-int	BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-	const int p[], BN_CTX *ctx); /* r = (a * b) mod p */
-int	BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const int p[],
-	BN_CTX *ctx); /* r = (a * a) mod p */
-int	BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *b, const int p[],
-	BN_CTX *ctx); /* r = (1 / b) mod p */
-int	BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-	const int p[], BN_CTX *ctx); /* r = (a / b) mod p */
-int	BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-	const int p[], BN_CTX *ctx); /* r = (a ^ b) mod p */
-int	BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a,
-	const int p[], BN_CTX *ctx); /* r = sqrt(a) mod p */
-int	BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a,
-	const int p[], BN_CTX *ctx); /* r^2 + r = a mod p */
-int	BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max);
-int	BN_GF2m_arr2poly(const int p[], BIGNUM *a);
-
-/* faster mod functions for the 'NIST primes' 
- * 0 <= a < p^2 */
-int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-
-const BIGNUM *BN_get0_nist_prime_192(void);
-const BIGNUM *BN_get0_nist_prime_224(void);
-const BIGNUM *BN_get0_nist_prime_256(void);
-const BIGNUM *BN_get0_nist_prime_384(void);
-const BIGNUM *BN_get0_nist_prime_521(void);
-
-/* library internal functions */
-
-#define bn_expand(a,bits) ((((((bits+BN_BITS2-1))/BN_BITS2)) <= (a)->dmax)?\
-	(a):bn_expand2((a),(bits+BN_BITS2-1)/BN_BITS2))
-#define bn_wexpand(a,words) (((words) <= (a)->dmax)?(a):bn_expand2((a),(words)))
-BIGNUM *bn_expand2(BIGNUM *a, int words);
-#ifndef OPENSSL_NO_DEPRECATED
-BIGNUM *bn_dup_expand(const BIGNUM *a, int words); /* unused */
-#endif
-
-/* Bignum consistency macros
- * There is one "API" macro, bn_fix_top(), for stripping leading zeroes from
- * bignum data after direct manipulations on the data. There is also an
- * "internal" macro, bn_check_top(), for verifying that there are no leading
- * zeroes. Unfortunately, some auditing is required due to the fact that
- * bn_fix_top() has become an overabused duct-tape because bignum data is
- * occasionally passed around in an inconsistent state. So the following
- * changes have been made to sort this out;
- * - bn_fix_top()s implementation has been moved to bn_correct_top()
- * - if BN_DEBUG isn't defined, bn_fix_top() maps to bn_correct_top(), and
- *   bn_check_top() is as before.
- * - if BN_DEBUG *is* defined;
- *   - bn_check_top() tries to pollute unused words even if the bignum 'top' is
- *     consistent. (ed: only if BN_DEBUG_RAND is defined)
- *   - bn_fix_top() maps to bn_check_top() rather than "fixing" anything.
- * The idea is to have debug builds flag up inconsistent bignums when they
- * occur. If that occurs in a bn_fix_top(), we examine the code in question; if
- * the use of bn_fix_top() was appropriate (ie. it follows directly after code
- * that manipulates the bignum) it is converted to bn_correct_top(), and if it
- * was not appropriate, we convert it permanently to bn_check_top() and track
- * down the cause of the bug. Eventually, no internal code should be using the
- * bn_fix_top() macro. External applications and libraries should try this with
- * their own code too, both in terms of building against the openssl headers
- * with BN_DEBUG defined *and* linking with a version of OpenSSL built with it
- * defined. This not only improves external code, it provides more test
- * coverage for openssl's own code.
- */
-
-#ifdef BN_DEBUG
-
-/* We only need assert() when debugging */
-#include <assert.h>
-
-#ifdef BN_DEBUG_RAND
-/* To avoid "make update" cvs wars due to BN_DEBUG, use some tricks */
-#ifndef RAND_pseudo_bytes
-int RAND_pseudo_bytes(unsigned char *buf,int num);
-#define BN_DEBUG_TRIX
-#endif
-#define bn_pollute(a) \
-	do { \
-		const BIGNUM *_bnum1 = (a); \
-		if(_bnum1->top < _bnum1->dmax) { \
-			unsigned char _tmp_char; \
-			/* We cast away const without the compiler knowing, any \
-			 * *genuinely* constant variables that aren't mutable \
-			 * wouldn't be constructed with top!=dmax. */ \
-			BN_ULONG *_not_const; \
-			memcpy(&_not_const, &_bnum1->d, sizeof(BN_ULONG*)); \
-			RAND_pseudo_bytes(&_tmp_char, 1); \
-			memset((unsigned char *)(_not_const + _bnum1->top), _tmp_char, \
-				(_bnum1->dmax - _bnum1->top) * sizeof(BN_ULONG)); \
-		} \
-	} while(0)
-#ifdef BN_DEBUG_TRIX
-#undef RAND_pseudo_bytes
-#endif
-#else
-#define bn_pollute(a)
-#endif
-#define bn_check_top(a) \
-	do { \
-		const BIGNUM *_bnum2 = (a); \
-		if (_bnum2 != NULL) { \
-			assert((_bnum2->top == 0) || \
-				(_bnum2->d[_bnum2->top - 1] != 0)); \
-			bn_pollute(_bnum2); \
-		} \
-	} while(0)
-
-#define bn_fix_top(a)		bn_check_top(a)
-
-#else /* !BN_DEBUG */
-
-#define bn_pollute(a)
-#define bn_check_top(a)
-#define bn_fix_top(a)		bn_correct_top(a)
-
-#endif
-
-#define bn_correct_top(a) \
-        { \
-        BN_ULONG *ftl; \
-	int tmp_top = (a)->top; \
-	if (tmp_top > 0) \
-		{ \
-		for (ftl= &((a)->d[tmp_top-1]); tmp_top > 0; tmp_top--) \
-			if (*(ftl--)) break; \
-		(a)->top = tmp_top; \
-		} \
-	bn_pollute(a); \
-	}
-
-BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w);
-BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w);
-void     bn_sqr_words(BN_ULONG *rp, const BN_ULONG *ap, int num);
-BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d);
-BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int num);
-BN_ULONG bn_sub_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int num);
-
-/* Primes from RFC 2409 */
-BIGNUM *get_rfc2409_prime_768(BIGNUM *bn);
-BIGNUM *get_rfc2409_prime_1024(BIGNUM *bn);
-
-/* Primes from RFC 3526 */
-BIGNUM *get_rfc3526_prime_1536(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_2048(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_3072(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_4096(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_6144(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_8192(BIGNUM *bn);
-
-int BN_bntest_rand(BIGNUM *rnd, int bits, int top,int bottom);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_BN_strings(void);
-
-/* Error codes for the BN functions. */
-
-/* Function codes. */
-#define BN_F_BNRAND					 127
-#define BN_F_BN_BLINDING_CONVERT_EX			 100
-#define BN_F_BN_BLINDING_CREATE_PARAM			 128
-#define BN_F_BN_BLINDING_INVERT_EX			 101
-#define BN_F_BN_BLINDING_NEW				 102
-#define BN_F_BN_BLINDING_UPDATE				 103
-#define BN_F_BN_BN2DEC					 104
-#define BN_F_BN_BN2HEX					 105
-#define BN_F_BN_CTX_GET					 116
-#define BN_F_BN_CTX_NEW					 106
-#define BN_F_BN_CTX_START				 129
-#define BN_F_BN_DIV					 107
-#define BN_F_BN_DIV_NO_BRANCH				 138
-#define BN_F_BN_DIV_RECP				 130
-#define BN_F_BN_EXP					 123
-#define BN_F_BN_EXPAND2					 108
-#define BN_F_BN_EXPAND_INTERNAL				 120
-#define BN_F_BN_GF2M_MOD				 131
-#define BN_F_BN_GF2M_MOD_EXP				 132
-#define BN_F_BN_GF2M_MOD_MUL				 133
-#define BN_F_BN_GF2M_MOD_SOLVE_QUAD			 134
-#define BN_F_BN_GF2M_MOD_SOLVE_QUAD_ARR			 135
-#define BN_F_BN_GF2M_MOD_SQR				 136
-#define BN_F_BN_GF2M_MOD_SQRT				 137
-#define BN_F_BN_MOD_EXP2_MONT				 118
-#define BN_F_BN_MOD_EXP_MONT				 109
-#define BN_F_BN_MOD_EXP_MONT_CONSTTIME			 124
-#define BN_F_BN_MOD_EXP_MONT_WORD			 117
-#define BN_F_BN_MOD_EXP_RECP				 125
-#define BN_F_BN_MOD_EXP_SIMPLE				 126
-#define BN_F_BN_MOD_INVERSE				 110
-#define BN_F_BN_MOD_INVERSE_NO_BRANCH			 139
-#define BN_F_BN_MOD_LSHIFT_QUICK			 119
-#define BN_F_BN_MOD_MUL_RECIPROCAL			 111
-#define BN_F_BN_MOD_SQRT				 121
-#define BN_F_BN_MPI2BN					 112
-#define BN_F_BN_NEW					 113
-#define BN_F_BN_RAND					 114
-#define BN_F_BN_RAND_RANGE				 122
-#define BN_F_BN_USUB					 115
-
-/* Reason codes. */
-#define BN_R_ARG2_LT_ARG3				 100
-#define BN_R_BAD_RECIPROCAL				 101
-#define BN_R_BIGNUM_TOO_LONG				 114
-#define BN_R_CALLED_WITH_EVEN_MODULUS			 102
-#define BN_R_DIV_BY_ZERO				 103
-#define BN_R_ENCODING_ERROR				 104
-#define BN_R_EXPAND_ON_STATIC_BIGNUM_DATA		 105
-#define BN_R_INPUT_NOT_REDUCED				 110
-#define BN_R_INVALID_LENGTH				 106
-#define BN_R_INVALID_RANGE				 115
-#define BN_R_NOT_A_SQUARE				 111
-#define BN_R_NOT_INITIALIZED				 107
-#define BN_R_NO_INVERSE					 108
-#define BN_R_NO_SOLUTION				 116
-#define BN_R_P_IS_NOT_PRIME				 112
-#define BN_R_TOO_MANY_ITERATIONS			 113
-#define BN_R_TOO_MANY_TEMPORARY_VARIABLES		 109
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/buffer.h b/dep/include/openssl/buffer.h
deleted file mode 100644
index 178e41828..000000000
--- a/dep/include/openssl/buffer.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* crypto/buffer/buffer.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_BUFFER_H
-#define HEADER_BUFFER_H
-
-#include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
-
-#if !defined(NO_SYS_TYPES_H)
-#include <sys/types.h>
-#endif
-
-/* Already declared in ossl_typ.h */
-/* typedef struct buf_mem_st BUF_MEM; */
-
-struct buf_mem_st
-	{
-	size_t length;	/* current number of bytes */
-	char *data;
-	size_t max;	/* size of buffer */
-	};
-
-BUF_MEM *BUF_MEM_new(void);
-void	BUF_MEM_free(BUF_MEM *a);
-int	BUF_MEM_grow(BUF_MEM *str, size_t len);
-int	BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
-char *	BUF_strdup(const char *str);
-char *	BUF_strndup(const char *str, size_t siz);
-void *	BUF_memdup(const void *data, size_t siz);
-void	BUF_reverse(unsigned char *out, unsigned char *in, size_t siz);
-
-/* safe string functions */
-size_t BUF_strlcpy(char *dst,const char *src,size_t siz);
-size_t BUF_strlcat(char *dst,const char *src,size_t siz);
-
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_BUF_strings(void);
-
-/* Error codes for the BUF functions. */
-
-/* Function codes. */
-#define BUF_F_BUF_MEMDUP				 103
-#define BUF_F_BUF_MEM_GROW				 100
-#define BUF_F_BUF_MEM_GROW_CLEAN			 105
-#define BUF_F_BUF_MEM_NEW				 101
-#define BUF_F_BUF_STRDUP				 102
-#define BUF_F_BUF_STRNDUP				 104
-
-/* Reason codes. */
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/camellia.h b/dep/include/openssl/camellia.h
deleted file mode 100644
index cf0457dd9..000000000
--- a/dep/include/openssl/camellia.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* crypto/camellia/camellia.h -*- mode:C; c-file-style: "eay" -*- */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- */
-
-#ifndef HEADER_CAMELLIA_H
-#define HEADER_CAMELLIA_H
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_CAMELLIA
-#error CAMELLIA is disabled.
-#endif
-
-#include <stddef.h>
-
-#define CAMELLIA_ENCRYPT	1
-#define CAMELLIA_DECRYPT	0
-
-/* Because array size can't be a const in C, the following two are macros.
-   Both sizes are in bytes. */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* This should be a hidden type, but EVP requires that the size be known */
-
-#define CAMELLIA_BLOCK_SIZE 16
-#define CAMELLIA_TABLE_BYTE_LEN 272
-#define CAMELLIA_TABLE_WORD_LEN (CAMELLIA_TABLE_BYTE_LEN / 4)
-
-typedef unsigned int KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN]; /* to match with WORD */
-
-struct camellia_key_st 
-	{
-	union	{
-		double d;	/* ensures 64-bit align */
-		KEY_TABLE_TYPE rd_key;
-		} u;
-	int grand_rounds;
-	};
-typedef struct camellia_key_st CAMELLIA_KEY;
-
-int Camellia_set_key(const unsigned char *userKey, const int bits,
-	CAMELLIA_KEY *key);
-
-void Camellia_encrypt(const unsigned char *in, unsigned char *out,
-	const CAMELLIA_KEY *key);
-void Camellia_decrypt(const unsigned char *in, unsigned char *out,
-	const CAMELLIA_KEY *key);
-
-void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
-	const CAMELLIA_KEY *key, const int enc);
-void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
-	size_t length, const CAMELLIA_KEY *key,
-	unsigned char *ivec, const int enc);
-void Camellia_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-	size_t length, const CAMELLIA_KEY *key,
-	unsigned char *ivec, int *num, const int enc);
-void Camellia_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-	size_t length, const CAMELLIA_KEY *key,
-	unsigned char *ivec, int *num, const int enc);
-void Camellia_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-	size_t length, const CAMELLIA_KEY *key,
-	unsigned char *ivec, int *num, const int enc);
-void Camellia_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-	size_t length, const CAMELLIA_KEY *key,
-	unsigned char *ivec, int *num);
-void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-	size_t length, const CAMELLIA_KEY *key,
-	unsigned char ivec[CAMELLIA_BLOCK_SIZE],
-	unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
-	unsigned int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* !HEADER_Camellia_H */
diff --git a/dep/include/openssl/cast.h b/dep/include/openssl/cast.h
deleted file mode 100644
index 1a264f814..000000000
--- a/dep/include/openssl/cast.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* crypto/cast/cast.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_CAST_H
-#define HEADER_CAST_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_CAST
-#error CAST is disabled.
-#endif
-
-#define CAST_ENCRYPT	1
-#define CAST_DECRYPT	0
-
-#define CAST_LONG unsigned int
-
-#define CAST_BLOCK	8
-#define CAST_KEY_LENGTH	16
-
-typedef struct cast_key_st
-	{
-	CAST_LONG data[32];
-	int short_key;	/* Use reduced rounds for short key */
-	} CAST_KEY;
-
- 
-void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
-void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out, const CAST_KEY *key,
-		      int enc);
-void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key);
-void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key);
-void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-		      const CAST_KEY *ks, unsigned char *iv, int enc);
-void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-			long length, const CAST_KEY *schedule, unsigned char *ivec,
-			int *num, int enc);
-void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out, 
-			long length, const CAST_KEY *schedule, unsigned char *ivec,
-			int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/cms.h b/dep/include/openssl/cms.h
deleted file mode 100644
index 09c45d041..000000000
--- a/dep/include/openssl/cms.h
+++ /dev/null
@@ -1,479 +0,0 @@
-/* crypto/cms/cms.h */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project.
- */
-/* ====================================================================
- * Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- */
-
-
-#ifndef HEADER_CMS_H
-#define HEADER_CMS_H
-
-#include <openssl/x509.h>
-
-#ifdef OPENSSL_NO_CMS
-#error CMS is disabled.
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-typedef struct CMS_ContentInfo_st CMS_ContentInfo;
-typedef struct CMS_SignerInfo_st CMS_SignerInfo;
-typedef struct CMS_CertificateChoices CMS_CertificateChoices;
-typedef struct CMS_RevocationInfoChoice_st CMS_RevocationInfoChoice;
-typedef struct CMS_RecipientInfo_st CMS_RecipientInfo;
-typedef struct CMS_ReceiptRequest_st CMS_ReceiptRequest;
-typedef struct CMS_Receipt_st CMS_Receipt;
-
-DECLARE_STACK_OF(CMS_SignerInfo)
-DECLARE_STACK_OF(GENERAL_NAMES)
-DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo)
-DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest)
-DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo)
-
-#define CMS_SIGNERINFO_ISSUER_SERIAL	0
-#define CMS_SIGNERINFO_KEYIDENTIFIER	1
-
-#define CMS_RECIPINFO_TRANS		0
-#define CMS_RECIPINFO_AGREE		1
-#define CMS_RECIPINFO_KEK		2
-#define CMS_RECIPINFO_PASS		3
-#define CMS_RECIPINFO_OTHER		4
-
-/* S/MIME related flags */
-
-#define CMS_TEXT			0x1
-#define CMS_NOCERTS			0x2
-#define CMS_NO_CONTENT_VERIFY		0x4
-#define CMS_NO_ATTR_VERIFY		0x8
-#define CMS_NOSIGS			\
-			(CMS_NO_CONTENT_VERIFY|CMS_NO_ATTR_VERIFY)
-#define CMS_NOINTERN			0x10
-#define CMS_NO_SIGNER_CERT_VERIFY	0x20
-#define CMS_NOVERIFY			0x20
-#define CMS_DETACHED			0x40
-#define CMS_BINARY			0x80
-#define CMS_NOATTR			0x100
-#define	CMS_NOSMIMECAP			0x200
-#define CMS_NOOLDMIMETYPE		0x400
-#define CMS_CRLFEOL			0x800
-#define CMS_STREAM			0x1000
-#define CMS_NOCRL			0x2000
-#define CMS_PARTIAL			0x4000
-#define CMS_REUSE_DIGEST		0x8000
-#define CMS_USE_KEYID			0x10000
-
-const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms);
-
-BIO *CMS_dataInit(CMS_ContentInfo *cms, BIO *icont);
-int CMS_dataFinal(CMS_ContentInfo *cms, BIO *bio);
-
-ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms);
-int CMS_is_detached(CMS_ContentInfo *cms);
-int CMS_set_detached(CMS_ContentInfo *cms, int detached);
-
-#ifdef HEADER_PEM_H
-DECLARE_PEM_rw_const(CMS, CMS_ContentInfo)
-#endif
-
-int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms);
-CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms);
-int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms);
-
-BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms);
-int i2d_CMS_bio_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags);
-int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags);
-CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont);
-int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags);
-
-int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags);
-
-CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
-						BIO *data, unsigned int flags);
-
-CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
-					X509 *signcert, EVP_PKEY *pkey,
-					STACK_OF(X509) *certs,
-					unsigned int flags);
-
-int CMS_data(CMS_ContentInfo *cms, BIO *out, unsigned int flags);
-CMS_ContentInfo *CMS_data_create(BIO *in, unsigned int flags);
-
-int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-							unsigned int flags);
-CMS_ContentInfo *CMS_digest_create(BIO *in, const EVP_MD *md,
-							unsigned int flags);
-
-int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms,
-				const unsigned char *key, size_t keylen,
-				BIO *dcont, BIO *out, unsigned int flags);
-
-CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher,
-					const unsigned char *key, size_t keylen,
-					unsigned int flags);
-
-int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
-				const unsigned char *key, size_t keylen);
-
-int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
-		 X509_STORE *store, BIO *dcont, BIO *out, unsigned int flags);
-
-int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,
-			STACK_OF(X509) *certs,
-			X509_STORE *store, unsigned int flags);
-
-STACK_OF(X509) *CMS_get0_signers(CMS_ContentInfo *cms);
-
-CMS_ContentInfo *CMS_encrypt(STACK_OF(X509) *certs, BIO *in,
-				const EVP_CIPHER *cipher, unsigned int flags);
-
-int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pkey, X509 *cert,
-				BIO *dcont, BIO *out,
-				unsigned int flags);
-	
-int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert);
-int CMS_decrypt_set1_key(CMS_ContentInfo *cms, 
-				unsigned char *key, size_t keylen,
-				unsigned char *id, size_t idlen);
-
-STACK_OF(CMS_RecipientInfo) *CMS_get0_RecipientInfos(CMS_ContentInfo *cms);
-int CMS_RecipientInfo_type(CMS_RecipientInfo *ri);
-CMS_ContentInfo *CMS_EnvelopedData_create(const EVP_CIPHER *cipher);
-CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,
-					X509 *recip, unsigned int flags);
-int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey);
-int CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert);
-int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri,
-					EVP_PKEY **pk, X509 **recip,
-					X509_ALGOR **palg);
-int CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri,
-					ASN1_OCTET_STRING **keyid,
-					X509_NAME **issuer, ASN1_INTEGER **sno);
-
-CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,
-					unsigned char *key, size_t keylen,
-					unsigned char *id, size_t idlen,
-					ASN1_GENERALIZEDTIME *date,
-					ASN1_OBJECT *otherTypeId,
-					ASN1_TYPE *otherType);
-
-int CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri,
-					X509_ALGOR **palg,
-					ASN1_OCTET_STRING **pid,
-					ASN1_GENERALIZEDTIME **pdate,
-					ASN1_OBJECT **potherid,
-					ASN1_TYPE **pothertype);
-
-int CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri, 
-				unsigned char *key, size_t keylen);
-
-int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri, 
-					const unsigned char *id, size_t idlen);
-
-int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
-	
-int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-							unsigned int flags);
-CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags);
-
-int CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid);
-const ASN1_OBJECT *CMS_get0_eContentType(CMS_ContentInfo *cms);
-
-CMS_CertificateChoices *CMS_add0_CertificateChoices(CMS_ContentInfo *cms);
-int CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert);
-int CMS_add1_cert(CMS_ContentInfo *cms, X509 *cert);
-STACK_OF(X509) *CMS_get1_certs(CMS_ContentInfo *cms);
-
-CMS_RevocationInfoChoice *CMS_add0_RevocationInfoChoice(CMS_ContentInfo *cms);
-int CMS_add0_crl(CMS_ContentInfo *cms, X509_CRL *crl);
-int CMS_add1_crl(CMS_ContentInfo *cms, X509_CRL *crl);
-STACK_OF(X509_CRL) *CMS_get1_crls(CMS_ContentInfo *cms);
-
-int CMS_SignedData_init(CMS_ContentInfo *cms);
-CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
-			X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
-			unsigned int flags);
-STACK_OF(CMS_SignerInfo) *CMS_get0_SignerInfos(CMS_ContentInfo *cms);
-
-void CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer);
-int CMS_SignerInfo_get0_signer_id(CMS_SignerInfo *si,
-					ASN1_OCTET_STRING **keyid,
-					X509_NAME **issuer, ASN1_INTEGER **sno);
-int CMS_SignerInfo_cert_cmp(CMS_SignerInfo *si, X509 *cert);
-int CMS_set1_signers_certs(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
-					unsigned int flags);
-void CMS_SignerInfo_get0_algs(CMS_SignerInfo *si, EVP_PKEY **pk, X509 **signer,
-					X509_ALGOR **pdig, X509_ALGOR **psig);
-int CMS_SignerInfo_sign(CMS_SignerInfo *si);
-int CMS_SignerInfo_verify(CMS_SignerInfo *si);
-int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain);
-
-int CMS_add_smimecap(CMS_SignerInfo *si, STACK_OF(X509_ALGOR) *algs);
-int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs,
-				int algnid, int keysize);
-int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap);
-
-int CMS_signed_get_attr_count(const CMS_SignerInfo *si);
-int CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
-			  int lastpos);
-int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,
-			  int lastpos);
-X509_ATTRIBUTE *CMS_signed_get_attr(const CMS_SignerInfo *si, int loc);
-X509_ATTRIBUTE *CMS_signed_delete_attr(CMS_SignerInfo *si, int loc);
-int CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);
-int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si,
-			const ASN1_OBJECT *obj, int type,
-			const void *bytes, int len);
-int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si,
-			int nid, int type,
-			const void *bytes, int len);
-int CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si,
-			const char *attrname, int type,
-			const void *bytes, int len);
-void *CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
-					int lastpos, int type);
-
-int CMS_unsigned_get_attr_count(const CMS_SignerInfo *si);
-int CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
-			  int lastpos);
-int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,
-			  int lastpos);
-X509_ATTRIBUTE *CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc);
-X509_ATTRIBUTE *CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc);
-int CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);
-int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si,
-			const ASN1_OBJECT *obj, int type,
-			const void *bytes, int len);
-int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si,
-			int nid, int type,
-			const void *bytes, int len);
-int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,
-			const char *attrname, int type,
-			const void *bytes, int len);
-void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
-					int lastpos, int type);
-
-#ifdef HEADER_X509V3_H
-
-int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr);
-CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,
-				int allorfirst,
-				STACK_OF(GENERAL_NAMES) *receiptList,
-				STACK_OF(GENERAL_NAMES) *receiptsTo);
-int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr);
-void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
-					ASN1_STRING **pcid,
-					int *pallorfirst,
-					STACK_OF(GENERAL_NAMES) **plist,
-					STACK_OF(GENERAL_NAMES) **prto);
-
-#endif
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_CMS_strings(void);
-
-/* Error codes for the CMS functions. */
-
-/* Function codes. */
-#define CMS_F_CHECK_CONTENT				 99
-#define CMS_F_CMS_ADD0_CERT				 164
-#define CMS_F_CMS_ADD0_RECIPIENT_KEY			 100
-#define CMS_F_CMS_ADD1_RECEIPTREQUEST			 158
-#define CMS_F_CMS_ADD1_RECIPIENT_CERT			 101
-#define CMS_F_CMS_ADD1_SIGNER				 102
-#define CMS_F_CMS_ADD1_SIGNINGTIME			 103
-#define CMS_F_CMS_COMPRESS				 104
-#define CMS_F_CMS_COMPRESSEDDATA_CREATE			 105
-#define CMS_F_CMS_COMPRESSEDDATA_INIT_BIO		 106
-#define CMS_F_CMS_COPY_CONTENT				 107
-#define CMS_F_CMS_COPY_MESSAGEDIGEST			 108
-#define CMS_F_CMS_DATA					 109
-#define CMS_F_CMS_DATAFINAL				 110
-#define CMS_F_CMS_DATAINIT				 111
-#define CMS_F_CMS_DECRYPT				 112
-#define CMS_F_CMS_DECRYPT_SET1_KEY			 113
-#define CMS_F_CMS_DECRYPT_SET1_PKEY			 114
-#define CMS_F_CMS_DIGESTALGORITHM_FIND_CTX		 115
-#define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO		 116
-#define CMS_F_CMS_DIGESTEDDATA_DO_FINAL			 117
-#define CMS_F_CMS_DIGEST_VERIFY				 118
-#define CMS_F_CMS_ENCODE_RECEIPT			 161
-#define CMS_F_CMS_ENCRYPT				 119
-#define CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO		 120
-#define CMS_F_CMS_ENCRYPTEDDATA_DECRYPT			 121
-#define CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT			 122
-#define CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY		 123
-#define CMS_F_CMS_ENVELOPEDDATA_CREATE			 124
-#define CMS_F_CMS_ENVELOPEDDATA_INIT_BIO		 125
-#define CMS_F_CMS_ENVELOPED_DATA_INIT			 126
-#define CMS_F_CMS_FINAL					 127
-#define CMS_F_CMS_GET0_CERTIFICATE_CHOICES		 128
-#define CMS_F_CMS_GET0_CONTENT				 129
-#define CMS_F_CMS_GET0_ECONTENT_TYPE			 130
-#define CMS_F_CMS_GET0_ENVELOPED			 131
-#define CMS_F_CMS_GET0_REVOCATION_CHOICES		 132
-#define CMS_F_CMS_GET0_SIGNED				 133
-#define CMS_F_CMS_MSGSIGDIGEST_ADD1			 162
-#define CMS_F_CMS_RECEIPTREQUEST_CREATE0		 159
-#define CMS_F_CMS_RECEIPT_VERIFY			 160
-#define CMS_F_CMS_RECIPIENTINFO_DECRYPT			 134
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT		 135
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT		 136
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID		 137
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP		 138
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP		 139
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT		 140
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT		 141
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS		 142
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID	 143
-#define CMS_F_CMS_RECIPIENTINFO_SET0_KEY		 144
-#define CMS_F_CMS_RECIPIENTINFO_SET0_PKEY		 145
-#define CMS_F_CMS_SET1_SIGNERIDENTIFIER			 146
-#define CMS_F_CMS_SET_DETACHED				 147
-#define CMS_F_CMS_SIGN					 148
-#define CMS_F_CMS_SIGNED_DATA_INIT			 149
-#define CMS_F_CMS_SIGNERINFO_CONTENT_SIGN		 150
-#define CMS_F_CMS_SIGNERINFO_SIGN			 151
-#define CMS_F_CMS_SIGNERINFO_VERIFY			 152
-#define CMS_F_CMS_SIGNERINFO_VERIFY_CERT		 153
-#define CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT		 154
-#define CMS_F_CMS_SIGN_RECEIPT				 163
-#define CMS_F_CMS_STREAM				 155
-#define CMS_F_CMS_UNCOMPRESS				 156
-#define CMS_F_CMS_VERIFY				 157
-
-/* Reason codes. */
-#define CMS_R_ADD_SIGNER_ERROR				 99
-#define CMS_R_CERTIFICATE_ALREADY_PRESENT		 175
-#define CMS_R_CERTIFICATE_HAS_NO_KEYID			 160
-#define CMS_R_CERTIFICATE_VERIFY_ERROR			 100
-#define CMS_R_CIPHER_INITIALISATION_ERROR		 101
-#define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR	 102
-#define CMS_R_CMS_DATAFINAL_ERROR			 103
-#define CMS_R_CMS_LIB					 104
-#define CMS_R_CONTENTIDENTIFIER_MISMATCH		 170
-#define CMS_R_CONTENT_NOT_FOUND				 105
-#define CMS_R_CONTENT_TYPE_MISMATCH			 171
-#define CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA		 106
-#define CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA		 107
-#define CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA		 108
-#define CMS_R_CONTENT_VERIFY_ERROR			 109
-#define CMS_R_CTRL_ERROR				 110
-#define CMS_R_CTRL_FAILURE				 111
-#define CMS_R_DECRYPT_ERROR				 112
-#define CMS_R_DIGEST_ERROR				 161
-#define CMS_R_ERROR_GETTING_PUBLIC_KEY			 113
-#define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE	 114
-#define CMS_R_ERROR_SETTING_KEY				 115
-#define CMS_R_ERROR_SETTING_RECIPIENTINFO		 116
-#define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH		 117
-#define CMS_R_INVALID_KEY_LENGTH			 118
-#define CMS_R_MD_BIO_INIT_ERROR				 119
-#define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH	 120
-#define CMS_R_MESSAGEDIGEST_WRONG_LENGTH		 121
-#define CMS_R_MSGSIGDIGEST_ERROR			 172
-#define CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE		 162
-#define CMS_R_MSGSIGDIGEST_WRONG_LENGTH			 163
-#define CMS_R_NEED_ONE_SIGNER				 164
-#define CMS_R_NOT_A_SIGNED_RECEIPT			 165
-#define CMS_R_NOT_ENCRYPTED_DATA			 122
-#define CMS_R_NOT_KEK					 123
-#define CMS_R_NOT_KEY_TRANSPORT				 124
-#define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE		 125
-#define CMS_R_NO_CIPHER					 126
-#define CMS_R_NO_CONTENT				 127
-#define CMS_R_NO_CONTENT_TYPE				 173
-#define CMS_R_NO_DEFAULT_DIGEST				 128
-#define CMS_R_NO_DIGEST_SET				 129
-#define CMS_R_NO_KEY					 130
-#define CMS_R_NO_KEY_OR_CERT				 174
-#define CMS_R_NO_MATCHING_DIGEST			 131
-#define CMS_R_NO_MATCHING_RECIPIENT			 132
-#define CMS_R_NO_MATCHING_SIGNATURE			 166
-#define CMS_R_NO_MSGSIGDIGEST				 167
-#define CMS_R_NO_PRIVATE_KEY				 133
-#define CMS_R_NO_PUBLIC_KEY				 134
-#define CMS_R_NO_RECEIPT_REQUEST			 168
-#define CMS_R_NO_SIGNERS				 135
-#define CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE	 136
-#define CMS_R_RECEIPT_DECODE_ERROR			 169
-#define CMS_R_RECIPIENT_ERROR				 137
-#define CMS_R_SIGNER_CERTIFICATE_NOT_FOUND		 138
-#define CMS_R_SIGNFINAL_ERROR				 139
-#define CMS_R_SMIME_TEXT_ERROR				 140
-#define CMS_R_STORE_INIT_ERROR				 141
-#define CMS_R_TYPE_NOT_COMPRESSED_DATA			 142
-#define CMS_R_TYPE_NOT_DATA				 143
-#define CMS_R_TYPE_NOT_DIGESTED_DATA			 144
-#define CMS_R_TYPE_NOT_ENCRYPTED_DATA			 145
-#define CMS_R_TYPE_NOT_ENVELOPED_DATA			 146
-#define CMS_R_UNABLE_TO_FINALIZE_CONTEXT		 147
-#define CMS_R_UNKNOWN_CIPHER				 148
-#define CMS_R_UNKNOWN_DIGEST_ALGORIHM			 149
-#define CMS_R_UNKNOWN_ID				 150
-#define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM		 151
-#define CMS_R_UNSUPPORTED_CONTENT_TYPE			 152
-#define CMS_R_UNSUPPORTED_KEK_ALGORITHM			 153
-#define CMS_R_UNSUPPORTED_RECIPIENT_TYPE		 154
-#define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE		 155
-#define CMS_R_UNSUPPORTED_TYPE				 156
-#define CMS_R_UNWRAP_ERROR				 157
-#define CMS_R_VERIFICATION_FAILURE			 158
-#define CMS_R_WRAP_ERROR				 159
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/comp.h b/dep/include/openssl/comp.h
deleted file mode 100644
index 4b405c7d4..000000000
--- a/dep/include/openssl/comp.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-#ifndef HEADER_COMP_H
-#define HEADER_COMP_H
-
-#include <openssl/crypto.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct comp_ctx_st COMP_CTX;
-
-typedef struct comp_method_st
-	{
-	int type;		/* NID for compression library */
-	const char *name;	/* A text string to identify the library */
-	int (*init)(COMP_CTX *ctx);
-	void (*finish)(COMP_CTX *ctx);
-	int (*compress)(COMP_CTX *ctx,
-			unsigned char *out, unsigned int olen,
-			unsigned char *in, unsigned int ilen);
-	int (*expand)(COMP_CTX *ctx,
-		      unsigned char *out, unsigned int olen,
-		      unsigned char *in, unsigned int ilen);
-	/* The following two do NOTHING, but are kept for backward compatibility */
-	long (*ctrl)(void);
-	long (*callback_ctrl)(void);
-	} COMP_METHOD;
-
-struct comp_ctx_st
-	{
-	COMP_METHOD *meth;
-	unsigned long compress_in;
-	unsigned long compress_out;
-	unsigned long expand_in;
-	unsigned long expand_out;
-
-	CRYPTO_EX_DATA	ex_data;
-	};
-
-
-COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
-void COMP_CTX_free(COMP_CTX *ctx);
-int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
-	unsigned char *in, int ilen);
-int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
-	unsigned char *in, int ilen);
-COMP_METHOD *COMP_rle(void );
-COMP_METHOD *COMP_zlib(void );
-void COMP_zlib_cleanup(void);
-
-#ifdef HEADER_BIO_H
-#ifdef ZLIB
-BIO_METHOD *BIO_f_zlib(void);
-#endif
-#endif
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_COMP_strings(void);
-
-/* Error codes for the COMP functions. */
-
-/* Function codes. */
-#define COMP_F_BIO_ZLIB_FLUSH				 99
-#define COMP_F_BIO_ZLIB_NEW				 100
-#define COMP_F_BIO_ZLIB_READ				 101
-#define COMP_F_BIO_ZLIB_WRITE				 102
-
-/* Reason codes. */
-#define COMP_R_ZLIB_DEFLATE_ERROR			 99
-#define COMP_R_ZLIB_INFLATE_ERROR			 100
-#define COMP_R_ZLIB_NOT_SUPPORTED			 101
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/conf.h b/dep/include/openssl/conf.h
deleted file mode 100644
index c2199978a..000000000
--- a/dep/include/openssl/conf.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/* crypto/conf/conf.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef  HEADER_CONF_H
-#define HEADER_CONF_H
-
-#include <openssl/bio.h>
-#include <openssl/lhash.h>
-#include <openssl/stack.h>
-#include <openssl/safestack.h>
-#include <openssl/e_os2.h>
-
-#include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct
-	{
-	char *section;
-	char *name;
-	char *value;
-	} CONF_VALUE;
-
-DECLARE_STACK_OF(CONF_VALUE)
-DECLARE_LHASH_OF(CONF_VALUE);
-
-struct conf_st;
-struct conf_method_st;
-typedef struct conf_method_st CONF_METHOD;
-
-struct conf_method_st
-	{
-	const char *name;
-	CONF *(*create)(CONF_METHOD *meth);
-	int (*init)(CONF *conf);
-	int (*destroy)(CONF *conf);
-	int (*destroy_data)(CONF *conf);
-	int (*load_bio)(CONF *conf, BIO *bp, long *eline);
-	int (*dump)(const CONF *conf, BIO *bp);
-	int (*is_number)(const CONF *conf, char c);
-	int (*to_int)(const CONF *conf, char c);
-	int (*load)(CONF *conf, const char *name, long *eline);
-	};
-
-/* Module definitions */
-
-typedef struct conf_imodule_st CONF_IMODULE;
-typedef struct conf_module_st CONF_MODULE;
-
-DECLARE_STACK_OF(CONF_MODULE)
-DECLARE_STACK_OF(CONF_IMODULE)
-
-/* DSO module function typedefs */
-typedef int conf_init_func(CONF_IMODULE *md, const CONF *cnf);
-typedef void conf_finish_func(CONF_IMODULE *md);
-
-#define	CONF_MFLAGS_IGNORE_ERRORS	0x1
-#define CONF_MFLAGS_IGNORE_RETURN_CODES	0x2
-#define CONF_MFLAGS_SILENT		0x4
-#define CONF_MFLAGS_NO_DSO		0x8
-#define CONF_MFLAGS_IGNORE_MISSING_FILE	0x10
-#define CONF_MFLAGS_DEFAULT_SECTION	0x20
-
-int CONF_set_default_method(CONF_METHOD *meth);
-void CONF_set_nconf(CONF *conf,LHASH_OF(CONF_VALUE) *hash);
-LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf,const char *file,
-				long *eline);
-#ifndef OPENSSL_NO_FP_API
-LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
-				   long *eline);
-#endif
-LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,long *eline);
-STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
-				       const char *section);
-char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf,const char *group,
-		      const char *name);
-long CONF_get_number(LHASH_OF(CONF_VALUE) *conf,const char *group,
-		     const char *name);
-void CONF_free(LHASH_OF(CONF_VALUE) *conf);
-int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);
-int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out);
-
-void OPENSSL_config(const char *config_name);
-void OPENSSL_no_config(void);
-
-/* New conf code.  The semantics are different from the functions above.
-   If that wasn't the case, the above functions would have been replaced */
-
-struct conf_st
-	{
-	CONF_METHOD *meth;
-	void *meth_data;
-	LHASH_OF(CONF_VALUE) *data;
-	};
-
-CONF *NCONF_new(CONF_METHOD *meth);
-CONF_METHOD *NCONF_default(void);
-CONF_METHOD *NCONF_WIN32(void);
-#if 0 /* Just to give you an idea of what I have in mind */
-CONF_METHOD *NCONF_XML(void);
-#endif
-void NCONF_free(CONF *conf);
-void NCONF_free_data(CONF *conf);
-
-int NCONF_load(CONF *conf,const char *file,long *eline);
-#ifndef OPENSSL_NO_FP_API
-int NCONF_load_fp(CONF *conf, FILE *fp,long *eline);
-#endif
-int NCONF_load_bio(CONF *conf, BIO *bp,long *eline);
-STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf,const char *section);
-char *NCONF_get_string(const CONF *conf,const char *group,const char *name);
-int NCONF_get_number_e(const CONF *conf,const char *group,const char *name,
-		       long *result);
-int NCONF_dump_fp(const CONF *conf, FILE *out);
-int NCONF_dump_bio(const CONF *conf, BIO *out);
-
-#if 0 /* The following function has no error checking,
-	 and should therefore be avoided */
-long NCONF_get_number(CONF *conf,char *group,char *name);
-#else
-#define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r)
-#endif
-  
-/* Module functions */
-
-int CONF_modules_load(const CONF *cnf, const char *appname,
-		      unsigned long flags);
-int CONF_modules_load_file(const char *filename, const char *appname,
-			   unsigned long flags);
-void CONF_modules_unload(int all);
-void CONF_modules_finish(void);
-void CONF_modules_free(void);
-int CONF_module_add(const char *name, conf_init_func *ifunc,
-		    conf_finish_func *ffunc);
-
-const char *CONF_imodule_get_name(const CONF_IMODULE *md);
-const char *CONF_imodule_get_value(const CONF_IMODULE *md);
-void *CONF_imodule_get_usr_data(const CONF_IMODULE *md);
-void CONF_imodule_set_usr_data(CONF_IMODULE *md, void *usr_data);
-CONF_MODULE *CONF_imodule_get_module(const CONF_IMODULE *md);
-unsigned long CONF_imodule_get_flags(const CONF_IMODULE *md);
-void CONF_imodule_set_flags(CONF_IMODULE *md, unsigned long flags);
-void *CONF_module_get_usr_data(CONF_MODULE *pmod);
-void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data);
-
-char *CONF_get1_default_config_file(void);
-
-int CONF_parse_list(const char *list, int sep, int nospc,
-	int (*list_cb)(const char *elem, int len, void *usr), void *arg);
-
-void OPENSSL_load_builtin_modules(void);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_CONF_strings(void);
-
-/* Error codes for the CONF functions. */
-
-/* Function codes. */
-#define CONF_F_CONF_DUMP_FP				 104
-#define CONF_F_CONF_LOAD				 100
-#define CONF_F_CONF_LOAD_BIO				 102
-#define CONF_F_CONF_LOAD_FP				 103
-#define CONF_F_CONF_MODULES_LOAD			 116
-#define CONF_F_CONF_PARSE_LIST				 119
-#define CONF_F_DEF_LOAD					 120
-#define CONF_F_DEF_LOAD_BIO				 121
-#define CONF_F_MODULE_INIT				 115
-#define CONF_F_MODULE_LOAD_DSO				 117
-#define CONF_F_MODULE_RUN				 118
-#define CONF_F_NCONF_DUMP_BIO				 105
-#define CONF_F_NCONF_DUMP_FP				 106
-#define CONF_F_NCONF_GET_NUMBER				 107
-#define CONF_F_NCONF_GET_NUMBER_E			 112
-#define CONF_F_NCONF_GET_SECTION			 108
-#define CONF_F_NCONF_GET_STRING				 109
-#define CONF_F_NCONF_LOAD				 113
-#define CONF_F_NCONF_LOAD_BIO				 110
-#define CONF_F_NCONF_LOAD_FP				 114
-#define CONF_F_NCONF_NEW				 111
-#define CONF_F_STR_COPY					 101
-
-/* Reason codes. */
-#define CONF_R_ERROR_LOADING_DSO			 110
-#define CONF_R_LIST_CANNOT_BE_NULL			 115
-#define CONF_R_MISSING_CLOSE_SQUARE_BRACKET		 100
-#define CONF_R_MISSING_EQUAL_SIGN			 101
-#define CONF_R_MISSING_FINISH_FUNCTION			 111
-#define CONF_R_MISSING_INIT_FUNCTION			 112
-#define CONF_R_MODULE_INITIALIZATION_ERROR		 109
-#define CONF_R_NO_CLOSE_BRACE				 102
-#define CONF_R_NO_CONF					 105
-#define CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE		 106
-#define CONF_R_NO_SECTION				 107
-#define CONF_R_NO_SUCH_FILE				 114
-#define CONF_R_NO_VALUE					 108
-#define CONF_R_UNABLE_TO_CREATE_NEW_SECTION		 103
-#define CONF_R_UNKNOWN_MODULE_NAME			 113
-#define CONF_R_VARIABLE_HAS_NO_VALUE			 104
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/conf_api.h b/dep/include/openssl/conf_api.h
deleted file mode 100644
index 87a954aff..000000000
--- a/dep/include/openssl/conf_api.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* conf_api.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef  HEADER_CONF_API_H
-#define HEADER_CONF_API_H
-
-#include <openssl/lhash.h>
-#include <openssl/conf.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Up until OpenSSL 0.9.5a, this was new_section */
-CONF_VALUE *_CONF_new_section(CONF *conf, const char *section);
-/* Up until OpenSSL 0.9.5a, this was get_section */
-CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section);
-/* Up until OpenSSL 0.9.5a, this was CONF_get_section */
-STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf,
-					       const char *section);
-
-int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value);
-char *_CONF_get_string(const CONF *conf, const char *section,
-		       const char *name);
-long _CONF_get_number(const CONF *conf, const char *section, const char *name);
-
-int _CONF_new_data(CONF *conf);
-void _CONF_free_data(CONF *conf);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/dep/include/openssl/crypto.h b/dep/include/openssl/crypto.h
deleted file mode 100644
index b0360cec5..000000000
--- a/dep/include/openssl/crypto.h
+++ /dev/null
@@ -1,575 +0,0 @@
-/* crypto/crypto.h */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_CRYPTO_H
-#define HEADER_CRYPTO_H
-
-#include <stdlib.h>
-
-#include <openssl/e_os2.h>
-
-#ifndef OPENSSL_NO_FP_API
-#include <stdio.h>
-#endif
-
-#include <openssl/stack.h>
-#include <openssl/safestack.h>
-#include <openssl/opensslv.h>
-#include <openssl/ossl_typ.h>
-
-#ifdef CHARSET_EBCDIC
-#include <openssl/ebcdic.h>
-#endif
-
-/* Resolve problems on some operating systems with symbol names that clash
-   one way or another */
-#include <openssl/symhacks.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Backward compatibility to SSLeay */
-/* This is more to be used to check the correct DLL is being used
- * in the MS world. */
-#define SSLEAY_VERSION_NUMBER	OPENSSL_VERSION_NUMBER
-#define SSLEAY_VERSION		0
-/* #define SSLEAY_OPTIONS	1 no longer supported */
-#define SSLEAY_CFLAGS		2
-#define SSLEAY_BUILT_ON		3
-#define SSLEAY_PLATFORM		4
-#define SSLEAY_DIR		5
-
-/* Already declared in ossl_typ.h */
-#if 0
-typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
-/* Called when a new object is created */
-typedef int CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-					int idx, long argl, void *argp);
-/* Called when an object is free()ed */
-typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-					int idx, long argl, void *argp);
-/* Called when we need to dup an object */
-typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d, 
-					int idx, long argl, void *argp);
-#endif
-
-/* A generic structure to pass assorted data in a expandable way */
-typedef struct openssl_item_st
-	{
-	int code;
-	void *value;		/* Not used for flag attributes */
-	size_t value_size;	/* Max size of value for output, length for input */
-	size_t *value_length;	/* Returned length of value for output */
-	} OPENSSL_ITEM;
-
-
-/* When changing the CRYPTO_LOCK_* list, be sure to maintin the text lock
- * names in cryptlib.c
- */
-
-#define	CRYPTO_LOCK_ERR			1
-#define	CRYPTO_LOCK_EX_DATA		2
-#define	CRYPTO_LOCK_X509		3
-#define	CRYPTO_LOCK_X509_INFO		4
-#define	CRYPTO_LOCK_X509_PKEY		5
-#define CRYPTO_LOCK_X509_CRL		6
-#define CRYPTO_LOCK_X509_REQ		7
-#define CRYPTO_LOCK_DSA			8
-#define CRYPTO_LOCK_RSA			9
-#define CRYPTO_LOCK_EVP_PKEY		10
-#define CRYPTO_LOCK_X509_STORE		11
-#define CRYPTO_LOCK_SSL_CTX		12
-#define CRYPTO_LOCK_SSL_CERT		13
-#define CRYPTO_LOCK_SSL_SESSION		14
-#define CRYPTO_LOCK_SSL_SESS_CERT	15
-#define CRYPTO_LOCK_SSL			16
-#define CRYPTO_LOCK_SSL_METHOD		17
-#define CRYPTO_LOCK_RAND		18
-#define CRYPTO_LOCK_RAND2		19
-#define CRYPTO_LOCK_MALLOC		20
-#define CRYPTO_LOCK_BIO			21
-#define CRYPTO_LOCK_GETHOSTBYNAME	22
-#define CRYPTO_LOCK_GETSERVBYNAME	23
-#define CRYPTO_LOCK_READDIR		24
-#define CRYPTO_LOCK_RSA_BLINDING	25
-#define CRYPTO_LOCK_DH			26
-#define CRYPTO_LOCK_MALLOC2		27
-#define CRYPTO_LOCK_DSO			28
-#define CRYPTO_LOCK_DYNLOCK		29
-#define CRYPTO_LOCK_ENGINE		30
-#define CRYPTO_LOCK_UI			31
-#define CRYPTO_LOCK_ECDSA               32
-#define CRYPTO_LOCK_EC			33
-#define CRYPTO_LOCK_ECDH		34
-#define CRYPTO_LOCK_BN  		35
-#define CRYPTO_LOCK_EC_PRE_COMP		36
-#define CRYPTO_LOCK_STORE		37
-#define CRYPTO_LOCK_COMP		38
-#define CRYPTO_LOCK_FIPS		39
-#define CRYPTO_LOCK_FIPS2		40
-#define CRYPTO_NUM_LOCKS		41
-
-#define CRYPTO_LOCK		1
-#define CRYPTO_UNLOCK		2
-#define CRYPTO_READ		4
-#define CRYPTO_WRITE		8
-
-#ifndef OPENSSL_NO_LOCKING
-#ifndef CRYPTO_w_lock
-#define CRYPTO_w_lock(type)	\
-	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-#define CRYPTO_w_unlock(type)	\
-	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-#define CRYPTO_r_lock(type)	\
-	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-#define CRYPTO_r_unlock(type)	\
-	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-#define CRYPTO_add(addr,amount,type)	\
-	CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
-#endif
-#else
-#define CRYPTO_w_lock(a)
-#define CRYPTO_w_unlock(a)
-#define CRYPTO_r_lock(a)
-#define CRYPTO_r_unlock(a)
-#define CRYPTO_add(a,b,c)	((*(a))+=(b))
-#endif
-
-/* Some applications as well as some parts of OpenSSL need to allocate
-   and deallocate locks in a dynamic fashion.  The following typedef
-   makes this possible in a type-safe manner.  */
-/* struct CRYPTO_dynlock_value has to be defined by the application. */
-typedef struct
-	{
-	int references;
-	struct CRYPTO_dynlock_value *data;
-	} CRYPTO_dynlock;
-
-
-/* The following can be used to detect memory leaks in the SSLeay library.
- * It used, it turns on malloc checking */
-
-#define CRYPTO_MEM_CHECK_OFF	0x0	/* an enume */
-#define CRYPTO_MEM_CHECK_ON	0x1	/* a bit */
-#define CRYPTO_MEM_CHECK_ENABLE	0x2	/* a bit */
-#define CRYPTO_MEM_CHECK_DISABLE 0x3	/* an enume */
-
-/* The following are bit values to turn on or off options connected to the
- * malloc checking functionality */
-
-/* Adds time to the memory checking information */
-#define V_CRYPTO_MDEBUG_TIME	0x1 /* a bit */
-/* Adds thread number to the memory checking information */
-#define V_CRYPTO_MDEBUG_THREAD	0x2 /* a bit */
-
-#define V_CRYPTO_MDEBUG_ALL (V_CRYPTO_MDEBUG_TIME | V_CRYPTO_MDEBUG_THREAD)
-
-
-/* predec of the BIO type */
-typedef struct bio_st BIO_dummy;
-
-struct crypto_ex_data_st
-	{
-	STACK_OF(void) *sk;
-	int dummy; /* gcc is screwing up this data structure :-( */
-	};
-DECLARE_STACK_OF(void)
-
-/* This stuff is basically class callback functions
- * The current classes are SSL_CTX, SSL, SSL_SESSION, and a few more */
-
-typedef struct crypto_ex_data_func_st
-	{
-	long argl;	/* Arbitary long */
-	void *argp;	/* Arbitary void * */
-	CRYPTO_EX_new *new_func;
-	CRYPTO_EX_free *free_func;
-	CRYPTO_EX_dup *dup_func;
-	} CRYPTO_EX_DATA_FUNCS;
-
-DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS)
-
-/* Per class, we have a STACK of CRYPTO_EX_DATA_FUNCS for each CRYPTO_EX_DATA
- * entry.
- */
-
-#define CRYPTO_EX_INDEX_BIO		0
-#define CRYPTO_EX_INDEX_SSL		1
-#define CRYPTO_EX_INDEX_SSL_CTX		2
-#define CRYPTO_EX_INDEX_SSL_SESSION	3
-#define CRYPTO_EX_INDEX_X509_STORE	4
-#define CRYPTO_EX_INDEX_X509_STORE_CTX	5
-#define CRYPTO_EX_INDEX_RSA		6
-#define CRYPTO_EX_INDEX_DSA		7
-#define CRYPTO_EX_INDEX_DH		8
-#define CRYPTO_EX_INDEX_ENGINE		9
-#define CRYPTO_EX_INDEX_X509		10
-#define CRYPTO_EX_INDEX_UI		11
-#define CRYPTO_EX_INDEX_ECDSA		12
-#define CRYPTO_EX_INDEX_ECDH		13
-#define CRYPTO_EX_INDEX_COMP		14
-#define CRYPTO_EX_INDEX_STORE		15
-
-/* Dynamically assigned indexes start from this value (don't use directly, use
- * via CRYPTO_ex_data_new_class). */
-#define CRYPTO_EX_INDEX_USER		100
-
-
-/* This is the default callbacks, but we can have others as well:
- * this is needed in Win32 where the application malloc and the
- * library malloc may not be the same.
- */
-#define CRYPTO_malloc_init()	CRYPTO_set_mem_functions(\
-	malloc, realloc, free)
-
-#if defined CRYPTO_MDEBUG_ALL || defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD
-# ifndef CRYPTO_MDEBUG /* avoid duplicate #define */
-#  define CRYPTO_MDEBUG
-# endif
-#endif
-
-/* Set standard debugging functions (not done by default
- * unless CRYPTO_MDEBUG is defined) */
-#define CRYPTO_malloc_debug_init()	do {\
-	CRYPTO_set_mem_debug_functions(\
-		CRYPTO_dbg_malloc,\
-		CRYPTO_dbg_realloc,\
-		CRYPTO_dbg_free,\
-		CRYPTO_dbg_set_options,\
-		CRYPTO_dbg_get_options);\
-	} while(0)
-
-int CRYPTO_mem_ctrl(int mode);
-int CRYPTO_is_mem_check_on(void);
-
-/* for applications */
-#define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON)
-#define MemCheck_stop()	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF)
-
-/* for library-internal use */
-#define MemCheck_on()	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE)
-#define MemCheck_off()	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)
-#define is_MemCheck_on() CRYPTO_is_mem_check_on()
-
-#define OPENSSL_malloc(num)	CRYPTO_malloc((int)num,__FILE__,__LINE__)
-#define OPENSSL_strdup(str)	CRYPTO_strdup((str),__FILE__,__LINE__)
-#define OPENSSL_realloc(addr,num) \
-	CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)
-#define OPENSSL_realloc_clean(addr,old_num,num) \
-	CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)
-#define OPENSSL_remalloc(addr,num) \
-	CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)
-#define OPENSSL_freeFunc	CRYPTO_free
-#define OPENSSL_free(addr)	CRYPTO_free(addr)
-
-#define OPENSSL_malloc_locked(num) \
-	CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)
-#define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)
-
-
-const char *SSLeay_version(int type);
-unsigned long SSLeay(void);
-
-int OPENSSL_issetugid(void);
-
-/* An opaque type representing an implementation of "ex_data" support */
-typedef struct st_CRYPTO_EX_DATA_IMPL	CRYPTO_EX_DATA_IMPL;
-/* Return an opaque pointer to the current "ex_data" implementation */
-const CRYPTO_EX_DATA_IMPL *CRYPTO_get_ex_data_implementation(void);
-/* Sets the "ex_data" implementation to be used (if it's not too late) */
-int CRYPTO_set_ex_data_implementation(const CRYPTO_EX_DATA_IMPL *i);
-/* Get a new "ex_data" class, and return the corresponding "class_index" */
-int CRYPTO_ex_data_new_class(void);
-/* Within a given class, get/register a new index */
-int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
-		CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
-		CRYPTO_EX_free *free_func);
-/* Initialise/duplicate/free CRYPTO_EX_DATA variables corresponding to a given
- * class (invokes whatever per-class callbacks are applicable) */
-int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);
-int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
-		CRYPTO_EX_DATA *from);
-void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);
-/* Get/set data in a CRYPTO_EX_DATA variable corresponding to a particular index
- * (relative to the class type involved) */
-int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val);
-void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad,int idx);
-/* This function cleans up all "ex_data" state. It mustn't be called under
- * potential race-conditions. */
-void CRYPTO_cleanup_all_ex_data(void);
-
-int CRYPTO_get_new_lockid(char *name);
-
-int CRYPTO_num_locks(void); /* return CRYPTO_NUM_LOCKS (shared libs!) */
-void CRYPTO_lock(int mode, int type,const char *file,int line);
-void CRYPTO_set_locking_callback(void (*func)(int mode,int type,
-					      const char *file,int line));
-void (*CRYPTO_get_locking_callback(void))(int mode,int type,const char *file,
-		int line);
-void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,int type,
-					      const char *file, int line));
-int (*CRYPTO_get_add_lock_callback(void))(int *num,int mount,int type,
-					  const char *file,int line);
-
-/* Don't use this structure directly. */
-typedef struct crypto_threadid_st
-	{
-	void *ptr;
-	unsigned long val;
-	} CRYPTO_THREADID;
-/* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */
-void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val);
-void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr);
-int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *));
-void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *);
-void CRYPTO_THREADID_current(CRYPTO_THREADID *id);
-int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a, const CRYPTO_THREADID *b);
-void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest, const CRYPTO_THREADID *src);
-unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id);
-#ifndef OPENSSL_NO_DEPRECATED
-void CRYPTO_set_id_callback(unsigned long (*func)(void));
-unsigned long (*CRYPTO_get_id_callback(void))(void);
-unsigned long CRYPTO_thread_id(void);
-#endif
-
-const char *CRYPTO_get_lock_name(int type);
-int CRYPTO_add_lock(int *pointer,int amount,int type, const char *file,
-		    int line);
-
-int CRYPTO_get_new_dynlockid(void);
-void CRYPTO_destroy_dynlockid(int i);
-struct CRYPTO_dynlock_value *CRYPTO_get_dynlock_value(int i);
-void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *(*dyn_create_function)(const char *file, int line));
-void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)(int mode, struct CRYPTO_dynlock_value *l, const char *file, int line));
-void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)(struct CRYPTO_dynlock_value *l, const char *file, int line));
-struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback(void))(const char *file,int line);
-void (*CRYPTO_get_dynlock_lock_callback(void))(int mode, struct CRYPTO_dynlock_value *l, const char *file,int line);
-void (*CRYPTO_get_dynlock_destroy_callback(void))(struct CRYPTO_dynlock_value *l, const char *file,int line);
-
-/* CRYPTO_set_mem_functions includes CRYPTO_set_locked_mem_functions --
- * call the latter last if you need different functions */
-int CRYPTO_set_mem_functions(void *(*m)(size_t),void *(*r)(void *,size_t), void (*f)(void *));
-int CRYPTO_set_locked_mem_functions(void *(*m)(size_t), void (*free_func)(void *));
-int CRYPTO_set_mem_ex_functions(void *(*m)(size_t,const char *,int),
-                                void *(*r)(void *,size_t,const char *,int),
-                                void (*f)(void *));
-int CRYPTO_set_locked_mem_ex_functions(void *(*m)(size_t,const char *,int),
-                                       void (*free_func)(void *));
-int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int),
-				   void (*r)(void *,void *,int,const char *,int,int),
-				   void (*f)(void *,int),
-				   void (*so)(long),
-				   long (*go)(void));
-void CRYPTO_get_mem_functions(void *(**m)(size_t),void *(**r)(void *, size_t), void (**f)(void *));
-void CRYPTO_get_locked_mem_functions(void *(**m)(size_t), void (**f)(void *));
-void CRYPTO_get_mem_ex_functions(void *(**m)(size_t,const char *,int),
-                                 void *(**r)(void *, size_t,const char *,int),
-                                 void (**f)(void *));
-void CRYPTO_get_locked_mem_ex_functions(void *(**m)(size_t,const char *,int),
-                                        void (**f)(void *));
-void CRYPTO_get_mem_debug_functions(void (**m)(void *,int,const char *,int,int),
-				    void (**r)(void *,void *,int,const char *,int,int),
-				    void (**f)(void *,int),
-				    void (**so)(long),
-				    long (**go)(void));
-
-void *CRYPTO_malloc_locked(int num, const char *file, int line);
-void CRYPTO_free_locked(void *);
-void *CRYPTO_malloc(int num, const char *file, int line);
-char *CRYPTO_strdup(const char *str, const char *file, int line);
-void CRYPTO_free(void *);
-void *CRYPTO_realloc(void *addr,int num, const char *file, int line);
-void *CRYPTO_realloc_clean(void *addr,int old_num,int num,const char *file,
-			   int line);
-void *CRYPTO_remalloc(void *addr,int num, const char *file, int line);
-
-void OPENSSL_cleanse(void *ptr, size_t len);
-
-void CRYPTO_set_mem_debug_options(long bits);
-long CRYPTO_get_mem_debug_options(void);
-
-#define CRYPTO_push_info(info) \
-        CRYPTO_push_info_(info, __FILE__, __LINE__);
-int CRYPTO_push_info_(const char *info, const char *file, int line);
-int CRYPTO_pop_info(void);
-int CRYPTO_remove_all_info(void);
-
-
-/* Default debugging functions (enabled by CRYPTO_malloc_debug_init() macro;
- * used as default in CRYPTO_MDEBUG compilations): */
-/* The last argument has the following significance:
- *
- * 0:	called before the actual memory allocation has taken place
- * 1:	called after the actual memory allocation has taken place
- */
-void CRYPTO_dbg_malloc(void *addr,int num,const char *file,int line,int before_p);
-void CRYPTO_dbg_realloc(void *addr1,void *addr2,int num,const char *file,int line,int before_p);
-void CRYPTO_dbg_free(void *addr,int before_p);
-/* Tell the debugging code about options.  By default, the following values
- * apply:
- *
- * 0:                           Clear all options.
- * V_CRYPTO_MDEBUG_TIME (1):    Set the "Show Time" option.
- * V_CRYPTO_MDEBUG_THREAD (2):  Set the "Show Thread Number" option.
- * V_CRYPTO_MDEBUG_ALL (3):     1 + 2
- */
-void CRYPTO_dbg_set_options(long bits);
-long CRYPTO_dbg_get_options(void);
-
-
-#ifndef OPENSSL_NO_FP_API
-void CRYPTO_mem_leaks_fp(FILE *);
-#endif
-void CRYPTO_mem_leaks(struct bio_st *bio);
-/* unsigned long order, char *file, int line, int num_bytes, char *addr */
-typedef void *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *);
-void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);
-
-/* die if we have to */
-void OpenSSLDie(const char *file,int line,const char *assertion);
-#define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))
-
-unsigned long *OPENSSL_ia32cap_loc(void);
-#define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
-int OPENSSL_isservice(void);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_CRYPTO_strings(void);
-
-/* Error codes for the CRYPTO functions. */
-
-/* Function codes. */
-#define CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX		 100
-#define CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID		 103
-#define CRYPTO_F_CRYPTO_GET_NEW_LOCKID			 101
-#define CRYPTO_F_CRYPTO_SET_EX_DATA			 102
-#define CRYPTO_F_DEF_ADD_INDEX				 104
-#define CRYPTO_F_DEF_GET_CLASS				 105
-#define CRYPTO_F_INT_DUP_EX_DATA			 106
-#define CRYPTO_F_INT_FREE_EX_DATA			 107
-#define CRYPTO_F_INT_NEW_EX_DATA			 108
-
-/* Reason codes. */
-#define CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK		 100
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/des.h b/dep/include/openssl/des.h
deleted file mode 100644
index 92b666359..000000000
--- a/dep/include/openssl/des.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/* crypto/des/des.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_NEW_DES_H
-#define HEADER_NEW_DES_H
-
-#include <openssl/e_os2.h>	/* OPENSSL_EXTERN, OPENSSL_NO_DES,
-				   DES_LONG (via openssl/opensslconf.h */
-
-#ifdef OPENSSL_NO_DES
-#error DES is disabled.
-#endif
-
-#ifdef OPENSSL_BUILD_SHLIBCRYPTO
-# undef OPENSSL_EXTERN
-# define OPENSSL_EXTERN OPENSSL_EXPORT
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef unsigned char DES_cblock[8];
-typedef /* const */ unsigned char const_DES_cblock[8];
-/* With "const", gcc 2.8.1 on Solaris thinks that DES_cblock *
- * and const_DES_cblock * are incompatible pointer types. */
-
-typedef struct DES_ks
-    {
-    union
-	{
-	DES_cblock cblock;
-	/* make sure things are correct size on machines with
-	 * 8 byte longs */
-	DES_LONG deslong[2];
-	} ks[16];
-    } DES_key_schedule;
-
-#ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT
-# ifndef OPENSSL_ENABLE_OLD_DES_SUPPORT
-#  define OPENSSL_ENABLE_OLD_DES_SUPPORT
-# endif
-#endif
-
-#ifdef OPENSSL_ENABLE_OLD_DES_SUPPORT
-# include <openssl/des_old.h>
-#endif
-
-#define DES_KEY_SZ 	(sizeof(DES_cblock))
-#define DES_SCHEDULE_SZ (sizeof(DES_key_schedule))
-
-#define DES_ENCRYPT	1
-#define DES_DECRYPT	0
-
-#define DES_CBC_MODE	0
-#define DES_PCBC_MODE	1
-
-#define DES_ecb2_encrypt(i,o,k1,k2,e) \
-	DES_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
-
-#define DES_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
-	DES_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
-
-#define DES_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
-	DES_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
-
-#define DES_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
-	DES_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
-
-OPENSSL_DECLARE_GLOBAL(int,DES_check_key);	/* defaults to false */
-#define DES_check_key OPENSSL_GLOBAL_REF(DES_check_key)
-OPENSSL_DECLARE_GLOBAL(int,DES_rw_mode);	/* defaults to DES_PCBC_MODE */
-#define DES_rw_mode OPENSSL_GLOBAL_REF(DES_rw_mode)
-
-const char *DES_options(void);
-void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
-		      DES_key_schedule *ks1,DES_key_schedule *ks2,
-		      DES_key_schedule *ks3, int enc);
-DES_LONG DES_cbc_cksum(const unsigned char *input,DES_cblock *output,
-		       long length,DES_key_schedule *schedule,
-		       const_DES_cblock *ivec);
-/* DES_cbc_encrypt does not update the IV!  Use DES_ncbc_encrypt instead. */
-void DES_cbc_encrypt(const unsigned char *input,unsigned char *output,
-		     long length,DES_key_schedule *schedule,DES_cblock *ivec,
-		     int enc);
-void DES_ncbc_encrypt(const unsigned char *input,unsigned char *output,
-		      long length,DES_key_schedule *schedule,DES_cblock *ivec,
-		      int enc);
-void DES_xcbc_encrypt(const unsigned char *input,unsigned char *output,
-		      long length,DES_key_schedule *schedule,DES_cblock *ivec,
-		      const_DES_cblock *inw,const_DES_cblock *outw,int enc);
-void DES_cfb_encrypt(const unsigned char *in,unsigned char *out,int numbits,
-		     long length,DES_key_schedule *schedule,DES_cblock *ivec,
-		     int enc);
-void DES_ecb_encrypt(const_DES_cblock *input,DES_cblock *output,
-		     DES_key_schedule *ks,int enc);
-
-/* 	This is the DES encryption function that gets called by just about
-	every other DES routine in the library.  You should not use this
-	function except to implement 'modes' of DES.  I say this because the
-	functions that call this routine do the conversion from 'char *' to
-	long, and this needs to be done to make sure 'non-aligned' memory
-	access do not occur.  The characters are loaded 'little endian'.
-	Data is a pointer to 2 unsigned long's and ks is the
-	DES_key_schedule to use.  enc, is non zero specifies encryption,
-	zero if decryption. */
-void DES_encrypt1(DES_LONG *data,DES_key_schedule *ks, int enc);
-
-/* 	This functions is the same as DES_encrypt1() except that the DES
-	initial permutation (IP) and final permutation (FP) have been left
-	out.  As for DES_encrypt1(), you should not use this function.
-	It is used by the routines in the library that implement triple DES.
-	IP() DES_encrypt2() DES_encrypt2() DES_encrypt2() FP() is the same
-	as DES_encrypt1() DES_encrypt1() DES_encrypt1() except faster :-). */
-void DES_encrypt2(DES_LONG *data,DES_key_schedule *ks, int enc);
-
-void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
-		  DES_key_schedule *ks2, DES_key_schedule *ks3);
-void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
-		  DES_key_schedule *ks2, DES_key_schedule *ks3);
-void DES_ede3_cbc_encrypt(const unsigned char *input,unsigned char *output, 
-			  long length,
-			  DES_key_schedule *ks1,DES_key_schedule *ks2,
-			  DES_key_schedule *ks3,DES_cblock *ivec,int enc);
-void DES_ede3_cbcm_encrypt(const unsigned char *in,unsigned char *out,
-			   long length,
-			   DES_key_schedule *ks1,DES_key_schedule *ks2,
-			   DES_key_schedule *ks3,
-			   DES_cblock *ivec1,DES_cblock *ivec2,
-			   int enc);
-void DES_ede3_cfb64_encrypt(const unsigned char *in,unsigned char *out,
-			    long length,DES_key_schedule *ks1,
-			    DES_key_schedule *ks2,DES_key_schedule *ks3,
-			    DES_cblock *ivec,int *num,int enc);
-void DES_ede3_cfb_encrypt(const unsigned char *in,unsigned char *out,
-			  int numbits,long length,DES_key_schedule *ks1,
-			  DES_key_schedule *ks2,DES_key_schedule *ks3,
-			  DES_cblock *ivec,int enc);
-void DES_ede3_ofb64_encrypt(const unsigned char *in,unsigned char *out,
-			    long length,DES_key_schedule *ks1,
-			    DES_key_schedule *ks2,DES_key_schedule *ks3,
-			    DES_cblock *ivec,int *num);
-#if 0
-void DES_xwhite_in2out(const_DES_cblock *DES_key,const_DES_cblock *in_white,
-		       DES_cblock *out_white);
-#endif
-
-int DES_enc_read(int fd,void *buf,int len,DES_key_schedule *sched,
-		 DES_cblock *iv);
-int DES_enc_write(int fd,const void *buf,int len,DES_key_schedule *sched,
-		  DES_cblock *iv);
-char *DES_fcrypt(const char *buf,const char *salt, char *ret);
-char *DES_crypt(const char *buf,const char *salt);
-void DES_ofb_encrypt(const unsigned char *in,unsigned char *out,int numbits,
-		     long length,DES_key_schedule *schedule,DES_cblock *ivec);
-void DES_pcbc_encrypt(const unsigned char *input,unsigned char *output,
-		      long length,DES_key_schedule *schedule,DES_cblock *ivec,
-		      int enc);
-DES_LONG DES_quad_cksum(const unsigned char *input,DES_cblock output[],
-			long length,int out_count,DES_cblock *seed);
-int DES_random_key(DES_cblock *ret);
-void DES_set_odd_parity(DES_cblock *key);
-int DES_check_key_parity(const_DES_cblock *key);
-int DES_is_weak_key(const_DES_cblock *key);
-/* DES_set_key (= set_key = DES_key_sched = key_sched) calls
- * DES_set_key_checked if global variable DES_check_key is set,
- * DES_set_key_unchecked otherwise. */
-int DES_set_key(const_DES_cblock *key,DES_key_schedule *schedule);
-int DES_key_sched(const_DES_cblock *key,DES_key_schedule *schedule);
-int DES_set_key_checked(const_DES_cblock *key,DES_key_schedule *schedule);
-void DES_set_key_unchecked(const_DES_cblock *key,DES_key_schedule *schedule);
-void DES_string_to_key(const char *str,DES_cblock *key);
-void DES_string_to_2keys(const char *str,DES_cblock *key1,DES_cblock *key2);
-void DES_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length,
-		       DES_key_schedule *schedule,DES_cblock *ivec,int *num,
-		       int enc);
-void DES_ofb64_encrypt(const unsigned char *in,unsigned char *out,long length,
-		       DES_key_schedule *schedule,DES_cblock *ivec,int *num);
-
-int DES_read_password(DES_cblock *key, const char *prompt, int verify);
-int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2, const char *prompt,
-	int verify);
-
-#define DES_fixup_key_parity DES_set_odd_parity
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/des_old.h b/dep/include/openssl/des_old.h
deleted file mode 100644
index 2b2c37235..000000000
--- a/dep/include/openssl/des_old.h
+++ /dev/null
@@ -1,446 +0,0 @@
-/* crypto/des/des_old.h -*- mode:C; c-file-style: "eay" -*- */
-
-/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- *
- * The function names in here are deprecated and are only present to
- * provide an interface compatible with openssl 0.9.6 and older as
- * well as libdes.  OpenSSL now provides functions where "des_" has
- * been replaced with "DES_" in the names, to make it possible to
- * make incompatible changes that are needed for C type security and
- * other stuff.
- *
- * This include files has two compatibility modes:
- *
- *   - If OPENSSL_DES_LIBDES_COMPATIBILITY is defined, you get an API
- *     that is compatible with libdes and SSLeay.
- *   - If OPENSSL_DES_LIBDES_COMPATIBILITY isn't defined, you get an
- *     API that is compatible with OpenSSL 0.9.5x to 0.9.6x.
- *
- * Note that these modes break earlier snapshots of OpenSSL, where
- * libdes compatibility was the only available mode or (later on) the
- * prefered compatibility mode.  However, after much consideration
- * (and more or less violent discussions with external parties), it
- * was concluded that OpenSSL should be compatible with earlier versions
- * of itself before anything else.  Also, in all honesty, libdes is
- * an old beast that shouldn't really be used any more.
- *
- * Please consider starting to use the DES_ functions rather than the
- * des_ ones.  The des_ functions will disappear completely before
- * OpenSSL 1.0!
- *
- * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- */
-
-/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
- * project 2001.
- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_DES_H
-#define HEADER_DES_H
-
-#include <openssl/e_os2.h>	/* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */
-
-#ifdef OPENSSL_NO_DES
-#error DES is disabled.
-#endif
-
-#ifndef HEADER_NEW_DES_H
-#error You must include des.h, not des_old.h directly.
-#endif
-
-#ifdef _KERBEROS_DES_H
-#error <openssl/des_old.h> replaces <kerberos/des.h>.
-#endif
-
-#include <openssl/symhacks.h>
-
-#ifdef OPENSSL_BUILD_SHLIBCRYPTO
-# undef OPENSSL_EXTERN
-# define OPENSSL_EXTERN OPENSSL_EXPORT
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef _
-#undef _
-#endif
-
-typedef unsigned char _ossl_old_des_cblock[8];
-typedef struct _ossl_old_des_ks_struct
-	{
-	union	{
-		_ossl_old_des_cblock _;
-		/* make sure things are correct size on machines with
-		 * 8 byte longs */
-		DES_LONG pad[2];
-		} ks;
-	} _ossl_old_des_key_schedule[16];
-
-#ifndef OPENSSL_DES_LIBDES_COMPATIBILITY
-#define des_cblock DES_cblock
-#define const_des_cblock const_DES_cblock
-#define des_key_schedule DES_key_schedule
-#define des_ecb3_encrypt(i,o,k1,k2,k3,e)\
-	DES_ecb3_encrypt((i),(o),&(k1),&(k2),&(k3),(e))
-#define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\
-	DES_ede3_cbc_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(e))
-#define des_ede3_cbcm_encrypt(i,o,l,k1,k2,k3,iv1,iv2,e)\
-	DES_ede3_cbcm_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv1),(iv2),(e))
-#define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\
-	DES_ede3_cfb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n),(e))
-#define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\
-	DES_ede3_ofb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n))
-#define des_options()\
-	DES_options()
-#define des_cbc_cksum(i,o,l,k,iv)\
-	DES_cbc_cksum((i),(o),(l),&(k),(iv))
-#define des_cbc_encrypt(i,o,l,k,iv,e)\
-	DES_cbc_encrypt((i),(o),(l),&(k),(iv),(e))
-#define des_ncbc_encrypt(i,o,l,k,iv,e)\
-	DES_ncbc_encrypt((i),(o),(l),&(k),(iv),(e))
-#define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\
-	DES_xcbc_encrypt((i),(o),(l),&(k),(iv),(inw),(outw),(e))
-#define des_cfb_encrypt(i,o,n,l,k,iv,e)\
-	DES_cfb_encrypt((i),(o),(n),(l),&(k),(iv),(e))
-#define des_ecb_encrypt(i,o,k,e)\
-	DES_ecb_encrypt((i),(o),&(k),(e))
-#define des_encrypt1(d,k,e)\
-	DES_encrypt1((d),&(k),(e))
-#define des_encrypt2(d,k,e)\
-	DES_encrypt2((d),&(k),(e))
-#define des_encrypt3(d,k1,k2,k3)\
-	DES_encrypt3((d),&(k1),&(k2),&(k3))
-#define des_decrypt3(d,k1,k2,k3)\
-	DES_decrypt3((d),&(k1),&(k2),&(k3))
-#define des_xwhite_in2out(k,i,o)\
-	DES_xwhite_in2out((k),(i),(o))
-#define des_enc_read(f,b,l,k,iv)\
-	DES_enc_read((f),(b),(l),&(k),(iv))
-#define des_enc_write(f,b,l,k,iv)\
-	DES_enc_write((f),(b),(l),&(k),(iv))
-#define des_fcrypt(b,s,r)\
-	DES_fcrypt((b),(s),(r))
-#if 0
-#define des_crypt(b,s)\
-	DES_crypt((b),(s))
-#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
-#define crypt(b,s)\
-	DES_crypt((b),(s))
-#endif
-#endif
-#define des_ofb_encrypt(i,o,n,l,k,iv)\
-	DES_ofb_encrypt((i),(o),(n),(l),&(k),(iv))
-#define des_pcbc_encrypt(i,o,l,k,iv,e)\
-	DES_pcbc_encrypt((i),(o),(l),&(k),(iv),(e))
-#define des_quad_cksum(i,o,l,c,s)\
-	DES_quad_cksum((i),(o),(l),(c),(s))
-#define des_random_seed(k)\
-	_ossl_096_des_random_seed((k))
-#define des_random_key(r)\
-	DES_random_key((r))
-#define des_read_password(k,p,v) \
-	DES_read_password((k),(p),(v))
-#define des_read_2passwords(k1,k2,p,v) \
-	DES_read_2passwords((k1),(k2),(p),(v))
-#define des_set_odd_parity(k)\
-	DES_set_odd_parity((k))
-#define des_check_key_parity(k)\
-	DES_check_key_parity((k))
-#define des_is_weak_key(k)\
-	DES_is_weak_key((k))
-#define des_set_key(k,ks)\
-	DES_set_key((k),&(ks))
-#define des_key_sched(k,ks)\
-	DES_key_sched((k),&(ks))
-#define des_set_key_checked(k,ks)\
-	DES_set_key_checked((k),&(ks))
-#define des_set_key_unchecked(k,ks)\
-	DES_set_key_unchecked((k),&(ks))
-#define des_string_to_key(s,k)\
-	DES_string_to_key((s),(k))
-#define des_string_to_2keys(s,k1,k2)\
-	DES_string_to_2keys((s),(k1),(k2))
-#define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\
-	DES_cfb64_encrypt((i),(o),(l),&(ks),(iv),(n),(e))
-#define des_ofb64_encrypt(i,o,l,ks,iv,n)\
-	DES_ofb64_encrypt((i),(o),(l),&(ks),(iv),(n))
-		
-
-#define des_ecb2_encrypt(i,o,k1,k2,e) \
-	des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
-
-#define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
-	des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
-
-#define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
-	des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
-
-#define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
-	des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
-
-#define des_check_key DES_check_key
-#define des_rw_mode DES_rw_mode
-#else /* libdes compatibility */
-/* Map all symbol names to _ossl_old_des_* form, so we avoid all
-   clashes with libdes */
-#define des_cblock _ossl_old_des_cblock
-#define des_key_schedule _ossl_old_des_key_schedule
-#define des_ecb3_encrypt(i,o,k1,k2,k3,e)\
-	_ossl_old_des_ecb3_encrypt((i),(o),(k1),(k2),(k3),(e))
-#define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\
-	_ossl_old_des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(e))
-#define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\
-	_ossl_old_des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(n),(e))
-#define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\
-	_ossl_old_des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(n))
-#define des_options()\
-	_ossl_old_des_options()
-#define des_cbc_cksum(i,o,l,k,iv)\
-	_ossl_old_des_cbc_cksum((i),(o),(l),(k),(iv))
-#define des_cbc_encrypt(i,o,l,k,iv,e)\
-	_ossl_old_des_cbc_encrypt((i),(o),(l),(k),(iv),(e))
-#define des_ncbc_encrypt(i,o,l,k,iv,e)\
-	_ossl_old_des_ncbc_encrypt((i),(o),(l),(k),(iv),(e))
-#define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\
-	_ossl_old_des_xcbc_encrypt((i),(o),(l),(k),(iv),(inw),(outw),(e))
-#define des_cfb_encrypt(i,o,n,l,k,iv,e)\
-	_ossl_old_des_cfb_encrypt((i),(o),(n),(l),(k),(iv),(e))
-#define des_ecb_encrypt(i,o,k,e)\
-	_ossl_old_des_ecb_encrypt((i),(o),(k),(e))
-#define des_encrypt(d,k,e)\
-	_ossl_old_des_encrypt((d),(k),(e))
-#define des_encrypt2(d,k,e)\
-	_ossl_old_des_encrypt2((d),(k),(e))
-#define des_encrypt3(d,k1,k2,k3)\
-	_ossl_old_des_encrypt3((d),(k1),(k2),(k3))
-#define des_decrypt3(d,k1,k2,k3)\
-	_ossl_old_des_decrypt3((d),(k1),(k2),(k3))
-#define des_xwhite_in2out(k,i,o)\
-	_ossl_old_des_xwhite_in2out((k),(i),(o))
-#define des_enc_read(f,b,l,k,iv)\
-	_ossl_old_des_enc_read((f),(b),(l),(k),(iv))
-#define des_enc_write(f,b,l,k,iv)\
-	_ossl_old_des_enc_write((f),(b),(l),(k),(iv))
-#define des_fcrypt(b,s,r)\
-	_ossl_old_des_fcrypt((b),(s),(r))
-#define des_crypt(b,s)\
-	_ossl_old_des_crypt((b),(s))
-#if 0
-#define crypt(b,s)\
-	_ossl_old_crypt((b),(s))
-#endif
-#define des_ofb_encrypt(i,o,n,l,k,iv)\
-	_ossl_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv))
-#define des_pcbc_encrypt(i,o,l,k,iv,e)\
-	_ossl_old_des_pcbc_encrypt((i),(o),(l),(k),(iv),(e))
-#define des_quad_cksum(i,o,l,c,s)\
-	_ossl_old_des_quad_cksum((i),(o),(l),(c),(s))
-#define des_random_seed(k)\
-	_ossl_old_des_random_seed((k))
-#define des_random_key(r)\
-	_ossl_old_des_random_key((r))
-#define des_read_password(k,p,v) \
-	_ossl_old_des_read_password((k),(p),(v))
-#define des_read_2passwords(k1,k2,p,v) \
-	_ossl_old_des_read_2passwords((k1),(k2),(p),(v))
-#define des_set_odd_parity(k)\
-	_ossl_old_des_set_odd_parity((k))
-#define des_is_weak_key(k)\
-	_ossl_old_des_is_weak_key((k))
-#define des_set_key(k,ks)\
-	_ossl_old_des_set_key((k),(ks))
-#define des_key_sched(k,ks)\
-	_ossl_old_des_key_sched((k),(ks))
-#define des_string_to_key(s,k)\
-	_ossl_old_des_string_to_key((s),(k))
-#define des_string_to_2keys(s,k1,k2)\
-	_ossl_old_des_string_to_2keys((s),(k1),(k2))
-#define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\
-	_ossl_old_des_cfb64_encrypt((i),(o),(l),(ks),(iv),(n),(e))
-#define des_ofb64_encrypt(i,o,l,ks,iv,n)\
-	_ossl_old_des_ofb64_encrypt((i),(o),(l),(ks),(iv),(n))
-		
-
-#define des_ecb2_encrypt(i,o,k1,k2,e) \
-	des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
-
-#define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
-	des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
-
-#define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
-	des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
-
-#define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
-	des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
-
-#define des_check_key DES_check_key
-#define des_rw_mode DES_rw_mode
-#endif
-
-const char *_ossl_old_des_options(void);
-void _ossl_old_des_ecb3_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,
-	_ossl_old_des_key_schedule ks1,_ossl_old_des_key_schedule ks2,
-	_ossl_old_des_key_schedule ks3, int enc);
-DES_LONG _ossl_old_des_cbc_cksum(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,
-	long length,_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec);
-void _ossl_old_des_cbc_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,long length,
-	_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,int enc);
-void _ossl_old_des_ncbc_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,long length,
-	_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,int enc);
-void _ossl_old_des_xcbc_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,long length,
-	_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,
-	_ossl_old_des_cblock *inw,_ossl_old_des_cblock *outw,int enc);
-void _ossl_old_des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
-	long length,_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,int enc);
-void _ossl_old_des_ecb_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,
-	_ossl_old_des_key_schedule ks,int enc);
-void _ossl_old_des_encrypt(DES_LONG *data,_ossl_old_des_key_schedule ks, int enc);
-void _ossl_old_des_encrypt2(DES_LONG *data,_ossl_old_des_key_schedule ks, int enc);
-void _ossl_old_des_encrypt3(DES_LONG *data, _ossl_old_des_key_schedule ks1,
-	_ossl_old_des_key_schedule ks2, _ossl_old_des_key_schedule ks3);
-void _ossl_old_des_decrypt3(DES_LONG *data, _ossl_old_des_key_schedule ks1,
-	_ossl_old_des_key_schedule ks2, _ossl_old_des_key_schedule ks3);
-void _ossl_old_des_ede3_cbc_encrypt(_ossl_old_des_cblock *input, _ossl_old_des_cblock *output, 
-	long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2, 
-	_ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int enc);
-void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
-	long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2,
-	_ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int *num, int enc);
-void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
-	long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2,
-	_ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int *num);
-#if 0
-void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white),
-	_ossl_old_des_cblock (*out_white));
-#endif
-
-int _ossl_old_des_enc_read(int fd,char *buf,int len,_ossl_old_des_key_schedule sched,
-	_ossl_old_des_cblock *iv);
-int _ossl_old_des_enc_write(int fd,char *buf,int len,_ossl_old_des_key_schedule sched,
-	_ossl_old_des_cblock *iv);
-char *_ossl_old_des_fcrypt(const char *buf,const char *salt, char *ret);
-char *_ossl_old_des_crypt(const char *buf,const char *salt);
-#if !defined(PERL5) && !defined(NeXT)
-char *_ossl_old_crypt(const char *buf,const char *salt);
-#endif
-void _ossl_old_des_ofb_encrypt(unsigned char *in,unsigned char *out,
-	int numbits,long length,_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec);
-void _ossl_old_des_pcbc_encrypt(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,long length,
-	_ossl_old_des_key_schedule schedule,_ossl_old_des_cblock *ivec,int enc);
-DES_LONG _ossl_old_des_quad_cksum(_ossl_old_des_cblock *input,_ossl_old_des_cblock *output,
-	long length,int out_count,_ossl_old_des_cblock *seed);
-void _ossl_old_des_random_seed(_ossl_old_des_cblock key);
-void _ossl_old_des_random_key(_ossl_old_des_cblock ret);
-int _ossl_old_des_read_password(_ossl_old_des_cblock *key,const char *prompt,int verify);
-int _ossl_old_des_read_2passwords(_ossl_old_des_cblock *key1,_ossl_old_des_cblock *key2,
-	const char *prompt,int verify);
-void _ossl_old_des_set_odd_parity(_ossl_old_des_cblock *key);
-int _ossl_old_des_is_weak_key(_ossl_old_des_cblock *key);
-int _ossl_old_des_set_key(_ossl_old_des_cblock *key,_ossl_old_des_key_schedule schedule);
-int _ossl_old_des_key_sched(_ossl_old_des_cblock *key,_ossl_old_des_key_schedule schedule);
-void _ossl_old_des_string_to_key(char *str,_ossl_old_des_cblock *key);
-void _ossl_old_des_string_to_2keys(char *str,_ossl_old_des_cblock *key1,_ossl_old_des_cblock *key2);
-void _ossl_old_des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-	_ossl_old_des_key_schedule schedule, _ossl_old_des_cblock *ivec, int *num, int enc);
-void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
-	_ossl_old_des_key_schedule schedule, _ossl_old_des_cblock *ivec, int *num);
-
-void _ossl_096_des_random_seed(des_cblock *key);
-
-/* The following definitions provide compatibility with the MIT Kerberos
- * library. The _ossl_old_des_key_schedule structure is not binary compatible. */
-
-#define _KERBEROS_DES_H
-
-#define KRBDES_ENCRYPT DES_ENCRYPT
-#define KRBDES_DECRYPT DES_DECRYPT
-
-#ifdef KERBEROS
-#  define ENCRYPT DES_ENCRYPT
-#  define DECRYPT DES_DECRYPT
-#endif
-
-#ifndef NCOMPAT
-#  define C_Block des_cblock
-#  define Key_schedule des_key_schedule
-#  define KEY_SZ DES_KEY_SZ
-#  define string_to_key des_string_to_key
-#  define read_pw_string des_read_pw_string
-#  define random_key des_random_key
-#  define pcbc_encrypt des_pcbc_encrypt
-#  define set_key des_set_key
-#  define key_sched des_key_sched
-#  define ecb_encrypt des_ecb_encrypt
-#  define cbc_encrypt des_cbc_encrypt
-#  define ncbc_encrypt des_ncbc_encrypt
-#  define xcbc_encrypt des_xcbc_encrypt
-#  define cbc_cksum des_cbc_cksum
-#  define quad_cksum des_quad_cksum
-#  define check_parity des_check_key_parity
-#endif
-
-#define des_fixup_key_parity DES_fixup_key_parity
-
-#ifdef  __cplusplus
-}
-#endif
-
-/* for DES_read_pw_string et al */
-#include <openssl/ui_compat.h>
-
-#endif
diff --git a/dep/include/openssl/dh.h b/dep/include/openssl/dh.h
deleted file mode 100644
index 849309a48..000000000
--- a/dep/include/openssl/dh.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/* crypto/dh/dh.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_DH_H
-#define HEADER_DH_H
-
-#include <openssl/e_os2.h>
-
-#ifdef OPENSSL_NO_DH
-#error DH is disabled.
-#endif
-
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
-	
-#ifndef OPENSSL_DH_MAX_MODULUS_BITS
-# define OPENSSL_DH_MAX_MODULUS_BITS	10000
-#endif
-
-#define DH_FLAG_CACHE_MONT_P     0x01
-#define DH_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DH
-                                       * implementation now uses constant time
-                                       * modular exponentiation for secret exponents
-                                       * by default. This flag causes the
-                                       * faster variable sliding window method to
-                                       * be used for all exponents.
-                                       */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Already defined in ossl_typ.h */
-/* typedef struct dh_st DH; */
-/* typedef struct dh_method DH_METHOD; */
-
-struct dh_method
-	{
-	const char *name;
-	/* Methods here */
-	int (*generate_key)(DH *dh);
-	int (*compute_key)(unsigned char *key,const BIGNUM *pub_key,DH *dh);
-	int (*bn_mod_exp)(const DH *dh, BIGNUM *r, const BIGNUM *a,
-				const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-				BN_MONT_CTX *m_ctx); /* Can be null */
-
-	int (*init)(DH *dh);
-	int (*finish)(DH *dh);
-	int flags;
-	char *app_data;
-	/* If this is non-NULL, it will be used to generate parameters */
-	int (*generate_params)(DH *dh, int prime_len, int generator, BN_GENCB *cb);
-	};
-
-struct dh_st
-	{
-	/* This first argument is used to pick up errors when
-	 * a DH is passed instead of a EVP_PKEY */
-	int pad;
-	int version;
-	BIGNUM *p;
-	BIGNUM *g;
-	long length; /* optional */
-	BIGNUM *pub_key;	/* g^x */
-	BIGNUM *priv_key;	/* x */
-
-	int flags;
-	BN_MONT_CTX *method_mont_p;
-	/* Place holders if we want to do X9.42 DH */
-	BIGNUM *q;
-	BIGNUM *j;
-	unsigned char *seed;
-	int seedlen;
-	BIGNUM *counter;
-
-	int references;
-	CRYPTO_EX_DATA ex_data;
-	const DH_METHOD *meth;
-	ENGINE *engine;
-	};
-
-#define DH_GENERATOR_2		2
-/* #define DH_GENERATOR_3	3 */
-#define DH_GENERATOR_5		5
-
-/* DH_check error codes */
-#define DH_CHECK_P_NOT_PRIME		0x01
-#define DH_CHECK_P_NOT_SAFE_PRIME	0x02
-#define DH_UNABLE_TO_CHECK_GENERATOR	0x04
-#define DH_NOT_SUITABLE_GENERATOR	0x08
-
-/* DH_check_pub_key error codes */
-#define DH_CHECK_PUBKEY_TOO_SMALL	0x01
-#define DH_CHECK_PUBKEY_TOO_LARGE	0x02
-
-/* primes p where (p-1)/2 is prime too are called "safe"; we define
-   this for backward compatibility: */
-#define DH_CHECK_P_NOT_STRONG_PRIME	DH_CHECK_P_NOT_SAFE_PRIME
-
-#define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
-		(char *(*)())d2i_DHparams,(fp),(unsigned char **)(x))
-#define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \
-		(unsigned char *)(x))
-#define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x)
-#define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x)
-
-DH *DHparams_dup(DH *);
-
-const DH_METHOD *DH_OpenSSL(void);
-
-void DH_set_default_method(const DH_METHOD *meth);
-const DH_METHOD *DH_get_default_method(void);
-int DH_set_method(DH *dh, const DH_METHOD *meth);
-DH *DH_new_method(ENGINE *engine);
-
-DH *	DH_new(void);
-void	DH_free(DH *dh);
-int	DH_up_ref(DH *dh);
-int	DH_size(const DH *dh);
-int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	     CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int DH_set_ex_data(DH *d, int idx, void *arg);
-void *DH_get_ex_data(DH *d, int idx);
-
-/* Deprecated version */
-#ifndef OPENSSL_NO_DEPRECATED
-DH *	DH_generate_parameters(int prime_len,int generator,
-		void (*callback)(int,int,void *),void *cb_arg);
-#endif /* !defined(OPENSSL_NO_DEPRECATED) */
-
-/* New version */
-int	DH_generate_parameters_ex(DH *dh, int prime_len,int generator, BN_GENCB *cb);
-
-int	DH_check(const DH *dh,int *codes);
-int	DH_check_pub_key(const DH *dh,const BIGNUM *pub_key, int *codes);
-int	DH_generate_key(DH *dh);
-int	DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh);
-DH *	d2i_DHparams(DH **a,const unsigned char **pp, long length);
-int	i2d_DHparams(const DH *a,unsigned char **pp);
-#ifndef OPENSSL_NO_FP_API
-int	DHparams_print_fp(FILE *fp, const DH *x);
-#endif
-#ifndef OPENSSL_NO_BIO
-int	DHparams_print(BIO *bp, const DH *x);
-#else
-int	DHparams_print(char *bp, const DH *x);
-#endif
-
-#define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \
-	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
-			EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, len, NULL)
-
-#define EVP_PKEY_CTX_set_dh_paramgen_generator(ctx, gen) \
-	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
-			EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR, gen, NULL)
-
-#define	EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN	(EVP_PKEY_ALG_CTRL + 1)
-#define	EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR	(EVP_PKEY_ALG_CTRL + 2)
-		
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_DH_strings(void);
-
-/* Error codes for the DH functions. */
-
-/* Function codes. */
-#define DH_F_COMPUTE_KEY				 102
-#define DH_F_DHPARAMS_PRINT_FP				 101
-#define DH_F_DH_BUILTIN_GENPARAMS			 106
-#define DH_F_DH_NEW_METHOD				 105
-#define DH_F_DH_PARAM_DECODE				 107
-#define DH_F_DH_PRIV_DECODE				 110
-#define DH_F_DH_PRIV_ENCODE				 111
-#define DH_F_DH_PUB_DECODE				 108
-#define DH_F_DH_PUB_ENCODE				 109
-#define DH_F_DO_DH_PRINT				 100
-#define DH_F_GENERATE_KEY				 103
-#define DH_F_GENERATE_PARAMETERS			 104
-#define DH_F_PKEY_DH_DERIVE				 112
-#define DH_F_PKEY_DH_KEYGEN				 113
-
-/* Reason codes. */
-#define DH_R_BAD_GENERATOR				 101
-#define DH_R_BN_DECODE_ERROR				 109
-#define DH_R_BN_ERROR					 106
-#define DH_R_DECODE_ERROR				 104
-#define DH_R_INVALID_PUBKEY				 102
-#define DH_R_KEYS_NOT_SET				 108
-#define DH_R_MODULUS_TOO_LARGE				 103
-#define DH_R_NO_PARAMETERS_SET				 107
-#define DH_R_NO_PRIVATE_VALUE				 100
-#define DH_R_PARAMETER_ENCODING_ERROR			 105
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/dsa.h b/dep/include/openssl/dsa.h
deleted file mode 100644
index ac50a5c84..000000000
--- a/dep/include/openssl/dsa.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/* crypto/dsa/dsa.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/*
- * The DSS routines are based on patches supplied by
- * Steven Schoch <schoch@sheba.arc.nasa.gov>.  He basically did the
- * work and I have just tweaked them a little to fit into my
- * stylistic vision for SSLeay :-) */
-
-#ifndef HEADER_DSA_H
-#define HEADER_DSA_H
-
-#include <openssl/e_os2.h>
-
-#ifdef OPENSSL_NO_DSA
-#error DSA is disabled.
-#endif
-
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#include <openssl/crypto.h>
-#include <openssl/ossl_typ.h>
-
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
-#endif
-#endif
-
-#ifndef OPENSSL_DSA_MAX_MODULUS_BITS
-# define OPENSSL_DSA_MAX_MODULUS_BITS	10000
-#endif
-
-#define DSA_FLAG_CACHE_MONT_P	0x01
-#define DSA_FLAG_NO_EXP_CONSTTIME       0x02 /* new with 0.9.7h; the built-in DSA
-                                              * implementation now uses constant time
-                                              * modular exponentiation for secret exponents
-                                              * by default. This flag causes the
-                                              * faster variable sliding window method to
-                                              * be used for all exponents.
-                                              */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Already defined in ossl_typ.h */
-/* typedef struct dsa_st DSA; */
-/* typedef struct dsa_method DSA_METHOD; */
-
-typedef struct DSA_SIG_st
-	{
-	BIGNUM *r;
-	BIGNUM *s;
-	} DSA_SIG;
-
-struct dsa_method
-	{
-	const char *name;
-	DSA_SIG * (*dsa_do_sign)(const unsigned char *dgst, int dlen, DSA *dsa);
-	int (*dsa_sign_setup)(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
-								BIGNUM **rp);
-	int (*dsa_do_verify)(const unsigned char *dgst, int dgst_len,
-			     DSA_SIG *sig, DSA *dsa);
-	int (*dsa_mod_exp)(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1,
-			BIGNUM *a2, BIGNUM *p2, BIGNUM *m, BN_CTX *ctx,
-			BN_MONT_CTX *in_mont);
-	int (*bn_mod_exp)(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-				const BIGNUM *m, BN_CTX *ctx,
-				BN_MONT_CTX *m_ctx); /* Can be null */
-	int (*init)(DSA *dsa);
-	int (*finish)(DSA *dsa);
-	int flags;
-	char *app_data;
-	/* If this is non-NULL, it is used to generate DSA parameters */
-	int (*dsa_paramgen)(DSA *dsa, int bits,
-			const unsigned char *seed, int seed_len,
-			int *counter_ret, unsigned long *h_ret,
-			BN_GENCB *cb);
-	/* If this is non-NULL, it is used to generate DSA keys */
-	int (*dsa_keygen)(DSA *dsa);
-	};
-
-struct dsa_st
-	{
-	/* This first variable is used to pick up errors where
-	 * a DSA is passed instead of of a EVP_PKEY */
-	int pad;
-	long version;
-	int write_params;
-	BIGNUM *p;
-	BIGNUM *q;	/* == 20 */
-	BIGNUM *g;
-
-	BIGNUM *pub_key;  /* y public key */
-	BIGNUM *priv_key; /* x private key */
-
-	BIGNUM *kinv;	/* Signing pre-calc */
-	BIGNUM *r;	/* Signing pre-calc */
-
-	int flags;
-	/* Normally used to cache montgomery values */
-	BN_MONT_CTX *method_mont_p;
-	int references;
-	CRYPTO_EX_DATA ex_data;
-	const DSA_METHOD *meth;
-	/* functional reference if 'meth' is ENGINE-provided */
-	ENGINE *engine;
-	};
-
-#define d2i_DSAparams_fp(fp,x) (DSA *)ASN1_d2i_fp((char *(*)())DSA_new, \
-		(char *(*)())d2i_DSAparams,(fp),(unsigned char **)(x))
-#define i2d_DSAparams_fp(fp,x) ASN1_i2d_fp(i2d_DSAparams,(fp), \
-		(unsigned char *)(x))
-#define d2i_DSAparams_bio(bp,x) ASN1_d2i_bio_of(DSA,DSA_new,d2i_DSAparams,bp,x)
-#define i2d_DSAparams_bio(bp,x) ASN1_i2d_bio_of_const(DSA,i2d_DSAparams,bp,x)
-
-
-DSA *DSAparams_dup(DSA *x);
-DSA_SIG * DSA_SIG_new(void);
-void	DSA_SIG_free(DSA_SIG *a);
-int	i2d_DSA_SIG(const DSA_SIG *a, unsigned char **pp);
-DSA_SIG * d2i_DSA_SIG(DSA_SIG **v, const unsigned char **pp, long length);
-
-DSA_SIG * DSA_do_sign(const unsigned char *dgst,int dlen,DSA *dsa);
-int	DSA_do_verify(const unsigned char *dgst,int dgst_len,
-		      DSA_SIG *sig,DSA *dsa);
-
-const DSA_METHOD *DSA_OpenSSL(void);
-
-void	DSA_set_default_method(const DSA_METHOD *);
-const DSA_METHOD *DSA_get_default_method(void);
-int	DSA_set_method(DSA *dsa, const DSA_METHOD *);
-
-DSA *	DSA_new(void);
-DSA *	DSA_new_method(ENGINE *engine);
-void	DSA_free (DSA *r);
-/* "up" the DSA object's reference count */
-int	DSA_up_ref(DSA *r);
-int	DSA_size(const DSA *);
-	/* next 4 return -1 on error */
-int	DSA_sign_setup( DSA *dsa,BN_CTX *ctx_in,BIGNUM **kinvp,BIGNUM **rp);
-int	DSA_sign(int type,const unsigned char *dgst,int dlen,
-		unsigned char *sig, unsigned int *siglen, DSA *dsa);
-int	DSA_verify(int type,const unsigned char *dgst,int dgst_len,
-		const unsigned char *sigbuf, int siglen, DSA *dsa);
-int DSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	     CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int DSA_set_ex_data(DSA *d, int idx, void *arg);
-void *DSA_get_ex_data(DSA *d, int idx);
-
-DSA *	d2i_DSAPublicKey(DSA **a, const unsigned char **pp, long length);
-DSA *	d2i_DSAPrivateKey(DSA **a, const unsigned char **pp, long length);
-DSA * 	d2i_DSAparams(DSA **a, const unsigned char **pp, long length);
-
-/* Deprecated version */
-#ifndef OPENSSL_NO_DEPRECATED
-DSA *	DSA_generate_parameters(int bits,
-		unsigned char *seed,int seed_len,
-		int *counter_ret, unsigned long *h_ret,void
-		(*callback)(int, int, void *),void *cb_arg);
-#endif /* !defined(OPENSSL_NO_DEPRECATED) */
-
-/* New version */
-int	DSA_generate_parameters_ex(DSA *dsa, int bits,
-		const unsigned char *seed,int seed_len,
-		int *counter_ret, unsigned long *h_ret, BN_GENCB *cb);
-
-int	DSA_generate_key(DSA *a);
-int	i2d_DSAPublicKey(const DSA *a, unsigned char **pp);
-int 	i2d_DSAPrivateKey(const DSA *a, unsigned char **pp);
-int	i2d_DSAparams(const DSA *a,unsigned char **pp);
-
-#ifndef OPENSSL_NO_BIO
-int	DSAparams_print(BIO *bp, const DSA *x);
-int	DSA_print(BIO *bp, const DSA *x, int off);
-#endif
-#ifndef OPENSSL_NO_FP_API
-int	DSAparams_print_fp(FILE *fp, const DSA *x);
-int	DSA_print_fp(FILE *bp, const DSA *x, int off);
-#endif
-
-#define DSS_prime_checks 50
-/* Primality test according to FIPS PUB 186[-1], Appendix 2.1:
- * 50 rounds of Rabin-Miller */
-#define DSA_is_prime(n, callback, cb_arg) \
-	BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg)
-
-#ifndef OPENSSL_NO_DH
-/* Convert DSA structure (key or just parameters) into DH structure
- * (be careful to avoid small subgroup attacks when using this!) */
-DH *DSA_dup_DH(const DSA *r);
-#endif
-
-#define EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, nbits) \
-	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN, \
-				EVP_PKEY_CTRL_DSA_PARAMGEN_BITS, nbits, NULL)
-
-#define	EVP_PKEY_CTRL_DSA_PARAMGEN_BITS		(EVP_PKEY_ALG_CTRL + 1)
-#define	EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS	(EVP_PKEY_ALG_CTRL + 2)
-#define	EVP_PKEY_CTRL_DSA_PARAMGEN_MD		(EVP_PKEY_ALG_CTRL + 3)
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_DSA_strings(void);
-
-/* Error codes for the DSA functions. */
-
-/* Function codes. */
-#define DSA_F_D2I_DSA_SIG				 110
-#define DSA_F_DO_DSA_PRINT				 104
-#define DSA_F_DSAPARAMS_PRINT				 100
-#define DSA_F_DSAPARAMS_PRINT_FP			 101
-#define DSA_F_DSA_DO_SIGN				 112
-#define DSA_F_DSA_DO_VERIFY				 113
-#define DSA_F_DSA_NEW_METHOD				 103
-#define DSA_F_DSA_PARAM_DECODE				 119
-#define DSA_F_DSA_PRINT_FP				 105
-#define DSA_F_DSA_PRIV_DECODE				 115
-#define DSA_F_DSA_PRIV_ENCODE				 116
-#define DSA_F_DSA_PUB_DECODE				 117
-#define DSA_F_DSA_PUB_ENCODE				 118
-#define DSA_F_DSA_SIGN					 106
-#define DSA_F_DSA_SIGN_SETUP				 107
-#define DSA_F_DSA_SIG_NEW				 109
-#define DSA_F_DSA_VERIFY				 108
-#define DSA_F_I2D_DSA_SIG				 111
-#define DSA_F_OLD_DSA_PRIV_DECODE			 122
-#define DSA_F_PKEY_DSA_CTRL				 120
-#define DSA_F_PKEY_DSA_KEYGEN				 121
-#define DSA_F_SIG_CB					 114
-
-/* Reason codes. */
-#define DSA_R_BAD_Q_VALUE				 102
-#define DSA_R_BN_DECODE_ERROR				 108
-#define DSA_R_BN_ERROR					 109
-#define DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE		 100
-#define DSA_R_DECODE_ERROR				 104
-#define DSA_R_INVALID_DIGEST_TYPE			 106
-#define DSA_R_MISSING_PARAMETERS			 101
-#define DSA_R_MODULUS_TOO_LARGE				 103
-#define DSA_R_NO_PARAMETERS_SET				 107
-#define DSA_R_PARAMETER_ENCODING_ERROR			 105
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/dso.h b/dep/include/openssl/dso.h
deleted file mode 100644
index 839f2e061..000000000
--- a/dep/include/openssl/dso.h
+++ /dev/null
@@ -1,409 +0,0 @@
-/* dso.h -*- mode:C; c-file-style: "eay" -*- */
-/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
- * project 2000.
- */
-/* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_DSO_H
-#define HEADER_DSO_H
-
-#include <openssl/crypto.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* These values are used as commands to DSO_ctrl() */
-#define DSO_CTRL_GET_FLAGS	1
-#define DSO_CTRL_SET_FLAGS	2
-#define DSO_CTRL_OR_FLAGS	3
-
-/* By default, DSO_load() will translate the provided filename into a form
- * typical for the platform (more specifically the DSO_METHOD) using the
- * dso_name_converter function of the method. Eg. win32 will transform "blah"
- * into "blah.dll", and dlfcn will transform it into "libblah.so". The
- * behaviour can be overriden by setting the name_converter callback in the DSO
- * object (using DSO_set_name_converter()). This callback could even utilise
- * the DSO_METHOD's converter too if it only wants to override behaviour for
- * one or two possible DSO methods. However, the following flag can be set in a
- * DSO to prevent *any* native name-translation at all - eg. if the caller has
- * prompted the user for a path to a driver library so the filename should be
- * interpreted as-is. */
-#define DSO_FLAG_NO_NAME_TRANSLATION		0x01
-/* An extra flag to give if only the extension should be added as
- * translation.  This is obviously only of importance on Unix and
- * other operating systems where the translation also may prefix
- * the name with something, like 'lib', and ignored everywhere else.
- * This flag is also ignored if DSO_FLAG_NO_NAME_TRANSLATION is used
- * at the same time. */
-#define DSO_FLAG_NAME_TRANSLATION_EXT_ONLY	0x02
-
-/* The following flag controls the translation of symbol names to upper
- * case.  This is currently only being implemented for OpenVMS.
- */
-#define DSO_FLAG_UPCASE_SYMBOL			0x10
-
-/* This flag loads the library with public symbols.
- * Meaning: The exported symbols of this library are public
- * to all libraries loaded after this library.
- * At the moment only implemented in unix.
- */
-#define DSO_FLAG_GLOBAL_SYMBOLS			0x20
-
-
-typedef void (*DSO_FUNC_TYPE)(void);
-
-typedef struct dso_st DSO;
-
-/* The function prototype used for method functions (or caller-provided
- * callbacks) that transform filenames. They are passed a DSO structure pointer
- * (or NULL if they are to be used independantly of a DSO object) and a
- * filename to transform. They should either return NULL (if there is an error
- * condition) or a newly allocated string containing the transformed form that
- * the caller will need to free with OPENSSL_free() when done. */
-typedef char* (*DSO_NAME_CONVERTER_FUNC)(DSO *, const char *);
-/* The function prototype used for method functions (or caller-provided
- * callbacks) that merge two file specifications. They are passed a
- * DSO structure pointer (or NULL if they are to be used independantly of
- * a DSO object) and two file specifications to merge. They should
- * either return NULL (if there is an error condition) or a newly allocated
- * string containing the result of merging that the caller will need
- * to free with OPENSSL_free() when done.
- * Here, merging means that bits and pieces are taken from each of the
- * file specifications and added together in whatever fashion that is
- * sensible for the DSO method in question.  The only rule that really
- * applies is that if the two specification contain pieces of the same
- * type, the copy from the first string takes priority.  One could see
- * it as the first specification is the one given by the user and the
- * second being a bunch of defaults to add on if they're missing in the
- * first. */
-typedef char* (*DSO_MERGER_FUNC)(DSO *, const char *, const char *);
-
-typedef struct dso_meth_st
-	{
-	const char *name;
-	/* Loads a shared library, NB: new DSO_METHODs must ensure that a
-	 * successful load populates the loaded_filename field, and likewise a
-	 * successful unload OPENSSL_frees and NULLs it out. */
-	int (*dso_load)(DSO *dso);
-	/* Unloads a shared library */
-	int (*dso_unload)(DSO *dso);
-	/* Binds a variable */
-	void *(*dso_bind_var)(DSO *dso, const char *symname);
-	/* Binds a function - assumes a return type of DSO_FUNC_TYPE.
-	 * This should be cast to the real function prototype by the
-	 * caller. Platforms that don't have compatible representations
-	 * for different prototypes (this is possible within ANSI C)
-	 * are highly unlikely to have shared libraries at all, let
-	 * alone a DSO_METHOD implemented for them. */
-	DSO_FUNC_TYPE (*dso_bind_func)(DSO *dso, const char *symname);
-
-/* I don't think this would actually be used in any circumstances. */
-#if 0
-	/* Unbinds a variable */
-	int (*dso_unbind_var)(DSO *dso, char *symname, void *symptr);
-	/* Unbinds a function */
-	int (*dso_unbind_func)(DSO *dso, char *symname, DSO_FUNC_TYPE symptr);
-#endif
-	/* The generic (yuck) "ctrl()" function. NB: Negative return
-	 * values (rather than zero) indicate errors. */
-	long (*dso_ctrl)(DSO *dso, int cmd, long larg, void *parg);
-	/* The default DSO_METHOD-specific function for converting filenames to
-	 * a canonical native form. */
-	DSO_NAME_CONVERTER_FUNC dso_name_converter;
-	/* The default DSO_METHOD-specific function for converting filenames to
-	 * a canonical native form. */
-	DSO_MERGER_FUNC dso_merger;
-
-	/* [De]Initialisation handlers. */
-	int (*init)(DSO *dso);
-	int (*finish)(DSO *dso);
-
-	/* Return pathname of the module containing location */
-	int (*pathbyaddr)(void *addr,char *path,int sz);
-	/* Perform global symbol lookup, i.e. among *all* modules */
-	void *(*globallookup)(const char *symname);
-	} DSO_METHOD;
-
-/**********************************************************************/
-/* The low-level handle type used to refer to a loaded shared library */
-
-struct dso_st
-	{
-	DSO_METHOD *meth;
-	/* Standard dlopen uses a (void *). Win32 uses a HANDLE. VMS
-	 * doesn't use anything but will need to cache the filename
-	 * for use in the dso_bind handler. All in all, let each
-	 * method control its own destiny. "Handles" and such go in
-	 * a STACK. */
-	STACK_OF(void) *meth_data;
-	int references;
-	int flags;
-	/* For use by applications etc ... use this for your bits'n'pieces,
-	 * don't touch meth_data! */
-	CRYPTO_EX_DATA ex_data;
-	/* If this callback function pointer is set to non-NULL, then it will
-	 * be used in DSO_load() in place of meth->dso_name_converter. NB: This
-	 * should normally set using DSO_set_name_converter(). */
-	DSO_NAME_CONVERTER_FUNC name_converter;
-	/* If this callback function pointer is set to non-NULL, then it will
-	 * be used in DSO_load() in place of meth->dso_merger. NB: This
-	 * should normally set using DSO_set_merger(). */
-	DSO_MERGER_FUNC merger;
-	/* This is populated with (a copy of) the platform-independant
-	 * filename used for this DSO. */
-	char *filename;
-	/* This is populated with (a copy of) the translated filename by which
-	 * the DSO was actually loaded. It is NULL iff the DSO is not currently
-	 * loaded. NB: This is here because the filename translation process
-	 * may involve a callback being invoked more than once not only to
-	 * convert to a platform-specific form, but also to try different
-	 * filenames in the process of trying to perform a load. As such, this
-	 * variable can be used to indicate (a) whether this DSO structure
-	 * corresponds to a loaded library or not, and (b) the filename with
-	 * which it was actually loaded. */
-	char *loaded_filename;
-	};
-
-
-DSO *	DSO_new(void);
-DSO *	DSO_new_method(DSO_METHOD *method);
-int	DSO_free(DSO *dso);
-int	DSO_flags(DSO *dso);
-int	DSO_up_ref(DSO *dso);
-long	DSO_ctrl(DSO *dso, int cmd, long larg, void *parg);
-
-/* This function sets the DSO's name_converter callback. If it is non-NULL,
- * then it will be used instead of the associated DSO_METHOD's function. If
- * oldcb is non-NULL then it is set to the function pointer value being
- * replaced. Return value is non-zero for success. */
-int	DSO_set_name_converter(DSO *dso, DSO_NAME_CONVERTER_FUNC cb,
-				DSO_NAME_CONVERTER_FUNC *oldcb);
-/* These functions can be used to get/set the platform-independant filename
- * used for a DSO. NB: set will fail if the DSO is already loaded. */
-const char *DSO_get_filename(DSO *dso);
-int	DSO_set_filename(DSO *dso, const char *filename);
-/* This function will invoke the DSO's name_converter callback to translate a
- * filename, or if the callback isn't set it will instead use the DSO_METHOD's
- * converter. If "filename" is NULL, the "filename" in the DSO itself will be
- * used. If the DSO_FLAG_NO_NAME_TRANSLATION flag is set, then the filename is
- * simply duplicated. NB: This function is usually called from within a
- * DSO_METHOD during the processing of a DSO_load() call, and is exposed so that
- * caller-created DSO_METHODs can do the same thing. A non-NULL return value
- * will need to be OPENSSL_free()'d. */
-char	*DSO_convert_filename(DSO *dso, const char *filename);
-/* This function will invoke the DSO's merger callback to merge two file
- * specifications, or if the callback isn't set it will instead use the
- * DSO_METHOD's merger.  A non-NULL return value will need to be
- * OPENSSL_free()'d. */
-char	*DSO_merge(DSO *dso, const char *filespec1, const char *filespec2);
-/* If the DSO is currently loaded, this returns the filename that it was loaded
- * under, otherwise it returns NULL. So it is also useful as a test as to
- * whether the DSO is currently loaded. NB: This will not necessarily return
- * the same value as DSO_convert_filename(dso, dso->filename), because the
- * DSO_METHOD's load function may have tried a variety of filenames (with
- * and/or without the aid of the converters) before settling on the one it
- * actually loaded. */
-const char *DSO_get_loaded_filename(DSO *dso);
-
-void	DSO_set_default_method(DSO_METHOD *meth);
-DSO_METHOD *DSO_get_default_method(void);
-DSO_METHOD *DSO_get_method(DSO *dso);
-DSO_METHOD *DSO_set_method(DSO *dso, DSO_METHOD *meth);
-
-/* The all-singing all-dancing load function, you normally pass NULL
- * for the first and third parameters. Use DSO_up and DSO_free for
- * subsequent reference count handling. Any flags passed in will be set
- * in the constructed DSO after its init() function but before the
- * load operation. If 'dso' is non-NULL, 'flags' is ignored. */
-DSO *DSO_load(DSO *dso, const char *filename, DSO_METHOD *meth, int flags);
-
-/* This function binds to a variable inside a shared library. */
-void *DSO_bind_var(DSO *dso, const char *symname);
-
-/* This function binds to a function inside a shared library. */
-DSO_FUNC_TYPE DSO_bind_func(DSO *dso, const char *symname);
-
-/* This method is the default, but will beg, borrow, or steal whatever
- * method should be the default on any particular platform (including
- * DSO_METH_null() if necessary). */
-DSO_METHOD *DSO_METHOD_openssl(void);
-
-/* This method is defined for all platforms - if a platform has no
- * DSO support then this will be the only method! */
-DSO_METHOD *DSO_METHOD_null(void);
-
-/* If DSO_DLFCN is defined, the standard dlfcn.h-style functions
- * (dlopen, dlclose, dlsym, etc) will be used and incorporated into
- * this method. If not, this method will return NULL. */
-DSO_METHOD *DSO_METHOD_dlfcn(void);
-
-/* If DSO_DL is defined, the standard dl.h-style functions (shl_load, 
- * shl_unload, shl_findsym, etc) will be used and incorporated into
- * this method. If not, this method will return NULL. */
-DSO_METHOD *DSO_METHOD_dl(void);
-
-/* If WIN32 is defined, use DLLs. If not, return NULL. */
-DSO_METHOD *DSO_METHOD_win32(void);
-
-/* If VMS is defined, use shared images. If not, return NULL. */
-DSO_METHOD *DSO_METHOD_vms(void);
-
-/* This function writes null-terminated pathname of DSO module
- * containing 'addr' into 'sz' large caller-provided 'path' and
- * returns the number of characters [including trailing zero]
- * written to it. If 'sz' is 0 or negative, 'path' is ignored and
- * required amount of charachers [including trailing zero] to
- * accomodate pathname is returned. If 'addr' is NULL, then
- * pathname of cryptolib itself is returned. Negative or zero
- * return value denotes error.
- */
-int DSO_pathbyaddr(void *addr,char *path,int sz);
-
-/* This function should be used with caution! It looks up symbols in
- * *all* loaded modules and if module gets unloaded by somebody else
- * attempt to dereference the pointer is doomed to have fatal
- * consequences. Primary usage for this function is to probe *core*
- * system functionality, e.g. check if getnameinfo(3) is available
- * at run-time without bothering about OS-specific details such as
- * libc.so.versioning or where does it actually reside: in libc
- * itself or libsocket. */
-void *DSO_global_lookup(const char *name);
-
-/* If BeOS is defined, use shared images. If not, return NULL. */
-DSO_METHOD *DSO_METHOD_beos(void);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_DSO_strings(void);
-
-/* Error codes for the DSO functions. */
-
-/* Function codes. */
-#define DSO_F_BEOS_BIND_FUNC				 144
-#define DSO_F_BEOS_BIND_VAR				 145
-#define DSO_F_BEOS_LOAD					 146
-#define DSO_F_BEOS_NAME_CONVERTER			 147
-#define DSO_F_BEOS_UNLOAD				 148
-#define DSO_F_DLFCN_BIND_FUNC				 100
-#define DSO_F_DLFCN_BIND_VAR				 101
-#define DSO_F_DLFCN_LOAD				 102
-#define DSO_F_DLFCN_MERGER				 130
-#define DSO_F_DLFCN_NAME_CONVERTER			 123
-#define DSO_F_DLFCN_UNLOAD				 103
-#define DSO_F_DL_BIND_FUNC				 104
-#define DSO_F_DL_BIND_VAR				 105
-#define DSO_F_DL_LOAD					 106
-#define DSO_F_DL_MERGER					 131
-#define DSO_F_DL_NAME_CONVERTER				 124
-#define DSO_F_DL_UNLOAD					 107
-#define DSO_F_DSO_BIND_FUNC				 108
-#define DSO_F_DSO_BIND_VAR				 109
-#define DSO_F_DSO_CONVERT_FILENAME			 126
-#define DSO_F_DSO_CTRL					 110
-#define DSO_F_DSO_FREE					 111
-#define DSO_F_DSO_GET_FILENAME				 127
-#define DSO_F_DSO_GET_LOADED_FILENAME			 128
-#define DSO_F_DSO_GLOBAL_LOOKUP				 139
-#define DSO_F_DSO_LOAD					 112
-#define DSO_F_DSO_MERGE					 132
-#define DSO_F_DSO_NEW_METHOD				 113
-#define DSO_F_DSO_PATHBYADDR				 140
-#define DSO_F_DSO_SET_FILENAME				 129
-#define DSO_F_DSO_SET_NAME_CONVERTER			 122
-#define DSO_F_DSO_UP_REF				 114
-#define DSO_F_GLOBAL_LOOKUP_FUNC			 138
-#define DSO_F_PATHBYADDR				 137
-#define DSO_F_VMS_BIND_SYM				 115
-#define DSO_F_VMS_LOAD					 116
-#define DSO_F_VMS_MERGER				 133
-#define DSO_F_VMS_UNLOAD				 117
-#define DSO_F_WIN32_BIND_FUNC				 118
-#define DSO_F_WIN32_BIND_VAR				 119
-#define DSO_F_WIN32_GLOBALLOOKUP			 142
-#define DSO_F_WIN32_GLOBALLOOKUP_FUNC			 143
-#define DSO_F_WIN32_JOINER				 135
-#define DSO_F_WIN32_LOAD				 120
-#define DSO_F_WIN32_MERGER				 134
-#define DSO_F_WIN32_NAME_CONVERTER			 125
-#define DSO_F_WIN32_PATHBYADDR				 141
-#define DSO_F_WIN32_SPLITTER				 136
-#define DSO_F_WIN32_UNLOAD				 121
-
-/* Reason codes. */
-#define DSO_R_CTRL_FAILED				 100
-#define DSO_R_DSO_ALREADY_LOADED			 110
-#define DSO_R_EMPTY_FILE_STRUCTURE			 113
-#define DSO_R_FAILURE					 114
-#define DSO_R_FILENAME_TOO_BIG				 101
-#define DSO_R_FINISH_FAILED				 102
-#define DSO_R_INCORRECT_FILE_SYNTAX			 115
-#define DSO_R_LOAD_FAILED				 103
-#define DSO_R_NAME_TRANSLATION_FAILED			 109
-#define DSO_R_NO_FILENAME				 111
-#define DSO_R_NO_FILE_SPECIFICATION			 116
-#define DSO_R_NULL_HANDLE				 104
-#define DSO_R_SET_FILENAME_FAILED			 112
-#define DSO_R_STACK_ERROR				 105
-#define DSO_R_SYM_FAILURE				 106
-#define DSO_R_UNLOAD_FAILED				 107
-#define DSO_R_UNSUPPORTED				 108
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/dtls1.h b/dep/include/openssl/dtls1.h
deleted file mode 100644
index 2900d1d8a..000000000
--- a/dep/include/openssl/dtls1.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* ssl/dtls1.h */
-/* 
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_DTLS1_H 
-#define HEADER_DTLS1_H 
-
-#include <openssl/buffer.h>
-#include <openssl/pqueue.h>
-#ifdef OPENSSL_SYS_VMS
-#include <resource.h>
-#include <sys/timeb.h>
-#endif
-#ifdef OPENSSL_SYS_WIN32
-/* Needed for struct timeval */
-#include <winsock.h>
-#elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
-#include <sys/timeval.h>
-#else
-#include <sys/time.h>
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#define DTLS1_VERSION			0xFEFF
-#define DTLS1_BAD_VER			0x0100
-
-#if 0
-/* this alert description is not specified anywhere... */
-#define DTLS1_AD_MISSING_HANDSHAKE_MESSAGE    110
-#endif
-
-/* lengths of messages */
-#define DTLS1_COOKIE_LENGTH                     256
-
-#define DTLS1_RT_HEADER_LENGTH                  13
-
-#define DTLS1_HM_HEADER_LENGTH                  12
-
-#define DTLS1_HM_BAD_FRAGMENT                   -2
-#define DTLS1_HM_FRAGMENT_RETRY                 -3
-
-#define DTLS1_CCS_HEADER_LENGTH                  1
-
-#ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
-#define DTLS1_AL_HEADER_LENGTH                   7
-#else
-#define DTLS1_AL_HEADER_LENGTH                   2
-#endif
-
-
-typedef struct dtls1_bitmap_st
-	{
-	unsigned long map;		/* track 32 packets on 32-bit systems
-					   and 64 - on 64-bit systems */
-	unsigned char max_seq_num[8];	/* max record number seen so far,
-					   64-bit value in big-endian
-					   encoding */
-	} DTLS1_BITMAP;
-
-struct dtls1_retransmit_state
-	{
-	EVP_CIPHER_CTX *enc_write_ctx;	/* cryptographic state */
-	EVP_MD_CTX *write_hash;			/* used for mac generation */
-#ifndef OPENSSL_NO_COMP
-	COMP_CTX *compress;				/* compression */
-#else
-	char *compress;	
-#endif
-	SSL_SESSION *session;
-	unsigned short epoch;
-	};
-
-struct hm_header_st
-	{
-	unsigned char type;
-	unsigned long msg_len;
-	unsigned short seq;
-	unsigned long frag_off;
-	unsigned long frag_len;
-	unsigned int is_ccs;
-	struct dtls1_retransmit_state saved_retransmit_state;
-	};
-
-struct ccs_header_st
-	{
-	unsigned char type;
-	unsigned short seq;
-	};
-
-struct dtls1_timeout_st
-	{
-	/* Number of read timeouts so far */
-	unsigned int read_timeouts;
-	
-	/* Number of write timeouts so far */
-	unsigned int write_timeouts;
-	
-	/* Number of alerts received so far */
-	unsigned int num_alerts;
-	};
-
-typedef struct record_pqueue_st
-	{
-	unsigned short epoch;
-	pqueue q;
-	} record_pqueue;
-
-typedef struct hm_fragment_st
-	{
-	struct hm_header_st msg_header;
-	unsigned char *fragment;
-	unsigned char *reassembly;
-	} hm_fragment;
-
-typedef struct dtls1_state_st
-	{
-	unsigned int send_cookie;
-	unsigned char cookie[DTLS1_COOKIE_LENGTH];
-	unsigned char rcvd_cookie[DTLS1_COOKIE_LENGTH];
-	unsigned int cookie_len;
-
-	/* 
-	 * The current data and handshake epoch.  This is initially
-	 * undefined, and starts at zero once the initial handshake is
-	 * completed 
-	 */
-	unsigned short r_epoch;
-	unsigned short w_epoch;
-
-	/* records being received in the current epoch */
-	DTLS1_BITMAP bitmap;
-
-	/* renegotiation starts a new set of sequence numbers */
-	DTLS1_BITMAP next_bitmap;
-
-	/* handshake message numbers */
-	unsigned short handshake_write_seq;
-	unsigned short next_handshake_write_seq;
-
-	unsigned short handshake_read_seq;
-
-	/* save last sequence number for retransmissions */
-	unsigned char last_write_sequence[8];
-
-	/* Received handshake records (processed and unprocessed) */
-	record_pqueue unprocessed_rcds;
-	record_pqueue processed_rcds;
-
-	/* Buffered handshake messages */
-	pqueue buffered_messages;
-
-	/* Buffered (sent) handshake records */
-	pqueue sent_messages;
-
-	/* Buffered application records.
-	 * Only for records between CCS and Finished
-	 * to prevent either protocol violation or
-	 * unnecessary message loss.
-	 */
-	record_pqueue buffered_app_data;
-
-	/* Is set when listening for new connections with dtls1_listen() */
-	unsigned int listen;
-
-	unsigned int mtu; /* max DTLS packet size */
-
-	struct hm_header_st w_msg_hdr;
-	struct hm_header_st r_msg_hdr;
-
-	struct dtls1_timeout_st timeout;
-
-	/* Indicates when the last handshake msg sent will timeout */
-	struct timeval next_timeout;
-
-	/* Timeout duration */
-	unsigned short timeout_duration;
-
-	/* storage for Alert/Handshake protocol data received but not
-	 * yet processed by ssl3_read_bytes: */
-	unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];
-	unsigned int alert_fragment_len;
-	unsigned char handshake_fragment[DTLS1_HM_HEADER_LENGTH];
-	unsigned int handshake_fragment_len;
-
-	unsigned int retransmitting;
-	unsigned int change_cipher_spec_ok;
-
-	} DTLS1_STATE;
-
-typedef struct dtls1_record_data_st
-	{
-	unsigned char *packet;
-	unsigned int   packet_length;
-	SSL3_BUFFER    rbuf;
-	SSL3_RECORD    rrec;
-	} DTLS1_RECORD_DATA;
-
-
-/* Timeout multipliers (timeout slice is defined in apps/timeouts.h */
-#define DTLS1_TMO_READ_COUNT                      2
-#define DTLS1_TMO_WRITE_COUNT                     2
-
-#define DTLS1_TMO_ALERT_COUNT                     12
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/dep/include/openssl/e_os2.h b/dep/include/openssl/e_os2.h
deleted file mode 100644
index 4c785c62c..000000000
--- a/dep/include/openssl/e_os2.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/* e_os2.h */
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <openssl/opensslconf.h>
-
-#ifndef HEADER_E_OS2_H
-#define HEADER_E_OS2_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************
- * Detect operating systems.  This probably needs completing.
- * The result is that at least one OPENSSL_SYS_os macro should be defined.
- * However, if none is defined, Unix is assumed.
- **/
-
-#define OPENSSL_SYS_UNIX
-
-/* ----------------------- Macintosh, before MacOS X ----------------------- */
-#if defined(__MWERKS__) && defined(macintosh) || defined(OPENSSL_SYSNAME_MAC)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_MACINTOSH_CLASSIC
-#endif
-
-/* ----------------------- NetWare ----------------------------------------- */
-#if defined(NETWARE) || defined(OPENSSL_SYSNAME_NETWARE)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_NETWARE
-#endif
-
-/* ---------------------- Microsoft operating systems ---------------------- */
-
-/* Note that MSDOS actually denotes 32-bit environments running on top of
-   MS-DOS, such as DJGPP one. */
-#if defined(OPENSSL_SYSNAME_MSDOS)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_MSDOS
-#endif
-
-/* For 32 bit environment, there seems to be the CygWin environment and then
-   all the others that try to do the same thing Microsoft does... */
-#if defined(OPENSSL_SYSNAME_UWIN)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_WIN32_UWIN
-#else
-# if defined(__CYGWIN32__) || defined(OPENSSL_SYSNAME_CYGWIN32)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_WIN32_CYGWIN
-# else
-#  if defined(_WIN32) || defined(OPENSSL_SYSNAME_WIN32)
-#   undef OPENSSL_SYS_UNIX
-#   define OPENSSL_SYS_WIN32
-#  endif
-#  if defined(OPENSSL_SYSNAME_WINNT)
-#   undef OPENSSL_SYS_UNIX
-#   define OPENSSL_SYS_WINNT
-#  endif
-#  if defined(OPENSSL_SYSNAME_WINCE)
-#   undef OPENSSL_SYS_UNIX
-#   define OPENSSL_SYS_WINCE
-#  endif
-# endif
-#endif
-
-/* Anything that tries to look like Microsoft is "Windows" */
-#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINNT) || defined(OPENSSL_SYS_WINCE)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_WINDOWS
-# ifndef OPENSSL_SYS_MSDOS
-#  define OPENSSL_SYS_MSDOS
-# endif
-#endif
-
-/* DLL settings.  This part is a bit tough, because it's up to the application
-   implementor how he or she will link the application, so it requires some
-   macro to be used. */
-#ifdef OPENSSL_SYS_WINDOWS
-# ifndef OPENSSL_OPT_WINDLL
-#  if defined(_WINDLL) /* This is used when building OpenSSL to indicate that
-                          DLL linkage should be used */
-#   define OPENSSL_OPT_WINDLL
-#  endif
-# endif
-#endif
-
-/* -------------------------------- OpenVMS -------------------------------- */
-#if defined(__VMS) || defined(VMS) || defined(OPENSSL_SYSNAME_VMS)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_VMS
-# if defined(__DECC)
-#  define OPENSSL_SYS_VMS_DECC
-# elif defined(__DECCXX)
-#  define OPENSSL_SYS_VMS_DECC
-#  define OPENSSL_SYS_VMS_DECCXX
-# else
-#  define OPENSSL_SYS_VMS_NODECC
-# endif
-#endif
-
-/* --------------------------------- OS/2 ---------------------------------- */
-#if defined(__EMX__) || defined(__OS2__)
-# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_OS2
-#endif
-
-/* --------------------------------- Unix ---------------------------------- */
-#ifdef OPENSSL_SYS_UNIX
-# if defined(linux) || defined(__linux__) || defined(OPENSSL_SYSNAME_LINUX)
-#  define OPENSSL_SYS_LINUX
-# endif
-# ifdef OPENSSL_SYSNAME_MPE
-#  define OPENSSL_SYS_MPE
-# endif
-# ifdef OPENSSL_SYSNAME_SNI
-#  define OPENSSL_SYS_SNI
-# endif
-# ifdef OPENSSL_SYSNAME_ULTRASPARC
-#  define OPENSSL_SYS_ULTRASPARC
-# endif
-# ifdef OPENSSL_SYSNAME_NEWS4
-#  define OPENSSL_SYS_NEWS4
-# endif
-# ifdef OPENSSL_SYSNAME_MACOSX
-#  define OPENSSL_SYS_MACOSX
-# endif
-# ifdef OPENSSL_SYSNAME_MACOSX_RHAPSODY
-#  define OPENSSL_SYS_MACOSX_RHAPSODY
-#  define OPENSSL_SYS_MACOSX
-# endif
-# ifdef OPENSSL_SYSNAME_SUNOS
-#  define OPENSSL_SYS_SUNOS
-#endif
-# if defined(_CRAY) || defined(OPENSSL_SYSNAME_CRAY)
-#  define OPENSSL_SYS_CRAY
-# endif
-# if defined(_AIX) || defined(OPENSSL_SYSNAME_AIX)
-#  define OPENSSL_SYS_AIX
-# endif
-#endif
-
-/* --------------------------------- VOS ----------------------------------- */
-#ifdef OPENSSL_SYSNAME_VOS
-# define OPENSSL_SYS_VOS
-#endif
-
-/* ------------------------------- VxWorks --------------------------------- */
-#ifdef OPENSSL_SYSNAME_VXWORKS
-# define OPENSSL_SYS_VXWORKS
-#endif
-
-/* --------------------------------- BeOS ---------------------------------- */
-#if defined(__BEOS__)
-# define OPENSSL_SYS_BEOS
-# include <sys/socket.h>
-# if defined(BONE_VERSION)
-#  define OPENSSL_SYS_BEOS_BONE
-# else
-#  define OPENSSL_SYS_BEOS_R5
-# endif
-#endif
-
-/**
- * That's it for OS-specific stuff
- *****************************************************************************/
-
-
-/* Specials for I/O an exit */
-#ifdef OPENSSL_SYS_MSDOS
-# define OPENSSL_UNISTD_IO <io.h>
-# define OPENSSL_DECLARE_EXIT extern void exit(int);
-#else
-# define OPENSSL_UNISTD_IO OPENSSL_UNISTD
-# define OPENSSL_DECLARE_EXIT /* declared in unistd.h */
-#endif
-
-/* Definitions of OPENSSL_GLOBAL and OPENSSL_EXTERN, to define and declare
-   certain global symbols that, with some compilers under VMS, have to be
-   defined and declared explicitely with globaldef and globalref.
-   Definitions of OPENSSL_EXPORT and OPENSSL_IMPORT, to define and declare
-   DLL exports and imports for compilers under Win32.  These are a little
-   more complicated to use.  Basically, for any library that exports some
-   global variables, the following code must be present in the header file
-   that declares them, before OPENSSL_EXTERN is used:
-
-   #ifdef SOME_BUILD_FLAG_MACRO
-   # undef OPENSSL_EXTERN
-   # define OPENSSL_EXTERN OPENSSL_EXPORT
-   #endif
-
-   The default is to have OPENSSL_EXPORT, OPENSSL_IMPORT and OPENSSL_GLOBAL
-   have some generally sensible values, and for OPENSSL_EXTERN to have the
-   value OPENSSL_IMPORT.
-*/
-
-#if defined(OPENSSL_SYS_VMS_NODECC)
-# define OPENSSL_EXPORT globalref
-# define OPENSSL_IMPORT globalref
-# define OPENSSL_GLOBAL globaldef
-#elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
-# define OPENSSL_EXPORT extern __declspec(dllexport)
-# define OPENSSL_IMPORT extern __declspec(dllimport)
-# define OPENSSL_GLOBAL
-#else
-# define OPENSSL_EXPORT extern
-# define OPENSSL_IMPORT extern
-# define OPENSSL_GLOBAL
-#endif
-#define OPENSSL_EXTERN OPENSSL_IMPORT
-
-/* Macros to allow global variables to be reached through function calls when
-   required (if a shared library version requires it, for example.
-   The way it's done allows definitions like this:
-
-	// in foobar.c
-	OPENSSL_IMPLEMENT_GLOBAL(int,foobar,0)
-	// in foobar.h
-	OPENSSL_DECLARE_GLOBAL(int,foobar);
-	#define foobar OPENSSL_GLOBAL_REF(foobar)
-*/
-#ifdef OPENSSL_EXPORT_VAR_AS_FUNCTION
-# define OPENSSL_IMPLEMENT_GLOBAL(type,name,value)			\
-	type *_shadow_##name(void)					\
-	{ static type _hide_##name=value; return &_hide_##name; }
-# define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
-# define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
-#else
-# define OPENSSL_IMPLEMENT_GLOBAL(type,name,value) OPENSSL_GLOBAL type _shadow_##name=value;
-# define OPENSSL_DECLARE_GLOBAL(type,name) OPENSSL_EXPORT type _shadow_##name
-# define OPENSSL_GLOBAL_REF(name) _shadow_##name
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/ebcdic.h b/dep/include/openssl/ebcdic.h
deleted file mode 100644
index 6d65afcf9..000000000
--- a/dep/include/openssl/ebcdic.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* crypto/ebcdic.h */
-
-#ifndef HEADER_EBCDIC_H
-#define HEADER_EBCDIC_H
-
-#include <sys/types.h>
-
-/* Avoid name clashes with other applications */
-#define os_toascii   _openssl_os_toascii
-#define os_toebcdic  _openssl_os_toebcdic
-#define ebcdic2ascii _openssl_ebcdic2ascii
-#define ascii2ebcdic _openssl_ascii2ebcdic
-
-extern const unsigned char os_toascii[256];
-extern const unsigned char os_toebcdic[256];
-void *ebcdic2ascii(void *dest, const void *srce, size_t count);
-void *ascii2ebcdic(void *dest, const void *srce, size_t count);
-
-#endif
diff --git a/dep/include/openssl/ec.h b/dep/include/openssl/ec.h
deleted file mode 100644
index ee7078130..000000000
--- a/dep/include/openssl/ec.h
+++ /dev/null
@@ -1,1100 +0,0 @@
-/* crypto/ec/ec.h */
-/*
- * Originally written by Bodo Moeller for the OpenSSL project.
- */
-/**
- * \file crypto/ec/ec.h Include file for the OpenSSL EC functions
- * \author Originally written by Bodo Moeller for the OpenSSL project
- */
-/* ====================================================================
- * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by 
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by 
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-#ifndef HEADER_EC_H
-#define HEADER_EC_H
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_EC
-#error EC is disabled.
-#endif
-
-#include <openssl/asn1.h>
-#include <openssl/symhacks.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#elif defined(__SUNPRO_C)
-# if __SUNPRO_C >= 0x520
-# pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
-# endif
-#endif
-
-  
-#ifndef OPENSSL_ECC_MAX_FIELD_BITS
-# define OPENSSL_ECC_MAX_FIELD_BITS 661
-#endif
-
-/** Enum for the point conversion form as defined in X9.62 (ECDSA)
- *  for the encoding of a elliptic curve point (x,y) */
-typedef enum {
-	/** the point is encoded as z||x, where the octet z specifies 
-	 *  which solution of the quadratic equation y is  */
-	POINT_CONVERSION_COMPRESSED = 2,
-	/** the point is encoded as z||x||y, where z is the octet 0x02  */
-	POINT_CONVERSION_UNCOMPRESSED = 4,
-	/** the point is encoded as z||x||y, where the octet z specifies
-         *  which solution of the quadratic equation y is  */
-	POINT_CONVERSION_HYBRID = 6
-} point_conversion_form_t;
-
-
-typedef struct ec_method_st EC_METHOD;
-
-typedef struct ec_group_st
-	/*
-	 EC_METHOD *meth;
-	 -- field definition
-	 -- curve coefficients
-	 -- optional generator with associated information (order, cofactor)
-	 -- optional extra data (precomputed table for fast computation of multiples of generator)
-	 -- ASN1 stuff
-	*/
-	EC_GROUP;
-
-typedef struct ec_point_st EC_POINT;
-
-
-/********************************************************************/
-/*               EC_METHODs for curves over GF(p)                   */       
-/********************************************************************/
-
-/** Returns the basic GFp ec methods which provides the basis for the
- *  optimized methods. 
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_simple_method(void);
-
-/** Returns GFp methods using montgomery multiplication.
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_mont_method(void);
-
-/** Returns GFp methods using optimized methods for NIST recommended curves
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nist_method(void);
-
-
-/********************************************************************/ 
-/*           EC_METHOD for curves over GF(2^m)                      */
-/********************************************************************/
-
-/** Returns the basic GF2m ec method 
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GF2m_simple_method(void);
-
-
-/********************************************************************/
-/*                   EC_GROUP functions                             */
-/********************************************************************/
-
-/** Creates a new EC_GROUP object
- *  \param   meth  EC_METHOD to use
- *  \return  newly created EC_GROUP object or NULL in case of an error.
- */
-EC_GROUP *EC_GROUP_new(const EC_METHOD *meth);
-
-/** Frees a EC_GROUP object
- *  \param  group  EC_GROUP object to be freed.
- */
-void EC_GROUP_free(EC_GROUP *group);
-
-/** Clears and frees a EC_GROUP object
- *  \param  group  EC_GROUP object to be cleared and freed.
- */
-void EC_GROUP_clear_free(EC_GROUP *group);
-
-/** Copies EC_GROUP objects. Note: both EC_GROUPs must use the same EC_METHOD.
- *  \param  dst  destination EC_GROUP object
- *  \param  src  source EC_GROUP object
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_GROUP_copy(EC_GROUP *dst, const EC_GROUP *src);
-
-/** Creates a new EC_GROUP object and copies the copies the content
- *  form src to the newly created EC_KEY object
- *  \param  src  source EC_GROUP object
- *  \return newly created EC_GROUP object or NULL in case of an error.
- */
-EC_GROUP *EC_GROUP_dup(const EC_GROUP *src);
-
-/** Returns the EC_METHOD of the EC_GROUP object.
- *  \param  group  EC_GROUP object 
- *  \return EC_METHOD used in this EC_GROUP object.
- */
-const EC_METHOD *EC_GROUP_method_of(const EC_GROUP *group);
-
-/** Returns the field type of the EC_METHOD.
- *  \param  meth  EC_METHOD object
- *  \return NID of the underlying field type OID.
- */
-int EC_METHOD_get_field_type(const EC_METHOD *meth);
-
-/** Sets the generator and it's order/cofactor of a EC_GROUP object.
- *  \param  group      EC_GROUP object 
- *  \param  generator  EC_POINT object with the generator.
- *  \param  order      the order of the group generated by the generator.
- *  \param  cofactor   the index of the sub-group generated by the generator
- *                     in the group of all points on the elliptic curve.
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator, const BIGNUM *order, const BIGNUM *cofactor);
-
-/** Returns the generator of a EC_GROUP object.
- *  \param  group  EC_GROUP object
- *  \return the currently used generator (possibly NULL).
- */
-const EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *group);
-
-/** Gets the order of a EC_GROUP
- *  \param  group  EC_GROUP object
- *  \param  order  BIGNUM to which the order is copied
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_get_order(const EC_GROUP *group, BIGNUM *order, BN_CTX *ctx);
-
-/** Gets the cofactor of a EC_GROUP
- *  \param  group     EC_GROUP object
- *  \param  cofactor  BIGNUM to which the cofactor is copied
- *  \param  ctx       BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_get_cofactor(const EC_GROUP *group, BIGNUM *cofactor, BN_CTX *ctx);
-
-/** Sets the name of a EC_GROUP object
- *  \param  group  EC_GROUP object
- *  \param  nid    NID of the curve name OID
- */
-void EC_GROUP_set_curve_name(EC_GROUP *group, int nid);
-
-/** Returns the curve name of a EC_GROUP object
- *  \param  group  EC_GROUP object
- *  \return NID of the curve name OID or 0 if not set.
- */
-int EC_GROUP_get_curve_name(const EC_GROUP *group);
-
-void EC_GROUP_set_asn1_flag(EC_GROUP *group, int flag);
-int EC_GROUP_get_asn1_flag(const EC_GROUP *group);
-
-void EC_GROUP_set_point_conversion_form(EC_GROUP *, point_conversion_form_t);
-point_conversion_form_t EC_GROUP_get_point_conversion_form(const EC_GROUP *);
-
-unsigned char *EC_GROUP_get0_seed(const EC_GROUP *);
-size_t EC_GROUP_get_seed_len(const EC_GROUP *);
-size_t EC_GROUP_set_seed(EC_GROUP *, const unsigned char *, size_t len);
-
-/** Sets the parameter of a ec over GFp defined by y^2 = x^3 + a*x + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM with the prime number
- *  \param  a      BIGNUM with parameter a of the equation
- *  \param  b      BIGNUM with parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-
-/** Gets the parameter of the ec over GFp defined by y^2 = x^3 + a*x + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM for the prime number
- *  \param  a      BIGNUM for parameter a of the equation
- *  \param  b      BIGNUM for parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx);
-
-/** Sets the parameter of a ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM with the polynomial defining the underlying field
- *  \param  a      BIGNUM with parameter a of the equation
- *  \param  b      BIGNUM with parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-
-/** Gets the parameter of the ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM for the polynomial defining the underlying field
- *  \param  a      BIGNUM for parameter a of the equation
- *  \param  b      BIGNUM for parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx);
-
-/** Returns the number of bits needed to represent a field element 
- *  \param  group  EC_GROUP object
- *  \return number of bits needed to represent a field element
- */
-int EC_GROUP_get_degree(const EC_GROUP *group);
-
-/** Checks whether the parameter in the EC_GROUP define a valid ec group
- *  \param  group  EC_GROUP object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if group is a valid ec group and 0 otherwise
- */
-int EC_GROUP_check(const EC_GROUP *group, BN_CTX *ctx);
-
-/** Checks whether the discriminant of the elliptic curve is zero or not
- *  \param  group  EC_GROUP object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if the discriminant is not zero and 0 otherwise
- */
-int EC_GROUP_check_discriminant(const EC_GROUP *group, BN_CTX *ctx);
-
-/** Compares two EC_GROUP objects
- *  \param  a    first EC_GROUP object
- *  \param  b    second EC_GROUP object
- *  \param  ctx  BN_CTX object (optional)
- *  \return 0 if both groups are equal and 1 otherwise
- */
-int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx);
-
-/* EC_GROUP_new_GF*() calls EC_GROUP_new() and EC_GROUP_set_GF*()
- * after choosing an appropriate EC_METHOD */
-
-/** Creates a new EC_GROUP object with the specified parameters defined
- *  over GFp (defined by the equation y^2 = x^3 + a*x + b)
- *  \param  p    BIGNUM with the prime number
- *  \param  a    BIGNUM with the parameter a of the equation
- *  \param  b    BIGNUM with the parameter b of the equation
- *  \param  ctx  BN_CTX object (optional)
- *  \return newly created EC_GROUP object with the specified parameters
- */
-EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-
-/** Creates a new EC_GROUP object with the specified parameters defined
- *  over GF2m (defined by the equation y^2 + x*y = x^3 + a*x^2 + b)
- *  \param  p    BIGNUM with the polynomial defining the underlying field
- *  \param  a    BIGNUM with the parameter a of the equation
- *  \param  b    BIGNUM with the parameter b of the equation
- *  \param  ctx  BN_CTX object (optional)
- *  \return newly created EC_GROUP object with the specified parameters
- */
-EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-
-/** Creates a EC_GROUP object with a curve specified by a NID
- *  \param  nid  NID of the OID of the curve name
- *  \return newly created EC_GROUP object with specified curve or NULL
- *          if an error occurred
- */
-EC_GROUP *EC_GROUP_new_by_curve_name(int nid);
-
-
-/********************************************************************/
-/*               handling of internal curves                        */
-/********************************************************************/
-
-typedef struct { 
-	int nid;
-	const char *comment;
-	} EC_builtin_curve;
-
-/* EC_builtin_curves(EC_builtin_curve *r, size_t size) returns number 
- * of all available curves or zero if a error occurred. 
- * In case r ist not zero nitems EC_builtin_curve structures 
- * are filled with the data of the first nitems internal groups */
-size_t EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
-
-
-/********************************************************************/
-/*                    EC_POINT functions                            */
-/********************************************************************/
-
-/** Creates a new EC_POINT object for the specified EC_GROUP
- *  \param  group  EC_GROUP the underlying EC_GROUP object
- *  \return newly created EC_POINT object or NULL if an error occurred
- */
-EC_POINT *EC_POINT_new(const EC_GROUP *group);
-
-/** Frees a EC_POINT object
- *  \param  point  EC_POINT object to be freed
- */
-void EC_POINT_free(EC_POINT *point);
-
-/** Clears and frees a EC_POINT object
- *  \param  point  EC_POINT object to be cleared and freed
- */
-void EC_POINT_clear_free(EC_POINT *point);
-
-/** Copies EC_POINT object
- *  \param  dst  destination EC_POINT object
- *  \param  src  source EC_POINT object
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_copy(EC_POINT *dst, const EC_POINT *src);
-
-/** Creates a new EC_POINT object and copies the content of the supplied
- *  EC_POINT
- *  \param  src    source EC_POINT object
- *  \param  group  underlying the EC_GROUP object
- *  \return newly created EC_POINT object or NULL if an error occurred 
- */
-EC_POINT *EC_POINT_dup(const EC_POINT *src, const EC_GROUP *group);
- 
-/** Returns the EC_METHOD used in EC_POINT object 
- *  \param  point  EC_POINT object
- *  \return the EC_METHOD used
- */
-const EC_METHOD *EC_POINT_method_of(const EC_POINT *point);
-
-/** Sets a point to infinity (neutral element)
- *  \param  group  underlying EC_GROUP object
- *  \param  point  EC_POINT to set to infinity
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_to_infinity(const EC_GROUP *group, EC_POINT *point);
-
-/** Sets the jacobian projective coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with the x-coordinate
- *  \param  y      BIGNUM with the y-coordinate
- *  \param  z      BIGNUM with the z-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
-	const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx);
-
-/** Gets the jacobian projective coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM for the x-coordinate
- *  \param  y      BIGNUM for the y-coordinate
- *  \param  z      BIGNUM for the z-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
-	const EC_POINT *p, BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *ctx);
-
-/** Sets the affine coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with the x-coordinate
- *  \param  y      BIGNUM with the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
-	const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx);
-
-/** Gets the affine coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM for the x-coordinate
- *  \param  y      BIGNUM for the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
-	const EC_POINT *p, BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
-
-/** Sets the x9.62 compressed coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with x-coordinate
- *  \param  y_bit  integer with the y-Bit (either 0 or 1)
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
-	const BIGNUM *x, int y_bit, BN_CTX *ctx);
-
-/** Sets the affine coordinates of a EC_POINT over GF2m
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with the x-coordinate
- *  \param  y      BIGNUM with the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p,
-	const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx);
-
-/** Gets the affine coordinates of a EC_POINT over GF2m
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM for the x-coordinate
- *  \param  y      BIGNUM for the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
-	const EC_POINT *p, BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
-
-/** Sets the x9.62 compressed coordinates of a EC_POINT over GF2m
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with x-coordinate
- *  \param  y_bit  integer with the y-Bit (either 0 or 1)
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p,
-	const BIGNUM *x, int y_bit, BN_CTX *ctx);
-
-/** Encodes a EC_POINT object to a octet string
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  form   point conversion form
- *  \param  buf    memory buffer for the result. If NULL the function returns
- *                 required buffer size.
- *  \param  len    length of the memory buffer
- *  \param  ctx    BN_CTX object (optional)
- *  \return the length of the encoded octet string or 0 if an error occurred
- */
-size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *p,
-	point_conversion_form_t form,
-        unsigned char *buf, size_t len, BN_CTX *ctx);
-
-/** Decodes a EC_POINT from a octet string
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  buf    memory buffer with the encoded ec point
- *  \param  len    length of the encoded ec point
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *p,
-        const unsigned char *buf, size_t len, BN_CTX *ctx);
-
-/* other interfaces to point2oct/oct2point: */
-BIGNUM *EC_POINT_point2bn(const EC_GROUP *, const EC_POINT *,
-	point_conversion_form_t form, BIGNUM *, BN_CTX *);
-EC_POINT *EC_POINT_bn2point(const EC_GROUP *, const BIGNUM *,
-	EC_POINT *, BN_CTX *);
-char *EC_POINT_point2hex(const EC_GROUP *, const EC_POINT *,
-	point_conversion_form_t form, BN_CTX *);
-EC_POINT *EC_POINT_hex2point(const EC_GROUP *, const char *,
-	EC_POINT *, BN_CTX *);
-
-
-/********************************************************************/
-/*         functions for doing EC_POINT arithmetic                  */
-/********************************************************************/
-
-/** Computes the sum of two EC_POINT 
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result (r = a + b)
- *  \param  a      EC_POINT object with the first summand
- *  \param  b      EC_POINT object with the second summand
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx);
-
-/** Computes the double of a EC_POINT
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result (r = 2 * a)
- *  \param  a      EC_POINT object 
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *ctx);
-
-/** Computes the inverse of a EC_POINT
- *  \param  group  underlying EC_GROUP object
- *  \param  a      EC_POINT object to be inverted (it's used for the result as well)
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_invert(const EC_GROUP *group, EC_POINT *a, BN_CTX *ctx);
-
-/** Checks whether the point is the neutral element of the group
- *  \param  group  the underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \return 1 if the point is the neutral element and 0 otherwise
- */
-int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *p);
-
-/** Checks whether the point is on the curve 
- *  \param  group  underlying EC_GROUP object
- *  \param  point  EC_POINT object to check
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if point if on the curve and 0 otherwise
- */
-int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_CTX *ctx);
-
-/** Compares two EC_POINTs 
- *  \param  group  underlying EC_GROUP object
- *  \param  a      first EC_POINT object
- *  \param  b      second EC_POINT object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 0 if both points are equal and a value != 0 otherwise
- */
-int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx);
-
-int EC_POINT_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *);
-int EC_POINTs_make_affine(const EC_GROUP *, size_t num, EC_POINT *[], BN_CTX *);
-
-/** Computes r = generator * n sum_{i=0}^num p[i] * m[i]
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result
- *  \param  n      BIGNUM with the multiplier for the group generator (optional)
- *  \param  num    number futher summands
- *  \param  p      array of size num of EC_POINT objects
- *  \param  m      array of size num of BIGNUM objects
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n, size_t num, const EC_POINT *p[], const BIGNUM *m[], BN_CTX *ctx);
-
-/** Computes r = generator * n + q * m
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result
- *  \param  n      BIGNUM with the multiplier for the group generator (optional)
- *  \param  q      EC_POINT object with the first factor of the second summand
- *  \param  m      BIGNUM with the second factor of the second summand
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n, const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx);
-
-/** Stores multiples of generator for faster point multiplication
- *  \param  group  EC_GROUP object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
-
-/** Reports whether a precomputation has been done
- *  \param  group  EC_GROUP object
- *  \return 1 if a pre-computation has been done and 0 otherwise
- */
-int EC_GROUP_have_precompute_mult(const EC_GROUP *group);
-
-
-/********************************************************************/
-/*                       ASN1 stuff                                 */
-/********************************************************************/
-
-/* EC_GROUP_get_basis_type() returns the NID of the basis type
- * used to represent the field elements */
-int EC_GROUP_get_basis_type(const EC_GROUP *);
-int EC_GROUP_get_trinomial_basis(const EC_GROUP *, unsigned int *k);
-int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1, 
-	unsigned int *k2, unsigned int *k3);
-
-#define OPENSSL_EC_NAMED_CURVE	0x001
-
-typedef struct ecpk_parameters_st ECPKPARAMETERS;
-
-EC_GROUP *d2i_ECPKParameters(EC_GROUP **, const unsigned char **in, long len);
-int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
-
-#define d2i_ECPKParameters_bio(bp,x) ASN1_d2i_bio_of(EC_GROUP,NULL,d2i_ECPKParameters,bp,x)
-#define i2d_ECPKParameters_bio(bp,x) ASN1_i2d_bio_of_const(EC_GROUP,i2d_ECPKParameters,bp,x)
-#define d2i_ECPKParameters_fp(fp,x) (EC_GROUP *)ASN1_d2i_fp(NULL, \
-                (char *(*)())d2i_ECPKParameters,(fp),(unsigned char **)(x))
-#define i2d_ECPKParameters_fp(fp,x) ASN1_i2d_fp(i2d_ECPKParameters,(fp), \
-		(unsigned char *)(x))
-
-#ifndef OPENSSL_NO_BIO
-int     ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
-#endif
-#ifndef OPENSSL_NO_FP_API
-int     ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
-#endif
-
-
-/********************************************************************/
-/*                      EC_KEY functions                            */
-/********************************************************************/
-
-typedef struct ec_key_st EC_KEY;
-
-/* some values for the encoding_flag */
-#define EC_PKEY_NO_PARAMETERS	0x001
-#define EC_PKEY_NO_PUBKEY	0x002
-
-/** Creates a new EC_KEY object.
- *  \return EC_KEY object or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_new(void);
-
-/** Creates a new EC_KEY object using a named curve as underlying
- *  EC_GROUP object.
- *  \param  nid  NID of the named curve.
- *  \return EC_KEY object or NULL if an error occurred. 
- */
-EC_KEY *EC_KEY_new_by_curve_name(int nid);
-
-/** Frees a EC_KEY object.
- *  \param  key  EC_KEY object to be freed.
- */
-void EC_KEY_free(EC_KEY *key);
-
-/** Copies a EC_KEY object.
- *  \param  dst  destination EC_KEY object
- *  \param  src  src EC_KEY object
- *  \return dst or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_copy(EC_KEY *dst, const EC_KEY *src);
-
-/** Creates a new EC_KEY object and copies the content from src to it.
- *  \param  src  the source EC_KEY object
- *  \return newly created EC_KEY object or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_dup(const EC_KEY *src);
-
-/** Increases the internal reference count of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_up_ref(EC_KEY *key);
-
-/** Returns the EC_GROUP object of a EC_KEY object
- *  \param  key  EC_KEY object
- *  \return the EC_GROUP object (possibly NULL).
- */
-const EC_GROUP *EC_KEY_get0_group(const EC_KEY *key);
-
-/** Sets the EC_GROUP of a EC_KEY object.
- *  \param  key    EC_KEY object
- *  \param  group  EC_GROUP to use in the EC_KEY object (note: the EC_KEY
- *                 object will use an own copy of the EC_GROUP).
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group);
-
-/** Returns the private key of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \return a BIGNUM with the private key (possibly NULL).
- */
-const BIGNUM *EC_KEY_get0_private_key(const EC_KEY *key);
-
-/** Sets the private key of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \param  prv  BIGNUM with the private key (note: the EC_KEY object
- *               will use an own copy of the BIGNUM).
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *prv);
-
-/** Returns the public key of a EC_KEY object.
- *  \param  key  the EC_KEY object
- *  \return a EC_POINT object with the public key (possibly NULL)
- */
-const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *key);
-
-/** Sets the public key of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \param  pub  EC_POINT object with the public key (note: the EC_KEY object
- *               will use an own copy of the EC_POINT object).
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub);
-
-unsigned EC_KEY_get_enc_flags(const EC_KEY *key);
-void EC_KEY_set_enc_flags(EC_KEY *, unsigned int);
-point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *);
-void EC_KEY_set_conv_form(EC_KEY *, point_conversion_form_t);
-/* functions to set/get method specific data  */
-void *EC_KEY_get_key_method_data(EC_KEY *, 
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
-void EC_KEY_insert_key_method_data(EC_KEY *, void *data,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
-/* wrapper functions for the underlying EC_GROUP object */
-void EC_KEY_set_asn1_flag(EC_KEY *, int);
-
-/** Creates a table of pre-computed multiples of the generator to 
- *  accelerate further EC_KEY operations.
- *  \param  key  EC_KEY object
- *  \param  ctx  BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_precompute_mult(EC_KEY *key, BN_CTX *ctx);
-
-/** Creates a new ec private (and optional a new public) key.
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_generate_key(EC_KEY *key);
-
-/** Verifies that a private and/or public key is valid.
- *  \param  key  the EC_KEY object
- *  \return 1 on success and 0 otherwise.
- */
-int EC_KEY_check_key(const EC_KEY *key);
-
-
-/********************************************************************/
-/*        de- and encoding functions for SEC1 ECPrivateKey          */
-/********************************************************************/
-
-/** Decodes a private key from a memory buffer.
- *  \param  key  a pointer to a EC_KEY object which should be used (or NULL)
- *  \param  in   pointer to memory with the DER encoded private key
- *  \param  len  length of the DER encoded private key
- *  \return the decoded private key or NULL if an error occurred.
- */
-EC_KEY *d2i_ECPrivateKey(EC_KEY **key, const unsigned char **in, long len);
-
-/** Encodes a private key object and stores the result in a buffer.
- *  \param  key  the EC_KEY object to encode
- *  \param  out  the buffer for the result (if NULL the function returns number
- *               of bytes needed).
- *  \return 1 on success and 0 if an error occurred.
- */
-int i2d_ECPrivateKey(EC_KEY *key, unsigned char **out);
-
-
-/********************************************************************/
-/*        de- and encoding functions for EC parameters              */
-/********************************************************************/
-
-/** Decodes ec parameter from a memory buffer.
- *  \param  key  a pointer to a EC_KEY object which should be used (or NULL)
- *  \param  in   pointer to memory with the DER encoded ec parameters
- *  \param  len  length of the DER encoded ec parameters
- *  \return a EC_KEY object with the decoded parameters or NULL if an error
- *          occurred.
- */
-EC_KEY *d2i_ECParameters(EC_KEY **key, const unsigned char **in, long len);
-
-/** Encodes ec parameter and stores the result in a buffer.
- *  \param  key  the EC_KEY object with ec paramters to encode
- *  \param  out  the buffer for the result (if NULL the function returns number
- *               of bytes needed).
- *  \return 1 on success and 0 if an error occurred.
- */
-int i2d_ECParameters(EC_KEY *key, unsigned char **out);
-
-
-/********************************************************************/
-/*         de- and encoding functions for EC public key             */
-/*         (octet string, not DER -- hence 'o2i' and 'i2o')         */
-/********************************************************************/
-
-/** Decodes a ec public key from a octet string.
- *  \param  key  a pointer to a EC_KEY object which should be used
- *  \param  in   memory buffer with the encoded public key
- *  \param  len  length of the encoded public key
- *  \return EC_KEY object with decoded public key or NULL if an error
- *          occurred.
- */
-EC_KEY *o2i_ECPublicKey(EC_KEY **key, const unsigned char **in, long len);
-
-/** Encodes a ec public key in an octet string.
- *  \param  key  the EC_KEY object with the public key
- *  \param  out  the buffer for the result (if NULL the function returns number
- *               of bytes needed).
- *  \return 1 on success and 0 if an error occurred
- */
-int i2o_ECPublicKey(EC_KEY *key, unsigned char **out);
-
-#ifndef OPENSSL_NO_BIO
-/** Prints out the ec parameters on human readable form.
- *  \param  bp   BIO object to which the information is printed
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred
- */
-int	ECParameters_print(BIO *bp, const EC_KEY *key);
-
-/** Prints out the contents of a EC_KEY object
- *  \param  bp   BIO object to which the information is printed
- *  \param  key  EC_KEY object
- *  \param  off  line offset 
- *  \return 1 on success and 0 if an error occurred
- */
-int	EC_KEY_print(BIO *bp, const EC_KEY *key, int off);
-
-#endif
-#ifndef OPENSSL_NO_FP_API
-/** Prints out the ec parameters on human readable form.
- *  \param  fp   file descriptor to which the information is printed
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred
- */
-int	ECParameters_print_fp(FILE *fp, const EC_KEY *key);
-
-/** Prints out the contents of a EC_KEY object
- *  \param  fp   file descriptor to which the information is printed
- *  \param  key  EC_KEY object
- *  \param  off  line offset 
- *  \return 1 on success and 0 if an error occurred
- */
-int	EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
-
-#endif
-
-#define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
-
-#ifndef __cplusplus
-#if defined(__SUNPRO_C)
-#  if __SUNPRO_C >= 0x520
-# pragma error_messages (default,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
-#  endif
-# endif
-#endif
-
-#define EVP_PKEY_CTX_set_ec_paramgen_curve_nid(ctx, nid) \
-	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_PARAMGEN, \
-				EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, nid, NULL)
-
-
-#define EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID		(EVP_PKEY_ALG_CTRL + 1)
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_EC_strings(void);
-
-/* Error codes for the EC functions. */
-
-/* Function codes. */
-#define EC_F_COMPUTE_WNAF				 143
-#define EC_F_D2I_ECPARAMETERS				 144
-#define EC_F_D2I_ECPKPARAMETERS				 145
-#define EC_F_D2I_ECPRIVATEKEY				 146
-#define EC_F_DO_EC_KEY_PRINT				 221
-#define EC_F_ECKEY_PARAM2TYPE				 223
-#define EC_F_ECKEY_PARAM_DECODE				 212
-#define EC_F_ECKEY_PRIV_DECODE				 213
-#define EC_F_ECKEY_PRIV_ENCODE				 214
-#define EC_F_ECKEY_PUB_DECODE				 215
-#define EC_F_ECKEY_PUB_ENCODE				 216
-#define EC_F_ECKEY_TYPE2PARAM				 220
-#define EC_F_ECPARAMETERS_PRINT				 147
-#define EC_F_ECPARAMETERS_PRINT_FP			 148
-#define EC_F_ECPKPARAMETERS_PRINT			 149
-#define EC_F_ECPKPARAMETERS_PRINT_FP			 150
-#define EC_F_ECP_NIST_MOD_192				 203
-#define EC_F_ECP_NIST_MOD_224				 204
-#define EC_F_ECP_NIST_MOD_256				 205
-#define EC_F_ECP_NIST_MOD_521				 206
-#define EC_F_EC_ASN1_GROUP2CURVE			 153
-#define EC_F_EC_ASN1_GROUP2FIELDID			 154
-#define EC_F_EC_ASN1_GROUP2PARAMETERS			 155
-#define EC_F_EC_ASN1_GROUP2PKPARAMETERS			 156
-#define EC_F_EC_ASN1_PARAMETERS2GROUP			 157
-#define EC_F_EC_ASN1_PKPARAMETERS2GROUP			 158
-#define EC_F_EC_EX_DATA_SET_DATA			 211
-#define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY		 208
-#define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT	 159
-#define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE		 195
-#define EC_F_EC_GF2M_SIMPLE_OCT2POINT			 160
-#define EC_F_EC_GF2M_SIMPLE_POINT2OCT			 161
-#define EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES 162
-#define EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES 163
-#define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES	 164
-#define EC_F_EC_GFP_MONT_FIELD_DECODE			 133
-#define EC_F_EC_GFP_MONT_FIELD_ENCODE			 134
-#define EC_F_EC_GFP_MONT_FIELD_MUL			 131
-#define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE		 209
-#define EC_F_EC_GFP_MONT_FIELD_SQR			 132
-#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE		 189
-#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP		 135
-#define EC_F_EC_GFP_NIST_FIELD_MUL			 200
-#define EC_F_EC_GFP_NIST_FIELD_SQR			 201
-#define EC_F_EC_GFP_NIST_GROUP_SET_CURVE		 202
-#define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT	 165
-#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE		 166
-#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP		 100
-#define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR		 101
-#define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE			 102
-#define EC_F_EC_GFP_SIMPLE_OCT2POINT			 103
-#define EC_F_EC_GFP_SIMPLE_POINT2OCT			 104
-#define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE		 137
-#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES	 167
-#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP 105
-#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES	 168
-#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP 128
-#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES	 169
-#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP 129
-#define EC_F_EC_GROUP_CHECK				 170
-#define EC_F_EC_GROUP_CHECK_DISCRIMINANT		 171
-#define EC_F_EC_GROUP_COPY				 106
-#define EC_F_EC_GROUP_GET0_GENERATOR			 139
-#define EC_F_EC_GROUP_GET_COFACTOR			 140
-#define EC_F_EC_GROUP_GET_CURVE_GF2M			 172
-#define EC_F_EC_GROUP_GET_CURVE_GFP			 130
-#define EC_F_EC_GROUP_GET_DEGREE			 173
-#define EC_F_EC_GROUP_GET_ORDER				 141
-#define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS		 193
-#define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS		 194
-#define EC_F_EC_GROUP_NEW				 108
-#define EC_F_EC_GROUP_NEW_BY_CURVE_NAME			 174
-#define EC_F_EC_GROUP_NEW_FROM_DATA			 175
-#define EC_F_EC_GROUP_PRECOMPUTE_MULT			 142
-#define EC_F_EC_GROUP_SET_CURVE_GF2M			 176
-#define EC_F_EC_GROUP_SET_CURVE_GFP			 109
-#define EC_F_EC_GROUP_SET_EXTRA_DATA			 110
-#define EC_F_EC_GROUP_SET_GENERATOR			 111
-#define EC_F_EC_KEY_CHECK_KEY				 177
-#define EC_F_EC_KEY_COPY				 178
-#define EC_F_EC_KEY_GENERATE_KEY			 179
-#define EC_F_EC_KEY_NEW					 182
-#define EC_F_EC_KEY_PRINT				 180
-#define EC_F_EC_KEY_PRINT_FP				 181
-#define EC_F_EC_POINTS_MAKE_AFFINE			 136
-#define EC_F_EC_POINT_ADD				 112
-#define EC_F_EC_POINT_CMP				 113
-#define EC_F_EC_POINT_COPY				 114
-#define EC_F_EC_POINT_DBL				 115
-#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M	 183
-#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP	 116
-#define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP	 117
-#define EC_F_EC_POINT_INVERT				 210
-#define EC_F_EC_POINT_IS_AT_INFINITY			 118
-#define EC_F_EC_POINT_IS_ON_CURVE			 119
-#define EC_F_EC_POINT_MAKE_AFFINE			 120
-#define EC_F_EC_POINT_MUL				 184
-#define EC_F_EC_POINT_NEW				 121
-#define EC_F_EC_POINT_OCT2POINT				 122
-#define EC_F_EC_POINT_POINT2OCT				 123
-#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M	 185
-#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP	 124
-#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M	 186
-#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP	 125
-#define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP	 126
-#define EC_F_EC_POINT_SET_TO_INFINITY			 127
-#define EC_F_EC_PRE_COMP_DUP				 207
-#define EC_F_EC_PRE_COMP_NEW				 196
-#define EC_F_EC_WNAF_MUL				 187
-#define EC_F_EC_WNAF_PRECOMPUTE_MULT			 188
-#define EC_F_I2D_ECPARAMETERS				 190
-#define EC_F_I2D_ECPKPARAMETERS				 191
-#define EC_F_I2D_ECPRIVATEKEY				 192
-#define EC_F_I2O_ECPUBLICKEY				 151
-#define EC_F_O2I_ECPUBLICKEY				 152
-#define EC_F_OLD_EC_PRIV_DECODE				 222
-#define EC_F_PKEY_EC_CTRL				 197
-#define EC_F_PKEY_EC_CTRL_STR				 198
-#define EC_F_PKEY_EC_DERIVE				 217
-#define EC_F_PKEY_EC_KEYGEN				 199
-#define EC_F_PKEY_EC_PARAMGEN				 219
-#define EC_F_PKEY_EC_SIGN				 218
-
-/* Reason codes. */
-#define EC_R_ASN1_ERROR					 115
-#define EC_R_ASN1_UNKNOWN_FIELD				 116
-#define EC_R_BUFFER_TOO_SMALL				 100
-#define EC_R_D2I_ECPKPARAMETERS_FAILURE			 117
-#define EC_R_DECODE_ERROR				 142
-#define EC_R_DISCRIMINANT_IS_ZERO			 118
-#define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE		 119
-#define EC_R_FIELD_TOO_LARGE				 143
-#define EC_R_GROUP2PKPARAMETERS_FAILURE			 120
-#define EC_R_I2D_ECPKPARAMETERS_FAILURE			 121
-#define EC_R_INCOMPATIBLE_OBJECTS			 101
-#define EC_R_INVALID_ARGUMENT				 112
-#define EC_R_INVALID_COMPRESSED_POINT			 110
-#define EC_R_INVALID_COMPRESSION_BIT			 109
-#define EC_R_INVALID_CURVE				 141
-#define EC_R_INVALID_DIGEST_TYPE			 138
-#define EC_R_INVALID_ENCODING				 102
-#define EC_R_INVALID_FIELD				 103
-#define EC_R_INVALID_FORM				 104
-#define EC_R_INVALID_GROUP_ORDER			 122
-#define EC_R_INVALID_PENTANOMIAL_BASIS			 132
-#define EC_R_INVALID_PRIVATE_KEY			 123
-#define EC_R_INVALID_TRINOMIAL_BASIS			 137
-#define EC_R_KEYS_NOT_SET				 140
-#define EC_R_MISSING_PARAMETERS				 124
-#define EC_R_MISSING_PRIVATE_KEY			 125
-#define EC_R_NOT_A_NIST_PRIME				 135
-#define EC_R_NOT_A_SUPPORTED_NIST_PRIME			 136
-#define EC_R_NOT_IMPLEMENTED				 126
-#define EC_R_NOT_INITIALIZED				 111
-#define EC_R_NO_FIELD_MOD				 133
-#define EC_R_NO_PARAMETERS_SET				 139
-#define EC_R_PASSED_NULL_PARAMETER			 134
-#define EC_R_PKPARAMETERS2GROUP_FAILURE			 127
-#define EC_R_POINT_AT_INFINITY				 106
-#define EC_R_POINT_IS_NOT_ON_CURVE			 107
-#define EC_R_SLOT_FULL					 108
-#define EC_R_UNDEFINED_GENERATOR			 113
-#define EC_R_UNDEFINED_ORDER				 128
-#define EC_R_UNKNOWN_GROUP				 129
-#define EC_R_UNKNOWN_ORDER				 114
-#define EC_R_UNSUPPORTED_FIELD				 131
-#define EC_R_WRONG_ORDER				 130
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/ecdh.h b/dep/include/openssl/ecdh.h
deleted file mode 100644
index b4b58ee65..000000000
--- a/dep/include/openssl/ecdh.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* crypto/ecdh/ecdh.h */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
- * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
- * to the OpenSSL project.
- *
- * The ECC Code is licensed pursuant to the OpenSSL open source
- * license provided below.
- *
- * The ECDH software is originally written by Douglas Stebila of
- * Sun Microsystems Laboratories.
- *
- */
-/* ====================================================================
- * Copyright (c) 2000-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_ECDH_H
-#define HEADER_ECDH_H
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_ECDH
-#error ECDH is disabled.
-#endif
-
-#include <openssl/ec.h>
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-const ECDH_METHOD *ECDH_OpenSSL(void);
-
-void	  ECDH_set_default_method(const ECDH_METHOD *);
-const ECDH_METHOD *ECDH_get_default_method(void);
-int 	  ECDH_set_method(EC_KEY *, const ECDH_METHOD *);
-
-int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh,
-                     void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen));
-
-int 	  ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new 
-		*new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int 	  ECDH_set_ex_data(EC_KEY *d, int idx, void *arg);
-void 	  *ECDH_get_ex_data(EC_KEY *d, int idx);
-
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ECDH_strings(void);
-
-/* Error codes for the ECDH functions. */
-
-/* Function codes. */
-#define ECDH_F_ECDH_COMPUTE_KEY				 100
-#define ECDH_F_ECDH_DATA_NEW_METHOD			 101
-
-/* Reason codes. */
-#define ECDH_R_KDF_FAILED				 102
-#define ECDH_R_NO_PRIVATE_VALUE				 100
-#define ECDH_R_POINT_ARITHMETIC_FAILURE			 101
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/ecdsa.h b/dep/include/openssl/ecdsa.h
deleted file mode 100644
index e61c53981..000000000
--- a/dep/include/openssl/ecdsa.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/* crypto/ecdsa/ecdsa.h */
-/**
- * \file   crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions
- * \author Written by Nils Larsch for the OpenSSL project
- */
-/* ====================================================================
- * Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_ECDSA_H
-#define HEADER_ECDSA_H
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_ECDSA
-#error ECDSA is disabled.
-#endif
-
-#include <openssl/ec.h>
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct ECDSA_SIG_st
-	{
-	BIGNUM *r;
-	BIGNUM *s;
-	} ECDSA_SIG;
-
-/** Allocates and initialize a ECDSA_SIG structure
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_SIG_new(void);
-
-/** frees a ECDSA_SIG structure
- *  \param  sig  pointer to the ECDSA_SIG structure
- */
-void	  ECDSA_SIG_free(ECDSA_SIG *sig);
-
-/** DER encode content of ECDSA_SIG object (note: this function modifies *pp
- *  (*pp += length of the DER encoded signature)).
- *  \param  sig  pointer to the ECDSA_SIG object
- *  \param  pp   pointer to a unsigned char pointer for the output or NULL
- *  \return the length of the DER encoded ECDSA_SIG object or 0 
- */
-int	  i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **pp);
-
-/** Decodes a DER encoded ECDSA signature (note: this function changes *pp
- *  (*pp += len)). 
- *  \param  sig  pointer to ECDSA_SIG pointer (may be NULL)
- *  \param  pp   memory buffer with the DER encoded signature
- *  \param  len  length of the buffer
- *  \return pointer to the decoded ECDSA_SIG structure (or NULL)
- */
-ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **sig, const unsigned char **pp, long len);
-
-/** Computes the ECDSA signature of the given hash value using
- *  the supplied private key and returns the created signature.
- *  \param  dgst      pointer to the hash value
- *  \param  dgst_len  length of the hash value
- *  \param  eckey     EC_KEY object containing a private EC key
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst,int dgst_len,EC_KEY *eckey);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  kinv     BIGNUM with a pre-computed inverse k (optional)
- *  \param  rp       BIGNUM with a pre-computed rp value (optioanl), 
- *                   see ECDSA_sign_setup
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen, 
-		const BIGNUM *kinv, const BIGNUM *rp, EC_KEY *eckey);
-
-/** Verifies that the supplied signature is a valid ECDSA
- *  signature of the supplied hash value using the supplied public key.
- *  \param  dgst      pointer to the hash value
- *  \param  dgst_len  length of the hash value
- *  \param  sig       ECDSA_SIG structure
- *  \param  eckey     EC_KEY object containing a public EC key
- *  \return 1 if the signature is valid, 0 if the signature is invalid
- *          and -1 on error
- */
-int	  ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
-		const ECDSA_SIG *sig, EC_KEY* eckey);
-
-const ECDSA_METHOD *ECDSA_OpenSSL(void);
-
-/** Sets the default ECDSA method
- *  \param  meth  new default ECDSA_METHOD
- */
-void	  ECDSA_set_default_method(const ECDSA_METHOD *meth);
-
-/** Returns the default ECDSA method
- *  \return pointer to ECDSA_METHOD structure containing the default method
- */
-const ECDSA_METHOD *ECDSA_get_default_method(void);
-
-/** Sets method to be used for the ECDSA operations
- *  \param  eckey  EC_KEY object
- *  \param  meth   new method
- *  \return 1 on success and 0 otherwise 
- */
-int 	  ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth);
-
-/** Returns the maximum length of the DER encoded signature
- *  \param  eckey  EC_KEY object
- *  \return numbers of bytes required for the DER encoded signature
- */
-int	  ECDSA_size(const EC_KEY *eckey);
-
-/** Precompute parts of the signing operation
- *  \param  eckey  EC_KEY object containing a private EC key
- *  \param  ctx    BN_CTX object (optional)
- *  \param  kinv   BIGNUM pointer for the inverse of k
- *  \param  rp     BIGNUM pointer for x coordinate of k * generator
- *  \return 1 on success and 0 otherwise
- */
-int 	  ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinv, 
-		BIGNUM **rp);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  sig      memory for the DER encoded created signature
- *  \param  siglen   pointer to the length of the returned signature
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return 1 on success and 0 otherwise
- */
-int	  ECDSA_sign(int type, const unsigned char *dgst, int dgstlen, 
-		unsigned char *sig, unsigned int *siglen, EC_KEY *eckey);
-
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  sig      buffer to hold the DER encoded signature
- *  \param  siglen   pointer to the length of the returned signature
- *  \param  kinv     BIGNUM with a pre-computed inverse k (optional)
- *  \param  rp       BIGNUM with a pre-computed rp value (optioanl), 
- *                   see ECDSA_sign_setup
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return 1 on success and 0 otherwise
- */
-int	  ECDSA_sign_ex(int type, const unsigned char *dgst, int dgstlen, 
-		unsigned char *sig, unsigned int *siglen, const BIGNUM *kinv,
-		const BIGNUM *rp, EC_KEY *eckey);
-
-/** Verifies that the given signature is valid ECDSA signature
- *  of the supplied hash value using the specified public key.
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value 
- *  \param  dgstlen  length of the hash value
- *  \param  sig      pointer to the DER encoded signature
- *  \param  siglen   length of the DER encoded signature
- *  \param  eckey    EC_KEY object containing a public EC key
- *  \return 1 if the signature is valid, 0 if the signature is invalid
- *          and -1 on error
- */
-int 	  ECDSA_verify(int type, const unsigned char *dgst, int dgstlen, 
-		const unsigned char *sig, int siglen, EC_KEY *eckey);
-
-/* the standard ex_data functions */
-int 	  ECDSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new 
-		*new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int 	  ECDSA_set_ex_data(EC_KEY *d, int idx, void *arg);
-void 	  *ECDSA_get_ex_data(EC_KEY *d, int idx);
-
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ECDSA_strings(void);
-
-/* Error codes for the ECDSA functions. */
-
-/* Function codes. */
-#define ECDSA_F_ECDSA_DATA_NEW_METHOD			 100
-#define ECDSA_F_ECDSA_DO_SIGN				 101
-#define ECDSA_F_ECDSA_DO_VERIFY				 102
-#define ECDSA_F_ECDSA_SIGN_SETUP			 103
-
-/* Reason codes. */
-#define ECDSA_R_BAD_SIGNATURE				 100
-#define ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE		 101
-#define ECDSA_R_ERR_EC_LIB				 102
-#define ECDSA_R_MISSING_PARAMETERS			 103
-#define ECDSA_R_NEED_NEW_SETUP_VALUES			 106
-#define ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED		 104
-#define ECDSA_R_SIGNATURE_MALLOC_FAILED			 105
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/engine.h b/dep/include/openssl/engine.h
deleted file mode 100644
index 943aeae21..000000000
--- a/dep/include/openssl/engine.h
+++ /dev/null
@@ -1,833 +0,0 @@
-/* openssl/engine.h */
-/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
- * project 2000.
- */
-/* ====================================================================
- * Copyright (c) 1999-2004 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_ENGINE_H
-#define HEADER_ENGINE_H
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_ENGINE
-#error ENGINE is disabled.
-#endif
-
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
-#ifndef OPENSSL_NO_ECDH
-#include <openssl/ecdh.h>
-#endif
-#ifndef OPENSSL_NO_ECDSA
-#include <openssl/ecdsa.h>
-#endif
-#include <openssl/rand.h>
-#include <openssl/ui.h>
-#include <openssl/err.h>
-#endif
-
-#include <openssl/ossl_typ.h>
-#include <openssl/symhacks.h>
-
-#include <openssl/x509.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* These flags are used to control combinations of algorithm (methods)
- * by bitwise "OR"ing. */
-#define ENGINE_METHOD_RSA		(unsigned int)0x0001
-#define ENGINE_METHOD_DSA		(unsigned int)0x0002
-#define ENGINE_METHOD_DH		(unsigned int)0x0004
-#define ENGINE_METHOD_RAND		(unsigned int)0x0008
-#define ENGINE_METHOD_ECDH		(unsigned int)0x0010
-#define ENGINE_METHOD_ECDSA		(unsigned int)0x0020
-#define ENGINE_METHOD_CIPHERS		(unsigned int)0x0040
-#define ENGINE_METHOD_DIGESTS		(unsigned int)0x0080
-#define ENGINE_METHOD_STORE		(unsigned int)0x0100
-#define ENGINE_METHOD_PKEY_METHS	(unsigned int)0x0200
-#define ENGINE_METHOD_PKEY_ASN1_METHS	(unsigned int)0x0400
-/* Obvious all-or-nothing cases. */
-#define ENGINE_METHOD_ALL		(unsigned int)0xFFFF
-#define ENGINE_METHOD_NONE		(unsigned int)0x0000
-
-/* This(ese) flag(s) controls behaviour of the ENGINE_TABLE mechanism used
- * internally to control registration of ENGINE implementations, and can be set
- * by ENGINE_set_table_flags(). The "NOINIT" flag prevents attempts to
- * initialise registered ENGINEs if they are not already initialised. */
-#define ENGINE_TABLE_FLAG_NOINIT	(unsigned int)0x0001
-
-/* ENGINE flags that can be set by ENGINE_set_flags(). */
-/* #define ENGINE_FLAGS_MALLOCED	0x0001 */ /* Not used */
-
-/* This flag is for ENGINEs that wish to handle the various 'CMD'-related
- * control commands on their own. Without this flag, ENGINE_ctrl() handles these
- * control commands on behalf of the ENGINE using their "cmd_defns" data. */
-#define ENGINE_FLAGS_MANUAL_CMD_CTRL	(int)0x0002
-
-/* This flag is for ENGINEs who return new duplicate structures when found via
- * "ENGINE_by_id()". When an ENGINE must store state (eg. if ENGINE_ctrl()
- * commands are called in sequence as part of some stateful process like
- * key-generation setup and execution), it can set this flag - then each attempt
- * to obtain the ENGINE will result in it being copied into a new structure.
- * Normally, ENGINEs don't declare this flag so ENGINE_by_id() just increments
- * the existing ENGINE's structural reference count. */
-#define ENGINE_FLAGS_BY_ID_COPY		(int)0x0004
-
-/* ENGINEs can support their own command types, and these flags are used in
- * ENGINE_CTRL_GET_CMD_FLAGS to indicate to the caller what kind of input each
- * command expects. Currently only numeric and string input is supported. If a
- * control command supports none of the _NUMERIC, _STRING, or _NO_INPUT options,
- * then it is regarded as an "internal" control command - and not for use in
- * config setting situations. As such, they're not available to the
- * ENGINE_ctrl_cmd_string() function, only raw ENGINE_ctrl() access. Changes to
- * this list of 'command types' should be reflected carefully in
- * ENGINE_cmd_is_executable() and ENGINE_ctrl_cmd_string(). */
-
-/* accepts a 'long' input value (3rd parameter to ENGINE_ctrl) */
-#define ENGINE_CMD_FLAG_NUMERIC		(unsigned int)0x0001
-/* accepts string input (cast from 'void*' to 'const char *', 4th parameter to
- * ENGINE_ctrl) */
-#define ENGINE_CMD_FLAG_STRING		(unsigned int)0x0002
-/* Indicates that the control command takes *no* input. Ie. the control command
- * is unparameterised. */
-#define ENGINE_CMD_FLAG_NO_INPUT	(unsigned int)0x0004
-/* Indicates that the control command is internal. This control command won't
- * be shown in any output, and is only usable through the ENGINE_ctrl_cmd()
- * function. */
-#define ENGINE_CMD_FLAG_INTERNAL	(unsigned int)0x0008
-
-/* NB: These 3 control commands are deprecated and should not be used. ENGINEs
- * relying on these commands should compile conditional support for
- * compatibility (eg. if these symbols are defined) but should also migrate the
- * same functionality to their own ENGINE-specific control functions that can be
- * "discovered" by calling applications. The fact these control commands
- * wouldn't be "executable" (ie. usable by text-based config) doesn't change the
- * fact that application code can find and use them without requiring per-ENGINE
- * hacking. */
-
-/* These flags are used to tell the ctrl function what should be done.
- * All command numbers are shared between all engines, even if some don't
- * make sense to some engines.  In such a case, they do nothing but return
- * the error ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED. */
-#define ENGINE_CTRL_SET_LOGSTREAM		1
-#define ENGINE_CTRL_SET_PASSWORD_CALLBACK	2
-#define ENGINE_CTRL_HUP				3 /* Close and reinitialise any
-						     handles/connections etc. */
-#define ENGINE_CTRL_SET_USER_INTERFACE          4 /* Alternative to callback */
-#define ENGINE_CTRL_SET_CALLBACK_DATA           5 /* User-specific data, used
-						     when calling the password
-						     callback and the user
-						     interface */
-#define ENGINE_CTRL_LOAD_CONFIGURATION		6 /* Load a configuration, given
-						     a string that represents a
-						     file name or so */
-#define ENGINE_CTRL_LOAD_SECTION		7 /* Load data from a given
-						     section in the already loaded
-						     configuration */
-
-/* These control commands allow an application to deal with an arbitrary engine
- * in a dynamic way. Warn: Negative return values indicate errors FOR THESE
- * COMMANDS because zero is used to indicate 'end-of-list'. Other commands,
- * including ENGINE-specific command types, return zero for an error.
- *
- * An ENGINE can choose to implement these ctrl functions, and can internally
- * manage things however it chooses - it does so by setting the
- * ENGINE_FLAGS_MANUAL_CMD_CTRL flag (using ENGINE_set_flags()). Otherwise the
- * ENGINE_ctrl() code handles this on the ENGINE's behalf using the cmd_defns
- * data (set using ENGINE_set_cmd_defns()). This means an ENGINE's ctrl()
- * handler need only implement its own commands - the above "meta" commands will
- * be taken care of. */
-
-/* Returns non-zero if the supplied ENGINE has a ctrl() handler. If "not", then
- * all the remaining control commands will return failure, so it is worth
- * checking this first if the caller is trying to "discover" the engine's
- * capabilities and doesn't want errors generated unnecessarily. */
-#define ENGINE_CTRL_HAS_CTRL_FUNCTION		10
-/* Returns a positive command number for the first command supported by the
- * engine. Returns zero if no ctrl commands are supported. */
-#define ENGINE_CTRL_GET_FIRST_CMD_TYPE		11
-/* The 'long' argument specifies a command implemented by the engine, and the
- * return value is the next command supported, or zero if there are no more. */
-#define ENGINE_CTRL_GET_NEXT_CMD_TYPE		12
-/* The 'void*' argument is a command name (cast from 'const char *'), and the
- * return value is the command that corresponds to it. */
-#define ENGINE_CTRL_GET_CMD_FROM_NAME		13
-/* The next two allow a command to be converted into its corresponding string
- * form. In each case, the 'long' argument supplies the command. In the NAME_LEN
- * case, the return value is the length of the command name (not counting a
- * trailing EOL). In the NAME case, the 'void*' argument must be a string buffer
- * large enough, and it will be populated with the name of the command (WITH a
- * trailing EOL). */
-#define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD	14
-#define ENGINE_CTRL_GET_NAME_FROM_CMD		15
-/* The next two are similar but give a "short description" of a command. */
-#define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD	16
-#define ENGINE_CTRL_GET_DESC_FROM_CMD		17
-/* With this command, the return value is the OR'd combination of
- * ENGINE_CMD_FLAG_*** values that indicate what kind of input a given
- * engine-specific ctrl command expects. */
-#define ENGINE_CTRL_GET_CMD_FLAGS		18
-
-/* ENGINE implementations should start the numbering of their own control
- * commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc). */
-#define ENGINE_CMD_BASE				200
-
-/* NB: These 2 nCipher "chil" control commands are deprecated, and their
- * functionality is now available through ENGINE-specific control commands
- * (exposed through the above-mentioned 'CMD'-handling). Code using these 2
- * commands should be migrated to the more general command handling before these
- * are removed. */
-
-/* Flags specific to the nCipher "chil" engine */
-#define ENGINE_CTRL_CHIL_SET_FORKCHECK		100
-	/* Depending on the value of the (long)i argument, this sets or
-	 * unsets the SimpleForkCheck flag in the CHIL API to enable or
-	 * disable checking and workarounds for applications that fork().
-	 */
-#define ENGINE_CTRL_CHIL_NO_LOCKING		101
-	/* This prevents the initialisation function from providing mutex
-	 * callbacks to the nCipher library. */
-
-/* If an ENGINE supports its own specific control commands and wishes the
- * framework to handle the above 'ENGINE_CMD_***'-manipulation commands on its
- * behalf, it should supply a null-terminated array of ENGINE_CMD_DEFN entries
- * to ENGINE_set_cmd_defns(). It should also implement a ctrl() handler that
- * supports the stated commands (ie. the "cmd_num" entries as described by the
- * array). NB: The array must be ordered in increasing order of cmd_num.
- * "null-terminated" means that the last ENGINE_CMD_DEFN element has cmd_num set
- * to zero and/or cmd_name set to NULL. */
-typedef struct ENGINE_CMD_DEFN_st
-	{
-	unsigned int cmd_num; /* The command number */
-	const char *cmd_name; /* The command name itself */
-	const char *cmd_desc; /* A short description of the command */
-	unsigned int cmd_flags; /* The input the command expects */
-	} ENGINE_CMD_DEFN;
-
-/* Generic function pointer */
-typedef int (*ENGINE_GEN_FUNC_PTR)(void);
-/* Generic function pointer taking no arguments */
-typedef int (*ENGINE_GEN_INT_FUNC_PTR)(ENGINE *);
-/* Specific control function pointer */
-typedef int (*ENGINE_CTRL_FUNC_PTR)(ENGINE *, int, long, void *, void (*f)(void));
-/* Generic load_key function pointer */
-typedef EVP_PKEY * (*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *,
-	UI_METHOD *ui_method, void *callback_data);
-typedef int (*ENGINE_SSL_CLIENT_CERT_PTR)(ENGINE *, SSL *ssl,
-	STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **pkey,
-	STACK_OF(X509) **pother, UI_METHOD *ui_method, void *callback_data);
-/* These callback types are for an ENGINE's handler for cipher and digest logic.
- * These handlers have these prototypes;
- *   int foo(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid);
- *   int foo(ENGINE *e, const EVP_MD **digest, const int **nids, int nid);
- * Looking at how to implement these handlers in the case of cipher support, if
- * the framework wants the EVP_CIPHER for 'nid', it will call;
- *   foo(e, &p_evp_cipher, NULL, nid);    (return zero for failure)
- * If the framework wants a list of supported 'nid's, it will call;
- *   foo(e, NULL, &p_nids, 0); (returns number of 'nids' or -1 for error)
- */
-/* Returns to a pointer to the array of supported cipher 'nid's. If the second
- * parameter is non-NULL it is set to the size of the returned array. */
-typedef int (*ENGINE_CIPHERS_PTR)(ENGINE *, const EVP_CIPHER **, const int **, int);
-typedef int (*ENGINE_DIGESTS_PTR)(ENGINE *, const EVP_MD **, const int **, int);
-typedef int (*ENGINE_PKEY_METHS_PTR)(ENGINE *, EVP_PKEY_METHOD **, const int **, int);
-typedef int (*ENGINE_PKEY_ASN1_METHS_PTR)(ENGINE *, EVP_PKEY_ASN1_METHOD **, const int **, int);
-/* STRUCTURE functions ... all of these functions deal with pointers to ENGINE
- * structures where the pointers have a "structural reference". This means that
- * their reference is to allowed access to the structure but it does not imply
- * that the structure is functional. To simply increment or decrement the
- * structural reference count, use ENGINE_by_id and ENGINE_free. NB: This is not
- * required when iterating using ENGINE_get_next as it will automatically
- * decrement the structural reference count of the "current" ENGINE and
- * increment the structural reference count of the ENGINE it returns (unless it
- * is NULL). */
-
-/* Get the first/last "ENGINE" type available. */
-ENGINE *ENGINE_get_first(void);
-ENGINE *ENGINE_get_last(void);
-/* Iterate to the next/previous "ENGINE" type (NULL = end of the list). */
-ENGINE *ENGINE_get_next(ENGINE *e);
-ENGINE *ENGINE_get_prev(ENGINE *e);
-/* Add another "ENGINE" type into the array. */
-int ENGINE_add(ENGINE *e);
-/* Remove an existing "ENGINE" type from the array. */
-int ENGINE_remove(ENGINE *e);
-/* Retrieve an engine from the list by its unique "id" value. */
-ENGINE *ENGINE_by_id(const char *id);
-/* Add all the built-in engines. */
-void ENGINE_load_openssl(void);
-void ENGINE_load_dynamic(void);
-#ifndef OPENSSL_NO_STATIC_ENGINE
-void ENGINE_load_4758cca(void);
-void ENGINE_load_aep(void);
-void ENGINE_load_atalla(void);
-void ENGINE_load_chil(void);
-void ENGINE_load_cswift(void);
-void ENGINE_load_nuron(void);
-void ENGINE_load_sureware(void);
-void ENGINE_load_ubsec(void);
-void ENGINE_load_padlock(void);
-void ENGINE_load_capi(void);
-#ifndef OPENSSL_NO_GMP
-void ENGINE_load_gmp(void);
-#endif
-#ifndef OPENSSL_NO_GOST
-void ENGINE_load_gost(void);
-#endif
-#endif
-void ENGINE_load_cryptodev(void);
-void ENGINE_load_builtin_engines(void);
-
-/* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
- * "registry" handling. */
-unsigned int ENGINE_get_table_flags(void);
-void ENGINE_set_table_flags(unsigned int flags);
-
-/* Manage registration of ENGINEs per "table". For each type, there are 3
- * functions;
- *   ENGINE_register_***(e) - registers the implementation from 'e' (if it has one)
- *   ENGINE_unregister_***(e) - unregister the implementation from 'e'
- *   ENGINE_register_all_***() - call ENGINE_register_***() for each 'e' in the list
- * Cleanup is automatically registered from each table when required, so
- * ENGINE_cleanup() will reverse any "register" operations. */
-
-int ENGINE_register_RSA(ENGINE *e);
-void ENGINE_unregister_RSA(ENGINE *e);
-void ENGINE_register_all_RSA(void);
-
-int ENGINE_register_DSA(ENGINE *e);
-void ENGINE_unregister_DSA(ENGINE *e);
-void ENGINE_register_all_DSA(void);
-
-int ENGINE_register_ECDH(ENGINE *e);
-void ENGINE_unregister_ECDH(ENGINE *e);
-void ENGINE_register_all_ECDH(void);
-
-int ENGINE_register_ECDSA(ENGINE *e);
-void ENGINE_unregister_ECDSA(ENGINE *e);
-void ENGINE_register_all_ECDSA(void);
-
-int ENGINE_register_DH(ENGINE *e);
-void ENGINE_unregister_DH(ENGINE *e);
-void ENGINE_register_all_DH(void);
-
-int ENGINE_register_RAND(ENGINE *e);
-void ENGINE_unregister_RAND(ENGINE *e);
-void ENGINE_register_all_RAND(void);
-
-int ENGINE_register_STORE(ENGINE *e);
-void ENGINE_unregister_STORE(ENGINE *e);
-void ENGINE_register_all_STORE(void);
-
-int ENGINE_register_ciphers(ENGINE *e);
-void ENGINE_unregister_ciphers(ENGINE *e);
-void ENGINE_register_all_ciphers(void);
-
-int ENGINE_register_digests(ENGINE *e);
-void ENGINE_unregister_digests(ENGINE *e);
-void ENGINE_register_all_digests(void);
-
-int ENGINE_register_pkey_meths(ENGINE *e);
-void ENGINE_unregister_pkey_meths(ENGINE *e);
-void ENGINE_register_all_pkey_meths(void);
-
-int ENGINE_register_pkey_asn1_meths(ENGINE *e);
-void ENGINE_unregister_pkey_asn1_meths(ENGINE *e);
-void ENGINE_register_all_pkey_asn1_meths(void);
-
-/* These functions register all support from the above categories. Note, use of
- * these functions can result in static linkage of code your application may not
- * need. If you only need a subset of functionality, consider using more
- * selective initialisation. */
-int ENGINE_register_complete(ENGINE *e);
-int ENGINE_register_all_complete(void);
-
-/* Send parametrised control commands to the engine. The possibilities to send
- * down an integer, a pointer to data or a function pointer are provided. Any of
- * the parameters may or may not be NULL, depending on the command number. In
- * actuality, this function only requires a structural (rather than functional)
- * reference to an engine, but many control commands may require the engine be
- * functional. The caller should be aware of trying commands that require an
- * operational ENGINE, and only use functional references in such situations. */
-int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
-
-/* This function tests if an ENGINE-specific command is usable as a "setting".
- * Eg. in an application's config file that gets processed through
- * ENGINE_ctrl_cmd_string(). If this returns zero, it is not available to
- * ENGINE_ctrl_cmd_string(), only ENGINE_ctrl(). */
-int ENGINE_cmd_is_executable(ENGINE *e, int cmd);
-
-/* This function works like ENGINE_ctrl() with the exception of taking a
- * command name instead of a command number, and can handle optional commands.
- * See the comment on ENGINE_ctrl_cmd_string() for an explanation on how to
- * use the cmd_name and cmd_optional. */
-int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
-        long i, void *p, void (*f)(void), int cmd_optional);
-
-/* This function passes a command-name and argument to an ENGINE. The cmd_name
- * is converted to a command number and the control command is called using
- * 'arg' as an argument (unless the ENGINE doesn't support such a command, in
- * which case no control command is called). The command is checked for input
- * flags, and if necessary the argument will be converted to a numeric value. If
- * cmd_optional is non-zero, then if the ENGINE doesn't support the given
- * cmd_name the return value will be success anyway. This function is intended
- * for applications to use so that users (or config files) can supply
- * engine-specific config data to the ENGINE at run-time to control behaviour of
- * specific engines. As such, it shouldn't be used for calling ENGINE_ctrl()
- * functions that return data, deal with binary data, or that are otherwise
- * supposed to be used directly through ENGINE_ctrl() in application code. Any
- * "return" data from an ENGINE_ctrl() operation in this function will be lost -
- * the return value is interpreted as failure if the return value is zero,
- * success otherwise, and this function returns a boolean value as a result. In
- * other words, vendors of 'ENGINE'-enabled devices should write ENGINE
- * implementations with parameterisations that work in this scheme, so that
- * compliant ENGINE-based applications can work consistently with the same
- * configuration for the same ENGINE-enabled devices, across applications. */
-int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
-				int cmd_optional);
-
-/* These functions are useful for manufacturing new ENGINE structures. They
- * don't address reference counting at all - one uses them to populate an ENGINE
- * structure with personalised implementations of things prior to using it
- * directly or adding it to the builtin ENGINE list in OpenSSL. These are also
- * here so that the ENGINE structure doesn't have to be exposed and break binary
- * compatibility! */
-ENGINE *ENGINE_new(void);
-int ENGINE_free(ENGINE *e);
-int ENGINE_up_ref(ENGINE *e);
-int ENGINE_set_id(ENGINE *e, const char *id);
-int ENGINE_set_name(ENGINE *e, const char *name);
-int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);
-int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);
-int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth);
-int ENGINE_set_ECDSA(ENGINE *e, const ECDSA_METHOD *ecdsa_meth);
-int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth);
-int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth);
-int ENGINE_set_STORE(ENGINE *e, const STORE_METHOD *store_meth);
-int ENGINE_set_destroy_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f);
-int ENGINE_set_init_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f);
-int ENGINE_set_finish_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f);
-int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f);
-int ENGINE_set_load_privkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f);
-int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);
-int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
-				ENGINE_SSL_CLIENT_CERT_PTR loadssl_f);
-int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);
-int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);
-int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f);
-int ENGINE_set_pkey_asn1_meths(ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f);
-int ENGINE_set_flags(ENGINE *e, int flags);
-int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);
-/* These functions allow control over any per-structure ENGINE data. */
-int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-		CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);
-void *ENGINE_get_ex_data(const ENGINE *e, int idx);
-
-/* This function cleans up anything that needs it. Eg. the ENGINE_add() function
- * automatically ensures the list cleanup function is registered to be called
- * from ENGINE_cleanup(). Similarly, all ENGINE_register_*** functions ensure
- * ENGINE_cleanup() will clean up after them. */
-void ENGINE_cleanup(void);
-
-/* These return values from within the ENGINE structure. These can be useful
- * with functional references as well as structural references - it depends
- * which you obtained. Using the result for functional purposes if you only
- * obtained a structural reference may be problematic! */
-const char *ENGINE_get_id(const ENGINE *e);
-const char *ENGINE_get_name(const ENGINE *e);
-const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e);
-const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e);
-const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e);
-const ECDSA_METHOD *ENGINE_get_ECDSA(const ENGINE *e);
-const DH_METHOD *ENGINE_get_DH(const ENGINE *e);
-const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e);
-const STORE_METHOD *ENGINE_get_STORE(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_destroy_function(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_init_function(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_finish_function(const ENGINE *e);
-ENGINE_CTRL_FUNC_PTR ENGINE_get_ctrl_function(const ENGINE *e);
-ENGINE_LOAD_KEY_PTR ENGINE_get_load_privkey_function(const ENGINE *e);
-ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e);
-ENGINE_SSL_CLIENT_CERT_PTR ENGINE_get_ssl_client_cert_function(const ENGINE *e);
-ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e);
-ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e);
-ENGINE_PKEY_METHS_PTR ENGINE_get_pkey_meths(const ENGINE *e);
-ENGINE_PKEY_ASN1_METHS_PTR ENGINE_get_pkey_asn1_meths(const ENGINE *e);
-const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid);
-const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid);
-const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid);
-const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid);
-const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,
-					const char *str, int len);
-const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe,
-					const char *str, int len);
-const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e);
-int ENGINE_get_flags(const ENGINE *e);
-
-/* FUNCTIONAL functions. These functions deal with ENGINE structures
- * that have (or will) be initialised for use. Broadly speaking, the
- * structural functions are useful for iterating the list of available
- * engine types, creating new engine types, and other "list" operations.
- * These functions actually deal with ENGINEs that are to be used. As
- * such these functions can fail (if applicable) when particular
- * engines are unavailable - eg. if a hardware accelerator is not
- * attached or not functioning correctly. Each ENGINE has 2 reference
- * counts; structural and functional. Every time a functional reference
- * is obtained or released, a corresponding structural reference is
- * automatically obtained or released too. */
-
-/* Initialise a engine type for use (or up its reference count if it's
- * already in use). This will fail if the engine is not currently
- * operational and cannot initialise. */
-int ENGINE_init(ENGINE *e);
-/* Free a functional reference to a engine type. This does not require
- * a corresponding call to ENGINE_free as it also releases a structural
- * reference. */
-int ENGINE_finish(ENGINE *e);
-
-/* The following functions handle keys that are stored in some secondary
- * location, handled by the engine.  The storage may be on a card or
- * whatever. */
-EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
-	UI_METHOD *ui_method, void *callback_data);
-EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
-	UI_METHOD *ui_method, void *callback_data);
-int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,
-	STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **ppkey,
-	STACK_OF(X509) **pother,
-	UI_METHOD *ui_method, void *callback_data);
-
-/* This returns a pointer for the current ENGINE structure that
- * is (by default) performing any RSA operations. The value returned
- * is an incremented reference, so it should be free'd (ENGINE_finish)
- * before it is discarded. */
-ENGINE *ENGINE_get_default_RSA(void);
-/* Same for the other "methods" */
-ENGINE *ENGINE_get_default_DSA(void);
-ENGINE *ENGINE_get_default_ECDH(void);
-ENGINE *ENGINE_get_default_ECDSA(void);
-ENGINE *ENGINE_get_default_DH(void);
-ENGINE *ENGINE_get_default_RAND(void);
-/* These functions can be used to get a functional reference to perform
- * ciphering or digesting corresponding to "nid". */
-ENGINE *ENGINE_get_cipher_engine(int nid);
-ENGINE *ENGINE_get_digest_engine(int nid);
-ENGINE *ENGINE_get_pkey_meth_engine(int nid);
-ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid);
-
-/* This sets a new default ENGINE structure for performing RSA
- * operations. If the result is non-zero (success) then the ENGINE
- * structure will have had its reference count up'd so the caller
- * should still free their own reference 'e'. */
-int ENGINE_set_default_RSA(ENGINE *e);
-int ENGINE_set_default_string(ENGINE *e, const char *def_list);
-/* Same for the other "methods" */
-int ENGINE_set_default_DSA(ENGINE *e);
-int ENGINE_set_default_ECDH(ENGINE *e);
-int ENGINE_set_default_ECDSA(ENGINE *e);
-int ENGINE_set_default_DH(ENGINE *e);
-int ENGINE_set_default_RAND(ENGINE *e);
-int ENGINE_set_default_ciphers(ENGINE *e);
-int ENGINE_set_default_digests(ENGINE *e);
-int ENGINE_set_default_pkey_meths(ENGINE *e);
-int ENGINE_set_default_pkey_asn1_meths(ENGINE *e);
-
-/* The combination "set" - the flags are bitwise "OR"d from the
- * ENGINE_METHOD_*** defines above. As with the "ENGINE_register_complete()"
- * function, this function can result in unnecessary static linkage. If your
- * application requires only specific functionality, consider using more
- * selective functions. */
-int ENGINE_set_default(ENGINE *e, unsigned int flags);
-
-void ENGINE_add_conf_module(void);
-
-/* Deprecated functions ... */
-/* int ENGINE_clear_defaults(void); */
-
-/**************************/
-/* DYNAMIC ENGINE SUPPORT */
-/**************************/
-
-/* Binary/behaviour compatibility levels */
-#define OSSL_DYNAMIC_VERSION		(unsigned long)0x00020000
-/* Binary versions older than this are too old for us (whether we're a loader or
- * a loadee) */
-#define OSSL_DYNAMIC_OLDEST		(unsigned long)0x00020000
-
-/* When compiling an ENGINE entirely as an external shared library, loadable by
- * the "dynamic" ENGINE, these types are needed. The 'dynamic_fns' structure
- * type provides the calling application's (or library's) error functionality
- * and memory management function pointers to the loaded library. These should
- * be used/set in the loaded library code so that the loading application's
- * 'state' will be used/changed in all operations. The 'static_state' pointer
- * allows the loaded library to know if it shares the same static data as the
- * calling application (or library), and thus whether these callbacks need to be
- * set or not. */
-typedef void *(*dyn_MEM_malloc_cb)(size_t);
-typedef void *(*dyn_MEM_realloc_cb)(void *, size_t);
-typedef void (*dyn_MEM_free_cb)(void *);
-typedef struct st_dynamic_MEM_fns {
-	dyn_MEM_malloc_cb			malloc_cb;
-	dyn_MEM_realloc_cb			realloc_cb;
-	dyn_MEM_free_cb				free_cb;
-	} dynamic_MEM_fns;
-/* FIXME: Perhaps the memory and locking code (crypto.h) should declare and use
- * these types so we (and any other dependant code) can simplify a bit?? */
-typedef void (*dyn_lock_locking_cb)(int,int,const char *,int);
-typedef int (*dyn_lock_add_lock_cb)(int*,int,int,const char *,int);
-typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb)(
-						const char *,int);
-typedef void (*dyn_dynlock_lock_cb)(int,struct CRYPTO_dynlock_value *,
-						const char *,int);
-typedef void (*dyn_dynlock_destroy_cb)(struct CRYPTO_dynlock_value *,
-						const char *,int);
-typedef struct st_dynamic_LOCK_fns {
-	dyn_lock_locking_cb			lock_locking_cb;
-	dyn_lock_add_lock_cb			lock_add_lock_cb;
-	dyn_dynlock_create_cb			dynlock_create_cb;
-	dyn_dynlock_lock_cb			dynlock_lock_cb;
-	dyn_dynlock_destroy_cb			dynlock_destroy_cb;
-	} dynamic_LOCK_fns;
-/* The top-level structure */
-typedef struct st_dynamic_fns {
-	void 					*static_state;
-	const ERR_FNS				*err_fns;
-	const CRYPTO_EX_DATA_IMPL		*ex_data_fns;
-	dynamic_MEM_fns				mem_fns;
-	dynamic_LOCK_fns			lock_fns;
-	} dynamic_fns;
-
-/* The version checking function should be of this prototype. NB: The
- * ossl_version value passed in is the OSSL_DYNAMIC_VERSION of the loading code.
- * If this function returns zero, it indicates a (potential) version
- * incompatibility and the loaded library doesn't believe it can proceed.
- * Otherwise, the returned value is the (latest) version supported by the
- * loading library. The loader may still decide that the loaded code's version
- * is unsatisfactory and could veto the load. The function is expected to
- * be implemented with the symbol name "v_check", and a default implementation
- * can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */
-typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);
-#define IMPLEMENT_DYNAMIC_CHECK_FN() \
-	OPENSSL_EXPORT unsigned long v_check(unsigned long v); \
-	OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \
-		if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
-		return 0; }
-
-/* This function is passed the ENGINE structure to initialise with its own
- * function and command settings. It should not adjust the structural or
- * functional reference counts. If this function returns zero, (a) the load will
- * be aborted, (b) the previous ENGINE state will be memcpy'd back onto the
- * structure, and (c) the shared library will be unloaded. So implementations
- * should do their own internal cleanup in failure circumstances otherwise they
- * could leak. The 'id' parameter, if non-NULL, represents the ENGINE id that
- * the loader is looking for. If this is NULL, the shared library can choose to
- * return failure or to initialise a 'default' ENGINE. If non-NULL, the shared
- * library must initialise only an ENGINE matching the passed 'id'. The function
- * is expected to be implemented with the symbol name "bind_engine". A standard
- * implementation can be instantiated with IMPLEMENT_DYNAMIC_BIND_FN(fn) where
- * the parameter 'fn' is a callback function that populates the ENGINE structure
- * and returns an int value (zero for failure). 'fn' should have prototype;
- *    [static] int fn(ENGINE *e, const char *id); */
-typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,
-				const dynamic_fns *fns);
-#define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
-	OPENSSL_EXPORT \
-	int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \
-	OPENSSL_EXPORT \
-	int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \
-		if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \
-		if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \
-			fns->mem_fns.realloc_cb, fns->mem_fns.free_cb)) \
-			return 0; \
-		CRYPTO_set_locking_callback(fns->lock_fns.lock_locking_cb); \
-		CRYPTO_set_add_lock_callback(fns->lock_fns.lock_add_lock_cb); \
-		CRYPTO_set_dynlock_create_callback(fns->lock_fns.dynlock_create_cb); \
-		CRYPTO_set_dynlock_lock_callback(fns->lock_fns.dynlock_lock_cb); \
-		CRYPTO_set_dynlock_destroy_callback(fns->lock_fns.dynlock_destroy_cb); \
-		if(!CRYPTO_set_ex_data_implementation(fns->ex_data_fns)) \
-			return 0; \
-		if(!ERR_set_implementation(fns->err_fns)) return 0; \
-	skip_cbs: \
-		if(!fn(e,id)) return 0; \
-		return 1; }
-
-/* If the loading application (or library) and the loaded ENGINE library share
- * the same static data (eg. they're both dynamically linked to the same
- * libcrypto.so) we need a way to avoid trying to set system callbacks - this
- * would fail, and for the same reason that it's unnecessary to try. If the
- * loaded ENGINE has (or gets from through the loader) its own copy of the
- * libcrypto static data, we will need to set the callbacks. The easiest way to
- * detect this is to have a function that returns a pointer to some static data
- * and let the loading application and loaded ENGINE compare their respective
- * values. */
-void *ENGINE_get_static_state(void);
-
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
-void ENGINE_setup_bsd_cryptodev(void);
-#endif
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ENGINE_strings(void);
-
-/* Error codes for the ENGINE functions. */
-
-/* Function codes. */
-#define ENGINE_F_DYNAMIC_CTRL				 180
-#define ENGINE_F_DYNAMIC_GET_DATA_CTX			 181
-#define ENGINE_F_DYNAMIC_LOAD				 182
-#define ENGINE_F_DYNAMIC_SET_DATA_CTX			 183
-#define ENGINE_F_ENGINE_ADD				 105
-#define ENGINE_F_ENGINE_BY_ID				 106
-#define ENGINE_F_ENGINE_CMD_IS_EXECUTABLE		 170
-#define ENGINE_F_ENGINE_CTRL				 142
-#define ENGINE_F_ENGINE_CTRL_CMD			 178
-#define ENGINE_F_ENGINE_CTRL_CMD_STRING			 171
-#define ENGINE_F_ENGINE_FINISH				 107
-#define ENGINE_F_ENGINE_FREE_UTIL			 108
-#define ENGINE_F_ENGINE_GET_CIPHER			 185
-#define ENGINE_F_ENGINE_GET_DEFAULT_TYPE		 177
-#define ENGINE_F_ENGINE_GET_DIGEST			 186
-#define ENGINE_F_ENGINE_GET_NEXT			 115
-#define ENGINE_F_ENGINE_GET_PKEY_ASN1_METH		 193
-#define ENGINE_F_ENGINE_GET_PKEY_METH			 192
-#define ENGINE_F_ENGINE_GET_PREV			 116
-#define ENGINE_F_ENGINE_INIT				 119
-#define ENGINE_F_ENGINE_LIST_ADD			 120
-#define ENGINE_F_ENGINE_LIST_REMOVE			 121
-#define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY		 150
-#define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY			 151
-#define ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT		 194
-#define ENGINE_F_ENGINE_NEW				 122
-#define ENGINE_F_ENGINE_REMOVE				 123
-#define ENGINE_F_ENGINE_SET_DEFAULT_STRING		 189
-#define ENGINE_F_ENGINE_SET_DEFAULT_TYPE		 126
-#define ENGINE_F_ENGINE_SET_ID				 129
-#define ENGINE_F_ENGINE_SET_NAME			 130
-#define ENGINE_F_ENGINE_TABLE_REGISTER			 184
-#define ENGINE_F_ENGINE_UNLOAD_KEY			 152
-#define ENGINE_F_ENGINE_UNLOCKED_FINISH			 191
-#define ENGINE_F_ENGINE_UP_REF				 190
-#define ENGINE_F_INT_CTRL_HELPER			 172
-#define ENGINE_F_INT_ENGINE_CONFIGURE			 188
-#define ENGINE_F_INT_ENGINE_MODULE_INIT			 187
-#define ENGINE_F_LOG_MESSAGE				 141
-
-/* Reason codes. */
-#define ENGINE_R_ALREADY_LOADED				 100
-#define ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER		 133
-#define ENGINE_R_CMD_NOT_EXECUTABLE			 134
-#define ENGINE_R_COMMAND_TAKES_INPUT			 135
-#define ENGINE_R_COMMAND_TAKES_NO_INPUT			 136
-#define ENGINE_R_CONFLICTING_ENGINE_ID			 103
-#define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED		 119
-#define ENGINE_R_DH_NOT_IMPLEMENTED			 139
-#define ENGINE_R_DSA_NOT_IMPLEMENTED			 140
-#define ENGINE_R_DSO_FAILURE				 104
-#define ENGINE_R_DSO_NOT_FOUND				 132
-#define ENGINE_R_ENGINES_SECTION_ERROR			 148
-#define ENGINE_R_ENGINE_CONFIGURATION_ERROR		 102
-#define ENGINE_R_ENGINE_IS_NOT_IN_LIST			 105
-#define ENGINE_R_ENGINE_SECTION_ERROR			 149
-#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY		 128
-#define ENGINE_R_FAILED_LOADING_PUBLIC_KEY		 129
-#define ENGINE_R_FINISH_FAILED				 106
-#define ENGINE_R_GET_HANDLE_FAILED			 107
-#define ENGINE_R_ID_OR_NAME_MISSING			 108
-#define ENGINE_R_INIT_FAILED				 109
-#define ENGINE_R_INTERNAL_LIST_ERROR			 110
-#define ENGINE_R_INVALID_ARGUMENT			 143
-#define ENGINE_R_INVALID_CMD_NAME			 137
-#define ENGINE_R_INVALID_CMD_NUMBER			 138
-#define ENGINE_R_INVALID_INIT_VALUE			 151
-#define ENGINE_R_INVALID_STRING				 150
-#define ENGINE_R_NOT_INITIALISED			 117
-#define ENGINE_R_NOT_LOADED				 112
-#define ENGINE_R_NO_CONTROL_FUNCTION			 120
-#define ENGINE_R_NO_INDEX				 144
-#define ENGINE_R_NO_LOAD_FUNCTION			 125
-#define ENGINE_R_NO_REFERENCE				 130
-#define ENGINE_R_NO_SUCH_ENGINE				 116
-#define ENGINE_R_NO_UNLOAD_FUNCTION			 126
-#define ENGINE_R_PROVIDE_PARAMETERS			 113
-#define ENGINE_R_RSA_NOT_IMPLEMENTED			 141
-#define ENGINE_R_UNIMPLEMENTED_CIPHER			 146
-#define ENGINE_R_UNIMPLEMENTED_DIGEST			 147
-#define ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD	 101
-#define ENGINE_R_VERSION_INCOMPATIBILITY		 145
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/err.h b/dep/include/openssl/err.h
deleted file mode 100644
index b9f8c16d4..000000000
--- a/dep/include/openssl/err.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/* crypto/err/err.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_ERR_H
-#define HEADER_ERR_H
-
-#include <openssl/e_os2.h>
-
-#ifndef OPENSSL_NO_FP_API
-#include <stdio.h>
-#include <stdlib.h>
-#endif
-
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#ifndef OPENSSL_NO_LHASH
-#include <openssl/lhash.h>
-#endif
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#ifndef OPENSSL_NO_ERR
-#define ERR_PUT_error(a,b,c,d,e)	ERR_put_error(a,b,c,d,e)
-#else
-#define ERR_PUT_error(a,b,c,d,e)	ERR_put_error(a,b,c,NULL,0)
-#endif
-
-#include <errno.h>
-
-#define ERR_TXT_MALLOCED	0x01
-#define ERR_TXT_STRING		0x02
-
-#define ERR_FLAG_MARK		0x01
-
-#define ERR_NUM_ERRORS	16
-typedef struct err_state_st
-	{
-	CRYPTO_THREADID tid;
-	int err_flags[ERR_NUM_ERRORS];
-	unsigned long err_buffer[ERR_NUM_ERRORS];
-	char *err_data[ERR_NUM_ERRORS];
-	int err_data_flags[ERR_NUM_ERRORS];
-	const char *err_file[ERR_NUM_ERRORS];
-	int err_line[ERR_NUM_ERRORS];
-	int top,bottom;
-	} ERR_STATE;
-
-/* library */
-#define ERR_LIB_NONE		1
-#define ERR_LIB_SYS		2
-#define ERR_LIB_BN		3
-#define ERR_LIB_RSA		4
-#define ERR_LIB_DH		5
-#define ERR_LIB_EVP		6
-#define ERR_LIB_BUF		7
-#define ERR_LIB_OBJ		8
-#define ERR_LIB_PEM		9
-#define ERR_LIB_DSA		10
-#define ERR_LIB_X509		11
-/* #define ERR_LIB_METH         12 */
-#define ERR_LIB_ASN1		13
-#define ERR_LIB_CONF		14
-#define ERR_LIB_CRYPTO		15
-#define ERR_LIB_EC		16
-#define ERR_LIB_SSL		20
-/* #define ERR_LIB_SSL23        21 */
-/* #define ERR_LIB_SSL2         22 */
-/* #define ERR_LIB_SSL3         23 */
-/* #define ERR_LIB_RSAREF       30 */
-/* #define ERR_LIB_PROXY        31 */
-#define ERR_LIB_BIO		32
-#define ERR_LIB_PKCS7		33
-#define ERR_LIB_X509V3		34
-#define ERR_LIB_PKCS12		35
-#define ERR_LIB_RAND		36
-#define ERR_LIB_DSO		37
-#define ERR_LIB_ENGINE		38
-#define ERR_LIB_OCSP            39
-#define ERR_LIB_UI              40
-#define ERR_LIB_COMP            41
-#define ERR_LIB_ECDSA		42
-#define ERR_LIB_ECDH		43
-#define ERR_LIB_STORE           44
-#define ERR_LIB_FIPS		45
-#define ERR_LIB_CMS		46
-#define ERR_LIB_TS		47
-#define ERR_LIB_HMAC		48
-#define ERR_LIB_JPAKE		49
-
-#define ERR_LIB_USER		128
-
-#define SYSerr(f,r)  ERR_PUT_error(ERR_LIB_SYS,(f),(r),__FILE__,__LINE__)
-#define BNerr(f,r)   ERR_PUT_error(ERR_LIB_BN,(f),(r),__FILE__,__LINE__)
-#define RSAerr(f,r)  ERR_PUT_error(ERR_LIB_RSA,(f),(r),__FILE__,__LINE__)
-#define DHerr(f,r)   ERR_PUT_error(ERR_LIB_DH,(f),(r),__FILE__,__LINE__)
-#define EVPerr(f,r)  ERR_PUT_error(ERR_LIB_EVP,(f),(r),__FILE__,__LINE__)
-#define BUFerr(f,r)  ERR_PUT_error(ERR_LIB_BUF,(f),(r),__FILE__,__LINE__)
-#define OBJerr(f,r)  ERR_PUT_error(ERR_LIB_OBJ,(f),(r),__FILE__,__LINE__)
-#define PEMerr(f,r)  ERR_PUT_error(ERR_LIB_PEM,(f),(r),__FILE__,__LINE__)
-#define DSAerr(f,r)  ERR_PUT_error(ERR_LIB_DSA,(f),(r),__FILE__,__LINE__)
-#define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),__FILE__,__LINE__)
-#define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),__FILE__,__LINE__)
-#define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),__FILE__,__LINE__)
-#define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),__FILE__,__LINE__)
-#define ECerr(f,r)   ERR_PUT_error(ERR_LIB_EC,(f),(r),__FILE__,__LINE__)
-#define SSLerr(f,r)  ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__)
-#define BIOerr(f,r)  ERR_PUT_error(ERR_LIB_BIO,(f),(r),__FILE__,__LINE__)
-#define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),__FILE__,__LINE__)
-#define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),__FILE__,__LINE__)
-#define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),__FILE__,__LINE__)
-#define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),__FILE__,__LINE__)
-#define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),__FILE__,__LINE__)
-#define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),__FILE__,__LINE__)
-#define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),__FILE__,__LINE__)
-#define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),__FILE__,__LINE__)
-#define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),__FILE__,__LINE__)
-#define ECDSAerr(f,r)  ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__)
-#define ECDHerr(f,r)  ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__)
-#define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)
-#define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__)
-#define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)
-#define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)
-#define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)
-#define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)
-
-/* Borland C seems too stupid to be able to shift and do longs in
- * the pre-processor :-( */
-#define ERR_PACK(l,f,r)		(((((unsigned long)l)&0xffL)*0x1000000)| \
-				((((unsigned long)f)&0xfffL)*0x1000)| \
-				((((unsigned long)r)&0xfffL)))
-#define ERR_GET_LIB(l)		(int)((((unsigned long)l)>>24L)&0xffL)
-#define ERR_GET_FUNC(l)		(int)((((unsigned long)l)>>12L)&0xfffL)
-#define ERR_GET_REASON(l)	(int)((l)&0xfffL)
-#define ERR_FATAL_ERROR(l)	(int)((l)&ERR_R_FATAL)
-
-
-/* OS functions */
-#define SYS_F_FOPEN		1
-#define SYS_F_CONNECT		2
-#define SYS_F_GETSERVBYNAME	3
-#define SYS_F_SOCKET		4
-#define SYS_F_IOCTLSOCKET	5
-#define SYS_F_BIND		6
-#define SYS_F_LISTEN		7
-#define SYS_F_ACCEPT		8
-#define SYS_F_WSASTARTUP	9 /* Winsock stuff */
-#define SYS_F_OPENDIR		10
-#define SYS_F_FREAD		11
-
-
-/* reasons */
-#define ERR_R_SYS_LIB	ERR_LIB_SYS       /* 2 */
-#define ERR_R_BN_LIB	ERR_LIB_BN        /* 3 */
-#define ERR_R_RSA_LIB	ERR_LIB_RSA       /* 4 */
-#define ERR_R_DH_LIB	ERR_LIB_DH        /* 5 */
-#define ERR_R_EVP_LIB	ERR_LIB_EVP       /* 6 */
-#define ERR_R_BUF_LIB	ERR_LIB_BUF       /* 7 */
-#define ERR_R_OBJ_LIB	ERR_LIB_OBJ       /* 8 */
-#define ERR_R_PEM_LIB	ERR_LIB_PEM       /* 9 */
-#define ERR_R_DSA_LIB	ERR_LIB_DSA      /* 10 */
-#define ERR_R_X509_LIB	ERR_LIB_X509     /* 11 */
-#define ERR_R_ASN1_LIB	ERR_LIB_ASN1     /* 13 */
-#define ERR_R_CONF_LIB	ERR_LIB_CONF     /* 14 */
-#define ERR_R_CRYPTO_LIB ERR_LIB_CRYPTO  /* 15 */
-#define ERR_R_EC_LIB	ERR_LIB_EC       /* 16 */
-#define ERR_R_SSL_LIB	ERR_LIB_SSL      /* 20 */
-#define ERR_R_BIO_LIB	ERR_LIB_BIO      /* 32 */
-#define ERR_R_PKCS7_LIB	ERR_LIB_PKCS7    /* 33 */
-#define ERR_R_X509V3_LIB ERR_LIB_X509V3  /* 34 */
-#define ERR_R_PKCS12_LIB ERR_LIB_PKCS12  /* 35 */
-#define ERR_R_RAND_LIB	ERR_LIB_RAND     /* 36 */
-#define ERR_R_DSO_LIB	ERR_LIB_DSO      /* 37 */
-#define ERR_R_ENGINE_LIB ERR_LIB_ENGINE  /* 38 */
-#define ERR_R_OCSP_LIB  ERR_LIB_OCSP     /* 39 */
-#define ERR_R_UI_LIB    ERR_LIB_UI       /* 40 */
-#define ERR_R_COMP_LIB	ERR_LIB_COMP     /* 41 */
-#define ERR_R_ECDSA_LIB ERR_LIB_ECDSA	 /* 42 */
-#define ERR_R_ECDH_LIB  ERR_LIB_ECDH	 /* 43 */
-#define ERR_R_STORE_LIB ERR_LIB_STORE    /* 44 */
-#define ERR_R_TS_LIB	ERR_LIB_TS       /* 45 */
-
-#define ERR_R_NESTED_ASN1_ERROR			58
-#define ERR_R_BAD_ASN1_OBJECT_HEADER		59
-#define ERR_R_BAD_GET_ASN1_OBJECT_CALL		60
-#define ERR_R_EXPECTING_AN_ASN1_SEQUENCE	61
-#define ERR_R_ASN1_LENGTH_MISMATCH		62
-#define ERR_R_MISSING_ASN1_EOS			63
-
-/* fatal error */
-#define ERR_R_FATAL				64
-#define	ERR_R_MALLOC_FAILURE			(1|ERR_R_FATAL)
-#define	ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED	(2|ERR_R_FATAL)
-#define	ERR_R_PASSED_NULL_PARAMETER		(3|ERR_R_FATAL)
-#define	ERR_R_INTERNAL_ERROR			(4|ERR_R_FATAL)
-#define	ERR_R_DISABLED				(5|ERR_R_FATAL)
-
-/* 99 is the maximum possible ERR_R_... code, higher values
- * are reserved for the individual libraries */
-
-
-typedef struct ERR_string_data_st
-	{
-	unsigned long error;
-	const char *string;
-	} ERR_STRING_DATA;
-
-void ERR_put_error(int lib, int func,int reason,const char *file,int line);
-void ERR_set_error_data(char *data,int flags);
-
-unsigned long ERR_get_error(void);
-unsigned long ERR_get_error_line(const char **file,int *line);
-unsigned long ERR_get_error_line_data(const char **file,int *line,
-				      const char **data, int *flags);
-unsigned long ERR_peek_error(void);
-unsigned long ERR_peek_error_line(const char **file,int *line);
-unsigned long ERR_peek_error_line_data(const char **file,int *line,
-				       const char **data,int *flags);
-unsigned long ERR_peek_last_error(void);
-unsigned long ERR_peek_last_error_line(const char **file,int *line);
-unsigned long ERR_peek_last_error_line_data(const char **file,int *line,
-				       const char **data,int *flags);
-void ERR_clear_error(void );
-char *ERR_error_string(unsigned long e,char *buf);
-void ERR_error_string_n(unsigned long e, char *buf, size_t len);
-const char *ERR_lib_error_string(unsigned long e);
-const char *ERR_func_error_string(unsigned long e);
-const char *ERR_reason_error_string(unsigned long e);
-void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
-			 void *u);
-#ifndef OPENSSL_NO_FP_API
-void ERR_print_errors_fp(FILE *fp);
-#endif
-#ifndef OPENSSL_NO_BIO
-void ERR_print_errors(BIO *bp);
-void ERR_add_error_data(int num, ...);
-#endif
-void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
-void ERR_unload_strings(int lib,ERR_STRING_DATA str[]);
-void ERR_load_ERR_strings(void);
-void ERR_load_crypto_strings(void);
-void ERR_free_strings(void);
-
-void ERR_remove_thread_state(const CRYPTO_THREADID *tid);
-#ifndef OPENSSL_NO_DEPRECATED
-void ERR_remove_state(unsigned long pid); /* if zero we look it up */
-#endif
-ERR_STATE *ERR_get_state(void);
-
-#ifndef OPENSSL_NO_LHASH
-LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void);
-LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void);
-void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash);
-#endif
-
-int ERR_get_next_error_library(void);
-
-int ERR_set_mark(void);
-int ERR_pop_to_mark(void);
-
-/* Already defined in ossl_typ.h */
-/* typedef struct st_ERR_FNS ERR_FNS; */
-/* An application can use this function and provide the return value to loaded
- * modules that should use the application's ERR state/functionality */
-const ERR_FNS *ERR_get_implementation(void);
-/* A loaded module should call this function prior to any ERR operations using
- * the application's "ERR_FNS". */
-int ERR_set_implementation(const ERR_FNS *fns);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/evp.h b/dep/include/openssl/evp.h
deleted file mode 100644
index 9f9795e2d..000000000
--- a/dep/include/openssl/evp.h
+++ /dev/null
@@ -1,1324 +0,0 @@
-/* crypto/evp/evp.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_ENVELOPE_H
-#define HEADER_ENVELOPE_H
-
-#ifdef OPENSSL_ALGORITHM_DEFINES
-# include <openssl/opensslconf.h>
-#else
-# define OPENSSL_ALGORITHM_DEFINES
-# include <openssl/opensslconf.h>
-# undef OPENSSL_ALGORITHM_DEFINES
-#endif
-
-#include <openssl/ossl_typ.h>
-
-#include <openssl/symhacks.h>
-
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-
-/*
-#define EVP_RC2_KEY_SIZE		16
-#define EVP_RC4_KEY_SIZE		16
-#define EVP_BLOWFISH_KEY_SIZE		16
-#define EVP_CAST5_KEY_SIZE		16
-#define EVP_RC5_32_12_16_KEY_SIZE	16
-*/
-#define EVP_MAX_MD_SIZE			64	/* longest known is SHA512 */
-#define EVP_MAX_KEY_LENGTH		32
-#define EVP_MAX_IV_LENGTH		16
-#define EVP_MAX_BLOCK_LENGTH		32
-
-#define PKCS5_SALT_LEN			8
-/* Default PKCS#5 iteration count */
-#define PKCS5_DEFAULT_ITER		2048
-
-#include <openssl/objects.h>
-
-#define EVP_PK_RSA	0x0001
-#define EVP_PK_DSA	0x0002
-#define EVP_PK_DH	0x0004
-#define EVP_PK_EC	0x0008
-#define EVP_PKT_SIGN	0x0010
-#define EVP_PKT_ENC	0x0020
-#define EVP_PKT_EXCH	0x0040
-#define EVP_PKS_RSA	0x0100
-#define EVP_PKS_DSA	0x0200
-#define EVP_PKS_EC	0x0400
-#define EVP_PKT_EXP	0x1000 /* <= 512 bit key */
-
-#define EVP_PKEY_NONE	NID_undef
-#define EVP_PKEY_RSA	NID_rsaEncryption
-#define EVP_PKEY_RSA2	NID_rsa
-#define EVP_PKEY_DSA	NID_dsa
-#define EVP_PKEY_DSA1	NID_dsa_2
-#define EVP_PKEY_DSA2	NID_dsaWithSHA
-#define EVP_PKEY_DSA3	NID_dsaWithSHA1
-#define EVP_PKEY_DSA4	NID_dsaWithSHA1_2
-#define EVP_PKEY_DH	NID_dhKeyAgreement
-#define EVP_PKEY_EC	NID_X9_62_id_ecPublicKey
-#define EVP_PKEY_HMAC	NID_hmac
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* Type needs to be a bit field
- * Sub-type needs to be for variations on the method, as in, can it do
- * arbitrary encryption.... */
-struct evp_pkey_st
-	{
-	int type;
-	int save_type;
-	int references;
-	const EVP_PKEY_ASN1_METHOD *ameth;
-	ENGINE *engine;
-	union	{
-		char *ptr;
-#ifndef OPENSSL_NO_RSA
-		struct rsa_st *rsa;	/* RSA */
-#endif
-#ifndef OPENSSL_NO_DSA
-		struct dsa_st *dsa;	/* DSA */
-#endif
-#ifndef OPENSSL_NO_DH
-		struct dh_st *dh;	/* DH */
-#endif
-#ifndef OPENSSL_NO_EC
-		struct ec_key_st *ec;	/* ECC */
-#endif
-		} pkey;
-	int save_parameters;
-	STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
-	} /* EVP_PKEY */;
-
-#define EVP_PKEY_MO_SIGN	0x0001
-#define EVP_PKEY_MO_VERIFY	0x0002
-#define EVP_PKEY_MO_ENCRYPT	0x0004
-#define EVP_PKEY_MO_DECRYPT	0x0008
-
-#ifndef EVP_MD
-struct env_md_st
-	{
-	int type;
-	int pkey_type;
-	int md_size;
-	unsigned long flags;
-	int (*init)(EVP_MD_CTX *ctx);
-	int (*update)(EVP_MD_CTX *ctx,const void *data,size_t count);
-	int (*final)(EVP_MD_CTX *ctx,unsigned char *md);
-	int (*copy)(EVP_MD_CTX *to,const EVP_MD_CTX *from);
-	int (*cleanup)(EVP_MD_CTX *ctx);
-
-	/* FIXME: prototype these some day */
-	int (*sign)(int type, const unsigned char *m, unsigned int m_length,
-		    unsigned char *sigret, unsigned int *siglen, void *key);
-	int (*verify)(int type, const unsigned char *m, unsigned int m_length,
-		      const unsigned char *sigbuf, unsigned int siglen,
-		      void *key);
-	int required_pkey_type[5]; /*EVP_PKEY_xxx */
-	int block_size;
-	int ctx_size; /* how big does the ctx->md_data need to be */
-	/* control function */
-	int (*md_ctrl)(EVP_MD_CTX *ctx, int cmd, int p1, void *p2);
-	} /* EVP_MD */;
-
-typedef int evp_sign_method(int type,const unsigned char *m,
-			    unsigned int m_length,unsigned char *sigret,
-			    unsigned int *siglen, void *key);
-typedef int evp_verify_method(int type,const unsigned char *m,
-			    unsigned int m_length,const unsigned char *sigbuf,
-			    unsigned int siglen, void *key);
-
-#define EVP_MD_FLAG_ONESHOT	0x0001 /* digest can only handle a single
-					* block */
-
-#define EVP_MD_FLAG_PKEY_DIGEST	0x0002 /* digest is a "clone" digest used
-					* which is a copy of an existing
-					* one for a specific public key type.
-					* EVP_dss1() etc */
-
-/* Digest uses EVP_PKEY_METHOD for signing instead of MD specific signing */
-
-#define EVP_MD_FLAG_PKEY_METHOD_SIGNATURE	0x0004
-
-/* DigestAlgorithmIdentifier flags... */
-
-#define EVP_MD_FLAG_DIGALGID_MASK		0x0018
-
-/* NULL or absent parameter accepted. Use NULL */
-
-#define EVP_MD_FLAG_DIGALGID_NULL		0x0000
-
-/* NULL or absent parameter accepted. Use NULL for PKCS#1 otherwise absent */
-
-#define EVP_MD_FLAG_DIGALGID_ABSENT		0x0008
-
-/* Custom handling via ctrl */
-
-#define EVP_MD_FLAG_DIGALGID_CUSTOM		0x0018
-
-/* Digest ctrls */
-
-#define	EVP_MD_CTRL_DIGALGID			0x1
-#define	EVP_MD_CTRL_MICALG			0x2
-
-/* Minimum Algorithm specific ctrl value */
-
-#define	EVP_MD_CTRL_ALG_CTRL			0x1000
-
-#define EVP_PKEY_NULL_method	NULL,NULL,{0,0,0,0}
-
-#ifndef OPENSSL_NO_DSA
-#define EVP_PKEY_DSA_method	(evp_sign_method *)DSA_sign, \
-				(evp_verify_method *)DSA_verify, \
-				{EVP_PKEY_DSA,EVP_PKEY_DSA2,EVP_PKEY_DSA3, \
-					EVP_PKEY_DSA4,0}
-#else
-#define EVP_PKEY_DSA_method	EVP_PKEY_NULL_method
-#endif
-
-#ifndef OPENSSL_NO_ECDSA
-#define EVP_PKEY_ECDSA_method   (evp_sign_method *)ECDSA_sign, \
-				(evp_verify_method *)ECDSA_verify, \
-                                 {EVP_PKEY_EC,0,0,0}
-#else   
-#define EVP_PKEY_ECDSA_method   EVP_PKEY_NULL_method
-#endif
-
-#ifndef OPENSSL_NO_RSA
-#define EVP_PKEY_RSA_method	(evp_sign_method *)RSA_sign, \
-				(evp_verify_method *)RSA_verify, \
-				{EVP_PKEY_RSA,EVP_PKEY_RSA2,0,0}
-#define EVP_PKEY_RSA_ASN1_OCTET_STRING_method \
-				(evp_sign_method *)RSA_sign_ASN1_OCTET_STRING, \
-				(evp_verify_method *)RSA_verify_ASN1_OCTET_STRING, \
-				{EVP_PKEY_RSA,EVP_PKEY_RSA2,0,0}
-#else
-#define EVP_PKEY_RSA_method	EVP_PKEY_NULL_method
-#define EVP_PKEY_RSA_ASN1_OCTET_STRING_method EVP_PKEY_NULL_method
-#endif
-
-#endif /* !EVP_MD */
-
-struct env_md_ctx_st
-	{
-	const EVP_MD *digest;
-	ENGINE *engine; /* functional reference if 'digest' is ENGINE-provided */
-	unsigned long flags;
-	void *md_data;
-	/* Public key context for sign/verify */
-	EVP_PKEY_CTX *pctx;
-	/* Update function: usually copied from EVP_MD */
-	int (*update)(EVP_MD_CTX *ctx,const void *data,size_t count);
-	} /* EVP_MD_CTX */;
-
-/* values for EVP_MD_CTX flags */
-
-#define EVP_MD_CTX_FLAG_ONESHOT		0x0001 /* digest update will be called
-						* once only */
-#define EVP_MD_CTX_FLAG_CLEANED		0x0002 /* context has already been
-						* cleaned */
-#define EVP_MD_CTX_FLAG_REUSE		0x0004 /* Don't free up ctx->md_data
-						* in EVP_MD_CTX_cleanup */
-/* FIPS and pad options are ignored in 1.0.0, definitions are here
- * so we don't accidentally reuse the values for other purposes.
- */
-
-#define EVP_MD_CTX_FLAG_NON_FIPS_ALLOW	0x0008	/* Allow use of non FIPS digest
-						 * in FIPS mode */
-
-/* The following PAD options are also currently ignored in 1.0.0, digest
- * parameters are handled through EVP_DigestSign*() and EVP_DigestVerify*()
- * instead.
- */
-#define EVP_MD_CTX_FLAG_PAD_MASK	0xF0	/* RSA mode to use */
-#define EVP_MD_CTX_FLAG_PAD_PKCS1	0x00	/* PKCS#1 v1.5 mode */
-#define EVP_MD_CTX_FLAG_PAD_X931	0x10	/* X9.31 mode */
-#define EVP_MD_CTX_FLAG_PAD_PSS		0x20	/* PSS mode */
-
-#define EVP_MD_CTX_FLAG_NO_INIT		0x0100 /* Don't initialize md_data */
-
-struct evp_cipher_st
-	{
-	int nid;
-	int block_size;
-	int key_len;		/* Default value for variable length ciphers */
-	int iv_len;
-	unsigned long flags;	/* Various flags */
-	int (*init)(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-		    const unsigned char *iv, int enc);	/* init key */
-	int (*do_cipher)(EVP_CIPHER_CTX *ctx, unsigned char *out,
-			 const unsigned char *in, size_t inl);/* encrypt/decrypt data */
-	int (*cleanup)(EVP_CIPHER_CTX *); /* cleanup ctx */
-	int ctx_size;		/* how big ctx->cipher_data needs to be */
-	int (*set_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *); /* Populate a ASN1_TYPE with parameters */
-	int (*get_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *); /* Get parameters from a ASN1_TYPE */
-	int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr); /* Miscellaneous operations */
-	void *app_data;		/* Application data */
-	} /* EVP_CIPHER */;
-
-/* Values for cipher flags */
-
-/* Modes for ciphers */
-
-#define		EVP_CIPH_STREAM_CIPHER		0x0
-#define		EVP_CIPH_ECB_MODE		0x1
-#define		EVP_CIPH_CBC_MODE		0x2
-#define		EVP_CIPH_CFB_MODE		0x3
-#define		EVP_CIPH_OFB_MODE		0x4
-#define 	EVP_CIPH_MODE			0xF0007
-/* Set if variable length cipher */
-#define 	EVP_CIPH_VARIABLE_LENGTH	0x8
-/* Set if the iv handling should be done by the cipher itself */
-#define 	EVP_CIPH_CUSTOM_IV		0x10
-/* Set if the cipher's init() function should be called if key is NULL */
-#define 	EVP_CIPH_ALWAYS_CALL_INIT	0x20
-/* Call ctrl() to init cipher parameters */
-#define 	EVP_CIPH_CTRL_INIT		0x40
-/* Don't use standard key length function */
-#define 	EVP_CIPH_CUSTOM_KEY_LENGTH	0x80
-/* Don't use standard block padding */
-#define 	EVP_CIPH_NO_PADDING		0x100
-/* cipher handles random key generation */
-#define 	EVP_CIPH_RAND_KEY		0x200
-/* cipher has its own additional copying logic */
-#define 	EVP_CIPH_CUSTOM_COPY		0x400
-/* Allow use default ASN1 get/set iv */
-#define		EVP_CIPH_FLAG_DEFAULT_ASN1	0x1000
-/* Buffer length in bits not bytes: CFB1 mode only */
-#define		EVP_CIPH_FLAG_LENGTH_BITS	0x2000
-
-/* ctrl() values */
-
-#define		EVP_CTRL_INIT			0x0
-#define 	EVP_CTRL_SET_KEY_LENGTH		0x1
-#define 	EVP_CTRL_GET_RC2_KEY_BITS	0x2
-#define 	EVP_CTRL_SET_RC2_KEY_BITS	0x3
-#define 	EVP_CTRL_GET_RC5_ROUNDS		0x4
-#define 	EVP_CTRL_SET_RC5_ROUNDS		0x5
-#define 	EVP_CTRL_RAND_KEY		0x6
-#define 	EVP_CTRL_PBE_PRF_NID		0x7
-#define 	EVP_CTRL_COPY			0x8
-
-typedef struct evp_cipher_info_st
-	{
-	const EVP_CIPHER *cipher;
-	unsigned char iv[EVP_MAX_IV_LENGTH];
-	} EVP_CIPHER_INFO;
-
-struct evp_cipher_ctx_st
-	{
-	const EVP_CIPHER *cipher;
-	ENGINE *engine;	/* functional reference if 'cipher' is ENGINE-provided */
-	int encrypt;		/* encrypt or decrypt */
-	int buf_len;		/* number we have left */
-
-	unsigned char  oiv[EVP_MAX_IV_LENGTH];	/* original iv */
-	unsigned char  iv[EVP_MAX_IV_LENGTH];	/* working iv */
-	unsigned char buf[EVP_MAX_BLOCK_LENGTH];/* saved partial block */
-	int num;				/* used by cfb/ofb mode */
-
-	void *app_data;		/* application stuff */
-	int key_len;		/* May change for variable length cipher */
-	unsigned long flags;	/* Various flags */
-	void *cipher_data; /* per EVP data */
-	int final_used;
-	int block_mask;
-	unsigned char final[EVP_MAX_BLOCK_LENGTH];/* possible final block */
-	} /* EVP_CIPHER_CTX */;
-
-typedef struct evp_Encode_Ctx_st
-	{
-	int num;	/* number saved in a partial encode/decode */
-	int length;	/* The length is either the output line length
-			 * (in input bytes) or the shortest input line
-			 * length that is ok.  Once decoding begins,
-			 * the length is adjusted up each time a longer
-			 * line is decoded */
-	unsigned char enc_data[80];	/* data to encode */
-	int line_num;	/* number read on current line */
-	int expect_nl;
-	} EVP_ENCODE_CTX;
-
-/* Password based encryption function */
-typedef int (EVP_PBE_KEYGEN)(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-		ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                const EVP_MD *md, int en_de);
-
-#ifndef OPENSSL_NO_RSA
-#define EVP_PKEY_assign_RSA(pkey,rsa) EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
-					(char *)(rsa))
-#endif
-
-#ifndef OPENSSL_NO_DSA
-#define EVP_PKEY_assign_DSA(pkey,dsa) EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
-					(char *)(dsa))
-#endif
-
-#ifndef OPENSSL_NO_DH
-#define EVP_PKEY_assign_DH(pkey,dh) EVP_PKEY_assign((pkey),EVP_PKEY_DH,\
-					(char *)(dh))
-#endif
-
-#ifndef OPENSSL_NO_EC
-#define EVP_PKEY_assign_EC_KEY(pkey,eckey) EVP_PKEY_assign((pkey),EVP_PKEY_EC,\
-                                        (char *)(eckey))
-#endif
-
-/* Add some extra combinations */
-#define EVP_get_digestbynid(a) EVP_get_digestbyname(OBJ_nid2sn(a))
-#define EVP_get_digestbyobj(a) EVP_get_digestbynid(OBJ_obj2nid(a))
-#define EVP_get_cipherbynid(a) EVP_get_cipherbyname(OBJ_nid2sn(a))
-#define EVP_get_cipherbyobj(a) EVP_get_cipherbynid(OBJ_obj2nid(a))
-
-int EVP_MD_type(const EVP_MD *md);
-#define EVP_MD_nid(e)			EVP_MD_type(e)
-#define EVP_MD_name(e)			OBJ_nid2sn(EVP_MD_nid(e))
-int EVP_MD_pkey_type(const EVP_MD *md);	
-int EVP_MD_size(const EVP_MD *md);
-int EVP_MD_block_size(const EVP_MD *md);
-unsigned long EVP_MD_flags(const EVP_MD *md);
-
-const EVP_MD *EVP_MD_CTX_md(const EVP_MD_CTX *ctx);
-#define EVP_MD_CTX_size(e)		EVP_MD_size(EVP_MD_CTX_md(e))
-#define EVP_MD_CTX_block_size(e)	EVP_MD_block_size(EVP_MD_CTX_md(e))
-#define EVP_MD_CTX_type(e)		EVP_MD_type(EVP_MD_CTX_md(e))
-
-int EVP_CIPHER_nid(const EVP_CIPHER *cipher);
-#define EVP_CIPHER_name(e)		OBJ_nid2sn(EVP_CIPHER_nid(e))
-int EVP_CIPHER_block_size(const EVP_CIPHER *cipher);
-int EVP_CIPHER_key_length(const EVP_CIPHER *cipher);
-int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher);
-unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher);
-#define EVP_CIPHER_mode(e)		(EVP_CIPHER_flags(e) & EVP_CIPH_MODE)
-
-const EVP_CIPHER * EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in);
-void * EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx);
-void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data);
-#define EVP_CIPHER_CTX_type(c)         EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
-unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx);
-#define EVP_CIPHER_CTX_mode(e)		(EVP_CIPHER_CTX_flags(e) & EVP_CIPH_MODE)
-
-#define EVP_ENCODE_LENGTH(l)	(((l+2)/3*4)+(l/48+1)*2+80)
-#define EVP_DECODE_LENGTH(l)	((l+3)/4*3+80)
-
-#define EVP_SignInit_ex(a,b,c)		EVP_DigestInit_ex(a,b,c)
-#define EVP_SignInit(a,b)		EVP_DigestInit(a,b)
-#define EVP_SignUpdate(a,b,c)		EVP_DigestUpdate(a,b,c)
-#define	EVP_VerifyInit_ex(a,b,c)	EVP_DigestInit_ex(a,b,c)
-#define	EVP_VerifyInit(a,b)		EVP_DigestInit(a,b)
-#define	EVP_VerifyUpdate(a,b,c)		EVP_DigestUpdate(a,b,c)
-#define EVP_OpenUpdate(a,b,c,d,e)	EVP_DecryptUpdate(a,b,c,d,e)
-#define EVP_SealUpdate(a,b,c,d,e)	EVP_EncryptUpdate(a,b,c,d,e)	
-#define EVP_DigestSignUpdate(a,b,c)	EVP_DigestUpdate(a,b,c)
-#define EVP_DigestVerifyUpdate(a,b,c)	EVP_DigestUpdate(a,b,c)
-
-#ifdef CONST_STRICT
-void BIO_set_md(BIO *,const EVP_MD *md);
-#else
-# define BIO_set_md(b,md)		BIO_ctrl(b,BIO_C_SET_MD,0,(char *)md)
-#endif
-#define BIO_get_md(b,mdp)		BIO_ctrl(b,BIO_C_GET_MD,0,(char *)mdp)
-#define BIO_get_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_GET_MD_CTX,0,(char *)mdcp)
-#define BIO_set_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_SET_MD_CTX,0,(char *)mdcp)
-#define BIO_get_cipher_status(b)	BIO_ctrl(b,BIO_C_GET_CIPHER_STATUS,0,NULL)
-#define BIO_get_cipher_ctx(b,c_pp)	BIO_ctrl(b,BIO_C_GET_CIPHER_CTX,0,(char *)c_pp)
-
-int EVP_Cipher(EVP_CIPHER_CTX *c,
-		unsigned char *out,
-		const unsigned char *in,
-		unsigned int inl);
-
-#define EVP_add_cipher_alias(n,alias) \
-	OBJ_NAME_add((alias),OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS,(n))
-#define EVP_add_digest_alias(n,alias) \
-	OBJ_NAME_add((alias),OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,(n))
-#define EVP_delete_cipher_alias(alias) \
-	OBJ_NAME_remove(alias,OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS);
-#define EVP_delete_digest_alias(alias) \
-	OBJ_NAME_remove(alias,OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS);
-
-void	EVP_MD_CTX_init(EVP_MD_CTX *ctx);
-int	EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
-EVP_MD_CTX *EVP_MD_CTX_create(void);
-void	EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
-int     EVP_MD_CTX_copy_ex(EVP_MD_CTX *out,const EVP_MD_CTX *in);  
-void	EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags);
-void	EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags);
-int 	EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx,int flags);
-int	EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl);
-int	EVP_DigestUpdate(EVP_MD_CTX *ctx,const void *d,
-			 size_t cnt);
-int	EVP_DigestFinal_ex(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s);
-int	EVP_Digest(const void *data, size_t count,
-		unsigned char *md, unsigned int *size, const EVP_MD *type, ENGINE *impl);
-
-int     EVP_MD_CTX_copy(EVP_MD_CTX *out,const EVP_MD_CTX *in);  
-int	EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
-int	EVP_DigestFinal(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s);
-
-int	EVP_read_pw_string(char *buf,int length,const char *prompt,int verify);
-int	EVP_read_pw_string_min(char *buf,int minlen,int maxlen,const char *prompt,int verify);
-void	EVP_set_pw_prompt(const char *prompt);
-char *	EVP_get_pw_prompt(void);
-
-int	EVP_BytesToKey(const EVP_CIPHER *type,const EVP_MD *md,
-		const unsigned char *salt, const unsigned char *data,
-		int datal, int count, unsigned char *key,unsigned char *iv);
-
-void	EVP_CIPHER_CTX_set_flags(EVP_CIPHER_CTX *ctx, int flags);
-void	EVP_CIPHER_CTX_clear_flags(EVP_CIPHER_CTX *ctx, int flags);
-int 	EVP_CIPHER_CTX_test_flags(const EVP_CIPHER_CTX *ctx,int flags);
-
-int	EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher,
-		const unsigned char *key, const unsigned char *iv);
-int	EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
-		const unsigned char *key, const unsigned char *iv);
-int	EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-		int *outl, const unsigned char *in, int inl);
-int	EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-int	EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-int	EVP_DecryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher,
-		const unsigned char *key, const unsigned char *iv);
-int	EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
-		const unsigned char *key, const unsigned char *iv);
-int	EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-		int *outl, const unsigned char *in, int inl);
-int	EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-int	EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-
-int	EVP_CipherInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher,
-		       const unsigned char *key,const unsigned char *iv,
-		       int enc);
-int	EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
-		       const unsigned char *key,const unsigned char *iv,
-		       int enc);
-int	EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-		int *outl, const unsigned char *in, int inl);
-int	EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-int	EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-
-int	EVP_SignFinal(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s,
-		EVP_PKEY *pkey);
-
-int	EVP_VerifyFinal(EVP_MD_CTX *ctx,const unsigned char *sigbuf,
-		unsigned int siglen,EVP_PKEY *pkey);
-
-int	EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-			const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey);
-int	EVP_DigestSignFinal(EVP_MD_CTX *ctx,
-			unsigned char *sigret, size_t *siglen);
-
-int	EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-			const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey);
-int	EVP_DigestVerifyFinal(EVP_MD_CTX *ctx,
-			unsigned char *sig, size_t siglen);
-
-int	EVP_OpenInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type,
-		const unsigned char *ek, int ekl, const unsigned char *iv,
-		EVP_PKEY *priv);
-int	EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-int	EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-		 unsigned char **ek, int *ekl, unsigned char *iv,
-		EVP_PKEY **pubk, int npubk);
-int	EVP_SealFinal(EVP_CIPHER_CTX *ctx,unsigned char *out,int *outl);
-
-void	EVP_EncodeInit(EVP_ENCODE_CTX *ctx);
-void	EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx,unsigned char *out,int *outl,
-		const unsigned char *in,int inl);
-void	EVP_EncodeFinal(EVP_ENCODE_CTX *ctx,unsigned char *out,int *outl);
-int	EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int n);
-
-void	EVP_DecodeInit(EVP_ENCODE_CTX *ctx);
-int	EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx,unsigned char *out,int *outl,
-		const unsigned char *in, int inl);
-int	EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned
-		char *out, int *outl);
-int	EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n);
-
-void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
-int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
-EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
-void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a);
-int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
-int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *c, int pad);
-int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr);
-int EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key);
-
-#ifndef OPENSSL_NO_BIO
-BIO_METHOD *BIO_f_md(void);
-BIO_METHOD *BIO_f_base64(void);
-BIO_METHOD *BIO_f_cipher(void);
-BIO_METHOD *BIO_f_reliable(void);
-void BIO_set_cipher(BIO *b,const EVP_CIPHER *c,const unsigned char *k,
-		const unsigned char *i, int enc);
-#endif
-
-const EVP_MD *EVP_md_null(void);
-#ifndef OPENSSL_NO_MD2
-const EVP_MD *EVP_md2(void);
-#endif
-#ifndef OPENSSL_NO_MD4
-const EVP_MD *EVP_md4(void);
-#endif
-#ifndef OPENSSL_NO_MD5
-const EVP_MD *EVP_md5(void);
-#endif
-#ifndef OPENSSL_NO_SHA
-const EVP_MD *EVP_sha(void);
-const EVP_MD *EVP_sha1(void);
-const EVP_MD *EVP_dss(void);
-const EVP_MD *EVP_dss1(void);
-const EVP_MD *EVP_ecdsa(void);
-#endif
-#ifndef OPENSSL_NO_SHA256
-const EVP_MD *EVP_sha224(void);
-const EVP_MD *EVP_sha256(void);
-#endif
-#ifndef OPENSSL_NO_SHA512
-const EVP_MD *EVP_sha384(void);
-const EVP_MD *EVP_sha512(void);
-#endif
-#ifndef OPENSSL_NO_MDC2
-const EVP_MD *EVP_mdc2(void);
-#endif
-#ifndef OPENSSL_NO_RIPEMD
-const EVP_MD *EVP_ripemd160(void);
-#endif
-#ifndef OPENSSL_NO_WHIRLPOOL
-const EVP_MD *EVP_whirlpool(void);
-#endif
-const EVP_CIPHER *EVP_enc_null(void);		/* does nothing :-) */
-#ifndef OPENSSL_NO_DES
-const EVP_CIPHER *EVP_des_ecb(void);
-const EVP_CIPHER *EVP_des_ede(void);
-const EVP_CIPHER *EVP_des_ede3(void);
-const EVP_CIPHER *EVP_des_ede_ecb(void);
-const EVP_CIPHER *EVP_des_ede3_ecb(void);
-const EVP_CIPHER *EVP_des_cfb64(void);
-# define EVP_des_cfb EVP_des_cfb64
-const EVP_CIPHER *EVP_des_cfb1(void);
-const EVP_CIPHER *EVP_des_cfb8(void);
-const EVP_CIPHER *EVP_des_ede_cfb64(void);
-# define EVP_des_ede_cfb EVP_des_ede_cfb64
-#if 0
-const EVP_CIPHER *EVP_des_ede_cfb1(void);
-const EVP_CIPHER *EVP_des_ede_cfb8(void);
-#endif
-const EVP_CIPHER *EVP_des_ede3_cfb64(void);
-# define EVP_des_ede3_cfb EVP_des_ede3_cfb64
-const EVP_CIPHER *EVP_des_ede3_cfb1(void);
-const EVP_CIPHER *EVP_des_ede3_cfb8(void);
-const EVP_CIPHER *EVP_des_ofb(void);
-const EVP_CIPHER *EVP_des_ede_ofb(void);
-const EVP_CIPHER *EVP_des_ede3_ofb(void);
-const EVP_CIPHER *EVP_des_cbc(void);
-const EVP_CIPHER *EVP_des_ede_cbc(void);
-const EVP_CIPHER *EVP_des_ede3_cbc(void);
-const EVP_CIPHER *EVP_desx_cbc(void);
-/* This should now be supported through the dev_crypto ENGINE. But also, why are
- * rc4 and md5 declarations made here inside a "NO_DES" precompiler branch? */
-#if 0
-# ifdef OPENSSL_OPENBSD_DEV_CRYPTO
-const EVP_CIPHER *EVP_dev_crypto_des_ede3_cbc(void);
-const EVP_CIPHER *EVP_dev_crypto_rc4(void);
-const EVP_MD *EVP_dev_crypto_md5(void);
-# endif
-#endif
-#endif
-#ifndef OPENSSL_NO_RC4
-const EVP_CIPHER *EVP_rc4(void);
-const EVP_CIPHER *EVP_rc4_40(void);
-#endif
-#ifndef OPENSSL_NO_IDEA
-const EVP_CIPHER *EVP_idea_ecb(void);
-const EVP_CIPHER *EVP_idea_cfb64(void);
-# define EVP_idea_cfb EVP_idea_cfb64
-const EVP_CIPHER *EVP_idea_ofb(void);
-const EVP_CIPHER *EVP_idea_cbc(void);
-#endif
-#ifndef OPENSSL_NO_RC2
-const EVP_CIPHER *EVP_rc2_ecb(void);
-const EVP_CIPHER *EVP_rc2_cbc(void);
-const EVP_CIPHER *EVP_rc2_40_cbc(void);
-const EVP_CIPHER *EVP_rc2_64_cbc(void);
-const EVP_CIPHER *EVP_rc2_cfb64(void);
-# define EVP_rc2_cfb EVP_rc2_cfb64
-const EVP_CIPHER *EVP_rc2_ofb(void);
-#endif
-#ifndef OPENSSL_NO_BF
-const EVP_CIPHER *EVP_bf_ecb(void);
-const EVP_CIPHER *EVP_bf_cbc(void);
-const EVP_CIPHER *EVP_bf_cfb64(void);
-# define EVP_bf_cfb EVP_bf_cfb64
-const EVP_CIPHER *EVP_bf_ofb(void);
-#endif
-#ifndef OPENSSL_NO_CAST
-const EVP_CIPHER *EVP_cast5_ecb(void);
-const EVP_CIPHER *EVP_cast5_cbc(void);
-const EVP_CIPHER *EVP_cast5_cfb64(void);
-# define EVP_cast5_cfb EVP_cast5_cfb64
-const EVP_CIPHER *EVP_cast5_ofb(void);
-#endif
-#ifndef OPENSSL_NO_RC5
-const EVP_CIPHER *EVP_rc5_32_12_16_cbc(void);
-const EVP_CIPHER *EVP_rc5_32_12_16_ecb(void);
-const EVP_CIPHER *EVP_rc5_32_12_16_cfb64(void);
-# define EVP_rc5_32_12_16_cfb EVP_rc5_32_12_16_cfb64
-const EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
-#endif
-#ifndef OPENSSL_NO_AES
-const EVP_CIPHER *EVP_aes_128_ecb(void);
-const EVP_CIPHER *EVP_aes_128_cbc(void);
-const EVP_CIPHER *EVP_aes_128_cfb1(void);
-const EVP_CIPHER *EVP_aes_128_cfb8(void);
-const EVP_CIPHER *EVP_aes_128_cfb128(void);
-# define EVP_aes_128_cfb EVP_aes_128_cfb128
-const EVP_CIPHER *EVP_aes_128_ofb(void);
-#if 0
-const EVP_CIPHER *EVP_aes_128_ctr(void);
-#endif
-const EVP_CIPHER *EVP_aes_192_ecb(void);
-const EVP_CIPHER *EVP_aes_192_cbc(void);
-const EVP_CIPHER *EVP_aes_192_cfb1(void);
-const EVP_CIPHER *EVP_aes_192_cfb8(void);
-const EVP_CIPHER *EVP_aes_192_cfb128(void);
-# define EVP_aes_192_cfb EVP_aes_192_cfb128
-const EVP_CIPHER *EVP_aes_192_ofb(void);
-#if 0
-const EVP_CIPHER *EVP_aes_192_ctr(void);
-#endif
-const EVP_CIPHER *EVP_aes_256_ecb(void);
-const EVP_CIPHER *EVP_aes_256_cbc(void);
-const EVP_CIPHER *EVP_aes_256_cfb1(void);
-const EVP_CIPHER *EVP_aes_256_cfb8(void);
-const EVP_CIPHER *EVP_aes_256_cfb128(void);
-# define EVP_aes_256_cfb EVP_aes_256_cfb128
-const EVP_CIPHER *EVP_aes_256_ofb(void);
-#if 0
-const EVP_CIPHER *EVP_aes_256_ctr(void);
-#endif
-#endif
-#ifndef OPENSSL_NO_CAMELLIA
-const EVP_CIPHER *EVP_camellia_128_ecb(void);
-const EVP_CIPHER *EVP_camellia_128_cbc(void);
-const EVP_CIPHER *EVP_camellia_128_cfb1(void);
-const EVP_CIPHER *EVP_camellia_128_cfb8(void);
-const EVP_CIPHER *EVP_camellia_128_cfb128(void);
-# define EVP_camellia_128_cfb EVP_camellia_128_cfb128
-const EVP_CIPHER *EVP_camellia_128_ofb(void);
-const EVP_CIPHER *EVP_camellia_192_ecb(void);
-const EVP_CIPHER *EVP_camellia_192_cbc(void);
-const EVP_CIPHER *EVP_camellia_192_cfb1(void);
-const EVP_CIPHER *EVP_camellia_192_cfb8(void);
-const EVP_CIPHER *EVP_camellia_192_cfb128(void);
-# define EVP_camellia_192_cfb EVP_camellia_192_cfb128
-const EVP_CIPHER *EVP_camellia_192_ofb(void);
-const EVP_CIPHER *EVP_camellia_256_ecb(void);
-const EVP_CIPHER *EVP_camellia_256_cbc(void);
-const EVP_CIPHER *EVP_camellia_256_cfb1(void);
-const EVP_CIPHER *EVP_camellia_256_cfb8(void);
-const EVP_CIPHER *EVP_camellia_256_cfb128(void);
-# define EVP_camellia_256_cfb EVP_camellia_256_cfb128
-const EVP_CIPHER *EVP_camellia_256_ofb(void);
-#endif
-
-#ifndef OPENSSL_NO_SEED
-const EVP_CIPHER *EVP_seed_ecb(void);
-const EVP_CIPHER *EVP_seed_cbc(void);
-const EVP_CIPHER *EVP_seed_cfb128(void);
-# define EVP_seed_cfb EVP_seed_cfb128
-const EVP_CIPHER *EVP_seed_ofb(void);
-#endif
-
-void OPENSSL_add_all_algorithms_noconf(void);
-void OPENSSL_add_all_algorithms_conf(void);
-
-#ifdef OPENSSL_LOAD_CONF
-#define OpenSSL_add_all_algorithms() \
-		OPENSSL_add_all_algorithms_conf()
-#else
-#define OpenSSL_add_all_algorithms() \
-		OPENSSL_add_all_algorithms_noconf()
-#endif
-
-void OpenSSL_add_all_ciphers(void);
-void OpenSSL_add_all_digests(void);
-#define SSLeay_add_all_algorithms() OpenSSL_add_all_algorithms()
-#define SSLeay_add_all_ciphers() OpenSSL_add_all_ciphers()
-#define SSLeay_add_all_digests() OpenSSL_add_all_digests()
-
-int EVP_add_cipher(const EVP_CIPHER *cipher);
-int EVP_add_digest(const EVP_MD *digest);
-
-const EVP_CIPHER *EVP_get_cipherbyname(const char *name);
-const EVP_MD *EVP_get_digestbyname(const char *name);
-void EVP_cleanup(void);
-
-void EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph,
-		const char *from, const char *to, void *x), void *arg);
-void EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph,
-		const char *from, const char *to, void *x), void *arg);
-
-void EVP_MD_do_all(void (*fn)(const EVP_MD *ciph,
-		const char *from, const char *to, void *x), void *arg);
-void EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *ciph,
-		const char *from, const char *to, void *x), void *arg);
-
-int		EVP_PKEY_decrypt_old(unsigned char *dec_key,
-			const unsigned char *enc_key,int enc_key_len,
-			EVP_PKEY *private_key);
-int		EVP_PKEY_encrypt_old(unsigned char *enc_key,
-			const unsigned char *key,int key_len,
-			EVP_PKEY *pub_key);
-int		EVP_PKEY_type(int type);
-int		EVP_PKEY_id(const EVP_PKEY *pkey);
-int		EVP_PKEY_base_id(const EVP_PKEY *pkey);
-int		EVP_PKEY_bits(EVP_PKEY *pkey);
-int		EVP_PKEY_size(EVP_PKEY *pkey);
-int 		EVP_PKEY_set_type(EVP_PKEY *pkey,int type);
-int		EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len);
-int 		EVP_PKEY_assign(EVP_PKEY *pkey,int type,void *key);
-void *		EVP_PKEY_get0(EVP_PKEY *pkey);
-
-#ifndef OPENSSL_NO_RSA
-struct rsa_st;
-int EVP_PKEY_set1_RSA(EVP_PKEY *pkey,struct rsa_st *key);
-struct rsa_st *EVP_PKEY_get1_RSA(EVP_PKEY *pkey);
-#endif
-#ifndef OPENSSL_NO_DSA
-struct dsa_st;
-int EVP_PKEY_set1_DSA(EVP_PKEY *pkey,struct dsa_st *key);
-struct dsa_st *EVP_PKEY_get1_DSA(EVP_PKEY *pkey);
-#endif
-#ifndef OPENSSL_NO_DH
-struct dh_st;
-int EVP_PKEY_set1_DH(EVP_PKEY *pkey,struct dh_st *key);
-struct dh_st *EVP_PKEY_get1_DH(EVP_PKEY *pkey);
-#endif
-#ifndef OPENSSL_NO_EC
-struct ec_key_st;
-int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey,struct ec_key_st *key);
-struct ec_key_st *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey);
-#endif
-
-EVP_PKEY *	EVP_PKEY_new(void);
-void		EVP_PKEY_free(EVP_PKEY *pkey);
-
-EVP_PKEY *	d2i_PublicKey(int type,EVP_PKEY **a, const unsigned char **pp,
-			long length);
-int		i2d_PublicKey(EVP_PKEY *a, unsigned char **pp);
-
-EVP_PKEY *	d2i_PrivateKey(int type,EVP_PKEY **a, const unsigned char **pp,
-			long length);
-EVP_PKEY *	d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
-			long length);
-int		i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp);
-
-int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from);
-int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey);
-int EVP_PKEY_save_parameters(EVP_PKEY *pkey,int mode);
-int EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b);
-
-int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b);
-
-int EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey,
-				int indent, ASN1_PCTX *pctx);
-int EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey,
-				int indent, ASN1_PCTX *pctx);
-int EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey,
-				int indent, ASN1_PCTX *pctx);
-
-int EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid);
-
-int EVP_CIPHER_type(const EVP_CIPHER *ctx);
-
-/* calls methods */
-int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-
-/* These are used by EVP_CIPHER methods */
-int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c,ASN1_TYPE *type);
-int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c,ASN1_TYPE *type);
-
-/* PKCS5 password based encryption */
-int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-			 ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md,
-			 int en_de);
-int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
-			   const unsigned char *salt, int saltlen, int iter,
-			   int keylen, unsigned char *out);
-int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,
-			   const unsigned char *salt, int saltlen, int iter,
-			   const EVP_MD *digest,
-		      int keylen, unsigned char *out);
-int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-			 ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md,
-			 int en_de);
-
-void PKCS5_PBE_add(void);
-
-int EVP_PBE_CipherInit (ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
-	     ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de);
-
-/* PBE type */
-
-/* Can appear as the outermost AlgorithmIdentifier */
-#define EVP_PBE_TYPE_OUTER	0x0
-/* Is an PRF type OID */
-#define EVP_PBE_TYPE_PRF	0x1
-
-int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid, int md_nid,
-	     EVP_PBE_KEYGEN *keygen);
-int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
-		    EVP_PBE_KEYGEN *keygen);
-int EVP_PBE_find(int type, int pbe_nid,
-			int *pcnid, int *pmnid, EVP_PBE_KEYGEN **pkeygen);
-void EVP_PBE_cleanup(void);
-
-#define ASN1_PKEY_ALIAS		0x1
-#define ASN1_PKEY_DYNAMIC	0x2
-#define ASN1_PKEY_SIGPARAM_NULL	0x4
-
-#define ASN1_PKEY_CTRL_PKCS7_SIGN	0x1
-#define ASN1_PKEY_CTRL_PKCS7_ENCRYPT	0x2
-#define ASN1_PKEY_CTRL_DEFAULT_MD_NID	0x3
-#define ASN1_PKEY_CTRL_CMS_SIGN		0x5
-#define ASN1_PKEY_CTRL_CMS_ENVELOPE	0x7
-
-int EVP_PKEY_asn1_get_count(void);
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_get0(int idx);
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type);
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
-					const char *str, int len);
-int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth);
-int EVP_PKEY_asn1_add_alias(int to, int from);
-int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *pkey_base_id, int *ppkey_flags,
-				const char **pinfo, const char **ppem_str,
-					const EVP_PKEY_ASN1_METHOD *ameth);
-
-const EVP_PKEY_ASN1_METHOD* EVP_PKEY_get0_asn1(EVP_PKEY *pkey);
-EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
-					const char *pem_str, const char *info);
-void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, 
-			const EVP_PKEY_ASN1_METHOD *src);
-void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth);
-void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
-		int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub),
-		int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk),
-		int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),
-		int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent,
-							ASN1_PCTX *pctx),
-		int (*pkey_size)(const EVP_PKEY *pk),
-		int (*pkey_bits)(const EVP_PKEY *pk));
-void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
-		int (*priv_decode)(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf),
-		int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk),
-		int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int indent,
-							ASN1_PCTX *pctx));
-void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
-		int (*param_decode)(EVP_PKEY *pkey,
-				const unsigned char **pder, int derlen),
-		int (*param_encode)(const EVP_PKEY *pkey, unsigned char **pder),
-		int (*param_missing)(const EVP_PKEY *pk),
-		int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from),
-		int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),
-		int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,
-							ASN1_PCTX *pctx));
-
-void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
-		void (*pkey_free)(EVP_PKEY *pkey));
-void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
-		int (*pkey_ctrl)(EVP_PKEY *pkey, int op,
-							long arg1, void *arg2));
-
-
-#define EVP_PKEY_OP_UNDEFINED		0
-#define EVP_PKEY_OP_PARAMGEN		(1<<1)
-#define EVP_PKEY_OP_KEYGEN		(1<<2)
-#define EVP_PKEY_OP_SIGN		(1<<3)
-#define EVP_PKEY_OP_VERIFY		(1<<4)
-#define EVP_PKEY_OP_VERIFYRECOVER	(1<<5)
-#define EVP_PKEY_OP_SIGNCTX		(1<<6)
-#define EVP_PKEY_OP_VERIFYCTX		(1<<7)
-#define EVP_PKEY_OP_ENCRYPT		(1<<8)
-#define EVP_PKEY_OP_DECRYPT		(1<<9)
-#define EVP_PKEY_OP_DERIVE		(1<<10)
-
-#define EVP_PKEY_OP_TYPE_SIG	\
-	(EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY | EVP_PKEY_OP_VERIFYRECOVER \
-		| EVP_PKEY_OP_SIGNCTX | EVP_PKEY_OP_VERIFYCTX)
-
-#define EVP_PKEY_OP_TYPE_CRYPT \
-	(EVP_PKEY_OP_ENCRYPT | EVP_PKEY_OP_DECRYPT)
-
-#define EVP_PKEY_OP_TYPE_NOGEN \
-	(EVP_PKEY_OP_SIG | EVP_PKEY_OP_CRYPT | EVP_PKEY_OP_DERIVE)
-
-#define EVP_PKEY_OP_TYPE_GEN \
-		(EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN)
-
-#define	 EVP_PKEY_CTX_set_signature_md(ctx, md)	\
-		EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,  \
-					EVP_PKEY_CTRL_MD, 0, (void *)md)
-
-#define EVP_PKEY_CTRL_MD		1
-#define EVP_PKEY_CTRL_PEER_KEY		2
-
-#define EVP_PKEY_CTRL_PKCS7_ENCRYPT	3
-#define EVP_PKEY_CTRL_PKCS7_DECRYPT	4
-
-#define EVP_PKEY_CTRL_PKCS7_SIGN	5
-
-#define EVP_PKEY_CTRL_SET_MAC_KEY	6
-
-#define EVP_PKEY_CTRL_DIGESTINIT	7
-
-/* Used by GOST key encryption in TLS */
-#define EVP_PKEY_CTRL_SET_IV 		8
-
-#define EVP_PKEY_CTRL_CMS_ENCRYPT	9
-#define EVP_PKEY_CTRL_CMS_DECRYPT	10
-#define EVP_PKEY_CTRL_CMS_SIGN		11
-
-#define EVP_PKEY_ALG_CTRL		0x1000
-
-
-#define EVP_PKEY_FLAG_AUTOARGLEN	2
-
-const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type);
-EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags);
-void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth);
-int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth);
-
-EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-EVP_PKEY_CTX *EVP_PKEY_CTX_new_id(int id, ENGINE *e);
-EVP_PKEY_CTX *EVP_PKEY_CTX_dup(EVP_PKEY_CTX *ctx);
-void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
-				int cmd, int p1, void *p2);
-int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
-						const char *value);
-
-int EVP_PKEY_CTX_get_operation(EVP_PKEY_CTX *ctx);
-void EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen);
-
-EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
-				unsigned char *key, int keylen);
-
-void EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data);
-void *EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx);
-EVP_PKEY *EVP_PKEY_CTX_get0_pkey(EVP_PKEY_CTX *ctx);
-
-EVP_PKEY *EVP_PKEY_CTX_get0_peerkey(EVP_PKEY_CTX *ctx);
-
-void EVP_PKEY_CTX_set_app_data(EVP_PKEY_CTX *ctx, void *data);
-void *EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_sign(EVP_PKEY_CTX *ctx,
-			unsigned char *sig, size_t *siglen,
-			const unsigned char *tbs, size_t tbslen);
-int EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_verify(EVP_PKEY_CTX *ctx,
-			const unsigned char *sig, size_t siglen,
-			const unsigned char *tbs, size_t tbslen);
-int EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx,
-			unsigned char *rout, size_t *routlen,
-			const unsigned char *sig, size_t siglen);
-int EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
-			unsigned char *out, size_t *outlen,
-			const unsigned char *in, size_t inlen);
-int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
-			unsigned char *out, size_t *outlen,
-			const unsigned char *in, size_t inlen);
-
-int EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer);
-int EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
-
-typedef int EVP_PKEY_gen_cb(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey);
-int EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey);
-
-void EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb);
-EVP_PKEY_gen_cb *EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx);
-
-void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
-	int (*init)(EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth,
-	int (*copy)(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src));
-
-void EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth,
-	void (*cleanup)(EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth,
-	int (*paramgen_init)(EVP_PKEY_CTX *ctx),
-	int (*paramgen)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth,
-	int (*keygen_init)(EVP_PKEY_CTX *ctx),
-	int (*keygen)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth,
-	int (*sign_init)(EVP_PKEY_CTX *ctx),
-	int (*sign)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-					const unsigned char *tbs, size_t tbslen));
-
-void EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth,
-	int (*verify_init)(EVP_PKEY_CTX *ctx),
-	int (*verify)(EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen,
-					const unsigned char *tbs, size_t tbslen));
-
-void EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth,
-	int (*verify_recover_init)(EVP_PKEY_CTX *ctx),
-	int (*verify_recover)(EVP_PKEY_CTX *ctx,
-					unsigned char *sig, size_t *siglen,
-					const unsigned char *tbs, size_t tbslen));
-
-void EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth,
-	int (*signctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx),
-	int (*signctx)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-					EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth,
-	int (*verifyctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx),
-	int (*verifyctx)(EVP_PKEY_CTX *ctx, const unsigned char *sig,int siglen,
-					EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth,
-	int (*encrypt_init)(EVP_PKEY_CTX *ctx),
-	int (*encryptfn)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
-					const unsigned char *in, size_t inlen));
-
-void EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth,
-	int (*decrypt_init)(EVP_PKEY_CTX *ctx),
-	int (*decrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
-					const unsigned char *in, size_t inlen));
-
-void EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth,
-	int (*derive_init)(EVP_PKEY_CTX *ctx),
-	int (*derive)(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen));
-
-void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
-	int (*ctrl)(EVP_PKEY_CTX *ctx, int type, int p1, void *p2),
-	int (*ctrl_str)(EVP_PKEY_CTX *ctx,
-					const char *type, const char *value));
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_EVP_strings(void);
-
-/* Error codes for the EVP functions. */
-
-/* Function codes. */
-#define EVP_F_AES_INIT_KEY				 133
-#define EVP_F_CAMELLIA_INIT_KEY				 159
-#define EVP_F_D2I_PKEY					 100
-#define EVP_F_DO_SIGVER_INIT				 161
-#define EVP_F_DSAPKEY2PKCS8				 134
-#define EVP_F_DSA_PKEY2PKCS8				 135
-#define EVP_F_ECDSA_PKEY2PKCS8				 129
-#define EVP_F_ECKEY_PKEY2PKCS8				 132
-#define EVP_F_EVP_CIPHERINIT_EX				 123
-#define EVP_F_EVP_CIPHER_CTX_COPY			 163
-#define EVP_F_EVP_CIPHER_CTX_CTRL			 124
-#define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH		 122
-#define EVP_F_EVP_DECRYPTFINAL_EX			 101
-#define EVP_F_EVP_DIGESTINIT_EX				 128
-#define EVP_F_EVP_ENCRYPTFINAL_EX			 127
-#define EVP_F_EVP_MD_CTX_COPY_EX			 110
-#define EVP_F_EVP_MD_SIZE				 162
-#define EVP_F_EVP_OPENINIT				 102
-#define EVP_F_EVP_PBE_ALG_ADD				 115
-#define EVP_F_EVP_PBE_ALG_ADD_TYPE			 160
-#define EVP_F_EVP_PBE_CIPHERINIT			 116
-#define EVP_F_EVP_PKCS82PKEY				 111
-#define EVP_F_EVP_PKCS82PKEY_BROKEN			 136
-#define EVP_F_EVP_PKEY2PKCS8_BROKEN			 113
-#define EVP_F_EVP_PKEY_COPY_PARAMETERS			 103
-#define EVP_F_EVP_PKEY_CTX_CTRL				 137
-#define EVP_F_EVP_PKEY_CTX_CTRL_STR			 150
-#define EVP_F_EVP_PKEY_CTX_DUP				 156
-#define EVP_F_EVP_PKEY_DECRYPT				 104
-#define EVP_F_EVP_PKEY_DECRYPT_INIT			 138
-#define EVP_F_EVP_PKEY_DECRYPT_OLD			 151
-#define EVP_F_EVP_PKEY_DERIVE				 153
-#define EVP_F_EVP_PKEY_DERIVE_INIT			 154
-#define EVP_F_EVP_PKEY_DERIVE_SET_PEER			 155
-#define EVP_F_EVP_PKEY_ENCRYPT				 105
-#define EVP_F_EVP_PKEY_ENCRYPT_INIT			 139
-#define EVP_F_EVP_PKEY_ENCRYPT_OLD			 152
-#define EVP_F_EVP_PKEY_GET1_DH				 119
-#define EVP_F_EVP_PKEY_GET1_DSA				 120
-#define EVP_F_EVP_PKEY_GET1_ECDSA			 130
-#define EVP_F_EVP_PKEY_GET1_EC_KEY			 131
-#define EVP_F_EVP_PKEY_GET1_RSA				 121
-#define EVP_F_EVP_PKEY_KEYGEN				 146
-#define EVP_F_EVP_PKEY_KEYGEN_INIT			 147
-#define EVP_F_EVP_PKEY_NEW				 106
-#define EVP_F_EVP_PKEY_PARAMGEN				 148
-#define EVP_F_EVP_PKEY_PARAMGEN_INIT			 149
-#define EVP_F_EVP_PKEY_SIGN				 140
-#define EVP_F_EVP_PKEY_SIGN_INIT			 141
-#define EVP_F_EVP_PKEY_VERIFY				 142
-#define EVP_F_EVP_PKEY_VERIFY_INIT			 143
-#define EVP_F_EVP_PKEY_VERIFY_RECOVER			 144
-#define EVP_F_EVP_PKEY_VERIFY_RECOVER_INIT		 145
-#define EVP_F_EVP_RIJNDAEL				 126
-#define EVP_F_EVP_SIGNFINAL				 107
-#define EVP_F_EVP_VERIFYFINAL				 108
-#define EVP_F_INT_CTX_NEW				 157
-#define EVP_F_PKCS5_PBE_KEYIVGEN			 117
-#define EVP_F_PKCS5_V2_PBE_KEYIVGEN			 118
-#define EVP_F_PKCS8_SET_BROKEN				 112
-#define EVP_F_PKEY_SET_TYPE				 158
-#define EVP_F_RC2_MAGIC_TO_METH				 109
-#define EVP_F_RC5_CTRL					 125
-
-/* Reason codes. */
-#define EVP_R_AES_KEY_SETUP_FAILED			 143
-#define EVP_R_ASN1_LIB					 140
-#define EVP_R_BAD_BLOCK_LENGTH				 136
-#define EVP_R_BAD_DECRYPT				 100
-#define EVP_R_BAD_KEY_LENGTH				 137
-#define EVP_R_BN_DECODE_ERROR				 112
-#define EVP_R_BN_PUBKEY_ERROR				 113
-#define EVP_R_BUFFER_TOO_SMALL				 155
-#define EVP_R_CAMELLIA_KEY_SETUP_FAILED			 157
-#define EVP_R_CIPHER_PARAMETER_ERROR			 122
-#define EVP_R_COMMAND_NOT_SUPPORTED			 147
-#define EVP_R_CTRL_NOT_IMPLEMENTED			 132
-#define EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED		 133
-#define EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH		 138
-#define EVP_R_DECODE_ERROR				 114
-#define EVP_R_DIFFERENT_KEY_TYPES			 101
-#define EVP_R_DIFFERENT_PARAMETERS			 153
-#define EVP_R_ENCODE_ERROR				 115
-#define EVP_R_EVP_PBE_CIPHERINIT_ERROR			 119
-#define EVP_R_EXPECTING_AN_RSA_KEY			 127
-#define EVP_R_EXPECTING_A_DH_KEY			 128
-#define EVP_R_EXPECTING_A_DSA_KEY			 129
-#define EVP_R_EXPECTING_A_ECDSA_KEY			 141
-#define EVP_R_EXPECTING_A_EC_KEY			 142
-#define EVP_R_INITIALIZATION_ERROR			 134
-#define EVP_R_INPUT_NOT_INITIALIZED			 111
-#define EVP_R_INVALID_DIGEST				 152
-#define EVP_R_INVALID_KEY_LENGTH			 130
-#define EVP_R_INVALID_OPERATION				 148
-#define EVP_R_IV_TOO_LARGE				 102
-#define EVP_R_KEYGEN_FAILURE				 120
-#define EVP_R_MESSAGE_DIGEST_IS_NULL			 159
-#define EVP_R_METHOD_NOT_SUPPORTED			 144
-#define EVP_R_MISSING_PARAMETERS			 103
-#define EVP_R_NO_CIPHER_SET				 131
-#define EVP_R_NO_DEFAULT_DIGEST				 158
-#define EVP_R_NO_DIGEST_SET				 139
-#define EVP_R_NO_DSA_PARAMETERS				 116
-#define EVP_R_NO_KEY_SET				 154
-#define EVP_R_NO_OPERATION_SET				 149
-#define EVP_R_NO_SIGN_FUNCTION_CONFIGURED		 104
-#define EVP_R_NO_VERIFY_FUNCTION_CONFIGURED		 105
-#define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE	 150
-#define EVP_R_OPERATON_NOT_INITIALIZED			 151
-#define EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE			 117
-#define EVP_R_PRIVATE_KEY_DECODE_ERROR			 145
-#define EVP_R_PRIVATE_KEY_ENCODE_ERROR			 146
-#define EVP_R_PUBLIC_KEY_NOT_RSA			 106
-#define EVP_R_UNKNOWN_CIPHER				 160
-#define EVP_R_UNKNOWN_DIGEST				 161
-#define EVP_R_UNKNOWN_PBE_ALGORITHM			 121
-#define EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS		 135
-#define EVP_R_UNSUPPORTED_ALGORITHM			 156
-#define EVP_R_UNSUPPORTED_CIPHER			 107
-#define EVP_R_UNSUPPORTED_KEYLENGTH			 123
-#define EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION	 124
-#define EVP_R_UNSUPPORTED_KEY_SIZE			 108
-#define EVP_R_UNSUPPORTED_PRF				 125
-#define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM		 118
-#define EVP_R_UNSUPPORTED_SALT_TYPE			 126
-#define EVP_R_WRONG_FINAL_BLOCK_LENGTH			 109
-#define EVP_R_WRONG_PUBLIC_KEY_TYPE			 110
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/hmac.h b/dep/include/openssl/hmac.h
deleted file mode 100644
index 1be002219..000000000
--- a/dep/include/openssl/hmac.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* crypto/hmac/hmac.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-#ifndef HEADER_HMAC_H
-#define HEADER_HMAC_H
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_HMAC
-#error HMAC is disabled.
-#endif
-
-#include <openssl/evp.h>
-
-#define HMAC_MAX_MD_CBLOCK	128	/* largest known is SHA512 */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct hmac_ctx_st
-	{
-	const EVP_MD *md;
-	EVP_MD_CTX md_ctx;
-	EVP_MD_CTX i_ctx;
-	EVP_MD_CTX o_ctx;
-	unsigned int key_length;
-	unsigned char key[HMAC_MAX_MD_CBLOCK];
-	} HMAC_CTX;
-
-#define HMAC_size(e)	(EVP_MD_size((e)->md))
-
-
-void HMAC_CTX_init(HMAC_CTX *ctx);
-void HMAC_CTX_cleanup(HMAC_CTX *ctx);
-
-#define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */
-
-int HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
-	       const EVP_MD *md); /* deprecated */
-int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
-		  const EVP_MD *md, ENGINE *impl);
-int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len);
-int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
-unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
-		    const unsigned char *d, size_t n, unsigned char *md,
-		    unsigned int *md_len);
-int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
-
-void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/idea.h b/dep/include/openssl/idea.h
deleted file mode 100644
index 5782e54b0..000000000
--- a/dep/include/openssl/idea.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* crypto/idea/idea.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_IDEA_H
-#define HEADER_IDEA_H
-
-#include <openssl/opensslconf.h> /* IDEA_INT, OPENSSL_NO_IDEA */
-
-#ifdef OPENSSL_NO_IDEA
-#error IDEA is disabled.
-#endif
-
-#define IDEA_ENCRYPT	1
-#define IDEA_DECRYPT	0
-
-#define IDEA_BLOCK	8
-#define IDEA_KEY_LENGTH	16
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct idea_key_st
-	{
-	IDEA_INT data[9][6];
-	} IDEA_KEY_SCHEDULE;
-
-const char *idea_options(void);
-void idea_ecb_encrypt(const unsigned char *in, unsigned char *out,
-	IDEA_KEY_SCHEDULE *ks);
-void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks);
-void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk);
-void idea_cbc_encrypt(const unsigned char *in, unsigned char *out,
-	long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,int enc);
-void idea_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-	long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-	int *num,int enc);
-void idea_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-	long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int *num);
-void idea_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/krb5_asn.h b/dep/include/openssl/krb5_asn.h
deleted file mode 100644
index 41725d0dc..000000000
--- a/dep/include/openssl/krb5_asn.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* krb5_asn.h */
-/* Written by Vern Staats <staatsvr@asc.hpc.mil> for the OpenSSL project,
-** using ocsp/{*.h,*asn*.c} as a starting point
-*/
-
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_KRB5_ASN_H
-#define HEADER_KRB5_ASN_H
-
-/*
-#include <krb5.h>
-*/
-#include <openssl/safestack.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
-/*	ASN.1 from Kerberos RFC 1510
-*/
-
-/*	EncryptedData ::=   SEQUENCE {
-**		etype[0]                      INTEGER, -- EncryptionType
-**		kvno[1]                       INTEGER OPTIONAL,
-**		cipher[2]                     OCTET STRING -- ciphertext
-**	}
-*/
-typedef	struct	krb5_encdata_st
-	{
-	ASN1_INTEGER			*etype;
-	ASN1_INTEGER			*kvno;
-	ASN1_OCTET_STRING		*cipher;
-	}	KRB5_ENCDATA;
-
-DECLARE_STACK_OF(KRB5_ENCDATA)
-
-/*	PrincipalName ::=   SEQUENCE {
-**		name-type[0]                  INTEGER,
-**		name-string[1]                SEQUENCE OF GeneralString
-**	}
-*/
-typedef	struct	krb5_princname_st
-	{
-	ASN1_INTEGER			*nametype;
-	STACK_OF(ASN1_GENERALSTRING)	*namestring;
-	}	KRB5_PRINCNAME;
-
-DECLARE_STACK_OF(KRB5_PRINCNAME)
-
-
-/*	Ticket ::=	[APPLICATION 1] SEQUENCE {
-**		tkt-vno[0]                    INTEGER,
-**		realm[1]                      Realm,
-**		sname[2]                      PrincipalName,
-**		enc-part[3]                   EncryptedData
-**	}
-*/
-typedef	struct	krb5_tktbody_st
-	{
-	ASN1_INTEGER			*tktvno;
-	ASN1_GENERALSTRING		*realm;
-	KRB5_PRINCNAME			*sname;
-	KRB5_ENCDATA			*encdata;
-	}	KRB5_TKTBODY;
-
-typedef STACK_OF(KRB5_TKTBODY) KRB5_TICKET;
-DECLARE_STACK_OF(KRB5_TKTBODY)
-
-
-/*	AP-REQ ::=      [APPLICATION 14] SEQUENCE {
-**		pvno[0]                       INTEGER,
-**		msg-type[1]                   INTEGER,
-**		ap-options[2]                 APOptions,
-**		ticket[3]                     Ticket,
-**		authenticator[4]              EncryptedData
-**	}
-**
-**	APOptions ::=   BIT STRING {
-**		reserved(0), use-session-key(1), mutual-required(2) }
-*/
-typedef	struct	krb5_ap_req_st
-	{
-	ASN1_INTEGER			*pvno;
-	ASN1_INTEGER			*msgtype;
-	ASN1_BIT_STRING			*apoptions;
-	KRB5_TICKET			*ticket;
-	KRB5_ENCDATA			*authenticator;
-	}	KRB5_APREQBODY;
-
-typedef STACK_OF(KRB5_APREQBODY) KRB5_APREQ;
-DECLARE_STACK_OF(KRB5_APREQBODY)
-
-
-/*	Authenticator Stuff	*/
-
-
-/*	Checksum ::=   SEQUENCE {
-**		cksumtype[0]                  INTEGER,
-**		checksum[1]                   OCTET STRING
-**	}
-*/
-typedef	struct	krb5_checksum_st
-	{
-	ASN1_INTEGER			*ctype;
-	ASN1_OCTET_STRING		*checksum;
-	}	KRB5_CHECKSUM;
-
-DECLARE_STACK_OF(KRB5_CHECKSUM)
-
-
-/*	EncryptionKey ::=   SEQUENCE {
-**		keytype[0]                    INTEGER,
-**		keyvalue[1]                   OCTET STRING
-**	}
-*/
-typedef struct  krb5_encryptionkey_st
-	{
-	ASN1_INTEGER			*ktype;
-	ASN1_OCTET_STRING		*keyvalue;
-	}	KRB5_ENCKEY;
-
-DECLARE_STACK_OF(KRB5_ENCKEY)
-
-
-/*	AuthorizationData ::=   SEQUENCE OF SEQUENCE {
-**		ad-type[0]                    INTEGER,
-**              ad-data[1]                    OCTET STRING
-**	}
-*/
-typedef struct	krb5_authorization_st
-	{
-	ASN1_INTEGER			*adtype;
-	ASN1_OCTET_STRING		*addata;
-	}	KRB5_AUTHDATA;
-
-DECLARE_STACK_OF(KRB5_AUTHDATA)
-
-			
-/*	-- Unencrypted authenticator
-**	Authenticator ::=    [APPLICATION 2] SEQUENCE    {
-**		authenticator-vno[0]          INTEGER,
-**		crealm[1]                     Realm,
-**		cname[2]                      PrincipalName,
-**		cksum[3]                      Checksum OPTIONAL,
-**		cusec[4]                      INTEGER,
-**		ctime[5]                      KerberosTime,
-**		subkey[6]                     EncryptionKey OPTIONAL,
-**		seq-number[7]                 INTEGER OPTIONAL,
-**		authorization-data[8]         AuthorizationData OPTIONAL
-**	}
-*/
-typedef struct	krb5_authenticator_st
-	{
-	ASN1_INTEGER			*avno;
-	ASN1_GENERALSTRING		*crealm;
-	KRB5_PRINCNAME			*cname;
-	KRB5_CHECKSUM			*cksum;
-	ASN1_INTEGER			*cusec;
-	ASN1_GENERALIZEDTIME		*ctime;
-	KRB5_ENCKEY			*subkey;
-	ASN1_INTEGER			*seqnum;
-	KRB5_AUTHDATA			*authorization;
-	}	KRB5_AUTHENTBODY;
-
-typedef STACK_OF(KRB5_AUTHENTBODY) KRB5_AUTHENT;
-DECLARE_STACK_OF(KRB5_AUTHENTBODY)
-
-
-/*  DECLARE_ASN1_FUNCTIONS(type) = DECLARE_ASN1_FUNCTIONS_name(type, type) =
-**	type *name##_new(void);
-**	void name##_free(type *a);
-**	DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name) =
-**	 DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) =
-**	  type *d2i_##name(type **a, const unsigned char **in, long len);
-**	  int i2d_##name(type *a, unsigned char **out);
-**	  DECLARE_ASN1_ITEM(itname) = OPENSSL_EXTERN const ASN1_ITEM itname##_it
-*/
-
-DECLARE_ASN1_FUNCTIONS(KRB5_ENCDATA)
-DECLARE_ASN1_FUNCTIONS(KRB5_PRINCNAME)
-DECLARE_ASN1_FUNCTIONS(KRB5_TKTBODY)
-DECLARE_ASN1_FUNCTIONS(KRB5_APREQBODY)
-DECLARE_ASN1_FUNCTIONS(KRB5_TICKET)
-DECLARE_ASN1_FUNCTIONS(KRB5_APREQ)
-
-DECLARE_ASN1_FUNCTIONS(KRB5_CHECKSUM)
-DECLARE_ASN1_FUNCTIONS(KRB5_ENCKEY)
-DECLARE_ASN1_FUNCTIONS(KRB5_AUTHDATA)
-DECLARE_ASN1_FUNCTIONS(KRB5_AUTHENTBODY)
-DECLARE_ASN1_FUNCTIONS(KRB5_AUTHENT)
-
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/dep/include/openssl/kssl.h b/dep/include/openssl/kssl.h
deleted file mode 100644
index a3d20e1cc..000000000
--- a/dep/include/openssl/kssl.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/* ssl/kssl.h -*- mode: C; c-file-style: "eay" -*- */
-/* Written by Vern Staats <staatsvr@asc.hpc.mil> for the OpenSSL project 2000.
- * project 2000.
- */
-/* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/*
-**	19990701	VRS 	Started.
-*/
-
-#ifndef	KSSL_H
-#define	KSSL_H
-
-#include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_NO_KRB5
-
-#include <stdio.h>
-#include <ctype.h>
-#include <krb5.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
-**	Depending on which KRB5 implementation used, some types from
-**	the other may be missing.  Resolve that here and now
-*/
-#ifdef KRB5_HEIMDAL
-typedef unsigned char krb5_octet;
-#define FAR
-#else
-
-#ifndef FAR
-#define FAR
-#endif
-
-#endif
-
-/*	Uncomment this to debug kssl problems or
-**	to trace usage of the Kerberos session key
-**
-**	#define		KSSL_DEBUG
-*/
-
-#ifndef	KRB5SVC
-#define KRB5SVC	"host"
-#endif
-
-#ifndef	KRB5KEYTAB
-#define KRB5KEYTAB	"/etc/krb5.keytab"
-#endif
-
-#ifndef KRB5SENDAUTH
-#define KRB5SENDAUTH	1
-#endif
-
-#ifndef KRB5CHECKAUTH
-#define KRB5CHECKAUTH	1
-#endif
-
-#ifndef KSSL_CLOCKSKEW
-#define	KSSL_CLOCKSKEW	300;
-#endif
-
-#define	KSSL_ERR_MAX	255
-typedef struct kssl_err_st  {
-	int  reason;
-	char text[KSSL_ERR_MAX+1];
-	} KSSL_ERR;
-
-
-/*	Context for passing
-**		(1) Kerberos session key to SSL, and
-**		(2)	Config data between application and SSL lib
-*/
-typedef struct kssl_ctx_st
-        {
-                                /*	used by:    disposition:            */
-	char *service_name;	/*	C,S	    default ok (kssl)       */
-	char *service_host;	/*	C	    input, REQUIRED         */
-	char *client_princ;	/*	S	    output from krb5 ticket */
-	char *keytab_file;	/*      S	    NULL (/etc/krb5.keytab) */
-	char *cred_cache;	/*	C	    NULL (default)          */
-	krb5_enctype enctype;
-	int length;
-	krb5_octet FAR *key;
-	} KSSL_CTX;
-
-#define	KSSL_CLIENT 	1
-#define KSSL_SERVER 	2
-#define	KSSL_SERVICE	3
-#define	KSSL_KEYTAB 	4
-
-#define KSSL_CTX_OK 	0
-#define KSSL_CTX_ERR	1
-#define KSSL_NOMEM	2
-
-/* Public (for use by applications that use OpenSSL with Kerberos 5 support */
-krb5_error_code kssl_ctx_setstring(KSSL_CTX *kssl_ctx, int which, char *text);
-KSSL_CTX *kssl_ctx_new(void);
-KSSL_CTX *kssl_ctx_free(KSSL_CTX *kssl_ctx);
-void kssl_ctx_show(KSSL_CTX *kssl_ctx);
-krb5_error_code kssl_ctx_setprinc(KSSL_CTX *kssl_ctx, int which,
-        krb5_data *realm, krb5_data *entity, int nentities);
-krb5_error_code	kssl_cget_tkt(KSSL_CTX *kssl_ctx,  krb5_data **enc_tktp,
-        krb5_data *authenp, KSSL_ERR *kssl_err);
-krb5_error_code	kssl_sget_tkt(KSSL_CTX *kssl_ctx,  krb5_data *indata,
-        krb5_ticket_times *ttimes, KSSL_ERR *kssl_err);
-krb5_error_code kssl_ctx_setkey(KSSL_CTX *kssl_ctx, krb5_keyblock *session);
-void	kssl_err_set(KSSL_ERR *kssl_err, int reason, char *text);
-void kssl_krb5_free_data_contents(krb5_context context, krb5_data *data);
-krb5_error_code  kssl_build_principal_2(krb5_context context,
-			krb5_principal *princ, int rlen, const char *realm,
-			int slen, const char *svc, int hlen, const char *host);
-krb5_error_code  kssl_validate_times(krb5_timestamp atime,
-					krb5_ticket_times *ttimes);
-krb5_error_code  kssl_check_authent(KSSL_CTX *kssl_ctx, krb5_data *authentp,
-			            krb5_timestamp *atimep, KSSL_ERR *kssl_err);
-unsigned char	*kssl_skip_confound(krb5_enctype enctype, unsigned char *authn);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif	/* OPENSSL_NO_KRB5	*/
-#endif	/* KSSL_H 	*/
diff --git a/dep/include/openssl/lhash.h b/dep/include/openssl/lhash.h
deleted file mode 100644
index e7d876359..000000000
--- a/dep/include/openssl/lhash.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/* crypto/lhash/lhash.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* Header for dynamic hash table routines
- * Author - Eric Young
- */
-
-#ifndef HEADER_LHASH_H
-#define HEADER_LHASH_H
-
-#include <openssl/e_os2.h>
-#ifndef OPENSSL_NO_FP_API
-#include <stdio.h>
-#endif
-
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct lhash_node_st
-	{
-	void *data;
-	struct lhash_node_st *next;
-#ifndef OPENSSL_NO_HASH_COMP
-	unsigned long hash;
-#endif
-	} LHASH_NODE;
-
-typedef int (*LHASH_COMP_FN_TYPE)(const void *, const void *);
-typedef unsigned long (*LHASH_HASH_FN_TYPE)(const void *);
-typedef void (*LHASH_DOALL_FN_TYPE)(void *);
-typedef void (*LHASH_DOALL_ARG_FN_TYPE)(void *, void *);
-
-/* Macros for declaring and implementing type-safe wrappers for LHASH callbacks.
- * This way, callbacks can be provided to LHASH structures without function
- * pointer casting and the macro-defined callbacks provide per-variable casting
- * before deferring to the underlying type-specific callbacks. NB: It is
- * possible to place a "static" in front of both the DECLARE and IMPLEMENT
- * macros if the functions are strictly internal. */
-
-/* First: "hash" functions */
-#define DECLARE_LHASH_HASH_FN(name, o_type) \
-	unsigned long name##_LHASH_HASH(const void *);
-#define IMPLEMENT_LHASH_HASH_FN(name, o_type) \
-	unsigned long name##_LHASH_HASH(const void *arg) { \
-		const o_type *a = arg; \
-		return name##_hash(a); }
-#define LHASH_HASH_FN(name) name##_LHASH_HASH
-
-/* Second: "compare" functions */
-#define DECLARE_LHASH_COMP_FN(name, o_type) \
-	int name##_LHASH_COMP(const void *, const void *);
-#define IMPLEMENT_LHASH_COMP_FN(name, o_type) \
-	int name##_LHASH_COMP(const void *arg1, const void *arg2) { \
-		const o_type *a = arg1;		    \
-		const o_type *b = arg2; \
-		return name##_cmp(a,b); }
-#define LHASH_COMP_FN(name) name##_LHASH_COMP
-
-/* Third: "doall" functions */
-#define DECLARE_LHASH_DOALL_FN(name, o_type) \
-	void name##_LHASH_DOALL(void *);
-#define IMPLEMENT_LHASH_DOALL_FN(name, o_type) \
-	void name##_LHASH_DOALL(void *arg) { \
-		o_type *a = arg; \
-		name##_doall(a); }
-#define LHASH_DOALL_FN(name) name##_LHASH_DOALL
-
-/* Fourth: "doall_arg" functions */
-#define DECLARE_LHASH_DOALL_ARG_FN(name, o_type, a_type) \
-	void name##_LHASH_DOALL_ARG(void *, void *);
-#define IMPLEMENT_LHASH_DOALL_ARG_FN(name, o_type, a_type) \
-	void name##_LHASH_DOALL_ARG(void *arg1, void *arg2) { \
-		o_type *a = arg1; \
-		a_type *b = arg2; \
-		name##_doall_arg(a, b); }
-#define LHASH_DOALL_ARG_FN(name) name##_LHASH_DOALL_ARG
-
-typedef struct lhash_st
-	{
-	LHASH_NODE **b;
-	LHASH_COMP_FN_TYPE comp;
-	LHASH_HASH_FN_TYPE hash;
-	unsigned int num_nodes;
-	unsigned int num_alloc_nodes;
-	unsigned int p;
-	unsigned int pmax;
-	unsigned long up_load; /* load times 256 */
-	unsigned long down_load; /* load times 256 */
-	unsigned long num_items;
-
-	unsigned long num_expands;
-	unsigned long num_expand_reallocs;
-	unsigned long num_contracts;
-	unsigned long num_contract_reallocs;
-	unsigned long num_hash_calls;
-	unsigned long num_comp_calls;
-	unsigned long num_insert;
-	unsigned long num_replace;
-	unsigned long num_delete;
-	unsigned long num_no_delete;
-	unsigned long num_retrieve;
-	unsigned long num_retrieve_miss;
-	unsigned long num_hash_comps;
-
-	int error;
-	} _LHASH;	/* Do not use _LHASH directly, use LHASH_OF
-			 * and friends */
-
-#define LH_LOAD_MULT	256
-
-/* Indicates a malloc() error in the last call, this is only bad
- * in lh_insert(). */
-#define lh_error(lh)	((lh)->error)
-
-_LHASH *lh_new(LHASH_HASH_FN_TYPE h, LHASH_COMP_FN_TYPE c);
-void lh_free(_LHASH *lh);
-void *lh_insert(_LHASH *lh, void *data);
-void *lh_delete(_LHASH *lh, const void *data);
-void *lh_retrieve(_LHASH *lh, const void *data);
-void lh_doall(_LHASH *lh, LHASH_DOALL_FN_TYPE func);
-void lh_doall_arg(_LHASH *lh, LHASH_DOALL_ARG_FN_TYPE func, void *arg);
-unsigned long lh_strhash(const char *c);
-unsigned long lh_num_items(const _LHASH *lh);
-
-#ifndef OPENSSL_NO_FP_API
-void lh_stats(const _LHASH *lh, FILE *out);
-void lh_node_stats(const _LHASH *lh, FILE *out);
-void lh_node_usage_stats(const _LHASH *lh, FILE *out);
-#endif
-
-#ifndef OPENSSL_NO_BIO
-void lh_stats_bio(const _LHASH *lh, BIO *out);
-void lh_node_stats_bio(const _LHASH *lh, BIO *out);
-void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out);
-#endif
-
-/* Type checking... */
-
-#define LHASH_OF(type) struct lhash_st_##type
-
-#define DECLARE_LHASH_OF(type) LHASH_OF(type) { int dummy; }
-
-#define CHECKED_LHASH_OF(type,lh) \
-  ((_LHASH *)CHECKED_PTR_OF(LHASH_OF(type),lh))
-
-/* Define wrapper functions. */
-#define LHM_lh_new(type, name) \
-  ((LHASH_OF(type) *)lh_new(LHASH_HASH_FN(name), LHASH_COMP_FN(name)))
-#define LHM_lh_error(type, lh) \
-  lh_error(CHECKED_LHASH_OF(type,lh))
-#define LHM_lh_insert(type, lh, inst) \
-  ((type *)lh_insert(CHECKED_LHASH_OF(type, lh), \
-		     CHECKED_PTR_OF(type, inst)))
-#define LHM_lh_retrieve(type, lh, inst) \
-  ((type *)lh_retrieve(CHECKED_LHASH_OF(type, lh), \
-		       CHECKED_PTR_OF(type, inst)))
-#define LHM_lh_delete(type, lh, inst) \
-  ((type *)lh_delete(CHECKED_LHASH_OF(type, lh),			\
-		     CHECKED_PTR_OF(type, inst)))
-#define LHM_lh_doall(type, lh,fn) lh_doall(CHECKED_LHASH_OF(type, lh), fn)
-#define LHM_lh_doall_arg(type, lh, fn, arg_type, arg) \
-  lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg))
-#define LHM_lh_num_items(type, lh) lh_num_items(CHECKED_LHASH_OF(type, lh))
-#define LHM_lh_down_load(type, lh) (CHECKED_LHASH_OF(type, lh)->down_load)
-#define LHM_lh_node_stats_bio(type, lh, out) \
-  lh_node_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-#define LHM_lh_node_usage_stats_bio(type, lh, out) \
-  lh_node_usage_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-#define LHM_lh_stats_bio(type, lh, out) \
-  lh_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-#define LHM_lh_free(type, lh) lh_free(CHECKED_LHASH_OF(type, lh))
-
-DECLARE_LHASH_OF(OPENSSL_STRING);
-DECLARE_LHASH_OF(OPENSSL_CSTRING);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/dep/include/openssl/md4.h b/dep/include/openssl/md4.h
deleted file mode 100644
index c3ed9b3f7..000000000
--- a/dep/include/openssl/md4.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* crypto/md4/md4.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_MD4_H
-#define HEADER_MD4_H
-
-#include <openssl/e_os2.h>
-#include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef OPENSSL_NO_MD4
-#error MD4 is disabled.
-#endif
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! MD4_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! MD4_LONG_LOG2 has to be defined along.			   !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-#if defined(__LP32__)
-#define MD4_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#define MD4_LONG unsigned long
-#define MD4_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *					<appro@fy.chalmers.se>
- */
-#else
-#define MD4_LONG unsigned int
-#endif
-
-#define MD4_CBLOCK	64
-#define MD4_LBLOCK	(MD4_CBLOCK/4)
-#define MD4_DIGEST_LENGTH 16
-
-typedef struct MD4state_st
-	{
-	MD4_LONG A,B,C,D;
-	MD4_LONG Nl,Nh;
-	MD4_LONG data[MD4_LBLOCK];
-	unsigned int num;
-	} MD4_CTX;
-
-int MD4_Init(MD4_CTX *c);
-int MD4_Update(MD4_CTX *c, const void *data, size_t len);
-int MD4_Final(unsigned char *md, MD4_CTX *c);
-unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md);
-void MD4_Transform(MD4_CTX *c, const unsigned char *b);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/md5.h b/dep/include/openssl/md5.h
deleted file mode 100644
index 4cbf84386..000000000
--- a/dep/include/openssl/md5.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* crypto/md5/md5.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_MD5_H
-#define HEADER_MD5_H
-
-#include <openssl/e_os2.h>
-#include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef OPENSSL_NO_MD5
-#error MD5 is disabled.
-#endif
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! MD5_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! MD5_LONG_LOG2 has to be defined along.			   !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-#if defined(__LP32__)
-#define MD5_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#define MD5_LONG unsigned long
-#define MD5_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *					<appro@fy.chalmers.se>
- */
-#else
-#define MD5_LONG unsigned int
-#endif
-
-#define MD5_CBLOCK	64
-#define MD5_LBLOCK	(MD5_CBLOCK/4)
-#define MD5_DIGEST_LENGTH 16
-
-typedef struct MD5state_st
-	{
-	MD5_LONG A,B,C,D;
-	MD5_LONG Nl,Nh;
-	MD5_LONG data[MD5_LBLOCK];
-	unsigned int num;
-	} MD5_CTX;
-
-int MD5_Init(MD5_CTX *c);
-int MD5_Update(MD5_CTX *c, const void *data, size_t len);
-int MD5_Final(unsigned char *md, MD5_CTX *c);
-unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md);
-void MD5_Transform(MD5_CTX *c, const unsigned char *b);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/mdc2.h b/dep/include/openssl/mdc2.h
deleted file mode 100644
index 72778a521..000000000
--- a/dep/include/openssl/mdc2.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* crypto/mdc2/mdc2.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_MDC2_H
-#define HEADER_MDC2_H
-
-#include <openssl/des.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef OPENSSL_NO_MDC2
-#error MDC2 is disabled.
-#endif
-
-#define MDC2_BLOCK              8
-#define MDC2_DIGEST_LENGTH      16
- 
-typedef struct mdc2_ctx_st
-	{
-	unsigned int num;
-	unsigned char data[MDC2_BLOCK];
-	DES_cblock h,hh;
-	int pad_type; /* either 1 or 2, default 1 */
-	} MDC2_CTX;
-
-
-int MDC2_Init(MDC2_CTX *c);
-int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len);
-int MDC2_Final(unsigned char *md, MDC2_CTX *c);
-unsigned char *MDC2(const unsigned char *d, size_t n,
-	unsigned char *md);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/dep/include/openssl/modes.h b/dep/include/openssl/modes.h
deleted file mode 100644
index af8d97d79..000000000
--- a/dep/include/openssl/modes.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2008 The OpenSSL Project. All rights reserved.
- *
- * Rights for redistribution and usage in source and binary
- * forms are granted according to the OpenSSL license.
- */
-
-#include <stddef.h>
-
-typedef void (*block128_f)(const unsigned char in[16],
-			unsigned char out[16],
-			const void *key);
-
-typedef void (*cbc128_f)(const unsigned char *in, unsigned char *out,
-			size_t len, const void *key,
-			unsigned char ivec[16], int enc);
-
-void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
-			size_t len, const void *key,
-			unsigned char ivec[16], block128_f block);
-void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
-			size_t len, const void *key,
-			unsigned char ivec[16], block128_f block);
-
-void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-			size_t len, const void *key,
-			unsigned char ivec[16], unsigned char ecount_buf[16],
-			unsigned int *num, block128_f block);
-
-void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-			size_t len, const void *key,
-			unsigned char ivec[16], int *num,
-			block128_f block);
-
-void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-			size_t len, const void *key,
-			unsigned char ivec[16], int *num,
-			int enc, block128_f block);
-void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out,
-			size_t length, const void *key,
-			unsigned char ivec[16], int *num,
-			int enc, block128_f block);
-void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
-			size_t bits, const void *key,
-			unsigned char ivec[16], int *num,
-			int enc, block128_f block);
-
-size_t CRYPTO_cts128_encrypt_block(const unsigned char *in, unsigned char *out,
-			size_t len, const void *key,
-			unsigned char ivec[16], block128_f block);
-size_t CRYPTO_cts128_encrypt(const unsigned char *in, unsigned char *out,
-			size_t len, const void *key,
-			unsigned char ivec[16], cbc128_f cbc);
-size_t CRYPTO_cts128_decrypt_block(const unsigned char *in, unsigned char *out,
-			size_t len, const void *key,
-			unsigned char ivec[16], block128_f block);
-size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
-			size_t len, const void *key,
-			unsigned char ivec[16], cbc128_f cbc);
diff --git a/dep/include/openssl/obj_mac.h b/dep/include/openssl/obj_mac.h
deleted file mode 100644
index 282f11a8a..000000000
--- a/dep/include/openssl/obj_mac.h
+++ /dev/null
@@ -1,3914 +0,0 @@
-/* crypto/objects/obj_mac.h */
-
-/* THIS FILE IS GENERATED FROM objects.txt by objects.pl via the
- * following command:
- * perl objects.pl objects.txt obj_mac.num obj_mac.h
- */
-
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#define SN_undef			"UNDEF"
-#define LN_undef			"undefined"
-#define NID_undef			0
-#define OBJ_undef			0L
-
-#define SN_itu_t		"ITU-T"
-#define LN_itu_t		"itu-t"
-#define NID_itu_t		645
-#define OBJ_itu_t		0L
-
-#define NID_ccitt		404
-#define OBJ_ccitt		OBJ_itu_t
-
-#define SN_iso		"ISO"
-#define LN_iso		"iso"
-#define NID_iso		181
-#define OBJ_iso		1L
-
-#define SN_joint_iso_itu_t		"JOINT-ISO-ITU-T"
-#define LN_joint_iso_itu_t		"joint-iso-itu-t"
-#define NID_joint_iso_itu_t		646
-#define OBJ_joint_iso_itu_t		2L
-
-#define NID_joint_iso_ccitt		393
-#define OBJ_joint_iso_ccitt		OBJ_joint_iso_itu_t
-
-#define SN_member_body		"member-body"
-#define LN_member_body		"ISO Member Body"
-#define NID_member_body		182
-#define OBJ_member_body		OBJ_iso,2L
-
-#define SN_identified_organization		"identified-organization"
-#define NID_identified_organization		676
-#define OBJ_identified_organization		OBJ_iso,3L
-
-#define SN_hmac_md5		"HMAC-MD5"
-#define LN_hmac_md5		"hmac-md5"
-#define NID_hmac_md5		780
-#define OBJ_hmac_md5		OBJ_identified_organization,6L,1L,5L,5L,8L,1L,1L
-
-#define SN_hmac_sha1		"HMAC-SHA1"
-#define LN_hmac_sha1		"hmac-sha1"
-#define NID_hmac_sha1		781
-#define OBJ_hmac_sha1		OBJ_identified_organization,6L,1L,5L,5L,8L,1L,2L
-
-#define SN_certicom_arc		"certicom-arc"
-#define NID_certicom_arc		677
-#define OBJ_certicom_arc		OBJ_identified_organization,132L
-
-#define SN_international_organizations		"international-organizations"
-#define LN_international_organizations		"International Organizations"
-#define NID_international_organizations		647
-#define OBJ_international_organizations		OBJ_joint_iso_itu_t,23L
-
-#define SN_wap		"wap"
-#define NID_wap		678
-#define OBJ_wap		OBJ_international_organizations,43L
-
-#define SN_wap_wsg		"wap-wsg"
-#define NID_wap_wsg		679
-#define OBJ_wap_wsg		OBJ_wap,1L
-
-#define SN_selected_attribute_types		"selected-attribute-types"
-#define LN_selected_attribute_types		"Selected Attribute Types"
-#define NID_selected_attribute_types		394
-#define OBJ_selected_attribute_types		OBJ_joint_iso_itu_t,5L,1L,5L
-
-#define SN_clearance		"clearance"
-#define NID_clearance		395
-#define OBJ_clearance		OBJ_selected_attribute_types,55L
-
-#define SN_ISO_US		"ISO-US"
-#define LN_ISO_US		"ISO US Member Body"
-#define NID_ISO_US		183
-#define OBJ_ISO_US		OBJ_member_body,840L
-
-#define SN_X9_57		"X9-57"
-#define LN_X9_57		"X9.57"
-#define NID_X9_57		184
-#define OBJ_X9_57		OBJ_ISO_US,10040L
-
-#define SN_X9cm		"X9cm"
-#define LN_X9cm		"X9.57 CM ?"
-#define NID_X9cm		185
-#define OBJ_X9cm		OBJ_X9_57,4L
-
-#define SN_dsa		"DSA"
-#define LN_dsa		"dsaEncryption"
-#define NID_dsa		116
-#define OBJ_dsa		OBJ_X9cm,1L
-
-#define SN_dsaWithSHA1		"DSA-SHA1"
-#define LN_dsaWithSHA1		"dsaWithSHA1"
-#define NID_dsaWithSHA1		113
-#define OBJ_dsaWithSHA1		OBJ_X9cm,3L
-
-#define SN_ansi_X9_62		"ansi-X9-62"
-#define LN_ansi_X9_62		"ANSI X9.62"
-#define NID_ansi_X9_62		405
-#define OBJ_ansi_X9_62		OBJ_ISO_US,10045L
-
-#define OBJ_X9_62_id_fieldType		OBJ_ansi_X9_62,1L
-
-#define SN_X9_62_prime_field		"prime-field"
-#define NID_X9_62_prime_field		406
-#define OBJ_X9_62_prime_field		OBJ_X9_62_id_fieldType,1L
-
-#define SN_X9_62_characteristic_two_field		"characteristic-two-field"
-#define NID_X9_62_characteristic_two_field		407
-#define OBJ_X9_62_characteristic_two_field		OBJ_X9_62_id_fieldType,2L
-
-#define SN_X9_62_id_characteristic_two_basis		"id-characteristic-two-basis"
-#define NID_X9_62_id_characteristic_two_basis		680
-#define OBJ_X9_62_id_characteristic_two_basis		OBJ_X9_62_characteristic_two_field,3L
-
-#define SN_X9_62_onBasis		"onBasis"
-#define NID_X9_62_onBasis		681
-#define OBJ_X9_62_onBasis		OBJ_X9_62_id_characteristic_two_basis,1L
-
-#define SN_X9_62_tpBasis		"tpBasis"
-#define NID_X9_62_tpBasis		682
-#define OBJ_X9_62_tpBasis		OBJ_X9_62_id_characteristic_two_basis,2L
-
-#define SN_X9_62_ppBasis		"ppBasis"
-#define NID_X9_62_ppBasis		683
-#define OBJ_X9_62_ppBasis		OBJ_X9_62_id_characteristic_two_basis,3L
-
-#define OBJ_X9_62_id_publicKeyType		OBJ_ansi_X9_62,2L
-
-#define SN_X9_62_id_ecPublicKey		"id-ecPublicKey"
-#define NID_X9_62_id_ecPublicKey		408
-#define OBJ_X9_62_id_ecPublicKey		OBJ_X9_62_id_publicKeyType,1L
-
-#define OBJ_X9_62_ellipticCurve		OBJ_ansi_X9_62,3L
-
-#define OBJ_X9_62_c_TwoCurve		OBJ_X9_62_ellipticCurve,0L
-
-#define SN_X9_62_c2pnb163v1		"c2pnb163v1"
-#define NID_X9_62_c2pnb163v1		684
-#define OBJ_X9_62_c2pnb163v1		OBJ_X9_62_c_TwoCurve,1L
-
-#define SN_X9_62_c2pnb163v2		"c2pnb163v2"
-#define NID_X9_62_c2pnb163v2		685
-#define OBJ_X9_62_c2pnb163v2		OBJ_X9_62_c_TwoCurve,2L
-
-#define SN_X9_62_c2pnb163v3		"c2pnb163v3"
-#define NID_X9_62_c2pnb163v3		686
-#define OBJ_X9_62_c2pnb163v3		OBJ_X9_62_c_TwoCurve,3L
-
-#define SN_X9_62_c2pnb176v1		"c2pnb176v1"
-#define NID_X9_62_c2pnb176v1		687
-#define OBJ_X9_62_c2pnb176v1		OBJ_X9_62_c_TwoCurve,4L
-
-#define SN_X9_62_c2tnb191v1		"c2tnb191v1"
-#define NID_X9_62_c2tnb191v1		688
-#define OBJ_X9_62_c2tnb191v1		OBJ_X9_62_c_TwoCurve,5L
-
-#define SN_X9_62_c2tnb191v2		"c2tnb191v2"
-#define NID_X9_62_c2tnb191v2		689
-#define OBJ_X9_62_c2tnb191v2		OBJ_X9_62_c_TwoCurve,6L
-
-#define SN_X9_62_c2tnb191v3		"c2tnb191v3"
-#define NID_X9_62_c2tnb191v3		690
-#define OBJ_X9_62_c2tnb191v3		OBJ_X9_62_c_TwoCurve,7L
-
-#define SN_X9_62_c2onb191v4		"c2onb191v4"
-#define NID_X9_62_c2onb191v4		691
-#define OBJ_X9_62_c2onb191v4		OBJ_X9_62_c_TwoCurve,8L
-
-#define SN_X9_62_c2onb191v5		"c2onb191v5"
-#define NID_X9_62_c2onb191v5		692
-#define OBJ_X9_62_c2onb191v5		OBJ_X9_62_c_TwoCurve,9L
-
-#define SN_X9_62_c2pnb208w1		"c2pnb208w1"
-#define NID_X9_62_c2pnb208w1		693
-#define OBJ_X9_62_c2pnb208w1		OBJ_X9_62_c_TwoCurve,10L
-
-#define SN_X9_62_c2tnb239v1		"c2tnb239v1"
-#define NID_X9_62_c2tnb239v1		694
-#define OBJ_X9_62_c2tnb239v1		OBJ_X9_62_c_TwoCurve,11L
-
-#define SN_X9_62_c2tnb239v2		"c2tnb239v2"
-#define NID_X9_62_c2tnb239v2		695
-#define OBJ_X9_62_c2tnb239v2		OBJ_X9_62_c_TwoCurve,12L
-
-#define SN_X9_62_c2tnb239v3		"c2tnb239v3"
-#define NID_X9_62_c2tnb239v3		696
-#define OBJ_X9_62_c2tnb239v3		OBJ_X9_62_c_TwoCurve,13L
-
-#define SN_X9_62_c2onb239v4		"c2onb239v4"
-#define NID_X9_62_c2onb239v4		697
-#define OBJ_X9_62_c2onb239v4		OBJ_X9_62_c_TwoCurve,14L
-
-#define SN_X9_62_c2onb239v5		"c2onb239v5"
-#define NID_X9_62_c2onb239v5		698
-#define OBJ_X9_62_c2onb239v5		OBJ_X9_62_c_TwoCurve,15L
-
-#define SN_X9_62_c2pnb272w1		"c2pnb272w1"
-#define NID_X9_62_c2pnb272w1		699
-#define OBJ_X9_62_c2pnb272w1		OBJ_X9_62_c_TwoCurve,16L
-
-#define SN_X9_62_c2pnb304w1		"c2pnb304w1"
-#define NID_X9_62_c2pnb304w1		700
-#define OBJ_X9_62_c2pnb304w1		OBJ_X9_62_c_TwoCurve,17L
-
-#define SN_X9_62_c2tnb359v1		"c2tnb359v1"
-#define NID_X9_62_c2tnb359v1		701
-#define OBJ_X9_62_c2tnb359v1		OBJ_X9_62_c_TwoCurve,18L
-
-#define SN_X9_62_c2pnb368w1		"c2pnb368w1"
-#define NID_X9_62_c2pnb368w1		702
-#define OBJ_X9_62_c2pnb368w1		OBJ_X9_62_c_TwoCurve,19L
-
-#define SN_X9_62_c2tnb431r1		"c2tnb431r1"
-#define NID_X9_62_c2tnb431r1		703
-#define OBJ_X9_62_c2tnb431r1		OBJ_X9_62_c_TwoCurve,20L
-
-#define OBJ_X9_62_primeCurve		OBJ_X9_62_ellipticCurve,1L
-
-#define SN_X9_62_prime192v1		"prime192v1"
-#define NID_X9_62_prime192v1		409
-#define OBJ_X9_62_prime192v1		OBJ_X9_62_primeCurve,1L
-
-#define SN_X9_62_prime192v2		"prime192v2"
-#define NID_X9_62_prime192v2		410
-#define OBJ_X9_62_prime192v2		OBJ_X9_62_primeCurve,2L
-
-#define SN_X9_62_prime192v3		"prime192v3"
-#define NID_X9_62_prime192v3		411
-#define OBJ_X9_62_prime192v3		OBJ_X9_62_primeCurve,3L
-
-#define SN_X9_62_prime239v1		"prime239v1"
-#define NID_X9_62_prime239v1		412
-#define OBJ_X9_62_prime239v1		OBJ_X9_62_primeCurve,4L
-
-#define SN_X9_62_prime239v2		"prime239v2"
-#define NID_X9_62_prime239v2		413
-#define OBJ_X9_62_prime239v2		OBJ_X9_62_primeCurve,5L
-
-#define SN_X9_62_prime239v3		"prime239v3"
-#define NID_X9_62_prime239v3		414
-#define OBJ_X9_62_prime239v3		OBJ_X9_62_primeCurve,6L
-
-#define SN_X9_62_prime256v1		"prime256v1"
-#define NID_X9_62_prime256v1		415
-#define OBJ_X9_62_prime256v1		OBJ_X9_62_primeCurve,7L
-
-#define OBJ_X9_62_id_ecSigType		OBJ_ansi_X9_62,4L
-
-#define SN_ecdsa_with_SHA1		"ecdsa-with-SHA1"
-#define NID_ecdsa_with_SHA1		416
-#define OBJ_ecdsa_with_SHA1		OBJ_X9_62_id_ecSigType,1L
-
-#define SN_ecdsa_with_Recommended		"ecdsa-with-Recommended"
-#define NID_ecdsa_with_Recommended		791
-#define OBJ_ecdsa_with_Recommended		OBJ_X9_62_id_ecSigType,2L
-
-#define SN_ecdsa_with_Specified		"ecdsa-with-Specified"
-#define NID_ecdsa_with_Specified		792
-#define OBJ_ecdsa_with_Specified		OBJ_X9_62_id_ecSigType,3L
-
-#define SN_ecdsa_with_SHA224		"ecdsa-with-SHA224"
-#define NID_ecdsa_with_SHA224		793
-#define OBJ_ecdsa_with_SHA224		OBJ_ecdsa_with_Specified,1L
-
-#define SN_ecdsa_with_SHA256		"ecdsa-with-SHA256"
-#define NID_ecdsa_with_SHA256		794
-#define OBJ_ecdsa_with_SHA256		OBJ_ecdsa_with_Specified,2L
-
-#define SN_ecdsa_with_SHA384		"ecdsa-with-SHA384"
-#define NID_ecdsa_with_SHA384		795
-#define OBJ_ecdsa_with_SHA384		OBJ_ecdsa_with_Specified,3L
-
-#define SN_ecdsa_with_SHA512		"ecdsa-with-SHA512"
-#define NID_ecdsa_with_SHA512		796
-#define OBJ_ecdsa_with_SHA512		OBJ_ecdsa_with_Specified,4L
-
-#define OBJ_secg_ellipticCurve		OBJ_certicom_arc,0L
-
-#define SN_secp112r1		"secp112r1"
-#define NID_secp112r1		704
-#define OBJ_secp112r1		OBJ_secg_ellipticCurve,6L
-
-#define SN_secp112r2		"secp112r2"
-#define NID_secp112r2		705
-#define OBJ_secp112r2		OBJ_secg_ellipticCurve,7L
-
-#define SN_secp128r1		"secp128r1"
-#define NID_secp128r1		706
-#define OBJ_secp128r1		OBJ_secg_ellipticCurve,28L
-
-#define SN_secp128r2		"secp128r2"
-#define NID_secp128r2		707
-#define OBJ_secp128r2		OBJ_secg_ellipticCurve,29L
-
-#define SN_secp160k1		"secp160k1"
-#define NID_secp160k1		708
-#define OBJ_secp160k1		OBJ_secg_ellipticCurve,9L
-
-#define SN_secp160r1		"secp160r1"
-#define NID_secp160r1		709
-#define OBJ_secp160r1		OBJ_secg_ellipticCurve,8L
-
-#define SN_secp160r2		"secp160r2"
-#define NID_secp160r2		710
-#define OBJ_secp160r2		OBJ_secg_ellipticCurve,30L
-
-#define SN_secp192k1		"secp192k1"
-#define NID_secp192k1		711
-#define OBJ_secp192k1		OBJ_secg_ellipticCurve,31L
-
-#define SN_secp224k1		"secp224k1"
-#define NID_secp224k1		712
-#define OBJ_secp224k1		OBJ_secg_ellipticCurve,32L
-
-#define SN_secp224r1		"secp224r1"
-#define NID_secp224r1		713
-#define OBJ_secp224r1		OBJ_secg_ellipticCurve,33L
-
-#define SN_secp256k1		"secp256k1"
-#define NID_secp256k1		714
-#define OBJ_secp256k1		OBJ_secg_ellipticCurve,10L
-
-#define SN_secp384r1		"secp384r1"
-#define NID_secp384r1		715
-#define OBJ_secp384r1		OBJ_secg_ellipticCurve,34L
-
-#define SN_secp521r1		"secp521r1"
-#define NID_secp521r1		716
-#define OBJ_secp521r1		OBJ_secg_ellipticCurve,35L
-
-#define SN_sect113r1		"sect113r1"
-#define NID_sect113r1		717
-#define OBJ_sect113r1		OBJ_secg_ellipticCurve,4L
-
-#define SN_sect113r2		"sect113r2"
-#define NID_sect113r2		718
-#define OBJ_sect113r2		OBJ_secg_ellipticCurve,5L
-
-#define SN_sect131r1		"sect131r1"
-#define NID_sect131r1		719
-#define OBJ_sect131r1		OBJ_secg_ellipticCurve,22L
-
-#define SN_sect131r2		"sect131r2"
-#define NID_sect131r2		720
-#define OBJ_sect131r2		OBJ_secg_ellipticCurve,23L
-
-#define SN_sect163k1		"sect163k1"
-#define NID_sect163k1		721
-#define OBJ_sect163k1		OBJ_secg_ellipticCurve,1L
-
-#define SN_sect163r1		"sect163r1"
-#define NID_sect163r1		722
-#define OBJ_sect163r1		OBJ_secg_ellipticCurve,2L
-
-#define SN_sect163r2		"sect163r2"
-#define NID_sect163r2		723
-#define OBJ_sect163r2		OBJ_secg_ellipticCurve,15L
-
-#define SN_sect193r1		"sect193r1"
-#define NID_sect193r1		724
-#define OBJ_sect193r1		OBJ_secg_ellipticCurve,24L
-
-#define SN_sect193r2		"sect193r2"
-#define NID_sect193r2		725
-#define OBJ_sect193r2		OBJ_secg_ellipticCurve,25L
-
-#define SN_sect233k1		"sect233k1"
-#define NID_sect233k1		726
-#define OBJ_sect233k1		OBJ_secg_ellipticCurve,26L
-
-#define SN_sect233r1		"sect233r1"
-#define NID_sect233r1		727
-#define OBJ_sect233r1		OBJ_secg_ellipticCurve,27L
-
-#define SN_sect239k1		"sect239k1"
-#define NID_sect239k1		728
-#define OBJ_sect239k1		OBJ_secg_ellipticCurve,3L
-
-#define SN_sect283k1		"sect283k1"
-#define NID_sect283k1		729
-#define OBJ_sect283k1		OBJ_secg_ellipticCurve,16L
-
-#define SN_sect283r1		"sect283r1"
-#define NID_sect283r1		730
-#define OBJ_sect283r1		OBJ_secg_ellipticCurve,17L
-
-#define SN_sect409k1		"sect409k1"
-#define NID_sect409k1		731
-#define OBJ_sect409k1		OBJ_secg_ellipticCurve,36L
-
-#define SN_sect409r1		"sect409r1"
-#define NID_sect409r1		732
-#define OBJ_sect409r1		OBJ_secg_ellipticCurve,37L
-
-#define SN_sect571k1		"sect571k1"
-#define NID_sect571k1		733
-#define OBJ_sect571k1		OBJ_secg_ellipticCurve,38L
-
-#define SN_sect571r1		"sect571r1"
-#define NID_sect571r1		734
-#define OBJ_sect571r1		OBJ_secg_ellipticCurve,39L
-
-#define OBJ_wap_wsg_idm_ecid		OBJ_wap_wsg,4L
-
-#define SN_wap_wsg_idm_ecid_wtls1		"wap-wsg-idm-ecid-wtls1"
-#define NID_wap_wsg_idm_ecid_wtls1		735
-#define OBJ_wap_wsg_idm_ecid_wtls1		OBJ_wap_wsg_idm_ecid,1L
-
-#define SN_wap_wsg_idm_ecid_wtls3		"wap-wsg-idm-ecid-wtls3"
-#define NID_wap_wsg_idm_ecid_wtls3		736
-#define OBJ_wap_wsg_idm_ecid_wtls3		OBJ_wap_wsg_idm_ecid,3L
-
-#define SN_wap_wsg_idm_ecid_wtls4		"wap-wsg-idm-ecid-wtls4"
-#define NID_wap_wsg_idm_ecid_wtls4		737
-#define OBJ_wap_wsg_idm_ecid_wtls4		OBJ_wap_wsg_idm_ecid,4L
-
-#define SN_wap_wsg_idm_ecid_wtls5		"wap-wsg-idm-ecid-wtls5"
-#define NID_wap_wsg_idm_ecid_wtls5		738
-#define OBJ_wap_wsg_idm_ecid_wtls5		OBJ_wap_wsg_idm_ecid,5L
-
-#define SN_wap_wsg_idm_ecid_wtls6		"wap-wsg-idm-ecid-wtls6"
-#define NID_wap_wsg_idm_ecid_wtls6		739
-#define OBJ_wap_wsg_idm_ecid_wtls6		OBJ_wap_wsg_idm_ecid,6L
-
-#define SN_wap_wsg_idm_ecid_wtls7		"wap-wsg-idm-ecid-wtls7"
-#define NID_wap_wsg_idm_ecid_wtls7		740
-#define OBJ_wap_wsg_idm_ecid_wtls7		OBJ_wap_wsg_idm_ecid,7L
-
-#define SN_wap_wsg_idm_ecid_wtls8		"wap-wsg-idm-ecid-wtls8"
-#define NID_wap_wsg_idm_ecid_wtls8		741
-#define OBJ_wap_wsg_idm_ecid_wtls8		OBJ_wap_wsg_idm_ecid,8L
-
-#define SN_wap_wsg_idm_ecid_wtls9		"wap-wsg-idm-ecid-wtls9"
-#define NID_wap_wsg_idm_ecid_wtls9		742
-#define OBJ_wap_wsg_idm_ecid_wtls9		OBJ_wap_wsg_idm_ecid,9L
-
-#define SN_wap_wsg_idm_ecid_wtls10		"wap-wsg-idm-ecid-wtls10"
-#define NID_wap_wsg_idm_ecid_wtls10		743
-#define OBJ_wap_wsg_idm_ecid_wtls10		OBJ_wap_wsg_idm_ecid,10L
-
-#define SN_wap_wsg_idm_ecid_wtls11		"wap-wsg-idm-ecid-wtls11"
-#define NID_wap_wsg_idm_ecid_wtls11		744
-#define OBJ_wap_wsg_idm_ecid_wtls11		OBJ_wap_wsg_idm_ecid,11L
-
-#define SN_wap_wsg_idm_ecid_wtls12		"wap-wsg-idm-ecid-wtls12"
-#define NID_wap_wsg_idm_ecid_wtls12		745
-#define OBJ_wap_wsg_idm_ecid_wtls12		OBJ_wap_wsg_idm_ecid,12L
-
-#define SN_cast5_cbc		"CAST5-CBC"
-#define LN_cast5_cbc		"cast5-cbc"
-#define NID_cast5_cbc		108
-#define OBJ_cast5_cbc		OBJ_ISO_US,113533L,7L,66L,10L
-
-#define SN_cast5_ecb		"CAST5-ECB"
-#define LN_cast5_ecb		"cast5-ecb"
-#define NID_cast5_ecb		109
-
-#define SN_cast5_cfb64		"CAST5-CFB"
-#define LN_cast5_cfb64		"cast5-cfb"
-#define NID_cast5_cfb64		110
-
-#define SN_cast5_ofb64		"CAST5-OFB"
-#define LN_cast5_ofb64		"cast5-ofb"
-#define NID_cast5_ofb64		111
-
-#define LN_pbeWithMD5AndCast5_CBC		"pbeWithMD5AndCast5CBC"
-#define NID_pbeWithMD5AndCast5_CBC		112
-#define OBJ_pbeWithMD5AndCast5_CBC		OBJ_ISO_US,113533L,7L,66L,12L
-
-#define SN_id_PasswordBasedMAC		"id-PasswordBasedMAC"
-#define LN_id_PasswordBasedMAC		"password based MAC"
-#define NID_id_PasswordBasedMAC		782
-#define OBJ_id_PasswordBasedMAC		OBJ_ISO_US,113533L,7L,66L,13L
-
-#define SN_id_DHBasedMac		"id-DHBasedMac"
-#define LN_id_DHBasedMac		"Diffie-Hellman based MAC"
-#define NID_id_DHBasedMac		783
-#define OBJ_id_DHBasedMac		OBJ_ISO_US,113533L,7L,66L,30L
-
-#define SN_rsadsi		"rsadsi"
-#define LN_rsadsi		"RSA Data Security, Inc."
-#define NID_rsadsi		1
-#define OBJ_rsadsi		OBJ_ISO_US,113549L
-
-#define SN_pkcs		"pkcs"
-#define LN_pkcs		"RSA Data Security, Inc. PKCS"
-#define NID_pkcs		2
-#define OBJ_pkcs		OBJ_rsadsi,1L
-
-#define SN_pkcs1		"pkcs1"
-#define NID_pkcs1		186
-#define OBJ_pkcs1		OBJ_pkcs,1L
-
-#define LN_rsaEncryption		"rsaEncryption"
-#define NID_rsaEncryption		6
-#define OBJ_rsaEncryption		OBJ_pkcs1,1L
-
-#define SN_md2WithRSAEncryption		"RSA-MD2"
-#define LN_md2WithRSAEncryption		"md2WithRSAEncryption"
-#define NID_md2WithRSAEncryption		7
-#define OBJ_md2WithRSAEncryption		OBJ_pkcs1,2L
-
-#define SN_md4WithRSAEncryption		"RSA-MD4"
-#define LN_md4WithRSAEncryption		"md4WithRSAEncryption"
-#define NID_md4WithRSAEncryption		396
-#define OBJ_md4WithRSAEncryption		OBJ_pkcs1,3L
-
-#define SN_md5WithRSAEncryption		"RSA-MD5"
-#define LN_md5WithRSAEncryption		"md5WithRSAEncryption"
-#define NID_md5WithRSAEncryption		8
-#define OBJ_md5WithRSAEncryption		OBJ_pkcs1,4L
-
-#define SN_sha1WithRSAEncryption		"RSA-SHA1"
-#define LN_sha1WithRSAEncryption		"sha1WithRSAEncryption"
-#define NID_sha1WithRSAEncryption		65
-#define OBJ_sha1WithRSAEncryption		OBJ_pkcs1,5L
-
-#define SN_sha256WithRSAEncryption		"RSA-SHA256"
-#define LN_sha256WithRSAEncryption		"sha256WithRSAEncryption"
-#define NID_sha256WithRSAEncryption		668
-#define OBJ_sha256WithRSAEncryption		OBJ_pkcs1,11L
-
-#define SN_sha384WithRSAEncryption		"RSA-SHA384"
-#define LN_sha384WithRSAEncryption		"sha384WithRSAEncryption"
-#define NID_sha384WithRSAEncryption		669
-#define OBJ_sha384WithRSAEncryption		OBJ_pkcs1,12L
-
-#define SN_sha512WithRSAEncryption		"RSA-SHA512"
-#define LN_sha512WithRSAEncryption		"sha512WithRSAEncryption"
-#define NID_sha512WithRSAEncryption		670
-#define OBJ_sha512WithRSAEncryption		OBJ_pkcs1,13L
-
-#define SN_sha224WithRSAEncryption		"RSA-SHA224"
-#define LN_sha224WithRSAEncryption		"sha224WithRSAEncryption"
-#define NID_sha224WithRSAEncryption		671
-#define OBJ_sha224WithRSAEncryption		OBJ_pkcs1,14L
-
-#define SN_pkcs3		"pkcs3"
-#define NID_pkcs3		27
-#define OBJ_pkcs3		OBJ_pkcs,3L
-
-#define LN_dhKeyAgreement		"dhKeyAgreement"
-#define NID_dhKeyAgreement		28
-#define OBJ_dhKeyAgreement		OBJ_pkcs3,1L
-
-#define SN_pkcs5		"pkcs5"
-#define NID_pkcs5		187
-#define OBJ_pkcs5		OBJ_pkcs,5L
-
-#define SN_pbeWithMD2AndDES_CBC		"PBE-MD2-DES"
-#define LN_pbeWithMD2AndDES_CBC		"pbeWithMD2AndDES-CBC"
-#define NID_pbeWithMD2AndDES_CBC		9
-#define OBJ_pbeWithMD2AndDES_CBC		OBJ_pkcs5,1L
-
-#define SN_pbeWithMD5AndDES_CBC		"PBE-MD5-DES"
-#define LN_pbeWithMD5AndDES_CBC		"pbeWithMD5AndDES-CBC"
-#define NID_pbeWithMD5AndDES_CBC		10
-#define OBJ_pbeWithMD5AndDES_CBC		OBJ_pkcs5,3L
-
-#define SN_pbeWithMD2AndRC2_CBC		"PBE-MD2-RC2-64"
-#define LN_pbeWithMD2AndRC2_CBC		"pbeWithMD2AndRC2-CBC"
-#define NID_pbeWithMD2AndRC2_CBC		168
-#define OBJ_pbeWithMD2AndRC2_CBC		OBJ_pkcs5,4L
-
-#define SN_pbeWithMD5AndRC2_CBC		"PBE-MD5-RC2-64"
-#define LN_pbeWithMD5AndRC2_CBC		"pbeWithMD5AndRC2-CBC"
-#define NID_pbeWithMD5AndRC2_CBC		169
-#define OBJ_pbeWithMD5AndRC2_CBC		OBJ_pkcs5,6L
-
-#define SN_pbeWithSHA1AndDES_CBC		"PBE-SHA1-DES"
-#define LN_pbeWithSHA1AndDES_CBC		"pbeWithSHA1AndDES-CBC"
-#define NID_pbeWithSHA1AndDES_CBC		170
-#define OBJ_pbeWithSHA1AndDES_CBC		OBJ_pkcs5,10L
-
-#define SN_pbeWithSHA1AndRC2_CBC		"PBE-SHA1-RC2-64"
-#define LN_pbeWithSHA1AndRC2_CBC		"pbeWithSHA1AndRC2-CBC"
-#define NID_pbeWithSHA1AndRC2_CBC		68
-#define OBJ_pbeWithSHA1AndRC2_CBC		OBJ_pkcs5,11L
-
-#define LN_id_pbkdf2		"PBKDF2"
-#define NID_id_pbkdf2		69
-#define OBJ_id_pbkdf2		OBJ_pkcs5,12L
-
-#define LN_pbes2		"PBES2"
-#define NID_pbes2		161
-#define OBJ_pbes2		OBJ_pkcs5,13L
-
-#define LN_pbmac1		"PBMAC1"
-#define NID_pbmac1		162
-#define OBJ_pbmac1		OBJ_pkcs5,14L
-
-#define SN_pkcs7		"pkcs7"
-#define NID_pkcs7		20
-#define OBJ_pkcs7		OBJ_pkcs,7L
-
-#define LN_pkcs7_data		"pkcs7-data"
-#define NID_pkcs7_data		21
-#define OBJ_pkcs7_data		OBJ_pkcs7,1L
-
-#define LN_pkcs7_signed		"pkcs7-signedData"
-#define NID_pkcs7_signed		22
-#define OBJ_pkcs7_signed		OBJ_pkcs7,2L
-
-#define LN_pkcs7_enveloped		"pkcs7-envelopedData"
-#define NID_pkcs7_enveloped		23
-#define OBJ_pkcs7_enveloped		OBJ_pkcs7,3L
-
-#define LN_pkcs7_signedAndEnveloped		"pkcs7-signedAndEnvelopedData"
-#define NID_pkcs7_signedAndEnveloped		24
-#define OBJ_pkcs7_signedAndEnveloped		OBJ_pkcs7,4L
-
-#define LN_pkcs7_digest		"pkcs7-digestData"
-#define NID_pkcs7_digest		25
-#define OBJ_pkcs7_digest		OBJ_pkcs7,5L
-
-#define LN_pkcs7_encrypted		"pkcs7-encryptedData"
-#define NID_pkcs7_encrypted		26
-#define OBJ_pkcs7_encrypted		OBJ_pkcs7,6L
-
-#define SN_pkcs9		"pkcs9"
-#define NID_pkcs9		47
-#define OBJ_pkcs9		OBJ_pkcs,9L
-
-#define LN_pkcs9_emailAddress		"emailAddress"
-#define NID_pkcs9_emailAddress		48
-#define OBJ_pkcs9_emailAddress		OBJ_pkcs9,1L
-
-#define LN_pkcs9_unstructuredName		"unstructuredName"
-#define NID_pkcs9_unstructuredName		49
-#define OBJ_pkcs9_unstructuredName		OBJ_pkcs9,2L
-
-#define LN_pkcs9_contentType		"contentType"
-#define NID_pkcs9_contentType		50
-#define OBJ_pkcs9_contentType		OBJ_pkcs9,3L
-
-#define LN_pkcs9_messageDigest		"messageDigest"
-#define NID_pkcs9_messageDigest		51
-#define OBJ_pkcs9_messageDigest		OBJ_pkcs9,4L
-
-#define LN_pkcs9_signingTime		"signingTime"
-#define NID_pkcs9_signingTime		52
-#define OBJ_pkcs9_signingTime		OBJ_pkcs9,5L
-
-#define LN_pkcs9_countersignature		"countersignature"
-#define NID_pkcs9_countersignature		53
-#define OBJ_pkcs9_countersignature		OBJ_pkcs9,6L
-
-#define LN_pkcs9_challengePassword		"challengePassword"
-#define NID_pkcs9_challengePassword		54
-#define OBJ_pkcs9_challengePassword		OBJ_pkcs9,7L
-
-#define LN_pkcs9_unstructuredAddress		"unstructuredAddress"
-#define NID_pkcs9_unstructuredAddress		55
-#define OBJ_pkcs9_unstructuredAddress		OBJ_pkcs9,8L
-
-#define LN_pkcs9_extCertAttributes		"extendedCertificateAttributes"
-#define NID_pkcs9_extCertAttributes		56
-#define OBJ_pkcs9_extCertAttributes		OBJ_pkcs9,9L
-
-#define SN_ext_req		"extReq"
-#define LN_ext_req		"Extension Request"
-#define NID_ext_req		172
-#define OBJ_ext_req		OBJ_pkcs9,14L
-
-#define SN_SMIMECapabilities		"SMIME-CAPS"
-#define LN_SMIMECapabilities		"S/MIME Capabilities"
-#define NID_SMIMECapabilities		167
-#define OBJ_SMIMECapabilities		OBJ_pkcs9,15L
-
-#define SN_SMIME		"SMIME"
-#define LN_SMIME		"S/MIME"
-#define NID_SMIME		188
-#define OBJ_SMIME		OBJ_pkcs9,16L
-
-#define SN_id_smime_mod		"id-smime-mod"
-#define NID_id_smime_mod		189
-#define OBJ_id_smime_mod		OBJ_SMIME,0L
-
-#define SN_id_smime_ct		"id-smime-ct"
-#define NID_id_smime_ct		190
-#define OBJ_id_smime_ct		OBJ_SMIME,1L
-
-#define SN_id_smime_aa		"id-smime-aa"
-#define NID_id_smime_aa		191
-#define OBJ_id_smime_aa		OBJ_SMIME,2L
-
-#define SN_id_smime_alg		"id-smime-alg"
-#define NID_id_smime_alg		192
-#define OBJ_id_smime_alg		OBJ_SMIME,3L
-
-#define SN_id_smime_cd		"id-smime-cd"
-#define NID_id_smime_cd		193
-#define OBJ_id_smime_cd		OBJ_SMIME,4L
-
-#define SN_id_smime_spq		"id-smime-spq"
-#define NID_id_smime_spq		194
-#define OBJ_id_smime_spq		OBJ_SMIME,5L
-
-#define SN_id_smime_cti		"id-smime-cti"
-#define NID_id_smime_cti		195
-#define OBJ_id_smime_cti		OBJ_SMIME,6L
-
-#define SN_id_smime_mod_cms		"id-smime-mod-cms"
-#define NID_id_smime_mod_cms		196
-#define OBJ_id_smime_mod_cms		OBJ_id_smime_mod,1L
-
-#define SN_id_smime_mod_ess		"id-smime-mod-ess"
-#define NID_id_smime_mod_ess		197
-#define OBJ_id_smime_mod_ess		OBJ_id_smime_mod,2L
-
-#define SN_id_smime_mod_oid		"id-smime-mod-oid"
-#define NID_id_smime_mod_oid		198
-#define OBJ_id_smime_mod_oid		OBJ_id_smime_mod,3L
-
-#define SN_id_smime_mod_msg_v3		"id-smime-mod-msg-v3"
-#define NID_id_smime_mod_msg_v3		199
-#define OBJ_id_smime_mod_msg_v3		OBJ_id_smime_mod,4L
-
-#define SN_id_smime_mod_ets_eSignature_88		"id-smime-mod-ets-eSignature-88"
-#define NID_id_smime_mod_ets_eSignature_88		200
-#define OBJ_id_smime_mod_ets_eSignature_88		OBJ_id_smime_mod,5L
-
-#define SN_id_smime_mod_ets_eSignature_97		"id-smime-mod-ets-eSignature-97"
-#define NID_id_smime_mod_ets_eSignature_97		201
-#define OBJ_id_smime_mod_ets_eSignature_97		OBJ_id_smime_mod,6L
-
-#define SN_id_smime_mod_ets_eSigPolicy_88		"id-smime-mod-ets-eSigPolicy-88"
-#define NID_id_smime_mod_ets_eSigPolicy_88		202
-#define OBJ_id_smime_mod_ets_eSigPolicy_88		OBJ_id_smime_mod,7L
-
-#define SN_id_smime_mod_ets_eSigPolicy_97		"id-smime-mod-ets-eSigPolicy-97"
-#define NID_id_smime_mod_ets_eSigPolicy_97		203
-#define OBJ_id_smime_mod_ets_eSigPolicy_97		OBJ_id_smime_mod,8L
-
-#define SN_id_smime_ct_receipt		"id-smime-ct-receipt"
-#define NID_id_smime_ct_receipt		204
-#define OBJ_id_smime_ct_receipt		OBJ_id_smime_ct,1L
-
-#define SN_id_smime_ct_authData		"id-smime-ct-authData"
-#define NID_id_smime_ct_authData		205
-#define OBJ_id_smime_ct_authData		OBJ_id_smime_ct,2L
-
-#define SN_id_smime_ct_publishCert		"id-smime-ct-publishCert"
-#define NID_id_smime_ct_publishCert		206
-#define OBJ_id_smime_ct_publishCert		OBJ_id_smime_ct,3L
-
-#define SN_id_smime_ct_TSTInfo		"id-smime-ct-TSTInfo"
-#define NID_id_smime_ct_TSTInfo		207
-#define OBJ_id_smime_ct_TSTInfo		OBJ_id_smime_ct,4L
-
-#define SN_id_smime_ct_TDTInfo		"id-smime-ct-TDTInfo"
-#define NID_id_smime_ct_TDTInfo		208
-#define OBJ_id_smime_ct_TDTInfo		OBJ_id_smime_ct,5L
-
-#define SN_id_smime_ct_contentInfo		"id-smime-ct-contentInfo"
-#define NID_id_smime_ct_contentInfo		209
-#define OBJ_id_smime_ct_contentInfo		OBJ_id_smime_ct,6L
-
-#define SN_id_smime_ct_DVCSRequestData		"id-smime-ct-DVCSRequestData"
-#define NID_id_smime_ct_DVCSRequestData		210
-#define OBJ_id_smime_ct_DVCSRequestData		OBJ_id_smime_ct,7L
-
-#define SN_id_smime_ct_DVCSResponseData		"id-smime-ct-DVCSResponseData"
-#define NID_id_smime_ct_DVCSResponseData		211
-#define OBJ_id_smime_ct_DVCSResponseData		OBJ_id_smime_ct,8L
-
-#define SN_id_smime_ct_compressedData		"id-smime-ct-compressedData"
-#define NID_id_smime_ct_compressedData		786
-#define OBJ_id_smime_ct_compressedData		OBJ_id_smime_ct,9L
-
-#define SN_id_ct_asciiTextWithCRLF		"id-ct-asciiTextWithCRLF"
-#define NID_id_ct_asciiTextWithCRLF		787
-#define OBJ_id_ct_asciiTextWithCRLF		OBJ_id_smime_ct,27L
-
-#define SN_id_smime_aa_receiptRequest		"id-smime-aa-receiptRequest"
-#define NID_id_smime_aa_receiptRequest		212
-#define OBJ_id_smime_aa_receiptRequest		OBJ_id_smime_aa,1L
-
-#define SN_id_smime_aa_securityLabel		"id-smime-aa-securityLabel"
-#define NID_id_smime_aa_securityLabel		213
-#define OBJ_id_smime_aa_securityLabel		OBJ_id_smime_aa,2L
-
-#define SN_id_smime_aa_mlExpandHistory		"id-smime-aa-mlExpandHistory"
-#define NID_id_smime_aa_mlExpandHistory		214
-#define OBJ_id_smime_aa_mlExpandHistory		OBJ_id_smime_aa,3L
-
-#define SN_id_smime_aa_contentHint		"id-smime-aa-contentHint"
-#define NID_id_smime_aa_contentHint		215
-#define OBJ_id_smime_aa_contentHint		OBJ_id_smime_aa,4L
-
-#define SN_id_smime_aa_msgSigDigest		"id-smime-aa-msgSigDigest"
-#define NID_id_smime_aa_msgSigDigest		216
-#define OBJ_id_smime_aa_msgSigDigest		OBJ_id_smime_aa,5L
-
-#define SN_id_smime_aa_encapContentType		"id-smime-aa-encapContentType"
-#define NID_id_smime_aa_encapContentType		217
-#define OBJ_id_smime_aa_encapContentType		OBJ_id_smime_aa,6L
-
-#define SN_id_smime_aa_contentIdentifier		"id-smime-aa-contentIdentifier"
-#define NID_id_smime_aa_contentIdentifier		218
-#define OBJ_id_smime_aa_contentIdentifier		OBJ_id_smime_aa,7L
-
-#define SN_id_smime_aa_macValue		"id-smime-aa-macValue"
-#define NID_id_smime_aa_macValue		219
-#define OBJ_id_smime_aa_macValue		OBJ_id_smime_aa,8L
-
-#define SN_id_smime_aa_equivalentLabels		"id-smime-aa-equivalentLabels"
-#define NID_id_smime_aa_equivalentLabels		220
-#define OBJ_id_smime_aa_equivalentLabels		OBJ_id_smime_aa,9L
-
-#define SN_id_smime_aa_contentReference		"id-smime-aa-contentReference"
-#define NID_id_smime_aa_contentReference		221
-#define OBJ_id_smime_aa_contentReference		OBJ_id_smime_aa,10L
-
-#define SN_id_smime_aa_encrypKeyPref		"id-smime-aa-encrypKeyPref"
-#define NID_id_smime_aa_encrypKeyPref		222
-#define OBJ_id_smime_aa_encrypKeyPref		OBJ_id_smime_aa,11L
-
-#define SN_id_smime_aa_signingCertificate		"id-smime-aa-signingCertificate"
-#define NID_id_smime_aa_signingCertificate		223
-#define OBJ_id_smime_aa_signingCertificate		OBJ_id_smime_aa,12L
-
-#define SN_id_smime_aa_smimeEncryptCerts		"id-smime-aa-smimeEncryptCerts"
-#define NID_id_smime_aa_smimeEncryptCerts		224
-#define OBJ_id_smime_aa_smimeEncryptCerts		OBJ_id_smime_aa,13L
-
-#define SN_id_smime_aa_timeStampToken		"id-smime-aa-timeStampToken"
-#define NID_id_smime_aa_timeStampToken		225
-#define OBJ_id_smime_aa_timeStampToken		OBJ_id_smime_aa,14L
-
-#define SN_id_smime_aa_ets_sigPolicyId		"id-smime-aa-ets-sigPolicyId"
-#define NID_id_smime_aa_ets_sigPolicyId		226
-#define OBJ_id_smime_aa_ets_sigPolicyId		OBJ_id_smime_aa,15L
-
-#define SN_id_smime_aa_ets_commitmentType		"id-smime-aa-ets-commitmentType"
-#define NID_id_smime_aa_ets_commitmentType		227
-#define OBJ_id_smime_aa_ets_commitmentType		OBJ_id_smime_aa,16L
-
-#define SN_id_smime_aa_ets_signerLocation		"id-smime-aa-ets-signerLocation"
-#define NID_id_smime_aa_ets_signerLocation		228
-#define OBJ_id_smime_aa_ets_signerLocation		OBJ_id_smime_aa,17L
-
-#define SN_id_smime_aa_ets_signerAttr		"id-smime-aa-ets-signerAttr"
-#define NID_id_smime_aa_ets_signerAttr		229
-#define OBJ_id_smime_aa_ets_signerAttr		OBJ_id_smime_aa,18L
-
-#define SN_id_smime_aa_ets_otherSigCert		"id-smime-aa-ets-otherSigCert"
-#define NID_id_smime_aa_ets_otherSigCert		230
-#define OBJ_id_smime_aa_ets_otherSigCert		OBJ_id_smime_aa,19L
-
-#define SN_id_smime_aa_ets_contentTimestamp		"id-smime-aa-ets-contentTimestamp"
-#define NID_id_smime_aa_ets_contentTimestamp		231
-#define OBJ_id_smime_aa_ets_contentTimestamp		OBJ_id_smime_aa,20L
-
-#define SN_id_smime_aa_ets_CertificateRefs		"id-smime-aa-ets-CertificateRefs"
-#define NID_id_smime_aa_ets_CertificateRefs		232
-#define OBJ_id_smime_aa_ets_CertificateRefs		OBJ_id_smime_aa,21L
-
-#define SN_id_smime_aa_ets_RevocationRefs		"id-smime-aa-ets-RevocationRefs"
-#define NID_id_smime_aa_ets_RevocationRefs		233
-#define OBJ_id_smime_aa_ets_RevocationRefs		OBJ_id_smime_aa,22L
-
-#define SN_id_smime_aa_ets_certValues		"id-smime-aa-ets-certValues"
-#define NID_id_smime_aa_ets_certValues		234
-#define OBJ_id_smime_aa_ets_certValues		OBJ_id_smime_aa,23L
-
-#define SN_id_smime_aa_ets_revocationValues		"id-smime-aa-ets-revocationValues"
-#define NID_id_smime_aa_ets_revocationValues		235
-#define OBJ_id_smime_aa_ets_revocationValues		OBJ_id_smime_aa,24L
-
-#define SN_id_smime_aa_ets_escTimeStamp		"id-smime-aa-ets-escTimeStamp"
-#define NID_id_smime_aa_ets_escTimeStamp		236
-#define OBJ_id_smime_aa_ets_escTimeStamp		OBJ_id_smime_aa,25L
-
-#define SN_id_smime_aa_ets_certCRLTimestamp		"id-smime-aa-ets-certCRLTimestamp"
-#define NID_id_smime_aa_ets_certCRLTimestamp		237
-#define OBJ_id_smime_aa_ets_certCRLTimestamp		OBJ_id_smime_aa,26L
-
-#define SN_id_smime_aa_ets_archiveTimeStamp		"id-smime-aa-ets-archiveTimeStamp"
-#define NID_id_smime_aa_ets_archiveTimeStamp		238
-#define OBJ_id_smime_aa_ets_archiveTimeStamp		OBJ_id_smime_aa,27L
-
-#define SN_id_smime_aa_signatureType		"id-smime-aa-signatureType"
-#define NID_id_smime_aa_signatureType		239
-#define OBJ_id_smime_aa_signatureType		OBJ_id_smime_aa,28L
-
-#define SN_id_smime_aa_dvcs_dvc		"id-smime-aa-dvcs-dvc"
-#define NID_id_smime_aa_dvcs_dvc		240
-#define OBJ_id_smime_aa_dvcs_dvc		OBJ_id_smime_aa,29L
-
-#define SN_id_smime_alg_ESDHwith3DES		"id-smime-alg-ESDHwith3DES"
-#define NID_id_smime_alg_ESDHwith3DES		241
-#define OBJ_id_smime_alg_ESDHwith3DES		OBJ_id_smime_alg,1L
-
-#define SN_id_smime_alg_ESDHwithRC2		"id-smime-alg-ESDHwithRC2"
-#define NID_id_smime_alg_ESDHwithRC2		242
-#define OBJ_id_smime_alg_ESDHwithRC2		OBJ_id_smime_alg,2L
-
-#define SN_id_smime_alg_3DESwrap		"id-smime-alg-3DESwrap"
-#define NID_id_smime_alg_3DESwrap		243
-#define OBJ_id_smime_alg_3DESwrap		OBJ_id_smime_alg,3L
-
-#define SN_id_smime_alg_RC2wrap		"id-smime-alg-RC2wrap"
-#define NID_id_smime_alg_RC2wrap		244
-#define OBJ_id_smime_alg_RC2wrap		OBJ_id_smime_alg,4L
-
-#define SN_id_smime_alg_ESDH		"id-smime-alg-ESDH"
-#define NID_id_smime_alg_ESDH		245
-#define OBJ_id_smime_alg_ESDH		OBJ_id_smime_alg,5L
-
-#define SN_id_smime_alg_CMS3DESwrap		"id-smime-alg-CMS3DESwrap"
-#define NID_id_smime_alg_CMS3DESwrap		246
-#define OBJ_id_smime_alg_CMS3DESwrap		OBJ_id_smime_alg,6L
-
-#define SN_id_smime_alg_CMSRC2wrap		"id-smime-alg-CMSRC2wrap"
-#define NID_id_smime_alg_CMSRC2wrap		247
-#define OBJ_id_smime_alg_CMSRC2wrap		OBJ_id_smime_alg,7L
-
-#define SN_id_smime_cd_ldap		"id-smime-cd-ldap"
-#define NID_id_smime_cd_ldap		248
-#define OBJ_id_smime_cd_ldap		OBJ_id_smime_cd,1L
-
-#define SN_id_smime_spq_ets_sqt_uri		"id-smime-spq-ets-sqt-uri"
-#define NID_id_smime_spq_ets_sqt_uri		249
-#define OBJ_id_smime_spq_ets_sqt_uri		OBJ_id_smime_spq,1L
-
-#define SN_id_smime_spq_ets_sqt_unotice		"id-smime-spq-ets-sqt-unotice"
-#define NID_id_smime_spq_ets_sqt_unotice		250
-#define OBJ_id_smime_spq_ets_sqt_unotice		OBJ_id_smime_spq,2L
-
-#define SN_id_smime_cti_ets_proofOfOrigin		"id-smime-cti-ets-proofOfOrigin"
-#define NID_id_smime_cti_ets_proofOfOrigin		251
-#define OBJ_id_smime_cti_ets_proofOfOrigin		OBJ_id_smime_cti,1L
-
-#define SN_id_smime_cti_ets_proofOfReceipt		"id-smime-cti-ets-proofOfReceipt"
-#define NID_id_smime_cti_ets_proofOfReceipt		252
-#define OBJ_id_smime_cti_ets_proofOfReceipt		OBJ_id_smime_cti,2L
-
-#define SN_id_smime_cti_ets_proofOfDelivery		"id-smime-cti-ets-proofOfDelivery"
-#define NID_id_smime_cti_ets_proofOfDelivery		253
-#define OBJ_id_smime_cti_ets_proofOfDelivery		OBJ_id_smime_cti,3L
-
-#define SN_id_smime_cti_ets_proofOfSender		"id-smime-cti-ets-proofOfSender"
-#define NID_id_smime_cti_ets_proofOfSender		254
-#define OBJ_id_smime_cti_ets_proofOfSender		OBJ_id_smime_cti,4L
-
-#define SN_id_smime_cti_ets_proofOfApproval		"id-smime-cti-ets-proofOfApproval"
-#define NID_id_smime_cti_ets_proofOfApproval		255
-#define OBJ_id_smime_cti_ets_proofOfApproval		OBJ_id_smime_cti,5L
-
-#define SN_id_smime_cti_ets_proofOfCreation		"id-smime-cti-ets-proofOfCreation"
-#define NID_id_smime_cti_ets_proofOfCreation		256
-#define OBJ_id_smime_cti_ets_proofOfCreation		OBJ_id_smime_cti,6L
-
-#define LN_friendlyName		"friendlyName"
-#define NID_friendlyName		156
-#define OBJ_friendlyName		OBJ_pkcs9,20L
-
-#define LN_localKeyID		"localKeyID"
-#define NID_localKeyID		157
-#define OBJ_localKeyID		OBJ_pkcs9,21L
-
-#define SN_ms_csp_name		"CSPName"
-#define LN_ms_csp_name		"Microsoft CSP Name"
-#define NID_ms_csp_name		417
-#define OBJ_ms_csp_name		1L,3L,6L,1L,4L,1L,311L,17L,1L
-
-#define SN_LocalKeySet		"LocalKeySet"
-#define LN_LocalKeySet		"Microsoft Local Key set"
-#define NID_LocalKeySet		856
-#define OBJ_LocalKeySet		1L,3L,6L,1L,4L,1L,311L,17L,2L
-
-#define OBJ_certTypes		OBJ_pkcs9,22L
-
-#define LN_x509Certificate		"x509Certificate"
-#define NID_x509Certificate		158
-#define OBJ_x509Certificate		OBJ_certTypes,1L
-
-#define LN_sdsiCertificate		"sdsiCertificate"
-#define NID_sdsiCertificate		159
-#define OBJ_sdsiCertificate		OBJ_certTypes,2L
-
-#define OBJ_crlTypes		OBJ_pkcs9,23L
-
-#define LN_x509Crl		"x509Crl"
-#define NID_x509Crl		160
-#define OBJ_x509Crl		OBJ_crlTypes,1L
-
-#define OBJ_pkcs12		OBJ_pkcs,12L
-
-#define OBJ_pkcs12_pbeids		OBJ_pkcs12,1L
-
-#define SN_pbe_WithSHA1And128BitRC4		"PBE-SHA1-RC4-128"
-#define LN_pbe_WithSHA1And128BitRC4		"pbeWithSHA1And128BitRC4"
-#define NID_pbe_WithSHA1And128BitRC4		144
-#define OBJ_pbe_WithSHA1And128BitRC4		OBJ_pkcs12_pbeids,1L
-
-#define SN_pbe_WithSHA1And40BitRC4		"PBE-SHA1-RC4-40"
-#define LN_pbe_WithSHA1And40BitRC4		"pbeWithSHA1And40BitRC4"
-#define NID_pbe_WithSHA1And40BitRC4		145
-#define OBJ_pbe_WithSHA1And40BitRC4		OBJ_pkcs12_pbeids,2L
-
-#define SN_pbe_WithSHA1And3_Key_TripleDES_CBC		"PBE-SHA1-3DES"
-#define LN_pbe_WithSHA1And3_Key_TripleDES_CBC		"pbeWithSHA1And3-KeyTripleDES-CBC"
-#define NID_pbe_WithSHA1And3_Key_TripleDES_CBC		146
-#define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC		OBJ_pkcs12_pbeids,3L
-
-#define SN_pbe_WithSHA1And2_Key_TripleDES_CBC		"PBE-SHA1-2DES"
-#define LN_pbe_WithSHA1And2_Key_TripleDES_CBC		"pbeWithSHA1And2-KeyTripleDES-CBC"
-#define NID_pbe_WithSHA1And2_Key_TripleDES_CBC		147
-#define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC		OBJ_pkcs12_pbeids,4L
-
-#define SN_pbe_WithSHA1And128BitRC2_CBC		"PBE-SHA1-RC2-128"
-#define LN_pbe_WithSHA1And128BitRC2_CBC		"pbeWithSHA1And128BitRC2-CBC"
-#define NID_pbe_WithSHA1And128BitRC2_CBC		148
-#define OBJ_pbe_WithSHA1And128BitRC2_CBC		OBJ_pkcs12_pbeids,5L
-
-#define SN_pbe_WithSHA1And40BitRC2_CBC		"PBE-SHA1-RC2-40"
-#define LN_pbe_WithSHA1And40BitRC2_CBC		"pbeWithSHA1And40BitRC2-CBC"
-#define NID_pbe_WithSHA1And40BitRC2_CBC		149
-#define OBJ_pbe_WithSHA1And40BitRC2_CBC		OBJ_pkcs12_pbeids,6L
-
-#define OBJ_pkcs12_Version1		OBJ_pkcs12,10L
-
-#define OBJ_pkcs12_BagIds		OBJ_pkcs12_Version1,1L
-
-#define LN_keyBag		"keyBag"
-#define NID_keyBag		150
-#define OBJ_keyBag		OBJ_pkcs12_BagIds,1L
-
-#define LN_pkcs8ShroudedKeyBag		"pkcs8ShroudedKeyBag"
-#define NID_pkcs8ShroudedKeyBag		151
-#define OBJ_pkcs8ShroudedKeyBag		OBJ_pkcs12_BagIds,2L
-
-#define LN_certBag		"certBag"
-#define NID_certBag		152
-#define OBJ_certBag		OBJ_pkcs12_BagIds,3L
-
-#define LN_crlBag		"crlBag"
-#define NID_crlBag		153
-#define OBJ_crlBag		OBJ_pkcs12_BagIds,4L
-
-#define LN_secretBag		"secretBag"
-#define NID_secretBag		154
-#define OBJ_secretBag		OBJ_pkcs12_BagIds,5L
-
-#define LN_safeContentsBag		"safeContentsBag"
-#define NID_safeContentsBag		155
-#define OBJ_safeContentsBag		OBJ_pkcs12_BagIds,6L
-
-#define SN_md2		"MD2"
-#define LN_md2		"md2"
-#define NID_md2		3
-#define OBJ_md2		OBJ_rsadsi,2L,2L
-
-#define SN_md4		"MD4"
-#define LN_md4		"md4"
-#define NID_md4		257
-#define OBJ_md4		OBJ_rsadsi,2L,4L
-
-#define SN_md5		"MD5"
-#define LN_md5		"md5"
-#define NID_md5		4
-#define OBJ_md5		OBJ_rsadsi,2L,5L
-
-#define SN_md5_sha1		"MD5-SHA1"
-#define LN_md5_sha1		"md5-sha1"
-#define NID_md5_sha1		114
-
-#define LN_hmacWithMD5		"hmacWithMD5"
-#define NID_hmacWithMD5		797
-#define OBJ_hmacWithMD5		OBJ_rsadsi,2L,6L
-
-#define LN_hmacWithSHA1		"hmacWithSHA1"
-#define NID_hmacWithSHA1		163
-#define OBJ_hmacWithSHA1		OBJ_rsadsi,2L,7L
-
-#define LN_hmacWithSHA224		"hmacWithSHA224"
-#define NID_hmacWithSHA224		798
-#define OBJ_hmacWithSHA224		OBJ_rsadsi,2L,8L
-
-#define LN_hmacWithSHA256		"hmacWithSHA256"
-#define NID_hmacWithSHA256		799
-#define OBJ_hmacWithSHA256		OBJ_rsadsi,2L,9L
-
-#define LN_hmacWithSHA384		"hmacWithSHA384"
-#define NID_hmacWithSHA384		800
-#define OBJ_hmacWithSHA384		OBJ_rsadsi,2L,10L
-
-#define LN_hmacWithSHA512		"hmacWithSHA512"
-#define NID_hmacWithSHA512		801
-#define OBJ_hmacWithSHA512		OBJ_rsadsi,2L,11L
-
-#define SN_rc2_cbc		"RC2-CBC"
-#define LN_rc2_cbc		"rc2-cbc"
-#define NID_rc2_cbc		37
-#define OBJ_rc2_cbc		OBJ_rsadsi,3L,2L
-
-#define SN_rc2_ecb		"RC2-ECB"
-#define LN_rc2_ecb		"rc2-ecb"
-#define NID_rc2_ecb		38
-
-#define SN_rc2_cfb64		"RC2-CFB"
-#define LN_rc2_cfb64		"rc2-cfb"
-#define NID_rc2_cfb64		39
-
-#define SN_rc2_ofb64		"RC2-OFB"
-#define LN_rc2_ofb64		"rc2-ofb"
-#define NID_rc2_ofb64		40
-
-#define SN_rc2_40_cbc		"RC2-40-CBC"
-#define LN_rc2_40_cbc		"rc2-40-cbc"
-#define NID_rc2_40_cbc		98
-
-#define SN_rc2_64_cbc		"RC2-64-CBC"
-#define LN_rc2_64_cbc		"rc2-64-cbc"
-#define NID_rc2_64_cbc		166
-
-#define SN_rc4		"RC4"
-#define LN_rc4		"rc4"
-#define NID_rc4		5
-#define OBJ_rc4		OBJ_rsadsi,3L,4L
-
-#define SN_rc4_40		"RC4-40"
-#define LN_rc4_40		"rc4-40"
-#define NID_rc4_40		97
-
-#define SN_des_ede3_cbc		"DES-EDE3-CBC"
-#define LN_des_ede3_cbc		"des-ede3-cbc"
-#define NID_des_ede3_cbc		44
-#define OBJ_des_ede3_cbc		OBJ_rsadsi,3L,7L
-
-#define SN_rc5_cbc		"RC5-CBC"
-#define LN_rc5_cbc		"rc5-cbc"
-#define NID_rc5_cbc		120
-#define OBJ_rc5_cbc		OBJ_rsadsi,3L,8L
-
-#define SN_rc5_ecb		"RC5-ECB"
-#define LN_rc5_ecb		"rc5-ecb"
-#define NID_rc5_ecb		121
-
-#define SN_rc5_cfb64		"RC5-CFB"
-#define LN_rc5_cfb64		"rc5-cfb"
-#define NID_rc5_cfb64		122
-
-#define SN_rc5_ofb64		"RC5-OFB"
-#define LN_rc5_ofb64		"rc5-ofb"
-#define NID_rc5_ofb64		123
-
-#define SN_ms_ext_req		"msExtReq"
-#define LN_ms_ext_req		"Microsoft Extension Request"
-#define NID_ms_ext_req		171
-#define OBJ_ms_ext_req		1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
-
-#define SN_ms_code_ind		"msCodeInd"
-#define LN_ms_code_ind		"Microsoft Individual Code Signing"
-#define NID_ms_code_ind		134
-#define OBJ_ms_code_ind		1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
-
-#define SN_ms_code_com		"msCodeCom"
-#define LN_ms_code_com		"Microsoft Commercial Code Signing"
-#define NID_ms_code_com		135
-#define OBJ_ms_code_com		1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
-
-#define SN_ms_ctl_sign		"msCTLSign"
-#define LN_ms_ctl_sign		"Microsoft Trust List Signing"
-#define NID_ms_ctl_sign		136
-#define OBJ_ms_ctl_sign		1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
-
-#define SN_ms_sgc		"msSGC"
-#define LN_ms_sgc		"Microsoft Server Gated Crypto"
-#define NID_ms_sgc		137
-#define OBJ_ms_sgc		1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
-
-#define SN_ms_efs		"msEFS"
-#define LN_ms_efs		"Microsoft Encrypted File System"
-#define NID_ms_efs		138
-#define OBJ_ms_efs		1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
-
-#define SN_ms_smartcard_login		"msSmartcardLogin"
-#define LN_ms_smartcard_login		"Microsoft Smartcardlogin"
-#define NID_ms_smartcard_login		648
-#define OBJ_ms_smartcard_login		1L,3L,6L,1L,4L,1L,311L,20L,2L,2L
-
-#define SN_ms_upn		"msUPN"
-#define LN_ms_upn		"Microsoft Universal Principal Name"
-#define NID_ms_upn		649
-#define OBJ_ms_upn		1L,3L,6L,1L,4L,1L,311L,20L,2L,3L
-
-#define SN_idea_cbc		"IDEA-CBC"
-#define LN_idea_cbc		"idea-cbc"
-#define NID_idea_cbc		34
-#define OBJ_idea_cbc		1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
-
-#define SN_idea_ecb		"IDEA-ECB"
-#define LN_idea_ecb		"idea-ecb"
-#define NID_idea_ecb		36
-
-#define SN_idea_cfb64		"IDEA-CFB"
-#define LN_idea_cfb64		"idea-cfb"
-#define NID_idea_cfb64		35
-
-#define SN_idea_ofb64		"IDEA-OFB"
-#define LN_idea_ofb64		"idea-ofb"
-#define NID_idea_ofb64		46
-
-#define SN_bf_cbc		"BF-CBC"
-#define LN_bf_cbc		"bf-cbc"
-#define NID_bf_cbc		91
-#define OBJ_bf_cbc		1L,3L,6L,1L,4L,1L,3029L,1L,2L
-
-#define SN_bf_ecb		"BF-ECB"
-#define LN_bf_ecb		"bf-ecb"
-#define NID_bf_ecb		92
-
-#define SN_bf_cfb64		"BF-CFB"
-#define LN_bf_cfb64		"bf-cfb"
-#define NID_bf_cfb64		93
-
-#define SN_bf_ofb64		"BF-OFB"
-#define LN_bf_ofb64		"bf-ofb"
-#define NID_bf_ofb64		94
-
-#define SN_id_pkix		"PKIX"
-#define NID_id_pkix		127
-#define OBJ_id_pkix		1L,3L,6L,1L,5L,5L,7L
-
-#define SN_id_pkix_mod		"id-pkix-mod"
-#define NID_id_pkix_mod		258
-#define OBJ_id_pkix_mod		OBJ_id_pkix,0L
-
-#define SN_id_pe		"id-pe"
-#define NID_id_pe		175
-#define OBJ_id_pe		OBJ_id_pkix,1L
-
-#define SN_id_qt		"id-qt"
-#define NID_id_qt		259
-#define OBJ_id_qt		OBJ_id_pkix,2L
-
-#define SN_id_kp		"id-kp"
-#define NID_id_kp		128
-#define OBJ_id_kp		OBJ_id_pkix,3L
-
-#define SN_id_it		"id-it"
-#define NID_id_it		260
-#define OBJ_id_it		OBJ_id_pkix,4L
-
-#define SN_id_pkip		"id-pkip"
-#define NID_id_pkip		261
-#define OBJ_id_pkip		OBJ_id_pkix,5L
-
-#define SN_id_alg		"id-alg"
-#define NID_id_alg		262
-#define OBJ_id_alg		OBJ_id_pkix,6L
-
-#define SN_id_cmc		"id-cmc"
-#define NID_id_cmc		263
-#define OBJ_id_cmc		OBJ_id_pkix,7L
-
-#define SN_id_on		"id-on"
-#define NID_id_on		264
-#define OBJ_id_on		OBJ_id_pkix,8L
-
-#define SN_id_pda		"id-pda"
-#define NID_id_pda		265
-#define OBJ_id_pda		OBJ_id_pkix,9L
-
-#define SN_id_aca		"id-aca"
-#define NID_id_aca		266
-#define OBJ_id_aca		OBJ_id_pkix,10L
-
-#define SN_id_qcs		"id-qcs"
-#define NID_id_qcs		267
-#define OBJ_id_qcs		OBJ_id_pkix,11L
-
-#define SN_id_cct		"id-cct"
-#define NID_id_cct		268
-#define OBJ_id_cct		OBJ_id_pkix,12L
-
-#define SN_id_ppl		"id-ppl"
-#define NID_id_ppl		662
-#define OBJ_id_ppl		OBJ_id_pkix,21L
-
-#define SN_id_ad		"id-ad"
-#define NID_id_ad		176
-#define OBJ_id_ad		OBJ_id_pkix,48L
-
-#define SN_id_pkix1_explicit_88		"id-pkix1-explicit-88"
-#define NID_id_pkix1_explicit_88		269
-#define OBJ_id_pkix1_explicit_88		OBJ_id_pkix_mod,1L
-
-#define SN_id_pkix1_implicit_88		"id-pkix1-implicit-88"
-#define NID_id_pkix1_implicit_88		270
-#define OBJ_id_pkix1_implicit_88		OBJ_id_pkix_mod,2L
-
-#define SN_id_pkix1_explicit_93		"id-pkix1-explicit-93"
-#define NID_id_pkix1_explicit_93		271
-#define OBJ_id_pkix1_explicit_93		OBJ_id_pkix_mod,3L
-
-#define SN_id_pkix1_implicit_93		"id-pkix1-implicit-93"
-#define NID_id_pkix1_implicit_93		272
-#define OBJ_id_pkix1_implicit_93		OBJ_id_pkix_mod,4L
-
-#define SN_id_mod_crmf		"id-mod-crmf"
-#define NID_id_mod_crmf		273
-#define OBJ_id_mod_crmf		OBJ_id_pkix_mod,5L
-
-#define SN_id_mod_cmc		"id-mod-cmc"
-#define NID_id_mod_cmc		274
-#define OBJ_id_mod_cmc		OBJ_id_pkix_mod,6L
-
-#define SN_id_mod_kea_profile_88		"id-mod-kea-profile-88"
-#define NID_id_mod_kea_profile_88		275
-#define OBJ_id_mod_kea_profile_88		OBJ_id_pkix_mod,7L
-
-#define SN_id_mod_kea_profile_93		"id-mod-kea-profile-93"
-#define NID_id_mod_kea_profile_93		276
-#define OBJ_id_mod_kea_profile_93		OBJ_id_pkix_mod,8L
-
-#define SN_id_mod_cmp		"id-mod-cmp"
-#define NID_id_mod_cmp		277
-#define OBJ_id_mod_cmp		OBJ_id_pkix_mod,9L
-
-#define SN_id_mod_qualified_cert_88		"id-mod-qualified-cert-88"
-#define NID_id_mod_qualified_cert_88		278
-#define OBJ_id_mod_qualified_cert_88		OBJ_id_pkix_mod,10L
-
-#define SN_id_mod_qualified_cert_93		"id-mod-qualified-cert-93"
-#define NID_id_mod_qualified_cert_93		279
-#define OBJ_id_mod_qualified_cert_93		OBJ_id_pkix_mod,11L
-
-#define SN_id_mod_attribute_cert		"id-mod-attribute-cert"
-#define NID_id_mod_attribute_cert		280
-#define OBJ_id_mod_attribute_cert		OBJ_id_pkix_mod,12L
-
-#define SN_id_mod_timestamp_protocol		"id-mod-timestamp-protocol"
-#define NID_id_mod_timestamp_protocol		281
-#define OBJ_id_mod_timestamp_protocol		OBJ_id_pkix_mod,13L
-
-#define SN_id_mod_ocsp		"id-mod-ocsp"
-#define NID_id_mod_ocsp		282
-#define OBJ_id_mod_ocsp		OBJ_id_pkix_mod,14L
-
-#define SN_id_mod_dvcs		"id-mod-dvcs"
-#define NID_id_mod_dvcs		283
-#define OBJ_id_mod_dvcs		OBJ_id_pkix_mod,15L
-
-#define SN_id_mod_cmp2000		"id-mod-cmp2000"
-#define NID_id_mod_cmp2000		284
-#define OBJ_id_mod_cmp2000		OBJ_id_pkix_mod,16L
-
-#define SN_info_access		"authorityInfoAccess"
-#define LN_info_access		"Authority Information Access"
-#define NID_info_access		177
-#define OBJ_info_access		OBJ_id_pe,1L
-
-#define SN_biometricInfo		"biometricInfo"
-#define LN_biometricInfo		"Biometric Info"
-#define NID_biometricInfo		285
-#define OBJ_biometricInfo		OBJ_id_pe,2L
-
-#define SN_qcStatements		"qcStatements"
-#define NID_qcStatements		286
-#define OBJ_qcStatements		OBJ_id_pe,3L
-
-#define SN_ac_auditEntity		"ac-auditEntity"
-#define NID_ac_auditEntity		287
-#define OBJ_ac_auditEntity		OBJ_id_pe,4L
-
-#define SN_ac_targeting		"ac-targeting"
-#define NID_ac_targeting		288
-#define OBJ_ac_targeting		OBJ_id_pe,5L
-
-#define SN_aaControls		"aaControls"
-#define NID_aaControls		289
-#define OBJ_aaControls		OBJ_id_pe,6L
-
-#define SN_sbgp_ipAddrBlock		"sbgp-ipAddrBlock"
-#define NID_sbgp_ipAddrBlock		290
-#define OBJ_sbgp_ipAddrBlock		OBJ_id_pe,7L
-
-#define SN_sbgp_autonomousSysNum		"sbgp-autonomousSysNum"
-#define NID_sbgp_autonomousSysNum		291
-#define OBJ_sbgp_autonomousSysNum		OBJ_id_pe,8L
-
-#define SN_sbgp_routerIdentifier		"sbgp-routerIdentifier"
-#define NID_sbgp_routerIdentifier		292
-#define OBJ_sbgp_routerIdentifier		OBJ_id_pe,9L
-
-#define SN_ac_proxying		"ac-proxying"
-#define NID_ac_proxying		397
-#define OBJ_ac_proxying		OBJ_id_pe,10L
-
-#define SN_sinfo_access		"subjectInfoAccess"
-#define LN_sinfo_access		"Subject Information Access"
-#define NID_sinfo_access		398
-#define OBJ_sinfo_access		OBJ_id_pe,11L
-
-#define SN_proxyCertInfo		"proxyCertInfo"
-#define LN_proxyCertInfo		"Proxy Certificate Information"
-#define NID_proxyCertInfo		663
-#define OBJ_proxyCertInfo		OBJ_id_pe,14L
-
-#define SN_id_qt_cps		"id-qt-cps"
-#define LN_id_qt_cps		"Policy Qualifier CPS"
-#define NID_id_qt_cps		164
-#define OBJ_id_qt_cps		OBJ_id_qt,1L
-
-#define SN_id_qt_unotice		"id-qt-unotice"
-#define LN_id_qt_unotice		"Policy Qualifier User Notice"
-#define NID_id_qt_unotice		165
-#define OBJ_id_qt_unotice		OBJ_id_qt,2L
-
-#define SN_textNotice		"textNotice"
-#define NID_textNotice		293
-#define OBJ_textNotice		OBJ_id_qt,3L
-
-#define SN_server_auth		"serverAuth"
-#define LN_server_auth		"TLS Web Server Authentication"
-#define NID_server_auth		129
-#define OBJ_server_auth		OBJ_id_kp,1L
-
-#define SN_client_auth		"clientAuth"
-#define LN_client_auth		"TLS Web Client Authentication"
-#define NID_client_auth		130
-#define OBJ_client_auth		OBJ_id_kp,2L
-
-#define SN_code_sign		"codeSigning"
-#define LN_code_sign		"Code Signing"
-#define NID_code_sign		131
-#define OBJ_code_sign		OBJ_id_kp,3L
-
-#define SN_email_protect		"emailProtection"
-#define LN_email_protect		"E-mail Protection"
-#define NID_email_protect		132
-#define OBJ_email_protect		OBJ_id_kp,4L
-
-#define SN_ipsecEndSystem		"ipsecEndSystem"
-#define LN_ipsecEndSystem		"IPSec End System"
-#define NID_ipsecEndSystem		294
-#define OBJ_ipsecEndSystem		OBJ_id_kp,5L
-
-#define SN_ipsecTunnel		"ipsecTunnel"
-#define LN_ipsecTunnel		"IPSec Tunnel"
-#define NID_ipsecTunnel		295
-#define OBJ_ipsecTunnel		OBJ_id_kp,6L
-
-#define SN_ipsecUser		"ipsecUser"
-#define LN_ipsecUser		"IPSec User"
-#define NID_ipsecUser		296
-#define OBJ_ipsecUser		OBJ_id_kp,7L
-
-#define SN_time_stamp		"timeStamping"
-#define LN_time_stamp		"Time Stamping"
-#define NID_time_stamp		133
-#define OBJ_time_stamp		OBJ_id_kp,8L
-
-#define SN_OCSP_sign		"OCSPSigning"
-#define LN_OCSP_sign		"OCSP Signing"
-#define NID_OCSP_sign		180
-#define OBJ_OCSP_sign		OBJ_id_kp,9L
-
-#define SN_dvcs		"DVCS"
-#define LN_dvcs		"dvcs"
-#define NID_dvcs		297
-#define OBJ_dvcs		OBJ_id_kp,10L
-
-#define SN_id_it_caProtEncCert		"id-it-caProtEncCert"
-#define NID_id_it_caProtEncCert		298
-#define OBJ_id_it_caProtEncCert		OBJ_id_it,1L
-
-#define SN_id_it_signKeyPairTypes		"id-it-signKeyPairTypes"
-#define NID_id_it_signKeyPairTypes		299
-#define OBJ_id_it_signKeyPairTypes		OBJ_id_it,2L
-
-#define SN_id_it_encKeyPairTypes		"id-it-encKeyPairTypes"
-#define NID_id_it_encKeyPairTypes		300
-#define OBJ_id_it_encKeyPairTypes		OBJ_id_it,3L
-
-#define SN_id_it_preferredSymmAlg		"id-it-preferredSymmAlg"
-#define NID_id_it_preferredSymmAlg		301
-#define OBJ_id_it_preferredSymmAlg		OBJ_id_it,4L
-
-#define SN_id_it_caKeyUpdateInfo		"id-it-caKeyUpdateInfo"
-#define NID_id_it_caKeyUpdateInfo		302
-#define OBJ_id_it_caKeyUpdateInfo		OBJ_id_it,5L
-
-#define SN_id_it_currentCRL		"id-it-currentCRL"
-#define NID_id_it_currentCRL		303
-#define OBJ_id_it_currentCRL		OBJ_id_it,6L
-
-#define SN_id_it_unsupportedOIDs		"id-it-unsupportedOIDs"
-#define NID_id_it_unsupportedOIDs		304
-#define OBJ_id_it_unsupportedOIDs		OBJ_id_it,7L
-
-#define SN_id_it_subscriptionRequest		"id-it-subscriptionRequest"
-#define NID_id_it_subscriptionRequest		305
-#define OBJ_id_it_subscriptionRequest		OBJ_id_it,8L
-
-#define SN_id_it_subscriptionResponse		"id-it-subscriptionResponse"
-#define NID_id_it_subscriptionResponse		306
-#define OBJ_id_it_subscriptionResponse		OBJ_id_it,9L
-
-#define SN_id_it_keyPairParamReq		"id-it-keyPairParamReq"
-#define NID_id_it_keyPairParamReq		307
-#define OBJ_id_it_keyPairParamReq		OBJ_id_it,10L
-
-#define SN_id_it_keyPairParamRep		"id-it-keyPairParamRep"
-#define NID_id_it_keyPairParamRep		308
-#define OBJ_id_it_keyPairParamRep		OBJ_id_it,11L
-
-#define SN_id_it_revPassphrase		"id-it-revPassphrase"
-#define NID_id_it_revPassphrase		309
-#define OBJ_id_it_revPassphrase		OBJ_id_it,12L
-
-#define SN_id_it_implicitConfirm		"id-it-implicitConfirm"
-#define NID_id_it_implicitConfirm		310
-#define OBJ_id_it_implicitConfirm		OBJ_id_it,13L
-
-#define SN_id_it_confirmWaitTime		"id-it-confirmWaitTime"
-#define NID_id_it_confirmWaitTime		311
-#define OBJ_id_it_confirmWaitTime		OBJ_id_it,14L
-
-#define SN_id_it_origPKIMessage		"id-it-origPKIMessage"
-#define NID_id_it_origPKIMessage		312
-#define OBJ_id_it_origPKIMessage		OBJ_id_it,15L
-
-#define SN_id_it_suppLangTags		"id-it-suppLangTags"
-#define NID_id_it_suppLangTags		784
-#define OBJ_id_it_suppLangTags		OBJ_id_it,16L
-
-#define SN_id_regCtrl		"id-regCtrl"
-#define NID_id_regCtrl		313
-#define OBJ_id_regCtrl		OBJ_id_pkip,1L
-
-#define SN_id_regInfo		"id-regInfo"
-#define NID_id_regInfo		314
-#define OBJ_id_regInfo		OBJ_id_pkip,2L
-
-#define SN_id_regCtrl_regToken		"id-regCtrl-regToken"
-#define NID_id_regCtrl_regToken		315
-#define OBJ_id_regCtrl_regToken		OBJ_id_regCtrl,1L
-
-#define SN_id_regCtrl_authenticator		"id-regCtrl-authenticator"
-#define NID_id_regCtrl_authenticator		316
-#define OBJ_id_regCtrl_authenticator		OBJ_id_regCtrl,2L
-
-#define SN_id_regCtrl_pkiPublicationInfo		"id-regCtrl-pkiPublicationInfo"
-#define NID_id_regCtrl_pkiPublicationInfo		317
-#define OBJ_id_regCtrl_pkiPublicationInfo		OBJ_id_regCtrl,3L
-
-#define SN_id_regCtrl_pkiArchiveOptions		"id-regCtrl-pkiArchiveOptions"
-#define NID_id_regCtrl_pkiArchiveOptions		318
-#define OBJ_id_regCtrl_pkiArchiveOptions		OBJ_id_regCtrl,4L
-
-#define SN_id_regCtrl_oldCertID		"id-regCtrl-oldCertID"
-#define NID_id_regCtrl_oldCertID		319
-#define OBJ_id_regCtrl_oldCertID		OBJ_id_regCtrl,5L
-
-#define SN_id_regCtrl_protocolEncrKey		"id-regCtrl-protocolEncrKey"
-#define NID_id_regCtrl_protocolEncrKey		320
-#define OBJ_id_regCtrl_protocolEncrKey		OBJ_id_regCtrl,6L
-
-#define SN_id_regInfo_utf8Pairs		"id-regInfo-utf8Pairs"
-#define NID_id_regInfo_utf8Pairs		321
-#define OBJ_id_regInfo_utf8Pairs		OBJ_id_regInfo,1L
-
-#define SN_id_regInfo_certReq		"id-regInfo-certReq"
-#define NID_id_regInfo_certReq		322
-#define OBJ_id_regInfo_certReq		OBJ_id_regInfo,2L
-
-#define SN_id_alg_des40		"id-alg-des40"
-#define NID_id_alg_des40		323
-#define OBJ_id_alg_des40		OBJ_id_alg,1L
-
-#define SN_id_alg_noSignature		"id-alg-noSignature"
-#define NID_id_alg_noSignature		324
-#define OBJ_id_alg_noSignature		OBJ_id_alg,2L
-
-#define SN_id_alg_dh_sig_hmac_sha1		"id-alg-dh-sig-hmac-sha1"
-#define NID_id_alg_dh_sig_hmac_sha1		325
-#define OBJ_id_alg_dh_sig_hmac_sha1		OBJ_id_alg,3L
-
-#define SN_id_alg_dh_pop		"id-alg-dh-pop"
-#define NID_id_alg_dh_pop		326
-#define OBJ_id_alg_dh_pop		OBJ_id_alg,4L
-
-#define SN_id_cmc_statusInfo		"id-cmc-statusInfo"
-#define NID_id_cmc_statusInfo		327
-#define OBJ_id_cmc_statusInfo		OBJ_id_cmc,1L
-
-#define SN_id_cmc_identification		"id-cmc-identification"
-#define NID_id_cmc_identification		328
-#define OBJ_id_cmc_identification		OBJ_id_cmc,2L
-
-#define SN_id_cmc_identityProof		"id-cmc-identityProof"
-#define NID_id_cmc_identityProof		329
-#define OBJ_id_cmc_identityProof		OBJ_id_cmc,3L
-
-#define SN_id_cmc_dataReturn		"id-cmc-dataReturn"
-#define NID_id_cmc_dataReturn		330
-#define OBJ_id_cmc_dataReturn		OBJ_id_cmc,4L
-
-#define SN_id_cmc_transactionId		"id-cmc-transactionId"
-#define NID_id_cmc_transactionId		331
-#define OBJ_id_cmc_transactionId		OBJ_id_cmc,5L
-
-#define SN_id_cmc_senderNonce		"id-cmc-senderNonce"
-#define NID_id_cmc_senderNonce		332
-#define OBJ_id_cmc_senderNonce		OBJ_id_cmc,6L
-
-#define SN_id_cmc_recipientNonce		"id-cmc-recipientNonce"
-#define NID_id_cmc_recipientNonce		333
-#define OBJ_id_cmc_recipientNonce		OBJ_id_cmc,7L
-
-#define SN_id_cmc_addExtensions		"id-cmc-addExtensions"
-#define NID_id_cmc_addExtensions		334
-#define OBJ_id_cmc_addExtensions		OBJ_id_cmc,8L
-
-#define SN_id_cmc_encryptedPOP		"id-cmc-encryptedPOP"
-#define NID_id_cmc_encryptedPOP		335
-#define OBJ_id_cmc_encryptedPOP		OBJ_id_cmc,9L
-
-#define SN_id_cmc_decryptedPOP		"id-cmc-decryptedPOP"
-#define NID_id_cmc_decryptedPOP		336
-#define OBJ_id_cmc_decryptedPOP		OBJ_id_cmc,10L
-
-#define SN_id_cmc_lraPOPWitness		"id-cmc-lraPOPWitness"
-#define NID_id_cmc_lraPOPWitness		337
-#define OBJ_id_cmc_lraPOPWitness		OBJ_id_cmc,11L
-
-#define SN_id_cmc_getCert		"id-cmc-getCert"
-#define NID_id_cmc_getCert		338
-#define OBJ_id_cmc_getCert		OBJ_id_cmc,15L
-
-#define SN_id_cmc_getCRL		"id-cmc-getCRL"
-#define NID_id_cmc_getCRL		339
-#define OBJ_id_cmc_getCRL		OBJ_id_cmc,16L
-
-#define SN_id_cmc_revokeRequest		"id-cmc-revokeRequest"
-#define NID_id_cmc_revokeRequest		340
-#define OBJ_id_cmc_revokeRequest		OBJ_id_cmc,17L
-
-#define SN_id_cmc_regInfo		"id-cmc-regInfo"
-#define NID_id_cmc_regInfo		341
-#define OBJ_id_cmc_regInfo		OBJ_id_cmc,18L
-
-#define SN_id_cmc_responseInfo		"id-cmc-responseInfo"
-#define NID_id_cmc_responseInfo		342
-#define OBJ_id_cmc_responseInfo		OBJ_id_cmc,19L
-
-#define SN_id_cmc_queryPending		"id-cmc-queryPending"
-#define NID_id_cmc_queryPending		343
-#define OBJ_id_cmc_queryPending		OBJ_id_cmc,21L
-
-#define SN_id_cmc_popLinkRandom		"id-cmc-popLinkRandom"
-#define NID_id_cmc_popLinkRandom		344
-#define OBJ_id_cmc_popLinkRandom		OBJ_id_cmc,22L
-
-#define SN_id_cmc_popLinkWitness		"id-cmc-popLinkWitness"
-#define NID_id_cmc_popLinkWitness		345
-#define OBJ_id_cmc_popLinkWitness		OBJ_id_cmc,23L
-
-#define SN_id_cmc_confirmCertAcceptance		"id-cmc-confirmCertAcceptance"
-#define NID_id_cmc_confirmCertAcceptance		346
-#define OBJ_id_cmc_confirmCertAcceptance		OBJ_id_cmc,24L
-
-#define SN_id_on_personalData		"id-on-personalData"
-#define NID_id_on_personalData		347
-#define OBJ_id_on_personalData		OBJ_id_on,1L
-
-#define SN_id_on_permanentIdentifier		"id-on-permanentIdentifier"
-#define LN_id_on_permanentIdentifier		"Permanent Identifier"
-#define NID_id_on_permanentIdentifier		858
-#define OBJ_id_on_permanentIdentifier		OBJ_id_on,3L
-
-#define SN_id_pda_dateOfBirth		"id-pda-dateOfBirth"
-#define NID_id_pda_dateOfBirth		348
-#define OBJ_id_pda_dateOfBirth		OBJ_id_pda,1L
-
-#define SN_id_pda_placeOfBirth		"id-pda-placeOfBirth"
-#define NID_id_pda_placeOfBirth		349
-#define OBJ_id_pda_placeOfBirth		OBJ_id_pda,2L
-
-#define SN_id_pda_gender		"id-pda-gender"
-#define NID_id_pda_gender		351
-#define OBJ_id_pda_gender		OBJ_id_pda,3L
-
-#define SN_id_pda_countryOfCitizenship		"id-pda-countryOfCitizenship"
-#define NID_id_pda_countryOfCitizenship		352
-#define OBJ_id_pda_countryOfCitizenship		OBJ_id_pda,4L
-
-#define SN_id_pda_countryOfResidence		"id-pda-countryOfResidence"
-#define NID_id_pda_countryOfResidence		353
-#define OBJ_id_pda_countryOfResidence		OBJ_id_pda,5L
-
-#define SN_id_aca_authenticationInfo		"id-aca-authenticationInfo"
-#define NID_id_aca_authenticationInfo		354
-#define OBJ_id_aca_authenticationInfo		OBJ_id_aca,1L
-
-#define SN_id_aca_accessIdentity		"id-aca-accessIdentity"
-#define NID_id_aca_accessIdentity		355
-#define OBJ_id_aca_accessIdentity		OBJ_id_aca,2L
-
-#define SN_id_aca_chargingIdentity		"id-aca-chargingIdentity"
-#define NID_id_aca_chargingIdentity		356
-#define OBJ_id_aca_chargingIdentity		OBJ_id_aca,3L
-
-#define SN_id_aca_group		"id-aca-group"
-#define NID_id_aca_group		357
-#define OBJ_id_aca_group		OBJ_id_aca,4L
-
-#define SN_id_aca_role		"id-aca-role"
-#define NID_id_aca_role		358
-#define OBJ_id_aca_role		OBJ_id_aca,5L
-
-#define SN_id_aca_encAttrs		"id-aca-encAttrs"
-#define NID_id_aca_encAttrs		399
-#define OBJ_id_aca_encAttrs		OBJ_id_aca,6L
-
-#define SN_id_qcs_pkixQCSyntax_v1		"id-qcs-pkixQCSyntax-v1"
-#define NID_id_qcs_pkixQCSyntax_v1		359
-#define OBJ_id_qcs_pkixQCSyntax_v1		OBJ_id_qcs,1L
-
-#define SN_id_cct_crs		"id-cct-crs"
-#define NID_id_cct_crs		360
-#define OBJ_id_cct_crs		OBJ_id_cct,1L
-
-#define SN_id_cct_PKIData		"id-cct-PKIData"
-#define NID_id_cct_PKIData		361
-#define OBJ_id_cct_PKIData		OBJ_id_cct,2L
-
-#define SN_id_cct_PKIResponse		"id-cct-PKIResponse"
-#define NID_id_cct_PKIResponse		362
-#define OBJ_id_cct_PKIResponse		OBJ_id_cct,3L
-
-#define SN_id_ppl_anyLanguage		"id-ppl-anyLanguage"
-#define LN_id_ppl_anyLanguage		"Any language"
-#define NID_id_ppl_anyLanguage		664
-#define OBJ_id_ppl_anyLanguage		OBJ_id_ppl,0L
-
-#define SN_id_ppl_inheritAll		"id-ppl-inheritAll"
-#define LN_id_ppl_inheritAll		"Inherit all"
-#define NID_id_ppl_inheritAll		665
-#define OBJ_id_ppl_inheritAll		OBJ_id_ppl,1L
-
-#define SN_Independent		"id-ppl-independent"
-#define LN_Independent		"Independent"
-#define NID_Independent		667
-#define OBJ_Independent		OBJ_id_ppl,2L
-
-#define SN_ad_OCSP		"OCSP"
-#define LN_ad_OCSP		"OCSP"
-#define NID_ad_OCSP		178
-#define OBJ_ad_OCSP		OBJ_id_ad,1L
-
-#define SN_ad_ca_issuers		"caIssuers"
-#define LN_ad_ca_issuers		"CA Issuers"
-#define NID_ad_ca_issuers		179
-#define OBJ_ad_ca_issuers		OBJ_id_ad,2L
-
-#define SN_ad_timeStamping		"ad_timestamping"
-#define LN_ad_timeStamping		"AD Time Stamping"
-#define NID_ad_timeStamping		363
-#define OBJ_ad_timeStamping		OBJ_id_ad,3L
-
-#define SN_ad_dvcs		"AD_DVCS"
-#define LN_ad_dvcs		"ad dvcs"
-#define NID_ad_dvcs		364
-#define OBJ_ad_dvcs		OBJ_id_ad,4L
-
-#define SN_caRepository		"caRepository"
-#define LN_caRepository		"CA Repository"
-#define NID_caRepository		785
-#define OBJ_caRepository		OBJ_id_ad,5L
-
-#define OBJ_id_pkix_OCSP		OBJ_ad_OCSP
-
-#define SN_id_pkix_OCSP_basic		"basicOCSPResponse"
-#define LN_id_pkix_OCSP_basic		"Basic OCSP Response"
-#define NID_id_pkix_OCSP_basic		365
-#define OBJ_id_pkix_OCSP_basic		OBJ_id_pkix_OCSP,1L
-
-#define SN_id_pkix_OCSP_Nonce		"Nonce"
-#define LN_id_pkix_OCSP_Nonce		"OCSP Nonce"
-#define NID_id_pkix_OCSP_Nonce		366
-#define OBJ_id_pkix_OCSP_Nonce		OBJ_id_pkix_OCSP,2L
-
-#define SN_id_pkix_OCSP_CrlID		"CrlID"
-#define LN_id_pkix_OCSP_CrlID		"OCSP CRL ID"
-#define NID_id_pkix_OCSP_CrlID		367
-#define OBJ_id_pkix_OCSP_CrlID		OBJ_id_pkix_OCSP,3L
-
-#define SN_id_pkix_OCSP_acceptableResponses		"acceptableResponses"
-#define LN_id_pkix_OCSP_acceptableResponses		"Acceptable OCSP Responses"
-#define NID_id_pkix_OCSP_acceptableResponses		368
-#define OBJ_id_pkix_OCSP_acceptableResponses		OBJ_id_pkix_OCSP,4L
-
-#define SN_id_pkix_OCSP_noCheck		"noCheck"
-#define LN_id_pkix_OCSP_noCheck		"OCSP No Check"
-#define NID_id_pkix_OCSP_noCheck		369
-#define OBJ_id_pkix_OCSP_noCheck		OBJ_id_pkix_OCSP,5L
-
-#define SN_id_pkix_OCSP_archiveCutoff		"archiveCutoff"
-#define LN_id_pkix_OCSP_archiveCutoff		"OCSP Archive Cutoff"
-#define NID_id_pkix_OCSP_archiveCutoff		370
-#define OBJ_id_pkix_OCSP_archiveCutoff		OBJ_id_pkix_OCSP,6L
-
-#define SN_id_pkix_OCSP_serviceLocator		"serviceLocator"
-#define LN_id_pkix_OCSP_serviceLocator		"OCSP Service Locator"
-#define NID_id_pkix_OCSP_serviceLocator		371
-#define OBJ_id_pkix_OCSP_serviceLocator		OBJ_id_pkix_OCSP,7L
-
-#define SN_id_pkix_OCSP_extendedStatus		"extendedStatus"
-#define LN_id_pkix_OCSP_extendedStatus		"Extended OCSP Status"
-#define NID_id_pkix_OCSP_extendedStatus		372
-#define OBJ_id_pkix_OCSP_extendedStatus		OBJ_id_pkix_OCSP,8L
-
-#define SN_id_pkix_OCSP_valid		"valid"
-#define NID_id_pkix_OCSP_valid		373
-#define OBJ_id_pkix_OCSP_valid		OBJ_id_pkix_OCSP,9L
-
-#define SN_id_pkix_OCSP_path		"path"
-#define NID_id_pkix_OCSP_path		374
-#define OBJ_id_pkix_OCSP_path		OBJ_id_pkix_OCSP,10L
-
-#define SN_id_pkix_OCSP_trustRoot		"trustRoot"
-#define LN_id_pkix_OCSP_trustRoot		"Trust Root"
-#define NID_id_pkix_OCSP_trustRoot		375
-#define OBJ_id_pkix_OCSP_trustRoot		OBJ_id_pkix_OCSP,11L
-
-#define SN_algorithm		"algorithm"
-#define LN_algorithm		"algorithm"
-#define NID_algorithm		376
-#define OBJ_algorithm		1L,3L,14L,3L,2L
-
-#define SN_md5WithRSA		"RSA-NP-MD5"
-#define LN_md5WithRSA		"md5WithRSA"
-#define NID_md5WithRSA		104
-#define OBJ_md5WithRSA		OBJ_algorithm,3L
-
-#define SN_des_ecb		"DES-ECB"
-#define LN_des_ecb		"des-ecb"
-#define NID_des_ecb		29
-#define OBJ_des_ecb		OBJ_algorithm,6L
-
-#define SN_des_cbc		"DES-CBC"
-#define LN_des_cbc		"des-cbc"
-#define NID_des_cbc		31
-#define OBJ_des_cbc		OBJ_algorithm,7L
-
-#define SN_des_ofb64		"DES-OFB"
-#define LN_des_ofb64		"des-ofb"
-#define NID_des_ofb64		45
-#define OBJ_des_ofb64		OBJ_algorithm,8L
-
-#define SN_des_cfb64		"DES-CFB"
-#define LN_des_cfb64		"des-cfb"
-#define NID_des_cfb64		30
-#define OBJ_des_cfb64		OBJ_algorithm,9L
-
-#define SN_rsaSignature		"rsaSignature"
-#define NID_rsaSignature		377
-#define OBJ_rsaSignature		OBJ_algorithm,11L
-
-#define SN_dsa_2		"DSA-old"
-#define LN_dsa_2		"dsaEncryption-old"
-#define NID_dsa_2		67
-#define OBJ_dsa_2		OBJ_algorithm,12L
-
-#define SN_dsaWithSHA		"DSA-SHA"
-#define LN_dsaWithSHA		"dsaWithSHA"
-#define NID_dsaWithSHA		66
-#define OBJ_dsaWithSHA		OBJ_algorithm,13L
-
-#define SN_shaWithRSAEncryption		"RSA-SHA"
-#define LN_shaWithRSAEncryption		"shaWithRSAEncryption"
-#define NID_shaWithRSAEncryption		42
-#define OBJ_shaWithRSAEncryption		OBJ_algorithm,15L
-
-#define SN_des_ede_ecb		"DES-EDE"
-#define LN_des_ede_ecb		"des-ede"
-#define NID_des_ede_ecb		32
-#define OBJ_des_ede_ecb		OBJ_algorithm,17L
-
-#define SN_des_ede3_ecb		"DES-EDE3"
-#define LN_des_ede3_ecb		"des-ede3"
-#define NID_des_ede3_ecb		33
-
-#define SN_des_ede_cbc		"DES-EDE-CBC"
-#define LN_des_ede_cbc		"des-ede-cbc"
-#define NID_des_ede_cbc		43
-
-#define SN_des_ede_cfb64		"DES-EDE-CFB"
-#define LN_des_ede_cfb64		"des-ede-cfb"
-#define NID_des_ede_cfb64		60
-
-#define SN_des_ede3_cfb64		"DES-EDE3-CFB"
-#define LN_des_ede3_cfb64		"des-ede3-cfb"
-#define NID_des_ede3_cfb64		61
-
-#define SN_des_ede_ofb64		"DES-EDE-OFB"
-#define LN_des_ede_ofb64		"des-ede-ofb"
-#define NID_des_ede_ofb64		62
-
-#define SN_des_ede3_ofb64		"DES-EDE3-OFB"
-#define LN_des_ede3_ofb64		"des-ede3-ofb"
-#define NID_des_ede3_ofb64		63
-
-#define SN_desx_cbc		"DESX-CBC"
-#define LN_desx_cbc		"desx-cbc"
-#define NID_desx_cbc		80
-
-#define SN_sha		"SHA"
-#define LN_sha		"sha"
-#define NID_sha		41
-#define OBJ_sha		OBJ_algorithm,18L
-
-#define SN_sha1		"SHA1"
-#define LN_sha1		"sha1"
-#define NID_sha1		64
-#define OBJ_sha1		OBJ_algorithm,26L
-
-#define SN_dsaWithSHA1_2		"DSA-SHA1-old"
-#define LN_dsaWithSHA1_2		"dsaWithSHA1-old"
-#define NID_dsaWithSHA1_2		70
-#define OBJ_dsaWithSHA1_2		OBJ_algorithm,27L
-
-#define SN_sha1WithRSA		"RSA-SHA1-2"
-#define LN_sha1WithRSA		"sha1WithRSA"
-#define NID_sha1WithRSA		115
-#define OBJ_sha1WithRSA		OBJ_algorithm,29L
-
-#define SN_ripemd160		"RIPEMD160"
-#define LN_ripemd160		"ripemd160"
-#define NID_ripemd160		117
-#define OBJ_ripemd160		1L,3L,36L,3L,2L,1L
-
-#define SN_ripemd160WithRSA		"RSA-RIPEMD160"
-#define LN_ripemd160WithRSA		"ripemd160WithRSA"
-#define NID_ripemd160WithRSA		119
-#define OBJ_ripemd160WithRSA		1L,3L,36L,3L,3L,1L,2L
-
-#define SN_sxnet		"SXNetID"
-#define LN_sxnet		"Strong Extranet ID"
-#define NID_sxnet		143
-#define OBJ_sxnet		1L,3L,101L,1L,4L,1L
-
-#define SN_X500		"X500"
-#define LN_X500		"directory services (X.500)"
-#define NID_X500		11
-#define OBJ_X500		2L,5L
-
-#define SN_X509		"X509"
-#define NID_X509		12
-#define OBJ_X509		OBJ_X500,4L
-
-#define SN_commonName		"CN"
-#define LN_commonName		"commonName"
-#define NID_commonName		13
-#define OBJ_commonName		OBJ_X509,3L
-
-#define SN_surname		"SN"
-#define LN_surname		"surname"
-#define NID_surname		100
-#define OBJ_surname		OBJ_X509,4L
-
-#define LN_serialNumber		"serialNumber"
-#define NID_serialNumber		105
-#define OBJ_serialNumber		OBJ_X509,5L
-
-#define SN_countryName		"C"
-#define LN_countryName		"countryName"
-#define NID_countryName		14
-#define OBJ_countryName		OBJ_X509,6L
-
-#define SN_localityName		"L"
-#define LN_localityName		"localityName"
-#define NID_localityName		15
-#define OBJ_localityName		OBJ_X509,7L
-
-#define SN_stateOrProvinceName		"ST"
-#define LN_stateOrProvinceName		"stateOrProvinceName"
-#define NID_stateOrProvinceName		16
-#define OBJ_stateOrProvinceName		OBJ_X509,8L
-
-#define SN_streetAddress		"street"
-#define LN_streetAddress		"streetAddress"
-#define NID_streetAddress		660
-#define OBJ_streetAddress		OBJ_X509,9L
-
-#define SN_organizationName		"O"
-#define LN_organizationName		"organizationName"
-#define NID_organizationName		17
-#define OBJ_organizationName		OBJ_X509,10L
-
-#define SN_organizationalUnitName		"OU"
-#define LN_organizationalUnitName		"organizationalUnitName"
-#define NID_organizationalUnitName		18
-#define OBJ_organizationalUnitName		OBJ_X509,11L
-
-#define SN_title		"title"
-#define LN_title		"title"
-#define NID_title		106
-#define OBJ_title		OBJ_X509,12L
-
-#define LN_description		"description"
-#define NID_description		107
-#define OBJ_description		OBJ_X509,13L
-
-#define LN_searchGuide		"searchGuide"
-#define NID_searchGuide		859
-#define OBJ_searchGuide		OBJ_X509,14L
-
-#define LN_businessCategory		"businessCategory"
-#define NID_businessCategory		860
-#define OBJ_businessCategory		OBJ_X509,15L
-
-#define LN_postalAddress		"postalAddress"
-#define NID_postalAddress		861
-#define OBJ_postalAddress		OBJ_X509,16L
-
-#define LN_postalCode		"postalCode"
-#define NID_postalCode		661
-#define OBJ_postalCode		OBJ_X509,17L
-
-#define LN_postOfficeBox		"postOfficeBox"
-#define NID_postOfficeBox		862
-#define OBJ_postOfficeBox		OBJ_X509,18L
-
-#define LN_physicalDeliveryOfficeName		"physicalDeliveryOfficeName"
-#define NID_physicalDeliveryOfficeName		863
-#define OBJ_physicalDeliveryOfficeName		OBJ_X509,19L
-
-#define LN_telephoneNumber		"telephoneNumber"
-#define NID_telephoneNumber		864
-#define OBJ_telephoneNumber		OBJ_X509,20L
-
-#define LN_telexNumber		"telexNumber"
-#define NID_telexNumber		865
-#define OBJ_telexNumber		OBJ_X509,21L
-
-#define LN_teletexTerminalIdentifier		"teletexTerminalIdentifier"
-#define NID_teletexTerminalIdentifier		866
-#define OBJ_teletexTerminalIdentifier		OBJ_X509,22L
-
-#define LN_facsimileTelephoneNumber		"facsimileTelephoneNumber"
-#define NID_facsimileTelephoneNumber		867
-#define OBJ_facsimileTelephoneNumber		OBJ_X509,23L
-
-#define LN_x121Address		"x121Address"
-#define NID_x121Address		868
-#define OBJ_x121Address		OBJ_X509,24L
-
-#define LN_internationaliSDNNumber		"internationaliSDNNumber"
-#define NID_internationaliSDNNumber		869
-#define OBJ_internationaliSDNNumber		OBJ_X509,25L
-
-#define LN_registeredAddress		"registeredAddress"
-#define NID_registeredAddress		870
-#define OBJ_registeredAddress		OBJ_X509,26L
-
-#define LN_destinationIndicator		"destinationIndicator"
-#define NID_destinationIndicator		871
-#define OBJ_destinationIndicator		OBJ_X509,27L
-
-#define LN_preferredDeliveryMethod		"preferredDeliveryMethod"
-#define NID_preferredDeliveryMethod		872
-#define OBJ_preferredDeliveryMethod		OBJ_X509,28L
-
-#define LN_presentationAddress		"presentationAddress"
-#define NID_presentationAddress		873
-#define OBJ_presentationAddress		OBJ_X509,29L
-
-#define LN_supportedApplicationContext		"supportedApplicationContext"
-#define NID_supportedApplicationContext		874
-#define OBJ_supportedApplicationContext		OBJ_X509,30L
-
-#define SN_member		"member"
-#define NID_member		875
-#define OBJ_member		OBJ_X509,31L
-
-#define SN_owner		"owner"
-#define NID_owner		876
-#define OBJ_owner		OBJ_X509,32L
-
-#define LN_roleOccupant		"roleOccupant"
-#define NID_roleOccupant		877
-#define OBJ_roleOccupant		OBJ_X509,33L
-
-#define SN_seeAlso		"seeAlso"
-#define NID_seeAlso		878
-#define OBJ_seeAlso		OBJ_X509,34L
-
-#define LN_userPassword		"userPassword"
-#define NID_userPassword		879
-#define OBJ_userPassword		OBJ_X509,35L
-
-#define LN_userCertificate		"userCertificate"
-#define NID_userCertificate		880
-#define OBJ_userCertificate		OBJ_X509,36L
-
-#define LN_cACertificate		"cACertificate"
-#define NID_cACertificate		881
-#define OBJ_cACertificate		OBJ_X509,37L
-
-#define LN_authorityRevocationList		"authorityRevocationList"
-#define NID_authorityRevocationList		882
-#define OBJ_authorityRevocationList		OBJ_X509,38L
-
-#define LN_certificateRevocationList		"certificateRevocationList"
-#define NID_certificateRevocationList		883
-#define OBJ_certificateRevocationList		OBJ_X509,39L
-
-#define LN_crossCertificatePair		"crossCertificatePair"
-#define NID_crossCertificatePair		884
-#define OBJ_crossCertificatePair		OBJ_X509,40L
-
-#define SN_name		"name"
-#define LN_name		"name"
-#define NID_name		173
-#define OBJ_name		OBJ_X509,41L
-
-#define SN_givenName		"GN"
-#define LN_givenName		"givenName"
-#define NID_givenName		99
-#define OBJ_givenName		OBJ_X509,42L
-
-#define SN_initials		"initials"
-#define LN_initials		"initials"
-#define NID_initials		101
-#define OBJ_initials		OBJ_X509,43L
-
-#define LN_generationQualifier		"generationQualifier"
-#define NID_generationQualifier		509
-#define OBJ_generationQualifier		OBJ_X509,44L
-
-#define LN_x500UniqueIdentifier		"x500UniqueIdentifier"
-#define NID_x500UniqueIdentifier		503
-#define OBJ_x500UniqueIdentifier		OBJ_X509,45L
-
-#define SN_dnQualifier		"dnQualifier"
-#define LN_dnQualifier		"dnQualifier"
-#define NID_dnQualifier		174
-#define OBJ_dnQualifier		OBJ_X509,46L
-
-#define LN_enhancedSearchGuide		"enhancedSearchGuide"
-#define NID_enhancedSearchGuide		885
-#define OBJ_enhancedSearchGuide		OBJ_X509,47L
-
-#define LN_protocolInformation		"protocolInformation"
-#define NID_protocolInformation		886
-#define OBJ_protocolInformation		OBJ_X509,48L
-
-#define LN_distinguishedName		"distinguishedName"
-#define NID_distinguishedName		887
-#define OBJ_distinguishedName		OBJ_X509,49L
-
-#define LN_uniqueMember		"uniqueMember"
-#define NID_uniqueMember		888
-#define OBJ_uniqueMember		OBJ_X509,50L
-
-#define LN_houseIdentifier		"houseIdentifier"
-#define NID_houseIdentifier		889
-#define OBJ_houseIdentifier		OBJ_X509,51L
-
-#define LN_supportedAlgorithms		"supportedAlgorithms"
-#define NID_supportedAlgorithms		890
-#define OBJ_supportedAlgorithms		OBJ_X509,52L
-
-#define LN_deltaRevocationList		"deltaRevocationList"
-#define NID_deltaRevocationList		891
-#define OBJ_deltaRevocationList		OBJ_X509,53L
-
-#define SN_dmdName		"dmdName"
-#define NID_dmdName		892
-#define OBJ_dmdName		OBJ_X509,54L
-
-#define LN_pseudonym		"pseudonym"
-#define NID_pseudonym		510
-#define OBJ_pseudonym		OBJ_X509,65L
-
-#define SN_role		"role"
-#define LN_role		"role"
-#define NID_role		400
-#define OBJ_role		OBJ_X509,72L
-
-#define SN_X500algorithms		"X500algorithms"
-#define LN_X500algorithms		"directory services - algorithms"
-#define NID_X500algorithms		378
-#define OBJ_X500algorithms		OBJ_X500,8L
-
-#define SN_rsa		"RSA"
-#define LN_rsa		"rsa"
-#define NID_rsa		19
-#define OBJ_rsa		OBJ_X500algorithms,1L,1L
-
-#define SN_mdc2WithRSA		"RSA-MDC2"
-#define LN_mdc2WithRSA		"mdc2WithRSA"
-#define NID_mdc2WithRSA		96
-#define OBJ_mdc2WithRSA		OBJ_X500algorithms,3L,100L
-
-#define SN_mdc2		"MDC2"
-#define LN_mdc2		"mdc2"
-#define NID_mdc2		95
-#define OBJ_mdc2		OBJ_X500algorithms,3L,101L
-
-#define SN_id_ce		"id-ce"
-#define NID_id_ce		81
-#define OBJ_id_ce		OBJ_X500,29L
-
-#define SN_subject_directory_attributes		"subjectDirectoryAttributes"
-#define LN_subject_directory_attributes		"X509v3 Subject Directory Attributes"
-#define NID_subject_directory_attributes		769
-#define OBJ_subject_directory_attributes		OBJ_id_ce,9L
-
-#define SN_subject_key_identifier		"subjectKeyIdentifier"
-#define LN_subject_key_identifier		"X509v3 Subject Key Identifier"
-#define NID_subject_key_identifier		82
-#define OBJ_subject_key_identifier		OBJ_id_ce,14L
-
-#define SN_key_usage		"keyUsage"
-#define LN_key_usage		"X509v3 Key Usage"
-#define NID_key_usage		83
-#define OBJ_key_usage		OBJ_id_ce,15L
-
-#define SN_private_key_usage_period		"privateKeyUsagePeriod"
-#define LN_private_key_usage_period		"X509v3 Private Key Usage Period"
-#define NID_private_key_usage_period		84
-#define OBJ_private_key_usage_period		OBJ_id_ce,16L
-
-#define SN_subject_alt_name		"subjectAltName"
-#define LN_subject_alt_name		"X509v3 Subject Alternative Name"
-#define NID_subject_alt_name		85
-#define OBJ_subject_alt_name		OBJ_id_ce,17L
-
-#define SN_issuer_alt_name		"issuerAltName"
-#define LN_issuer_alt_name		"X509v3 Issuer Alternative Name"
-#define NID_issuer_alt_name		86
-#define OBJ_issuer_alt_name		OBJ_id_ce,18L
-
-#define SN_basic_constraints		"basicConstraints"
-#define LN_basic_constraints		"X509v3 Basic Constraints"
-#define NID_basic_constraints		87
-#define OBJ_basic_constraints		OBJ_id_ce,19L
-
-#define SN_crl_number		"crlNumber"
-#define LN_crl_number		"X509v3 CRL Number"
-#define NID_crl_number		88
-#define OBJ_crl_number		OBJ_id_ce,20L
-
-#define SN_crl_reason		"CRLReason"
-#define LN_crl_reason		"X509v3 CRL Reason Code"
-#define NID_crl_reason		141
-#define OBJ_crl_reason		OBJ_id_ce,21L
-
-#define SN_invalidity_date		"invalidityDate"
-#define LN_invalidity_date		"Invalidity Date"
-#define NID_invalidity_date		142
-#define OBJ_invalidity_date		OBJ_id_ce,24L
-
-#define SN_delta_crl		"deltaCRL"
-#define LN_delta_crl		"X509v3 Delta CRL Indicator"
-#define NID_delta_crl		140
-#define OBJ_delta_crl		OBJ_id_ce,27L
-
-#define SN_issuing_distribution_point		"issuingDistributionPoint"
-#define LN_issuing_distribution_point		"X509v3 Issuing Distrubution Point"
-#define NID_issuing_distribution_point		770
-#define OBJ_issuing_distribution_point		OBJ_id_ce,28L
-
-#define SN_certificate_issuer		"certificateIssuer"
-#define LN_certificate_issuer		"X509v3 Certificate Issuer"
-#define NID_certificate_issuer		771
-#define OBJ_certificate_issuer		OBJ_id_ce,29L
-
-#define SN_name_constraints		"nameConstraints"
-#define LN_name_constraints		"X509v3 Name Constraints"
-#define NID_name_constraints		666
-#define OBJ_name_constraints		OBJ_id_ce,30L
-
-#define SN_crl_distribution_points		"crlDistributionPoints"
-#define LN_crl_distribution_points		"X509v3 CRL Distribution Points"
-#define NID_crl_distribution_points		103
-#define OBJ_crl_distribution_points		OBJ_id_ce,31L
-
-#define SN_certificate_policies		"certificatePolicies"
-#define LN_certificate_policies		"X509v3 Certificate Policies"
-#define NID_certificate_policies		89
-#define OBJ_certificate_policies		OBJ_id_ce,32L
-
-#define SN_any_policy		"anyPolicy"
-#define LN_any_policy		"X509v3 Any Policy"
-#define NID_any_policy		746
-#define OBJ_any_policy		OBJ_certificate_policies,0L
-
-#define SN_policy_mappings		"policyMappings"
-#define LN_policy_mappings		"X509v3 Policy Mappings"
-#define NID_policy_mappings		747
-#define OBJ_policy_mappings		OBJ_id_ce,33L
-
-#define SN_authority_key_identifier		"authorityKeyIdentifier"
-#define LN_authority_key_identifier		"X509v3 Authority Key Identifier"
-#define NID_authority_key_identifier		90
-#define OBJ_authority_key_identifier		OBJ_id_ce,35L
-
-#define SN_policy_constraints		"policyConstraints"
-#define LN_policy_constraints		"X509v3 Policy Constraints"
-#define NID_policy_constraints		401
-#define OBJ_policy_constraints		OBJ_id_ce,36L
-
-#define SN_ext_key_usage		"extendedKeyUsage"
-#define LN_ext_key_usage		"X509v3 Extended Key Usage"
-#define NID_ext_key_usage		126
-#define OBJ_ext_key_usage		OBJ_id_ce,37L
-
-#define SN_freshest_crl		"freshestCRL"
-#define LN_freshest_crl		"X509v3 Freshest CRL"
-#define NID_freshest_crl		857
-#define OBJ_freshest_crl		OBJ_id_ce,46L
-
-#define SN_inhibit_any_policy		"inhibitAnyPolicy"
-#define LN_inhibit_any_policy		"X509v3 Inhibit Any Policy"
-#define NID_inhibit_any_policy		748
-#define OBJ_inhibit_any_policy		OBJ_id_ce,54L
-
-#define SN_target_information		"targetInformation"
-#define LN_target_information		"X509v3 AC Targeting"
-#define NID_target_information		402
-#define OBJ_target_information		OBJ_id_ce,55L
-
-#define SN_no_rev_avail		"noRevAvail"
-#define LN_no_rev_avail		"X509v3 No Revocation Available"
-#define NID_no_rev_avail		403
-#define OBJ_no_rev_avail		OBJ_id_ce,56L
-
-#define SN_netscape		"Netscape"
-#define LN_netscape		"Netscape Communications Corp."
-#define NID_netscape		57
-#define OBJ_netscape		2L,16L,840L,1L,113730L
-
-#define SN_netscape_cert_extension		"nsCertExt"
-#define LN_netscape_cert_extension		"Netscape Certificate Extension"
-#define NID_netscape_cert_extension		58
-#define OBJ_netscape_cert_extension		OBJ_netscape,1L
-
-#define SN_netscape_data_type		"nsDataType"
-#define LN_netscape_data_type		"Netscape Data Type"
-#define NID_netscape_data_type		59
-#define OBJ_netscape_data_type		OBJ_netscape,2L
-
-#define SN_netscape_cert_type		"nsCertType"
-#define LN_netscape_cert_type		"Netscape Cert Type"
-#define NID_netscape_cert_type		71
-#define OBJ_netscape_cert_type		OBJ_netscape_cert_extension,1L
-
-#define SN_netscape_base_url		"nsBaseUrl"
-#define LN_netscape_base_url		"Netscape Base Url"
-#define NID_netscape_base_url		72
-#define OBJ_netscape_base_url		OBJ_netscape_cert_extension,2L
-
-#define SN_netscape_revocation_url		"nsRevocationUrl"
-#define LN_netscape_revocation_url		"Netscape Revocation Url"
-#define NID_netscape_revocation_url		73
-#define OBJ_netscape_revocation_url		OBJ_netscape_cert_extension,3L
-
-#define SN_netscape_ca_revocation_url		"nsCaRevocationUrl"
-#define LN_netscape_ca_revocation_url		"Netscape CA Revocation Url"
-#define NID_netscape_ca_revocation_url		74
-#define OBJ_netscape_ca_revocation_url		OBJ_netscape_cert_extension,4L
-
-#define SN_netscape_renewal_url		"nsRenewalUrl"
-#define LN_netscape_renewal_url		"Netscape Renewal Url"
-#define NID_netscape_renewal_url		75
-#define OBJ_netscape_renewal_url		OBJ_netscape_cert_extension,7L
-
-#define SN_netscape_ca_policy_url		"nsCaPolicyUrl"
-#define LN_netscape_ca_policy_url		"Netscape CA Policy Url"
-#define NID_netscape_ca_policy_url		76
-#define OBJ_netscape_ca_policy_url		OBJ_netscape_cert_extension,8L
-
-#define SN_netscape_ssl_server_name		"nsSslServerName"
-#define LN_netscape_ssl_server_name		"Netscape SSL Server Name"
-#define NID_netscape_ssl_server_name		77
-#define OBJ_netscape_ssl_server_name		OBJ_netscape_cert_extension,12L
-
-#define SN_netscape_comment		"nsComment"
-#define LN_netscape_comment		"Netscape Comment"
-#define NID_netscape_comment		78
-#define OBJ_netscape_comment		OBJ_netscape_cert_extension,13L
-
-#define SN_netscape_cert_sequence		"nsCertSequence"
-#define LN_netscape_cert_sequence		"Netscape Certificate Sequence"
-#define NID_netscape_cert_sequence		79
-#define OBJ_netscape_cert_sequence		OBJ_netscape_data_type,5L
-
-#define SN_ns_sgc		"nsSGC"
-#define LN_ns_sgc		"Netscape Server Gated Crypto"
-#define NID_ns_sgc		139
-#define OBJ_ns_sgc		OBJ_netscape,4L,1L
-
-#define SN_org		"ORG"
-#define LN_org		"org"
-#define NID_org		379
-#define OBJ_org		OBJ_iso,3L
-
-#define SN_dod		"DOD"
-#define LN_dod		"dod"
-#define NID_dod		380
-#define OBJ_dod		OBJ_org,6L
-
-#define SN_iana		"IANA"
-#define LN_iana		"iana"
-#define NID_iana		381
-#define OBJ_iana		OBJ_dod,1L
-
-#define OBJ_internet		OBJ_iana
-
-#define SN_Directory		"directory"
-#define LN_Directory		"Directory"
-#define NID_Directory		382
-#define OBJ_Directory		OBJ_internet,1L
-
-#define SN_Management		"mgmt"
-#define LN_Management		"Management"
-#define NID_Management		383
-#define OBJ_Management		OBJ_internet,2L
-
-#define SN_Experimental		"experimental"
-#define LN_Experimental		"Experimental"
-#define NID_Experimental		384
-#define OBJ_Experimental		OBJ_internet,3L
-
-#define SN_Private		"private"
-#define LN_Private		"Private"
-#define NID_Private		385
-#define OBJ_Private		OBJ_internet,4L
-
-#define SN_Security		"security"
-#define LN_Security		"Security"
-#define NID_Security		386
-#define OBJ_Security		OBJ_internet,5L
-
-#define SN_SNMPv2		"snmpv2"
-#define LN_SNMPv2		"SNMPv2"
-#define NID_SNMPv2		387
-#define OBJ_SNMPv2		OBJ_internet,6L
-
-#define LN_Mail		"Mail"
-#define NID_Mail		388
-#define OBJ_Mail		OBJ_internet,7L
-
-#define SN_Enterprises		"enterprises"
-#define LN_Enterprises		"Enterprises"
-#define NID_Enterprises		389
-#define OBJ_Enterprises		OBJ_Private,1L
-
-#define SN_dcObject		"dcobject"
-#define LN_dcObject		"dcObject"
-#define NID_dcObject		390
-#define OBJ_dcObject		OBJ_Enterprises,1466L,344L
-
-#define SN_mime_mhs		"mime-mhs"
-#define LN_mime_mhs		"MIME MHS"
-#define NID_mime_mhs		504
-#define OBJ_mime_mhs		OBJ_Mail,1L
-
-#define SN_mime_mhs_headings		"mime-mhs-headings"
-#define LN_mime_mhs_headings		"mime-mhs-headings"
-#define NID_mime_mhs_headings		505
-#define OBJ_mime_mhs_headings		OBJ_mime_mhs,1L
-
-#define SN_mime_mhs_bodies		"mime-mhs-bodies"
-#define LN_mime_mhs_bodies		"mime-mhs-bodies"
-#define NID_mime_mhs_bodies		506
-#define OBJ_mime_mhs_bodies		OBJ_mime_mhs,2L
-
-#define SN_id_hex_partial_message		"id-hex-partial-message"
-#define LN_id_hex_partial_message		"id-hex-partial-message"
-#define NID_id_hex_partial_message		507
-#define OBJ_id_hex_partial_message		OBJ_mime_mhs_headings,1L
-
-#define SN_id_hex_multipart_message		"id-hex-multipart-message"
-#define LN_id_hex_multipart_message		"id-hex-multipart-message"
-#define NID_id_hex_multipart_message		508
-#define OBJ_id_hex_multipart_message		OBJ_mime_mhs_headings,2L
-
-#define SN_rle_compression		"RLE"
-#define LN_rle_compression		"run length compression"
-#define NID_rle_compression		124
-#define OBJ_rle_compression		1L,1L,1L,1L,666L,1L
-
-#define SN_zlib_compression		"ZLIB"
-#define LN_zlib_compression		"zlib compression"
-#define NID_zlib_compression		125
-#define OBJ_zlib_compression		OBJ_id_smime_alg,8L
-
-#define OBJ_csor		2L,16L,840L,1L,101L,3L
-
-#define OBJ_nistAlgorithms		OBJ_csor,4L
-
-#define OBJ_aes		OBJ_nistAlgorithms,1L
-
-#define SN_aes_128_ecb		"AES-128-ECB"
-#define LN_aes_128_ecb		"aes-128-ecb"
-#define NID_aes_128_ecb		418
-#define OBJ_aes_128_ecb		OBJ_aes,1L
-
-#define SN_aes_128_cbc		"AES-128-CBC"
-#define LN_aes_128_cbc		"aes-128-cbc"
-#define NID_aes_128_cbc		419
-#define OBJ_aes_128_cbc		OBJ_aes,2L
-
-#define SN_aes_128_ofb128		"AES-128-OFB"
-#define LN_aes_128_ofb128		"aes-128-ofb"
-#define NID_aes_128_ofb128		420
-#define OBJ_aes_128_ofb128		OBJ_aes,3L
-
-#define SN_aes_128_cfb128		"AES-128-CFB"
-#define LN_aes_128_cfb128		"aes-128-cfb"
-#define NID_aes_128_cfb128		421
-#define OBJ_aes_128_cfb128		OBJ_aes,4L
-
-#define SN_aes_192_ecb		"AES-192-ECB"
-#define LN_aes_192_ecb		"aes-192-ecb"
-#define NID_aes_192_ecb		422
-#define OBJ_aes_192_ecb		OBJ_aes,21L
-
-#define SN_aes_192_cbc		"AES-192-CBC"
-#define LN_aes_192_cbc		"aes-192-cbc"
-#define NID_aes_192_cbc		423
-#define OBJ_aes_192_cbc		OBJ_aes,22L
-
-#define SN_aes_192_ofb128		"AES-192-OFB"
-#define LN_aes_192_ofb128		"aes-192-ofb"
-#define NID_aes_192_ofb128		424
-#define OBJ_aes_192_ofb128		OBJ_aes,23L
-
-#define SN_aes_192_cfb128		"AES-192-CFB"
-#define LN_aes_192_cfb128		"aes-192-cfb"
-#define NID_aes_192_cfb128		425
-#define OBJ_aes_192_cfb128		OBJ_aes,24L
-
-#define SN_aes_256_ecb		"AES-256-ECB"
-#define LN_aes_256_ecb		"aes-256-ecb"
-#define NID_aes_256_ecb		426
-#define OBJ_aes_256_ecb		OBJ_aes,41L
-
-#define SN_aes_256_cbc		"AES-256-CBC"
-#define LN_aes_256_cbc		"aes-256-cbc"
-#define NID_aes_256_cbc		427
-#define OBJ_aes_256_cbc		OBJ_aes,42L
-
-#define SN_aes_256_ofb128		"AES-256-OFB"
-#define LN_aes_256_ofb128		"aes-256-ofb"
-#define NID_aes_256_ofb128		428
-#define OBJ_aes_256_ofb128		OBJ_aes,43L
-
-#define SN_aes_256_cfb128		"AES-256-CFB"
-#define LN_aes_256_cfb128		"aes-256-cfb"
-#define NID_aes_256_cfb128		429
-#define OBJ_aes_256_cfb128		OBJ_aes,44L
-
-#define SN_aes_128_cfb1		"AES-128-CFB1"
-#define LN_aes_128_cfb1		"aes-128-cfb1"
-#define NID_aes_128_cfb1		650
-
-#define SN_aes_192_cfb1		"AES-192-CFB1"
-#define LN_aes_192_cfb1		"aes-192-cfb1"
-#define NID_aes_192_cfb1		651
-
-#define SN_aes_256_cfb1		"AES-256-CFB1"
-#define LN_aes_256_cfb1		"aes-256-cfb1"
-#define NID_aes_256_cfb1		652
-
-#define SN_aes_128_cfb8		"AES-128-CFB8"
-#define LN_aes_128_cfb8		"aes-128-cfb8"
-#define NID_aes_128_cfb8		653
-
-#define SN_aes_192_cfb8		"AES-192-CFB8"
-#define LN_aes_192_cfb8		"aes-192-cfb8"
-#define NID_aes_192_cfb8		654
-
-#define SN_aes_256_cfb8		"AES-256-CFB8"
-#define LN_aes_256_cfb8		"aes-256-cfb8"
-#define NID_aes_256_cfb8		655
-
-#define SN_des_cfb1		"DES-CFB1"
-#define LN_des_cfb1		"des-cfb1"
-#define NID_des_cfb1		656
-
-#define SN_des_cfb8		"DES-CFB8"
-#define LN_des_cfb8		"des-cfb8"
-#define NID_des_cfb8		657
-
-#define SN_des_ede3_cfb1		"DES-EDE3-CFB1"
-#define LN_des_ede3_cfb1		"des-ede3-cfb1"
-#define NID_des_ede3_cfb1		658
-
-#define SN_des_ede3_cfb8		"DES-EDE3-CFB8"
-#define LN_des_ede3_cfb8		"des-ede3-cfb8"
-#define NID_des_ede3_cfb8		659
-
-#define SN_id_aes128_wrap		"id-aes128-wrap"
-#define NID_id_aes128_wrap		788
-#define OBJ_id_aes128_wrap		OBJ_aes,5L
-
-#define SN_id_aes192_wrap		"id-aes192-wrap"
-#define NID_id_aes192_wrap		789
-#define OBJ_id_aes192_wrap		OBJ_aes,25L
-
-#define SN_id_aes256_wrap		"id-aes256-wrap"
-#define NID_id_aes256_wrap		790
-#define OBJ_id_aes256_wrap		OBJ_aes,45L
-
-#define OBJ_nist_hashalgs		OBJ_nistAlgorithms,2L
-
-#define SN_sha256		"SHA256"
-#define LN_sha256		"sha256"
-#define NID_sha256		672
-#define OBJ_sha256		OBJ_nist_hashalgs,1L
-
-#define SN_sha384		"SHA384"
-#define LN_sha384		"sha384"
-#define NID_sha384		673
-#define OBJ_sha384		OBJ_nist_hashalgs,2L
-
-#define SN_sha512		"SHA512"
-#define LN_sha512		"sha512"
-#define NID_sha512		674
-#define OBJ_sha512		OBJ_nist_hashalgs,3L
-
-#define SN_sha224		"SHA224"
-#define LN_sha224		"sha224"
-#define NID_sha224		675
-#define OBJ_sha224		OBJ_nist_hashalgs,4L
-
-#define OBJ_dsa_with_sha2		OBJ_nistAlgorithms,3L
-
-#define SN_dsa_with_SHA224		"dsa_with_SHA224"
-#define NID_dsa_with_SHA224		802
-#define OBJ_dsa_with_SHA224		OBJ_dsa_with_sha2,1L
-
-#define SN_dsa_with_SHA256		"dsa_with_SHA256"
-#define NID_dsa_with_SHA256		803
-#define OBJ_dsa_with_SHA256		OBJ_dsa_with_sha2,2L
-
-#define SN_hold_instruction_code		"holdInstructionCode"
-#define LN_hold_instruction_code		"Hold Instruction Code"
-#define NID_hold_instruction_code		430
-#define OBJ_hold_instruction_code		OBJ_id_ce,23L
-
-#define OBJ_holdInstruction		OBJ_X9_57,2L
-
-#define SN_hold_instruction_none		"holdInstructionNone"
-#define LN_hold_instruction_none		"Hold Instruction None"
-#define NID_hold_instruction_none		431
-#define OBJ_hold_instruction_none		OBJ_holdInstruction,1L
-
-#define SN_hold_instruction_call_issuer		"holdInstructionCallIssuer"
-#define LN_hold_instruction_call_issuer		"Hold Instruction Call Issuer"
-#define NID_hold_instruction_call_issuer		432
-#define OBJ_hold_instruction_call_issuer		OBJ_holdInstruction,2L
-
-#define SN_hold_instruction_reject		"holdInstructionReject"
-#define LN_hold_instruction_reject		"Hold Instruction Reject"
-#define NID_hold_instruction_reject		433
-#define OBJ_hold_instruction_reject		OBJ_holdInstruction,3L
-
-#define SN_data		"data"
-#define NID_data		434
-#define OBJ_data		OBJ_itu_t,9L
-
-#define SN_pss		"pss"
-#define NID_pss		435
-#define OBJ_pss		OBJ_data,2342L
-
-#define SN_ucl		"ucl"
-#define NID_ucl		436
-#define OBJ_ucl		OBJ_pss,19200300L
-
-#define SN_pilot		"pilot"
-#define NID_pilot		437
-#define OBJ_pilot		OBJ_ucl,100L
-
-#define LN_pilotAttributeType		"pilotAttributeType"
-#define NID_pilotAttributeType		438
-#define OBJ_pilotAttributeType		OBJ_pilot,1L
-
-#define LN_pilotAttributeSyntax		"pilotAttributeSyntax"
-#define NID_pilotAttributeSyntax		439
-#define OBJ_pilotAttributeSyntax		OBJ_pilot,3L
-
-#define LN_pilotObjectClass		"pilotObjectClass"
-#define NID_pilotObjectClass		440
-#define OBJ_pilotObjectClass		OBJ_pilot,4L
-
-#define LN_pilotGroups		"pilotGroups"
-#define NID_pilotGroups		441
-#define OBJ_pilotGroups		OBJ_pilot,10L
-
-#define LN_iA5StringSyntax		"iA5StringSyntax"
-#define NID_iA5StringSyntax		442
-#define OBJ_iA5StringSyntax		OBJ_pilotAttributeSyntax,4L
-
-#define LN_caseIgnoreIA5StringSyntax		"caseIgnoreIA5StringSyntax"
-#define NID_caseIgnoreIA5StringSyntax		443
-#define OBJ_caseIgnoreIA5StringSyntax		OBJ_pilotAttributeSyntax,5L
-
-#define LN_pilotObject		"pilotObject"
-#define NID_pilotObject		444
-#define OBJ_pilotObject		OBJ_pilotObjectClass,3L
-
-#define LN_pilotPerson		"pilotPerson"
-#define NID_pilotPerson		445
-#define OBJ_pilotPerson		OBJ_pilotObjectClass,4L
-
-#define SN_account		"account"
-#define NID_account		446
-#define OBJ_account		OBJ_pilotObjectClass,5L
-
-#define SN_document		"document"
-#define NID_document		447
-#define OBJ_document		OBJ_pilotObjectClass,6L
-
-#define SN_room		"room"
-#define NID_room		448
-#define OBJ_room		OBJ_pilotObjectClass,7L
-
-#define LN_documentSeries		"documentSeries"
-#define NID_documentSeries		449
-#define OBJ_documentSeries		OBJ_pilotObjectClass,9L
-
-#define SN_Domain		"domain"
-#define LN_Domain		"Domain"
-#define NID_Domain		392
-#define OBJ_Domain		OBJ_pilotObjectClass,13L
-
-#define LN_rFC822localPart		"rFC822localPart"
-#define NID_rFC822localPart		450
-#define OBJ_rFC822localPart		OBJ_pilotObjectClass,14L
-
-#define LN_dNSDomain		"dNSDomain"
-#define NID_dNSDomain		451
-#define OBJ_dNSDomain		OBJ_pilotObjectClass,15L
-
-#define LN_domainRelatedObject		"domainRelatedObject"
-#define NID_domainRelatedObject		452
-#define OBJ_domainRelatedObject		OBJ_pilotObjectClass,17L
-
-#define LN_friendlyCountry		"friendlyCountry"
-#define NID_friendlyCountry		453
-#define OBJ_friendlyCountry		OBJ_pilotObjectClass,18L
-
-#define LN_simpleSecurityObject		"simpleSecurityObject"
-#define NID_simpleSecurityObject		454
-#define OBJ_simpleSecurityObject		OBJ_pilotObjectClass,19L
-
-#define LN_pilotOrganization		"pilotOrganization"
-#define NID_pilotOrganization		455
-#define OBJ_pilotOrganization		OBJ_pilotObjectClass,20L
-
-#define LN_pilotDSA		"pilotDSA"
-#define NID_pilotDSA		456
-#define OBJ_pilotDSA		OBJ_pilotObjectClass,21L
-
-#define LN_qualityLabelledData		"qualityLabelledData"
-#define NID_qualityLabelledData		457
-#define OBJ_qualityLabelledData		OBJ_pilotObjectClass,22L
-
-#define SN_userId		"UID"
-#define LN_userId		"userId"
-#define NID_userId		458
-#define OBJ_userId		OBJ_pilotAttributeType,1L
-
-#define LN_textEncodedORAddress		"textEncodedORAddress"
-#define NID_textEncodedORAddress		459
-#define OBJ_textEncodedORAddress		OBJ_pilotAttributeType,2L
-
-#define SN_rfc822Mailbox		"mail"
-#define LN_rfc822Mailbox		"rfc822Mailbox"
-#define NID_rfc822Mailbox		460
-#define OBJ_rfc822Mailbox		OBJ_pilotAttributeType,3L
-
-#define SN_info		"info"
-#define NID_info		461
-#define OBJ_info		OBJ_pilotAttributeType,4L
-
-#define LN_favouriteDrink		"favouriteDrink"
-#define NID_favouriteDrink		462
-#define OBJ_favouriteDrink		OBJ_pilotAttributeType,5L
-
-#define LN_roomNumber		"roomNumber"
-#define NID_roomNumber		463
-#define OBJ_roomNumber		OBJ_pilotAttributeType,6L
-
-#define SN_photo		"photo"
-#define NID_photo		464
-#define OBJ_photo		OBJ_pilotAttributeType,7L
-
-#define LN_userClass		"userClass"
-#define NID_userClass		465
-#define OBJ_userClass		OBJ_pilotAttributeType,8L
-
-#define SN_host		"host"
-#define NID_host		466
-#define OBJ_host		OBJ_pilotAttributeType,9L
-
-#define SN_manager		"manager"
-#define NID_manager		467
-#define OBJ_manager		OBJ_pilotAttributeType,10L
-
-#define LN_documentIdentifier		"documentIdentifier"
-#define NID_documentIdentifier		468
-#define OBJ_documentIdentifier		OBJ_pilotAttributeType,11L
-
-#define LN_documentTitle		"documentTitle"
-#define NID_documentTitle		469
-#define OBJ_documentTitle		OBJ_pilotAttributeType,12L
-
-#define LN_documentVersion		"documentVersion"
-#define NID_documentVersion		470
-#define OBJ_documentVersion		OBJ_pilotAttributeType,13L
-
-#define LN_documentAuthor		"documentAuthor"
-#define NID_documentAuthor		471
-#define OBJ_documentAuthor		OBJ_pilotAttributeType,14L
-
-#define LN_documentLocation		"documentLocation"
-#define NID_documentLocation		472
-#define OBJ_documentLocation		OBJ_pilotAttributeType,15L
-
-#define LN_homeTelephoneNumber		"homeTelephoneNumber"
-#define NID_homeTelephoneNumber		473
-#define OBJ_homeTelephoneNumber		OBJ_pilotAttributeType,20L
-
-#define SN_secretary		"secretary"
-#define NID_secretary		474
-#define OBJ_secretary		OBJ_pilotAttributeType,21L
-
-#define LN_otherMailbox		"otherMailbox"
-#define NID_otherMailbox		475
-#define OBJ_otherMailbox		OBJ_pilotAttributeType,22L
-
-#define LN_lastModifiedTime		"lastModifiedTime"
-#define NID_lastModifiedTime		476
-#define OBJ_lastModifiedTime		OBJ_pilotAttributeType,23L
-
-#define LN_lastModifiedBy		"lastModifiedBy"
-#define NID_lastModifiedBy		477
-#define OBJ_lastModifiedBy		OBJ_pilotAttributeType,24L
-
-#define SN_domainComponent		"DC"
-#define LN_domainComponent		"domainComponent"
-#define NID_domainComponent		391
-#define OBJ_domainComponent		OBJ_pilotAttributeType,25L
-
-#define LN_aRecord		"aRecord"
-#define NID_aRecord		478
-#define OBJ_aRecord		OBJ_pilotAttributeType,26L
-
-#define LN_pilotAttributeType27		"pilotAttributeType27"
-#define NID_pilotAttributeType27		479
-#define OBJ_pilotAttributeType27		OBJ_pilotAttributeType,27L
-
-#define LN_mXRecord		"mXRecord"
-#define NID_mXRecord		480
-#define OBJ_mXRecord		OBJ_pilotAttributeType,28L
-
-#define LN_nSRecord		"nSRecord"
-#define NID_nSRecord		481
-#define OBJ_nSRecord		OBJ_pilotAttributeType,29L
-
-#define LN_sOARecord		"sOARecord"
-#define NID_sOARecord		482
-#define OBJ_sOARecord		OBJ_pilotAttributeType,30L
-
-#define LN_cNAMERecord		"cNAMERecord"
-#define NID_cNAMERecord		483
-#define OBJ_cNAMERecord		OBJ_pilotAttributeType,31L
-
-#define LN_associatedDomain		"associatedDomain"
-#define NID_associatedDomain		484
-#define OBJ_associatedDomain		OBJ_pilotAttributeType,37L
-
-#define LN_associatedName		"associatedName"
-#define NID_associatedName		485
-#define OBJ_associatedName		OBJ_pilotAttributeType,38L
-
-#define LN_homePostalAddress		"homePostalAddress"
-#define NID_homePostalAddress		486
-#define OBJ_homePostalAddress		OBJ_pilotAttributeType,39L
-
-#define LN_personalTitle		"personalTitle"
-#define NID_personalTitle		487
-#define OBJ_personalTitle		OBJ_pilotAttributeType,40L
-
-#define LN_mobileTelephoneNumber		"mobileTelephoneNumber"
-#define NID_mobileTelephoneNumber		488
-#define OBJ_mobileTelephoneNumber		OBJ_pilotAttributeType,41L
-
-#define LN_pagerTelephoneNumber		"pagerTelephoneNumber"
-#define NID_pagerTelephoneNumber		489
-#define OBJ_pagerTelephoneNumber		OBJ_pilotAttributeType,42L
-
-#define LN_friendlyCountryName		"friendlyCountryName"
-#define NID_friendlyCountryName		490
-#define OBJ_friendlyCountryName		OBJ_pilotAttributeType,43L
-
-#define LN_organizationalStatus		"organizationalStatus"
-#define NID_organizationalStatus		491
-#define OBJ_organizationalStatus		OBJ_pilotAttributeType,45L
-
-#define LN_janetMailbox		"janetMailbox"
-#define NID_janetMailbox		492
-#define OBJ_janetMailbox		OBJ_pilotAttributeType,46L
-
-#define LN_mailPreferenceOption		"mailPreferenceOption"
-#define NID_mailPreferenceOption		493
-#define OBJ_mailPreferenceOption		OBJ_pilotAttributeType,47L
-
-#define LN_buildingName		"buildingName"
-#define NID_buildingName		494
-#define OBJ_buildingName		OBJ_pilotAttributeType,48L
-
-#define LN_dSAQuality		"dSAQuality"
-#define NID_dSAQuality		495
-#define OBJ_dSAQuality		OBJ_pilotAttributeType,49L
-
-#define LN_singleLevelQuality		"singleLevelQuality"
-#define NID_singleLevelQuality		496
-#define OBJ_singleLevelQuality		OBJ_pilotAttributeType,50L
-
-#define LN_subtreeMinimumQuality		"subtreeMinimumQuality"
-#define NID_subtreeMinimumQuality		497
-#define OBJ_subtreeMinimumQuality		OBJ_pilotAttributeType,51L
-
-#define LN_subtreeMaximumQuality		"subtreeMaximumQuality"
-#define NID_subtreeMaximumQuality		498
-#define OBJ_subtreeMaximumQuality		OBJ_pilotAttributeType,52L
-
-#define LN_personalSignature		"personalSignature"
-#define NID_personalSignature		499
-#define OBJ_personalSignature		OBJ_pilotAttributeType,53L
-
-#define LN_dITRedirect		"dITRedirect"
-#define NID_dITRedirect		500
-#define OBJ_dITRedirect		OBJ_pilotAttributeType,54L
-
-#define SN_audio		"audio"
-#define NID_audio		501
-#define OBJ_audio		OBJ_pilotAttributeType,55L
-
-#define LN_documentPublisher		"documentPublisher"
-#define NID_documentPublisher		502
-#define OBJ_documentPublisher		OBJ_pilotAttributeType,56L
-
-#define SN_id_set		"id-set"
-#define LN_id_set		"Secure Electronic Transactions"
-#define NID_id_set		512
-#define OBJ_id_set		OBJ_international_organizations,42L
-
-#define SN_set_ctype		"set-ctype"
-#define LN_set_ctype		"content types"
-#define NID_set_ctype		513
-#define OBJ_set_ctype		OBJ_id_set,0L
-
-#define SN_set_msgExt		"set-msgExt"
-#define LN_set_msgExt		"message extensions"
-#define NID_set_msgExt		514
-#define OBJ_set_msgExt		OBJ_id_set,1L
-
-#define SN_set_attr		"set-attr"
-#define NID_set_attr		515
-#define OBJ_set_attr		OBJ_id_set,3L
-
-#define SN_set_policy		"set-policy"
-#define NID_set_policy		516
-#define OBJ_set_policy		OBJ_id_set,5L
-
-#define SN_set_certExt		"set-certExt"
-#define LN_set_certExt		"certificate extensions"
-#define NID_set_certExt		517
-#define OBJ_set_certExt		OBJ_id_set,7L
-
-#define SN_set_brand		"set-brand"
-#define NID_set_brand		518
-#define OBJ_set_brand		OBJ_id_set,8L
-
-#define SN_setct_PANData		"setct-PANData"
-#define NID_setct_PANData		519
-#define OBJ_setct_PANData		OBJ_set_ctype,0L
-
-#define SN_setct_PANToken		"setct-PANToken"
-#define NID_setct_PANToken		520
-#define OBJ_setct_PANToken		OBJ_set_ctype,1L
-
-#define SN_setct_PANOnly		"setct-PANOnly"
-#define NID_setct_PANOnly		521
-#define OBJ_setct_PANOnly		OBJ_set_ctype,2L
-
-#define SN_setct_OIData		"setct-OIData"
-#define NID_setct_OIData		522
-#define OBJ_setct_OIData		OBJ_set_ctype,3L
-
-#define SN_setct_PI		"setct-PI"
-#define NID_setct_PI		523
-#define OBJ_setct_PI		OBJ_set_ctype,4L
-
-#define SN_setct_PIData		"setct-PIData"
-#define NID_setct_PIData		524
-#define OBJ_setct_PIData		OBJ_set_ctype,5L
-
-#define SN_setct_PIDataUnsigned		"setct-PIDataUnsigned"
-#define NID_setct_PIDataUnsigned		525
-#define OBJ_setct_PIDataUnsigned		OBJ_set_ctype,6L
-
-#define SN_setct_HODInput		"setct-HODInput"
-#define NID_setct_HODInput		526
-#define OBJ_setct_HODInput		OBJ_set_ctype,7L
-
-#define SN_setct_AuthResBaggage		"setct-AuthResBaggage"
-#define NID_setct_AuthResBaggage		527
-#define OBJ_setct_AuthResBaggage		OBJ_set_ctype,8L
-
-#define SN_setct_AuthRevReqBaggage		"setct-AuthRevReqBaggage"
-#define NID_setct_AuthRevReqBaggage		528
-#define OBJ_setct_AuthRevReqBaggage		OBJ_set_ctype,9L
-
-#define SN_setct_AuthRevResBaggage		"setct-AuthRevResBaggage"
-#define NID_setct_AuthRevResBaggage		529
-#define OBJ_setct_AuthRevResBaggage		OBJ_set_ctype,10L
-
-#define SN_setct_CapTokenSeq		"setct-CapTokenSeq"
-#define NID_setct_CapTokenSeq		530
-#define OBJ_setct_CapTokenSeq		OBJ_set_ctype,11L
-
-#define SN_setct_PInitResData		"setct-PInitResData"
-#define NID_setct_PInitResData		531
-#define OBJ_setct_PInitResData		OBJ_set_ctype,12L
-
-#define SN_setct_PI_TBS		"setct-PI-TBS"
-#define NID_setct_PI_TBS		532
-#define OBJ_setct_PI_TBS		OBJ_set_ctype,13L
-
-#define SN_setct_PResData		"setct-PResData"
-#define NID_setct_PResData		533
-#define OBJ_setct_PResData		OBJ_set_ctype,14L
-
-#define SN_setct_AuthReqTBS		"setct-AuthReqTBS"
-#define NID_setct_AuthReqTBS		534
-#define OBJ_setct_AuthReqTBS		OBJ_set_ctype,16L
-
-#define SN_setct_AuthResTBS		"setct-AuthResTBS"
-#define NID_setct_AuthResTBS		535
-#define OBJ_setct_AuthResTBS		OBJ_set_ctype,17L
-
-#define SN_setct_AuthResTBSX		"setct-AuthResTBSX"
-#define NID_setct_AuthResTBSX		536
-#define OBJ_setct_AuthResTBSX		OBJ_set_ctype,18L
-
-#define SN_setct_AuthTokenTBS		"setct-AuthTokenTBS"
-#define NID_setct_AuthTokenTBS		537
-#define OBJ_setct_AuthTokenTBS		OBJ_set_ctype,19L
-
-#define SN_setct_CapTokenData		"setct-CapTokenData"
-#define NID_setct_CapTokenData		538
-#define OBJ_setct_CapTokenData		OBJ_set_ctype,20L
-
-#define SN_setct_CapTokenTBS		"setct-CapTokenTBS"
-#define NID_setct_CapTokenTBS		539
-#define OBJ_setct_CapTokenTBS		OBJ_set_ctype,21L
-
-#define SN_setct_AcqCardCodeMsg		"setct-AcqCardCodeMsg"
-#define NID_setct_AcqCardCodeMsg		540
-#define OBJ_setct_AcqCardCodeMsg		OBJ_set_ctype,22L
-
-#define SN_setct_AuthRevReqTBS		"setct-AuthRevReqTBS"
-#define NID_setct_AuthRevReqTBS		541
-#define OBJ_setct_AuthRevReqTBS		OBJ_set_ctype,23L
-
-#define SN_setct_AuthRevResData		"setct-AuthRevResData"
-#define NID_setct_AuthRevResData		542
-#define OBJ_setct_AuthRevResData		OBJ_set_ctype,24L
-
-#define SN_setct_AuthRevResTBS		"setct-AuthRevResTBS"
-#define NID_setct_AuthRevResTBS		543
-#define OBJ_setct_AuthRevResTBS		OBJ_set_ctype,25L
-
-#define SN_setct_CapReqTBS		"setct-CapReqTBS"
-#define NID_setct_CapReqTBS		544
-#define OBJ_setct_CapReqTBS		OBJ_set_ctype,26L
-
-#define SN_setct_CapReqTBSX		"setct-CapReqTBSX"
-#define NID_setct_CapReqTBSX		545
-#define OBJ_setct_CapReqTBSX		OBJ_set_ctype,27L
-
-#define SN_setct_CapResData		"setct-CapResData"
-#define NID_setct_CapResData		546
-#define OBJ_setct_CapResData		OBJ_set_ctype,28L
-
-#define SN_setct_CapRevReqTBS		"setct-CapRevReqTBS"
-#define NID_setct_CapRevReqTBS		547
-#define OBJ_setct_CapRevReqTBS		OBJ_set_ctype,29L
-
-#define SN_setct_CapRevReqTBSX		"setct-CapRevReqTBSX"
-#define NID_setct_CapRevReqTBSX		548
-#define OBJ_setct_CapRevReqTBSX		OBJ_set_ctype,30L
-
-#define SN_setct_CapRevResData		"setct-CapRevResData"
-#define NID_setct_CapRevResData		549
-#define OBJ_setct_CapRevResData		OBJ_set_ctype,31L
-
-#define SN_setct_CredReqTBS		"setct-CredReqTBS"
-#define NID_setct_CredReqTBS		550
-#define OBJ_setct_CredReqTBS		OBJ_set_ctype,32L
-
-#define SN_setct_CredReqTBSX		"setct-CredReqTBSX"
-#define NID_setct_CredReqTBSX		551
-#define OBJ_setct_CredReqTBSX		OBJ_set_ctype,33L
-
-#define SN_setct_CredResData		"setct-CredResData"
-#define NID_setct_CredResData		552
-#define OBJ_setct_CredResData		OBJ_set_ctype,34L
-
-#define SN_setct_CredRevReqTBS		"setct-CredRevReqTBS"
-#define NID_setct_CredRevReqTBS		553
-#define OBJ_setct_CredRevReqTBS		OBJ_set_ctype,35L
-
-#define SN_setct_CredRevReqTBSX		"setct-CredRevReqTBSX"
-#define NID_setct_CredRevReqTBSX		554
-#define OBJ_setct_CredRevReqTBSX		OBJ_set_ctype,36L
-
-#define SN_setct_CredRevResData		"setct-CredRevResData"
-#define NID_setct_CredRevResData		555
-#define OBJ_setct_CredRevResData		OBJ_set_ctype,37L
-
-#define SN_setct_PCertReqData		"setct-PCertReqData"
-#define NID_setct_PCertReqData		556
-#define OBJ_setct_PCertReqData		OBJ_set_ctype,38L
-
-#define SN_setct_PCertResTBS		"setct-PCertResTBS"
-#define NID_setct_PCertResTBS		557
-#define OBJ_setct_PCertResTBS		OBJ_set_ctype,39L
-
-#define SN_setct_BatchAdminReqData		"setct-BatchAdminReqData"
-#define NID_setct_BatchAdminReqData		558
-#define OBJ_setct_BatchAdminReqData		OBJ_set_ctype,40L
-
-#define SN_setct_BatchAdminResData		"setct-BatchAdminResData"
-#define NID_setct_BatchAdminResData		559
-#define OBJ_setct_BatchAdminResData		OBJ_set_ctype,41L
-
-#define SN_setct_CardCInitResTBS		"setct-CardCInitResTBS"
-#define NID_setct_CardCInitResTBS		560
-#define OBJ_setct_CardCInitResTBS		OBJ_set_ctype,42L
-
-#define SN_setct_MeAqCInitResTBS		"setct-MeAqCInitResTBS"
-#define NID_setct_MeAqCInitResTBS		561
-#define OBJ_setct_MeAqCInitResTBS		OBJ_set_ctype,43L
-
-#define SN_setct_RegFormResTBS		"setct-RegFormResTBS"
-#define NID_setct_RegFormResTBS		562
-#define OBJ_setct_RegFormResTBS		OBJ_set_ctype,44L
-
-#define SN_setct_CertReqData		"setct-CertReqData"
-#define NID_setct_CertReqData		563
-#define OBJ_setct_CertReqData		OBJ_set_ctype,45L
-
-#define SN_setct_CertReqTBS		"setct-CertReqTBS"
-#define NID_setct_CertReqTBS		564
-#define OBJ_setct_CertReqTBS		OBJ_set_ctype,46L
-
-#define SN_setct_CertResData		"setct-CertResData"
-#define NID_setct_CertResData		565
-#define OBJ_setct_CertResData		OBJ_set_ctype,47L
-
-#define SN_setct_CertInqReqTBS		"setct-CertInqReqTBS"
-#define NID_setct_CertInqReqTBS		566
-#define OBJ_setct_CertInqReqTBS		OBJ_set_ctype,48L
-
-#define SN_setct_ErrorTBS		"setct-ErrorTBS"
-#define NID_setct_ErrorTBS		567
-#define OBJ_setct_ErrorTBS		OBJ_set_ctype,49L
-
-#define SN_setct_PIDualSignedTBE		"setct-PIDualSignedTBE"
-#define NID_setct_PIDualSignedTBE		568
-#define OBJ_setct_PIDualSignedTBE		OBJ_set_ctype,50L
-
-#define SN_setct_PIUnsignedTBE		"setct-PIUnsignedTBE"
-#define NID_setct_PIUnsignedTBE		569
-#define OBJ_setct_PIUnsignedTBE		OBJ_set_ctype,51L
-
-#define SN_setct_AuthReqTBE		"setct-AuthReqTBE"
-#define NID_setct_AuthReqTBE		570
-#define OBJ_setct_AuthReqTBE		OBJ_set_ctype,52L
-
-#define SN_setct_AuthResTBE		"setct-AuthResTBE"
-#define NID_setct_AuthResTBE		571
-#define OBJ_setct_AuthResTBE		OBJ_set_ctype,53L
-
-#define SN_setct_AuthResTBEX		"setct-AuthResTBEX"
-#define NID_setct_AuthResTBEX		572
-#define OBJ_setct_AuthResTBEX		OBJ_set_ctype,54L
-
-#define SN_setct_AuthTokenTBE		"setct-AuthTokenTBE"
-#define NID_setct_AuthTokenTBE		573
-#define OBJ_setct_AuthTokenTBE		OBJ_set_ctype,55L
-
-#define SN_setct_CapTokenTBE		"setct-CapTokenTBE"
-#define NID_setct_CapTokenTBE		574
-#define OBJ_setct_CapTokenTBE		OBJ_set_ctype,56L
-
-#define SN_setct_CapTokenTBEX		"setct-CapTokenTBEX"
-#define NID_setct_CapTokenTBEX		575
-#define OBJ_setct_CapTokenTBEX		OBJ_set_ctype,57L
-
-#define SN_setct_AcqCardCodeMsgTBE		"setct-AcqCardCodeMsgTBE"
-#define NID_setct_AcqCardCodeMsgTBE		576
-#define OBJ_setct_AcqCardCodeMsgTBE		OBJ_set_ctype,58L
-
-#define SN_setct_AuthRevReqTBE		"setct-AuthRevReqTBE"
-#define NID_setct_AuthRevReqTBE		577
-#define OBJ_setct_AuthRevReqTBE		OBJ_set_ctype,59L
-
-#define SN_setct_AuthRevResTBE		"setct-AuthRevResTBE"
-#define NID_setct_AuthRevResTBE		578
-#define OBJ_setct_AuthRevResTBE		OBJ_set_ctype,60L
-
-#define SN_setct_AuthRevResTBEB		"setct-AuthRevResTBEB"
-#define NID_setct_AuthRevResTBEB		579
-#define OBJ_setct_AuthRevResTBEB		OBJ_set_ctype,61L
-
-#define SN_setct_CapReqTBE		"setct-CapReqTBE"
-#define NID_setct_CapReqTBE		580
-#define OBJ_setct_CapReqTBE		OBJ_set_ctype,62L
-
-#define SN_setct_CapReqTBEX		"setct-CapReqTBEX"
-#define NID_setct_CapReqTBEX		581
-#define OBJ_setct_CapReqTBEX		OBJ_set_ctype,63L
-
-#define SN_setct_CapResTBE		"setct-CapResTBE"
-#define NID_setct_CapResTBE		582
-#define OBJ_setct_CapResTBE		OBJ_set_ctype,64L
-
-#define SN_setct_CapRevReqTBE		"setct-CapRevReqTBE"
-#define NID_setct_CapRevReqTBE		583
-#define OBJ_setct_CapRevReqTBE		OBJ_set_ctype,65L
-
-#define SN_setct_CapRevReqTBEX		"setct-CapRevReqTBEX"
-#define NID_setct_CapRevReqTBEX		584
-#define OBJ_setct_CapRevReqTBEX		OBJ_set_ctype,66L
-
-#define SN_setct_CapRevResTBE		"setct-CapRevResTBE"
-#define NID_setct_CapRevResTBE		585
-#define OBJ_setct_CapRevResTBE		OBJ_set_ctype,67L
-
-#define SN_setct_CredReqTBE		"setct-CredReqTBE"
-#define NID_setct_CredReqTBE		586
-#define OBJ_setct_CredReqTBE		OBJ_set_ctype,68L
-
-#define SN_setct_CredReqTBEX		"setct-CredReqTBEX"
-#define NID_setct_CredReqTBEX		587
-#define OBJ_setct_CredReqTBEX		OBJ_set_ctype,69L
-
-#define SN_setct_CredResTBE		"setct-CredResTBE"
-#define NID_setct_CredResTBE		588
-#define OBJ_setct_CredResTBE		OBJ_set_ctype,70L
-
-#define SN_setct_CredRevReqTBE		"setct-CredRevReqTBE"
-#define NID_setct_CredRevReqTBE		589
-#define OBJ_setct_CredRevReqTBE		OBJ_set_ctype,71L
-
-#define SN_setct_CredRevReqTBEX		"setct-CredRevReqTBEX"
-#define NID_setct_CredRevReqTBEX		590
-#define OBJ_setct_CredRevReqTBEX		OBJ_set_ctype,72L
-
-#define SN_setct_CredRevResTBE		"setct-CredRevResTBE"
-#define NID_setct_CredRevResTBE		591
-#define OBJ_setct_CredRevResTBE		OBJ_set_ctype,73L
-
-#define SN_setct_BatchAdminReqTBE		"setct-BatchAdminReqTBE"
-#define NID_setct_BatchAdminReqTBE		592
-#define OBJ_setct_BatchAdminReqTBE		OBJ_set_ctype,74L
-
-#define SN_setct_BatchAdminResTBE		"setct-BatchAdminResTBE"
-#define NID_setct_BatchAdminResTBE		593
-#define OBJ_setct_BatchAdminResTBE		OBJ_set_ctype,75L
-
-#define SN_setct_RegFormReqTBE		"setct-RegFormReqTBE"
-#define NID_setct_RegFormReqTBE		594
-#define OBJ_setct_RegFormReqTBE		OBJ_set_ctype,76L
-
-#define SN_setct_CertReqTBE		"setct-CertReqTBE"
-#define NID_setct_CertReqTBE		595
-#define OBJ_setct_CertReqTBE		OBJ_set_ctype,77L
-
-#define SN_setct_CertReqTBEX		"setct-CertReqTBEX"
-#define NID_setct_CertReqTBEX		596
-#define OBJ_setct_CertReqTBEX		OBJ_set_ctype,78L
-
-#define SN_setct_CertResTBE		"setct-CertResTBE"
-#define NID_setct_CertResTBE		597
-#define OBJ_setct_CertResTBE		OBJ_set_ctype,79L
-
-#define SN_setct_CRLNotificationTBS		"setct-CRLNotificationTBS"
-#define NID_setct_CRLNotificationTBS		598
-#define OBJ_setct_CRLNotificationTBS		OBJ_set_ctype,80L
-
-#define SN_setct_CRLNotificationResTBS		"setct-CRLNotificationResTBS"
-#define NID_setct_CRLNotificationResTBS		599
-#define OBJ_setct_CRLNotificationResTBS		OBJ_set_ctype,81L
-
-#define SN_setct_BCIDistributionTBS		"setct-BCIDistributionTBS"
-#define NID_setct_BCIDistributionTBS		600
-#define OBJ_setct_BCIDistributionTBS		OBJ_set_ctype,82L
-
-#define SN_setext_genCrypt		"setext-genCrypt"
-#define LN_setext_genCrypt		"generic cryptogram"
-#define NID_setext_genCrypt		601
-#define OBJ_setext_genCrypt		OBJ_set_msgExt,1L
-
-#define SN_setext_miAuth		"setext-miAuth"
-#define LN_setext_miAuth		"merchant initiated auth"
-#define NID_setext_miAuth		602
-#define OBJ_setext_miAuth		OBJ_set_msgExt,3L
-
-#define SN_setext_pinSecure		"setext-pinSecure"
-#define NID_setext_pinSecure		603
-#define OBJ_setext_pinSecure		OBJ_set_msgExt,4L
-
-#define SN_setext_pinAny		"setext-pinAny"
-#define NID_setext_pinAny		604
-#define OBJ_setext_pinAny		OBJ_set_msgExt,5L
-
-#define SN_setext_track2		"setext-track2"
-#define NID_setext_track2		605
-#define OBJ_setext_track2		OBJ_set_msgExt,7L
-
-#define SN_setext_cv		"setext-cv"
-#define LN_setext_cv		"additional verification"
-#define NID_setext_cv		606
-#define OBJ_setext_cv		OBJ_set_msgExt,8L
-
-#define SN_set_policy_root		"set-policy-root"
-#define NID_set_policy_root		607
-#define OBJ_set_policy_root		OBJ_set_policy,0L
-
-#define SN_setCext_hashedRoot		"setCext-hashedRoot"
-#define NID_setCext_hashedRoot		608
-#define OBJ_setCext_hashedRoot		OBJ_set_certExt,0L
-
-#define SN_setCext_certType		"setCext-certType"
-#define NID_setCext_certType		609
-#define OBJ_setCext_certType		OBJ_set_certExt,1L
-
-#define SN_setCext_merchData		"setCext-merchData"
-#define NID_setCext_merchData		610
-#define OBJ_setCext_merchData		OBJ_set_certExt,2L
-
-#define SN_setCext_cCertRequired		"setCext-cCertRequired"
-#define NID_setCext_cCertRequired		611
-#define OBJ_setCext_cCertRequired		OBJ_set_certExt,3L
-
-#define SN_setCext_tunneling		"setCext-tunneling"
-#define NID_setCext_tunneling		612
-#define OBJ_setCext_tunneling		OBJ_set_certExt,4L
-
-#define SN_setCext_setExt		"setCext-setExt"
-#define NID_setCext_setExt		613
-#define OBJ_setCext_setExt		OBJ_set_certExt,5L
-
-#define SN_setCext_setQualf		"setCext-setQualf"
-#define NID_setCext_setQualf		614
-#define OBJ_setCext_setQualf		OBJ_set_certExt,6L
-
-#define SN_setCext_PGWYcapabilities		"setCext-PGWYcapabilities"
-#define NID_setCext_PGWYcapabilities		615
-#define OBJ_setCext_PGWYcapabilities		OBJ_set_certExt,7L
-
-#define SN_setCext_TokenIdentifier		"setCext-TokenIdentifier"
-#define NID_setCext_TokenIdentifier		616
-#define OBJ_setCext_TokenIdentifier		OBJ_set_certExt,8L
-
-#define SN_setCext_Track2Data		"setCext-Track2Data"
-#define NID_setCext_Track2Data		617
-#define OBJ_setCext_Track2Data		OBJ_set_certExt,9L
-
-#define SN_setCext_TokenType		"setCext-TokenType"
-#define NID_setCext_TokenType		618
-#define OBJ_setCext_TokenType		OBJ_set_certExt,10L
-
-#define SN_setCext_IssuerCapabilities		"setCext-IssuerCapabilities"
-#define NID_setCext_IssuerCapabilities		619
-#define OBJ_setCext_IssuerCapabilities		OBJ_set_certExt,11L
-
-#define SN_setAttr_Cert		"setAttr-Cert"
-#define NID_setAttr_Cert		620
-#define OBJ_setAttr_Cert		OBJ_set_attr,0L
-
-#define SN_setAttr_PGWYcap		"setAttr-PGWYcap"
-#define LN_setAttr_PGWYcap		"payment gateway capabilities"
-#define NID_setAttr_PGWYcap		621
-#define OBJ_setAttr_PGWYcap		OBJ_set_attr,1L
-
-#define SN_setAttr_TokenType		"setAttr-TokenType"
-#define NID_setAttr_TokenType		622
-#define OBJ_setAttr_TokenType		OBJ_set_attr,2L
-
-#define SN_setAttr_IssCap		"setAttr-IssCap"
-#define LN_setAttr_IssCap		"issuer capabilities"
-#define NID_setAttr_IssCap		623
-#define OBJ_setAttr_IssCap		OBJ_set_attr,3L
-
-#define SN_set_rootKeyThumb		"set-rootKeyThumb"
-#define NID_set_rootKeyThumb		624
-#define OBJ_set_rootKeyThumb		OBJ_setAttr_Cert,0L
-
-#define SN_set_addPolicy		"set-addPolicy"
-#define NID_set_addPolicy		625
-#define OBJ_set_addPolicy		OBJ_setAttr_Cert,1L
-
-#define SN_setAttr_Token_EMV		"setAttr-Token-EMV"
-#define NID_setAttr_Token_EMV		626
-#define OBJ_setAttr_Token_EMV		OBJ_setAttr_TokenType,1L
-
-#define SN_setAttr_Token_B0Prime		"setAttr-Token-B0Prime"
-#define NID_setAttr_Token_B0Prime		627
-#define OBJ_setAttr_Token_B0Prime		OBJ_setAttr_TokenType,2L
-
-#define SN_setAttr_IssCap_CVM		"setAttr-IssCap-CVM"
-#define NID_setAttr_IssCap_CVM		628
-#define OBJ_setAttr_IssCap_CVM		OBJ_setAttr_IssCap,3L
-
-#define SN_setAttr_IssCap_T2		"setAttr-IssCap-T2"
-#define NID_setAttr_IssCap_T2		629
-#define OBJ_setAttr_IssCap_T2		OBJ_setAttr_IssCap,4L
-
-#define SN_setAttr_IssCap_Sig		"setAttr-IssCap-Sig"
-#define NID_setAttr_IssCap_Sig		630
-#define OBJ_setAttr_IssCap_Sig		OBJ_setAttr_IssCap,5L
-
-#define SN_setAttr_GenCryptgrm		"setAttr-GenCryptgrm"
-#define LN_setAttr_GenCryptgrm		"generate cryptogram"
-#define NID_setAttr_GenCryptgrm		631
-#define OBJ_setAttr_GenCryptgrm		OBJ_setAttr_IssCap_CVM,1L
-
-#define SN_setAttr_T2Enc		"setAttr-T2Enc"
-#define LN_setAttr_T2Enc		"encrypted track 2"
-#define NID_setAttr_T2Enc		632
-#define OBJ_setAttr_T2Enc		OBJ_setAttr_IssCap_T2,1L
-
-#define SN_setAttr_T2cleartxt		"setAttr-T2cleartxt"
-#define LN_setAttr_T2cleartxt		"cleartext track 2"
-#define NID_setAttr_T2cleartxt		633
-#define OBJ_setAttr_T2cleartxt		OBJ_setAttr_IssCap_T2,2L
-
-#define SN_setAttr_TokICCsig		"setAttr-TokICCsig"
-#define LN_setAttr_TokICCsig		"ICC or token signature"
-#define NID_setAttr_TokICCsig		634
-#define OBJ_setAttr_TokICCsig		OBJ_setAttr_IssCap_Sig,1L
-
-#define SN_setAttr_SecDevSig		"setAttr-SecDevSig"
-#define LN_setAttr_SecDevSig		"secure device signature"
-#define NID_setAttr_SecDevSig		635
-#define OBJ_setAttr_SecDevSig		OBJ_setAttr_IssCap_Sig,2L
-
-#define SN_set_brand_IATA_ATA		"set-brand-IATA-ATA"
-#define NID_set_brand_IATA_ATA		636
-#define OBJ_set_brand_IATA_ATA		OBJ_set_brand,1L
-
-#define SN_set_brand_Diners		"set-brand-Diners"
-#define NID_set_brand_Diners		637
-#define OBJ_set_brand_Diners		OBJ_set_brand,30L
-
-#define SN_set_brand_AmericanExpress		"set-brand-AmericanExpress"
-#define NID_set_brand_AmericanExpress		638
-#define OBJ_set_brand_AmericanExpress		OBJ_set_brand,34L
-
-#define SN_set_brand_JCB		"set-brand-JCB"
-#define NID_set_brand_JCB		639
-#define OBJ_set_brand_JCB		OBJ_set_brand,35L
-
-#define SN_set_brand_Visa		"set-brand-Visa"
-#define NID_set_brand_Visa		640
-#define OBJ_set_brand_Visa		OBJ_set_brand,4L
-
-#define SN_set_brand_MasterCard		"set-brand-MasterCard"
-#define NID_set_brand_MasterCard		641
-#define OBJ_set_brand_MasterCard		OBJ_set_brand,5L
-
-#define SN_set_brand_Novus		"set-brand-Novus"
-#define NID_set_brand_Novus		642
-#define OBJ_set_brand_Novus		OBJ_set_brand,6011L
-
-#define SN_des_cdmf		"DES-CDMF"
-#define LN_des_cdmf		"des-cdmf"
-#define NID_des_cdmf		643
-#define OBJ_des_cdmf		OBJ_rsadsi,3L,10L
-
-#define SN_rsaOAEPEncryptionSET		"rsaOAEPEncryptionSET"
-#define NID_rsaOAEPEncryptionSET		644
-#define OBJ_rsaOAEPEncryptionSET		OBJ_rsadsi,1L,1L,6L
-
-#define SN_ipsec3		"Oakley-EC2N-3"
-#define LN_ipsec3		"ipsec3"
-#define NID_ipsec3		749
-
-#define SN_ipsec4		"Oakley-EC2N-4"
-#define LN_ipsec4		"ipsec4"
-#define NID_ipsec4		750
-
-#define SN_whirlpool		"whirlpool"
-#define NID_whirlpool		804
-#define OBJ_whirlpool		OBJ_iso,0L,10118L,3L,0L,55L
-
-#define SN_cryptopro		"cryptopro"
-#define NID_cryptopro		805
-#define OBJ_cryptopro		OBJ_member_body,643L,2L,2L
-
-#define SN_cryptocom		"cryptocom"
-#define NID_cryptocom		806
-#define OBJ_cryptocom		OBJ_member_body,643L,2L,9L
-
-#define SN_id_GostR3411_94_with_GostR3410_2001		"id-GostR3411-94-with-GostR3410-2001"
-#define LN_id_GostR3411_94_with_GostR3410_2001		"GOST R 34.11-94 with GOST R 34.10-2001"
-#define NID_id_GostR3411_94_with_GostR3410_2001		807
-#define OBJ_id_GostR3411_94_with_GostR3410_2001		OBJ_cryptopro,3L
-
-#define SN_id_GostR3411_94_with_GostR3410_94		"id-GostR3411-94-with-GostR3410-94"
-#define LN_id_GostR3411_94_with_GostR3410_94		"GOST R 34.11-94 with GOST R 34.10-94"
-#define NID_id_GostR3411_94_with_GostR3410_94		808
-#define OBJ_id_GostR3411_94_with_GostR3410_94		OBJ_cryptopro,4L
-
-#define SN_id_GostR3411_94		"md_gost94"
-#define LN_id_GostR3411_94		"GOST R 34.11-94"
-#define NID_id_GostR3411_94		809
-#define OBJ_id_GostR3411_94		OBJ_cryptopro,9L
-
-#define SN_id_HMACGostR3411_94		"id-HMACGostR3411-94"
-#define LN_id_HMACGostR3411_94		"HMAC GOST 34.11-94"
-#define NID_id_HMACGostR3411_94		810
-#define OBJ_id_HMACGostR3411_94		OBJ_cryptopro,10L
-
-#define SN_id_GostR3410_2001		"gost2001"
-#define LN_id_GostR3410_2001		"GOST R 34.10-2001"
-#define NID_id_GostR3410_2001		811
-#define OBJ_id_GostR3410_2001		OBJ_cryptopro,19L
-
-#define SN_id_GostR3410_94		"gost94"
-#define LN_id_GostR3410_94		"GOST R 34.10-94"
-#define NID_id_GostR3410_94		812
-#define OBJ_id_GostR3410_94		OBJ_cryptopro,20L
-
-#define SN_id_Gost28147_89		"gost89"
-#define LN_id_Gost28147_89		"GOST 28147-89"
-#define NID_id_Gost28147_89		813
-#define OBJ_id_Gost28147_89		OBJ_cryptopro,21L
-
-#define SN_gost89_cnt		"gost89-cnt"
-#define NID_gost89_cnt		814
-
-#define SN_id_Gost28147_89_MAC		"gost-mac"
-#define LN_id_Gost28147_89_MAC		"GOST 28147-89 MAC"
-#define NID_id_Gost28147_89_MAC		815
-#define OBJ_id_Gost28147_89_MAC		OBJ_cryptopro,22L
-
-#define SN_id_GostR3411_94_prf		"prf-gostr3411-94"
-#define LN_id_GostR3411_94_prf		"GOST R 34.11-94 PRF"
-#define NID_id_GostR3411_94_prf		816
-#define OBJ_id_GostR3411_94_prf		OBJ_cryptopro,23L
-
-#define SN_id_GostR3410_2001DH		"id-GostR3410-2001DH"
-#define LN_id_GostR3410_2001DH		"GOST R 34.10-2001 DH"
-#define NID_id_GostR3410_2001DH		817
-#define OBJ_id_GostR3410_2001DH		OBJ_cryptopro,98L
-
-#define SN_id_GostR3410_94DH		"id-GostR3410-94DH"
-#define LN_id_GostR3410_94DH		"GOST R 34.10-94 DH"
-#define NID_id_GostR3410_94DH		818
-#define OBJ_id_GostR3410_94DH		OBJ_cryptopro,99L
-
-#define SN_id_Gost28147_89_CryptoPro_KeyMeshing		"id-Gost28147-89-CryptoPro-KeyMeshing"
-#define NID_id_Gost28147_89_CryptoPro_KeyMeshing		819
-#define OBJ_id_Gost28147_89_CryptoPro_KeyMeshing		OBJ_cryptopro,14L,1L
-
-#define SN_id_Gost28147_89_None_KeyMeshing		"id-Gost28147-89-None-KeyMeshing"
-#define NID_id_Gost28147_89_None_KeyMeshing		820
-#define OBJ_id_Gost28147_89_None_KeyMeshing		OBJ_cryptopro,14L,0L
-
-#define SN_id_GostR3411_94_TestParamSet		"id-GostR3411-94-TestParamSet"
-#define NID_id_GostR3411_94_TestParamSet		821
-#define OBJ_id_GostR3411_94_TestParamSet		OBJ_cryptopro,30L,0L
-
-#define SN_id_GostR3411_94_CryptoProParamSet		"id-GostR3411-94-CryptoProParamSet"
-#define NID_id_GostR3411_94_CryptoProParamSet		822
-#define OBJ_id_GostR3411_94_CryptoProParamSet		OBJ_cryptopro,30L,1L
-
-#define SN_id_Gost28147_89_TestParamSet		"id-Gost28147-89-TestParamSet"
-#define NID_id_Gost28147_89_TestParamSet		823
-#define OBJ_id_Gost28147_89_TestParamSet		OBJ_cryptopro,31L,0L
-
-#define SN_id_Gost28147_89_CryptoPro_A_ParamSet		"id-Gost28147-89-CryptoPro-A-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_A_ParamSet		824
-#define OBJ_id_Gost28147_89_CryptoPro_A_ParamSet		OBJ_cryptopro,31L,1L
-
-#define SN_id_Gost28147_89_CryptoPro_B_ParamSet		"id-Gost28147-89-CryptoPro-B-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_B_ParamSet		825
-#define OBJ_id_Gost28147_89_CryptoPro_B_ParamSet		OBJ_cryptopro,31L,2L
-
-#define SN_id_Gost28147_89_CryptoPro_C_ParamSet		"id-Gost28147-89-CryptoPro-C-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_C_ParamSet		826
-#define OBJ_id_Gost28147_89_CryptoPro_C_ParamSet		OBJ_cryptopro,31L,3L
-
-#define SN_id_Gost28147_89_CryptoPro_D_ParamSet		"id-Gost28147-89-CryptoPro-D-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_D_ParamSet		827
-#define OBJ_id_Gost28147_89_CryptoPro_D_ParamSet		OBJ_cryptopro,31L,4L
-
-#define SN_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet		"id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet		828
-#define OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet		OBJ_cryptopro,31L,5L
-
-#define SN_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet		"id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet		829
-#define OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet		OBJ_cryptopro,31L,6L
-
-#define SN_id_Gost28147_89_CryptoPro_RIC_1_ParamSet		"id-Gost28147-89-CryptoPro-RIC-1-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet		830
-#define OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet		OBJ_cryptopro,31L,7L
-
-#define SN_id_GostR3410_94_TestParamSet		"id-GostR3410-94-TestParamSet"
-#define NID_id_GostR3410_94_TestParamSet		831
-#define OBJ_id_GostR3410_94_TestParamSet		OBJ_cryptopro,32L,0L
-
-#define SN_id_GostR3410_94_CryptoPro_A_ParamSet		"id-GostR3410-94-CryptoPro-A-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_A_ParamSet		832
-#define OBJ_id_GostR3410_94_CryptoPro_A_ParamSet		OBJ_cryptopro,32L,2L
-
-#define SN_id_GostR3410_94_CryptoPro_B_ParamSet		"id-GostR3410-94-CryptoPro-B-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_B_ParamSet		833
-#define OBJ_id_GostR3410_94_CryptoPro_B_ParamSet		OBJ_cryptopro,32L,3L
-
-#define SN_id_GostR3410_94_CryptoPro_C_ParamSet		"id-GostR3410-94-CryptoPro-C-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_C_ParamSet		834
-#define OBJ_id_GostR3410_94_CryptoPro_C_ParamSet		OBJ_cryptopro,32L,4L
-
-#define SN_id_GostR3410_94_CryptoPro_D_ParamSet		"id-GostR3410-94-CryptoPro-D-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_D_ParamSet		835
-#define OBJ_id_GostR3410_94_CryptoPro_D_ParamSet		OBJ_cryptopro,32L,5L
-
-#define SN_id_GostR3410_94_CryptoPro_XchA_ParamSet		"id-GostR3410-94-CryptoPro-XchA-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_XchA_ParamSet		836
-#define OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet		OBJ_cryptopro,33L,1L
-
-#define SN_id_GostR3410_94_CryptoPro_XchB_ParamSet		"id-GostR3410-94-CryptoPro-XchB-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_XchB_ParamSet		837
-#define OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet		OBJ_cryptopro,33L,2L
-
-#define SN_id_GostR3410_94_CryptoPro_XchC_ParamSet		"id-GostR3410-94-CryptoPro-XchC-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_XchC_ParamSet		838
-#define OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet		OBJ_cryptopro,33L,3L
-
-#define SN_id_GostR3410_2001_TestParamSet		"id-GostR3410-2001-TestParamSet"
-#define NID_id_GostR3410_2001_TestParamSet		839
-#define OBJ_id_GostR3410_2001_TestParamSet		OBJ_cryptopro,35L,0L
-
-#define SN_id_GostR3410_2001_CryptoPro_A_ParamSet		"id-GostR3410-2001-CryptoPro-A-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_A_ParamSet		840
-#define OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet		OBJ_cryptopro,35L,1L
-
-#define SN_id_GostR3410_2001_CryptoPro_B_ParamSet		"id-GostR3410-2001-CryptoPro-B-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_B_ParamSet		841
-#define OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet		OBJ_cryptopro,35L,2L
-
-#define SN_id_GostR3410_2001_CryptoPro_C_ParamSet		"id-GostR3410-2001-CryptoPro-C-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_C_ParamSet		842
-#define OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet		OBJ_cryptopro,35L,3L
-
-#define SN_id_GostR3410_2001_CryptoPro_XchA_ParamSet		"id-GostR3410-2001-CryptoPro-XchA-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet		843
-#define OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet		OBJ_cryptopro,36L,0L
-
-#define SN_id_GostR3410_2001_CryptoPro_XchB_ParamSet		"id-GostR3410-2001-CryptoPro-XchB-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet		844
-#define OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet		OBJ_cryptopro,36L,1L
-
-#define SN_id_GostR3410_94_a		"id-GostR3410-94-a"
-#define NID_id_GostR3410_94_a		845
-#define OBJ_id_GostR3410_94_a		OBJ_id_GostR3410_94,1L
-
-#define SN_id_GostR3410_94_aBis		"id-GostR3410-94-aBis"
-#define NID_id_GostR3410_94_aBis		846
-#define OBJ_id_GostR3410_94_aBis		OBJ_id_GostR3410_94,2L
-
-#define SN_id_GostR3410_94_b		"id-GostR3410-94-b"
-#define NID_id_GostR3410_94_b		847
-#define OBJ_id_GostR3410_94_b		OBJ_id_GostR3410_94,3L
-
-#define SN_id_GostR3410_94_bBis		"id-GostR3410-94-bBis"
-#define NID_id_GostR3410_94_bBis		848
-#define OBJ_id_GostR3410_94_bBis		OBJ_id_GostR3410_94,4L
-
-#define SN_id_Gost28147_89_cc		"id-Gost28147-89-cc"
-#define LN_id_Gost28147_89_cc		"GOST 28147-89 Cryptocom ParamSet"
-#define NID_id_Gost28147_89_cc		849
-#define OBJ_id_Gost28147_89_cc		OBJ_cryptocom,1L,6L,1L
-
-#define SN_id_GostR3410_94_cc		"gost94cc"
-#define LN_id_GostR3410_94_cc		"GOST 34.10-94 Cryptocom"
-#define NID_id_GostR3410_94_cc		850
-#define OBJ_id_GostR3410_94_cc		OBJ_cryptocom,1L,5L,3L
-
-#define SN_id_GostR3410_2001_cc		"gost2001cc"
-#define LN_id_GostR3410_2001_cc		"GOST 34.10-2001 Cryptocom"
-#define NID_id_GostR3410_2001_cc		851
-#define OBJ_id_GostR3410_2001_cc		OBJ_cryptocom,1L,5L,4L
-
-#define SN_id_GostR3411_94_with_GostR3410_94_cc		"id-GostR3411-94-with-GostR3410-94-cc"
-#define LN_id_GostR3411_94_with_GostR3410_94_cc		"GOST R 34.11-94 with GOST R 34.10-94 Cryptocom"
-#define NID_id_GostR3411_94_with_GostR3410_94_cc		852
-#define OBJ_id_GostR3411_94_with_GostR3410_94_cc		OBJ_cryptocom,1L,3L,3L
-
-#define SN_id_GostR3411_94_with_GostR3410_2001_cc		"id-GostR3411-94-with-GostR3410-2001-cc"
-#define LN_id_GostR3411_94_with_GostR3410_2001_cc		"GOST R 34.11-94 with GOST R 34.10-2001 Cryptocom"
-#define NID_id_GostR3411_94_with_GostR3410_2001_cc		853
-#define OBJ_id_GostR3411_94_with_GostR3410_2001_cc		OBJ_cryptocom,1L,3L,4L
-
-#define SN_id_GostR3410_2001_ParamSet_cc		"id-GostR3410-2001-ParamSet-cc"
-#define LN_id_GostR3410_2001_ParamSet_cc		"GOST R 3410-2001 Parameter Set Cryptocom"
-#define NID_id_GostR3410_2001_ParamSet_cc		854
-#define OBJ_id_GostR3410_2001_ParamSet_cc		OBJ_cryptocom,1L,8L,1L
-
-#define SN_camellia_128_cbc		"CAMELLIA-128-CBC"
-#define LN_camellia_128_cbc		"camellia-128-cbc"
-#define NID_camellia_128_cbc		751
-#define OBJ_camellia_128_cbc		1L,2L,392L,200011L,61L,1L,1L,1L,2L
-
-#define SN_camellia_192_cbc		"CAMELLIA-192-CBC"
-#define LN_camellia_192_cbc		"camellia-192-cbc"
-#define NID_camellia_192_cbc		752
-#define OBJ_camellia_192_cbc		1L,2L,392L,200011L,61L,1L,1L,1L,3L
-
-#define SN_camellia_256_cbc		"CAMELLIA-256-CBC"
-#define LN_camellia_256_cbc		"camellia-256-cbc"
-#define NID_camellia_256_cbc		753
-#define OBJ_camellia_256_cbc		1L,2L,392L,200011L,61L,1L,1L,1L,4L
-
-#define OBJ_ntt_ds		0L,3L,4401L,5L
-
-#define OBJ_camellia		OBJ_ntt_ds,3L,1L,9L
-
-#define SN_camellia_128_ecb		"CAMELLIA-128-ECB"
-#define LN_camellia_128_ecb		"camellia-128-ecb"
-#define NID_camellia_128_ecb		754
-#define OBJ_camellia_128_ecb		OBJ_camellia,1L
-
-#define SN_camellia_128_ofb128		"CAMELLIA-128-OFB"
-#define LN_camellia_128_ofb128		"camellia-128-ofb"
-#define NID_camellia_128_ofb128		766
-#define OBJ_camellia_128_ofb128		OBJ_camellia,3L
-
-#define SN_camellia_128_cfb128		"CAMELLIA-128-CFB"
-#define LN_camellia_128_cfb128		"camellia-128-cfb"
-#define NID_camellia_128_cfb128		757
-#define OBJ_camellia_128_cfb128		OBJ_camellia,4L
-
-#define SN_camellia_192_ecb		"CAMELLIA-192-ECB"
-#define LN_camellia_192_ecb		"camellia-192-ecb"
-#define NID_camellia_192_ecb		755
-#define OBJ_camellia_192_ecb		OBJ_camellia,21L
-
-#define SN_camellia_192_ofb128		"CAMELLIA-192-OFB"
-#define LN_camellia_192_ofb128		"camellia-192-ofb"
-#define NID_camellia_192_ofb128		767
-#define OBJ_camellia_192_ofb128		OBJ_camellia,23L
-
-#define SN_camellia_192_cfb128		"CAMELLIA-192-CFB"
-#define LN_camellia_192_cfb128		"camellia-192-cfb"
-#define NID_camellia_192_cfb128		758
-#define OBJ_camellia_192_cfb128		OBJ_camellia,24L
-
-#define SN_camellia_256_ecb		"CAMELLIA-256-ECB"
-#define LN_camellia_256_ecb		"camellia-256-ecb"
-#define NID_camellia_256_ecb		756
-#define OBJ_camellia_256_ecb		OBJ_camellia,41L
-
-#define SN_camellia_256_ofb128		"CAMELLIA-256-OFB"
-#define LN_camellia_256_ofb128		"camellia-256-ofb"
-#define NID_camellia_256_ofb128		768
-#define OBJ_camellia_256_ofb128		OBJ_camellia,43L
-
-#define SN_camellia_256_cfb128		"CAMELLIA-256-CFB"
-#define LN_camellia_256_cfb128		"camellia-256-cfb"
-#define NID_camellia_256_cfb128		759
-#define OBJ_camellia_256_cfb128		OBJ_camellia,44L
-
-#define SN_camellia_128_cfb1		"CAMELLIA-128-CFB1"
-#define LN_camellia_128_cfb1		"camellia-128-cfb1"
-#define NID_camellia_128_cfb1		760
-
-#define SN_camellia_192_cfb1		"CAMELLIA-192-CFB1"
-#define LN_camellia_192_cfb1		"camellia-192-cfb1"
-#define NID_camellia_192_cfb1		761
-
-#define SN_camellia_256_cfb1		"CAMELLIA-256-CFB1"
-#define LN_camellia_256_cfb1		"camellia-256-cfb1"
-#define NID_camellia_256_cfb1		762
-
-#define SN_camellia_128_cfb8		"CAMELLIA-128-CFB8"
-#define LN_camellia_128_cfb8		"camellia-128-cfb8"
-#define NID_camellia_128_cfb8		763
-
-#define SN_camellia_192_cfb8		"CAMELLIA-192-CFB8"
-#define LN_camellia_192_cfb8		"camellia-192-cfb8"
-#define NID_camellia_192_cfb8		764
-
-#define SN_camellia_256_cfb8		"CAMELLIA-256-CFB8"
-#define LN_camellia_256_cfb8		"camellia-256-cfb8"
-#define NID_camellia_256_cfb8		765
-
-#define SN_kisa		"KISA"
-#define LN_kisa		"kisa"
-#define NID_kisa		773
-#define OBJ_kisa		OBJ_member_body,410L,200004L
-
-#define SN_seed_ecb		"SEED-ECB"
-#define LN_seed_ecb		"seed-ecb"
-#define NID_seed_ecb		776
-#define OBJ_seed_ecb		OBJ_kisa,1L,3L
-
-#define SN_seed_cbc		"SEED-CBC"
-#define LN_seed_cbc		"seed-cbc"
-#define NID_seed_cbc		777
-#define OBJ_seed_cbc		OBJ_kisa,1L,4L
-
-#define SN_seed_cfb128		"SEED-CFB"
-#define LN_seed_cfb128		"seed-cfb"
-#define NID_seed_cfb128		779
-#define OBJ_seed_cfb128		OBJ_kisa,1L,5L
-
-#define SN_seed_ofb128		"SEED-OFB"
-#define LN_seed_ofb128		"seed-ofb"
-#define NID_seed_ofb128		778
-#define OBJ_seed_ofb128		OBJ_kisa,1L,6L
-
-#define SN_hmac		"HMAC"
-#define LN_hmac		"hmac"
-#define NID_hmac		855
-
diff --git a/dep/include/openssl/objects.h b/dep/include/openssl/objects.h
deleted file mode 100644
index bd0ee52fe..000000000
--- a/dep/include/openssl/objects.h
+++ /dev/null
@@ -1,1138 +0,0 @@
-/* crypto/objects/objects.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_OBJECTS_H
-#define HEADER_OBJECTS_H
-
-#define USE_OBJ_MAC
-
-#ifdef USE_OBJ_MAC
-#include <openssl/obj_mac.h>
-#else
-#define SN_undef			"UNDEF"
-#define LN_undef			"undefined"
-#define NID_undef			0
-#define OBJ_undef			0L
-
-#define SN_Algorithm			"Algorithm"
-#define LN_algorithm			"algorithm"
-#define NID_algorithm			38
-#define OBJ_algorithm			1L,3L,14L,3L,2L
-
-#define LN_rsadsi			"rsadsi"
-#define NID_rsadsi			1
-#define OBJ_rsadsi			1L,2L,840L,113549L
-
-#define LN_pkcs				"pkcs"
-#define NID_pkcs			2
-#define OBJ_pkcs			OBJ_rsadsi,1L
-
-#define SN_md2				"MD2"
-#define LN_md2				"md2"
-#define NID_md2				3
-#define OBJ_md2				OBJ_rsadsi,2L,2L
-
-#define SN_md5				"MD5"
-#define LN_md5				"md5"
-#define NID_md5				4
-#define OBJ_md5				OBJ_rsadsi,2L,5L
-
-#define SN_rc4				"RC4"
-#define LN_rc4				"rc4"
-#define NID_rc4				5
-#define OBJ_rc4				OBJ_rsadsi,3L,4L
-
-#define LN_rsaEncryption		"rsaEncryption"
-#define NID_rsaEncryption		6
-#define OBJ_rsaEncryption		OBJ_pkcs,1L,1L
-
-#define SN_md2WithRSAEncryption		"RSA-MD2"
-#define LN_md2WithRSAEncryption		"md2WithRSAEncryption"
-#define NID_md2WithRSAEncryption	7
-#define OBJ_md2WithRSAEncryption	OBJ_pkcs,1L,2L
-
-#define SN_md5WithRSAEncryption		"RSA-MD5"
-#define LN_md5WithRSAEncryption		"md5WithRSAEncryption"
-#define NID_md5WithRSAEncryption	8
-#define OBJ_md5WithRSAEncryption	OBJ_pkcs,1L,4L
-
-#define SN_pbeWithMD2AndDES_CBC		"PBE-MD2-DES"
-#define LN_pbeWithMD2AndDES_CBC		"pbeWithMD2AndDES-CBC"
-#define NID_pbeWithMD2AndDES_CBC	9
-#define OBJ_pbeWithMD2AndDES_CBC	OBJ_pkcs,5L,1L
-
-#define SN_pbeWithMD5AndDES_CBC		"PBE-MD5-DES"
-#define LN_pbeWithMD5AndDES_CBC		"pbeWithMD5AndDES-CBC"
-#define NID_pbeWithMD5AndDES_CBC	10
-#define OBJ_pbeWithMD5AndDES_CBC	OBJ_pkcs,5L,3L
-
-#define LN_X500				"X500"
-#define NID_X500			11
-#define OBJ_X500			2L,5L
-
-#define LN_X509				"X509"
-#define NID_X509			12
-#define OBJ_X509			OBJ_X500,4L
-
-#define SN_commonName			"CN"
-#define LN_commonName			"commonName"
-#define NID_commonName			13
-#define OBJ_commonName			OBJ_X509,3L
-
-#define SN_countryName			"C"
-#define LN_countryName			"countryName"
-#define NID_countryName			14
-#define OBJ_countryName			OBJ_X509,6L
-
-#define SN_localityName			"L"
-#define LN_localityName			"localityName"
-#define NID_localityName		15
-#define OBJ_localityName		OBJ_X509,7L
-
-/* Postal Address? PA */
-
-/* should be "ST" (rfc1327) but MS uses 'S' */
-#define SN_stateOrProvinceName		"ST"
-#define LN_stateOrProvinceName		"stateOrProvinceName"
-#define NID_stateOrProvinceName		16
-#define OBJ_stateOrProvinceName		OBJ_X509,8L
-
-#define SN_organizationName		"O"
-#define LN_organizationName		"organizationName"
-#define NID_organizationName		17
-#define OBJ_organizationName		OBJ_X509,10L
-
-#define SN_organizationalUnitName	"OU"
-#define LN_organizationalUnitName	"organizationalUnitName"
-#define NID_organizationalUnitName	18
-#define OBJ_organizationalUnitName	OBJ_X509,11L
-
-#define SN_rsa				"RSA"
-#define LN_rsa				"rsa"
-#define NID_rsa				19
-#define OBJ_rsa				OBJ_X500,8L,1L,1L
-
-#define LN_pkcs7			"pkcs7"
-#define NID_pkcs7			20
-#define OBJ_pkcs7			OBJ_pkcs,7L
-
-#define LN_pkcs7_data			"pkcs7-data"
-#define NID_pkcs7_data			21
-#define OBJ_pkcs7_data			OBJ_pkcs7,1L
-
-#define LN_pkcs7_signed			"pkcs7-signedData"
-#define NID_pkcs7_signed		22
-#define OBJ_pkcs7_signed		OBJ_pkcs7,2L
-
-#define LN_pkcs7_enveloped		"pkcs7-envelopedData"
-#define NID_pkcs7_enveloped		23
-#define OBJ_pkcs7_enveloped		OBJ_pkcs7,3L
-
-#define LN_pkcs7_signedAndEnveloped	"pkcs7-signedAndEnvelopedData"
-#define NID_pkcs7_signedAndEnveloped	24
-#define OBJ_pkcs7_signedAndEnveloped	OBJ_pkcs7,4L
-
-#define LN_pkcs7_digest			"pkcs7-digestData"
-#define NID_pkcs7_digest		25
-#define OBJ_pkcs7_digest		OBJ_pkcs7,5L
-
-#define LN_pkcs7_encrypted		"pkcs7-encryptedData"
-#define NID_pkcs7_encrypted		26
-#define OBJ_pkcs7_encrypted		OBJ_pkcs7,6L
-
-#define LN_pkcs3			"pkcs3"
-#define NID_pkcs3			27
-#define OBJ_pkcs3			OBJ_pkcs,3L
-
-#define LN_dhKeyAgreement		"dhKeyAgreement"
-#define NID_dhKeyAgreement		28
-#define OBJ_dhKeyAgreement		OBJ_pkcs3,1L
-
-#define SN_des_ecb			"DES-ECB"
-#define LN_des_ecb			"des-ecb"
-#define NID_des_ecb			29
-#define OBJ_des_ecb			OBJ_algorithm,6L
-
-#define SN_des_cfb64			"DES-CFB"
-#define LN_des_cfb64			"des-cfb"
-#define NID_des_cfb64			30
-/* IV + num */
-#define OBJ_des_cfb64			OBJ_algorithm,9L
-
-#define SN_des_cbc			"DES-CBC"
-#define LN_des_cbc			"des-cbc"
-#define NID_des_cbc			31
-/* IV */
-#define OBJ_des_cbc			OBJ_algorithm,7L
-
-#define SN_des_ede			"DES-EDE"
-#define LN_des_ede			"des-ede"
-#define NID_des_ede			32
-/* ?? */
-#define OBJ_des_ede			OBJ_algorithm,17L
-
-#define SN_des_ede3			"DES-EDE3"
-#define LN_des_ede3			"des-ede3"
-#define NID_des_ede3			33
-
-#define SN_idea_cbc			"IDEA-CBC"
-#define LN_idea_cbc			"idea-cbc"
-#define NID_idea_cbc			34
-#define OBJ_idea_cbc			1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
-
-#define SN_idea_cfb64			"IDEA-CFB"
-#define LN_idea_cfb64			"idea-cfb"
-#define NID_idea_cfb64			35
-
-#define SN_idea_ecb			"IDEA-ECB"
-#define LN_idea_ecb			"idea-ecb"
-#define NID_idea_ecb			36
-
-#define SN_rc2_cbc			"RC2-CBC"
-#define LN_rc2_cbc			"rc2-cbc"
-#define NID_rc2_cbc			37
-#define OBJ_rc2_cbc			OBJ_rsadsi,3L,2L
-
-#define SN_rc2_ecb			"RC2-ECB"
-#define LN_rc2_ecb			"rc2-ecb"
-#define NID_rc2_ecb			38
-
-#define SN_rc2_cfb64			"RC2-CFB"
-#define LN_rc2_cfb64			"rc2-cfb"
-#define NID_rc2_cfb64			39
-
-#define SN_rc2_ofb64			"RC2-OFB"
-#define LN_rc2_ofb64			"rc2-ofb"
-#define NID_rc2_ofb64			40
-
-#define SN_sha				"SHA"
-#define LN_sha				"sha"
-#define NID_sha				41
-#define OBJ_sha				OBJ_algorithm,18L
-
-#define SN_shaWithRSAEncryption		"RSA-SHA"
-#define LN_shaWithRSAEncryption		"shaWithRSAEncryption"
-#define NID_shaWithRSAEncryption	42
-#define OBJ_shaWithRSAEncryption	OBJ_algorithm,15L
-
-#define SN_des_ede_cbc			"DES-EDE-CBC"
-#define LN_des_ede_cbc			"des-ede-cbc"
-#define NID_des_ede_cbc			43
-
-#define SN_des_ede3_cbc			"DES-EDE3-CBC"
-#define LN_des_ede3_cbc			"des-ede3-cbc"
-#define NID_des_ede3_cbc		44
-#define OBJ_des_ede3_cbc		OBJ_rsadsi,3L,7L
-
-#define SN_des_ofb64			"DES-OFB"
-#define LN_des_ofb64			"des-ofb"
-#define NID_des_ofb64			45
-#define OBJ_des_ofb64			OBJ_algorithm,8L
-
-#define SN_idea_ofb64			"IDEA-OFB"
-#define LN_idea_ofb64			"idea-ofb"
-#define NID_idea_ofb64			46
-
-#define LN_pkcs9			"pkcs9"
-#define NID_pkcs9			47
-#define OBJ_pkcs9			OBJ_pkcs,9L
-
-#define SN_pkcs9_emailAddress		"Email"
-#define LN_pkcs9_emailAddress		"emailAddress"
-#define NID_pkcs9_emailAddress		48
-#define OBJ_pkcs9_emailAddress		OBJ_pkcs9,1L
-
-#define LN_pkcs9_unstructuredName	"unstructuredName"
-#define NID_pkcs9_unstructuredName	49
-#define OBJ_pkcs9_unstructuredName	OBJ_pkcs9,2L
-
-#define LN_pkcs9_contentType		"contentType"
-#define NID_pkcs9_contentType		50
-#define OBJ_pkcs9_contentType		OBJ_pkcs9,3L
-
-#define LN_pkcs9_messageDigest		"messageDigest"
-#define NID_pkcs9_messageDigest		51
-#define OBJ_pkcs9_messageDigest		OBJ_pkcs9,4L
-
-#define LN_pkcs9_signingTime		"signingTime"
-#define NID_pkcs9_signingTime		52
-#define OBJ_pkcs9_signingTime		OBJ_pkcs9,5L
-
-#define LN_pkcs9_countersignature	"countersignature"
-#define NID_pkcs9_countersignature	53
-#define OBJ_pkcs9_countersignature	OBJ_pkcs9,6L
-
-#define LN_pkcs9_challengePassword	"challengePassword"
-#define NID_pkcs9_challengePassword	54
-#define OBJ_pkcs9_challengePassword	OBJ_pkcs9,7L
-
-#define LN_pkcs9_unstructuredAddress	"unstructuredAddress"
-#define NID_pkcs9_unstructuredAddress	55
-#define OBJ_pkcs9_unstructuredAddress	OBJ_pkcs9,8L
-
-#define LN_pkcs9_extCertAttributes	"extendedCertificateAttributes"
-#define NID_pkcs9_extCertAttributes	56
-#define OBJ_pkcs9_extCertAttributes	OBJ_pkcs9,9L
-
-#define SN_netscape			"Netscape"
-#define LN_netscape			"Netscape Communications Corp."
-#define NID_netscape			57
-#define OBJ_netscape			2L,16L,840L,1L,113730L
-
-#define SN_netscape_cert_extension	"nsCertExt"
-#define LN_netscape_cert_extension	"Netscape Certificate Extension"
-#define NID_netscape_cert_extension	58
-#define OBJ_netscape_cert_extension	OBJ_netscape,1L
-
-#define SN_netscape_data_type		"nsDataType"
-#define LN_netscape_data_type		"Netscape Data Type"
-#define NID_netscape_data_type		59
-#define OBJ_netscape_data_type		OBJ_netscape,2L
-
-#define SN_des_ede_cfb64		"DES-EDE-CFB"
-#define LN_des_ede_cfb64		"des-ede-cfb"
-#define NID_des_ede_cfb64		60
-
-#define SN_des_ede3_cfb64		"DES-EDE3-CFB"
-#define LN_des_ede3_cfb64		"des-ede3-cfb"
-#define NID_des_ede3_cfb64		61
-
-#define SN_des_ede_ofb64		"DES-EDE-OFB"
-#define LN_des_ede_ofb64		"des-ede-ofb"
-#define NID_des_ede_ofb64		62
-
-#define SN_des_ede3_ofb64		"DES-EDE3-OFB"
-#define LN_des_ede3_ofb64		"des-ede3-ofb"
-#define NID_des_ede3_ofb64		63
-
-/* I'm not sure about the object ID */
-#define SN_sha1				"SHA1"
-#define LN_sha1				"sha1"
-#define NID_sha1			64
-#define OBJ_sha1			OBJ_algorithm,26L
-/* 28 Jun 1996 - eay */
-/* #define OBJ_sha1			1L,3L,14L,2L,26L,05L <- wrong */
-
-#define SN_sha1WithRSAEncryption	"RSA-SHA1"
-#define LN_sha1WithRSAEncryption	"sha1WithRSAEncryption"
-#define NID_sha1WithRSAEncryption	65
-#define OBJ_sha1WithRSAEncryption	OBJ_pkcs,1L,5L
-
-#define SN_dsaWithSHA			"DSA-SHA"
-#define LN_dsaWithSHA			"dsaWithSHA"
-#define NID_dsaWithSHA			66
-#define OBJ_dsaWithSHA			OBJ_algorithm,13L
-
-#define SN_dsa_2			"DSA-old"
-#define LN_dsa_2			"dsaEncryption-old"
-#define NID_dsa_2			67
-#define OBJ_dsa_2			OBJ_algorithm,12L
-
-/* proposed by microsoft to RSA */
-#define SN_pbeWithSHA1AndRC2_CBC	"PBE-SHA1-RC2-64"
-#define LN_pbeWithSHA1AndRC2_CBC	"pbeWithSHA1AndRC2-CBC"
-#define NID_pbeWithSHA1AndRC2_CBC	68
-#define OBJ_pbeWithSHA1AndRC2_CBC	OBJ_pkcs,5L,11L 
-
-/* proposed by microsoft to RSA as pbeWithSHA1AndRC4: it is now
- * defined explicitly in PKCS#5 v2.0 as id-PBKDF2 which is something
- * completely different.
- */
-#define LN_id_pbkdf2			"PBKDF2"
-#define NID_id_pbkdf2			69
-#define OBJ_id_pbkdf2			OBJ_pkcs,5L,12L 
-
-#define SN_dsaWithSHA1_2		"DSA-SHA1-old"
-#define LN_dsaWithSHA1_2		"dsaWithSHA1-old"
-#define NID_dsaWithSHA1_2		70
-/* Got this one from 'sdn706r20.pdf' which is actually an NSA document :-) */
-#define OBJ_dsaWithSHA1_2		OBJ_algorithm,27L
-
-#define SN_netscape_cert_type		"nsCertType"
-#define LN_netscape_cert_type		"Netscape Cert Type"
-#define NID_netscape_cert_type		71
-#define OBJ_netscape_cert_type		OBJ_netscape_cert_extension,1L
-
-#define SN_netscape_base_url		"nsBaseUrl"
-#define LN_netscape_base_url		"Netscape Base Url"
-#define NID_netscape_base_url		72
-#define OBJ_netscape_base_url		OBJ_netscape_cert_extension,2L
-
-#define SN_netscape_revocation_url	"nsRevocationUrl"
-#define LN_netscape_revocation_url	"Netscape Revocation Url"
-#define NID_netscape_revocation_url	73
-#define OBJ_netscape_revocation_url	OBJ_netscape_cert_extension,3L
-
-#define SN_netscape_ca_revocation_url	"nsCaRevocationUrl"
-#define LN_netscape_ca_revocation_url	"Netscape CA Revocation Url"
-#define NID_netscape_ca_revocation_url	74
-#define OBJ_netscape_ca_revocation_url	OBJ_netscape_cert_extension,4L
-
-#define SN_netscape_renewal_url		"nsRenewalUrl"
-#define LN_netscape_renewal_url		"Netscape Renewal Url"
-#define NID_netscape_renewal_url	75
-#define OBJ_netscape_renewal_url	OBJ_netscape_cert_extension,7L
-
-#define SN_netscape_ca_policy_url	"nsCaPolicyUrl"
-#define LN_netscape_ca_policy_url	"Netscape CA Policy Url"
-#define NID_netscape_ca_policy_url	76
-#define OBJ_netscape_ca_policy_url	OBJ_netscape_cert_extension,8L
-
-#define SN_netscape_ssl_server_name	"nsSslServerName"
-#define LN_netscape_ssl_server_name	"Netscape SSL Server Name"
-#define NID_netscape_ssl_server_name	77
-#define OBJ_netscape_ssl_server_name	OBJ_netscape_cert_extension,12L
-
-#define SN_netscape_comment		"nsComment"
-#define LN_netscape_comment		"Netscape Comment"
-#define NID_netscape_comment		78
-#define OBJ_netscape_comment		OBJ_netscape_cert_extension,13L
-
-#define SN_netscape_cert_sequence	"nsCertSequence"
-#define LN_netscape_cert_sequence	"Netscape Certificate Sequence"
-#define NID_netscape_cert_sequence	79
-#define OBJ_netscape_cert_sequence	OBJ_netscape_data_type,5L
-
-#define SN_desx_cbc			"DESX-CBC"
-#define LN_desx_cbc			"desx-cbc"
-#define NID_desx_cbc			80
-
-#define SN_id_ce			"id-ce"
-#define NID_id_ce			81
-#define OBJ_id_ce			2L,5L,29L
-
-#define SN_subject_key_identifier	"subjectKeyIdentifier"
-#define LN_subject_key_identifier	"X509v3 Subject Key Identifier"
-#define NID_subject_key_identifier	82
-#define OBJ_subject_key_identifier	OBJ_id_ce,14L
-
-#define SN_key_usage			"keyUsage"
-#define LN_key_usage			"X509v3 Key Usage"
-#define NID_key_usage			83
-#define OBJ_key_usage			OBJ_id_ce,15L
-
-#define SN_private_key_usage_period	"privateKeyUsagePeriod"
-#define LN_private_key_usage_period	"X509v3 Private Key Usage Period"
-#define NID_private_key_usage_period	84
-#define OBJ_private_key_usage_period	OBJ_id_ce,16L
-
-#define SN_subject_alt_name		"subjectAltName"
-#define LN_subject_alt_name		"X509v3 Subject Alternative Name"
-#define NID_subject_alt_name		85
-#define OBJ_subject_alt_name		OBJ_id_ce,17L
-
-#define SN_issuer_alt_name		"issuerAltName"
-#define LN_issuer_alt_name		"X509v3 Issuer Alternative Name"
-#define NID_issuer_alt_name		86
-#define OBJ_issuer_alt_name		OBJ_id_ce,18L
-
-#define SN_basic_constraints		"basicConstraints"
-#define LN_basic_constraints		"X509v3 Basic Constraints"
-#define NID_basic_constraints		87
-#define OBJ_basic_constraints		OBJ_id_ce,19L
-
-#define SN_crl_number			"crlNumber"
-#define LN_crl_number			"X509v3 CRL Number"
-#define NID_crl_number			88
-#define OBJ_crl_number			OBJ_id_ce,20L
-
-#define SN_certificate_policies		"certificatePolicies"
-#define LN_certificate_policies		"X509v3 Certificate Policies"
-#define NID_certificate_policies	89
-#define OBJ_certificate_policies	OBJ_id_ce,32L
-
-#define SN_authority_key_identifier	"authorityKeyIdentifier"
-#define LN_authority_key_identifier	"X509v3 Authority Key Identifier"
-#define NID_authority_key_identifier	90
-#define OBJ_authority_key_identifier	OBJ_id_ce,35L
-
-#define SN_bf_cbc			"BF-CBC"
-#define LN_bf_cbc			"bf-cbc"
-#define NID_bf_cbc			91
-#define OBJ_bf_cbc			1L,3L,6L,1L,4L,1L,3029L,1L,2L
-
-#define SN_bf_ecb			"BF-ECB"
-#define LN_bf_ecb			"bf-ecb"
-#define NID_bf_ecb			92
-
-#define SN_bf_cfb64			"BF-CFB"
-#define LN_bf_cfb64			"bf-cfb"
-#define NID_bf_cfb64			93
-
-#define SN_bf_ofb64			"BF-OFB"
-#define LN_bf_ofb64			"bf-ofb"
-#define NID_bf_ofb64			94
-
-#define SN_mdc2				"MDC2"
-#define LN_mdc2				"mdc2"
-#define NID_mdc2			95
-#define OBJ_mdc2			2L,5L,8L,3L,101L
-/* An alternative?			1L,3L,14L,3L,2L,19L */
-
-#define SN_mdc2WithRSA			"RSA-MDC2"
-#define LN_mdc2WithRSA			"mdc2withRSA"
-#define NID_mdc2WithRSA			96
-#define OBJ_mdc2WithRSA			2L,5L,8L,3L,100L
-
-#define SN_rc4_40			"RC4-40"
-#define LN_rc4_40			"rc4-40"
-#define NID_rc4_40			97
-
-#define SN_rc2_40_cbc			"RC2-40-CBC"
-#define LN_rc2_40_cbc			"rc2-40-cbc"
-#define NID_rc2_40_cbc			98
-
-#define SN_givenName			"G"
-#define LN_givenName			"givenName"
-#define NID_givenName			99
-#define OBJ_givenName			OBJ_X509,42L
-
-#define SN_surname			"S"
-#define LN_surname			"surname"
-#define NID_surname			100
-#define OBJ_surname			OBJ_X509,4L
-
-#define SN_initials			"I"
-#define LN_initials			"initials"
-#define NID_initials			101
-#define OBJ_initials			OBJ_X509,43L
-
-#define SN_uniqueIdentifier		"UID"
-#define LN_uniqueIdentifier		"uniqueIdentifier"
-#define NID_uniqueIdentifier		102
-#define OBJ_uniqueIdentifier		OBJ_X509,45L
-
-#define SN_crl_distribution_points	"crlDistributionPoints"
-#define LN_crl_distribution_points	"X509v3 CRL Distribution Points"
-#define NID_crl_distribution_points	103
-#define OBJ_crl_distribution_points	OBJ_id_ce,31L
-
-#define SN_md5WithRSA			"RSA-NP-MD5"
-#define LN_md5WithRSA			"md5WithRSA"
-#define NID_md5WithRSA			104
-#define OBJ_md5WithRSA			OBJ_algorithm,3L
-
-#define SN_serialNumber			"SN"
-#define LN_serialNumber			"serialNumber"
-#define NID_serialNumber		105
-#define OBJ_serialNumber		OBJ_X509,5L
-
-#define SN_title			"T"
-#define LN_title			"title"
-#define NID_title			106
-#define OBJ_title			OBJ_X509,12L
-
-#define SN_description			"D"
-#define LN_description			"description"
-#define NID_description			107
-#define OBJ_description			OBJ_X509,13L
-
-/* CAST5 is CAST-128, I'm just sticking with the documentation */
-#define SN_cast5_cbc			"CAST5-CBC"
-#define LN_cast5_cbc			"cast5-cbc"
-#define NID_cast5_cbc			108
-#define OBJ_cast5_cbc			1L,2L,840L,113533L,7L,66L,10L
-
-#define SN_cast5_ecb			"CAST5-ECB"
-#define LN_cast5_ecb			"cast5-ecb"
-#define NID_cast5_ecb			109
-
-#define SN_cast5_cfb64			"CAST5-CFB"
-#define LN_cast5_cfb64			"cast5-cfb"
-#define NID_cast5_cfb64			110
-
-#define SN_cast5_ofb64			"CAST5-OFB"
-#define LN_cast5_ofb64			"cast5-ofb"
-#define NID_cast5_ofb64			111
-
-#define LN_pbeWithMD5AndCast5_CBC	"pbeWithMD5AndCast5CBC"
-#define NID_pbeWithMD5AndCast5_CBC	112
-#define OBJ_pbeWithMD5AndCast5_CBC	1L,2L,840L,113533L,7L,66L,12L
-
-/* This is one sun will soon be using :-(
- * id-dsa-with-sha1 ID  ::= {
- *   iso(1) member-body(2) us(840) x9-57 (10040) x9cm(4) 3 }
- */
-#define SN_dsaWithSHA1			"DSA-SHA1"
-#define LN_dsaWithSHA1			"dsaWithSHA1"
-#define NID_dsaWithSHA1			113
-#define OBJ_dsaWithSHA1			1L,2L,840L,10040L,4L,3L
-
-#define NID_md5_sha1			114
-#define SN_md5_sha1			"MD5-SHA1"
-#define LN_md5_sha1			"md5-sha1"
-
-#define SN_sha1WithRSA			"RSA-SHA1-2"
-#define LN_sha1WithRSA			"sha1WithRSA"
-#define NID_sha1WithRSA			115
-#define OBJ_sha1WithRSA			OBJ_algorithm,29L
-
-#define SN_dsa				"DSA"
-#define LN_dsa				"dsaEncryption"
-#define NID_dsa				116
-#define OBJ_dsa				1L,2L,840L,10040L,4L,1L
-
-#define SN_ripemd160			"RIPEMD160"
-#define LN_ripemd160			"ripemd160"
-#define NID_ripemd160			117
-#define OBJ_ripemd160			1L,3L,36L,3L,2L,1L
-
-/* The name should actually be rsaSignatureWithripemd160, but I'm going
- * to continue using the convention I'm using with the other ciphers */
-#define SN_ripemd160WithRSA		"RSA-RIPEMD160"
-#define LN_ripemd160WithRSA		"ripemd160WithRSA"
-#define NID_ripemd160WithRSA		119
-#define OBJ_ripemd160WithRSA		1L,3L,36L,3L,3L,1L,2L
-
-/* Taken from rfc2040
- *  RC5_CBC_Parameters ::= SEQUENCE {
- *	version           INTEGER (v1_0(16)),
- *	rounds            INTEGER (8..127),
- *	blockSizeInBits   INTEGER (64, 128),
- *	iv                OCTET STRING OPTIONAL
- *	}
- */
-#define SN_rc5_cbc			"RC5-CBC"
-#define LN_rc5_cbc			"rc5-cbc"
-#define NID_rc5_cbc			120
-#define OBJ_rc5_cbc			OBJ_rsadsi,3L,8L
-
-#define SN_rc5_ecb			"RC5-ECB"
-#define LN_rc5_ecb			"rc5-ecb"
-#define NID_rc5_ecb			121
-
-#define SN_rc5_cfb64			"RC5-CFB"
-#define LN_rc5_cfb64			"rc5-cfb"
-#define NID_rc5_cfb64			122
-
-#define SN_rc5_ofb64			"RC5-OFB"
-#define LN_rc5_ofb64			"rc5-ofb"
-#define NID_rc5_ofb64			123
-
-#define SN_rle_compression		"RLE"
-#define LN_rle_compression		"run length compression"
-#define NID_rle_compression		124
-#define OBJ_rle_compression		1L,1L,1L,1L,666L,1L
-
-#define SN_zlib_compression		"ZLIB"
-#define LN_zlib_compression		"zlib compression"
-#define NID_zlib_compression		125
-#define OBJ_zlib_compression		1L,1L,1L,1L,666L,2L
-
-#define SN_ext_key_usage		"extendedKeyUsage"
-#define LN_ext_key_usage		"X509v3 Extended Key Usage"
-#define NID_ext_key_usage		126
-#define OBJ_ext_key_usage		OBJ_id_ce,37
-
-#define SN_id_pkix			"PKIX"
-#define NID_id_pkix			127
-#define OBJ_id_pkix			1L,3L,6L,1L,5L,5L,7L
-
-#define SN_id_kp			"id-kp"
-#define NID_id_kp			128
-#define OBJ_id_kp			OBJ_id_pkix,3L
-
-/* PKIX extended key usage OIDs */
-
-#define SN_server_auth			"serverAuth"
-#define LN_server_auth			"TLS Web Server Authentication"
-#define NID_server_auth			129
-#define OBJ_server_auth			OBJ_id_kp,1L
-
-#define SN_client_auth			"clientAuth"
-#define LN_client_auth			"TLS Web Client Authentication"
-#define NID_client_auth			130
-#define OBJ_client_auth			OBJ_id_kp,2L
-
-#define SN_code_sign			"codeSigning"
-#define LN_code_sign			"Code Signing"
-#define NID_code_sign			131
-#define OBJ_code_sign			OBJ_id_kp,3L
-
-#define SN_email_protect		"emailProtection"
-#define LN_email_protect		"E-mail Protection"
-#define NID_email_protect		132
-#define OBJ_email_protect		OBJ_id_kp,4L
-
-#define SN_time_stamp			"timeStamping"
-#define LN_time_stamp			"Time Stamping"
-#define NID_time_stamp			133
-#define OBJ_time_stamp			OBJ_id_kp,8L
-
-/* Additional extended key usage OIDs: Microsoft */
-
-#define SN_ms_code_ind			"msCodeInd"
-#define LN_ms_code_ind			"Microsoft Individual Code Signing"
-#define NID_ms_code_ind			134
-#define OBJ_ms_code_ind			1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
-
-#define SN_ms_code_com			"msCodeCom"
-#define LN_ms_code_com			"Microsoft Commercial Code Signing"
-#define NID_ms_code_com			135
-#define OBJ_ms_code_com			1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
-
-#define SN_ms_ctl_sign			"msCTLSign"
-#define LN_ms_ctl_sign			"Microsoft Trust List Signing"
-#define NID_ms_ctl_sign			136
-#define OBJ_ms_ctl_sign			1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
-
-#define SN_ms_sgc			"msSGC"
-#define LN_ms_sgc			"Microsoft Server Gated Crypto"
-#define NID_ms_sgc			137
-#define OBJ_ms_sgc			1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
-
-#define SN_ms_efs			"msEFS"
-#define LN_ms_efs			"Microsoft Encrypted File System"
-#define NID_ms_efs			138
-#define OBJ_ms_efs			1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
-
-/* Additional usage: Netscape */
-
-#define SN_ns_sgc			"nsSGC"
-#define LN_ns_sgc			"Netscape Server Gated Crypto"
-#define NID_ns_sgc			139
-#define OBJ_ns_sgc			OBJ_netscape,4L,1L
-
-#define SN_delta_crl			"deltaCRL"
-#define LN_delta_crl			"X509v3 Delta CRL Indicator"
-#define NID_delta_crl			140
-#define OBJ_delta_crl			OBJ_id_ce,27L
-
-#define SN_crl_reason			"CRLReason"
-#define LN_crl_reason			"CRL Reason Code"
-#define NID_crl_reason			141
-#define OBJ_crl_reason			OBJ_id_ce,21L
-
-#define SN_invalidity_date		"invalidityDate"
-#define LN_invalidity_date		"Invalidity Date"
-#define NID_invalidity_date		142
-#define OBJ_invalidity_date		OBJ_id_ce,24L
-
-#define SN_sxnet			"SXNetID"
-#define LN_sxnet			"Strong Extranet ID"
-#define NID_sxnet			143
-#define OBJ_sxnet			1L,3L,101L,1L,4L,1L
-
-/* PKCS12 and related OBJECT IDENTIFIERS */
-
-#define OBJ_pkcs12			OBJ_pkcs,12L
-#define OBJ_pkcs12_pbeids		OBJ_pkcs12, 1
-
-#define SN_pbe_WithSHA1And128BitRC4	"PBE-SHA1-RC4-128"
-#define LN_pbe_WithSHA1And128BitRC4	"pbeWithSHA1And128BitRC4"
-#define NID_pbe_WithSHA1And128BitRC4	144
-#define OBJ_pbe_WithSHA1And128BitRC4	OBJ_pkcs12_pbeids, 1L
-
-#define SN_pbe_WithSHA1And40BitRC4	"PBE-SHA1-RC4-40"
-#define LN_pbe_WithSHA1And40BitRC4	"pbeWithSHA1And40BitRC4"
-#define NID_pbe_WithSHA1And40BitRC4	145
-#define OBJ_pbe_WithSHA1And40BitRC4	OBJ_pkcs12_pbeids, 2L
-
-#define SN_pbe_WithSHA1And3_Key_TripleDES_CBC	"PBE-SHA1-3DES"
-#define LN_pbe_WithSHA1And3_Key_TripleDES_CBC	"pbeWithSHA1And3-KeyTripleDES-CBC"
-#define NID_pbe_WithSHA1And3_Key_TripleDES_CBC	146
-#define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC	OBJ_pkcs12_pbeids, 3L
-
-#define SN_pbe_WithSHA1And2_Key_TripleDES_CBC	"PBE-SHA1-2DES"
-#define LN_pbe_WithSHA1And2_Key_TripleDES_CBC	"pbeWithSHA1And2-KeyTripleDES-CBC"
-#define NID_pbe_WithSHA1And2_Key_TripleDES_CBC	147
-#define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC	OBJ_pkcs12_pbeids, 4L
-
-#define SN_pbe_WithSHA1And128BitRC2_CBC		"PBE-SHA1-RC2-128"
-#define LN_pbe_WithSHA1And128BitRC2_CBC		"pbeWithSHA1And128BitRC2-CBC"
-#define NID_pbe_WithSHA1And128BitRC2_CBC	148
-#define OBJ_pbe_WithSHA1And128BitRC2_CBC	OBJ_pkcs12_pbeids, 5L
-
-#define SN_pbe_WithSHA1And40BitRC2_CBC	"PBE-SHA1-RC2-40"
-#define LN_pbe_WithSHA1And40BitRC2_CBC	"pbeWithSHA1And40BitRC2-CBC"
-#define NID_pbe_WithSHA1And40BitRC2_CBC	149
-#define OBJ_pbe_WithSHA1And40BitRC2_CBC	OBJ_pkcs12_pbeids, 6L
-
-#define OBJ_pkcs12_Version1	OBJ_pkcs12, 10L
-
-#define OBJ_pkcs12_BagIds	OBJ_pkcs12_Version1, 1L
-
-#define LN_keyBag		"keyBag"
-#define NID_keyBag		150
-#define OBJ_keyBag		OBJ_pkcs12_BagIds, 1L
-
-#define LN_pkcs8ShroudedKeyBag	"pkcs8ShroudedKeyBag"
-#define NID_pkcs8ShroudedKeyBag	151
-#define OBJ_pkcs8ShroudedKeyBag	OBJ_pkcs12_BagIds, 2L
-
-#define LN_certBag		"certBag"
-#define NID_certBag		152
-#define OBJ_certBag		OBJ_pkcs12_BagIds, 3L
-
-#define LN_crlBag		"crlBag"
-#define NID_crlBag		153
-#define OBJ_crlBag		OBJ_pkcs12_BagIds, 4L
-
-#define LN_secretBag		"secretBag"
-#define NID_secretBag		154
-#define OBJ_secretBag		OBJ_pkcs12_BagIds, 5L
-
-#define LN_safeContentsBag	"safeContentsBag"
-#define NID_safeContentsBag	155
-#define OBJ_safeContentsBag	OBJ_pkcs12_BagIds, 6L
-
-#define LN_friendlyName		"friendlyName"
-#define	NID_friendlyName	156
-#define OBJ_friendlyName	OBJ_pkcs9, 20L
-
-#define LN_localKeyID		"localKeyID"
-#define	NID_localKeyID		157
-#define OBJ_localKeyID		OBJ_pkcs9, 21L
-
-#define OBJ_certTypes		OBJ_pkcs9, 22L
-
-#define LN_x509Certificate	"x509Certificate"
-#define	NID_x509Certificate	158
-#define OBJ_x509Certificate	OBJ_certTypes, 1L
-
-#define LN_sdsiCertificate	"sdsiCertificate"
-#define	NID_sdsiCertificate	159
-#define OBJ_sdsiCertificate	OBJ_certTypes, 2L
-
-#define OBJ_crlTypes		OBJ_pkcs9, 23L
-
-#define LN_x509Crl		"x509Crl"
-#define	NID_x509Crl		160
-#define OBJ_x509Crl		OBJ_crlTypes, 1L
-
-/* PKCS#5 v2 OIDs */
-
-#define LN_pbes2		"PBES2"
-#define NID_pbes2		161
-#define OBJ_pbes2		OBJ_pkcs,5L,13L
-
-#define LN_pbmac1		"PBMAC1"
-#define NID_pbmac1		162
-#define OBJ_pbmac1		OBJ_pkcs,5L,14L
-
-#define LN_hmacWithSHA1		"hmacWithSHA1"
-#define NID_hmacWithSHA1	163
-#define OBJ_hmacWithSHA1	OBJ_rsadsi,2L,7L
-
-/* Policy Qualifier Ids */
-
-#define LN_id_qt_cps		"Policy Qualifier CPS"
-#define SN_id_qt_cps		"id-qt-cps"
-#define NID_id_qt_cps		164
-#define OBJ_id_qt_cps		OBJ_id_pkix,2L,1L
-
-#define LN_id_qt_unotice	"Policy Qualifier User Notice"
-#define SN_id_qt_unotice	"id-qt-unotice"
-#define NID_id_qt_unotice	165
-#define OBJ_id_qt_unotice	OBJ_id_pkix,2L,2L
-
-#define SN_rc2_64_cbc			"RC2-64-CBC"
-#define LN_rc2_64_cbc			"rc2-64-cbc"
-#define NID_rc2_64_cbc			166
-
-#define SN_SMIMECapabilities		"SMIME-CAPS"
-#define LN_SMIMECapabilities		"S/MIME Capabilities"
-#define NID_SMIMECapabilities		167
-#define OBJ_SMIMECapabilities		OBJ_pkcs9,15L
-
-#define SN_pbeWithMD2AndRC2_CBC		"PBE-MD2-RC2-64"
-#define LN_pbeWithMD2AndRC2_CBC		"pbeWithMD2AndRC2-CBC"
-#define NID_pbeWithMD2AndRC2_CBC	168
-#define OBJ_pbeWithMD2AndRC2_CBC	OBJ_pkcs,5L,4L
-
-#define SN_pbeWithMD5AndRC2_CBC		"PBE-MD5-RC2-64"
-#define LN_pbeWithMD5AndRC2_CBC		"pbeWithMD5AndRC2-CBC"
-#define NID_pbeWithMD5AndRC2_CBC	169
-#define OBJ_pbeWithMD5AndRC2_CBC	OBJ_pkcs,5L,6L
-
-#define SN_pbeWithSHA1AndDES_CBC	"PBE-SHA1-DES"
-#define LN_pbeWithSHA1AndDES_CBC	"pbeWithSHA1AndDES-CBC"
-#define NID_pbeWithSHA1AndDES_CBC	170
-#define OBJ_pbeWithSHA1AndDES_CBC	OBJ_pkcs,5L,10L
-
-/* Extension request OIDs */
-
-#define LN_ms_ext_req			"Microsoft Extension Request"
-#define SN_ms_ext_req			"msExtReq"
-#define NID_ms_ext_req			171
-#define OBJ_ms_ext_req			1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
-
-#define LN_ext_req			"Extension Request"
-#define SN_ext_req			"extReq"
-#define NID_ext_req			172
-#define OBJ_ext_req			OBJ_pkcs9,14L
-
-#define SN_name				"name"
-#define LN_name				"name"
-#define NID_name			173
-#define OBJ_name			OBJ_X509,41L
-
-#define SN_dnQualifier			"dnQualifier"
-#define LN_dnQualifier			"dnQualifier"
-#define NID_dnQualifier			174
-#define OBJ_dnQualifier			OBJ_X509,46L
-
-#define SN_id_pe			"id-pe"
-#define NID_id_pe			175
-#define OBJ_id_pe			OBJ_id_pkix,1L
-
-#define SN_id_ad			"id-ad"
-#define NID_id_ad			176
-#define OBJ_id_ad			OBJ_id_pkix,48L
-
-#define SN_info_access			"authorityInfoAccess"
-#define LN_info_access			"Authority Information Access"
-#define NID_info_access			177
-#define OBJ_info_access			OBJ_id_pe,1L
-
-#define SN_ad_OCSP			"OCSP"
-#define LN_ad_OCSP			"OCSP"
-#define NID_ad_OCSP			178
-#define OBJ_ad_OCSP			OBJ_id_ad,1L
-
-#define SN_ad_ca_issuers		"caIssuers"
-#define LN_ad_ca_issuers		"CA Issuers"
-#define NID_ad_ca_issuers		179
-#define OBJ_ad_ca_issuers		OBJ_id_ad,2L
-
-#define SN_OCSP_sign			"OCSPSigning"
-#define LN_OCSP_sign			"OCSP Signing"
-#define NID_OCSP_sign			180
-#define OBJ_OCSP_sign			OBJ_id_kp,9L
-#endif /* USE_OBJ_MAC */
-
-#include <openssl/bio.h>
-#include <openssl/asn1.h>
-
-#define	OBJ_NAME_TYPE_UNDEF		0x00
-#define	OBJ_NAME_TYPE_MD_METH		0x01
-#define	OBJ_NAME_TYPE_CIPHER_METH	0x02
-#define	OBJ_NAME_TYPE_PKEY_METH		0x03
-#define	OBJ_NAME_TYPE_COMP_METH		0x04
-#define	OBJ_NAME_TYPE_NUM		0x05
-
-#define	OBJ_NAME_ALIAS			0x8000
-
-#define OBJ_BSEARCH_VALUE_ON_NOMATCH		0x01
-#define OBJ_BSEARCH_FIRST_VALUE_ON_MATCH	0x02
-
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct obj_name_st
-	{
-	int type;
-	int alias;
-	const char *name;
-	const char *data;
-	} OBJ_NAME;
-
-#define		OBJ_create_and_add_object(a,b,c) OBJ_create(a,b,c)
-
-
-int OBJ_NAME_init(void);
-int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
-		       int (*cmp_func)(const char *, const char *),
-		       void (*free_func)(const char *, int, const char *));
-const char *OBJ_NAME_get(const char *name,int type);
-int OBJ_NAME_add(const char *name,int type,const char *data);
-int OBJ_NAME_remove(const char *name,int type);
-void OBJ_NAME_cleanup(int type); /* -1 for everything */
-void OBJ_NAME_do_all(int type,void (*fn)(const OBJ_NAME *,void *arg),
-		     void *arg);
-void OBJ_NAME_do_all_sorted(int type,void (*fn)(const OBJ_NAME *,void *arg),
-			    void *arg);
-
-ASN1_OBJECT *	OBJ_dup(const ASN1_OBJECT *o);
-ASN1_OBJECT *	OBJ_nid2obj(int n);
-const char *	OBJ_nid2ln(int n);
-const char *	OBJ_nid2sn(int n);
-int		OBJ_obj2nid(const ASN1_OBJECT *o);
-ASN1_OBJECT *	OBJ_txt2obj(const char *s, int no_name);
-int	OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name);
-int		OBJ_txt2nid(const char *s);
-int		OBJ_ln2nid(const char *s);
-int		OBJ_sn2nid(const char *s);
-int		OBJ_cmp(const ASN1_OBJECT *a,const ASN1_OBJECT *b);
-const void *	OBJ_bsearch_(const void *key,const void *base,int num,int size,
-			     int (*cmp)(const void *, const void *));
-const void *	OBJ_bsearch_ex_(const void *key,const void *base,int num,
-				int size,
-				int (*cmp)(const void *, const void *),
-				int flags);
-
-#define _DECLARE_OBJ_BSEARCH_CMP_FN(scope, type1, type2, nm)	\
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *, const void *); \
-  static int nm##_cmp(type1 const *, type2 const *); \
-  scope type2 * OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
-
-#define DECLARE_OBJ_BSEARCH_CMP_FN(type1, type2, cmp)	\
-  _DECLARE_OBJ_BSEARCH_CMP_FN(static, type1, type2, cmp)
-#define DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm)	\
-  type2 * OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
-
-/*
- * Unsolved problem: if a type is actually a pointer type, like
- * nid_triple is, then its impossible to get a const where you need
- * it. Consider:
- *
- * typedef int nid_triple[3];
- * const void *a_;
- * const nid_triple const *a = a_;
- *
- * The assignement discards a const because what you really want is:
- *
- * const int const * const *a = a_;
- *
- * But if you do that, you lose the fact that a is an array of 3 ints,
- * which breaks comparison functions.
- *
- * Thus we end up having to cast, sadly, or unpack the
- * declarations. Or, as I finally did in this case, delcare nid_triple
- * to be a struct, which it should have been in the first place.
- *
- * Ben, August 2008.
- *
- * Also, strictly speaking not all types need be const, but handling
- * the non-constness means a lot of complication, and in practice
- * comparison routines do always not touch their arguments.
- */
-
-#define IMPLEMENT_OBJ_BSEARCH_CMP_FN(type1, type2, nm)	\
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)	\
-      { \
-      type1 const *a = a_; \
-      type2 const *b = b_; \
-      return nm##_cmp(a,b); \
-      } \
-  static type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num) \
-      { \
-      return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2), \
-					nm##_cmp_BSEARCH_CMP_FN); \
-      } \
-      extern void dummy_prototype(void)
-
-#define IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm)	\
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)	\
-      { \
-      type1 const *a = a_; \
-      type2 const *b = b_; \
-      return nm##_cmp(a,b); \
-      } \
-  type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num) \
-      { \
-      return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2), \
-					nm##_cmp_BSEARCH_CMP_FN); \
-      } \
-      extern void dummy_prototype(void)
-
-#define OBJ_bsearch(type1,key,type2,base,num,cmp)			       \
-  ((type2 *)OBJ_bsearch_(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \
-			 num,sizeof(type2),				\
-			 ((void)CHECKED_PTR_OF(type1,cmp##_type_1),	\
-			  (void)CHECKED_PTR_OF(type2,cmp##_type_2),	\
-			  cmp##_BSEARCH_CMP_FN)))
-
-#define OBJ_bsearch_ex(type1,key,type2,base,num,cmp,flags)			\
-  ((type2 *)OBJ_bsearch_ex_(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \
-			 num,sizeof(type2),				\
-			 ((void)CHECKED_PTR_OF(type1,cmp##_type_1),	\
-			  (void)type_2=CHECKED_PTR_OF(type2,cmp##_type_2), \
-			  cmp##_BSEARCH_CMP_FN)),flags)
-
-int		OBJ_new_nid(int num);
-int		OBJ_add_object(const ASN1_OBJECT *obj);
-int		OBJ_create(const char *oid,const char *sn,const char *ln);
-void		OBJ_cleanup(void );
-int		OBJ_create_objects(BIO *in);
-
-int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid);
-int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid);
-int OBJ_add_sigid(int signid, int dig_id, int pkey_id);
-void OBJ_sigid_free(void);
-
-extern int obj_cleanup_defer;
-void check_defer(int nid);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_OBJ_strings(void);
-
-/* Error codes for the OBJ functions. */
-
-/* Function codes. */
-#define OBJ_F_OBJ_ADD_OBJECT				 105
-#define OBJ_F_OBJ_CREATE				 100
-#define OBJ_F_OBJ_DUP					 101
-#define OBJ_F_OBJ_NAME_NEW_INDEX			 106
-#define OBJ_F_OBJ_NID2LN				 102
-#define OBJ_F_OBJ_NID2OBJ				 103
-#define OBJ_F_OBJ_NID2SN				 104
-
-/* Reason codes. */
-#define OBJ_R_MALLOC_FAILURE				 100
-#define OBJ_R_UNKNOWN_NID				 101
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/ocsp.h b/dep/include/openssl/ocsp.h
deleted file mode 100644
index 31e45744b..000000000
--- a/dep/include/openssl/ocsp.h
+++ /dev/null
@@ -1,623 +0,0 @@
-/* ocsp.h */
-/* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
- * project. */
-
-/* History:
-   This file was transfered to Richard Levitte from CertCo by Kathy
-   Weinhold in mid-spring 2000 to be included in OpenSSL or released
-   as a patch kit. */
-
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_OCSP_H
-#define HEADER_OCSP_H
-
-#include <openssl/ossl_typ.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-#include <openssl/safestack.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Various flags and values */
-
-#define OCSP_DEFAULT_NONCE_LENGTH	16
-
-#define OCSP_NOCERTS			0x1
-#define OCSP_NOINTERN			0x2
-#define OCSP_NOSIGS			0x4
-#define OCSP_NOCHAIN			0x8
-#define OCSP_NOVERIFY			0x10
-#define OCSP_NOEXPLICIT			0x20
-#define OCSP_NOCASIGN			0x40
-#define OCSP_NODELEGATED		0x80
-#define OCSP_NOCHECKS			0x100
-#define OCSP_TRUSTOTHER			0x200
-#define OCSP_RESPID_KEY			0x400
-#define OCSP_NOTIME			0x800
-
-/*   CertID ::= SEQUENCE {
- *       hashAlgorithm            AlgorithmIdentifier,
- *       issuerNameHash     OCTET STRING, -- Hash of Issuer's DN
- *       issuerKeyHash      OCTET STRING, -- Hash of Issuers public key (excluding the tag & length fields)
- *       serialNumber       CertificateSerialNumber }
- */
-typedef struct ocsp_cert_id_st
-	{
-	X509_ALGOR *hashAlgorithm;
-	ASN1_OCTET_STRING *issuerNameHash;
-	ASN1_OCTET_STRING *issuerKeyHash;
-	ASN1_INTEGER *serialNumber;
-	} OCSP_CERTID;
-
-DECLARE_STACK_OF(OCSP_CERTID)
-
-/*   Request ::=     SEQUENCE {
- *       reqCert                    CertID,
- *       singleRequestExtensions    [0] EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_one_request_st
-	{
-	OCSP_CERTID *reqCert;
-	STACK_OF(X509_EXTENSION) *singleRequestExtensions;
-	} OCSP_ONEREQ;
-
-DECLARE_STACK_OF(OCSP_ONEREQ)
-DECLARE_ASN1_SET_OF(OCSP_ONEREQ)
-
-
-/*   TBSRequest      ::=     SEQUENCE {
- *       version             [0] EXPLICIT Version DEFAULT v1,
- *       requestorName       [1] EXPLICIT GeneralName OPTIONAL,
- *       requestList             SEQUENCE OF Request,
- *       requestExtensions   [2] EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_req_info_st
-	{
-	ASN1_INTEGER *version;
-	GENERAL_NAME *requestorName;
-	STACK_OF(OCSP_ONEREQ) *requestList;
-	STACK_OF(X509_EXTENSION) *requestExtensions;
-	} OCSP_REQINFO;
-
-/*   Signature       ::=     SEQUENCE {
- *       signatureAlgorithm   AlgorithmIdentifier,
- *       signature            BIT STRING,
- *       certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
- */
-typedef struct ocsp_signature_st
-	{
-	X509_ALGOR *signatureAlgorithm;
-	ASN1_BIT_STRING *signature;
-	STACK_OF(X509) *certs;
-	} OCSP_SIGNATURE;
-
-/*   OCSPRequest     ::=     SEQUENCE {
- *       tbsRequest                  TBSRequest,
- *       optionalSignature   [0]     EXPLICIT Signature OPTIONAL }
- */
-typedef struct ocsp_request_st
-	{
-	OCSP_REQINFO *tbsRequest;
-	OCSP_SIGNATURE *optionalSignature; /* OPTIONAL */
-	} OCSP_REQUEST;
-
-/*   OCSPResponseStatus ::= ENUMERATED {
- *       successful            (0),      --Response has valid confirmations
- *       malformedRequest      (1),      --Illegal confirmation request
- *       internalError         (2),      --Internal error in issuer
- *       tryLater              (3),      --Try again later
- *                                       --(4) is not used
- *       sigRequired           (5),      --Must sign the request
- *       unauthorized          (6)       --Request unauthorized
- *   }
- */
-#define OCSP_RESPONSE_STATUS_SUCCESSFUL          0
-#define OCSP_RESPONSE_STATUS_MALFORMEDREQUEST     1
-#define OCSP_RESPONSE_STATUS_INTERNALERROR        2
-#define OCSP_RESPONSE_STATUS_TRYLATER             3
-#define OCSP_RESPONSE_STATUS_SIGREQUIRED          5
-#define OCSP_RESPONSE_STATUS_UNAUTHORIZED         6
-
-/*   ResponseBytes ::=       SEQUENCE {
- *       responseType   OBJECT IDENTIFIER,
- *       response       OCTET STRING }
- */
-typedef struct ocsp_resp_bytes_st
-	{
-	ASN1_OBJECT *responseType;
-	ASN1_OCTET_STRING *response;
-	} OCSP_RESPBYTES;
-
-/*   OCSPResponse ::= SEQUENCE {
- *      responseStatus         OCSPResponseStatus,
- *      responseBytes          [0] EXPLICIT ResponseBytes OPTIONAL }
- */
-struct ocsp_response_st
-	{
-	ASN1_ENUMERATED *responseStatus;
-	OCSP_RESPBYTES  *responseBytes;
-	};
-
-/*   ResponderID ::= CHOICE {
- *      byName   [1] Name,
- *      byKey    [2] KeyHash }
- */
-#define V_OCSP_RESPID_NAME 0
-#define V_OCSP_RESPID_KEY  1
-struct ocsp_responder_id_st
-	{
-	int type;
-	union   {
-		X509_NAME* byName;
-        	ASN1_OCTET_STRING *byKey;
-		} value;
-	};
-
-DECLARE_STACK_OF(OCSP_RESPID)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
-
-/*   KeyHash ::= OCTET STRING --SHA-1 hash of responder's public key
- *                            --(excluding the tag and length fields)
- */
-
-/*   RevokedInfo ::= SEQUENCE {
- *       revocationTime              GeneralizedTime,
- *       revocationReason    [0]     EXPLICIT CRLReason OPTIONAL }
- */
-typedef struct ocsp_revoked_info_st
-	{
-	ASN1_GENERALIZEDTIME *revocationTime;
-	ASN1_ENUMERATED *revocationReason;
-	} OCSP_REVOKEDINFO;
-
-/*   CertStatus ::= CHOICE {
- *       good                [0]     IMPLICIT NULL,
- *       revoked             [1]     IMPLICIT RevokedInfo,
- *       unknown             [2]     IMPLICIT UnknownInfo }
- */
-#define V_OCSP_CERTSTATUS_GOOD    0
-#define V_OCSP_CERTSTATUS_REVOKED 1
-#define V_OCSP_CERTSTATUS_UNKNOWN 2
-typedef struct ocsp_cert_status_st
-	{
-	int type;
-	union	{
-		ASN1_NULL *good;
-		OCSP_REVOKEDINFO *revoked;
-		ASN1_NULL *unknown;
-		} value;
-	} OCSP_CERTSTATUS;
-
-/*   SingleResponse ::= SEQUENCE {
- *      certID                       CertID,
- *      certStatus                   CertStatus,
- *      thisUpdate                   GeneralizedTime,
- *      nextUpdate           [0]     EXPLICIT GeneralizedTime OPTIONAL,
- *      singleExtensions     [1]     EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_single_response_st
-	{
-	OCSP_CERTID *certId;
-	OCSP_CERTSTATUS *certStatus;
-	ASN1_GENERALIZEDTIME *thisUpdate;
-	ASN1_GENERALIZEDTIME *nextUpdate;
-	STACK_OF(X509_EXTENSION) *singleExtensions;
-	} OCSP_SINGLERESP;
-
-DECLARE_STACK_OF(OCSP_SINGLERESP)
-DECLARE_ASN1_SET_OF(OCSP_SINGLERESP)
-
-/*   ResponseData ::= SEQUENCE {
- *      version              [0] EXPLICIT Version DEFAULT v1,
- *      responderID              ResponderID,
- *      producedAt               GeneralizedTime,
- *      responses                SEQUENCE OF SingleResponse,
- *      responseExtensions   [1] EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_response_data_st
-	{
-	ASN1_INTEGER *version;
-	OCSP_RESPID  *responderId;
-	ASN1_GENERALIZEDTIME *producedAt;
-	STACK_OF(OCSP_SINGLERESP) *responses;
-	STACK_OF(X509_EXTENSION) *responseExtensions;
-	} OCSP_RESPDATA;
-
-/*   BasicOCSPResponse       ::= SEQUENCE {
- *      tbsResponseData      ResponseData,
- *      signatureAlgorithm   AlgorithmIdentifier,
- *      signature            BIT STRING,
- *      certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
- */
-  /* Note 1:
-     The value for "signature" is specified in the OCSP rfc2560 as follows:
-     "The value for the signature SHALL be computed on the hash of the DER
-     encoding ResponseData."  This means that you must hash the DER-encoded
-     tbsResponseData, and then run it through a crypto-signing function, which
-     will (at least w/RSA) do a hash-'n'-private-encrypt operation.  This seems
-     a bit odd, but that's the spec.  Also note that the data structures do not
-     leave anywhere to independently specify the algorithm used for the initial
-     hash. So, we look at the signature-specification algorithm, and try to do
-     something intelligent.	-- Kathy Weinhold, CertCo */
-  /* Note 2:
-     It seems that the mentioned passage from RFC 2560 (section 4.2.1) is open
-     for interpretation.  I've done tests against another responder, and found
-     that it doesn't do the double hashing that the RFC seems to say one
-     should.  Therefore, all relevant functions take a flag saying which
-     variant should be used.	-- Richard Levitte, OpenSSL team and CeloCom */
-typedef struct ocsp_basic_response_st
-	{
-	OCSP_RESPDATA *tbsResponseData;
-	X509_ALGOR *signatureAlgorithm;
-	ASN1_BIT_STRING *signature;
-	STACK_OF(X509) *certs;
-	} OCSP_BASICRESP;
-
-/*
- *   CRLReason ::= ENUMERATED {
- *        unspecified             (0),
- *        keyCompromise           (1),
- *        cACompromise            (2),
- *        affiliationChanged      (3),
- *        superseded              (4),
- *        cessationOfOperation    (5),
- *        certificateHold         (6),
- *        removeFromCRL           (8) }
- */
-#define OCSP_REVOKED_STATUS_NOSTATUS               -1
-#define OCSP_REVOKED_STATUS_UNSPECIFIED             0
-#define OCSP_REVOKED_STATUS_KEYCOMPROMISE           1
-#define OCSP_REVOKED_STATUS_CACOMPROMISE            2
-#define OCSP_REVOKED_STATUS_AFFILIATIONCHANGED      3
-#define OCSP_REVOKED_STATUS_SUPERSEDED              4
-#define OCSP_REVOKED_STATUS_CESSATIONOFOPERATION    5
-#define OCSP_REVOKED_STATUS_CERTIFICATEHOLD         6
-#define OCSP_REVOKED_STATUS_REMOVEFROMCRL           8
-
-/* CrlID ::= SEQUENCE {
- *     crlUrl               [0]     EXPLICIT IA5String OPTIONAL,
- *     crlNum               [1]     EXPLICIT INTEGER OPTIONAL,
- *     crlTime              [2]     EXPLICIT GeneralizedTime OPTIONAL }
- */
-typedef struct ocsp_crl_id_st
-        {
-	ASN1_IA5STRING *crlUrl;
-	ASN1_INTEGER *crlNum;
-	ASN1_GENERALIZEDTIME *crlTime;
-        } OCSP_CRLID;
-
-/* ServiceLocator ::= SEQUENCE {
- *      issuer    Name,
- *      locator   AuthorityInfoAccessSyntax OPTIONAL }
- */
-typedef struct ocsp_service_locator_st
-        {
-	X509_NAME* issuer;
-	STACK_OF(ACCESS_DESCRIPTION) *locator;
-        } OCSP_SERVICELOC;
- 
-#define PEM_STRING_OCSP_REQUEST	"OCSP REQUEST"
-#define PEM_STRING_OCSP_RESPONSE "OCSP RESPONSE"
-
-#define d2i_OCSP_REQUEST_bio(bp,p) ASN1_d2i_bio_of(OCSP_REQUEST,OCSP_REQUEST_new,d2i_OCSP_REQUEST,bp,p)
-
-#define d2i_OCSP_RESPONSE_bio(bp,p) ASN1_d2i_bio_of(OCSP_RESPONSE,OCSP_RESPONSE_new,d2i_OCSP_RESPONSE,bp,p)
-
-#define	PEM_read_bio_OCSP_REQUEST(bp,x,cb) (OCSP_REQUEST *)PEM_ASN1_read_bio( \
-     (char *(*)())d2i_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,bp,(char **)x,cb,NULL)
-
-#define	PEM_read_bio_OCSP_RESPONSE(bp,x,cb)(OCSP_RESPONSE *)PEM_ASN1_read_bio(\
-     (char *(*)())d2i_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,bp,(char **)x,cb,NULL)
-
-#define PEM_write_bio_OCSP_REQUEST(bp,o) \
-    PEM_ASN1_write_bio((int (*)())i2d_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,\
-			bp,(char *)o, NULL,NULL,0,NULL,NULL)
-
-#define PEM_write_bio_OCSP_RESPONSE(bp,o) \
-    PEM_ASN1_write_bio((int (*)())i2d_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,\
-			bp,(char *)o, NULL,NULL,0,NULL,NULL)
-
-#define i2d_OCSP_RESPONSE_bio(bp,o) ASN1_i2d_bio_of(OCSP_RESPONSE,i2d_OCSP_RESPONSE,bp,o)
-
-#define i2d_OCSP_REQUEST_bio(bp,o) ASN1_i2d_bio_of(OCSP_REQUEST,i2d_OCSP_REQUEST,bp,o)
-
-#define OCSP_REQUEST_sign(o,pkey,md) \
-	ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO),\
-		o->optionalSignature->signatureAlgorithm,NULL,\
-	        o->optionalSignature->signature,o->tbsRequest,pkey,md)
-
-#define OCSP_BASICRESP_sign(o,pkey,md,d) \
-	ASN1_item_sign(ASN1_ITEM_rptr(OCSP_RESPDATA),o->signatureAlgorithm,NULL,\
-		o->signature,o->tbsResponseData,pkey,md)
-
-#define OCSP_REQUEST_verify(a,r) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_REQINFO),\
-        a->optionalSignature->signatureAlgorithm,\
-	a->optionalSignature->signature,a->tbsRequest,r)
-
-#define OCSP_BASICRESP_verify(a,r,d) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_RESPDATA),\
-	a->signatureAlgorithm,a->signature,a->tbsResponseData,r)
-
-#define ASN1_BIT_STRING_digest(data,type,md,len) \
-	ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len)
-
-#define OCSP_CERTSTATUS_dup(cs)\
-                (OCSP_CERTSTATUS*)ASN1_dup((int(*)())i2d_OCSP_CERTSTATUS,\
-		(char *(*)())d2i_OCSP_CERTSTATUS,(char *)(cs))
-
-OCSP_CERTID *OCSP_CERTID_dup(OCSP_CERTID *id);
-
-OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req);
-OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req,
-								int maxline);
-int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx);
-void OCSP_REQ_CTX_free(OCSP_REQ_CTX *rctx);
-int OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req);
-int OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx,
-		const char *name, const char *value);
-
-OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
-
-OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst, 
-			      X509_NAME *issuerName, 
-			      ASN1_BIT_STRING* issuerKey, 
-			      ASN1_INTEGER *serialNumber);
-
-OCSP_ONEREQ *OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid);
-
-int OCSP_request_add1_nonce(OCSP_REQUEST *req, unsigned char *val, int len);
-int OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len);
-int OCSP_check_nonce(OCSP_REQUEST *req, OCSP_BASICRESP *bs);
-int OCSP_copy_nonce(OCSP_BASICRESP *resp, OCSP_REQUEST *req);
-
-int OCSP_request_set1_name(OCSP_REQUEST *req, X509_NAME *nm);
-int OCSP_request_add1_cert(OCSP_REQUEST *req, X509 *cert);
-
-int OCSP_request_sign(OCSP_REQUEST   *req,
-		      X509           *signer,
-		      EVP_PKEY       *key,
-		      const EVP_MD   *dgst,
-		      STACK_OF(X509) *certs,
-		      unsigned long flags);
-
-int OCSP_response_status(OCSP_RESPONSE *resp);
-OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp);
-
-int OCSP_resp_count(OCSP_BASICRESP *bs);
-OCSP_SINGLERESP *OCSP_resp_get0(OCSP_BASICRESP *bs, int idx);
-int OCSP_resp_find(OCSP_BASICRESP *bs, OCSP_CERTID *id, int last);
-int OCSP_single_get0_status(OCSP_SINGLERESP *single, int *reason,
-				ASN1_GENERALIZEDTIME **revtime,
-				ASN1_GENERALIZEDTIME **thisupd,
-				ASN1_GENERALIZEDTIME **nextupd);
-int OCSP_resp_find_status(OCSP_BASICRESP *bs, OCSP_CERTID *id, int *status,
-				int *reason,
-				ASN1_GENERALIZEDTIME **revtime,
-				ASN1_GENERALIZEDTIME **thisupd,
-				ASN1_GENERALIZEDTIME **nextupd);
-int OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd,
-			ASN1_GENERALIZEDTIME *nextupd,
-			long sec, long maxsec);
-
-int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs, X509_STORE *store, unsigned long flags);
-
-int OCSP_parse_url(char *url, char **phost, char **pport, char **ppath, int *pssl);
-
-int OCSP_id_issuer_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
-int OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
-
-int OCSP_request_onereq_count(OCSP_REQUEST *req);
-OCSP_ONEREQ *OCSP_request_onereq_get0(OCSP_REQUEST *req, int i);
-OCSP_CERTID *OCSP_onereq_get0_id(OCSP_ONEREQ *one);
-int OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd,
-			ASN1_OCTET_STRING **pikeyHash,
-			ASN1_INTEGER **pserial, OCSP_CERTID *cid);
-int OCSP_request_is_signed(OCSP_REQUEST *req);
-OCSP_RESPONSE *OCSP_response_create(int status, OCSP_BASICRESP *bs);
-OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
-						OCSP_CERTID *cid,
-						int status, int reason,
-						ASN1_TIME *revtime,
-					ASN1_TIME *thisupd, ASN1_TIME *nextupd);
-int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert);
-int OCSP_basic_sign(OCSP_BASICRESP *brsp, 
-			X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
-			STACK_OF(X509) *certs, unsigned long flags);
-
-X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
-
-X509_EXTENSION *OCSP_accept_responses_new(char **oids);
-
-X509_EXTENSION *OCSP_archive_cutoff_new(char* tim);
-
-X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME* issuer, char **urls);
-
-int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x);
-int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos);
-int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, ASN1_OBJECT *obj, int lastpos);
-int OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos);
-X509_EXTENSION *OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc);
-X509_EXTENSION *OCSP_REQUEST_delete_ext(OCSP_REQUEST *x, int loc);
-void *OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit, int *idx);
-int OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,
-							unsigned long flags);
-int OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc);
-
-int OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x);
-int OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos);
-int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, ASN1_OBJECT *obj, int lastpos);
-int OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos);
-X509_EXTENSION *OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc);
-X509_EXTENSION *OCSP_ONEREQ_delete_ext(OCSP_ONEREQ *x, int loc);
-void *OCSP_ONEREQ_get1_ext_d2i(OCSP_ONEREQ *x, int nid, int *crit, int *idx);
-int OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit,
-							unsigned long flags);
-int OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc);
-
-int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x);
-int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos);
-int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, ASN1_OBJECT *obj, int lastpos);
-int OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit, int lastpos);
-X509_EXTENSION *OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc);
-X509_EXTENSION *OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc);
-void *OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit, int *idx);
-int OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value, int crit,
-							unsigned long flags);
-int OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc);
-
-int OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x);
-int OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, int lastpos);
-int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, ASN1_OBJECT *obj, int lastpos);
-int OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit, int lastpos);
-X509_EXTENSION *OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc);
-X509_EXTENSION *OCSP_SINGLERESP_delete_ext(OCSP_SINGLERESP *x, int loc);
-void *OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit, int *idx);
-int OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value, int crit,
-							unsigned long flags);
-int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc);
-
-DECLARE_ASN1_FUNCTIONS(OCSP_SINGLERESP)
-DECLARE_ASN1_FUNCTIONS(OCSP_CERTSTATUS)
-DECLARE_ASN1_FUNCTIONS(OCSP_REVOKEDINFO)
-DECLARE_ASN1_FUNCTIONS(OCSP_BASICRESP)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPDATA)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPONSE)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPBYTES)
-DECLARE_ASN1_FUNCTIONS(OCSP_ONEREQ)
-DECLARE_ASN1_FUNCTIONS(OCSP_CERTID)
-DECLARE_ASN1_FUNCTIONS(OCSP_REQUEST)
-DECLARE_ASN1_FUNCTIONS(OCSP_SIGNATURE)
-DECLARE_ASN1_FUNCTIONS(OCSP_REQINFO)
-DECLARE_ASN1_FUNCTIONS(OCSP_CRLID)
-DECLARE_ASN1_FUNCTIONS(OCSP_SERVICELOC)
-
-const char *OCSP_response_status_str(long s);
-const char *OCSP_cert_status_str(long s);
-const char *OCSP_crl_reason_str(long s);
-
-int OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST* a, unsigned long flags);
-int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags);
-
-int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
-				X509_STORE *st, unsigned long flags);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_OCSP_strings(void);
-
-/* Error codes for the OCSP functions. */
-
-/* Function codes. */
-#define OCSP_F_ASN1_STRING_ENCODE			 100
-#define OCSP_F_D2I_OCSP_NONCE				 102
-#define OCSP_F_OCSP_BASIC_ADD1_STATUS			 103
-#define OCSP_F_OCSP_BASIC_SIGN				 104
-#define OCSP_F_OCSP_BASIC_VERIFY			 105
-#define OCSP_F_OCSP_CERT_ID_NEW				 101
-#define OCSP_F_OCSP_CHECK_DELEGATED			 106
-#define OCSP_F_OCSP_CHECK_IDS				 107
-#define OCSP_F_OCSP_CHECK_ISSUER			 108
-#define OCSP_F_OCSP_CHECK_VALIDITY			 115
-#define OCSP_F_OCSP_MATCH_ISSUERID			 109
-#define OCSP_F_OCSP_PARSE_URL				 114
-#define OCSP_F_OCSP_REQUEST_SIGN			 110
-#define OCSP_F_OCSP_REQUEST_VERIFY			 116
-#define OCSP_F_OCSP_RESPONSE_GET1_BASIC			 111
-#define OCSP_F_OCSP_SENDREQ_BIO				 112
-#define OCSP_F_OCSP_SENDREQ_NBIO			 117
-#define OCSP_F_PARSE_HTTP_LINE1				 118
-#define OCSP_F_REQUEST_VERIFY				 113
-
-/* Reason codes. */
-#define OCSP_R_BAD_DATA					 100
-#define OCSP_R_CERTIFICATE_VERIFY_ERROR			 101
-#define OCSP_R_DIGEST_ERR				 102
-#define OCSP_R_ERROR_IN_NEXTUPDATE_FIELD		 122
-#define OCSP_R_ERROR_IN_THISUPDATE_FIELD		 123
-#define OCSP_R_ERROR_PARSING_URL			 121
-#define OCSP_R_MISSING_OCSPSIGNING_USAGE		 103
-#define OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE		 124
-#define OCSP_R_NOT_BASIC_RESPONSE			 104
-#define OCSP_R_NO_CERTIFICATES_IN_CHAIN			 105
-#define OCSP_R_NO_CONTENT				 106
-#define OCSP_R_NO_PUBLIC_KEY				 107
-#define OCSP_R_NO_RESPONSE_DATA				 108
-#define OCSP_R_NO_REVOKED_TIME				 109
-#define OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE	 110
-#define OCSP_R_REQUEST_NOT_SIGNED			 128
-#define OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA	 111
-#define OCSP_R_ROOT_CA_NOT_TRUSTED			 112
-#define OCSP_R_SERVER_READ_ERROR			 113
-#define OCSP_R_SERVER_RESPONSE_ERROR			 114
-#define OCSP_R_SERVER_RESPONSE_PARSE_ERROR		 115
-#define OCSP_R_SERVER_WRITE_ERROR			 116
-#define OCSP_R_SIGNATURE_FAILURE			 117
-#define OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND		 118
-#define OCSP_R_STATUS_EXPIRED				 125
-#define OCSP_R_STATUS_NOT_YET_VALID			 126
-#define OCSP_R_STATUS_TOO_OLD				 127
-#define OCSP_R_UNKNOWN_MESSAGE_DIGEST			 119
-#define OCSP_R_UNKNOWN_NID				 120
-#define OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE		 129
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/opensslconf.h b/dep/include/openssl/opensslconf.h
deleted file mode 100644
index c348a63d8..000000000
--- a/dep/include/openssl/opensslconf.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* OpenSSL was configured with the following options: */
-#ifndef OPENSSL_SYSNAME_WIN32
-# define OPENSSL_SYSNAME_WIN32
-#endif
-#ifndef OPENSSL_DOING_MAKEDEPEND
-
-
-#ifndef OPENSSL_NO_GMP
-# define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_JPAKE
-# define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
-# define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
-# define OPENSSL_NO_MD2
-#endif
-#ifndef OPENSSL_NO_RC5
-# define OPENSSL_NO_RC5
-#endif
-#ifndef OPENSSL_NO_RFC3779
-# define OPENSSL_NO_RFC3779
-#endif
-#ifndef OPENSSL_NO_STORE
-# define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
-
-#ifndef OPENSSL_THREADS
-# define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_ASM
-# define OPENSSL_NO_ASM
-#endif
-
-/* The OPENSSL_NO_* macros are also defined as NO_* if the application
-   asks for it.  This is a transient feature that is provided for those
-   who haven't had the time to do the appropriate changes in their
-   applications.  */
-#ifdef OPENSSL_ALGORITHM_DEFINES
-# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
-#  define NO_GMP
-# endif
-# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
-#  define NO_JPAKE
-# endif
-# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
-#  define NO_KRB5
-# endif
-# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
-#  define NO_MD2
-# endif
-# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
-#  define NO_RC5
-# endif
-# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
-#  define NO_RFC3779
-# endif
-# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
-#  define NO_STORE
-# endif
-#endif
-
-/* crypto/opensslconf.h.in */
-
-/* Generate 80386 code? */
-#undef I386_ONLY
-
-#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
-#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "c:\\openssl\\release/lib/engines"
-#define OPENSSLDIR "c:\\openssl\\release/ssl"
-#endif
-#endif
-
-#undef OPENSSL_UNISTD
-#define OPENSSL_UNISTD <unistd.h>
-
-#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
-#define OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
-#define IDEA_INT unsigned int
-#endif
-
-#if defined(HEADER_MD2_H) && !defined(MD2_INT)
-#define MD2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC2_H) && !defined(RC2_INT)
-/* I need to put in a mod for the alpha - eay */
-#define RC2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC4_H)
-#if !defined(RC4_INT)
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
-/*
- * I don't know what does "most" mean, but declaring "int" is a must on:
- * - Intel P6 because partial register stalls are very expensive;
- * - elder Alpha because it lacks byte load/store instructions;
- */
-#define RC4_INT unsigned int
-#endif
-#if !defined(RC4_CHUNK)
-/*
- * This enables code handling data aligned at natural CPU word
- * boundary. See crypto/rc4/rc4_enc.c for further details.
- */
-#undef RC4_CHUNK
-#endif
-#endif
-
-#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
-/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
- * %20 speed up (longs are 8 bytes, int's are 4). */
-#ifndef DES_LONG
-#define DES_LONG unsigned long
-#endif
-#endif
-
-#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
-#define CONFIG_HEADER_BN_H
-#define BN_LLONG
-
-/* Should we define BN_DIV2W here? */
-
-/* Only one for the following should be defined */
-#undef SIXTY_FOUR_BIT_LONG
-#undef SIXTY_FOUR_BIT
-#define THIRTY_TWO_BIT
-#endif
-
-#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-#define CONFIG_HEADER_RC4_LOCL_H
-/* if this is defined data[i] is used instead of *data, this is a %20
- * speedup on x86 */
-#define RC4_INDEX
-#endif
-
-#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-#define CONFIG_HEADER_BF_LOCL_H
-#undef BF_PTR
-#endif /* HEADER_BF_LOCL_H */
-
-#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-#define CONFIG_HEADER_DES_LOCL_H
-#ifndef DES_DEFAULT_OPTIONS
-/* the following is tweaked from a config script, that is why it is a
- * protected undef/define */
-#ifndef DES_PTR
-#undef DES_PTR
-#endif
-
-/* This helps C compiler generate the correct code for multiple functional
- * units.  It reduces register dependancies at the expense of 2 more
- * registers */
-#ifndef DES_RISC1
-#undef DES_RISC1
-#endif
-
-#ifndef DES_RISC2
-#undef DES_RISC2
-#endif
-
-#if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
-#endif
-
-/* Unroll the inner loop, this sometimes helps, sometimes hinders.
- * Very mucy CPU dependant */
-#ifndef DES_UNROLL
-#undef DES_UNROLL
-#endif
-
-/* These default values were supplied by
- * Peter Gutman <pgut001@cs.auckland.ac.nz>
- * They are only used if nothing else has been defined */
-#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
-/* Special defines which change the way the code is built depending on the
-   CPU and OS.  For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
-   even newer MIPS CPU's, but at the moment one size fits all for
-   optimization options.  Older Sparc's work better with only UNROLL, but
-   there's no way to tell at compile time what it is you're running on */
- 
-#if defined( sun )		/* Newer Sparc's */
-#  define DES_PTR
-#  define DES_RISC1
-#  define DES_UNROLL
-#elif defined( __ultrix )	/* Older MIPS */
-#  define DES_PTR
-#  define DES_RISC2
-#  define DES_UNROLL
-#elif defined( __osf1__ )	/* Alpha */
-#  define DES_PTR
-#  define DES_RISC2
-#elif defined ( _AIX )		/* RS6000 */
-  /* Unknown */
-#elif defined( __hpux )		/* HP-PA */
-  /* Unknown */
-#elif defined( __aux )		/* 68K */
-  /* Unknown */
-#elif defined( __dgux )		/* 88K (but P6 in latest boxes) */
-#  define DES_UNROLL
-#elif defined( __sgi )		/* Newer MIPS */
-#  define DES_PTR
-#  define DES_RISC2
-#  define DES_UNROLL
-#elif defined(i386) || defined(__i386__)	/* x86 boxes, should be gcc */
-#  define DES_PTR
-#  define DES_RISC1
-#  define DES_UNROLL
-#endif /* Systems-specific speed defines */
-#endif
-
-#endif /* DES_DEFAULT_OPTIONS */
-#endif /* HEADER_DES_LOCL_H */
diff --git a/dep/include/openssl/opensslv.h b/dep/include/openssl/opensslv.h
deleted file mode 100644
index e7fca8345..000000000
--- a/dep/include/openssl/opensslv.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef HEADER_OPENSSLV_H
-#define HEADER_OPENSSLV_H
-
-/* Numeric release version identifier:
- * MNNFFPPS: major minor fix patch status
- * The status nibble has one of the values 0 for development, 1 to e for betas
- * 1 to 14, and f for release.  The patch level is exactly that.
- * For example:
- * 0.9.3-dev	  0x00903000
- * 0.9.3-beta1	  0x00903001
- * 0.9.3-beta2-dev 0x00903002
- * 0.9.3-beta2    0x00903002 (same as ...beta2-dev)
- * 0.9.3	  0x0090300f
- * 0.9.3a	  0x0090301f
- * 0.9.4 	  0x0090400f
- * 1.2.3z	  0x102031af
- *
- * For continuity reasons (because 0.9.5 is already out, and is coded
- * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level
- * part is slightly different, by setting the highest bit.  This means
- * that 0.9.5a looks like this: 0x0090581f.  At 0.9.6, we can start
- * with 0x0090600S...
- *
- * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.)
- * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
- *  major minor fix final patch/beta)
- */
-#define OPENSSL_VERSION_NUMBER	0x1000004fL
-#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0d-fips 8 Feb 2011"
-#else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0d 8 Feb 2011"
-#endif
-#define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
-
-
-/* The macros below are to be used for shared library (.so, .dll, ...)
- * versioning.  That kind of versioning works a bit differently between
- * operating systems.  The most usual scheme is to set a major and a minor
- * number, and have the runtime loader check that the major number is equal
- * to what it was at application link time, while the minor number has to
- * be greater or equal to what it was at application link time.  With this
- * scheme, the version number is usually part of the file name, like this:
- *
- *	libcrypto.so.0.9
- *
- * Some unixen also make a softlink with the major verson number only:
- *
- *	libcrypto.so.0
- *
- * On Tru64 and IRIX 6.x it works a little bit differently.  There, the
- * shared library version is stored in the file, and is actually a series
- * of versions, separated by colons.  The rightmost version present in the
- * library when linking an application is stored in the application to be
- * matched at run time.  When the application is run, a check is done to
- * see if the library version stored in the application matches any of the
- * versions in the version string of the library itself.
- * This version string can be constructed in any way, depending on what
- * kind of matching is desired.  However, to implement the same scheme as
- * the one used in the other unixen, all compatible versions, from lowest
- * to highest, should be part of the string.  Consecutive builds would
- * give the following versions strings:
- *
- *	3.0
- *	3.0:3.1
- *	3.0:3.1:3.2
- *	4.0
- *	4.0:4.1
- *
- * Notice how version 4 is completely incompatible with version, and
- * therefore give the breach you can see.
- *
- * There may be other schemes as well that I haven't yet discovered.
- *
- * So, here's the way it works here: first of all, the library version
- * number doesn't need at all to match the overall OpenSSL version.
- * However, it's nice and more understandable if it actually does.
- * The current library version is stored in the macro SHLIB_VERSION_NUMBER,
- * which is just a piece of text in the format "M.m.e" (Major, minor, edit).
- * For the sake of Tru64, IRIX, and any other OS that behaves in similar ways,
- * we need to keep a history of version numbers, which is done in the
- * macro SHLIB_VERSION_HISTORY.  The numbers are separated by colons and
- * should only keep the versions that are binary compatible with the current.
- */
-#define SHLIB_VERSION_HISTORY ""
-#define SHLIB_VERSION_NUMBER "1.0.0"
-
-
-#endif /* HEADER_OPENSSLV_H */
diff --git a/dep/include/openssl/ossl_typ.h b/dep/include/openssl/ossl_typ.h
deleted file mode 100644
index 12bd7014d..000000000
--- a/dep/include/openssl/ossl_typ.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_OPENSSL_TYPES_H
-#define HEADER_OPENSSL_TYPES_H
-
-#include <openssl/e_os2.h>
-
-#ifdef NO_ASN1_TYPEDEFS
-#define ASN1_INTEGER		ASN1_STRING
-#define ASN1_ENUMERATED		ASN1_STRING
-#define ASN1_BIT_STRING		ASN1_STRING
-#define ASN1_OCTET_STRING	ASN1_STRING
-#define ASN1_PRINTABLESTRING	ASN1_STRING
-#define ASN1_T61STRING		ASN1_STRING
-#define ASN1_IA5STRING		ASN1_STRING
-#define ASN1_UTCTIME		ASN1_STRING
-#define ASN1_GENERALIZEDTIME	ASN1_STRING
-#define ASN1_TIME		ASN1_STRING
-#define ASN1_GENERALSTRING	ASN1_STRING
-#define ASN1_UNIVERSALSTRING	ASN1_STRING
-#define ASN1_BMPSTRING		ASN1_STRING
-#define ASN1_VISIBLESTRING	ASN1_STRING
-#define ASN1_UTF8STRING		ASN1_STRING
-#define ASN1_BOOLEAN		int
-#define ASN1_NULL		int
-#else
-typedef struct asn1_string_st ASN1_INTEGER;
-typedef struct asn1_string_st ASN1_ENUMERATED;
-typedef struct asn1_string_st ASN1_BIT_STRING;
-typedef struct asn1_string_st ASN1_OCTET_STRING;
-typedef struct asn1_string_st ASN1_PRINTABLESTRING;
-typedef struct asn1_string_st ASN1_T61STRING;
-typedef struct asn1_string_st ASN1_IA5STRING;
-typedef struct asn1_string_st ASN1_GENERALSTRING;
-typedef struct asn1_string_st ASN1_UNIVERSALSTRING;
-typedef struct asn1_string_st ASN1_BMPSTRING;
-typedef struct asn1_string_st ASN1_UTCTIME;
-typedef struct asn1_string_st ASN1_TIME;
-typedef struct asn1_string_st ASN1_GENERALIZEDTIME;
-typedef struct asn1_string_st ASN1_VISIBLESTRING;
-typedef struct asn1_string_st ASN1_UTF8STRING;
-typedef int ASN1_BOOLEAN;
-typedef int ASN1_NULL;
-#endif
-
-typedef struct asn1_pctx_st ASN1_PCTX;
-
-#ifdef OPENSSL_SYS_WIN32
-#undef X509_NAME
-#undef X509_EXTENSIONS
-#undef X509_CERT_PAIR
-#undef PKCS7_ISSUER_AND_SERIAL
-#undef OCSP_REQUEST
-#undef OCSP_RESPONSE
-#endif
-
-#ifdef BIGNUM
-#undef BIGNUM
-#endif
-typedef struct bignum_st BIGNUM;
-typedef struct bignum_ctx BN_CTX;
-typedef struct bn_blinding_st BN_BLINDING;
-typedef struct bn_mont_ctx_st BN_MONT_CTX;
-typedef struct bn_recp_ctx_st BN_RECP_CTX;
-typedef struct bn_gencb_st BN_GENCB;
-
-typedef struct buf_mem_st BUF_MEM;
-
-typedef struct evp_cipher_st EVP_CIPHER;
-typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;
-typedef struct env_md_st EVP_MD;
-typedef struct env_md_ctx_st EVP_MD_CTX;
-typedef struct evp_pkey_st EVP_PKEY;
-
-typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD;
-
-typedef struct evp_pkey_method_st EVP_PKEY_METHOD;
-typedef struct evp_pkey_ctx_st EVP_PKEY_CTX;
-
-typedef struct dh_st DH;
-typedef struct dh_method DH_METHOD;
-
-typedef struct dsa_st DSA;
-typedef struct dsa_method DSA_METHOD;
-
-typedef struct rsa_st RSA;
-typedef struct rsa_meth_st RSA_METHOD;
-
-typedef struct rand_meth_st RAND_METHOD;
-
-typedef struct ecdh_method ECDH_METHOD;
-typedef struct ecdsa_method ECDSA_METHOD;
-
-typedef struct x509_st X509;
-typedef struct X509_algor_st X509_ALGOR;
-typedef struct X509_crl_st X509_CRL;
-typedef struct x509_crl_method_st X509_CRL_METHOD;
-typedef struct x509_revoked_st X509_REVOKED;
-typedef struct X509_name_st X509_NAME;
-typedef struct X509_pubkey_st X509_PUBKEY;
-typedef struct x509_store_st X509_STORE;
-typedef struct x509_store_ctx_st X509_STORE_CTX;
-
-typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO;
-
-typedef struct v3_ext_ctx X509V3_CTX;
-typedef struct conf_st CONF;
-
-typedef struct store_st STORE;
-typedef struct store_method_st STORE_METHOD;
-
-typedef struct ui_st UI;
-typedef struct ui_method_st UI_METHOD;
-
-typedef struct st_ERR_FNS ERR_FNS;
-
-typedef struct engine_st ENGINE;
-typedef struct ssl_st SSL;
-typedef struct ssl_ctx_st SSL_CTX;
-
-typedef struct X509_POLICY_NODE_st X509_POLICY_NODE;
-typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL;
-typedef struct X509_POLICY_TREE_st X509_POLICY_TREE;
-typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE;
-
-typedef struct AUTHORITY_KEYID_st AUTHORITY_KEYID;
-typedef struct DIST_POINT_st DIST_POINT;
-typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT;
-typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS;
-
-  /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */
-#define DECLARE_PKCS12_STACK_OF(type) /* Nothing */
-#define IMPLEMENT_PKCS12_STACK_OF(type) /* Nothing */
-
-typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
-/* Callback types for crypto.h */
-typedef int CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-					int idx, long argl, void *argp);
-typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-					int idx, long argl, void *argp);
-typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d, 
-					int idx, long argl, void *argp);
-
-typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
-typedef struct ocsp_response_st OCSP_RESPONSE;
-typedef struct ocsp_responder_id_st OCSP_RESPID;
-
-#endif /* def HEADER_OPENSSL_TYPES_H */
diff --git a/dep/include/openssl/pem.h b/dep/include/openssl/pem.h
deleted file mode 100644
index 8a6ababe3..000000000
--- a/dep/include/openssl/pem.h
+++ /dev/null
@@ -1,641 +0,0 @@
-/* crypto/pem/pem.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_PEM_H
-#define HEADER_PEM_H
-
-#include <openssl/e_os2.h>
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#ifndef OPENSSL_NO_STACK
-#include <openssl/stack.h>
-#endif
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/pem2.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#define PEM_BUFSIZE		1024
-
-#define PEM_OBJ_UNDEF		0
-#define PEM_OBJ_X509		1
-#define PEM_OBJ_X509_REQ	2
-#define PEM_OBJ_CRL		3
-#define PEM_OBJ_SSL_SESSION	4
-#define PEM_OBJ_PRIV_KEY	10
-#define PEM_OBJ_PRIV_RSA	11
-#define PEM_OBJ_PRIV_DSA	12
-#define PEM_OBJ_PRIV_DH		13
-#define PEM_OBJ_PUB_RSA		14
-#define PEM_OBJ_PUB_DSA		15
-#define PEM_OBJ_PUB_DH		16
-#define PEM_OBJ_DHPARAMS	17
-#define PEM_OBJ_DSAPARAMS	18
-#define PEM_OBJ_PRIV_RSA_PUBLIC	19
-#define PEM_OBJ_PRIV_ECDSA	20
-#define PEM_OBJ_PUB_ECDSA	21
-#define PEM_OBJ_ECPARAMETERS	22
-
-#define PEM_ERROR		30
-#define PEM_DEK_DES_CBC         40
-#define PEM_DEK_IDEA_CBC        45
-#define PEM_DEK_DES_EDE         50
-#define PEM_DEK_DES_ECB         60
-#define PEM_DEK_RSA             70
-#define PEM_DEK_RSA_MD2         80
-#define PEM_DEK_RSA_MD5         90
-
-#define PEM_MD_MD2		NID_md2
-#define PEM_MD_MD5		NID_md5
-#define PEM_MD_SHA		NID_sha
-#define PEM_MD_MD2_RSA		NID_md2WithRSAEncryption
-#define PEM_MD_MD5_RSA		NID_md5WithRSAEncryption
-#define PEM_MD_SHA_RSA		NID_sha1WithRSAEncryption
-
-#define PEM_STRING_X509_OLD	"X509 CERTIFICATE"
-#define PEM_STRING_X509		"CERTIFICATE"
-#define PEM_STRING_X509_PAIR	"CERTIFICATE PAIR"
-#define PEM_STRING_X509_TRUSTED	"TRUSTED CERTIFICATE"
-#define PEM_STRING_X509_REQ_OLD	"NEW CERTIFICATE REQUEST"
-#define PEM_STRING_X509_REQ	"CERTIFICATE REQUEST"
-#define PEM_STRING_X509_CRL	"X509 CRL"
-#define PEM_STRING_EVP_PKEY	"ANY PRIVATE KEY"
-#define PEM_STRING_PUBLIC	"PUBLIC KEY"
-#define PEM_STRING_RSA		"RSA PRIVATE KEY"
-#define PEM_STRING_RSA_PUBLIC	"RSA PUBLIC KEY"
-#define PEM_STRING_DSA		"DSA PRIVATE KEY"
-#define PEM_STRING_DSA_PUBLIC	"DSA PUBLIC KEY"
-#define PEM_STRING_PKCS7	"PKCS7"
-#define PEM_STRING_PKCS7_SIGNED	"PKCS #7 SIGNED DATA"
-#define PEM_STRING_PKCS8	"ENCRYPTED PRIVATE KEY"
-#define PEM_STRING_PKCS8INF	"PRIVATE KEY"
-#define PEM_STRING_DHPARAMS	"DH PARAMETERS"
-#define PEM_STRING_SSL_SESSION	"SSL SESSION PARAMETERS"
-#define PEM_STRING_DSAPARAMS	"DSA PARAMETERS"
-#define PEM_STRING_ECDSA_PUBLIC "ECDSA PUBLIC KEY"
-#define PEM_STRING_ECPARAMETERS "EC PARAMETERS"
-#define PEM_STRING_ECPRIVATEKEY	"EC PRIVATE KEY"
-#define PEM_STRING_PARAMETERS	"PARAMETERS"
-#define PEM_STRING_CMS		"CMS"
-
-  /* Note that this structure is initialised by PEM_SealInit and cleaned up
-     by PEM_SealFinal (at least for now) */
-typedef struct PEM_Encode_Seal_st
-	{
-	EVP_ENCODE_CTX encode;
-	EVP_MD_CTX md;
-	EVP_CIPHER_CTX cipher;
-	} PEM_ENCODE_SEAL_CTX;
-
-/* enc_type is one off */
-#define PEM_TYPE_ENCRYPTED      10
-#define PEM_TYPE_MIC_ONLY       20
-#define PEM_TYPE_MIC_CLEAR      30
-#define PEM_TYPE_CLEAR		40
-
-typedef struct pem_recip_st
-	{
-	char *name;
-	X509_NAME *dn;
-
-	int cipher;
-	int key_enc;
-	/*	char iv[8]; unused and wrong size */
-	} PEM_USER;
-
-typedef struct pem_ctx_st
-	{
-	int type;		/* what type of object */
-
-	struct	{
-		int version;	
-		int mode;		
-		} proc_type;
-
-	char *domain;
-
-	struct	{
-		int cipher;
-	/* unused, and wrong size
-	   unsigned char iv[8]; */
-		} DEK_info;
-		
-	PEM_USER *originator;
-
-	int num_recipient;
-	PEM_USER **recipient;
-
-	/* XXX(ben): don#t think this is used! 
-		STACK *x509_chain;	/ * certificate chain */
-	EVP_MD *md;		/* signature type */
-
-	int md_enc;		/* is the md encrypted or not? */
-	int md_len;		/* length of md_data */
-	char *md_data;		/* message digest, could be pkey encrypted */
-
-	EVP_CIPHER *dec;	/* date encryption cipher */
-	int key_len;		/* key length */
-	unsigned char *key;	/* key */
-	/* unused, and wrong size
-	   unsigned char iv[8]; */
-
-	
-	int  data_enc;		/* is the data encrypted */
-	int data_len;
-	unsigned char *data;
-	} PEM_CTX;
-
-/* These macros make the PEM_read/PEM_write functions easier to maintain and
- * write. Now they are all implemented with either:
- * IMPLEMENT_PEM_rw(...) or IMPLEMENT_PEM_rw_cb(...)
- */
-
-#ifdef OPENSSL_NO_FP_API
-
-#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/
-
-#else
-
-#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
-type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
-{ \
-return PEM_ASN1_read((d2i_of_void *)d2i_##asn1, str,fp,(void **)x,cb,u); \
-} 
-
-#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x) \
-{ \
-return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL); \
-}
-
-#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, const type *x) \
-{ \
-return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(void *)x,NULL,NULL,0,NULL,NULL); \
-}
-
-#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-	     unsigned char *kstr, int klen, pem_password_cb *cb, \
-		  void *u) \
-	{ \
-	return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u); \
-	}
-
-#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-	     unsigned char *kstr, int klen, pem_password_cb *cb, \
-		  void *u) \
-	{ \
-	return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u); \
-	}
-
-#endif
-
-#define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
-type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
-{ \
-return PEM_ASN1_read_bio((d2i_of_void *)d2i_##asn1, str,bp,(void **)x,cb,u); \
-}
-
-#define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x) \
-{ \
-return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL); \
-}
-
-#define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, const type *x) \
-{ \
-return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(void *)x,NULL,NULL,0,NULL,NULL); \
-}
-
-#define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
-	{ \
-	return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u); \
-	}
-
-#define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
-	{ \
-	return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(void *)x,enc,kstr,klen,cb,u); \
-	}
-
-#define IMPLEMENT_PEM_write(name, type, str, asn1) \
-	IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
-	IMPLEMENT_PEM_write_fp(name, type, str, asn1) 
-
-#define IMPLEMENT_PEM_write_const(name, type, str, asn1) \
-	IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
-	IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) 
-
-#define IMPLEMENT_PEM_write_cb(name, type, str, asn1) \
-	IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
-	IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) 
-
-#define IMPLEMENT_PEM_write_cb_const(name, type, str, asn1) \
-	IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
-	IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) 
-
-#define IMPLEMENT_PEM_read(name, type, str, asn1) \
-	IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
-	IMPLEMENT_PEM_read_fp(name, type, str, asn1) 
-
-#define IMPLEMENT_PEM_rw(name, type, str, asn1) \
-	IMPLEMENT_PEM_read(name, type, str, asn1) \
-	IMPLEMENT_PEM_write(name, type, str, asn1)
-
-#define IMPLEMENT_PEM_rw_const(name, type, str, asn1) \
-	IMPLEMENT_PEM_read(name, type, str, asn1) \
-	IMPLEMENT_PEM_write_const(name, type, str, asn1)
-
-#define IMPLEMENT_PEM_rw_cb(name, type, str, asn1) \
-	IMPLEMENT_PEM_read(name, type, str, asn1) \
-	IMPLEMENT_PEM_write_cb(name, type, str, asn1)
-
-/* These are the same except they are for the declarations */
-
-#if defined(OPENSSL_NO_FP_API)
-
-#define DECLARE_PEM_read_fp(name, type) /**/
-#define DECLARE_PEM_write_fp(name, type) /**/
-#define DECLARE_PEM_write_cb_fp(name, type) /**/
-
-#else
-
-#define DECLARE_PEM_read_fp(name, type) \
-	type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u);
-
-#define DECLARE_PEM_write_fp(name, type) \
-	int PEM_write_##name(FILE *fp, type *x);
-
-#define DECLARE_PEM_write_fp_const(name, type) \
-	int PEM_write_##name(FILE *fp, const type *x);
-
-#define DECLARE_PEM_write_cb_fp(name, type) \
-	int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
-
-#endif
-
-#ifndef OPENSSL_NO_BIO
-#define DECLARE_PEM_read_bio(name, type) \
-	type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u);
-
-#define DECLARE_PEM_write_bio(name, type) \
-	int PEM_write_bio_##name(BIO *bp, type *x);
-
-#define DECLARE_PEM_write_bio_const(name, type) \
-	int PEM_write_bio_##name(BIO *bp, const type *x);
-
-#define DECLARE_PEM_write_cb_bio(name, type) \
-	int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
-
-#else
-
-#define DECLARE_PEM_read_bio(name, type) /**/
-#define DECLARE_PEM_write_bio(name, type) /**/
-#define DECLARE_PEM_write_bio_const(name, type) /**/
-#define DECLARE_PEM_write_cb_bio(name, type) /**/
-
-#endif
-
-#define DECLARE_PEM_write(name, type) \
-	DECLARE_PEM_write_bio(name, type) \
-	DECLARE_PEM_write_fp(name, type) 
-
-#define DECLARE_PEM_write_const(name, type) \
-	DECLARE_PEM_write_bio_const(name, type) \
-	DECLARE_PEM_write_fp_const(name, type)
-
-#define DECLARE_PEM_write_cb(name, type) \
-	DECLARE_PEM_write_cb_bio(name, type) \
-	DECLARE_PEM_write_cb_fp(name, type) 
-
-#define DECLARE_PEM_read(name, type) \
-	DECLARE_PEM_read_bio(name, type) \
-	DECLARE_PEM_read_fp(name, type)
-
-#define DECLARE_PEM_rw(name, type) \
-	DECLARE_PEM_read(name, type) \
-	DECLARE_PEM_write(name, type)
-
-#define DECLARE_PEM_rw_const(name, type) \
-	DECLARE_PEM_read(name, type) \
-	DECLARE_PEM_write_const(name, type)
-
-#define DECLARE_PEM_rw_cb(name, type) \
-	DECLARE_PEM_read(name, type) \
-	DECLARE_PEM_write_cb(name, type)
-
-#if 1
-/* "userdata": new with OpenSSL 0.9.4 */
-typedef int pem_password_cb(char *buf, int size, int rwflag, void *userdata);
-#else
-/* OpenSSL 0.9.3, 0.9.3a */
-typedef int pem_password_cb(char *buf, int size, int rwflag);
-#endif
-
-int	PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher);
-int	PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data,long *len,
-	pem_password_cb *callback,void *u);
-
-#ifndef OPENSSL_NO_BIO
-int	PEM_read_bio(BIO *bp, char **name, char **header,
-		unsigned char **data,long *len);
-int	PEM_write_bio(BIO *bp,const char *name,char *hdr,unsigned char *data,
-		long len);
-int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, const char *name, BIO *bp,
-	     pem_password_cb *cb, void *u);
-void *	PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
-			  void **x, pem_password_cb *cb, void *u);
-int	PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp, void *x,
-			   const EVP_CIPHER *enc,unsigned char *kstr,int klen,
-			   pem_password_cb *cb, void *u);
-
-STACK_OF(X509_INFO) *	PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u);
-int	PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,
-		unsigned char *kstr, int klen, pem_password_cb *cd, void *u);
-#endif
-
-int	PEM_read(FILE *fp, char **name, char **header,
-		unsigned char **data,long *len);
-int	PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len);
-void *  PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
-		      pem_password_cb *cb, void *u);
-int	PEM_ASN1_write(i2d_of_void *i2d,const char *name,FILE *fp,
-		       void *x,const EVP_CIPHER *enc,unsigned char *kstr,
-		       int klen,pem_password_cb *callback, void *u);
-STACK_OF(X509_INFO) *	PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
-	pem_password_cb *cb, void *u);
-
-int	PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,
-		EVP_MD *md_type, unsigned char **ek, int *ekl,
-		unsigned char *iv, EVP_PKEY **pubk, int npubk);
-void	PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl,
-		unsigned char *in, int inl);
-int	PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig,int *sigl,
-		unsigned char *out, int *outl, EVP_PKEY *priv);
-
-void    PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type);
-void    PEM_SignUpdate(EVP_MD_CTX *ctx,unsigned char *d,unsigned int cnt);
-int	PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
-		unsigned int *siglen, EVP_PKEY *pkey);
-
-int	PEM_def_callback(char *buf, int num, int w, void *key);
-void	PEM_proc_type(char *buf, int type);
-void	PEM_dek_info(char *buf, const char *type, int len, char *str);
-
-
-#include <openssl/symhacks.h>
-
-DECLARE_PEM_rw(X509, X509)
-
-DECLARE_PEM_rw(X509_AUX, X509)
-
-DECLARE_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR)
-
-DECLARE_PEM_rw(X509_REQ, X509_REQ)
-DECLARE_PEM_write(X509_REQ_NEW, X509_REQ)
-
-DECLARE_PEM_rw(X509_CRL, X509_CRL)
-
-DECLARE_PEM_rw(PKCS7, PKCS7)
-
-DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
-
-DECLARE_PEM_rw(PKCS8, X509_SIG)
-
-DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
-
-#ifndef OPENSSL_NO_RSA
-
-DECLARE_PEM_rw_cb(RSAPrivateKey, RSA)
-
-DECLARE_PEM_rw_const(RSAPublicKey, RSA)
-DECLARE_PEM_rw(RSA_PUBKEY, RSA)
-
-#endif
-
-#ifndef OPENSSL_NO_DSA
-
-DECLARE_PEM_rw_cb(DSAPrivateKey, DSA)
-
-DECLARE_PEM_rw(DSA_PUBKEY, DSA)
-
-DECLARE_PEM_rw_const(DSAparams, DSA)
-
-#endif
-
-#ifndef OPENSSL_NO_EC
-DECLARE_PEM_rw_const(ECPKParameters, EC_GROUP)
-DECLARE_PEM_rw_cb(ECPrivateKey, EC_KEY)
-DECLARE_PEM_rw(EC_PUBKEY, EC_KEY)
-#endif
-
-#ifndef OPENSSL_NO_DH
-
-DECLARE_PEM_rw_const(DHparams, DH)
-
-#endif
-
-DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY)
-
-DECLARE_PEM_rw(PUBKEY, EVP_PKEY)
-
-int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid,
-				  char *kstr, int klen,
-				  pem_password_cb *cb, void *u);
-int PEM_write_bio_PKCS8PrivateKey(BIO *, EVP_PKEY *, const EVP_CIPHER *,
-                                  char *, int, pem_password_cb *, void *);
-int i2d_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
-				  char *kstr, int klen,
-				  pem_password_cb *cb, void *u);
-int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid,
-				  char *kstr, int klen,
-				  pem_password_cb *cb, void *u);
-EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u);
-
-int i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
-				  char *kstr, int klen,
-				  pem_password_cb *cb, void *u);
-int i2d_PKCS8PrivateKey_nid_fp(FILE *fp, EVP_PKEY *x, int nid,
-				  char *kstr, int klen,
-				  pem_password_cb *cb, void *u);
-int PEM_write_PKCS8PrivateKey_nid(FILE *fp, EVP_PKEY *x, int nid,
-				  char *kstr, int klen,
-				  pem_password_cb *cb, void *u);
-
-EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u);
-
-int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc,
-			      char *kstr,int klen, pem_password_cb *cd, void *u);
-
-EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x);
-int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x);
-
-
-EVP_PKEY *b2i_PrivateKey(const unsigned char **in, long length);
-EVP_PKEY *b2i_PublicKey(const unsigned char **in, long length);
-EVP_PKEY *b2i_PrivateKey_bio(BIO *in);
-EVP_PKEY *b2i_PublicKey_bio(BIO *in);
-int i2b_PrivateKey_bio(BIO *out, EVP_PKEY *pk);
-int i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk);
-#ifndef OPENSSL_NO_RC4
-EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u);
-int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,
-		pem_password_cb *cb, void *u);
-#endif
-
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_PEM_strings(void);
-
-/* Error codes for the PEM functions. */
-
-/* Function codes. */
-#define PEM_F_B2I_DSS					 127
-#define PEM_F_B2I_PVK_BIO				 128
-#define PEM_F_B2I_RSA					 129
-#define PEM_F_CHECK_BITLEN_DSA				 130
-#define PEM_F_CHECK_BITLEN_RSA				 131
-#define PEM_F_D2I_PKCS8PRIVATEKEY_BIO			 120
-#define PEM_F_D2I_PKCS8PRIVATEKEY_FP			 121
-#define PEM_F_DO_B2I					 132
-#define PEM_F_DO_B2I_BIO				 133
-#define PEM_F_DO_BLOB_HEADER				 134
-#define PEM_F_DO_PK8PKEY				 126
-#define PEM_F_DO_PK8PKEY_FP				 125
-#define PEM_F_DO_PVK_BODY				 135
-#define PEM_F_DO_PVK_HEADER				 136
-#define PEM_F_I2B_PVK					 137
-#define PEM_F_I2B_PVK_BIO				 138
-#define PEM_F_LOAD_IV					 101
-#define PEM_F_PEM_ASN1_READ				 102
-#define PEM_F_PEM_ASN1_READ_BIO				 103
-#define PEM_F_PEM_ASN1_WRITE				 104
-#define PEM_F_PEM_ASN1_WRITE_BIO			 105
-#define PEM_F_PEM_DEF_CALLBACK				 100
-#define PEM_F_PEM_DO_HEADER				 106
-#define PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY		 118
-#define PEM_F_PEM_GET_EVP_CIPHER_INFO			 107
-#define PEM_F_PEM_PK8PKEY				 119
-#define PEM_F_PEM_READ					 108
-#define PEM_F_PEM_READ_BIO				 109
-#define PEM_F_PEM_READ_BIO_PARAMETERS			 140
-#define PEM_F_PEM_READ_BIO_PRIVATEKEY			 123
-#define PEM_F_PEM_READ_PRIVATEKEY			 124
-#define PEM_F_PEM_SEALFINAL				 110
-#define PEM_F_PEM_SEALINIT				 111
-#define PEM_F_PEM_SIGNFINAL				 112
-#define PEM_F_PEM_WRITE					 113
-#define PEM_F_PEM_WRITE_BIO				 114
-#define PEM_F_PEM_WRITE_PRIVATEKEY			 139
-#define PEM_F_PEM_X509_INFO_READ			 115
-#define PEM_F_PEM_X509_INFO_READ_BIO			 116
-#define PEM_F_PEM_X509_INFO_WRITE_BIO			 117
-
-/* Reason codes. */
-#define PEM_R_BAD_BASE64_DECODE				 100
-#define PEM_R_BAD_DECRYPT				 101
-#define PEM_R_BAD_END_LINE				 102
-#define PEM_R_BAD_IV_CHARS				 103
-#define PEM_R_BAD_MAGIC_NUMBER				 116
-#define PEM_R_BAD_PASSWORD_READ				 104
-#define PEM_R_BAD_VERSION_NUMBER			 117
-#define PEM_R_BIO_WRITE_FAILURE				 118
-#define PEM_R_CIPHER_IS_NULL				 127
-#define PEM_R_ERROR_CONVERTING_PRIVATE_KEY		 115
-#define PEM_R_EXPECTING_PRIVATE_KEY_BLOB		 119
-#define PEM_R_EXPECTING_PUBLIC_KEY_BLOB			 120
-#define PEM_R_INCONSISTENT_HEADER			 121
-#define PEM_R_KEYBLOB_HEADER_PARSE_ERROR		 122
-#define PEM_R_KEYBLOB_TOO_SHORT				 123
-#define PEM_R_NOT_DEK_INFO				 105
-#define PEM_R_NOT_ENCRYPTED				 106
-#define PEM_R_NOT_PROC_TYPE				 107
-#define PEM_R_NO_START_LINE				 108
-#define PEM_R_PROBLEMS_GETTING_PASSWORD			 109
-#define PEM_R_PUBLIC_KEY_NO_RSA				 110
-#define PEM_R_PVK_DATA_TOO_SHORT			 124
-#define PEM_R_PVK_TOO_SHORT				 125
-#define PEM_R_READ_KEY					 111
-#define PEM_R_SHORT_HEADER				 112
-#define PEM_R_UNSUPPORTED_CIPHER			 113
-#define PEM_R_UNSUPPORTED_ENCRYPTION			 114
-#define PEM_R_UNSUPPORTED_KEY_COMPONENTS		 126
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/pem2.h b/dep/include/openssl/pem2.h
deleted file mode 100644
index f31790d69..000000000
--- a/dep/include/openssl/pem2.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/*
- * This header only exists to break a circular dependency between pem and err
- * Ben 30 Jan 1999.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef HEADER_PEM_H
-void ERR_load_PEM_strings(void);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/dep/include/openssl/pkcs12.h b/dep/include/openssl/pkcs12.h
deleted file mode 100644
index b17eb9f42..000000000
--- a/dep/include/openssl/pkcs12.h
+++ /dev/null
@@ -1,331 +0,0 @@
-/* pkcs12.h */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_PKCS12_H
-#define HEADER_PKCS12_H
-
-#include <openssl/bio.h>
-#include <openssl/x509.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define PKCS12_KEY_ID	1
-#define PKCS12_IV_ID	2
-#define PKCS12_MAC_ID	3
-
-/* Default iteration count */
-#ifndef PKCS12_DEFAULT_ITER
-#define PKCS12_DEFAULT_ITER	PKCS5_DEFAULT_ITER
-#endif
-
-#define PKCS12_MAC_KEY_LENGTH 20
-
-#define PKCS12_SALT_LEN	8
-
-/* Uncomment out next line for unicode password and names, otherwise ASCII */
-
-/*#define PBE_UNICODE*/
-
-#ifdef PBE_UNICODE
-#define PKCS12_key_gen PKCS12_key_gen_uni
-#define PKCS12_add_friendlyname PKCS12_add_friendlyname_uni
-#else
-#define PKCS12_key_gen PKCS12_key_gen_asc
-#define PKCS12_add_friendlyname PKCS12_add_friendlyname_asc
-#endif
-
-/* MS key usage constants */
-
-#define KEY_EX	0x10
-#define KEY_SIG 0x80
-
-typedef struct {
-X509_SIG *dinfo;
-ASN1_OCTET_STRING *salt;
-ASN1_INTEGER *iter;	/* defaults to 1 */
-} PKCS12_MAC_DATA;
-
-typedef struct {
-ASN1_INTEGER *version;
-PKCS12_MAC_DATA *mac;
-PKCS7 *authsafes;
-} PKCS12;
-
-typedef struct {
-ASN1_OBJECT *type;
-union {
-	struct pkcs12_bag_st *bag; /* secret, crl and certbag */
-	struct pkcs8_priv_key_info_st	*keybag; /* keybag */
-	X509_SIG *shkeybag; /* shrouded key bag */
-	STACK_OF(PKCS12_SAFEBAG) *safes;
-	ASN1_TYPE *other;
-}value;
-STACK_OF(X509_ATTRIBUTE) *attrib;
-} PKCS12_SAFEBAG;
-
-DECLARE_STACK_OF(PKCS12_SAFEBAG)
-DECLARE_ASN1_SET_OF(PKCS12_SAFEBAG)
-DECLARE_PKCS12_STACK_OF(PKCS12_SAFEBAG)
-
-typedef struct pkcs12_bag_st {
-ASN1_OBJECT *type;
-union {
-	ASN1_OCTET_STRING *x509cert;
-	ASN1_OCTET_STRING *x509crl;
-	ASN1_OCTET_STRING *octet;
-	ASN1_IA5STRING *sdsicert;
-	ASN1_TYPE *other; /* Secret or other bag */
-}value;
-} PKCS12_BAGS;
-
-#define PKCS12_ERROR	0
-#define PKCS12_OK	1
-
-/* Compatibility macros */
-
-#define M_PKCS12_x5092certbag PKCS12_x5092certbag
-#define M_PKCS12_x509crl2certbag PKCS12_x509crl2certbag
-
-#define M_PKCS12_certbag2x509 PKCS12_certbag2x509
-#define M_PKCS12_certbag2x509crl PKCS12_certbag2x509crl 
-
-#define M_PKCS12_unpack_p7data PKCS12_unpack_p7data
-#define M_PKCS12_pack_authsafes PKCS12_pack_authsafes
-#define M_PKCS12_unpack_authsafes PKCS12_unpack_authsafes
-#define M_PKCS12_unpack_p7encdata PKCS12_unpack_p7encdata
-
-#define M_PKCS12_decrypt_skey PKCS12_decrypt_skey
-#define M_PKCS8_decrypt PKCS8_decrypt
-
-#define M_PKCS12_bag_type(bg) OBJ_obj2nid((bg)->type)
-#define M_PKCS12_cert_bag_type(bg) OBJ_obj2nid((bg)->value.bag->type)
-#define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type
-
-#define PKCS12_get_attr(bag, attr_nid) \
-			 PKCS12_get_attr_gen(bag->attrib, attr_nid)
-
-#define PKCS8_get_attr(p8, attr_nid) \
-		PKCS12_get_attr_gen(p8->attributes, attr_nid)
-
-#define PKCS12_mac_present(p12) ((p12)->mac ? 1 : 0)
-
-
-PKCS12_SAFEBAG *PKCS12_x5092certbag(X509 *x509);
-PKCS12_SAFEBAG *PKCS12_x509crl2certbag(X509_CRL *crl);
-X509 *PKCS12_certbag2x509(PKCS12_SAFEBAG *bag);
-X509_CRL *PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag);
-
-PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it, int nid1,
-	     int nid2);
-PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8);
-PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen);
-PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag, const char *pass,
-								int passlen);
-X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, 
-			const char *pass, int passlen,
-			unsigned char *salt, int saltlen, int iter,
-			PKCS8_PRIV_KEY_INFO *p8);
-PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG(int pbe_nid, const char *pass,
-				     int passlen, unsigned char *salt,
-				     int saltlen, int iter,
-				     PKCS8_PRIV_KEY_INFO *p8);
-PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk);
-STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7);
-PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
-			     unsigned char *salt, int saltlen, int iter,
-			     STACK_OF(PKCS12_SAFEBAG) *bags);
-STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass, int passlen);
-
-int PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes);
-STACK_OF(PKCS7) *PKCS12_unpack_authsafes(PKCS12 *p12);
-
-int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name, int namelen);
-int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name,
-				int namelen);
-int PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name,
-				int namelen);
-int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, const unsigned char *name,
-				int namelen);
-int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage);
-ASN1_TYPE *PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid);
-char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag);
-unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass,
-				int passlen, unsigned char *in, int inlen,
-				unsigned char **data, int *datalen, int en_de);
-void * PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it,
-	     const char *pass, int passlen, ASN1_OCTET_STRING *oct, int zbuf);
-ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it,
-				       const char *pass, int passlen,
-				       void *obj, int zbuf);
-PKCS12 *PKCS12_init(int mode);
-int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
-		       int saltlen, int id, int iter, int n,
-		       unsigned char *out, const EVP_MD *md_type);
-int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int id, int iter, int n, unsigned char *out, const EVP_MD *md_type);
-int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-			 ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md_type,
-			 int en_de);
-int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
-			 unsigned char *mac, unsigned int *maclen);
-int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen);
-int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
-		   unsigned char *salt, int saltlen, int iter,
-		   const EVP_MD *md_type);
-int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
-					 int saltlen, const EVP_MD *md_type);
-unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
-char *OPENSSL_uni2asc(unsigned char *uni, int unilen);
-
-DECLARE_ASN1_FUNCTIONS(PKCS12)
-DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
-DECLARE_ASN1_FUNCTIONS(PKCS12_SAFEBAG)
-DECLARE_ASN1_FUNCTIONS(PKCS12_BAGS)
-
-DECLARE_ASN1_ITEM(PKCS12_SAFEBAGS)
-DECLARE_ASN1_ITEM(PKCS12_AUTHSAFES)
-
-void PKCS12_PBE_add(void);
-int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
-		 STACK_OF(X509) **ca);
-PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
-			 STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,
-						 int mac_iter, int keytype);
-
-PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert);
-PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key,
-						int key_usage, int iter,
-						int key_nid, char *pass);
-int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
-					int safe_nid, int iter, char *pass);
-PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid);
-
-int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12);
-int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12);
-PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12);
-PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12);
-int PKCS12_newpass(PKCS12 *p12, char *oldpass, char *newpass);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_PKCS12_strings(void);
-
-/* Error codes for the PKCS12 functions. */
-
-/* Function codes. */
-#define PKCS12_F_PARSE_BAG				 129
-#define PKCS12_F_PARSE_BAGS				 103
-#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME		 100
-#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC		 127
-#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI		 102
-#define PKCS12_F_PKCS12_ADD_LOCALKEYID			 104
-#define PKCS12_F_PKCS12_CREATE				 105
-#define PKCS12_F_PKCS12_GEN_MAC				 107
-#define PKCS12_F_PKCS12_INIT				 109
-#define PKCS12_F_PKCS12_ITEM_DECRYPT_D2I		 106
-#define PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT		 108
-#define PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG		 117
-#define PKCS12_F_PKCS12_KEY_GEN_ASC			 110
-#define PKCS12_F_PKCS12_KEY_GEN_UNI			 111
-#define PKCS12_F_PKCS12_MAKE_KEYBAG			 112
-#define PKCS12_F_PKCS12_MAKE_SHKEYBAG			 113
-#define PKCS12_F_PKCS12_NEWPASS				 128
-#define PKCS12_F_PKCS12_PACK_P7DATA			 114
-#define PKCS12_F_PKCS12_PACK_P7ENCDATA			 115
-#define PKCS12_F_PKCS12_PARSE				 118
-#define PKCS12_F_PKCS12_PBE_CRYPT			 119
-#define PKCS12_F_PKCS12_PBE_KEYIVGEN			 120
-#define PKCS12_F_PKCS12_SETUP_MAC			 122
-#define PKCS12_F_PKCS12_SET_MAC				 123
-#define PKCS12_F_PKCS12_UNPACK_AUTHSAFES		 130
-#define PKCS12_F_PKCS12_UNPACK_P7DATA			 131
-#define PKCS12_F_PKCS12_VERIFY_MAC			 126
-#define PKCS12_F_PKCS8_ADD_KEYUSAGE			 124
-#define PKCS12_F_PKCS8_ENCRYPT				 125
-
-/* Reason codes. */
-#define PKCS12_R_CANT_PACK_STRUCTURE			 100
-#define PKCS12_R_CONTENT_TYPE_NOT_DATA			 121
-#define PKCS12_R_DECODE_ERROR				 101
-#define PKCS12_R_ENCODE_ERROR				 102
-#define PKCS12_R_ENCRYPT_ERROR				 103
-#define PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE	 120
-#define PKCS12_R_INVALID_NULL_ARGUMENT			 104
-#define PKCS12_R_INVALID_NULL_PKCS12_POINTER		 105
-#define PKCS12_R_IV_GEN_ERROR				 106
-#define PKCS12_R_KEY_GEN_ERROR				 107
-#define PKCS12_R_MAC_ABSENT				 108
-#define PKCS12_R_MAC_GENERATION_ERROR			 109
-#define PKCS12_R_MAC_SETUP_ERROR			 110
-#define PKCS12_R_MAC_STRING_SET_ERROR			 111
-#define PKCS12_R_MAC_VERIFY_ERROR			 112
-#define PKCS12_R_MAC_VERIFY_FAILURE			 113
-#define PKCS12_R_PARSE_ERROR				 114
-#define PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR		 115
-#define PKCS12_R_PKCS12_CIPHERFINAL_ERROR		 116
-#define PKCS12_R_PKCS12_PBE_CRYPT_ERROR			 117
-#define PKCS12_R_UNKNOWN_DIGEST_ALGORITHM		 118
-#define PKCS12_R_UNSUPPORTED_PKCS12_MODE		 119
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/pkcs7.h b/dep/include/openssl/pkcs7.h
deleted file mode 100644
index e4d443193..000000000
--- a/dep/include/openssl/pkcs7.h
+++ /dev/null
@@ -1,499 +0,0 @@
-/* crypto/pkcs7/pkcs7.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_PKCS7_H
-#define HEADER_PKCS7_H
-
-#include <openssl/asn1.h>
-#include <openssl/bio.h>
-#include <openssl/e_os2.h>
-
-#include <openssl/symhacks.h>
-#include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef OPENSSL_SYS_WIN32
-/* Under Win32 thes are defined in wincrypt.h */
-#undef PKCS7_ISSUER_AND_SERIAL
-#undef PKCS7_SIGNER_INFO
-#endif
-
-/*
-Encryption_ID		DES-CBC
-Digest_ID		MD5
-Digest_Encryption_ID	rsaEncryption
-Key_Encryption_ID	rsaEncryption
-*/
-
-typedef struct pkcs7_issuer_and_serial_st
-	{
-	X509_NAME *issuer;
-	ASN1_INTEGER *serial;
-	} PKCS7_ISSUER_AND_SERIAL;
-
-typedef struct pkcs7_signer_info_st
-	{
-	ASN1_INTEGER 			*version;	/* version 1 */
-	PKCS7_ISSUER_AND_SERIAL		*issuer_and_serial;
-	X509_ALGOR			*digest_alg;
-	STACK_OF(X509_ATTRIBUTE)	*auth_attr;	/* [ 0 ] */
-	X509_ALGOR			*digest_enc_alg;
-	ASN1_OCTET_STRING		*enc_digest;
-	STACK_OF(X509_ATTRIBUTE)	*unauth_attr;	/* [ 1 ] */
-
-	/* The private key to sign with */
-	EVP_PKEY			*pkey;
-	} PKCS7_SIGNER_INFO;
-
-DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
-DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO)
-
-typedef struct pkcs7_recip_info_st
-	{
-	ASN1_INTEGER			*version;	/* version 0 */
-	PKCS7_ISSUER_AND_SERIAL		*issuer_and_serial;
-	X509_ALGOR			*key_enc_algor;
-	ASN1_OCTET_STRING		*enc_key;
-	X509				*cert; /* get the pub-key from this */
-	} PKCS7_RECIP_INFO;
-
-DECLARE_STACK_OF(PKCS7_RECIP_INFO)
-DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO)
-
-typedef struct pkcs7_signed_st
-	{
-	ASN1_INTEGER			*version;	/* version 1 */
-	STACK_OF(X509_ALGOR)		*md_algs;	/* md used */
-	STACK_OF(X509)			*cert;		/* [ 0 ] */
-	STACK_OF(X509_CRL)		*crl;		/* [ 1 ] */
-	STACK_OF(PKCS7_SIGNER_INFO)	*signer_info;
-
-	struct pkcs7_st			*contents;
-	} PKCS7_SIGNED;
-/* The above structure is very very similar to PKCS7_SIGN_ENVELOPE.
- * How about merging the two */
-
-typedef struct pkcs7_enc_content_st
-	{
-	ASN1_OBJECT			*content_type;
-	X509_ALGOR			*algorithm;
-	ASN1_OCTET_STRING		*enc_data;	/* [ 0 ] */
-	const EVP_CIPHER		*cipher;
-	} PKCS7_ENC_CONTENT;
-
-typedef struct pkcs7_enveloped_st
-	{
-	ASN1_INTEGER			*version;	/* version 0 */
-	STACK_OF(PKCS7_RECIP_INFO)	*recipientinfo;
-	PKCS7_ENC_CONTENT		*enc_data;
-	} PKCS7_ENVELOPE;
-
-typedef struct pkcs7_signedandenveloped_st
-	{
-	ASN1_INTEGER			*version;	/* version 1 */
-	STACK_OF(X509_ALGOR)		*md_algs;	/* md used */
-	STACK_OF(X509)			*cert;		/* [ 0 ] */
-	STACK_OF(X509_CRL)		*crl;		/* [ 1 ] */
-	STACK_OF(PKCS7_SIGNER_INFO)	*signer_info;
-
-	PKCS7_ENC_CONTENT		*enc_data;
-	STACK_OF(PKCS7_RECIP_INFO)	*recipientinfo;
-	} PKCS7_SIGN_ENVELOPE;
-
-typedef struct pkcs7_digest_st
-	{
-	ASN1_INTEGER			*version;	/* version 0 */
-	X509_ALGOR			*md;		/* md used */
-	struct pkcs7_st 		*contents;
-	ASN1_OCTET_STRING		*digest;
-	} PKCS7_DIGEST;
-
-typedef struct pkcs7_encrypted_st
-	{
-	ASN1_INTEGER			*version;	/* version 0 */
-	PKCS7_ENC_CONTENT		*enc_data;
-	} PKCS7_ENCRYPT;
-
-typedef struct pkcs7_st
-	{
-	/* The following is non NULL if it contains ASN1 encoding of
-	 * this structure */
-	unsigned char *asn1;
-	long length;
-
-#define PKCS7_S_HEADER	0
-#define PKCS7_S_BODY	1
-#define PKCS7_S_TAIL	2
-	int state; /* used during processing */
-
-	int detached;
-
-	ASN1_OBJECT *type;
-	/* content as defined by the type */
-	/* all encryption/message digests are applied to the 'contents',
-	 * leaving out the 'type' field. */
-	union	{
-		char *ptr;
-
-		/* NID_pkcs7_data */
-		ASN1_OCTET_STRING *data;
-
-		/* NID_pkcs7_signed */
-		PKCS7_SIGNED *sign;
-
-		/* NID_pkcs7_enveloped */
-		PKCS7_ENVELOPE *enveloped;
-
-		/* NID_pkcs7_signedAndEnveloped */
-		PKCS7_SIGN_ENVELOPE *signed_and_enveloped;
-
-		/* NID_pkcs7_digest */
-		PKCS7_DIGEST *digest;
-
-		/* NID_pkcs7_encrypted */
-		PKCS7_ENCRYPT *encrypted;
-
-		/* Anything else */
-		ASN1_TYPE *other;
-		} d;
-	} PKCS7;
-
-DECLARE_STACK_OF(PKCS7)
-DECLARE_ASN1_SET_OF(PKCS7)
-DECLARE_PKCS12_STACK_OF(PKCS7)
-
-#define PKCS7_OP_SET_DETACHED_SIGNATURE	1
-#define PKCS7_OP_GET_DETACHED_SIGNATURE	2
-
-#define PKCS7_get_signed_attributes(si)	((si)->auth_attr)
-#define PKCS7_get_attributes(si)	((si)->unauth_attr)
-
-#define PKCS7_type_is_signed(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_signed)
-#define PKCS7_type_is_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
-#define PKCS7_type_is_enveloped(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_enveloped)
-#define PKCS7_type_is_signedAndEnveloped(a) \
-		(OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped)
-#define PKCS7_type_is_data(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_data)
-#define PKCS7_type_is_digest(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_digest)
-#define PKCS7_type_is_encrypted(a) \
-		(OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
-
-#define PKCS7_type_is_digest(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_digest)
-
-#define PKCS7_set_detached(p,v) \
-		PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL)
-#define PKCS7_get_detached(p) \
-		PKCS7_ctrl(p,PKCS7_OP_GET_DETACHED_SIGNATURE,0,NULL)
-
-#define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
-
-/* S/MIME related flags */
-
-#define PKCS7_TEXT		0x1
-#define PKCS7_NOCERTS		0x2
-#define PKCS7_NOSIGS		0x4
-#define PKCS7_NOCHAIN		0x8
-#define PKCS7_NOINTERN		0x10
-#define PKCS7_NOVERIFY		0x20
-#define PKCS7_DETACHED		0x40
-#define PKCS7_BINARY		0x80
-#define PKCS7_NOATTR		0x100
-#define	PKCS7_NOSMIMECAP	0x200
-#define PKCS7_NOOLDMIMETYPE	0x400
-#define PKCS7_CRLFEOL		0x800
-#define PKCS7_STREAM		0x1000
-#define PKCS7_NOCRL		0x2000
-#define PKCS7_PARTIAL		0x4000
-#define PKCS7_REUSE_DIGEST	0x8000
-
-/* Flags: for compatibility with older code */
-
-#define SMIME_TEXT	PKCS7_TEXT
-#define SMIME_NOCERTS	PKCS7_NOCERTS
-#define SMIME_NOSIGS	PKCS7_NOSIGS
-#define SMIME_NOCHAIN	PKCS7_NOCHAIN
-#define SMIME_NOINTERN	PKCS7_NOINTERN
-#define SMIME_NOVERIFY	PKCS7_NOVERIFY
-#define SMIME_DETACHED	PKCS7_DETACHED
-#define SMIME_BINARY	PKCS7_BINARY
-#define SMIME_NOATTR	PKCS7_NOATTR
-
-DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
-
-int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,const EVP_MD *type,
-	unsigned char *md,unsigned int *len);
-#ifndef OPENSSL_NO_FP_API
-PKCS7 *d2i_PKCS7_fp(FILE *fp,PKCS7 **p7);
-int i2d_PKCS7_fp(FILE *fp,PKCS7 *p7);
-#endif
-PKCS7 *PKCS7_dup(PKCS7 *p7);
-PKCS7 *d2i_PKCS7_bio(BIO *bp,PKCS7 **p7);
-int i2d_PKCS7_bio(BIO *bp,PKCS7 *p7);
-int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags);
-int PEM_write_bio_PKCS7_stream(BIO *out, PKCS7 *p7, BIO *in, int flags);
-
-DECLARE_ASN1_FUNCTIONS(PKCS7_SIGNER_INFO)
-DECLARE_ASN1_FUNCTIONS(PKCS7_RECIP_INFO)
-DECLARE_ASN1_FUNCTIONS(PKCS7_SIGNED)
-DECLARE_ASN1_FUNCTIONS(PKCS7_ENC_CONTENT)
-DECLARE_ASN1_FUNCTIONS(PKCS7_ENVELOPE)
-DECLARE_ASN1_FUNCTIONS(PKCS7_SIGN_ENVELOPE)
-DECLARE_ASN1_FUNCTIONS(PKCS7_DIGEST)
-DECLARE_ASN1_FUNCTIONS(PKCS7_ENCRYPT)
-DECLARE_ASN1_FUNCTIONS(PKCS7)
-
-DECLARE_ASN1_ITEM(PKCS7_ATTR_SIGN)
-DECLARE_ASN1_ITEM(PKCS7_ATTR_VERIFY)
-
-DECLARE_ASN1_NDEF_FUNCTION(PKCS7)
-DECLARE_ASN1_PRINT_FUNCTION(PKCS7)
-
-long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);
-
-int PKCS7_set_type(PKCS7 *p7, int type);
-int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other);
-int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data);
-int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
-	const EVP_MD *dgst);
-int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si);
-int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *p7i);
-int PKCS7_add_certificate(PKCS7 *p7, X509 *x509);
-int PKCS7_add_crl(PKCS7 *p7, X509_CRL *x509);
-int PKCS7_content_new(PKCS7 *p7, int nid);
-int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx,
-	BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si); 
-int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
-								X509 *x509);
-
-BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio);
-int PKCS7_dataFinal(PKCS7 *p7, BIO *bio);
-BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert);
-
-
-PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509,
-	EVP_PKEY *pkey, const EVP_MD *dgst);
-X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si);
-int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md);
-STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7);
-
-PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509);
-void PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,
-					X509_ALGOR **pdig, X509_ALGOR **psig);
-void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc);
-int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri);
-int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509);
-int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher);
-int PKCS7_stream(unsigned char ***boundary, PKCS7 *p7);
-
-PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx);
-ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk);
-int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si,int nid,int type,
-	void *data);
-int PKCS7_add_attribute (PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
-	void *value);
-ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid);
-ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid);
-int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
-				STACK_OF(X509_ATTRIBUTE) *sk);
-int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,STACK_OF(X509_ATTRIBUTE) *sk);
-
-
-PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
-							BIO *data, int flags);
-
-PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7,
-			X509 *signcert, EVP_PKEY *pkey, const EVP_MD *md,
-			int flags);
-
-int PKCS7_final(PKCS7 *p7, BIO *data, int flags);
-int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
-					BIO *indata, BIO *out, int flags);
-STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags);
-PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher,
-								int flags);
-int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags);
-
-int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si,
-			      STACK_OF(X509_ALGOR) *cap);
-STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si);
-int PKCS7_simple_smimecap(STACK_OF(X509_ALGOR) *sk, int nid, int arg);
-
-int PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid);
-int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t);
-int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si,
-				const unsigned char *md, int mdlen);
-
-int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags);
-PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont);
-
-BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7);
-
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_PKCS7_strings(void);
-
-/* Error codes for the PKCS7 functions. */
-
-/* Function codes. */
-#define PKCS7_F_B64_READ_PKCS7				 120
-#define PKCS7_F_B64_WRITE_PKCS7				 121
-#define PKCS7_F_DO_PKCS7_SIGNED_ATTRIB			 136
-#define PKCS7_F_I2D_PKCS7_BIO_STREAM			 140
-#define PKCS7_F_PKCS7_ADD0_ATTRIB_SIGNING_TIME		 135
-#define PKCS7_F_PKCS7_ADD_ATTRIB_SMIMECAP		 118
-#define PKCS7_F_PKCS7_ADD_CERTIFICATE			 100
-#define PKCS7_F_PKCS7_ADD_CRL				 101
-#define PKCS7_F_PKCS7_ADD_RECIPIENT_INFO		 102
-#define PKCS7_F_PKCS7_ADD_SIGNATURE			 131
-#define PKCS7_F_PKCS7_ADD_SIGNER			 103
-#define PKCS7_F_PKCS7_BIO_ADD_DIGEST			 125
-#define PKCS7_F_PKCS7_COPY_EXISTING_DIGEST		 138
-#define PKCS7_F_PKCS7_CTRL				 104
-#define PKCS7_F_PKCS7_DATADECODE			 112
-#define PKCS7_F_PKCS7_DATAFINAL				 128
-#define PKCS7_F_PKCS7_DATAINIT				 105
-#define PKCS7_F_PKCS7_DATASIGN				 106
-#define PKCS7_F_PKCS7_DATAVERIFY			 107
-#define PKCS7_F_PKCS7_DECRYPT				 114
-#define PKCS7_F_PKCS7_DECRYPT_RINFO			 133
-#define PKCS7_F_PKCS7_ENCODE_RINFO			 132
-#define PKCS7_F_PKCS7_ENCRYPT				 115
-#define PKCS7_F_PKCS7_FINAL				 134
-#define PKCS7_F_PKCS7_FIND_DIGEST			 127
-#define PKCS7_F_PKCS7_GET0_SIGNERS			 124
-#define PKCS7_F_PKCS7_RECIP_INFO_SET			 130
-#define PKCS7_F_PKCS7_SET_CIPHER			 108
-#define PKCS7_F_PKCS7_SET_CONTENT			 109
-#define PKCS7_F_PKCS7_SET_DIGEST			 126
-#define PKCS7_F_PKCS7_SET_TYPE				 110
-#define PKCS7_F_PKCS7_SIGN				 116
-#define PKCS7_F_PKCS7_SIGNATUREVERIFY			 113
-#define PKCS7_F_PKCS7_SIGNER_INFO_SET			 129
-#define PKCS7_F_PKCS7_SIGNER_INFO_SIGN			 139
-#define PKCS7_F_PKCS7_SIGN_ADD_SIGNER			 137
-#define PKCS7_F_PKCS7_SIMPLE_SMIMECAP			 119
-#define PKCS7_F_PKCS7_VERIFY				 117
-#define PKCS7_F_SMIME_READ_PKCS7			 122
-#define PKCS7_F_SMIME_TEXT				 123
-
-/* Reason codes. */
-#define PKCS7_R_CERTIFICATE_VERIFY_ERROR		 117
-#define PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER		 144
-#define PKCS7_R_CIPHER_NOT_INITIALIZED			 116
-#define PKCS7_R_CONTENT_AND_DATA_PRESENT		 118
-#define PKCS7_R_CTRL_ERROR				 152
-#define PKCS7_R_DECODE_ERROR				 130
-#define PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH		 100
-#define PKCS7_R_DECRYPT_ERROR				 119
-#define PKCS7_R_DIGEST_FAILURE				 101
-#define PKCS7_R_ENCRYPTION_CTRL_FAILURE			 149
-#define PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 150
-#define PKCS7_R_ERROR_ADDING_RECIPIENT			 120
-#define PKCS7_R_ERROR_SETTING_CIPHER			 121
-#define PKCS7_R_INVALID_MIME_TYPE			 131
-#define PKCS7_R_INVALID_NULL_POINTER			 143
-#define PKCS7_R_MIME_NO_CONTENT_TYPE			 132
-#define PKCS7_R_MIME_PARSE_ERROR			 133
-#define PKCS7_R_MIME_SIG_PARSE_ERROR			 134
-#define PKCS7_R_MISSING_CERIPEND_INFO			 103
-#define PKCS7_R_NO_CONTENT				 122
-#define PKCS7_R_NO_CONTENT_TYPE				 135
-#define PKCS7_R_NO_DEFAULT_DIGEST			 151
-#define PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND		 154
-#define PKCS7_R_NO_MULTIPART_BODY_FAILURE		 136
-#define PKCS7_R_NO_MULTIPART_BOUNDARY			 137
-#define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE	 115
-#define PKCS7_R_NO_RECIPIENT_MATCHES_KEY		 146
-#define PKCS7_R_NO_SIGNATURES_ON_DATA			 123
-#define PKCS7_R_NO_SIGNERS				 142
-#define PKCS7_R_NO_SIG_CONTENT_TYPE			 138
-#define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE	 104
-#define PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR		 124
-#define PKCS7_R_PKCS7_ADD_SIGNER_ERROR			 153
-#define PKCS7_R_PKCS7_DATAFINAL				 126
-#define PKCS7_R_PKCS7_DATAFINAL_ERROR			 125
-#define PKCS7_R_PKCS7_DATASIGN				 145
-#define PKCS7_R_PKCS7_PARSE_ERROR			 139
-#define PKCS7_R_PKCS7_SIG_PARSE_ERROR			 140
-#define PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE	 127
-#define PKCS7_R_SIGNATURE_FAILURE			 105
-#define PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND		 128
-#define PKCS7_R_SIGNING_CTRL_FAILURE			 147
-#define PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE	 148
-#define PKCS7_R_SIG_INVALID_MIME_TYPE			 141
-#define PKCS7_R_SMIME_TEXT_ERROR			 129
-#define PKCS7_R_UNABLE_TO_FIND_CERTIFICATE		 106
-#define PKCS7_R_UNABLE_TO_FIND_MEM_BIO			 107
-#define PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST		 108
-#define PKCS7_R_UNKNOWN_DIGEST_TYPE			 109
-#define PKCS7_R_UNKNOWN_OPERATION			 110
-#define PKCS7_R_UNSUPPORTED_CIPHER_TYPE			 111
-#define PKCS7_R_UNSUPPORTED_CONTENT_TYPE		 112
-#define PKCS7_R_WRONG_CONTENT_TYPE			 113
-#define PKCS7_R_WRONG_PKCS7_TYPE			 114
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/pqueue.h b/dep/include/openssl/pqueue.h
deleted file mode 100644
index 87fc9037c..000000000
--- a/dep/include/openssl/pqueue.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* crypto/pqueue/pqueue.h */
-/* 
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_PQUEUE_H
-#define HEADER_PQUEUE_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-typedef struct _pqueue *pqueue;
-
-typedef struct _pitem
-	{
-	unsigned char priority[8]; /* 64-bit value in big-endian encoding */
-	void *data;
-	struct _pitem *next;
-	} pitem;
-
-typedef struct _pitem *piterator;
-
-pitem *pitem_new(unsigned char *prio64be, void *data);
-void   pitem_free(pitem *item);
-
-pqueue pqueue_new(void);
-void   pqueue_free(pqueue pq);
-
-pitem *pqueue_insert(pqueue pq, pitem *item);
-pitem *pqueue_peek(pqueue pq);
-pitem *pqueue_pop(pqueue pq);
-pitem *pqueue_find(pqueue pq, unsigned char *prio64be);
-pitem *pqueue_iterator(pqueue pq);
-pitem *pqueue_next(piterator *iter);
-
-void   pqueue_print(pqueue pq);
-int    pqueue_size(pqueue pq);
-
-#endif /* ! HEADER_PQUEUE_H */
diff --git a/dep/include/openssl/rand.h b/dep/include/openssl/rand.h
deleted file mode 100644
index ac6c02176..000000000
--- a/dep/include/openssl/rand.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* crypto/rand/rand.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RAND_H
-#define HEADER_RAND_H
-
-#include <stdlib.h>
-#include <openssl/ossl_typ.h>
-#include <openssl/e_os2.h>
-
-#if defined(OPENSSL_SYS_WINDOWS)
-#include <windows.h>
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#if defined(OPENSSL_FIPS)
-#define FIPS_RAND_SIZE_T size_t
-#endif
-
-/* Already defined in ossl_typ.h */
-/* typedef struct rand_meth_st RAND_METHOD; */
-
-struct rand_meth_st
-	{
-	void (*seed)(const void *buf, int num);
-	int (*bytes)(unsigned char *buf, int num);
-	void (*cleanup)(void);
-	void (*add)(const void *buf, int num, double entropy);
-	int (*pseudorand)(unsigned char *buf, int num);
-	int (*status)(void);
-	};
-
-#ifdef BN_DEBUG
-extern int rand_predictable;
-#endif
-
-int RAND_set_rand_method(const RAND_METHOD *meth);
-const RAND_METHOD *RAND_get_rand_method(void);
-#ifndef OPENSSL_NO_ENGINE
-int RAND_set_rand_engine(ENGINE *engine);
-#endif
-RAND_METHOD *RAND_SSLeay(void);
-void RAND_cleanup(void );
-int  RAND_bytes(unsigned char *buf,int num);
-int  RAND_pseudo_bytes(unsigned char *buf,int num);
-void RAND_seed(const void *buf,int num);
-void RAND_add(const void *buf,int num,double entropy);
-int  RAND_load_file(const char *file,long max_bytes);
-int  RAND_write_file(const char *file);
-const char *RAND_file_name(char *file,size_t num);
-int RAND_status(void);
-int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes);
-int RAND_egd(const char *path);
-int RAND_egd_bytes(const char *path,int bytes);
-int RAND_poll(void);
-
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-
-void RAND_screen(void);
-int RAND_event(UINT, WPARAM, LPARAM);
-
-#endif
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_RAND_strings(void);
-
-/* Error codes for the RAND functions. */
-
-/* Function codes. */
-#define RAND_F_RAND_GET_RAND_METHOD			 101
-#define RAND_F_SSLEAY_RAND_BYTES			 100
-
-/* Reason codes. */
-#define RAND_R_PRNG_NOT_SEEDED				 100
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/rc2.h b/dep/include/openssl/rc2.h
deleted file mode 100644
index 34c836231..000000000
--- a/dep/include/openssl/rc2.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* crypto/rc2/rc2.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RC2_H
-#define HEADER_RC2_H
-
-#include <openssl/opensslconf.h> /* OPENSSL_NO_RC2, RC2_INT */
-#ifdef OPENSSL_NO_RC2
-#error RC2 is disabled.
-#endif
-
-#define RC2_ENCRYPT	1
-#define RC2_DECRYPT	0
-
-#define RC2_BLOCK	8
-#define RC2_KEY_LENGTH	16
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct rc2_key_st
-	{
-	RC2_INT data[64];
-	} RC2_KEY;
-
- 
-void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,int bits);
-void RC2_ecb_encrypt(const unsigned char *in,unsigned char *out,RC2_KEY *key,
-		     int enc);
-void RC2_encrypt(unsigned long *data,RC2_KEY *key);
-void RC2_decrypt(unsigned long *data,RC2_KEY *key);
-void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-	RC2_KEY *ks, unsigned char *iv, int enc);
-void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-		       long length, RC2_KEY *schedule, unsigned char *ivec,
-		       int *num, int enc);
-void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-		       long length, RC2_KEY *schedule, unsigned char *ivec,
-		       int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/rc4.h b/dep/include/openssl/rc4.h
deleted file mode 100644
index 29d1acccf..000000000
--- a/dep/include/openssl/rc4.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* crypto/rc4/rc4.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RC4_H
-#define HEADER_RC4_H
-
-#include <openssl/opensslconf.h> /* OPENSSL_NO_RC4, RC4_INT */
-#ifdef OPENSSL_NO_RC4
-#error RC4 is disabled.
-#endif
-
-#include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct rc4_key_st
-	{
-	RC4_INT x,y;
-	RC4_INT data[256];
-	} RC4_KEY;
-
- 
-const char *RC4_options(void);
-void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
-void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
-		unsigned char *outdata);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/ripemd.h b/dep/include/openssl/ripemd.h
deleted file mode 100644
index 5942eb618..000000000
--- a/dep/include/openssl/ripemd.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* crypto/ripemd/ripemd.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RIPEMD_H
-#define HEADER_RIPEMD_H
-
-#include <openssl/e_os2.h>
-#include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef OPENSSL_NO_RIPEMD
-#error RIPEMD is disabled.
-#endif
-
-#if defined(__LP32__)
-#define RIPEMD160_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#define RIPEMD160_LONG unsigned long
-#define RIPEMD160_LONG_LOG2 3
-#else
-#define RIPEMD160_LONG unsigned int
-#endif
-
-#define RIPEMD160_CBLOCK	64
-#define RIPEMD160_LBLOCK	(RIPEMD160_CBLOCK/4)
-#define RIPEMD160_DIGEST_LENGTH	20
-
-typedef struct RIPEMD160state_st
-	{
-	RIPEMD160_LONG A,B,C,D,E;
-	RIPEMD160_LONG Nl,Nh;
-	RIPEMD160_LONG data[RIPEMD160_LBLOCK];
-	unsigned int   num;
-	} RIPEMD160_CTX;
-
-int RIPEMD160_Init(RIPEMD160_CTX *c);
-int RIPEMD160_Update(RIPEMD160_CTX *c, const void *data, size_t len);
-int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
-unsigned char *RIPEMD160(const unsigned char *d, size_t n,
-	unsigned char *md);
-void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/rsa.h b/dep/include/openssl/rsa.h
deleted file mode 100644
index cf7434365..000000000
--- a/dep/include/openssl/rsa.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/* crypto/rsa/rsa.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RSA_H
-#define HEADER_RSA_H
-
-#include <openssl/asn1.h>
-
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#include <openssl/crypto.h>
-#include <openssl/ossl_typ.h>
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#endif
-
-#ifdef OPENSSL_NO_RSA
-#error RSA is disabled.
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Declared already in ossl_typ.h */
-/* typedef struct rsa_st RSA; */
-/* typedef struct rsa_meth_st RSA_METHOD; */
-
-struct rsa_meth_st
-	{
-	const char *name;
-	int (*rsa_pub_enc)(int flen,const unsigned char *from,
-			   unsigned char *to,
-			   RSA *rsa,int padding);
-	int (*rsa_pub_dec)(int flen,const unsigned char *from,
-			   unsigned char *to,
-			   RSA *rsa,int padding);
-	int (*rsa_priv_enc)(int flen,const unsigned char *from,
-			    unsigned char *to,
-			    RSA *rsa,int padding);
-	int (*rsa_priv_dec)(int flen,const unsigned char *from,
-			    unsigned char *to,
-			    RSA *rsa,int padding);
-	int (*rsa_mod_exp)(BIGNUM *r0,const BIGNUM *I,RSA *rsa,BN_CTX *ctx); /* Can be null */
-	int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-			  const BIGNUM *m, BN_CTX *ctx,
-			  BN_MONT_CTX *m_ctx); /* Can be null */
-	int (*init)(RSA *rsa);		/* called at new */
-	int (*finish)(RSA *rsa);	/* called at free */
-	int flags;			/* RSA_METHOD_FLAG_* things */
-	char *app_data;			/* may be needed! */
-/* New sign and verify functions: some libraries don't allow arbitrary data
- * to be signed/verified: this allows them to be used. Note: for this to work
- * the RSA_public_decrypt() and RSA_private_encrypt() should *NOT* be used
- * RSA_sign(), RSA_verify() should be used instead. Note: for backwards
- * compatibility this functionality is only enabled if the RSA_FLAG_SIGN_VER
- * option is set in 'flags'.
- */
-	int (*rsa_sign)(int type,
-		const unsigned char *m, unsigned int m_length,
-		unsigned char *sigret, unsigned int *siglen, const RSA *rsa);
-	int (*rsa_verify)(int dtype,
-		const unsigned char *m, unsigned int m_length,
-		const unsigned char *sigbuf, unsigned int siglen,
-								const RSA *rsa);
-/* If this callback is NULL, the builtin software RSA key-gen will be used. This
- * is for behavioural compatibility whilst the code gets rewired, but one day
- * it would be nice to assume there are no such things as "builtin software"
- * implementations. */
-	int (*rsa_keygen)(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
-	};
-
-struct rsa_st
-	{
-	/* The first parameter is used to pickup errors where
-	 * this is passed instead of aEVP_PKEY, it is set to 0 */
-	int pad;
-	long version;
-	const RSA_METHOD *meth;
-	/* functional reference if 'meth' is ENGINE-provided */
-	ENGINE *engine;
-	BIGNUM *n;
-	BIGNUM *e;
-	BIGNUM *d;
-	BIGNUM *p;
-	BIGNUM *q;
-	BIGNUM *dmp1;
-	BIGNUM *dmq1;
-	BIGNUM *iqmp;
-	/* be careful using this if the RSA structure is shared */
-	CRYPTO_EX_DATA ex_data;
-	int references;
-	int flags;
-
-	/* Used to cache montgomery values */
-	BN_MONT_CTX *_method_mod_n;
-	BN_MONT_CTX *_method_mod_p;
-	BN_MONT_CTX *_method_mod_q;
-
-	/* all BIGNUM values are actually in the following data, if it is not
-	 * NULL */
-	char *bignum_data;
-	BN_BLINDING *blinding;
-	BN_BLINDING *mt_blinding;
-	};
-
-#ifndef OPENSSL_RSA_MAX_MODULUS_BITS
-# define OPENSSL_RSA_MAX_MODULUS_BITS	16384
-#endif
-
-#ifndef OPENSSL_RSA_SMALL_MODULUS_BITS
-# define OPENSSL_RSA_SMALL_MODULUS_BITS	3072
-#endif
-#ifndef OPENSSL_RSA_MAX_PUBEXP_BITS
-# define OPENSSL_RSA_MAX_PUBEXP_BITS	64 /* exponent limit enforced for "large" modulus only */
-#endif
-
-#define RSA_3	0x3L
-#define RSA_F4	0x10001L
-
-#define RSA_METHOD_FLAG_NO_CHECK	0x0001 /* don't check pub/private match */
-
-#define RSA_FLAG_CACHE_PUBLIC		0x0002
-#define RSA_FLAG_CACHE_PRIVATE		0x0004
-#define RSA_FLAG_BLINDING		0x0008
-#define RSA_FLAG_THREAD_SAFE		0x0010
-/* This flag means the private key operations will be handled by rsa_mod_exp
- * and that they do not depend on the private key components being present:
- * for example a key stored in external hardware. Without this flag bn_mod_exp
- * gets called when private key components are absent.
- */
-#define RSA_FLAG_EXT_PKEY		0x0020
-
-/* This flag in the RSA_METHOD enables the new rsa_sign, rsa_verify functions.
- */
-#define RSA_FLAG_SIGN_VER		0x0040
-
-#define RSA_FLAG_NO_BLINDING		0x0080 /* new with 0.9.6j and 0.9.7b; the built-in
-                                                * RSA implementation now uses blinding by
-                                                * default (ignoring RSA_FLAG_BLINDING),
-                                                * but other engines might not need it
-                                                */
-#define RSA_FLAG_NO_CONSTTIME		0x0100 /* new with 0.9.8f; the built-in RSA
-						* implementation now uses constant time
-						* operations by default in private key operations,
-						* e.g., constant time modular exponentiation, 
-                                                * modular inverse without leaking branches, 
-                                                * division without leaking branches. This 
-                                                * flag disables these constant time 
-                                                * operations and results in faster RSA 
-                                                * private key operations.
-                                                */ 
-#ifndef OPENSSL_NO_DEPRECATED
-#define RSA_FLAG_NO_EXP_CONSTTIME RSA_FLAG_NO_CONSTTIME /* deprecated name for the flag*/
-                                                /* new with 0.9.7h; the built-in RSA
-                                                * implementation now uses constant time
-                                                * modular exponentiation for secret exponents
-                                                * by default. This flag causes the
-                                                * faster variable sliding window method to
-                                                * be used for all exponents.
-                                                */
-#endif
-
-
-#define EVP_PKEY_CTX_set_rsa_padding(ctx, pad) \
-	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, EVP_PKEY_CTRL_RSA_PADDING, \
-				pad, NULL)
-
-#define EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, len) \
-	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
-				(EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \
-				EVP_PKEY_CTRL_RSA_PSS_SALTLEN, \
-				len, NULL)
-
-#define EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, bits) \
-	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN, \
-				EVP_PKEY_CTRL_RSA_KEYGEN_BITS, bits, NULL)
-
-#define EVP_PKEY_CTX_set_rsa_keygen_pubexp(ctx, pubexp) \
-	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN, \
-				EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp)
-
-#define EVP_PKEY_CTRL_RSA_PADDING	(EVP_PKEY_ALG_CTRL + 1)
-#define EVP_PKEY_CTRL_RSA_PSS_SALTLEN	(EVP_PKEY_ALG_CTRL + 2)
-
-#define EVP_PKEY_CTRL_RSA_KEYGEN_BITS	(EVP_PKEY_ALG_CTRL + 3)
-#define EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP	(EVP_PKEY_ALG_CTRL + 4)
-
-#define RSA_PKCS1_PADDING	1
-#define RSA_SSLV23_PADDING	2
-#define RSA_NO_PADDING		3
-#define RSA_PKCS1_OAEP_PADDING	4
-#define RSA_X931_PADDING	5
-/* EVP_PKEY_ only */
-#define RSA_PKCS1_PSS_PADDING	6
-
-#define RSA_PKCS1_PADDING_SIZE	11
-
-#define RSA_set_app_data(s,arg)         RSA_set_ex_data(s,0,arg)
-#define RSA_get_app_data(s)             RSA_get_ex_data(s,0)
-
-RSA *	RSA_new(void);
-RSA *	RSA_new_method(ENGINE *engine);
-int	RSA_size(const RSA *);
-
-/* Deprecated version */
-#ifndef OPENSSL_NO_DEPRECATED
-RSA *	RSA_generate_key(int bits, unsigned long e,void
-		(*callback)(int,int,void *),void *cb_arg);
-#endif /* !defined(OPENSSL_NO_DEPRECATED) */
-
-/* New version */
-int	RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
-
-int	RSA_check_key(const RSA *);
-	/* next 4 return -1 on error */
-int	RSA_public_encrypt(int flen, const unsigned char *from,
-		unsigned char *to, RSA *rsa,int padding);
-int	RSA_private_encrypt(int flen, const unsigned char *from,
-		unsigned char *to, RSA *rsa,int padding);
-int	RSA_public_decrypt(int flen, const unsigned char *from, 
-		unsigned char *to, RSA *rsa,int padding);
-int	RSA_private_decrypt(int flen, const unsigned char *from, 
-		unsigned char *to, RSA *rsa,int padding);
-void	RSA_free (RSA *r);
-/* "up" the RSA object's reference count */
-int	RSA_up_ref(RSA *r);
-
-int	RSA_flags(const RSA *r);
-
-void RSA_set_default_method(const RSA_METHOD *meth);
-const RSA_METHOD *RSA_get_default_method(void);
-const RSA_METHOD *RSA_get_method(const RSA *rsa);
-int RSA_set_method(RSA *rsa, const RSA_METHOD *meth);
-
-/* This function needs the memory locking malloc callbacks to be installed */
-int RSA_memory_lock(RSA *r);
-
-/* these are the actual SSLeay RSA functions */
-const RSA_METHOD *RSA_PKCS1_SSLeay(void);
-
-const RSA_METHOD *RSA_null_method(void);
-
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPublicKey)
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPrivateKey)
-
-#ifndef OPENSSL_NO_FP_API
-int	RSA_print_fp(FILE *fp, const RSA *r,int offset);
-#endif
-
-#ifndef OPENSSL_NO_BIO
-int	RSA_print(BIO *bp, const RSA *r,int offset);
-#endif
-
-#ifndef OPENSSL_NO_RC4
-int i2d_RSA_NET(const RSA *a, unsigned char **pp,
-		int (*cb)(char *buf, int len, const char *prompt, int verify),
-		int sgckey);
-RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
-		 int (*cb)(char *buf, int len, const char *prompt, int verify),
-		 int sgckey);
-
-int i2d_Netscape_RSA(const RSA *a, unsigned char **pp,
-		     int (*cb)(char *buf, int len, const char *prompt,
-			       int verify));
-RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length,
-		      int (*cb)(char *buf, int len, const char *prompt,
-				int verify));
-#endif
-
-/* The following 2 functions sign and verify a X509_SIG ASN1 object
- * inside PKCS#1 padded RSA encryption */
-int RSA_sign(int type, const unsigned char *m, unsigned int m_length,
-	unsigned char *sigret, unsigned int *siglen, RSA *rsa);
-int RSA_verify(int type, const unsigned char *m, unsigned int m_length,
-	const unsigned char *sigbuf, unsigned int siglen, RSA *rsa);
-
-/* The following 2 function sign and verify a ASN1_OCTET_STRING
- * object inside PKCS#1 padded RSA encryption */
-int RSA_sign_ASN1_OCTET_STRING(int type,
-	const unsigned char *m, unsigned int m_length,
-	unsigned char *sigret, unsigned int *siglen, RSA *rsa);
-int RSA_verify_ASN1_OCTET_STRING(int type,
-	const unsigned char *m, unsigned int m_length,
-	unsigned char *sigbuf, unsigned int siglen, RSA *rsa);
-
-int RSA_blinding_on(RSA *rsa, BN_CTX *ctx);
-void RSA_blinding_off(RSA *rsa);
-BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *ctx);
-
-int RSA_padding_add_PKCS1_type_1(unsigned char *to,int tlen,
-	const unsigned char *f,int fl);
-int RSA_padding_check_PKCS1_type_1(unsigned char *to,int tlen,
-	const unsigned char *f,int fl,int rsa_len);
-int RSA_padding_add_PKCS1_type_2(unsigned char *to,int tlen,
-	const unsigned char *f,int fl);
-int RSA_padding_check_PKCS1_type_2(unsigned char *to,int tlen,
-	const unsigned char *f,int fl,int rsa_len);
-int PKCS1_MGF1(unsigned char *mask, long len,
-	const unsigned char *seed, long seedlen, const EVP_MD *dgst);
-int RSA_padding_add_PKCS1_OAEP(unsigned char *to,int tlen,
-	const unsigned char *f,int fl,
-	const unsigned char *p,int pl);
-int RSA_padding_check_PKCS1_OAEP(unsigned char *to,int tlen,
-	const unsigned char *f,int fl,int rsa_len,
-	const unsigned char *p,int pl);
-int RSA_padding_add_SSLv23(unsigned char *to,int tlen,
-	const unsigned char *f,int fl);
-int RSA_padding_check_SSLv23(unsigned char *to,int tlen,
-	const unsigned char *f,int fl,int rsa_len);
-int RSA_padding_add_none(unsigned char *to,int tlen,
-	const unsigned char *f,int fl);
-int RSA_padding_check_none(unsigned char *to,int tlen,
-	const unsigned char *f,int fl,int rsa_len);
-int RSA_padding_add_X931(unsigned char *to,int tlen,
-	const unsigned char *f,int fl);
-int RSA_padding_check_X931(unsigned char *to,int tlen,
-	const unsigned char *f,int fl,int rsa_len);
-int RSA_X931_hash_id(int nid);
-
-int RSA_verify_PKCS1_PSS(RSA *rsa, const unsigned char *mHash,
-			const EVP_MD *Hash, const unsigned char *EM, int sLen);
-int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
-			const unsigned char *mHash,
-			const EVP_MD *Hash, int sLen);
-
-int RSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int RSA_set_ex_data(RSA *r,int idx,void *arg);
-void *RSA_get_ex_data(const RSA *r, int idx);
-
-RSA *RSAPublicKey_dup(RSA *rsa);
-RSA *RSAPrivateKey_dup(RSA *rsa);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_RSA_strings(void);
-
-/* Error codes for the RSA functions. */
-
-/* Function codes. */
-#define RSA_F_CHECK_PADDING_MD				 140
-#define RSA_F_DO_RSA_PRINT				 146
-#define RSA_F_INT_RSA_VERIFY				 145
-#define RSA_F_MEMORY_LOCK				 100
-#define RSA_F_OLD_RSA_PRIV_DECODE			 147
-#define RSA_F_PKEY_RSA_CTRL				 143
-#define RSA_F_PKEY_RSA_CTRL_STR				 144
-#define RSA_F_PKEY_RSA_SIGN				 142
-#define RSA_F_PKEY_RSA_VERIFYRECOVER			 141
-#define RSA_F_RSA_BUILTIN_KEYGEN			 129
-#define RSA_F_RSA_CHECK_KEY				 123
-#define RSA_F_RSA_EAY_PRIVATE_DECRYPT			 101
-#define RSA_F_RSA_EAY_PRIVATE_ENCRYPT			 102
-#define RSA_F_RSA_EAY_PUBLIC_DECRYPT			 103
-#define RSA_F_RSA_EAY_PUBLIC_ENCRYPT			 104
-#define RSA_F_RSA_GENERATE_KEY				 105
-#define RSA_F_RSA_MEMORY_LOCK				 130
-#define RSA_F_RSA_NEW_METHOD				 106
-#define RSA_F_RSA_NULL					 124
-#define RSA_F_RSA_NULL_MOD_EXP				 131
-#define RSA_F_RSA_NULL_PRIVATE_DECRYPT			 132
-#define RSA_F_RSA_NULL_PRIVATE_ENCRYPT			 133
-#define RSA_F_RSA_NULL_PUBLIC_DECRYPT			 134
-#define RSA_F_RSA_NULL_PUBLIC_ENCRYPT			 135
-#define RSA_F_RSA_PADDING_ADD_NONE			 107
-#define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP		 121
-#define RSA_F_RSA_PADDING_ADD_PKCS1_PSS			 125
-#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1		 108
-#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2		 109
-#define RSA_F_RSA_PADDING_ADD_SSLV23			 110
-#define RSA_F_RSA_PADDING_ADD_X931			 127
-#define RSA_F_RSA_PADDING_CHECK_NONE			 111
-#define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP		 122
-#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1		 112
-#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2		 113
-#define RSA_F_RSA_PADDING_CHECK_SSLV23			 114
-#define RSA_F_RSA_PADDING_CHECK_X931			 128
-#define RSA_F_RSA_PRINT					 115
-#define RSA_F_RSA_PRINT_FP				 116
-#define RSA_F_RSA_PRIV_DECODE				 137
-#define RSA_F_RSA_PRIV_ENCODE				 138
-#define RSA_F_RSA_PUB_DECODE				 139
-#define RSA_F_RSA_SETUP_BLINDING			 136
-#define RSA_F_RSA_SIGN					 117
-#define RSA_F_RSA_SIGN_ASN1_OCTET_STRING		 118
-#define RSA_F_RSA_VERIFY				 119
-#define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING		 120
-#define RSA_F_RSA_VERIFY_PKCS1_PSS			 126
-
-/* Reason codes. */
-#define RSA_R_ALGORITHM_MISMATCH			 100
-#define RSA_R_BAD_E_VALUE				 101
-#define RSA_R_BAD_FIXED_HEADER_DECRYPT			 102
-#define RSA_R_BAD_PAD_BYTE_COUNT			 103
-#define RSA_R_BAD_SIGNATURE				 104
-#define RSA_R_BLOCK_TYPE_IS_NOT_01			 106
-#define RSA_R_BLOCK_TYPE_IS_NOT_02			 107
-#define RSA_R_DATA_GREATER_THAN_MOD_LEN			 108
-#define RSA_R_DATA_TOO_LARGE				 109
-#define RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE		 110
-#define RSA_R_DATA_TOO_LARGE_FOR_MODULUS		 132
-#define RSA_R_DATA_TOO_SMALL				 111
-#define RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE		 122
-#define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY		 112
-#define RSA_R_DMP1_NOT_CONGRUENT_TO_D			 124
-#define RSA_R_DMQ1_NOT_CONGRUENT_TO_D			 125
-#define RSA_R_D_E_NOT_CONGRUENT_TO_1			 123
-#define RSA_R_FIRST_OCTET_INVALID			 133
-#define RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE	 144
-#define RSA_R_INVALID_DIGEST_LENGTH			 143
-#define RSA_R_INVALID_HEADER				 137
-#define RSA_R_INVALID_KEYBITS				 145
-#define RSA_R_INVALID_MESSAGE_LENGTH			 131
-#define RSA_R_INVALID_PADDING				 138
-#define RSA_R_INVALID_PADDING_MODE			 141
-#define RSA_R_INVALID_PSS_SALTLEN			 146
-#define RSA_R_INVALID_TRAILER				 139
-#define RSA_R_INVALID_X931_DIGEST			 142
-#define RSA_R_IQMP_NOT_INVERSE_OF_Q			 126
-#define RSA_R_KEY_SIZE_TOO_SMALL			 120
-#define RSA_R_LAST_OCTET_INVALID			 134
-#define RSA_R_MODULUS_TOO_LARGE				 105
-#define RSA_R_NO_PUBLIC_EXPONENT			 140
-#define RSA_R_NULL_BEFORE_BLOCK_MISSING			 113
-#define RSA_R_N_DOES_NOT_EQUAL_P_Q			 127
-#define RSA_R_OAEP_DECODING_ERROR			 121
-#define RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE	 148
-#define RSA_R_PADDING_CHECK_FAILED			 114
-#define RSA_R_P_NOT_PRIME				 128
-#define RSA_R_Q_NOT_PRIME				 129
-#define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED		 130
-#define RSA_R_SLEN_CHECK_FAILED				 136
-#define RSA_R_SLEN_RECOVERY_FAILED			 135
-#define RSA_R_SSLV3_ROLLBACK_ATTACK			 115
-#define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116
-#define RSA_R_UNKNOWN_ALGORITHM_TYPE			 117
-#define RSA_R_UNKNOWN_PADDING_TYPE			 118
-#define RSA_R_VALUE_MISSING				 147
-#define RSA_R_WRONG_SIGNATURE_LENGTH			 119
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/safestack.h b/dep/include/openssl/safestack.h
deleted file mode 100644
index 39914bdde..000000000
--- a/dep/include/openssl/safestack.h
+++ /dev/null
@@ -1,2575 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_SAFESTACK_H
-#define HEADER_SAFESTACK_H
-
-#include <openssl/stack.h>
-
-#ifndef CHECKED_PTR_OF
-#define CHECKED_PTR_OF(type, p) \
-    ((void*) (1 ? p : (type*)0))
-#endif
-
-/* In C++ we get problems because an explicit cast is needed from (void *)
- * we use CHECKED_STACK_OF to ensure the correct type is passed in the macros
- * below. 
- */
-
-#define CHECKED_STACK_OF(type, p) \
-    ((_STACK*) (1 ? p : (STACK_OF(type)*)0))
-
-#define CHECKED_SK_FREE_FUNC(type, p) \
-    ((void (*)(void *)) ((1 ? p : (void (*)(type *))0)))
-
-#define CHECKED_SK_FREE_FUNC2(type, p) \
-    ((void (*)(void *)) ((1 ? p : (void (*)(type))0)))
-
-#define CHECKED_SK_CMP_FUNC(type, p) \
-    ((int (*)(const void *, const void *)) \
-	((1 ? p : (int (*)(const type * const *, const type * const *))0)))
-
-#define STACK_OF(type) struct stack_st_##type
-#define PREDECLARE_STACK_OF(type) STACK_OF(type);
-
-#define DECLARE_STACK_OF(type) \
-STACK_OF(type) \
-    { \
-    _STACK stack; \
-    };
-#define DECLARE_SPECIAL_STACK_OF(type, type2) \
-STACK_OF(type) \
-    { \
-    _STACK stack; \
-    };
-
-#define IMPLEMENT_STACK_OF(type) /* nada (obsolete in new safestack approach)*/
-
-
-/* Strings are special: normally an lhash entry will point to a single
- * (somewhat) mutable object. In the case of strings:
- *
- * a) Instead of a single char, there is an array of chars, NUL-terminated.
- * b) The string may have be immutable.
- *
- * So, they need their own declarations. Especially important for
- * type-checking tools, such as Deputy.
- *
-o * In practice, however, it appears to be hard to have a const
- * string. For now, I'm settling for dealing with the fact it is a
- * string at all.
- */
-typedef char *OPENSSL_STRING;
-
-typedef const char *OPENSSL_CSTRING;
-
-/* Confusingly, LHASH_OF(STRING) deals with char ** throughout, but
- * STACK_OF(STRING) is really more like STACK_OF(char), only, as
- * mentioned above, instead of a single char each entry is a
- * NUL-terminated array of chars. So, we have to implement STRING
- * specially for STACK_OF. This is dealt with in the autogenerated
- * macros below.
- */
-
-DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
-
-/* Similarly, we sometimes use a block of characters, NOT
- * nul-terminated. These should also be distinguished from "normal"
- * stacks. */
-
-typedef void *OPENSSL_BLOCK;
-DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
-
-/* SKM_sk_... stack macros are internal to safestack.h:
- * never use them directly, use sk_<type>_... instead */
-#define SKM_sk_new(type, cmp) \
-	((STACK_OF(type) *)sk_new(CHECKED_SK_CMP_FUNC(type, cmp)))
-#define SKM_sk_new_null(type) \
-	((STACK_OF(type) *)sk_new_null())
-#define SKM_sk_free(type, st) \
-	sk_free(CHECKED_STACK_OF(type, st))
-#define SKM_sk_num(type, st) \
-	sk_num(CHECKED_STACK_OF(type, st))
-#define SKM_sk_value(type, st,i) \
-	((type *)sk_value(CHECKED_STACK_OF(type, st), i))
-#define SKM_sk_set(type, st,i,val) \
-	sk_set(CHECKED_STACK_OF(type, st), i, CHECKED_PTR_OF(type, val))
-#define SKM_sk_zero(type, st) \
-	sk_zero(CHECKED_STACK_OF(type, st))
-#define SKM_sk_push(type, st, val) \
-	sk_push(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-#define SKM_sk_unshift(type, st, val) \
-	sk_unshift(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-#define SKM_sk_find(type, st, val) \
-	sk_find(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-#define SKM_sk_find_ex(type, st, val) \
-	sk_find_ex(CHECKED_STACK_OF(type, st), \
-		   CHECKED_PTR_OF(type, val))
-#define SKM_sk_delete(type, st, i) \
-	(type *)sk_delete(CHECKED_STACK_OF(type, st), i)
-#define SKM_sk_delete_ptr(type, st, ptr) \
-	(type *)sk_delete_ptr(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, ptr))
-#define SKM_sk_insert(type, st,val, i) \
-	sk_insert(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val), i)
-#define SKM_sk_set_cmp_func(type, st, cmp) \
-	((int (*)(const type * const *,const type * const *)) \
-	sk_set_cmp_func(CHECKED_STACK_OF(type, st), CHECKED_SK_CMP_FUNC(type, cmp)))
-#define SKM_sk_dup(type, st) \
-	(STACK_OF(type) *)sk_dup(CHECKED_STACK_OF(type, st))
-#define SKM_sk_pop_free(type, st, free_func) \
-	sk_pop_free(CHECKED_STACK_OF(type, st), CHECKED_SK_FREE_FUNC(type, free_func))
-#define SKM_sk_shift(type, st) \
-	(type *)sk_shift(CHECKED_STACK_OF(type, st))
-#define SKM_sk_pop(type, st) \
-	(type *)sk_pop(CHECKED_STACK_OF(type, st))
-#define SKM_sk_sort(type, st) \
-	sk_sort(CHECKED_STACK_OF(type, st))
-#define SKM_sk_is_sorted(type, st) \
-	sk_is_sorted(CHECKED_STACK_OF(type, st))
-
-#define	SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-  (STACK_OF(type) *)d2i_ASN1_SET( \
-				(STACK_OF(OPENSSL_BLOCK) **)CHECKED_PTR_OF(STACK_OF(type)*, st), \
-				pp, length, \
-				CHECKED_D2I_OF(type, d2i_func), \
-				CHECKED_SK_FREE_FUNC(type, free_func), \
-				ex_tag, ex_class)
-
-#define	SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \
-  i2d_ASN1_SET((STACK_OF(OPENSSL_BLOCK) *)CHECKED_STACK_OF(type, st), pp, \
-				CHECKED_I2D_OF(type, i2d_func), \
-				ex_tag, ex_class, is_set)
-
-#define	SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \
-	ASN1_seq_pack(CHECKED_PTR_OF(STACK_OF(type), st), \
-			CHECKED_I2D_OF(type, i2d_func), buf, len)
-
-#define	SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
-	(STACK_OF(type) *)ASN1_seq_unpack(buf, len, CHECKED_D2I_OF(type, d2i_func), CHECKED_SK_FREE_FUNC(type, free_func))
-
-#define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \
-	(STACK_OF(type) *)PKCS12_decrypt_d2i(algor, \
-				CHECKED_D2I_OF(type, d2i_func), \
-				CHECKED_SK_FREE_FUNC(type, free_func), \
-				pass, passlen, oct, seq)
-
-/* This block of defines is updated by util/mkstack.pl, please do not touch! */
-#define sk_ACCESS_DESCRIPTION_new(cmp) SKM_sk_new(ACCESS_DESCRIPTION, (cmp))
-#define sk_ACCESS_DESCRIPTION_new_null() SKM_sk_new_null(ACCESS_DESCRIPTION)
-#define sk_ACCESS_DESCRIPTION_free(st) SKM_sk_free(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_num(st) SKM_sk_num(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_value(st, i) SKM_sk_value(ACCESS_DESCRIPTION, (st), (i))
-#define sk_ACCESS_DESCRIPTION_set(st, i, val) SKM_sk_set(ACCESS_DESCRIPTION, (st), (i), (val))
-#define sk_ACCESS_DESCRIPTION_zero(st) SKM_sk_zero(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_push(st, val) SKM_sk_push(ACCESS_DESCRIPTION, (st), (val))
-#define sk_ACCESS_DESCRIPTION_unshift(st, val) SKM_sk_unshift(ACCESS_DESCRIPTION, (st), (val))
-#define sk_ACCESS_DESCRIPTION_find(st, val) SKM_sk_find(ACCESS_DESCRIPTION, (st), (val))
-#define sk_ACCESS_DESCRIPTION_find_ex(st, val) SKM_sk_find_ex(ACCESS_DESCRIPTION, (st), (val))
-#define sk_ACCESS_DESCRIPTION_delete(st, i) SKM_sk_delete(ACCESS_DESCRIPTION, (st), (i))
-#define sk_ACCESS_DESCRIPTION_delete_ptr(st, ptr) SKM_sk_delete_ptr(ACCESS_DESCRIPTION, (st), (ptr))
-#define sk_ACCESS_DESCRIPTION_insert(st, val, i) SKM_sk_insert(ACCESS_DESCRIPTION, (st), (val), (i))
-#define sk_ACCESS_DESCRIPTION_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ACCESS_DESCRIPTION, (st), (cmp))
-#define sk_ACCESS_DESCRIPTION_dup(st) SKM_sk_dup(ACCESS_DESCRIPTION, st)
-#define sk_ACCESS_DESCRIPTION_pop_free(st, free_func) SKM_sk_pop_free(ACCESS_DESCRIPTION, (st), (free_func))
-#define sk_ACCESS_DESCRIPTION_shift(st) SKM_sk_shift(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_pop(st) SKM_sk_pop(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_sort(st) SKM_sk_sort(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_is_sorted(st) SKM_sk_is_sorted(ACCESS_DESCRIPTION, (st))
-
-#define sk_ASIdOrRange_new(cmp) SKM_sk_new(ASIdOrRange, (cmp))
-#define sk_ASIdOrRange_new_null() SKM_sk_new_null(ASIdOrRange)
-#define sk_ASIdOrRange_free(st) SKM_sk_free(ASIdOrRange, (st))
-#define sk_ASIdOrRange_num(st) SKM_sk_num(ASIdOrRange, (st))
-#define sk_ASIdOrRange_value(st, i) SKM_sk_value(ASIdOrRange, (st), (i))
-#define sk_ASIdOrRange_set(st, i, val) SKM_sk_set(ASIdOrRange, (st), (i), (val))
-#define sk_ASIdOrRange_zero(st) SKM_sk_zero(ASIdOrRange, (st))
-#define sk_ASIdOrRange_push(st, val) SKM_sk_push(ASIdOrRange, (st), (val))
-#define sk_ASIdOrRange_unshift(st, val) SKM_sk_unshift(ASIdOrRange, (st), (val))
-#define sk_ASIdOrRange_find(st, val) SKM_sk_find(ASIdOrRange, (st), (val))
-#define sk_ASIdOrRange_find_ex(st, val) SKM_sk_find_ex(ASIdOrRange, (st), (val))
-#define sk_ASIdOrRange_delete(st, i) SKM_sk_delete(ASIdOrRange, (st), (i))
-#define sk_ASIdOrRange_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASIdOrRange, (st), (ptr))
-#define sk_ASIdOrRange_insert(st, val, i) SKM_sk_insert(ASIdOrRange, (st), (val), (i))
-#define sk_ASIdOrRange_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASIdOrRange, (st), (cmp))
-#define sk_ASIdOrRange_dup(st) SKM_sk_dup(ASIdOrRange, st)
-#define sk_ASIdOrRange_pop_free(st, free_func) SKM_sk_pop_free(ASIdOrRange, (st), (free_func))
-#define sk_ASIdOrRange_shift(st) SKM_sk_shift(ASIdOrRange, (st))
-#define sk_ASIdOrRange_pop(st) SKM_sk_pop(ASIdOrRange, (st))
-#define sk_ASIdOrRange_sort(st) SKM_sk_sort(ASIdOrRange, (st))
-#define sk_ASIdOrRange_is_sorted(st) SKM_sk_is_sorted(ASIdOrRange, (st))
-
-#define sk_ASN1_GENERALSTRING_new(cmp) SKM_sk_new(ASN1_GENERALSTRING, (cmp))
-#define sk_ASN1_GENERALSTRING_new_null() SKM_sk_new_null(ASN1_GENERALSTRING)
-#define sk_ASN1_GENERALSTRING_free(st) SKM_sk_free(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_num(st) SKM_sk_num(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_value(st, i) SKM_sk_value(ASN1_GENERALSTRING, (st), (i))
-#define sk_ASN1_GENERALSTRING_set(st, i, val) SKM_sk_set(ASN1_GENERALSTRING, (st), (i), (val))
-#define sk_ASN1_GENERALSTRING_zero(st) SKM_sk_zero(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_push(st, val) SKM_sk_push(ASN1_GENERALSTRING, (st), (val))
-#define sk_ASN1_GENERALSTRING_unshift(st, val) SKM_sk_unshift(ASN1_GENERALSTRING, (st), (val))
-#define sk_ASN1_GENERALSTRING_find(st, val) SKM_sk_find(ASN1_GENERALSTRING, (st), (val))
-#define sk_ASN1_GENERALSTRING_find_ex(st, val) SKM_sk_find_ex(ASN1_GENERALSTRING, (st), (val))
-#define sk_ASN1_GENERALSTRING_delete(st, i) SKM_sk_delete(ASN1_GENERALSTRING, (st), (i))
-#define sk_ASN1_GENERALSTRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_GENERALSTRING, (st), (ptr))
-#define sk_ASN1_GENERALSTRING_insert(st, val, i) SKM_sk_insert(ASN1_GENERALSTRING, (st), (val), (i))
-#define sk_ASN1_GENERALSTRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_GENERALSTRING, (st), (cmp))
-#define sk_ASN1_GENERALSTRING_dup(st) SKM_sk_dup(ASN1_GENERALSTRING, st)
-#define sk_ASN1_GENERALSTRING_pop_free(st, free_func) SKM_sk_pop_free(ASN1_GENERALSTRING, (st), (free_func))
-#define sk_ASN1_GENERALSTRING_shift(st) SKM_sk_shift(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_pop(st) SKM_sk_pop(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_sort(st) SKM_sk_sort(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_is_sorted(st) SKM_sk_is_sorted(ASN1_GENERALSTRING, (st))
-
-#define sk_ASN1_INTEGER_new(cmp) SKM_sk_new(ASN1_INTEGER, (cmp))
-#define sk_ASN1_INTEGER_new_null() SKM_sk_new_null(ASN1_INTEGER)
-#define sk_ASN1_INTEGER_free(st) SKM_sk_free(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_num(st) SKM_sk_num(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_value(st, i) SKM_sk_value(ASN1_INTEGER, (st), (i))
-#define sk_ASN1_INTEGER_set(st, i, val) SKM_sk_set(ASN1_INTEGER, (st), (i), (val))
-#define sk_ASN1_INTEGER_zero(st) SKM_sk_zero(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_push(st, val) SKM_sk_push(ASN1_INTEGER, (st), (val))
-#define sk_ASN1_INTEGER_unshift(st, val) SKM_sk_unshift(ASN1_INTEGER, (st), (val))
-#define sk_ASN1_INTEGER_find(st, val) SKM_sk_find(ASN1_INTEGER, (st), (val))
-#define sk_ASN1_INTEGER_find_ex(st, val) SKM_sk_find_ex(ASN1_INTEGER, (st), (val))
-#define sk_ASN1_INTEGER_delete(st, i) SKM_sk_delete(ASN1_INTEGER, (st), (i))
-#define sk_ASN1_INTEGER_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_INTEGER, (st), (ptr))
-#define sk_ASN1_INTEGER_insert(st, val, i) SKM_sk_insert(ASN1_INTEGER, (st), (val), (i))
-#define sk_ASN1_INTEGER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_INTEGER, (st), (cmp))
-#define sk_ASN1_INTEGER_dup(st) SKM_sk_dup(ASN1_INTEGER, st)
-#define sk_ASN1_INTEGER_pop_free(st, free_func) SKM_sk_pop_free(ASN1_INTEGER, (st), (free_func))
-#define sk_ASN1_INTEGER_shift(st) SKM_sk_shift(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_pop(st) SKM_sk_pop(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_sort(st) SKM_sk_sort(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_is_sorted(st) SKM_sk_is_sorted(ASN1_INTEGER, (st))
-
-#define sk_ASN1_OBJECT_new(cmp) SKM_sk_new(ASN1_OBJECT, (cmp))
-#define sk_ASN1_OBJECT_new_null() SKM_sk_new_null(ASN1_OBJECT)
-#define sk_ASN1_OBJECT_free(st) SKM_sk_free(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_num(st) SKM_sk_num(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_value(st, i) SKM_sk_value(ASN1_OBJECT, (st), (i))
-#define sk_ASN1_OBJECT_set(st, i, val) SKM_sk_set(ASN1_OBJECT, (st), (i), (val))
-#define sk_ASN1_OBJECT_zero(st) SKM_sk_zero(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_push(st, val) SKM_sk_push(ASN1_OBJECT, (st), (val))
-#define sk_ASN1_OBJECT_unshift(st, val) SKM_sk_unshift(ASN1_OBJECT, (st), (val))
-#define sk_ASN1_OBJECT_find(st, val) SKM_sk_find(ASN1_OBJECT, (st), (val))
-#define sk_ASN1_OBJECT_find_ex(st, val) SKM_sk_find_ex(ASN1_OBJECT, (st), (val))
-#define sk_ASN1_OBJECT_delete(st, i) SKM_sk_delete(ASN1_OBJECT, (st), (i))
-#define sk_ASN1_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_OBJECT, (st), (ptr))
-#define sk_ASN1_OBJECT_insert(st, val, i) SKM_sk_insert(ASN1_OBJECT, (st), (val), (i))
-#define sk_ASN1_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_OBJECT, (st), (cmp))
-#define sk_ASN1_OBJECT_dup(st) SKM_sk_dup(ASN1_OBJECT, st)
-#define sk_ASN1_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(ASN1_OBJECT, (st), (free_func))
-#define sk_ASN1_OBJECT_shift(st) SKM_sk_shift(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_pop(st) SKM_sk_pop(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_sort(st) SKM_sk_sort(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_is_sorted(st) SKM_sk_is_sorted(ASN1_OBJECT, (st))
-
-#define sk_ASN1_STRING_TABLE_new(cmp) SKM_sk_new(ASN1_STRING_TABLE, (cmp))
-#define sk_ASN1_STRING_TABLE_new_null() SKM_sk_new_null(ASN1_STRING_TABLE)
-#define sk_ASN1_STRING_TABLE_free(st) SKM_sk_free(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_num(st) SKM_sk_num(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_value(st, i) SKM_sk_value(ASN1_STRING_TABLE, (st), (i))
-#define sk_ASN1_STRING_TABLE_set(st, i, val) SKM_sk_set(ASN1_STRING_TABLE, (st), (i), (val))
-#define sk_ASN1_STRING_TABLE_zero(st) SKM_sk_zero(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_push(st, val) SKM_sk_push(ASN1_STRING_TABLE, (st), (val))
-#define sk_ASN1_STRING_TABLE_unshift(st, val) SKM_sk_unshift(ASN1_STRING_TABLE, (st), (val))
-#define sk_ASN1_STRING_TABLE_find(st, val) SKM_sk_find(ASN1_STRING_TABLE, (st), (val))
-#define sk_ASN1_STRING_TABLE_find_ex(st, val) SKM_sk_find_ex(ASN1_STRING_TABLE, (st), (val))
-#define sk_ASN1_STRING_TABLE_delete(st, i) SKM_sk_delete(ASN1_STRING_TABLE, (st), (i))
-#define sk_ASN1_STRING_TABLE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_STRING_TABLE, (st), (ptr))
-#define sk_ASN1_STRING_TABLE_insert(st, val, i) SKM_sk_insert(ASN1_STRING_TABLE, (st), (val), (i))
-#define sk_ASN1_STRING_TABLE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_STRING_TABLE, (st), (cmp))
-#define sk_ASN1_STRING_TABLE_dup(st) SKM_sk_dup(ASN1_STRING_TABLE, st)
-#define sk_ASN1_STRING_TABLE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_STRING_TABLE, (st), (free_func))
-#define sk_ASN1_STRING_TABLE_shift(st) SKM_sk_shift(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_pop(st) SKM_sk_pop(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_sort(st) SKM_sk_sort(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_is_sorted(st) SKM_sk_is_sorted(ASN1_STRING_TABLE, (st))
-
-#define sk_ASN1_TYPE_new(cmp) SKM_sk_new(ASN1_TYPE, (cmp))
-#define sk_ASN1_TYPE_new_null() SKM_sk_new_null(ASN1_TYPE)
-#define sk_ASN1_TYPE_free(st) SKM_sk_free(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_num(st) SKM_sk_num(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_value(st, i) SKM_sk_value(ASN1_TYPE, (st), (i))
-#define sk_ASN1_TYPE_set(st, i, val) SKM_sk_set(ASN1_TYPE, (st), (i), (val))
-#define sk_ASN1_TYPE_zero(st) SKM_sk_zero(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_push(st, val) SKM_sk_push(ASN1_TYPE, (st), (val))
-#define sk_ASN1_TYPE_unshift(st, val) SKM_sk_unshift(ASN1_TYPE, (st), (val))
-#define sk_ASN1_TYPE_find(st, val) SKM_sk_find(ASN1_TYPE, (st), (val))
-#define sk_ASN1_TYPE_find_ex(st, val) SKM_sk_find_ex(ASN1_TYPE, (st), (val))
-#define sk_ASN1_TYPE_delete(st, i) SKM_sk_delete(ASN1_TYPE, (st), (i))
-#define sk_ASN1_TYPE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_TYPE, (st), (ptr))
-#define sk_ASN1_TYPE_insert(st, val, i) SKM_sk_insert(ASN1_TYPE, (st), (val), (i))
-#define sk_ASN1_TYPE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_TYPE, (st), (cmp))
-#define sk_ASN1_TYPE_dup(st) SKM_sk_dup(ASN1_TYPE, st)
-#define sk_ASN1_TYPE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_TYPE, (st), (free_func))
-#define sk_ASN1_TYPE_shift(st) SKM_sk_shift(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_pop(st) SKM_sk_pop(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_sort(st) SKM_sk_sort(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_is_sorted(st) SKM_sk_is_sorted(ASN1_TYPE, (st))
-
-#define sk_ASN1_UTF8STRING_new(cmp) SKM_sk_new(ASN1_UTF8STRING, (cmp))
-#define sk_ASN1_UTF8STRING_new_null() SKM_sk_new_null(ASN1_UTF8STRING)
-#define sk_ASN1_UTF8STRING_free(st) SKM_sk_free(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_num(st) SKM_sk_num(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_value(st, i) SKM_sk_value(ASN1_UTF8STRING, (st), (i))
-#define sk_ASN1_UTF8STRING_set(st, i, val) SKM_sk_set(ASN1_UTF8STRING, (st), (i), (val))
-#define sk_ASN1_UTF8STRING_zero(st) SKM_sk_zero(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_push(st, val) SKM_sk_push(ASN1_UTF8STRING, (st), (val))
-#define sk_ASN1_UTF8STRING_unshift(st, val) SKM_sk_unshift(ASN1_UTF8STRING, (st), (val))
-#define sk_ASN1_UTF8STRING_find(st, val) SKM_sk_find(ASN1_UTF8STRING, (st), (val))
-#define sk_ASN1_UTF8STRING_find_ex(st, val) SKM_sk_find_ex(ASN1_UTF8STRING, (st), (val))
-#define sk_ASN1_UTF8STRING_delete(st, i) SKM_sk_delete(ASN1_UTF8STRING, (st), (i))
-#define sk_ASN1_UTF8STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_UTF8STRING, (st), (ptr))
-#define sk_ASN1_UTF8STRING_insert(st, val, i) SKM_sk_insert(ASN1_UTF8STRING, (st), (val), (i))
-#define sk_ASN1_UTF8STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_UTF8STRING, (st), (cmp))
-#define sk_ASN1_UTF8STRING_dup(st) SKM_sk_dup(ASN1_UTF8STRING, st)
-#define sk_ASN1_UTF8STRING_pop_free(st, free_func) SKM_sk_pop_free(ASN1_UTF8STRING, (st), (free_func))
-#define sk_ASN1_UTF8STRING_shift(st) SKM_sk_shift(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_pop(st) SKM_sk_pop(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_sort(st) SKM_sk_sort(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_is_sorted(st) SKM_sk_is_sorted(ASN1_UTF8STRING, (st))
-
-#define sk_ASN1_VALUE_new(cmp) SKM_sk_new(ASN1_VALUE, (cmp))
-#define sk_ASN1_VALUE_new_null() SKM_sk_new_null(ASN1_VALUE)
-#define sk_ASN1_VALUE_free(st) SKM_sk_free(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_num(st) SKM_sk_num(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_value(st, i) SKM_sk_value(ASN1_VALUE, (st), (i))
-#define sk_ASN1_VALUE_set(st, i, val) SKM_sk_set(ASN1_VALUE, (st), (i), (val))
-#define sk_ASN1_VALUE_zero(st) SKM_sk_zero(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_push(st, val) SKM_sk_push(ASN1_VALUE, (st), (val))
-#define sk_ASN1_VALUE_unshift(st, val) SKM_sk_unshift(ASN1_VALUE, (st), (val))
-#define sk_ASN1_VALUE_find(st, val) SKM_sk_find(ASN1_VALUE, (st), (val))
-#define sk_ASN1_VALUE_find_ex(st, val) SKM_sk_find_ex(ASN1_VALUE, (st), (val))
-#define sk_ASN1_VALUE_delete(st, i) SKM_sk_delete(ASN1_VALUE, (st), (i))
-#define sk_ASN1_VALUE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_VALUE, (st), (ptr))
-#define sk_ASN1_VALUE_insert(st, val, i) SKM_sk_insert(ASN1_VALUE, (st), (val), (i))
-#define sk_ASN1_VALUE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_VALUE, (st), (cmp))
-#define sk_ASN1_VALUE_dup(st) SKM_sk_dup(ASN1_VALUE, st)
-#define sk_ASN1_VALUE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_VALUE, (st), (free_func))
-#define sk_ASN1_VALUE_shift(st) SKM_sk_shift(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_pop(st) SKM_sk_pop(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_sort(st) SKM_sk_sort(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_is_sorted(st) SKM_sk_is_sorted(ASN1_VALUE, (st))
-
-#define sk_BIO_new(cmp) SKM_sk_new(BIO, (cmp))
-#define sk_BIO_new_null() SKM_sk_new_null(BIO)
-#define sk_BIO_free(st) SKM_sk_free(BIO, (st))
-#define sk_BIO_num(st) SKM_sk_num(BIO, (st))
-#define sk_BIO_value(st, i) SKM_sk_value(BIO, (st), (i))
-#define sk_BIO_set(st, i, val) SKM_sk_set(BIO, (st), (i), (val))
-#define sk_BIO_zero(st) SKM_sk_zero(BIO, (st))
-#define sk_BIO_push(st, val) SKM_sk_push(BIO, (st), (val))
-#define sk_BIO_unshift(st, val) SKM_sk_unshift(BIO, (st), (val))
-#define sk_BIO_find(st, val) SKM_sk_find(BIO, (st), (val))
-#define sk_BIO_find_ex(st, val) SKM_sk_find_ex(BIO, (st), (val))
-#define sk_BIO_delete(st, i) SKM_sk_delete(BIO, (st), (i))
-#define sk_BIO_delete_ptr(st, ptr) SKM_sk_delete_ptr(BIO, (st), (ptr))
-#define sk_BIO_insert(st, val, i) SKM_sk_insert(BIO, (st), (val), (i))
-#define sk_BIO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BIO, (st), (cmp))
-#define sk_BIO_dup(st) SKM_sk_dup(BIO, st)
-#define sk_BIO_pop_free(st, free_func) SKM_sk_pop_free(BIO, (st), (free_func))
-#define sk_BIO_shift(st) SKM_sk_shift(BIO, (st))
-#define sk_BIO_pop(st) SKM_sk_pop(BIO, (st))
-#define sk_BIO_sort(st) SKM_sk_sort(BIO, (st))
-#define sk_BIO_is_sorted(st) SKM_sk_is_sorted(BIO, (st))
-
-#define sk_BY_DIR_ENTRY_new(cmp) SKM_sk_new(BY_DIR_ENTRY, (cmp))
-#define sk_BY_DIR_ENTRY_new_null() SKM_sk_new_null(BY_DIR_ENTRY)
-#define sk_BY_DIR_ENTRY_free(st) SKM_sk_free(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_num(st) SKM_sk_num(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_value(st, i) SKM_sk_value(BY_DIR_ENTRY, (st), (i))
-#define sk_BY_DIR_ENTRY_set(st, i, val) SKM_sk_set(BY_DIR_ENTRY, (st), (i), (val))
-#define sk_BY_DIR_ENTRY_zero(st) SKM_sk_zero(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_push(st, val) SKM_sk_push(BY_DIR_ENTRY, (st), (val))
-#define sk_BY_DIR_ENTRY_unshift(st, val) SKM_sk_unshift(BY_DIR_ENTRY, (st), (val))
-#define sk_BY_DIR_ENTRY_find(st, val) SKM_sk_find(BY_DIR_ENTRY, (st), (val))
-#define sk_BY_DIR_ENTRY_find_ex(st, val) SKM_sk_find_ex(BY_DIR_ENTRY, (st), (val))
-#define sk_BY_DIR_ENTRY_delete(st, i) SKM_sk_delete(BY_DIR_ENTRY, (st), (i))
-#define sk_BY_DIR_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(BY_DIR_ENTRY, (st), (ptr))
-#define sk_BY_DIR_ENTRY_insert(st, val, i) SKM_sk_insert(BY_DIR_ENTRY, (st), (val), (i))
-#define sk_BY_DIR_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BY_DIR_ENTRY, (st), (cmp))
-#define sk_BY_DIR_ENTRY_dup(st) SKM_sk_dup(BY_DIR_ENTRY, st)
-#define sk_BY_DIR_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(BY_DIR_ENTRY, (st), (free_func))
-#define sk_BY_DIR_ENTRY_shift(st) SKM_sk_shift(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_pop(st) SKM_sk_pop(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_sort(st) SKM_sk_sort(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_is_sorted(st) SKM_sk_is_sorted(BY_DIR_ENTRY, (st))
-
-#define sk_BY_DIR_HASH_new(cmp) SKM_sk_new(BY_DIR_HASH, (cmp))
-#define sk_BY_DIR_HASH_new_null() SKM_sk_new_null(BY_DIR_HASH)
-#define sk_BY_DIR_HASH_free(st) SKM_sk_free(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_num(st) SKM_sk_num(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_value(st, i) SKM_sk_value(BY_DIR_HASH, (st), (i))
-#define sk_BY_DIR_HASH_set(st, i, val) SKM_sk_set(BY_DIR_HASH, (st), (i), (val))
-#define sk_BY_DIR_HASH_zero(st) SKM_sk_zero(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_push(st, val) SKM_sk_push(BY_DIR_HASH, (st), (val))
-#define sk_BY_DIR_HASH_unshift(st, val) SKM_sk_unshift(BY_DIR_HASH, (st), (val))
-#define sk_BY_DIR_HASH_find(st, val) SKM_sk_find(BY_DIR_HASH, (st), (val))
-#define sk_BY_DIR_HASH_find_ex(st, val) SKM_sk_find_ex(BY_DIR_HASH, (st), (val))
-#define sk_BY_DIR_HASH_delete(st, i) SKM_sk_delete(BY_DIR_HASH, (st), (i))
-#define sk_BY_DIR_HASH_delete_ptr(st, ptr) SKM_sk_delete_ptr(BY_DIR_HASH, (st), (ptr))
-#define sk_BY_DIR_HASH_insert(st, val, i) SKM_sk_insert(BY_DIR_HASH, (st), (val), (i))
-#define sk_BY_DIR_HASH_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BY_DIR_HASH, (st), (cmp))
-#define sk_BY_DIR_HASH_dup(st) SKM_sk_dup(BY_DIR_HASH, st)
-#define sk_BY_DIR_HASH_pop_free(st, free_func) SKM_sk_pop_free(BY_DIR_HASH, (st), (free_func))
-#define sk_BY_DIR_HASH_shift(st) SKM_sk_shift(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_pop(st) SKM_sk_pop(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_sort(st) SKM_sk_sort(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_is_sorted(st) SKM_sk_is_sorted(BY_DIR_HASH, (st))
-
-#define sk_CMS_CertificateChoices_new(cmp) SKM_sk_new(CMS_CertificateChoices, (cmp))
-#define sk_CMS_CertificateChoices_new_null() SKM_sk_new_null(CMS_CertificateChoices)
-#define sk_CMS_CertificateChoices_free(st) SKM_sk_free(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_num(st) SKM_sk_num(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_value(st, i) SKM_sk_value(CMS_CertificateChoices, (st), (i))
-#define sk_CMS_CertificateChoices_set(st, i, val) SKM_sk_set(CMS_CertificateChoices, (st), (i), (val))
-#define sk_CMS_CertificateChoices_zero(st) SKM_sk_zero(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_push(st, val) SKM_sk_push(CMS_CertificateChoices, (st), (val))
-#define sk_CMS_CertificateChoices_unshift(st, val) SKM_sk_unshift(CMS_CertificateChoices, (st), (val))
-#define sk_CMS_CertificateChoices_find(st, val) SKM_sk_find(CMS_CertificateChoices, (st), (val))
-#define sk_CMS_CertificateChoices_find_ex(st, val) SKM_sk_find_ex(CMS_CertificateChoices, (st), (val))
-#define sk_CMS_CertificateChoices_delete(st, i) SKM_sk_delete(CMS_CertificateChoices, (st), (i))
-#define sk_CMS_CertificateChoices_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_CertificateChoices, (st), (ptr))
-#define sk_CMS_CertificateChoices_insert(st, val, i) SKM_sk_insert(CMS_CertificateChoices, (st), (val), (i))
-#define sk_CMS_CertificateChoices_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_CertificateChoices, (st), (cmp))
-#define sk_CMS_CertificateChoices_dup(st) SKM_sk_dup(CMS_CertificateChoices, st)
-#define sk_CMS_CertificateChoices_pop_free(st, free_func) SKM_sk_pop_free(CMS_CertificateChoices, (st), (free_func))
-#define sk_CMS_CertificateChoices_shift(st) SKM_sk_shift(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_pop(st) SKM_sk_pop(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_sort(st) SKM_sk_sort(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_is_sorted(st) SKM_sk_is_sorted(CMS_CertificateChoices, (st))
-
-#define sk_CMS_RecipientInfo_new(cmp) SKM_sk_new(CMS_RecipientInfo, (cmp))
-#define sk_CMS_RecipientInfo_new_null() SKM_sk_new_null(CMS_RecipientInfo)
-#define sk_CMS_RecipientInfo_free(st) SKM_sk_free(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_num(st) SKM_sk_num(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_value(st, i) SKM_sk_value(CMS_RecipientInfo, (st), (i))
-#define sk_CMS_RecipientInfo_set(st, i, val) SKM_sk_set(CMS_RecipientInfo, (st), (i), (val))
-#define sk_CMS_RecipientInfo_zero(st) SKM_sk_zero(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_push(st, val) SKM_sk_push(CMS_RecipientInfo, (st), (val))
-#define sk_CMS_RecipientInfo_unshift(st, val) SKM_sk_unshift(CMS_RecipientInfo, (st), (val))
-#define sk_CMS_RecipientInfo_find(st, val) SKM_sk_find(CMS_RecipientInfo, (st), (val))
-#define sk_CMS_RecipientInfo_find_ex(st, val) SKM_sk_find_ex(CMS_RecipientInfo, (st), (val))
-#define sk_CMS_RecipientInfo_delete(st, i) SKM_sk_delete(CMS_RecipientInfo, (st), (i))
-#define sk_CMS_RecipientInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RecipientInfo, (st), (ptr))
-#define sk_CMS_RecipientInfo_insert(st, val, i) SKM_sk_insert(CMS_RecipientInfo, (st), (val), (i))
-#define sk_CMS_RecipientInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RecipientInfo, (st), (cmp))
-#define sk_CMS_RecipientInfo_dup(st) SKM_sk_dup(CMS_RecipientInfo, st)
-#define sk_CMS_RecipientInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_RecipientInfo, (st), (free_func))
-#define sk_CMS_RecipientInfo_shift(st) SKM_sk_shift(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_pop(st) SKM_sk_pop(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_sort(st) SKM_sk_sort(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_is_sorted(st) SKM_sk_is_sorted(CMS_RecipientInfo, (st))
-
-#define sk_CMS_RevocationInfoChoice_new(cmp) SKM_sk_new(CMS_RevocationInfoChoice, (cmp))
-#define sk_CMS_RevocationInfoChoice_new_null() SKM_sk_new_null(CMS_RevocationInfoChoice)
-#define sk_CMS_RevocationInfoChoice_free(st) SKM_sk_free(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_num(st) SKM_sk_num(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_value(st, i) SKM_sk_value(CMS_RevocationInfoChoice, (st), (i))
-#define sk_CMS_RevocationInfoChoice_set(st, i, val) SKM_sk_set(CMS_RevocationInfoChoice, (st), (i), (val))
-#define sk_CMS_RevocationInfoChoice_zero(st) SKM_sk_zero(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_push(st, val) SKM_sk_push(CMS_RevocationInfoChoice, (st), (val))
-#define sk_CMS_RevocationInfoChoice_unshift(st, val) SKM_sk_unshift(CMS_RevocationInfoChoice, (st), (val))
-#define sk_CMS_RevocationInfoChoice_find(st, val) SKM_sk_find(CMS_RevocationInfoChoice, (st), (val))
-#define sk_CMS_RevocationInfoChoice_find_ex(st, val) SKM_sk_find_ex(CMS_RevocationInfoChoice, (st), (val))
-#define sk_CMS_RevocationInfoChoice_delete(st, i) SKM_sk_delete(CMS_RevocationInfoChoice, (st), (i))
-#define sk_CMS_RevocationInfoChoice_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RevocationInfoChoice, (st), (ptr))
-#define sk_CMS_RevocationInfoChoice_insert(st, val, i) SKM_sk_insert(CMS_RevocationInfoChoice, (st), (val), (i))
-#define sk_CMS_RevocationInfoChoice_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RevocationInfoChoice, (st), (cmp))
-#define sk_CMS_RevocationInfoChoice_dup(st) SKM_sk_dup(CMS_RevocationInfoChoice, st)
-#define sk_CMS_RevocationInfoChoice_pop_free(st, free_func) SKM_sk_pop_free(CMS_RevocationInfoChoice, (st), (free_func))
-#define sk_CMS_RevocationInfoChoice_shift(st) SKM_sk_shift(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_pop(st) SKM_sk_pop(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_sort(st) SKM_sk_sort(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_is_sorted(st) SKM_sk_is_sorted(CMS_RevocationInfoChoice, (st))
-
-#define sk_CMS_SignerInfo_new(cmp) SKM_sk_new(CMS_SignerInfo, (cmp))
-#define sk_CMS_SignerInfo_new_null() SKM_sk_new_null(CMS_SignerInfo)
-#define sk_CMS_SignerInfo_free(st) SKM_sk_free(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_num(st) SKM_sk_num(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_value(st, i) SKM_sk_value(CMS_SignerInfo, (st), (i))
-#define sk_CMS_SignerInfo_set(st, i, val) SKM_sk_set(CMS_SignerInfo, (st), (i), (val))
-#define sk_CMS_SignerInfo_zero(st) SKM_sk_zero(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_push(st, val) SKM_sk_push(CMS_SignerInfo, (st), (val))
-#define sk_CMS_SignerInfo_unshift(st, val) SKM_sk_unshift(CMS_SignerInfo, (st), (val))
-#define sk_CMS_SignerInfo_find(st, val) SKM_sk_find(CMS_SignerInfo, (st), (val))
-#define sk_CMS_SignerInfo_find_ex(st, val) SKM_sk_find_ex(CMS_SignerInfo, (st), (val))
-#define sk_CMS_SignerInfo_delete(st, i) SKM_sk_delete(CMS_SignerInfo, (st), (i))
-#define sk_CMS_SignerInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_SignerInfo, (st), (ptr))
-#define sk_CMS_SignerInfo_insert(st, val, i) SKM_sk_insert(CMS_SignerInfo, (st), (val), (i))
-#define sk_CMS_SignerInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_SignerInfo, (st), (cmp))
-#define sk_CMS_SignerInfo_dup(st) SKM_sk_dup(CMS_SignerInfo, st)
-#define sk_CMS_SignerInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_SignerInfo, (st), (free_func))
-#define sk_CMS_SignerInfo_shift(st) SKM_sk_shift(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_pop(st) SKM_sk_pop(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_sort(st) SKM_sk_sort(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_is_sorted(st) SKM_sk_is_sorted(CMS_SignerInfo, (st))
-
-#define sk_CONF_IMODULE_new(cmp) SKM_sk_new(CONF_IMODULE, (cmp))
-#define sk_CONF_IMODULE_new_null() SKM_sk_new_null(CONF_IMODULE)
-#define sk_CONF_IMODULE_free(st) SKM_sk_free(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_num(st) SKM_sk_num(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_value(st, i) SKM_sk_value(CONF_IMODULE, (st), (i))
-#define sk_CONF_IMODULE_set(st, i, val) SKM_sk_set(CONF_IMODULE, (st), (i), (val))
-#define sk_CONF_IMODULE_zero(st) SKM_sk_zero(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_push(st, val) SKM_sk_push(CONF_IMODULE, (st), (val))
-#define sk_CONF_IMODULE_unshift(st, val) SKM_sk_unshift(CONF_IMODULE, (st), (val))
-#define sk_CONF_IMODULE_find(st, val) SKM_sk_find(CONF_IMODULE, (st), (val))
-#define sk_CONF_IMODULE_find_ex(st, val) SKM_sk_find_ex(CONF_IMODULE, (st), (val))
-#define sk_CONF_IMODULE_delete(st, i) SKM_sk_delete(CONF_IMODULE, (st), (i))
-#define sk_CONF_IMODULE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_IMODULE, (st), (ptr))
-#define sk_CONF_IMODULE_insert(st, val, i) SKM_sk_insert(CONF_IMODULE, (st), (val), (i))
-#define sk_CONF_IMODULE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_IMODULE, (st), (cmp))
-#define sk_CONF_IMODULE_dup(st) SKM_sk_dup(CONF_IMODULE, st)
-#define sk_CONF_IMODULE_pop_free(st, free_func) SKM_sk_pop_free(CONF_IMODULE, (st), (free_func))
-#define sk_CONF_IMODULE_shift(st) SKM_sk_shift(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_pop(st) SKM_sk_pop(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_sort(st) SKM_sk_sort(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_is_sorted(st) SKM_sk_is_sorted(CONF_IMODULE, (st))
-
-#define sk_CONF_MODULE_new(cmp) SKM_sk_new(CONF_MODULE, (cmp))
-#define sk_CONF_MODULE_new_null() SKM_sk_new_null(CONF_MODULE)
-#define sk_CONF_MODULE_free(st) SKM_sk_free(CONF_MODULE, (st))
-#define sk_CONF_MODULE_num(st) SKM_sk_num(CONF_MODULE, (st))
-#define sk_CONF_MODULE_value(st, i) SKM_sk_value(CONF_MODULE, (st), (i))
-#define sk_CONF_MODULE_set(st, i, val) SKM_sk_set(CONF_MODULE, (st), (i), (val))
-#define sk_CONF_MODULE_zero(st) SKM_sk_zero(CONF_MODULE, (st))
-#define sk_CONF_MODULE_push(st, val) SKM_sk_push(CONF_MODULE, (st), (val))
-#define sk_CONF_MODULE_unshift(st, val) SKM_sk_unshift(CONF_MODULE, (st), (val))
-#define sk_CONF_MODULE_find(st, val) SKM_sk_find(CONF_MODULE, (st), (val))
-#define sk_CONF_MODULE_find_ex(st, val) SKM_sk_find_ex(CONF_MODULE, (st), (val))
-#define sk_CONF_MODULE_delete(st, i) SKM_sk_delete(CONF_MODULE, (st), (i))
-#define sk_CONF_MODULE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_MODULE, (st), (ptr))
-#define sk_CONF_MODULE_insert(st, val, i) SKM_sk_insert(CONF_MODULE, (st), (val), (i))
-#define sk_CONF_MODULE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_MODULE, (st), (cmp))
-#define sk_CONF_MODULE_dup(st) SKM_sk_dup(CONF_MODULE, st)
-#define sk_CONF_MODULE_pop_free(st, free_func) SKM_sk_pop_free(CONF_MODULE, (st), (free_func))
-#define sk_CONF_MODULE_shift(st) SKM_sk_shift(CONF_MODULE, (st))
-#define sk_CONF_MODULE_pop(st) SKM_sk_pop(CONF_MODULE, (st))
-#define sk_CONF_MODULE_sort(st) SKM_sk_sort(CONF_MODULE, (st))
-#define sk_CONF_MODULE_is_sorted(st) SKM_sk_is_sorted(CONF_MODULE, (st))
-
-#define sk_CONF_VALUE_new(cmp) SKM_sk_new(CONF_VALUE, (cmp))
-#define sk_CONF_VALUE_new_null() SKM_sk_new_null(CONF_VALUE)
-#define sk_CONF_VALUE_free(st) SKM_sk_free(CONF_VALUE, (st))
-#define sk_CONF_VALUE_num(st) SKM_sk_num(CONF_VALUE, (st))
-#define sk_CONF_VALUE_value(st, i) SKM_sk_value(CONF_VALUE, (st), (i))
-#define sk_CONF_VALUE_set(st, i, val) SKM_sk_set(CONF_VALUE, (st), (i), (val))
-#define sk_CONF_VALUE_zero(st) SKM_sk_zero(CONF_VALUE, (st))
-#define sk_CONF_VALUE_push(st, val) SKM_sk_push(CONF_VALUE, (st), (val))
-#define sk_CONF_VALUE_unshift(st, val) SKM_sk_unshift(CONF_VALUE, (st), (val))
-#define sk_CONF_VALUE_find(st, val) SKM_sk_find(CONF_VALUE, (st), (val))
-#define sk_CONF_VALUE_find_ex(st, val) SKM_sk_find_ex(CONF_VALUE, (st), (val))
-#define sk_CONF_VALUE_delete(st, i) SKM_sk_delete(CONF_VALUE, (st), (i))
-#define sk_CONF_VALUE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_VALUE, (st), (ptr))
-#define sk_CONF_VALUE_insert(st, val, i) SKM_sk_insert(CONF_VALUE, (st), (val), (i))
-#define sk_CONF_VALUE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_VALUE, (st), (cmp))
-#define sk_CONF_VALUE_dup(st) SKM_sk_dup(CONF_VALUE, st)
-#define sk_CONF_VALUE_pop_free(st, free_func) SKM_sk_pop_free(CONF_VALUE, (st), (free_func))
-#define sk_CONF_VALUE_shift(st) SKM_sk_shift(CONF_VALUE, (st))
-#define sk_CONF_VALUE_pop(st) SKM_sk_pop(CONF_VALUE, (st))
-#define sk_CONF_VALUE_sort(st) SKM_sk_sort(CONF_VALUE, (st))
-#define sk_CONF_VALUE_is_sorted(st) SKM_sk_is_sorted(CONF_VALUE, (st))
-
-#define sk_CRYPTO_EX_DATA_FUNCS_new(cmp) SKM_sk_new(CRYPTO_EX_DATA_FUNCS, (cmp))
-#define sk_CRYPTO_EX_DATA_FUNCS_new_null() SKM_sk_new_null(CRYPTO_EX_DATA_FUNCS)
-#define sk_CRYPTO_EX_DATA_FUNCS_free(st) SKM_sk_free(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_num(st) SKM_sk_num(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_value(st, i) SKM_sk_value(CRYPTO_EX_DATA_FUNCS, (st), (i))
-#define sk_CRYPTO_EX_DATA_FUNCS_set(st, i, val) SKM_sk_set(CRYPTO_EX_DATA_FUNCS, (st), (i), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_zero(st) SKM_sk_zero(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_push(st, val) SKM_sk_push(CRYPTO_EX_DATA_FUNCS, (st), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_unshift(st, val) SKM_sk_unshift(CRYPTO_EX_DATA_FUNCS, (st), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_find(st, val) SKM_sk_find(CRYPTO_EX_DATA_FUNCS, (st), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_find_ex(st, val) SKM_sk_find_ex(CRYPTO_EX_DATA_FUNCS, (st), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_delete(st, i) SKM_sk_delete(CRYPTO_EX_DATA_FUNCS, (st), (i))
-#define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr(st, ptr) SKM_sk_delete_ptr(CRYPTO_EX_DATA_FUNCS, (st), (ptr))
-#define sk_CRYPTO_EX_DATA_FUNCS_insert(st, val, i) SKM_sk_insert(CRYPTO_EX_DATA_FUNCS, (st), (val), (i))
-#define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CRYPTO_EX_DATA_FUNCS, (st), (cmp))
-#define sk_CRYPTO_EX_DATA_FUNCS_dup(st) SKM_sk_dup(CRYPTO_EX_DATA_FUNCS, st)
-#define sk_CRYPTO_EX_DATA_FUNCS_pop_free(st, free_func) SKM_sk_pop_free(CRYPTO_EX_DATA_FUNCS, (st), (free_func))
-#define sk_CRYPTO_EX_DATA_FUNCS_shift(st) SKM_sk_shift(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_pop(st) SKM_sk_pop(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_sort(st) SKM_sk_sort(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_is_sorted(st) SKM_sk_is_sorted(CRYPTO_EX_DATA_FUNCS, (st))
-
-#define sk_CRYPTO_dynlock_new(cmp) SKM_sk_new(CRYPTO_dynlock, (cmp))
-#define sk_CRYPTO_dynlock_new_null() SKM_sk_new_null(CRYPTO_dynlock)
-#define sk_CRYPTO_dynlock_free(st) SKM_sk_free(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_num(st) SKM_sk_num(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_value(st, i) SKM_sk_value(CRYPTO_dynlock, (st), (i))
-#define sk_CRYPTO_dynlock_set(st, i, val) SKM_sk_set(CRYPTO_dynlock, (st), (i), (val))
-#define sk_CRYPTO_dynlock_zero(st) SKM_sk_zero(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_push(st, val) SKM_sk_push(CRYPTO_dynlock, (st), (val))
-#define sk_CRYPTO_dynlock_unshift(st, val) SKM_sk_unshift(CRYPTO_dynlock, (st), (val))
-#define sk_CRYPTO_dynlock_find(st, val) SKM_sk_find(CRYPTO_dynlock, (st), (val))
-#define sk_CRYPTO_dynlock_find_ex(st, val) SKM_sk_find_ex(CRYPTO_dynlock, (st), (val))
-#define sk_CRYPTO_dynlock_delete(st, i) SKM_sk_delete(CRYPTO_dynlock, (st), (i))
-#define sk_CRYPTO_dynlock_delete_ptr(st, ptr) SKM_sk_delete_ptr(CRYPTO_dynlock, (st), (ptr))
-#define sk_CRYPTO_dynlock_insert(st, val, i) SKM_sk_insert(CRYPTO_dynlock, (st), (val), (i))
-#define sk_CRYPTO_dynlock_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CRYPTO_dynlock, (st), (cmp))
-#define sk_CRYPTO_dynlock_dup(st) SKM_sk_dup(CRYPTO_dynlock, st)
-#define sk_CRYPTO_dynlock_pop_free(st, free_func) SKM_sk_pop_free(CRYPTO_dynlock, (st), (free_func))
-#define sk_CRYPTO_dynlock_shift(st) SKM_sk_shift(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_pop(st) SKM_sk_pop(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_sort(st) SKM_sk_sort(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_is_sorted(st) SKM_sk_is_sorted(CRYPTO_dynlock, (st))
-
-#define sk_DIST_POINT_new(cmp) SKM_sk_new(DIST_POINT, (cmp))
-#define sk_DIST_POINT_new_null() SKM_sk_new_null(DIST_POINT)
-#define sk_DIST_POINT_free(st) SKM_sk_free(DIST_POINT, (st))
-#define sk_DIST_POINT_num(st) SKM_sk_num(DIST_POINT, (st))
-#define sk_DIST_POINT_value(st, i) SKM_sk_value(DIST_POINT, (st), (i))
-#define sk_DIST_POINT_set(st, i, val) SKM_sk_set(DIST_POINT, (st), (i), (val))
-#define sk_DIST_POINT_zero(st) SKM_sk_zero(DIST_POINT, (st))
-#define sk_DIST_POINT_push(st, val) SKM_sk_push(DIST_POINT, (st), (val))
-#define sk_DIST_POINT_unshift(st, val) SKM_sk_unshift(DIST_POINT, (st), (val))
-#define sk_DIST_POINT_find(st, val) SKM_sk_find(DIST_POINT, (st), (val))
-#define sk_DIST_POINT_find_ex(st, val) SKM_sk_find_ex(DIST_POINT, (st), (val))
-#define sk_DIST_POINT_delete(st, i) SKM_sk_delete(DIST_POINT, (st), (i))
-#define sk_DIST_POINT_delete_ptr(st, ptr) SKM_sk_delete_ptr(DIST_POINT, (st), (ptr))
-#define sk_DIST_POINT_insert(st, val, i) SKM_sk_insert(DIST_POINT, (st), (val), (i))
-#define sk_DIST_POINT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(DIST_POINT, (st), (cmp))
-#define sk_DIST_POINT_dup(st) SKM_sk_dup(DIST_POINT, st)
-#define sk_DIST_POINT_pop_free(st, free_func) SKM_sk_pop_free(DIST_POINT, (st), (free_func))
-#define sk_DIST_POINT_shift(st) SKM_sk_shift(DIST_POINT, (st))
-#define sk_DIST_POINT_pop(st) SKM_sk_pop(DIST_POINT, (st))
-#define sk_DIST_POINT_sort(st) SKM_sk_sort(DIST_POINT, (st))
-#define sk_DIST_POINT_is_sorted(st) SKM_sk_is_sorted(DIST_POINT, (st))
-
-#define sk_ENGINE_new(cmp) SKM_sk_new(ENGINE, (cmp))
-#define sk_ENGINE_new_null() SKM_sk_new_null(ENGINE)
-#define sk_ENGINE_free(st) SKM_sk_free(ENGINE, (st))
-#define sk_ENGINE_num(st) SKM_sk_num(ENGINE, (st))
-#define sk_ENGINE_value(st, i) SKM_sk_value(ENGINE, (st), (i))
-#define sk_ENGINE_set(st, i, val) SKM_sk_set(ENGINE, (st), (i), (val))
-#define sk_ENGINE_zero(st) SKM_sk_zero(ENGINE, (st))
-#define sk_ENGINE_push(st, val) SKM_sk_push(ENGINE, (st), (val))
-#define sk_ENGINE_unshift(st, val) SKM_sk_unshift(ENGINE, (st), (val))
-#define sk_ENGINE_find(st, val) SKM_sk_find(ENGINE, (st), (val))
-#define sk_ENGINE_find_ex(st, val) SKM_sk_find_ex(ENGINE, (st), (val))
-#define sk_ENGINE_delete(st, i) SKM_sk_delete(ENGINE, (st), (i))
-#define sk_ENGINE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE, (st), (ptr))
-#define sk_ENGINE_insert(st, val, i) SKM_sk_insert(ENGINE, (st), (val), (i))
-#define sk_ENGINE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE, (st), (cmp))
-#define sk_ENGINE_dup(st) SKM_sk_dup(ENGINE, st)
-#define sk_ENGINE_pop_free(st, free_func) SKM_sk_pop_free(ENGINE, (st), (free_func))
-#define sk_ENGINE_shift(st) SKM_sk_shift(ENGINE, (st))
-#define sk_ENGINE_pop(st) SKM_sk_pop(ENGINE, (st))
-#define sk_ENGINE_sort(st) SKM_sk_sort(ENGINE, (st))
-#define sk_ENGINE_is_sorted(st) SKM_sk_is_sorted(ENGINE, (st))
-
-#define sk_ENGINE_CLEANUP_ITEM_new(cmp) SKM_sk_new(ENGINE_CLEANUP_ITEM, (cmp))
-#define sk_ENGINE_CLEANUP_ITEM_new_null() SKM_sk_new_null(ENGINE_CLEANUP_ITEM)
-#define sk_ENGINE_CLEANUP_ITEM_free(st) SKM_sk_free(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_num(st) SKM_sk_num(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_value(st, i) SKM_sk_value(ENGINE_CLEANUP_ITEM, (st), (i))
-#define sk_ENGINE_CLEANUP_ITEM_set(st, i, val) SKM_sk_set(ENGINE_CLEANUP_ITEM, (st), (i), (val))
-#define sk_ENGINE_CLEANUP_ITEM_zero(st) SKM_sk_zero(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_push(st, val) SKM_sk_push(ENGINE_CLEANUP_ITEM, (st), (val))
-#define sk_ENGINE_CLEANUP_ITEM_unshift(st, val) SKM_sk_unshift(ENGINE_CLEANUP_ITEM, (st), (val))
-#define sk_ENGINE_CLEANUP_ITEM_find(st, val) SKM_sk_find(ENGINE_CLEANUP_ITEM, (st), (val))
-#define sk_ENGINE_CLEANUP_ITEM_find_ex(st, val) SKM_sk_find_ex(ENGINE_CLEANUP_ITEM, (st), (val))
-#define sk_ENGINE_CLEANUP_ITEM_delete(st, i) SKM_sk_delete(ENGINE_CLEANUP_ITEM, (st), (i))
-#define sk_ENGINE_CLEANUP_ITEM_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE_CLEANUP_ITEM, (st), (ptr))
-#define sk_ENGINE_CLEANUP_ITEM_insert(st, val, i) SKM_sk_insert(ENGINE_CLEANUP_ITEM, (st), (val), (i))
-#define sk_ENGINE_CLEANUP_ITEM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE_CLEANUP_ITEM, (st), (cmp))
-#define sk_ENGINE_CLEANUP_ITEM_dup(st) SKM_sk_dup(ENGINE_CLEANUP_ITEM, st)
-#define sk_ENGINE_CLEANUP_ITEM_pop_free(st, free_func) SKM_sk_pop_free(ENGINE_CLEANUP_ITEM, (st), (free_func))
-#define sk_ENGINE_CLEANUP_ITEM_shift(st) SKM_sk_shift(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_pop(st) SKM_sk_pop(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_sort(st) SKM_sk_sort(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_is_sorted(st) SKM_sk_is_sorted(ENGINE_CLEANUP_ITEM, (st))
-
-#define sk_ESS_CERT_ID_new(cmp) SKM_sk_new(ESS_CERT_ID, (cmp))
-#define sk_ESS_CERT_ID_new_null() SKM_sk_new_null(ESS_CERT_ID)
-#define sk_ESS_CERT_ID_free(st) SKM_sk_free(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_num(st) SKM_sk_num(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_value(st, i) SKM_sk_value(ESS_CERT_ID, (st), (i))
-#define sk_ESS_CERT_ID_set(st, i, val) SKM_sk_set(ESS_CERT_ID, (st), (i), (val))
-#define sk_ESS_CERT_ID_zero(st) SKM_sk_zero(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_push(st, val) SKM_sk_push(ESS_CERT_ID, (st), (val))
-#define sk_ESS_CERT_ID_unshift(st, val) SKM_sk_unshift(ESS_CERT_ID, (st), (val))
-#define sk_ESS_CERT_ID_find(st, val) SKM_sk_find(ESS_CERT_ID, (st), (val))
-#define sk_ESS_CERT_ID_find_ex(st, val) SKM_sk_find_ex(ESS_CERT_ID, (st), (val))
-#define sk_ESS_CERT_ID_delete(st, i) SKM_sk_delete(ESS_CERT_ID, (st), (i))
-#define sk_ESS_CERT_ID_delete_ptr(st, ptr) SKM_sk_delete_ptr(ESS_CERT_ID, (st), (ptr))
-#define sk_ESS_CERT_ID_insert(st, val, i) SKM_sk_insert(ESS_CERT_ID, (st), (val), (i))
-#define sk_ESS_CERT_ID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ESS_CERT_ID, (st), (cmp))
-#define sk_ESS_CERT_ID_dup(st) SKM_sk_dup(ESS_CERT_ID, st)
-#define sk_ESS_CERT_ID_pop_free(st, free_func) SKM_sk_pop_free(ESS_CERT_ID, (st), (free_func))
-#define sk_ESS_CERT_ID_shift(st) SKM_sk_shift(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_pop(st) SKM_sk_pop(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_sort(st) SKM_sk_sort(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_is_sorted(st) SKM_sk_is_sorted(ESS_CERT_ID, (st))
-
-#define sk_EVP_MD_new(cmp) SKM_sk_new(EVP_MD, (cmp))
-#define sk_EVP_MD_new_null() SKM_sk_new_null(EVP_MD)
-#define sk_EVP_MD_free(st) SKM_sk_free(EVP_MD, (st))
-#define sk_EVP_MD_num(st) SKM_sk_num(EVP_MD, (st))
-#define sk_EVP_MD_value(st, i) SKM_sk_value(EVP_MD, (st), (i))
-#define sk_EVP_MD_set(st, i, val) SKM_sk_set(EVP_MD, (st), (i), (val))
-#define sk_EVP_MD_zero(st) SKM_sk_zero(EVP_MD, (st))
-#define sk_EVP_MD_push(st, val) SKM_sk_push(EVP_MD, (st), (val))
-#define sk_EVP_MD_unshift(st, val) SKM_sk_unshift(EVP_MD, (st), (val))
-#define sk_EVP_MD_find(st, val) SKM_sk_find(EVP_MD, (st), (val))
-#define sk_EVP_MD_find_ex(st, val) SKM_sk_find_ex(EVP_MD, (st), (val))
-#define sk_EVP_MD_delete(st, i) SKM_sk_delete(EVP_MD, (st), (i))
-#define sk_EVP_MD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_MD, (st), (ptr))
-#define sk_EVP_MD_insert(st, val, i) SKM_sk_insert(EVP_MD, (st), (val), (i))
-#define sk_EVP_MD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_MD, (st), (cmp))
-#define sk_EVP_MD_dup(st) SKM_sk_dup(EVP_MD, st)
-#define sk_EVP_MD_pop_free(st, free_func) SKM_sk_pop_free(EVP_MD, (st), (free_func))
-#define sk_EVP_MD_shift(st) SKM_sk_shift(EVP_MD, (st))
-#define sk_EVP_MD_pop(st) SKM_sk_pop(EVP_MD, (st))
-#define sk_EVP_MD_sort(st) SKM_sk_sort(EVP_MD, (st))
-#define sk_EVP_MD_is_sorted(st) SKM_sk_is_sorted(EVP_MD, (st))
-
-#define sk_EVP_PBE_CTL_new(cmp) SKM_sk_new(EVP_PBE_CTL, (cmp))
-#define sk_EVP_PBE_CTL_new_null() SKM_sk_new_null(EVP_PBE_CTL)
-#define sk_EVP_PBE_CTL_free(st) SKM_sk_free(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_num(st) SKM_sk_num(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_value(st, i) SKM_sk_value(EVP_PBE_CTL, (st), (i))
-#define sk_EVP_PBE_CTL_set(st, i, val) SKM_sk_set(EVP_PBE_CTL, (st), (i), (val))
-#define sk_EVP_PBE_CTL_zero(st) SKM_sk_zero(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_push(st, val) SKM_sk_push(EVP_PBE_CTL, (st), (val))
-#define sk_EVP_PBE_CTL_unshift(st, val) SKM_sk_unshift(EVP_PBE_CTL, (st), (val))
-#define sk_EVP_PBE_CTL_find(st, val) SKM_sk_find(EVP_PBE_CTL, (st), (val))
-#define sk_EVP_PBE_CTL_find_ex(st, val) SKM_sk_find_ex(EVP_PBE_CTL, (st), (val))
-#define sk_EVP_PBE_CTL_delete(st, i) SKM_sk_delete(EVP_PBE_CTL, (st), (i))
-#define sk_EVP_PBE_CTL_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PBE_CTL, (st), (ptr))
-#define sk_EVP_PBE_CTL_insert(st, val, i) SKM_sk_insert(EVP_PBE_CTL, (st), (val), (i))
-#define sk_EVP_PBE_CTL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PBE_CTL, (st), (cmp))
-#define sk_EVP_PBE_CTL_dup(st) SKM_sk_dup(EVP_PBE_CTL, st)
-#define sk_EVP_PBE_CTL_pop_free(st, free_func) SKM_sk_pop_free(EVP_PBE_CTL, (st), (free_func))
-#define sk_EVP_PBE_CTL_shift(st) SKM_sk_shift(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_pop(st) SKM_sk_pop(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_sort(st) SKM_sk_sort(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_is_sorted(st) SKM_sk_is_sorted(EVP_PBE_CTL, (st))
-
-#define sk_EVP_PKEY_ASN1_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_ASN1_METHOD, (cmp))
-#define sk_EVP_PKEY_ASN1_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_ASN1_METHOD)
-#define sk_EVP_PKEY_ASN1_METHOD_free(st) SKM_sk_free(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_num(st) SKM_sk_num(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_ASN1_METHOD, (st), (i))
-#define sk_EVP_PKEY_ASN1_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_ASN1_METHOD, (st), (i), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_ASN1_METHOD, (st), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_ASN1_METHOD, (st), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_ASN1_METHOD, (st), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_ASN1_METHOD, (st), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_ASN1_METHOD, (st), (i))
-#define sk_EVP_PKEY_ASN1_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_ASN1_METHOD, (st), (ptr))
-#define sk_EVP_PKEY_ASN1_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_ASN1_METHOD, (st), (val), (i))
-#define sk_EVP_PKEY_ASN1_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_ASN1_METHOD, (st), (cmp))
-#define sk_EVP_PKEY_ASN1_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_ASN1_METHOD, st)
-#define sk_EVP_PKEY_ASN1_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_ASN1_METHOD, (st), (free_func))
-#define sk_EVP_PKEY_ASN1_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_ASN1_METHOD, (st))
-
-#define sk_EVP_PKEY_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_METHOD, (cmp))
-#define sk_EVP_PKEY_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_METHOD)
-#define sk_EVP_PKEY_METHOD_free(st) SKM_sk_free(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_num(st) SKM_sk_num(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_METHOD, (st), (i))
-#define sk_EVP_PKEY_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_METHOD, (st), (i), (val))
-#define sk_EVP_PKEY_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_METHOD, (st), (val))
-#define sk_EVP_PKEY_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_METHOD, (st), (val))
-#define sk_EVP_PKEY_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_METHOD, (st), (val))
-#define sk_EVP_PKEY_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_METHOD, (st), (val))
-#define sk_EVP_PKEY_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_METHOD, (st), (i))
-#define sk_EVP_PKEY_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_METHOD, (st), (ptr))
-#define sk_EVP_PKEY_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_METHOD, (st), (val), (i))
-#define sk_EVP_PKEY_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_METHOD, (st), (cmp))
-#define sk_EVP_PKEY_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_METHOD, st)
-#define sk_EVP_PKEY_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_METHOD, (st), (free_func))
-#define sk_EVP_PKEY_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_METHOD, (st))
-
-#define sk_GENERAL_NAME_new(cmp) SKM_sk_new(GENERAL_NAME, (cmp))
-#define sk_GENERAL_NAME_new_null() SKM_sk_new_null(GENERAL_NAME)
-#define sk_GENERAL_NAME_free(st) SKM_sk_free(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_num(st) SKM_sk_num(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_value(st, i) SKM_sk_value(GENERAL_NAME, (st), (i))
-#define sk_GENERAL_NAME_set(st, i, val) SKM_sk_set(GENERAL_NAME, (st), (i), (val))
-#define sk_GENERAL_NAME_zero(st) SKM_sk_zero(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_push(st, val) SKM_sk_push(GENERAL_NAME, (st), (val))
-#define sk_GENERAL_NAME_unshift(st, val) SKM_sk_unshift(GENERAL_NAME, (st), (val))
-#define sk_GENERAL_NAME_find(st, val) SKM_sk_find(GENERAL_NAME, (st), (val))
-#define sk_GENERAL_NAME_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAME, (st), (val))
-#define sk_GENERAL_NAME_delete(st, i) SKM_sk_delete(GENERAL_NAME, (st), (i))
-#define sk_GENERAL_NAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAME, (st), (ptr))
-#define sk_GENERAL_NAME_insert(st, val, i) SKM_sk_insert(GENERAL_NAME, (st), (val), (i))
-#define sk_GENERAL_NAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAME, (st), (cmp))
-#define sk_GENERAL_NAME_dup(st) SKM_sk_dup(GENERAL_NAME, st)
-#define sk_GENERAL_NAME_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAME, (st), (free_func))
-#define sk_GENERAL_NAME_shift(st) SKM_sk_shift(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_pop(st) SKM_sk_pop(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_sort(st) SKM_sk_sort(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAME, (st))
-
-#define sk_GENERAL_NAMES_new(cmp) SKM_sk_new(GENERAL_NAMES, (cmp))
-#define sk_GENERAL_NAMES_new_null() SKM_sk_new_null(GENERAL_NAMES)
-#define sk_GENERAL_NAMES_free(st) SKM_sk_free(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_num(st) SKM_sk_num(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_value(st, i) SKM_sk_value(GENERAL_NAMES, (st), (i))
-#define sk_GENERAL_NAMES_set(st, i, val) SKM_sk_set(GENERAL_NAMES, (st), (i), (val))
-#define sk_GENERAL_NAMES_zero(st) SKM_sk_zero(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_push(st, val) SKM_sk_push(GENERAL_NAMES, (st), (val))
-#define sk_GENERAL_NAMES_unshift(st, val) SKM_sk_unshift(GENERAL_NAMES, (st), (val))
-#define sk_GENERAL_NAMES_find(st, val) SKM_sk_find(GENERAL_NAMES, (st), (val))
-#define sk_GENERAL_NAMES_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAMES, (st), (val))
-#define sk_GENERAL_NAMES_delete(st, i) SKM_sk_delete(GENERAL_NAMES, (st), (i))
-#define sk_GENERAL_NAMES_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAMES, (st), (ptr))
-#define sk_GENERAL_NAMES_insert(st, val, i) SKM_sk_insert(GENERAL_NAMES, (st), (val), (i))
-#define sk_GENERAL_NAMES_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAMES, (st), (cmp))
-#define sk_GENERAL_NAMES_dup(st) SKM_sk_dup(GENERAL_NAMES, st)
-#define sk_GENERAL_NAMES_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAMES, (st), (free_func))
-#define sk_GENERAL_NAMES_shift(st) SKM_sk_shift(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_pop(st) SKM_sk_pop(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_sort(st) SKM_sk_sort(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAMES, (st))
-
-#define sk_GENERAL_SUBTREE_new(cmp) SKM_sk_new(GENERAL_SUBTREE, (cmp))
-#define sk_GENERAL_SUBTREE_new_null() SKM_sk_new_null(GENERAL_SUBTREE)
-#define sk_GENERAL_SUBTREE_free(st) SKM_sk_free(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_num(st) SKM_sk_num(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_value(st, i) SKM_sk_value(GENERAL_SUBTREE, (st), (i))
-#define sk_GENERAL_SUBTREE_set(st, i, val) SKM_sk_set(GENERAL_SUBTREE, (st), (i), (val))
-#define sk_GENERAL_SUBTREE_zero(st) SKM_sk_zero(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_push(st, val) SKM_sk_push(GENERAL_SUBTREE, (st), (val))
-#define sk_GENERAL_SUBTREE_unshift(st, val) SKM_sk_unshift(GENERAL_SUBTREE, (st), (val))
-#define sk_GENERAL_SUBTREE_find(st, val) SKM_sk_find(GENERAL_SUBTREE, (st), (val))
-#define sk_GENERAL_SUBTREE_find_ex(st, val) SKM_sk_find_ex(GENERAL_SUBTREE, (st), (val))
-#define sk_GENERAL_SUBTREE_delete(st, i) SKM_sk_delete(GENERAL_SUBTREE, (st), (i))
-#define sk_GENERAL_SUBTREE_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_SUBTREE, (st), (ptr))
-#define sk_GENERAL_SUBTREE_insert(st, val, i) SKM_sk_insert(GENERAL_SUBTREE, (st), (val), (i))
-#define sk_GENERAL_SUBTREE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_SUBTREE, (st), (cmp))
-#define sk_GENERAL_SUBTREE_dup(st) SKM_sk_dup(GENERAL_SUBTREE, st)
-#define sk_GENERAL_SUBTREE_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_SUBTREE, (st), (free_func))
-#define sk_GENERAL_SUBTREE_shift(st) SKM_sk_shift(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_pop(st) SKM_sk_pop(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_sort(st) SKM_sk_sort(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_is_sorted(st) SKM_sk_is_sorted(GENERAL_SUBTREE, (st))
-
-#define sk_IPAddressFamily_new(cmp) SKM_sk_new(IPAddressFamily, (cmp))
-#define sk_IPAddressFamily_new_null() SKM_sk_new_null(IPAddressFamily)
-#define sk_IPAddressFamily_free(st) SKM_sk_free(IPAddressFamily, (st))
-#define sk_IPAddressFamily_num(st) SKM_sk_num(IPAddressFamily, (st))
-#define sk_IPAddressFamily_value(st, i) SKM_sk_value(IPAddressFamily, (st), (i))
-#define sk_IPAddressFamily_set(st, i, val) SKM_sk_set(IPAddressFamily, (st), (i), (val))
-#define sk_IPAddressFamily_zero(st) SKM_sk_zero(IPAddressFamily, (st))
-#define sk_IPAddressFamily_push(st, val) SKM_sk_push(IPAddressFamily, (st), (val))
-#define sk_IPAddressFamily_unshift(st, val) SKM_sk_unshift(IPAddressFamily, (st), (val))
-#define sk_IPAddressFamily_find(st, val) SKM_sk_find(IPAddressFamily, (st), (val))
-#define sk_IPAddressFamily_find_ex(st, val) SKM_sk_find_ex(IPAddressFamily, (st), (val))
-#define sk_IPAddressFamily_delete(st, i) SKM_sk_delete(IPAddressFamily, (st), (i))
-#define sk_IPAddressFamily_delete_ptr(st, ptr) SKM_sk_delete_ptr(IPAddressFamily, (st), (ptr))
-#define sk_IPAddressFamily_insert(st, val, i) SKM_sk_insert(IPAddressFamily, (st), (val), (i))
-#define sk_IPAddressFamily_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(IPAddressFamily, (st), (cmp))
-#define sk_IPAddressFamily_dup(st) SKM_sk_dup(IPAddressFamily, st)
-#define sk_IPAddressFamily_pop_free(st, free_func) SKM_sk_pop_free(IPAddressFamily, (st), (free_func))
-#define sk_IPAddressFamily_shift(st) SKM_sk_shift(IPAddressFamily, (st))
-#define sk_IPAddressFamily_pop(st) SKM_sk_pop(IPAddressFamily, (st))
-#define sk_IPAddressFamily_sort(st) SKM_sk_sort(IPAddressFamily, (st))
-#define sk_IPAddressFamily_is_sorted(st) SKM_sk_is_sorted(IPAddressFamily, (st))
-
-#define sk_IPAddressOrRange_new(cmp) SKM_sk_new(IPAddressOrRange, (cmp))
-#define sk_IPAddressOrRange_new_null() SKM_sk_new_null(IPAddressOrRange)
-#define sk_IPAddressOrRange_free(st) SKM_sk_free(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_num(st) SKM_sk_num(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_value(st, i) SKM_sk_value(IPAddressOrRange, (st), (i))
-#define sk_IPAddressOrRange_set(st, i, val) SKM_sk_set(IPAddressOrRange, (st), (i), (val))
-#define sk_IPAddressOrRange_zero(st) SKM_sk_zero(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_push(st, val) SKM_sk_push(IPAddressOrRange, (st), (val))
-#define sk_IPAddressOrRange_unshift(st, val) SKM_sk_unshift(IPAddressOrRange, (st), (val))
-#define sk_IPAddressOrRange_find(st, val) SKM_sk_find(IPAddressOrRange, (st), (val))
-#define sk_IPAddressOrRange_find_ex(st, val) SKM_sk_find_ex(IPAddressOrRange, (st), (val))
-#define sk_IPAddressOrRange_delete(st, i) SKM_sk_delete(IPAddressOrRange, (st), (i))
-#define sk_IPAddressOrRange_delete_ptr(st, ptr) SKM_sk_delete_ptr(IPAddressOrRange, (st), (ptr))
-#define sk_IPAddressOrRange_insert(st, val, i) SKM_sk_insert(IPAddressOrRange, (st), (val), (i))
-#define sk_IPAddressOrRange_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(IPAddressOrRange, (st), (cmp))
-#define sk_IPAddressOrRange_dup(st) SKM_sk_dup(IPAddressOrRange, st)
-#define sk_IPAddressOrRange_pop_free(st, free_func) SKM_sk_pop_free(IPAddressOrRange, (st), (free_func))
-#define sk_IPAddressOrRange_shift(st) SKM_sk_shift(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_pop(st) SKM_sk_pop(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_sort(st) SKM_sk_sort(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_is_sorted(st) SKM_sk_is_sorted(IPAddressOrRange, (st))
-
-#define sk_KRB5_APREQBODY_new(cmp) SKM_sk_new(KRB5_APREQBODY, (cmp))
-#define sk_KRB5_APREQBODY_new_null() SKM_sk_new_null(KRB5_APREQBODY)
-#define sk_KRB5_APREQBODY_free(st) SKM_sk_free(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_num(st) SKM_sk_num(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_value(st, i) SKM_sk_value(KRB5_APREQBODY, (st), (i))
-#define sk_KRB5_APREQBODY_set(st, i, val) SKM_sk_set(KRB5_APREQBODY, (st), (i), (val))
-#define sk_KRB5_APREQBODY_zero(st) SKM_sk_zero(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_push(st, val) SKM_sk_push(KRB5_APREQBODY, (st), (val))
-#define sk_KRB5_APREQBODY_unshift(st, val) SKM_sk_unshift(KRB5_APREQBODY, (st), (val))
-#define sk_KRB5_APREQBODY_find(st, val) SKM_sk_find(KRB5_APREQBODY, (st), (val))
-#define sk_KRB5_APREQBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_APREQBODY, (st), (val))
-#define sk_KRB5_APREQBODY_delete(st, i) SKM_sk_delete(KRB5_APREQBODY, (st), (i))
-#define sk_KRB5_APREQBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_APREQBODY, (st), (ptr))
-#define sk_KRB5_APREQBODY_insert(st, val, i) SKM_sk_insert(KRB5_APREQBODY, (st), (val), (i))
-#define sk_KRB5_APREQBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_APREQBODY, (st), (cmp))
-#define sk_KRB5_APREQBODY_dup(st) SKM_sk_dup(KRB5_APREQBODY, st)
-#define sk_KRB5_APREQBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_APREQBODY, (st), (free_func))
-#define sk_KRB5_APREQBODY_shift(st) SKM_sk_shift(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_pop(st) SKM_sk_pop(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_sort(st) SKM_sk_sort(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_APREQBODY, (st))
-
-#define sk_KRB5_AUTHDATA_new(cmp) SKM_sk_new(KRB5_AUTHDATA, (cmp))
-#define sk_KRB5_AUTHDATA_new_null() SKM_sk_new_null(KRB5_AUTHDATA)
-#define sk_KRB5_AUTHDATA_free(st) SKM_sk_free(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_num(st) SKM_sk_num(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_value(st, i) SKM_sk_value(KRB5_AUTHDATA, (st), (i))
-#define sk_KRB5_AUTHDATA_set(st, i, val) SKM_sk_set(KRB5_AUTHDATA, (st), (i), (val))
-#define sk_KRB5_AUTHDATA_zero(st) SKM_sk_zero(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_push(st, val) SKM_sk_push(KRB5_AUTHDATA, (st), (val))
-#define sk_KRB5_AUTHDATA_unshift(st, val) SKM_sk_unshift(KRB5_AUTHDATA, (st), (val))
-#define sk_KRB5_AUTHDATA_find(st, val) SKM_sk_find(KRB5_AUTHDATA, (st), (val))
-#define sk_KRB5_AUTHDATA_find_ex(st, val) SKM_sk_find_ex(KRB5_AUTHDATA, (st), (val))
-#define sk_KRB5_AUTHDATA_delete(st, i) SKM_sk_delete(KRB5_AUTHDATA, (st), (i))
-#define sk_KRB5_AUTHDATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_AUTHDATA, (st), (ptr))
-#define sk_KRB5_AUTHDATA_insert(st, val, i) SKM_sk_insert(KRB5_AUTHDATA, (st), (val), (i))
-#define sk_KRB5_AUTHDATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_AUTHDATA, (st), (cmp))
-#define sk_KRB5_AUTHDATA_dup(st) SKM_sk_dup(KRB5_AUTHDATA, st)
-#define sk_KRB5_AUTHDATA_pop_free(st, free_func) SKM_sk_pop_free(KRB5_AUTHDATA, (st), (free_func))
-#define sk_KRB5_AUTHDATA_shift(st) SKM_sk_shift(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_pop(st) SKM_sk_pop(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_sort(st) SKM_sk_sort(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHDATA, (st))
-
-#define sk_KRB5_AUTHENTBODY_new(cmp) SKM_sk_new(KRB5_AUTHENTBODY, (cmp))
-#define sk_KRB5_AUTHENTBODY_new_null() SKM_sk_new_null(KRB5_AUTHENTBODY)
-#define sk_KRB5_AUTHENTBODY_free(st) SKM_sk_free(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_num(st) SKM_sk_num(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_value(st, i) SKM_sk_value(KRB5_AUTHENTBODY, (st), (i))
-#define sk_KRB5_AUTHENTBODY_set(st, i, val) SKM_sk_set(KRB5_AUTHENTBODY, (st), (i), (val))
-#define sk_KRB5_AUTHENTBODY_zero(st) SKM_sk_zero(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_push(st, val) SKM_sk_push(KRB5_AUTHENTBODY, (st), (val))
-#define sk_KRB5_AUTHENTBODY_unshift(st, val) SKM_sk_unshift(KRB5_AUTHENTBODY, (st), (val))
-#define sk_KRB5_AUTHENTBODY_find(st, val) SKM_sk_find(KRB5_AUTHENTBODY, (st), (val))
-#define sk_KRB5_AUTHENTBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_AUTHENTBODY, (st), (val))
-#define sk_KRB5_AUTHENTBODY_delete(st, i) SKM_sk_delete(KRB5_AUTHENTBODY, (st), (i))
-#define sk_KRB5_AUTHENTBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_AUTHENTBODY, (st), (ptr))
-#define sk_KRB5_AUTHENTBODY_insert(st, val, i) SKM_sk_insert(KRB5_AUTHENTBODY, (st), (val), (i))
-#define sk_KRB5_AUTHENTBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_AUTHENTBODY, (st), (cmp))
-#define sk_KRB5_AUTHENTBODY_dup(st) SKM_sk_dup(KRB5_AUTHENTBODY, st)
-#define sk_KRB5_AUTHENTBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_AUTHENTBODY, (st), (free_func))
-#define sk_KRB5_AUTHENTBODY_shift(st) SKM_sk_shift(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_pop(st) SKM_sk_pop(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_sort(st) SKM_sk_sort(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHENTBODY, (st))
-
-#define sk_KRB5_CHECKSUM_new(cmp) SKM_sk_new(KRB5_CHECKSUM, (cmp))
-#define sk_KRB5_CHECKSUM_new_null() SKM_sk_new_null(KRB5_CHECKSUM)
-#define sk_KRB5_CHECKSUM_free(st) SKM_sk_free(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_num(st) SKM_sk_num(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_value(st, i) SKM_sk_value(KRB5_CHECKSUM, (st), (i))
-#define sk_KRB5_CHECKSUM_set(st, i, val) SKM_sk_set(KRB5_CHECKSUM, (st), (i), (val))
-#define sk_KRB5_CHECKSUM_zero(st) SKM_sk_zero(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_push(st, val) SKM_sk_push(KRB5_CHECKSUM, (st), (val))
-#define sk_KRB5_CHECKSUM_unshift(st, val) SKM_sk_unshift(KRB5_CHECKSUM, (st), (val))
-#define sk_KRB5_CHECKSUM_find(st, val) SKM_sk_find(KRB5_CHECKSUM, (st), (val))
-#define sk_KRB5_CHECKSUM_find_ex(st, val) SKM_sk_find_ex(KRB5_CHECKSUM, (st), (val))
-#define sk_KRB5_CHECKSUM_delete(st, i) SKM_sk_delete(KRB5_CHECKSUM, (st), (i))
-#define sk_KRB5_CHECKSUM_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_CHECKSUM, (st), (ptr))
-#define sk_KRB5_CHECKSUM_insert(st, val, i) SKM_sk_insert(KRB5_CHECKSUM, (st), (val), (i))
-#define sk_KRB5_CHECKSUM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_CHECKSUM, (st), (cmp))
-#define sk_KRB5_CHECKSUM_dup(st) SKM_sk_dup(KRB5_CHECKSUM, st)
-#define sk_KRB5_CHECKSUM_pop_free(st, free_func) SKM_sk_pop_free(KRB5_CHECKSUM, (st), (free_func))
-#define sk_KRB5_CHECKSUM_shift(st) SKM_sk_shift(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_pop(st) SKM_sk_pop(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_sort(st) SKM_sk_sort(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_is_sorted(st) SKM_sk_is_sorted(KRB5_CHECKSUM, (st))
-
-#define sk_KRB5_ENCDATA_new(cmp) SKM_sk_new(KRB5_ENCDATA, (cmp))
-#define sk_KRB5_ENCDATA_new_null() SKM_sk_new_null(KRB5_ENCDATA)
-#define sk_KRB5_ENCDATA_free(st) SKM_sk_free(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_num(st) SKM_sk_num(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_value(st, i) SKM_sk_value(KRB5_ENCDATA, (st), (i))
-#define sk_KRB5_ENCDATA_set(st, i, val) SKM_sk_set(KRB5_ENCDATA, (st), (i), (val))
-#define sk_KRB5_ENCDATA_zero(st) SKM_sk_zero(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_push(st, val) SKM_sk_push(KRB5_ENCDATA, (st), (val))
-#define sk_KRB5_ENCDATA_unshift(st, val) SKM_sk_unshift(KRB5_ENCDATA, (st), (val))
-#define sk_KRB5_ENCDATA_find(st, val) SKM_sk_find(KRB5_ENCDATA, (st), (val))
-#define sk_KRB5_ENCDATA_find_ex(st, val) SKM_sk_find_ex(KRB5_ENCDATA, (st), (val))
-#define sk_KRB5_ENCDATA_delete(st, i) SKM_sk_delete(KRB5_ENCDATA, (st), (i))
-#define sk_KRB5_ENCDATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_ENCDATA, (st), (ptr))
-#define sk_KRB5_ENCDATA_insert(st, val, i) SKM_sk_insert(KRB5_ENCDATA, (st), (val), (i))
-#define sk_KRB5_ENCDATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_ENCDATA, (st), (cmp))
-#define sk_KRB5_ENCDATA_dup(st) SKM_sk_dup(KRB5_ENCDATA, st)
-#define sk_KRB5_ENCDATA_pop_free(st, free_func) SKM_sk_pop_free(KRB5_ENCDATA, (st), (free_func))
-#define sk_KRB5_ENCDATA_shift(st) SKM_sk_shift(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_pop(st) SKM_sk_pop(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_sort(st) SKM_sk_sort(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCDATA, (st))
-
-#define sk_KRB5_ENCKEY_new(cmp) SKM_sk_new(KRB5_ENCKEY, (cmp))
-#define sk_KRB5_ENCKEY_new_null() SKM_sk_new_null(KRB5_ENCKEY)
-#define sk_KRB5_ENCKEY_free(st) SKM_sk_free(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_num(st) SKM_sk_num(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_value(st, i) SKM_sk_value(KRB5_ENCKEY, (st), (i))
-#define sk_KRB5_ENCKEY_set(st, i, val) SKM_sk_set(KRB5_ENCKEY, (st), (i), (val))
-#define sk_KRB5_ENCKEY_zero(st) SKM_sk_zero(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_push(st, val) SKM_sk_push(KRB5_ENCKEY, (st), (val))
-#define sk_KRB5_ENCKEY_unshift(st, val) SKM_sk_unshift(KRB5_ENCKEY, (st), (val))
-#define sk_KRB5_ENCKEY_find(st, val) SKM_sk_find(KRB5_ENCKEY, (st), (val))
-#define sk_KRB5_ENCKEY_find_ex(st, val) SKM_sk_find_ex(KRB5_ENCKEY, (st), (val))
-#define sk_KRB5_ENCKEY_delete(st, i) SKM_sk_delete(KRB5_ENCKEY, (st), (i))
-#define sk_KRB5_ENCKEY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_ENCKEY, (st), (ptr))
-#define sk_KRB5_ENCKEY_insert(st, val, i) SKM_sk_insert(KRB5_ENCKEY, (st), (val), (i))
-#define sk_KRB5_ENCKEY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_ENCKEY, (st), (cmp))
-#define sk_KRB5_ENCKEY_dup(st) SKM_sk_dup(KRB5_ENCKEY, st)
-#define sk_KRB5_ENCKEY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_ENCKEY, (st), (free_func))
-#define sk_KRB5_ENCKEY_shift(st) SKM_sk_shift(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_pop(st) SKM_sk_pop(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_sort(st) SKM_sk_sort(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCKEY, (st))
-
-#define sk_KRB5_PRINCNAME_new(cmp) SKM_sk_new(KRB5_PRINCNAME, (cmp))
-#define sk_KRB5_PRINCNAME_new_null() SKM_sk_new_null(KRB5_PRINCNAME)
-#define sk_KRB5_PRINCNAME_free(st) SKM_sk_free(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_num(st) SKM_sk_num(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_value(st, i) SKM_sk_value(KRB5_PRINCNAME, (st), (i))
-#define sk_KRB5_PRINCNAME_set(st, i, val) SKM_sk_set(KRB5_PRINCNAME, (st), (i), (val))
-#define sk_KRB5_PRINCNAME_zero(st) SKM_sk_zero(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_push(st, val) SKM_sk_push(KRB5_PRINCNAME, (st), (val))
-#define sk_KRB5_PRINCNAME_unshift(st, val) SKM_sk_unshift(KRB5_PRINCNAME, (st), (val))
-#define sk_KRB5_PRINCNAME_find(st, val) SKM_sk_find(KRB5_PRINCNAME, (st), (val))
-#define sk_KRB5_PRINCNAME_find_ex(st, val) SKM_sk_find_ex(KRB5_PRINCNAME, (st), (val))
-#define sk_KRB5_PRINCNAME_delete(st, i) SKM_sk_delete(KRB5_PRINCNAME, (st), (i))
-#define sk_KRB5_PRINCNAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_PRINCNAME, (st), (ptr))
-#define sk_KRB5_PRINCNAME_insert(st, val, i) SKM_sk_insert(KRB5_PRINCNAME, (st), (val), (i))
-#define sk_KRB5_PRINCNAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_PRINCNAME, (st), (cmp))
-#define sk_KRB5_PRINCNAME_dup(st) SKM_sk_dup(KRB5_PRINCNAME, st)
-#define sk_KRB5_PRINCNAME_pop_free(st, free_func) SKM_sk_pop_free(KRB5_PRINCNAME, (st), (free_func))
-#define sk_KRB5_PRINCNAME_shift(st) SKM_sk_shift(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_pop(st) SKM_sk_pop(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_sort(st) SKM_sk_sort(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_is_sorted(st) SKM_sk_is_sorted(KRB5_PRINCNAME, (st))
-
-#define sk_KRB5_TKTBODY_new(cmp) SKM_sk_new(KRB5_TKTBODY, (cmp))
-#define sk_KRB5_TKTBODY_new_null() SKM_sk_new_null(KRB5_TKTBODY)
-#define sk_KRB5_TKTBODY_free(st) SKM_sk_free(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_num(st) SKM_sk_num(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_value(st, i) SKM_sk_value(KRB5_TKTBODY, (st), (i))
-#define sk_KRB5_TKTBODY_set(st, i, val) SKM_sk_set(KRB5_TKTBODY, (st), (i), (val))
-#define sk_KRB5_TKTBODY_zero(st) SKM_sk_zero(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_push(st, val) SKM_sk_push(KRB5_TKTBODY, (st), (val))
-#define sk_KRB5_TKTBODY_unshift(st, val) SKM_sk_unshift(KRB5_TKTBODY, (st), (val))
-#define sk_KRB5_TKTBODY_find(st, val) SKM_sk_find(KRB5_TKTBODY, (st), (val))
-#define sk_KRB5_TKTBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_TKTBODY, (st), (val))
-#define sk_KRB5_TKTBODY_delete(st, i) SKM_sk_delete(KRB5_TKTBODY, (st), (i))
-#define sk_KRB5_TKTBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_TKTBODY, (st), (ptr))
-#define sk_KRB5_TKTBODY_insert(st, val, i) SKM_sk_insert(KRB5_TKTBODY, (st), (val), (i))
-#define sk_KRB5_TKTBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_TKTBODY, (st), (cmp))
-#define sk_KRB5_TKTBODY_dup(st) SKM_sk_dup(KRB5_TKTBODY, st)
-#define sk_KRB5_TKTBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_TKTBODY, (st), (free_func))
-#define sk_KRB5_TKTBODY_shift(st) SKM_sk_shift(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_pop(st) SKM_sk_pop(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_sort(st) SKM_sk_sort(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_TKTBODY, (st))
-
-#define sk_MEM_OBJECT_DATA_new(cmp) SKM_sk_new(MEM_OBJECT_DATA, (cmp))
-#define sk_MEM_OBJECT_DATA_new_null() SKM_sk_new_null(MEM_OBJECT_DATA)
-#define sk_MEM_OBJECT_DATA_free(st) SKM_sk_free(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_num(st) SKM_sk_num(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_value(st, i) SKM_sk_value(MEM_OBJECT_DATA, (st), (i))
-#define sk_MEM_OBJECT_DATA_set(st, i, val) SKM_sk_set(MEM_OBJECT_DATA, (st), (i), (val))
-#define sk_MEM_OBJECT_DATA_zero(st) SKM_sk_zero(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_push(st, val) SKM_sk_push(MEM_OBJECT_DATA, (st), (val))
-#define sk_MEM_OBJECT_DATA_unshift(st, val) SKM_sk_unshift(MEM_OBJECT_DATA, (st), (val))
-#define sk_MEM_OBJECT_DATA_find(st, val) SKM_sk_find(MEM_OBJECT_DATA, (st), (val))
-#define sk_MEM_OBJECT_DATA_find_ex(st, val) SKM_sk_find_ex(MEM_OBJECT_DATA, (st), (val))
-#define sk_MEM_OBJECT_DATA_delete(st, i) SKM_sk_delete(MEM_OBJECT_DATA, (st), (i))
-#define sk_MEM_OBJECT_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(MEM_OBJECT_DATA, (st), (ptr))
-#define sk_MEM_OBJECT_DATA_insert(st, val, i) SKM_sk_insert(MEM_OBJECT_DATA, (st), (val), (i))
-#define sk_MEM_OBJECT_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MEM_OBJECT_DATA, (st), (cmp))
-#define sk_MEM_OBJECT_DATA_dup(st) SKM_sk_dup(MEM_OBJECT_DATA, st)
-#define sk_MEM_OBJECT_DATA_pop_free(st, free_func) SKM_sk_pop_free(MEM_OBJECT_DATA, (st), (free_func))
-#define sk_MEM_OBJECT_DATA_shift(st) SKM_sk_shift(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_pop(st) SKM_sk_pop(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_sort(st) SKM_sk_sort(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_is_sorted(st) SKM_sk_is_sorted(MEM_OBJECT_DATA, (st))
-
-#define sk_MIME_HEADER_new(cmp) SKM_sk_new(MIME_HEADER, (cmp))
-#define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER)
-#define sk_MIME_HEADER_free(st) SKM_sk_free(MIME_HEADER, (st))
-#define sk_MIME_HEADER_num(st) SKM_sk_num(MIME_HEADER, (st))
-#define sk_MIME_HEADER_value(st, i) SKM_sk_value(MIME_HEADER, (st), (i))
-#define sk_MIME_HEADER_set(st, i, val) SKM_sk_set(MIME_HEADER, (st), (i), (val))
-#define sk_MIME_HEADER_zero(st) SKM_sk_zero(MIME_HEADER, (st))
-#define sk_MIME_HEADER_push(st, val) SKM_sk_push(MIME_HEADER, (st), (val))
-#define sk_MIME_HEADER_unshift(st, val) SKM_sk_unshift(MIME_HEADER, (st), (val))
-#define sk_MIME_HEADER_find(st, val) SKM_sk_find(MIME_HEADER, (st), (val))
-#define sk_MIME_HEADER_find_ex(st, val) SKM_sk_find_ex(MIME_HEADER, (st), (val))
-#define sk_MIME_HEADER_delete(st, i) SKM_sk_delete(MIME_HEADER, (st), (i))
-#define sk_MIME_HEADER_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_HEADER, (st), (ptr))
-#define sk_MIME_HEADER_insert(st, val, i) SKM_sk_insert(MIME_HEADER, (st), (val), (i))
-#define sk_MIME_HEADER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_HEADER, (st), (cmp))
-#define sk_MIME_HEADER_dup(st) SKM_sk_dup(MIME_HEADER, st)
-#define sk_MIME_HEADER_pop_free(st, free_func) SKM_sk_pop_free(MIME_HEADER, (st), (free_func))
-#define sk_MIME_HEADER_shift(st) SKM_sk_shift(MIME_HEADER, (st))
-#define sk_MIME_HEADER_pop(st) SKM_sk_pop(MIME_HEADER, (st))
-#define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))
-#define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))
-
-#define sk_MIME_PARAM_new(cmp) SKM_sk_new(MIME_PARAM, (cmp))
-#define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)
-#define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))
-#define sk_MIME_PARAM_num(st) SKM_sk_num(MIME_PARAM, (st))
-#define sk_MIME_PARAM_value(st, i) SKM_sk_value(MIME_PARAM, (st), (i))
-#define sk_MIME_PARAM_set(st, i, val) SKM_sk_set(MIME_PARAM, (st), (i), (val))
-#define sk_MIME_PARAM_zero(st) SKM_sk_zero(MIME_PARAM, (st))
-#define sk_MIME_PARAM_push(st, val) SKM_sk_push(MIME_PARAM, (st), (val))
-#define sk_MIME_PARAM_unshift(st, val) SKM_sk_unshift(MIME_PARAM, (st), (val))
-#define sk_MIME_PARAM_find(st, val) SKM_sk_find(MIME_PARAM, (st), (val))
-#define sk_MIME_PARAM_find_ex(st, val) SKM_sk_find_ex(MIME_PARAM, (st), (val))
-#define sk_MIME_PARAM_delete(st, i) SKM_sk_delete(MIME_PARAM, (st), (i))
-#define sk_MIME_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_PARAM, (st), (ptr))
-#define sk_MIME_PARAM_insert(st, val, i) SKM_sk_insert(MIME_PARAM, (st), (val), (i))
-#define sk_MIME_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_PARAM, (st), (cmp))
-#define sk_MIME_PARAM_dup(st) SKM_sk_dup(MIME_PARAM, st)
-#define sk_MIME_PARAM_pop_free(st, free_func) SKM_sk_pop_free(MIME_PARAM, (st), (free_func))
-#define sk_MIME_PARAM_shift(st) SKM_sk_shift(MIME_PARAM, (st))
-#define sk_MIME_PARAM_pop(st) SKM_sk_pop(MIME_PARAM, (st))
-#define sk_MIME_PARAM_sort(st) SKM_sk_sort(MIME_PARAM, (st))
-#define sk_MIME_PARAM_is_sorted(st) SKM_sk_is_sorted(MIME_PARAM, (st))
-
-#define sk_NAME_FUNCS_new(cmp) SKM_sk_new(NAME_FUNCS, (cmp))
-#define sk_NAME_FUNCS_new_null() SKM_sk_new_null(NAME_FUNCS)
-#define sk_NAME_FUNCS_free(st) SKM_sk_free(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_num(st) SKM_sk_num(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_value(st, i) SKM_sk_value(NAME_FUNCS, (st), (i))
-#define sk_NAME_FUNCS_set(st, i, val) SKM_sk_set(NAME_FUNCS, (st), (i), (val))
-#define sk_NAME_FUNCS_zero(st) SKM_sk_zero(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_push(st, val) SKM_sk_push(NAME_FUNCS, (st), (val))
-#define sk_NAME_FUNCS_unshift(st, val) SKM_sk_unshift(NAME_FUNCS, (st), (val))
-#define sk_NAME_FUNCS_find(st, val) SKM_sk_find(NAME_FUNCS, (st), (val))
-#define sk_NAME_FUNCS_find_ex(st, val) SKM_sk_find_ex(NAME_FUNCS, (st), (val))
-#define sk_NAME_FUNCS_delete(st, i) SKM_sk_delete(NAME_FUNCS, (st), (i))
-#define sk_NAME_FUNCS_delete_ptr(st, ptr) SKM_sk_delete_ptr(NAME_FUNCS, (st), (ptr))
-#define sk_NAME_FUNCS_insert(st, val, i) SKM_sk_insert(NAME_FUNCS, (st), (val), (i))
-#define sk_NAME_FUNCS_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(NAME_FUNCS, (st), (cmp))
-#define sk_NAME_FUNCS_dup(st) SKM_sk_dup(NAME_FUNCS, st)
-#define sk_NAME_FUNCS_pop_free(st, free_func) SKM_sk_pop_free(NAME_FUNCS, (st), (free_func))
-#define sk_NAME_FUNCS_shift(st) SKM_sk_shift(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_pop(st) SKM_sk_pop(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_sort(st) SKM_sk_sort(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_is_sorted(st) SKM_sk_is_sorted(NAME_FUNCS, (st))
-
-#define sk_OCSP_CERTID_new(cmp) SKM_sk_new(OCSP_CERTID, (cmp))
-#define sk_OCSP_CERTID_new_null() SKM_sk_new_null(OCSP_CERTID)
-#define sk_OCSP_CERTID_free(st) SKM_sk_free(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_num(st) SKM_sk_num(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_value(st, i) SKM_sk_value(OCSP_CERTID, (st), (i))
-#define sk_OCSP_CERTID_set(st, i, val) SKM_sk_set(OCSP_CERTID, (st), (i), (val))
-#define sk_OCSP_CERTID_zero(st) SKM_sk_zero(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_push(st, val) SKM_sk_push(OCSP_CERTID, (st), (val))
-#define sk_OCSP_CERTID_unshift(st, val) SKM_sk_unshift(OCSP_CERTID, (st), (val))
-#define sk_OCSP_CERTID_find(st, val) SKM_sk_find(OCSP_CERTID, (st), (val))
-#define sk_OCSP_CERTID_find_ex(st, val) SKM_sk_find_ex(OCSP_CERTID, (st), (val))
-#define sk_OCSP_CERTID_delete(st, i) SKM_sk_delete(OCSP_CERTID, (st), (i))
-#define sk_OCSP_CERTID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_CERTID, (st), (ptr))
-#define sk_OCSP_CERTID_insert(st, val, i) SKM_sk_insert(OCSP_CERTID, (st), (val), (i))
-#define sk_OCSP_CERTID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_CERTID, (st), (cmp))
-#define sk_OCSP_CERTID_dup(st) SKM_sk_dup(OCSP_CERTID, st)
-#define sk_OCSP_CERTID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_CERTID, (st), (free_func))
-#define sk_OCSP_CERTID_shift(st) SKM_sk_shift(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_pop(st) SKM_sk_pop(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_sort(st) SKM_sk_sort(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_is_sorted(st) SKM_sk_is_sorted(OCSP_CERTID, (st))
-
-#define sk_OCSP_ONEREQ_new(cmp) SKM_sk_new(OCSP_ONEREQ, (cmp))
-#define sk_OCSP_ONEREQ_new_null() SKM_sk_new_null(OCSP_ONEREQ)
-#define sk_OCSP_ONEREQ_free(st) SKM_sk_free(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_num(st) SKM_sk_num(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_value(st, i) SKM_sk_value(OCSP_ONEREQ, (st), (i))
-#define sk_OCSP_ONEREQ_set(st, i, val) SKM_sk_set(OCSP_ONEREQ, (st), (i), (val))
-#define sk_OCSP_ONEREQ_zero(st) SKM_sk_zero(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_push(st, val) SKM_sk_push(OCSP_ONEREQ, (st), (val))
-#define sk_OCSP_ONEREQ_unshift(st, val) SKM_sk_unshift(OCSP_ONEREQ, (st), (val))
-#define sk_OCSP_ONEREQ_find(st, val) SKM_sk_find(OCSP_ONEREQ, (st), (val))
-#define sk_OCSP_ONEREQ_find_ex(st, val) SKM_sk_find_ex(OCSP_ONEREQ, (st), (val))
-#define sk_OCSP_ONEREQ_delete(st, i) SKM_sk_delete(OCSP_ONEREQ, (st), (i))
-#define sk_OCSP_ONEREQ_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_ONEREQ, (st), (ptr))
-#define sk_OCSP_ONEREQ_insert(st, val, i) SKM_sk_insert(OCSP_ONEREQ, (st), (val), (i))
-#define sk_OCSP_ONEREQ_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_ONEREQ, (st), (cmp))
-#define sk_OCSP_ONEREQ_dup(st) SKM_sk_dup(OCSP_ONEREQ, st)
-#define sk_OCSP_ONEREQ_pop_free(st, free_func) SKM_sk_pop_free(OCSP_ONEREQ, (st), (free_func))
-#define sk_OCSP_ONEREQ_shift(st) SKM_sk_shift(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_pop(st) SKM_sk_pop(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_sort(st) SKM_sk_sort(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_is_sorted(st) SKM_sk_is_sorted(OCSP_ONEREQ, (st))
-
-#define sk_OCSP_RESPID_new(cmp) SKM_sk_new(OCSP_RESPID, (cmp))
-#define sk_OCSP_RESPID_new_null() SKM_sk_new_null(OCSP_RESPID)
-#define sk_OCSP_RESPID_free(st) SKM_sk_free(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_num(st) SKM_sk_num(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_value(st, i) SKM_sk_value(OCSP_RESPID, (st), (i))
-#define sk_OCSP_RESPID_set(st, i, val) SKM_sk_set(OCSP_RESPID, (st), (i), (val))
-#define sk_OCSP_RESPID_zero(st) SKM_sk_zero(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_push(st, val) SKM_sk_push(OCSP_RESPID, (st), (val))
-#define sk_OCSP_RESPID_unshift(st, val) SKM_sk_unshift(OCSP_RESPID, (st), (val))
-#define sk_OCSP_RESPID_find(st, val) SKM_sk_find(OCSP_RESPID, (st), (val))
-#define sk_OCSP_RESPID_find_ex(st, val) SKM_sk_find_ex(OCSP_RESPID, (st), (val))
-#define sk_OCSP_RESPID_delete(st, i) SKM_sk_delete(OCSP_RESPID, (st), (i))
-#define sk_OCSP_RESPID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_RESPID, (st), (ptr))
-#define sk_OCSP_RESPID_insert(st, val, i) SKM_sk_insert(OCSP_RESPID, (st), (val), (i))
-#define sk_OCSP_RESPID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_RESPID, (st), (cmp))
-#define sk_OCSP_RESPID_dup(st) SKM_sk_dup(OCSP_RESPID, st)
-#define sk_OCSP_RESPID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_RESPID, (st), (free_func))
-#define sk_OCSP_RESPID_shift(st) SKM_sk_shift(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_pop(st) SKM_sk_pop(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_sort(st) SKM_sk_sort(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_is_sorted(st) SKM_sk_is_sorted(OCSP_RESPID, (st))
-
-#define sk_OCSP_SINGLERESP_new(cmp) SKM_sk_new(OCSP_SINGLERESP, (cmp))
-#define sk_OCSP_SINGLERESP_new_null() SKM_sk_new_null(OCSP_SINGLERESP)
-#define sk_OCSP_SINGLERESP_free(st) SKM_sk_free(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_num(st) SKM_sk_num(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_value(st, i) SKM_sk_value(OCSP_SINGLERESP, (st), (i))
-#define sk_OCSP_SINGLERESP_set(st, i, val) SKM_sk_set(OCSP_SINGLERESP, (st), (i), (val))
-#define sk_OCSP_SINGLERESP_zero(st) SKM_sk_zero(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_push(st, val) SKM_sk_push(OCSP_SINGLERESP, (st), (val))
-#define sk_OCSP_SINGLERESP_unshift(st, val) SKM_sk_unshift(OCSP_SINGLERESP, (st), (val))
-#define sk_OCSP_SINGLERESP_find(st, val) SKM_sk_find(OCSP_SINGLERESP, (st), (val))
-#define sk_OCSP_SINGLERESP_find_ex(st, val) SKM_sk_find_ex(OCSP_SINGLERESP, (st), (val))
-#define sk_OCSP_SINGLERESP_delete(st, i) SKM_sk_delete(OCSP_SINGLERESP, (st), (i))
-#define sk_OCSP_SINGLERESP_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_SINGLERESP, (st), (ptr))
-#define sk_OCSP_SINGLERESP_insert(st, val, i) SKM_sk_insert(OCSP_SINGLERESP, (st), (val), (i))
-#define sk_OCSP_SINGLERESP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_SINGLERESP, (st), (cmp))
-#define sk_OCSP_SINGLERESP_dup(st) SKM_sk_dup(OCSP_SINGLERESP, st)
-#define sk_OCSP_SINGLERESP_pop_free(st, free_func) SKM_sk_pop_free(OCSP_SINGLERESP, (st), (free_func))
-#define sk_OCSP_SINGLERESP_shift(st) SKM_sk_shift(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_pop(st) SKM_sk_pop(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_sort(st) SKM_sk_sort(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_is_sorted(st) SKM_sk_is_sorted(OCSP_SINGLERESP, (st))
-
-#define sk_PKCS12_SAFEBAG_new(cmp) SKM_sk_new(PKCS12_SAFEBAG, (cmp))
-#define sk_PKCS12_SAFEBAG_new_null() SKM_sk_new_null(PKCS12_SAFEBAG)
-#define sk_PKCS12_SAFEBAG_free(st) SKM_sk_free(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_num(st) SKM_sk_num(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_value(st, i) SKM_sk_value(PKCS12_SAFEBAG, (st), (i))
-#define sk_PKCS12_SAFEBAG_set(st, i, val) SKM_sk_set(PKCS12_SAFEBAG, (st), (i), (val))
-#define sk_PKCS12_SAFEBAG_zero(st) SKM_sk_zero(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_push(st, val) SKM_sk_push(PKCS12_SAFEBAG, (st), (val))
-#define sk_PKCS12_SAFEBAG_unshift(st, val) SKM_sk_unshift(PKCS12_SAFEBAG, (st), (val))
-#define sk_PKCS12_SAFEBAG_find(st, val) SKM_sk_find(PKCS12_SAFEBAG, (st), (val))
-#define sk_PKCS12_SAFEBAG_find_ex(st, val) SKM_sk_find_ex(PKCS12_SAFEBAG, (st), (val))
-#define sk_PKCS12_SAFEBAG_delete(st, i) SKM_sk_delete(PKCS12_SAFEBAG, (st), (i))
-#define sk_PKCS12_SAFEBAG_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS12_SAFEBAG, (st), (ptr))
-#define sk_PKCS12_SAFEBAG_insert(st, val, i) SKM_sk_insert(PKCS12_SAFEBAG, (st), (val), (i))
-#define sk_PKCS12_SAFEBAG_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS12_SAFEBAG, (st), (cmp))
-#define sk_PKCS12_SAFEBAG_dup(st) SKM_sk_dup(PKCS12_SAFEBAG, st)
-#define sk_PKCS12_SAFEBAG_pop_free(st, free_func) SKM_sk_pop_free(PKCS12_SAFEBAG, (st), (free_func))
-#define sk_PKCS12_SAFEBAG_shift(st) SKM_sk_shift(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_pop(st) SKM_sk_pop(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_sort(st) SKM_sk_sort(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_is_sorted(st) SKM_sk_is_sorted(PKCS12_SAFEBAG, (st))
-
-#define sk_PKCS7_new(cmp) SKM_sk_new(PKCS7, (cmp))
-#define sk_PKCS7_new_null() SKM_sk_new_null(PKCS7)
-#define sk_PKCS7_free(st) SKM_sk_free(PKCS7, (st))
-#define sk_PKCS7_num(st) SKM_sk_num(PKCS7, (st))
-#define sk_PKCS7_value(st, i) SKM_sk_value(PKCS7, (st), (i))
-#define sk_PKCS7_set(st, i, val) SKM_sk_set(PKCS7, (st), (i), (val))
-#define sk_PKCS7_zero(st) SKM_sk_zero(PKCS7, (st))
-#define sk_PKCS7_push(st, val) SKM_sk_push(PKCS7, (st), (val))
-#define sk_PKCS7_unshift(st, val) SKM_sk_unshift(PKCS7, (st), (val))
-#define sk_PKCS7_find(st, val) SKM_sk_find(PKCS7, (st), (val))
-#define sk_PKCS7_find_ex(st, val) SKM_sk_find_ex(PKCS7, (st), (val))
-#define sk_PKCS7_delete(st, i) SKM_sk_delete(PKCS7, (st), (i))
-#define sk_PKCS7_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7, (st), (ptr))
-#define sk_PKCS7_insert(st, val, i) SKM_sk_insert(PKCS7, (st), (val), (i))
-#define sk_PKCS7_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7, (st), (cmp))
-#define sk_PKCS7_dup(st) SKM_sk_dup(PKCS7, st)
-#define sk_PKCS7_pop_free(st, free_func) SKM_sk_pop_free(PKCS7, (st), (free_func))
-#define sk_PKCS7_shift(st) SKM_sk_shift(PKCS7, (st))
-#define sk_PKCS7_pop(st) SKM_sk_pop(PKCS7, (st))
-#define sk_PKCS7_sort(st) SKM_sk_sort(PKCS7, (st))
-#define sk_PKCS7_is_sorted(st) SKM_sk_is_sorted(PKCS7, (st))
-
-#define sk_PKCS7_RECIP_INFO_new(cmp) SKM_sk_new(PKCS7_RECIP_INFO, (cmp))
-#define sk_PKCS7_RECIP_INFO_new_null() SKM_sk_new_null(PKCS7_RECIP_INFO)
-#define sk_PKCS7_RECIP_INFO_free(st) SKM_sk_free(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_num(st) SKM_sk_num(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_value(st, i) SKM_sk_value(PKCS7_RECIP_INFO, (st), (i))
-#define sk_PKCS7_RECIP_INFO_set(st, i, val) SKM_sk_set(PKCS7_RECIP_INFO, (st), (i), (val))
-#define sk_PKCS7_RECIP_INFO_zero(st) SKM_sk_zero(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_push(st, val) SKM_sk_push(PKCS7_RECIP_INFO, (st), (val))
-#define sk_PKCS7_RECIP_INFO_unshift(st, val) SKM_sk_unshift(PKCS7_RECIP_INFO, (st), (val))
-#define sk_PKCS7_RECIP_INFO_find(st, val) SKM_sk_find(PKCS7_RECIP_INFO, (st), (val))
-#define sk_PKCS7_RECIP_INFO_find_ex(st, val) SKM_sk_find_ex(PKCS7_RECIP_INFO, (st), (val))
-#define sk_PKCS7_RECIP_INFO_delete(st, i) SKM_sk_delete(PKCS7_RECIP_INFO, (st), (i))
-#define sk_PKCS7_RECIP_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7_RECIP_INFO, (st), (ptr))
-#define sk_PKCS7_RECIP_INFO_insert(st, val, i) SKM_sk_insert(PKCS7_RECIP_INFO, (st), (val), (i))
-#define sk_PKCS7_RECIP_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7_RECIP_INFO, (st), (cmp))
-#define sk_PKCS7_RECIP_INFO_dup(st) SKM_sk_dup(PKCS7_RECIP_INFO, st)
-#define sk_PKCS7_RECIP_INFO_pop_free(st, free_func) SKM_sk_pop_free(PKCS7_RECIP_INFO, (st), (free_func))
-#define sk_PKCS7_RECIP_INFO_shift(st) SKM_sk_shift(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_pop(st) SKM_sk_pop(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_sort(st) SKM_sk_sort(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_RECIP_INFO, (st))
-
-#define sk_PKCS7_SIGNER_INFO_new(cmp) SKM_sk_new(PKCS7_SIGNER_INFO, (cmp))
-#define sk_PKCS7_SIGNER_INFO_new_null() SKM_sk_new_null(PKCS7_SIGNER_INFO)
-#define sk_PKCS7_SIGNER_INFO_free(st) SKM_sk_free(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_num(st) SKM_sk_num(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_value(st, i) SKM_sk_value(PKCS7_SIGNER_INFO, (st), (i))
-#define sk_PKCS7_SIGNER_INFO_set(st, i, val) SKM_sk_set(PKCS7_SIGNER_INFO, (st), (i), (val))
-#define sk_PKCS7_SIGNER_INFO_zero(st) SKM_sk_zero(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_push(st, val) SKM_sk_push(PKCS7_SIGNER_INFO, (st), (val))
-#define sk_PKCS7_SIGNER_INFO_unshift(st, val) SKM_sk_unshift(PKCS7_SIGNER_INFO, (st), (val))
-#define sk_PKCS7_SIGNER_INFO_find(st, val) SKM_sk_find(PKCS7_SIGNER_INFO, (st), (val))
-#define sk_PKCS7_SIGNER_INFO_find_ex(st, val) SKM_sk_find_ex(PKCS7_SIGNER_INFO, (st), (val))
-#define sk_PKCS7_SIGNER_INFO_delete(st, i) SKM_sk_delete(PKCS7_SIGNER_INFO, (st), (i))
-#define sk_PKCS7_SIGNER_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7_SIGNER_INFO, (st), (ptr))
-#define sk_PKCS7_SIGNER_INFO_insert(st, val, i) SKM_sk_insert(PKCS7_SIGNER_INFO, (st), (val), (i))
-#define sk_PKCS7_SIGNER_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7_SIGNER_INFO, (st), (cmp))
-#define sk_PKCS7_SIGNER_INFO_dup(st) SKM_sk_dup(PKCS7_SIGNER_INFO, st)
-#define sk_PKCS7_SIGNER_INFO_pop_free(st, free_func) SKM_sk_pop_free(PKCS7_SIGNER_INFO, (st), (free_func))
-#define sk_PKCS7_SIGNER_INFO_shift(st) SKM_sk_shift(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_pop(st) SKM_sk_pop(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_sort(st) SKM_sk_sort(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_SIGNER_INFO, (st))
-
-#define sk_POLICYINFO_new(cmp) SKM_sk_new(POLICYINFO, (cmp))
-#define sk_POLICYINFO_new_null() SKM_sk_new_null(POLICYINFO)
-#define sk_POLICYINFO_free(st) SKM_sk_free(POLICYINFO, (st))
-#define sk_POLICYINFO_num(st) SKM_sk_num(POLICYINFO, (st))
-#define sk_POLICYINFO_value(st, i) SKM_sk_value(POLICYINFO, (st), (i))
-#define sk_POLICYINFO_set(st, i, val) SKM_sk_set(POLICYINFO, (st), (i), (val))
-#define sk_POLICYINFO_zero(st) SKM_sk_zero(POLICYINFO, (st))
-#define sk_POLICYINFO_push(st, val) SKM_sk_push(POLICYINFO, (st), (val))
-#define sk_POLICYINFO_unshift(st, val) SKM_sk_unshift(POLICYINFO, (st), (val))
-#define sk_POLICYINFO_find(st, val) SKM_sk_find(POLICYINFO, (st), (val))
-#define sk_POLICYINFO_find_ex(st, val) SKM_sk_find_ex(POLICYINFO, (st), (val))
-#define sk_POLICYINFO_delete(st, i) SKM_sk_delete(POLICYINFO, (st), (i))
-#define sk_POLICYINFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICYINFO, (st), (ptr))
-#define sk_POLICYINFO_insert(st, val, i) SKM_sk_insert(POLICYINFO, (st), (val), (i))
-#define sk_POLICYINFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICYINFO, (st), (cmp))
-#define sk_POLICYINFO_dup(st) SKM_sk_dup(POLICYINFO, st)
-#define sk_POLICYINFO_pop_free(st, free_func) SKM_sk_pop_free(POLICYINFO, (st), (free_func))
-#define sk_POLICYINFO_shift(st) SKM_sk_shift(POLICYINFO, (st))
-#define sk_POLICYINFO_pop(st) SKM_sk_pop(POLICYINFO, (st))
-#define sk_POLICYINFO_sort(st) SKM_sk_sort(POLICYINFO, (st))
-#define sk_POLICYINFO_is_sorted(st) SKM_sk_is_sorted(POLICYINFO, (st))
-
-#define sk_POLICYQUALINFO_new(cmp) SKM_sk_new(POLICYQUALINFO, (cmp))
-#define sk_POLICYQUALINFO_new_null() SKM_sk_new_null(POLICYQUALINFO)
-#define sk_POLICYQUALINFO_free(st) SKM_sk_free(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_num(st) SKM_sk_num(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_value(st, i) SKM_sk_value(POLICYQUALINFO, (st), (i))
-#define sk_POLICYQUALINFO_set(st, i, val) SKM_sk_set(POLICYQUALINFO, (st), (i), (val))
-#define sk_POLICYQUALINFO_zero(st) SKM_sk_zero(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_push(st, val) SKM_sk_push(POLICYQUALINFO, (st), (val))
-#define sk_POLICYQUALINFO_unshift(st, val) SKM_sk_unshift(POLICYQUALINFO, (st), (val))
-#define sk_POLICYQUALINFO_find(st, val) SKM_sk_find(POLICYQUALINFO, (st), (val))
-#define sk_POLICYQUALINFO_find_ex(st, val) SKM_sk_find_ex(POLICYQUALINFO, (st), (val))
-#define sk_POLICYQUALINFO_delete(st, i) SKM_sk_delete(POLICYQUALINFO, (st), (i))
-#define sk_POLICYQUALINFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICYQUALINFO, (st), (ptr))
-#define sk_POLICYQUALINFO_insert(st, val, i) SKM_sk_insert(POLICYQUALINFO, (st), (val), (i))
-#define sk_POLICYQUALINFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICYQUALINFO, (st), (cmp))
-#define sk_POLICYQUALINFO_dup(st) SKM_sk_dup(POLICYQUALINFO, st)
-#define sk_POLICYQUALINFO_pop_free(st, free_func) SKM_sk_pop_free(POLICYQUALINFO, (st), (free_func))
-#define sk_POLICYQUALINFO_shift(st) SKM_sk_shift(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_pop(st) SKM_sk_pop(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_sort(st) SKM_sk_sort(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_is_sorted(st) SKM_sk_is_sorted(POLICYQUALINFO, (st))
-
-#define sk_POLICY_MAPPING_new(cmp) SKM_sk_new(POLICY_MAPPING, (cmp))
-#define sk_POLICY_MAPPING_new_null() SKM_sk_new_null(POLICY_MAPPING)
-#define sk_POLICY_MAPPING_free(st) SKM_sk_free(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_num(st) SKM_sk_num(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_value(st, i) SKM_sk_value(POLICY_MAPPING, (st), (i))
-#define sk_POLICY_MAPPING_set(st, i, val) SKM_sk_set(POLICY_MAPPING, (st), (i), (val))
-#define sk_POLICY_MAPPING_zero(st) SKM_sk_zero(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_push(st, val) SKM_sk_push(POLICY_MAPPING, (st), (val))
-#define sk_POLICY_MAPPING_unshift(st, val) SKM_sk_unshift(POLICY_MAPPING, (st), (val))
-#define sk_POLICY_MAPPING_find(st, val) SKM_sk_find(POLICY_MAPPING, (st), (val))
-#define sk_POLICY_MAPPING_find_ex(st, val) SKM_sk_find_ex(POLICY_MAPPING, (st), (val))
-#define sk_POLICY_MAPPING_delete(st, i) SKM_sk_delete(POLICY_MAPPING, (st), (i))
-#define sk_POLICY_MAPPING_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICY_MAPPING, (st), (ptr))
-#define sk_POLICY_MAPPING_insert(st, val, i) SKM_sk_insert(POLICY_MAPPING, (st), (val), (i))
-#define sk_POLICY_MAPPING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICY_MAPPING, (st), (cmp))
-#define sk_POLICY_MAPPING_dup(st) SKM_sk_dup(POLICY_MAPPING, st)
-#define sk_POLICY_MAPPING_pop_free(st, free_func) SKM_sk_pop_free(POLICY_MAPPING, (st), (free_func))
-#define sk_POLICY_MAPPING_shift(st) SKM_sk_shift(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_pop(st) SKM_sk_pop(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st))
-
-#define sk_SSL_CIPHER_new(cmp) SKM_sk_new(SSL_CIPHER, (cmp))
-#define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER)
-#define sk_SSL_CIPHER_free(st) SKM_sk_free(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_num(st) SKM_sk_num(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_value(st, i) SKM_sk_value(SSL_CIPHER, (st), (i))
-#define sk_SSL_CIPHER_set(st, i, val) SKM_sk_set(SSL_CIPHER, (st), (i), (val))
-#define sk_SSL_CIPHER_zero(st) SKM_sk_zero(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_push(st, val) SKM_sk_push(SSL_CIPHER, (st), (val))
-#define sk_SSL_CIPHER_unshift(st, val) SKM_sk_unshift(SSL_CIPHER, (st), (val))
-#define sk_SSL_CIPHER_find(st, val) SKM_sk_find(SSL_CIPHER, (st), (val))
-#define sk_SSL_CIPHER_find_ex(st, val) SKM_sk_find_ex(SSL_CIPHER, (st), (val))
-#define sk_SSL_CIPHER_delete(st, i) SKM_sk_delete(SSL_CIPHER, (st), (i))
-#define sk_SSL_CIPHER_delete_ptr(st, ptr) SKM_sk_delete_ptr(SSL_CIPHER, (st), (ptr))
-#define sk_SSL_CIPHER_insert(st, val, i) SKM_sk_insert(SSL_CIPHER, (st), (val), (i))
-#define sk_SSL_CIPHER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SSL_CIPHER, (st), (cmp))
-#define sk_SSL_CIPHER_dup(st) SKM_sk_dup(SSL_CIPHER, st)
-#define sk_SSL_CIPHER_pop_free(st, free_func) SKM_sk_pop_free(SSL_CIPHER, (st), (free_func))
-#define sk_SSL_CIPHER_shift(st) SKM_sk_shift(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_pop(st) SKM_sk_pop(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_sort(st) SKM_sk_sort(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_is_sorted(st) SKM_sk_is_sorted(SSL_CIPHER, (st))
-
-#define sk_SSL_COMP_new(cmp) SKM_sk_new(SSL_COMP, (cmp))
-#define sk_SSL_COMP_new_null() SKM_sk_new_null(SSL_COMP)
-#define sk_SSL_COMP_free(st) SKM_sk_free(SSL_COMP, (st))
-#define sk_SSL_COMP_num(st) SKM_sk_num(SSL_COMP, (st))
-#define sk_SSL_COMP_value(st, i) SKM_sk_value(SSL_COMP, (st), (i))
-#define sk_SSL_COMP_set(st, i, val) SKM_sk_set(SSL_COMP, (st), (i), (val))
-#define sk_SSL_COMP_zero(st) SKM_sk_zero(SSL_COMP, (st))
-#define sk_SSL_COMP_push(st, val) SKM_sk_push(SSL_COMP, (st), (val))
-#define sk_SSL_COMP_unshift(st, val) SKM_sk_unshift(SSL_COMP, (st), (val))
-#define sk_SSL_COMP_find(st, val) SKM_sk_find(SSL_COMP, (st), (val))
-#define sk_SSL_COMP_find_ex(st, val) SKM_sk_find_ex(SSL_COMP, (st), (val))
-#define sk_SSL_COMP_delete(st, i) SKM_sk_delete(SSL_COMP, (st), (i))
-#define sk_SSL_COMP_delete_ptr(st, ptr) SKM_sk_delete_ptr(SSL_COMP, (st), (ptr))
-#define sk_SSL_COMP_insert(st, val, i) SKM_sk_insert(SSL_COMP, (st), (val), (i))
-#define sk_SSL_COMP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SSL_COMP, (st), (cmp))
-#define sk_SSL_COMP_dup(st) SKM_sk_dup(SSL_COMP, st)
-#define sk_SSL_COMP_pop_free(st, free_func) SKM_sk_pop_free(SSL_COMP, (st), (free_func))
-#define sk_SSL_COMP_shift(st) SKM_sk_shift(SSL_COMP, (st))
-#define sk_SSL_COMP_pop(st) SKM_sk_pop(SSL_COMP, (st))
-#define sk_SSL_COMP_sort(st) SKM_sk_sort(SSL_COMP, (st))
-#define sk_SSL_COMP_is_sorted(st) SKM_sk_is_sorted(SSL_COMP, (st))
-
-#define sk_STACK_OF_X509_NAME_ENTRY_new(cmp) SKM_sk_new(STACK_OF_X509_NAME_ENTRY, (cmp))
-#define sk_STACK_OF_X509_NAME_ENTRY_new_null() SKM_sk_new_null(STACK_OF_X509_NAME_ENTRY)
-#define sk_STACK_OF_X509_NAME_ENTRY_free(st) SKM_sk_free(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_num(st) SKM_sk_num(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_value(st, i) SKM_sk_value(STACK_OF_X509_NAME_ENTRY, (st), (i))
-#define sk_STACK_OF_X509_NAME_ENTRY_set(st, i, val) SKM_sk_set(STACK_OF_X509_NAME_ENTRY, (st), (i), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_zero(st) SKM_sk_zero(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_push(st, val) SKM_sk_push(STACK_OF_X509_NAME_ENTRY, (st), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_unshift(st, val) SKM_sk_unshift(STACK_OF_X509_NAME_ENTRY, (st), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_find(st, val) SKM_sk_find(STACK_OF_X509_NAME_ENTRY, (st), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_find_ex(st, val) SKM_sk_find_ex(STACK_OF_X509_NAME_ENTRY, (st), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_delete(st, i) SKM_sk_delete(STACK_OF_X509_NAME_ENTRY, (st), (i))
-#define sk_STACK_OF_X509_NAME_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(STACK_OF_X509_NAME_ENTRY, (st), (ptr))
-#define sk_STACK_OF_X509_NAME_ENTRY_insert(st, val, i) SKM_sk_insert(STACK_OF_X509_NAME_ENTRY, (st), (val), (i))
-#define sk_STACK_OF_X509_NAME_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STACK_OF_X509_NAME_ENTRY, (st), (cmp))
-#define sk_STACK_OF_X509_NAME_ENTRY_dup(st) SKM_sk_dup(STACK_OF_X509_NAME_ENTRY, st)
-#define sk_STACK_OF_X509_NAME_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(STACK_OF_X509_NAME_ENTRY, (st), (free_func))
-#define sk_STACK_OF_X509_NAME_ENTRY_shift(st) SKM_sk_shift(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_pop(st) SKM_sk_pop(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_sort(st) SKM_sk_sort(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(STACK_OF_X509_NAME_ENTRY, (st))
-
-#define sk_STORE_ATTR_INFO_new(cmp) SKM_sk_new(STORE_ATTR_INFO, (cmp))
-#define sk_STORE_ATTR_INFO_new_null() SKM_sk_new_null(STORE_ATTR_INFO)
-#define sk_STORE_ATTR_INFO_free(st) SKM_sk_free(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_num(st) SKM_sk_num(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_value(st, i) SKM_sk_value(STORE_ATTR_INFO, (st), (i))
-#define sk_STORE_ATTR_INFO_set(st, i, val) SKM_sk_set(STORE_ATTR_INFO, (st), (i), (val))
-#define sk_STORE_ATTR_INFO_zero(st) SKM_sk_zero(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_push(st, val) SKM_sk_push(STORE_ATTR_INFO, (st), (val))
-#define sk_STORE_ATTR_INFO_unshift(st, val) SKM_sk_unshift(STORE_ATTR_INFO, (st), (val))
-#define sk_STORE_ATTR_INFO_find(st, val) SKM_sk_find(STORE_ATTR_INFO, (st), (val))
-#define sk_STORE_ATTR_INFO_find_ex(st, val) SKM_sk_find_ex(STORE_ATTR_INFO, (st), (val))
-#define sk_STORE_ATTR_INFO_delete(st, i) SKM_sk_delete(STORE_ATTR_INFO, (st), (i))
-#define sk_STORE_ATTR_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(STORE_ATTR_INFO, (st), (ptr))
-#define sk_STORE_ATTR_INFO_insert(st, val, i) SKM_sk_insert(STORE_ATTR_INFO, (st), (val), (i))
-#define sk_STORE_ATTR_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STORE_ATTR_INFO, (st), (cmp))
-#define sk_STORE_ATTR_INFO_dup(st) SKM_sk_dup(STORE_ATTR_INFO, st)
-#define sk_STORE_ATTR_INFO_pop_free(st, free_func) SKM_sk_pop_free(STORE_ATTR_INFO, (st), (free_func))
-#define sk_STORE_ATTR_INFO_shift(st) SKM_sk_shift(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_pop(st) SKM_sk_pop(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_sort(st) SKM_sk_sort(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_is_sorted(st) SKM_sk_is_sorted(STORE_ATTR_INFO, (st))
-
-#define sk_STORE_OBJECT_new(cmp) SKM_sk_new(STORE_OBJECT, (cmp))
-#define sk_STORE_OBJECT_new_null() SKM_sk_new_null(STORE_OBJECT)
-#define sk_STORE_OBJECT_free(st) SKM_sk_free(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_num(st) SKM_sk_num(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_value(st, i) SKM_sk_value(STORE_OBJECT, (st), (i))
-#define sk_STORE_OBJECT_set(st, i, val) SKM_sk_set(STORE_OBJECT, (st), (i), (val))
-#define sk_STORE_OBJECT_zero(st) SKM_sk_zero(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_push(st, val) SKM_sk_push(STORE_OBJECT, (st), (val))
-#define sk_STORE_OBJECT_unshift(st, val) SKM_sk_unshift(STORE_OBJECT, (st), (val))
-#define sk_STORE_OBJECT_find(st, val) SKM_sk_find(STORE_OBJECT, (st), (val))
-#define sk_STORE_OBJECT_find_ex(st, val) SKM_sk_find_ex(STORE_OBJECT, (st), (val))
-#define sk_STORE_OBJECT_delete(st, i) SKM_sk_delete(STORE_OBJECT, (st), (i))
-#define sk_STORE_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(STORE_OBJECT, (st), (ptr))
-#define sk_STORE_OBJECT_insert(st, val, i) SKM_sk_insert(STORE_OBJECT, (st), (val), (i))
-#define sk_STORE_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STORE_OBJECT, (st), (cmp))
-#define sk_STORE_OBJECT_dup(st) SKM_sk_dup(STORE_OBJECT, st)
-#define sk_STORE_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(STORE_OBJECT, (st), (free_func))
-#define sk_STORE_OBJECT_shift(st) SKM_sk_shift(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_pop(st) SKM_sk_pop(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_sort(st) SKM_sk_sort(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_is_sorted(st) SKM_sk_is_sorted(STORE_OBJECT, (st))
-
-#define sk_SXNETID_new(cmp) SKM_sk_new(SXNETID, (cmp))
-#define sk_SXNETID_new_null() SKM_sk_new_null(SXNETID)
-#define sk_SXNETID_free(st) SKM_sk_free(SXNETID, (st))
-#define sk_SXNETID_num(st) SKM_sk_num(SXNETID, (st))
-#define sk_SXNETID_value(st, i) SKM_sk_value(SXNETID, (st), (i))
-#define sk_SXNETID_set(st, i, val) SKM_sk_set(SXNETID, (st), (i), (val))
-#define sk_SXNETID_zero(st) SKM_sk_zero(SXNETID, (st))
-#define sk_SXNETID_push(st, val) SKM_sk_push(SXNETID, (st), (val))
-#define sk_SXNETID_unshift(st, val) SKM_sk_unshift(SXNETID, (st), (val))
-#define sk_SXNETID_find(st, val) SKM_sk_find(SXNETID, (st), (val))
-#define sk_SXNETID_find_ex(st, val) SKM_sk_find_ex(SXNETID, (st), (val))
-#define sk_SXNETID_delete(st, i) SKM_sk_delete(SXNETID, (st), (i))
-#define sk_SXNETID_delete_ptr(st, ptr) SKM_sk_delete_ptr(SXNETID, (st), (ptr))
-#define sk_SXNETID_insert(st, val, i) SKM_sk_insert(SXNETID, (st), (val), (i))
-#define sk_SXNETID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SXNETID, (st), (cmp))
-#define sk_SXNETID_dup(st) SKM_sk_dup(SXNETID, st)
-#define sk_SXNETID_pop_free(st, free_func) SKM_sk_pop_free(SXNETID, (st), (free_func))
-#define sk_SXNETID_shift(st) SKM_sk_shift(SXNETID, (st))
-#define sk_SXNETID_pop(st) SKM_sk_pop(SXNETID, (st))
-#define sk_SXNETID_sort(st) SKM_sk_sort(SXNETID, (st))
-#define sk_SXNETID_is_sorted(st) SKM_sk_is_sorted(SXNETID, (st))
-
-#define sk_UI_STRING_new(cmp) SKM_sk_new(UI_STRING, (cmp))
-#define sk_UI_STRING_new_null() SKM_sk_new_null(UI_STRING)
-#define sk_UI_STRING_free(st) SKM_sk_free(UI_STRING, (st))
-#define sk_UI_STRING_num(st) SKM_sk_num(UI_STRING, (st))
-#define sk_UI_STRING_value(st, i) SKM_sk_value(UI_STRING, (st), (i))
-#define sk_UI_STRING_set(st, i, val) SKM_sk_set(UI_STRING, (st), (i), (val))
-#define sk_UI_STRING_zero(st) SKM_sk_zero(UI_STRING, (st))
-#define sk_UI_STRING_push(st, val) SKM_sk_push(UI_STRING, (st), (val))
-#define sk_UI_STRING_unshift(st, val) SKM_sk_unshift(UI_STRING, (st), (val))
-#define sk_UI_STRING_find(st, val) SKM_sk_find(UI_STRING, (st), (val))
-#define sk_UI_STRING_find_ex(st, val) SKM_sk_find_ex(UI_STRING, (st), (val))
-#define sk_UI_STRING_delete(st, i) SKM_sk_delete(UI_STRING, (st), (i))
-#define sk_UI_STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(UI_STRING, (st), (ptr))
-#define sk_UI_STRING_insert(st, val, i) SKM_sk_insert(UI_STRING, (st), (val), (i))
-#define sk_UI_STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(UI_STRING, (st), (cmp))
-#define sk_UI_STRING_dup(st) SKM_sk_dup(UI_STRING, st)
-#define sk_UI_STRING_pop_free(st, free_func) SKM_sk_pop_free(UI_STRING, (st), (free_func))
-#define sk_UI_STRING_shift(st) SKM_sk_shift(UI_STRING, (st))
-#define sk_UI_STRING_pop(st) SKM_sk_pop(UI_STRING, (st))
-#define sk_UI_STRING_sort(st) SKM_sk_sort(UI_STRING, (st))
-#define sk_UI_STRING_is_sorted(st) SKM_sk_is_sorted(UI_STRING, (st))
-
-#define sk_X509_new(cmp) SKM_sk_new(X509, (cmp))
-#define sk_X509_new_null() SKM_sk_new_null(X509)
-#define sk_X509_free(st) SKM_sk_free(X509, (st))
-#define sk_X509_num(st) SKM_sk_num(X509, (st))
-#define sk_X509_value(st, i) SKM_sk_value(X509, (st), (i))
-#define sk_X509_set(st, i, val) SKM_sk_set(X509, (st), (i), (val))
-#define sk_X509_zero(st) SKM_sk_zero(X509, (st))
-#define sk_X509_push(st, val) SKM_sk_push(X509, (st), (val))
-#define sk_X509_unshift(st, val) SKM_sk_unshift(X509, (st), (val))
-#define sk_X509_find(st, val) SKM_sk_find(X509, (st), (val))
-#define sk_X509_find_ex(st, val) SKM_sk_find_ex(X509, (st), (val))
-#define sk_X509_delete(st, i) SKM_sk_delete(X509, (st), (i))
-#define sk_X509_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509, (st), (ptr))
-#define sk_X509_insert(st, val, i) SKM_sk_insert(X509, (st), (val), (i))
-#define sk_X509_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509, (st), (cmp))
-#define sk_X509_dup(st) SKM_sk_dup(X509, st)
-#define sk_X509_pop_free(st, free_func) SKM_sk_pop_free(X509, (st), (free_func))
-#define sk_X509_shift(st) SKM_sk_shift(X509, (st))
-#define sk_X509_pop(st) SKM_sk_pop(X509, (st))
-#define sk_X509_sort(st) SKM_sk_sort(X509, (st))
-#define sk_X509_is_sorted(st) SKM_sk_is_sorted(X509, (st))
-
-#define sk_X509V3_EXT_METHOD_new(cmp) SKM_sk_new(X509V3_EXT_METHOD, (cmp))
-#define sk_X509V3_EXT_METHOD_new_null() SKM_sk_new_null(X509V3_EXT_METHOD)
-#define sk_X509V3_EXT_METHOD_free(st) SKM_sk_free(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_num(st) SKM_sk_num(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_value(st, i) SKM_sk_value(X509V3_EXT_METHOD, (st), (i))
-#define sk_X509V3_EXT_METHOD_set(st, i, val) SKM_sk_set(X509V3_EXT_METHOD, (st), (i), (val))
-#define sk_X509V3_EXT_METHOD_zero(st) SKM_sk_zero(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_push(st, val) SKM_sk_push(X509V3_EXT_METHOD, (st), (val))
-#define sk_X509V3_EXT_METHOD_unshift(st, val) SKM_sk_unshift(X509V3_EXT_METHOD, (st), (val))
-#define sk_X509V3_EXT_METHOD_find(st, val) SKM_sk_find(X509V3_EXT_METHOD, (st), (val))
-#define sk_X509V3_EXT_METHOD_find_ex(st, val) SKM_sk_find_ex(X509V3_EXT_METHOD, (st), (val))
-#define sk_X509V3_EXT_METHOD_delete(st, i) SKM_sk_delete(X509V3_EXT_METHOD, (st), (i))
-#define sk_X509V3_EXT_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509V3_EXT_METHOD, (st), (ptr))
-#define sk_X509V3_EXT_METHOD_insert(st, val, i) SKM_sk_insert(X509V3_EXT_METHOD, (st), (val), (i))
-#define sk_X509V3_EXT_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509V3_EXT_METHOD, (st), (cmp))
-#define sk_X509V3_EXT_METHOD_dup(st) SKM_sk_dup(X509V3_EXT_METHOD, st)
-#define sk_X509V3_EXT_METHOD_pop_free(st, free_func) SKM_sk_pop_free(X509V3_EXT_METHOD, (st), (free_func))
-#define sk_X509V3_EXT_METHOD_shift(st) SKM_sk_shift(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_pop(st) SKM_sk_pop(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_sort(st) SKM_sk_sort(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_is_sorted(st) SKM_sk_is_sorted(X509V3_EXT_METHOD, (st))
-
-#define sk_X509_ALGOR_new(cmp) SKM_sk_new(X509_ALGOR, (cmp))
-#define sk_X509_ALGOR_new_null() SKM_sk_new_null(X509_ALGOR)
-#define sk_X509_ALGOR_free(st) SKM_sk_free(X509_ALGOR, (st))
-#define sk_X509_ALGOR_num(st) SKM_sk_num(X509_ALGOR, (st))
-#define sk_X509_ALGOR_value(st, i) SKM_sk_value(X509_ALGOR, (st), (i))
-#define sk_X509_ALGOR_set(st, i, val) SKM_sk_set(X509_ALGOR, (st), (i), (val))
-#define sk_X509_ALGOR_zero(st) SKM_sk_zero(X509_ALGOR, (st))
-#define sk_X509_ALGOR_push(st, val) SKM_sk_push(X509_ALGOR, (st), (val))
-#define sk_X509_ALGOR_unshift(st, val) SKM_sk_unshift(X509_ALGOR, (st), (val))
-#define sk_X509_ALGOR_find(st, val) SKM_sk_find(X509_ALGOR, (st), (val))
-#define sk_X509_ALGOR_find_ex(st, val) SKM_sk_find_ex(X509_ALGOR, (st), (val))
-#define sk_X509_ALGOR_delete(st, i) SKM_sk_delete(X509_ALGOR, (st), (i))
-#define sk_X509_ALGOR_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_ALGOR, (st), (ptr))
-#define sk_X509_ALGOR_insert(st, val, i) SKM_sk_insert(X509_ALGOR, (st), (val), (i))
-#define sk_X509_ALGOR_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_ALGOR, (st), (cmp))
-#define sk_X509_ALGOR_dup(st) SKM_sk_dup(X509_ALGOR, st)
-#define sk_X509_ALGOR_pop_free(st, free_func) SKM_sk_pop_free(X509_ALGOR, (st), (free_func))
-#define sk_X509_ALGOR_shift(st) SKM_sk_shift(X509_ALGOR, (st))
-#define sk_X509_ALGOR_pop(st) SKM_sk_pop(X509_ALGOR, (st))
-#define sk_X509_ALGOR_sort(st) SKM_sk_sort(X509_ALGOR, (st))
-#define sk_X509_ALGOR_is_sorted(st) SKM_sk_is_sorted(X509_ALGOR, (st))
-
-#define sk_X509_ATTRIBUTE_new(cmp) SKM_sk_new(X509_ATTRIBUTE, (cmp))
-#define sk_X509_ATTRIBUTE_new_null() SKM_sk_new_null(X509_ATTRIBUTE)
-#define sk_X509_ATTRIBUTE_free(st) SKM_sk_free(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_num(st) SKM_sk_num(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_value(st, i) SKM_sk_value(X509_ATTRIBUTE, (st), (i))
-#define sk_X509_ATTRIBUTE_set(st, i, val) SKM_sk_set(X509_ATTRIBUTE, (st), (i), (val))
-#define sk_X509_ATTRIBUTE_zero(st) SKM_sk_zero(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_push(st, val) SKM_sk_push(X509_ATTRIBUTE, (st), (val))
-#define sk_X509_ATTRIBUTE_unshift(st, val) SKM_sk_unshift(X509_ATTRIBUTE, (st), (val))
-#define sk_X509_ATTRIBUTE_find(st, val) SKM_sk_find(X509_ATTRIBUTE, (st), (val))
-#define sk_X509_ATTRIBUTE_find_ex(st, val) SKM_sk_find_ex(X509_ATTRIBUTE, (st), (val))
-#define sk_X509_ATTRIBUTE_delete(st, i) SKM_sk_delete(X509_ATTRIBUTE, (st), (i))
-#define sk_X509_ATTRIBUTE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_ATTRIBUTE, (st), (ptr))
-#define sk_X509_ATTRIBUTE_insert(st, val, i) SKM_sk_insert(X509_ATTRIBUTE, (st), (val), (i))
-#define sk_X509_ATTRIBUTE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_ATTRIBUTE, (st), (cmp))
-#define sk_X509_ATTRIBUTE_dup(st) SKM_sk_dup(X509_ATTRIBUTE, st)
-#define sk_X509_ATTRIBUTE_pop_free(st, free_func) SKM_sk_pop_free(X509_ATTRIBUTE, (st), (free_func))
-#define sk_X509_ATTRIBUTE_shift(st) SKM_sk_shift(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_pop(st) SKM_sk_pop(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_sort(st) SKM_sk_sort(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_is_sorted(st) SKM_sk_is_sorted(X509_ATTRIBUTE, (st))
-
-#define sk_X509_CRL_new(cmp) SKM_sk_new(X509_CRL, (cmp))
-#define sk_X509_CRL_new_null() SKM_sk_new_null(X509_CRL)
-#define sk_X509_CRL_free(st) SKM_sk_free(X509_CRL, (st))
-#define sk_X509_CRL_num(st) SKM_sk_num(X509_CRL, (st))
-#define sk_X509_CRL_value(st, i) SKM_sk_value(X509_CRL, (st), (i))
-#define sk_X509_CRL_set(st, i, val) SKM_sk_set(X509_CRL, (st), (i), (val))
-#define sk_X509_CRL_zero(st) SKM_sk_zero(X509_CRL, (st))
-#define sk_X509_CRL_push(st, val) SKM_sk_push(X509_CRL, (st), (val))
-#define sk_X509_CRL_unshift(st, val) SKM_sk_unshift(X509_CRL, (st), (val))
-#define sk_X509_CRL_find(st, val) SKM_sk_find(X509_CRL, (st), (val))
-#define sk_X509_CRL_find_ex(st, val) SKM_sk_find_ex(X509_CRL, (st), (val))
-#define sk_X509_CRL_delete(st, i) SKM_sk_delete(X509_CRL, (st), (i))
-#define sk_X509_CRL_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_CRL, (st), (ptr))
-#define sk_X509_CRL_insert(st, val, i) SKM_sk_insert(X509_CRL, (st), (val), (i))
-#define sk_X509_CRL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_CRL, (st), (cmp))
-#define sk_X509_CRL_dup(st) SKM_sk_dup(X509_CRL, st)
-#define sk_X509_CRL_pop_free(st, free_func) SKM_sk_pop_free(X509_CRL, (st), (free_func))
-#define sk_X509_CRL_shift(st) SKM_sk_shift(X509_CRL, (st))
-#define sk_X509_CRL_pop(st) SKM_sk_pop(X509_CRL, (st))
-#define sk_X509_CRL_sort(st) SKM_sk_sort(X509_CRL, (st))
-#define sk_X509_CRL_is_sorted(st) SKM_sk_is_sorted(X509_CRL, (st))
-
-#define sk_X509_EXTENSION_new(cmp) SKM_sk_new(X509_EXTENSION, (cmp))
-#define sk_X509_EXTENSION_new_null() SKM_sk_new_null(X509_EXTENSION)
-#define sk_X509_EXTENSION_free(st) SKM_sk_free(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_num(st) SKM_sk_num(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_value(st, i) SKM_sk_value(X509_EXTENSION, (st), (i))
-#define sk_X509_EXTENSION_set(st, i, val) SKM_sk_set(X509_EXTENSION, (st), (i), (val))
-#define sk_X509_EXTENSION_zero(st) SKM_sk_zero(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_push(st, val) SKM_sk_push(X509_EXTENSION, (st), (val))
-#define sk_X509_EXTENSION_unshift(st, val) SKM_sk_unshift(X509_EXTENSION, (st), (val))
-#define sk_X509_EXTENSION_find(st, val) SKM_sk_find(X509_EXTENSION, (st), (val))
-#define sk_X509_EXTENSION_find_ex(st, val) SKM_sk_find_ex(X509_EXTENSION, (st), (val))
-#define sk_X509_EXTENSION_delete(st, i) SKM_sk_delete(X509_EXTENSION, (st), (i))
-#define sk_X509_EXTENSION_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_EXTENSION, (st), (ptr))
-#define sk_X509_EXTENSION_insert(st, val, i) SKM_sk_insert(X509_EXTENSION, (st), (val), (i))
-#define sk_X509_EXTENSION_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_EXTENSION, (st), (cmp))
-#define sk_X509_EXTENSION_dup(st) SKM_sk_dup(X509_EXTENSION, st)
-#define sk_X509_EXTENSION_pop_free(st, free_func) SKM_sk_pop_free(X509_EXTENSION, (st), (free_func))
-#define sk_X509_EXTENSION_shift(st) SKM_sk_shift(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_pop(st) SKM_sk_pop(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_sort(st) SKM_sk_sort(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_is_sorted(st) SKM_sk_is_sorted(X509_EXTENSION, (st))
-
-#define sk_X509_INFO_new(cmp) SKM_sk_new(X509_INFO, (cmp))
-#define sk_X509_INFO_new_null() SKM_sk_new_null(X509_INFO)
-#define sk_X509_INFO_free(st) SKM_sk_free(X509_INFO, (st))
-#define sk_X509_INFO_num(st) SKM_sk_num(X509_INFO, (st))
-#define sk_X509_INFO_value(st, i) SKM_sk_value(X509_INFO, (st), (i))
-#define sk_X509_INFO_set(st, i, val) SKM_sk_set(X509_INFO, (st), (i), (val))
-#define sk_X509_INFO_zero(st) SKM_sk_zero(X509_INFO, (st))
-#define sk_X509_INFO_push(st, val) SKM_sk_push(X509_INFO, (st), (val))
-#define sk_X509_INFO_unshift(st, val) SKM_sk_unshift(X509_INFO, (st), (val))
-#define sk_X509_INFO_find(st, val) SKM_sk_find(X509_INFO, (st), (val))
-#define sk_X509_INFO_find_ex(st, val) SKM_sk_find_ex(X509_INFO, (st), (val))
-#define sk_X509_INFO_delete(st, i) SKM_sk_delete(X509_INFO, (st), (i))
-#define sk_X509_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_INFO, (st), (ptr))
-#define sk_X509_INFO_insert(st, val, i) SKM_sk_insert(X509_INFO, (st), (val), (i))
-#define sk_X509_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_INFO, (st), (cmp))
-#define sk_X509_INFO_dup(st) SKM_sk_dup(X509_INFO, st)
-#define sk_X509_INFO_pop_free(st, free_func) SKM_sk_pop_free(X509_INFO, (st), (free_func))
-#define sk_X509_INFO_shift(st) SKM_sk_shift(X509_INFO, (st))
-#define sk_X509_INFO_pop(st) SKM_sk_pop(X509_INFO, (st))
-#define sk_X509_INFO_sort(st) SKM_sk_sort(X509_INFO, (st))
-#define sk_X509_INFO_is_sorted(st) SKM_sk_is_sorted(X509_INFO, (st))
-
-#define sk_X509_LOOKUP_new(cmp) SKM_sk_new(X509_LOOKUP, (cmp))
-#define sk_X509_LOOKUP_new_null() SKM_sk_new_null(X509_LOOKUP)
-#define sk_X509_LOOKUP_free(st) SKM_sk_free(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_num(st) SKM_sk_num(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_value(st, i) SKM_sk_value(X509_LOOKUP, (st), (i))
-#define sk_X509_LOOKUP_set(st, i, val) SKM_sk_set(X509_LOOKUP, (st), (i), (val))
-#define sk_X509_LOOKUP_zero(st) SKM_sk_zero(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_push(st, val) SKM_sk_push(X509_LOOKUP, (st), (val))
-#define sk_X509_LOOKUP_unshift(st, val) SKM_sk_unshift(X509_LOOKUP, (st), (val))
-#define sk_X509_LOOKUP_find(st, val) SKM_sk_find(X509_LOOKUP, (st), (val))
-#define sk_X509_LOOKUP_find_ex(st, val) SKM_sk_find_ex(X509_LOOKUP, (st), (val))
-#define sk_X509_LOOKUP_delete(st, i) SKM_sk_delete(X509_LOOKUP, (st), (i))
-#define sk_X509_LOOKUP_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_LOOKUP, (st), (ptr))
-#define sk_X509_LOOKUP_insert(st, val, i) SKM_sk_insert(X509_LOOKUP, (st), (val), (i))
-#define sk_X509_LOOKUP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_LOOKUP, (st), (cmp))
-#define sk_X509_LOOKUP_dup(st) SKM_sk_dup(X509_LOOKUP, st)
-#define sk_X509_LOOKUP_pop_free(st, free_func) SKM_sk_pop_free(X509_LOOKUP, (st), (free_func))
-#define sk_X509_LOOKUP_shift(st) SKM_sk_shift(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_pop(st) SKM_sk_pop(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_sort(st) SKM_sk_sort(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_is_sorted(st) SKM_sk_is_sorted(X509_LOOKUP, (st))
-
-#define sk_X509_NAME_new(cmp) SKM_sk_new(X509_NAME, (cmp))
-#define sk_X509_NAME_new_null() SKM_sk_new_null(X509_NAME)
-#define sk_X509_NAME_free(st) SKM_sk_free(X509_NAME, (st))
-#define sk_X509_NAME_num(st) SKM_sk_num(X509_NAME, (st))
-#define sk_X509_NAME_value(st, i) SKM_sk_value(X509_NAME, (st), (i))
-#define sk_X509_NAME_set(st, i, val) SKM_sk_set(X509_NAME, (st), (i), (val))
-#define sk_X509_NAME_zero(st) SKM_sk_zero(X509_NAME, (st))
-#define sk_X509_NAME_push(st, val) SKM_sk_push(X509_NAME, (st), (val))
-#define sk_X509_NAME_unshift(st, val) SKM_sk_unshift(X509_NAME, (st), (val))
-#define sk_X509_NAME_find(st, val) SKM_sk_find(X509_NAME, (st), (val))
-#define sk_X509_NAME_find_ex(st, val) SKM_sk_find_ex(X509_NAME, (st), (val))
-#define sk_X509_NAME_delete(st, i) SKM_sk_delete(X509_NAME, (st), (i))
-#define sk_X509_NAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_NAME, (st), (ptr))
-#define sk_X509_NAME_insert(st, val, i) SKM_sk_insert(X509_NAME, (st), (val), (i))
-#define sk_X509_NAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_NAME, (st), (cmp))
-#define sk_X509_NAME_dup(st) SKM_sk_dup(X509_NAME, st)
-#define sk_X509_NAME_pop_free(st, free_func) SKM_sk_pop_free(X509_NAME, (st), (free_func))
-#define sk_X509_NAME_shift(st) SKM_sk_shift(X509_NAME, (st))
-#define sk_X509_NAME_pop(st) SKM_sk_pop(X509_NAME, (st))
-#define sk_X509_NAME_sort(st) SKM_sk_sort(X509_NAME, (st))
-#define sk_X509_NAME_is_sorted(st) SKM_sk_is_sorted(X509_NAME, (st))
-
-#define sk_X509_NAME_ENTRY_new(cmp) SKM_sk_new(X509_NAME_ENTRY, (cmp))
-#define sk_X509_NAME_ENTRY_new_null() SKM_sk_new_null(X509_NAME_ENTRY)
-#define sk_X509_NAME_ENTRY_free(st) SKM_sk_free(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_num(st) SKM_sk_num(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_value(st, i) SKM_sk_value(X509_NAME_ENTRY, (st), (i))
-#define sk_X509_NAME_ENTRY_set(st, i, val) SKM_sk_set(X509_NAME_ENTRY, (st), (i), (val))
-#define sk_X509_NAME_ENTRY_zero(st) SKM_sk_zero(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_push(st, val) SKM_sk_push(X509_NAME_ENTRY, (st), (val))
-#define sk_X509_NAME_ENTRY_unshift(st, val) SKM_sk_unshift(X509_NAME_ENTRY, (st), (val))
-#define sk_X509_NAME_ENTRY_find(st, val) SKM_sk_find(X509_NAME_ENTRY, (st), (val))
-#define sk_X509_NAME_ENTRY_find_ex(st, val) SKM_sk_find_ex(X509_NAME_ENTRY, (st), (val))
-#define sk_X509_NAME_ENTRY_delete(st, i) SKM_sk_delete(X509_NAME_ENTRY, (st), (i))
-#define sk_X509_NAME_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_NAME_ENTRY, (st), (ptr))
-#define sk_X509_NAME_ENTRY_insert(st, val, i) SKM_sk_insert(X509_NAME_ENTRY, (st), (val), (i))
-#define sk_X509_NAME_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_NAME_ENTRY, (st), (cmp))
-#define sk_X509_NAME_ENTRY_dup(st) SKM_sk_dup(X509_NAME_ENTRY, st)
-#define sk_X509_NAME_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(X509_NAME_ENTRY, (st), (free_func))
-#define sk_X509_NAME_ENTRY_shift(st) SKM_sk_shift(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_pop(st) SKM_sk_pop(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_sort(st) SKM_sk_sort(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(X509_NAME_ENTRY, (st))
-
-#define sk_X509_OBJECT_new(cmp) SKM_sk_new(X509_OBJECT, (cmp))
-#define sk_X509_OBJECT_new_null() SKM_sk_new_null(X509_OBJECT)
-#define sk_X509_OBJECT_free(st) SKM_sk_free(X509_OBJECT, (st))
-#define sk_X509_OBJECT_num(st) SKM_sk_num(X509_OBJECT, (st))
-#define sk_X509_OBJECT_value(st, i) SKM_sk_value(X509_OBJECT, (st), (i))
-#define sk_X509_OBJECT_set(st, i, val) SKM_sk_set(X509_OBJECT, (st), (i), (val))
-#define sk_X509_OBJECT_zero(st) SKM_sk_zero(X509_OBJECT, (st))
-#define sk_X509_OBJECT_push(st, val) SKM_sk_push(X509_OBJECT, (st), (val))
-#define sk_X509_OBJECT_unshift(st, val) SKM_sk_unshift(X509_OBJECT, (st), (val))
-#define sk_X509_OBJECT_find(st, val) SKM_sk_find(X509_OBJECT, (st), (val))
-#define sk_X509_OBJECT_find_ex(st, val) SKM_sk_find_ex(X509_OBJECT, (st), (val))
-#define sk_X509_OBJECT_delete(st, i) SKM_sk_delete(X509_OBJECT, (st), (i))
-#define sk_X509_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_OBJECT, (st), (ptr))
-#define sk_X509_OBJECT_insert(st, val, i) SKM_sk_insert(X509_OBJECT, (st), (val), (i))
-#define sk_X509_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_OBJECT, (st), (cmp))
-#define sk_X509_OBJECT_dup(st) SKM_sk_dup(X509_OBJECT, st)
-#define sk_X509_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(X509_OBJECT, (st), (free_func))
-#define sk_X509_OBJECT_shift(st) SKM_sk_shift(X509_OBJECT, (st))
-#define sk_X509_OBJECT_pop(st) SKM_sk_pop(X509_OBJECT, (st))
-#define sk_X509_OBJECT_sort(st) SKM_sk_sort(X509_OBJECT, (st))
-#define sk_X509_OBJECT_is_sorted(st) SKM_sk_is_sorted(X509_OBJECT, (st))
-
-#define sk_X509_POLICY_DATA_new(cmp) SKM_sk_new(X509_POLICY_DATA, (cmp))
-#define sk_X509_POLICY_DATA_new_null() SKM_sk_new_null(X509_POLICY_DATA)
-#define sk_X509_POLICY_DATA_free(st) SKM_sk_free(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_num(st) SKM_sk_num(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_value(st, i) SKM_sk_value(X509_POLICY_DATA, (st), (i))
-#define sk_X509_POLICY_DATA_set(st, i, val) SKM_sk_set(X509_POLICY_DATA, (st), (i), (val))
-#define sk_X509_POLICY_DATA_zero(st) SKM_sk_zero(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_push(st, val) SKM_sk_push(X509_POLICY_DATA, (st), (val))
-#define sk_X509_POLICY_DATA_unshift(st, val) SKM_sk_unshift(X509_POLICY_DATA, (st), (val))
-#define sk_X509_POLICY_DATA_find(st, val) SKM_sk_find(X509_POLICY_DATA, (st), (val))
-#define sk_X509_POLICY_DATA_find_ex(st, val) SKM_sk_find_ex(X509_POLICY_DATA, (st), (val))
-#define sk_X509_POLICY_DATA_delete(st, i) SKM_sk_delete(X509_POLICY_DATA, (st), (i))
-#define sk_X509_POLICY_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_POLICY_DATA, (st), (ptr))
-#define sk_X509_POLICY_DATA_insert(st, val, i) SKM_sk_insert(X509_POLICY_DATA, (st), (val), (i))
-#define sk_X509_POLICY_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_POLICY_DATA, (st), (cmp))
-#define sk_X509_POLICY_DATA_dup(st) SKM_sk_dup(X509_POLICY_DATA, st)
-#define sk_X509_POLICY_DATA_pop_free(st, free_func) SKM_sk_pop_free(X509_POLICY_DATA, (st), (free_func))
-#define sk_X509_POLICY_DATA_shift(st) SKM_sk_shift(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_pop(st) SKM_sk_pop(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_sort(st) SKM_sk_sort(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_DATA, (st))
-
-#define sk_X509_POLICY_NODE_new(cmp) SKM_sk_new(X509_POLICY_NODE, (cmp))
-#define sk_X509_POLICY_NODE_new_null() SKM_sk_new_null(X509_POLICY_NODE)
-#define sk_X509_POLICY_NODE_free(st) SKM_sk_free(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_num(st) SKM_sk_num(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_value(st, i) SKM_sk_value(X509_POLICY_NODE, (st), (i))
-#define sk_X509_POLICY_NODE_set(st, i, val) SKM_sk_set(X509_POLICY_NODE, (st), (i), (val))
-#define sk_X509_POLICY_NODE_zero(st) SKM_sk_zero(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_push(st, val) SKM_sk_push(X509_POLICY_NODE, (st), (val))
-#define sk_X509_POLICY_NODE_unshift(st, val) SKM_sk_unshift(X509_POLICY_NODE, (st), (val))
-#define sk_X509_POLICY_NODE_find(st, val) SKM_sk_find(X509_POLICY_NODE, (st), (val))
-#define sk_X509_POLICY_NODE_find_ex(st, val) SKM_sk_find_ex(X509_POLICY_NODE, (st), (val))
-#define sk_X509_POLICY_NODE_delete(st, i) SKM_sk_delete(X509_POLICY_NODE, (st), (i))
-#define sk_X509_POLICY_NODE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_POLICY_NODE, (st), (ptr))
-#define sk_X509_POLICY_NODE_insert(st, val, i) SKM_sk_insert(X509_POLICY_NODE, (st), (val), (i))
-#define sk_X509_POLICY_NODE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_POLICY_NODE, (st), (cmp))
-#define sk_X509_POLICY_NODE_dup(st) SKM_sk_dup(X509_POLICY_NODE, st)
-#define sk_X509_POLICY_NODE_pop_free(st, free_func) SKM_sk_pop_free(X509_POLICY_NODE, (st), (free_func))
-#define sk_X509_POLICY_NODE_shift(st) SKM_sk_shift(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_pop(st) SKM_sk_pop(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_sort(st) SKM_sk_sort(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_NODE, (st))
-
-#define sk_X509_PURPOSE_new(cmp) SKM_sk_new(X509_PURPOSE, (cmp))
-#define sk_X509_PURPOSE_new_null() SKM_sk_new_null(X509_PURPOSE)
-#define sk_X509_PURPOSE_free(st) SKM_sk_free(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_num(st) SKM_sk_num(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_value(st, i) SKM_sk_value(X509_PURPOSE, (st), (i))
-#define sk_X509_PURPOSE_set(st, i, val) SKM_sk_set(X509_PURPOSE, (st), (i), (val))
-#define sk_X509_PURPOSE_zero(st) SKM_sk_zero(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_push(st, val) SKM_sk_push(X509_PURPOSE, (st), (val))
-#define sk_X509_PURPOSE_unshift(st, val) SKM_sk_unshift(X509_PURPOSE, (st), (val))
-#define sk_X509_PURPOSE_find(st, val) SKM_sk_find(X509_PURPOSE, (st), (val))
-#define sk_X509_PURPOSE_find_ex(st, val) SKM_sk_find_ex(X509_PURPOSE, (st), (val))
-#define sk_X509_PURPOSE_delete(st, i) SKM_sk_delete(X509_PURPOSE, (st), (i))
-#define sk_X509_PURPOSE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_PURPOSE, (st), (ptr))
-#define sk_X509_PURPOSE_insert(st, val, i) SKM_sk_insert(X509_PURPOSE, (st), (val), (i))
-#define sk_X509_PURPOSE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_PURPOSE, (st), (cmp))
-#define sk_X509_PURPOSE_dup(st) SKM_sk_dup(X509_PURPOSE, st)
-#define sk_X509_PURPOSE_pop_free(st, free_func) SKM_sk_pop_free(X509_PURPOSE, (st), (free_func))
-#define sk_X509_PURPOSE_shift(st) SKM_sk_shift(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_pop(st) SKM_sk_pop(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_sort(st) SKM_sk_sort(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_is_sorted(st) SKM_sk_is_sorted(X509_PURPOSE, (st))
-
-#define sk_X509_REVOKED_new(cmp) SKM_sk_new(X509_REVOKED, (cmp))
-#define sk_X509_REVOKED_new_null() SKM_sk_new_null(X509_REVOKED)
-#define sk_X509_REVOKED_free(st) SKM_sk_free(X509_REVOKED, (st))
-#define sk_X509_REVOKED_num(st) SKM_sk_num(X509_REVOKED, (st))
-#define sk_X509_REVOKED_value(st, i) SKM_sk_value(X509_REVOKED, (st), (i))
-#define sk_X509_REVOKED_set(st, i, val) SKM_sk_set(X509_REVOKED, (st), (i), (val))
-#define sk_X509_REVOKED_zero(st) SKM_sk_zero(X509_REVOKED, (st))
-#define sk_X509_REVOKED_push(st, val) SKM_sk_push(X509_REVOKED, (st), (val))
-#define sk_X509_REVOKED_unshift(st, val) SKM_sk_unshift(X509_REVOKED, (st), (val))
-#define sk_X509_REVOKED_find(st, val) SKM_sk_find(X509_REVOKED, (st), (val))
-#define sk_X509_REVOKED_find_ex(st, val) SKM_sk_find_ex(X509_REVOKED, (st), (val))
-#define sk_X509_REVOKED_delete(st, i) SKM_sk_delete(X509_REVOKED, (st), (i))
-#define sk_X509_REVOKED_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_REVOKED, (st), (ptr))
-#define sk_X509_REVOKED_insert(st, val, i) SKM_sk_insert(X509_REVOKED, (st), (val), (i))
-#define sk_X509_REVOKED_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_REVOKED, (st), (cmp))
-#define sk_X509_REVOKED_dup(st) SKM_sk_dup(X509_REVOKED, st)
-#define sk_X509_REVOKED_pop_free(st, free_func) SKM_sk_pop_free(X509_REVOKED, (st), (free_func))
-#define sk_X509_REVOKED_shift(st) SKM_sk_shift(X509_REVOKED, (st))
-#define sk_X509_REVOKED_pop(st) SKM_sk_pop(X509_REVOKED, (st))
-#define sk_X509_REVOKED_sort(st) SKM_sk_sort(X509_REVOKED, (st))
-#define sk_X509_REVOKED_is_sorted(st) SKM_sk_is_sorted(X509_REVOKED, (st))
-
-#define sk_X509_TRUST_new(cmp) SKM_sk_new(X509_TRUST, (cmp))
-#define sk_X509_TRUST_new_null() SKM_sk_new_null(X509_TRUST)
-#define sk_X509_TRUST_free(st) SKM_sk_free(X509_TRUST, (st))
-#define sk_X509_TRUST_num(st) SKM_sk_num(X509_TRUST, (st))
-#define sk_X509_TRUST_value(st, i) SKM_sk_value(X509_TRUST, (st), (i))
-#define sk_X509_TRUST_set(st, i, val) SKM_sk_set(X509_TRUST, (st), (i), (val))
-#define sk_X509_TRUST_zero(st) SKM_sk_zero(X509_TRUST, (st))
-#define sk_X509_TRUST_push(st, val) SKM_sk_push(X509_TRUST, (st), (val))
-#define sk_X509_TRUST_unshift(st, val) SKM_sk_unshift(X509_TRUST, (st), (val))
-#define sk_X509_TRUST_find(st, val) SKM_sk_find(X509_TRUST, (st), (val))
-#define sk_X509_TRUST_find_ex(st, val) SKM_sk_find_ex(X509_TRUST, (st), (val))
-#define sk_X509_TRUST_delete(st, i) SKM_sk_delete(X509_TRUST, (st), (i))
-#define sk_X509_TRUST_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_TRUST, (st), (ptr))
-#define sk_X509_TRUST_insert(st, val, i) SKM_sk_insert(X509_TRUST, (st), (val), (i))
-#define sk_X509_TRUST_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_TRUST, (st), (cmp))
-#define sk_X509_TRUST_dup(st) SKM_sk_dup(X509_TRUST, st)
-#define sk_X509_TRUST_pop_free(st, free_func) SKM_sk_pop_free(X509_TRUST, (st), (free_func))
-#define sk_X509_TRUST_shift(st) SKM_sk_shift(X509_TRUST, (st))
-#define sk_X509_TRUST_pop(st) SKM_sk_pop(X509_TRUST, (st))
-#define sk_X509_TRUST_sort(st) SKM_sk_sort(X509_TRUST, (st))
-#define sk_X509_TRUST_is_sorted(st) SKM_sk_is_sorted(X509_TRUST, (st))
-
-#define sk_X509_VERIFY_PARAM_new(cmp) SKM_sk_new(X509_VERIFY_PARAM, (cmp))
-#define sk_X509_VERIFY_PARAM_new_null() SKM_sk_new_null(X509_VERIFY_PARAM)
-#define sk_X509_VERIFY_PARAM_free(st) SKM_sk_free(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_num(st) SKM_sk_num(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_value(st, i) SKM_sk_value(X509_VERIFY_PARAM, (st), (i))
-#define sk_X509_VERIFY_PARAM_set(st, i, val) SKM_sk_set(X509_VERIFY_PARAM, (st), (i), (val))
-#define sk_X509_VERIFY_PARAM_zero(st) SKM_sk_zero(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_push(st, val) SKM_sk_push(X509_VERIFY_PARAM, (st), (val))
-#define sk_X509_VERIFY_PARAM_unshift(st, val) SKM_sk_unshift(X509_VERIFY_PARAM, (st), (val))
-#define sk_X509_VERIFY_PARAM_find(st, val) SKM_sk_find(X509_VERIFY_PARAM, (st), (val))
-#define sk_X509_VERIFY_PARAM_find_ex(st, val) SKM_sk_find_ex(X509_VERIFY_PARAM, (st), (val))
-#define sk_X509_VERIFY_PARAM_delete(st, i) SKM_sk_delete(X509_VERIFY_PARAM, (st), (i))
-#define sk_X509_VERIFY_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_VERIFY_PARAM, (st), (ptr))
-#define sk_X509_VERIFY_PARAM_insert(st, val, i) SKM_sk_insert(X509_VERIFY_PARAM, (st), (val), (i))
-#define sk_X509_VERIFY_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_VERIFY_PARAM, (st), (cmp))
-#define sk_X509_VERIFY_PARAM_dup(st) SKM_sk_dup(X509_VERIFY_PARAM, st)
-#define sk_X509_VERIFY_PARAM_pop_free(st, free_func) SKM_sk_pop_free(X509_VERIFY_PARAM, (st), (free_func))
-#define sk_X509_VERIFY_PARAM_shift(st) SKM_sk_shift(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_pop(st) SKM_sk_pop(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_sort(st) SKM_sk_sort(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_is_sorted(st) SKM_sk_is_sorted(X509_VERIFY_PARAM, (st))
-
-#define sk_nid_triple_new(cmp) SKM_sk_new(nid_triple, (cmp))
-#define sk_nid_triple_new_null() SKM_sk_new_null(nid_triple)
-#define sk_nid_triple_free(st) SKM_sk_free(nid_triple, (st))
-#define sk_nid_triple_num(st) SKM_sk_num(nid_triple, (st))
-#define sk_nid_triple_value(st, i) SKM_sk_value(nid_triple, (st), (i))
-#define sk_nid_triple_set(st, i, val) SKM_sk_set(nid_triple, (st), (i), (val))
-#define sk_nid_triple_zero(st) SKM_sk_zero(nid_triple, (st))
-#define sk_nid_triple_push(st, val) SKM_sk_push(nid_triple, (st), (val))
-#define sk_nid_triple_unshift(st, val) SKM_sk_unshift(nid_triple, (st), (val))
-#define sk_nid_triple_find(st, val) SKM_sk_find(nid_triple, (st), (val))
-#define sk_nid_triple_find_ex(st, val) SKM_sk_find_ex(nid_triple, (st), (val))
-#define sk_nid_triple_delete(st, i) SKM_sk_delete(nid_triple, (st), (i))
-#define sk_nid_triple_delete_ptr(st, ptr) SKM_sk_delete_ptr(nid_triple, (st), (ptr))
-#define sk_nid_triple_insert(st, val, i) SKM_sk_insert(nid_triple, (st), (val), (i))
-#define sk_nid_triple_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(nid_triple, (st), (cmp))
-#define sk_nid_triple_dup(st) SKM_sk_dup(nid_triple, st)
-#define sk_nid_triple_pop_free(st, free_func) SKM_sk_pop_free(nid_triple, (st), (free_func))
-#define sk_nid_triple_shift(st) SKM_sk_shift(nid_triple, (st))
-#define sk_nid_triple_pop(st) SKM_sk_pop(nid_triple, (st))
-#define sk_nid_triple_sort(st) SKM_sk_sort(nid_triple, (st))
-#define sk_nid_triple_is_sorted(st) SKM_sk_is_sorted(nid_triple, (st))
-
-#define sk_void_new(cmp) SKM_sk_new(void, (cmp))
-#define sk_void_new_null() SKM_sk_new_null(void)
-#define sk_void_free(st) SKM_sk_free(void, (st))
-#define sk_void_num(st) SKM_sk_num(void, (st))
-#define sk_void_value(st, i) SKM_sk_value(void, (st), (i))
-#define sk_void_set(st, i, val) SKM_sk_set(void, (st), (i), (val))
-#define sk_void_zero(st) SKM_sk_zero(void, (st))
-#define sk_void_push(st, val) SKM_sk_push(void, (st), (val))
-#define sk_void_unshift(st, val) SKM_sk_unshift(void, (st), (val))
-#define sk_void_find(st, val) SKM_sk_find(void, (st), (val))
-#define sk_void_find_ex(st, val) SKM_sk_find_ex(void, (st), (val))
-#define sk_void_delete(st, i) SKM_sk_delete(void, (st), (i))
-#define sk_void_delete_ptr(st, ptr) SKM_sk_delete_ptr(void, (st), (ptr))
-#define sk_void_insert(st, val, i) SKM_sk_insert(void, (st), (val), (i))
-#define sk_void_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(void, (st), (cmp))
-#define sk_void_dup(st) SKM_sk_dup(void, st)
-#define sk_void_pop_free(st, free_func) SKM_sk_pop_free(void, (st), (free_func))
-#define sk_void_shift(st) SKM_sk_shift(void, (st))
-#define sk_void_pop(st) SKM_sk_pop(void, (st))
-#define sk_void_sort(st) SKM_sk_sort(void, (st))
-#define sk_void_is_sorted(st) SKM_sk_is_sorted(void, (st))
-
-#define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
-#define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())
-#define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_STACK_OF(OPENSSL_STRING, st), i))
-#define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)
-#define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_FREE_FUNC2(OPENSSL_STRING, free_func))
-#define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val), i)
-#define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)
-#define sk_OPENSSL_STRING_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_STRING, st), i, CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))
-#define sk_OPENSSL_STRING_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))
-#define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, ptr))
-#define sk_OPENSSL_STRING_set_cmp_func(st, cmp)  \
-	((int (*)(const char * const *,const char * const *)) \
-	sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_CMP_FUNC(char, cmp)))
-#define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)
-#define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))
-#define sk_OPENSSL_STRING_pop(st) (char *)sk_pop(CHECKED_STACK_OF(OPENSSL_STRING, st))
-#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
-#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
-
-
-#define sk_OPENSSL_BLOCK_new(cmp) ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
-#define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())
-#define sk_OPENSSL_BLOCK_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_value(st, i) ((OPENSSL_BLOCK)sk_value(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i))
-#define sk_OPENSSL_BLOCK_num(st) SKM_sk_num(OPENSSL_BLOCK, st)
-#define sk_OPENSSL_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_FREE_FUNC2(OPENSSL_BLOCK, free_func))
-#define sk_OPENSSL_BLOCK_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val), i)
-#define sk_OPENSSL_BLOCK_free(st) SKM_sk_free(OPENSSL_BLOCK, st)
-#define sk_OPENSSL_BLOCK_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i, CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_zero(st) SKM_sk_zero(OPENSSL_BLOCK, (st))
-#define sk_OPENSSL_BLOCK_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_CONST_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_delete(st, i) SKM_sk_delete(OPENSSL_BLOCK, (st), (i))
-#define sk_OPENSSL_BLOCK_delete_ptr(st, ptr) (OPENSSL_BLOCK *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, ptr))
-#define sk_OPENSSL_BLOCK_set_cmp_func(st, cmp)  \
-	((int (*)(const void * const *,const void * const *)) \
-	sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_CMP_FUNC(void, cmp)))
-#define sk_OPENSSL_BLOCK_dup(st) SKM_sk_dup(OPENSSL_BLOCK, st)
-#define sk_OPENSSL_BLOCK_shift(st) SKM_sk_shift(OPENSSL_BLOCK, (st))
-#define sk_OPENSSL_BLOCK_pop(st) (void *)sk_pop(CHECKED_STACK_OF(OPENSSL_BLOCK, st))
-#define sk_OPENSSL_BLOCK_sort(st) SKM_sk_sort(OPENSSL_BLOCK, (st))
-#define sk_OPENSSL_BLOCK_is_sorted(st) SKM_sk_is_sorted(OPENSSL_BLOCK, (st))
-
-
-#define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
-#define sk_OPENSSL_PSTRING_new_null() ((STACK_OF(OPENSSL_PSTRING) *)sk_new_null())
-#define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_value(st, i) ((OPENSSL_PSTRING)sk_value(CHECKED_STACK_OF(OPENSSL_PSTRING, st), i))
-#define sk_OPENSSL_PSTRING_num(st) SKM_sk_num(OPENSSL_PSTRING, st)
-#define sk_OPENSSL_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_FREE_FUNC2(OPENSSL_PSTRING, free_func))
-#define sk_OPENSSL_PSTRING_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val), i)
-#define sk_OPENSSL_PSTRING_free(st) SKM_sk_free(OPENSSL_PSTRING, st)
-#define sk_OPENSSL_PSTRING_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_PSTRING, st), i, CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_zero(st) SKM_sk_zero(OPENSSL_PSTRING, (st))
-#define sk_OPENSSL_PSTRING_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_CONST_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_delete(st, i) SKM_sk_delete(OPENSSL_PSTRING, (st), (i))
-#define sk_OPENSSL_PSTRING_delete_ptr(st, ptr) (OPENSSL_PSTRING *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, ptr))
-#define sk_OPENSSL_PSTRING_set_cmp_func(st, cmp)  \
-	((int (*)(const OPENSSL_STRING * const *,const OPENSSL_STRING * const *)) \
-	sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
-#define sk_OPENSSL_PSTRING_dup(st) SKM_sk_dup(OPENSSL_PSTRING, st)
-#define sk_OPENSSL_PSTRING_shift(st) SKM_sk_shift(OPENSSL_PSTRING, (st))
-#define sk_OPENSSL_PSTRING_pop(st) (OPENSSL_STRING *)sk_pop(CHECKED_STACK_OF(OPENSSL_PSTRING, st))
-#define sk_OPENSSL_PSTRING_sort(st) SKM_sk_sort(OPENSSL_PSTRING, (st))
-#define sk_OPENSSL_PSTRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_PSTRING, (st))
-
-
-#define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ACCESS_DESCRIPTION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ACCESS_DESCRIPTION(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ACCESS_DESCRIPTION, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ACCESS_DESCRIPTION(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ACCESS_DESCRIPTION, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ASN1_INTEGER(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ASN1_INTEGER, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ASN1_INTEGER(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ASN1_INTEGER, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ASN1_INTEGER(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ASN1_INTEGER, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ASN1_INTEGER(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ASN1_INTEGER, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ASN1_OBJECT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ASN1_OBJECT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ASN1_OBJECT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ASN1_OBJECT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ASN1_OBJECT(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ASN1_OBJECT, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ASN1_OBJECT(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ASN1_OBJECT, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ASN1_TYPE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ASN1_TYPE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ASN1_TYPE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ASN1_TYPE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ASN1_TYPE(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ASN1_TYPE, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ASN1_TYPE(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ASN1_TYPE, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ASN1_UTF8STRING, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ASN1_UTF8STRING, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ASN1_UTF8STRING(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ASN1_UTF8STRING, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ASN1_UTF8STRING(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ASN1_UTF8STRING, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_DIST_POINT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(DIST_POINT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_DIST_POINT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(DIST_POINT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_DIST_POINT(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(DIST_POINT, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_DIST_POINT(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(DIST_POINT, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ESS_CERT_ID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ESS_CERT_ID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ESS_CERT_ID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ESS_CERT_ID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ESS_CERT_ID(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ESS_CERT_ID, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ESS_CERT_ID(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ESS_CERT_ID, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_EVP_MD(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(EVP_MD, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_EVP_MD(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(EVP_MD, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_EVP_MD(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(EVP_MD, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_EVP_MD(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(EVP_MD, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_GENERAL_NAME(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(GENERAL_NAME, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_GENERAL_NAME(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(GENERAL_NAME, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_GENERAL_NAME(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(GENERAL_NAME, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_GENERAL_NAME(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(GENERAL_NAME, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_OCSP_ONEREQ(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(OCSP_ONEREQ, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_OCSP_ONEREQ(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(OCSP_ONEREQ, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_OCSP_ONEREQ(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(OCSP_ONEREQ, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_OCSP_ONEREQ(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(OCSP_ONEREQ, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(OCSP_SINGLERESP, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(OCSP_SINGLERESP, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_OCSP_SINGLERESP(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(OCSP_SINGLERESP, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_OCSP_SINGLERESP(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(OCSP_SINGLERESP, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(PKCS12_SAFEBAG, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(PKCS12_SAFEBAG, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_PKCS12_SAFEBAG(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(PKCS12_SAFEBAG, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_PKCS12_SAFEBAG(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(PKCS12_SAFEBAG, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_PKCS7(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(PKCS7, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_PKCS7(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(PKCS7, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_PKCS7(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(PKCS7, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_PKCS7(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(PKCS7, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(PKCS7_RECIP_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(PKCS7_RECIP_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_PKCS7_RECIP_INFO(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(PKCS7_RECIP_INFO, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_PKCS7_RECIP_INFO(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(PKCS7_RECIP_INFO, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(PKCS7_SIGNER_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(PKCS7_SIGNER_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_PKCS7_SIGNER_INFO(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(PKCS7_SIGNER_INFO, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_PKCS7_SIGNER_INFO(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(PKCS7_SIGNER_INFO, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_POLICYINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(POLICYINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_POLICYINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(POLICYINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_POLICYINFO(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(POLICYINFO, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_POLICYINFO(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(POLICYINFO, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_POLICYQUALINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(POLICYQUALINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_POLICYQUALINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(POLICYQUALINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_POLICYQUALINFO(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(POLICYQUALINFO, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_POLICYQUALINFO(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(POLICYQUALINFO, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_SXNETID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(SXNETID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_SXNETID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(SXNETID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_SXNETID(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(SXNETID, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_SXNETID(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(SXNETID, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_ALGOR(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_ALGOR, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_ALGOR(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_ALGOR, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_ALGOR(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_ALGOR, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_ALGOR(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_ALGOR, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_ATTRIBUTE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_ATTRIBUTE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_ATTRIBUTE(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_ATTRIBUTE, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_ATTRIBUTE(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_ATTRIBUTE, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_CRL(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_CRL, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_CRL(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_CRL, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_CRL(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_CRL, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_CRL(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_CRL, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_EXTENSION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_EXTENSION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_EXTENSION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_EXTENSION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_EXTENSION(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_EXTENSION, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_EXTENSION(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_EXTENSION, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_NAME_ENTRY, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_NAME_ENTRY, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_NAME_ENTRY(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_NAME_ENTRY, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_NAME_ENTRY(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_NAME_ENTRY, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_REVOKED(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_REVOKED, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_REVOKED(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_REVOKED, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_REVOKED(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_REVOKED, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_REVOKED(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_REVOKED, (buf), (len), (d2i_func), (free_func))
-
-#define PKCS12_decrypt_d2i_PKCS12_SAFEBAG(algor, d2i_func, free_func, pass, passlen, oct, seq) \
-	SKM_PKCS12_decrypt_d2i(PKCS12_SAFEBAG, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-
-#define PKCS12_decrypt_d2i_PKCS7(algor, d2i_func, free_func, pass, passlen, oct, seq) \
-	SKM_PKCS12_decrypt_d2i(PKCS7, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-
-#define lh_ADDED_OBJ_new() LHM_lh_new(ADDED_OBJ,added_obj)
-#define lh_ADDED_OBJ_insert(lh,inst) LHM_lh_insert(ADDED_OBJ,lh,inst)
-#define lh_ADDED_OBJ_retrieve(lh,inst) LHM_lh_retrieve(ADDED_OBJ,lh,inst)
-#define lh_ADDED_OBJ_delete(lh,inst) LHM_lh_delete(ADDED_OBJ,lh,inst)
-#define lh_ADDED_OBJ_doall(lh,fn) LHM_lh_doall(ADDED_OBJ,lh,fn)
-#define lh_ADDED_OBJ_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ADDED_OBJ,lh,fn,arg_type,arg)
-#define lh_ADDED_OBJ_error(lh) LHM_lh_error(ADDED_OBJ,lh)
-#define lh_ADDED_OBJ_num_items(lh) LHM_lh_num_items(ADDED_OBJ,lh)
-#define lh_ADDED_OBJ_down_load(lh) LHM_lh_down_load(ADDED_OBJ,lh)
-#define lh_ADDED_OBJ_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ADDED_OBJ,lh,out)
-#define lh_ADDED_OBJ_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ADDED_OBJ,lh,out)
-#define lh_ADDED_OBJ_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ADDED_OBJ,lh,out)
-#define lh_ADDED_OBJ_free(lh) LHM_lh_free(ADDED_OBJ,lh)
-
-#define lh_APP_INFO_new() LHM_lh_new(APP_INFO,app_info)
-#define lh_APP_INFO_insert(lh,inst) LHM_lh_insert(APP_INFO,lh,inst)
-#define lh_APP_INFO_retrieve(lh,inst) LHM_lh_retrieve(APP_INFO,lh,inst)
-#define lh_APP_INFO_delete(lh,inst) LHM_lh_delete(APP_INFO,lh,inst)
-#define lh_APP_INFO_doall(lh,fn) LHM_lh_doall(APP_INFO,lh,fn)
-#define lh_APP_INFO_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(APP_INFO,lh,fn,arg_type,arg)
-#define lh_APP_INFO_error(lh) LHM_lh_error(APP_INFO,lh)
-#define lh_APP_INFO_num_items(lh) LHM_lh_num_items(APP_INFO,lh)
-#define lh_APP_INFO_down_load(lh) LHM_lh_down_load(APP_INFO,lh)
-#define lh_APP_INFO_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(APP_INFO,lh,out)
-#define lh_APP_INFO_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(APP_INFO,lh,out)
-#define lh_APP_INFO_stats_bio(lh,out) \
-  LHM_lh_stats_bio(APP_INFO,lh,out)
-#define lh_APP_INFO_free(lh) LHM_lh_free(APP_INFO,lh)
-
-#define lh_CONF_VALUE_new() LHM_lh_new(CONF_VALUE,conf_value)
-#define lh_CONF_VALUE_insert(lh,inst) LHM_lh_insert(CONF_VALUE,lh,inst)
-#define lh_CONF_VALUE_retrieve(lh,inst) LHM_lh_retrieve(CONF_VALUE,lh,inst)
-#define lh_CONF_VALUE_delete(lh,inst) LHM_lh_delete(CONF_VALUE,lh,inst)
-#define lh_CONF_VALUE_doall(lh,fn) LHM_lh_doall(CONF_VALUE,lh,fn)
-#define lh_CONF_VALUE_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(CONF_VALUE,lh,fn,arg_type,arg)
-#define lh_CONF_VALUE_error(lh) LHM_lh_error(CONF_VALUE,lh)
-#define lh_CONF_VALUE_num_items(lh) LHM_lh_num_items(CONF_VALUE,lh)
-#define lh_CONF_VALUE_down_load(lh) LHM_lh_down_load(CONF_VALUE,lh)
-#define lh_CONF_VALUE_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(CONF_VALUE,lh,out)
-#define lh_CONF_VALUE_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(CONF_VALUE,lh,out)
-#define lh_CONF_VALUE_stats_bio(lh,out) \
-  LHM_lh_stats_bio(CONF_VALUE,lh,out)
-#define lh_CONF_VALUE_free(lh) LHM_lh_free(CONF_VALUE,lh)
-
-#define lh_ENGINE_PILE_new() LHM_lh_new(ENGINE_PILE,engine_pile)
-#define lh_ENGINE_PILE_insert(lh,inst) LHM_lh_insert(ENGINE_PILE,lh,inst)
-#define lh_ENGINE_PILE_retrieve(lh,inst) LHM_lh_retrieve(ENGINE_PILE,lh,inst)
-#define lh_ENGINE_PILE_delete(lh,inst) LHM_lh_delete(ENGINE_PILE,lh,inst)
-#define lh_ENGINE_PILE_doall(lh,fn) LHM_lh_doall(ENGINE_PILE,lh,fn)
-#define lh_ENGINE_PILE_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ENGINE_PILE,lh,fn,arg_type,arg)
-#define lh_ENGINE_PILE_error(lh) LHM_lh_error(ENGINE_PILE,lh)
-#define lh_ENGINE_PILE_num_items(lh) LHM_lh_num_items(ENGINE_PILE,lh)
-#define lh_ENGINE_PILE_down_load(lh) LHM_lh_down_load(ENGINE_PILE,lh)
-#define lh_ENGINE_PILE_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ENGINE_PILE,lh,out)
-#define lh_ENGINE_PILE_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ENGINE_PILE,lh,out)
-#define lh_ENGINE_PILE_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ENGINE_PILE,lh,out)
-#define lh_ENGINE_PILE_free(lh) LHM_lh_free(ENGINE_PILE,lh)
-
-#define lh_ERR_STATE_new() LHM_lh_new(ERR_STATE,err_state)
-#define lh_ERR_STATE_insert(lh,inst) LHM_lh_insert(ERR_STATE,lh,inst)
-#define lh_ERR_STATE_retrieve(lh,inst) LHM_lh_retrieve(ERR_STATE,lh,inst)
-#define lh_ERR_STATE_delete(lh,inst) LHM_lh_delete(ERR_STATE,lh,inst)
-#define lh_ERR_STATE_doall(lh,fn) LHM_lh_doall(ERR_STATE,lh,fn)
-#define lh_ERR_STATE_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ERR_STATE,lh,fn,arg_type,arg)
-#define lh_ERR_STATE_error(lh) LHM_lh_error(ERR_STATE,lh)
-#define lh_ERR_STATE_num_items(lh) LHM_lh_num_items(ERR_STATE,lh)
-#define lh_ERR_STATE_down_load(lh) LHM_lh_down_load(ERR_STATE,lh)
-#define lh_ERR_STATE_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ERR_STATE,lh,out)
-#define lh_ERR_STATE_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ERR_STATE,lh,out)
-#define lh_ERR_STATE_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ERR_STATE,lh,out)
-#define lh_ERR_STATE_free(lh) LHM_lh_free(ERR_STATE,lh)
-
-#define lh_ERR_STRING_DATA_new() LHM_lh_new(ERR_STRING_DATA,err_string_data)
-#define lh_ERR_STRING_DATA_insert(lh,inst) LHM_lh_insert(ERR_STRING_DATA,lh,inst)
-#define lh_ERR_STRING_DATA_retrieve(lh,inst) LHM_lh_retrieve(ERR_STRING_DATA,lh,inst)
-#define lh_ERR_STRING_DATA_delete(lh,inst) LHM_lh_delete(ERR_STRING_DATA,lh,inst)
-#define lh_ERR_STRING_DATA_doall(lh,fn) LHM_lh_doall(ERR_STRING_DATA,lh,fn)
-#define lh_ERR_STRING_DATA_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ERR_STRING_DATA,lh,fn,arg_type,arg)
-#define lh_ERR_STRING_DATA_error(lh) LHM_lh_error(ERR_STRING_DATA,lh)
-#define lh_ERR_STRING_DATA_num_items(lh) LHM_lh_num_items(ERR_STRING_DATA,lh)
-#define lh_ERR_STRING_DATA_down_load(lh) LHM_lh_down_load(ERR_STRING_DATA,lh)
-#define lh_ERR_STRING_DATA_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ERR_STRING_DATA,lh,out)
-#define lh_ERR_STRING_DATA_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ERR_STRING_DATA,lh,out)
-#define lh_ERR_STRING_DATA_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ERR_STRING_DATA,lh,out)
-#define lh_ERR_STRING_DATA_free(lh) LHM_lh_free(ERR_STRING_DATA,lh)
-
-#define lh_EX_CLASS_ITEM_new() LHM_lh_new(EX_CLASS_ITEM,ex_class_item)
-#define lh_EX_CLASS_ITEM_insert(lh,inst) LHM_lh_insert(EX_CLASS_ITEM,lh,inst)
-#define lh_EX_CLASS_ITEM_retrieve(lh,inst) LHM_lh_retrieve(EX_CLASS_ITEM,lh,inst)
-#define lh_EX_CLASS_ITEM_delete(lh,inst) LHM_lh_delete(EX_CLASS_ITEM,lh,inst)
-#define lh_EX_CLASS_ITEM_doall(lh,fn) LHM_lh_doall(EX_CLASS_ITEM,lh,fn)
-#define lh_EX_CLASS_ITEM_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(EX_CLASS_ITEM,lh,fn,arg_type,arg)
-#define lh_EX_CLASS_ITEM_error(lh) LHM_lh_error(EX_CLASS_ITEM,lh)
-#define lh_EX_CLASS_ITEM_num_items(lh) LHM_lh_num_items(EX_CLASS_ITEM,lh)
-#define lh_EX_CLASS_ITEM_down_load(lh) LHM_lh_down_load(EX_CLASS_ITEM,lh)
-#define lh_EX_CLASS_ITEM_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(EX_CLASS_ITEM,lh,out)
-#define lh_EX_CLASS_ITEM_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(EX_CLASS_ITEM,lh,out)
-#define lh_EX_CLASS_ITEM_stats_bio(lh,out) \
-  LHM_lh_stats_bio(EX_CLASS_ITEM,lh,out)
-#define lh_EX_CLASS_ITEM_free(lh) LHM_lh_free(EX_CLASS_ITEM,lh)
-
-#define lh_FUNCTION_new() LHM_lh_new(FUNCTION,function)
-#define lh_FUNCTION_insert(lh,inst) LHM_lh_insert(FUNCTION,lh,inst)
-#define lh_FUNCTION_retrieve(lh,inst) LHM_lh_retrieve(FUNCTION,lh,inst)
-#define lh_FUNCTION_delete(lh,inst) LHM_lh_delete(FUNCTION,lh,inst)
-#define lh_FUNCTION_doall(lh,fn) LHM_lh_doall(FUNCTION,lh,fn)
-#define lh_FUNCTION_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(FUNCTION,lh,fn,arg_type,arg)
-#define lh_FUNCTION_error(lh) LHM_lh_error(FUNCTION,lh)
-#define lh_FUNCTION_num_items(lh) LHM_lh_num_items(FUNCTION,lh)
-#define lh_FUNCTION_down_load(lh) LHM_lh_down_load(FUNCTION,lh)
-#define lh_FUNCTION_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(FUNCTION,lh,out)
-#define lh_FUNCTION_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(FUNCTION,lh,out)
-#define lh_FUNCTION_stats_bio(lh,out) \
-  LHM_lh_stats_bio(FUNCTION,lh,out)
-#define lh_FUNCTION_free(lh) LHM_lh_free(FUNCTION,lh)
-
-#define lh_MEM_new() LHM_lh_new(MEM,mem)
-#define lh_MEM_insert(lh,inst) LHM_lh_insert(MEM,lh,inst)
-#define lh_MEM_retrieve(lh,inst) LHM_lh_retrieve(MEM,lh,inst)
-#define lh_MEM_delete(lh,inst) LHM_lh_delete(MEM,lh,inst)
-#define lh_MEM_doall(lh,fn) LHM_lh_doall(MEM,lh,fn)
-#define lh_MEM_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(MEM,lh,fn,arg_type,arg)
-#define lh_MEM_error(lh) LHM_lh_error(MEM,lh)
-#define lh_MEM_num_items(lh) LHM_lh_num_items(MEM,lh)
-#define lh_MEM_down_load(lh) LHM_lh_down_load(MEM,lh)
-#define lh_MEM_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(MEM,lh,out)
-#define lh_MEM_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(MEM,lh,out)
-#define lh_MEM_stats_bio(lh,out) \
-  LHM_lh_stats_bio(MEM,lh,out)
-#define lh_MEM_free(lh) LHM_lh_free(MEM,lh)
-
-#define lh_OBJ_NAME_new() LHM_lh_new(OBJ_NAME,obj_name)
-#define lh_OBJ_NAME_insert(lh,inst) LHM_lh_insert(OBJ_NAME,lh,inst)
-#define lh_OBJ_NAME_retrieve(lh,inst) LHM_lh_retrieve(OBJ_NAME,lh,inst)
-#define lh_OBJ_NAME_delete(lh,inst) LHM_lh_delete(OBJ_NAME,lh,inst)
-#define lh_OBJ_NAME_doall(lh,fn) LHM_lh_doall(OBJ_NAME,lh,fn)
-#define lh_OBJ_NAME_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(OBJ_NAME,lh,fn,arg_type,arg)
-#define lh_OBJ_NAME_error(lh) LHM_lh_error(OBJ_NAME,lh)
-#define lh_OBJ_NAME_num_items(lh) LHM_lh_num_items(OBJ_NAME,lh)
-#define lh_OBJ_NAME_down_load(lh) LHM_lh_down_load(OBJ_NAME,lh)
-#define lh_OBJ_NAME_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(OBJ_NAME,lh,out)
-#define lh_OBJ_NAME_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(OBJ_NAME,lh,out)
-#define lh_OBJ_NAME_stats_bio(lh,out) \
-  LHM_lh_stats_bio(OBJ_NAME,lh,out)
-#define lh_OBJ_NAME_free(lh) LHM_lh_free(OBJ_NAME,lh)
-
-#define lh_OPENSSL_CSTRING_new() LHM_lh_new(OPENSSL_CSTRING,openssl_cstring)
-#define lh_OPENSSL_CSTRING_insert(lh,inst) LHM_lh_insert(OPENSSL_CSTRING,lh,inst)
-#define lh_OPENSSL_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_CSTRING,lh,inst)
-#define lh_OPENSSL_CSTRING_delete(lh,inst) LHM_lh_delete(OPENSSL_CSTRING,lh,inst)
-#define lh_OPENSSL_CSTRING_doall(lh,fn) LHM_lh_doall(OPENSSL_CSTRING,lh,fn)
-#define lh_OPENSSL_CSTRING_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(OPENSSL_CSTRING,lh,fn,arg_type,arg)
-#define lh_OPENSSL_CSTRING_error(lh) LHM_lh_error(OPENSSL_CSTRING,lh)
-#define lh_OPENSSL_CSTRING_num_items(lh) LHM_lh_num_items(OPENSSL_CSTRING,lh)
-#define lh_OPENSSL_CSTRING_down_load(lh) LHM_lh_down_load(OPENSSL_CSTRING,lh)
-#define lh_OPENSSL_CSTRING_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(OPENSSL_CSTRING,lh,out)
-#define lh_OPENSSL_CSTRING_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(OPENSSL_CSTRING,lh,out)
-#define lh_OPENSSL_CSTRING_stats_bio(lh,out) \
-  LHM_lh_stats_bio(OPENSSL_CSTRING,lh,out)
-#define lh_OPENSSL_CSTRING_free(lh) LHM_lh_free(OPENSSL_CSTRING,lh)
-
-#define lh_OPENSSL_STRING_new() LHM_lh_new(OPENSSL_STRING,openssl_string)
-#define lh_OPENSSL_STRING_insert(lh,inst) LHM_lh_insert(OPENSSL_STRING,lh,inst)
-#define lh_OPENSSL_STRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_STRING,lh,inst)
-#define lh_OPENSSL_STRING_delete(lh,inst) LHM_lh_delete(OPENSSL_STRING,lh,inst)
-#define lh_OPENSSL_STRING_doall(lh,fn) LHM_lh_doall(OPENSSL_STRING,lh,fn)
-#define lh_OPENSSL_STRING_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(OPENSSL_STRING,lh,fn,arg_type,arg)
-#define lh_OPENSSL_STRING_error(lh) LHM_lh_error(OPENSSL_STRING,lh)
-#define lh_OPENSSL_STRING_num_items(lh) LHM_lh_num_items(OPENSSL_STRING,lh)
-#define lh_OPENSSL_STRING_down_load(lh) LHM_lh_down_load(OPENSSL_STRING,lh)
-#define lh_OPENSSL_STRING_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(OPENSSL_STRING,lh,out)
-#define lh_OPENSSL_STRING_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(OPENSSL_STRING,lh,out)
-#define lh_OPENSSL_STRING_stats_bio(lh,out) \
-  LHM_lh_stats_bio(OPENSSL_STRING,lh,out)
-#define lh_OPENSSL_STRING_free(lh) LHM_lh_free(OPENSSL_STRING,lh)
-
-#define lh_SSL_SESSION_new() LHM_lh_new(SSL_SESSION,ssl_session)
-#define lh_SSL_SESSION_insert(lh,inst) LHM_lh_insert(SSL_SESSION,lh,inst)
-#define lh_SSL_SESSION_retrieve(lh,inst) LHM_lh_retrieve(SSL_SESSION,lh,inst)
-#define lh_SSL_SESSION_delete(lh,inst) LHM_lh_delete(SSL_SESSION,lh,inst)
-#define lh_SSL_SESSION_doall(lh,fn) LHM_lh_doall(SSL_SESSION,lh,fn)
-#define lh_SSL_SESSION_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(SSL_SESSION,lh,fn,arg_type,arg)
-#define lh_SSL_SESSION_error(lh) LHM_lh_error(SSL_SESSION,lh)
-#define lh_SSL_SESSION_num_items(lh) LHM_lh_num_items(SSL_SESSION,lh)
-#define lh_SSL_SESSION_down_load(lh) LHM_lh_down_load(SSL_SESSION,lh)
-#define lh_SSL_SESSION_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(SSL_SESSION,lh,out)
-#define lh_SSL_SESSION_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(SSL_SESSION,lh,out)
-#define lh_SSL_SESSION_stats_bio(lh,out) \
-  LHM_lh_stats_bio(SSL_SESSION,lh,out)
-#define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
-/* End of util/mkstack.pl block, you may now edit :-) */
-
-#endif /* !defined HEADER_SAFESTACK_H */
diff --git a/dep/include/openssl/seed.h b/dep/include/openssl/seed.h
deleted file mode 100644
index 6ffa5f024..000000000
--- a/dep/include/openssl/seed.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved.  
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Neither the name of author nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-/* ====================================================================
- * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-
-#ifndef HEADER_SEED_H
-#define HEADER_SEED_H
-
-#include <openssl/opensslconf.h>
-#include <openssl/e_os2.h>
-#include <openssl/crypto.h>
-
-#ifdef OPENSSL_NO_SEED
-#error SEED is disabled.
-#endif
-
-#ifdef AES_LONG /* look whether we need 'long' to get 32 bits */
-# ifndef SEED_LONG
-#  define SEED_LONG 1
-# endif
-#endif
-
-#if !defined(NO_SYS_TYPES_H)
-# include <sys/types.h>
-#endif
-
-#define SEED_BLOCK_SIZE 16
-#define SEED_KEY_LENGTH	16
-
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
-typedef struct seed_key_st {
-#ifdef SEED_LONG
-    unsigned long data[32];
-#else
-    unsigned int data[32];
-#endif
-} SEED_KEY_SCHEDULE;
-
-
-void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH], SEED_KEY_SCHEDULE *ks);
-
-void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE], unsigned char d[SEED_BLOCK_SIZE], const SEED_KEY_SCHEDULE *ks);
-void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE], unsigned char d[SEED_BLOCK_SIZE], const SEED_KEY_SCHEDULE *ks);
-
-void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out, const SEED_KEY_SCHEDULE *ks, int enc);
-void SEED_cbc_encrypt(const unsigned char *in, unsigned char *out,
-        size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_SIZE], int enc);
-void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-        size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_SIZE], int *num, int enc);
-void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-        size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_SIZE], int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* HEADER_SEED_H */
diff --git a/dep/include/openssl/sha.h b/dep/include/openssl/sha.h
deleted file mode 100644
index 16cacf9fc..000000000
--- a/dep/include/openssl/sha.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* crypto/sha/sha.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SHA_H
-#define HEADER_SHA_H
-
-#include <openssl/e_os2.h>
-#include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#if defined(OPENSSL_NO_SHA) || (defined(OPENSSL_NO_SHA0) && defined(OPENSSL_NO_SHA1))
-#error SHA is disabled.
-#endif
-
-#if defined(OPENSSL_FIPS)
-#define FIPS_SHA_SIZE_T size_t
-#endif
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! SHA_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-#if defined(__LP32__)
-#define SHA_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#define SHA_LONG unsigned long
-#define SHA_LONG_LOG2 3
-#else
-#define SHA_LONG unsigned int
-#endif
-
-#define SHA_LBLOCK	16
-#define SHA_CBLOCK	(SHA_LBLOCK*4)	/* SHA treats input data as a
-					 * contiguous array of 32 bit
-					 * wide big-endian values. */
-#define SHA_LAST_BLOCK  (SHA_CBLOCK-8)
-#define SHA_DIGEST_LENGTH 20
-
-typedef struct SHAstate_st
-	{
-	SHA_LONG h0,h1,h2,h3,h4;
-	SHA_LONG Nl,Nh;
-	SHA_LONG data[SHA_LBLOCK];
-	unsigned int num;
-	} SHA_CTX;
-
-#ifndef OPENSSL_NO_SHA0
-int SHA_Init(SHA_CTX *c);
-int SHA_Update(SHA_CTX *c, const void *data, size_t len);
-int SHA_Final(unsigned char *md, SHA_CTX *c);
-unsigned char *SHA(const unsigned char *d, size_t n, unsigned char *md);
-void SHA_Transform(SHA_CTX *c, const unsigned char *data);
-#endif
-#ifndef OPENSSL_NO_SHA1
-int SHA1_Init(SHA_CTX *c);
-int SHA1_Update(SHA_CTX *c, const void *data, size_t len);
-int SHA1_Final(unsigned char *md, SHA_CTX *c);
-unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md);
-void SHA1_Transform(SHA_CTX *c, const unsigned char *data);
-#endif
-
-#define SHA256_CBLOCK	(SHA_LBLOCK*4)	/* SHA-256 treats input data as a
-					 * contiguous array of 32 bit
-					 * wide big-endian values. */
-#define SHA224_DIGEST_LENGTH	28
-#define SHA256_DIGEST_LENGTH	32
-
-typedef struct SHA256state_st
-	{
-	SHA_LONG h[8];
-	SHA_LONG Nl,Nh;
-	SHA_LONG data[SHA_LBLOCK];
-	unsigned int num,md_len;
-	} SHA256_CTX;
-
-#ifndef OPENSSL_NO_SHA256
-int SHA224_Init(SHA256_CTX *c);
-int SHA224_Update(SHA256_CTX *c, const void *data, size_t len);
-int SHA224_Final(unsigned char *md, SHA256_CTX *c);
-unsigned char *SHA224(const unsigned char *d, size_t n,unsigned char *md);
-int SHA256_Init(SHA256_CTX *c);
-int SHA256_Update(SHA256_CTX *c, const void *data, size_t len);
-int SHA256_Final(unsigned char *md, SHA256_CTX *c);
-unsigned char *SHA256(const unsigned char *d, size_t n,unsigned char *md);
-void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
-#endif
-
-#define SHA384_DIGEST_LENGTH	48
-#define SHA512_DIGEST_LENGTH	64
-
-#ifndef OPENSSL_NO_SHA512
-/*
- * Unlike 32-bit digest algorithms, SHA-512 *relies* on SHA_LONG64
- * being exactly 64-bit wide. See Implementation Notes in sha512.c
- * for further details.
- */
-#define SHA512_CBLOCK	(SHA_LBLOCK*8)	/* SHA-512 treats input data as a
-					 * contiguous array of 64 bit
-					 * wide big-endian values. */
-#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#define SHA_LONG64 unsigned __int64
-#define U64(C)     C##UI64
-#elif defined(__arch64__)
-#define SHA_LONG64 unsigned long
-#define U64(C)     C##UL
-#else
-#define SHA_LONG64 unsigned long long
-#define U64(C)     C##ULL
-#endif
-
-typedef struct SHA512state_st
-	{
-	SHA_LONG64 h[8];
-	SHA_LONG64 Nl,Nh;
-	union {
-		SHA_LONG64	d[SHA_LBLOCK];
-		unsigned char	p[SHA512_CBLOCK];
-	} u;
-	unsigned int num,md_len;
-	} SHA512_CTX;
-#endif
-
-#ifndef OPENSSL_NO_SHA512
-int SHA384_Init(SHA512_CTX *c);
-int SHA384_Update(SHA512_CTX *c, const void *data, size_t len);
-int SHA384_Final(unsigned char *md, SHA512_CTX *c);
-unsigned char *SHA384(const unsigned char *d, size_t n,unsigned char *md);
-int SHA512_Init(SHA512_CTX *c);
-int SHA512_Update(SHA512_CTX *c, const void *data, size_t len);
-int SHA512_Final(unsigned char *md, SHA512_CTX *c);
-unsigned char *SHA512(const unsigned char *d, size_t n,unsigned char *md);
-void SHA512_Transform(SHA512_CTX *c, const unsigned char *data);
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/ssl.h b/dep/include/openssl/ssl.h
deleted file mode 100644
index e4c3f6501..000000000
--- a/dep/include/openssl/ssl.h
+++ /dev/null
@@ -1,2302 +0,0 @@
-/* ssl/ssl.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECC cipher suite support in OpenSSL originally developed by 
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-/* ====================================================================
- * Copyright 2005 Nokia. All rights reserved.
- *
- * The portions of the attached software ("Contribution") is developed by
- * Nokia Corporation and is licensed pursuant to the OpenSSL open source
- * license.
- *
- * The Contribution, originally written by Mika Kousa and Pasi Eronen of
- * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
- * support (see RFC 4279) to OpenSSL.
- *
- * No patent licenses or other rights except those expressly stated in
- * the OpenSSL open source license shall be deemed granted or received
- * expressly, by implication, estoppel, or otherwise.
- *
- * No assurances are provided by Nokia that the Contribution does not
- * infringe the patent or other intellectual property rights of any third
- * party or that the license provides you with all the necessary rights
- * to make use of the Contribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
- * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
- * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
- * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
- * OTHERWISE.
- */
-
-#ifndef HEADER_SSL_H 
-#define HEADER_SSL_H 
-
-#include <openssl/e_os2.h>
-
-#ifndef OPENSSL_NO_COMP
-#include <openssl/comp.h>
-#endif
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#ifndef OPENSSL_NO_DEPRECATED
-#ifndef OPENSSL_NO_X509
-#include <openssl/x509.h>
-#endif
-#include <openssl/crypto.h>
-#include <openssl/lhash.h>
-#include <openssl/buffer.h>
-#endif
-#include <openssl/pem.h>
-#include <openssl/hmac.h>
-
-#include <openssl/kssl.h>
-#include <openssl/safestack.h>
-#include <openssl/symhacks.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* SSLeay version number for ASN.1 encoding of the session information */
-/* Version 0 - initial version
- * Version 1 - added the optional peer certificate
- */
-#define SSL_SESSION_ASN1_VERSION 0x0001
-
-/* text strings for the ciphers */
-#define SSL_TXT_NULL_WITH_MD5		SSL2_TXT_NULL_WITH_MD5			
-#define SSL_TXT_RC4_128_WITH_MD5	SSL2_TXT_RC4_128_WITH_MD5		
-#define SSL_TXT_RC4_128_EXPORT40_WITH_MD5 SSL2_TXT_RC4_128_EXPORT40_WITH_MD5	
-#define SSL_TXT_RC2_128_CBC_WITH_MD5	SSL2_TXT_RC2_128_CBC_WITH_MD5		
-#define SSL_TXT_RC2_128_CBC_EXPORT40_WITH_MD5 SSL2_TXT_RC2_128_CBC_EXPORT40_WITH_MD5	
-#define SSL_TXT_IDEA_128_CBC_WITH_MD5	SSL2_TXT_IDEA_128_CBC_WITH_MD5		
-#define SSL_TXT_DES_64_CBC_WITH_MD5	SSL2_TXT_DES_64_CBC_WITH_MD5		
-#define SSL_TXT_DES_64_CBC_WITH_SHA	SSL2_TXT_DES_64_CBC_WITH_SHA		
-#define SSL_TXT_DES_192_EDE3_CBC_WITH_MD5 SSL2_TXT_DES_192_EDE3_CBC_WITH_MD5	
-#define SSL_TXT_DES_192_EDE3_CBC_WITH_SHA SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA	
-
-/*    VRS Additional Kerberos5 entries
- */
-#define SSL_TXT_KRB5_DES_64_CBC_SHA   SSL3_TXT_KRB5_DES_64_CBC_SHA
-#define SSL_TXT_KRB5_DES_192_CBC3_SHA SSL3_TXT_KRB5_DES_192_CBC3_SHA
-#define SSL_TXT_KRB5_RC4_128_SHA      SSL3_TXT_KRB5_RC4_128_SHA
-#define SSL_TXT_KRB5_IDEA_128_CBC_SHA SSL3_TXT_KRB5_IDEA_128_CBC_SHA
-#define SSL_TXT_KRB5_DES_64_CBC_MD5   SSL3_TXT_KRB5_DES_64_CBC_MD5       
-#define SSL_TXT_KRB5_DES_192_CBC3_MD5 SSL3_TXT_KRB5_DES_192_CBC3_MD5       
-#define SSL_TXT_KRB5_RC4_128_MD5      SSL3_TXT_KRB5_RC4_128_MD5
-#define SSL_TXT_KRB5_IDEA_128_CBC_MD5 SSL3_TXT_KRB5_IDEA_128_CBC_MD5 
-
-#define SSL_TXT_KRB5_DES_40_CBC_SHA   SSL3_TXT_KRB5_DES_40_CBC_SHA 
-#define SSL_TXT_KRB5_RC2_40_CBC_SHA   SSL3_TXT_KRB5_RC2_40_CBC_SHA 
-#define SSL_TXT_KRB5_RC4_40_SHA	      SSL3_TXT_KRB5_RC4_40_SHA
-#define SSL_TXT_KRB5_DES_40_CBC_MD5   SSL3_TXT_KRB5_DES_40_CBC_MD5 
-#define SSL_TXT_KRB5_RC2_40_CBC_MD5   SSL3_TXT_KRB5_RC2_40_CBC_MD5 
-#define SSL_TXT_KRB5_RC4_40_MD5	      SSL3_TXT_KRB5_RC4_40_MD5
-
-#define SSL_TXT_KRB5_DES_40_CBC_SHA   SSL3_TXT_KRB5_DES_40_CBC_SHA
-#define SSL_TXT_KRB5_DES_40_CBC_MD5   SSL3_TXT_KRB5_DES_40_CBC_MD5
-#define SSL_TXT_KRB5_DES_64_CBC_SHA   SSL3_TXT_KRB5_DES_64_CBC_SHA
-#define SSL_TXT_KRB5_DES_64_CBC_MD5   SSL3_TXT_KRB5_DES_64_CBC_MD5
-#define SSL_TXT_KRB5_DES_192_CBC3_SHA SSL3_TXT_KRB5_DES_192_CBC3_SHA
-#define SSL_TXT_KRB5_DES_192_CBC3_MD5 SSL3_TXT_KRB5_DES_192_CBC3_MD5
-#define SSL_MAX_KRB5_PRINCIPAL_LENGTH  256
-
-#define SSL_MAX_SSL_SESSION_ID_LENGTH		32
-#define SSL_MAX_SID_CTX_LENGTH			32
-
-#define SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES	(512/8)
-#define SSL_MAX_KEY_ARG_LENGTH			8
-#define SSL_MAX_MASTER_KEY_LENGTH		48
-
-
-/* These are used to specify which ciphers to use and not to use */
-
-#define SSL_TXT_EXP40		"EXPORT40"
-#define SSL_TXT_EXP56		"EXPORT56"
-#define SSL_TXT_LOW		"LOW"
-#define SSL_TXT_MEDIUM		"MEDIUM"
-#define SSL_TXT_HIGH		"HIGH"
-#define SSL_TXT_FIPS		"FIPS"
-
-#define SSL_TXT_kFZA		"kFZA" /* unused! */
-#define	SSL_TXT_aFZA		"aFZA" /* unused! */
-#define SSL_TXT_eFZA		"eFZA" /* unused! */
-#define SSL_TXT_FZA		"FZA"  /* unused! */
-
-#define	SSL_TXT_aNULL		"aNULL"
-#define	SSL_TXT_eNULL		"eNULL"
-#define	SSL_TXT_NULL		"NULL"
-
-#define SSL_TXT_kRSA		"kRSA"
-#define SSL_TXT_kDHr		"kDHr" /* no such ciphersuites supported! */
-#define SSL_TXT_kDHd		"kDHd" /* no such ciphersuites supported! */
-#define SSL_TXT_kDH 		"kDH"  /* no such ciphersuites supported! */
-#define SSL_TXT_kEDH		"kEDH"
-#define SSL_TXT_kKRB5     	"kKRB5"
-#define SSL_TXT_kECDHr		"kECDHr"
-#define SSL_TXT_kECDHe		"kECDHe"
-#define SSL_TXT_kECDH		"kECDH"
-#define SSL_TXT_kEECDH		"kEECDH"
-#define SSL_TXT_kPSK            "kPSK"
-#define SSL_TXT_kGOST		"kGOST"
-
-#define	SSL_TXT_aRSA		"aRSA"
-#define	SSL_TXT_aDSS		"aDSS"
-#define	SSL_TXT_aDH		"aDH" /* no such ciphersuites supported! */
-#define	SSL_TXT_aECDH		"aECDH"
-#define SSL_TXT_aKRB5     	"aKRB5"
-#define SSL_TXT_aECDSA		"aECDSA"
-#define SSL_TXT_aPSK            "aPSK"
-#define SSL_TXT_aGOST94	"aGOST94"
-#define SSL_TXT_aGOST01 "aGOST01"
-#define SSL_TXT_aGOST  "aGOST"
-
-#define	SSL_TXT_DSS		"DSS"
-#define SSL_TXT_DH		"DH"
-#define SSL_TXT_EDH		"EDH" /* same as "kEDH:-ADH" */
-#define SSL_TXT_ADH		"ADH"
-#define SSL_TXT_RSA		"RSA"
-#define SSL_TXT_ECDH		"ECDH"
-#define SSL_TXT_EECDH		"EECDH" /* same as "kEECDH:-AECDH" */
-#define SSL_TXT_AECDH		"AECDH"
-#define SSL_TXT_ECDSA		"ECDSA"
-#define SSL_TXT_KRB5      	"KRB5"
-#define SSL_TXT_PSK             "PSK"
-
-#define SSL_TXT_DES		"DES"
-#define SSL_TXT_3DES		"3DES"
-#define SSL_TXT_RC4		"RC4"
-#define SSL_TXT_RC2		"RC2"
-#define SSL_TXT_IDEA		"IDEA"
-#define SSL_TXT_SEED		"SEED"
-#define SSL_TXT_AES128		"AES128"
-#define SSL_TXT_AES256		"AES256"
-#define SSL_TXT_AES		"AES"
-#define SSL_TXT_CAMELLIA128	"CAMELLIA128"
-#define SSL_TXT_CAMELLIA256	"CAMELLIA256"
-#define SSL_TXT_CAMELLIA	"CAMELLIA"
-
-#define SSL_TXT_MD5		"MD5"
-#define SSL_TXT_SHA1		"SHA1"
-#define SSL_TXT_SHA		"SHA" /* same as "SHA1" */
-#define SSL_TXT_GOST94		"GOST94" 
-#define SSL_TXT_GOST89MAC		"GOST89MAC" 
-
-#define SSL_TXT_SSLV2		"SSLv2"
-#define SSL_TXT_SSLV3		"SSLv3"
-#define SSL_TXT_TLSV1		"TLSv1"
-
-#define SSL_TXT_EXP		"EXP"
-#define SSL_TXT_EXPORT		"EXPORT"
-
-#define SSL_TXT_ALL		"ALL"
-
-/*
- * COMPLEMENTOF* definitions. These identifiers are used to (de-select)
- * ciphers normally not being used.
- * Example: "RC4" will activate all ciphers using RC4 including ciphers
- * without authentication, which would normally disabled by DEFAULT (due
- * the "!ADH" being part of default). Therefore "RC4:!COMPLEMENTOFDEFAULT"
- * will make sure that it is also disabled in the specific selection.
- * COMPLEMENTOF* identifiers are portable between version, as adjustments
- * to the default cipher setup will also be included here.
- *
- * COMPLEMENTOFDEFAULT does not experience the same special treatment that
- * DEFAULT gets, as only selection is being done and no sorting as needed
- * for DEFAULT.
- */
-#define SSL_TXT_CMPALL		"COMPLEMENTOFALL"
-#define SSL_TXT_CMPDEF		"COMPLEMENTOFDEFAULT"
-
-/* The following cipher list is used by default.
- * It also is substituted when an application-defined cipher list string
- * starts with 'DEFAULT'. */
-#define SSL_DEFAULT_CIPHER_LIST	"ALL:!aNULL:!eNULL:!SSLv2"
-/* As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always
- * starts with a reasonable order, and all we have to do for DEFAULT is
- * throwing out anonymous and unencrypted ciphersuites!
- * (The latter are not actually enabled by ALL, but "ALL:RSA" would enable
- * some of them.)
- */
-
-/* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
-#define SSL_SENT_SHUTDOWN	1
-#define SSL_RECEIVED_SHUTDOWN	2
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#if (defined(OPENSSL_NO_RSA) || defined(OPENSSL_NO_MD5)) && !defined(OPENSSL_NO_SSL2)
-#define OPENSSL_NO_SSL2
-#endif
-
-#define SSL_FILETYPE_ASN1	X509_FILETYPE_ASN1
-#define SSL_FILETYPE_PEM	X509_FILETYPE_PEM
-
-/* This is needed to stop compilers complaining about the
- * 'struct ssl_st *' function parameters used to prototype callbacks
- * in SSL_CTX. */
-typedef struct ssl_st *ssl_crock_st;
-typedef struct tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT;
-
-/* used to hold info on the particular ciphers used */
-typedef struct ssl_cipher_st
-	{
-	int valid;
-	const char *name;		/* text name */
-	unsigned long id;		/* id, 4 bytes, first is version */
-
-	/* changed in 0.9.9: these four used to be portions of a single value 'algorithms' */
-	unsigned long algorithm_mkey;	/* key exchange algorithm */
-	unsigned long algorithm_auth;	/* server authentication */
-	unsigned long algorithm_enc;	/* symmetric encryption */
-	unsigned long algorithm_mac;	/* symmetric authentication */
-	unsigned long algorithm_ssl;	/* (major) protocol version */
-
-	unsigned long algo_strength;	/* strength and export flags */
-	unsigned long algorithm2;	/* Extra flags */
-	int strength_bits;		/* Number of bits really used */
-	int alg_bits;			/* Number of bits for algorithm */
-	} SSL_CIPHER;
-
-DECLARE_STACK_OF(SSL_CIPHER)
-
-typedef int (*tls_session_ticket_ext_cb_fn)(SSL *s, const unsigned char *data, int len, void *arg);
-typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg);
-
-/* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */
-typedef struct ssl_method_st
-	{
-	int version;
-	int (*ssl_new)(SSL *s);
-	void (*ssl_clear)(SSL *s);
-	void (*ssl_free)(SSL *s);
-	int (*ssl_accept)(SSL *s);
-	int (*ssl_connect)(SSL *s);
-	int (*ssl_read)(SSL *s,void *buf,int len);
-	int (*ssl_peek)(SSL *s,void *buf,int len);
-	int (*ssl_write)(SSL *s,const void *buf,int len);
-	int (*ssl_shutdown)(SSL *s);
-	int (*ssl_renegotiate)(SSL *s);
-	int (*ssl_renegotiate_check)(SSL *s);
-	long (*ssl_get_message)(SSL *s, int st1, int stn, int mt, long
-		max, int *ok);
-	int (*ssl_read_bytes)(SSL *s, int type, unsigned char *buf, int len, 
-		int peek);
-	int (*ssl_write_bytes)(SSL *s, int type, const void *buf_, int len);
-	int (*ssl_dispatch_alert)(SSL *s);
-	long (*ssl_ctrl)(SSL *s,int cmd,long larg,void *parg);
-	long (*ssl_ctx_ctrl)(SSL_CTX *ctx,int cmd,long larg,void *parg);
-	const SSL_CIPHER *(*get_cipher_by_char)(const unsigned char *ptr);
-	int (*put_cipher_by_char)(const SSL_CIPHER *cipher,unsigned char *ptr);
-	int (*ssl_pending)(const SSL *s);
-	int (*num_ciphers)(void);
-	const SSL_CIPHER *(*get_cipher)(unsigned ncipher);
-	const struct ssl_method_st *(*get_ssl_method)(int version);
-	long (*get_timeout)(void);
-	struct ssl3_enc_method *ssl3_enc; /* Extra SSLv3/TLS stuff */
-	int (*ssl_version)(void);
-	long (*ssl_callback_ctrl)(SSL *s, int cb_id, void (*fp)(void));
-	long (*ssl_ctx_callback_ctrl)(SSL_CTX *s, int cb_id, void (*fp)(void));
-	} SSL_METHOD;
-
-/* Lets make this into an ASN.1 type structure as follows
- * SSL_SESSION_ID ::= SEQUENCE {
- *	version 		INTEGER,	-- structure version number
- *	SSLversion 		INTEGER,	-- SSL version number
- *	Cipher 			OCTET STRING,	-- the 3 byte cipher ID
- *	Session_ID 		OCTET STRING,	-- the Session ID
- *	Master_key 		OCTET STRING,	-- the master key
- *	KRB5_principal		OCTET STRING	-- optional Kerberos principal
- *	Key_Arg [ 0 ] IMPLICIT	OCTET STRING,	-- the optional Key argument
- *	Time [ 1 ] EXPLICIT	INTEGER,	-- optional Start Time
- *	Timeout [ 2 ] EXPLICIT	INTEGER,	-- optional Timeout ins seconds
- *	Peer [ 3 ] EXPLICIT	X509,		-- optional Peer Certificate
- *	Session_ID_context [ 4 ] EXPLICIT OCTET STRING,   -- the Session ID context
- *	Verify_result [ 5 ] EXPLICIT INTEGER,   -- X509_V_... code for `Peer'
- *	HostName [ 6 ] EXPLICIT OCTET STRING,   -- optional HostName from servername TLS extension 
- *	ECPointFormatList [ 7 ] OCTET STRING,     -- optional EC point format list from TLS extension
- *	PSK_identity_hint [ 8 ] EXPLICIT OCTET STRING, -- optional PSK identity hint
- *	PSK_identity [ 9 ] EXPLICIT OCTET STRING -- optional PSK identity
- *	}
- * Look in ssl/ssl_asn1.c for more details
- * I'm using EXPLICIT tags so I can read the damn things using asn1parse :-).
- */
-typedef struct ssl_session_st
-	{
-	int ssl_version;	/* what ssl version session info is
-				 * being kept in here? */
-
-	/* only really used in SSLv2 */
-	unsigned int key_arg_length;
-	unsigned char key_arg[SSL_MAX_KEY_ARG_LENGTH];
-	int master_key_length;
-	unsigned char master_key[SSL_MAX_MASTER_KEY_LENGTH];
-	/* session_id - valid? */
-	unsigned int session_id_length;
-	unsigned char session_id[SSL_MAX_SSL_SESSION_ID_LENGTH];
-	/* this is used to determine whether the session is being reused in
-	 * the appropriate context. It is up to the application to set this,
-	 * via SSL_new */
-	unsigned int sid_ctx_length;
-	unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-
-#ifndef OPENSSL_NO_KRB5
-        unsigned int krb5_client_princ_len;
-        unsigned char krb5_client_princ[SSL_MAX_KRB5_PRINCIPAL_LENGTH];
-#endif /* OPENSSL_NO_KRB5 */
-#ifndef OPENSSL_NO_PSK
-	char *psk_identity_hint;
-	char *psk_identity;
-#endif
-	int not_resumable;
-
-	/* The cert is the certificate used to establish this connection */
-	struct sess_cert_st /* SESS_CERT */ *sess_cert;
-
-	/* This is the cert for the other end.
-	 * On clients, it will be the same as sess_cert->peer_key->x509
-	 * (the latter is not enough as sess_cert is not retained
-	 * in the external representation of sessions, see ssl_asn1.c). */
-	X509 *peer;
-	/* when app_verify_callback accepts a session where the peer's certificate
-	 * is not ok, we must remember the error for session reuse: */
-	long verify_result; /* only for servers */
-
-	int references;
-	long timeout;
-	long time;
-
-	unsigned int compress_meth;	/* Need to lookup the method */
-
-	const SSL_CIPHER *cipher;
-	unsigned long cipher_id;	/* when ASN.1 loaded, this
-					 * needs to be used to load
-					 * the 'cipher' structure */
-
-	STACK_OF(SSL_CIPHER) *ciphers; /* shared ciphers? */
-
-	CRYPTO_EX_DATA ex_data; /* application specific data */
-
-	/* These are used to make removal of session-ids more
-	 * efficient and to implement a maximum cache size. */
-	struct ssl_session_st *prev,*next;
-#ifndef OPENSSL_NO_TLSEXT
-	char *tlsext_hostname;
-#ifndef OPENSSL_NO_EC
-	size_t tlsext_ecpointformatlist_length;
-	unsigned char *tlsext_ecpointformatlist; /* peer's list */
-	size_t tlsext_ellipticcurvelist_length;
-	unsigned char *tlsext_ellipticcurvelist; /* peer's list */
-#endif /* OPENSSL_NO_EC */
-	/* RFC4507 info */
-	unsigned char *tlsext_tick;	/* Session ticket */
-	size_t	tlsext_ticklen;		/* Session ticket length */	
-	long tlsext_tick_lifetime_hint;	/* Session lifetime hint in seconds */
-#endif
-	} SSL_SESSION;
-
-
-#define SSL_OP_MICROSOFT_SESS_ID_BUG			0x00000001L
-#define SSL_OP_NETSCAPE_CHALLENGE_BUG			0x00000002L
-/* Allow initial connection to servers that don't support RI */
-#define SSL_OP_LEGACY_SERVER_CONNECT			0x00000004L
-#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG		0x00000008L
-#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG		0x00000010L
-#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER		0x00000020L
-#define SSL_OP_MSIE_SSLV2_RSA_PADDING			0x00000040L /* no effect since 0.9.7h and 0.9.8b */
-#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG			0x00000080L
-#define SSL_OP_TLS_D5_BUG				0x00000100L
-#define SSL_OP_TLS_BLOCK_PADDING_BUG			0x00000200L
-
-/* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
- * in OpenSSL 0.9.6d.  Usually (depending on the application protocol)
- * the workaround is not needed.  Unfortunately some broken SSL/TLS
- * implementations cannot handle it at all, which is why we include
- * it in SSL_OP_ALL. */
-#define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS              0x00000800L /* added in 0.9.6e */
-
-/* SSL_OP_ALL: various bug workarounds that should be rather harmless.
- *             This used to be 0x000FFFFFL before 0.9.7. */
-#define SSL_OP_ALL					0x80000FFFL
-
-/* DTLS options */
-#define SSL_OP_NO_QUERY_MTU                 0x00001000L
-/* Turn on Cookie Exchange (on relevant for servers) */
-#define SSL_OP_COOKIE_EXCHANGE              0x00002000L
-/* Don't use RFC4507 ticket extension */
-#define SSL_OP_NO_TICKET	            0x00004000L
-/* Use Cisco's "speshul" version of DTLS_BAD_VER (as client)  */
-#define SSL_OP_CISCO_ANYCONNECT		    0x00008000L
-
-/* As server, disallow session resumption on renegotiation */
-#define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION	0x00010000L
-/* Don't use compression even if supported */
-#define SSL_OP_NO_COMPRESSION				0x00020000L
-/* Permit unsafe legacy renegotiation */
-#define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION	0x00040000L
-/* If set, always create a new key when using tmp_ecdh parameters */
-#define SSL_OP_SINGLE_ECDH_USE				0x00080000L
-/* If set, always create a new key when using tmp_dh parameters */
-#define SSL_OP_SINGLE_DH_USE				0x00100000L
-/* Set to always use the tmp_rsa key when doing RSA operations,
- * even when this violates protocol specs */
-#define SSL_OP_EPHEMERAL_RSA				0x00200000L
-/* Set on servers to choose the cipher according to the server's
- * preferences */
-#define SSL_OP_CIPHER_SERVER_PREFERENCE			0x00400000L
-/* If set, a server will allow a client to issue a SSLv3.0 version number
- * as latest version supported in the premaster secret, even when TLSv1.0
- * (version 3.1) was announced in the client hello. Normally this is
- * forbidden to prevent version rollback attacks. */
-#define SSL_OP_TLS_ROLLBACK_BUG				0x00800000L
-
-#define SSL_OP_NO_SSLv2					0x01000000L
-#define SSL_OP_NO_SSLv3					0x02000000L
-#define SSL_OP_NO_TLSv1					0x04000000L
-
-/* The next flag deliberately changes the ciphertest, this is a check
- * for the PKCS#1 attack */
-#define SSL_OP_PKCS1_CHECK_1				0x08000000L
-#define SSL_OP_PKCS1_CHECK_2				0x10000000L
-#define SSL_OP_NETSCAPE_CA_DN_BUG			0x20000000L
-#define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG		0x40000000L
-/* Make server add server-hello extension from early version of
- * cryptopro draft, when GOST ciphersuite is negotiated. 
- * Required for interoperability with CryptoPro CSP 3.x 
- */
-#define SSL_OP_CRYPTOPRO_TLSEXT_BUG			0x80000000L
-
-/* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success
- * when just a single record has been written): */
-#define SSL_MODE_ENABLE_PARTIAL_WRITE       0x00000001L
-/* Make it possible to retry SSL_write() with changed buffer location
- * (buffer contents must stay the same!); this is not the default to avoid
- * the misconception that non-blocking SSL_write() behaves like
- * non-blocking write(): */
-#define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER 0x00000002L
-/* Never bother the application with retries if the transport
- * is blocking: */
-#define SSL_MODE_AUTO_RETRY 0x00000004L
-/* Don't attempt to automatically build certificate chain */
-#define SSL_MODE_NO_AUTO_CHAIN 0x00000008L
-/* Save RAM by releasing read and write buffers when they're empty. (SSL3 and
- * TLS only.)  "Released" buffers are put onto a free-list in the context
- * or just freed (depending on the context's setting for freelist_max_len). */
-#define SSL_MODE_RELEASE_BUFFERS 0x00000010L
-
-/* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value,
- * they cannot be used to clear bits. */
-
-#define SSL_CTX_set_options(ctx,op) \
-	SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL)
-#define SSL_CTX_clear_options(ctx,op) \
-	SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_OPTIONS,(op),NULL)
-#define SSL_CTX_get_options(ctx) \
-	SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,0,NULL)
-#define SSL_set_options(ssl,op) \
-	SSL_ctrl((ssl),SSL_CTRL_OPTIONS,(op),NULL)
-#define SSL_clear_options(ssl,op) \
-	SSL_ctrl((ssl),SSL_CTRL_CLEAR_OPTIONS,(op),NULL)
-#define SSL_get_options(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_OPTIONS,0,NULL)
-
-#define SSL_CTX_set_mode(ctx,op) \
-	SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL)
-#define SSL_CTX_clear_mode(ctx,op) \
-	SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_MODE,(op),NULL)
-#define SSL_CTX_get_mode(ctx) \
-	SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,0,NULL)
-#define SSL_clear_mode(ssl,op) \
-	SSL_ctrl((ssl),SSL_CTRL_CLEAR_MODE,(op),NULL)
-#define SSL_set_mode(ssl,op) \
-	SSL_ctrl((ssl),SSL_CTRL_MODE,(op),NULL)
-#define SSL_get_mode(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_MODE,0,NULL)
-#define SSL_set_mtu(ssl, mtu) \
-        SSL_ctrl((ssl),SSL_CTRL_SET_MTU,(mtu),NULL)
-
-#define SSL_get_secure_renegotiation_support(ssl) \
-	SSL_ctrl((ssl), SSL_CTRL_GET_RI_SUPPORT, 0, NULL)
-
-void SSL_CTX_set_msg_callback(SSL_CTX *ctx, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg));
-void SSL_set_msg_callback(SSL *ssl, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg));
-#define SSL_CTX_set_msg_callback_arg(ctx, arg) SSL_CTX_ctrl((ctx), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
-#define SSL_set_msg_callback_arg(ssl, arg) SSL_ctrl((ssl), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
-
-
-
-#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32)
-#define SSL_MAX_CERT_LIST_DEFAULT 1024*30 /* 30k max cert list :-) */
-#else
-#define SSL_MAX_CERT_LIST_DEFAULT 1024*100 /* 100k max cert list :-) */
-#endif
-
-#define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT	(1024*20)
-
-/* This callback type is used inside SSL_CTX, SSL, and in the functions that set
- * them. It is used to override the generation of SSL/TLS session IDs in a
- * server. Return value should be zero on an error, non-zero to proceed. Also,
- * callbacks should themselves check if the id they generate is unique otherwise
- * the SSL handshake will fail with an error - callbacks can do this using the
- * 'ssl' value they're passed by;
- *      SSL_has_matching_session_id(ssl, id, *id_len)
- * The length value passed in is set at the maximum size the session ID can be.
- * In SSLv2 this is 16 bytes, whereas SSLv3/TLSv1 it is 32 bytes. The callback
- * can alter this length to be less if desired, but under SSLv2 session IDs are
- * supposed to be fixed at 16 bytes so the id will be padded after the callback
- * returns in this case. It is also an error for the callback to set the size to
- * zero. */
-typedef int (*GEN_SESSION_CB)(const SSL *ssl, unsigned char *id,
-				unsigned int *id_len);
-
-typedef struct ssl_comp_st
-	{
-	int id;
-	const char *name;
-#ifndef OPENSSL_NO_COMP
-	COMP_METHOD *method;
-#else
-	char *method;
-#endif
-	} SSL_COMP;
-
-DECLARE_STACK_OF(SSL_COMP)
-DECLARE_LHASH_OF(SSL_SESSION);
-
-struct ssl_ctx_st
-	{
-	const SSL_METHOD *method;
-
-	STACK_OF(SSL_CIPHER) *cipher_list;
-	/* same as above but sorted for lookup */
-	STACK_OF(SSL_CIPHER) *cipher_list_by_id;
-
-	struct x509_store_st /* X509_STORE */ *cert_store;
-	LHASH_OF(SSL_SESSION) *sessions;
-	/* Most session-ids that will be cached, default is
-	 * SSL_SESSION_CACHE_MAX_SIZE_DEFAULT. 0 is unlimited. */
-	unsigned long session_cache_size;
-	struct ssl_session_st *session_cache_head;
-	struct ssl_session_st *session_cache_tail;
-
-	/* This can have one of 2 values, ored together,
-	 * SSL_SESS_CACHE_CLIENT,
-	 * SSL_SESS_CACHE_SERVER,
-	 * Default is SSL_SESSION_CACHE_SERVER, which means only
-	 * SSL_accept which cache SSL_SESSIONS. */
-	int session_cache_mode;
-
-	/* If timeout is not 0, it is the default timeout value set
-	 * when SSL_new() is called.  This has been put in to make
-	 * life easier to set things up */
-	long session_timeout;
-
-	/* If this callback is not null, it will be called each
-	 * time a session id is added to the cache.  If this function
-	 * returns 1, it means that the callback will do a
-	 * SSL_SESSION_free() when it has finished using it.  Otherwise,
-	 * on 0, it means the callback has finished with it.
-	 * If remove_session_cb is not null, it will be called when
-	 * a session-id is removed from the cache.  After the call,
-	 * OpenSSL will SSL_SESSION_free() it. */
-	int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess);
-	void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess);
-	SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl,
-		unsigned char *data,int len,int *copy);
-
-	struct
-		{
-		int sess_connect;	/* SSL new conn - started */
-		int sess_connect_renegotiate;/* SSL reneg - requested */
-		int sess_connect_good;	/* SSL new conne/reneg - finished */
-		int sess_accept;	/* SSL new accept - started */
-		int sess_accept_renegotiate;/* SSL reneg - requested */
-		int sess_accept_good;	/* SSL accept/reneg - finished */
-		int sess_miss;		/* session lookup misses  */
-		int sess_timeout;	/* reuse attempt on timeouted session */
-		int sess_cache_full;	/* session removed due to full cache */
-		int sess_hit;		/* session reuse actually done */
-		int sess_cb_hit;	/* session-id that was not
-					 * in the cache was
-					 * passed back via the callback.  This
-					 * indicates that the application is
-					 * supplying session-id's from other
-					 * processes - spooky :-) */
-		} stats;
-
-	int references;
-
-	/* if defined, these override the X509_verify_cert() calls */
-	int (*app_verify_callback)(X509_STORE_CTX *, void *);
-	void *app_verify_arg;
-	/* before OpenSSL 0.9.7, 'app_verify_arg' was ignored
-	 * ('app_verify_callback' was called with just one argument) */
-
-	/* Default password callback. */
-	pem_password_cb *default_passwd_callback;
-
-	/* Default password callback user data. */
-	void *default_passwd_callback_userdata;
-
-	/* get client cert callback */
-	int (*client_cert_cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey);
-
-    /* cookie generate callback */
-    int (*app_gen_cookie_cb)(SSL *ssl, unsigned char *cookie, 
-        unsigned int *cookie_len);
-
-    /* verify cookie callback */
-    int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, 
-        unsigned int cookie_len);
-
-	CRYPTO_EX_DATA ex_data;
-
-	const EVP_MD *rsa_md5;/* For SSLv2 - name is 'ssl2-md5' */
-	const EVP_MD *md5;	/* For SSLv3/TLSv1 'ssl3-md5' */
-	const EVP_MD *sha1;   /* For SSLv3/TLSv1 'ssl3->sha1' */
-
-	STACK_OF(X509) *extra_certs;
-	STACK_OF(SSL_COMP) *comp_methods; /* stack of SSL_COMP, SSLv3/TLSv1 */
-
-
-	/* Default values used when no per-SSL value is defined follow */
-
-	void (*info_callback)(const SSL *ssl,int type,int val); /* used if SSL's info_callback is NULL */
-
-	/* what we put in client cert requests */
-	STACK_OF(X509_NAME) *client_CA;
-
-
-	/* Default values to use in SSL structures follow (these are copied by SSL_new) */
-
-	unsigned long options;
-	unsigned long mode;
-	long max_cert_list;
-
-	struct cert_st /* CERT */ *cert;
-	int read_ahead;
-
-	/* callback that allows applications to peek at protocol messages */
-	void (*msg_callback)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
-	void *msg_callback_arg;
-
-	int verify_mode;
-	unsigned int sid_ctx_length;
-	unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-	int (*default_verify_callback)(int ok,X509_STORE_CTX *ctx); /* called 'verify_callback' in the SSL */
-
-	/* Default generate session ID callback. */
-	GEN_SESSION_CB generate_session_id;
-
-	X509_VERIFY_PARAM *param;
-
-#if 0
-	int purpose;		/* Purpose setting */
-	int trust;		/* Trust setting */
-#endif
-
-	int quiet_shutdown;
-
-	/* Maximum amount of data to send in one fragment.
-	 * actual record size can be more than this due to
-	 * padding and MAC overheads.
-	 */
-	unsigned int max_send_fragment;
-
-#ifndef OPENSSL_ENGINE
-	/* Engine to pass requests for client certs to
-	 */
-	ENGINE *client_cert_engine;
-#endif
-
-#ifndef OPENSSL_NO_TLSEXT
-	/* TLS extensions servername callback */
-	int (*tlsext_servername_callback)(SSL*, int *, void *);
-	void *tlsext_servername_arg;
-	/* RFC 4507 session ticket keys */
-	unsigned char tlsext_tick_key_name[16];
-	unsigned char tlsext_tick_hmac_key[16];
-	unsigned char tlsext_tick_aes_key[16];
-	/* Callback to support customisation of ticket key setting */
-	int (*tlsext_ticket_key_cb)(SSL *ssl,
-					unsigned char *name, unsigned char *iv,
-					EVP_CIPHER_CTX *ectx,
- 					HMAC_CTX *hctx, int enc);
-
-	/* certificate status request info */
-	/* Callback for status request */
-	int (*tlsext_status_cb)(SSL *ssl, void *arg);
-	void *tlsext_status_arg;
-
-	/* draft-rescorla-tls-opaque-prf-input-00.txt information */
-	int (*tlsext_opaque_prf_input_callback)(SSL *, void *peerinput, size_t len, void *arg);
-	void *tlsext_opaque_prf_input_callback_arg;
-#endif
-
-#ifndef OPENSSL_NO_PSK
-	char *psk_identity_hint;
-	unsigned int (*psk_client_callback)(SSL *ssl, const char *hint, char *identity,
-		unsigned int max_identity_len, unsigned char *psk,
-		unsigned int max_psk_len);
-	unsigned int (*psk_server_callback)(SSL *ssl, const char *identity,
-		unsigned char *psk, unsigned int max_psk_len);
-#endif
-
-#ifndef OPENSSL_NO_BUF_FREELISTS
-#define SSL_MAX_BUF_FREELIST_LEN_DEFAULT 32
-	unsigned int freelist_max_len;
-	struct ssl3_buf_freelist_st *wbuf_freelist;
-	struct ssl3_buf_freelist_st *rbuf_freelist;
-#endif
-	};
-
-#define SSL_SESS_CACHE_OFF			0x0000
-#define SSL_SESS_CACHE_CLIENT			0x0001
-#define SSL_SESS_CACHE_SERVER			0x0002
-#define SSL_SESS_CACHE_BOTH	(SSL_SESS_CACHE_CLIENT|SSL_SESS_CACHE_SERVER)
-#define SSL_SESS_CACHE_NO_AUTO_CLEAR		0x0080
-/* enough comments already ... see SSL_CTX_set_session_cache_mode(3) */
-#define SSL_SESS_CACHE_NO_INTERNAL_LOOKUP	0x0100
-#define SSL_SESS_CACHE_NO_INTERNAL_STORE	0x0200
-#define SSL_SESS_CACHE_NO_INTERNAL \
-	(SSL_SESS_CACHE_NO_INTERNAL_LOOKUP|SSL_SESS_CACHE_NO_INTERNAL_STORE)
-
-LHASH_OF(SSL_SESSION) *SSL_CTX_sessions(SSL_CTX *ctx);
-#define SSL_CTX_sess_number(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_NUMBER,0,NULL)
-#define SSL_CTX_sess_connect(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT,0,NULL)
-#define SSL_CTX_sess_connect_good(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT_GOOD,0,NULL)
-#define SSL_CTX_sess_connect_renegotiate(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT_RENEGOTIATE,0,NULL)
-#define SSL_CTX_sess_accept(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT,0,NULL)
-#define SSL_CTX_sess_accept_renegotiate(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT_RENEGOTIATE,0,NULL)
-#define SSL_CTX_sess_accept_good(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT_GOOD,0,NULL)
-#define SSL_CTX_sess_hits(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_HIT,0,NULL)
-#define SSL_CTX_sess_cb_hits(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CB_HIT,0,NULL)
-#define SSL_CTX_sess_misses(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_MISSES,0,NULL)
-#define SSL_CTX_sess_timeouts(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_TIMEOUTS,0,NULL)
-#define SSL_CTX_sess_cache_full(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CACHE_FULL,0,NULL)
-
-void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx, int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess));
-int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(struct ssl_st *ssl, SSL_SESSION *sess);
-void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx, void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess));
-void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(struct ssl_ctx_st *ctx, SSL_SESSION *sess);
-void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx, SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, unsigned char *data,int len,int *copy));
-SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st *ssl, unsigned char *Data, int len, int *copy);
-void SSL_CTX_set_info_callback(SSL_CTX *ctx, void (*cb)(const SSL *ssl,int type,int val));
-void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl,int type,int val);
-void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx, int (*client_cert_cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey));
-int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL *ssl, X509 **x509, EVP_PKEY **pkey);
-#ifndef OPENSSL_NO_ENGINE
-int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e);
-#endif
-void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx, int (*app_gen_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len));
-void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int cookie_len));
-
-#ifndef OPENSSL_NO_PSK
-/* the maximum length of the buffer given to callbacks containing the
- * resulting identity/psk */
-#define PSK_MAX_IDENTITY_LEN 128
-#define PSK_MAX_PSK_LEN 256
-void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx, 
-	unsigned int (*psk_client_callback)(SSL *ssl, const char *hint, 
-		char *identity, unsigned int max_identity_len, unsigned char *psk,
-		unsigned int max_psk_len));
-void SSL_set_psk_client_callback(SSL *ssl, 
-	unsigned int (*psk_client_callback)(SSL *ssl, const char *hint, 
-		char *identity, unsigned int max_identity_len, unsigned char *psk,
-		unsigned int max_psk_len));
-void SSL_CTX_set_psk_server_callback(SSL_CTX *ctx, 
-	unsigned int (*psk_server_callback)(SSL *ssl, const char *identity,
-		unsigned char *psk, unsigned int max_psk_len));
-void SSL_set_psk_server_callback(SSL *ssl,
-	unsigned int (*psk_server_callback)(SSL *ssl, const char *identity,
-		unsigned char *psk, unsigned int max_psk_len));
-int SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *identity_hint);
-int SSL_use_psk_identity_hint(SSL *s, const char *identity_hint);
-const char *SSL_get_psk_identity_hint(const SSL *s);
-const char *SSL_get_psk_identity(const SSL *s);
-#endif
-
-#define SSL_NOTHING	1
-#define SSL_WRITING	2
-#define SSL_READING	3
-#define SSL_X509_LOOKUP	4
-
-/* These will only be used when doing non-blocking IO */
-#define SSL_want_nothing(s)	(SSL_want(s) == SSL_NOTHING)
-#define SSL_want_read(s)	(SSL_want(s) == SSL_READING)
-#define SSL_want_write(s)	(SSL_want(s) == SSL_WRITING)
-#define SSL_want_x509_lookup(s)	(SSL_want(s) == SSL_X509_LOOKUP)
-
-#define SSL_MAC_FLAG_READ_MAC_STREAM 1
-#define SSL_MAC_FLAG_WRITE_MAC_STREAM 2
-
-struct ssl_st
-	{
-	/* protocol version
-	 * (one of SSL2_VERSION, SSL3_VERSION, TLS1_VERSION, DTLS1_VERSION)
-	 */
-	int version;
-	int type; /* SSL_ST_CONNECT or SSL_ST_ACCEPT */
-
-	const SSL_METHOD *method; /* SSLv3 */
-
-	/* There are 2 BIO's even though they are normally both the
-	 * same.  This is so data can be read and written to different
-	 * handlers */
-
-#ifndef OPENSSL_NO_BIO
-	BIO *rbio; /* used by SSL_read */
-	BIO *wbio; /* used by SSL_write */
-	BIO *bbio; /* used during session-id reuse to concatenate
-		    * messages */
-#else
-	char *rbio; /* used by SSL_read */
-	char *wbio; /* used by SSL_write */
-	char *bbio;
-#endif
-	/* This holds a variable that indicates what we were doing
-	 * when a 0 or -1 is returned.  This is needed for
-	 * non-blocking IO so we know what request needs re-doing when
-	 * in SSL_accept or SSL_connect */
-	int rwstate;
-
-	/* true when we are actually in SSL_accept() or SSL_connect() */
-	int in_handshake;
-	int (*handshake_func)(SSL *);
-
-	/* Imagine that here's a boolean member "init" that is
-	 * switched as soon as SSL_set_{accept/connect}_state
-	 * is called for the first time, so that "state" and
-	 * "handshake_func" are properly initialized.  But as
-	 * handshake_func is == 0 until then, we use this
-	 * test instead of an "init" member.
-	 */
-
-	int server;	/* are we the server side? - mostly used by SSL_clear*/
-
-	int new_session;/* 1 if we are to use a new session.
-	                 * 2 if we are a server and are inside a handshake
-	                 *   (i.e. not just sending a HelloRequest)
-	                 * NB: For servers, the 'new' session may actually be a previously
-	                 * cached session or even the previous session unless
-	                 * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set */
-	int quiet_shutdown;/* don't send shutdown packets */
-	int shutdown;	/* we have shut things down, 0x01 sent, 0x02
-			 * for received */
-	int state;	/* where we are */
-	int rstate;	/* where we are when reading */
-
-	BUF_MEM *init_buf;	/* buffer used during init */
-	void *init_msg;   	/* pointer to handshake message body, set by ssl3_get_message() */
-	int init_num;		/* amount read/written */
-	int init_off;		/* amount read/written */
-
-	/* used internally to point at a raw packet */
-	unsigned char *packet;
-	unsigned int packet_length;
-
-	struct ssl2_state_st *s2; /* SSLv2 variables */
-	struct ssl3_state_st *s3; /* SSLv3 variables */
-	struct dtls1_state_st *d1; /* DTLSv1 variables */
-
-	int read_ahead;		/* Read as many input bytes as possible
-	               	 	 * (for non-blocking reads) */
-
-	/* callback that allows applications to peek at protocol messages */
-	void (*msg_callback)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
-	void *msg_callback_arg;
-
-	int hit;		/* reusing a previous session */
-
-	X509_VERIFY_PARAM *param;
-
-#if 0
-	int purpose;		/* Purpose setting */
-	int trust;		/* Trust setting */
-#endif
-
-	/* crypto */
-	STACK_OF(SSL_CIPHER) *cipher_list;
-	STACK_OF(SSL_CIPHER) *cipher_list_by_id;
-
-	/* These are the ones being used, the ones in SSL_SESSION are
-	 * the ones to be 'copied' into these ones */
-	int mac_flags; 
-	EVP_CIPHER_CTX *enc_read_ctx;		/* cryptographic state */
-	EVP_MD_CTX *read_hash;		/* used for mac generation */
-#ifndef OPENSSL_NO_COMP
-	COMP_CTX *expand;			/* uncompress */
-#else
-	char *expand;
-#endif
-
-	EVP_CIPHER_CTX *enc_write_ctx;		/* cryptographic state */
-	EVP_MD_CTX *write_hash;		/* used for mac generation */
-#ifndef OPENSSL_NO_COMP
-	COMP_CTX *compress;			/* compression */
-#else
-	char *compress;	
-#endif
-
-	/* session info */
-
-	/* client cert? */
-	/* This is used to hold the server certificate used */
-	struct cert_st /* CERT */ *cert;
-
-	/* the session_id_context is used to ensure sessions are only reused
-	 * in the appropriate context */
-	unsigned int sid_ctx_length;
-	unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-
-	/* This can also be in the session once a session is established */
-	SSL_SESSION *session;
-
-	/* Default generate session ID callback. */
-	GEN_SESSION_CB generate_session_id;
-
-	/* Used in SSL2 and SSL3 */
-	int verify_mode;	/* 0 don't care about verify failure.
-				 * 1 fail if verify fails */
-	int (*verify_callback)(int ok,X509_STORE_CTX *ctx); /* fail if callback returns 0 */
-
-	void (*info_callback)(const SSL *ssl,int type,int val); /* optional informational callback */
-
-	int error;		/* error bytes to be written */
-	int error_code;		/* actual code */
-
-#ifndef OPENSSL_NO_KRB5
-	KSSL_CTX *kssl_ctx;     /* Kerberos 5 context */
-#endif	/* OPENSSL_NO_KRB5 */
-
-#ifndef OPENSSL_NO_PSK
-	unsigned int (*psk_client_callback)(SSL *ssl, const char *hint, char *identity,
-		unsigned int max_identity_len, unsigned char *psk,
-		unsigned int max_psk_len);
-	unsigned int (*psk_server_callback)(SSL *ssl, const char *identity,
-		unsigned char *psk, unsigned int max_psk_len);
-#endif
-
-	SSL_CTX *ctx;
-	/* set this flag to 1 and a sleep(1) is put into all SSL_read()
-	 * and SSL_write() calls, good for nbio debuging :-) */
-	int debug;	
-
-	/* extra application data */
-	long verify_result;
-	CRYPTO_EX_DATA ex_data;
-
-	/* for server side, keep the list of CA_dn we can use */
-	STACK_OF(X509_NAME) *client_CA;
-
-	int references;
-	unsigned long options; /* protocol behaviour */
-	unsigned long mode; /* API behaviour */
-	long max_cert_list;
-	int first_packet;
-	int client_version;	/* what was passed, used for
-				 * SSLv3/TLS rollback check */
-	unsigned int max_send_fragment;
-#ifndef OPENSSL_NO_TLSEXT
-	/* TLS extension debug callback */
-	void (*tlsext_debug_cb)(SSL *s, int client_server, int type,
-					unsigned char *data, int len,
-					void *arg);
-	void *tlsext_debug_arg;
-	char *tlsext_hostname;
-	int servername_done;   /* no further mod of servername 
-	                          0 : call the servername extension callback.
-	                          1 : prepare 2, allow last ack just after in server callback.
-	                          2 : don't call servername callback, no ack in server hello
-	                       */
-	/* certificate status request info */
-	/* Status type or -1 if no status type */
-	int tlsext_status_type;
-	/* Expect OCSP CertificateStatus message */
-	int tlsext_status_expected;
-	/* OCSP status request only */
-	STACK_OF(OCSP_RESPID) *tlsext_ocsp_ids;
-	X509_EXTENSIONS *tlsext_ocsp_exts;
-	/* OCSP response received or to be sent */
-	unsigned char *tlsext_ocsp_resp;
-	int tlsext_ocsp_resplen;
-
-	/* RFC4507 session ticket expected to be received or sent */
-	int tlsext_ticket_expected;
-#ifndef OPENSSL_NO_EC
-	size_t tlsext_ecpointformatlist_length;
-	unsigned char *tlsext_ecpointformatlist; /* our list */
-	size_t tlsext_ellipticcurvelist_length;
-	unsigned char *tlsext_ellipticcurvelist; /* our list */
-#endif /* OPENSSL_NO_EC */
-
-	/* draft-rescorla-tls-opaque-prf-input-00.txt information to be used for handshakes */
-	void *tlsext_opaque_prf_input;
-	size_t tlsext_opaque_prf_input_len;
-
-	/* TLS Session Ticket extension override */
-	TLS_SESSION_TICKET_EXT *tlsext_session_ticket;
-
-	/* TLS Session Ticket extension callback */
-	tls_session_ticket_ext_cb_fn tls_session_ticket_ext_cb;
-	void *tls_session_ticket_ext_cb_arg;
-
-	/* TLS pre-shared secret session resumption */
-	tls_session_secret_cb_fn tls_session_secret_cb;
-	void *tls_session_secret_cb_arg;
-
-	SSL_CTX * initial_ctx; /* initial ctx, used to store sessions */
-#define session_ctx initial_ctx
-#else
-#define session_ctx ctx
-#endif /* OPENSSL_NO_TLSEXT */
-	};
-
-#ifdef __cplusplus
-}
-#endif
-
-#include <openssl/ssl2.h>
-#include <openssl/ssl3.h>
-#include <openssl/tls1.h> /* This is mostly sslv3 with a few tweaks */
-#include <openssl/dtls1.h> /* Datagram TLS */
-#include <openssl/ssl23.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* compatibility */
-#define SSL_set_app_data(s,arg)		(SSL_set_ex_data(s,0,(char *)arg))
-#define SSL_get_app_data(s)		(SSL_get_ex_data(s,0))
-#define SSL_SESSION_set_app_data(s,a)	(SSL_SESSION_set_ex_data(s,0,(char *)a))
-#define SSL_SESSION_get_app_data(s)	(SSL_SESSION_get_ex_data(s,0))
-#define SSL_CTX_get_app_data(ctx)	(SSL_CTX_get_ex_data(ctx,0))
-#define SSL_CTX_set_app_data(ctx,arg)	(SSL_CTX_set_ex_data(ctx,0,(char *)arg))
-
-/* The following are the possible values for ssl->state are are
- * used to indicate where we are up to in the SSL connection establishment.
- * The macros that follow are about the only things you should need to use
- * and even then, only when using non-blocking IO.
- * It can also be useful to work out where you were when the connection
- * failed */
-
-#define SSL_ST_CONNECT			0x1000
-#define SSL_ST_ACCEPT			0x2000
-#define SSL_ST_MASK			0x0FFF
-#define SSL_ST_INIT			(SSL_ST_CONNECT|SSL_ST_ACCEPT)
-#define SSL_ST_BEFORE			0x4000
-#define SSL_ST_OK			0x03
-#define SSL_ST_RENEGOTIATE		(0x04|SSL_ST_INIT)
-
-#define SSL_CB_LOOP			0x01
-#define SSL_CB_EXIT			0x02
-#define SSL_CB_READ			0x04
-#define SSL_CB_WRITE			0x08
-#define SSL_CB_ALERT			0x4000 /* used in callback */
-#define SSL_CB_READ_ALERT		(SSL_CB_ALERT|SSL_CB_READ)
-#define SSL_CB_WRITE_ALERT		(SSL_CB_ALERT|SSL_CB_WRITE)
-#define SSL_CB_ACCEPT_LOOP		(SSL_ST_ACCEPT|SSL_CB_LOOP)
-#define SSL_CB_ACCEPT_EXIT		(SSL_ST_ACCEPT|SSL_CB_EXIT)
-#define SSL_CB_CONNECT_LOOP		(SSL_ST_CONNECT|SSL_CB_LOOP)
-#define SSL_CB_CONNECT_EXIT		(SSL_ST_CONNECT|SSL_CB_EXIT)
-#define SSL_CB_HANDSHAKE_START		0x10
-#define SSL_CB_HANDSHAKE_DONE		0x20
-
-/* Is the SSL_connection established? */
-#define SSL_get_state(a)		SSL_state(a)
-#define SSL_is_init_finished(a)		(SSL_state(a) == SSL_ST_OK)
-#define SSL_in_init(a)			(SSL_state(a)&SSL_ST_INIT)
-#define SSL_in_before(a)		(SSL_state(a)&SSL_ST_BEFORE)
-#define SSL_in_connect_init(a)		(SSL_state(a)&SSL_ST_CONNECT)
-#define SSL_in_accept_init(a)		(SSL_state(a)&SSL_ST_ACCEPT)
-
-/* The following 2 states are kept in ssl->rstate when reads fail,
- * you should not need these */
-#define SSL_ST_READ_HEADER			0xF0
-#define SSL_ST_READ_BODY			0xF1
-#define SSL_ST_READ_DONE			0xF2
-
-/* Obtain latest Finished message
- *   -- that we sent (SSL_get_finished)
- *   -- that we expected from peer (SSL_get_peer_finished).
- * Returns length (0 == no Finished so far), copies up to 'count' bytes. */
-size_t SSL_get_finished(const SSL *s, void *buf, size_t count);
-size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
-
-/* use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 2 options
- * are 'ored' with SSL_VERIFY_PEER if they are desired */
-#define SSL_VERIFY_NONE			0x00
-#define SSL_VERIFY_PEER			0x01
-#define SSL_VERIFY_FAIL_IF_NO_PEER_CERT	0x02
-#define SSL_VERIFY_CLIENT_ONCE		0x04
-
-#define OpenSSL_add_ssl_algorithms()	SSL_library_init()
-#define SSLeay_add_ssl_algorithms()	SSL_library_init()
-
-/* this is for backward compatibility */
-#if 0 /* NEW_SSLEAY */
-#define SSL_CTX_set_default_verify(a,b,c) SSL_CTX_set_verify(a,b,c)
-#define SSL_set_pref_cipher(c,n)	SSL_set_cipher_list(c,n)
-#define SSL_add_session(a,b)            SSL_CTX_add_session((a),(b))
-#define SSL_remove_session(a,b)		SSL_CTX_remove_session((a),(b))
-#define SSL_flush_sessions(a,b)		SSL_CTX_flush_sessions((a),(b))
-#endif
-/* More backward compatibility */
-#define SSL_get_cipher(s) \
-		SSL_CIPHER_get_name(SSL_get_current_cipher(s))
-#define SSL_get_cipher_bits(s,np) \
-		SSL_CIPHER_get_bits(SSL_get_current_cipher(s),np)
-#define SSL_get_cipher_version(s) \
-		SSL_CIPHER_get_version(SSL_get_current_cipher(s))
-#define SSL_get_cipher_name(s) \
-		SSL_CIPHER_get_name(SSL_get_current_cipher(s))
-#define SSL_get_time(a)		SSL_SESSION_get_time(a)
-#define SSL_set_time(a,b)	SSL_SESSION_set_time((a),(b))
-#define SSL_get_timeout(a)	SSL_SESSION_get_timeout(a)
-#define SSL_set_timeout(a,b)	SSL_SESSION_set_timeout((a),(b))
-
-#define d2i_SSL_SESSION_bio(bp,s_id) ASN1_d2i_bio_of(SSL_SESSION,SSL_SESSION_new,d2i_SSL_SESSION,bp,s_id)
-#define i2d_SSL_SESSION_bio(bp,s_id) ASN1_i2d_bio_of(SSL_SESSION,i2d_SSL_SESSION,bp,s_id)
-
-DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
-
-#define SSL_AD_REASON_OFFSET		1000 /* offset to get SSL_R_... value from SSL_AD_... */
-
-/* These alert types are for SSLv3 and TLSv1 */
-#define SSL_AD_CLOSE_NOTIFY		SSL3_AD_CLOSE_NOTIFY
-#define SSL_AD_UNEXPECTED_MESSAGE	SSL3_AD_UNEXPECTED_MESSAGE /* fatal */
-#define SSL_AD_BAD_RECORD_MAC		SSL3_AD_BAD_RECORD_MAC     /* fatal */
-#define SSL_AD_DECRYPTION_FAILED	TLS1_AD_DECRYPTION_FAILED
-#define SSL_AD_RECORD_OVERFLOW		TLS1_AD_RECORD_OVERFLOW
-#define SSL_AD_DECOMPRESSION_FAILURE	SSL3_AD_DECOMPRESSION_FAILURE/* fatal */
-#define SSL_AD_HANDSHAKE_FAILURE	SSL3_AD_HANDSHAKE_FAILURE/* fatal */
-#define SSL_AD_NO_CERTIFICATE		SSL3_AD_NO_CERTIFICATE /* Not for TLS */
-#define SSL_AD_BAD_CERTIFICATE		SSL3_AD_BAD_CERTIFICATE
-#define SSL_AD_UNSUPPORTED_CERTIFICATE	SSL3_AD_UNSUPPORTED_CERTIFICATE
-#define SSL_AD_CERTIFICATE_REVOKED	SSL3_AD_CERTIFICATE_REVOKED
-#define SSL_AD_CERTIFICATE_EXPIRED	SSL3_AD_CERTIFICATE_EXPIRED
-#define SSL_AD_CERTIFICATE_UNKNOWN	SSL3_AD_CERTIFICATE_UNKNOWN
-#define SSL_AD_ILLEGAL_PARAMETER	SSL3_AD_ILLEGAL_PARAMETER   /* fatal */
-#define SSL_AD_UNKNOWN_CA		TLS1_AD_UNKNOWN_CA	/* fatal */
-#define SSL_AD_ACCESS_DENIED		TLS1_AD_ACCESS_DENIED	/* fatal */
-#define SSL_AD_DECODE_ERROR		TLS1_AD_DECODE_ERROR	/* fatal */
-#define SSL_AD_DECRYPT_ERROR		TLS1_AD_DECRYPT_ERROR
-#define SSL_AD_EXPORT_RESTRICTION	TLS1_AD_EXPORT_RESTRICTION/* fatal */
-#define SSL_AD_PROTOCOL_VERSION		TLS1_AD_PROTOCOL_VERSION /* fatal */
-#define SSL_AD_INSUFFICIENT_SECURITY	TLS1_AD_INSUFFICIENT_SECURITY/* fatal */
-#define SSL_AD_INTERNAL_ERROR		TLS1_AD_INTERNAL_ERROR	/* fatal */
-#define SSL_AD_USER_CANCELLED		TLS1_AD_USER_CANCELLED
-#define SSL_AD_NO_RENEGOTIATION		TLS1_AD_NO_RENEGOTIATION
-#define SSL_AD_UNSUPPORTED_EXTENSION	TLS1_AD_UNSUPPORTED_EXTENSION
-#define SSL_AD_CERTIFICATE_UNOBTAINABLE TLS1_AD_CERTIFICATE_UNOBTAINABLE
-#define SSL_AD_UNRECOGNIZED_NAME	TLS1_AD_UNRECOGNIZED_NAME
-#define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE
-#define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE
-#define SSL_AD_UNKNOWN_PSK_IDENTITY     TLS1_AD_UNKNOWN_PSK_IDENTITY /* fatal */
-
-#define SSL_ERROR_NONE			0
-#define SSL_ERROR_SSL			1
-#define SSL_ERROR_WANT_READ		2
-#define SSL_ERROR_WANT_WRITE		3
-#define SSL_ERROR_WANT_X509_LOOKUP	4
-#define SSL_ERROR_SYSCALL		5 /* look at error stack/return value/errno */
-#define SSL_ERROR_ZERO_RETURN		6
-#define SSL_ERROR_WANT_CONNECT		7
-#define SSL_ERROR_WANT_ACCEPT		8
-
-#define SSL_CTRL_NEED_TMP_RSA			1
-#define SSL_CTRL_SET_TMP_RSA			2
-#define SSL_CTRL_SET_TMP_DH			3
-#define SSL_CTRL_SET_TMP_ECDH			4
-#define SSL_CTRL_SET_TMP_RSA_CB			5
-#define SSL_CTRL_SET_TMP_DH_CB			6
-#define SSL_CTRL_SET_TMP_ECDH_CB		7
-
-#define SSL_CTRL_GET_SESSION_REUSED		8
-#define SSL_CTRL_GET_CLIENT_CERT_REQUEST	9
-#define SSL_CTRL_GET_NUM_RENEGOTIATIONS		10
-#define SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS	11
-#define SSL_CTRL_GET_TOTAL_RENEGOTIATIONS	12
-#define SSL_CTRL_GET_FLAGS			13
-#define SSL_CTRL_EXTRA_CHAIN_CERT		14
-
-#define SSL_CTRL_SET_MSG_CALLBACK               15
-#define SSL_CTRL_SET_MSG_CALLBACK_ARG           16
-
-/* only applies to datagram connections */
-#define SSL_CTRL_SET_MTU                17
-/* Stats */
-#define SSL_CTRL_SESS_NUMBER			20
-#define SSL_CTRL_SESS_CONNECT			21
-#define SSL_CTRL_SESS_CONNECT_GOOD		22
-#define SSL_CTRL_SESS_CONNECT_RENEGOTIATE	23
-#define SSL_CTRL_SESS_ACCEPT			24
-#define SSL_CTRL_SESS_ACCEPT_GOOD		25
-#define SSL_CTRL_SESS_ACCEPT_RENEGOTIATE	26
-#define SSL_CTRL_SESS_HIT			27
-#define SSL_CTRL_SESS_CB_HIT			28
-#define SSL_CTRL_SESS_MISSES			29
-#define SSL_CTRL_SESS_TIMEOUTS			30
-#define SSL_CTRL_SESS_CACHE_FULL		31
-#define SSL_CTRL_OPTIONS			32
-#define SSL_CTRL_MODE				33
-
-#define SSL_CTRL_GET_READ_AHEAD			40
-#define SSL_CTRL_SET_READ_AHEAD			41
-#define SSL_CTRL_SET_SESS_CACHE_SIZE		42
-#define SSL_CTRL_GET_SESS_CACHE_SIZE		43
-#define SSL_CTRL_SET_SESS_CACHE_MODE		44
-#define SSL_CTRL_GET_SESS_CACHE_MODE		45
-
-#define SSL_CTRL_GET_MAX_CERT_LIST		50
-#define SSL_CTRL_SET_MAX_CERT_LIST		51
-
-#define SSL_CTRL_SET_MAX_SEND_FRAGMENT		52
-
-/* see tls1.h for macros based on these */
-#ifndef OPENSSL_NO_TLSEXT
-#define SSL_CTRL_SET_TLSEXT_SERVERNAME_CB	53
-#define SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG	54
-#define SSL_CTRL_SET_TLSEXT_HOSTNAME		55
-#define SSL_CTRL_SET_TLSEXT_DEBUG_CB		56
-#define SSL_CTRL_SET_TLSEXT_DEBUG_ARG		57
-#define SSL_CTRL_GET_TLSEXT_TICKET_KEYS		58
-#define SSL_CTRL_SET_TLSEXT_TICKET_KEYS		59
-#define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT	60
-#define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB	61
-#define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG 62
-#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB	63
-#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG	64
-#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE	65
-#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS	66
-#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS	67
-#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS	68
-#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS	69
-#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP	70
-#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP	71
-
-#define SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB	72
-#endif
-
-#define DTLS_CTRL_GET_TIMEOUT		73
-#define DTLS_CTRL_HANDLE_TIMEOUT	74
-#define DTLS_CTRL_LISTEN			75
-
-#define SSL_CTRL_GET_RI_SUPPORT			76
-#define SSL_CTRL_CLEAR_OPTIONS			77
-#define SSL_CTRL_CLEAR_MODE			78
-
-#define DTLSv1_get_timeout(ssl, arg) \
-	SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg)
-#define DTLSv1_handle_timeout(ssl) \
-	SSL_ctrl(ssl,DTLS_CTRL_HANDLE_TIMEOUT,0, NULL)
-#define DTLSv1_listen(ssl, peer) \
-	SSL_ctrl(ssl,DTLS_CTRL_LISTEN,0, (void *)peer)
-
-#define SSL_session_reused(ssl) \
-	SSL_ctrl((ssl),SSL_CTRL_GET_SESSION_REUSED,0,NULL)
-#define SSL_num_renegotiations(ssl) \
-	SSL_ctrl((ssl),SSL_CTRL_GET_NUM_RENEGOTIATIONS,0,NULL)
-#define SSL_clear_num_renegotiations(ssl) \
-	SSL_ctrl((ssl),SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS,0,NULL)
-#define SSL_total_renegotiations(ssl) \
-	SSL_ctrl((ssl),SSL_CTRL_GET_TOTAL_RENEGOTIATIONS,0,NULL)
-
-#define SSL_CTX_need_tmp_RSA(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_NEED_TMP_RSA,0,NULL)
-#define SSL_CTX_set_tmp_rsa(ctx,rsa) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_RSA,0,(char *)rsa)
-#define SSL_CTX_set_tmp_dh(ctx,dh) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH,0,(char *)dh)
-#define SSL_CTX_set_tmp_ecdh(ctx,ecdh) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh)
-
-#define SSL_need_tmp_RSA(ssl) \
-	SSL_ctrl(ssl,SSL_CTRL_NEED_TMP_RSA,0,NULL)
-#define SSL_set_tmp_rsa(ssl,rsa) \
-	SSL_ctrl(ssl,SSL_CTRL_SET_TMP_RSA,0,(char *)rsa)
-#define SSL_set_tmp_dh(ssl,dh) \
-	SSL_ctrl(ssl,SSL_CTRL_SET_TMP_DH,0,(char *)dh)
-#define SSL_set_tmp_ecdh(ssl,ecdh) \
-	SSL_ctrl(ssl,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh)
-
-#define SSL_CTX_add_extra_chain_cert(ctx,x509) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
-
-#ifndef OPENSSL_NO_BIO
-BIO_METHOD *BIO_f_ssl(void);
-BIO *BIO_new_ssl(SSL_CTX *ctx,int client);
-BIO *BIO_new_ssl_connect(SSL_CTX *ctx);
-BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx);
-int BIO_ssl_copy_session_id(BIO *to,BIO *from);
-void BIO_ssl_shutdown(BIO *ssl_bio);
-
-#endif
-
-int	SSL_CTX_set_cipher_list(SSL_CTX *,const char *str);
-SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth);
-void	SSL_CTX_free(SSL_CTX *);
-long SSL_CTX_set_timeout(SSL_CTX *ctx,long t);
-long SSL_CTX_get_timeout(const SSL_CTX *ctx);
-X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *);
-void SSL_CTX_set_cert_store(SSL_CTX *,X509_STORE *);
-int SSL_want(const SSL *s);
-int	SSL_clear(SSL *s);
-
-void	SSL_CTX_flush_sessions(SSL_CTX *ctx,long tm);
-
-const SSL_CIPHER *SSL_get_current_cipher(const SSL *s);
-int	SSL_CIPHER_get_bits(const SSL_CIPHER *c,int *alg_bits);
-char *	SSL_CIPHER_get_version(const SSL_CIPHER *c);
-const char *	SSL_CIPHER_get_name(const SSL_CIPHER *c);
-
-int	SSL_get_fd(const SSL *s);
-int	SSL_get_rfd(const SSL *s);
-int	SSL_get_wfd(const SSL *s);
-const char  * SSL_get_cipher_list(const SSL *s,int n);
-char *	SSL_get_shared_ciphers(const SSL *s, char *buf, int len);
-int	SSL_get_read_ahead(const SSL * s);
-int	SSL_pending(const SSL *s);
-#ifndef OPENSSL_NO_SOCK
-int	SSL_set_fd(SSL *s, int fd);
-int	SSL_set_rfd(SSL *s, int fd);
-int	SSL_set_wfd(SSL *s, int fd);
-#endif
-#ifndef OPENSSL_NO_BIO
-void	SSL_set_bio(SSL *s, BIO *rbio,BIO *wbio);
-BIO *	SSL_get_rbio(const SSL *s);
-BIO *	SSL_get_wbio(const SSL *s);
-#endif
-int	SSL_set_cipher_list(SSL *s, const char *str);
-void	SSL_set_read_ahead(SSL *s, int yes);
-int	SSL_get_verify_mode(const SSL *s);
-int	SSL_get_verify_depth(const SSL *s);
-int	(*SSL_get_verify_callback(const SSL *s))(int,X509_STORE_CTX *);
-void	SSL_set_verify(SSL *s, int mode,
-		       int (*callback)(int ok,X509_STORE_CTX *ctx));
-void	SSL_set_verify_depth(SSL *s, int depth);
-#ifndef OPENSSL_NO_RSA
-int	SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa);
-#endif
-int	SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len);
-int	SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey);
-int	SSL_use_PrivateKey_ASN1(int pk,SSL *ssl, const unsigned char *d, long len);
-int	SSL_use_certificate(SSL *ssl, X509 *x);
-int	SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
-
-#ifndef OPENSSL_NO_STDIO
-int	SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
-int	SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
-int	SSL_use_certificate_file(SSL *ssl, const char *file, int type);
-int	SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-int	SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-int	SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
-int	SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file); /* PEM type */
-STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
-int	SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-					    const char *file);
-#ifndef OPENSSL_SYS_VMS
-#ifndef OPENSSL_SYS_MACINTOSH_CLASSIC /* XXXXX: Better scheme needed! [was: #ifndef MAC_OS_pre_X] */
-int	SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-					   const char *dir);
-#endif
-#endif
-
-#endif
-
-void	SSL_load_error_strings(void );
-const char *SSL_state_string(const SSL *s);
-const char *SSL_rstate_string(const SSL *s);
-const char *SSL_state_string_long(const SSL *s);
-const char *SSL_rstate_string_long(const SSL *s);
-long	SSL_SESSION_get_time(const SSL_SESSION *s);
-long	SSL_SESSION_set_time(SSL_SESSION *s, long t);
-long	SSL_SESSION_get_timeout(const SSL_SESSION *s);
-long	SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
-void	SSL_copy_session_id(SSL *to,const SSL *from);
-
-SSL_SESSION *SSL_SESSION_new(void);
-const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s,
-					unsigned int *len);
-#ifndef OPENSSL_NO_FP_API
-int	SSL_SESSION_print_fp(FILE *fp,const SSL_SESSION *ses);
-#endif
-#ifndef OPENSSL_NO_BIO
-int	SSL_SESSION_print(BIO *fp,const SSL_SESSION *ses);
-#endif
-void	SSL_SESSION_free(SSL_SESSION *ses);
-int	i2d_SSL_SESSION(SSL_SESSION *in,unsigned char **pp);
-int	SSL_set_session(SSL *to, SSL_SESSION *session);
-int	SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
-int	SSL_CTX_remove_session(SSL_CTX *,SSL_SESSION *c);
-int	SSL_CTX_set_generate_session_id(SSL_CTX *, GEN_SESSION_CB);
-int	SSL_set_generate_session_id(SSL *, GEN_SESSION_CB);
-int	SSL_has_matching_session_id(const SSL *ssl, const unsigned char *id,
-					unsigned int id_len);
-SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a,const unsigned char **pp,
-			     long length);
-
-#ifdef HEADER_X509_H
-X509 *	SSL_get_peer_certificate(const SSL *s);
-#endif
-
-STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s);
-
-int SSL_CTX_get_verify_mode(const SSL_CTX *ctx);
-int SSL_CTX_get_verify_depth(const SSL_CTX *ctx);
-int (*SSL_CTX_get_verify_callback(const SSL_CTX *ctx))(int,X509_STORE_CTX *);
-void SSL_CTX_set_verify(SSL_CTX *ctx,int mode,
-			int (*callback)(int, X509_STORE_CTX *));
-void SSL_CTX_set_verify_depth(SSL_CTX *ctx,int depth);
-void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx, int (*cb)(X509_STORE_CTX *,void *), void *arg);
-#ifndef OPENSSL_NO_RSA
-int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa);
-#endif
-int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d, long len);
-int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey);
-int SSL_CTX_use_PrivateKey_ASN1(int pk,SSL_CTX *ctx,
-	const unsigned char *d, long len);
-int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
-int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, const unsigned char *d);
-
-void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb);
-void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u);
-
-int SSL_CTX_check_private_key(const SSL_CTX *ctx);
-int SSL_check_private_key(const SSL *ctx);
-
-int	SSL_CTX_set_session_id_context(SSL_CTX *ctx,const unsigned char *sid_ctx,
-				       unsigned int sid_ctx_len);
-
-SSL *	SSL_new(SSL_CTX *ctx);
-int	SSL_set_session_id_context(SSL *ssl,const unsigned char *sid_ctx,
-				   unsigned int sid_ctx_len);
-
-int SSL_CTX_set_purpose(SSL_CTX *s, int purpose);
-int SSL_set_purpose(SSL *s, int purpose);
-int SSL_CTX_set_trust(SSL_CTX *s, int trust);
-int SSL_set_trust(SSL *s, int trust);
-
-int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm);
-int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm);
-
-void	SSL_free(SSL *ssl);
-int 	SSL_accept(SSL *ssl);
-int 	SSL_connect(SSL *ssl);
-int 	SSL_read(SSL *ssl,void *buf,int num);
-int 	SSL_peek(SSL *ssl,void *buf,int num);
-int 	SSL_write(SSL *ssl,const void *buf,int num);
-long	SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg);
-long	SSL_callback_ctrl(SSL *, int, void (*)(void));
-long	SSL_CTX_ctrl(SSL_CTX *ctx,int cmd, long larg, void *parg);
-long	SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
-
-int	SSL_get_error(const SSL *s,int ret_code);
-const char *SSL_get_version(const SSL *s);
-
-/* This sets the 'default' SSL version that SSL_new() will create */
-int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);
-
-#ifndef OPENSSL_NO_SSL2
-const SSL_METHOD *SSLv2_method(void);		/* SSLv2 */
-const SSL_METHOD *SSLv2_server_method(void);	/* SSLv2 */
-const SSL_METHOD *SSLv2_client_method(void);	/* SSLv2 */
-#endif
-
-const SSL_METHOD *SSLv3_method(void);		/* SSLv3 */
-const SSL_METHOD *SSLv3_server_method(void);	/* SSLv3 */
-const SSL_METHOD *SSLv3_client_method(void);	/* SSLv3 */
-
-const SSL_METHOD *SSLv23_method(void);	/* SSLv3 but can rollback to v2 */
-const SSL_METHOD *SSLv23_server_method(void);	/* SSLv3 but can rollback to v2 */
-const SSL_METHOD *SSLv23_client_method(void);	/* SSLv3 but can rollback to v2 */
-
-const SSL_METHOD *TLSv1_method(void);		/* TLSv1.0 */
-const SSL_METHOD *TLSv1_server_method(void);	/* TLSv1.0 */
-const SSL_METHOD *TLSv1_client_method(void);	/* TLSv1.0 */
-
-const SSL_METHOD *DTLSv1_method(void);		/* DTLSv1.0 */
-const SSL_METHOD *DTLSv1_server_method(void);	/* DTLSv1.0 */
-const SSL_METHOD *DTLSv1_client_method(void);	/* DTLSv1.0 */
-
-STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s);
-
-int SSL_do_handshake(SSL *s);
-int SSL_renegotiate(SSL *s);
-int SSL_renegotiate_pending(SSL *s);
-int SSL_shutdown(SSL *s);
-
-const SSL_METHOD *SSL_get_ssl_method(SSL *s);
-int SSL_set_ssl_method(SSL *s, const SSL_METHOD *method);
-const char *SSL_alert_type_string_long(int value);
-const char *SSL_alert_type_string(int value);
-const char *SSL_alert_desc_string_long(int value);
-const char *SSL_alert_desc_string(int value);
-
-void SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *name_list);
-void SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *name_list);
-STACK_OF(X509_NAME) *SSL_get_client_CA_list(const SSL *s);
-STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_CTX *s);
-int SSL_add_client_CA(SSL *ssl,X509 *x);
-int SSL_CTX_add_client_CA(SSL_CTX *ctx,X509 *x);
-
-void SSL_set_connect_state(SSL *s);
-void SSL_set_accept_state(SSL *s);
-
-long SSL_get_default_timeout(const SSL *s);
-
-int SSL_library_init(void );
-
-char *SSL_CIPHER_description(const SSL_CIPHER *,char *buf,int size);
-STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);
-
-SSL *SSL_dup(SSL *ssl);
-
-X509 *SSL_get_certificate(const SSL *ssl);
-/* EVP_PKEY */ struct evp_pkey_st *SSL_get_privatekey(SSL *ssl);
-
-void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx,int mode);
-int SSL_CTX_get_quiet_shutdown(const SSL_CTX *ctx);
-void SSL_set_quiet_shutdown(SSL *ssl,int mode);
-int SSL_get_quiet_shutdown(const SSL *ssl);
-void SSL_set_shutdown(SSL *ssl,int mode);
-int SSL_get_shutdown(const SSL *ssl);
-int SSL_version(const SSL *ssl);
-int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
-int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
-	const char *CApath);
-#define SSL_get0_session SSL_get_session /* just peek at pointer */
-SSL_SESSION *SSL_get_session(const SSL *ssl);
-SSL_SESSION *SSL_get1_session(SSL *ssl); /* obtain a reference count */
-SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl);
-SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX* ctx);
-void SSL_set_info_callback(SSL *ssl,
-			   void (*cb)(const SSL *ssl,int type,int val));
-void (*SSL_get_info_callback(const SSL *ssl))(const SSL *ssl,int type,int val);
-int SSL_state(const SSL *ssl);
-
-void SSL_set_verify_result(SSL *ssl,long v);
-long SSL_get_verify_result(const SSL *ssl);
-
-int SSL_set_ex_data(SSL *ssl,int idx,void *data);
-void *SSL_get_ex_data(const SSL *ssl,int idx);
-int SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-
-int SSL_SESSION_set_ex_data(SSL_SESSION *ss,int idx,void *data);
-void *SSL_SESSION_get_ex_data(const SSL_SESSION *ss,int idx);
-int SSL_SESSION_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-
-int SSL_CTX_set_ex_data(SSL_CTX *ssl,int idx,void *data);
-void *SSL_CTX_get_ex_data(const SSL_CTX *ssl,int idx);
-int SSL_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-
-int SSL_get_ex_data_X509_STORE_CTX_idx(void );
-
-#define SSL_CTX_sess_set_cache_size(ctx,t) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_SIZE,t,NULL)
-#define SSL_CTX_sess_get_cache_size(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_GET_SESS_CACHE_SIZE,0,NULL)
-#define SSL_CTX_set_session_cache_mode(ctx,m) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_MODE,m,NULL)
-#define SSL_CTX_get_session_cache_mode(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_GET_SESS_CACHE_MODE,0,NULL)
-
-#define SSL_CTX_get_default_read_ahead(ctx) SSL_CTX_get_read_ahead(ctx)
-#define SSL_CTX_set_default_read_ahead(ctx,m) SSL_CTX_set_read_ahead(ctx,m)
-#define SSL_CTX_get_read_ahead(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_GET_READ_AHEAD,0,NULL)
-#define SSL_CTX_set_read_ahead(ctx,m) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_READ_AHEAD,m,NULL)
-#define SSL_CTX_get_max_cert_list(ctx) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_GET_MAX_CERT_LIST,0,NULL)
-#define SSL_CTX_set_max_cert_list(ctx,m) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_CERT_LIST,m,NULL)
-#define SSL_get_max_cert_list(ssl) \
-	SSL_ctrl(ssl,SSL_CTRL_GET_MAX_CERT_LIST,0,NULL)
-#define SSL_set_max_cert_list(ssl,m) \
-	SSL_ctrl(ssl,SSL_CTRL_SET_MAX_CERT_LIST,m,NULL)
-
-#define SSL_CTX_set_max_send_fragment(ctx,m) \
-	SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_SEND_FRAGMENT,m,NULL)
-#define SSL_set_max_send_fragment(ssl,m) \
-	SSL_ctrl(ssl,SSL_CTRL_SET_MAX_SEND_FRAGMENT,m,NULL)
-
-     /* NB: the keylength is only applicable when is_export is true */
-#ifndef OPENSSL_NO_RSA
-void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,
-				  RSA *(*cb)(SSL *ssl,int is_export,
-					     int keylength));
-
-void SSL_set_tmp_rsa_callback(SSL *ssl,
-				  RSA *(*cb)(SSL *ssl,int is_export,
-					     int keylength));
-#endif
-#ifndef OPENSSL_NO_DH
-void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,
-				 DH *(*dh)(SSL *ssl,int is_export,
-					   int keylength));
-void SSL_set_tmp_dh_callback(SSL *ssl,
-				 DH *(*dh)(SSL *ssl,int is_export,
-					   int keylength));
-#endif
-#ifndef OPENSSL_NO_ECDH
-void SSL_CTX_set_tmp_ecdh_callback(SSL_CTX *ctx,
-				 EC_KEY *(*ecdh)(SSL *ssl,int is_export,
-					   int keylength));
-void SSL_set_tmp_ecdh_callback(SSL *ssl,
-				 EC_KEY *(*ecdh)(SSL *ssl,int is_export,
-					   int keylength));
-#endif
-
-#ifndef OPENSSL_NO_COMP
-const COMP_METHOD *SSL_get_current_compression(SSL *s);
-const COMP_METHOD *SSL_get_current_expansion(SSL *s);
-const char *SSL_COMP_get_name(const COMP_METHOD *comp);
-STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
-int SSL_COMP_add_compression_method(int id,COMP_METHOD *cm);
-#else
-const void *SSL_get_current_compression(SSL *s);
-const void *SSL_get_current_expansion(SSL *s);
-const char *SSL_COMP_get_name(const void *comp);
-void *SSL_COMP_get_compression_methods(void);
-int SSL_COMP_add_compression_method(int id,void *cm);
-#endif
-
-/* TLS extensions functions */
-int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);
-
-int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
-				  void *arg);
-
-/* Pre-shared secret session resumption functions */
-int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_SSL_strings(void);
-
-/* Error codes for the SSL functions. */
-
-/* Function codes. */
-#define SSL_F_CLIENT_CERTIFICATE			 100
-#define SSL_F_CLIENT_FINISHED				 167
-#define SSL_F_CLIENT_HELLO				 101
-#define SSL_F_CLIENT_MASTER_KEY				 102
-#define SSL_F_D2I_SSL_SESSION				 103
-#define SSL_F_DO_DTLS1_WRITE				 245
-#define SSL_F_DO_SSL3_WRITE				 104
-#define SSL_F_DTLS1_ACCEPT				 246
-#define SSL_F_DTLS1_ADD_CERT_TO_BUF			 295
-#define SSL_F_DTLS1_BUFFER_RECORD			 247
-#define SSL_F_DTLS1_CLIENT_HELLO			 248
-#define SSL_F_DTLS1_CONNECT				 249
-#define SSL_F_DTLS1_ENC					 250
-#define SSL_F_DTLS1_GET_HELLO_VERIFY			 251
-#define SSL_F_DTLS1_GET_MESSAGE				 252
-#define SSL_F_DTLS1_GET_MESSAGE_FRAGMENT		 253
-#define SSL_F_DTLS1_GET_RECORD				 254
-#define SSL_F_DTLS1_HANDLE_TIMEOUT			 297
-#define SSL_F_DTLS1_OUTPUT_CERT_CHAIN			 255
-#define SSL_F_DTLS1_PREPROCESS_FRAGMENT			 288
-#define SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE		 256
-#define SSL_F_DTLS1_PROCESS_RECORD			 257
-#define SSL_F_DTLS1_READ_BYTES				 258
-#define SSL_F_DTLS1_READ_FAILED				 259
-#define SSL_F_DTLS1_SEND_CERTIFICATE_REQUEST		 260
-#define SSL_F_DTLS1_SEND_CLIENT_CERTIFICATE		 261
-#define SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE		 262
-#define SSL_F_DTLS1_SEND_CLIENT_VERIFY			 263
-#define SSL_F_DTLS1_SEND_HELLO_VERIFY_REQUEST		 264
-#define SSL_F_DTLS1_SEND_SERVER_CERTIFICATE		 265
-#define SSL_F_DTLS1_SEND_SERVER_HELLO			 266
-#define SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE		 267
-#define SSL_F_DTLS1_WRITE_APP_DATA_BYTES		 268
-#define SSL_F_GET_CLIENT_FINISHED			 105
-#define SSL_F_GET_CLIENT_HELLO				 106
-#define SSL_F_GET_CLIENT_MASTER_KEY			 107
-#define SSL_F_GET_SERVER_FINISHED			 108
-#define SSL_F_GET_SERVER_HELLO				 109
-#define SSL_F_GET_SERVER_VERIFY				 110
-#define SSL_F_I2D_SSL_SESSION				 111
-#define SSL_F_READ_N					 112
-#define SSL_F_REQUEST_CERTIFICATE			 113
-#define SSL_F_SERVER_FINISH				 239
-#define SSL_F_SERVER_HELLO				 114
-#define SSL_F_SERVER_VERIFY				 240
-#define SSL_F_SSL23_ACCEPT				 115
-#define SSL_F_SSL23_CLIENT_HELLO			 116
-#define SSL_F_SSL23_CONNECT				 117
-#define SSL_F_SSL23_GET_CLIENT_HELLO			 118
-#define SSL_F_SSL23_GET_SERVER_HELLO			 119
-#define SSL_F_SSL23_PEEK				 237
-#define SSL_F_SSL23_READ				 120
-#define SSL_F_SSL23_WRITE				 121
-#define SSL_F_SSL2_ACCEPT				 122
-#define SSL_F_SSL2_CONNECT				 123
-#define SSL_F_SSL2_ENC_INIT				 124
-#define SSL_F_SSL2_GENERATE_KEY_MATERIAL		 241
-#define SSL_F_SSL2_PEEK					 234
-#define SSL_F_SSL2_READ					 125
-#define SSL_F_SSL2_READ_INTERNAL			 236
-#define SSL_F_SSL2_SET_CERTIFICATE			 126
-#define SSL_F_SSL2_WRITE				 127
-#define SSL_F_SSL3_ACCEPT				 128
-#define SSL_F_SSL3_ADD_CERT_TO_BUF			 296
-#define SSL_F_SSL3_CALLBACK_CTRL			 233
-#define SSL_F_SSL3_CHANGE_CIPHER_STATE			 129
-#define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM		 130
-#define SSL_F_SSL3_CLIENT_HELLO				 131
-#define SSL_F_SSL3_CONNECT				 132
-#define SSL_F_SSL3_CTRL					 213
-#define SSL_F_SSL3_CTX_CTRL				 133
-#define SSL_F_SSL3_DIGEST_CACHED_RECORDS		 293
-#define SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC		 292
-#define SSL_F_SSL3_ENC					 134
-#define SSL_F_SSL3_GENERATE_KEY_BLOCK			 238
-#define SSL_F_SSL3_GET_CERTIFICATE_REQUEST		 135
-#define SSL_F_SSL3_GET_CERT_STATUS			 289
-#define SSL_F_SSL3_GET_CERT_VERIFY			 136
-#define SSL_F_SSL3_GET_CLIENT_CERTIFICATE		 137
-#define SSL_F_SSL3_GET_CLIENT_HELLO			 138
-#define SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE		 139
-#define SSL_F_SSL3_GET_FINISHED				 140
-#define SSL_F_SSL3_GET_KEY_EXCHANGE			 141
-#define SSL_F_SSL3_GET_MESSAGE				 142
-#define SSL_F_SSL3_GET_NEW_SESSION_TICKET		 283
-#define SSL_F_SSL3_GET_RECORD				 143
-#define SSL_F_SSL3_GET_SERVER_CERTIFICATE		 144
-#define SSL_F_SSL3_GET_SERVER_DONE			 145
-#define SSL_F_SSL3_GET_SERVER_HELLO			 146
-#define SSL_F_SSL3_HANDSHAKE_MAC			 285
-#define SSL_F_SSL3_NEW_SESSION_TICKET			 287
-#define SSL_F_SSL3_OUTPUT_CERT_CHAIN			 147
-#define SSL_F_SSL3_PEEK					 235
-#define SSL_F_SSL3_READ_BYTES				 148
-#define SSL_F_SSL3_READ_N				 149
-#define SSL_F_SSL3_SEND_CERTIFICATE_REQUEST		 150
-#define SSL_F_SSL3_SEND_CLIENT_CERTIFICATE		 151
-#define SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE		 152
-#define SSL_F_SSL3_SEND_CLIENT_VERIFY			 153
-#define SSL_F_SSL3_SEND_SERVER_CERTIFICATE		 154
-#define SSL_F_SSL3_SEND_SERVER_HELLO			 242
-#define SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE		 155
-#define SSL_F_SSL3_SETUP_KEY_BLOCK			 157
-#define SSL_F_SSL3_SETUP_READ_BUFFER			 156
-#define SSL_F_SSL3_SETUP_WRITE_BUFFER			 291
-#define SSL_F_SSL3_WRITE_BYTES				 158
-#define SSL_F_SSL3_WRITE_PENDING			 159
-#define SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT	 298
-#define SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT		 277
-#define SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK	 215
-#define SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK	 216
-#define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT	 299
-#define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT		 278
-#define SSL_F_SSL_BAD_METHOD				 160
-#define SSL_F_SSL_BYTES_TO_CIPHER_LIST			 161
-#define SSL_F_SSL_CERT_DUP				 221
-#define SSL_F_SSL_CERT_INST				 222
-#define SSL_F_SSL_CERT_INSTANTIATE			 214
-#define SSL_F_SSL_CERT_NEW				 162
-#define SSL_F_SSL_CHECK_PRIVATE_KEY			 163
-#define SSL_F_SSL_CHECK_SERVERHELLO_TLSEXT		 280
-#define SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG		 279
-#define SSL_F_SSL_CIPHER_PROCESS_RULESTR		 230
-#define SSL_F_SSL_CIPHER_STRENGTH_SORT			 231
-#define SSL_F_SSL_CLEAR					 164
-#define SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD		 165
-#define SSL_F_SSL_CREATE_CIPHER_LIST			 166
-#define SSL_F_SSL_CTRL					 232
-#define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY			 168
-#define SSL_F_SSL_CTX_NEW				 169
-#define SSL_F_SSL_CTX_SET_CIPHER_LIST			 269
-#define SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE		 290
-#define SSL_F_SSL_CTX_SET_PURPOSE			 226
-#define SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT		 219
-#define SSL_F_SSL_CTX_SET_SSL_VERSION			 170
-#define SSL_F_SSL_CTX_SET_TRUST				 229
-#define SSL_F_SSL_CTX_USE_CERTIFICATE			 171
-#define SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1		 172
-#define SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE	 220
-#define SSL_F_SSL_CTX_USE_CERTIFICATE_FILE		 173
-#define SSL_F_SSL_CTX_USE_PRIVATEKEY			 174
-#define SSL_F_SSL_CTX_USE_PRIVATEKEY_ASN1		 175
-#define SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE		 176
-#define SSL_F_SSL_CTX_USE_PSK_IDENTITY_HINT		 272
-#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY			 177
-#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_ASN1		 178
-#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE		 179
-#define SSL_F_SSL_DO_HANDSHAKE				 180
-#define SSL_F_SSL_GET_NEW_SESSION			 181
-#define SSL_F_SSL_GET_PREV_SESSION			 217
-#define SSL_F_SSL_GET_SERVER_SEND_CERT			 182
-#define SSL_F_SSL_GET_SIGN_PKEY				 183
-#define SSL_F_SSL_INIT_WBIO_BUFFER			 184
-#define SSL_F_SSL_LOAD_CLIENT_CA_FILE			 185
-#define SSL_F_SSL_NEW					 186
-#define SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT	 300
-#define SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT		 302
-#define SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT	 301
-#define SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT		 303
-#define SSL_F_SSL_PEEK					 270
-#define SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT		 281
-#define SSL_F_SSL_PREPARE_SERVERHELLO_TLSEXT		 282
-#define SSL_F_SSL_READ					 223
-#define SSL_F_SSL_RSA_PRIVATE_DECRYPT			 187
-#define SSL_F_SSL_RSA_PUBLIC_ENCRYPT			 188
-#define SSL_F_SSL_SESSION_NEW				 189
-#define SSL_F_SSL_SESSION_PRINT_FP			 190
-#define SSL_F_SSL_SESS_CERT_NEW				 225
-#define SSL_F_SSL_SET_CERT				 191
-#define SSL_F_SSL_SET_CIPHER_LIST			 271
-#define SSL_F_SSL_SET_FD				 192
-#define SSL_F_SSL_SET_PKEY				 193
-#define SSL_F_SSL_SET_PURPOSE				 227
-#define SSL_F_SSL_SET_RFD				 194
-#define SSL_F_SSL_SET_SESSION				 195
-#define SSL_F_SSL_SET_SESSION_ID_CONTEXT		 218
-#define SSL_F_SSL_SET_SESSION_TICKET_EXT		 294
-#define SSL_F_SSL_SET_TRUST				 228
-#define SSL_F_SSL_SET_WFD				 196
-#define SSL_F_SSL_SHUTDOWN				 224
-#define SSL_F_SSL_UNDEFINED_CONST_FUNCTION		 243
-#define SSL_F_SSL_UNDEFINED_FUNCTION			 197
-#define SSL_F_SSL_UNDEFINED_VOID_FUNCTION		 244
-#define SSL_F_SSL_USE_CERTIFICATE			 198
-#define SSL_F_SSL_USE_CERTIFICATE_ASN1			 199
-#define SSL_F_SSL_USE_CERTIFICATE_FILE			 200
-#define SSL_F_SSL_USE_PRIVATEKEY			 201
-#define SSL_F_SSL_USE_PRIVATEKEY_ASN1			 202
-#define SSL_F_SSL_USE_PRIVATEKEY_FILE			 203
-#define SSL_F_SSL_USE_PSK_IDENTITY_HINT			 273
-#define SSL_F_SSL_USE_RSAPRIVATEKEY			 204
-#define SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1		 205
-#define SSL_F_SSL_USE_RSAPRIVATEKEY_FILE		 206
-#define SSL_F_SSL_VERIFY_CERT_CHAIN			 207
-#define SSL_F_SSL_WRITE					 208
-#define SSL_F_TLS1_CERT_VERIFY_MAC			 286
-#define SSL_F_TLS1_CHANGE_CIPHER_STATE			 209
-#define SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT		 274
-#define SSL_F_TLS1_ENC					 210
-#define SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT		 275
-#define SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT		 276
-#define SSL_F_TLS1_PRF					 284
-#define SSL_F_TLS1_SETUP_KEY_BLOCK			 211
-#define SSL_F_WRITE_PENDING				 212
-
-/* Reason codes. */
-#define SSL_R_APP_DATA_IN_HANDSHAKE			 100
-#define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
-#define SSL_R_BAD_ALERT_RECORD				 101
-#define SSL_R_BAD_AUTHENTICATION_TYPE			 102
-#define SSL_R_BAD_CHANGE_CIPHER_SPEC			 103
-#define SSL_R_BAD_CHECKSUM				 104
-#define SSL_R_BAD_DATA_RETURNED_BY_CALLBACK		 106
-#define SSL_R_BAD_DECOMPRESSION				 107
-#define SSL_R_BAD_DH_G_LENGTH				 108
-#define SSL_R_BAD_DH_PUB_KEY_LENGTH			 109
-#define SSL_R_BAD_DH_P_LENGTH				 110
-#define SSL_R_BAD_DIGEST_LENGTH				 111
-#define SSL_R_BAD_DSA_SIGNATURE				 112
-#define SSL_R_BAD_ECC_CERT				 304
-#define SSL_R_BAD_ECDSA_SIGNATURE			 305
-#define SSL_R_BAD_ECPOINT				 306
-#define SSL_R_BAD_HANDSHAKE_LENGTH			 332
-#define SSL_R_BAD_HELLO_REQUEST				 105
-#define SSL_R_BAD_LENGTH				 271
-#define SSL_R_BAD_MAC_DECODE				 113
-#define SSL_R_BAD_MAC_LENGTH				 333
-#define SSL_R_BAD_MESSAGE_TYPE				 114
-#define SSL_R_BAD_PACKET_LENGTH				 115
-#define SSL_R_BAD_PROTOCOL_VERSION_NUMBER		 116
-#define SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH		 316
-#define SSL_R_BAD_RESPONSE_ARGUMENT			 117
-#define SSL_R_BAD_RSA_DECRYPT				 118
-#define SSL_R_BAD_RSA_ENCRYPT				 119
-#define SSL_R_BAD_RSA_E_LENGTH				 120
-#define SSL_R_BAD_RSA_MODULUS_LENGTH			 121
-#define SSL_R_BAD_RSA_SIGNATURE				 122
-#define SSL_R_BAD_SIGNATURE				 123
-#define SSL_R_BAD_SSL_FILETYPE				 124
-#define SSL_R_BAD_SSL_SESSION_ID_LENGTH			 125
-#define SSL_R_BAD_STATE					 126
-#define SSL_R_BAD_WRITE_RETRY				 127
-#define SSL_R_BIO_NOT_SET				 128
-#define SSL_R_BLOCK_CIPHER_PAD_IS_WRONG			 129
-#define SSL_R_BN_LIB					 130
-#define SSL_R_CA_DN_LENGTH_MISMATCH			 131
-#define SSL_R_CA_DN_TOO_LONG				 132
-#define SSL_R_CCS_RECEIVED_EARLY			 133
-#define SSL_R_CERTIFICATE_VERIFY_FAILED			 134
-#define SSL_R_CERT_LENGTH_MISMATCH			 135
-#define SSL_R_CHALLENGE_IS_DIFFERENT			 136
-#define SSL_R_CIPHER_CODE_WRONG_LENGTH			 137
-#define SSL_R_CIPHER_OR_HASH_UNAVAILABLE		 138
-#define SSL_R_CIPHER_TABLE_SRC_ERROR			 139
-#define SSL_R_CLIENTHELLO_TLSEXT			 226
-#define SSL_R_COMPRESSED_LENGTH_TOO_LONG		 140
-#define SSL_R_COMPRESSION_DISABLED			 343
-#define SSL_R_COMPRESSION_FAILURE			 141
-#define SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE	 307
-#define SSL_R_COMPRESSION_LIBRARY_ERROR			 142
-#define SSL_R_CONNECTION_ID_IS_DIFFERENT		 143
-#define SSL_R_CONNECTION_TYPE_NOT_SET			 144
-#define SSL_R_COOKIE_MISMATCH				 308
-#define SSL_R_DATA_BETWEEN_CCS_AND_FINISHED		 145
-#define SSL_R_DATA_LENGTH_TOO_LONG			 146
-#define SSL_R_DECRYPTION_FAILED				 147
-#define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC	 281
-#define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG		 148
-#define SSL_R_DIGEST_CHECK_FAILED			 149
-#define SSL_R_DTLS_MESSAGE_TOO_BIG			 334
-#define SSL_R_DUPLICATE_COMPRESSION_ID			 309
-#define SSL_R_ECC_CERT_NOT_FOR_KEY_AGREEMENT		 317
-#define SSL_R_ECC_CERT_NOT_FOR_SIGNING			 318
-#define SSL_R_ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE	 322
-#define SSL_R_ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE	 323
-#define SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER		 310
-#define SSL_R_ENCRYPTED_LENGTH_TOO_LONG			 150
-#define SSL_R_ERROR_GENERATING_TMP_RSA_KEY		 282
-#define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST		 151
-#define SSL_R_EXCESSIVE_MESSAGE_SIZE			 152
-#define SSL_R_EXTRA_DATA_IN_MESSAGE			 153
-#define SSL_R_GOT_A_FIN_BEFORE_A_CCS			 154
-#define SSL_R_HTTPS_PROXY_REQUEST			 155
-#define SSL_R_HTTP_REQUEST				 156
-#define SSL_R_ILLEGAL_PADDING				 283
-#define SSL_R_INCONSISTENT_COMPRESSION			 340
-#define SSL_R_INVALID_CHALLENGE_LENGTH			 158
-#define SSL_R_INVALID_COMMAND				 280
-#define SSL_R_INVALID_COMPRESSION_ALGORITHM		 341
-#define SSL_R_INVALID_PURPOSE				 278
-#define SSL_R_INVALID_STATUS_RESPONSE			 328
-#define SSL_R_INVALID_TICKET_KEYS_LENGTH		 325
-#define SSL_R_INVALID_TRUST				 279
-#define SSL_R_KEY_ARG_TOO_LONG				 284
-#define SSL_R_KRB5					 285
-#define SSL_R_KRB5_C_CC_PRINC				 286
-#define SSL_R_KRB5_C_GET_CRED				 287
-#define SSL_R_KRB5_C_INIT				 288
-#define SSL_R_KRB5_C_MK_REQ				 289
-#define SSL_R_KRB5_S_BAD_TICKET				 290
-#define SSL_R_KRB5_S_INIT				 291
-#define SSL_R_KRB5_S_RD_REQ				 292
-#define SSL_R_KRB5_S_TKT_EXPIRED			 293
-#define SSL_R_KRB5_S_TKT_NYV				 294
-#define SSL_R_KRB5_S_TKT_SKEW				 295
-#define SSL_R_LENGTH_MISMATCH				 159
-#define SSL_R_LENGTH_TOO_SHORT				 160
-#define SSL_R_LIBRARY_BUG				 274
-#define SSL_R_LIBRARY_HAS_NO_CIPHERS			 161
-#define SSL_R_MESSAGE_TOO_LONG				 296
-#define SSL_R_MISSING_DH_DSA_CERT			 162
-#define SSL_R_MISSING_DH_KEY				 163
-#define SSL_R_MISSING_DH_RSA_CERT			 164
-#define SSL_R_MISSING_DSA_SIGNING_CERT			 165
-#define SSL_R_MISSING_EXPORT_TMP_DH_KEY			 166
-#define SSL_R_MISSING_EXPORT_TMP_RSA_KEY		 167
-#define SSL_R_MISSING_RSA_CERTIFICATE			 168
-#define SSL_R_MISSING_RSA_ENCRYPTING_CERT		 169
-#define SSL_R_MISSING_RSA_SIGNING_CERT			 170
-#define SSL_R_MISSING_TMP_DH_KEY			 171
-#define SSL_R_MISSING_TMP_ECDH_KEY			 311
-#define SSL_R_MISSING_TMP_RSA_KEY			 172
-#define SSL_R_MISSING_TMP_RSA_PKEY			 173
-#define SSL_R_MISSING_VERIFY_MESSAGE			 174
-#define SSL_R_NON_SSLV2_INITIAL_PACKET			 175
-#define SSL_R_NO_CERTIFICATES_RETURNED			 176
-#define SSL_R_NO_CERTIFICATE_ASSIGNED			 177
-#define SSL_R_NO_CERTIFICATE_RETURNED			 178
-#define SSL_R_NO_CERTIFICATE_SET			 179
-#define SSL_R_NO_CERTIFICATE_SPECIFIED			 180
-#define SSL_R_NO_CIPHERS_AVAILABLE			 181
-#define SSL_R_NO_CIPHERS_PASSED				 182
-#define SSL_R_NO_CIPHERS_SPECIFIED			 183
-#define SSL_R_NO_CIPHER_LIST				 184
-#define SSL_R_NO_CIPHER_MATCH				 185
-#define SSL_R_NO_CLIENT_CERT_METHOD			 331
-#define SSL_R_NO_CLIENT_CERT_RECEIVED			 186
-#define SSL_R_NO_COMPRESSION_SPECIFIED			 187
-#define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER		 330
-#define SSL_R_NO_METHOD_SPECIFIED			 188
-#define SSL_R_NO_PRIVATEKEY				 189
-#define SSL_R_NO_PRIVATE_KEY_ASSIGNED			 190
-#define SSL_R_NO_PROTOCOLS_AVAILABLE			 191
-#define SSL_R_NO_PUBLICKEY				 192
-#define SSL_R_NO_RENEGOTIATION				 339
-#define SSL_R_NO_REQUIRED_DIGEST			 324
-#define SSL_R_NO_SHARED_CIPHER				 193
-#define SSL_R_NO_VERIFY_CALLBACK			 194
-#define SSL_R_NULL_SSL_CTX				 195
-#define SSL_R_NULL_SSL_METHOD_PASSED			 196
-#define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED		 197
-#define SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED 344
-#define SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE		 297
-#define SSL_R_OPAQUE_PRF_INPUT_TOO_LONG			 327
-#define SSL_R_PACKET_LENGTH_TOO_LONG			 198
-#define SSL_R_PARSE_TLSEXT				 227
-#define SSL_R_PATH_TOO_LONG				 270
-#define SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE		 199
-#define SSL_R_PEER_ERROR				 200
-#define SSL_R_PEER_ERROR_CERTIFICATE			 201
-#define SSL_R_PEER_ERROR_NO_CERTIFICATE			 202
-#define SSL_R_PEER_ERROR_NO_CIPHER			 203
-#define SSL_R_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE	 204
-#define SSL_R_PRE_MAC_LENGTH_TOO_LONG			 205
-#define SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS		 206
-#define SSL_R_PROTOCOL_IS_SHUTDOWN			 207
-#define SSL_R_PSK_IDENTITY_NOT_FOUND			 223
-#define SSL_R_PSK_NO_CLIENT_CB				 224
-#define SSL_R_PSK_NO_SERVER_CB				 225
-#define SSL_R_PUBLIC_KEY_ENCRYPT_ERROR			 208
-#define SSL_R_PUBLIC_KEY_IS_NOT_RSA			 209
-#define SSL_R_PUBLIC_KEY_NOT_RSA			 210
-#define SSL_R_READ_BIO_NOT_SET				 211
-#define SSL_R_READ_TIMEOUT_EXPIRED			 312
-#define SSL_R_READ_WRONG_PACKET_TYPE			 212
-#define SSL_R_RECORD_LENGTH_MISMATCH			 213
-#define SSL_R_RECORD_TOO_LARGE				 214
-#define SSL_R_RECORD_TOO_SMALL				 298
-#define SSL_R_RENEGOTIATE_EXT_TOO_LONG			 335
-#define SSL_R_RENEGOTIATION_ENCODING_ERR		 336
-#define SSL_R_RENEGOTIATION_MISMATCH			 337
-#define SSL_R_REQUIRED_CIPHER_MISSING			 215
-#define SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING	 342
-#define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO		 216
-#define SSL_R_REUSE_CERT_TYPE_NOT_ZERO			 217
-#define SSL_R_REUSE_CIPHER_LIST_NOT_ZERO		 218
-#define SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING		 345
-#define SSL_R_SERVERHELLO_TLSEXT			 275
-#define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED		 277
-#define SSL_R_SHORT_READ				 219
-#define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE	 220
-#define SSL_R_SSL23_DOING_SESSION_ID_REUSE		 221
-#define SSL_R_SSL2_CONNECTION_ID_TOO_LONG		 299
-#define SSL_R_SSL3_EXT_INVALID_ECPOINTFORMAT		 321
-#define SSL_R_SSL3_EXT_INVALID_SERVERNAME		 319
-#define SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE		 320
-#define SSL_R_SSL3_SESSION_ID_TOO_LONG			 300
-#define SSL_R_SSL3_SESSION_ID_TOO_SHORT			 222
-#define SSL_R_SSLV3_ALERT_BAD_CERTIFICATE		 1042
-#define SSL_R_SSLV3_ALERT_BAD_RECORD_MAC		 1020
-#define SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED		 1045
-#define SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED		 1044
-#define SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN		 1046
-#define SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE		 1030
-#define SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE		 1040
-#define SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER		 1047
-#define SSL_R_SSLV3_ALERT_NO_CERTIFICATE		 1041
-#define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE		 1010
-#define SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE	 1043
-#define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION	 228
-#define SSL_R_SSL_HANDSHAKE_FAILURE			 229
-#define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS		 230
-#define SSL_R_SSL_SESSION_ID_CALLBACK_FAILED		 301
-#define SSL_R_SSL_SESSION_ID_CONFLICT			 302
-#define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG		 273
-#define SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH		 303
-#define SSL_R_SSL_SESSION_ID_IS_DIFFERENT		 231
-#define SSL_R_TLSV1_ALERT_ACCESS_DENIED			 1049
-#define SSL_R_TLSV1_ALERT_DECODE_ERROR			 1050
-#define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED		 1021
-#define SSL_R_TLSV1_ALERT_DECRYPT_ERROR			 1051
-#define SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION		 1060
-#define SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY		 1071
-#define SSL_R_TLSV1_ALERT_INTERNAL_ERROR		 1080
-#define SSL_R_TLSV1_ALERT_NO_RENEGOTIATION		 1100
-#define SSL_R_TLSV1_ALERT_PROTOCOL_VERSION		 1070
-#define SSL_R_TLSV1_ALERT_RECORD_OVERFLOW		 1022
-#define SSL_R_TLSV1_ALERT_UNKNOWN_CA			 1048
-#define SSL_R_TLSV1_ALERT_USER_CANCELLED		 1090
-#define SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE		 1114
-#define SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE	 1113
-#define SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE		 1111
-#define SSL_R_TLSV1_UNRECOGNIZED_NAME			 1112
-#define SSL_R_TLSV1_UNSUPPORTED_EXTENSION		 1110
-#define SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER	 232
-#define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST		 157
-#define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233
-#define SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG	 234
-#define SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER		 235
-#define SSL_R_UNABLE_TO_DECODE_DH_CERTS			 236
-#define SSL_R_UNABLE_TO_DECODE_ECDH_CERTS		 313
-#define SSL_R_UNABLE_TO_EXTRACT_PUBLIC_KEY		 237
-#define SSL_R_UNABLE_TO_FIND_DH_PARAMETERS		 238
-#define SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS		 314
-#define SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS	 239
-#define SSL_R_UNABLE_TO_FIND_SSL_METHOD			 240
-#define SSL_R_UNABLE_TO_LOAD_SSL2_MD5_ROUTINES		 241
-#define SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES		 242
-#define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES		 243
-#define SSL_R_UNEXPECTED_MESSAGE			 244
-#define SSL_R_UNEXPECTED_RECORD				 245
-#define SSL_R_UNINITIALIZED				 276
-#define SSL_R_UNKNOWN_ALERT_TYPE			 246
-#define SSL_R_UNKNOWN_CERTIFICATE_TYPE			 247
-#define SSL_R_UNKNOWN_CIPHER_RETURNED			 248
-#define SSL_R_UNKNOWN_CIPHER_TYPE			 249
-#define SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE			 250
-#define SSL_R_UNKNOWN_PKEY_TYPE				 251
-#define SSL_R_UNKNOWN_PROTOCOL				 252
-#define SSL_R_UNKNOWN_REMOTE_ERROR_TYPE			 253
-#define SSL_R_UNKNOWN_SSL_VERSION			 254
-#define SSL_R_UNKNOWN_STATE				 255
-#define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED	 338
-#define SSL_R_UNSUPPORTED_CIPHER			 256
-#define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM		 257
-#define SSL_R_UNSUPPORTED_DIGEST_TYPE			 326
-#define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE		 315
-#define SSL_R_UNSUPPORTED_PROTOCOL			 258
-#define SSL_R_UNSUPPORTED_SSL_VERSION			 259
-#define SSL_R_UNSUPPORTED_STATUS_TYPE			 329
-#define SSL_R_WRITE_BIO_NOT_SET				 260
-#define SSL_R_WRONG_CIPHER_RETURNED			 261
-#define SSL_R_WRONG_MESSAGE_TYPE			 262
-#define SSL_R_WRONG_NUMBER_OF_KEY_BITS			 263
-#define SSL_R_WRONG_SIGNATURE_LENGTH			 264
-#define SSL_R_WRONG_SIGNATURE_SIZE			 265
-#define SSL_R_WRONG_SSL_VERSION				 266
-#define SSL_R_WRONG_VERSION_NUMBER			 267
-#define SSL_R_X509_LIB					 268
-#define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS		 269
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/ssl2.h b/dep/include/openssl/ssl2.h
deleted file mode 100644
index 99a52ea0d..000000000
--- a/dep/include/openssl/ssl2.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/* ssl/ssl2.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SSL2_H 
-#define HEADER_SSL2_H 
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Protocol Version Codes */
-#define SSL2_VERSION		0x0002
-#define SSL2_VERSION_MAJOR	0x00
-#define SSL2_VERSION_MINOR	0x02
-/* #define SSL2_CLIENT_VERSION	0x0002 */
-/* #define SSL2_SERVER_VERSION	0x0002 */
-
-/* Protocol Message Codes */
-#define SSL2_MT_ERROR			0
-#define SSL2_MT_CLIENT_HELLO		1
-#define SSL2_MT_CLIENT_MASTER_KEY	2
-#define SSL2_MT_CLIENT_FINISHED		3
-#define SSL2_MT_SERVER_HELLO		4
-#define SSL2_MT_SERVER_VERIFY		5
-#define SSL2_MT_SERVER_FINISHED		6
-#define SSL2_MT_REQUEST_CERTIFICATE	7
-#define SSL2_MT_CLIENT_CERTIFICATE	8
-
-/* Error Message Codes */
-#define SSL2_PE_UNDEFINED_ERROR		0x0000
-#define SSL2_PE_NO_CIPHER		0x0001
-#define SSL2_PE_NO_CERTIFICATE		0x0002
-#define SSL2_PE_BAD_CERTIFICATE		0x0004
-#define SSL2_PE_UNSUPPORTED_CERTIFICATE_TYPE 0x0006
-
-/* Cipher Kind Values */
-#define SSL2_CK_NULL_WITH_MD5			0x02000000 /* v3 */
-#define SSL2_CK_RC4_128_WITH_MD5		0x02010080
-#define SSL2_CK_RC4_128_EXPORT40_WITH_MD5	0x02020080
-#define SSL2_CK_RC2_128_CBC_WITH_MD5		0x02030080
-#define SSL2_CK_RC2_128_CBC_EXPORT40_WITH_MD5	0x02040080
-#define SSL2_CK_IDEA_128_CBC_WITH_MD5		0x02050080
-#define SSL2_CK_DES_64_CBC_WITH_MD5		0x02060040
-#define SSL2_CK_DES_64_CBC_WITH_SHA		0x02060140 /* v3 */
-#define SSL2_CK_DES_192_EDE3_CBC_WITH_MD5	0x020700c0
-#define SSL2_CK_DES_192_EDE3_CBC_WITH_SHA	0x020701c0 /* v3 */
-#define SSL2_CK_RC4_64_WITH_MD5			0x02080080 /* MS hack */
- 
-#define SSL2_CK_DES_64_CFB64_WITH_MD5_1		0x02ff0800 /* SSLeay */
-#define SSL2_CK_NULL				0x02ff0810 /* SSLeay */
-
-#define SSL2_TXT_DES_64_CFB64_WITH_MD5_1	"DES-CFB-M1"
-#define SSL2_TXT_NULL_WITH_MD5			"NULL-MD5"
-#define SSL2_TXT_RC4_128_WITH_MD5		"RC4-MD5"
-#define SSL2_TXT_RC4_128_EXPORT40_WITH_MD5	"EXP-RC4-MD5"
-#define SSL2_TXT_RC2_128_CBC_WITH_MD5		"RC2-CBC-MD5"
-#define SSL2_TXT_RC2_128_CBC_EXPORT40_WITH_MD5	"EXP-RC2-CBC-MD5"
-#define SSL2_TXT_IDEA_128_CBC_WITH_MD5		"IDEA-CBC-MD5"
-#define SSL2_TXT_DES_64_CBC_WITH_MD5		"DES-CBC-MD5"
-#define SSL2_TXT_DES_64_CBC_WITH_SHA		"DES-CBC-SHA"
-#define SSL2_TXT_DES_192_EDE3_CBC_WITH_MD5	"DES-CBC3-MD5"
-#define SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA	"DES-CBC3-SHA"
-#define SSL2_TXT_RC4_64_WITH_MD5		"RC4-64-MD5"
-
-#define SSL2_TXT_NULL				"NULL"
-
-/* Flags for the SSL_CIPHER.algorithm2 field */
-#define SSL2_CF_5_BYTE_ENC			0x01
-#define SSL2_CF_8_BYTE_ENC			0x02
-
-/* Certificate Type Codes */
-#define SSL2_CT_X509_CERTIFICATE		0x01
-
-/* Authentication Type Code */
-#define SSL2_AT_MD5_WITH_RSA_ENCRYPTION		0x01
-
-#define SSL2_MAX_SSL_SESSION_ID_LENGTH		32
-
-/* Upper/Lower Bounds */
-#define SSL2_MAX_MASTER_KEY_LENGTH_IN_BITS	256
-#ifdef OPENSSL_SYS_MPE
-#define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER	29998u
-#else
-#define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER	32767u  /* 2^15-1 */
-#endif
-#define SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER	16383 /* 2^14-1 */
-
-#define SSL2_CHALLENGE_LENGTH	16
-/*#define SSL2_CHALLENGE_LENGTH	32 */
-#define SSL2_MIN_CHALLENGE_LENGTH	16
-#define SSL2_MAX_CHALLENGE_LENGTH	32
-#define SSL2_CONNECTION_ID_LENGTH	16
-#define SSL2_MAX_CONNECTION_ID_LENGTH	16
-#define SSL2_SSL_SESSION_ID_LENGTH	16
-#define SSL2_MAX_CERT_CHALLENGE_LENGTH	32
-#define SSL2_MIN_CERT_CHALLENGE_LENGTH	16
-#define SSL2_MAX_KEY_MATERIAL_LENGTH	24
-
-#ifndef HEADER_SSL_LOCL_H
-#define  CERT		char
-#endif
-
-typedef struct ssl2_state_st
-	{
-	int three_byte_header;
-	int clear_text;		/* clear text */
-	int escape;		/* not used in SSLv2 */
-	int ssl2_rollback;	/* used if SSLv23 rolled back to SSLv2 */
-
-	/* non-blocking io info, used to make sure the same
-	 * args were passwd */
-	unsigned int wnum;	/* number of bytes sent so far */
-	int wpend_tot;
-	const unsigned char *wpend_buf;
-
-	int wpend_off;	/* offset to data to write */
-	int wpend_len; 	/* number of bytes passwd to write */
-	int wpend_ret; 	/* number of bytes to return to caller */
-
-	/* buffer raw data */
-	int rbuf_left;
-	int rbuf_offs;
-	unsigned char *rbuf;
-	unsigned char *wbuf;
-
-	unsigned char *write_ptr;/* used to point to the start due to
-				  * 2/3 byte header. */
-
-	unsigned int padding;
-	unsigned int rlength; /* passed to ssl2_enc */
-	int ract_data_length; /* Set when things are encrypted. */
-	unsigned int wlength; /* passed to ssl2_enc */
-	int wact_data_length; /* Set when things are decrypted. */
-	unsigned char *ract_data;
-	unsigned char *wact_data;
-	unsigned char *mac_data;
-
-	unsigned char *read_key;
-	unsigned char *write_key;
-
-		/* Stuff specifically to do with this SSL session */
-	unsigned int challenge_length;
-	unsigned char challenge[SSL2_MAX_CHALLENGE_LENGTH];
-	unsigned int conn_id_length;
-	unsigned char conn_id[SSL2_MAX_CONNECTION_ID_LENGTH];
-	unsigned int key_material_length;
-	unsigned char key_material[SSL2_MAX_KEY_MATERIAL_LENGTH*2];
-
-	unsigned long read_sequence;
-	unsigned long write_sequence;
-
-	struct	{
-		unsigned int conn_id_length;
-		unsigned int cert_type;	
-		unsigned int cert_length;
-		unsigned int csl; 
-		unsigned int clear;
-		unsigned int enc; 
-		unsigned char ccl[SSL2_MAX_CERT_CHALLENGE_LENGTH];
-		unsigned int cipher_spec_length;
-		unsigned int session_id_length;
-		unsigned int clen;
-		unsigned int rlen;
-		} tmp;
-	} SSL2_STATE;
-
-/* SSLv2 */
-/* client */
-#define SSL2_ST_SEND_CLIENT_HELLO_A		(0x10|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_HELLO_B		(0x11|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_HELLO_A		(0x20|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_HELLO_B		(0x21|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_MASTER_KEY_A	(0x30|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_MASTER_KEY_B	(0x31|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_FINISHED_A		(0x40|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_FINISHED_B		(0x41|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_A	(0x50|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_B	(0x51|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_C	(0x52|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_D	(0x53|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_VERIFY_A		(0x60|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_VERIFY_B		(0x61|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_FINISHED_A		(0x70|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_FINISHED_B		(0x71|SSL_ST_CONNECT)
-#define SSL2_ST_CLIENT_START_ENCRYPTION		(0x80|SSL_ST_CONNECT)
-#define SSL2_ST_X509_GET_CLIENT_CERTIFICATE	(0x90|SSL_ST_CONNECT)
-/* server */
-#define SSL2_ST_GET_CLIENT_HELLO_A		(0x10|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_HELLO_B		(0x11|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_HELLO_C		(0x12|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_HELLO_A		(0x20|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_HELLO_B		(0x21|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_MASTER_KEY_A		(0x30|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_MASTER_KEY_B		(0x31|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_A		(0x40|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_B		(0x41|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_C		(0x42|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_FINISHED_A		(0x50|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_FINISHED_B		(0x51|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_FINISHED_A		(0x60|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_FINISHED_B		(0x61|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_A	(0x70|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_B	(0x71|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_C	(0x72|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_D	(0x73|SSL_ST_ACCEPT)
-#define SSL2_ST_SERVER_START_ENCRYPTION		(0x80|SSL_ST_ACCEPT)
-#define SSL2_ST_X509_GET_SERVER_CERTIFICATE	(0x90|SSL_ST_ACCEPT)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/dep/include/openssl/ssl23.h b/dep/include/openssl/ssl23.h
deleted file mode 100644
index d3228983c..000000000
--- a/dep/include/openssl/ssl23.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ssl/ssl23.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SSL23_H 
-#define HEADER_SSL23_H 
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*client */
-/* write to server */
-#define SSL23_ST_CW_CLNT_HELLO_A	(0x210|SSL_ST_CONNECT)
-#define SSL23_ST_CW_CLNT_HELLO_B	(0x211|SSL_ST_CONNECT)
-/* read from server */
-#define SSL23_ST_CR_SRVR_HELLO_A	(0x220|SSL_ST_CONNECT)
-#define SSL23_ST_CR_SRVR_HELLO_B	(0x221|SSL_ST_CONNECT)
-
-/* server */
-/* read from client */
-#define SSL23_ST_SR_CLNT_HELLO_A	(0x210|SSL_ST_ACCEPT)
-#define SSL23_ST_SR_CLNT_HELLO_B	(0x211|SSL_ST_ACCEPT)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/dep/include/openssl/ssl3.h b/dep/include/openssl/ssl3.h
deleted file mode 100644
index baaa89e71..000000000
--- a/dep/include/openssl/ssl3.h
+++ /dev/null
@@ -1,637 +0,0 @@
-/* ssl/ssl3.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECC cipher suite support in OpenSSL originally developed by 
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_SSL3_H 
-#define HEADER_SSL3_H 
-
-#ifndef OPENSSL_NO_COMP
-#include <openssl/comp.h>
-#endif
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-#include <openssl/ssl.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Signalling cipher suite value: from draft-ietf-tls-renegotiation-03.txt */
-#define SSL3_CK_SCSV				0x030000FF
-
-#define SSL3_CK_RSA_NULL_MD5			0x03000001
-#define SSL3_CK_RSA_NULL_SHA			0x03000002
-#define SSL3_CK_RSA_RC4_40_MD5 			0x03000003
-#define SSL3_CK_RSA_RC4_128_MD5			0x03000004
-#define SSL3_CK_RSA_RC4_128_SHA			0x03000005
-#define SSL3_CK_RSA_RC2_40_MD5			0x03000006
-#define SSL3_CK_RSA_IDEA_128_SHA		0x03000007
-#define SSL3_CK_RSA_DES_40_CBC_SHA		0x03000008
-#define SSL3_CK_RSA_DES_64_CBC_SHA		0x03000009
-#define SSL3_CK_RSA_DES_192_CBC3_SHA		0x0300000A
-
-#define SSL3_CK_DH_DSS_DES_40_CBC_SHA		0x0300000B
-#define SSL3_CK_DH_DSS_DES_64_CBC_SHA		0x0300000C
-#define SSL3_CK_DH_DSS_DES_192_CBC3_SHA 	0x0300000D
-#define SSL3_CK_DH_RSA_DES_40_CBC_SHA		0x0300000E
-#define SSL3_CK_DH_RSA_DES_64_CBC_SHA		0x0300000F
-#define SSL3_CK_DH_RSA_DES_192_CBC3_SHA 	0x03000010
-
-#define SSL3_CK_EDH_DSS_DES_40_CBC_SHA		0x03000011
-#define SSL3_CK_EDH_DSS_DES_64_CBC_SHA		0x03000012
-#define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA	0x03000013
-#define SSL3_CK_EDH_RSA_DES_40_CBC_SHA		0x03000014
-#define SSL3_CK_EDH_RSA_DES_64_CBC_SHA		0x03000015
-#define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA	0x03000016
-
-#define SSL3_CK_ADH_RC4_40_MD5			0x03000017
-#define SSL3_CK_ADH_RC4_128_MD5			0x03000018
-#define SSL3_CK_ADH_DES_40_CBC_SHA		0x03000019
-#define SSL3_CK_ADH_DES_64_CBC_SHA		0x0300001A
-#define SSL3_CK_ADH_DES_192_CBC_SHA		0x0300001B
-
-#if 0
-	#define SSL3_CK_FZA_DMS_NULL_SHA		0x0300001C
-	#define SSL3_CK_FZA_DMS_FZA_SHA			0x0300001D
-	#if 0 /* Because it clashes with KRB5, is never used any more, and is safe
-		 to remove according to David Hopwood <david.hopwood@zetnet.co.uk>
-		 of the ietf-tls list */
-	#define SSL3_CK_FZA_DMS_RC4_SHA			0x0300001E
-	#endif
-#endif
-
-/*    VRS Additional Kerberos5 entries
- */
-#define SSL3_CK_KRB5_DES_64_CBC_SHA		0x0300001E
-#define SSL3_CK_KRB5_DES_192_CBC3_SHA		0x0300001F
-#define SSL3_CK_KRB5_RC4_128_SHA		0x03000020
-#define SSL3_CK_KRB5_IDEA_128_CBC_SHA	       	0x03000021
-#define SSL3_CK_KRB5_DES_64_CBC_MD5       	0x03000022
-#define SSL3_CK_KRB5_DES_192_CBC3_MD5       	0x03000023
-#define SSL3_CK_KRB5_RC4_128_MD5	       	0x03000024
-#define SSL3_CK_KRB5_IDEA_128_CBC_MD5 		0x03000025
-
-#define SSL3_CK_KRB5_DES_40_CBC_SHA 		0x03000026
-#define SSL3_CK_KRB5_RC2_40_CBC_SHA 		0x03000027
-#define SSL3_CK_KRB5_RC4_40_SHA	 		0x03000028
-#define SSL3_CK_KRB5_DES_40_CBC_MD5 		0x03000029
-#define SSL3_CK_KRB5_RC2_40_CBC_MD5 		0x0300002A
-#define SSL3_CK_KRB5_RC4_40_MD5	 		0x0300002B
-
-#define SSL3_TXT_RSA_NULL_MD5			"NULL-MD5"
-#define SSL3_TXT_RSA_NULL_SHA			"NULL-SHA"
-#define SSL3_TXT_RSA_RC4_40_MD5 		"EXP-RC4-MD5"
-#define SSL3_TXT_RSA_RC4_128_MD5		"RC4-MD5"
-#define SSL3_TXT_RSA_RC4_128_SHA		"RC4-SHA"
-#define SSL3_TXT_RSA_RC2_40_MD5			"EXP-RC2-CBC-MD5"
-#define SSL3_TXT_RSA_IDEA_128_SHA		"IDEA-CBC-SHA"
-#define SSL3_TXT_RSA_DES_40_CBC_SHA		"EXP-DES-CBC-SHA"
-#define SSL3_TXT_RSA_DES_64_CBC_SHA		"DES-CBC-SHA"
-#define SSL3_TXT_RSA_DES_192_CBC3_SHA		"DES-CBC3-SHA"
-
-#define SSL3_TXT_DH_DSS_DES_40_CBC_SHA		"EXP-DH-DSS-DES-CBC-SHA"
-#define SSL3_TXT_DH_DSS_DES_64_CBC_SHA		"DH-DSS-DES-CBC-SHA"
-#define SSL3_TXT_DH_DSS_DES_192_CBC3_SHA 	"DH-DSS-DES-CBC3-SHA"
-#define SSL3_TXT_DH_RSA_DES_40_CBC_SHA		"EXP-DH-RSA-DES-CBC-SHA"
-#define SSL3_TXT_DH_RSA_DES_64_CBC_SHA		"DH-RSA-DES-CBC-SHA"
-#define SSL3_TXT_DH_RSA_DES_192_CBC3_SHA 	"DH-RSA-DES-CBC3-SHA"
-
-#define SSL3_TXT_EDH_DSS_DES_40_CBC_SHA		"EXP-EDH-DSS-DES-CBC-SHA"
-#define SSL3_TXT_EDH_DSS_DES_64_CBC_SHA		"EDH-DSS-DES-CBC-SHA"
-#define SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA	"EDH-DSS-DES-CBC3-SHA"
-#define SSL3_TXT_EDH_RSA_DES_40_CBC_SHA		"EXP-EDH-RSA-DES-CBC-SHA"
-#define SSL3_TXT_EDH_RSA_DES_64_CBC_SHA		"EDH-RSA-DES-CBC-SHA"
-#define SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA	"EDH-RSA-DES-CBC3-SHA"
-
-#define SSL3_TXT_ADH_RC4_40_MD5			"EXP-ADH-RC4-MD5"
-#define SSL3_TXT_ADH_RC4_128_MD5		"ADH-RC4-MD5"
-#define SSL3_TXT_ADH_DES_40_CBC_SHA		"EXP-ADH-DES-CBC-SHA"
-#define SSL3_TXT_ADH_DES_64_CBC_SHA		"ADH-DES-CBC-SHA"
-#define SSL3_TXT_ADH_DES_192_CBC_SHA		"ADH-DES-CBC3-SHA"
-
-#if 0
-	#define SSL3_TXT_FZA_DMS_NULL_SHA		"FZA-NULL-SHA"
-	#define SSL3_TXT_FZA_DMS_FZA_SHA		"FZA-FZA-CBC-SHA"
-	#define SSL3_TXT_FZA_DMS_RC4_SHA		"FZA-RC4-SHA"
-#endif
-
-#define SSL3_TXT_KRB5_DES_64_CBC_SHA		"KRB5-DES-CBC-SHA"
-#define SSL3_TXT_KRB5_DES_192_CBC3_SHA		"KRB5-DES-CBC3-SHA"
-#define SSL3_TXT_KRB5_RC4_128_SHA		"KRB5-RC4-SHA"
-#define SSL3_TXT_KRB5_IDEA_128_CBC_SHA	       	"KRB5-IDEA-CBC-SHA"
-#define SSL3_TXT_KRB5_DES_64_CBC_MD5       	"KRB5-DES-CBC-MD5"
-#define SSL3_TXT_KRB5_DES_192_CBC3_MD5       	"KRB5-DES-CBC3-MD5"
-#define SSL3_TXT_KRB5_RC4_128_MD5		"KRB5-RC4-MD5"
-#define SSL3_TXT_KRB5_IDEA_128_CBC_MD5 		"KRB5-IDEA-CBC-MD5"
-
-#define SSL3_TXT_KRB5_DES_40_CBC_SHA 		"EXP-KRB5-DES-CBC-SHA"
-#define SSL3_TXT_KRB5_RC2_40_CBC_SHA 		"EXP-KRB5-RC2-CBC-SHA"
-#define SSL3_TXT_KRB5_RC4_40_SHA	 	"EXP-KRB5-RC4-SHA"
-#define SSL3_TXT_KRB5_DES_40_CBC_MD5 		"EXP-KRB5-DES-CBC-MD5"
-#define SSL3_TXT_KRB5_RC2_40_CBC_MD5 		"EXP-KRB5-RC2-CBC-MD5"
-#define SSL3_TXT_KRB5_RC4_40_MD5	 	"EXP-KRB5-RC4-MD5"
-
-#define SSL3_SSL_SESSION_ID_LENGTH		32
-#define SSL3_MAX_SSL_SESSION_ID_LENGTH		32
-
-#define SSL3_MASTER_SECRET_SIZE			48
-#define SSL3_RANDOM_SIZE			32
-#define SSL3_SESSION_ID_SIZE			32
-#define SSL3_RT_HEADER_LENGTH			5
-
-#ifndef SSL3_ALIGN_PAYLOAD
- /* Some will argue that this increases memory footprint, but it's
-  * not actually true. Point is that malloc has to return at least
-  * 64-bit aligned pointers, meaning that allocating 5 bytes wastes
-  * 3 bytes in either case. Suggested pre-gaping simply moves these
-  * wasted bytes from the end of allocated region to its front,
-  * but makes data payload aligned, which improves performance:-) */
-# define SSL3_ALIGN_PAYLOAD			8
-#else
-# if (SSL3_ALIGN_PAYLOAD&(SSL3_ALIGN_PAYLOAD-1))!=0
-#  error "insane SSL3_ALIGN_PAYLOAD"
-#  undef SSL3_ALIGN_PAYLOAD
-# endif
-#endif
-
-/* This is the maximum MAC (digest) size used by the SSL library.
- * Currently maximum of 20 is used by SHA1, but we reserve for
- * future extension for 512-bit hashes.
- */
-
-#define SSL3_RT_MAX_MD_SIZE			64
-
-/* Maximum block size used in all ciphersuites. Currently 16 for AES.
- */
-
-#define	SSL_RT_MAX_CIPHER_BLOCK_SIZE		16
-
-#define SSL3_RT_MAX_EXTRA			(16384)
-
-/* Maximum plaintext length: defined by SSL/TLS standards */
-#define SSL3_RT_MAX_PLAIN_LENGTH		16384
-/* Maximum compression overhead: defined by SSL/TLS standards */
-#define SSL3_RT_MAX_COMPRESSED_OVERHEAD		1024
-
-/* The standards give a maximum encryption overhead of 1024 bytes.
- * In practice the value is lower than this. The overhead is the maximum
- * number of padding bytes (256) plus the mac size.
- */
-#define SSL3_RT_MAX_ENCRYPTED_OVERHEAD	(256 + SSL3_RT_MAX_MD_SIZE)
-
-/* OpenSSL currently only uses a padding length of at most one block so
- * the send overhead is smaller.
- */
-
-#define SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD \
-			(SSL_RT_MAX_CIPHER_BLOCK_SIZE + SSL3_RT_MAX_MD_SIZE)
-
-/* If compression isn't used don't include the compression overhead */
-
-#ifdef OPENSSL_NO_COMP
-#define SSL3_RT_MAX_COMPRESSED_LENGTH		SSL3_RT_MAX_PLAIN_LENGTH
-#else
-#define SSL3_RT_MAX_COMPRESSED_LENGTH	\
-		(SSL3_RT_MAX_PLAIN_LENGTH+SSL3_RT_MAX_COMPRESSED_OVERHEAD)
-#endif
-#define SSL3_RT_MAX_ENCRYPTED_LENGTH	\
-		(SSL3_RT_MAX_ENCRYPTED_OVERHEAD+SSL3_RT_MAX_COMPRESSED_LENGTH)
-#define SSL3_RT_MAX_PACKET_SIZE		\
-		(SSL3_RT_MAX_ENCRYPTED_LENGTH+SSL3_RT_HEADER_LENGTH)
-
-#define SSL3_MD_CLIENT_FINISHED_CONST	"\x43\x4C\x4E\x54"
-#define SSL3_MD_SERVER_FINISHED_CONST	"\x53\x52\x56\x52"
-
-#define SSL3_VERSION			0x0300
-#define SSL3_VERSION_MAJOR		0x03
-#define SSL3_VERSION_MINOR		0x00
-
-#define SSL3_RT_CHANGE_CIPHER_SPEC	20
-#define SSL3_RT_ALERT			21
-#define SSL3_RT_HANDSHAKE		22
-#define SSL3_RT_APPLICATION_DATA	23
-
-#define SSL3_AL_WARNING			1
-#define SSL3_AL_FATAL			2
-
-#define SSL3_AD_CLOSE_NOTIFY		 0
-#define SSL3_AD_UNEXPECTED_MESSAGE	10	/* fatal */
-#define SSL3_AD_BAD_RECORD_MAC		20	/* fatal */
-#define SSL3_AD_DECOMPRESSION_FAILURE	30	/* fatal */
-#define SSL3_AD_HANDSHAKE_FAILURE	40	/* fatal */
-#define SSL3_AD_NO_CERTIFICATE		41
-#define SSL3_AD_BAD_CERTIFICATE		42
-#define SSL3_AD_UNSUPPORTED_CERTIFICATE	43
-#define SSL3_AD_CERTIFICATE_REVOKED	44
-#define SSL3_AD_CERTIFICATE_EXPIRED	45
-#define SSL3_AD_CERTIFICATE_UNKNOWN	46
-#define SSL3_AD_ILLEGAL_PARAMETER	47	/* fatal */
-
-typedef struct ssl3_record_st
-	{
-/*r */	int type;               /* type of record */
-/*rw*/	unsigned int length;    /* How many bytes available */
-/*r */	unsigned int off;       /* read/write offset into 'buf' */
-/*rw*/	unsigned char *data;    /* pointer to the record data */
-/*rw*/	unsigned char *input;   /* where the decode bytes are */
-/*r */	unsigned char *comp;    /* only used with decompression - malloc()ed */
-/*r */  unsigned long epoch;    /* epoch number, needed by DTLS1 */
-/*r */  unsigned char seq_num[8]; /* sequence number, needed by DTLS1 */
-	} SSL3_RECORD;
-
-typedef struct ssl3_buffer_st
-	{
-	unsigned char *buf;     /* at least SSL3_RT_MAX_PACKET_SIZE bytes,
-	                         * see ssl3_setup_buffers() */
-	size_t len;             /* buffer size */
-	int offset;             /* where to 'copy from' */
-	int left;               /* how many bytes left */
-	} SSL3_BUFFER;
-
-#define SSL3_CT_RSA_SIGN			1
-#define SSL3_CT_DSS_SIGN			2
-#define SSL3_CT_RSA_FIXED_DH			3
-#define SSL3_CT_DSS_FIXED_DH			4
-#define SSL3_CT_RSA_EPHEMERAL_DH		5
-#define SSL3_CT_DSS_EPHEMERAL_DH		6
-#define SSL3_CT_FORTEZZA_DMS			20
-/* SSL3_CT_NUMBER is used to size arrays and it must be large
- * enough to contain all of the cert types defined either for
- * SSLv3 and TLSv1.
- */
-#define SSL3_CT_NUMBER			9
-
-
-#define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS	0x0001
-#define SSL3_FLAGS_DELAY_CLIENT_FINISHED	0x0002
-#define SSL3_FLAGS_POP_BUFFER			0x0004
-#define TLS1_FLAGS_TLS_PADDING_BUG		0x0008
-#define TLS1_FLAGS_SKIP_CERT_VERIFY		0x0010
-
-typedef struct ssl3_state_st
-	{
-	long flags;
-	int delay_buf_pop_ret;
-
-	unsigned char read_sequence[8];
-	int read_mac_secret_size;
-	unsigned char read_mac_secret[EVP_MAX_MD_SIZE];
-	unsigned char write_sequence[8];
-	int write_mac_secret_size;
-	unsigned char write_mac_secret[EVP_MAX_MD_SIZE];
-
-	unsigned char server_random[SSL3_RANDOM_SIZE];
-	unsigned char client_random[SSL3_RANDOM_SIZE];
-
-	/* flags for countermeasure against known-IV weakness */
-	int need_empty_fragments;
-	int empty_fragment_done;
-
-	/* The value of 'extra' when the buffers were initialized */
-	int init_extra;
-
-	SSL3_BUFFER rbuf;	/* read IO goes into here */
-	SSL3_BUFFER wbuf;	/* write IO goes into here */
-
-	SSL3_RECORD rrec;	/* each decoded record goes in here */
-	SSL3_RECORD wrec;	/* goes out from here */
-
-	/* storage for Alert/Handshake protocol data received but not
-	 * yet processed by ssl3_read_bytes: */
-	unsigned char alert_fragment[2];
-	unsigned int alert_fragment_len;
-	unsigned char handshake_fragment[4];
-	unsigned int handshake_fragment_len;
-
-	/* partial write - check the numbers match */
-	unsigned int wnum;	/* number of bytes sent so far */
-	int wpend_tot;		/* number bytes written */
-	int wpend_type;
-	int wpend_ret;		/* number of bytes submitted */
-	const unsigned char *wpend_buf;
-
-	/* used during startup, digest all incoming/outgoing packets */
-	BIO *handshake_buffer;
-	/* When set of handshake digests is determined, buffer is hashed
-	 * and freed and MD_CTX-es for all required digests are stored in
-	 * this array */
-	EVP_MD_CTX **handshake_dgst;
-	/* this is set whenerver we see a change_cipher_spec message
-	 * come in when we are not looking for one */
-	int change_cipher_spec;
-
-	int warn_alert;
-	int fatal_alert;
-	/* we allow one fatal and one warning alert to be outstanding,
-	 * send close alert via the warning alert */
-	int alert_dispatch;
-	unsigned char send_alert[2];
-
-	/* This flag is set when we should renegotiate ASAP, basically when
-	 * there is no more data in the read or write buffers */
-	int renegotiate;
-	int total_renegotiations;
-	int num_renegotiations;
-
-	int in_read_app_data;
-
-	/* Opaque PRF input as used for the current handshake.
-	 * These fields are used only if TLSEXT_TYPE_opaque_prf_input is defined
-	 * (otherwise, they are merely present to improve binary compatibility) */
-	void *client_opaque_prf_input;
-	size_t client_opaque_prf_input_len;
-	void *server_opaque_prf_input;
-	size_t server_opaque_prf_input_len;
-
-	struct	{
-		/* actually only needs to be 16+20 */
-		unsigned char cert_verify_md[EVP_MAX_MD_SIZE*2];
-
-		/* actually only need to be 16+20 for SSLv3 and 12 for TLS */
-		unsigned char finish_md[EVP_MAX_MD_SIZE*2];
-		int finish_md_len;
-		unsigned char peer_finish_md[EVP_MAX_MD_SIZE*2];
-		int peer_finish_md_len;
-		
-		unsigned long message_size;
-		int message_type;
-
-		/* used to hold the new cipher we are going to use */
-		const SSL_CIPHER *new_cipher;
-#ifndef OPENSSL_NO_DH
-		DH *dh;
-#endif
-
-#ifndef OPENSSL_NO_ECDH
-		EC_KEY *ecdh; /* holds short lived ECDH key */
-#endif
-
-		/* used when SSL_ST_FLUSH_DATA is entered */
-		int next_state;			
-
-		int reuse_message;
-
-		/* used for certificate requests */
-		int cert_req;
-		int ctype_num;
-		char ctype[SSL3_CT_NUMBER];
-		STACK_OF(X509_NAME) *ca_names;
-
-		int use_rsa_tmp;
-
-		int key_block_length;
-		unsigned char *key_block;
-
-		const EVP_CIPHER *new_sym_enc;
-		const EVP_MD *new_hash;
-		int new_mac_pkey_type;
-		int new_mac_secret_size;
-#ifndef OPENSSL_NO_COMP
-		const SSL_COMP *new_compression;
-#else
-		char *new_compression;
-#endif
-		int cert_request;
-		} tmp;
-
-        /* Connection binding to prevent renegotiation attacks */
-        unsigned char previous_client_finished[EVP_MAX_MD_SIZE];
-        unsigned char previous_client_finished_len;
-        unsigned char previous_server_finished[EVP_MAX_MD_SIZE];
-        unsigned char previous_server_finished_len;
-        int send_connection_binding; /* TODOEKR */
-	} SSL3_STATE;
-
-
-/* SSLv3 */
-/*client */
-/* extra state */
-#define SSL3_ST_CW_FLUSH		(0x100|SSL_ST_CONNECT)
-/* write to server */
-#define SSL3_ST_CW_CLNT_HELLO_A		(0x110|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CLNT_HELLO_B		(0x111|SSL_ST_CONNECT)
-/* read from server */
-#define SSL3_ST_CR_SRVR_HELLO_A		(0x120|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SRVR_HELLO_B		(0x121|SSL_ST_CONNECT)
-#define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A (0x126|SSL_ST_CONNECT)
-#define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B (0x127|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_A		(0x130|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_B		(0x131|SSL_ST_CONNECT)
-#define SSL3_ST_CR_KEY_EXCH_A		(0x140|SSL_ST_CONNECT)
-#define SSL3_ST_CR_KEY_EXCH_B		(0x141|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_REQ_A		(0x150|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_REQ_B		(0x151|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SRVR_DONE_A		(0x160|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SRVR_DONE_B		(0x161|SSL_ST_CONNECT)
-/* write to server */
-#define SSL3_ST_CW_CERT_A		(0x170|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_B		(0x171|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_C		(0x172|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_D		(0x173|SSL_ST_CONNECT)
-#define SSL3_ST_CW_KEY_EXCH_A		(0x180|SSL_ST_CONNECT)
-#define SSL3_ST_CW_KEY_EXCH_B		(0x181|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_VRFY_A		(0x190|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_VRFY_B		(0x191|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CHANGE_A		(0x1A0|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CHANGE_B		(0x1A1|SSL_ST_CONNECT)
-#define SSL3_ST_CW_FINISHED_A		(0x1B0|SSL_ST_CONNECT)
-#define SSL3_ST_CW_FINISHED_B		(0x1B1|SSL_ST_CONNECT)
-/* read from server */
-#define SSL3_ST_CR_CHANGE_A		(0x1C0|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CHANGE_B		(0x1C1|SSL_ST_CONNECT)
-#define SSL3_ST_CR_FINISHED_A		(0x1D0|SSL_ST_CONNECT)
-#define SSL3_ST_CR_FINISHED_B		(0x1D1|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SESSION_TICKET_A	(0x1E0|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SESSION_TICKET_B	(0x1E1|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_STATUS_A	(0x1F0|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_STATUS_B	(0x1F1|SSL_ST_CONNECT)
-
-/* server */
-/* extra state */
-#define SSL3_ST_SW_FLUSH		(0x100|SSL_ST_ACCEPT)
-/* read from client */
-/* Do not change the number values, they do matter */
-#define SSL3_ST_SR_CLNT_HELLO_A		(0x110|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CLNT_HELLO_B		(0x111|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CLNT_HELLO_C		(0x112|SSL_ST_ACCEPT)
-/* write to client */
-#define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A (0x113|SSL_ST_ACCEPT)
-#define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B (0x114|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_HELLO_REQ_A		(0x120|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_HELLO_REQ_B		(0x121|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_HELLO_REQ_C		(0x122|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SRVR_HELLO_A		(0x130|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SRVR_HELLO_B		(0x131|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_A		(0x140|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_B		(0x141|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_KEY_EXCH_A		(0x150|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_KEY_EXCH_B		(0x151|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_REQ_A		(0x160|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_REQ_B		(0x161|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SRVR_DONE_A		(0x170|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SRVR_DONE_B		(0x171|SSL_ST_ACCEPT)
-/* read from client */
-#define SSL3_ST_SR_CERT_A		(0x180|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CERT_B		(0x181|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_KEY_EXCH_A		(0x190|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_KEY_EXCH_B		(0x191|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CERT_VRFY_A		(0x1A0|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CERT_VRFY_B		(0x1A1|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CHANGE_A		(0x1B0|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CHANGE_B		(0x1B1|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_FINISHED_A		(0x1C0|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_FINISHED_B		(0x1C1|SSL_ST_ACCEPT)
-/* write to client */
-#define SSL3_ST_SW_CHANGE_A		(0x1D0|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CHANGE_B		(0x1D1|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_FINISHED_A		(0x1E0|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_FINISHED_B		(0x1E1|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SESSION_TICKET_A	(0x1F0|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SESSION_TICKET_B	(0x1F1|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_STATUS_A	(0x200|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_STATUS_B	(0x201|SSL_ST_ACCEPT)
-
-#define SSL3_MT_HELLO_REQUEST			0
-#define SSL3_MT_CLIENT_HELLO			1
-#define SSL3_MT_SERVER_HELLO			2
-#define	SSL3_MT_NEWSESSION_TICKET		4
-#define SSL3_MT_CERTIFICATE			11
-#define SSL3_MT_SERVER_KEY_EXCHANGE		12
-#define SSL3_MT_CERTIFICATE_REQUEST		13
-#define SSL3_MT_SERVER_DONE			14
-#define SSL3_MT_CERTIFICATE_VERIFY		15
-#define SSL3_MT_CLIENT_KEY_EXCHANGE		16
-#define SSL3_MT_FINISHED			20
-#define SSL3_MT_CERTIFICATE_STATUS		22
-#define DTLS1_MT_HELLO_VERIFY_REQUEST    3
-
-
-#define SSL3_MT_CCS				1
-
-/* These are used when changing over to a new cipher */
-#define SSL3_CC_READ		0x01
-#define SSL3_CC_WRITE		0x02
-#define SSL3_CC_CLIENT		0x10
-#define SSL3_CC_SERVER		0x20
-#define SSL3_CHANGE_CIPHER_CLIENT_WRITE	(SSL3_CC_CLIENT|SSL3_CC_WRITE)	
-#define SSL3_CHANGE_CIPHER_SERVER_READ	(SSL3_CC_SERVER|SSL3_CC_READ)
-#define SSL3_CHANGE_CIPHER_CLIENT_READ	(SSL3_CC_CLIENT|SSL3_CC_READ)
-#define SSL3_CHANGE_CIPHER_SERVER_WRITE	(SSL3_CC_SERVER|SSL3_CC_WRITE)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/dep/include/openssl/stack.h b/dep/include/openssl/stack.h
deleted file mode 100644
index ce35e554e..000000000
--- a/dep/include/openssl/stack.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* crypto/stack/stack.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_STACK_H
-#define HEADER_STACK_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct stack_st
-	{
-	int num;
-	char **data;
-	int sorted;
-
-	int num_alloc;
-	int (*comp)(const void *, const void *);
-	} _STACK;  /* Use STACK_OF(...) instead */
-
-#define M_sk_num(sk)		((sk) ? (sk)->num:-1)
-#define M_sk_value(sk,n)	((sk) ? (sk)->data[n] : NULL)
-
-int sk_num(const _STACK *);
-void *sk_value(const _STACK *, int);
-
-void *sk_set(_STACK *, int, void *);
-
-_STACK *sk_new(int (*cmp)(const void *, const void *));
-_STACK *sk_new_null(void);
-void sk_free(_STACK *);
-void sk_pop_free(_STACK *st, void (*func)(void *));
-int sk_insert(_STACK *sk, void *data, int where);
-void *sk_delete(_STACK *st, int loc);
-void *sk_delete_ptr(_STACK *st, void *p);
-int sk_find(_STACK *st, void *data);
-int sk_find_ex(_STACK *st, void *data);
-int sk_push(_STACK *st, void *data);
-int sk_unshift(_STACK *st, void *data);
-void *sk_shift(_STACK *st);
-void *sk_pop(_STACK *st);
-void sk_zero(_STACK *st);
-int (*sk_set_cmp_func(_STACK *sk, int (*c)(const void *, const void *)))
-	(const void *, const void *);
-_STACK *sk_dup(_STACK *st);
-void sk_sort(_STACK *st);
-int sk_is_sorted(const _STACK *st);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/symhacks.h b/dep/include/openssl/symhacks.h
deleted file mode 100644
index 3fd4a8169..000000000
--- a/dep/include/openssl/symhacks.h
+++ /dev/null
@@ -1,449 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_SYMHACKS_H
-#define HEADER_SYMHACKS_H
-
-#include <openssl/e_os2.h>
-
-/* Hacks to solve the problem with linkers incapable of handling very long
-   symbol names.  In the case of VMS, the limit is 31 characters on VMS for
-   VAX. */
-/* Note that this affects util/libeay.num and util/ssleay.num...  you may
-   change those manually, but that's not recommended, as those files are
-   controlled centrally and updated on Unix, and the central definition
-   may disagree with yours, which in turn may come with shareable library
-   incompatibilities. */
-#ifdef OPENSSL_SYS_VMS
-
-/* Hack a long name in crypto/ex_data.c */
-#undef CRYPTO_get_ex_data_implementation
-#define CRYPTO_get_ex_data_implementation	CRYPTO_get_ex_data_impl
-#undef CRYPTO_set_ex_data_implementation
-#define CRYPTO_set_ex_data_implementation	CRYPTO_set_ex_data_impl
-
-/* Hack a long name in crypto/asn1/a_mbstr.c */
-#undef ASN1_STRING_set_default_mask_asc
-#define ASN1_STRING_set_default_mask_asc	ASN1_STRING_set_def_mask_asc
-
-#if 0 /* No longer needed, since safestack macro magic does the job */
-/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO) */
-#undef i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO
-#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO	i2d_ASN1_SET_OF_PKCS7_SIGINF
-#undef d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO
-#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO	d2i_ASN1_SET_OF_PKCS7_SIGINF
-#endif
-
-#if 0 /* No longer needed, since safestack macro magic does the job */
-/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO) */
-#undef i2d_ASN1_SET_OF_PKCS7_RECIP_INFO
-#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO	i2d_ASN1_SET_OF_PKCS7_RECINF
-#undef d2i_ASN1_SET_OF_PKCS7_RECIP_INFO
-#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO	d2i_ASN1_SET_OF_PKCS7_RECINF
-#endif
-
-#if 0 /* No longer needed, since safestack macro magic does the job */
-/* Hack the names created with DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION) */
-#undef i2d_ASN1_SET_OF_ACCESS_DESCRIPTION
-#define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION	i2d_ASN1_SET_OF_ACC_DESC
-#undef d2i_ASN1_SET_OF_ACCESS_DESCRIPTION
-#define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION	d2i_ASN1_SET_OF_ACC_DESC
-#endif
-
-/* Hack the names created with DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE) */
-#undef PEM_read_NETSCAPE_CERT_SEQUENCE
-#define PEM_read_NETSCAPE_CERT_SEQUENCE		PEM_read_NS_CERT_SEQ
-#undef PEM_write_NETSCAPE_CERT_SEQUENCE
-#define PEM_write_NETSCAPE_CERT_SEQUENCE	PEM_write_NS_CERT_SEQ
-#undef PEM_read_bio_NETSCAPE_CERT_SEQUENCE
-#define PEM_read_bio_NETSCAPE_CERT_SEQUENCE	PEM_read_bio_NS_CERT_SEQ
-#undef PEM_write_bio_NETSCAPE_CERT_SEQUENCE
-#define PEM_write_bio_NETSCAPE_CERT_SEQUENCE	PEM_write_bio_NS_CERT_SEQ
-#undef PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE
-#define PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE	PEM_write_cb_bio_NS_CERT_SEQ
-
-/* Hack the names created with DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO) */
-#undef PEM_read_PKCS8_PRIV_KEY_INFO
-#define PEM_read_PKCS8_PRIV_KEY_INFO		PEM_read_P8_PRIV_KEY_INFO
-#undef PEM_write_PKCS8_PRIV_KEY_INFO
-#define PEM_write_PKCS8_PRIV_KEY_INFO		PEM_write_P8_PRIV_KEY_INFO
-#undef PEM_read_bio_PKCS8_PRIV_KEY_INFO
-#define PEM_read_bio_PKCS8_PRIV_KEY_INFO	PEM_read_bio_P8_PRIV_KEY_INFO
-#undef PEM_write_bio_PKCS8_PRIV_KEY_INFO
-#define PEM_write_bio_PKCS8_PRIV_KEY_INFO	PEM_write_bio_P8_PRIV_KEY_INFO
-#undef PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO
-#define PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO	PEM_wrt_cb_bio_P8_PRIV_KEY_INFO
-
-/* Hack other PEM names */
-#undef PEM_write_bio_PKCS8PrivateKey_nid
-#define PEM_write_bio_PKCS8PrivateKey_nid	PEM_write_bio_PKCS8PrivKey_nid
-
-/* Hack some long X509 names */
-#undef X509_REVOKED_get_ext_by_critical
-#define X509_REVOKED_get_ext_by_critical	X509_REVOKED_get_ext_by_critic
-#undef X509_policy_tree_get0_user_policies
-#define X509_policy_tree_get0_user_policies	X509_pcy_tree_get0_usr_policies
-#undef X509_policy_node_get0_qualifiers
-#define X509_policy_node_get0_qualifiers	X509_pcy_node_get0_qualifiers
-#undef X509_STORE_CTX_get_explicit_policy
-#define X509_STORE_CTX_get_explicit_policy	X509_STORE_CTX_get_expl_policy
-#undef X509_STORE_CTX_get0_current_issuer
-#define X509_STORE_CTX_get0_current_issuer	X509_STORE_CTX_get0_cur_issuer
-
-/* Hack some long CRYPTO names */
-#undef CRYPTO_set_dynlock_destroy_callback
-#define CRYPTO_set_dynlock_destroy_callback     CRYPTO_set_dynlock_destroy_cb
-#undef CRYPTO_set_dynlock_create_callback
-#define CRYPTO_set_dynlock_create_callback      CRYPTO_set_dynlock_create_cb
-#undef CRYPTO_set_dynlock_lock_callback
-#define CRYPTO_set_dynlock_lock_callback	CRYPTO_set_dynlock_lock_cb
-#undef CRYPTO_get_dynlock_lock_callback
-#define CRYPTO_get_dynlock_lock_callback	CRYPTO_get_dynlock_lock_cb
-#undef CRYPTO_get_dynlock_destroy_callback
-#define CRYPTO_get_dynlock_destroy_callback     CRYPTO_get_dynlock_destroy_cb
-#undef CRYPTO_get_dynlock_create_callback
-#define CRYPTO_get_dynlock_create_callback      CRYPTO_get_dynlock_create_cb
-#undef CRYPTO_set_locked_mem_ex_functions
-#define CRYPTO_set_locked_mem_ex_functions      CRYPTO_set_locked_mem_ex_funcs
-#undef CRYPTO_get_locked_mem_ex_functions
-#define CRYPTO_get_locked_mem_ex_functions      CRYPTO_get_locked_mem_ex_funcs
-
-/* Hack some long SSL names */
-#undef SSL_CTX_set_default_verify_paths
-#define SSL_CTX_set_default_verify_paths	SSL_CTX_set_def_verify_paths
-#undef SSL_get_ex_data_X509_STORE_CTX_idx
-#define SSL_get_ex_data_X509_STORE_CTX_idx      SSL_get_ex_d_X509_STORE_CTX_idx
-#undef SSL_add_file_cert_subjects_to_stack
-#define SSL_add_file_cert_subjects_to_stack     SSL_add_file_cert_subjs_to_stk
-#undef SSL_add_dir_cert_subjects_to_stack
-#define SSL_add_dir_cert_subjects_to_stack      SSL_add_dir_cert_subjs_to_stk
-#undef SSL_CTX_use_certificate_chain_file
-#define SSL_CTX_use_certificate_chain_file      SSL_CTX_use_cert_chain_file
-#undef SSL_CTX_set_cert_verify_callback
-#define SSL_CTX_set_cert_verify_callback	SSL_CTX_set_cert_verify_cb
-#undef SSL_CTX_set_default_passwd_cb_userdata
-#define SSL_CTX_set_default_passwd_cb_userdata  SSL_CTX_set_def_passwd_cb_ud
-#undef SSL_COMP_get_compression_methods
-#define SSL_COMP_get_compression_methods	SSL_COMP_get_compress_methods
-
-#undef ssl_add_clienthello_renegotiate_ext
-#define ssl_add_clienthello_renegotiate_ext	ssl_add_clienthello_reneg_ext
-#undef ssl_add_serverhello_renegotiate_ext
-#define ssl_add_serverhello_renegotiate_ext	ssl_add_serverhello_reneg_ext
-#undef ssl_parse_clienthello_renegotiate_ext
-#define ssl_parse_clienthello_renegotiate_ext	ssl_parse_clienthello_reneg_ext
-#undef ssl_parse_serverhello_renegotiate_ext
-#define ssl_parse_serverhello_renegotiate_ext	ssl_parse_serverhello_reneg_ext
-
-/* Hack some long ENGINE names */
-#undef ENGINE_get_default_BN_mod_exp_crt
-#define ENGINE_get_default_BN_mod_exp_crt	ENGINE_get_def_BN_mod_exp_crt
-#undef ENGINE_set_default_BN_mod_exp_crt
-#define ENGINE_set_default_BN_mod_exp_crt	ENGINE_set_def_BN_mod_exp_crt
-#undef ENGINE_set_load_privkey_function
-#define ENGINE_set_load_privkey_function	ENGINE_set_load_privkey_fn
-#undef ENGINE_get_load_privkey_function
-#define ENGINE_get_load_privkey_function	ENGINE_get_load_privkey_fn
-#undef ENGINE_unregister_pkey_asn1_meths
-#define ENGINE_unregister_pkey_asn1_meths	ENGINE_unreg_pkey_asn1_meths
-#undef ENGINE_register_all_pkey_asn1_meths
-#define ENGINE_register_all_pkey_asn1_meths	ENGINE_reg_all_pkey_asn1_meths
-#undef ENGINE_set_default_pkey_asn1_meths
-#define ENGINE_set_default_pkey_asn1_meths	ENGINE_set_def_pkey_asn1_meths
-#undef ENGINE_get_pkey_asn1_meth_engine
-#define ENGINE_get_pkey_asn1_meth_engine	ENGINE_get_pkey_asn1_meth_eng
-#undef ENGINE_set_load_ssl_client_cert_function
-#define ENGINE_set_load_ssl_client_cert_function \
-						ENGINE_set_ld_ssl_clnt_cert_fn
-#undef ENGINE_get_ssl_client_cert_function
-#define ENGINE_get_ssl_client_cert_function	ENGINE_get_ssl_client_cert_fn
-
-/* Hack some long OCSP names */
-#undef OCSP_REQUEST_get_ext_by_critical
-#define OCSP_REQUEST_get_ext_by_critical	OCSP_REQUEST_get_ext_by_crit
-#undef OCSP_BASICRESP_get_ext_by_critical
-#define OCSP_BASICRESP_get_ext_by_critical      OCSP_BASICRESP_get_ext_by_crit
-#undef OCSP_SINGLERESP_get_ext_by_critical
-#define OCSP_SINGLERESP_get_ext_by_critical     OCSP_SINGLERESP_get_ext_by_crit
-
-/* Hack some long DES names */
-#undef _ossl_old_des_ede3_cfb64_encrypt
-#define _ossl_old_des_ede3_cfb64_encrypt	_ossl_odes_ede3_cfb64_encrypt
-#undef _ossl_old_des_ede3_ofb64_encrypt
-#define _ossl_old_des_ede3_ofb64_encrypt	_ossl_odes_ede3_ofb64_encrypt
-
-/* Hack some long EVP names */
-#undef OPENSSL_add_all_algorithms_noconf
-#define OPENSSL_add_all_algorithms_noconf	OPENSSL_add_all_algo_noconf
-#undef OPENSSL_add_all_algorithms_conf
-#define OPENSSL_add_all_algorithms_conf		OPENSSL_add_all_algo_conf
-#undef EVP_PKEY_meth_set_verify_recover
-#define EVP_PKEY_meth_set_verify_recover	EVP_PKEY_meth_set_vrfy_recover
-
-/* Hack some long EC names */
-#undef EC_GROUP_set_point_conversion_form
-#define EC_GROUP_set_point_conversion_form	EC_GROUP_set_point_conv_form
-#undef EC_GROUP_get_point_conversion_form
-#define EC_GROUP_get_point_conversion_form	EC_GROUP_get_point_conv_form
-#undef EC_GROUP_clear_free_all_extra_data
-#define EC_GROUP_clear_free_all_extra_data	EC_GROUP_clr_free_all_xtra_data
-#undef EC_POINT_set_Jprojective_coordinates_GFp
-#define EC_POINT_set_Jprojective_coordinates_GFp \
-                                                EC_POINT_set_Jproj_coords_GFp
-#undef EC_POINT_get_Jprojective_coordinates_GFp
-#define EC_POINT_get_Jprojective_coordinates_GFp \
-                                                EC_POINT_get_Jproj_coords_GFp
-#undef EC_POINT_set_affine_coordinates_GFp
-#define EC_POINT_set_affine_coordinates_GFp     EC_POINT_set_affine_coords_GFp
-#undef EC_POINT_get_affine_coordinates_GFp
-#define EC_POINT_get_affine_coordinates_GFp     EC_POINT_get_affine_coords_GFp
-#undef EC_POINT_set_compressed_coordinates_GFp
-#define EC_POINT_set_compressed_coordinates_GFp EC_POINT_set_compr_coords_GFp
-#undef EC_POINT_set_affine_coordinates_GF2m
-#define EC_POINT_set_affine_coordinates_GF2m    EC_POINT_set_affine_coords_GF2m
-#undef EC_POINT_get_affine_coordinates_GF2m
-#define EC_POINT_get_affine_coordinates_GF2m    EC_POINT_get_affine_coords_GF2m
-#undef EC_POINT_set_compressed_coordinates_GF2m
-#define EC_POINT_set_compressed_coordinates_GF2m \
-                                                EC_POINT_set_compr_coords_GF2m
-#undef ec_GF2m_simple_group_clear_finish
-#define ec_GF2m_simple_group_clear_finish	ec_GF2m_simple_grp_clr_finish
-#undef ec_GF2m_simple_group_check_discriminant
-#define ec_GF2m_simple_group_check_discriminant	ec_GF2m_simple_grp_chk_discrim
-#undef ec_GF2m_simple_point_clear_finish
-#define ec_GF2m_simple_point_clear_finish	ec_GF2m_simple_pt_clr_finish
-#undef ec_GF2m_simple_point_set_to_infinity
-#define ec_GF2m_simple_point_set_to_infinity	ec_GF2m_simple_pt_set_to_inf
-#undef ec_GF2m_simple_points_make_affine
-#define ec_GF2m_simple_points_make_affine	ec_GF2m_simple_pts_make_affine
-#undef ec_GF2m_simple_point_set_affine_coordinates
-#define ec_GF2m_simple_point_set_affine_coordinates \
-                                                ec_GF2m_smp_pt_set_af_coords
-#undef ec_GF2m_simple_point_get_affine_coordinates
-#define ec_GF2m_simple_point_get_affine_coordinates \
-                                                ec_GF2m_smp_pt_get_af_coords
-#undef ec_GF2m_simple_set_compressed_coordinates
-#define ec_GF2m_simple_set_compressed_coordinates \
-                                                ec_GF2m_smp_set_compr_coords
-#undef ec_GFp_simple_group_set_curve_GFp
-#define ec_GFp_simple_group_set_curve_GFp       ec_GFp_simple_grp_set_curve_GFp
-#undef ec_GFp_simple_group_get_curve_GFp
-#define ec_GFp_simple_group_get_curve_GFp       ec_GFp_simple_grp_get_curve_GFp
-#undef ec_GFp_simple_group_clear_finish
-#define ec_GFp_simple_group_clear_finish	ec_GFp_simple_grp_clear_finish
-#undef ec_GFp_simple_group_set_generator
-#define ec_GFp_simple_group_set_generator       ec_GFp_simple_grp_set_generator
-#undef ec_GFp_simple_group_get0_generator
-#define ec_GFp_simple_group_get0_generator      ec_GFp_simple_grp_gt0_generator
-#undef ec_GFp_simple_group_get_cofactor
-#define ec_GFp_simple_group_get_cofactor	ec_GFp_simple_grp_get_cofactor
-#undef ec_GFp_simple_point_clear_finish
-#define ec_GFp_simple_point_clear_finish	ec_GFp_simple_pt_clear_finish
-#undef ec_GFp_simple_point_set_to_infinity
-#define ec_GFp_simple_point_set_to_infinity     ec_GFp_simple_pt_set_to_inf
-#undef ec_GFp_simple_points_make_affine
-#define ec_GFp_simple_points_make_affine	ec_GFp_simple_pts_make_affine
-#undef ec_GFp_simple_group_get_curve_GFp
-#define ec_GFp_simple_group_get_curve_GFp       ec_GFp_simple_grp_get_curve_GFp
-#undef ec_GFp_simple_set_Jprojective_coordinates_GFp
-#define ec_GFp_simple_set_Jprojective_coordinates_GFp \
-                                                ec_GFp_smp_set_Jproj_coords_GFp
-#undef ec_GFp_simple_get_Jprojective_coordinates_GFp
-#define ec_GFp_simple_get_Jprojective_coordinates_GFp \
-                                                ec_GFp_smp_get_Jproj_coords_GFp
-#undef ec_GFp_simple_point_set_affine_coordinates_GFp
-#define ec_GFp_simple_point_set_affine_coordinates_GFp \
-                                                ec_GFp_smp_pt_set_af_coords_GFp
-#undef ec_GFp_simple_point_get_affine_coordinates_GFp
-#define ec_GFp_simple_point_get_affine_coordinates_GFp \
-                                                ec_GFp_smp_pt_get_af_coords_GFp
-#undef ec_GFp_simple_set_compressed_coordinates_GFp
-#define ec_GFp_simple_set_compressed_coordinates_GFp \
-                                                ec_GFp_smp_set_compr_coords_GFp
-#undef ec_GFp_simple_point_set_affine_coordinates
-#define ec_GFp_simple_point_set_affine_coordinates \
-                                                ec_GFp_smp_pt_set_af_coords
-#undef ec_GFp_simple_point_get_affine_coordinates
-#define ec_GFp_simple_point_get_affine_coordinates \
-                                                ec_GFp_smp_pt_get_af_coords
-#undef ec_GFp_simple_set_compressed_coordinates
-#define ec_GFp_simple_set_compressed_coordinates \
-                                                ec_GFp_smp_set_compr_coords
-#undef ec_GFp_simple_group_check_discriminant
-#define ec_GFp_simple_group_check_discriminant	ec_GFp_simple_grp_chk_discrim
-
-/* Hack som long STORE names */
-#undef STORE_method_set_initialise_function
-#define STORE_method_set_initialise_function	STORE_meth_set_initialise_fn
-#undef STORE_method_set_cleanup_function
-#define STORE_method_set_cleanup_function	STORE_meth_set_cleanup_fn
-#undef STORE_method_set_generate_function
-#define STORE_method_set_generate_function	STORE_meth_set_generate_fn
-#undef STORE_method_set_modify_function
-#define STORE_method_set_modify_function	STORE_meth_set_modify_fn
-#undef STORE_method_set_revoke_function
-#define STORE_method_set_revoke_function	STORE_meth_set_revoke_fn
-#undef STORE_method_set_delete_function
-#define STORE_method_set_delete_function	STORE_meth_set_delete_fn
-#undef STORE_method_set_list_start_function
-#define STORE_method_set_list_start_function	STORE_meth_set_list_start_fn
-#undef STORE_method_set_list_next_function
-#define STORE_method_set_list_next_function	STORE_meth_set_list_next_fn
-#undef STORE_method_set_list_end_function
-#define STORE_method_set_list_end_function	STORE_meth_set_list_end_fn
-#undef STORE_method_set_update_store_function
-#define STORE_method_set_update_store_function	STORE_meth_set_update_store_fn
-#undef STORE_method_set_lock_store_function
-#define STORE_method_set_lock_store_function	STORE_meth_set_lock_store_fn
-#undef STORE_method_set_unlock_store_function
-#define STORE_method_set_unlock_store_function	STORE_meth_set_unlock_store_fn
-#undef STORE_method_get_initialise_function
-#define STORE_method_get_initialise_function	STORE_meth_get_initialise_fn
-#undef STORE_method_get_cleanup_function
-#define STORE_method_get_cleanup_function	STORE_meth_get_cleanup_fn
-#undef STORE_method_get_generate_function
-#define STORE_method_get_generate_function	STORE_meth_get_generate_fn
-#undef STORE_method_get_modify_function
-#define STORE_method_get_modify_function	STORE_meth_get_modify_fn
-#undef STORE_method_get_revoke_function
-#define STORE_method_get_revoke_function	STORE_meth_get_revoke_fn
-#undef STORE_method_get_delete_function
-#define STORE_method_get_delete_function	STORE_meth_get_delete_fn
-#undef STORE_method_get_list_start_function
-#define STORE_method_get_list_start_function	STORE_meth_get_list_start_fn
-#undef STORE_method_get_list_next_function
-#define STORE_method_get_list_next_function	STORE_meth_get_list_next_fn
-#undef STORE_method_get_list_end_function
-#define STORE_method_get_list_end_function	STORE_meth_get_list_end_fn
-#undef STORE_method_get_update_store_function
-#define STORE_method_get_update_store_function	STORE_meth_get_update_store_fn
-#undef STORE_method_get_lock_store_function
-#define STORE_method_get_lock_store_function	STORE_meth_get_lock_store_fn
-#undef STORE_method_get_unlock_store_function
-#define STORE_method_get_unlock_store_function	STORE_meth_get_unlock_store_fn
-
-/* Hack some long TS names */
-#undef TS_RESP_CTX_set_status_info_cond
-#define TS_RESP_CTX_set_status_info_cond	TS_RESP_CTX_set_stat_info_cond
-#undef TS_RESP_CTX_set_clock_precision_digits
-#define TS_RESP_CTX_set_clock_precision_digits	TS_RESP_CTX_set_clk_prec_digits
-#undef TS_CONF_set_clock_precision_digits
-#define TS_CONF_set_clock_precision_digits	TS_CONF_set_clk_prec_digits
-
-/* Hack some long CMS names */
-#undef CMS_RecipientInfo_ktri_get0_algs
-#define CMS_RecipientInfo_ktri_get0_algs	CMS_RecipInfo_ktri_get0_algs
-#undef CMS_RecipientInfo_ktri_get0_signer_id
-#define CMS_RecipientInfo_ktri_get0_signer_id	CMS_RecipInfo_ktri_get0_sigr_id
-#undef CMS_OtherRevocationInfoFormat_it
-#define CMS_OtherRevocationInfoFormat_it	CMS_OtherRevocInfoFormat_it
-#undef CMS_KeyAgreeRecipientIdentifier_it
-#define CMS_KeyAgreeRecipientIdentifier_it	CMS_KeyAgreeRecipIdentifier_it
-#undef CMS_OriginatorIdentifierOrKey_it
-#define CMS_OriginatorIdentifierOrKey_it	CMS_OriginatorIdOrKey_it
-#undef cms_SignerIdentifier_get0_signer_id
-#define cms_SignerIdentifier_get0_signer_id	cms_SignerId_get0_signer_id
-
-/* Hack some long DTLS1 names */
-#undef dtls1_retransmit_buffered_messages
-#define dtls1_retransmit_buffered_messages	dtls1_retransmit_buffered_msgs
-
-/* Hack some long UI names */
-#undef UI_method_get_prompt_constructor
-#define UI_method_get_prompt_constructor	UI_method_get_prompt_constructr
-#undef UI_method_set_prompt_constructor
-#define UI_method_set_prompt_constructor	UI_method_set_prompt_constructr
-
-#endif /* defined OPENSSL_SYS_VMS */
-
-
-/* Case insensitive linking causes problems.... */
-#if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2)
-#undef ERR_load_CRYPTO_strings
-#define ERR_load_CRYPTO_strings			ERR_load_CRYPTOlib_strings
-#undef OCSP_crlID_new
-#define OCSP_crlID_new				OCSP_crlID2_new
-
-#undef d2i_ECPARAMETERS
-#define d2i_ECPARAMETERS			d2i_UC_ECPARAMETERS
-#undef i2d_ECPARAMETERS
-#define i2d_ECPARAMETERS			i2d_UC_ECPARAMETERS
-#undef d2i_ECPKPARAMETERS
-#define d2i_ECPKPARAMETERS			d2i_UC_ECPKPARAMETERS
-#undef i2d_ECPKPARAMETERS
-#define i2d_ECPKPARAMETERS			i2d_UC_ECPKPARAMETERS
-
-/* These functions do not seem to exist!  However, I'm paranoid...
-   Original command in x509v3.h:
-   These functions are being redefined in another directory,
-   and clash when the linker is case-insensitive, so let's
-   hide them a little, by giving them an extra 'o' at the
-   beginning of the name... */
-#undef X509v3_cleanup_extensions
-#define X509v3_cleanup_extensions		oX509v3_cleanup_extensions
-#undef X509v3_add_extension
-#define X509v3_add_extension			oX509v3_add_extension
-#undef X509v3_add_netscape_extensions
-#define X509v3_add_netscape_extensions		oX509v3_add_netscape_extensions
-#undef X509v3_add_standard_extensions
-#define X509v3_add_standard_extensions		oX509v3_add_standard_extensions
-
-/* This one clashes with CMS_data_create */
-#undef cms_Data_create
-#define cms_Data_create				priv_cms_Data_create
-
-#endif
-
-
-#endif /* ! defined HEADER_VMS_IDHACKS_H */
diff --git a/dep/include/openssl/tls1.h b/dep/include/openssl/tls1.h
deleted file mode 100644
index b3cc8f098..000000000
--- a/dep/include/openssl/tls1.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/* ssl/tls1.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by 
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * ECC cipher suite support in OpenSSL originally written by
- * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories.
- *
- */
-/* ====================================================================
- * Copyright 2005 Nokia. All rights reserved.
- *
- * The portions of the attached software ("Contribution") is developed by
- * Nokia Corporation and is licensed pursuant to the OpenSSL open source
- * license.
- *
- * The Contribution, originally written by Mika Kousa and Pasi Eronen of
- * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
- * support (see RFC 4279) to OpenSSL.
- *
- * No patent licenses or other rights except those expressly stated in
- * the OpenSSL open source license shall be deemed granted or received
- * expressly, by implication, estoppel, or otherwise.
- *
- * No assurances are provided by Nokia that the Contribution does not
- * infringe the patent or other intellectual property rights of any third
- * party or that the license provides you with all the necessary rights
- * to make use of the Contribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
- * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
- * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
- * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
- * OTHERWISE.
- */
-
-#ifndef HEADER_TLS1_H 
-#define HEADER_TLS1_H 
-
-#include <openssl/buffer.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES	0
-
-#define TLS1_VERSION			0x0301
-#define TLS1_VERSION_MAJOR		0x03
-#define TLS1_VERSION_MINOR		0x01
-
-#define TLS1_AD_DECRYPTION_FAILED	21
-#define TLS1_AD_RECORD_OVERFLOW		22
-#define TLS1_AD_UNKNOWN_CA		48	/* fatal */
-#define TLS1_AD_ACCESS_DENIED		49	/* fatal */
-#define TLS1_AD_DECODE_ERROR		50	/* fatal */
-#define TLS1_AD_DECRYPT_ERROR		51
-#define TLS1_AD_EXPORT_RESTRICTION	60	/* fatal */
-#define TLS1_AD_PROTOCOL_VERSION	70	/* fatal */
-#define TLS1_AD_INSUFFICIENT_SECURITY	71	/* fatal */
-#define TLS1_AD_INTERNAL_ERROR		80	/* fatal */
-#define TLS1_AD_USER_CANCELLED		90
-#define TLS1_AD_NO_RENEGOTIATION	100
-/* codes 110-114 are from RFC3546 */
-#define TLS1_AD_UNSUPPORTED_EXTENSION	110
-#define TLS1_AD_CERTIFICATE_UNOBTAINABLE 111
-#define TLS1_AD_UNRECOGNIZED_NAME 	112
-#define TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 113
-#define TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 114
-#define TLS1_AD_UNKNOWN_PSK_IDENTITY	115	/* fatal */
-
-/* ExtensionType values from RFC3546 / RFC4366 */
-#define TLSEXT_TYPE_server_name			0
-#define TLSEXT_TYPE_max_fragment_length		1
-#define TLSEXT_TYPE_client_certificate_url	2
-#define TLSEXT_TYPE_trusted_ca_keys		3
-#define TLSEXT_TYPE_truncated_hmac		4
-#define TLSEXT_TYPE_status_request		5
-/* ExtensionType values from RFC4492 */
-#define TLSEXT_TYPE_elliptic_curves		10
-#define TLSEXT_TYPE_ec_point_formats		11
-#define TLSEXT_TYPE_session_ticket		35
-/* ExtensionType value from draft-rescorla-tls-opaque-prf-input-00.txt */
-#if 0 /* will have to be provided externally for now ,
-       * i.e. build with -DTLSEXT_TYPE_opaque_prf_input=38183
-       * using whatever extension number you'd like to try */
-# define TLSEXT_TYPE_opaque_prf_input		?? */
-#endif
-
-/* Temporary extension type */
-#define TLSEXT_TYPE_renegotiate                 0xff01
-
-/* NameType value from RFC 3546 */
-#define TLSEXT_NAMETYPE_host_name 0
-/* status request value from RFC 3546 */
-#define TLSEXT_STATUSTYPE_ocsp 1
-
-/* ECPointFormat values from draft-ietf-tls-ecc-12 */
-#define TLSEXT_ECPOINTFORMAT_first			0
-#define TLSEXT_ECPOINTFORMAT_uncompressed		0
-#define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime	1
-#define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2	2
-#define TLSEXT_ECPOINTFORMAT_last			2
-
-#ifndef OPENSSL_NO_TLSEXT
-
-#define TLSEXT_MAXLEN_host_name 255
-
-const char *SSL_get_servername(const SSL *s, const int type) ;
-int SSL_get_servername_type(const SSL *s) ;
-
-#define SSL_set_tlsext_host_name(s,name) \
-SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name)
-
-#define SSL_set_tlsext_debug_callback(ssl, cb) \
-SSL_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_CB,(void (*)(void))cb)
-
-#define SSL_set_tlsext_debug_arg(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_ARG,0, (void *)arg)
-
-#define SSL_set_tlsext_status_type(ssl, type) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE,type, NULL)
-
-#define SSL_get_tlsext_status_exts(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg)
-
-#define SSL_set_tlsext_status_exts(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg)
-
-#define SSL_get_tlsext_status_ids(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg)
-
-#define SSL_set_tlsext_status_ids(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg)
-
-#define SSL_get_tlsext_status_ocsp_resp(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP,0, (void *)arg)
-
-#define SSL_set_tlsext_status_ocsp_resp(ssl, arg, arglen) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP,arglen, (void *)arg)
-
-#define SSL_CTX_set_tlsext_servername_callback(ctx, cb) \
-SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,(void (*)(void))cb)
-
-#define SSL_TLSEXT_ERR_OK 0
-#define SSL_TLSEXT_ERR_ALERT_WARNING 1
-#define SSL_TLSEXT_ERR_ALERT_FATAL 2
-#define SSL_TLSEXT_ERR_NOACK 3
-
-#define SSL_CTX_set_tlsext_servername_arg(ctx, arg) \
-SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0, (void *)arg)
-
-#define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \
-	SSL_CTX_ctrl((ctx),SSL_CTRL_GET_TLSEXT_TICKET_KEYS,(keylen),(keys))
-#define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \
-	SSL_CTX_ctrl((ctx),SSL_CTRL_SET_TLSEXT_TICKET_KEYS,(keylen),(keys))
-
-#define SSL_CTX_set_tlsext_status_cb(ssl, cb) \
-SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,(void (*)(void))cb)
-
-#define SSL_CTX_set_tlsext_status_arg(ssl, arg) \
-SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)arg)
-
-#define SSL_set_tlsext_opaque_prf_input(s, src, len) \
-SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT, len, src)
-#define SSL_CTX_set_tlsext_opaque_prf_input_callback(ctx, cb) \
-SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB, (void (*)(void))cb)
-#define SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(ctx, arg) \
-SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG, 0, arg)
-
-#define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \
-SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
-
-#endif
-
-/* PSK ciphersuites from 4279 */
-#define TLS1_CK_PSK_WITH_RC4_128_SHA                    0x0300008A
-#define TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA               0x0300008B
-#define TLS1_CK_PSK_WITH_AES_128_CBC_SHA                0x0300008C
-#define TLS1_CK_PSK_WITH_AES_256_CBC_SHA                0x0300008D
-
-/* Additional TLS ciphersuites from expired Internet Draft
- * draft-ietf-tls-56-bit-ciphersuites-01.txt
- * (available if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES is defined, see
- * s3_lib.c).  We actually treat them like SSL 3.0 ciphers, which we probably
- * shouldn't.  Note that the first two are actually not in the IDs. */
-#define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5		0x03000060 /* not in ID */
-#define TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5	0x03000061 /* not in ID */
-#define TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA		0x03000062
-#define TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA	0x03000063
-#define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA		0x03000064
-#define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA	0x03000065
-#define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA		0x03000066
-
-/* AES ciphersuites from RFC3268 */
-
-#define TLS1_CK_RSA_WITH_AES_128_SHA			0x0300002F
-#define TLS1_CK_DH_DSS_WITH_AES_128_SHA			0x03000030
-#define TLS1_CK_DH_RSA_WITH_AES_128_SHA			0x03000031
-#define TLS1_CK_DHE_DSS_WITH_AES_128_SHA		0x03000032
-#define TLS1_CK_DHE_RSA_WITH_AES_128_SHA		0x03000033
-#define TLS1_CK_ADH_WITH_AES_128_SHA			0x03000034
-
-#define TLS1_CK_RSA_WITH_AES_256_SHA			0x03000035
-#define TLS1_CK_DH_DSS_WITH_AES_256_SHA			0x03000036
-#define TLS1_CK_DH_RSA_WITH_AES_256_SHA			0x03000037
-#define TLS1_CK_DHE_DSS_WITH_AES_256_SHA		0x03000038
-#define TLS1_CK_DHE_RSA_WITH_AES_256_SHA		0x03000039
-#define TLS1_CK_ADH_WITH_AES_256_SHA			0x0300003A
-
-/* Camellia ciphersuites from RFC4132 */
-#define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA		0x03000041
-#define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA	0x03000042
-#define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA	0x03000043
-#define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA	0x03000044
-#define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA	0x03000045
-#define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA		0x03000046
-
-#define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA		0x03000084
-#define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA	0x03000085
-#define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA	0x03000086
-#define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA	0x03000087
-#define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA	0x03000088
-#define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA		0x03000089
-
-/* SEED ciphersuites from RFC4162 */
-#define TLS1_CK_RSA_WITH_SEED_SHA                       0x03000096
-#define TLS1_CK_DH_DSS_WITH_SEED_SHA                    0x03000097
-#define TLS1_CK_DH_RSA_WITH_SEED_SHA                    0x03000098
-#define TLS1_CK_DHE_DSS_WITH_SEED_SHA                   0x03000099
-#define TLS1_CK_DHE_RSA_WITH_SEED_SHA                   0x0300009A
-#define TLS1_CK_ADH_WITH_SEED_SHA                	0x0300009B
-
-/* ECC ciphersuites from draft-ietf-tls-ecc-12.txt with changes soon to be in draft 13 */
-#define TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA                0x0300C001
-#define TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA             0x0300C002
-#define TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA        0x0300C003
-#define TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA         0x0300C004
-#define TLS1_CK_ECDH_ECDSA_WITH_AES_256_CBC_SHA         0x0300C005
-
-#define TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA               0x0300C006
-#define TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA            0x0300C007
-#define TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA       0x0300C008
-#define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA        0x0300C009
-#define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA        0x0300C00A
-
-#define TLS1_CK_ECDH_RSA_WITH_NULL_SHA                  0x0300C00B
-#define TLS1_CK_ECDH_RSA_WITH_RC4_128_SHA               0x0300C00C
-#define TLS1_CK_ECDH_RSA_WITH_DES_192_CBC3_SHA          0x0300C00D
-#define TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA           0x0300C00E
-#define TLS1_CK_ECDH_RSA_WITH_AES_256_CBC_SHA           0x0300C00F
-
-#define TLS1_CK_ECDHE_RSA_WITH_NULL_SHA                 0x0300C010
-#define TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA              0x0300C011
-#define TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA         0x0300C012
-#define TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA          0x0300C013
-#define TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA          0x0300C014
-
-#define TLS1_CK_ECDH_anon_WITH_NULL_SHA                 0x0300C015
-#define TLS1_CK_ECDH_anon_WITH_RC4_128_SHA              0x0300C016
-#define TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA         0x0300C017
-#define TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA          0x0300C018
-#define TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA          0x0300C019
-
-/* XXX
- * Inconsistency alert:
- * The OpenSSL names of ciphers with ephemeral DH here include the string
- * "DHE", while elsewhere it has always been "EDH".
- * (The alias for the list of all such ciphers also is "EDH".)
- * The specifications speak of "EDH"; maybe we should allow both forms
- * for everything. */
-#define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5		"EXP1024-RC4-MD5"
-#define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5	"EXP1024-RC2-CBC-MD5"
-#define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA	"EXP1024-DES-CBC-SHA"
-#define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA	"EXP1024-DHE-DSS-DES-CBC-SHA"
-#define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA		"EXP1024-RC4-SHA"
-#define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA	"EXP1024-DHE-DSS-RC4-SHA"
-#define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA		"DHE-DSS-RC4-SHA"
-
-/* AES ciphersuites from RFC3268 */
-#define TLS1_TXT_RSA_WITH_AES_128_SHA			"AES128-SHA"
-#define TLS1_TXT_DH_DSS_WITH_AES_128_SHA		"DH-DSS-AES128-SHA"
-#define TLS1_TXT_DH_RSA_WITH_AES_128_SHA		"DH-RSA-AES128-SHA"
-#define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA		"DHE-DSS-AES128-SHA"
-#define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA		"DHE-RSA-AES128-SHA"
-#define TLS1_TXT_ADH_WITH_AES_128_SHA			"ADH-AES128-SHA"
-
-#define TLS1_TXT_RSA_WITH_AES_256_SHA			"AES256-SHA"
-#define TLS1_TXT_DH_DSS_WITH_AES_256_SHA		"DH-DSS-AES256-SHA"
-#define TLS1_TXT_DH_RSA_WITH_AES_256_SHA		"DH-RSA-AES256-SHA"
-#define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA		"DHE-DSS-AES256-SHA"
-#define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA		"DHE-RSA-AES256-SHA"
-#define TLS1_TXT_ADH_WITH_AES_256_SHA			"ADH-AES256-SHA"
-
-/* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (Mar 15, 2001) */
-#define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA               "ECDH-ECDSA-NULL-SHA"
-#define TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA            "ECDH-ECDSA-RC4-SHA"
-#define TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA       "ECDH-ECDSA-DES-CBC3-SHA"
-#define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA        "ECDH-ECDSA-AES128-SHA"
-#define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_CBC_SHA        "ECDH-ECDSA-AES256-SHA"
-
-#define TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA              "ECDHE-ECDSA-NULL-SHA"
-#define TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA           "ECDHE-ECDSA-RC4-SHA"
-#define TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA      "ECDHE-ECDSA-DES-CBC3-SHA"
-#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA       "ECDHE-ECDSA-AES128-SHA"
-#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA       "ECDHE-ECDSA-AES256-SHA"
-
-#define TLS1_TXT_ECDH_RSA_WITH_NULL_SHA                 "ECDH-RSA-NULL-SHA"
-#define TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA              "ECDH-RSA-RC4-SHA"
-#define TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA         "ECDH-RSA-DES-CBC3-SHA"
-#define TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA          "ECDH-RSA-AES128-SHA"
-#define TLS1_TXT_ECDH_RSA_WITH_AES_256_CBC_SHA          "ECDH-RSA-AES256-SHA"
-
-#define TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA                "ECDHE-RSA-NULL-SHA"
-#define TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA             "ECDHE-RSA-RC4-SHA"
-#define TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA        "ECDHE-RSA-DES-CBC3-SHA"
-#define TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA         "ECDHE-RSA-AES128-SHA"
-#define TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA         "ECDHE-RSA-AES256-SHA"
-
-#define TLS1_TXT_ECDH_anon_WITH_NULL_SHA                "AECDH-NULL-SHA"
-#define TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA             "AECDH-RC4-SHA"
-#define TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA        "AECDH-DES-CBC3-SHA"
-#define TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA         "AECDH-AES128-SHA"
-#define TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA         "AECDH-AES256-SHA"
-
-/* PSK ciphersuites from RFC 4279 */
-#define TLS1_TXT_PSK_WITH_RC4_128_SHA			"PSK-RC4-SHA"
-#define TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA		"PSK-3DES-EDE-CBC-SHA"
-#define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA		"PSK-AES128-CBC-SHA"
-#define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA		"PSK-AES256-CBC-SHA"
-
-/* Camellia ciphersuites from RFC4132 */
-#define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA		"CAMELLIA128-SHA"
-#define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA	"DH-DSS-CAMELLIA128-SHA"
-#define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA	"DH-RSA-CAMELLIA128-SHA"
-#define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA	"DHE-DSS-CAMELLIA128-SHA"
-#define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA	"DHE-RSA-CAMELLIA128-SHA"
-#define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA		"ADH-CAMELLIA128-SHA"
-
-#define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA		"CAMELLIA256-SHA"
-#define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA	"DH-DSS-CAMELLIA256-SHA"
-#define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA	"DH-RSA-CAMELLIA256-SHA"
-#define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA	"DHE-DSS-CAMELLIA256-SHA"
-#define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA	"DHE-RSA-CAMELLIA256-SHA"
-#define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA		"ADH-CAMELLIA256-SHA"
-
-/* SEED ciphersuites from RFC4162 */
-#define TLS1_TXT_RSA_WITH_SEED_SHA                      "SEED-SHA"
-#define TLS1_TXT_DH_DSS_WITH_SEED_SHA                   "DH-DSS-SEED-SHA"
-#define TLS1_TXT_DH_RSA_WITH_SEED_SHA                   "DH-RSA-SEED-SHA"
-#define TLS1_TXT_DHE_DSS_WITH_SEED_SHA                  "DHE-DSS-SEED-SHA"
-#define TLS1_TXT_DHE_RSA_WITH_SEED_SHA                  "DHE-RSA-SEED-SHA"
-#define TLS1_TXT_ADH_WITH_SEED_SHA                      "ADH-SEED-SHA"
-
-
-#define TLS_CT_RSA_SIGN			1
-#define TLS_CT_DSS_SIGN			2
-#define TLS_CT_RSA_FIXED_DH		3
-#define TLS_CT_DSS_FIXED_DH		4
-#define TLS_CT_ECDSA_SIGN		64
-#define TLS_CT_RSA_FIXED_ECDH		65
-#define TLS_CT_ECDSA_FIXED_ECDH 	66
-#define TLS_CT_GOST94_SIGN		21
-#define TLS_CT_GOST01_SIGN		22
-/* when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see
- * comment there) */
-#define TLS_CT_NUMBER			9
-
-#define TLS1_FINISH_MAC_LENGTH		12
-
-#define TLS_MD_MAX_CONST_SIZE			20
-#define TLS_MD_CLIENT_FINISH_CONST		"client finished"
-#define TLS_MD_CLIENT_FINISH_CONST_SIZE		15
-#define TLS_MD_SERVER_FINISH_CONST		"server finished"
-#define TLS_MD_SERVER_FINISH_CONST_SIZE		15
-#define TLS_MD_SERVER_WRITE_KEY_CONST		"server write key"
-#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE	16
-#define TLS_MD_KEY_EXPANSION_CONST		"key expansion"
-#define TLS_MD_KEY_EXPANSION_CONST_SIZE		13
-#define TLS_MD_CLIENT_WRITE_KEY_CONST		"client write key"
-#define TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE	16
-#define TLS_MD_SERVER_WRITE_KEY_CONST		"server write key"
-#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE	16
-#define TLS_MD_IV_BLOCK_CONST			"IV block"
-#define TLS_MD_IV_BLOCK_CONST_SIZE		8
-#define TLS_MD_MASTER_SECRET_CONST		"master secret"
-#define TLS_MD_MASTER_SECRET_CONST_SIZE		13
-
-#ifdef CHARSET_EBCDIC
-#undef TLS_MD_CLIENT_FINISH_CONST
-#define TLS_MD_CLIENT_FINISH_CONST    "\x63\x6c\x69\x65\x6e\x74\x20\x66\x69\x6e\x69\x73\x68\x65\x64"  /*client finished*/
-#undef TLS_MD_SERVER_FINISH_CONST
-#define TLS_MD_SERVER_FINISH_CONST    "\x73\x65\x72\x76\x65\x72\x20\x66\x69\x6e\x69\x73\x68\x65\x64"  /*server finished*/
-#undef TLS_MD_SERVER_WRITE_KEY_CONST
-#define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"  /*server write key*/
-#undef TLS_MD_KEY_EXPANSION_CONST
-#define TLS_MD_KEY_EXPANSION_CONST    "\x6b\x65\x79\x20\x65\x78\x70\x61\x6e\x73\x69\x6f\x6e"  /*key expansion*/
-#undef TLS_MD_CLIENT_WRITE_KEY_CONST
-#define TLS_MD_CLIENT_WRITE_KEY_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"  /*client write key*/
-#undef TLS_MD_SERVER_WRITE_KEY_CONST
-#define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"  /*server write key*/
-#undef TLS_MD_IV_BLOCK_CONST
-#define TLS_MD_IV_BLOCK_CONST         "\x49\x56\x20\x62\x6c\x6f\x63\x6b"  /*IV block*/
-#undef TLS_MD_MASTER_SECRET_CONST
-#define TLS_MD_MASTER_SECRET_CONST    "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"  /*master secret*/
-#endif
-
-/* TLS Session Ticket extension struct */
-struct tls_session_ticket_ext_st
-	{
-	unsigned short length;
-	void *data;
-	};
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/ts.h b/dep/include/openssl/ts.h
deleted file mode 100644
index 190e8a1bf..000000000
--- a/dep/include/openssl/ts.h
+++ /dev/null
@@ -1,861 +0,0 @@
-/* crypto/ts/ts.h */
-/* Written by Zoltan Glozik (zglozik@opentsa.org) for the OpenSSL
- * project 2002, 2003, 2004.
- */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_TS_H
-#define HEADER_TS_H
-
-#include <openssl/opensslconf.h>
-#include <openssl/symhacks.h>
-#ifndef OPENSSL_NO_BUFFER
-#include <openssl/buffer.h>
-#endif
-#ifndef OPENSSL_NO_EVP
-#include <openssl/evp.h>
-#endif
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#include <openssl/stack.h>
-#include <openssl/asn1.h>
-#include <openssl/safestack.h>
-
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
-
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
-
-#include <openssl/evp.h>
-
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef WIN32
-/* Under Win32 this is defined in wincrypt.h */
-#undef X509_NAME
-#endif
-
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-
-/*
-MessageImprint ::= SEQUENCE  {
-     hashAlgorithm                AlgorithmIdentifier,
-     hashedMessage                OCTET STRING  }
-*/
-
-typedef struct TS_msg_imprint_st
-	{
-	X509_ALGOR *hash_algo;
-	ASN1_OCTET_STRING *hashed_msg;
-	} TS_MSG_IMPRINT;
-
-/*
-TimeStampReq ::= SEQUENCE  {
-   version                  INTEGER  { v1(1) },
-   messageImprint           MessageImprint,
-     --a hash algorithm OID and the hash value of the data to be
-     --time-stamped
-   reqPolicy                TSAPolicyId                OPTIONAL,
-   nonce                    INTEGER                    OPTIONAL,
-   certReq                  BOOLEAN                    DEFAULT FALSE,
-   extensions               [0] IMPLICIT Extensions    OPTIONAL  }
-*/
-
-typedef struct TS_req_st
-	{
-	ASN1_INTEGER *version;
-	TS_MSG_IMPRINT *msg_imprint;
-	ASN1_OBJECT *policy_id;		/* OPTIONAL */
-	ASN1_INTEGER *nonce;		/* OPTIONAL */
-	ASN1_BOOLEAN cert_req;		/* DEFAULT FALSE */
-	STACK_OF(X509_EXTENSION) *extensions;	/* [0] OPTIONAL */
-	} TS_REQ;
-
-/*
-Accuracy ::= SEQUENCE {
-                seconds        INTEGER           OPTIONAL,
-                millis     [0] INTEGER  (1..999) OPTIONAL,
-                micros     [1] INTEGER  (1..999) OPTIONAL  }
-*/
-
-typedef struct TS_accuracy_st
-	{
-	ASN1_INTEGER *seconds;
-	ASN1_INTEGER *millis;
-	ASN1_INTEGER *micros;
-	} TS_ACCURACY;
-
-/*
-TSTInfo ::= SEQUENCE  {
-    version                      INTEGER  { v1(1) },
-    policy                       TSAPolicyId,
-    messageImprint               MessageImprint,
-      -- MUST have the same value as the similar field in
-      -- TimeStampReq
-    serialNumber                 INTEGER,
-     -- Time-Stamping users MUST be ready to accommodate integers
-     -- up to 160 bits.
-    genTime                      GeneralizedTime,
-    accuracy                     Accuracy                 OPTIONAL,
-    ordering                     BOOLEAN             DEFAULT FALSE,
-    nonce                        INTEGER                  OPTIONAL,
-      -- MUST be present if the similar field was present
-      -- in TimeStampReq.  In that case it MUST have the same value.
-    tsa                          [0] GeneralName          OPTIONAL,
-    extensions                   [1] IMPLICIT Extensions  OPTIONAL   }
-*/
-
-typedef struct TS_tst_info_st
-	{
-	ASN1_INTEGER *version;
-	ASN1_OBJECT *policy_id;
-	TS_MSG_IMPRINT *msg_imprint;
-	ASN1_INTEGER *serial;
-	ASN1_GENERALIZEDTIME *time;
-	TS_ACCURACY *accuracy;
-	ASN1_BOOLEAN ordering;
-	ASN1_INTEGER *nonce;
-	GENERAL_NAME *tsa;
-	STACK_OF(X509_EXTENSION) *extensions;
-	} TS_TST_INFO;	
-
-/*
-PKIStatusInfo ::= SEQUENCE {
-    status        PKIStatus,
-    statusString  PKIFreeText     OPTIONAL,
-    failInfo      PKIFailureInfo  OPTIONAL  }
-
-From RFC 1510 - section 3.1.1:
-PKIFreeText ::= SEQUENCE SIZE (1..MAX) OF UTF8String
-	-- text encoded as UTF-8 String (note:  each UTF8String SHOULD
-	-- include an RFC 1766 language tag to indicate the language
-	-- of the contained text)
-*/
-
-/* Possible values for status. See ts_resp_print.c && ts_resp_verify.c. */
-
-#define	TS_STATUS_GRANTED			0
-#define	TS_STATUS_GRANTED_WITH_MODS		1
-#define	TS_STATUS_REJECTION			2
-#define	TS_STATUS_WAITING			3
-#define	TS_STATUS_REVOCATION_WARNING		4
-#define	TS_STATUS_REVOCATION_NOTIFICATION	5
-
-/* Possible values for failure_info. See ts_resp_print.c && ts_resp_verify.c */
-
-#define	TS_INFO_BAD_ALG			0
-#define	TS_INFO_BAD_REQUEST		2
-#define	TS_INFO_BAD_DATA_FORMAT		5
-#define	TS_INFO_TIME_NOT_AVAILABLE	14
-#define	TS_INFO_UNACCEPTED_POLICY	15
-#define	TS_INFO_UNACCEPTED_EXTENSION	16
-#define	TS_INFO_ADD_INFO_NOT_AVAILABLE	17
-#define	TS_INFO_SYSTEM_FAILURE		25
-
-typedef struct TS_status_info_st
-	{
-	ASN1_INTEGER *status;
-	STACK_OF(ASN1_UTF8STRING) *text;
-	ASN1_BIT_STRING *failure_info;
-	} TS_STATUS_INFO;
-
-DECLARE_STACK_OF(ASN1_UTF8STRING)
-DECLARE_ASN1_SET_OF(ASN1_UTF8STRING)
-
-/*
-TimeStampResp ::= SEQUENCE  {
-     status                  PKIStatusInfo,
-     timeStampToken          TimeStampToken     OPTIONAL }
-*/
-
-typedef struct TS_resp_st
-	{
-	TS_STATUS_INFO *status_info;
-	PKCS7 *token;
-	TS_TST_INFO *tst_info;
-	} TS_RESP;
-
-/* The structure below would belong to the ESS component. */
-
-/*
-IssuerSerial ::= SEQUENCE {
-	issuer                   GeneralNames,
-	serialNumber             CertificateSerialNumber
-	}
-*/
-
-typedef struct ESS_issuer_serial
-	{
-	STACK_OF(GENERAL_NAME)	*issuer;
-	ASN1_INTEGER		*serial;
-	} ESS_ISSUER_SERIAL;
-
-/*
-ESSCertID ::=  SEQUENCE {
-        certHash                 Hash,
-        issuerSerial             IssuerSerial OPTIONAL
-}
-*/
-
-typedef struct ESS_cert_id
-	{
-	ASN1_OCTET_STRING *hash;	/* Always SHA-1 digest. */
-	ESS_ISSUER_SERIAL *issuer_serial;
-	} ESS_CERT_ID;
-
-DECLARE_STACK_OF(ESS_CERT_ID)
-DECLARE_ASN1_SET_OF(ESS_CERT_ID)
-
-/*
-SigningCertificate ::=  SEQUENCE {
-       certs        SEQUENCE OF ESSCertID,
-       policies     SEQUENCE OF PolicyInformation OPTIONAL
-}
-*/
-
-typedef struct ESS_signing_cert
-	{
-	STACK_OF(ESS_CERT_ID) *cert_ids;
-	STACK_OF(POLICYINFO) *policy_info;
-	} ESS_SIGNING_CERT;
-
-
-TS_REQ	*TS_REQ_new(void);
-void	TS_REQ_free(TS_REQ *a);
-int	i2d_TS_REQ(const TS_REQ *a, unsigned char **pp);
-TS_REQ	*d2i_TS_REQ(TS_REQ **a, const unsigned char **pp, long length);
-
-TS_REQ	*TS_REQ_dup(TS_REQ *a);
-
-TS_REQ	*d2i_TS_REQ_fp(FILE *fp, TS_REQ **a);
-int	i2d_TS_REQ_fp(FILE *fp, TS_REQ *a);
-TS_REQ	*d2i_TS_REQ_bio(BIO *fp, TS_REQ **a);
-int	i2d_TS_REQ_bio(BIO *fp, TS_REQ *a);
-
-TS_MSG_IMPRINT	*TS_MSG_IMPRINT_new(void);
-void		TS_MSG_IMPRINT_free(TS_MSG_IMPRINT *a);
-int		i2d_TS_MSG_IMPRINT(const TS_MSG_IMPRINT *a, unsigned char **pp);
-TS_MSG_IMPRINT	*d2i_TS_MSG_IMPRINT(TS_MSG_IMPRINT **a,
-				    const unsigned char **pp, long length);
-
-TS_MSG_IMPRINT	*TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *a);
-
-TS_MSG_IMPRINT	*d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a);
-int		i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a);
-TS_MSG_IMPRINT	*d2i_TS_MSG_IMPRINT_bio(BIO *fp, TS_MSG_IMPRINT **a);
-int		i2d_TS_MSG_IMPRINT_bio(BIO *fp, TS_MSG_IMPRINT *a);
-
-TS_RESP	*TS_RESP_new(void);
-void	TS_RESP_free(TS_RESP *a);
-int	i2d_TS_RESP(const TS_RESP *a, unsigned char **pp);
-TS_RESP	*d2i_TS_RESP(TS_RESP **a, const unsigned char **pp, long length);
-TS_TST_INFO *PKCS7_to_TS_TST_INFO(PKCS7 *token);
-TS_RESP	*TS_RESP_dup(TS_RESP *a);
-
-TS_RESP	*d2i_TS_RESP_fp(FILE *fp, TS_RESP **a);
-int	i2d_TS_RESP_fp(FILE *fp, TS_RESP *a);
-TS_RESP	*d2i_TS_RESP_bio(BIO *fp, TS_RESP **a);
-int	i2d_TS_RESP_bio(BIO *fp, TS_RESP *a);
-
-TS_STATUS_INFO	*TS_STATUS_INFO_new(void);
-void		TS_STATUS_INFO_free(TS_STATUS_INFO *a);
-int		i2d_TS_STATUS_INFO(const TS_STATUS_INFO *a, unsigned char **pp);
-TS_STATUS_INFO	*d2i_TS_STATUS_INFO(TS_STATUS_INFO **a, 
-				    const unsigned char **pp, long length);
-TS_STATUS_INFO	*TS_STATUS_INFO_dup(TS_STATUS_INFO *a);
-
-TS_TST_INFO	*TS_TST_INFO_new(void);
-void		TS_TST_INFO_free(TS_TST_INFO *a);
-int		i2d_TS_TST_INFO(const TS_TST_INFO *a, unsigned char **pp);
-TS_TST_INFO	*d2i_TS_TST_INFO(TS_TST_INFO **a, const unsigned char **pp,
-				    long length);
-TS_TST_INFO	*TS_TST_INFO_dup(TS_TST_INFO *a);
-
-TS_TST_INFO	*d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a);
-int		i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a);
-TS_TST_INFO	*d2i_TS_TST_INFO_bio(BIO *fp, TS_TST_INFO **a);
-int		i2d_TS_TST_INFO_bio(BIO *fp, TS_TST_INFO *a);
-
-TS_ACCURACY	*TS_ACCURACY_new(void);
-void		TS_ACCURACY_free(TS_ACCURACY *a);
-int		i2d_TS_ACCURACY(const TS_ACCURACY *a, unsigned char **pp);
-TS_ACCURACY	*d2i_TS_ACCURACY(TS_ACCURACY **a, const unsigned char **pp,
-				    long length);
-TS_ACCURACY	*TS_ACCURACY_dup(TS_ACCURACY *a);
-
-ESS_ISSUER_SERIAL *ESS_ISSUER_SERIAL_new(void);
-void		  ESS_ISSUER_SERIAL_free(ESS_ISSUER_SERIAL *a);
-int		  i2d_ESS_ISSUER_SERIAL(const ESS_ISSUER_SERIAL *a,
-					unsigned char **pp);
-ESS_ISSUER_SERIAL *d2i_ESS_ISSUER_SERIAL(ESS_ISSUER_SERIAL **a,
-					 const unsigned char **pp, long length);
-ESS_ISSUER_SERIAL *ESS_ISSUER_SERIAL_dup(ESS_ISSUER_SERIAL *a);
-
-ESS_CERT_ID	*ESS_CERT_ID_new(void);
-void		ESS_CERT_ID_free(ESS_CERT_ID *a);
-int		i2d_ESS_CERT_ID(const ESS_CERT_ID *a, unsigned char **pp);
-ESS_CERT_ID	*d2i_ESS_CERT_ID(ESS_CERT_ID **a, const unsigned char **pp,
-				 long length);
-ESS_CERT_ID	*ESS_CERT_ID_dup(ESS_CERT_ID *a);
-
-ESS_SIGNING_CERT *ESS_SIGNING_CERT_new(void);
-void		 ESS_SIGNING_CERT_free(ESS_SIGNING_CERT *a);
-int		 i2d_ESS_SIGNING_CERT(const ESS_SIGNING_CERT *a, 
-				      unsigned char **pp);
-ESS_SIGNING_CERT *d2i_ESS_SIGNING_CERT(ESS_SIGNING_CERT **a,
-				       const unsigned char **pp, long length);
-ESS_SIGNING_CERT *ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *a);
-
-void ERR_load_TS_strings(void);
-
-int TS_REQ_set_version(TS_REQ *a, long version);
-long TS_REQ_get_version(const TS_REQ *a);
-
-int TS_REQ_set_msg_imprint(TS_REQ *a, TS_MSG_IMPRINT *msg_imprint);
-TS_MSG_IMPRINT *TS_REQ_get_msg_imprint(TS_REQ *a);
-
-int TS_MSG_IMPRINT_set_algo(TS_MSG_IMPRINT *a, X509_ALGOR *alg);
-X509_ALGOR *TS_MSG_IMPRINT_get_algo(TS_MSG_IMPRINT *a);
-
-int TS_MSG_IMPRINT_set_msg(TS_MSG_IMPRINT *a, unsigned char *d, int len);
-ASN1_OCTET_STRING *TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a);
-
-int TS_REQ_set_policy_id(TS_REQ *a, ASN1_OBJECT *policy);
-ASN1_OBJECT *TS_REQ_get_policy_id(TS_REQ *a);
-
-int TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce);
-const ASN1_INTEGER *TS_REQ_get_nonce(const TS_REQ *a);
-
-int TS_REQ_set_cert_req(TS_REQ *a, int cert_req);
-int TS_REQ_get_cert_req(const TS_REQ *a);
-
-STACK_OF(X509_EXTENSION) *TS_REQ_get_exts(TS_REQ *a);
-void TS_REQ_ext_free(TS_REQ *a);
-int TS_REQ_get_ext_count(TS_REQ *a);
-int TS_REQ_get_ext_by_NID(TS_REQ *a, int nid, int lastpos);
-int TS_REQ_get_ext_by_OBJ(TS_REQ *a, ASN1_OBJECT *obj, int lastpos);
-int TS_REQ_get_ext_by_critical(TS_REQ *a, int crit, int lastpos);
-X509_EXTENSION *TS_REQ_get_ext(TS_REQ *a, int loc);
-X509_EXTENSION *TS_REQ_delete_ext(TS_REQ *a, int loc);
-int TS_REQ_add_ext(TS_REQ *a, X509_EXTENSION *ex, int loc);
-void *TS_REQ_get_ext_d2i(TS_REQ *a, int nid, int *crit, int *idx);
-
-/* Function declarations for TS_REQ defined in ts/ts_req_print.c */
-
-int TS_REQ_print_bio(BIO *bio, TS_REQ *a);
-
-/* Function declarations for TS_RESP defined in ts/ts_resp_utils.c */
-
-int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *info);
-TS_STATUS_INFO *TS_RESP_get_status_info(TS_RESP *a);
-
-/* Caller loses ownership of PKCS7 and TS_TST_INFO objects. */
-void TS_RESP_set_tst_info(TS_RESP *a, PKCS7 *p7, TS_TST_INFO *tst_info);
-PKCS7 *TS_RESP_get_token(TS_RESP *a);
-TS_TST_INFO *TS_RESP_get_tst_info(TS_RESP *a);
-
-int TS_TST_INFO_set_version(TS_TST_INFO *a, long version);
-long TS_TST_INFO_get_version(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_policy_id(TS_TST_INFO *a, ASN1_OBJECT *policy_id);
-ASN1_OBJECT *TS_TST_INFO_get_policy_id(TS_TST_INFO *a);
-
-int TS_TST_INFO_set_msg_imprint(TS_TST_INFO *a, TS_MSG_IMPRINT *msg_imprint);
-TS_MSG_IMPRINT *TS_TST_INFO_get_msg_imprint(TS_TST_INFO *a);
-
-int TS_TST_INFO_set_serial(TS_TST_INFO *a, const ASN1_INTEGER *serial);
-const ASN1_INTEGER *TS_TST_INFO_get_serial(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime);
-const ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_accuracy(TS_TST_INFO *a, TS_ACCURACY *accuracy);
-TS_ACCURACY *TS_TST_INFO_get_accuracy(TS_TST_INFO *a);
-
-int TS_ACCURACY_set_seconds(TS_ACCURACY *a, const ASN1_INTEGER *seconds);
-const ASN1_INTEGER *TS_ACCURACY_get_seconds(const TS_ACCURACY *a);
-
-int TS_ACCURACY_set_millis(TS_ACCURACY *a, const ASN1_INTEGER *millis);
-const ASN1_INTEGER *TS_ACCURACY_get_millis(const TS_ACCURACY *a);
-
-int TS_ACCURACY_set_micros(TS_ACCURACY *a, const ASN1_INTEGER *micros);
-const ASN1_INTEGER *TS_ACCURACY_get_micros(const TS_ACCURACY *a);
-
-int TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering);
-int TS_TST_INFO_get_ordering(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_nonce(TS_TST_INFO *a, const ASN1_INTEGER *nonce);
-const ASN1_INTEGER *TS_TST_INFO_get_nonce(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_tsa(TS_TST_INFO *a, GENERAL_NAME *tsa);
-GENERAL_NAME *TS_TST_INFO_get_tsa(TS_TST_INFO *a);
-
-STACK_OF(X509_EXTENSION) *TS_TST_INFO_get_exts(TS_TST_INFO *a);
-void TS_TST_INFO_ext_free(TS_TST_INFO *a);
-int TS_TST_INFO_get_ext_count(TS_TST_INFO *a);
-int TS_TST_INFO_get_ext_by_NID(TS_TST_INFO *a, int nid, int lastpos);
-int TS_TST_INFO_get_ext_by_OBJ(TS_TST_INFO *a, ASN1_OBJECT *obj, int lastpos);
-int TS_TST_INFO_get_ext_by_critical(TS_TST_INFO *a, int crit, int lastpos);
-X509_EXTENSION *TS_TST_INFO_get_ext(TS_TST_INFO *a, int loc);
-X509_EXTENSION *TS_TST_INFO_delete_ext(TS_TST_INFO *a, int loc);
-int TS_TST_INFO_add_ext(TS_TST_INFO *a, X509_EXTENSION *ex, int loc);
-void *TS_TST_INFO_get_ext_d2i(TS_TST_INFO *a, int nid, int *crit, int *idx);
-
-/* Declarations related to response generation, defined in ts/ts_resp_sign.c. */
-
-/* Optional flags for response generation. */
-
-/* Don't include the TSA name in response. */
-#define	TS_TSA_NAME		0x01
-
-/* Set ordering to true in response. */
-#define	TS_ORDERING		0x02
-
-/*
- * Include the signer certificate and the other specified certificates in
- * the ESS signing certificate attribute beside the PKCS7 signed data.
- * Only the signer certificates is included by default.
- */
-#define	TS_ESS_CERT_ID_CHAIN	0x04
-
-/* Forward declaration. */
-struct TS_resp_ctx;
-
-/* This must return a unique number less than 160 bits long. */
-typedef ASN1_INTEGER *(*TS_serial_cb)(struct TS_resp_ctx *, void *);
-
-/* This must return the seconds and microseconds since Jan 1, 1970 in
-   the sec and usec variables allocated by the caller. 
-   Return non-zero for success and zero for failure. */
-typedef	int (*TS_time_cb)(struct TS_resp_ctx *, void *, long *sec, long *usec);
-
-/* This must process the given extension.
- * It can modify the TS_TST_INFO object of the context.
- * Return values: !0 (processed), 0 (error, it must set the 
- * status info/failure info of the response).
- */
-typedef	int (*TS_extension_cb)(struct TS_resp_ctx *, X509_EXTENSION *, void *);
-
-typedef struct TS_resp_ctx
-	{
-	X509		*signer_cert;
-	EVP_PKEY	*signer_key;
-	STACK_OF(X509)	*certs;	/* Certs to include in signed data. */
-	STACK_OF(ASN1_OBJECT)	*policies;	/* Acceptable policies. */
-	ASN1_OBJECT	*default_policy; /* It may appear in policies, too. */
-	STACK_OF(EVP_MD)	*mds;	/* Acceptable message digests. */
-	ASN1_INTEGER	*seconds;	/* accuracy, 0 means not specified. */
-	ASN1_INTEGER	*millis;	/* accuracy, 0 means not specified. */
-	ASN1_INTEGER	*micros;	/* accuracy, 0 means not specified. */
-	unsigned	clock_precision_digits; /* fraction of seconds in
-						   time stamp token. */
-	unsigned	flags;		/* Optional info, see values above. */
-
-	/* Callback functions. */
-	TS_serial_cb serial_cb;
-	void *serial_cb_data;	/* User data for serial_cb. */
-	
-	TS_time_cb time_cb;
-	void *time_cb_data;	/* User data for time_cb. */
-	
-	TS_extension_cb extension_cb;
-	void *extension_cb_data;	/* User data for extension_cb. */
-
-	/* These members are used only while creating the response. */
-	TS_REQ		*request;
-	TS_RESP		*response;
-	TS_TST_INFO	*tst_info;
-	} TS_RESP_CTX;
-
-DECLARE_STACK_OF(EVP_MD)
-DECLARE_ASN1_SET_OF(EVP_MD)
-
-/* Creates a response context that can be used for generating responses. */
-TS_RESP_CTX *TS_RESP_CTX_new(void);
-void TS_RESP_CTX_free(TS_RESP_CTX *ctx);
-
-/* This parameter must be set. */
-int TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer);
-
-/* This parameter must be set. */
-int TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key);
-
-/* This parameter must be set. */
-int TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *def_policy);
-
-/* No additional certs are included in the response by default. */
-int TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs);
-
-/* Adds a new acceptable policy, only the default policy 
-   is accepted by default. */
-int TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *policy);
-
-/* Adds a new acceptable message digest. Note that no message digests 
-   are accepted by default. The md argument is shared with the caller. */
-int TS_RESP_CTX_add_md(TS_RESP_CTX *ctx, const EVP_MD *md);
-
-/* Accuracy is not included by default. */
-int TS_RESP_CTX_set_accuracy(TS_RESP_CTX *ctx,
-			     int secs, int millis, int micros);
-
-/* Clock precision digits, i.e. the number of decimal digits: 
-   '0' means sec, '3' msec, '6' usec, and so on. Default is 0. */ 
-int TS_RESP_CTX_set_clock_precision_digits(TS_RESP_CTX *ctx,
-					   unsigned clock_precision_digits);
-/* At most we accept usec precision. */	
-#define TS_MAX_CLOCK_PRECISION_DIGITS	6
-
-/* No flags are set by default. */
-void TS_RESP_CTX_add_flags(TS_RESP_CTX *ctx, int flags);
-
-/* Default callback always returns a constant. */
-void TS_RESP_CTX_set_serial_cb(TS_RESP_CTX *ctx, TS_serial_cb cb, void *data);
-
-/* Default callback uses the gettimeofday() and gmtime() system calls. */
-void TS_RESP_CTX_set_time_cb(TS_RESP_CTX *ctx, TS_time_cb cb, void *data);
-
-/* Default callback rejects all extensions. The extension callback is called 
- * when the TS_TST_INFO object is already set up and not signed yet. */
-/* FIXME: extension handling is not tested yet. */
-void TS_RESP_CTX_set_extension_cb(TS_RESP_CTX *ctx, 
-				  TS_extension_cb cb, void *data);
-
-/* The following methods can be used in the callbacks. */
-int TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx, 
-				int status, const char *text);
-
-/* Sets the status info only if it is still TS_STATUS_GRANTED. */
-int TS_RESP_CTX_set_status_info_cond(TS_RESP_CTX *ctx, 
-				     int status, const char *text);
-
-int TS_RESP_CTX_add_failure_info(TS_RESP_CTX *ctx, int failure);
-
-/* The get methods below can be used in the extension callback. */
-TS_REQ *TS_RESP_CTX_get_request(TS_RESP_CTX *ctx);
-
-TS_TST_INFO *TS_RESP_CTX_get_tst_info(TS_RESP_CTX *ctx);
-
-/* 
- * Creates the signed TS_TST_INFO and puts it in TS_RESP.
- * In case of errors it sets the status info properly.
- * Returns NULL only in case of memory allocation/fatal error.
- */
-TS_RESP *TS_RESP_create_response(TS_RESP_CTX *ctx, BIO *req_bio);
-
-/*
- * Declarations related to response verification,
- * they are defined in ts/ts_resp_verify.c.
- */
-
-int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
-			     X509_STORE *store, X509 **signer_out);
-
-/* Context structure for the generic verify method. */
-
-/* Verify the signer's certificate and the signature of the response. */
-#define	TS_VFY_SIGNATURE	(1u << 0)
-/* Verify the version number of the response. */
-#define	TS_VFY_VERSION		(1u << 1)
-/* Verify if the policy supplied by the user matches the policy of the TSA. */
-#define	TS_VFY_POLICY		(1u << 2)
-/* Verify the message imprint provided by the user. This flag should not be
-   specified with TS_VFY_DATA. */
-#define	TS_VFY_IMPRINT		(1u << 3)
-/* Verify the message imprint computed by the verify method from the user
-   provided data and the MD algorithm of the response. This flag should not be
-   specified with TS_VFY_IMPRINT. */
-#define	TS_VFY_DATA		(1u << 4)
-/* Verify the nonce value. */
-#define	TS_VFY_NONCE		(1u << 5)
-/* Verify if the TSA name field matches the signer certificate. */
-#define	TS_VFY_SIGNER		(1u << 6)
-/* Verify if the TSA name field equals to the user provided name. */
-#define	TS_VFY_TSA_NAME		(1u << 7)
-
-/* You can use the following convenience constants. */
-#define	TS_VFY_ALL_IMPRINT	(TS_VFY_SIGNATURE	\
-				 | TS_VFY_VERSION	\
-				 | TS_VFY_POLICY	\
-				 | TS_VFY_IMPRINT	\
-				 | TS_VFY_NONCE		\
-				 | TS_VFY_SIGNER	\
-				 | TS_VFY_TSA_NAME)
-#define	TS_VFY_ALL_DATA		(TS_VFY_SIGNATURE	\
-				 | TS_VFY_VERSION	\
-				 | TS_VFY_POLICY	\
-				 | TS_VFY_DATA		\
-				 | TS_VFY_NONCE		\
-				 | TS_VFY_SIGNER	\
-				 | TS_VFY_TSA_NAME)
-
-typedef struct TS_verify_ctx
-	{
-	/* Set this to the union of TS_VFY_... flags you want to carry out. */
-	unsigned	flags;
-
-	/* Must be set only with TS_VFY_SIGNATURE. certs is optional. */
-	X509_STORE	*store;
-	STACK_OF(X509)	*certs;
-
-	/* Must be set only with TS_VFY_POLICY. */
-	ASN1_OBJECT	*policy;
-
-	/* Must be set only with TS_VFY_IMPRINT. If md_alg is NULL, 
-	   the algorithm from the response is used. */
-	X509_ALGOR	*md_alg;
-	unsigned char	*imprint;
-	unsigned	imprint_len;
-
-	/* Must be set only with TS_VFY_DATA. */
-	BIO		*data;
-
-	/* Must be set only with TS_VFY_TSA_NAME. */
-	ASN1_INTEGER	*nonce;
-
-	/* Must be set only with TS_VFY_TSA_NAME. */
-	GENERAL_NAME	*tsa_name;
-	} TS_VERIFY_CTX;
-
-int TS_RESP_verify_response(TS_VERIFY_CTX *ctx, TS_RESP *response);
-int TS_RESP_verify_token(TS_VERIFY_CTX *ctx, PKCS7 *token);
-
-/*
- * Declarations related to response verification context,
- * they are defined in ts/ts_verify_ctx.c.
- */
-
-/* Set all fields to zero. */
-TS_VERIFY_CTX *TS_VERIFY_CTX_new(void);
-void TS_VERIFY_CTX_init(TS_VERIFY_CTX *ctx);
-void TS_VERIFY_CTX_free(TS_VERIFY_CTX *ctx);
-void TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx);
-
-/* 
- * If ctx is NULL, it allocates and returns a new object, otherwise
- * it returns ctx. It initialises all the members as follows:
- * flags = TS_VFY_ALL_IMPRINT & ~(TS_VFY_TSA_NAME | TS_VFY_SIGNATURE)
- * certs = NULL
- * store = NULL
- * policy = policy from the request or NULL if absent (in this case
- *	TS_VFY_POLICY is cleared from flags as well)
- * md_alg = MD algorithm from request
- * imprint, imprint_len = imprint from request
- * data = NULL
- * nonce, nonce_len = nonce from the request or NULL if absent (in this case
- * 	TS_VFY_NONCE is cleared from flags as well)
- * tsa_name = NULL
- * Important: after calling this method TS_VFY_SIGNATURE should be added!
- */
-TS_VERIFY_CTX *TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx);
-
-/* Function declarations for TS_RESP defined in ts/ts_resp_print.c */
-
-int TS_RESP_print_bio(BIO *bio, TS_RESP *a);
-int TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a);
-int TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a);
-
-/* Common utility functions defined in ts/ts_lib.c */
-
-int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num);
-int TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj);
-int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions);
-int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg);
-int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *msg);
-
-/* Function declarations for handling configuration options,
-   defined in ts/ts_conf.c */
-
-X509 *TS_CONF_load_cert(const char *file);
-STACK_OF(X509) *TS_CONF_load_certs(const char *file);
-EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass);
-const char *TS_CONF_get_tsa_section(CONF *conf, const char *section);
-int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,
-		       TS_RESP_CTX *ctx);
-int TS_CONF_set_crypto_device(CONF *conf, const char *section,
-			      const char *device);
-int TS_CONF_set_default_engine(const char *name);
-int TS_CONF_set_signer_cert(CONF *conf, const char *section,
-			    const char *cert, TS_RESP_CTX *ctx);
-int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,
-		      TS_RESP_CTX *ctx);
-int TS_CONF_set_signer_key(CONF *conf, const char *section,
-			   const char *key, const char *pass, TS_RESP_CTX *ctx);
-int TS_CONF_set_def_policy(CONF *conf, const char *section,
-			   const char *policy, TS_RESP_CTX *ctx);
-int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_clock_precision_digits(CONF *conf, const char *section,
-				       TS_RESP_CTX *ctx);
-int TS_CONF_set_ordering(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_tsa_name(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section,
-				  TS_RESP_CTX *ctx);
-
-/* -------------------------------------------------- */
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_TS_strings(void);
-
-/* Error codes for the TS functions. */
-
-/* Function codes. */
-#define TS_F_D2I_TS_RESP				 147
-#define TS_F_DEF_SERIAL_CB				 110
-#define TS_F_DEF_TIME_CB				 111
-#define TS_F_ESS_ADD_SIGNING_CERT			 112
-#define TS_F_ESS_CERT_ID_NEW_INIT			 113
-#define TS_F_ESS_SIGNING_CERT_NEW_INIT			 114
-#define TS_F_INT_TS_RESP_VERIFY_TOKEN			 149
-#define TS_F_PKCS7_TO_TS_TST_INFO			 148
-#define TS_F_TS_ACCURACY_SET_MICROS			 115
-#define TS_F_TS_ACCURACY_SET_MILLIS			 116
-#define TS_F_TS_ACCURACY_SET_SECONDS			 117
-#define TS_F_TS_CHECK_IMPRINTS				 100
-#define TS_F_TS_CHECK_NONCES				 101
-#define TS_F_TS_CHECK_POLICY				 102
-#define TS_F_TS_CHECK_SIGNING_CERTS			 103
-#define TS_F_TS_CHECK_STATUS_INFO			 104
-#define TS_F_TS_COMPUTE_IMPRINT				 145
-#define TS_F_TS_CONF_SET_DEFAULT_ENGINE			 146
-#define TS_F_TS_GET_STATUS_TEXT				 105
-#define TS_F_TS_MSG_IMPRINT_SET_ALGO			 118
-#define TS_F_TS_REQ_SET_MSG_IMPRINT			 119
-#define TS_F_TS_REQ_SET_NONCE				 120
-#define TS_F_TS_REQ_SET_POLICY_ID			 121
-#define TS_F_TS_RESP_CREATE_RESPONSE			 122
-#define TS_F_TS_RESP_CREATE_TST_INFO			 123
-#define TS_F_TS_RESP_CTX_ADD_FAILURE_INFO		 124
-#define TS_F_TS_RESP_CTX_ADD_MD				 125
-#define TS_F_TS_RESP_CTX_ADD_POLICY			 126
-#define TS_F_TS_RESP_CTX_NEW				 127
-#define TS_F_TS_RESP_CTX_SET_ACCURACY			 128
-#define TS_F_TS_RESP_CTX_SET_CERTS			 129
-#define TS_F_TS_RESP_CTX_SET_DEF_POLICY			 130
-#define TS_F_TS_RESP_CTX_SET_SIGNER_CERT		 131
-#define TS_F_TS_RESP_CTX_SET_STATUS_INFO		 132
-#define TS_F_TS_RESP_GET_POLICY				 133
-#define TS_F_TS_RESP_SET_GENTIME_WITH_PRECISION		 134
-#define TS_F_TS_RESP_SET_STATUS_INFO			 135
-#define TS_F_TS_RESP_SET_TST_INFO			 150
-#define TS_F_TS_RESP_SIGN				 136
-#define TS_F_TS_RESP_VERIFY_SIGNATURE			 106
-#define TS_F_TS_RESP_VERIFY_TOKEN			 107
-#define TS_F_TS_TST_INFO_SET_ACCURACY			 137
-#define TS_F_TS_TST_INFO_SET_MSG_IMPRINT		 138
-#define TS_F_TS_TST_INFO_SET_NONCE			 139
-#define TS_F_TS_TST_INFO_SET_POLICY_ID			 140
-#define TS_F_TS_TST_INFO_SET_SERIAL			 141
-#define TS_F_TS_TST_INFO_SET_TIME			 142
-#define TS_F_TS_TST_INFO_SET_TSA			 143
-#define TS_F_TS_VERIFY					 108
-#define TS_F_TS_VERIFY_CERT				 109
-#define TS_F_TS_VERIFY_CTX_NEW				 144
-
-/* Reason codes. */
-#define TS_R_BAD_PKCS7_TYPE				 132
-#define TS_R_BAD_TYPE					 133
-#define TS_R_CERTIFICATE_VERIFY_ERROR			 100
-#define TS_R_COULD_NOT_SET_ENGINE			 127
-#define TS_R_COULD_NOT_SET_TIME				 115
-#define TS_R_D2I_TS_RESP_INT_FAILED			 128
-#define TS_R_DETACHED_CONTENT				 134
-#define TS_R_ESS_ADD_SIGNING_CERT_ERROR			 116
-#define TS_R_ESS_SIGNING_CERTIFICATE_ERROR		 101
-#define TS_R_INVALID_NULL_POINTER			 102
-#define TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE		 117
-#define TS_R_MESSAGE_IMPRINT_MISMATCH			 103
-#define TS_R_NONCE_MISMATCH				 104
-#define TS_R_NONCE_NOT_RETURNED				 105
-#define TS_R_NO_CONTENT					 106
-#define TS_R_NO_TIME_STAMP_TOKEN			 107
-#define TS_R_PKCS7_ADD_SIGNATURE_ERROR			 118
-#define TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR		 119
-#define TS_R_PKCS7_TO_TS_TST_INFO_FAILED		 129
-#define TS_R_POLICY_MISMATCH				 108
-#define TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE	 120
-#define TS_R_RESPONSE_SETUP_ERROR			 121
-#define TS_R_SIGNATURE_FAILURE				 109
-#define TS_R_THERE_MUST_BE_ONE_SIGNER			 110
-#define TS_R_TIME_SYSCALL_ERROR				 122
-#define TS_R_TOKEN_NOT_PRESENT				 130
-#define TS_R_TOKEN_PRESENT				 131
-#define TS_R_TSA_NAME_MISMATCH				 111
-#define TS_R_TSA_UNTRUSTED				 112
-#define TS_R_TST_INFO_SETUP_ERROR			 123
-#define TS_R_TS_DATASIGN				 124
-#define TS_R_UNACCEPTABLE_POLICY			 125
-#define TS_R_UNSUPPORTED_MD_ALGORITHM			 126
-#define TS_R_UNSUPPORTED_VERSION			 113
-#define TS_R_WRONG_CONTENT_TYPE				 114
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/txt_db.h b/dep/include/openssl/txt_db.h
deleted file mode 100644
index 6abe435bc..000000000
--- a/dep/include/openssl/txt_db.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* crypto/txt_db/txt_db.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_TXT_DB_H
-#define HEADER_TXT_DB_H
-
-#include <openssl/opensslconf.h>
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#include <openssl/stack.h>
-#include <openssl/lhash.h>
-
-#define DB_ERROR_OK			0
-#define DB_ERROR_MALLOC			1
-#define DB_ERROR_INDEX_CLASH    	2
-#define DB_ERROR_INDEX_OUT_OF_RANGE	3
-#define DB_ERROR_NO_INDEX		4
-#define DB_ERROR_INSERT_INDEX_CLASH    	5
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef OPENSSL_STRING *OPENSSL_PSTRING;
-DECLARE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING)
-
-typedef struct txt_db_st
-	{
-	int num_fields;
-	STACK_OF(OPENSSL_PSTRING) *data;
-	LHASH_OF(OPENSSL_STRING) **index;
-	int (**qual)(OPENSSL_STRING *);
-	long error;
-	long arg1;
-	long arg2;
-	OPENSSL_STRING *arg_row;
-	} TXT_DB;
-
-#ifndef OPENSSL_NO_BIO
-TXT_DB *TXT_DB_read(BIO *in, int num);
-long TXT_DB_write(BIO *out, TXT_DB *db);
-#else
-TXT_DB *TXT_DB_read(char *in, int num);
-long TXT_DB_write(char *out, TXT_DB *db);
-#endif
-int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(OPENSSL_STRING *),
-			LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp);
-void TXT_DB_free(TXT_DB *db);
-OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value);
-int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *value);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/ui.h b/dep/include/openssl/ui.h
deleted file mode 100644
index 2b1cfa228..000000000
--- a/dep/include/openssl/ui.h
+++ /dev/null
@@ -1,383 +0,0 @@
-/* crypto/ui/ui.h -*- mode:C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
- * project 2001.
- */
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_UI_H
-#define HEADER_UI_H
-
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/crypto.h>
-#endif
-#include <openssl/safestack.h>
-#include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Declared already in ossl_typ.h */
-/* typedef struct ui_st UI; */
-/* typedef struct ui_method_st UI_METHOD; */
-
-
-/* All the following functions return -1 or NULL on error and in some cases
-   (UI_process()) -2 if interrupted or in some other way cancelled.
-   When everything is fine, they return 0, a positive value or a non-NULL
-   pointer, all depending on their purpose. */
-
-/* Creators and destructor.   */
-UI *UI_new(void);
-UI *UI_new_method(const UI_METHOD *method);
-void UI_free(UI *ui);
-
-/* The following functions are used to add strings to be printed and prompt
-   strings to prompt for data.  The names are UI_{add,dup}_<function>_string
-   and UI_{add,dup}_input_boolean.
-
-   UI_{add,dup}_<function>_string have the following meanings:
-	add	add a text or prompt string.  The pointers given to these
-		functions are used verbatim, no copying is done.
-	dup	make a copy of the text or prompt string, then add the copy
-		to the collection of strings in the user interface.
-	<function>
-		The function is a name for the functionality that the given
-		string shall be used for.  It can be one of:
-			input	use the string as data prompt.
-			verify	use the string as verification prompt.  This
-				is used to verify a previous input.
-			info	use the string for informational output.
-			error	use the string for error output.
-   Honestly, there's currently no difference between info and error for the
-   moment.
-
-   UI_{add,dup}_input_boolean have the same semantics for "add" and "dup",
-   and are typically used when one wants to prompt for a yes/no response.
-
-
-   All of the functions in this group take a UI and a prompt string.
-   The string input and verify addition functions also take a flag argument,
-   a buffer for the result to end up with, a minimum input size and a maximum
-   input size (the result buffer MUST be large enough to be able to contain
-   the maximum number of characters).  Additionally, the verify addition
-   functions takes another buffer to compare the result against.
-   The boolean input functions take an action description string (which should
-   be safe to ignore if the expected user action is obvious, for example with
-   a dialog box with an OK button and a Cancel button), a string of acceptable
-   characters to mean OK and to mean Cancel.  The two last strings are checked
-   to make sure they don't have common characters.  Additionally, the same
-   flag argument as for the string input is taken, as well as a result buffer.
-   The result buffer is required to be at least one byte long.  Depending on
-   the answer, the first character from the OK or the Cancel character strings
-   will be stored in the first byte of the result buffer.  No NUL will be
-   added, so the result is *not* a string.
-
-   On success, the all return an index of the added information.  That index
-   is usefull when retrieving results with UI_get0_result(). */
-int UI_add_input_string(UI *ui, const char *prompt, int flags,
-	char *result_buf, int minsize, int maxsize);
-int UI_dup_input_string(UI *ui, const char *prompt, int flags,
-	char *result_buf, int minsize, int maxsize);
-int UI_add_verify_string(UI *ui, const char *prompt, int flags,
-	char *result_buf, int minsize, int maxsize, const char *test_buf);
-int UI_dup_verify_string(UI *ui, const char *prompt, int flags,
-	char *result_buf, int minsize, int maxsize, const char *test_buf);
-int UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc,
-	const char *ok_chars, const char *cancel_chars,
-	int flags, char *result_buf);
-int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
-	const char *ok_chars, const char *cancel_chars,
-	int flags, char *result_buf);
-int UI_add_info_string(UI *ui, const char *text);
-int UI_dup_info_string(UI *ui, const char *text);
-int UI_add_error_string(UI *ui, const char *text);
-int UI_dup_error_string(UI *ui, const char *text);
-
-/* These are the possible flags.  They can be or'ed together. */
-/* Use to have echoing of input */
-#define UI_INPUT_FLAG_ECHO		0x01
-/* Use a default password.  Where that password is found is completely
-   up to the application, it might for example be in the user data set
-   with UI_add_user_data().  It is not recommended to have more than
-   one input in each UI being marked with this flag, or the application
-   might get confused. */
-#define UI_INPUT_FLAG_DEFAULT_PWD	0x02
-
-/* The user of these routines may want to define flags of their own.  The core
-   UI won't look at those, but will pass them on to the method routines.  They
-   must use higher bits so they don't get confused with the UI bits above.
-   UI_INPUT_FLAG_USER_BASE tells which is the lowest bit to use.  A good
-   example of use is this:
-
-	#define MY_UI_FLAG1	(0x01 << UI_INPUT_FLAG_USER_BASE)
-
-*/
-#define UI_INPUT_FLAG_USER_BASE	16
-
-
-/* The following function helps construct a prompt.  object_desc is a
-   textual short description of the object, for example "pass phrase",
-   and object_name is the name of the object (might be a card name or
-   a file name.
-   The returned string shall always be allocated on the heap with
-   OPENSSL_malloc(), and need to be free'd with OPENSSL_free().
-
-   If the ui_method doesn't contain a pointer to a user-defined prompt
-   constructor, a default string is built, looking like this:
-
-	"Enter {object_desc} for {object_name}:"
-
-   So, if object_desc has the value "pass phrase" and object_name has
-   the value "foo.key", the resulting string is:
-
-	"Enter pass phrase for foo.key:"
-*/
-char *UI_construct_prompt(UI *ui_method,
-	const char *object_desc, const char *object_name);
-
-
-/* The following function is used to store a pointer to user-specific data.
-   Any previous such pointer will be returned and replaced.
-
-   For callback purposes, this function makes a lot more sense than using
-   ex_data, since the latter requires that different parts of OpenSSL or
-   applications share the same ex_data index.
-
-   Note that the UI_OpenSSL() method completely ignores the user data.
-   Other methods may not, however.  */
-void *UI_add_user_data(UI *ui, void *user_data);
-/* We need a user data retrieving function as well.  */
-void *UI_get0_user_data(UI *ui);
-
-/* Return the result associated with a prompt given with the index i. */
-const char *UI_get0_result(UI *ui, int i);
-
-/* When all strings have been added, process the whole thing. */
-int UI_process(UI *ui);
-
-/* Give a user interface parametrised control commands.  This can be used to
-   send down an integer, a data pointer or a function pointer, as well as
-   be used to get information from a UI. */
-int UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f)(void));
-
-/* The commands */
-/* Use UI_CONTROL_PRINT_ERRORS with the value 1 to have UI_process print the
-   OpenSSL error stack before printing any info or added error messages and
-   before any prompting. */
-#define UI_CTRL_PRINT_ERRORS		1
-/* Check if a UI_process() is possible to do again with the same instance of
-   a user interface.  This makes UI_ctrl() return 1 if it is redoable, and 0
-   if not. */
-#define UI_CTRL_IS_REDOABLE		2
-
-
-/* Some methods may use extra data */
-#define UI_set_app_data(s,arg)         UI_set_ex_data(s,0,arg)
-#define UI_get_app_data(s)             UI_get_ex_data(s,0)
-int UI_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int UI_set_ex_data(UI *r,int idx,void *arg);
-void *UI_get_ex_data(UI *r, int idx);
-
-/* Use specific methods instead of the built-in one */
-void UI_set_default_method(const UI_METHOD *meth);
-const UI_METHOD *UI_get_default_method(void);
-const UI_METHOD *UI_get_method(UI *ui);
-const UI_METHOD *UI_set_method(UI *ui, const UI_METHOD *meth);
-
-/* The method with all the built-in thingies */
-UI_METHOD *UI_OpenSSL(void);
-
-
-/* ---------- For method writers ---------- */
-/* A method contains a number of functions that implement the low level
-   of the User Interface.  The functions are:
-
-	an opener	This function starts a session, maybe by opening
-			a channel to a tty, or by opening a window.
-	a writer	This function is called to write a given string,
-			maybe to the tty, maybe as a field label in a
-			window.
-	a flusher	This function is called to flush everything that
-			has been output so far.  It can be used to actually
-			display a dialog box after it has been built.
-	a reader	This function is called to read a given prompt,
-			maybe from the tty, maybe from a field in a
-			window.  Note that it's called wth all string
-			structures, not only the prompt ones, so it must
-			check such things itself.
-	a closer	This function closes the session, maybe by closing
-			the channel to the tty, or closing the window.
-
-   All these functions are expected to return:
-
-	0	on error.
-	1	on success.
-	-1	on out-of-band events, for example if some prompting has
-		been canceled (by pressing Ctrl-C, for example).  This is
-		only checked when returned by the flusher or the reader.
-
-   The way this is used, the opener is first called, then the writer for all
-   strings, then the flusher, then the reader for all strings and finally the
-   closer.  Note that if you want to prompt from a terminal or other command
-   line interface, the best is to have the reader also write the prompts
-   instead of having the writer do it.  If you want to prompt from a dialog
-   box, the writer can be used to build up the contents of the box, and the
-   flusher to actually display the box and run the event loop until all data
-   has been given, after which the reader only grabs the given data and puts
-   them back into the UI strings.
-
-   All method functions take a UI as argument.  Additionally, the writer and
-   the reader take a UI_STRING.
-*/
-
-/* The UI_STRING type is the data structure that contains all the needed info
-   about a string or a prompt, including test data for a verification prompt.
-*/
-typedef struct ui_string_st UI_STRING;
-DECLARE_STACK_OF(UI_STRING)
-
-/* The different types of strings that are currently supported.
-   This is only needed by method authors. */
-enum UI_string_types
-	{
-	UIT_NONE=0,
-	UIT_PROMPT,		/* Prompt for a string */
-	UIT_VERIFY,		/* Prompt for a string and verify */
-	UIT_BOOLEAN,		/* Prompt for a yes/no response */
-	UIT_INFO,		/* Send info to the user */
-	UIT_ERROR		/* Send an error message to the user */
-	};
-
-/* Create and manipulate methods */
-UI_METHOD *UI_create_method(char *name);
-void UI_destroy_method(UI_METHOD *ui_method);
-int UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui));
-int UI_method_set_writer(UI_METHOD *method, int (*writer)(UI *ui, UI_STRING *uis));
-int UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui));
-int UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis));
-int UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui));
-int UI_method_set_prompt_constructor(UI_METHOD *method, char *(*prompt_constructor)(UI* ui, const char* object_desc, const char* object_name));
-int (*UI_method_get_opener(UI_METHOD *method))(UI*);
-int (*UI_method_get_writer(UI_METHOD *method))(UI*,UI_STRING*);
-int (*UI_method_get_flusher(UI_METHOD *method))(UI*);
-int (*UI_method_get_reader(UI_METHOD *method))(UI*,UI_STRING*);
-int (*UI_method_get_closer(UI_METHOD *method))(UI*);
-char* (*UI_method_get_prompt_constructor(UI_METHOD *method))(UI*, const char*, const char*);
-
-/* The following functions are helpers for method writers to access relevant
-   data from a UI_STRING. */
-
-/* Return type of the UI_STRING */
-enum UI_string_types UI_get_string_type(UI_STRING *uis);
-/* Return input flags of the UI_STRING */
-int UI_get_input_flags(UI_STRING *uis);
-/* Return the actual string to output (the prompt, info or error) */
-const char *UI_get0_output_string(UI_STRING *uis);
-/* Return the optional action string to output (the boolean promtp instruction) */
-const char *UI_get0_action_string(UI_STRING *uis);
-/* Return the result of a prompt */
-const char *UI_get0_result_string(UI_STRING *uis);
-/* Return the string to test the result against.  Only useful with verifies. */
-const char *UI_get0_test_string(UI_STRING *uis);
-/* Return the required minimum size of the result */
-int UI_get_result_minsize(UI_STRING *uis);
-/* Return the required maximum size of the result */
-int UI_get_result_maxsize(UI_STRING *uis);
-/* Set the result of a UI_STRING. */
-int UI_set_result(UI *ui, UI_STRING *uis, const char *result);
-
-
-/* A couple of popular utility functions */
-int UI_UTIL_read_pw_string(char *buf,int length,const char *prompt,int verify);
-int UI_UTIL_read_pw(char *buf,char *buff,int size,const char *prompt,int verify);
-
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_UI_strings(void);
-
-/* Error codes for the UI functions. */
-
-/* Function codes. */
-#define UI_F_GENERAL_ALLOCATE_BOOLEAN			 108
-#define UI_F_GENERAL_ALLOCATE_PROMPT			 109
-#define UI_F_GENERAL_ALLOCATE_STRING			 100
-#define UI_F_UI_CTRL					 111
-#define UI_F_UI_DUP_ERROR_STRING			 101
-#define UI_F_UI_DUP_INFO_STRING				 102
-#define UI_F_UI_DUP_INPUT_BOOLEAN			 110
-#define UI_F_UI_DUP_INPUT_STRING			 103
-#define UI_F_UI_DUP_VERIFY_STRING			 106
-#define UI_F_UI_GET0_RESULT				 107
-#define UI_F_UI_NEW_METHOD				 104
-#define UI_F_UI_SET_RESULT				 105
-
-/* Reason codes. */
-#define UI_R_COMMON_OK_AND_CANCEL_CHARACTERS		 104
-#define UI_R_INDEX_TOO_LARGE				 102
-#define UI_R_INDEX_TOO_SMALL				 103
-#define UI_R_NO_RESULT_BUFFER				 105
-#define UI_R_RESULT_TOO_LARGE				 100
-#define UI_R_RESULT_TOO_SMALL				 101
-#define UI_R_UNKNOWN_CONTROL_COMMAND			 106
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/ui_compat.h b/dep/include/openssl/ui_compat.h
deleted file mode 100644
index b35c9bb7f..000000000
--- a/dep/include/openssl/ui_compat.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* crypto/ui/ui.h -*- mode:C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
- * project 2001.
- */
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_UI_COMPAT_H
-#define HEADER_UI_COMPAT_H
-
-#include <openssl/opensslconf.h>
-#include <openssl/ui.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* The following functions were previously part of the DES section,
-   and are provided here for backward compatibility reasons. */
-
-#define des_read_pw_string(b,l,p,v) \
-	_ossl_old_des_read_pw_string((b),(l),(p),(v))
-#define des_read_pw(b,bf,s,p,v) \
-	_ossl_old_des_read_pw((b),(bf),(s),(p),(v))
-
-int _ossl_old_des_read_pw_string(char *buf,int length,const char *prompt,int verify);
-int _ossl_old_des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/whrlpool.h b/dep/include/openssl/whrlpool.h
deleted file mode 100644
index 03c91da11..000000000
--- a/dep/include/openssl/whrlpool.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef HEADER_WHRLPOOL_H
-#define HEADER_WHRLPOOL_H
-
-#include <openssl/e_os2.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define WHIRLPOOL_DIGEST_LENGTH	(512/8)
-#define WHIRLPOOL_BBLOCK	512
-#define WHIRLPOOL_COUNTER	(256/8)
-
-typedef struct	{
-	union	{
-		unsigned char	c[WHIRLPOOL_DIGEST_LENGTH];
-		/* double q is here to ensure 64-bit alignment */
-		double		q[WHIRLPOOL_DIGEST_LENGTH/sizeof(double)];
-		}	H;
-	unsigned char	data[WHIRLPOOL_BBLOCK/8];
-	unsigned int	bitoff;
-	size_t		bitlen[WHIRLPOOL_COUNTER/sizeof(size_t)];
-	} WHIRLPOOL_CTX;
-
-#ifndef OPENSSL_NO_WHIRLPOOL
-int WHIRLPOOL_Init	(WHIRLPOOL_CTX *c);
-int WHIRLPOOL_Update	(WHIRLPOOL_CTX *c,const void *inp,size_t bytes);
-void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c,const void *inp,size_t bits);
-int WHIRLPOOL_Final	(unsigned char *md,WHIRLPOOL_CTX *c);
-unsigned char *WHIRLPOOL(const void *inp,size_t bytes,unsigned char *md);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/dep/include/openssl/x509.h b/dep/include/openssl/x509.h
deleted file mode 100644
index e6f8a4039..000000000
--- a/dep/include/openssl/x509.h
+++ /dev/null
@@ -1,1286 +0,0 @@
-/* crypto/x509/x509.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_X509_H
-#define HEADER_X509_H
-
-#include <openssl/e_os2.h>
-#include <openssl/symhacks.h>
-#ifndef OPENSSL_NO_BUFFER
-#include <openssl/buffer.h>
-#endif
-#ifndef OPENSSL_NO_EVP
-#include <openssl/evp.h>
-#endif
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#include <openssl/stack.h>
-#include <openssl/asn1.h>
-#include <openssl/safestack.h>
-
-#ifndef OPENSSL_NO_EC
-#include <openssl/ec.h>
-#endif
-
-#ifndef OPENSSL_NO_ECDSA
-#include <openssl/ecdsa.h>
-#endif
-
-#ifndef OPENSSL_NO_ECDH
-#include <openssl/ecdh.h>
-#endif
-
-#ifndef OPENSSL_NO_DEPRECATED
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
-#endif
-
-#ifndef OPENSSL_NO_SHA
-#include <openssl/sha.h>
-#endif
-#include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef OPENSSL_SYS_WIN32
-/* Under Win32 these are defined in wincrypt.h */
-#undef X509_NAME
-#undef X509_CERT_PAIR
-#undef X509_EXTENSIONS
-#endif
-
-#define X509_FILETYPE_PEM	1
-#define X509_FILETYPE_ASN1	2
-#define X509_FILETYPE_DEFAULT	3
-
-#define X509v3_KU_DIGITAL_SIGNATURE	0x0080
-#define X509v3_KU_NON_REPUDIATION	0x0040
-#define X509v3_KU_KEY_ENCIPHERMENT	0x0020
-#define X509v3_KU_DATA_ENCIPHERMENT	0x0010
-#define X509v3_KU_KEY_AGREEMENT		0x0008
-#define X509v3_KU_KEY_CERT_SIGN		0x0004
-#define X509v3_KU_CRL_SIGN		0x0002
-#define X509v3_KU_ENCIPHER_ONLY		0x0001
-#define X509v3_KU_DECIPHER_ONLY		0x8000
-#define X509v3_KU_UNDEF			0xffff
-
-typedef struct X509_objects_st
-	{
-	int nid;
-	int (*a2i)(void);
-	int (*i2a)(void);
-	} X509_OBJECTS;
-
-struct X509_algor_st
-	{
-	ASN1_OBJECT *algorithm;
-	ASN1_TYPE *parameter;
-	} /* X509_ALGOR */;
-
-DECLARE_ASN1_SET_OF(X509_ALGOR)
-
-typedef STACK_OF(X509_ALGOR) X509_ALGORS;
-
-typedef struct X509_val_st
-	{
-	ASN1_TIME *notBefore;
-	ASN1_TIME *notAfter;
-	} X509_VAL;
-
-struct X509_pubkey_st
-	{
-	X509_ALGOR *algor;
-	ASN1_BIT_STRING *public_key;
-	EVP_PKEY *pkey;
-	};
-
-typedef struct X509_sig_st
-	{
-	X509_ALGOR *algor;
-	ASN1_OCTET_STRING *digest;
-	} X509_SIG;
-
-typedef struct X509_name_entry_st
-	{
-	ASN1_OBJECT *object;
-	ASN1_STRING *value;
-	int set;
-	int size; 	/* temp variable */
-	} X509_NAME_ENTRY;
-
-DECLARE_STACK_OF(X509_NAME_ENTRY)
-DECLARE_ASN1_SET_OF(X509_NAME_ENTRY)
-
-/* we always keep X509_NAMEs in 2 forms. */
-struct X509_name_st
-	{
-	STACK_OF(X509_NAME_ENTRY) *entries;
-	int modified;	/* true if 'bytes' needs to be built */
-#ifndef OPENSSL_NO_BUFFER
-	BUF_MEM *bytes;
-#else
-	char *bytes;
-#endif
-/*	unsigned long hash; Keep the hash around for lookups */
-	unsigned char *canon_enc;
-	int canon_enclen;
-	} /* X509_NAME */;
-
-DECLARE_STACK_OF(X509_NAME)
-
-#define X509_EX_V_NETSCAPE_HACK		0x8000
-#define X509_EX_V_INIT			0x0001
-typedef struct X509_extension_st
-	{
-	ASN1_OBJECT *object;
-	ASN1_BOOLEAN critical;
-	ASN1_OCTET_STRING *value;
-	} X509_EXTENSION;
-
-typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
-
-DECLARE_STACK_OF(X509_EXTENSION)
-DECLARE_ASN1_SET_OF(X509_EXTENSION)
-
-/* a sequence of these are used */
-typedef struct x509_attributes_st
-	{
-	ASN1_OBJECT *object;
-	int single; /* 0 for a set, 1 for a single item (which is wrong) */
-	union	{
-		char		*ptr;
-/* 0 */		STACK_OF(ASN1_TYPE) *set;
-/* 1 */		ASN1_TYPE	*single;
-		} value;
-	} X509_ATTRIBUTE;
-
-DECLARE_STACK_OF(X509_ATTRIBUTE)
-DECLARE_ASN1_SET_OF(X509_ATTRIBUTE)
-
-
-typedef struct X509_req_info_st
-	{
-	ASN1_ENCODING enc;
-	ASN1_INTEGER *version;
-	X509_NAME *subject;
-	X509_PUBKEY *pubkey;
-	/*  d=2 hl=2 l=  0 cons: cont: 00 */
-	STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
-	} X509_REQ_INFO;
-
-typedef struct X509_req_st
-	{
-	X509_REQ_INFO *req_info;
-	X509_ALGOR *sig_alg;
-	ASN1_BIT_STRING *signature;
-	int references;
-	} X509_REQ;
-
-typedef struct x509_cinf_st
-	{
-	ASN1_INTEGER *version;		/* [ 0 ] default of v1 */
-	ASN1_INTEGER *serialNumber;
-	X509_ALGOR *signature;
-	X509_NAME *issuer;
-	X509_VAL *validity;
-	X509_NAME *subject;
-	X509_PUBKEY *key;
-	ASN1_BIT_STRING *issuerUID;		/* [ 1 ] optional in v2 */
-	ASN1_BIT_STRING *subjectUID;		/* [ 2 ] optional in v2 */
-	STACK_OF(X509_EXTENSION) *extensions;	/* [ 3 ] optional in v3 */
-	ASN1_ENCODING enc;
-	} X509_CINF;
-
-/* This stuff is certificate "auxiliary info"
- * it contains details which are useful in certificate
- * stores and databases. When used this is tagged onto
- * the end of the certificate itself
- */
-
-typedef struct x509_cert_aux_st
-	{
-	STACK_OF(ASN1_OBJECT) *trust;		/* trusted uses */
-	STACK_OF(ASN1_OBJECT) *reject;		/* rejected uses */
-	ASN1_UTF8STRING *alias;			/* "friendly name" */
-	ASN1_OCTET_STRING *keyid;		/* key id of private key */
-	STACK_OF(X509_ALGOR) *other;		/* other unspecified info */
-	} X509_CERT_AUX;
-
-struct x509_st
-	{
-	X509_CINF *cert_info;
-	X509_ALGOR *sig_alg;
-	ASN1_BIT_STRING *signature;
-	int valid;
-	int references;
-	char *name;
-	CRYPTO_EX_DATA ex_data;
-	/* These contain copies of various extension values */
-	long ex_pathlen;
-	long ex_pcpathlen;
-	unsigned long ex_flags;
-	unsigned long ex_kusage;
-	unsigned long ex_xkusage;
-	unsigned long ex_nscert;
-	ASN1_OCTET_STRING *skid;
-	AUTHORITY_KEYID *akid;
-	X509_POLICY_CACHE *policy_cache;
-	STACK_OF(DIST_POINT) *crldp;
-	STACK_OF(GENERAL_NAME) *altname;
-	NAME_CONSTRAINTS *nc;
-#ifndef OPENSSL_NO_RFC3779
-	STACK_OF(IPAddressFamily) *rfc3779_addr;
-	struct ASIdentifiers_st *rfc3779_asid;
-#endif
-#ifndef OPENSSL_NO_SHA
-	unsigned char sha1_hash[SHA_DIGEST_LENGTH];
-#endif
-	X509_CERT_AUX *aux;
-	} /* X509 */;
-
-DECLARE_STACK_OF(X509)
-DECLARE_ASN1_SET_OF(X509)
-
-/* This is used for a table of trust checking functions */
-
-typedef struct x509_trust_st {
-	int trust;
-	int flags;
-	int (*check_trust)(struct x509_trust_st *, X509 *, int);
-	char *name;
-	int arg1;
-	void *arg2;
-} X509_TRUST;
-
-DECLARE_STACK_OF(X509_TRUST)
-
-typedef struct x509_cert_pair_st {
-	X509 *forward;
-	X509 *reverse;
-} X509_CERT_PAIR;
-
-/* standard trust ids */
-
-#define X509_TRUST_DEFAULT	-1	/* Only valid in purpose settings */
-
-#define X509_TRUST_COMPAT	1
-#define X509_TRUST_SSL_CLIENT	2
-#define X509_TRUST_SSL_SERVER	3
-#define X509_TRUST_EMAIL	4
-#define X509_TRUST_OBJECT_SIGN	5
-#define X509_TRUST_OCSP_SIGN	6
-#define X509_TRUST_OCSP_REQUEST	7
-#define X509_TRUST_TSA		8
-
-/* Keep these up to date! */
-#define X509_TRUST_MIN		1
-#define X509_TRUST_MAX		8
-
-
-/* trust_flags values */
-#define	X509_TRUST_DYNAMIC 	1
-#define	X509_TRUST_DYNAMIC_NAME	2
-
-/* check_trust return codes */
-
-#define X509_TRUST_TRUSTED	1
-#define X509_TRUST_REJECTED	2
-#define X509_TRUST_UNTRUSTED	3
-
-/* Flags for X509_print_ex() */
-
-#define	X509_FLAG_COMPAT		0
-#define	X509_FLAG_NO_HEADER		1L
-#define	X509_FLAG_NO_VERSION		(1L << 1)
-#define	X509_FLAG_NO_SERIAL		(1L << 2)
-#define	X509_FLAG_NO_SIGNAME		(1L << 3)
-#define	X509_FLAG_NO_ISSUER		(1L << 4)
-#define	X509_FLAG_NO_VALIDITY		(1L << 5)
-#define	X509_FLAG_NO_SUBJECT		(1L << 6)
-#define	X509_FLAG_NO_PUBKEY		(1L << 7)
-#define	X509_FLAG_NO_EXTENSIONS		(1L << 8)
-#define	X509_FLAG_NO_SIGDUMP		(1L << 9)
-#define	X509_FLAG_NO_AUX		(1L << 10)
-#define	X509_FLAG_NO_ATTRIBUTES		(1L << 11)
-
-/* Flags specific to X509_NAME_print_ex() */	
-
-/* The field separator information */
-
-#define XN_FLAG_SEP_MASK	(0xf << 16)
-
-#define XN_FLAG_COMPAT		0		/* Traditional SSLeay: use old X509_NAME_print */
-#define XN_FLAG_SEP_COMMA_PLUS	(1 << 16)	/* RFC2253 ,+ */
-#define XN_FLAG_SEP_CPLUS_SPC	(2 << 16)	/* ,+ spaced: more readable */
-#define XN_FLAG_SEP_SPLUS_SPC	(3 << 16)	/* ;+ spaced */
-#define XN_FLAG_SEP_MULTILINE	(4 << 16)	/* One line per field */
-
-#define XN_FLAG_DN_REV		(1 << 20)	/* Reverse DN order */
-
-/* How the field name is shown */
-
-#define XN_FLAG_FN_MASK		(0x3 << 21)
-
-#define XN_FLAG_FN_SN		0		/* Object short name */
-#define XN_FLAG_FN_LN		(1 << 21)	/* Object long name */
-#define XN_FLAG_FN_OID		(2 << 21)	/* Always use OIDs */
-#define XN_FLAG_FN_NONE		(3 << 21)	/* No field names */
-
-#define XN_FLAG_SPC_EQ		(1 << 23)	/* Put spaces round '=' */
-
-/* This determines if we dump fields we don't recognise:
- * RFC2253 requires this.
- */
-
-#define XN_FLAG_DUMP_UNKNOWN_FIELDS (1 << 24)
-
-#define XN_FLAG_FN_ALIGN	(1 << 25)	/* Align field names to 20 characters */
-
-/* Complete set of RFC2253 flags */
-
-#define XN_FLAG_RFC2253 (ASN1_STRFLGS_RFC2253 | \
-			XN_FLAG_SEP_COMMA_PLUS | \
-			XN_FLAG_DN_REV | \
-			XN_FLAG_FN_SN | \
-			XN_FLAG_DUMP_UNKNOWN_FIELDS)
-
-/* readable oneline form */
-
-#define XN_FLAG_ONELINE (ASN1_STRFLGS_RFC2253 | \
-			ASN1_STRFLGS_ESC_QUOTE | \
-			XN_FLAG_SEP_CPLUS_SPC | \
-			XN_FLAG_SPC_EQ | \
-			XN_FLAG_FN_SN)
-
-/* readable multiline form */
-
-#define XN_FLAG_MULTILINE (ASN1_STRFLGS_ESC_CTRL | \
-			ASN1_STRFLGS_ESC_MSB | \
-			XN_FLAG_SEP_MULTILINE | \
-			XN_FLAG_SPC_EQ | \
-			XN_FLAG_FN_LN | \
-			XN_FLAG_FN_ALIGN)
-
-struct x509_revoked_st
-	{
-	ASN1_INTEGER *serialNumber;
-	ASN1_TIME *revocationDate;
-	STACK_OF(X509_EXTENSION) /* optional */ *extensions;
-	/* Set up if indirect CRL */
-	STACK_OF(GENERAL_NAME) *issuer;
-	/* Revocation reason */
-	int reason;
-	int sequence; /* load sequence */
-	};
-
-DECLARE_STACK_OF(X509_REVOKED)
-DECLARE_ASN1_SET_OF(X509_REVOKED)
-
-typedef struct X509_crl_info_st
-	{
-	ASN1_INTEGER *version;
-	X509_ALGOR *sig_alg;
-	X509_NAME *issuer;
-	ASN1_TIME *lastUpdate;
-	ASN1_TIME *nextUpdate;
-	STACK_OF(X509_REVOKED) *revoked;
-	STACK_OF(X509_EXTENSION) /* [0] */ *extensions;
-	ASN1_ENCODING enc;
-	} X509_CRL_INFO;
-
-struct X509_crl_st
-	{
-	/* actual signature */
-	X509_CRL_INFO *crl;
-	X509_ALGOR *sig_alg;
-	ASN1_BIT_STRING *signature;
-	int references;
-	int flags;
-	/* Copies of various extensions */
-	AUTHORITY_KEYID *akid;
-	ISSUING_DIST_POINT *idp;
-	/* Convenient breakdown of IDP */
-	int idp_flags;
-	int idp_reasons;
-	/* CRL and base CRL numbers for delta processing */
-	ASN1_INTEGER *crl_number;
-	ASN1_INTEGER *base_crl_number;
-#ifndef OPENSSL_NO_SHA
-	unsigned char sha1_hash[SHA_DIGEST_LENGTH];
-#endif
-	STACK_OF(GENERAL_NAMES) *issuers;
-	const X509_CRL_METHOD *meth;
-	void *meth_data;
-	} /* X509_CRL */;
-
-DECLARE_STACK_OF(X509_CRL)
-DECLARE_ASN1_SET_OF(X509_CRL)
-
-typedef struct private_key_st
-	{
-	int version;
-	/* The PKCS#8 data types */
-	X509_ALGOR *enc_algor;
-	ASN1_OCTET_STRING *enc_pkey;	/* encrypted pub key */
-
-	/* When decrypted, the following will not be NULL */
-	EVP_PKEY *dec_pkey;
-
-	/* used to encrypt and decrypt */
-	int key_length;
-	char *key_data;
-	int key_free;	/* true if we should auto free key_data */
-
-	/* expanded version of 'enc_algor' */
-	EVP_CIPHER_INFO cipher;
-
-	int references;
-	} X509_PKEY;
-
-#ifndef OPENSSL_NO_EVP
-typedef struct X509_info_st
-	{
-	X509 *x509;
-	X509_CRL *crl;
-	X509_PKEY *x_pkey;
-
-	EVP_CIPHER_INFO enc_cipher;
-	int enc_len;
-	char *enc_data;
-
-	int references;
-	} X509_INFO;
-
-DECLARE_STACK_OF(X509_INFO)
-#endif
-
-/* The next 2 structures and their 8 routines were sent to me by
- * Pat Richard <patr@x509.com> and are used to manipulate
- * Netscapes spki structures - useful if you are writing a CA web page
- */
-typedef struct Netscape_spkac_st
-	{
-	X509_PUBKEY *pubkey;
-	ASN1_IA5STRING *challenge;	/* challenge sent in atlas >= PR2 */
-	} NETSCAPE_SPKAC;
-
-typedef struct Netscape_spki_st
-	{
-	NETSCAPE_SPKAC *spkac;	/* signed public key and challenge */
-	X509_ALGOR *sig_algor;
-	ASN1_BIT_STRING *signature;
-	} NETSCAPE_SPKI;
-
-/* Netscape certificate sequence structure */
-typedef struct Netscape_certificate_sequence
-	{
-	ASN1_OBJECT *type;
-	STACK_OF(X509) *certs;
-	} NETSCAPE_CERT_SEQUENCE;
-
-/* Unused (and iv length is wrong)
-typedef struct CBCParameter_st
-	{
-	unsigned char iv[8];
-	} CBC_PARAM;
-*/
-
-/* Password based encryption structure */
-
-typedef struct PBEPARAM_st {
-ASN1_OCTET_STRING *salt;
-ASN1_INTEGER *iter;
-} PBEPARAM;
-
-/* Password based encryption V2 structures */
-
-typedef struct PBE2PARAM_st {
-X509_ALGOR *keyfunc;
-X509_ALGOR *encryption;
-} PBE2PARAM;
-
-typedef struct PBKDF2PARAM_st {
-ASN1_TYPE *salt;	/* Usually OCTET STRING but could be anything */
-ASN1_INTEGER *iter;
-ASN1_INTEGER *keylength;
-X509_ALGOR *prf;
-} PBKDF2PARAM;
-
-
-/* PKCS#8 private key info structure */
-
-struct pkcs8_priv_key_info_st
-        {
-        int broken;     /* Flag for various broken formats */
-#define PKCS8_OK		0
-#define PKCS8_NO_OCTET		1
-#define PKCS8_EMBEDDED_PARAM	2
-#define PKCS8_NS_DB		3
-#define PKCS8_NEG_PRIVKEY	4
-        ASN1_INTEGER *version;
-        X509_ALGOR *pkeyalg;
-        ASN1_TYPE *pkey; /* Should be OCTET STRING but some are broken */
-        STACK_OF(X509_ATTRIBUTE) *attributes;
-        };
-
-#ifdef  __cplusplus
-}
-#endif
-
-#include <openssl/x509_vfy.h>
-#include <openssl/pkcs7.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#define X509_EXT_PACK_UNKNOWN	1
-#define X509_EXT_PACK_STRING	2
-
-#define		X509_get_version(x) ASN1_INTEGER_get((x)->cert_info->version)
-/* #define	X509_get_serialNumber(x) ((x)->cert_info->serialNumber) */
-#define		X509_get_notBefore(x) ((x)->cert_info->validity->notBefore)
-#define		X509_get_notAfter(x) ((x)->cert_info->validity->notAfter)
-#define		X509_extract_key(x)	X509_get_pubkey(x) /*****/
-#define		X509_REQ_get_version(x) ASN1_INTEGER_get((x)->req_info->version)
-#define		X509_REQ_get_subject_name(x) ((x)->req_info->subject)
-#define		X509_REQ_extract_key(a)	X509_REQ_get_pubkey(a)
-#define		X509_name_cmp(a,b)	X509_NAME_cmp((a),(b))
-#define		X509_get_signature_type(x) EVP_PKEY_type(OBJ_obj2nid((x)->sig_alg->algorithm))
-
-#define		X509_CRL_get_version(x) ASN1_INTEGER_get((x)->crl->version)
-#define 	X509_CRL_get_lastUpdate(x) ((x)->crl->lastUpdate)
-#define 	X509_CRL_get_nextUpdate(x) ((x)->crl->nextUpdate)
-#define		X509_CRL_get_issuer(x) ((x)->crl->issuer)
-#define		X509_CRL_get_REVOKED(x) ((x)->crl->revoked)
-
-void X509_CRL_set_default_method(const X509_CRL_METHOD *meth);
-X509_CRL_METHOD *X509_CRL_METHOD_new(
-	int (*crl_init)(X509_CRL *crl),
-	int (*crl_free)(X509_CRL *crl),
-	int (*crl_lookup)(X509_CRL *crl, X509_REVOKED **ret,
-				ASN1_INTEGER *ser, X509_NAME *issuer),
-	int (*crl_verify)(X509_CRL *crl, EVP_PKEY *pk));
-void X509_CRL_METHOD_free(X509_CRL_METHOD *m);
-
-void X509_CRL_set_meth_data(X509_CRL *crl, void *dat);
-void *X509_CRL_get_meth_data(X509_CRL *crl);
-
-/* This one is only used so that a binary form can output, as in
- * i2d_X509_NAME(X509_get_X509_PUBKEY(x),&buf) */
-#define 	X509_get_X509_PUBKEY(x) ((x)->cert_info->key)
-
-
-const char *X509_verify_cert_error_string(long n);
-
-#ifndef OPENSSL_NO_EVP
-int X509_verify(X509 *a, EVP_PKEY *r);
-
-int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r);
-int X509_CRL_verify(X509_CRL *a, EVP_PKEY *r);
-int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r);
-
-NETSCAPE_SPKI * NETSCAPE_SPKI_b64_decode(const char *str, int len);
-char * NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *x);
-EVP_PKEY *NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *x);
-int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey);
-
-int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki);
-
-int X509_signature_print(BIO *bp,X509_ALGOR *alg, ASN1_STRING *sig);
-
-int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md);
-int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md);
-
-int X509_pubkey_digest(const X509 *data,const EVP_MD *type,
-		unsigned char *md, unsigned int *len);
-int X509_digest(const X509 *data,const EVP_MD *type,
-		unsigned char *md, unsigned int *len);
-int X509_CRL_digest(const X509_CRL *data,const EVP_MD *type,
-		unsigned char *md, unsigned int *len);
-int X509_REQ_digest(const X509_REQ *data,const EVP_MD *type,
-		unsigned char *md, unsigned int *len);
-int X509_NAME_digest(const X509_NAME *data,const EVP_MD *type,
-		unsigned char *md, unsigned int *len);
-#endif
-
-#ifndef OPENSSL_NO_FP_API
-X509 *d2i_X509_fp(FILE *fp, X509 **x509);
-int i2d_X509_fp(FILE *fp,X509 *x509);
-X509_CRL *d2i_X509_CRL_fp(FILE *fp,X509_CRL **crl);
-int i2d_X509_CRL_fp(FILE *fp,X509_CRL *crl);
-X509_REQ *d2i_X509_REQ_fp(FILE *fp,X509_REQ **req);
-int i2d_X509_REQ_fp(FILE *fp,X509_REQ *req);
-#ifndef OPENSSL_NO_RSA
-RSA *d2i_RSAPrivateKey_fp(FILE *fp,RSA **rsa);
-int i2d_RSAPrivateKey_fp(FILE *fp,RSA *rsa);
-RSA *d2i_RSAPublicKey_fp(FILE *fp,RSA **rsa);
-int i2d_RSAPublicKey_fp(FILE *fp,RSA *rsa);
-RSA *d2i_RSA_PUBKEY_fp(FILE *fp,RSA **rsa);
-int i2d_RSA_PUBKEY_fp(FILE *fp,RSA *rsa);
-#endif
-#ifndef OPENSSL_NO_DSA
-DSA *d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa);
-int i2d_DSA_PUBKEY_fp(FILE *fp, DSA *dsa);
-DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa);
-int i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa);
-#endif
-#ifndef OPENSSL_NO_EC
-EC_KEY *d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey);
-int   i2d_EC_PUBKEY_fp(FILE *fp, EC_KEY *eckey);
-EC_KEY *d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey);
-int   i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey);
-#endif
-X509_SIG *d2i_PKCS8_fp(FILE *fp,X509_SIG **p8);
-int i2d_PKCS8_fp(FILE *fp,X509_SIG *p8);
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,
-						PKCS8_PRIV_KEY_INFO **p8inf);
-int i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,PKCS8_PRIV_KEY_INFO *p8inf);
-int i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, EVP_PKEY *key);
-int i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a);
-int i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a);
-#endif
-
-#ifndef OPENSSL_NO_BIO
-X509 *d2i_X509_bio(BIO *bp,X509 **x509);
-int i2d_X509_bio(BIO *bp,X509 *x509);
-X509_CRL *d2i_X509_CRL_bio(BIO *bp,X509_CRL **crl);
-int i2d_X509_CRL_bio(BIO *bp,X509_CRL *crl);
-X509_REQ *d2i_X509_REQ_bio(BIO *bp,X509_REQ **req);
-int i2d_X509_REQ_bio(BIO *bp,X509_REQ *req);
-#ifndef OPENSSL_NO_RSA
-RSA *d2i_RSAPrivateKey_bio(BIO *bp,RSA **rsa);
-int i2d_RSAPrivateKey_bio(BIO *bp,RSA *rsa);
-RSA *d2i_RSAPublicKey_bio(BIO *bp,RSA **rsa);
-int i2d_RSAPublicKey_bio(BIO *bp,RSA *rsa);
-RSA *d2i_RSA_PUBKEY_bio(BIO *bp,RSA **rsa);
-int i2d_RSA_PUBKEY_bio(BIO *bp,RSA *rsa);
-#endif
-#ifndef OPENSSL_NO_DSA
-DSA *d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa);
-int i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa);
-DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa);
-int i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa);
-#endif
-#ifndef OPENSSL_NO_EC
-EC_KEY *d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey);
-int   i2d_EC_PUBKEY_bio(BIO *bp, EC_KEY *eckey);
-EC_KEY *d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey);
-int   i2d_ECPrivateKey_bio(BIO *bp, EC_KEY *eckey);
-#endif
-X509_SIG *d2i_PKCS8_bio(BIO *bp,X509_SIG **p8);
-int i2d_PKCS8_bio(BIO *bp,X509_SIG *p8);
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
-						PKCS8_PRIV_KEY_INFO **p8inf);
-int i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,PKCS8_PRIV_KEY_INFO *p8inf);
-int i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, EVP_PKEY *key);
-int i2d_PrivateKey_bio(BIO *bp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a);
-int i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a);
-#endif
-
-X509 *X509_dup(X509 *x509);
-X509_ATTRIBUTE *X509_ATTRIBUTE_dup(X509_ATTRIBUTE *xa);
-X509_EXTENSION *X509_EXTENSION_dup(X509_EXTENSION *ex);
-X509_CRL *X509_CRL_dup(X509_CRL *crl);
-X509_REQ *X509_REQ_dup(X509_REQ *req);
-X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn);
-int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval);
-void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval,
-						X509_ALGOR *algor);
-
-X509_NAME *X509_NAME_dup(X509_NAME *xn);
-X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);
-
-int		X509_cmp_time(const ASN1_TIME *s, time_t *t);
-int		X509_cmp_current_time(const ASN1_TIME *s);
-ASN1_TIME *	X509_time_adj(ASN1_TIME *s, long adj, time_t *t);
-ASN1_TIME *	X509_time_adj_ex(ASN1_TIME *s,
-				int offset_day, long offset_sec, time_t *t);
-ASN1_TIME *	X509_gmtime_adj(ASN1_TIME *s, long adj);
-
-const char *	X509_get_default_cert_area(void );
-const char *	X509_get_default_cert_dir(void );
-const char *	X509_get_default_cert_file(void );
-const char *	X509_get_default_cert_dir_env(void );
-const char *	X509_get_default_cert_file_env(void );
-const char *	X509_get_default_private_dir(void );
-
-X509_REQ *	X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
-X509 *		X509_REQ_to_X509(X509_REQ *r, int days,EVP_PKEY *pkey);
-
-DECLARE_ASN1_FUNCTIONS(X509_ALGOR)
-DECLARE_ASN1_ENCODE_FUNCTIONS(X509_ALGORS, X509_ALGORS, X509_ALGORS)
-DECLARE_ASN1_FUNCTIONS(X509_VAL)
-
-DECLARE_ASN1_FUNCTIONS(X509_PUBKEY)
-
-int		X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey);
-EVP_PKEY *	X509_PUBKEY_get(X509_PUBKEY *key);
-int		X509_get_pubkey_parameters(EVP_PKEY *pkey,
-					   STACK_OF(X509) *chain);
-int		i2d_PUBKEY(EVP_PKEY *a,unsigned char **pp);
-EVP_PKEY *	d2i_PUBKEY(EVP_PKEY **a,const unsigned char **pp,
-			long length);
-#ifndef OPENSSL_NO_RSA
-int		i2d_RSA_PUBKEY(RSA *a,unsigned char **pp);
-RSA *		d2i_RSA_PUBKEY(RSA **a,const unsigned char **pp,
-			long length);
-#endif
-#ifndef OPENSSL_NO_DSA
-int		i2d_DSA_PUBKEY(DSA *a,unsigned char **pp);
-DSA *		d2i_DSA_PUBKEY(DSA **a,const unsigned char **pp,
-			long length);
-#endif
-#ifndef OPENSSL_NO_EC
-int		i2d_EC_PUBKEY(EC_KEY *a, unsigned char **pp);
-EC_KEY 		*d2i_EC_PUBKEY(EC_KEY **a, const unsigned char **pp,
-			long length);
-#endif
-
-DECLARE_ASN1_FUNCTIONS(X509_SIG)
-DECLARE_ASN1_FUNCTIONS(X509_REQ_INFO)
-DECLARE_ASN1_FUNCTIONS(X509_REQ)
-
-DECLARE_ASN1_FUNCTIONS(X509_ATTRIBUTE)
-X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value);
-
-DECLARE_ASN1_FUNCTIONS(X509_EXTENSION)
-DECLARE_ASN1_ENCODE_FUNCTIONS(X509_EXTENSIONS, X509_EXTENSIONS, X509_EXTENSIONS)
-
-DECLARE_ASN1_FUNCTIONS(X509_NAME_ENTRY)
-
-DECLARE_ASN1_FUNCTIONS(X509_NAME)
-
-int		X509_NAME_set(X509_NAME **xn, X509_NAME *name);
-
-DECLARE_ASN1_FUNCTIONS(X509_CINF)
-
-DECLARE_ASN1_FUNCTIONS(X509)
-DECLARE_ASN1_FUNCTIONS(X509_CERT_AUX)
-
-DECLARE_ASN1_FUNCTIONS(X509_CERT_PAIR)
-
-int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	     CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int X509_set_ex_data(X509 *r, int idx, void *arg);
-void *X509_get_ex_data(X509 *r, int idx);
-int		i2d_X509_AUX(X509 *a,unsigned char **pp);
-X509 *		d2i_X509_AUX(X509 **a,const unsigned char **pp,long length);
-
-int X509_alias_set1(X509 *x, unsigned char *name, int len);
-int X509_keyid_set1(X509 *x, unsigned char *id, int len);
-unsigned char * X509_alias_get0(X509 *x, int *len);
-unsigned char * X509_keyid_get0(X509 *x, int *len);
-int (*X509_TRUST_set_default(int (*trust)(int , X509 *, int)))(int, X509 *, int);
-int X509_TRUST_set(int *t, int trust);
-int X509_add1_trust_object(X509 *x, ASN1_OBJECT *obj);
-int X509_add1_reject_object(X509 *x, ASN1_OBJECT *obj);
-void X509_trust_clear(X509 *x);
-void X509_reject_clear(X509 *x);
-
-DECLARE_ASN1_FUNCTIONS(X509_REVOKED)
-DECLARE_ASN1_FUNCTIONS(X509_CRL_INFO)
-DECLARE_ASN1_FUNCTIONS(X509_CRL)
-
-int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
-int X509_CRL_get0_by_serial(X509_CRL *crl,
-		X509_REVOKED **ret, ASN1_INTEGER *serial);
-int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x);
-
-X509_PKEY *	X509_PKEY_new(void );
-void		X509_PKEY_free(X509_PKEY *a);
-int		i2d_X509_PKEY(X509_PKEY *a,unsigned char **pp);
-X509_PKEY *	d2i_X509_PKEY(X509_PKEY **a,const unsigned char **pp,long length);
-
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKI)
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKAC)
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_CERT_SEQUENCE)
-
-#ifndef OPENSSL_NO_EVP
-X509_INFO *	X509_INFO_new(void);
-void		X509_INFO_free(X509_INFO *a);
-char *		X509_NAME_oneline(X509_NAME *a,char *buf,int size);
-
-int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *algor1,
-		ASN1_BIT_STRING *signature,char *data,EVP_PKEY *pkey);
-
-int ASN1_digest(i2d_of_void *i2d,const EVP_MD *type,char *data,
-		unsigned char *md,unsigned int *len);
-
-int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1,
-	      X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
-	      char *data,EVP_PKEY *pkey, const EVP_MD *type);
-
-int ASN1_item_digest(const ASN1_ITEM *it,const EVP_MD *type,void *data,
-	unsigned char *md,unsigned int *len);
-
-int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *algor1,
-	ASN1_BIT_STRING *signature,void *data,EVP_PKEY *pkey);
-
-int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
-	ASN1_BIT_STRING *signature,
-	void *data, EVP_PKEY *pkey, const EVP_MD *type);
-#endif
-
-int 		X509_set_version(X509 *x,long version);
-int 		X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial);
-ASN1_INTEGER *	X509_get_serialNumber(X509 *x);
-int 		X509_set_issuer_name(X509 *x, X509_NAME *name);
-X509_NAME *	X509_get_issuer_name(X509 *a);
-int 		X509_set_subject_name(X509 *x, X509_NAME *name);
-X509_NAME *	X509_get_subject_name(X509 *a);
-int 		X509_set_notBefore(X509 *x, const ASN1_TIME *tm);
-int 		X509_set_notAfter(X509 *x, const ASN1_TIME *tm);
-int 		X509_set_pubkey(X509 *x, EVP_PKEY *pkey);
-EVP_PKEY *	X509_get_pubkey(X509 *x);
-ASN1_BIT_STRING * X509_get0_pubkey_bitstr(const X509 *x);
-int		X509_certificate_type(X509 *x,EVP_PKEY *pubkey /* optional */);
-
-int		X509_REQ_set_version(X509_REQ *x,long version);
-int		X509_REQ_set_subject_name(X509_REQ *req,X509_NAME *name);
-int		X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey);
-EVP_PKEY *	X509_REQ_get_pubkey(X509_REQ *req);
-int		X509_REQ_extension_nid(int nid);
-int *		X509_REQ_get_extension_nids(void);
-void		X509_REQ_set_extension_nids(int *nids);
-STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req);
-int X509_REQ_add_extensions_nid(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts,
-				int nid);
-int X509_REQ_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts);
-int X509_REQ_get_attr_count(const X509_REQ *req);
-int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid,
-			  int lastpos);
-int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, ASN1_OBJECT *obj,
-			  int lastpos);
-X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc);
-X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc);
-int X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr);
-int X509_REQ_add1_attr_by_OBJ(X509_REQ *req,
-			const ASN1_OBJECT *obj, int type,
-			const unsigned char *bytes, int len);
-int X509_REQ_add1_attr_by_NID(X509_REQ *req,
-			int nid, int type,
-			const unsigned char *bytes, int len);
-int X509_REQ_add1_attr_by_txt(X509_REQ *req,
-			const char *attrname, int type,
-			const unsigned char *bytes, int len);
-
-int X509_CRL_set_version(X509_CRL *x, long version);
-int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
-int X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm);
-int X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm);
-int X509_CRL_sort(X509_CRL *crl);
-
-int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial);
-int X509_REVOKED_set_revocationDate(X509_REVOKED *r, ASN1_TIME *tm);
-
-int		X509_REQ_check_private_key(X509_REQ *x509,EVP_PKEY *pkey);
-
-int		X509_check_private_key(X509 *x509,EVP_PKEY *pkey);
-
-int		X509_issuer_and_serial_cmp(const X509 *a, const X509 *b);
-unsigned long	X509_issuer_and_serial_hash(X509 *a);
-
-int		X509_issuer_name_cmp(const X509 *a, const X509 *b);
-unsigned long	X509_issuer_name_hash(X509 *a);
-
-int		X509_subject_name_cmp(const X509 *a, const X509 *b);
-unsigned long	X509_subject_name_hash(X509 *x);
-
-#ifndef OPENSSL_NO_MD5
-unsigned long	X509_issuer_name_hash_old(X509 *a);
-unsigned long	X509_subject_name_hash_old(X509 *x);
-#endif
-
-int		X509_cmp(const X509 *a, const X509 *b);
-int		X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b);
-unsigned long	X509_NAME_hash(X509_NAME *x);
-unsigned long	X509_NAME_hash_old(X509_NAME *x);
-
-int		X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b);
-int		X509_CRL_match(const X509_CRL *a, const X509_CRL *b);
-#ifndef OPENSSL_NO_FP_API
-int		X509_print_ex_fp(FILE *bp,X509 *x, unsigned long nmflag, unsigned long cflag);
-int		X509_print_fp(FILE *bp,X509 *x);
-int		X509_CRL_print_fp(FILE *bp,X509_CRL *x);
-int		X509_REQ_print_fp(FILE *bp,X509_REQ *req);
-int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags);
-#endif
-
-#ifndef OPENSSL_NO_BIO
-int		X509_NAME_print(BIO *bp, X509_NAME *name, int obase);
-int X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent, unsigned long flags);
-int		X509_print_ex(BIO *bp,X509 *x, unsigned long nmflag, unsigned long cflag);
-int		X509_print(BIO *bp,X509 *x);
-int		X509_ocspid_print(BIO *bp,X509 *x);
-int		X509_CERT_AUX_print(BIO *bp,X509_CERT_AUX *x, int indent);
-int		X509_CRL_print(BIO *bp,X509_CRL *x);
-int		X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflag, unsigned long cflag);
-int		X509_REQ_print(BIO *bp,X509_REQ *req);
-#endif
-
-int 		X509_NAME_entry_count(X509_NAME *name);
-int 		X509_NAME_get_text_by_NID(X509_NAME *name, int nid,
-			char *buf,int len);
-int		X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
-			char *buf,int len);
-
-/* NOTE: you should be passsing -1, not 0 as lastpos.  The functions that use
- * lastpos, search after that position on. */
-int 		X509_NAME_get_index_by_NID(X509_NAME *name,int nid,int lastpos);
-int 		X509_NAME_get_index_by_OBJ(X509_NAME *name,ASN1_OBJECT *obj,
-			int lastpos);
-X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc);
-X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc);
-int 		X509_NAME_add_entry(X509_NAME *name,X509_NAME_ENTRY *ne,
-			int loc, int set);
-int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
-			unsigned char *bytes, int len, int loc, int set);
-int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
-			unsigned char *bytes, int len, int loc, int set);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
-		const char *field, int type, const unsigned char *bytes, int len);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
-			int type,unsigned char *bytes, int len);
-int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
-			const unsigned char *bytes, int len, int loc, int set);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
-			ASN1_OBJECT *obj, int type,const unsigned char *bytes,
-			int len);
-int 		X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne,
-			ASN1_OBJECT *obj);
-int 		X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
-			const unsigned char *bytes, int len);
-ASN1_OBJECT *	X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne);
-ASN1_STRING *	X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne);
-
-int		X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x);
-int		X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x,
-				      int nid, int lastpos);
-int		X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *x,
-				      ASN1_OBJECT *obj,int lastpos);
-int		X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *x,
-					   int crit, int lastpos);
-X509_EXTENSION *X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc);
-X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc);
-STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
-					 X509_EXTENSION *ex, int loc);
-
-int		X509_get_ext_count(X509 *x);
-int		X509_get_ext_by_NID(X509 *x, int nid, int lastpos);
-int		X509_get_ext_by_OBJ(X509 *x,ASN1_OBJECT *obj,int lastpos);
-int		X509_get_ext_by_critical(X509 *x, int crit, int lastpos);
-X509_EXTENSION *X509_get_ext(X509 *x, int loc);
-X509_EXTENSION *X509_delete_ext(X509 *x, int loc);
-int		X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc);
-void	*	X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx);
-int		X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,
-							unsigned long flags);
-
-int		X509_CRL_get_ext_count(X509_CRL *x);
-int		X509_CRL_get_ext_by_NID(X509_CRL *x, int nid, int lastpos);
-int		X509_CRL_get_ext_by_OBJ(X509_CRL *x,ASN1_OBJECT *obj,int lastpos);
-int		X509_CRL_get_ext_by_critical(X509_CRL *x, int crit, int lastpos);
-X509_EXTENSION *X509_CRL_get_ext(X509_CRL *x, int loc);
-X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc);
-int		X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc);
-void	*	X509_CRL_get_ext_d2i(X509_CRL *x, int nid, int *crit, int *idx);
-int		X509_CRL_add1_ext_i2d(X509_CRL *x, int nid, void *value, int crit,
-							unsigned long flags);
-
-int		X509_REVOKED_get_ext_count(X509_REVOKED *x);
-int		X509_REVOKED_get_ext_by_NID(X509_REVOKED *x, int nid, int lastpos);
-int		X509_REVOKED_get_ext_by_OBJ(X509_REVOKED *x,ASN1_OBJECT *obj,int lastpos);
-int		X509_REVOKED_get_ext_by_critical(X509_REVOKED *x, int crit, int lastpos);
-X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *x, int loc);
-X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *x, int loc);
-int		X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc);
-void	*	X509_REVOKED_get_ext_d2i(X509_REVOKED *x, int nid, int *crit, int *idx);
-int		X509_REVOKED_add1_ext_i2d(X509_REVOKED *x, int nid, void *value, int crit,
-							unsigned long flags);
-
-X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex,
-			int nid, int crit, ASN1_OCTET_STRING *data);
-X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
-			ASN1_OBJECT *obj,int crit,ASN1_OCTET_STRING *data);
-int		X509_EXTENSION_set_object(X509_EXTENSION *ex,ASN1_OBJECT *obj);
-int		X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit);
-int		X509_EXTENSION_set_data(X509_EXTENSION *ex,
-			ASN1_OCTET_STRING *data);
-ASN1_OBJECT *	X509_EXTENSION_get_object(X509_EXTENSION *ex);
-ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ne);
-int		X509_EXTENSION_get_critical(X509_EXTENSION *ex);
-
-int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x);
-int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid,
-			  int lastpos);
-int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk, ASN1_OBJECT *obj,
-			  int lastpos);
-X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc);
-X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
-					 X509_ATTRIBUTE *attr);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x,
-			const ASN1_OBJECT *obj, int type,
-			const unsigned char *bytes, int len);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x,
-			int nid, int type,
-			const unsigned char *bytes, int len);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x,
-			const char *attrname, int type,
-			const unsigned char *bytes, int len);
-void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x,
-				ASN1_OBJECT *obj, int lastpos, int type);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
-	     int atrtype, const void *data, int len);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,
-	     const ASN1_OBJECT *obj, int atrtype, const void *data, int len);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr,
-		const char *atrname, int type, const unsigned char *bytes, int len);
-int X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj);
-int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data, int len);
-void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx,
-					int atrtype, void *data);
-int X509_ATTRIBUTE_count(X509_ATTRIBUTE *attr);
-ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr);
-ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx);
-
-int EVP_PKEY_get_attr_count(const EVP_PKEY *key);
-int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid,
-			  int lastpos);
-int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, ASN1_OBJECT *obj,
-			  int lastpos);
-X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *key, int loc);
-X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *key, int loc);
-int EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr);
-int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key,
-			const ASN1_OBJECT *obj, int type,
-			const unsigned char *bytes, int len);
-int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key,
-			int nid, int type,
-			const unsigned char *bytes, int len);
-int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key,
-			const char *attrname, int type,
-			const unsigned char *bytes, int len);
-
-int		X509_verify_cert(X509_STORE_CTX *ctx);
-
-/* lookup a cert from a X509 STACK */
-X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk,X509_NAME *name,
-				     ASN1_INTEGER *serial);
-X509 *X509_find_by_subject(STACK_OF(X509) *sk,X509_NAME *name);
-
-DECLARE_ASN1_FUNCTIONS(PBEPARAM)
-DECLARE_ASN1_FUNCTIONS(PBE2PARAM)
-DECLARE_ASN1_FUNCTIONS(PBKDF2PARAM)
-
-int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
-				const unsigned char *salt, int saltlen);
-
-X509_ALGOR *PKCS5_pbe_set(int alg, int iter,
-				const unsigned char *salt, int saltlen);
-X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
-					 unsigned char *salt, int saltlen);
-X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
-				 unsigned char *salt, int saltlen,
-				 unsigned char *aiv, int prf_nid);
-
-/* PKCS#8 utilities */
-
-DECLARE_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO)
-
-EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8);
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey);
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken);
-PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken);
-
-int PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj,
-			int version, int ptype, void *pval,
-				unsigned char *penc, int penclen);
-int PKCS8_pkey_get0(ASN1_OBJECT **ppkalg,
-		const unsigned char **pk, int *ppklen,
-		X509_ALGOR **pa,
-		PKCS8_PRIV_KEY_INFO *p8);
-
-int X509_PUBKEY_set0_param(X509_PUBKEY *pub, ASN1_OBJECT *aobj,
-					int ptype, void *pval,
-					unsigned char *penc, int penclen);
-int X509_PUBKEY_get0_param(ASN1_OBJECT **ppkalg,
-		const unsigned char **pk, int *ppklen,
-		X509_ALGOR **pa,
-		X509_PUBKEY *pub);
-
-int X509_check_trust(X509 *x, int id, int flags);
-int X509_TRUST_get_count(void);
-X509_TRUST * X509_TRUST_get0(int idx);
-int X509_TRUST_get_by_id(int id);
-int X509_TRUST_add(int id, int flags, int (*ck)(X509_TRUST *, X509 *, int),
-					char *name, int arg1, void *arg2);
-void X509_TRUST_cleanup(void);
-int X509_TRUST_get_flags(X509_TRUST *xp);
-char *X509_TRUST_get0_name(X509_TRUST *xp);
-int X509_TRUST_get_trust(X509_TRUST *xp);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_X509_strings(void);
-
-/* Error codes for the X509 functions. */
-
-/* Function codes. */
-#define X509_F_ADD_CERT_DIR				 100
-#define X509_F_BY_FILE_CTRL				 101
-#define X509_F_CHECK_POLICY				 145
-#define X509_F_DIR_CTRL					 102
-#define X509_F_GET_CERT_BY_SUBJECT			 103
-#define X509_F_NETSCAPE_SPKI_B64_DECODE			 129
-#define X509_F_NETSCAPE_SPKI_B64_ENCODE			 130
-#define X509_F_X509AT_ADD1_ATTR				 135
-#define X509_F_X509V3_ADD_EXT				 104
-#define X509_F_X509_ATTRIBUTE_CREATE_BY_NID		 136
-#define X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ		 137
-#define X509_F_X509_ATTRIBUTE_CREATE_BY_TXT		 140
-#define X509_F_X509_ATTRIBUTE_GET0_DATA			 139
-#define X509_F_X509_ATTRIBUTE_SET1_DATA			 138
-#define X509_F_X509_CHECK_PRIVATE_KEY			 128
-#define X509_F_X509_CRL_PRINT_FP			 147
-#define X509_F_X509_EXTENSION_CREATE_BY_NID		 108
-#define X509_F_X509_EXTENSION_CREATE_BY_OBJ		 109
-#define X509_F_X509_GET_PUBKEY_PARAMETERS		 110
-#define X509_F_X509_LOAD_CERT_CRL_FILE			 132
-#define X509_F_X509_LOAD_CERT_FILE			 111
-#define X509_F_X509_LOAD_CRL_FILE			 112
-#define X509_F_X509_NAME_ADD_ENTRY			 113
-#define X509_F_X509_NAME_ENTRY_CREATE_BY_NID		 114
-#define X509_F_X509_NAME_ENTRY_CREATE_BY_TXT		 131
-#define X509_F_X509_NAME_ENTRY_SET_OBJECT		 115
-#define X509_F_X509_NAME_ONELINE			 116
-#define X509_F_X509_NAME_PRINT				 117
-#define X509_F_X509_PRINT_EX_FP				 118
-#define X509_F_X509_PUBKEY_GET				 119
-#define X509_F_X509_PUBKEY_SET				 120
-#define X509_F_X509_REQ_CHECK_PRIVATE_KEY		 144
-#define X509_F_X509_REQ_PRINT_EX			 121
-#define X509_F_X509_REQ_PRINT_FP			 122
-#define X509_F_X509_REQ_TO_X509				 123
-#define X509_F_X509_STORE_ADD_CERT			 124
-#define X509_F_X509_STORE_ADD_CRL			 125
-#define X509_F_X509_STORE_CTX_GET1_ISSUER		 146
-#define X509_F_X509_STORE_CTX_INIT			 143
-#define X509_F_X509_STORE_CTX_NEW			 142
-#define X509_F_X509_STORE_CTX_PURPOSE_INHERIT		 134
-#define X509_F_X509_TO_X509_REQ				 126
-#define X509_F_X509_TRUST_ADD				 133
-#define X509_F_X509_TRUST_SET				 141
-#define X509_F_X509_VERIFY_CERT				 127
-
-/* Reason codes. */
-#define X509_R_BAD_X509_FILETYPE			 100
-#define X509_R_BASE64_DECODE_ERROR			 118
-#define X509_R_CANT_CHECK_DH_KEY			 114
-#define X509_R_CERT_ALREADY_IN_HASH_TABLE		 101
-#define X509_R_ERR_ASN1_LIB				 102
-#define X509_R_INVALID_DIRECTORY			 113
-#define X509_R_INVALID_FIELD_NAME			 119
-#define X509_R_INVALID_TRUST				 123
-#define X509_R_KEY_TYPE_MISMATCH			 115
-#define X509_R_KEY_VALUES_MISMATCH			 116
-#define X509_R_LOADING_CERT_DIR				 103
-#define X509_R_LOADING_DEFAULTS				 104
-#define X509_R_METHOD_NOT_SUPPORTED			 124
-#define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY		 105
-#define X509_R_PUBLIC_KEY_DECODE_ERROR			 125
-#define X509_R_PUBLIC_KEY_ENCODE_ERROR			 126
-#define X509_R_SHOULD_RETRY				 106
-#define X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN	 107
-#define X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY		 108
-#define X509_R_UNKNOWN_KEY_TYPE				 117
-#define X509_R_UNKNOWN_NID				 109
-#define X509_R_UNKNOWN_PURPOSE_ID			 121
-#define X509_R_UNKNOWN_TRUST_ID				 120
-#define X509_R_UNSUPPORTED_ALGORITHM			 111
-#define X509_R_WRONG_LOOKUP_TYPE			 112
-#define X509_R_WRONG_TYPE				 122
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/openssl/x509_vfy.h b/dep/include/openssl/x509_vfy.h
deleted file mode 100644
index fe09b30aa..000000000
--- a/dep/include/openssl/x509_vfy.h
+++ /dev/null
@@ -1,567 +0,0 @@
-/* crypto/x509/x509_vfy.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_X509_H
-#include <openssl/x509.h>
-/* openssl/x509.h ends up #include-ing this file at about the only
- * appropriate moment. */
-#endif
-
-#ifndef HEADER_X509_VFY_H
-#define HEADER_X509_VFY_H
-
-#include <openssl/opensslconf.h>
-#ifndef OPENSSL_NO_LHASH
-#include <openssl/lhash.h>
-#endif
-#include <openssl/bio.h>
-#include <openssl/crypto.h>
-#include <openssl/symhacks.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#if 0
-/* Outer object */
-typedef struct x509_hash_dir_st
-	{
-	int num_dirs;
-	char **dirs;
-	int *dirs_type;
-	int num_dirs_alloced;
-	} X509_HASH_DIR_CTX;
-#endif
-
-typedef struct x509_file_st
-	{
-	int num_paths;	/* number of paths to files or directories */
-	int num_alloced;
-	char **paths;	/* the list of paths or directories */
-	int *path_type;
-	} X509_CERT_FILE_CTX;
-
-/*******************************/
-/*
-SSL_CTX -> X509_STORE    
-		-> X509_LOOKUP
-			->X509_LOOKUP_METHOD
-		-> X509_LOOKUP
-			->X509_LOOKUP_METHOD
- 
-SSL	-> X509_STORE_CTX
-		->X509_STORE    
-
-The X509_STORE holds the tables etc for verification stuff.
-A X509_STORE_CTX is used while validating a single certificate.
-The X509_STORE has X509_LOOKUPs for looking up certs.
-The X509_STORE then calls a function to actually verify the
-certificate chain.
-*/
-
-#define X509_LU_RETRY		-1
-#define X509_LU_FAIL		0
-#define X509_LU_X509		1
-#define X509_LU_CRL		2
-#define X509_LU_PKEY		3
-
-typedef struct x509_object_st
-	{
-	/* one of the above types */
-	int type;
-	union	{
-		char *ptr;
-		X509 *x509;
-		X509_CRL *crl;
-		EVP_PKEY *pkey;
-		} data;
-	} X509_OBJECT;
-
-typedef struct x509_lookup_st X509_LOOKUP;
-
-DECLARE_STACK_OF(X509_LOOKUP)
-DECLARE_STACK_OF(X509_OBJECT)
-
-/* This is a static that defines the function interface */
-typedef struct x509_lookup_method_st
-	{
-	const char *name;
-	int (*new_item)(X509_LOOKUP *ctx);
-	void (*free)(X509_LOOKUP *ctx);
-	int (*init)(X509_LOOKUP *ctx);
-	int (*shutdown)(X509_LOOKUP *ctx);
-	int (*ctrl)(X509_LOOKUP *ctx,int cmd,const char *argc,long argl,
-			char **ret);
-	int (*get_by_subject)(X509_LOOKUP *ctx,int type,X509_NAME *name,
-			      X509_OBJECT *ret);
-	int (*get_by_issuer_serial)(X509_LOOKUP *ctx,int type,X509_NAME *name,
-				    ASN1_INTEGER *serial,X509_OBJECT *ret);
-	int (*get_by_fingerprint)(X509_LOOKUP *ctx,int type,
-				  unsigned char *bytes,int len,
-				  X509_OBJECT *ret);
-	int (*get_by_alias)(X509_LOOKUP *ctx,int type,char *str,int len,
-			    X509_OBJECT *ret);
-	} X509_LOOKUP_METHOD;
-
-/* This structure hold all parameters associated with a verify operation
- * by including an X509_VERIFY_PARAM structure in related structures the
- * parameters used can be customized
- */
-
-typedef struct X509_VERIFY_PARAM_st
-	{
-	char *name;
-	time_t check_time;	/* Time to use */
-	unsigned long inh_flags; /* Inheritance flags */
-	unsigned long flags;	/* Various verify flags */
-	int purpose;		/* purpose to check untrusted certificates */
-	int trust;		/* trust setting to check */
-	int depth;		/* Verify depth */
-	STACK_OF(ASN1_OBJECT) *policies;	/* Permissible policies */
-	} X509_VERIFY_PARAM;
-
-DECLARE_STACK_OF(X509_VERIFY_PARAM)
-
-/* This is used to hold everything.  It is used for all certificate
- * validation.  Once we have a certificate chain, the 'verify'
- * function is then called to actually check the cert chain. */
-struct x509_store_st
-	{
-	/* The following is a cache of trusted certs */
-	int cache; 	/* if true, stash any hits */
-	STACK_OF(X509_OBJECT) *objs;	/* Cache of all objects */
-
-	/* These are external lookup methods */
-	STACK_OF(X509_LOOKUP) *get_cert_methods;
-
-	X509_VERIFY_PARAM *param;
-
-	/* Callbacks for various operations */
-	int (*verify)(X509_STORE_CTX *ctx);	/* called to verify a certificate */
-	int (*verify_cb)(int ok,X509_STORE_CTX *ctx);	/* error callback */
-	int (*get_issuer)(X509 **issuer, X509_STORE_CTX *ctx, X509 *x);	/* get issuers cert from ctx */
-	int (*check_issued)(X509_STORE_CTX *ctx, X509 *x, X509 *issuer); /* check issued */
-	int (*check_revocation)(X509_STORE_CTX *ctx); /* Check revocation status of chain */
-	int (*get_crl)(X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x); /* retrieve CRL */
-	int (*check_crl)(X509_STORE_CTX *ctx, X509_CRL *crl); /* Check CRL validity */
-	int (*cert_crl)(X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x); /* Check certificate against CRL */
-	STACK_OF(X509) * (*lookup_certs)(X509_STORE_CTX *ctx, X509_NAME *nm);
-	STACK_OF(X509_CRL) * (*lookup_crls)(X509_STORE_CTX *ctx, X509_NAME *nm);
-	int (*cleanup)(X509_STORE_CTX *ctx);
-
-	CRYPTO_EX_DATA ex_data;
-	int references;
-	} /* X509_STORE */;
-
-int X509_STORE_set_depth(X509_STORE *store, int depth);
-
-#define X509_STORE_set_verify_cb_func(ctx,func) ((ctx)->verify_cb=(func))
-#define X509_STORE_set_verify_func(ctx,func)	((ctx)->verify=(func))
-
-/* This is the functions plus an instance of the local variables. */
-struct x509_lookup_st
-	{
-	int init;			/* have we been started */
-	int skip;			/* don't use us. */
-	X509_LOOKUP_METHOD *method;	/* the functions */
-	char *method_data;		/* method data */
-
-	X509_STORE *store_ctx;	/* who owns us */
-	} /* X509_LOOKUP */;
-
-/* This is a used when verifying cert chains.  Since the
- * gathering of the cert chain can take some time (and have to be
- * 'retried', this needs to be kept and passed around. */
-struct x509_store_ctx_st      /* X509_STORE_CTX */
-	{
-	X509_STORE *ctx;
-	int current_method;	/* used when looking up certs */
-
-	/* The following are set by the caller */
-	X509 *cert;		/* The cert to check */
-	STACK_OF(X509) *untrusted;	/* chain of X509s - untrusted - passed in */
-	STACK_OF(X509_CRL) *crls;	/* set of CRLs passed in */
-
-	X509_VERIFY_PARAM *param;
-	void *other_ctx;	/* Other info for use with get_issuer() */
-
-	/* Callbacks for various operations */
-	int (*verify)(X509_STORE_CTX *ctx);	/* called to verify a certificate */
-	int (*verify_cb)(int ok,X509_STORE_CTX *ctx);		/* error callback */
-	int (*get_issuer)(X509 **issuer, X509_STORE_CTX *ctx, X509 *x);	/* get issuers cert from ctx */
-	int (*check_issued)(X509_STORE_CTX *ctx, X509 *x, X509 *issuer); /* check issued */
-	int (*check_revocation)(X509_STORE_CTX *ctx); /* Check revocation status of chain */
-	int (*get_crl)(X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x); /* retrieve CRL */
-	int (*check_crl)(X509_STORE_CTX *ctx, X509_CRL *crl); /* Check CRL validity */
-	int (*cert_crl)(X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x); /* Check certificate against CRL */
-	int (*check_policy)(X509_STORE_CTX *ctx);
-	STACK_OF(X509) * (*lookup_certs)(X509_STORE_CTX *ctx, X509_NAME *nm);
-	STACK_OF(X509_CRL) * (*lookup_crls)(X509_STORE_CTX *ctx, X509_NAME *nm);
-	int (*cleanup)(X509_STORE_CTX *ctx);
-
-	/* The following is built up */
-	int valid;		/* if 0, rebuild chain */
-	int last_untrusted;	/* index of last untrusted cert */
-	STACK_OF(X509) *chain; 		/* chain of X509s - built up and trusted */
-	X509_POLICY_TREE *tree;	/* Valid policy tree */
-
-	int explicit_policy;	/* Require explicit policy value */
-
-	/* When something goes wrong, this is why */
-	int error_depth;
-	int error;
-	X509 *current_cert;
-	X509 *current_issuer;	/* cert currently being tested as valid issuer */
-	X509_CRL *current_crl;	/* current CRL */
-
-	int current_crl_score;  /* score of current CRL */
-	unsigned int current_reasons;  /* Reason mask */
-
-	X509_STORE_CTX *parent; /* For CRL path validation: parent context */
-
-	CRYPTO_EX_DATA ex_data;
-	} /* X509_STORE_CTX */;
-
-void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
-
-#define X509_STORE_CTX_set_app_data(ctx,data) \
-	X509_STORE_CTX_set_ex_data(ctx,0,data)
-#define X509_STORE_CTX_get_app_data(ctx) \
-	X509_STORE_CTX_get_ex_data(ctx,0)
-
-#define X509_L_FILE_LOAD	1
-#define X509_L_ADD_DIR		2
-
-#define X509_LOOKUP_load_file(x,name,type) \
-		X509_LOOKUP_ctrl((x),X509_L_FILE_LOAD,(name),(long)(type),NULL)
-
-#define X509_LOOKUP_add_dir(x,name,type) \
-		X509_LOOKUP_ctrl((x),X509_L_ADD_DIR,(name),(long)(type),NULL)
-
-#define		X509_V_OK					0
-/* illegal error (for uninitialized values, to avoid X509_V_OK): 1 */
-
-#define		X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT		2
-#define		X509_V_ERR_UNABLE_TO_GET_CRL			3
-#define		X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE	4
-#define		X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE	5
-#define		X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY	6
-#define		X509_V_ERR_CERT_SIGNATURE_FAILURE		7
-#define		X509_V_ERR_CRL_SIGNATURE_FAILURE		8
-#define		X509_V_ERR_CERT_NOT_YET_VALID			9
-#define		X509_V_ERR_CERT_HAS_EXPIRED			10
-#define		X509_V_ERR_CRL_NOT_YET_VALID			11
-#define		X509_V_ERR_CRL_HAS_EXPIRED			12
-#define		X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD	13
-#define		X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD	14
-#define		X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD	15
-#define		X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD	16
-#define		X509_V_ERR_OUT_OF_MEM				17
-#define		X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT		18
-#define		X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN		19
-#define		X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY	20
-#define		X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE	21
-#define		X509_V_ERR_CERT_CHAIN_TOO_LONG			22
-#define		X509_V_ERR_CERT_REVOKED				23
-#define		X509_V_ERR_INVALID_CA				24
-#define		X509_V_ERR_PATH_LENGTH_EXCEEDED			25
-#define		X509_V_ERR_INVALID_PURPOSE			26
-#define		X509_V_ERR_CERT_UNTRUSTED			27
-#define		X509_V_ERR_CERT_REJECTED			28
-/* These are 'informational' when looking for issuer cert */
-#define		X509_V_ERR_SUBJECT_ISSUER_MISMATCH		29
-#define		X509_V_ERR_AKID_SKID_MISMATCH			30
-#define		X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH		31
-#define		X509_V_ERR_KEYUSAGE_NO_CERTSIGN			32
-
-#define		X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER		33
-#define		X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION		34
-#define		X509_V_ERR_KEYUSAGE_NO_CRL_SIGN			35
-#define		X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION	36
-#define		X509_V_ERR_INVALID_NON_CA			37
-#define		X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED		38
-#define		X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE	39
-#define		X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED	40
-
-#define		X509_V_ERR_INVALID_EXTENSION			41
-#define		X509_V_ERR_INVALID_POLICY_EXTENSION		42
-#define		X509_V_ERR_NO_EXPLICIT_POLICY			43
-#define		X509_V_ERR_DIFFERENT_CRL_SCOPE			44
-#define		X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE	45
-
-#define		X509_V_ERR_UNNESTED_RESOURCE			46
-
-#define		X509_V_ERR_PERMITTED_VIOLATION			47
-#define		X509_V_ERR_EXCLUDED_VIOLATION			48
-#define		X509_V_ERR_SUBTREE_MINMAX			49
-#define		X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE		51
-#define		X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX	52
-#define		X509_V_ERR_UNSUPPORTED_NAME_SYNTAX		53
-#define		X509_V_ERR_CRL_PATH_VALIDATION_ERROR		54
-
-/* The application is not happy */
-#define		X509_V_ERR_APPLICATION_VERIFICATION		50
-
-/* Certificate verify flags */
-
-/* Send issuer+subject checks to verify_cb */
-#define	X509_V_FLAG_CB_ISSUER_CHECK		0x1
-/* Use check time instead of current time */
-#define	X509_V_FLAG_USE_CHECK_TIME		0x2
-/* Lookup CRLs */
-#define	X509_V_FLAG_CRL_CHECK			0x4
-/* Lookup CRLs for whole chain */
-#define	X509_V_FLAG_CRL_CHECK_ALL		0x8
-/* Ignore unhandled critical extensions */
-#define	X509_V_FLAG_IGNORE_CRITICAL		0x10
-/* Disable workarounds for broken certificates */
-#define	X509_V_FLAG_X509_STRICT			0x20
-/* Enable proxy certificate validation */
-#define	X509_V_FLAG_ALLOW_PROXY_CERTS		0x40
-/* Enable policy checking */
-#define X509_V_FLAG_POLICY_CHECK		0x80
-/* Policy variable require-explicit-policy */
-#define X509_V_FLAG_EXPLICIT_POLICY		0x100
-/* Policy variable inhibit-any-policy */
-#define	X509_V_FLAG_INHIBIT_ANY			0x200
-/* Policy variable inhibit-policy-mapping */
-#define X509_V_FLAG_INHIBIT_MAP			0x400
-/* Notify callback that policy is OK */
-#define X509_V_FLAG_NOTIFY_POLICY		0x800
-/* Extended CRL features such as indirect CRLs, alternate CRL signing keys */
-#define X509_V_FLAG_EXTENDED_CRL_SUPPORT	0x1000
-/* Delta CRL support */
-#define X509_V_FLAG_USE_DELTAS			0x2000
-/* Check selfsigned CA signature */
-#define X509_V_FLAG_CHECK_SS_SIGNATURE		0x4000
-
-
-#define X509_VP_FLAG_DEFAULT			0x1
-#define X509_VP_FLAG_OVERWRITE			0x2
-#define X509_VP_FLAG_RESET_FLAGS		0x4
-#define X509_VP_FLAG_LOCKED			0x8
-#define X509_VP_FLAG_ONCE			0x10
-
-/* Internal use: mask of policy related options */
-#define X509_V_FLAG_POLICY_MASK (X509_V_FLAG_POLICY_CHECK \
-				| X509_V_FLAG_EXPLICIT_POLICY \
-				| X509_V_FLAG_INHIBIT_ANY \
-				| X509_V_FLAG_INHIBIT_MAP)
-
-int X509_OBJECT_idx_by_subject(STACK_OF(X509_OBJECT) *h, int type,
-	     X509_NAME *name);
-X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h,int type,X509_NAME *name);
-X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h, X509_OBJECT *x);
-void X509_OBJECT_up_ref_count(X509_OBJECT *a);
-void X509_OBJECT_free_contents(X509_OBJECT *a);
-X509_STORE *X509_STORE_new(void );
-void X509_STORE_free(X509_STORE *v);
-
-STACK_OF(X509)* X509_STORE_get1_certs(X509_STORE_CTX *st, X509_NAME *nm);
-STACK_OF(X509_CRL)* X509_STORE_get1_crls(X509_STORE_CTX *st, X509_NAME *nm);
-int X509_STORE_set_flags(X509_STORE *ctx, unsigned long flags);
-int X509_STORE_set_purpose(X509_STORE *ctx, int purpose);
-int X509_STORE_set_trust(X509_STORE *ctx, int trust);
-int X509_STORE_set1_param(X509_STORE *ctx, X509_VERIFY_PARAM *pm);
-
-void X509_STORE_set_verify_cb(X509_STORE *ctx,
-				  int (*verify_cb)(int, X509_STORE_CTX *));
-
-X509_STORE_CTX *X509_STORE_CTX_new(void);
-
-int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
-
-void X509_STORE_CTX_free(X509_STORE_CTX *ctx);
-int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store,
-			 X509 *x509, STACK_OF(X509) *chain);
-void X509_STORE_CTX_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *sk);
-void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx);
-
-X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);
-
-X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void);
-X509_LOOKUP_METHOD *X509_LOOKUP_file(void);
-
-int X509_STORE_add_cert(X509_STORE *ctx, X509 *x);
-int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);
-
-int X509_STORE_get_by_subject(X509_STORE_CTX *vs,int type,X509_NAME *name,
-	X509_OBJECT *ret);
-
-int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
-	long argl, char **ret);
-
-#ifndef OPENSSL_NO_STDIO
-int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type);
-int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type);
-int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type);
-#endif
-
-
-X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method);
-void X509_LOOKUP_free(X509_LOOKUP *ctx);
-int X509_LOOKUP_init(X509_LOOKUP *ctx);
-int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, int type, X509_NAME *name,
-	X509_OBJECT *ret);
-int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, int type, X509_NAME *name,
-	ASN1_INTEGER *serial, X509_OBJECT *ret);
-int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, int type,
-	unsigned char *bytes, int len, X509_OBJECT *ret);
-int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, int type, char *str,
-	int len, X509_OBJECT *ret);
-int X509_LOOKUP_shutdown(X509_LOOKUP *ctx);
-
-#ifndef OPENSSL_NO_STDIO
-int	X509_STORE_load_locations (X509_STORE *ctx,
-		const char *file, const char *dir);
-int	X509_STORE_set_default_paths(X509_STORE *ctx);
-#endif
-
-int X509_STORE_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-	CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int	X509_STORE_CTX_set_ex_data(X509_STORE_CTX *ctx,int idx,void *data);
-void *	X509_STORE_CTX_get_ex_data(X509_STORE_CTX *ctx,int idx);
-int	X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
-void	X509_STORE_CTX_set_error(X509_STORE_CTX *ctx,int s);
-int	X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
-X509 *	X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);
-X509 *X509_STORE_CTX_get0_current_issuer(X509_STORE_CTX *ctx);
-X509_CRL *X509_STORE_CTX_get0_current_crl(X509_STORE_CTX *ctx);
-X509_STORE_CTX *X509_STORE_CTX_get0_parent_ctx(X509_STORE_CTX *ctx);
-STACK_OF(X509) *X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);
-STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *ctx);
-void	X509_STORE_CTX_set_cert(X509_STORE_CTX *c,X509 *x);
-void	X509_STORE_CTX_set_chain(X509_STORE_CTX *c,STACK_OF(X509) *sk);
-void	X509_STORE_CTX_set0_crls(X509_STORE_CTX *c,STACK_OF(X509_CRL) *sk);
-int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose);
-int X509_STORE_CTX_set_trust(X509_STORE_CTX *ctx, int trust);
-int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
-				int purpose, int trust);
-void X509_STORE_CTX_set_flags(X509_STORE_CTX *ctx, unsigned long flags);
-void X509_STORE_CTX_set_time(X509_STORE_CTX *ctx, unsigned long flags,
-								time_t t);
-void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,
-				  int (*verify_cb)(int, X509_STORE_CTX *));
-  
-X509_POLICY_TREE *X509_STORE_CTX_get0_policy_tree(X509_STORE_CTX *ctx);
-int X509_STORE_CTX_get_explicit_policy(X509_STORE_CTX *ctx);
-
-X509_VERIFY_PARAM *X509_STORE_CTX_get0_param(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set0_param(X509_STORE_CTX *ctx, X509_VERIFY_PARAM *param);
-int X509_STORE_CTX_set_default(X509_STORE_CTX *ctx, const char *name);
-
-/* X509_VERIFY_PARAM functions */
-
-X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void);
-void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param);
-int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *to,
-						const X509_VERIFY_PARAM *from);
-int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to, 
-						const X509_VERIFY_PARAM *from);
-int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name);
-int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param, unsigned long flags);
-int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
-							unsigned long flags);
-unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param);
-int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);
-int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);
-void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth);
-void X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t);
-int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param,
-						ASN1_OBJECT *policy);
-int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param, 
-					STACK_OF(ASN1_OBJECT) *policies);
-int X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *param);
-
-int X509_VERIFY_PARAM_add0_table(X509_VERIFY_PARAM *param);
-const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name);
-void X509_VERIFY_PARAM_table_cleanup(void);
-
-int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy,
-			STACK_OF(X509) *certs,
-			STACK_OF(ASN1_OBJECT) *policy_oids,
-			unsigned int flags);
-
-void X509_policy_tree_free(X509_POLICY_TREE *tree);
-
-int X509_policy_tree_level_count(const X509_POLICY_TREE *tree);
-X509_POLICY_LEVEL *
-	X509_policy_tree_get0_level(const X509_POLICY_TREE *tree, int i);
-
-STACK_OF(X509_POLICY_NODE) *
-	X509_policy_tree_get0_policies(const X509_POLICY_TREE *tree);
-
-STACK_OF(X509_POLICY_NODE) *
-	X509_policy_tree_get0_user_policies(const X509_POLICY_TREE *tree);
-
-int X509_policy_level_node_count(X509_POLICY_LEVEL *level);
-
-X509_POLICY_NODE *X509_policy_level_get0_node(X509_POLICY_LEVEL *level, int i);
-
-const ASN1_OBJECT *X509_policy_node_get0_policy(const X509_POLICY_NODE *node);
-
-STACK_OF(POLICYQUALINFO) *
-	X509_policy_node_get0_qualifiers(const X509_POLICY_NODE *node);
-const X509_POLICY_NODE *
-	X509_policy_node_get0_parent(const X509_POLICY_NODE *node);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/dep/include/openssl/x509v3.h b/dep/include/openssl/x509v3.h
deleted file mode 100644
index b308abe7c..000000000
--- a/dep/include/openssl/x509v3.h
+++ /dev/null
@@ -1,1007 +0,0 @@
-/* x509v3.h */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999-2004 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_X509V3_H
-#define HEADER_X509V3_H
-
-#include <openssl/bio.h>
-#include <openssl/x509.h>
-#include <openssl/conf.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Forward reference */
-struct v3_ext_method;
-struct v3_ext_ctx;
-
-/* Useful typedefs */
-
-typedef void * (*X509V3_EXT_NEW)(void);
-typedef void (*X509V3_EXT_FREE)(void *);
-typedef void * (*X509V3_EXT_D2I)(void *, const unsigned char ** , long);
-typedef int (*X509V3_EXT_I2D)(void *, unsigned char **);
-typedef STACK_OF(CONF_VALUE) *
-  (*X509V3_EXT_I2V)(const struct v3_ext_method *method, void *ext,
-		    STACK_OF(CONF_VALUE) *extlist);
-typedef void * (*X509V3_EXT_V2I)(const struct v3_ext_method *method,
-				 struct v3_ext_ctx *ctx,
-				 STACK_OF(CONF_VALUE) *values);
-typedef char * (*X509V3_EXT_I2S)(const struct v3_ext_method *method, void *ext);
-typedef void * (*X509V3_EXT_S2I)(const struct v3_ext_method *method,
-				 struct v3_ext_ctx *ctx, const char *str);
-typedef int (*X509V3_EXT_I2R)(const struct v3_ext_method *method, void *ext,
-			      BIO *out, int indent);
-typedef void * (*X509V3_EXT_R2I)(const struct v3_ext_method *method,
-				 struct v3_ext_ctx *ctx, const char *str);
-
-/* V3 extension structure */
-
-struct v3_ext_method {
-int ext_nid;
-int ext_flags;
-/* If this is set the following four fields are ignored */
-ASN1_ITEM_EXP *it;
-/* Old style ASN1 calls */
-X509V3_EXT_NEW ext_new;
-X509V3_EXT_FREE ext_free;
-X509V3_EXT_D2I d2i;
-X509V3_EXT_I2D i2d;
-
-/* The following pair is used for string extensions */
-X509V3_EXT_I2S i2s;
-X509V3_EXT_S2I s2i;
-
-/* The following pair is used for multi-valued extensions */
-X509V3_EXT_I2V i2v;
-X509V3_EXT_V2I v2i;
-
-/* The following are used for raw extensions */
-X509V3_EXT_I2R i2r;
-X509V3_EXT_R2I r2i;
-
-void *usr_data;	/* Any extension specific data */
-};
-
-typedef struct X509V3_CONF_METHOD_st {
-char * (*get_string)(void *db, char *section, char *value);
-STACK_OF(CONF_VALUE) * (*get_section)(void *db, char *section);
-void (*free_string)(void *db, char * string);
-void (*free_section)(void *db, STACK_OF(CONF_VALUE) *section);
-} X509V3_CONF_METHOD;
-
-/* Context specific info */
-struct v3_ext_ctx {
-#define CTX_TEST 0x1
-int flags;
-X509 *issuer_cert;
-X509 *subject_cert;
-X509_REQ *subject_req;
-X509_CRL *crl;
-X509V3_CONF_METHOD *db_meth;
-void *db;
-/* Maybe more here */
-};
-
-typedef struct v3_ext_method X509V3_EXT_METHOD;
-
-DECLARE_STACK_OF(X509V3_EXT_METHOD)
-
-/* ext_flags values */
-#define X509V3_EXT_DYNAMIC	0x1
-#define X509V3_EXT_CTX_DEP	0x2
-#define X509V3_EXT_MULTILINE	0x4
-
-typedef BIT_STRING_BITNAME ENUMERATED_NAMES;
-
-typedef struct BASIC_CONSTRAINTS_st {
-int ca;
-ASN1_INTEGER *pathlen;
-} BASIC_CONSTRAINTS;
-
-
-typedef struct PKEY_USAGE_PERIOD_st {
-ASN1_GENERALIZEDTIME *notBefore;
-ASN1_GENERALIZEDTIME *notAfter;
-} PKEY_USAGE_PERIOD;
-
-typedef struct otherName_st {
-ASN1_OBJECT *type_id;
-ASN1_TYPE *value;
-} OTHERNAME;
-
-typedef struct EDIPartyName_st {
-	ASN1_STRING *nameAssigner;
-	ASN1_STRING *partyName;
-} EDIPARTYNAME;
-
-typedef struct GENERAL_NAME_st {
-
-#define GEN_OTHERNAME	0
-#define GEN_EMAIL	1
-#define GEN_DNS		2
-#define GEN_X400	3
-#define GEN_DIRNAME	4
-#define GEN_EDIPARTY	5
-#define GEN_URI		6
-#define GEN_IPADD	7
-#define GEN_RID		8
-
-int type;
-union {
-	char *ptr;
-	OTHERNAME *otherName; /* otherName */
-	ASN1_IA5STRING *rfc822Name;
-	ASN1_IA5STRING *dNSName;
-	ASN1_TYPE *x400Address;
-	X509_NAME *directoryName;
-	EDIPARTYNAME *ediPartyName;
-	ASN1_IA5STRING *uniformResourceIdentifier;
-	ASN1_OCTET_STRING *iPAddress;
-	ASN1_OBJECT *registeredID;
-
-	/* Old names */
-	ASN1_OCTET_STRING *ip; /* iPAddress */
-	X509_NAME *dirn;		/* dirn */
-	ASN1_IA5STRING *ia5;/* rfc822Name, dNSName, uniformResourceIdentifier */
-	ASN1_OBJECT *rid; /* registeredID */
-	ASN1_TYPE *other; /* x400Address */
-} d;
-} GENERAL_NAME;
-
-typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES;
-
-typedef struct ACCESS_DESCRIPTION_st {
-	ASN1_OBJECT *method;
-	GENERAL_NAME *location;
-} ACCESS_DESCRIPTION;
-
-typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS;
-
-typedef STACK_OF(ASN1_OBJECT) EXTENDED_KEY_USAGE;
-
-DECLARE_STACK_OF(GENERAL_NAME)
-DECLARE_ASN1_SET_OF(GENERAL_NAME)
-
-DECLARE_STACK_OF(ACCESS_DESCRIPTION)
-DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION)
-
-typedef struct DIST_POINT_NAME_st {
-int type;
-union {
-	GENERAL_NAMES *fullname;
-	STACK_OF(X509_NAME_ENTRY) *relativename;
-} name;
-/* If relativename then this contains the full distribution point name */
-X509_NAME *dpname;
-} DIST_POINT_NAME;
-/* All existing reasons */
-#define CRLDP_ALL_REASONS	0x807f
-
-#define CRL_REASON_NONE				-1
-#define CRL_REASON_UNSPECIFIED			0
-#define CRL_REASON_KEY_COMPROMISE		1
-#define CRL_REASON_CA_COMPROMISE		2
-#define CRL_REASON_AFFILIATION_CHANGED		3
-#define CRL_REASON_SUPERSEDED			4
-#define CRL_REASON_CESSATION_OF_OPERATION	5
-#define CRL_REASON_CERTIFICATE_HOLD		6
-#define CRL_REASON_REMOVE_FROM_CRL		8
-#define CRL_REASON_PRIVILEGE_WITHDRAWN		9
-#define CRL_REASON_AA_COMPROMISE		10
-
-struct DIST_POINT_st {
-DIST_POINT_NAME	*distpoint;
-ASN1_BIT_STRING *reasons;
-GENERAL_NAMES *CRLissuer;
-int dp_reasons;
-};
-
-typedef STACK_OF(DIST_POINT) CRL_DIST_POINTS;
-
-DECLARE_STACK_OF(DIST_POINT)
-DECLARE_ASN1_SET_OF(DIST_POINT)
-
-struct AUTHORITY_KEYID_st {
-ASN1_OCTET_STRING *keyid;
-GENERAL_NAMES *issuer;
-ASN1_INTEGER *serial;
-};
-
-/* Strong extranet structures */
-
-typedef struct SXNET_ID_st {
-	ASN1_INTEGER *zone;
-	ASN1_OCTET_STRING *user;
-} SXNETID;
-
-DECLARE_STACK_OF(SXNETID)
-DECLARE_ASN1_SET_OF(SXNETID)
-
-typedef struct SXNET_st {
-	ASN1_INTEGER *version;
-	STACK_OF(SXNETID) *ids;
-} SXNET;
-
-typedef struct NOTICEREF_st {
-	ASN1_STRING *organization;
-	STACK_OF(ASN1_INTEGER) *noticenos;
-} NOTICEREF;
-
-typedef struct USERNOTICE_st {
-	NOTICEREF *noticeref;
-	ASN1_STRING *exptext;
-} USERNOTICE;
-
-typedef struct POLICYQUALINFO_st {
-	ASN1_OBJECT *pqualid;
-	union {
-		ASN1_IA5STRING *cpsuri;
-		USERNOTICE *usernotice;
-		ASN1_TYPE *other;
-	} d;
-} POLICYQUALINFO;
-
-DECLARE_STACK_OF(POLICYQUALINFO)
-DECLARE_ASN1_SET_OF(POLICYQUALINFO)
-
-typedef struct POLICYINFO_st {
-	ASN1_OBJECT *policyid;
-	STACK_OF(POLICYQUALINFO) *qualifiers;
-} POLICYINFO;
-
-typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
-
-DECLARE_STACK_OF(POLICYINFO)
-DECLARE_ASN1_SET_OF(POLICYINFO)
-
-typedef struct POLICY_MAPPING_st {
-	ASN1_OBJECT *issuerDomainPolicy;
-	ASN1_OBJECT *subjectDomainPolicy;
-} POLICY_MAPPING;
-
-DECLARE_STACK_OF(POLICY_MAPPING)
-
-typedef STACK_OF(POLICY_MAPPING) POLICY_MAPPINGS;
-
-typedef struct GENERAL_SUBTREE_st {
-	GENERAL_NAME *base;
-	ASN1_INTEGER *minimum;
-	ASN1_INTEGER *maximum;
-} GENERAL_SUBTREE;
-
-DECLARE_STACK_OF(GENERAL_SUBTREE)
-
-struct NAME_CONSTRAINTS_st {
-	STACK_OF(GENERAL_SUBTREE) *permittedSubtrees;
-	STACK_OF(GENERAL_SUBTREE) *excludedSubtrees;
-};
-
-typedef struct POLICY_CONSTRAINTS_st {
-	ASN1_INTEGER *requireExplicitPolicy;
-	ASN1_INTEGER *inhibitPolicyMapping;
-} POLICY_CONSTRAINTS;
-
-/* Proxy certificate structures, see RFC 3820 */
-typedef struct PROXY_POLICY_st
-	{
-	ASN1_OBJECT *policyLanguage;
-	ASN1_OCTET_STRING *policy;
-	} PROXY_POLICY;
-
-typedef struct PROXY_CERT_INFO_EXTENSION_st
-	{
-	ASN1_INTEGER *pcPathLengthConstraint;
-	PROXY_POLICY *proxyPolicy;
-	} PROXY_CERT_INFO_EXTENSION;
-
-DECLARE_ASN1_FUNCTIONS(PROXY_POLICY)
-DECLARE_ASN1_FUNCTIONS(PROXY_CERT_INFO_EXTENSION)
-
-struct ISSUING_DIST_POINT_st
-	{
-	DIST_POINT_NAME *distpoint;
-	int onlyuser;
-	int onlyCA;
-	ASN1_BIT_STRING *onlysomereasons;
-	int indirectCRL;
-	int onlyattr;
-	};
-
-/* Values in idp_flags field */
-/* IDP present */
-#define	IDP_PRESENT	0x1
-/* IDP values inconsistent */
-#define IDP_INVALID	0x2
-/* onlyuser true */
-#define	IDP_ONLYUSER	0x4
-/* onlyCA true */
-#define	IDP_ONLYCA	0x8
-/* onlyattr true */
-#define IDP_ONLYATTR	0x10
-/* indirectCRL true */
-#define IDP_INDIRECT	0x20
-/* onlysomereasons present */
-#define IDP_REASONS	0x40
-
-#define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \
-",name:", val->name, ",value:", val->value);
-
-#define X509V3_set_ctx_test(ctx) \
-			X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST)
-#define X509V3_set_ctx_nodb(ctx) (ctx)->db = NULL;
-
-#define EXT_BITSTRING(nid, table) { nid, 0, ASN1_ITEM_ref(ASN1_BIT_STRING), \
-			0,0,0,0, \
-			0,0, \
-			(X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \
-			(X509V3_EXT_V2I)v2i_ASN1_BIT_STRING, \
-			NULL, NULL, \
-			table}
-
-#define EXT_IA5STRING(nid) { nid, 0, ASN1_ITEM_ref(ASN1_IA5STRING), \
-			0,0,0,0, \
-			(X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \
-			(X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \
-			0,0,0,0, \
-			NULL}
-
-#define EXT_END { -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-
-
-/* X509_PURPOSE stuff */
-
-#define EXFLAG_BCONS		0x1
-#define EXFLAG_KUSAGE		0x2
-#define EXFLAG_XKUSAGE		0x4
-#define EXFLAG_NSCERT		0x8
-
-#define EXFLAG_CA		0x10
-/* Really self issued not necessarily self signed */
-#define EXFLAG_SI		0x20
-#define EXFLAG_SS		0x20
-#define EXFLAG_V1		0x40
-#define EXFLAG_INVALID		0x80
-#define EXFLAG_SET		0x100
-#define EXFLAG_CRITICAL		0x200
-#define EXFLAG_PROXY		0x400
-
-#define EXFLAG_INVALID_POLICY	0x800
-#define EXFLAG_FRESHEST		0x1000
-
-#define KU_DIGITAL_SIGNATURE	0x0080
-#define KU_NON_REPUDIATION	0x0040
-#define KU_KEY_ENCIPHERMENT	0x0020
-#define KU_DATA_ENCIPHERMENT	0x0010
-#define KU_KEY_AGREEMENT	0x0008
-#define KU_KEY_CERT_SIGN	0x0004
-#define KU_CRL_SIGN		0x0002
-#define KU_ENCIPHER_ONLY	0x0001
-#define KU_DECIPHER_ONLY	0x8000
-
-#define NS_SSL_CLIENT		0x80
-#define NS_SSL_SERVER		0x40
-#define NS_SMIME		0x20
-#define NS_OBJSIGN		0x10
-#define NS_SSL_CA		0x04
-#define NS_SMIME_CA		0x02
-#define NS_OBJSIGN_CA		0x01
-#define NS_ANY_CA		(NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA)
-
-#define XKU_SSL_SERVER		0x1	
-#define XKU_SSL_CLIENT		0x2
-#define XKU_SMIME		0x4
-#define XKU_CODE_SIGN		0x8
-#define XKU_SGC			0x10
-#define XKU_OCSP_SIGN		0x20
-#define XKU_TIMESTAMP		0x40
-#define XKU_DVCS		0x80
-
-#define X509_PURPOSE_DYNAMIC	0x1
-#define X509_PURPOSE_DYNAMIC_NAME	0x2
-
-typedef struct x509_purpose_st {
-	int purpose;
-	int trust;		/* Default trust ID */
-	int flags;
-	int (*check_purpose)(const struct x509_purpose_st *,
-				const X509 *, int);
-	char *name;
-	char *sname;
-	void *usr_data;
-} X509_PURPOSE;
-
-#define X509_PURPOSE_SSL_CLIENT		1
-#define X509_PURPOSE_SSL_SERVER		2
-#define X509_PURPOSE_NS_SSL_SERVER	3
-#define X509_PURPOSE_SMIME_SIGN		4
-#define X509_PURPOSE_SMIME_ENCRYPT	5
-#define X509_PURPOSE_CRL_SIGN		6
-#define X509_PURPOSE_ANY		7
-#define X509_PURPOSE_OCSP_HELPER	8
-#define X509_PURPOSE_TIMESTAMP_SIGN	9
-
-#define X509_PURPOSE_MIN		1
-#define X509_PURPOSE_MAX		9
-
-/* Flags for X509V3_EXT_print() */
-
-#define X509V3_EXT_UNKNOWN_MASK		(0xfL << 16)
-/* Return error for unknown extensions */
-#define X509V3_EXT_DEFAULT		0
-/* Print error for unknown extensions */
-#define X509V3_EXT_ERROR_UNKNOWN	(1L << 16)
-/* ASN1 parse unknown extensions */
-#define X509V3_EXT_PARSE_UNKNOWN	(2L << 16)
-/* BIO_dump unknown extensions */
-#define X509V3_EXT_DUMP_UNKNOWN		(3L << 16)
-
-/* Flags for X509V3_add1_i2d */
-
-#define X509V3_ADD_OP_MASK		0xfL
-#define X509V3_ADD_DEFAULT		0L
-#define X509V3_ADD_APPEND		1L
-#define X509V3_ADD_REPLACE		2L
-#define X509V3_ADD_REPLACE_EXISTING	3L
-#define X509V3_ADD_KEEP_EXISTING	4L
-#define X509V3_ADD_DELETE		5L
-#define X509V3_ADD_SILENT		0x10
-
-DECLARE_STACK_OF(X509_PURPOSE)
-
-DECLARE_ASN1_FUNCTIONS(BASIC_CONSTRAINTS)
-
-DECLARE_ASN1_FUNCTIONS(SXNET)
-DECLARE_ASN1_FUNCTIONS(SXNETID)
-
-int SXNET_add_id_asc(SXNET **psx, char *zone, char *user, int userlen); 
-int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user, int userlen); 
-int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, char *user, int userlen); 
-
-ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone);
-ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone);
-ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone);
-
-DECLARE_ASN1_FUNCTIONS(AUTHORITY_KEYID)
-
-DECLARE_ASN1_FUNCTIONS(PKEY_USAGE_PERIOD)
-
-DECLARE_ASN1_FUNCTIONS(GENERAL_NAME)
-GENERAL_NAME *GENERAL_NAME_dup(GENERAL_NAME *a);
-int GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b);
-
-
-
-ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-				X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-				ASN1_BIT_STRING *bits,
-				STACK_OF(CONF_VALUE) *extlist);
-
-STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, GENERAL_NAME *gen, STACK_OF(CONF_VALUE) *ret);
-int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen);
-
-DECLARE_ASN1_FUNCTIONS(GENERAL_NAMES)
-
-STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
-		GENERAL_NAMES *gen, STACK_OF(CONF_VALUE) *extlist);
-GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
-				 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-
-DECLARE_ASN1_FUNCTIONS(OTHERNAME)
-DECLARE_ASN1_FUNCTIONS(EDIPARTYNAME)
-int OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b);
-void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value);
-void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype);
-int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
-				ASN1_OBJECT *oid, ASN1_TYPE *value);
-int GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, 
-				ASN1_OBJECT **poid, ASN1_TYPE **pvalue);
-
-char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *ia5);
-ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str);
-
-DECLARE_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
-int i2a_ACCESS_DESCRIPTION(BIO *bp, ACCESS_DESCRIPTION* a);
-
-DECLARE_ASN1_FUNCTIONS(CERTIFICATEPOLICIES)
-DECLARE_ASN1_FUNCTIONS(POLICYINFO)
-DECLARE_ASN1_FUNCTIONS(POLICYQUALINFO)
-DECLARE_ASN1_FUNCTIONS(USERNOTICE)
-DECLARE_ASN1_FUNCTIONS(NOTICEREF)
-
-DECLARE_ASN1_FUNCTIONS(CRL_DIST_POINTS)
-DECLARE_ASN1_FUNCTIONS(DIST_POINT)
-DECLARE_ASN1_FUNCTIONS(DIST_POINT_NAME)
-DECLARE_ASN1_FUNCTIONS(ISSUING_DIST_POINT)
-
-int DIST_POINT_set_dpname(DIST_POINT_NAME *dpn, X509_NAME *iname);
-
-int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc);
-
-DECLARE_ASN1_FUNCTIONS(ACCESS_DESCRIPTION)
-DECLARE_ASN1_FUNCTIONS(AUTHORITY_INFO_ACCESS)
-
-DECLARE_ASN1_ITEM(POLICY_MAPPING)
-DECLARE_ASN1_ALLOC_FUNCTIONS(POLICY_MAPPING)
-DECLARE_ASN1_ITEM(POLICY_MAPPINGS)
-
-DECLARE_ASN1_ITEM(GENERAL_SUBTREE)
-DECLARE_ASN1_ALLOC_FUNCTIONS(GENERAL_SUBTREE)
-
-DECLARE_ASN1_ITEM(NAME_CONSTRAINTS)
-DECLARE_ASN1_ALLOC_FUNCTIONS(NAME_CONSTRAINTS)
-
-DECLARE_ASN1_ALLOC_FUNCTIONS(POLICY_CONSTRAINTS)
-DECLARE_ASN1_ITEM(POLICY_CONSTRAINTS)
-
-GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
-			       const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
-			       int gen_type, char *value, int is_nc);
-
-#ifdef HEADER_CONF_H
-GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
-			       CONF_VALUE *cnf);
-GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
-				  const X509V3_EXT_METHOD *method,
-				  X509V3_CTX *ctx, CONF_VALUE *cnf, int is_nc);
-void X509V3_conf_free(CONF_VALUE *val);
-
-X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid, char *value);
-X509_EXTENSION *X509V3_EXT_nconf(CONF *conf, X509V3_CTX *ctx, char *name, char *value);
-int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, char *section, STACK_OF(X509_EXTENSION) **sk);
-int X509V3_EXT_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section, X509 *cert);
-int X509V3_EXT_REQ_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section, X509_REQ *req);
-int X509V3_EXT_CRL_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section, X509_CRL *crl);
-
-X509_EXTENSION *X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-				    int ext_nid, char *value);
-X509_EXTENSION *X509V3_EXT_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-				char *name, char *value);
-int X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-			char *section, X509 *cert);
-int X509V3_EXT_REQ_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-			    char *section, X509_REQ *req);
-int X509V3_EXT_CRL_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-			    char *section, X509_CRL *crl);
-
-int X509V3_add_value_bool_nf(char *name, int asn1_bool,
-			     STACK_OF(CONF_VALUE) **extlist);
-int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool);
-int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint);
-void X509V3_set_nconf(X509V3_CTX *ctx, CONF *conf);
-void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH_OF(CONF_VALUE) *lhash);
-#endif
-
-char * X509V3_get_string(X509V3_CTX *ctx, char *name, char *section);
-STACK_OF(CONF_VALUE) * X509V3_get_section(X509V3_CTX *ctx, char *section);
-void X509V3_string_free(X509V3_CTX *ctx, char *str);
-void X509V3_section_free( X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section);
-void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject,
-				 X509_REQ *req, X509_CRL *crl, int flags);
-
-int X509V3_add_value(const char *name, const char *value,
-						STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_uchar(const char *name, const unsigned char *value,
-						STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_bool(const char *name, int asn1_bool,
-						STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint,
-						STACK_OF(CONF_VALUE) **extlist);
-char * i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint);
-ASN1_INTEGER * s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, char *value);
-char * i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint);
-char * i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint);
-int X509V3_EXT_add(X509V3_EXT_METHOD *ext);
-int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist);
-int X509V3_EXT_add_alias(int nid_to, int nid_from);
-void X509V3_EXT_cleanup(void);
-
-const X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *ext);
-const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid);
-int X509V3_add_standard_extensions(void);
-STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line);
-void *X509V3_EXT_d2i(X509_EXTENSION *ext);
-void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx);
-
-
-X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);
-int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value, int crit, unsigned long flags);
-
-char *hex_to_string(const unsigned char *buffer, long len);
-unsigned char *string_to_hex(const char *str, long *len);
-int name_cmp(const char *name, const char *cmp);
-
-void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
-								 int ml);
-int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent);
-int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);
-
-int X509V3_extensions_print(BIO *out, char *title, STACK_OF(X509_EXTENSION) *exts, unsigned long flag, int indent);
-
-int X509_check_ca(X509 *x);
-int X509_check_purpose(X509 *x, int id, int ca);
-int X509_supported_extension(X509_EXTENSION *ex);
-int X509_PURPOSE_set(int *p, int purpose);
-int X509_check_issued(X509 *issuer, X509 *subject);
-int X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid);
-int X509_PURPOSE_get_count(void);
-X509_PURPOSE * X509_PURPOSE_get0(int idx);
-int X509_PURPOSE_get_by_sname(char *sname);
-int X509_PURPOSE_get_by_id(int id);
-int X509_PURPOSE_add(int id, int trust, int flags,
-			int (*ck)(const X509_PURPOSE *, const X509 *, int),
-				char *name, char *sname, void *arg);
-char *X509_PURPOSE_get0_name(X509_PURPOSE *xp);
-char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp);
-int X509_PURPOSE_get_trust(X509_PURPOSE *xp);
-void X509_PURPOSE_cleanup(void);
-int X509_PURPOSE_get_id(X509_PURPOSE *);
-
-STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x);
-STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x);
-void X509_email_free(STACK_OF(OPENSSL_STRING) *sk);
-STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x);
-
-ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
-ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);
-int a2i_ipadd(unsigned char *ipout, const char *ipasc);
-int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk,
-						unsigned long chtype);
-
-void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);
-DECLARE_STACK_OF(X509_POLICY_NODE)
-
-#ifndef OPENSSL_NO_RFC3779
-
-typedef struct ASRange_st {
-  ASN1_INTEGER *min, *max;
-} ASRange;
-
-#define	ASIdOrRange_id		0
-#define	ASIdOrRange_range	1
-
-typedef struct ASIdOrRange_st {
-  int type;
-  union {
-    ASN1_INTEGER *id;
-    ASRange      *range;
-  } u;
-} ASIdOrRange;
-
-typedef STACK_OF(ASIdOrRange) ASIdOrRanges;
-DECLARE_STACK_OF(ASIdOrRange)
-
-#define	ASIdentifierChoice_inherit		0
-#define	ASIdentifierChoice_asIdsOrRanges	1
-
-typedef struct ASIdentifierChoice_st {
-  int type;
-  union {
-    ASN1_NULL    *inherit;
-    ASIdOrRanges *asIdsOrRanges;
-  } u;
-} ASIdentifierChoice;
-
-typedef struct ASIdentifiers_st {
-  ASIdentifierChoice *asnum, *rdi;
-} ASIdentifiers;
-
-DECLARE_ASN1_FUNCTIONS(ASRange)
-DECLARE_ASN1_FUNCTIONS(ASIdOrRange)
-DECLARE_ASN1_FUNCTIONS(ASIdentifierChoice)
-DECLARE_ASN1_FUNCTIONS(ASIdentifiers)
-
-
-typedef struct IPAddressRange_st {
-  ASN1_BIT_STRING	*min, *max;
-} IPAddressRange;
-
-#define	IPAddressOrRange_addressPrefix	0
-#define	IPAddressOrRange_addressRange	1
-
-typedef struct IPAddressOrRange_st {
-  int type;
-  union {
-    ASN1_BIT_STRING	*addressPrefix;
-    IPAddressRange	*addressRange;
-  } u;
-} IPAddressOrRange;
-
-typedef STACK_OF(IPAddressOrRange) IPAddressOrRanges;
-DECLARE_STACK_OF(IPAddressOrRange)
-
-#define	IPAddressChoice_inherit			0
-#define	IPAddressChoice_addressesOrRanges	1
-
-typedef struct IPAddressChoice_st {
-  int type;
-  union {
-    ASN1_NULL		*inherit;
-    IPAddressOrRanges	*addressesOrRanges;
-  } u;
-} IPAddressChoice;
-
-typedef struct IPAddressFamily_st {
-  ASN1_OCTET_STRING	*addressFamily;
-  IPAddressChoice	*ipAddressChoice;
-} IPAddressFamily;
-
-typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
-DECLARE_STACK_OF(IPAddressFamily)
-
-DECLARE_ASN1_FUNCTIONS(IPAddressRange)
-DECLARE_ASN1_FUNCTIONS(IPAddressOrRange)
-DECLARE_ASN1_FUNCTIONS(IPAddressChoice)
-DECLARE_ASN1_FUNCTIONS(IPAddressFamily)
-
-/*
- * API tag for elements of the ASIdentifer SEQUENCE.
- */
-#define	V3_ASID_ASNUM	0
-#define	V3_ASID_RDI	1
-
-/*
- * AFI values, assigned by IANA.  It'd be nice to make the AFI
- * handling code totally generic, but there are too many little things
- * that would need to be defined for other address families for it to
- * be worth the trouble.
- */
-#define	IANA_AFI_IPV4	1
-#define	IANA_AFI_IPV6	2
-
-/*
- * Utilities to construct and extract values from RFC3779 extensions,
- * since some of the encodings (particularly for IP address prefixes
- * and ranges) are a bit tedious to work with directly.
- */
-int v3_asid_add_inherit(ASIdentifiers *asid, int which);
-int v3_asid_add_id_or_range(ASIdentifiers *asid, int which,
-			    ASN1_INTEGER *min, ASN1_INTEGER *max);
-int v3_addr_add_inherit(IPAddrBlocks *addr,
-			const unsigned afi, const unsigned *safi);
-int v3_addr_add_prefix(IPAddrBlocks *addr,
-		       const unsigned afi, const unsigned *safi,
-		       unsigned char *a, const int prefixlen);
-int v3_addr_add_range(IPAddrBlocks *addr,
-		      const unsigned afi, const unsigned *safi,
-		      unsigned char *min, unsigned char *max);
-unsigned v3_addr_get_afi(const IPAddressFamily *f);
-int v3_addr_get_range(IPAddressOrRange *aor, const unsigned afi,
-		      unsigned char *min, unsigned char *max,
-		      const int length);
-
-/*
- * Canonical forms.
- */
-int v3_asid_is_canonical(ASIdentifiers *asid);
-int v3_addr_is_canonical(IPAddrBlocks *addr);
-int v3_asid_canonize(ASIdentifiers *asid);
-int v3_addr_canonize(IPAddrBlocks *addr);
-
-/*
- * Tests for inheritance and containment.
- */
-int v3_asid_inherits(ASIdentifiers *asid);
-int v3_addr_inherits(IPAddrBlocks *addr);
-int v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b);
-int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b);
-
-/*
- * Check whether RFC 3779 extensions nest properly in chains.
- */
-int v3_asid_validate_path(X509_STORE_CTX *);
-int v3_addr_validate_path(X509_STORE_CTX *);
-int v3_asid_validate_resource_set(STACK_OF(X509) *chain,
-				  ASIdentifiers *ext,
-				  int allow_inheritance);
-int v3_addr_validate_resource_set(STACK_OF(X509) *chain,
-				  IPAddrBlocks *ext,
-				  int allow_inheritance);
-
-#endif /* OPENSSL_NO_RFC3779 */
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_X509V3_strings(void);
-
-/* Error codes for the X509V3 functions. */
-
-/* Function codes. */
-#define X509V3_F_A2I_GENERAL_NAME			 164
-#define X509V3_F_ASIDENTIFIERCHOICE_CANONIZE		 161
-#define X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL	 162
-#define X509V3_F_COPY_EMAIL				 122
-#define X509V3_F_COPY_ISSUER				 123
-#define X509V3_F_DO_DIRNAME				 144
-#define X509V3_F_DO_EXT_CONF				 124
-#define X509V3_F_DO_EXT_I2D				 135
-#define X509V3_F_DO_EXT_NCONF				 151
-#define X509V3_F_DO_I2V_NAME_CONSTRAINTS		 148
-#define X509V3_F_GNAMES_FROM_SECTNAME			 156
-#define X509V3_F_HEX_TO_STRING				 111
-#define X509V3_F_I2S_ASN1_ENUMERATED			 121
-#define X509V3_F_I2S_ASN1_IA5STRING			 149
-#define X509V3_F_I2S_ASN1_INTEGER			 120
-#define X509V3_F_I2V_AUTHORITY_INFO_ACCESS		 138
-#define X509V3_F_NOTICE_SECTION				 132
-#define X509V3_F_NREF_NOS				 133
-#define X509V3_F_POLICY_SECTION				 131
-#define X509V3_F_PROCESS_PCI_VALUE			 150
-#define X509V3_F_R2I_CERTPOL				 130
-#define X509V3_F_R2I_PCI				 155
-#define X509V3_F_S2I_ASN1_IA5STRING			 100
-#define X509V3_F_S2I_ASN1_INTEGER			 108
-#define X509V3_F_S2I_ASN1_OCTET_STRING			 112
-#define X509V3_F_S2I_ASN1_SKEY_ID			 114
-#define X509V3_F_S2I_SKEY_ID				 115
-#define X509V3_F_SET_DIST_POINT_NAME			 158
-#define X509V3_F_STRING_TO_HEX				 113
-#define X509V3_F_SXNET_ADD_ID_ASC			 125
-#define X509V3_F_SXNET_ADD_ID_INTEGER			 126
-#define X509V3_F_SXNET_ADD_ID_ULONG			 127
-#define X509V3_F_SXNET_GET_ID_ASC			 128
-#define X509V3_F_SXNET_GET_ID_ULONG			 129
-#define X509V3_F_V2I_ASIDENTIFIERS			 163
-#define X509V3_F_V2I_ASN1_BIT_STRING			 101
-#define X509V3_F_V2I_AUTHORITY_INFO_ACCESS		 139
-#define X509V3_F_V2I_AUTHORITY_KEYID			 119
-#define X509V3_F_V2I_BASIC_CONSTRAINTS			 102
-#define X509V3_F_V2I_CRLD				 134
-#define X509V3_F_V2I_EXTENDED_KEY_USAGE			 103
-#define X509V3_F_V2I_GENERAL_NAMES			 118
-#define X509V3_F_V2I_GENERAL_NAME_EX			 117
-#define X509V3_F_V2I_IDP				 157
-#define X509V3_F_V2I_IPADDRBLOCKS			 159
-#define X509V3_F_V2I_ISSUER_ALT				 153
-#define X509V3_F_V2I_NAME_CONSTRAINTS			 147
-#define X509V3_F_V2I_POLICY_CONSTRAINTS			 146
-#define X509V3_F_V2I_POLICY_MAPPINGS			 145
-#define X509V3_F_V2I_SUBJECT_ALT			 154
-#define X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL		 160
-#define X509V3_F_V3_GENERIC_EXTENSION			 116
-#define X509V3_F_X509V3_ADD1_I2D			 140
-#define X509V3_F_X509V3_ADD_VALUE			 105
-#define X509V3_F_X509V3_EXT_ADD				 104
-#define X509V3_F_X509V3_EXT_ADD_ALIAS			 106
-#define X509V3_F_X509V3_EXT_CONF			 107
-#define X509V3_F_X509V3_EXT_I2D				 136
-#define X509V3_F_X509V3_EXT_NCONF			 152
-#define X509V3_F_X509V3_GET_SECTION			 142
-#define X509V3_F_X509V3_GET_STRING			 143
-#define X509V3_F_X509V3_GET_VALUE_BOOL			 110
-#define X509V3_F_X509V3_PARSE_LIST			 109
-#define X509V3_F_X509_PURPOSE_ADD			 137
-#define X509V3_F_X509_PURPOSE_SET			 141
-
-/* Reason codes. */
-#define X509V3_R_BAD_IP_ADDRESS				 118
-#define X509V3_R_BAD_OBJECT				 119
-#define X509V3_R_BN_DEC2BN_ERROR			 100
-#define X509V3_R_BN_TO_ASN1_INTEGER_ERROR		 101
-#define X509V3_R_DIRNAME_ERROR				 149
-#define X509V3_R_DISTPOINT_ALREADY_SET			 160
-#define X509V3_R_DUPLICATE_ZONE_ID			 133
-#define X509V3_R_ERROR_CONVERTING_ZONE			 131
-#define X509V3_R_ERROR_CREATING_EXTENSION		 144
-#define X509V3_R_ERROR_IN_EXTENSION			 128
-#define X509V3_R_EXPECTED_A_SECTION_NAME		 137
-#define X509V3_R_EXTENSION_EXISTS			 145
-#define X509V3_R_EXTENSION_NAME_ERROR			 115
-#define X509V3_R_EXTENSION_NOT_FOUND			 102
-#define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED	 103
-#define X509V3_R_EXTENSION_VALUE_ERROR			 116
-#define X509V3_R_ILLEGAL_EMPTY_EXTENSION		 151
-#define X509V3_R_ILLEGAL_HEX_DIGIT			 113
-#define X509V3_R_INCORRECT_POLICY_SYNTAX_TAG		 152
-#define X509V3_R_INVALID_MULTIPLE_RDNS			 161
-#define X509V3_R_INVALID_ASNUMBER			 162
-#define X509V3_R_INVALID_ASRANGE			 163
-#define X509V3_R_INVALID_BOOLEAN_STRING			 104
-#define X509V3_R_INVALID_EXTENSION_STRING		 105
-#define X509V3_R_INVALID_INHERITANCE			 165
-#define X509V3_R_INVALID_IPADDRESS			 166
-#define X509V3_R_INVALID_NAME				 106
-#define X509V3_R_INVALID_NULL_ARGUMENT			 107
-#define X509V3_R_INVALID_NULL_NAME			 108
-#define X509V3_R_INVALID_NULL_VALUE			 109
-#define X509V3_R_INVALID_NUMBER				 140
-#define X509V3_R_INVALID_NUMBERS			 141
-#define X509V3_R_INVALID_OBJECT_IDENTIFIER		 110
-#define X509V3_R_INVALID_OPTION				 138
-#define X509V3_R_INVALID_POLICY_IDENTIFIER		 134
-#define X509V3_R_INVALID_PROXY_POLICY_SETTING		 153
-#define X509V3_R_INVALID_PURPOSE			 146
-#define X509V3_R_INVALID_SAFI				 164
-#define X509V3_R_INVALID_SECTION			 135
-#define X509V3_R_INVALID_SYNTAX				 143
-#define X509V3_R_ISSUER_DECODE_ERROR			 126
-#define X509V3_R_MISSING_VALUE				 124
-#define X509V3_R_NEED_ORGANIZATION_AND_NUMBERS		 142
-#define X509V3_R_NO_CONFIG_DATABASE			 136
-#define X509V3_R_NO_ISSUER_CERTIFICATE			 121
-#define X509V3_R_NO_ISSUER_DETAILS			 127
-#define X509V3_R_NO_POLICY_IDENTIFIER			 139
-#define X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED	 154
-#define X509V3_R_NO_PUBLIC_KEY				 114
-#define X509V3_R_NO_SUBJECT_DETAILS			 125
-#define X509V3_R_ODD_NUMBER_OF_DIGITS			 112
-#define X509V3_R_OPERATION_NOT_DEFINED			 148
-#define X509V3_R_OTHERNAME_ERROR			 147
-#define X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED	 155
-#define X509V3_R_POLICY_PATH_LENGTH			 156
-#define X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED	 157
-#define X509V3_R_POLICY_SYNTAX_NOT_CURRENTLY_SUPPORTED	 158
-#define X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY 159
-#define X509V3_R_SECTION_NOT_FOUND			 150
-#define X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS		 122
-#define X509V3_R_UNABLE_TO_GET_ISSUER_KEYID		 123
-#define X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT		 111
-#define X509V3_R_UNKNOWN_EXTENSION			 129
-#define X509V3_R_UNKNOWN_EXTENSION_NAME			 130
-#define X509V3_R_UNKNOWN_OPTION				 120
-#define X509V3_R_UNSUPPORTED_OPTION			 117
-#define X509V3_R_UNSUPPORTED_TYPE			 167
-#define X509V3_R_USER_TOO_LONG				 132
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/dep/include/postgre/libpq-fe.h b/dep/include/postgre/libpq-fe.h
index f51c6b38a..3bff3baa5 100644
--- a/dep/include/postgre/libpq-fe.h
+++ b/dep/include/postgre/libpq-fe.h
@@ -1,8 +1,8 @@
 /*-------------------------------------------------------------------------
  *
  * libpq-fe.h
- *	  This file contains definitions for structures and
- *	  externs for functions used by frontend postgres applications.
+ *      This file contains definitions for structures and
+ *      externs for functions used by frontend postgres applications.
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -16,7 +16,7 @@
 #define LIBPQ_FE_H
 
 #ifdef __cplusplus
-extern		"C"
+extern        "C"
 {
 #endif
 
@@ -32,71 +32,71 @@ extern		"C"
 
 typedef enum
 {
-	/*
-	 * Although it is okay to add to this list, values which become unused
-	 * should never be removed, nor should constants be redefined - that would
-	 * break compatibility with existing code.
-	 */
-	CONNECTION_OK,
-	CONNECTION_BAD,
-	/* Non-blocking mode only below here */
+    /*
+     * Although it is okay to add to this list, values which become unused
+     * should never be removed, nor should constants be redefined - that would
+     * break compatibility with existing code.
+     */
+    CONNECTION_OK,
+    CONNECTION_BAD,
+    /* Non-blocking mode only below here */
 
-	/*
-	 * The existence of these should never be relied upon - they should only
-	 * be used for user feedback or similar purposes.
-	 */
-	CONNECTION_STARTED,			/* Waiting for connection to be made.  */
-	CONNECTION_MADE,			/* Connection OK; waiting to send.	   */
-	CONNECTION_AWAITING_RESPONSE,		/* Waiting for a response from the
-										 * postmaster.		  */
-	CONNECTION_AUTH_OK,			/* Received authentication; waiting for
-								 * backend startup. */
-	CONNECTION_SETENV,			/* Negotiating environment. */
-	CONNECTION_SSL_STARTUP,		/* Negotiating SSL. */
-	CONNECTION_NEEDED			/* Internal state: connect() needed */
+    /*
+     * The existence of these should never be relied upon - they should only
+     * be used for user feedback or similar purposes.
+     */
+    CONNECTION_STARTED,            /* Waiting for connection to be made.  */
+    CONNECTION_MADE,            /* Connection OK; waiting to send.       */
+    CONNECTION_AWAITING_RESPONSE,        /* Waiting for a response from the
+                                         * postmaster.          */
+    CONNECTION_AUTH_OK,            /* Received authentication; waiting for
+                                 * backend startup. */
+    CONNECTION_SETENV,            /* Negotiating environment. */
+    CONNECTION_SSL_STARTUP,        /* Negotiating SSL. */
+    CONNECTION_NEEDED            /* Internal state: connect() needed */
 } ConnStatusType;
 
 typedef enum
 {
-	PGRES_POLLING_FAILED = 0,
-	PGRES_POLLING_READING,		/* These two indicate that one may	  */
-	PGRES_POLLING_WRITING,		/* use select before polling again.   */
-	PGRES_POLLING_OK,
-	PGRES_POLLING_ACTIVE		/* unused; keep for awhile for backwards
-								 * compatibility */
+    PGRES_POLLING_FAILED = 0,
+    PGRES_POLLING_READING,        /* These two indicate that one may      */
+    PGRES_POLLING_WRITING,        /* use select before polling again.   */
+    PGRES_POLLING_OK,
+    PGRES_POLLING_ACTIVE        /* unused; keep for awhile for backwards
+                                 * compatibility */
 } PostgresPollingStatusType;
 
 typedef enum
 {
-	PGRES_EMPTY_QUERY = 0,		/* empty query string was executed */
-	PGRES_COMMAND_OK,			/* a query command that doesn't return
-								 * anything was executed properly by the
-								 * backend */
-	PGRES_TUPLES_OK,			/* a query command that returns tuples was
-								 * executed properly by the backend, PGresult
-								 * contains the result tuples */
-	PGRES_COPY_OUT,				/* Copy Out data transfer in progress */
-	PGRES_COPY_IN,				/* Copy In data transfer in progress */
-	PGRES_BAD_RESPONSE,			/* an unexpected response was recv'd from the
-								 * backend */
-	PGRES_NONFATAL_ERROR,		/* notice or warning message */
-	PGRES_FATAL_ERROR			/* query failed */
+    PGRES_EMPTY_QUERY = 0,        /* empty query string was executed */
+    PGRES_COMMAND_OK,            /* a query command that doesn't return
+                                 * anything was executed properly by the
+                                 * backend */
+    PGRES_TUPLES_OK,            /* a query command that returns tuples was
+                                 * executed properly by the backend, PGresult
+                                 * contains the result tuples */
+    PGRES_COPY_OUT,                /* Copy Out data transfer in progress */
+    PGRES_COPY_IN,                /* Copy In data transfer in progress */
+    PGRES_BAD_RESPONSE,            /* an unexpected response was recv'd from the
+                                 * backend */
+    PGRES_NONFATAL_ERROR,        /* notice or warning message */
+    PGRES_FATAL_ERROR            /* query failed */
 } ExecStatusType;
 
 typedef enum
 {
-	PQTRANS_IDLE,				/* connection idle */
-	PQTRANS_ACTIVE,				/* command in progress */
-	PQTRANS_INTRANS,			/* idle, within transaction block */
-	PQTRANS_INERROR,			/* idle, within failed transaction */
-	PQTRANS_UNKNOWN				/* cannot determine status */
+    PQTRANS_IDLE,                /* connection idle */
+    PQTRANS_ACTIVE,                /* command in progress */
+    PQTRANS_INTRANS,            /* idle, within transaction block */
+    PQTRANS_INERROR,            /* idle, within failed transaction */
+    PQTRANS_UNKNOWN                /* cannot determine status */
 } PGTransactionStatusType;
 
 typedef enum
 {
-	PQERRORS_TERSE,				/* single-line error messages */
-	PQERRORS_DEFAULT,			/* recommended style */
-	PQERRORS_VERBOSE			/* all the facts, ma'am */
+    PQERRORS_TERSE,                /* single-line error messages */
+    PQERRORS_DEFAULT,            /* recommended style */
+    PQERRORS_VERBOSE            /* all the facts, ma'am */
 } PGVerbosity;
 
 /* PGconn encapsulates a connection to the backend.
@@ -125,11 +125,11 @@ typedef struct pg_cancel PGcancel;
  */
 typedef struct pgNotify
 {
-	char	   *relname;		/* notification condition name */
-	int			be_pid;			/* process ID of notifying server process */
-	char	   *extra;			/* notification parameter */
-	/* Fields below here are private to libpq; apps should not use 'em */
-	struct pgNotify *next;		/* list link */
+    char       *relname;        /* notification condition name */
+    int            be_pid;            /* process ID of notifying server process */
+    char       *extra;            /* notification parameter */
+    /* Fields below here are private to libpq; apps should not use 'em */
+    struct pgNotify *next;        /* list link */
 } PGnotify;
 
 /* Function types for notice-handling callbacks */
@@ -141,17 +141,17 @@ typedef char pqbool;
 
 typedef struct _PQprintOpt
 {
-	pqbool		header;			/* print output field headings and row count */
-	pqbool		align;			/* fill align the fields */
-	pqbool		standard;		/* old brain dead format */
-	pqbool		html3;			/* output html tables */
-	pqbool		expanded;		/* expand tables */
-	pqbool		pager;			/* use pager for output if needed */
-	char	   *fieldSep;		/* field separator */
-	char	   *tableOpt;		/* insert to HTML <table ...> */
-	char	   *caption;		/* HTML <caption> */
-	char	  **fieldName;		/* null terminated array of replacement field
-								 * names */
+    pqbool        header;            /* print output field headings and row count */
+    pqbool        align;            /* fill align the fields */
+    pqbool        standard;        /* old brain dead format */
+    pqbool        html3;            /* output html tables */
+    pqbool        expanded;        /* expand tables */
+    pqbool        pager;            /* use pager for output if needed */
+    char       *fieldSep;        /* field separator */
+    char       *tableOpt;        /* insert to HTML <table ...> */
+    char       *caption;        /* HTML <caption> */
+    char      **fieldName;        /* null terminated array of replacement field
+                                 * names */
 } PQprintOpt;
 
 /* ----------------
@@ -164,17 +164,17 @@ typedef struct _PQprintOpt
  */
 typedef struct _PQconninfoOption
 {
-	char	   *keyword;		/* The keyword of the option			*/
-	char	   *envvar;			/* Fallback environment variable name	*/
-	char	   *compiled;		/* Fallback compiled in default value	*/
-	char	   *val;			/* Option's current value, or NULL		 */
-	char	   *label;			/* Label for field in connect dialog	*/
-	char	   *dispchar;		/* Character to display for this field in a
-								 * connect dialog. Values are: "" Display
-								 * entered value as is "*" Password field -
-								 * hide value "D"  Debug option - don't show
-								 * by default */
-	int			dispsize;		/* Field size in characters for dialog	*/
+    char       *keyword;        /* The keyword of the option            */
+    char       *envvar;            /* Fallback environment variable name    */
+    char       *compiled;        /* Fallback compiled in default value    */
+    char       *val;            /* Option's current value, or NULL         */
+    char       *label;            /* Label for field in connect dialog    */
+    char       *dispchar;        /* Character to display for this field in a
+                                 * connect dialog. Values are: "" Display
+                                 * entered value as is "*" Password field -
+                                 * hide value "D"  Debug option - don't show
+                                 * by default */
+    int            dispsize;        /* Field size in characters for dialog    */
 } PQconninfoOption;
 
 /* ----------------
@@ -183,13 +183,13 @@ typedef struct _PQconninfoOption
  */
 typedef struct
 {
-	int			len;
-	int			isint;
-	union
-	{
-		int		   *ptr;		/* can't use void (dec compiler barfs)	 */
-		int			integer;
-	}			u;
+    int            len;
+    int            isint;
+    union
+    {
+        int           *ptr;        /* can't use void (dec compiler barfs)     */
+        int            integer;
+    }            u;
 } PQArgBlock;
 
 /* ----------------
@@ -197,7 +197,7 @@ typedef struct
  * ----------------
  */
 
-/* ===	in fe-connect.c === */
+/* ===    in fe-connect.c === */
 
 /* make a new client connection to the backend */
 /* Asynchronous (non-blocking) */
@@ -207,12 +207,12 @@ extern PostgresPollingStatusType PQconnectPoll(PGconn *conn);
 /* Synchronous (blocking) */
 extern PGconn *PQconnectdb(const char *conninfo);
 extern PGconn *PQsetdbLogin(const char *pghost, const char *pgport,
-			 const char *pgoptions, const char *pgtty,
-			 const char *dbName,
-			 const char *login, const char *pwd);
+             const char *pgoptions, const char *pgtty,
+             const char *dbName,
+             const char *login, const char *pwd);
 
 #define PQsetdb(M_PGHOST,M_PGPORT,M_PGOPT,M_PGTTY,M_DBNAME)  \
-	PQsetdbLogin(M_PGHOST, M_PGPORT, M_PGOPT, M_PGTTY, M_DBNAME, NULL, NULL)
+    PQsetdbLogin(M_PGHOST, M_PGPORT, M_PGOPT, M_PGTTY, M_DBNAME, NULL, NULL)
 
 /* close the current connection and free the PGconn data structure */
 extern void PQfinish(PGconn *conn);
@@ -228,7 +228,7 @@ extern void PQconninfoFree(PQconninfoOption *connOptions);
  * parameters
  */
 /* Asynchronous (non-blocking) */
-extern int	PQresetStart(PGconn *conn);
+extern int    PQresetStart(PGconn *conn);
 extern PostgresPollingStatusType PQresetPoll(PGconn *conn);
 
 /* Synchronous (blocking) */
@@ -241,10 +241,10 @@ extern PGcancel *PQgetCancel(PGconn *conn);
 extern void PQfreeCancel(PGcancel *cancel);
 
 /* issue a cancel request */
-extern int	PQcancel(PGcancel *cancel, char *errbuf, int errbufsize);
+extern int    PQcancel(PGcancel *cancel, char *errbuf, int errbufsize);
 
 /* backwards compatible version of PQcancel; not thread-safe */
-extern int	PQrequestCancel(PGconn *conn);
+extern int    PQrequestCancel(PGconn *conn);
 
 /* Accessor functions for PGconn objects */
 extern char *PQdb(const PGconn *conn);
@@ -257,16 +257,16 @@ extern char *PQoptions(const PGconn *conn);
 extern ConnStatusType PQstatus(const PGconn *conn);
 extern PGTransactionStatusType PQtransactionStatus(const PGconn *conn);
 extern const char *PQparameterStatus(const PGconn *conn,
-				  const char *paramName);
-extern int	PQprotocolVersion(const PGconn *conn);
-extern int	PQserverVersion(const PGconn *conn);
+                  const char *paramName);
+extern int    PQprotocolVersion(const PGconn *conn);
+extern int    PQserverVersion(const PGconn *conn);
 extern char *PQerrorMessage(const PGconn *conn);
-extern int	PQsocket(const PGconn *conn);
-extern int	PQbackendPID(const PGconn *conn);
-extern int	PQconnectionNeedsPassword(const PGconn *conn);
-extern int	PQconnectionUsedPassword(const PGconn *conn);
-extern int	PQclientEncoding(const PGconn *conn);
-extern int	PQsetClientEncoding(PGconn *conn, const char *encoding);
+extern int    PQsocket(const PGconn *conn);
+extern int    PQbackendPID(const PGconn *conn);
+extern int    PQconnectionNeedsPassword(const PGconn *conn);
+extern int    PQconnectionUsedPassword(const PGconn *conn);
+extern int    PQclientEncoding(const PGconn *conn);
+extern int    PQsetClientEncoding(PGconn *conn, const char *encoding);
 
 /* Get the OpenSSL structure associated with a connection. Returns NULL for
  * unencrypted connections or if any other TLS library is in use. */
@@ -284,18 +284,18 @@ extern void PQuntrace(PGconn *conn);
 
 /* Override default notice handling routines */
 extern PQnoticeReceiver PQsetNoticeReceiver(PGconn *conn,
-					PQnoticeReceiver proc,
-					void *arg);
+                    PQnoticeReceiver proc,
+                    void *arg);
 extern PQnoticeProcessor PQsetNoticeProcessor(PGconn *conn,
-					 PQnoticeProcessor proc,
-					 void *arg);
+                     PQnoticeProcessor proc,
+                     void *arg);
 
 /*
- *	   Used to set callback that prevents concurrent access to
- *	   non-thread safe functions that libpq needs.
- *	   The default implementation uses a libpq internal mutex.
- *	   Only required for multithreaded apps that use kerberos
- *	   both within their app and for postgresql connections.
+ *       Used to set callback that prevents concurrent access to
+ *       non-thread safe functions that libpq needs.
+ *       The default implementation uses a libpq internal mutex.
+ *       Only required for multithreaded apps that use kerberos
+ *       both within their app and for postgresql connections.
  */
 typedef void (*pgthreadlock_t) (int acquire);
 
@@ -306,116 +306,116 @@ extern pgthreadlock_t PQregisterThreadLock(pgthreadlock_t newhandler);
 /* Simple synchronous query */
 extern PGresult *PQexec(PGconn *conn, const char *query);
 extern PGresult *PQexecParams(PGconn *conn,
-			 const char *command,
-			 int nParams,
-			 const Oid *paramTypes,
-			 const char *const * paramValues,
-			 const int *paramLengths,
-			 const int *paramFormats,
-			 int resultFormat);
+             const char *command,
+             int nParams,
+             const Oid *paramTypes,
+             const char *const * paramValues,
+             const int *paramLengths,
+             const int *paramFormats,
+             int resultFormat);
 extern PGresult *PQprepare(PGconn *conn, const char *stmtName,
-		  const char *query, int nParams,
-		  const Oid *paramTypes);
+          const char *query, int nParams,
+          const Oid *paramTypes);
 extern PGresult *PQexecPrepared(PGconn *conn,
-			   const char *stmtName,
-			   int nParams,
-			   const char *const * paramValues,
-			   const int *paramLengths,
-			   const int *paramFormats,
-			   int resultFormat);
+               const char *stmtName,
+               int nParams,
+               const char *const * paramValues,
+               const int *paramLengths,
+               const int *paramFormats,
+               int resultFormat);
 
 /* Interface for multiple-result or asynchronous queries */
-extern int	PQsendQuery(PGconn *conn, const char *query);
+extern int    PQsendQuery(PGconn *conn, const char *query);
 extern int PQsendQueryParams(PGconn *conn,
-				  const char *command,
-				  int nParams,
-				  const Oid *paramTypes,
-				  const char *const * paramValues,
-				  const int *paramLengths,
-				  const int *paramFormats,
-				  int resultFormat);
+                  const char *command,
+                  int nParams,
+                  const Oid *paramTypes,
+                  const char *const * paramValues,
+                  const int *paramLengths,
+                  const int *paramFormats,
+                  int resultFormat);
 extern int PQsendPrepare(PGconn *conn, const char *stmtName,
-			  const char *query, int nParams,
-			  const Oid *paramTypes);
+              const char *query, int nParams,
+              const Oid *paramTypes);
 extern int PQsendQueryPrepared(PGconn *conn,
-					const char *stmtName,
-					int nParams,
-					const char *const * paramValues,
-					const int *paramLengths,
-					const int *paramFormats,
-					int resultFormat);
+                    const char *stmtName,
+                    int nParams,
+                    const char *const * paramValues,
+                    const int *paramLengths,
+                    const int *paramFormats,
+                    int resultFormat);
 extern PGresult *PQgetResult(PGconn *conn);
 
 /* Routines for managing an asynchronous query */
-extern int	PQisBusy(PGconn *conn);
-extern int	PQconsumeInput(PGconn *conn);
+extern int    PQisBusy(PGconn *conn);
+extern int    PQconsumeInput(PGconn *conn);
 
 /* LISTEN/NOTIFY support */
 extern PGnotify *PQnotifies(PGconn *conn);
 
 /* Routines for copy in/out */
-extern int	PQputCopyData(PGconn *conn, const char *buffer, int nbytes);
-extern int	PQputCopyEnd(PGconn *conn, const char *errormsg);
-extern int	PQgetCopyData(PGconn *conn, char **buffer, int async);
+extern int    PQputCopyData(PGconn *conn, const char *buffer, int nbytes);
+extern int    PQputCopyEnd(PGconn *conn, const char *errormsg);
+extern int    PQgetCopyData(PGconn *conn, char **buffer, int async);
 
 /* Deprecated routines for copy in/out */
-extern int	PQgetline(PGconn *conn, char *string, int length);
-extern int	PQputline(PGconn *conn, const char *string);
-extern int	PQgetlineAsync(PGconn *conn, char *buffer, int bufsize);
-extern int	PQputnbytes(PGconn *conn, const char *buffer, int nbytes);
-extern int	PQendcopy(PGconn *conn);
+extern int    PQgetline(PGconn *conn, char *string, int length);
+extern int    PQputline(PGconn *conn, const char *string);
+extern int    PQgetlineAsync(PGconn *conn, char *buffer, int bufsize);
+extern int    PQputnbytes(PGconn *conn, const char *buffer, int nbytes);
+extern int    PQendcopy(PGconn *conn);
 
 /* Set blocking/nonblocking connection to the backend */
-extern int	PQsetnonblocking(PGconn *conn, int arg);
-extern int	PQisnonblocking(const PGconn *conn);
-extern int	PQisthreadsafe(void);
+extern int    PQsetnonblocking(PGconn *conn, int arg);
+extern int    PQisnonblocking(const PGconn *conn);
+extern int    PQisthreadsafe(void);
 
 /* Force the write buffer to be written (or at least try) */
-extern int	PQflush(PGconn *conn);
+extern int    PQflush(PGconn *conn);
 
 /*
  * "Fast path" interface --- not really recommended for application
  * use
  */
 extern PGresult *PQfn(PGconn *conn,
-	 int fnid,
-	 int *result_buf,
-	 int *result_len,
-	 int result_is_int,
-	 const PQArgBlock *args,
-	 int nargs);
+     int fnid,
+     int *result_buf,
+     int *result_len,
+     int result_is_int,
+     const PQArgBlock *args,
+     int nargs);
 
 /* Accessor functions for PGresult objects */
 extern ExecStatusType PQresultStatus(const PGresult *res);
 extern char *PQresStatus(ExecStatusType status);
 extern char *PQresultErrorMessage(const PGresult *res);
 extern char *PQresultErrorField(const PGresult *res, int fieldcode);
-extern int	PQntuples(const PGresult *res);
-extern int	PQnfields(const PGresult *res);
-extern int	PQbinaryTuples(const PGresult *res);
+extern int    PQntuples(const PGresult *res);
+extern int    PQnfields(const PGresult *res);
+extern int    PQbinaryTuples(const PGresult *res);
 extern char *PQfname(const PGresult *res, int field_num);
-extern int	PQfnumber(const PGresult *res, const char *field_name);
-extern Oid	PQftable(const PGresult *res, int field_num);
-extern int	PQftablecol(const PGresult *res, int field_num);
-extern int	PQfformat(const PGresult *res, int field_num);
-extern Oid	PQftype(const PGresult *res, int field_num);
-extern int	PQfsize(const PGresult *res, int field_num);
-extern int	PQfmod(const PGresult *res, int field_num);
+extern int    PQfnumber(const PGresult *res, const char *field_name);
+extern Oid    PQftable(const PGresult *res, int field_num);
+extern int    PQftablecol(const PGresult *res, int field_num);
+extern int    PQfformat(const PGresult *res, int field_num);
+extern Oid    PQftype(const PGresult *res, int field_num);
+extern int    PQfsize(const PGresult *res, int field_num);
+extern int    PQfmod(const PGresult *res, int field_num);
 extern char *PQcmdStatus(PGresult *res);
-extern char *PQoidStatus(const PGresult *res);	/* old and ugly */
-extern Oid	PQoidValue(const PGresult *res);	/* new and improved */
+extern char *PQoidStatus(const PGresult *res);    /* old and ugly */
+extern Oid    PQoidValue(const PGresult *res);    /* new and improved */
 extern char *PQcmdTuples(PGresult *res);
 extern char *PQgetvalue(const PGresult *res, int tup_num, int field_num);
-extern int	PQgetlength(const PGresult *res, int tup_num, int field_num);
-extern int	PQgetisnull(const PGresult *res, int tup_num, int field_num);
-extern int	PQnparams(const PGresult *res);
-extern Oid	PQparamtype(const PGresult *res, int param_num);
+extern int    PQgetlength(const PGresult *res, int tup_num, int field_num);
+extern int    PQgetisnull(const PGresult *res, int tup_num, int field_num);
+extern int    PQnparams(const PGresult *res);
+extern Oid    PQparamtype(const PGresult *res, int param_num);
 
 /* Describe prepared statements and portals */
 extern PGresult *PQdescribePrepared(PGconn *conn, const char *stmt);
 extern PGresult *PQdescribePortal(PGconn *conn, const char *portal);
-extern int	PQsendDescribePrepared(PGconn *conn, const char *stmt);
-extern int	PQsendDescribePortal(PGconn *conn, const char *portal);
+extern int    PQsendDescribePrepared(PGconn *conn, const char *stmt);
+extern int    PQsendDescribePortal(PGconn *conn, const char *portal);
 
 /* Delete a PGresult */
 extern void PQclear(PGresult *res);
@@ -428,7 +428,7 @@ extern void PQfreemem(void *ptr);
 
 /* Error when no password was given. */
 /* Note: depending on this is deprecated; use PQconnectionNeedsPassword(). */
-#define PQnoPasswordSupplied	"fe_sendauth: no password supplied\n"
+#define PQnoPasswordSupplied    "fe_sendauth: no password supplied\n"
 
 /*
  * Make an empty PGresult with given status (some apps find this
@@ -440,73 +440,73 @@ extern PGresult *PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status);
 
 /* Quoting strings before inclusion in queries. */
 extern size_t PQescapeStringConn(PGconn *conn,
-				   char *to, const char *from, size_t length,
-				   int *error);
+                   char *to, const char *from, size_t length,
+                   int *error);
 extern unsigned char *PQescapeByteaConn(PGconn *conn,
-				  const unsigned char *from, size_t from_length,
-				  size_t *to_length);
+                  const unsigned char *from, size_t from_length,
+                  size_t *to_length);
 extern unsigned char *PQunescapeBytea(const unsigned char *strtext,
-				size_t *retbuflen);
+                size_t *retbuflen);
 
 /* These forms are deprecated! */
 extern size_t PQescapeString(char *to, const char *from, size_t length);
 extern unsigned char *PQescapeBytea(const unsigned char *from, size_t from_length,
-			  size_t *to_length);
+              size_t *to_length);
 
 
 
 /* === in fe-print.c === */
 
 extern void
-PQprint(FILE *fout,				/* output stream */
-		const PGresult *res,
-		const PQprintOpt *ps);	/* option structure */
+PQprint(FILE *fout,                /* output stream */
+        const PGresult *res,
+        const PQprintOpt *ps);    /* option structure */
 
 /*
  * really old printing routines
  */
 extern void
 PQdisplayTuples(const PGresult *res,
-				FILE *fp,		/* where to send the output */
-				int fillAlign,	/* pad the fields with spaces */
-				const char *fieldSep,	/* field separator */
-				int printHeader,	/* display headers? */
-				int quiet);
+                FILE *fp,        /* where to send the output */
+                int fillAlign,    /* pad the fields with spaces */
+                const char *fieldSep,    /* field separator */
+                int printHeader,    /* display headers? */
+                int quiet);
 
 extern void
 PQprintTuples(const PGresult *res,
-			  FILE *fout,		/* output stream */
-			  int printAttName, /* print attribute names */
-			  int terseOutput,	/* delimiter bars */
-			  int width);		/* width of column, if 0, use variable width */
+              FILE *fout,        /* output stream */
+              int printAttName, /* print attribute names */
+              int terseOutput,    /* delimiter bars */
+              int width);        /* width of column, if 0, use variable width */
 
 
 /* === in fe-lobj.c === */
 
 /* Large-object access routines */
-extern int	lo_open(PGconn *conn, Oid lobjId, int mode);
-extern int	lo_close(PGconn *conn, int fd);
-extern int	lo_read(PGconn *conn, int fd, char *buf, size_t len);
-extern int	lo_write(PGconn *conn, int fd, const char *buf, size_t len);
-extern int	lo_lseek(PGconn *conn, int fd, int offset, int whence);
-extern Oid	lo_creat(PGconn *conn, int mode);
-extern Oid	lo_create(PGconn *conn, Oid lobjId);
-extern int	lo_tell(PGconn *conn, int fd);
-extern int	lo_truncate(PGconn *conn, int fd, size_t len);
-extern int	lo_unlink(PGconn *conn, Oid lobjId);
-extern Oid	lo_import(PGconn *conn, const char *filename);
-extern int	lo_export(PGconn *conn, Oid lobjId, const char *filename);
+extern int    lo_open(PGconn *conn, Oid lobjId, int mode);
+extern int    lo_close(PGconn *conn, int fd);
+extern int    lo_read(PGconn *conn, int fd, char *buf, size_t len);
+extern int    lo_write(PGconn *conn, int fd, const char *buf, size_t len);
+extern int    lo_lseek(PGconn *conn, int fd, int offset, int whence);
+extern Oid    lo_creat(PGconn *conn, int mode);
+extern Oid    lo_create(PGconn *conn, Oid lobjId);
+extern int    lo_tell(PGconn *conn, int fd);
+extern int    lo_truncate(PGconn *conn, int fd, size_t len);
+extern int    lo_unlink(PGconn *conn, Oid lobjId);
+extern Oid    lo_import(PGconn *conn, const char *filename);
+extern int    lo_export(PGconn *conn, Oid lobjId, const char *filename);
 
 /* === in fe-misc.c === */
 
 /* Determine length of multibyte encoded char at *s */
-extern int	PQmblen(const char *s, int encoding);
+extern int    PQmblen(const char *s, int encoding);
 
 /* Determine display length of multibyte encoded char at *s */
-extern int	PQdsplen(const char *s, int encoding);
+extern int    PQdsplen(const char *s, int encoding);
 
 /* Get encoding id from environment variable PGCLIENTENCODING */
-extern int	PQenv2encoding(void);
+extern int    PQenv2encoding(void);
 
 /* === in fe-auth.c === */
 
@@ -514,9 +514,9 @@ extern char *PQencryptPassword(const char *passwd, const char *user);
 
 /* === in encnames.c === */
 
-extern int	pg_char_to_encoding(const char *name);
+extern int    pg_char_to_encoding(const char *name);
 extern const char *pg_encoding_to_char(int encoding);
-extern int	pg_valid_server_encoding_id(int encoding);
+extern int    pg_valid_server_encoding_id(int encoding);
 
 #ifdef __cplusplus
 }
diff --git a/dep/include/postgre/pg_type.h b/dep/include/postgre/pg_type.h
index 823656cb1..f68620081 100644
--- a/dep/include/postgre/pg_type.h
+++ b/dep/include/postgre/pg_type.h
@@ -1,8 +1,8 @@
 /*-------------------------------------------------------------------------
  *
  * pg_type.h
- *	  definition of the system "type" relation (pg_type)
- *	  along with the relation's initial contents.
+ *      definition of the system "type" relation (pg_type)
+ *      along with the relation's initial contents.
  *
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
@@ -11,8 +11,8 @@
  * $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/pg_type.h,v 1.8 2008/01/01 19:45:59 momjian Exp $
  *
  * NOTES
- *	  the genbki.sh script reads this file and generates .bki
- *	  information from the DATA() statements.
+ *      the genbki.sh script reads this file and generates .bki
+ *      information from the DATA() statements.
  *
  *-------------------------------------------------------------------------
  */
@@ -20,54 +20,54 @@
 #define PG_TYPE_H
 
 /* ----------------
- *		initial contents of pg_type
+ *        initial contents of pg_type
  * ----------------
  */
 
 /* keep the following ordered by OID so that later changes can be made easier*/
 
 /* OIDS 1 - 99 */
-#define BOOLOID			16
-#define BYTEAOID		17
-#define CHAROID			18
-#define NAMEOID			19
-#define INT8OID			20
-#define INT2OID			21
-#define INT2VECTOROID	22
-#define INT4OID			23
-#define REGPROCOID		24
-#define TEXTOID			25
-#define OIDOID			26
-#define TIDOID		27
+#define BOOLOID            16
+#define BYTEAOID        17
+#define CHAROID            18
+#define NAMEOID            19
+#define INT8OID            20
+#define INT2OID            21
+#define INT2VECTOROID    22
+#define INT4OID            23
+#define REGPROCOID        24
+#define TEXTOID            25
+#define OIDOID            26
+#define TIDOID        27
 #define XIDOID 28
 #define CIDOID 29
-#define OIDVECTOROID	30
-#define POINTOID		600
-#define LSEGOID			601
-#define PATHOID			602
-#define BOXOID			603
-#define POLYGONOID		604
-#define LINEOID			628
+#define OIDVECTOROID    30
+#define POINTOID        600
+#define LSEGOID            601
+#define PATHOID            602
+#define BOXOID            603
+#define POLYGONOID        604
+#define LINEOID            628
 #define FLOAT4OID 700
 #define FLOAT8OID 701
-#define ABSTIMEOID		702
-#define RELTIMEOID		703
-#define TINTERVALOID	704
-#define UNKNOWNOID		705
-#define CIRCLEOID		718
+#define ABSTIMEOID        702
+#define RELTIMEOID        703
+#define TINTERVALOID    704
+#define UNKNOWNOID        705
+#define CIRCLEOID        718
 #define CASHOID 790
 #define INETOID 869
 #define CIDROID 650
-#define BPCHAROID		1042
-#define VARCHAROID		1043
-#define DATEOID			1082
-#define TIMEOID			1083
-#define TIMESTAMPOID	1114
-#define TIMESTAMPTZOID	1184
-#define INTERVALOID		1186
-#define TIMETZOID		1266
-#define ZPBITOID	 1560
-#define VARBITOID	  1562
-#define NUMERICOID		1700
+#define BPCHAROID        1042
+#define VARCHAROID        1043
+#define DATEOID            1082
+#define TIMEOID            1083
+#define TIMESTAMPOID    1114
+#define TIMESTAMPTZOID    1184
+#define INTERVALOID        1186
+#define TIMETZOID        1266
+#define ZPBITOID     1560
+#define VARBITOID      1562
+#define NUMERICOID        1700
 
 #endif   /* PG_TYPE_H */
diff --git a/dep/include/postgre/postgres_ext.h b/dep/include/postgre/postgres_ext.h
index 51a18b7dc..244cf054c 100644
--- a/dep/include/postgre/postgres_ext.h
+++ b/dep/include/postgre/postgres_ext.h
@@ -2,18 +2,18 @@
  *
  * postgres_ext.h
  *
- *	   This file contains declarations of things that are visible everywhere
- *	in PostgreSQL *and* are visible to clients of frontend interface libraries.
- *	For example, the Oid type is part of the API of libpq and other libraries.
+ *       This file contains declarations of things that are visible everywhere
+ *    in PostgreSQL *and* are visible to clients of frontend interface libraries.
+ *    For example, the Oid type is part of the API of libpq and other libraries.
  *
- *	   Declarations which are specific to a particular interface should
- *	go in the header file for that interface (such as libpq-fe.h).	This
- *	file is only for fundamental Postgres declarations.
+ *       Declarations which are specific to a particular interface should
+ *    go in the header file for that interface (such as libpq-fe.h).    This
+ *    file is only for fundamental Postgres declarations.
  *
- *	   User-written C functions don't count as "external to Postgres."
- *	Those function much as local modifications to the backend itself, and
- *	use header files that are otherwise internal to Postgres to interface
- *	with the backend.
+ *       User-written C functions don't count as "external to Postgres."
+ *    Those function much as local modifications to the backend itself, and
+ *    use header files that are otherwise internal to Postgres to interface
+ *    with the backend.
  *
  * $PostgreSQL: pgsql/src/include/postgres_ext.h,v 1.17 2007/02/06 09:16:08 petere Exp $
  *
@@ -29,9 +29,9 @@
 typedef unsigned int Oid;
 
 #ifdef __cplusplus
-#define InvalidOid		(Oid(0))
+#define InvalidOid        (Oid(0))
 #else
-#define InvalidOid		((Oid) 0)
+#define InvalidOid        ((Oid) 0)
 #endif
 
 #define OID_MAX  UINT_MAX
@@ -43,17 +43,17 @@ typedef unsigned int Oid;
  * between frontend and backend, and also to export them to libpq
  * applications.
  */
-#define PG_DIAG_SEVERITY		'S'
-#define PG_DIAG_SQLSTATE		'C'
+#define PG_DIAG_SEVERITY        'S'
+#define PG_DIAG_SQLSTATE        'C'
 #define PG_DIAG_MESSAGE_PRIMARY 'M'
-#define PG_DIAG_MESSAGE_DETAIL	'D'
-#define PG_DIAG_MESSAGE_HINT	'H'
+#define PG_DIAG_MESSAGE_DETAIL    'D'
+#define PG_DIAG_MESSAGE_HINT    'H'
 #define PG_DIAG_STATEMENT_POSITION 'P'
 #define PG_DIAG_INTERNAL_POSITION 'p'
-#define PG_DIAG_INTERNAL_QUERY	'q'
-#define PG_DIAG_CONTEXT			'W'
-#define PG_DIAG_SOURCE_FILE		'F'
-#define PG_DIAG_SOURCE_LINE		'L'
+#define PG_DIAG_INTERNAL_QUERY    'q'
+#define PG_DIAG_CONTEXT            'W'
+#define PG_DIAG_SOURCE_FILE        'F'
+#define PG_DIAG_SOURCE_LINE        'L'
 #define PG_DIAG_SOURCE_FUNCTION 'R'
 
 #endif
diff --git a/dep/include/zlib/zconf.h b/dep/include/zlib/zconf.h
deleted file mode 100644
index 03a9431c8..000000000
--- a/dep/include/zlib/zconf.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_          z_deflateInit_
-#  define deflate               z_deflate
-#  define deflateEnd            z_deflateEnd
-#  define inflateInit_          z_inflateInit_
-#  define inflate               z_inflate
-#  define inflateEnd            z_inflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateCopy           z_deflateCopy
-#  define deflateReset          z_deflateReset
-#  define deflateParams         z_deflateParams
-#  define deflateBound          z_deflateBound
-#  define deflatePrime          z_deflatePrime
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateCopy           z_inflateCopy
-#  define inflateReset          z_inflateReset
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  define uncompress            z_uncompress
-#  define adler32               z_adler32
-#  define crc32                 z_crc32
-#  define get_crc_table         z_get_crc_table
-#  define zError                z_zError
-
-#  define alloc_func            z_alloc_func
-#  define free_func             z_free_func
-#  define in_func               z_in_func
-#  define out_func              z_out_func
-#  define Byte                  z_Byte
-#  define uInt                  z_uInt
-#  define uLong                 z_uLong
-#  define Bytef                 z_Bytef
-#  define charf                 z_charf
-#  define intf                  z_intf
-#  define uIntf                 z_uIntf
-#  define uLongf                z_uLongf
-#  define voidpf                z_voidpf
-#  define voidp                 z_voidp
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
-#  endif
-#  define z_off_t off_t
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#  ifdef FAR
-#    undef FAR
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(deflateBound,"DEBND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(compressBound,"CMBND")
-#   pragma map(inflate_table,"INTABL")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/dep/include/zlib/zlib.h b/dep/include/zlib/zlib.h
deleted file mode 100644
index 022817927..000000000
--- a/dep/include/zlib/zlib.h
+++ /dev/null
@@ -1,1357 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.3, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
-
-/*
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-     The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-     This library can optionally read and write gzip streams in memory as well.
-
-     The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows. deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumualte before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  the value returned by deflateBound (see below). If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows. inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-  if and when it gets to the next deflate block boundary. When decoding the
-  zlib or gzip format, this will cause inflate() to return immediately after
-  the header and before the first block. When doing a raw inflate, inflate()
-  will go ahead and process the first block, and will return when it gets to
-  the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64
-  if inflate() is currently decoding the last block in the deflate stream,
-  plus 128 if inflate() returned immediately after decoding an end-of-block
-  code or decoding the complete header up to just before the first byte of the
-  deflate stream. The end-of-block will not be indicated until all of the
-  uncompressed data from that block has been written to strm->next_out.  The
-  number of unused bits may in general be greater than seven, except when
-  bit 7 of data_type is set, in which case the number of unused bits will be
-  less than eight.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster approach
-  may be used for the single inflate() call.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call. So the only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below. At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically.  Any information
-  contained in the gzip header is not retained, so applications that need that
-  information should instead use raw inflate, see inflateInit2() below, or
-  inflateBack() and perform their own processing of the gzip header and
-  trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing. If Z_DATA_ERROR is returned, the application may then
-  call inflateSync() to look for a good compression block if a partial recovery
-  of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer). It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
-   determines the window size. deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding. Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper. The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero),
-   no header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding). Filtered data consists mostly of small values with a somewhat
-   random distribution. In this case, the compression algorithm is tuned to
-   compress them better. The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
-   parameter only affects the compression ratio but not the correctness of the
-   compressed output even if it is not set appropriately.  Z_FIXED prevents the
-   use of dynamic Huffman codes, allowing for a simpler decoder for special
-   applications.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front. In addition, the
-   current implementation of deflate will use at most the window size minus
-   262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit()
-   or deflateInit2().  This would be used to allocate an output buffer
-   for deflation in a single pass, and so would be called before deflate().
-*/
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-  is that this function is used to start off the deflate output with the
-  bits leftover from a previous deflate stream when appending to it.  As such,
-  this function can only be used for raw deflate, and must be used before the
-  first deflate() call after a deflateInit2() or deflateReset().  bits must be
-  less than or equal to 16, and that many of the least significant bits of
-  value will be inserted in the output.
-
-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-      If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter. The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used. If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-   determines the window size. inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream. This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values. If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is. Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding. Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
-   a crc32 instead of an adler32.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
-   is set to null if there is no error message.  inflateInit2 does not perform
-   any decompression apart from reading the zlib header if present: this will
-   be done by inflate(). (So next_in and avail_in may be modified, but next_out
-   and avail_out are unchanged.)
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  The application must insure that the
-   dictionary that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
-
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-  that this function is used to start inflating at a bit position in the
-  middle of a byte.  The provided bits will be used before any bytes are used
-  from next_in.  This function should only be used with raw inflate, and
-  should be used before the first inflate() call after inflateInit2() or
-  inflateReset().  bits must be less than or equal to 16, and that many of the
-  least significant bits of value will be inserted in the input.
-
-      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
-   force inflate() to return immediately after header processing is complete
-   and before any actual data is decompressed.
-
-      The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When
-   any of extra, name, or comment are not Z_NULL and the respective field is
-   not present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-      If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
-   be allocated, or Z_VERSION_ERROR if the version of the library does not
-   match the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free
-   the allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects
-   only the raw deflate stream to decompress.  This is different from the
-   normal behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format
-   error in the deflate stream (in which case strm->msg is set to indicate the
-   nature of the error), or Z_STREAM_ERROR if the stream was not properly
-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
-   distinguished using strm->next_in which will be Z_NULL only if in() returned
-   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
-   out() returning non-zero.  (in() will always be called before out(), so
-   strm->next_in is assured to be defined if out() returns non-zero.)  Note
-   that inflateBack() cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least the value returned
-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before
-   a compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
-*/
-
-
-typedef voidp gzFile;
-
-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h", or 'R' for run-length encoding
-   as in "wb1R". (See the description of deflateInit2 for more information
-   about the strategy parameter.)
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
-
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
-
-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy. See the description
-   of deflateInit2 for the meaning of these parameters.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
-                                   voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).  The number of
-   uncompressed bytes written is limited to 4095. The caller should assure that
-   this limit is not exceeded. If it is exceeded, then gzprintf() will return
-   return an error (0) with nothing written. In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
-/*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
-/*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-
-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
-/*
-      Push one character back onto the stream to be read again later.
-   Only one character of push-back is allowed.  gzungetc() returns the
-   character pushed, or -1 on failure.  gzungetc() will fail if a
-   character has been pushed but not read yet, or if c is -1. The pushed
-   character will be discarded if the stream is repositioned with gzseek()
-   or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-                                      z_off_t offset, int whence));
-/*
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-/*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns 1 if file is being read directly without decompression, otherwise
-   zero.
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file. This is analogous to the
-   clearerr() function in stdio. This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-/*
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32. If buf is NULL, this function returns the required initial
-   value for the for the crc. Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-/*
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-        ZLIB_VERSION, sizeof(z_stream))
-
-
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
-#endif
-
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
diff --git a/dep/lib/Win32/libeay32.dll b/dep/lib/Win32/libeay32.dll
deleted file mode 100644
index 85538d4cf..000000000
Binary files a/dep/lib/Win32/libeay32.dll and /dev/null differ
diff --git a/dep/lib/Win32/libeay32.lib b/dep/lib/Win32/libeay32.lib
deleted file mode 100644
index fa324242d..000000000
Binary files a/dep/lib/Win32/libeay32.lib and /dev/null differ
diff --git a/dep/lib/Win32/libmysql.dll b/dep/lib/Win32/libmysql.dll
deleted file mode 100644
index d197ad11f..000000000
Binary files a/dep/lib/Win32/libmysql.dll and /dev/null differ
diff --git a/dep/lib/Win32/libmysql.lib b/dep/lib/Win32/libmysql.lib
deleted file mode 100644
index 1cce3a2cd..000000000
Binary files a/dep/lib/Win32/libmysql.lib and /dev/null differ
diff --git a/dep/lib/Win32/license.txt b/dep/lib/Win32/license.txt
deleted file mode 100644
index e47d101f1..000000000
--- a/dep/lib/Win32/license.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-
-  LICENSE ISSUES
-  ==============
-
-  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
-  the OpenSSL License and the original SSLeay license apply to the toolkit.
-  See below for the actual license texts. Actually both licenses are BSD-style
-  Open Source licenses. In case of any license issues related to OpenSSL
-  please contact openssl-core@openssl.org.
-
-  OpenSSL License
-  ---------------
-
-/* ====================================================================
- * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
- Original SSLeay License
- -----------------------
-
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
diff --git a/dep/lib/Win32/mysqlclient.lib b/dep/lib/Win32/mysqlclient.lib
deleted file mode 100644
index 3817683fb..000000000
Binary files a/dep/lib/Win32/mysqlclient.lib and /dev/null differ
diff --git a/dep/lib/Win32/news.txt b/dep/lib/Win32/news.txt
deleted file mode 100644
index 0269f2277..000000000
--- a/dep/lib/Win32/news.txt
+++ /dev/null
@@ -1,656 +0,0 @@
-
-  NEWS
-  ====
-
-  This file gives a brief overview of the major changes between each OpenSSL
-  release. For more details please read the CHANGES file.
-
-  Major changes between OpenSSL 1.0.1d and OpenSSL 1.0.1e:
-
-      o Corrected fix for CVE-2013-0169
-
-  Major changes between OpenSSL 1.0.1c and OpenSSL 1.0.1d:
-
-      o Fix renegotiation in TLS 1.1, 1.2 by using the correct TLS version.
-      o Include the fips configuration module.
-      o Fix OCSP bad key DoS attack CVE-2013-0166
-      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
-      o Fix for TLS AESNI record handling flaw CVE-2012-2686
-
-  Major changes between OpenSSL 1.0.1b and OpenSSL 1.0.1c:
-
-      o Fix TLS/DTLS record length checking bug CVE-2012-2333
-      o Don't attempt to use non-FIPS composite ciphers in FIPS mode.
-
-  Major changes between OpenSSL 1.0.1a and OpenSSL 1.0.1b:
-
-      o Fix compilation error on non-x86 platforms.
-      o Make FIPS capable OpenSSL ciphers work in non-FIPS mode.
-      o Fix SSL_OP_NO_TLSv1_1 clash with SSL_OP_ALL in OpenSSL 1.0.0
-
-  Major changes between OpenSSL 1.0.1 and OpenSSL 1.0.1a:
-
-      o Fix for ASN1 overflow bug CVE-2012-2110
-      o Workarounds for some servers that hang on long client hellos.
-      o Fix SEGV in AES code.
-
-  Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.1:
-
-      o TLS/DTLS heartbeat support.
-      o SCTP support.
-      o RFC 5705 TLS key material exporter.
-      o RFC 5764 DTLS-SRTP negotiation.
-      o Next Protocol Negotiation.
-      o PSS signatures in certificates, requests and CRLs.
-      o Support for password based recipient info for CMS.
-      o Support TLS v1.2 and TLS v1.1.
-      o Preliminary FIPS capability for unvalidated 2.0 FIPS module.
-      o SRP support.
-
-  Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h:
-
-      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
-      o Corrected fix for CVE-2011-4619
-      o Various DTLS fixes.
-
-  Major changes between OpenSSL 1.0.0f and OpenSSL 1.0.0g:
-
-      o Fix for DTLS DoS issue CVE-2012-0050
-
-  Major changes between OpenSSL 1.0.0e and OpenSSL 1.0.0f:
-
-      o Fix for DTLS plaintext recovery attack CVE-2011-4108
-      o Clear block padding bytes of SSL 3.0 records CVE-2011-4576
-      o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619
-      o Check parameters are not NULL in GOST ENGINE CVE-2012-0027
-      o Check for malformed RFC3779 data CVE-2011-4577
-
-  Major changes between OpenSSL 1.0.0d and OpenSSL 1.0.0e:
-
-      o Fix for CRL vulnerability issue CVE-2011-3207
-      o Fix for ECDH crashes CVE-2011-3210
-      o Protection against EC timing attacks.
-      o Support ECDH ciphersuites for certificates using SHA2 algorithms.
-      o Various DTLS fixes.
-
-  Major changes between OpenSSL 1.0.0c and OpenSSL 1.0.0d:
-
-      o Fix for security issue CVE-2011-0014
-
-  Major changes between OpenSSL 1.0.0b and OpenSSL 1.0.0c:
-
-      o Fix for security issue CVE-2010-4180
-      o Fix for CVE-2010-4252
-      o Fix mishandling of absent EC point format extension.
-      o Fix various platform compilation issues.
-      o Corrected fix for security issue CVE-2010-3864.
-
-  Major changes between OpenSSL 1.0.0a and OpenSSL 1.0.0b:
-
-      o Fix for security issue CVE-2010-3864.
-      o Fix for CVE-2010-2939
-      o Fix WIN32 build system for GOST ENGINE.
-
-  Major changes between OpenSSL 1.0.0 and OpenSSL 1.0.0a:
-
-      o Fix for security issue CVE-2010-1633.
-      o GOST MAC and CFB fixes.
-
-  Major changes between OpenSSL 0.9.8n and OpenSSL 1.0.0:
-
-      o RFC3280 path validation: sufficient to process PKITS tests.
-      o Integrated support for PVK files and keyblobs.
-      o Change default private key format to PKCS#8.
-      o CMS support: able to process all examples in RFC4134
-      o Streaming ASN1 encode support for PKCS#7 and CMS.
-      o Multiple signer and signer add support for PKCS#7 and CMS.
-      o ASN1 printing support.
-      o Whirlpool hash algorithm added.
-      o RFC3161 time stamp support.
-      o New generalised public key API supporting ENGINE based algorithms.
-      o New generalised public key API utilities.
-      o New ENGINE supporting GOST algorithms.
-      o SSL/TLS GOST ciphersuite support.
-      o PKCS#7 and CMS GOST support.
-      o RFC4279 PSK ciphersuite support.
-      o Supported points format extension for ECC ciphersuites.
-      o ecdsa-with-SHA224/256/384/512 signature types.
-      o dsa-with-SHA224 and dsa-with-SHA256 signature types.
-      o Opaque PRF Input TLS extension support.
-      o Updated time routines to avoid OS limitations.
-
-  Major changes between OpenSSL 0.9.8q and OpenSSL 0.9.8r:
-
-      o Fix for security issue CVE-2011-0014
-
-  Major changes between OpenSSL 0.9.8p and OpenSSL 0.9.8q:
-
-      o Fix for security issue CVE-2010-4180
-      o Fix for CVE-2010-4252
-
-  Major changes between OpenSSL 0.9.8o and OpenSSL 0.9.8p:
-
-      o Fix for security issue CVE-2010-3864.
-
-  Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o:
-
-      o Fix for security issue CVE-2010-0742.
-      o Various DTLS fixes.
-      o Recognise SHA2 certificates if only SSL algorithms added.
-      o Fix for no-rc4 compilation.
-      o Chil ENGINE unload workaround.
-
-  Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n:
-
-      o CFB cipher definition fixes.
-      o Fix security issues CVE-2010-0740 and CVE-2010-0433.
-
-  Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m:
-
-      o Cipher definition fixes.
-      o Workaround for slow RAND_poll() on some WIN32 versions.
-      o Remove MD2 from algorithm tables.
-      o SPKAC handling fixes.
-      o Support for RFC5746 TLS renegotiation extension.
-      o Compression memory leak fixed.
-      o Compression session resumption fixed.
-      o Ticket and SNI coexistence fixes.
-      o Many fixes to DTLS handling. 
-
-  Major changes between OpenSSL 0.9.8k and OpenSSL 0.9.8l:
-
-      o Temporary work around for CVE-2009-3555: disable renegotiation.
-
-  Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k:
-
-      o Fix various build issues.
-      o Fix security issues (CVE-2009-0590, CVE-2009-0591, CVE-2009-0789)
-
-  Major changes between OpenSSL 0.9.8i and OpenSSL 0.9.8j:
-
-      o Fix security issue (CVE-2008-5077)
-      o Merge FIPS 140-2 branch code.
-
-  Major changes between OpenSSL 0.9.8g and OpenSSL 0.9.8h:
-
-      o CryptoAPI ENGINE support.
-      o Various precautionary measures.
-      o Fix for bugs affecting certificate request creation.
-      o Support for local machine keyset attribute in PKCS#12 files.
-
-  Major changes between OpenSSL 0.9.8f and OpenSSL 0.9.8g:
-
-      o Backport of CMS functionality to 0.9.8.
-      o Fixes for bugs introduced with 0.9.8f.
-
-  Major changes between OpenSSL 0.9.8e and OpenSSL 0.9.8f:
-
-      o Add gcc 4.2 support.
-      o Add support for AES and SSE2 assembly lanugauge optimization
-        for VC++ build.
-      o Support for RFC4507bis and server name extensions if explicitly 
-        selected at compile time.
-      o DTLS improvements.
-      o RFC4507bis support.
-      o TLS Extensions support.
-
-  Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e:
-
-      o Various ciphersuite selection fixes.
-      o RFC3779 support.
-
-  Major changes between OpenSSL 0.9.8c and OpenSSL 0.9.8d:
-
-      o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
-      o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
-      o Changes to ciphersuite selection algorithm
-
-  Major changes between OpenSSL 0.9.8b and OpenSSL 0.9.8c:
-
-      o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
-      o New cipher Camellia
-
-  Major changes between OpenSSL 0.9.8a and OpenSSL 0.9.8b:
-
-      o Cipher string fixes.
-      o Fixes for VC++ 2005.
-      o Updated ECC cipher suite support.
-      o New functions EVP_CIPHER_CTX_new() and EVP_CIPHER_CTX_free().
-      o Zlib compression usage fixes.
-      o Built in dynamic engine compilation support on Win32.
-      o Fixes auto dynamic engine loading in Win32.
-
-  Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a:
-
-      o Fix potential SSL 2.0 rollback, CVE-2005-2969
-      o Extended Windows CE support
-
-  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.8:
-
-      o Major work on the BIGNUM library for higher efficiency and to
-        make operations more streamlined and less contradictory.  This
-        is the result of a major audit of the BIGNUM library.
-      o Addition of BIGNUM functions for fields GF(2^m) and NIST
-        curves, to support the Elliptic Crypto functions.
-      o Major work on Elliptic Crypto; ECDH and ECDSA added, including
-        the use through EVP, X509 and ENGINE.
-      o New ASN.1 mini-compiler that's usable through the OpenSSL
-        configuration file.
-      o Added support for ASN.1 indefinite length constructed encoding.
-      o New PKCS#12 'medium level' API to manipulate PKCS#12 files.
-      o Complete rework of shared library construction and linking
-        programs with shared or static libraries, through a separate
-        Makefile.shared.
-      o Rework of the passing of parameters from one Makefile to another.
-      o Changed ENGINE framework to load dynamic engine modules
-        automatically from specifically given directories.
-      o New structure and ASN.1 functions for CertificatePair.
-      o Changed the ZLIB compression method to be stateful.
-      o Changed the key-generation and primality testing "progress"
-        mechanism to take a structure that contains the ticker
-        function and an argument.
-      o New engine module: GMP (performs private key exponentiation).
-      o New engine module: VIA PadLOck ACE extension in VIA C3
-        Nehemiah processors.
-      o Added support for IPv6 addresses in certificate extensions.
-        See RFC 1884, section 2.2.
-      o Added support for certificate policy mappings, policy
-        constraints and name constraints.
-      o Added support for multi-valued AVAs in the OpenSSL
-        configuration file.
-      o Added support for multiple certificates with the same subject
-        in the 'openssl ca' index file.
-      o Make it possible to create self-signed certificates using
-        'openssl ca -selfsign'.
-      o Make it possible to generate a serial number file with
-        'openssl ca -create_serial'.
-      o New binary search functions with extended functionality.
-      o New BUF functions.
-      o New STORE structure and library to provide an interface to all
-        sorts of data repositories.  Supports storage of public and
-        private keys, certificates, CRLs, numbers and arbitrary blobs.
-	This library is unfortunately unfinished and unused withing
-	OpenSSL.
-      o New control functions for the error stack.
-      o Changed the PKCS#7 library to support one-pass S/MIME
-        processing.
-      o Added the possibility to compile without old deprecated
-        functionality with the OPENSSL_NO_DEPRECATED macro or the
-        'no-deprecated' argument to the config and Configure scripts.
-      o Constification of all ASN.1 conversion functions, and other
-        affected functions.
-      o Improved platform support for PowerPC.
-      o New FIPS 180-2 algorithms (SHA-224, -256, -384 and -512).
-      o New X509_VERIFY_PARAM structure to support parametrisation
-        of X.509 path validation.
-      o Major overhaul of RC4 performance on Intel P4, IA-64 and
-        AMD64.
-      o Changed the Configure script to have some algorithms disabled
-        by default.  Those can be explicitely enabled with the new
-        argument form 'enable-xxx'.
-      o Change the default digest in 'openssl' commands from MD5 to
-        SHA-1.
-      o Added support for DTLS.
-      o New BIGNUM blinding.
-      o Added support for the RSA-PSS encryption scheme
-      o Added support for the RSA X.931 padding.
-      o Added support for BSD sockets on NetWare.
-      o Added support for files larger than 2GB.
-      o Added initial support for Win64.
-      o Added alternate pkg-config files.
-
-  Major changes between OpenSSL 0.9.7l and OpenSSL 0.9.7m:
-
-      o FIPS 1.1.1 module linking.
-      o Various ciphersuite selection fixes.
-
-  Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l:
-
-      o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
-      o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
-
-  Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k:
-
-      o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
-
-  Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j:
-
-      o Visual C++ 2005 fixes.
-      o Update Windows build system for FIPS.
-
-  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i:
-
-      o Give EVP_MAX_MD_SIZE it's old value, except for a FIPS build.
-
-  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h:
-
-      o Fix SSL 2.0 Rollback, CVE-2005-2969
-      o Allow use of fixed-length exponent on DSA signing
-      o Default fixed-window RSA, DSA, DH private-key operations
-
-  Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g:
-
-      o More compilation issues fixed.
-      o Adaptation to more modern Kerberos API.
-      o Enhanced or corrected configuration for Solaris64, Mingw and Cygwin.
-      o Enhanced x86_64 assembler BIGNUM module.
-      o More constification.
-      o Added processing of proxy certificates (RFC 3820).
-
-  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f:
-
-      o Several compilation issues fixed.
-      o Many memory allocation failure checks added.
-      o Improved comparison of X509 Name type.
-      o Mandatory basic checks on certificates.
-      o Performance improvements.
-
-  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e:
-
-      o Fix race condition in CRL checking code.
-      o Fixes to PKCS#7 (S/MIME) code.
-
-  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d:
-
-      o Security: Fix Kerberos ciphersuite SSL/TLS handshaking bug
-      o Security: Fix null-pointer assignment in do_change_cipher_spec()
-      o Allow multiple active certificates with same subject in CA index
-      o Multiple X509 verification fixes
-      o Speed up HMAC and other operations
-
-  Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c:
-
-      o Security: fix various ASN1 parsing bugs.
-      o New -ignore_err option to OCSP utility.
-      o Various interop and bug fixes in S/MIME code.
-      o SSL/TLS protocol fix for unrequested client certificates.
-
-  Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b:
-
-      o Security: counter the Klima-Pokorny-Rosa extension of
-        Bleichbacher's attack 
-      o Security: make RSA blinding default.
-      o Configuration: Irix fixes, AIX fixes, better mingw support.
-      o Support for new platforms: linux-ia64-ecc.
-      o Build: shared library support fixes.
-      o ASN.1: treat domainComponent correctly.
-      o Documentation: fixes and additions.
-
-  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a:
-
-      o Security: Important security related bugfixes.
-      o Enhanced compatibility with MIT Kerberos.
-      o Can be built without the ENGINE framework.
-      o IA32 assembler enhancements.
-      o Support for new platforms: FreeBSD/IA64 and FreeBSD/Sparc64.
-      o Configuration: the no-err option now works properly.
-      o SSL/TLS: now handles manual certificate chain building.
-      o SSL/TLS: certain session ID malfunctions corrected.
-
-  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7:
-
-      o New library section OCSP.
-      o Complete rewrite of ASN1 code.
-      o CRL checking in verify code and openssl utility.
-      o Extension copying in 'ca' utility.
-      o Flexible display options in 'ca' utility.
-      o Provisional support for international characters with UTF8.
-      o Support for external crypto devices ('engine') is no longer
-        a separate distribution.
-      o New elliptic curve library section.
-      o New AES (Rijndael) library section.
-      o Support for new platforms: Windows CE, Tandem OSS, A/UX, AIX 64-bit,
-        Linux x86_64, Linux 64-bit on Sparc v9
-      o Extended support for some platforms: VxWorks
-      o Enhanced support for shared libraries.
-      o Now only builds PIC code when shared library support is requested.
-      o Support for pkg-config.
-      o Lots of new manuals.
-      o Makes symbolic links to or copies of manuals to cover all described
-        functions.
-      o Change DES API to clean up the namespace (some applications link also
-        against libdes providing similar functions having the same name).
-        Provide macros for backward compatibility (will be removed in the
-        future).
-      o Unify handling of cryptographic algorithms (software and engine)
-        to be available via EVP routines for asymmetric and symmetric ciphers.
-      o NCONF: new configuration handling routines.
-      o Change API to use more 'const' modifiers to improve error checking
-        and help optimizers.
-      o Finally remove references to RSAref.
-      o Reworked parts of the BIGNUM code.
-      o Support for new engines: Broadcom ubsec, Accelerated Encryption
-        Processing, IBM 4758.
-      o A few new engines added in the demos area.
-      o Extended and corrected OID (object identifier) table.
-      o PRNG: query at more locations for a random device, automatic query for
-        EGD style random sources at several locations.
-      o SSL/TLS: allow optional cipher choice according to server's preference.
-      o SSL/TLS: allow server to explicitly set new session ids.
-      o SSL/TLS: support Kerberos cipher suites (RFC2712).
-	Only supports MIT Kerberos for now.
-      o SSL/TLS: allow more precise control of renegotiations and sessions.
-      o SSL/TLS: add callback to retrieve SSL/TLS messages.
-      o SSL/TLS: support AES cipher suites (RFC3268).
-
-  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k:
-
-      o Security: fix various ASN1 parsing bugs.
-      o SSL/TLS protocol fix for unrequested client certificates.
-
-  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j:
-
-      o Security: counter the Klima-Pokorny-Rosa extension of
-        Bleichbacher's attack 
-      o Security: make RSA blinding default.
-      o Build: shared library support fixes.
-
-  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i:
-
-      o Important security related bugfixes.
-
-  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h:
-
-      o New configuration targets for Tandem OSS and A/UX.
-      o New OIDs for Microsoft attributes.
-      o Better handling of SSL session caching.
-      o Better comparison of distinguished names.
-      o Better handling of shared libraries in a mixed GNU/non-GNU environment.
-      o Support assembler code with Borland C.
-      o Fixes for length problems.
-      o Fixes for uninitialised variables.
-      o Fixes for memory leaks, some unusual crashes and some race conditions.
-      o Fixes for smaller building problems.
-      o Updates of manuals, FAQ and other instructive documents.
-
-  Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g:
-
-      o Important building fixes on Unix.
-
-  Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f:
-
-      o Various important bugfixes.
-
-  Major changes between OpenSSL 0.9.6d and OpenSSL 0.9.6e:
-
-      o Important security related bugfixes.
-      o Various SSL/TLS library bugfixes.
-
-  Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d:
-
-      o Various SSL/TLS library bugfixes.
-      o Fix DH parameter generation for 'non-standard' generators.
-
-  Major changes between OpenSSL 0.9.6b and OpenSSL 0.9.6c:
-
-      o Various SSL/TLS library bugfixes.
-      o BIGNUM library fixes.
-      o RSA OAEP and random number generation fixes.
-      o Object identifiers corrected and added.
-      o Add assembler BN routines for IA64.
-      o Add support for OS/390 Unix, UnixWare with gcc, OpenUNIX 8,
-        MIPS Linux; shared library support for Irix, HP-UX.
-      o Add crypto accelerator support for AEP, Baltimore SureWare,
-        Broadcom and Cryptographic Appliance's keyserver
-        [in 0.9.6c-engine release].
-
-  Major changes between OpenSSL 0.9.6a and OpenSSL 0.9.6b:
-
-      o Security fix: PRNG improvements.
-      o Security fix: RSA OAEP check.
-      o Security fix: Reinsert and fix countermeasure to Bleichbacher's
-        attack.
-      o MIPS bug fix in BIGNUM.
-      o Bug fix in "openssl enc".
-      o Bug fix in X.509 printing routine.
-      o Bug fix in DSA verification routine and DSA S/MIME verification.
-      o Bug fix to make PRNG thread-safe.
-      o Bug fix in RAND_file_name().
-      o Bug fix in compatibility mode trust settings.
-      o Bug fix in blowfish EVP.
-      o Increase default size for BIO buffering filter.
-      o Compatibility fixes in some scripts.
-
-  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.6a:
-
-      o Security fix: change behavior of OpenSSL to avoid using
-        environment variables when running as root.
-      o Security fix: check the result of RSA-CRT to reduce the
-        possibility of deducing the private key from an incorrectly
-        calculated signature.
-      o Security fix: prevent Bleichenbacher's DSA attack.
-      o Security fix: Zero the premaster secret after deriving the
-        master secret in DH ciphersuites.
-      o Reimplement SSL_peek(), which had various problems.
-      o Compatibility fix: the function des_encrypt() renamed to
-        des_encrypt1() to avoid clashes with some Unixen libc.
-      o Bug fixes for Win32, HP/UX and Irix.
-      o Bug fixes in BIGNUM, SSL, PKCS#7, PKCS#12, X.509, CONF and
-        memory checking routines.
-      o Bug fixes for RSA operations in threaded environments.
-      o Bug fixes in misc. openssl applications.
-      o Remove a few potential memory leaks.
-      o Add tighter checks of BIGNUM routines.
-      o Shared library support has been reworked for generality.
-      o More documentation.
-      o New function BN_rand_range().
-      o Add "-rand" option to openssl s_client and s_server.
-
-  Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6:
-
-      o Some documentation for BIO and SSL libraries.
-      o Enhanced chain verification using key identifiers.
-      o New sign and verify options to 'dgst' application.
-      o Support for DER and PEM encoded messages in 'smime' application.
-      o New 'rsautl' application, low level RSA utility.
-      o MD4 now included.
-      o Bugfix for SSL rollback padding check.
-      o Support for external crypto devices [1].
-      o Enhanced EVP interface.
-
-    [1] The support for external crypto devices is currently a separate
-        distribution.  See the file README.ENGINE.
-
-  Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a:
-
-      o Bug fixes for Win32, SuSE Linux, NeXTSTEP and FreeBSD 2.2.8 
-      o Shared library support for HPUX and Solaris-gcc
-      o Support of Linux/IA64
-      o Assembler support for Mingw32
-      o New 'rand' application
-      o New way to check for existence of algorithms from scripts
-
-  Major changes between OpenSSL 0.9.4 and OpenSSL 0.9.5:
-
-      o S/MIME support in new 'smime' command
-      o Documentation for the OpenSSL command line application
-      o Automation of 'req' application
-      o Fixes to make s_client, s_server work under Windows
-      o Support for multiple fieldnames in SPKACs
-      o New SPKAC command line utilty and associated library functions
-      o Options to allow passwords to be obtained from various sources
-      o New public key PEM format and options to handle it
-      o Many other fixes and enhancements to command line utilities
-      o Usable certificate chain verification
-      o Certificate purpose checking
-      o Certificate trust settings
-      o Support of authority information access extension
-      o Extensions in certificate requests
-      o Simplified X509 name and attribute routines
-      o Initial (incomplete) support for international character sets
-      o New DH_METHOD, DSA_METHOD and enhanced RSA_METHOD
-      o Read only memory BIOs and simplified creation function
-      o TLS/SSL protocol bugfixes: Accept TLS 'client hello' in SSL 3.0
-        record; allow fragmentation and interleaving of handshake and other
-        data
-      o TLS/SSL code now "tolerates" MS SGC
-      o Work around for Netscape client certificate hang bug
-      o RSA_NULL option that removes RSA patent code but keeps other
-        RSA functionality
-      o Memory leak detection now allows applications to add extra information
-        via a per-thread stack
-      o PRNG robustness improved
-      o EGD support
-      o BIGNUM library bug fixes
-      o Faster DSA parameter generation
-      o Enhanced support for Alpha Linux
-      o Experimental MacOS support
-
-  Major changes between OpenSSL 0.9.3 and OpenSSL 0.9.4:
-
-      o Transparent support for PKCS#8 format private keys: these are used
-        by several software packages and are more secure than the standard
-        form
-      o PKCS#5 v2.0 implementation
-      o Password callbacks have a new void * argument for application data
-      o Avoid various memory leaks
-      o New pipe-like BIO that allows using the SSL library when actual I/O
-        must be handled by the application (BIO pair)
-
-  Major changes between OpenSSL 0.9.2b and OpenSSL 0.9.3:
-      o Lots of enhancements and cleanups to the Configuration mechanism
-      o RSA OEAP related fixes
-      o Added `openssl ca -revoke' option for revoking a certificate
-      o Source cleanups: const correctness, type-safe stacks and ASN.1 SETs
-      o Source tree cleanups: removed lots of obsolete files
-      o Thawte SXNet, certificate policies and CRL distribution points
-        extension support
-      o Preliminary (experimental) S/MIME support
-      o Support for ASN.1 UTF8String and VisibleString
-      o Full integration of PKCS#12 code
-      o Sparc assembler bignum implementation, optimized hash functions
-      o Option to disable selected ciphers
-
-  Major changes between OpenSSL 0.9.1c and OpenSSL 0.9.2b:
-      o Fixed a security hole related to session resumption
-      o Fixed RSA encryption routines for the p < q case
-      o "ALL" in cipher lists now means "everything except NULL ciphers"
-      o Support for Triple-DES CBCM cipher
-      o Support of Optimal Asymmetric Encryption Padding (OAEP) for RSA
-      o First support for new TLSv1 ciphers
-      o Added a few new BIOs (syslog BIO, reliable BIO)
-      o Extended support for DSA certificate/keys.
-      o Extended support for Certificate Signing Requests (CSR)
-      o Initial support for X.509v3 extensions
-      o Extended support for compression inside the SSL record layer
-      o Overhauled Win32 builds
-      o Cleanups and fixes to the Big Number (BN) library
-      o Support for ASN.1 GeneralizedTime
-      o Splitted ASN.1 SETs from SEQUENCEs
-      o ASN1 and PEM support for Netscape Certificate Sequences
-      o Overhauled Perl interface
-      o Lots of source tree cleanups.
-      o Lots of memory leak fixes.
-      o Lots of bug fixes.
-
-  Major changes between SSLeay 0.9.0b and OpenSSL 0.9.1c:
-      o Integration of the popular NO_RSA/NO_DSA patches
-      o Initial support for compression inside the SSL record layer
-      o Added BIO proxy and filtering functionality
-      o Extended Big Number (BN) library
-      o Added RIPE MD160 message digest
-      o Addeed support for RC2/64bit cipher
-      o Extended ASN.1 parser routines
-      o Adjustations of the source tree for CVS
-      o Support for various new platforms
-
diff --git a/dep/lib/Win32/ssleay32.dll b/dep/lib/Win32/ssleay32.dll
deleted file mode 100644
index e72cd7ebc..000000000
Binary files a/dep/lib/Win32/ssleay32.dll and /dev/null differ
diff --git a/dep/lib/Win32/ssleay32.lib b/dep/lib/Win32/ssleay32.lib
deleted file mode 100644
index 6fd59df50..000000000
Binary files a/dep/lib/Win32/ssleay32.lib and /dev/null differ
diff --git a/dep/lib/win32_debug/.gitignore b/dep/lib/win32_debug/.gitignore
deleted file mode 100644
index 218b1f842..000000000
--- a/dep/lib/win32_debug/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git-ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# MaNGOS generated files
-#
-
-ACE*
-tbb*
-Recast*
-Detour*
-DebugUtils*
diff --git a/dep/lib/win32_debug/dbghelp.dll b/dep/lib/win32_debug/dbghelp.dll
deleted file mode 100644
index 6f646de49..000000000
Binary files a/dep/lib/win32_debug/dbghelp.dll and /dev/null differ
diff --git a/dep/lib/win32_debug/libeay32.dll b/dep/lib/win32_debug/libeay32.dll
deleted file mode 100644
index 090039590..000000000
Binary files a/dep/lib/win32_debug/libeay32.dll and /dev/null differ
diff --git a/dep/lib/win32_debug/libeay32.lib b/dep/lib/win32_debug/libeay32.lib
deleted file mode 100644
index 2381a0bb7..000000000
Binary files a/dep/lib/win32_debug/libeay32.lib and /dev/null differ
diff --git a/dep/lib/win32_debug/libmySQL.dll b/dep/lib/win32_debug/libmySQL.dll
deleted file mode 100644
index 81149511e..000000000
Binary files a/dep/lib/win32_debug/libmySQL.dll and /dev/null differ
diff --git a/dep/lib/win32_debug/libmySQL.lib b/dep/lib/win32_debug/libmySQL.lib
deleted file mode 100644
index fe76518d5..000000000
Binary files a/dep/lib/win32_debug/libmySQL.lib and /dev/null differ
diff --git a/dep/lib/win32_release/.gitignore b/dep/lib/win32_release/.gitignore
deleted file mode 100644
index 218b1f842..000000000
--- a/dep/lib/win32_release/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git-ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# MaNGOS generated files
-#
-
-ACE*
-tbb*
-Recast*
-Detour*
-DebugUtils*
diff --git a/dep/lib/win32_release/dbghelp.dll b/dep/lib/win32_release/dbghelp.dll
deleted file mode 100644
index 597188d77..000000000
Binary files a/dep/lib/win32_release/dbghelp.dll and /dev/null differ
diff --git a/dep/lib/win32_release/libeay32.dll b/dep/lib/win32_release/libeay32.dll
deleted file mode 100644
index 090039590..000000000
Binary files a/dep/lib/win32_release/libeay32.dll and /dev/null differ
diff --git a/dep/lib/win32_release/libeay32.lib b/dep/lib/win32_release/libeay32.lib
deleted file mode 100644
index 2381a0bb7..000000000
Binary files a/dep/lib/win32_release/libeay32.lib and /dev/null differ
diff --git a/dep/lib/win32_release/libmySQL.dll b/dep/lib/win32_release/libmySQL.dll
deleted file mode 100644
index c5bcf23be..000000000
Binary files a/dep/lib/win32_release/libmySQL.dll and /dev/null differ
diff --git a/dep/lib/win32_release/libmySQL.lib b/dep/lib/win32_release/libmySQL.lib
deleted file mode 100644
index 18dab985c..000000000
Binary files a/dep/lib/win32_release/libmySQL.lib and /dev/null differ
diff --git a/dep/lib/x64/libeay32.dll b/dep/lib/x64/libeay32.dll
deleted file mode 100644
index 8fe82d619..000000000
Binary files a/dep/lib/x64/libeay32.dll and /dev/null differ
diff --git a/dep/lib/x64/libeay32.lib b/dep/lib/x64/libeay32.lib
deleted file mode 100644
index e7f7bec5d..000000000
Binary files a/dep/lib/x64/libeay32.lib and /dev/null differ
diff --git a/dep/lib/x64/libmysql.dll b/dep/lib/x64/libmysql.dll
deleted file mode 100644
index f339600e3..000000000
Binary files a/dep/lib/x64/libmysql.dll and /dev/null differ
diff --git a/dep/lib/x64/libmysql.lib b/dep/lib/x64/libmysql.lib
deleted file mode 100644
index 26820e657..000000000
Binary files a/dep/lib/x64/libmysql.lib and /dev/null differ
diff --git a/dep/lib/x64/ssleay32.dll b/dep/lib/x64/ssleay32.dll
deleted file mode 100644
index 2b5ff4cba..000000000
Binary files a/dep/lib/x64/ssleay32.dll and /dev/null differ
diff --git a/dep/lib/x64/ssleay32.lib b/dep/lib/x64/ssleay32.lib
deleted file mode 100644
index d5641c7aa..000000000
Binary files a/dep/lib/x64/ssleay32.lib and /dev/null differ
diff --git a/dep/lib/x64_Debug/.gitignore b/dep/lib/x64_Debug/.gitignore
deleted file mode 100644
index 218b1f842..000000000
--- a/dep/lib/x64_Debug/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git-ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# MaNGOS generated files
-#
-
-ACE*
-tbb*
-Recast*
-Detour*
-DebugUtils*
diff --git a/dep/lib/x64_Debug/libeay32.dll b/dep/lib/x64_Debug/libeay32.dll
deleted file mode 100644
index 324fbb2e9..000000000
Binary files a/dep/lib/x64_Debug/libeay32.dll and /dev/null differ
diff --git a/dep/lib/x64_Debug/libeay32.lib b/dep/lib/x64_Debug/libeay32.lib
deleted file mode 100644
index 59ea158a3..000000000
Binary files a/dep/lib/x64_Debug/libeay32.lib and /dev/null differ
diff --git a/dep/lib/x64_Debug/libmySQL.dll b/dep/lib/x64_Debug/libmySQL.dll
deleted file mode 100644
index d36d8be10..000000000
Binary files a/dep/lib/x64_Debug/libmySQL.dll and /dev/null differ
diff --git a/dep/lib/x64_Debug/libmysql.lib b/dep/lib/x64_Debug/libmysql.lib
deleted file mode 100644
index 9468c2a57..000000000
Binary files a/dep/lib/x64_Debug/libmysql.lib and /dev/null differ
diff --git a/dep/lib/x64_release/.gitignore b/dep/lib/x64_release/.gitignore
deleted file mode 100644
index 218b1f842..000000000
--- a/dep/lib/x64_release/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git-ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# MaNGOS generated files
-#
-
-ACE*
-tbb*
-Recast*
-Detour*
-DebugUtils*
diff --git a/dep/lib/x64_release/libeay32.dll b/dep/lib/x64_release/libeay32.dll
deleted file mode 100644
index 324fbb2e9..000000000
Binary files a/dep/lib/x64_release/libeay32.dll and /dev/null differ
diff --git a/dep/lib/x64_release/libeay32.lib b/dep/lib/x64_release/libeay32.lib
deleted file mode 100644
index 59ea158a3..000000000
Binary files a/dep/lib/x64_release/libeay32.lib and /dev/null differ
diff --git a/dep/lib/x64_release/libmySQL.dll b/dep/lib/x64_release/libmySQL.dll
deleted file mode 100644
index 812b41c8f..000000000
Binary files a/dep/lib/x64_release/libmySQL.dll and /dev/null differ
diff --git a/dep/lib/x64_release/libmysql.lib b/dep/lib/x64_release/libmysql.lib
deleted file mode 100644
index dfa7b8cab..000000000
Binary files a/dep/lib/x64_release/libmysql.lib and /dev/null differ
diff --git a/dep/libmpq/.gitignore b/dep/libmpq/.gitignore
new file mode 100644
index 000000000..b038a7024
--- /dev/null
+++ b/dep/libmpq/.gitignore
@@ -0,0 +1,20 @@
+bin
+Makefile
+Makefile.in
+aclocal.m4
+config.guess
+config.h
+config.h.in
+config.status
+config.sub
+configure
+install-sh
+libmpq-config
+libmpq.pc
+libmpq/.libs/
+libmpq/libmpq.la
+libtool
+ltmain.sh
+missing
+py-compile
+stamp-h1
diff --git a/dep/libmpq/AUTHORS b/dep/libmpq/AUTHORS
new file mode 100644
index 000000000..3d7da7bec
--- /dev/null
+++ b/dep/libmpq/AUTHORS
@@ -0,0 +1,10 @@
+Project Initiator:
+
+    * Maik Broemme <mbroemme@plusserver.de>
+
+Developers:
+
+    * Maik Broemme <mbroemme@plusserver.de>
+    * Tilman Sauerbeck <tilman@code-monkey.de>
+    * Forrest Voight <voights@gmail.com>
+    * Georg Lukas <georg@op-co.de>
diff --git a/dep/libmpq/CMakeLists.txt b/dep/libmpq/CMakeLists.txt
new file mode 100644
index 000000000..b345c663c
--- /dev/null
+++ b/dep/libmpq/CMakeLists.txt
@@ -0,0 +1,82 @@
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.2.5a, 4.2.3 and 5.4.8
+#
+# Copyright (C) 2005-2014  MaNGOS project <http://getmangos.eu>
+#
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+# World of Warcraft, and all World of Warcraft or Warcraft art, images,
+# and lore are copyrighted by Blizzard Entertainment, Inc.
+
+file(GLOB sources_mpq libmpq/*.c libmpq/*.h)
+
+set(mpq_STAT_SRCS
+  ${sources_mpq}
+)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/dep/zlib
+  ${CMAKE_SOURCE_DIR}/dep/bzip2
+)
+
+if( WIN32 )
+  include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/win
+  )
+endif()
+
+#Configure libmpq, without using it's ./configure etc.
+include(CheckIncludeFiles)
+include(CheckFunctionExists)
+
+#check_include_files(dlfcn.h HAVE_DLFCN_H)
+#check_function_exists(fseeko HAVE_FSEEKO)
+#check_include_files(inttypes.h HAVE_INTTYPES_H)
+set(HAVE_LIBBZ2 1)
+set(HAVE_LIBZ 1)
+#check_include_files(memory.h HAVE_MEMORY_H)
+#check_include_files(stdint.h HAVE_STDINT_H)
+#check_include_files(stdlib.h HAVE_STDLIB_H)
+#check_include_files(strings.h HAVE_STRINGS_H)
+#check_include_files(string.h HAVE_STRING_H)
+#check_include_files(sys/stat.h HAVE_SYS_STAT_H)
+#check_include_files(sys/types.h HAVE_SYS_TYPES_H)
+#check_include_files(unistd.h HAVE_UNISTD_H)
+
+#Taken from https://github.com/jonathanslenders/fluidsynth/blob/master/cmake_admin/CheckSTDC.cmake
+#check_include_files("dlfcn.h;stdint.h;stddef.h;inttypes.h;stdlib.h;strings.h;string.h;float.h" StandardHeadersExist)
+if (StandardHeadersExist)
+  set(STDC_HEADERS 1)
+else()
+  set(STDC_HEADERS 0)
+endif()
+
+set(LIBMPQ_PACKAGE_VERSION "0.4.2")
+set(LIBMPQ_PACKAGE_NAME "libmpq")
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
+
+#Add the library
+add_library(libmpq STATIC ${mpq_STAT_SRCS})
+
+include_directories( ${ZLIB_INCLUDE_DIRS} )
+target_link_libraries(libmpq ${ZLIB_LIBRARIES} bzip2)
+
+set_target_properties(libmpq PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/dep/libmpq/COPYING b/dep/libmpq/COPYING
new file mode 100644
index 000000000..4189933be
--- /dev/null
+++ b/dep/libmpq/COPYING
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                      59 Temple Place, Suite 330, Boston, MA 02111 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/dep/libmpq/FAQ b/dep/libmpq/FAQ
new file mode 100644
index 000000000..52ca9f3c7
--- /dev/null
+++ b/dep/libmpq/FAQ
@@ -0,0 +1,68 @@
+FAQ - Frequently Asked Questions
+================================
+
+Q: What is libmpq?
+A: libmpq is a library for manipulating MoPaQ mpq archives mostly used
+   used by Blizzard in their games.
+
+Q: What can i do with libmpq?
+A: With libmpq you can write applications which can extract, create
+   and manipulate mpq archives.
+
+Q: Is it legal?
+A: Yes, i think so. I have no idea why it should not, all informations
+   about the fileformat are available.
+
+Q: Is there a description of the functions?
+A: Since version 0.4.0 libmpq comes with a API documentation for
+   developers. The documentation is written as manual pages.
+
+Q: Can i help?
+A: Yes, help is needed, not only with developing, also with testing.
+   A good point to start is using a recent SVN version of libmpq and
+   trying to use it with every mpq archive you could get :)
+
+Q: Can you give a small example to demonstrate the usage?
+A: Of course :) The example below takes first parameter as mpq archive
+   and extracts the first file to a buffer.
+
+   /*
+    *  Compile with:
+    *
+    *  x86_32:
+    *
+    *  gcc \
+    *    -D_FILE_OFFSET_BITS=64 \
+    *    -D_LARGE_FILES=1 \
+    *    -D_LARGEFILE_SOURCE=1 \
+    *    mpq-example.c -o mpq-example -lmpq -lz -lbz2 -I/usr/local/include/libmpq
+    *
+    *  x86_64:
+    *
+    *  gcc \
+    *    -D_LARGE_FILES=1 \
+    *    mpq-example.c -o mpq-example -lmpq -lz -lbz2 -I/usr/local/include/libmpq
+    */
+
+   #include <mpq.h>
+   #include <stdlib.h>
+   #include <limits.h>
+
+   int main(int argc, char **argv) {
+           mpq_archive_s *mpq_archive;
+           off_t out_size;
+           char *out_buf;
+
+           /* open the mpq archive given as first parameter. */
+           libmpq__archive_open(&mpq_archive, argv[1], -1);
+
+           /* get size of first file (0) and malloc output buffer. */
+           libmpq__file_unpacked_size(mpq_archive, 0, &out_size);
+           out_buf = malloc(out_size);
+
+           /* read, decrypt and unpack file to output buffer. */
+           libmpq__file_read(mpq_archive, 0, out_buf, out_size, NULL);
+
+           /* close the mpq archive. */
+           libmpq__archive_close(mpq_archive);
+   }
diff --git a/dep/libmpq/INSTALL b/dep/libmpq/INSTALL
new file mode 100644
index 000000000..b42a17ac4
--- /dev/null
+++ b/dep/libmpq/INSTALL
@@ -0,0 +1,182 @@
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, a file
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If at some point `config.cache'
+contains results you don't want to keep, you may remove or edit it.
+
+   The file `configure.in' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.in' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  You can give `configure'
+initial values for variables by setting them in the environment.  Using
+a Bourne-compatible shell, you can do that on the command line like
+this:
+     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+
+Or on systems that have the `env' program, you can do it like this:
+     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not supports the `VPATH'
+variable, you have to compile the package for one architecture at a time
+in the source code directory.  After you have installed the package for
+one architecture, use `make distclean' before reconfiguring for another
+architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' can not figure out
+automatically, but needs to determine by the type of host the package
+will run on.  Usually `configure' can figure that out, but if it prints
+a message saying it can not guess the host type, give it the
+`--host=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
+     CPU-COMPANY-SYSTEM
+
+See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the host type.
+
+   If you are building compiler tools for cross-compiling, you can also
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
+system on which you are compiling the package.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Operation Controls
+==================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--cache-file=FILE'
+     Use and save the results of the tests in FILE instead of
+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
+     debugging `configure'.
+
+`--help'
+     Print a summary of the options to `configure', and exit.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--version'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`configure' also accepts some other, not widely useful, options.
diff --git a/dep/libmpq/Makefile.am b/dep/libmpq/Makefile.am
new file mode 100644
index 000000000..0a9b54c25
--- /dev/null
+++ b/dep/libmpq/Makefile.am
@@ -0,0 +1,26 @@
+# minimum required automake 1.6
+AUTOMAKE_OPTIONS		= 1.6
+
+# any directories which should be built and installed.
+SUBDIRS				= libmpq bindings doc
+
+# the directories which are part of the distribution.
+DIST_SUBDIRS			= $(SUBDIRS)
+
+# libmpq runtime configuration script.
+bin_SCRIPTS			= libmpq-config
+
+# pkg-config installation directory.
+pkgconfigdir			= $(libdir)/pkgconfig
+pkgconfig_DATA			= libmpq.pc
+
+# extra stuff.
+EXTRA_DIST =			\
+	AUTHORS			\
+	COPYING			\
+	FAQ			\
+	INSTALL			\
+	NEWS			\
+	README			\
+	THANKS			\
+	TODO
diff --git a/dep/libmpq/NEWS b/dep/libmpq/NEWS
new file mode 100644
index 000000000..74850a8a5
--- /dev/null
+++ b/dep/libmpq/NEWS
@@ -0,0 +1,76 @@
+Changes version 0.4.2 (2008-05-16)
+==================================
+
+    * added full extraction support for protected maps used in
+      warcraft 3.
+
+    * added full extraction support for all blizzard titles until
+      world of warcraft - the burning crusade.
+
+    * added support for archives version 2 with extended header and
+      extended block table.
+
+    * added support for the bzip2 compression algorithm.
+
+    * added support for archives and files inside archive > 2gb.
+
+    * added generic read functions, which will do decryption,
+      decompression or exploding.
+
+    * the info functions are no longer exported by the library and
+      were replaced by separate api functions.
+
+    * the file number and block number are count from 0 instead
+      of 1.
+
+    * added python bindings.
+
+    * linking against libmpq requires from now on the usual largefile
+      macros -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -D_LARGEFILE_SOURCE=1
+
+Changes version 0.4.1 (2008-04-02)
+==================================
+
+    * memory, speed and stability improvements.
+
+    * split sourcecode into library and utility package.
+
+Changes version 0.4.0 (2008-03-31)
+==================================
+
+    * added robust error handling to make the library and extracting
+      utility more stable.
+
+    * added c++ bindings to public include and moved internal defines
+      and functions to private include.
+
+    * added support for 64-bit architectures and removed any stupid
+      pointer to int arithmetics.
+
+    * added much better member names to the structures to make
+      developers able to understand the code on reading.
+
+    * added full api documentation using manual pages.
+
+    * added full extraction support for all blizzard titles until
+      warcraft 3 - the frozen throne.
+
+    * added support for single sector and stored files (neither
+      compressed nor imploded).
+
+    * added support for files which have compressed size greater than
+      uncompressed size.
+
+    * removed the external listfile database support from 0.3.0 it
+      was a weird implementation.
+
+Changes version 0.3.0 (2004-02-12)
+==================================
+
+    * added listfile database support from external files.
+
+Initial version 0.2.1 (2004-01-17)
+==================================
+
+    * first version which was able to extract some of the older mopaq
+      archives.
diff --git a/dep/libmpq/README b/dep/libmpq/README
new file mode 100644
index 000000000..3f1bd3a1e
--- /dev/null
+++ b/dep/libmpq/README
@@ -0,0 +1,34 @@
+Introduction
+============
+
+'libmpq' is a library which can be easily used in own applications
+to extract, create or manipulate MoPaQ mpq archives.
+
+MPQ, or MoPaQ, is a proprietary archive format created by
+Mike O'Brien, the man hailed as Blizzard's multiplayer engine
+genius, back in 1996 as a general purpose archive for use with
+Diablo, and named narcissistically for its creator
+"Mike O'brien PaCK". The copyrights to it, however, are held by
+Havas Interactive, Blizzard's parent company. The archive format
+is used by many Blizzard titles like Diablo, Diablo 2, Starcraft,
+Warcraft 2: BNE, a newer version in Warcraft 3 and World of
+Warcraft (WoW).
+
+Manual
+======
+
+Since version 0.4.0 the 'libmpq' package comes with a manpage for
+every library function. If you use 'libmpq' first time it is a good
+idea to read the `FAQ' file.
+
+Reporting Bugs
+==============
+
+Bug reports for 'libmpq' can be send to me directly.
+
+    * Maik Broemme <mbroemme@plusserver.de>
+
+Enjoy!
+
+Maik Broemme <mbroemme@plusserver.de>
+http://www.babelize.org/
diff --git a/dep/libmpq/THANKS b/dep/libmpq/THANKS
new file mode 100644
index 000000000..42da12354
--- /dev/null
+++ b/dep/libmpq/THANKS
@@ -0,0 +1,21 @@
+'libmpq' was originaly created by Maik Broemme <mbroemme@plusserver.de>
+and i want to thank some people which helped by supplying knowledge, code or
+something else.
+
+    * Romy Trompke <rtnet@web.de>
+      - my lovely girlfriend for her patience
+
+    * Ladislav Zezula <ladik@zezula.net>
+      - stormlib creator
+
+    * Marko Friedemann <marko.friedemann@bmx-chemnitz.de>
+      - initial port of stormlib to linux
+
+    * Tom Amigo <tomamigo@apexmail.com>
+      - first people who decrypts the MoPaQ archive format
+
+    * ShadowFlare <BlakFlare@hiotmail.com>
+      - creator of the ShadowFlare MPQ API
+
+    * Justin Olbrantz (Quantam) <omega@dragonfire.net>
+      - creator of the client using ShadowFlare MPQ API
diff --git a/dep/libmpq/TODO b/dep/libmpq/TODO
new file mode 100644
index 000000000..0c1951f0b
--- /dev/null
+++ b/dep/libmpq/TODO
@@ -0,0 +1,10 @@
+Features and functionality which should be added in the future.
+
+	* Porting for big endian systems.
+	* Porting for Windows? :)
+	* Creating mpq archives.
+	* Brute all unknown filenames, Blizzard uses in their
+	  archives.
+
+Look at the AUTHORS file if you want help me with 'libmpq', or
+if you have other interesting features which should be added.
diff --git a/dep/libmpq/autogen.sh b/dep/libmpq/autogen.sh
new file mode 100644
index 000000000..16871edd7
--- /dev/null
+++ b/dep/libmpq/autogen.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+echo "Generating build information using aclocal, autoheader, automake and autoconf"
+echo "This may take a while ..."
+
+# Touch the timestamps on all the files since CVS messes them up
+directory=`dirname $0`
+touch $directory/configure.ac
+
+# Regenerate configuration files
+libtoolize --copy
+aclocal
+autoheader
+automake --foreign --add-missing --copy
+autoconf
+
+# Run configure for this platform
+#./configure $*
+echo "Now you are ready to run ./configure"
diff --git a/dep/libmpq/bindings/Makefile.am b/dep/libmpq/bindings/Makefile.am
new file mode 100644
index 000000000..b9fefe306
--- /dev/null
+++ b/dep/libmpq/bindings/Makefile.am
@@ -0,0 +1,6 @@
+# any directories which should be built and installed.
+SUBDIRS				= d
+
+if HAVE_PYTHON
+SUBDIRS				+= python
+endif
diff --git a/dep/libmpq/bindings/d/Makefile.am b/dep/libmpq/bindings/d/Makefile.am
new file mode 100644
index 000000000..4de7285ae
--- /dev/null
+++ b/dep/libmpq/bindings/d/Makefile.am
@@ -0,0 +1,6 @@
+# minimum required automake 1.6
+AUTOMAKE_OPTIONS		= 1.6
+
+# install D binding to /usr/include/d by default
+libmpq_includedir		= $(includedir)/d
+libmpq_include_HEADERS		= mpq.d
diff --git a/dep/libmpq/bindings/d/dsss.conf b/dep/libmpq/bindings/d/dsss.conf
new file mode 100644
index 000000000..252482c49
--- /dev/null
+++ b/dep/libmpq/bindings/d/dsss.conf
@@ -0,0 +1,2 @@
+[mpq.d]
+type=sourcelibrary
diff --git a/dep/libmpq/bindings/d/mpq.d b/dep/libmpq/bindings/d/mpq.d
new file mode 100644
index 000000000..d72c2d2a9
--- /dev/null
+++ b/dep/libmpq/bindings/d/mpq.d
@@ -0,0 +1,318 @@
+/*
+ *  mpq.d -- D programming language module for libmpq
+ *
+ *  Copyright (c) 2008 Georg Lukas <georg@op-co.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  This module is written to support Phobos. Patches to allow binding to
+ *  Tango are welcome.
+ */
+
+module mpq;
+
+/* the following pragma does not work on DMD/Linux, generates a warning on
+ * GDC/Linux and has not been tested on Windows. Commented out for now. */
+// pragma(lib, "libmpq");
+
+import std.string; // for format() and toStringz()
+import std.traits; // for ParameterTypeTuple!()
+
+/* XXX: this assumes that libmpq is compiled with Large File Support on */
+alias long off_t;
+
+/* libmpq error return values */
+const LIBMPQ_ERROR_OPEN			= -1;	/* open error on file. */
+const LIBMPQ_ERROR_CLOSE		= -2;	/* close error on file. */
+const LIBMPQ_ERROR_SEEK			= -3;	/* lseek error on file. */
+const LIBMPQ_ERROR_READ			= -4;	/* read error on file. */
+const LIBMPQ_ERROR_WRITE		= -5;	/* write error on file. */
+const LIBMPQ_ERROR_MALLOC		= -6;	/* memory allocation error. */
+const LIBMPQ_ERROR_FORMAT		= -7;	/* format errror. */
+const LIBMPQ_ERROR_NOT_INITIALIZED	= -8;	/* init() wasn't called. */
+const LIBMPQ_ERROR_SIZE			= -9;	/* buffer size is to small. */
+const LIBMPQ_ERROR_EXIST		= -10;	/* file or block does not exist in archive. */
+const LIBMPQ_ERROR_DECRYPT		= -11;	/* we don't know the decryption seed. */
+const LIBMPQ_ERROR_UNPACK		= -12;	/* error on unpacking file. */
+
+/** libmpq internal meta-data for an archive */
+extern struct mpq_archive_s;
+
+extern(C) {
+
+/* libmpq__generic information about library. */
+char *libmpq__version();
+
+/* libmpq__generic mpq archive information. */
+int libmpq__archive_open(mpq_archive_s **mpq_archive, char *mpq_filename, off_t archive_offset);
+int libmpq__archive_close(mpq_archive_s *mpq_archive);
+int libmpq__archive_packed_size(mpq_archive_s *mpq_archive, off_t *packed_size);
+int libmpq__archive_unpacked_size(mpq_archive_s *mpq_archive, off_t *unpacked_size);
+int libmpq__archive_offset(mpq_archive_s *mpq_archive, off_t *offset);
+int libmpq__archive_version(mpq_archive_s *mpq_archive, uint *version_);
+int libmpq__archive_files(mpq_archive_s *mpq_archive, uint *files);
+
+/* libmpq__generic file processing functions. */
+int libmpq__file_packed_size(mpq_archive_s *mpq_archive, uint file_number, off_t *packed_size);
+int libmpq__file_unpacked_size(mpq_archive_s *mpq_archive, uint file_number, off_t *unpacked_size);
+int libmpq__file_offset(mpq_archive_s *mpq_archive, uint file_number, off_t *offset);
+int libmpq__file_blocks(mpq_archive_s *mpq_archive, uint file_number, uint *blocks);
+int libmpq__file_encrypted(mpq_archive_s *mpq_archive, uint file_number, uint *encrypted);
+int libmpq__file_compressed(mpq_archive_s *mpq_archive, uint file_number, uint *compressed);
+int libmpq__file_imploded(mpq_archive_s *mpq_archive, uint file_number, uint *imploded);
+int libmpq__file_number(mpq_archive_s *mpq_archive, char *filename, uint *number);
+int libmpq__file_read(mpq_archive_s *mpq_archive, uint file_number, ubyte *out_buf, off_t out_size, off_t *transferred);
+
+/* libmpq__generic block processing functions. */
+int libmpq__block_open_offset(mpq_archive_s *mpq_archive, uint file_number);
+int libmpq__block_close_offset(mpq_archive_s *mpq_archive, uint file_number);
+int libmpq__block_unpacked_size(mpq_archive_s *mpq_archive, uint file_number, uint block_number, off_t *unpacked_size);
+int libmpq__block_read(mpq_archive_s *mpq_archive, uint file_number, uint block_number, ubyte *out_buf, off_t out_size, off_t *transferred);
+
+}
+
+
+/** exception class for failed libmpq calls */
+class MPQException : Exception {
+	const string[] Errors = [
+		"unknown error",
+		"open error on file",
+		"close error on file",
+		"lseek error on file",
+		"read error on file",
+		"write error on file",
+		"memory allocation error",
+		"format errror",
+		"init() wasn't called",
+		"buffer size is to small",
+		"file or block does not exist in archive",
+		"we don't know the decryption seed",
+		"error on unpacking file"];
+
+	public int errno;
+	this(char[] fnname = "unknown_function", int errno = 0) {
+
+		this.errno = errno;
+		if (-errno >= Errors.length)
+			errno = 0;
+		super(std.string.format("Error in %s(): %s (%d)",
+					fnname, Errors[-errno], errno));
+	}
+}
+
+
+/** template to wrap function calls and throw exceptions in case of error
+ *
+ * thanks for the idea to while(nan) blog,
+ * http://while-nan.blogspot.com/2007/06/wrapping-functions-for-fun-and-profit.html
+ *
+ * use: MPQ_CHECKERR(libmpq__archive_open)(&m, "foo.mpq", -1);
+ *   returns the retval of archive_open on success;
+ *   throws an MPQException on failure.
+ *
+ * @param Fn libmpq__function reference
+ * @param args libmpq__function parameters
+ * @return return value of libmpq__function on success
+ * @throw MPQException on error
+ */
+int MPQ_CHECKERR(alias Fn)(ParameterTypeTuple!(Fn) args)
+{
+	int result = Fn(args);
+	if (result < 0) {
+		/* XXX: relying on non-specified stringof() behaviour */
+		throw new MPQException((&Fn).stringof[2..$], result);
+	}
+        return result;
+}
+
+
+/** mixin alias to wrap library functions into MPQ_CHECKERR.
+ *
+ * alias mpq.func_name(...) to MPQ_CHECKERR(libmpq__func_name)(...)
+ * @param func_name name of the function to be wrapped
+ */
+template MPQ_FUNC(char[] func_name) {
+	const char[] MPQ_FUNC = "alias MPQ_CHECKERR!(libmpq__" ~ func_name ~ ") " ~ func_name ~ ";";
+}
+
+alias libmpq__version libversion; /* must be direct alias because it returns char*, not error int */
+mixin(MPQ_FUNC!("archive_open"));
+mixin(MPQ_FUNC!("archive_close"));
+mixin(MPQ_FUNC!("archive_packed_size"));
+mixin(MPQ_FUNC!("archive_unpacked_size"));
+mixin(MPQ_FUNC!("archive_offset"));
+mixin(MPQ_FUNC!("archive_version"));
+mixin(MPQ_FUNC!("archive_files"));
+mixin(MPQ_FUNC!("file_packed_size"));
+mixin(MPQ_FUNC!("file_unpacked_size"));
+mixin(MPQ_FUNC!("file_offset"));
+mixin(MPQ_FUNC!("file_blocks"));
+mixin(MPQ_FUNC!("file_encrypted"));
+mixin(MPQ_FUNC!("file_compressed"));
+mixin(MPQ_FUNC!("file_imploded"));
+mixin(MPQ_FUNC!("file_number"));
+mixin(MPQ_FUNC!("file_read"));
+mixin(MPQ_FUNC!("block_open_offset"));
+mixin(MPQ_FUNC!("block_close_offset"));
+mixin(MPQ_FUNC!("block_unpacked_size"));
+mixin(MPQ_FUNC!("block_read"));
+
+/** getter function named name for returning archive_* single values:
+ *
+ *   <type> Archive.<name>() { return libmpq__archive_<name>() }
+ *
+ * @param type return type for the original function reference
+ * @param name name of the original function
+ * @param name2 name for the prototype (defaults to name, used for "version")
+ * @return getter function mixin
+ */
+template MPQ_A_GET(char[] type, char[] name, char[] name2 = name) {
+	const char[] MPQ_A_GET = type ~ " " ~ name2 ~ "() { " ~
+			type ~ " ret; " ~
+			"archive_" ~ name ~ "(m, &ret); return ret;" ~
+		"}";
+}
+
+/** wrapper class for an MPQ Archive
+ *
+ * syntax: auto a = new mpq.Archive("somefile.mpq");
+ */
+class Archive {
+	mpq_archive_s *m;
+	File listfile;
+	char[][] listfiledata;
+
+	this(char[] archivename, off_t offset = -1) {
+		archive_open(&m, toStringz(archivename), offset);
+	}
+
+	mixin(MPQ_A_GET!("off_t", "packed_size"));
+	mixin(MPQ_A_GET!("off_t", "unpacked_size"));
+	mixin(MPQ_A_GET!("off_t", "offset"));
+	mixin(MPQ_A_GET!("uint", "version", "version_"));
+	mixin(MPQ_A_GET!("uint", "files"));
+
+	~this() {
+		archive_close(m);
+	}
+
+	mpq_archive_s* archive() {
+		return m;
+	}
+
+	File opIndex(char[] fname) {
+		return new File(this, fname);
+	}
+	File opIndex(int fno) {
+		return new File(this, fno);
+	}
+
+	char[][] filelist() {
+		try {
+			if (!listfile) {
+				listfile = this["(listfile)"];
+				listfiledata = (cast(char[])listfile.read()).splitlines();
+			}
+			return listfiledata;
+		} catch (MPQException e) {
+			return [];
+		}
+	}
+
+	/+uint filenumber(char[] filename) {
+		try {
+			if (!listfile) {
+				listfile = this["(listfile)"];
+				listfiledata = (cast(char[])listfile.read()).splitlines();
+			}
+			return listfiledata;
+		} catch (MPQException e) {
+			return [];
+		}
+	}+/
+
+}
+
+
+/** getter function named name for returning file_* single values:
+ *
+ *   <type> File.<name>() { return libmpq__file_<name>() }
+ *
+ * @param type return type for the original function reference
+ * @param name name of the original function
+ * @param name2 name for the prototype (defaults to name, used for "version")
+ * @return getter function mixin
+ */
+template MPQ_F_GET(char[] type, char[] name, char[] name2 = name) {
+	const char[] MPQ_F_GET = type ~ " " ~ name2 ~ "() { " ~
+			type ~ " ret; " ~
+			"file_" ~ name ~ "(am, fileno, &ret); " ~
+			"return ret;" ~
+		"}";
+}
+
+/** wrapper class for a single file in an MPQ Archive
+ *
+ * syntax:
+ *    auto a = new mpq.Archive("somefile.mpq");
+ *    auto f = a["(listfile)"];
+ *    auto f2 = a[0];
+ *    auto f3 = new File(a, "(listfile)");
+ */
+class File {
+	Archive a;
+	mpq_archive_s* am;
+	char[] filename;
+	uint fileno;
+
+	this(Archive a, int fileno) {
+		this.a = a;
+		this.am = a.archive();
+		if (fileno >= a.files) {
+			throw new MPQException(format("File(%d)", fileno),
+				LIBMPQ_ERROR_EXIST);
+		}
+		this.filename = format("file%04d.xxx", fileno);
+		this.fileno = fileno;
+	}
+
+	this(Archive a, char[] filename) {
+		this.a = a;
+		this.am = a.archive();
+		this.filename = filename;
+		/* this line will throw an exception when the file is not there */
+		mpq.file_number(am, toStringz(filename), &this.fileno);
+	}
+
+	mixin(MPQ_F_GET!("off_t", "packed_size"));
+	mixin(MPQ_F_GET!("off_t", "unpacked_size"));
+	mixin(MPQ_F_GET!("off_t", "offset"));
+	mixin(MPQ_F_GET!("uint", "blocks"));
+	mixin(MPQ_F_GET!("uint", "encrypted"));
+	mixin(MPQ_F_GET!("uint", "compressed"));
+	mixin(MPQ_F_GET!("uint", "imploded"));
+
+	uint no() {	return fileno; }
+	char[] name() {	return filename; }
+
+	ubyte[] read() {
+		ubyte[] content;
+		content.length = this.unpacked_size();
+		off_t trans;
+		mpq.file_read(am, fileno, content.ptr, content.length, &trans);
+		content.length = trans;
+		return content;
+	}
+}
diff --git a/dep/libmpq/bindings/python/Makefile.am b/dep/libmpq/bindings/python/Makefile.am
new file mode 100644
index 000000000..6971a9b2f
--- /dev/null
+++ b/dep/libmpq/bindings/python/Makefile.am
@@ -0,0 +1,5 @@
+# minimum required automake 1.6
+AUTOMAKE_OPTIONS		= 1.6
+
+# library information and headers which should not be installed.
+python_PYTHON			= mpq.py
diff --git a/dep/libmpq/bindings/python/mpq-info b/dep/libmpq/bindings/python/mpq-info
new file mode 100644
index 000000000..2c67aa1d0
--- /dev/null
+++ b/dep/libmpq/bindings/python/mpq-info
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+from __future__ import division
+
+import sys
+
+import mpq
+
+archive = mpq.Archive(sys.argv[1])
+
+print "Name:              %s" % sys.argv[1]
+print "Version:           %s" % archive.filename
+print "Offset:            %s" % archive.offset
+print "Packed size:       %s" % archive.packed_size
+print "Unpacked size:     %s" % archive.unpacked_size
+print "Compression ratio: %s" % (archive.packed_size/archive.unpacked_size)
diff --git a/dep/libmpq/bindings/python/mpq.py b/dep/libmpq/bindings/python/mpq.py
new file mode 100644
index 000000000..cf6ecaae8
--- /dev/null
+++ b/dep/libmpq/bindings/python/mpq.py
@@ -0,0 +1,322 @@
+"""wrapper for libmpq"""
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+import ctypes
+import ctypes.util
+import os
+
+libmpq = ctypes.CDLL(ctypes.util.find_library("mpq"))
+
+class Error(Exception):
+    pass
+
+errors = {
+    -1: (IOError, "open"),
+    -2: (IOError, "close"),
+    -3: (IOError, "seek"),
+    -4: (IOError, "read"),
+    -5: (IOError, "write"),
+    -6: (MemoryError,),
+    -7: (Error, "file is not an mpq or is corrupted"),
+    -8: (AssertionError, "not initialized"),
+    -9: (AssertionError, "buffer size too small"),
+    -10: (IndexError, "file not in archive"),
+    -11: (AssertionError, "decrypt"),
+    -12: (AssertionError, "unpack"),
+}
+
+def check_error(result, func, arguments, errors=errors):
+    try:
+        error = errors[result]
+    except KeyError:
+        return result
+    else:
+        raise error[0](*error[1:])
+
+libmpq.libmpq__version.restype = ctypes.c_char_p
+
+libmpq.libmpq__archive_open.errcheck = check_error
+libmpq.libmpq__archive_close.errcheck = check_error
+libmpq.libmpq__archive_packed_size.errcheck = check_error
+libmpq.libmpq__archive_unpacked_size.errcheck = check_error
+libmpq.libmpq__archive_offset.errcheck = check_error
+libmpq.libmpq__archive_version.errcheck = check_error
+libmpq.libmpq__archive_files.errcheck = check_error
+
+libmpq.libmpq__file_packed_size.errcheck = check_error
+libmpq.libmpq__file_unpacked_size.errcheck = check_error
+libmpq.libmpq__file_offset.errcheck = check_error
+libmpq.libmpq__file_blocks.errcheck = check_error
+libmpq.libmpq__file_encrypted.errcheck = check_error
+libmpq.libmpq__file_compressed.errcheck = check_error
+libmpq.libmpq__file_imploded.errcheck = check_error
+libmpq.libmpq__file_number.errcheck = check_error
+libmpq.libmpq__file_read.errcheck = check_error
+
+libmpq.libmpq__block_open_offset.errcheck = check_error
+libmpq.libmpq__block_close_offset.errcheck = check_error
+libmpq.libmpq__block_unpacked_size.errcheck = check_error
+libmpq.libmpq__block_read.errcheck = check_error
+
+__version__ = libmpq.libmpq__version()
+
+
+class Reader(object):
+    def __init__(self, file, libmpq=libmpq):
+        self._file = file
+        self._pos = 0
+        self._buf = []
+        self._cur_block = 0
+        libmpq.libmpq__block_open_offset(self._file._archive._mpq,
+            self._file.number)
+    
+    def __iter__(self): 
+        return self
+    
+    def __repr__(self):
+        return "iter(%r)" % self._file
+    
+    def seek(self, offset, whence=os.SEEK_SET, os=os):
+        if whence == os.SEEK_SET:
+            pass
+        elif whence == os.SEEK_CUR:
+            offset += self._pos
+        elif whence == os.SEEK_END:
+            offset += self._file.unpacked_size
+        else:
+            raise ValueError, "invalid whence"
+        
+        if offset >= self._pos:
+            self.read(offset - self._pos)
+        else:
+            self._pos = 0
+            self._buf = []
+            self._cur_block = 0
+            self.read(offset)
+    
+    def tell(self):
+        return self._pos
+    
+    def _read_block(self, ctypes=ctypes, libmpq=libmpq):
+        block_size = ctypes.c_uint64()
+        libmpq.libmpq__block_unpacked_size(self._file._archive._mpq,
+            self._file.number, self._cur_block, ctypes.byref(block_size))
+        block_data = ctypes.create_string_buffer(block_size.value)
+        libmpq.libmpq__block_read(self._file._archive._mpq,
+            self._file.number, self._cur_block,
+            block_data, ctypes.c_uint64(len(block_data)), None)
+        self._buf.append(block_data.raw)
+        self._cur_block += 1
+    
+    def read(self, size=-1):
+        while size < 0 or sum(map(len, self._buf)) < size:
+            if self._cur_block == self._file.blocks:
+                break
+            self._read_block()
+        buf = "".join(self._buf)
+        if size < 0:
+            ret = buf
+            self._buf = []
+        else:
+            ret = buf[:size]
+            self._buf = [buf[size:]]
+        self._pos += len(ret)
+        return ret
+    
+    def readline(self, os=os):
+        line = []
+        while True:
+            char = self.read(1)
+            if char == "":
+                break
+            if char not in '\r\n' and line and line[-1] in '\r\n':
+                self.seek(-1, os.SEEK_CUR)
+                break
+            line.append(char)
+        return ''.join(line)
+    
+    def next(self):
+        line = self.readline()
+        if not line:
+            raise StopIteration
+        return line
+    
+    def readlines(self, sizehint=-1):
+        res = []
+        while sizehint < 0 or sum(map(len, res)) < sizehint:
+            line = self.readline()
+            if not line:
+                break
+            res.append(line)
+        return res
+    
+    xreadlines = __iter__
+    
+    def __del__(self, libmpq=libmpq):
+        libmpq.libmpq__block_close_offset(self._file._archive._mpq,
+            self._file.number)
+
+
+class File(object):
+    def __init__(self, archive, number, ctypes=ctypes, libmpq=libmpq):
+        self._archive = archive
+        self.number = number
+        
+        for name, atype in [
+            ("packed_size", ctypes.c_uint64),
+            ("unpacked_size", ctypes.c_uint64),
+            ("offset", ctypes.c_uint64),
+            ("blocks", ctypes.c_uint32),
+            ("encrypted", ctypes.c_uint32),
+            ("compressed", ctypes.c_uint32),
+            ("imploded", ctypes.c_uint32),
+        ]:
+            data = atype()
+            func = getattr(libmpq, "libmpq__file_"+name)
+            func(self._archive._mpq, self.number, ctypes.byref(data))
+            setattr(self, name, data.value)
+    
+    def __str__(self, ctypes=ctypes, libmpq=libmpq):
+        data = ctypes.create_string_buffer(self.unpacked_size)
+        libmpq.libmpq__file_read(self._archive._mpq, self.number,
+            data, ctypes.c_uint64(len(data)), None)
+        return data.raw
+    
+    def __repr__(self):
+        return "%r[%i]" % (self._archive, self.number)
+    
+    def __iter__(self, Reader=Reader):
+        return Reader(self)
+
+
+class Archive(object):
+    def __init__(self, source, ctypes=ctypes, File=File, libmpq=libmpq):
+        self._source = source
+        if isinstance(source, File):
+            assert not source.encrypted
+            assert not source.compressed
+            assert not source.imploded
+            self.filename = source._archive.filename
+            offset = source._archive.offset + source.offset
+        else:
+            self.filename = source
+            offset = -1
+        
+        self._mpq = ctypes.c_void_p()
+        libmpq.libmpq__archive_open(ctypes.byref(self._mpq), self.filename,
+            ctypes.c_uint64(offset))
+        self._opened = True
+        
+        for field_name, field_type in [
+            ("packed_size", ctypes.c_uint64),
+            ("unpacked_size", ctypes.c_uint64),
+            ("offset", ctypes.c_uint64),
+            ("version", ctypes.c_uint32),
+            ("files", ctypes.c_uint32),
+        ]:
+            func = getattr(libmpq, "libmpq__archive_" + field_name)
+            data = field_type()
+            func(self._mpq, ctypes.byref(data))
+            setattr(self, field_name, data.value)
+    
+    def __del__(self, libmpq=libmpq):
+        if getattr(self, "_opened", False):
+            libmpq.libmpq__archive_close(self._mpq)
+    
+    def __len__(self):
+        return self.files
+    
+    def __contains__(self, item, ctypes=ctypes, libmpq=libmpq):
+        if isinstance(item, str):
+            data = ctypes.c_uint32()
+            try:
+                libmpq.libmpq__file_number(self._mpq, ctypes.c_char_p(item),
+                    ctypes.byref(data))
+            except IndexError:
+                return False
+            return True
+        return 0 <= item < self.files
+    
+    def __getitem__(self, item, ctypes=ctypes, File=File, libmpq=libmpq):
+        if isinstance(item, str):
+            data = ctypes.c_int()
+            libmpq.libmpq__file_number(self._mpq, ctypes.c_char_p(item),
+                ctypes.byref(data))
+            item = data.value
+        else:
+            if not 0 <= item < self.files:
+                raise IndexError, "file not in archive"
+        return File(self, item)
+    
+    def __repr__(self):
+        return "mpq.Archive(%r)" % self._source
+
+# Remove clutter - everything except Error and Archive.
+del os, check_error, ctypes, errors, File, libmpq, Reader
+
+if __name__ == "__main__":
+    import sys, random
+    archive = Archive(sys.argv[1])
+    print repr(archive)
+    for k, v in archive.__dict__.iteritems():
+        #if k[0] == '_': continue
+        print " " * (4 - 1), k, v
+    assert '(listfile)' in archive
+    assert 0 in archive
+    assert len(archive) == archive.files
+    files = [x.strip() for x in archive['(listfile)']]
+    files.extend(xrange(archive.files))
+    for key in files: #sys.argv[2:] if sys.argv[2:] else xrange(archive.files):
+        file = archive[key]
+        print
+        print " " * (4 - 1), repr(file)
+        for k, v in file.__dict__.iteritems():
+            #if k[0] == '_': continue
+            print " " * (8 - 1), k, v
+        
+        a = str(file)
+        
+        b = iter(file).read()
+        
+        reader = iter(file)
+        c = []
+        while True:
+            l = random.randrange(1, 10)
+            d = reader.read(l)
+            if not d: break
+            assert len(d) <= l
+            c.append(d)
+        c = "".join(c)
+        
+        d = []
+        reader.seek(0)
+        for line in reader:
+            d.append(line)
+        d = "".join(d)
+        
+        assert a == b == c == d, map(hash, [a,b,c,d])
+        assert len(a) == file.unpacked_size
+        
+        repr(iter(file))
+        
+        
+        reader.seek(0)
+        a = reader.readlines()
+        
+        reader.seek(0)
+        b = list(reader)
+        
+        assert a == b
diff --git a/dep/libmpq/config.h.cmake b/dep/libmpq/config.h.cmake
new file mode 100644
index 000000000..b039f4181
--- /dev/null
+++ b/dep/libmpq/config.h.cmake
@@ -0,0 +1,86 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#cmakedefine HAVE_DLFCN_H 1
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#cmakedefine HAVE_FSEEKO 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#cmakedefine HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `bz2' library (-lbz2). */
+#cmakedefine HAVE_LIBBZ2 1
+
+/* Define to 1 if you have the `z' library (-lz). */
+#cmakedefine HAVE_LIBZ 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#cmakedefine HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#cmakedefine HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#cmakedefine HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#cmakedefine HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#cmakedefine HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#cmakedefine HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#cmakedefine HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#cmakedefine HAVE_UNISTD_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "@LIBMPQ_PACKAGE_NAME@"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "mbroemme@plusserver.de"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "@LIBMPQ_PACKAGE_NAME@"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "@LIBMPQ_PACKAGE_NAME@ @LIBMPQ_PACKAGE_VERSION@"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "@LIBMPQ_PACKAGE_NAME@"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "@LIBMPQ_PACKAGE_VERSION@"
+
+/* Define to 1 if you have the ANSI C header files. */
+#cmakedefine STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "@LIBMPQ_PACKAGE_VERSION@"
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+/* #undef _LARGEFILE_SOURCE */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
diff --git a/dep/libmpq/configure.ac b/dep/libmpq/configure.ac
new file mode 100644
index 000000000..d274eab07
--- /dev/null
+++ b/dep/libmpq/configure.ac
@@ -0,0 +1,84 @@
+# the autoconf initilization.
+AC_INIT(libmpq, 0.4.2, [mbroemme@plusserver.de], [libmpq])
+
+# detect the canonical host and target build environment.
+AC_CANONICAL_SYSTEM
+
+# initialize autoconf and automake system.
+AM_INIT_AUTOMAKE([no-dependencies])
+AC_CONFIG_HEADERS([config.h:config.h.in])
+
+# notices.
+AC_PREREQ(2.53)
+AC_REVISION($Revision: 1.6 $)
+
+# checking for programs.
+AC_PROG_LIBTOOL
+AC_PROG_MAKE_SET
+AC_PROG_CC
+AC_SYS_LARGEFILE
+AC_FUNC_FSEEKO
+
+# check if we need to export some largefile flags.
+if test "$enable_largefile" != no; then
+	if test "$ac_cv_sys_file_offset_bits" != 'no'; then
+		if test -z "$LFS_CFLAGS" ; then
+			LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+		else
+			LFS_CFLAGS="$LFS_CFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+		fi
+	fi
+	if test "$ac_cv_sys_large_files" != 'no'; then
+		if test -z "$LFS_CFLAGS" ; then
+			LFS_CFLAGS="-D_LARGE_FILES=1"
+		else
+			LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES=1"
+		fi
+	fi
+	if  test "$ac_cv_sys_largefile_source" != 'no'; then
+		if test -z "$LFS_CFLAGS" ; then
+			LFS_CFLAGS="-D_LARGEFILE_SOURCE=1"
+		else
+			LFS_CFLAGS="$LFS_CFLAGS -D_LARGEFILE_SOURCE=1"
+		fi
+	fi
+fi
+
+# export largefile flags.
+AC_SUBST(LFS_CFLAGS)
+
+# check for zlib library.
+AC_CHECK_HEADER([zlib.h], [], [AC_MSG_ERROR([*** zlib.h is required, install zlib header files])])
+AC_CHECK_LIB([z], [inflateEnd], [], [AC_MSG_ERROR([*** inflateEnd is required, install zlib library files])])
+
+# check for bzlib2 library.
+AC_CHECK_HEADER([bzlib.h], [], [AC_MSG_ERROR([*** bzlib.h is required, install bzip2 header files])])
+AC_CHECK_LIB([bz2], [BZ2_bzDecompressInit], [], [AC_MSG_ERROR([*** BZ2_bzDecompressInit is required, install bzip2 library files])])
+
+# When we're running gcc 4 or greater, compile with -fvisibility=hidden.
+AC_TRY_COMPILE([
+#if !defined(__GNUC__) || (__GNUC__ < 4)
+#error not gcc4
+#endif
+], [], [CFLAGS="$CFLAGS -fvisibility=hidden"])
+
+# find python for binding
+AM_PATH_PYTHON([2.4],,[:])
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+
+# configuration files.
+AC_CONFIG_FILES([libmpq.pc])
+AC_CONFIG_FILES([libmpq-config],[chmod +x libmpq-config])
+
+# creating files.
+AC_OUTPUT([
+Makefile
+libmpq/Makefile
+bindings/Makefile
+bindings/d/Makefile
+bindings/python/Makefile
+doc/Makefile
+doc/man1/Makefile
+doc/man3/Makefile
+tools/Makefile
+])
diff --git a/dep/libmpq/debian/changelog b/dep/libmpq/debian/changelog
new file mode 100644
index 000000000..55d2d9187
--- /dev/null
+++ b/dep/libmpq/debian/changelog
@@ -0,0 +1,35 @@
+libmpq (0.4.2-svn288-1) unstable; urgency=low
+
+  [ babyface ]
+  * Due to the nature of MPQ archives which can have valid block entries
+  * removed function libmpq__init() and libmpq__shutdown(), because they
+    are no longer required and libmpq__file_name(), because it is up to
+    the application to provide listfile support
+  * updated documentation to latest API changes
+  * removed API documentation for removed function prototypes
+  * removed no longer required files from target
+
+  [ forrestv ]
+  * mpq.py fix
+  * spelling - huffmann to huffman
+  * changed pkware/pkzip to pkzip and used constants instead of numbers
+    in extract.c
+  * sanified huffman decoder a bit
+  * cleanup + update of mpq.py
+  * Added support for library finding on platforms besides Linux.
+  * python bindings - sequence methods on Archive, example code
+
+  [ georg ]
+  * libmpq: file number search now continued over hashtable end
+  * debian debug package
+
+ -- Georg Lukas <georg@op-co.de>  Fri, 22 May 2009 22:38:26 +0200
+
+libmpq (0.4.2-svn270-1) unstable; urgency=low
+
+  * First debian package
+  * compatible to new libmpq API (post 0.4.2)
+  * contains preliminary python-mpq package
+
+ -- Georg Lukas <georg@op-co.de>  Tue, 07 Oct 2008 14:38:58 +0200
+
diff --git a/dep/libmpq/debian/compat b/dep/libmpq/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/dep/libmpq/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/dep/libmpq/debian/control b/dep/libmpq/debian/control
new file mode 100644
index 000000000..f35bb0600
--- /dev/null
+++ b/dep/libmpq/debian/control
@@ -0,0 +1,50 @@
+Source: libmpq
+Priority: extra
+Maintainer: Georg Lukas <georg@op-co.de>
+Build-Depends: debhelper (>= 7), autotools-dev, libbz2-dev
+Standards-Version: 3.7.3
+Section: libs
+Homepage: https://libmpq.org/
+
+Package: libmpq-dev
+Section: libdevel
+Architecture: any
+Depends: libmpq0 (= ${binary:Version})
+Description: Headers for libmpq, a library for MoPaQ mpq archives
+ libmpq is a library for extracting and manipulating MoPaQ mpq archives.
+ This package provides header files and bindings for applications using
+ the libmpq library for the following languages:
+   * C
+   * Python
+   * D
+
+Package: libmpq0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A library for extracting and manipulating MoPaQ mpq archives
+ MPQ, or MoPaQ, is a proprietary archive format created by
+ Mike O'Brien, the man hailed as Blizzard's multiplayer engine
+ genius, back in 1996 as a general purpose archive for use with
+ Diablo, and named narcissistically for its creator
+ "Mike O'brien PaCK". The copyrights to it, however, are held by
+ Havas Interactive, Blizzard's parent company. The archive format
+ is used by many Blizzard titles like Diablo, Diablo 2, Starcraft,
+ Warcraft 2: BNE, a newer version in Warcraft 3 and World of
+ Warcraft (WoW).
+
+Package: libmpq0-dbg
+Section: libdevel
+Architecture: any
+Depends: libmpq0 (= ${binary:Version})
+Description: Debug symbols for libmpq0 library package
+
+Package: python-mpq
+Architecture: all
+Depends: ${python:Depends}
+XB-Python-Version: ${python:Versions}
+XS-Python-Version: current
+Description: Python bindings for libmpq, a library for MoPaQ mpq archives
+ libmpq is a library for extracting and manipulating MoPaQ mpq archives.
+ This package provides the python bindings for libmpq.
+
diff --git a/dep/libmpq/debian/copyright b/dep/libmpq/debian/copyright
new file mode 100644
index 000000000..f014cf14d
--- /dev/null
+++ b/dep/libmpq/debian/copyright
@@ -0,0 +1,23 @@
+This package was debianized by Georg Lukas <georg@op-co.de> on
+Fri, 04 Jul 2008 18:17:08 +0200.
+
+It was downloaded from <https://libmpq.org/>
+
+Upstream Author:
+
+    Maik Broemme <mbroemme@plusserver.de>
+
+Copyright:
+
+    Copyright (C) 2008 Maik Broemme
+
+License:
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+
+The Debian packaging is (C) 2008, Georg Lukas <georg@op-co.de> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/dep/libmpq/debian/libmpq-dev.dirs b/dep/libmpq/debian/libmpq-dev.dirs
new file mode 100644
index 000000000..7b6c7ee6e
--- /dev/null
+++ b/dep/libmpq/debian/libmpq-dev.dirs
@@ -0,0 +1,6 @@
+usr/bin
+usr/lib
+usr/lib/pkgconfig
+usr/include
+usr/share/man/man1
+usr/share/man/man3
diff --git a/dep/libmpq/debian/libmpq-dev.install b/dep/libmpq/debian/libmpq-dev.install
new file mode 100644
index 000000000..4e6ab3278
--- /dev/null
+++ b/dep/libmpq/debian/libmpq-dev.install
@@ -0,0 +1,6 @@
+usr/bin/*
+usr/include/*
+usr/lib/lib*.a
+usr/lib/pkgconfig/*
+usr/lib/*.la
+usr/share/man/man?/*
diff --git a/dep/libmpq/debian/libmpq0.dirs b/dep/libmpq/debian/libmpq0.dirs
new file mode 100644
index 000000000..68457717b
--- /dev/null
+++ b/dep/libmpq/debian/libmpq0.dirs
@@ -0,0 +1 @@
+usr/lib
diff --git a/dep/libmpq/debian/libmpq0.docs b/dep/libmpq/debian/libmpq0.docs
new file mode 100644
index 000000000..5ac706085
--- /dev/null
+++ b/dep/libmpq/debian/libmpq0.docs
@@ -0,0 +1,6 @@
+FAQ
+NEWS
+README
+TODO
+THANKS
+AUTHORS
diff --git a/dep/libmpq/debian/libmpq0.install b/dep/libmpq/debian/libmpq0.install
new file mode 100644
index 000000000..8aa4466a6
--- /dev/null
+++ b/dep/libmpq/debian/libmpq0.install
@@ -0,0 +1 @@
+usr/lib/lib*.so*
diff --git a/dep/libmpq/debian/python-mpq.install b/dep/libmpq/debian/python-mpq.install
new file mode 100644
index 000000000..a7aba2013
--- /dev/null
+++ b/dep/libmpq/debian/python-mpq.install
@@ -0,0 +1 @@
+usr/lib/python?.?
diff --git a/dep/libmpq/debian/rules b/dep/libmpq/debian/rules
new file mode 100644
index 000000000..1e101be5f
--- /dev/null
+++ b/dep/libmpq/debian/rules
@@ -0,0 +1,112 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+
+
+
+# shared library versions, option 1
+version=2.0.5
+major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS) -ggdb" LDFLAGS="-Wl,-z,defs"
+
+
+build: build-stamp
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -f config.sub config.guess
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_pysupport usr/lib/python?.?/site-packages
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_install
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip --dbg-package=libmpq0-dbg
+	dh_compress
+	dh_fixperms
+#	dh_perl
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/dep/libmpq/doc/Makefile.am b/dep/libmpq/doc/Makefile.am
new file mode 100644
index 000000000..e7ccd5f45
--- /dev/null
+++ b/dep/libmpq/doc/Makefile.am
@@ -0,0 +1,5 @@
+# minimum required automake 1.6
+AUTOMAKE_OPTIONS		= 1.6
+
+# any directories which should be built and installed.
+SUBDIRS				= man1 man3
diff --git a/dep/libmpq/doc/man1/Makefile.am b/dep/libmpq/doc/man1/Makefile.am
new file mode 100644
index 000000000..055f1aab5
--- /dev/null
+++ b/dep/libmpq/doc/man1/Makefile.am
@@ -0,0 +1,9 @@
+# minimum required automake 1.6
+AUTOMAKE_OPTIONS		= 1.6
+
+# manual page directory.
+EXTRA_DIST			= $(man_MANS)
+
+# manual pages for the installed binaries.
+man_MANS =			\
+	libmpq-config.1
diff --git a/dep/libmpq/doc/man1/libmpq-config.1 b/dep/libmpq/doc/man1/libmpq-config.1
new file mode 100644
index 000000000..c025f5ce4
--- /dev/null
+++ b/dep/libmpq/doc/man1/libmpq-config.1
@@ -0,0 +1,69 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 1 2008-02-10 "The MoPaQ archive library"
+.SH NAME
+libmpq-config \- script to get information about the installed version of libmpq.
+.SH SYNOPSIS
+.B libmpq-config
+[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version]
+.br
+[\-\-cflags] [\-\-libs] [\-\-static\-libs]
+.SH DESCRIPTION
+.PP
+\fIlibmpq-config\fP is a tool that is used to determine the compiler and linker flags that should be used to compile and link programs that use \fIlibmpq\fP. Finally, it's also used internally by the .m4 macros for GNU autoconf that are included with \fIlibmpq\fP.
+.SH OPTIONS
+\fIlibmpq-config\fP accepts the following options:
+.TP 8
+.B  \-\-version
+.ti 15
+Print the currently installed version of \fIlibmpq\fP on the standard output.
+.TP 8
+.B  \-\-libs
+.ti 15
+Print the linker flags that are necessary to link \fIlibmpq\fP to a program.
+.TP 8
+.B  \-\-static\-libs
+.ti 15
+Print the linker flags that are necessary to statically link \fIlibmpq\fP to a program.
+.TP 8
+.B  \-\-cflags
+.ti 15
+Print the compiler flags that are necessary to compile a program that use \fIlibmpq\fP.
+.TP 8
+.B  \-\-prefix=PREFIX
+.ti 15
+If specified, use PREFIX instead of the installation prefix that \fIlibmpq\fP was built with when computing the output for the \-\-cflags and \-\-libs options. This option is also used for the exec prefix if \-\-exec\-prefix was not specified. This option must be specified before any \-\-libs or \-\-cflags options.
+.TP 8
+.B  \-\-exec\-prefix=PREFIX
+.ti 15
+If specified, use PREFIX instead of the installation exec prefix that \fIlibmpq\fP was built with when computing the output for the \-\-cflags and \-\-libs options.  This option must be specified before any \-\-libs or \-\-cflags options.
+.SH NOTE
+Instead of using this configuration script you should better use the pkg-config version because this would be more platform independent and makes the usage within GNU autoconf much easier.
+.SH SEE ALSO
+\fBlibmpq\fR(3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/Makefile.am b/dep/libmpq/doc/man3/Makefile.am
new file mode 100644
index 000000000..cad3d865d
--- /dev/null
+++ b/dep/libmpq/doc/man3/Makefile.am
@@ -0,0 +1,31 @@
+# minimum required automake 1.6
+AUTOMAKE_OPTIONS		= 1.6
+
+# manual page directory.
+EXTRA_DIST			= $(man_MANS)
+
+# manual pages for the installed binaries.
+man_MANS =				\
+	libmpq.3			\
+	libmpq__archive_close.3		\
+	libmpq__archive_files.3		\
+	libmpq__archive_offset.3	\
+	libmpq__archive_open.3		\
+	libmpq__archive_packed_size.3	\
+	libmpq__archive_unpacked_size.3	\
+	libmpq__archive_version.3	\
+	libmpq__block_close_offset.3	\
+	libmpq__block_open_offset.3	\
+	libmpq__block_read.3		\
+	libmpq__block_unpacked_size.3	\
+	libmpq__file_blocks.3		\
+	libmpq__file_compressed.3	\
+	libmpq__file_encrypted.3	\
+	libmpq__file_imploded.3		\
+	libmpq__file_number.3		\
+	libmpq__file_offset.3		\
+	libmpq__file_packed_size.3	\
+	libmpq__file_read.3		\
+	libmpq__file_unpacked_size.3	\
+	libmpq__strerror.3		\
+	libmpq__version.3
diff --git a/dep/libmpq/doc/man3/libmpq.3 b/dep/libmpq/doc/man3/libmpq.3
new file mode 100644
index 000000000..768dab0a7
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq.3
@@ -0,0 +1,207 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-04-29 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "const char *libmpq__version();"
+.sp
+.BI "const char *libmpq__strerror(int32_t returncode);"
+.sp
+.BI "int32_t libmpq__archive_open("
+.BI "        mpq_archive_s **" "mpq_archive",
+.BI "        const char     *" "mpq_filename",
+.BI "        off_t           " "archive_offset"
+.BI ");"
+.sp
+.BI "int32_t libmpq__archive_close("
+.BI "        mpq_archive_s  *" "mpq_archive"
+.BI ");"
+.sp
+.BI "int32_t libmpq__archive_packed_size("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        off_t          *" "packed_size"
+.BI ");"
+.sp
+.BI "int32_t libmpq__archive_unpacked_size("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        off_t          *" "unpacked_size"
+.BI ");"
+.sp
+.BI "int32_t libmpq__archive_offset("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        off_t          *" "offset"
+.BI ");"
+.sp
+.BI "int32_t libmpq__archive_version("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t       *" "version"
+.BI ");"
+.sp
+.BI "int32_t libmpq__archive_files("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t       *" "files"
+.BI ");"
+.sp
+.BI "int32_t libmpq__file_packed_size("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        off_t          *" "packed_size"
+.BI ");"
+.sp
+.BI "int32_t libmpq__file_unpacked_size("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        off_t          *" "unpacked_size"
+.BI ");"
+.sp
+.BI "int32_t libmpq__file_offset("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        off_t          *" "offset"
+.BI ");"
+.sp
+.BI "int32_t libmpq__file_blocks("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        off_t          *" "blocks"
+.BI ");"
+.sp
+.BI "int32_t libmpq__file_encrypted("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        off_t          *" "encrypted"
+.BI ");"
+.sp
+.BI "int32_t libmpq__file_compressed("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        off_t          *" "compressed"
+.BI ");"
+.sp
+.BI "int32_t libmpq__file_imploded("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        off_t          *" "imploded"
+.BI ");"
+.sp
+.BI "int32_t libmpq__file_number("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        const char     *" "filename",
+.BI "        uint32_t       *" "number"
+.BI ");"
+.sp
+.BI "int32_t libmpq__file_read("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint8_t        *" "out_buf",
+.BI "        off_t           " "out_size",
+.BI "        off_t          *" "transferred"
+.BI ");"
+.sp
+.BI "int32_t libmpq__block_open_offset("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number"
+.BI ");"
+.sp
+.BI "int32_t libmpq__block_close_offset("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number"
+.BI ");"
+.sp
+.BI "int32_t libmpq__block_packed_size("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint32_t        " "block_number",
+.BI "        off_t          *" "packed_size"
+.BI ");"
+.sp
+.BI "int32_t libmpq__block_unpacked_size("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint32_t        " "block_number",
+.BI "        off_t          *" "unpacked_size"
+.BI ");"
+.sp
+.BI "int32_t libmpq__block_offset("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint32_t        " "block_number",
+.BI "        off_t          *" "offset"
+.BI ");"
+.sp
+.BI "int32_t libmpq__block_seed("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint32_t        " "block_number",
+.BI "        uint32_t       *" "seed"
+.BI ");"
+.sp
+.BI "int32_t libmpq__block_read("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint32_t        " "block_number",
+.BI "        uint8_t        *" "out_buf",
+.BI "        off_t           " "out_size",
+.BI "        off_t          *" "transferred"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+The \fIlibmpq\fP library supports decrypting, decompressing, exploding and various manipulations of the MoPaQ archive files. It uses \fIzlib(3)\fP and \fIbzip2(1)\fP compression library. At this moment \fIlibmpq\fP is not able to create MoPaQ archives, this limitation will be removed in a future version.
+.SH SEE ALSO
+.BR libmpq__version (3),
+.BR libmpq__strerror (3),
+.BR libmpq__archive_open (3),
+.BR libmpq__archive_close (3),
+.BR libmpq__archive_packed_size (3),
+.BR libmpq__archive_unpacked_size (3),
+.BR libmpq__archive_offset (3),
+.BR libmpq__archive_version (3),
+.BR libmpq__archive_files (3),
+.BR libmpq__file_packed_size (3),
+.BR libmpq__file_unpacked_size (3),
+.BR libmpq__file_offset (3),
+.BR libmpq__file_blocks (3),
+.BR libmpq__file_encrypted (3),
+.BR libmpq__file_compressed (3),
+.BR libmpq__file_imploded (3),
+.BR libmpq__file_number (3),
+.BR libmpq__file_read (3),
+.BR libmpq__block_open_offset (3),
+.BR libmpq__block_close_offset (3),
+.BR libmpq__block_packed_size (3),
+.BR libmpq__block_unpacked_size (3),
+.BR libmpq__block_offset (3),
+.BR libmpq__block_seed (3),
+.BR libmpq__block_read (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__archive_close.3 b/dep/libmpq/doc/man3/libmpq__archive_close.3
new file mode 100644
index 000000000..dfc652a67
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__archive_close.3
@@ -0,0 +1,57 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-04-29 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__archive_close("
+.BI "        mpq_archive_s  *" "mpq_archive"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__archive_close\fP() to close a mpq archive which was opened by \fBlibmpq__archive_open\fP(). The function frees the archive structure itself and the contents of it.
+.LP
+The \fBlibmpq__archive_close\fP() function one takes one argument of the archive structure \fImpq_archive\fP which has to be set by \fBlibmpq__archive_open\fP.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP
+.B LIBMPQ_ERROR_CLOSE
+The given file could not be closed.
+.SH SEE ALSO
+.BR libmpq__archive_open (3),
+.BR libmpq__archive_packed_size (3),
+.BR libmpq__archive_unpacked_size (3),
+.BR libmpq__archive_offset (3),
+.BR libmpq__archive_version (3),
+.BR libmpq__archive_files (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__archive_files.3 b/dep/libmpq/doc/man3/libmpq__archive_files.3
new file mode 100644
index 000000000..6663b9916
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__archive_files.3
@@ -0,0 +1,50 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-14 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__archive_files("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t       *" "files"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__archive_files\fP() to get the number of files inside the archive. It will count only valid files and skip files which have deleted or freed hash entries.
+.LP
+The \fBlibmpq__archive_files\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument is a reference to the number of \fIfiles\fP in the archive.
+.SH RETURN VALUE
+On success, a zero is returned.
+.SH SEE ALSO
+.BR libmpq__file_blocks (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__archive_offset.3 b/dep/libmpq/doc/man3/libmpq__archive_offset.3
new file mode 100644
index 000000000..696ac5e80
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__archive_offset.3
@@ -0,0 +1,51 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-14 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__archive_offset("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        off_t          *" "offset"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__archive_offset\fP() to get the offset of the archive, which is the absolute position in the file. It also supports archives within archives.
+.LP
+The \fBlibmpq__archive_offset\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument is a reference to the archive starting position \fIoffset\fP in file.
+.SH RETURN VALUE
+On success, a zero is returned.
+.SH SEE ALSO
+.BR libmpq__file_offset (3),
+.BR libmpq__block_offset (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__archive_open.3 b/dep/libmpq/doc/man3/libmpq__archive_open.3
new file mode 100644
index 000000000..02c021f89
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__archive_open.3
@@ -0,0 +1,71 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-04-29 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__archive_open("
+.BI "        mpq_archive_s **" "mpq_archive",
+.BI "        const char     *" "mpq_filename",
+.BI "        off_t           " "archive_offset"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__archive_open\fP() to open a given mpq archive for later use to extract or manipulate files inside the archive. It will create all required file structures and you have to call \fBlibmpq__archive_close\fP() on success to clean the opened structures. On failure there is no need to call \fBlibmpq__archive_close\fP() because everything will be cleaned up.
+.LP
+The \fBlibmpq__archive_open\fP() function takes as first argument a reference to the archive structure \fImpq_archive\fP and will open the file \fImpq_filename\fP to the structure pointed to by \fImpq_archive\fP. The last argument, \fIarchive_offset\fP is normally -1, but can be specified when the archive offset is known, or not 512-byte aligned.
+.SH RETURN VALUE
+On success, *\fImpq_archive\fP is set to a new \fBmpq_archive_s\fP* and zero is returned, and on error one of the following constants is returned.
+.TP
+.B LIBMPQ_ERROR_OPEN
+The given file could not be opened.
+.TP
+.B LIBMPQ_ERROR_MALLOC
+Not enough memory for creating required structures.
+.TP
+.B LIBMPQ_ERROR_SEEK
+Seeking in file failed.
+.TP
+.B LIBMPQ_ERROR_FORMAT
+The given file is no valid mpq archive.
+.TP
+.B LIBMPQ_ERROR_READ
+Reading in archive failed.
+.SH SEE ALSO
+.BR libmpq__archive_close (3),
+.BR libmpq__archive_packed_size (3),
+.BR libmpq__archive_unpacked_size (3),
+.BR libmpq__archive_offset (3),
+.BR libmpq__archive_version (3),
+.BR libmpq__archive_files (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__archive_packed_size.3 b/dep/libmpq/doc/man3/libmpq__archive_packed_size.3
new file mode 100644
index 000000000..6c3061f20
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__archive_packed_size.3
@@ -0,0 +1,51 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-04-29 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__archive_packed_size("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        off_t          *" "packed_size"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__archive_packed_size\fP() to get the packed size of all files in the archive. It will count compressed and imploded files as well as stored only.
+.LP
+The \fBlibmpq__archive_packed_size\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument is a reference to the compressed, imploded or stored size \fIpacked_size\fP of file.
+.SH RETURN VALUE
+On success, a zero is returned.
+.SH SEE ALSO
+.BR libmpq__file_packed_size (3),
+.BR libmpq__block_packed_size (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__archive_unpacked_size.3 b/dep/libmpq/doc/man3/libmpq__archive_unpacked_size.3
new file mode 100644
index 000000000..d2ba923c8
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__archive_unpacked_size.3
@@ -0,0 +1,51 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-04-29 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__archive_unpacked_size("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        off_t          *" "unpacked_size"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__archive_unpacked_size\fP() to get the unpacked size of all files in the archive. It will count uncompressed and exploded files as well as stored only.
+.LP
+The \fBlibmpq__archive_unpacked_size\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument is a reference to the uncompressed, exploded or stored size \fIunpacked_size\fP of file.
+.SH RETURN VALUE
+On success, a zero is returned.
+.SH SEE ALSO
+.BR libmpq__file_unpacked_size (3),
+.BR libmpq__block_unpacked_size (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__archive_version.3 b/dep/libmpq/doc/man3/libmpq__archive_version.3
new file mode 100644
index 000000000..176404689
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__archive_version.3
@@ -0,0 +1,48 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-14 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__archive_version("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t       *" "version"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__archive_version\fP() to get the archive version. Currently there exist two known versions, version 1 which supports archives until 2GB total size and version 2 which supports archives above 2GB total size and both are supported.
+.LP
+The \fBlibmpq__archive_version\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument is a reference to the \fIversion\fP of archive.
+.SH RETURN VALUE
+On success, a zero is returned.
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__block_close_offset.3 b/dep/libmpq/doc/man3/libmpq__block_close_offset.3
new file mode 100644
index 000000000..1ec0c06f7
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__block_close_offset.3
@@ -0,0 +1,53 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-16 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__block_close_offset("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__block_close_offset\fP() to close the block offset table for the given file. It will close the block offset table regardless of compression (compressed, imploded or stored) type of file.
+.LP
+The \fBlibmpq__block_close_offset\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfile_number\fP is the number of file to close.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP
+.B LIBMPQ_ERROR_EXIST
+File or block does not exist in archive.
+.SH SEE ALSO
+.BR libmpq__block_open_offset (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__block_open_offset.3 b/dep/libmpq/doc/man3/libmpq__block_open_offset.3
new file mode 100644
index 000000000..a60b133f4
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__block_open_offset.3
@@ -0,0 +1,65 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-16 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__block_open_offset("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__block_open_offset\fP() to open the block offset table for the given file. It will open the block offset table regardless of compression (compressed, imploded or stored) type of file.
+.LP
+The \fBlibmpq__block_open_offset\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfile_number\fP is the number of file to open.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP
+.B LIBMPQ_ERROR_EXIST
+File or block does not exist in archive.
+.TP
+.B LIBMPQ_ERROR_SEEK
+Seeking in file failed.
+.TP
+.B LIBMPQ_ERROR_MALLOC
+Not enough memory for creating required structures.
+.TP
+.B LIBMPQ_ERROR_READ
+Reading in archive failed.
+.TP
+.B LIBMPQ_ERROR_DECRYPT
+Decrypting block failed.
+.SH SEE ALSO
+.BR libmpq__block_close_offset (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__block_read.3 b/dep/libmpq/doc/man3/libmpq__block_read.3
new file mode 100644
index 000000000..3272c64c7
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__block_read.3
@@ -0,0 +1,78 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-16 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__block_read("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint32_t        " "block_number,
+.BI "        uint8_t        *" "out_buf",
+.BI "        off_t           " "out_size",
+.BI "        off_t           " "transferred"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__block_read\fP() to read a given block into memory. If the block is encrypted it will be first decrypted and then if it is packed (compressed or imploded) it will be unpacked.
+.LP
+The \fBlibmpq__block_read\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfile_number\fP is the number of file, the third argument \fIblock_number\fP is the number of block. The fourth argument \fIout_buf\fP is the output data buffer which contains the extracted data and the fifth argument \fIout_size\fP is the size of \fIout_buf\fP. The sixth argument is a reference to the \fItransferred\fP bytes of the file.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP
+.B LIBMPQ_ERROR_EXIST
+Block does not exist in archive.
+.TP 
+.B LIBMPQ_ERROR_OPEN
+Block offset table was not opened by calling \fBlibmpq__block_open_offset\fP(), or it was closed by an \fBlibmpq__block_close_offset\fP() call.
+.TP
+.B LIBMPQ_ERROR_SIZE
+The output buffer is to small.
+.TP
+.B LIBMPQ_ERROR_SEEK
+Seeking in file failed.
+.TP
+.B LIBMPQ_ERROR_MALLOC
+Not enough memory for creating required structures.
+.TP
+.B LIBMPQ_ERROR_READ
+Reading in archive failed.
+.TP
+.B LIBMPQ_ERROR_DECRYPT
+Decrypting block failed.
+.TP
+.B LIBMPQ_ERROR_UNPACK
+Unpacking block failed.
+.SH SEE ALSO
+.BR libmpq__file_read (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__block_unpacked_size.3 b/dep/libmpq/doc/man3/libmpq__block_unpacked_size.3
new file mode 100644
index 000000000..a21ca4815
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__block_unpacked_size.3
@@ -0,0 +1,59 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-16 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__block_unpacked_size("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint32_t        " "block_number",
+.BI "        off_t          *" "unpacked_size"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__block_unpacked_size\fP() to get the unpacked size of a given block in the file. It will return a valid size for compressed and imploded blocks as well as stored only.
+.LP
+The \fBlibmpq__block_unpacked_size\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfile_number\fP is the number of file, the third argument \fIblock_number\fP is the number of block and the fourth argument is a reference to the uncompressed, exploded or stored size \fIunpacked_size\fP of block.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP
+.B LIBMPQ_ERROR_EXIST
+File or block does not exist in archive.
+.TP
+.B LIBMPQ_ERROR_OPEN
+Block offset table was not opened by calling \fBlibmpq__block_open_offset\fP(), or it was closed by an \fBlibmpq__block_close_offset\fP() call.
+.SH SEE ALSO
+.BR libmpq__archive_unpacked_size (3),
+.BR libmpq__file_unpacked_size (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__file_blocks.3 b/dep/libmpq/doc/man3/libmpq__file_blocks.3
new file mode 100644
index 000000000..85baeffc6
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__file_blocks.3
@@ -0,0 +1,54 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-16 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__file_blocks("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint32_t       *" "blocks"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__file_blocks\fP() to get the number of blocks for a given file. It will count all blocks for files stored in multiple sectors or count one for files stored in single sector.
+.LP
+The \fBlibmpq__file_blocks\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfile_number\fP is the number of file and the third argument is a reference to the number of \fIblocks\fP of the file.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP 
+.B LIBMPQ_ERROR_EXIST
+File does not exist in archive.
+.SH SEE ALSO
+.BR libmpq__archive_files (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__file_compressed.3 b/dep/libmpq/doc/man3/libmpq__file_compressed.3
new file mode 100644
index 000000000..24b44f0b6
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__file_compressed.3
@@ -0,0 +1,54 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-16 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__file_compressed("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint32_t       *" "compressed"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__file_compressed\fP() to get the compression status of the given file. It will return true for compressed files and false otherwise.
+.LP
+The \fBlibmpq__file_compressed\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfile_number\fP is the number of file and the third argument is a reference to the compression status \fIcompressed\fP of the file.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP 
+.B LIBMPQ_ERROR_EXIST
+File does not exist in archive.
+.SH SEE ALSO
+.BR libmpq__archive_files (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__file_encrypted.3 b/dep/libmpq/doc/man3/libmpq__file_encrypted.3
new file mode 100644
index 000000000..798f4019c
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__file_encrypted.3
@@ -0,0 +1,54 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-16 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__file_encrypted("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint32_t       *" "encrypted"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__file_encrypted\fP() to get the encryption status of the given file. It will return true for encrypted files and false otherwise.
+.LP
+The \fBlibmpq__file_encrypted\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfile_number\fP is the number of file and the third argument is a reference to the encryption status \fIencrypted\fP of the file.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP 
+.B LIBMPQ_ERROR_EXIST
+File does not exist in archive.
+.SH SEE ALSO
+.BR libmpq__archive_files (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__file_imploded.3 b/dep/libmpq/doc/man3/libmpq__file_imploded.3
new file mode 100644
index 000000000..9adce38cb
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__file_imploded.3
@@ -0,0 +1,54 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-16 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__file_imploded("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint32_t       *" "imploded"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__file_imploded\fP() to get the implosion status of the given file. It will return true for imploded files and false otherwise.
+.LP
+The \fBlibmpq__file_imploded\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfile_number\fP is the number of file and the third argument is a reference to the implosion status \fIimploded\fP of the file.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP 
+.B LIBMPQ_ERROR_EXIST
+File does not exist in archive.
+.SH SEE ALSO
+.BR libmpq__archive_files (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__file_number.3 b/dep/libmpq/doc/man3/libmpq__file_number.3
new file mode 100644
index 000000000..8d7a47769
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__file_number.3
@@ -0,0 +1,52 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-16 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__file_number("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        const char     *" "filename",
+.BI "        uint32_t       *" "number"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__file_number\fP() to get the number of a given file in the archive. This function will return a file number regardless of a known or opened listfile.
+.LP
+The \fBlibmpq__file_number\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfilename\fP is the name of the file and the third argument is a reference to the \fInumber\fP of the file.
+.SH RETURN VALUE
+On success, the number of the file is returned and on error one of the following constants.
+.TP
+.B LIBMPQ_ERROR_EXIST
+File does not exist in archive.
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__file_offset.3 b/dep/libmpq/doc/man3/libmpq__file_offset.3
new file mode 100644
index 000000000..392a66d0b
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__file_offset.3
@@ -0,0 +1,55 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-15 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__file_offset("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        off_t          *" "offset"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__file_offset\fP() to get the offset of the file, which is the absolute position in the archive. It also supports archives within archives.
+.LP
+The \fBlibmpq__file_offset\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfile_number\fP is the number of file and the third argument is a reference to the file starting position \fIoffset\fP in archive.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP
+.B LIBMPQ_ERROR_EXIST
+File does not exist in archive.
+.SH SEE ALSO
+.BR libmpq__archive_offset (3),
+.BR libmpq__block_offset (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__file_packed_size.3 b/dep/libmpq/doc/man3/libmpq__file_packed_size.3
new file mode 100644
index 000000000..b584ddf77
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__file_packed_size.3
@@ -0,0 +1,55 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-15 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__file_packed_size("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        off_t          *" "packed_size"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__file_packed_size\fP() to get the packed size of a given file in the archive. It will return a valid size for compressed and imploded files as well as stored only.
+.LP
+The \fBlibmpq__file_packed_size\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfile_number\fP is the number of file and the third argument is a reference to the compressed, imploded or stored size \fIpacked_size\fP of file.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP
+.B LIBMPQ_ERROR_EXIST
+File does not exist in archive.
+.SH SEE ALSO
+.BR libmpq__archive_packed_size (3),
+.BR libmpq__block_packed_size (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__file_read.3 b/dep/libmpq/doc/man3/libmpq__file_read.3
new file mode 100644
index 000000000..cbfafbd0f
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__file_read.3
@@ -0,0 +1,77 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-16 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__file_read("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        uint8_t        *" "out_buf",
+.BI "        off_t           " "out_size",
+.BI "        off_t          *" "transferred"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__file_read\fP() to read a given file into memory. If the file is encrypted it will be first decrypted and then if it is packed (compressed or imploded) it will be unpacked.
+.LP
+The \fBlibmpq__file_read\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfile_number\fP is the file to extract, the third argument \fIout_buf\fP is the output data buffer which contains the extracted data. The fourth argument \fIout_size\fP is the size of \fIout_buf\fP and the fifth argument is a reference to the \fItransferred\fP bytes of the file.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP
+.B LIBMPQ_ERROR_EXIST
+File does not exist in archive.
+.TP 
+.B LIBMPQ_ERROR_OPEN
+Block offset table was not opened by calling \fBlibmpq__block_open_offset\fP(), or it was closed by an \fBlibmpq__block_close_offset\fP() call.
+.TP
+.B LIBMPQ_ERROR_SIZE
+The output buffer is to small.
+.TP
+.B LIBMPQ_ERROR_SEEK
+Seeking in file failed.
+.TP
+.B LIBMPQ_ERROR_MALLOC
+Not enough memory for creating required structures.
+.TP
+.B LIBMPQ_ERROR_READ
+Reading in archive failed.
+.TP
+.B LIBMPQ_ERROR_DECRYPT
+Decrypting file failed.
+.TP
+.B LIBMPQ_ERROR_UNPACK
+Unpacking file failed.
+.SH SEE ALSO
+.BR libmpq__block_read (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__file_unpacked_size.3 b/dep/libmpq/doc/man3/libmpq__file_unpacked_size.3
new file mode 100644
index 000000000..a81cf7a4e
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__file_unpacked_size.3
@@ -0,0 +1,55 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-05-15 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "int32_t libmpq__file_unpacked_size("
+.BI "        mpq_archive_s  *" "mpq_archive",
+.BI "        uint32_t        " "file_number",
+.BI "        off_t          *" "unpacked_size"
+.BI ");"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__file_unpacked_size\fP() to get the unpacked size of a given file in the archive. It will return a valid size for compressed and imploded files as well as stored only.
+.LP
+The \fBlibmpq__file_unpacked_size\fP() function takes as first argument the archive structure \fImpq_archive\fP which have to be allocated first and opened by \fBlibmpq__archive_open\fP(). The second argument \fIfile_number\fP is the number of file and the third argument is a reference to the uncompressed, exploded or stored size \fIunpacked_size\fP of file.
+.SH RETURN VALUE
+On success, a zero is returned and on error one of the following constants.
+.TP
+.B LIBMPQ_ERROR_EXIST
+File does not exist in archive.
+.SH SEE ALSO
+.BR libmpq__archive_unpacked_size (3),
+.BR libmpq__block_unpacked_size (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__strerror.3 b/dep/libmpq/doc/man3/libmpq__strerror.3
new file mode 100644
index 000000000..246f422ee
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__strerror.3
@@ -0,0 +1,45 @@
+.\" Copyright (c) 2010 Georg Lukas <georg@op-co.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2010-07-18 "The MoPaQ archive library"
+.SH NAME
+libmpq__strerror \- return string describing libmpq error number
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "const char *libmpq__strerror(int32_t returncode);"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__strerror\fP() to get a string message for the return code of one of the other libmpq functions.
+.SH RETURN VALUE
+The function returns a string pointer to non-writable memory or NULL if \fBreturncode\fP is not a return code of a libmpq function.
+.SH SEE ALSO
+.BR libmpq (3), strerror (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/doc/man3/libmpq__version.3 b/dep/libmpq/doc/man3/libmpq__version.3
new file mode 100644
index 000000000..5500d7314
--- /dev/null
+++ b/dep/libmpq/doc/man3/libmpq__version.3
@@ -0,0 +1,45 @@
+.\" Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
+.\" USA.
+.TH libmpq 3 2008-03-31 "The MoPaQ archive library"
+.SH NAME
+libmpq \- cross-platform C library for manipulating mpq archives.
+.SH SYNOPSIS
+.nf
+.B
+#include <mpq.h>
+.sp
+.BI "const char *libmpq__version();"
+.fi
+.SH DESCRIPTION
+.PP
+Call \fBlibmpq__version\fP() to get information about the version of the library, it is useful to create minimum required version verifications.
+.SH RETURN VALUE
+The function returns the library version.
+.SH SEE ALSO
+.BR libmpq (3)
+.SH AUTHOR
+Check documentation.
+.TP
+libmpq is (c) 2003-2008
+.B Maik Broemme <mbroemme@plusserver.de>
+.PP
+The above e-mail address can be used to send bug reports, feedbacks or library enhancements.
diff --git a/dep/libmpq/libmpq-config.in b/dep/libmpq/libmpq-config.in
new file mode 100644
index 000000000..d345efdbe
--- /dev/null
+++ b/dep/libmpq/libmpq-config.in
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+exec_prefix_set=no
+
+usage="\
+Usage: libmpq-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+
+if test "$#" -eq "0"; then
+      echo "${usage}" 1>&2
+      exit 1
+fi
+
+while test "$#" -gt "0"; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case "$1" in
+    --prefix=*)
+      prefix="$optarg"
+      if test "$exec_prefix_set" = "no" ; then
+        exec_prefix="$optarg"
+      fi
+      ;;
+    --prefix)
+      echo "$prefix"
+      ;;
+    --exec-prefix=*)
+      exec_prefix="$optarg"
+      exec_prefix_set=yes
+      ;;
+    --exec-prefix)
+      echo "$exec_prefix"
+      ;;
+    --version)
+      echo "@VERSION@"
+      ;;
+    --cflags)
+      largefile="@LFS_CFLAGS@"
+      includes=-I@includedir@/libmpq
+      echo "$includes $largefile"
+      ;;
+    --libs)
+      libdirs="-L@libdir@"
+      echo "$libdirs -lmpq"
+      ;;
+    *)
+      echo "${usage}" 1>&2
+      exit 1
+      ;;
+  esac
+  shift
+done
+
diff --git a/dep/libmpq/libmpq.pc.in b/dep/libmpq/libmpq.pc.in
new file mode 100644
index 000000000..8c53bea35
--- /dev/null
+++ b/dep/libmpq/libmpq.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libmpq
+Description: GPL version of the libmpq library
+Version: @VERSION@
+Libs: -L${libdir} -lmpq
+Cflags: -I${includedir}/libmpq @LFS_CFLAGS@
diff --git a/dep/libmpq/libmpq/Makefile.am b/dep/libmpq/libmpq/Makefile.am
new file mode 100644
index 000000000..409e3dfe0
--- /dev/null
+++ b/dep/libmpq/libmpq/Makefile.am
@@ -0,0 +1,23 @@
+# minimum required automake 1.6
+AUTOMAKE_OPTIONS		= 1.6
+
+# library information and headers which should not be installed.
+lib_LTLIBRARIES			= libmpq.la
+noinst_HEADERS			= common.h explode.h extract.h huffman.h mpq-internal.h wave.h
+
+# directory where the include files will be installed.
+libmpq_includedir		= $(includedir)/libmpq
+
+# header files to install.
+libmpq_include_HEADERS		= mpq.h
+
+libmpq_la_SOURCES		= $(GENERAL_SRCS)
+libmpq_la_LDFLAGS		= -release $(PACKAGE_VERSION)
+
+GENERAL_SRCS =			\
+	common.c		\
+	huffman.c		\
+	extract.c		\
+	explode.c		\
+	mpq.c			\
+	wave.c
diff --git a/dep/libmpq/libmpq/common.c b/dep/libmpq/libmpq/common.c
new file mode 100644
index 000000000..879bd902b
--- /dev/null
+++ b/dep/libmpq/libmpq/common.c
@@ -0,0 +1,220 @@
+/*
+ *  common.c -- shared functions used by mpq-tools.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* generic includes. */
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+/* libmpq main includes. */
+#include "mpq.h"
+#include "mpq-internal.h"
+
+/* libmpq generic includes. */
+#include "extract.h"
+
+#include "common.h"
+
+/* the global shared decryption buffer. it's a static array compiled into the
+ * library, and can be re-created by compiling and running crypt_buf_gen.c
+ */
+#include "crypt_buf.h"
+
+/* function to return the hash to a given string. */
+uint32_t libmpq__hash_string(const char *key, uint32_t offset) {
+
+	/* some common variables. */
+	uint32_t seed1 = 0x7FED7FED;
+	uint32_t seed2 = 0xEEEEEEEE;
+
+	/* one key character. */
+	uint32_t ch;
+
+	/* prepare seeds. */
+	while (*key != 0) {
+		ch    = toupper(*key++);
+		seed1 = crypt_buf[offset + ch] ^ (seed1 + seed2);
+		seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
+	}
+
+	return seed1;
+}
+
+/* function to encrypt a block. */
+int32_t libmpq__encrypt_block(uint32_t *in_buf, uint32_t in_size, uint32_t seed) {
+
+	/* some common variables. */
+	uint32_t seed2 = 0xEEEEEEEE;
+	uint32_t ch;
+
+	/* we're processing the data 4 bytes at a time. */
+	for (; in_size >= 4; in_size -= 4) {
+		seed2    += crypt_buf[0x400 + (seed & 0xFF)];
+		ch        = *in_buf ^ (seed + seed2);
+		seed      = ((~seed << 0x15) + 0x11111111) | (seed >> 0x0B);
+		seed2     = *in_buf + seed2 + (seed2 << 5) + 3;
+		*in_buf++ = ch;
+	}
+
+	/* if no error was found, return decrypted bytes. */
+	return LIBMPQ_SUCCESS;
+}
+
+
+/* function to decrypt a block. */
+int32_t libmpq__decrypt_block(uint32_t *in_buf, uint32_t in_size, uint32_t seed) {
+
+	/* some common variables. */
+	uint32_t seed2 = 0xEEEEEEEE;
+	uint32_t ch;
+
+	/* we're processing the data 4 bytes at a time. */
+	for (; in_size >= 4; in_size -= 4) {
+		seed2    += crypt_buf[0x400 + (seed & 0xFF)];
+		ch        = *in_buf ^ (seed + seed2);
+		seed      = ((~seed << 0x15) + 0x11111111) | (seed >> 0x0B);
+		seed2     = ch + seed2 + (seed2 << 5) + 3;
+		*in_buf++ = ch;
+	}
+
+	/* if no error was found, return decrypted bytes. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* function to detect decryption key. */
+int32_t libmpq__decrypt_key(uint8_t *in_buf, uint32_t in_size, uint32_t block_size, uint32_t *key) {
+
+	/* some common variables. */
+	uint32_t saveseed1;
+
+	/* temp = seed1 + seed2 */
+	uint32_t temp;
+	uint32_t i = 0;
+
+	/* temp = seed1 + buffer[0x400 + (seed1 & 0xFF)] */
+	temp = (*(uint32_t *)in_buf ^ in_size) - 0xEEEEEEEE;
+
+	/* try all 255 possibilities. */
+	for (i = 0; i < 0x100; i++) {
+
+		/* some common variables. */
+		uint32_t seed1;
+		uint32_t seed2 = 0xEEEEEEEE;
+		uint32_t ch;
+		uint32_t ch2;
+
+		/* try the first uint32_t's (we exactly know the value). */
+		seed1  = temp - crypt_buf[0x400 + i];
+		seed2 += crypt_buf[0x400 + (seed1 & 0xFF)];
+		ch     = ((uint32_t *)in_buf)[0] ^ (seed1 + seed2);
+
+		if (ch != in_size) {
+			continue;
+		}
+
+		/* add one because we are decrypting block positions. */
+		saveseed1 = seed1 + 1;
+		ch2       = ch;
+
+		/*
+		 *  if ok, continue and test the second value. we don't know exactly the value,
+		 *  but we know that the second one has lower 16 bits set to zero (no compressed
+		 *  block is larger than 0xFFFF bytes)
+		 */
+		seed1  = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
+		seed2  = ch + seed2 + (seed2 << 5) + 3;
+		seed2 += crypt_buf[0x400 + (seed1 & 0xFF)];
+		ch     = ((uint32_t *)in_buf)[1] ^ (seed1 + seed2);
+
+		/* check if we found the file seed. */
+		if ((ch - ch2) <= block_size) {
+
+			/* file seed found, so return it. */
+			*key = saveseed1;
+			return LIBMPQ_SUCCESS;
+		}
+	}
+
+	/* if no file seed was found return with error. */
+	return LIBMPQ_ERROR_DECRYPT;
+}
+
+/* function to decompress or explode a block from mpq archive. */
+int32_t libmpq__decompress_block(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size, uint32_t compression_type) {
+
+	/* some common variables. */
+	int32_t tb = 0;
+
+	/* check if buffer is not compressed. */
+	if (compression_type == LIBMPQ_FLAG_COMPRESS_NONE) {
+
+		/* no compressed data, so copy input buffer to output buffer. */
+		memcpy(out_buf, in_buf, out_size);
+
+		/* store number of bytes copied. */
+		tb = out_size;
+	}
+
+	/* check if one compression mode is used. */
+	else if (compression_type == LIBMPQ_FLAG_COMPRESS_PKZIP ||
+	    compression_type == LIBMPQ_FLAG_COMPRESS_MULTI) {
+
+		/* check if block is really compressed, some blocks have set the compression flag, but are not compressed. */
+		if (in_size < out_size) {
+
+			/* check if we are using pkzip compression algorithm. */
+			if (compression_type == LIBMPQ_FLAG_COMPRESS_PKZIP) {
+
+				/* decompress using pkzip. */
+				if ((tb = libmpq__decompress_pkzip(in_buf, in_size, out_buf, out_size)) < 0) {
+
+					/* something on decompression failed. */
+					return tb;
+				}
+			}
+
+			/* check if we are using multiple compression algorithm. */
+			else if (compression_type == LIBMPQ_FLAG_COMPRESS_MULTI) {
+
+				/*
+				 *  check if it is a file compressed by blizzard's multiple compression, note that storm.dll
+				 *  version 1.0.9 distributed with warcraft 3 passes the full path name of the opened archive
+				 *  as the new last parameter.
+				 */
+				if ((tb = libmpq__decompress_multi(in_buf, in_size, out_buf, out_size)) < 0) {
+
+					/* something on decompression failed. */
+					return tb;
+				}
+			}
+		} else {
+
+			/* block has set compression flag, but is not compressed, so copy data to output buffer. */
+			memcpy(out_buf, in_buf, out_size);
+
+			/* save the number of transferred bytes. */
+			tb = in_size;
+		}
+	}
+
+	/* if no error was found, return transferred bytes. */
+	return tb;
+}
diff --git a/dep/libmpq/libmpq/common.h b/dep/libmpq/libmpq/common.h
new file mode 100644
index 000000000..bd13f9613
--- /dev/null
+++ b/dep/libmpq/libmpq/common.h
@@ -0,0 +1,61 @@
+/*
+ *  common.h -- header functions used by mpq-tools.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */       
+
+#ifndef _COMMON_H
+#define _COMMON_H
+
+/* function to return the hash to a given string. */
+uint32_t libmpq__hash_string(
+    const char    *key,
+    uint32_t    offset
+);
+
+/* function to encrypt a block. */
+int32_t libmpq__encrypt_block(
+    uint32_t    *in_buf,
+    uint32_t    in_size,
+    uint32_t    seed
+);
+
+/* function to decrypt a block. */
+int32_t libmpq__decrypt_block(
+    uint32_t    *in_buf,
+    uint32_t    in_size,
+    uint32_t    seed
+);
+
+/* function to detect decryption key. */
+int32_t libmpq__decrypt_key(
+    uint8_t        *in_buf,
+    uint32_t    in_size,
+    uint32_t    block_size,
+    uint32_t    *key
+);
+
+/* function to decompress or explode block from archive. */
+int32_t libmpq__decompress_block(
+    uint8_t        *in_buf,
+    uint32_t    in_size,
+    uint8_t        *out_buf,
+    uint32_t    out_size,
+    uint32_t    compression_type
+);
+
+#endif                        /* _COMMON_H */
diff --git a/dep/libmpq/libmpq/crypt_buf.h b/dep/libmpq/libmpq/crypt_buf.h
new file mode 100644
index 000000000..1f7b4d8ca
--- /dev/null
+++ b/dep/libmpq/libmpq/crypt_buf.h
@@ -0,0 +1,217 @@
+/* DO NOT CHANGE! this file is auto-generated by crypt_buf_gen.c */
+static const uint32_t crypt_buf[0x500] = {
+    0x55c636e2, 0x02be0170, 0x584b71d4, 0x2984f00e, 0xb682c809, 0x91cf876b,
+    0x775a9c24, 0x597d5ca5, 0x5a1afeb2, 0xd3e9ce0d, 0x32cdcdf8, 0xb18201cd,
+    0x3cce05ce, 0xa55d13be, 0xbb0afe71, 0x9376ab33, 0x848f645e, 0x87e45a45,
+    0x45b86017, 0x5e656ca8, 0x1b851a95, 0x2542dbd7, 0xab4df9e4, 0x5976ae9b,
+    0x6c317e7d, 0xcddd2f94, 0x3c3c13e5, 0x335b1371, 0x31a592ca, 0x51e4fc4c,
+    0xf7db5b2f, 0x8abdbe41, 0x8beaa674, 0x20d6b319, 0xde6c9a9d, 0xc5ac84e5,
+    0x445a5feb, 0x94958cb0, 0x1e7d3847, 0xf35d29b0, 0xca5cceda, 0xb732c8b5,
+    0xfdcc41dd, 0x0edcec16, 0x9d01feae, 0x1165d38e, 0x9ee193c8, 0xbf33b13c,
+    0x61bc0dfc, 0xef3e7be9, 0xf8d4d4c5, 0xc79b7694, 0x5a255943, 0x0b3dd20a,
+    0x9d1ab5a3, 0xcfa8ba57, 0x5e6d7069, 0xcb89b731, 0x3dc0d15b, 0x0d4d7e7e,
+    0x97e37f2b, 0xfefc2bb1, 0xf95b16b5, 0x27a55b93, 0x45f22729, 0x4c986630,
+    0x7c666862, 0x5fa40847, 0xa3f16205, 0x791b7764, 0x386b36d6, 0x6e6c3fef,
+    0xc75855db, 0x4abc7dc7, 0x4a328f9b, 0xcef20c0f, 0x60b88f07, 0xf7bb4b8f,
+    0x830b5192, 0x94f711ec, 0x20250752, 0x399d21a3, 0xe5c0840d, 0xe76cffa5,
+    0x624fab29, 0x5df133e6, 0x83e0b9b8, 0xc5796bfb, 0x4a7ab2d0, 0xba59a821,
+    0x03a81e4c, 0xcd3adfdb, 0x32b26b8c, 0x8e35c533, 0x9e6300e9, 0x8cf92ac5,
+    0x880d18eb, 0x131a53b3, 0x2ed2dc64, 0xb23257c1, 0xa06450c1, 0x1b92cb8e,
+    0x72ed730e, 0x19a685f0, 0x82836483, 0x42d94e8a, 0xee9bd6f6, 0x556d0b6a,
+    0xba65589a, 0xde24cce4, 0x53329f6c, 0xc754fe8b, 0x503d2dc7, 0x10027ba4,
+    0xd3b60a8b, 0x68e68d83, 0x0a9128a9, 0x595fa35f, 0x0b03b5be, 0x150a45c4,
+    0xb1629cce, 0xe5f7497b, 0x8a7098a4, 0xb8233e69, 0x8ea0f978, 0x5b579970,
+    0xeab14318, 0x4b28b263, 0xb6766cef, 0x06782877, 0x155c6dd0, 0xc711333c,
+    0xf819cedf, 0x00eb1d68, 0xd6fffa6e, 0x439e5962, 0xd765d6db, 0xcb0bcee9,
+    0x6d3c5647, 0x965466f3, 0x0ca983c9, 0x74ecc1ce, 0xfc0563b6, 0x42b08fee,
+    0xc5b38853, 0xfe502ceb, 0x7b432faf, 0xc309e610, 0x2c3997d8, 0x43774654,
+    0x15bd9d2c, 0xed6a420d, 0xc7ff520c, 0xb8a97fd1, 0x5e4d60cc, 0xb9738d11,
+    0xda2181ff, 0x73ac2597, 0x3a8eec8d, 0xac85e779, 0xf3f975d6, 0xb9fe7b91,
+    0x0f155d1e, 0x2860b6dd, 0x835977cb, 0xb0607436, 0x9cab7f6b, 0x8ab91186,
+    0xc12b51e9, 0x20084e8b, 0x44ba8ead, 0xa542b130, 0x82bcd5c4, 0xcc747f4e,
+    0x0f1909d8, 0xda242e1c, 0x6f7d1aa0, 0xd2626486, 0x88d0781e, 0xab695ccd,
+    0xfa569145, 0xb4feb55c, 0xbe47e896, 0xe70a7a88, 0xd56185a2, 0xacf4c871,
+    0x09282332, 0x1ddeeaa8, 0x590c7adb, 0xf4a97667, 0xbfd85705, 0x0ea77ccc,
+    0xa9f85364, 0x83195869, 0x8bfb041a, 0xdb842f5c, 0xd6f0f315, 0xa7756ea7,
+    0x0a51b439, 0xa9edf8a3, 0xd9084e2f, 0x827407f8, 0xd4ac8284, 0x09739d0d,
+    0xb3bb6cfc, 0xd539c77d, 0x6bbc9ac0, 0x35c641aa, 0x934c96b0, 0xd17af317,
+    0x29c6baef, 0xb275cdac, 0xd72662de, 0x9f5c2544, 0xc1a98f75, 0xd98e8f9a,
+    0x47bd5c86, 0x70c610a6, 0xb5482ed4, 0x23b9c68c, 0x3c1bae66, 0x69556e7f,
+    0xd902f5e0, 0x653d195b, 0xde6541fb, 0x07bcc6ac, 0xc6ee7788, 0x801534d4,
+    0x2c1f35c0, 0xd9de614d, 0xbdccac85, 0xb4d4a0da, 0x242d549b, 0x9d964796,
+    0xb9ceb982, 0x59fa99a9, 0xd8986cc1, 0x9e90c1a1, 0x01bbd82f, 0xd7f1c5fd,
+    0xdd847eba, 0x883d305d, 0x25f13152, 0x4a92694d, 0x77f1e601, 0x8024e6e7,
+    0x02a5f53d, 0x9c3ef4d9, 0xaf403ccc, 0xe2ad03c0, 0x46edf6ec, 0x6f9bd3e6,
+    0xcc24ad7a, 0x47afab12, 0x82298df7, 0x708c9eec, 0x76f8c1b1, 0xb39459d2,
+    0x3f1e26d9, 0xe1811be7, 0x56ed1c4d, 0xc9d18af8, 0xe828060e, 0x91cada2e,
+    0x5ccbf9b7, 0xf1a552d4, 0x3c9d4343, 0xe1008785, 0x2adfeebf, 0xf90240a0,
+    0x3d08cce7, 0x426e6fb0, 0x573c984f, 0x13a843ae, 0x406b7439, 0x636085d9,
+    0x5000ba9a, 0xad4a47ab, 0xaf001d8d, 0x419907ae, 0x185c8f96, 0xe5e9ed4d,
+    0x61764133, 0xd3703d97, 0xac98f0c6, 0xdbc3a37c, 0x85f010c4, 0x90491e32,
+    0xf12e18bf, 0xc88c96e1, 0xd3fbd6d9, 0xe3c28b08, 0xd5bf08cc, 0xb1e78859,
+    0x2546ddcf, 0xb030b200, 0xaafd2811, 0x55b22d21, 0xd38bf567, 0x469c7a2b,
+    0x5ad05792, 0xa1a5981e, 0x7dfb8384, 0x34d1ca0a, 0x7eb0dbe0, 0xd61ce0f6,
+    0x398068b7, 0xe6406d1f, 0x95ae6b47, 0xe4281230, 0xb0843061, 0xa70a3a68,
+    0xe340f625, 0x72dcbffd, 0x8eb8afcd, 0x18b6661f, 0x17ef5a5c, 0x000c5b22,
+    0x6ba13836, 0x6165e383, 0x74481c5b, 0xe56f0711, 0xa26f5024, 0x5ff22e60,
+    0x31a5e829, 0xa1094bf0, 0xc680ec6c, 0x8cf327d7, 0xebf1348a, 0x6a227d2f,
+    0x74065184, 0x8df65112, 0x2bbd05ee, 0xe4d00ed6, 0x2980ee1a, 0x6ae1da73,
+    0xe84614da, 0x6c9906ab, 0xcf8e02db, 0xd3723e97, 0x92f66caf, 0xac8491c7,
+    0xaec65696, 0xb98997cf, 0xfa16c762, 0x6d73c65f, 0x205d22a6, 0x4dd3aaa5,
+    0x2deb6bc0, 0x9f37686c, 0x71a5282b, 0x376bb9e0, 0x7fff2a1b, 0xde67982f,
+    0x9cbf33ce, 0x2e6dab37, 0x6e3424b9, 0x0ee143bc, 0x832a60d9, 0xbb6329e1,
+    0x13f6befd, 0x5965fb84, 0xf60b233c, 0x3d695183, 0x433224a1, 0xb5d9cae5,
+    0x82459bab, 0x9f21b311, 0xaf6c5247, 0xb447b13a, 0x7b2676c3, 0xc38979cd,
+    0x8526ae25, 0xc550ad5b, 0x685099a7, 0x65e9c2bd, 0xe5c6dc36, 0xe10b37a9,
+    0x88016878, 0xce81d4e4, 0x24d6fc80, 0x4106152d, 0x6d4f5f90, 0xc4dc74be,
+    0xdb48676c, 0x6cb569b7, 0xf3bf598f, 0x042b08d9, 0x02ccb2de, 0xb1056f65,
+    0x47994af4, 0xfa141ba4, 0x9376ab2e, 0x07a76737, 0x75e7e6fc, 0x449d80a1,
+    0x03b7259d, 0xf6df358a, 0x5a75d5b9, 0x47286923, 0x3b1a30ef, 0xeebe3d6a,
+    0x9db1aa00, 0x007a90d9, 0x24667071, 0x019c73cf, 0x69039bcd, 0x95900744,
+    0x6518b1eb, 0x6905f202, 0xee3951b2, 0xe141fca9, 0x797fa832, 0x5a95e55b,
+    0xd6263b15, 0x5b61f394, 0x897acb1c, 0x005f83a9, 0x22420f71, 0xf495176e,
+    0x7e138f3d, 0x1392e384, 0x373bf7aa, 0x8e512816, 0xa960b3ca, 0x0474d74c,
+    0xffacd6d7, 0x2ef5ed9e, 0x60992aaa, 0x7e690e99, 0x23c0749d, 0xd8e29105,
+    0x555d5909, 0x15631bfe, 0xa69c5a1c, 0x501017ca, 0x99438048, 0x38733ac7,
+    0xe682e2c8, 0xd4655fd6, 0x956e4c04, 0x347df643, 0x2f4b177b, 0x93ed3aa4,
+    0xa77e1dd5, 0x7ae55702, 0xd2a52fd9, 0xef8ba18c, 0xb7d3c1ee, 0x8078ba8d,
+    0xab5aaadb, 0x752be08f, 0x068b31c1, 0x078aae3c, 0xaa5a8343, 0x123d9268,
+    0x2ceaee43, 0x8ebdb239, 0x650251f3, 0x04883648, 0x8c62e12e, 0x12b32167,
+    0xe5112e9a, 0x10002548, 0x3e7a818d, 0x077e5327, 0xf140cc21, 0x6ce7d75d,
+    0x9b99f9a5, 0x3215741c, 0xb6aadbae, 0x738768dc, 0x82a3742f, 0x76517020,
+    0xdd872ad8, 0x9d0902b2, 0x7d1a6b04, 0x49381592, 0x63a652a5, 0x0c15e626,
+    0xe22f70d6, 0x01e84385, 0xb29de134, 0x20c5000e, 0xe961f443, 0x2d31662e,
+    0x3ce6bc28, 0x34f9dd94, 0xfa45de53, 0x497588bd, 0x9468215b, 0x0777fa5c,
+    0x6f7114c0, 0xe0e82694, 0xe4371986, 0x57112de2, 0xe0cac289, 0xf2a3cee0,
+    0x6a41e1b9, 0xbfcea77d, 0xf927fd52, 0x69747d98, 0xbea76cdb, 0x8dd39557,
+    0x04db5ece, 0x2a0885c8, 0x3be4e8ee, 0x21d785dc, 0x09de7c0e, 0x3258ea33,
+    0x51922982, 0xee8dd024, 0x3df6965d, 0x30c1237b, 0xf7f6686a, 0x9faca186,
+    0x7c400076, 0x85acef8a, 0xf4b6d220, 0xddc3481c, 0x439eaec4, 0x717bbe63,
+    0x8259faa7, 0xd682bd68, 0x932a8610, 0x38bf0a7f, 0x6212e2c7, 0x88ee3168,
+    0xb3c27047, 0x6133cb1e, 0x15295506, 0x5ae66246, 0x1d208ddd, 0xa91d3dba,
+    0xc315968d, 0x6aa2664b, 0x716d0cca, 0x891f4956, 0x80866bff, 0xbd56c847,
+    0x9093425a, 0x28dd9e87, 0x84ef3e08, 0x690a49d6, 0x6a7eff82, 0xabcfe400,
+    0x3d3be5ca, 0x381b650c, 0x4b7c8622, 0x3e0246f3, 0xa3561654, 0x9488865c,
+    0x3aef1bf2, 0x5e5d68a2, 0xd32f1ddc, 0x51972bf0, 0x177a213b, 0x469375c2,
+    0x37640bd0, 0xfc3324c8, 0x07091a09, 0x2d63d3fb, 0x2153f023, 0x48223875,
+    0x61a55826, 0x8c136538, 0x49f71d98, 0x84c7d51e, 0x85551a73, 0x13d604c5,
+    0xd701a626, 0x87b844ca, 0x741eb29d, 0x2a2c977c, 0xc797ca03, 0x6c4085d7,
+    0x2dacf79b, 0x734fa2eb, 0xcc290557, 0xfa1e75e4, 0x06b29a27, 0xbece2a7a,
+    0x70a4554b, 0xc935942e, 0xa764bbc1, 0x1fe391d6, 0x7807f0c2, 0x40606ed9,
+    0xe5153086, 0xe91d7dd2, 0xed5d3ba9, 0xaa14b64a, 0x83b24dd9, 0xec1ff5cd,
+    0xba33ead3, 0xe4ef735c, 0xbc062438, 0xd8bfd523, 0x473d1e04, 0x2007f8a7,
+    0xb02903ed, 0x86ea8ada, 0x95ab69cf, 0xfd1f9809, 0x9cb3d8bb, 0x51f45958,
+    0x9cdd4276, 0xc245865e, 0x8f0c836b, 0x4ee7dc07, 0xf6368d9d, 0xef2c1dc1,
+    0xee56b54b, 0xbd62ce2f, 0xf4916aad, 0xc81cb594, 0x41729f49, 0x24bef0a4,
+    0xdef487a9, 0x222e05b8, 0x8d3bf5c6, 0x11b55009, 0xad09d2b3, 0x19db9fd1,
+    0xd7427085, 0x33dbfc8b, 0x526b9378, 0x790e1bc8, 0xb2998a00, 0xa5641703,
+    0x0676d249, 0x6b9185cc, 0x30e4348f, 0x82c52f65, 0x57c7dc24, 0x489c1ecd,
+    0x9fcab02a, 0x56d61117, 0xfe869cac, 0x55fc5140, 0x7fbbb382, 0x9e5afc79,
+    0x10047c99, 0xfc9f5984, 0x56587e2d, 0xb98193f0, 0x98fe5e8e, 0x29b15b6b,
+    0x9561f055, 0xbb0caa25, 0x1e4ecc15, 0x23f5393b, 0x0845b458, 0xceff67ca,
+    0xb099900c, 0x00b1564f, 0x39eef3d1, 0xfcc1bf84, 0xac8893b5, 0x6484bf0e,
+    0x91c02ab3, 0x8c0c0c70, 0x686fa8c6, 0xe171bed6, 0xdfae37df, 0xd5a1a4e7,
+    0xe3eb49a1, 0x5e6014e0, 0x205b21ac, 0xfd58b3da, 0x2e7c07cd, 0xef2cc85a,
+    0xd7587b46, 0xf417847d, 0x8a30cec1, 0x70984f6c, 0xf0b63388, 0xc220c98d,
+    0xede62936, 0x92c0a7b3, 0x1ef371e8, 0x2005f7af, 0x91a47265, 0xb0cf5504,
+    0xd500aba8, 0xcb5c4bd3, 0x9b3bcbc3, 0xcf6644b5, 0xce9488ef, 0x003fc96e,
+    0xaa42222f, 0x4844f3d0, 0x4db89d77, 0x08681aae, 0x662f3a28, 0x761552db,
+    0x1df7a17a, 0x93feed9a, 0xcc496a4f, 0xa217cfcd, 0x3ba3c930, 0x268f7e77,
+    0x0797b4a1, 0x8bebfc51, 0x068930c4, 0x16c874e2, 0xc242da24, 0xfb229f76,
+    0xa0795b02, 0x689fc036, 0x17a73732, 0xd21aec00, 0xac00a692, 0x5b217f18,
+    0xae421624, 0x2bc05cc0, 0x48c1db7a, 0x4f4e63b4, 0x1667f04e, 0x34020f94,
+    0x972b2555, 0x9a07355b, 0x01665970, 0x7db60c6f, 0x3ad7103b, 0x5c3d09c0,
+    0xeea3dada, 0x88c21c10, 0x102436d7, 0x6a3b3400, 0xeb523c4c, 0xfb97d896,
+    0x964cb86b, 0xdd878038, 0x0529da4d, 0x0b1468a5, 0x18739ac8, 0xf7f26668,
+    0xf64f4471, 0x5c14f5c3, 0x44a081fb, 0x39ac7e37, 0x8a17c26b, 0x868f5e67,
+    0x3931978d, 0x6edf7817, 0x4951cc67, 0x943407f3, 0xcc5e748f, 0x2b7ee729,
+    0xcbb320f0, 0x11fec8e7, 0xfccfc658, 0x03454354, 0x373aa1ec, 0x1d58fe9a,
+    0x064710ae, 0xa88aa0ba, 0xd183a23e, 0x40d150a3, 0xf531b8d1, 0xa7d99f85,
+    0x11838cd5, 0xb19e64b3, 0x3d67a5e9, 0xb02c5ac6, 0x99b9b9e8, 0x4c202b7a,
+    0x15f261d3, 0xa84c2d0d, 0x50f185a6, 0x33ba41d5, 0x39791013, 0x4baff44e,
+    0xeeeeaa1c, 0xe0488314, 0x559ccd2b, 0xa104f445, 0x636f37c4, 0x264d5e3b,
+    0x75c17f35, 0x75424131, 0xbb115739, 0x74fe755a, 0x7d3a7aa6, 0x2d8be784,
+    0x83ed154a, 0xfc2673d8, 0x44dd4a7f, 0x79056cc8, 0x82cc8831, 0x9d3c1b7c,
+    0xe9453bfa, 0x24315694, 0x661f3253, 0x75549f5c, 0xbb2b63ed, 0x67e00d96,
+    0xf48966c7, 0x0d7bea56, 0xc25f92ef, 0xa947a79d, 0xde4adf6f, 0xac0f0342,
+    0xd3eb246b, 0xa4aa118e, 0x3c3e6a46, 0x457f4441, 0xa50a406f, 0x6c508d9f,
+    0xe9ac18e7, 0x1ecdb4ba, 0x39ac7e3a, 0x7fb304fa, 0x6f38f8e8, 0x4aecea6d,
+    0x61035e73, 0x81708907, 0xebc07205, 0x90fd7614, 0xb52d217f, 0x6c4de195,
+    0x1dd49084, 0x64ee482c, 0x94c7a521, 0x540c09d8, 0x75df8dd5, 0x414131f7,
+    0x3698fd76, 0xf784db4f, 0xf8c97a03, 0x048f39b9, 0x3bf4f0bd, 0x8cb50992,
+    0x9b58d9ee, 0xe5ab79cc, 0x9a5f6052, 0xbd9591b0, 0xfad2232b, 0x5a632254,
+    0x0286e618, 0x8ad3c8f7, 0xe4060176, 0x754c4617, 0x5c10490b, 0x6f7d6fff,
+    0x2187b42a, 0x5775095b, 0x02f4c663, 0x5a5dca06, 0xfe4ad4c7, 0x53e19f7d,
+    0x59ff46b5, 0xbcc42ba5, 0xfd2f4a97, 0xbed6d905, 0x95629b6b, 0x21a1c0db,
+    0xaa10b45d, 0xe6ef6d58, 0x2892cf4d, 0x9fed6c10, 0x1e386bf7, 0x9be0c6e8,
+    0x2b2f15ef, 0x19f5ac7b, 0x7aff0e72, 0x31da576f, 0x30252cb4, 0x577960ac,
+    0x166e9e5a, 0xa9374a61, 0x71369c96, 0x7ff826ae, 0xe8175326, 0xcabbfd33,
+    0x0191190e, 0x699d3c3e, 0x36b40b22, 0xb3950513, 0x9b889bfa, 0xa52a5007,
+    0xac290fed, 0x3b4e4a4f, 0xb753d8d6, 0x3c531f22, 0x582f6427, 0xa9cd93a9,
+    0x546e39ae, 0x242faad2, 0xd2e0f747, 0x09f6325d, 0x59d48719, 0xad7eb66e,
+    0xd5512878, 0x56debf9d, 0x5107e5a5, 0xf1c00aa4, 0x814ccca8, 0x600d90f0,
+    0x9be97619, 0x915fa5f2, 0x2b5628dd, 0xa33d5f5a, 0x595df7c1, 0x6966215d,
+    0x50ec8337, 0xf1d21372, 0x0ee2eefb, 0xad9e70b7, 0xab0d2fe4, 0xcf277b5d,
+    0x62585a2c, 0x835a7844, 0x74b1fa6b, 0x49baffd5, 0x2ea9c864, 0x129311a8,
+    0xbdfa1867, 0x83ca5997, 0x9d1db719, 0x84bb79e6, 0x9e3f99f2, 0x313f6101,
+    0x1b99245b, 0xd15d8fb2, 0xcef90f81, 0x2945268d, 0xdbbcf573, 0xb1021886,
+    0x9ee7ec1d, 0x1cf824f7, 0x7eaa2e32, 0x69c0a2b5, 0x7494419c, 0xe253d7d3,
+    0x48da3d12, 0x45b8b571, 0xdb4d147a, 0xd82d8dde, 0x265d10a2, 0xb0a6eb9a,
+    0x7e1c93a6, 0x36fe2f46, 0xdcad6b00, 0x05439191, 0xb0ce5484, 0x61d1c309,
+    0x8da62a03, 0x06d0fe2f, 0xbac6dd3c, 0xca2006f3, 0x8321b1af, 0x0411a6f3,
+    0xe8918eac, 0x21a2c152, 0x91c0d54f, 0x6aaa14fa, 0xdd22a440, 0x88cb2075,
+    0x7a4eb813, 0x67afa071, 0xd8d98c9c, 0x31f10d47, 0x6ff1a8a8, 0x2faaf0a1,
+    0x48a221bb, 0x3be6948b, 0xaa79e79b, 0x0ea7278c, 0x7a3857ef, 0x49b7fe55,
+    0xd51cb931, 0x041c018d, 0x00b90501, 0x45ea7881, 0x8fc1dbcf, 0xb80b32a9,
+    0xabacd2e9, 0x677bdc40, 0xecace542, 0x6d6514eb, 0x31c09ff7, 0x5e6c1abd,
+    0x1c391d0f, 0x0e9d77f1, 0x7119392d, 0x6be9b0ba, 0x6194fa77, 0x45e62148,
+    0x42234af2, 0xc3239d66, 0x939cbdbc, 0x56200d9c, 0x6b275208, 0x001a61f3,
+    0xccc2a546, 0x4b722be0, 0xee25f2b7, 0x6d86cf9e, 0xaa6be0cd, 0x4dcda7b6,
+    0x78d4aa13, 0x36ea7ad9, 0x3f29d700, 0xdeea2d84, 0x6a6af5bd, 0x18afb81c,
+    0xd8e4e73c, 0x8aa708ba, 0x658b94d9, 0xa676478c, 0xcfa10c22, 0x25593c74,
+    0x8d962235, 0x5f980270, 0x3df6ebc0, 0x8e7d92fa, 0xc3ee55e1, 0xd5f72447,
+    0x02b0fa95, 0x52b0b520, 0x70d2c11f, 0x3a6fdd6c, 0x193aa698, 0x5496f7d5,
+    0x4208931b, 0x7a4106ec, 0x83e86840, 0xf49b6f8c, 0xba3d9a51, 0x55f54ddd,
+    0x2de51372, 0x9afb571b, 0x3ab35406, 0xad64ff1f, 0xc77764fe, 0x7f864466,
+    0x416d9cd4, 0xa2489278, 0xe30b86e4, 0x0b5231b6, 0xba67aed6, 0xe5ab2467,
+    0x60028b90, 0x1d9e20c6, 0x2a7c692a, 0x6b691cdb, 0x9e51f817, 0x9b763dec,
+    0x3d29323f, 0xcfe12b68, 0x754b459b, 0xa2238047, 0xd9c55514, 0x6bdcffc1,
+    0x693e6340, 0x82383fe7, 0x1916ea5f, 0xec7bcd59, 0x72de165a, 0xe79a1617,
+    0x8ec86234, 0xa8f0d284, 0x20c90226, 0x7bf98884, 0x28a58331, 0x3ec3fa6e,
+    0x4ce0895b, 0xc353b4d0, 0x33ef064f, 0x21e5e210, 0xc8bb589d, 0xe85dcab2,
+    0xac65829f, 0xa7bf92d0, 0x05a6174d, 0x25a50c2e, 0xe5c78777, 0x3d75021f,
+    0x4baa9c98, 0x23bdc884, 0x9653bbd7, 0xbadce7f5, 0xc283a484, 0xc040df2e,
+    0x9370a841, 0x2f316022, 0x36eed231, 0xac2cbc0c, 0x13c0a49b, 0xcdd12997,
+    0x07fe91b2, 0xcd7eabcd, 0x2c01271d, 0x18432df8, 0x599c6bc7, 0x75e93d5a,
+    0xb67a6ee2, 0x8e738e16, 0xff9073fd, 0xaf77026a, 0xf86ea2fc, 0x91509ea3,
+    0x33a78dc6, 0x4f79234a, 0x3a7535bc, 0x3539fcb1, 0x3103ee52, 0x4f6f1e69,
+    0x6bb3ebbc, 0x4cb77555, 0x8dd1e999, 0x2ade439d, 0x11521fae, 0xb94d2545,
+    0x8dde9abd, 0x1909393f, 0xb792a23d, 0x749c455b, 0xb5b60f2c, 0x380459ce,
+    0x0dad5820, 0xb130845b, 0x291cbd52, 0xde9a5bb7, 0x51def961, 0x515b6408,
+    0xca6e823e, 0x382e6e74, 0xeebe3d71, 0x4c8f0c6a, 0xe676dcea, 0x14e1dc7c,
+    0x6f7fc634, 0xcf85a943, 0xd39ea96e, 0x136e7c93, 0x7164b304, 0xf32f1333,
+    0x35c34034, 0xde39d721, 0x91a87439, 0xc410111f, 0x29f17aac, 0x1316a6ff,
+    0x12f194ee, 0x420b9499, 0xf72db0dc, 0x690b9f93, 0x17d14bb2, 0x8f931ab8,
+    0x217500bc, 0x875413f8, 0x98b2e43d, 0xc51f9571, 0x54cebdca, 0x0719cc79,
+    0xf3c7080d, 0xe4286771, 0xa3eab3cd, 0x4a6b00e0, 0x11cf0759, 0x7e897379,
+    0x5b32876c, 0x5e8cd4f6, 0x0cedfa64, 0x919ac2c7, 0xb214f3b3, 0x0e89c38c,
+    0xf0c43a39, 0xeae10522, 0x835bce06, 0x9eec43c2, 0xea26a9d6, 0x69531821,
+    0x6725b24a, 0xda81b0e2, 0xd5b4ae33, 0x080f99fb, 0x15a83daf, 0x29dfc720,
+    0x91e1900f, 0x28163d58, 0x83d107a2, 0x4eac149a, 0x9f71da18, 0x61d5c4fa,
+    0xe3ab2a5f, 0xc7b0d63f, 0xb3cc752a, 0x61ebcfb6, 0x26ffb52a, 0xed789e3f,
+    0xaa3bc958, 0x455a8788, 0xc9c082a9, 0x0a1bef0e, 0xc29a5a7e, 0x150d4735,
+    0x943809e0, 0x69215510, 0xef0b0da9, 0x3b4e9fb3, 0xd8b5d04c, 0xc7a023a8,
+    0xb0d50288, 0x64821375, 0xc260e8cf, 0x8496bd2c, 0xff4f5435, 0x0fb5560c,
+    0x7cd74a52, 0x93589c80, 0x88975c47, 0x83bda89d, 0x8bcc4296, 0x01b82c21,
+    0xfd821dbf, 0x26520b47, 0x04983e19, 0xd3e1ca27, 0x782c580f, 0x326ff573,
+    0xc157bcc7, 0x4f5e6b84, 0x44ebfbfb, 0xda26d9d8, 0x6cd9d08e, 0x1719f1d8,
+    0x715c0487, 0x2c2d3c92, 0x53faaba9, 0xbc836146, 0x510c92d6, 0xe089f82a,
+    0x4680171f, 0x369f00de, 0x70ec2331, 0x0e253d55, 0xdafb9717, 0xe5dd922d,
+    0x95915d21, 0xa0202f96, 0xa161cc47, 0xeacfa6f1, 0xed5e9189, 0xdab87684,
+    0xa4b76d4a, 0xfa704897, 0x631f10ba, 0xd39da8f9, 0x5db4c0e4, 0x16fde42a,
+    0x2dff7580, 0xb56fec7e, 0xc3ffb370, 0x8e6f36bc, 0x6097d459, 0x514d5d36,
+    0xa5a737e2, 0x3977b9b3, 0xfd31a0ca, 0x903368db, 0xe8370d61, 0x98109520,
+    0xade23cac, 0x99f82e04, 0x41de7ea3, 0x84a1c295, 0x09191be0, 0x30930d02,
+    0x1c9fa44a, 0xc406b6d7, 0xeedca152, 0x6149809c, 0xb0099ef4, 0xc5f653a5,
+    0x4c10790d, 0x7303286c
+};
diff --git a/dep/libmpq/libmpq/explode.c b/dep/libmpq/libmpq/explode.c
new file mode 100644
index 000000000..2d778d25c
--- /dev/null
+++ b/dep/libmpq/libmpq/explode.c
@@ -0,0 +1,602 @@
+/*
+ *  explode.c -- explode function of pkware data compression library.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  This source was adepted from the C++ version of pkware.cpp included
+ *  in stormlib. The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula <ladik@zezula.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* generic includes. */
+#include <string.h>
+
+/* libmpq main includes. */
+#include "mpq.h"
+
+/* libmpq generic includes. */
+#include "explode.h"
+
+/* tables used for data extraction. */
+static const uint8_t pkzip_dist_bits[] = {
+	0x02, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08
+};
+
+/* tables used for data extraction. */
+static const uint8_t pkzip_dist_code[] = {
+	0x03, 0x0D, 0x05, 0x19, 0x09, 0x11, 0x01, 0x3E, 0x1E, 0x2E, 0x0E, 0x36, 0x16, 0x26, 0x06, 0x3A,
+	0x1A, 0x2A, 0x0A, 0x32, 0x12, 0x22, 0x42, 0x02, 0x7C, 0x3C, 0x5C, 0x1C, 0x6C, 0x2C, 0x4C, 0x0C,
+	0x74, 0x34, 0x54, 0x14, 0x64, 0x24, 0x44, 0x04, 0x78, 0x38, 0x58, 0x18, 0x68, 0x28, 0x48, 0x08,
+	0xF0, 0x70, 0xB0, 0x30, 0xD0, 0x50, 0x90, 0x10, 0xE0, 0x60, 0xA0, 0x20, 0xC0, 0x40, 0x80, 0x00
+};
+
+/* tables used for data extraction. */
+static const uint8_t pkzip_clen_bits[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
+};
+
+/* tables used for data extraction. */
+static const uint16_t pkzip_len_base[] = {
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
+	0x0008, 0x000A, 0x000E, 0x0016, 0x0026, 0x0046, 0x0086, 0x0106
+};
+
+/* tables used for data extraction. */
+static const uint8_t pkzip_slen_bits[] = {
+	0x03, 0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x07, 0x07
+};
+
+/* tables used for data extraction. */
+static const uint8_t pkzip_len_code[] = {
+	0x05, 0x03, 0x01, 0x06, 0x0A, 0x02, 0x0C, 0x14, 0x04, 0x18, 0x08, 0x30, 0x10, 0x20, 0x40, 0x00
+};
+
+/* tables used for data extraction. */
+static const uint8_t pkzip_bits_asc[] = {
+	0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x08, 0x07, 0x0C, 0x0C, 0x07, 0x0C, 0x0C,
+	0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+	0x04, 0x0A, 0x08, 0x0C, 0x0A, 0x0C, 0x0A, 0x08, 0x07, 0x07, 0x08, 0x09, 0x07, 0x06, 0x07, 0x08,
+	0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x08, 0x07, 0x07, 0x08, 0x08, 0x0C, 0x0B, 0x07, 0x09, 0x0B,
+	0x0C, 0x06, 0x07, 0x06, 0x06, 0x05, 0x07, 0x08, 0x08, 0x06, 0x0B, 0x09, 0x06, 0x07, 0x06, 0x06,
+	0x07, 0x0B, 0x06, 0x06, 0x06, 0x07, 0x09, 0x08, 0x09, 0x09, 0x0B, 0x08, 0x0B, 0x09, 0x0C, 0x08,
+	0x0C, 0x05, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x05, 0x0B, 0x07, 0x05, 0x06, 0x05, 0x05,
+	0x06, 0x0A, 0x05, 0x05, 0x05, 0x05, 0x08, 0x07, 0x08, 0x08, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C,
+	0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
+	0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
+	0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
+	0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+	0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+	0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+	0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D,
+	0x0D, 0x0D, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D
+};
+
+/* tables used for data extraction. */
+static const uint16_t pkzip_code_asc[] = {
+	0x0490, 0x0FE0, 0x07E0, 0x0BE0, 0x03E0, 0x0DE0, 0x05E0, 0x09E0,
+	0x01E0, 0x00B8, 0x0062, 0x0EE0, 0x06E0, 0x0022, 0x0AE0, 0x02E0,
+	0x0CE0, 0x04E0, 0x08E0, 0x00E0, 0x0F60, 0x0760, 0x0B60, 0x0360,
+	0x0D60, 0x0560, 0x1240, 0x0960, 0x0160, 0x0E60, 0x0660, 0x0A60,
+	0x000F, 0x0250, 0x0038, 0x0260, 0x0050, 0x0C60, 0x0390, 0x00D8,
+	0x0042, 0x0002, 0x0058, 0x01B0, 0x007C, 0x0029, 0x003C, 0x0098,
+	0x005C, 0x0009, 0x001C, 0x006C, 0x002C, 0x004C, 0x0018, 0x000C,
+	0x0074, 0x00E8, 0x0068, 0x0460, 0x0090, 0x0034, 0x00B0, 0x0710,
+	0x0860, 0x0031, 0x0054, 0x0011, 0x0021, 0x0017, 0x0014, 0x00A8,
+	0x0028, 0x0001, 0x0310, 0x0130, 0x003E, 0x0064, 0x001E, 0x002E,
+	0x0024, 0x0510, 0x000E, 0x0036, 0x0016, 0x0044, 0x0030, 0x00C8,
+	0x01D0, 0x00D0, 0x0110, 0x0048, 0x0610, 0x0150, 0x0060, 0x0088,
+	0x0FA0, 0x0007, 0x0026, 0x0006, 0x003A, 0x001B, 0x001A, 0x002A,
+	0x000A, 0x000B, 0x0210, 0x0004, 0x0013, 0x0032, 0x0003, 0x001D,
+	0x0012, 0x0190, 0x000D, 0x0015, 0x0005, 0x0019, 0x0008, 0x0078,
+	0x00F0, 0x0070, 0x0290, 0x0410, 0x0010, 0x07A0, 0x0BA0, 0x03A0,
+	0x0240, 0x1C40, 0x0C40, 0x1440, 0x0440, 0x1840, 0x0840, 0x1040,
+	0x0040, 0x1F80, 0x0F80, 0x1780, 0x0780, 0x1B80, 0x0B80, 0x1380,
+	0x0380, 0x1D80, 0x0D80, 0x1580, 0x0580, 0x1980, 0x0980, 0x1180,
+	0x0180, 0x1E80, 0x0E80, 0x1680, 0x0680, 0x1A80, 0x0A80, 0x1280,
+	0x0280, 0x1C80, 0x0C80, 0x1480, 0x0480, 0x1880, 0x0880, 0x1080,
+	0x0080, 0x1F00, 0x0F00, 0x1700, 0x0700, 0x1B00, 0x0B00, 0x1300,
+	0x0DA0, 0x05A0, 0x09A0, 0x01A0, 0x0EA0, 0x06A0, 0x0AA0, 0x02A0,
+	0x0CA0, 0x04A0, 0x08A0, 0x00A0, 0x0F20, 0x0720, 0x0B20, 0x0320,
+	0x0D20, 0x0520, 0x0920, 0x0120, 0x0E20, 0x0620, 0x0A20, 0x0220,
+	0x0C20, 0x0420, 0x0820, 0x0020, 0x0FC0, 0x07C0, 0x0BC0, 0x03C0,
+	0x0DC0, 0x05C0, 0x09C0, 0x01C0, 0x0EC0, 0x06C0, 0x0AC0, 0x02C0,
+	0x0CC0, 0x04C0, 0x08C0, 0x00C0, 0x0F40, 0x0740, 0x0B40, 0x0340,
+	0x0300, 0x0D40, 0x1D00, 0x0D00, 0x1500, 0x0540, 0x0500, 0x1900,
+	0x0900, 0x0940, 0x1100, 0x0100, 0x1E00, 0x0E00, 0x0140, 0x1600,
+	0x0600, 0x1A00, 0x0E40, 0x0640, 0x0A40, 0x0A00, 0x1200, 0x0200,
+	0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000  
+};
+
+/* local unused variables. */
+char pkware_copyright[] = "PKWARE Data Compression Library for Win32\r\n"
+			  "Copyright 1989-1995 PKWARE Inc.  All Rights Reserved\r\n"
+			  "Patent No. 5,051,745\r\n"
+			  "PKWARE Data Compression Library Reg. U.S. Pat. and Tm. Off.\r\n"
+			  "Version 1.11\r\n";
+
+/* skips given number of bits. */
+static int32_t skip_bit(pkzip_cmp_s *mpq_pkzip, uint32_t bits) {
+
+	/* check if number of bits required is less than number of bits in the buffer. */
+	if (bits <= mpq_pkzip->extra_bits) {
+		mpq_pkzip->extra_bits  -= bits;
+		mpq_pkzip->bit_buf    >>= bits;
+		return 0;
+	}
+
+	/* load input buffer if necessary. */
+	mpq_pkzip->bit_buf >>= mpq_pkzip->extra_bits;
+	if (mpq_pkzip->in_pos == mpq_pkzip->in_bytes) {
+		mpq_pkzip->in_pos = sizeof(mpq_pkzip->in_buf);
+		if ((mpq_pkzip->in_bytes = mpq_pkzip->read_buf((char *)mpq_pkzip->in_buf, &mpq_pkzip->in_pos, mpq_pkzip->param)) == 0) {
+			return 1;
+		}
+		mpq_pkzip->in_pos = 0;
+	}
+
+	/* update bit buffer. */
+	mpq_pkzip->bit_buf     |= (mpq_pkzip->in_buf[mpq_pkzip->in_pos++] << 8);
+	mpq_pkzip->bit_buf    >>= (bits - mpq_pkzip->extra_bits);
+	mpq_pkzip->extra_bits   = (mpq_pkzip->extra_bits - bits) + 8;
+
+	/* if no error was found, return zero. */
+	return 0;
+}
+
+/* this function generate the decode tables used for decryption. */
+static void generate_tables_decode(int32_t count, uint8_t *bits, const uint8_t *code, uint8_t *buf2) {
+
+	/* some common variables. */
+	int32_t i;
+
+	/* EBX - count */
+	for (i = count-1; i >= 0; i--) {
+
+		/* some common variables. */
+		uint32_t idx1 = code[i];
+		uint32_t idx2 = 1 << bits[i];
+
+		/* loop until table is ready. */
+		do {
+			buf2[idx1] = (uint8_t)i;
+			idx1      += idx2;
+		} while (idx1 < 0x100);
+	}
+}
+
+/* this function generate the tables for ascii decompression. */
+static void generate_tables_ascii(pkzip_cmp_s *mpq_pkzip) {
+
+	/* some common variables. */
+	const uint16_t *code_asc = &pkzip_code_asc[0xFF];
+	uint32_t acc;
+	uint32_t add;
+	uint16_t count;
+
+	/* loop through ascii table. */
+	for (count = 0x00FF; code_asc >= pkzip_code_asc; code_asc--, count--) {
+		uint8_t *bits_asc = mpq_pkzip->bits_asc + count;
+		uint8_t bits_tmp  = *bits_asc;
+
+		/* check if byte is finished. */
+		if (bits_tmp <= 8) {
+			add = (1 << bits_tmp);
+			acc = *code_asc;
+			do {
+				mpq_pkzip->offs_2c34[acc]  = (uint8_t)count;
+				acc                       += add;
+			} while (acc < 0x100);
+		} else {
+			if ((acc = (*code_asc & 0xFF)) != 0) {
+				mpq_pkzip->offs_2c34[acc] = 0xFF;
+				if (*code_asc & 0x3F) {
+
+					/* decrease bit by four. */
+					bits_tmp  -= 4;
+					*bits_asc  = bits_tmp;
+					add        = (1 << bits_tmp);
+					acc        = *code_asc >> 4;
+					do {
+						mpq_pkzip->offs_2d34[acc]  = (uint8_t)count;
+						acc                       += add;
+					} while (acc < 0x100);
+				} else {
+
+					/* decrease bit by six. */
+					bits_tmp  -= 6;
+					*bits_asc  = bits_tmp;
+					add        = (1 << bits_tmp);
+					acc        = *code_asc >> 6;
+					do {
+						mpq_pkzip->offs_2e34[acc]  = (uint8_t)count;
+						acc                       += add;
+					} while (acc < 0x80);
+				}
+			} else {
+
+				/* decrease bit by eight. (one byte) */
+				bits_tmp  -= 8;
+				*bits_asc  = bits_tmp;
+				add        = (1 << bits_tmp);
+				acc        = *code_asc >> 8;
+				do {
+					mpq_pkzip->offs_2eb4[acc]  = (uint8_t)count;
+					acc                       += add;
+				} while (acc < 0x100);
+			}
+		}
+	}
+}
+
+/*
+ *  decompress the imploded data using coded literals.
+ *
+ *  returns: 0x000 - 0x0FF : one byte from compressed file.
+ *           0x100 - 0x305 : copy previous block. (0x100 = 1 byte)
+ *           0x306         : out of buffer?
+ */
+static uint32_t decode_literal(pkzip_cmp_s *mpq_pkzip) {
+
+	/* number of bits to skip. */
+	uint32_t bits;
+
+	/* position in buffers. */
+	uint32_t value;
+
+	/* check if bit the current buffer is set, if not return the next byte. */
+	if (mpq_pkzip->bit_buf & 1) {
+
+		/* skip current bit in the buffer. */
+		if (skip_bit(mpq_pkzip, 1)) {
+			return 0x306;
+		}
+
+		/* the next bits are position in buffers. */
+		value = mpq_pkzip->pos2[(mpq_pkzip->bit_buf & 0xFF)];
+
+		/* get number of bits to skip. */
+		if (skip_bit(mpq_pkzip, mpq_pkzip->slen_bits[value])) {
+			return 0x306;
+		}
+
+		/* check bits. */
+		if ((bits = mpq_pkzip->clen_bits[value]) != 0) {
+
+			/* some common variables. */
+			uint32_t val2 = mpq_pkzip->bit_buf & ((1 << bits) - 1);
+
+			/* check if we should skip one bit. */
+			if (skip_bit(mpq_pkzip, bits)) {
+
+				/* check position if we should skip the bit. */
+				if ((value + val2) != 0x10E) {
+					return 0x306;
+				}
+			}
+
+			/* fill values. */
+			value = mpq_pkzip->len_base[value] + val2;
+		}
+
+		/* return number of bytes to repeat. */
+		return value + 0x100;
+	}
+
+	/* skip one bit. */
+	if (skip_bit(mpq_pkzip, 1)) {
+		return 0x306;
+	}
+
+	/* check the binary compression type, read 8 bits and return them as one byte. */
+	if (mpq_pkzip->cmp_type == LIBMPQ_PKZIP_CMP_BINARY) {
+
+		/* fill values. */
+		value = mpq_pkzip->bit_buf & 0xFF;
+
+		/* check if we should skip one bit. */
+		if (skip_bit(mpq_pkzip, 8)) {
+			return 0x306;
+		}
+
+		/* return value from bit buffer. */
+		return value;
+	}
+
+	/* check if ascii compression is used. */
+	if (mpq_pkzip->bit_buf & 0xFF) {
+
+		/* fill values. */
+		value = mpq_pkzip->offs_2c34[mpq_pkzip->bit_buf & 0xFF];
+
+		/* check value. */
+		if (value == 0xFF) {
+			if (mpq_pkzip->bit_buf & 0x3F) {
+
+				/* check if four bits are in bit buffer for skipping. */
+				if (skip_bit(mpq_pkzip, 4)) {
+					return 0x306;
+				}
+
+				/* fill values. */
+				value = mpq_pkzip->offs_2d34[mpq_pkzip->bit_buf & 0xFF];
+			} else {
+
+				/* check if six bits are in bit buffer for skipping. */
+				if (skip_bit(mpq_pkzip, 6)) {
+					return 0x306;
+				}
+
+				/* fill values. */
+				value = mpq_pkzip->offs_2e34[mpq_pkzip->bit_buf & 0x7F];
+			}
+		}
+	} else {
+
+		/* check if eight bits are in bit buffer for skipping. */
+		if (skip_bit(mpq_pkzip, 8)) {
+			return 0x306;
+		}
+
+		/* fill values. */
+		value = mpq_pkzip->offs_2eb4[mpq_pkzip->bit_buf & 0xFF];
+	}
+
+	/* return out of buffer error (0x306) or position in buffer. */
+	return skip_bit(mpq_pkzip, mpq_pkzip->bits_asc[value]) ? 0x306 : value;
+}
+
+/* this function retrieves the number of bytes to move back. */
+static uint32_t decode_distance(pkzip_cmp_s *mpq_pkzip, uint32_t length) {
+
+	/* some common variables. */
+	uint32_t pos  = mpq_pkzip->pos1[(mpq_pkzip->bit_buf & 0xFF)];
+
+	/* number of bits to skip. */
+	uint32_t skip = mpq_pkzip->dist_bits[pos];
+
+	/* skip the appropriate number of bits. */
+	if (skip_bit(mpq_pkzip, skip) == 1) {
+		return 0;
+	}
+
+	/* check if length is two. */
+	if (length == 2) {
+		pos = (pos << 2) | (mpq_pkzip->bit_buf & 0x03);
+
+		/* skip the bits. */
+		if (skip_bit(mpq_pkzip, 2) == 1) {
+			return 0;
+		}
+	} else {
+		pos = (pos << mpq_pkzip->dsize_bits) | (mpq_pkzip->bit_buf & mpq_pkzip->dsize_mask);
+
+		/* skip the bits */
+		if (skip_bit(mpq_pkzip, mpq_pkzip->dsize_bits) == 1) {
+			return 0;
+		}
+	}
+
+	/* return the bytes to move back. */
+	return pos + 1;
+}
+
+/*
+ *  function loads data from the input buffer used by mpq_pkzip
+ *  "implode" and "explode" function as user defined callback and
+ *  returns number of bytes loaded.
+ *
+ *  char		*buf	- pointer to a buffer where to store loaded data.
+ *  uint32_t		*size	- maximum number of bytes to read.
+ *  void		*param	- custom pointer, parameter of implode/explode.
+ */
+static uint32_t data_read_input(char *buf, uint32_t *size, void *param) {
+
+	/* some common variables. */
+	pkzip_data_s *info   = (pkzip_data_s *)param;
+	uint32_t max_avail = (info->in_bytes - info->in_pos);
+	uint32_t to_read   = *size;
+
+	/* check the case when not enough data available. */
+	if (to_read > max_avail) {
+		to_read = max_avail;
+	}
+
+	/* load data and increment offsets. */
+	memcpy(buf, info->in_buf + info->in_pos, to_read);
+	info->in_pos += to_read;
+
+	/* return bytes read. */
+	return to_read;
+}
+
+/*
+ *  function for store output data used by mpq_pkzip "implode" and
+ *  "explode" as userdefined callback.
+ *
+ *  char		*buf	- pointer to data to be written.
+ *  uint32_t		*size	- number of bytes to write.
+ *  void		*param	- custom pointer, parameter of implode/explode.
+ */
+static void data_write_output(char *buf, uint32_t *size, void *param) {
+
+	/* some common variables. */
+	pkzip_data_s *info   = (pkzip_data_s *)param;
+	uint32_t max_write = (info->max_out - info->out_pos);
+	uint32_t to_write  = *size;
+
+	/* check the case when not enough space in the output buffer. */
+	if (to_write > max_write) {
+		to_write = max_write;
+	}
+
+	/* write output data and increments offsets. */
+	memcpy(info->out_buf + info->out_pos, buf, to_write);
+	info->out_pos += to_write;
+}
+
+/* this function extract the data from input stream. */
+static uint32_t expand(pkzip_cmp_s *mpq_pkzip) {
+
+	/* number of bytes to copy. */
+	uint32_t copy_bytes;
+
+	/* one byte from compressed file. */
+	uint32_t one_byte;
+
+	/* some common variables. */
+	uint32_t result;
+
+	/* initialize output buffer position. */
+	mpq_pkzip->out_pos = 0x1000;
+
+	/* check if end of data or error, so terminate decompress. */
+	while ((result = one_byte = decode_literal(mpq_pkzip)) < 0x305) {
+
+		/* check if one byte is greater than 0x100, which means 'repeat n - 0xFE bytes'. */
+		if (one_byte >= 0x100) {
+
+			/* ECX */
+			uint8_t *source;
+
+			/* EDX */
+			uint8_t *target;
+
+			/* some common variables. */
+			uint32_t copy_length = one_byte - 0xFE;
+			uint32_t move_back;
+
+			/* get length of data to copy. */
+			if ((move_back = decode_distance(mpq_pkzip, copy_length)) == 0) {
+				result = 0x306;
+				break;
+			}
+
+			/* target and source pointer. */
+			target              = &mpq_pkzip->out_buf[mpq_pkzip->out_pos];
+			source              = target - move_back;
+			mpq_pkzip->out_pos += copy_length;
+
+			/* copy until nothing left. */
+			while (copy_length-- > 0) {
+				*target++ = *source++;
+			}
+		} else {
+
+			/* byte is 0x100 great, so add one byte. */
+			mpq_pkzip->out_buf[mpq_pkzip->out_pos++] = (uint8_t)one_byte;
+		}
+
+		/* check if number of extracted bytes has reached 1/2 of output buffer, so flush output buffer. */
+		if (mpq_pkzip->out_pos >= 0x2000) {
+
+			/* copy decompressed data into user buffer. */
+			copy_bytes = 0x1000;
+			mpq_pkzip->write_buf((char *)&mpq_pkzip->out_buf[0x1000], &copy_bytes, mpq_pkzip->param);
+
+			/* check if there are some data left, keep them alive. */
+			memcpy(mpq_pkzip->out_buf, &mpq_pkzip->out_buf[0x1000], mpq_pkzip->out_pos - 0x1000);
+			mpq_pkzip->out_pos -= 0x1000;
+		}
+	}
+
+	/* copy the rest. */
+	copy_bytes = mpq_pkzip->out_pos - 0x1000;
+	mpq_pkzip->write_buf((char *)&mpq_pkzip->out_buf[0x1000], &copy_bytes, mpq_pkzip->param);
+
+	/* return copied bytes. */
+	return result;
+}
+
+/* this function explode the data stream. */
+uint32_t libmpq__do_decompress_pkzip(uint8_t *work_buf, void *param) {
+
+	/* some common variables. */
+	pkzip_cmp_s *mpq_pkzip = (pkzip_cmp_s *)work_buf;
+
+	/* set the whole work buffer to zeros. */
+	memset(mpq_pkzip, 0, sizeof(pkzip_cmp_s));
+
+	/* initialize work struct and load compressed data. */
+	mpq_pkzip->read_buf   = data_read_input;
+	mpq_pkzip->write_buf  = data_write_output;
+	mpq_pkzip->param      = param;
+	mpq_pkzip->in_pos     = sizeof(mpq_pkzip->in_buf);
+	mpq_pkzip->in_bytes   = mpq_pkzip->read_buf((char *)mpq_pkzip->in_buf, &mpq_pkzip->in_pos, mpq_pkzip->param);
+
+	/* check if we have pkzip data. */
+	if (mpq_pkzip->in_bytes <= 4) {
+		return LIBMPQ_PKZIP_CMP_BAD_DATA;
+	}
+
+	/* get the compression type. */
+	mpq_pkzip->cmp_type   = mpq_pkzip->in_buf[0];
+
+	/* get the dictionary size. */
+	mpq_pkzip->dsize_bits = mpq_pkzip->in_buf[1];
+
+	/* initialize 16-bit bit buffer. */
+	mpq_pkzip->bit_buf    = mpq_pkzip->in_buf[2];
+
+	/* extra (over 8) bits. */
+	mpq_pkzip->extra_bits = 0;
+
+	/* position in input buffer. */
+	mpq_pkzip->in_pos     = 3;
+
+	/* check if valid dictionary size. */
+	if (4 > mpq_pkzip->dsize_bits || mpq_pkzip->dsize_bits > 6) {
+		return LIBMPQ_PKZIP_CMP_INV_DICTSIZE;
+	}
+
+	/* shifted by 'sar' instruction. */
+	mpq_pkzip->dsize_mask = 0xFFFF >> (0x10 - mpq_pkzip->dsize_bits);
+
+	/* check if we are using binary compression. */
+	if (mpq_pkzip->cmp_type != LIBMPQ_PKZIP_CMP_BINARY) {
+
+		/* check if we are using ascii compression. */
+		if (mpq_pkzip->cmp_type != LIBMPQ_PKZIP_CMP_ASCII) {
+			return LIBMPQ_PKZIP_CMP_INV_MODE;
+		}
+
+		/* create ascii buffer. */
+		memcpy(mpq_pkzip->bits_asc, pkzip_bits_asc, sizeof(mpq_pkzip->bits_asc));
+		generate_tables_ascii(mpq_pkzip);
+	}
+
+	/* create the tables for decode. */
+	memcpy(mpq_pkzip->slen_bits, pkzip_slen_bits, sizeof(mpq_pkzip->slen_bits));
+	generate_tables_decode(0x10, mpq_pkzip->slen_bits, pkzip_len_code, mpq_pkzip->pos2);
+
+	/* create the tables for decode. */
+	memcpy(mpq_pkzip->clen_bits, pkzip_clen_bits, sizeof(mpq_pkzip->clen_bits));
+	memcpy(mpq_pkzip->len_base, pkzip_len_base, sizeof(mpq_pkzip->len_base));
+	memcpy(mpq_pkzip->dist_bits, pkzip_dist_bits, sizeof(mpq_pkzip->dist_bits));
+	generate_tables_decode(0x40, mpq_pkzip->dist_bits, pkzip_dist_code, mpq_pkzip->pos1);
+
+	/* check if data extraction works. */
+	if (expand(mpq_pkzip) != 0x306) {
+		return LIBMPQ_PKZIP_CMP_NO_ERROR;
+	}
+
+	/* something failed, so return error. */
+	return LIBMPQ_PKZIP_CMP_ABORT;
+}
diff --git a/dep/libmpq/libmpq/explode.h b/dep/libmpq/libmpq/explode.h
new file mode 100644
index 000000000..007ee88f1
--- /dev/null
+++ b/dep/libmpq/libmpq/explode.h
@@ -0,0 +1,114 @@
+/*
+ *  explode.h -- header file for pkware data decompression library
+ *               used by mpq-tools.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  This source was adepted from the C++ version of pklib.h included
+ *  in stormlib. The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula <ladik@zezula.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _EXPLODE_H
+#define _EXPLODE_H
+
+/* define compression constants and return values. */
+#define LIBMPQ_PKZIP_CMP_BINARY         0       /* binary compression. */
+#define LIBMPQ_PKZIP_CMP_ASCII          1       /* ascii compression. */
+#define LIBMPQ_PKZIP_CMP_NO_ERROR       0
+#define LIBMPQ_PKZIP_CMP_INV_DICTSIZE   1
+#define LIBMPQ_PKZIP_CMP_INV_MODE       2
+#define LIBMPQ_PKZIP_CMP_BAD_DATA       3
+#define LIBMPQ_PKZIP_CMP_ABORT          4
+
+/* define true and false, because not all systems have them. */
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifdef _MSC_VER
+#pragma pack(push,1)
+#define PACK_STRUCT
+#else
+//#error "pack_begin.h may not be included twice!"
+/* we assume GNU here */
+#define PACK_STRUCT __attribute__((packed))
+#endif
+
+/* compression structure. */
+typedef struct
+{
+    uint32_t    offs0000;                                               /* 0000 - start. */
+    uint32_t    cmp_type;                                               /* 0004 - compression type (binary or ascii). */
+    uint32_t    out_pos;                                                /* 0008 - position in output buffer. */
+    uint32_t    dsize_bits;                                             /* 000C - dict size (4, 5, 6 for 0x400, 0x800, 0x1000). */
+    uint32_t    dsize_mask;                                             /* 0010 - dict size bitmask (0x0F, 0x1F, 0x3F for 0x400, 0x800, 0x1000). */
+    uint32_t    bit_buf;                                                /* 0014 - 16-bit buffer for processing input data. */
+    uint32_t    extra_bits;                                             /* 0018 - number of extra (above 8) bits in bit buffer. */
+    uint32_t    in_pos;                                                 /* 001C - position in in_buf. */
+    uint32_t    in_bytes;                                               /* 0020 - number of bytes in input buffer. */
+    void        *param;                                                 /* 0024 - custom parameter. */
+    uint32_t (*read_buf)(char *buf, uint32_t *size, void *param);       /* 0028 offset.*/
+    void (*write_buf)(char *buf, uint32_t *size, void *param);          /* 002C offset. */
+    uint8_t     out_buf[0x2000];                                        /* 0030 - output circle buffer, starting position is 0x1000. */
+    uint8_t     offs_2030[0x204];                                       /* 2030 - whats that? */
+    uint8_t     in_buf[0x800];                                          /* 2234 - buffer for data to be decompressed. */
+    uint8_t     pos1[0x100];                                            /* 2A34 - positions in buffers. */
+    uint8_t     pos2[0x100];                                            /* 2B34 - positions in buffers. */
+    uint8_t     offs_2c34[0x100];                                       /* 2C34 - buffer. */
+    uint8_t     offs_2d34[0x100];                                       /* 2D34 - buffer. */
+    uint8_t     offs_2e34[0x80];                                        /* 2EB4 - buffer. */
+    uint8_t     offs_2eb4[0x100];                                       /* 2EB4 - buffer. */
+    uint8_t     bits_asc[0x100];                                        /* 2FB4 - buffer. */
+    uint8_t     dist_bits[0x40];                                        /* 30B4 - numbers of bytes to skip copied block length. */
+    uint8_t     slen_bits[0x10];                                        /* 30F4 - numbers of bits for skip copied block length. */
+    uint8_t     clen_bits[0x10];                                        /* 3104 - number of valid bits for copied block. */
+    uint16_t    len_base[0x10];                                         /* 3114 - buffer. */
+} PACK_STRUCT pkzip_cmp_s;
+
+#ifdef _PACK_BEGIN
+#undef _PACK_BEGIN
+#endif
+
+#ifdef _MSC_VER
+#pragma pack(pop)
+#endif
+
+#undef PACK_STRUCT
+
+/* data structure. */
+typedef struct
+{
+    uint8_t     *in_buf;        /* pointer to input data buffer. */
+    uint32_t    in_pos;         /* current offset in input data buffer. */
+    int32_t     in_bytes;       /* number of bytes in the input buffer. */
+    uint8_t     *out_buf;       /* pointer to output data buffer. */
+    uint32_t    out_pos;        /* position in the output buffer. */
+    int32_t     max_out;        /* maximum number of bytes in the output buffer. */
+} pkzip_data_s;
+
+/* decompress the stream using pkzip compression. */
+uint32_t libmpq__do_decompress_pkzip(
+    uint8_t     *work_buf,
+    void        *param
+);
+
+#endif                      /* _EXPLODE_H */
diff --git a/dep/libmpq/libmpq/extract.c b/dep/libmpq/libmpq/extract.c
new file mode 100644
index 000000000..11de10716
--- /dev/null
+++ b/dep/libmpq/libmpq/extract.c
@@ -0,0 +1,361 @@
+/*
+ *  extract.c -- global extracting function for all known file compressions
+ *               in a mpq archive.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* generic includes. */
+#include <stdlib.h>
+#include <string.h>
+
+/* zlib includes. */
+#include <zlib.h>
+#include <bzlib.h>
+
+/* libmpq main includes. */
+#include "mpq.h"
+
+/* libmpq generic includes. */
+#include "explode.h"
+#include "extract.h"
+#include "huffman.h"
+#include "wave.h"
+
+/* table with decompression bits and functions. */
+static decompress_table_s dcmp_table[] = {
+	{LIBMPQ_COMPRESSION_HUFFMAN, libmpq__decompress_huffman},	/* decompression using huffman trees. */
+	{LIBMPQ_COMPRESSION_ZLIB, libmpq__decompress_zlib},	/* decompression with the zlib library. */
+	{LIBMPQ_COMPRESSION_PKZIP, libmpq__decompress_pkzip},	/* decompression with pkware data compression library. */
+	{LIBMPQ_COMPRESSION_BZIP2, libmpq__decompress_bzip2},	/* decompression with bzip2 library. */
+	{LIBMPQ_COMPRESSION_WAVE_MONO, libmpq__decompress_wave_mono},	/* decompression for mono waves. */
+	{LIBMPQ_COMPRESSION_WAVE_STEREO, libmpq__decompress_wave_stereo}	/* decompression for stereo waves. */
+};
+
+/* this function decompress a stream using huffman algorithm. */
+int32_t libmpq__decompress_huffman(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* TODO: make typdefs of this structs? */
+	/* some common variables. */
+	int32_t tb     = 0;
+	struct huffman_tree_s *ht;
+	struct huffman_input_stream_s *is;
+
+	/* allocate memory for the huffman tree. */
+	if ((ht = malloc(sizeof(struct huffman_tree_s))) == NULL ||
+	    (is = malloc(sizeof(struct huffman_input_stream_s))) == NULL) {
+
+		/* memory allocation problem. */
+		return LIBMPQ_ERROR_MALLOC;
+	}
+
+	/* cleanup structures. */
+	memset(ht, 0, sizeof(struct huffman_tree_s));
+	memset(is, 0, sizeof(struct huffman_input_stream_s));
+
+	/* initialize input stream. */
+	is->bit_buf  = *(uint32_t *)in_buf;
+	in_buf      += sizeof(int32_t);
+	is->in_buf   = (uint8_t *)in_buf;
+	is->bits     = 32;
+
+// TODO: add all the mallocs to init function and add function libmpq__huffman_tree_free() */
+//	if ((result = libmpq__huffman_tree_init(ht, LIBMPQ_HUFF_DECOMPRESS)) < 0) {
+//
+//		/* something on zlib initialization failed. */
+//		return LIBMPQ_ERROR_UNPACK;
+//	}
+
+	/* initialize the huffman tree for decompression. */
+	libmpq__huffman_tree_init(ht, LIBMPQ_HUFF_DECOMPRESS);
+
+	/* save the number of copied bytes. */
+	tb = libmpq__do_decompress_huffman(ht, is, out_buf, out_size);
+
+	/* free structures. */
+	free(is);
+	free(ht);
+
+	/* return transferred bytes. */
+	return tb;
+}
+
+/* this function decompress a stream using zlib algorithm. */
+int32_t libmpq__decompress_zlib(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* some common variables. */
+	int32_t result = 0;
+	int32_t tb     = 0;
+	z_stream z;
+
+	/* fill the stream structure for zlib. */
+	z.next_in   = (Bytef *)in_buf;
+	z.avail_in  = (uInt)in_size;
+	z.total_in  = in_size;
+	z.next_out  = (Bytef *)out_buf;
+	z.avail_out = (uInt)out_size;
+	z.total_out = 0;
+	z.zalloc    = NULL;
+	z.zfree     = NULL;
+
+	/* initialize the decompression structure, storm.dll uses zlib version 1.1.3. */
+	if ((result = inflateInit(&z)) != Z_OK) {
+
+		/* something on zlib initialization failed. */
+		return result;
+	}
+
+	/* call zlib to decompress the data. */
+	if ((result = inflate(&z, Z_FINISH)) != Z_STREAM_END) {
+
+		/* something on zlib decompression failed. */
+		return result;
+	}
+
+	/* save transferred bytes. */
+	tb = z.total_out;
+
+	/* cleanup zlib. */
+	if ((result = inflateEnd(&z)) != Z_OK) {
+
+		/* something on zlib finalization failed. */
+		return result;
+	}
+
+	/* return transferred bytes. */
+	return tb;
+}
+
+/* this function decompress a stream using pkzip algorithm. */
+int32_t libmpq__decompress_pkzip(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* some common variables. */
+	int32_t tb = 0;
+	uint8_t *work_buf;
+	pkzip_data_s info;
+
+	/* allocate memory for pkzip data structure. */
+	if ((work_buf = malloc(sizeof(pkzip_cmp_s))) == NULL) {
+
+		/* memory allocation problem. */
+		return LIBMPQ_ERROR_MALLOC;
+	}
+
+	/* cleanup. */
+	memset(work_buf, 0, sizeof(pkzip_cmp_s));
+
+	/* fill data information structure. */
+	info.in_buf   = in_buf;
+	info.in_pos   = 0;
+	info.in_bytes = in_size;
+	info.out_buf  = out_buf;
+	info.out_pos  = 0;
+	info.max_out  = out_size;
+
+	/* do the decompression. */
+	if ((tb = libmpq__do_decompress_pkzip(work_buf, &info)) < 0) {
+
+		/* free working buffer. */
+		free(work_buf);
+
+		/* something failed on pkzip decompression. */
+		return tb;
+	}
+
+	/* save transferred bytes. */
+	tb = info.out_pos;
+
+	/* free working buffer. */
+	free(work_buf);
+
+	/* return transferred bytes. */
+	return tb;
+}
+
+/* this function decompress a stream using bzip2 library. */
+int32_t libmpq__decompress_bzip2(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* some common variables. */
+	int32_t result = 0;
+	int32_t tb     = 0;
+	bz_stream strm;
+
+	/* initialize the bzlib decompression. */
+	strm.bzalloc = NULL;
+	strm.bzfree  = NULL;
+
+	/* initialize the structure. */
+	if ((result = BZ2_bzDecompressInit(&strm, 0, 0)) != BZ_OK) {
+
+		/* something on bzlib initialization failed. */
+		return result;
+	}
+
+	/* fill the stream structure for bzlib. */
+	strm.next_in   = (char *)in_buf;
+	strm.avail_in  = in_size;
+	strm.next_out  = (char *)out_buf;
+	strm.avail_out = out_size;
+
+	/* do the decompression. */
+	while (BZ2_bzDecompress(&strm) != BZ_STREAM_END);
+
+	/* save transferred bytes. */
+	tb = strm.total_out_lo32;
+
+	/* cleanup of bzip stream. */
+	BZ2_bzDecompressEnd(&strm);
+
+	/* return transferred bytes. */
+	return tb;
+}
+
+/* this function decompress a stream using wave algorithm. (1 channel) */
+int32_t libmpq__decompress_wave_mono(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* some common variables. */
+	int32_t tb = 0;
+
+	/* save the number of copied bytes. */
+	if ((tb = libmpq__do_decompress_wave(out_buf, out_size, in_buf, in_size, 1)) < 0) {
+
+		/* something on wave decompression failed. */
+		return tb;
+	}
+
+	/* return transferred bytes. */
+	return tb;
+}
+
+/* this function decompress a stream using wave algorithm. (2 channels) */
+int32_t libmpq__decompress_wave_stereo(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* some common variables. */
+	int32_t tb = 0;
+
+	/* save the number of copied bytes. */
+	if ((tb = libmpq__do_decompress_wave(out_buf, out_size, in_buf, in_size, 2)) < 0) {
+
+		/* something on wave decompression failed. */
+		return tb;
+	}
+
+	/* return transferred bytes. */
+	return tb;
+}
+
+/* this function decompress a stream using a combination of the other compression algorithm. */
+int32_t libmpq__decompress_multi(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* some common variables. */
+	int32_t tb        = 0;
+	uint32_t count    = 0;
+	uint32_t entries  = (sizeof(dcmp_table) / sizeof(decompress_table_s));
+	uint8_t *temp_buf = NULL;
+	uint8_t *work_buf = 0;
+	uint8_t decompress_flag, decompress_unsupp;
+	uint32_t i;
+
+	/* get applied compression types. */
+	decompress_flag = decompress_unsupp = *in_buf++;
+
+	/* decrement data size. */
+	in_size--;
+
+	/* search decompression table type and get all types of compression. */
+	for (i = 0; i < entries; i++) {
+
+		/* check if have to apply this decompression. */
+		if (decompress_flag & dcmp_table[i].mask) {
+
+			/* increase counter for used compression algorithms. */
+			count++;
+			/* this algorithm is supported, remove from unsupp mask */
+			decompress_unsupp &= ~dcmp_table[i].mask;
+		}
+	}
+
+	/* check if there is some method unhandled. (e.g. compressed by future versions) */
+	if (decompress_unsupp) {
+
+		/* compression type is unknown and we need to implement it. :) */
+		return LIBMPQ_ERROR_UNPACK;
+	}
+
+	/* if multiple decompressions should be made, we need temporary buffer for the data. */
+	if (count > 1) {
+
+		/* allocate memory for temporary buffer. */
+		if ((temp_buf = malloc(out_size)) == NULL) {
+
+			/* memory allocation problem. */
+			return LIBMPQ_ERROR_MALLOC;
+		}
+
+		/* cleanup. */
+		memset(temp_buf, 0, out_size);
+	}
+
+	/* apply all decompressions. */
+	for (i = 0, count = 0; i < entries; i++) {
+
+		/* check if not used this kind of compression. */
+		if (decompress_flag & dcmp_table[i].mask) {
+
+			/* if multiple decompressions should be made, we need temporary buffer for the data. */
+			if (count == 0) {
+
+				/* use output buffer as working buffer. */
+				work_buf = out_buf;
+			} else {
+
+				/* use temporary buffer as working buffer. */
+				work_buf = temp_buf;
+			}
+
+			/* decompress buffer using corresponding function. */
+			if ((tb = dcmp_table[i].decompress(in_buf, in_size, work_buf, out_size)) < 0) {
+
+				/* free temporary buffer. */
+				free(temp_buf);
+
+				/* something on decompression failed. */
+				return tb;
+			}
+
+			/* move output size to source size for next compression. */
+			in_size = out_size;
+			in_buf  = work_buf;
+
+			/* increase counter. */
+			count++;
+		}
+	}
+
+	/* if output buffer is not the same like target buffer, we have to copy data (this will happen on multiple decompressions). */
+	if (work_buf != out_buf) {
+
+		/* copy buffer. */
+		memcpy(out_buf, in_buf, out_size);
+	}
+
+	/* free temporary buffer. */
+	free(temp_buf);
+
+	/* return transferred bytes. */
+	return tb;
+}
diff --git a/dep/libmpq/libmpq/extract.h b/dep/libmpq/libmpq/extract.h
new file mode 100644
index 000000000..695bc7c70
--- /dev/null
+++ b/dep/libmpq/libmpq/extract.h
@@ -0,0 +1,107 @@
+/*
+ *  extract.h -- header for the extraction functions used by mpq-tools.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _EXTRACT_H
+#define _EXTRACT_H
+
+/* define compression types for multilpe compressions. */
+#define LIBMPQ_COMPRESSION_HUFFMAN      0x01            /* huffman compression. (used on wave files only and introduced in starcraft) */
+#define LIBMPQ_COMPRESSION_ZLIB         0x02            /* zlib compression. (introduced in warcraft 3) */
+#define LIBMPQ_COMPRESSION_PKZIP        0x08            /* pkware dcl compression. (first used compression algorithm) */
+#define LIBMPQ_COMPRESSION_BZIP2        0x10            /* bzip compression. (introduced in warcraft 3 - the frozen throne) */
+#define LIBMPQ_COMPRESSION_WAVE_MONO    0x40            /* adpcm 4:1 compression. (introduced in starcraft) */
+#define LIBMPQ_COMPRESSION_WAVE_STEREO  0x80            /* adpcm 4:1 compression. (introduced in starcraft) */
+
+/*
+ *  table for decompression functions, return value for all functions
+ *  is the transferred data size or one of the following error constants:
+ *
+ *  LIBMPQ_ERROR_MALLOC
+ *  LIBMPQ_ERROR_DECOMPRESS
+ */
+typedef int32_t (*DECOMPRESS)(uint8_t *, uint32_t, uint8_t *, uint32_t);
+typedef struct
+{
+    uint32_t    mask;                                   /* decompression bit. */
+    DECOMPRESS  decompress;                             /* decompression function. */
+} decompress_table_s;
+
+/*
+ *  huffman decompression routine, the in_size parameter is not used,
+ *  but needs to be specified due to compatibility reasons.
+ *
+ *  1500F5F0
+ */
+extern int32_t libmpq__decompress_huffman(
+    uint8_t     *in_buf,
+    uint32_t    in_size,
+    uint8_t     *out_buf,
+    uint32_t    out_size
+);
+
+/* decompression using zlib. */
+extern int32_t libmpq__decompress_zlib(
+    uint8_t     *in_buf,
+    uint32_t    in_size,
+    uint8_t     *out_buf,
+    uint32_t    out_size
+);
+
+/* decompression using pkzip. */
+extern int32_t libmpq__decompress_pkzip(
+    uint8_t     *in_buf,
+    uint32_t    in_size,
+    uint8_t     *out_buf,
+    uint32_t    out_size
+);
+
+/* decompression using bzip2. */
+extern int32_t libmpq__decompress_bzip2(
+    uint8_t     *in_buf,
+    uint32_t    in_size,
+    uint8_t     *out_buf,
+    uint32_t    out_size
+);
+
+/* decompression using wave. (1 channel) */
+extern int32_t libmpq__decompress_wave_mono(
+    uint8_t     *in_buf,
+    uint32_t    in_size,
+    uint8_t     *out_buf,
+    uint32_t    out_size
+);
+
+/* decompression using wave. (2 channels) */
+extern int32_t libmpq__decompress_wave_stereo(
+    uint8_t     *in_buf,
+    uint32_t    in_size,
+    uint8_t     *out_buf,
+    uint32_t    out_size
+);
+
+/* decompression using multiple of the above algorithm. */
+extern int32_t libmpq__decompress_multi(
+    uint8_t     *in_buf,
+    uint32_t    in_size,
+    uint8_t     *out_buf,
+    uint32_t    out_size
+);
+
+#endif                      /* _EXTRACT_H */
diff --git a/dep/libmpq/libmpq/huffman.c b/dep/libmpq/libmpq/huffman.c
new file mode 100644
index 000000000..8fc87be2f
--- /dev/null
+++ b/dep/libmpq/libmpq/huffman.c
@@ -0,0 +1,1101 @@
+/*
+ *  huffman.c -- functions do decompress files in mpq files which
+ *               uses a modified huffman version.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  Differences between C++ and C version:
+ *
+ *    - Removed the object oriented stuff.
+ *    - Replaced the goto things with some better C code.
+ *
+ *  This source was adepted from the C++ version of huffman.cpp included
+ *  in stormlib. The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula <ladik@zezula.net>
+ *  ShadowFlare <BlakFlare@hotmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* generic includes. */
+#include <stdlib.h>
+#include <string.h>
+
+/* libmpq main includes. */
+#include "mpq.h"
+#include "mpq-internal.h"
+
+/* libmpq generic includes. */
+#include "huffman.h"
+
+/* tables for huffman tree. */
+static const uint8_t table_1502A630[] = {
+
+	/* data for compression type 0x00. */
+	0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+	0x00, 0x00,
+
+	/* data for compression type 0x01. */
+	0x54, 0x16, 0x16, 0x0D, 0x0C, 0x08, 0x06, 0x05, 0x06, 0x05, 0x06, 0x03, 0x04, 0x04, 0x03, 0x05,
+	0x0E, 0x0B, 0x14, 0x13, 0x13, 0x09, 0x0B, 0x06, 0x05, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02,
+	0x0D, 0x07, 0x09, 0x06, 0x06, 0x04, 0x03, 0x02, 0x04, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02,
+	0x09, 0x06, 0x04, 0x04, 0x04, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x04,
+	0x08, 0x03, 0x04, 0x07, 0x09, 0x05, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02,
+	0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02,
+	0x06, 0x0A, 0x08, 0x08, 0x06, 0x07, 0x04, 0x03, 0x04, 0x04, 0x02, 0x02, 0x04, 0x02, 0x03, 0x03,
+	0x04, 0x03, 0x07, 0x07, 0x09, 0x06, 0x04, 0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02,
+	0x0A, 0x02, 0x02, 0x03, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x03, 0x05, 0x02, 0x03,
+	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x03, 0x01, 0x01, 0x01,
+	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x04, 0x04, 0x04, 0x07, 0x09, 0x08, 0x0C, 0x02,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x03,
+	0x04, 0x01, 0x02, 0x04, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
+	0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x4B,
+	0x00, 0x00,
+
+	/* data for compression type 0x02. */
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x27, 0x00, 0x00, 0x23, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x06, 0x0E, 0x10, 0x04,
+	0x06, 0x08, 0x05, 0x04, 0x04, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03, 0x01, 0x01, 0x02, 0x01, 0x01,
+	0x01, 0x04, 0x02, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x04, 0x01, 0x01, 0x02, 0x03, 0x03, 0x02,
+	0x03, 0x01, 0x03, 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x01,
+	0x01, 0x29, 0x07, 0x16, 0x12, 0x40, 0x0A, 0x0A, 0x11, 0x25, 0x01, 0x03, 0x17, 0x10, 0x26, 0x2A,
+	0x10, 0x01, 0x23, 0x23, 0x2F, 0x10, 0x06, 0x07, 0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+
+	/* data for compression type 0x03. */
+	0xFF, 0x0B, 0x07, 0x05, 0x0B, 0x02, 0x02, 0x02, 0x06, 0x02, 0x02, 0x01, 0x04, 0x02, 0x01, 0x03,
+	0x09, 0x01, 0x01, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
+	0x05, 0x01, 0x01, 0x01, 0x0D, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x02, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
+	0x0A, 0x04, 0x02, 0x01, 0x06, 0x03, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01,
+	0x05, 0x02, 0x03, 0x04, 0x03, 0x03, 0x03, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x03, 0x03,
+	0x01, 0x03, 0x01, 0x01, 0x02, 0x05, 0x01, 0x01, 0x04, 0x03, 0x05, 0x01, 0x03, 0x01, 0x03, 0x03,
+	0x02, 0x01, 0x04, 0x03, 0x0A, 0x06, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x02, 0x02, 0x01, 0x0A, 0x02, 0x05, 0x01, 0x01, 0x02, 0x07, 0x02, 0x17, 0x01, 0x05, 0x01, 0x01,
+	0x0E, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x06, 0x02, 0x01, 0x04, 0x05, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
+	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x11,
+	0x00, 0x00,
+
+	/* data for compression type 0x04. */
+	0xFF, 0xFB, 0x98, 0x9A, 0x84, 0x85, 0x63, 0x64, 0x3E, 0x3E, 0x22, 0x22, 0x13, 0x13, 0x18, 0x17,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+
+	/* data for compression type 0x05. */
+	0xFF, 0xF1, 0x9D, 0x9E, 0x9A, 0x9B, 0x9A, 0x97, 0x93, 0x93, 0x8C, 0x8E, 0x86, 0x88, 0x80, 0x82,
+	0x7C, 0x7C, 0x72, 0x73, 0x69, 0x6B, 0x5F, 0x60, 0x55, 0x56, 0x4A, 0x4B, 0x40, 0x41, 0x37, 0x37,
+	0x2F, 0x2F, 0x27, 0x27, 0x21, 0x21, 0x1B, 0x1C, 0x17, 0x17, 0x13, 0x13, 0x10, 0x10, 0x0D, 0x0D,
+	0x0B, 0x0B, 0x09, 0x09, 0x08, 0x08, 0x07, 0x07, 0x06, 0x05, 0x05, 0x04, 0x04, 0x04, 0x19, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+
+	/* data for compression type 0x06. */
+	0xC3, 0xCB, 0xF5, 0x41, 0xFF, 0x7B, 0xF7, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xBF, 0xCC, 0xF2, 0x40, 0xFD, 0x7C, 0xF7, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x7A, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+
+	/* data for compression type 0x07. */
+	0xC3, 0xD9, 0xEF, 0x3D, 0xF9, 0x7C, 0xE9, 0x1E, 0xFD, 0xAB, 0xF1, 0x2C, 0xFC, 0x5B, 0xFE, 0x17,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xBD, 0xD9, 0xEC, 0x3D, 0xF5, 0x7D, 0xE8, 0x1D, 0xFB, 0xAE, 0xF0, 0x2C, 0xFB, 0x5C, 0xFF, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x70, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+
+	/* data for compression type 0x08. */
+	0xBA, 0xC5, 0xDA, 0x33, 0xE3, 0x6D, 0xD8, 0x18, 0xE5, 0x94, 0xDA, 0x23, 0xDF, 0x4A, 0xD1, 0x10,
+	0xEE, 0xAF, 0xE4, 0x2C, 0xEA, 0x5A, 0xDE, 0x15, 0xF4, 0x87, 0xE9, 0x21, 0xF6, 0x43, 0xFC, 0x12,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xB0, 0xC7, 0xD8, 0x33, 0xE3, 0x6B, 0xD6, 0x18, 0xE7, 0x95, 0xD8, 0x23, 0xDB, 0x49, 0xD0, 0x11,
+	0xE9, 0xB2, 0xE2, 0x2B, 0xE8, 0x5C, 0xDD, 0x15, 0xF1, 0x87, 0xE7, 0x20, 0xF7, 0x44, 0xFF, 0x13,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x5F, 0x9E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00
+};
+
+/* this function insert an item to a huffman tree. */
+void libmpq__huffman_insert_item(struct huffman_tree_item_s **p_item, struct huffman_tree_item_s *item, uint32_t where, struct huffman_tree_item_s *item2) {
+
+	/* EDI - next to the first item. */
+	struct huffman_tree_item_s *next = item->next;
+
+	/* ESI - prev to the first item. */
+	struct huffman_tree_item_s *prev = item->prev;
+
+	/* pointer to previous item. */
+	struct huffman_tree_item_s *prev2;
+
+	/* pointer to next item. */
+	long next2;
+
+	/* check the first item already has next one. */
+	if (next != 0) {
+
+		/* check if previous item exist. */
+		if (PTR_INT(prev) < 0) {
+
+			/* return previous item. */
+			prev = PTR_NOT(prev);
+		} else {
+
+			/* add item. */
+			prev += (item - next->prev);
+		}
+
+		/* 150083C1 - remove the item from the tree. */
+		prev->next = next;
+		next->prev = prev;
+
+		/* invalidate prev and next pointer. */
+		item->next = 0;
+		item->prev = 0;
+	}
+
+	/* EDX - check if the second item is not entered. */
+	if (item2 == NULL) {
+
+		/* take the first tree item. */
+		item2 = PTR_PTR(&p_item[1]);
+	}
+
+	/* check if items should be switched or new one inserted. */
+	switch (where) {
+		case SWITCH_ITEMS:
+
+			/* item2->next (pointer to pointer to first). */
+			item->next        = item2->next;
+			item->prev        = item2->next->prev;
+			item2->next->prev = item;
+
+			/* set the first item. */
+			item2->next       = item;
+
+			/* return from function. */
+			return;
+		case INSERT_ITEM:
+
+			/* set next item (or pointer to pointer to first item) - insert as last item. */
+			item->next = item2;
+
+			/* set previous item (or last item in the tree). */
+			item->prev = item2->prev;
+
+			/* usually NULL. */
+			next2      = PTR_INT(p_item[0]);
+
+			/* previous item to the second (or last tree item). */
+			prev2      = item2->prev;
+
+			/* check if previous item is a valid pointer. */
+			if (PTR_INT(prev2) < 0) {
+
+				/* set values. */
+				prev2       = PTR_NOT(prev);
+				prev2->next = item;
+
+				/* next after last item. */
+				item2->prev = item;
+
+				/* return from function. */
+				return;
+			}
+
+			/* check if next item is empty. */
+			if (next2 < 0) {
+
+				/* set next item. */
+				next2 = item2 - item2->next->prev;
+			}
+
+			/* add next item to previous one. */
+			prev2       += next2;
+			prev2->next  = item;
+
+			/* set the next and last item. */
+			item2->prev  = item;
+
+			/* return from function. */
+			return;
+		default:
+
+			/* nothing to do, so return from function. */
+			return;
+	}
+}
+
+/* 1500BC90 - remove item from huffman tree.*/
+void libmpq__huffman_remove_item(struct huffman_tree_item_s *hi) {
+
+	/* EDX - some common variables. */
+	struct huffman_tree_item_s *temp;
+
+	/* check if next item is not empty. */
+	if (hi->next != NULL) {
+
+		/* fetch previous item. */
+		temp = hi->prev;
+
+		/* check if previous item is a pointer. */
+		if (PTR_INT(temp) <= 0) {
+			temp = PTR_NOT(temp);
+		} else {
+			temp += (hi - hi->next->prev);
+		}
+
+		/* reorganize tree. */
+		temp->next     = hi->next;
+		hi->next->prev = hi->prev;
+		hi->next       = hi->prev = NULL;
+	}
+}
+
+/* get previous huffman tree item. */
+struct huffman_tree_item_s *libmpq__huffman_previous_item(struct huffman_tree_item_s *hi, long value) {
+
+	/* check if previous item exist. */
+	if (PTR_INT(hi->prev) < 0) {
+
+		/* return previous item. */
+		return PTR_NOT(hi->prev);
+	}
+
+	/* check if something else should returned. */
+	if (value < 0) {
+
+		/* fetch previous item of next item. */
+		value = hi - hi->next->prev;
+	}
+
+	/* return previous item with value. */
+	return hi->prev + value;
+}
+
+/* get one bit from input stream. */
+uint32_t libmpq__huffman_get_1bit(struct huffman_input_stream_s *is) {
+
+	/* some common variables. */
+	uint32_t bit = (is->bit_buf & 1);
+
+	/* shift bit right by one. */
+	is->bit_buf >>= 1;
+
+	/* check if we should extract bits. */
+	if (--is->bits == 0) {
+		is->bit_buf  = *(uint32_t *)is->in_buf;
+		is->in_buf  += sizeof(int32_t);
+		is->bits     = 32;
+	}
+
+	/* return the bit. */
+	return bit;
+}
+
+/* get 7 bits from the input stream. */
+uint32_t libmpq__huffman_get_7bit(struct huffman_input_stream_s *is) {
+
+	/* check if we should extract bits. */
+	if (is->bits <= 7) {
+		is->bit_buf |= *(uint16_t *)is->in_buf << is->bits;
+		is->in_buf  += sizeof(int16_t);
+		is->bits    += 16;
+	}
+
+	/* get 7 bits from input stream. */
+	return (is->bit_buf & 0x7F);
+}
+
+/* get the whole byte from the input stream. */
+uint32_t libmpq__huffman_get_8bit(struct huffman_input_stream_s *is) {
+
+	/* some common variables. */
+	uint32_t one_byte;
+
+	/* check if we should extract bits. */
+	if (is->bits <= 8) {
+		is->bit_buf |= *(uint16_t *)is->in_buf << is->bits;
+		is->in_buf  += sizeof(int16_t);
+		is->bits    += 16;
+	}
+
+	/* fill values. */
+	one_byte      = (is->bit_buf & 0xFF);
+	is->bit_buf >>= 8;
+	is->bits     -= 8;
+
+	/* return the 8 bits. */
+	return one_byte;
+}
+
+/* return struct for 1500E740. */
+struct huffman_tree_item_s *libmpq__huffman_call_1500E740(struct huffman_tree_s *ht) {
+
+	/* EDX */
+	struct huffman_tree_item_s *p_item1 = ht->item3058;
+
+	/* EAX */
+	struct huffman_tree_item_s *p_item2;
+
+	/* some common variables. */
+	struct huffman_tree_item_s *p_next;
+	struct huffman_tree_item_s *p_prev;
+	struct huffman_tree_item_s **pp_item;
+
+	/* check if item is empty. */
+	if (PTR_INT(p_item1) <= 0 || (p_item2 = p_item1) == NULL) {
+
+		/* check if item is not empty. */
+		if ((p_item2 = &ht->items0008[ht->items++]) != NULL) {
+			p_item1 = p_item2;
+		} else {
+			p_item1 = ht->first;
+		}
+	} else {
+		p_item1 = p_item2;
+	}
+
+	/* set next item. */
+	p_next = p_item1->next;
+
+	/* check if next item is not empty. */
+	if (p_next != NULL) {
+
+		/* set previous item. */
+		p_prev = p_item1->prev;
+
+		/* check if previous item is a valid pointer. */
+		if (PTR_INT(p_prev) <= 0) {
+			p_prev = PTR_NOT(p_prev);
+		} else {
+			p_prev += (p_item1 - p_item1->next->prev);
+		}
+
+		/* fill values. */
+		p_prev->next  = p_next;
+		p_next->prev  = p_prev;
+		p_item1->next = NULL;
+		p_item1->prev = NULL;
+	}
+
+	/* ESI */
+	pp_item       = &ht->first;
+	p_item1->next = (struct huffman_tree_item_s *)pp_item;
+	p_item1->prev = pp_item[1];
+
+	/* EDI = ht->item305C - ECX */
+	p_prev = pp_item[1];
+
+	/* check if previous pointer is valid. */
+	if (p_prev <= 0) {
+
+		/* fill values. */
+		p_prev          = PTR_NOT(p_prev);
+		p_prev->next    = p_item1;
+		p_prev->prev    = p_item2;
+		p_item2->parent = NULL;
+		p_item2->child  = NULL;
+	} else {
+
+		/* check if pointer is valid. */
+		if (PTR_INT(ht->item305C) < 0) {
+			p_prev += (struct huffman_tree_item_s *)pp_item - (*pp_item)->prev;
+		} else {
+			p_prev += PTR_INT(ht->item305C);
+		}
+
+		/* fill values. */
+		p_prev->next    = p_item1;
+		pp_item[1]      = p_item2;
+		p_item2->parent = NULL;
+		p_item2->child  = NULL;
+	}
+
+	/* return item. */
+	return p_item2;
+}
+
+/* return struct for 1500E820. */
+void libmpq__huffman_call_1500E820(struct huffman_tree_s *ht, struct huffman_tree_item_s *p_item) {
+
+	/* EDI */
+	struct huffman_tree_item_s *p_item1;
+
+	/* EAX */
+	struct huffman_tree_item_s *p_item2 = NULL;
+
+	/* EDX */
+	struct huffman_tree_item_s *p_item3;
+
+	/* EBX */
+	struct huffman_tree_item_s *p_prev;
+
+	/* loop through parent items. */
+	for (; p_item != NULL; p_item = p_item->parent) {
+
+		/* increase byte counter. */
+		p_item->byte_value++;
+
+		/* loop through previous items. */
+		for (p_item1 = p_item; ; p_item1 = p_prev) {
+
+			/* set previous item. */
+			p_prev = p_item1->prev;
+
+			/* check if pointer is valid. */
+			if (PTR_INT(p_prev) <= 0) {
+				p_prev = NULL;
+				break;
+			}
+
+			/* check if byte value of previous item is higher than actual item. */
+			if (p_prev->byte_value >= p_item->byte_value) {
+				break;
+			}
+		}
+
+		/* check if previous item is same like actual item. */
+		if (p_item1 == p_item) {
+			continue;
+		}
+
+		/* check if next item is not empty, */
+		if (p_item1->next != NULL) {
+
+			/* fill values. */
+			p_item2             = libmpq__huffman_previous_item(p_item1, -1);
+			p_item2->next       = p_item1->next;
+			p_item1->next->prev = p_item1->prev;
+			p_item1->next       = NULL;
+			p_item1->prev       = NULL;
+		}
+
+		/* fill values. */
+		p_item2       = p_item->next;
+		p_item1->next = p_item2;
+		p_item1->prev = p_item2->prev;
+		p_item2->prev = p_item1;
+		p_item->next  = p_item1;
+
+		/* check if both items are not empty. */
+		if ((p_item2 = p_item1) != NULL) {
+
+			/* fill values. */
+			p_item2            = libmpq__huffman_previous_item(p_item, -1);
+			p_item2->next      = p_item->next;
+			p_item->next->prev = p_item->prev;
+			p_item->next       = NULL;
+			p_item->prev       = NULL;
+		}
+
+		/* check if previous item is empty. */
+		if (p_prev == NULL) {
+			p_prev = PTR_PTR(&ht->first);
+		}
+
+		/* fill values. */
+		p_item2       = p_prev->next;
+		p_item->next  = p_item2;
+		p_item->prev  = p_item2->prev;
+		p_item2->prev = p_item;
+		p_prev->next  = p_item;
+		p_item3       = p_item1->parent->child;
+		p_item2       = p_item->parent;
+
+		/* check if child item and parent item match. */
+		if (p_item2->child == p_item) {
+			p_item2->child = p_item1;
+		}
+
+		/* check if items match. */
+		if (p_item3 == p_item1) {
+			p_item1->parent->child = p_item;
+		}
+
+		/* fill values. */
+		p_item2         = p_item->parent;
+		p_item->parent  = p_item1->parent;
+		p_item1->parent = p_item2;
+
+		/* increase counter. */
+		ht->offs0004++;
+	}
+}
+
+/* this function initialize a huffman tree. */
+void libmpq__huffman_tree_init(struct huffman_tree_s *ht, uint32_t cmp) {
+
+	/* some common variables. */
+	uint32_t count;
+	struct huffman_tree_item_s *hi;
+
+	/* clear links for all the items in the tree. */
+	for (hi = ht->items0008, count = 0x203; count != 0; hi++, count--) {
+		hi->next = hi->prev = NULL;
+	}
+
+	/* fill values. */
+	ht->item3050 = NULL;
+	ht->item3054 = PTR_PTR(&ht->item3054);
+	ht->item3058 = PTR_NOT(ht->item3054);
+	ht->item305C = NULL;
+	ht->first    = PTR_PTR(&ht->first);
+	ht->last     = PTR_NOT(ht->first);
+	ht->offs0004 = 1;
+	ht->items    = 0;
+
+	/* clear all huffman decompress items, do this only if preparing for decompression. */
+	if (cmp == LIBMPQ_HUFF_DECOMPRESS) {
+		for (count = 0; count < sizeof(ht->qd3474) / sizeof(struct huffman_decompress_s); count++) {
+			ht->qd3474[count].offs00 = 0;
+		}
+	}
+}
+
+/* this function build a huffman tree, called with the first 8 bits loaded from input stream. */
+void libmpq__huffman_tree_build(struct huffman_tree_s *ht, uint32_t cmp_type) {
+
+	/* [ESP+10] - the greatest character found in table. */
+	uint32_t max_byte;
+
+	/* [ESP+1C] - pointer to uint8_t in table_1502A630. */
+	const uint8_t *byte_array;
+
+	/* thats needed to replace the goto stuff from original source. :) */
+	uint32_t found;
+
+	/* [ESP+14] - Pointer to Huffman tree item pointer array. */
+	struct huffman_tree_item_s **p_item;
+	struct huffman_tree_item_s *child1;
+
+	/* some common variables. */
+	uint32_t i;
+
+	/* ESI - loop while pointer has a negative value (last entry). */
+	while (PTR_INT(ht->last) > 0) {
+
+		/* EAX */
+		struct huffman_tree_item_s *temp;
+
+		/* ESI->next */
+		if (ht->last->next != NULL) {
+			libmpq__huffman_remove_item(ht->last);
+		}
+
+		/* [EDI+4] */
+		ht->item3058   = PTR_PTR(&ht->item3054);
+
+		/* EAX */
+		ht->last->prev = ht->item3058;
+		temp           = libmpq__huffman_previous_item(PTR_PTR(&ht->item3054), PTR_INT(&ht->item3050));
+		temp->next     = ht->last;
+		ht->item3054   = ht->last;
+	}
+
+	/* clear all pointers in huffman tree item array. */
+	memset(ht->items306C, 0, sizeof(ht->items306C));
+
+	/* greatest character found init to zero. */
+	max_byte    = 0;
+
+	/* pointer to current entry in huffman tree item pointer array. */
+	p_item      = (struct huffman_tree_item_s **)&ht->items306C;
+
+	/* ensure we have low 8 bits only. */
+	cmp_type   &= 0xFF;
+
+	/* EDI also. */
+	byte_array  = table_1502A630 + cmp_type * 258;
+
+	/* loop to build huffman tree. */
+	for (i = 0; i < 0x100; i++, p_item++) {
+
+		/* item to be created. */
+		struct huffman_tree_item_s *item    = ht->item3058;
+		struct huffman_tree_item_s *p_item3 = ht->item3058;
+		uint8_t one_byte                  = byte_array[i];
+
+		/* skip all the bytes which are zero. */
+		if (byte_array[i] == 0) {
+			continue;
+		}
+
+		/* if not valid pointer, take the first available item in the array. */
+		if (PTR_INT(item) <= 0) {
+			item = &ht->items0008[ht->items++];
+		}
+
+		/* insert this item as the top of the tree. */
+		libmpq__huffman_insert_item(&ht->item305C, item, SWITCH_ITEMS, NULL);
+
+		/* invalidate child and parent. */
+		item->parent     = NULL;
+		item->child      = NULL;
+
+		/* store pointer into pointer array. */
+		*p_item          = item;
+
+		/* store counter. */
+		item->dcmp_byte  = i;
+
+		/* store byte value. */
+		item->byte_value = one_byte;
+
+		/* check if byte is to big. */
+		if (one_byte >= max_byte) {
+
+			/* set max byte to highest value. */
+			max_byte = one_byte;
+
+			/* continue loop. */
+			continue;
+		}
+
+		/* find the first item which has byte value greater than current one byte. */
+		found = 0;
+
+		/* EDI - Pointer to the last item. */
+		if (PTR_INT((p_item3 = ht->last)) > 0) {
+
+			/* 15006AF7 */
+			if (p_item3 != NULL) {
+
+				/* 15006AFB */
+				do {
+
+					/* check if we found item. */
+					if (p_item3->byte_value >= one_byte) {
+						found = 1;
+						break;
+					}
+
+					/* switch to previous item. */
+					p_item3 = p_item3->prev;
+				} while (PTR_INT(p_item3) > 0);
+			}
+		}
+
+		/* check if item was not found. */
+		if (found == 0) {
+			p_item3 = NULL;
+		}
+
+		/* 15006B09 */
+		if (item->next != NULL) {
+			libmpq__huffman_remove_item(item);
+		}
+
+		/* 15006B15 */
+		if (p_item3 == NULL) {
+			p_item3 = PTR_PTR(&ht->first);
+		}
+
+		/* 15006B1F */
+		item->next          = p_item3->next;
+		item->prev          = p_item3->next->prev;
+		p_item3->next->prev = item;
+		p_item3->next       = item;
+	}
+
+	/* 15006B4A */
+	for (; i < 0x102; i++) {
+
+		/* EDI */
+		struct huffman_tree_item_s **p_item2 = &ht->items306C[i];
+
+		/* 15006B59 - ESI */
+		struct huffman_tree_item_s *item2 = ht->item3058;
+
+		/* check if item is a valid pointer. */
+		if (PTR_INT(item2) <= 0) {
+			item2 = &ht->items0008[ht->items++];
+		}
+
+		/* insert the item into tree. */
+		libmpq__huffman_insert_item(&ht->item305C, item2, INSERT_ITEM, NULL);
+
+		/* 15006B89 */
+		item2->dcmp_byte  = i;
+		item2->byte_value = 1;
+		item2->parent     = NULL;
+		item2->child      = NULL;
+		*p_item2++        = item2;
+	}
+
+	/* 15006BAA - EDI - last item (first child to item). */
+	if (PTR_INT((child1 = ht->last)) > 0) {
+
+		/* EBP */
+		struct huffman_tree_item_s *child2;
+
+		/* ESI */
+		struct huffman_tree_item_s *item;
+
+		/* 15006BB8 */
+		while (PTR_INT((child2 = child1->prev)) > 0) {
+			if (PTR_INT((item = ht->item3058)) <= 0) {
+				item = &ht->items0008[ht->items++];
+			}
+
+			/* 15006BE3 */
+			libmpq__huffman_insert_item(&ht->item305C, item, SWITCH_ITEMS, NULL);
+
+			/* 15006BF3 */
+			item->parent = NULL;
+			item->child  = NULL;
+
+			/*
+			 * EDX = child2->byte_value + child1->byte_value;
+			 * EAX = child1->byte_value;
+			 * ECX = max_byte; (the greatest character (0xFF usually))
+			 *       item->byte_value (0x02 usually)
+			 */
+			item->byte_value = child1->byte_value + child2->byte_value;
+
+			/* previous item in the tree. */
+			item->child      = child1;
+			child1->parent   = item;
+			child2->parent   = item;
+
+			/* EAX = item->byte_value */
+			if (item->byte_value >= max_byte) {
+				max_byte = item->byte_value;
+			} else {
+
+				/* EDI */
+				struct huffman_tree_item_s *p_item2 = child2->prev;
+				found = 0;
+
+				/* check if item is a valid pointer. */
+				if (PTR_INT(p_item2) > 0) {
+
+					/* 15006C2D */
+					do {
+
+						/* check if we found item. */
+						if (p_item2->byte_value >= item->byte_value) {
+							found = 1;
+							break;
+						}
+
+						/* switch to previous item. */
+						p_item2 = p_item2->prev;
+					} while (PTR_INT(p_item2) > 0);
+				}
+
+				/* check if item was not found. */
+				if (found == 0) {
+					p_item2 = NULL;
+				}
+
+				/* check if next item exist. */
+				if (item->next != 0) {
+
+					/* some common variables. */
+					struct huffman_tree_item_s *temp4 = libmpq__huffman_previous_item(item, -1);
+
+					/* zhe first item changed. */
+					temp4->next                     = item->next;
+
+					/* first->prev changed to negative value. */
+					item->next->prev                = item->prev;
+					item->next                      = NULL;
+					item->prev                      = NULL;
+				}
+
+				/* 15006C62 */
+				if (p_item2 == NULL) {
+					p_item2 = PTR_PTR(&ht->first);
+				}
+
+				/* set item with 0x100 byte value. */
+				item->next          = p_item2->next;
+
+				/* set item with 0x17 byte value. */
+				item->prev          = p_item2->next->prev;
+
+				/* changed prev of item with. */
+				p_item2->next->prev = item;
+				p_item2->next       = item;
+			}
+
+			/* 15006C7B */
+			if (PTR_INT((child1 = child2->prev)) <= 0) {
+				break;
+			}
+		}
+	}
+
+	/* 15006C88 */
+	ht->offs0004 = 1;
+}
+
+/* this function did the real decompression. */
+int32_t libmpq__do_decompress_huffman(struct huffman_tree_s *ht, struct huffman_input_stream_s *is, uint8_t *out_buf, uint32_t out_length) {
+
+	/* some common variables. */
+	uint32_t dcmp_byte = 0;
+	uint8_t *out_pos = out_buf;
+	uint32_t bit_count;
+	struct huffman_decompress_s *qd;
+	struct huffman_tree_item_s *p_item1;
+	struct huffman_tree_item_s *p_item2;
+
+	/* 8 bits loaded from input stream. */
+	uint32_t n8bits;
+
+	/* 7 bits loaded from input stream. */
+	uint32_t n7bits;
+
+	/* thats needed to replace the goto stuff from original source. :) */
+	uint32_t found;
+
+	/* can we use quick decompression */
+	uint32_t has_qd;
+
+	/* test the output length, must not be non zero. */
+	if (out_length == 0) {
+		return 0;
+	}
+
+	/* get the compression type from the input stream. */
+	n8bits = libmpq__huffman_get_8bit(is);
+
+	/* build the Huffman tree. */
+	libmpq__huffman_tree_build(ht, n8bits);
+
+	/* compression 8 bit or not? */
+	ht->cmp0 = (n8bits == 0) ? TRUE : FALSE;
+
+	/* loop until break. */
+	for(;;) {
+
+		/* get 7 bits from input stream. */
+		n7bits = libmpq__huffman_get_7bit(is);
+
+		/* try to use quick decompression, check huffman decompress struct for corresponding item. */
+		qd = &ht->qd3474[n7bits];
+
+		/* if there is a quick-pass possible (ebx). */
+		has_qd = (qd->offs00 >= ht->offs0004) ? TRUE : FALSE;
+
+		/* if we can use quick decompress, use it. */
+		if (has_qd) {
+			found = 0;
+			if (qd->bits > 7) {
+				is->bit_buf >>= 7;
+				is->bits     -= 7;
+				p_item1       = qd->p_item;
+				found         = 1;
+			}
+			if (found == 0) {
+				is->bit_buf >>= qd->bits;
+				is->bits     -= qd->bits;
+				dcmp_byte     = qd->dcmp_byte;
+			}
+		} else {
+			found = 1;
+			p_item1 = ht->first->next->prev;
+			if (PTR_INT(p_item1) <= 0) {
+				p_item1 = NULL;
+			}
+		}
+
+		/* check if item was found. */
+		if (found == 1) {
+			bit_count = 0;
+			p_item2   = NULL;
+
+			/* loop until tree has no deeper level. */
+			do {
+
+				/* move down by one level. */
+				p_item1 = p_item1->child;
+
+				/* check if current bit is set, move to previous. */
+				if (libmpq__huffman_get_1bit(is)) {
+					p_item1 = p_item1->prev;
+				}
+
+				/* check if we are at 7th bit, save current huffman tree item. */
+				if (++bit_count == 7) {
+					p_item2 = p_item1;
+				}
+			} while (p_item1->child != NULL);
+
+			/* no quick decompression. :( */
+			if (has_qd == FALSE) {
+
+				/* check bit counter. */
+				if (bit_count > 7) {
+					qd->offs00 = ht->offs0004;
+					qd->bits   = bit_count;
+					qd->p_item = p_item2;
+				} else {
+					uint32_t index = n7bits & (0xFFFFFFFF >> (32 - bit_count));
+					uint32_t add   = (1 << bit_count);
+
+					/* loop through compression. */
+					for (qd = &ht->qd3474[index]; index <= 0x7F; index += add, qd += add) {
+						qd->offs00    = ht->offs0004;
+						qd->bits      = bit_count;
+						qd->dcmp_byte = p_item1->dcmp_byte;
+					}
+				}
+			}
+
+			/* set compression byte. */
+			dcmp_byte = p_item1->dcmp_byte;
+		}
+
+		/* check if huffman tree needs to be modified. */
+		if (dcmp_byte == 0x101)	{
+
+			/* fill values. */
+			n8bits                            = libmpq__huffman_get_8bit(is);
+			p_item1                           = (ht->last <= 0) ? NULL : ht->last;
+			p_item2                           = libmpq__huffman_call_1500E740(ht);
+			p_item2->parent                   = p_item1;
+			p_item2->dcmp_byte                = p_item1->dcmp_byte;
+			p_item2->byte_value               = p_item1->byte_value;
+			ht->items306C[p_item2->dcmp_byte] = p_item2;
+			p_item2                           = libmpq__huffman_call_1500E740(ht);
+			p_item2->parent                   = p_item1;
+			p_item2->dcmp_byte                = n8bits;
+			p_item2->byte_value               = 0;
+			ht->items306C[p_item2->dcmp_byte] = p_item2;
+			p_item1->child                    = p_item2;
+
+			/* call 1500E820. */
+			libmpq__huffman_call_1500E820(ht, p_item2);
+
+			/* check if compression is not set. */
+			if (ht->cmp0 == 0) {
+				libmpq__huffman_call_1500E820(ht, ht->items306C[n8bits]);
+			}
+
+			/* set compression byte. */
+			dcmp_byte = n8bits;
+		}
+
+		/* check for compression. */
+		if (dcmp_byte == 0x100) {
+			break;
+		}
+
+		/* increase position by compression byte. */
+		*out_pos++ = (uint8_t)dcmp_byte;
+		if (--out_length == 0) {
+			break;
+		}
+
+		/* check if compression is not set. */
+		if (ht->cmp0) {
+			libmpq__huffman_call_1500E820(ht, ht->items306C[dcmp_byte]);
+		}
+	}
+
+	/* return copied bytes. */
+	return (out_pos - out_buf);
+}
diff --git a/dep/libmpq/libmpq/huffman.h b/dep/libmpq/libmpq/huffman.h
new file mode 100644
index 000000000..55da55950
--- /dev/null
+++ b/dep/libmpq/libmpq/huffman.h
@@ -0,0 +1,156 @@
+/*
+ *  huffman.h -- structures used for huffman compression.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  This source was adepted from the C++ version of huffman.h included
+ *  in stormlib. The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula <ladik@zezula.net>
+ *  ShadowFlare <BlakFlare@hotmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _HUFFMAN_H
+#define _HUFFMAN_H
+
+/* define huffman compression and decompression values. */
+#define LIBMPQ_HUFF_DECOMPRESS          0               /* we want to decompress using huffman trees. */
+
+/* define pointer conversions. */
+#define PTR_NOT(ptr)                (struct huffman_tree_item_s *)(~(unsigned long)(ptr))
+#define PTR_PTR(ptr)                ((struct huffman_tree_item_s *)(ptr))
+#define PTR_INT(ptr)                (long)(ptr)
+
+/* define item handling. */
+#define INSERT_ITEM                     1               /* insert item into huffman tree. */
+#define SWITCH_ITEMS                    2               /* switch items isnide huffman tree. */
+
+/* input stream for huffman decompression. */
+struct huffman_input_stream_s
+{
+    uint8_t     *in_buf;                                /* 00 - input data. */
+    uint32_t    bit_buf;                                /* 04 - input bit buffer. */
+    uint32_t    bits;                                   /* 08 - number of bits remaining in byte. */
+};
+
+/* huffman tree item. */
+struct huffman_tree_item_s
+{
+    struct      huffman_tree_item_s *next;              /* 00 - pointer to next huffman tree item. */
+    struct      huffman_tree_item_s *prev;              /* 04 - pointer to prev huffman tree item (< 0 if none). */
+    uint32_t    dcmp_byte;                              /* 08 - index of this item in item pointer array, decompressed byte value. */
+    uint32_t    byte_value;                             /* 0C - some byte value. */
+    struct      huffman_tree_item_s *parent;            /* 10 - pointer to parent huffman tree item (NULL if none). */
+    struct      huffman_tree_item_s *child;             /* 14 - pointer to child huffman tree item. */
+};
+
+/* structure used for quick decompression. */
+struct huffman_decompress_s
+{
+    uint32_t    offs00;                                 /* 00 - 1 if resolved. */
+    uint32_t    bits;                                   /* 04 - bit count. */
+    union
+    {
+        uint32_t    dcmp_byte;                          /* 08 - byte value for decompress (if bitCount <= 7). */
+        struct      huffman_tree_item_s *p_item;        /* 08 - huffman tree item (if number of bits is greater than 7). */
+    };
+};
+
+/* structure for huffman tree. */
+struct huffman_tree_s
+{
+    uint32_t    cmp0;                                   /* 0000 - 1 if compression type 0. */
+    uint32_t    offs0004;                               /* 0004 - some flag. */
+    struct      huffman_tree_item_s items0008[0x203];   /* 0008 - huffman tree items. */
+    struct      huffman_tree_item_s *item3050;          /* 3050 - always NULL? */
+    struct      huffman_tree_item_s *item3054;          /* 3054 - pointer to huffman tree item. */
+    struct      huffman_tree_item_s *item3058;          /* 3058 - pointer to huffman tree item (< 0 if invalid). */
+    struct      huffman_tree_item_s *item305C;          /* 305C - usually NULL. */
+    struct      huffman_tree_item_s *first;             /* 3060 - pointer to top (first) huffman tree item. */
+    struct      huffman_tree_item_s *last;              /* 3064 - pointer to bottom (last) huffman tree item (< 0 if invalid). */
+    uint32_t    items;                                  /* 3068 - number of used huffman tree items. */
+    struct      huffman_tree_item_s *items306C[0x102];  /* 306C - huffman tree item pointer array. */
+    struct      huffman_decompress_s qd3474[0x80];      /* 3474 - array for quick decompression. */
+    uint8_t     table_1502A630[];                       /* some table to make struct size flexible. */
+};
+
+/* insert a new item into huffman tree. */
+void libmpq__huffman_insert_item(
+    struct      huffman_tree_item_s **p_item,
+    struct      huffman_tree_item_s *item,
+    uint32_t    where,
+    struct      huffman_tree_item_s *item2
+);
+
+/* remove item from huffman tree. */
+void libmpq__huffman_remove_item(
+    struct      huffman_tree_item_s *hi
+);
+
+/* get previous item from huffman tree. */
+struct huffman_tree_item_s *libmpq__huffman_previous_item(
+    struct      huffman_tree_item_s *hi,
+    long        value
+);
+
+/* get one bit from stream. */
+uint32_t libmpq__huffman_get_1bit(
+    struct      huffman_input_stream_s *is
+);
+
+/* get seven bit from stream. */
+uint32_t libmpq__huffman_get_7bit(
+    struct      huffman_input_stream_s *is
+);
+
+/* get eight bit from stream. */
+uint32_t libmpq__huffman_get_8bit(
+    struct      huffman_input_stream_s *is
+);
+
+/* call 1500E740. */
+struct huffman_tree_item_s *libmpq__huffman_call_1500E740(
+    struct      huffman_tree_s *ht
+);
+
+/* call 1500E820- */
+void libmpq__huffman_call_1500E820(
+    struct      huffman_tree_s *ht,
+    struct      huffman_tree_item_s *p_item
+);
+
+/* initialize the huffman tree. */
+void libmpq__huffman_tree_init(
+    struct      huffman_tree_s *ht,
+    uint32_t    cmp
+);
+
+/* build the huffman tree. */
+void libmpq__huffman_tree_build(
+    struct      huffman_tree_s *ht,
+    uint32_t    cmp_type
+);
+
+/* decompress the stream using huffman compression. */
+int32_t libmpq__do_decompress_huffman(
+    struct      huffman_tree_s *ht,
+    struct      huffman_input_stream_s *is,
+    uint8_t     *out_buf,
+    uint32_t    out_length
+);
+
+#endif                      /* _HUFFMAN_H */
diff --git a/dep/libmpq/libmpq/mpq-internal.h b/dep/libmpq/libmpq/mpq-internal.h
new file mode 100644
index 000000000..8a5683101
--- /dev/null
+++ b/dep/libmpq/libmpq/mpq-internal.h
@@ -0,0 +1,170 @@
+/*
+ *  mpq-internal.h -- some default types and defines, but only required for
+ *                    compilation of the library.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _MPQ_INTERNAL_H
+#define _MPQ_INTERNAL_H
+
+/* generic includes. */
+#include <stdint.h>
+#include <stdio.h>
+
+/* define return value if nothing failed. */
+#define LIBMPQ_SUCCESS              0                   /* return value for all functions which success. */
+
+/* define generic mpq archive information. */
+#define LIBMPQ_HEADER               0x1A51504D          /* mpq archive header ('MPQ\x1A') */
+
+/* define the known archive versions. */
+#define LIBMPQ_ARCHIVE_VERSION_ONE      0               /* version one used until world of warcraft. */
+#define LIBMPQ_ARCHIVE_VERSION_TWO      1               /* version two used from world of warcraft - the burning crusade. */
+
+/* define values used by blizzard as flags. */
+#define LIBMPQ_FLAG_EXISTS          0x80000000          /* set if file exists, reset when the file was deleted. */
+#define LIBMPQ_FLAG_ENCRYPTED       0x00010000          /* indicates whether file is encrypted. */
+#define LIBMPQ_FLAG_COMPRESSED      0x0000FF00          /* file is compressed. */
+#define LIBMPQ_FLAG_COMPRESS_PKZIP  0x00000100          /* compression made by pkware data compression library. */
+#define LIBMPQ_FLAG_COMPRESS_MULTI  0x00000200          /* multiple compressions. */
+#define LIBMPQ_FLAG_COMPRESS_NONE   0x00000300          /* no compression (no blizzard flag used by myself). */
+#define LIBMPQ_FLAG_SINGLE          0x01000000          /* file is stored in one single sector, first seen in world of warcraft. */
+#define LIBMPQ_FLAG_EXTRA           0x04000000          /* compressed block offset table has one extra entry. */
+
+/* define generic hash values. */
+#define LIBMPQ_HASH_FREE            0xFFFFFFFF          /* hash table entry is empty and has always been empty. */
+
+/* define special files. */
+#define LIBMPQ_LISTFILE_NAME            "(listfile)"    /* internal listfile. */
+#define LIBMPQ_SIGNATURE_NAME           "(signature)"   /* internal signature file. */
+#define LIBMPQ_ATTRIBUTES_NAME          "(attributes)"  /* internal attributes file. */
+
+/* define true and false, because not all systems have them. */
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifdef _MSC_VER
+#pragma pack(push,1)
+#define PACK_STRUCT
+#else
+//#error "pack_begin.h may not be included twice!"
+/* we assume GNU here */
+#define PACK_STRUCT __attribute__((packed))
+#endif
+
+/* mpq archive header. */
+typedef struct
+{
+    uint32_t    mpq_magic;                              /* the 0x1A51504D ('MPQ\x1A') signature. */
+    uint32_t    header_size;                            /* mpq archive header size. */
+    uint32_t    archive_size;                           /* size of mpq archive. */
+    uint16_t    version;                                /* 0000 for starcraft and broodwar. */
+    uint16_t    block_size;                             /* size of file block is (512 * 2 ^ block size). */
+    uint32_t    hash_table_offset;                      /* file position of mpq_hash. */
+    uint32_t    block_table_offset;                     /* file position of mpq_block, each entry has 16 bytes. */
+    uint32_t    hash_table_count;                       /* number of entries in hash table. */
+    uint32_t    block_table_count;                      /* number of entries in the block table. */
+} PACK_STRUCT mpq_header_s;
+
+/* mpq extended archive header, used since world of warcraft - the burning crusade. */
+typedef struct
+{
+    uint64_t    extended_offset;                        /* offset to the beginning of the extended block table, relative to the beginning of the archive. */
+    uint16_t    hash_table_offset_high;                 /* upper 16 bits of the hash table offset for large archives. */
+    uint16_t    block_table_offset_high;                /* upper 16 bits of the block table offset for large archives.*/
+} PACK_STRUCT mpq_header_ex_s;
+
+/* hash entry, all files in the archive are searched by their hashes. */
+typedef struct
+{
+    uint32_t    hash_a;                                 /* the first two uint32_ts are the encrypted file. */
+    uint32_t    hash_b;                                 /* the first two uint32_ts are the encrypted file. */
+    uint16_t    locale;                                 /* locale information. */
+    uint16_t    platform;                               /* platform information and zero is default. */
+    uint32_t    block_table_index;                      /* index to file description block. */
+} PACK_STRUCT mpq_hash_s;
+
+/* file description block contains informations about the file. */
+typedef struct
+{
+    uint32_t    offset;                                 /* block file starting position in the archive. */
+    uint32_t    packed_size;                            /* packed file size. */
+    uint32_t    unpacked_size;                          /* unpacked file size. */
+    uint32_t    flags;                                  /* flags. */
+} PACK_STRUCT mpq_block_s;
+
+/* extended file description block contains information about the offset beyond 2^32 (4GB). */
+typedef struct
+{
+    uint16_t    offset_high;                            /* upper 16 bit of the file offset in archive. */
+} PACK_STRUCT mpq_block_ex_s;
+
+/* file structure used since diablo 1.00 (0x38 bytes). */
+typedef struct
+{
+    uint32_t    seed;                                   /* seed used for file decrypt. */
+    uint32_t    *packed_offset;                         /* position of each file block (only for packed files). */
+    uint32_t    open_count;                             /* number of times it has been opened - used for freeing */
+} PACK_STRUCT mpq_file_s;
+
+/* map structure for valid blocks and hashes (first seen in warcraft 3 archives). */
+typedef struct
+{
+    uint32_t    block_table_indices;                    /* real mapping for file number to block entry. */
+    uint32_t    block_table_diff;                       /* block table difference between valid blocks and invalid blocks before. */
+} PACK_STRUCT mpq_map_s;
+
+#ifdef _PACK_BEGIN
+#undef _PACK_BEGIN
+#endif
+
+#ifdef _MSC_VER
+#pragma pack(pop)
+#endif
+
+#undef PACK_STRUCT
+
+/* archive structure used since diablo 1.00 by blizzard. */
+struct mpq_archive
+{
+
+    /* generic file information. */
+    FILE        *fp;                                    /* file handle. */
+
+    /* generic size information. */
+    uint32_t    block_size;                             /* size of the mpq block. */
+    off_t       archive_offset;                         /* absolute start position of archive. */
+
+    /* archive related buffers and tables. */
+    mpq_header_s    mpq_header;                         /* mpq file header. */
+    mpq_header_ex_s mpq_header_ex;                      /* mpq extended file header. */
+    mpq_hash_s  *mpq_hash;                              /* hash table. */
+    mpq_block_s *mpq_block;                             /* block table. */
+    mpq_block_ex_s  *mpq_block_ex;                      /* extended block table. */
+    mpq_file_s  **mpq_file;                             /* pointer to the file pointers which are opened. */
+
+    /* non archive structure related members. */
+    mpq_map_s   *mpq_map;                               /* map table between valid blocks and hashes. */
+    uint32_t    files;                                  /* number of files in archive, which could be extracted. */
+};
+
+#endif                      /* _MPQ_INTERNAL_H */
diff --git a/dep/libmpq/libmpq/mpq.c b/dep/libmpq/libmpq/mpq.c
new file mode 100644
index 000000000..0c5f75f84
--- /dev/null
+++ b/dep/libmpq/libmpq/mpq.c
@@ -0,0 +1,1004 @@
+/*
+ *  mpq.c -- functions for developers using libmpq.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* mpq-tools configuration includes. */
+#include "config.h"
+
+/* libmpq main includes. */
+#include "mpq.h"
+#include "mpq-internal.h"
+
+/* libmpq generic includes. */
+#include "common.h"
+
+/* generic includes. */
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+/* support for platform specific things */
+#include "platform.h"
+
+/* this function returns the library version information. */
+const char *libmpq__version(void) {
+
+	/* return version information. */
+	return VERSION;
+}
+
+static const char *__libmpq_error_strings[] = {
+		"success",
+		"open error on file",
+		"close error on file",
+		"lseek error on file",
+		"read error on file",
+		"write error on file",
+		"memory allocation error",
+		"format errror",
+		"init() wasn't called",
+		"buffer size is to small",
+		"file or block does not exist in archive",
+		"we don't know the decryption seed",
+		"error on unpacking file"
+	};
+
+/* this function returns a string message for a return code. */
+const char *libmpq__strerror(int32_t returncode) {
+	/* check for array bounds */
+	if (-returncode < 0 || -returncode > sizeof(__libmpq_error_strings)/sizeof(char*))
+		return NULL;
+
+	/* return appropriate string */
+	return __libmpq_error_strings[-returncode];
+}
+
+/* this function read a file and verify if it is a valid mpq archive, then it read and decrypt the hash table. */
+int32_t libmpq__archive_open(mpq_archive_s **mpq_archive, const char *mpq_filename, libmpq__off_t archive_offset) {
+
+	/* some common variables. */
+	uint32_t rb             = 0;
+	uint32_t i              = 0;
+	uint32_t count          = 0;
+	int32_t result          = 0;
+	uint32_t header_search	= FALSE;
+
+	if (archive_offset == -1) {
+		archive_offset = 0;
+		header_search = TRUE;
+	}
+
+	if ((*mpq_archive = calloc(1, sizeof(mpq_archive_s))) == NULL) {
+
+		/* archive struct could not be allocated */
+		return LIBMPQ_ERROR_MALLOC;
+	}
+
+	/* check if file exists and is readable */
+	if (((*mpq_archive)->fp = fopen(mpq_filename, "rb")) == NULL) {
+
+		/* file could not be opened. */
+		result = LIBMPQ_ERROR_OPEN;
+		goto error;
+	}
+
+	/* assign some default values. */
+	(*mpq_archive)->mpq_header.mpq_magic = 0;
+	(*mpq_archive)->files                = 0;
+
+	/* loop through file and search for mpq signature. */
+	while (TRUE) {
+
+		/* reset header values. */
+		(*mpq_archive)->mpq_header.mpq_magic = 0;
+
+		/* seek in file. */
+		if (fseeko((*mpq_archive)->fp, archive_offset, SEEK_SET) < 0) {
+
+			/* seek in file failed. */
+			result = LIBMPQ_ERROR_SEEK;
+			goto error;
+		}
+
+		/* read header from file. */
+		if ((rb = fread(&(*mpq_archive)->mpq_header, 1, sizeof(mpq_header_s), (*mpq_archive)->fp)) != sizeof(mpq_header_s)) {
+
+			/* no valid mpq archive. */
+			result = LIBMPQ_ERROR_FORMAT;
+			goto error;
+		}
+
+		/* check if we found a valid mpq header. */
+		if ((*mpq_archive)->mpq_header.mpq_magic == LIBMPQ_HEADER) {
+
+			/* check if we process old mpq archive version. */
+			if ((*mpq_archive)->mpq_header.version == LIBMPQ_ARCHIVE_VERSION_ONE) {
+
+				/* check if the archive is protected. */
+				if ((*mpq_archive)->mpq_header.header_size != sizeof(mpq_header_s)) {
+
+					/* correct header size. */
+					(*mpq_archive)->mpq_header.header_size = sizeof(mpq_header_s);
+				}
+			}
+
+			/* check if we process new mpq archive version. */
+			if ((*mpq_archive)->mpq_header.version == LIBMPQ_ARCHIVE_VERSION_TWO) {
+
+				/* check if the archive is protected. */
+				if ((*mpq_archive)->mpq_header.header_size != sizeof(mpq_header_s) + sizeof(mpq_header_ex_s)) {
+
+					/* correct header size. */
+					(*mpq_archive)->mpq_header.header_size = sizeof(mpq_header_s) + sizeof(mpq_header_ex_s);
+				}
+			}
+
+			/* break the loop, because header was found. */
+			break;
+		}
+
+		/* move to the next possible offset. */
+		if (!header_search) {
+
+			/* no valid mpq archive. */
+			result = LIBMPQ_ERROR_FORMAT;
+			goto error;
+		}
+		archive_offset += 512;
+	}
+
+	/* store block size for later use. */
+	(*mpq_archive)->block_size = 512 << (*mpq_archive)->mpq_header.block_size;
+
+	/* store archive offset and size for later use. */
+	(*mpq_archive)->archive_offset = (off_t)archive_offset;
+
+	/* check if we process new mpq archive version. */
+	if ((*mpq_archive)->mpq_header.version == LIBMPQ_ARCHIVE_VERSION_TWO) {
+
+		/* seek in file. */
+		if (fseeko((*mpq_archive)->fp, sizeof(mpq_header_s) + archive_offset, SEEK_SET) < 0) {
+
+			/* seek in file failed. */
+			result = LIBMPQ_ERROR_SEEK;
+			goto error;
+		}
+
+		/* read header from file. */
+		if ((rb = fread(&(*mpq_archive)->mpq_header_ex, 1, sizeof(mpq_header_ex_s), (*mpq_archive)->fp)) != sizeof(mpq_header_ex_s)) {
+
+			/* no valid mpq archive. */
+			result = LIBMPQ_ERROR_FORMAT;
+			goto error;
+		}
+	}
+
+	/* allocate memory for the block table, hash table, file and block table to file mapping. */
+	if (((*mpq_archive)->mpq_block    = calloc((*mpq_archive)->mpq_header.block_table_count, sizeof(mpq_block_s))) == NULL ||
+	    ((*mpq_archive)->mpq_block_ex = calloc((*mpq_archive)->mpq_header.block_table_count, sizeof(mpq_block_ex_s))) == NULL ||
+	    ((*mpq_archive)->mpq_hash     = calloc((*mpq_archive)->mpq_header.hash_table_count,  sizeof(mpq_hash_s))) == NULL ||
+	    ((*mpq_archive)->mpq_file     = calloc((*mpq_archive)->mpq_header.block_table_count, sizeof(mpq_file_s))) == NULL ||
+	    ((*mpq_archive)->mpq_map      = calloc((*mpq_archive)->mpq_header.block_table_count, sizeof(mpq_map_s))) == NULL) {
+
+		/* memory allocation problem. */
+		result = LIBMPQ_ERROR_MALLOC;
+		goto error;
+	}
+
+	/* seek in file. */
+	if (fseeko((*mpq_archive)->fp, (*mpq_archive)->mpq_header.hash_table_offset + (((long long)((*mpq_archive)->mpq_header_ex.hash_table_offset_high)) << 32) + (*mpq_archive)->archive_offset, SEEK_SET) < 0) {
+
+		/* seek in file failed. */
+		result = LIBMPQ_ERROR_SEEK;
+		goto error;
+	}
+
+	/* read the hash table into the buffer. */
+	if ((rb = fread((*mpq_archive)->mpq_hash, 1, (*mpq_archive)->mpq_header.hash_table_count * sizeof(mpq_hash_s), (*mpq_archive)->fp)) < 0) {
+
+		/* something on read failed. */
+		result = LIBMPQ_ERROR_READ;
+		goto error;
+	}
+
+	/* decrypt the hashtable. */
+	libmpq__decrypt_block((uint32_t *)((*mpq_archive)->mpq_hash), (*mpq_archive)->mpq_header.hash_table_count * sizeof(mpq_hash_s), libmpq__hash_string("(hash table)", 0x300));
+
+	/* seek in file. */
+	if (fseeko((*mpq_archive)->fp, (*mpq_archive)->mpq_header.block_table_offset + (((long long)((*mpq_archive)->mpq_header_ex.block_table_offset_high)) << 32) + (*mpq_archive)->archive_offset, SEEK_SET) < 0) {
+
+		/* seek in file failed. */
+		result = LIBMPQ_ERROR_SEEK;
+		goto error;
+	}
+
+	/* read the block table into the buffer. */
+	if ((rb = fread((*mpq_archive)->mpq_block, 1, (*mpq_archive)->mpq_header.block_table_count * sizeof(mpq_block_s), (*mpq_archive)->fp)) < 0) {
+
+		/* something on read failed. */
+		result = LIBMPQ_ERROR_READ;
+		goto error;
+	}
+
+	/* decrypt block table. */
+	libmpq__decrypt_block((uint32_t *)((*mpq_archive)->mpq_block), (*mpq_archive)->mpq_header.block_table_count * sizeof(mpq_block_s), libmpq__hash_string("(block table)", 0x300));
+
+	/* check if extended block table is present, regardless of version 2 it is only present in archives > 4GB. */
+	if ((*mpq_archive)->mpq_header_ex.extended_offset > 0) {
+
+		/* seek in file. */
+		if (fseeko((*mpq_archive)->fp, (*mpq_archive)->mpq_header_ex.extended_offset + archive_offset, SEEK_SET) < 0) {
+
+			/* seek in file failed. */
+			result = LIBMPQ_ERROR_SEEK;
+			goto error;
+		}
+
+		/* read header from file. */
+		if ((rb = fread((*mpq_archive)->mpq_block_ex, 1, (*mpq_archive)->mpq_header.block_table_count * sizeof(mpq_block_ex_s), (*mpq_archive)->fp)) < 0) {
+
+			/* no valid mpq archive. */
+			result = LIBMPQ_ERROR_FORMAT;
+			goto error;
+		}
+	}
+
+	/* loop through all files in mpq archive and check if they are valid. */
+	for (i = 0; i < (*mpq_archive)->mpq_header.block_table_count; i++) {
+
+		/* save block difference between valid and invalid blocks. */
+		(*mpq_archive)->mpq_map[i].block_table_diff = i - count;
+
+		/* check if file exists, sizes and offsets are correct. */
+		if (((*mpq_archive)->mpq_block[i].flags & LIBMPQ_FLAG_EXISTS) == 0) {
+
+			/* file does not exist, so nothing to do with that block. */
+			continue;
+		}
+
+		/* create final indices tables. */
+		(*mpq_archive)->mpq_map[count].block_table_indices = i;
+
+		/* increase file counter. */
+		count++;
+	}
+
+	/* save the number of files. */
+	(*mpq_archive)->files = count;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+
+error:
+	if ((*mpq_archive)->fp)
+		fclose((*mpq_archive)->fp);
+
+	free((*mpq_archive)->mpq_map);
+	free((*mpq_archive)->mpq_file);
+	free((*mpq_archive)->mpq_hash);
+	free((*mpq_archive)->mpq_block);
+	free((*mpq_archive)->mpq_block_ex);
+	free(*mpq_archive);
+
+	*mpq_archive = NULL;
+
+	return result;
+}
+
+/* this function close the file descriptor, free the decryption buffer and the file list. */
+int32_t libmpq__archive_close(mpq_archive_s *mpq_archive) {
+
+	/* try to close the file */
+	if ((fclose(mpq_archive->fp)) < 0) {
+
+		/* don't free anything here, so the caller can try calling us
+		 * again.
+		 */
+		return LIBMPQ_ERROR_CLOSE;
+	}
+
+	/* free header, tables and list. */
+	free(mpq_archive->mpq_map);
+	free(mpq_archive->mpq_file);
+	free(mpq_archive->mpq_hash);
+	free(mpq_archive->mpq_block);
+	free(mpq_archive->mpq_block_ex);
+	free(mpq_archive);
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the packed size of all files in the archive. */
+int32_t libmpq__archive_packed_size(mpq_archive_s *mpq_archive, libmpq__off_t *packed_size) {
+
+	/* some common variables. */
+	uint32_t i;
+
+	/* loop through all files in archive and count packed size. */
+	for (i = 0; i < mpq_archive->files; i++) {
+		*packed_size += mpq_archive->mpq_block[mpq_archive->mpq_map[i].block_table_indices].packed_size;
+	}
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the unpacked size of all files in the archive. */
+int32_t libmpq__archive_unpacked_size(mpq_archive_s *mpq_archive, libmpq__off_t *unpacked_size) {
+
+	/* some common variables. */
+	uint32_t i;
+
+	/* loop through all files in archive and count unpacked size. */
+	for (i = 0; i < mpq_archive->files; i++) {
+		*unpacked_size += mpq_archive->mpq_block[mpq_archive->mpq_map[i].block_table_indices].unpacked_size;
+	}
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the archive offset (beginning of archive in file). */
+int32_t libmpq__archive_offset(mpq_archive_s *mpq_archive, libmpq__off_t *offset) {
+
+	/* return archive offset. */
+	*offset = mpq_archive->archive_offset;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the archive offset. */
+int32_t libmpq__archive_version(mpq_archive_s *mpq_archive, uint32_t *version) {
+
+	/* return archive version. */
+	*version = mpq_archive->mpq_header.version + 1;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the number of valid files in archive. */
+int32_t libmpq__archive_files(mpq_archive_s *mpq_archive, uint32_t *files) {
+
+	/* return archive version. */
+	*files = mpq_archive->files;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+#define CHECK_FILE_NUM(file_number, mpq_archive) \
+	if (file_number < 0 || file_number > mpq_archive->files - 1) { \
+		return LIBMPQ_ERROR_EXIST; \
+	}
+
+#define CHECK_BLOCK_NUM(block_number, mpq_archive) \
+	if (block_number < 0 || block_number >= ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) != 0 ? 1 : (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size)) { \
+		return LIBMPQ_ERROR_EXIST; \
+	}
+
+/* this function return the packed size of the given files in the archive. */
+int32_t libmpq__file_packed_size(mpq_archive_s *mpq_archive, uint32_t file_number, libmpq__off_t *packed_size) {
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	/* get the packed size of file. */
+	*packed_size = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].packed_size;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the unpacked size of the given file in the archive. */
+int32_t libmpq__file_unpacked_size(mpq_archive_s *mpq_archive, uint32_t file_number, libmpq__off_t *unpacked_size) {
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	/* get the unpacked size of file. */
+	*unpacked_size = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the file offset (beginning of file in archive). */
+int32_t libmpq__file_offset(mpq_archive_s *mpq_archive, uint32_t file_number, libmpq__off_t *offset) {
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	/* return file offset relative to archive start. */
+	*offset = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].offset + (((long long)mpq_archive->mpq_block_ex[mpq_archive->mpq_map[file_number].block_table_indices].offset_high) << 32);
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the number of blocks for the given file in the archive. */
+int32_t libmpq__file_blocks(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *blocks) {
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	/* return the number of blocks for the given file. */
+	*blocks = (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) != 0 ? 1 : (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return if the file is encrypted or not. */
+int32_t libmpq__file_encrypted(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *encrypted) {
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	/* return the encryption status of file. */
+	*encrypted = (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_ENCRYPTED) != 0 ? TRUE : FALSE;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return if the file is compressed or not. */
+int32_t libmpq__file_compressed(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *compressed) {
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	/* return the compression status of file. */
+	*compressed = (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_COMPRESS_MULTI) != 0 ? TRUE : FALSE;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return if the file is imploded or not. */
+int32_t libmpq__file_imploded(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *imploded) {
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	/* return the implosion status of file. */
+	*imploded = (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_COMPRESS_PKZIP) != 0 ? TRUE : FALSE;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return filenumber by the given name. */
+int32_t libmpq__file_number(mpq_archive_s *mpq_archive, const char *filename, uint32_t *number) {
+
+	/* some common variables. */
+	uint32_t i, hash1, hash2, hash3, ht_count;
+
+	/* if the list of file names doesn't include this one, we'll have
+	 * to figure out the file number the "hard" way.
+	 */
+	ht_count = mpq_archive->mpq_header.hash_table_count;
+
+	hash1 = libmpq__hash_string (filename, 0x0) & (ht_count - 1);
+	hash2 = libmpq__hash_string (filename, 0x100);
+	hash3 = libmpq__hash_string (filename, 0x200);
+
+	/* loop through all files in mpq archive.
+	 * hash1 gives us a clue about the starting position of this
+	 * search.
+	 */
+	for (i = hash1; mpq_archive->mpq_hash[i].block_table_index != LIBMPQ_HASH_FREE; i = (i + 1) & (ht_count - 1)) {
+
+		/* if the other two hashes match, we found our file number. */
+		if (mpq_archive->mpq_hash[i].hash_a == hash2 &&
+		    mpq_archive->mpq_hash[i].hash_b == hash3) {
+
+			/* return the file number. */
+			*number = mpq_archive->mpq_hash[i].block_table_index - mpq_archive->mpq_map[mpq_archive->mpq_hash[i].block_table_index].block_table_diff;
+
+			/* we found our file, return zero. */
+			return LIBMPQ_SUCCESS;
+		}
+
+		/* check if we have cycled through the whole hash table */
+		if (((i + 1) & (ht_count - 1)) == hash1) {
+			break;
+		}
+	}
+
+	/* if no matching entry found, so return error. */
+	return LIBMPQ_ERROR_EXIST;
+}
+
+/* this function read the given file from archive into a buffer. */
+int32_t libmpq__file_read(mpq_archive_s *mpq_archive, uint32_t file_number, uint8_t *out_buf, libmpq__off_t out_size, libmpq__off_t *transferred) {
+
+	/* some common variables. */
+	uint32_t i;
+	uint32_t blocks         = 0;
+	int32_t result          = 0;
+	libmpq__off_t file_offset       = 0;
+	libmpq__off_t unpacked_size     = 0;
+	libmpq__off_t transferred_block = 0;
+	libmpq__off_t transferred_total = 0;
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	/* get target size of block. */
+	libmpq__file_unpacked_size(mpq_archive, file_number, &unpacked_size);
+
+	/* check if target buffer is to small. */
+	if (unpacked_size > out_size) {
+
+		/* output buffer size is to small or block size is unknown. */
+		return LIBMPQ_ERROR_SIZE;
+	}
+
+	/* fetch file offset. */
+	libmpq__file_offset(mpq_archive, file_number, &file_offset);
+
+	/* get block count for file. */
+	libmpq__file_blocks(mpq_archive, file_number, &blocks);
+
+	/* open the packed block offset table. */
+	if ((result = libmpq__block_open_offset(mpq_archive, file_number)) < 0) {
+
+		/* something on opening packed block offset table failed. */
+		return result;
+	}
+
+	/* loop through all blocks. */
+	for (i = 0; i < blocks; i++) {
+
+		/* cleanup size variable. */
+		unpacked_size = 0;
+
+		/* get unpacked block size. */
+		libmpq__block_unpacked_size(mpq_archive, file_number, i, &unpacked_size);
+
+		/* read block. */
+		if ((result = libmpq__block_read(mpq_archive, file_number, i, out_buf + transferred_total, unpacked_size, &transferred_block)) < 0) {
+
+			/* close the packed block offset table. */
+			libmpq__block_close_offset(mpq_archive, file_number);
+
+			/* something on reading block failed. */
+			return result;
+		}
+
+		transferred_total += transferred_block;
+
+	}
+
+	/* close the packed block offset table. */
+	libmpq__block_close_offset(mpq_archive, file_number);
+
+	/* check for null pointer. */
+	if (transferred != NULL) {
+
+		/* store transferred bytes. */
+		*transferred = transferred_total;
+	}
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function open a file in the given archive and caches the block offset information. */
+int32_t libmpq__block_open_offset(mpq_archive_s *mpq_archive, uint32_t file_number) {
+
+	/* some common variables. */
+	uint32_t i;
+	uint32_t packed_size;
+	int32_t rb     = 0;
+	int32_t result = 0;
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	if (mpq_archive->mpq_file[file_number]) {
+
+		/* file already opened, so increment counter */
+		mpq_archive->mpq_file[file_number]->open_count++;
+		return LIBMPQ_SUCCESS;
+	}
+
+	/* check if file is not stored in a single sector. */
+	if ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) == 0) {
+
+		/* get packed size based on block size and block count. */
+		packed_size = sizeof(uint32_t) * (((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size) + 1);
+	} else {
+
+		/* file is stored in single sector and we need only two entries for the packed block offset table. */
+		packed_size = sizeof(uint32_t) * 2;
+	}
+
+	/* check if data has one extra entry. */
+	if ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_EXTRA) != 0) {
+
+		/* add one uint32_t. */
+		packed_size += sizeof(uint32_t);
+	}
+
+	/* allocate memory for the file. */
+	if ((mpq_archive->mpq_file[file_number] = calloc(1, sizeof(mpq_file_s))) == NULL) {
+
+		/* memory allocation problem. */
+		result = LIBMPQ_ERROR_MALLOC;
+		goto error;
+	}
+
+	/* allocate memory for the packed block offset table. */
+	if ((mpq_archive->mpq_file[file_number]->packed_offset = calloc(1, packed_size)) == NULL) {
+
+		/* memory allocation problem. */
+		result = LIBMPQ_ERROR_MALLOC;
+		goto error;
+	}
+
+	/* initialize counter to one opening */
+	mpq_archive->mpq_file[file_number]->open_count = 1;
+
+	/* check if we need to load the packed block offset table, we will maintain this table for unpacked files too. */
+	if ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_COMPRESSED) != 0 &&
+	    (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) == 0) {
+
+		/* seek to block position. */
+		if (fseeko(mpq_archive->fp, mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].offset + (((long long)mpq_archive->mpq_block_ex[mpq_archive->mpq_map[file_number].block_table_indices].offset_high) << 32) + mpq_archive->archive_offset, SEEK_SET) < 0) {
+
+			/* seek in file failed. */
+			result = LIBMPQ_ERROR_SEEK;
+			goto error;
+		}
+
+		/* read block positions from begin of file. */
+		if ((rb = fread(mpq_archive->mpq_file[file_number]->packed_offset, 1, packed_size, mpq_archive->fp)) < 0) {
+
+			/* something on read from archive failed. */
+			result = LIBMPQ_ERROR_READ;
+			goto error;
+		}
+
+		/* check if the archive is protected some way, sometimes the file appears not to be encrypted, but it is.
+		 * a special case are files with an additional sector but LIBMPQ_FLAG_CRC not set. we don't want to handle
+		 * them as encrypted. */
+		if (mpq_archive->mpq_file[file_number]->packed_offset[0] != rb &&
+		    mpq_archive->mpq_file[file_number]->packed_offset[0] != rb + 4) {
+
+			/* file is encrypted. */
+			mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags |= LIBMPQ_FLAG_ENCRYPTED;
+		}
+
+		/* check if packed offset block is encrypted, we have to decrypt it. */
+		if (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_ENCRYPTED) {
+
+			/* check if we don't know the file seed, try to find it. */
+			if (libmpq__decrypt_key((uint8_t *)mpq_archive->mpq_file[file_number]->packed_offset, packed_size, mpq_archive->block_size, &mpq_archive->mpq_file[file_number]->seed) < 0) {
+
+				/* sorry without seed, we cannot extract file. */
+				result = LIBMPQ_ERROR_DECRYPT;
+				goto error;
+			}
+
+			/* decrypt block in input buffer. */
+			if (libmpq__decrypt_block(mpq_archive->mpq_file[file_number]->packed_offset, packed_size, mpq_archive->mpq_file[file_number]->seed - 1) < 0 ) {
+
+				/* something on decrypt failed. */
+				result = LIBMPQ_ERROR_DECRYPT;
+				goto error;
+			}
+
+			/* check if the block positions are correctly decrypted. */
+			if (mpq_archive->mpq_file[file_number]->packed_offset[0] != packed_size) {
+
+				/* sorry without seed, we cannot extract file. */
+				result = LIBMPQ_ERROR_DECRYPT;
+				goto error;
+			}
+		}
+	} else {
+
+		/* check if file is not stored in a single sector. */
+		if ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) == 0) {
+
+			/* loop through all blocks and create packed block offset table based on block size. */
+			for (i = 0; i < ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size + 1); i++) {
+
+				/* check if we process the last block. */
+				if (i == ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size)) {
+
+					/* store size of last block. */
+					mpq_archive->mpq_file[file_number]->packed_offset[i] = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size;
+				} else {
+
+					/* store default block size. */
+					mpq_archive->mpq_file[file_number]->packed_offset[i] = i * mpq_archive->block_size;
+				}
+			}
+		} else {
+
+			/* store offsets. */
+			mpq_archive->mpq_file[file_number]->packed_offset[0] = 0;
+			mpq_archive->mpq_file[file_number]->packed_offset[1] = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].packed_size;
+		}
+	}
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+
+error:
+
+	/* free packed block offset table and file pointer. */
+	free(mpq_archive->mpq_file[file_number]->packed_offset);
+	free(mpq_archive->mpq_file[file_number]);
+
+	/* return error constant. */
+	return result;
+}
+
+/* this function free the file pointer to the opened file in archive. */
+int32_t libmpq__block_close_offset(mpq_archive_s *mpq_archive, uint32_t file_number) {
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	if (mpq_archive->mpq_file[file_number] == NULL) {
+
+		/* packed block offset table is not opened. */
+		return LIBMPQ_ERROR_OPEN;
+	}
+
+	mpq_archive->mpq_file[file_number]->open_count--;
+
+	if (mpq_archive->mpq_file[file_number]->open_count != 0) {
+
+		/* still in use */
+		return LIBMPQ_SUCCESS;
+	}
+
+	/* free packed block offset table and file pointer. */
+	free(mpq_archive->mpq_file[file_number]->packed_offset);
+	free(mpq_archive->mpq_file[file_number]);
+
+	/* mark it as unopened - libmpq__block_open_offset checks for this to decide whether to increment the counter */
+	mpq_archive->mpq_file[file_number] = NULL;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the unpacked size of the given file and block in the archive. */
+int32_t libmpq__block_unpacked_size(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t block_number, libmpq__off_t *unpacked_size) {
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	/* check if given block number is not out of range. */
+	CHECK_BLOCK_NUM(block_number, mpq_archive)
+
+	/* check if packed block offset table is opened. */
+	if (mpq_archive->mpq_file[file_number] == NULL ||
+	    mpq_archive->mpq_file[file_number]->packed_offset == NULL) {
+
+		/* packed block offset table is not opened. */
+		return LIBMPQ_ERROR_OPEN;
+	}
+
+	/* check if block is stored as single sector. */
+	if ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) != 0) {
+
+		/* return the unpacked size of the block in the mpq archive. */
+		*unpacked_size = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size;
+	}
+
+	/* check if block is not stored as single sector. */
+	if ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) == 0) {
+
+		/* check if we not process the last block. */
+		if (block_number < ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size) - 1) {
+
+			/* return the block size as unpacked size. */
+			*unpacked_size = mpq_archive->block_size;
+		} else {
+
+			/* return the unpacked size of the last block in the mpq archive. */
+			*unpacked_size = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size - mpq_archive->block_size * block_number;
+		}
+	}
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the decryption seed for the given file and block. */
+int32_t libmpq__block_seed(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t block_number, uint32_t *seed) {
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	/* check if given block number is not out of range. */
+	CHECK_BLOCK_NUM(block_number, mpq_archive)
+
+	/* check if packed block offset table is opened. */
+	if (mpq_archive->mpq_file[file_number] == NULL ||
+	    mpq_archive->mpq_file[file_number]->packed_offset == NULL) {
+
+		/* packed block offset table is not opened. */
+		return LIBMPQ_ERROR_OPEN;
+	}
+
+	/* return the decryption key. */
+	*seed = mpq_archive->mpq_file[file_number]->seed + block_number;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function read the given block from archive into a buffer. */
+int32_t libmpq__block_read(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t block_number, uint8_t *out_buf, libmpq__off_t out_size, libmpq__off_t *transferred) {
+
+	/* some common variables. */
+	uint8_t *in_buf;
+	uint32_t seed       = 0;
+	uint32_t encrypted  = 0;
+	uint32_t compressed = 0;
+	uint32_t imploded   = 0;
+	int32_t tb          = 0;
+	libmpq__off_t block_offset  = 0;
+	off_t in_size       = 0;
+	libmpq__off_t unpacked_size = 0;
+
+	/* check if given file number is not out of range. */
+	CHECK_FILE_NUM(file_number, mpq_archive)
+
+	/* check if given block number is not out of range. */
+	CHECK_BLOCK_NUM(block_number, mpq_archive)
+
+	/* check if packed block offset table is opened. */
+	if (mpq_archive->mpq_file[file_number] == NULL ||
+	    mpq_archive->mpq_file[file_number]->packed_offset == NULL) {
+
+		/* packed block offset table is not opened. */
+		return LIBMPQ_ERROR_OPEN;
+	}
+
+	/* get target size of block. */
+	libmpq__block_unpacked_size(mpq_archive, file_number, block_number, &unpacked_size);
+
+	/* check if target buffer is to small. */
+	if (unpacked_size > out_size) {
+
+		/* output buffer size is to small or block size is unknown. */
+		return LIBMPQ_ERROR_SIZE;
+	}
+
+	/* fetch some required values like input buffer size and block offset. */
+	block_offset = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].offset + (((long long)mpq_archive->mpq_block_ex[mpq_archive->mpq_map[file_number].block_table_indices].offset_high) << 32) + mpq_archive->mpq_file[file_number]->packed_offset[block_number];
+	in_size = mpq_archive->mpq_file[file_number]->packed_offset[block_number + 1] - mpq_archive->mpq_file[file_number]->packed_offset[block_number];
+
+	/* seek in file. */
+	if (fseeko(mpq_archive->fp, block_offset + mpq_archive->archive_offset, SEEK_SET) < 0) {
+
+		/* something with seek in file failed. */
+		return LIBMPQ_ERROR_SEEK;
+	}
+
+	/* allocate memory for the read buffer. */
+	if ((in_buf = calloc(1, in_size)) == NULL) {
+
+		/* memory allocation problem. */
+		return LIBMPQ_ERROR_MALLOC;
+	}
+
+	/* read block from file. */
+	if (fread(in_buf, 1, in_size, mpq_archive->fp) < 0) {
+
+		/* free buffers. */
+		free(in_buf);
+
+		/* something on reading block failed. */
+		return LIBMPQ_ERROR_READ;
+	}
+
+	/* get encryption status. */
+	libmpq__file_encrypted(mpq_archive, file_number, &encrypted);
+
+	/* check if file is encrypted. */
+	if (encrypted == 1) {
+
+		/* get decryption key. */
+		libmpq__block_seed(mpq_archive, file_number, block_number, &seed);
+
+		/* decrypt block. */
+		if (libmpq__decrypt_block((uint32_t *)in_buf, in_size, seed) < 0) {
+
+			/* free buffers. */
+			free(in_buf);
+
+			/* something on decrypting block failed. */
+			return LIBMPQ_ERROR_DECRYPT;
+		}
+	}
+
+	/* get compression status. */
+	libmpq__file_compressed(mpq_archive, file_number, &compressed);
+
+	/* check if file is compressed. */
+	if (compressed == 1) {
+
+		/* decompress block. */
+		if ((tb = libmpq__decompress_block(in_buf, in_size, out_buf, (uint32_t)out_size, LIBMPQ_FLAG_COMPRESS_MULTI)) < 0) {
+
+			/* free temporary buffer. */
+			free(in_buf);
+
+			/* something on decompressing block failed. */
+			return LIBMPQ_ERROR_UNPACK;
+		}
+	}
+
+	/* get implosion status. */
+	libmpq__file_imploded(mpq_archive, file_number, &imploded);
+
+	/* check if file is imploded. */
+	if (imploded == 1) {
+
+		/* explode block. */
+		if ((tb = libmpq__decompress_block(in_buf, in_size, out_buf, (uint32_t)out_size, LIBMPQ_FLAG_COMPRESS_PKZIP)) < 0) {
+
+			/* free temporary buffer. */
+			free(in_buf);
+
+			/* something on decompressing block failed. */
+			return LIBMPQ_ERROR_UNPACK;
+		}
+	}
+
+	/* check if file is neither compressed nor imploded. */
+	if (compressed == 0 && imploded == 0) {
+
+		/* copy block. */
+		if ((tb = libmpq__decompress_block(in_buf, in_size, out_buf, (uint32_t)out_size, LIBMPQ_FLAG_COMPRESS_NONE)) < 0) {
+
+			/* free temporary buffer. */
+			free(in_buf);
+
+			/* something on decompressing block failed. */
+			return LIBMPQ_ERROR_UNPACK;
+		}
+	}
+
+	/* free read buffer. */
+	free(in_buf);
+
+	/* check for null pointer. */
+	if (transferred != NULL) {
+
+		/* store transferred bytes. */
+		*transferred = tb;
+	}
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
diff --git a/dep/libmpq/libmpq/mpq.h b/dep/libmpq/libmpq/mpq.h
new file mode 100644
index 000000000..91ba22a58
--- /dev/null
+++ b/dep/libmpq/libmpq/mpq.h
@@ -0,0 +1,101 @@
+/*
+ *  mpq.h -- some default types and defines.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  Some parts (the encryption and decryption stuff) were adapted from
+ *  the C++ version of StormLib.h and StormPort.h included in stormlib.
+ *  The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula <ladik@zezula.net>
+ *  Marko Friedemann <marko.friedemann@bmx-chemnitz.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _MPQ_H
+#define _MPQ_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* generic includes. */
+#include <stdint.h>
+#include <sys/types.h>
+
+#if defined(__GNUC__) && (__GNUC__ >= 4)
+# define LIBMPQ_API __attribute__((visibility("default")))
+#else
+# define LIBMPQ_API
+#endif
+
+/* define errors. */
+#define LIBMPQ_ERROR_OPEN            -1        /* open error on file. */
+#define LIBMPQ_ERROR_CLOSE            -2        /* close error on file. */
+#define LIBMPQ_ERROR_SEEK            -3        /* lseek error on file. */
+#define LIBMPQ_ERROR_READ            -4        /* read error on file. */
+#define LIBMPQ_ERROR_WRITE            -5        /* write error on file. */
+#define LIBMPQ_ERROR_MALLOC            -6        /* memory allocation error. */
+#define LIBMPQ_ERROR_FORMAT            -7        /* format errror. */
+#define LIBMPQ_ERROR_NOT_INITIALIZED        -8        /* libmpq__init() wasn't called. */
+#define LIBMPQ_ERROR_SIZE            -9        /* buffer size is to small. */
+#define LIBMPQ_ERROR_EXIST            -10        /* file or block does not exist in archive. */
+#define LIBMPQ_ERROR_DECRYPT            -11        /* we don't know the decryption seed. */
+#define LIBMPQ_ERROR_UNPACK            -12        /* error on unpacking file. */
+
+/* internal data structure. */
+typedef struct mpq_archive mpq_archive_s;
+
+/* file offset data type for API*/
+typedef int64_t libmpq__off_t;
+
+/* generic information about library. */
+extern LIBMPQ_API const char *libmpq__version(void);
+
+/* string error message for a libmpq return code. */
+extern LIBMPQ_API const char *libmpq__strerror(int32_t returncode);
+
+/* generic mpq archive information. */
+extern LIBMPQ_API int32_t libmpq__archive_open(mpq_archive_s **mpq_archive, const char *mpq_filename, libmpq__off_t archive_offset);
+extern LIBMPQ_API int32_t libmpq__archive_close(mpq_archive_s *mpq_archive);
+extern LIBMPQ_API int32_t libmpq__archive_packed_size(mpq_archive_s *mpq_archive, libmpq__off_t *packed_size);
+extern LIBMPQ_API int32_t libmpq__archive_unpacked_size(mpq_archive_s *mpq_archive, libmpq__off_t *unpacked_size);
+extern LIBMPQ_API int32_t libmpq__archive_offset(mpq_archive_s *mpq_archive, libmpq__off_t *offset);
+extern LIBMPQ_API int32_t libmpq__archive_version(mpq_archive_s *mpq_archive, uint32_t *version);
+extern LIBMPQ_API int32_t libmpq__archive_files(mpq_archive_s *mpq_archive, uint32_t *files);
+
+/* generic file processing functions. */
+extern LIBMPQ_API int32_t libmpq__file_packed_size(mpq_archive_s *mpq_archive, uint32_t file_number, libmpq__off_t *packed_size);
+extern LIBMPQ_API int32_t libmpq__file_unpacked_size(mpq_archive_s *mpq_archive, uint32_t file_number, libmpq__off_t *unpacked_size);
+extern LIBMPQ_API int32_t libmpq__file_offset(mpq_archive_s *mpq_archive, uint32_t file_number, libmpq__off_t *offset);
+extern LIBMPQ_API int32_t libmpq__file_blocks(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *blocks);
+extern LIBMPQ_API int32_t libmpq__file_encrypted(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *encrypted);
+extern LIBMPQ_API int32_t libmpq__file_compressed(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *compressed);
+extern LIBMPQ_API int32_t libmpq__file_imploded(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *imploded);
+extern LIBMPQ_API int32_t libmpq__file_number(mpq_archive_s *mpq_archive, const char *filename, uint32_t *number);
+extern LIBMPQ_API int32_t libmpq__file_read(mpq_archive_s *mpq_archive, uint32_t file_number, uint8_t *out_buf, libmpq__off_t out_size, libmpq__off_t *transferred);
+
+/* generic block processing functions. */
+extern LIBMPQ_API int32_t libmpq__block_open_offset(mpq_archive_s *mpq_archive, uint32_t file_number);
+extern LIBMPQ_API int32_t libmpq__block_close_offset(mpq_archive_s *mpq_archive, uint32_t file_number);
+extern LIBMPQ_API int32_t libmpq__block_unpacked_size(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t block_number, libmpq__off_t *unpacked_size);
+extern LIBMPQ_API int32_t libmpq__block_read(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t block_number, uint8_t *out_buf, libmpq__off_t out_size, libmpq__off_t *transferred);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif                        /* _MPQ_H */
diff --git a/dep/libmpq/libmpq/pack_begin.h.txt b/dep/libmpq/libmpq/pack_begin.h.txt
new file mode 100644
index 000000000..d7be494cc
--- /dev/null
+++ b/dep/libmpq/libmpq/pack_begin.h.txt
@@ -0,0 +1,36 @@
+/*
+ *  pack_begin.h -- header file for struct packing used by libmpq.
+ *
+ *  Copyright (c) 2010 Georg Lukas <georg@op-co.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _PACK_BEGIN
+    #define _PACK_BEGIN
+#else
+    #error "pack_begin.h may not be included twice!"
+#endif
+
+#ifdef _MSC_VER
+    #error "We should not be using these now"
+    #pragma pack(push,1)
+    #define PACK_STRUCT
+#else
+    #error "We should not be using these now"
+    /* we assume GNU here */
+    #define PACK_STRUCT __attribute__((packed))
+#endif
+
diff --git a/dep/libmpq/libmpq/pack_end.h.txt b/dep/libmpq/libmpq/pack_end.h.txt
new file mode 100644
index 000000000..ac4665e8f
--- /dev/null
+++ b/dep/libmpq/libmpq/pack_end.h.txt
@@ -0,0 +1,32 @@
+/*
+ *  pack_end.h -- header file for struct packing used by libmpq.
+ *
+ *  Copyright (c) 2010 Georg Lukas <georg@op-co.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef _PACK_BEGIN
+    #undef _PACK_BEGIN
+#else
+    #error "pack_begin.h must be includede before pack_end.h"
+#endif
+
+#ifdef _MSC_VER
+#error "We should not be using these now"
+#pragma pack(pop)
+#endif
+
+#undef PACK_STRUCT
diff --git a/dep/libmpq/libmpq/platform.h b/dep/libmpq/libmpq/platform.h
new file mode 100644
index 000000000..18dd808e2
--- /dev/null
+++ b/dep/libmpq/libmpq/platform.h
@@ -0,0 +1,28 @@
+/*
+ *  platform.h -- header file for platform specific parts.
+ *
+ *  Copyright (c) 2010 Georg Lukas <georg@op-co.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _PLATFORM_H
+#define _PLATFORM_H
+
+#ifdef _MSC_VER
+    #define fseeko _fseeki64
+#endif
+
+#endif                              /* _PLATFORM_H */
diff --git a/dep/libmpq/libmpq/wave.c b/dep/libmpq/libmpq/wave.c
new file mode 100644
index 000000000..628593fce
--- /dev/null
+++ b/dep/libmpq/libmpq/wave.c
@@ -0,0 +1,250 @@
+/*
+ *  wave.c -- this file contains decompression methods used by mpq-tools
+ *            to decompress wave files.
+ *
+ *  Copyright (c) 2003-2007 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  This source was adepted from the C++ version of wave.cpp included
+ *  in stormlib. The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula <ladik@zezula.net>
+ *  Tom Amigo <tomamigo@apexmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* generic includes. */
+#include <stdint.h>
+
+/* libmpq generic includes. */
+#include "wave.h"
+
+/* table necessary dor decompression. */
+static const uint32_t wave_table_1503f120[] = {
+	0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000006,
+	0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
+	0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,  
+	0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008  
+};
+
+/* table necessary dor decompression. */
+static const uint32_t wave_table_1503f1a0[] = {
+	0x00000007, 0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E,
+	0x00000010, 0x00000011, 0x00000013, 0x00000015, 0x00000017, 0x00000019, 0x0000001C, 0x0000001F,
+	0x00000022, 0x00000025, 0x00000029, 0x0000002D, 0x00000032, 0x00000037, 0x0000003C, 0x00000042,
+	0x00000049, 0x00000050, 0x00000058, 0x00000061, 0x0000006B, 0x00000076, 0x00000082, 0x0000008F,
+	0x0000009D, 0x000000AD, 0x000000BE, 0x000000D1, 0x000000E6, 0x000000FD, 0x00000117, 0x00000133,
+	0x00000151, 0x00000173, 0x00000198, 0x000001C1, 0x000001EE, 0x00000220, 0x00000256, 0x00000292,
+	0x000002D4, 0x0000031C, 0x0000036C, 0x000003C3, 0x00000424, 0x0000048E, 0x00000502, 0x00000583,
+	0x00000610, 0x000006AB, 0x00000756, 0x00000812, 0x000008E0, 0x000009C3, 0x00000ABD, 0x00000BD0,
+	0x00000CFF, 0x00000E4C, 0x00000FBA, 0x0000114C, 0x00001307, 0x000014EE, 0x00001706, 0x00001954,
+	0x00001BDC, 0x00001EA5, 0x000021B6, 0x00002515, 0x000028CA, 0x00002CDF, 0x0000315B, 0x0000364B,
+	0x00003BB9, 0x000041B2, 0x00004844, 0x00004F7E, 0x00005771, 0x0000602F, 0x000069CE, 0x00007462,
+	0x00007FFF
+};
+
+/* this function decompress a wave file, mono or stereo, 1500F230 offset. */
+int32_t libmpq__do_decompress_wave(uint8_t *out_buf, int32_t out_length, uint8_t *in_buf, int32_t in_length, int32_t channels) {
+
+	/* some common variables. */
+	byte_and_int16_t out;
+	byte_and_int16_t in;
+	uint32_t index;
+	int32_t nr_array1[2];
+	int32_t nr_array2[2];
+	int32_t count = 0;
+
+	/* end on input buffer. */
+	uint8_t *in_end = in_buf + in_length;
+
+	/* assign default values. */
+	out.pb       = out_buf;
+	in.pb        = in_buf;
+	nr_array1[0] = 0x2C;
+	nr_array1[1] = 0x2C;
+
+	/* increase. */
+	in.pw++;
+
+	/* 15007AD7 */
+	for (count = 0; count < channels; count++) {
+
+		/* some common variables. */
+		int32_t temp;
+
+		/* save pointer. */
+		temp = *(int16_t *)in.pw++;
+		nr_array2[count] = temp;
+
+		/* check if should break. */
+		if (out_length < 2) {
+			return out.pb - out_buf;
+		}
+
+		/* return values. */
+		*out.pw++   = (uint16_t)temp;
+		out_length -= 2;
+	}
+
+	/* decrease channels. */
+	index = channels - 1;
+
+	/* loop through input buffer until end reached. */
+	while (in.pb < in_end) {
+
+		/* save the byte. */
+		uint8_t one_byte = *in.pb++;
+
+		/* check how many channels and set index. */
+		if (channels == 2) {
+			index = (index == 0) ? 1 : 0;
+		}
+
+		/* 15007B25 - get one byte from input buffer. */
+		if (one_byte & 0x80) {
+
+			/* 15007B32 */
+			switch (one_byte & 0x7F) {
+				case 0:
+
+					/* 15007B8E */
+					if (nr_array1[index] != 0) {
+						nr_array1[index]--;
+					}
+
+					/* check if should break. */
+					if (out_length < 2) {
+						break;
+					}
+
+					/* return values. */
+					*out.pw++ = (uint16_t)nr_array2[index];
+					out_length -= 2;
+
+					/* continue loop. */
+					continue;
+				case 1:
+					/* 15007B72 and EBX. */
+					nr_array1[index] += 8;
+
+					/* check index. */
+					if (nr_array1[index] > 0x58) {
+						nr_array1[index] = 0x58;
+					}
+
+					/* check how many channels and set index. */
+					if (channels == 2) {
+						index = (index == 0) ? 1 : 0;
+					}
+
+					/* continue loop. */
+					continue;
+				case 2:
+
+					/* nothing todo, so continue. */
+					continue;
+				default:
+
+					/* decrease index. */
+					nr_array1[index] -= 8;
+
+					/* check index. */
+					if (nr_array1[index] < 0) {
+						nr_array1[index] = 0;
+					}
+
+					/* check if two channels left. */
+					if (channels != 2) {
+						continue;
+					}
+					index = (index == 0) ? 1 : 0;
+
+					/* continue loop. */
+					continue;
+			}
+		} else {
+
+			/* EDI */
+			uint32_t temp1 = wave_table_1503f1a0[nr_array1[index]];
+
+			/* ESI */
+			uint32_t temp2 = temp1 >> in_buf[1];
+
+			/* ECX */
+			int32_t temp3 = nr_array2[index];
+
+			/* EBX = one byte. */
+			if (one_byte & 0x01) {
+				temp2 += (temp1 >> 0);
+			}
+			if (one_byte & 0x02) {
+				temp2 += (temp1 >> 1);
+			}
+			if (one_byte & 0x04) {
+				temp2 += (temp1 >> 2);
+			}
+			if (one_byte & 0x08) {
+				temp2 += (temp1 >> 3);
+			}
+			if (one_byte & 0x10) {
+				temp2 += (temp1 >> 4);
+			}
+			if (one_byte & 0x20) {
+				temp2 += (temp1 >> 5);
+			}
+			if (one_byte & 0x40) {
+				temp3 -= temp2;
+				if (temp3 <= (int32_t)0xFFFF8000) {
+					temp3 = (int32_t)0xFFFF8000;
+				}
+			} else {
+				temp3 += temp2;
+				if (temp3 >= 0x7FFF) {
+					temp3 = 0x7FFF;
+				}
+			}
+
+			/* restore index. */
+			nr_array2[index] = temp3;
+
+			/* check if should break. */
+			if (out_length < 2) {
+				break;
+			}
+
+			/* assign values. */
+			temp2             = nr_array1[index];
+			one_byte         &= 0x1F;
+			*out.pw++         = (uint16_t)temp3;
+			out_length       -= 2;
+			temp2            += wave_table_1503f120[one_byte];
+			nr_array1[index]  = temp2;
+
+			/* check index. */
+			if (nr_array1[index] < 0) {
+				nr_array1[index] = 0;
+			} else {
+
+				/* check index. */
+				if (nr_array1[index] > 0x58) {
+					nr_array1[index] = 0x58;
+				}
+			}
+		}
+	}
+
+	/* return copied bytes. */
+	return (out.pb - out_buf);
+}
diff --git a/dep/libmpq/libmpq/wave.h b/dep/libmpq/libmpq/wave.h
new file mode 100644
index 000000000..7e45254b7
--- /dev/null
+++ b/dep/libmpq/libmpq/wave.h
@@ -0,0 +1,46 @@
+/*
+ *  wave.h -- header file for wav unplode functions used by mpq-tools.
+ *
+ *  Copyright (c) 2003-2007 Maik Broemme <mbroemme@plusserver.de>
+ *
+ *  This source was adepted from the C++ version of wave.h included
+ *  in stormlib. The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula <ladik.zezula.net>
+ *  Tom Amigo <tomamigo@apexmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _WAVE_H
+#define _WAVE_H
+
+/* buffer. */
+typedef union
+{
+    uint16_t    *pw;
+    uint8_t     *pb;
+} byte_and_int16_t;
+
+/* decompress a wave file, mono or stereo, 1500F230 offset. */
+int32_t libmpq__do_decompress_wave(
+    uint8_t     *out_buf,
+    int32_t     out_length,
+    uint8_t     *in_buf,
+    int32_t     in_length,
+    int32_t     channels
+);
+
+#endif                      /* _WAVE_H */
diff --git a/dep/libmpq/tools/Makefile.am b/dep/libmpq/tools/Makefile.am
new file mode 100644
index 000000000..607205379
--- /dev/null
+++ b/dep/libmpq/tools/Makefile.am
@@ -0,0 +1,8 @@
+# minimum required automake 1.6
+AUTOMAKE_OPTIONS		= 1.6
+
+# the main programs.
+bin_PROGRAMS			= crypt_buf_gen
+
+# sources for crypt_buf_gen program.
+crypt_buf_gen_SOURCES		= crypt_buf_gen.c
diff --git a/dep/libmpq/tools/crypt_buf_gen.c b/dep/libmpq/tools/crypt_buf_gen.c
new file mode 100644
index 000000000..3d150fc66
--- /dev/null
+++ b/dep/libmpq/tools/crypt_buf_gen.c
@@ -0,0 +1,85 @@
+/*
+ *  crypt_buf_gen.c -- tool to re-create the static decryption buffer.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme <mbroemme@plusserver.de>
+ *  Copyright (c)      2008 Georg Lukas <georg@op-co.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ *  Usage:
+ *  $ make crypt_buf_gen
+ *  $ ./crypt_buf_gen > crypt_buf.h
+ *
+ */
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+static uint32_t *buffer;
+
+int32_t libmpq__buffer_init() {
+	buffer = malloc(sizeof(uint32_t) * 0x500);
+
+	if (!buffer)
+		return -1;
+
+	/* some common variables. */
+	uint32_t seed   = 0x00100001;
+	uint32_t index1 = 0;
+	uint32_t index2 = 0;
+	uint32_t i;
+
+	/* initialize the decryption buffer. */
+	for (index1 = 0; index1 < 0x100; index1++) {
+		for(index2 = index1, i = 0; i < 5; i++, index2 += 0x100) {
+
+			/* some common variables. */
+			uint32_t temp1, temp2;
+
+			/* temporary copy. */
+			seed  = (seed * 125 + 3) % 0x2AAAAB;
+			temp1 = (seed & 0xFFFF) << 0x10;
+
+			/* temporary copy. */
+			seed  = (seed * 125 + 3) % 0x2AAAAB;
+			temp2 = (seed & 0xFFFF);
+
+			/* assign buffer. */
+			buffer[index2] = (temp1 | temp2);
+		}
+	}
+
+	/* if no error was found, return zero. */
+	return 0;
+}
+
+int main() {
+	if (libmpq__buffer_init() != 0)
+		perror("libmpq__buffer_init()");
+	int x;
+	printf("/* DO NOT CHANGE! this file is auto-generated by crypt_buf_gen.c */\n");
+	printf("static const uint32_t crypt_buf[0x500] = {\n\t");
+	for (x = 0; x < 0x500; x++) {
+		printf("0x%08x", buffer[x]);
+		if (x < 0x500 - 1) {
+			if (x % 6 == 5)
+				printf(",\n\t");
+			else
+				printf(", ");
+		}
+	}
+	printf("\n};\n");
+}
diff --git a/dep/libmpq/win/.gitignore b/dep/libmpq/win/.gitignore
new file mode 100644
index 000000000..6fd3935c7
--- /dev/null
+++ b/dep/libmpq/win/.gitignore
@@ -0,0 +1,5 @@
+
+*.sdf
+*.suo
+bin
+ipch
\ No newline at end of file
diff --git a/dep/libmpq/win/VC100/.gitignore b/dep/libmpq/win/VC100/.gitignore
new file mode 100644
index 000000000..4fb7be5e4
--- /dev/null
+++ b/dep/libmpq/win/VC100/.gitignore
@@ -0,0 +1,2 @@
+
+*.user
\ No newline at end of file
diff --git a/dep/libmpq/win/VC100/libmpq.vcxproj b/dep/libmpq/win/VC100/libmpq.vcxproj
new file mode 100644
index 000000000..d20ec144f
--- /dev/null
+++ b/dep/libmpq/win/VC100/libmpq.vcxproj
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>libmpq</ProjectName>
+    <ProjectGuid>{03AB0F44-628E-4855-99A0-C98A1EB52C50}</ProjectGuid>
+    <RootNamespace>libmpq</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\libmpq\common.c" />
+    <ClCompile Include="..\..\libmpq\explode.c" />
+    <ClCompile Include="..\..\libmpq\extract.c" />
+    <ClCompile Include="..\..\libmpq\huffman.c" />
+    <ClCompile Include="..\..\libmpq\mpq.c" />
+    <ClCompile Include="..\..\libmpq\wave.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\libmpq\common.h" />
+    <ClInclude Include="..\..\libmpq\crypt_buf.h" />
+    <ClInclude Include="..\..\libmpq\explode.h" />
+    <ClInclude Include="..\..\libmpq\extract.h" />
+    <ClInclude Include="..\..\libmpq\huffman.h" />
+    <ClInclude Include="..\..\libmpq\mpq-internal.h" />
+    <ClInclude Include="..\..\libmpq\mpq.h" />
+    <ClInclude Include="..\..\libmpq\wave.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\win\VC100\bzip2.vcxproj">
+      <Project>{b96f612a-c91d-43b3-a4c3-d4294817ec6c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\win\VC100\zlib.vcxproj">
+      <Project>{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/dep/libmpq/win/VC110/.gitignore b/dep/libmpq/win/VC110/.gitignore
new file mode 100644
index 000000000..4fb7be5e4
--- /dev/null
+++ b/dep/libmpq/win/VC110/.gitignore
@@ -0,0 +1,2 @@
+
+*.user
\ No newline at end of file
diff --git a/dep/libmpq/win/VC110/libmpq.vcxproj b/dep/libmpq/win/VC110/libmpq.vcxproj
new file mode 100644
index 000000000..b06cfab42
--- /dev/null
+++ b/dep/libmpq/win/VC110/libmpq.vcxproj
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>libmpq</ProjectName>
+    <ProjectGuid>{03AB0F44-628E-4855-99A0-C98A1EB52C50}</ProjectGuid>
+    <RootNamespace>libmpq</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\libmpq\common.c" />
+    <ClCompile Include="..\..\libmpq\explode.c" />
+    <ClCompile Include="..\..\libmpq\extract.c" />
+    <ClCompile Include="..\..\libmpq\huffman.c" />
+    <ClCompile Include="..\..\libmpq\mpq.c" />
+    <ClCompile Include="..\..\libmpq\wave.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\libmpq\common.h" />
+    <ClInclude Include="..\..\libmpq\crypt_buf.h" />
+    <ClInclude Include="..\..\libmpq\explode.h" />
+    <ClInclude Include="..\..\libmpq\extract.h" />
+    <ClInclude Include="..\..\libmpq\huffman.h" />
+    <ClInclude Include="..\..\libmpq\mpq-internal.h" />
+    <ClInclude Include="..\..\libmpq\mpq.h" />
+    <ClInclude Include="..\..\libmpq\wave.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\win\VC110\bzip2.vcxproj">
+      <Project>{b96f612a-c91d-43b3-a4c3-d4294817ec6c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\win\VC110\zlib.vcxproj">
+      <Project>{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/dep/libmpq/win/VC120/.gitignore b/dep/libmpq/win/VC120/.gitignore
new file mode 100644
index 000000000..4fb7be5e4
--- /dev/null
+++ b/dep/libmpq/win/VC120/.gitignore
@@ -0,0 +1,2 @@
+
+*.user
\ No newline at end of file
diff --git a/dep/libmpq/win/VC120/libmpq.vcxproj b/dep/libmpq/win/VC120/libmpq.vcxproj
new file mode 100644
index 000000000..6318216c4
--- /dev/null
+++ b/dep/libmpq/win/VC120/libmpq.vcxproj
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>libmpq</ProjectName>
+    <ProjectGuid>{03AB0F44-628E-4855-99A0-C98A1EB52C50}</ProjectGuid>
+    <RootNamespace>libmpq</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\$(ProjectName)__$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\; ..\..\..\..\dep\include\zlib; ..\..\..\..\dep\include\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalLibraryDirectories>..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\libmpq\common.c" />
+    <ClCompile Include="..\..\libmpq\explode.c" />
+    <ClCompile Include="..\..\libmpq\extract.c" />
+    <ClCompile Include="..\..\libmpq\huffman.c" />
+    <ClCompile Include="..\..\libmpq\mpq.c" />
+    <ClCompile Include="..\..\libmpq\wave.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\libmpq\common.h" />
+    <ClInclude Include="..\..\libmpq\crypt_buf.h" />
+    <ClInclude Include="..\..\libmpq\explode.h" />
+    <ClInclude Include="..\..\libmpq\extract.h" />
+    <ClInclude Include="..\..\libmpq\huffman.h" />
+    <ClInclude Include="..\..\libmpq\mpq-internal.h" />
+    <ClInclude Include="..\..\libmpq\mpq.h" />
+    <ClInclude Include="..\..\libmpq\wave.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\win\VC120\bzip2.vcxproj">
+      <Project>{b96f612a-c91d-43b3-a4c3-d4294817ec6c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\win\VC120\zlib.vcxproj">
+      <Project>{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/dep/libmpq/win/dirent.h b/dep/libmpq/win/dirent.h
new file mode 100644
index 000000000..642517409
--- /dev/null
+++ b/dep/libmpq/win/dirent.h
@@ -0,0 +1,230 @@
+/*****************************************************************************
+ * dirent.h - dirent API for Microsoft Visual Studio
+ *
+ * Copyright (C) 2006 Toni Ronkko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * ``Software''), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Dec 15, 2009, John Cunningham
+ * Added rewinddir member function
+ *
+ * Jan 18, 2008, Toni Ronkko
+ * Using FindFirstFileA and WIN32_FIND_DATAA to avoid converting string
+ * between multi-byte and unicode representations.  This makes the
+ * code simpler and also allows the code to be compiled under MingW.  Thanks
+ * to Azriel Fasten for the suggestion.
+ *
+ * Mar 4, 2007, Toni Ronkko
+ * Bug fix: due to the strncpy_s() function this file only compiled in
+ * Visual Studio 2005.  Using the new string functions only when the
+ * compiler version allows.
+ *
+ * Nov  2, 2006, Toni Ronkko
+ * Major update: removed support for Watcom C, MS-DOS and Turbo C to
+ * simplify the file, updated the code to compile cleanly on Visual
+ * Studio 2005 with both unicode and multi-byte character strings,
+ * removed rewinddir() as it had a bug.
+ *
+ * Aug 20, 2006, Toni Ronkko
+ * Removed all remarks about MSVC 1.0, which is antiqued now.  Simplified
+ * comments by removing SGML tags.
+ *
+ * May 14 2002, Toni Ronkko
+ * Embedded the function definitions directly to the header so that no
+ * source modules need to be included in the Visual Studio project.  Removed
+ * all the dependencies to other projects so that this very header can be
+ * used independently.
+ *
+ * May 28 1998, Toni Ronkko
+ * First version.
+ *****************************************************************************/
+#ifndef DIRENT_H
+#define DIRENT_H
+
+#include <windows.h>
+#include <string.h>
+#include <assert.h>
+
+
+typedef struct dirent
+{
+   char d_name[MAX_PATH + 1]; /* current dir entry (multi-byte char string) */
+   WIN32_FIND_DATAA data;     /* file attributes */
+}  dirent;
+
+
+typedef struct DIR
+{
+   dirent current;            /* Current directory entry */
+   int    cached;             /* Indicates un-processed entry in memory */
+   HANDLE search_handle;      /* File search handle */
+   char   patt[MAX_PATH + 3]; /* search pattern (3 = pattern + "\\*\0") */
+} DIR;
+
+
+/* Forward declarations */
+static DIR *opendir (const char *dirname);
+static struct dirent *readdir (DIR *dirp);
+static int closedir (DIR *dirp);
+static void rewinddir(DIR* dirp);
+
+
+/* Use the new safe string functions introduced in Visual Studio 2005 */
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+# define STRNCPY(dest,src,size) strncpy_s((dest),(size),(src),_TRUNCATE)
+#else
+# define STRNCPY(dest,src,size) strncpy((dest),(src),(size))
+#endif
+
+
+/*****************************************************************************
+ * Open directory stream DIRNAME for read and return a pointer to the
+ * internal working area that is used to retrieve individual directory
+ * entries.
+ */
+static DIR *opendir(const char *dirname)
+{
+   DIR *dirp;
+   assert (dirname != NULL);
+   assert (strlen (dirname) < MAX_PATH);
+
+   /* construct new DIR structure */
+   dirp = (DIR*) malloc (sizeof (struct DIR));
+   if (dirp != NULL) {
+      char *p;
+
+      /* take directory name... */
+      STRNCPY (dirp->patt, dirname, sizeof(dirp->patt));
+      dirp->patt[MAX_PATH] = '\0';
+
+      /* ... and append search pattern to it */
+      p = strchr (dirp->patt, '\0');
+      if (dirp->patt < p  &&  *(p-1) != '\\'  &&  *(p-1) != ':') {
+         *p++ = '\\';
+      }
+      *p++ = '*';
+      *p = '\0';
+
+      /* open stream and retrieve first file */
+      dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->current.data);
+      if (dirp->search_handle == INVALID_HANDLE_VALUE) {
+         /* invalid search pattern? */
+         free (dirp);
+         return NULL;
+      }
+
+      /* there is an un-processed directory entry in memory now */
+      dirp->cached = 1;
+   }
+
+   return dirp;
+}
+
+
+/*****************************************************************************
+ * Read a directory entry, and return a pointer to a dirent structure
+ * containing the name of the entry in d_name field.  Individual directory
+ * entries returned by this very function include regular files,
+ * sub-directories, pseudo-directories "." and "..", but also volume labels,
+ * hidden files and system files may be returned.
+ */
+static struct dirent *readdir(DIR *dirp)
+{
+   assert (dirp != NULL);
+
+   if (dirp->search_handle == INVALID_HANDLE_VALUE) {
+      /* directory stream was opened/rewound incorrectly or ended normally */
+      return NULL;
+   }
+
+   /* get next directory entry */
+   if (dirp->cached != 0) {
+      /* a valid directory entry already in memory */
+      dirp->cached = 0;
+   } else {
+      /* read next directory entry from disk */
+      if (FindNextFileA (dirp->search_handle, &dirp->current.data) == FALSE) {
+         /* the very last file has been processed or an error occured */
+         FindClose (dirp->search_handle);
+         dirp->search_handle = INVALID_HANDLE_VALUE;
+         return NULL;
+      }
+   }
+
+   /* copy as a multibyte character string */
+   STRNCPY ( dirp->current.d_name,
+             dirp->current.data.cFileName,
+             sizeof(dirp->current.d_name) );
+   dirp->current.d_name[MAX_PATH] = '\0';
+
+   return &dirp->current;
+}
+
+
+/*****************************************************************************
+ * Close directory stream opened by opendir() function.  Close of the
+ * directory stream invalidates the DIR structure as well as any previously
+ * read directory entry.
+ */
+static int closedir(DIR *dirp)
+{
+   assert (dirp != NULL);
+
+   /* release search handle */
+   if (dirp->search_handle != INVALID_HANDLE_VALUE) {
+      FindClose (dirp->search_handle);
+      dirp->search_handle = INVALID_HANDLE_VALUE;
+   }
+
+   /* release directory handle */
+   free (dirp);
+   return 0;
+}
+
+
+/*****************************************************************************
+ * Resets the position of the directory stream to which dirp refers to the
+ * beginning of the directory. It also causes the directory stream to refer
+ * to the current state of the corresponding directory, as a call to opendir()
+ * would have done. If dirp does not refer to a directory stream, the effect
+ * is undefined.
+ */
+static void rewinddir(DIR* dirp)
+{
+   /* release search handle */
+   if (dirp->search_handle != INVALID_HANDLE_VALUE) {
+      FindClose (dirp->search_handle);
+      dirp->search_handle = INVALID_HANDLE_VALUE;
+   }
+
+   /* open new search handle and retrieve first file */
+   dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->current.data);
+   if (dirp->search_handle == INVALID_HANDLE_VALUE) {
+      /* invalid search pattern? */
+      free (dirp);
+      return;
+   }
+
+   /* there is an un-processed directory entry in memory now */
+   dirp->cached = 1;
+}
+
+
+#endif /*DIRENT_H*/
diff --git a/dep/libmpq/win/libmpq_VC100.sln b/dep/libmpq/win/libmpq_VC100.sln
new file mode 100644
index 000000000..3baae4776
--- /dev/null
+++ b/dep/libmpq/win/libmpq_VC100.sln
@@ -0,0 +1,31 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpq", "VC100\libmpq.vcxproj", "{03AB0F44-628E-4855-99A0-C98A1EB52C50}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC100\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\..\win\VC100\bzip2.vcxproj", "{B96F612A-C91D-43B3-A4C3-D4294817EC6C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.ActiveCfg = Debug|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.Build.0 = Debug|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.ActiveCfg = Release|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.Build.0 = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.Build.0 = Debug|Win32
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.ActiveCfg = Release|Win32
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/libmpq/win/libmpq_VC110.sln b/dep/libmpq/win/libmpq_VC110.sln
new file mode 100644
index 000000000..8f7080dec
--- /dev/null
+++ b/dep/libmpq/win/libmpq_VC110.sln
@@ -0,0 +1,31 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpq", "VC110\libmpq.vcxproj", "{03AB0F44-628E-4855-99A0-C98A1EB52C50}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC110\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\..\win\VC110\bzip2.vcxproj", "{B96F612A-C91D-43B3-A4C3-D4294817EC6C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.ActiveCfg = Debug|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.Build.0 = Debug|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.ActiveCfg = Release|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.Build.0 = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.Build.0 = Debug|Win32
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.ActiveCfg = Release|Win32
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/libmpq/win/libmpq_VC120.sln b/dep/libmpq/win/libmpq_VC120.sln
new file mode 100644
index 000000000..549220186
--- /dev/null
+++ b/dep/libmpq/win/libmpq_VC120.sln
@@ -0,0 +1,47 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpq", "VC120\libmpq.vcxproj", "{03AB0F44-628E-4855-99A0-C98A1EB52C50}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC120\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\..\win\VC120\bzip2.vcxproj", "{B96F612A-C91D-43B3-A4C3-D4294817EC6C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.ActiveCfg = Debug|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.Build.0 = Debug|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|x64.ActiveCfg = Debug|x64
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|x64.Build.0 = Debug|x64
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.ActiveCfg = Release|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.Build.0 = Release|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|x64.ActiveCfg = Release|x64
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|x64.Build.0 = Release|x64
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.Build.0 = Debug|Win32
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|x64.ActiveCfg = Debug|x64
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|x64.Build.0 = Debug|x64
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.ActiveCfg = Release|Win32
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.Build.0 = Release|Win32
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|x64.ActiveCfg = Release|x64
+		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/dep/libmpq/win/stdint.h b/dep/libmpq/win/stdint.h
new file mode 100644
index 000000000..d02608a59
--- /dev/null
+++ b/dep/libmpq/win/stdint.h
@@ -0,0 +1,247 @@
+// ISO C9x  compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006-2008 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
+// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#ifdef __cplusplus
+extern "C" {
+#endif
+#  include <wchar.h>
+#ifdef __cplusplus
+}
+#endif
+
+// Define _W64 macros to mark types changing their size, like intptr_t.
+#ifndef _W64
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#     define _W64 __w64
+#  else
+#     define _W64
+#  endif
+#endif
+
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+
+// Visual Studio 6 and Embedded Visual C++ 4 doesn't
+// realize that, e.g. char has the same size as __int8
+// so we give up on __intX for them.
+#if (_MSC_VER < 1300)
+   typedef signed char       int8_t;
+   typedef signed short      int16_t;
+   typedef signed int        int32_t;
+   typedef unsigned char     uint8_t;
+   typedef unsigned short    uint16_t;
+   typedef unsigned int      uint32_t;
+#else
+   typedef signed __int8     int8_t;
+   typedef signed __int16    int16_t;
+   typedef signed __int32    int32_t;
+   typedef unsigned __int8   uint8_t;
+   typedef unsigned __int16  uint16_t;
+   typedef unsigned __int32  uint32_t;
+#endif
+typedef signed __int64       int64_t;
+typedef unsigned __int64     uint64_t;
+
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+typedef int64_t   int_least64_t;
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+typedef uint64_t  uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+typedef int64_t   int_fast64_t;
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+typedef uint64_t  uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+   typedef signed __int64    intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#else // _WIN64 ][
+   typedef _W64 signed int   intptr_t;
+   typedef _W64 unsigned int uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#define UINT64_MAX   _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+#  define INTPTR_MIN   INT64_MIN
+#  define INTPTR_MAX   INT64_MAX
+#  define UINTPTR_MAX  UINT64_MAX
+#else // _WIN64 ][
+#  define INTPTR_MIN   INT32_MIN
+#  define INTPTR_MAX   INT32_MAX
+#  define UINTPTR_MAX  UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+#  define PTRDIFF_MIN  _I64_MIN
+#  define PTRDIFF_MAX  _I64_MAX
+#else  // _WIN64 ][
+#  define PTRDIFF_MIN  _I32_MIN
+#  define PTRDIFF_MAX  _I32_MAX
+#endif  // _WIN64 ]
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX // [
+#  ifdef _WIN64 // [
+#     define SIZE_MAX  _UI64_MAX
+#  else // _WIN64 ][
+#     define SIZE_MAX  _UI32_MAX
+#  endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+#  define WCHAR_MIN  0
+#endif  // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+#  define WCHAR_MAX  _UI16_MAX
+#endif  // WCHAR_MAX ]
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+#define INTMAX_C   INT64_C
+#define UINTMAX_C  UINT64_C
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+
+#endif // _MSC_STDINT_H_ ]
diff --git a/dep/loadlib/CMakeLists.txt b/dep/loadlib/CMakeLists.txt
new file mode 100644
index 000000000..345315fb0
--- /dev/null
+++ b/dep/loadlib/CMakeLists.txt
@@ -0,0 +1,15 @@
+# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+include_directories (${CMAKE_SOURCE_DIR}/dep/StormLib/src)
+
+add_library (loadlib loadlib.cpp  adt.cpp  wdt.cpp mpqfile.cpp)
+# link loadlib with zlib
+target_link_libraries (loadlib zlib)
diff --git a/dep/loadlib/adt.cpp b/dep/loadlib/adt.cpp
new file mode 100644
index 000000000..5cac7db32
--- /dev/null
+++ b/dep/loadlib/adt.cpp
@@ -0,0 +1,153 @@
+/**
+ * MaNGOS is a full featured server for World of Warcraft, supporting
+ * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+ *
+ * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "adt.h"
+
+// Helper
+int holetab_h[4] = {0x1111, 0x2222, 0x4444, 0x8888};
+int holetab_v[4] = {0x000F, 0x00F0, 0x0F00, 0xF000};
+
+bool isHole(int holes, int i, int j)
+{
+    int testi = i / 2;
+    int testj = j / 4;
+    if (testi > 3) { testi = 3; }
+    if (testj > 3) { testj = 3; }
+    return (holes & holetab_h[testi] & holetab_v[testj]) != 0;
+}
+
+//
+// Adt file loader class
+//
+ADT_file::ADT_file()
+{
+    a_grid = 0;
+}
+
+ADT_file::~ADT_file()
+{
+    free();
+}
+
+void ADT_file::free()
+{
+    a_grid = 0;
+    FileLoader::free();
+}
+
+//
+// Adt file check function
+//
+bool ADT_file::prepareLoadedData()
+{
+    // Check parent
+    if (!FileLoader::prepareLoadedData())
+        { return false; }
+
+    // Check and prepare MHDR
+    a_grid = (adt_MHDR*)(GetData() + 8 + version->size);
+    if (!a_grid->prepareLoadedData())
+        { return false; }
+
+    return true;
+}
+
+bool adt_MHDR::prepareLoadedData()
+{
+    if (fcc != 'MHDR')
+        { return false; }
+
+    if (size != sizeof(adt_MHDR) - 8)
+        { return false; }
+
+    // Check and prepare MCIN
+    if (offsMCIN && !getMCIN()->prepareLoadedData())
+        { return false; }
+
+    // Check and prepare MH2O
+    if (offsMH2O && !getMH2O()->prepareLoadedData())
+        { return false; }
+
+    return true;
+}
+
+bool adt_MCIN::prepareLoadedData()
+{
+    if (fcc != 'MCIN')
+        { return false; }
+
+    // Check cells data
+    for (int i = 0; i < ADT_CELLS_PER_GRID; i++)
+        for (int j = 0; j < ADT_CELLS_PER_GRID; j++)
+            if (cells[i][j].offsMCNK && !getMCNK(i, j)->prepareLoadedData())
+                { return false; }
+
+    return true;
+}
+
+bool adt_MH2O::prepareLoadedData()
+{
+    if (fcc != 'MH2O')
+        { return false; }
+
+    // Check liquid data
+//    for (int i=0; i<ADT_CELLS_PER_GRID;i++)
+//        for (int j=0; j<ADT_CELLS_PER_GRID;j++)
+
+    return true;
+}
+
+bool adt_MCNK::prepareLoadedData()
+{
+    if (fcc != 'MCNK')
+        { return false; }
+
+    // Check height map
+    if (offsMCVT && !getMCVT()->prepareLoadedData())
+        { return false; }
+    // Check liquid data
+    if (offsMCLQ && !getMCLQ()->prepareLoadedData())
+        { return false; }
+
+    return true;
+}
+
+bool adt_MCVT::prepareLoadedData()
+{
+    if (fcc != 'MCVT')
+        { return false; }
+
+    if (size != sizeof(adt_MCVT) - 8)
+        { return false; }
+
+    return true;
+}
+
+bool adt_MCLQ::prepareLoadedData()
+{
+    if (fcc != 'MCLQ')
+        { return false; }
+
+    return true;
+}
diff --git a/dep/loadlib/adt.h b/dep/loadlib/adt.h
new file mode 100644
index 000000000..95fc4a34e
--- /dev/null
+++ b/dep/loadlib/adt.h
@@ -0,0 +1,493 @@
+/**
+ * MaNGOS is a full featured server for World of Warcraft, supporting
+ * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+ *
+ * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef ADT_H
+#define ADT_H
+
+#include "loadlib.h"
+
+#define TILESIZE (533.33333f)
+#define CHUNKSIZE ((TILESIZE) / 16.0f)
+#define UNITSIZE (CHUNKSIZE / 8.0f)
+
+/**
+ * @brief
+ *
+ */
+enum LiquidType
+{
+    LIQUID_TYPE_MAGMA = 0,
+    LIQUID_TYPE_OCEAN = 1,
+    LIQUID_TYPE_SLIME = 2,
+    LIQUID_TYPE_WATER = 3
+};
+
+//**************************************************************************************
+// ADT file class
+//**************************************************************************************
+#define ADT_CELLS_PER_GRID    16
+#define ADT_CELL_SIZE         8
+#define ADT_GRID_SIZE         (ADT_CELLS_PER_GRID*ADT_CELL_SIZE)
+
+/**
+ * @brief Adt file height map chunk
+ *
+ */
+class adt_MCVT
+{
+        /**
+         * @brief
+         *
+         */
+        union
+        {
+            uint32 fcc; /**< TODO */
+            char   fcc_txt[4]; /**< TODO */
+        };
+        uint32 size; /**< TODO */
+    public:
+        float height_map[(ADT_CELL_SIZE + 1) * (ADT_CELL_SIZE + 1) + ADT_CELL_SIZE* ADT_CELL_SIZE]; /**< TODO */
+
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool  prepareLoadedData();
+};
+
+/**
+ * @brief Adt file liquid map chunk (old)
+ *
+ */
+class adt_MCLQ
+{
+        /**
+         * @brief
+         *
+         */
+        union
+        {
+            uint32 fcc; /**< TODO */
+            char   fcc_txt[4]; /**< TODO */
+        };
+        uint32 size; /**< TODO */
+    public:
+        float height1; /**< TODO */
+        float height2; /**< TODO */
+        /**
+         * @brief
+         *
+         */
+        struct liquid_data
+        {
+            uint32 light; /**< TODO */
+            float  height; /**< TODO */
+        } liquid[ADT_CELL_SIZE + 1][ADT_CELL_SIZE + 1]; /**< TODO */
+
+        // 1<<0 - ochen
+        // 1<<1 - lava/slime
+        // 1<<2 - water
+        // 1<<6 - all water
+        // 1<<7 - dark water
+        // == 0x0F - not show liquid
+        uint8 flags[ADT_CELL_SIZE][ADT_CELL_SIZE]; /**< TODO */
+        uint8 data[84]; /**< TODO */
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool  prepareLoadedData();
+};
+
+/**
+ * @brief Adt file cell chunk
+ *
+ */
+class adt_MCNK
+{
+        /**
+         * @brief
+         *
+         */
+        union
+        {
+            uint32 fcc; /**< TODO */
+            char   fcc_txt[4]; /**< TODO */
+        };
+        uint32 size; /**< TODO */
+    public:
+        uint32 flags; /**< TODO */
+        uint32 ix; /**< TODO */
+        uint32 iy; /**< TODO */
+        uint32 nLayers; /**< TODO */
+        uint32 nDoodadRefs; /**< TODO */
+        uint32 offsMCVT;        /**< height map */
+        uint32 offsMCNR;        /**< Normal vectors for each vertex */
+        uint32 offsMCLY;        /**< Texture layer definitions */
+        uint32 offsMCRF;        /**< A list of indices into the parent file's MDDF chunk */
+        uint32 offsMCAL;        /**< Alpha maps for additional texture layers */
+        uint32 sizeMCAL; /**< TODO */
+        uint32 offsMCSH;        /**< Shadow map for static shadows on the terrain */
+        uint32 sizeMCSH; /**< TODO */
+        uint32 areaid; /**< TODO */
+        uint32 nMapObjRefs; /**< TODO */
+        uint16 holes;           /**< locations where models pierce the heightmap */
+        uint16 pad; /**< TODO */
+        uint16 s[2]; /**< TODO */
+        uint32 data1; /**< TODO */
+        uint32 data2; /**< TODO */
+        uint32 data3; /**< TODO */
+        uint32 predTex; /**< TODO */
+        uint32 nEffectDoodad; /**< TODO */
+        uint32 offsMCSE; /**< TODO */
+        uint32 nSndEmitters; /**< TODO */
+        uint32 offsMCLQ;         /**< Liqid level (old) */
+        uint32 sizeMCLQ;         /**< TODO */
+        float  zpos; /**< TODO */
+        float  xpos; /**< TODO */
+        float  ypos; /**< TODO */
+        uint32 offsMCCV;         /**< offsColorValues in WotLK */
+        uint32 props; /**< TODO */
+        uint32 effectId; /**< TODO */
+
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool   prepareLoadedData();
+        /**
+         * @brief
+         *
+         * @return adt_MCVT
+         */
+        adt_MCVT* getMCVT()
+        {
+            if (offsMCVT)
+                { return (adt_MCVT*)((uint8*)this + offsMCVT); }
+            return 0;
+        }
+        /**
+         * @brief
+         *
+         * @return adt_MCLQ
+         */
+        adt_MCLQ* getMCLQ()
+        {
+            if (offsMCLQ)
+                { return (adt_MCLQ*)((uint8*)this + offsMCLQ); }
+            return 0;
+        }
+};
+
+/**
+ * @brief Adt file grid chunk
+ *
+ */
+class adt_MCIN
+{
+        /**
+         * @brief
+         *
+         */
+        union
+        {
+            uint32 fcc; /**< TODO */
+            char   fcc_txt[4]; /**< TODO */
+        };
+        uint32 size; /**< TODO */
+    public:
+        /**
+         * @brief
+         *
+         */
+        struct adt_CELLS
+        {
+            uint32 offsMCNK; /**< TODO */
+            uint32 size; /**< TODO */
+            uint32 flags; /**< TODO */
+            uint32 asyncId; /**< TODO */
+        } cells[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID]; /**< TODO */
+
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool   prepareLoadedData();
+        /**
+         * @brief offset from begin file (used this-84)
+         *
+         * @param x
+         * @param y
+         * @return adt_MCNK
+         */
+        adt_MCNK* getMCNK(int x, int y)
+        {
+            if (cells[x][y].offsMCNK)
+                { return (adt_MCNK*)((uint8*)this + cells[x][y].offsMCNK - 84); }
+            return 0;
+        }
+};
+
+#define ADT_LIQUID_HEADER_FULL_LIGHT   0x01
+#define ADT_LIQUID_HEADER_NO_HIGHT     0x02
+
+/**
+ * @brief
+ *
+ */
+struct adt_liquid_header
+{
+    uint16 liquidType;             /**< Index from LiquidType.dbc */
+    uint16 formatFlags; /**< TODO */
+    float  heightLevel1; /**< TODO */
+    float  heightLevel2; /**< TODO */
+    uint8  xOffset; /**< TODO */
+    uint8  yOffset; /**< TODO */
+    uint8  width; /**< TODO */
+    uint8  height; /**< TODO */
+    uint32 offsData2a; /**< TODO */
+    uint32 offsData2b; /**< TODO */
+};
+
+/**
+ * @briefAdt file liquid data chunk (new)
+ *
+ */
+class adt_MH2O
+{
+    public:
+        /**
+         * @brief
+         *
+         */
+        union
+        {
+            uint32 fcc; /**< TODO */
+            char   fcc_txt[4]; /**< TODO */
+        };
+        uint32 size; /**< TODO */
+
+        /**
+         * @brief
+         *
+         */
+        struct adt_LIQUID
+        {
+            uint32 offsData1; /**< TODO */
+            uint32 used; /**< TODO */
+            uint32 offsData2; /**< TODO */
+        } liquid[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID]; /**< TODO */
+
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool   prepareLoadedData();
+
+        /**
+         * @brief
+         *
+         * @param x
+         * @param y
+         * @return adt_liquid_header
+         */
+        adt_liquid_header* getLiquidData(int x, int y)
+        {
+            if (liquid[x][y].used && liquid[x][y].offsData1)
+                { return (adt_liquid_header*)((uint8*)this + 8 + liquid[x][y].offsData1); }
+            return 0;
+        }
+
+        /**
+         * @brief
+         *
+         * @param h
+         * @return float
+         */
+        float* getLiquidHeightMap(adt_liquid_header* h)
+        {
+            if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT)
+                { return 0; }
+            if (h->offsData2b)
+                { return (float*)((uint8*)this + 8 + h->offsData2b); }
+            return 0;
+        }
+
+        /**
+         * @brief
+         *
+         * @param h
+         * @return uint8
+         */
+        uint8* getLiquidLightMap(adt_liquid_header* h)
+        {
+            if (h->formatFlags & ADT_LIQUID_HEADER_FULL_LIGHT)
+                { return 0; }
+            if (h->offsData2b)
+            {
+                if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT)
+                    { return (uint8*)((uint8*)this + 8 + h->offsData2b); }
+                return (uint8*)((uint8*)this + 8 + h->offsData2b + (h->width + 1) * (h->height + 1) * 4);
+            }
+            return 0;
+        }
+
+        /**
+         * @brief
+         *
+         * @param h
+         * @return uint32
+         */
+        uint32* getLiquidFullLightMap(adt_liquid_header* h)
+        {
+            if (!(h->formatFlags & ADT_LIQUID_HEADER_FULL_LIGHT))
+                { return 0; }
+            if (h->offsData2b)
+            {
+                if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT)
+                    { return (uint32*)((uint8*)this + 8 + h->offsData2b); }
+                return (uint32*)((uint8*)this + 8 + h->offsData2b + (h->width + 1) * (h->height + 1) * 4);
+            }
+            return 0;
+        }
+
+        /**
+         * @brief
+         *
+         * @param h
+         * @return uint64
+         */
+        uint64 getLiquidShowMap(adt_liquid_header* h)
+        {
+            if (h->offsData2a)
+                { return *((uint64*)((uint8*)this + 8 + h->offsData2a)); }
+            else
+                { return (uint64)0xFFFFFFFFFFFFFFFFLL; }
+        }
+
+};
+
+/**
+ * @brief Adt file header chunk
+ *
+ */
+class adt_MHDR
+{
+        /**
+         * @brief
+         *
+         */
+        union
+        {
+            uint32 fcc; /**< TODO */
+            char   fcc_txt[4]; /**< TODO */
+        };
+        uint32 size; /**< TODO */
+
+        uint32 pad; /**< TODO */
+        uint32 offsMCIN;           /**< MCIN */
+        uint32 offsTex;            /**< MTEX */
+        uint32 offsModels;         /**< MMDX */
+        uint32 offsModelsIds;      /**< MMID */
+        uint32 offsMapObjects;     /**< MWMO */
+        uint32 offsMapObjectsIds;  /**< MWID */
+        uint32 offsDoodsDef;       /**< MDDF */
+        uint32 offsObjectsDef;     /**< MODF */
+        uint32 offsMFBO;           /**< MFBO */
+        uint32 offsMH2O;           /**< MH2O */
+        uint32 data1; /**< TODO */
+        uint32 data2; /**< TODO */
+        uint32 data3; /**< TODO */
+        uint32 data4; /**< TODO */
+        uint32 data5; /**< TODO */
+    public:
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool prepareLoadedData();
+        /**
+         * @brief
+         *
+         * @return adt_MCIN
+         */
+        adt_MCIN* getMCIN() { return (adt_MCIN*)((uint8*)&pad + offsMCIN);}
+        /**
+         * @brief
+         *
+         * @return adt_MH2O
+         */
+        adt_MH2O* getMH2O() { return offsMH2O ? (adt_MH2O*)((uint8*)&pad + offsMH2O) : 0;}
+
+};
+
+/**
+ * @brief
+ *
+ */
+class ADT_file : public FileLoader
+{
+    public:
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool prepareLoadedData();
+        /**
+         * @brief
+         *
+         */
+        ADT_file();
+        /**
+         * @brief
+         *
+         */
+        ~ADT_file();
+        /**
+         * @brief
+         *
+         */
+        void free();
+
+        adt_MHDR* a_grid; /**< TODO */
+};
+
+/**
+ * @brief
+ *
+ * @param holes
+ * @param i
+ * @param j
+ * @return bool
+ */
+bool isHole(int holes, int i, int j);
+
+#endif
diff --git a/dep/loadlib/loadlib.cpp b/dep/loadlib/loadlib.cpp
new file mode 100644
index 000000000..7cd0523df
--- /dev/null
+++ b/dep/loadlib/loadlib.cpp
@@ -0,0 +1,168 @@
+/**
+ * MaNGOS is a full featured server for World of Warcraft, supporting
+ * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+ *
+ * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "loadlib.h"
+
+ArchiveSet gOpenArchives;
+
+ArchiveSetBounds GetArchivesBounds()
+{
+return ArchiveSetBounds(gOpenArchives.begin(), gOpenArchives.end());
+}
+
+bool OpenArchive(char const* mpqFileName, HANDLE* mpqHandlePtr /*= NULL*/)
+{
+    HANDLE mpqHandle;
+    
+    if (!SFileOpenArchive(mpqFileName, 0, MPQ_OPEN_READ_ONLY, &mpqHandle))
+        return false;
+    
+    gOpenArchives.push_back(mpqHandle);
+    
+    if (mpqHandlePtr)
+        *mpqHandlePtr = mpqHandle;
+    
+    return true;
+}
+
+bool OpenNewestFile(char const* filename, HANDLE* fileHandlerPtr)
+{
+    for (ArchiveSet::const_reverse_iterator i = gOpenArchives.rbegin(); i != gOpenArchives.rend();++i)
+    {
+        // always prefer get updated file version
+        if (SFileOpenFileEx(*i, filename, SFILE_OPEN_PATCHED_FILE, fileHandlerPtr))
+            return true;
+    }
+    
+    return false;
+}
+
+bool ExtractFile(char const* mpq_name, std::string const& filename)
+{
+    for (ArchiveSet::const_reverse_iterator i = gOpenArchives.rbegin(); i != gOpenArchives.rend();++i)
+    {
+        HANDLE fileHandle;
+        if (!SFileOpenFileEx(*i, mpq_name, SFILE_OPEN_PATCHED_FILE, &fileHandle))
+            continue;
+
+        if (SFileGetFileSize(fileHandle, NULL) == 0)        // some files removed in next updates and its reported  size 0
+        {
+            printf("Skipping zero-size file: %s\n", mpq_name);
+            SFileCloseFile(fileHandle);
+            return false;
+        }
+
+        SFileCloseFile(fileHandle);
+
+        if (!SFileExtractFile(*i, mpq_name, filename.c_str(), SFILE_OPEN_PATCHED_FILE))
+        {
+            printf("Can't extract file: %s\n", mpq_name);
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void CloseArchives()
+{
+    for (ArchiveSet::const_iterator i = gOpenArchives.begin(); i != gOpenArchives.end();++i)
+        SFileCloseArchive(*i);
+
+    gOpenArchives.clear();
+}
+
+FileLoader::FileLoader()
+{
+    data = 0;
+    data_size = 0;
+    version = 0;
+}
+
+FileLoader::~FileLoader()
+{
+    free();
+}
+
+bool FileLoader::loadFile(char* filename, bool log)
+{
+    free();
+    HANDLE fileHandle = 0;
+    
+    if (!OpenNewestFile(filename, &fileHandle))
+    {
+        if (log)
+            { printf("No such file %s\n", filename); }
+        return false;
+    }
+
+    data_size = SFileGetFileSize(fileHandle, NULL);
+
+    data = new uint8 [data_size];
+    if (!data)
+    {
+        SFileCloseFile(fileHandle);
+        return false;
+    }
+
+    if (!SFileReadFile(fileHandle, data, data_size, NULL, NULL))
+    {
+        if (log)
+            printf("Can't read file %s\n", filename);
+
+        SFileCloseFile(fileHandle);
+        return false;
+    }
+
+    SFileCloseFile(fileHandle);
+
+    if (!prepareLoadedData())
+    {
+        printf("Error loading %s\n\n", filename);
+        free();
+        return false;
+    }
+
+    return true;
+
+}
+
+bool FileLoader::prepareLoadedData()
+{
+    // Check version
+    version = (file_MVER*) data;
+    if (version->fcc != 'MVER')
+        { return false; }
+    if (version->ver != FILE_FORMAT_VERSION)
+        { return false; }
+    return true;
+}
+
+void FileLoader::free()
+{
+    if (data) { delete[] data; }
+    data = 0;
+    data_size = 0;
+    version = 0;
+}
diff --git a/dep/loadlib/loadlib.h b/dep/loadlib/loadlib.h
new file mode 100644
index 000000000..065983dbe
--- /dev/null
+++ b/dep/loadlib/loadlib.h
@@ -0,0 +1,175 @@
+/**
+ * MaNGOS is a full featured server for World of Warcraft, supporting
+ * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+ *
+ * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef LOAD_LIB_H
+#define LOAD_LIB_H
+
+#include <string>
+#include <StormLib.h>
+#include "mpqfile.h"
+#include <deque>
+
+#ifdef WIN32
+typedef __int64            int64;
+typedef __int32            int32;
+typedef __int16            int16;
+typedef __int8             int8;
+typedef unsigned __int64   uint64;
+typedef unsigned __int32   uint32;
+typedef unsigned __int16   uint16;
+typedef unsigned __int8    uint8;
+#else
+#include <stdint.h>
+#ifndef uint64_t
+#ifdef __linux__
+#include <linux/types.h>
+#endif
+#endif
+
+/**
+ * @brief
+ *
+ */
+typedef int64_t            int64;
+/**
+ * @brief
+ *
+ */
+typedef int32_t            int32;
+/**
+ * @brief
+ *
+ */
+typedef int16_t            int16;
+/**
+ * @brief
+ *
+ */
+typedef int8_t             int8;
+/**
+ * @brief
+ *
+ */
+typedef uint64_t           uint64;
+/**
+ * @brief
+ *
+ */
+typedef uint32_t           uint32;
+/**
+ * @brief
+ *
+ */
+typedef uint16_t           uint16;
+/**
+ * @brief
+ *
+ */
+typedef uint8_t            uint8;
+#endif
+
+typedef std::deque<HANDLE> ArchiveSet;
+typedef std::pair<ArchiveSet::const_iterator, ArchiveSet::const_iterator> ArchiveSetBounds;
+
+bool OpenArchive(char const* mpqFileName, HANDLE* mpqHandlePtr = NULL);
+bool OpenNewestFile(char const* filename, HANDLE* fileHandlerPtr);
+ArchiveSetBounds GetArchivesBounds();
+bool ExtractFile(char const* mpq_name, std::string const& filename);
+void CloseArchives();
+
+#define FILE_FORMAT_VERSION    18
+
+/**
+ * @brief File version chunk
+ *
+ */
+struct file_MVER
+{
+    /**
+     * @brief
+     *
+     */
+    union
+    {
+        uint32 fcc; /**< TODO */
+        char   fcc_txt[4]; /**< TODO */
+    };
+    uint32 size; /**< TODO */
+    uint32 ver; /**< TODO */
+};
+
+/**
+ * @brief
+ *
+ */
+class FileLoader
+{
+        uint8*  data; /**< TODO */
+        uint32  data_size; /**< TODO */
+    public:
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        virtual bool prepareLoadedData();
+        /**
+         * @brief
+         *
+         * @return uint8
+         */
+        uint8* GetData()     {return data;}
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
+        uint32 GetDataSize() {return data_size;}
+
+        file_MVER* version; /**< TODO */
+        /**
+         * @brief
+         *
+         */
+        FileLoader();
+        /**
+         * @brief
+         *
+         */
+        ~FileLoader();
+        /**
+         * @brief
+         *
+         * @param filename
+         * @param log
+         * @return bool
+         */
+        bool loadFile(char* filename, bool log = true);
+        /**
+         * @brief
+         *
+         */
+        virtual void free();
+};
+#endif
diff --git a/dep/loadlib/mpqfile.cpp b/dep/loadlib/mpqfile.cpp
new file mode 100644
index 000000000..8e4f214cf
--- /dev/null
+++ b/dep/loadlib/mpqfile.cpp
@@ -0,0 +1,113 @@
+/**
+ * MaNGOS is a full featured server for World of Warcraft, supporting
+ * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+ *
+ * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "mpqfile.h"
+#include <deque>
+#include <cstdio>
+#include "StormLib.h"
+
+MPQFile::MPQFile(HANDLE mpq, const char* filename) :
+    eof(false),
+    buffer(0),
+    pointer(0),
+    size(0)
+{
+    HANDLE file;
+    if (!SFileOpenFileEx(mpq, filename, SFILE_OPEN_PATCHED_FILE, &file))
+    {
+        int error = GetLastError();
+        if (error != ERROR_FILE_NOT_FOUND)
+            fprintf(stderr, "Can't open %s, err=%u!\n", filename, GetLastError());
+        eof = true;
+        return;
+    }
+
+    DWORD hi = 0;
+    size = SFileGetFileSize(file, &hi);
+
+    if (hi)
+    {
+        fprintf(stderr, "Can't open %s, size[hi] = %u!\n", filename, (uint32)hi);
+        SFileCloseFile(file);
+        eof = true;
+        return;
+    }
+
+    if (size <= 1)
+    {
+        fprintf(stderr, "Can't open %s, size = %u!\n", filename, size);
+        SFileCloseFile(file);
+        eof = true;
+        return;
+    }
+
+    DWORD read = 0;
+    buffer = new char[size];
+    if (!SFileReadFile(file, buffer, size, &read, NULL) || size != read)
+    {
+        fprintf(stderr, "Can't read %s, size=%u read=%u!\n", filename, size, read);
+        SFileCloseFile(file);
+        eof = true;
+        return;
+    }
+
+    SFileCloseFile(file);
+}
+
+size_t MPQFile::read(void* dest, size_t bytes)
+{
+    if (eof) { return 0; }
+
+    size_t rpos = (size_t)(pointer + bytes);
+    if (rpos > size)
+    {
+        bytes = (size_t)(size - pointer);
+        eof = true;
+    }
+
+    memcpy(dest, &(buffer[pointer]), bytes);
+
+    pointer = rpos;
+
+    return bytes;
+}
+
+void MPQFile::seek(int offset)
+{
+    pointer = offset;
+    eof = (pointer >= size);
+}
+
+void MPQFile::seekRelative(int offset)
+{
+    pointer += offset;
+    eof = (pointer >= size);
+}
+
+void MPQFile::close()
+{
+    if (buffer) { delete[] buffer; }
+    buffer = 0;
+    eof = true;
+}
\ No newline at end of file
diff --git a/dep/loadlib/mpqfile.h b/dep/loadlib/mpqfile.h
new file mode 100644
index 000000000..404494c45
--- /dev/null
+++ b/dep/loadlib/mpqfile.h
@@ -0,0 +1,142 @@
+/**
+ * MaNGOS is a full featured server for World of Warcraft, supporting
+ * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+ *
+ * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef MPQ_H
+#define MPQ_H
+
+#include <string.h>
+#include <ctype.h>
+#include <vector>
+#include <iostream>
+#include <deque>
+#include "loadlib.h"
+#include "stormlib.h"
+
+using namespace std;
+
+/**
+ * @brief
+ *
+ */
+class MPQFile
+{
+        //MPQHANDLE handle;
+        bool eof; /**< TODO */
+        char* buffer; /**< TODO */
+        size_t pointer, size; /**< TODO */
+
+        /**
+         * @brief disable copying
+         *
+         * @param f
+         */
+        MPQFile() {}
+
+
+    public:
+        /**
+         * @brief
+         *
+         * @param filename filenames are not case sensitive
+         */
+        MPQFile(HANDLE mpq, const char* filename);
+        /**
+         * @brief
+         *
+         */
+        ~MPQFile() { close(); }
+        /**
+         * @brief
+         *
+         * @param dest
+         * @param bytes
+         * @return size_t
+         */
+        size_t read(void* dest, size_t bytes);
+        /**
+         * @brief
+         *
+         * @return size_t
+         */
+        size_t getSize() { return (size_t)size; }
+        /**
+         * @brief
+         *
+         * @return size_t
+         */
+        size_t getPos() { return (size_t)pointer; }
+        /**
+         * @brief
+         *
+         * @return char
+         */
+        char* getBuffer() { return buffer; }
+        /**
+         * @brief
+         *
+         * @return char
+         */
+        char* getPointer() { return buffer + pointer; }
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool isEof() { return eof; }
+        /**
+         * @brief
+         *
+         * @param offset
+         */
+        void seek(int offset);
+        /**
+         * @brief
+         *
+         * @param offset
+         */
+        void seekRelative(int offset);
+        /**
+         * @brief
+         *
+         */
+        void close();
+};
+
+/**
+ * @brief
+ *
+ * @param fcc
+ */
+inline void flipcc(char* fcc)
+{
+    char t;
+    t = fcc[0];
+    fcc[0] = fcc[3];
+    fcc[3] = t;
+    t = fcc[1];
+    fcc[1] = fcc[2];
+    fcc[2] = t;
+}
+
+#endif
\ No newline at end of file
diff --git a/dep/loadlib/wdt.cpp b/dep/loadlib/wdt.cpp
new file mode 100644
index 000000000..46cbed2b2
--- /dev/null
+++ b/dep/loadlib/wdt.cpp
@@ -0,0 +1,84 @@
+/**
+ * MaNGOS is a full featured server for World of Warcraft, supporting
+ * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+ *
+ * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "wdt.h"
+
+bool wdt_MWMO::prepareLoadedData()
+{
+    if (fcc != 'MWMO')
+        { return false; }
+    return true;
+}
+
+bool wdt_MPHD::prepareLoadedData()
+{
+    if (fcc != 'MPHD')
+        { return false; }
+    return true;
+}
+
+bool wdt_MAIN::prepareLoadedData()
+{
+    if (fcc != 'MAIN')
+        { return false; }
+    return true;
+}
+
+WDT_file::WDT_file()
+{
+    mphd = 0;
+    main = 0;
+    wmo  = 0;
+}
+
+WDT_file::~WDT_file()
+{
+    free();
+}
+
+void WDT_file::free()
+{
+    mphd = 0;
+    main = 0;
+    wmo  = 0;
+    FileLoader::free();
+}
+
+bool WDT_file::prepareLoadedData()
+{
+    // Check parent
+    if (!FileLoader::prepareLoadedData())
+        { return false; }
+
+    mphd = (wdt_MPHD*)((uint8*)version + version->size + 8);
+    if (!mphd->prepareLoadedData())
+        { return false; }
+    main = (wdt_MAIN*)((uint8*)mphd + mphd->size + 8);
+    if (!main->prepareLoadedData())
+        { return false; }
+    wmo = (wdt_MWMO*)((uint8*)main + main->size + 8);
+    if (!wmo->prepareLoadedData())
+        { return false; }
+    return true;
+}
diff --git a/dep/loadlib/wdt.h b/dep/loadlib/wdt.h
new file mode 100644
index 000000000..5fb7190cd
--- /dev/null
+++ b/dep/loadlib/wdt.h
@@ -0,0 +1,165 @@
+/**
+ * MaNGOS is a full featured server for World of Warcraft, supporting
+ * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+ *
+ * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#ifndef WDT_H
+#define WDT_H
+
+#include "loadlib.h"
+
+//**************************************************************************************
+// WDT file class and structures
+//**************************************************************************************
+#define WDT_MAP_SIZE 64
+
+/**
+ * @brief
+ *
+ */
+class wdt_MWMO
+{
+        /**
+         * @brief
+         *
+         */
+        union
+        {
+            uint32 fcc; /**< TODO */
+            char   fcc_txt[4]; /**< TODO */
+        };
+    public:
+        uint32 size; /**< TODO */
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool prepareLoadedData();
+};
+
+/**
+ * @brief
+ *
+ */
+class wdt_MPHD
+{
+        /**
+         * @brief
+         *
+         */
+        union
+        {
+            uint32 fcc; /**< TODO */
+            char   fcc_txt[4]; /**< TODO */
+        };
+    public:
+        uint32 size; /**< TODO */
+
+        uint32 data1; /**< TODO */
+        uint32 data2; /**< TODO */
+        uint32 data3; /**< TODO */
+        uint32 data4; /**< TODO */
+        uint32 data5; /**< TODO */
+        uint32 data6; /**< TODO */
+        uint32 data7; /**< TODO */
+        uint32 data8; /**< TODO */
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool   prepareLoadedData();
+};
+
+/**
+ * @brief
+ *
+ */
+class wdt_MAIN
+{
+        /**
+         * @brief
+         *
+         */
+        union
+        {
+            uint32 fcc; /**< TODO */
+            char   fcc_txt[4]; /**< TODO */
+        };
+    public:
+        uint32 size; /**< TODO */
+
+        /**
+         * @brief
+         *
+         */
+        struct adtData
+        {
+            uint32 exist; /**< TODO */
+            uint32 data1; /**< TODO */
+        } adt_list[64][64]; /**< TODO */
+
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool   prepareLoadedData();
+};
+
+/**
+ * @brief
+ *
+ */
+class WDT_file : public FileLoader
+{
+    public:
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool   prepareLoadedData();
+
+        /**
+         * @brief
+         *
+         */
+        WDT_file();
+        /**
+         * @brief
+         *
+         */
+        ~WDT_file();
+        /**
+         * @brief
+         *
+         */
+        void free();
+
+        wdt_MPHD* mphd; /**< TODO */
+        wdt_MAIN* main; /**< TODO */
+        wdt_MWMO* wmo; /**< TODO */
+};
+
+#endif
diff --git a/dep/mersennetwister/MersenneTwister.h b/dep/mersennetwister/MersenneTwister.h
new file mode 100644
index 000000000..dfe3f5be1
--- /dev/null
+++ b/dep/mersennetwister/MersenneTwister.h
@@ -0,0 +1,414 @@
+// MersenneTwister.h
+// Mersenne Twister random number generator -- a C++ class MTRand
+// Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus
+// Richard J. Wagner  v1.0  15 May 2003  rjwagner@writeme.com
+
+// The Mersenne Twister is an algorithm for generating random numbers.  It
+// was designed with consideration of the flaws in various other generators.
+// The period, 2^19937-1, and the order of equidistribution, 623 dimensions,
+// are far greater.  The generator is also fast; it avoids multiplication and
+// division, and it benefits from caches and pipelines.  For more information
+// see the inventors' web page at http://www.math.keio.ac.jp/~matumoto/emt.html
+
+// Reference
+// M. Matsumoto and T. Nishimura, "Mersenne Twister: A 623-Dimensionally
+// Equidistributed Uniform Pseudo-Random Number Generator", ACM Transactions on
+// Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30.
+
+// Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+// Copyright (C) 2000 - 2003, Richard J. Wagner
+// All rights reserved.                          
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+//   1. Redistributions of source code must retain the above copyright
+//      notice, this list of conditions and the following disclaimer.
+//
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+//
+//   3. The names of its contributors may not be used to endorse or promote 
+//      products derived from this software without specific prior written 
+//      permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// The original code included the following notice:
+//
+//     When you use this, send an email to: matumoto@math.keio.ac.jp
+//     with an appropriate reference to your work.
+//
+// It would be nice to CC: rjwagner@writeme.com and Cokus@math.washington.edu
+// when you write.
+
+#ifndef MERSENNETWISTER_H
+#define MERSENNETWISTER_H
+
+// Not thread safe (unless auto-initialization is avoided and each thread has
+// its own MTRand object)
+
+#include"Platform/Define.h"
+
+#include <limits.h>
+#include <time.h>
+#include <math.h>
+
+class MTRand {
+// Data
+public:
+    typedef ::uint32 uint32;
+    enum { N = 624 };       // length of state vector
+    enum { SAVE = N + 1 };  // length of array for save()
+
+protected:
+    enum { M = 397 };  // period parameter
+    
+    uint32 state[N];   // internal state
+    uint32 *pNext;     // next value to get from state
+    int left;          // number of values left before reload needed
+
+
+//Methods
+public:
+    MTRand( const uint32& oneSeed );  // initialize with a simple uint32
+    MTRand( uint32 *const bigSeed, uint32 const seedLength = N );  // or an array
+    MTRand();                         // auto-initialize with /dev/urandom or time() and clock()
+    MTRand(const MTRand&);            // prevent copy constructor
+    MTRand& operator=(const MTRand&); // no-op operator=
+    
+    // Do NOT use for CRYPTOGRAPHY without securely hashing several returned
+    // values together, otherwise the generator state can be learned after
+    // reading 624 consecutive values.
+    
+    // Access to 32-bit random numbers
+    double rand();                          // real number in [0,1]
+    double rand( const double& n );         // real number in [0,n]
+    double randExc();                       // real number in [0,1)
+    double randExc( const double& n );      // real number in [0,n)
+    double randDblExc();                    // real number in (0,1)
+    double randDblExc( const double& n );   // real number in (0,n)
+    uint32 randInt();                       // integer in [0,2^32-1]
+    uint32 randInt( const uint32& n );      // integer in [0,n] for n < 2^32
+    double operator()() { return rand(); }  // same as rand()
+    
+    // Access to 53-bit random numbers (capacity of IEEE double precision)
+    double rand53();  // real number in [0,1)
+    
+    // Access to nonuniform random number distributions
+    double randNorm( const double& mean = 0.0, const double& variance = 0.0 );
+    
+    // Re-seeding functions with same behavior as initializers
+    void seed( const uint32 oneSeed );
+    void seed( uint32 *const bigSeed, const uint32 seedLength = N );
+    void seed();
+    
+    // Saving and loading generator state
+    void save( uint32* saveArray ) const;  // to array of size SAVE
+    void load( uint32 *const loadArray );  // from such array
+    /* Mangos not use streams for random values output
+    friend std::ostream& operator<<( std::ostream& os, const MTRand& mtrand );
+    friend std::istream& operator>>( std::istream& is, MTRand& mtrand );
+    */
+protected:
+    void initialize( const uint32 oneSeed );
+    void reload();
+    uint32 hiBit( const uint32& u ) const { return u & 0x80000000UL; }
+    uint32 loBit( const uint32& u ) const { return u & 0x00000001UL; }
+    uint32 loBits( const uint32& u ) const { return u & 0x7fffffffUL; }
+    uint32 mixBits( const uint32& u, const uint32& v ) const
+        { return hiBit(u) | loBits(v); }
+    uint32 twist( const uint32& m, const uint32& s0, const uint32& s1 ) const
+        { return m ^ (mixBits(s0,s1)>>1) ^ uint32(-(int32)(loBit(s1) & 0x9908b0dfUL)); }
+    static uint32 hash( time_t t, clock_t c );
+};
+
+inline MTRand::MTRand(const MTRand&)
+    { seed(); }
+
+inline MTRand& MTRand::operator=(const MTRand&) 
+    { return *this; }
+
+inline MTRand::MTRand( const uint32& oneSeed )
+    { seed(oneSeed); }
+
+inline MTRand::MTRand( uint32 *const bigSeed, const uint32 seedLength )
+    { seed(bigSeed,seedLength); }
+
+inline MTRand::MTRand()
+    { seed(); }
+
+inline double MTRand::rand()
+    { return double(randInt()) * (1.0/4294967295.0); }
+
+inline double MTRand::rand( const double& n )
+    { return rand() * n; }
+
+inline double MTRand::randExc()
+    { return double(randInt()) * (1.0/4294967296.0); }
+
+inline double MTRand::randExc( const double& n )
+    { return randExc() * n; }
+
+inline double MTRand::randDblExc()
+    { return ( double(randInt()) + 0.5 ) * (1.0/4294967296.0); }
+
+inline double MTRand::randDblExc( const double& n )
+    { return randDblExc() * n; }
+
+inline double MTRand::rand53()
+{
+    uint32 a = randInt() >> 5, b = randInt() >> 6;
+    return ( a * 67108864.0 + b ) * (1.0/9007199254740992.0);  // by Isaku Wada
+}
+
+inline double MTRand::randNorm( const double& mean, const double& variance )
+{
+    // Return a real number from a normal (Gaussian) distribution with given
+    // mean and variance by Box-Muller method
+    double r = sqrt( -2.0 * log( 1.0-randDblExc()) ) * variance;
+    double phi = 2.0 * 3.14159265358979323846264338328 * randExc();
+    return mean + r * cos(phi);
+}
+
+inline MTRand::uint32 MTRand::randInt()
+{
+    // Pull a 32-bit integer from the generator state
+    // Every other access function simply transforms the numbers extracted here
+    
+    if( left == 0 ) reload();
+    --left;
+        
+    register uint32 s1;
+    s1 = *pNext++;
+    s1 ^= (s1 >> 11);
+    s1 ^= (s1 <<  7) & 0x9d2c5680UL;
+    s1 ^= (s1 << 15) & 0xefc60000UL;
+    return ( s1 ^ (s1 >> 18) );
+}
+
+inline MTRand::uint32 MTRand::randInt( const uint32& n )
+{
+    // Find which bits are used in n
+    // Optimized by Magnus Jonsson (magnus@smartelectronix.com)
+    uint32 used = n;
+    used |= used >> 1;
+    used |= used >> 2;
+    used |= used >> 4;
+    used |= used >> 8;
+    used |= used >> 16;
+    
+    // Draw numbers until one is found in [0,n]
+    uint32 i;
+    do
+        i = randInt() & used;  // toss unused bits to shorten search
+    while( i > n );
+    return i;
+}
+
+
+inline void MTRand::seed( const uint32 oneSeed )
+{
+    // Seed the generator with a simple uint32
+    initialize(oneSeed);
+    reload();
+}
+
+
+inline void MTRand::seed( uint32 *const bigSeed, const uint32 seedLength )
+{
+    // Seed the generator with an array of uint32's
+    // There are 2^19937-1 possible initial states.  This function allows
+    // all of those to be accessed by providing at least 19937 bits (with a
+    // default seed length of N = 624 uint32's).  Any bits above the lower 32
+    // in each element are discarded.
+    // Just call seed() if you want to get array from /dev/urandom
+    initialize(19650218UL);
+    register int i = 1;
+    register uint32 j = 0;
+    register int k = ( N > int(seedLength) ? N : int(seedLength) );
+    for( ; k; --k )
+    {
+        state[i] =
+            state[i] ^ ( (state[i-1] ^ (state[i-1] >> 30)) * 1664525UL );
+        state[i] += ( bigSeed[j] & 0xffffffffUL ) + j;
+        state[i] &= 0xffffffffUL;
+        ++i;  ++j;
+        if( i >= N ) { state[0] = state[N-1];  i = 1; }
+        if( j >= seedLength ) j = 0;
+    }
+    for( k = N - 1; k; --k )
+    {
+        state[i] =
+            state[i] ^ ( (state[i-1] ^ (state[i-1] >> 30)) * 1566083941UL );
+        state[i] -= i;
+        state[i] &= 0xffffffffUL;
+        ++i;
+        if( i >= N ) { state[0] = state[N-1];  i = 1; }
+    }
+    state[0] = 0x80000000UL;  // MSB is 1, assuring non-zero initial array
+    reload();
+}
+
+
+inline void MTRand::seed()
+{
+    // Seed the generator with hash of time() and clock() values
+    seed( hash( time(NULL), clock() ) );
+}
+
+
+inline void MTRand::initialize( const uint32 seed )
+{
+    // Initialize generator state with seed
+    // See Knuth TAOCP Vol 2, 3rd Ed, p.106 for multiplier.
+    // In previous versions, most significant bits (MSBs) of the seed affect
+    // only MSBs of the state array.  Modified 9 Jan 2002 by Makoto Matsumoto.
+    register uint32 *s = state;
+    register uint32 *r = state;
+    register int i = 1;
+    *s++ = seed & 0xffffffffUL;
+    for( ; i < N; ++i )
+    {
+        *s++ = ( 1812433253UL * ( *r ^ (*r >> 30) ) + i ) & 0xffffffffUL;
+        r++;
+    }
+}
+
+
+inline void MTRand::reload()
+{
+    // Generate N new values in state
+    // Made clearer and faster by Matthew Bellew (matthew.bellew@home.com)
+    register uint32 *p = state;
+    register int i;
+    for( i = N - M; i--; ++p )
+        *p = twist( p[M], p[0], p[1] );
+    for( i = M; --i; ++p )
+        *p = twist( p[M-N], p[0], p[1] );
+    *p = twist( p[M-N], p[0], state[0] );
+
+    left = N, pNext = state;
+}
+
+
+inline MTRand::uint32 MTRand::hash( time_t t, clock_t c )
+{
+    // Get a uint32 from t and c
+    // Better than uint32(x) in case x is floating point in [0,1]
+    // Based on code by Lawrence Kirby (fred@genesis.demon.co.uk)
+
+    static uint32 differ = 0;  // guarantee time-based seeds will change
+
+    uint32 h1 = 0;
+    unsigned char *p = (unsigned char *) &t;
+    for( size_t i = 0; i < sizeof(t); ++i )
+    {
+        h1 *= UCHAR_MAX + 2U;
+        h1 += p[i];
+    }
+    uint32 h2 = 0;
+    p = (unsigned char *) &c;
+    for( size_t j = 0; j < sizeof(c); ++j )
+    {
+        h2 *= UCHAR_MAX + 2U;
+        h2 += p[j];
+    }
+    return ( h1 + differ++ ) ^ h2;
+}
+
+
+inline void MTRand::save( uint32* saveArray ) const
+{
+    register uint32 *sa = saveArray;
+    register const uint32 *s = state;
+    register int i = N;
+    for( ; i--; *sa++ = *s++ ) {}
+    *sa = left;
+}
+
+
+inline void MTRand::load( uint32 *const loadArray )
+{
+    register uint32 *s = state;
+    register uint32 *la = loadArray;
+    register int i = N;
+    for( ; i--; *s++ = *la++ ) {}
+    left = *la;
+    pNext = &state[N-left];
+}
+
+/* Mangos not use streams for random values output
+inline std::ostream& operator<<( std::ostream& os, const MTRand& mtrand )
+{
+    register const MTRand::uint32 *s = mtrand.state;
+    register int i = mtrand.N;
+    for( ; i--; os << *s++ << "\t" ) {}
+    return os << mtrand.left;
+}
+
+
+inline std::istream& operator>>( std::istream& is, MTRand& mtrand )
+{
+    register MTRand::uint32 *s = mtrand.state;
+    register int i = mtrand.N;
+    for( ; i--; is >> *s++ ) {}
+    is >> mtrand.left;
+    mtrand.pNext = &mtrand.state[mtrand.N-mtrand.left];
+    return is;
+}
+*/
+
+#endif  // MERSENNETWISTER_H
+
+// Change log:
+//
+// v0.1 - First release on 15 May 2000
+//      - Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus
+//      - Translated from C to C++
+//      - Made completely ANSI compliant
+//      - Designed convenient interface for initialization, seeding, and
+//        obtaining numbers in default or user-defined ranges
+//      - Added automatic seeding from /dev/urandom or time() and clock()
+//      - Provided functions for saving and loading generator state
+//
+// v0.2 - Fixed bug which reloaded generator one step too late
+//
+// v0.3 - Switched to clearer, faster reload() code from Matthew Bellew
+//
+// v0.4 - Removed trailing newline in saved generator format to be consistent
+//        with output format of built-in types
+//
+// v0.5 - Improved portability by replacing static const int's with enum's and
+//        clarifying return values in seed(); suggested by Eric Heimburg
+//      - Removed MAXINT constant; use 0xffffffffUL instead
+//
+// v0.6 - Eliminated seed overflow when uint32 is larger than 32 bits
+//      - Changed integer [0,n] generator to give better uniformity
+//
+// v0.7 - Fixed operator precedence ambiguity in reload()
+//      - Added access for real numbers in (0,1) and (0,n)
+//
+// v0.8 - Included time.h header to properly support time_t and clock_t
+//
+// v1.0 - Revised seeding to match 26 Jan 2002 update of Nishimura and Matsumoto
+//      - Allowed for seeding with arrays of any length
+//      - Added access for real numbers in [0,1) with 53-bit resolution
+//      - Added access for real numbers from normal (Gaussian) distributions
+//      - Increased overall speed by optimizing twist()
+//      - Doubled speed of integer [0,n] generation
+//      - Fixed out-of-range number generation on 64-bit machines
+//      - Improved portability by substituting literal constants for long enum's
+//      - Changed license from GNU LGPL to BSD
diff --git a/dep/src/CMakeLists.txt b/dep/src/CMakeLists.txt
deleted file mode 100644
index 15aaa6172..000000000
--- a/dep/src/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-add_subdirectory(g3dlite)
-add_subdirectory(gsoap)
-
-add_subdirectory(zlib)
-add_subdirectory(bzip2)
diff --git a/dep/src/bzip2/blocksort.c b/dep/src/bzip2/blocksort.c
deleted file mode 100644
index bd2dec157..000000000
--- a/dep/src/bzip2/blocksort.c
+++ /dev/null
@@ -1,1094 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Block sorting machinery                               ---*/
-/*---                                           blocksort.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#include "bzlib_private.h"
-
-/*---------------------------------------------*/
-/*--- Fallback O(N log(N)^2) sorting        ---*/
-/*--- algorithm, for repetitive blocks      ---*/
-/*---------------------------------------------*/
-
-/*---------------------------------------------*/
-static 
-__inline__
-void fallbackSimpleSort ( UInt32* fmap, 
-                          UInt32* eclass, 
-                          Int32   lo, 
-                          Int32   hi )
-{
-   Int32 i, j, tmp;
-   UInt32 ec_tmp;
-
-   if (lo == hi) return;
-
-   if (hi - lo > 3) {
-      for ( i = hi-4; i >= lo; i-- ) {
-         tmp = fmap[i];
-         ec_tmp = eclass[tmp];
-         for ( j = i+4; j <= hi && ec_tmp > eclass[fmap[j]]; j += 4 )
-            fmap[j-4] = fmap[j];
-         fmap[j-4] = tmp;
-      }
-   }
-
-   for ( i = hi-1; i >= lo; i-- ) {
-      tmp = fmap[i];
-      ec_tmp = eclass[tmp];
-      for ( j = i+1; j <= hi && ec_tmp > eclass[fmap[j]]; j++ )
-         fmap[j-1] = fmap[j];
-      fmap[j-1] = tmp;
-   }
-}
-
-
-/*---------------------------------------------*/
-#define fswap(zz1, zz2) \
-   { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; }
-
-#define fvswap(zzp1, zzp2, zzn)       \
-{                                     \
-   Int32 yyp1 = (zzp1);               \
-   Int32 yyp2 = (zzp2);               \
-   Int32 yyn  = (zzn);                \
-   while (yyn > 0) {                  \
-      fswap(fmap[yyp1], fmap[yyp2]);  \
-      yyp1++; yyp2++; yyn--;          \
-   }                                  \
-}
-
-
-#define fmin(a,b) ((a) < (b)) ? (a) : (b)
-
-#define fpush(lz,hz) { stackLo[sp] = lz; \
-                       stackHi[sp] = hz; \
-                       sp++; }
-
-#define fpop(lz,hz) { sp--;              \
-                      lz = stackLo[sp];  \
-                      hz = stackHi[sp]; }
-
-#define FALLBACK_QSORT_SMALL_THRESH 10
-#define FALLBACK_QSORT_STACK_SIZE   100
-
-
-static
-void fallbackQSort3 ( UInt32* fmap, 
-                      UInt32* eclass,
-                      Int32   loSt, 
-                      Int32   hiSt )
-{
-   Int32 unLo, unHi, ltLo, gtHi, n, m;
-   Int32 sp, lo, hi;
-   UInt32 med, r, r3;
-   Int32 stackLo[FALLBACK_QSORT_STACK_SIZE];
-   Int32 stackHi[FALLBACK_QSORT_STACK_SIZE];
-
-   r = 0;
-
-   sp = 0;
-   fpush ( loSt, hiSt );
-
-   while (sp > 0) {
-
-      AssertH ( sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004 );
-
-      fpop ( lo, hi );
-      if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) {
-         fallbackSimpleSort ( fmap, eclass, lo, hi );
-         continue;
-      }
-
-      /* Random partitioning.  Median of 3 sometimes fails to
-         avoid bad cases.  Median of 9 seems to help but 
-         looks rather expensive.  This too seems to work but
-         is cheaper.  Guidance for the magic constants 
-         7621 and 32768 is taken from Sedgewick's algorithms
-         book, chapter 35.
-      */
-      r = ((r * 7621) + 1) % 32768;
-      r3 = r % 3;
-      if (r3 == 0) med = eclass[fmap[lo]]; else
-      if (r3 == 1) med = eclass[fmap[(lo+hi)>>1]]; else
-                   med = eclass[fmap[hi]];
-
-      unLo = ltLo = lo;
-      unHi = gtHi = hi;
-
-      while (1) {
-         while (1) {
-            if (unLo > unHi) break;
-            n = (Int32)eclass[fmap[unLo]] - (Int32)med;
-            if (n == 0) { 
-               fswap(fmap[unLo], fmap[ltLo]); 
-               ltLo++; unLo++; 
-               continue; 
-            };
-            if (n > 0) break;
-            unLo++;
-         }
-         while (1) {
-            if (unLo > unHi) break;
-            n = (Int32)eclass[fmap[unHi]] - (Int32)med;
-            if (n == 0) { 
-               fswap(fmap[unHi], fmap[gtHi]); 
-               gtHi--; unHi--; 
-               continue; 
-            };
-            if (n < 0) break;
-            unHi--;
-         }
-         if (unLo > unHi) break;
-         fswap(fmap[unLo], fmap[unHi]); unLo++; unHi--;
-      }
-
-      AssertD ( unHi == unLo-1, "fallbackQSort3(2)" );
-
-      if (gtHi < ltLo) continue;
-
-      n = fmin(ltLo-lo, unLo-ltLo); fvswap(lo, unLo-n, n);
-      m = fmin(hi-gtHi, gtHi-unHi); fvswap(unLo, hi-m+1, m);
-
-      n = lo + unLo - ltLo - 1;
-      m = hi - (gtHi - unHi) + 1;
-
-      if (n - lo > hi - m) {
-         fpush ( lo, n );
-         fpush ( m, hi );
-      } else {
-         fpush ( m, hi );
-         fpush ( lo, n );
-      }
-   }
-}
-
-#undef fmin
-#undef fpush
-#undef fpop
-#undef fswap
-#undef fvswap
-#undef FALLBACK_QSORT_SMALL_THRESH
-#undef FALLBACK_QSORT_STACK_SIZE
-
-
-/*---------------------------------------------*/
-/* Pre:
-      nblock > 0
-      eclass exists for [0 .. nblock-1]
-      ((UChar*)eclass) [0 .. nblock-1] holds block
-      ptr exists for [0 .. nblock-1]
-
-   Post:
-      ((UChar*)eclass) [0 .. nblock-1] holds block
-      All other areas of eclass destroyed
-      fmap [0 .. nblock-1] holds sorted order
-      bhtab [ 0 .. 2+(nblock/32) ] destroyed
-*/
-
-#define       SET_BH(zz)  bhtab[(zz) >> 5] |= (1 << ((zz) & 31))
-#define     CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31))
-#define     ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1 << ((zz) & 31)))
-#define      WORD_BH(zz)  bhtab[(zz) >> 5]
-#define UNALIGNED_BH(zz)  ((zz) & 0x01f)
-
-static
-void fallbackSort ( UInt32* fmap, 
-                    UInt32* eclass, 
-                    UInt32* bhtab,
-                    Int32   nblock,
-                    Int32   verb )
-{
-   Int32 ftab[257];
-   Int32 ftabCopy[256];
-   Int32 H, i, j, k, l, r, cc, cc1;
-   Int32 nNotDone;
-   Int32 nBhtab;
-   UChar* eclass8 = (UChar*)eclass;
-
-   /*--
-      Initial 1-char radix sort to generate
-      initial fmap and initial BH bits.
-   --*/
-   if (verb >= 4)
-      VPrintf0 ( "        bucket sorting ...\n" );
-   for (i = 0; i < 257;    i++) ftab[i] = 0;
-   for (i = 0; i < nblock; i++) ftab[eclass8[i]]++;
-   for (i = 0; i < 256;    i++) ftabCopy[i] = ftab[i];
-   for (i = 1; i < 257;    i++) ftab[i] += ftab[i-1];
-
-   for (i = 0; i < nblock; i++) {
-      j = eclass8[i];
-      k = ftab[j] - 1;
-      ftab[j] = k;
-      fmap[k] = i;
-   }
-
-   nBhtab = 2 + (nblock / 32);
-   for (i = 0; i < nBhtab; i++) bhtab[i] = 0;
-   for (i = 0; i < 256; i++) SET_BH(ftab[i]);
-
-   /*--
-      Inductively refine the buckets.  Kind-of an
-      "exponential radix sort" (!), inspired by the
-      Manber-Myers suffix array construction algorithm.
-   --*/
-
-   /*-- set sentinel bits for block-end detection --*/
-   for (i = 0; i < 32; i++) { 
-      SET_BH(nblock + 2*i);
-      CLEAR_BH(nblock + 2*i + 1);
-   }
-
-   /*-- the log(N) loop --*/
-   H = 1;
-   while (1) {
-
-      if (verb >= 4) 
-         VPrintf1 ( "        depth %6d has ", H );
-
-      j = 0;
-      for (i = 0; i < nblock; i++) {
-         if (ISSET_BH(i)) j = i;
-         k = fmap[i] - H; if (k < 0) k += nblock;
-         eclass[k] = j;
-      }
-
-      nNotDone = 0;
-      r = -1;
-      while (1) {
-
-	 /*-- find the next non-singleton bucket --*/
-         k = r + 1;
-         while (ISSET_BH(k) && UNALIGNED_BH(k)) k++;
-         if (ISSET_BH(k)) {
-            while (WORD_BH(k) == 0xffffffff) k += 32;
-            while (ISSET_BH(k)) k++;
-         }
-         l = k - 1;
-         if (l >= nblock) break;
-         while (!ISSET_BH(k) && UNALIGNED_BH(k)) k++;
-         if (!ISSET_BH(k)) {
-            while (WORD_BH(k) == 0x00000000) k += 32;
-            while (!ISSET_BH(k)) k++;
-         }
-         r = k - 1;
-         if (r >= nblock) break;
-
-         /*-- now [l, r] bracket current bucket --*/
-         if (r > l) {
-            nNotDone += (r - l + 1);
-            fallbackQSort3 ( fmap, eclass, l, r );
-
-            /*-- scan bucket and generate header bits-- */
-            cc = -1;
-            for (i = l; i <= r; i++) {
-               cc1 = eclass[fmap[i]];
-               if (cc != cc1) { SET_BH(i); cc = cc1; };
-            }
-         }
-      }
-
-      if (verb >= 4) 
-         VPrintf1 ( "%6d unresolved strings\n", nNotDone );
-
-      H *= 2;
-      if (H > nblock || nNotDone == 0) break;
-   }
-
-   /*-- 
-      Reconstruct the original block in
-      eclass8 [0 .. nblock-1], since the
-      previous phase destroyed it.
-   --*/
-   if (verb >= 4)
-      VPrintf0 ( "        reconstructing block ...\n" );
-   j = 0;
-   for (i = 0; i < nblock; i++) {
-      while (ftabCopy[j] == 0) j++;
-      ftabCopy[j]--;
-      eclass8[fmap[i]] = (UChar)j;
-   }
-   AssertH ( j < 256, 1005 );
-}
-
-#undef       SET_BH
-#undef     CLEAR_BH
-#undef     ISSET_BH
-#undef      WORD_BH
-#undef UNALIGNED_BH
-
-
-/*---------------------------------------------*/
-/*--- The main, O(N^2 log(N)) sorting       ---*/
-/*--- algorithm.  Faster for "normal"       ---*/
-/*--- non-repetitive blocks.                ---*/
-/*---------------------------------------------*/
-
-/*---------------------------------------------*/
-static
-__inline__
-Bool mainGtU ( UInt32  i1, 
-               UInt32  i2,
-               UChar*  block, 
-               UInt16* quadrant,
-               UInt32  nblock,
-               Int32*  budget )
-{
-   Int32  k;
-   UChar  c1, c2;
-   UInt16 s1, s2;
-
-   AssertD ( i1 != i2, "mainGtU" );
-   /* 1 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 2 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 3 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 4 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 5 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 6 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 7 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 8 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 9 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 10 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 11 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 12 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-
-   k = nblock + 8;
-
-   do {
-      /* 1 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 2 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 3 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 4 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 5 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 6 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 7 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 8 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-
-      if (i1 >= nblock) i1 -= nblock;
-      if (i2 >= nblock) i2 -= nblock;
-
-      k -= 8;
-      (*budget)--;
-   }
-      while (k >= 0);
-
-   return False;
-}
-
-
-/*---------------------------------------------*/
-/*--
-   Knuth's increments seem to work better
-   than Incerpi-Sedgewick here.  Possibly
-   because the number of elems to sort is
-   usually small, typically <= 20.
---*/
-static
-Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280,
-                   9841, 29524, 88573, 265720,
-                   797161, 2391484 };
-
-static
-void mainSimpleSort ( UInt32* ptr,
-                      UChar*  block,
-                      UInt16* quadrant,
-                      Int32   nblock,
-                      Int32   lo, 
-                      Int32   hi, 
-                      Int32   d,
-                      Int32*  budget )
-{
-   Int32 i, j, h, bigN, hp;
-   UInt32 v;
-
-   bigN = hi - lo + 1;
-   if (bigN < 2) return;
-
-   hp = 0;
-   while (incs[hp] < bigN) hp++;
-   hp--;
-
-   for (; hp >= 0; hp--) {
-      h = incs[hp];
-
-      i = lo + h;
-      while (True) {
-
-         /*-- copy 1 --*/
-         if (i > hi) break;
-         v = ptr[i];
-         j = i;
-         while ( mainGtU ( 
-                    ptr[j-h]+d, v+d, block, quadrant, nblock, budget 
-                 ) ) {
-            ptr[j] = ptr[j-h];
-            j = j - h;
-            if (j <= (lo + h - 1)) break;
-         }
-         ptr[j] = v;
-         i++;
-
-         /*-- copy 2 --*/
-         if (i > hi) break;
-         v = ptr[i];
-         j = i;
-         while ( mainGtU ( 
-                    ptr[j-h]+d, v+d, block, quadrant, nblock, budget 
-                 ) ) {
-            ptr[j] = ptr[j-h];
-            j = j - h;
-            if (j <= (lo + h - 1)) break;
-         }
-         ptr[j] = v;
-         i++;
-
-         /*-- copy 3 --*/
-         if (i > hi) break;
-         v = ptr[i];
-         j = i;
-         while ( mainGtU ( 
-                    ptr[j-h]+d, v+d, block, quadrant, nblock, budget 
-                 ) ) {
-            ptr[j] = ptr[j-h];
-            j = j - h;
-            if (j <= (lo + h - 1)) break;
-         }
-         ptr[j] = v;
-         i++;
-
-         if (*budget < 0) return;
-      }
-   }
-}
-
-
-/*---------------------------------------------*/
-/*--
-   The following is an implementation of
-   an elegant 3-way quicksort for strings,
-   described in a paper "Fast Algorithms for
-   Sorting and Searching Strings", by Robert
-   Sedgewick and Jon L. Bentley.
---*/
-
-#define mswap(zz1, zz2) \
-   { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; }
-
-#define mvswap(zzp1, zzp2, zzn)       \
-{                                     \
-   Int32 yyp1 = (zzp1);               \
-   Int32 yyp2 = (zzp2);               \
-   Int32 yyn  = (zzn);                \
-   while (yyn > 0) {                  \
-      mswap(ptr[yyp1], ptr[yyp2]);    \
-      yyp1++; yyp2++; yyn--;          \
-   }                                  \
-}
-
-static 
-__inline__
-UChar mmed3 ( UChar a, UChar b, UChar c )
-{
-   UChar t;
-   if (a > b) { t = a; a = b; b = t; };
-   if (b > c) { 
-      b = c;
-      if (a > b) b = a;
-   }
-   return b;
-}
-
-#define mmin(a,b) ((a) < (b)) ? (a) : (b)
-
-#define mpush(lz,hz,dz) { stackLo[sp] = lz; \
-                          stackHi[sp] = hz; \
-                          stackD [sp] = dz; \
-                          sp++; }
-
-#define mpop(lz,hz,dz) { sp--;             \
-                         lz = stackLo[sp]; \
-                         hz = stackHi[sp]; \
-                         dz = stackD [sp]; }
-
-
-#define mnextsize(az) (nextHi[az]-nextLo[az])
-
-#define mnextswap(az,bz)                                        \
-   { Int32 tz;                                                  \
-     tz = nextLo[az]; nextLo[az] = nextLo[bz]; nextLo[bz] = tz; \
-     tz = nextHi[az]; nextHi[az] = nextHi[bz]; nextHi[bz] = tz; \
-     tz = nextD [az]; nextD [az] = nextD [bz]; nextD [bz] = tz; }
-
-
-#define MAIN_QSORT_SMALL_THRESH 20
-#define MAIN_QSORT_DEPTH_THRESH (BZ_N_RADIX + BZ_N_QSORT)
-#define MAIN_QSORT_STACK_SIZE 100
-
-static
-void mainQSort3 ( UInt32* ptr,
-                  UChar*  block,
-                  UInt16* quadrant,
-                  Int32   nblock,
-                  Int32   loSt, 
-                  Int32   hiSt, 
-                  Int32   dSt,
-                  Int32*  budget )
-{
-   Int32 unLo, unHi, ltLo, gtHi, n, m, med;
-   Int32 sp, lo, hi, d;
-
-   Int32 stackLo[MAIN_QSORT_STACK_SIZE];
-   Int32 stackHi[MAIN_QSORT_STACK_SIZE];
-   Int32 stackD [MAIN_QSORT_STACK_SIZE];
-
-   Int32 nextLo[3];
-   Int32 nextHi[3];
-   Int32 nextD [3];
-
-   sp = 0;
-   mpush ( loSt, hiSt, dSt );
-
-   while (sp > 0) {
-
-      AssertH ( sp < MAIN_QSORT_STACK_SIZE - 2, 1001 );
-
-      mpop ( lo, hi, d );
-      if (hi - lo < MAIN_QSORT_SMALL_THRESH || 
-          d > MAIN_QSORT_DEPTH_THRESH) {
-         mainSimpleSort ( ptr, block, quadrant, nblock, lo, hi, d, budget );
-         if (*budget < 0) return;
-         continue;
-      }
-
-      med = (Int32) 
-            mmed3 ( block[ptr[ lo         ]+d],
-                    block[ptr[ hi         ]+d],
-                    block[ptr[ (lo+hi)>>1 ]+d] );
-
-      unLo = ltLo = lo;
-      unHi = gtHi = hi;
-
-      while (True) {
-         while (True) {
-            if (unLo > unHi) break;
-            n = ((Int32)block[ptr[unLo]+d]) - med;
-            if (n == 0) { 
-               mswap(ptr[unLo], ptr[ltLo]); 
-               ltLo++; unLo++; continue; 
-            };
-            if (n >  0) break;
-            unLo++;
-         }
-         while (True) {
-            if (unLo > unHi) break;
-            n = ((Int32)block[ptr[unHi]+d]) - med;
-            if (n == 0) { 
-               mswap(ptr[unHi], ptr[gtHi]); 
-               gtHi--; unHi--; continue; 
-            };
-            if (n <  0) break;
-            unHi--;
-         }
-         if (unLo > unHi) break;
-         mswap(ptr[unLo], ptr[unHi]); unLo++; unHi--;
-      }
-
-      AssertD ( unHi == unLo-1, "mainQSort3(2)" );
-
-      if (gtHi < ltLo) {
-         mpush(lo, hi, d+1 );
-         continue;
-      }
-
-      n = mmin(ltLo-lo, unLo-ltLo); mvswap(lo, unLo-n, n);
-      m = mmin(hi-gtHi, gtHi-unHi); mvswap(unLo, hi-m+1, m);
-
-      n = lo + unLo - ltLo - 1;
-      m = hi - (gtHi - unHi) + 1;
-
-      nextLo[0] = lo;  nextHi[0] = n;   nextD[0] = d;
-      nextLo[1] = m;   nextHi[1] = hi;  nextD[1] = d;
-      nextLo[2] = n+1; nextHi[2] = m-1; nextD[2] = d+1;
-
-      if (mnextsize(0) < mnextsize(1)) mnextswap(0,1);
-      if (mnextsize(1) < mnextsize(2)) mnextswap(1,2);
-      if (mnextsize(0) < mnextsize(1)) mnextswap(0,1);
-
-      AssertD (mnextsize(0) >= mnextsize(1), "mainQSort3(8)" );
-      AssertD (mnextsize(1) >= mnextsize(2), "mainQSort3(9)" );
-
-      mpush (nextLo[0], nextHi[0], nextD[0]);
-      mpush (nextLo[1], nextHi[1], nextD[1]);
-      mpush (nextLo[2], nextHi[2], nextD[2]);
-   }
-}
-
-#undef mswap
-#undef mvswap
-#undef mpush
-#undef mpop
-#undef mmin
-#undef mnextsize
-#undef mnextswap
-#undef MAIN_QSORT_SMALL_THRESH
-#undef MAIN_QSORT_DEPTH_THRESH
-#undef MAIN_QSORT_STACK_SIZE
-
-
-/*---------------------------------------------*/
-/* Pre:
-      nblock > N_OVERSHOOT
-      block32 exists for [0 .. nblock-1 +N_OVERSHOOT]
-      ((UChar*)block32) [0 .. nblock-1] holds block
-      ptr exists for [0 .. nblock-1]
-
-   Post:
-      ((UChar*)block32) [0 .. nblock-1] holds block
-      All other areas of block32 destroyed
-      ftab [0 .. 65536 ] destroyed
-      ptr [0 .. nblock-1] holds sorted order
-      if (*budget < 0), sorting was abandoned
-*/
-
-#define BIGFREQ(b) (ftab[((b)+1) << 8] - ftab[(b) << 8])
-#define SETMASK (1 << 21)
-#define CLEARMASK (~(SETMASK))
-
-static
-void mainSort ( UInt32* ptr, 
-                UChar*  block,
-                UInt16* quadrant, 
-                UInt32* ftab,
-                Int32   nblock,
-                Int32   verb,
-                Int32*  budget )
-{
-   Int32  i, j, k, ss, sb;
-   Int32  runningOrder[256];
-   Bool   bigDone[256];
-   Int32  copyStart[256];
-   Int32  copyEnd  [256];
-   UChar  c1;
-   Int32  numQSorted;
-   UInt16 s;
-   if (verb >= 4) VPrintf0 ( "        main sort initialise ...\n" );
-
-   /*-- set up the 2-byte frequency table --*/
-   for (i = 65536; i >= 0; i--) ftab[i] = 0;
-
-   j = block[0] << 8;
-   i = nblock-1;
-   for (; i >= 3; i -= 4) {
-      quadrant[i] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i]) << 8);
-      ftab[j]++;
-      quadrant[i-1] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i-1]) << 8);
-      ftab[j]++;
-      quadrant[i-2] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i-2]) << 8);
-      ftab[j]++;
-      quadrant[i-3] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i-3]) << 8);
-      ftab[j]++;
-   }
-   for (; i >= 0; i--) {
-      quadrant[i] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i]) << 8);
-      ftab[j]++;
-   }
-
-   /*-- (emphasises close relationship of block & quadrant) --*/
-   for (i = 0; i < BZ_N_OVERSHOOT; i++) {
-      block   [nblock+i] = block[i];
-      quadrant[nblock+i] = 0;
-   }
-
-   if (verb >= 4) VPrintf0 ( "        bucket sorting ...\n" );
-
-   /*-- Complete the initial radix sort --*/
-   for (i = 1; i <= 65536; i++) ftab[i] += ftab[i-1];
-
-   s = block[0] << 8;
-   i = nblock-1;
-   for (; i >= 3; i -= 4) {
-      s = (s >> 8) | (block[i] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i;
-      s = (s >> 8) | (block[i-1] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i-1;
-      s = (s >> 8) | (block[i-2] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i-2;
-      s = (s >> 8) | (block[i-3] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i-3;
-   }
-   for (; i >= 0; i--) {
-      s = (s >> 8) | (block[i] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i;
-   }
-
-   /*--
-      Now ftab contains the first loc of every small bucket.
-      Calculate the running order, from smallest to largest
-      big bucket.
-   --*/
-   for (i = 0; i <= 255; i++) {
-      bigDone     [i] = False;
-      runningOrder[i] = i;
-   }
-
-   {
-      Int32 vv;
-      Int32 h = 1;
-      do h = 3 * h + 1; while (h <= 256);
-      do {
-         h = h / 3;
-         for (i = h; i <= 255; i++) {
-            vv = runningOrder[i];
-            j = i;
-            while ( BIGFREQ(runningOrder[j-h]) > BIGFREQ(vv) ) {
-               runningOrder[j] = runningOrder[j-h];
-               j = j - h;
-               if (j <= (h - 1)) goto zero;
-            }
-            zero:
-            runningOrder[j] = vv;
-         }
-      } while (h != 1);
-   }
-
-   /*--
-      The main sorting loop.
-   --*/
-
-   numQSorted = 0;
-
-   for (i = 0; i <= 255; i++) {
-
-      /*--
-         Process big buckets, starting with the least full.
-         Basically this is a 3-step process in which we call
-         mainQSort3 to sort the small buckets [ss, j], but
-         also make a big effort to avoid the calls if we can.
-      --*/
-      ss = runningOrder[i];
-
-      /*--
-         Step 1:
-         Complete the big bucket [ss] by quicksorting
-         any unsorted small buckets [ss, j], for j != ss.  
-         Hopefully previous pointer-scanning phases have already
-         completed many of the small buckets [ss, j], so
-         we don't have to sort them at all.
-      --*/
-      for (j = 0; j <= 255; j++) {
-         if (j != ss) {
-            sb = (ss << 8) + j;
-            if ( ! (ftab[sb] & SETMASK) ) {
-               Int32 lo = ftab[sb]   & CLEARMASK;
-               Int32 hi = (ftab[sb+1] & CLEARMASK) - 1;
-               if (hi > lo) {
-                  if (verb >= 4)
-                     VPrintf4 ( "        qsort [0x%x, 0x%x]   "
-                                "done %d   this %d\n",
-                                ss, j, numQSorted, hi - lo + 1 );
-                  mainQSort3 ( 
-                     ptr, block, quadrant, nblock, 
-                     lo, hi, BZ_N_RADIX, budget 
-                  );   
-                  numQSorted += (hi - lo + 1);
-                  if (*budget < 0) return;
-               }
-            }
-            ftab[sb] |= SETMASK;
-         }
-      }
-
-      AssertH ( !bigDone[ss], 1006 );
-
-      /*--
-         Step 2:
-         Now scan this big bucket [ss] so as to synthesise the
-         sorted order for small buckets [t, ss] for all t,
-         including, magically, the bucket [ss,ss] too.
-         This will avoid doing Real Work in subsequent Step 1's.
-      --*/
-      {
-         for (j = 0; j <= 255; j++) {
-            copyStart[j] =  ftab[(j << 8) + ss]     & CLEARMASK;
-            copyEnd  [j] = (ftab[(j << 8) + ss + 1] & CLEARMASK) - 1;
-         }
-         for (j = ftab[ss << 8] & CLEARMASK; j < copyStart[ss]; j++) {
-            k = ptr[j]-1; if (k < 0) k += nblock;
-            c1 = block[k];
-            if (!bigDone[c1])
-               ptr[ copyStart[c1]++ ] = k;
-         }
-         for (j = (ftab[(ss+1) << 8] & CLEARMASK) - 1; j > copyEnd[ss]; j--) {
-            k = ptr[j]-1; if (k < 0) k += nblock;
-            c1 = block[k];
-            if (!bigDone[c1]) 
-               ptr[ copyEnd[c1]-- ] = k;
-         }
-      }
-
-      AssertH ( (copyStart[ss]-1 == copyEnd[ss])
-                || 
-                /* Extremely rare case missing in bzip2-1.0.0 and 1.0.1.
-                   Necessity for this case is demonstrated by compressing 
-                   a sequence of approximately 48.5 million of character 
-                   251; 1.0.0/1.0.1 will then die here. */
-                (copyStart[ss] == 0 && copyEnd[ss] == nblock-1),
-                1007 )
-
-      for (j = 0; j <= 255; j++) ftab[(j << 8) + ss] |= SETMASK;
-
-      /*--
-         Step 3:
-         The [ss] big bucket is now done.  Record this fact,
-         and update the quadrant descriptors.  Remember to
-         update quadrants in the overshoot area too, if
-         necessary.  The "if (i < 255)" test merely skips
-         this updating for the last bucket processed, since
-         updating for the last bucket is pointless.
-
-         The quadrant array provides a way to incrementally
-         cache sort orderings, as they appear, so as to 
-         make subsequent comparisons in fullGtU() complete
-         faster.  For repetitive blocks this makes a big
-         difference (but not big enough to be able to avoid
-         the fallback sorting mechanism, exponential radix sort).
-
-         The precise meaning is: at all times:
-
-            for 0 <= i < nblock and 0 <= j <= nblock
-
-            if block[i] != block[j], 
-
-               then the relative values of quadrant[i] and 
-                    quadrant[j] are meaningless.
-
-               else {
-                  if quadrant[i] < quadrant[j]
-                     then the string starting at i lexicographically
-                     precedes the string starting at j
-
-                  else if quadrant[i] > quadrant[j]
-                     then the string starting at j lexicographically
-                     precedes the string starting at i
-
-                  else
-                     the relative ordering of the strings starting
-                     at i and j has not yet been determined.
-               }
-      --*/
-      bigDone[ss] = True;
-
-      if (i < 255) {
-         Int32 bbStart  = ftab[ss << 8] & CLEARMASK;
-         Int32 bbSize   = (ftab[(ss+1) << 8] & CLEARMASK) - bbStart;
-         Int32 shifts   = 0;
-
-         while ((bbSize >> shifts) > 65534) shifts++;
-
-         for (j = bbSize-1; j >= 0; j--) {
-            Int32 a2update     = ptr[bbStart + j];
-            UInt16 qVal        = (UInt16)(j >> shifts);
-            quadrant[a2update] = qVal;
-            if (a2update < BZ_N_OVERSHOOT)
-               quadrant[a2update + nblock] = qVal;
-         }
-         AssertH ( ((bbSize-1) >> shifts) <= 65535, 1002 );
-      }
-
-   }
-
-   if (verb >= 4)
-      VPrintf3 ( "        %d pointers, %d sorted, %d scanned\n",
-                 nblock, numQSorted, nblock - numQSorted );
-}
-
-#undef BIGFREQ
-#undef SETMASK
-#undef CLEARMASK
-
-
-/*---------------------------------------------*/
-/* Pre:
-      nblock > 0
-      arr2 exists for [0 .. nblock-1 +N_OVERSHOOT]
-      ((UChar*)arr2)  [0 .. nblock-1] holds block
-      arr1 exists for [0 .. nblock-1]
-
-   Post:
-      ((UChar*)arr2) [0 .. nblock-1] holds block
-      All other areas of block destroyed
-      ftab [ 0 .. 65536 ] destroyed
-      arr1 [0 .. nblock-1] holds sorted order
-*/
-void BZ2_blockSort ( EState* s )
-{
-   UInt32* ptr    = s->ptr; 
-   UChar*  block  = s->block;
-   UInt32* ftab   = s->ftab;
-   Int32   nblock = s->nblock;
-   Int32   verb   = s->verbosity;
-   Int32   wfact  = s->workFactor;
-   UInt16* quadrant;
-   Int32   budget;
-   Int32   budgetInit;
-   Int32   i;
-
-   if (nblock < 10000) {
-      fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb );
-   } else {
-      /* Calculate the location for quadrant, remembering to get
-         the alignment right.  Assumes that &(block[0]) is at least
-         2-byte aligned -- this should be ok since block is really
-         the first section of arr2.
-      */
-      i = nblock+BZ_N_OVERSHOOT;
-      if (i & 1) i++;
-      quadrant = (UInt16*)(&(block[i]));
-
-      /* (wfact-1) / 3 puts the default-factor-30
-         transition point at very roughly the same place as 
-         with v0.1 and v0.9.0.  
-         Not that it particularly matters any more, since the
-         resulting compressed stream is now the same regardless
-         of whether or not we use the main sort or fallback sort.
-      */
-      if (wfact < 1  ) wfact = 1;
-      if (wfact > 100) wfact = 100;
-      budgetInit = nblock * ((wfact-1) / 3);
-      budget = budgetInit;
-
-      mainSort ( ptr, block, quadrant, ftab, nblock, verb, &budget );
-      if (verb >= 3) 
-         VPrintf3 ( "      %d work, %d block, ratio %5.2f\n",
-                    budgetInit - budget,
-                    nblock, 
-                    (float)(budgetInit - budget) /
-                    (float)(nblock==0 ? 1 : nblock) ); 
-      if (budget < 0) {
-         if (verb >= 2) 
-            VPrintf0 ( "    too repetitive; using fallback"
-                       " sorting algorithm\n" );
-         fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb );
-      }
-   }
-
-   s->origPtr = -1;
-   for (i = 0; i < s->nblock; i++)
-      if (ptr[i] == 0)
-         { s->origPtr = i; break; };
-
-   AssertH( s->origPtr != -1, 1003 );
-}
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                       blocksort.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/dep/src/bzip2/bzlib.c b/dep/src/bzip2/bzlib.c
deleted file mode 100644
index ef86c91e6..000000000
--- a/dep/src/bzip2/bzlib.c
+++ /dev/null
@@ -1,1572 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Library top-level functions.                          ---*/
-/*---                                               bzlib.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-/* CHANGES
-   0.9.0    -- original version.
-   0.9.0a/b -- no changes in this file.
-   0.9.0c   -- made zero-length BZ_FLUSH work correctly in bzCompress().
-     fixed bzWrite/bzRead to ignore zero-length requests.
-     fixed bzread to correctly handle read requests after EOF.
-     wrong parameter order in call to bzDecompressInit in
-     bzBuffToBuffDecompress.  Fixed.
-*/
-
-#include "bzlib_private.h"
-
-
-/*---------------------------------------------------*/
-/*--- Compression stuff                           ---*/
-/*---------------------------------------------------*/
-
-
-/*---------------------------------------------------*/
-#ifndef BZ_NO_STDIO
-void BZ2_bz__AssertH__fail ( int errcode )
-{
-   fprintf(stderr, 
-      "\n\nbzip2/libbzip2: internal error number %d.\n"
-      "This is a bug in bzip2/libbzip2, %s.\n"
-      "Please report it to me at: jseward@bzip.org.  If this happened\n"
-      "when you were using some program which uses libbzip2 as a\n"
-      "component, you should also report this bug to the author(s)\n"
-      "of that program.  Please make an effort to report this bug;\n"
-      "timely and accurate bug reports eventually lead to higher\n"
-      "quality software.  Thanks.  Julian Seward, 10 December 2007.\n\n",
-      errcode,
-      BZ2_bzlibVersion()
-   );
-
-   if (errcode == 1007) {
-   fprintf(stderr,
-      "\n*** A special note about internal error number 1007 ***\n"
-      "\n"
-      "Experience suggests that a common cause of i.e. 1007\n"
-      "is unreliable memory or other hardware.  The 1007 assertion\n"
-      "just happens to cross-check the results of huge numbers of\n"
-      "memory reads/writes, and so acts (unintendedly) as a stress\n"
-      "test of your memory system.\n"
-      "\n"
-      "I suggest the following: try compressing the file again,\n"
-      "possibly monitoring progress in detail with the -vv flag.\n"
-      "\n"
-      "* If the error cannot be reproduced, and/or happens at different\n"
-      "  points in compression, you may have a flaky memory system.\n"
-      "  Try a memory-test program.  I have used Memtest86\n"
-      "  (www.memtest86.com).  At the time of writing it is free (GPLd).\n"
-      "  Memtest86 tests memory much more thorougly than your BIOSs\n"
-      "  power-on test, and may find failures that the BIOS doesn't.\n"
-      "\n"
-      "* If the error can be repeatably reproduced, this is a bug in\n"
-      "  bzip2, and I would very much like to hear about it.  Please\n"
-      "  let me know, and, ideally, save a copy of the file causing the\n"
-      "  problem -- without which I will be unable to investigate it.\n"
-      "\n"
-   );
-   }
-
-   exit(3);
-}
-#endif
-
-
-/*---------------------------------------------------*/
-static
-int bz_config_ok ( void )
-{
-   if (sizeof(int)   != 4) return 0;
-   if (sizeof(short) != 2) return 0;
-   if (sizeof(char)  != 1) return 0;
-   return 1;
-}
-
-
-/*---------------------------------------------------*/
-static
-void* default_bzalloc ( void* opaque, Int32 items, Int32 size )
-{
-   void* v = malloc ( items * size );
-   return v;
-}
-
-static
-void default_bzfree ( void* opaque, void* addr )
-{
-   if (addr != NULL) free ( addr );
-}
-
-
-/*---------------------------------------------------*/
-static
-void prepare_new_block ( EState* s )
-{
-   Int32 i;
-   s->nblock = 0;
-   s->numZ = 0;
-   s->state_out_pos = 0;
-   BZ_INITIALISE_CRC ( s->blockCRC );
-   for (i = 0; i < 256; i++) s->inUse[i] = False;
-   s->blockNo++;
-}
-
-
-/*---------------------------------------------------*/
-static
-void init_RL ( EState* s )
-{
-   s->state_in_ch  = 256;
-   s->state_in_len = 0;
-}
-
-
-static
-Bool isempty_RL ( EState* s )
-{
-   if (s->state_in_ch < 256 && s->state_in_len > 0)
-      return False; else
-      return True;
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzCompressInit) 
-                    ( bz_stream* strm, 
-                     int        blockSize100k,
-                     int        verbosity,
-                     int        workFactor )
-{
-   Int32   n;
-   EState* s;
-
-   if (!bz_config_ok()) return BZ_CONFIG_ERROR;
-
-   if (strm == NULL || 
-       blockSize100k < 1 || blockSize100k > 9 ||
-       workFactor < 0 || workFactor > 250)
-     return BZ_PARAM_ERROR;
-
-   if (workFactor == 0) workFactor = 30;
-   if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc;
-   if (strm->bzfree == NULL) strm->bzfree = default_bzfree;
-
-   s = BZALLOC( sizeof(EState) );
-   if (s == NULL) return BZ_MEM_ERROR;
-   s->strm = strm;
-
-   s->arr1 = NULL;
-   s->arr2 = NULL;
-   s->ftab = NULL;
-
-   n       = 100000 * blockSize100k;
-   s->arr1 = BZALLOC( n                  * sizeof(UInt32) );
-   s->arr2 = BZALLOC( (n+BZ_N_OVERSHOOT) * sizeof(UInt32) );
-   s->ftab = BZALLOC( 65537              * sizeof(UInt32) );
-
-   if (s->arr1 == NULL || s->arr2 == NULL || s->ftab == NULL) {
-      if (s->arr1 != NULL) BZFREE(s->arr1);
-      if (s->arr2 != NULL) BZFREE(s->arr2);
-      if (s->ftab != NULL) BZFREE(s->ftab);
-      if (s       != NULL) BZFREE(s);
-      return BZ_MEM_ERROR;
-   }
-
-   s->blockNo           = 0;
-   s->state             = BZ_S_INPUT;
-   s->mode              = BZ_M_RUNNING;
-   s->combinedCRC       = 0;
-   s->blockSize100k     = blockSize100k;
-   s->nblockMAX         = 100000 * blockSize100k - 19;
-   s->verbosity         = verbosity;
-   s->workFactor        = workFactor;
-
-   s->block             = (UChar*)s->arr2;
-   s->mtfv              = (UInt16*)s->arr1;
-   s->zbits             = NULL;
-   s->ptr               = (UInt32*)s->arr1;
-
-   strm->state          = s;
-   strm->total_in_lo32  = 0;
-   strm->total_in_hi32  = 0;
-   strm->total_out_lo32 = 0;
-   strm->total_out_hi32 = 0;
-   init_RL ( s );
-   prepare_new_block ( s );
-   return BZ_OK;
-}
-
-
-/*---------------------------------------------------*/
-static
-void add_pair_to_block ( EState* s )
-{
-   Int32 i;
-   UChar ch = (UChar)(s->state_in_ch);
-   for (i = 0; i < s->state_in_len; i++) {
-      BZ_UPDATE_CRC( s->blockCRC, ch );
-   }
-   s->inUse[s->state_in_ch] = True;
-   switch (s->state_in_len) {
-      case 1:
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         break;
-      case 2:
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         break;
-      case 3:
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         break;
-      default:
-         s->inUse[s->state_in_len-4] = True;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = ((UChar)(s->state_in_len-4));
-         s->nblock++;
-         break;
-   }
-}
-
-
-/*---------------------------------------------------*/
-static
-void flush_RL ( EState* s )
-{
-   if (s->state_in_ch < 256) add_pair_to_block ( s );
-   init_RL ( s );
-}
-
-
-/*---------------------------------------------------*/
-#define ADD_CHAR_TO_BLOCK(zs,zchh0)               \
-{                                                 \
-   UInt32 zchh = (UInt32)(zchh0);                 \
-   /*-- fast track the common case --*/           \
-   if (zchh != zs->state_in_ch &&                 \
-       zs->state_in_len == 1) {                   \
-      UChar ch = (UChar)(zs->state_in_ch);        \
-      BZ_UPDATE_CRC( zs->blockCRC, ch );          \
-      zs->inUse[zs->state_in_ch] = True;          \
-      zs->block[zs->nblock] = (UChar)ch;          \
-      zs->nblock++;                               \
-      zs->state_in_ch = zchh;                     \
-   }                                              \
-   else                                           \
-   /*-- general, uncommon cases --*/              \
-   if (zchh != zs->state_in_ch ||                 \
-      zs->state_in_len == 255) {                  \
-      if (zs->state_in_ch < 256)                  \
-         add_pair_to_block ( zs );                \
-      zs->state_in_ch = zchh;                     \
-      zs->state_in_len = 1;                       \
-   } else {                                       \
-      zs->state_in_len++;                         \
-   }                                              \
-}
-
-
-/*---------------------------------------------------*/
-static
-Bool copy_input_until_stop ( EState* s )
-{
-   Bool progress_in = False;
-
-   if (s->mode == BZ_M_RUNNING) {
-
-      /*-- fast track the common case --*/
-      while (True) {
-         /*-- block full? --*/
-         if (s->nblock >= s->nblockMAX) break;
-         /*-- no input? --*/
-         if (s->strm->avail_in == 0) break;
-         progress_in = True;
-         ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); 
-         s->strm->next_in++;
-         s->strm->avail_in--;
-         s->strm->total_in_lo32++;
-         if (s->strm->total_in_lo32 == 0) s->strm->total_in_hi32++;
-      }
-
-   } else {
-
-      /*-- general, uncommon case --*/
-      while (True) {
-         /*-- block full? --*/
-         if (s->nblock >= s->nblockMAX) break;
-         /*-- no input? --*/
-         if (s->strm->avail_in == 0) break;
-         /*-- flush/finish end? --*/
-         if (s->avail_in_expect == 0) break;
-         progress_in = True;
-         ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); 
-         s->strm->next_in++;
-         s->strm->avail_in--;
-         s->strm->total_in_lo32++;
-         if (s->strm->total_in_lo32 == 0) s->strm->total_in_hi32++;
-         s->avail_in_expect--;
-      }
-   }
-   return progress_in;
-}
-
-
-/*---------------------------------------------------*/
-static
-Bool copy_output_until_stop ( EState* s )
-{
-   Bool progress_out = False;
-
-   while (True) {
-
-      /*-- no output space? --*/
-      if (s->strm->avail_out == 0) break;
-
-      /*-- block done? --*/
-      if (s->state_out_pos >= s->numZ) break;
-
-      progress_out = True;
-      *(s->strm->next_out) = s->zbits[s->state_out_pos];
-      s->state_out_pos++;
-      s->strm->avail_out--;
-      s->strm->next_out++;
-      s->strm->total_out_lo32++;
-      if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
-   }
-
-   return progress_out;
-}
-
-
-/*---------------------------------------------------*/
-static
-Bool handle_compress ( bz_stream* strm )
-{
-   Bool progress_in  = False;
-   Bool progress_out = False;
-   EState* s = strm->state;
-   
-   while (True) {
-
-      if (s->state == BZ_S_OUTPUT) {
-         progress_out |= copy_output_until_stop ( s );
-         if (s->state_out_pos < s->numZ) break;
-         if (s->mode == BZ_M_FINISHING && 
-             s->avail_in_expect == 0 &&
-             isempty_RL(s)) break;
-         prepare_new_block ( s );
-         s->state = BZ_S_INPUT;
-         if (s->mode == BZ_M_FLUSHING && 
-             s->avail_in_expect == 0 &&
-             isempty_RL(s)) break;
-      }
-
-      if (s->state == BZ_S_INPUT) {
-         progress_in |= copy_input_until_stop ( s );
-         if (s->mode != BZ_M_RUNNING && s->avail_in_expect == 0) {
-            flush_RL ( s );
-            BZ2_compressBlock ( s, (Bool)(s->mode == BZ_M_FINISHING) );
-            s->state = BZ_S_OUTPUT;
-         }
-         else
-         if (s->nblock >= s->nblockMAX) {
-            BZ2_compressBlock ( s, False );
-            s->state = BZ_S_OUTPUT;
-         }
-         else
-         if (s->strm->avail_in == 0) {
-            break;
-         }
-      }
-
-   }
-
-   return progress_in || progress_out;
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzCompress) ( bz_stream *strm, int action )
-{
-   Bool progress;
-   EState* s;
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   s = strm->state;
-   if (s == NULL) return BZ_PARAM_ERROR;
-   if (s->strm != strm) return BZ_PARAM_ERROR;
-
-   preswitch:
-   switch (s->mode) {
-
-      case BZ_M_IDLE:
-         return BZ_SEQUENCE_ERROR;
-
-      case BZ_M_RUNNING:
-         if (action == BZ_RUN) {
-            progress = handle_compress ( strm );
-            return progress ? BZ_RUN_OK : BZ_PARAM_ERROR;
-         } 
-         else
-	 if (action == BZ_FLUSH) {
-            s->avail_in_expect = strm->avail_in;
-            s->mode = BZ_M_FLUSHING;
-            goto preswitch;
-         }
-         else
-         if (action == BZ_FINISH) {
-            s->avail_in_expect = strm->avail_in;
-            s->mode = BZ_M_FINISHING;
-            goto preswitch;
-         }
-         else 
-            return BZ_PARAM_ERROR;
-
-      case BZ_M_FLUSHING:
-         if (action != BZ_FLUSH) return BZ_SEQUENCE_ERROR;
-         if (s->avail_in_expect != s->strm->avail_in) 
-            return BZ_SEQUENCE_ERROR;
-         progress = handle_compress ( strm );
-         if (s->avail_in_expect > 0 || !isempty_RL(s) ||
-             s->state_out_pos < s->numZ) return BZ_FLUSH_OK;
-         s->mode = BZ_M_RUNNING;
-         return BZ_RUN_OK;
-
-      case BZ_M_FINISHING:
-         if (action != BZ_FINISH) return BZ_SEQUENCE_ERROR;
-         if (s->avail_in_expect != s->strm->avail_in) 
-            return BZ_SEQUENCE_ERROR;
-         progress = handle_compress ( strm );
-         if (!progress) return BZ_SEQUENCE_ERROR;
-         if (s->avail_in_expect > 0 || !isempty_RL(s) ||
-             s->state_out_pos < s->numZ) return BZ_FINISH_OK;
-         s->mode = BZ_M_IDLE;
-         return BZ_STREAM_END;
-   }
-   return BZ_OK; /*--not reached--*/
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzCompressEnd)  ( bz_stream *strm )
-{
-   EState* s;
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   s = strm->state;
-   if (s == NULL) return BZ_PARAM_ERROR;
-   if (s->strm != strm) return BZ_PARAM_ERROR;
-
-   if (s->arr1 != NULL) BZFREE(s->arr1);
-   if (s->arr2 != NULL) BZFREE(s->arr2);
-   if (s->ftab != NULL) BZFREE(s->ftab);
-   BZFREE(strm->state);
-
-   strm->state = NULL;   
-
-   return BZ_OK;
-}
-
-
-/*---------------------------------------------------*/
-/*--- Decompression stuff                         ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzDecompressInit) 
-                     ( bz_stream* strm, 
-                       int        verbosity,
-                       int        small )
-{
-   DState* s;
-
-   if (!bz_config_ok()) return BZ_CONFIG_ERROR;
-
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   if (small != 0 && small != 1) return BZ_PARAM_ERROR;
-   if (verbosity < 0 || verbosity > 4) return BZ_PARAM_ERROR;
-
-   if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc;
-   if (strm->bzfree == NULL) strm->bzfree = default_bzfree;
-
-   s = BZALLOC( sizeof(DState) );
-   if (s == NULL) return BZ_MEM_ERROR;
-   s->strm                  = strm;
-   strm->state              = s;
-   s->state                 = BZ_X_MAGIC_1;
-   s->bsLive                = 0;
-   s->bsBuff                = 0;
-   s->calculatedCombinedCRC = 0;
-   strm->total_in_lo32      = 0;
-   strm->total_in_hi32      = 0;
-   strm->total_out_lo32     = 0;
-   strm->total_out_hi32     = 0;
-   s->smallDecompress       = (Bool)small;
-   s->ll4                   = NULL;
-   s->ll16                  = NULL;
-   s->tt                    = NULL;
-   s->currBlockNo           = 0;
-   s->verbosity             = verbosity;
-
-   return BZ_OK;
-}
-
-
-/*---------------------------------------------------*/
-/* Return  True iff data corruption is discovered.
-   Returns False if there is no problem.
-*/
-static
-Bool unRLE_obuf_to_output_FAST ( DState* s )
-{
-   UChar k1;
-
-   if (s->blockRandomised) {
-
-      while (True) {
-         /* try to finish existing run */
-         while (True) {
-            if (s->strm->avail_out == 0) return False;
-            if (s->state_out_len == 0) break;
-            *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
-            BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
-            s->state_out_len--;
-            s->strm->next_out++;
-            s->strm->avail_out--;
-            s->strm->total_out_lo32++;
-            if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
-         }
-
-         /* can a new run be started? */
-         if (s->nblock_used == s->save_nblock+1) return False;
-               
-         /* Only caused by corrupt data stream? */
-         if (s->nblock_used > s->save_nblock+1)
-            return True;
-   
-         s->state_out_len = 1;
-         s->state_out_ch = s->k0;
-         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 2;
-         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 3;
-         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         s->state_out_len = ((Int32)k1) + 4;
-         BZ_GET_FAST(s->k0); BZ_RAND_UPD_MASK; 
-         s->k0 ^= BZ_RAND_MASK; s->nblock_used++;
-      }
-
-   } else {
-
-      /* restore */
-      UInt32        c_calculatedBlockCRC = s->calculatedBlockCRC;
-      UChar         c_state_out_ch       = s->state_out_ch;
-      Int32         c_state_out_len      = s->state_out_len;
-      Int32         c_nblock_used        = s->nblock_used;
-      Int32         c_k0                 = s->k0;
-      UInt32*       c_tt                 = s->tt;
-      UInt32        c_tPos               = s->tPos;
-      char*         cs_next_out          = s->strm->next_out;
-      unsigned int  cs_avail_out         = s->strm->avail_out;
-      Int32         ro_blockSize100k     = s->blockSize100k;
-      /* end restore */
-
-      UInt32       avail_out_INIT = cs_avail_out;
-      Int32        s_save_nblockPP = s->save_nblock+1;
-      unsigned int total_out_lo32_old;
-
-      while (True) {
-
-         /* try to finish existing run */
-         if (c_state_out_len > 0) {
-            while (True) {
-               if (cs_avail_out == 0) goto return_notr;
-               if (c_state_out_len == 1) break;
-               *( (UChar*)(cs_next_out) ) = c_state_out_ch;
-               BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch );
-               c_state_out_len--;
-               cs_next_out++;
-               cs_avail_out--;
-            }
-            s_state_out_len_eq_one:
-            {
-               if (cs_avail_out == 0) { 
-                  c_state_out_len = 1; goto return_notr;
-               };
-               *( (UChar*)(cs_next_out) ) = c_state_out_ch;
-               BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch );
-               cs_next_out++;
-               cs_avail_out--;
-            }
-         }   
-         /* Only caused by corrupt data stream? */
-         if (c_nblock_used > s_save_nblockPP)
-            return True;
-
-         /* can a new run be started? */
-         if (c_nblock_used == s_save_nblockPP) {
-            c_state_out_len = 0; goto return_notr;
-         };   
-         c_state_out_ch = c_k0;
-         BZ_GET_FAST_C(k1); c_nblock_used++;
-         if (k1 != c_k0) { 
-            c_k0 = k1; goto s_state_out_len_eq_one; 
-         };
-         if (c_nblock_used == s_save_nblockPP) 
-            goto s_state_out_len_eq_one;
-   
-         c_state_out_len = 2;
-         BZ_GET_FAST_C(k1); c_nblock_used++;
-         if (c_nblock_used == s_save_nblockPP) continue;
-         if (k1 != c_k0) { c_k0 = k1; continue; };
-   
-         c_state_out_len = 3;
-         BZ_GET_FAST_C(k1); c_nblock_used++;
-         if (c_nblock_used == s_save_nblockPP) continue;
-         if (k1 != c_k0) { c_k0 = k1; continue; };
-   
-         BZ_GET_FAST_C(k1); c_nblock_used++;
-         c_state_out_len = ((Int32)k1) + 4;
-         BZ_GET_FAST_C(c_k0); c_nblock_used++;
-      }
-
-      return_notr:
-      total_out_lo32_old = s->strm->total_out_lo32;
-      s->strm->total_out_lo32 += (avail_out_INIT - cs_avail_out);
-      if (s->strm->total_out_lo32 < total_out_lo32_old)
-         s->strm->total_out_hi32++;
-
-      /* save */
-      s->calculatedBlockCRC = c_calculatedBlockCRC;
-      s->state_out_ch       = c_state_out_ch;
-      s->state_out_len      = c_state_out_len;
-      s->nblock_used        = c_nblock_used;
-      s->k0                 = c_k0;
-      s->tt                 = c_tt;
-      s->tPos               = c_tPos;
-      s->strm->next_out     = cs_next_out;
-      s->strm->avail_out    = cs_avail_out;
-      /* end save */
-   }
-   return False;
-}
-
-
-
-/*---------------------------------------------------*/
-__inline__ Int32 BZ2_indexIntoF ( Int32 indx, Int32 *cftab )
-{
-   Int32 nb, na, mid;
-   nb = 0;
-   na = 256;
-   do {
-      mid = (nb + na) >> 1;
-      if (indx >= cftab[mid]) nb = mid; else na = mid;
-   }
-   while (na - nb != 1);
-   return nb;
-}
-
-
-/*---------------------------------------------------*/
-/* Return  True iff data corruption is discovered.
-   Returns False if there is no problem.
-*/
-static
-Bool unRLE_obuf_to_output_SMALL ( DState* s )
-{
-   UChar k1;
-
-   if (s->blockRandomised) {
-
-      while (True) {
-         /* try to finish existing run */
-         while (True) {
-            if (s->strm->avail_out == 0) return False;
-            if (s->state_out_len == 0) break;
-            *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
-            BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
-            s->state_out_len--;
-            s->strm->next_out++;
-            s->strm->avail_out--;
-            s->strm->total_out_lo32++;
-            if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
-         }
-   
-         /* can a new run be started? */
-         if (s->nblock_used == s->save_nblock+1) return False;
-
-         /* Only caused by corrupt data stream? */
-         if (s->nblock_used > s->save_nblock+1)
-            return True;
-   
-         s->state_out_len = 1;
-         s->state_out_ch = s->k0;
-         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 2;
-         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 3;
-         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         s->state_out_len = ((Int32)k1) + 4;
-         BZ_GET_SMALL(s->k0); BZ_RAND_UPD_MASK; 
-         s->k0 ^= BZ_RAND_MASK; s->nblock_used++;
-      }
-
-   } else {
-
-      while (True) {
-         /* try to finish existing run */
-         while (True) {
-            if (s->strm->avail_out == 0) return False;
-            if (s->state_out_len == 0) break;
-            *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
-            BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
-            s->state_out_len--;
-            s->strm->next_out++;
-            s->strm->avail_out--;
-            s->strm->total_out_lo32++;
-            if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
-         }
-   
-         /* can a new run be started? */
-         if (s->nblock_used == s->save_nblock+1) return False;
-
-         /* Only caused by corrupt data stream? */
-         if (s->nblock_used > s->save_nblock+1)
-            return True;
-   
-         s->state_out_len = 1;
-         s->state_out_ch = s->k0;
-         BZ_GET_SMALL(k1); s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 2;
-         BZ_GET_SMALL(k1); s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 3;
-         BZ_GET_SMALL(k1); s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         BZ_GET_SMALL(k1); s->nblock_used++;
-         s->state_out_len = ((Int32)k1) + 4;
-         BZ_GET_SMALL(s->k0); s->nblock_used++;
-      }
-
-   }
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzDecompress) ( bz_stream *strm )
-{
-   Bool    corrupt;
-   DState* s;
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   s = strm->state;
-   if (s == NULL) return BZ_PARAM_ERROR;
-   if (s->strm != strm) return BZ_PARAM_ERROR;
-
-   while (True) {
-      if (s->state == BZ_X_IDLE) return BZ_SEQUENCE_ERROR;
-      if (s->state == BZ_X_OUTPUT) {
-         if (s->smallDecompress)
-            corrupt = unRLE_obuf_to_output_SMALL ( s ); else
-            corrupt = unRLE_obuf_to_output_FAST  ( s );
-         if (corrupt) return BZ_DATA_ERROR;
-         if (s->nblock_used == s->save_nblock+1 && s->state_out_len == 0) {
-            BZ_FINALISE_CRC ( s->calculatedBlockCRC );
-            if (s->verbosity >= 3) 
-               VPrintf2 ( " {0x%08x, 0x%08x}", s->storedBlockCRC, 
-                          s->calculatedBlockCRC );
-            if (s->verbosity >= 2) VPrintf0 ( "]" );
-            if (s->calculatedBlockCRC != s->storedBlockCRC)
-               return BZ_DATA_ERROR;
-            s->calculatedCombinedCRC 
-               = (s->calculatedCombinedCRC << 1) | 
-                    (s->calculatedCombinedCRC >> 31);
-            s->calculatedCombinedCRC ^= s->calculatedBlockCRC;
-            s->state = BZ_X_BLKHDR_1;
-         } else {
-            return BZ_OK;
-         }
-      }
-      if (s->state >= BZ_X_MAGIC_1) {
-         Int32 r = BZ2_decompress ( s );
-         if (r == BZ_STREAM_END) {
-            if (s->verbosity >= 3)
-               VPrintf2 ( "\n    combined CRCs: stored = 0x%08x, computed = 0x%08x", 
-                          s->storedCombinedCRC, s->calculatedCombinedCRC );
-            if (s->calculatedCombinedCRC != s->storedCombinedCRC)
-               return BZ_DATA_ERROR;
-            return r;
-         }
-         if (s->state != BZ_X_OUTPUT) return r;
-      }
-   }
-
-   AssertH ( 0, 6001 );
-
-   return 0;  /*NOTREACHED*/
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzDecompressEnd)  ( bz_stream *strm )
-{
-   DState* s;
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   s = strm->state;
-   if (s == NULL) return BZ_PARAM_ERROR;
-   if (s->strm != strm) return BZ_PARAM_ERROR;
-
-   if (s->tt   != NULL) BZFREE(s->tt);
-   if (s->ll16 != NULL) BZFREE(s->ll16);
-   if (s->ll4  != NULL) BZFREE(s->ll4);
-
-   BZFREE(strm->state);
-   strm->state = NULL;
-
-   return BZ_OK;
-}
-
-
-#ifndef BZ_NO_STDIO
-/*---------------------------------------------------*/
-/*--- File I/O stuff                              ---*/
-/*---------------------------------------------------*/
-
-#define BZ_SETERR(eee)                    \
-{                                         \
-   if (bzerror != NULL) *bzerror = eee;   \
-   if (bzf != NULL) bzf->lastErr = eee;   \
-}
-
-typedef 
-   struct {
-      FILE*     handle;
-      Char      buf[BZ_MAX_UNUSED];
-      Int32     bufN;
-      Bool      writing;
-      bz_stream strm;
-      Int32     lastErr;
-      Bool      initialisedOk;
-   }
-   bzFile;
-
-
-/*---------------------------------------------*/
-static Bool myfeof ( FILE* f )
-{
-   Int32 c = fgetc ( f );
-   if (c == EOF) return True;
-   ungetc ( c, f );
-   return False;
-}
-
-
-/*---------------------------------------------------*/
-BZFILE* BZ_API(BZ2_bzWriteOpen) 
-                    ( int*  bzerror,      
-                      FILE* f, 
-                      int   blockSize100k, 
-                      int   verbosity,
-                      int   workFactor )
-{
-   Int32   ret;
-   bzFile* bzf = NULL;
-
-   BZ_SETERR(BZ_OK);
-
-   if (f == NULL ||
-       (blockSize100k < 1 || blockSize100k > 9) ||
-       (workFactor < 0 || workFactor > 250) ||
-       (verbosity < 0 || verbosity > 4))
-      { BZ_SETERR(BZ_PARAM_ERROR); return NULL; };
-
-   if (ferror(f))
-      { BZ_SETERR(BZ_IO_ERROR); return NULL; };
-
-   bzf = malloc ( sizeof(bzFile) );
-   if (bzf == NULL)
-      { BZ_SETERR(BZ_MEM_ERROR); return NULL; };
-
-   BZ_SETERR(BZ_OK);
-   bzf->initialisedOk = False;
-   bzf->bufN          = 0;
-   bzf->handle        = f;
-   bzf->writing       = True;
-   bzf->strm.bzalloc  = NULL;
-   bzf->strm.bzfree   = NULL;
-   bzf->strm.opaque   = NULL;
-
-   if (workFactor == 0) workFactor = 30;
-   ret = BZ2_bzCompressInit ( &(bzf->strm), blockSize100k, 
-                              verbosity, workFactor );
-   if (ret != BZ_OK)
-      { BZ_SETERR(ret); free(bzf); return NULL; };
-
-   bzf->strm.avail_in = 0;
-   bzf->initialisedOk = True;
-   return bzf;   
-}
-
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzWrite)
-             ( int*    bzerror, 
-               BZFILE* b, 
-               void*   buf, 
-               int     len )
-{
-   Int32 n, n2, ret;
-   bzFile* bzf = (bzFile*)b;
-
-   BZ_SETERR(BZ_OK);
-   if (bzf == NULL || buf == NULL || len < 0)
-      { BZ_SETERR(BZ_PARAM_ERROR); return; };
-   if (!(bzf->writing))
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
-   if (ferror(bzf->handle))
-      { BZ_SETERR(BZ_IO_ERROR); return; };
-
-   if (len == 0)
-      { BZ_SETERR(BZ_OK); return; };
-
-   bzf->strm.avail_in = len;
-   bzf->strm.next_in  = buf;
-
-   while (True) {
-      bzf->strm.avail_out = BZ_MAX_UNUSED;
-      bzf->strm.next_out = bzf->buf;
-      ret = BZ2_bzCompress ( &(bzf->strm), BZ_RUN );
-      if (ret != BZ_RUN_OK)
-         { BZ_SETERR(ret); return; };
-
-      if (bzf->strm.avail_out < BZ_MAX_UNUSED) {
-         n = BZ_MAX_UNUSED - bzf->strm.avail_out;
-         n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), 
-                       n, bzf->handle );
-         if (n != n2 || ferror(bzf->handle))
-            { BZ_SETERR(BZ_IO_ERROR); return; };
-      }
-
-      if (bzf->strm.avail_in == 0)
-         { BZ_SETERR(BZ_OK); return; };
-   }
-}
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzWriteClose)
-                  ( int*          bzerror, 
-                    BZFILE*       b, 
-                    int           abandon,
-                    unsigned int* nbytes_in,
-                    unsigned int* nbytes_out )
-{
-   BZ2_bzWriteClose64 ( bzerror, b, abandon, 
-                        nbytes_in, NULL, nbytes_out, NULL );
-}
-
-
-void BZ_API(BZ2_bzWriteClose64)
-                  ( int*          bzerror, 
-                    BZFILE*       b, 
-                    int           abandon,
-                    unsigned int* nbytes_in_lo32,
-                    unsigned int* nbytes_in_hi32,
-                    unsigned int* nbytes_out_lo32,
-                    unsigned int* nbytes_out_hi32 )
-{
-   Int32   n, n2, ret;
-   bzFile* bzf = (bzFile*)b;
-
-   if (bzf == NULL)
-      { BZ_SETERR(BZ_OK); return; };
-   if (!(bzf->writing))
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
-   if (ferror(bzf->handle))
-      { BZ_SETERR(BZ_IO_ERROR); return; };
-
-   if (nbytes_in_lo32 != NULL) *nbytes_in_lo32 = 0;
-   if (nbytes_in_hi32 != NULL) *nbytes_in_hi32 = 0;
-   if (nbytes_out_lo32 != NULL) *nbytes_out_lo32 = 0;
-   if (nbytes_out_hi32 != NULL) *nbytes_out_hi32 = 0;
-
-   if ((!abandon) && bzf->lastErr == BZ_OK) {
-      while (True) {
-         bzf->strm.avail_out = BZ_MAX_UNUSED;
-         bzf->strm.next_out = bzf->buf;
-         ret = BZ2_bzCompress ( &(bzf->strm), BZ_FINISH );
-         if (ret != BZ_FINISH_OK && ret != BZ_STREAM_END)
-            { BZ_SETERR(ret); return; };
-
-         if (bzf->strm.avail_out < BZ_MAX_UNUSED) {
-            n = BZ_MAX_UNUSED - bzf->strm.avail_out;
-            n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), 
-                          n, bzf->handle );
-            if (n != n2 || ferror(bzf->handle))
-               { BZ_SETERR(BZ_IO_ERROR); return; };
-         }
-
-         if (ret == BZ_STREAM_END) break;
-      }
-   }
-
-   if ( !abandon && !ferror ( bzf->handle ) ) {
-      fflush ( bzf->handle );
-      if (ferror(bzf->handle))
-         { BZ_SETERR(BZ_IO_ERROR); return; };
-   }
-
-   if (nbytes_in_lo32 != NULL)
-      *nbytes_in_lo32 = bzf->strm.total_in_lo32;
-   if (nbytes_in_hi32 != NULL)
-      *nbytes_in_hi32 = bzf->strm.total_in_hi32;
-   if (nbytes_out_lo32 != NULL)
-      *nbytes_out_lo32 = bzf->strm.total_out_lo32;
-   if (nbytes_out_hi32 != NULL)
-      *nbytes_out_hi32 = bzf->strm.total_out_hi32;
-
-   BZ_SETERR(BZ_OK);
-   BZ2_bzCompressEnd ( &(bzf->strm) );
-   free ( bzf );
-}
-
-
-/*---------------------------------------------------*/
-BZFILE* BZ_API(BZ2_bzReadOpen) 
-                   ( int*  bzerror, 
-                     FILE* f, 
-                     int   verbosity,
-                     int   small,
-                     void* unused,
-                     int   nUnused )
-{
-   bzFile* bzf = NULL;
-   int     ret;
-
-   BZ_SETERR(BZ_OK);
-
-   if (f == NULL || 
-       (small != 0 && small != 1) ||
-       (verbosity < 0 || verbosity > 4) ||
-       (unused == NULL && nUnused != 0) ||
-       (unused != NULL && (nUnused < 0 || nUnused > BZ_MAX_UNUSED)))
-      { BZ_SETERR(BZ_PARAM_ERROR); return NULL; };
-
-   if (ferror(f))
-      { BZ_SETERR(BZ_IO_ERROR); return NULL; };
-
-   bzf = malloc ( sizeof(bzFile) );
-   if (bzf == NULL) 
-      { BZ_SETERR(BZ_MEM_ERROR); return NULL; };
-
-   BZ_SETERR(BZ_OK);
-
-   bzf->initialisedOk = False;
-   bzf->handle        = f;
-   bzf->bufN          = 0;
-   bzf->writing       = False;
-   bzf->strm.bzalloc  = NULL;
-   bzf->strm.bzfree   = NULL;
-   bzf->strm.opaque   = NULL;
-   
-   while (nUnused > 0) {
-      bzf->buf[bzf->bufN] = *((UChar*)(unused)); bzf->bufN++;
-      unused = ((void*)( 1 + ((UChar*)(unused))  ));
-      nUnused--;
-   }
-
-   ret = BZ2_bzDecompressInit ( &(bzf->strm), verbosity, small );
-   if (ret != BZ_OK)
-      { BZ_SETERR(ret); free(bzf); return NULL; };
-
-   bzf->strm.avail_in = bzf->bufN;
-   bzf->strm.next_in  = bzf->buf;
-
-   bzf->initialisedOk = True;
-   return bzf;   
-}
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzReadClose) ( int *bzerror, BZFILE *b )
-{
-   bzFile* bzf = (bzFile*)b;
-
-   BZ_SETERR(BZ_OK);
-   if (bzf == NULL)
-      { BZ_SETERR(BZ_OK); return; };
-
-   if (bzf->writing)
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
-
-   if (bzf->initialisedOk)
-      (void)BZ2_bzDecompressEnd ( &(bzf->strm) );
-   free ( bzf );
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzRead) 
-           ( int*    bzerror, 
-             BZFILE* b, 
-             void*   buf, 
-             int     len )
-{
-   Int32   n, ret;
-   bzFile* bzf = (bzFile*)b;
-
-   BZ_SETERR(BZ_OK);
-
-   if (bzf == NULL || buf == NULL || len < 0)
-      { BZ_SETERR(BZ_PARAM_ERROR); return 0; };
-
-   if (bzf->writing)
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return 0; };
-
-   if (len == 0)
-      { BZ_SETERR(BZ_OK); return 0; };
-
-   bzf->strm.avail_out = len;
-   bzf->strm.next_out = buf;
-
-   while (True) {
-
-      if (ferror(bzf->handle)) 
-         { BZ_SETERR(BZ_IO_ERROR); return 0; };
-
-      if (bzf->strm.avail_in == 0 && !myfeof(bzf->handle)) {
-         n = fread ( bzf->buf, sizeof(UChar), 
-                     BZ_MAX_UNUSED, bzf->handle );
-         if (ferror(bzf->handle))
-            { BZ_SETERR(BZ_IO_ERROR); return 0; };
-         bzf->bufN = n;
-         bzf->strm.avail_in = bzf->bufN;
-         bzf->strm.next_in = bzf->buf;
-      }
-
-      ret = BZ2_bzDecompress ( &(bzf->strm) );
-
-      if (ret != BZ_OK && ret != BZ_STREAM_END)
-         { BZ_SETERR(ret); return 0; };
-
-      if (ret == BZ_OK && myfeof(bzf->handle) && 
-          bzf->strm.avail_in == 0 && bzf->strm.avail_out > 0)
-         { BZ_SETERR(BZ_UNEXPECTED_EOF); return 0; };
-
-      if (ret == BZ_STREAM_END)
-         { BZ_SETERR(BZ_STREAM_END);
-           return len - bzf->strm.avail_out; };
-      if (bzf->strm.avail_out == 0)
-         { BZ_SETERR(BZ_OK); return len; };
-      
-   }
-
-   return 0; /*not reached*/
-}
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzReadGetUnused) 
-                     ( int*    bzerror, 
-                       BZFILE* b, 
-                       void**  unused, 
-                       int*    nUnused )
-{
-   bzFile* bzf = (bzFile*)b;
-   if (bzf == NULL)
-      { BZ_SETERR(BZ_PARAM_ERROR); return; };
-   if (bzf->lastErr != BZ_STREAM_END)
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
-   if (unused == NULL || nUnused == NULL)
-      { BZ_SETERR(BZ_PARAM_ERROR); return; };
-
-   BZ_SETERR(BZ_OK);
-   *nUnused = bzf->strm.avail_in;
-   *unused = bzf->strm.next_in;
-}
-#endif
-
-
-/*---------------------------------------------------*/
-/*--- Misc convenience stuff                      ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzBuffToBuffCompress) 
-                         ( char*         dest, 
-                           unsigned int* destLen,
-                           char*         source, 
-                           unsigned int  sourceLen,
-                           int           blockSize100k, 
-                           int           verbosity, 
-                           int           workFactor )
-{
-   bz_stream strm;
-   int ret;
-
-   if (dest == NULL || destLen == NULL || 
-       source == NULL ||
-       blockSize100k < 1 || blockSize100k > 9 ||
-       verbosity < 0 || verbosity > 4 ||
-       workFactor < 0 || workFactor > 250) 
-      return BZ_PARAM_ERROR;
-
-   if (workFactor == 0) workFactor = 30;
-   strm.bzalloc = NULL;
-   strm.bzfree = NULL;
-   strm.opaque = NULL;
-   ret = BZ2_bzCompressInit ( &strm, blockSize100k, 
-                              verbosity, workFactor );
-   if (ret != BZ_OK) return ret;
-
-   strm.next_in = source;
-   strm.next_out = dest;
-   strm.avail_in = sourceLen;
-   strm.avail_out = *destLen;
-
-   ret = BZ2_bzCompress ( &strm, BZ_FINISH );
-   if (ret == BZ_FINISH_OK) goto output_overflow;
-   if (ret != BZ_STREAM_END) goto errhandler;
-
-   /* normal termination */
-   *destLen -= strm.avail_out;   
-   BZ2_bzCompressEnd ( &strm );
-   return BZ_OK;
-
-   output_overflow:
-   BZ2_bzCompressEnd ( &strm );
-   return BZ_OUTBUFF_FULL;
-
-   errhandler:
-   BZ2_bzCompressEnd ( &strm );
-   return ret;
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzBuffToBuffDecompress) 
-                           ( char*         dest, 
-                             unsigned int* destLen,
-                             char*         source, 
-                             unsigned int  sourceLen,
-                             int           small,
-                             int           verbosity )
-{
-   bz_stream strm;
-   int ret;
-
-   if (dest == NULL || destLen == NULL || 
-       source == NULL ||
-       (small != 0 && small != 1) ||
-       verbosity < 0 || verbosity > 4) 
-          return BZ_PARAM_ERROR;
-
-   strm.bzalloc = NULL;
-   strm.bzfree = NULL;
-   strm.opaque = NULL;
-   ret = BZ2_bzDecompressInit ( &strm, verbosity, small );
-   if (ret != BZ_OK) return ret;
-
-   strm.next_in = source;
-   strm.next_out = dest;
-   strm.avail_in = sourceLen;
-   strm.avail_out = *destLen;
-
-   ret = BZ2_bzDecompress ( &strm );
-   if (ret == BZ_OK) goto output_overflow_or_eof;
-   if (ret != BZ_STREAM_END) goto errhandler;
-
-   /* normal termination */
-   *destLen -= strm.avail_out;
-   BZ2_bzDecompressEnd ( &strm );
-   return BZ_OK;
-
-   output_overflow_or_eof:
-   if (strm.avail_out > 0) {
-      BZ2_bzDecompressEnd ( &strm );
-      return BZ_UNEXPECTED_EOF;
-   } else {
-      BZ2_bzDecompressEnd ( &strm );
-      return BZ_OUTBUFF_FULL;
-   };      
-
-   errhandler:
-   BZ2_bzDecompressEnd ( &strm );
-   return ret; 
-}
-
-
-/*---------------------------------------------------*/
-/*--
-   Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp)
-   to support better zlib compatibility.
-   This code is not _officially_ part of libbzip2 (yet);
-   I haven't tested it, documented it, or considered the
-   threading-safeness of it.
-   If this code breaks, please contact both Yoshioka and me.
---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-/*--
-   return version like "0.9.5d, 4-Sept-1999".
---*/
-const char * BZ_API(BZ2_bzlibVersion)(void)
-{
-   return BZ_VERSION;
-}
-
-
-#ifndef BZ_NO_STDIO
-/*---------------------------------------------------*/
-
-#if defined(_WIN32) || defined(OS2) || defined(MSDOS)
-#   include <fcntl.h>
-#   include <io.h>
-#   define SET_BINARY_MODE(file) setmode(fileno(file),O_BINARY)
-#else
-#   define SET_BINARY_MODE(file)
-#endif
-static
-BZFILE * bzopen_or_bzdopen
-               ( const char *path,   /* no use when bzdopen */
-                 int fd,             /* no use when bzdopen */
-                 const char *mode,
-                 int open_mode)      /* bzopen: 0, bzdopen:1 */
-{
-   int    bzerr;
-   char   unused[BZ_MAX_UNUSED];
-   int    blockSize100k = 9;
-   int    writing       = 0;
-   char   mode2[10]     = "";
-   FILE   *fp           = NULL;
-   BZFILE *bzfp         = NULL;
-   int    verbosity     = 0;
-   int    workFactor    = 30;
-   int    smallMode     = 0;
-   int    nUnused       = 0; 
-
-   if (mode == NULL) return NULL;
-   while (*mode) {
-      switch (*mode) {
-      case 'r':
-         writing = 0; break;
-      case 'w':
-         writing = 1; break;
-      case 's':
-         smallMode = 1; break;
-      default:
-         if (isdigit((int)(*mode))) {
-            blockSize100k = *mode-BZ_HDR_0;
-         }
-      }
-      mode++;
-   }
-   strcat(mode2, writing ? "w" : "r" );
-   strcat(mode2,"b");   /* binary mode */
-
-   if (open_mode==0) {
-      if (path==NULL || strcmp(path,"")==0) {
-        fp = (writing ? stdout : stdin);
-        SET_BINARY_MODE(fp);
-      } else {
-        fp = fopen(path,mode2);
-      }
-   } else {
-#ifdef BZ_STRICT_ANSI
-      fp = NULL;
-#else
-      fp = fdopen(fd,mode2);
-#endif
-   }
-   if (fp == NULL) return NULL;
-
-   if (writing) {
-      /* Guard against total chaos and anarchy -- JRS */
-      if (blockSize100k < 1) blockSize100k = 1;
-      if (blockSize100k > 9) blockSize100k = 9; 
-      bzfp = BZ2_bzWriteOpen(&bzerr,fp,blockSize100k,
-                             verbosity,workFactor);
-   } else {
-      bzfp = BZ2_bzReadOpen(&bzerr,fp,verbosity,smallMode,
-                            unused,nUnused);
-   }
-   if (bzfp == NULL) {
-      if (fp != stdin && fp != stdout) fclose(fp);
-      return NULL;
-   }
-   return bzfp;
-}
-
-
-/*---------------------------------------------------*/
-/*--
-   open file for read or write.
-      ex) bzopen("file","w9")
-      case path="" or NULL => use stdin or stdout.
---*/
-BZFILE * BZ_API(BZ2_bzopen)
-               ( const char *path,
-                 const char *mode )
-{
-   return bzopen_or_bzdopen(path,-1,mode,/*bzopen*/0);
-}
-
-
-/*---------------------------------------------------*/
-BZFILE * BZ_API(BZ2_bzdopen)
-               ( int fd,
-                 const char *mode )
-{
-   return bzopen_or_bzdopen(NULL,fd,mode,/*bzdopen*/1);
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzread) (BZFILE* b, void* buf, int len )
-{
-   int bzerr, nread;
-   if (((bzFile*)b)->lastErr == BZ_STREAM_END) return 0;
-   nread = BZ2_bzRead(&bzerr,b,buf,len);
-   if (bzerr == BZ_OK || bzerr == BZ_STREAM_END) {
-      return nread;
-   } else {
-      return -1;
-   }
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzwrite) (BZFILE* b, void* buf, int len )
-{
-   int bzerr;
-
-   BZ2_bzWrite(&bzerr,b,buf,len);
-   if(bzerr == BZ_OK){
-      return len;
-   }else{
-      return -1;
-   }
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzflush) (BZFILE *b)
-{
-   /* do nothing now... */
-   return 0;
-}
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzclose) (BZFILE* b)
-{
-   int bzerr;
-   FILE *fp;
-   
-   if (b==NULL) {return;}
-   fp = ((bzFile *)b)->handle;
-   if(((bzFile*)b)->writing){
-      BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL);
-      if(bzerr != BZ_OK){
-         BZ2_bzWriteClose(NULL,b,1,NULL,NULL);
-      }
-   }else{
-      BZ2_bzReadClose(&bzerr,b);
-   }
-   if(fp!=stdin && fp!=stdout){
-      fclose(fp);
-   }
-}
-
-
-/*---------------------------------------------------*/
-/*--
-   return last error code 
---*/
-static const char *bzerrorstrings[] = {
-       "OK"
-      ,"SEQUENCE_ERROR"
-      ,"PARAM_ERROR"
-      ,"MEM_ERROR"
-      ,"DATA_ERROR"
-      ,"DATA_ERROR_MAGIC"
-      ,"IO_ERROR"
-      ,"UNEXPECTED_EOF"
-      ,"OUTBUFF_FULL"
-      ,"CONFIG_ERROR"
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-};
-
-
-const char * BZ_API(BZ2_bzerror) (BZFILE *b, int *errnum)
-{
-   int err = ((bzFile *)b)->lastErr;
-
-   if(err>0) err = 0;
-   *errnum = err;
-   return bzerrorstrings[err*-1];
-}
-#endif
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                           bzlib.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/dep/src/bzip2/bzlib.h b/dep/src/bzip2/bzlib.h
deleted file mode 100644
index c5b75d6d8..000000000
--- a/dep/src/bzip2/bzlib.h
+++ /dev/null
@@ -1,282 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Public header file for the library.                   ---*/
-/*---                                               bzlib.h ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#ifndef _BZLIB_H
-#define _BZLIB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BZ_RUN               0
-#define BZ_FLUSH             1
-#define BZ_FINISH            2
-
-#define BZ_OK                0
-#define BZ_RUN_OK            1
-#define BZ_FLUSH_OK          2
-#define BZ_FINISH_OK         3
-#define BZ_STREAM_END        4
-#define BZ_SEQUENCE_ERROR    (-1)
-#define BZ_PARAM_ERROR       (-2)
-#define BZ_MEM_ERROR         (-3)
-#define BZ_DATA_ERROR        (-4)
-#define BZ_DATA_ERROR_MAGIC  (-5)
-#define BZ_IO_ERROR          (-6)
-#define BZ_UNEXPECTED_EOF    (-7)
-#define BZ_OUTBUFF_FULL      (-8)
-#define BZ_CONFIG_ERROR      (-9)
-
-typedef 
-   struct {
-      char *next_in;
-      unsigned int avail_in;
-      unsigned int total_in_lo32;
-      unsigned int total_in_hi32;
-
-      char *next_out;
-      unsigned int avail_out;
-      unsigned int total_out_lo32;
-      unsigned int total_out_hi32;
-
-      void *state;
-
-      void *(*bzalloc)(void *,int,int);
-      void (*bzfree)(void *,void *);
-      void *opaque;
-   } 
-   bz_stream;
-
-
-#ifndef BZ_IMPORT
-#define BZ_EXPORT
-#endif
-
-#ifndef BZ_NO_STDIO
-/* Need a definitition for FILE */
-#include <stdio.h>
-#endif
-
-#ifdef _WIN32
-#   include <windows.h>
-#   ifdef small
-      /* windows.h define small to char */
-#      undef small
-#   endif
-#   ifdef BZ_EXPORT
-#   define BZ_API(func) WINAPI func
-#   define BZ_EXTERN extern
-#   else
-   /* import windows dll dynamically */
-#   define BZ_API(func) (WINAPI * func)
-#   define BZ_EXTERN
-#   endif
-#else
-#   define BZ_API(func) func
-#   define BZ_EXTERN extern
-#endif
-
-
-/*-- Core (low-level) library functions --*/
-
-BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( 
-      bz_stream* strm, 
-      int        blockSize100k, 
-      int        verbosity, 
-      int        workFactor 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzCompress) ( 
-      bz_stream* strm, 
-      int action 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( 
-      bz_stream* strm 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( 
-      bz_stream *strm, 
-      int       verbosity, 
-      int       small
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( 
-      bz_stream* strm 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( 
-      bz_stream *strm 
-   );
-
-
-
-/*-- High(er) level library functions --*/
-
-#ifndef BZ_NO_STDIO
-#define BZ_MAX_UNUSED 5000
-
-typedef void BZFILE;
-
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( 
-      int*  bzerror,   
-      FILE* f, 
-      int   verbosity, 
-      int   small,
-      void* unused,    
-      int   nUnused 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( 
-      int*    bzerror, 
-      BZFILE* b 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void**  unused,  
-      int*    nUnused 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzRead) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( 
-      int*  bzerror,      
-      FILE* f, 
-      int   blockSize100k, 
-      int   verbosity, 
-      int   workFactor 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWrite) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in, 
-      unsigned int* nbytes_out 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in_lo32, 
-      unsigned int* nbytes_in_hi32, 
-      unsigned int* nbytes_out_lo32, 
-      unsigned int* nbytes_out_hi32
-   );
-#endif
-
-
-/*-- Utility functions --*/
-
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( 
-      char*         dest, 
-      unsigned int* destLen,
-      char*         source, 
-      unsigned int  sourceLen,
-      int           blockSize100k, 
-      int           verbosity, 
-      int           workFactor 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( 
-      char*         dest, 
-      unsigned int* destLen,
-      char*         source, 
-      unsigned int  sourceLen,
-      int           small, 
-      int           verbosity 
-   );
-
-
-/*--
-   Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp)
-   to support better zlib compatibility.
-   This code is not _officially_ part of libbzip2 (yet);
-   I haven't tested it, documented it, or considered the
-   threading-safeness of it.
-   If this code breaks, please contact both Yoshioka and me.
---*/
-
-BZ_EXTERN const char * BZ_API(BZ2_bzlibVersion) (
-      void
-   );
-
-#ifndef BZ_NO_STDIO
-BZ_EXTERN BZFILE * BZ_API(BZ2_bzopen) (
-      const char *path,
-      const char *mode
-   );
-
-BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) (
-      int        fd,
-      const char *mode
-   );
-         
-BZ_EXTERN int BZ_API(BZ2_bzread) (
-      BZFILE* b, 
-      void* buf, 
-      int len 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzwrite) (
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzflush) (
-      BZFILE* b
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzclose) (
-      BZFILE* b
-   );
-
-BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
-      BZFILE *b, 
-      int    *errnum
-   );
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/*-------------------------------------------------------------*/
-/*--- end                                           bzlib.h ---*/
-/*-------------------------------------------------------------*/
diff --git a/dep/src/bzip2/bzlib_private.h b/dep/src/bzip2/bzlib_private.h
deleted file mode 100644
index 23427879b..000000000
--- a/dep/src/bzip2/bzlib_private.h
+++ /dev/null
@@ -1,509 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Private header file for the library.                  ---*/
-/*---                                       bzlib_private.h ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#ifndef _BZLIB_PRIVATE_H
-#define _BZLIB_PRIVATE_H
-
-#include <stdlib.h>
-
-#ifndef BZ_NO_STDIO
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#endif
-
-#include "bzlib.h"
-
-
-
-/*-- General stuff. --*/
-
-#define BZ_VERSION  "1.0.5, 10-Dec-2007"
-
-typedef char            Char;
-typedef unsigned char   Bool;
-typedef unsigned char   UChar;
-typedef int             Int32;
-typedef unsigned int    UInt32;
-typedef short           Int16;
-typedef unsigned short  UInt16;
-
-#define True  ((Bool)1)
-#define False ((Bool)0)
-
-#ifndef __GNUC__
-#define __inline__  /* */
-#endif 
-
-#ifndef BZ_NO_STDIO
-
-extern void BZ2_bz__AssertH__fail ( int errcode );
-#define AssertH(cond,errcode) \
-   { if (!(cond)) BZ2_bz__AssertH__fail ( errcode ); }
-
-#if BZ_DEBUG
-#define AssertD(cond,msg) \
-   { if (!(cond)) {       \
-      fprintf ( stderr,   \
-        "\n\nlibbzip2(debug build): internal error\n\t%s\n", msg );\
-      exit(1); \
-   }}
-#else
-#define AssertD(cond,msg) /* */
-#endif
-
-#define VPrintf0(zf) \
-   fprintf(stderr,zf)
-#define VPrintf1(zf,za1) \
-   fprintf(stderr,zf,za1)
-#define VPrintf2(zf,za1,za2) \
-   fprintf(stderr,zf,za1,za2)
-#define VPrintf3(zf,za1,za2,za3) \
-   fprintf(stderr,zf,za1,za2,za3)
-#define VPrintf4(zf,za1,za2,za3,za4) \
-   fprintf(stderr,zf,za1,za2,za3,za4)
-#define VPrintf5(zf,za1,za2,za3,za4,za5) \
-   fprintf(stderr,zf,za1,za2,za3,za4,za5)
-
-#else
-
-extern void bz_internal_error ( int errcode );
-#define AssertH(cond,errcode) \
-   { if (!(cond)) bz_internal_error ( errcode ); }
-#define AssertD(cond,msg)                do { } while (0)
-#define VPrintf0(zf)                     do { } while (0)
-#define VPrintf1(zf,za1)                 do { } while (0)
-#define VPrintf2(zf,za1,za2)             do { } while (0)
-#define VPrintf3(zf,za1,za2,za3)         do { } while (0)
-#define VPrintf4(zf,za1,za2,za3,za4)     do { } while (0)
-#define VPrintf5(zf,za1,za2,za3,za4,za5) do { } while (0)
-
-#endif
-
-
-#define BZALLOC(nnn) (strm->bzalloc)(strm->opaque,(nnn),1)
-#define BZFREE(ppp)  (strm->bzfree)(strm->opaque,(ppp))
-
-
-/*-- Header bytes. --*/
-
-#define BZ_HDR_B 0x42   /* 'B' */
-#define BZ_HDR_Z 0x5a   /* 'Z' */
-#define BZ_HDR_h 0x68   /* 'h' */
-#define BZ_HDR_0 0x30   /* '0' */
-  
-/*-- Constants for the back end. --*/
-
-#define BZ_MAX_ALPHA_SIZE 258
-#define BZ_MAX_CODE_LEN    23
-
-#define BZ_RUNA 0
-#define BZ_RUNB 1
-
-#define BZ_N_GROUPS 6
-#define BZ_G_SIZE   50
-#define BZ_N_ITERS  4
-
-#define BZ_MAX_SELECTORS (2 + (900000 / BZ_G_SIZE))
-
-
-
-/*-- Stuff for randomising repetitive blocks. --*/
-
-extern Int32 BZ2_rNums[512];
-
-#define BZ_RAND_DECLS                          \
-   Int32 rNToGo;                               \
-   Int32 rTPos                                 \
-
-#define BZ_RAND_INIT_MASK                      \
-   s->rNToGo = 0;                              \
-   s->rTPos  = 0                               \
-
-#define BZ_RAND_MASK ((s->rNToGo == 1) ? 1 : 0)
-
-#define BZ_RAND_UPD_MASK                       \
-   if (s->rNToGo == 0) {                       \
-      s->rNToGo = BZ2_rNums[s->rTPos];         \
-      s->rTPos++;                              \
-      if (s->rTPos == 512) s->rTPos = 0;       \
-   }                                           \
-   s->rNToGo--;
-
-
-
-/*-- Stuff for doing CRCs. --*/
-
-extern UInt32 BZ2_crc32Table[256];
-
-#define BZ_INITIALISE_CRC(crcVar)              \
-{                                              \
-   crcVar = 0xffffffffL;                       \
-}
-
-#define BZ_FINALISE_CRC(crcVar)                \
-{                                              \
-   crcVar = ~(crcVar);                         \
-}
-
-#define BZ_UPDATE_CRC(crcVar,cha)              \
-{                                              \
-   crcVar = (crcVar << 8) ^                    \
-            BZ2_crc32Table[(crcVar >> 24) ^    \
-                           ((UChar)cha)];      \
-}
-
-
-
-/*-- States and modes for compression. --*/
-
-#define BZ_M_IDLE      1
-#define BZ_M_RUNNING   2
-#define BZ_M_FLUSHING  3
-#define BZ_M_FINISHING 4
-
-#define BZ_S_OUTPUT    1
-#define BZ_S_INPUT     2
-
-#define BZ_N_RADIX 2
-#define BZ_N_QSORT 12
-#define BZ_N_SHELL 18
-#define BZ_N_OVERSHOOT (BZ_N_RADIX + BZ_N_QSORT + BZ_N_SHELL + 2)
-
-
-
-
-/*-- Structure holding all the compression-side stuff. --*/
-
-typedef
-   struct {
-      /* pointer back to the struct bz_stream */
-      bz_stream* strm;
-
-      /* mode this stream is in, and whether inputting */
-      /* or outputting data */
-      Int32    mode;
-      Int32    state;
-
-      /* remembers avail_in when flush/finish requested */
-      UInt32   avail_in_expect;
-
-      /* for doing the block sorting */
-      UInt32*  arr1;
-      UInt32*  arr2;
-      UInt32*  ftab;
-      Int32    origPtr;
-
-      /* aliases for arr1 and arr2 */
-      UInt32*  ptr;
-      UChar*   block;
-      UInt16*  mtfv;
-      UChar*   zbits;
-
-      /* for deciding when to use the fallback sorting algorithm */
-      Int32    workFactor;
-
-      /* run-length-encoding of the input */
-      UInt32   state_in_ch;
-      Int32    state_in_len;
-      BZ_RAND_DECLS;
-
-      /* input and output limits and current posns */
-      Int32    nblock;
-      Int32    nblockMAX;
-      Int32    numZ;
-      Int32    state_out_pos;
-
-      /* map of bytes used in block */
-      Int32    nInUse;
-      Bool     inUse[256];
-      UChar    unseqToSeq[256];
-
-      /* the buffer for bit stream creation */
-      UInt32   bsBuff;
-      Int32    bsLive;
-
-      /* block and combined CRCs */
-      UInt32   blockCRC;
-      UInt32   combinedCRC;
-
-      /* misc administratium */
-      Int32    verbosity;
-      Int32    blockNo;
-      Int32    blockSize100k;
-
-      /* stuff for coding the MTF values */
-      Int32    nMTF;
-      Int32    mtfFreq    [BZ_MAX_ALPHA_SIZE];
-      UChar    selector   [BZ_MAX_SELECTORS];
-      UChar    selectorMtf[BZ_MAX_SELECTORS];
-
-      UChar    len     [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    code    [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    rfreq   [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      /* second dimension: only 3 needed; 4 makes index calculations faster */
-      UInt32   len_pack[BZ_MAX_ALPHA_SIZE][4];
-
-   }
-   EState;
-
-
-
-/*-- externs for compression. --*/
-
-extern void 
-BZ2_blockSort ( EState* );
-
-extern void 
-BZ2_compressBlock ( EState*, Bool );
-
-extern void 
-BZ2_bsInitWrite ( EState* );
-
-extern void 
-BZ2_hbAssignCodes ( Int32*, UChar*, Int32, Int32, Int32 );
-
-extern void 
-BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 );
-
-
-
-/*-- states for decompression. --*/
-
-#define BZ_X_IDLE        1
-#define BZ_X_OUTPUT      2
-
-#define BZ_X_MAGIC_1     10
-#define BZ_X_MAGIC_2     11
-#define BZ_X_MAGIC_3     12
-#define BZ_X_MAGIC_4     13
-#define BZ_X_BLKHDR_1    14
-#define BZ_X_BLKHDR_2    15
-#define BZ_X_BLKHDR_3    16
-#define BZ_X_BLKHDR_4    17
-#define BZ_X_BLKHDR_5    18
-#define BZ_X_BLKHDR_6    19
-#define BZ_X_BCRC_1      20
-#define BZ_X_BCRC_2      21
-#define BZ_X_BCRC_3      22
-#define BZ_X_BCRC_4      23
-#define BZ_X_RANDBIT     24
-#define BZ_X_ORIGPTR_1   25
-#define BZ_X_ORIGPTR_2   26
-#define BZ_X_ORIGPTR_3   27
-#define BZ_X_MAPPING_1   28
-#define BZ_X_MAPPING_2   29
-#define BZ_X_SELECTOR_1  30
-#define BZ_X_SELECTOR_2  31
-#define BZ_X_SELECTOR_3  32
-#define BZ_X_CODING_1    33
-#define BZ_X_CODING_2    34
-#define BZ_X_CODING_3    35
-#define BZ_X_MTF_1       36
-#define BZ_X_MTF_2       37
-#define BZ_X_MTF_3       38
-#define BZ_X_MTF_4       39
-#define BZ_X_MTF_5       40
-#define BZ_X_MTF_6       41
-#define BZ_X_ENDHDR_2    42
-#define BZ_X_ENDHDR_3    43
-#define BZ_X_ENDHDR_4    44
-#define BZ_X_ENDHDR_5    45
-#define BZ_X_ENDHDR_6    46
-#define BZ_X_CCRC_1      47
-#define BZ_X_CCRC_2      48
-#define BZ_X_CCRC_3      49
-#define BZ_X_CCRC_4      50
-
-
-
-/*-- Constants for the fast MTF decoder. --*/
-
-#define MTFA_SIZE 4096
-#define MTFL_SIZE 16
-
-
-
-/*-- Structure holding all the decompression-side stuff. --*/
-
-typedef
-   struct {
-      /* pointer back to the struct bz_stream */
-      bz_stream* strm;
-
-      /* state indicator for this stream */
-      Int32    state;
-
-      /* for doing the final run-length decoding */
-      UChar    state_out_ch;
-      Int32    state_out_len;
-      Bool     blockRandomised;
-      BZ_RAND_DECLS;
-
-      /* the buffer for bit stream reading */
-      UInt32   bsBuff;
-      Int32    bsLive;
-
-      /* misc administratium */
-      Int32    blockSize100k;
-      Bool     smallDecompress;
-      Int32    currBlockNo;
-      Int32    verbosity;
-
-      /* for undoing the Burrows-Wheeler transform */
-      Int32    origPtr;
-      UInt32   tPos;
-      Int32    k0;
-      Int32    unzftab[256];
-      Int32    nblock_used;
-      Int32    cftab[257];
-      Int32    cftabCopy[257];
-
-      /* for undoing the Burrows-Wheeler transform (FAST) */
-      UInt32   *tt;
-
-      /* for undoing the Burrows-Wheeler transform (SMALL) */
-      UInt16   *ll16;
-      UChar    *ll4;
-
-      /* stored and calculated CRCs */
-      UInt32   storedBlockCRC;
-      UInt32   storedCombinedCRC;
-      UInt32   calculatedBlockCRC;
-      UInt32   calculatedCombinedCRC;
-
-      /* map of bytes used in block */
-      Int32    nInUse;
-      Bool     inUse[256];
-      Bool     inUse16[16];
-      UChar    seqToUnseq[256];
-
-      /* for decoding the MTF values */
-      UChar    mtfa   [MTFA_SIZE];
-      Int32    mtfbase[256 / MTFL_SIZE];
-      UChar    selector   [BZ_MAX_SELECTORS];
-      UChar    selectorMtf[BZ_MAX_SELECTORS];
-      UChar    len  [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-
-      Int32    limit  [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    base   [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    perm   [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    minLens[BZ_N_GROUPS];
-
-      /* save area for scalars in the main decompress code */
-      Int32    save_i;
-      Int32    save_j;
-      Int32    save_t;
-      Int32    save_alphaSize;
-      Int32    save_nGroups;
-      Int32    save_nSelectors;
-      Int32    save_EOB;
-      Int32    save_groupNo;
-      Int32    save_groupPos;
-      Int32    save_nextSym;
-      Int32    save_nblockMAX;
-      Int32    save_nblock;
-      Int32    save_es;
-      Int32    save_N;
-      Int32    save_curr;
-      Int32    save_zt;
-      Int32    save_zn; 
-      Int32    save_zvec;
-      Int32    save_zj;
-      Int32    save_gSel;
-      Int32    save_gMinlen;
-      Int32*   save_gLimit;
-      Int32*   save_gBase;
-      Int32*   save_gPerm;
-
-   }
-   DState;
-
-
-
-/*-- Macros for decompression. --*/
-
-#define BZ_GET_FAST(cccc)                     \
-    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
-    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
-    s->tPos = s->tt[s->tPos];                 \
-    cccc = (UChar)(s->tPos & 0xff);           \
-    s->tPos >>= 8;
-
-#define BZ_GET_FAST_C(cccc)                   \
-    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
-    if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \
-    c_tPos = c_tt[c_tPos];                    \
-    cccc = (UChar)(c_tPos & 0xff);            \
-    c_tPos >>= 8;
-
-#define SET_LL4(i,n)                                          \
-   { if (((i) & 0x1) == 0)                                    \
-        s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0xf0) | (n); else    \
-        s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0x0f) | ((n) << 4);  \
-   }
-
-#define GET_LL4(i)                             \
-   ((((UInt32)(s->ll4[(i) >> 1])) >> (((i) << 2) & 0x4)) & 0xF)
-
-#define SET_LL(i,n)                          \
-   { s->ll16[i] = (UInt16)(n & 0x0000ffff);  \
-     SET_LL4(i, n >> 16);                    \
-   }
-
-#define GET_LL(i) \
-   (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
-
-#define BZ_GET_SMALL(cccc)                            \
-    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
-    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
-    cccc = BZ2_indexIntoF ( s->tPos, s->cftab );    \
-    s->tPos = GET_LL(s->tPos);
-
-
-/*-- externs for decompression. --*/
-
-extern Int32 
-BZ2_indexIntoF ( Int32, Int32* );
-
-extern Int32 
-BZ2_decompress ( DState* );
-
-extern void 
-BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*,
-                           Int32,  Int32, Int32 );
-
-
-#endif
-
-
-/*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/
-
-#ifdef BZ_NO_STDIO
-#ifndef NULL
-#define NULL 0
-#endif
-#endif
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                   bzlib_private.h ---*/
-/*-------------------------------------------------------------*/
diff --git a/dep/src/bzip2/compress.c b/dep/src/bzip2/compress.c
deleted file mode 100644
index 8c80a0797..000000000
--- a/dep/src/bzip2/compress.c
+++ /dev/null
@@ -1,672 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Compression machinery (not incl block sorting)        ---*/
-/*---                                            compress.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-/* CHANGES
-    0.9.0    -- original version.
-    0.9.0a/b -- no changes in this file.
-    0.9.0c   -- changed setting of nGroups in sendMTFValues() 
-                so as to do a bit better on small files
-*/
-
-#include "bzlib_private.h"
-
-
-/*---------------------------------------------------*/
-/*--- Bit stream I/O                              ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-void BZ2_bsInitWrite ( EState* s )
-{
-   s->bsLive = 0;
-   s->bsBuff = 0;
-}
-
-
-/*---------------------------------------------------*/
-static
-void bsFinishWrite ( EState* s )
-{
-   while (s->bsLive > 0) {
-      s->zbits[s->numZ] = (UChar)(s->bsBuff >> 24);
-      s->numZ++;
-      s->bsBuff <<= 8;
-      s->bsLive -= 8;
-   }
-}
-
-
-/*---------------------------------------------------*/
-#define bsNEEDW(nz)                           \
-{                                             \
-   while (s->bsLive >= 8) {                   \
-      s->zbits[s->numZ]                       \
-         = (UChar)(s->bsBuff >> 24);          \
-      s->numZ++;                              \
-      s->bsBuff <<= 8;                        \
-      s->bsLive -= 8;                         \
-   }                                          \
-}
-
-
-/*---------------------------------------------------*/
-static
-__inline__
-void bsW ( EState* s, Int32 n, UInt32 v )
-{
-   bsNEEDW ( n );
-   s->bsBuff |= (v << (32 - s->bsLive - n));
-   s->bsLive += n;
-}
-
-
-/*---------------------------------------------------*/
-static
-void bsPutUInt32 ( EState* s, UInt32 u )
-{
-   bsW ( s, 8, (u >> 24) & 0xffL );
-   bsW ( s, 8, (u >> 16) & 0xffL );
-   bsW ( s, 8, (u >>  8) & 0xffL );
-   bsW ( s, 8,  u        & 0xffL );
-}
-
-
-/*---------------------------------------------------*/
-static
-void bsPutUChar ( EState* s, UChar c )
-{
-   bsW( s, 8, (UInt32)c );
-}
-
-
-/*---------------------------------------------------*/
-/*--- The back end proper                         ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-static
-void makeMaps_e ( EState* s )
-{
-   Int32 i;
-   s->nInUse = 0;
-   for (i = 0; i < 256; i++)
-      if (s->inUse[i]) {
-         s->unseqToSeq[i] = s->nInUse;
-         s->nInUse++;
-      }
-}
-
-
-/*---------------------------------------------------*/
-static
-void generateMTFValues ( EState* s )
-{
-   UChar   yy[256];
-   Int32   i, j;
-   Int32   zPend;
-   Int32   wr;
-   Int32   EOB;
-
-   /* 
-      After sorting (eg, here),
-         s->arr1 [ 0 .. s->nblock-1 ] holds sorted order,
-         and
-         ((UChar*)s->arr2) [ 0 .. s->nblock-1 ] 
-         holds the original block data.
-
-      The first thing to do is generate the MTF values,
-      and put them in
-         ((UInt16*)s->arr1) [ 0 .. s->nblock-1 ].
-      Because there are strictly fewer or equal MTF values
-      than block values, ptr values in this area are overwritten
-      with MTF values only when they are no longer needed.
-
-      The final compressed bitstream is generated into the
-      area starting at
-         (UChar*) (&((UChar*)s->arr2)[s->nblock])
-
-      These storage aliases are set up in bzCompressInit(),
-      except for the last one, which is arranged in 
-      compressBlock().
-   */
-   UInt32* ptr   = s->ptr;
-   UChar* block  = s->block;
-   UInt16* mtfv  = s->mtfv;
-
-   makeMaps_e ( s );
-   EOB = s->nInUse+1;
-
-   for (i = 0; i <= EOB; i++) s->mtfFreq[i] = 0;
-
-   wr = 0;
-   zPend = 0;
-   for (i = 0; i < s->nInUse; i++) yy[i] = (UChar) i;
-
-   for (i = 0; i < s->nblock; i++) {
-      UChar ll_i;
-      AssertD ( wr <= i, "generateMTFValues(1)" );
-      j = ptr[i]-1; if (j < 0) j += s->nblock;
-      ll_i = s->unseqToSeq[block[j]];
-      AssertD ( ll_i < s->nInUse, "generateMTFValues(2a)" );
-
-      if (yy[0] == ll_i) { 
-         zPend++;
-      } else {
-
-         if (zPend > 0) {
-            zPend--;
-            while (True) {
-               if (zPend & 1) {
-                  mtfv[wr] = BZ_RUNB; wr++; 
-                  s->mtfFreq[BZ_RUNB]++; 
-               } else {
-                  mtfv[wr] = BZ_RUNA; wr++; 
-                  s->mtfFreq[BZ_RUNA]++; 
-               }
-               if (zPend < 2) break;
-               zPend = (zPend - 2) / 2;
-            };
-            zPend = 0;
-         }
-         {
-            register UChar  rtmp;
-            register UChar* ryy_j;
-            register UChar  rll_i;
-            rtmp  = yy[1];
-            yy[1] = yy[0];
-            ryy_j = &(yy[1]);
-            rll_i = ll_i;
-            while ( rll_i != rtmp ) {
-               register UChar rtmp2;
-               ryy_j++;
-               rtmp2  = rtmp;
-               rtmp   = *ryy_j;
-               *ryy_j = rtmp2;
-            };
-            yy[0] = rtmp;
-            j = ryy_j - &(yy[0]);
-            mtfv[wr] = j+1; wr++; s->mtfFreq[j+1]++;
-         }
-
-      }
-   }
-
-   if (zPend > 0) {
-      zPend--;
-      while (True) {
-         if (zPend & 1) {
-            mtfv[wr] = BZ_RUNB; wr++; 
-            s->mtfFreq[BZ_RUNB]++; 
-         } else {
-            mtfv[wr] = BZ_RUNA; wr++; 
-            s->mtfFreq[BZ_RUNA]++; 
-         }
-         if (zPend < 2) break;
-         zPend = (zPend - 2) / 2;
-      };
-      zPend = 0;
-   }
-
-   mtfv[wr] = EOB; wr++; s->mtfFreq[EOB]++;
-
-   s->nMTF = wr;
-}
-
-
-/*---------------------------------------------------*/
-#define BZ_LESSER_ICOST  0
-#define BZ_GREATER_ICOST 15
-
-static
-void sendMTFValues ( EState* s )
-{
-   Int32 v, t, i, j, gs, ge, totc, bt, bc, iter;
-   Int32 nSelectors, alphaSize, minLen, maxLen, selCtr;
-   Int32 nGroups, nBytes;
-
-   /*--
-   UChar  len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-   is a global since the decoder also needs it.
-
-   Int32  code[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-   Int32  rfreq[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-   are also globals only used in this proc.
-   Made global to keep stack frame size small.
-   --*/
-
-
-   UInt16 cost[BZ_N_GROUPS];
-   Int32  fave[BZ_N_GROUPS];
-
-   UInt16* mtfv = s->mtfv;
-
-   if (s->verbosity >= 3)
-      VPrintf3( "      %d in block, %d after MTF & 1-2 coding, "
-                "%d+2 syms in use\n", 
-                s->nblock, s->nMTF, s->nInUse );
-
-   alphaSize = s->nInUse+2;
-   for (t = 0; t < BZ_N_GROUPS; t++)
-      for (v = 0; v < alphaSize; v++)
-         s->len[t][v] = BZ_GREATER_ICOST;
-
-   /*--- Decide how many coding tables to use ---*/
-   AssertH ( s->nMTF > 0, 3001 );
-   if (s->nMTF < 200)  nGroups = 2; else
-   if (s->nMTF < 600)  nGroups = 3; else
-   if (s->nMTF < 1200) nGroups = 4; else
-   if (s->nMTF < 2400) nGroups = 5; else
-                       nGroups = 6;
-
-   /*--- Generate an initial set of coding tables ---*/
-   { 
-      Int32 nPart, remF, tFreq, aFreq;
-
-      nPart = nGroups;
-      remF  = s->nMTF;
-      gs = 0;
-      while (nPart > 0) {
-         tFreq = remF / nPart;
-         ge = gs-1;
-         aFreq = 0;
-         while (aFreq < tFreq && ge < alphaSize-1) {
-            ge++;
-            aFreq += s->mtfFreq[ge];
-         }
-
-         if (ge > gs 
-             && nPart != nGroups && nPart != 1 
-             && ((nGroups-nPart) % 2 == 1)) {
-            aFreq -= s->mtfFreq[ge];
-            ge--;
-         }
-
-         if (s->verbosity >= 3)
-            VPrintf5( "      initial group %d, [%d .. %d], "
-                      "has %d syms (%4.1f%%)\n",
-                      nPart, gs, ge, aFreq, 
-                      (100.0 * (float)aFreq) / (float)(s->nMTF) );
- 
-         for (v = 0; v < alphaSize; v++)
-            if (v >= gs && v <= ge) 
-               s->len[nPart-1][v] = BZ_LESSER_ICOST; else
-               s->len[nPart-1][v] = BZ_GREATER_ICOST;
- 
-         nPart--;
-         gs = ge+1;
-         remF -= aFreq;
-      }
-   }
-
-   /*--- 
-      Iterate up to BZ_N_ITERS times to improve the tables.
-   ---*/
-   for (iter = 0; iter < BZ_N_ITERS; iter++) {
-
-      for (t = 0; t < nGroups; t++) fave[t] = 0;
-
-      for (t = 0; t < nGroups; t++)
-         for (v = 0; v < alphaSize; v++)
-            s->rfreq[t][v] = 0;
-
-      /*---
-        Set up an auxiliary length table which is used to fast-track
-	the common case (nGroups == 6). 
-      ---*/
-      if (nGroups == 6) {
-         for (v = 0; v < alphaSize; v++) {
-            s->len_pack[v][0] = (s->len[1][v] << 16) | s->len[0][v];
-            s->len_pack[v][1] = (s->len[3][v] << 16) | s->len[2][v];
-            s->len_pack[v][2] = (s->len[5][v] << 16) | s->len[4][v];
-	 }
-      }
-
-      nSelectors = 0;
-      totc = 0;
-      gs = 0;
-      while (True) {
-
-         /*--- Set group start & end marks. --*/
-         if (gs >= s->nMTF) break;
-         ge = gs + BZ_G_SIZE - 1; 
-         if (ge >= s->nMTF) ge = s->nMTF-1;
-
-         /*-- 
-            Calculate the cost of this group as coded
-            by each of the coding tables.
-         --*/
-         for (t = 0; t < nGroups; t++) cost[t] = 0;
-
-         if (nGroups == 6 && 50 == ge-gs+1) {
-            /*--- fast track the common case ---*/
-            register UInt32 cost01, cost23, cost45;
-            register UInt16 icv;
-            cost01 = cost23 = cost45 = 0;
-
-#           define BZ_ITER(nn)                \
-               icv = mtfv[gs+(nn)];           \
-               cost01 += s->len_pack[icv][0]; \
-               cost23 += s->len_pack[icv][1]; \
-               cost45 += s->len_pack[icv][2]; \
-
-            BZ_ITER(0);  BZ_ITER(1);  BZ_ITER(2);  BZ_ITER(3);  BZ_ITER(4);
-            BZ_ITER(5);  BZ_ITER(6);  BZ_ITER(7);  BZ_ITER(8);  BZ_ITER(9);
-            BZ_ITER(10); BZ_ITER(11); BZ_ITER(12); BZ_ITER(13); BZ_ITER(14);
-            BZ_ITER(15); BZ_ITER(16); BZ_ITER(17); BZ_ITER(18); BZ_ITER(19);
-            BZ_ITER(20); BZ_ITER(21); BZ_ITER(22); BZ_ITER(23); BZ_ITER(24);
-            BZ_ITER(25); BZ_ITER(26); BZ_ITER(27); BZ_ITER(28); BZ_ITER(29);
-            BZ_ITER(30); BZ_ITER(31); BZ_ITER(32); BZ_ITER(33); BZ_ITER(34);
-            BZ_ITER(35); BZ_ITER(36); BZ_ITER(37); BZ_ITER(38); BZ_ITER(39);
-            BZ_ITER(40); BZ_ITER(41); BZ_ITER(42); BZ_ITER(43); BZ_ITER(44);
-            BZ_ITER(45); BZ_ITER(46); BZ_ITER(47); BZ_ITER(48); BZ_ITER(49);
-
-#           undef BZ_ITER
-
-            cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16;
-            cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16;
-            cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16;
-
-         } else {
-	    /*--- slow version which correctly handles all situations ---*/
-            for (i = gs; i <= ge; i++) { 
-               UInt16 icv = mtfv[i];
-               for (t = 0; t < nGroups; t++) cost[t] += s->len[t][icv];
-            }
-         }
- 
-         /*-- 
-            Find the coding table which is best for this group,
-            and record its identity in the selector table.
-         --*/
-         bc = 999999999; bt = -1;
-         for (t = 0; t < nGroups; t++)
-            if (cost[t] < bc) { bc = cost[t]; bt = t; };
-         totc += bc;
-         fave[bt]++;
-         s->selector[nSelectors] = bt;
-         nSelectors++;
-
-         /*-- 
-            Increment the symbol frequencies for the selected table.
-          --*/
-         if (nGroups == 6 && 50 == ge-gs+1) {
-            /*--- fast track the common case ---*/
-
-#           define BZ_ITUR(nn) s->rfreq[bt][ mtfv[gs+(nn)] ]++
-
-            BZ_ITUR(0);  BZ_ITUR(1);  BZ_ITUR(2);  BZ_ITUR(3);  BZ_ITUR(4);
-            BZ_ITUR(5);  BZ_ITUR(6);  BZ_ITUR(7);  BZ_ITUR(8);  BZ_ITUR(9);
-            BZ_ITUR(10); BZ_ITUR(11); BZ_ITUR(12); BZ_ITUR(13); BZ_ITUR(14);
-            BZ_ITUR(15); BZ_ITUR(16); BZ_ITUR(17); BZ_ITUR(18); BZ_ITUR(19);
-            BZ_ITUR(20); BZ_ITUR(21); BZ_ITUR(22); BZ_ITUR(23); BZ_ITUR(24);
-            BZ_ITUR(25); BZ_ITUR(26); BZ_ITUR(27); BZ_ITUR(28); BZ_ITUR(29);
-            BZ_ITUR(30); BZ_ITUR(31); BZ_ITUR(32); BZ_ITUR(33); BZ_ITUR(34);
-            BZ_ITUR(35); BZ_ITUR(36); BZ_ITUR(37); BZ_ITUR(38); BZ_ITUR(39);
-            BZ_ITUR(40); BZ_ITUR(41); BZ_ITUR(42); BZ_ITUR(43); BZ_ITUR(44);
-            BZ_ITUR(45); BZ_ITUR(46); BZ_ITUR(47); BZ_ITUR(48); BZ_ITUR(49);
-
-#           undef BZ_ITUR
-
-         } else {
-	    /*--- slow version which correctly handles all situations ---*/
-            for (i = gs; i <= ge; i++)
-               s->rfreq[bt][ mtfv[i] ]++;
-         }
-
-         gs = ge+1;
-      }
-      if (s->verbosity >= 3) {
-         VPrintf2 ( "      pass %d: size is %d, grp uses are ", 
-                   iter+1, totc/8 );
-         for (t = 0; t < nGroups; t++)
-            VPrintf1 ( "%d ", fave[t] );
-         VPrintf0 ( "\n" );
-      }
-
-      /*--
-        Recompute the tables based on the accumulated frequencies.
-      --*/
-      /* maxLen was changed from 20 to 17 in bzip2-1.0.3.  See 
-         comment in huffman.c for details. */
-      for (t = 0; t < nGroups; t++)
-         BZ2_hbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]), 
-                                 alphaSize, 17 /*20*/ );
-   }
-
-
-   AssertH( nGroups < 8, 3002 );
-   AssertH( nSelectors < 32768 &&
-            nSelectors <= (2 + (900000 / BZ_G_SIZE)),
-            3003 );
-
-
-   /*--- Compute MTF values for the selectors. ---*/
-   {
-      UChar pos[BZ_N_GROUPS], ll_i, tmp2, tmp;
-      for (i = 0; i < nGroups; i++) pos[i] = i;
-      for (i = 0; i < nSelectors; i++) {
-         ll_i = s->selector[i];
-         j = 0;
-         tmp = pos[j];
-         while ( ll_i != tmp ) {
-            j++;
-            tmp2 = tmp;
-            tmp = pos[j];
-            pos[j] = tmp2;
-         };
-         pos[0] = tmp;
-         s->selectorMtf[i] = j;
-      }
-   };
-
-   /*--- Assign actual codes for the tables. --*/
-   for (t = 0; t < nGroups; t++) {
-      minLen = 32;
-      maxLen = 0;
-      for (i = 0; i < alphaSize; i++) {
-         if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
-         if (s->len[t][i] < minLen) minLen = s->len[t][i];
-      }
-      AssertH ( !(maxLen > 17 /*20*/ ), 3004 );
-      AssertH ( !(minLen < 1),  3005 );
-      BZ2_hbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]), 
-                          minLen, maxLen, alphaSize );
-   }
-
-   /*--- Transmit the mapping table. ---*/
-   { 
-      Bool inUse16[16];
-      for (i = 0; i < 16; i++) {
-          inUse16[i] = False;
-          for (j = 0; j < 16; j++)
-             if (s->inUse[i * 16 + j]) inUse16[i] = True;
-      }
-     
-      nBytes = s->numZ;
-      for (i = 0; i < 16; i++)
-         if (inUse16[i]) bsW(s,1,1); else bsW(s,1,0);
-
-      for (i = 0; i < 16; i++)
-         if (inUse16[i])
-            for (j = 0; j < 16; j++) {
-               if (s->inUse[i * 16 + j]) bsW(s,1,1); else bsW(s,1,0);
-            }
-
-      if (s->verbosity >= 3) 
-         VPrintf1( "      bytes: mapping %d, ", s->numZ-nBytes );
-   }
-
-   /*--- Now the selectors. ---*/
-   nBytes = s->numZ;
-   bsW ( s, 3, nGroups );
-   bsW ( s, 15, nSelectors );
-   for (i = 0; i < nSelectors; i++) { 
-      for (j = 0; j < s->selectorMtf[i]; j++) bsW(s,1,1);
-      bsW(s,1,0);
-   }
-   if (s->verbosity >= 3)
-      VPrintf1( "selectors %d, ", s->numZ-nBytes );
-
-   /*--- Now the coding tables. ---*/
-   nBytes = s->numZ;
-
-   for (t = 0; t < nGroups; t++) {
-      Int32 curr = s->len[t][0];
-      bsW ( s, 5, curr );
-      for (i = 0; i < alphaSize; i++) {
-         while (curr < s->len[t][i]) { bsW(s,2,2); curr++; /* 10 */ };
-         while (curr > s->len[t][i]) { bsW(s,2,3); curr--; /* 11 */ };
-         bsW ( s, 1, 0 );
-      }
-   }
-
-   if (s->verbosity >= 3)
-      VPrintf1 ( "code lengths %d, ", s->numZ-nBytes );
-
-   /*--- And finally, the block data proper ---*/
-   nBytes = s->numZ;
-   selCtr = 0;
-   gs = 0;
-   while (True) {
-      if (gs >= s->nMTF) break;
-      ge = gs + BZ_G_SIZE - 1; 
-      if (ge >= s->nMTF) ge = s->nMTF-1;
-      AssertH ( s->selector[selCtr] < nGroups, 3006 );
-
-      if (nGroups == 6 && 50 == ge-gs+1) {
-            /*--- fast track the common case ---*/
-            UInt16 mtfv_i;
-            UChar* s_len_sel_selCtr 
-               = &(s->len[s->selector[selCtr]][0]);
-            Int32* s_code_sel_selCtr
-               = &(s->code[s->selector[selCtr]][0]);
-
-#           define BZ_ITAH(nn)                      \
-               mtfv_i = mtfv[gs+(nn)];              \
-               bsW ( s,                             \
-                     s_len_sel_selCtr[mtfv_i],      \
-                     s_code_sel_selCtr[mtfv_i] )
-
-            BZ_ITAH(0);  BZ_ITAH(1);  BZ_ITAH(2);  BZ_ITAH(3);  BZ_ITAH(4);
-            BZ_ITAH(5);  BZ_ITAH(6);  BZ_ITAH(7);  BZ_ITAH(8);  BZ_ITAH(9);
-            BZ_ITAH(10); BZ_ITAH(11); BZ_ITAH(12); BZ_ITAH(13); BZ_ITAH(14);
-            BZ_ITAH(15); BZ_ITAH(16); BZ_ITAH(17); BZ_ITAH(18); BZ_ITAH(19);
-            BZ_ITAH(20); BZ_ITAH(21); BZ_ITAH(22); BZ_ITAH(23); BZ_ITAH(24);
-            BZ_ITAH(25); BZ_ITAH(26); BZ_ITAH(27); BZ_ITAH(28); BZ_ITAH(29);
-            BZ_ITAH(30); BZ_ITAH(31); BZ_ITAH(32); BZ_ITAH(33); BZ_ITAH(34);
-            BZ_ITAH(35); BZ_ITAH(36); BZ_ITAH(37); BZ_ITAH(38); BZ_ITAH(39);
-            BZ_ITAH(40); BZ_ITAH(41); BZ_ITAH(42); BZ_ITAH(43); BZ_ITAH(44);
-            BZ_ITAH(45); BZ_ITAH(46); BZ_ITAH(47); BZ_ITAH(48); BZ_ITAH(49);
-
-#           undef BZ_ITAH
-
-      } else {
-	 /*--- slow version which correctly handles all situations ---*/
-         for (i = gs; i <= ge; i++) {
-            bsW ( s, 
-                  s->len  [s->selector[selCtr]] [mtfv[i]],
-                  s->code [s->selector[selCtr]] [mtfv[i]] );
-         }
-      }
-
-
-      gs = ge+1;
-      selCtr++;
-   }
-   AssertH( selCtr == nSelectors, 3007 );
-
-   if (s->verbosity >= 3)
-      VPrintf1( "codes %d\n", s->numZ-nBytes );
-}
-
-
-/*---------------------------------------------------*/
-void BZ2_compressBlock ( EState* s, Bool is_last_block )
-{
-   if (s->nblock > 0) {
-
-      BZ_FINALISE_CRC ( s->blockCRC );
-      s->combinedCRC = (s->combinedCRC << 1) | (s->combinedCRC >> 31);
-      s->combinedCRC ^= s->blockCRC;
-      if (s->blockNo > 1) s->numZ = 0;
-
-      if (s->verbosity >= 2)
-         VPrintf4( "    block %d: crc = 0x%08x, "
-                   "combined CRC = 0x%08x, size = %d\n",
-                   s->blockNo, s->blockCRC, s->combinedCRC, s->nblock );
-
-      BZ2_blockSort ( s );
-   }
-
-   s->zbits = (UChar*) (&((UChar*)s->arr2)[s->nblock]);
-
-   /*-- If this is the first block, create the stream header. --*/
-   if (s->blockNo == 1) {
-      BZ2_bsInitWrite ( s );
-      bsPutUChar ( s, BZ_HDR_B );
-      bsPutUChar ( s, BZ_HDR_Z );
-      bsPutUChar ( s, BZ_HDR_h );
-      bsPutUChar ( s, (UChar)(BZ_HDR_0 + s->blockSize100k) );
-   }
-
-   if (s->nblock > 0) {
-
-      bsPutUChar ( s, 0x31 ); bsPutUChar ( s, 0x41 );
-      bsPutUChar ( s, 0x59 ); bsPutUChar ( s, 0x26 );
-      bsPutUChar ( s, 0x53 ); bsPutUChar ( s, 0x59 );
-
-      /*-- Now the block's CRC, so it is in a known place. --*/
-      bsPutUInt32 ( s, s->blockCRC );
-
-      /*-- 
-         Now a single bit indicating (non-)randomisation. 
-         As of version 0.9.5, we use a better sorting algorithm
-         which makes randomisation unnecessary.  So always set
-         the randomised bit to 'no'.  Of course, the decoder
-         still needs to be able to handle randomised blocks
-         so as to maintain backwards compatibility with
-         older versions of bzip2.
-      --*/
-      bsW(s,1,0);
-
-      bsW ( s, 24, s->origPtr );
-      generateMTFValues ( s );
-      sendMTFValues ( s );
-   }
-
-
-   /*-- If this is the last block, add the stream trailer. --*/
-   if (is_last_block) {
-
-      bsPutUChar ( s, 0x17 ); bsPutUChar ( s, 0x72 );
-      bsPutUChar ( s, 0x45 ); bsPutUChar ( s, 0x38 );
-      bsPutUChar ( s, 0x50 ); bsPutUChar ( s, 0x90 );
-      bsPutUInt32 ( s, s->combinedCRC );
-      if (s->verbosity >= 2)
-         VPrintf1( "    final combined CRC = 0x%08x\n   ", s->combinedCRC );
-      bsFinishWrite ( s );
-   }
-}
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                        compress.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/dep/src/bzip2/crctable.c b/dep/src/bzip2/crctable.c
deleted file mode 100644
index 215687b2c..000000000
--- a/dep/src/bzip2/crctable.c
+++ /dev/null
@@ -1,104 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Table for doing CRCs                                  ---*/
-/*---                                            crctable.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#include "bzlib_private.h"
-
-/*--
-  I think this is an implementation of the AUTODIN-II,
-  Ethernet & FDDI 32-bit CRC standard.  Vaguely derived
-  from code by Rob Warnock, in Section 51 of the
-  comp.compression FAQ.
---*/
-
-UInt32 BZ2_crc32Table[256] = {
-
-   /*-- Ugly, innit? --*/
-
-   0x00000000L, 0x04c11db7L, 0x09823b6eL, 0x0d4326d9L,
-   0x130476dcL, 0x17c56b6bL, 0x1a864db2L, 0x1e475005L,
-   0x2608edb8L, 0x22c9f00fL, 0x2f8ad6d6L, 0x2b4bcb61L,
-   0x350c9b64L, 0x31cd86d3L, 0x3c8ea00aL, 0x384fbdbdL,
-   0x4c11db70L, 0x48d0c6c7L, 0x4593e01eL, 0x4152fda9L,
-   0x5f15adacL, 0x5bd4b01bL, 0x569796c2L, 0x52568b75L,
-   0x6a1936c8L, 0x6ed82b7fL, 0x639b0da6L, 0x675a1011L,
-   0x791d4014L, 0x7ddc5da3L, 0x709f7b7aL, 0x745e66cdL,
-   0x9823b6e0L, 0x9ce2ab57L, 0x91a18d8eL, 0x95609039L,
-   0x8b27c03cL, 0x8fe6dd8bL, 0x82a5fb52L, 0x8664e6e5L,
-   0xbe2b5b58L, 0xbaea46efL, 0xb7a96036L, 0xb3687d81L,
-   0xad2f2d84L, 0xa9ee3033L, 0xa4ad16eaL, 0xa06c0b5dL,
-   0xd4326d90L, 0xd0f37027L, 0xddb056feL, 0xd9714b49L,
-   0xc7361b4cL, 0xc3f706fbL, 0xceb42022L, 0xca753d95L,
-   0xf23a8028L, 0xf6fb9d9fL, 0xfbb8bb46L, 0xff79a6f1L,
-   0xe13ef6f4L, 0xe5ffeb43L, 0xe8bccd9aL, 0xec7dd02dL,
-   0x34867077L, 0x30476dc0L, 0x3d044b19L, 0x39c556aeL,
-   0x278206abL, 0x23431b1cL, 0x2e003dc5L, 0x2ac12072L,
-   0x128e9dcfL, 0x164f8078L, 0x1b0ca6a1L, 0x1fcdbb16L,
-   0x018aeb13L, 0x054bf6a4L, 0x0808d07dL, 0x0cc9cdcaL,
-   0x7897ab07L, 0x7c56b6b0L, 0x71159069L, 0x75d48ddeL,
-   0x6b93dddbL, 0x6f52c06cL, 0x6211e6b5L, 0x66d0fb02L,
-   0x5e9f46bfL, 0x5a5e5b08L, 0x571d7dd1L, 0x53dc6066L,
-   0x4d9b3063L, 0x495a2dd4L, 0x44190b0dL, 0x40d816baL,
-   0xaca5c697L, 0xa864db20L, 0xa527fdf9L, 0xa1e6e04eL,
-   0xbfa1b04bL, 0xbb60adfcL, 0xb6238b25L, 0xb2e29692L,
-   0x8aad2b2fL, 0x8e6c3698L, 0x832f1041L, 0x87ee0df6L,
-   0x99a95df3L, 0x9d684044L, 0x902b669dL, 0x94ea7b2aL,
-   0xe0b41de7L, 0xe4750050L, 0xe9362689L, 0xedf73b3eL,
-   0xf3b06b3bL, 0xf771768cL, 0xfa325055L, 0xfef34de2L,
-   0xc6bcf05fL, 0xc27dede8L, 0xcf3ecb31L, 0xcbffd686L,
-   0xd5b88683L, 0xd1799b34L, 0xdc3abdedL, 0xd8fba05aL,
-   0x690ce0eeL, 0x6dcdfd59L, 0x608edb80L, 0x644fc637L,
-   0x7a089632L, 0x7ec98b85L, 0x738aad5cL, 0x774bb0ebL,
-   0x4f040d56L, 0x4bc510e1L, 0x46863638L, 0x42472b8fL,
-   0x5c007b8aL, 0x58c1663dL, 0x558240e4L, 0x51435d53L,
-   0x251d3b9eL, 0x21dc2629L, 0x2c9f00f0L, 0x285e1d47L,
-   0x36194d42L, 0x32d850f5L, 0x3f9b762cL, 0x3b5a6b9bL,
-   0x0315d626L, 0x07d4cb91L, 0x0a97ed48L, 0x0e56f0ffL,
-   0x1011a0faL, 0x14d0bd4dL, 0x19939b94L, 0x1d528623L,
-   0xf12f560eL, 0xf5ee4bb9L, 0xf8ad6d60L, 0xfc6c70d7L,
-   0xe22b20d2L, 0xe6ea3d65L, 0xeba91bbcL, 0xef68060bL,
-   0xd727bbb6L, 0xd3e6a601L, 0xdea580d8L, 0xda649d6fL,
-   0xc423cd6aL, 0xc0e2d0ddL, 0xcda1f604L, 0xc960ebb3L,
-   0xbd3e8d7eL, 0xb9ff90c9L, 0xb4bcb610L, 0xb07daba7L,
-   0xae3afba2L, 0xaafbe615L, 0xa7b8c0ccL, 0xa379dd7bL,
-   0x9b3660c6L, 0x9ff77d71L, 0x92b45ba8L, 0x9675461fL,
-   0x8832161aL, 0x8cf30badL, 0x81b02d74L, 0x857130c3L,
-   0x5d8a9099L, 0x594b8d2eL, 0x5408abf7L, 0x50c9b640L,
-   0x4e8ee645L, 0x4a4ffbf2L, 0x470cdd2bL, 0x43cdc09cL,
-   0x7b827d21L, 0x7f436096L, 0x7200464fL, 0x76c15bf8L,
-   0x68860bfdL, 0x6c47164aL, 0x61043093L, 0x65c52d24L,
-   0x119b4be9L, 0x155a565eL, 0x18197087L, 0x1cd86d30L,
-   0x029f3d35L, 0x065e2082L, 0x0b1d065bL, 0x0fdc1becL,
-   0x3793a651L, 0x3352bbe6L, 0x3e119d3fL, 0x3ad08088L,
-   0x2497d08dL, 0x2056cd3aL, 0x2d15ebe3L, 0x29d4f654L,
-   0xc5a92679L, 0xc1683bceL, 0xcc2b1d17L, 0xc8ea00a0L,
-   0xd6ad50a5L, 0xd26c4d12L, 0xdf2f6bcbL, 0xdbee767cL,
-   0xe3a1cbc1L, 0xe760d676L, 0xea23f0afL, 0xeee2ed18L,
-   0xf0a5bd1dL, 0xf464a0aaL, 0xf9278673L, 0xfde69bc4L,
-   0x89b8fd09L, 0x8d79e0beL, 0x803ac667L, 0x84fbdbd0L,
-   0x9abc8bd5L, 0x9e7d9662L, 0x933eb0bbL, 0x97ffad0cL,
-   0xafb010b1L, 0xab710d06L, 0xa6322bdfL, 0xa2f33668L,
-   0xbcb4666dL, 0xb8757bdaL, 0xb5365d03L, 0xb1f740b4L
-};
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                        crctable.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/dep/src/bzip2/decompress.c b/dep/src/bzip2/decompress.c
deleted file mode 100644
index bba5e0fa3..000000000
--- a/dep/src/bzip2/decompress.c
+++ /dev/null
@@ -1,626 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Decompression machinery                               ---*/
-/*---                                          decompress.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#include "bzlib_private.h"
-
-
-/*---------------------------------------------------*/
-static
-void makeMaps_d ( DState* s )
-{
-   Int32 i;
-   s->nInUse = 0;
-   for (i = 0; i < 256; i++)
-      if (s->inUse[i]) {
-         s->seqToUnseq[s->nInUse] = i;
-         s->nInUse++;
-      }
-}
-
-
-/*---------------------------------------------------*/
-#define RETURN(rrr)                               \
-   { retVal = rrr; goto save_state_and_return; };
-
-#define GET_BITS(lll,vvv,nnn)                     \
-   case lll: s->state = lll;                      \
-   while (True) {                                 \
-      if (s->bsLive >= nnn) {                     \
-         UInt32 v;                                \
-         v = (s->bsBuff >>                        \
-             (s->bsLive-nnn)) & ((1 << nnn)-1);   \
-         s->bsLive -= nnn;                        \
-         vvv = v;                                 \
-         break;                                   \
-      }                                           \
-      if (s->strm->avail_in == 0) RETURN(BZ_OK);  \
-      s->bsBuff                                   \
-         = (s->bsBuff << 8) |                     \
-           ((UInt32)                              \
-              (*((UChar*)(s->strm->next_in))));   \
-      s->bsLive += 8;                             \
-      s->strm->next_in++;                         \
-      s->strm->avail_in--;                        \
-      s->strm->total_in_lo32++;                   \
-      if (s->strm->total_in_lo32 == 0)            \
-         s->strm->total_in_hi32++;                \
-   }
-
-#define GET_UCHAR(lll,uuu)                        \
-   GET_BITS(lll,uuu,8)
-
-#define GET_BIT(lll,uuu)                          \
-   GET_BITS(lll,uuu,1)
-
-/*---------------------------------------------------*/
-#define GET_MTF_VAL(label1,label2,lval)           \
-{                                                 \
-   if (groupPos == 0) {                           \
-      groupNo++;                                  \
-      if (groupNo >= nSelectors)                  \
-         RETURN(BZ_DATA_ERROR);                   \
-      groupPos = BZ_G_SIZE;                       \
-      gSel = s->selector[groupNo];                \
-      gMinlen = s->minLens[gSel];                 \
-      gLimit = &(s->limit[gSel][0]);              \
-      gPerm = &(s->perm[gSel][0]);                \
-      gBase = &(s->base[gSel][0]);                \
-   }                                              \
-   groupPos--;                                    \
-   zn = gMinlen;                                  \
-   GET_BITS(label1, zvec, zn);                    \
-   while (1) {                                    \
-      if (zn > 20 /* the longest code */)         \
-         RETURN(BZ_DATA_ERROR);                   \
-      if (zvec <= gLimit[zn]) break;              \
-      zn++;                                       \
-      GET_BIT(label2, zj);                        \
-      zvec = (zvec << 1) | zj;                    \
-   };                                             \
-   if (zvec - gBase[zn] < 0                       \
-       || zvec - gBase[zn] >= BZ_MAX_ALPHA_SIZE)  \
-      RETURN(BZ_DATA_ERROR);                      \
-   lval = gPerm[zvec - gBase[zn]];                \
-}
-
-
-/*---------------------------------------------------*/
-Int32 BZ2_decompress ( DState* s )
-{
-   UChar      uc;
-   Int32      retVal;
-   Int32      minLen, maxLen;
-   bz_stream* strm = s->strm;
-
-   /* stuff that needs to be saved/restored */
-   Int32  i;
-   Int32  j;
-   Int32  t;
-   Int32  alphaSize;
-   Int32  nGroups;
-   Int32  nSelectors;
-   Int32  EOB;
-   Int32  groupNo;
-   Int32  groupPos;
-   Int32  nextSym;
-   Int32  nblockMAX;
-   Int32  nblock;
-   Int32  es;
-   Int32  N;
-   Int32  curr;
-   Int32  zt;
-   Int32  zn; 
-   Int32  zvec;
-   Int32  zj;
-   Int32  gSel;
-   Int32  gMinlen;
-   Int32* gLimit;
-   Int32* gBase;
-   Int32* gPerm;
-
-   if (s->state == BZ_X_MAGIC_1) {
-      /*initialise the save area*/
-      s->save_i           = 0;
-      s->save_j           = 0;
-      s->save_t           = 0;
-      s->save_alphaSize   = 0;
-      s->save_nGroups     = 0;
-      s->save_nSelectors  = 0;
-      s->save_EOB         = 0;
-      s->save_groupNo     = 0;
-      s->save_groupPos    = 0;
-      s->save_nextSym     = 0;
-      s->save_nblockMAX   = 0;
-      s->save_nblock      = 0;
-      s->save_es          = 0;
-      s->save_N           = 0;
-      s->save_curr        = 0;
-      s->save_zt          = 0;
-      s->save_zn          = 0;
-      s->save_zvec        = 0;
-      s->save_zj          = 0;
-      s->save_gSel        = 0;
-      s->save_gMinlen     = 0;
-      s->save_gLimit      = NULL;
-      s->save_gBase       = NULL;
-      s->save_gPerm       = NULL;
-   }
-
-   /*restore from the save area*/
-   i           = s->save_i;
-   j           = s->save_j;
-   t           = s->save_t;
-   alphaSize   = s->save_alphaSize;
-   nGroups     = s->save_nGroups;
-   nSelectors  = s->save_nSelectors;
-   EOB         = s->save_EOB;
-   groupNo     = s->save_groupNo;
-   groupPos    = s->save_groupPos;
-   nextSym     = s->save_nextSym;
-   nblockMAX   = s->save_nblockMAX;
-   nblock      = s->save_nblock;
-   es          = s->save_es;
-   N           = s->save_N;
-   curr        = s->save_curr;
-   zt          = s->save_zt;
-   zn          = s->save_zn; 
-   zvec        = s->save_zvec;
-   zj          = s->save_zj;
-   gSel        = s->save_gSel;
-   gMinlen     = s->save_gMinlen;
-   gLimit      = s->save_gLimit;
-   gBase       = s->save_gBase;
-   gPerm       = s->save_gPerm;
-
-   retVal = BZ_OK;
-
-   switch (s->state) {
-
-      GET_UCHAR(BZ_X_MAGIC_1, uc);
-      if (uc != BZ_HDR_B) RETURN(BZ_DATA_ERROR_MAGIC);
-
-      GET_UCHAR(BZ_X_MAGIC_2, uc);
-      if (uc != BZ_HDR_Z) RETURN(BZ_DATA_ERROR_MAGIC);
-
-      GET_UCHAR(BZ_X_MAGIC_3, uc)
-      if (uc != BZ_HDR_h) RETURN(BZ_DATA_ERROR_MAGIC);
-
-      GET_BITS(BZ_X_MAGIC_4, s->blockSize100k, 8)
-      if (s->blockSize100k < (BZ_HDR_0 + 1) || 
-          s->blockSize100k > (BZ_HDR_0 + 9)) RETURN(BZ_DATA_ERROR_MAGIC);
-      s->blockSize100k -= BZ_HDR_0;
-
-      if (s->smallDecompress) {
-         s->ll16 = BZALLOC( s->blockSize100k * 100000 * sizeof(UInt16) );
-         s->ll4  = BZALLOC( 
-                      ((1 + s->blockSize100k * 100000) >> 1) * sizeof(UChar) 
-                   );
-         if (s->ll16 == NULL || s->ll4 == NULL) RETURN(BZ_MEM_ERROR);
-      } else {
-         s->tt  = BZALLOC( s->blockSize100k * 100000 * sizeof(Int32) );
-         if (s->tt == NULL) RETURN(BZ_MEM_ERROR);
-      }
-
-      GET_UCHAR(BZ_X_BLKHDR_1, uc);
-
-      if (uc == 0x17) goto endhdr_2;
-      if (uc != 0x31) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_2, uc);
-      if (uc != 0x41) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_3, uc);
-      if (uc != 0x59) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_4, uc);
-      if (uc != 0x26) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_5, uc);
-      if (uc != 0x53) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_6, uc);
-      if (uc != 0x59) RETURN(BZ_DATA_ERROR);
-
-      s->currBlockNo++;
-      if (s->verbosity >= 2)
-         VPrintf1 ( "\n    [%d: huff+mtf ", s->currBlockNo );
- 
-      s->storedBlockCRC = 0;
-      GET_UCHAR(BZ_X_BCRC_1, uc);
-      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_BCRC_2, uc);
-      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_BCRC_3, uc);
-      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_BCRC_4, uc);
-      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
-
-      GET_BITS(BZ_X_RANDBIT, s->blockRandomised, 1);
-
-      s->origPtr = 0;
-      GET_UCHAR(BZ_X_ORIGPTR_1, uc);
-      s->origPtr = (s->origPtr << 8) | ((Int32)uc);
-      GET_UCHAR(BZ_X_ORIGPTR_2, uc);
-      s->origPtr = (s->origPtr << 8) | ((Int32)uc);
-      GET_UCHAR(BZ_X_ORIGPTR_3, uc);
-      s->origPtr = (s->origPtr << 8) | ((Int32)uc);
-
-      if (s->origPtr < 0)
-         RETURN(BZ_DATA_ERROR);
-      if (s->origPtr > 10 + 100000*s->blockSize100k) 
-         RETURN(BZ_DATA_ERROR);
-
-      /*--- Receive the mapping table ---*/
-      for (i = 0; i < 16; i++) {
-         GET_BIT(BZ_X_MAPPING_1, uc);
-         if (uc == 1) 
-            s->inUse16[i] = True; else 
-            s->inUse16[i] = False;
-      }
-
-      for (i = 0; i < 256; i++) s->inUse[i] = False;
-
-      for (i = 0; i < 16; i++)
-         if (s->inUse16[i])
-            for (j = 0; j < 16; j++) {
-               GET_BIT(BZ_X_MAPPING_2, uc);
-               if (uc == 1) s->inUse[i * 16 + j] = True;
-            }
-      makeMaps_d ( s );
-      if (s->nInUse == 0) RETURN(BZ_DATA_ERROR);
-      alphaSize = s->nInUse+2;
-
-      /*--- Now the selectors ---*/
-      GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
-      if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
-      GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
-      if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
-      for (i = 0; i < nSelectors; i++) {
-         j = 0;
-         while (True) {
-            GET_BIT(BZ_X_SELECTOR_3, uc);
-            if (uc == 0) break;
-            j++;
-            if (j >= nGroups) RETURN(BZ_DATA_ERROR);
-         }
-         s->selectorMtf[i] = j;
-      }
-
-      /*--- Undo the MTF values for the selectors. ---*/
-      {
-         UChar pos[BZ_N_GROUPS], tmp, v;
-         for (v = 0; v < nGroups; v++) pos[v] = v;
-   
-         for (i = 0; i < nSelectors; i++) {
-            v = s->selectorMtf[i];
-            tmp = pos[v];
-            while (v > 0) { pos[v] = pos[v-1]; v--; }
-            pos[0] = tmp;
-            s->selector[i] = tmp;
-         }
-      }
-
-      /*--- Now the coding tables ---*/
-      for (t = 0; t < nGroups; t++) {
-         GET_BITS(BZ_X_CODING_1, curr, 5);
-         for (i = 0; i < alphaSize; i++) {
-            while (True) {
-               if (curr < 1 || curr > 20) RETURN(BZ_DATA_ERROR);
-               GET_BIT(BZ_X_CODING_2, uc);
-               if (uc == 0) break;
-               GET_BIT(BZ_X_CODING_3, uc);
-               if (uc == 0) curr++; else curr--;
-            }
-            s->len[t][i] = curr;
-         }
-      }
-
-      /*--- Create the Huffman decoding tables ---*/
-      for (t = 0; t < nGroups; t++) {
-         minLen = 32;
-         maxLen = 0;
-         for (i = 0; i < alphaSize; i++) {
-            if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
-            if (s->len[t][i] < minLen) minLen = s->len[t][i];
-         }
-         BZ2_hbCreateDecodeTables ( 
-            &(s->limit[t][0]), 
-            &(s->base[t][0]), 
-            &(s->perm[t][0]), 
-            &(s->len[t][0]),
-            minLen, maxLen, alphaSize
-         );
-         s->minLens[t] = minLen;
-      }
-
-      /*--- Now the MTF values ---*/
-
-      EOB      = s->nInUse+1;
-      nblockMAX = 100000 * s->blockSize100k;
-      groupNo  = -1;
-      groupPos = 0;
-
-      for (i = 0; i <= 255; i++) s->unzftab[i] = 0;
-
-      /*-- MTF init --*/
-      {
-         Int32 ii, jj, kk;
-         kk = MTFA_SIZE-1;
-         for (ii = 256 / MTFL_SIZE - 1; ii >= 0; ii--) {
-            for (jj = MTFL_SIZE-1; jj >= 0; jj--) {
-               s->mtfa[kk] = (UChar)(ii * MTFL_SIZE + jj);
-               kk--;
-            }
-            s->mtfbase[ii] = kk + 1;
-         }
-      }
-      /*-- end MTF init --*/
-
-      nblock = 0;
-      GET_MTF_VAL(BZ_X_MTF_1, BZ_X_MTF_2, nextSym);
-
-      while (True) {
-
-         if (nextSym == EOB) break;
-
-         if (nextSym == BZ_RUNA || nextSym == BZ_RUNB) {
-
-            es = -1;
-            N = 1;
-            do {
-               if (nextSym == BZ_RUNA) es = es + (0+1) * N; else
-               if (nextSym == BZ_RUNB) es = es + (1+1) * N;
-               N = N * 2;
-               GET_MTF_VAL(BZ_X_MTF_3, BZ_X_MTF_4, nextSym);
-            }
-               while (nextSym == BZ_RUNA || nextSym == BZ_RUNB);
-
-            es++;
-            uc = s->seqToUnseq[ s->mtfa[s->mtfbase[0]] ];
-            s->unzftab[uc] += es;
-
-            if (s->smallDecompress)
-               while (es > 0) {
-                  if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
-                  s->ll16[nblock] = (UInt16)uc;
-                  nblock++;
-                  es--;
-               }
-            else
-               while (es > 0) {
-                  if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
-                  s->tt[nblock] = (UInt32)uc;
-                  nblock++;
-                  es--;
-               };
-
-            continue;
-
-         } else {
-
-            if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
-
-            /*-- uc = MTF ( nextSym-1 ) --*/
-            {
-               Int32 ii, jj, kk, pp, lno, off;
-               UInt32 nn;
-               nn = (UInt32)(nextSym - 1);
-
-               if (nn < MTFL_SIZE) {
-                  /* avoid general-case expense */
-                  pp = s->mtfbase[0];
-                  uc = s->mtfa[pp+nn];
-                  while (nn > 3) {
-                     Int32 z = pp+nn;
-                     s->mtfa[(z)  ] = s->mtfa[(z)-1];
-                     s->mtfa[(z)-1] = s->mtfa[(z)-2];
-                     s->mtfa[(z)-2] = s->mtfa[(z)-3];
-                     s->mtfa[(z)-3] = s->mtfa[(z)-4];
-                     nn -= 4;
-                  }
-                  while (nn > 0) { 
-                     s->mtfa[(pp+nn)] = s->mtfa[(pp+nn)-1]; nn--; 
-                  };
-                  s->mtfa[pp] = uc;
-               } else { 
-                  /* general case */
-                  lno = nn / MTFL_SIZE;
-                  off = nn % MTFL_SIZE;
-                  pp = s->mtfbase[lno] + off;
-                  uc = s->mtfa[pp];
-                  while (pp > s->mtfbase[lno]) { 
-                     s->mtfa[pp] = s->mtfa[pp-1]; pp--; 
-                  };
-                  s->mtfbase[lno]++;
-                  while (lno > 0) {
-                     s->mtfbase[lno]--;
-                     s->mtfa[s->mtfbase[lno]] 
-                        = s->mtfa[s->mtfbase[lno-1] + MTFL_SIZE - 1];
-                     lno--;
-                  }
-                  s->mtfbase[0]--;
-                  s->mtfa[s->mtfbase[0]] = uc;
-                  if (s->mtfbase[0] == 0) {
-                     kk = MTFA_SIZE-1;
-                     for (ii = 256 / MTFL_SIZE-1; ii >= 0; ii--) {
-                        for (jj = MTFL_SIZE-1; jj >= 0; jj--) {
-                           s->mtfa[kk] = s->mtfa[s->mtfbase[ii] + jj];
-                           kk--;
-                        }
-                        s->mtfbase[ii] = kk + 1;
-                     }
-                  }
-               }
-            }
-            /*-- end uc = MTF ( nextSym-1 ) --*/
-
-            s->unzftab[s->seqToUnseq[uc]]++;
-            if (s->smallDecompress)
-               s->ll16[nblock] = (UInt16)(s->seqToUnseq[uc]); else
-               s->tt[nblock]   = (UInt32)(s->seqToUnseq[uc]);
-            nblock++;
-
-            GET_MTF_VAL(BZ_X_MTF_5, BZ_X_MTF_6, nextSym);
-            continue;
-         }
-      }
-
-      /* Now we know what nblock is, we can do a better sanity
-         check on s->origPtr.
-      */
-      if (s->origPtr < 0 || s->origPtr >= nblock)
-         RETURN(BZ_DATA_ERROR);
-
-      /*-- Set up cftab to facilitate generation of T^(-1) --*/
-      s->cftab[0] = 0;
-      for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1];
-      for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1];
-      for (i = 0; i <= 256; i++) {
-         if (s->cftab[i] < 0 || s->cftab[i] > nblock) {
-            /* s->cftab[i] can legitimately be == nblock */
-            RETURN(BZ_DATA_ERROR);
-         }
-      }
-
-      s->state_out_len = 0;
-      s->state_out_ch  = 0;
-      BZ_INITIALISE_CRC ( s->calculatedBlockCRC );
-      s->state = BZ_X_OUTPUT;
-      if (s->verbosity >= 2) VPrintf0 ( "rt+rld" );
-
-      if (s->smallDecompress) {
-
-         /*-- Make a copy of cftab, used in generation of T --*/
-         for (i = 0; i <= 256; i++) s->cftabCopy[i] = s->cftab[i];
-
-         /*-- compute the T vector --*/
-         for (i = 0; i < nblock; i++) {
-            uc = (UChar)(s->ll16[i]);
-            SET_LL(i, s->cftabCopy[uc]);
-            s->cftabCopy[uc]++;
-         }
-
-         /*-- Compute T^(-1) by pointer reversal on T --*/
-         i = s->origPtr;
-         j = GET_LL(i);
-         do {
-            Int32 tmp = GET_LL(j);
-            SET_LL(j, i);
-            i = j;
-            j = tmp;
-         }
-            while (i != s->origPtr);
-
-         s->tPos = s->origPtr;
-         s->nblock_used = 0;
-         if (s->blockRandomised) {
-            BZ_RAND_INIT_MASK;
-            BZ_GET_SMALL(s->k0); s->nblock_used++;
-            BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; 
-         } else {
-            BZ_GET_SMALL(s->k0); s->nblock_used++;
-         }
-
-      } else {
-
-         /*-- compute the T^(-1) vector --*/
-         for (i = 0; i < nblock; i++) {
-            uc = (UChar)(s->tt[i] & 0xff);
-            s->tt[s->cftab[uc]] |= (i << 8);
-            s->cftab[uc]++;
-         }
-
-         s->tPos = s->tt[s->origPtr] >> 8;
-         s->nblock_used = 0;
-         if (s->blockRandomised) {
-            BZ_RAND_INIT_MASK;
-            BZ_GET_FAST(s->k0); s->nblock_used++;
-            BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; 
-         } else {
-            BZ_GET_FAST(s->k0); s->nblock_used++;
-         }
-
-      }
-
-      RETURN(BZ_OK);
-
-
-
-    endhdr_2:
-
-      GET_UCHAR(BZ_X_ENDHDR_2, uc);
-      if (uc != 0x72) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_ENDHDR_3, uc);
-      if (uc != 0x45) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_ENDHDR_4, uc);
-      if (uc != 0x38) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_ENDHDR_5, uc);
-      if (uc != 0x50) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_ENDHDR_6, uc);
-      if (uc != 0x90) RETURN(BZ_DATA_ERROR);
-
-      s->storedCombinedCRC = 0;
-      GET_UCHAR(BZ_X_CCRC_1, uc);
-      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_CCRC_2, uc);
-      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_CCRC_3, uc);
-      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_CCRC_4, uc);
-      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
-
-      s->state = BZ_X_IDLE;
-      RETURN(BZ_STREAM_END);
-
-      default: AssertH ( False, 4001 );
-   }
-
-   AssertH ( False, 4002 );
-
-   save_state_and_return:
-
-   s->save_i           = i;
-   s->save_j           = j;
-   s->save_t           = t;
-   s->save_alphaSize   = alphaSize;
-   s->save_nGroups     = nGroups;
-   s->save_nSelectors  = nSelectors;
-   s->save_EOB         = EOB;
-   s->save_groupNo     = groupNo;
-   s->save_groupPos    = groupPos;
-   s->save_nextSym     = nextSym;
-   s->save_nblockMAX   = nblockMAX;
-   s->save_nblock      = nblock;
-   s->save_es          = es;
-   s->save_N           = N;
-   s->save_curr        = curr;
-   s->save_zt          = zt;
-   s->save_zn          = zn;
-   s->save_zvec        = zvec;
-   s->save_zj          = zj;
-   s->save_gSel        = gSel;
-   s->save_gMinlen     = gMinlen;
-   s->save_gLimit      = gLimit;
-   s->save_gBase       = gBase;
-   s->save_gPerm       = gPerm;
-
-   return retVal;   
-}
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                      decompress.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/dep/src/bzip2/huffman.c b/dep/src/bzip2/huffman.c
deleted file mode 100644
index 87e79e38a..000000000
--- a/dep/src/bzip2/huffman.c
+++ /dev/null
@@ -1,205 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Huffman coding low-level stuff                        ---*/
-/*---                                             huffman.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#include "bzlib_private.h"
-
-/*---------------------------------------------------*/
-#define WEIGHTOF(zz0)  ((zz0) & 0xffffff00)
-#define DEPTHOF(zz1)   ((zz1) & 0x000000ff)
-#define MYMAX(zz2,zz3) ((zz2) > (zz3) ? (zz2) : (zz3))
-
-#define ADDWEIGHTS(zw1,zw2)                           \
-   (WEIGHTOF(zw1)+WEIGHTOF(zw2)) |                    \
-   (1 + MYMAX(DEPTHOF(zw1),DEPTHOF(zw2)))
-
-#define UPHEAP(z)                                     \
-{                                                     \
-   Int32 zz, tmp;                                     \
-   zz = z; tmp = heap[zz];                            \
-   while (weight[tmp] < weight[heap[zz >> 1]]) {      \
-      heap[zz] = heap[zz >> 1];                       \
-      zz >>= 1;                                       \
-   }                                                  \
-   heap[zz] = tmp;                                    \
-}
-
-#define DOWNHEAP(z)                                   \
-{                                                     \
-   Int32 zz, yy, tmp;                                 \
-   zz = z; tmp = heap[zz];                            \
-   while (True) {                                     \
-      yy = zz << 1;                                   \
-      if (yy > nHeap) break;                          \
-      if (yy < nHeap &&                               \
-          weight[heap[yy+1]] < weight[heap[yy]])      \
-         yy++;                                        \
-      if (weight[tmp] < weight[heap[yy]]) break;      \
-      heap[zz] = heap[yy];                            \
-      zz = yy;                                        \
-   }                                                  \
-   heap[zz] = tmp;                                    \
-}
-
-
-/*---------------------------------------------------*/
-void BZ2_hbMakeCodeLengths ( UChar *len, 
-                             Int32 *freq,
-                             Int32 alphaSize,
-                             Int32 maxLen )
-{
-   /*--
-      Nodes and heap entries run from 1.  Entry 0
-      for both the heap and nodes is a sentinel.
-   --*/
-   Int32 nNodes, nHeap, n1, n2, i, j, k;
-   Bool  tooLong;
-
-   Int32 heap   [ BZ_MAX_ALPHA_SIZE + 2 ];
-   Int32 weight [ BZ_MAX_ALPHA_SIZE * 2 ];
-   Int32 parent [ BZ_MAX_ALPHA_SIZE * 2 ]; 
-
-   for (i = 0; i < alphaSize; i++)
-      weight[i+1] = (freq[i] == 0 ? 1 : freq[i]) << 8;
-
-   while (True) {
-
-      nNodes = alphaSize;
-      nHeap = 0;
-
-      heap[0] = 0;
-      weight[0] = 0;
-      parent[0] = -2;
-
-      for (i = 1; i <= alphaSize; i++) {
-         parent[i] = -1;
-         nHeap++;
-         heap[nHeap] = i;
-         UPHEAP(nHeap);
-      }
-
-      AssertH( nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001 );
-   
-      while (nHeap > 1) {
-         n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1);
-         n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1);
-         nNodes++;
-         parent[n1] = parent[n2] = nNodes;
-         weight[nNodes] = ADDWEIGHTS(weight[n1], weight[n2]);
-         parent[nNodes] = -1;
-         nHeap++;
-         heap[nHeap] = nNodes;
-         UPHEAP(nHeap);
-      }
-
-      AssertH( nNodes < (BZ_MAX_ALPHA_SIZE * 2), 2002 );
-
-      tooLong = False;
-      for (i = 1; i <= alphaSize; i++) {
-         j = 0;
-         k = i;
-         while (parent[k] >= 0) { k = parent[k]; j++; }
-         len[i-1] = j;
-         if (j > maxLen) tooLong = True;
-      }
-      
-      if (! tooLong) break;
-
-      /* 17 Oct 04: keep-going condition for the following loop used
-         to be 'i < alphaSize', which missed the last element,
-         theoretically leading to the possibility of the compressor
-         looping.  However, this count-scaling step is only needed if
-         one of the generated Huffman code words is longer than
-         maxLen, which up to and including version 1.0.2 was 20 bits,
-         which is extremely unlikely.  In version 1.0.3 maxLen was
-         changed to 17 bits, which has minimal effect on compression
-         ratio, but does mean this scaling step is used from time to
-         time, enough to verify that it works.
-
-         This means that bzip2-1.0.3 and later will only produce
-         Huffman codes with a maximum length of 17 bits.  However, in
-         order to preserve backwards compatibility with bitstreams
-         produced by versions pre-1.0.3, the decompressor must still
-         handle lengths of up to 20. */
-
-      for (i = 1; i <= alphaSize; i++) {
-         j = weight[i] >> 8;
-         j = 1 + (j / 2);
-         weight[i] = j << 8;
-      }
-   }
-}
-
-
-/*---------------------------------------------------*/
-void BZ2_hbAssignCodes ( Int32 *code,
-                         UChar *length,
-                         Int32 minLen,
-                         Int32 maxLen,
-                         Int32 alphaSize )
-{
-   Int32 n, vec, i;
-
-   vec = 0;
-   for (n = minLen; n <= maxLen; n++) {
-      for (i = 0; i < alphaSize; i++)
-         if (length[i] == n) { code[i] = vec; vec++; };
-      vec <<= 1;
-   }
-}
-
-
-/*---------------------------------------------------*/
-void BZ2_hbCreateDecodeTables ( Int32 *limit,
-                                Int32 *base,
-                                Int32 *perm,
-                                UChar *length,
-                                Int32 minLen,
-                                Int32 maxLen,
-                                Int32 alphaSize )
-{
-   Int32 pp, i, j, vec;
-
-   pp = 0;
-   for (i = minLen; i <= maxLen; i++)
-      for (j = 0; j < alphaSize; j++)
-         if (length[j] == i) { perm[pp] = j; pp++; };
-
-   for (i = 0; i < BZ_MAX_CODE_LEN; i++) base[i] = 0;
-   for (i = 0; i < alphaSize; i++) base[length[i]+1]++;
-
-   for (i = 1; i < BZ_MAX_CODE_LEN; i++) base[i] += base[i-1];
-
-   for (i = 0; i < BZ_MAX_CODE_LEN; i++) limit[i] = 0;
-   vec = 0;
-
-   for (i = minLen; i <= maxLen; i++) {
-      vec += (base[i+1] - base[i]);
-      limit[i] = vec-1;
-      vec <<= 1;
-   }
-   for (i = minLen + 1; i <= maxLen; i++)
-      base[i] = ((limit[i-1] + 1) << 1) - base[i];
-}
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                         huffman.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/dep/src/bzip2/randtable.c b/dep/src/bzip2/randtable.c
deleted file mode 100644
index 068b76367..000000000
--- a/dep/src/bzip2/randtable.c
+++ /dev/null
@@ -1,84 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Table for randomising repetitive blocks               ---*/
-/*---                                           randtable.c ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.5 of 10 December 2007
-   Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#include "bzlib_private.h"
-
-
-/*---------------------------------------------*/
-Int32 BZ2_rNums[512] = { 
-   619, 720, 127, 481, 931, 816, 813, 233, 566, 247, 
-   985, 724, 205, 454, 863, 491, 741, 242, 949, 214, 
-   733, 859, 335, 708, 621, 574, 73, 654, 730, 472, 
-   419, 436, 278, 496, 867, 210, 399, 680, 480, 51, 
-   878, 465, 811, 169, 869, 675, 611, 697, 867, 561, 
-   862, 687, 507, 283, 482, 129, 807, 591, 733, 623, 
-   150, 238, 59, 379, 684, 877, 625, 169, 643, 105, 
-   170, 607, 520, 932, 727, 476, 693, 425, 174, 647, 
-   73, 122, 335, 530, 442, 853, 695, 249, 445, 515, 
-   909, 545, 703, 919, 874, 474, 882, 500, 594, 612, 
-   641, 801, 220, 162, 819, 984, 589, 513, 495, 799, 
-   161, 604, 958, 533, 221, 400, 386, 867, 600, 782, 
-   382, 596, 414, 171, 516, 375, 682, 485, 911, 276, 
-   98, 553, 163, 354, 666, 933, 424, 341, 533, 870, 
-   227, 730, 475, 186, 263, 647, 537, 686, 600, 224, 
-   469, 68, 770, 919, 190, 373, 294, 822, 808, 206, 
-   184, 943, 795, 384, 383, 461, 404, 758, 839, 887, 
-   715, 67, 618, 276, 204, 918, 873, 777, 604, 560, 
-   951, 160, 578, 722, 79, 804, 96, 409, 713, 940, 
-   652, 934, 970, 447, 318, 353, 859, 672, 112, 785, 
-   645, 863, 803, 350, 139, 93, 354, 99, 820, 908, 
-   609, 772, 154, 274, 580, 184, 79, 626, 630, 742, 
-   653, 282, 762, 623, 680, 81, 927, 626, 789, 125, 
-   411, 521, 938, 300, 821, 78, 343, 175, 128, 250, 
-   170, 774, 972, 275, 999, 639, 495, 78, 352, 126, 
-   857, 956, 358, 619, 580, 124, 737, 594, 701, 612, 
-   669, 112, 134, 694, 363, 992, 809, 743, 168, 974, 
-   944, 375, 748, 52, 600, 747, 642, 182, 862, 81, 
-   344, 805, 988, 739, 511, 655, 814, 334, 249, 515, 
-   897, 955, 664, 981, 649, 113, 974, 459, 893, 228, 
-   433, 837, 553, 268, 926, 240, 102, 654, 459, 51, 
-   686, 754, 806, 760, 493, 403, 415, 394, 687, 700, 
-   946, 670, 656, 610, 738, 392, 760, 799, 887, 653, 
-   978, 321, 576, 617, 626, 502, 894, 679, 243, 440, 
-   680, 879, 194, 572, 640, 724, 926, 56, 204, 700, 
-   707, 151, 457, 449, 797, 195, 791, 558, 945, 679, 
-   297, 59, 87, 824, 713, 663, 412, 693, 342, 606, 
-   134, 108, 571, 364, 631, 212, 174, 643, 304, 329, 
-   343, 97, 430, 751, 497, 314, 983, 374, 822, 928, 
-   140, 206, 73, 263, 980, 736, 876, 478, 430, 305, 
-   170, 514, 364, 692, 829, 82, 855, 953, 676, 246, 
-   369, 970, 294, 750, 807, 827, 150, 790, 288, 923, 
-   804, 378, 215, 828, 592, 281, 565, 555, 710, 82, 
-   896, 831, 547, 261, 524, 462, 293, 465, 502, 56, 
-   661, 821, 976, 991, 658, 869, 905, 758, 745, 193, 
-   768, 550, 608, 933, 378, 286, 215, 979, 792, 961, 
-   61, 688, 793, 644, 986, 403, 106, 366, 905, 644, 
-   372, 567, 466, 434, 645, 210, 389, 550, 919, 135, 
-   780, 773, 635, 389, 707, 100, 626, 958, 165, 504, 
-   920, 176, 193, 713, 857, 265, 203, 50, 668, 108, 
-   645, 990, 626, 197, 510, 357, 358, 850, 858, 364, 
-   936, 638
-};
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                       randtable.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/dep/src/g3dlite/CMakeLists.txt b/dep/src/g3dlite/CMakeLists.txt
deleted file mode 100644
index 1d5f749dc..000000000
--- a/dep/src/g3dlite/CMakeLists.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-set(LIBRARY_NAME g3dlite)
-
-set(LIBRARY_SRCS
-    AABox.cpp
-    Any.cpp
-    #AnyVal.cpp
-    #AreaMemoryManager.cpp
-    BinaryFormat.cpp
-    BinaryInput.cpp
-    BinaryOutput.cpp
-    Box.cpp
-    #Box2D.cpp
-    #BumpMapPreprocess.cpp
-    Capsule.cpp
-    CollisionDetection.cpp
-    #Color1.cpp
-    #Color1uint8.cpp
-    #Color3.cpp
-    #Color3uint8.cpp
-    #Color4.cpp
-    #Color4uint8.cpp
-    #Cone.cpp
-    #ConvexPolyhedron.cpp
-    CoordinateFrame.cpp
-    Crypto.cpp
-    #Crypto_md5.cpp
-    Cylinder.cpp
-    FileSystem.cpp
-    #GCamera.cpp
-    #GImage.cpp
-    #GImage_bayer.cpp
-    #GImage_bmp.cpp
-    #GImage_jpeg.cpp
-    #GImage_png.cpp
-    #GImage_ppm.cpp
-    #GImage_tga.cpp
-    #GLight.cpp
-    #GThread.cpp
-    #GUniqueID.cpp
-    #Image1.cpp
-    #Image1uint8.cpp
-    #Image3.cpp
-    #Image3uint8.cpp
-    #Image4.cpp
-    #Image4uint8.cpp
-    #ImageFormat.cpp
-    #ImageFormat_convert.cpp
-    #Intersect.cpp
-    Line.cpp
-    LineSegment.cpp
-    Log.cpp
-    #Matrix.cpp
-    Matrix3.cpp
-    Matrix4.cpp
-    MemoryManager.cpp
-    #MeshAlg.cpp
-    #MeshAlgAdjacency.cpp
-    #MeshAlgWeld.cpp
-    #MeshBuilder.cpp
-    #NetAddress.cpp
-    #NetworkDevice.cpp
-    PhysicsFrame.cpp
-    #PhysicsFrameSpline.cpp
-    Plane.cpp
-    #PrecomputedRandom.cpp
-    Quat.cpp
-    Random.cpp
-    Ray.cpp
-    #Rect2D.cpp
-    ReferenceCount.cpp
-    RegistryUtil.cpp
-    Sphere.cpp
-    #SplineBase.cpp
-    #Stopwatch.cpp
-    System.cpp
-    TextInput.cpp
-    TextOutput.cpp
-    #ThreadSet.cpp
-    Triangle.cpp
-    UprightFrame.cpp
-    Vector2.cpp
-    #Vector2int16.cpp
-    Vector3.cpp
-    #Vector3int16.cpp
-    #Vector3int32.cpp
-    Vector4.cpp
-    #Vector4int8.cpp
-    #Welder.cpp
-    #WinMain.cpp
-    #XML.cpp
-    #constants.cpp
-    debugAssert.cpp
-    fileutils.cpp
-    #filter.cpp
-    format.cpp
-    g3dfnmatch.cpp
-    g3dmath.cpp
-    #license.cpp
-    prompt.cpp
-    stringutils.cpp
-    uint128.cpp
-)
-
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/dep/include
-  ${CMAKE_SOURCE_DIR}/dep/include/g3dlite
-  ${CMAKE_SOURCE_DIR}/dep/include/zlib
-)
-
-add_library(${LIBRARY_NAME} STATIC
-  ${LIBRARY_SRCS}
-)
-
-if(WIN32)
-  target_link_libraries(${LIBRARY_NAME}
-    zlib
-  )
-endif()
diff --git a/dep/src/g3dlite/Intersect.cpp b/dep/src/g3dlite/Intersect.cpp
deleted file mode 100644
index 929a2e4e6..000000000
--- a/dep/src/g3dlite/Intersect.cpp
+++ /dev/null
@@ -1,844 +0,0 @@
-/**
- @file Intersect.cpp
- 
- @maintainer Morgan McGuire, http://graphics.cs.williams.edu
-  
- @created 2009-06-29
- @edited  2009-06-29
-
- Copyright 2000-2009, Morgan McGuire.
- All rights reserved.
-
- From the G3D Innovation Engine
- http://g3d.sf.net
- */
-#include "G3D/Intersect.h"
-
-namespace G3D {
-
-#ifdef _MSC_VER
-// Turn on fast floating-point optimizations
-#pragma float_control( push )
-#pragma fp_contract( on )
-#pragma fenv_access( off )
-#pragma float_control( except, off )
-#pragma float_control( precise, off )
-#endif
-
-bool __fastcall Intersect::rayAABox(const Ray& ray, const AABox& box) {
-    switch (ray.classification) {
-    case Ray::MMM:
-		
-		if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z < box.lo.z)
-			|| (ray.jbyi * box.lo.x - box.hi.y + ray.c_xy > 0)
-			|| (ray.ibyj * box.lo.y - box.hi.x + ray.c_yx > 0)
-			|| (ray.jbyk * box.lo.z - box.hi.y + ray.c_zy > 0)
-			|| (ray.kbyj * box.lo.y - box.hi.z + ray.c_yz > 0)
-			|| (ray.kbyi * box.lo.x - box.hi.z + ray.c_xz > 0)
-			|| (ray.ibyk * box.lo.z - box.hi.x + ray.c_zx > 0)
-			)
-			return false;
-		
-		return true;
-
-	case Ray::MMP:
-		
-		if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z > box.hi.z)
-			|| (ray.jbyi * box.lo.x - box.hi.y + ray.c_xy > 0)
-			|| (ray.ibyj * box.lo.y - box.hi.x + ray.c_yx > 0)
-			|| (ray.jbyk * box.hi.z - box.hi.y + ray.c_zy > 0)
-			|| (ray.kbyj * box.lo.y - box.lo.z + ray.c_yz < 0)
-			|| (ray.kbyi * box.lo.x - box.lo.z + ray.c_xz < 0)
-			|| (ray.ibyk * box.hi.z - box.hi.x + ray.c_zx > 0)
-			)
-			return false;
-		
-		return true;
-
-	case Ray::MPM:
-		
-		if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z < box.lo.z)
-			|| (ray.jbyi * box.lo.x - box.lo.y + ray.c_xy < 0) 
-			|| (ray.ibyj * box.hi.y - box.hi.x + ray.c_yx > 0)
-			|| (ray.jbyk * box.lo.z - box.lo.y + ray.c_zy < 0) 
-			|| (ray.kbyj * box.hi.y - box.hi.z + ray.c_yz > 0)
-			|| (ray.kbyi * box.lo.x - box.hi.z + ray.c_xz > 0)
-			|| (ray.ibyk * box.lo.z - box.hi.x + ray.c_zx > 0)
-			)
-			return false;
-		
-		return true;
-
-	case Ray::MPP:
-	
-		if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z > box.hi.z)
-			|| (ray.jbyi * box.lo.x - box.lo.y + ray.c_xy < 0) 
-			|| (ray.ibyj * box.hi.y - box.hi.x + ray.c_yx > 0)
-			|| (ray.jbyk * box.hi.z - box.lo.y + ray.c_zy < 0)
-			|| (ray.kbyj * box.hi.y - box.lo.z + ray.c_yz < 0)
-			|| (ray.kbyi * box.lo.x - box.lo.z + ray.c_xz < 0)
-			|| (ray.ibyk * box.hi.z - box.hi.x + ray.c_zx > 0)
-			)
-			return false;
-		
-		return true;
-
-	case Ray::PMM:
-
-		if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z < box.lo.z)
-			|| (ray.jbyi * box.hi.x - box.hi.y + ray.c_xy > 0)
-			|| (ray.ibyj * box.lo.y - box.lo.x + ray.c_yx < 0)
-			|| (ray.jbyk * box.lo.z - box.hi.y + ray.c_zy > 0)
-			|| (ray.kbyj * box.lo.y - box.hi.z + ray.c_yz > 0)
-			|| (ray.kbyi * box.hi.x - box.hi.z + ray.c_xz > 0)
-			|| (ray.ibyk * box.lo.z - box.lo.x + ray.c_zx < 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::PMP:
-
-		if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z > box.hi.z)
-			|| (ray.jbyi * box.hi.x - box.hi.y + ray.c_xy > 0)
-			|| (ray.ibyj * box.lo.y - box.lo.x + ray.c_yx < 0)
-			|| (ray.jbyk * box.hi.z - box.hi.y + ray.c_zy > 0)
-			|| (ray.kbyj * box.lo.y - box.lo.z + ray.c_yz < 0)
-			|| (ray.kbyi * box.hi.x - box.lo.z + ray.c_xz < 0)
-			|| (ray.ibyk * box.hi.z - box.lo.x + ray.c_zx < 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::PPM:
-
-		if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z < box.lo.z)
-			|| (ray.jbyi * box.hi.x - box.lo.y + ray.c_xy < 0)
-			|| (ray.ibyj * box.hi.y - box.lo.x + ray.c_yx < 0)
-			|| (ray.jbyk * box.lo.z - box.lo.y + ray.c_zy < 0) 
-			|| (ray.kbyj * box.hi.y - box.hi.z + ray.c_yz > 0)
-			|| (ray.kbyi * box.hi.x - box.hi.z + ray.c_xz > 0)
-			|| (ray.ibyk * box.lo.z - box.lo.x + ray.c_zx < 0)
-			)
-			return false;
-		
-		return true;
-
-	case Ray::PPP:
-
-		if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z > box.hi.z)
-			|| (ray.jbyi * box.hi.x - box.lo.y + ray.c_xy < 0)
-			|| (ray.ibyj * box.hi.y - box.lo.x + ray.c_yx < 0)
-			|| (ray.jbyk * box.hi.z - box.lo.y + ray.c_zy < 0)
-			|| (ray.kbyj * box.hi.y - box.lo.z + ray.c_yz < 0)
-			|| (ray.kbyi * box.hi.x - box.lo.z + ray.c_xz < 0)
-            || (ray.ibyk * box.hi.z - box.lo.x + ray.c_zx < 0)) {
-			return false;
-        }
-		
-		return true;
-
-	case Ray::OMM:
-
-		if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.y < box.lo.y) || (ray.m_origin.z < box.lo.z)
-			|| (ray.jbyk * box.lo.z - box.hi.y + ray.c_zy > 0)
-			|| (ray.kbyj * box.lo.y - box.hi.z + ray.c_yz > 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::OMP:
-
-		if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.y < box.lo.y) || (ray.m_origin.z > box.hi.z)
-			|| (ray.jbyk * box.hi.z - box.hi.y + ray.c_zy > 0)
-			|| (ray.kbyj * box.lo.y - box.lo.z + ray.c_yz < 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::OPM:
-
-		if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.y > box.hi.y) || (ray.m_origin.z < box.lo.z)
-			|| (ray.jbyk * box.lo.z - box.lo.y + ray.c_zy < 0) 
-			|| (ray.kbyj * box.hi.y - box.hi.z + ray.c_yz > 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::OPP:
-
-		if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.y > box.hi.y) || (ray.m_origin.z > box.hi.z)
-			|| (ray.jbyk * box.hi.z - box.lo.y + ray.c_zy < 0)
-			|| (ray.kbyj * box.hi.y - box.lo.z + ray.c_yz < 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::MOM:
-
-		if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.z < box.lo.z) 
-			|| (ray.kbyi * box.lo.x - box.hi.z + ray.c_xz > 0)
-			|| (ray.ibyk * box.lo.z - box.hi.x + ray.c_zx > 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::MOP:
-
-		if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.z > box.hi.z) 
-			|| (ray.kbyi * box.lo.x - box.lo.z + ray.c_xz < 0)
-			|| (ray.ibyk * box.hi.z - box.hi.x + ray.c_zx > 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::POM:
-
-		if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-			|| (ray.m_origin.x > box.hi.x) || (ray.m_origin.z < box.lo.z)
-			|| (ray.kbyi * box.hi.x - box.hi.z + ray.c_xz > 0)
-			|| (ray.ibyk * box.lo.z - box.lo.x + ray.c_zx < 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::POP:
-
-		if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-			|| (ray.m_origin.x > box.hi.x) || (ray.m_origin.z > box.hi.z)
-			|| (ray.kbyi * box.hi.x - box.lo.z + ray.c_xz < 0)
-			|| (ray.ibyk * box.hi.z - box.lo.x + ray.c_zx < 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::MMO:
-
-		if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.y < box.lo.y) 
-			|| (ray.jbyi * box.lo.x - box.hi.y + ray.c_xy > 0)
-			|| (ray.ibyj * box.lo.y - box.hi.x + ray.c_yx > 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::MPO:
-
-		if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.y > box.hi.y) 
-			|| (ray.jbyi * box.lo.x - box.lo.y + ray.c_xy < 0) 
-			|| (ray.ibyj * box.hi.y - box.hi.x + ray.c_yx > 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::PMO:
-
-		if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
-			|| (ray.m_origin.x > box.hi.x) || (ray.m_origin.y < box.lo.y) 
-			|| (ray.jbyi * box.hi.x - box.hi.y + ray.c_xy > 0)
-			|| (ray.ibyj * box.lo.y - box.lo.x + ray.c_yx < 0)  
-			)
-			return false;
-
-		return true;
-
-	case Ray::PPO:
-
-		if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
-			|| (ray.m_origin.x > box.hi.x) || (ray.m_origin.y > box.hi.y)
-			|| (ray.jbyi * box.hi.x - box.lo.y + ray.c_xy < 0)
-			|| (ray.ibyj * box.hi.y - box.lo.x + ray.c_yx < 0)
-			)
-			return false;
-
-		return true;
-
-	case Ray::MOO:
-
-		if((ray.m_origin.x < box.lo.x)
-			|| (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-			|| (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
-			)
-			return false;
-
-		return true;
-
-	case Ray::POO:
-
-		if((ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-			|| (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
-			)
-			return false;
-
-		return true;
-
-	case Ray::OMO:
-
-		if((ray.m_origin.y < box.lo.y)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
-			)
-			return false;
-
-	case Ray::OPO:
-
-		if((ray.m_origin.y > box.hi.y)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
-			)
-			return false;
-
-	case Ray::OOM:
-
-		if((ray.m_origin.z < box.lo.z)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-			)
-			return false;
-
-	case Ray::OOP:
-
-		if((ray.m_origin.z > box.hi.z)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-			)
-			return false;
-
-		return true;
-	
-	}
-
-	return false;
-}
-
-
-bool __fastcall Intersect::rayAABox(const Ray& ray, const AABox& box, float& time) {
-
-	switch (ray.classification) {
-	case Ray::MMM:
-		{
-		if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z < box.lo.z)
-			|| (ray.jbyi * box.lo.x - box.hi.y + ray.c_xy > 0)
-			|| (ray.ibyj * box.lo.y - box.hi.x + ray.c_yx > 0)
-			|| (ray.jbyk * box.lo.z - box.hi.y + ray.c_zy > 0)
-			|| (ray.kbyj * box.lo.y - box.hi.z + ray.c_yz > 0)
-			|| (ray.kbyi * box.lo.x - box.hi.z + ray.c_xz > 0)
-			|| (ray.ibyk * box.lo.z - box.hi.x + ray.c_zx > 0)) {
-			return false;
-        }
-
-		// compute the intersection distance
-
-		time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t1 = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
-        if (t1 > time) {
-				time = t1;
-        }
-
-		float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-
-	case Ray::MMP:
-		{		
-		if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z > box.hi.z)
-			|| (ray.jbyi * box.lo.x - box.hi.y + ray.c_xy > 0)
-			|| (ray.ibyj * box.lo.y - box.hi.x + ray.c_yx > 0)
-			|| (ray.jbyk * box.hi.z - box.hi.y + ray.c_zy > 0)
-			|| (ray.kbyj * box.lo.y - box.lo.z + ray.c_yz < 0)
-			|| (ray.kbyi * box.lo.x - box.lo.z + ray.c_xz < 0)
-            || (ray.ibyk * box.hi.z - box.hi.x + ray.c_zx > 0)) {
-			return false;
-        }
-		
-		time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t1 = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
-        if (t1 > time) {
-			time = t1;
-        }
-		float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-	
-		return true;
-		}
-
-	case Ray::MPM:
-		{		
-		if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z < box.lo.z)
-			|| (ray.jbyi * box.lo.x - box.lo.y + ray.c_xy < 0) 
-			|| (ray.ibyj * box.hi.y - box.hi.x + ray.c_yx > 0)
-			|| (ray.jbyk * box.lo.z - box.lo.y + ray.c_zy < 0) 
-			|| (ray.kbyj * box.hi.y - box.hi.z + ray.c_yz > 0)
-			|| (ray.kbyi * box.lo.x - box.hi.z + ray.c_xz > 0)
-            || (ray.ibyk * box.lo.z - box.hi.x + ray.c_zx > 0)) {
-			return false;
-        }
-		
-		time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t1 = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
-        if (t1 > time) {
-			time = t1;
-        }
-		float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-
-	case Ray::MPP:
-		{
-		if ((ray.m_origin.x < box.lo.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z > box.hi.z)
-			|| (ray.jbyi * box.lo.x - box.lo.y + ray.c_xy < 0) 
-			|| (ray.ibyj * box.hi.y - box.hi.x + ray.c_yx > 0)
-			|| (ray.jbyk * box.hi.z - box.lo.y + ray.c_zy < 0)
-			|| (ray.kbyj * box.hi.y - box.lo.z + ray.c_yz < 0) 
-			|| (ray.kbyi * box.lo.x - box.lo.z + ray.c_xz < 0)
-            || (ray.ibyk * box.hi.z - box.hi.x + ray.c_zx > 0)) {
-			return false;
-        }
-		
-		time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t1 = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
-        if (t1 > time) {
-			time = t1;
-        }
-		float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-
-	case Ray::PMM:
-		{
-		if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z < box.lo.z)
-			|| (ray.jbyi * box.hi.x - box.hi.y + ray.c_xy > 0)
-			|| (ray.ibyj * box.lo.y - box.lo.x + ray.c_yx < 0)
-			|| (ray.jbyk * box.lo.z - box.hi.y + ray.c_zy > 0)
-			|| (ray.kbyj * box.lo.y - box.hi.z + ray.c_yz > 0)
-			|| (ray.kbyi * box.hi.x - box.hi.z + ray.c_xz > 0)
-            || (ray.ibyk * box.lo.z - box.lo.x + ray.c_zx < 0)) {
-			return false;
-        }
-		
-		time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t1 = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
-        if (t1 > time) {
-			time = t1;
-        }
-		float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-		
-
-	case Ray::PMP:
-		{
-		if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y < box.lo.y) || (ray.m_origin.z > box.hi.z)
-			|| (ray.jbyi * box.hi.x - box.hi.y + ray.c_xy > 0)
-			|| (ray.ibyj * box.lo.y - box.lo.x + ray.c_yx < 0)
-			|| (ray.jbyk * box.hi.z - box.hi.y + ray.c_zy > 0)
-			|| (ray.kbyj * box.lo.y - box.lo.z + ray.c_yz < 0)
-			|| (ray.kbyi * box.hi.x - box.lo.z + ray.c_xz < 0)
-            || (ray.ibyk * box.hi.z - box.lo.x + ray.c_zx < 0)) {
-			return false;
-        }
-
-		time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t1 = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
-        if (t1 > time) {
-			time = t1;
-        }
-		float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-
-	case Ray::PPM:
-		{
-		if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z < box.lo.z)
-			|| (ray.jbyi * box.hi.x - box.lo.y + ray.c_xy < 0)
-			|| (ray.ibyj * box.hi.y - box.lo.x + ray.c_yx < 0)
-			|| (ray.jbyk * box.lo.z - box.lo.y + ray.c_zy < 0) 
-			|| (ray.kbyj * box.hi.y - box.hi.z + ray.c_yz > 0)
-			|| (ray.kbyi * box.hi.x - box.hi.z + ray.c_xz > 0)
-            || (ray.ibyk * box.lo.z - box.lo.x + ray.c_zx < 0))	{
-            return false;
-        }
-		
-		time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t1 = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
-        if (t1 > time) {
-			time = t1;
-        }
-		float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-
-	case Ray::PPP:
-		{
-		if ((ray.m_origin.x > box.hi.x) || (ray.m_origin.y > box.hi.y) || (ray.m_origin.z > box.hi.z)
-			|| (ray.jbyi * box.hi.x - box.lo.y + ray.c_xy < 0)
-			|| (ray.ibyj * box.hi.y - box.lo.x + ray.c_yx < 0)
-			|| (ray.jbyk * box.hi.z - box.lo.y + ray.c_zy < 0)
-			|| (ray.kbyj * box.hi.y - box.lo.z + ray.c_yz < 0)
-			|| (ray.kbyi * box.hi.x - box.lo.z + ray.c_xz < 0)
-            || (ray.ibyk * box.hi.z - box.lo.x + ray.c_zx < 0)) {
-			return false;
-        }
-		
-		time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t1 = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
-        if (t1 > time) {
-			time = t1;
-        }
-		float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-
-	case Ray::OMM:
-		{
-		if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.y < box.lo.y) || (ray.m_origin.z < box.lo.z)
-			|| (ray.jbyk * box.lo.z - box.hi.y + ray.c_zy > 0)
-            || (ray.kbyj * box.lo.y - box.hi.z + ray.c_yz > 0)) {
-			return false;
-        }
-
-		time = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
-		float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-
-	case Ray::OMP:
-		{
-		if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.y < box.lo.y) || (ray.m_origin.z > box.hi.z)
-			|| (ray.jbyk * box.hi.z - box.hi.y + ray.c_zy > 0)
-            || (ray.kbyj * box.lo.y - box.lo.z + ray.c_yz < 0)) {
-			return false;
-        }
-
-		time = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
-		float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-
-	case Ray::OPM:
-		{
-		if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.y > box.hi.y) || (ray.m_origin.z < box.lo.z)
-			|| (ray.jbyk * box.lo.z - box.lo.y + ray.c_zy < 0) 
-            || (ray.kbyj * box.hi.y - box.hi.z + ray.c_yz > 0)) {
-			return false;
-        }
-
-		time = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;		
-		float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-
-	case Ray::OPP:
-		{
-		if((ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.y > box.hi.y) || (ray.m_origin.z > box.hi.z)
-			|| (ray.jbyk * box.hi.z - box.lo.y + ray.c_zy < 0)
-            || (ray.kbyj * box.hi.y - box.lo.z + ray.c_yz < 0)) {
-			return false;
-        }
-		
-		time = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;		
-		float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-		
-
-	case Ray::MOM:
-		{
-		if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.z < box.lo.z) 
-			|| (ray.kbyi * box.lo.x - box.hi.z + ray.c_xz > 0)
-            || (ray.ibyk * box.lo.z - box.hi.x + ray.c_zx > 0)) {
-			return false;
-        }
-		
-		time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-		
-
-	case Ray::MOP:
-		{
-		if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.z > box.hi.z) 
-			|| (ray.kbyi * box.lo.x - box.lo.z + ray.c_xz < 0)
-            || (ray.ibyk * box.hi.z - box.hi.x + ray.c_zx > 0)) {
-			return false;
-        }
-
-		time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-
-	case Ray::POM:
-		{
-		if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-			|| (ray.m_origin.x > box.hi.x) || (ray.m_origin.z < box.lo.z)
-			|| (ray.kbyi * box.hi.x - box.hi.z + ray.c_xz > 0)
-            || (ray.ibyk * box.lo.z - box.lo.x + ray.c_zx < 0)) {
-			return false;
-        }
-		
-		time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t2 = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}
-			
-
-	case Ray::POP:
-		{
-		if((ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-			|| (ray.m_origin.x > box.hi.x) || (ray.m_origin.z > box.hi.z)
-			|| (ray.kbyi * box.hi.x - box.lo.z + ray.c_xz < 0)
-            || (ray.ibyk * box.hi.z - box.lo.x + ray.c_zx < 0)) {
-			return false;
-        }
-
-		time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t2 = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
-        if (t2 > time) {
-			time = t2;
-        }
-
-		return true;
-		}	
-
-	case Ray::MMO:
-		{
-		if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.y < box.lo.y)  
-			|| (ray.jbyi * box.lo.x - box.hi.y + ray.c_xy > 0)
-            || (ray.ibyj * box.lo.y - box.hi.x + ray.c_yx > 0)) {
-			return false;
-        }
-
-		time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t1 = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
-        if (t1 > time) {
-			time = t1;
-        }
-
-		return true;
-		}	
-
-	case Ray::MPO:
-		{
-		if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.y > box.hi.y) 
-			|| (ray.jbyi * box.lo.x - box.lo.y + ray.c_xy < 0) 
-            || (ray.ibyj * box.hi.y - box.hi.x + ray.c_yx > 0))	{
-            return false;
-        }
-		
-		time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t1 = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
-        if (t1 > time) {
-			time = t1;
-        }
-		
-		return true;
-		}
-		
-
-	case Ray::PMO:
-		{
-		if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
-			|| (ray.m_origin.x > box.hi.x) || (ray.m_origin.y < box.lo.y) 
-			|| (ray.jbyi * box.hi.x - box.hi.y + ray.c_xy > 0)
-            || (ray.ibyj * box.lo.y - box.lo.x + ray.c_yx < 0)) {
-			return false;
-        }
-
-		time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t1 = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
-        if (t1 > time) {
-			time = t1;
-        }
-		
-		return true;
-		}
-
-	case Ray::PPO:
-		{
-		if((ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)
-			|| (ray.m_origin.x > box.hi.x) || (ray.m_origin.y > box.hi.y) 
-			|| (ray.jbyi * box.hi.x - box.lo.y + ray.c_xy < 0)
-            || (ray.ibyj * box.hi.y - box.lo.x + ray.c_yx < 0)) {
-			return false;
-        }
-	
-		time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
-		float t1 = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
-        if (t1 > time) {
-			time = t1;
-        }
-
-		return true;
-		}
-		
-
-	case Ray::MOO:
-		{
-		if((ray.m_origin.x < box.lo.x)
-			|| (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-            || (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)) {
-			return false;
-        }
-
-		time = (box.hi.x - ray.m_origin.x) * ray.m_invDirection.x;
-		return true;
-		}
-
-	case Ray::POO:
-		{
-		if ((ray.m_origin.x > box.hi.x)
-			|| (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)
-            || (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)) {
-			return false;
-        }
-
-		time = (box.lo.x - ray.m_origin.x) * ray.m_invDirection.x;
-		return true;
-		}
-
-	case Ray::OMO:
-		{
-		if ((ray.m_origin.y < box.lo.y)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-            || (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)) {
-			return false;
-        }
-		
-		time = (box.hi.y - ray.m_origin.y) * ray.m_invDirection.y;
-		return true;
-		}
-
-	case Ray::OPO:
-		{
-		if ((ray.m_origin.y > box.hi.y)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-            || (ray.m_origin.z < box.lo.z) || (ray.m_origin.z > box.hi.z)) {
-			return false;
-        }
-
-		time = (box.lo.y - ray.m_origin.y) * ray.m_invDirection.y;
-		return true;
-		}
-
-
-	case Ray::OOM:
-		{
-		if ((ray.m_origin.z < box.lo.z)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)) {
-            return false;
-        }
-
-		time = (box.hi.z - ray.m_origin.z) * ray.m_invDirection.z;
-		return true;
-		}
-
-	case Ray::OOP:
-		{
-		if ((ray.m_origin.z > box.hi.z)
-			|| (ray.m_origin.x < box.lo.x) || (ray.m_origin.x > box.hi.x)
-            || (ray.m_origin.y < box.lo.y) || (ray.m_origin.y > box.hi.y)) {
-			return false;
-        }
-
-		time = (box.lo.z - ray.m_origin.z) * ray.m_invDirection.z;
-		return true;
-		}	
-	}
-
-	return false;
-}
-
-#ifdef _MSC_VER
-// Turn off fast floating-point optimizations
-#pragma float_control( pop )
-#endif
-
-}
diff --git a/dep/src/g3dlite/Ray.cpp b/dep/src/g3dlite/Ray.cpp
deleted file mode 100644
index 0436ef0b3..000000000
--- a/dep/src/g3dlite/Ray.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- @file Ray.cpp 
- 
- @maintainer Morgan McGuire, http://graphics.cs.williams.edu
- 
- @created 2002-07-12
- @edited  2004-03-19
- */
-
-#include "G3D/platform.h"
-#include "G3D/Ray.h"
-#include "G3D/Plane.h"
-#include "G3D/Sphere.h"
-#include "G3D/CollisionDetection.h"
-
-namespace G3D {
-
-void Ray::set(const Vector3& origin, const Vector3& direction) {
-	m_origin = origin;
-	m_direction = direction;
-	debugAssert(direction.isUnit());
-
-	m_invDirection = Vector3::one() / direction;
-
-	// ray slope
-	ibyj = m_direction.x * m_invDirection.y;
-	jbyi = m_direction.y * m_invDirection.x;
-	jbyk = m_direction.y * m_invDirection.z;
-	kbyj = m_direction.z * m_invDirection.y;
-	ibyk = m_direction.x * m_invDirection.z;
-	kbyi = m_direction.z * m_invDirection.x;
-
-	// precomputed terms
-	c_xy = m_origin.y - jbyi * m_origin.x;
-	c_xz = m_origin.z - kbyi * m_origin.x;
-	c_yx = m_origin.x - ibyj * m_origin.y;
-	c_yz = m_origin.z - kbyj * m_origin.y;
-	c_zx = m_origin.x - ibyk * m_origin.z;
-	c_zy = m_origin.y - jbyk * m_origin.z;	
-
-	//ray slope classification
-	if (m_direction.x < 0) {
-		if (m_direction.y < 0) {
-			if (m_direction.z < 0) {
-				classification = MMM;
-			} else if (m_direction.z > 0) {
-				classification = MMP;
-			} else { //(m_direction.z >= 0)
-				classification = MMO;
-			}
-		} else { //(m_direction.y >= 0)
-			if (m_direction.z < 0) {
-				if (m_direction.y == 0) {
-					classification = MOM;
-				} else {
-					classification = MPM;
-				}
-			} else { //(m_direction.z >= 0)
-				if ((m_direction.y == 0) && (m_direction.z == 0)) {
-					classification = MOO;
-				} else if (m_direction.z == 0) {
-					classification = MPO;
-				} else if (m_direction.y == 0) {
-					classification = MOP;
-				} else {
-					classification = MPP;
-				}
-			}
-		}
-	} else { //(m_direction.x >= 0)
-		if (m_direction.y < 0) {
-			if (m_direction.z < 0) {
-				if (m_direction.x == 0) {
-					classification = OMM;
-				} else {
-					classification = PMM;
-				}
-			} else { //(m_direction.z >= 0)
-				if ((m_direction.x == 0) && (m_direction.z == 0)) {
-					classification = OMO;
-				} else if (m_direction.z == 0) {
-					classification = PMO;
-				} else if (m_direction.x == 0) {
-					classification = OMP;
-				} else {
-					classification = PMP;
-				}
-			}
-		} else { //(m_direction.y >= 0)
-			if (m_direction.z < 0) {
-				if ((m_direction.x == 0) && (m_direction.y == 0)) {
-					classification = OOM;
-				} else if (m_direction.x == 0) {
-					classification = OPM;
-				} else if (m_direction.y == 0) {
-					classification = POM;
-				} else {
-					classification = PPM;
-				}
-			} else { //(m_direction.z > 0)
-				if (m_direction.x == 0) {
-					if (m_direction.y == 0) {
-						classification = OOP;
-					} else if (m_direction.z == 0) {
-						classification = OPO;
-					} else {
-						classification = OPP;
-					}
-				} else {
-					if ((m_direction.y == 0) && (m_direction.z == 0)) {
-						classification = POO;
-					} else if (m_direction.y == 0) {
-						classification = POP;
-					} else if (m_direction.z == 0) {
-						classification = PPO;
-					} else {
-						classification = PPP;
-					}
-				}
-			}			
-		}
-	}
-}
-
-Ray::Ray(class BinaryInput& b) {
-	deserialize(b);
-}
-
-
-void Ray::serialize(class BinaryOutput& b) const {
-	m_origin.serialize(b);
-	m_direction.serialize(b);
-}
-
-
-void Ray::deserialize(class BinaryInput& b) {
-	m_origin.deserialize(b);
-	m_direction.deserialize(b);
-	set(m_origin, m_direction);
-}
-
-
-Ray Ray::refract(
-    const Vector3&  newOrigin,
-    const Vector3&  normal,
-    float           iInside,
-    float           iOutside) const {
-
-    Vector3 D = m_direction.refractionDirection(normal, iInside, iOutside);
-    return Ray(newOrigin + (m_direction + normal * (float)sign(m_direction.dot(normal))) * 0.001f, D);
-}
-
-
-Ray Ray::reflect(
-    const Vector3&  newOrigin,
-    const Vector3&  normal) const {
-
-    Vector3 D = m_direction.reflectionDirection(normal);
-    return Ray(newOrigin + (D + normal) * 0.001f, D);
-}
-
-
-Vector3 Ray::intersection(const Plane& plane) const {
-    float d;
-    Vector3 normal = plane.normal();
-    plane.getEquation(normal, d);
-    float rate = m_direction.dot(normal);
-
-    if (rate >= 0.0f) {
-        return Vector3::inf();
-    } else {
-        float t = -(d + m_origin.dot(normal)) / rate;
-        return m_origin + m_direction * t;
-    }
-}
-
-
-float Ray::intersectionTime(const class Sphere& sphere, bool solid) const {
-    Vector3 dummy;
-    return CollisionDetection::collisionTimeForMovingPointFixedSphere(
-            m_origin, m_direction, sphere, dummy, dummy, solid);
-}
-
-
-float Ray::intersectionTime(const class Plane& plane) const {
-    Vector3 dummy;
-    return CollisionDetection::collisionTimeForMovingPointFixedPlane(
-            m_origin, m_direction, plane, dummy);
-}
-
-
-float Ray::intersectionTime(const class Box& box) const {
-    Vector3 dummy;
-    float time = CollisionDetection::collisionTimeForMovingPointFixedBox(
-            m_origin, m_direction, box, dummy);
-
-    if ((time == finf()) && (box.contains(m_origin))) {
-        return 0.0f;
-    } else {
-        return time;
-    }
-}
-
-
-float Ray::intersectionTime(const class AABox& box) const {
-    Vector3 dummy;
-    bool inside;
-    float time = CollisionDetection::collisionTimeForMovingPointFixedAABox(
-            m_origin, m_direction, box, dummy, inside);
-
-    if ((time == finf()) && inside) {
-        return 0.0f;
-    } else {
-        return time;
-    }
-}
-
-}
diff --git a/dep/src/g3dlite/g3dfnmatch.cpp b/dep/src/g3dlite/g3dfnmatch.cpp
deleted file mode 100644
index 2d24c4126..000000000
--- a/dep/src/g3dlite/g3dfnmatch.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-/* $Id: g3dfnmatch.cpp,v 1.3 2010/03/15 05:01:23 morgan3d Exp $ */
-
-/*	$OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "G3D/g3dfnmatch.h"
-
-#ifdef G3D_WIN32
-
-#include <ctype.h>
-#include <string.h>
-#include <stdio.h>
-
-namespace G3D {
-
-#define	EOS	'\0'
-
-#define	RANGE_MATCH	1
-#define	RANGE_NOMATCH	0
-#define	RANGE_ERROR	(-1)
-
-static int rangematch(const char *, char, int, char **);
-
-int
-g3dfnmatch(const char *pattern, const char *string, int flags)
-{
-	const char *stringstart;
-	char *newp;
-	char c, test;
-
-	for (stringstart = string;;)
-		switch (c = *pattern++) {
-		case EOS:
-			if ((flags & FNM_LEADING_DIR) && *string == '/')
-				return (0);
-			return (*string == EOS ? 0 : FNM_NOMATCH);
-		case '?':
-			if (*string == EOS)
-				return (FNM_NOMATCH);
-			if (*string == '/' && (flags & FNM_PATHNAME))
-				return (FNM_NOMATCH);
-			if (*string == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-			++string;
-			break;
-		case '*':
-			c = *pattern;
-			/* Collapse multiple stars. */
-			while (c == '*')
-				c = *++pattern;
-
-			if (*string == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-
-			/* Optimize for pattern with * at end or before /. */
-			if (c == EOS) {
-				if (flags & FNM_PATHNAME)
-					return ((flags & FNM_LEADING_DIR) ||
-					    strchr(string, '/') == NULL ?
-					    0 : FNM_NOMATCH);
-				else
-					return (0);
-			} else if (c == '/' && (flags & FNM_PATHNAME)) {
-				if ((string = strchr(string, '/')) == NULL)
-					return (FNM_NOMATCH);
-				break;
-			}
-
-			/* General case, use recursion. */
-			while ((test = *string) != EOS) {
-				if (!g3dfnmatch(pattern, string, flags & ~FNM_PERIOD))
-					return (0);
-				if (test == '/' && (flags & FNM_PATHNAME))
-					break;
-				++string;
-			}
-			return (FNM_NOMATCH);
-		case '[':
-			if (*string == EOS)
-				return (FNM_NOMATCH);
-			if (*string == '/' && (flags & FNM_PATHNAME))
-				return (FNM_NOMATCH);
-			if (*string == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-
-			switch (rangematch(pattern, *string, flags, &newp)) {
-			case RANGE_ERROR:
-				/* not a good range, treat as normal text */
-				goto normal;
-			case RANGE_MATCH:
-				pattern = newp;
-				break;
-			case RANGE_NOMATCH:
-				return (FNM_NOMATCH);
-			}
-			++string;
-			break;
-		case '\\':
-			if (!(flags & FNM_NOESCAPE)) {
-				if ((c = *pattern++) == EOS) {
-					c = '\\';
-					--pattern;
-				}
-			}
-			/* FALLTHROUGH */
-		default:
-		normal:
-			if (c != *string && !((flags & FNM_CASEFOLD) &&
-				 (tolower((unsigned char)c) ==
-				 tolower((unsigned char)*string))))
-				return (FNM_NOMATCH);
-			++string;
-			break;
-		}
-	/* NOTREACHED */
-}
-
-static int
-rangematch(const char *pattern, char test, int flags, char **newp)
-{
-	int negate, ok;
-	char c, c2;
-
-	/*
-	 * A bracket expression starting with an unquoted circumflex
-	 * character produces unspecified results (IEEE 1003.2-1992,
-	 * 3.13.2).  This implementation treats it like '!', for
-	 * consistency with the regular expression syntax.
-	 * J.T. Conklin (conklin@ngai.kaleida.com)
-	 */
-	if ((negate = (*pattern == '!' || *pattern == '^')))
-		++pattern;
-
-	if (flags & FNM_CASEFOLD)
-		test = tolower((unsigned char)test);
-
-	/*
-	 * A right bracket shall lose its special meaning and represent
-	 * itself in a bracket expression if it occurs first in the list.
-	 * -- POSIX.2 2.8.3.2
-	 */
-	ok = 0;
-	c = *pattern++;
-	do {
-		if (c == '\\' && !(flags & FNM_NOESCAPE))
-			c = *pattern++;
-		if (c == EOS)
-			return (RANGE_ERROR);
-		if (c == '/' && (flags & FNM_PATHNAME))
-			return (RANGE_NOMATCH);
-		if ((flags & FNM_CASEFOLD))
-			c = tolower((unsigned char)c);
-		if (*pattern == '-'
-		    && (c2 = *(pattern+1)) != EOS && c2 != ']') {
-			pattern += 2;
-			if (c2 == '\\' && !(flags & FNM_NOESCAPE))
-				c2 = *pattern++;
-			if (c2 == EOS)
-				return (RANGE_ERROR);
-			if (flags & FNM_CASEFOLD)
-				c2 = tolower((unsigned char)c2);
-			if (c <= test && test <= c2)
-				ok = 1;
-		} else if (c == test)
-			ok = 1;
-	} while ((c = *pattern++) != ']');
-
-	*newp = (char *)pattern;
-	return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH);
-}
-
-}
-
-#else
-
-namespace G3D {
-int g3dfnmatch(const char * a, const char *b, int c) {
-    return fnmatch(a, b, c);
-}
-}
-
-#endif
-
diff --git a/dep/src/zlib/adler32.c b/dep/src/zlib/adler32.c
deleted file mode 100644
index 007ba2627..000000000
--- a/dep/src/zlib/adler32.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2004 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-#define BASE 65521UL    /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf)   DO8(buf,0); DO8(buf,8);
-
-/* use NO_DIVIDE if your processor does not do division in hardware */
-#ifdef NO_DIVIDE
-#  define MOD(a) \
-    do { \
-        if (a >= (BASE << 16)) a -= (BASE << 16); \
-        if (a >= (BASE << 15)) a -= (BASE << 15); \
-        if (a >= (BASE << 14)) a -= (BASE << 14); \
-        if (a >= (BASE << 13)) a -= (BASE << 13); \
-        if (a >= (BASE << 12)) a -= (BASE << 12); \
-        if (a >= (BASE << 11)) a -= (BASE << 11); \
-        if (a >= (BASE << 10)) a -= (BASE << 10); \
-        if (a >= (BASE << 9)) a -= (BASE << 9); \
-        if (a >= (BASE << 8)) a -= (BASE << 8); \
-        if (a >= (BASE << 7)) a -= (BASE << 7); \
-        if (a >= (BASE << 6)) a -= (BASE << 6); \
-        if (a >= (BASE << 5)) a -= (BASE << 5); \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#  define MOD4(a) \
-    do { \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#else
-#  define MOD(a) a %= BASE
-#  define MOD4(a) a %= BASE
-#endif
-
-/* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
-{
-    unsigned long sum2;
-    unsigned n;
-
-    /* split Adler-32 into component sums */
-    sum2 = (adler >> 16) & 0xffff;
-    adler &= 0xffff;
-
-    /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1) {
-        adler += buf[0];
-        if (adler >= BASE)
-            adler -= BASE;
-        sum2 += adler;
-        if (sum2 >= BASE)
-            sum2 -= BASE;
-        return adler | (sum2 << 16);
-    }
-
-    /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (buf == Z_NULL)
-        return 1L;
-
-    /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16) {
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        if (adler >= BASE)
-            adler -= BASE;
-        MOD4(sum2);             /* only added so many BASE's */
-        return adler | (sum2 << 16);
-    }
-
-    /* do length NMAX blocks -- requires just one modulo operation */
-    while (len >= NMAX) {
-        len -= NMAX;
-        n = NMAX / 16;          /* NMAX is divisible by 16 */
-        do {
-            DO16(buf);          /* 16 sums unrolled */
-            buf += 16;
-        } while (--n);
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* do remaining bytes (less than NMAX, still just one modulo) */
-    if (len) {                  /* avoid modulos if none remaining */
-        while (len >= 16) {
-            len -= 16;
-            DO16(buf);
-            buf += 16;
-        }
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* return recombined sums */
-    return adler | (sum2 << 16);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off_t len2;
-{
-    unsigned long sum1;
-    unsigned long sum2;
-    unsigned rem;
-
-    /* the derivation of this formula is left as an exercise for the reader */
-    rem = (unsigned)(len2 % BASE);
-    sum1 = adler1 & 0xffff;
-    sum2 = rem * sum1;
-    MOD(sum2);
-    sum1 += (adler2 & 0xffff) + BASE - 1;
-    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
-    if (sum1 > BASE) sum1 -= BASE;
-    if (sum1 > BASE) sum1 -= BASE;
-    if (sum2 > (BASE << 1)) sum2 -= (BASE << 1);
-    if (sum2 > BASE) sum2 -= BASE;
-    return sum1 | (sum2 << 16);
-}
diff --git a/dep/src/zlib/crc32.c b/dep/src/zlib/crc32.c
deleted file mode 100644
index f658a9ef5..000000000
--- a/dep/src/zlib/crc32.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
- * tables for updating the shift register in one step with three exclusive-ors
- * instead of four steps with four exclusive-ors.  This results in about a
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
- */
-
-/* @(#) $Id$ */
-
-/*
-  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
-  protection on the static variables used to control the first-use generation
-  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
-  first call get_crc_table() to initialize the tables before allowing more than
-  one thread to use crc32().
- */
-
-#ifdef MAKECRCH
-#  include <stdio.h>
-#  ifndef DYNAMIC_CRC_TABLE
-#    define DYNAMIC_CRC_TABLE
-#  endif /* !DYNAMIC_CRC_TABLE */
-#endif /* MAKECRCH */
-
-#include "zutil.h"      /* for STDC and FAR definitions */
-
-#define local static
-
-/* Find a four-byte integer type for crc32_little() and crc32_big(). */
-#ifndef NOBYFOUR
-#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
-#    include <limits.h>
-#    define BYFOUR
-#    if (UINT_MAX == 0xffffffffUL)
-       typedef unsigned int u4;
-#    else
-#      if (ULONG_MAX == 0xffffffffUL)
-         typedef unsigned long u4;
-#      else
-#        if (USHRT_MAX == 0xffffffffUL)
-           typedef unsigned short u4;
-#        else
-#          undef BYFOUR     /* can't find a four-byte integer type! */
-#        endif
-#      endif
-#    endif
-#  endif /* STDC */
-#endif /* !NOBYFOUR */
-
-/* Definitions for doing the crc four data bytes at a time. */
-#ifdef BYFOUR
-#  define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \
-                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
-   local unsigned long crc32_little OF((unsigned long,
-                        const unsigned char FAR *, unsigned));
-   local unsigned long crc32_big OF((unsigned long,
-                        const unsigned char FAR *, unsigned));
-#  define TBLS 8
-#else
-#  define TBLS 1
-#endif /* BYFOUR */
-
-/* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
-                                         unsigned long vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-
-#ifdef DYNAMIC_CRC_TABLE
-
-local volatile int crc_table_empty = 1;
-local unsigned long FAR crc_table[TBLS][256];
-local void make_crc_table OF((void));
-#ifdef MAKECRCH
-   local void write_table OF((FILE *, const unsigned long FAR *));
-#endif /* MAKECRCH */
-/*
-  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
-  Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit.  Then adding polynomials
-  is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one.  If we call the above polynomial p, and represent a byte as the
-  polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-  where a mod b means the remainder after dividing a by b.
-
-  This calculation is done using the shift-register method of multiplying and
-  taking the remainder.  The register is initialized to zero, and for each
-  incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted
-  out is a one).  We start with the highest power (least significant bit) of
-  q and repeat for all eight bits of q.
-
-  The first table is simply the CRC of all possible eight bit values.  This is
-  all the information needed to generate CRCs on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.  The remaining tables
-  allow for word-at-a-time CRC calculation for both big-endian and little-
-  endian machines, where a word is four bytes.
-*/
-local void make_crc_table()
-{
-    unsigned long c;
-    int n, k;
-    unsigned long poly;                 /* polynomial exclusive-or pattern */
-    /* terms of polynomial defining this crc (except x^32): */
-    static volatile int first = 1;      /* flag to limit concurrent making */
-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-    /* See if another task is already doing this (not thread-safe, but better
-       than nothing -- significantly reduces duration of vulnerability in
-       case the advice about DYNAMIC_CRC_TABLE is ignored) */
-    if (first) {
-        first = 0;
-
-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0UL;
-        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
-            poly |= 1UL << (31 - p[n]);
-
-        /* generate a crc for every 8-bit value */
-        for (n = 0; n < 256; n++) {
-            c = (unsigned long)n;
-            for (k = 0; k < 8; k++)
-                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-            crc_table[0][n] = c;
-        }
-
-#ifdef BYFOUR
-        /* generate crc for each value followed by one, two, and three zeros,
-           and then the byte reversal of those as well as the first table */
-        for (n = 0; n < 256; n++) {
-            c = crc_table[0][n];
-            crc_table[4][n] = REV(c);
-            for (k = 1; k < 4; k++) {
-                c = crc_table[0][c & 0xff] ^ (c >> 8);
-                crc_table[k][n] = c;
-                crc_table[k + 4][n] = REV(c);
-            }
-        }
-#endif /* BYFOUR */
-
-        crc_table_empty = 0;
-    }
-    else {      /* not first */
-        /* wait for the other guy to finish (not efficient, but rare) */
-        while (crc_table_empty)
-            ;
-    }
-
-#ifdef MAKECRCH
-    /* write out CRC tables to crc32.h */
-    {
-        FILE *out;
-
-        out = fopen("crc32.h", "w");
-        if (out == NULL) return;
-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const unsigned long FAR ");
-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
-        write_table(out, crc_table[0]);
-#  ifdef BYFOUR
-        fprintf(out, "#ifdef BYFOUR\n");
-        for (k = 1; k < 8; k++) {
-            fprintf(out, "  },\n  {\n");
-            write_table(out, crc_table[k]);
-        }
-        fprintf(out, "#endif\n");
-#  endif /* BYFOUR */
-        fprintf(out, "  }\n};\n");
-        fclose(out);
-    }
-#endif /* MAKECRCH */
-}
-
-#ifdef MAKECRCH
-local void write_table(out, table)
-    FILE *out;
-    const unsigned long FAR *table;
-{
-    int n;
-
-    for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
-                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
-}
-#endif /* MAKECRCH */
-
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
- */
-#include "crc32.h"
-#endif /* DYNAMIC_CRC_TABLE */
-
-/* =========================================================================
- * This function can be used by asm versions of crc32()
- */
-const unsigned long FAR * ZEXPORT get_crc_table()
-{
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-    return (const unsigned long FAR *)crc_table;
-}
-
-/* ========================================================================= */
-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
-
-/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    if (buf == Z_NULL) return 0UL;
-
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-
-#ifdef BYFOUR
-    if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        u4 endian;
-
-        endian = 1;
-        if (*((unsigned char *)(&endian)))
-            return crc32_little(crc, buf, len);
-        else
-            return crc32_big(crc, buf, len);
-    }
-#endif /* BYFOUR */
-    crc = crc ^ 0xffffffffUL;
-    while (len >= 8) {
-        DO8;
-        len -= 8;
-    }
-    if (len) do {
-        DO1;
-    } while (--len);
-    return crc ^ 0xffffffffUL;
-}
-
-#ifdef BYFOUR
-
-/* ========================================================================= */
-#define DOLIT4 c ^= *buf4++; \
-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
-
-/* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    register u4 c;
-    register const u4 FAR *buf4;
-
-    c = (u4)crc;
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-        len--;
-    }
-
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOLIT32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOLIT4;
-        len -= 4;
-    }
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)c;
-}
-
-/* ========================================================================= */
-#define DOBIG4 c ^= *++buf4; \
-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
-
-/* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    register u4 c;
-    register const u4 FAR *buf4;
-
-    c = REV((u4)crc);
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-        len--;
-    }
-
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
-    buf4--;
-    while (len >= 32) {
-        DOBIG32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOBIG4;
-        len -= 4;
-    }
-    buf4++;
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)(REV(c));
-}
-
-#endif /* BYFOUR */
-
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
-
-/* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
-    unsigned long *mat;
-    unsigned long vec;
-{
-    unsigned long sum;
-
-    sum = 0;
-    while (vec) {
-        if (vec & 1)
-            sum ^= *mat;
-        vec >>= 1;
-        mat++;
-    }
-    return sum;
-}
-
-/* ========================================================================= */
-local void gf2_matrix_square(square, mat)
-    unsigned long *square;
-    unsigned long *mat;
-{
-    int n;
-
-    for (n = 0; n < GF2_DIM; n++)
-        square[n] = gf2_matrix_times(mat, mat[n]);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off_t len2;
-{
-    int n;
-    unsigned long row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
-
-    /* degenerate case */
-    if (len2 == 0)
-        return crc1;
-
-    /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320L;           /* CRC-32 polynomial */
-    row = 1;
-    for (n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
-
-    /* put operator for two zero bits in even */
-    gf2_matrix_square(even, odd);
-
-    /* put operator for four zero bits in odd */
-    gf2_matrix_square(odd, even);
-
-    /* apply len2 zeros to crc1 (first square will put the operator for one
-       zero byte, eight zero bits, in even) */
-    do {
-        /* apply zeros operator for this bit of len2 */
-        gf2_matrix_square(even, odd);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(even, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-        if (len2 == 0)
-            break;
-
-        /* another iteration of the loop with odd and even swapped */
-        gf2_matrix_square(odd, even);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(odd, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-    return crc1;
-}
diff --git a/dep/src/zlib/crc32.h b/dep/src/zlib/crc32.h
deleted file mode 100644
index 8053b6117..000000000
--- a/dep/src/zlib/crc32.h
+++ /dev/null
@@ -1,441 +0,0 @@
-/* crc32.h -- tables for rapid CRC calculation
- * Generated automatically by crc32.c
- */
-
-local const unsigned long FAR crc_table[TBLS][256] =
-{
-  {
-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-    0x2d02ef8dUL
-#ifdef BYFOUR
-  },
-  {
-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
-    0x9324fd72UL
-  },
-  {
-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
-    0xbe9834edUL
-  },
-  {
-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
-    0xde0506f1UL
-  },
-  {
-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
-    0x8def022dUL
-  },
-  {
-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
-    0x72fd2493UL
-  },
-  {
-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
-    0xed3498beUL
-  },
-  {
-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
-    0xf10605deUL
-#endif
-  }
-};
diff --git a/dep/src/zlib/deflate.c b/dep/src/zlib/deflate.c
deleted file mode 100644
index 29ce1f64a..000000000
--- a/dep/src/zlib/deflate.c
+++ /dev/null
@@ -1,1736 +0,0 @@
-/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process depends on being able to identify portions
- *      of the input text which are identical to earlier input (within a
- *      sliding window trailing behind the input currently being processed).
- *
- *      The most straightforward technique turns out to be the fastest for
- *      most input files: try all possible matches and select the longest.
- *      The key feature of this algorithm is that insertions into the string
- *      dictionary are very simple and thus fast, and deletions are avoided
- *      completely. Insertions are performed at each input character, whereas
- *      string matches are performed only when the previous match ends. So it
- *      is preferable to spend more time in matches to allow very fast string
- *      insertions and avoid deletions. The matching algorithm for small
- *      strings is inspired from that of Rabin & Karp. A brute force approach
- *      is used to find longer strings when a small match has been found.
- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
- *      (by Leonid Broukhis).
- *         A previous version of this file used a more sophisticated algorithm
- *      (by Fiala and Greene) which is guaranteed to run in linear amortized
- *      time, but has a larger average cost, uses more memory and is patented.
- *      However the F&G algorithm may be faster for some highly redundant
- *      files if the parameter max_chain_length (described below) is too large.
- *
- *  ACKNOWLEDGEMENTS
- *
- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
- *      I found it in 'freeze' written by Leonid Broukhis.
- *      Thanks to many people for bug reports and testing.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://www.ietf.org/rfc/rfc1951.txt
- *
- *      A description of the Rabin and Karp algorithm is given in the book
- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
- *
- *      Fiala,E.R., and Greene,D.H.
- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
- *
- */
-
-/* @(#) $Id$ */
-
-#include "deflate.h"
-
-const char deflate_copyright[] =
-   " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/* ===========================================================================
- *  Function prototypes.
- */
-typedef enum {
-    need_more,      /* block not completed, need more input or more output */
-    block_done,     /* block flush performed */
-    finish_started, /* finish started, need only more output at next deflate */
-    finish_done     /* finish done, accept no more input or output */
-} block_state;
-
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
-/* Compression function. Returns the block state after the call. */
-
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
-#ifndef FASTEST
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-#endif
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifndef FASTEST
-#ifdef ASMV
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-#endif
-local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));
-
-#ifdef DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
-#endif
-
-/* ===========================================================================
- * Local data
- */
-
-#define NIL 0
-/* Tail of hash chains */
-
-#ifndef TOO_FAR
-#  define TOO_FAR 4096
-#endif
-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-typedef struct config_s {
-   ush good_length; /* reduce lazy search above this match length */
-   ush max_lazy;    /* do not perform lazy search above this match length */
-   ush nice_length; /* quit search above this match length */
-   ush max_chain;
-   compress_func func;
-} config;
-
-#ifdef FASTEST
-local const config configuration_table[2] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
-#else
-local const config configuration_table[10] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
-/* 2 */ {4,    5, 16,    8, deflate_fast},
-/* 3 */ {4,    6, 32,   32, deflate_fast},
-
-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32, deflate_slow},
-/* 6 */ {8,   16, 128, 128, deflate_slow},
-/* 7 */ {8,   32, 128, 256, deflate_slow},
-/* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
-#endif
-
-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
- * meaning.
- */
-
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-#ifndef NO_DUMMY_DECL
-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
-#endif
-
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
- *    input characters, so that a running hash key can be computed from the
- *    previous key instead of complete recalculation each time.
- */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * If this file is compiled with -DFASTEST, the compression level is forced
- * to 1, and no hash chains are maintained.
- * IN  assertion: all calls to to INSERT_STRING are made with consecutive
- *    input characters and the first MIN_MATCH bytes of str are valid
- *    (except for the last MIN_MATCH-1 bytes of the input file).
- */
-#ifdef FASTEST
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#else
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#endif
-
-/* ===========================================================================
- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
- * prev[] will be initialized on the fly.
- */
-#define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-
-/* ========================================================================= */
-int ZEXPORT deflateInit_(strm, level, version, stream_size)
-    z_streamp strm;
-    int level;
-    const char *version;
-    int stream_size;
-{
-    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
-                         Z_DEFAULT_STRATEGY, version, stream_size);
-    /* To do: ignore strm->next_in if we use it as window */
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                  version, stream_size)
-    z_streamp strm;
-    int  level;
-    int  method;
-    int  windowBits;
-    int  memLevel;
-    int  strategy;
-    const char *version;
-    int stream_size;
-{
-    deflate_state *s;
-    int wrap = 1;
-    static const char my_version[] = ZLIB_VERSION;
-
-    ushf *overlay;
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
-     * output size for (length,distance) codes is <= 24 bits.
-     */
-
-    if (version == Z_NULL || version[0] != my_version[0] ||
-        stream_size != sizeof(z_stream)) {
-        return Z_VERSION_ERROR;
-    }
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-
-    strm->msg = Z_NULL;
-    if (strm->zalloc == (alloc_func)0) {
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-    }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-
-    if (windowBits < 0) { /* suppress zlib wrapper */
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-#ifdef GZIP
-    else if (windowBits > 15) {
-        wrap = 2;       /* write gzip wrapper instead */
-        windowBits -= 16;
-    }
-#endif
-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
-        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-        strategy < 0 || strategy > Z_FIXED) {
-        return Z_STREAM_ERROR;
-    }
-    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
-    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
-    if (s == Z_NULL) return Z_MEM_ERROR;
-    strm->state = (struct internal_state FAR *)s;
-    s->strm = strm;
-
-    s->wrap = wrap;
-    s->gzhead = Z_NULL;
-    s->w_bits = windowBits;
-    s->w_size = 1 << s->w_bits;
-    s->w_mask = s->w_size - 1;
-
-    s->hash_bits = memLevel + 7;
-    s->hash_size = 1 << s->hash_bits;
-    s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
-
-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
-
-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-    s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-
-    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-        s->pending_buf == Z_NULL) {
-        s->status = FINISH_STATE;
-        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
-        deflateEnd (strm);
-        return Z_MEM_ERROR;
-    }
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-
-    s->level = level;
-    s->strategy = strategy;
-    s->method = (Byte)method;
-
-    return deflateReset(strm);
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    const Bytef *dictionary;
-    uInt  dictLength;
-{
-    deflate_state *s;
-    uInt length = dictLength;
-    uInt n;
-    IPos hash_head = 0;
-
-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
-        strm->state->wrap == 2 ||
-        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
-        return Z_STREAM_ERROR;
-
-    s = strm->state;
-    if (s->wrap)
-        strm->adler = adler32(strm->adler, dictionary, dictLength);
-
-    if (length < MIN_MATCH) return Z_OK;
-    if (length > MAX_DIST(s)) {
-        length = MAX_DIST(s);
-        dictionary += dictLength - length; /* use the tail of the dictionary */
-    }
-    zmemcpy(s->window, dictionary, length);
-    s->strstart = length;
-    s->block_start = (long)length;
-
-    /* Insert all strings in the hash table (except for the last two bytes).
-     * s->lookahead stays null, so s->ins_h will be recomputed at the next
-     * call of fill_window.
-     */
-    s->ins_h = s->window[0];
-    UPDATE_HASH(s, s->ins_h, s->window[1]);
-    for (n = 0; n <= length - MIN_MATCH; n++) {
-        INSERT_STRING(s, n, hash_head);
-    }
-    if (hash_head) hash_head = 0;  /* to make compiler happy */
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateReset (strm)
-    z_streamp strm;
-{
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
-        return Z_STREAM_ERROR;
-    }
-
-    strm->total_in = strm->total_out = 0;
-    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
-    strm->data_type = Z_UNKNOWN;
-
-    s = (deflate_state *)strm->state;
-    s->pending = 0;
-    s->pending_out = s->pending_buf;
-
-    if (s->wrap < 0) {
-        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
-    }
-    s->status = s->wrap ? INIT_STATE : BUSY_STATE;
-    strm->adler =
-#ifdef GZIP
-        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
-#endif
-        adler32(0L, Z_NULL, 0);
-    s->last_flush = Z_NO_FLUSH;
-
-    _tr_init(s);
-    lm_init(s);
-
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
-    z_streamp strm;
-    gz_headerp head;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    if (strm->state->wrap != 2) return Z_STREAM_ERROR;
-    strm->state->gzhead = head;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
-    z_streamp strm;
-    int bits;
-    int value;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    strm->state->bi_valid = bits;
-    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateParams(strm, level, strategy)
-    z_streamp strm;
-    int level;
-    int strategy;
-{
-    deflate_state *s;
-    compress_func func;
-    int err = Z_OK;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
-        return Z_STREAM_ERROR;
-    }
-    func = configuration_table[s->level].func;
-
-    if (func != configuration_table[level].func && strm->total_in != 0) {
-        /* Flush the last buffer: */
-        err = deflate(strm, Z_PARTIAL_FLUSH);
-    }
-    if (s->level != level) {
-        s->level = level;
-        s->max_lazy_match   = configuration_table[level].max_lazy;
-        s->good_match       = configuration_table[level].good_length;
-        s->nice_match       = configuration_table[level].nice_length;
-        s->max_chain_length = configuration_table[level].max_chain;
-    }
-    s->strategy = strategy;
-    return err;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
-    z_streamp strm;
-    int good_length;
-    int max_lazy;
-    int nice_length;
-    int max_chain;
-{
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-    s->good_match = good_length;
-    s->max_lazy_match = max_lazy;
-    s->nice_match = nice_length;
-    s->max_chain_length = max_chain;
-    return Z_OK;
-}
-
-/* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
- *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
- *
- * This function could be more sophisticated to provide closer upper bounds
- * for every combination of windowBits and memLevel, as well as wrap.
- * But even the conservative upper bound of about 14% expansion does not
- * seem onerous for output buffer allocation.
- */
-uLong ZEXPORT deflateBound(strm, sourceLen)
-    z_streamp strm;
-    uLong sourceLen;
-{
-    deflate_state *s;
-    uLong destLen;
-
-    /* conservative upper bound */
-    destLen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11;
-
-    /* if can't get parameters, return conservative bound */
-    if (strm == Z_NULL || strm->state == Z_NULL)
-        return destLen;
-
-    /* if not default parameters, return conservative bound */
-    s = strm->state;
-    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return destLen;
-
-    /* default settings: return tight bound for that case */
-    return compressBound(sourceLen);
-}
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-local void putShortMSB (s, b)
-    deflate_state *s;
-    uInt b;
-{
-    put_byte(s, (Byte)(b >> 8));
-    put_byte(s, (Byte)(b & 0xff));
-}
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output goes
- * through this function so some applications may wish to modify it
- * to avoid allocating a large strm->next_out buffer and copying into it.
- * (See also read_buf()).
- */
-local void flush_pending(strm)
-    z_streamp strm;
-{
-    unsigned len = strm->state->pending;
-
-    if (len > strm->avail_out) len = strm->avail_out;
-    if (len == 0) return;
-
-    zmemcpy(strm->next_out, strm->state->pending_out, len);
-    strm->next_out  += len;
-    strm->state->pending_out  += len;
-    strm->total_out += len;
-    strm->avail_out  -= len;
-    strm->state->pending -= len;
-    if (strm->state->pending == 0) {
-        strm->state->pending_out = strm->state->pending_buf;
-    }
-}
-
-/* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
-    z_streamp strm;
-    int flush;
-{
-    int old_flush; /* value of flush param for previous deflate call */
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        flush > Z_FINISH || flush < 0) {
-        return Z_STREAM_ERROR;
-    }
-    s = strm->state;
-
-    if (strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
-        (s->status == FINISH_STATE && flush != Z_FINISH)) {
-        ERR_RETURN(strm, Z_STREAM_ERROR);
-    }
-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
-
-    s->strm = strm; /* just in case */
-    old_flush = s->last_flush;
-    s->last_flush = flush;
-
-    /* Write the header */
-    if (s->status == INIT_STATE) {
-#ifdef GZIP
-        if (s->wrap == 2) {
-            strm->adler = crc32(0L, Z_NULL, 0);
-            put_byte(s, 31);
-            put_byte(s, 139);
-            put_byte(s, 8);
-            if (s->gzhead == NULL) {
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, s->level == 9 ? 2 :
-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                             4 : 0));
-                put_byte(s, OS_CODE);
-                s->status = BUSY_STATE;
-            }
-            else {
-                put_byte(s, (s->gzhead->text ? 1 : 0) +
-                            (s->gzhead->hcrc ? 2 : 0) +
-                            (s->gzhead->extra == Z_NULL ? 0 : 4) +
-                            (s->gzhead->name == Z_NULL ? 0 : 8) +
-                            (s->gzhead->comment == Z_NULL ? 0 : 16)
-                        );
-                put_byte(s, (Byte)(s->gzhead->time & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
-                put_byte(s, s->level == 9 ? 2 :
-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                             4 : 0));
-                put_byte(s, s->gzhead->os & 0xff);
-                if (s->gzhead->extra != NULL) {
-                    put_byte(s, s->gzhead->extra_len & 0xff);
-                    put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
-                }
-                if (s->gzhead->hcrc)
-                    strm->adler = crc32(strm->adler, s->pending_buf,
-                                        s->pending);
-                s->gzindex = 0;
-                s->status = EXTRA_STATE;
-            }
-        }
-        else
-#endif
-        {
-            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-            uInt level_flags;
-
-            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
-                level_flags = 0;
-            else if (s->level < 6)
-                level_flags = 1;
-            else if (s->level == 6)
-                level_flags = 2;
-            else
-                level_flags = 3;
-            header |= (level_flags << 6);
-            if (s->strstart != 0) header |= PRESET_DICT;
-            header += 31 - (header % 31);
-
-            s->status = BUSY_STATE;
-            putShortMSB(s, header);
-
-            /* Save the adler32 of the preset dictionary: */
-            if (s->strstart != 0) {
-                putShortMSB(s, (uInt)(strm->adler >> 16));
-                putShortMSB(s, (uInt)(strm->adler & 0xffff));
-            }
-            strm->adler = adler32(0L, Z_NULL, 0);
-        }
-    }
-#ifdef GZIP
-    if (s->status == EXTRA_STATE) {
-        if (s->gzhead->extra != NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-
-            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size)
-                        break;
-                }
-                put_byte(s, s->gzhead->extra[s->gzindex]);
-                s->gzindex++;
-            }
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (s->gzindex == s->gzhead->extra_len) {
-                s->gzindex = 0;
-                s->status = NAME_STATE;
-            }
-        }
-        else
-            s->status = NAME_STATE;
-    }
-    if (s->status == NAME_STATE) {
-        if (s->gzhead->name != NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-            int val;
-
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size) {
-                        val = 1;
-                        break;
-                    }
-                }
-                val = s->gzhead->name[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (val == 0) {
-                s->gzindex = 0;
-                s->status = COMMENT_STATE;
-            }
-        }
-        else
-            s->status = COMMENT_STATE;
-    }
-    if (s->status == COMMENT_STATE) {
-        if (s->gzhead->comment != NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-            int val;
-
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size) {
-                        val = 1;
-                        break;
-                    }
-                }
-                val = s->gzhead->comment[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (val == 0)
-                s->status = HCRC_STATE;
-        }
-        else
-            s->status = HCRC_STATE;
-    }
-    if (s->status == HCRC_STATE) {
-        if (s->gzhead->hcrc) {
-            if (s->pending + 2 > s->pending_buf_size)
-                flush_pending(strm);
-            if (s->pending + 2 <= s->pending_buf_size) {
-                put_byte(s, (Byte)(strm->adler & 0xff));
-                put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-                strm->adler = crc32(0L, Z_NULL, 0);
-                s->status = BUSY_STATE;
-            }
-        }
-        else
-            s->status = BUSY_STATE;
-    }
-#endif
-
-    /* Flush as much pending output as possible */
-    if (s->pending != 0) {
-        flush_pending(strm);
-        if (strm->avail_out == 0) {
-            /* Since avail_out is 0, deflate will be called again with
-             * more output space, but possibly with both pending and
-             * avail_in equal to zero. There won't be anything to do,
-             * but this is not an error situation so make sure we
-             * return OK instead of BUF_ERROR at next call of deflate:
-             */
-            s->last_flush = -1;
-            return Z_OK;
-        }
-
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUF_ERROR.
-     */
-    } else if (strm->avail_in == 0 && flush <= old_flush &&
-               flush != Z_FINISH) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* User must not provide more input after the first FINISH: */
-    if (s->status == FINISH_STATE && strm->avail_in != 0) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* Start a new block or continue the current one.
-     */
-    if (strm->avail_in != 0 || s->lookahead != 0 ||
-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-        block_state bstate;
-
-        bstate = (*(configuration_table[s->level].func))(s, flush);
-
-        if (bstate == finish_started || bstate == finish_done) {
-            s->status = FINISH_STATE;
-        }
-        if (bstate == need_more || bstate == finish_started) {
-            if (strm->avail_out == 0) {
-                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-            }
-            return Z_OK;
-            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-             * of deflate should use the same flush parameter to make sure
-             * that the flush is complete. So we don't have to output an
-             * empty block here, this will be done at next call. This also
-             * ensures that for a very small output buffer, we emit at most
-             * one empty block.
-             */
-        }
-        if (bstate == block_done) {
-            if (flush == Z_PARTIAL_FLUSH) {
-                _tr_align(s);
-            } else { /* FULL_FLUSH or SYNC_FLUSH */
-                _tr_stored_block(s, (char*)0, 0L, 0);
-                /* For a full flush, this empty block will be recognized
-                 * as a special marker by inflate_sync().
-                 */
-                if (flush == Z_FULL_FLUSH) {
-                    CLEAR_HASH(s);             /* forget history */
-                }
-            }
-            flush_pending(strm);
-            if (strm->avail_out == 0) {
-              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-              return Z_OK;
-            }
-        }
-    }
-    Assert(strm->avail_out > 0, "bug2");
-
-    if (flush != Z_FINISH) return Z_OK;
-    if (s->wrap <= 0) return Z_STREAM_END;
-
-    /* Write the trailer */
-#ifdef GZIP
-    if (s->wrap == 2) {
-        put_byte(s, (Byte)(strm->adler & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
-        put_byte(s, (Byte)(strm->total_in & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
-    }
-    else
-#endif
-    {
-        putShortMSB(s, (uInt)(strm->adler >> 16));
-        putShortMSB(s, (uInt)(strm->adler & 0xffff));
-    }
-    flush_pending(strm);
-    /* If avail_out is zero, the application will call deflate again
-     * to flush the rest.
-     */
-    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
-    return s->pending != 0 ? Z_OK : Z_STREAM_END;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
-    z_streamp strm;
-{
-    int status;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-
-    status = strm->state->status;
-    if (status != INIT_STATE &&
-        status != EXTRA_STATE &&
-        status != NAME_STATE &&
-        status != COMMENT_STATE &&
-        status != HCRC_STATE &&
-        status != BUSY_STATE &&
-        status != FINISH_STATE) {
-      return Z_STREAM_ERROR;
-    }
-
-    /* Deallocate in reverse order of allocations: */
-    TRY_FREE(strm, strm->state->pending_buf);
-    TRY_FREE(strm, strm->state->head);
-    TRY_FREE(strm, strm->state->prev);
-    TRY_FREE(strm, strm->state->window);
-
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-
-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state.
- * To simplify the source, this is not supported for 16-bit MSDOS (which
- * doesn't have enough memory anyway to duplicate compression states).
- */
-int ZEXPORT deflateCopy (dest, source)
-    z_streamp dest;
-    z_streamp source;
-{
-#ifdef MAXSEG_64K
-    return Z_STREAM_ERROR;
-#else
-    deflate_state *ds;
-    deflate_state *ss;
-    ushf *overlay;
-
-
-    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
-        return Z_STREAM_ERROR;
-    }
-
-    ss = source->state;
-
-    zmemcpy(dest, source, sizeof(z_stream));
-
-    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
-    if (ds == Z_NULL) return Z_MEM_ERROR;
-    dest->state = (struct internal_state FAR *) ds;
-    zmemcpy(ds, ss, sizeof(deflate_state));
-    ds->strm = dest;
-
-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-    ds->pending_buf = (uchf *) overlay;
-
-    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-        ds->pending_buf == Z_NULL) {
-        deflateEnd (dest);
-        return Z_MEM_ERROR;
-    }
-    /* following zmemcpy do not work for 16-bit MSDOS */
-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
-
-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-
-    ds->l_desc.dyn_tree = ds->dyn_ltree;
-    ds->d_desc.dyn_tree = ds->dyn_dtree;
-    ds->bl_desc.dyn_tree = ds->bl_tree;
-
-    return Z_OK;
-#endif /* MAXSEG_64K */
-}
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-local int read_buf(strm, buf, size)
-    z_streamp strm;
-    Bytef *buf;
-    unsigned size;
-{
-    unsigned len = strm->avail_in;
-
-    if (len > size) len = size;
-    if (len == 0) return 0;
-
-    strm->avail_in  -= len;
-
-    if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, strm->next_in, len);
-    }
-#ifdef GZIP
-    else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, strm->next_in, len);
-    }
-#endif
-    zmemcpy(buf, strm->next_in, len);
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return (int)len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (s)
-    deflate_state *s;
-{
-    s->window_size = (ulg)2L*s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    s->max_lazy_match   = configuration_table[s->level].max_lazy;
-    s->good_match       = configuration_table[s->level].good_length;
-    s->nice_match       = configuration_table[s->level].nice_length;
-    s->max_chain_length = configuration_table[s->level].max_chain;
-
-    s->strstart = 0;
-    s->block_start = 0L;
-    s->lookahead = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-#endif
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    int best_len = s->prev_length;              /* best match length so far */
-    int nice_match = s->nice_match;             /* stop if match long enough */
-    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-        s->strstart - (IPos)MAX_DIST(s) : NIL;
-    /* Stop when cur_match becomes <= limit. To simplify the code,
-     * we prevent matches with the string of window index 0.
-     */
-    Posf *prev = s->prev;
-    uInt wmask = s->w_mask;
-
-#ifdef UNALIGNED_OK
-    /* Compare two bytes at a time. Note: this is not always beneficial.
-     * Try with and without -DUNALIGNED_OK to check.
-     */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
-#else
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
-    register Byte scan_end   = scan[best_len];
-#endif
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    /* Do not waste too much time if we already have a good match: */
-    if (s->prev_length >= s->good_match) {
-        chain_length >>= 2;
-    }
-    /* Do not look for matches beyond the end of the input. This is necessary
-     * to make deflate deterministic.
-     */
-    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    do {
-        Assert(cur_match < s->strstart, "no future");
-        match = s->window + cur_match;
-
-        /* Skip to next match if the match length cannot increase
-         * or if the match length is less than 2.  Note that the checks below
-         * for insufficient lookahead only occur occasionally for performance
-         * reasons.  Therefore uninitialized memory will be accessed, and
-         * conditional jumps will be made that depend on those values.
-         * However the length of the match is limited to the lookahead, so
-         * the output of deflate is not affected by the uninitialized values.
-         */
-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
-        /* This code assumes sizeof(unsigned short) == 2. Do not use
-         * UNALIGNED_OK if your compiler uses a different size.
-         */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
-            *(ushf*)match != scan_start) continue;
-
-        /* It is not necessary to compare scan[2] and match[2] since they are
-         * always equal when the other bytes match, given that the hash keys
-         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
-         * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
-         * necessary to put more guard bytes at the end of the window, or
-         * to check more often for insufficient lookahead.
-         */
-        Assert(scan[2] == match[2], "scan[2]?");
-        scan++, match++;
-        do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 scan < strend);
-        /* The funny "do {}" generates better code on most compilers */
-
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-        if (*scan == *match) scan++;
-
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
-        scan = strend - (MAX_MATCH-1);
-
-#else /* UNALIGNED_OK */
-
-        if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
-            *match            != *scan     ||
-            *++match          != scan[1])      continue;
-
-        /* The check at best_len-1 can be removed because it will be made
-         * again later. (This heuristic is not always a win.)
-         * It is not necessary to compare scan[2] and match[2] since they
-         * are always equal when the other bytes match, given that
-         * the hash keys are equal and that HASH_BITS >= 8.
-         */
-        scan += 2, match++;
-        Assert(*scan == *match, "match[2]?");
-
-        /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
-         */
-        do {
-        } while (*++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 scan < strend);
-
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-        len = MAX_MATCH - (int)(strend - scan);
-        scan = strend - MAX_MATCH;
-
-#endif /* UNALIGNED_OK */
-
-        if (len > best_len) {
-            s->match_start = cur_match;
-            best_len = len;
-            if (len >= nice_match) break;
-#ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
-#else
-            scan_end1  = scan[best_len-1];
-            scan_end   = scan[best_len];
-#endif
-        }
-    } while ((cur_match = prev[cur_match & wmask]) > limit
-             && --chain_length != 0);
-
-    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-    return s->lookahead;
-}
-#endif /* ASMV */
-#endif /* FASTEST */
-
-/* ---------------------------------------------------------------------------
- * Optimized version for level == 1 or strategy == Z_RLE only
- */
-local uInt longest_match_fast(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    Assert(cur_match < s->strstart, "no future");
-
-    match = s->window + cur_match;
-
-    /* Return failure if the match length is less than 2:
-     */
-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
-
-    /* The check at best_len-1 can be removed because it will be made
-     * again later. (This heuristic is not always a win.)
-     * It is not necessary to compare scan[2] and match[2] since they
-     * are always equal when the other bytes match, given that
-     * the hash keys are equal and that HASH_BITS >= 8.
-     */
-    scan += 2, match += 2;
-    Assert(*scan == *match, "match[2]?");
-
-    /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
-     */
-    do {
-    } while (*++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             scan < strend);
-
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-    len = MAX_MATCH - (int)(strend - scan);
-
-    if (len < MIN_MATCH) return MIN_MATCH - 1;
-
-    s->match_start = cur_match;
-    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
-}
-
-#ifdef DEBUG
-/* ===========================================================================
- * Check that the match at match_start is indeed a match.
- */
-local void check_match(s, start, match, length)
-    deflate_state *s;
-    IPos start, match;
-    int length;
-{
-    /* check that the match is indeed a match */
-    if (zmemcmp(s->window + match,
-                s->window + start, length) != EQUAL) {
-        fprintf(stderr, " start %u, match %u, length %d\n",
-                start, match, length);
-        do {
-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-        } while (--length != 0);
-        z_error("invalid match");
-    }
-    if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
-        do { putc(s->window[start++], stderr); } while (--length != 0);
-    }
-}
-#else
-#  define check_match(s, start, match, length)
-#endif /* DEBUG */
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-local void fill_window(s)
-    deflate_state *s;
-{
-    register unsigned n, m;
-    register Posf *p;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (sizeof(int) <= 2) {
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-                more = wsize;
-
-            } else if (more == (unsigned)(-1)) {
-                /* Very unlikely, but possible on 16 bit machine if
-                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-                 */
-                more--;
-            }
-        }
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-
-            /* Slide the hash table (could be avoided with 32 bit values
-               at the expense of memory usage). We slide even when level == 0
-               to keep the hash table consistent if we switch back to level > 0
-               later. (Using level 0 permanently is not an optimal usage of
-               zlib, so we don't care about this pathological case.)
-             */
-            /* %%% avoid this when Z_RLE */
-            n = s->hash_size;
-            p = &s->head[n];
-            do {
-                m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
-            } while (--n);
-
-            n = wsize;
-#ifndef FASTEST
-            p = &s->prev[n];
-            do {
-                m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
-                /* If n is not on any hash chain, prev[n] is garbage but
-                 * its value will never be used.
-                 */
-            } while (--n);
-#endif
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) return;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead >= MIN_MATCH) {
-            s->ins_h = s->window[s->strstart];
-            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-}
-
-/* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
-#define FLUSH_BLOCK_ONLY(s, eof) { \
-   _tr_flush_block(s, (s->block_start >= 0L ? \
-                   (charf *)&s->window[(unsigned)s->block_start] : \
-                   (charf *)Z_NULL), \
-                (ulg)((long)s->strstart - s->block_start), \
-                (eof)); \
-   s->block_start = s->strstart; \
-   flush_pending(s->strm); \
-   Tracev((stderr,"[FLUSH]")); \
-}
-
-/* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, eof) { \
-   FLUSH_BLOCK_ONLY(s, eof); \
-   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
-}
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
- */
-local block_state deflate_stored(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
-     * to pending_buf_size, and each stored block has a 5 byte header:
-     */
-    ulg max_block_size = 0xffff;
-    ulg max_start;
-
-    if (max_block_size > s->pending_buf_size - 5) {
-        max_block_size = s->pending_buf_size - 5;
-    }
-
-    /* Copy as much as possible from input to output: */
-    for (;;) {
-        /* Fill the window as much as possible: */
-        if (s->lookahead <= 1) {
-
-            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
-                   s->block_start >= (long)s->w_size, "slide too late");
-
-            fill_window(s);
-            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
-
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-        Assert(s->block_start >= 0L, "block gone");
-
-        s->strstart += s->lookahead;
-        s->lookahead = 0;
-
-        /* Emit a stored block if pending_buf will be full: */
-        max_start = s->block_start + max_block_size;
-        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
-            /* strstart == 0 is possible when wraparound on 16-bit machine */
-            s->lookahead = (uInt)(s->strstart - max_start);
-            s->strstart = (uInt)max_start;
-            FLUSH_BLOCK(s, 0);
-        }
-        /* Flush if we may have to slide, otherwise block_start may become
-         * negative and the data will be gone:
-         */
-        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
-            FLUSH_BLOCK(s, 0);
-        }
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-local block_state deflate_fast(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head = NIL; /* head of the hash chain */
-    int bflush;           /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         * At this point we have always match_length < MIN_MATCH
-         */
-        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-#ifdef FASTEST
-            if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) ||
-                (s->strategy == Z_RLE && s->strstart - hash_head == 1)) {
-                s->match_length = longest_match_fast (s, hash_head);
-            }
-#else
-            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
-                s->match_length = longest_match (s, hash_head);
-            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
-                s->match_length = longest_match_fast (s, hash_head);
-            }
-#endif
-            /* longest_match() or longest_match_fast() sets match_start */
-        }
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->match_start, s->match_length);
-
-            _tr_tally_dist(s, s->strstart - s->match_start,
-                           s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-
-            /* Insert new strings in the hash table only if the match length
-             * is not too large. This saves time but degrades compression.
-             */
-#ifndef FASTEST
-            if (s->match_length <= s->max_insert_length &&
-                s->lookahead >= MIN_MATCH) {
-                s->match_length--; /* string at strstart already in table */
-                do {
-                    s->strstart++;
-                    INSERT_STRING(s, s->strstart, hash_head);
-                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                     * always MIN_MATCH bytes ahead.
-                     */
-                } while (--s->match_length != 0);
-                s->strstart++;
-            } else
-#endif
-            {
-                s->strstart += s->match_length;
-                s->match_length = 0;
-                s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-                Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-                 * matter since it will be recomputed at next deflate call.
-                 */
-            }
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-local block_state deflate_slow(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head = NIL;    /* head of hash chain */
-    int bflush;              /* set if current block must be flushed */
-
-    /* Process the input block. */
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-        s->prev_length = s->match_length, s->prev_match = s->match_start;
-        s->match_length = MIN_MATCH-1;
-
-        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
-            s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
-                s->match_length = longest_match (s, hash_head);
-            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
-                s->match_length = longest_match_fast (s, hash_head);
-            }
-            /* longest_match() or longest_match_fast() sets match_start */
-
-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
-#if TOO_FAR <= 32767
-                || (s->match_length == MIN_MATCH &&
-                    s->strstart - s->match_start > TOO_FAR)
-#endif
-                )) {
-
-                /* If prev_match is also MIN_MATCH, match_start is garbage
-                 * but we will ignore the current match anyway.
-                 */
-                s->match_length = MIN_MATCH-1;
-            }
-        }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
-            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
-            /* Do not insert strings in hash table beyond this. */
-
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
-                           s->prev_length - MIN_MATCH, bflush);
-
-            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
-             * enough lookahead, the last two strings are not inserted in
-             * the hash table.
-             */
-            s->lookahead -= s->prev_length-1;
-            s->prev_length -= 2;
-            do {
-                if (++s->strstart <= max_insert) {
-                    INSERT_STRING(s, s->strstart, hash_head);
-                }
-            } while (--s->prev_length != 0);
-            s->match_available = 0;
-            s->match_length = MIN_MATCH-1;
-            s->strstart++;
-
-            if (bflush) FLUSH_BLOCK(s, 0);
-
-        } else if (s->match_available) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-            if (bflush) {
-                FLUSH_BLOCK_ONLY(s, 0);
-            }
-            s->strstart++;
-            s->lookahead--;
-            if (s->strm->avail_out == 0) return need_more;
-        } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-            s->match_available = 1;
-            s->strstart++;
-            s->lookahead--;
-        }
-    }
-    Assert (flush != Z_NO_FLUSH, "no flush?");
-    if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-        s->match_available = 0;
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-#endif /* FASTEST */
-
-#if 0
-/* ===========================================================================
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
- * one.  Do not maintain a hash table.  (It will be regenerated if this run of
- * deflate switches away from Z_RLE.)
- */
-local block_state deflate_rle(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    int bflush;         /* set if current block must be flushed */
-    uInt run;           /* length of run */
-    uInt max;           /* maximum length of run */
-    uInt prev;          /* byte at distance one to match */
-    Bytef *scan;        /* scan for end of run */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the longest encodable run.
-         */
-        if (s->lookahead < MAX_MATCH) {
-            fill_window(s);
-            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* See how many times the previous byte repeats */
-        run = 0;
-        if (s->strstart > 0) {      /* if there is a previous byte, that is */
-            max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH;
-            scan = s->window + s->strstart - 1;
-            prev = *scan++;
-            do {
-                if (*scan++ != prev)
-                    break;
-            } while (++run < max);
-        }
-
-        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-        if (run >= MIN_MATCH) {
-            check_match(s, s->strstart, s->strstart - 1, run);
-            _tr_tally_dist(s, 1, run - MIN_MATCH, bflush);
-            s->lookahead -= run;
-            s->strstart += run;
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-#endif
diff --git a/dep/src/zlib/deflate.h b/dep/src/zlib/deflate.h
deleted file mode 100644
index 05a5ab3a2..000000000
--- a/dep/src/zlib/deflate.h
+++ /dev/null
@@ -1,331 +0,0 @@
-/* deflate.h -- internal compression state
- * Copyright (C) 1995-2004 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef DEFLATE_H
-#define DEFLATE_H
-
-#include "zutil.h"
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip encoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#  define GZIP
-#endif
-
-/* ===========================================================================
- * Internal compression state.
- */
-
-#define LENGTH_CODES 29
-/* number of length codes, not counting the special END_BLOCK code */
-
-#define LITERALS  256
-/* number of literal bytes 0..255 */
-
-#define L_CODES (LITERALS+1+LENGTH_CODES)
-/* number of Literal or Length codes, including the END_BLOCK code */
-
-#define D_CODES   30
-/* number of distance codes */
-
-#define BL_CODES  19
-/* number of codes used to transfer the bit lengths */
-
-#define HEAP_SIZE (2*L_CODES+1)
-/* maximum heap size */
-
-#define MAX_BITS 15
-/* All codes must not exceed MAX_BITS bits */
-
-#define INIT_STATE    42
-#define EXTRA_STATE   69
-#define NAME_STATE    73
-#define COMMENT_STATE 91
-#define HCRC_STATE   103
-#define BUSY_STATE   113
-#define FINISH_STATE 666
-/* Stream status */
-
-
-/* Data structure describing a single value and its code string. */
-typedef struct ct_data_s {
-    union {
-        ush  freq;       /* frequency count */
-        ush  code;       /* bit string */
-    } fc;
-    union {
-        ush  dad;        /* father node in Huffman tree */
-        ush  len;        /* length of bit string */
-    } dl;
-} FAR ct_data;
-
-#define Freq fc.freq
-#define Code fc.code
-#define Dad  dl.dad
-#define Len  dl.len
-
-typedef struct static_tree_desc_s  static_tree_desc;
-
-typedef struct tree_desc_s {
-    ct_data *dyn_tree;           /* the dynamic tree */
-    int     max_code;            /* largest code with non zero frequency */
-    static_tree_desc *stat_desc; /* the corresponding static tree */
-} FAR tree_desc;
-
-typedef ush Pos;
-typedef Pos FAR Posf;
-typedef unsigned IPos;
-
-/* A Pos is an index in the character window. We use short instead of int to
- * save space in the various tables. IPos is used only for parameter passing.
- */
-
-typedef struct internal_state {
-    z_streamp strm;      /* pointer back to this zlib stream */
-    int   status;        /* as the name implies */
-    Bytef *pending_buf;  /* output still pending */
-    ulg   pending_buf_size; /* size of pending_buf */
-    Bytef *pending_out;  /* next pending byte to output to the stream */
-    uInt   pending;      /* nb of bytes in the pending buffer */
-    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
-    gz_headerp  gzhead;  /* gzip header information to write */
-    uInt   gzindex;      /* where in extra, name, or comment */
-    Byte  method;        /* STORED (for zip only) or DEFLATED */
-    int   last_flush;    /* value of flush param for previous deflate call */
-
-                /* used by deflate.c: */
-
-    uInt  w_size;        /* LZ77 window size (32K by default) */
-    uInt  w_bits;        /* log2(w_size)  (8..16) */
-    uInt  w_mask;        /* w_size - 1 */
-
-    Bytef *window;
-    /* Sliding window. Input bytes are read into the second half of the window,
-     * and move to the first half later to keep a dictionary of at least wSize
-     * bytes. With this organization, matches are limited to a distance of
-     * wSize-MAX_MATCH bytes, but this ensures that IO is always
-     * performed with a length multiple of the block size. Also, it limits
-     * the window size to 64K, which is quite useful on MSDOS.
-     * To do: use the user input buffer as sliding window.
-     */
-
-    ulg window_size;
-    /* Actual size of window: 2*wSize, except when the user input buffer
-     * is directly used as sliding window.
-     */
-
-    Posf *prev;
-    /* Link to older string with same hash index. To limit the size of this
-     * array to 64K, this link is maintained only for the last 32K strings.
-     * An index in this array is thus a window index modulo 32K.
-     */
-
-    Posf *head; /* Heads of the hash chains or NIL. */
-
-    uInt  ins_h;          /* hash index of string to be inserted */
-    uInt  hash_size;      /* number of elements in hash table */
-    uInt  hash_bits;      /* log2(hash_size) */
-    uInt  hash_mask;      /* hash_size-1 */
-
-    uInt  hash_shift;
-    /* Number of bits by which ins_h must be shifted at each input
-     * step. It must be such that after MIN_MATCH steps, the oldest
-     * byte no longer takes part in the hash key, that is:
-     *   hash_shift * MIN_MATCH >= hash_bits
-     */
-
-    long block_start;
-    /* Window position at the beginning of the current output block. Gets
-     * negative when the window is moved backwards.
-     */
-
-    uInt match_length;           /* length of best match */
-    IPos prev_match;             /* previous match */
-    int match_available;         /* set if previous match exists */
-    uInt strstart;               /* start of string to insert */
-    uInt match_start;            /* start of matching string */
-    uInt lookahead;              /* number of valid bytes ahead in window */
-
-    uInt prev_length;
-    /* Length of the best match at previous step. Matches not greater than this
-     * are discarded. This is used in the lazy match evaluation.
-     */
-
-    uInt max_chain_length;
-    /* To speed up deflation, hash chains are never searched beyond this
-     * length.  A higher limit improves compression ratio but degrades the
-     * speed.
-     */
-
-    uInt max_lazy_match;
-    /* Attempt to find a better match only when the current match is strictly
-     * smaller than this value. This mechanism is used only for compression
-     * levels >= 4.
-     */
-#   define max_insert_length  max_lazy_match
-    /* Insert new strings in the hash table only if the match length is not
-     * greater than this length. This saves time but degrades compression.
-     * max_insert_length is used only for compression levels <= 3.
-     */
-
-    int level;    /* compression level (1..9) */
-    int strategy; /* favor or force Huffman coding*/
-
-    uInt good_match;
-    /* Use a faster search when the previous match is longer than this */
-
-    int nice_match; /* Stop searching when current match exceeds this */
-
-                /* used by trees.c: */
-    /* Didn't use ct_data typedef below to supress compiler warning */
-    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
-    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
-
-    struct tree_desc_s l_desc;               /* desc. for literal tree */
-    struct tree_desc_s d_desc;               /* desc. for distance tree */
-    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
-
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
-    int heap_len;               /* number of elements in the heap */
-    int heap_max;               /* element of largest frequency */
-    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-     * The same heap array is used to build all trees.
-     */
-
-    uch depth[2*L_CODES+1];
-    /* Depth of each subtree used as tie breaker for trees of equal frequency
-     */
-
-    uchf *l_buf;          /* buffer for literals or lengths */
-
-    uInt  lit_bufsize;
-    /* Size of match buffer for literals/lengths.  There are 4 reasons for
-     * limiting lit_bufsize to 64K:
-     *   - frequencies can be kept in 16 bit counters
-     *   - if compression is not successful for the first block, all input
-     *     data is still in the window so we can still emit a stored block even
-     *     when input comes from standard input.  (This can also be done for
-     *     all blocks if lit_bufsize is not greater than 32K.)
-     *   - if compression is not successful for a file smaller than 64K, we can
-     *     even emit a stored file instead of a stored block (saving 5 bytes).
-     *     This is applicable only for zip (not gzip or zlib).
-     *   - creating new Huffman trees less frequently may not provide fast
-     *     adaptation to changes in the input data statistics. (Take for
-     *     example a binary file with poorly compressible code followed by
-     *     a highly compressible string table.) Smaller buffer sizes give
-     *     fast adaptation but have of course the overhead of transmitting
-     *     trees more frequently.
-     *   - I can't count above 4
-     */
-
-    uInt last_lit;      /* running index in l_buf */
-
-    ushf *d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
-
-    ulg opt_len;        /* bit length of current block with optimal trees */
-    ulg static_len;     /* bit length of current block with static trees */
-    uInt matches;       /* number of string matches in current block */
-    int last_eob_len;   /* bit length of EOB code for last block */
-
-#ifdef DEBUG
-    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
-    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
-#endif
-
-    ush bi_buf;
-    /* Output buffer. bits are inserted starting at the bottom (least
-     * significant bits).
-     */
-    int bi_valid;
-    /* Number of valid bits in bi_buf.  All bits above the last valid bit
-     * are always zero.
-     */
-
-} FAR deflate_state;
-
-/* Output a byte on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
-
-
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
-/* In order to simplify the code, particularly on 16 bit machines, match
- * distances are limited to MAX_DIST instead of WSIZE.
- */
-
-        /* in trees.c */
-void _tr_init         OF((deflate_state *s));
-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
-void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int eof));
-void _tr_align        OF((deflate_state *s));
-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int eof));
-
-#define d_code(dist) \
-   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
-/* Mapping from a distance to a distance code. dist is the distance - 1 and
- * must not have side effects. _dist_code[256] and _dist_code[257] are never
- * used.
- */
-
-#ifndef DEBUG
-/* Inline versions of _tr_tally for speed: */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch _length_code[];
-  extern uch _dist_code[];
-#else
-  extern const uch _length_code[];
-  extern const uch _dist_code[];
-#endif
-
-# define _tr_tally_lit(s, c, flush) \
-  { uch cc = (c); \
-    s->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
-    s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-   }
-# define _tr_tally_dist(s, distance, length, flush) \
-  { uch len = (length); \
-    ush dist = (distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
-    dist--; \
-    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-    s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-  }
-#else
-# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
-# define _tr_tally_dist(s, distance, length, flush) \
-              flush = _tr_tally(s, distance, length)
-#endif
-
-#endif /* DEFLATE_H */
diff --git a/dep/src/zlib/inffast.c b/dep/src/zlib/inffast.c
deleted file mode 100644
index bbee92ed1..000000000
--- a/dep/src/zlib/inffast.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* inffast.c -- fast decoding
- * Copyright (C) 1995-2004 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifndef ASMINF
-
-/* Allow machine dependent optimization for post-increment or pre-increment.
-   Based on testing to date,
-   Pre-increment preferred for:
-   - PowerPC G3 (Adler)
-   - MIPS R5000 (Randers-Pehrson)
-   Post-increment preferred for:
-   - none
-   No measurable difference:
-   - Pentium III (Anderson)
-   - M68060 (Nikl)
- */
-#ifdef POSTINC
-#  define OFF 0
-#  define PUP(a) *(a)++
-#else
-#  define OFF 1
-#  define PUP(a) *++(a)
-#endif
-
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state->mode == LEN
-        strm->avail_in >= 6
-        strm->avail_out >= 258
-        start >= strm->avail_out
-        state->bits < 8
-
-   On return, state->mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm->avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-void inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
-{
-    struct inflate_state FAR *state;
-    unsigned char FAR *in;      /* local strm->next_in */
-    unsigned char FAR *last;    /* while in < last, enough input available */
-    unsigned char FAR *out;     /* local strm->next_out */
-    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
-    unsigned char FAR *end;     /* while out < end, enough space available */
-#ifdef INFLATE_STRICT
-    unsigned dmax;              /* maximum distance from zlib header */
-#endif
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned write;             /* window write index */
-    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
-    unsigned long hold;         /* local strm->hold */
-    unsigned bits;              /* local strm->bits */
-    code const FAR *lcode;      /* local strm->lencode */
-    code const FAR *dcode;      /* local strm->distcode */
-    unsigned lmask;             /* mask for first level of length codes */
-    unsigned dmask;             /* mask for first level of distance codes */
-    code this;                  /* retrieved table entry */
-    unsigned op;                /* code bits, operation, extra bits, or */
-                                /*  window position, window bytes to copy */
-    unsigned len;               /* match length, unused bytes */
-    unsigned dist;              /* match distance */
-    unsigned char FAR *from;    /* where to copy match from */
-
-    /* copy state to local variables */
-    state = (struct inflate_state FAR *)strm->state;
-    in = strm->next_in - OFF;
-    last = in + (strm->avail_in - 5);
-    out = strm->next_out - OFF;
-    beg = out - (start - strm->avail_out);
-    end = out + (strm->avail_out - 257);
-#ifdef INFLATE_STRICT
-    dmax = state->dmax;
-#endif
-    wsize = state->wsize;
-    whave = state->whave;
-    write = state->write;
-    window = state->window;
-    hold = state->hold;
-    bits = state->bits;
-    lcode = state->lencode;
-    dcode = state->distcode;
-    lmask = (1U << state->lenbits) - 1;
-    dmask = (1U << state->distbits) - 1;
-
-    /* decode literals and length/distances until end-of-block or not enough
-       input data or output space */
-    do {
-        if (bits < 15) {
-            hold += (unsigned long)(PUP(in)) << bits;
-            bits += 8;
-            hold += (unsigned long)(PUP(in)) << bits;
-            bits += 8;
-        }
-        this = lcode[hold & lmask];
-      dolen:
-        op = (unsigned)(this.bits);
-        hold >>= op;
-        bits -= op;
-        op = (unsigned)(this.op);
-        if (op == 0) {                          /* literal */
-            Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
-                    "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", this.val));
-            PUP(out) = (unsigned char)(this.val);
-        }
-        else if (op & 16) {                     /* length base */
-            len = (unsigned)(this.val);
-            op &= 15;                           /* number of extra bits */
-            if (op) {
-                if (bits < op) {
-                    hold += (unsigned long)(PUP(in)) << bits;
-                    bits += 8;
-                }
-                len += (unsigned)hold & ((1U << op) - 1);
-                hold >>= op;
-                bits -= op;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", len));
-            if (bits < 15) {
-                hold += (unsigned long)(PUP(in)) << bits;
-                bits += 8;
-                hold += (unsigned long)(PUP(in)) << bits;
-                bits += 8;
-            }
-            this = dcode[hold & dmask];
-          dodist:
-            op = (unsigned)(this.bits);
-            hold >>= op;
-            bits -= op;
-            op = (unsigned)(this.op);
-            if (op & 16) {                      /* distance base */
-                dist = (unsigned)(this.val);
-                op &= 15;                       /* number of extra bits */
-                if (bits < op) {
-                    hold += (unsigned long)(PUP(in)) << bits;
-                    bits += 8;
-                    if (bits < op) {
-                        hold += (unsigned long)(PUP(in)) << bits;
-                        bits += 8;
-                    }
-                }
-                dist += (unsigned)hold & ((1U << op) - 1);
-#ifdef INFLATE_STRICT
-                if (dist > dmax) {
-                    strm->msg = (char *)"invalid distance too far back";
-                    state->mode = BAD;
-                    break;
-                }
-#endif
-                hold >>= op;
-                bits -= op;
-                Tracevv((stderr, "inflate:         distance %u\n", dist));
-                op = (unsigned)(out - beg);     /* max distance in output */
-                if (dist > op) {                /* see if copy from window */
-                    op = dist - op;             /* distance back in window */
-                    if (op > whave) {
-                        strm->msg = (char *)"invalid distance too far back";
-                        state->mode = BAD;
-                        break;
-                    }
-                    from = window - OFF;
-                    if (write == 0) {           /* very common case */
-                        from += wsize - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    else if (write < op) {      /* wrap around window */
-                        from += wsize + write - op;
-                        op -= write;
-                        if (op < len) {         /* some from end of window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = window - OFF;
-                            if (write < len) {  /* some from start of window */
-                                op = write;
-                                len -= op;
-                                do {
-                                    PUP(out) = PUP(from);
-                                } while (--op);
-                                from = out - dist;      /* rest from output */
-                            }
-                        }
-                    }
-                    else {                      /* contiguous in window */
-                        from += write - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    while (len > 2) {
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        len -= 3;
-                    }
-                    if (len) {
-                        PUP(out) = PUP(from);
-                        if (len > 1)
-                            PUP(out) = PUP(from);
-                    }
-                }
-                else {
-                    from = out - dist;          /* copy direct from output */
-                    do {                        /* minimum length is three */
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        len -= 3;
-                    } while (len > 2);
-                    if (len) {
-                        PUP(out) = PUP(from);
-                        if (len > 1)
-                            PUP(out) = PUP(from);
-                    }
-                }
-            }
-            else if ((op & 64) == 0) {          /* 2nd level distance code */
-                this = dcode[this.val + (hold & ((1U << op) - 1))];
-                goto dodist;
-            }
-            else {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-        }
-        else if ((op & 64) == 0) {              /* 2nd level length code */
-            this = lcode[this.val + (hold & ((1U << op) - 1))];
-            goto dolen;
-        }
-        else if (op & 32) {                     /* end-of-block */
-            Tracevv((stderr, "inflate:         end of block\n"));
-            state->mode = TYPE;
-            break;
-        }
-        else {
-            strm->msg = (char *)"invalid literal/length code";
-            state->mode = BAD;
-            break;
-        }
-    } while (in < last && out < end);
-
-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-    len = bits >> 3;
-    in -= len;
-    bits -= len << 3;
-    hold &= (1U << bits) - 1;
-
-    /* update state and return */
-    strm->next_in = in + OFF;
-    strm->next_out = out + OFF;
-    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
-    strm->avail_out = (unsigned)(out < end ?
-                                 257 + (end - out) : 257 - (out - end));
-    state->hold = hold;
-    state->bits = bits;
-    return;
-}
-
-/*
-   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
-   - Using bit fields for code structure
-   - Different op definition to avoid & for extra bits (do & for table bits)
-   - Three separate decoding do-loops for direct, window, and write == 0
-   - Special case for distance > 1 copies to do overlapped load and store copy
-   - Explicit branch predictions (based on measured branch probabilities)
-   - Deferring match copy and interspersed it with decoding subsequent codes
-   - Swapping literal/length else
-   - Swapping window/direct else
-   - Larger unrolled copy loops (three is about right)
-   - Moving len -= 3 statement into middle of loop
- */
-
-#endif /* !ASMINF */
diff --git a/dep/src/zlib/inffast.h b/dep/src/zlib/inffast.h
deleted file mode 100644
index 1e88d2d97..000000000
--- a/dep/src/zlib/inffast.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-void inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/dep/src/zlib/inffixed.h b/dep/src/zlib/inffixed.h
deleted file mode 100644
index 75ed4b597..000000000
--- a/dep/src/zlib/inffixed.h
+++ /dev/null
@@ -1,94 +0,0 @@
-    /* inffixed.h -- table for decoding fixed codes
-     * Generated automatically by makefixed().
-     */
-
-    /* WARNING: this file should *not* be used by applications. It
-       is part of the implementation of the compression library and
-       is subject to change. Applications should only use zlib.h.
-     */
-
-    static const code lenfix[512] = {
-        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
-        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
-        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
-        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
-        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
-        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
-        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
-        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
-        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
-        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
-        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
-        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
-        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
-        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
-        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
-        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
-        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
-        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
-        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
-        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
-        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
-        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
-        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
-        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
-        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
-        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
-        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
-        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
-        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
-        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
-        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
-        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
-        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
-        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
-        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
-        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
-        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
-        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
-        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
-        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
-        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
-        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
-        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
-        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
-        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
-        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
-        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
-        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
-        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
-        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
-        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
-        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
-        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
-        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
-        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
-        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
-        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
-        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
-        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
-        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
-        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
-        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
-        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
-        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
-        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
-        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
-        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
-        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
-        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
-        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
-        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
-        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
-        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
-        {0,9,255}
-    };
-
-    static const code distfix[32] = {
-        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
-        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
-        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
-        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
-        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
-        {22,5,193},{64,5,0}
-    };
diff --git a/dep/src/zlib/inflate.c b/dep/src/zlib/inflate.c
deleted file mode 100644
index 792fdee8e..000000000
--- a/dep/src/zlib/inflate.c
+++ /dev/null
@@ -1,1368 +0,0 @@
-/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * Change history:
- *
- * 1.2.beta0    24 Nov 2002
- * - First version -- complete rewrite of inflate to simplify code, avoid
- *   creation of window when not needed, minimize use of window when it is
- *   needed, make inffast.c even faster, implement gzip decoding, and to
- *   improve code readability and style over the previous zlib inflate code
- *
- * 1.2.beta1    25 Nov 2002
- * - Use pointers for available input and output checking in inffast.c
- * - Remove input and output counters in inffast.c
- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
- * - Remove unnecessary second byte pull from length extra in inffast.c
- * - Unroll direct copy to three copies per loop in inffast.c
- *
- * 1.2.beta2    4 Dec 2002
- * - Change external routine names to reduce potential conflicts
- * - Correct filename to inffixed.h for fixed tables in inflate.c
- * - Make hbuf[] unsigned char to match parameter type in inflate.c
- * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
- *   to avoid negation problem on Alphas (64 bit) in inflate.c
- *
- * 1.2.beta3    22 Dec 2002
- * - Add comments on state->bits assertion in inffast.c
- * - Add comments on op field in inftrees.h
- * - Fix bug in reuse of allocated window after inflateReset()
- * - Remove bit fields--back to byte structure for speed
- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
- * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
- * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
- * - Use local copies of stream next and avail values, as well as local bit
- *   buffer and bit count in inflate()--for speed when inflate_fast() not used
- *
- * 1.2.beta4    1 Jan 2003
- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
- * - Move a comment on output buffer sizes from inffast.c to inflate.c
- * - Add comments in inffast.c to introduce the inflate_fast() routine
- * - Rearrange window copies in inflate_fast() for speed and simplification
- * - Unroll last copy for window match in inflate_fast()
- * - Use local copies of window variables in inflate_fast() for speed
- * - Pull out common write == 0 case for speed in inflate_fast()
- * - Make op and len in inflate_fast() unsigned for consistency
- * - Add FAR to lcode and dcode declarations in inflate_fast()
- * - Simplified bad distance check in inflate_fast()
- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
- *   source file infback.c to provide a call-back interface to inflate for
- *   programs like gzip and unzip -- uses window as output buffer to avoid
- *   window copying
- *
- * 1.2.beta5    1 Jan 2003
- * - Improved inflateBack() interface to allow the caller to provide initial
- *   input in strm.
- * - Fixed stored blocks bug in inflateBack()
- *
- * 1.2.beta6    4 Jan 2003
- * - Added comments in inffast.c on effectiveness of POSTINC
- * - Typecasting all around to reduce compiler warnings
- * - Changed loops from while (1) or do {} while (1) to for (;;), again to
- *   make compilers happy
- * - Changed type of window in inflateBackInit() to unsigned char *
- *
- * 1.2.beta7    27 Jan 2003
- * - Changed many types to unsigned or unsigned short to avoid warnings
- * - Added inflateCopy() function
- *
- * 1.2.0        9 Mar 2003
- * - Changed inflateBack() interface to provide separate opaque descriptors
- *   for the in() and out() functions
- * - Changed inflateBack() argument and in_func typedef to swap the length
- *   and buffer address return values for the input function
- * - Check next_in and next_out for Z_NULL on entry to inflate()
- *
- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifdef MAKEFIXED
-#  ifndef BUILDFIXED
-#    define BUILDFIXED
-#  endif
-#endif
-
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, unsigned out));
-#ifdef BUILDFIXED
-   void makefixed OF((void));
-#endif
-local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
-                              unsigned len));
-
-int ZEXPORT inflateReset(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    strm->total_in = strm->total_out = state->total = 0;
-    strm->msg = Z_NULL;
-    strm->adler = 1;        /* to support ill-conceived Java test suite */
-    state->mode = HEAD;
-    state->last = 0;
-    state->havedict = 0;
-    state->dmax = 32768U;
-    state->head = Z_NULL;
-    state->wsize = 0;
-    state->whave = 0;
-    state->write = 0;
-    state->hold = 0;
-    state->bits = 0;
-    state->lencode = state->distcode = state->next = state->codes;
-    Tracev((stderr, "inflate: reset\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflatePrime(strm, bits, value)
-z_streamp strm;
-int bits;
-int value;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
-    value &= (1L << bits) - 1;
-    state->hold += value << state->bits;
-    state->bits += bits;
-    return Z_OK;
-}
-
-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-z_streamp strm;
-int windowBits;
-const char *version;
-int stream_size;
-{
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-    }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-    state = (struct inflate_state FAR *)
-            ZALLOC(strm, 1, sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
-    if (windowBits < 0) {
-        state->wrap = 0;
-        windowBits = -windowBits;
-    }
-    else {
-        state->wrap = (windowBits >> 4) + 1;
-#ifdef GUNZIP
-        if (windowBits < 48) windowBits &= 15;
-#endif
-    }
-    if (windowBits < 8 || windowBits > 15) {
-        ZFREE(strm, state);
-        strm->state = Z_NULL;
-        return Z_STREAM_ERROR;
-    }
-    state->wbits = (unsigned)windowBits;
-    state->window = Z_NULL;
-    return inflateReset(strm);
-}
-
-int ZEXPORT inflateInit_(strm, version, stream_size)
-z_streamp strm;
-const char *version;
-int stream_size;
-{
-    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-#ifdef MAKEFIXED
-#include <stdio.h>
-
-/*
-   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
-   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
-   those tables to stdout, which would be piped to inffixed.h.  A small program
-   can simply call makefixed to do this:
-
-    void makefixed(void);
-
-    int main(void)
-    {
-        makefixed();
-        return 0;
-    }
-
-   Then that can be linked with zlib built with MAKEFIXED defined and run:
-
-    a.out > inffixed.h
- */
-void makefixed()
-{
-    unsigned low, size;
-    struct inflate_state state;
-
-    fixedtables(&state);
-    puts("    /* inffixed.h -- table for decoding fixed codes");
-    puts("     * Generated automatically by makefixed().");
-    puts("     */");
-    puts("");
-    puts("    /* WARNING: this file should *not* be used by applications.");
-    puts("       It is part of the implementation of this library and is");
-    puts("       subject to change. Applications should only use zlib.h.");
-    puts("     */");
-    puts("");
-    size = 1U << 9;
-    printf("    static const code lenfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
-               state.lencode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-    size = 1U << 5;
-    printf("\n    static const code distfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 6) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
-               state.distcode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-}
-#endif /* MAKEFIXED */
-
-/*
-   Update the window with the last wsize (normally 32K) bytes written before
-   returning.  If window does not exist yet, create it.  This is only called
-   when a window is already in use, or when output has been written during this
-   inflate call, but the end of the deflate stream has not been reached yet.
-   It is also called to create a window for dictionary data when a dictionary
-   is loaded.
-
-   Providing output buffers larger than 32K to inflate() should provide a speed
-   advantage, since only the last 32K of output is copied to the sliding window
-   upon return from inflate(), and since all distances after the first 32K of
-   output will fall in the output data, making match copies simpler and faster.
-   The advantage may be dependent on the size of the processor's data caches.
- */
-local int updatewindow(strm, out)
-z_streamp strm;
-unsigned out;
-{
-    struct inflate_state FAR *state;
-    unsigned copy, dist;
-
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* if it hasn't been done already, allocate space for the window */
-    if (state->window == Z_NULL) {
-        state->window = (unsigned char FAR *)
-                        ZALLOC(strm, 1U << state->wbits,
-                               sizeof(unsigned char));
-        if (state->window == Z_NULL) return 1;
-    }
-
-    /* if window not in use yet, initialize */
-    if (state->wsize == 0) {
-        state->wsize = 1U << state->wbits;
-        state->write = 0;
-        state->whave = 0;
-    }
-
-    /* copy state->wsize or less output bytes into the circular window */
-    copy = out - strm->avail_out;
-    if (copy >= state->wsize) {
-        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
-        state->write = 0;
-        state->whave = state->wsize;
-    }
-    else {
-        dist = state->wsize - state->write;
-        if (dist > copy) dist = copy;
-        zmemcpy(state->window + state->write, strm->next_out - copy, dist);
-        copy -= dist;
-        if (copy) {
-            zmemcpy(state->window, strm->next_out - copy, copy);
-            state->write = copy;
-            state->whave = state->wsize;
-        }
-        else {
-            state->write += dist;
-            if (state->write == state->wsize) state->write = 0;
-            if (state->whave < state->wsize) state->whave += dist;
-        }
-    }
-    return 0;
-}
-
-/* Macros for inflate(): */
-
-/* check function to use adler32() for zlib or crc32() for gzip */
-#ifdef GUNZIP
-#  define UPDATE(check, buf, len) \
-    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
-#else
-#  define UPDATE(check, buf, len) adler32(check, buf, len)
-#endif
-
-/* check macros for header crc */
-#ifdef GUNZIP
-#  define CRC2(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        check = crc32(check, hbuf, 2); \
-    } while (0)
-
-#  define CRC4(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        hbuf[2] = (unsigned char)((word) >> 16); \
-        hbuf[3] = (unsigned char)((word) >> 24); \
-        check = crc32(check, hbuf, 4); \
-    } while (0)
-#endif
-
-/* Load registers with state in inflate() for speed */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Restore state from registers in inflate() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflate()
-   if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        if (have == 0) goto inf_leave; \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflate(). */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/* Reverse the bytes in a 32-bit value */
-#define REVERSE(q) \
-    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
-/*
-   inflate() uses a state machine to process as much input data and generate as
-   much output data as possible before returning.  The state machine is
-   structured roughly as follows:
-
-    for (;;) switch (state) {
-    ...
-    case STATEn:
-        if (not enough input data or output space to make progress)
-            return;
-        ... make progress ...
-        state = STATEm;
-        break;
-    ...
-    }
-
-   so when inflate() is called again, the same case is attempted again, and
-   if the appropriate resources are provided, the machine proceeds to the
-   next state.  The NEEDBITS() macro is usually the way the state evaluates
-   whether it can proceed or should return.  NEEDBITS() does the return if
-   the requested bits are not available.  The typical use of the BITS macros
-   is:
-
-        NEEDBITS(n);
-        ... do something with BITS(n) ...
-        DROPBITS(n);
-
-   where NEEDBITS(n) either returns from inflate() if there isn't enough
-   input left to load n bits into the accumulator, or it continues.  BITS(n)
-   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
-   the low n bits off the accumulator.  INITBITS() clears the accumulator
-   and sets the number of available bits to zero.  BYTEBITS() discards just
-   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
-   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
-
-   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
-   if there is no input available.  The decoding of variable length codes uses
-   PULLBYTE() directly in order to pull just enough bytes to decode the next
-   code, and no more.
-
-   Some states loop until they get enough input, making sure that enough
-   state information is maintained to continue the loop where it left off
-   if NEEDBITS() returns in the loop.  For example, want, need, and keep
-   would all have to actually be part of the saved state in case NEEDBITS()
-   returns:
-
-    case STATEw:
-        while (want < need) {
-            NEEDBITS(n);
-            keep[want++] = BITS(n);
-            DROPBITS(n);
-        }
-        state = STATEx;
-    case STATEx:
-
-   As shown above, if the next state is also the next case, then the break
-   is omitted.
-
-   A state may also return if there is not enough output space available to
-   complete that state.  Those states are copying stored data, writing a
-   literal byte, and copying a matching string.
-
-   When returning, a "goto inf_leave" is used to update the total counters,
-   update the check value, and determine whether any progress has been made
-   during that inflate() call in order to return the proper return code.
-   Progress is defined as a change in either strm->avail_in or strm->avail_out.
-   When there is a window, goto inf_leave will update the window with the last
-   output written.  If a goto inf_leave occurs in the middle of decompression
-   and there is no window currently, goto inf_leave will create one and copy
-   output to the window for the next call of inflate().
-
-   In this implementation, the flush parameter of inflate() only affects the
-   return code (per zlib.h).  inflate() always writes as much as possible to
-   strm->next_out, given the space available and the provided input--the effect
-   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
-   the allocation of and copying into a sliding window until necessary, which
-   provides the effect documented in zlib.h for Z_FINISH when the entire input
-   stream available.  So the only thing the flush parameter actually does is:
-   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
-   will return Z_BUF_ERROR if it has not reached the end of the stream.
- */
-
-int ZEXPORT inflate(strm, flush)
-z_streamp strm;
-int flush;
-{
-    struct inflate_state FAR *state;
-    unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned in, out;           /* save starting available input and output */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code this;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-#ifdef GUNZIP
-    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
-#endif
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0))
-        return Z_STREAM_ERROR;
-
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
-    LOAD();
-    in = have;
-    out = left;
-    ret = Z_OK;
-    for (;;)
-        switch (state->mode) {
-        case HEAD:
-            if (state->wrap == 0) {
-                state->mode = TYPEDO;
-                break;
-            }
-            NEEDBITS(16);
-#ifdef GUNZIP
-            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
-                state->check = crc32(0L, Z_NULL, 0);
-                CRC2(state->check, hold);
-                INITBITS();
-                state->mode = FLAGS;
-                break;
-            }
-            state->flags = 0;           /* expect zlib header */
-            if (state->head != Z_NULL)
-                state->head->done = -1;
-            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
-#else
-            if (
-#endif
-                ((BITS(8) << 8) + (hold >> 8)) % 31) {
-                strm->msg = (char *)"incorrect header check";
-                state->mode = BAD;
-                break;
-            }
-            if (BITS(4) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            DROPBITS(4);
-            len = BITS(4) + 8;
-            if (len > state->wbits) {
-                strm->msg = (char *)"invalid window size";
-                state->mode = BAD;
-                break;
-            }
-            state->dmax = 1U << len;
-            Tracev((stderr, "inflate:   zlib header ok\n"));
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = hold & 0x200 ? DICTID : TYPE;
-            INITBITS();
-            break;
-#ifdef GUNZIP
-        case FLAGS:
-            NEEDBITS(16);
-            state->flags = (int)(hold);
-            if ((state->flags & 0xff) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            if (state->flags & 0xe000) {
-                strm->msg = (char *)"unknown header flags set";
-                state->mode = BAD;
-                break;
-            }
-            if (state->head != Z_NULL)
-                state->head->text = (int)((hold >> 8) & 1);
-            if (state->flags & 0x0200) CRC2(state->check, hold);
-            INITBITS();
-            state->mode = TIME;
-        case TIME:
-            NEEDBITS(32);
-            if (state->head != Z_NULL)
-                state->head->time = hold;
-            if (state->flags & 0x0200) CRC4(state->check, hold);
-            INITBITS();
-            state->mode = OS;
-        case OS:
-            NEEDBITS(16);
-            if (state->head != Z_NULL) {
-                state->head->xflags = (int)(hold & 0xff);
-                state->head->os = (int)(hold >> 8);
-            }
-            if (state->flags & 0x0200) CRC2(state->check, hold);
-            INITBITS();
-            state->mode = EXLEN;
-        case EXLEN:
-            if (state->flags & 0x0400) {
-                NEEDBITS(16);
-                state->length = (unsigned)(hold);
-                if (state->head != Z_NULL)
-                    state->head->extra_len = (unsigned)hold;
-                if (state->flags & 0x0200) CRC2(state->check, hold);
-                INITBITS();
-            }
-            else if (state->head != Z_NULL)
-                state->head->extra = Z_NULL;
-            state->mode = EXTRA;
-        case EXTRA:
-            if (state->flags & 0x0400) {
-                copy = state->length;
-                if (copy > have) copy = have;
-                if (copy) {
-                    if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
-                        zmemcpy(state->head->extra + len, next,
-                                len + copy > state->head->extra_max ?
-                                state->head->extra_max - len : copy);
-                    }
-                    if (state->flags & 0x0200)
-                        state->check = crc32(state->check, next, copy);
-                    have -= copy;
-                    next += copy;
-                    state->length -= copy;
-                }
-                if (state->length) goto inf_leave;
-            }
-            state->length = 0;
-            state->mode = NAME;
-        case NAME:
-            if (state->flags & 0x0800) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->name != Z_NULL &&
-                            state->length < state->head->name_max)
-                        state->head->name[state->length++] = len;
-                } while (len && copy < have);
-                if (state->flags & 0x0200)
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->name = Z_NULL;
-            state->length = 0;
-            state->mode = COMMENT;
-        case COMMENT:
-            if (state->flags & 0x1000) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->comment != Z_NULL &&
-                            state->length < state->head->comm_max)
-                        state->head->comment[state->length++] = len;
-                } while (len && copy < have);
-                if (state->flags & 0x0200)
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->comment = Z_NULL;
-            state->mode = HCRC;
-        case HCRC:
-            if (state->flags & 0x0200) {
-                NEEDBITS(16);
-                if (hold != (state->check & 0xffff)) {
-                    strm->msg = (char *)"header crc mismatch";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-            }
-            if (state->head != Z_NULL) {
-                state->head->hcrc = (int)((state->flags >> 9) & 1);
-                state->head->done = 1;
-            }
-            strm->adler = state->check = crc32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-            break;
-#endif
-        case DICTID:
-            NEEDBITS(32);
-            strm->adler = state->check = REVERSE(hold);
-            INITBITS();
-            state->mode = DICT;
-        case DICT:
-            if (state->havedict == 0) {
-                RESTORE();
-                return Z_NEED_DICT;
-            }
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-        case TYPE:
-            if (flush == Z_BLOCK) goto inf_leave;
-        case TYPEDO:
-            if (state->last) {
-                BYTEBITS();
-                state->mode = CHECK;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN;              /* decode codes */
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-        case STORED:
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-            state->mode = COPY;
-        case COPY:
-            copy = state->length;
-            if (copy) {
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                if (copy == 0) goto inf_leave;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-                break;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-        case TABLE:
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-            state->have = 0;
-            state->mode = LENLENS;
-        case LENLENS:
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-            state->have = 0;
-            state->mode = CODELENS;
-        case CODELENS:
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    this = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(this.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (this.val < 16) {
-                    NEEDBITS(this.bits);
-                    DROPBITS(this.bits);
-                    state->lens[state->have++] = this.val;
-                }
-                else {
-                    if (this.val == 16) {
-                        NEEDBITS(this.bits + 2);
-                        DROPBITS(this.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            state->mode = BAD;
-                            break;
-                        }
-                        len = state->lens[state->have - 1];
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (this.val == 17) {
-                        NEEDBITS(this.bits + 3);
-                        DROPBITS(this.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(this.bits + 7);
-                        DROPBITS(this.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* build code tables */
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (code const FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN;
-        case LEN:
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                inflate_fast(strm, out);
-                LOAD();
-                break;
-            }
-            for (;;) {
-                this = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(this.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (this.op && (this.op & 0xf0) == 0) {
-                last = this;
-                for (;;) {
-                    this = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(this.bits);
-            state->length = (unsigned)this.val;
-            if ((int)(this.op) == 0) {
-                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", this.val));
-                state->mode = LIT;
-                break;
-            }
-            if (this.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->mode = TYPE;
-                break;
-            }
-            if (this.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-            state->extra = (unsigned)(this.op) & 15;
-            state->mode = LENEXT;
-        case LENEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-            state->mode = DIST;
-        case DIST:
-            for (;;) {
-                this = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(this.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((this.op & 0xf0) == 0) {
-                last = this;
-                for (;;) {
-                    this = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(this.bits);
-            if (this.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)this.val;
-            state->extra = (unsigned)(this.op) & 15;
-            state->mode = DISTEXT;
-        case DISTEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-#ifdef INFLATE_STRICT
-            if (state->offset > state->dmax) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            if (state->offset > state->whave + out - left) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-            state->mode = MATCH;
-        case MATCH:
-            if (left == 0) goto inf_leave;
-            copy = out - left;
-            if (state->offset > copy) {         /* copy from window */
-                copy = state->offset - copy;
-                if (copy > state->write) {
-                    copy -= state->write;
-                    from = state->window + (state->wsize - copy);
-                }
-                else
-                    from = state->window + (state->write - copy);
-                if (copy > state->length) copy = state->length;
-            }
-            else {                              /* copy from output */
-                from = put - state->offset;
-                copy = state->length;
-            }
-            if (copy > left) copy = left;
-            left -= copy;
-            state->length -= copy;
-            do {
-                *put++ = *from++;
-            } while (--copy);
-            if (state->length == 0) state->mode = LEN;
-            break;
-        case LIT:
-            if (left == 0) goto inf_leave;
-            *put++ = (unsigned char)(state->length);
-            left--;
-            state->mode = LEN;
-            break;
-        case CHECK:
-            if (state->wrap) {
-                NEEDBITS(32);
-                out -= left;
-                strm->total_out += out;
-                state->total += out;
-                if (out)
-                    strm->adler = state->check =
-                        UPDATE(state->check, put - out, out);
-                out = left;
-                if ((
-#ifdef GUNZIP
-                     state->flags ? hold :
-#endif
-                     REVERSE(hold)) != state->check) {
-                    strm->msg = (char *)"incorrect data check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   check matches trailer\n"));
-            }
-#ifdef GUNZIP
-            state->mode = LENGTH;
-        case LENGTH:
-            if (state->wrap && state->flags) {
-                NEEDBITS(32);
-                if (hold != (state->total & 0xffffffffUL)) {
-                    strm->msg = (char *)"incorrect length check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   length matches trailer\n"));
-            }
-#endif
-            state->mode = DONE;
-        case DONE:
-            ret = Z_STREAM_END;
-            goto inf_leave;
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-        case MEM:
-            return Z_MEM_ERROR;
-        case SYNC:
-        default:
-            return Z_STREAM_ERROR;
-        }
-
-    /*
-       Return from inflate(), updating the total counts and the check value.
-       If there was no progress during the inflate() call, return a buffer
-       error.  Call updatewindow() to create and/or update the window state.
-       Note: a memory error from inflate() is non-recoverable.
-     */
-  inf_leave:
-    RESTORE();
-    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
-        if (updatewindow(strm, out)) {
-            state->mode = MEM;
-            return Z_MEM_ERROR;
-        }
-    in -= strm->avail_in;
-    out -= strm->avail_out;
-    strm->total_in += in;
-    strm->total_out += out;
-    state->total += out;
-    if (state->wrap && out)
-        strm->adler = state->check =
-            UPDATE(state->check, strm->next_out - out, out);
-    strm->data_type = state->bits + (state->last ? 64 : 0) +
-                      (state->mode == TYPE ? 128 : 0);
-    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
-        ret = Z_BUF_ERROR;
-    return ret;
-}
-
-int ZEXPORT inflateEnd(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->window != Z_NULL) ZFREE(strm, state->window);
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-const Bytef *dictionary;
-uInt dictLength;
-{
-    struct inflate_state FAR *state;
-    unsigned long id;
-
-    /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->wrap != 0 && state->mode != DICT)
-        return Z_STREAM_ERROR;
-
-    /* check for correct dictionary id */
-    if (state->mode == DICT) {
-        id = adler32(0L, Z_NULL, 0);
-        id = adler32(id, dictionary, dictLength);
-        if (id != state->check)
-            return Z_DATA_ERROR;
-    }
-
-    /* copy dictionary to window */
-    if (updatewindow(strm, strm->avail_out)) {
-        state->mode = MEM;
-        return Z_MEM_ERROR;
-    }
-    if (dictLength > state->wsize) {
-        zmemcpy(state->window, dictionary + dictLength - state->wsize,
-                state->wsize);
-        state->whave = state->wsize;
-    }
-    else {
-        zmemcpy(state->window + state->wsize - dictLength, dictionary,
-                dictLength);
-        state->whave = dictLength;
-    }
-    state->havedict = 1;
-    Tracev((stderr, "inflate:   dictionary set\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateGetHeader(strm, head)
-z_streamp strm;
-gz_headerp head;
-{
-    struct inflate_state FAR *state;
-
-    /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
-
-    /* save header structure */
-    state->head = head;
-    head->done = 0;
-    return Z_OK;
-}
-
-/*
-   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
-   or when out of input.  When called, *have is the number of pattern bytes
-   found in order so far, in 0..3.  On return *have is updated to the new
-   state.  If on return *have equals four, then the pattern was found and the
-   return value is how many bytes were read including the last byte of the
-   pattern.  If *have is less than four, then the pattern has not been found
-   yet and the return value is len.  In the latter case, syncsearch() can be
-   called again with more data and the *have state.  *have is initialized to
-   zero for the first call.
- */
-local unsigned syncsearch(have, buf, len)
-unsigned FAR *have;
-unsigned char FAR *buf;
-unsigned len;
-{
-    unsigned got;
-    unsigned next;
-
-    got = *have;
-    next = 0;
-    while (next < len && got < 4) {
-        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
-            got++;
-        else if (buf[next])
-            got = 0;
-        else
-            got = 4 - got;
-        next++;
-    }
-    *have = got;
-    return next;
-}
-
-int ZEXPORT inflateSync(strm)
-z_streamp strm;
-{
-    unsigned len;               /* number of bytes to look at or looked at */
-    unsigned long in, out;      /* temporary to save total_in and total_out */
-    unsigned char buf[4];       /* to restore bit buffer to byte string */
-    struct inflate_state FAR *state;
-
-    /* check parameters */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
-
-    /* if first time, start search in bit buffer */
-    if (state->mode != SYNC) {
-        state->mode = SYNC;
-        state->hold <<= state->bits & 7;
-        state->bits -= state->bits & 7;
-        len = 0;
-        while (state->bits >= 8) {
-            buf[len++] = (unsigned char)(state->hold);
-            state->hold >>= 8;
-            state->bits -= 8;
-        }
-        state->have = 0;
-        syncsearch(&(state->have), buf, len);
-    }
-
-    /* search available input */
-    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
-    strm->avail_in -= len;
-    strm->next_in += len;
-    strm->total_in += len;
-
-    /* return no joy or set up to restart inflate() on a new block */
-    if (state->have != 4) return Z_DATA_ERROR;
-    in = strm->total_in;  out = strm->total_out;
-    inflateReset(strm);
-    strm->total_in = in;  strm->total_out = out;
-    state->mode = TYPE;
-    return Z_OK;
-}
-
-/*
-   Returns true if inflate is currently at the end of a block generated by
-   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
-   implementation to provide an additional safety check. PPP uses
-   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
-   block. When decompressing, PPP checks that at the end of input packet,
-   inflate is waiting for these length bytes.
- */
-int ZEXPORT inflateSyncPoint(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    return state->mode == STORED && state->bits == 0;
-}
-
-int ZEXPORT inflateCopy(dest, source)
-z_streamp dest;
-z_streamp source;
-{
-    struct inflate_state FAR *state;
-    struct inflate_state FAR *copy;
-    unsigned char FAR *window;
-    unsigned wsize;
-
-    /* check input */
-    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
-        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)source->state;
-
-    /* allocate space */
-    copy = (struct inflate_state FAR *)
-           ZALLOC(source, 1, sizeof(struct inflate_state));
-    if (copy == Z_NULL) return Z_MEM_ERROR;
-    window = Z_NULL;
-    if (state->window != Z_NULL) {
-        window = (unsigned char FAR *)
-                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
-        if (window == Z_NULL) {
-            ZFREE(source, copy);
-            return Z_MEM_ERROR;
-        }
-    }
-
-    /* copy state */
-    zmemcpy(dest, source, sizeof(z_stream));
-    zmemcpy(copy, state, sizeof(struct inflate_state));
-    if (state->lencode >= state->codes &&
-        state->lencode <= state->codes + ENOUGH - 1) {
-        copy->lencode = copy->codes + (state->lencode - state->codes);
-        copy->distcode = copy->codes + (state->distcode - state->codes);
-    }
-    copy->next = copy->codes + (state->next - state->codes);
-    if (window != Z_NULL) {
-        wsize = 1U << state->wbits;
-        zmemcpy(window, state->window, wsize);
-    }
-    copy->window = window;
-    dest->state = (struct internal_state FAR *)copy;
-    return Z_OK;
-}
diff --git a/dep/src/zlib/inflate.h b/dep/src/zlib/inflate.h
deleted file mode 100644
index 07bd3e78a..000000000
--- a/dep/src/zlib/inflate.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2004 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip decoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#  define GUNZIP
-#endif
-
-/* Possible inflate modes between inflate() calls */
-typedef enum {
-    HEAD,       /* i: waiting for magic header */
-    FLAGS,      /* i: waiting for method and flags (gzip) */
-    TIME,       /* i: waiting for modification time (gzip) */
-    OS,         /* i: waiting for extra flags and operating system (gzip) */
-    EXLEN,      /* i: waiting for extra length (gzip) */
-    EXTRA,      /* i: waiting for extra bytes (gzip) */
-    NAME,       /* i: waiting for end of file name (gzip) */
-    COMMENT,    /* i: waiting for end of comment (gzip) */
-    HCRC,       /* i: waiting for header crc (gzip) */
-    DICTID,     /* i: waiting for dictionary check value */
-    DICT,       /* waiting for inflateSetDictionary() call */
-        TYPE,       /* i: waiting for type bits, including last-flag bit */
-        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
-        STORED,     /* i: waiting for stored size (length and complement) */
-        COPY,       /* i/o: waiting for input or output to copy stored block */
-        TABLE,      /* i: waiting for dynamic block table lengths */
-        LENLENS,    /* i: waiting for code length code lengths */
-        CODELENS,   /* i: waiting for length/lit and distance code lengths */
-            LEN,        /* i: waiting for length/lit code */
-            LENEXT,     /* i: waiting for length extra bits */
-            DIST,       /* i: waiting for distance code */
-            DISTEXT,    /* i: waiting for distance extra bits */
-            MATCH,      /* o: waiting for output space to copy string */
-            LIT,        /* o: waiting for output space to write literal */
-    CHECK,      /* i: waiting for 32-bit check value */
-    LENGTH,     /* i: waiting for 32-bit length (gzip) */
-    DONE,       /* finished check, done -- remain here until reset */
-    BAD,        /* got a data error -- remain here until reset */
-    MEM,        /* got an inflate() memory error -- remain here until reset */
-    SYNC        /* looking for synchronization bytes to restart inflate() */
-} inflate_mode;
-
-/*
-    State transitions between above modes -
-
-    (most modes can go to the BAD or MEM mode -- not shown for clarity)
-
-    Process header:
-        HEAD -> (gzip) or (zlib)
-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME
-        NAME -> COMMENT -> HCRC -> TYPE
-        (zlib) -> DICTID or TYPE
-        DICTID -> DICT -> TYPE
-    Read deflate blocks:
-            TYPE -> STORED or TABLE or LEN or CHECK
-            STORED -> COPY -> TYPE
-            TABLE -> LENLENS -> CODELENS -> LEN
-    Read deflate codes:
-                LEN -> LENEXT or LIT or TYPE
-                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
-                LIT -> LEN
-    Process trailer:
-        CHECK -> LENGTH -> DONE
- */
-
-/* state maintained between inflate() calls.  Approximately 7K bytes. */
-struct inflate_state {
-    inflate_mode mode;          /* current inflate mode */
-    int last;                   /* true if processing last block */
-    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
-    int havedict;               /* true if dictionary provided */
-    int flags;                  /* gzip header method and flags (0 if zlib) */
-    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
-    unsigned long check;        /* protected copy of check value */
-    unsigned long total;        /* protected copy of output count */
-    gz_headerp head;            /* where to save gzip header information */
-        /* sliding window */
-    unsigned wbits;             /* log base 2 of requested window size */
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned write;             /* window write index */
-    unsigned char FAR *window;  /* allocated sliding window, if needed */
-        /* bit accumulator */
-    unsigned long hold;         /* input bit accumulator */
-    unsigned bits;              /* number of bits in "in" */
-        /* for string and stored block copying */
-    unsigned length;            /* literal or length of data to copy */
-    unsigned offset;            /* distance back to copy string from */
-        /* for table and code decoding */
-    unsigned extra;             /* extra bits needed */
-        /* fixed and dynamic code tables */
-    code const FAR *lencode;    /* starting table for length/literal codes */
-    code const FAR *distcode;   /* starting table for distance codes */
-    unsigned lenbits;           /* index bits for lencode */
-    unsigned distbits;          /* index bits for distcode */
-        /* dynamic table building */
-    unsigned ncode;             /* number of code length code lengths */
-    unsigned nlen;              /* number of length code lengths */
-    unsigned ndist;             /* number of distance code lengths */
-    unsigned have;              /* number of code lengths in lens[] */
-    code FAR *next;             /* next available space in codes[] */
-    unsigned short lens[320];   /* temporary storage for code lengths */
-    unsigned short work[288];   /* work area for code table building */
-    code codes[ENOUGH];         /* space for code tables */
-};
diff --git a/dep/src/zlib/inftrees.c b/dep/src/zlib/inftrees.c
deleted file mode 100644
index 8a9c13ff0..000000000
--- a/dep/src/zlib/inftrees.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-
-#define MAXBITS 15
-
-const char inflate_copyright[] =
-   " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/*
-   Build a set of tables to decode the provided canonical Huffman code.
-   The code lengths are lens[0..codes-1].  The result starts at *table,
-   whose indices are 0..2^bits-1.  work is a writable array of at least
-   lens shorts, which is used as a work area.  type is the type of code
-   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
-   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
-   on return points to the next available entry's address.  bits is the
-   requested root table index bits, and on return it is the actual root
-   table index bits.  It will differ if the request is greater than the
-   longest code or if it is less than the shortest code.
- */
-int inflate_table(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
-    unsigned len;               /* a code's length in bits */
-    unsigned sym;               /* index of code symbols */
-    unsigned min, max;          /* minimum and maximum code lengths */
-    unsigned root;              /* number of index bits for root table */
-    unsigned curr;              /* number of index bits for current table */
-    unsigned drop;              /* code bits to drop for sub-table */
-    int left;                   /* number of prefix codes available */
-    unsigned used;              /* code entries in table used */
-    unsigned huff;              /* Huffman code */
-    unsigned incr;              /* for incrementing code, index */
-    unsigned fill;              /* index for replicating entries */
-    unsigned low;               /* low bits for current root entry */
-    unsigned mask;              /* mask for low root bits */
-    code this;                  /* table entry for duplication */
-    code FAR *next;             /* next available space in table */
-    const unsigned short FAR *base;     /* base value table to use */
-    const unsigned short FAR *extra;    /* extra bits table to use */
-    int end;                    /* use base and extra for symbol > end */
-    unsigned short count[MAXBITS+1];    /* number of codes of each length */
-    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
-    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
-        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};
-    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577, 0, 0};
-    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
-        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
-        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
-        28, 28, 29, 29, 64, 64};
-
-    /*
-       Process a set of code lengths to create a canonical Huffman code.  The
-       code lengths are lens[0..codes-1].  Each length corresponds to the
-       symbols 0..codes-1.  The Huffman code is generated by first sorting the
-       symbols by length from short to long, and retaining the symbol order
-       for codes with equal lengths.  Then the code starts with all zero bits
-       for the first code of the shortest length, and the codes are integer
-       increments for the same length, and zeros are appended as the length
-       increases.  For the deflate format, these bits are stored backwards
-       from their more natural integer increment ordering, and so when the
-       decoding tables are built in the large loop below, the integer codes
-       are incremented backwards.
-
-       This routine assumes, but does not check, that all of the entries in
-       lens[] are in the range 0..MAXBITS.  The caller must assure this.
-       1..MAXBITS is interpreted as that code length.  zero means that that
-       symbol does not occur in this code.
-
-       The codes are sorted by computing a count of codes for each length,
-       creating from that a table of starting indices for each length in the
-       sorted table, and then entering the symbols in order in the sorted
-       table.  The sorted table is work[], with that space being provided by
-       the caller.
-
-       The length counts are used for other purposes as well, i.e. finding
-       the minimum and maximum length codes, determining if there are any
-       codes at all, checking for a valid set of lengths, and looking ahead
-       at length counts to determine sub-table sizes when building the
-       decoding tables.
-     */
-
-    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-    for (len = 0; len <= MAXBITS; len++)
-        count[len] = 0;
-    for (sym = 0; sym < codes; sym++)
-        count[lens[sym]]++;
-
-    /* bound code lengths, force root to be within code lengths */
-    root = *bits;
-    for (max = MAXBITS; max >= 1; max--)
-        if (count[max] != 0) break;
-    if (root > max) root = max;
-    if (max == 0) {                     /* no symbols to code at all */
-        this.op = (unsigned char)64;    /* invalid code marker */
-        this.bits = (unsigned char)1;
-        this.val = (unsigned short)0;
-        *(*table)++ = this;             /* make a table to force an error */
-        *(*table)++ = this;
-        *bits = 1;
-        return 0;     /* no symbols, but wait for decoding to report error */
-    }
-    for (min = 1; min <= MAXBITS; min++)
-        if (count[min] != 0) break;
-    if (root < min) root = min;
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;
-        left -= count[len];
-        if (left < 0) return -1;        /* over-subscribed */
-    }
-    if (left > 0 && (type == CODES || max != 1))
-        return -1;                      /* incomplete set */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + count[len];
-
-    /* sort symbols by length, by symbol order within each length */
-    for (sym = 0; sym < codes; sym++)
-        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
-
-    /*
-       Create and fill in decoding tables.  In this loop, the table being
-       filled is at next and has curr index bits.  The code being used is huff
-       with length len.  That code is converted to an index by dropping drop
-       bits off of the bottom.  For codes where len is less than drop + curr,
-       those top drop + curr - len bits are incremented through all values to
-       fill the table with replicated entries.
-
-       root is the number of index bits for the root table.  When len exceeds
-       root, sub-tables are created pointed to by the root entry with an index
-       of the low root bits of huff.  This is saved in low to check for when a
-       new sub-table should be started.  drop is zero when the root table is
-       being filled, and drop is root when sub-tables are being filled.
-
-       When a new sub-table is needed, it is necessary to look ahead in the
-       code lengths to determine what size sub-table is needed.  The length
-       counts are used for this, and so count[] is decremented as codes are
-       entered in the tables.
-
-       used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked when a LENS table is being made
-       against the space in *table, ENOUGH, minus the maximum space needed by
-       the worst case distance code, MAXD.  This should never happen, but the
-       sufficiency of ENOUGH has not been proven exhaustively, hence the check.
-       This assumes that when type == LENS, bits == 9.
-
-       sym increments through all symbols, and the loop terminates when
-       all codes of length max, i.e. all codes, have been processed.  This
-       routine permits incomplete codes, so another loop after this one fills
-       in the rest of the decoding tables with invalid code markers.
-     */
-
-    /* set up for code type */
-    switch (type) {
-    case CODES:
-        base = extra = work;    /* dummy value--not used */
-        end = 19;
-        break;
-    case LENS:
-        base = lbase;
-        base -= 257;
-        extra = lext;
-        extra -= 257;
-        end = 256;
-        break;
-    default:            /* DISTS */
-        base = dbase;
-        extra = dext;
-        end = -1;
-    }
-
-    /* initialize state for loop */
-    huff = 0;                   /* starting code */
-    sym = 0;                    /* starting code symbol */
-    len = min;                  /* starting code length */
-    next = *table;              /* current table to fill in */
-    curr = root;                /* current table index bits */
-    drop = 0;                   /* current bits to drop from code for index */
-    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
-    used = 1U << root;          /* use root table entries */
-    mask = used - 1;            /* mask for comparing low */
-
-    /* check available table space */
-    if (type == LENS && used >= ENOUGH - MAXD)
-        return 1;
-
-    /* process all codes and make table entries */
-    for (;;) {
-        /* create table entry */
-        this.bits = (unsigned char)(len - drop);
-        if ((int)(work[sym]) < end) {
-            this.op = (unsigned char)0;
-            this.val = work[sym];
-        }
-        else if ((int)(work[sym]) > end) {
-            this.op = (unsigned char)(extra[work[sym]]);
-            this.val = base[work[sym]];
-        }
-        else {
-            this.op = (unsigned char)(32 + 64);         /* end of block */
-            this.val = 0;
-        }
-
-        /* replicate for those indices with low len bits equal to huff */
-        incr = 1U << (len - drop);
-        fill = 1U << curr;
-        min = fill;                 /* save offset to next table */
-        do {
-            fill -= incr;
-            next[(huff >> drop) + fill] = this;
-        } while (fill != 0);
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
-
-        /* go to next symbol, update count, len */
-        sym++;
-        if (--(count[len]) == 0) {
-            if (len == max) break;
-            len = lens[work[sym]];
-        }
-
-        /* create new sub-table if needed */
-        if (len > root && (huff & mask) != low) {
-            /* if first time, transition to sub-tables */
-            if (drop == 0)
-                drop = root;
-
-            /* increment past last table */
-            next += min;            /* here min is 1 << curr */
-
-            /* determine length of next table */
-            curr = len - drop;
-            left = (int)(1 << curr);
-            while (curr + drop < max) {
-                left -= count[curr + drop];
-                if (left <= 0) break;
-                curr++;
-                left <<= 1;
-            }
-
-            /* check for enough space */
-            used += 1U << curr;
-            if (type == LENS && used >= ENOUGH - MAXD)
-                return 1;
-
-            /* point entry in root table to sub-table */
-            low = huff & mask;
-            (*table)[low].op = (unsigned char)curr;
-            (*table)[low].bits = (unsigned char)root;
-            (*table)[low].val = (unsigned short)(next - *table);
-        }
-    }
-
-    /*
-       Fill in rest of table for incomplete codes.  This loop is similar to the
-       loop above in incrementing huff for table indices.  It is assumed that
-       len is equal to curr + drop, so there is no loop needed to increment
-       through high index bits.  When the current sub-table is filled, the loop
-       drops back to the root table to fill in any remaining entries there.
-     */
-    this.op = (unsigned char)64;                /* invalid code marker */
-    this.bits = (unsigned char)(len - drop);
-    this.val = (unsigned short)0;
-    while (huff != 0) {
-        /* when done with sub-table, drop back to root table */
-        if (drop != 0 && (huff & mask) != low) {
-            drop = 0;
-            len = root;
-            next = *table;
-            this.bits = (unsigned char)len;
-        }
-
-        /* put invalid code marker in table */
-        next[huff >> drop] = this;
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
-    }
-
-    /* set return parameters */
-    *table += used;
-    *bits = root;
-    return 0;
-}
diff --git a/dep/src/zlib/inftrees.h b/dep/src/zlib/inftrees.h
deleted file mode 100644
index b1104c87e..000000000
--- a/dep/src/zlib/inftrees.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Structure for decoding tables.  Each entry provides either the
-   information needed to do the operation requested by the code that
-   indexed that table entry, or it provides a pointer to another
-   table that indexes more bits of the code.  op indicates whether
-   the entry is a pointer to another table, a literal, a length or
-   distance, an end-of-block, or an invalid code.  For a table
-   pointer, the low four bits of op is the number of index bits of
-   that table.  For a length or distance, the low four bits of op
-   is the number of extra bits to get after the code.  bits is
-   the number of bits in this code or part of the code to drop off
-   of the bit buffer.  val is the actual byte to output in the case
-   of a literal, the base length or distance, or the offset from
-   the current table to the next table.  Each entry is four bytes. */
-typedef struct {
-    unsigned char op;           /* operation, extra bits, table bits */
-    unsigned char bits;         /* bits in this part of the code */
-    unsigned short val;         /* offset in table or code value */
-} code;
-
-/* op values as set by inflate_table():
-    00000000 - literal
-    0000tttt - table link, tttt != 0 is the number of table index bits
-    0001eeee - length or distance, eeee is the number of extra bits
-    01100000 - end of block
-    01000000 - invalid code
- */
-
-/* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1444 code structures (852 for length/literals
-   and 592 for distances, the latter actually the result of an
-   exhaustive search).  The true maximum is not known, but the value
-   below is more than safe. */
-#define ENOUGH 2048
-#define MAXD 592
-
-/* Type of code to build for inftable() */
-typedef enum {
-    CODES,
-    LENS,
-    DISTS
-} codetype;
-
-extern int inflate_table OF((codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/dep/src/zlib/trees.c b/dep/src/zlib/trees.c
deleted file mode 100644
index 395e4e168..000000000
--- a/dep/src/zlib/trees.c
+++ /dev/null
@@ -1,1219 +0,0 @@
-/* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2005 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process uses several Huffman trees. The more
- *      common source values are represented by shorter bit sequences.
- *
- *      Each code tree is stored in a compressed form which is itself
- * a Huffman encoding of the lengths of all the code strings (in
- * ascending order by source values).  The actual code strings are
- * reconstructed from the lengths in the inflate process, as described
- * in the deflate specification.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
- *
- *      Storer, James A.
- *          Data Compression:  Methods and Theory, pp. 49-50.
- *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
- *
- *      Sedgewick, R.
- *          Algorithms, p290.
- *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
- */
-
-/* @(#) $Id$ */
-
-/* #define GEN_TREES_H */
-
-#include "deflate.h"
-
-#ifdef DEBUG
-#  include <ctype.h>
-#endif
-
-/* ===========================================================================
- * Constants
- */
-
-#define MAX_BL_BITS 7
-/* Bit length codes must not exceed MAX_BL_BITS bits */
-
-#define END_BLOCK 256
-/* end of block literal code */
-
-#define REP_3_6      16
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-
-#define REPZ_3_10    17
-/* repeat a zero length 3-10 times  (3 bits of repeat count) */
-
-#define REPZ_11_138  18
-/* repeat a zero length 11-138 times  (7 bits of repeat count) */
-
-local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
-
-local const int extra_dbits[D_CODES] /* extra bits for each distance code */
-   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
-
-local const uch bl_order[BL_CODES]
-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
-/* The lengths of the bit length codes are sent in order of decreasing
- * probability, to avoid transmitting the lengths for unused bit length codes.
- */
-
-#define Buf_size (8 * 2*sizeof(char))
-/* Number of bits used within bi_buf. (bi_buf might be implemented on
- * more than 16 bits on some systems.)
- */
-
-/* ===========================================================================
- * Local data. These are initialized only once.
- */
-
-#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-/* non ANSI compilers may not accept trees.h */
-
-local ct_data static_ltree[L_CODES+2];
-/* The static literal tree. Since the bit lengths are imposed, there is no
- * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
- * below).
- */
-
-local ct_data static_dtree[D_CODES];
-/* The static distance tree. (Actually a trivial tree since all codes use
- * 5 bits.)
- */
-
-uch _dist_code[DIST_CODE_LEN];
-/* Distance codes. The first 256 values correspond to the distances
- * 3 .. 258, the last 256 values correspond to the top 8 bits of
- * the 15 bit distances.
- */
-
-uch _length_code[MAX_MATCH-MIN_MATCH+1];
-/* length code for each normalized match length (0 == MIN_MATCH) */
-
-local int base_length[LENGTH_CODES];
-/* First normalized length for each code (0 = MIN_MATCH) */
-
-local int base_dist[D_CODES];
-/* First normalized distance for each code (0 = distance of 1) */
-
-#else
-#  include "trees.h"
-#endif /* GEN_TREES_H */
-
-struct static_tree_desc_s {
-    const ct_data *static_tree;  /* static tree or NULL */
-    const intf *extra_bits;      /* extra bits for each code or NULL */
-    int     extra_base;          /* base index for extra_bits */
-    int     elems;               /* max number of elements in the tree */
-    int     max_length;          /* max bit length for the codes */
-};
-
-local static_tree_desc  static_l_desc =
-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
-
-local static_tree_desc  static_d_desc =
-{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
-
-local static_tree_desc  static_bl_desc =
-{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
-
-/* ===========================================================================
- * Local (static) routines in this file.
- */
-
-local void tr_static_init OF((void));
-local void init_block     OF((deflate_state *s));
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-                              int blcodes));
-local void compress_block OF((deflate_state *s, ct_data *ltree,
-                              ct_data *dtree));
-local void set_data_type  OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned value, int length));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
-local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
-                              int header));
-
-#ifdef GEN_TREES_H
-local void gen_trees_header OF((void));
-#endif
-
-#ifndef DEBUG
-#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
-   /* Send a code of the given tree. c and tree must not have side effects */
-
-#else /* DEBUG */
-#  define send_code(s, c, tree) \
-     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
-       send_bits(s, tree[c].Code, tree[c].Len); }
-#endif
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-#ifdef DEBUG
-local void send_bits      OF((deflate_state *s, int value, int length));
-
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
-    Tracevv((stderr," l %2d v %4x ", length, value));
-    Assert(length > 0 && length <= 15, "invalid length");
-    s->bits_sent += (ulg)length;
-
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-     * unused bits in value.
-     */
-    if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (value << s->bi_valid);
-        put_short(s, s->bi_buf);
-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
-        s->bi_valid += length - Buf_size;
-    } else {
-        s->bi_buf |= value << s->bi_valid;
-        s->bi_valid += length;
-    }
-}
-#else /* !DEBUG */
-
-#define send_bits(s, value, length) \
-{ int len = length;\
-  if (s->bi_valid > (int)Buf_size - len) {\
-    int val = value;\
-    s->bi_buf |= (val << s->bi_valid);\
-    put_short(s, s->bi_buf);\
-    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
-    s->bi_valid += len - Buf_size;\
-  } else {\
-    s->bi_buf |= (value) << s->bi_valid;\
-    s->bi_valid += len;\
-  }\
-}
-#endif /* DEBUG */
-
-
-/* the arguments must not have side effects */
-
-/* ===========================================================================
- * Initialize the various 'constant' tables.
- */
-local void tr_static_init()
-{
-#if defined(GEN_TREES_H) || !defined(STDC)
-    static int static_init_done = 0;
-    int n;        /* iterates over tree elements */
-    int bits;     /* bit counter */
-    int length;   /* length value */
-    int code;     /* code value */
-    int dist;     /* distance index */
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    if (static_init_done) return;
-
-    /* For some embedded targets, global variables are not initialized: */
-    static_l_desc.static_tree = static_ltree;
-    static_l_desc.extra_bits = extra_lbits;
-    static_d_desc.static_tree = static_dtree;
-    static_d_desc.extra_bits = extra_dbits;
-    static_bl_desc.extra_bits = extra_blbits;
-
-    /* Initialize the mapping length (0..255) -> length code (0..28) */
-    length = 0;
-    for (code = 0; code < LENGTH_CODES-1; code++) {
-        base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
-            _length_code[length++] = (uch)code;
-        }
-    }
-    Assert (length == 256, "tr_static_init: length != 256");
-    /* Note that the length 255 (match length 258) can be represented
-     * in two different ways: code 284 + 5 bits or code 285, so we
-     * overwrite length_code[255] to use the best encoding:
-     */
-    _length_code[length-1] = (uch)code;
-
-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-    dist = 0;
-    for (code = 0 ; code < 16; code++) {
-        base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
-            _dist_code[dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: dist != 256");
-    dist >>= 7; /* from now on, all distances are divided by 128 */
-    for ( ; code < D_CODES; code++) {
-        base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-            _dist_code[256 + dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
-
-    /* Construct the codes of the static literal tree */
-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
-    n = 0;
-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
-    /* Codes 286 and 287 do not exist, but we must include them in the
-     * tree construction to get a canonical Huffman tree (longest code
-     * all ones)
-     */
-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
-
-    /* The static distance tree is trivial: */
-    for (n = 0; n < D_CODES; n++) {
-        static_dtree[n].Len = 5;
-        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
-    }
-    static_init_done = 1;
-
-#  ifdef GEN_TREES_H
-    gen_trees_header();
-#  endif
-#endif /* defined(GEN_TREES_H) || !defined(STDC) */
-}
-
-/* ===========================================================================
- * Genererate the file trees.h describing the static trees.
- */
-#ifdef GEN_TREES_H
-#  ifndef DEBUG
-#    include <stdio.h>
-#  endif
-
-#  define SEPARATOR(i, last, width) \
-      ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
-
-void gen_trees_header()
-{
-    FILE *header = fopen("trees.h", "w");
-    int i;
-
-    Assert (header != NULL, "Can't open trees.h");
-    fprintf(header,
-            "/* header created automatically with -DGEN_TREES_H */\n\n");
-
-    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
-    for (i = 0; i < L_CODES+2; i++) {
-        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
-                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
-    }
-
-    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
-                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
-    }
-
-    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
-    for (i = 0; i < DIST_CODE_LEN; i++) {
-        fprintf(header, "%2u%s", _dist_code[i],
-                SEPARATOR(i, DIST_CODE_LEN-1, 20));
-    }
-
-    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
-    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
-        fprintf(header, "%2u%s", _length_code[i],
-                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
-    }
-
-    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
-    for (i = 0; i < LENGTH_CODES; i++) {
-        fprintf(header, "%1u%s", base_length[i],
-                SEPARATOR(i, LENGTH_CODES-1, 20));
-    }
-
-    fprintf(header, "local const int base_dist[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        fprintf(header, "%5u%s", base_dist[i],
-                SEPARATOR(i, D_CODES-1, 10));
-    }
-
-    fclose(header);
-}
-#endif /* GEN_TREES_H */
-
-/* ===========================================================================
- * Initialize the tree data structures for a new zlib stream.
- */
-void _tr_init(s)
-    deflate_state *s;
-{
-    tr_static_init();
-
-    s->l_desc.dyn_tree = s->dyn_ltree;
-    s->l_desc.stat_desc = &static_l_desc;
-
-    s->d_desc.dyn_tree = s->dyn_dtree;
-    s->d_desc.stat_desc = &static_d_desc;
-
-    s->bl_desc.dyn_tree = s->bl_tree;
-    s->bl_desc.stat_desc = &static_bl_desc;
-
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-    s->last_eob_len = 8; /* enough lookahead for inflate */
-#ifdef DEBUG
-    s->compressed_len = 0L;
-    s->bits_sent = 0L;
-#endif
-
-    /* Initialize the first block of the first file: */
-    init_block(s);
-}
-
-/* ===========================================================================
- * Initialize a new block.
- */
-local void init_block(s)
-    deflate_state *s;
-{
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
-
-    s->dyn_ltree[END_BLOCK].Freq = 1;
-    s->opt_len = s->static_len = 0L;
-    s->last_lit = s->matches = 0;
-}
-
-#define SMALLEST 1
-/* Index within the heap array of least frequent node in the Huffman tree */
-
-
-/* ===========================================================================
- * Remove the smallest element from the heap and recreate the heap with
- * one less element. Updates heap and heap_len.
- */
-#define pqremove(s, tree, top) \
-{\
-    top = s->heap[SMALLEST]; \
-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
-    pqdownheap(s, tree, SMALLEST); \
-}
-
-/* ===========================================================================
- * Compares to subtrees, using the tree depth as tie breaker when
- * the subtrees have equal frequency. This minimizes the worst case length.
- */
-#define smaller(tree, n, m, depth) \
-   (tree[n].Freq < tree[m].Freq || \
-   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
-
-/* ===========================================================================
- * Restore the heap property by moving down the tree starting at node k,
- * exchanging a node with the smallest of its two sons if necessary, stopping
- * when the heap property is re-established (each father smaller than its
- * two sons).
- */
-local void pqdownheap(s, tree, k)
-    deflate_state *s;
-    ct_data *tree;  /* the tree to restore */
-    int k;               /* node to move down */
-{
-    int v = s->heap[k];
-    int j = k << 1;  /* left son of k */
-    while (j <= s->heap_len) {
-        /* Set j to the smallest of the two sons: */
-        if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
-            j++;
-        }
-        /* Exit if v is smaller than both sons */
-        if (smaller(tree, v, s->heap[j], s->depth)) break;
-
-        /* Exchange v with the smallest son */
-        s->heap[k] = s->heap[j];  k = j;
-
-        /* And continue down the tree, setting j to the left son of k */
-        j <<= 1;
-    }
-    s->heap[k] = v;
-}
-
-/* ===========================================================================
- * Compute the optimal bit lengths for a tree and update the total bit length
- * for the current block.
- * IN assertion: the fields freq and dad are set, heap[heap_max] and
- *    above are the tree nodes sorted by increasing frequency.
- * OUT assertions: the field len is set to the optimal bit length, the
- *     array bl_count contains the frequencies for each bit length.
- *     The length opt_len is updated; static_len is also updated if stree is
- *     not null.
- */
-local void gen_bitlen(s, desc)
-    deflate_state *s;
-    tree_desc *desc;    /* the tree descriptor */
-{
-    ct_data *tree        = desc->dyn_tree;
-    int max_code         = desc->max_code;
-    const ct_data *stree = desc->stat_desc->static_tree;
-    const intf *extra    = desc->stat_desc->extra_bits;
-    int base             = desc->stat_desc->extra_base;
-    int max_length       = desc->stat_desc->max_length;
-    int h;              /* heap index */
-    int n, m;           /* iterate over the tree elements */
-    int bits;           /* bit length */
-    int xbits;          /* extra bits */
-    ush f;              /* frequency */
-    int overflow = 0;   /* number of elements with bit length too large */
-
-    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
-
-    /* In a first pass, compute the optimal bit lengths (which may
-     * overflow in the case of the bit length tree).
-     */
-    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
-
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
-        n = s->heap[h];
-        bits = tree[tree[n].Dad].Len + 1;
-        if (bits > max_length) bits = max_length, overflow++;
-        tree[n].Len = (ush)bits;
-        /* We overwrite tree[n].Dad which is no longer needed */
-
-        if (n > max_code) continue; /* not a leaf node */
-
-        s->bl_count[bits]++;
-        xbits = 0;
-        if (n >= base) xbits = extra[n-base];
-        f = tree[n].Freq;
-        s->opt_len += (ulg)f * (bits + xbits);
-        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
-    }
-    if (overflow == 0) return;
-
-    Trace((stderr,"\nbit length overflow\n"));
-    /* This happens for example on obj2 and pic of the Calgary corpus */
-
-    /* Find the first bit length which could increase: */
-    do {
-        bits = max_length-1;
-        while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
-        s->bl_count[max_length]--;
-        /* The brother of the overflow item also moves one step up,
-         * but this does not affect bl_count[max_length]
-         */
-        overflow -= 2;
-    } while (overflow > 0);
-
-    /* Now recompute all bit lengths, scanning in increasing frequency.
-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-     * lengths instead of fixing only the wrong ones. This idea is taken
-     * from 'ar' written by Haruhiko Okumura.)
-     */
-    for (bits = max_length; bits != 0; bits--) {
-        n = s->bl_count[bits];
-        while (n != 0) {
-            m = s->heap[--h];
-            if (m > max_code) continue;
-            if ((unsigned) tree[m].Len != (unsigned) bits) {
-                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((long)bits - (long)tree[m].Len)
-                              *(long)tree[m].Freq;
-                tree[m].Len = (ush)bits;
-            }
-            n--;
-        }
-    }
-}
-
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-local void gen_codes (tree, max_code, bl_count)
-    ct_data *tree;             /* the tree to decorate */
-    int max_code;              /* largest code with non zero frequency */
-    ushf *bl_count;            /* number of codes at each bit length */
-{
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    ush code = 0;              /* running code value */
-    int bits;                  /* bit index */
-    int n;                     /* code index */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0) continue;
-        /* Now reverse the bits */
-        tree[n].Code = bi_reverse(next_code[len]++, len);
-
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
-}
-
-/* ===========================================================================
- * Construct one Huffman tree and assigns the code bit strings and lengths.
- * Update the total bit length for the current block.
- * IN assertion: the field freq is set for all tree elements.
- * OUT assertions: the fields len and code are set to the optimal bit length
- *     and corresponding code. The length opt_len is updated; static_len is
- *     also updated if stree is not null. The field max_code is set.
- */
-local void build_tree(s, desc)
-    deflate_state *s;
-    tree_desc *desc; /* the tree descriptor */
-{
-    ct_data *tree         = desc->dyn_tree;
-    const ct_data *stree  = desc->stat_desc->static_tree;
-    int elems             = desc->stat_desc->elems;
-    int n, m;          /* iterate over heap elements */
-    int max_code = -1; /* largest code with non zero frequency */
-    int node;          /* new node being created */
-
-    /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-     * heap[0] is not used.
-     */
-    s->heap_len = 0, s->heap_max = HEAP_SIZE;
-
-    for (n = 0; n < elems; n++) {
-        if (tree[n].Freq != 0) {
-            s->heap[++(s->heap_len)] = max_code = n;
-            s->depth[n] = 0;
-        } else {
-            tree[n].Len = 0;
-        }
-    }
-
-    /* The pkzip format requires that at least one distance code exists,
-     * and that at least one bit should be sent even if there is only one
-     * possible code. So to avoid special checks later on we force at least
-     * two codes of non zero frequency.
-     */
-    while (s->heap_len < 2) {
-        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-        tree[node].Freq = 1;
-        s->depth[node] = 0;
-        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
-        /* node is 0 or 1 so it does not have extra bits */
-    }
-    desc->max_code = max_code;
-
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-     * establish sub-heaps of increasing lengths:
-     */
-    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
-
-    /* Construct the Huffman tree by repeatedly combining the least two
-     * frequent nodes.
-     */
-    node = elems;              /* next internal node of the tree */
-    do {
-        pqremove(s, tree, n);  /* n = node of least frequency */
-        m = s->heap[SMALLEST]; /* m = node of next least frequency */
-
-        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
-        s->heap[--(s->heap_max)] = m;
-
-        /* Create a new node father of n and m */
-        tree[node].Freq = tree[n].Freq + tree[m].Freq;
-        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
-                                s->depth[n] : s->depth[m]) + 1);
-        tree[n].Dad = tree[m].Dad = (ush)node;
-#ifdef DUMP_BL_TREE
-        if (tree == s->bl_tree) {
-            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
-                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
-        }
-#endif
-        /* and insert the new node in the heap */
-        s->heap[SMALLEST] = node++;
-        pqdownheap(s, tree, SMALLEST);
-
-    } while (s->heap_len >= 2);
-
-    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
-
-    /* At this point, the fields freq and dad are set. We can now
-     * generate the bit lengths.
-     */
-    gen_bitlen(s, (tree_desc *)desc);
-
-    /* The field len is now set, we can generate the bit codes */
-    gen_codes ((ct_data *)tree, max_code, s->bl_count);
-}
-
-/* ===========================================================================
- * Scan a literal or distance tree to determine the frequencies of the codes
- * in the bit length tree.
- */
-local void scan_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree;   /* the tree to be scanned */
-    int max_code;    /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            s->bl_tree[curlen].Freq += count;
-        } else if (curlen != 0) {
-            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
-            s->bl_tree[REP_3_6].Freq++;
-        } else if (count <= 10) {
-            s->bl_tree[REPZ_3_10].Freq++;
-        } else {
-            s->bl_tree[REPZ_11_138].Freq++;
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Send a literal or distance tree in compressed form, using the codes in
- * bl_tree.
- */
-local void send_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree; /* the tree to be scanned */
-    int max_code;       /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
-    if (nextlen == 0) max_count = 138, min_count = 3;
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
-
-        } else if (curlen != 0) {
-            if (curlen != prevlen) {
-                send_code(s, curlen, s->bl_tree); count--;
-            }
-            Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
-
-        } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
-
-        } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
-local int build_bl_tree(s)
-    deflate_state *s;
-{
-    int max_blindex;  /* index of last bit length code of non zero freq */
-
-    /* Determine the bit length frequencies for literal and distance trees */
-    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
-    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
-
-    /* Build the bit length tree: */
-    build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-     */
-
-    /* Determine the number of bit length codes to send. The pkzip format
-     * requires that at least 4 bit length codes be sent. (appnote.txt says
-     * 3 but the actual value used is 4.)
-     */
-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
-    }
-    /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*(max_blindex+1) + 5+5+4;
-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-            s->opt_len, s->static_len));
-
-    return max_blindex;
-}
-
-/* ===========================================================================
- * Send the header for a block using dynamic Huffman trees: the counts, the
- * lengths of the bit length codes, the literal tree and the distance tree.
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
- */
-local void send_all_trees(s, lcodes, dcodes, blcodes)
-    deflate_state *s;
-    int lcodes, dcodes, blcodes; /* number of codes for each tree */
-{
-    int rank;                    /* index in bl_order */
-
-    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-            "too many codes");
-    Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
-    for (rank = 0; rank < blcodes; rank++) {
-        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
-    }
-    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
-    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
-    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
-}
-
-/* ===========================================================================
- * Send a stored block
- */
-void _tr_stored_block(s, buf, stored_len, eof)
-    deflate_state *s;
-    charf *buf;       /* input block */
-    ulg stored_len;   /* length of input block */
-    int eof;          /* true if this is the last block for a file */
-{
-    send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
-#ifdef DEBUG
-    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
-    s->compressed_len += (stored_len + 4) << 3;
-#endif
-    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
-}
-
-/* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate.
- * This takes 10 bits, of which 7 may remain in the bit buffer.
- * The current inflate code requires 9 bits of lookahead. If the
- * last two codes for the previous block (real code plus EOB) were coded
- * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
- * the last real code. In this case we send two empty static blocks instead
- * of one. (There are no problems if the previous block is stored or fixed.)
- * To simplify the code, we assume the worst case of last real code encoded
- * on one bit only.
- */
-void _tr_align(s)
-    deflate_state *s;
-{
-    send_bits(s, STATIC_TREES<<1, 3);
-    send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
-#endif
-    bi_flush(s);
-    /* Of the 10 bits for the empty block, we have already sent
-     * (10 - bi_valid) bits. The lookahead for the last real code (before
-     * the EOB of the previous block) was thus at least one plus the length
-     * of the EOB plus what we have just sent of the empty static block.
-     */
-    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
-        send_bits(s, STATIC_TREES<<1, 3);
-        send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-        s->compressed_len += 10L;
-#endif
-        bi_flush(s);
-    }
-    s->last_eob_len = 7;
-}
-
-/* ===========================================================================
- * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
- */
-void _tr_flush_block(s, buf, stored_len, eof)
-    deflate_state *s;
-    charf *buf;       /* input block, or NULL if too old */
-    ulg stored_len;   /* length of input block */
-    int eof;          /* true if this is the last block for a file */
-{
-    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-    int max_blindex = 0;  /* index of last bit length code of non zero freq */
-
-    /* Build the Huffman trees unless a stored block is forced */
-    if (s->level > 0) {
-
-        /* Check if the file is binary or text */
-        if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN)
-            set_data_type(s);
-
-        /* Construct the literal and distance trees */
-        build_tree(s, (tree_desc *)(&(s->l_desc)));
-        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-                s->static_len));
-
-        build_tree(s, (tree_desc *)(&(s->d_desc)));
-        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-                s->static_len));
-        /* At this point, opt_len and static_len are the total bit lengths of
-         * the compressed block data, excluding the tree representations.
-         */
-
-        /* Build the bit length tree for the above two trees, and get the index
-         * in bl_order of the last bit length code to send.
-         */
-        max_blindex = build_bl_tree(s);
-
-        /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7)>>3;
-        static_lenb = (s->static_len+3+7)>>3;
-
-        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-                s->last_lit));
-
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
-
-    } else {
-        Assert(buf != (char*)0, "lost buf");
-        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-    }
-
-#ifdef FORCE_STORED
-    if (buf != (char*)0) { /* force stored block */
-#else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
-                       /* 4: two words for the lengths */
-#endif
-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-         * Otherwise we can't have processed more than WSIZE input bytes since
-         * the last block flush, because compression would have been
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-         * transform a block into a stored block.
-         */
-        _tr_stored_block(s, buf, stored_len, eof);
-
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+eof, 3);
-        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
-#ifdef DEBUG
-        s->compressed_len += 3 + s->static_len;
-#endif
-    } else {
-        send_bits(s, (DYN_TREES<<1)+eof, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
-        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
-#ifdef DEBUG
-        s->compressed_len += 3 + s->opt_len;
-#endif
-    }
-    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
-    /* The above check is made mod 2^32, for files larger than 512 MB
-     * and uLong implemented on 32 bits.
-     */
-    init_block(s);
-
-    if (eof) {
-        bi_windup(s);
-#ifdef DEBUG
-        s->compressed_len += 7;  /* align on byte boundary */
-#endif
-    }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*eof));
-}
-
-/* ===========================================================================
- * Save the match info and tally the frequency counts. Return true if
- * the current block must be flushed.
- */
-int _tr_tally (s, dist, lc)
-    deflate_state *s;
-    unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
-    s->d_buf[s->last_lit] = (ush)dist;
-    s->l_buf[s->last_lit++] = (uch)lc;
-    if (dist == 0) {
-        /* lc is the unmatched char */
-        s->dyn_ltree[lc].Freq++;
-    } else {
-        s->matches++;
-        /* Here, lc is the match length - MIN_MATCH */
-        dist--;             /* dist = match distance - 1 */
-        Assert((ush)dist < (ush)MAX_DIST(s) &&
-               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
-
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-        s->dyn_dtree[d_code(dist)].Freq++;
-    }
-
-#ifdef TRUNCATE_BLOCK
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-    }
-#endif
-    return (s->last_lit == s->lit_bufsize-1);
-    /* We avoid equality with lit_bufsize because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
-}
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-local void compress_block(s, ltree, dtree)
-    deflate_state *s;
-    ct_data *ltree; /* literal tree */
-    ct_data *dtree; /* distance tree */
-{
-    unsigned dist;      /* distance of matched string */
-    int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned lx = 0;    /* running index in l_buf */
-    unsigned code;      /* the code to send */
-    int extra;          /* number of extra bits to send */
-
-    if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
-        if (dist == 0) {
-            send_code(s, lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(s, lc, extra);       /* send the extra length bits */
-            }
-            dist--; /* dist is now the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
-
-            send_code(s, code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
-
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-               "pendingBuf overflow");
-
-    } while (lx < s->last_lit);
-
-    send_code(s, END_BLOCK, ltree);
-    s->last_eob_len = ltree[END_BLOCK].Len;
-}
-
-/* ===========================================================================
- * Set the data type to BINARY or TEXT, using a crude approximation:
- * set it to Z_TEXT if all symbols are either printable characters (33 to 255)
- * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise.
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-local void set_data_type(s)
-    deflate_state *s;
-{
-    int n;
-
-    for (n = 0; n < 9; n++)
-        if (s->dyn_ltree[n].Freq != 0)
-            break;
-    if (n == 9)
-        for (n = 14; n < 32; n++)
-            if (s->dyn_ltree[n].Freq != 0)
-                break;
-    s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY;
-}
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-local unsigned bi_reverse(code, len)
-    unsigned code; /* the value to invert */
-    int len;       /* its bit length */
-{
-    register unsigned res = 0;
-    do {
-        res |= code & 1;
-        code >>= 1, res <<= 1;
-    } while (--len > 0);
-    return res >> 1;
-}
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-local void bi_flush(s)
-    deflate_state *s;
-{
-    if (s->bi_valid == 16) {
-        put_short(s, s->bi_buf);
-        s->bi_buf = 0;
-        s->bi_valid = 0;
-    } else if (s->bi_valid >= 8) {
-        put_byte(s, (Byte)s->bi_buf);
-        s->bi_buf >>= 8;
-        s->bi_valid -= 8;
-    }
-}
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-local void bi_windup(s)
-    deflate_state *s;
-{
-    if (s->bi_valid > 8) {
-        put_short(s, s->bi_buf);
-    } else if (s->bi_valid > 0) {
-        put_byte(s, (Byte)s->bi_buf);
-    }
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
-#endif
-}
-
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-local void copy_block(s, buf, len, header)
-    deflate_state *s;
-    charf    *buf;    /* the input data */
-    unsigned len;     /* its length */
-    int      header;  /* true if block header must be written */
-{
-    bi_windup(s);        /* align on byte boundary */
-    s->last_eob_len = 8; /* enough lookahead for inflate */
-
-    if (header) {
-        put_short(s, (ush)len);
-        put_short(s, (ush)~len);
-#ifdef DEBUG
-        s->bits_sent += 2*16;
-#endif
-    }
-#ifdef DEBUG
-    s->bits_sent += (ulg)len<<3;
-#endif
-    while (len--) {
-        put_byte(s, *buf++);
-    }
-}
diff --git a/dep/src/zlib/trees.h b/dep/src/zlib/trees.h
deleted file mode 100644
index 72facf900..000000000
--- a/dep/src/zlib/trees.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* header created automatically with -DGEN_TREES_H */
-
-local const ct_data static_ltree[L_CODES+2] = {
-{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
-{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
-{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
-{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
-{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
-{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
-{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
-{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
-{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
-{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
-{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
-{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
-{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
-{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
-{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
-{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
-{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
-{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
-{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
-{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
-{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
-{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
-{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
-{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
-{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
-{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
-{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
-{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
-{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
-{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
-{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
-{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
-{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
-{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
-{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
-{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
-{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
-{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
-{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
-{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
-{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
-{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
-{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
-{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
-{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
-{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
-{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
-{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
-{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
-{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
-{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
-{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
-{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
-{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
-{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
-{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
-{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
-{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
-};
-
-local const ct_data static_dtree[D_CODES] = {
-{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
-{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
-{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
-{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
-{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
-{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
-};
-
-const uch _dist_code[DIST_CODE_LEN] = {
- 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
- 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
-10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
-18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
-};
-
-const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
- 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
-13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
-17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
-19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
-22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
-};
-
-local const int base_length[LENGTH_CODES] = {
-0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
-64, 80, 96, 112, 128, 160, 192, 224, 0
-};
-
-local const int base_dist[D_CODES] = {
-    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
-   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
- 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
-};
-
diff --git a/dep/src/zlib/zconf.h b/dep/src/zlib/zconf.h
deleted file mode 100644
index 03a9431c8..000000000
--- a/dep/src/zlib/zconf.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_          z_deflateInit_
-#  define deflate               z_deflate
-#  define deflateEnd            z_deflateEnd
-#  define inflateInit_          z_inflateInit_
-#  define inflate               z_inflate
-#  define inflateEnd            z_inflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateCopy           z_deflateCopy
-#  define deflateReset          z_deflateReset
-#  define deflateParams         z_deflateParams
-#  define deflateBound          z_deflateBound
-#  define deflatePrime          z_deflatePrime
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateCopy           z_inflateCopy
-#  define inflateReset          z_inflateReset
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  define uncompress            z_uncompress
-#  define adler32               z_adler32
-#  define crc32                 z_crc32
-#  define get_crc_table         z_get_crc_table
-#  define zError                z_zError
-
-#  define alloc_func            z_alloc_func
-#  define free_func             z_free_func
-#  define in_func               z_in_func
-#  define out_func              z_out_func
-#  define Byte                  z_Byte
-#  define uInt                  z_uInt
-#  define uLong                 z_uLong
-#  define Bytef                 z_Bytef
-#  define charf                 z_charf
-#  define intf                  z_intf
-#  define uIntf                 z_uIntf
-#  define uLongf                z_uLongf
-#  define voidpf                z_voidpf
-#  define voidp                 z_voidp
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
-#  endif
-#  define z_off_t off_t
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#  ifdef FAR
-#    undef FAR
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(deflateBound,"DEBND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(compressBound,"CMBND")
-#   pragma map(inflate_table,"INTABL")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/dep/src/zlib/zlib.h b/dep/src/zlib/zlib.h
deleted file mode 100644
index 022817927..000000000
--- a/dep/src/zlib/zlib.h
+++ /dev/null
@@ -1,1357 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.3, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
-
-/*
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-     The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-     This library can optionally read and write gzip streams in memory as well.
-
-     The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows. deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumualte before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  the value returned by deflateBound (see below). If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows. inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-  if and when it gets to the next deflate block boundary. When decoding the
-  zlib or gzip format, this will cause inflate() to return immediately after
-  the header and before the first block. When doing a raw inflate, inflate()
-  will go ahead and process the first block, and will return when it gets to
-  the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64
-  if inflate() is currently decoding the last block in the deflate stream,
-  plus 128 if inflate() returned immediately after decoding an end-of-block
-  code or decoding the complete header up to just before the first byte of the
-  deflate stream. The end-of-block will not be indicated until all of the
-  uncompressed data from that block has been written to strm->next_out.  The
-  number of unused bits may in general be greater than seven, except when
-  bit 7 of data_type is set, in which case the number of unused bits will be
-  less than eight.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster approach
-  may be used for the single inflate() call.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call. So the only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below. At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically.  Any information
-  contained in the gzip header is not retained, so applications that need that
-  information should instead use raw inflate, see inflateInit2() below, or
-  inflateBack() and perform their own processing of the gzip header and
-  trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing. If Z_DATA_ERROR is returned, the application may then
-  call inflateSync() to look for a good compression block if a partial recovery
-  of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer). It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
-   determines the window size. deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding. Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper. The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero),
-   no header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding). Filtered data consists mostly of small values with a somewhat
-   random distribution. In this case, the compression algorithm is tuned to
-   compress them better. The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
-   parameter only affects the compression ratio but not the correctness of the
-   compressed output even if it is not set appropriately.  Z_FIXED prevents the
-   use of dynamic Huffman codes, allowing for a simpler decoder for special
-   applications.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front. In addition, the
-   current implementation of deflate will use at most the window size minus
-   262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit()
-   or deflateInit2().  This would be used to allocate an output buffer
-   for deflation in a single pass, and so would be called before deflate().
-*/
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-  is that this function is used to start off the deflate output with the
-  bits leftover from a previous deflate stream when appending to it.  As such,
-  this function can only be used for raw deflate, and must be used before the
-  first deflate() call after a deflateInit2() or deflateReset().  bits must be
-  less than or equal to 16, and that many of the least significant bits of
-  value will be inserted in the output.
-
-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-      If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter. The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used. If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-   determines the window size. inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream. This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values. If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is. Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding. Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
-   a crc32 instead of an adler32.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
-   is set to null if there is no error message.  inflateInit2 does not perform
-   any decompression apart from reading the zlib header if present: this will
-   be done by inflate(). (So next_in and avail_in may be modified, but next_out
-   and avail_out are unchanged.)
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  The application must insure that the
-   dictionary that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
-
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-  that this function is used to start inflating at a bit position in the
-  middle of a byte.  The provided bits will be used before any bytes are used
-  from next_in.  This function should only be used with raw inflate, and
-  should be used before the first inflate() call after inflateInit2() or
-  inflateReset().  bits must be less than or equal to 16, and that many of the
-  least significant bits of value will be inserted in the input.
-
-      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
-   force inflate() to return immediately after header processing is complete
-   and before any actual data is decompressed.
-
-      The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When
-   any of extra, name, or comment are not Z_NULL and the respective field is
-   not present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-      If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
-   be allocated, or Z_VERSION_ERROR if the version of the library does not
-   match the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free
-   the allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects
-   only the raw deflate stream to decompress.  This is different from the
-   normal behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format
-   error in the deflate stream (in which case strm->msg is set to indicate the
-   nature of the error), or Z_STREAM_ERROR if the stream was not properly
-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
-   distinguished using strm->next_in which will be Z_NULL only if in() returned
-   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
-   out() returning non-zero.  (in() will always be called before out(), so
-   strm->next_in is assured to be defined if out() returns non-zero.)  Note
-   that inflateBack() cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least the value returned
-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before
-   a compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
-*/
-
-
-typedef voidp gzFile;
-
-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h", or 'R' for run-length encoding
-   as in "wb1R". (See the description of deflateInit2 for more information
-   about the strategy parameter.)
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
-
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
-
-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy. See the description
-   of deflateInit2 for the meaning of these parameters.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
-                                   voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).  The number of
-   uncompressed bytes written is limited to 4095. The caller should assure that
-   this limit is not exceeded. If it is exceeded, then gzprintf() will return
-   return an error (0) with nothing written. In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
-/*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
-/*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-
-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
-/*
-      Push one character back onto the stream to be read again later.
-   Only one character of push-back is allowed.  gzungetc() returns the
-   character pushed, or -1 on failure.  gzungetc() will fail if a
-   character has been pushed but not read yet, or if c is -1. The pushed
-   character will be discarded if the stream is repositioned with gzseek()
-   or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-                                      z_off_t offset, int whence));
-/*
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-/*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns 1 if file is being read directly without decompression, otherwise
-   zero.
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file. This is analogous to the
-   clearerr() function in stdio. This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-/*
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32. If buf is NULL, this function returns the required initial
-   value for the for the crc. Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-/*
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-        ZLIB_VERSION, sizeof(z_stream))
-
-
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
-#endif
-
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
diff --git a/dep/src/zlib/zutil.c b/dep/src/zlib/zutil.c
deleted file mode 100644
index d55f5948a..000000000
--- a/dep/src/zlib/zutil.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-
-#ifndef NO_DUMMY_DECL
-struct internal_state      {int dummy;}; /* for buggy compilers */
-#endif
-
-const char * const z_errmsg[10] = {
-"need dictionary",     /* Z_NEED_DICT       2  */
-"stream end",          /* Z_STREAM_END      1  */
-"",                    /* Z_OK              0  */
-"file error",          /* Z_ERRNO         (-1) */
-"stream error",        /* Z_STREAM_ERROR  (-2) */
-"data error",          /* Z_DATA_ERROR    (-3) */
-"insufficient memory", /* Z_MEM_ERROR     (-4) */
-"buffer error",        /* Z_BUF_ERROR     (-5) */
-"incompatible version",/* Z_VERSION_ERROR (-6) */
-""};
-
-
-const char * ZEXPORT zlibVersion()
-{
-    return ZLIB_VERSION;
-}
-
-uLong ZEXPORT zlibCompileFlags()
-{
-    uLong flags;
-
-    flags = 0;
-    switch (sizeof(uInt)) {
-    case 2:     break;
-    case 4:     flags += 1;     break;
-    case 8:     flags += 2;     break;
-    default:    flags += 3;
-    }
-    switch (sizeof(uLong)) {
-    case 2:     break;
-    case 4:     flags += 1 << 2;        break;
-    case 8:     flags += 2 << 2;        break;
-    default:    flags += 3 << 2;
-    }
-    switch (sizeof(voidpf)) {
-    case 2:     break;
-    case 4:     flags += 1 << 4;        break;
-    case 8:     flags += 2 << 4;        break;
-    default:    flags += 3 << 4;
-    }
-    switch (sizeof(z_off_t)) {
-    case 2:     break;
-    case 4:     flags += 1 << 6;        break;
-    case 8:     flags += 2 << 6;        break;
-    default:    flags += 3 << 6;
-    }
-#ifdef DEBUG
-    flags += 1 << 8;
-#endif
-#if defined(ASMV) || defined(ASMINF)
-    flags += 1 << 9;
-#endif
-#ifdef ZLIB_WINAPI
-    flags += 1 << 10;
-#endif
-#ifdef BUILDFIXED
-    flags += 1 << 12;
-#endif
-#ifdef DYNAMIC_CRC_TABLE
-    flags += 1 << 13;
-#endif
-#ifdef NO_GZCOMPRESS
-    flags += 1L << 16;
-#endif
-#ifdef NO_GZIP
-    flags += 1L << 17;
-#endif
-#ifdef PKZIP_BUG_WORKAROUND
-    flags += 1L << 20;
-#endif
-#ifdef FASTEST
-    flags += 1L << 21;
-#endif
-#ifdef STDC
-#  ifdef NO_vsnprintf
-        flags += 1L << 25;
-#    ifdef HAS_vsprintf_void
-        flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_vsnprintf_void
-        flags += 1L << 26;
-#    endif
-#  endif
-#else
-        flags += 1L << 24;
-#  ifdef NO_snprintf
-        flags += 1L << 25;
-#    ifdef HAS_sprintf_void
-        flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_snprintf_void
-        flags += 1L << 26;
-#    endif
-#  endif
-#endif
-    return flags;
-}
-
-#ifdef DEBUG
-
-#  ifndef verbose
-#    define verbose 0
-#  endif
-int z_verbose = verbose;
-
-void z_error (m)
-    char *m;
-{
-    fprintf(stderr, "%s\n", m);
-    exit(1);
-}
-#endif
-
-/* exported to allow conversion of error code to string for compress() and
- * uncompress()
- */
-const char * ZEXPORT zError(err)
-    int err;
-{
-    return ERR_MSG(err);
-}
-
-#if defined(_WIN32_WCE)
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
-     * errno.  We define it as a global variable to simplify porting.
-     * Its value is always 0 and should not be used.
-     */
-    int errno = 0;
-#endif
-
-#ifndef HAVE_MEMCPY
-
-void zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = *source++; /* ??? to be unrolled */
-    } while (--len != 0);
-}
-
-int zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
-{
-    uInt j;
-
-    for (j = 0; j < len; j++) {
-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
-    }
-    return 0;
-}
-
-void zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = 0;  /* ??? to be unrolled */
-    } while (--len != 0);
-}
-#endif
-
-
-#ifdef SYS16BIT
-
-#ifdef __TURBOC__
-/* Turbo C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
- * and farmalloc(64K) returns a pointer with an offset of 8, so we
- * must fix the pointer. Warning: the pointer must be put back to its
- * original form in order to free it, use zcfree().
- */
-
-#define MAX_PTR 10
-/* 10*64K = 640K */
-
-local int next_ptr = 0;
-
-typedef struct ptr_table_s {
-    voidpf org_ptr;
-    voidpf new_ptr;
-} ptr_table;
-
-local ptr_table table[MAX_PTR];
-/* This table is used to remember the original form of pointers
- * to large buffers (64K). Such pointers are normalized with a zero offset.
- * Since MSDOS is not a preemptive multitasking OS, this table is not
- * protected from concurrent access. This hack doesn't work anyway on
- * a protected system like OS/2. Use Microsoft C instead.
- */
-
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    voidpf buf = opaque; /* just to make some compilers happy */
-    ulg bsize = (ulg)items*size;
-
-    /* If we allocate less than 65520 bytes, we assume that farmalloc
-     * will return a usable pointer which doesn't have to be normalized.
-     */
-    if (bsize < 65520L) {
-        buf = farmalloc(bsize);
-        if (*(ush*)&buf != 0) return buf;
-    } else {
-        buf = farmalloc(bsize + 16L);
-    }
-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-    table[next_ptr].org_ptr = buf;
-
-    /* Normalize the pointer to seg:0 */
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-    *(ush*)&buf = 0;
-    table[next_ptr++].new_ptr = buf;
-    return buf;
-}
-
-void  zcfree (voidpf opaque, voidpf ptr)
-{
-    int n;
-    if (*(ush*)&ptr != 0) { /* object < 64K */
-        farfree(ptr);
-        return;
-    }
-    /* Find the original pointer */
-    for (n = 0; n < next_ptr; n++) {
-        if (ptr != table[n].new_ptr) continue;
-
-        farfree(table[n].org_ptr);
-        while (++n < next_ptr) {
-            table[n-1] = table[n];
-        }
-        next_ptr--;
-        return;
-    }
-    ptr = opaque; /* just to make some compilers happy */
-    Assert(0, "zcfree: ptr not found");
-}
-
-#endif /* __TURBOC__ */
-
-
-#ifdef M_I86
-/* Microsoft C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
-#  define _halloc  halloc
-#  define _hfree   hfree
-#endif
-
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    return _halloc((long)items, size);
-}
-
-void  zcfree (voidpf opaque, voidpf ptr)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    _hfree(ptr);
-}
-
-#endif /* M_I86 */
-
-#endif /* SYS16BIT */
-
-
-#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-
-#ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern voidp  calloc OF((uInt items, uInt size));
-extern void   free   OF((voidpf ptr));
-#endif
-
-voidpf zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
-{
-    if (opaque) items += size - size; /* make compiler happy */
-    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
-                              (voidpf)calloc(items, size);
-}
-
-void  zcfree (opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
-{
-    free(ptr);
-    if (opaque) return; /* make compiler happy */
-}
-
-#endif /* MY_ZCALLOC */
diff --git a/dep/src/zlib/zutil.h b/dep/src/zlib/zutil.h
deleted file mode 100644
index b7d5eff81..000000000
--- a/dep/src/zlib/zutil.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZUTIL_H
-#define ZUTIL_H
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-#ifdef STDC
-#  ifndef _WIN32_WCE
-#    include <stddef.h>
-#  endif
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-#   ifdef _WIN32_WCE
-      /* The Microsoft C Run-Time Library for Windows CE doesn't have
-       * errno.  We define it as a global variable to simplify porting.
-       * Its value is always 0 and should not be used.  We rename it to
-       * avoid conflict with other libraries that use the same workaround.
-       */
-#     define errno z_errno
-#   endif
-    extern int errno;
-#else
-#  ifndef _WIN32_WCE
-#    include <errno.h>
-#  endif
-#endif
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-typedef unsigned char  uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long  ulg;
-
-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define MIN_MATCH  3
-#define MAX_MATCH  258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-        /* target dependencies */
-
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
-#  define OS_CODE  0x00
-#  if defined(__TURBOC__) || defined(__BORLANDC__)
-#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-       /* Allow compilation with ANSI keywords only enabled */
-       void _Cdecl farfree( void *block );
-       void *_Cdecl farmalloc( unsigned long nbytes );
-#    else
-#      include <alloc.h>
-#    endif
-#  else /* MSC or DJGPP */
-#    include <malloc.h>
-#  endif
-#endif
-
-#ifdef AMIGA
-#  define OS_CODE  0x01
-#endif
-
-#if defined(VAXC) || defined(VMS)
-#  define OS_CODE  0x02
-#  define F_OPEN(name, mode) \
-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#if defined(ATARI) || defined(atarist)
-#  define OS_CODE  0x05
-#endif
-
-#ifdef OS2
-#  define OS_CODE  0x06
-#  ifdef M_I86
-     #include <malloc.h>
-#  endif
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  0x07
-#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#    include <unix.h> /* for fdopen */
-#  else
-#    ifndef fdopen
-#      define fdopen(fd,mode) NULL /* No fdopen() */
-#    endif
-#  endif
-#endif
-
-#ifdef TOPS20
-#  define OS_CODE  0x0a
-#endif
-
-#ifdef WIN32
-#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
-#    define OS_CODE  0x0b
-#  endif
-#endif
-
-#ifdef __50SERIES /* Prime/PRIMOS */
-#  define OS_CODE  0x0f
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600))
-#  if defined(_WIN32_WCE)
-#    define fdopen(fd,mode) NULL /* No fdopen() */
-#    ifndef _PTRDIFF_T_DEFINED
-       typedef int ptrdiff_t;
-#      define _PTRDIFF_T_DEFINED
-#    endif
-#  else
-#    define fdopen(fd,type)  _fdopen(fd,type)
-#  endif
-#endif
-
-        /* common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-#  define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-         /* functions */
-
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-#if defined(__CYGWIN__)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-#ifndef HAVE_VSNPRINTF
-#  ifdef MSDOS
-     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
-        but for now we just assume it doesn't. */
-#    define NO_vsnprintf
-#  endif
-#  ifdef __TURBOC__
-#    define NO_vsnprintf
-#  endif
-#  ifdef WIN32
-     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
-#      define vsnprintf _vsnprintf
-#    endif
-#  endif
-#  ifdef __SASC
-#    define NO_vsnprintf
-#  endif
-#endif
-#ifdef VMS
-#  define NO_vsnprintf
-#endif
-
-#if defined(pyr)
-#  define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
-  * You may have to use the same strategy for Borland C (untested).
-  * The __SC__ check is for Symantec.
-  */
-#  define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-#  define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-#    define zmemcpy _fmemcpy
-#    define zmemcmp _fmemcmp
-#    define zmemzero(dest, len) _fmemset(dest, 0, len)
-#  else
-#    define zmemcpy memcpy
-#    define zmemcmp memcmp
-#    define zmemzero(dest, len) memset(dest, 0, len)
-#  endif
-#else
-   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
-   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
-   extern void zmemzero OF((Bytef* dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef DEBUG
-#  include <stdio.h>
-   extern int z_verbose;
-   extern void z_error    OF((char *m));
-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
-#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
-#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void   zcfree  OF((voidpf opaque, voidpf ptr));
-
-#define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-#endif /* ZUTIL_H */
diff --git a/dep/include/utf8cpp/doc/ReleaseNotes b/dep/utf8cpp/doc/ReleaseNotes
similarity index 100%
rename from dep/include/utf8cpp/doc/ReleaseNotes
rename to dep/utf8cpp/doc/ReleaseNotes
diff --git a/dep/include/utf8cpp/doc/utf8cpp.html b/dep/utf8cpp/doc/utf8cpp.html
similarity index 100%
rename from dep/include/utf8cpp/doc/utf8cpp.html
rename to dep/utf8cpp/doc/utf8cpp.html
diff --git a/dep/include/utf8cpp/utf8.h b/dep/utf8cpp/utf8.h
similarity index 100%
rename from dep/include/utf8cpp/utf8.h
rename to dep/utf8cpp/utf8.h
diff --git a/dep/include/utf8cpp/utf8/checked.h b/dep/utf8cpp/utf8/checked.h
similarity index 100%
rename from dep/include/utf8cpp/utf8/checked.h
rename to dep/utf8cpp/utf8/checked.h
diff --git a/dep/include/utf8cpp/utf8/core.h b/dep/utf8cpp/utf8/core.h
similarity index 100%
rename from dep/include/utf8cpp/utf8/core.h
rename to dep/utf8cpp/utf8/core.h
diff --git a/dep/include/utf8cpp/utf8/unchecked.h b/dep/utf8cpp/utf8/unchecked.h
similarity index 100%
rename from dep/include/utf8cpp/utf8/unchecked.h
rename to dep/utf8cpp/utf8/unchecked.h
diff --git a/dep/src/zlib/CMakeLists.txt b/dep/zlib/CMakeLists.txt
similarity index 96%
rename from dep/src/zlib/CMakeLists.txt
rename to dep/zlib/CMakeLists.txt
index f587b9277..a663883fe 100644
--- a/dep/src/zlib/CMakeLists.txt
+++ b/dep/zlib/CMakeLists.txt
@@ -30,7 +30,7 @@ set(zlib_SRCS
 )
 
 include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
+  "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 
 add_library(zlib STATIC
diff --git a/dep/StormLibOld/src/zlib/adler32.c b/dep/zlib/adler32.c
similarity index 100%
rename from dep/StormLibOld/src/zlib/adler32.c
rename to dep/zlib/adler32.c
diff --git a/dep/src/zlib/compress.c b/dep/zlib/compress.c
similarity index 100%
rename from dep/src/zlib/compress.c
rename to dep/zlib/compress.c
diff --git a/dep/StormLibOld/src/zlib/crc32.c b/dep/zlib/crc32.c
similarity index 100%
rename from dep/StormLibOld/src/zlib/crc32.c
rename to dep/zlib/crc32.c
diff --git a/dep/StormLibOld/src/zlib/crc32.h b/dep/zlib/crc32.h
similarity index 100%
rename from dep/StormLibOld/src/zlib/crc32.h
rename to dep/zlib/crc32.h
diff --git a/dep/StormLibOld/src/zlib/deflate.c b/dep/zlib/deflate.c
similarity index 100%
rename from dep/StormLibOld/src/zlib/deflate.c
rename to dep/zlib/deflate.c
diff --git a/dep/StormLibOld/src/zlib/deflate.h b/dep/zlib/deflate.h
similarity index 100%
rename from dep/StormLibOld/src/zlib/deflate.h
rename to dep/zlib/deflate.h
diff --git a/dep/src/zlib/example.c b/dep/zlib/example.c
similarity index 100%
rename from dep/src/zlib/example.c
rename to dep/zlib/example.c
diff --git a/dep/src/zlib/gzio.c b/dep/zlib/gzio.c
similarity index 99%
rename from dep/src/zlib/gzio.c
rename to dep/zlib/gzio.c
index 7e90f4928..4ed1a3891 100644
--- a/dep/src/zlib/gzio.c
+++ b/dep/zlib/gzio.c
@@ -8,6 +8,7 @@
 /* @(#) $Id$ */
 
 #include <stdio.h>
+#include <errno.h>
 
 #include "zutil.h"
 
diff --git a/dep/src/zlib/infback.c b/dep/zlib/infback.c
similarity index 100%
rename from dep/src/zlib/infback.c
rename to dep/zlib/infback.c
diff --git a/dep/StormLibOld/src/zlib/inffast.c b/dep/zlib/inffast.c
similarity index 100%
rename from dep/StormLibOld/src/zlib/inffast.c
rename to dep/zlib/inffast.c
diff --git a/dep/StormLibOld/src/zlib/inffast.h b/dep/zlib/inffast.h
similarity index 100%
rename from dep/StormLibOld/src/zlib/inffast.h
rename to dep/zlib/inffast.h
diff --git a/dep/StormLibOld/src/zlib/inffixed.h b/dep/zlib/inffixed.h
similarity index 100%
rename from dep/StormLibOld/src/zlib/inffixed.h
rename to dep/zlib/inffixed.h
diff --git a/dep/StormLibOld/src/zlib/inflate.c b/dep/zlib/inflate.c
similarity index 100%
rename from dep/StormLibOld/src/zlib/inflate.c
rename to dep/zlib/inflate.c
diff --git a/dep/StormLibOld/src/zlib/inflate.h b/dep/zlib/inflate.h
similarity index 100%
rename from dep/StormLibOld/src/zlib/inflate.h
rename to dep/zlib/inflate.h
diff --git a/dep/StormLibOld/src/zlib/inftrees.c b/dep/zlib/inftrees.c
similarity index 100%
rename from dep/StormLibOld/src/zlib/inftrees.c
rename to dep/zlib/inftrees.c
diff --git a/dep/StormLibOld/src/zlib/inftrees.h b/dep/zlib/inftrees.h
similarity index 100%
rename from dep/StormLibOld/src/zlib/inftrees.h
rename to dep/zlib/inftrees.h
diff --git a/dep/StormLibOld/src/zlib/trees.c b/dep/zlib/trees.c
similarity index 100%
rename from dep/StormLibOld/src/zlib/trees.c
rename to dep/zlib/trees.c
diff --git a/dep/StormLibOld/src/zlib/trees.h b/dep/zlib/trees.h
similarity index 100%
rename from dep/StormLibOld/src/zlib/trees.h
rename to dep/zlib/trees.h
diff --git a/dep/src/zlib/uncompr.c b/dep/zlib/uncompr.c
similarity index 100%
rename from dep/src/zlib/uncompr.c
rename to dep/zlib/uncompr.c
diff --git a/dep/StormLibOld/src/zlib/zconf.h b/dep/zlib/zconf.h
similarity index 100%
rename from dep/StormLibOld/src/zlib/zconf.h
rename to dep/zlib/zconf.h
diff --git a/dep/StormLibOld/src/zlib/zlib.h b/dep/zlib/zlib.h
similarity index 100%
rename from dep/StormLibOld/src/zlib/zlib.h
rename to dep/zlib/zlib.h
diff --git a/dep/StormLibOld/src/zlib/zutil.c b/dep/zlib/zutil.c
similarity index 100%
rename from dep/StormLibOld/src/zlib/zutil.c
rename to dep/zlib/zutil.c
diff --git a/dep/StormLibOld/src/zlib/zutil.h b/dep/zlib/zutil.h
similarity index 100%
rename from dep/StormLibOld/src/zlib/zutil.h
rename to dep/zlib/zutil.h
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 000000000..8902632ae
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,15 @@
+#Taken from and modified: http://majewsky.wordpress.com/2010/08/14/tip-of-the-day-cmake-and-doxygen/
+# add a target to generate API documentation with Doxygen
+find_package(Doxygen)
+
+if(DOXYGEN_FOUND)
+  set(TOP_SRCDIR ${CMAKE_SOURCE_DIR})
+  set(PACKAGE "MaNGOS Two")
+  
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+  add_custom_target(doc
+    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Generating API documentation with Doxygen" VERBATIM
+  )
+endif(DOXYGEN_FOUND)
diff --git a/src/modules/SD2/docs/License.md b/doc/License.md
similarity index 100%
rename from src/modules/SD2/docs/License.md
rename to doc/License.md
diff --git a/src/modules/SD2/docs/SQL_guide.md b/doc/SD2_SQL_guide.md
similarity index 100%
rename from src/modules/SD2/docs/SQL_guide.md
rename to doc/SD2_SQL_guide.md
diff --git a/src/modules/SD2/docs/Script_Layout.md b/doc/SD2_Script_Layout.md
similarity index 100%
rename from src/modules/SD2/docs/Script_Layout.md
rename to doc/SD2_Script_Layout.md
diff --git a/src/modules/SD2/docs/Text-tables.md b/doc/SD2_Text-tables.md
similarity index 100%
rename from src/modules/SD2/docs/Text-tables.md
rename to doc/SD2_Text-tables.md
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c4a10968b..2c767bb06 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,8 @@
 # MaNGOS is a full featured server for World of Warcraft, supporting
-# the following clients: 1.12.x, 2.4.3, 3.2.5a, 4.2.3 and 5.4.8
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
 #
 # Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
 #
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -18,48 +16,32 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# ***** END GPL LICENSE BLOCK *****
-#
-# World of Warcraft, and all World of Warcraft or Warcraft art, images,
-# and lore are copyrighted by Blizzard Entertainment, Inc.
 
-# Needs to link against mangos_worldd.lib
+# Needs to link against mangos_world.lib
 if(WIN32)
-  link_directories(
-    "${CMAKE_BINARY_DIR}/src/mangosd/${CMAKE_CFG_INTDIR}"
-  )
-  include_directories(
-    "${CMAKE_SOURCE_DIR}/dep/include"
-  )
+  link_directories("${CMAKE_BINARY_DIR}/src/mangosd/${CMAKE_CFG_INTDIR}")
+  include_directories(${CMAKE_SOURCE_DIR}/dep/include)
 endif()
 
-#-----------------------------------------------------------------------------
-# Build the mangos-zero framework library
+# Build the mangos framework library
 add_subdirectory(framework)
 
-#-----------------------------------------------------------------------------
-# Build the mangos-zero shared library
+# Build the mangos shared library
 add_subdirectory(shared)
 
-#-----------------------------------------------------------------------------
-# Build the mangos-zero game library
+# Build the mangos game library
 add_subdirectory(game)
 
-#-----------------------------------------------------------------------------
-# Build the mangos-zero realm authentication server
+# Build the mangos realm authentication server
 add_subdirectory(realmd)
 
-#-----------------------------------------------------------------------------
-# Build the mangos-zero world server
+# Build the mangos world server
 add_subdirectory(mangosd)
 
-#-----------------------------------------------------------------------------
 # Build the selected modules
 add_subdirectory(modules)
 
-#-----------------------------------------------------------------------------
 # If we want the tools for map/vmap/mmap extraction
 if(BUILD_TOOLS)
     add_subdirectory(tools)
-endif()
+endif()
\ No newline at end of file
diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
index 84c62310d..b7222dac2 100644
--- a/src/framework/CMakeLists.txt
+++ b/src/framework/CMakeLists.txt
@@ -1,4 +1,7 @@
-# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+#
+# Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,102 +19,40 @@
 
 set(LIBRARY_NAME framework)
 
-set(SRC_GRP_DYNAMIC
-    Dynamic/FactoryHolder.h
-    Dynamic/ObjectRegistry.h
-)
+file(GLOB SRC_GRP_DYNAMIC Dynamic/*.h)
+source_group("Dynamic" FILES ${SRC_GRP_DYNAMIC})
 
-set(SRC_GRP_GAMESYSTEM
-    GameSystem/Grid.h
-    GameSystem/GridLoader.h
-    GameSystem/GridReference.h
-    GameSystem/GridRefManager.h
-    GameSystem/NGrid.h
-    GameSystem/TypeContainer.h
-    GameSystem/TypeContainerFunctions.h
-    GameSystem/TypeContainerVisitor.h
-)
+file(GLOB SRC_GRP_GAMESYSTEM GameSystem/*.h)
+source_group("GameSystem" FILES ${SRC_GRP_GAMESYSTEM})
 
-set(SRC_GRP_PLATFORM
-    Platform/CompilerDefs.h
-    Platform/Define.h
-)
+file(GLOB SRC_GRP_PLATFORM Platform/*.h)
+source_group("Platform" FILES ${SRC_GRP_PLATFORM})
 
-set(SRC_GRP_POLICIES
-    Policies/CreationPolicy.h
-    Policies/ObjectLifeTime.cpp
-    Policies/ObjectLifeTime.h
-    Policies/Singleton.h
-    Policies/ThreadingModel.h
-)
+file(GLOB SRC_GRP_POLICIES Policies/*.h Policies/*.cpp)
+source_group("Policies" FILES ${SRC_GRP_POLICIES})
 
-set(SRC_GRP_UTIL
-    Utilities/ByteConverter.h
-    Utilities/Callback.h
-    Utilities/EventProcessor.cpp
-    Utilities/EventProcessor.h
-    Utilities/LinkedList.h
-    Utilities/TypeList.h
-    Utilities/UnorderedMapSet.h
-)
+file(GLOB SRC_GRP_UTILITIES Utilities/*.h Utilities/*.cpp)
+source_group("Utilities" FILES ${SRC_GRP_UTILITIES})
 
-set(SRC_GRP_LINKED_REFERENCE
-    Utilities/LinkedReference/Reference.h
-    Utilities/LinkedReference/RefManager.h
-)
+file(GLOB SRC_GRP_LINKED_REFERENCE Utilities/LinkedReference/*.h)
+source_group("Utilities\\LinkedReference" FILES ${SRC_GRP_LINKED_REFERENCE})
 
 set(LIBRARY_SRCS
     ${SRC_GRP_DYNAMIC}
     ${SRC_GRP_GAMESYSTEM}
     ${SRC_GRP_PLATFORM}
     ${SRC_GRP_POLICIES}
-    ${SRC_GRP_UTIL}
-    ${SRC_GRP_LINKED_REFERENCE}
-)
-
-source_group("Dynamic"
-  FILES
-    ${SRC_GRP_DYNAMIC}
-)
-
-source_group("GameSystem"
-  FILES
-    ${SRC_GRP_GAMESYSTEM}
-)
-
-source_group("Platform"
-  FILES
-    ${SRC_GRP_PLATFORM}
-)
-
-source_group("Policies"
-  FILES
-    ${SRC_GRP_POLICIES}
-)
-
-source_group("Utilities"
-  FILES
-    ${SRC_GRP_UTIL}
-)
-
-source_group("Utilities\\LinkedReference"
-  FILES
+    ${SRC_GRP_UTILITIES}
     ${SRC_GRP_LINKED_REFERENCE}
 )
 
 include_directories(
-  "${CMAKE_CURRENT_SOURCE_DIR}"
-  "${ACE_INCLUDE_DIR}"
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${ACE_INCLUDE_DIR}
 )
 
-add_library(${LIBRARY_NAME} STATIC
-  ${LIBRARY_SRCS}
-)
+add_library(${LIBRARY_NAME} STATIC ${LIBRARY_SRCS})
 
 if(NOT ACE_USE_EXTERNAL)
-  add_dependencies(${LIBRARY_NAME} ace)
-endif()
-
-target_link_libraries(${LIBRARY_NAME}
-  ${TBB_LIBRARIES}
-)
+    add_dependencies(${LIBRARY_NAME} ace)
+endif()
\ No newline at end of file
diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h
index 197a571f4..e30ae4ad9 100644
--- a/src/framework/Dynamic/FactoryHolder.h
+++ b/src/framework/Dynamic/FactoryHolder.h
@@ -35,7 +35,7 @@ template < class T, class Key = std::string >
  * @brief FactoryHolder holds a factory object of a specific type
  *
  */
-class MANGOS_DLL_DECL FactoryHolder
+class FactoryHolder
 {
     public:
         /**
diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h
index 3db553edc..f3b66bc20 100644
--- a/src/framework/Dynamic/ObjectRegistry.h
+++ b/src/framework/Dynamic/ObjectRegistry.h
@@ -38,7 +38,7 @@ template < class T, class Key = std::string >
  * @brief ObjectRegistry holds all registry item of the same type
  *
  */
-class MANGOS_DLL_DECL ObjectRegistry
+class ObjectRegistry
 {
     public:
         /**
diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h
index 6ef8be65a..3bbece917 100644
--- a/src/framework/GameSystem/Grid.h
+++ b/src/framework/GameSystem/Grid.h
@@ -49,7 +49,7 @@ class ACTIVE_OBJECT,
  * this is implementation specific to the loader class.  From the
  * Grid's perspective, the loader meets its API requirement is suffice.
  */
-class MANGOS_DLL_DECL Grid
+class Grid
 {
         // allows the GridLoader to access its internals
         template<class A, class T, class O> friend class GridLoader;
diff --git a/src/framework/GameSystem/GridLoader.h b/src/framework/GameSystem/GridLoader.h
index 942ca7550..340986856 100644
--- a/src/framework/GameSystem/GridLoader.h
+++ b/src/framework/GameSystem/GridLoader.h
@@ -45,7 +45,7 @@ class ACTIVE_OBJECT,
  * loader and unloader. GridLoader manages the grid (both local and remote).
  *
  */
-class MANGOS_DLL_DECL GridLoader
+class GridLoader
 {
     public:
 
diff --git a/src/framework/GameSystem/GridReference.h b/src/framework/GameSystem/GridReference.h
index 2498e3f49..f3269761a 100644
--- a/src/framework/GameSystem/GridReference.h
+++ b/src/framework/GameSystem/GridReference.h
@@ -34,7 +34,7 @@ template<class OBJECT>
  * @brief
  *
  */
-class  GridReference : public Reference<GridRefManager<OBJECT>, OBJECT>
+class GridReference : public Reference<GridRefManager<OBJECT>, OBJECT>
 {
     protected:
 
diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h
index 46e28a717..58e6bd800 100644
--- a/src/framework/GameSystem/NGrid.h
+++ b/src/framework/GameSystem/NGrid.h
@@ -143,7 +143,7 @@ uint32 N,
  * @brief
  *
  */
-class MANGOS_DLL_DECL NGrid
+class NGrid
 {
     public:
 
diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h
index 61ec93139..491ebf32f 100644
--- a/src/framework/GameSystem/TypeContainer.h
+++ b/src/framework/GameSystem/TypeContainer.h
@@ -369,7 +369,7 @@ template<class OBJECT_TYPES>
  * objects of different types.
  *
  */
-class MANGOS_DLL_DECL TypeMapContainer
+class TypeMapContainer
 {
     public:
 
diff --git a/src/framework/GameSystem/TypeContainerVisitor.h b/src/framework/GameSystem/TypeContainerVisitor.h
index 82c2e9710..736ff85f6 100644
--- a/src/framework/GameSystem/TypeContainerVisitor.h
+++ b/src/framework/GameSystem/TypeContainerVisitor.h
@@ -103,7 +103,7 @@ template<class VISITOR, class TYPE_CONTAINER>
  * @brief
  *
  */
-class MANGOS_DLL_DECL TypeContainerVisitor
+class TypeContainerVisitor
 {
     public:
 
diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h
index 73acd23e3..67ab08255 100644
--- a/src/framework/Platform/Define.h
+++ b/src/framework/Platform/Define.h
@@ -74,20 +74,6 @@ typedef ACE_SHLIB_HANDLE MANGOS_LIBRARY_HANDLE;
 #  endif //__APPLE_CC__ && BIG_ENDIAN
 #endif // PLATFORM
 
-#if PLATFORM == PLATFORM_WINDOWS
-#  ifdef MANGOS_WIN32_DLL_IMPORT
-#    define MANGOS_DLL_DECL __declspec(dllimport)
-#  else //!MANGOS_WIN32_DLL_IMPORT
-#    ifdef MANGOS_WIND_DLL_EXPORT
-#      define MANGOS_DLL_DECL __declspec(dllexport)
-#    else //!MANGOS_WIND_DLL_EXPORT
-#      define MANGOS_DLL_DECL
-#    endif // MANGOS_WIND_DLL_EXPORT
-#  endif // MANGOS_WIN32_DLL_IMPORT
-#else // PLATFORM != PLATFORM_WINDOWS
-#  define MANGOS_DLL_DECL
-#endif // PLATFORM
-
 #if PLATFORM == PLATFORM_WINDOWS
 #  define MANGOS_DLL_SPEC __declspec(dllexport)
 #  ifndef DECLSPEC_NORETURN
@@ -205,19 +191,4 @@ typedef uint32      DWORD;
  */
 typedef uint64 OBJECT_HANDLE;
 
-enum FieldFormat
-{
-    FT_NA = 'x',                                            // ignore/ default, 4 byte size, in Source String means field is ignored, in Dest String means field is filled with default value
-    FT_NA_BYTE = 'X',                                       // ignore/ default, 1 byte size, see above
-    FT_NA_FLOAT = 'F',                                      // ignore/ default,  float size, see above
-    FT_NA_POINTER = 'p',                                    // fill default value into dest, pointer size, Use this only with static data (otherwise mem-leak)
-    FT_STRING = 's',                                        // char*
-    FT_FLOAT = 'f',                                         // float
-    FT_INT = 'i',                                           // uint32
-    FT_BYTE = 'b',                                          // uint8
-    FT_SORT = 'd',                                          // sorted by this field, field is not included
-    FT_IND = 'n',                                           // the same,but parsed to data
-    FT_LOGIC = 'l'                                          // Logical (boolean)
-};
-
 #endif // MANGOS_DEFINE_H
diff --git a/src/framework/Policies/CreationPolicy.h b/src/framework/Policies/CreationPolicy.h
index f685d9233..3d6b2834e 100644
--- a/src/framework/Policies/CreationPolicy.h
+++ b/src/framework/Policies/CreationPolicy.h
@@ -35,7 +35,7 @@ namespace MaNGOS
      * @brief OperatorNew policy creates an object on the heap using new.
      *
      */
-    class MANGOS_DLL_DECL OperatorNew
+    class  OperatorNew
     {
         public:
 
@@ -65,7 +65,7 @@ namespace MaNGOS
      * @brief LocalStaticCreation policy creates an object on the stack the first time call Create.
      *
      */
-    class MANGOS_DLL_DECL LocalStaticCreation
+    class  LocalStaticCreation
     {
             /**
              * @brief
@@ -123,7 +123,7 @@ namespace MaNGOS
      * @brief
      *
      */
-    class MANGOS_DLL_DECL CreateUsingMalloc
+    class  CreateUsingMalloc
     {
         public:
 
@@ -159,7 +159,7 @@ namespace MaNGOS
      * @brief CreateOnCallBack creates the object base on the call back.
      *
      */
-    class MANGOS_DLL_DECL CreateOnCallBack
+    class  CreateOnCallBack
     {
         public:
             /**
diff --git a/src/framework/Policies/ObjectLifeTime.h b/src/framework/Policies/ObjectLifeTime.h
index d2ee0d13e..ddd3e3ce7 100644
--- a/src/framework/Policies/ObjectLifeTime.h
+++ b/src/framework/Policies/ObjectLifeTime.h
@@ -48,7 +48,7 @@ namespace MaNGOS
      * @brief
      *
      */
-    class MANGOS_DLL_DECL ObjectLifeTime
+    class  ObjectLifeTime
     {
         public:
 
diff --git a/src/framework/Policies/Singleton.h b/src/framework/Policies/Singleton.h
index 6b8fd145a..9dbd72684 100644
--- a/src/framework/Policies/Singleton.h
+++ b/src/framework/Policies/Singleton.h
@@ -46,7 +46,7 @@ namespace MaNGOS
      * @brief
      *
      */
-    class MANGOS_DLL_DECL Singleton
+    class  Singleton
     {
         public:
 
@@ -147,15 +147,15 @@ namespace MaNGOS
 }
 
 #define INSTANTIATE_SINGLETON_1(TYPE) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
+    template class  MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
 
 #define INSTANTIATE_SINGLETON_2(TYPE, THREADINGMODEL) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
+    template class  MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
 
 #define INSTANTIATE_SINGLETON_3(TYPE, THREADINGMODEL, CREATIONPOLICY ) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeTime<TYPE> >;
+    template class  MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeTime<TYPE> >;
 
 #define INSTANTIATE_SINGLETON_4(TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >;
+    template class  MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >;
 
 #endif
diff --git a/src/framework/Policies/ThreadingModel.h b/src/framework/Policies/ThreadingModel.h
index 00f766228..0db438c21 100644
--- a/src/framework/Policies/ThreadingModel.h
+++ b/src/framework/Policies/ThreadingModel.h
@@ -39,7 +39,7 @@ namespace MaNGOS
      * @brief
      *
      */
-    class MANGOS_DLL_DECL GeneralLock
+    class  GeneralLock
     {
         public:
 
@@ -86,7 +86,7 @@ namespace MaNGOS
      * @brief
      *
      */
-    class MANGOS_DLL_DECL SingleThreaded
+    class  SingleThreaded
     {
         public:
 
@@ -128,7 +128,7 @@ namespace MaNGOS
      * @brief
      *
      */
-    class MANGOS_DLL_DECL ObjectLevelLockable
+    class  ObjectLevelLockable
     {
         public:
 
@@ -193,7 +193,7 @@ namespace MaNGOS
      * @brief
      *
      */
-    class MANGOS_DLL_DECL ClassLevelLockable
+    class  ClassLevelLockable
     {
         public:
 
@@ -265,6 +265,6 @@ namespace MaNGOS
 template<class T, class MUTEX> MUTEX MaNGOS::ClassLevelLockable<T, MUTEX>::si_mtx; /**< TODO */
 
 #define INSTANTIATE_CLASS_MUTEX(CTYPE, MUTEX) \
-    template class MANGOS_DLL_DECL MaNGOS::ClassLevelLockable<CTYPE, MUTEX>
+    template class  MaNGOS::ClassLevelLockable<CTYPE, MUTEX>
 
 #endif
diff --git a/src/framework/Utilities/UnorderedMapSet.h b/src/framework/Utilities/UnorderedMapSet.h
index 77f6399c0..ba4cba3df 100644
--- a/src/framework/Utilities/UnorderedMapSet.h
+++ b/src/framework/Utilities/UnorderedMapSet.h
@@ -70,7 +70,6 @@ using std::hash_set;
 #  define UNORDERED_SET stdext::hash_set
 #  define HASH_NAMESPACE_START namespace stdext {
 #  define HASH_NAMESPACE_END }
-
 using stdext::hash_map;
 using stdext::hash_set;
 
@@ -97,14 +96,14 @@ HASH_NAMESPACE_END
 #  define HASH_NAMESPACE_END }
 using std::hash_map;
 using std::hash_set;
-#elif COMPILER == COMPILER_CLANG && __clang_major__ <= 3 && __clang_minor < 7
-#  define UNORDERED_MAP std::tr1::unordered_map
-#  define UNORDERED_SET std::tr1::unordered_set
-#  define HASH_NAMESPACE_START namespace std { namespace tr1 {
-#  define HASH_NAMESPACE_END } }
-#elif COMPILER == COMPILER_CLANG && (__clang_major__ > 3 || __clang_major__ == 3 && __clang_minor >= 7)
+#elif COMPILER == COMPILER_CLANG && defined(__FreeBSD__)
 #  define UNORDERED_MAP std::unordered_map
 #  define UNORDERED_SET std::unordered_set
+#  define HASH_NAMESPACE_START namespace std { namespace __1 {
+#  define HASH_NAMESPACE_END } }
+#elif COMPILER == COMPILER_CLANG
+#  define UNORDERED_MAP std::tr1::unordered_map
+#  define UNORDERED_SET std::tr1::unordered_set
 #  define HASH_NAMESPACE_START namespace std { namespace tr1 {
 #  define HASH_NAMESPACE_END } }
 #elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
index 0fe470894..27ab4e417 100644
--- a/src/game/AuctionHouseBot/AuctionHouseBot.cpp
+++ b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
@@ -30,8 +30,16 @@
 #include "SystemConfig.h"
 #include "SQLStorages.h"
 
-// Format is YYYYMMDDRR where RR is the change in the conf file
-// for that day.
+/** \addtogroup auctionbot
+ * @{
+ * \file
+ */
+
+
+/**
+ * Format is YYYYMMDDRR where RR is the change in the conf file
+ * for that day.
+ */
 #define AUCTIONHOUSEBOT_CONF_VERSION    2010102201
 
 #include "Policies/Singleton.h"
@@ -135,11 +143,11 @@ class AHB_Seller_Config
         uint32 GetMinTime() const
         {
             if (m_minTime < 1)
-                return 1;
+                { return 1; }
             else if ((m_maxTime) && (m_minTime > m_maxTime))
-                return m_maxTime;
+                { return m_maxTime; }
             else
-                return m_minTime;
+                { return m_minTime; }
         }
 
         void        SetMaxTime(uint32 value) { m_maxTime = value; }
@@ -152,9 +160,9 @@ class AHB_Seller_Config
         void        SetMissedItemsPerClass(AuctionQuality quality, ItemClass itemclass, uint32 found)
         {
             if (m_ItemInfo[quality].ItemClassInfos[itemclass].AmountOfItems > found)
-                m_ItemInfo[quality].ItemClassInfos[itemclass].MissItems = m_ItemInfo[quality].ItemClassInfos[itemclass].AmountOfItems - found;
+                { m_ItemInfo[quality].ItemClassInfos[itemclass].MissItems = m_ItemInfo[quality].ItemClassInfos[itemclass].AmountOfItems - found; }
             else
-                m_ItemInfo[quality].ItemClassInfos[itemclass].MissItems = 0;
+                { m_ItemInfo[quality].ItemClassInfos[itemclass].MissItems = 0; }
         }
         uint32      GetMissedItemsPerClass(AuctionQuality quality, ItemClass itemclass) const { return m_ItemInfo[quality].ItemClassInfos[itemclass].MissItems; }
 
@@ -171,8 +179,12 @@ class AHB_Seller_Config
         SellerItemInfo m_ItemInfo[MAX_AUCTION_QUALITY];
 };
 
-// This class handle all Buyer method
-// (holder of AuctionBotConfig for each auction house type)
+/**
+ * This class handle all Buyer method
+ * (holder of AuctionBotConfig for each auction house type)
+ * (Taken from comments in file)
+ * \todo Perhaps a better description of the class?
+ */
 class AuctionBotBuyer : public AuctionBotAgent
 {
     public:
@@ -180,42 +192,149 @@ class AuctionBotBuyer : public AuctionBotAgent
         ~AuctionBotBuyer();
 
         bool        Initialize() override;
+        /**
+         * Updates the specified house type. Will buy items if there are any that match certain
+         * criteria.
+         * @param houseType Type of the house.
+         * @return true if the update was successful, false otherwise
+         */
         bool        Update(AuctionHouseType houseType) override;
 
         void        LoadConfig();
+        /**
+         * Adds the new auction buyer bot bid.
+         * @param config The config.
+         */
         void        addNewAuctionBuyerBotBid(AHB_Buyer_Config& config);
 
     private:
         uint32              m_CheckInterval;
         AHB_Buyer_Config    m_HouseConfig[MAX_AUCTION_HOUSE_TYPE];
 
+        /**
+         * Loads the buyer values.
+         * @param config The config.
+         */
         void        LoadBuyerValues(AHB_Buyer_Config& config);
+        /**
+         * Determines whether [is buyable entry] [the specified buyout price].
+         *
+         * @param buyoutPrice The buyout price.
+         * @param InGame_BuyPrice The in game_ buy price.
+         * @param MaxBuyablePrice The max buyable price.
+         * @param MinBuyPrice The min buy price.
+         * @param MaxChance The max chance.
+         * @param ChanceRatio The chance ratio.
+         * @return true if the entry is buyable, false otherwise
+         */
         bool        IsBuyableEntry(uint64 buyoutPrice, double InGame_BuyPrice, double MaxBuyablePrice, uint64 MinBuyPrice, uint32 MaxChance, uint32 ChanceRatio);
+        /**
+         * Determines whether [is bidable entry] [the specified bid price].
+         *
+         * @param bidPrice The bid price.
+         * @param InGame_BuyPrice The in game_ buy price.
+         * @param MaxBidablePrice The max bidable price.
+         * @param MinBidPrice The min bid price.
+         * @param MaxChance The max chance.
+         * @param ChanceRatio The chance ratio.
+         * @return true if the bot can bid on this entry, false otherwise
+         */
         bool        IsBidableEntry(uint64 bidPrice, double InGame_BuyPrice, double MaxBidablePrice, uint64 MinBidPrice, uint32 MaxChance, uint32 ChanceRatio);
+        /**
+         * Places the bid to entry.
+         *
+         * @param auction The auction.
+         * @param bidPrice The bid price.
+         */
         void        PlaceBidToEntry(AuctionEntry* auction, uint64 bidPrice);
+        /**
+         * Buys the entry.
+         *
+         * @param auction The auction.
+         */
         void        BuyEntry(AuctionEntry* auction);
+        /**
+         * Prepares the list of entry.
+         *
+         * @param config The config.
+         */
         void        PrepareListOfEntry(AHB_Buyer_Config& config);
+        /**
+         * Gets the buyable entry.
+         *
+         * @param config The config.
+         * <returns></returns
+         */
         uint32      GetBuyableEntry(AHB_Buyer_Config& config);
 };
 
-// This class handle all Selling method
-// (holder of AHB_Seller_Config data for each auction house type)
+/**
+ * This class handle all Selling method
+ * (holder of AHB_Seller_Config data for each auction house type)
+ * (Taken from comments in file)
+ * \todo Maybe improve the description of this class
+ */
 class AuctionBotSeller : public AuctionBotAgent
 {
     public:
         typedef std::vector<uint32> ItemPool;
-
+        /**
+         * Initializes a new instance of the \ref AuctionBotSeller class.
+         */
         AuctionBotSeller();
+        /**
+         * Finalizes an instance of the \ref AuctionBotSeller class.
+         */
         ~AuctionBotSeller();
 
+        /**
+         * Initializes this instance.
+         */
         bool Initialize() override;
+        /**
+         * Updates the specified house type by possibly putting up new items for
+         * sale if there's a need for it.
+         * @param houseType Type of the house.
+         */
         bool Update(AuctionHouseType houseType) override;
-
+        /**
+         * Add new auction to one of the factions.
+         * Faction and setting associated is passed with the config
+         * @param config The config to use for adding the auctions
+         */
         void addNewAuctions(AHB_Seller_Config& config);
+        /**
+         * Sets the items ratio. This should be a value betweeen 0 and 10000 which
+         * probably represents 0-100%
+         * @param al The alliance item amount/ratio
+         * @param ho The horde item amount/ratio
+         * @param ne The neutral item amount/ratio
+         */
         void SetItemsRatio(uint32 al, uint32 ho, uint32 ne);
+        /**
+         * Sets the items ratio for a specific house. Works as \ref AuctionBotSeller::SetItemsRatio
+         * but only changes the value for one house instead.
+         * @param house The house to change the ratio for
+         * @param val The new ratio
+         */
         void SetItemsRatioForHouse(AuctionHouseType house, uint32 val);
+        /**
+         * Changes how many items of each item quality should be available.
+         * @param vals Array of size \ref MAX_AUCTION_QUALITY telling the amount of each item to be available on the AH.
+         * @see AuctionQuality
+         */
         void SetItemsAmount(uint32(&vals) [MAX_AUCTION_QUALITY]);
+        /**
+         * Changes how many items of a certain quality should be available. Works as
+         * \ref AuctionBotSeller::SetItemsAmount but for one of the qualities instead
+         * of all.
+         * @param quality The quality to change
+         * @param val How many of this item quality that should be available on AH
+         */
         void SetItemsAmountForQuality(AuctionQuality quality, uint32 val);
+        /**
+         * Loads the config.
+         */
         void LoadConfig();
 
     private:
@@ -223,10 +342,44 @@ class AuctionBotSeller : public AuctionBotAgent
 
         ItemPool m_ItemPool[MAX_AUCTION_QUALITY][MAX_ITEM_CLASS];
 
+        /**
+         * Loads the seller values
+         * @param config The config.
+         */
         void        LoadSellerValues(AHB_Seller_Config& config);
+        /**
+         * Set static of items on one AH faction.
+         * Fill ItemInfos object with real content of AH.
+         *
+         * @param config The config.
+         * @return
+         */
         uint32      SetStat(AHB_Seller_Config& config);
+        /**
+         * getRandomArray is used to make available the possibility to
+         * add any of missed item in place of first one to last one.
+         *
+         * @param config The config.
+         * @param ra The ra.
+         * @param addedItem The added item.
+         */
         bool        getRandomArray(AHB_Seller_Config& config, RandomArray& ra, const std::vector<std::vector<uint32> >& addedItem);
+        /**
+         * Set items price. All important value are passed by address.
+         *
+         * @param itemProto The item proto.
+         * @param config The config.
+         * @param buyp The buyp.
+         * @param bidp The bidp.
+         * @param stackcnt The stackcnt.
+         * @param itemQuality The item quality.
+         */
         void        SetPricesOfItem(ItemPrototype const* itemProto, AHB_Seller_Config& config, uint64& buyp, uint64& bidp, uint32 stackcnt, ItemQualities itemQuality);
+        /**
+         * Loads the items quantity.
+         *
+         * @param config The config.
+         */
         void        LoadItemsQuantity(AHB_Seller_Config& config);
 };
 
@@ -243,14 +396,14 @@ bool AuctionBotConfig::Initialize()
 {
     if (!m_AhBotCfg.SetSource(m_configFileName.c_str()))
     {
-        sLog.outString("AHBOT is Disabled. Unable to open configuration file(%s). ", m_configFileName.c_str());
+        sLog.outString("AHBOT is Disabled. Unable to open configuration file %s. ", m_configFileName.c_str());
         setConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO, 0);
         setConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO, 0);
         setConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO, 0);
         return false;
     }
     else
-        sLog.outString("AHBot using configuration file %s", m_configFileName.c_str());
+        { sLog.outString("AHBot using configuration file %s", m_configFileName.c_str()); }
 
     GetConfigFromFile();
 
@@ -261,16 +414,16 @@ bool AuctionBotConfig::Initialize()
     }
 
     if ((getConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO) == 0) && (getConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO) == 0) && (getConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO) == 0) &&
-            !getConfig(CONFIG_BOOL_AHBOT_BUYER_ALLIANCE_ENABLED) && !getConfig(CONFIG_BOOL_AHBOT_BUYER_HORDE_ENABLED) && !getConfig(CONFIG_BOOL_AHBOT_BUYER_NEUTRAL_ENABLED))
+        !getConfig(CONFIG_BOOL_AHBOT_BUYER_ALLIANCE_ENABLED) && !getConfig(CONFIG_BOOL_AHBOT_BUYER_HORDE_ENABLED) && !getConfig(CONFIG_BOOL_AHBOT_BUYER_NEUTRAL_ENABLED))
     {
         sLog.outString("All feature of AuctionHouseBot are disabled! (If you want to use it please set config in 'ahbot.conf')");
         return false;
     }
     if ((getConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO) == 0) && (getConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO) == 0) && (getConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO) == 0))
-        sLog.outString("AuctionHouseBot SELLER is disabled! (If you want to use it please set config in 'ahbot.conf')");
+        { sLog.outString("AuctionHouseBot SELLER is disabled! (If you want to use it please set config in 'ahbot.conf')"); }
 
     if (!getConfig(CONFIG_BOOL_AHBOT_BUYER_ALLIANCE_ENABLED) && !getConfig(CONFIG_BOOL_AHBOT_BUYER_HORDE_ENABLED) && !getConfig(CONFIG_BOOL_AHBOT_BUYER_NEUTRAL_ENABLED))
-        sLog.outString("AuctionHouseBot BUYER is disabled! (If you want to use it please set config in 'ahbot.conf')");
+        { sLog.outString("AuctionHouseBot BUYER is disabled! (If you want to use it please set config in 'ahbot.conf')"); }
 
     m_ItemsPerCycleBoost = getConfig(CONFIG_UINT32_AHBOT_ITEMS_PER_CYCLE_BOOST);
     m_ItemsPerCycleNormal = getConfig(CONFIG_UINT32_AHBOT_ITEMS_PER_CYCLE_NORMAL);
@@ -322,7 +475,7 @@ void AuctionBotConfig::GetConfigFromFile()
 {
     // Check config file version
     if (m_AhBotCfg.GetIntDefault("ConfVersion", 0) != AUCTIONHOUSEBOT_CONF_VERSION)
-        sLog.outError("AHBot: Configuration file version doesn't match expected version. Some config variables may be wrong or missing.");
+        { sLog.outError("AHBot: Configuration file version doesn't match expected version. Some config variables may be wrong or missing."); }
 
     setConfigMax(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO , "AuctionHouseBot.Alliance.Items.Amount.Ratio" , 100, 10000);
     setConfigMax(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO    , "AuctionHouseBot.Horde.Items.Amount.Ratio"    , 100, 10000);
@@ -476,7 +629,7 @@ AuctionBotBuyer::AuctionBotBuyer()
 {
     // Define faction for our main data class.
     for (int i = 0; i < MAX_AUCTION_HOUSE_TYPE; ++i)
-        m_HouseConfig[i].Initialize(AuctionHouseType(i));
+        { m_HouseConfig[i].Initialize(AuctionHouseType(i)); }
 }
 
 AuctionBotBuyer::~AuctionBotBuyer()
@@ -497,7 +650,7 @@ bool AuctionBotBuyer::Initialize()
         }
     }
     if (!active_house)
-        return false;
+        { return false; }
 
     // load Check interval
     m_CheckInterval = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_BUYER_RECHECK_INTERVAL) * MINUTE;
@@ -533,7 +686,7 @@ void AuctionBotBuyer::LoadConfig()
     {
         m_HouseConfig[i].BuyerEnabled = sAuctionBotConfig.getConfigBuyerEnabled(AuctionHouseType(i));
         if (m_HouseConfig[i].BuyerEnabled)
-            LoadBuyerValues(m_HouseConfig[i]);
+            { LoadBuyerValues(m_HouseConfig[i]); }
     }
 }
 
@@ -611,9 +764,9 @@ void AuctionBotBuyer::PrepareListOfEntry(AHB_Buyer_Config& config)
     for (CheckEntryMap::iterator itr = config.CheckedEntry.begin(); itr != config.CheckedEntry.end();)
     {
         if (itr->second.LastExist  < (Now - 5))
-            config.CheckedEntry.erase(itr++);
+            { config.CheckedEntry.erase(itr++); }
         else
-            ++itr;
+            { ++itr; }
     }
 
     DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: CheckedEntry size = " SIZEFMTD, config.CheckedEntry.size());
@@ -627,45 +780,45 @@ bool AuctionBotBuyer::IsBuyableEntry(uint64 buyoutPrice, double InGame_BuyPrice,
     if (buyoutPrice <= MinBuyPrice)
     {
         if (buyoutPrice <= MaxBuyablePrice)
-            Chance = MaxChance;
+            { Chance = MaxChance; }
         else
         {
             if ((buyoutPrice > 0) && (MaxBuyablePrice > 0))
             {
                 ratio = buyoutPrice / MaxBuyablePrice;
                 if (ratio < 10)
-                    Chance = MaxChance - (ratio * (MaxChance / 10));
-                else Chance = 1;
+                    { Chance = MaxChance - (ratio * (MaxChance / 10)); }
+                else { Chance = 1; }
             }
         }
     }
     else if (buyoutPrice <= InGame_BuyPrice)
     {
         if (buyoutPrice <= MaxBuyablePrice)
-            Chance = MaxChance / 5;
+            { Chance = MaxChance / 5; }
         else
         {
             if ((buyoutPrice > 0) && (MaxBuyablePrice > 0))
             {
                 ratio = buyoutPrice / MaxBuyablePrice;
                 if (ratio < 10)
-                    Chance = (MaxChance / 5) - (ratio * (MaxChance / 50));
-                else Chance = 1;
+                    { Chance = (MaxChance / 5) - (ratio * (MaxChance / 50)); }
+                else { Chance = 1; }
             }
         }
     }
     else if (buyoutPrice <= MaxBuyablePrice)
-        Chance = MaxChance / 10;
+        { Chance = MaxChance / 10; }
     else
     {
         if ((buyoutPrice > 0) && (MaxBuyablePrice > 0))
         {
             ratio = buyoutPrice / MaxBuyablePrice;
             if (ratio < 10)
-                Chance = (MaxChance / 5) - (ratio * (MaxChance / 50));
-            else Chance = 0;
+                { Chance = (MaxChance / 5) - (ratio * (MaxChance / 50)); }
+            else { Chance = 0; }
         }
-        else Chance = 0;
+        else { Chance = 0; }
     }
     uint32 RandNum = urand(1, ChanceRatio);
     if (RandNum <= Chance)
@@ -688,30 +841,30 @@ bool AuctionBotBuyer::IsBidableEntry(uint64 bidPrice, double InGame_BuyPrice, do
     if (bidPrice <= MinBidPrice)
     {
         if ((InGame_BuyPrice != 0) && (bidPrice < (InGame_BuyPrice - (InGame_BuyPrice / 30))))
-            Chance = MaxChance;
+            { Chance = MaxChance; }
         else
         {
             if (bidPrice < MaxBidablePrice)
             {
                 ratio = MaxBidablePrice / bidPrice;
                 if (ratio < 3)
-                    Chance = ((MaxChance / 500) * ratio);
+                    { Chance = ((MaxChance / 500) * ratio); }
                 else
-                    Chance = (MaxChance / 500);
+                    { Chance = (MaxChance / 500); }
             }
         }
     }
     else if (bidPrice < (InGame_BuyPrice - (InGame_BuyPrice / 30)))
-        Chance = (MaxChance / 10);
+        { Chance = (MaxChance / 10); }
     else
     {
         if (bidPrice < MaxBidablePrice)
         {
             ratio = MaxBidablePrice / bidPrice;
             if (ratio < 4)
-                Chance = ((MaxChance / 1000) * ratio);
+                { Chance = ((MaxChance / 1000) * ratio); }
             else
-                Chance = (MaxChance / 1000);
+                { Chance = (MaxChance / 1000); }
         }
     }
     uint32 RandNum = urand(1, ChanceRatio);
@@ -753,7 +906,7 @@ void AuctionBotBuyer::addNewAuctionBuyerBotBid(AHB_Buyer_Config& config)
         BASIC_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: Boost value used for Buyer! (if this happens often adjust both ItemsPerCycle in ahbot.conf)");
     }
     else
-        BuyCycles = sAuctionBotConfig.GetItemPerCycleNormal();
+        { BuyCycles = sAuctionBotConfig.GetItemPerCycleNormal(); }
 
     for (CheckEntryMap::iterator itr = config.CheckedEntry.begin(); itr != config.CheckedEntry.end();)
     {
@@ -775,7 +928,7 @@ void AuctionBotBuyer::addNewAuctionBuyerBotBid(AHB_Buyer_Config& config)
         }
 
         if (BuyCycles == 0)
-            break;
+            { break; }
 
         uint32 MaxChance = 5000;
 
@@ -842,17 +995,17 @@ void AuctionBotBuyer::addNewAuctionBuyerBotBid(AHB_Buyer_Config& config)
                 if (IsBidableEntry(bidPriceByItem, InGame_BuyPrice, MaxBidablePrice, sameitem_itr->second.MinBidPrice, MaxChance / 2, config.FactionChance))
                         if (urand(0, 5) == 0) PlaceBidToEntry(auction, bidPrice); else BuyEntry(auction);
                 else
-                    BuyEntry(auction);
+                    { BuyEntry(auction); }
             }
             else
             {
                 if (IsBidableEntry(bidPriceByItem, InGame_BuyPrice, MaxBidablePrice, sameitem_itr->second.MinBidPrice, MaxChance / 2, config.FactionChance))
-                    PlaceBidToEntry(auction, bidPrice);
+                    { PlaceBidToEntry(auction, bidPrice); }
             }
         }
         else // buyout = 0 mean only bid are possible
             if (IsBidableEntry(bidPriceByItem, InGame_BuyPrice, MaxBidablePrice, sameitem_itr->second.MinBidPrice, MaxChance, config.FactionChance))
-                PlaceBidToEntry(auction, bidPrice);
+                { PlaceBidToEntry(auction, bidPrice); }
 
         itr->second.LastChecked = Now;
         --BuyCycles;
@@ -867,10 +1020,10 @@ bool AuctionBotBuyer::Update(AuctionHouseType houseType)
     {
         DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: %s buying ...", AuctionBotConfig::GetHouseTypeName(houseType));
         if (GetBuyableEntry(m_HouseConfig[houseType]) > 0)
-            addNewAuctionBuyerBotBid(m_HouseConfig[houseType]);
+            { addNewAuctionBuyerBotBid(m_HouseConfig[houseType]); }
         return true;
     }
-    else return false;
+    else { return false; }
 }
 
 //== AuctionBotSeller functions ============================
@@ -879,7 +1032,7 @@ AuctionBotSeller::AuctionBotSeller()
 {
     // Define faction for our main data class.
     for (int i = 0; i < MAX_AUCTION_HOUSE_TYPE; ++i)
-        m_HouseConfig[i].Initialize(AuctionHouseType(i));
+        { m_HouseConfig[i].Initialize(AuctionHouseType(i)); }
 }
 
 AuctionBotSeller::~AuctionBotSeller()
@@ -900,14 +1053,14 @@ bool AuctionBotSeller::Initialize()
         std::stringstream includeStream(sAuctionBotConfig.GetAHBotIncludes());
         std::string temp;
         while (getline(includeStream, temp, ','))
-            includeItems.push_back(atoi(temp.c_str()));
+            { includeItems.push_back(atoi(temp.c_str())); }
     }
 
     {
         std::stringstream excludeStream(sAuctionBotConfig.GetAHBotExcludes());
         std::string temp;
         while (getline(excludeStream, temp, ','))
-            excludeItems.push_back(atoi(temp.c_str()));
+            { excludeItems.push_back(atoi(temp.c_str())); }
     }
     sLog.outString("Forced Inclusion " SIZEFMTD " items", includeItems.size());
     sLog.outString("Forced Exclusion " SIZEFMTD " items", excludeItems.size());
@@ -955,7 +1108,7 @@ bool AuctionBotSeller::Initialize()
 
             uint32 entry = fields[0].GetUInt32();
             if (!entry)
-                continue;
+                { continue; }
 
             lootItems.push_back(fields[0].GetUInt32());
         }
@@ -982,25 +1135,25 @@ bool AuctionBotSeller::Initialize()
         bar.step();
 
         if (!prototype)
-            continue;
+            { continue; }
 
         // skip items with too high quality (code can't propertly work with its)
         if (prototype->Quality >= MAX_AUCTION_QUALITY)
-            continue;
+            { continue; }
 
         // forced exclude filter
         bool isExcludeItem = false;
         for (size_t i = 0; (i < excludeItems.size() && (!isExcludeItem)); ++i)
             if (itemID == excludeItems[i])
-                isExcludeItem = true;
+                { isExcludeItem = true; }
         if (isExcludeItem)
-            continue;
+            { continue; }
 
         // forced include filter
         bool isForcedIncludeItem = false;
         for (size_t i = 0; (i < includeItems.size() && (!isForcedIncludeItem)); ++i)
             if (itemID == includeItems[i])
-                isForcedIncludeItem = true;
+                { isForcedIncludeItem = true; }
 
         if (isForcedIncludeItem)
         {
@@ -1014,23 +1167,23 @@ bool AuctionBotSeller::Initialize()
         {
             case NO_BIND:
                 if (!sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_BIND_NO))
-                    continue;
+                    { continue; }
                 break;
             case BIND_WHEN_PICKED_UP:
                 if (!sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_BIND_PICKUP))
-                    continue;
+                    { continue; }
                 break;
             case BIND_WHEN_EQUIPPED:
                 if (!sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_BIND_EQUIP))
-                    continue;
+                    { continue; }
                 break;
             case BIND_WHEN_USE:
                 if (!sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_BIND_USE))
-                    continue;
+                    { continue; }
                 break;
             case BIND_QUEST_ITEM:
                 if (!sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_BIND_QUEST))
-                    continue;
+                    { continue; }
                 break;
             default:
                 continue;
@@ -1040,12 +1193,12 @@ bool AuctionBotSeller::Initialize()
         if (sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_BUYPRICE_SELLER))
         {
             if (prototype->BuyPrice == 0)
-                continue;
+                { continue; }
         }
         else
         {
             if (prototype->SellPrice == 0)
-                continue;
+                { continue; }
         }
 
         // vendor filter
@@ -1057,7 +1210,7 @@ bool AuctionBotSeller::Initialize()
                     isVendorItem = true;
 
             if (isVendorItem)
-                continue;
+                { continue; }
         }
 
         // loot filter
@@ -1068,7 +1221,7 @@ bool AuctionBotSeller::Initialize()
                 if (itemID == lootItems[i])
                     isLootItem = true;
             if (isLootItem)
-                continue;
+                { continue; }
         }
 
         // not vendor/loot filter
@@ -1083,10 +1236,10 @@ bool AuctionBotSeller::Initialize()
 
             for (size_t i = 0; (i < lootItems.size()) && (!isLootItem); ++i)
                 if (itemID == lootItems[i])
-                    isLootItem = true;
+                    { isLootItem = true; }
 
             if ((!isLootItem) && (!isVendorItem))
-                continue;
+                { continue; }
         }
 
         // item class/subclass specific filters
@@ -1097,22 +1250,22 @@ bool AuctionBotSeller::Initialize()
             {
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ITEM_MIN_ITEM_LEVEL))
                     if (prototype->ItemLevel < value)
-                        continue;
+                        { continue; }
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ITEM_MAX_ITEM_LEVEL))
                     if (prototype->ItemLevel > value)
-                        continue;
+                        { continue; }
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ITEM_MIN_REQ_LEVEL))
                     if (prototype->RequiredLevel < value)
-                        continue;
+                        { continue; }
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ITEM_MAX_REQ_LEVEL))
                     if (prototype->RequiredLevel > value)
-                        continue;
+                        { continue; }
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ITEM_MIN_SKILL_RANK))
                     if (prototype->RequiredSkillRank < value)
-                        continue;
+                        { continue; }
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ITEM_MAX_SKILL_RANK))
                     if (prototype->RequiredSkillRank > value)
-                        continue;
+                        { continue; }
                 break;
             }
             case ITEM_CLASS_RECIPE:
@@ -1121,16 +1274,16 @@ bool AuctionBotSeller::Initialize()
             {
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ITEM_MIN_REQ_LEVEL))
                     if (prototype->RequiredLevel < value)
-                        continue;
+                        { continue; }
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ITEM_MAX_REQ_LEVEL))
                     if (prototype->RequiredLevel > value)
-                        continue;
+                        { continue; }
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ITEM_MIN_SKILL_RANK))
                     if (prototype->RequiredSkillRank < value)
-                        continue;
+                        { continue; }
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_ITEM_MAX_SKILL_RANK))
                     if (prototype->RequiredSkillRank > value)
-                        continue;
+                        { continue; }
                 break;
             }
             case ITEM_CLASS_MISC:
@@ -1154,10 +1307,10 @@ bool AuctionBotSeller::Initialize()
                 {
                     // skip any not locked lootable items (mostly quest specific or reward cases)
                     if (!prototype->LockID)
-                        continue;
+                        { continue; }
 
                     if (!sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_LOCKBOX_ENABLED))
-                        continue;
+                        { continue; }
                 }
 
                 break;
@@ -1181,10 +1334,10 @@ bool AuctionBotSeller::Initialize()
             {
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_TRADEGOOD_MIN_ITEM_LEVEL))
                     if (prototype->ItemLevel < value)
-                        continue;
+                        { continue; }
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_TRADEGOOD_MAX_ITEM_LEVEL))
                     if (prototype->ItemLevel > value)
-                        continue;
+                        { continue; }
                 break;
             }
             case ITEM_CLASS_CONTAINER:
@@ -1192,10 +1345,10 @@ bool AuctionBotSeller::Initialize()
             {
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_CONTAINER_MIN_ITEM_LEVEL))
                     if (prototype->ItemLevel < value)
-                        continue;
+                        { continue; }
                 if (uint32 value = sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_CONTAINER_MAX_ITEM_LEVEL))
                     if (prototype->ItemLevel > value)
-                        continue;
+                        { continue; }
                 break;
             }
         }
@@ -1236,7 +1389,7 @@ void AuctionBotSeller::LoadConfig()
 {
     for (int i = 0; i < MAX_AUCTION_HOUSE_TYPE; ++i)
         if (sAuctionBotConfig.getConfigItemAmountRatio(AuctionHouseType(i)))
-            LoadSellerValues(m_HouseConfig[i]);
+            { LoadSellerValues(m_HouseConfig[i]); }
 }
 
 void AuctionBotSeller::LoadItemsQuantity(AHB_Seller_Config& config)
@@ -1377,7 +1530,7 @@ void AuctionBotSeller::LoadItemsQuantity(AHB_Seller_Config& config)
                          sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_RECIPE_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_QUIVER_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_QUEST_AMOUNT) +
                          sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_KEY_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_MISC_AMOUNT) + sAuctionBotConfig.getConfig(CONFIG_UINT32_AHBOT_CLASS_GLYPH_AMOUNT));
         for (uint32 i = 0; i < MAX_ITEM_CLASS; ++i)
-            config.SetItemsAmountPerClass(AuctionQuality(j), ItemClass(i), indice);
+            { config.SetItemsAmountPerClass(AuctionQuality(j), ItemClass(i), indice); }
     }
 }
 
@@ -1472,7 +1625,7 @@ uint32 AuctionBotSeller::SetStat(AHB_Seller_Config& config)
     return count;
 }
 
-// getRandomArray is used to make aviable the possibility to add any of missed item in place of first one to last one.
+// getRandomArray is used to make available the possibility to add any of missed item in place of first one to last one.
 bool AuctionBotSeller::getRandomArray(AHB_Seller_Config& config, RandomArray& ra, const std::vector<std::vector<uint32> >& addedItem)
 {
     ra.clear();
@@ -1515,13 +1668,13 @@ void AuctionBotSeller::SetItemsRatio(uint32 al, uint32 ho, uint32 ne)
     sAuctionBotConfig.setConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO, ne < 10000 ? ne : 10000);
 
     for (int i = 0; i < MAX_AUCTION_HOUSE_TYPE; ++i)
-        LoadItemsQuantity(m_HouseConfig[i]);
+        { LoadItemsQuantity(m_HouseConfig[i]); }
 }
 
 void AuctionBotSeller::SetItemsRatioForHouse(AuctionHouseType house, uint32 val)
 {
     if (val > 10000)                                        // apply same upper limit as used for config load
-        val = 10000;
+        { val = 10000; }
 
     switch (house)
     {
@@ -1544,7 +1697,7 @@ void AuctionBotSeller::SetItemsAmount(uint32(&vals) [MAX_AUCTION_QUALITY])
     sAuctionBotConfig.setConfig(CONFIG_UINT32_AHBOT_ITEM_YELLOW_AMOUNT, vals[AUCTION_QUALITY_YELLOW]);
 
     for (int i = 0; i < MAX_AUCTION_HOUSE_TYPE; ++i)
-        LoadItemsQuantity(m_HouseConfig[i]);
+        { LoadItemsQuantity(m_HouseConfig[i]); }
 }
 
 void AuctionBotSeller::SetItemsAmountForQuality(AuctionQuality quality, uint32 val)
@@ -1561,7 +1714,7 @@ void AuctionBotSeller::SetItemsAmountForQuality(AuctionQuality quality, uint32 v
     }
 
     for (int i = 0; i < MAX_AUCTION_HOUSE_TYPE; ++i)
-        LoadItemsQuantity(m_HouseConfig[i]);
+        { LoadItemsQuantity(m_HouseConfig[i]); }
 }
 
 // Add new auction to one of the factions.
@@ -1576,7 +1729,7 @@ void AuctionBotSeller::addNewAuctions(AHB_Seller_Config& config)
         items = sAuctionBotConfig.GetItemPerCycleBoost();
         BASIC_FILTER_LOG(LOG_FILTER_AHBOT_BUYER, "AHBot: Boost value used to fill AH! (if this happens often adjust both ItemsPerCycle in ahbot.conf)");
     }
-    else items = sAuctionBotConfig.GetItemPerCycleNormal();
+    else { items = sAuctionBotConfig.GetItemPerCycleNormal(); }
 
     uint32 houseid;
     switch (config.GetHouseType())
@@ -1631,9 +1784,9 @@ void AuctionBotSeller::addNewAuctions(AHB_Seller_Config& config)
         uint64 bidPrice = 0;
         // Not sure if i will keep the next test
         if (sAuctionBotConfig.getConfig(CONFIG_BOOL_AHBOT_BUYPRICE_SELLER))
-            buyoutPrice  = prototype->BuyPrice * item->GetCount();
+            { buyoutPrice  = prototype->BuyPrice * item->GetCount(); }
         else
-            buyoutPrice  = prototype->SellPrice * item->GetCount();
+            { buyoutPrice  = prototype->SellPrice * item->GetCount(); }
         // Price of items are set here
         SetPricesOfItem(prototype, config, buyoutPrice, bidPrice, stackCount, ItemQualities(prototype->Quality));
 
@@ -1647,11 +1800,11 @@ bool AuctionBotSeller::Update(AuctionHouseType houseType)
     {
         DEBUG_FILTER_LOG(LOG_FILTER_AHBOT_SELLER, "AHBot: %s selling ...", AuctionBotConfig::GetHouseTypeName(houseType));
         if (SetStat(m_HouseConfig[houseType]))
-            addNewAuctions(m_HouseConfig[houseType]);
+            { addNewAuctions(m_HouseConfig[houseType]); }
         return true;
     }
     else
-        return false;
+        { return false; }
 }
 
 //== AuctionHouseBot functions =============================
@@ -1693,31 +1846,31 @@ void AuctionHouseBot::InitilizeAgents()
 void AuctionHouseBot::Initialize()
 {
     if (sAuctionBotConfig.Initialize())
-        InitilizeAgents();
+        { InitilizeAgents(); }
 }
 
 void AuctionHouseBot::SetItemsRatio(uint32 al, uint32 ho, uint32 ne)
 {
     if (AuctionBotSeller* seller = dynamic_cast<AuctionBotSeller*>(m_Seller))
-        seller->SetItemsRatio(al, ho, ne);
+        { seller->SetItemsRatio(al, ho, ne); }
 }
 
 void AuctionHouseBot::SetItemsRatioForHouse(AuctionHouseType house, uint32 val)
 {
     if (AuctionBotSeller* seller = dynamic_cast<AuctionBotSeller*>(m_Seller))
-        seller->SetItemsRatioForHouse(house, val);
+        { seller->SetItemsRatioForHouse(house, val); }
 }
 
 void AuctionHouseBot::SetItemsAmount(uint32(&vals) [MAX_AUCTION_QUALITY])
 {
     if (AuctionBotSeller* seller = dynamic_cast<AuctionBotSeller*>(m_Seller))
-        seller->SetItemsAmount(vals);
+        { seller->SetItemsAmount(vals); }
 }
 
 void AuctionHouseBot::SetItemsAmountForQuality(AuctionQuality quality, uint32 val)
 {
     if (AuctionBotSeller* seller = dynamic_cast<AuctionBotSeller*>(m_Seller))
-        seller->SetItemsAmountForQuality(quality, val);
+        { seller->SetItemsAmountForQuality(quality, val); }
 }
 
 bool AuctionHouseBot::ReloadAllConfig()
@@ -1739,7 +1892,7 @@ void AuctionHouseBot::PrepareStatusInfos(AuctionHouseBotStatusInfo& statusInfo)
         statusInfo[i].ItemsCount = 0;
 
         for (int j = 0; j < MAX_AUCTION_QUALITY; ++j)
-            statusInfo[i].QualityInfo[j] = 0;
+            { statusInfo[i].QualityInfo[j] = 0; }
 
         AuctionHouseObject::AuctionEntryMapBounds bounds = sAuctionMgr.GetAuctionsMap(AuctionHouseType(i))->GetAuctionsBounds();
         for (AuctionHouseObject::AuctionEntryMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
@@ -1751,7 +1904,7 @@ void AuctionHouseBot::PrepareStatusInfos(AuctionHouseBotStatusInfo& statusInfo)
                 if (!Aentry->owner)                         // Add only ahbot items
                 {
                     if (prototype->Quality < MAX_AUCTION_QUALITY)
-                        ++statusInfo[i].QualityInfo[prototype->Quality];
+                        { ++statusInfo[i].QualityInfo[prototype->Quality]; }
 
                     ++statusInfo[i].ItemsCount;
                 }
@@ -1760,6 +1913,7 @@ void AuctionHouseBot::PrepareStatusInfos(AuctionHouseBotStatusInfo& statusInfo)
     }
 }
 
+
 void AuctionHouseBot::Rebuild(bool all)
 {
     for (uint32 i = 0; i < MAX_AUCTION_HOUSE_TYPE; ++i)
@@ -1776,7 +1930,7 @@ void AuctionHouseBot::Update()
 {
     // nothing do...
     if (!m_Buyer && !m_Seller)
-        return;
+        { return; }
 
     // scan all possible update cases until first success
     for (uint32 count = 0; count < 2 * MAX_AUCTION_HOUSE_TYPE; ++count)
@@ -1786,20 +1940,21 @@ void AuctionHouseBot::Update()
         if (m_OperationSelector < MAX_AUCTION_HOUSE_TYPE)
         {
             if (m_Seller)
-                successStep = m_Seller->Update(AuctionHouseType(m_OperationSelector));
+                { successStep = m_Seller->Update(AuctionHouseType(m_OperationSelector)); }
         }
         else
         {
             if (m_Buyer)
-                successStep = m_Buyer->Update(AuctionHouseType(m_OperationSelector - MAX_AUCTION_HOUSE_TYPE));
+                { successStep = m_Buyer->Update(AuctionHouseType(m_OperationSelector - MAX_AUCTION_HOUSE_TYPE)); }
         }
 
         ++m_OperationSelector;
         if (m_OperationSelector >= 2 * MAX_AUCTION_HOUSE_TYPE)
-            m_OperationSelector = 0;
+            { m_OperationSelector = 0; }
 
         // one success update per call
         if (successStep)
-            break;
+            { break; }
     }
 }
+/** @} */
diff --git a/src/game/BattleGround/CMakeLists.txt b/src/game/BattleGround/CMakeLists.txt
index 0de2ccc52..a8fd967e1 100644
--- a/src/game/BattleGround/CMakeLists.txt
+++ b/src/game/BattleGround/CMakeLists.txt
@@ -56,6 +56,4 @@ target_link_libraries(mangos-battleground mangos-shared mangos-framework g3dlite
 if(${CMAKE_BUILD_TYPE} MATCHES Debug)
     set(BUILD_PROPERTIES "-DMANGOS_DEBUG")
     set_target_properties(mangos-battleground PROPERTIES COMPILE_FLAGS ${BUILD_PROPERTIES})
-endif()
-
-add_dependencies(mangos-battleground revision.h)
+endif()
\ No newline at end of file
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index 71e5f1720..4af524a2e 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -1,4 +1,7 @@
-# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+#
+# Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,168 +22,108 @@ set(LIBRARY_NAME game)
 add_definitions(-DDT_POLYREF64)
 
 include_directories(
-  "${CMAKE_CURRENT_SOURCE_DIR}"
-  "${CMAKE_CURRENT_SOURCE_DIR}/AuctionHouseBot"
-  "${CMAKE_CURRENT_SOURCE_DIR}/BattleGround"
-  "${CMAKE_CURRENT_SOURCE_DIR}/ChatCommands"
-  "${CMAKE_CURRENT_SOURCE_DIR}/MotionGenerators"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Object"
-  "${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP"
-  "${CMAKE_CURRENT_SOURCE_DIR}/References"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Server"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Tools"
-  "${CMAKE_CURRENT_SOURCE_DIR}/vmap"
-  "${CMAKE_CURRENT_SOURCE_DIR}/WorldHandlers"
-  "${CMAKE_SOURCE_DIR}/dep/include/g3dlite"
-  "${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include"
-  "${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour"
-  "${CMAKE_SOURCE_DIR}/dep/recastnavigation/"
-  "${CMAKE_SOURCE_DIR}/dep/include"
-  "${CMAKE_SOURCE_DIR}/src/shared"
-  "${CMAKE_SOURCE_DIR}/src/framework"
-  "${CMAKE_BINARY_DIR}"
-  "${CMAKE_BINARY_DIR}/src/shared"
-  "${MYSQL_INCLUDE_DIR}"
-  "${ACE_INCLUDE_DIR}"
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/AuctionHouseBot
+    ${CMAKE_CURRENT_SOURCE_DIR}/BattleGround
+    ${CMAKE_CURRENT_SOURCE_DIR}/ChatCommands
+    ${CMAKE_CURRENT_SOURCE_DIR}/Maps
+    ${CMAKE_CURRENT_SOURCE_DIR}/MotionGenerators
+    ${CMAKE_CURRENT_SOURCE_DIR}/Object
+    ${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP
+    ${CMAKE_CURRENT_SOURCE_DIR}/References
+    ${CMAKE_CURRENT_SOURCE_DIR}/Server
+    ${CMAKE_CURRENT_SOURCE_DIR}/Tools
+    ${CMAKE_CURRENT_SOURCE_DIR}/vmap
+    ${CMAKE_CURRENT_SOURCE_DIR}/Warden
+    ${CMAKE_CURRENT_SOURCE_DIR}/Warden/Modules
+    ${CMAKE_CURRENT_SOURCE_DIR}/WorldHandlers
+    ${CMAKE_SOURCE_DIR}/dep/g3dlite
+    ${CMAKE_SOURCE_DIR}/dep/zlib
+    ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include
+    ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour
+    ${CMAKE_SOURCE_DIR}/dep/recastnavigation
+    ${CMAKE_SOURCE_DIR}/dep/include
+    ${CMAKE_SOURCE_DIR}/src/shared
+    ${CMAKE_SOURCE_DIR}/src/shared/Auth
+    ${CMAKE_SOURCE_DIR}/src/shared/Config
+    ${CMAKE_SOURCE_DIR}/src/shared/Common
+    ${CMAKE_SOURCE_DIR}/src/shared/Database
+    ${CMAKE_SOURCE_DIR}/src/shared/DataStores
+    ${CMAKE_SOURCE_DIR}/src/shared/Utilities
+    ${CMAKE_SOURCE_DIR}/src/shared/Log
+    ${CMAKE_SOURCE_DIR}/src/shared/Threading
+    ${CMAKE_SOURCE_DIR}/src/framework
+    ${CMAKE_BINARY_DIR}/src/shared
+    ${MYSQL_INCLUDE_DIR}
+    ${OPENSSL_INCLUDE_DIR}
+    ${ACE_INCLUDE_DIR}
 )
 
 #AH Bot group
-file(GLOB SRC_FILES_AHBOT AuctionHouseBot/*.cpp AuctionHouseBot/*.h)
-    set(SRC_GRP_AHBOT
-        ${SRC_FILES_AHBOT}
-    )
-
-source_group("AhBot"
-  FILES
-    ${SRC_GRP_AHBOT}
-)
+file(GLOB SRC_GRP_AHBOT AuctionHouseBot/*.cpp AuctionHouseBot/*.h)
+source_group("AhBot" FILES ${SRC_GRP_AHBOT})
 
 #Battlegrounds group
-file(GLOB SRC_FILES_BATTLEGROUND BattleGround/*.cpp BattleGround/*.h)
-    set(SRC_GRP_BATTLEGROUND
-        ${SRC_FILES_BATTLEGROUND}
-    )
-	
-source_group("BattleGround"
-  FILES
-    ${SRC_GRP_BATTLEGROUND}
-)
-
+file(GLOB SRC_GRP_BATTLEGROUND BattleGround/*.cpp BattleGround/*.h)
+source_group("BattleGround" FILES ${SRC_GRP_BATTLEGROUND})
 
 #Chat Commands group
-file(GLOB SRC_FILES_CHAT_COMMANDS ChatCommands/*.cpp ChatCommands/*.h)
-    set(SRC_GRP_CHAT_COMMANDS
-        ${SRC_FILES_CHAT_COMMANDS}
-    )
+file(GLOB SRC_GRP_CHAT_COMMANDS ChatCommands/*.cpp ChatCommands/*.h)
+source_group("Chat Commands" FILES ${SRC_GRP_CHAT_COMMANDS})
 
-source_group("Chat Commands"
-  FILES
-    ${SRC_GRP_CHAT_COMMANDS}
-)
+#Map Threading group
+file(GLOB SRC_GRP_MAP_THREAD Maps/*.cpp Maps/*.h)
+source_group("Map Threading" FILES ${SRC_GRP_MAP_THREAD})
 
 #Motion Generator group
-file(GLOB SRC_FILES_MOTION_GEN MotionGenerators/*.cpp MotionGenerators/*.h)
-    set(SRC_GRP_MOTION_GEN
-        ${SRC_FILES_MOTION_GEN}
-    )
-
-source_group("Motion generators"
-  FILES
-    ${SRC_GRP_MOTION_GEN}
-)
+file(GLOB SRC_GRP_MOTION_GEN MotionGenerators/*.cpp MotionGenerators/*.h)
+source_group("Motion generators" FILES ${SRC_GRP_MOTION_GEN})
 
 #Movement group
-file(GLOB SRC_FILES_MOVEMENT movement/*.cpp movement/*.h)
-    set(SRC_GRP_MOVEMENT
-        ${SRC_FILES_MOVEMENT}
-    )
-
-source_group("Movement"
-  FILES
-    ${SRC_GRP_MOVEMENT}
-)
+file(GLOB SRC_GRP_MOVEMENT movement/*.cpp movement/*.h)
+source_group("Movement" FILES ${SRC_GRP_MOVEMENT})
 
 #Object group
-file(GLOB SRC_FILES_OBJECT Object/*.cpp Object/*.h)
-    set(SRC_GRP_OBJECT
-        ${SRC_FILES_OBJECT}
-    )
-
-source_group("Object"
-  FILES
-    ${SRC_GRP_OBJECT}
-)	
+file(GLOB SRC_GRP_OBJECT Object/*.cpp Object/*.h)
+source_group("Object" FILES ${SRC_GRP_OBJECT})    
 
 #Outdoors PvP group
-file(GLOB SRC_FILES_OUTDOOR_PVP OutdoorPvP/*.cpp OutdoorPvP/*.h)
-    set(SRC_GRP_OUTDOOR_PVP
-        ${SRC_FILES_OUTDOOR_PVP}
-    )
-	
-source_group("Outdoor PvP"
-  FILES
-    ${SRC_GRP_OUTDOOR_PVP}
-)
+file(GLOB SRC_GRP_OUTDOOR_PVP OutdoorPvP/*.cpp OutdoorPvP/*.h)
+source_group("Outdoor PvP" FILES ${SRC_GRP_OUTDOOR_PVP})
 
 #References group
-file(GLOB SRC_FILES_REFERENCES References/*.cpp References/*.h)
-    set(SRC_GRP_REFERENCES
-        ${SRC_FILES_REFERENCES}
-    )
-	
-source_group("References"
-  FILES
-    ${SRC_GRP_REFERENCES}
-)
+file(GLOB SRC_GRP_REFERENCES References/*.cpp References/*.h)
+source_group("References" FILES ${SRC_GRP_REFERENCES})
 
 #Server group
-file(GLOB SRC_FILES_SERVER Server/*.cpp Server/*.h)
-    set(SRC_GRP_SERVER
-        ${SRC_FILES_SERVER}
-    )
-	
-source_group("Server"
-  FILES
-    ${SRC_GRP_SERVER}
-)
-	
+file(GLOB SRC_GRP_SERVER Server/*.cpp Server/*.h)
+source_group("Server" FILES ${SRC_GRP_SERVER})
+    
 #Tools group
-file(GLOB SRC_FILES_TOOL Tools/*.cpp Tools/*.h)
-    set(SRC_GRP_TOOL
-        ${SRC_FILES_TOOL}
-    )
-
-source_group("Tool"
-  FILES
-    ${SRC_GRP_TOOL}
-)
+file(GLOB SRC_GRP_TOOL Tools/*.cpp Tools/*.h)
+source_group("Tool" FILES ${SRC_GRP_TOOL})
 
 #VMap group
-file(GLOB SRC_FILES_VMAPS vmap/*.cpp vmap/*.h)
-    set(SRC_GRP_VMAPS
-        ${SRC_FILES_VMAPS}
-    )
+file(GLOB SRC_GRP_VMAPS vmap/*.cpp vmap/*.h)
+source_group("vmaps" FILES ${SRC_GRP_VMAPS})
 
-source_group("vmaps"
-  FILES
-    ${SRC_GRP_VMAPS}
-)
-	
+#Warden group
+file(GLOB SRC_GRP_WARDEN Warden/*.cpp Warden/*.h)
+source_group("Warden" FILES ${SRC_GRP_WARDEN})
+
+#Warden Modules group
+file(GLOB SRC_GRP_WARDEN_MODULES Warden/Modules/*.cpp Warden/Modules/*.h)
+source_group("Warden\\Modules" FILES ${SRC_GRP_WARDEN_MODULES})
+    
 #World and Handlers group
-file(GLOB SRC_FILES_WORLD_HANDLERS WorldHandlers/*.cpp WorldHandlers/*.h)
-    set(SRC_GRP_WORLD_HANDLERS
-        ${SRC_FILES_WORLD_HANDLERS}
-    )
-
-source_group("World/Handlers"
-  FILES
-    ${SRC_GRP_WORLD_HANDLERS}
-)
-	
+file(GLOB SRC_GRP_WORLD_HANDLERS WorldHandlers/*.cpp WorldHandlers/*.h)
+source_group("World/Handlers" FILES ${SRC_GRP_WORLD_HANDLERS})
+    
 set(LIBRARY_SRCS
     ${SRC_GRP_AHBOT}
     ${SRC_GRP_BATTLEGROUND}
     ${SRC_GRP_CHAT_COMMANDS}
+    ${SRC_GRP_MAP_THREAD}
     ${SRC_GRP_MOTION_GEN}
     ${SRC_GRP_MOVEMENT}
     ${SRC_GRP_OBJECT}
@@ -189,31 +132,26 @@ set(LIBRARY_SRCS
     ${SRC_GRP_SERVER}
     ${SRC_GRP_TOOL}
     ${SRC_GRP_VMAPS}
+    ${SRC_GRP_WARDEN}
+    ${SRC_GRP_WARDEN_MODULES}
     ${SRC_GRP_WORLD_HANDLERS}
     pchdef.cpp
     pchdef.h
 )
 
 if(PCH)
-  include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+    include_directories(${CMAKE_CURRENT_BINARY_DIR})
 endif()
 
-add_library(${LIBRARY_NAME} STATIC
-  ${LIBRARY_SRCS}
-)
+add_library(${LIBRARY_NAME} STATIC ${LIBRARY_SRCS})
 
-target_link_libraries(${LIBRARY_NAME}
-  shared
-  detour
-)
+target_link_libraries(${LIBRARY_NAME} shared detour)
 
 if(UNIX)
-  # Both systems don't have libdl and don't need them
-  if (NOT (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD"))
-    target_link_libraries(${LIBRARY_NAME}
-      dl
-    )
-  endif()
+    # Both systems don't have libdl and don't need them
+    if (NOT (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD"))
+        target_link_libraries(${LIBRARY_NAME} dl)
+    endif()
 endif()
 
 if(NOT ACE_USE_EXTERNAL)
@@ -225,32 +163,39 @@ if(PCH)
     ADD_CXX_PCH(${LIBRARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/pchdef.h ${CMAKE_CURRENT_SOURCE_DIR}/pchdef.cpp)
 endif()
 
-add_subdirectory(AuctionHouseBot)
+#if(PLAYERBOTS)
+#    include_directories(
+#        ${CMAKE_SOURCE_DIR}/src/modules/Bots/playerbot
+#        ${CMAKE_SOURCE_DIR}/src/modules/Bots/ahbot
+#    )
+#    target_link_libraries(${LIBRARY_NAME} Bots)
+#    add_dependencies(${LIBRARY_NAME} Bots)
+#endif()
 
 if(SCRIPT_LIB_SD2)
-    include_directories(
-        "${CMAKE_SOURCE_DIR}/src/modules/SD2"
-    )
-    target_link_libraries(${LIBRARY_NAME}
-        mangosscript
-    )
+    include_directories(${CMAKE_SOURCE_DIR}/src/modules/SD2)
+    target_link_libraries(${LIBRARY_NAME} mangosscript)
     add_dependencies(${LIBRARY_NAME} mangosscript)
 endif()
 
-#Eluna specific start
-
 if(SCRIPT_LIB_ELUNA)
-  include_directories(
-    "${CMAKE_SOURCE_DIR}/dep/lualib"
-    "${CMAKE_SOURCE_DIR}/src/modules/Eluna"
-  )
-  list(APPEND LIBRARY_SRCS ${SRC_GRP_LUAENGINE})
-
-  target_link_libraries(${LIBRARY_NAME} LuaEngine)
-  target_link_libraries(${LIBRARY_NAME} lualib)
-
-  add_dependencies(${LIBRARY_NAME} LuaEngine)
-  add_dependencies(${LIBRARY_NAME} lualib)
+    include_directories(
+        ${CMAKE_SOURCE_DIR}/dep/lualib
+        ${CMAKE_SOURCE_DIR}/src/modules/Eluna
+    )
+    list(APPEND LIBRARY_SRCS ${SRC_GRP_LUAENGINE})
+    target_link_libraries(${LIBRARY_NAME} LuaEngine)
+    target_link_libraries(${LIBRARY_NAME} lualib)
+    add_dependencies(${LIBRARY_NAME} LuaEngine)
+    add_dependencies(${LIBRARY_NAME} lualib)
 endif()
 
-#Eluna specific end
+#AH Bot Config
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/AuctionHouseBot/ahbot.conf.dist.in" "${CMAKE_CURRENT_BINARY_DIR}/AuctionHouseBot/ahbot.conf.dist")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AuctionHouseBot/ahbot.conf.dist" DESTINATION "${CONF_INSTALL_DIR}")
+
+if(WIN32 AND MSVC)
+    add_custom_command(TARGET ${LIBRARY_NAME}
+        POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/AuctionHouseBot/ahbot.conf.dist" "${CONF_COPY_DIR}"
+    )
+endif()
\ No newline at end of file
diff --git a/src/game/ChatCommands/Level0.cpp b/src/game/ChatCommands/Level0.cpp
index 6b45098e6..27edfbaa6 100644
--- a/src/game/ChatCommands/Level0.cpp
+++ b/src/game/ChatCommands/Level0.cpp
@@ -33,8 +33,7 @@
 #include "AccountMgr.h"
 #include "ScriptMgr.h"
 #include "SystemConfig.h"
-//#include "revision.h"
-#include "revision_nr.h"
+#include "revision.h"
 #include "Util.h"
 
 bool ChatHandler::HandleHelpCommand(char* args)
diff --git a/src/game/Object/AggressorAI.h b/src/game/Object/AggressorAI.h
index 5fd6098aa..a0a0f98e1 100644
--- a/src/game/Object/AggressorAI.h
+++ b/src/game/Object/AggressorAI.h
@@ -31,7 +31,7 @@
 
 class Creature;
 
-class MANGOS_DLL_DECL AggressorAI : public CreatureAI
+class AggressorAI : public CreatureAI
 {
         enum AggressorState
         {
diff --git a/src/game/Object/GuardAI.h b/src/game/Object/GuardAI.h
index d38dee5a7..28cb664f9 100644
--- a/src/game/Object/GuardAI.h
+++ b/src/game/Object/GuardAI.h
@@ -31,7 +31,7 @@
 
 class Creature;
 
-class MANGOS_DLL_DECL GuardAI : public CreatureAI
+class GuardAI : public CreatureAI
 {
         enum GuardState
         {
diff --git a/src/game/Object/NullCreatureAI.h b/src/game/Object/NullCreatureAI.h
index a06036a27..7a65a0db4 100644
--- a/src/game/Object/NullCreatureAI.h
+++ b/src/game/Object/NullCreatureAI.h
@@ -27,7 +27,7 @@
 
 #include "CreatureAI.h"
 
-class MANGOS_DLL_DECL NullCreatureAI : public CreatureAI
+class NullCreatureAI : public CreatureAI
 {
     public:
 
diff --git a/src/game/Object/ObjectAccessor.h b/src/game/Object/ObjectAccessor.h
index e4ad1dbcb..beea66160 100644
--- a/src/game/Object/ObjectAccessor.h
+++ b/src/game/Object/ObjectAccessor.h
@@ -89,7 +89,7 @@ class HashMapHolder
         static MapType  m_objectMap;
 };
 
-class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor, MaNGOS::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex> >
+class ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor, MaNGOS::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex> >
 {
         friend class MaNGOS::OperatorNew<ObjectAccessor>;
 
diff --git a/src/game/Object/PetAI.h b/src/game/Object/PetAI.h
index e69d6f812..73fcbab95 100644
--- a/src/game/Object/PetAI.h
+++ b/src/game/Object/PetAI.h
@@ -32,7 +32,7 @@
 class Creature;
 class Spell;
 
-class MANGOS_DLL_DECL PetAI : public CreatureAI
+class PetAI : public CreatureAI
 {
     public:
 
diff --git a/src/game/Object/ReactorAI.h b/src/game/Object/ReactorAI.h
index 54e1cec21..9b0868c42 100644
--- a/src/game/Object/ReactorAI.h
+++ b/src/game/Object/ReactorAI.h
@@ -30,7 +30,7 @@
 
 class Unit;
 
-class MANGOS_DLL_DECL ReactorAI : public CreatureAI
+class ReactorAI : public CreatureAI
 {
     public:
 
diff --git a/src/game/Object/TotemAI.h b/src/game/Object/TotemAI.h
index 373e6cc3e..ba31d20ae 100644
--- a/src/game/Object/TotemAI.h
+++ b/src/game/Object/TotemAI.h
@@ -32,7 +32,7 @@
 class Creature;
 class Totem;
 
-class MANGOS_DLL_DECL TotemAI : public CreatureAI
+class TotemAI : public CreatureAI
 {
     public:
 
diff --git a/src/game/Server/DB2Stores.cpp b/src/game/Server/DB2Stores.cpp
index 97940bc81..03456f462 100644
--- a/src/game/Server/DB2Stores.cpp
+++ b/src/game/Server/DB2Stores.cpp
@@ -1,4 +1,4 @@
-/*
+/**
  * MaNGOS is a full featured server for World of Warcraft, supporting
  * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
  *
diff --git a/src/game/Server/DB2Stores.h b/src/game/Server/DB2Stores.h
index efcf573a4..01c46a434 100644
--- a/src/game/Server/DB2Stores.h
+++ b/src/game/Server/DB2Stores.h
@@ -1,4 +1,4 @@
-/*
+/**
  * MaNGOS is a full featured server for World of Warcraft, supporting
  * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
  *
@@ -26,7 +26,7 @@
 #define MANGOS_DB2STORES_H
 
 #include "Common.h"
-#include "Database/DB2Store.h"
+#include "Datastores/DB2Store.h"
 #include "DB2Structure.h"
 
 #include <list>
diff --git a/src/game/Server/DBCStores.cpp b/src/game/Server/DBCStores.cpp
index f7e751843..95252b9b8 100644
--- a/src/game/Server/DBCStores.cpp
+++ b/src/game/Server/DBCStores.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "DBCStores.h"
+#include "DB2Stores.h"
 #include "Policies/Singleton.h"
 #include "Log.h"
 #include "ProgressBar.h"
diff --git a/src/game/Server/DBCStores.h b/src/game/Server/DBCStores.h
index 9f16269d8..064f0bdb8 100644
--- a/src/game/Server/DBCStores.h
+++ b/src/game/Server/DBCStores.h
@@ -26,7 +26,7 @@
 #define MANGOS_DBCSTORES_H
 
 #include "Common.h"
-#include "Database/DBCStore.h"
+#include"DataStores/DBCStore.h"
 #include "DBCStructure.h"
 
 #include <list>
diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp
index 130fbf20d..48e71c2ac 100644
--- a/src/game/Server/WorldSession.cpp
+++ b/src/game/Server/WorldSession.cpp
@@ -44,7 +44,7 @@
 #include "SocialMgr.h"
 #include "Auth/AuthCrypt.h"
 #include "Auth/HMACSHA1.h"
-#include "zlib/zlib.h"
+#include "zlib.h"
 
 // select opcodes appropriate for processing in Map::Update context for current session state
 static bool MapSessionFilterHelper(WorldSession* session, OpcodeHandler const& opHandle)
diff --git a/src/game/WorldHandlers/AccountMgr.cpp b/src/game/WorldHandlers/AccountMgr.cpp
index 4f04a5dc6..60ae5232d 100644
--- a/src/game/WorldHandlers/AccountMgr.cpp
+++ b/src/game/WorldHandlers/AccountMgr.cpp
@@ -51,7 +51,7 @@ AccountOpResult AccountMgr::CreateAccount(std::string username, std::string pass
 
     if (GetId(username))
     {
-        return AOR_NAME_ALREDY_EXIST;                       // username does already exist
+        return AOR_NAME_ALREADY_EXIST;                       // username does already exist
     }
 
     if (!LoginDatabase.PExecute("INSERT INTO account(username,sha_pass_hash,joindate) VALUES('%s','%s',NOW())", username.c_str(), CalculateShaPassHash(username, password).c_str()))
@@ -71,7 +71,7 @@ AccountOpResult AccountMgr::CreateAccount(std::string username, std::string pass
 
     if (GetId(username))
     {
-        return AOR_NAME_ALREDY_EXIST;                       // username does already exist
+        return AOR_NAME_ALREADY_EXIST;                       // username does already exist
     }
 
     if (!LoginDatabase.PExecute("INSERT INTO account(username,sha_pass_hash,joindate,expansion) VALUES('%s','%s',NOW(),'%u')", username.c_str(), CalculateShaPassHash(username, password).c_str(), expansion))
diff --git a/src/game/WorldHandlers/AccountMgr.h b/src/game/WorldHandlers/AccountMgr.h
index 5340646b9..c54f68a7a 100644
--- a/src/game/WorldHandlers/AccountMgr.h
+++ b/src/game/WorldHandlers/AccountMgr.h
@@ -34,7 +34,7 @@ enum AccountOpResult
     AOR_OK,
     AOR_NAME_TOO_LONG,
     AOR_PASS_TOO_LONG,
-    AOR_NAME_ALREDY_EXIST,
+    AOR_NAME_ALREADY_EXIST,
     AOR_NAME_NOT_EXIST,
     AOR_DB_INTERNAL_ERROR
 };
diff --git a/src/game/WorldHandlers/Cell.h b/src/game/WorldHandlers/Cell.h
index 57c3c621b..89e084602 100644
--- a/src/game/WorldHandlers/Cell.h
+++ b/src/game/WorldHandlers/Cell.h
@@ -33,7 +33,7 @@
 class Map;
 class WorldObject;
 
-struct MANGOS_DLL_DECL CellArea
+struct CellArea
 {
     CellArea() {}
     CellArea(CellPair low, CellPair high) : low_bound(low), high_bound(high) {}
@@ -50,7 +50,7 @@ struct MANGOS_DLL_DECL CellArea
     CellPair high_bound;
 };
 
-struct MANGOS_DLL_DECL Cell
+struct Cell
 {
         Cell() { data.All = 0; }
         Cell(const Cell& cell) { data.All = cell.data.All; }
diff --git a/src/game/WorldHandlers/GridDefines.h b/src/game/WorldHandlers/GridDefines.h
index c23d84c69..3da77de08 100644
--- a/src/game/WorldHandlers/GridDefines.h
+++ b/src/game/WorldHandlers/GridDefines.h
@@ -81,7 +81,7 @@ typedef TypeMapContainer<AllGridObjectTypes> GridTypeMapContainer;
 typedef TypeMapContainer<AllWorldObjectTypes> WorldTypeMapContainer;
 
 template<const unsigned int LIMIT>
-struct MANGOS_DLL_DECL CoordPair
+struct CoordPair
 {
     CoordPair(uint32 x = 0, uint32 y = 0) : x_coord(x), y_coord(y) {}
     CoordPair(const CoordPair<LIMIT> &obj) : x_coord(obj.x_coord), y_coord(obj.y_coord) {}
diff --git a/src/game/WorldHandlers/GridMap.h b/src/game/WorldHandlers/GridMap.h
index be9ebdfae..78deb9b71 100644
--- a/src/game/WorldHandlers/GridMap.h
+++ b/src/game/WorldHandlers/GridMap.h
@@ -283,7 +283,7 @@ class  TerrainInfo : public Referencable<AtomicLong>
 };
 
 // class for managing TerrainData object and all sort of geometry querying operations
-class MANGOS_DLL_DECL TerrainManager : public MaNGOS::Singleton<TerrainManager, MaNGOS::ClassLevelLockable<TerrainManager, ACE_Thread_Mutex> >
+class TerrainManager : public MaNGOS::Singleton<TerrainManager, MaNGOS::ClassLevelLockable<TerrainManager, ACE_Thread_Mutex> >
 {
         typedef UNORDERED_MAP<uint32,  TerrainInfo*> TerrainDataMap;
         friend class MaNGOS::OperatorNew<TerrainManager>;
diff --git a/src/game/WorldHandlers/GridNotifiers.h b/src/game/WorldHandlers/GridNotifiers.h
index 61f2de14f..773e907ea 100644
--- a/src/game/WorldHandlers/GridNotifiers.h
+++ b/src/game/WorldHandlers/GridNotifiers.h
@@ -38,7 +38,7 @@
 
 namespace MaNGOS
 {
-    struct MANGOS_DLL_DECL VisibleNotifier
+    struct VisibleNotifier
     {
         Camera& i_camera;
         UpdateData i_data;
@@ -51,7 +51,7 @@ namespace MaNGOS
         void Notify(void);
     };
 
-    struct MANGOS_DLL_DECL VisibleChangesNotifier
+    struct VisibleChangesNotifier
     {
         WorldObject& i_object;
 
@@ -60,7 +60,7 @@ namespace MaNGOS
         void Visit(CameraMapType&);
     };
 
-    struct MANGOS_DLL_DECL MessageDeliverer
+    struct MessageDeliverer
     {
         Player const& i_player;
         WorldPacket* i_message;
@@ -83,7 +83,7 @@ namespace MaNGOS
         template<class SKIP> void Visit(GridRefManager<SKIP> &) {}
     };
 
-    struct MANGOS_DLL_DECL ObjectMessageDeliverer
+    struct ObjectMessageDeliverer
     {
         uint32 i_phaseMask;
         WorldPacket* i_message;
@@ -93,7 +93,7 @@ namespace MaNGOS
         template<class SKIP> void Visit(GridRefManager<SKIP> &) {}
     };
 
-    struct MANGOS_DLL_DECL MessageDistDeliverer
+    struct MessageDistDeliverer
     {
         Player const& i_player;
         WorldPacket* i_message;
@@ -107,7 +107,7 @@ namespace MaNGOS
         template<class SKIP> void Visit(GridRefManager<SKIP> &) {}
     };
 
-    struct MANGOS_DLL_DECL ObjectMessageDistDeliverer
+    struct ObjectMessageDistDeliverer
     {
         WorldObject const& i_object;
         WorldPacket* i_message;
@@ -117,7 +117,7 @@ namespace MaNGOS
         template<class SKIP> void Visit(GridRefManager<SKIP> &) {}
     };
 
-    struct MANGOS_DLL_DECL ObjectUpdater
+    struct ObjectUpdater
     {
         uint32 i_timeDiff;
         explicit ObjectUpdater(const uint32& diff) : i_timeDiff(diff) {}
@@ -128,7 +128,7 @@ namespace MaNGOS
         void Visit(CreatureMapType&);
     };
 
-    struct MANGOS_DLL_DECL PlayerRelocationNotifier
+    struct PlayerRelocationNotifier
     {
         Player& i_player;
         PlayerRelocationNotifier(Player& pl) : i_player(pl) {}
@@ -136,7 +136,7 @@ namespace MaNGOS
         void Visit(CreatureMapType&);
     };
 
-    struct MANGOS_DLL_DECL CreatureRelocationNotifier
+    struct CreatureRelocationNotifier
     {
         Creature& i_creature;
         CreatureRelocationNotifier(Creature& c) : i_creature(c) {}
@@ -146,7 +146,7 @@ namespace MaNGOS
 #endif
     };
 
-    struct MANGOS_DLL_DECL DynamicObjectUpdater
+    struct DynamicObjectUpdater
     {
         DynamicObject& i_dynobject;
         Unit* i_check;
@@ -172,7 +172,7 @@ namespace MaNGOS
 
     /* Model Searcher class:
     template<class Check>
-    struct MANGOS_DLL_DECL SomeSearcher
+    struct SomeSearcher
     {
         ResultType& i_result;
         Check & i_check;
@@ -203,7 +203,7 @@ namespace MaNGOS
     // WorldObject searchers & workers
 
     template<class Check>
-    struct MANGOS_DLL_DECL WorldObjectSearcher
+    struct WorldObjectSearcher
     {
         uint32 i_phaseMask;
         WorldObject* &i_object;
@@ -222,7 +222,7 @@ namespace MaNGOS
     };
 
     template<class Check>
-    struct MANGOS_DLL_DECL WorldObjectListSearcher
+    struct WorldObjectListSearcher
     {
         uint32 i_phaseMask;
         std::list<WorldObject*> &i_objects;
@@ -241,7 +241,7 @@ namespace MaNGOS
     };
 
     template<class Do>
-    struct MANGOS_DLL_DECL WorldObjectWorker
+    struct WorldObjectWorker
     {
         uint32 i_phaseMask;
         Do const& i_do;
@@ -289,7 +289,7 @@ namespace MaNGOS
     // Gameobject searchers
 
     template<class Check>
-    struct MANGOS_DLL_DECL GameObjectSearcher
+    struct GameObjectSearcher
     {
         uint32 i_phaseMask;
         GameObject* &i_object;
@@ -305,7 +305,7 @@ namespace MaNGOS
 
     // Last accepted by Check GO if any (Check can change requirements at each call)
     template<class Check>
-    struct MANGOS_DLL_DECL GameObjectLastSearcher
+    struct GameObjectLastSearcher
     {
         uint32 i_phaseMask;
         GameObject* &i_object;
@@ -320,7 +320,7 @@ namespace MaNGOS
     };
 
     template<class Check>
-    struct MANGOS_DLL_DECL GameObjectListSearcher
+    struct GameObjectListSearcher
     {
         uint32 i_phaseMask;
         std::list<GameObject*> &i_objects;
@@ -338,7 +338,7 @@ namespace MaNGOS
 
     // First accepted by Check Unit if any
     template<class Check>
-    struct MANGOS_DLL_DECL UnitSearcher
+    struct UnitSearcher
     {
         uint32 i_phaseMask;
         Unit* &i_object;
@@ -355,7 +355,7 @@ namespace MaNGOS
 
     // Last accepted by Check Unit if any (Check can change requirements at each call)
     template<class Check>
-    struct MANGOS_DLL_DECL UnitLastSearcher
+    struct UnitLastSearcher
     {
         uint32 i_phaseMask;
         Unit* &i_object;
@@ -372,7 +372,7 @@ namespace MaNGOS
 
     // All accepted by Check units if any
     template<class Check>
-    struct MANGOS_DLL_DECL UnitListSearcher
+    struct UnitListSearcher
     {
         uint32 i_phaseMask;
         std::list<Unit*> &i_objects;
@@ -390,7 +390,7 @@ namespace MaNGOS
     // Creature searchers
 
     template<class Check>
-    struct MANGOS_DLL_DECL CreatureSearcher
+    struct CreatureSearcher
     {
         uint32 i_phaseMask;
         Creature* &i_object;
@@ -406,7 +406,7 @@ namespace MaNGOS
 
     // Last accepted by Check Creature if any (Check can change requirements at each call)
     template<class Check>
-    struct MANGOS_DLL_DECL CreatureLastSearcher
+    struct CreatureLastSearcher
     {
         uint32 i_phaseMask;
         Creature* &i_object;
@@ -421,7 +421,7 @@ namespace MaNGOS
     };
 
     template<class Check>
-    struct MANGOS_DLL_DECL CreatureListSearcher
+    struct CreatureListSearcher
     {
         uint32 i_phaseMask;
         std::list<Creature*> &i_objects;
@@ -436,7 +436,7 @@ namespace MaNGOS
     };
 
     template<class Do>
-    struct MANGOS_DLL_DECL CreatureWorker
+    struct CreatureWorker
     {
         uint32 i_phaseMask;
         Do& i_do;
@@ -457,7 +457,7 @@ namespace MaNGOS
     // Player searchers
 
     template<class Check>
-    struct MANGOS_DLL_DECL PlayerSearcher
+    struct PlayerSearcher
     {
         uint32 i_phaseMask;
         Player* &i_object;
@@ -472,7 +472,7 @@ namespace MaNGOS
     };
 
     template<class Check>
-    struct MANGOS_DLL_DECL PlayerListSearcher
+    struct PlayerListSearcher
     {
         uint32 i_phaseMask;
         std::list<Player*> &i_objects;
@@ -487,7 +487,7 @@ namespace MaNGOS
     };
 
     template<class Do>
-    struct MANGOS_DLL_DECL PlayerWorker
+    struct PlayerWorker
     {
         uint32 i_phaseMask;
         Do& i_do;
@@ -506,7 +506,7 @@ namespace MaNGOS
     };
 
     template<class Do>
-    struct MANGOS_DLL_DECL CameraDistWorker
+    struct CameraDistWorker
     {
         WorldObject const* i_searcher;
         float i_dist;
diff --git a/src/game/WorldHandlers/GridStates.h b/src/game/WorldHandlers/GridStates.h
index f636dad97..f37131a01 100644
--- a/src/game/WorldHandlers/GridStates.h
+++ b/src/game/WorldHandlers/GridStates.h
@@ -27,35 +27,35 @@
 
 #include "Map.h"
 
-class MANGOS_DLL_DECL GridState
+class GridState
 {
     public:
 
         virtual void Update(Map&, NGridType&, GridInfo&, const uint32& x, const uint32& y, const uint32& t_diff) const = 0;
 };
 
-class MANGOS_DLL_DECL InvalidState : public GridState
+class InvalidState : public GridState
 {
     public:
 
         void Update(Map&, NGridType&, GridInfo&, const uint32& x, const uint32& y, const uint32& t_diff) const override;
 };
 
-class MANGOS_DLL_DECL ActiveState : public GridState
+class ActiveState : public GridState
 {
     public:
 
         void Update(Map&, NGridType&, GridInfo&, const uint32& x, const uint32& y, const uint32& t_diff) const override;
 };
 
-class MANGOS_DLL_DECL IdleState : public GridState
+class IdleState : public GridState
 {
     public:
 
         void Update(Map&, NGridType&, GridInfo&, const uint32& x, const uint32& y, const uint32& t_diff) const override;
 };
 
-class MANGOS_DLL_DECL RemovalState : public GridState
+class RemovalState : public GridState
 {
     public:
 
diff --git a/src/game/WorldHandlers/MapManager.h b/src/game/WorldHandlers/MapManager.h
index 98f5fd89e..773b95ff3 100644
--- a/src/game/WorldHandlers/MapManager.h
+++ b/src/game/WorldHandlers/MapManager.h
@@ -35,7 +35,7 @@
 class Transport;
 class BattleGround;
 
-struct MANGOS_DLL_DECL MapID
+struct MapID
 {
     explicit MapID(uint32 id) : nMapId(id), nInstanceId(0) {}
     MapID(uint32 id, uint32 instid) : nMapId(id), nInstanceId(instid) {}
@@ -54,7 +54,7 @@ struct MANGOS_DLL_DECL MapID
     uint32 nInstanceId;
 };
 
-class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::ClassLevelLockable<MapManager, ACE_Recursive_Thread_Mutex> >
+class MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::ClassLevelLockable<MapManager, ACE_Recursive_Thread_Mutex> >
 {
         friend class MaNGOS::OperatorNew<MapManager>;
 
diff --git a/src/game/WorldHandlers/MapPersistentStateMgr.h b/src/game/WorldHandlers/MapPersistentStateMgr.h
index 96debafc0..2508d498e 100644
--- a/src/game/WorldHandlers/MapPersistentStateMgr.h
+++ b/src/game/WorldHandlers/MapPersistentStateMgr.h
@@ -334,7 +334,7 @@ class DungeonResetScheduler
         ResetTimeQueue m_resetTimeQueue;
 };
 
-class MANGOS_DLL_DECL MapPersistentStateManager : public MaNGOS::Singleton<MapPersistentStateManager, MaNGOS::ClassLevelLockable<MapPersistentStateManager, ACE_Thread_Mutex> >
+class MapPersistentStateManager : public MaNGOS::Singleton<MapPersistentStateManager, MaNGOS::ClassLevelLockable<MapPersistentStateManager, ACE_Thread_Mutex> >
 {
         friend class DungeonResetScheduler;
     public:                                                 // constructors
diff --git a/src/game/WorldHandlers/MiscHandler.cpp b/src/game/WorldHandlers/MiscHandler.cpp
index 8a1ce5baa..bc8b64bcc 100644
--- a/src/game/WorldHandlers/MiscHandler.cpp
+++ b/src/game/WorldHandlers/MiscHandler.cpp
@@ -40,7 +40,7 @@
 #include "LootMgr.h"
 #include "Chat.h"
 #include "ScriptMgr.h"
-#include <zlib/zlib.h>
+#include "zlib.h"
 #include "ObjectAccessor.h"
 #include "Object.h"
 #include "BattleGround/BattleGround.h"
diff --git a/src/game/WorldHandlers/ObjectGridLoader.cpp b/src/game/WorldHandlers/ObjectGridLoader.cpp
index 59e52dcfc..9d40935a6 100644
--- a/src/game/WorldHandlers/ObjectGridLoader.cpp
+++ b/src/game/WorldHandlers/ObjectGridLoader.cpp
@@ -34,7 +34,7 @@
 #include "CellImpl.h"
 #include "GridDefines.h"
 
-class MANGOS_DLL_DECL ObjectGridRespawnMover
+class ObjectGridRespawnMover
 {
     public:
         ObjectGridRespawnMover() {}
diff --git a/src/game/WorldHandlers/ObjectGridLoader.h b/src/game/WorldHandlers/ObjectGridLoader.h
index cda8db46c..4211224ec 100644
--- a/src/game/WorldHandlers/ObjectGridLoader.h
+++ b/src/game/WorldHandlers/ObjectGridLoader.h
@@ -34,7 +34,7 @@
 
 class ObjectWorldLoader;
 
-class MANGOS_DLL_DECL ObjectGridLoader
+class ObjectGridLoader
 {
         friend class ObjectWorldLoader;
 
@@ -61,7 +61,7 @@ class MANGOS_DLL_DECL ObjectGridLoader
         uint32 i_corpses;
 };
 
-class MANGOS_DLL_DECL ObjectGridUnloader
+class ObjectGridUnloader
 {
     public:
         ObjectGridUnloader(NGridType& grid) : i_grid(grid) {}
@@ -85,7 +85,7 @@ class MANGOS_DLL_DECL ObjectGridUnloader
         NGridType& i_grid;
 };
 
-class MANGOS_DLL_DECL ObjectGridStoper
+class ObjectGridStoper
 {
     public:
         ObjectGridStoper(NGridType& grid) : i_grid(grid) {}
diff --git a/src/game/WorldHandlers/ScriptMgr.cpp b/src/game/WorldHandlers/ScriptMgr.cpp
index 4936b9575..1d8885d00 100644
--- a/src/game/WorldHandlers/ScriptMgr.cpp
+++ b/src/game/WorldHandlers/ScriptMgr.cpp
@@ -38,7 +38,7 @@
 #include "OutdoorPvP/OutdoorPvP.h"
 #include "WaypointMovementGenerator.h"
 
-#include "revision_nr.h"
+#include "revision.h"
 
 ScriptMapMapName sQuestEndScripts;
 ScriptMapMapName sQuestStartScripts;
diff --git a/src/game/WorldHandlers/Spell.h b/src/game/WorldHandlers/Spell.h
index 76f2fba9d..0ea061e54 100644
--- a/src/game/WorldHandlers/Spell.h
+++ b/src/game/WorldHandlers/Spell.h
@@ -721,7 +721,7 @@ enum ReplenishType
 
 namespace MaNGOS
 {
-    struct MANGOS_DLL_DECL SpellNotifierPlayer              // Currently unused. When put to use this one requires handling for source-location (smilar to below)
+    struct SpellNotifierPlayer              // Currently unused. When put to use this one requires handling for source-location (smilar to below)
     {
         Spell::UnitList& i_data;
         Spell& i_spell;
@@ -756,7 +756,7 @@ namespace MaNGOS
         template<class SKIP> void Visit(GridRefManager<SKIP>&) {}
     };
 
-    struct MANGOS_DLL_DECL SpellNotifierCreatureAndPlayer
+    struct SpellNotifierCreatureAndPlayer
     {
         Spell::UnitList* i_data;
         Spell& i_spell;
diff --git a/src/game/WorldHandlers/UpdateData.cpp b/src/game/WorldHandlers/UpdateData.cpp
index 6eba2feef..4c2b244d7 100644
--- a/src/game/WorldHandlers/UpdateData.cpp
+++ b/src/game/WorldHandlers/UpdateData.cpp
@@ -30,7 +30,8 @@
 #include "Opcodes.h"
 #include "World.h"
 #include "ObjectGuid.h"
-#include <zlib/zlib.h>
+#include "zlib.h"
+
 
 UpdateData::UpdateData(uint16 map) : m_blockCount(0), m_map(map)
 {
diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt
index 5d60f6978..0316d8451 100644
--- a/src/mangosd/CMakeLists.txt
+++ b/src/mangosd/CMakeLists.txt
@@ -1,4 +1,7 @@
-# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+#
+# Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,27 +19,28 @@
 
 set(EXECUTABLE_NAME mangosd)
 
+#Main Files
+file(GLOB SRC_GRP_MAIN *.cpp *.h)
+source_group("Main" FILES ${SRC_GRP_MAIN})
+
+#Command Line Files
+file(GLOB SRC_GRP_COMM Comm/*.cpp Comm/*.h)
+source_group("Command Line" FILES ${SRC_GRP_COMM})
+
+#Remote Access Files
+file(GLOB SRC_GRP_RA RA/*.cpp RA/*.h)
+source_group("Remote Access" FILES ${SRC_GRP_RA})
+
 set(EXECUTABLE_SRCS
-    CliRunnable.cpp
-    CliRunnable.h
-    Main.cpp
-    Master.cpp
-    Master.h
-    RASocket.cpp
-    RASocket.h
-    WorldRunnable.cpp
-    WorldRunnable.h
+    ${SRC_GRP_COMM}
+    ${SRC_GRP_RA}
+    ${SRC_GRP_MAIN}
 )
 
 if(SOAP)
-    LIST(APPEND EXECUTABLE_SRCS
-        MaNGOSsoap.cpp
-        MaNGOSsoap.h
-        soapC.cpp
-        soapH.h
-        soapServer.cpp
-        soapStub.h
-    )
+    file(GLOB SRC_GRP_SOAP SOAP/*.cpp SOAP/*.h)
+    source_group("SOAP" FILES ${SRC_GRP_SOAP})
+    LIST(APPEND EXECUTABLE_SRCS ${SRC_GRP_SOAP})
 endif()
 
 if(WIN32)
@@ -45,23 +49,38 @@ if(WIN32)
 endif()
 
 include_directories(
-    "${CMAKE_SOURCE_DIR}/src/shared"
-    "${CMAKE_SOURCE_DIR}/src/framework"
-    "${CMAKE_SOURCE_DIR}/src/game/AuctionHouseBot"
-    "${CMAKE_SOURCE_DIR}/src/game/BattleGround"
-    "${CMAKE_SOURCE_DIR}/src/game/Server"
-    "${CMAKE_SOURCE_DIR}/src/game/WorldHandlers"
-    "${CMAKE_SOURCE_DIR}/src/game/Object"
-    "${CMAKE_SOURCE_DIR}/src/game/Tools"
-    "${CMAKE_SOURCE_DIR}/src/game/References"
-    "${CMAKE_SOURCE_DIR}/src/game/MotionGenerators"
-    "${CMAKE_SOURCE_DIR}/src/game/vmap"
-    "${CMAKE_BINARY_DIR}"
-    "${CMAKE_BINARY_DIR}/src/shared"
-    "${ACE_INCLUDE_DIR}"
-    "${OPENSSL_INCLUDE_DIR}"
+    ${CMAKE_SOURCE_DIR}/src/shared
+    ${CMAKE_SOURCE_DIR}/src/shared/Common
+    ${CMAKE_SOURCE_DIR}/src/shared/Threading
+    ${CMAKE_SOURCE_DIR}/src/shared/Utilities
+    ${CMAKE_SOURCE_DIR}/src/shared/Log
+    ${CMAKE_SOURCE_DIR}/src/shared/DataStores
+    ${CMAKE_SOURCE_DIR}/src/shared/Win
+    ${CMAKE_SOURCE_DIR}/src/shared/Linux
+    ${CMAKE_SOURCE_DIR}/src/framework
+    ${CMAKE_SOURCE_DIR}/src/game/AuctionHouseBot
+    ${CMAKE_SOURCE_DIR}/src/game/BattleGround
+    ${CMAKE_SOURCE_DIR}/src/game/Server
+    ${CMAKE_SOURCE_DIR}/src/game/WorldHandlers
+    ${CMAKE_SOURCE_DIR}/src/game/Maps
+    ${CMAKE_SOURCE_DIR}/src/game/Object
+    ${CMAKE_SOURCE_DIR}/src/game/Tools
+    ${CMAKE_SOURCE_DIR}/src/game/References
+    ${CMAKE_SOURCE_DIR}/src/game/MotionGenerators
+    ${CMAKE_SOURCE_DIR}/src/game/vmap
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_BINARY_DIR}/src/shared
+    ${ACE_INCLUDE_DIR}
+    ${OPENSSL_INCLUDE_DIR}
 )
 
+if(PLAYERBOTS)
+    include_directories(
+        ${CMAKE_SOURCE_DIR}/src/modules/Bots/playerbot
+        ${CMAKE_SOURCE_DIR}/src/modules/Bots/ahbot
+    )
+endif()
+
 if(SCRIPT_LIB_ELUNA)
     include_directories(${CMAKE_SOURCE_DIR}/src/modules/Eluna)
     include_directories(${CMAKE_SOURCE_DIR}/dep/lualib)
@@ -72,24 +91,16 @@ if(SCRIPT_LIB_SD2)
 endif()
 
 if(SOAP)
-    include_directories("${CMAKE_SOURCE_DIR}/dep/include/gsoap")
+    include_directories(${CMAKE_SOURCE_DIR}/dep/gsoap)
 endif()
 
-if(POSTGRESQL)
-  include_directories("${PGSQL_INCLUDE_DIR}")
-else()
-  include_directories("${MYSQL_INCLUDE_DIR}")
-endif()
-
-add_executable(${EXECUTABLE_NAME}
-  ${EXECUTABLE_SRCS}
-)
+add_executable(${EXECUTABLE_NAME} ${EXECUTABLE_SRCS})
 
 if(NOT ACE_USE_EXTERNAL)
-  add_dependencies(${EXECUTABLE_NAME} ace)
-  target_link_libraries(${EXECUTABLE_NAME} ace)
+    add_dependencies(${EXECUTABLE_NAME} ace)
+    target_link_libraries(${EXECUTABLE_NAME} ace)
 else()
-  target_link_libraries(${EXECUTABLE_NAME} ACE)
+    target_link_libraries(${EXECUTABLE_NAME} ACE)
 endif()
 
 target_link_libraries(${EXECUTABLE_NAME}
@@ -97,82 +108,72 @@ target_link_libraries(${EXECUTABLE_NAME}
     shared
     framework
     g3dlite
+    ${OPENSSL_LIBRARIES}
 )
 
+if(POSTGRESQL)
+    include_directories(${PostgreSQL_INCLUDE_DIR})
+    target_link_libraries(${EXECUTABLE_NAME} ${PostgreSQL_LIBRARIES})
+else()
+    include_directories(${MYSQL_INCLUDE_DIR})
+    target_link_libraries(${EXECUTABLE_NAME} ${MYSQL_LIBRARY})
+endif()
+
 add_dependencies(${EXECUTABLE_NAME} game)
 
 if(SOAP)
-    target_link_libraries(${EXECUTABLE_NAME}
-        gsoap
-    )
+    target_link_libraries(${EXECUTABLE_NAME} gsoap)
 endif()
 
 if(WIN32)
-  target_link_libraries(${EXECUTABLE_NAME}
-    zlib
-    optimized ${MYSQL_LIBRARY}
-    optimized ${OPENSSL_LIBRARIES}
-    debug ${MYSQL_DEBUG_LIBRARY}
-    debug ${OPENSSL_DEBUG_LIBRARIES}
-  )
-  if(PLATFORM MATCHES X86)
-    target_link_libraries(${EXECUTABLE_NAME})
-  endif()
+    target_link_libraries(${EXECUTABLE_NAME} zlib)
 endif()
 
 if(UNIX)
-  target_link_libraries(${EXECUTABLE_NAME}
-    ${MYSQL_LIBRARY}
-    ${OPENSSL_LIBRARIES}
-    ${OPENSSL_EXTRA_LIBRARIES}
-    ${ZLIB_LIBRARIES}
-  )
+    target_link_libraries(${EXECUTABLE_NAME}
+        ${OPENSSL_EXTRA_LIBRARIES}
+        ${ZLIB_LIBRARIES}
+    )
 endif()
 
 set(EXECUTABLE_LINK_FLAGS "")
 
 if(UNIX)
-  if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-    set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -pthread -lrt ${EXECUTABLE_LINK_FLAGS} -rdynamic")
-  elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -ldl -pthread -lrt ${EXECUTABLE_LINK_FLAGS} -rdynamic")
-  endif()
+    if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+        set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -pthread -lrt ${EXECUTABLE_LINK_FLAGS} -rdynamic")
+    elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -ldl -pthread -lrt ${EXECUTABLE_LINK_FLAGS} -rdynamic")
+    endif()
 endif()
 
 if(APPLE)
-  set(EXECUTABLE_LINK_FLAGS "-framework Carbon ${EXECUTABLE_LINK_FLAGS}")
+    set(EXECUTABLE_LINK_FLAGS "-framework Carbon ${EXECUTABLE_LINK_FLAGS}")
 endif()
 
-set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS
-  "${EXECUTABLE_LINK_FLAGS}"
-)
+set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS "${EXECUTABLE_LINK_FLAGS}")
 
 install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_DIR}")
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mangosd.conf.dist.in" "${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist" DESTINATION "${CONF_INSTALL_DIR}")
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mangosd.conf.dist.in ${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist DESTINATION ${CONF_INSTALL_DIR})
 
 if(WIN32 AND MSVC)
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}" CONFIGURATIONS Debug)
-  add_custom_command(TARGET ${EXECUTABLE_NAME}
-    POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist" "${CONF_COPY_DIR}"
-  )
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}" CONFIGURATIONS Debug)
+    add_custom_command(TARGET ${EXECUTABLE_NAME}
+        POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist" "${CONF_COPY_DIR}"
+    )
 endif()
 
 #Copy dlls to build dir
 if(WIN32)
-  if(MSVC)
-   add_custom_command(TARGET ${EXECUTABLE_NAME}
-     POST_BUILD
-     COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/libeay32.dll" "${CMAKE_BINARY_DIR}/bin/$(Configuration)/"
-     COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/ssleay32.dll" "${CMAKE_BINARY_DIR}/bin/$(Configuration)/"
-     COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/libmySQL.dll" "${CMAKE_BINARY_DIR}/bin/$(Configuration)/"
-   )
-  elseif(XCODE)
-   add_custom_command(TARGET ${EXECUTABLE_NAME}
-     POST_BUILD
-     COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/libeay32.dll" "${CMAKE_BINARY_DIR}/bin/"
-     COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/ssleay32.dll" "${CMAKE_BINARY_DIR}/bin/"
-     COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dep/lib/${DEP_ARCH}/libmySQL.dll" "${CMAKE_BINARY_DIR}/bin/"
-   )
-  endif()
+    if(MSVC)
+        add_custom_command(TARGET ${EXECUTABLE_NAME}
+            POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_INCLUDE_DIR}/../lib/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/$(Configuration)/"
+        )
+    elseif(XCODE)
+        add_custom_command(TARGET ${EXECUTABLE_NAME}
+            POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_INCLUDE_DIR}/../lib/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/"
+        )
+    endif()
 endif()
diff --git a/src/mangosd/CliRunnable.cpp b/src/mangosd/Comm/CliRunnable.cpp
similarity index 92%
rename from src/mangosd/CliRunnable.cpp
rename to src/mangosd/Comm/CliRunnable.cpp
index e7742f272..17c0e72a7 100644
--- a/src/mangosd/CliRunnable.cpp
+++ b/src/mangosd/Comm/CliRunnable.cpp
@@ -40,13 +40,13 @@
 #include "Player.h"
 #include "Chat.h"
 
-void utf8print(void* arg, const char* str)
+void utf8print(void* /*arg*/, const char* str)
 {
 #if PLATFORM == PLATFORM_WINDOWS
     wchar_t wtemp_buf[6000];
     size_t wtemp_len = 6000 - 1;
     if (!Utf8toWStr(str, strlen(str), wtemp_buf, wtemp_len))
-        return;
+        { return; }
 
     char temp_buf[6000];
     CharToOemBuffW(&wtemp_buf[0], &temp_buf[0], wtemp_len + 1);
@@ -56,7 +56,7 @@ void utf8print(void* arg, const char* str)
 #endif
 }
 
-void commandFinished(void*, bool sucess)
+void commandFinished(void*, bool /*sucess*/)
 {
     printf("mangos>");
     fflush(stdout);
@@ -67,18 +67,18 @@ void commandFinished(void*, bool sucess)
 bool ChatHandler::HandleAccountDeleteCommand(char* args)
 {
     if (!*args)
-        return false;
+        { return false; }
 
     std::string account_name;
     uint32 account_id = ExtractAccountId(&args, &account_name);
     if (!account_id)
-        return false;
+        { return false; }
 
     /// Commands not recommended call from chat, but support anyway
     /// can delete only for account with less security
     /// This is also reject self apply in fact
     if (HasLowerSecurityAccount(NULL, account_id, true))
-        return false;
+        { return false; }
 
     AccountOpResult result = sAccountMgr.DeleteAccount(account_id);
     switch (result)
@@ -117,18 +117,18 @@ bool ChatHandler::GetDeletedCharacterInfoList(DeletedInfoList& foundList, std::s
     {
         // search by GUID
         if (isNumeric(searchString))
-            resultChar = CharacterDatabase.PQuery("SELECT guid, deleteInfos_Name, deleteInfos_Account, deleteDate FROM characters WHERE deleteDate IS NOT NULL AND guid = %u", uint32(atoi(searchString.c_str())));
+            { resultChar = CharacterDatabase.PQuery("SELECT guid, deleteInfos_Name, deleteInfos_Account, deleteDate FROM characters WHERE deleteDate IS NOT NULL AND guid = %u", uint32(atoi(searchString.c_str()))); }
         // search by name
         else
         {
             if (!normalizePlayerName(searchString))
-                return false;
+                { return false; }
 
             resultChar = CharacterDatabase.PQuery("SELECT guid, deleteInfos_Name, deleteInfos_Account, deleteDate FROM characters WHERE deleteDate IS NOT NULL AND deleteInfos_Name " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'"), searchString.c_str());
         }
     }
     else
-        resultChar = CharacterDatabase.Query("SELECT guid, deleteInfos_Name, deleteInfos_Account, deleteDate FROM characters WHERE deleteDate IS NOT NULL");
+        { resultChar = CharacterDatabase.Query("SELECT guid, deleteInfos_Name, deleteInfos_Account, deleteDate FROM characters WHERE deleteDate IS NOT NULL"); }
 
     if (resultChar)
     {
@@ -180,7 +180,7 @@ std::string ChatHandler::GenerateDeletedCharacterGUIDsWhereStr(DeletedInfoList::
 
         DeletedInfoList::const_iterator itr2 = itr;
         if (++itr2 != itr_end)
-            wherestr << "','";
+            { wherestr << "','"; }
     }
     wherestr << "')";
     return wherestr.str();
@@ -220,7 +220,7 @@ void ChatHandler::HandleCharacterDeletedListHelper(DeletedInfoList const& foundL
     }
 
     if (!m_session)
-        SendSysMessage(LANG_CHARACTER_DELETED_LIST_BAR);
+        { SendSysMessage(LANG_CHARACTER_DELETED_LIST_BAR); }
 }
 
 /**
@@ -237,7 +237,7 @@ bool ChatHandler::HandleCharacterDeletedListCommand(char* args)
 {
     DeletedInfoList foundList;
     if (!GetDeletedCharacterInfoList(foundList, args))
-        return false;
+        { return false; }
 
     // if no characters have been found, output a warning
     if (foundList.empty())
@@ -301,7 +301,7 @@ bool ChatHandler::HandleCharacterDeletedRestoreCommand(char* args)
 {
     // It is required to submit at least one argument
     if (!*args)
-        return false;
+        { return false; }
 
     std::string searchString;
     std::string newCharName;
@@ -313,7 +313,7 @@ bool ChatHandler::HandleCharacterDeletedRestoreCommand(char* args)
 
     DeletedInfoList foundList;
     if (!GetDeletedCharacterInfoList(foundList, searchString))
-        return false;
+        { return false; }
 
     if (foundList.empty())
     {
@@ -328,7 +328,7 @@ bool ChatHandler::HandleCharacterDeletedRestoreCommand(char* args)
     {
         // Drop nonexistent account cases
         for (DeletedInfoList::iterator itr = foundList.begin(); itr != foundList.end(); ++itr)
-            HandleCharacterDeletedRestoreHelper(*itr);
+            { HandleCharacterDeletedRestoreHelper(*itr); }
     }
     else if (foundList.size() == 1 && normalizePlayerName(newCharName))
     {
@@ -347,7 +347,7 @@ bool ChatHandler::HandleCharacterDeletedRestoreCommand(char* args)
         HandleCharacterDeletedRestoreHelper(delInfo);
     }
     else
-        SendSysMessage(LANG_CHARACTER_DELETED_ERR_RENAME);
+        { SendSysMessage(LANG_CHARACTER_DELETED_ERR_RENAME); }
 
     return true;
 }
@@ -366,11 +366,11 @@ bool ChatHandler::HandleCharacterDeletedDeleteCommand(char* args)
 {
     // It is required to submit at least one argument
     if (!*args)
-        return false;
+        { return false; }
 
     DeletedInfoList foundList;
     if (!GetDeletedCharacterInfoList(foundList, args))
-        return false;
+        { return false; }
 
     if (foundList.empty())
     {
@@ -383,7 +383,7 @@ bool ChatHandler::HandleCharacterDeletedDeleteCommand(char* args)
 
     // Call the appropriate function to delete them (current account for deleted characters is 0)
     for (DeletedInfoList::const_iterator itr = foundList.begin(); itr != foundList.end(); ++itr)
-        Player::DeleteFromDB(ObjectGuid(HIGHGUID_PLAYER, itr->lowguid), 0, false, true);
+        { Player::DeleteFromDB(ObjectGuid(HIGHGUID_PLAYER, itr->lowguid), 0, false, true); }
 
     return true;
 }
@@ -404,10 +404,10 @@ bool ChatHandler::HandleCharacterDeletedOldCommand(char* args)
     int32 keepDays = sWorld.getConfig(CONFIG_UINT32_CHARDELETE_KEEP_DAYS);
 
     if (!ExtractOptInt32(&args, keepDays, sWorld.getConfig(CONFIG_UINT32_CHARDELETE_KEEP_DAYS)))
-        return false;
+        { return false; }
 
     if (keepDays < 0)
-        return false;
+        { return false; }
 
     Player::DeleteOldCharacters((uint32)keepDays);
     return true;
@@ -417,13 +417,13 @@ bool ChatHandler::HandleCharacterEraseCommand(char* args)
 {
     char* nameStr = ExtractLiteralArg(&args);
     if (!nameStr)
-        return false;
+        { return false; }
 
     Player* target;
     ObjectGuid target_guid;
     std::string target_name;
     if (!ExtractPlayerTarget(&nameStr, &target, &target_guid, &target_name))
-        return false;
+        { return false; }
 
     uint32 account_id;
 
@@ -433,7 +433,7 @@ bool ChatHandler::HandleCharacterEraseCommand(char* args)
         target->GetSession()->KickPlayer();
     }
     else
-        account_id = sObjectMgr.GetPlayerAccountIdByGUID(target_guid);
+        { account_id = sObjectMgr.GetPlayerAccountIdByGUID(target_guid); }
 
     std::string account_name;
     sAccountMgr.GetName(account_id, account_name);
@@ -464,7 +464,7 @@ bool ChatHandler::HandleAccountOnlineListCommand(char* args)
 {
     uint32 limit;
     if (!ExtractOptUInt32(&args, limit, 100))
-        return false;
+        { return false; }
 
     ///- Get the list of accounts ID logged to the realm
     //                                                 0   1         2        3        4
@@ -480,7 +480,7 @@ bool ChatHandler::HandleAccountCreateCommand(char* args)
     char* szAcc = ExtractQuotedOrLiteralArg(&args);
     char* szPassword = ExtractQuotedOrLiteralArg(&args);
     if (!szAcc || !szPassword)
-        return false;
+        { return false; }
 
     // normalized in accmgr.CreateAccount
     std::string account_name = szAcc;
@@ -501,7 +501,7 @@ bool ChatHandler::HandleAccountCreateCommand(char* args)
             SendSysMessage(LANG_ACCOUNT_TOO_LONG);
             SetSentErrorMessage(true);
             return false;
-        case AOR_NAME_ALREDY_EXIST:
+        case AOR_NAME_ALREADY_EXIST:
             SendSysMessage(LANG_ACCOUNT_ALREADY_EXIST);
             SetSentErrorMessage(true);
             return false;
@@ -526,13 +526,13 @@ bool ChatHandler::HandleServerLogFilterCommand(char* args)
         SendSysMessage(LANG_LOG_FILTERS_STATE_HEADER);
         for (int i = 0; i < LOG_FILTER_COUNT; ++i)
             if (*logFilterData[i].name)
-                PSendSysMessage("  %-20s = %s", logFilterData[i].name, GetOnOffStr(sLog.HasLogFilter(1 << i)));
+                { PSendSysMessage("  %-20s = %s", logFilterData[i].name, GetOnOffStr(sLog.HasLogFilter(1 << i))); }
         return true;
     }
 
     char* filtername = ExtractLiteralArg(&args);
     if (!filtername)
-        return false;
+        { return false; }
 
     bool value;
     if (!ExtractOnOff(&args, value))
@@ -552,7 +552,7 @@ bool ChatHandler::HandleServerLogFilterCommand(char* args)
     for (int i = 0; i < LOG_FILTER_COUNT; ++i)
     {
         if (!*logFilterData[i].name)
-            continue;
+            { continue; }
 
         if (!strncmp(filtername, logFilterData[i].name, strlen(filtername)))
         {
@@ -607,7 +607,7 @@ void CliRunnable::run()
     sLog.outString();
 
     if (sConfig.GetBoolDefault("BeepAtStart", true))
-        printf("\a");                                       // \a = Alert
+        { printf("\a"); }                                       // \a = Alert
 
     // print this here the first time
     // later it will be printed after command queue updates
@@ -620,9 +620,9 @@ void CliRunnable::run()
 #ifdef linux
         while (!kb_hit_return() && !World::IsStopped())
             // With this, we limit CLI to 10commands/second
-            usleep(100);
+            { usleep(100); }
         if (World::IsStopped())
-            break;
+            { break; }
 #endif
         char* command_str = fgets(commandbuf, sizeof(commandbuf), stdin);
         if (command_str != NULL)
diff --git a/src/mangosd/CliRunnable.h b/src/mangosd/Comm/CliRunnable.h
similarity index 88%
rename from src/mangosd/CliRunnable.h
rename to src/mangosd/Comm/CliRunnable.h
index 1b219bdf1..a055fdfc9 100644
--- a/src/mangosd/CliRunnable.h
+++ b/src/mangosd/Comm/CliRunnable.h
@@ -26,16 +26,23 @@
 /// @{
 /// \file
 
-#ifndef __CLIRUNNABLE_H
-#define __CLIRUNNABLE_H
+#ifndef MANGOS_H_CLIRUNNABLE
+#define MANGOS_H_CLIRUNNABLE
 
 #include "Common.h"
 #include "Threading.h"
 
-/// Command Line Interface handling thread
+/**
+ * @brief Command Line Interface handling thread
+ *
+ */
 class CliRunnable : public ACE_Based::Runnable
 {
     public:
+        /**
+         * @brief
+         *
+         */
         void run() override;
 };
 #endif
diff --git a/src/mangosd/Main.cpp b/src/mangosd/Main.cpp
index cd46f1147..2e60de4dc 100644
--- a/src/mangosd/Main.cpp
+++ b/src/mangosd/Main.cpp
@@ -34,8 +34,7 @@
 #include "Master.h"
 #include "SystemConfig.h"
 #include "AuctionHouseBot.h"
-//#include "revision.h"
-#include "revision_nr.h"
+#include "revision.h"
 #include <openssl/opensslv.h>
 #include <openssl/crypto.h>
 #include <ace/Version.h>
@@ -211,7 +210,13 @@ extern int main(int argc, char** argv)
 
     ///- and run the 'Master'
     /// \todo Why do we need this 'Master'? Can't all of this be in the Main as for Realmd?
-    return sMaster.Run();
+    int code = sMaster.Run();
+
+#ifdef WIN32
+    _set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
+#endif
+
+    return code;
 
     // at sMaster return function exist with codes
     // 0 - normal shutdown
diff --git a/src/mangosd/Master.cpp b/src/mangosd/Master.cpp
index 8ddabd61e..c7e4a628f 100644
--- a/src/mangosd/Master.cpp
+++ b/src/mangosd/Master.cpp
@@ -42,15 +42,15 @@
 #include "SystemConfig.h"
 #include "Config/Config.h"
 #include "Database/DatabaseEnv.h"
-#include "CliRunnable.h"
-#include "RASocket.h"
+#include "Comm/CliRunnable.h"
+#include "RA/RASocket.h"
 #include "Util.h"
-#include "revision_sql.h"
+#include "revision.h"
 #include "MassMailMgr.h"
 #include "DBCStores.h"
 #include "ScriptMgr.h"
 #ifdef ENABLE_SOAP
-#include "MaNGOSsoap.h"
+#include "SOAP/MaNGOSsoap.h"
 #endif
 
 #include <ace/OS_NS_signal.h>
@@ -570,7 +570,7 @@ void Master::clearOnlineAccounts()
 {
     // Cleanup online status for characters hosted at current realm
     /// \todo Only accounts with characters logged on *this* realm should have online status reset. Move the online column from 'account' to 'realmcharacters'?
-    LoginDatabase.PExecute("UPDATE account SET active_realm_id = 0 WHERE active_realm_id = '%u'", realmID);
+    LoginDatabase.PExecute("UPDATE account SET active_realm_id = 0, os = ''  WHERE active_realm_id = '%u'", realmID);
 
     CharacterDatabase.Execute("UPDATE characters SET online = 0 WHERE online<>0");
 
diff --git a/src/mangosd/RASocket.cpp b/src/mangosd/RA/RASocket.cpp
similarity index 95%
rename from src/mangosd/RASocket.cpp
rename to src/mangosd/RA/RASocket.cpp
index 33e41d03a..d926fe0ef 100644
--- a/src/mangosd/RASocket.cpp
+++ b/src/mangosd/RA/RASocket.cpp
@@ -90,7 +90,7 @@ int RASocket::open(void*)
 int RASocket::close(int)
 {
     if (closing_)
-        return -1;
+        { return -1; }
     DEBUG_LOG("RASocket::close");
     shutdown();
 
@@ -103,14 +103,14 @@ int RASocket::close(int)
 int RASocket::handle_close(ACE_HANDLE h, ACE_Reactor_Mask)
 {
     if (closing_)
-        return -1;
+        { return -1; }
     DEBUG_LOG("RASocket::handle_close");
     ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, outBufferLock, -1);
 
     closing_ = true;
 
     if (h == ACE_INVALID_HANDLE)
-        peer().close_writer();
+        { peer().close_writer(); }
     remove_reference();
     return 0;
 }
@@ -120,7 +120,7 @@ int RASocket::handle_output(ACE_HANDLE)
     ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, outBufferLock, -1);
 
     if (closing_)
-        return -1;
+        { return -1; }
 
     if (!outputBufferLen)
     {
@@ -139,7 +139,7 @@ int RASocket::handle_output(ACE_HANDLE)
 #endif // MSG_NOSIGNAL
 
     if (n <= 0)
-        return -1;
+        { return -1; }
 
     ACE_OS::memmove(outputBuffer, outputBuffer + n, outputBufferLen - n);
 
@@ -226,7 +226,7 @@ int RASocket::handle_input(ACE_HANDLE)
 
                 ///- allow by remotely connected admin use console level commands dependent from config setting
                 if (accAccessLevel >= SEC_ADMINISTRATOR && !bStricted)
-                    accAccessLevel = SEC_CONSOLE;
+                    { accAccessLevel = SEC_CONSOLE; }
 
                 stage = LG;
                 sendf(sObjectMgr.GetMangosStringForDBCLocale(LANG_RA_PASS));
@@ -267,7 +267,7 @@ int RASocket::handle_input(ACE_HANDLE)
                 {
                     sLog.outRALog("Got '%s' cmd.", inputBuffer);
                     if (strncmp(inputBuffer, "quit", 4) == 0)
-                        return -1;
+                        { return -1; }
                     else
                     {
                         CliCommandHolder* cmd = new CliCommandHolder(accId, accAccessLevel, this, inputBuffer, &RASocket::zprint, &RASocket::commandFinished);
@@ -276,7 +276,7 @@ int RASocket::handle_input(ACE_HANDLE)
                     }
                 }
                 else
-                    sendf("mangos>");
+                    { sendf("mangos>"); }
                 break;
                 ///</ul>
         };
@@ -289,12 +289,12 @@ int RASocket::handle_input(ACE_HANDLE)
 void RASocket::zprint(void* callbackArg, const char* szText)
 {
     if (!szText)
-        return;
+        { return; }
 
     ((RASocket*)callbackArg)->sendf(szText);
 }
 
-void RASocket::commandFinished(void* callbackArg, bool success)
+void RASocket::commandFinished(void* callbackArg, bool /*success*/)
 {
     RASocket* raSocket = (RASocket*)callbackArg;
     raSocket->sendf("mangos>");
@@ -306,12 +306,12 @@ int RASocket::sendf(const char* msg)
     ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, outBufferLock, -1);
 
     if (closing_)
-        return -1;
+        { return -1; }
 
     int msgLen = strlen(msg);
 
     if (msgLen + outputBufferLen > RA_BUFF_SIZE)
-        return -1;
+        { return -1; }
 
     ACE_OS::memcpy(outputBuffer + outputBufferLen, msg, msgLen);
     outputBufferLen += msgLen;
@@ -319,7 +319,7 @@ int RASocket::sendf(const char* msg)
     if (!outActive)
     {
         if (reactor()->schedule_wakeup
-                (this, ACE_Event_Handler::WRITE_MASK) == -1)
+            (this, ACE_Event_Handler::WRITE_MASK) == -1)
         {
             sLog.outError("RASocket::sendf error while schedule_wakeup");
             return -1;
diff --git a/src/mangosd/RASocket.h b/src/mangosd/RA/RASocket.h
similarity index 52%
rename from src/mangosd/RASocket.h
rename to src/mangosd/RA/RASocket.h
index 984dc65d6..ed923c58f 100644
--- a/src/mangosd/RASocket.h
+++ b/src/mangosd/RA/RASocket.h
@@ -39,62 +39,127 @@
 
 #define RA_BUFF_SIZE 8192
 
-/// Remote Administration socket
+/**
+ * @brief Remote Administration socket
+ *
+ */
 typedef ACE_Svc_Handler < ACE_SOCK_STREAM, ACE_NULL_SYNCH> RAHandler;
+/**
+ * @brief
+ *
+ */
 class RASocket: protected RAHandler
 {
     public:
-        ACE_Semaphore pendingCommands;
+        ACE_Semaphore pendingCommands; /**< TODO */
+        /**
+         * @brief
+         *
+         */
         typedef ACE_Acceptor<RASocket, ACE_SOCK_ACCEPTOR > Acceptor;
         friend class ACE_Acceptor<RASocket, ACE_SOCK_ACCEPTOR >;
 
+        /**
+         * @brief
+         *
+         * @param
+         * @return int
+         */
         int sendf(const char*);
 
     protected:
-        /// things called by ACE framework.
+        /**
+         * @brief things called by ACE framework.
+         *
+         */
         RASocket(void);
+        /**
+         * @brief
+         *
+         */
         virtual ~RASocket(void);
 
-        /// Called on open ,the void* is the acceptor.
+        /**
+         * @brief Called on open ,the void* is the acceptor.
+         *
+         * @param
+         * @return int
+         */
         virtual int open(void*) override;
 
-        /// Called on failures inside of the acceptor, don't call from your code.
+        /**
+         * @brief Called on failures inside of the acceptor, don't call from your code.
+         *
+         * @param int
+         * @return int
+         */
         virtual int close(int);
 
-        /// Called when we can read from the socket.
+        /**
+         * @brief Called when we can read from the socket.
+         *
+         * @param ACE_HANDLE
+         * @return int
+         */
         virtual int handle_input(ACE_HANDLE = ACE_INVALID_HANDLE) override;
 
-        /// Called when the socket can write.
+        /**
+         * @brief Called when the socket can write.
+         *
+         * @param ACE_HANDLE
+         * @return int
+         */
         virtual int handle_output(ACE_HANDLE = ACE_INVALID_HANDLE) override;
 
-        /// Called when connection is closed or error happens.
+        /**
+         * @brief Called when connection is closed or error happens.
+         *
+         * @param ACE_HANDLE
+         * @param ACE_Reactor_Mask
+         * @return int
+         */
         virtual int handle_close(ACE_HANDLE = ACE_INVALID_HANDLE,
                                  ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
 
     private:
-        bool outActive;
+        bool outActive; /**< TODO */
 
-        char inputBuffer[RA_BUFF_SIZE];
-        uint32 inputBufferLen;
+        char inputBuffer[RA_BUFF_SIZE]; /**< TODO */
+        uint32 inputBufferLen; /**< TODO */
 
-        ACE_Thread_Mutex outBufferLock;
-        char outputBuffer[RA_BUFF_SIZE];
-        uint32 outputBufferLen;
+        ACE_Thread_Mutex outBufferLock; /**< TODO */
+        char outputBuffer[RA_BUFF_SIZE]; /**< TODO */
+        uint32 outputBufferLen; /**< TODO */
 
-        uint32 accId;
-        AccountTypes accAccessLevel;
-        bool bSecure;                                       // kick on wrong pass, non exist. user OR user with no priv
-        // will protect from DOS, bruteforce attacks
-        bool bStricted;                                     // not allow execute console only commands (SEC_CONSOLE) remotly
-        AccountTypes iMinLevel;
+        uint32 accId; /**< TODO */
+        AccountTypes accAccessLevel; /**< TODO */
+        bool bSecure;                                       /**< kick on wrong pass, non exist. user OR user with no priv. will protect from DOS, bruteforce attacks */
+        bool bStricted;                                     /**< not allow execute console only commands (SEC_CONSOLE) remotly */
+        AccountTypes iMinLevel; /**< TODO */
+        /**
+         * @brief
+         *
+         */
         enum
         {
             NONE,                                           // initial value
             LG,                                             // only login was entered
-            OK,                                             // both login and pass were given, they were correct and user has enough priv.
-        } stage;
+            OK                                              // both login and pass were given, they were correct and user has enough priv.
+        } stage; /**< TODO */
 
+        /**
+         * @brief
+         *
+         * @param callbackArg
+         * @param szText
+         */
         static void zprint(void* callbackArg, const char* szText);
+        /**
+         * @brief
+         *
+         * @param callbackArg
+         * @param success
+         */
         static void commandFinished(void* callbackArg, bool success);
 };
 #endif
diff --git a/src/mangosd/MaNGOSsoap.cpp b/src/mangosd/SOAP/MaNGOSsoap.cpp
similarity index 96%
rename from src/mangosd/MaNGOSsoap.cpp
rename to src/mangosd/SOAP/MaNGOSsoap.cpp
index eb36e696f..0e019f6a8 100644
--- a/src/mangosd/MaNGOSsoap.cpp
+++ b/src/mangosd/SOAP/MaNGOSsoap.cpp
@@ -123,7 +123,7 @@ int ns1__executeCommand(soap* soap, char* command, char** result)
     }
 
     if (!command || !*command)
-        return soap_sender_fault(soap, "Command mustn't be empty", "The supplied command was an empty string");
+        { return soap_sender_fault(soap, "Command mustn't be empty", "The supplied command was an empty string"); }
 
     DEBUG_LOG("MaNGOSsoap: got command '%s'", command);
     SOAPCommand connection;
@@ -152,7 +152,7 @@ int ns1__executeCommand(soap* soap, char* command, char** result)
         return SOAP_OK;
     }
     else
-        return soap_sender_fault(soap, printBuffer, printBuffer);
+        { return soap_sender_fault(soap, printBuffer, printBuffer); }
 }
 
 void SOAPCommand::commandFinished(void* soapconnection, bool success)
diff --git a/src/mangosd/MaNGOSsoap.h b/src/mangosd/SOAP/MaNGOSsoap.h
similarity index 100%
rename from src/mangosd/MaNGOSsoap.h
rename to src/mangosd/SOAP/MaNGOSsoap.h
diff --git a/src/mangosd/WorldRunnable.cpp b/src/mangosd/WorldRunnable.cpp
index ab25e44eb..ffc166d32 100644
--- a/src/mangosd/WorldRunnable.cpp
+++ b/src/mangosd/WorldRunnable.cpp
@@ -31,10 +31,15 @@
 #include "World.h"
 #include "WorldRunnable.h"
 #include "Timer.h"
+#include "ObjectAccessor.h"
 #include "MapManager.h"
 
 #include "Database/DatabaseEnv.h"
 
+#ifdef ENABLE_ELUNA 
+#include "LuaEngine.h" 
+#endif /* ENABLE_ELUNA */ 
+
 #define WORLD_SLEEP_CONST 50
 
 #ifdef WIN32
@@ -45,9 +50,9 @@ extern int m_ServiceStatus;
 /// Heartbeat for the World
 void WorldRunnable::run()
 {
-    ///- Init new SQL thread for the world database
-    WorldDatabase.ThreadStart();                            // let thread do safe mySQL requests (one connection call enough)
-    sWorld.InitResultQueue();
+#ifdef ENABLE_ELUNA
+    sEluna->OnStartup();
+#endif /* ENABLE_ELUNA */
 
     uint32 realCurrTime = 0;
     uint32 realPrevTime = WorldTimer::tick();
@@ -75,20 +80,35 @@ void WorldRunnable::run()
             ACE_Based::Thread::Sleep(prevSleepTime);
         }
         else
+        {
             prevSleepTime = 0;
+        }
 
-#ifdef WIN32
-        if (m_ServiceStatus == 0) World::StopNow(SHUTDOWN_EXIT_CODE);
-        while (m_ServiceStatus == 2) Sleep(1000);
+#ifdef _WIN32
+        if (m_ServiceStatus == 0)
+        {
+            World::StopNow(SHUTDOWN_EXIT_CODE);
+        }
+
+        while (m_ServiceStatus == 2)
+            Sleep(1000);
 #endif
     }
 
-    sWorld.CleanupsBeforeStop();
+#ifdef ENABLE_ELUNA
+    sEluna->OnShutdown();
+#endif /* ENABLE_ELUNA */
+
+    sWorld.KickAll();                                       // save and kick all players
+    sWorld.UpdateSessions(1);                               // real players unload required UpdateSessions call
 
     sWorldSocketMgr->StopNetwork();
 
-    MapManager::Instance().UnloadAll();                     // unload all grids (including locked in memory)
+    sMapMgr.UnloadAll();                                    // unload all grids (including locked in memory)
 
-    ///- End the database thread
-    WorldDatabase.ThreadEnd();                              // free mySQL thread resources
+#ifdef ENABLE_ELUNA
+    // Eluna must be unloaded after Maps, since ~Map calls sEluna->OnDestroy,
+    //   and must be unloaded before the DB, since it can access the DB.
+    Eluna::Uninitialize();
+#endif /* ENABLE_ELUNA */
 }
diff --git a/src/mangosd/WorldRunnable.h b/src/mangosd/WorldRunnable.h
index 20085bb2d..aa62f0c7d 100644
--- a/src/mangosd/WorldRunnable.h
+++ b/src/mangosd/WorldRunnable.h
@@ -26,16 +26,23 @@
 /// @{
 /// \file
 
-#ifndef __WORLDRUNNABLE_H
-#define __WORLDRUNNABLE_H
+#ifndef MANGOS_H_WORLDRUNNABLE
+#define MANGOS_H_WORLDRUNNABLE
 
 #include "Common.h"
 #include "Threading.h"
 
-/// Heartbeat thread for the World
+/**
+ * @brief Heartbeat thread for the World
+ *
+ */
 class WorldRunnable : public ACE_Based::Runnable
 {
     public:
+        /**
+         * @brief
+         *
+         */
         void run() override;
 };
 #endif
diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in
index 406505168..d3f072b03 100644
--- a/src/mangosd/mangosd.conf.dist.in
+++ b/src/mangosd/mangosd.conf.dist.in
@@ -1,6 +1,6 @@
-#####################################
-# MaNGOS Configuration file         #
-#####################################
+################################################################################
+# World server configuration                                                   #
+################################################################################
 
 [MangosdConf]
 ConfVersion=2013122901
@@ -14,7 +14,7 @@ ConfVersion=2013122901
 #    DataDir
 #        Data directory setting.
 #        Important: DataDir needs to be quoted, as it is a string which may contain space characters.
-#        Example: "@CMAKE_INSTALL_PREFIX@/share/mangos"
+#        Example: "${CMAKE_INSTALL_PREFIX}/share/mangos"
 #
 #    LogsDir
 #        Logs directory setting.
@@ -26,6 +26,7 @@ ConfVersion=2013122901
 #    LoginDatabaseInfo
 #    WorldDatabaseInfo
 #    CharacterDatabaseInfo
+#    ScriptDev2DatabaseInfo
 #        Database connection settings for the world server.
 #        Default:
 #                ---MYSQL---
@@ -40,9 +41,11 @@ ConfVersion=2013122901
 #	LoginDatabaseConnections
 #	WorldDatabaseConnections
 #	CharacterDatabaseConnections
+#       ScriptDev2DatabaseConnections
 #		 Amount of connections to database which will be used for SELECT queries. Maximum 16 connections per database.
 #		 Please, note, for data consistency only one connection for each database is used for transactions and async SELECTs.
-#		 So formula to find out how many connections will be established: X = ¹_connections + 1
+#		 So formula to find out how many connections will be established:
+#                X = LoginDatabaseConnections + WorldDatabaseConnections + CharacterDatabaseConnections + 1
 #		 Default: 1 connection for SELECT statements
 #
 #    MaxPingTime
@@ -57,22 +60,24 @@ ConfVersion=2013122901
 #        on different IP addresses using default ports.
 #        DO NOT CHANGE THIS UNLESS YOU _REALLY_ KNOW WHAT YOU'RE DOING
 #
-###################################################################################################################
+################################################################################
 
-RealmID = 1
-DataDir = "."
-LogsDir = ""
-LoginDatabaseInfo     = "127.0.0.1;3306;mangos;mangos;realmd"
-WorldDatabaseInfo     = "127.0.0.1;3306;mangos;mangos;mangos"
-CharacterDatabaseInfo = "127.0.0.1;3306;mangos;mangos;characters"
-LoginDatabaseConnections = 1
-WorldDatabaseConnections = 1
+RealmID                      = 1
+DataDir                      = "."
+LogsDir                      = ""
+LoginDatabaseInfo            = "127.0.0.1;3306;mangos;mangos;realmd"
+WorldDatabaseInfo            = "127.0.0.1;3306;mangos;mangos;mangos"
+CharacterDatabaseInfo        = "127.0.0.1;3306;mangos;mangos;characters"
+ScriptDev2DatabaseInfo       = "127.0.0.1;3306;mangos;mangos;mangos"
+LoginDatabaseConnections     = 1
+WorldDatabaseConnections     = 1
 CharacterDatabaseConnections = 1
-MaxPingTime = 30
-WorldServerPort = 8085
-BindIP = "0.0.0.0"
+ScriptDev2DatabaseConnections= 1
+MaxPingTime                  = 30
+WorldServerPort              = 8085
+BindIP                       = "0.0.0.0"
 
-###################################################################################################################
+################################################################################
 # PERFORMANCE SETINGS
 #
 #    UseProcessors
@@ -197,35 +202,35 @@ BindIP = "0.0.0.0"
 #        Default: 1 (Enable)
 #                 0 (Disabled)
 #
-###################################################################################################################
+################################################################################
 
-UseProcessors = 0
-ProcessPriority = 1
-Compression = 1
-PlayerLimit = 100
-SaveRespawnTimeImmediately = 1
-MaxOverspeedPings = 2
-GridUnload = 1
-GridCleanUpDelay = 300000
-MapUpdateInterval = 100
-ChangeWeatherInterval = 600000
-PlayerSave.Interval = 900000
-PlayerSave.Stats.MinLevel = 0
+UseProcessors                     = 0
+ProcessPriority                   = 1
+Compression                       = 1
+PlayerLimit                       = 100
+SaveRespawnTimeImmediately        = 1
+MaxOverspeedPings                 = 2
+GridUnload                        = 1
+GridCleanUpDelay                  = 300000
+MapUpdateInterval                 = 100
+ChangeWeatherInterval             = 600000
+PlayerSave.Interval               = 900000
+PlayerSave.Stats.MinLevel         = 0
 PlayerSave.Stats.SaveOnlyOnLogout = 1
-vmap.enableLOS = 1
-vmap.enableHeight = 1
-vmap.ignoreSpellIds = "7720"
-vmap.enableIndoorCheck = 1
-DetectPosCollision = 1
-TargetPosRecalculateRange = 1.5
-mmap.enabled = 0
-mmap.ignoreMapIds = ""
-UpdateUptimeInterval = 10
-MaxCoreStuckTime = 0
-AddonChannel = 1
-CleanCharacterDB = 1
+vmap.enableLOS                    = 1
+vmap.enableHeight                 = 1
+vmap.ignoreSpellIds               = "7720"
+vmap.enableIndoorCheck            = 1
+DetectPosCollision                = 1
+TargetPosRecalculateRange         = 1.5
+mmap.enabled                      = 1
+mmap.ignoreMapIds                 = ""
+UpdateUptimeInterval              = 10
+MaxCoreStuckTime                  = 0
+AddonChannel                      = 1
+CleanCharacterDB                  = 1
 
-###################################################################################################################
+################################################################################
 # SERVER LOGGING
 #
 #    LogSQL
@@ -252,7 +257,7 @@ CleanCharacterDB = 1
 #
 #    LogFile
 #        Logfile name
-#        Default: "Server.log"
+#        Default: "world-server.log"
 #                 "" - Empty name disable creating log file
 #
 #    LogTimestamp
@@ -354,47 +359,48 @@ CleanCharacterDB = 1
 #        Default: "" - none colors
 #        Example: "13 7 11 9"
 #
-###################################################################################################################
+################################################################################
 
-LogSQL = 1
-PidFile = ""
-LogLevel = 3
-LogTime = 0
-LogFile = "Server.log"
-LogTimestamp = 0
-LogFileLevel = 0
+LogSQL                      = 1
+PidFile                     = ""
+LogLevel                    = 3
+LogTime                     = 0
+LogFile                     = "world-server.log"
+LogTimestamp                = 0
+LogFileLevel                = 0
 LogFilter_AchievementUpdates = 1
-LogFilter_CreatureMoves = 1
+LogFilter_CreatureMoves     = 1
 LogFilter_TransportMoves = 1
 LogFilter_VisibilityChanges = 1
-LogFilter_Weather = 1
-LogFilter_DbStrictedCheck = 1
-LogFilter_Pathfinding = 1
-LogFilter_MapsLoading = 1
-LogFilter_EventAiDev = 1
-LogFilter_PeriodicAffects = 0
-LogFilter_PlayerMoves = 1
-LogFilter_SQLText = 1
-LogFilter_AIAndMovegens = 0
-LogFilter_PlayerStats = 0
-LogFilter_Damage = 0
-LogFilter_Combat = 0
-LogFilter_SpellCast = 0
+LogFilter_Weather           = 1
+LogFilter_DbStrictedCheck   = 1
+LogFilter_Pathfinding       = 1
+LogFilter_MapsLoading       = 1
+LogFilter_EventAiDev        = 1
+LogFilter_PeriodicAffects   = 0
+LogFilter_PlayerMoves       = 1
+LogFilter_SQLText           = 1
+LogFilter_AIAndMovegens     = 0
+LogFilter_PlayerStats       = 0
+LogFilter_Damage            = 0
+LogFilter_Combat            = 0
+LogFilter_SpellCast         = 0
 LogFilter_Calendar = 1
-WorldLogFile = ""
-WorldLogTimestamp = 0
-DBErrorLogFile = "DBErrors.log"
-EventAIErrorLogFile = "EventAIErrors.log"
-CharLogFile = "Char.log"
-CharLogTimestamp = 0
-CharLogDump = 0
-GmLogFile = ""
-GmLogTimestamp = 0
-GmLogPerAccount = 0
-RaLogFile = ""
-LogColors = ""
+WorldLogFile                = "world-packets.log"
+WorldLogTimestamp           = 0
+DBErrorLogFile              = "world-database.log"
+EventAIErrorLogFile         = "world-eventai.log"
+CharLogFile                 = "world-characters.log"
+CharLogTimestamp            = 0
+CharLogDump                 = 0
+GmLogFile                   = "world-gamemaster.log"
+GmLogTimestamp              = 0
+GmLogPerAccount             = 0
+RaLogFile                   = "world-remote-access.log"
+LogColors                   = "13 7 11 9"
+SD2ErrorLogFile             = "scriptdev2-errors.log"
 
-###################################################################################################################
+################################################################################
 # SERVER SETTINGS
 #
 #    GameType
@@ -449,8 +455,8 @@ LogColors = ""
 #
 #    DBC.Locale
 #        DBC Language Settings
-#        0 = English; 1 = Korean; 2 = French; 3 = German; 4 = Chinese; 5 = Taiwanese; 6 = Spanish; 7 = Spanish Mexico
-#        8 = Russian; 255 = Auto Detect (Default)
+#        0 = English; 1 = Korean; 2 = French; 3 = German; 4 = Chinese; 5 = Taiwanese; 6 = Spanish;
+#        7 = Spanish Mexico; 8 = Russian; 255 = Auto Detect (Default)
 #
 #    DeclinedNames
 #    Allow russian clients to set and use declined names
@@ -600,7 +606,7 @@ LogColors = ""
 #
 #    Instance.UnloadDelay
 #        Unload the instance map from memory after some time if no players are inside.
-#        Default: 1800000 (miliseconds 30 minutes)
+#        Default: 1800000 (miliseconds, i.e 30 minutes)
 #                 0 (instance maps are kept in memory until they are reset)
 #
 #    Quests.LowLevelHideDiff
@@ -772,77 +778,77 @@ LogColors = ""
 #
 ###################################################################################################################
 
-GameType = 1
-RealmZone = 1
+GameType                                  = 1
+RealmZone                                 = 1
 Expansion = 3
-DBC.Locale = 255
-DeclinedNames = 0
-StrictPlayerNames = 0
-StrictCharterNames = 0
-StrictPetNames = 0
-MinPlayerName = 2
-MinCharterName = 2
-MinPetName = 2
-CharactersCreatingDisabled = 0
-CharactersPerAccount = 50
-CharactersPerRealm = 10
+DBC.Locale                                = 255
+DeclinedNames                             = 0
+StrictPlayerNames                         = 0
+StrictCharterNames                        = 0
+StrictPetNames                            = 0
+MinPlayerName                             = 2
+MinCharterName                            = 2
+MinPetName                                = 2
+CharactersCreatingDisabled                = 0
+CharactersPerAccount                      = 50
+CharactersPerRealm                        = 10
 HeroicCharactersPerRealm = 1
 MinLevelForHeroicCharacterCreating = 55
-SkipCinematics = 0
+SkipCinematics                            = 0
 MaxPlayerLevel = 85
-StartPlayerLevel = 1
+StartPlayerLevel                          = 1
 StartHeroicPlayerLevel = 55
-StartPlayerMoney = 0
-InstantLogout = 1
+StartPlayerMoney                          = 0
+InstantLogout                             = 1
 DisableWaterBreath = 4
-AllFlightPaths = 0
-ActivateWeather = 1
-CastUnstuck = 1
-MaxSpellCastsInChain = 20
+AllFlightPaths                            = 0
+ActivateWeather                           = 1
+CastUnstuck                               = 1
+MaxSpellCastsInChain                      = 20
 BirthdayTime = 1125180000
-RabbitDay = 0
-Instance.IgnoreLevel = 0
-Instance.IgnoreRaid = 0
-Instance.ResetTimeHour = 4
-Instance.UnloadDelay = 1800000
-Quests.LowLevelHideDiff = 4
-Quests.HighLevelHideDiff = 7
+RabbitDay                                 = 0
+Instance.IgnoreLevel                      = 0
+Instance.IgnoreRaid                       = 0
+Instance.ResetTimeHour                    = 4
+Instance.UnloadDelay                      = 1800000
+Quests.LowLevelHideDiff                   = 4
+Quests.HighLevelHideDiff                  = 7
 Quests.Daily.ResetHour = 6
 Quests.Weekly.ResetWeekDay = 3
 Quests.Weekly.ResetHour = 6
-Quests.IgnoreRaid = 0
-Guild.EventLogRecordsCount = 100
+Quests.IgnoreRaid                         = 0
+Guild.EventLogRecordsCount                = 100
 Guild.BankEventLogRecordsCount = 25
 Guild.UndeletableLevel = 4
 Guild.LevelingEnabled = 1
-TimerBar.Fatigue.GMLevel = 4
-TimerBar.Fatigue.Max = 60
-TimerBar.Breath.GMLevel = 4
-TimerBar.Breath.Max = 180
-TimerBar.Fire.GMLevel = 4
-TimerBar.Fire.Max = 1
-MaxPrimaryTradeSkill = 2
+TimerBar.Fatigue.GMLevel                  = 4
+TimerBar.Fatigue.Max                      = 60
+TimerBar.Breath.GMLevel                   = 4
+TimerBar.Breath.Max                       = 180
+TimerBar.Fire.GMLevel                     = 4
+TimerBar.Fire.Max                         = 1
+MaxPrimaryTradeSkill                      = 2
 TradeSkill.GMIgnore.MaxPrimarySkillsCount = 4
-TradeSkill.GMIgnore.Level = 4
-TradeSkill.GMIgnore.Skill = 4
+TradeSkill.GMIgnore.Level                 = 4
+TradeSkill.GMIgnore.Skill                 = 4
 MinPetitionSigns = 4
-MaxGroupXPDistance = 74
-MailDeliveryDelay = 3600
-MassMailer.SendPerTick = 10
+MaxGroupXPDistance                        = 74
+MailDeliveryDelay                         = 3600
+MassMailer.SendPerTick                    = 10
 SkillChance.Prospecting = 0
 SkillChance.Milling = 0
 OffhandCheckAtTalentsReset = 0
 PetUnsummonAtMount = 1
 ClientCacheVersion = 0
-Event.Announce = 0
-BeepAtStart = 1
-ShowProgressBars = 1
-WaitAtStartupError = 0
-PlayerCommands = 0
+Event.Announce                            = 0
+BeepAtStart                               = 1
+ShowProgressBars                          = 1
+WaitAtStartupError                        = 0
+PlayerCommands                            = 0
 Motd = "Welcome to the Massive Network Game Object Server."
 Raid.MinLevel = 10
 
-###################################################################################################################
+################################################################################
 # PLAYER INTERACTION
 #
 #    AllowTwoSide.Accounts
@@ -878,21 +884,21 @@ Raid.MinLevel = 10
 #        Default: 1 (allow)
 #                 0 (not allow)
 #
-###################################################################################################################
+################################################################################
 
 AllowTwoSide.Accounts = 1
-AllowTwoSide.Interaction.Chat = 0
+AllowTwoSide.Interaction.Chat    = 0
 AllowTwoSide.Interaction.Channel = 0
-AllowTwoSide.Interaction.Group = 0
-AllowTwoSide.Interaction.Guild = 0
+AllowTwoSide.Interaction.Group   = 0
+AllowTwoSide.Interaction.Guild   = 0
 AllowTwoSide.Interaction.Auction = 0
-AllowTwoSide.Interaction.Mail = 0
+AllowTwoSide.Interaction.Mail    = 0
 AllowTwoSide.Interaction.Calendar = 0
-AllowTwoSide.WhoList = 0
-AllowTwoSide.AddFriend = 0
-TalentsInspecting = 1
+AllowTwoSide.WhoList             = 0
+AllowTwoSide.AddFriend           = 0
+TalentsInspecting                = 1
 
-###################################################################################################################
+################################################################################
 # CREATURE AND GAMEOBJECT SETTINGS
 #
 #    ThreatRadius
@@ -989,45 +995,45 @@ TalentsInspecting = 1
 #        in game from other side
 #        Default: 100
 #
-###################################################################################################################
+################################################################################
 
-ThreatRadius = 100
-Rate.Creature.Aggro = 1
-CreatureFamilyFleeAssistanceRadius = 30
-CreatureFamilyAssistanceRadius = 10
-CreatureFamilyAssistanceDelay = 1500
-CreatureFamilyFleeDelay = 7000
-WorldBossLevelDiff = 3
-Corpse.EmptyLootShow = 1
-Corpse.Decay.NORMAL = 300
-Corpse.Decay.RARE = 900
-Corpse.Decay.ELITE = 600
-Corpse.Decay.RAREELITE = 1200
-Corpse.Decay.WORLDBOSS = 3600
+ThreatRadius                              = 100
+Rate.Creature.Aggro                       = 1
+CreatureFamilyFleeAssistanceRadius        = 30
+CreatureFamilyAssistanceRadius            = 10
+CreatureFamilyAssistanceDelay             = 1500
+CreatureFamilyFleeDelay                   = 7000
+WorldBossLevelDiff                        = 3
+Corpse.EmptyLootShow                      = 1
+Corpse.Decay.NORMAL                       = 300
+Corpse.Decay.RARE                         = 900
+Corpse.Decay.ELITE                        = 600
+Corpse.Decay.RAREELITE                    = 1200
+Corpse.Decay.WORLDBOSS                    = 3600
 Rate.Corpse.Decay.Looted = 0.0
 Rate.Creature.Normal.Damage = 1
-Rate.Creature.Elite.Elite.Damage = 1
+Rate.Creature.Elite.Elite.Damage          = 1
 Rate.Creature.Elite.RAREELITE.Damage = 1
 Rate.Creature.Elite.WORLDBOSS.Damage = 1
-Rate.Creature.Elite.RARE.Damage = 1
+Rate.Creature.Elite.RARE.Damage           = 1
 Rate.Creature.Normal.SpellDamage = 1
 Rate.Creature.Elite.Elite.SpellDamage = 1
 Rate.Creature.Elite.RAREELITE.SpellDamage = 1
 Rate.Creature.Elite.WORLDBOSS.SpellDamage = 1
 Rate.Creature.Elite.RARE.SpellDamage = 1
-Rate.Creature.Normal.HP = 1
+Rate.Creature.Normal.HP                   = 1
 Rate.Creature.Elite.Elite.HP = 1
 Rate.Creature.Elite.RAREELITE.HP = 1
 Rate.Creature.Elite.WORLDBOSS.HP = 1
 Rate.Creature.Elite.RARE.HP = 1
-ListenRange.Say = 40
-ListenRange.TextEmote = 40
-ListenRange.Yell = 300
-GuidReserveSize.Creature = 100
-GuidReserveSize.GameObject = 100
+ListenRange.Say                           = 40
+ListenRange.TextEmote                     = 40
+ListenRange.Yell                          = 300
 
+GuidReserveSize.Creature                  = 100
+GuidReserveSize.GameObject                = 100
 
-###################################################################################################################
+################################################################################
 # CHAT SETTINGS
 #
 #    ChatFakeMessagePreventing
@@ -1073,18 +1079,18 @@ GuidReserveSize.GameObject = 100
 #        Default: 0 (join announcement in normal way)
 #                 1 (GM join without announcement)
 #
-###################################################################################################################
+################################################################################
 
-ChatFakeMessagePreventing = 0
+ChatFakeMessagePreventing       = 0
 ChatStrictLinkChecking.Severity = 0
-ChatStrictLinkChecking.Kick = 0
-ChatFlood.MessageCount = 10
-ChatFlood.MessageDelay = 1
-ChatFlood.MuteTime = 10
+ChatStrictLinkChecking.Kick     = 0
+ChatFlood.MessageCount          = 10
+ChatFlood.MessageDelay          = 1
+ChatFlood.MuteTime              = 10
 Channel.RestrictedLfg = 1
-Channel.SilentlyGMJoin = 0
+Channel.SilentlyGMJoin          = 0
 
-###################################################################################################################
+################################################################################
 # GAME MASTER SETTINGS
 #
 #    GM.LoginState
@@ -1155,22 +1161,22 @@ Channel.SilentlyGMJoin = 0
 #        Default: 37800 (50% Transparency)
 #                 0 (Disabled)
 #
-###################################################################################################################
+################################################################################
 
-GM.LoginState            = 2
-GM.Visible               = 2
-GM.AcceptTickets         = 2
-GM.Chat                  = 2
-GM.WhisperingTo          = 2
-GM.InGMList.Level        = 3
-GM.InWhoList.Level       = 3
-GM.LogTrade              = 1
-GM.StartLevel            = 1
-GM.LowerSecurity         = 0
+GM.LoginState      = 2
+GM.Visible         = 2
+GM.AcceptTickets   = 2
+GM.Chat            = 2
+GM.WhisperingTo    = 2
+GM.InGMList.Level  = 3
+GM.InWhoList.Level = 3
+GM.LogTrade        = 1
+GM.StartLevel      = 1
+GM.LowerSecurity   = 0
 GM.AllowAchievementGain  = 1
 GM.InvisibleAura         = 37800
 
-###################################################################################################################
+################################################################################
 # VISIBILITY AND RADIUSES
 #
 #    Visibility.GroupMode
@@ -1211,19 +1217,19 @@ GM.InvisibleAura         = 37800
 #        Delay time between creature AI reactions on nearby movements
 #        Default: 1000 (milliseconds)
 #
-###################################################################################################################
+################################################################################
 
-Visibility.GroupMode = 0
-Visibility.Distance.Continents    = 90
-Visibility.Distance.Instances     = 120
-Visibility.Distance.BGArenas      = 180
-Visibility.Distance.InFlight      = 100
-Visibility.Distance.Grey.Unit   = 1
-Visibility.Distance.Grey.Object = 10
+Visibility.GroupMode               = 0
+Visibility.Distance.Continents     = 90
+Visibility.Distance.Instances      = 120
+Visibility.Distance.BGArenas       = 180
+Visibility.Distance.InFlight       = 100
+Visibility.Distance.Grey.Unit      = 1
+Visibility.Distance.Grey.Object    = 10
 Visibility.RelocationLowerLimit    = 10
 Visibility.AIRelocationNotifyDelay = 1000
 
-###################################################################################################################
+################################################################################
 # SERVER RATES
 #
 #    Rate.Health
@@ -1381,71 +1387,76 @@ Visibility.AIRelocationNotifyDelay = 1000
 #         Modifies the speed of player's ghosts, removed upon reviving, not permanent/saved, in non-BG and BG maps
 #         Default: 1.0 (normal speed)
 #
-###################################################################################################################
+################################################################################
 
-Rate.Health = 1
-Rate.Mana = 1
-Rate.Rage.Income = 1
-Rate.Rage.Loss = 1
+Rate.Health                       = 1
+Rate.Mana                         = 1
+Rate.Rage.Income                  = 1
+Rate.Rage.Loss                    = 1
 Rate.RunicPower.Income = 1
 Rate.RunicPower.Loss = 1
-Rate.Focus = 1
-Rate.Energy = 1
-Rate.Skill.Discovery = 1
-Rate.Drop.Item.Poor = 1
-Rate.Drop.Item.Normal = 1
-Rate.Drop.Item.Uncommon = 1
-Rate.Drop.Item.Rare = 1
-Rate.Drop.Item.Epic = 1
-Rate.Drop.Item.Legendary = 1
-Rate.Drop.Item.Artifact = 1
-Rate.Drop.Item.Referenced = 1
-Rate.Drop.Money = 1
+Rate.Focus                        = 1
+Rate.Energy                       = 1
+Rate.Skill.Discovery              = 1
+Rate.Drop.Item.Poor               = 1
+Rate.Drop.Item.Normal             = 1
+Rate.Drop.Item.Uncommon           = 1
+Rate.Drop.Item.Rare               = 1
+Rate.Drop.Item.Epic               = 1
+Rate.Drop.Item.Legendary          = 1
+Rate.Drop.Item.Artifact           = 1
+Rate.Drop.Item.Referenced         = 1
+Rate.Drop.Money                   = 1
 Rate.Drop.Currency = 1
 Rate.Drop.Currency.Amount = 1
-Rate.XP.Kill = 1
-Rate.XP.Quest = 1
-Rate.XP.Explore = 1
-Rate.Rest.InGame = 1
-Rate.Rest.Offline.InTavernOrCity = 1
-Rate.Rest.Offline.InWilderness = 1
-Rate.Damage.Fall = 1
-Rate.Auction.Time = 1
-Rate.Auction.Deposit = 1
-Rate.Auction.Cut = 1
+Rate.XP.Kill                      = 1
+Rate.XP.Quest                     = 1
+Rate.XP.Explore                   = 1
+Rate.Rest.InGame                  = 1
+Rate.Rest.Offline.InTavernOrCity  = 1
+Rate.Rest.Offline.InWilderness    = 1
+Rate.Damage.Fall                  = 1
+Rate.Auction.Time                 = 1
+Rate.Auction.Deposit              = 1
+Rate.Auction.Cut                  = 1
 Auction.Deposit.Min = 100
-Rate.Honor = 1
-Rate.Mining.Amount = 1
-Rate.Mining.Next   = 1
-Rate.Talent = 1
-Rate.Reputation.Gain = 1
+Rate.Honor                        = 1
+Rate.Mining.Amount                = 1
+Rate.Mining.Next                  = 1
+Rate.Talent                       = 1
+Rate.Reputation.Gain              = 1
 Rate.Reputation.LowLevel.Kill    = 1
-Rate.Reputation.LowLevel.Quest   = 1
-Rate.InstanceResetTime = 1
-SkillGain.Crafting = 1
-SkillGain.Gathering = 1
-SkillChance.Orange = 100
-SkillChance.Yellow = 75
-SkillChance.Green  = 25
-SkillChance.Grey   = 0
-SkillChance.MiningSteps   = 0
-SkillChance.SkinningSteps = 0
+Rate.Reputation.LowLevel.Quest    = 1
+Rate.InstanceResetTime            = 1
+
+SkillGain.Crafting                = 1
+SkillGain.Gathering               = 1
+
+SkillChance.Orange                = 100
+SkillChance.Yellow                = 75
+SkillChance.Green                 = 25
+SkillChance.Grey                  = 0
+SkillChance.MiningSteps           = 0
+SkillChance.SkinningSteps         = 0
+
 SkillFail.Loot.Fishing = 1
 SkillFail.Gain.Fishing = 1
 SkillFail.Possible.FishingPool = 0
-DurabilityLossChance.Damage = 0.5
-DurabilityLossChance.Absorb = 0.5
-DurabilityLossChance.Parry  = 0.05
-DurabilityLossChance.Block  = 0.05
-Death.SicknessLevel = 11
-Death.CorpseReclaimDelay.PvP = 1
-Death.CorpseReclaimDelay.PvE = 1
-Death.Bones.World = 1
-Death.Bones.BattlegroundOrArena = 1
-Death.Ghost.RunSpeed.World = 1.0
+
+DurabilityLossChance.Damage       = 0.5
+DurabilityLossChance.Absorb       = 0.5
+DurabilityLossChance.Parry        = 0.05
+DurabilityLossChance.Block        = 0.05
+
+Death.SicknessLevel               = 11
+Death.CorpseReclaimDelay.PvP      = 1
+Death.CorpseReclaimDelay.PvE      = 1
+Death.Bones.World                 = 1
+Death.Bones.BattlegroundOrArena   = 1
+Death.Ghost.RunSpeed.World        = 1.0
 Death.Ghost.RunSpeed.Battleground = 1.0
 
-###################################################################################################################
+################################################################################
 # BATTLEGROUND CONFIG
 #
 #    Battleground.CastDeserter
@@ -1476,25 +1487,24 @@ Death.Ghost.RunSpeed.Battleground = 1.0
 #
 #    BattleGround.PremadeGroupWaitForMatch
 #        The time in which premade group of 1 faction waits in BG Queue for premade group of other faction
-#        Default: 1800000 (30 minutes)
-#                 0 - disable premade group matches (group always added to bg team in normal way)
+#                 1800000 (30 minutes)
+#        Default: 0 - disable premade group matches (group always added to bg team in normal way)
 #
-###################################################################################################################
+################################################################################
 
-Battleground.CastDeserter = 1
-Battleground.QueueAnnouncer.Join = 0
-Battleground.QueueAnnouncer.Start = 0
-Battleground.InvitationType = 0
-BattleGround.PrematureFinishTimer = 300000
+Battleground.CastDeserter             = 1
+Battleground.QueueAnnouncer.Join      = 0
+Battleground.QueueAnnouncer.Start     = 0
+Battleground.InvitationType           = 0
+BattleGround.PrematureFinishTimer     = 300000
 BattleGround.PremadeGroupWaitForMatch = 1800000
 
-###################################################################################################################
+################################################################################
 # ARENA CONFIG
 #
 #    Arena.MaxRatingDifference
 #        The maximum rating difference between two groups in rated matches
-#        Default: 150 (enable, recommended)
-#                 0 (disable, rating difference is discarded)
+#        Default: 0 (disable, rating difference is discarded)
 #
 #    Arena.RatingDiscardTimer
 #        After the specified milliseconds has passed,
@@ -1530,7 +1540,7 @@ BattleGround.PremadeGroupWaitForMatch = 1800000
 #        Default Personal Rating at team creation
 #        Default: -1 (use season dependent default value)
 #
-###################################################################################################################
+################################################################################
 
 Arena.MaxRatingDifference = 150
 Arena.RatingDiscardTimer = 600000
@@ -1541,7 +1551,7 @@ Arena.ArenaSeasonPrevious.ID = 0
 Arena.StartRating = -1
 Arena.StartPersonalRating = -1
 
-###################################################################################################################
+################################################################################
 # OUTDOOR PVP CONFIG
 #
 #    OutdoorPvp.SIEnabled               #Enable Silithus Outdoor pvp
@@ -1554,7 +1564,7 @@ Arena.StartPersonalRating = -1
 #        Default: 1 (enable)
 #                 0 (disable)
 #
-###################################################################################################################
+################################################################################
 
 OutdoorPvp.SIEnabled = 1
 OutdoorPvp.EPEnabled = 1
@@ -1564,7 +1574,7 @@ OutdoorPvp.TFEnabled = 1
 OutdoorPvp.NAEnabled = 1
 OutdoorPvp.GHEnabled = 1
 
-###################################################################################################################
+################################################################################
 # NETWORK CONFIG
 #
 #    Network.Threads
@@ -1589,15 +1599,15 @@ OutdoorPvp.GHEnabled = 1
 #         Default: 0 - do not kick
 #                  1 - kick
 #
-###################################################################################################################
+################################################################################
 
-Network.Threads = 1
-Network.OutKBuff = -1
-Network.OutUBuff = 65536
-Network.TcpNodelay = 1
+Network.Threads         = 1
+Network.OutKBuff        = -1
+Network.OutUBuff        = 65536
+Network.TcpNodelay      = 1
 Network.KickOnBadPacket = 0
 
-###################################################################################################################
+################################################################################
 # CONSOLE, REMOTE ACCESS AND SOAP
 #
 #    Console.Enable
@@ -1645,21 +1655,22 @@ Network.KickOnBadPacket = 0
 #        SOAP port
 #        Default: 7878
 #
-###################################################################################################################
+################################################################################
 
 Console.Enable = 1
-Ra.Enable = 0
-Ra.IP = 0.0.0.0
-Ra.Port = 3443
-Ra.MinLevel = 3
-Ra.Secure = 1
-Ra.Stricted = 1
 
-SOAP.Enabled = 0
-SOAP.IP = 127.0.0.1
-SOAP.Port = 7878
+Ra.Enable      = 0
+Ra.IP          = 0.0.0.0
+Ra.Port        = 3443
+Ra.MinLevel    = 3
+Ra.Secure      = 1
+Ra.Stricted    = 1
 
-###################################################################################################################
+SOAP.Enabled   = 0
+SOAP.IP        = 127.0.0.1
+SOAP.Port      = 7878
+
+################################################################################
 #    CharDelete.Method
 #        Character deletion behavior
 #        Default: 0  - Completely remove the character from the database
@@ -1680,13 +1691,13 @@ SOAP.Port = 7878
 #        Default: 30
 #                 0  - Don't delete any characters, they stay in the database forever.
 #
-###################################################################################################################
+################################################################################
 
-CharDelete.Method = 0
+CharDelete.Method   = 0
 CharDelete.MinLevel = 0
 CharDelete.KeepDays = 30
 
-###################################################################################################################
+###################################################################################################
 # CURRENCIES
 #
 #    Currency.StartHonorPoints
diff --git a/src/modules/Bots/CMakeLists.txt b/src/modules/Bots/CMakeLists.txt
new file mode 100644
index 000000000..ecc1d2acb
--- /dev/null
+++ b/src/modules/Bots/CMakeLists.txt
@@ -0,0 +1,185 @@
+#
+# Copyright (C) 2005-2012 MaNGOS project <http://getmangos.com/>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+set(LIBRARY_NAME Bots)
+
+#Add PCH Files
+set(bots_PCH "${CMAKE_CURRENT_SOURCE_DIR}/botpch.h")
+if(PCH)
+    LIST(APPEND bots_PCH "${CMAKE_CURRENT_SOURCE_DIR}/botpch.cpp")
+endif()
+
+#Base files
+file(GLOB Playerbot_Source ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/*.h)
+    source_group("Player Bot" FILES ${Playerbot_Source})
+    
+file(GLOB AHbot_Source ${CMAKE_CURRENT_SOURCE_DIR}/ahbot/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ahbot/*.h)
+    source_group("AH Bot" FILES ${AHbot_Source})
+    
+#Define base source library
+set(LIBRARY_SRCS 
+    ${Playerbot_Source}
+    ${AHbot_Source}
+    ${bots_PCH}
+)
+
+#Strategy files
+file(GLOB Playerbot_Strategy ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/*.h)
+    source_group("Player Bot\\Strategies" FILES ${Playerbot_Strategy})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Strategy})
+    
+#Action files
+file(GLOB Playerbot_Actions ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/actions/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/actions/*.h)
+    source_group("Player Bot\\Strategies\\Actions" FILES ${Playerbot_Actions})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Actions})
+    
+#Generic files
+file(GLOB Playerbot_Generic ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/generic/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/generic/*.h)
+    source_group("Player Bot\\Strategies\\Generic" FILES ${Playerbot_Generic})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Generic})
+    
+#Trigger files
+file(GLOB Playerbot_Triggers ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/triggers/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/triggers/*.h)
+    source_group("Player Bot\\Strategies\\Triggers" FILES ${Playerbot_Triggers})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Triggers})
+    
+#Value files
+file(GLOB Playerbot_Values ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/values/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/values/*.h)
+    source_group("Player Bot\\Strategies\\Values" FILES ${Playerbot_Values})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Values})
+    
+## Class files
+
+#Druid AI
+file(GLOB Playerbot_Druid ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/druid/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/druid/*.h)
+    source_group("Player Bot\\Strategies\\Druid" FILES ${Playerbot_Druid})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Druid})
+    
+#Hunter AI
+file(GLOB Playerbot_Hunter ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/hunter/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/hunter/*.h)
+    source_group("Player Bot\\Strategies\\Hunter" FILES ${Playerbot_Hunter})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Hunter})
+    
+#Mage AI
+file(GLOB Playerbot_Mage ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/mage/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/mage/*.h)
+    source_group("Player Bot\\Strategies\\Mage" FILES ${Playerbot_Mage})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Mage})
+    
+#Paladin AI
+file(GLOB Playerbot_Paladin ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/paladin/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/paladin/*.h)
+    source_group("Player Bot\\Strategies\\Paladin" FILES ${Playerbot_Paladin})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Paladin})
+    
+#Priest AI
+file(GLOB Playerbot_Priest ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/priest/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/priest/*.h)
+    source_group("Player Bot\\Strategies\\Priest" FILES ${Playerbot_Priest})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Priest})
+    
+#Rogue AI
+file(GLOB Playerbot_Rogue ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/rogue/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/rogue/*.h)
+    source_group("Player Bot\\Strategies\\Rogue" FILES ${Playerbot_Rogue})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Rogue})
+    
+#Shaman AI
+file(GLOB Playerbot_Shaman ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/shaman/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/shaman/*.h)
+    source_group("Player Bot\\Strategies\\Shaman" FILES ${Playerbot_Shaman})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Shaman})
+    
+#Warlock AI
+file(GLOB Playerbot_Warlock ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/warlock/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/warlock/*.h)
+    source_group("Player Bot\\Strategies\\Warlock" FILES ${Playerbot_Warlock})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Warlock})
+    
+#Warrior AI
+file(GLOB Playerbot_Warrior ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/warrior/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/playerbot/strategy/warrior/*.h)
+    source_group("Player Bot\\Strategies\\Warrior" FILES ${Playerbot_Warrior})
+    LIST(APPEND LIBRARY_SRCS ${Playerbot_Warrior})
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/ahbot
+  ${CMAKE_CURRENT_SOURCE_DIR}/playerbot
+  ${CMAKE_SOURCE_DIR}/src/game
+  ${CMAKE_SOURCE_DIR}/src/game/AuctionHouseBot
+  ${CMAKE_SOURCE_DIR}/src/game/BattleGround
+  ${CMAKE_SOURCE_DIR}/src/game/ChatCommands
+  ${CMAKE_SOURCE_DIR}/src/game/Maps
+  ${CMAKE_SOURCE_DIR}/src/game/MotionGenerators
+  ${CMAKE_SOURCE_DIR}/src/game/movement
+  ${CMAKE_SOURCE_DIR}/src/game/Object
+  ${CMAKE_SOURCE_DIR}/src/game/OutdoorPvP
+  ${CMAKE_SOURCE_DIR}/src/game/References
+  ${CMAKE_SOURCE_DIR}/src/game/Server
+  ${CMAKE_SOURCE_DIR}/src/game/Tools
+  ${CMAKE_SOURCE_DIR}/src/game/vmap
+  ${CMAKE_SOURCE_DIR}/src/game/WorldHandlers
+  ${CMAKE_SOURCE_DIR}/src/shared
+  ${CMAKE_SOURCE_DIR}/src/shared/Config
+  ${CMAKE_SOURCE_DIR}/src/shared/Common
+  ${CMAKE_SOURCE_DIR}/src/shared/Database
+  ${CMAKE_SOURCE_DIR}/src/shared/DataStores
+  ${CMAKE_SOURCE_DIR}/src/shared/Log
+  ${CMAKE_SOURCE_DIR}/src/shared/Threading
+  ${CMAKE_SOURCE_DIR}/src/shared/Utilities
+  ${CMAKE_SOURCE_DIR}/src/framework
+  ${CMAKE_SOURCE_DIR}/src/framework/Platform
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/src/shared
+  ${MYSQL_INCLUDE_DIR}
+  ${ACE_INCLUDE_DIR}
+)
+
+if(PCH)
+  include_directories(${CMAKE_CURRENT_BINARY_DIR})
+endif()
+
+add_library(${LIBRARY_NAME} STATIC ${LIBRARY_SRCS})
+
+target_link_libraries(${LIBRARY_NAME} shared detour)
+
+if(UNIX)
+  # Both systems don't have libdl and don't need them
+  if (NOT (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD"))
+    target_link_libraries(${LIBRARY_NAME} dl)
+  endif()
+endif()
+
+add_dependencies(${LIBRARY_NAME} revision.h)
+if(NOT ACE_USE_EXTERNAL)
+  add_dependencies(${LIBRARY_NAME} ace)
+endif()
+
+# Install config files
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/playerbot/aiplayerbot.conf.dist.in ${CMAKE_CURRENT_BINARY_DIR}/aiplayerbot.conf.dist)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/aiplayerbot.conf.dist DESTINATION ${CONF_INSTALL_DIR})
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ahbot/ahbot.conf.dist.in ${CMAKE_CURRENT_BINARY_DIR}/ahbot.conf.dist)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ahbot.conf.dist DESTINATION ${CONF_INSTALL_DIR})
+
+if(WIN32 AND MSVC)
+  add_custom_command(TARGET ${LIBRARY_NAME}
+    POST_BUILD 
+    COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/ahbot.conf.dist" "${CONF_COPY_DIR}"
+    COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/aiplayerbot.conf.dist" "${CONF_COPY_DIR}"
+  )
+endif()
+
+# Generate PCH
+if(PCH)
+    ADD_CXX_PCH(Bots ${bots_PCH})
+endif()
diff --git a/src/modules/Bots/ahbot/ahbot.conf.dist.in b/src/modules/Bots/ahbot/ahbot.conf.dist.in
new file mode 100644
index 000000000..f50ffc269
--- /dev/null
+++ b/src/modules/Bots/ahbot/ahbot.conf.dist.in
@@ -0,0 +1,209 @@
+################################################
+# MANGOS Auction House Bot Configuration file  #
+################################################
+
+[AhbotConf]
+ConfVersion=2010102201
+
+###################################################################################################################
+# AUCTION HOUSE BOT SETTINGS
+#
+###################################################################################################################
+
+# Disable original AuctionHouseBot
+AuctionHouseBot.Seller.Enabled = 0
+AuctionHouseBot.Buyer.Enabled = 0
+
+# Replace with the new AhBot
+AhBot.Enabled = 1
+
+# Should be used only if random bots are disabled
+# AhBot.GUID = 0
+
+# 199 for 80, 80 for 70, 70 for 60, ..., 25 for 20
+AhBot.MaxItemLevel = 199
+# Same as level cap
+AhBot.MaxRequiredLevel = 80
+
+# Ignore items by ID
+AhBot.IgnoreItemIds = 49283,52200,8494,6345,6891,2460
+
+AhBot.PriceMultiplier = 1.0
+AhBot.DefaultMinPrice = 20
+AhBot.PriceQualityMultiplier = 1.0
+AhBot.AlwaysAvailableMoney = 2000000
+
+# Buy/sell delays
+AhBot.ItemBuyMinInterval = 7200
+AhBot.ItemBuyMaxInterval = 28800
+AhBot.ItemSellMinInterval = 7200
+AhBot.ItemSellMaxInterval = 28800
+
+#
+# Items
+#
+
+AhBot.MaxAuctionCount.equip.green = 0
+AhBot.MaxAuctionCount.equip.blue = 40
+AhBot.MaxAuctionCount.equip.epic = 20
+AhBot.PriceMultiplier.Sell.equip = 1.0
+AhBot.PriceMultiplier.Buy.equip = 1.0
+AhBot.PricingStrategy.equip = buyOnlyRare
+
+AhBot.MaxAuctionCount.reagent.white = 6
+AhBot.MaxAuctionCount.reagent.green = 2
+AhBot.PriceMultiplier.Sell.reagent = 1.0
+AhBot.PriceMultiplier.Buy.reagent = 1.0
+AhBot.PricingStrategy.reagent = buyOnlyRare
+
+AhBot.MaxAuctionCount.other.white = 20
+AhBot.MaxAuctionCount.other.green = 10
+AhBot.MaxAuctionCount.other.blue = 6
+AhBot.PriceMultiplier.Sell.other = 1.0
+AhBot.PriceMultiplier.Buy.other = 1.0
+AhBot.PricingStrategy.other = buyOnlyRare
+
+#
+# Container
+#
+
+AhBot.MaxAuctionCount.quiver.white = 2
+AhBot.PriceMultiplier.Sell.quiver = 1.0
+AhBot.PriceMultiplier.Buy.quiver = 1.0
+AhBot.PricingStrategy.quiver = buyOnlyRare
+
+AhBot.MaxAuctionCount.container.white = 6
+AhBot.MaxAuctionCount.container.green = 2
+AhBot.MaxAuctionCount.container.blue = 2
+AhBot.PriceMultiplier.Sell.container = 1.0
+AhBot.PriceMultiplier.Buy.container = 1.0
+
+#
+# Glyph
+#
+
+AhBot.MaxAuctionCount.glyph.white = 50
+AhBot.MaxAuctionCount.glyph.green = 20
+AhBot.MaxAuctionCount.glyph.blue = 10
+AhBot.PriceMultiplier.Sell.glyph = 1.0
+AhBot.PriceMultiplier.Buy.glyph = 1.0
+
+#
+# Quest
+#
+
+AhBot.MaxAuctionCount.quest.white = 14
+AhBot.MaxAuctionCount.quest.green = 2
+AhBot.MaxAuctionCount.quest.blue = 2
+AhBot.PriceMultiplier.Sell.quest = 1.0
+AhBot.PriceMultiplier.Buy.quest = 1.0
+
+#
+# Consumables
+#
+
+AhBot.MaxAuctionCount.alchemy.white = 50
+AhBot.MaxAuctionCount.alchemy.green = 20
+AhBot.MaxAuctionCount.alchemy.blue = 10
+AhBot.PriceMultiplier.Sell.alchemy = 1.0
+AhBot.PriceMultiplier.Buy.alchemy = 1.0
+
+AhBot.MaxAuctionCount.scroll.white = 40
+AhBot.MaxAuctionCount.scroll.green = 6
+AhBot.MaxAuctionCount.scroll.blue = 4
+AhBot.PriceMultiplier.Sell.scroll = 1.0
+AhBot.PriceMultiplier.Buy.scroll = 1.0
+
+AhBot.MaxAuctionCount.Food.white = 40
+AhBot.PriceMultiplier.Sell.Food = 1.0
+AhBot.PriceMultiplier.Buy.Food = 1.0
+
+AhBot.MaxAuctionCount.bandage.white = 10
+AhBot.PriceMultiplier.Sell.bandage = 1.0
+AhBot.PriceMultiplier.Buy.bandage = 1.0
+
+AhBot.MaxAuctionCount.OtherConsumable.white = 20
+AhBot.MaxAuctionCount.OtherConsumable.green = 10
+AhBot.MaxAuctionCount.OtherConsumable.blue = 5
+AhBot.PriceMultiplier.Sell.OtherConsumable = 1.0
+AhBot.PriceMultiplier.Buy.OtherConsumable = 1.0
+
+#
+# Recipe
+#
+
+AhBot.MaxAuctionCount.recipe.white = 8
+AhBot.MaxAuctionCount.recipe.green = 4
+AhBot.MaxAuctionCount.recipe.blue = 2
+AhBot.MaxAuctionCount.recipe.epic = 2
+AhBot.PriceMultiplier.Sell.recipe = 1.0
+AhBot.PriceMultiplier.Buy.recipe = 1.0
+
+#
+# Trade
+#
+
+AhBot.MaxAuctionCount.Elemental.white = 30
+AhBot.MaxAuctionCount.Elemental.green = 20
+AhBot.MaxAuctionCount.Elemental.blue = 6
+AhBot.PriceMultiplier.Sell.Elemental = 1.0
+AhBot.PriceMultiplier.Buy.Elemental = 1.0
+
+AhBot.MaxAuctionCount.Cloth.white = 50
+AhBot.MaxAuctionCount.Cloth.green = 14
+AhBot.MaxAuctionCount.Cloth.blue = 6
+AhBot.PriceMultiplier.Sell.Cloth = 1.0
+AhBot.PriceMultiplier.Buy.Cloth = 1.0
+
+AhBot.MaxAuctionCount.Leather.white = 50
+AhBot.MaxAuctionCount.Leather.green = 14
+AhBot.MaxAuctionCount.Leather.blue = 6
+AhBot.PriceMultiplier.Sell.Leather = 1.0
+AhBot.PriceMultiplier.Buy.Leather = 1.0
+
+AhBot.MaxAuctionCount.Herb.white = 50
+AhBot.MaxAuctionCount.Herb.green = 14
+AhBot.PriceMultiplier.Sell.Herb = 1.0
+AhBot.PriceMultiplier.Buy.Herb = 1.0
+
+AhBot.MaxAuctionCount.Meat.white = 50
+AhBot.PriceMultiplier.Sell.Meat = 1.0
+AhBot.PriceMultiplier.Buy.Meat = 1.0
+
+AhBot.MaxAuctionCount.Metal.white = 50
+AhBot.MaxAuctionCount.Metal.green = 14
+AhBot.MaxAuctionCount.Metal.blue = 6
+AhBot.PriceMultiplier.Sell.Metal = 1.0
+AhBot.PriceMultiplier.Buy.Metal = 1.0
+
+AhBot.MaxAuctionCount.Engineering.white = 20
+AhBot.MaxAuctionCount.Engineering.green = 10
+AhBot.MaxAuctionCount.Engineering.blue = 4
+AhBot.PriceMultiplier.Sell.Engineering = 1.0
+AhBot.PriceMultiplier.Buy.Engineering = 1.0
+
+AhBot.MaxAuctionCount.Disenchants.white = 40
+AhBot.MaxAuctionCount.Disenchants.green = 20
+AhBot.MaxAuctionCount.Disenchants.blue = 20
+AhBot.PriceMultiplier.Sell.Disenchants = 1.0
+AhBot.PriceMultiplier.Buy.Disenchants = 1.0
+
+AhBot.MaxAuctionCount.SimpleGems.green = 30
+AhBot.MaxAuctionCount.SimpleGems.blue = 20
+AhBot.MaxAuctionCount.SimpleGems.epic = 4
+AhBot.PriceMultiplier.Sell.SimpleGems = 1.0
+AhBot.PriceMultiplier.Buy.SimpleGems = 1.0
+
+AhBot.MaxAuctionCount.SocketGems.green = 50
+AhBot.MaxAuctionCount.SocketGems.blue = 20
+AhBot.MaxAuctionCount.SocketGems.epic = 4
+AhBot.PriceMultiplier.Sell.SocketGems = 1.0
+AhBot.PriceMultiplier.Buy.SocketGems = 1.0
+
+AhBot.MaxAuctionCount.OtherTrade.white = 10
+AhBot.PriceMultiplier.Sell.OtherTrade = 1.0
+AhBot.PriceMultiplier.Buy.OtherTrade = 1.0
+
+AhBot.PriceMultiplier.Sell.projectile = 1.0
+AhBot.PriceMultiplier.Buy.projectile = 1.0
+AhBot.PricingStrategy.projectile = buyOnlyRare
diff --git a/src/modules/Bots/playerbot/aiplayerbot.conf.dist.in b/src/modules/Bots/playerbot/aiplayerbot.conf.dist.in
new file mode 100644
index 000000000..a4191acfe
--- /dev/null
+++ b/src/modules/Bots/playerbot/aiplayerbot.conf.dist.in
@@ -0,0 +1,164 @@
+##########################################
+# MANGOS Ai Playerbot Configuration file #
+##########################################
+
+[AiPlayerbotConf]
+ConfVersion=2010102201
+
+# Enable or disable AI Playerbot
+AiPlayerbot.Enabled = 1
+
+# Warrior
+AiPlayerbot.RandomClassSpecProbability.1.0 = 20
+AiPlayerbot.RandomClassSpecProbability.1.1 = 30
+AiPlayerbot.RandomClassSpecProbability.1.2 = 50
+# Paladin
+AiPlayerbot.RandomClassSpecProbability.2.0 = 20
+AiPlayerbot.RandomClassSpecProbability.2.1 = 50
+AiPlayerbot.RandomClassSpecProbability.2.2 = 30
+# Hunter
+AiPlayerbot.RandomClassSpecProbability.3.0 = 25
+AiPlayerbot.RandomClassSpecProbability.3.1 = 50
+AiPlayerbot.RandomClassSpecProbability.3.2 = 25
+# Rogue
+AiPlayerbot.RandomClassSpecProbability.4.0 = 40
+AiPlayerbot.RandomClassSpecProbability.4.1 = 50
+AiPlayerbot.RandomClassSpecProbability.4.2 = 10
+# Priest
+AiPlayerbot.RandomClassSpecProbability.5.0 = 40
+AiPlayerbot.RandomClassSpecProbability.5.1 = 40
+AiPlayerbot.RandomClassSpecProbability.5.2 = 20
+# Shaman
+AiPlayerbot.RandomClassSpecProbability.7.0 = 10
+AiPlayerbot.RandomClassSpecProbability.7.1 = 45
+AiPlayerbot.RandomClassSpecProbability.7.2 = 45
+# Mage
+AiPlayerbot.RandomClassSpecProbability.8.0 = 20
+AiPlayerbot.RandomClassSpecProbability.8.1 = 10
+AiPlayerbot.RandomClassSpecProbability.8.2 = 70
+# Warlock
+AiPlayerbot.RandomClassSpecProbability.9.0 = 33
+AiPlayerbot.RandomClassSpecProbability.9.1 = 33
+AiPlayerbot.RandomClassSpecProbability.9.2 = 33
+# Druid
+AiPlayerbot.RandomClassSpecProbability.11.0 = 10
+AiPlayerbot.RandomClassSpecProbability.11.1 = 45
+AiPlayerbot.RandomClassSpecProbability.11.2 = 45
+
+#
+# All other parameters are optional but can be changed by uncommenting them here
+#
+
+# Prefix for bot chat commands (e.g. follow, stay)
+AiPlayerbot.CommandPrefix = ~
+
+# Max AI iterations per tick
+#AiPlayerbot.IterationsPerTick = 10
+
+# Allow/deny bots from your guild
+#AiPlayerbot.AllowGuildBots = 1
+
+# Delay between two short-time spells cast
+#AiPlayerbot.GlobalCooldown = 500
+
+# Max wait time when moving
+#AiPlayerbot.MaxWaitForMove = 5000
+
+# Delay between two bot actions
+#AiPlayerbot.ReactDelay = 100
+
+# Distances
+#AiPlayerbot.SightDistance = 50.0
+#AiPlayerbot.SpellDistance = 30.0
+#AiPlayerbot.ReactDistance = 150.0
+#AiPlayerbot.GrindDistance = 100.0
+#AiPlayerbot.LootDistance = 20.0
+#AiPlayerbot.FleeDistance = 20.0
+#AiPlayerbot.TooCloseDistance = 7.0
+#AiPlayerbot.MeleeDistance = 1.0
+#AiPlayerbot.FollowDistance = 1.5
+#AiPlayerbot.WhisperDistance = 6000.0
+#AiPlayerbot.ContactDistance = 0.5
+
+# Bot can flee for enemy
+#AiPlayerbot.FleeingEnabled = 1
+
+# Health/Mana levels
+#AiPlayerbot.CriticalHealth = 25
+#AiPlayerbot.LowHealth = 45
+#AiPlayerbot.MediumHealth = 65
+#AiPlayerbot.AlmostFullHealth = 85
+#AiPlayerbot.LowMana = 15
+#AiPlayerbot.MediumMana = 40
+
+# Enable random bot system
+#AiPlayerbot.RandomBotAutologin = 1
+
+# Random bot default strategies (applied after defaults)
+#AiPlayerbot.RandomBotCombatStrategies = +dps,+attack weak
+#AiPlayerbot.RandomBotNonCombatStrategies = +grind,+move random,+loot
+
+# Create random bot characters automatically
+#AiPlayerbot.RandomBotAutoCreate = 1
+
+# Random bot count
+#AiPlayerbot.MinRandomBots = 50
+#AiPlayerbot.MaxRandomBots = 200
+#AiPlayerbot.RandomBotMinLevel = 1
+#AiPlayerbot.RandomBotMaxLevel = 255 (ignored if more than MaxPlayerLevel mangosd.conf value)
+
+# Accounts to create for random bots
+#AiPlayerbot.RandomBotAccountPrefix = rndbot
+#AiPlayerbot.RandomBotAccountCount = 50
+
+# Delete all random bot accounts
+#AiPlayerbot.DeleteRandomBotAccounts = 0
+
+# Maps to teleport random bots
+#AiPlayerbot.RandomBotMaps = 0,1,530,571
+
+# Change random bot has lower gear
+#AiPlayerbot.RandomGearLoweringChance = 0.15
+
+# Chance random bot has max level on first randomize
+#AiPlayerbot.RandomBotMaxLevelChance = 0.4
+
+# Quest items to leave (do not destroy)
+#AiPlayerbot.RandomBotQuestItems = 6948,5175,5176,5177,5178
+
+# Spells every random bot will learn on randomize (54197 - cold weather flying)
+#AiPlayerbot.RandomBotSpellIds = 54197
+
+# Enable LFG for random bots
+#AiPlayerbot.RandomBotJoinLfg = 1
+
+# Level diff between random bots and nearby creatures for random teleports
+AiPlayerbot.RandomBotTeleLevel = 3
+
+# Intervals
+#AiPlayerbot.RandomBotUpdateInterval = 60
+#AiPlayerbot.RandomBotCountChangeMinInterval = 86400
+#AiPlayerbot.RandomBotCountChangeMaxInterval = 259200
+#AiPlayerbot.MinRandomBotInWorldTime = 7200
+#AiPlayerbot.MaxRandomBotInWorldTime = 1209600
+#AiPlayerbot.MinRandomBotRandomizeTime = 7200
+#AiPlayerbot.MaxRandomRandomizeTime = 1209600
+#AiPlayerbot.MinRandomBotsPerInterval = 50
+#AiPlayerbot.MaxRandomBotsPerInterval = 100
+#AiPlayerbot.MinRandomBotsPriceChangeInterval = 7200
+#AiPlayerbot.MaxRandomBotsPriceChangeInterval = 172800
+
+# Log on all random bots on start
+#AiPlayerbot.RandomBotLoginAtStartup = 1
+
+# How far random bots are teleported after death
+#AiPlayerbot.RandomBotTeleportDistance = 1000
+
+# Debug switches
+#AiPlayerbot.SpellDump = 0
+#AiPlayerbot.LogInGroupOnly = 1
+#AiPlayerbot.LogValuesPerTick = 0
+#AiPlayerbot.RandomChangeMultiplier = 1
+
+# Command server port, 0 - disabled
+#AiPlayerbot.CommandServerPort = 8888
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 5a40081e2..bc3fe81a8 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -1,11 +1,33 @@
-#-----------------------------------------------------------------------------
-# Build the mangos-zero script library if wished for
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+#
+# Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+# Build the mangos script library if enabled
 if(SCRIPT_LIB_SD2)
     add_subdirectory(SD2)
 endif()
 
-#-----------------------------------------------------------------------------
-# Build the Eluna library if wished for
+# Build the Eluna library if enabled
 if(SCRIPT_LIB_ELUNA)
     add_subdirectory(Eluna)
-endif()
\ No newline at end of file
+endif()
+
+# Include Player Bots if enabled
+#if(PLAYERBOTS)
+#    add_subdirectory(Bots)
+#endif()
\ No newline at end of file
diff --git a/src/modules/Eluna b/src/modules/Eluna
deleted file mode 160000
index 5f6417663..000000000
--- a/src/modules/Eluna
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5f6417663e395987585466ab62f4fbce7d0a7ba3
diff --git a/src/modules/SD2/@@Temp_VC120/ScriptDev2.vcxproj b/src/modules/SD2/@@Temp_VC120/ScriptDev2.vcxproj
deleted file mode 100644
index 493d57563..000000000
--- a/src/modules/SD2/@@Temp_VC120/ScriptDev2.vcxproj
+++ /dev/null
@@ -1,891 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ScriptDev2</ProjectName>
-    <ProjectGuid>{4295C8A9-79B7-4354-8064-F05FB9CA0C96}</ProjectGuid>
-    <RootNamespace>ScriptDev2</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\bin\win32_debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\ScriptDev2__$(Platform)_$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\bin\x64_debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\ScriptDev2__$(Platform)_$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\bin\win32_release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\ScriptDev2__$(Platform)_$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\bin\x64_release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\ScriptDev2__$(Platform)_$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mangosscript</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mangosscript</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mangosscript</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mangosscript</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;ACEd.lib;framework.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\win\VC120\mangosd__Win32_Debug;..\..\..\..\win\VC120\framework__Win32_Debug;..\..\..\..\dep\lib\win32_debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;ACEd.lib;framework.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\win\VC120\mangosd__x64_Debug;..\..\..\..\win\VC120\framework__x64_Debug;..\..\..\..\dep\lib\x64_Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;ACE.lib;framework.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\win\VC120\mangosd__Win32_Release;..\..\..\..\win\VC120\framework__Win32_Release;..\..\..\..\dep\lib\win32_release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)mangosscript.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <StringPooling>true</StringPooling>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;ACE.lib;framework.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\win\VC120\mangosd__x64_Release;..\..\..\..\win\VC120\framework__x64_Release;..\..\..\..\dep\lib\x64_release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)mangosscript.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\base\escort_ai.cpp" />
-    <ClCompile Include="..\base\follower_ai.cpp" />
-    <ClCompile Include="..\base\guard_ai.cpp" />
-    <ClCompile Include="..\base\pet_ai.cpp" />
-    <ClCompile Include="..\scripts\battlegrounds\battleground.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\alterac_mountains.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\arathi_highlands.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blasted_lands.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\burning_steppes.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\dun_morogh.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\eastern_plaguelands.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\elwynn_forest.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\eversong_woods.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\ghostlands.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\gilneas.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\gilneas_city.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\hinterlands.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\ironforge.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\isle_of_queldanas.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\loch_modan.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\redridge_mountains.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\searing_gorge.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\silvermoon_city.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\silverpine_forest.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\stormwind_city.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\stranglethorn_vale.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\swamp_of_sorrows.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\tirisfal_glades.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\twilight_highlands.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\undercity.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\vashjir.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\western_plaguelands.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\westfall.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\wetlands.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\bastion_of_twilight\ascendant_council.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\bastion_of_twilight\boss_chogall.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\bastion_of_twilight\boss_halfus_wyrmbreaker.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\bastion_of_twilight\boss_sinestra.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\bastion_of_twilight\boss_valiona_and_theralion.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\bastion_of_twilight\instance_bastion_of_twilight.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\boss_beauty.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\boss_corla.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\boss_karsh_steelbender.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\boss_lord_obsidius.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\boss_romogg.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\instance_blackrock_caverns.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\blackrock_depths.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_ambassador_flamelash.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_coren_direbrew.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_emperor_dagran_thaurissan.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_general_angerforge.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_high_interrogator_gerstahn.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\instance_blackrock_depths.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\boss_gyth.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\boss_overlord_wyrmthalak.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\boss_pyroguard_emberseer.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\instance_blackrock_spire.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\boss_atramedes.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\boss_chimaeron.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\boss_magmaw.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\boss_maloriak.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\boss_nefarian_descent.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\instance_blackwing_descent.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\omnotron_defense.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_broodlord_lashlayer.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_chromaggus.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_ebonroc.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_firemaw.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_flamegor.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_nefarian.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_razorgore.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_vaelastrasz.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_victor_nefarius.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\instance_blackwing_lair.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_baron_geddon.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_garr.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_gehennas.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_golemagg.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_lucifron.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_magmadar.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_majordomo_executus.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_ragnaros.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_shazzrah.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_sulfuron_harbinger.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\instance_molten_core.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\molten_core.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\deadmines\boss_mr_smite.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\deadmines\deadmines.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\deadmines\instance_deadmines.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\gnomeregan\boss_thermaplugg.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\gnomeregan\gnomeregan.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\gnomeregan\instance_gnomeregan.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\grim_batol\boss_drahga_shadowburner.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\grim_batol\boss_erudax.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\grim_batol\boss_forgemaster_throngus.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\grim_batol\boss_general_umbriss.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\grim_batol\instance_grim_batol.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_curator.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_maiden_of_virtue.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_midnight.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_moroes.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_netherspite.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_nightbane.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_prince_malchezaar.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_shade_of_aran.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_terestian_illhoof.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\bosses_opera.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\chess_event.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\instance_karazhan.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\karazhan.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\magisters_terrace\boss_felblood_kaelthas.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\magisters_terrace\boss_priestess_delrissa.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\magisters_terrace\boss_selin_fireheart.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\magisters_terrace\boss_vexallus.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\magisters_terrace\instance_magisters_terrace.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\magisters_terrace\magisters_terrace.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_enclave\ebon_hold.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_enclave\world_map_ebon_hold.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\boss_arcanist_doan.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\boss_headless_horseman.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\boss_herod.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\boss_mograine_and_whitemane.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\instance_scarlet_monastery.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\scholomance\boss_darkmaster_gandling.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\scholomance\boss_jandice_barov.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\scholomance\instance_scholomance.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\shadowfang_keep\boss_hummel.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\shadowfang_keep\instance_shadowfang_keep.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\boss_baroness_anastari.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\boss_cannon_master_willey.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\boss_dathrohan_balnazzar.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\boss_maleki_the_pallid.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\boss_order_of_silver_hand.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\instance_stratholme.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\stratholme.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunken_temple\instance_sunken_temple.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunken_temple\sunken_temple.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\boss_brutallus.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\boss_eredar_twins.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\boss_felmyst.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\boss_kalecgos.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\boss_kiljaeden.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\boss_muru.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\instance_sunwell_plateau.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\throne_of_the_tides\boss_commander_ulthok.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\throne_of_the_tides\boss_erunak_and_ghursha.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\throne_of_the_tides\boss_lady_nazjar.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\throne_of_the_tides\boss_ozumat.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\throne_of_the_tides\instance_throne_of_the_tides.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\uldaman\boss_archaedas.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\uldaman\uldaman.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\uldaman\instance_uldaman.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\boss_akilzon.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\boss_halazzi.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\boss_janalai.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\boss_malacrass.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\boss_nalorakk.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\boss_zuljin.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\instance_zulaman.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\zulaman.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_arlokk.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_hakkar.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_hazzarah.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_jeklik.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_jindo.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_mandokir.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_marli.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_renataki.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_thekal.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_venoxis.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\instance_zulgurub.cpp" />
-    <ClCompile Include="..\scripts\examples\example_creature.cpp" />
-    <ClCompile Include="..\scripts\examples\example_escort.cpp" />
-    <ClCompile Include="..\scripts\examples\example_gossip_codebox.cpp" />
-    <ClCompile Include="..\scripts\examples\example_misc.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\ashenvale.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\azshara.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\azuremyst_isle.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\bloodmyst_isle.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\boss_azuregos.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\darkshore.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\desolace.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\durotar.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\dustwallow_marsh.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\felwood.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\feralas.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\molten_front.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\moonglade.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\mount_hyjal.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\mulgore.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\orgrimmar.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\silithus.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\stonetalon_mountains.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\tanaris.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\teldrassil.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\the_barrens.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\thousand_needles.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\thunder_bluff.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\uldum.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\ungoro_crater.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\winterspring.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\blackfathom_deeps\instance_blackfathom_deeps.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\culling_of_stratholme.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\instance_culling_of_stratholme.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dark_portal\boss_aeonus.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dark_portal\boss_chrono_lord_deja.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dark_portal\boss_temporus.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dark_portal\dark_portal.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dark_portal\instance_dark_portal.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_deathwing.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_hagara.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_morchok.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_ultraxion.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_warlord_zonozz.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_warmaster_blackhorn.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_yorsahj.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\dragon_soul.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\instance_dragon_soul.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\end_of_time\end_of_time.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\end_of_time\instance_end_of_time.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hour_of_twilight\boss_archbishop_benedictus.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hour_of_twilight\boss_arcurion.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hour_of_twilight\boss_asira_dawnslayer.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hour_of_twilight\instance_hour_of_twilight.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hyjal_summit\boss_archimonde.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hyjal_summit\hyjal.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hyjal_summit\hyjalAI.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hyjal_summit\instance_hyjal.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\instance_old_hillsbrad.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\well_of_eternity\boss_mannoroth_and_varothen.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\well_of_eternity\boss_perotharn.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\well_of_eternity\boss_queen_azshara.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\well_of_eternity\instance_well_of_eternity.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\dire_maul\dire_maul.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\dire_maul\instance_dire_maul.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_alysrazor.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_baleroc.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_bethtilac.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_lord_rhyolith.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_majordomo_staghelm.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_ragnaros_firelands.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_shannox.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\firelands\instance_firelands.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\lost_city_of_tolvir\boss_general_husam.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\lost_city_of_tolvir\boss_lockmaw.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\lost_city_of_tolvir\boss_prophet_barim.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\lost_city_of_tolvir\boss_siamat.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\lost_city_of_tolvir\instance_lost_city_of_tolvir.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\maraudon\boss_noxxion.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\onyxias_lair\boss_onyxia.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\onyxias_lair\instance_onyxias_lair.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\razorfen_downs\razorfen_downs.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\razorfen_kraul\instance_razorfen_kraul.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_ayamiss.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_buru.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_kurinnaxx.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_moam.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_ossirian.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_rajaxx.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\instance_ruins_of_ahnqiraj.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\ruins_of_ahnqiraj.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_bug_trio.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_cthun.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_fankriss.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_huhuran.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_ouro.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_sartura.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_skeram.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_twinemperors.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_viscidus.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\instance_temple_of_ahnqiraj.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\mob_anubisath_sentinel.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\throne_of_the_four_winds\boss_alakir.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\throne_of_the_four_winds\conclave_of_the_wind.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\throne_of_the_four_winds\instance_throne_of_the_four_winds.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\vortex_pinnacle\boss_altairus.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\vortex_pinnacle\boss_asaad.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\vortex_pinnacle\boss_grand_vizier_ertan.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\vortex_pinnacle\instance_vortex_pinnacle.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\wailing_caverns\instance_wailing_caverns.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\wailing_caverns\wailing_caverns.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\zulfarrak\boss_zumrah.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\zulfarrak\instance_zulfarrak.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\zulfarrak\zulfarrak.cpp" />
-    <ClCompile Include="..\scripts\maelstrom\deepholm.cpp" />
-    <ClCompile Include="..\scripts\maelstrom\kezan.cpp" />
-    <ClCompile Include="..\scripts\maelstrom\lost_isles.cpp" />
-    <ClCompile Include="..\scripts\maelstrom\stonecore\boss_corborus.cpp" />
-    <ClCompile Include="..\scripts\maelstrom\stonecore\boss_ozruk.cpp" />
-    <ClCompile Include="..\scripts\maelstrom\stonecore\boss_priestess_azil.cpp" />
-    <ClCompile Include="..\scripts\maelstrom\stonecore\boss_slabhide.cpp" />
-    <ClCompile Include="..\scripts\maelstrom\stonecore\instance_stonecore.cpp" />
-    <ClCompile Include="..\scripts\northrend\borean_tundra.cpp" />
-    <ClCompile Include="..\scripts\northrend\dalaran.cpp" />
-    <ClCompile Include="..\scripts\northrend\dragonblight.cpp" />
-    <ClCompile Include="..\scripts\northrend\grizzly_hills.cpp" />
-    <ClCompile Include="..\scripts\northrend\howling_fjord.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown.cpp" />
-    <ClCompile Include="..\scripts\northrend\sholazar_basin.cpp" />
-    <ClCompile Include="..\scripts\northrend\storm_peaks.cpp" />
-    <ClCompile Include="..\scripts\northrend\zuldrak.cpp" />
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\ahnkahet\boss_amanitar.cpp" />
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\ahnkahet\boss_jedoga.cpp" />
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\ahnkahet\boss_nadox.cpp" />
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\ahnkahet\boss_taldaram.cpp" />
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\ahnkahet\boss_volazj.cpp" />
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\ahnkahet\instance_ahnkahet.cpp" />
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\azjol-nerub\boss_anubarak.cpp" />
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\azjol-nerub\boss_hadronox.cpp" />
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\azjol-nerub\boss_krikthir.cpp" />
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\azjol-nerub\instance_azjol-nerub.cpp" />
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_champion\boss_grand_champions.cpp" />
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_champion\instance_trial_of_the_champion.cpp" />
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_champion\trial_of_the_champion.cpp" />
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\boss_anubarak_trial.cpp" />
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\boss_faction_champions.cpp" />
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\boss_jaraxxus.cpp" />
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\boss_northrend_beasts.cpp" />
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\boss_twin_valkyr.cpp" />
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\instance_trial_of_the_crusader.cpp" />
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\trial_of_the_crusader.cpp" />
-    <ClCompile Include="..\scripts\northrend\draktharon_keep\boss_novos.cpp" />
-    <ClCompile Include="..\scripts\northrend\draktharon_keep\boss_tharonja.cpp" />
-    <ClCompile Include="..\scripts\northrend\draktharon_keep\boss_trollgore.cpp" />
-    <ClCompile Include="..\scripts\northrend\draktharon_keep\instance_draktharon_keep.cpp" />
-    <ClCompile Include="..\scripts\northrend\gundrak\boss_colossus.cpp" />
-    <ClCompile Include="..\scripts\northrend\gundrak\boss_eck.cpp" />
-    <ClCompile Include="..\scripts\northrend\gundrak\boss_galdarah.cpp" />
-    <ClCompile Include="..\scripts\northrend\gundrak\boss_moorabi.cpp" />
-    <ClCompile Include="..\scripts\northrend\gundrak\boss_sladran.cpp" />
-    <ClCompile Include="..\scripts\northrend\gundrak\instance_gundrak.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls\boss_bronjahm.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls\boss_devourer_of_souls.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls\instance_forge_of_souls.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\boss_falric.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\boss_lich_king.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\boss_marwyn.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\halls_of_reflection.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\instance_halls_of_reflection.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron\boss_forgemaster_garfrost.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron\boss_krick_and_ick.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron\boss_scourgelord_tyrannus.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron\instance_pit_of_saron.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron\pit_of_saron.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\blood_prince_council.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_blood_queen_lanathel.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_deathbringer_saurfang.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_festergut.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_lady_deathwhisper.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_lord_marrowgar.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_professor_putricide.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_rotface.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_sindragosa.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_the_lich_king.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_valithria_dreamwalker.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\gunship_battle.cpp" />
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\instance_icecrown_citadel.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_anubrekhan.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_faerlina.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_four_horsemen.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_gluth.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_gothik.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_grobbulus.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_heigan.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_kelthuzad.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_loatheb.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_maexxna.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_noth.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_patchwerk.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_razuvious.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_sapphiron.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_thaddius.cpp" />
-    <ClCompile Include="..\scripts\northrend\naxxramas\instance_naxxramas.cpp" />
-    <ClCompile Include="..\scripts\northrend\nexus\eye_of_eternity\boss_malygos.cpp" />
-    <ClCompile Include="..\scripts\northrend\nexus\eye_of_eternity\instance_eye_of_eternity.cpp" />
-    <ClCompile Include="..\scripts\northrend\nexus\nexus\boss_anomalus.cpp" />
-    <ClCompile Include="..\scripts\northrend\nexus\nexus\boss_keristrasza.cpp" />
-    <ClCompile Include="..\scripts\northrend\nexus\nexus\boss_ormorok.cpp" />
-    <ClCompile Include="..\scripts\northrend\nexus\nexus\boss_telestra.cpp" />
-    <ClCompile Include="..\scripts\northrend\nexus\nexus\instance_nexus.cpp" />
-    <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_eregos.cpp" />
-    <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_urom.cpp" />
-    <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_varos.cpp" />
-    <ClCompile Include="..\scripts\northrend\nexus\oculus\instance_oculus.cpp" />
-    <ClCompile Include="..\scripts\northrend\nexus\oculus\oculus.cpp" />
-    <ClCompile Include="..\scripts\northrend\obsidian_sanctum\boss_sartharion.cpp" />
-    <ClCompile Include="..\scripts\northrend\obsidian_sanctum\instance_obsidian_sanctum.cpp" />
-    <ClCompile Include="..\scripts\northrend\ruby_sanctum\boss_baltharus.cpp" />
-    <ClCompile Include="..\scripts\northrend\ruby_sanctum\boss_halion.cpp" />
-    <ClCompile Include="..\scripts\northrend\ruby_sanctum\boss_saviana.cpp" />
-    <ClCompile Include="..\scripts\northrend\ruby_sanctum\boss_zarithrian.cpp" />
-    <ClCompile Include="..\scripts\northrend\ruby_sanctum\instance_ruby_sanctum.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_lightning\boss_bjarngrim.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_lightning\boss_ionar.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_lightning\boss_loken.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_lightning\boss_volkhan.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_lightning\instance_halls_of_lightning.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_stone\boss_maiden_of_grief.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_stone\boss_sjonnir.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_stone\halls_of_stone.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_stone\instance_halls_of_stone.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\assembly_of_iron.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_algalon.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_auriaya.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_flame_leviathan.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_freya.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_general_vezax.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_hodir.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_ignis.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_kologarn.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_mimiron.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_razorscale.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_thorim.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_xt_002.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_yogg_saron.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\instance_ulduar.cpp" />
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\ulduar.cpp" />
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_ingvar.cpp" />
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_keleseth.cpp" />
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_skarvald_and_dalronn.cpp" />
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_keep\instance_utgarde_keep.cpp" />
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_keep\utgarde_keep.cpp" />
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_gortok.cpp" />
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_skadi.cpp" />
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_svala.cpp" />
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_ymiron.cpp" />
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\instance_utgarde_pinnacle.cpp" />
-    <ClCompile Include="..\scripts\northrend\vault_of_archavon\boss_archavon.cpp" />
-    <ClCompile Include="..\scripts\northrend\vault_of_archavon\boss_emalon.cpp" />
-    <ClCompile Include="..\scripts\northrend\vault_of_archavon\boss_koralon.cpp" />
-    <ClCompile Include="..\scripts\northrend\vault_of_archavon\boss_toravon.cpp" />
-    <ClCompile Include="..\scripts\northrend\vault_of_archavon\instance_vault_of_archavon.cpp" />
-    <ClCompile Include="..\scripts\northrend\violet_hold\boss_erekem.cpp" />
-    <ClCompile Include="..\scripts\northrend\violet_hold\boss_ichoron.cpp" />
-    <ClCompile Include="..\scripts\northrend\violet_hold\instance_violet_hold.cpp" />
-    <ClCompile Include="..\scripts\northrend\violet_hold\violet_hold.cpp" />
-    <ClCompile Include="..\scripts\outland\blades_edge_mountains.cpp" />
-    <ClCompile Include="..\scripts\outland\boss_doomlord_kazzak.cpp" />
-    <ClCompile Include="..\scripts\outland\boss_doomwalker.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_peninsula.cpp" />
-    <ClCompile Include="..\scripts\outland\nagrand.cpp" />
-    <ClCompile Include="..\scripts\outland\netherstorm.cpp" />
-    <ClCompile Include="..\scripts\outland\shadowmoon_valley.cpp" />
-    <ClCompile Include="..\scripts\outland\shattrath_city.cpp" />
-    <ClCompile Include="..\scripts\outland\terokkar_forest.cpp" />
-    <ClCompile Include="..\scripts\outland\zangarmarsh.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\auchenai_crypts\boss_exarch_maladaar.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\auchenai_crypts\boss_shirrak.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\mana_tombs\boss_nexusprince_shaffar.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\mana_tombs\boss_pandemonius.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\sethekk_halls\boss_anzu.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\sethekk_halls\boss_darkweaver_syth.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\sethekk_halls\boss_talon_king_ikiss.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\sethekk_halls\instance_sethekk_halls.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\shadow_labyrinth\boss_ambassador_hellmaw.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\shadow_labyrinth\boss_blackheart_the_inciter.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\shadow_labyrinth\boss_grandmaster_vorpil.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\shadow_labyrinth\boss_murmur.cpp" />
-    <ClCompile Include="..\scripts\outland\auchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp" />
-    <ClCompile Include="..\scripts\outland\black_temple\black_temple.cpp" />
-    <ClCompile Include="..\scripts\outland\black_temple\boss_bloodboil.cpp" />
-    <ClCompile Include="..\scripts\outland\black_temple\boss_illidan.cpp" />
-    <ClCompile Include="..\scripts\outland\black_temple\boss_mother_shahraz.cpp" />
-    <ClCompile Include="..\scripts\outland\black_temple\boss_reliquary_of_souls.cpp" />
-    <ClCompile Include="..\scripts\outland\black_temple\boss_shade_of_akama.cpp" />
-    <ClCompile Include="..\scripts\outland\black_temple\boss_supremus.cpp" />
-    <ClCompile Include="..\scripts\outland\black_temple\boss_teron_gorefiend.cpp" />
-    <ClCompile Include="..\scripts\outland\black_temple\boss_warlord_najentus.cpp" />
-    <ClCompile Include="..\scripts\outland\black_temple\illidari_council.cpp" />
-    <ClCompile Include="..\scripts\outland\black_temple\instance_black_temple.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\boss_fathomlord_karathress.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\boss_hydross_the_unstable.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\boss_lady_vashj.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\boss_leotheras_the_blind.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\boss_morogrim_tidewalker.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\boss_the_lurker_below.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\instance_serpent_shrine.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\slave_pens\boss_ahune.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\steam_vault\boss_hydromancer_thespia.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\steam_vault\boss_mekgineer_steamrigger.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\steam_vault\boss_warlord_kalithresh.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\steam_vault\instance_steam_vault.cpp" />
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\underbog\boss_hungarfen.cpp" />
-    <ClCompile Include="..\scripts\outland\gruuls_lair\boss_gruul.cpp" />
-    <ClCompile Include="..\scripts\outland\gruuls_lair\boss_high_king_maulgar.cpp" />
-    <ClCompile Include="..\scripts\outland\gruuls_lair\instance_gruuls_lair.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\blood_furnace\boss_broggok.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\blood_furnace\boss_kelidan_the_breaker.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\blood_furnace\boss_the_maker.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\blood_furnace\instance_blood_furnace.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\hellfire_ramparts\boss_nazan_and_vazruden.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\hellfire_ramparts\boss_omor_the_unscarred.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\hellfire_ramparts\boss_watchkeeper_gargolmar.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\hellfire_ramparts\instance_hellfire_ramparts.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\magtheridons_lair\boss_magtheridon.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\magtheridons_lair\instance_magtheridons_lair.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\shattered_halls\boss_nethekurse.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\shattered_halls\boss_warbringer_omrogg.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\shattered_halls\boss_warchief_kargath_bladefist.cpp" />
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\shattered_halls\instance_shattered_halls.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\arcatraz\arcatraz.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\arcatraz\boss_dalliah.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\arcatraz\boss_harbinger_skyriss.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\arcatraz\boss_soccothrates.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\arcatraz\instance_arcatraz.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\botanica\boss_high_botanist_freywinn.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\botanica\boss_laj.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\botanica\boss_warp_splinter.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_alar.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_astromancer.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_kaelthas.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_void_reaver.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\instance_the_eye.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_mechanar\boss_nethermancer_sepethrea.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_mechanar\boss_pathaleon_the_calculator.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_mechanar\instance_mechanar.cpp" />
-    <ClCompile Include="..\scripts\world\areatrigger_scripts.cpp" />
-    <ClCompile Include="..\scripts\world\bosses_emerald_dragons.cpp" />
-    <ClCompile Include="..\scripts\world\go_scripts.cpp" />
-    <ClCompile Include="..\scripts\world\guards.cpp" />
-    <ClCompile Include="..\scripts\world\item_scripts.cpp" />
-    <ClCompile Include="..\scripts\world\mob_generic_creature.cpp" />
-    <ClCompile Include="..\scripts\world\npc_professions.cpp" />
-    <ClCompile Include="..\scripts\world\npcs_special.cpp" />
-    <ClCompile Include="..\scripts\world\spell_scripts.cpp" />
-    <ClCompile Include="..\scripts\world\world_map_scripts.cpp" />
-    <ClCompile Include="..\include\precompiled.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\include\sc_creature.cpp" />
-    <ClCompile Include="..\include\sc_grid_searchers.cpp" />
-    <ClCompile Include="..\include\sc_instance.cpp" />
-    <ClCompile Include="..\system\MangosdRev.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\system\ScriptLoader.cpp" />
-    <ClCompile Include="..\system\system.cpp" />
-    <ClCompile Include="..\ScriptMgr.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\base\escort_ai.h" />
-    <ClInclude Include="..\base\follower_ai.h" />
-    <ClInclude Include="..\base\guard_ai.h" />
-    <ClInclude Include="..\base\pet_ai.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\bastion_of_twilight\bastion_of_twilight.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\blackrock_caverns.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\blackrock_depths.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\blackrock_spire.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\blackwing_descent.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\blackwing_lair.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\molten_core.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\deadmines\deadmines.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\gnomeregan\gnomeregan.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\grim_batol\grim_batol.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\karazhan\karazhan.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\magisters_terrace\magisters_terrace.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\scarlet_enclave\world_map_ebon_hold.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\scarlet_monastery\scarlet_monastery.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\scholomance\scholomance.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\stratholme\stratholme.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\sunken_temple\sunken_temple.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\sunwell_plateau\sunwell_plateau.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\throne_of_the_tides\throne_of_the_tides.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\uldaman\uldaman.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\zulaman\zulaman.h" />
-    <ClInclude Include="..\scripts\eastern_kingdoms\zulgurub\zulgurub.h" />
-    <ClInclude Include="..\scripts\kalimdor\blackfathom_deeps\blackfathom_deeps.h" />
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\culling_of_stratholme.h" />
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\dark_portal\dark_portal.h" />
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\dragon_soul.h" />
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\end_of_time\end_of_time.h" />
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\hour_of_twilight\hour_of_twilight.h" />
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\hyjal_summit\hyjal.h" />
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\hyjal_summit\hyjalAI.h" />
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.h" />
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\well_of_eternity\well_of_eternity.h" />
-    <ClInclude Include="..\scripts\kalimdor\dire_maul\dire_maul.h" />
-    <ClInclude Include="..\scripts\kalimdor\firelands\firelands.h" />
-    <ClInclude Include="..\scripts\kalimdor\lost_city_of_tolvir\lost_city_of_tolvir.h" />
-    <ClInclude Include="..\scripts\kalimdor\onyxias_lair\onyxias_lair.h" />
-    <ClInclude Include="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.h" />
-    <ClInclude Include="..\scripts\kalimdor\ruins_of_ahnqiraj\ruins_of_ahnqiraj.h" />
-    <ClInclude Include="..\scripts\kalimdor\temple_of_ahnqiraj\temple_of_ahnqiraj.h" />
-    <ClInclude Include="..\scripts\kalimdor\throne_of_the_four_winds\throne_of_the_four_winds.h" />
-    <ClInclude Include="..\scripts\kalimdor\vortex_pinnacle\vortex_pinnacle.h" />
-    <ClInclude Include="..\scripts\kalimdor\wailing_caverns\wailing_caverns.h" />
-    <ClInclude Include="..\scripts\kalimdor\zulfarrak\zulfarrak.h" />
-    <ClInclude Include="..\scripts\maelstrom\stonecore\stonecore.h" />
-    <ClInclude Include="..\scripts\northrend\azjol-nerub\ahnkahet\ahnkahet.h" />
-    <ClInclude Include="..\scripts\northrend\azjol-nerub\azjol-nerub\azjol-nerub.h" />
-    <ClInclude Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_champion\trial_of_the_champion.h" />
-    <ClInclude Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\trial_of_the_crusader.h" />
-    <ClInclude Include="..\scripts\northrend\draktharon_keep\draktharon_keep.h" />
-    <ClInclude Include="..\scripts\northrend\gundrak\gundrak.h" />
-    <ClInclude Include="..\scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls\forge_of_souls.h" />
-    <ClInclude Include="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\halls_of_reflection.h" />
-    <ClInclude Include="..\scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron\pit_of_saron.h" />
-    <ClInclude Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\icecrown_citadel.h" />
-    <ClInclude Include="..\scripts\northrend\naxxramas\naxxramas.h" />
-    <ClInclude Include="..\scripts\northrend\nexus\eye_of_eternity\eye_of_eternity.h" />
-    <ClInclude Include="..\scripts\northrend\nexus\nexus\nexus.h" />
-    <ClInclude Include="..\scripts\northrend\nexus\oculus\oculus.h" />
-    <ClInclude Include="..\scripts\northrend\obsidian_sanctum\obsidian_sanctum.h" />
-    <ClInclude Include="..\scripts\northrend\ruby_sanctum\ruby_sanctum.h" />
-    <ClInclude Include="..\scripts\northrend\ulduar\halls_of_lightning\halls_of_lightning.h" />
-    <ClInclude Include="..\scripts\northrend\ulduar\halls_of_stone\halls_of_stone.h" />
-    <ClInclude Include="..\scripts\northrend\ulduar\ulduar\ulduar.h" />
-    <ClInclude Include="..\scripts\northrend\utgarde_keep\utgarde_keep\utgarde_keep.h" />
-    <ClInclude Include="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\utgarde_pinnacle.h" />
-    <ClInclude Include="..\scripts\northrend\vault_of_archavon\vault_of_archavon.h" />
-    <ClInclude Include="..\scripts\northrend\violet_hold\violet_hold.h" />
-    <ClInclude Include="..\scripts\outland\auchindoun\sethekk_halls\sethekk_halls.h" />
-    <ClInclude Include="..\scripts\outland\auchindoun\shadow_labyrinth\shadow_labyrinth.h" />
-    <ClInclude Include="..\scripts\outland\black_temple\black_temple.h" />
-    <ClInclude Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\serpent_shrine.h" />
-    <ClInclude Include="..\scripts\outland\coilfang_reservoir\steam_vault\steam_vault.h" />
-    <ClInclude Include="..\scripts\outland\gruuls_lair\gruuls_lair.h" />
-    <ClInclude Include="..\scripts\outland\hellfire_citadel\blood_furnace\blood_furnace.h" />
-    <ClInclude Include="..\scripts\outland\hellfire_citadel\hellfire_ramparts\hellfire_ramparts.h" />
-    <ClInclude Include="..\scripts\outland\hellfire_citadel\magtheridons_lair\magtheridons_lair.h" />
-    <ClInclude Include="..\scripts\outland\hellfire_citadel\shattered_halls\shattered_halls.h" />
-    <ClInclude Include="..\scripts\outland\tempest_keep\arcatraz\arcatraz.h" />
-    <ClInclude Include="..\scripts\outland\tempest_keep\the_eye\the_eye.h" />
-    <ClInclude Include="..\scripts\outland\tempest_keep\the_mechanar\mechanar.h" />
-    <ClInclude Include="..\scripts\world\world_map_scripts.h" />
-    <ClInclude Include="..\include\precompiled.h" />
-    <ClInclude Include="..\include\sc_creature.h" />
-    <ClInclude Include="..\include\sc_gossip.h" />
-    <ClInclude Include="..\include\sc_grid_searchers.h" />
-    <ClInclude Include="..\include\sc_instance.h" />
-    <ClInclude Include="..\system\ScriptLoader.h" />
-    <ClInclude Include="..\system\system.h" />
-    <ClInclude Include="..\config.h" />
-    <CustomBuild Include="..\revision.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Extracting revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(SolutionDir)"
-"$(SolutionDir)..\..\..\win\VC120\genrevision__Win32_$(Configuration)\genrevision.exe"
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.svn/entries;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Extracting revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(SolutionDir)"
-"$(SolutionDir)..\..\..\win\VC120\genrevision__Win32_$(Configuration)\genrevision.exe"
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.svn/entries;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Extracting revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(SolutionDir)"
-"$(SolutionDir)..\..\..\win\VC120\genrevision__Win32_$(Configuration)\genrevision.exe"
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.svn/entries;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Extracting revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(SolutionDir)"
-"$(SolutionDir)..\..\..\win\VC120\genrevision__Win32_$(Configuration)\genrevision.exe"
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.svn/entries;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">revision.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <ClInclude Include="..\sd2_revision_nr.h" />
-    <ClInclude Include="..\sd2_revision_sql.h" />
-    <ClInclude Include="..\ScriptMgr.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/modules/SD2/@@Temp_VC120/ScriptDev2.vcxproj.filters b/src/modules/SD2/@@Temp_VC120/ScriptDev2.vcxproj.filters
deleted file mode 100644
index d19c23750..000000000
--- a/src/modules/SD2/@@Temp_VC120/ScriptDev2.vcxproj.filters
+++ /dev/null
@@ -1,2249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="base">
-      <UniqueIdentifier>{3b1307a9-bc58-4773-9a93-0e9ceff55c82}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts">
-      <UniqueIdentifier>{b7b35df3-4231-4370-aed5-5859ab4c312e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\battlegrounds">
-      <UniqueIdentifier>{ced0a1e2-6867-4f01-a762-390a3d1f01d3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\custom">
-      <UniqueIdentifier>{af3d4b4d-a585-41c4-ba95-79669a614ea8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms">
-      <UniqueIdentifier>{ca2551e0-68d0-4331-88f3-ab0cdaa2bf9a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\bastion_of_twilight">
-      <UniqueIdentifier>{043f49c3-d844-4833-b5bc-bf88638c47b5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\blackrock_mountain">
-      <UniqueIdentifier>{1bb5cf47-7950-4b49-8e5d-9ee37108f2c5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns">
-      <UniqueIdentifier>{434e1621-9e58-44d9-b5a6-d0f5dea495b4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths">
-      <UniqueIdentifier>{45c59280-02fb-482f-859b-bd47cc230f0f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire">
-      <UniqueIdentifier>{5631f38e-66c8-4efd-ad3a-2834fbb49a6e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent">
-      <UniqueIdentifier>{9887f0b1-d8ca-49a5-b1a7-aaf30ed4452f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair">
-      <UniqueIdentifier>{31605090-12b9-4d42-a5e9-1cbfac8ab384}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\blackrock_mountain\molten_core">
-      <UniqueIdentifier>{920d1832-b347-4afd-bd05-4c943e5555f0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\deadmines">
-      <UniqueIdentifier>{08fb5b22-710d-46d6-9893-f567aa75a5e6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\gnomeregan">
-      <UniqueIdentifier>{cef5c3c5-f434-4b9f-9bad-8c106d46c755}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\grim_batol">
-      <UniqueIdentifier>{cc0c8231-75d8-456e-bca8-7d0a122eee52}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\karazhan">
-      <UniqueIdentifier>{66bc2cec-8372-4191-991c-1c23275fa13c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\magisters_terrace">
-      <UniqueIdentifier>{af465469-5a16-4908-aa08-39c77d02cd88}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\scarlet_enclave">
-      <UniqueIdentifier>{6ffd42e5-ac49-4635-8087-77ad2b7b0866}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\scarlet_monastery">
-      <UniqueIdentifier>{dd4995a8-6d86-4f21-82bc-a18acc2c688f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\scholomance">
-      <UniqueIdentifier>{2a3a25e5-51f1-4ab3-a1a0-1b9ec9c45d1a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\shadowfang_keep">
-      <UniqueIdentifier>{7a028ad9-afa1-42ea-b147-20a40c5e716c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\stockade">
-      <UniqueIdentifier>{66401dac-d94c-4ed6-b912-229dda0906d6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\stratholme">
-      <UniqueIdentifier>{385f26dc-dcaf-4022-921d-3a562617bf93}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\sunken_temple">
-      <UniqueIdentifier>{25be39dd-536d-450d-ac94-6372d37a4fae}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\sunwell_plateau">
-      <UniqueIdentifier>{1d718eaa-2a8d-4cb9-9abf-17fcf0d91f83}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\throne_of_the_tides">
-      <UniqueIdentifier>{f00c08b4-1c1d-4379-8b0c-2a1a51c14bb2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\uldaman">
-      <UniqueIdentifier>{c929f54b-22dd-49b4-862c-92dfa9a2d1f7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\zulaman">
-      <UniqueIdentifier>{60b91cfe-7dff-40de-9957-41f8d03144cc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\eastern_kingdoms\zulgurub">
-      <UniqueIdentifier>{22eca3e6-662f-4c53-9344-6e749c09c86b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\examples">
-      <UniqueIdentifier>{070541ef-a813-43f5-a8a6-e6674fe1a47e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor">
-      <UniqueIdentifier>{5cda7bda-399b-46b7-8bc2-5786f0202fa2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\blackfathom_deeps">
-      <UniqueIdentifier>{226d4dc8-830b-4249-b28a-313ac21080a9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\caverns_of_time">
-      <UniqueIdentifier>{404b30fd-bdaa-44d1-ab3a-384886ebb8ec}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\caverns_of_time\culling_of_stratholme">
-      <UniqueIdentifier>{5833dbce-1fa8-49eb-b678-145a2d58a067}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\caverns_of_time\dark_portal">
-      <UniqueIdentifier>{dc38d3fe-d1fe-49f2-bd8f-758cd270dd62}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\caverns_of_time\dragon_soul">
-      <UniqueIdentifier>{ad315c26-01fe-4431-96bf-7b3dc3402e1a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\caverns_of_time\end_of_time">
-      <UniqueIdentifier>{b8416f00-9151-4ab5-abe1-bc06af42d736}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\caverns_of_time\hour_of_twilight">
-      <UniqueIdentifier>{4df3cb5e-8de9-4082-a35a-72a2c589779c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\caverns_of_time\hyjal_summit">
-      <UniqueIdentifier>{2552ab59-1f73-4778-a6db-6f03e405622d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\caverns_of_time\old_hillsbrad">
-      <UniqueIdentifier>{8206776b-4d43-431d-bca5-5f6cff157ea4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\caverns_of_time\well_of_eternity">
-      <UniqueIdentifier>{708d3668-ff97-46b8-a75e-6f5d20ee3ec8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\dire_maul">
-      <UniqueIdentifier>{02135a7c-33cc-444e-af90-48a5193e5a6f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\firelands">
-      <UniqueIdentifier>{094d5051-4784-4b79-8875-a87d4ed6d5b1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\lost_city_of_tolvir">
-      <UniqueIdentifier>{dd6326cc-bcd9-4642-a049-7911cda0bc85}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\maraudon">
-      <UniqueIdentifier>{014ada9a-13bf-4540-a0ce-5132bdc36fcf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\onyxias_lair">
-      <UniqueIdentifier>{9feb59d0-e6bd-4328-9a50-7ddb9852936e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\ragefire_chasm">
-      <UniqueIdentifier>{00f03f8d-4af1-40d9-a95a-e2dc1a81ca7d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\razorfen_downs">
-      <UniqueIdentifier>{de2e959a-1ef4-41ef-9235-15a1f3f8a19d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\razorfen_kraul">
-      <UniqueIdentifier>{8f8a60e0-223e-4517-918c-243e523a7892}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\ruins_of_ahnqiraj">
-      <UniqueIdentifier>{416ccfc8-a1bb-43a5-b202-d7656981094a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\temple_of_ahnqiraj">
-      <UniqueIdentifier>{ba031a13-787e-41da-bcaf-1986fdea8069}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\throne_of_the_four_winds">
-      <UniqueIdentifier>{17496c60-f5f8-4e29-ab2b-d480296e0eb4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\vortex_pinnacle">
-      <UniqueIdentifier>{397252e0-5267-4571-b9e1-cb45a1bbd1ab}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\wailing_caverns">
-      <UniqueIdentifier>{0412262e-b05b-4827-adef-97507204cb69}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\kalimdor\zulfarrak">
-      <UniqueIdentifier>{e775610e-fa3c-4355-9c4c-473a6a5e57d5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\maelstrom">
-      <UniqueIdentifier>{d85193fb-5107-4a82-86b9-fff6c2ffb537}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\maelstrom\stonecore">
-      <UniqueIdentifier>{6089ced5-7090-4294-bd63-c036335880be}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend">
-      <UniqueIdentifier>{6c5f7fd4-671b-4cba-aa95-7758b93dc844}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\azjol-nerub">
-      <UniqueIdentifier>{71e87e58-3b30-41e7-8f8a-16886508a4d9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\azjol-nerub\ahnkahet">
-      <UniqueIdentifier>{3cf8e088-da94-4561-993f-2970908d6642}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\azjol-nerub\azjol-nerub">
-      <UniqueIdentifier>{bc0156b2-6544-4ebc-9ed6-fe45ac1902a4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\crusaders_coliseum">
-      <UniqueIdentifier>{b59c73a8-c480-43b2-8a2e-65f5a54978eb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\crusaders_coliseum\trial_of_the_champion">
-      <UniqueIdentifier>{5eb6a84a-97e6-477e-97e3-23681f29f675}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\crusaders_coliseum\trial_of_the_crusader">
-      <UniqueIdentifier>{d7e0e45a-fd89-48a6-8d24-f4922058160e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\draktharon_keep">
-      <UniqueIdentifier>{71617682-fe62-4d7c-a2de-7181fb3f46f6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\gundrak">
-      <UniqueIdentifier>{9c5d9a0f-8967-4cf6-a047-3b724f81dc29}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\icecrown_citadel">
-      <UniqueIdentifier>{88c327d5-0768-465f-b954-30eca0d31f45}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\icecrown_citadel\icecrown_citadel">
-      <UniqueIdentifier>{b20efa19-1e16-42e4-bc29-a9c8e282d17c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\icecrown_citadel\frozen_halls">
-      <UniqueIdentifier>{fec1fbfa-5119-4bb0-98bc-f8d4583521f7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron">
-      <UniqueIdentifier>{1cb43523-dc33-4c49-a5b7-6e700fe0ecd6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection">
-      <UniqueIdentifier>{7289cc07-6956-4b09-8dc5-753c82abe8c9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls">
-      <UniqueIdentifier>{e834cf7b-88ad-4bae-9fc8-8e027136c63b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\naxxramas">
-      <UniqueIdentifier>{42501e94-f91e-40be-a02a-472b5ca1e22c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\nexus">
-      <UniqueIdentifier>{aac6b8be-6055-4d7d-a50a-41650b8d464e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\nexus\eye_of_eternity">
-      <UniqueIdentifier>{e7ee3113-f4d0-4e28-acc7-dc80f42d41df}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\nexus\nexus">
-      <UniqueIdentifier>{e603d4b3-3c2f-4011-aa2b-040243163d3f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\nexus\oculus">
-      <UniqueIdentifier>{36c79ad7-420c-4909-8da3-c90d3cc83b31}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\obsidian_sanctum">
-      <UniqueIdentifier>{d47410b0-3184-40e2-8704-cea9b97e20ed}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\ruby_sanctum">
-      <UniqueIdentifier>{e35abead-2389-4eb9-88bd-70e6fe5636b5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\ulduar">
-      <UniqueIdentifier>{1b2f0d99-82b0-4a96-aaac-c485830eb1b3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\ulduar\halls_of_lightning">
-      <UniqueIdentifier>{fd594031-4dc2-40de-b37b-93063ee6e3e9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\ulduar\halls_of_stone">
-      <UniqueIdentifier>{ef27a557-e12d-4b02-9e86-c258329f201e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\ulduar\ulduar">
-      <UniqueIdentifier>{b7e4ad7d-8515-4981-ae27-9e542c223618}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\utgarde_keep">
-      <UniqueIdentifier>{04b1d59c-38b6-4b5c-a50d-b9ff1d39bb30}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\utgarde_keep\utgarde_keep">
-      <UniqueIdentifier>{ee364414-732a-4aad-820f-a5b73cb8b093}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\utgarde_keep\utgarde_pinnacle">
-      <UniqueIdentifier>{638d5426-652e-4d1f-9abe-3ed95d7e7e69}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\vault_of_archavon">
-      <UniqueIdentifier>{a21893a5-0f34-4a73-b0aa-49b175822834}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\northrend\violet_hold">
-      <UniqueIdentifier>{728148f8-18a0-4606-a2ec-2c9eae4e5e7e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland">
-      <UniqueIdentifier>{cfb08e82-63e6-49ca-bff2-533f8647797b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\auchindoun">
-      <UniqueIdentifier>{2be3084e-c5c0-4e2f-bbb4-2ebb22bfff19}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\auchindoun\auchenai_crypts">
-      <UniqueIdentifier>{6dc08e92-3e86-4a7f-bab9-9a8cec6a201b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\auchindoun\mana_tombs">
-      <UniqueIdentifier>{01da56d1-ee04-455c-846c-4e53869314f6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\auchindoun\sethekk_halls">
-      <UniqueIdentifier>{5e79ca74-cd29-47ff-a08e-3fada858ddd7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\auchindoun\shadow_labyrinth">
-      <UniqueIdentifier>{32b92545-4821-4cc8-ae39-f631b0176d46}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\black_temple">
-      <UniqueIdentifier>{044e4dbc-e2fc-437c-b359-b6fb5a3439ff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\coilfang_reservoir">
-      <UniqueIdentifier>{4cbcf193-4d98-4518-a9c4-6c8b4bedbf44}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\coilfang_reservoir\serpent_shrine">
-      <UniqueIdentifier>{5c32221e-3532-4c32-bdba-9a85213006af}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\coilfang_reservoir\slave_pens">
-      <UniqueIdentifier>{2df99085-aee2-4202-b4d1-38a5cc35f3e2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\coilfang_reservoir\steam_vault">
-      <UniqueIdentifier>{0a109c31-6dd3-4030-8d6c-6c0e147481be}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\coilfang_reservoir\underbog">
-      <UniqueIdentifier>{ddada980-2eed-4f2b-a9f7-dbb9cca7ca3d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\gruuls_lair">
-      <UniqueIdentifier>{d6843352-6425-48da-85b6-6b26f6217ba8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\hellfire_citadel">
-      <UniqueIdentifier>{6a68396b-343f-4c79-938c-93741acdeb41}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\hellfire_citadel\blood_furnace">
-      <UniqueIdentifier>{974fc97c-e585-442c-b35e-b21a17804619}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\hellfire_citadel\hellfire_ramparts">
-      <UniqueIdentifier>{ba709b56-d5db-4730-9591-79b8f9788ca1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\hellfire_citadel\magtheridons_lair">
-      <UniqueIdentifier>{1fa90250-9c5b-450c-be64-d9eee910c4a8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\hellfire_citadel\shattered_halls">
-      <UniqueIdentifier>{7b3c1c18-03e9-493e-a364-5beb1a6936eb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\tempest_keep">
-      <UniqueIdentifier>{575420cc-581f-4d08-a9da-7814f221ab47}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\tempest_keep\arcatraz">
-      <UniqueIdentifier>{9c5997ee-accc-4737-815f-b031d422577b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\tempest_keep\botanica">
-      <UniqueIdentifier>{579f2f5c-acf1-410a-bce6-d353d6912546}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\tempest_keep\the_eye">
-      <UniqueIdentifier>{04e4571d-55ee-4f2e-ac4e-46fc2610341f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\outland\tempest_keep\the_mechanar">
-      <UniqueIdentifier>{79a3e62b-bd96-4d16-8c23-bda17f968d19}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripts\world">
-      <UniqueIdentifier>{ca7213e9-56c1-4084-a48b-19ff57dee433}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="include">
-      <UniqueIdentifier>{2fd46769-c050-4e47-9533-461ef8695d6a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="system">
-      <UniqueIdentifier>{90f3df6a-a1d0-4a6e-b8d7-d1d993fc795b}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\base\escort_ai.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\follower_ai.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\guard_ai.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\base\pet_ai.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\battlegrounds\battleground.cpp">
-      <Filter>scripts\battlegrounds</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\alterac_mountains.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\arathi_highlands.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blasted_lands.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\burning_steppes.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\dun_morogh.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\eastern_plaguelands.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\elwynn_forest.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\eversong_woods.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\ghostlands.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\gilneas.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\gilneas_city.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\hinterlands.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\ironforge.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\isle_of_queldanas.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\loch_modan.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\redridge_mountains.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\searing_gorge.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\silvermoon_city.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\silverpine_forest.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\stormwind_city.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\stranglethorn_vale.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\swamp_of_sorrows.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\tirisfal_glades.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\twilight_highlands.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\undercity.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\vashjir.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\western_plaguelands.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\westfall.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\wetlands.cpp">
-      <Filter>scripts\eastern_kingdoms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\bastion_of_twilight\ascendant_council.cpp">
-      <Filter>scripts\eastern_kingdoms\bastion_of_twilight</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\bastion_of_twilight\boss_chogall.cpp">
-      <Filter>scripts\eastern_kingdoms\bastion_of_twilight</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\bastion_of_twilight\boss_halfus_wyrmbreaker.cpp">
-      <Filter>scripts\eastern_kingdoms\bastion_of_twilight</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\bastion_of_twilight\boss_sinestra.cpp">
-      <Filter>scripts\eastern_kingdoms\bastion_of_twilight</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\bastion_of_twilight\boss_valiona_and_theralion.cpp">
-      <Filter>scripts\eastern_kingdoms\bastion_of_twilight</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\bastion_of_twilight\instance_bastion_of_twilight.cpp">
-      <Filter>scripts\eastern_kingdoms\bastion_of_twilight</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\boss_beauty.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\boss_corla.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\boss_karsh_steelbender.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\boss_lord_obsidius.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\boss_romogg.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\instance_blackrock_caverns.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\blackrock_depths.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_ambassador_flamelash.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_coren_direbrew.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_emperor_dagran_thaurissan.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_general_angerforge.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_high_interrogator_gerstahn.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\instance_blackrock_depths.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\boss_gyth.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\boss_overlord_wyrmthalak.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\boss_pyroguard_emberseer.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\instance_blackrock_spire.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\boss_atramedes.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\boss_chimaeron.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\boss_magmaw.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\boss_maloriak.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\boss_nefarian_descent.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\instance_blackwing_descent.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\omnotron_defense.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_broodlord_lashlayer.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_chromaggus.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_ebonroc.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_firemaw.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_flamegor.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_nefarian.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_razorgore.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_vaelastrasz.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_victor_nefarius.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\instance_blackwing_lair.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_baron_geddon.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_garr.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_gehennas.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_golemagg.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_lucifron.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_magmadar.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_majordomo_executus.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_ragnaros.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_shazzrah.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_sulfuron_harbinger.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\instance_molten_core.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\molten_core.cpp">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\deadmines\boss_mr_smite.cpp">
-      <Filter>scripts\eastern_kingdoms\deadmines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\deadmines\deadmines.cpp">
-      <Filter>scripts\eastern_kingdoms\deadmines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\deadmines\instance_deadmines.cpp">
-      <Filter>scripts\eastern_kingdoms\deadmines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\gnomeregan\boss_thermaplugg.cpp">
-      <Filter>scripts\eastern_kingdoms\gnomeregan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\gnomeregan\gnomeregan.cpp">
-      <Filter>scripts\eastern_kingdoms\gnomeregan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\gnomeregan\instance_gnomeregan.cpp">
-      <Filter>scripts\eastern_kingdoms\gnomeregan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\grim_batol\boss_drahga_shadowburner.cpp">
-      <Filter>scripts\eastern_kingdoms\grim_batol</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\grim_batol\boss_erudax.cpp">
-      <Filter>scripts\eastern_kingdoms\grim_batol</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\grim_batol\boss_forgemaster_throngus.cpp">
-      <Filter>scripts\eastern_kingdoms\grim_batol</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\grim_batol\boss_general_umbriss.cpp">
-      <Filter>scripts\eastern_kingdoms\grim_batol</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\grim_batol\instance_grim_batol.cpp">
-      <Filter>scripts\eastern_kingdoms\grim_batol</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_curator.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_maiden_of_virtue.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_midnight.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_moroes.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_netherspite.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_nightbane.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_prince_malchezaar.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_shade_of_aran.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\boss_terestian_illhoof.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\bosses_opera.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\chess_event.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\instance_karazhan.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\karazhan\karazhan.cpp">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\magisters_terrace\boss_felblood_kaelthas.cpp">
-      <Filter>scripts\eastern_kingdoms\magisters_terrace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\magisters_terrace\boss_priestess_delrissa.cpp">
-      <Filter>scripts\eastern_kingdoms\magisters_terrace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\magisters_terrace\boss_selin_fireheart.cpp">
-      <Filter>scripts\eastern_kingdoms\magisters_terrace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\magisters_terrace\boss_vexallus.cpp">
-      <Filter>scripts\eastern_kingdoms\magisters_terrace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\magisters_terrace\instance_magisters_terrace.cpp">
-      <Filter>scripts\eastern_kingdoms\magisters_terrace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\magisters_terrace\magisters_terrace.cpp">
-      <Filter>scripts\eastern_kingdoms\magisters_terrace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_enclave\ebon_hold.cpp">
-      <Filter>scripts\eastern_kingdoms\scarlet_enclave</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_enclave\world_map_ebon_hold.cpp">
-      <Filter>scripts\eastern_kingdoms\scarlet_enclave</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\boss_arcanist_doan.cpp">
-      <Filter>scripts\eastern_kingdoms\scarlet_monastery</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\boss_headless_horseman.cpp">
-      <Filter>scripts\eastern_kingdoms\scarlet_monastery</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\boss_herod.cpp">
-      <Filter>scripts\eastern_kingdoms\scarlet_monastery</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\boss_mograine_and_whitemane.cpp">
-      <Filter>scripts\eastern_kingdoms\scarlet_monastery</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\scarlet_monastery\instance_scarlet_monastery.cpp">
-      <Filter>scripts\eastern_kingdoms\scarlet_monastery</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\scholomance\boss_darkmaster_gandling.cpp">
-      <Filter>scripts\eastern_kingdoms\scholomance</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\scholomance\boss_jandice_barov.cpp">
-      <Filter>scripts\eastern_kingdoms\scholomance</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\scholomance\instance_scholomance.cpp">
-      <Filter>scripts\eastern_kingdoms\scholomance</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\shadowfang_keep\boss_hummel.cpp">
-      <Filter>scripts\eastern_kingdoms\shadowfang_keep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\shadowfang_keep\instance_shadowfang_keep.cpp">
-      <Filter>scripts\eastern_kingdoms\shadowfang_keep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.cpp">
-      <Filter>scripts\eastern_kingdoms\shadowfang_keep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\boss_baroness_anastari.cpp">
-      <Filter>scripts\eastern_kingdoms\stratholme</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\boss_cannon_master_willey.cpp">
-      <Filter>scripts\eastern_kingdoms\stratholme</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\boss_dathrohan_balnazzar.cpp">
-      <Filter>scripts\eastern_kingdoms\stratholme</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\boss_maleki_the_pallid.cpp">
-      <Filter>scripts\eastern_kingdoms\stratholme</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\boss_order_of_silver_hand.cpp">
-      <Filter>scripts\eastern_kingdoms\stratholme</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\instance_stratholme.cpp">
-      <Filter>scripts\eastern_kingdoms\stratholme</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\stratholme\stratholme.cpp">
-      <Filter>scripts\eastern_kingdoms\stratholme</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunken_temple\instance_sunken_temple.cpp">
-      <Filter>scripts\eastern_kingdoms\sunken_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunken_temple\sunken_temple.cpp">
-      <Filter>scripts\eastern_kingdoms\sunken_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\boss_brutallus.cpp">
-      <Filter>scripts\eastern_kingdoms\sunwell_plateau</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\boss_eredar_twins.cpp">
-      <Filter>scripts\eastern_kingdoms\sunwell_plateau</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\boss_felmyst.cpp">
-      <Filter>scripts\eastern_kingdoms\sunwell_plateau</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\boss_kalecgos.cpp">
-      <Filter>scripts\eastern_kingdoms\sunwell_plateau</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\boss_kiljaeden.cpp">
-      <Filter>scripts\eastern_kingdoms\sunwell_plateau</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\boss_muru.cpp">
-      <Filter>scripts\eastern_kingdoms\sunwell_plateau</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\sunwell_plateau\instance_sunwell_plateau.cpp">
-      <Filter>scripts\eastern_kingdoms\sunwell_plateau</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\throne_of_the_tides\boss_commander_ulthok.cpp">
-      <Filter>scripts\eastern_kingdoms\throne_of_the_tides</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\throne_of_the_tides\boss_erunak_and_ghursha.cpp">
-      <Filter>scripts\eastern_kingdoms\throne_of_the_tides</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\throne_of_the_tides\boss_lady_nazjar.cpp">
-      <Filter>scripts\eastern_kingdoms\throne_of_the_tides</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\throne_of_the_tides\boss_ozumat.cpp">
-      <Filter>scripts\eastern_kingdoms\throne_of_the_tides</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\throne_of_the_tides\instance_throne_of_the_tides.cpp">
-      <Filter>scripts\eastern_kingdoms\throne_of_the_tides</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\uldaman\boss_archaedas.cpp">
-      <Filter>scripts\eastern_kingdoms\uldaman</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\uldaman\uldaman.cpp">
-      <Filter>scripts\eastern_kingdoms\uldaman</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\uldaman\instance_uldaman.cpp">
-      <Filter>scripts\eastern_kingdoms\uldaman</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\boss_akilzon.cpp">
-      <Filter>scripts\eastern_kingdoms\zulaman</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\boss_halazzi.cpp">
-      <Filter>scripts\eastern_kingdoms\zulaman</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\boss_janalai.cpp">
-      <Filter>scripts\eastern_kingdoms\zulaman</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\boss_malacrass.cpp">
-      <Filter>scripts\eastern_kingdoms\zulaman</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\boss_nalorakk.cpp">
-      <Filter>scripts\eastern_kingdoms\zulaman</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\boss_zuljin.cpp">
-      <Filter>scripts\eastern_kingdoms\zulaman</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\instance_zulaman.cpp">
-      <Filter>scripts\eastern_kingdoms\zulaman</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulaman\zulaman.cpp">
-      <Filter>scripts\eastern_kingdoms\zulaman</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_arlokk.cpp">
-      <Filter>scripts\eastern_kingdoms\zulgurub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_hakkar.cpp">
-      <Filter>scripts\eastern_kingdoms\zulgurub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_hazzarah.cpp">
-      <Filter>scripts\eastern_kingdoms\zulgurub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_jeklik.cpp">
-      <Filter>scripts\eastern_kingdoms\zulgurub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_jindo.cpp">
-      <Filter>scripts\eastern_kingdoms\zulgurub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_mandokir.cpp">
-      <Filter>scripts\eastern_kingdoms\zulgurub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_marli.cpp">
-      <Filter>scripts\eastern_kingdoms\zulgurub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_renataki.cpp">
-      <Filter>scripts\eastern_kingdoms\zulgurub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_thekal.cpp">
-      <Filter>scripts\eastern_kingdoms\zulgurub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\boss_venoxis.cpp">
-      <Filter>scripts\eastern_kingdoms\zulgurub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\eastern_kingdoms\zulgurub\instance_zulgurub.cpp">
-      <Filter>scripts\eastern_kingdoms\zulgurub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\examples\example_creature.cpp">
-      <Filter>scripts\examples</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\examples\example_escort.cpp">
-      <Filter>scripts\examples</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\examples\example_gossip_codebox.cpp">
-      <Filter>scripts\examples</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\examples\example_misc.cpp">
-      <Filter>scripts\examples</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\ashenvale.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\azshara.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\azuremyst_isle.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\bloodmyst_isle.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\boss_azuregos.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\darkshore.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\desolace.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\durotar.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\dustwallow_marsh.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\felwood.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\feralas.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\molten_front.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\moonglade.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\mount_hyjal.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\mulgore.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\orgrimmar.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\silithus.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\stonetalon_mountains.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\tanaris.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\teldrassil.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\the_barrens.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\thousand_needles.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\thunder_bluff.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\uldum.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\ungoro_crater.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\winterspring.cpp">
-      <Filter>scripts\kalimdor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\blackfathom_deeps\instance_blackfathom_deeps.cpp">
-      <Filter>scripts\kalimdor\blackfathom_deeps</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\culling_of_stratholme.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\culling_of_stratholme</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\instance_culling_of_stratholme.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\culling_of_stratholme</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dark_portal\boss_aeonus.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dark_portal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dark_portal\boss_chrono_lord_deja.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dark_portal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dark_portal\boss_temporus.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dark_portal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dark_portal\dark_portal.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dark_portal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dark_portal\instance_dark_portal.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dark_portal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_deathwing.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dragon_soul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_hagara.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dragon_soul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_morchok.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dragon_soul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_ultraxion.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dragon_soul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_warlord_zonozz.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dragon_soul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_warmaster_blackhorn.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dragon_soul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\boss_yorsahj.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dragon_soul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\dragon_soul.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dragon_soul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\instance_dragon_soul.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\dragon_soul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\end_of_time\end_of_time.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\end_of_time</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\end_of_time\instance_end_of_time.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\end_of_time</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hour_of_twilight\boss_archbishop_benedictus.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\hour_of_twilight</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hour_of_twilight\boss_arcurion.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\hour_of_twilight</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hour_of_twilight\boss_asira_dawnslayer.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\hour_of_twilight</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hour_of_twilight\instance_hour_of_twilight.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\hour_of_twilight</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hyjal_summit\boss_archimonde.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\hyjal_summit</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hyjal_summit\hyjal.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\hyjal_summit</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hyjal_summit\hyjalAI.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\hyjal_summit</Filter>
-     </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\hyjal_summit\instance_hyjal.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\hyjal_summit</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\instance_old_hillsbrad.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\old_hillsbrad</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\old_hillsbrad</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\well_of_eternity\boss_mannoroth_and_varothen.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\well_of_eternity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\well_of_eternity\boss_perotharn.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\well_of_eternity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\well_of_eternity\boss_queen_azshara.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\well_of_eternity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\caverns_of_time\well_of_eternity\instance_well_of_eternity.cpp">
-      <Filter>scripts\kalimdor\caverns_of_time\well_of_eternity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\dire_maul\dire_maul.cpp">
-      <Filter>scripts\kalimdor\dire_maul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\dire_maul\instance_dire_maul.cpp">
-      <Filter>scripts\kalimdor\dire_maul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_alysrazor.cpp">
-      <Filter>scripts\kalimdor\firelands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_baleroc.cpp">
-      <Filter>scripts\kalimdor\firelands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_bethtilac.cpp">
-      <Filter>scripts\kalimdor\firelands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_lord_rhyolith.cpp">
-      <Filter>scripts\kalimdor\firelands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_majordomo_staghelm.cpp">
-      <Filter>scripts\kalimdor\firelands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_ragnaros_firelands.cpp">
-      <Filter>scripts\kalimdor\firelands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\firelands\boss_shannox.cpp">
-      <Filter>scripts\kalimdor\firelands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\firelands\instance_firelands.cpp">
-      <Filter>scripts\kalimdor\firelands</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\lost_city_of_tolvir\boss_general_husam.cpp">
-      <Filter>scripts\kalimdor\lost_city_of_tolvir</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\lost_city_of_tolvir\boss_lockmaw.cpp">
-      <Filter>scripts\kalimdor\lost_city_of_tolvir</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\lost_city_of_tolvir\boss_prophet_barim.cpp">
-      <Filter>scripts\kalimdor\lost_city_of_tolvir</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\lost_city_of_tolvir\boss_siamat.cpp">
-      <Filter>scripts\kalimdor\lost_city_of_tolvir</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\lost_city_of_tolvir\instance_lost_city_of_tolvir.cpp">
-      <Filter>scripts\kalimdor\lost_city_of_tolvir</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\maraudon\boss_noxxion.cpp">
-      <Filter>scripts\kalimdor\maraudon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\onyxias_lair\boss_onyxia.cpp">
-      <Filter>scripts\kalimdor\onyxias_lair</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\onyxias_lair\instance_onyxias_lair.cpp">
-      <Filter>scripts\kalimdor\onyxias_lair</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\razorfen_downs\razorfen_downs.cpp">
-      <Filter>scripts\kalimdor\razorfen_downs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\razorfen_kraul\instance_razorfen_kraul.cpp">
-      <Filter>scripts\kalimdor\razorfen_kraul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.cpp">
-      <Filter>scripts\kalimdor\razorfen_kraul</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_ayamiss.cpp">
-      <Filter>scripts\kalimdor\ruins_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_buru.cpp">
-      <Filter>scripts\kalimdor\ruins_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_kurinnaxx.cpp">
-      <Filter>scripts\kalimdor\ruins_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_moam.cpp">
-      <Filter>scripts\kalimdor\ruins_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_ossirian.cpp">
-      <Filter>scripts\kalimdor\ruins_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_rajaxx.cpp">
-      <Filter>scripts\kalimdor\ruins_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\instance_ruins_of_ahnqiraj.cpp">
-      <Filter>scripts\kalimdor\ruins_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\ruins_of_ahnqiraj.cpp">
-      <Filter>scripts\kalimdor\ruins_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_bug_trio.cpp">
-      <Filter>scripts\kalimdor\temple_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_cthun.cpp">
-      <Filter>scripts\kalimdor\temple_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_fankriss.cpp">
-      <Filter>scripts\kalimdor\temple_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_huhuran.cpp">
-      <Filter>scripts\kalimdor\temple_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_ouro.cpp">
-      <Filter>scripts\kalimdor\temple_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_sartura.cpp">
-      <Filter>scripts\kalimdor\temple_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_skeram.cpp">
-      <Filter>scripts\kalimdor\temple_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_twinemperors.cpp">
-      <Filter>scripts\kalimdor\temple_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\boss_viscidus.cpp">
-      <Filter>scripts\kalimdor\temple_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\instance_temple_of_ahnqiraj.cpp">
-      <Filter>scripts\kalimdor\temple_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\temple_of_ahnqiraj\mob_anubisath_sentinel.cpp">
-      <Filter>scripts\kalimdor\temple_of_ahnqiraj</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\throne_of_the_four_winds\boss_alakir.cpp">
-      <Filter>scripts\kalimdor\throne_of_the_four_winds</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\throne_of_the_four_winds\conclave_of_the_wind.cpp">
-      <Filter>scripts\kalimdor\throne_of_the_four_winds</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\throne_of_the_four_winds\instance_throne_of_the_four_winds.cpp">
-      <Filter>scripts\kalimdor\throne_of_the_four_winds</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\vortex_pinnacle\boss_altairus.cpp">
-      <Filter>scripts\kalimdor\vortex_pinnacle</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\vortex_pinnacle\boss_asaad.cpp">
-      <Filter>scripts\kalimdor\vortex_pinnacle</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\vortex_pinnacle\boss_grand_vizier_ertan.cpp">
-      <Filter>scripts\kalimdor\vortex_pinnacle</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\vortex_pinnacle\instance_vortex_pinnacle.cpp">
-      <Filter>scripts\kalimdor\vortex_pinnacle</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\wailing_caverns\instance_wailing_caverns.cpp">
-      <Filter>scripts\kalimdor\wailing_caverns</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\wailing_caverns\wailing_caverns.cpp">
-      <Filter>scripts\kalimdor\wailing_caverns</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\zulfarrak\boss_zumrah.cpp">
-      <Filter>scripts\kalimdor\zulfarrak</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\zulfarrak\instance_zulfarrak.cpp">
-      <Filter>scripts\kalimdor\zulfarrak</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\kalimdor\zulfarrak\zulfarrak.cpp">
-      <Filter>scripts\kalimdor\zulfarrak</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\maelstrom\deepholm.cpp">
-      <Filter>scripts\maelstrom</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\maelstrom\kezan.cpp">
-      <Filter>scripts\maelstrom</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\maelstrom\lost_isles.cpp">
-      <Filter>scripts\maelstrom</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\maelstrom\stonecore\boss_corborus.cpp">
-      <Filter>scripts\maelstrom\stonecore</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\maelstrom\stonecore\boss_ozruk.cpp">
-      <Filter>scripts\maelstrom\stonecore</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\maelstrom\stonecore\boss_priestess_azil.cpp">
-      <Filter>scripts\maelstrom\stonecore</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\maelstrom\stonecore\boss_slabhide.cpp">
-      <Filter>scripts\maelstrom\stonecore</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\maelstrom\stonecore\instance_stonecore.cpp">
-      <Filter>scripts\maelstrom\stonecore</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\borean_tundra.cpp">
-      <Filter>scripts\northrend</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\dalaran.cpp">
-      <Filter>scripts\northrend</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\dragonblight.cpp">
-      <Filter>scripts\northrend</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\grizzly_hills.cpp">
-      <Filter>scripts\northrend</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\howling_fjord.cpp">
-      <Filter>scripts\northrend</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown.cpp">
-      <Filter>scripts\northrend</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\sholazar_basin.cpp">
-      <Filter>scripts\northrend</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\storm_peaks.cpp">
-      <Filter>scripts\northrend</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\zuldrak.cpp">
-      <Filter>scripts\northrend</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\ahnkahet\boss_amanitar.cpp">
-      <Filter>scripts\northrend\azjol-nerub\ahnkahet</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\ahnkahet\boss_jedoga.cpp">
-      <Filter>scripts\northrend\azjol-nerub\ahnkahet</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\ahnkahet\boss_nadox.cpp">
-      <Filter>scripts\northrend\azjol-nerub\ahnkahet</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\ahnkahet\boss_taldaram.cpp">
-      <Filter>scripts\northrend\azjol-nerub\ahnkahet</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\ahnkahet\boss_volazj.cpp">
-      <Filter>scripts\northrend\azjol-nerub\ahnkahet</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\ahnkahet\instance_ahnkahet.cpp">
-      <Filter>scripts\northrend\azjol-nerub\ahnkahet</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\azjol-nerub\boss_anubarak.cpp">
-      <Filter>scripts\northrend\azjol-nerub\azjol-nerub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\azjol-nerub\boss_hadronox.cpp">
-      <Filter>scripts\northrend\azjol-nerub\azjol-nerub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\azjol-nerub\boss_krikthir.cpp">
-      <Filter>scripts\northrend\azjol-nerub\azjol-nerub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\azjol-nerub\azjol-nerub\instance_azjol-nerub.cpp">
-      <Filter>scripts\northrend\azjol-nerub\azjol-nerub</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_champion\boss_grand_champions.cpp">
-      <Filter>scripts\northrend\crusaders_coliseum\trial_of_the_champion</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_champion\instance_trial_of_the_champion.cpp">
-      <Filter>scripts\northrend\crusaders_coliseum\trial_of_the_champion</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_champion\trial_of_the_champion.cpp">
-      <Filter>scripts\northrend\crusaders_coliseum\trial_of_the_champion</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\boss_anubarak_trial.cpp">
-      <Filter>scripts\northrend\crusaders_coliseum\trial_of_the_crusader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\boss_faction_champions.cpp">
-      <Filter>scripts\northrend\crusaders_coliseum\trial_of_the_crusader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\boss_jaraxxus.cpp">
-      <Filter>scripts\northrend\crusaders_coliseum\trial_of_the_crusader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\boss_northrend_beasts.cpp">
-      <Filter>scripts\northrend\crusaders_coliseum\trial_of_the_crusader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\boss_twin_valkyr.cpp">
-      <Filter>scripts\northrend\crusaders_coliseum\trial_of_the_crusader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\instance_trial_of_the_crusader.cpp">
-      <Filter>scripts\northrend\crusaders_coliseum\trial_of_the_crusader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\trial_of_the_crusader.cpp">
-      <Filter>scripts\northrend\crusaders_coliseum\trial_of_the_crusader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\draktharon_keep\boss_novos.cpp">
-      <Filter>scripts\northrend\draktharon_keep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\draktharon_keep\boss_tharonja.cpp">
-      <Filter>scripts\northrend\draktharon_keep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\draktharon_keep\boss_trollgore.cpp">
-      <Filter>scripts\northrend\draktharon_keep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\draktharon_keep\instance_draktharon_keep.cpp">
-      <Filter>scripts\northrend\draktharon_keep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\gundrak\boss_colossus.cpp">
-      <Filter>scripts\northrend\gundrak</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\gundrak\boss_eck.cpp">
-      <Filter>scripts\northrend\gundrak</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\gundrak\boss_galdarah.cpp">
-      <Filter>scripts\northrend\gundrak</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\gundrak\boss_moorabi.cpp">
-      <Filter>scripts\northrend\gundrak</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\gundrak\boss_sladran.cpp">
-      <Filter>scripts\northrend\gundrak</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\gundrak\instance_gundrak.cpp">
-      <Filter>scripts\northrend\gundrak</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\blood_prince_council.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_blood_queen_lanathel.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_deathbringer_saurfang.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_festergut.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_lady_deathwhisper.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_lord_marrowgar.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_professor_putricide.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_rotface.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_sindragosa.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_the_lich_king.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\boss_valithria_dreamwalker.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\gunship_battle.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\instance_icecrown_citadel.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron\boss_forgemaster_garfrost.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron\boss_krick_and_ick.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron\boss_scourgelord_tyrannus.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron\instance_pit_of_saron.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron\pit_of_saron.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\boss_falric.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\boss_lich_king.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\boss_marwyn.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\halls_of_reflection.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\instance_halls_of_reflection.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls\boss_bronjahm.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls\boss_devourer_of_souls.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls\instance_forge_of_souls.cpp">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_anubrekhan.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_faerlina.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_four_horsemen.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_gluth.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_gothik.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_grobbulus.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_heigan.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_kelthuzad.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_loatheb.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_maexxna.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_noth.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_patchwerk.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_razuvious.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_sapphiron.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\boss_thaddius.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\naxxramas\instance_naxxramas.cpp">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\nexus\eye_of_eternity\boss_malygos.cpp">
-      <Filter>scripts\northrend\nexus\eye_of_eternity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\nexus\eye_of_eternity\instance_eye_of_eternity.cpp">
-      <Filter>scripts\northrend\nexus\eye_of_eternity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\nexus\nexus\boss_anomalus.cpp">
-      <Filter>scripts\northrend\nexus\nexus</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\nexus\nexus\boss_keristrasza.cpp">
-      <Filter>scripts\northrend\nexus\nexus</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\nexus\nexus\boss_ormorok.cpp">
-      <Filter>scripts\northrend\nexus\nexus</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\nexus\nexus\boss_telestra.cpp">
-      <Filter>scripts\northrend\nexus\nexus</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\nexus\nexus\instance_nexus.cpp">
-      <Filter>scripts\northrend\nexus\nexus</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_eregos.cpp">
-      <Filter>scripts\northrend\nexus\oculus</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_urom.cpp">
-      <Filter>scripts\northrend\nexus\oculus</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\nexus\oculus\boss_varos.cpp">
-      <Filter>scripts\northrend\nexus\oculus</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\nexus\oculus\instance_oculus.cpp">
-      <Filter>scripts\northrend\nexus\oculus</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\nexus\oculus\oculus.cpp">
-      <Filter>scripts\northrend\nexus\oculus</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\obsidian_sanctum\boss_sartharion.cpp">
-      <Filter>scripts\northrend\obsidian_sanctum</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\obsidian_sanctum\instance_obsidian_sanctum.cpp">
-      <Filter>scripts\northrend\obsidian_sanctum</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ruby_sanctum\boss_baltharus.cpp">
-      <Filter>scripts\northrend\ruby_sanctum</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ruby_sanctum\boss_halion.cpp">
-      <Filter>scripts\northrend\ruby_sanctum</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ruby_sanctum\boss_saviana.cpp">
-      <Filter>scripts\northrend\ruby_sanctum</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ruby_sanctum\boss_zarithrian.cpp">
-      <Filter>scripts\northrend\ruby_sanctum</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ruby_sanctum\instance_ruby_sanctum.cpp">
-      <Filter>scripts\northrend\ruby_sanctum</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_lightning\boss_bjarngrim.cpp">
-      <Filter>scripts\northrend\ulduar\halls_of_lightning</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_lightning\boss_ionar.cpp">
-      <Filter>scripts\northrend\ulduar\halls_of_lightning</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_lightning\boss_loken.cpp">
-      <Filter>scripts\northrend\ulduar\halls_of_lightning</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_lightning\boss_volkhan.cpp">
-      <Filter>scripts\northrend\ulduar\halls_of_lightning</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_lightning\instance_halls_of_lightning.cpp">
-      <Filter>scripts\northrend\ulduar\halls_of_lightning</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_stone\boss_maiden_of_grief.cpp">
-      <Filter>scripts\northrend\ulduar\halls_of_stone</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_stone\boss_sjonnir.cpp">
-      <Filter>scripts\northrend\ulduar\halls_of_stone</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_stone\halls_of_stone.cpp">
-      <Filter>scripts\northrend\ulduar\halls_of_stone</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\halls_of_stone\instance_halls_of_stone.cpp">
-      <Filter>scripts\northrend\ulduar\halls_of_stone</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\assembly_of_iron.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_algalon.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_auriaya.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_flame_leviathan.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_freya.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_general_vezax.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_hodir.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_ignis.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_kologarn.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_mimiron.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_razorscale.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_thorim.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_xt_002.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\boss_yogg_saron.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\instance_ulduar.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\ulduar\ulduar\ulduar.cpp">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_ingvar.cpp">
-      <Filter>scripts\northrend\utgarde_keep\utgarde_keep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_keleseth.cpp">
-      <Filter>scripts\northrend\utgarde_keep\utgarde_keep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_skarvald_and_dalronn.cpp">
-      <Filter>scripts\northrend\utgarde_keep\utgarde_keep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_keep\instance_utgarde_keep.cpp">
-      <Filter>scripts\northrend\utgarde_keep\utgarde_keep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_keep\utgarde_keep.cpp">
-      <Filter>scripts\northrend\utgarde_keep\utgarde_keep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_gortok.cpp">
-      <Filter>scripts\northrend\utgarde_keep\utgarde_pinnacle</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_skadi.cpp">
-      <Filter>scripts\northrend\utgarde_keep\utgarde_pinnacle</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_svala.cpp">
-      <Filter>scripts\northrend\utgarde_keep\utgarde_pinnacle</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_ymiron.cpp">
-      <Filter>scripts\northrend\utgarde_keep\utgarde_pinnacle</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\instance_utgarde_pinnacle.cpp">
-      <Filter>scripts\northrend\utgarde_keep\utgarde_pinnacle</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\vault_of_archavon\boss_archavon.cpp">
-      <Filter>scripts\northrend\vault_of_archavon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\vault_of_archavon\boss_emalon.cpp">
-      <Filter>scripts\northrend\vault_of_archavon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\vault_of_archavon\boss_koralon.cpp">
-      <Filter>scripts\northrend\vault_of_archavon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\vault_of_archavon\boss_toravon.cpp">
-      <Filter>scripts\northrend\vault_of_archavon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\vault_of_archavon\instance_vault_of_archavon.cpp">
-      <Filter>scripts\northrend\vault_of_archavon</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\violet_hold\boss_erekem.cpp">
-      <Filter>scripts\northrend\violet_hold</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\violet_hold\boss_ichoron.cpp">
-      <Filter>scripts\northrend\violet_hold</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\violet_hold\instance_violet_hold.cpp">
-      <Filter>scripts\northrend\violet_hold</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\northrend\violet_hold\violet_hold.cpp">
-      <Filter>scripts\northrend\violet_hold</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\blades_edge_mountains.cpp">
-      <Filter>scripts\outland</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\boss_doomlord_kazzak.cpp">
-      <Filter>scripts\outland</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\boss_doomwalker.cpp">
-      <Filter>scripts\outland</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_peninsula.cpp">
-      <Filter>scripts\outland</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\nagrand.cpp">
-      <Filter>scripts\outland</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\netherstorm.cpp">
-      <Filter>scripts\outland</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\shadowmoon_valley.cpp">
-      <Filter>scripts\outland</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\shattrath_city.cpp">
-      <Filter>scripts\outland</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\terokkar_forest.cpp">
-      <Filter>scripts\outland</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\zangarmarsh.cpp">
-      <Filter>scripts\outland</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\auchenai_crypts\boss_exarch_maladaar.cpp">
-      <Filter>scripts\outland\auchindoun\auchenai_crypts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\auchenai_crypts\boss_shirrak.cpp">
-      <Filter>scripts\outland\auchindoun\auchenai_crypts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\mana_tombs\boss_nexusprince_shaffar.cpp">
-      <Filter>scripts\outland\auchindoun\mana_tombs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\mana_tombs\boss_pandemonius.cpp">
-      <Filter>scripts\outland\auchindoun\mana_tombs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\sethekk_halls\boss_anzu.cpp">
-      <Filter>scripts\outland\auchindoun\sethekk_halls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\sethekk_halls\boss_darkweaver_syth.cpp">
-      <Filter>scripts\outland\auchindoun\sethekk_halls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\sethekk_halls\boss_talon_king_ikiss.cpp">
-      <Filter>scripts\outland\auchindoun\sethekk_halls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\sethekk_halls\instance_sethekk_halls.cpp">
-      <Filter>scripts\outland\auchindoun\sethekk_halls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\shadow_labyrinth\boss_ambassador_hellmaw.cpp">
-      <Filter>scripts\outland\auchindoun\shadow_labyrinth</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\shadow_labyrinth\boss_blackheart_the_inciter.cpp">
-      <Filter>scripts\outland\auchindoun\shadow_labyrinth</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\shadow_labyrinth\boss_grandmaster_vorpil.cpp">
-      <Filter>scripts\outland\auchindoun\shadow_labyrinth</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\shadow_labyrinth\boss_murmur.cpp">
-      <Filter>scripts\outland\auchindoun\shadow_labyrinth</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\auchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp">
-      <Filter>scripts\outland\auchindoun\shadow_labyrinth</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\black_temple\black_temple.cpp">
-      <Filter>scripts\outland\black_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\black_temple\boss_bloodboil.cpp">
-      <Filter>scripts\outland\black_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\black_temple\boss_illidan.cpp">
-      <Filter>scripts\outland\black_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\black_temple\boss_mother_shahraz.cpp">
-      <Filter>scripts\outland\black_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\black_temple\boss_reliquary_of_souls.cpp">
-      <Filter>scripts\outland\black_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\black_temple\boss_shade_of_akama.cpp">
-      <Filter>scripts\outland\black_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\black_temple\boss_supremus.cpp">
-      <Filter>scripts\outland\black_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\black_temple\boss_teron_gorefiend.cpp">
-      <Filter>scripts\outland\black_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\black_temple\boss_warlord_najentus.cpp">
-      <Filter>scripts\outland\black_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\black_temple\illidari_council.cpp">
-      <Filter>scripts\outland\black_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\black_temple\instance_black_temple.cpp">
-      <Filter>scripts\outland\black_temple</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\boss_fathomlord_karathress.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\serpent_shrine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\boss_hydross_the_unstable.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\serpent_shrine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\boss_lady_vashj.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\serpent_shrine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\boss_leotheras_the_blind.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\serpent_shrine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\boss_morogrim_tidewalker.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\serpent_shrine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\boss_the_lurker_below.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\serpent_shrine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\instance_serpent_shrine.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\serpent_shrine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\slave_pens\boss_ahune.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\slave_pens</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\steam_vault\boss_hydromancer_thespia.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\steam_vault</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\steam_vault\boss_mekgineer_steamrigger.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\steam_vault</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\steam_vault\boss_warlord_kalithresh.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\steam_vault</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\steam_vault\instance_steam_vault.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\steam_vault</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\coilfang_reservoir\underbog\boss_hungarfen.cpp">
-      <Filter>scripts\outland\coilfang_reservoir\underbog</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\gruuls_lair\boss_gruul.cpp">
-      <Filter>scripts\outland\gruuls_lair</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\gruuls_lair\boss_high_king_maulgar.cpp">
-      <Filter>scripts\outland\gruuls_lair</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\gruuls_lair\instance_gruuls_lair.cpp">
-      <Filter>scripts\outland\gruuls_lair</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\blood_furnace\boss_broggok.cpp">
-      <Filter>scripts\outland\hellfire_citadel\blood_furnace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\blood_furnace\boss_kelidan_the_breaker.cpp">
-      <Filter>scripts\outland\hellfire_citadel\blood_furnace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\blood_furnace\boss_the_maker.cpp">
-      <Filter>scripts\outland\hellfire_citadel\blood_furnace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\blood_furnace\instance_blood_furnace.cpp">
-      <Filter>scripts\outland\hellfire_citadel\blood_furnace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\hellfire_ramparts\boss_nazan_and_vazruden.cpp">
-      <Filter>scripts\outland\hellfire_citadel\hellfire_ramparts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\hellfire_ramparts\boss_omor_the_unscarred.cpp">
-      <Filter>scripts\outland\hellfire_citadel\hellfire_ramparts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\hellfire_ramparts\boss_watchkeeper_gargolmar.cpp">
-      <Filter>scripts\outland\hellfire_citadel\hellfire_ramparts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\hellfire_ramparts\instance_hellfire_ramparts.cpp">
-      <Filter>scripts\outland\hellfire_citadel\hellfire_ramparts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\magtheridons_lair\boss_magtheridon.cpp">
-      <Filter>scripts\outland\hellfire_citadel\magtheridons_lair</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\magtheridons_lair\instance_magtheridons_lair.cpp">
-      <Filter>scripts\outland\hellfire_citadel\magtheridons_lair</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\shattered_halls\boss_nethekurse.cpp">
-      <Filter>scripts\outland\hellfire_citadel\shattered_halls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\shattered_halls\boss_warbringer_omrogg.cpp">
-      <Filter>scripts\outland\hellfire_citadel\shattered_halls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\shattered_halls\boss_warchief_kargath_bladefist.cpp">
-      <Filter>scripts\outland\hellfire_citadel\shattered_halls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\hellfire_citadel\shattered_halls\instance_shattered_halls.cpp">
-      <Filter>scripts\outland\hellfire_citadel\shattered_halls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\arcatraz\arcatraz.cpp">
-      <Filter>scripts\outland\tempest_keep\arcatraz</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\arcatraz\boss_dalliah.cpp">
-      <Filter>scripts\outland\tempest_keep\arcatraz</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\arcatraz\boss_harbinger_skyriss.cpp">
-      <Filter>scripts\outland\tempest_keep\arcatraz</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\arcatraz\boss_soccothrates.cpp">
-      <Filter>scripts\outland\tempest_keep\arcatraz</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\arcatraz\instance_arcatraz.cpp">
-      <Filter>scripts\outland\tempest_keep\arcatraz</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\botanica\boss_high_botanist_freywinn.cpp">
-      <Filter>scripts\outland\tempest_keep\botanica</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\botanica\boss_laj.cpp">
-      <Filter>scripts\outland\tempest_keep\botanica</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\botanica\boss_warp_splinter.cpp">
-      <Filter>scripts\outland\tempest_keep\botanica</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_alar.cpp">
-      <Filter>scripts\outland\tempest_keep\the_eye</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_astromancer.cpp">
-      <Filter>scripts\outland\tempest_keep\the_eye</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_kaelthas.cpp">
-      <Filter>scripts\outland\tempest_keep\the_eye</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_void_reaver.cpp">
-      <Filter>scripts\outland\tempest_keep\the_eye</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\instance_the_eye.cpp">
-      <Filter>scripts\outland\tempest_keep\the_eye</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_mechanar\boss_nethermancer_sepethrea.cpp">
-      <Filter>scripts\outland\tempest_keep\the_mechanar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_mechanar\boss_pathaleon_the_calculator.cpp">
-      <Filter>scripts\outland\tempest_keep\the_mechanar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_mechanar\instance_mechanar.cpp">
-      <Filter>scripts\outland\tempest_keep\the_mechanar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\world\areatrigger_scripts.cpp">
-      <Filter>scripts\world</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\world\bosses_emerald_dragons.cpp">
-      <Filter>scripts\world</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\world\go_scripts.cpp">
-      <Filter>scripts\world</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\world\guards.cpp">
-      <Filter>scripts\world</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\world\item_scripts.cpp">
-      <Filter>scripts\world</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\world\mob_generic_creature.cpp">
-      <Filter>scripts\world</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\world\npc_professions.cpp">
-      <Filter>scripts\world</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\world\npcs_special.cpp">
-      <Filter>scripts\world</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\world\spell_scripts.cpp">
-      <Filter>scripts\world</Filter>
-    </ClCompile>
-    <ClCompile Include="..\scripts\world\world_map_scripts.cpp">
-      <Filter>scripts\world</Filter>
-    </ClCompile>
-    <ClCompile Include="..\include\precompiled.cpp">
-      <Filter>include</Filter>
-    </ClCompile>
-    <ClCompile Include="..\include\sc_creature.cpp">
-      <Filter>include</Filter>
-    </ClCompile>
-    <ClCompile Include="..\include\sc_grid_searchers.cpp">
-      <Filter>include</Filter>
-    </ClCompile>
-    <ClCompile Include="..\include\sc_instance.cpp">
-      <Filter>include</Filter>
-    </ClCompile>
-    <ClCompile Include="..\system\MangosdRev.cpp">
-      <Filter>system</Filter>
-    </ClCompile>
-    <ClCompile Include="..\system\ScriptLoader.cpp">
-      <Filter>system</Filter>
-    </ClCompile>
-    <ClCompile Include="..\system\system.cpp">
-      <Filter>system</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ScriptMgr.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\base\escort_ai.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\follower_ai.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\guard_ai.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\base\pet_ai.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\bastion_of_twilight\bastion_of_twilight.h">
-      <Filter>scripts\eastern_kingdoms\bastion_of_twilight</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns\blackrock_caverns.h">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_caverns</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\blackrock_depths.h">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\blackrock_spire.h">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent\blackwing_descent.h">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_descent</Filter>
-     </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\blackwing_lair.h">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair</Filter>
-     </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\blackrock_mountain\molten_core\molten_core.h">
-      <Filter>scripts\eastern_kingdoms\blackrock_mountain\molten_core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\deadmines\deadmines.h">
-      <Filter>scripts\eastern_kingdoms\deadmines</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\gnomeregan\gnomeregan.h">
-      <Filter>scripts\eastern_kingdoms\gnomeregan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\grim_batol\grim_batol.h">
-      <Filter>scripts\eastern_kingdoms\grim_batol</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\karazhan\karazhan.h">
-      <Filter>scripts\eastern_kingdoms\karazhan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\magisters_terrace\magisters_terrace.h">
-      <Filter>scripts\eastern_kingdoms\magisters_terrace</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\scarlet_enclave\world_map_ebon_hold.h">
-      <Filter>scripts\eastern_kingdoms\scarlet_enclave</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\scarlet_monastery\scarlet_monastery.h">
-      <Filter>scripts\eastern_kingdoms\scarlet_monastery</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\scholomance\scholomance.h">
-      <Filter>scripts\eastern_kingdoms\scholomance</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.h">
-      <Filter>scripts\eastern_kingdoms\shadowfang_keep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\stratholme\stratholme.h">
-      <Filter>scripts\eastern_kingdoms\stratholme</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\sunken_temple\sunken_temple.h">
-      <Filter>scripts\eastern_kingdoms\sunken_temple</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\sunwell_plateau\sunwell_plateau.h">
-      <Filter>scripts\eastern_kingdoms\sunwell_plateau</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\throne_of_the_tides\throne_of_the_tides.h">
-      <Filter>scripts\eastern_kingdoms\throne_of_the_tides</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\uldaman\uldaman.h">
-      <Filter>scripts\eastern_kingdoms\uldaman</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\zulaman\zulaman.h">
-      <Filter>scripts\eastern_kingdoms\zulaman</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\eastern_kingdoms\zulgurub\zulgurub.h">
-      <Filter>scripts\eastern_kingdoms\zulgurub</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\blackfathom_deeps\blackfathom_deeps.h">
-      <Filter>scripts\kalimdor\blackfathom_deeps</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\culling_of_stratholme.h">
-      <Filter>scripts\kalimdor\caverns_of_time\culling_of_stratholme</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\dark_portal\dark_portal.h">
-      <Filter>scripts\kalimdor\caverns_of_time\dark_portal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\dragon_soul\dragon_soul.h">
-      <Filter>scripts\kalimdor\caverns_of_time\dragon_soul</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\end_of_time\end_of_time.h">
-      <Filter>scripts\kalimdor\caverns_of_time\end_of_time</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\hour_of_twilight\hour_of_twilight.h">
-      <Filter>scripts\kalimdor\caverns_of_time\hour_of_twilight</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\hyjal_summit\hyjal.h">
-      <Filter>scripts\kalimdor\caverns_of_time\hyjal_summit</Filter>
-     </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\hyjal_summit\hyjalAI.h">
-      <Filter>scripts\kalimdor\caverns_of_time\hyjal_summit</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.h">
-      <Filter>scripts\kalimdor\caverns_of_time\old_hillsbrad</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\caverns_of_time\well_of_eternity\well_of_eternity.h">
-      <Filter>scripts\kalimdor\caverns_of_time\well_of_eternity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\dire_maul\dire_maul.h">
-      <Filter>scripts\kalimdor\dire_maul</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\firelands\firelands.h">
-      <Filter>scripts\kalimdor\firelands</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\lost_city_of_tolvir\lost_city_of_tolvir.h">
-      <Filter>scripts\kalimdor\lost_city_of_tolvir</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\onyxias_lair\onyxias_lair.h">
-      <Filter>scripts\kalimdor\onyxias_lair</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.h">
-      <Filter>scripts\kalimdor\razorfen_kraul</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\ruins_of_ahnqiraj\ruins_of_ahnqiraj.h">
-      <Filter>scripts\kalimdor\ruins_of_ahnqiraj</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\temple_of_ahnqiraj\temple_of_ahnqiraj.h">
-      <Filter>scripts\kalimdor\temple_of_ahnqiraj</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\throne_of_the_four_winds\throne_of_the_four_winds.h">
-      <Filter>scripts\kalimdor\throne_of_the_four_winds</Filter>
-    </ClInclude>
-     <ClInclude Include="..\scripts\kalimdor\vortex_pinnacle\vortex_pinnacle.h">
-      <Filter>scripts\kalimdor\vortex_pinnacle</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\wailing_caverns\wailing_caverns.h">
-      <Filter>scripts\kalimdor\wailing_caverns</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\kalimdor\zulfarrak\zulfarrak.h">
-      <Filter>scripts\kalimdor\zulfarrak</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\maelstrom\stonecore\stonecore.h">
-      <Filter>scripts\maelstrom\stonecore</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\azjol-nerub\ahnkahet\ahnkahet.h">
-      <Filter>scripts\northrend\azjol-nerub\ahnkahet</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\azjol-nerub\azjol-nerub\azjol-nerub.h">
-      <Filter>scripts\northrend\azjol-nerub\azjol-nerub</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_champion\trial_of_the_champion.h">
-      <Filter>scripts\northrend\crusaders_coliseum\trial_of_the_champion</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\crusaders_coliseum\trial_of_the_crusader\trial_of_the_crusader.h">
-      <Filter>scripts\northrend\crusaders_coliseum\trial_of_the_crusader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\draktharon_keep\draktharon_keep.h">
-      <Filter>scripts\northrend\draktharon_keep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\gundrak\gundrak.h">
-      <Filter>scripts\northrend\gundrak</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls\forge_of_souls.h">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\forge_of_souls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\halls_of_reflection.h">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron\pit_of_saron.h">
-      <Filter>scripts\northrend\icecrown_citadel\frozen_halls\pit_of_saron</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\icecrown_citadel\icecrown_citadel\icecrown_citadel.h">
-      <Filter>scripts\northrend\icecrown_citadel\icecrown_citadel</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\naxxramas\naxxramas.h">
-      <Filter>scripts\northrend\naxxramas</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\nexus\eye_of_eternity\eye_of_eternity.h">
-      <Filter>scripts\northrend\nexus\eye_of_eternity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\nexus\nexus\nexus.h">
-      <Filter>scripts\northrend\nexus\nexus</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\nexus\oculus\oculus.h">
-      <Filter>scripts\northrend\nexus\oculus</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\obsidian_sanctum\obsidian_sanctum.h">
-      <Filter>scripts\northrend\obsidian_sanctum</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\ruby_sanctum\ruby_sanctum.h">
-      <Filter>scripts\northrend\ruby_sanctum</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\ulduar\halls_of_lightning\halls_of_lightning.h">
-      <Filter>scripts\northrend\ulduar\halls_of_lightning</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\ulduar\halls_of_stone\halls_of_stone.h">
-      <Filter>scripts\northrend\ulduar\halls_of_stone</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\ulduar\ulduar\ulduar.h">
-      <Filter>scripts\northrend\ulduar\ulduar</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\utgarde_keep\utgarde_keep\utgarde_keep.h">
-      <Filter>scripts\northrend\utgarde_keep\utgarde_keep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\utgarde_pinnacle.h">
-      <Filter>scripts\northrend\utgarde_keep\utgarde_pinnacle</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\vault_of_archavon\vault_of_archavon.h">
-      <Filter>scripts\northrend\vault_of_archavon</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\northrend\violet_hold\violet_hold.h">
-      <Filter>scripts\northrend\violet_hold</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\auchindoun\sethekk_halls\sethekk_halls.h">
-      <Filter>scripts\outland\auchindoun\sethekk_halls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\auchindoun\shadow_labyrinth\shadow_labyrinth.h">
-      <Filter>scripts\outland\auchindoun\shadow_labyrinth</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\black_temple\black_temple.h">
-      <Filter>scripts\outland\black_temple</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\coilfang_reservoir\serpent_shrine\serpent_shrine.h">
-      <Filter>scripts\outland\coilfang_reservoir\serpent_shrine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\coilfang_reservoir\steam_vault\steam_vault.h">
-      <Filter>scripts\outland\coilfang_reservoir\steam_vault</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\gruuls_lair\gruuls_lair.h">
-      <Filter>scripts\outland\gruuls_lair</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\hellfire_citadel\blood_furnace\blood_furnace.h">
-      <Filter>scripts\outland\hellfire_citadel\blood_furnace</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\hellfire_citadel\hellfire_ramparts\hellfire_ramparts.h">
-      <Filter>scripts\outland\hellfire_citadel\hellfire_ramparts</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\hellfire_citadel\magtheridons_lair\magtheridons_lair.h">
-      <Filter>scripts\outland\hellfire_citadel\magtheridons_lair</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\hellfire_citadel\shattered_halls\shattered_halls.h">
-      <Filter>scripts\outland\hellfire_citadel\shattered_halls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\tempest_keep\arcatraz\arcatraz.h">
-      <Filter>scripts\outland\tempest_keep\arcatraz</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\tempest_keep\the_eye\the_eye.h">
-      <Filter>scripts\outland\tempest_keep\the_eye</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\outland\tempest_keep\the_mechanar\mechanar.h">
-      <Filter>scripts\outland\tempest_keep\the_mechanar</Filter>
-    </ClInclude>
-    <ClInclude Include="..\scripts\world\world_map_scripts.h">
-      <Filter>scripts\world</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\precompiled.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\sc_creature.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\sc_gossip.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\sc_grid_searchers.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\sc_instance.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\system\ScriptLoader.h">
-      <Filter>system</Filter>
-    </ClInclude>
-    <ClInclude Include="..\system\system.h">
-      <Filter>system</Filter>
-    </ClInclude>
-    <ClInclude Include="..\config.h" />
-    <ClInclude Include="..\sd2_revision_nr.h" />
-    <ClInclude Include="..\sd2_revision_sql.h" />
-    <ClInclude Include="..\ScriptMgr.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\revision.h" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/modules/SD2/CMakeLists.txt b/src/modules/SD2/CMakeLists.txt
index 55b8e1fa5..b7a6f5faf 100644
--- a/src/modules/SD2/CMakeLists.txt
+++ b/src/modules/SD2/CMakeLists.txt
@@ -1,5 +1,8 @@
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
 #
-# Copyright (C) 2005-2015 MaNGOS <http://getmangos.eu/>
+# Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+# Copyright (C) 2006-2013  ScriptDev2 project <http://www.scriptdev2.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,503 +17,485 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# ***** END GPL LICENSE BLOCK *****
-#
-# World of Warcraft, and all World of Warcraft or Warcraft art, images,
-# and lore are copyrighted by Blizzard Entertainment, Inc.
 
 include(MacroMangosSourceGroup)
 
-set(mangosscript_PCH_H "${CMAKE_CURRENT_SOURCE_DIR}/include/precompiled.h")
+#Add PCH Files
+set(mangosscript_PCH "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h")
 if(PCH)
-  set(mangosscript_PCH_CPP "${CMAKE_CURRENT_SOURCE_DIR}/include/precompiled.cpp")
+    LIST(APPEND mangosscript_PCH "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.cpp")
 endif()
 
 include_directories(
-  "${CMAKE_CURRENT_SOURCE_DIR}/base"
-  "${CMAKE_CURRENT_SOURCE_DIR}/include"
-  "${CMAKE_SOURCE_DIR}/src/shared"
-  "${CMAKE_SOURCE_DIR}/src/framework"
-  "${CMAKE_SOURCE_DIR}/src/game/Server"
-  "${CMAKE_SOURCE_DIR}/src/game/BattleGround"
-  "${CMAKE_SOURCE_DIR}/src/game/WorldHandlers"
-  "${CMAKE_SOURCE_DIR}/src/game/Object"
-  "${CMAKE_SOURCE_DIR}/src/game/References"
-  "${CMAKE_SOURCE_DIR}/src/game/MotionGenerators"
-  "${CMAKE_SOURCE_DIR}/src/game/vmap"
-  "${CMAKE_SOURCE_DIR}/dep/include"
-  "${CMAKE_BINARY_DIR}"
-  "${CMAKE_BINARY_DIR}/src/shared"
-  "${ACE_INCLUDE_DIR}"
-  "${MYSQL_INCLUDE_DIR}"
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/base
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_SOURCE_DIR}/src/shared
+    ${CMAKE_SOURCE_DIR}/src/framework
+    ${CMAKE_SOURCE_DIR}/src/game/Server
+    ${CMAKE_SOURCE_DIR}/src/game/BattleGround
+    ${CMAKE_SOURCE_DIR}/src/game/WorldHandlers
+    ${CMAKE_SOURCE_DIR}/src/game/Object
+    ${CMAKE_SOURCE_DIR}/src/game/References
+    ${CMAKE_SOURCE_DIR}/src/game/MotionGenerators
+    ${CMAKE_SOURCE_DIR}/src/game/vmap
+    ${CMAKE_SOURCE_DIR}/src/shared
+    ${CMAKE_SOURCE_DIR}/src/shared/Utilities
+    ${CMAKE_SOURCE_DIR}/src/shared/Log
+    ${CMAKE_SOURCE_DIR}/src/shared/DataStores
+    ${CMAKE_SOURCE_DIR}/src/shared/Common
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_BINARY_DIR}/src/shared
+    ${ACE_INCLUDE_DIR}
+    ${MYSQL_INCLUDE_DIR}
 )
 
-#-----------------------------------------------------------------------------
-# Define the scriptdev2 library
-set(sources
-  sd2_revision_nr.h
-  sd2_revision_sql.h
-  ScriptDevMgr.cpp
-  ScriptDevMgr.h
-  base/escort_ai.cpp
-  base/escort_ai.h
-  base/follower_ai.cpp
-  base/follower_ai.h
-  base/guard_ai.cpp
-  base/guard_ai.h
-  base/pet_ai.cpp
-  base/pet_ai.h
+# Define the SD2 library
+set(mangosscript_LIB_SRCS ${mangosscript_PCH})
 
-  ${mangosscript_PCH_H}
-  ${mangosscript_PCH_CPP}
-  include/sc_creature.cpp
-  include/sc_creature.h
-  include/sc_grid_searchers.cpp
-  include/sc_grid_searchers.h
-  include/sc_instance.cpp
-  include/sc_instance.h
-  include/sc_gossip.h
+#Include Files
+file(GLOB sources_include include/*.cpp include/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_include})
+    source_group("Include Files" FILES ${sources_include})
 
-  system/ScriptLoader.cpp
-  system/ScriptLoader.h
-  system/system.cpp
-  system/system.h
-)
+#System Files
+file(GLOB sources_system system/*.cpp system/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_system})
+    source_group("System Files" FILES ${sources_system})
 
-set(mangosscript_LIB_SRCS ${sources})
+#Base Files
+file(GLOB sources_base base/*.cpp base/*.h)
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_base})
+    source_group("Base Files" FILES ${sources_base})
 
 #Battleground Scripts
 file(GLOB sources_battlegrounds scripts/battlegrounds/*.cpp scripts/battlegrounds/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_battlegrounds})
-  source_group("Battleground Scripts" FILES ${sources_battlegrounds})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_battlegrounds})
+    source_group("Battleground Scripts" FILES ${sources_battlegrounds})
 
 #World Scripts
 file(GLOB sources_world scripts/world/*.cpp scripts/world/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_world})
-  source_group("World Scripts" FILES ${sources_world})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_world})
+    source_group("World Scripts" FILES ${sources_world})
 
 #Eastern Kingdom Scripts
 file(GLOB sources_eastern_kingdoms scripts/eastern_kingdoms/*.cpp scripts/eastern_kingdoms/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_eastern_kingdoms})
-  source_group("Eastern Kingdoms Scripts" FILES ${sources_eastern_kingdoms})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_eastern_kingdoms})
+    source_group("Eastern Kingdoms Scripts" FILES ${sources_eastern_kingdoms})
 
 #Kalimdor Scripts
 file(GLOB sources_kalimdor scripts/kalimdor/*.cpp scripts/kalimdor/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_kalimdor})
-  source_group("Kalimdor Scripts" FILES ${sources_kalimdor})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_kalimdor})
+    source_group("Kalimdor Scripts" FILES ${sources_kalimdor})
   
 #Outlands Scripts
 file(GLOB sources_outlands scripts/outland/*.cpp scripts/outland/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_outlands})
-  source_group("Outlands Scripts" FILES ${sources_outlands})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_outlands})
+    source_group("Outlands Scripts" FILES ${sources_outlands})
   
 #Northrend Scripts
 file(GLOB sources_northrend scripts/northrend/*.cpp scripts/northrend/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_northrend})
-  source_group("Northrend Scripts" FILES ${sources_northrend})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_northrend})
+    source_group("Northrend Scripts" FILES ${sources_northrend})
 
 #Instance: Blackrock Depths Scripts
 file(GLOB sources_instance_ek_brd scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/*.cpp scripts/eastern_kingdoms/blackrock_mountain/blackrock_depths/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_brd})
-  source_group("Eastern Kingdoms Scripts\\Instances\\Blackrock Depths" FILES ${sources_instance_ek_brd})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_brd})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Blackrock Depths" FILES ${sources_instance_ek_brd})
 
 #Instance: Blackrock Spire Scripts
 file(GLOB sources_instance_ek_brs scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/*.cpp scripts/eastern_kingdoms/blackrock_mountain/blackrock_spire/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_brs})
-  source_group("Eastern Kingdoms Scripts\\Instances\\Blackrock Spire" FILES ${sources_instance_ek_brs})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_brs})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Blackrock Spire" FILES ${sources_instance_ek_brs})
 
 #Instance: Deadmines Scripts
 file(GLOB sources_instance_ek_tdm scripts/eastern_kingdoms/deadmines/*.cpp scripts/eastern_kingdoms/deadmines/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_tdm})
-  source_group("Eastern Kingdoms Scripts\\Instances\\Deadmines" FILES ${sources_instance_ek_tdm})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_tdm})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Deadmines" FILES ${sources_instance_ek_tdm})
 
 #Instance: Gnomeregan Scripts
 file(GLOB sources_instance_ek_gno scripts/eastern_kingdoms/gnomeregan/*.cpp scripts/eastern_kingdoms/gnomeregan/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_gno})
-  source_group("Eastern Kingdoms Scripts\\Instances\\Gnomeregan" FILES ${sources_instance_ek_gno})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_gno})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Gnomeregan" FILES ${sources_instance_ek_gno})
 
 #Instance: Scarlet Monastery Scripts
 file(GLOB sources_instance_ek_sm scripts/eastern_kingdoms/scarlet_monastery/*.cpp scripts/eastern_kingdoms/scarlet_monastery/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_sm})
-  source_group("Eastern Kingdoms Scripts\\Instances\\Scarlet Monastery" FILES ${sources_instance_ek_sm})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_sm})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Scarlet Monastery" FILES ${sources_instance_ek_sm})
 
 #Instance: Scholomance Scripts
 file(GLOB sources_instance_ek_scholo scripts/eastern_kingdoms/scholomance/*.cpp scripts/eastern_kingdoms/scholomance/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_scholo})
-  source_group("Eastern Kingdoms Scripts\\Instances\\Scholomance" FILES ${sources_instance_ek_scholo})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_scholo})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Scholomance" FILES ${sources_instance_ek_scholo})
 
 #Instance: Uldaman Scripts
 file(GLOB sources_instance_ek_uld scripts/eastern_kingdoms/uldaman/*.cpp scripts/eastern_kingdoms/uldaman/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_uld})
-  source_group("Eastern Kingdoms Scripts\\Instances\\Uldaman" FILES ${sources_instance_ek_uld})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_uld})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Uldaman" FILES ${sources_instance_ek_uld})
 
 #Instance: Shadowfang Keep Scripts
 file(GLOB sources_instance_ek_sfk scripts/eastern_kingdoms/shadowfang_keep/*.cpp scripts/eastern_kingdoms/shadowfang_keep/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_sfk})
-  source_group("Eastern Kingdoms Scripts\\Instances\\Shadowfang Keep" FILES ${sources_instance_ek_sfk})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_sfk})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Shadowfang Keep" FILES ${sources_instance_ek_sfk})
 
 #Instance: Sunken Temple Scripts
 file(GLOB sources_instance_ek_st scripts/eastern_kingdoms/sunken_temple/*.cpp scripts/eastern_kingdoms/sunken_temple/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_st})
-  source_group("Eastern Kingdoms Scripts\\Instances\\Sunken Temple" FILES ${sources_instance_ek_st})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_st})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Sunken Temple" FILES ${sources_instance_ek_st})
 
 #Instance: Stratholme Scripts
 file(GLOB sources_instance_ek_strat scripts/eastern_kingdoms/stratholme/*.cpp scripts/eastern_kingdoms/stratholme/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_strat})
-  source_group("Eastern Kingdoms Scripts\\Instances\\Stratholme" FILES ${sources_instance_ek_strat})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_strat})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Stratholme" FILES ${sources_instance_ek_strat})
 
 #Instance: Magisters Terrace Scripts
 file(GLOB sources_instance_ek_mt scripts/eastern_kingdoms/magisters_terrace/*.cpp scripts/eastern_kingdoms/magisters_terrace/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_mt})
-  source_group("Eastern Kingdoms Scripts\\Instances\\Magisters Terrace" FILES ${sources_instance_ek_mt})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ek_mt})
+    source_group("Eastern Kingdoms Scripts\\Instances\\Magisters Terrace" FILES ${sources_instance_ek_mt})
   
 #Raid: Karazhan Scripts
 file(GLOB sources_raid_ek_kara scripts/eastern_kingdoms/karazhan/*.cpp scripts/eastern_kingdoms/karazhan/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_kara})
-  source_group("Eastern Kingdoms Scripts\\Raids\\Karazhan" FILES ${sources_raid_ek_kara})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_kara})
+    source_group("Eastern Kingdoms Scripts\\Raids\\Karazhan" FILES ${sources_raid_ek_kara})
   
 #Raid: Sunwell Plateau Scripts
 file(GLOB sources_raid_ek_sp scripts/eastern_kingdoms/sunwell_plateau/*.cpp scripts/eastern_kingdoms/sunwell_plateau/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_sp})
-  source_group("Eastern Kingdoms Scripts\\Raids\\Sunwell Plateau" FILES ${sources_raid_ek_sp})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_sp})
+    source_group("Eastern Kingdoms Scripts\\Raids\\Sunwell Plateau" FILES ${sources_raid_ek_sp})
   
 #Raid: Zul'Aman Scripts
 file(GLOB sources_raid_ek_za scripts/eastern_kingdoms/zulaman/*.cpp scripts/eastern_kingdoms/zulaman/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_za})
-  source_group("Eastern Kingdoms Scripts\\Raids\\Zul'Aman" FILES ${sources_raid_ek_za})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_za})
+    source_group("Eastern Kingdoms Scripts\\Raids\\Zul'Aman" FILES ${sources_raid_ek_za})
   
 #Raid: Molten Core Scripts
 file(GLOB sources_raid_ek_mc scripts/eastern_kingdoms/blackrock_mountain/molten_core/*.cpp scripts/eastern_kingdoms/blackrock_mountain/molten_core/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_mc})
-  source_group("Eastern Kingdoms Scripts\\Raids\\Molten Core" FILES ${sources_raid_ek_mc})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_mc})
+    source_group("Eastern Kingdoms Scripts\\Raids\\Molten Core" FILES ${sources_raid_ek_mc})
 
 #Raid: Blackwing Lair Scripts
 file(GLOB sources_raid_ek_bwl scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/*.cpp scripts/eastern_kingdoms/blackrock_mountain/blackwing_lair/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_bwl})
-  source_group("Eastern Kingdoms Scripts\\Raids\\Blackwing Lair" FILES ${sources_raid_ek_bwl})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_bwl})
+    source_group("Eastern Kingdoms Scripts\\Raids\\Blackwing Lair" FILES ${sources_raid_ek_bwl})
 
 #Raid: Zul Gurub Scripts
 file(GLOB sources_raid_ek_zg scripts/eastern_kingdoms/zulgurub/*.cpp scripts/eastern_kingdoms/zulgurub/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_zg})
-  source_group("Eastern Kingdoms Scripts\\Raids\\Zul Gurub" FILES ${sources_raid_ek_zg})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ek_zg})
+    source_group("Eastern Kingdoms Scripts\\Raids\\Zul Gurub" FILES ${sources_raid_ek_zg})
 
 #Instance: Blackfathom Deeps Scripts
 file(GLOB sources_instance_k_bdf scripts/kalimdor/blackfathom_deeps/*.cpp scripts/kalimdor/blackfathom_deeps/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_bdf})
-  source_group("Kalimdor Scripts\\Instances\\Blackfathom Deeps" FILES ${sources_instance_k_bdf})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_bdf})
+    source_group("Kalimdor Scripts\\Instances\\Blackfathom Deeps" FILES ${sources_instance_k_bdf})
 
 #Instance: Dire Maul Scripts
 file(GLOB sources_instance_k_dm scripts/kalimdor/dire_maul/*.cpp scripts/kalimdor/dire_maul/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_dm})
-  source_group("Kalimdor Scripts\\Instances\\Dire Maul" FILES ${sources_instance_k_dm})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_dm})
+    source_group("Kalimdor Scripts\\Instances\\Dire Maul" FILES ${sources_instance_k_dm})
 
 #Instance: Maraudon Scripts
 file(GLOB sources_instance_k_mara scripts/kalimdor/maraudon/*.cpp scripts/kalimdor/maraudon/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_mara})
-  source_group("Kalimdor Scripts\\Instances\\Maraudon Scripts" FILES ${sources_instance_k_mara})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_mara})
+    source_group("Kalimdor Scripts\\Instances\\Maraudon Scripts" FILES ${sources_instance_k_mara})
 
 #Instance: Razorfen Downs Scripts
 file(GLOB sources_instance_k_rfd scripts/kalimdor/razorfen_downs/*.cpp scripts/kalimdor/razorfen_downs/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_rfd})
-  source_group("Kalimdor Scripts\\Instances\\Razorfen Downs" FILES ${sources_instance_k_rfd})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_rfd})
+    source_group("Kalimdor Scripts\\Instances\\Razorfen Downs" FILES ${sources_instance_k_rfd})
 
 #Instance: Razorfen Kraul Scripts
 file(GLOB sources_instance_k_rfk scripts/kalimdor/razorfen_kraul/*.cpp scripts/kalimdor/razorfen_kraul/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_rfk})
-  source_group("Kalimdor Scripts\\Instances\\Razorfen Kraul" FILES ${sources_instance_k_rfk})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_rfk})
+    source_group("Kalimdor Scripts\\Instances\\Razorfen Kraul" FILES ${sources_instance_k_rfk})
 
 #Instance: Wailing Caverns Scripts
 file(GLOB sources_instance_k_wc scripts/kalimdor/wailing_caverns/*.cpp scripts/kalimdor/wailing_caverns/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_wc})
-  source_group("Kalimdor Scripts\\Instances\\Wailing Caverns" FILES ${sources_instance_k_wc})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_wc})
+    source_group("Kalimdor Scripts\\Instances\\Wailing Caverns" FILES ${sources_instance_k_wc})
   
 #Instance: Caverns of Time - Black Morass
 file(GLOB sources_instance_k_cot_bm scripts/kalimdor/caverns_of_time/dark_portal/*.cpp scripts/kalimdor/caverns_of_time/dark_portal/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_cot_bm})
-  source_group("Kalimdor Scripts\\Instances\\Caverns of Time\\Black Morass" FILES ${sources_instance_k_cot_bm})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_cot_bm})
+    source_group("Kalimdor Scripts\\Instances\\Caverns of Time\\Black Morass" FILES ${sources_instance_k_cot_bm})
 
 #Instance: Caverns of Time - Old Hillsbrad
 file(GLOB sources_instance_k_cot_oh scripts/kalimdor/caverns_of_time/old_hillsbrad/*.cpp scripts/kalimdor/caverns_of_time/old_hillsbrad/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_cot_oh})
-  source_group("Kalimdor Scripts\\Instances\\Caverns of Time\\Old Hillsbrad" FILES ${sources_instance_k_cot_oh})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_cot_oh})
+    source_group("Kalimdor Scripts\\Instances\\Caverns of Time\\Old Hillsbrad" FILES ${sources_instance_k_cot_oh})
 
 #Instance: Caverns of Time - Culling of Stratholme
 file(GLOB sources_instance_k_cot_cos scripts/kalimdor/caverns_of_time/culling_of_stratholme/*.cpp scripts/kalimdor/caverns_of_time/culling_of_stratholme/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_cot_cos})
-  source_group("Kalimdor Scripts\\Instances\\Caverns of Time\\Culling of Stratholme" FILES ${sources_instance_k_cot_cos})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_cot_cos})
+    source_group("Kalimdor Scripts\\Instances\\Caverns of Time\\Culling of Stratholme" FILES ${sources_instance_k_cot_cos})
   
 #Instance: Zul Farrak Scripts
 file(GLOB sources_instance_k_zf scripts/kalimdor/zulfarrak/*.cpp scripts/kalimdor/zulfarrak/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_zf})
-  source_group("Kalimdor Scripts\\Instances\\Zul Farrak" FILES ${sources_instance_k_zf})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_zf})
+    source_group("Kalimdor Scripts\\Instances\\Zul Farrak" FILES ${sources_instance_k_zf})
 
 #Raid: Caverns of Time - Mount Hyjal
 file(GLOB sources_instance_k_cot_mh scripts/kalimdor/caverns_of_time/hyjal/*.cpp scripts/kalimdor/caverns_of_time/hyjal/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_cot_mh})
-  source_group("Kalimdor Scripts\\Raids\\Caverns of Time\\Mount Hyjal" FILES ${sources_instance_k_cot_mh})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_k_cot_mh})
+    source_group("Kalimdor Scripts\\Raids\\Caverns of Time\\Mount Hyjal" FILES ${sources_instance_k_cot_mh})
   
 #Raid: Onyxias Lair Scripts
 file(GLOB sources_raid_k_ony scripts/kalimdor/onyxias_lair/*.cpp scripts/kalimdor/onyxias_lair/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_ony})
-  source_group("Kalimdor Scripts\\Raids\\Onyxias Lair" FILES ${sources_raid_k_ony})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_ony})
+    source_group("Kalimdor Scripts\\Raids\\Onyxias Lair" FILES ${sources_raid_k_ony})
 
 #Raid: Ruins of AQ Scripts
 file(GLOB sources_raid_k_raq scripts/kalimdor/ruins_of_ahnqiraj/*.cpp scripts/kalimdor/ruins_of_ahnqiraj/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_raq})
-  source_group("Kalimdor Scripts\\Raids\\Ruins of AQ" FILES ${sources_raid_k_raq})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_raq})
+    source_group("Kalimdor Scripts\\Raids\\Ruins of AQ" FILES ${sources_raid_k_raq})
 
 #Raid: Temple of AQ Scripts
 file(GLOB sources_raid_k_taq scripts/kalimdor/temple_of_ahnqiraj/*.cpp scripts/kalimdor/temple_of_ahnqiraj/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_taq})
-  source_group("Kalimdor Scripts\\Raids\\Temple of AQ" FILES ${sources_raid_k_taq})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_k_taq})
+    source_group("Kalimdor Scripts\\Raids\\Temple of AQ" FILES ${sources_raid_k_taq})
 
 #Instance: Auchindoun - Auchenai Crypts
 file(GLOB sources_instance_ol_aac scripts/outland/auchindoun/auchenai_crypts/*.cpp scripts/outland/auchindoun/auchenai_crypts/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_aac})
-  source_group("Outlands Scripts\\Instances\\Auchindoun\\Auchenai Crypts" FILES ${sources_instance_ol_aac})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_aac})
+    source_group("Outlands Scripts\\Instances\\Auchindoun\\Auchenai Crypts" FILES ${sources_instance_ol_aac})
 
 #Instance: Auchindoun - Mana Tombs
 file(GLOB sources_instance_ol_amt scripts/outland/auchindoun/mana_tombs/*.cpp scripts/outland/auchindoun/mana_tombs/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_amt})
-  source_group("Outlands Scripts\\Instances\\Auchindoun\\Mana Tombs" FILES ${sources_instance_ol_amt})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_amt})
+    source_group("Outlands Scripts\\Instances\\Auchindoun\\Mana Tombs" FILES ${sources_instance_ol_amt})
   
 #Instance: Auchindoun - Sethekk Halls
 file(GLOB sources_instance_ol_ash scripts/outland/auchindoun/sethekk_halls/*.cpp scripts/outland/auchindoun/sethekk_halls/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_ash})
-  source_group("Outlands Scripts\\Instances\\Auchindoun\\Sethekk Halls" FILES ${sources_instance_ol_ash})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_ash})
+    source_group("Outlands Scripts\\Instances\\Auchindoun\\Sethekk Halls" FILES ${sources_instance_ol_ash})
   
 #Instance: Auchindoun - Shadow Labyrinth
 file(GLOB sources_instance_ol_asl scripts/outland/auchindoun/shadow_labyrinth/*.cpp scripts/outland/auchindoun/shadow_labyrinth/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_asl})
-  source_group("Outlands Scripts\\Instances\\Auchindoun\\Shadow Labyrinth" FILES ${sources_instance_ol_asl})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_asl})
+    source_group("Outlands Scripts\\Instances\\Auchindoun\\Shadow Labyrinth" FILES ${sources_instance_ol_asl})
 
 #Instance: Coilfang Reservoir - Slave Pens
 file(GLOB sources_instance_ol_csp scripts/outland/coilfang_reservoir/slave_pens/*.cpp scripts/outland/coilfang_reservoir/slave_pens/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_csp})
-  source_group("Outlands Scripts\\Instances\\Coilfang Reservoir\\Slave Pens" FILES ${sources_instance_ol_csp})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_csp})
+    source_group("Outlands Scripts\\Instances\\Coilfang Reservoir\\Slave Pens" FILES ${sources_instance_ol_csp})
   
 #Instance: Coilfang Reservoir - Steam Vaults
 file(GLOB sources_instance_ol_cst scripts/outland/coilfang_reservoir/steam_vault/*.cpp scripts/outland/coilfang_reservoir/steam_vault/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_cst})
-  source_group("Outlands Scripts\\Instances\\Coilfang Reservoir\\Steam Vaults" FILES ${sources_instance_ol_cst})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_cst})
+    source_group("Outlands Scripts\\Instances\\Coilfang Reservoir\\Steam Vaults" FILES ${sources_instance_ol_cst})
   
 #Instance: Coilfang Reservoir - Underbog
 file(GLOB sources_instance_ol_cu scripts/outland/coilfang_reservoir/underbog/*.cpp scripts/outland/coilfang_reservoir/underbog/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_cu})
-  source_group("Outlands Scripts\\Instances\\Coilfang Reservoir\\Underbog" FILES ${sources_instance_ol_cu})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_ol_cu})
+    source_group("Outlands Scripts\\Instances\\Coilfang Reservoir\\Underbog" FILES ${sources_instance_ol_cu})
   
 #Instance: Hellfire Citadel - Blood Furnace
 file(GLOB sources_raid_ol_hbf scripts/outland/hellfire_citadel/blood_furnace/*.cpp scripts/outland/hellfire_citadel/blood_furnace/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_hbf})
-  source_group("Outlands Scripts\\Instances\\Hellfire Citadel\\Blood Furnace" FILES ${sources_raid_ol_hbf})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_hbf})
+    source_group("Outlands Scripts\\Instances\\Hellfire Citadel\\Blood Furnace" FILES ${sources_raid_ol_hbf})
   
 #Instance: Hellfire Citadel - Hellfire Ramparts
 file(GLOB sources_raid_ol_hhr scripts/outland/hellfire_citadel/hellfire_ramparts/*.cpp scripts/outland/hellfire_citadel/hellfire_ramparts/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_hhr})
-  source_group("Outlands Scripts\\Instances\\Hellfire Citadel\\Hellfire Ramparts" FILES ${sources_raid_ol_hhr})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_hhr})
+    source_group("Outlands Scripts\\Instances\\Hellfire Citadel\\Hellfire Ramparts" FILES ${sources_raid_ol_hhr})
   
 #Instance: Hellfire Citadel - Shattered Halls
 file(GLOB sources_raid_ol_hsh scripts/outland/hellfire_citadel/shattered_halls/*.cpp scripts/outland/hellfire_citadel/shattered_halls/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_hsh})
-  source_group("Outlands Scripts\\Instances\\Hellfire Citadel\\Shattered Halls" FILES ${sources_raid_ol_hsh})  
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_hsh})
+    source_group("Outlands Scripts\\Instances\\Hellfire Citadel\\Shattered Halls" FILES ${sources_raid_ol_hsh})  
 
 #Instance: Tempest Keep - Arcatraz
 file(GLOB sources_raid_ol_ta scripts/outland/tempest_keep/arcatraz/*.cpp scripts/outland/tempest_keep/arcatraz/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_ta})
-  source_group("Outlands Scripts\\Instances\\Tempest Keep\\Arcatraz" FILES ${sources_raid_ol_ta})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_ta})
+    source_group("Outlands Scripts\\Instances\\Tempest Keep\\Arcatraz" FILES ${sources_raid_ol_ta})
   
 #Instance: Tempest Keep - Botanica
 file(GLOB sources_raid_ol_tb scripts/outland/tempest_keep/botanica/*.cpp scripts/outland/tempest_keep/botanica/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_tb})
-  source_group("Outlands Scripts\\Instances\\Tempest Keep\\Botanica" FILES ${sources_raid_ol_tb})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_tb})
+    source_group("Outlands Scripts\\Instances\\Tempest Keep\\Botanica" FILES ${sources_raid_ol_tb})
   
 #Instance: Tempest Keep - The Mechanar
 file(GLOB sources_raid_ol_ttm scripts/outland/tempest_keep/the_mechanar/*.cpp scripts/outland/tempest_keep/the_mechanar/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_ttm})
-  source_group("Outlands Scripts\\Instances\\Tempest Keep\\The Mechanar" FILES ${sources_raid_ol_ttm})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_ttm})
+    source_group("Outlands Scripts\\Instances\\Tempest Keep\\The Mechanar" FILES ${sources_raid_ol_ttm})
   
 #Raid: Hellfire Citadel - Magtheridons Lair
 file(GLOB sources_raid_ol_hml scripts/outland/hellfire_citadel/magtheridons_lair/*.cpp scripts/outland/hellfire_citadel/magtheridons_lair/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_hml})
-  source_group("Outlands Scripts\\Raids\\Hellfire Citadel\\Magtheridons Lair" FILES ${sources_raid_ol_hml})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_hml})
+    source_group("Outlands Scripts\\Raids\\Hellfire Citadel\\Magtheridons Lair" FILES ${sources_raid_ol_hml})
   
 #Raid: Tempest Keep - The Eye
 file(GLOB sources_raid_ol_tte scripts/outland/tempest_keep/the_eye/*.cpp scripts/outland/tempest_keep/the_eye/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_tte})
-  source_group("Outlands Scripts\\Raids\\Tempest Keep\\The Eye" FILES ${sources_raid_ol_tte})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_tte})
+    source_group("Outlands Scripts\\Raids\\Tempest Keep\\The Eye" FILES ${sources_raid_ol_tte})
   
 #Raid: Coilfang Reservoir - Serpentshrine Cavern
 file(GLOB sources_raid_ol_csc scripts/outland/coilfang_reservoir/serpent_shrine/*.cpp scripts/outland/coilfang_reservoir/serpent_shrine/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_csc})
-  source_group("Outlands Scripts\\Raids\\Coilfang Reservoir\\Serpentshrine Cavern" FILES ${sources_raid_ol_csc})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_csc})
+    source_group("Outlands Scripts\\Raids\\Coilfang Reservoir\\Serpentshrine Cavern" FILES ${sources_raid_ol_csc})
   
 #Raid: Black Temple
 file(GLOB sources_raid_ol_bt scripts/outland/black_temple/*.cpp scripts/outland/black_temple/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_bt})
-  source_group("Outlands Scripts\\Raids\\Black Temple" FILES ${sources_raid_ol_bt})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_bt})
+    source_group("Outlands Scripts\\Raids\\Black Temple" FILES ${sources_raid_ol_bt})
   
 #Raid: Gruul's Lair
 file(GLOB sources_raid_ol_gl scripts/outland/gruuls_lair/*.cpp scripts/outland/gruuls_lair/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_gl})
-  source_group("Outlands Scripts\\Raids\\Gruul's Lair" FILES ${sources_raid_ol_gl})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_ol_gl})
+    source_group("Outlands Scripts\\Raids\\Gruul's Lair" FILES ${sources_raid_ol_gl})
 
 #Instance: Azjol Nerub
 file(GLOB sources_instance_nr_aznj scripts/northrend/azjol-nerub/azjol-nerub/*.cpp scripts/northrend/azjol-nerub/azjol-nerub/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_aznj})
-  source_group("Northrend Scripts\\Instances\\Azjol Nerub" FILES ${sources_instance_nr_aznj})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_aznj})
+    source_group("Northrend Scripts\\Instances\\Azjol Nerub" FILES ${sources_instance_nr_aznj})
 
 #Instance: Ahn'Kahet
 file(GLOB sources_instance_nr_ahnk scripts/northrend/azjol-nerub/ahnkahet/*.cpp scripts/northrend/azjol-nerub/ahnkahet/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_ahnk})
-  source_group("Northrend Scripts\\Instances\\Ahn'Kahet" FILES ${sources_instance_nr_ahnk})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_ahnk})
+    source_group("Northrend Scripts\\Instances\\Ahn'Kahet" FILES ${sources_instance_nr_ahnk})
 
 #Instance: Trial of the Champion
 file(GLOB sources_instance_nr_totch scripts/northrend/crusaders_coliseum/trial_of_the_champion/*.cpp scripts/northrend/crusaders_coliseum/trial_of_the_champion/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_totch})
-  source_group("Northrend Scripts\\Instances\\Trial of the Champion" FILES ${sources_instance_nr_totch})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_totch})
+    source_group("Northrend Scripts\\Instances\\Trial of the Champion" FILES ${sources_instance_nr_totch})
 
 #Instance: Drak'Tharon Keep
 file(GLOB sources_instance_nr_dtk scripts/northrend/draktharon_keep/*.cpp scripts/northrend/draktharon_keep/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_dtk})
-  source_group("Northrend Scripts\\Instances\\Drak'Tharon Keep" FILES ${sources_instance_nr_dtk})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_dtk})
+    source_group("Northrend Scripts\\Instances\\Drak'Tharon Keep" FILES ${sources_instance_nr_dtk})
   
 #Instance: Gundrak
 file(GLOB sources_instance_nr_gdk scripts/northrend/gundrak/*.cpp scripts/northrend/gundrak/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_gdk})
-  source_group("Northrend Scripts\\Instances\\Gundrak" FILES ${sources_instance_nr_gdk})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_gdk})
+    source_group("Northrend Scripts\\Instances\\Gundrak" FILES ${sources_instance_nr_gdk})
   
 #Instance: Frozen Halls: Forge of Souls
 file(GLOB sources_instance_nr_fh_fos scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/*.cpp scripts/northrend/icecrown_citadel/frozen_halls/forge_of_souls/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_fh_fos})
-  source_group("Northrend Scripts\\Instances\\Forge of Souls" FILES ${sources_instance_nr_fh_fos})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_fh_fos})
+    source_group("Northrend Scripts\\Instances\\Forge of Souls" FILES ${sources_instance_nr_fh_fos})
 
 #Instance: Frozen Halls: Halls of Reflection
 file(GLOB sources_instance_nr_fh_hor scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/*.cpp scripts/northrend/icecrown_citadel/frozen_halls/halls_of_reflection/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_fh_hor})
-  source_group("Northrend Scripts\\Instances\\Halls of Reflection" FILES ${sources_instance_nr_fh_hor})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_fh_hor})
+    source_group("Northrend Scripts\\Instances\\Halls of Reflection" FILES ${sources_instance_nr_fh_hor})
 
 #Instance: Frozen Halls: Pit of Saron
 file(GLOB sources_instance_nr_fh_pos scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/*.cpp scripts/northrend/icecrown_citadel/frozen_halls/pit_of_saron/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_fh_pos})
-  source_group("Northrend Scripts\\Instances\\Pit of Saron" FILES ${sources_instance_nr_fh_pos})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_fh_pos})
+    source_group("Northrend Scripts\\Instances\\Pit of Saron" FILES ${sources_instance_nr_fh_pos})
   
 #Instance: The Nexus
 file(GLOB sources_instance_nr_nex scripts/northrend/nexus/nexus/*.cpp scripts/northrend/nexus/nexus/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_nex})
-  source_group("Northrend Scripts\\Instances\\The Nexus" FILES ${sources_instance_nr_nex})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_nex})
+    source_group("Northrend Scripts\\Instances\\The Nexus" FILES ${sources_instance_nr_nex})
   
 #Instance: The Oculus
 file(GLOB sources_instance_nr_oculus scripts/northrend/nexus/oculus/*.cpp scripts/northrend/nexus/oculus/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_oculus})
-  source_group("Northrend Scripts\\Instances\\The Oculus" FILES ${sources_instance_nr_oculus})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_oculus})
+    source_group("Northrend Scripts\\Instances\\The Oculus" FILES ${sources_instance_nr_oculus})
   
 #Instance: Halls of Lightning
 file(GLOB sources_instance_nr_uld_hol scripts/northrend/ulduar/halls_of_lightning/*.cpp scripts/northrend/ulduar/halls_of_lightning/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_uld_hol})
-  source_group("Northrend Scripts\\Instances\\Halls of Lightning" FILES ${sources_instance_nr_uld_hol})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_uld_hol})
+    source_group("Northrend Scripts\\Instances\\Halls of Lightning" FILES ${sources_instance_nr_uld_hol})
   
 #Instance: Halls of Stone
 file(GLOB sources_instance_nr_uld_hos scripts/northrend/ulduar/halls_of_stone/*.cpp scripts/northrend/ulduar/halls_of_stone/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_uld_hos})
-  source_group("Northrend Scripts\\Instances\\Halls of Stone" FILES ${sources_instance_nr_uld_hos})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_uld_hos})
+    source_group("Northrend Scripts\\Instances\\Halls of Stone" FILES ${sources_instance_nr_uld_hos})
   
 #Instance: Utgarde Keep
 file(GLOB sources_instance_nr_uk scripts/northrend/utgarde_keep/utgarde_keep/*.cpp scripts/northrend/utgarde_keep/utgarde_keep/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_uk})
-  source_group("Northrend Scripts\\Instances\\Utgarde Keep" FILES ${sources_instance_nr_uk})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_uk})
+    source_group("Northrend Scripts\\Instances\\Utgarde Keep" FILES ${sources_instance_nr_uk})
 
 #Instance: Utgarde Pinnacle
 file(GLOB sources_instance_nr_up scripts/northrend/utgarde_keep/utgarde_pinnacle/*.cpp scripts/northrend/utgarde_keep/utgarde_pinnacle/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_up})
-  source_group("Northrend Scripts\\Instances\\Utgarde Pinnacle" FILES ${sources_instance_nr_up})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_up})
+    source_group("Northrend Scripts\\Instances\\Utgarde Pinnacle" FILES ${sources_instance_nr_up})
   
 #Instance: Violet Hold
 file(GLOB sources_instance_nr_vh scripts/northrend/violet_hold/*.cpp scripts/northrend/violet_hold/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_vh})
-  source_group("Northrend Scripts\\Instances\\Violet Hold" FILES ${sources_instance_nr_vh})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_instance_nr_vh})
+    source_group("Northrend Scripts\\Instances\\Violet Hold" FILES ${sources_instance_nr_vh})
 
 #Raid: Naxxramas
 file(GLOB sources_raid_nr_naxx scripts/northrend/naxxramas/*.cpp scripts/northrend/naxxramas/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_naxx})
-  source_group("Northrend Scripts\\Raids\\Naxxramas" FILES ${sources_raid_nr_naxx})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_naxx})
+    source_group("Northrend Scripts\\Raids\\Naxxramas" FILES ${sources_raid_nr_naxx})
   
 #Raid: Vault of Archavon
 file(GLOB sources_raid_nr_voa scripts/northrend/vault_of_archavon/*.cpp scripts/northrend/vault_of_archavon/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_voa})
-  source_group("Northrend Scripts\\Raids\\Vault of Archavon" FILES ${sources_raid_nr_voa})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_voa})
+    source_group("Northrend Scripts\\Raids\\Vault of Archavon" FILES ${sources_raid_nr_voa})
   
 #Raid: Obsidian Sanctum
 file(GLOB sources_raid_nr_os scripts/northrend/obsidian_sanctum/*.cpp scripts/northrend/obsidian_sanctum/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_os})
-  source_group("Northrend Scripts\\Raids\\Obsidian Sanctum" FILES ${sources_raid_nr_os})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_os})
+    source_group("Northrend Scripts\\Raids\\Obsidian Sanctum" FILES ${sources_raid_nr_os})
   
 #Raid: Ruby Sanctum
 file(GLOB sources_raid_nr_rs scripts/northrend/ruby_sanctum/*.cpp scripts/northrend/ruby_sanctum/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_rs})
-  source_group("Northrend Scripts\\Raids\\Ruby Sanctum" FILES ${sources_raid_nr_rs})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_rs})
+    source_group("Northrend Scripts\\Raids\\Ruby Sanctum" FILES ${sources_raid_nr_rs})
   
 #Raid: Icecrown Citadel
 file(GLOB sources_raid_nr_icc scripts/northrend/icecrown_citadel/icecrown_citadel/*.cpp scripts/northrend/icecrown_citadel/icecrown_citadel/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_icc})
-  source_group("Northrend Scripts\\Raids\\Icecrown Citadel" FILES ${sources_raid_nr_icc})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_icc})
+    source_group("Northrend Scripts\\Raids\\Icecrown Citadel" FILES ${sources_raid_nr_icc})
   
 #Raid: Trial of the Crusader
 file(GLOB sources_raid_nr_totc scripts/northrend/crusaders_coliseum/trial_of_the_crusader/*.cpp scripts/northrend/crusaders_coliseum/trial_of_the_crusader/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_totc})
-  source_group("Northrend Scripts\\Raids\\Trial of the Crusader" FILES ${sources_raid_nr_totc})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_totc})
+    source_group("Northrend Scripts\\Raids\\Trial of the Crusader" FILES ${sources_raid_nr_totc})
   
 #Raid: Eye of Eternity
 file(GLOB sources_raid_nr_eoe scripts/northrend/nexus/eye_of_eternity/*.cpp scripts/northrend/nexus/eye_of_eternity/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_eoe})
-  source_group("Northrend Scripts\\Raids\\Eye of Eternity" FILES ${sources_raid_nr_eoe})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_eoe})
+    source_group("Northrend Scripts\\Raids\\Eye of Eternity" FILES ${sources_raid_nr_eoe})
   
 #Raid: Ulduar
 file(GLOB sources_raid_nr_uld scripts/northrend/ulduar/ulduar/*.cpp scripts/northrend/ulduar/ulduar/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_uld})
-  source_group("Northrend Scripts\\Raids\\Ulduar" FILES ${sources_raid_nr_uld})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_raid_nr_uld})
+    source_group("Northrend Scripts\\Raids\\Ulduar" FILES ${sources_raid_nr_uld})
   
 #WorldScript: Scarlet Enclave
 file(GLOB sources_world_scarlet_enclave scripts/eastern_kingdoms/scarlet_enclave/*.cpp scripts/eastern_kingdoms/scarlet_enclave/*.h)
-  LIST(APPEND mangosscript_LIB_SRCS ${sources_world_scarlet_enclave})
-  source_group("Eastern Kingdoms Scripts\\World\\Scarlet Enclave" FILES ${sources_world_scarlet_enclave})
+    LIST(APPEND mangosscript_LIB_SRCS ${sources_world_scarlet_enclave})
+    source_group("Eastern Kingdoms Scripts\\World\\Scarlet Enclave" FILES ${sources_world_scarlet_enclave})
+    
+add_library(mangosscript STATIC ${mangosscript_LIB_SRCS})
   
-add_library(mangosscript STATIC
-  ${mangosscript_PCH_CPP}
-  ${mangosscript_LIB_SRCS}
-)
-
-# Generate precompiled header
+# Generate PCH
 if(PCH)
-  ADD_CXX_PCH(mangosscript ${mangosscript_PCH_H} ${mangosscript_PCH_CPP})
+    ADD_CXX_PCH(mangosscript ${mangosscript_PCH})
 endif()
 
 if(NOT ACE_USE_EXTERNAL)
-  add_dependencies(mangosscript ace)
+    add_dependencies(mangosscript ace)
 endif()
 
 if(UNIX)
-  set(mangosscript_LINK_FLAGS "-pthread")
-  if(APPLE)
-    set(mangosscript_LINK_FLAGS "-framework Carbon ${mangosscript_LINK_FLAGS}")
-    # Needed for the linking because of the missing symbols
-    set(mangosscript_LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup ${mangosscript_LINK_FLAGS}")
-  endif()
+    set(mangosscript_LINK_FLAGS "-pthread")
+    if(APPLE)
+        set(mangosscript_LINK_FLAGS "-framework Carbon ${mangosscript_LINK_FLAGS}")
+        # Needed for the linking because of the missing symbols
+        set(mangosscript_LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup ${mangosscript_LINK_FLAGS}")
+    endif()
 
-  if(APPLE)
-    set(mangosscript_PROPERTIES INSTALL_NAME_DIR "${LIBS_DIR}")
-  else()
-    set(mangosscript_PROPERTIES INSTALL_RPATH ${LIBS_DIR})
-  endif()
+    if(APPLE)
+        set(mangosscript_PROPERTIES INSTALL_NAME_DIR ${LIBS_DIR})
+    else()
+        set(mangosscript_PROPERTIES INSTALL_RPATH ${LIBS_DIR})
+    endif()
 
-  # Run out of build tree
-  set(mangosscript_PROPERTIES
-    ${mangosscript_PROPERTIES}
-    BUILD_WITH_INSTALL_RPATH OFF
-  )
+    # Run out of build tree
+    set(mangosscript_PROPERTIES
+        ${mangosscript_PROPERTIES}
+        BUILD_WITH_INSTALL_RPATH OFF
+    )
 
-  set_target_properties(mangosscript PROPERTIES
-    LINK_FLAGS ${mangosscript_LINK_FLAGS}
-    ${mangosscript_PROPERTIES}
-  )
-endif()
+    set_target_properties(mangosscript PROPERTIES
+        LINK_FLAGS ${mangosscript_LINK_FLAGS}
+        ${mangosscript_PROPERTIES}
+    )
+endif()
\ No newline at end of file
diff --git a/src/modules/SD2/include/sc_creature.cpp b/src/modules/SD2/include/sc_creature.cpp
index c4331aa41..9763d63d6 100644
--- a/src/modules/SD2/include/sc_creature.cpp
+++ b/src/modules/SD2/include/sc_creature.cpp
@@ -254,13 +254,13 @@ SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, int32 uiSchool, int32 i
     // No target so we can't cast
     if (!pTarget)
     {
-        return NULL;
+        return false;
     }
 
     // Silenced so we can't cast
     if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
     {
-        return NULL;
+        return false;
     }
 
     // Using the extended script system we first create a list of viable spells
@@ -659,7 +659,9 @@ bool ScriptedAI::EnterEvadeIfOutOfCombatArea(const uint32 uiDiff)
     {
         case NPC_BROODLORD:                                 // broodlord (not move down stairs)
             if (fZ > 448.60f)
-            { return false; }
+            {
+                return false;
+            }
             break;
         case NPC_VOID_REAVER:                               // void reaver (calculate from center of room)
             if (m_creature->GetDistance2d(432.59f, 371.93f) < 105.0f)
diff --git a/src/modules/SD2/sd2_revision_nr.h b/src/modules/SD2/precompiled.cpp
similarity index 89%
rename from src/modules/SD2/sd2_revision_nr.h
rename to src/modules/SD2/precompiled.cpp
index b23689775..f43b4f1d3 100644
--- a/src/modules/SD2/sd2_revision_nr.h
+++ b/src/modules/SD2/precompiled.cpp
@@ -23,7 +23,4 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef __SD2_REVISION_NR_H__
-#define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "Rel20.2929"
-#endif // __SD2_REVISION_NR_H__
+#include "precompiled.h"
diff --git a/src/modules/SD2/config-sd2.h b/src/modules/SD2/precompiled.h
similarity index 67%
rename from src/modules/SD2/config-sd2.h
rename to src/modules/SD2/precompiled.h
index 0627e1037..31a6a9584 100644
--- a/src/modules/SD2/config-sd2.h
+++ b/src/modules/SD2/precompiled.h
@@ -23,16 +23,23 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef SC_CONFIG_H
-#define SC_CONFIG_H
+#ifndef SC_PRECOMPILED_H
+#define SC_PRECOMPILED_H
 
-#include "Platform/CompilerDefs.h"
-//#include "revision.h"
-#include "sd2_revision_nr.h"
-#include "SystemConfig.h"
+#include "system/ScriptDevMgr.h"
+#include "Object.h"
+#include "Unit.h"
+#include "Creature.h"
+#include "CreatureAI.h"
+#include "GameObject.h"
+#include "sc_creature.h"
+#include "sc_gossip.h"
+#include "sc_grid_searchers.h"
+#include "sc_instance.h"
+#include "SpellAuras.h"
+#include "World.h"
 
-#ifndef SCRIPTDEV2_VERSION
-  #define SCRIPTDEV2_VERSION "Revision [" SD2_REVISION_NR "] (" REVISION_ID ") " REVISION_DATE " " REVISION_TIME
-#endif
+// sc_gossip.h:             ADD_GOSSIP_ITEM_EXTENDED outcommented box-money (Required until professions are fixed)
+// sc_creature.cpp:         Used in ScriptedAI::SelectSpell, outcommented SchoolMask
 
 #endif
diff --git a/src/modules/SD2/sd2_revision_sql.h b/src/modules/SD2/sd2_revision_sql.h
deleted file mode 100644
index a3aaea168..000000000
--- a/src/modules/SD2/sd2_revision_sql.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * ScriptDev2 is an extension for mangos providing enhanced features for
- * area triggers, creatures, game objects, instances, items, and spells beyond
- * the default database scripting in mangos.
- *
- * Copyright (C) 2006-2013  ScriptDev2 <http://www.scriptdev2.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * World of Warcraft, and all World of Warcraft or Warcraft art, images,
- * and lore are copyrighted by Blizzard Entertainment, Inc.
- */
-
-#ifndef __SD2_REVISION_SQL_H__
-#define __SD2_REVISION_SQL_H__
-#define REVISION_DB_SCRIPTDEV2 "required__scriptdev2"
-#define REVISION_DB_SD2_MANGOS "required__mangos"
-#endif // __SD2_REVISION_SQL_H__
diff --git a/src/modules/SD2/ScriptDevMgr.cpp b/src/modules/SD2/system/ScriptDevMgr.cpp
similarity index 91%
rename from src/modules/SD2/ScriptDevMgr.cpp
rename to src/modules/SD2/system/ScriptDevMgr.cpp
index 89701a0a0..222d121ae 100644
--- a/src/modules/SD2/ScriptDevMgr.cpp
+++ b/src/modules/SD2/system/ScriptDevMgr.cpp
@@ -23,9 +23,9 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include "precompiled.h"
+#include "precompiled.h"//..\bindings\scripts\include\precompiled.h"
 #include "Config/Config.h"
-#include "config-sd2.h"
+#include "SystemConfig.h"
 #include "Database/DatabaseEnv.h"
 #include "DBCStores.h"
 #include "ObjectMgr.h"
@@ -80,44 +80,16 @@ struct TSpellSummary
     uint8 Effects;                                          // set of enum SelectEffect
 } extern* SpellSummary;
 
-
-    // Free Spell Summary
-
-    // Free resources before library unload
-
-
-
-
-    // ScriptDev2 startup
-
-    // Get configuration file
-
-    // Set SD2 Error Log File
-
-
-    // Check config file version
-
-
-    // Load database (must be called after SD2Config.SetSource).
-
-
-    // Resize script ids to needed ammount of assigned ScriptNames (from core)
-
-
-
-    // Check existance scripts for all registered by core script names
-
-
 //*********************************
 //*** Functions used globally ***
 
 /**
- * Function that does script text
- *
- * @param iTextEntry Entry of the text, stored in SD2-database
- * @param pSource Source of the text
- * @param pTarget Can be NULL (depending on CHAT_TYPE of iTextEntry). Possible target for the text
- */
+    * Function that does script text
+    *
+    * @param iTextEntry Entry of the text, stored in SD2-database
+    * @param pSource Source of the text
+    * @param pTarget Can be NULL (depending on CHAT_TYPE of iTextEntry). Possible target for the text
+    */
 void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
 {
     if (!pSource)
@@ -129,7 +101,7 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
     if (iTextEntry >= 0)
     {
         script_error_log("DoScriptText with source entry %u (TypeId=%u, guid=%u) attempts to process text entry %i, but text entry must be negative.",
-                         pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
+                            pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
 
         return;
     }
@@ -139,14 +111,14 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
 }
 
 /**
- * Function that either simulates or does script text for a map
- *
- * @param iTextEntry Entry of the text, stored in SD2-database, only type CHAT_TYPE_ZONE_YELL supported
- * @param uiCreatureEntry Id of the creature of whom saying will be simulated
- * @param pMap Given Map on which the map-wide text is displayed
- * @param pCreatureSource Can be NULL. If pointer to Creature is given, then the creature does the map-wide text
- * @param pTarget Can be NULL. Possible target for the text
- */
+    * Function that either simulates or does script text for a map
+    *
+    * @param iTextEntry Entry of the text, stored in SD2-database, only type CHAT_TYPE_ZONE_YELL supported
+    * @param uiCreatureEntry Id of the creature of whom saying will be simulated
+    * @param pMap Given Map on which the map-wide text is displayed
+    * @param pCreatureSource Can be NULL. If pointer to Creature is given, then the creature does the map-wide text
+    * @param pTarget Can be NULL. Possible target for the text
+    */
 void DoOrSimulateScriptTextForMap(int32 iTextEntry, uint32 uiCreatureEntry, Map* pMap, Creature* pCreatureSource /*=NULL*/, Unit* pTarget /*=NULL*/)
 {
     if (!pMap)
@@ -220,21 +192,24 @@ void Script::RegisterSelf(bool bReportError)
     }
 }
 
-//********************************
-//*** Functions to be Exported ***
+//************************************
+//*** Functions to be used by core ***
 
 void SD2::FreeScriptLibrary()
 {
     // Free Spell Summary
     delete []SpellSummary;
-        
+
     // Free resources before library unload
     for (SDScriptVec::const_iterator itr = m_scripts.begin(); itr != m_scripts.end(); ++itr)
     {
         delete *itr;
     }
+
     m_scripts.clear();
+
     num_sc_scripts = 0;
+
     setScriptLibraryErrorFile(NULL, NULL);
 }
 
@@ -247,7 +222,7 @@ void SD2::InitScriptLibrary()
     outstring_log(" |___/\\__|_| |_| .__/\\__|___/\\___|\\_//___|");
     outstring_log("               |_|                        ");
     outstring_log("                    http://scriptdev2.com/\n");
-        
+
     // Get configuration file
     bool configFailure = false;
     if (!SD2Config.SetSource(MANGOSD_CONFIG_LOCATION))
@@ -258,33 +233,38 @@ void SD2::InitScriptLibrary()
     {
         outstring_log("SD2: Using configuration file %s", MANGOSD_CONFIG_LOCATION);
     }
-        
+
     // Set SD2 Error Log File
     std::string sd2LogFile = SD2Config.GetStringDefault("SD2ErrorLogFile", "scriptdev2-errors.log");
     setScriptLibraryErrorFile(sd2LogFile.c_str(), "SD2");
+
     if (configFailure)
     {
         script_error_log("Unable to open configuration file. Database will be unaccessible. Configuration values will use default.");
     }
-        
+
     // Check config file version
     if (SD2Config.GetIntDefault("ConfVersion", 0) != MANGOSD_CONFIG_VERSION)
     {
         script_error_log("Configuration file version doesn't match expected version. Some config variables may be wrong or missing.");
     }
+
     outstring_log("\n");
-        
+
     // Load database (must be called after SD2Config.SetSource).
     LoadDatabase();
+
     outstring_log("SD2: Loading C++ scripts");
     BarGoLink bar(1);
     bar.step();
-        
+
     // Resize script ids to needed ammount of assigned ScriptNames (from core)
     m_scripts.resize(GetScriptIdsCount(), NULL);
+
     FillSpellSummary();
+
     AddScripts();
-        
+
     // Check existance scripts for all registered by core script names
     for (uint32 i = 1; i < GetScriptIdsCount(); ++i)
     {
@@ -293,9 +273,10 @@ void SD2::InitScriptLibrary()
             script_error_log("No script found for ScriptName '%s'.", GetScriptName(i));
         }
     }
+
     outstring_log(">> Loaded %i C++ Scripts.", num_sc_scripts);
 }
-    
+
 char const* SD2::GetScriptLibraryVersion()
 {
     return strSD2Version.c_str();
@@ -633,11 +614,3 @@ InstanceData* SD2::CreateInstanceData(Map* pMap)
 
     return pTempScript->GetInstanceData(pMap);
 }
-
-#ifdef WIN32
-#  include <windows.h>
-BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
-{
-    return true;
-}
-#endif
diff --git a/src/modules/SD2/ScriptDevMgr.h b/src/modules/SD2/system/ScriptDevMgr.h
similarity index 93%
rename from src/modules/SD2/ScriptDevMgr.h
rename to src/modules/SD2/system/ScriptDevMgr.h
index bb2d4e424..ea18f60f2 100644
--- a/src/modules/SD2/ScriptDevMgr.h
+++ b/src/modules/SD2/system/ScriptDevMgr.h
@@ -28,6 +28,7 @@
 
 #include "Common.h"
 #include "DBCStructure.h"
+#include "ScriptMgr.h"
 
 class Player;
 class Creature;
@@ -79,7 +80,8 @@ public:
     static bool EffectDummyGameObject(Unit*, uint32, SpellEffectIndex, GameObject*, ObjectGuid);
     static bool EffectDummyItem(Unit*, uint32, SpellEffectIndex, Item*, ObjectGuid);
     static bool EffectScriptEffectCreature(Unit*, uint32, SpellEffectIndex, Creature*, ObjectGuid);
-    static bool AuraDummy(Aura const*, bool);
+    static bool AuraDummy(Aura const *, bool);
+    //static bool AuraDummyTick(Aura const*);         [-ZERO:] no dummy ticks. TODO
 };
 
 // *********************************************************
@@ -170,13 +172,4 @@ struct Script
 void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget = NULL);
 void DoOrSimulateScriptTextForMap(int32 iTextEntry, uint32 uiCreatureEntry, Map* pMap, Creature* pCreatureSource = NULL, Unit* pTarget = NULL);
 
-// *********************************************************
-// **************** Internal hook mechanics ****************
-
-#if COMPILER == COMPILER_GNU || COMPILER == COMPILER_CLANG
-#define FUNC_PTR(name,callconvention,returntype,parameters)    typedef returntype(*name)parameters __attribute__ ((callconvention));
-#else
-#define FUNC_PTR(name, callconvention, returntype, parameters)    typedef returntype(callconvention *name)parameters;
-#endif
-
 #endif
diff --git a/src/modules/SD2/system/ScriptLoader.cpp b/src/modules/SD2/system/ScriptLoader.cpp
index a2ceafab9..312685d89 100644
--- a/src/modules/SD2/system/ScriptLoader.cpp
+++ b/src/modules/SD2/system/ScriptLoader.cpp
@@ -26,528 +26,528 @@
 #include "precompiled.h"
 
 // battlegrounds
-extern void AddSC_battleground();
+void AddSC_battleground();
 
 // custom
 
 // world
-extern void AddSC_areatrigger_scripts();
-extern void AddSC_bosses_emerald_dragons();
-extern void AddSC_generic_creature();
-extern void AddSC_go_scripts();
-extern void AddSC_guards();
-extern void AddSC_item_scripts();
-extern void AddSC_npc_professions();
-extern void AddSC_npcs_special();
-extern void AddSC_spell_scripts();
-extern void AddSC_world_map_scripts();
-extern void AddSC_world_map_ebon_hold();
+void AddSC_areatrigger_scripts();
+void AddSC_bosses_emerald_dragons();
+void AddSC_generic_creature();
+void AddSC_go_scripts();
+void AddSC_guards();
+void AddSC_item_scripts();
+void AddSC_npc_professions();
+void AddSC_npcs_special();
+void AddSC_spell_scripts();
+void AddSC_world_map_scripts();
+void AddSC_world_map_ebon_hold();
 
 // eastern kingdoms
-extern void AddSC_ascendant_council();                      // bastion_of_twilight
-extern void AddSC_boss_chogall();
-extern void AddSC_boss_halfus_wyrmbreaker();
-extern void AddSC_boss_sinestra();
-extern void AddSC_boss_valiona_and_theralion();
-extern void AddSC_instance_bastion_of_twilight();
-extern void AddSC_boss_beauty();                            // BM, blackrock_caverns
-extern void AddSC_boss_corla();
-extern void AddSC_boss_karsh_steelbender();
-extern void AddSC_boss_lord_obsidius();
-extern void AddSC_boss_romogg();
-extern void AddSC_instance_blackrock_caverns();
-extern void AddSC_blackrock_depths();                       // blackrock_depths
-extern void AddSC_boss_ambassador_flamelash();
-extern void AddSC_boss_coren_direbrew();
-extern void AddSC_boss_draganthaurissan();
-extern void AddSC_boss_general_angerforge();
-extern void AddSC_boss_high_interrogator_gerstahn();
-extern void AddSC_instance_blackrock_depths();
-extern void AddSC_boss_overlordwyrmthalak();                // blackrock_spire
-extern void AddSC_boss_pyroguard_emberseer();
-extern void AddSC_boss_gyth();
-extern void AddSC_instance_blackrock_spire();
-extern void AddSC_boss_adramedes();                         // BM, blackwing_descent
-extern void AddSC_boss_chimaeron();
-extern void AddSC_boss_magmaw();
-extern void AddSC_boss_maloriak();
-extern void AddSC_boss_nefarian_descent();
-extern void AddSC_instance_blackwing_descent();
-extern void AddSC_omnotron_defense();
-extern void AddSC_boss_razorgore();                         // blackwing_lair
-extern void AddSC_boss_vaelastrasz();
-extern void AddSC_boss_broodlord();
-extern void AddSC_boss_firemaw();
-extern void AddSC_boss_ebonroc();
-extern void AddSC_boss_flamegor();
-extern void AddSC_boss_chromaggus();
-extern void AddSC_boss_nefarian();
-extern void AddSC_boss_victor_nefarius();
-extern void AddSC_instance_blackwing_lair();
-extern void AddSC_boss_mr_smite();                          // deadmines
-extern void AddSC_deadmines();
-extern void AddSC_instance_deadmines();
-extern void AddSC_gnomeregan();                             // gnomeregan
-extern void AddSC_boss_thermaplugg();
-extern void AddSC_instance_gnomeregan();
-extern void AddSC_boss_drahga_shadowburner();               // grim_batol
-extern void AddSC_boss_erudax();
-extern void AddSC_boss_forgemaster_throngus();
-extern void AddSC_boss_general_umbriss();
-extern void AddSC_instance_grim_batol();
-extern void AddSC_boss_attumen();                           // karazhan
-extern void AddSC_boss_curator();
-extern void AddSC_boss_maiden_of_virtue();
-extern void AddSC_boss_shade_of_aran();
-extern void AddSC_boss_netherspite();
-extern void AddSC_boss_nightbane();
-extern void AddSC_boss_prince_malchezaar();
-extern void AddSC_boss_terestian_illhoof();
-extern void AddSC_boss_moroes();
-extern void AddSC_bosses_opera();
-extern void AddSC_chess_event();
-extern void AddSC_instance_karazhan();
-extern void AddSC_karazhan();
-extern void AddSC_boss_felblood_kaelthas();                 // magisters_terrace
-extern void AddSC_boss_selin_fireheart();
-extern void AddSC_boss_vexallus();
-extern void AddSC_boss_priestess_delrissa();
-extern void AddSC_instance_magisters_terrace();
-extern void AddSC_magisters_terrace();
-extern void AddSC_boss_lucifron();                          // molten_core
-extern void AddSC_boss_magmadar();
-extern void AddSC_boss_gehennas();
-extern void AddSC_boss_garr();
-extern void AddSC_boss_baron_geddon();
-extern void AddSC_boss_shazzrah();
-extern void AddSC_boss_golemagg();
-extern void AddSC_boss_sulfuron();
-extern void AddSC_boss_majordomo();
-extern void AddSC_boss_ragnaros();
-extern void AddSC_instance_molten_core();
-extern void AddSC_molten_core();
-extern void AddSC_ebon_hold();                              // scarlet_enclave
-extern void AddSC_boss_arcanist_doan();                     // scarlet_monastery
-extern void AddSC_boss_herod();
-extern void AddSC_boss_mograine_and_whitemane();
-extern void AddSC_boss_headless_horseman();
-extern void AddSC_instance_scarlet_monastery();
-extern void AddSC_boss_darkmaster_gandling();               // scholomance
-extern void AddSC_boss_jandicebarov();
-extern void AddSC_instance_scholomance();
-extern void AddSC_boss_hummel();                            // shadowfang_keep
-extern void AddSC_shadowfang_keep();
-extern void AddSC_instance_shadowfang_keep();
-extern void AddSC_boss_maleki_the_pallid();                 // stratholme
-extern void AddSC_boss_cannon_master_willey();
-extern void AddSC_boss_baroness_anastari();
-extern void AddSC_boss_dathrohan_balnazzar();
-extern void AddSC_boss_order_of_silver_hand();
-extern void AddSC_instance_stratholme();
-extern void AddSC_stratholme();
-extern void AddSC_instance_sunken_temple();                 // sunken_temple
-extern void AddSC_sunken_temple();
-extern void AddSC_boss_brutallus();                         // sunwell_plateau
-extern void AddSC_boss_eredar_twins();
-extern void AddSC_boss_felmyst();
-extern void AddSC_boss_kalecgos();
-extern void AddSC_boss_kiljaeden();
-extern void AddSC_boss_muru();
-extern void AddSC_instance_sunwell_plateau();
-extern void AddSC_boss_commander_ulthok();                  // throne_of_the_tides
-extern void AddSC_boss_erunak_and_ghursha();
-extern void AddSC_boss_lady_nazjar();
-extern void AddSC_boss_ozumat();
-extern void AddSC_instance_throne_of_the_tides();
-extern void AddSC_boss_archaedas();                         // uldaman
-extern void AddSC_instance_uldaman();
-extern void AddSC_uldaman();
-extern void AddSC_boss_akilzon();                           // zulaman
-extern void AddSC_boss_halazzi();
-extern void AddSC_boss_janalai();
-extern void AddSC_boss_malacrass();
-extern void AddSC_boss_nalorakk();
-extern void AddSC_instance_zulaman();
-extern void AddSC_zulaman();
-extern void AddSC_boss_zuljin();
-extern void AddSC_boss_arlokk();                            // zulgurub
-extern void AddSC_boss_hakkar();
-extern void AddSC_boss_hazzarah();
-extern void AddSC_boss_jeklik();
-extern void AddSC_boss_jindo();
-extern void AddSC_boss_mandokir();
-extern void AddSC_boss_marli();
-extern void AddSC_boss_ouro();
-extern void AddSC_boss_renataki();
-extern void AddSC_boss_thekal();
-extern void AddSC_boss_venoxis();
-extern void AddSC_instance_zulgurub();
+void AddSC_ascendant_council();                      // bastion_of_twilight
+void AddSC_boss_chogall();
+void AddSC_boss_halfus_wyrmbreaker();
+void AddSC_boss_sinestra();
+void AddSC_boss_valiona_and_theralion();
+void AddSC_instance_bastion_of_twilight();
+void AddSC_boss_beauty();                            // BM, blackrock_caverns
+void AddSC_boss_corla();
+void AddSC_boss_karsh_steelbender();
+void AddSC_boss_lord_obsidius();
+void AddSC_boss_romogg();
+void AddSC_instance_blackrock_caverns();
+void AddSC_blackrock_depths();                       // blackrock_depths
+void AddSC_boss_ambassador_flamelash();
+void AddSC_boss_coren_direbrew();
+void AddSC_boss_draganthaurissan();
+void AddSC_boss_general_angerforge();
+void AddSC_boss_high_interrogator_gerstahn();
+void AddSC_instance_blackrock_depths();
+void AddSC_boss_overlordwyrmthalak();                // blackrock_spire
+void AddSC_boss_pyroguard_emberseer();
+void AddSC_boss_gyth();
+void AddSC_instance_blackrock_spire();
+void AddSC_boss_adramedes();                         // BM, blackwing_descent
+void AddSC_boss_chimaeron();
+void AddSC_boss_magmaw();
+void AddSC_boss_maloriak();
+void AddSC_boss_nefarian_descent();
+void AddSC_instance_blackwing_descent();
+void AddSC_omnotron_defense();
+void AddSC_boss_razorgore();                         // blackwing_lair
+void AddSC_boss_vaelastrasz();
+void AddSC_boss_broodlord();
+void AddSC_boss_firemaw();
+void AddSC_boss_ebonroc();
+void AddSC_boss_flamegor();
+void AddSC_boss_chromaggus();
+void AddSC_boss_nefarian();
+void AddSC_boss_victor_nefarius();
+void AddSC_instance_blackwing_lair();
+void AddSC_boss_mr_smite();                          // deadmines
+void AddSC_deadmines();
+void AddSC_instance_deadmines();
+void AddSC_gnomeregan();                             // gnomeregan
+void AddSC_boss_thermaplugg();
+void AddSC_instance_gnomeregan();
+void AddSC_boss_drahga_shadowburner();               // grim_batol
+void AddSC_boss_erudax();
+void AddSC_boss_forgemaster_throngus();
+void AddSC_boss_general_umbriss();
+void AddSC_instance_grim_batol();
+void AddSC_boss_attumen();                           // karazhan
+void AddSC_boss_curator();
+void AddSC_boss_maiden_of_virtue();
+void AddSC_boss_shade_of_aran();
+void AddSC_boss_netherspite();
+void AddSC_boss_nightbane();
+void AddSC_boss_prince_malchezaar();
+void AddSC_boss_terestian_illhoof();
+void AddSC_boss_moroes();
+void AddSC_bosses_opera();
+void AddSC_chess_event();
+void AddSC_instance_karazhan();
+void AddSC_karazhan();
+void AddSC_boss_felblood_kaelthas();                 // magisters_terrace
+void AddSC_boss_selin_fireheart();
+void AddSC_boss_vexallus();
+void AddSC_boss_priestess_delrissa();
+void AddSC_instance_magisters_terrace();
+void AddSC_magisters_terrace();
+void AddSC_boss_lucifron();                          // molten_core
+void AddSC_boss_magmadar();
+void AddSC_boss_gehennas();
+void AddSC_boss_garr();
+void AddSC_boss_baron_geddon();
+void AddSC_boss_shazzrah();
+void AddSC_boss_golemagg();
+void AddSC_boss_sulfuron();
+void AddSC_boss_majordomo();
+void AddSC_boss_ragnaros();
+void AddSC_instance_molten_core();
+void AddSC_molten_core();
+void AddSC_ebon_hold();                              // scarlet_enclave
+void AddSC_boss_arcanist_doan();                     // scarlet_monastery
+void AddSC_boss_herod();
+void AddSC_boss_mograine_and_whitemane();
+void AddSC_boss_headless_horseman();
+void AddSC_instance_scarlet_monastery();
+void AddSC_boss_darkmaster_gandling();               // scholomance
+void AddSC_boss_jandicebarov();
+void AddSC_instance_scholomance();
+void AddSC_boss_hummel();                            // shadowfang_keep
+void AddSC_shadowfang_keep();
+void AddSC_instance_shadowfang_keep();
+void AddSC_boss_maleki_the_pallid();                 // stratholme
+void AddSC_boss_cannon_master_willey();
+void AddSC_boss_baroness_anastari();
+void AddSC_boss_dathrohan_balnazzar();
+void AddSC_boss_order_of_silver_hand();
+void AddSC_instance_stratholme();
+void AddSC_stratholme();
+void AddSC_instance_sunken_temple();                 // sunken_temple
+void AddSC_sunken_temple();
+void AddSC_boss_brutallus();                         // sunwell_plateau
+void AddSC_boss_eredar_twins();
+void AddSC_boss_felmyst();
+void AddSC_boss_kalecgos();
+void AddSC_boss_kiljaeden();
+void AddSC_boss_muru();
+void AddSC_instance_sunwell_plateau();
+void AddSC_boss_commander_ulthok();                  // throne_of_the_tides
+void AddSC_boss_erunak_and_ghursha();
+void AddSC_boss_lady_nazjar();
+void AddSC_boss_ozumat();
+void AddSC_instance_throne_of_the_tides();
+void AddSC_boss_archaedas();                         // uldaman
+void AddSC_instance_uldaman();
+void AddSC_uldaman();
+void AddSC_boss_akilzon();                           // zulaman
+void AddSC_boss_halazzi();
+void AddSC_boss_janalai();
+void AddSC_boss_malacrass();
+void AddSC_boss_nalorakk();
+void AddSC_instance_zulaman();
+void AddSC_zulaman();
+void AddSC_boss_zuljin();
+void AddSC_boss_arlokk();                            // zulgurub
+void AddSC_boss_hakkar();
+void AddSC_boss_hazzarah();
+void AddSC_boss_jeklik();
+void AddSC_boss_jindo();
+void AddSC_boss_mandokir();
+void AddSC_boss_marli();
+void AddSC_boss_ouro();
+void AddSC_boss_renataki();
+void AddSC_boss_thekal();
+void AddSC_boss_venoxis();
+void AddSC_instance_zulgurub();
 
-extern void AddSC_alterac_mountains();
-extern void AddSC_arathi_highlands();
-extern void AddSC_blasted_lands();
-extern void AddSC_burning_steppes();
-extern void AddSC_dun_morogh();
-extern void AddSC_eastern_plaguelands();
-extern void AddSC_elwynn_forest();
-extern void AddSC_eversong_woods();
-extern void AddSC_ghostlands();
-extern void AddSC_gilneas();
-extern void AddSC_gilneas_city();
-extern void AddSC_hinterlands();
-extern void AddSC_ironforge();
-extern void AddSC_isle_of_queldanas();
-extern void AddSC_loch_modan();
-extern void AddSC_redridge_mountains();
-extern void AddSC_searing_gorge();
-extern void AddSC_silvermoon_city();
-extern void AddSC_silverpine_forest();
-extern void AddSC_stormwind_city();
-extern void AddSC_stranglethorn_vale();
-extern void AddSC_swamp_of_sorrows();
-extern void AddSC_tirisfal_glades();
-extern void AddSC_twilight_highlands();
-extern void AddSC_undercity();
-extern void AddSC_vashjir();
-extern void AddSC_western_plaguelands();
-extern void AddSC_westfall();
-extern void AddSC_wetlands();
+void AddSC_alterac_mountains();
+void AddSC_arathi_highlands();
+void AddSC_blasted_lands();
+void AddSC_burning_steppes();
+void AddSC_dun_morogh();
+void AddSC_eastern_plaguelands();
+void AddSC_elwynn_forest();
+void AddSC_eversong_woods();
+void AddSC_ghostlands();
+void AddSC_gilneas();
+void AddSC_gilneas_city();
+void AddSC_hinterlands();
+void AddSC_ironforge();
+void AddSC_isle_of_queldanas();
+void AddSC_loch_modan();
+void AddSC_redridge_mountains();
+void AddSC_searing_gorge();
+void AddSC_silvermoon_city();
+void AddSC_silverpine_forest();
+void AddSC_stormwind_city();
+void AddSC_stranglethorn_vale();
+void AddSC_swamp_of_sorrows();
+void AddSC_tirisfal_glades();
+void AddSC_twilight_highlands();
+void AddSC_undercity();
+void AddSC_vashjir();
+void AddSC_western_plaguelands();
+void AddSC_westfall();
+void AddSC_wetlands();
 
 // kalimdor
-extern void AddSC_instance_blackfathom_deeps();             // blackfathom_deeps
-extern void AddSC_boss_aeonus();                            // COT, dark_portal
-extern void AddSC_boss_chrono_lord_deja();
-extern void AddSC_boss_temporus();
-extern void AddSC_dark_portal();
-extern void AddSC_instance_dark_portal();
-extern void AddSC_boss_deathwing();                         // COT, dragon_soul
-extern void AddSC_boss_hagara();
-extern void AddSC_boss_morchok();
-extern void AddSC_boss_ultraxion();
-extern void AddSC_boss_warlord_zonozz();
-extern void AddSC_boss_warmaster_blackhorn();
-extern void AddSC_boss_yorsahj();
-extern void AddSC_dragon_soul();
-extern void AddSC_instance_dragon_soul();
-extern void AddSC_end_of_time();                            // COT, end_of_time
-extern void AddSC_instance_end_of_time();
-extern void AddSC_boss_archbishop_benedictus();             // COT, hour_of_twilight
-extern void AddSC_boss_arcurion();
-extern void AddSC_boss_asira_dawnslayer();
-extern void AddSC_instance_hour_of_twilight();
-extern void AddSC_hyjal();                                  // COT, hyjal
-extern void AddSC_boss_archimonde();
-extern void AddSC_instance_mount_hyjal();
-extern void AddSC_instance_old_hillsbrad();                 // COT, old_hillsbrad
-extern void AddSC_old_hillsbrad();
-extern void AddSC_culling_of_stratholme();                  // COT, culling_of_stratholme
-extern void AddSC_instance_culling_of_stratholme();
-extern void AddSC_dire_maul();                              // dire_maul
-extern void AddSC_instance_dire_maul();
-extern void AddSC_boss_noxxion();                           // maraudon
-extern void AddSC_boss_onyxia();                            // onyxias_lair
-extern void AddSC_instance_onyxias_lair();
-extern void AddSC_razorfen_downs();                         // razorfen_downs
-extern void AddSC_instance_razorfen_kraul();                // razorfen_kraul
-extern void AddSC_razorfen_kraul();
-extern void AddSC_boss_ayamiss();                           // ruins_of_ahnqiraj
-extern void AddSC_boss_buru();
-extern void AddSC_boss_kurinnaxx();
-extern void AddSC_boss_ossirian();
-extern void AddSC_boss_moam();
-extern void AddSC_boss_rajaxx();
-extern void AddSC_ruins_of_ahnqiraj();
-extern void AddSC_instance_ruins_of_ahnqiraj();
-extern void AddSC_boss_cthun();                             // temple_of_ahnqiraj
-extern void AddSC_boss_fankriss();
-extern void AddSC_boss_huhuran();
-extern void AddSC_bug_trio();
-extern void AddSC_boss_sartura();
-extern void AddSC_boss_skeram();
-extern void AddSC_boss_twinemperors();
-extern void AddSC_boss_viscidus();
-extern void AddSC_mob_anubisath_sentinel();
-extern void AddSC_instance_temple_of_ahnqiraj();
-extern void AddSC_boss_alakir();                            // throne_of_the_four_winds
-extern void AddSC_conclave_of_the_wind();
-extern void AddSC_instance_throne_of_the_four_winds();
-extern void AddSC_boss_altairus();                          // vortex_pinnacle
-extern void AddSC_boss_asaad();
-extern void AddSC_boss_grand_vizier_etan();
-extern void AddSC_instance_vortex_pinnacle();
-extern void AddSC_instance_wailing_caverns();               // wailing_caverns
-extern void AddSC_wailing_caverns();
-extern void AddSC_boss_zumrah();                            // zulfarrak
-extern void AddSC_instance_zulfarrak();
-extern void AddSC_zulfarrak();
+void AddSC_instance_blackfathom_deeps();             // blackfathom_deeps
+void AddSC_boss_aeonus();                            // COT, dark_portal
+void AddSC_boss_chrono_lord_deja();
+void AddSC_boss_temporus();
+void AddSC_dark_portal();
+void AddSC_instance_dark_portal();
+void AddSC_boss_deathwing();                         // COT, dragon_soul
+void AddSC_boss_hagara();
+void AddSC_boss_morchok();
+void AddSC_boss_ultraxion();
+void AddSC_boss_warlord_zonozz();
+void AddSC_boss_warmaster_blackhorn();
+void AddSC_boss_yorsahj();
+void AddSC_dragon_soul();
+void AddSC_instance_dragon_soul();
+void AddSC_end_of_time();                            // COT, end_of_time
+void AddSC_instance_end_of_time();
+void AddSC_boss_archbishop_benedictus();             // COT, hour_of_twilight
+void AddSC_boss_arcurion();
+void AddSC_boss_asira_dawnslayer();
+void AddSC_instance_hour_of_twilight();
+void AddSC_hyjal();                                  // COT, hyjal
+void AddSC_boss_archimonde();
+void AddSC_instance_mount_hyjal();
+void AddSC_instance_old_hillsbrad();                 // COT, old_hillsbrad
+void AddSC_old_hillsbrad();
+void AddSC_culling_of_stratholme();                  // COT, culling_of_stratholme
+void AddSC_instance_culling_of_stratholme();
+void AddSC_dire_maul();                              // dire_maul
+void AddSC_instance_dire_maul();
+void AddSC_boss_noxxion();                           // maraudon
+void AddSC_boss_onyxia();                            // onyxias_lair
+void AddSC_instance_onyxias_lair();
+void AddSC_razorfen_downs();                         // razorfen_downs
+void AddSC_instance_razorfen_kraul();                // razorfen_kraul
+void AddSC_razorfen_kraul();
+void AddSC_boss_ayamiss();                           // ruins_of_ahnqiraj
+void AddSC_boss_buru();
+void AddSC_boss_kurinnaxx();
+void AddSC_boss_ossirian();
+void AddSC_boss_moam();
+void AddSC_boss_rajaxx();
+void AddSC_ruins_of_ahnqiraj();
+void AddSC_instance_ruins_of_ahnqiraj();
+void AddSC_boss_cthun();                             // temple_of_ahnqiraj
+void AddSC_boss_fankriss();
+void AddSC_boss_huhuran();
+void AddSC_bug_trio();
+void AddSC_boss_sartura();
+void AddSC_boss_skeram();
+void AddSC_boss_twinemperors();
+void AddSC_boss_viscidus();
+void AddSC_mob_anubisath_sentinel();
+void AddSC_instance_temple_of_ahnqiraj();
+void AddSC_boss_alakir();                            // throne_of_the_four_winds
+void AddSC_conclave_of_the_wind();
+void AddSC_instance_throne_of_the_four_winds();
+void AddSC_boss_altairus();                          // vortex_pinnacle
+void AddSC_boss_asaad();
+void AddSC_boss_grand_vizier_etan();
+void AddSC_instance_vortex_pinnacle();
+void AddSC_instance_wailing_caverns();               // wailing_caverns
+void AddSC_wailing_caverns();
+void AddSC_boss_zumrah();                            // zulfarrak
+void AddSC_instance_zulfarrak();
+void AddSC_zulfarrak();
 
-extern void AddSC_ashenvale();
-extern void AddSC_azshara();
-extern void AddSC_azuremyst_isle();
-extern void AddSC_bloodmyst_isle();
-extern void AddSC_boss_azuregos();
-extern void AddSC_darkshore();
-extern void AddSC_desolace();
-extern void AddSC_durotar();
-extern void AddSC_dustwallow_marsh();
-extern void AddSC_felwood();
-extern void AddSC_feralas();
-extern void AddSC_molten_front();
-extern void AddSC_moonglade();
-extern void AddSC_mount_hyjal();
-extern void AddSC_mulgore();
-extern void AddSC_orgrimmar();
-extern void AddSC_silithus();
-extern void AddSC_stonetalon_mountains();
-extern void AddSC_tanaris();
-extern void AddSC_teldrassil();
-extern void AddSC_the_barrens();
-extern void AddSC_thousand_needles();
-extern void AddSC_thunder_bluff();
-extern void AddSC_uldum();
-extern void AddSC_ungoro_crater();
-extern void AddSC_winterspring();
+void AddSC_ashenvale();
+void AddSC_azshara();
+void AddSC_azuremyst_isle();
+void AddSC_bloodmyst_isle();
+void AddSC_boss_azuregos();
+void AddSC_darkshore();
+void AddSC_desolace();
+void AddSC_durotar();
+void AddSC_dustwallow_marsh();
+void AddSC_felwood();
+void AddSC_feralas();
+void AddSC_molten_front();
+void AddSC_moonglade();
+void AddSC_mount_hyjal();
+void AddSC_mulgore();
+void AddSC_orgrimmar();
+void AddSC_silithus();
+void AddSC_stonetalon_mountains();
+void AddSC_tanaris();
+void AddSC_teldrassil();
+void AddSC_the_barrens();
+void AddSC_thousand_needles();
+void AddSC_thunder_bluff();
+void AddSC_uldum();
+void AddSC_ungoro_crater();
+void AddSC_winterspring();
 
 // maelstrom
-extern void AddSC_boss_corborus();                          // stonecore
-extern void AddSC_boss_ozruk();
-extern void AddSC_priestess_azil();
-extern void AddSC_boss_slabhide();
-extern void AddSC_instance_stonecore();
+void AddSC_boss_corborus();                          // stonecore
+void AddSC_boss_ozruk();
+void AddSC_priestess_azil();
+void AddSC_boss_slabhide();
+void AddSC_instance_stonecore();
 
-extern void AddSC_deepholm();
-extern void AddSC_kezan();
-extern void AddSC_lost_isles();
+void AddSC_deepholm();
+void AddSC_kezan();
+void AddSC_lost_isles();
 
 // northrend
-extern void AddSC_boss_amanitar();                          // azjol-nerub, ahnkahet
-extern void AddSC_boss_jedoga();
-extern void AddSC_boss_nadox();
-extern void AddSC_boss_taldaram();
-extern void AddSC_boss_volazj();
-extern void AddSC_instance_ahnkahet();
-extern void AddSC_boss_anubarak();                          // azjol-nerub, azjol-nerub
-extern void AddSC_boss_hadronox();
-extern void AddSC_boss_krikthir();
-extern void AddSC_instance_azjol_nerub();
-extern void AddSC_trial_of_the_champion();                  // CC, trial_of_the_champion
-extern void AddSC_boss_grand_champions();
-extern void AddSC_instance_trial_of_the_champion();
-extern void AddSC_boss_anubarak_trial();                    // CC, trial_of_the_crusader
-extern void AddSC_boss_faction_champions();
-extern void AddSC_boss_jaraxxus();
-extern void AddSC_instance_trial_of_the_crusader();
-extern void AddSC_northrend_beasts();
-extern void AddSC_trial_of_the_crusader();
-extern void AddSC_twin_valkyr();
-extern void AddSC_boss_novos();                             // draktharon_keep
-extern void AddSC_boss_tharonja();
-extern void AddSC_boss_trollgore();
-extern void AddSC_instance_draktharon_keep();
-extern void AddSC_boss_colossus();                          // gundrak
-extern void AddSC_boss_eck();
-extern void AddSC_boss_galdarah();
-extern void AddSC_boss_moorabi();
-extern void AddSC_boss_sladran();
-extern void AddSC_instance_gundrak();
-extern void AddSC_boss_bronjahm();                          // ICC, forge_of_souls
-extern void AddSC_boss_devourer_of_souls();
-extern void AddSC_instance_forge_of_souls();
-extern void AddSC_boss_falric();                            // ICC, halls_of_reflection
-extern void AddSC_boss_lich_king();
-extern void AddSC_boss_marwyn();
-extern void AddSC_halls_of_reflection();
-extern void AddSC_instance_halls_of_reflection();
-extern void AddSC_boss_garfrost();                          // ICC, pit_of_saron
-extern void AddSC_boss_krick_and_ick();
-extern void AddSC_boss_tyrannus();
-extern void AddSC_instance_pit_of_saron();
-extern void AddSC_pit_of_saron();
-extern void AddSC_blood_prince_council();                   // ICC, icecrown_citadel
-extern void AddSC_boss_blood_queen_lanathel();
-extern void AddSC_boss_deathbringer_saurfang();
-extern void AddSC_boss_festergut();
-extern void AddSC_boss_lady_deathwhisper();
-extern void AddSC_boss_lord_marrowgar();
-extern void AddSC_boss_professor_putricide();
-extern void AddSC_boss_rotface();
-extern void AddSC_boss_sindragosa();
-extern void AddSC_boss_the_lich_king();
-extern void AddSC_boss_valithria_dreamwalker();
-extern void AddSC_gunship_battle();
-extern void AddSC_instance_icecrown_citadel();
-extern void AddSC_boss_anubrekhan();                        // naxxramas
-extern void AddSC_boss_four_horsemen();
-extern void AddSC_boss_faerlina();
-extern void AddSC_boss_gluth();
-extern void AddSC_boss_gothik();
-extern void AddSC_boss_grobbulus();
-extern void AddSC_boss_kelthuzad();
-extern void AddSC_boss_loatheb();
-extern void AddSC_boss_maexxna();
-extern void AddSC_boss_noth();
-extern void AddSC_boss_heigan();
-extern void AddSC_boss_patchwerk();
-extern void AddSC_boss_razuvious();
-extern void AddSC_boss_sapphiron();
-extern void AddSC_boss_thaddius();
-extern void AddSC_instance_naxxramas();
-extern void AddSC_boss_malygos();                           // nexus, eye_of_eternity
-extern void AddSC_instance_eye_of_eternity();
-extern void AddSC_boss_anomalus();                          // nexus, nexus
-extern void AddSC_boss_keristrasza();
-extern void AddSC_boss_ormorok();
-extern void AddSC_boss_telestra();
-extern void AddSC_instance_nexus();
-extern void AddSC_boss_eregos();                            // nexus, oculus
-extern void AddSC_boss_urom();
-extern void AddSC_boss_varos();
-extern void AddSC_instance_oculus();
-extern void AddSC_oculus();
-extern void AddSC_boss_sartharion();                        // obsidian_sanctum
-extern void AddSC_instance_obsidian_sanctum();
-extern void AddSC_boss_baltharus();                         // ruby_sanctum
-extern void AddSC_boss_halion();
-extern void AddSC_boss_saviana();
-extern void AddSC_boss_zarithrian();
-extern void AddSC_instance_ruby_sanctum();
-extern void AddSC_boss_bjarngrim();                         // ulduar, halls_of_lightning
-extern void AddSC_boss_ionar();
-extern void AddSC_boss_loken();
-extern void AddSC_boss_volkhan();
-extern void AddSC_instance_halls_of_lightning();
-extern void AddSC_boss_maiden_of_grief();                   // ulduar, halls_of_stone
-extern void AddSC_boss_sjonnir();
-extern void AddSC_halls_of_stone();
-extern void AddSC_instance_halls_of_stone();
-extern void AddSC_boss_assembly_of_iron();                  // ulduar, ulduar
-extern void AddSC_boss_algalon();
-extern void AddSC_boss_auriaya();
-extern void AddSC_boss_flame_leviathan();
-extern void AddSC_boss_freya();
-extern void AddSC_boss_general_vezax();
-extern void AddSC_boss_hodir();
-extern void AddSC_boss_ignis();
-extern void AddSC_boss_kologarn();
-extern void AddSC_boss_mimiron();
-extern void AddSC_boss_razorscale();
-extern void AddSC_boss_thorim();
-extern void AddSC_boss_xt_002();
-extern void AddSC_boss_yogg_saron();
-extern void AddSC_instance_ulduar();
-extern void AddSC_ulduar();
-extern void AddSC_boss_ingvar();                            // utgarde_keep, utgarde_keep
-extern void AddSC_boss_keleseth();
-extern void AddSC_boss_skarvald_and_dalronn();
-extern void AddSC_instance_utgarde_keep();
-extern void AddSC_utgarde_keep();
-extern void AddSC_boss_gortok();                           // utgarde_keep, utgarde_pinnacle
-extern void AddSC_boss_skadi();
-extern void AddSC_boss_svala();
-extern void AddSC_boss_ymiron();
-extern void AddSC_instance_pinnacle();
-extern void AddSC_boss_archavon();                          // vault_of_archavon
-extern void AddSC_boss_emalon();
-extern void AddSC_boss_koralon();
-extern void AddSC_boss_toravon();
-extern void AddSC_instance_vault_of_archavon();
-extern void AddSC_boss_erekem();                            // violet_hold
-extern void AddSC_boss_ichoron();
-extern void AddSC_instance_violet_hold();
-extern void AddSC_violet_hold();
+void AddSC_boss_amanitar();                          // azjol-nerub, ahnkahet
+void AddSC_boss_jedoga();
+void AddSC_boss_nadox();
+void AddSC_boss_taldaram();
+void AddSC_boss_volazj();
+void AddSC_instance_ahnkahet();
+void AddSC_boss_anubarak();                          // azjol-nerub, azjol-nerub
+void AddSC_boss_hadronox();
+void AddSC_boss_krikthir();
+void AddSC_instance_azjol_nerub();
+void AddSC_trial_of_the_champion();                  // CC, trial_of_the_champion
+void AddSC_boss_grand_champions();
+void AddSC_instance_trial_of_the_champion();
+void AddSC_boss_anubarak_trial();                    // CC, trial_of_the_crusader
+void AddSC_boss_faction_champions();
+void AddSC_boss_jaraxxus();
+void AddSC_instance_trial_of_the_crusader();
+void AddSC_northrend_beasts();
+void AddSC_trial_of_the_crusader();
+void AddSC_twin_valkyr();
+void AddSC_boss_novos();                             // draktharon_keep
+void AddSC_boss_tharonja();
+void AddSC_boss_trollgore();
+void AddSC_instance_draktharon_keep();
+void AddSC_boss_colossus();                          // gundrak
+void AddSC_boss_eck();
+void AddSC_boss_galdarah();
+void AddSC_boss_moorabi();
+void AddSC_boss_sladran();
+void AddSC_instance_gundrak();
+void AddSC_boss_bronjahm();                          // ICC, forge_of_souls
+void AddSC_boss_devourer_of_souls();
+void AddSC_instance_forge_of_souls();
+void AddSC_boss_falric();                            // ICC, halls_of_reflection
+void AddSC_boss_lich_king();
+void AddSC_boss_marwyn();
+void AddSC_halls_of_reflection();
+void AddSC_instance_halls_of_reflection();
+void AddSC_boss_garfrost();                          // ICC, pit_of_saron
+void AddSC_boss_krick_and_ick();
+void AddSC_boss_tyrannus();
+void AddSC_instance_pit_of_saron();
+void AddSC_pit_of_saron();
+void AddSC_blood_prince_council();                   // ICC, icecrown_citadel
+void AddSC_boss_blood_queen_lanathel();
+void AddSC_boss_deathbringer_saurfang();
+void AddSC_boss_festergut();
+void AddSC_boss_lady_deathwhisper();
+void AddSC_boss_lord_marrowgar();
+void AddSC_boss_professor_putricide();
+void AddSC_boss_rotface();
+void AddSC_boss_sindragosa();
+void AddSC_boss_the_lich_king();
+void AddSC_boss_valithria_dreamwalker();
+void AddSC_gunship_battle();
+void AddSC_instance_icecrown_citadel();
+void AddSC_boss_anubrekhan();                        // naxxramas
+void AddSC_boss_four_horsemen();
+void AddSC_boss_faerlina();
+void AddSC_boss_gluth();
+void AddSC_boss_gothik();
+void AddSC_boss_grobbulus();
+void AddSC_boss_kelthuzad();
+void AddSC_boss_loatheb();
+void AddSC_boss_maexxna();
+void AddSC_boss_noth();
+void AddSC_boss_heigan();
+void AddSC_boss_patchwerk();
+void AddSC_boss_razuvious();
+void AddSC_boss_sapphiron();
+void AddSC_boss_thaddius();
+void AddSC_instance_naxxramas();
+void AddSC_boss_malygos();                           // nexus, eye_of_eternity
+void AddSC_instance_eye_of_eternity();
+void AddSC_boss_anomalus();                          // nexus, nexus
+void AddSC_boss_keristrasza();
+void AddSC_boss_ormorok();
+void AddSC_boss_telestra();
+void AddSC_instance_nexus();
+void AddSC_boss_eregos();                            // nexus, oculus
+void AddSC_boss_urom();
+void AddSC_boss_varos();
+void AddSC_instance_oculus();
+void AddSC_oculus();
+void AddSC_boss_sartharion();                        // obsidian_sanctum
+void AddSC_instance_obsidian_sanctum();
+void AddSC_boss_baltharus();                         // ruby_sanctum
+void AddSC_boss_halion();
+void AddSC_boss_saviana();
+void AddSC_boss_zarithrian();
+void AddSC_instance_ruby_sanctum();
+void AddSC_boss_bjarngrim();                         // ulduar, halls_of_lightning
+void AddSC_boss_ionar();
+void AddSC_boss_loken();
+void AddSC_boss_volkhan();
+void AddSC_instance_halls_of_lightning();
+void AddSC_boss_maiden_of_grief();                   // ulduar, halls_of_stone
+void AddSC_boss_sjonnir();
+void AddSC_halls_of_stone();
+void AddSC_instance_halls_of_stone();
+void AddSC_boss_assembly_of_iron();                  // ulduar, ulduar
+void AddSC_boss_algalon();
+void AddSC_boss_auriaya();
+void AddSC_boss_flame_leviathan();
+void AddSC_boss_freya();
+void AddSC_boss_general_vezax();
+void AddSC_boss_hodir();
+void AddSC_boss_ignis();
+void AddSC_boss_kologarn();
+void AddSC_boss_mimiron();
+void AddSC_boss_razorscale();
+void AddSC_boss_thorim();
+void AddSC_boss_xt_002();
+void AddSC_boss_yogg_saron();
+void AddSC_instance_ulduar();
+void AddSC_ulduar();
+void AddSC_boss_ingvar();                            // utgarde_keep, utgarde_keep
+void AddSC_boss_keleseth();
+void AddSC_boss_skarvald_and_dalronn();
+void AddSC_instance_utgarde_keep();
+void AddSC_utgarde_keep();
+void AddSC_boss_gortok();                           // utgarde_keep, utgarde_pinnacle
+void AddSC_boss_skadi();
+void AddSC_boss_svala();
+void AddSC_boss_ymiron();
+void AddSC_instance_pinnacle();
+void AddSC_boss_archavon();                          // vault_of_archavon
+void AddSC_boss_emalon();
+void AddSC_boss_koralon();
+void AddSC_boss_toravon();
+void AddSC_instance_vault_of_archavon();
+void AddSC_boss_erekem();                            // violet_hold
+void AddSC_boss_ichoron();
+void AddSC_instance_violet_hold();
+void AddSC_violet_hold();
 
-extern void AddSC_borean_tundra();
-extern void AddSC_dalaran();
-extern void AddSC_dragonblight();
-extern void AddSC_grizzly_hills();
-extern void AddSC_howling_fjord();
-extern void AddSC_icecrown();
-extern void AddSC_sholazar_basin();
-extern void AddSC_storm_peaks();
-extern void AddSC_zuldrak();
+void AddSC_borean_tundra();
+void AddSC_dalaran();
+void AddSC_dragonblight();
+void AddSC_grizzly_hills();
+void AddSC_howling_fjord();
+void AddSC_icecrown();
+void AddSC_sholazar_basin();
+void AddSC_storm_peaks();
+void AddSC_zuldrak();
 
 // outland
-extern void AddSC_boss_exarch_maladaar();                   // auchindoun, auchenai_crypts
-extern void AddSC_boss_shirrak();
-extern void AddSC_boss_nexusprince_shaffar();               // auchindoun, mana_tombs
-extern void AddSC_boss_pandemonius();
-extern void AddSC_boss_anzu();                              // auchindoun, sethekk_halls
-extern void AddSC_boss_darkweaver_syth();
-extern void AddSC_boss_talon_king_ikiss();
-extern void AddSC_instance_sethekk_halls();
-extern void AddSC_boss_ambassador_hellmaw();                // auchindoun, shadow_labyrinth
-extern void AddSC_boss_blackheart_the_inciter();
-extern void AddSC_boss_grandmaster_vorpil();
-extern void AddSC_boss_murmur();
-extern void AddSC_instance_shadow_labyrinth();
-extern void AddSC_black_temple();                           // black_temple
-extern void AddSC_boss_illidan();
-extern void AddSC_boss_shade_of_akama();
-extern void AddSC_boss_supremus();
-extern void AddSC_boss_gurtogg_bloodboil();
-extern void AddSC_boss_mother_shahraz();
-extern void AddSC_boss_reliquary_of_souls();
-extern void AddSC_boss_teron_gorefiend();
-extern void AddSC_boss_najentus();
-extern void AddSC_boss_illidari_council();
-extern void AddSC_instance_black_temple();
-extern void AddSC_boss_fathomlord_karathress();             // CR, serpent_shrine
-extern void AddSC_boss_hydross_the_unstable();
-extern void AddSC_boss_lady_vashj();
-extern void AddSC_boss_leotheras_the_blind();
-extern void AddSC_boss_morogrim_tidewalker();
-extern void AddSC_boss_the_lurker_below();
-extern void AddSC_instance_serpentshrine_cavern();
-extern void AddSC_boss_ahune();                             // CR, slave_pens
-extern void AddSC_boss_hydromancer_thespia();               // CR, steam_vault
-extern void AddSC_boss_mekgineer_steamrigger();
-extern void AddSC_boss_warlord_kalithresh();
-extern void AddSC_instance_steam_vault();
-extern void AddSC_boss_hungarfen();                         // CR, Underbog
-extern void AddSC_boss_gruul();                             // gruuls_lair
-extern void AddSC_boss_high_king_maulgar();
-extern void AddSC_instance_gruuls_lair();
-extern void AddSC_boss_broggok();                           // HC, blood_furnace
-extern void AddSC_boss_kelidan_the_breaker();
-extern void AddSC_boss_the_maker();
-extern void AddSC_instance_blood_furnace();
-extern void AddSC_boss_nazan_and_vazruden();                // HC, hellfire_ramparts
-extern void AddSC_boss_omor_the_unscarred();
-extern void AddSC_boss_watchkeeper_gargolmar();
-extern void AddSC_instance_ramparts();
-extern void AddSC_boss_magtheridon();                       // HC, magtheridons_lair
-extern void AddSC_instance_magtheridons_lair();
-extern void AddSC_boss_grand_warlock_nethekurse();          // HC, shattered_halls
-extern void AddSC_boss_warbringer_omrogg();
-extern void AddSC_boss_warchief_kargath_bladefist();
-extern void AddSC_instance_shattered_halls();
-extern void AddSC_arcatraz();                               // TK, arcatraz
-extern void AddSC_boss_dalliah();
-extern void AddSC_boss_harbinger_skyriss();
-extern void AddSC_boss_soccothrates();
-extern void AddSC_instance_arcatraz();
-extern void AddSC_boss_high_botanist_freywinn();            // TK, botanica
-extern void AddSC_boss_laj();
-extern void AddSC_boss_warp_splinter();
-extern void AddSC_boss_alar();                              // TK, the_eye
-extern void AddSC_boss_high_astromancer_solarian();
-extern void AddSC_boss_kaelthas();
-extern void AddSC_boss_void_reaver();
-extern void AddSC_instance_the_eye();
-extern void AddSC_boss_nethermancer_sepethrea();            // TK, the_mechanar
-extern void AddSC_boss_pathaleon_the_calculator();
-extern void AddSC_instance_mechanar();
+void AddSC_boss_exarch_maladaar();                   // auchindoun, auchenai_crypts
+void AddSC_boss_shirrak();
+void AddSC_boss_nexusprince_shaffar();               // auchindoun, mana_tombs
+void AddSC_boss_pandemonius();
+void AddSC_boss_anzu();                              // auchindoun, sethekk_halls
+void AddSC_boss_darkweaver_syth();
+void AddSC_boss_talon_king_ikiss();
+void AddSC_instance_sethekk_halls();
+void AddSC_boss_ambassador_hellmaw();                // auchindoun, shadow_labyrinth
+void AddSC_boss_blackheart_the_inciter();
+void AddSC_boss_grandmaster_vorpil();
+void AddSC_boss_murmur();
+void AddSC_instance_shadow_labyrinth();
+void AddSC_black_temple();                           // black_temple
+void AddSC_boss_illidan();
+void AddSC_boss_shade_of_akama();
+void AddSC_boss_supremus();
+void AddSC_boss_gurtogg_bloodboil();
+void AddSC_boss_mother_shahraz();
+void AddSC_boss_reliquary_of_souls();
+void AddSC_boss_teron_gorefiend();
+void AddSC_boss_najentus();
+void AddSC_boss_illidari_council();
+void AddSC_instance_black_temple();
+void AddSC_boss_fathomlord_karathress();             // CR, serpent_shrine
+void AddSC_boss_hydross_the_unstable();
+void AddSC_boss_lady_vashj();
+void AddSC_boss_leotheras_the_blind();
+void AddSC_boss_morogrim_tidewalker();
+void AddSC_boss_the_lurker_below();
+void AddSC_instance_serpentshrine_cavern();
+void AddSC_boss_ahune();                             // CR, slave_pens
+void AddSC_boss_hydromancer_thespia();               // CR, steam_vault
+void AddSC_boss_mekgineer_steamrigger();
+void AddSC_boss_warlord_kalithresh();
+void AddSC_instance_steam_vault();
+void AddSC_boss_hungarfen();                         // CR, Underbog
+void AddSC_boss_gruul();                             // gruuls_lair
+void AddSC_boss_high_king_maulgar();
+void AddSC_instance_gruuls_lair();
+void AddSC_boss_broggok();                           // HC, blood_furnace
+void AddSC_boss_kelidan_the_breaker();
+void AddSC_boss_the_maker();
+void AddSC_instance_blood_furnace();
+void AddSC_boss_nazan_and_vazruden();                // HC, hellfire_ramparts
+void AddSC_boss_omor_the_unscarred();
+void AddSC_boss_watchkeeper_gargolmar();
+void AddSC_instance_ramparts();
+void AddSC_boss_magtheridon();                       // HC, magtheridons_lair
+void AddSC_instance_magtheridons_lair();
+void AddSC_boss_grand_warlock_nethekurse();          // HC, shattered_halls
+void AddSC_boss_warbringer_omrogg();
+void AddSC_boss_warchief_kargath_bladefist();
+void AddSC_instance_shattered_halls();
+void AddSC_arcatraz();                               // TK, arcatraz
+void AddSC_boss_dalliah();
+void AddSC_boss_harbinger_skyriss();
+void AddSC_boss_soccothrates();
+void AddSC_instance_arcatraz();
+void AddSC_boss_high_botanist_freywinn();            // TK, botanica
+void AddSC_boss_laj();
+void AddSC_boss_warp_splinter();
+void AddSC_boss_alar();                              // TK, the_eye
+void AddSC_boss_high_astromancer_solarian();
+void AddSC_boss_kaelthas();
+void AddSC_boss_void_reaver();
+void AddSC_instance_the_eye();
+void AddSC_boss_nethermancer_sepethrea();            // TK, the_mechanar
+void AddSC_boss_pathaleon_the_calculator();
+void AddSC_instance_mechanar();
 
-extern void AddSC_blades_edge_mountains();
-extern void AddSC_boss_doomlordkazzak();
-extern void AddSC_boss_doomwalker();
-extern void AddSC_hellfire_peninsula();
-extern void AddSC_nagrand();
-extern void AddSC_netherstorm();
-extern void AddSC_shadowmoon_valley();
-extern void AddSC_shattrath_city();
-extern void AddSC_terokkar_forest();
-extern void AddSC_zangarmarsh();
+void AddSC_blades_edge_mountains();
+void AddSC_boss_doomlordkazzak();
+void AddSC_boss_doomwalker();
+void AddSC_hellfire_peninsula();
+void AddSC_nagrand();
+void AddSC_netherstorm();
+void AddSC_shadowmoon_valley();
+void AddSC_shattrath_city();
+void AddSC_terokkar_forest();
+void AddSC_zangarmarsh();
 
 void AddScripts()
 {
diff --git a/src/modules/SD2/system/system.cpp b/src/modules/SD2/system/system.cpp
index 03bdba8e3..910b34aa3 100644
--- a/src/modules/SD2/system/system.cpp
+++ b/src/modules/SD2/system/system.cpp
@@ -25,10 +25,10 @@
 
 #include "precompiled.h"
 #include "system.h"
-#include "../config-sd2.h"
 #include "ProgressBar.h"
 #include "ObjectMgr.h"
 #include "Database/DatabaseEnv.h"
+#include "SystemConfig.h"
 
 DatabaseType SD2Database;
 std::string  strSD2Version;
diff --git a/src/realmd/AuthCodes.h b/src/realmd/Auth/AuthCodes.h
similarity index 98%
rename from src/realmd/AuthCodes.h
rename to src/realmd/Auth/AuthCodes.h
index 452e743b5..7cb8b9f26 100644
--- a/src/realmd/AuthCodes.h
+++ b/src/realmd/Auth/AuthCodes.h
@@ -2,7 +2,7 @@
  * MaNGOS is a full featured server for World of Warcraft, supporting
  * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
  *
- * Copyright (C) 2005-2014  MaNGOS project <http://getmangos.eu>
+ * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/realmd/AuthSocket.cpp b/src/realmd/Auth/AuthSocket.cpp
similarity index 92%
rename from src/realmd/AuthSocket.cpp
rename to src/realmd/Auth/AuthSocket.cpp
index edf4f1b1d..ec01b6c70 100644
--- a/src/realmd/AuthSocket.cpp
+++ b/src/realmd/Auth/AuthSocket.cpp
@@ -30,10 +30,10 @@
 #include "Database/DatabaseEnv.h"
 #include "Config/Config.h"
 #include "Log.h"
-#include "RealmList.h"
+#include "Realm/RealmList.h"
 #include "AuthSocket.h"
 #include "AuthCodes.h"
-#include "PatchHandler.h"
+#include "Patch/PatchHandler.h"
 
 #include <openssl/md5.h>
 //#include "Util.h" -- for commented utf8ToUpperOnlyLatin
@@ -385,6 +385,13 @@ bool AuthSocket::_HandleLogonChallenge()
 
     _login = (const char*)ch->I;
     _build = ch->build;
+    _os = (const char*)ch->os;
+    
+    if (_os.size() > 4)
+        return false;
+
+    // Restore string order as its byte order is reversed
+    std::reverse(_os.begin(), _os.end());
 
     ///- Normalize account name
     // utf8ToUpperOnlyLatin(_login); -- client already send account in expected form
@@ -698,7 +705,7 @@ bool AuthSocket::_HandleLogonProof()
         ///- Update the sessionkey, last_ip, last login time and reset number of failed logins in the account table for this account
         // No SQL injection (escaped user name) and IP address as received by socket
         const char* K_hex = K.AsHexStr();
-        LoginDatabase.PExecute("UPDATE account SET sessionkey = '%s', last_ip = '%s', last_login = NOW(), locale = '%u', failed_logins = 0 WHERE username = '%s'", K_hex, get_remote_address().c_str(), GetLocaleByName(_localizationName), _safelogin.c_str());
+        LoginDatabase.PExecute("UPDATE account SET sessionkey = '%s', last_ip = '%s', last_login = NOW(), locale = '%u', os = '%s', failed_logins = 0 WHERE username = '%s'", K_hex, get_remote_address().c_str(), GetLocaleByName(_localizationName), _os.c_str(), _safelogin.c_str());
         OPENSSL_free((void*)K_hex);
 
         ///- Finish SRP6 and send the final result to the client
@@ -804,6 +811,13 @@ bool AuthSocket::_HandleReconnectChallenge()
     
     EndianConvert(ch->build);
     _build = ch->build;
+    _os = (const char*)ch->os;
+
+    if (_os.size() > 4)
+        return false;
+
+    // Restore string order as its byte order is reversed
+    std::reverse(_os.begin(), _os.end());
     
     QueryResult* result = LoginDatabase.PQuery("SELECT sessionkey FROM account WHERE username = '%s'", _safelogin.c_str());
     
@@ -876,6 +890,28 @@ bool AuthSocket::_HandleReconnectProof()
     }
 }
 
+ACE_INET_Addr const& AuthSocket::GetAddressForClient(Realm const& realm, ACE_INET_Addr const& clientAddr)
+{
+    // Attempt to send best address for client
+    if (clientAddr.is_loopback())
+    {
+        // Try guessing if realm is also connected locally
+        if (realm.LocalAddress.is_loopback() || realm.ExternalAddress.is_loopback())
+            return clientAddr;
+
+        // Assume that user connecting from the machine that authserver is located on
+        // has all realms available in his local network
+        return realm.LocalAddress;
+    }
+
+    // Check if connecting client is in the same network
+    if (IsIPAddrInNetwork(realm.LocalAddress, clientAddr, realm.LocalSubnetMask))
+        return realm.LocalAddress;
+
+    // Return external IP
+        return realm.ExternalAddress;
+}
+
 /// %Realm List command handler
 bool AuthSocket::_HandleRealmList()
 {
@@ -921,6 +957,9 @@ void AuthSocket::LoadRealmlist(ByteBuffer& pkt, uint32 acctid)
     iters = sRealmList.GetIteratorsForBuild(_build);
     uint32 numRealms = sRealmList.NumRealmsForBuild(_build);
     
+    ACE_INET_Addr clientAddr;
+    peer().get_remote_addr(clientAddr);
+
     switch (_build)
     {
         case 5875:                                          // 1.12.1
@@ -934,6 +973,7 @@ void AuthSocket::LoadRealmlist(ByteBuffer& pkt, uint32 acctid)
                  itr != iters.second;
                  ++itr)
             {
+                clientAddr.set_port_number((*itr)->ExternalAddress.get_port_number());
                 uint8 AmountOfCharacters;
                 
                 // No SQL injection. id of realm is controlled by the database.
@@ -968,14 +1008,14 @@ void AuthSocket::LoadRealmlist(ByteBuffer& pkt, uint32 acctid)
                 if (!ok_build || ((*itr)->allowedSecurityLevel > _accountSecurityLevel))
                     realmflags = RealmFlags(realmflags | REALM_FLAG_OFFLINE);
 
-                pkt << uint32((*itr)->icon);              // realm type
-                pkt << uint8(realmflags);                   // realmflags
-                pkt << name;                                // name
-                pkt << (*itr)->address;                   // address
+                pkt << uint32((*itr)->icon);                                        // realm type
+                pkt << uint8(realmflags);                                           // realmflags
+                pkt << name;                                                        // name
+                pkt << GetAddressString(GetAddressForClient((**itr), clientAddr));  // address
                 pkt << float((*itr)->populationLevel);
                 pkt << uint8(AmountOfCharacters);
-                pkt << uint8((*itr)->timezone);           // realm category
-                pkt << uint8(0x00);                         // unk, may be realm number/id?
+                pkt << uint8((*itr)->timezone);                                     // realm category
+                pkt << uint8(0x00);                                                 // unk, may be realm number/id?
             }
 
             pkt << uint16(0x0002);                          // unused value (why 2?)
@@ -1014,6 +1054,7 @@ void AuthSocket::LoadRealmlist(ByteBuffer& pkt, uint32 acctid)
                  itr != iters.second;
                  ++itr)
             {
+                clientAddr.set_port_number((*itr)->ExternalAddress.get_port_number());
                 uint8 AmountOfCharacters;
 
                 // No SQL injection. id of realm is controlled by the database.
@@ -1044,15 +1085,15 @@ void AuthSocket::LoadRealmlist(ByteBuffer& pkt, uint32 acctid)
                 if (!buildInfo)
                     { realmFlags = RealmFlags(realmFlags & ~REALM_FLAG_SPECIFYBUILD); }
 
-                pkt << uint8((*itr)->icon);               // realm type (this is second column in Cfg_Configs.dbc)
-                pkt << uint8(lock);                         // flags, if 0x01, then realm locked
-                pkt << uint8(realmFlags);                   // see enum RealmFlags
-                pkt << (*itr)->name;                            // name
-                pkt << (*itr)->address;                   // address
+                pkt << uint8((*itr)->icon);                                         // realm type (this is second column in Cfg_Configs.dbc)
+                pkt << uint8(lock);                                                 // flags, if 0x01, then realm locked
+                pkt << uint8(realmFlags);                                           // see enum RealmFlags
+                pkt << (*itr)->name;                                                // name
+                pkt << GetAddressString(GetAddressForClient((**itr), clientAddr));  // address
                 pkt << float((*itr)->populationLevel);
                 pkt << uint8(AmountOfCharacters);
-                pkt << uint8((*itr)->timezone);           // realm category (Cfg_Categories.dbc)
-                pkt << uint8(0x2C);                         // unk, may be realm number/id?
+                pkt << uint8((*itr)->timezone);                                     // realm category (Cfg_Categories.dbc)
+                pkt << uint8(0x2C);                                                 // unk, may be realm number/id?
 
                 if (realmFlags & REALM_FLAG_SPECIFYBUILD)
                 {
diff --git a/src/realmd/AuthSocket.h b/src/realmd/Auth/AuthSocket.h
similarity index 94%
rename from src/realmd/AuthSocket.h
rename to src/realmd/Auth/AuthSocket.h
index 162f16cc8..bd98332d9 100644
--- a/src/realmd/AuthSocket.h
+++ b/src/realmd/Auth/AuthSocket.h
@@ -33,8 +33,12 @@
 #include "Auth/BigNumber.h"
 #include "Auth/Sha1.h"
 #include "ByteBuffer.h"
+#include "Util.h"
 
-#include "BufferedSocket.h"
+#include "SocketBuffer/BufferedSocket.h"
+
+class ACE_INET_Addr;
+struct Realm;
 
 /**
  * @brief Handle login commands
@@ -80,6 +84,8 @@ class AuthSocket: public BufferedSocket
          */
         void LoadRealmlist(ByteBuffer& pkt, uint32 acctid);
 
+        static ACE_INET_Addr const& GetAddressForClient(Realm const& realm, ACE_INET_Addr const& clientAddr);
+
         /**
          * @brief
          *
@@ -150,6 +156,7 @@ class AuthSocket: public BufferedSocket
         std::string _safelogin; /**< TODO */
 
         std::string _localizationName; /**< Since GetLocaleByName() is _NOT_ bijective, we have to store the locale as a string. Otherwise we can't differ between enUS and enGB, which is important for the patch system */
+        std::string _os;
         uint16 _build; /**< TODO */
         AccountTypes _accountSecurityLevel; /**< TODO */
 
diff --git a/src/realmd/CMakeLists.txt b/src/realmd/CMakeLists.txt
index 7dad45be0..54ee00879 100644
--- a/src/realmd/CMakeLists.txt
+++ b/src/realmd/CMakeLists.txt
@@ -24,94 +24,101 @@
 
 set(EXECUTABLE_NAME realmd)
 
+#Auth Files
+file(GLOB_RECURSE SRC_GRP_AUTH Auth/*.cpp Auth/*.h)
+source_group("Authentication" FILES ${SRC_GRP_AUTH})
+
+#Patch Files
+file(GLOB_RECURSE SRC_GRP_PATCH Patch/*.cpp Patch/*.h)
+source_group("Authentication" FILES ${SRC_GRP_PATCH})
+
+#Realm Files
+file(GLOB_RECURSE SRC_GRP_REALM Realm/*.cpp Realm/*.h)
+source_group("Realmlist" FILES ${SRC_GRP_REALM})
+
+#Socket Buffer Files
+file(GLOB_RECURSE SRC_GRP_SOCKB SocketBuffer/*.cpp SocketBuffer/*.h)
+source_group("Socket Buffer" FILES ${SRC_GRP_SOCKB})
+
 set(EXECUTABLE_SRCS
-    AuthCodes.h
-    AuthSocket.cpp
-    AuthSocket.h
-    BufferedSocket.cpp
-    BufferedSocket.h
+    ${SRC_GRP_AUTH}
+    ${SRC_GRP_PATCH}
+    ${SRC_GRP_REALM}
+    ${SRC_GRP_SOCKB}
     Main.cpp
-    PatchHandler.cpp
-    PatchHandler.h
-    RealmList.cpp
-    RealmList.h
-   )
+)
 
 if(WIN32)
-  # add resource file to windows build
-  set(EXECUTABLE_SRCS ${EXECUTABLE_SRCS} realmd.rc)
+    # add resource file to windows build
+    set(EXECUTABLE_SRCS ${EXECUTABLE_SRCS} realmd.rc)
 endif()
 
 include_directories(
-  "${CMAKE_SOURCE_DIR}/src/shared"
-  "${CMAKE_SOURCE_DIR}/src/framework"
-  "${CMAKE_BINARY_DIR}"
-  "${CMAKE_BINARY_DIR}/src/shared"
-  "${MYSQL_INCLUDE_DIR}"
-  "${ACE_INCLUDE_DIR}"
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/src/shared
+    ${CMAKE_SOURCE_DIR}/src/shared/Common
+    ${CMAKE_SOURCE_DIR}/src/shared/Utilities
+    ${CMAKE_SOURCE_DIR}/src/shared/Log
+    ${CMAKE_SOURCE_DIR}/src/shared/DataStores
+    ${CMAKE_SOURCE_DIR}/src/shared/Win
+    ${CMAKE_SOURCE_DIR}/src/shared/Linux
+    ${CMAKE_SOURCE_DIR}/src/framework
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_BINARY_DIR}/src/shared
+    ${ACE_INCLUDE_DIR}
+    ${OPENSSL_INCLUDE_DIR}
 )
 
-add_executable(${EXECUTABLE_NAME}
-  ${EXECUTABLE_SRCS}
-)
+add_executable(${EXECUTABLE_NAME} ${EXECUTABLE_SRCS})
 
 if(NOT ACE_USE_EXTERNAL)
-  add_dependencies(${EXECUTABLE_NAME} ace)
-  target_link_libraries(${EXECUTABLE_NAME} ace)
+    add_dependencies(${EXECUTABLE_NAME} ace)
+    target_link_libraries(${EXECUTABLE_NAME} ace)
 else()
-  target_link_libraries(${EXECUTABLE_NAME} ACE)
+    target_link_libraries(${EXECUTABLE_NAME} ACE)
 endif()
 
 target_link_libraries(${EXECUTABLE_NAME}
-  shared
-  framework
+    shared
+    framework
+    ${OPENSSL_LIBRARIES}
 )
 
-if(WIN32)
-  target_link_libraries(${EXECUTABLE_NAME}
-    optimized ${MYSQL_LIBRARY}
-    optimized ${OPENSSL_LIBRARIES}
-    debug ${MYSQL_DEBUG_LIBRARY}
-    debug ${OPENSSL_DEBUG_LIBRARIES}
-  )
-  if(PLATFORM MATCHES X86)
-    target_link_libraries(${EXECUTABLE_NAME})
-  endif()
+if(POSTGRESQL)
+    include_directories(${PostgreSQL_INCLUDE_DIR})
+    target_link_libraries(${EXECUTABLE_NAME} ${PostgreSQL_LIBRARIES})
+else()
+    include_directories(${MYSQL_INCLUDE_DIR})
+    target_link_libraries(${EXECUTABLE_NAME} ${MYSQL_LIBRARY})
 endif()
 
 if(UNIX)
-  target_link_libraries(${EXECUTABLE_NAME}
-    ${MYSQL_LIBRARY}
-    ${OPENSSL_LIBRARIES}
-    ${OPENSSL_EXTRA_LIBRARIES}
-  )
+    target_link_libraries(${EXECUTABLE_NAME} ${OPENSSL_EXTRA_LIBRARIES})
 endif()
 
 set(EXECUTABLE_LINK_FLAGS "")
 
 if(UNIX)
-  if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-    set(EXECUTABLE_LINK_FLAGS "-Wl, --no-as-needed -pthread -lrt ${EXECUTABLE_LINK_FLAGS}")
-  elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -ldl -pthread -lrt ${EXECUTABLE_LINK_FLAGS}")
-  endif()
+    if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+        set(EXECUTABLE_LINK_FLAGS "-Wl, --no-as-needed -pthread -lrt ${EXECUTABLE_LINK_FLAGS}")
+    elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -ldl -pthread -lrt ${EXECUTABLE_LINK_FLAGS}")
+    endif()
 endif()
 
 if(APPLE)
-  set(EXECUTABLE_LINK_FLAGS "-framework Carbon ${EXECUTABLE_LINK_FLAGS}")
+    set(EXECUTABLE_LINK_FLAGS "-framework Carbon ${EXECUTABLE_LINK_FLAGS}")
 endif()
 
-set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS
-  "${EXECUTABLE_LINK_FLAGS}"
-)
+set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS "${EXECUTABLE_LINK_FLAGS}")
 
 install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_DIR}")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/realmd.conf.dist.in" "${CMAKE_CURRENT_BINARY_DIR}/realmd.conf.dist")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/realmd.conf.dist" DESTINATION "${CONF_INSTALL_DIR}")
 
 if(WIN32 AND MSVC)
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}" CONFIGURATIONS Debug)
-  add_custom_command(TARGET ${EXECUTABLE_NAME}
-    POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/realmd.conf.dist" "${CONF_COPY_DIR}"
-  )
-endif()
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}" CONFIGURATIONS Debug)
+    add_custom_command(TARGET ${EXECUTABLE_NAME}
+        POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/realmd.conf.dist" "${CONF_COPY_DIR}"
+    )
+endif()
\ No newline at end of file
diff --git a/src/realmd/Main.cpp b/src/realmd/Main.cpp
index a967b188c..6026ea4ee 100644
--- a/src/realmd/Main.cpp
+++ b/src/realmd/Main.cpp
@@ -28,14 +28,13 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "RealmList.h"
+#include "Realm/RealmList.h"
 
 #include "Config/Config.h"
 #include "Log.h"
-#include "AuthSocket.h"
+#include "Auth/AuthSocket.h"
 #include "SystemConfig.h"
-#include "revision_nr.h"
-#include "revision_sql.h"
+#include "revision.h"
 #include "Util.h"
 #include <openssl/opensslv.h>
 #include <openssl/crypto.h>
diff --git a/src/realmd/PatchHandler.cpp b/src/realmd/Patch/PatchHandler.cpp
similarity index 99%
rename from src/realmd/PatchHandler.cpp
rename to src/realmd/Patch/PatchHandler.cpp
index 3533bfc67..cb4103d1e 100644
--- a/src/realmd/PatchHandler.cpp
+++ b/src/realmd/Patch/PatchHandler.cpp
@@ -28,7 +28,7 @@
 
 #include "Common.h"
 #include "PatchHandler.h"
-#include "AuthCodes.h"
+#include "Auth/AuthCodes.h"
 #include "Log.h"
 
 #include <ace/OS_NS_sys_socket.h>
diff --git a/src/realmd/PatchHandler.h b/src/realmd/Patch/PatchHandler.h
similarity index 100%
rename from src/realmd/PatchHandler.h
rename to src/realmd/Patch/PatchHandler.h
diff --git a/src/realmd/RealmList.cpp b/src/realmd/Realm/RealmList.cpp
similarity index 83%
rename from src/realmd/RealmList.cpp
rename to src/realmd/Realm/RealmList.cpp
index 3401eaca2..ad59679e7 100644
--- a/src/realmd/RealmList.cpp
+++ b/src/realmd/Realm/RealmList.cpp
@@ -28,7 +28,7 @@
 
 #include "Common.h"
 #include "RealmList.h"
-#include "AuthCodes.h"
+#include "Auth/AuthCodes.h"
 #include "Util.h"                                           // for Tokens typedef
 #include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
@@ -169,7 +169,7 @@ void RealmList::InitBuildToVersion()
     m_buildToVersion[17128] = REALM_VERSION_MOP;
 }
 
-void RealmList::UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint32 port, uint8 icon, RealmFlags realmflags, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, const std::string& builds)
+void RealmList::UpdateRealm(uint32 ID, const std::string& name, ACE_INET_Addr const& address, ACE_INET_Addr const& localAddr, ACE_INET_Addr const& localSubmask, uint32 port, uint8 icon, RealmFlags realmflags, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, const std::string& builds)
 {
     ///- Create new if not exist or update existed
     Realm& realm = m_realms[name];
@@ -212,9 +212,9 @@ void RealmList::UpdateRealm(uint32 ID, const std::string& name, const std::strin
                 { realm.realmBuildInfo = *bInfo; }
 
     ///- Append port to IP address.
-    std::ostringstream ss;
-    ss << address << ":" << port;
-    realm.address   = ss.str();
+    realm.ExternalAddress = address;
+    realm.LocalAddress = localAddr;
+    realm.LocalSubnetMask = localSubmask;
 }
 
 void RealmList::UpdateIfNeed()
@@ -238,8 +238,8 @@ void RealmList::UpdateRealms(bool init)
 {
     DETAIL_LOG("Updating Realm List...");
 
-    ////                                               0   1     2        3     4     5           6         7                     8           9
-    QueryResult* result = LoginDatabase.Query("SELECT id, name, address, port, icon, realmflags, timezone, allowedSecurityLevel, population, realmbuilds FROM realmlist WHERE (realmflags & 1) = 0 ORDER BY name");
+    ////                                               0    1      2           3              4          5      6       7          8               9                10           11
+    QueryResult* result = LoginDatabase.Query("SELECT id, name, address, localAddress, localSubnetMask, port, icon, realmflags, timezone, allowedSecurityLevel, population, realmbuilds FROM realmlist WHERE (realmflags & 1) = 0 ORDER BY name");
 
     ///- Circle through results and add them to the realm map
     if (result)
@@ -248,10 +248,22 @@ void RealmList::UpdateRealms(bool init)
         {
             Field* fields = result->Fetch();
 
-            uint32 Id                  = fields[0].GetUInt32();
-            std::string name           = fields[1].GetCppString();
-            uint8 realmflags           = fields[5].GetUInt8();
-            uint8 allowedSecurityLevel = fields[7].GetUInt8();
+            uint32 Id                       = fields[0].GetUInt32();
+            std::string name                = fields[1].GetString();
+            std::string externalAddress     = fields[2].GetString();
+            std::string localAddress        = fields[3].GetString();
+            std::string localSubmask        = fields[4].GetString();
+            uint32 port                     = fields[5].GetUInt32();
+            uint8 icon                      = fields[6].GetUInt8();
+            uint8 realmflags                = fields[7].GetUInt8();
+            uint8 timezone                  = fields[8].GetUInt8();
+            uint8 allowedSecurityLevel      = fields[9].GetUInt8();
+            float population                = fields[10].GetFloat();
+            std::string realmbuilds         = fields[11].GetString();
+
+            ACE_INET_Addr externalAddr(port, externalAddress.c_str(), AF_INET);
+            ACE_INET_Addr localAddr(port, localAddress.c_str(), AF_INET);
+            ACE_INET_Addr submask(0, localSubmask.c_str(), AF_INET);
 
             if (realmflags & ~(REALM_FLAG_OFFLINE | REALM_FLAG_NEW_PLAYERS | REALM_FLAG_RECOMMENDED | REALM_FLAG_SPECIFYBUILD))
             {
@@ -259,11 +271,7 @@ void RealmList::UpdateRealms(bool init)
                 realmflags &= (REALM_FLAG_OFFLINE | REALM_FLAG_NEW_PLAYERS | REALM_FLAG_RECOMMENDED | REALM_FLAG_SPECIFYBUILD);
             }
 
-            UpdateRealm(
-                Id, name, fields[2].GetCppString(), fields[3].GetUInt32(),
-                fields[4].GetUInt8(), RealmFlags(realmflags), fields[6].GetUInt8(),
-                (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR),
-                fields[8].GetFloat(), fields[9].GetCppString());
+            UpdateRealm(Id, name, externalAddr, localAddr, submask, port, icon, RealmFlags(realmflags), timezone, (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR), population, realmbuilds);
 
             if (init)
                 { sLog.outString("Added realm id %u, name '%s'",  Id, name.c_str()); }
diff --git a/src/realmd/RealmList.h b/src/realmd/Realm/RealmList.h
similarity index 93%
rename from src/realmd/RealmList.h
rename to src/realmd/Realm/RealmList.h
index 4106a19ed..1230f96fc 100644
--- a/src/realmd/RealmList.h
+++ b/src/realmd/Realm/RealmList.h
@@ -29,6 +29,9 @@
 #ifndef MANGOS_H_REALMLIST
 #define MANGOS_H_REALMLIST
 
+#include <ace/Singleton.h>
+#include <ace/Null_Mutex.h>
+#include <ace/INET_Addr.h>
 #include "Common.h"
 
 /**
@@ -76,7 +79,9 @@ typedef std::set<uint32> RealmBuilds;
 struct Realm
 {
     std::string name;
-    std::string address;
+    ACE_INET_Addr ExternalAddress;
+    ACE_INET_Addr LocalAddress;
+    ACE_INET_Addr LocalSubnetMask;
     uint8 icon;
     RealmFlags realmflags;                                  // realmflags
     uint8 timezone;
@@ -183,7 +188,7 @@ class RealmList
          * @param popu
          * @param builds
          */
-        void UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint32 port, uint8 icon, RealmFlags realmflags, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, const std::string& builds);
+        void UpdateRealm(uint32 ID, const std::string& name, ACE_INET_Addr const& address, ACE_INET_Addr const& localAddress, ACE_INET_Addr const& localSubnetmask, uint32 port, uint8 icon, RealmFlags realmflags, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, const std::string& builds);
     private:
         RealmMap m_realms;                                    ///< Internal map of realms
         RealmStlList m_realmsByVersion[REALM_VERSION_COUNT]; ///< This sorts the realms by their supported build
diff --git a/src/realmd/BufferedSocket.cpp b/src/realmd/SocketBuffer/BufferedSocket.cpp
similarity index 100%
rename from src/realmd/BufferedSocket.cpp
rename to src/realmd/SocketBuffer/BufferedSocket.cpp
diff --git a/src/realmd/BufferedSocket.h b/src/realmd/SocketBuffer/BufferedSocket.h
similarity index 100%
rename from src/realmd/BufferedSocket.h
rename to src/realmd/SocketBuffer/BufferedSocket.h
diff --git a/src/shared/.gitignore b/src/shared/.gitignore
index 159215b3d..1c62b5c23 100644
--- a/src/shared/.gitignore
+++ b/src/shared/.gitignore
@@ -11,4 +11,3 @@
 #
 
 SystemConfig.h
-revision.h
diff --git a/src/shared/Auth/SARC4.cpp b/src/shared/Auth/ARC4.cpp
similarity index 86%
rename from src/shared/Auth/SARC4.cpp
rename to src/shared/Auth/ARC4.cpp
index c3b5d0062..39c0e53dc 100644
--- a/src/shared/Auth/SARC4.cpp
+++ b/src/shared/Auth/ARC4.cpp
@@ -1,8 +1,9 @@
-/*
+/**
  * MaNGOS is a full featured server for World of Warcraft, supporting
  * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
  *
  * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+ * Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,17 +23,16 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include "Auth/SARC4.h"
-#include <openssl/sha.h>
+#include "ARC4.h"
 
-SARC4::SARC4(uint8 len)
+ARC4::ARC4(uint8 len) : m_ctx()
 {
     EVP_CIPHER_CTX_init(&m_ctx);
     EVP_EncryptInit_ex(&m_ctx, EVP_rc4(), NULL, NULL, NULL);
     EVP_CIPHER_CTX_set_key_length(&m_ctx, len);
 }
 
-SARC4::SARC4(uint8* seed, uint8 len)
+ARC4::ARC4(uint8 *seed, uint8 len) : m_ctx()
 {
     EVP_CIPHER_CTX_init(&m_ctx);
     EVP_EncryptInit_ex(&m_ctx, EVP_rc4(), NULL, NULL, NULL);
@@ -40,17 +40,17 @@ SARC4::SARC4(uint8* seed, uint8 len)
     EVP_EncryptInit_ex(&m_ctx, NULL, NULL, seed, NULL);
 }
 
-SARC4::~SARC4()
+ARC4::~ARC4()
 {
     EVP_CIPHER_CTX_cleanup(&m_ctx);
 }
 
-void SARC4::Init(uint8* seed)
+void ARC4::Init(uint8 *seed)
 {
     EVP_EncryptInit_ex(&m_ctx, NULL, NULL, seed, NULL);
 }
 
-void SARC4::UpdateData(int len, uint8* data)
+void ARC4::UpdateData(int len, uint8 *data)
 {
     int outlen = 0;
     EVP_EncryptUpdate(&m_ctx, data, &outlen, data, len);
diff --git a/src/shared/Auth/SARC4.h b/src/shared/Auth/ARC4.h
similarity index 81%
rename from src/shared/Auth/SARC4.h
rename to src/shared/Auth/ARC4.h
index 21a418fb4..899edfc85 100644
--- a/src/shared/Auth/SARC4.h
+++ b/src/shared/Auth/ARC4.h
@@ -1,8 +1,9 @@
-/*
+/**
  * MaNGOS is a full featured server for World of Warcraft, supporting
  * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
  *
  * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+ * Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,18 +26,19 @@
 #ifndef _AUTH_SARC4_H
 #define _AUTH_SARC4_H
 
-#include "Common.h"
 #include <openssl/evp.h>
+#include "Common/Common.h"
 
-class SARC4
+class ARC4
 {
     public:
-        SARC4(uint8 len);
-        SARC4(uint8* seed, uint8 len);
-        ~SARC4();
-        void Init(uint8* seed);
-        void UpdateData(int len, uint8* data);
+        ARC4(uint8 len);
+        ARC4(uint8 *seed, uint8 len);
+        ~ARC4();
+        void Init(uint8 *seed);
+        void UpdateData(int len, uint8 *data);
     private:
         EVP_CIPHER_CTX m_ctx;
 };
+
 #endif
diff --git a/src/shared/Auth/AuthCrypt.cpp b/src/shared/Auth/AuthCrypt.cpp
index 781cc11cb..1e481342c 100644
--- a/src/shared/Auth/AuthCrypt.cpp
+++ b/src/shared/Auth/AuthCrypt.cpp
@@ -24,7 +24,7 @@
 
 #include "AuthCrypt.h"
 #include "HMACSHA1.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "BigNumber.h"
 
 AuthCrypt::AuthCrypt() : _clientDecrypt(SHA_DIGEST_LENGTH), _serverEncrypt(SHA_DIGEST_LENGTH)
diff --git a/src/shared/Auth/AuthCrypt.h b/src/shared/Auth/AuthCrypt.h
index b8b349bcc..52c854a08 100644
--- a/src/shared/Auth/AuthCrypt.h
+++ b/src/shared/Auth/AuthCrypt.h
@@ -22,29 +22,63 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef _AUTHCRYPT_H
-#define _AUTHCRYPT_H
+#ifndef MANGOS_H_AUTHCRYPT
+#define MANGOS_H_AUTHCRYPT
 
-#include <Common.h>
-#include "SARC4.h"
+#include "Common/Common.h"
+#include <vector>
+#include "ARC4.h"
 
 class BigNumber;
 
+/**
+ * @brief
+ *
+ */
 class AuthCrypt
 {
     public:
+        /**
+         * @brief
+         *
+         */
         AuthCrypt();
+        /**
+         * @brief
+         *
+         */
         ~AuthCrypt();
 
-        void Init(BigNumber* K);
+        /**
+        * @brief
+        *
+        */
+    void Init(BigNumber* K);
+        /**
+         * @brief
+         *
+         * @param
+         * @param size_t
+         */
         void DecryptRecv(uint8*, size_t);
+        /**
+         * @brief
+         *
+         * @param
+         * @param size_t
+         */
         void EncryptSend(uint8*, size_t);
 
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool IsInitialized() { return _initialized; }
 
     private:
-        SARC4 _clientDecrypt;
-        SARC4 _serverEncrypt;
-        bool _initialized;
+        ARC4 _clientDecrypt;
+        ARC4 _serverEncrypt;
+        bool _initialized; /**< TODO */
 };
 #endif
diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp
index 25581f111..04946db9a 100644
--- a/src/shared/Auth/BigNumber.cpp
+++ b/src/shared/Auth/BigNumber.cpp
@@ -48,7 +48,7 @@ BigNumber::BigNumber(uint32 val)
 BigNumber::~BigNumber()
 {
     BN_free(_bn);
-    if (_array) delete[] _array;
+    if (_array) { delete[] _array; }
 }
 
 void BigNumber::SetDword(uint32 val)
@@ -67,7 +67,7 @@ void BigNumber::SetBinary(const uint8* bytes, int len)
 {
     uint8 t[1000];
     for (int i = 0; i < len; ++i)
-        t[i] = bytes[len - 1 - i];
+        { t[i] = bytes[len - 1 - i]; }
     BN_bin2bn(t, len, _bn);
 }
 
@@ -171,7 +171,7 @@ bool BigNumber::isZero() const
     return BN_is_zero(_bn) != 0;
 }
 
-uint8* BigNumber::AsByteArray(int minSize, bool reverse)
+uint8 *BigNumber::AsByteArray(int minSize, bool reverse)
 {
     int length = (minSize >= GetNumBytes()) ? minSize : GetNumBytes();
 
@@ -182,7 +182,7 @@ uint8* BigNumber::AsByteArray(int minSize, bool reverse)
     if (length > GetNumBytes())
         memset((void*)_array, 0, length);
 
-    BN_bn2bin(_bn, (unsigned char*)_array);
+    BN_bn2bin(_bn, (unsigned char *)_array);
 
     if (reverse)
         std::reverse(_array, _array + length);
diff --git a/src/shared/Auth/BigNumber.h b/src/shared/Auth/BigNumber.h
index c82555777..3c439a041 100644
--- a/src/shared/Auth/BigNumber.h
+++ b/src/shared/Auth/BigNumber.h
@@ -22,78 +22,240 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef _AUTH_BIGNUMBER_H
-#define _AUTH_BIGNUMBER_H
+#ifndef MANGOS_H_AUTH_BIGNUMBER
+#define MANGOS_H_AUTH_BIGNUMBER
 
-#include "Common.h"
+#include "Common/Common.h"
 
 struct bignum_st;
 
+/**
+ * @brief
+ *
+ */
 class BigNumber
 {
     public:
+        /**
+         * @brief
+         *
+         */
         BigNumber();
+        /**
+         * @brief
+         *
+         * @param bn
+         */
         BigNumber(const BigNumber& bn);
+        /**
+         * @brief
+         *
+         * @param uint32
+         */
         BigNumber(uint32);
+        /**
+         * @brief
+         *
+         */
         ~BigNumber();
 
+        /**
+         * @brief
+         *
+         * @param uint32
+         */
         void SetDword(uint32);
+        /**
+         * @brief
+         *
+         * @param uint64
+         */
         void SetQword(uint64);
+        /**
+         * @brief
+         *
+         * @param bytes
+         * @param len
+         */
         void SetBinary(const uint8* bytes, int len);
+        /**
+         * @brief
+         *
+         * @param str
+         */
         void SetHexStr(const char* str);
 
+        /**
+         * @brief
+         *
+         * @param numbits
+         */
         void SetRand(int numbits);
 
+        /**
+         * @brief
+         *
+         * @param bn
+         * @return BigNumber operator
+         */
         BigNumber operator=(const BigNumber& bn);
 
+        /**
+         * @brief
+         *
+         * @param bn
+         * @return BigNumber operator
+         */
         BigNumber operator+=(const BigNumber& bn);
+        /**
+         * @brief
+         *
+         * @param bn
+         * @return BigNumber operator
+         */
         BigNumber operator+(const BigNumber& bn)
         {
             BigNumber t(*this);
             return t += bn;
         }
+        /**
+         * @brief
+         *
+         * @param bn
+         * @return BigNumber operator
+         */
         BigNumber operator-=(const BigNumber& bn);
+        /**
+         * @brief
+         *
+         * @param bn
+         * @return BigNumber operator
+         */
         BigNumber operator-(const BigNumber& bn)
         {
             BigNumber t(*this);
             return t -= bn;
         }
+        /**
+         * @brief
+         *
+         * @param bn
+         * @return BigNumber operator
+         */
         BigNumber operator*=(const BigNumber& bn);
+        /**
+         * @brief
+         *
+         * @param bn
+         * @return BigNumber operator
+         */
         BigNumber operator*(const BigNumber& bn)
         {
             BigNumber t(*this);
             return t *= bn;
         }
+        /**
+         * @brief
+         *
+         * @param bn
+         * @return BigNumber operator
+         */
         BigNumber operator/=(const BigNumber& bn);
+        /**
+         * @brief
+         *
+         * @param bn
+         * @return BigNumber operator
+         */
         BigNumber operator/(const BigNumber& bn)
         {
             BigNumber t(*this);
             return t /= bn;
         }
+        /**
+         * @brief
+         *
+         * @param bn
+         * @return BigNumber operator
+         */
         BigNumber operator%=(const BigNumber& bn);
+        /**
+         * @brief
+         *
+         * @param bn
+         * @return BigNumber operator
+         */
         BigNumber operator%(const BigNumber& bn)
         {
             BigNumber t(*this);
             return t %= bn;
         }
 
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool isZero() const;
 
+        /**
+         * @brief
+         *
+         * @param bn1
+         * @param bn2
+         * @return BigNumber
+         */
         BigNumber ModExp(const BigNumber& bn1, const BigNumber& bn2);
+        /**
+         * @brief
+         *
+         * @param
+         * @return BigNumber
+         */
         BigNumber Exp(const BigNumber&);
 
+        /**
+         * @brief
+         *
+         * @return int
+         */
         int GetNumBytes(void);
 
+        /**
+         * @brief
+         *
+         * @return bignum_st
+         */
         struct bignum_st* BN() { return _bn; }
 
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 AsDword();
+        /**
+         * @brief
+         *
+         * @param minSize
+         * @return uint8
+         */
         uint8* AsByteArray(int minSize = 0, bool reverse = true);
-
+        /**
+         * @brief
+         *
+         * @return const char
+         */
         const char* AsHexStr();
+        /**
+         * @brief
+         *
+         * @return const char
+         */
         const char* AsDecStr();
 
     private:
-        struct bignum_st* _bn;
-        uint8* _array;
+        struct bignum_st* _bn; /**< TODO */
+        uint8* _array; /**< TODO */
 };
 #endif
diff --git a/src/shared/Auth/HMACSHA1.cpp b/src/shared/Auth/HMACSHA1.cpp
index 7e67a22fa..2de15b109 100644
--- a/src/shared/Auth/HMACSHA1.cpp
+++ b/src/shared/Auth/HMACSHA1.cpp
@@ -1,4 +1,4 @@
-/*
+/**
  * MaNGOS is a full featured server for World of Warcraft, supporting
  * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
  *
@@ -25,7 +25,7 @@
 #include "Auth/HMACSHA1.h"
 #include "BigNumber.h"
 
-HMACSHA1::HMACSHA1(uint32 len, uint8* seed)
+HMACSHA1::HMACSHA1(uint32 len, uint8 *seed)
 {
     HMAC_CTX_init(&m_ctx);
     HMAC_Init_ex(&m_ctx, seed, len, EVP_sha1(), NULL);
@@ -36,17 +36,17 @@ HMACSHA1::~HMACSHA1()
     HMAC_CTX_cleanup(&m_ctx);
 }
 
-void HMACSHA1::UpdateBigNumber(BigNumber* bn)
+void HMACSHA1::UpdateBigNumber(BigNumber *bn)
 {
     UpdateData(bn->AsByteArray(), bn->GetNumBytes());
 }
 
-void HMACSHA1::UpdateData(const uint8* data, int length)
+void HMACSHA1::UpdateData(const uint8 *data, int length)
 {
     HMAC_Update(&m_ctx, data, length);
 }
 
-void HMACSHA1::UpdateData(const std::string& str)
+void HMACSHA1::UpdateData(const std::string &str)
 {
     UpdateData((uint8 const*)str.c_str(), str.length());
 }
@@ -58,9 +58,9 @@ void HMACSHA1::Finalize()
     MANGOS_ASSERT(length == SHA_DIGEST_LENGTH);
 }
 
-uint8* HMACSHA1::ComputeHash(BigNumber* bn)
+uint8 *HMACSHA1::ComputeHash(BigNumber *bn)
 {
     HMAC_Update(&m_ctx, bn->AsByteArray(), bn->GetNumBytes());
     Finalize();
     return (uint8*)m_digest;
-}
+}
\ No newline at end of file
diff --git a/src/shared/Auth/HMACSHA1.h b/src/shared/Auth/HMACSHA1.h
index f292dd17a..93e9f9acf 100644
--- a/src/shared/Auth/HMACSHA1.h
+++ b/src/shared/Auth/HMACSHA1.h
@@ -1,4 +1,4 @@
-/*
+/**
  * MaNGOS is a full featured server for World of Warcraft, supporting
  * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
  *
@@ -25,7 +25,7 @@
 #ifndef _AUTH_HMACSHA1_H
 #define _AUTH_HMACSHA1_H
 
-#include "Common.h"
+#include "Common/Common.h"
 #include <openssl/hmac.h>
 #include <openssl/sha.h>
 
@@ -35,18 +35,18 @@ class BigNumber;
 
 class HMACSHA1
 {
-    public:
-        HMACSHA1(uint32 len, uint8* seed);
-        ~HMACSHA1();
-        void UpdateBigNumber(BigNumber* bn);
-        void UpdateData(const uint8* data, int length);
-        void UpdateData(const std::string& str);
-        void Finalize();
-        uint8* ComputeHash(BigNumber* bn);
-        uint8* GetDigest() { return (uint8*)m_digest; }
-        int GetLength() { return SHA_DIGEST_LENGTH; }
-    private:
-        HMAC_CTX m_ctx;
-        uint8 m_digest[SHA_DIGEST_LENGTH];
+public:
+    HMACSHA1(uint32 len, uint8 *seed);
+    ~HMACSHA1();
+    void UpdateBigNumber(BigNumber *bn);
+    void UpdateData(const uint8 *data, int length);
+    void UpdateData(const std::string &str);
+    void Finalize();
+    uint8 *ComputeHash(BigNumber *bn);
+    uint8 *GetDigest() { return (uint8*)m_digest; }
+    int GetLength() { return SHA_DIGEST_LENGTH; }
+private:
+    HMAC_CTX m_ctx;
+    uint8 m_digest[SHA_DIGEST_LENGTH];
 };
-#endif
+#endif
\ No newline at end of file
diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h
index 1fdb8ef42..a773cbbd2 100644
--- a/src/shared/Auth/Sha1.h
+++ b/src/shared/Auth/Sha1.h
@@ -25,31 +25,77 @@
 #ifndef _AUTH_SHA1_H
 #define _AUTH_SHA1_H
 
-#include "Common.h"
+#include "Common/Common.h"
 #include <openssl/sha.h>
 #include <openssl/crypto.h>
 
 class BigNumber;
 
+/**
+ * @brief
+ *
+ */
 class Sha1Hash
 {
     public:
+        /**
+         * @brief
+         *
+         */
         Sha1Hash();
+        /**
+         * @brief
+         *
+         */
         ~Sha1Hash();
 
+        /**
+         * @brief
+         *
+         * @param bn0...
+         */
         void UpdateBigNumbers(BigNumber* bn0, ...);
 
+        /**
+         * @brief
+         *
+         * @param dta
+         * @param len
+         */
         void UpdateData(const uint8* dta, int len);
+        /**
+         * @brief
+         *
+         * @param str
+         */
         void UpdateData(const std::string& str);
 
+        /**
+         * @brief
+         *
+         */
         void Initialize();
+        /**
+         * @brief
+         *
+         */
         void Finalize();
 
+        /**
+         * @brief
+         *
+         * @return uint8
+         */
         uint8* GetDigest(void) { return mDigest; };
+        /**
+         * @brief
+         *
+         * @return int
+         */
         int GetLength(void) { return SHA_DIGEST_LENGTH; };
 
     private:
-        SHA_CTX mC;
-        uint8 mDigest[SHA_DIGEST_LENGTH];
+        SHA_CTX mC; /**< TODO */
+        uint8 mDigest[SHA_DIGEST_LENGTH]; /**< TODO */
 };
 #endif
diff --git a/src/shared/Auth/WardenKeyGeneration.h b/src/shared/Auth/WardenKeyGeneration.h
new file mode 100644
index 000000000..b87fdb237
--- /dev/null
+++ b/src/shared/Auth/WardenKeyGeneration.h
@@ -0,0 +1,86 @@
+/**
+ * MaNGOS is a full featured server for World of Warcraft, supporting
+ * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+ *
+ * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+ * Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include "Auth/Sha1.h"
+
+#ifndef _WARDEN_KEY_GENERATION_H
+#define _WARDEN_KEY_GENERATION_H
+
+class SHA1Randx
+{
+public:
+    SHA1Randx(uint8* buff, uint32 size)
+    {
+        uint32 taken = size/2;
+
+        sh.Initialize();
+        sh.UpdateData(buff, taken);
+        sh.Finalize();
+
+        memcpy(o1, sh.GetDigest(), 20);
+
+        sh.Initialize();
+        sh.UpdateData(buff + taken, size - taken);
+        sh.Finalize();
+
+        memcpy(o2, sh.GetDigest(), 20);
+
+        memset(o0, 0x00, 20);
+
+        FillUp();
+    }
+
+    void Generate(uint8* buf, uint32 sz)
+    {
+        for (uint32 i = 0; i < sz; ++i)
+        {
+            if (taken == 20)
+                FillUp();
+
+            buf[i] = o0[taken];
+            taken++;
+        }
+    }
+
+private:
+    void FillUp()
+    {
+        sh.Initialize();
+        sh.UpdateData(o1, 20);
+        sh.UpdateData(o0, 20);
+        sh.UpdateData(o2, 20);
+        sh.Finalize();
+
+        memcpy(o0, sh.GetDigest(), 20);
+
+        taken = 0;
+    }
+
+    Sha1Hash sh;
+    uint32 taken;
+    uint8 o0[20], o1[20], o2[20];
+};
+
+#endif
diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index f7bfb5b7d..18a57d7fb 100644
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -1,6 +1,7 @@
-# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
 #
-# ***** BEGIN GPL LICENSE BLOCK *****
+# Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,170 +16,83 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# ***** END GPL LICENSE BLOCK *****
-#
-# World of Warcraft, and all World of Warcraft or Warcraft art, images,
-# and lore are copyrighted by Blizzard Entertainment, Inc.
 
 set(LIBRARY_NAME shared)
 
-set(SRC_GRP_AUTH
-    Auth/AuthCrypt.cpp
-    Auth/AuthCrypt.h
-    Auth/BigNumber.cpp
-    Auth/BigNumber.h
-    Auth/HMACSHA1.cpp
-    Auth/HMACSHA1.h
-    Auth/md5.h
-    Auth/SARC4.cpp
-    Auth/SARC4.h
-    Auth/Sha1.cpp
-    Auth/Sha1.h
-)
+file(GLOB SRC_GRP_AUTH Auth/*.cpp Auth/*.h)
+source_group("Auth" FILES ${SRC_GRP_AUTH})
 
-set(SRC_GRP_CONFIG
-    Config/Config.cpp
-    Config/Config.h
-)
+file(GLOB SRC_GRP_COMMON Common/*.cpp Common/*.h)
+source_group("Common" FILES ${SRC_GRP_COMMON})
 
-set(SRC_GRP_DATABASE
-    Database/Database.cpp
-    Database/Database.h
-    Database/DatabaseEnv.h
-    Database/DatabaseImpl.h
-    Database/DatabaseMysql.cpp
-    Database/DatabaseMysql.h
-    Database/DatabasePostgre.cpp
-    Database/DatabasePostgre.h
-    Database/Field.cpp
-    Database/Field.h
-    Database/PGSQLDelayThread.h
-    Database/QueryResult.h
-    Database/QueryResultMysql.cpp
-    Database/QueryResultMysql.h
-    Database/QueryResultPostgre.cpp
-    Database/QueryResultPostgre.h
-    Database/SqlDelayThread.cpp
-    Database/SqlDelayThread.h
-    Database/SqlOperations.cpp
-    Database/SqlOperations.h
-    Database/SqlPreparedStatement.cpp
-    Database/SqlPreparedStatement.h
-    Database/SQLStorage.cpp
-    Database/SQLStorage.h
-    Database/SQLStorageImpl.h
-)
+file(GLOB SRC_GRP_CONFIG Config/*.cpp Config/*.h)
+source_group("Config" FILES ${SRC_GRP_CONFIG})
 
-set(SRC_GRP_DATABASE_DBC
-    Database/DB2FileLoader.cpp
-    Database/DB2FileLoader.h
-    Database/DB2Store.h
-    Database/DBCFileLoader.cpp
-    Database/DBCFileLoader.h
-    Database/DBCStore.h
-)
+file(GLOB SRC_GRP_DATABASE Database/*.cpp Database/*.h)
+source_group("Database" FILES ${SRC_GRP_DATABASE})
 
-set(SRC_GRP_LOG
-    Log.cpp
-    Log.h
-)
+file(GLOB SRC_GRP_DATASTORE DataStores/*.cpp DataStores/*.h)
+source_group("DataStores" FILES ${SRC_GRP_DATASTORE})
 
-set(SRC_GRP_UTIL
-    ByteBuffer.cpp
-    ByteBuffer.h
-    Errors.h
-    # dep/include/mersennetwister/MersenneTwister.h is part of this group in the VC 2012 file but it is not part of src/shared, so it is omitted here
-    ProgressBar.cpp
-    ProgressBar.h
-    Timer.h
-    Util.cpp
-    Util.h
-    WorldPacket.h
-)
+file(GLOB SRC_GRP_LOCKQ LockedQueue/*.cpp LockedQueue/*.h)
+source_group("LockedQueue" FILES ${SRC_GRP_LOCKQ})
 
+file(GLOB SRC_GRP_LOG Log/*.cpp Log/*.h)
+source_group("Log" FILES ${SRC_GRP_LOG})
+
+file(GLOB SRC_GRP_THREAD Threading/*.cpp Threading/*.h)
+source_group("Threading" FILES ${SRC_GRP_THREAD})
+
+file(GLOB SRC_GRP_UTIL Utilities/*.cpp Utilities/*.h)
+source_group("Utilities" FILES ${SRC_GRP_UTIL})
 
 set(LIBRARY_SRCS
     ${SRC_GRP_AUTH}
+    ${SRC_GRP_COMMON}
     ${SRC_GRP_CONFIG}
     ${SRC_GRP_DATABASE}
-    ${SRC_GRP_DATABASE_DBC}
+    ${SRC_GRP_DATASTORE}
+    ${SRC_GRP_LOCKQ}
     ${SRC_GRP_LOG}
+    ${SRC_GRP_THREAD}
     ${SRC_GRP_UTIL}
-    Common.cpp
-    Common.h
-    LockedQueue.h
-    revision_nr.h
-    revision_sql.h
-    SystemConfig.h
-    Threading.cpp
-    Threading.h
-)
-
-
-source_group("Auth"
-  FILES
-    ${SRC_GRP_AUTH}
-)
-
-source_group("Config"
-  FILES
-    ${SRC_GRP_CONFIG}
-)
-
-source_group("Database"
-  FILES
-    ${SRC_GRP_DATABASE}
-)
-
-source_group("Database\\DataStores"
-  FILES
-    ${SRC_GRP_DATABASE_DBC}
-)
-
-source_group("Log"
-  FILES
-    ${SRC_GRP_LOG}
-)
-
-source_group("Util"
-  FILES
-    ${SRC_GRP_UTIL}
+    revision.h
 )
 
 # OS specific files
 if(WIN32)
-  set(LIBRARY_SRCS
-      ${LIBRARY_SRCS}
-      WheatyExceptionReport.cpp
-      WheatyExceptionReport.h
-      ServiceWin32.cpp
-      ServiceWin32.h
-     )
+    file(GLOB SRC_GRP_WIN Win/*.cpp Win/*.h)
+    LIST(APPEND LIBRARY_SRCS ${SRC_GRP_WIN})
 else()
-  set(LIBRARY_SRCS
-      ${LIBRARY_SRCS}
-      PosixDaemon.cpp
-      PosixDaemon.h
-     )
+    file(GLOB SRC_GRP_LINUX Linux/*.cpp Linux/*.h)
+    LIST(APPEND LIBRARY_SRCS ${SRC_GRP_LINUX})
 endif()
 
 include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/dep/include
-  ${CMAKE_SOURCE_DIR}/src/framework
-  ${CMAKE_BINARY_DIR}
-  ${ACE_INCLUDE_DIR}
-  ${MYSQL_INCLUDE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/dep
+    ${CMAKE_SOURCE_DIR}/src/framework
+    ${CMAKE_BINARY_DIR}
+    ${ACE_INCLUDE_DIR}
+    ${OPENSSL_INCLUDE_DIR}
 )
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/SystemConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/SystemConfig.h)
+if(POSTGRESQL)
+    include_directories(${PostgreSQL_INCLUDE_DIRS})
+else()
+    include_directories(${MYSQL_INCLUDE_DIR})
+endif()
 
-add_library(${LIBRARY_NAME} STATIC
-  ${LIBRARY_SRCS}
-)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/SystemConfig.h.in" "${CMAKE_CURRENT_BINARY_DIR}/SystemConfig.h")
+
+add_library(${LIBRARY_NAME} STATIC ${LIBRARY_SRCS})
+
+if(POSTGRESQL)
+    target_link_libraries(${LIBRARY_NAME} ${PostgreSQL_LIBRARIES})
+else()
+    target_link_libraries(${LIBRARY_NAME} ${MYSQL_LIBRARY})
+endif()
 
-add_dependencies(${LIBRARY_NAME} revision.h)
 if(NOT ACE_USE_EXTERNAL)
-  add_dependencies(${LIBRARY_NAME} ACE_Project)
+    add_dependencies(${LIBRARY_NAME} ace)
 endif()
\ No newline at end of file
diff --git a/src/shared/Common.cpp b/src/shared/Common/Common.cpp
similarity index 100%
rename from src/shared/Common.cpp
rename to src/shared/Common/Common.cpp
diff --git a/src/shared/Common.h b/src/shared/Common/Common.h
similarity index 97%
rename from src/shared/Common.h
rename to src/shared/Common/Common.h
index 050cbcc87..1d8073ef9 100644
--- a/src/shared/Common.h
+++ b/src/shared/Common/Common.h
@@ -48,7 +48,6 @@
 #ifdef VERSION
 #undef VERSION
 #endif // VERSION
-//# include "config.h"
 #undef PACKAGE
 #undef PACKAGE_BUGREPORT
 #undef PACKAGE_NAME
@@ -90,9 +89,9 @@
 #include <sstream>
 #include <algorithm>
 
-#include "Errors.h"
-#include "LockedQueue.h"
-#include "Threading.h"
+#include "Utilities/Errors.h"
+#include "LockedQueue/LockedQueue.h"
+#include "Threading/Threading.h"
 
 #include <ace/Basic_Types.h>
 #include <ace/Guard_T.h>
@@ -242,6 +241,7 @@ enum LocaleConstant
 };
 
 #define MAX_LOCALE 9
+#define DEFAULT_LOCALE LOCALE_enUS
 
 /**
  * @brief
@@ -251,6 +251,7 @@ enum LocaleConstant
  */
 LocaleConstant GetLocaleByName(const std::string& name);
 
+typedef std::vector<std::string> StringVector;
 
 extern char const* localeNames[MAX_LOCALE]; /**< TODO */
 
diff --git a/src/shared/Config/Config.cpp b/src/shared/Config/Config.cpp
index cc4991fe5..91bfee482 100644
--- a/src/shared/Config/Config.cpp
+++ b/src/shared/Config/Config.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "Config.h"
-#include "ace/Configuration_Import_Export.h"
+#include <ace/Configuration_Import_Export.h>
 
 #include "Policies/Singleton.h"
 
@@ -32,7 +32,7 @@ INSTANTIATE_SINGLETON_1(Config);
 static bool GetValueHelper(ACE_Configuration_Heap* mConf, const char* name, ACE_TString& result)
 {
     if (!mConf)
-        return false;
+        { return false; }
 
     ACE_TString section_name;
     ACE_Configuration_Section_Key section_key;
@@ -43,7 +43,7 @@ static bool GetValueHelper(ACE_Configuration_Heap* mConf, const char* name, ACE_
     {
         mConf->open_section(root_key, section_name.c_str(), 0, section_key);
         if (mConf->get_string_value(section_key, name, result) == 0)
-            return true;
+            { return true; }
         ++i;
     }
 
@@ -76,7 +76,7 @@ bool Config::Reload()
     {
         ACE_Ini_ImpExp config_importer(*mConf);
         if (config_importer.import_config(mFilename.c_str()) == 0)
-            return true;
+            { return true; }
     }
 
     delete mConf;
@@ -94,15 +94,15 @@ bool Config::GetBoolDefault(const char* name, bool def)
 {
     ACE_TString val;
     if (!GetValueHelper(mConf, name, val))
-        return def;
+        { return def; }
 
     const char* str = val.c_str();
     if (strcmp(str, "true") == 0 || strcmp(str, "TRUE") == 0 ||
-            strcmp(str, "yes") == 0 || strcmp(str, "YES") == 0 ||
-            strcmp(str, "1") == 0)
-        return true;
+        strcmp(str, "yes") == 0 || strcmp(str, "YES") == 0 ||
+        strcmp(str, "1") == 0)
+        { return true; }
     else
-        return false;
+        { return false; }
 }
 
 int32 Config::GetIntDefault(const char* name, int32 def)
diff --git a/src/shared/Config/Config.h b/src/shared/Config/Config.h
index 2e38e9b5d..286844b20 100644
--- a/src/shared/Config/Config.h
+++ b/src/shared/Config/Config.h
@@ -25,34 +25,89 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include "Common.h"
+#include "Common/Common.h"
 #include <Policies/Singleton.h>
 #include "Platform/Define.h"
 
 class ACE_Configuration_Heap;
 
-class  Config
+/**
+ * @brief
+ *
+ */
+class Config
 {
     public:
-
+        /**
+         * @brief
+         *
+         */
         Config();
+        /**
+         * @brief
+         *
+         */
         ~Config();
 
+        /**
+         * @brief
+         *
+         * @param file
+         * @return bool
+         */
         bool SetSource(const char* file);
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool Reload();
 
+        /**
+         * @brief
+         *
+         * @param name
+         * @param def
+         * @return std::string
+         */
         std::string GetStringDefault(const char* name, const char* def);
+        /**
+         * @brief
+         *
+         * @param name
+         * @param def
+         * @return bool
+         */
         bool GetBoolDefault(const char* name, const bool def = false);
+        /**
+         * @brief
+         *
+         * @param name
+         * @param def
+         * @return int32
+         */
         int32 GetIntDefault(const char* name, const int32 def);
 		int64 GetInt64Default(const char* name, const int64 def);
+        /**
+         * @brief
+         *
+         * @param name
+         * @param def
+         * @return float
+         */
         float GetFloatDefault(const char* name, const float def);
 
+        /**
+         * @brief
+         *
+         * @return std::string
+         */
         std::string GetFilename() const { return mFilename; }
 
     private:
 
-        std::string mFilename;
-        ACE_Configuration_Heap* mConf;
+        std::string mFilename; /**< TODO */
+        ACE_Configuration_Heap* mConf; /**< TODO */
 };
 
 #define sConfig MaNGOS::Singleton<Config>::Instance()
diff --git a/src/shared/Database/DB2FileLoader.cpp b/src/shared/DataStores/DB2FileLoader.cpp
similarity index 65%
rename from src/shared/Database/DB2FileLoader.cpp
rename to src/shared/DataStores/DB2FileLoader.cpp
index 551f14e37..ba9b56213 100644
--- a/src/shared/Database/DB2FileLoader.cpp
+++ b/src/shared/DataStores/DB2FileLoader.cpp
@@ -1,4 +1,4 @@
-/*
+/**
  * MaNGOS is a full featured server for World of Warcraft, supporting
  * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
  *
@@ -25,6 +25,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include "DBCFileLoader.h"
 #include "DB2FileLoader.h"
 
 DB2FileLoader::DB2FileLoader()
@@ -42,8 +44,9 @@ bool DB2FileLoader::Load(const char *filename, const char *fmt)
         data=NULL;
     }
 
-    FILE * f = fopen(filename, "rb");
-    if(!f)return false;
+    FILE* f = fopen(filename, "rb");
+    if (!f)
+        { return false; }
 
     if(fread(&header, 4, 1, f) != 1)                        // Signature
     {
@@ -56,10 +59,10 @@ bool DB2FileLoader::Load(const char *filename, const char *fmt)
     if(header != 0x32424457)
     {
         fclose(f);
-        return false;                                       //'WDB2'
+        return false;
     }
 
-    if(fread(&recordCount,4,1,f)!=1)                        // Number of records
+    if (fread(&recordCount, 4, 1, f) != 1)                  // Number of records
     {
         fclose(f);
         return false;
@@ -67,7 +70,7 @@ bool DB2FileLoader::Load(const char *filename, const char *fmt)
 
     EndianConvert(recordCount);
 
-    if(fread(&fieldCount,4,1,f)!=1)                         // Number of fields
+    if (fread(&fieldCount, 4, 1, f) != 1)                   // Number of fields
     {
         fclose(f);
         return false;
@@ -75,7 +78,7 @@ bool DB2FileLoader::Load(const char *filename, const char *fmt)
 
     EndianConvert(fieldCount);
 
-    if(fread(&recordSize,4,1,f)!=1)                         // Size of a record
+    if (fread(&recordSize, 4, 1, f) != 1)                   // Size of a record
     {
         fclose(f);
         return false;
@@ -83,7 +86,7 @@ bool DB2FileLoader::Load(const char *filename, const char *fmt)
 
     EndianConvert(recordSize);
 
-    if(fread(&stringSize,4,1,f)!=1)                         // String size
+    if (fread(&stringSize, 4, 1, f) != 1)                   // String size
     {
         fclose(f);
         return false;
@@ -150,19 +153,19 @@ bool DB2FileLoader::Load(const char *filename, const char *fmt)
 
     fieldsOffset = new uint32[fieldCount];
     fieldsOffset[0] = 0;
-    for(uint32 i = 1; i < fieldCount; i++)
+    for (uint32 i = 1; i < fieldCount; ++i)
     {
         fieldsOffset[i] = fieldsOffset[i - 1];
         if (fmt[i - 1] == 'b' || fmt[i - 1] == 'X')         // byte fields
-            fieldsOffset[i] += 1;
+            { fieldsOffset[i] += 1; }
         else                                                // 4 byte fields (int32/float/strings)
-            fieldsOffset[i] += 4;
+            { fieldsOffset[i] += 4; }
     }
 
-    data = new unsigned char[recordSize*recordCount+stringSize];
-    stringTable = data + recordSize*recordCount;
+    data = new unsigned char[recordSize * recordCount + stringSize];
+    stringTable = data + recordSize * recordCount;
 
-    if(fread(data, recordSize * recordCount + stringSize, 1, f) != 1)
+    if (fread(data, recordSize * recordCount + stringSize, 1, f) != 1)
     {
         fclose(f);
         return false;
@@ -183,50 +186,50 @@ DB2FileLoader::~DB2FileLoader()
 DB2FileLoader::Record DB2FileLoader::getRecord(size_t id)
 {
     assert(data);
-    return Record(*this, data + id*recordSize);
+    return Record(*this, data + id * recordSize);
 }
 
 uint32 DB2FileLoader::GetFormatRecordSize(const char * format,int32* index_pos)
 {
     uint32 recordsize = 0;
     int32 i = -1;
-    for(uint32 x = 0; format[x]; ++ x)
+    for (uint32 x = 0; format[x]; ++ x)
     {
-        switch(format[x])
+        switch (format[x])
         {
-            case FT_FLOAT:
+            case DBC_FF_FLOAT:
                 recordsize += sizeof(float);
                 break;
-            case FT_INT:
+            case DBC_FF_INT:
                 recordsize += sizeof(uint32);
                 break;
-            case FT_STRING:
+            case DBC_FF_STRING:
                 recordsize += sizeof(char*);
                 break;
-            case FT_SORT:
-                i=x;
+            case DBC_FF_SORT:
+                i = x;
                 break;
-            case FT_IND:
-                i=x;
+            case DBC_FF_IND:
+                i = x;
                 recordsize += sizeof(uint32);
                 break;
-            case FT_BYTE:
+            case DBC_FF_BYTE:
                 recordsize += sizeof(uint8);
                 break;
-            case FT_LOGIC:
+            case DBC_FF_LOGIC:
                 assert(false && "2 files not have logic field type");
                 break;
-            case FT_NA:
-            case FT_NA_BYTE:
+            case DBC_FF_NA:
+            case DBC_FF_NA_BYTE:
                 break;
             default:
-                assert(false && "unknown format character");
+                assert(false && "Unknown field format character in DBCfmt.h");
                 break;
         }
     }
 
     if (index_pos)
-        *index_pos = i;
+        { *index_pos = i; }
 
     return recordsize;
 }
@@ -235,7 +238,7 @@ uint32 DB2FileLoader::GetFormatStringsFields(const char * format)
 {
     uint32 stringfields = 0;
     for(uint32 x=0; format[x];++x)
-        if (format[x] == FT_STRING)
+        if (format[x] == DBC_FF_STRING)
             ++stringfields;
 
     return stringfields;
@@ -254,28 +257,29 @@ char* DB2FileLoader::AutoProduceData(const char* format, uint32& records, char**
     this func will generate  entry[rows] data;
     */
 
-    typedef char * ptr;
-    if(strlen(format)!=fieldCount)
-        return NULL;
+    typedef char* ptr;
+    if (strlen(format) != fieldCount)
+        { return NULL; }
 
-    //get struct size and index pos
+    // get struct size and index pos
     int32 i;
-    uint32 recordsize=GetFormatRecordSize(format,&i);
+    uint32 recordsize = GetFormatRecordSize(format, &i);
 
-    if(i>=0)
+    if (i >= 0)
     {
-        uint32 maxi=0;
-        //find max index
-        for(uint32 y=0;y<recordCount;y++)
+        uint32 maxi = 0;
+        // find max index
+        for (uint32 y = 0; y < recordCount; ++y)
         {
-            uint32 ind=getRecord(y).getUInt (i);
-            if(ind>maxi)maxi=ind;
+            uint32 ind = getRecord(y).getUInt(i);
+            if (ind > maxi)
+                { maxi = ind; }
         }
 
         ++maxi;
-        records=maxi;
-        indexTable=new ptr[maxi];
-        memset(indexTable,0,maxi*sizeof(ptr));
+        records = maxi;
+        indexTable = new ptr[maxi];
+        memset(indexTable, 0, maxi * sizeof(ptr));
     }
     else
     {
@@ -283,49 +287,49 @@ char* DB2FileLoader::AutoProduceData(const char* format, uint32& records, char**
         indexTable = new ptr[recordCount];
     }
 
-    char* dataTable= new char[recordCount*recordsize];
+    char* dataTable = new char[recordCount * recordsize];
 
-    uint32 offset=0;
+    uint32 offset = 0;
 
-    for(uint32 y =0; y < recordCount; ++y)
+    for (uint32 y = 0; y < recordCount; ++y)
     {
         if (i >= 0)
         {
-            indexTable[getRecord(y).getUInt(i)]=&dataTable[offset];
+            indexTable[getRecord(y).getUInt(i)] = &dataTable[offset];
         }
         else
-            indexTable[y]=&dataTable[offset];
+            { indexTable[y] = &dataTable[offset]; }
 
-        for(uint32 x = 0; x < fieldCount; ++x)
+        for (uint32 x = 0; x < fieldCount; ++x)
         {
-            switch(format[x])
+            switch (format[x])
             {
-                case FT_FLOAT:
-                    *((float*)(&dataTable[offset]))=getRecord(y).getFloat(x);
+                case DBC_FF_FLOAT:
+                    *((float*)(&dataTable[offset])) = getRecord(y).getFloat(x);
                     offset += sizeof(float);
                     break;
-                case FT_IND:
-                case FT_INT:
-                    *((uint32*)(&dataTable[offset]))=getRecord(y).getUInt(x);
+                case DBC_FF_IND:
+                case DBC_FF_INT:
+                    *((uint32*)(&dataTable[offset])) = getRecord(y).getUInt(x);
                     offset += sizeof(uint32);
                     break;
-                case FT_BYTE:
-                    *((uint8*)(&dataTable[offset]))=getRecord(y).getUInt8(x);
+                case DBC_FF_BYTE:
+                    *((uint8*)(&dataTable[offset])) = getRecord(y).getUInt8(x);
                     offset += sizeof(uint8);
                     break;
-                case FT_STRING:
-                    *((char**)(&dataTable[offset]))=NULL;   // will be replaces non-empty or "" strings in AutoProduceStrings
+                case DBC_FF_STRING:
+                    *((char**)(&dataTable[offset])) = NULL; // will replace non-empty or "" strings in AutoProduceStrings
                     offset += sizeof(char*);
                     break;
-                case FT_LOGIC:
-                    assert(false && "DBC files not have logic field type");
+                case DBC_FF_LOGIC:
+                    assert(false && "Attempted to load DBC files that do not have field types that match what is in the core. Check DBCfmt.h or your DBC files.");
                     break;
-                case FT_NA:
-                case FT_NA_BYTE:
-                case FT_SORT:
+                case DBC_FF_NA:
+                case DBC_FF_NA_BYTE:
+                case DBC_FF_SORT:
                     break;
                 default:
-                    assert(false && "unknown format character");
+                    assert(false && "Unknown field format character in DBCfmt.h");
                     break;
             }
         }
@@ -338,8 +342,8 @@ static char const* const nullStr = "";
 
 char* DB2FileLoader::AutoProduceStringsArrayHolders(const char* format, char* dataTable)
 {
-    if(strlen(format)!=fieldCount)
-        return NULL;
+    if (strlen(format) != fieldCount)
+        { return NULL; }
 
     // we store flat holders pool as single memory block
     size_t stringFields = GetFormatStringsFields(format);
@@ -364,15 +368,15 @@ char* DB2FileLoader::AutoProduceStringsArrayHolders(const char* format, char* da
         for(uint32 x=0;x<fieldCount;x++)
             switch(format[x])
         {
-            case FT_FLOAT:
-            case FT_IND:
-            case FT_INT:
+            case DBC_FF_FLOAT:
+            case DBC_FF_IND:
+            case DBC_FF_INT:
                 offset+=4;
                 break;
-            case FT_BYTE:
+            case DBC_FF_BYTE:
                 offset+=1;
                 break;
-            case FT_STRING:
+            case DBC_FF_STRING:
             {
                 // init dbc string field slots by pointers to string holders
                 char const*** slot = (char const***)(&dataTable[offset]);
@@ -382,9 +386,9 @@ char* DB2FileLoader::AutoProduceStringsArrayHolders(const char* format, char* da
                 offset+=sizeof(char*);
                 break;
             }
-            case FT_NA:
-            case FT_NA_BYTE:
-            case FT_SORT:
+            case DBC_FF_NA:
+            case DBC_FF_NA_BYTE:
+            case DBC_FF_SORT:
                 break;
             default:
                 assert(false && "unknown format character");
@@ -403,28 +407,28 @@ char* DB2FileLoader::AutoProduceStrings(const char* format, char* dataTable, Loc
     // each string field at load have array of string for each locale
     size_t stringHolderSize = sizeof(char*) * MAX_LOCALE;
 
-    char* stringPool= new char[stringSize];
-    memcpy(stringPool,stringTable,stringSize);
+    char* stringPool = new char[stringSize];
+    memcpy(stringPool, stringTable, stringSize);
 
-    uint32 offset=0;
+    uint32 offset = 0;
 
-    for(uint32 y =0; y < recordCount; ++y)
+    for (uint32 y = 0; y < recordCount; ++y)
     {
-        for(uint32 x = 0; x < fieldCount; ++x)
+        for (uint32 x = 0; x < fieldCount; ++x)
         {
-            switch(format[x])
+            switch (format[x])
             {
-                case FT_FLOAT:
+                case DBC_FF_FLOAT:
                     offset += sizeof(float);
                     break;
-                case FT_IND:
-                case FT_INT:
+                case DBC_FF_IND:
+                case DBC_FF_INT:
                     offset += sizeof(uint32);
                     break;
-                case FT_BYTE:
+                case DBC_FF_BYTE:
                     offset += sizeof(uint8);
                     break;
-                case FT_STRING:
+                case DBC_FF_STRING:
                 {
                     char** holder = *((char***)(&dataTable[offset]));
                     char** slot = &holder[loc];
@@ -432,22 +436,21 @@ char* DB2FileLoader::AutoProduceStrings(const char* format, char* dataTable, Loc
                     // fill only not filled entries
                     if (*slot == nullStr)
                     {
-                        const char * st = getRecord(y).getString(x);
-                        *slot=stringPool+(st-(const char*)stringTable);
+                        const char* st = getRecord(y).getString(x);
+                        *slot = stringPool + (st - (const char*)stringTable);
                     }
-
-                    offset+=sizeof(char*);
+                    offset += sizeof(char*);
                     break;
                 }
-                case FT_LOGIC:
-                    assert(false && "DBC files not have logic field type");
+                case DBC_FF_LOGIC:
+                    assert(false && "Attempted to load DBC files that does not have field types that match what is in the core. Check DBCfmt.h or your DBC files.");
                     break;
-                case FT_NA:
-                case FT_NA_BYTE:
-                case FT_SORT:
+                case DBC_FF_NA:
+                case DBC_FF_NA_BYTE:
+                case DBC_FF_SORT:
                     break;
                 default:
-                    assert(false && "unknown format character");
+                    assert(false && "Unknown field format character in DBCfmt.h");
                     break;
             }
         }
diff --git a/src/shared/Database/DB2FileLoader.h b/src/shared/DataStores/DB2FileLoader.h
similarity index 75%
rename from src/shared/Database/DB2FileLoader.h
rename to src/shared/DataStores/DB2FileLoader.h
index 693a6e7f3..a3422280c 100644
--- a/src/shared/Database/DB2FileLoader.h
+++ b/src/shared/DataStores/DB2FileLoader.h
@@ -27,9 +27,32 @@
 
 #include "Platform/Define.h"
 #include "Utilities/ByteConverter.h"
-#include "Common.h"
+#include "Common\Common.h"
 #include <cassert>
 
+/**
+ * @brief
+ *
+ */
+//enum FieldFormat
+//{
+//    DBC_FF_NA = 'x',                                        // ignore/ default, 4 byte size, in Source String means field is ignored, in Dest String means field is filled with default value
+//    DBC_FF_NA_BYTE = 'X',                                   // ignore/ default, 1 byte size, see above
+//    DBC_FF_NA_FLOAT = 'F',                                  // ignore/ default,  float size, see above
+//    DBC_FF_NA_POINTER = 'p',                                // fill default value into dest, pointer size, Use this only with static data (otherwise mem-leak)
+//    DBC_FF_STRING = 's',                                    // char*
+//    DBC_FF_FLOAT = 'f',                                     // float
+//    DBC_FF_INT = 'i',                                       // uint32
+//    DBC_FF_BYTE = 'b',                                      // uint8
+//    DBC_FF_SORT = 'd',                                      // sorted by this field, field is not included
+//    DBC_FF_IND = 'n',                                       // the same,but parsed to data
+//    DBC_FF_LOGIC = 'l'                                      // Logical (boolean)
+//};
+
+/**
+ * @brief
+ *
+ */
 class DB2FileLoader
 {
     public:
diff --git a/src/shared/Database/DB2Store.h b/src/shared/DataStores/DB2Store.h
similarity index 100%
rename from src/shared/Database/DB2Store.h
rename to src/shared/DataStores/DB2Store.h
diff --git a/src/shared/Database/DBCFileLoader.cpp b/src/shared/DataStores/DBCFileLoader.cpp
similarity index 77%
rename from src/shared/Database/DBCFileLoader.cpp
rename to src/shared/DataStores/DBCFileLoader.cpp
index 5bdd17f7e..373ab4340 100644
--- a/src/shared/Database/DBCFileLoader.cpp
+++ b/src/shared/DataStores/DBCFileLoader.cpp
@@ -40,32 +40,52 @@ bool DBCFileLoader::Load(const char* filename, const char* fmt)
     delete[] data;
 
     FILE* f = fopen(filename, "rb");
-    if (!f)return false;
+    if (!f)
+        { return false; }
 
     if (fread(&header, 4, 1, f) != 1)                       // Number of records
+    {
+        fclose(f);
         return false;
+    }
 
     EndianConvert(header);
-    if (header != 0x43424457)
-        return false;                                       //'WDBC'
+
+    if (header != 0x43424457)                               //'WDBC'
+    {
+        fclose(f);
+        return false;
+    }
 
     if (fread(&recordCount, 4, 1, f) != 1)                  // Number of records
+    {
+        fclose(f);
         return false;
+    }
 
     EndianConvert(recordCount);
 
     if (fread(&fieldCount, 4, 1, f) != 1)                   // Number of fields
+    {
+        fclose(f);
         return false;
+    }
 
     EndianConvert(fieldCount);
 
     if (fread(&recordSize, 4, 1, f) != 1)                   // Size of a record
+    {
+        fclose(f);
         return false;
+    }
 
     EndianConvert(recordSize);
 
     if (fread(&stringSize, 4, 1, f) != 1)                   // String size
+    {
+        fclose(f);
         return false;
+    }
 
     EndianConvert(stringSize);
 
@@ -75,16 +95,19 @@ bool DBCFileLoader::Load(const char* filename, const char* fmt)
     {
         fieldsOffset[i] = fieldsOffset[i - 1];
         if (fmt[i - 1] == 'b' || fmt[i - 1] == 'X')         // byte fields
-            fieldsOffset[i] += 1;
+            { fieldsOffset[i] += 1; }
         else                                                // 4 byte fields (int32/float/strings)
-            fieldsOffset[i] += 4;
+            { fieldsOffset[i] += 4; }
     }
 
     data = new unsigned char[recordSize * recordCount + stringSize];
     stringTable = data + recordSize * recordCount;
 
     if (fread(data, recordSize * recordCount + stringSize, 1, f) != 1)
+    {
+        fclose(f);
         return false;
+    }
 
     fclose(f);
     return true;
@@ -110,39 +133,39 @@ uint32 DBCFileLoader::GetFormatRecordSize(const char* format, int32* index_pos)
     {
         switch (format[x])
         {
-            case FT_FLOAT:
+            case DBC_FF_FLOAT:
                 recordsize += sizeof(float);
                 break;
-            case FT_INT:
+            case DBC_FF_INT:
                 recordsize += sizeof(uint32);
                 break;
-            case FT_STRING:
+            case DBC_FF_STRING:
                 recordsize += sizeof(char*);
                 break;
-            case FT_SORT:
+            case DBC_FF_SORT:
                 i = x;
                 break;
-            case FT_IND:
+            case DBC_FF_IND:
                 i = x;
                 recordsize += sizeof(uint32);
                 break;
-            case FT_BYTE:
+            case DBC_FF_BYTE:
                 recordsize += sizeof(uint8);
                 break;
-            case FT_LOGIC:
-                assert(false && "DBC files not have logic field type");
+            case DBC_FF_LOGIC:
+                assert(false && "Attempted to load DBC files that do not have field types that match what is in the core. Check DBCfmt.h or your DBC files.");
                 break;
-            case FT_NA:
-            case FT_NA_BYTE:
+            case DBC_FF_NA:
+            case DBC_FF_NA_BYTE:
                 break;
             default:
-                assert(false && "unknown format character");
+                assert(false && "Unknown field format character in DBCfmt.h");
                 break;
         }
     }
 
     if (index_pos)
-        *index_pos = i;
+        { *index_pos = i; }
 
     return recordsize;
 }
@@ -151,7 +174,7 @@ uint32 DBCFileLoader::GetFormatStringsFields(const char * format)
 {
     uint32 stringfields = 0;
     for(uint32 x=0; format[x];++x)
-        if (format[x] == FT_STRING)
+        if (format[x] == DBC_FF_STRING)
             ++stringfields;
 
     return stringfields;
@@ -172,7 +195,7 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
 
     typedef char* ptr;
     if (strlen(format) != fieldCount)
-        return NULL;
+        { return NULL; }
 
     // get struct size and index pos
     int32 i;
@@ -185,7 +208,8 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
         for (uint32 y = 0; y < recordCount; ++y)
         {
             uint32 ind = getRecord(y).getUInt(i);
-            if (ind > maxi)maxi = ind;
+            if (ind > maxi)
+                { maxi = ind; }
         }
 
         ++maxi;
@@ -210,38 +234,38 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
             indexTable[getRecord(y).getUInt(i)] = &dataTable[offset];
         }
         else
-            indexTable[y] = &dataTable[offset];
+            { indexTable[y] = &dataTable[offset]; }
 
         for (uint32 x = 0; x < fieldCount; ++x)
         {
             switch (format[x])
             {
-                case FT_FLOAT:
+                case DBC_FF_FLOAT:
                     *((float*)(&dataTable[offset])) = getRecord(y).getFloat(x);
                     offset += sizeof(float);
                     break;
-                case FT_IND:
-                case FT_INT:
+                case DBC_FF_IND:
+                case DBC_FF_INT:
                     *((uint32*)(&dataTable[offset])) = getRecord(y).getUInt(x);
                     offset += sizeof(uint32);
                     break;
-                case FT_BYTE:
+                case DBC_FF_BYTE:
                     *((uint8*)(&dataTable[offset])) = getRecord(y).getUInt8(x);
                     offset += sizeof(uint8);
                     break;
-                case FT_STRING:
-                    *((char**)(&dataTable[offset])) = NULL; // will be replaces non-empty or "" strings in AutoProduceStrings
+                case DBC_FF_STRING:
+                    *((char**)(&dataTable[offset])) = NULL; // will replace non-empty or "" strings in AutoProduceStrings
                     offset += sizeof(char*);
                     break;
-                case FT_LOGIC:
-                    assert(false && "DBC files not have logic field type");
+                case DBC_FF_LOGIC:
+                    assert(false && "Attempted to load DBC files that do not have field types that match what is in the core. Check DBCfmt.h or your DBC files.");
                     break;
-                case FT_NA:
-                case FT_NA_BYTE:
-                case FT_SORT:
+                case DBC_FF_NA:
+                case DBC_FF_NA_BYTE:
+                case DBC_FF_SORT:
                     break;
                 default:
-                    assert(false && "unknown format character");
+                    assert(false && "Unknown field format character in DBCfmt.h");
                     break;
             }
         }
@@ -280,15 +304,15 @@ char* DBCFileLoader::AutoProduceStringsArrayHolders(const char* format, char* da
         for(uint32 x=0;x<fieldCount;x++)
             switch(format[x])
         {
-            case FT_FLOAT:
-            case FT_IND:
-            case FT_INT:
+            case DBC_FF_FLOAT:
+            case DBC_FF_IND:
+            case DBC_FF_INT:
                 offset+=4;
                 break;
-            case FT_BYTE:
+            case DBC_FF_BYTE:
                 offset+=1;
                 break;
-            case FT_STRING:
+            case DBC_FF_STRING:
             {
                 // init dbc string field slots by pointers to string holders
                 char const*** slot = (char const***)(&dataTable[offset]);
@@ -298,9 +322,9 @@ char* DBCFileLoader::AutoProduceStringsArrayHolders(const char* format, char* da
                 offset+=sizeof(char*);
                 break;
             }
-            case FT_NA:
-            case FT_NA_BYTE:
-            case FT_SORT:
+            case DBC_FF_NA:
+            case DBC_FF_NA_BYTE:
+            case DBC_FF_SORT:
                 break;
             default:
                 assert(false && "unknown format character");
@@ -314,7 +338,7 @@ char* DBCFileLoader::AutoProduceStringsArrayHolders(const char* format, char* da
 char* DBCFileLoader::AutoProduceStrings(const char* format, char* dataTable, LocaleConstant loc)
 {
     if (strlen(format) != fieldCount)
-        return NULL;
+        { return NULL; }
 
     // each string field at load have array of string for each locale
     size_t stringHolderSize = sizeof(char*) * MAX_LOCALE;
@@ -330,17 +354,17 @@ char* DBCFileLoader::AutoProduceStrings(const char* format, char* dataTable, Loc
         {
             switch (format[x])
             {
-                case FT_FLOAT:
+                case DBC_FF_FLOAT:
                     offset += sizeof(float);
                     break;
-                case FT_IND:
-                case FT_INT:
+                case DBC_FF_IND:
+                case DBC_FF_INT:
                     offset += sizeof(uint32);
                     break;
-                case FT_BYTE:
+                case DBC_FF_BYTE:
                     offset += sizeof(uint8);
                     break;
-                case FT_STRING:
+                case DBC_FF_STRING:
                 {
                     char** holder = *((char***)(&dataTable[offset]));
                     char** slot = &holder[loc];
@@ -354,15 +378,15 @@ char* DBCFileLoader::AutoProduceStrings(const char* format, char* dataTable, Loc
                     offset += sizeof(char*);
                     break;
                 }
-                case FT_LOGIC:
-                    assert(false && "DBC files not have logic field type");
+                case DBC_FF_LOGIC:
+                    assert(false && "Attempted to load DBC files that does not have field types that match what is in the core. Check DBCfmt.h or your DBC files.");
                     break;
-                case FT_NA:
-                case FT_NA_BYTE:
-                case FT_SORT:
+                case DBC_FF_NA:
+                case DBC_FF_NA_BYTE:
+                case DBC_FF_SORT:
                     break;
                 default:
-                    assert(false && "unknown format character");
+                    assert(false && "Unknown field format character in DBCfmt.h");
                     break;
             }
         }
diff --git a/src/shared/Database/DBCFileLoader.h b/src/shared/DataStores/DBCFileLoader.h
similarity index 53%
rename from src/shared/Database/DBCFileLoader.h
rename to src/shared/DataStores/DBCFileLoader.h
index c75f98b16..cdc26e1a6 100644
--- a/src/shared/Database/DBCFileLoader.h
+++ b/src/shared/DataStores/DBCFileLoader.h
@@ -24,37 +24,71 @@
 
 #ifndef DBC_FILE_LOADER_H
 #define DBC_FILE_LOADER_H
+
 #include "Platform/Define.h"
 #include "Utilities/ByteConverter.h"
-#include "Common.h"
 #include <cassert>
+#include "Common\Common.h"
 
-/*enum FieldFormat
+/**
+ * @brief
+ *
+ */
+enum FieldFormat
 {
-    FT_NA = 'x',                                            // ignore/ default, 4 byte size, in Source String means field is ignored, in Dest String means field is filled with default value
-    FT_NA_BYTE = 'X',                                       // ignore/ default, 1 byte size, see above
-    FT_NA_FLOAT = 'F',                                      // ignore/ default,  float size, see above
-    FT_NA_POINTER = 'p',                                    // fill default value into dest, pointer size, Use this only with static data (otherwise mem-leak)
-    FT_STRING = 's',                                        // char*
-    FT_FLOAT = 'f',                                         // float
-    FT_INT = 'i',                                           // uint32
-    FT_BYTE = 'b',                                          // uint8
-    FT_SORT = 'd',                                          // sorted by this field, field is not included
-    FT_IND = 'n',                                           // the same,but parsed to data
-    FT_LOGIC = 'l'                                          // Logical (boolean)
-};*/
+    DBC_FF_NA = 'x',                                        // ignore/ default, 4 byte size, in Source String means field is ignored, in Dest String means field is filled with default value
+    DBC_FF_NA_BYTE = 'X',                                   // ignore/ default, 1 byte size, see above
+    DBC_FF_NA_FLOAT = 'F',                                  // ignore/ default,  float size, see above
+    DBC_FF_NA_POINTER = 'p',                                // fill default value into dest, pointer size, Use this only with static data (otherwise mem-leak)
+    DBC_FF_STRING = 's',                                    // char*
+    DBC_FF_FLOAT = 'f',                                     // float
+    DBC_FF_INT = 'i',                                       // uint32
+    DBC_FF_BYTE = 'b',                                      // uint8
+    DBC_FF_SORT = 'd',                                      // sorted by this field, field is not included
+    DBC_FF_IND = 'n',                                       // the same,but parsed to data
+    DBC_FF_LOGIC = 'l'                                          // Logical (boolean)
+};
 
+/**
+ * @brief
+ *
+ */
 class DBCFileLoader
 {
     public:
+        /**
+         * @brief
+         *
+         */
         DBCFileLoader();
+        /**
+         * @brief
+         *
+         */
         ~DBCFileLoader();
 
+        /**
+         * @brief
+         *
+         * @param filename
+         * @param fmt
+         * @return bool
+         */
         bool Load(const char* filename, const char* fmt);
 
+        /**
+         * @brief
+         *
+         */
         class Record
         {
             public:
+                /**
+                 * @brief
+                 *
+                 * @param field
+                 * @return float
+                 */
                 float getFloat(size_t field) const
                 {
                     assert(field < file.fieldCount);
@@ -62,6 +96,12 @@ class DBCFileLoader
                     EndianConvert(val);
                     return val;
                 }
+                /**
+                 * @brief
+                 *
+                 * @param field
+                 * @return uint32
+                 */
                 uint32 getUInt(size_t field) const
                 {
                     assert(field < file.fieldCount);
@@ -69,12 +109,24 @@ class DBCFileLoader
                     EndianConvert(val);
                     return val;
                 }
+                /**
+                 * @brief
+                 *
+                 * @param field
+                 * @return uint8
+                 */
                 uint8 getUInt8(size_t field) const
                 {
                     assert(field < file.fieldCount);
                     return *reinterpret_cast<uint8*>(offset + file.GetOffset(field));
                 }
 
+                /**
+                 * @brief
+                 *
+                 * @param field
+                 * @return const char
+                 */
                 const char* getString(size_t field) const
                 {
                     assert(field < file.fieldCount);
@@ -84,35 +136,88 @@ class DBCFileLoader
                 }
 
             private:
+                /**
+                 * @brief
+                 *
+                 * @param file_
+                 * @param offset_
+                 */
                 Record(DBCFileLoader& file_, unsigned char* offset_): offset(offset_), file(file_) {}
-                unsigned char* offset;
-                DBCFileLoader& file;
+                unsigned char* offset; /**< TODO */
+                DBCFileLoader& file; /**< TODO */
 
                 friend class DBCFileLoader;
         };
 
-        // Get record by id
+        /**
+         * @brief Get record by id
+         *
+         * @param id
+         * @return Record
+         */
         Record getRecord(size_t id);
-        /// Get begin iterator over records
 
+        /**
+         * @brief Get begin iterator over records
+         *
+         * @return uint32
+         */
         uint32 GetNumRows() const { return recordCount;}
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 GetCols() const { return fieldCount; }
+        /**
+         * @brief
+         *
+         * @param id
+         * @return uint32
+         */
         uint32 GetOffset(size_t id) const { return (fieldsOffset != NULL && id < fieldCount) ? fieldsOffset[id] : 0; }
-        bool IsLoaded() {return (data != NULL);}
+        /**
+         * @brief
+         *
+         * @return bool
+         */
+        bool IsLoaded() const {return (data != NULL);}
+        /**
+         * @brief
+         *
+         * @param fmt
+         * @param count
+         * @param indexTable
+         * @return char
+         */
         char* AutoProduceData(const char* fmt, uint32& count, char**& indexTable);
+        /**
+         * @brief
+         *
+         * @param fmt
+         * @param dataTable
+         * @return char
+         */
         char* AutoProduceStringsArrayHolders(const char* fmt, char* dataTable);
         char* AutoProduceStrings(const char* fmt, char* dataTable, LocaleConstant loc);
-        static uint32 GetFormatRecordSize(const char * format, int32 * index_pos = NULL);
+        /**
+         * @brief
+         *
+         * @param format
+         * @param index_pos
+         * @return uint32
+         */
+        static uint32 GetFormatRecordSize(const char* format, int32* index_pos = NULL);
         static uint32 GetFormatStringsFields(const char * format);
 
     private:
 
-        uint32 recordSize;
-        uint32 recordCount;
-        uint32 fieldCount;
-        uint32 stringSize;
-        uint32* fieldsOffset;
-        unsigned char* data;
-        unsigned char* stringTable;
+        uint32 recordSize; /**< TODO */
+        uint32 recordCount; /**< TODO */
+        uint32 fieldCount; /**< TODO */
+        uint32 stringSize; /**< TODO */
+        uint32* fieldsOffset; /**< TODO */
+        unsigned char* data; /**< TODO */
+        unsigned char* stringTable; /**< TODO */
 };
 #endif
diff --git a/src/shared/Database/DBCStore.h b/src/shared/DataStores/DBCStore.h
similarity index 54%
rename from src/shared/Database/DBCStore.h
rename to src/shared/DataStores/DBCStore.h
index 8a492c2ad..6659caa1c 100644
--- a/src/shared/Database/DBCStore.h
+++ b/src/shared/DataStores/DBCStore.h
@@ -28,24 +28,79 @@
 #include "DBCFileLoader.h"
 
 template<class T>
+/**
+ * @brief
+ *
+ */
 class DBCStorage
 {
+        /**
+         * @brief
+         *
+         */
         typedef std::list<char*> StringPoolList;
     public:
+        /**
+         * @brief
+         *
+         * @param f
+         */
         explicit DBCStorage(const char* f) : nCount(0), fieldCount(0), fmt(f), indexTable(NULL), m_dataTable(NULL) { }
+        /**
+         * @brief
+         *
+         */
         ~DBCStorage() { Clear(); }
 
-        T const* LookupEntry(uint32 id) const { return (id >= nCount) ? NULL : indexTable[id]; }
-        uint32  GetNumRows() const { return nCount; }
+        /**
+        * @brief
+        *
+        * @return uint32
+        */
+//        T const* LookupEntry(uint32 id) const { return (id >= nCount) ? NULL : indexTable[id]; }
+        uint32  GetNumRows() const { return loaded ? data.size() : nCount; }
+        /**
+         * @brief
+         *
+         * @return const char
+         */
         char const* GetFormat() const { return fmt; }
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 GetFieldCount() const { return fieldCount; }
 
+        /**
+        * @brief
+        *
+        * @param id
+        * @return const T
+        */
+        //T const* LookupEntry(uint32 id) const { return (id >= nCount) ? NULL : indexTable[id]; }
+        T const* LookupEntry(uint32 id) const
+        {
+            if (loaded)
+            {
+                typename std::map<uint32, T const*>::const_iterator it = data.find(id);
+                if (it != data.end())
+                    return it->second;
+            }
+            return (id >= nCount) ? NULL : indexTable[id];
+        }
+        /**
+         * @brief
+         *
+         * @param fn
+         * @return bool
+         */
         bool Load(char const* fn, LocaleConstant loc)
         {
             DBCFileLoader dbc;
             // Check if load was sucessful, only then continue
             if (!dbc.Load(fn, fmt))
-                return false;
+                { return false; }
 
             fieldCount = dbc.GetCols();
 
@@ -62,16 +117,38 @@ class DBCStorage
             return indexTable != NULL;
         }
 
+        void SetEntry(uint32 id, T* t) // Cryptic they say..
+        {
+            if (!loaded)
+            {
+                for (uint32 i = 0; i < nCount; ++i)
+                {
+                    T const* node = LookupEntry(i);
+                    if (!node)
+                        continue;
+                    data[i] = node;
+                }
+                loaded = true;
+            }
+            data[id] = t;
+        }
+
+        /**
+         * @brief
+         *
+         * @param fn
+         * @return bool
+         */
         bool LoadStringsFrom(char const* fn, LocaleConstant loc)
         {
             // DBC must be already loaded using Load
             if (!indexTable)
-                return false;
+                { return false; }
 
             DBCFileLoader dbc;
             // Check if load was successful, only then continue
             if (!dbc.Load(fn, fmt))
-                return false;
+                { return false; }
 
             // load strings from another locale dbc data
             m_stringPoolList.push_back(dbc.AutoProduceStrings(fmt,(char*)m_dataTable,loc));
@@ -79,10 +156,20 @@ class DBCStorage
             return true;
         }
 
+        /**
+         * @brief
+         *
+         */
         void Clear()
         {
+            if (loaded)
+            {
+                data.clear();
+                loaded = false;
+            }
+
             if (!indexTable)
-                return;
+                { return; }
 
             delete[]((char*)indexTable);
             indexTable = NULL;
@@ -97,16 +184,29 @@ class DBCStorage
             nCount = 0;
         }
 
-        void EraseEntry(uint32 id) { assert(id < nCount && "To be erased entry must be in bounds!") ; indexTable[id] = NULL; }
-        void InsertEntry(T* entry, uint32 id) { assert(id < nCount && "To be inserted entry must be in bounds!"); indexTable[id] = entry; }
+        /**
+         * @brief
+         *
+         * @param id
+         */
+        void EraseEntry(uint32 id) { assert(id < nCount && "Entry to be erased must be in bounds!") ; indexTable[id] = NULL; }
+        /**
+         * @brief
+         *
+         * @param entry
+         * @param id
+         */
+        void InsertEntry(T* entry, uint32 id) { assert(id < nCount && "Entry to be inserted must be in bounds!"); indexTable[id] = entry; }
 
     private:
-        uint32 nCount;
-        uint32 fieldCount;
-        char const* fmt;
-        T** indexTable;
-        T* m_dataTable;
-        StringPoolList m_stringPoolList;
+        uint32 nCount; /**< TODO */
+        uint32 fieldCount; /**< TODO */
+        char const* fmt; /**< TODO */
+        T** indexTable; /**< TODO */
+        T* m_dataTable; /**< TODO */
+        std::map<uint32, T const*> data;
+        bool loaded;
+        StringPoolList m_stringPoolList; /**< TODO */
 };
 
 #endif
diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 58faad7b5..bdc129047 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -46,7 +46,7 @@ void SqlConnection::FreePreparedStatements()
 
     size_t nStmts = m_holder.size();
     for (size_t i = 0; i < nStmts; ++i)
-        delete m_holder[i];
+        { delete m_holder[i]; }
 
     m_holder.clear();
 }
@@ -55,7 +55,7 @@ SqlPreparedStatement* SqlConnection::GetStmt(uint32 nIndex)
 {
     // resize stmt container
     if (m_holder.size() <= nIndex)
-        m_holder.resize(nIndex + 1, NULL);
+        { m_holder.resize(nIndex + 1, NULL); }
 
     SqlPreparedStatement* pStmt = NULL;
 
@@ -78,7 +78,7 @@ SqlPreparedStatement* SqlConnection::GetStmt(uint32 nIndex)
         m_holder[nIndex] = pStmt;
     }
     else
-        pStmt = m_holder[nIndex];
+        { pStmt = m_holder[nIndex]; }
 
     return pStmt;
 }
@@ -86,7 +86,7 @@ SqlPreparedStatement* SqlConnection::GetStmt(uint32 nIndex)
 bool SqlConnection::ExecuteStmt(int nIndex, const SqlStmtParameters& id)
 {
     if (nIndex == -1)
-        return false;
+        { return false; }
 
     // get prepared statement object
     SqlPreparedStatement* pStmt = GetStmt(nIndex);
@@ -111,7 +111,7 @@ bool Database::Initialize(const char* infoString, int nConns /*= 1*/)
     if (!m_logsDir.empty())
     {
         if ((m_logsDir.at(m_logsDir.length() - 1) != '/') && (m_logsDir.at(m_logsDir.length() - 1) != '\\'))
-            m_logsDir.append("/");
+            { m_logsDir.append("/"); }
     }
 
     m_pingIntervallms = sConfig.GetIntDefault("MaxPingTime", 30) * (MINUTE * 1000);
@@ -120,11 +120,11 @@ bool Database::Initialize(const char* infoString, int nConns /*= 1*/)
 
     // setup connection pool size
     if (nConns < MIN_CONNECTION_POOL_SIZE)
-        m_nQueryConnPoolSize = MIN_CONNECTION_POOL_SIZE;
+        { m_nQueryConnPoolSize = MIN_CONNECTION_POOL_SIZE; }
     else if (nConns > MAX_CONNECTION_POOL_SIZE)
-        m_nQueryConnPoolSize = MAX_CONNECTION_POOL_SIZE;
+        { m_nQueryConnPoolSize = MAX_CONNECTION_POOL_SIZE; }
     else
-        m_nQueryConnPoolSize = nConns;
+        { m_nQueryConnPoolSize = nConns; }
 
     // create connection pool for sync requests
     for (int i = 0; i < m_nQueryConnPoolSize; ++i)
@@ -142,7 +142,7 @@ bool Database::Initialize(const char* infoString, int nConns /*= 1*/)
     // create and initialize connection for async requests
     m_pAsyncConn = CreateConnection();
     if (!m_pAsyncConn->Initialize(infoString))
-        return false;
+        { return false; }
 
     m_pResultQueue = new SqlResultQueue;
 
@@ -161,7 +161,7 @@ void Database::StopServer()
     m_pAsyncConn = NULL;
 
     for (size_t i = 0; i < m_pQueryConnections.size(); ++i)
-        delete m_pQueryConnections[i];
+        { delete m_pQueryConnections[i]; }
 
     m_pQueryConnections.clear();
 }
@@ -183,7 +183,7 @@ void Database::InitDelayThread()
 
 void Database::HaltDelayThread()
 {
-    if (!m_threadBody || !m_delayThread) return;
+    if (!m_threadBody || !m_delayThread) { return; }
 
     m_threadBody->Stop();                                   // Stop event
     m_delayThread->wait();                                  // Wait for flush to DB
@@ -203,13 +203,13 @@ void Database::ThreadEnd()
 void Database::ProcessResultQueue()
 {
     if (m_pResultQueue)
-        m_pResultQueue->Update();
+        { m_pResultQueue->Update(); }
 }
 
 void Database::escape_string(std::string& str)
 {
     if (str.empty())
-        return;
+        { return; }
 
     char* buf = new char[str.size() * 2 + 1];
     // we don't care what connection to use - escape string will be the same
@@ -223,9 +223,9 @@ SqlConnection* Database::getQueryConnection()
     int nCount = 0;
 
     if (m_nQueryCounter == long(1 << 31))
-        m_nQueryCounter = 0;
+        { m_nQueryCounter = 0; }
     else
-        nCount = ++m_nQueryCounter;
+        { nCount = ++m_nQueryCounter; }
 
     return m_pQueryConnections[nCount % m_nQueryConnPoolSize];
 }
@@ -249,7 +249,7 @@ void Database::Ping()
 bool Database::PExecuteLog(const char* format, ...)
 {
     if (!format)
-        return false;
+        { return false; }
 
     va_list ap;
     char szQuery [MAX_QUERY_LEN];
@@ -292,7 +292,7 @@ bool Database::PExecuteLog(const char* format, ...)
 
 QueryResult* Database::PQuery(const char* format, ...)
 {
-    if (!format) return NULL;
+    if (!format) { return NULL; }
 
     va_list ap;
     char szQuery [MAX_QUERY_LEN];
@@ -311,7 +311,7 @@ QueryResult* Database::PQuery(const char* format, ...)
 
 QueryNamedResult* Database::PQueryNamed(const char* format, ...)
 {
-    if (!format) return NULL;
+    if (!format) { return NULL; }
 
     va_list ap;
     char szQuery [MAX_QUERY_LEN];
@@ -331,7 +331,7 @@ QueryNamedResult* Database::PQueryNamed(const char* format, ...)
 bool Database::Execute(const char* sql)
 {
     if (!m_pAsyncConn)
-        return false;
+        { return false; }
 
     SqlTransaction* pTrans = m_TransStorage->get();
     if (pTrans)
@@ -343,7 +343,7 @@ bool Database::Execute(const char* sql)
     {
         // if async execution is not available
         if (!m_bAllowAsyncTransactions)
-            return DirectExecute(sql);
+            { return DirectExecute(sql); }
 
         // Simple sql statement
         m_threadBody->Delay(new SqlPlainRequest(sql));
@@ -355,7 +355,7 @@ bool Database::Execute(const char* sql)
 bool Database::PExecute(const char* format, ...)
 {
     if (!format)
-        return false;
+        { return false; }
 
     va_list ap;
     char szQuery [MAX_QUERY_LEN];
@@ -375,7 +375,7 @@ bool Database::PExecute(const char* format, ...)
 bool Database::DirectPExecute(const char* format, ...)
 {
     if (!format)
-        return false;
+        { return false; }
 
     va_list ap;
     char szQuery [MAX_QUERY_LEN];
@@ -395,7 +395,7 @@ bool Database::DirectPExecute(const char* format, ...)
 bool Database::BeginTransaction()
 {
     if (!m_pAsyncConn)
-        return false;
+        { return false; }
 
     // initiate transaction on current thread
     // currently we do not support queued transactions
@@ -406,15 +406,15 @@ bool Database::BeginTransaction()
 bool Database::CommitTransaction()
 {
     if (!m_pAsyncConn)
-        return false;
+        { return false; }
 
     // check if we have pending transaction
     if (!m_TransStorage->get())
-        return false;
+        { return false; }
 
     // if async execution is not available
     if (!m_bAllowAsyncTransactions)
-        return CommitTransactionDirect();
+        { return CommitTransactionDirect(); }
 
     // add SqlTransaction to the async queue
     m_threadBody->Delay(m_TransStorage->detach());
@@ -424,11 +424,11 @@ bool Database::CommitTransaction()
 bool Database::CommitTransactionDirect()
 {
     if (!m_pAsyncConn)
-        return false;
+        { return false; }
 
     // check if we have pending transaction
     if (!m_TransStorage->get())
-        return false;
+        { return false; }
 
     // directly execute SqlTransaction
     SqlTransaction* pTrans = m_TransStorage->detach();
@@ -441,10 +441,10 @@ bool Database::CommitTransactionDirect()
 bool Database::RollbackTransaction()
 {
     if (!m_pAsyncConn)
-        return false;
+        { return false; }
 
     if (!m_TransStorage->get())
-        return false;
+        { return false; }
 
     // remove scheduled transaction
     m_TransStorage->reset();
@@ -467,13 +467,13 @@ bool Database::CheckRequiredField(char const* table_name, char const* required_n
     // search current required_* field in DB
     const char* db_name;
     if (!strcmp(table_name, "db_version"))
-        db_name = "WORLD";
+        { db_name = "WORLD"; }
     else if (!strcmp(table_name, "character_db_version"))
-        db_name = "CHARACTER";
+        { db_name = "CHARACTER"; }
     else if (!strcmp(table_name, "realmd_db_version"))
-        db_name = "REALMD";
+        { db_name = "REALMD"; }
     else
-        db_name = "UNKNOWN";
+        { db_name = "UNKNOWN"; }
 
     char const* req_sql_update_name = required_name + strlen("required_");
 
@@ -510,31 +510,31 @@ bool Database::CheckRequiredField(char const* table_name, char const* required_n
         else
         {
             sLog.outErrorDb("The table `%s` in your [%s] database is missing its version info.", table_name, db_name);
-            sLog.outErrorDb("MaNGOS cannot find the version info needed to check that the db is up to date.");
+            sLog.outErrorDb("MaNGOS can not find the version info needed to check that the db is up to date.");
             sLog.outErrorDb();
             sLog.outErrorDb("This revision of MaNGOS requires a database updated to:");
             sLog.outErrorDb("`%s.sql`", req_sql_update_name);
             sLog.outErrorDb();
 
             if (!strcmp(db_name, "WORLD"))
-                sLog.outErrorDb("Post this error to your database provider forum or find a solution there.");
+                { sLog.outErrorDb("Post this error to your database provider forum or find a solution there."); }
             else
-                sLog.outErrorDb("Reinstall your [%s] database with the included sql file in the sql folder.", db_name);
+                { sLog.outErrorDb("Reinstall your [%s] database with the included sql file in the sql folder.", db_name); }
         }
     }
     else
     {
         sLog.outErrorDb("The table `%s` in your [%s] database is missing or corrupt.", table_name, db_name);
-        sLog.outErrorDb("MaNGOS cannot find the version info needed to check that the db is up to date.");
+        sLog.outErrorDb("MaNGOS can not find the version info needed to check that the db is up to date.");
         sLog.outErrorDb();
         sLog.outErrorDb("This revision of mangos requires a database updated to:");
         sLog.outErrorDb("`%s.sql`", req_sql_update_name);
         sLog.outErrorDb();
 
         if (!strcmp(db_name, "WORLD"))
-            sLog.outErrorDb("Post this error to your database provider forum or find a solution there.");
+            { sLog.outErrorDb("Post this error to your database provider forum or find a solution there."); }
         else
-            sLog.outErrorDb("Reinstall your [%s] database with the included sql file in the sql folder.", db_name);
+            { sLog.outErrorDb("Reinstall your [%s] database with the included sql file in the sql folder.", db_name); }
     }
 
     return false;
@@ -543,7 +543,7 @@ bool Database::CheckRequiredField(char const* table_name, char const* required_n
 bool Database::ExecuteStmt(const SqlStatementID& id, SqlStmtParameters* params)
 {
     if (!m_pAsyncConn)
-        return false;
+        { return false; }
 
     SqlTransaction* pTrans = m_TransStorage->get();
     if (pTrans)
@@ -555,7 +555,7 @@ bool Database::ExecuteStmt(const SqlStatementID& id, SqlStmtParameters* params)
     {
         // if async execution is not available
         if (!m_bAllowAsyncTransactions)
-            return DirectExecuteStmt(id, params);
+            { return DirectExecuteStmt(id, params); }
 
         // Simple sql statement
         m_threadBody->Delay(new SqlPreparedRequest(id.ID(), params));
@@ -592,7 +592,7 @@ SqlStatement Database::CreateStatement(SqlStatementID& index, const char* fmt)
             m_stmtRegistry[szFmt] = nId;
         }
         else
-            nId = iter->second;
+            { nId = iter->second; }
 
         // save initialized statement index info
         index.init(nId, nParams);
@@ -606,13 +606,13 @@ std::string Database::GetStmtString(const int stmtId) const
     LOCK_GUARD _guard(m_stmtGuard);
 
     if (stmtId == -1 || stmtId > m_iStmtIndex)
-        return std::string();
+        { return std::string(); }
 
     PreparedStmtRegistry::const_iterator iter_last = m_stmtRegistry.end();
     for (PreparedStmtRegistry::const_iterator iter = m_stmtRegistry.begin(); iter != iter_last; ++iter)
     {
         if (iter->second == stmtId)
-            return iter->first;
+            { return iter->first; }
     }
 
     return std::string();
diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index 2797b8f4c..f96ca176d 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -25,7 +25,7 @@
 #ifndef DATABASE_H
 #define DATABASE_H
 
-#include "Threading.h"
+#include "Threading/Threading.h"
 #include "Utilities/UnorderedMapSet.h"
 #include "Database/SqlDelayThread.h"
 #include <ace/Recursive_Thread_Mutex.h>
@@ -43,191 +43,611 @@ class Database;
 
 #define MAX_QUERY_LEN   (32*1024)
 
-//
-class  SqlConnection
+/**
+ * @brief
+ *
+ */
+class SqlConnection
 {
     public:
+        /**
+         * @brief
+         *
+         */
         virtual ~SqlConnection() {}
 
-        // method for initializing DB connection
+        /**
+         * @brief method for initializing DB connection
+         *
+         * @param infoString
+         * @return bool
+         */
         virtual bool Initialize(const char* infoString) = 0;
-        // public methods for making queries
+        /**
+         * @brief public methods for making queries
+         *
+         * @param sql
+         * @return QueryResult
+         */
         virtual QueryResult* Query(const char* sql) = 0;
+        /**
+         * @brief
+         *
+         * @param sql
+         * @return QueryNamedResult
+         */
         virtual QueryNamedResult* QueryNamed(const char* sql) = 0;
 
-        // public methods for making requests
+        /**
+         * @brief public methods for making requests
+         *
+         * @param sql
+         * @return bool
+         */
         virtual bool Execute(const char* sql) = 0;
 
-        // escape string generation
+        /**
+         * @brief escape string generation
+         *
+         * @param to
+         * @param from
+         * @param length
+         * @return unsigned long
+         */
         virtual unsigned long escape_string(char* to, const char* from, unsigned long length) { strncpy(to, from, length); return length; }
 
-        // nothing do if DB not support transactions
+        /**
+         * @brief nothing do if DB not support transactions
+         *
+         * @return bool
+         */
         virtual bool BeginTransaction() { return true; }
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         virtual bool CommitTransaction() { return true; }
-        // can't rollback without transaction support
+        /**
+         * @brief can't rollback without transaction support
+         *
+         * @return bool
+         */
         virtual bool RollbackTransaction() { return true; }
 
-        // methods to work with prepared statements
+        /**
+         * @brief methods to work with prepared statements
+         *
+         * @param nIndex
+         * @param id
+         * @return bool
+         */
         bool ExecuteStmt(int nIndex, const SqlStmtParameters& id);
 
-        // SqlConnection object lock
+        /**
+         * @brief SqlConnection object lock
+         *
+         */
         class Lock
         {
             public:
+                /**
+                 * @brief
+                 *
+                 * @param conn
+                 */
                 Lock(SqlConnection* conn) : m_pConn(conn) { m_pConn->m_mutex.acquire(); }
+                /**
+                 * @brief
+                 *
+                 */
                 ~Lock() { m_pConn->m_mutex.release(); }
 
+                /**
+                 * @brief
+                 *
+                 * @return SqlConnection *operator ->
+                 */
                 SqlConnection* operator->() const { return m_pConn; }
 
             private:
-                SqlConnection* const m_pConn;
+                SqlConnection* const m_pConn; /**< TODO */
         };
 
-        // get DB object
+        /**
+         * @brief get DB object
+         *
+         * @return Database
+         */
         Database& DB() { return m_db; }
 
     protected:
+        /**
+         * @brief
+         *
+         * @param db
+         */
         SqlConnection(Database& db) : m_db(db) {}
 
+        /**
+         * @brief
+         *
+         * @param fmt
+         * @return SqlPreparedStatement
+         */
         virtual SqlPreparedStatement* CreateStatement(const std::string& fmt);
-        // allocate prepared statement and return statement ID
+        /**
+         * @brief allocate prepared statement and return statement ID
+         *
+         * @param nIndex
+         * @return SqlPreparedStatement
+         */
         SqlPreparedStatement* GetStmt(uint32 nIndex);
 
-        Database& m_db;
+        Database& m_db; /**< TODO */
 
-        // free prepared statements objects
+        /**
+         * @brief free prepared statements objects
+         *
+         */
         void FreePreparedStatements();
 
     private:
+        /**
+         * @brief
+         *
+         */
         typedef ACE_Recursive_Thread_Mutex LOCK_TYPE;
-        LOCK_TYPE m_mutex;
+        LOCK_TYPE m_mutex; /**< TODO */
 
+        /**
+         * @brief
+         *
+         */
         typedef std::vector<SqlPreparedStatement* > StmtHolder;
-        StmtHolder m_holder;
+        StmtHolder m_holder; /**< TODO */
 };
 
-class  Database
+/**
+ * @brief
+ *
+ */
+class Database
 {
     public:
+        /**
+         * @brief
+         *
+         */
         virtual ~Database();
 
+        /**
+         * @brief
+         *
+         * @param infoString
+         * @param nConns
+         * @return bool
+         */
         virtual bool Initialize(const char* infoString, int nConns = 1);
-        // start worker thread for async DB request execution
+        /**
+         * @brief start worker thread for async DB request execution
+         *
+         */
         virtual void InitDelayThread();
-        // stop worker thread
+        /**
+         * @brief stop worker thread
+         *
+         */
         virtual void HaltDelayThread();
 
-        /// Synchronous DB queries
+        /**
+         * @brief Synchronous DB queries
+         *
+         * @param sql
+         * @return QueryResult
+         */
         inline QueryResult* Query(const char* sql)
         {
             SqlConnection::Lock guard(getQueryConnection());
             return guard->Query(sql);
         }
 
+        /**
+         * @brief
+         *
+         * @param sql
+         * @return QueryNamedResult
+         */
         inline QueryNamedResult* QueryNamed(const char* sql)
         {
             SqlConnection::Lock guard(getQueryConnection());
             return guard->QueryNamed(sql);
         }
 
+        /**
+         * @brief
+         *
+         * @param format...
+         * @return QueryResult
+         */
         QueryResult* PQuery(const char* format, ...) ATTR_PRINTF(2, 3);
+        /**
+         * @brief
+         *
+         * @param format...
+         * @return QueryNamedResult
+         */
         QueryNamedResult* PQueryNamed(const char* format, ...) ATTR_PRINTF(2, 3);
 
+        /**
+         * @brief
+         *
+         * @param sql
+         * @return bool
+         */
         inline bool DirectExecute(const char* sql)
         {
             if (!m_pAsyncConn)
-                return false;
+                { return false; }
 
             SqlConnection::Lock guard(m_pAsyncConn);
             return guard->Execute(sql);
         }
 
+        /**
+         * @brief
+         *
+         * @param format...
+         * @return bool
+         */
         bool DirectPExecute(const char* format, ...) ATTR_PRINTF(2, 3);
 
         /// Async queries and query holders, implemented in DatabaseImpl.h
 
         // Query / member
         template<class Class>
+        /**
+         * @brief
+         *
+         * @param object
+         * @param )
+         * @param sql
+         * @return bool
+         */
         bool AsyncQuery(Class* object, void (Class::*method)(QueryResult*), const char* sql);
         template<class Class, typename ParamType1>
+        /**
+         * @brief
+         *
+         * @param object
+         * @param
+         * @param ParamType1)
+         * @param param1
+         * @param sql
+         * @return bool
+         */
         bool AsyncQuery(Class* object, void (Class::*method)(QueryResult*, ParamType1), ParamType1 param1, const char* sql);
         template<class Class, typename ParamType1, typename ParamType2>
+        /**
+         * @brief
+         *
+         * @param object
+         * @param
+         * @param ParamType1
+         * @param ParamType2)
+         * @param param1
+         * @param param2
+         * @param sql
+         * @return bool
+         */
         bool AsyncQuery(Class* object, void (Class::*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char* sql);
         template<class Class, typename ParamType1, typename ParamType2, typename ParamType3>
+        /**
+         * @brief
+         *
+         * @param object
+         * @param
+         * @param ParamType1
+         * @param ParamType2
+         * @param ParamType3)
+         * @param param1
+         * @param param2
+         * @param param3
+         * @param sql
+         * @return bool
+         */
         bool AsyncQuery(Class* object, void (Class::*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char* sql);
         // Query / static
         template<typename ParamType1>
+        /**
+         * @brief
+         *
+         * @param
+         * @param ParamType1)
+         * @param param1
+         * @param sql
+         * @return bool
+         */
         bool AsyncQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param1, const char* sql);
         template<typename ParamType1, typename ParamType2>
+        /**
+         * @brief
+         *
+         * @param
+         * @param ParamType1
+         * @param ParamType2)
+         * @param param1
+         * @param param2
+         * @param sql
+         * @return bool
+         */
         bool AsyncQuery(void (*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char* sql);
         template<typename ParamType1, typename ParamType2, typename ParamType3>
+        /**
+         * @brief
+         *
+         * @param
+         * @param ParamType1
+         * @param ParamType2
+         * @param ParamType3)
+         * @param param1
+         * @param param2
+         * @param param3
+         * @param sql
+         * @return bool
+         */
         bool AsyncQuery(void (*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char* sql);
         // PQuery / member
         template<class Class>
+        /**
+         * @brief
+         *
+         * @param object
+         * @param )
+         * @param format...
+         * @return bool
+         */
         bool AsyncPQuery(Class* object, void (Class::*method)(QueryResult*), const char* format, ...) ATTR_PRINTF(4, 5);
         template<class Class, typename ParamType1>
+        /**
+         * @brief
+         *
+         * @param object
+         * @param
+         * @param ParamType1)
+         * @param param1
+         * @param format...
+         * @return bool
+         */
         bool AsyncPQuery(Class* object, void (Class::*method)(QueryResult*, ParamType1), ParamType1 param1, const char* format, ...) ATTR_PRINTF(5, 6);
         template<class Class, typename ParamType1, typename ParamType2>
+        /**
+         * @brief
+         *
+         * @param object
+         * @param
+         * @param ParamType1
+         * @param ParamType2)
+         * @param param1
+         * @param param2
+         * @param format...
+         * @return bool
+         */
         bool AsyncPQuery(Class* object, void (Class::*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char* format, ...) ATTR_PRINTF(6, 7);
         template<class Class, typename ParamType1, typename ParamType2, typename ParamType3>
+        /**
+         * @brief
+         *
+         * @param object
+         * @param
+         * @param ParamType1
+         * @param ParamType2
+         * @param ParamType3)
+         * @param param1
+         * @param param2
+         * @param param3
+         * @param format...
+         * @return bool
+         */
         bool AsyncPQuery(Class* object, void (Class::*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char* format, ...) ATTR_PRINTF(7, 8);
         // PQuery / static
         template<typename ParamType1>
+        /**
+         * @brief
+         *
+         * @param
+         * @param ParamType1)
+         * @param param1
+         * @param format...
+         * @return bool
+         */
         bool AsyncPQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param1, const char* format, ...) ATTR_PRINTF(4, 5);
         template<typename ParamType1, typename ParamType2>
+        /**
+         * @brief
+         *
+         * @param
+         * @param ParamType1
+         * @param ParamType2)
+         * @param param1
+         * @param param2
+         * @param format...
+         * @return bool
+         */
         bool AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char* format, ...) ATTR_PRINTF(5, 6);
         template<typename ParamType1, typename ParamType2, typename ParamType3>
+        /**
+         * @brief
+         *
+         * @param
+         * @param ParamType1
+         * @param ParamType2
+         * @param ParamType3)
+         * @param param1
+         * @param param2
+         * @param param3
+         * @param format...
+         * @return bool
+         */
         bool AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char* format, ...) ATTR_PRINTF(6, 7);
         template<class Class>
         // QueryHolder
+        /**
+         * @brief
+         *
+         * @param object
+         * @param
+         * @param )
+         * @param holder
+         * @return bool
+         */
         bool DelayQueryHolder(Class* object, void (Class::*method)(QueryResult*, SqlQueryHolder*), SqlQueryHolder* holder);
         template<class Class, typename ParamType1>
+        /**
+         * @brief
+         *
+         * @param object
+         * @param
+         * @param
+         * @param ParamType1)
+         * @param holder
+         * @param param1
+         * @return bool
+         */
         bool DelayQueryHolder(Class* object, void (Class::*method)(QueryResult*, SqlQueryHolder*, ParamType1), SqlQueryHolder* holder, ParamType1 param1);
 
+        /**
+         * @brief
+         *
+         * @param sql
+         * @return bool
+         */
         bool Execute(const char* sql);
+        /**
+         * @brief
+         *
+         * @param format...
+         * @return bool
+         */
         bool PExecute(const char* format, ...) ATTR_PRINTF(2, 3);
 
-        // Writes SQL commands to a LOG file (see mangosd.conf "LogSQL")
+        /**
+         * @brief Writes SQL commands to a LOG file (see mangosd.conf "LogSQL")
+         *
+         * @param format...
+         * @return bool
+         */
         bool PExecuteLog(const char* format, ...) ATTR_PRINTF(2, 3);
 
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool BeginTransaction();
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool CommitTransaction();
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool RollbackTransaction();
-        // for sync transaction execution
+        /**
+         * @brief for sync transaction execution
+         *
+         * @return bool
+         */
         bool CommitTransactionDirect();
 
         // PREPARED STATEMENT API
-
-        // allocate index for prepared statement with SQL request 'fmt'
+        /**
+         * @brief allocate index for prepared statement with SQL request 'fmt'
+         *
+         * @param index
+         * @param fmt
+         * @return SqlStatement
+         */
         SqlStatement CreateStatement(SqlStatementID& index, const char* fmt);
-        // get prepared statement format string
+        /**
+         * @brief get prepared statement format string
+         *
+         * @param stmtId
+         * @return std::string
+         */
         std::string GetStmtString(const int stmtId) const;
 
+        /**
+         * @brief
+         *
+         * @return operator
+         */
         operator bool () const { return m_pQueryConnections.size() && m_pAsyncConn != 0; }
 
-        // escape string generation
+        /**
+         * @brief escape string generation
+         *
+         * @param str
+         */
         void escape_string(std::string& str);
 
-        // must be called before first query in thread (one time for thread using one from existing Database objects)
+        /**
+         * @brief must be called before first query in thread (one time for thread using one from existing Database objects)
+         *
+         */
         virtual void ThreadStart();
-        // must be called before finish thread run (one time for thread using one from existing Database objects)
+        /**
+         * @brief must be called before finish thread run (one time for thread using one from existing Database objects)
+         *
+         */
         virtual void ThreadEnd();
 
-        // set database-wide result queue. also we should use object-bases and not thread-based result queues
+        /**
+         * @brief set database-wide result queue. also we should use object-bases and not thread-based result queues
+         *
+         */
         void ProcessResultQueue();
 
+        /**
+         * @brief
+         *
+         * @param table_name
+         * @param required_name
+         * @return bool
+         */
         bool CheckRequiredField(char const* table_name, char const* required_name);
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 GetPingIntervall() { return m_pingIntervallms; }
 
-        // function to ping database connections
+        /**
+         * @brief function to ping database connections
+         *
+         */
         void Ping();
 
-        // set this to allow async transactions
-        // you should call it explicitly after your server successfully started up
-        // NO ASYNC TRANSACTIONS DURING SERVER STARTUP - ONLY DURING RUNTIME!!!
+        /**
+         * @brief set this to allow async transactions
+         *
+         * you should call it explicitly after your server successfully started
+         * up.
+         * NO ASYNC TRANSACTIONS DURING SERVER STARTUP - ONLY DURING RUNTIME!!!
+         *
+         */
         void AllowAsyncTransactions() { m_bAllowAsyncTransactions = true; }
 
     protected:
+        /**
+         * @brief
+         *
+         */
         Database() :
             m_nQueryConnPoolSize(1), m_pAsyncConn(NULL), m_pResultQueue(NULL),
             m_threadBody(NULL), m_delayThread(NULL), m_bAllowAsyncTransactions(false),
@@ -236,83 +656,162 @@ class  Database
             m_nQueryCounter = -1;
         }
 
+        /**
+         * @brief
+         *
+         */
         void StopServer();
 
-        // factory method to create SqlConnection objects
+        /**
+         * @brief factory method to create SqlConnection objects
+         *
+         * @return SqlConnection
+         */
         virtual SqlConnection* CreateConnection() = 0;
-        // factory method to create SqlDelayThread objects
+        /**
+         * @brief factory method to create SqlDelayThread objects
+         *
+         * @return SqlDelayThread
+         */
         virtual SqlDelayThread* CreateDelayThread();
 
+        /**
+         * @brief
+         *
+         */
         class  TransHelper
         {
             public:
+                /**
+                 * @brief
+                 *
+                 */
                 TransHelper() : m_pTrans(NULL) {}
+                /**
+                 * @brief
+                 *
+                 */
                 ~TransHelper();
 
-                // initializes new SqlTransaction object
+                /**
+                 * @brief initializes new SqlTransaction object
+                 *
+                 * @return SqlTransaction
+                 */
                 SqlTransaction* init();
-                // gets pointer on current transaction object. Returns NULL if transaction was not initiated
+                /**
+                 * @brief gets pointer on current transaction object. Returns NULL if transaction was not initiated
+                 *
+                 * @return SqlTransaction
+                 */
                 SqlTransaction* get() const { return m_pTrans; }
-                // detaches SqlTransaction object allocated by init() function
-                // next call to get() function will return NULL!
-                // do not forget to destroy obtained SqlTransaction object!
+
+                /**
+                 * @brief detaches SqlTransaction object allocated by init() function
+                 *
+                 * next call to get() function will return NULL!
+                 * do not forget to destroy obtained SqlTransaction object!
+                 *
+                 * @return SqlTransaction
+                 */
                 SqlTransaction* detach();
-                // destroyes SqlTransaction allocated by init() function
+                /**
+                 * @brief destroyes SqlTransaction allocated by init() function
+                 *
+                 */
                 void reset();
 
             private:
-                SqlTransaction* m_pTrans;
+                SqlTransaction* m_pTrans; /**< TODO */
         };
 
-        // per-thread based storage for SqlTransaction object initialization - no locking is required
+        /**
+         * @brief per-thread based storage for SqlTransaction object initialization - no locking is required
+         *
+         */
         typedef ACE_TSS<Database::TransHelper> DBTransHelperTSS;
-        Database::DBTransHelperTSS m_TransStorage;
+        Database::DBTransHelperTSS m_TransStorage; /**< TODO */
 
         ///< DB connections
-
-        // round-robin connection selection
+        /**
+         * @brief round-robin connection selection
+         *
+         * @return SqlConnection
+         */
         SqlConnection* getQueryConnection();
-        // for now return one single connection for async requests
+        /**
+         * @brief for now return one single connection for async requests
+         *
+         * @return SqlConnection
+         */
         SqlConnection* getAsyncConnection() const { return m_pAsyncConn; }
 
         friend class SqlStatement;
         // PREPARED STATEMENT API
-        // query function for prepared statements
+        /**
+         * @brief query function for prepared statements
+         *
+         * @param id
+         * @param params
+         * @return bool
+         */
         bool ExecuteStmt(const SqlStatementID& id, SqlStmtParameters* params);
+        /**
+         * @brief
+         *
+         * @param id
+         * @param params
+         * @return bool
+         */
         bool DirectExecuteStmt(const SqlStatementID& id, SqlStmtParameters* params);
 
         // connection helper counters
-        int m_nQueryConnPoolSize;                           // current size of query connection pool
-        ACE_Atomic_Op<ACE_Thread_Mutex, long> m_nQueryCounter;  // counter for connection selection
+        int m_nQueryConnPoolSize;                               /**< current size of query connection pool */
+        ACE_Atomic_Op<ACE_Thread_Mutex, long> m_nQueryCounter;  /**< counter for connection selection */
 
-        // lets use pool of connections for sync queries
+        /**
+         * @brief lets use pool of connections for sync queries
+         *
+         */
         typedef std::vector< SqlConnection* > SqlConnectionContainer;
-        SqlConnectionContainer m_pQueryConnections;
+        SqlConnectionContainer m_pQueryConnections; /**< TODO */
 
         // only one single DB connection for transactions
-        SqlConnection* m_pAsyncConn;
+        SqlConnection* m_pAsyncConn; /**< TODO */
 
-        SqlResultQueue*     m_pResultQueue;                 ///< Transaction queues from diff. threads
-        SqlDelayThread*     m_threadBody;                   ///< Pointer to delay sql executer (owned by m_delayThread)
-        ACE_Based::Thread* m_delayThread;                   ///< Pointer to executer thread
+        SqlResultQueue*     m_pResultQueue;                 /**< Transaction queues from diff. threads */
+        SqlDelayThread*     m_threadBody;                   /**< Pointer to delay sql executer (owned by m_delayThread) */
+        ACE_Based::Thread* m_delayThread;                   /**< Pointer to executer thread */
 
-        bool m_bAllowAsyncTransactions;                     ///< flag which specifies if async transactions are enabled
+        bool m_bAllowAsyncTransactions;                     /**< flag which specifies if async transactions are enabled */
 
         // PREPARED STATEMENT REGISTRY
+        /**
+         * @brief
+         *
+         */
         typedef ACE_Thread_Mutex LOCK_TYPE;
+        /**
+         * @brief
+         *
+         */
         typedef ACE_Guard<LOCK_TYPE> LOCK_GUARD;
 
-        mutable LOCK_TYPE m_stmtGuard;
+        mutable LOCK_TYPE m_stmtGuard; /**< TODO */
 
+        /**
+         * @brief
+         *
+         */
         typedef UNORDERED_MAP<std::string, int> PreparedStmtRegistry;
-        PreparedStmtRegistry m_stmtRegistry;                ///<
+        PreparedStmtRegistry m_stmtRegistry;                ///< /**< TODO */
 
-        int m_iStmtIndex;
+        int m_iStmtIndex; /**< TODO */
 
     private:
 
-        bool m_logSQL;
-        std::string m_logsDir;
-        uint32 m_pingIntervallms;
+        bool m_logSQL; /**< TODO */
+        std::string m_logsDir; /**< TODO */
+        uint32 m_pingIntervallms; /**< TODO */
 };
 #endif
diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h
index fba5fe4b6..612684466 100644
--- a/src/shared/Database/DatabaseEnv.h
+++ b/src/shared/Database/DatabaseEnv.h
@@ -25,9 +25,9 @@
 #if !defined(DATABASEENV_H)
 #define DATABASEENV_H
 
-#include "Common.h"
-#include "Log.h"
-#include "Errors.h"
+#include "Common/Common.h"
+#include "Log/Log.h"
+#include "Utilities/Errors.h"
 
 #include "Database/Field.h"
 #include "Database/QueryResult.h"
@@ -45,6 +45,10 @@ typedef DatabasePostgre DatabaseType;
 #include "Database/QueryResultMysql.h"
 #include "Database/Database.h"
 #include "Database/DatabaseMysql.h"
+/**
+ * @brief
+ *
+ */
 typedef DatabaseMysql DatabaseType;
 #define _LIKE_           "LIKE"
 #define _TABLE_SIM_      "`"
@@ -52,8 +56,8 @@ typedef DatabaseMysql DatabaseType;
 #define _OFFSET_         "LIMIT %d,1"
 #endif
 
-extern DatabaseType WorldDatabase;
-extern DatabaseType CharacterDatabase;
-extern DatabaseType LoginDatabase;
+extern DatabaseType WorldDatabase; /**< TODO */
+extern DatabaseType CharacterDatabase; /**< TODO */
+extern DatabaseType LoginDatabase; /**< TODO */
 
 #endif
diff --git a/src/shared/Database/DatabaseImpl.h b/src/shared/Database/DatabaseImpl.h
index cce81bf1d..8c15e49d3 100644
--- a/src/shared/Database/DatabaseImpl.h
+++ b/src/shared/Database/DatabaseImpl.h
@@ -53,6 +53,14 @@
 
 template<class Class>
 bool
+/**
+ * @brief
+ *
+ * @param object
+ * @param )
+ * @param sql
+ * @return bool
+ */
 Database::AsyncQuery(Class* object, void (Class::*method)(QueryResult*), const char* sql)
 {
     ASYNC_QUERY_BODY(sql)
@@ -61,6 +69,16 @@ Database::AsyncQuery(Class* object, void (Class::*method)(QueryResult*), const c
 
 template<class Class, typename ParamType1>
 bool
+/**
+ * @brief
+ *
+ * @param object
+ * @param
+ * @param ParamType1)
+ * @param param1
+ * @param sql
+ * @return bool
+ */
 Database::AsyncQuery(Class* object, void (Class::*method)(QueryResult*, ParamType1), ParamType1 param1, const char* sql)
 {
     ASYNC_QUERY_BODY(sql)
@@ -69,6 +87,18 @@ Database::AsyncQuery(Class* object, void (Class::*method)(QueryResult*, ParamTyp
 
 template<class Class, typename ParamType1, typename ParamType2>
 bool
+/**
+ * @brief
+ *
+ * @param object
+ * @param
+ * @param ParamType1
+ * @param ParamType2)
+ * @param param1
+ * @param param2
+ * @param sql
+ * @return bool
+ */
 Database::AsyncQuery(Class* object, void (Class::*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char* sql)
 {
     ASYNC_QUERY_BODY(sql)
@@ -77,6 +107,20 @@ Database::AsyncQuery(Class* object, void (Class::*method)(QueryResult*, ParamTyp
 
 template<class Class, typename ParamType1, typename ParamType2, typename ParamType3>
 bool
+/**
+ * @brief
+ *
+ * @param object
+ * @param
+ * @param ParamType1
+ * @param ParamType2
+ * @param ParamType3)
+ * @param param1
+ * @param param2
+ * @param param3
+ * @param sql
+ * @return bool
+ */
 Database::AsyncQuery(Class* object, void (Class::*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char* sql)
 {
     ASYNC_QUERY_BODY(sql)
@@ -84,9 +128,17 @@ Database::AsyncQuery(Class* object, void (Class::*method)(QueryResult*, ParamTyp
 }
 
 // -- Query / static --
-
 template<typename ParamType1>
 bool
+/**
+ * @brief
+ *
+ * @param
+ * @param ParamType1)
+ * @param param1
+ * @param sql
+ * @return bool
+ */
 Database::AsyncQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param1, const char* sql)
 {
     ASYNC_QUERY_BODY(sql)
@@ -95,6 +147,17 @@ Database::AsyncQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param1
 
 template<typename ParamType1, typename ParamType2>
 bool
+/**
+ * @brief
+ *
+ * @param
+ * @param ParamType1
+ * @param ParamType2)
+ * @param param1
+ * @param param2
+ * @param sql
+ * @return bool
+ */
 Database::AsyncQuery(void (*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char* sql)
 {
     ASYNC_QUERY_BODY(sql)
@@ -103,6 +166,19 @@ Database::AsyncQuery(void (*method)(QueryResult*, ParamType1, ParamType2), Param
 
 template<typename ParamType1, typename ParamType2, typename ParamType3>
 bool
+/**
+ * @brief
+ *
+ * @param
+ * @param ParamType1
+ * @param ParamType2
+ * @param ParamType3)
+ * @param param1
+ * @param param2
+ * @param param3
+ * @param sql
+ * @return bool
+ */
 Database::AsyncQuery(void (*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char* sql)
 {
     ASYNC_QUERY_BODY(sql)
@@ -110,9 +186,16 @@ Database::AsyncQuery(void (*method)(QueryResult*, ParamType1, ParamType2, ParamT
 }
 
 // -- PQuery / member --
-
 template<class Class>
 bool
+/**
+ * @brief
+ *
+ * @param object
+ * @param )
+ * @param format...
+ * @return bool
+ */
 Database::AsyncPQuery(Class* object, void (Class::*method)(QueryResult*), const char* format, ...)
 {
     ASYNC_PQUERY_BODY(format, szQuery)
@@ -121,6 +204,16 @@ Database::AsyncPQuery(Class* object, void (Class::*method)(QueryResult*), const
 
 template<class Class, typename ParamType1>
 bool
+/**
+ * @brief
+ *
+ * @param object
+ * @param
+ * @param ParamType1)
+ * @param param1
+ * @param format...
+ * @return bool
+ */
 Database::AsyncPQuery(Class* object, void (Class::*method)(QueryResult*, ParamType1), ParamType1 param1, const char* format, ...)
 {
     ASYNC_PQUERY_BODY(format, szQuery)
@@ -129,6 +222,18 @@ Database::AsyncPQuery(Class* object, void (Class::*method)(QueryResult*, ParamTy
 
 template<class Class, typename ParamType1, typename ParamType2>
 bool
+/**
+ * @brief
+ *
+ * @param object
+ * @param
+ * @param ParamType1
+ * @param ParamType2)
+ * @param param1
+ * @param param2
+ * @param format...
+ * @return bool
+ */
 Database::AsyncPQuery(Class* object, void (Class::*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char* format, ...)
 {
     ASYNC_PQUERY_BODY(format, szQuery)
@@ -137,6 +242,20 @@ Database::AsyncPQuery(Class* object, void (Class::*method)(QueryResult*, ParamTy
 
 template<class Class, typename ParamType1, typename ParamType2, typename ParamType3>
 bool
+/**
+ * @brief
+ *
+ * @param object
+ * @param
+ * @param ParamType1
+ * @param ParamType2
+ * @param ParamType3)
+ * @param param1
+ * @param param2
+ * @param param3
+ * @param format...
+ * @return bool
+ */
 Database::AsyncPQuery(Class* object, void (Class::*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char* format, ...)
 {
     ASYNC_PQUERY_BODY(format, szQuery)
@@ -144,9 +263,17 @@ Database::AsyncPQuery(Class* object, void (Class::*method)(QueryResult*, ParamTy
 }
 
 // -- PQuery / static --
-
 template<typename ParamType1>
 bool
+/**
+ * @brief
+ *
+ * @param
+ * @param ParamType1)
+ * @param param1
+ * @param format...
+ * @return bool
+ */
 Database::AsyncPQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param1, const char* format, ...)
 {
     ASYNC_PQUERY_BODY(format, szQuery)
@@ -155,6 +282,17 @@ Database::AsyncPQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param
 
 template<typename ParamType1, typename ParamType2>
 bool
+/**
+ * @brief
+ *
+ * @param
+ * @param ParamType1
+ * @param ParamType2)
+ * @param param1
+ * @param param2
+ * @param format...
+ * @return bool
+ */
 Database::AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char* format, ...)
 {
     ASYNC_PQUERY_BODY(format, szQuery)
@@ -163,6 +301,19 @@ Database::AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2), Para
 
 template<typename ParamType1, typename ParamType2, typename ParamType3>
 bool
+/**
+ * @brief
+ *
+ * @param
+ * @param ParamType1
+ * @param ParamType2
+ * @param ParamType3)
+ * @param param1
+ * @param param2
+ * @param param3
+ * @param format...
+ * @return bool
+ */
 Database::AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char* format, ...)
 {
     ASYNC_PQUERY_BODY(format, szQuery)
@@ -170,9 +321,17 @@ Database::AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2, Param
 }
 
 // -- QueryHolder --
-
 template<class Class>
 bool
+/**
+ * @brief
+ *
+ * @param object
+ * @param
+ * @param )
+ * @param holder
+ * @return bool
+ */
 Database::DelayQueryHolder(Class* object, void (Class::*method)(QueryResult*, SqlQueryHolder*), SqlQueryHolder* holder)
 {
     ASYNC_DELAYHOLDER_BODY(holder)
@@ -181,6 +340,17 @@ Database::DelayQueryHolder(Class* object, void (Class::*method)(QueryResult*, Sq
 
 template<class Class, typename ParamType1>
 bool
+/**
+ * @brief
+ *
+ * @param object
+ * @param
+ * @param
+ * @param ParamType1)
+ * @param holder
+ * @param param1
+ * @return bool
+ */
 Database::DelayQueryHolder(Class* object, void (Class::*method)(QueryResult*, SqlQueryHolder*, ParamType1), SqlQueryHolder* holder, ParamType1 param1)
 {
     ASYNC_DELAYHOLDER_BODY(holder)
diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
index 906c5e12c..3672b941c 100644
--- a/src/shared/Database/DatabaseMysql.cpp
+++ b/src/shared/Database/DatabaseMysql.cpp
@@ -24,12 +24,12 @@
 
 #ifndef DO_POSTGRESQL
 
-#include "Util.h"
+#include "Utilities/Util.h"
 #include "Policies/Singleton.h"
 #include "Platform/Define.h"
-#include "Threading.h"
+#include "Threading/Threading.h"
 #include "DatabaseEnv.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 
 size_t DatabaseMysql::db_count = 0;
 
@@ -66,7 +66,7 @@ DatabaseMysql::~DatabaseMysql()
 
     // Free Mysql library pointers for last ~DB
     if (--db_count == 0)
-        mysql_library_end();
+        { mysql_library_end(); }
 }
 
 SqlConnection* DatabaseMysql::CreateConnection()
@@ -100,17 +100,18 @@ bool MySQLConnection::Initialize(const char* infoString)
     iter = tokens.begin();
 
     if (iter != tokens.end())
-        host = *iter++;
+        { host = *iter++; }
     if (iter != tokens.end())
-        port_or_socket = *iter++;
+        { port_or_socket = *iter++; }
     if (iter != tokens.end())
-        user = *iter++;
+        { user = *iter++; }
     if (iter != tokens.end())
-        password = *iter++;
+        { password = *iter++; }
     if (iter != tokens.end())
-        database = *iter++;
+        { database = *iter++; }
 
     mysql_options(mysqlInit, MYSQL_SET_CHARSET_NAME, "utf8");
+    mysql_options(mysqlInit, MYSQL_OPT_RECONNECT, "1");
 #ifdef WIN32
     if (host == ".")                                        // named pipe use option (Windows)
     {
@@ -167,9 +168,9 @@ bool MySQLConnection::Initialize(const char* infoString)
     // LEAVE 'AUTOCOMMIT' MODE ALWAYS ENABLED!!!
     // W/O IT EVEN 'SELECT' QUERIES WOULD REQUIRE TO BE WRAPPED INTO 'START TRANSACTION'<>'COMMIT' CLAUSES!!!
     if (!mysql_autocommit(mMysql, 1))
-        DETAIL_LOG("AUTOCOMMIT SUCCESSFULLY SET TO 1");
+        { DETAIL_LOG("AUTOCOMMIT SUCCESSFULLY SET TO 1"); }
     else
-        DETAIL_LOG("AUTOCOMMIT NOT SET TO 1");
+        { DETAIL_LOG("AUTOCOMMIT NOT SET TO 1"); }
     /*-------------------------------------*/
 
     // set connection properties to UTF8 to properly handle locales for different
@@ -183,7 +184,7 @@ bool MySQLConnection::Initialize(const char* infoString)
 bool MySQLConnection::_Query(const char* sql, MYSQL_RES** pResult, MYSQL_FIELD** pFields, uint64* pRowCount, uint32* pFieldCount)
 {
     if (!mMysql)
-        return 0;
+        { return 0; }
 
     uint32 _s = WorldTimer::getMSTime();
 
@@ -203,7 +204,7 @@ bool MySQLConnection::_Query(const char* sql, MYSQL_RES** pResult, MYSQL_FIELD**
     *pFieldCount = mysql_field_count(mMysql);
 
     if (!*pResult)
-        return false;
+        { return false; }
 
     if (!*pRowCount)
     {
@@ -223,7 +224,7 @@ QueryResult* MySQLConnection::Query(const char* sql)
     uint32 fieldCount = 0;
 
     if (!_Query(sql, &result, &fields, &rowCount, &fieldCount))
-        return NULL;
+        { return NULL; }
 
     QueryResultMysql* queryResult = new QueryResultMysql(result, fields, rowCount, fieldCount);
 
@@ -239,11 +240,11 @@ QueryNamedResult* MySQLConnection::QueryNamed(const char* sql)
     uint32 fieldCount = 0;
 
     if (!_Query(sql, &result, &fields, &rowCount, &fieldCount))
-        return NULL;
+        { return NULL; }
 
     QueryFieldNames names(fieldCount);
     for (uint32 i = 0; i < fieldCount; ++i)
-        names[i] = fields[i].name;
+        { names[i] = fields[i].name; }
 
     QueryResultMysql* queryResult = new QueryResultMysql(result, fields, rowCount, fieldCount);
 
@@ -254,7 +255,7 @@ QueryNamedResult* MySQLConnection::QueryNamed(const char* sql)
 bool MySQLConnection::Execute(const char* sql)
 {
     if (!mMysql)
-        return false;
+        { return false; }
 
     {
         uint32 _s = WorldTimer::getMSTime();
@@ -308,9 +309,9 @@ bool MySQLConnection::RollbackTransaction()
 unsigned long MySQLConnection::escape_string(char* to, const char* from, unsigned long length)
 {
     if (!mMysql || !to || !from || !length)
-        return 0;
+        { return 0; }
 
-    return (mysql_real_escape_string(mMysql, to, from, length));
+    return(mysql_real_escape_string(mMysql, to, from, length));
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -333,7 +334,7 @@ MySqlPreparedStatement::~MySqlPreparedStatement()
 bool MySqlPreparedStatement::prepare()
 {
     if (isPrepared())
-        return true;
+        { return true; }
 
     // remove old binds
     RemoveBinds();
@@ -399,7 +400,7 @@ void MySqlPreparedStatement::bind(const SqlStmtParameters& holder)
 
     // finalize adding params
     if (!m_pInputArgs)
-        return;
+        { return; }
 
     // verify if we bound all needed input parameters
     if (m_nParams != holder.boundParams())
@@ -447,7 +448,7 @@ void MySqlPreparedStatement::addParam(unsigned int nIndex, const SqlStmtFieldDat
 void MySqlPreparedStatement::RemoveBinds()
 {
     if (!m_stmt)
-        return;
+        { return; }
 
     delete[] m_pInputArgs;
     delete[] m_pResult;
@@ -466,11 +467,11 @@ void MySqlPreparedStatement::RemoveBinds()
 bool MySqlPreparedStatement::execute()
 {
     if (!isPrepared())
-        return false;
+        { return false; }
 
     if (mysql_stmt_execute(m_stmt))
     {
-        sLog.outError("SQL: cannot execute '%s'", m_szFmt.c_str());
+        sLog.outError("SQL: can not execute '%s'", m_szFmt.c_str());
         sLog.outError("SQL ERROR: %s", mysql_stmt_error(m_stmt));
         return false;
     }
diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
index eed35e5de..3778c9bb7 100644
--- a/src/shared/Database/DatabaseMysql.h
+++ b/src/shared/Database/DatabaseMysql.h
@@ -24,102 +24,245 @@
 
 #ifndef DO_POSTGRESQL
 
-#ifndef _DATABASEMYSQL_H
-#define _DATABASEMYSQL_H
+#ifndef MANGOS_H_DATABASEMYSQL
+#define MANGOS_H_DATABASEMYSQL
 
 //#include "Common.h"
 #include "Database.h"
 #include "Policies/Singleton.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Guard_T.h"
+#include <ace/Thread_Mutex.h>
+#include <ace/Guard_T.h>
+#include <mysql.h>
 
 #ifdef WIN32
 #include <winsock2.h>
-#include <mysql/mysql.h>
-#else
-#include <mysql.h>
 #endif
 
-// MySQL prepared statement class
-class  MySqlPreparedStatement : public SqlPreparedStatement
+/**
+ * @brief MySQL prepared statement class
+ *
+ */
+class MySqlPreparedStatement : public SqlPreparedStatement
 {
     public:
+        /**
+         * @brief
+         *
+         * @param fmt
+         * @param conn
+         * @param mysql
+         */
         MySqlPreparedStatement(const std::string& fmt, SqlConnection& conn, MYSQL* mysql);
+        /**
+         * @brief
+         *
+         */
         ~MySqlPreparedStatement();
 
-        // prepare statement
+        /**
+         * @brief prepare statement
+         *
+         * @return bool
+         */
         virtual bool prepare() override;
 
-        // bind input parameters
+        /**
+         * @brief bind input parameters
+         *
+         * @param holder
+         */
         virtual void bind(const SqlStmtParameters& holder) override;
 
-        // execute DML statement
+        /**
+         * @brief execute DML statement
+         *
+         * @return bool
+         */
         virtual bool execute() override;
 
     protected:
-        // bind parameters
+        /**
+         * @brief bind parameters
+         *
+         * @param nIndex
+         * @param data
+         */
         void addParam(unsigned int nIndex, const SqlStmtFieldData& data);
 
+        /**
+         * @brief
+         *
+         * @param data
+         * @param bUnsigned
+         * @return enum_field_types
+         */
         static enum_field_types ToMySQLType(const SqlStmtFieldData& data, my_bool& bUnsigned);
 
     private:
+        /**
+         * @brief
+         *
+         */
         void RemoveBinds();
 
-        MYSQL* m_pMySQLConn;
-        MYSQL_STMT* m_stmt;
-        MYSQL_BIND* m_pInputArgs;
-        MYSQL_BIND* m_pResult;
-        MYSQL_RES* m_pResultMetadata;
+        MYSQL* m_pMySQLConn; /**< TODO */
+        MYSQL_STMT* m_stmt; /**< TODO */
+        MYSQL_BIND* m_pInputArgs; /**< TODO */
+        MYSQL_BIND* m_pResult; /**< TODO */
+        MYSQL_RES* m_pResultMetadata; /**< TODO */
 };
 
-class  MySQLConnection : public SqlConnection
+/**
+ * @brief
+ *
+ */
+class MySQLConnection : public SqlConnection
 {
     public:
+        /**
+         * @brief
+         *
+         * @param db
+         */
         MySQLConnection(Database& db) : SqlConnection(db), mMysql(NULL) {}
+        /**
+         * @brief
+         *
+         */
         ~MySQLConnection();
 
-        //! Initializes Mysql and connects to a server.
-        /*! infoString should be formated like hostname;username;password;database. */
+        /**
+         * @brief Initializes Mysql and connects to a server.
+         *
+         * @param infoString infoString should be formated like hostname;username;password;database
+         * @return bool
+         */
         bool Initialize(const char* infoString) override;
 
+        /**
+         * @brief
+         *
+         * @param sql
+         * @return QueryResult
+         */
         QueryResult* Query(const char* sql) override;
+        /**
+         * @brief
+         *
+         * @param sql
+         * @return QueryNamedResult
+         */
         QueryNamedResult* QueryNamed(const char* sql) override;
+        /**
+         * @brief
+         *
+         * @param sql
+         * @return bool
+         */
         bool Execute(const char* sql) override;
 
+        /**
+         * @brief
+         *
+         * @param to
+         * @param from
+         * @param length
+         * @return unsigned long
+         */
         unsigned long escape_string(char* to, const char* from, unsigned long length);
 
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool BeginTransaction() override;
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool CommitTransaction() override;
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool RollbackTransaction() override;
 
     protected:
+        /**
+         * @brief
+         *
+         * @param fmt
+         * @return SqlPreparedStatement
+         */
         SqlPreparedStatement* CreateStatement(const std::string& fmt) override;
 
     private:
+        /**
+         * @brief
+         *
+         * @param sql
+         * @return bool
+         */
         bool _TransactionCmd(const char* sql);
+        /**
+         * @brief
+         *
+         * @param sql
+         * @param pResult
+         * @param pFields
+         * @param pRowCount
+         * @param pFieldCount
+         * @return bool
+         */
         bool _Query(const char* sql, MYSQL_RES** pResult, MYSQL_FIELD** pFields, uint64* pRowCount, uint32* pFieldCount);
 
-        MYSQL* mMysql;
+        MYSQL* mMysql; /**< TODO */
 };
 
-class  DatabaseMysql : public Database
+/**
+ * @brief
+ *
+ */
+class DatabaseMysql : public Database
 {
         friend class MaNGOS::OperatorNew<DatabaseMysql>;
 
     public:
+        /**
+         * @brief
+         *
+         */
         DatabaseMysql();
+        /**
+         * @brief
+         *
+         */
         ~DatabaseMysql();
 
-        // must be call before first query in thread
+        /**
+         * @brief must be call before first query in thread
+         *
+         */
         void ThreadStart() override;
-        // must be call before finish thread run
+        /**
+         * @brief must be call before finish thread run
+         *
+         */
         void ThreadEnd() override;
 
     protected:
+        /**
+         * @brief
+         *
+         * @return SqlConnection
+         */
         virtual SqlConnection* CreateConnection() override;
 
     private:
-        static size_t db_count;
+        static size_t db_count; /**< TODO */
 };
 
 #endif
diff --git a/src/shared/Database/DatabasePostgre.cpp b/src/shared/Database/DatabasePostgre.cpp
index 5dec9bc51..ab427e6bf 100644
--- a/src/shared/Database/DatabasePostgre.cpp
+++ b/src/shared/Database/DatabasePostgre.cpp
@@ -53,7 +53,7 @@ DatabasePostgre::~DatabasePostgre()
 
 SqlConnection* DatabasePostgre::CreateConnection()
 {
-    return new PostgreSQLConnection();
+    return new PostgreSQLConnection(*this);
 }
 
 PostgreSQLConnection::~PostgreSQLConnection()
@@ -72,20 +72,20 @@ bool PostgreSQLConnection::Initialize(const char* infoString)
     iter = tokens.begin();
 
     if (iter != tokens.end())
-        host = *iter++;
+        { host = *iter++; }
     if (iter != tokens.end())
-        port_or_socket_dir = *iter++;
+        { port_or_socket_dir = *iter++; }
     if (iter != tokens.end())
-        user = *iter++;
+        { user = *iter++; }
     if (iter != tokens.end())
-        password = *iter++;
+        { password = *iter++; }
     if (iter != tokens.end())
-        database = *iter++;
+        { database = *iter++; }
 
     if (host == ".")
-        mPGconn = PQsetdbLogin(NULL, port_or_socket_dir == "." ? NULL : port_or_socket_dir.c_str(), NULL, NULL, database.c_str(), user.c_str(), password.c_str());
+        { mPGconn = PQsetdbLogin(NULL, port_or_socket_dir == "." ? NULL : port_or_socket_dir.c_str(), NULL, NULL, database.c_str(), user.c_str(), password.c_str()); }
     else
-        mPGconn = PQsetdbLogin(host.c_str(), port_or_socket_dir.c_str(), NULL, NULL, database.c_str(), user.c_str(), password.c_str());
+        { mPGconn = PQsetdbLogin(host.c_str(), port_or_socket_dir.c_str(), NULL, NULL, database.c_str(), user.c_str(), password.c_str()); }
 
     /* check to see that the backend connection was successfully made */
     if (PQstatus(mPGconn) != CONNECTION_OK)
@@ -105,13 +105,13 @@ bool PostgreSQLConnection::Initialize(const char* infoString)
 bool PostgreSQLConnection::_Query(const char* sql, PGresult** pResult, uint64* pRowCount, uint32* pFieldCount)
 {
     if (!mPGconn)
-        return false;
+        { return false; }
 
     uint32 _s = WorldTimer::getMSTime();
     // Send the query
     *pResult = PQexec(mPGconn, sql);
     if (!*pResult)
-        return false;
+        { return false; }
 
     if (PQresultStatus(*pResult) != PGRES_TUPLES_OK)
     {
@@ -141,14 +141,14 @@ bool PostgreSQLConnection::_Query(const char* sql, PGresult** pResult, uint64* p
 QueryResult* PostgreSQLConnection::Query(const char* sql)
 {
     if (!mPGconn)
-        return NULL;
+        { return NULL; }
 
     PGresult* result = NULL;
     uint64 rowCount = 0;
     uint32 fieldCount = 0;
 
     if (!_Query(sql, &result, &rowCount, &fieldCount))
-        return NULL;
+        { return NULL; }
 
     QueryResultPostgre* queryResult = new QueryResultPostgre(result, rowCount, fieldCount);
 
@@ -159,18 +159,18 @@ QueryResult* PostgreSQLConnection::Query(const char* sql)
 QueryNamedResult* PostgreSQLConnection::QueryNamed(const char* sql)
 {
     if (!mPGconn)
-        return NULL;
+        { return NULL; }
 
     PGresult* result = NULL;
     uint64 rowCount = 0;
     uint32 fieldCount = 0;
 
     if (!_Query(sql, &result, &rowCount, &fieldCount))
-        return NULL;
+        { return NULL; }
 
     QueryFieldNames names(fieldCount);
     for (uint32 i = 0; i < fieldCount; ++i)
-        names[i] = PQfname(result, i);
+        { names[i] = PQfname(result, i); }
 
     QueryResultPostgre* queryResult = new QueryResultPostgre(result, rowCount, fieldCount);
 
@@ -181,7 +181,7 @@ QueryNamedResult* PostgreSQLConnection::QueryNamed(const char* sql)
 bool PostgreSQLConnection::Execute(const char* sql)
 {
     if (!mPGconn)
-        return false;
+        { return false; }
 
     uint32 _s = WorldTimer::getMSTime();
 
@@ -204,7 +204,7 @@ bool PostgreSQLConnection::Execute(const char* sql)
 bool PostgreSQLConnection::_TransactionCmd(const char* sql)
 {
     if (!mPGconn)
-        return false;
+        { return false; }
 
     PGresult* res = PQexec(mPGconn, sql);
     if (PQresultStatus(res) != PGRES_COMMAND_OK)
@@ -238,7 +238,7 @@ bool PostgreSQLConnection::RollbackTransaction()
 unsigned long PostgreSQLConnection::escape_string(char* to, const char* from, unsigned long length)
 {
     if (!mPGconn || !to || !from || !length)
-        return 0;
+        { return 0; }
 
     return PQescapeString(to, from, length);
 }
diff --git a/src/shared/Database/DatabasePostgre.h b/src/shared/Database/DatabasePostgre.h
index 8b9779898..7a1e5304c 100644
--- a/src/shared/Database/DatabasePostgre.h
+++ b/src/shared/Database/DatabasePostgre.h
@@ -28,8 +28,8 @@
 #include "Common.h"
 #include "Database.h"
 #include "Policies/Singleton.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Guard_T.h"
+#include <ace/Thread_Mutex.h>
+#include <ace/Guard_T.h>
 #include <stdarg.h>
 
 #ifdef WIN32
@@ -40,10 +40,10 @@
 #include <libpq-fe.h>
 #endif
 
-class  PostgreSQLConnection : public SqlConnection
+class PostgreSQLConnection : public SqlConnection
 {
     public:
-        PostgreSQLConnection() : mPGconn(NULL) {}
+        PostgreSQLConnection(Database& db) : SqlConnection(db), mPGconn(NULL) {}
         ~PostgreSQLConnection();
 
         bool Initialize(const char* infoString) override;
@@ -65,7 +65,7 @@ class  PostgreSQLConnection : public SqlConnection
         PGconn* mPGconn;
 };
 
-class  DatabasePostgre : public Database
+class DatabasePostgre : public Database
 {
         friend class MaNGOS::OperatorNew<DatabasePostgre>;
 
diff --git a/src/shared/Database/Field.h b/src/shared/Database/Field.h
index ff1302c1e..38dfd018a 100644
--- a/src/shared/Database/Field.h
+++ b/src/shared/Database/Field.h
@@ -25,12 +25,21 @@
 #ifndef FIELD_H
 #define FIELD_H
 
-#include "Common.h"
+#include "Common/Common.h"
+#include <mysql.h>
 
+/**
+ * @brief
+ *
+ */
 class Field
 {
     public:
 
+        /**
+         * @brief
+         *
+         */
         enum DataTypes
         {
             DB_TYPE_UNKNOWN = 0x00,
@@ -40,26 +49,95 @@ class Field
             DB_TYPE_BOOL    = 0x04
         };
 
+        /**
+         * @brief
+         *
+         */
         Field() : mValue(NULL), mType(DB_TYPE_UNKNOWN) {}
+        /**
+         * @brief
+         *
+         * @param value
+         * @param type
+         */
         Field(const char* value, enum DataTypes type) : mValue(value), mType(type) {}
 
+        /**
+         * @brief
+         *
+         */
         ~Field() {}
 
         enum DataTypes GetType() const { return mType; }
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool IsNULL() const { return mValue == NULL; }
 
+        /**
+         * @brief
+         *
+         * @return const char
+         */
         const char* GetString() const { return mValue; }
+        /**
+         * @brief
+         *
+         * @return std::string
+         */
         std::string GetCppString() const
         {
             return mValue ? mValue : "";                    // std::string s = 0 have undefine result in C++
         }
+        /**
+         * @brief
+         *
+         * @return float
+         */
         float GetFloat() const { return mValue ? static_cast<float>(atof(mValue)) : 0.0f; }
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool GetBool() const { return mValue ? atoi(mValue) > 0 : false; }
+        /**
+         * @brief
+         *
+         * @return int32
+         */
         int32 GetInt32() const { return mValue ? static_cast<int32>(atol(mValue)) : int32(0); }
+        /**
+         * @brief
+         *
+         * @return uint8
+         */
         uint8 GetUInt8() const { return mValue ? static_cast<uint8>(atol(mValue)) : uint8(0); }
+        /**
+         * @brief
+         *
+         * @return uint16
+         */
         uint16 GetUInt16() const { return mValue ? static_cast<uint16>(atol(mValue)) : uint16(0); }
+        /**
+         * @brief
+         *
+         * @return int16
+         */
         int16 GetInt16() const { return mValue ? static_cast<int16>(atol(mValue)) : int16(0); }
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 GetUInt32() const { return mValue ? static_cast<uint32>(atol(mValue)) : uint32(0); }
+        /**
+         * @brief
+         *
+         * @return uint64
+         */
         uint64 GetUInt64() const
         {
             uint64 value = 0;
@@ -70,15 +148,32 @@ class Field
         }
 
         void SetType(enum DataTypes type) { mType = type; }
-        // no need for memory allocations to store resultset field strings
-        // all we need is to cache pointers returned by different DBMS APIs
-        void SetValue(const char* value) { mValue = value; };
+
+        /**
+         * @brief no need for memory allocations to store resultset field strings
+         *
+         * all we need is to cache pointers returned by different DBMS APIs
+         *
+         * @param value
+         */
+        void SetValue(const char* value) { mValue = value; }
 
     private:
+        /**
+         * @brief
+         *
+         * @param
+         */
         Field(Field const&);
+        /**
+         * @brief
+         *
+         * @param
+         * @return Field &operator
+         */
         Field& operator=(Field const&);
 
-        const char* mValue;
+        const char* mValue; /**< TODO */
         enum DataTypes mType;
 };
 #endif
diff --git a/src/shared/Database/PGSQLDelayThread.h b/src/shared/Database/PGSQLDelayThread.h
index 69e6d38ae..0395300b3 100644
--- a/src/shared/Database/PGSQLDelayThread.h
+++ b/src/shared/Database/PGSQLDelayThread.h
@@ -22,8 +22,8 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef __PGSQLDELAYTHREAD_H
-#define __PGSQLDELAYTHREAD_H
+#ifndef MANGOS_H_PGSQLDELAYTHREAD
+#define MANGOS_H_PGSQLDELAYTHREAD
 
 #include "Database/SqlDelayThread.h"
 
diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h
index 0f26a15b8..459fb8819 100644
--- a/src/shared/Database/QueryResult.h
+++ b/src/shared/Database/QueryResult.h
@@ -25,66 +25,166 @@
 #ifndef QUERYRESULT_H
 #define QUERYRESULT_H
 
-#include "Common.h"
-#include "Errors.h"
+#include "Common/Common.h"
+#include "Utilities/Errors.h"
 #include "Field.h"
 
-class  QueryResult
+/**
+ * @brief
+ *
+ */
+class QueryResult
 {
     public:
+        /**
+         * @brief
+         *
+         * @param rowCount
+         * @param fieldCount
+         */
         QueryResult(uint64 rowCount, uint32 fieldCount)
             : mFieldCount(fieldCount), mRowCount(rowCount) {}
 
+        /**
+         * @brief
+         *
+         */
         virtual ~QueryResult() {}
 
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         virtual bool NextRow() = 0;
 
+        /**
+         * @brief
+         *
+         * @return Field
+         */
         Field* Fetch() const { return mCurrentRow; }
 
+        /**
+         * @brief
+         *
+         * @param index
+         * @return const Field &operator
+         */
         const Field& operator [](int index) const { return mCurrentRow[index]; }
 
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 GetFieldCount() const { return mFieldCount; }
+        /**
+         * @brief
+         *
+         * @return uint64
+         */
         uint64 GetRowCount() const { return mRowCount; }
 
     protected:
-        Field* mCurrentRow;
-        uint32 mFieldCount;
-        uint64 mRowCount;
+        Field* mCurrentRow; /**< TODO */
+        uint32 mFieldCount; /**< TODO */
+        uint64 mRowCount; /**< TODO */
 };
 
+/**
+ * @brief
+ *
+ */
 typedef std::vector<std::string> QueryFieldNames;
 
-class  QueryNamedResult
+/**
+ * @brief
+ *
+ */
+class QueryNamedResult
 {
     public:
+        /**
+         * @brief
+         *
+         * @param query
+         * @param names
+         */
         explicit QueryNamedResult(QueryResult* query, QueryFieldNames const& names) : mQuery(query), mFieldNames(names) {}
+        /**
+         * @brief
+         *
+         */
         ~QueryNamedResult() { delete mQuery; }
 
         // compatible interface with QueryResult
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool NextRow() { return mQuery->NextRow(); }
+        /**
+         * @brief
+         *
+         * @return Field
+         */
         Field* Fetch() const { return mQuery->Fetch(); }
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 GetFieldCount() const { return mQuery->GetFieldCount(); }
+        /**
+         * @brief
+         *
+         * @return uint64
+         */
         uint64 GetRowCount() const { return mQuery->GetRowCount(); }
+        /**
+         * @brief
+         *
+         * @param index
+         * @return const Field &operator
+         */
         Field const& operator[](int index) const { return (*mQuery)[index]; }
 
-        // named access
+        /**
+         * @brief named access
+         *
+         * @param name
+         * @return const Field &operator
+         */
         Field const& operator[](const std::string& name) const { return mQuery->Fetch()[GetField_idx(name)]; }
+        /**
+         * @brief
+         *
+         * @return const QueryFieldNames
+         */
         QueryFieldNames const& GetFieldNames() const { return mFieldNames; }
 
+        /**
+         * @brief
+         *
+         * @param name
+         * @return uint32
+         */
         uint32 GetField_idx(const std::string& name) const
         {
             for (size_t idx = 0; idx < mFieldNames.size(); ++idx)
             {
                 if (mFieldNames[idx] == name)
-                    return idx;
+                    { return idx; }
             }
             MANGOS_ASSERT(false && "unknown field name");
             return uint32(-1);
         }
 
     protected:
-        QueryResult* mQuery;
-        QueryFieldNames mFieldNames;
+        QueryResult* mQuery; /**< TODO */
+        QueryFieldNames mFieldNames; /**< TODO */
 };
 
 #endif
diff --git a/src/shared/Database/QueryResultMysql.cpp b/src/shared/Database/QueryResultMysql.cpp
index 3422cf6f3..cb2adc86c 100644
--- a/src/shared/Database/QueryResultMysql.cpp
+++ b/src/shared/Database/QueryResultMysql.cpp
@@ -25,7 +25,7 @@
 #ifndef DO_POSTGRESQL
 
 #include "DatabaseEnv.h"
-#include "Errors.h"
+#include "Utilities/Errors.h"
 
 QueryResultMysql::QueryResultMysql(MYSQL_RES* result, MYSQL_FIELD* fields, uint64 rowCount, uint32 fieldCount) :
     QueryResult(rowCount, fieldCount), mResult(result)
@@ -47,7 +47,7 @@ bool QueryResultMysql::NextRow()
     MYSQL_ROW row;
 
     if (!mResult)
-        return false;
+        { return false; }
 
     row = mysql_fetch_row(mResult);
     if (!row)
@@ -57,7 +57,7 @@ bool QueryResultMysql::NextRow()
     }
 
     for (uint32 i = 0; i < mFieldCount; ++i)
-        mCurrentRow[i].SetValue(row[i]);
+        { mCurrentRow[i].SetValue(row[i]); }
 
     return true;
 }
diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h
index 6e20aa9d5..e8e7fe1f0 100644
--- a/src/shared/Database/QueryResultMysql.h
+++ b/src/shared/Database/QueryResultMysql.h
@@ -27,29 +27,55 @@
 #if !defined(QUERYRESULTMYSQL_H)
 #define QUERYRESULTMYSQL_H
 
-#include "Common.h"
+#include "Common/Common.h"
 
 #ifdef WIN32
 #include <winsock2.h>
-#include <mysql/mysql.h>
-#else
-#include <mysql.h>
 #endif
 
+#include <mysql.h>
+
+/**
+ * @brief
+ *
+ */
 class QueryResultMysql : public QueryResult
 {
     public:
+        /**
+         * @brief
+         *
+         * @param result
+         * @param fields
+         * @param rowCount
+         * @param fieldCount
+         */
         QueryResultMysql(MYSQL_RES* result, MYSQL_FIELD* fields, uint64 rowCount, uint32 fieldCount);
 
+        /**
+         * @brief
+         *
+         */
         ~QueryResultMysql();
 
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool NextRow() override;
 
+        /**
+         * @brief
+         *
+         * @param type
+         * @return Field::SimpleDataTypes
+         */
     private:
         enum Field::DataTypes ConvertNativeType(enum_field_types mysqlType) const;
         void EndQuery();
 
-        MYSQL_RES* mResult;
+        MYSQL_RES* mResult; /**< TODO */
 };
 #endif
 #endif
diff --git a/src/shared/Database/QueryResultPostgre.cpp b/src/shared/Database/QueryResultPostgre.cpp
index b5be5b0a5..f89cb0b49 100644
--- a/src/shared/Database/QueryResultPostgre.cpp
+++ b/src/shared/Database/QueryResultPostgre.cpp
@@ -34,7 +34,7 @@ QueryResultPostgre::QueryResultPostgre(PGresult* result, uint64 rowCount, uint32
     MANGOS_ASSERT(mCurrentRow);
 
     for (uint32 i = 0; i < mFieldCount; ++i)
-        mCurrentRow[i].SetType(ConvertNativeType(PQftype(result, i)));
+        { mCurrentRow[i].SetType(ConvertNativeType(PQftype(result, i))); }
 }
 
 QueryResultPostgre::~QueryResultPostgre()
@@ -45,7 +45,7 @@ QueryResultPostgre::~QueryResultPostgre()
 bool QueryResultPostgre::NextRow()
 {
     if (!mResult)
-        return false;
+        { return false; }
 
     if (mTableIndex >= mRowCount)
     {
@@ -58,7 +58,7 @@ bool QueryResultPostgre::NextRow()
     {
         pPQgetvalue = PQgetvalue(mResult, mTableIndex, j);
         if (pPQgetvalue && !(*pPQgetvalue))
-            pPQgetvalue = NULL;
+            { pPQgetvalue = NULL; }
 
         mCurrentRow[j].SetValue(pPQgetvalue);
     }
diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp
index 12a666a6c..306c4f239 100644
--- a/src/shared/Database/SQLStorage.cpp
+++ b/src/shared/Database/SQLStorage.cpp
@@ -75,42 +75,42 @@ void SQLStorageBase::prepareToLoad(uint32 maxEntry, uint32 recordCount, uint32 r
 void SQLStorageBase::Free()
 {
     if (!m_data)
-        return;
+        { return; }
 
     uint32 offset = 0;
     for (uint32 x = 0; x < m_dstFieldCount; ++x)
     {
         switch (m_dst_format[x])
         {
-            case FT_LOGIC:
+            case DBC_FF_LOGIC:
                 offset += sizeof(bool);
                 break;
-            case FT_STRING:
+            case DBC_FF_STRING:
             {
                 for (uint32 recordItr = 0; recordItr < m_recordCount; ++recordItr)
-                    delete[] *(char**)((char*)(m_data + (recordItr * m_recordSize)) + offset);
+                    { delete[] *(char**)((char*)(m_data + (recordItr * m_recordSize)) + offset); }
 
                 offset += sizeof(char*);
                 break;
             }
-            case FT_NA:
-            case FT_INT:
+            case DBC_FF_NA:
+            case DBC_FF_INT:
                 offset += sizeof(uint32);
                 break;
-            case FT_BYTE:
-            case FT_NA_BYTE:
+            case DBC_FF_BYTE:
+            case DBC_FF_NA_BYTE:
                 offset += sizeof(char);
                 break;
-            case FT_FLOAT:
-            case FT_NA_FLOAT:
+            case DBC_FF_FLOAT:
+            case DBC_FF_NA_FLOAT:
                 offset += sizeof(float);
                 break;
-            case FT_NA_POINTER:
+            case DBC_FF_NA_POINTER:
                 // TODO- possible (and small) memleak here possible
                 offset += sizeof(char*);
                 break;
-            case FT_IND:
-            case FT_SORT:
+            case DBC_FF_IND:
+            case DBC_FF_SORT:
                 assert(false && "SQL storage not have sort field types");
                 break;
             default:
@@ -137,10 +137,10 @@ void SQLStorage::Free()
     m_Index = NULL;
 }
 
-void SQLStorage::Load()
+void SQLStorage::Load(bool error_at_empty /*= true*/)
 {
     SQLStorageLoader loader;
-    loader.Load(*this);
+    loader.Load(*this, error_at_empty);
 }
 
 SQLStorage::SQLStorage(const char* fmt, const char* _entry_field, const char* sqlname)
@@ -193,7 +193,7 @@ void SQLHashStorage::EraseEntry(uint32 id)
     // do not erase from m_records
     RecordMap::iterator find = m_indexMap.find(id);
     if (find != m_indexMap.end())
-        find->second = NULL;
+        { find->second = NULL; }
 }
 
 SQLHashStorage::SQLHashStorage(const char* fmt, const char* _entry_field, const char* sqlname)
diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h
index ed809c888..e9ff11da2 100644
--- a/src/shared/Database/SQLStorage.h
+++ b/src/shared/Database/SQLStorage.h
@@ -25,270 +25,751 @@
 #ifndef SQLSTORAGE_H
 #define SQLSTORAGE_H
 
-#include "Common.h"
+#include "Common/Common.h"
 #include "Database/DatabaseEnv.h"
-#include "DBCFileLoader.h"
+#include "DataStores/DBCFileLoader.h"
 
+/**
+ * @brief
+ *
+ */
 class SQLStorageBase
 {
-    template<class DerivedLoader, class StorageClass> friend class SQLStorageLoaderBase;
+        template<class DerivedLoader, class StorageClass> friend class SQLStorageLoaderBase;
 
     public:
+        /**
+         * @brief
+         *
+         * @return const char
+         */
         char const* GetTableName() const { return m_tableName; }
+        /**
+         * @brief
+         *
+         * @return const char
+         */
         char const* EntryFieldName() const { return m_entry_field; }
 
-        FieldFormat GetDstFormat(uint32 idx) const { return (FieldFormat)m_dst_format[idx]; };
-        const char* GetDstFormat() const { return m_dst_format; };
-        FieldFormat GetSrcFormat(uint32 idx) const { return (FieldFormat)m_src_format[idx]; };
-        const char* GetSrcFormat() const { return m_src_format; };
+        /**
+         * @brief
+         *
+         * @param idx
+         * @return FieldFormat
+         */
+        FieldFormat GetDstFormat(uint32 idx) const { return (FieldFormat)m_dst_format[idx]; }
+        /**
+         * @brief
+         *
+         * @return const char
+         */
+        const char* GetDstFormat() const { return m_dst_format; }
+        /**
+         * @brief
+         *
+         * @param idx
+         * @return FieldFormat
+         */
+        FieldFormat GetSrcFormat(uint32 idx) const { return (FieldFormat)m_src_format[idx]; }
+        /**
+         * @brief
+         *
+         * @return const char
+         */
+        const char* GetSrcFormat() const { return m_src_format; }
 
-        uint32 GetMaxEntry() const { return m_maxEntry; };
-        uint32 GetRecordCount() const { return m_recordCount; };
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
+        uint32 GetMaxEntry() const { return m_maxEntry; }
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
+        uint32 GetRecordCount() const { return m_recordCount; }
 
         template<typename T>
+        /**
+         * @brief
+         *
+         */
         class SQLSIterator
         {
-            friend class SQLStorageBase;
+                friend class SQLStorageBase;
 
             public:
+                /**
+                 * @brief
+                 *
+                 * @return const T
+                 */
                 T const* getValue() const { return reinterpret_cast<T const*>(pointer); }
 
+                /**
+                 * @brief
+                 *
+                 */
                 void operator ++() { pointer += recordSize; }
+                /**
+                 * @brief
+                 *
+                 * @return const T *operator
+                 */
                 T const* operator *() const { return getValue(); }
+                /**
+                 * @brief
+                 *
+                 * @return const T *operator ->
+                 */
                 T const* operator ->() const { return getValue(); }
+                /**
+                 * @brief
+                 *
+                 * @param r
+                 * @return bool operator
+                 */
                 bool operator <(const SQLSIterator& r) const { return pointer < r.pointer; }
+                /**
+                 * @brief
+                 *
+                 * @param r
+                 */
                 void operator =(const SQLSIterator& r) { pointer = r.pointer; recordSize = r.recordSize; }
 
             private:
+                /**
+                 * @brief
+                 *
+                 * @param ptr
+                 * @param _recordSize
+                 */
                 SQLSIterator(char* ptr, uint32 _recordSize) : pointer(ptr), recordSize(_recordSize) {}
-                char* pointer;
-                uint32 recordSize;
+                char* pointer; /**< TODO */
+                uint32 recordSize; /**< TODO */
         };
 
         template<typename T>
+        /**
+         * @brief
+         *
+         * @return SQLSIterator<T>
+         */
         SQLSIterator<T> getDataBegin() const { return SQLSIterator<T>(m_data, m_recordSize); }
         template<typename T>
+        /**
+         * @brief
+         *
+         * @return SQLSIterator<T>
+         */
         SQLSIterator<T> getDataEnd() const { return SQLSIterator<T>(m_data + m_recordCount * m_recordSize, m_recordSize); }
 
     protected:
+        /**
+         * @brief
+         *
+         */
         SQLStorageBase();
+        /**
+         * @brief
+         *
+         */
         virtual ~SQLStorageBase() { Free(); }
 
+        /**
+         * @brief
+         *
+         * @param tableName
+         * @param entry_field
+         * @param src_format
+         * @param dst_format
+         */
         void Initialize(const char* tableName, const char* entry_field, const char* src_format, const char* dst_format);
 
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 GetDstFieldCount() const { return m_dstFieldCount; }
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 GetSrcFieldCount() const { return m_srcFieldCount; }
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 GetRecordSize() const { return m_recordSize; }
 
+        /**
+         * @brief
+         *
+         * @param maxRecordId
+         * @param recordCount
+         * @param recordSize
+         */
         virtual void prepareToLoad(uint32 maxRecordId, uint32 recordCount, uint32 recordSize);
+        /**
+         * @brief
+         *
+         * @param recordId
+         * @param record
+         */
         virtual void JustCreatedRecord(uint32 recordId, char* record) = 0;
+        /**
+         * @brief
+         *
+         */
         virtual void Free();
 
     private:
+        /**
+         * @brief
+         *
+         * @param recordId
+         * @return char
+         */
         char* createRecord(uint32 recordId);
 
         // Information about the table
-        const char* m_tableName;
-        const char* m_entry_field;
-        const char* m_src_format;
-        const char* m_dst_format;
+        const char* m_tableName; /**< TODO */
+        const char* m_entry_field; /**< TODO */
+        const char* m_src_format; /**< TODO */
+        const char* m_dst_format; /**< TODO */
 
         // Information about the records
-        uint32 m_dstFieldCount;
-        uint32 m_srcFieldCount;
-        uint32 m_recordCount;
-        uint32 m_maxEntry;
-        uint32 m_recordSize;
+        uint32 m_dstFieldCount; /**< TODO */
+        uint32 m_srcFieldCount; /**< TODO */
+        uint32 m_recordCount; /**< TODO */
+        uint32 m_maxEntry; /**< TODO */
+        uint32 m_recordSize; /**< TODO */
 
         // Data Storage
-        char* m_data;
+        char* m_data; /**< TODO */
 };
 
+/**
+ * @brief
+ *
+ */
 class SQLStorage : public SQLStorageBase
 {
-    template<class DerivedLoader, class StorageClass> friend class SQLStorageLoaderBase;
+        template<class DerivedLoader, class StorageClass> friend class SQLStorageLoaderBase;
 
     public:
+        /**
+         * @brief
+         *
+         * @param fmt
+         * @param _entry_field
+         * @param sqlname
+         */
         SQLStorage(const char* fmt, const char* _entry_field, const char* sqlname);
 
+        /**
+         * @brief
+         *
+         * @param src_fmt
+         * @param dst_fmt
+         * @param _entry_field
+         * @param sqlname
+         */
         SQLStorage(const char* src_fmt, const char* dst_fmt, const char* _entry_field, const char* sqlname);
 
+        /**
+         * @brief
+         *
+         */
         ~SQLStorage() { Free(); }
 
         template<class T>
+        /**
+         * @brief
+         *
+         * @param id
+         * @return const T
+         */
         T const* LookupEntry(uint32 id) const
         {
             if (id >= GetMaxEntry())
-                return NULL;
+                { return NULL; }
             return reinterpret_cast<T const*>(m_Index[id]);
         }
 
-        void Load();
+        /**
+         * @brief
+         *
+         * @param error_at_empty
+         */
+        void Load(bool error_at_empty = true);
 
+        /**
+         * @brief
+         *
+         * @param id
+         */
         void EraseEntry(uint32 id);
 
     protected:
+        /**
+         * @brief
+         *
+         * @param maxRecordId
+         * @param recordCount
+         * @param recordSize
+         */
         void prepareToLoad(uint32 maxRecordId, uint32 recordCount, uint32 recordSize) override;
+        /**
+         * @brief
+         *
+         * @param recordId
+         * @param record
+         */
         void JustCreatedRecord(uint32 recordId, char* record) override
         {
             m_Index[recordId] = record;
         }
 
+        /**
+         * @brief
+         *
+         */
         void Free() override;
 
     private:
-        // Lookup access
-        char** m_Index;
+        char** m_Index; /**< Lookup access */
 };
 
+/**
+ * @brief
+ *
+ */
 class SQLHashStorage : public SQLStorageBase
 {
-    template<class DerivedLoader, class StorageClass> friend class SQLStorageLoaderBase;
+        template<class DerivedLoader, class StorageClass> friend class SQLStorageLoaderBase;
 
     public:
+        /**
+         * @brief
+         *
+         * @param fmt
+         * @param _entry_field
+         * @param sqlname
+         */
         SQLHashStorage(const char* fmt, const char* _entry_field, const char* sqlname);
+        /**
+         * @brief
+         *
+         * @param src_fmt
+         * @param dst_fmt
+         * @param _entry_field
+         * @param sqlname
+         */
         SQLHashStorage(const char* src_fmt, const char* dst_fmt, const char* _entry_field, const char* sqlname);
 
+        /**
+         * @brief
+         *
+         */
         ~SQLHashStorage() { Free(); }
 
         template<class T>
+        /**
+         * @brief
+         *
+         * @param id
+         * @return const T
+         */
         T const* LookupEntry(uint32 id) const
         {
             RecordMap::const_iterator find = m_indexMap.find(id);
             if (find != m_indexMap.end())
-                return reinterpret_cast<T const*>(find->second);
+                { return reinterpret_cast<T const*>(find->second); }
             return NULL;
         }
 
+        /**
+         * @brief
+         *
+         */
         void Load();
 
+        /**
+         * @brief
+         *
+         * @param id
+         */
         void EraseEntry(uint32 id);
 
     protected:
+        /**
+         * @brief
+         *
+         * @param maxRecordId
+         * @param recordCount
+         * @param recordSize
+         */
         void prepareToLoad(uint32 maxRecordId, uint32 recordCount, uint32 recordSize) override;
+        /**
+         * @brief
+         *
+         * @param recordId
+         * @param record
+         */
         void JustCreatedRecord(uint32 recordId, char* record) override
         {
             m_indexMap[recordId] = record;
         }
 
+        /**
+         * @brief
+         *
+         */
         void Free() override;
 
     private:
-        typedef UNORDERED_MAP<uint32 /*recordId*/, char* /*record*/> RecordMap;
-        RecordMap m_indexMap;
+        /**
+         * @brief
+         *
+         */
+        typedef UNORDERED_MAP < uint32 /*recordId*/, char* /*record*/ > RecordMap;
+        RecordMap m_indexMap; /**< TODO */
 };
 
+/**
+ * @brief
+ *
+ */
 class SQLMultiStorage : public SQLStorageBase
 {
-    template<class DerivedLoader, class StorageClass> friend class SQLStorageLoaderBase;
-    template<typename T> friend class SQLMultiSIterator;
-    template<typename T> friend class SQLMSIteratorBounds;
+        template<class DerivedLoader, class StorageClass> friend class SQLStorageLoaderBase;
+        template<typename T> friend class SQLMultiSIterator;
+        template<typename T> friend class SQLMSIteratorBounds;
 
     private:
-        typedef std::multimap<uint32 /*recordId*/, char* /*record*/> RecordMultiMap;
+        /**
+         * @brief
+         *
+         */
+        typedef std::multimap < uint32 /*recordId*/, char* /*record*/ > RecordMultiMap;
 
     public:
+        /**
+         * @brief
+         *
+         * @param fmt
+         * @param _entry_field
+         * @param sqlname
+         */
         SQLMultiStorage(const char* fmt, const char* _entry_field, const char* sqlname);
+        /**
+         * @brief
+         *
+         * @param src_fmt
+         * @param dst_fmt
+         * @param _entry_field
+         * @param sqlname
+         */
         SQLMultiStorage(const char* src_fmt, const char* dst_fmt, const char* _entry_field, const char* sqlname);
 
+        /**
+         * @brief
+         *
+         */
         ~SQLMultiStorage() { Free(); }
 
         // forward declaration
         template<typename T> class SQLMSIteratorBounds;
 
         template<typename T>
+        /**
+         * @brief
+         *
+         */
         class SQLMultiSIterator
         {
-            friend class SQLMultiStorage;
-            friend class SQLMSIteratorBounds<T>;
+                friend class SQLMultiStorage;
+                friend class SQLMSIteratorBounds<T>;
 
             public:
+                /**
+                 * @brief
+                 *
+                 * @return const T
+                 */
                 T const* getValue() const { return reinterpret_cast<T const*>(citerator->second); }
+                /**
+                 * @brief
+                 *
+                 * @return uint32
+                 */
                 uint32 getKey() const { return citerator->first; }
 
+                /**
+                 * @brief
+                 *
+                 */
                 void operator ++() { ++citerator; }
+                /**
+                 * @brief
+                 *
+                 * @return const T *operator
+                 */
                 T const* operator *() const { return getValue(); }
+                /**
+                 * @brief
+                 *
+                 * @return const T *operator ->
+                 */
                 T const* operator ->() const { return getValue(); }
+                /**
+                 * @brief
+                 *
+                 * @param r
+                 * @return bool operator
+                 */
                 bool operator !=(const SQLMultiSIterator& r) const { return citerator != r.citerator; }
+                /**
+                 * @brief
+                 *
+                 * @param r
+                 * @return bool operator
+                 */
                 bool operator ==(const SQLMultiSIterator& r) const { return citerator == r.citerator; }
 
             private:
+                /**
+                 * @brief
+                 *
+                 * @param _itr
+                 */
                 SQLMultiSIterator(RecordMultiMap::const_iterator _itr) : citerator(_itr) {}
-                RecordMultiMap::const_iterator citerator;
+                RecordMultiMap::const_iterator citerator; /**< TODO */
         };
 
         template<typename T>
+        /**
+         * @brief
+         *
+         */
         class SQLMSIteratorBounds
         {
-            friend class SQLMultiStorage;
+                friend class SQLMultiStorage;
 
             public:
-                const SQLMultiSIterator<T> first;
-                const SQLMultiSIterator<T> second;
+                const SQLMultiSIterator<T> first; /**< TODO */
+                const SQLMultiSIterator<T> second; /**< TODO */
 
             private:
+                /**
+                 * @brief
+                 *
+                 * @param std::pair<RecordMultiMap::const_iterator
+                 * @param pair
+                 */
                 SQLMSIteratorBounds(std::pair<RecordMultiMap::const_iterator, RecordMultiMap::const_iterator> pair) : first(pair.first), second(pair.second) {}
         };
 
         template<typename T>
+        /**
+         * @brief
+         *
+         * @param key
+         * @return SQLMSIteratorBounds<T>
+         */
         SQLMSIteratorBounds<T> getBounds(uint32 key) const { return SQLMSIteratorBounds<T>(m_indexMultiMap.equal_range(key)); }
 
+        /**
+         * @brief
+         *
+         */
         void Load();
 
+        /**
+         * @brief
+         *
+         * @param id
+         */
         void EraseEntry(uint32 id);
 
     protected:
+        /**
+         * @brief
+         *
+         * @param maxRecordId
+         * @param recordCount
+         * @param recordSize
+         */
         void prepareToLoad(uint32 maxRecordId, uint32 recordCount, uint32 recordSize) override;
+        /**
+         * @brief
+         *
+         * @param recordId
+         * @param record
+         */
         void JustCreatedRecord(uint32 recordId, char* record) override
         {
             m_indexMultiMap.insert(RecordMultiMap::value_type(recordId, record));
         }
 
+        /**
+         * @brief
+         *
+         */
         void Free() override;
 
     private:
-        RecordMultiMap m_indexMultiMap;
+        RecordMultiMap m_indexMultiMap; /**< TODO */
 };
 
 template <class DerivedLoader, class StorageClass>
+/**
+ * @brief
+ *
+ */
 class SQLStorageLoaderBase
 {
     public:
+        /**
+         * @brief
+         *
+         * @param storage
+         * @param error_at_empty
+         */
         void Load(StorageClass& storage, bool error_at_empty = true);
 
         template<class S, class D>
+        /**
+         * @brief
+         *
+         * @param field_pos
+         * @param src
+         * @param dst
+         */
         void convert(uint32 field_pos, S src, D& dst);
         template<class S>
+        /**
+         * @brief
+         *
+         * @param field_pos
+         * @param src
+         * @param dst
+         */
         void convert_to_str(uint32 field_pos, S src, char*& dst);
         template<class D>
+        /**
+         * @brief
+         *
+         * @param field_pos
+         * @param src
+         * @param dst
+         */
         void convert_from_str(uint32 field_pos, char const* src, D& dst);
+        /**
+         * @brief
+         *
+         * @param field_pos
+         * @param src
+         * @param dst
+         */
         void convert_str_to_str(uint32 field_pos, char const* src, char*& dst);
         template<class S, class D>
+        /**
+         * @brief
+         *
+         * @param field_pos
+         * @param src
+         * @param dst
+         */
         void default_fill(uint32 field_pos, S src, D& dst);
+        /**
+         * @brief
+         *
+         * @param field_pos
+         * @param src
+         * @param dst
+         */
         void default_fill_to_str(uint32 field_pos, char const* src, char*& dst);
 
-        // trap, no body
         template<class D>
+        /**
+         * @brief trap, no body
+         *
+         * @param field_pos
+         * @param src
+         * @param dst
+         */
         void convert_from_str(uint32 field_pos, char* src, D& dst);
+        /**
+         * @brief
+         *
+         * @param field_pos
+         * @param src
+         * @param dst
+         */
         void convert_str_to_str(uint32 field_pos, char* src, char*& dst);
 
     private:
         template<class V>
+        /**
+         * @brief
+         *
+         * @param value
+         * @param store
+         * @param record
+         * @param field_pos
+         * @param offset
+         */
         void storeValue(V value, StorageClass& store, char* record, uint32 field_pos, uint32& offset);
+        /**
+         * @brief
+         *
+         * @param value
+         * @param store
+         * @param record
+         * @param field_pos
+         * @param offset
+         */
         void storeValue(char const* value, StorageClass& store, char* record, uint32 field_pos, uint32& offset);
 
-        // trap, no body
+        /**
+         * @brief trap, no body
+         *
+         * @param value
+         * @param store
+         * @param record
+         * @param field_pos
+         * @param offset
+         */
         void storeValue(char* value, StorageClass& store, char* record, uint32 field_pos, uint32& offset);
 };
 
+/**
+ * @brief
+ *
+ */
 class SQLStorageLoader : public SQLStorageLoaderBase<SQLStorageLoader, SQLStorage>
 {
 };
 
+/**
+ * @brief
+ *
+ */
 class SQLHashStorageLoader : public SQLStorageLoaderBase<SQLHashStorageLoader, SQLHashStorage>
 {
 };
 
+/**
+ * @brief
+ *
+ */
 class SQLMultiStorageLoader : public SQLStorageLoaderBase<SQLMultiStorageLoader, SQLMultiStorage>
 {
 };
diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h
index 7101aee48..251ea9ba5 100644
--- a/src/shared/Database/SQLStorageImpl.h
+++ b/src/shared/Database/SQLStorageImpl.h
@@ -25,18 +25,32 @@
 #ifndef SQLSTORAGE_IMPL_H
 #define SQLSTORAGE_IMPL_H
 
-#include "ProgressBar.h"
-#include "Log.h"
-#include "DBCFileLoader.h"
+#include "Utilities/ProgressBar.h"
+#include "Log/Log.h"
+#include "DataStores/DBCFileLoader.h"
 
 template<class DerivedLoader, class StorageClass>
-template<class S, class D>                                  // S source-type, D destination-type
+template<class S, class D>
+/**
+ * @brief S source-type, D destination-type
+ *
+ * @param uint32
+ * @param src
+ * @param dst
+ */
 void SQLStorageLoaderBase<DerivedLoader, StorageClass>::convert(uint32 /*field_pos*/, S src, D& dst)
 {
     dst = D(src);
 }
 
 template<class DerivedLoader, class StorageClass>
+/**
+ * @brief
+ *
+ * @param uint32
+ * @param src
+ * @param dst
+ */
 void SQLStorageLoaderBase<DerivedLoader, StorageClass>::convert_str_to_str(uint32 /*field_pos*/, char const* src, char*& dst)
 {
     if (!src)
@@ -53,7 +67,14 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::convert_str_to_str(uint3
 }
 
 template<class DerivedLoader, class StorageClass>
-template<class S>                                           // S source-type
+template<class S>
+/**
+ * @brief S source-type
+ *
+ * @param uint32
+ * @param S
+ * @param dst
+ */
 void SQLStorageLoaderBase<DerivedLoader, StorageClass>::convert_to_str(uint32 /*field_pos*/, S /*src*/, char*& dst)
 {
     dst = new char[1];
@@ -61,20 +82,41 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::convert_to_str(uint32 /*
 }
 
 template<class DerivedLoader, class StorageClass>
-template<class D>                                           // D destination-type
+template<class D>
+/**
+ * @brief D destination-type
+ *
+ * @param uint32
+ * @param
+ * @param dst
+ */
 void SQLStorageLoaderBase<DerivedLoader, StorageClass>::convert_from_str(uint32 /*field_pos*/, char const* /*src*/, D& dst)
 {
     dst = 0;
 }
 
 template<class DerivedLoader, class StorageClass>
-template<class S, class D>                                  // S source-type, D destination-type
+template<class S, class D>
+/**
+ * @brief S source-type, D destination-type
+ *
+ * @param uint32
+ * @param src
+ * @param dst
+ */
 void SQLStorageLoaderBase<DerivedLoader, StorageClass>::default_fill(uint32 /*field_pos*/, S src, D& dst)
 {
     dst = D(src);
 }
 
 template<class DerivedLoader, class StorageClass>
+/**
+ * @brief
+ *
+ * @param uint32
+ * @param
+ * @param dst
+ */
 void SQLStorageLoaderBase<DerivedLoader, StorageClass>::default_fill_to_str(uint32 /*field_pos*/, char const* /*src*/, char*& dst)
 {
     dst = new char[1];
@@ -82,47 +124,56 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::default_fill_to_str(uint
 }
 
 template<class DerivedLoader, class StorageClass>
-template<class V>                                           // V value-type
+template<class V>
+/**
+ * @brief V value-type
+ *
+ * @param value
+ * @param store
+ * @param p
+ * @param x
+ * @param offset
+ */
 void SQLStorageLoaderBase<DerivedLoader, StorageClass>::storeValue(V value, StorageClass& store, char* p, uint32 x, uint32& offset)
 {
     DerivedLoader* subclass = (static_cast<DerivedLoader*>(this));
     switch (store.GetDstFormat(x))
     {
-        case FT_LOGIC:
+        case DBC_FF_LOGIC:
             subclass->convert(x, value, *((bool*)(&p[offset])));
             offset += sizeof(bool);
             break;
-        case FT_BYTE:
+        case DBC_FF_BYTE:
             subclass->convert(x, value, *((char*)(&p[offset])));
             offset += sizeof(char);
             break;
-        case FT_INT:
+        case DBC_FF_INT:
             subclass->convert(x, value, *((uint32*)(&p[offset])));
             offset += sizeof(uint32);
             break;
-        case FT_FLOAT:
+        case DBC_FF_FLOAT:
             subclass->convert(x, value, *((float*)(&p[offset])));
             offset += sizeof(float);
             break;
-        case FT_STRING:
+        case DBC_FF_STRING:
             subclass->convert_to_str(x, value, *((char**)(&p[offset])));
             offset += sizeof(char*);
             break;
-        case FT_NA:
+        case DBC_FF_NA:
             subclass->default_fill(x, value, *((uint32*)(&p[offset])));
             offset += sizeof(uint32);
             break;
-        case FT_NA_BYTE:
+        case DBC_FF_NA_BYTE:
             subclass->default_fill(x, value, *((char*)(&p[offset])));
             offset += sizeof(char);
             break;
-        case FT_NA_FLOAT:
+        case DBC_FF_NA_FLOAT:
             subclass->default_fill(x, value, *((float*)(&p[offset])));
             offset += sizeof(float);
             break;
-        case FT_IND:
-        case FT_SORT:
-            assert(false && "SQL storage not have sort field types");
+        case DBC_FF_IND:
+        case DBC_FF_SORT:
+            assert(false && "SQL storage does not have sort field types");
             break;
         default:
             assert(false && "unknown format character");
@@ -131,38 +182,47 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::storeValue(V value, Stor
 }
 
 template<class DerivedLoader, class StorageClass>
+/**
+ * @brief
+ *
+ * @param value
+ * @param store
+ * @param p
+ * @param x
+ * @param offset
+ */
 void SQLStorageLoaderBase<DerivedLoader, StorageClass>::storeValue(char const* value, StorageClass& store, char* p, uint32 x, uint32& offset)
 {
     DerivedLoader* subclass = (static_cast<DerivedLoader*>(this));
     switch (store.GetDstFormat(x))
     {
-        case FT_LOGIC:
+        case DBC_FF_LOGIC:
             subclass->convert_from_str(x, value, *((bool*)(&p[offset])));
             offset += sizeof(bool);
             break;
-        case FT_BYTE:
+        case DBC_FF_BYTE:
             subclass->convert_from_str(x, value, *((char*)(&p[offset])));
             offset += sizeof(char);
             break;
-        case FT_INT:
+        case DBC_FF_INT:
             subclass->convert_from_str(x, value, *((uint32*)(&p[offset])));
             offset += sizeof(uint32);
             break;
-        case FT_FLOAT:
+        case DBC_FF_FLOAT:
             subclass->convert_from_str(x, value, *((float*)(&p[offset])));
             offset += sizeof(float);
             break;
-        case FT_STRING:
+        case DBC_FF_STRING:
             subclass->convert_str_to_str(x, value, *((char**)(&p[offset])));
             offset += sizeof(char*);
             break;
-        case FT_NA_POINTER:
+        case DBC_FF_NA_POINTER:
             subclass->default_fill_to_str(x, value, *((char**)(&p[offset])));
             offset += sizeof(char*);
             break;
-        case FT_IND:
-        case FT_SORT:
-            assert(false && "SQL storage not have sort field types");
+        case DBC_FF_IND:
+        case DBC_FF_SORT:
+            assert(false && "SQL storage does not have sort field types");
             break;
         default:
             assert(false && "unknown format character");
@@ -171,6 +231,12 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::storeValue(char const* v
 }
 
 template<class DerivedLoader, class StorageClass>
+/**
+ * @brief
+ *
+ * @param store
+ * @param error_at_empty
+ */
 void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store, bool error_at_empty /*= true*/)
 {
     Field* fields = NULL;
@@ -179,7 +245,7 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
     {
         sLog.outError("Error loading %s table (not exist?)\n", store.GetTableName());
         Log::WaitBeforeContinueIfNeed();
-        exit(1);                                            // Stop server at loading non exited table or not accessable table
+        exit(1);                                            // Stop server at loading non existent table or inaccessible table
     }
 
     uint32 maxRecordId = (*result)[0].GetUInt32() + 1;
@@ -200,9 +266,9 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
     if (!result)
     {
         if (error_at_empty)
-            sLog.outError("%s table is empty!\n", store.GetTableName());
+            { sLog.outError("%s table is empty!\n", store.GetTableName()); }
         else
-            sLog.outString("%s table is empty!\n", store.GetTableName());
+            { sLog.outString("%s table is empty!\n", store.GetTableName()); }
 
         recordCount = 0;
         return;
@@ -211,7 +277,7 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
     if (store.GetSrcFieldCount() != result->GetFieldCount())
     {
         recordCount = 0;
-        sLog.outError("Error in %s table, probably sql file format was updated (there should be %d fields in sql).\n", store.GetTableName(), store.GetSrcFieldCount());
+        sLog.outError("Error in %s table.Perhaps the table structure was changed. There should be %d fields in the table.\n", store.GetTableName(), store.GetSrcFieldCount());
         delete result;
         Log::WaitBeforeContinueIfNeed();
         exit(1);                                            // Stop server at loading broken or non-compatible table.
@@ -223,26 +289,26 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
     {
         switch (store.GetDstFormat(x))
         {
-            case FT_LOGIC:
+            case DBC_FF_LOGIC:
                 recordsize += sizeof(bool);   break;
-            case FT_BYTE:
+            case DBC_FF_BYTE:
                 recordsize += sizeof(char);   break;
-            case FT_INT:
+            case DBC_FF_INT:
                 recordsize += sizeof(uint32); break;
-            case FT_FLOAT:
+            case DBC_FF_FLOAT:
                 recordsize += sizeof(float);  break;
-            case FT_STRING:
+            case DBC_FF_STRING:
                 recordsize += sizeof(char*);  break;
-            case FT_NA:
+            case DBC_FF_NA:
                 recordsize += sizeof(uint32); break;
-            case FT_NA_BYTE:
+            case DBC_FF_NA_BYTE:
                 recordsize += sizeof(char);   break;
-            case FT_NA_FLOAT:
+            case DBC_FF_NA_FLOAT:
                 recordsize += sizeof(float);  break;
-            case FT_NA_POINTER:
+            case DBC_FF_NA_POINTER:
                 recordsize += sizeof(char*);  break;
-            case FT_IND:
-            case FT_SORT:
+            case DBC_FF_IND:
+            case DBC_FF_SORT:
                 assert(false && "SQL storage not have sort field types");
                 break;
             default:
@@ -271,34 +337,34 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
         {
             switch (store.GetDstFormat(x))
             {
-                    // For default fill continue and do not increase y
-                case FT_NA:         storeValue((uint32)0, store, record, x, offset);         ++x; continue;
-                case FT_NA_BYTE:    storeValue((char)0, store, record, x, offset);           ++x; continue;
-                case FT_NA_FLOAT:   storeValue((float)0.0f, store, record, x, offset);       ++x; continue;
-                case FT_NA_POINTER: storeValue((char const*)NULL, store, record, x, offset); ++x; continue;
+                // For default fill continue and do not increase y
+                case DBC_FF_NA:         storeValue((uint32)0, store, record, x, offset);         ++x; continue;
+                case DBC_FF_NA_BYTE:    storeValue((char)0, store, record, x, offset);           ++x; continue;
+                case DBC_FF_NA_FLOAT:   storeValue((float)0.0f, store, record, x, offset);       ++x; continue;
+                case DBC_FF_NA_POINTER: storeValue((char const*)NULL, store, record, x, offset); ++x; continue;
                 default:
                     break;
             }
 
             // It is required that the input has at least as many columns set as the output requires
             if (y >= store.GetSrcFieldCount())
-                assert(false && "SQL storage has too few columns!");
+                { assert(false && "SQL storage has too few columns!"); }
 
             switch (store.GetSrcFormat(y))
             {
-                case FT_LOGIC:  storeValue((bool)(fields[y].GetUInt32() > 0), store, record, x, offset);  ++x; break;
-                case FT_BYTE:   storeValue((char)fields[y].GetUInt8(), store, record, x, offset);         ++x; break;
-                case FT_INT:    storeValue((uint32)fields[y].GetUInt32(), store, record, x, offset);      ++x; break;
-                case FT_FLOAT:  storeValue((float)fields[y].GetFloat(), store, record, x, offset);        ++x; break;
-                case FT_STRING: storeValue((char const*)fields[y].GetString(), store, record, x, offset); ++x; break;
-                case FT_NA:
-                case FT_NA_BYTE:
-                case FT_NA_FLOAT:
+                case DBC_FF_LOGIC:  storeValue((bool)(fields[y].GetUInt32() > 0), store, record, x, offset);  ++x; break;
+                case DBC_FF_BYTE:   storeValue((char)fields[y].GetUInt8(), store, record, x, offset);         ++x; break;
+                case DBC_FF_INT:    storeValue((uint32)fields[y].GetUInt32(), store, record, x, offset);      ++x; break;
+                case DBC_FF_FLOAT:  storeValue((float)fields[y].GetFloat(), store, record, x, offset);        ++x; break;
+                case DBC_FF_STRING: storeValue((char const*)fields[y].GetString(), store, record, x, offset); ++x; break;
+                case DBC_FF_NA:
+                case DBC_FF_NA_BYTE:
+                case DBC_FF_NA_FLOAT:
                     // Do Not increase x
                     break;
-                case FT_IND:
-                case FT_SORT:
-                case FT_NA_POINTER:
+                case DBC_FF_IND:
+                case DBC_FF_SORT:
+                case DBC_FF_NA_POINTER:
                     assert(false && "SQL storage not have sort or pointer field types");
                     break;
                 default:
diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h
index fbcceefca..bc81351f7 100644
--- a/src/shared/Database/SqlDelayThread.h
+++ b/src/shared/Database/SqlDelayThread.h
@@ -22,38 +22,72 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef __SQLDELAYTHREAD_H
-#define __SQLDELAYTHREAD_H
+#ifndef MANGOS_H_SQLDELAYTHREAD
+#define MANGOS_H_SQLDELAYTHREAD
 
-#include "ace/Thread_Mutex.h"
-#include "LockedQueue.h"
-#include "Threading.h"
+#include <ace/Thread_Mutex.h>
+#include "LockedQueue/LockedQueue.h"
+#include "Threading/Threading.h"
 
 class Database;
 class SqlOperation;
 class SqlConnection;
 
+/**
+ * @brief
+ *
+ */
 class SqlDelayThread : public ACE_Based::Runnable
 {
+        /**
+         * @brief
+         *
+         */
         typedef ACE_Based::LockedQueue<SqlOperation*, ACE_Thread_Mutex> SqlQueue;
 
     private:
-        SqlQueue m_sqlQueue;                                ///< Queue of SQL statements
-        Database* m_dbEngine;                               ///< Pointer to used Database engine
-        SqlConnection* m_dbConnection;                      ///< Pointer to DB connection
-        volatile bool m_running;
+        SqlQueue m_sqlQueue;                                /**< Queue of SQL statements */
+        Database* m_dbEngine;                               /**< Pointer to used Database engine */
+        SqlConnection* m_dbConnection;                      /**< Pointer to DB connection */
+        volatile bool m_running; /**< TODO */
 
-        // process all enqueued requests
+        /**
+         * @brief process all enqueued requests
+         *
+         */
         void ProcessRequests();
 
     public:
+        /**
+         * @brief
+         *
+         * @param db
+         * @param conn
+         */
         SqlDelayThread(Database* db, SqlConnection* conn);
+        /**
+         * @brief
+         *
+         */
         ~SqlDelayThread();
 
-        ///< Put sql statement to delay queue
+        /**
+         * @brief Put sql statement to delay queue
+         *
+         * @param sql
+         * @return bool
+         */
         bool Delay(SqlOperation* sql) { m_sqlQueue.add(sql); return true; }
 
-        virtual void Stop();                                ///< Stop event
-        virtual void run();                                 ///< Main Thread loop
+        /**
+         * @brief Stop event
+         *
+         */
+        virtual void Stop();
+        /**
+         * @brief Main Thread loop
+         *
+         */
+        virtual void run();
 };
 #endif                                                      //__SQLDELAYTHREAD_H
diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp
index 608948032..611344525 100644
--- a/src/shared/Database/SqlOperations.cpp
+++ b/src/shared/Database/SqlOperations.cpp
@@ -50,7 +50,7 @@ SqlTransaction::~SqlTransaction()
 bool SqlTransaction::Execute(SqlConnection* conn)
 {
     if (m_queue.empty())
-        return true;
+        { return true; }
 
     LOCK_DB_CONN(conn);
 
@@ -91,7 +91,7 @@ bool SqlPreparedRequest::Execute(SqlConnection* conn)
 bool SqlQuery::Execute(SqlConnection* conn)
 {
     if (!m_callback || !m_queue)
-        return false;
+        { return false; }
 
     LOCK_DB_CONN(conn);
     /// execute the query and store the result in the callback
@@ -116,7 +116,7 @@ void SqlResultQueue::Update()
 bool SqlQueryHolder::Execute(MaNGOS::IQueryCallback* callback, SqlDelayThread* thread, SqlResultQueue* queue)
 {
     if (!callback || !thread || !queue)
-        return false;
+        { return false; }
 
     /// delay the execution of the queries, sync them with the delay thread
     /// which will in turn resync on execution (via the queue) and call back
@@ -182,14 +182,14 @@ QueryResult* SqlQueryHolder::GetResult(size_t index)
         return m_queries[index].second;
     }
     else
-        return NULL;
+        { return NULL; }
 }
 
 void SqlQueryHolder::SetResult(size_t index, QueryResult* result)
 {
     /// store the result in the holder
     if (index < m_queries.size())
-        m_queries[index].second = result;
+        { m_queries[index].second = result; }
 }
 
 SqlQueryHolder::~SqlQueryHolder()
@@ -215,7 +215,7 @@ void SqlQueryHolder::SetSize(size_t size)
 bool SqlQueryHolderEx::Execute(SqlConnection* conn)
 {
     if (!m_holder || !m_callback || !m_queue)
-        return false;
+        { return false; }
 
     LOCK_DB_CONN(conn);
     /// we can do this, we are friends
@@ -224,7 +224,7 @@ bool SqlQueryHolderEx::Execute(SqlConnection* conn)
     {
         /// execute all queries in the holder and pass the results
         char const* sql = queries[i].first;
-        if (sql) m_holder->SetResult(i, conn->Query(sql));
+        if (sql) { m_holder->SetResult(i, conn->Query(sql)); }
     }
 
     /// sync with the caller thread
diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h
index d0df1864f..d09a79d93 100644
--- a/src/shared/Database/SqlOperations.h
+++ b/src/shared/Database/SqlOperations.h
@@ -22,13 +22,13 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef __SQLOPERATIONS_H
-#define __SQLOPERATIONS_H
+#ifndef MANGOS_H_SQLOPERATIONS
+#define MANGOS_H_SQLOPERATIONS
 
-#include "Common.h"
+#include "Common/Common.h"
 
-#include "ace/Thread_Mutex.h"
-#include "LockedQueue.h"
+#include <ace/Thread_Mutex.h>
+#include "LockedQueue/LockedQueue.h"
 #include <queue>
 #include "Utilities/Callback.h"
 
@@ -39,51 +39,131 @@ class SqlConnection;
 class SqlDelayThread;
 class SqlStmtParameters;
 
+/**
+ * @brief
+ *
+ */
 class SqlOperation
 {
     public:
+        /**
+         * @brief
+         *
+         */
         virtual void OnRemove() { delete this; }
+        /**
+         * @brief
+         *
+         * @param conn
+         * @return bool
+         */
         virtual bool Execute(SqlConnection* conn) = 0;
+        /**
+         * @brief
+         *
+         */
         virtual ~SqlOperation() {}
 };
 
 /// ---- ASYNC STATEMENTS / TRANSACTIONS ----
 
+/**
+ * @brief
+ *
+ */
 class SqlPlainRequest : public SqlOperation
 {
     private:
-        const char* m_sql;
+        const char* m_sql; /**< TODO */
     public:
+        /**
+         * @brief
+         *
+         * @param sql
+         */
         SqlPlainRequest(const char* sql) : m_sql(mangos_strdup(sql)) {}
+        /**
+         * @brief
+         *
+         */
         ~SqlPlainRequest() { char* tofree = const_cast<char*>(m_sql); delete[] tofree; }
+        /**
+         * @brief
+         *
+         * @param conn
+         * @return bool
+         */
         bool Execute(SqlConnection* conn) override;
 };
 
+/**
+ * @brief
+ *
+ */
 class SqlTransaction : public SqlOperation
 {
     private:
-        std::vector<SqlOperation* > m_queue;
+        std::vector<SqlOperation* > m_queue; /**< TODO */
 
     public:
+        /**
+         * @brief
+         *
+         */
         SqlTransaction() {}
+        /**
+         * @brief
+         *
+         */
         ~SqlTransaction();
 
+        /**
+         * @brief
+         *
+         * @param sql
+         */
         void DelayExecute(SqlOperation* sql) { m_queue.push_back(sql); }
 
+        /**
+         * @brief
+         *
+         * @param conn
+         * @return bool
+         */
         bool Execute(SqlConnection* conn) override;
 };
 
+/**
+ * @brief
+ *
+ */
 class SqlPreparedRequest : public SqlOperation
 {
     public:
+        /**
+         * @brief
+         *
+         * @param nIndex
+         * @param arg
+         */
         SqlPreparedRequest(int nIndex, SqlStmtParameters* arg);
+        /**
+         * @brief
+         *
+         */
         ~SqlPreparedRequest();
 
+        /**
+         * @brief
+         *
+         * @param conn
+         * @return bool
+         */
         bool Execute(SqlConnection* conn) override;
 
     private:
-        const int m_nIndex;
-        SqlStmtParameters* m_param;
+        const int m_nIndex; /**< TODO */
+        SqlStmtParameters* m_param; /**< TODO */
 };
 
 /// ---- ASYNC QUERIES ----
@@ -94,52 +174,157 @@ class SqlResultQueue;                                       /// queue for thread
 class SqlQueryHolder;                                       /// groups several async quries
 class SqlQueryHolderEx;                                     /// points to a holder, added to the delay thread
 
+/**
+ * @brief
+ *
+ */
 class SqlResultQueue : public ACE_Based::LockedQueue<MaNGOS::IQueryCallback* , ACE_Thread_Mutex>
 {
     public:
+        /**
+         * @brief
+         *
+         */
         SqlResultQueue() {}
+        /**
+         * @brief
+         *
+         */
         void Update();
 };
 
+/**
+ * @brief
+ *
+ */
 class SqlQuery : public SqlOperation
 {
     private:
-        const char* m_sql;
-        MaNGOS::IQueryCallback* m_callback;
-        SqlResultQueue* m_queue;
+        const char* m_sql; /**< TODO */
+        MaNGOS::IQueryCallback* m_callback; /**< TODO */
+        SqlResultQueue* m_queue; /**< TODO */
     public:
+        /**
+         * @brief
+         *
+         * @param sql
+         * @param callback
+         * @param queue
+         */
         SqlQuery(const char* sql, MaNGOS::IQueryCallback* callback, SqlResultQueue* queue)
             : m_sql(mangos_strdup(sql)), m_callback(callback), m_queue(queue) {}
+        /**
+         * @brief
+         *
+         */
         ~SqlQuery() { char* tofree = const_cast<char*>(m_sql); delete[] tofree; }
+        /**
+         * @brief
+         *
+         * @param conn
+         * @return bool
+         */
         bool Execute(SqlConnection* conn) override;
 };
 
+/**
+ * @brief
+ *
+ */
 class SqlQueryHolder
 {
         friend class SqlQueryHolderEx;
     private:
+        /**
+         * @brief
+         *
+         */
         typedef std::pair<const char*, QueryResult*> SqlResultPair;
-        std::vector<SqlResultPair> m_queries;
+        std::vector<SqlResultPair> m_queries; /**< TODO */
     public:
+        /**
+         * @brief
+         *
+         */
         SqlQueryHolder() {}
+        /**
+         * @brief
+         *
+         */
         ~SqlQueryHolder();
+        /**
+         * @brief
+         *
+         * @param index
+         * @param sql
+         * @return bool
+         */
         bool SetQuery(size_t index, const char* sql);
+        /**
+         * @brief
+         *
+         * @param index
+         * @param format...
+         * @return bool
+         */
         bool SetPQuery(size_t index, const char* format, ...) ATTR_PRINTF(3, 4);
+        /**
+         * @brief
+         *
+         * @param size
+         */
         void SetSize(size_t size);
+        /**
+         * @brief
+         *
+         * @param index
+         * @return QueryResult
+         */
         QueryResult* GetResult(size_t index);
+        /**
+         * @brief
+         *
+         * @param index
+         * @param result
+         */
         void SetResult(size_t index, QueryResult* result);
+        /**
+         * @brief
+         *
+         * @param callback
+         * @param thread
+         * @param queue
+         * @return bool
+         */
         bool Execute(MaNGOS::IQueryCallback* callback, SqlDelayThread* thread, SqlResultQueue* queue);
 };
 
+/**
+ * @brief
+ *
+ */
 class SqlQueryHolderEx : public SqlOperation
 {
     private:
-        SqlQueryHolder* m_holder;
-        MaNGOS::IQueryCallback* m_callback;
-        SqlResultQueue* m_queue;
+        SqlQueryHolder* m_holder; /**< TODO */
+        MaNGOS::IQueryCallback* m_callback; /**< TODO */
+        SqlResultQueue* m_queue; /**< TODO */
     public:
+        /**
+         * @brief
+         *
+         * @param holder
+         * @param callback
+         * @param queue
+         */
         SqlQueryHolderEx(SqlQueryHolder* holder, MaNGOS::IQueryCallback* callback, SqlResultQueue* queue)
             : m_holder(holder), m_callback(callback), m_queue(queue) {}
+        /**
+         * @brief
+         *
+         * @param conn
+         * @return bool
+         */
         bool Execute(SqlConnection* conn) override;
 };
 #endif                                                      //__SQLOPERATIONS_H
diff --git a/src/shared/Database/SqlPreparedStatement.cpp b/src/shared/Database/SqlPreparedStatement.cpp
index 66764bce5..bf299912a 100644
--- a/src/shared/Database/SqlPreparedStatement.cpp
+++ b/src/shared/Database/SqlPreparedStatement.cpp
@@ -28,7 +28,7 @@ SqlStmtParameters::SqlStmtParameters(uint32 nParams)
 {
     // reserve memory if needed
     if (nParams > 0)
-        m_params.reserve(nParams);
+        { m_params.reserve(nParams); }
 }
 
 void SqlStmtParameters::reset(const SqlStatement& stmt)
@@ -36,7 +36,7 @@ void SqlStmtParameters::reset(const SqlStatement& stmt)
     m_params.clear();
     // reserve memory if needed
     if (stmt.arguments() > 0)
-        m_params.reserve(stmt.arguments());
+        { m_params.reserve(stmt.arguments()); }
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -51,7 +51,7 @@ SqlStatement& SqlStatement::operator=(const SqlStatement& index)
         m_pParams = NULL;
 
         if (index.m_pParams)
-            m_pParams = new SqlStmtParameters(*(index.m_pParams));
+            { m_pParams = new SqlStmtParameters(*(index.m_pParams)); }
     }
 
     return *this;
@@ -132,7 +132,7 @@ void SqlPlainPreparedStatement::bind(const SqlStmtParameters& holder)
 bool SqlPlainPreparedStatement::execute()
 {
     if (m_szPlainRequest.empty())
-        return false;
+        { return false; }
 
     return m_pConn.Execute(m_szPlainRequest.c_str());
 }
diff --git a/src/shared/Database/SqlPreparedStatement.h b/src/shared/Database/SqlPreparedStatement.h
index 3a612bd04..666855b0a 100644
--- a/src/shared/Database/SqlPreparedStatement.h
+++ b/src/shared/Database/SqlPreparedStatement.h
@@ -25,7 +25,8 @@
 #ifndef SQLPREPAREDSTATEMENTS_H
 #define SQLPREPAREDSTATEMENTS_H
 
-#include "Common.h"
+#include "Common/Common.h"
+#include "Utilities/Errors.h"
 #include <ace/TSS_T.h>
 #include <vector>
 #include <stdexcept>
@@ -34,21 +35,29 @@ class Database;
 class SqlConnection;
 class QueryResult;
 
+/**
+ * @brief
+ *
+ */
 union SqlStmtField
 {
-    bool boolean;
-    uint8 ui8;
-    int8 i8;
-    uint16 ui16;
-    int16 i16;
-    uint32 ui32;
-    int32 i32;
-    uint64 ui64;
-    int64 i64;
-    float f;
-    double d;
+    bool boolean; /**< TODO */
+    uint8 ui8; /**< TODO */
+    int8 i8; /**< TODO */
+    uint16 ui16; /**< TODO */
+    int16 i16; /**< TODO */
+    uint32 ui32; /**< TODO */
+    int32 i32; /**< TODO */
+    uint64 ui64; /**< TODO */
+    int64 i64; /**< TODO */
+    float f; /**< TODO */
+    double d; /**< TODO */
 };
 
+/**
+ * @brief
+ *
+ */
 enum SqlStmtFieldType
 {
     FIELD_BOOL,
@@ -66,40 +75,130 @@ enum SqlStmtFieldType
     FIELD_NONE
 };
 
-// templates might be the best choice here
-// but I didn't have time to play with them
-class  SqlStmtFieldData
+/**
+ * @brief templates might be the best choice here
+ *
+ */
+class SqlStmtFieldData
 {
     public:
+        /**
+         * @brief
+         *
+         */
         SqlStmtFieldData() : m_type(FIELD_NONE) { m_binaryData.ui64 = 0; }
+        /**
+         * @brief
+         *
+         */
         ~SqlStmtFieldData() {}
 
         template<typename T>
+        /**
+         * @brief
+         *
+         * @param param
+         */
         SqlStmtFieldData(T param) { set(param); }
 
         template<typename T1>
+        /**
+         * @brief
+         *
+         * @param param1
+         */
         void set(T1 param1);
 
-        // getters
+        /**
+         * @brief getter
+         *
+         * @return bool
+         */
         bool toBool() const { MANGOS_ASSERT(m_type == FIELD_BOOL); return static_cast<bool>(m_binaryData.ui8); }
+        /**
+         * @brief getter
+         *
+         * @return uint8
+         */
         uint8 toUint8() const { MANGOS_ASSERT(m_type == FIELD_UI8); return m_binaryData.ui8; }
+        /**
+         * @brief getter
+         *
+         * @return int8
+         */
         int8 toInt8() const { MANGOS_ASSERT(m_type == FIELD_I8); return m_binaryData.i8; }
+        /**
+         * @brief getter
+         *
+         * @return uint16
+         */
         uint16 toUint16() const { MANGOS_ASSERT(m_type == FIELD_UI16); return m_binaryData.ui16; }
+        /**
+         * @brief getter
+         *
+         * @return int16
+         */
         int16 toInt16() const { MANGOS_ASSERT(m_type == FIELD_I16); return m_binaryData.i16; }
+        /**
+         * @brief getter
+         *
+         * @return uint32
+         */
         uint32 toUint32() const { MANGOS_ASSERT(m_type == FIELD_UI32); return m_binaryData.ui32; }
+        /**
+         * @brief getter
+         *
+         * @return int32
+         */
         int32 toInt32() const { MANGOS_ASSERT(m_type == FIELD_I32); return m_binaryData.i32; }
+        /**
+         * @brief getter
+         *
+         * @return uint64
+         */
         uint64 toUint64() const { MANGOS_ASSERT(m_type == FIELD_UI64); return m_binaryData.ui64; }
+        /**
+         * @brief getter
+         *
+         * @return int64
+         */
         int64 toInt64() const { MANGOS_ASSERT(m_type == FIELD_I64); return m_binaryData.i64; }
+        /**
+         * @brief getter
+         *
+         * @return float
+         */
         float toFloat() const { MANGOS_ASSERT(m_type == FIELD_FLOAT); return m_binaryData.f; }
+        /**
+         * @brief getter
+         *
+         * @return double
+         */
         double toDouble() const { MANGOS_ASSERT(m_type == FIELD_DOUBLE); return m_binaryData.d; }
+        /**
+         * @brief getter
+         *
+         * @return const char
+         */
         const char* toStr() const { MANGOS_ASSERT(m_type == FIELD_STRING); return m_szStringData.c_str(); }
 
-        // get type of data
+        /**
+         * @brief get type of data
+         *
+         * @return SqlStmtFieldType
+         */
         SqlStmtFieldType type() const { return m_type; }
-        // get underlying buffer type
+        /**
+         * @brief get underlying buffer type
+         *
+         */
         void* buff() const { return m_type == FIELD_STRING ? (void*)m_szStringData.c_str() : (void*)&m_binaryData; }
 
-        // get size of data
+        /**
+         * @brief get size of data
+         *
+         * @return size_t
+         */
         size_t size() const
         {
             switch (m_type)
@@ -124,97 +223,274 @@ class  SqlStmtFieldData
         }
 
     private:
-        SqlStmtFieldType m_type;
-        SqlStmtField m_binaryData;
-        std::string m_szStringData;
+        SqlStmtFieldType m_type; /**< TODO */
+        SqlStmtField m_binaryData; /**< TODO */
+        std::string m_szStringData; /**< TODO */
 };
 
 // template specialization
+/**
+ * @brief
+ *
+ * @param val
+ */
 template<> inline void SqlStmtFieldData::set(bool val) { m_type = FIELD_BOOL; m_binaryData.ui8 = val; }
+/**
+ * @brief
+ *
+ * @param val
+ */
 template<> inline void SqlStmtFieldData::set(uint8 val) { m_type = FIELD_UI8; m_binaryData.ui8 = val; }
+/**
+ * @brief
+ *
+ * @param val
+ */
 template<> inline void SqlStmtFieldData::set(int8 val) { m_type = FIELD_I8; m_binaryData.i8 = val; }
+/**
+ * @brief
+ *
+ * @param val
+ */
 template<> inline void SqlStmtFieldData::set(uint16 val) { m_type = FIELD_UI16; m_binaryData.ui16 = val; }
+/**
+ * @brief
+ *
+ * @param val
+ */
 template<> inline void SqlStmtFieldData::set(int16 val) { m_type = FIELD_I16; m_binaryData.i16 = val; }
+/**
+ * @brief
+ *
+ * @param val
+ */
 template<> inline void SqlStmtFieldData::set(uint32 val) { m_type = FIELD_UI32; m_binaryData.ui32 = val; }
+/**
+ * @brief
+ *
+ * @param val
+ */
 template<> inline void SqlStmtFieldData::set(int32 val) { m_type = FIELD_I32; m_binaryData.i32 = val; }
+/**
+ * @brief
+ *
+ * @param val
+ */
 template<> inline void SqlStmtFieldData::set(uint64 val) { m_type = FIELD_UI64; m_binaryData.ui64 = val; }
+/**
+ * @brief
+ *
+ * @param val
+ */
 template<> inline void SqlStmtFieldData::set(int64 val) { m_type = FIELD_I64; m_binaryData.i64 = val; }
+/**
+ * @brief
+ *
+ * @param val
+ */
 template<> inline void SqlStmtFieldData::set(float val) { m_type = FIELD_FLOAT; m_binaryData.f = val; }
+/**
+ * @brief
+ *
+ * @param val
+ */
 template<> inline void SqlStmtFieldData::set(double val) { m_type = FIELD_DOUBLE; m_binaryData.d = val; }
+/**
+ * @brief
+ *
+ * @param val
+ */
 template<> inline void SqlStmtFieldData::set(const char* val) { m_type = FIELD_STRING; m_szStringData = val; }
 
 class SqlStatement;
 // prepared statement executor
-class  SqlStmtParameters
+/**
+ * @brief
+ *
+ */
+class SqlStmtParameters
 {
     public:
+        /**
+         * @brief
+         *
+         */
         typedef std::vector<SqlStmtFieldData> ParameterContainer;
 
-        // reserve memory to contain all input parameters of stmt
+        /**
+         * @brief reserve memory to contain all input parameters of stmt
+         *
+         * @param nParams
+         */
         explicit SqlStmtParameters(uint32 nParams);
 
+        /**
+         * @brief
+         *
+         */
         ~SqlStmtParameters() {}
 
-        // get amount of bound parameters
+        /**
+         * @brief get amount of bound parameters
+         *
+         * @return uint32
+         */
         uint32 boundParams() const { return m_params.size(); }
-        // add parameter
+
+        /**
+         * @brief add parameter
+         *
+         * @param data
+         */
         void addParam(const SqlStmtFieldData& data) { m_params.push_back(data); }
-        // empty SQL statement parameters. In case nParams > 1 - reserve memory for parameters
-        // should help to reuse the same object with batched SQL requests
+
+        /**
+         * @brief empty SQL statement parameters.
+         *
+         * In case nParams > 1 - reserve memory for parameters should help to
+         * reuse the same object with batched SQL requests
+         *
+         * @param stmt
+         */
         void reset(const SqlStatement& stmt);
-        // swaps contents of intenral param container
+        /**
+         * @brief swaps contents of internal param container
+         *
+         * @param obj
+         */
         void swap(SqlStmtParameters& obj);
-        // get bound parameters
+        /**
+         * @brief get bound parameters
+         *
+         * @return const ParameterContainer
+         */
         const ParameterContainer& params() const { return m_params; }
 
     private:
+        /**
+         * @brief
+         *
+         * @param obj
+         * @return SqlStmtParameters &operator
+         */
         SqlStmtParameters& operator=(const SqlStmtParameters& obj);
 
-        // statement parameter holder
-        ParameterContainer m_params;
+        ParameterContainer m_params; /**< statement parameter holder */
 };
 
-// statement ID encapsulation logic
+/**
+ * @brief statement ID encapsulation logic
+ *
+ */
 class SqlStatementID
 {
     public:
+        /**
+         * @brief
+         *
+         */
         SqlStatementID() : m_bInitialized(false) {}
 
+        /**
+         * @brief
+         *
+         * @return int
+         */
         int ID() const { return m_nIndex; }
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 arguments() const { return m_nArguments; }
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool initialized() const { return m_bInitialized; }
 
     private:
         friend class Database;
+        /**
+         * @brief
+         *
+         * @param nID
+         * @param nArgs
+         */
         void init(int nID, uint32 nArgs) { m_nIndex = nID; m_nArguments = nArgs; m_bInitialized = true; }
 
-        int m_nIndex;
-        uint32 m_nArguments;
-        bool m_bInitialized;
+        int m_nIndex; /**< TODO */
+        uint32 m_nArguments; /**< TODO */
+        bool m_bInitialized; /**< TODO */
 };
 
-// statement index
-class  SqlStatement
+/**
+ * @brief statement index
+ *
+ */
+class SqlStatement
 {
     public:
+        /**
+         * @brief
+         *
+         */
         ~SqlStatement() { delete m_pParams; }
 
+        /**
+         * @brief
+         *
+         * @param index
+         */
         SqlStatement(const SqlStatement& index) : m_index(index.m_index), m_pDB(index.m_pDB), m_pParams(NULL)
         {
             if (index.m_pParams)
-                m_pParams = new SqlStmtParameters(*(index.m_pParams));
+                { m_pParams = new SqlStmtParameters(*(index.m_pParams)); }
         }
 
+        /**
+         * @brief
+         *
+         * @param index
+         * @return SqlStatement &operator
+         */
         SqlStatement& operator=(const SqlStatement& index);
 
+        /**
+         * @brief
+         *
+         * @return int
+         */
         int ID() const { return m_index.ID(); }
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 arguments() const { return m_index.arguments(); }
 
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool Execute();
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool DirectExecute();
 
         // templates to simplify 1-4 parameter bindings
         template<typename ParamType1>
+        /**
+         * @brief
+         *
+         * @param param1
+         * @return bool
+         */
         bool PExecute(ParamType1 param1)
         {
             arg(param1);
@@ -222,6 +498,13 @@ class  SqlStatement
         }
 
         template<typename ParamType1, typename ParamType2>
+        /**
+         * @brief
+         *
+         * @param param1
+         * @param param2
+         * @return bool
+         */
         bool PExecute(ParamType1 param1, ParamType2 param2)
         {
             arg(param1);
@@ -230,6 +513,14 @@ class  SqlStatement
         }
 
         template<typename ParamType1, typename ParamType2, typename ParamType3>
+        /**
+         * @brief
+         *
+         * @param param1
+         * @param param2
+         * @param param3
+         * @return bool
+         */
         bool PExecute(ParamType1 param1, ParamType2 param2, ParamType3 param3)
         {
             arg(param1);
@@ -239,6 +530,15 @@ class  SqlStatement
         }
 
         template<typename ParamType1, typename ParamType2, typename ParamType3, typename ParamType4>
+        /**
+         * @brief
+         *
+         * @param param1
+         * @param param2
+         * @param param3
+         * @param param4
+         * @return bool
+         */
         bool PExecute(ParamType1 param1, ParamType2 param2, ParamType3 param3, ParamType4 param4)
         {
             arg(param1);
@@ -249,36 +549,122 @@ class  SqlStatement
         }
 
         // bind parameters with specified type
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addBool(bool var) { arg(var); }
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addUInt8(uint8 var) { arg(var); }
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addInt8(int8 var) { arg(var); }
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addUInt16(uint16 var) { arg(var); }
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addInt16(int16 var) { arg(var); }
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addUInt32(uint32 var) { arg(var); }
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addInt32(int32 var) { arg(var); }
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addUInt64(uint64 var) { arg(var); }
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addInt64(int64 var) { arg(var); }
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addFloat(float var) { arg(var); }
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addDouble(double var) { arg(var); }
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addString(const char* var) { arg(var); }
+        /**
+         * @brief
+         *
+         * @param var
+         */
         void addString(const std::string& var) { arg(var.c_str()); }
+        /**
+         * @brief
+         *
+         * @param ss
+         */
         void addString(std::ostringstream& ss) { arg(ss.str().c_str()); ss.str(std::string()); }
 
     protected:
         // don't allow anyone except Database class to create static SqlStatement objects
         friend class Database;
+        /**
+         * @brief
+         *
+         * @param index
+         * @param db
+         */
         SqlStatement(const SqlStatementID& index, Database& db) : m_index(index), m_pDB(&db), m_pParams(NULL) {}
 
     private:
 
+        /**
+         * @brief
+         *
+         * @return SqlStmtParameters
+         */
         SqlStmtParameters* get()
         {
             if (!m_pParams)
-                m_pParams = new SqlStmtParameters(arguments());
+                { m_pParams = new SqlStmtParameters(arguments()); }
 
             return m_pParams;
         }
 
+        /**
+         * @brief
+         *
+         * @return SqlStmtParameters
+         */
         SqlStmtParameters* detach()
         {
             SqlStmtParameters* p = m_pParams ? m_pParams : new SqlStmtParameters(0);
@@ -289,71 +675,154 @@ class  SqlStatement
         // helper function
         // use appropriate add* functions to bind specific data type
         template<typename ParamType>
+        /**
+         * @brief
+         *
+         * @param val
+         */
         void arg(ParamType val)
         {
             SqlStmtParameters* p = get();
             p->addParam(SqlStmtFieldData(val));
         }
 
-        SqlStatementID m_index;
-        Database* m_pDB;
-        SqlStmtParameters* m_pParams;
+        SqlStatementID m_index; /**< TODO */
+        Database* m_pDB; /**< TODO */
+        SqlStmtParameters* m_pParams; /**< TODO */
 };
 
-// base prepared statement class
-class  SqlPreparedStatement
+/**
+ * @brief base prepared statement class
+ *
+ */
+class SqlPreparedStatement
 {
     public:
+        /**
+         * @brief
+         *
+         */
         virtual ~SqlPreparedStatement() {}
 
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool isPrepared() const { return m_bPrepared; }
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool isQuery() const { return m_bIsQuery; }
 
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 params() const { return m_nParams; }
+        /**
+         * @brief
+         *
+         * @return uint32
+         */
         uint32 columns() const { return isQuery() ? m_nColumns : 0; }
 
-        // initialize internal structures of prepared statement
-        // upon success m_bPrepared should be true
+        /**
+         * @brief initialize internal structures of prepared statement
+         *
+         * upon success m_bPrepared should be true
+         *
+         * @return bool
+         */
         virtual bool prepare() = 0;
-        // bind parameters for prepared statement from parameter placeholder
+        /**
+         * @brief bind parameters for prepared statement from parameter placeholder
+         *
+         * @param holder
+         */
         virtual void bind(const SqlStmtParameters& holder) = 0;
 
-        // execute statement w/o result set
+        /**
+         * @brief execute statement w/o result set
+         *
+         * @return bool
+         */
         virtual bool execute() = 0;
 
     protected:
+        /**
+         * @brief
+         *
+         * @param fmt
+         * @param conn
+         */
         SqlPreparedStatement(const std::string& fmt, SqlConnection& conn) :
             m_nParams(0), m_nColumns(0), m_bIsQuery(false),
             m_bPrepared(false), m_szFmt(fmt), m_pConn(conn)
         {}
 
-        uint32 m_nParams;
-        uint32 m_nColumns;
-        bool m_bIsQuery;
-        bool m_bPrepared;
-        std::string m_szFmt;
-        SqlConnection& m_pConn;
+        uint32 m_nParams; /**< TODO */
+        uint32 m_nColumns; /**< TODO */
+        bool m_bIsQuery; /**< TODO */
+        bool m_bPrepared; /**< TODO */
+        std::string m_szFmt; /**< TODO */
+        SqlConnection& m_pConn; /**< TODO */
 };
 
-// prepared statements via plain SQL string requests
-class  SqlPlainPreparedStatement : public SqlPreparedStatement
+/**
+ * @brief prepared statements via plain SQL string requests
+ *
+ */
+class SqlPlainPreparedStatement : public SqlPreparedStatement
 {
     public:
+        /**
+         * @brief
+         *
+         * @param fmt
+         * @param conn
+         */
         SqlPlainPreparedStatement(const std::string& fmt, SqlConnection& conn);
+        /**
+         * @brief
+         *
+         */
         ~SqlPlainPreparedStatement() {}
 
-        // this statement is always prepared
+        /**
+         * @brief this statement is always prepared
+         *
+         * @return bool
+         */
         virtual bool prepare() override { return true; }
 
-        // we should replace all '?' symbols with substrings with proper format
+        /**
+         * @brief we should replace all '?' symbols with substrings with proper format
+         *
+         * @param holder
+         */
         virtual void bind(const SqlStmtParameters& holder) override;
 
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         virtual bool execute() override;
 
     protected:
+        /**
+         * @brief
+         *
+         * @param data
+         * @param fmt
+         */
         void DataToString(const SqlStmtFieldData& data, std::ostringstream& fmt);
 
-        std::string m_szPlainRequest;
+        std::string m_szPlainRequest; /**< TODO */
 };
 
 #endif
diff --git a/src/shared/PosixDaemon.cpp b/src/shared/Linux/PosixDaemon.cpp
similarity index 100%
rename from src/shared/PosixDaemon.cpp
rename to src/shared/Linux/PosixDaemon.cpp
diff --git a/src/shared/PosixDaemon.h b/src/shared/Linux/PosixDaemon.h
similarity index 96%
rename from src/shared/PosixDaemon.h
rename to src/shared/Linux/PosixDaemon.h
index 2a89a13d1..59a689236 100644
--- a/src/shared/PosixDaemon.h
+++ b/src/shared/Linux/PosixDaemon.h
@@ -22,8 +22,8 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include "Common.h"
-#include "Log.h"
+#include "Common/Common.h"
+#include "Log/Log.h"
 
 /**
  * @brief
diff --git a/src/shared/LockedQueue.h b/src/shared/LockedQueue/LockedQueue.h
similarity index 99%
rename from src/shared/LockedQueue.h
rename to src/shared/LockedQueue/LockedQueue.h
index 119af705a..0fac2c130 100644
--- a/src/shared/LockedQueue.h
+++ b/src/shared/LockedQueue/LockedQueue.h
@@ -29,7 +29,7 @@
 #include <ace/Thread_Mutex.h>
 #include <deque>
 #include <assert.h>
-#include "Errors.h"
+#include "Utilities/Errors.h"
 
 namespace ACE_Based
 {
diff --git a/src/shared/Log.cpp b/src/shared/Log/Log.cpp
similarity index 87%
rename from src/shared/Log.cpp
rename to src/shared/Log/Log.cpp
index c9411c35c..658ec6005 100644
--- a/src/shared/Log.cpp
+++ b/src/shared/Log/Log.cpp
@@ -22,19 +22,19 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include "Common.h"
+#include "Common/Common.h"
 #include "Log.h"
 #include "Policies/Singleton.h"
 #include "Config/Config.h"
-#include "Util.h"
-#include "ByteBuffer.h"
-#include "ProgressBar.h"
+#include "Utilities/Util.h"
+#include "Utilities/ByteBuffer.h"
+#include "Utilities/ProgressBar.h"
 
 #include <stdarg.h>
 #include <fstream>
 #include <iostream>
 
-#include "ace/OS_NS_unistd.h"
+#include <ace/OS_NS_unistd.h>
 
 INSTANTIATE_SINGLETON_1(Log);
 
@@ -73,8 +73,12 @@ enum LogType
 const int LogType_count = int(LogError) + 1;
 
 Log::Log() :
-    raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL),
-    dberLogfile(NULL), eventAiErLogfile(NULL), scriptErrLogFile(NULL), worldLogfile(NULL), m_colored(false), m_includeTime(false), m_gmlog_per_account(false), m_scriptLibName(NULL)
+    raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL), dberLogfile(NULL), 
+#ifdef ENABLE_ELUNA
+    elunaErrLogfile(NULL), 
+#endif /* ENABLE_ELUNA */
+    eventAiErLogfile(NULL), scriptErrLogFile(NULL), worldLogfile(NULL), wardenLogfile(NULL), m_colored(false),
+    m_includeTime(false), m_gmlog_per_account(false), m_scriptLibName(NULL)
 {
     Initialize();
 }
@@ -119,18 +123,18 @@ void Log::SetColor(bool stdout_stream, Color color)
         FOREGROUND_GREEN,                                   // GREEN
         FOREGROUND_RED | FOREGROUND_GREEN,                  // BROWN
         FOREGROUND_BLUE,                                    // BLUE
-        FOREGROUND_RED |                    FOREGROUND_BLUE,// MAGENTA
+        FOREGROUND_RED | FOREGROUND_BLUE,                   // MAGENTA
         FOREGROUND_GREEN | FOREGROUND_BLUE,                 // CYAN
         FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,// WHITE
         // YELLOW
-        FOREGROUND_RED | FOREGROUND_GREEN |                   FOREGROUND_INTENSITY,
+        FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY,
         // RED_BOLD
-        FOREGROUND_RED |                                      FOREGROUND_INTENSITY,
+        FOREGROUND_RED | FOREGROUND_INTENSITY,
         // GREEN_BOLD
-        FOREGROUND_GREEN |                   FOREGROUND_INTENSITY,
+        FOREGROUND_GREEN | FOREGROUND_INTENSITY,
         FOREGROUND_BLUE | FOREGROUND_INTENSITY,             // BLUE_BOLD
         // MAGENTA_BOLD
-        FOREGROUND_RED |                    FOREGROUND_BLUE | FOREGROUND_INTENSITY,
+        FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
         // CYAN_BOLD
         FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
         // WHITE_BOLD
@@ -270,9 +274,13 @@ void Log::Initialize()
 
     charLogfile = openLogFile("CharLogFile", "CharLogTimestamp", "a");
     dberLogfile = openLogFile("DBErrorLogFile", NULL, "a");
+#ifdef ENABLE_ELUNA
+    elunaErrLogfile = openLogFile("ElunaErrorLogFile", NULL, "a");
+#endif /* ENABLE_ELUNA */
     eventAiErLogfile = openLogFile("EventAIErrorLogFile", NULL, "a");
     raLogfile = openLogFile("RaLogFile", NULL, "a");
     worldLogfile = openLogFile("WorldLogFile", "WorldLogTimestamp", "a");
+    wardenLogfile = openLogFile("WardenLogFile", "WardenLogTimestamp", "a");
 
     // Main log file settings
     m_includeTime  = sConfig.GetBoolDefault("LogTime", false);
@@ -523,6 +531,91 @@ void Log::outErrorDb(const char* err, ...)
     fflush(stderr);
 }
 
+#ifdef ENABLE_ELUNA
+void Log::outErrorEluna()
+{
+    if (m_includeTime)
+        outTime();
+
+    fprintf(stderr, "\n");
+
+    if (logfile)
+    {
+        outTimestamp(logfile);
+        fprintf(logfile, "ERROR Eluna\n");
+        fflush(logfile);
+    }
+
+    if (elunaErrLogfile)
+    {
+        outTimestamp(elunaErrLogfile);
+        fprintf(elunaErrLogfile, "\n");
+        fflush(elunaErrLogfile);
+    }
+
+    fflush(stderr);
+}
+#else
+/* This is made to not fiddle with the eluna code in LuaEngine/ at all */
+void Log::outErrorEluna() {}
+#endif /* ENABLE_ELUNA */
+
+#ifdef ENABLE_ELUNA
+void Log::outErrorEluna(const char* err, ...)
+{
+    if (!err)
+        return;
+
+    if (m_colored)
+        SetColor(false, m_colors[LogError]);
+
+    if (m_includeTime)
+        outTime();
+
+    va_list ap;
+
+    va_start(ap, err);
+    vutf8printf(stderr, err, &ap);
+    va_end(ap);
+
+    if (m_colored)
+        ResetColor(false);
+
+    fprintf(stderr, "\n");
+
+    if (logfile)
+    {
+        outTimestamp(logfile);
+        fprintf(logfile, "ERROR Eluna: ");
+
+        va_start(ap, err);
+        vfprintf(logfile, err, ap);
+        va_end(ap);
+
+        fprintf(logfile, "\n");
+        fflush(logfile);
+    }
+
+    if (elunaErrLogfile)
+    {
+        outTimestamp(elunaErrLogfile);
+
+        va_list ap;
+        va_start(ap, err);
+        vfprintf(elunaErrLogfile, err, ap);
+        va_end(ap);
+
+        fprintf(elunaErrLogfile, "\n");
+        fflush(elunaErrLogfile);
+    }
+
+    fflush(stderr);
+}
+#else
+/* This is made to not fiddle with the eluna code in LuaEngine/ at all */
+void Log::outErrorEluna(const char* err, ...) {}
+#endif /* ENABLE_ELUNA */
+
 void Log::outErrorEventAI()
 {
     if (m_includeTime)
@@ -778,6 +871,69 @@ void Log::outCommand(uint32 account, const char* str, ...)
     fflush(stdout);
 }
 
+void Log::outWarden()
+{
+    if (m_includeTime)
+    {
+        outTime();
+    }
+    printf("\n");
+    if (wardenLogfile)
+    {
+        outTimestamp(wardenLogfile);
+        fprintf(wardenLogfile, "\n");
+        fflush(wardenLogfile);
+    }
+
+    fflush(stdout);
+}
+
+void Log::outWarden(const char* str, ...)
+{
+    if (!str)
+    {
+        return;
+    }
+
+    if (m_colored)
+    {
+        SetColor(true, m_colors[LogNormal]);
+    }
+
+    if (m_includeTime)
+    {
+        outTime();
+    }
+
+    va_list ap;
+
+    va_start(ap, str);
+    vutf8printf(stdout, str, &ap);
+    va_end(ap);
+
+    if (m_colored)
+    {
+        ResetColor(true);
+    }
+
+    printf("\n");
+
+    if (wardenLogfile)
+    {
+        outTimestamp(wardenLogfile);
+        fprintf(wardenLogfile, "[Warden]: ");
+
+        va_start(ap, str);
+        vfprintf(wardenLogfile, str, ap);
+        fprintf(wardenLogfile, "\n");
+        va_end(ap);
+
+        fflush(wardenLogfile);
+    }
+
+    fflush(stdout);
+}
+
 void Log::outChar(const char* str, ...)
 {
     if (!str)
@@ -885,7 +1041,7 @@ void Log::outWorldPacketDump(uint32 socket, uint32 opcode, char const* opcodeNam
 
     outTimestamp(worldLogfile);
 
-    fprintf(worldLogfile, "\n%s:\nSOCKET: %u\nLENGTH: " SIZEFMTD "\nOPCODE: %s (0x%.4X)\nDATA:\n",
+    fprintf(worldLogfile, "\n%s:\nSOCKET: %u\nLENGTH: %lu\nOPCODE: %s (0x%.4X)\nDATA:\n",
             incoming ? "CLIENT" : "SERVER",
             socket, packet->size(), opcodeName, opcode);
 
diff --git a/src/shared/Log.h b/src/shared/Log/Log.h
similarity index 93%
rename from src/shared/Log.h
rename to src/shared/Log/Log.h
index 360a20099..14700dd96 100644
--- a/src/shared/Log.h
+++ b/src/shared/Log/Log.h
@@ -25,7 +25,7 @@
 #ifndef MANGOSSERVER_LOG_H
 #define MANGOSSERVER_LOG_H
 
-#include "Common.h"
+#include "Common/Common.h"
 #include "Policies/Singleton.h"
 
 class Config;
@@ -146,6 +146,12 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
                 { fclose(dberLogfile); }
             dberLogfile = NULL;
 
+#ifdef ENABLE_ELUNA
+            if (elunaErrLogfile != NULL)
+                fclose(elunaErrLogfile);
+            elunaErrLogfile = NULL;
+#endif /* ENABLE_ELUNA */
+
             if (eventAiErLogfile != NULL)
                 { fclose(eventAiErLogfile); }
             eventAiErLogfile = NULL;
@@ -161,6 +167,12 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
             if (worldLogfile != NULL)
                 { fclose(worldLogfile); }
             worldLogfile = NULL;
+
+            if (wardenLogfile != NULL)
+            {
+                fclose(wardenLogfile);
+            }
+            wardenLogfile = NULL;
         }
     public:
         /**
@@ -234,7 +246,18 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
          * @param str...
          */
         void outChar(const char* str, ...)        ATTR_PRINTF(2, 3);
-
+        /**
+         * @brief any log level
+         *
+         * @param str...
+         */
+        void outErrorEluna();
+        /**
+         * @brief any log level
+         *
+         * @param str...
+         */
+        void outErrorEluna(const char* str, ...)        ATTR_PRINTF(2, 3);
         /**
          * @brief any log level
          *
@@ -284,6 +307,17 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
          * @param str...
          */
         void outRALog(const char* str, ...)       ATTR_PRINTF(2, 3);
+        /**
+        * @brief any log level
+        *
+        */
+        void outWarden();
+        /**
+        * @brief any log level
+        *
+        * @param str...
+        */
+        void outWarden(const char* str, ...)      ATTR_PRINTF(2, 3);
         /**
          * @brief
          *
@@ -403,9 +437,13 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
         FILE* gmLogfile; /**< TODO */
         FILE* charLogfile; /**< TODO */
         FILE* dberLogfile; /**< TODO */
+#ifdef ENABLE_ELUNA
+        FILE* elunaErrLogfile; /**< TODO */
+#endif /* ENABLE_ELUNA */
         FILE* eventAiErLogfile; /**< TODO */
         FILE* scriptErrLogFile; /**< TODO */
         FILE* worldLogfile; /**< TODO */
+        FILE* wardenLogfile; /**< TODO */
         ACE_Thread_Mutex m_worldLogMtx; /**< TODO */
 
         LogLevel m_logLevel; /**< log/console control */
diff --git a/src/shared/SystemConfig.h.in b/src/shared/SystemConfig.h.in
index 27e237d0f..f20693a6d 100644
--- a/src/shared/SystemConfig.h.in
+++ b/src/shared/SystemConfig.h.in
@@ -33,7 +33,7 @@
 
 #ifndef MANGOS_VERSION
 #if PLATFORM == PLATFORM_WINDOWS
-# define MANGOS_VERSION(REVD,REVT,REVN,REVH) "0.20.0" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
+# define MANGOS_VERSION(REVD,REVT,REVN,REVH) "0.21.0" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
 #else
 # define MANGOS_VERSION(REVD,REVT,REVN,REVH) "@VERSION@" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
 #endif
diff --git a/src/shared/Threading/DelayExecutor.cpp b/src/shared/Threading/DelayExecutor.cpp
new file mode 100644
index 000000000..52c6c2e18
--- /dev/null
+++ b/src/shared/Threading/DelayExecutor.cpp
@@ -0,0 +1,135 @@
+/**
+ * MaNGOS is a full featured server for World of Warcraft, supporting
+ * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
+ *
+ * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * World of Warcraft, and all World of Warcraft or Warcraft art, images,
+ * and lore are copyrighted by Blizzard Entertainment, Inc.
+ */
+
+#include <ace/Singleton.h>
+#include <ace/Thread_Mutex.h>
+#include <ace/Log_Msg.h>
+
+#include "DelayExecutor.h"
+
+DelayExecutor* DelayExecutor::instance()
+{
+    return ACE_Singleton<DelayExecutor, ACE_Thread_Mutex>::instance();
+}
+
+DelayExecutor::DelayExecutor()
+    : pre_svc_hook_(0), post_svc_hook_(0), activated_(false)
+{
+}
+
+DelayExecutor::~DelayExecutor()
+{
+    if (pre_svc_hook_)
+        delete pre_svc_hook_;
+
+    if (post_svc_hook_)
+        delete post_svc_hook_;
+
+    deactivate();
+}
+
+int DelayExecutor::deactivate()
+{
+    if (!activated())
+        return -1;
+
+    activated(false);
+    queue_.queue()->deactivate();
+    wait();
+
+    return 0;
+}
+
+int DelayExecutor::svc()
+{
+    if (pre_svc_hook_)
+        pre_svc_hook_->call();
+
+    for (;;)
+    {
+        ACE_Method_Request* rq = queue_.dequeue();
+
+        if (!rq)
+            break;
+
+        rq->call();
+        delete rq;
+    }
+
+    if (post_svc_hook_)
+        post_svc_hook_->call();
+
+    return 0;
+}
+
+int DelayExecutor::activate(int num_threads, ACE_Method_Request* pre_svc_hook, ACE_Method_Request* post_svc_hook)
+{
+    if (activated())
+        return -1;
+
+    if (num_threads < 1)
+        return -1;
+
+    if (pre_svc_hook_)
+        delete pre_svc_hook_;
+
+    if (post_svc_hook_)
+        delete post_svc_hook_;
+
+    pre_svc_hook_ = pre_svc_hook;
+    post_svc_hook_ = post_svc_hook;
+
+    queue_.queue()->activate();
+
+    if (ACE_Task_Base::activate(THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED, num_threads) == -1)
+        return -1;
+
+    activated(true);
+
+    return true;
+}
+
+int DelayExecutor::execute(ACE_Method_Request* new_req)
+{
+    if (new_req == NULL)
+        return -1;
+
+    if (queue_.enqueue(new_req, (ACE_Time_Value*)&ACE_Time_Value::zero) == -1)
+    {
+        delete new_req;
+        ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("(%t) %p\n"), ACE_TEXT("DelayExecutor::execute enqueue")), -1);
+    }
+
+    return 0;
+}
+
+bool DelayExecutor::activated()
+{
+    return activated_;
+}
+
+void DelayExecutor::activated(bool s)
+{
+    activated_ = s;
+}
\ No newline at end of file
diff --git a/win/VC120/config.h b/src/shared/Threading/DelayExecutor.h
similarity index 54%
rename from win/VC120/config.h
rename to src/shared/Threading/DelayExecutor.h
index 53e818ebc..f86a6e838 100644
--- a/win/VC120/config.h
+++ b/src/shared/Threading/DelayExecutor.h
@@ -1,6 +1,6 @@
 /**
  * MaNGOS is a full featured server for World of Warcraft, supporting
- * the following clients: 1.12.x, 2.4.3, 3.2.5a, 4.2.3 and 5.4.8
+ * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
  *
  * Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
  *
@@ -22,21 +22,40 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef MANGOS_CONFIG_H
-#define MANGOS_CONFIG_H
+#ifndef _M_DELAY_EXECUTOR_H
+#define _M_DELAY_EXECUTOR_H
 
-#ifndef HAVE_ACE_STACK_TRACE_H
-#define HAVE_ACE_STACK_TRACE_H
-#endif /* HAVE_ACE_STACK_TRACE_H */
+#include <ace/Task.h>
+#include <ace/Activation_Queue.h>
+#include <ace/Method_Request.h>
 
-/* #undef USE_MULTI_THREAD_MAP */
+class DelayExecutor : protected ACE_Task_Base
+{
+    public:
 
-/* #undef ENABLE_SOAP */
+        DelayExecutor();
+        virtual ~DelayExecutor();
 
-#define ENABLE_ELUNA
+        static DelayExecutor* instance();
 
-#define ENABLE_SD2
+        int execute(ACE_Method_Request* new_req);
 
-#define VERSION "0.20"
+        int activate(int num_threads = 1, ACE_Method_Request* pre_svc_hook = NULL, ACE_Method_Request* post_svc_hook = NULL);
 
-#endif /* MANGOS_CONFIG_H */
+        int deactivate();
+
+        bool activated();
+
+        virtual int svc();
+
+    private:
+
+        ACE_Activation_Queue queue_;
+        ACE_Method_Request* pre_svc_hook_;
+        ACE_Method_Request* post_svc_hook_;
+        bool activated_;
+
+        void activated(bool s);
+};
+
+#endif // _M_DELAY_EXECUTOR_H
\ No newline at end of file
diff --git a/src/shared/Threading.cpp b/src/shared/Threading/Threading.cpp
similarity index 95%
rename from src/shared/Threading.cpp
rename to src/shared/Threading/Threading.cpp
index e4ab2b3f7..c95a6772d 100644
--- a/src/shared/Threading.cpp
+++ b/src/shared/Threading/Threading.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "Threading.h"
-#include "Errors.h"
+#include "Utilities/Errors.h"
 #include <ace/OS_NS_unistd.h>
 #include <ace/Sched_Params.h>
 #include <vector>
@@ -139,10 +139,13 @@ bool Thread::start()
     if (m_task == 0 || m_iThreadId != 0)
         { return false; }
 
+    // incRef before spawing the thread, otherwise Thread::ThreadTask() might call decRef and delete m_task
+    m_task->incReference();
+
     bool res = (ACE_Thread::spawn(&Thread::ThreadTask, (void*)m_task, THREADFLAG, &m_iThreadId, &m_hThreadHandle) == 0);
 
     if (res)
-        { m_task->incReference(); }
+        { m_task->decReference(); }
 
     return res;
 }
@@ -188,7 +191,9 @@ void Thread::resume()
 
 ACE_THR_FUNC_RETURN Thread::ThreadTask(void* param)
 {
-    Runnable* _task = (Runnable*)param;
+    Runnable* _task = static_cast<Runnable*>(param);
+    _task->incReference();
+    
     _task->run();
 
     // task execution complete, free referecne added at
diff --git a/src/shared/Threading.h b/src/shared/Threading/Threading.h
similarity index 99%
rename from src/shared/Threading.h
rename to src/shared/Threading/Threading.h
index c6d40ccc2..bf401dd88 100644
--- a/src/shared/Threading.h
+++ b/src/shared/Threading/Threading.h
@@ -27,7 +27,7 @@
 
 #include <ace/Thread.h>
 #include <ace/TSS_T.h>
-#include "ace/Atomic_Op.h"
+#include <ace/Atomic_Op.h>
 #include <assert.h>
 
 namespace ACE_Based
diff --git a/src/shared/ByteBuffer.cpp b/src/shared/Utilities/ByteBuffer.cpp
similarity index 98%
rename from src/shared/ByteBuffer.cpp
rename to src/shared/Utilities/ByteBuffer.cpp
index e77c80947..cb3b42927 100644
--- a/src/shared/ByteBuffer.cpp
+++ b/src/shared/Utilities/ByteBuffer.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "ByteBuffer.h"
+#include "Log/Log.h"
 
 void BitStream::Clear()
 {
diff --git a/src/shared/ByteBuffer.h b/src/shared/Utilities/ByteBuffer.h
similarity index 90%
rename from src/shared/ByteBuffer.h
rename to src/shared/Utilities/ByteBuffer.h
index 5c3f9dca4..e9eeadcfe 100644
--- a/src/shared/ByteBuffer.h
+++ b/src/shared/Utilities/ByteBuffer.h
@@ -22,12 +22,13 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef _BYTEBUFFER_H
-#define _BYTEBUFFER_H
+#ifndef MANGOS_H_BYTEBUFFER
+#define MANGOS_H_BYTEBUFFER
 
-#include "Common.h"
-#include "Log.h"
+#include "Common/Common.h"
+#include "Log/Log.h"
 #include "Utilities/ByteConverter.h"
+#include "Utilities/Errors.h"
 
 #define BITS_1 uint8 _1
 #define BITS_2 BITS_1, uint8 _2
@@ -724,8 +725,8 @@ class ByteBuffer
         ByteBuffer& read_skip(size_t skip)
         {
             ResetBitReader();
-            if(_rpos + skip > size())
-                throw ByteBufferException(false, _rpos, skip, size());
+            if (_rpos + skip > size())
+                { throw ByteBufferException(false, _rpos, skip, size()); }
             _rpos += skip;
 
             return *this;
@@ -759,11 +760,17 @@ class ByteBuffer
             return val;
         }
 
+        /**
+         * @brief
+         *
+         * @param dest
+         * @param len
+         */
         ByteBuffer& read(uint8* dest, size_t len)
         {
             ResetBitReader();
-            if(_rpos  + len > size())
-                throw ByteBufferException(false, _rpos, len, size());
+            if (_rpos  + len > size())
+                { throw ByteBufferException(false, _rpos, len, size()); }
             memcpy(dest, &_storage[_rpos], len);
             _rpos += len;
 
@@ -887,11 +894,26 @@ class ByteBuffer
             return f;
         }
 
-        const uint8 *contents() const { return &_storage[0]; }
+        const uint8* contents() const { return &_storage[0]; }
 
+        /**
+         * @brief
+         *
+         * @return size_t
+         */
         size_t size() const { return _storage.size(); }
+        /**
+         * @brief
+         *
+         * @return bool
+         */
         bool empty() const { return _storage.empty(); }
 
+        /**
+         * @brief
+         *
+         * @param newsize
+         */
         void resize(size_t newsize)
         {
             _storage.resize(newsize);
@@ -899,27 +921,55 @@ class ByteBuffer
             _wpos = size();
         }
 
+        /**
+         * @brief
+         *
+         * @param ressize
+         */
         void reserve(size_t ressize)
         {
             if (ressize > size())
-                _storage.reserve(ressize);
+                { _storage.reserve(ressize); }
         }
 
+        /**
+         * @brief
+         *
+         * @param str
+         */
         ByteBuffer& append(const std::string& str)
         {
             return append((uint8 const*)str.c_str(), str.size() + 1);
         }
 
+        /**
+         * @brief
+         *
+         * @param src
+         * @param cnt
+         */
         ByteBuffer& append(const char* src, size_t cnt)
         {
-            return append((const uint8 *)src, cnt);
+            return append((const uint8*)src, cnt);
         }
 
+        /**
+         * @brief
+         *
+         * @param src
+         * @param cnt
+         */
         template<class T> ByteBuffer& append(const T* src, size_t cnt)
         {
-            return append((const uint8 *)src, cnt * sizeof(T));
+            return append((const uint8*)src, cnt * sizeof(T));
         }
 
+        /**
+         * @brief
+         *
+         * @param src
+         * @param cnt
+         */
         ByteBuffer& append(const uint8* src, size_t cnt)
         {
             if (!cnt)
@@ -928,22 +978,32 @@ class ByteBuffer
             MANGOS_ASSERT(size() < 10000000);
 
             if (_storage.size() < _wpos + cnt)
-                _storage.resize(_wpos + cnt);
+                { _storage.resize(_wpos + cnt); }
             memcpy(&_storage[_wpos], src, cnt);
             _wpos += cnt;
 
             return *this;
         }
 
+        /**
+         * @brief
+         *
+         * @param buffer
+         */
         ByteBuffer& append(const ByteBuffer& buffer)
         {
             if (buffer.wpos())
                 return append(buffer.contents(), buffer.wpos());
-
             return *this;
         }
 
-        // can be used in SMSG_MONSTER_MOVE opcode
+        /**
+         * @brief can be used in SMSG_MONSTER_MOVE opcode
+         *
+         * @param x
+         * @param y
+         * @param z
+         */
         ByteBuffer& appendPackXYZ(float x, float y, float z)
         {
             uint32 packed = 0;
@@ -951,13 +1011,17 @@ class ByteBuffer
             packed |= ((int)(y / 0.25f) & 0x7FF) << 11;
             packed |= ((int)(z / 0.25f) & 0x3FF) << 22;
             *this << packed;
-
             return *this;
         }
 
+        /**
+         * @brief
+         *
+         * @param guid
+         */
         ByteBuffer& appendPackGUID(uint64 guid)
         {
-            uint8 packGUID[8+1];
+            uint8 packGUID[8 + 1];
             packGUID[0] = 0;
             size_t size = 1;
             for (uint8 i = 0; guid != 0; ++i)
@@ -971,16 +1035,28 @@ class ByteBuffer
 
                 guid >>= 8;
             }
+
             return append(packGUID, size);
         }
 
-        void put(size_t pos, const uint8 *src, size_t cnt)
+        /**
+         * @brief
+         *
+         * @param pos
+         * @param src
+         * @param cnt
+         */
+        void put(size_t pos, const uint8* src, size_t cnt)
         {
-            if(pos + cnt > size())
-                throw ByteBufferException(true, pos, cnt, size());
+            if (pos + cnt > size())
+                { throw ByteBufferException(true, pos, cnt, size()); }
             memcpy(&_storage[pos], src, cnt);
         }
 
+        /**
+         * @brief
+         *
+         */
         void print_storage() const
         {
             sLog.outDebug("STORAGE_SIZE: %lu", (unsigned long)size() );
@@ -1052,11 +1128,18 @@ class ByteBuffer
     protected:
         size_t _rpos, _wpos, _bitpos;
         uint8 _curbitval;
-        std::vector<uint8> _storage;
+        std::vector<uint8> _storage; /**< TODO */
 };
 
 template <typename T>
-inline ByteBuffer &operator<<(ByteBuffer &b, std::vector<T> v)
+/**
+ * @brief
+ *
+ * @param b
+ * @param v
+ * @return ByteBuffer &operator
+ */
+inline ByteBuffer& operator<<(ByteBuffer& b, std::vector<T> const& v)
 {
     b << (uint32)v.size();
     for (typename std::vector<T>::iterator i = v.begin(); i != v.end(); ++i)
@@ -1067,7 +1150,14 @@ inline ByteBuffer &operator<<(ByteBuffer &b, std::vector<T> v)
 }
 
 template <typename T>
-inline ByteBuffer &operator>>(ByteBuffer &b, std::vector<T> &v)
+/**
+ * @brief
+ *
+ * @param b
+ * @param v
+ * @return ByteBuffer &operator >>
+ */
+inline ByteBuffer& operator>>(ByteBuffer& b, std::vector<T>& v)
 {
     uint32 vsize;
     b >> vsize;
@@ -1082,7 +1172,14 @@ inline ByteBuffer &operator>>(ByteBuffer &b, std::vector<T> &v)
 }
 
 template <typename T>
-inline ByteBuffer &operator<<(ByteBuffer &b, std::list<T> v)
+/**
+ * @brief
+ *
+ * @param b
+ * @param v
+ * @return ByteBuffer &operator
+ */
+inline ByteBuffer& operator<<(ByteBuffer& b, std::list<T> const& v)
 {
     b << (uint32)v.size();
     for (typename std::list<T>::iterator i = v.begin(); i != v.end(); ++i)
@@ -1093,7 +1190,14 @@ inline ByteBuffer &operator<<(ByteBuffer &b, std::list<T> v)
 }
 
 template <typename T>
-inline ByteBuffer &operator>>(ByteBuffer &b, std::list<T> &v)
+/**
+ * @brief
+ *
+ * @param b
+ * @param v
+ * @return ByteBuffer &operator >>
+ */
+inline ByteBuffer& operator>>(ByteBuffer& b, std::list<T>& v)
 {
     uint32 vsize;
     b >> vsize;
@@ -1108,7 +1212,15 @@ inline ByteBuffer &operator>>(ByteBuffer &b, std::list<T> &v)
 }
 
 template <typename K, typename V>
-inline ByteBuffer &operator<<(ByteBuffer &b, std::map<K, V> &m)
+/**
+ * @brief
+ *
+ * @param b
+ * @param std::map<K
+ * @param m
+ * @return ByteBuffer &operator
+ */
+inline ByteBuffer& operator<<(ByteBuffer& b, std::map<K, V>& m)
 {
     b << (uint32)m.size();
     for (typename std::map<K, V>::iterator i = m.begin(); i != m.end(); ++i)
@@ -1119,7 +1231,15 @@ inline ByteBuffer &operator<<(ByteBuffer &b, std::map<K, V> &m)
 }
 
 template <typename K, typename V>
-inline ByteBuffer &operator>>(ByteBuffer &b, std::map<K, V> &m)
+/**
+ * @brief
+ *
+ * @param b
+ * @param std::map<K
+ * @param m
+ * @return ByteBuffer &operator >>
+ */
+inline ByteBuffer& operator>>(ByteBuffer& b, std::map<K, V>& m)
 {
     uint32 msize;
     b >> msize;
diff --git a/src/shared/Errors.h b/src/shared/Utilities/Errors.h
similarity index 95%
rename from src/shared/Errors.h
rename to src/shared/Utilities/Errors.h
index 1013d577f..ac6743e28 100644
--- a/src/shared/Errors.h
+++ b/src/shared/Utilities/Errors.h
@@ -25,14 +25,12 @@
 #ifndef MANGOSSERVER_ERRORS_H
 #define MANGOSSERVER_ERRORS_H
 
-#include "Common.h"
+#include "Common/Common.h"
 
-#ifndef HAVE_CONFIG_H
-#  define HAVE_ACE_STACK_TRACE_H 1
-#endif
+#define HAVE_ACE_STACK_TRACE_H 1
 
 #ifdef HAVE_ACE_STACK_TRACE_H
-#  include "ace/Stack_Trace.h"
+#  include <ace/Stack_Trace.h>
 #endif
 
 #ifdef HAVE_ACE_STACK_TRACE_H
diff --git a/src/shared/ProgressBar.cpp b/src/shared/Utilities/ProgressBar.cpp
similarity index 100%
rename from src/shared/ProgressBar.cpp
rename to src/shared/Utilities/ProgressBar.cpp
diff --git a/src/shared/ProgressBar.h b/src/shared/Utilities/ProgressBar.h
similarity index 99%
rename from src/shared/ProgressBar.h
rename to src/shared/Utilities/ProgressBar.h
index cbb6ae775..21d02702f 100644
--- a/src/shared/ProgressBar.h
+++ b/src/shared/Utilities/ProgressBar.h
@@ -31,7 +31,7 @@
  * @brief
  *
  */
-class  BarGoLink
+class BarGoLink
 {
     public:
         /**
diff --git a/src/shared/Timer.h b/src/shared/Utilities/Timer.h
similarity index 99%
rename from src/shared/Timer.h
rename to src/shared/Utilities/Timer.h
index 35db41ab7..dc82eb38d 100644
--- a/src/shared/Timer.h
+++ b/src/shared/Utilities/Timer.h
@@ -25,7 +25,7 @@
 #ifndef MANGOS_TIMER_H
 #define MANGOS_TIMER_H
 
-#include "Common.h"
+#include "Common/Common.h"
 #include <ace/OS_NS_sys_time.h>
 
 /**
diff --git a/src/shared/Util.cpp b/src/shared/Utilities/Util.cpp
similarity index 84%
rename from src/shared/Util.cpp
rename to src/shared/Utilities/Util.cpp
index 048cb5653..b28460e16 100644
--- a/src/shared/Util.cpp
+++ b/src/shared/Utilities/Util.cpp
@@ -26,7 +26,7 @@
 #include "Timer.h"
 
 #include "utf8cpp/utf8.h"
-#include "mersennetwister/MersenneTwister.h"
+#include <mersennetwister/MersenneTwister.h>
 #include <ace/TSS_T.h>
 #include <ace/INET_Addr.h>
 
@@ -307,6 +307,21 @@ bool IsIPAddress(char const* ipaddress)
     return ACE_OS::inet_addr(ipaddress) != INADDR_NONE;
 }
 
+std::string GetAddressString(ACE_INET_Addr const& addr)
+{
+    char buf[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16];
+    addr.addr_to_string(buf, ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16);
+    return buf;
+}
+
+bool IsIPAddrInNetwork(ACE_INET_Addr const& net, ACE_INET_Addr const& addr, ACE_INET_Addr const& subnetMask)
+{
+    uint32 mask = subnetMask.get_ip_address();
+    if ((net.get_ip_address() & mask) == (addr.get_ip_address() & mask))
+        return true;
+    return false;
+}
+
 /// create PID file
 uint32 CreatePIDFile(const std::string& filename)
 {
@@ -453,26 +468,26 @@ std::wstring GetMainPartOfName(std::wstring wname, uint32 declension)
 {
     // supported only Cyrillic cases
     if (wname.size() < 1 || !isCyrillicCharacter(wname[0]) || declension > 5)
-    { return wname; }
+        return wname;
 
     // Important: end length must be <= MAX_INTERNAL_PLAYER_NAME-MAX_PLAYER_NAME (3 currently)
 
-    static wchar_t const a_End[]    = { wchar_t(1), wchar_t(0x0430), wchar_t(0x0000)};
-    static wchar_t const o_End[]    = { wchar_t(1), wchar_t(0x043E), wchar_t(0x0000)};
-    static wchar_t const ya_End[]   = { wchar_t(1), wchar_t(0x044F), wchar_t(0x0000)};
-    static wchar_t const ie_End[]   = { wchar_t(1), wchar_t(0x0435), wchar_t(0x0000)};
-    static wchar_t const i_End[]    = { wchar_t(1), wchar_t(0x0438), wchar_t(0x0000)};
-    static wchar_t const yeru_End[] = { wchar_t(1), wchar_t(0x044B), wchar_t(0x0000)};
-    static wchar_t const u_End[]    = { wchar_t(1), wchar_t(0x0443), wchar_t(0x0000)};
-    static wchar_t const yu_End[]   = { wchar_t(1), wchar_t(0x044E), wchar_t(0x0000)};
-    static wchar_t const oj_End[]   = { wchar_t(2), wchar_t(0x043E), wchar_t(0x0439), wchar_t(0x0000)};
-    static wchar_t const ie_j_End[] = { wchar_t(2), wchar_t(0x0435), wchar_t(0x0439), wchar_t(0x0000)};
-    static wchar_t const io_j_End[] = { wchar_t(2), wchar_t(0x0451), wchar_t(0x0439), wchar_t(0x0000)};
-    static wchar_t const o_m_End[]  = { wchar_t(2), wchar_t(0x043E), wchar_t(0x043C), wchar_t(0x0000)};
-    static wchar_t const io_m_End[] = { wchar_t(2), wchar_t(0x0451), wchar_t(0x043C), wchar_t(0x0000)};
-    static wchar_t const ie_m_End[] = { wchar_t(2), wchar_t(0x0435), wchar_t(0x043C), wchar_t(0x0000)};
-    static wchar_t const soft_End[] = { wchar_t(1), wchar_t(0x044C), wchar_t(0x0000)};
-    static wchar_t const j_End[]    = { wchar_t(1), wchar_t(0x0439), wchar_t(0x0000)};
+    static wchar_t const a_End[] = { wchar_t(1), wchar_t(0x0430), wchar_t(0x0000) };
+    static wchar_t const o_End[] = { wchar_t(1), wchar_t(0x043E), wchar_t(0x0000) };
+    static wchar_t const ya_End[] = { wchar_t(1), wchar_t(0x044F), wchar_t(0x0000) };
+    static wchar_t const ie_End[] = { wchar_t(1), wchar_t(0x0435), wchar_t(0x0000) };
+    static wchar_t const i_End[] = { wchar_t(1), wchar_t(0x0438), wchar_t(0x0000) };
+    static wchar_t const yeru_End[] = { wchar_t(1), wchar_t(0x044B), wchar_t(0x0000) };
+    static wchar_t const u_End[] = { wchar_t(1), wchar_t(0x0443), wchar_t(0x0000) };
+    static wchar_t const yu_End[] = { wchar_t(1), wchar_t(0x044E), wchar_t(0x0000) };
+    static wchar_t const oj_End[] = { wchar_t(2), wchar_t(0x043E), wchar_t(0x0439), wchar_t(0x0000) };
+    static wchar_t const ie_j_End[] = { wchar_t(2), wchar_t(0x0435), wchar_t(0x0439), wchar_t(0x0000) };
+    static wchar_t const io_j_End[] = { wchar_t(2), wchar_t(0x0451), wchar_t(0x0439), wchar_t(0x0000) };
+    static wchar_t const o_m_End[] = { wchar_t(2), wchar_t(0x043E), wchar_t(0x043C), wchar_t(0x0000) };
+    static wchar_t const io_m_End[] = { wchar_t(2), wchar_t(0x0451), wchar_t(0x043C), wchar_t(0x0000) };
+    static wchar_t const ie_m_End[] = { wchar_t(2), wchar_t(0x0435), wchar_t(0x043C), wchar_t(0x0000) };
+    static wchar_t const soft_End[] = { wchar_t(1), wchar_t(0x044C), wchar_t(0x0000) };
+    static wchar_t const j_End[] = { wchar_t(1), wchar_t(0x0439), wchar_t(0x0000) };
 
     static wchar_t const* const dropEnds[6][8] =
     {
@@ -489,7 +504,7 @@ std::wstring GetMainPartOfName(std::wstring wname, uint32 declension)
         size_t len = size_t((*itr)[-1]);                    // get length from string size field
 
         if (wname.substr(wname.size() - len, len) == *itr)
-        { return wname.substr(0, wname.size() - len); }
+            return wname.substr(0, wname.size() - len);
     }
 
     return wname;
@@ -547,7 +562,7 @@ void utf8printf(FILE* out, const char* str, ...)
 {
     va_list ap;
     va_start(ap, str);
-    vutf8printf(stdout, str, &ap);
+    vutf8printf(out, str, &ap);
     va_end(ap);
 }
 
@@ -587,3 +602,52 @@ void hexEncodeByteArray(uint8* bytes, uint32 arrayLen, std::string& result)
     }
     result = ss.str();
 }
+
+std::string ByteArrayToHexStr(uint8 const* bytes, uint32 arrayLen, bool reverse /* = false */)
+{
+    int32 init = 0;
+    int32 end = arrayLen;
+    int8 op = 1;
+
+    if (reverse)
+    {
+        init = arrayLen - 1;
+        end = -1;
+        op = -1;
+    }
+
+    std::ostringstream ss;
+    for (int32 i = init; i != end; i += op)
+    {
+        char buffer[4];
+        sprintf(buffer, "%02X", bytes[i]);
+        ss << buffer;
+    }
+
+    return ss.str();
+}
+
+void HexStrToByteArray(std::string const& str, uint8* out, bool reverse /*= false*/)
+{
+    // string must have even number of characters
+    if (str.length() & 1)
+        return;
+
+    int32 init = 0;
+    int32 end = str.length();
+    int8 op = 1;
+
+    if (reverse)
+    {
+        init = str.length() - 2;
+        end = -2;
+        op = -1;
+    }
+
+    uint32 j = 0;
+    for (int32 i = init; i != end; i += 2 * op)
+    {
+        char buffer[3] = { str[i], str[i + 1], '\0' };
+        out[j++] = strtoul(buffer, NULL, 16);
+    }
+}
\ No newline at end of file
diff --git a/src/shared/Util.h b/src/shared/Utilities/Util.h
similarity index 94%
rename from src/shared/Util.h
rename to src/shared/Utilities/Util.h
index 5675064a1..6891c9efd 100644
--- a/src/shared/Util.h
+++ b/src/shared/Utilities/Util.h
@@ -22,10 +22,12 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef _UTIL_H
-#define _UTIL_H
+#ifndef MANGOS_H_UTIL
+#define MANGOS_H_UTIL
 
-#include "Common.h"
+#include "Common/Common.h"
+#include <ace/Null_Mutex.h>
+#include <ace/INET_Addr.h>
 
 #include <string>
 #include <vector>
@@ -494,7 +496,7 @@ inline bool isNumeric(std::wstring const& str)
  * @param numericOrSpace
  * @return bool
  */
-inline bool isBasicLatinString(std::wstring wstr, bool numericOrSpace)
+inline bool isBasicLatinString(const std::wstring &wstr, bool numericOrSpace)
 {
     for (size_t i = 0; i < wstr.size(); ++i)
         if (!isBasicLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i])))
@@ -509,7 +511,7 @@ inline bool isBasicLatinString(std::wstring wstr, bool numericOrSpace)
  * @param numericOrSpace
  * @return bool
  */
-inline bool isExtendedLatinString(std::wstring wstr, bool numericOrSpace)
+inline bool isExtendedLatinString(const std::wstring &wstr, bool numericOrSpace)
 {
     for (size_t i = 0; i < wstr.size(); ++i)
         if (!isExtendedLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i])))
@@ -524,7 +526,7 @@ inline bool isExtendedLatinString(std::wstring wstr, bool numericOrSpace)
  * @param numericOrSpace
  * @return bool
  */
-inline bool isCyrillicString(std::wstring wstr, bool numericOrSpace)
+inline bool isCyrillicString(const std::wstring &wstr, bool numericOrSpace)
 {
     for (size_t i = 0; i < wstr.size(); ++i)
         if (!isCyrillicCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i])))
@@ -539,7 +541,7 @@ inline bool isCyrillicString(std::wstring wstr, bool numericOrSpace)
  * @param numericOrSpace
  * @return bool
  */
-inline bool isEastAsianString(std::wstring wstr, bool numericOrSpace)
+inline bool isEastAsianString(const std::wstring &wstr, bool numericOrSpace)
 {
     for (size_t i = 0; i < wstr.size(); ++i)
         if (!isEastAsianCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i])))
@@ -705,6 +707,13 @@ void vutf8printf(FILE* out, const char* str, va_list* ap);
  * @return bool
  */
 bool IsIPAddress(char const* ipaddress);
+
+/// Checks if address belongs to the a network with specified submask
+bool IsIPAddrInNetwork(ACE_INET_Addr const& net, ACE_INET_Addr const& addr, ACE_INET_Addr const& subnetMask);
+
+/// Transforms ACE_INET_Addr address into string format "dotted_ip:port"
+std::string GetAddressString(ACE_INET_Addr const& addr);
+
 /**
  * @brief
  *
@@ -721,4 +730,7 @@ uint32 CreatePIDFile(const std::string& filename);
  * @param result
  */
 void hexEncodeByteArray(uint8* bytes, uint32 arrayLen, std::string& result);
+
+std::string ByteArrayToHexStr(uint8 const* bytes, uint32 length, bool reverse = false);
+void HexStrToByteArray(std::string const& str, uint8* out, bool reverse = false);
 #endif
diff --git a/src/shared/WorldPacket.h b/src/shared/Utilities/WorldPacket.h
similarity index 100%
rename from src/shared/WorldPacket.h
rename to src/shared/Utilities/WorldPacket.h
diff --git a/src/shared/ServiceWin32.cpp b/src/shared/Win/ServiceWin32.cpp
similarity index 99%
rename from src/shared/ServiceWin32.cpp
rename to src/shared/Win/ServiceWin32.cpp
index 96097280a..667ac1a9a 100644
--- a/src/shared/ServiceWin32.cpp
+++ b/src/shared/Win/ServiceWin32.cpp
@@ -24,8 +24,8 @@
 
 #ifdef WIN32
 
-#include "Common.h"
-#include "Log.h"
+#include "Common/Common.h"
+#include "Log/Log.h"
 #include <cstring>
 #include <windows.h>
 #include <winsvc.h>
diff --git a/src/shared/ServiceWin32.h b/src/shared/Win/ServiceWin32.h
similarity index 100%
rename from src/shared/ServiceWin32.h
rename to src/shared/Win/ServiceWin32.h
diff --git a/src/shared/WheatyExceptionReport.cpp b/src/shared/Win/WheatyExceptionReport.cpp
similarity index 99%
rename from src/shared/WheatyExceptionReport.cpp
rename to src/shared/Win/WheatyExceptionReport.cpp
index dc02eb996..4b20c07e2 100644
--- a/src/shared/WheatyExceptionReport.cpp
+++ b/src/shared/Win/WheatyExceptionReport.cpp
@@ -14,7 +14,7 @@
 #define _NO_CVCONST_H
 #include <dbghelp.h>
 #include "WheatyExceptionReport.h"
-#include "revision_nr.h"
+#include "revision.h"
 #define CrashFolder _T("Crashes")
 //#pragma comment(linker, "/defaultlib:dbghelp.lib")
 
diff --git a/src/shared/WheatyExceptionReport.h b/src/shared/Win/WheatyExceptionReport.h
similarity index 100%
rename from src/shared/WheatyExceptionReport.h
rename to src/shared/Win/WheatyExceptionReport.h
diff --git a/src/shared/revision_sql.h b/src/shared/revision.h
similarity index 75%
rename from src/shared/revision_sql.h
rename to src/shared/revision.h
index f81fc97e7..81cea9db7 100644
--- a/src/shared/revision_sql.h
+++ b/src/shared/revision.h
@@ -22,9 +22,10 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#ifndef __REVISION_SQL_H__
-#define __REVISION_SQL_H__
- #define REVISION_DB_CHARACTERS "required_12712_01_characters_characters"
- #define REVISION_DB_MANGOS "required_12752_01_mangos_reputation_spillover_template"
-#define REVISION_DB_REALMD "required_20140607_Realm_Resync"
-#endif // __REVISION_SQL_H__
+#ifndef MANGOS_H_REVISION
+#define MANGOS_H_REVISION
+#define REVISION_NR "12778"
+#define REVISION_DB_CHARACTERS "required_12712_01_characters_characters"
+#define REVISION_DB_MANGOS "required_12752_01_mangos_reputation_spillover_template"
+#define REVISION_DB_REALMD "required_20150722_01_realmcharacters_remove_constraint"
+#endif // __REVISION_H__
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
deleted file mode 100644
index 1f7a78f85..000000000
--- a/src/shared/revision_nr.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __REVISION_NR_H__
-#define __REVISION_NR_H__
- #define REVISION_NR "12778"
-#endif // __REVISION_NR_H__
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index c95d005d8..181abb9f9 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,5 +1,7 @@
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
 #
-# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+# Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,15 +16,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
 
 #Used by vmap-assembler and mmap-generator
 include_directories(
-    "${CMAKE_SOURCE_DIR}/src/shared"
-    "${CMAKE_SOURCE_DIR}/src/game/vmap/"
-    "${CMAKE_SOURCE_DIR}/dep/include/g3dlite/"
-    "${CMAKE_SOURCE_DIR}/src/framework/"
-    "${ACE_INCLUDE_DIR}"
+    ${CMAKE_SOURCE_DIR}/src/shared
+    ${CMAKE_SOURCE_DIR}/src/game/vmap
+    ${CMAKE_SOURCE_DIR}/dep/g3dlite
+    ${CMAKE_SOURCE_DIR}/src/framework
+    ${ACE_INCLUDE_DIR}
 )
 
 add_definitions(-DMMAP_GENERATOR -DNO_CORE_FUNCS)
diff --git a/src/tools/Movemap-Generator/CMakeLists.txt b/src/tools/Movemap-Generator/CMakeLists.txt
index ef08a1934..50ab3573a 100644
--- a/src/tools/Movemap-Generator/CMakeLists.txt
+++ b/src/tools/Movemap-Generator/CMakeLists.txt
@@ -1,5 +1,7 @@
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
 #
-# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+# Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,9 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-cmake_minimum_required (VERSION 2.8)
 
 project(mmap-generator)
 
@@ -39,26 +38,57 @@ endif()
 add_definitions(-DDT_POLYREF64)
 
 include_directories(
-    "${CMAKE_SOURCE_DIR}/src"
-    "${CMAKE_SOURCE_DIR}/src/shared"
-    "${CMAKE_SOURCE_DIR}/src/game"
-    "${CMAKE_SOURCE_DIR}/src/game/vmap"
-    "${CMAKE_SOURCE_DIR}/dep/include/g3dlite"
-    "${CMAKE_SOURCE_DIR}/src/framework"
-    "${CMAKE_SOURCE_DIR}/src/game/WorldHandlers"
-    "${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include"
-    "${CMAKE_SOURCE_DIR}/dep/recastnavigation/Recast/Include"
-    "${CMAKE_SOURCE_DIR}/dep/src/zlib"
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_SOURCE_DIR}/src/shared
+    ${CMAKE_SOURCE_DIR}/src/game
+    ${CMAKE_SOURCE_DIR}/src/game/vmap
+    ${CMAKE_SOURCE_DIR}/dep/g3dlite
+    ${CMAKE_SOURCE_DIR}/dep/g3dlite/G3D
+    ${CMAKE_SOURCE_DIR}/src/framework
+    ${CMAKE_SOURCE_DIR}/src/game/WorldHandlers
+    ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include
+    ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Recast/Include
+    ${CMAKE_SOURCE_DIR}/dep/zlib
 )
 
 set(SOURCES
-    ./src/IntermediateValues.cpp
-    ./src/generator.cpp
-    ./src/MapBuilder.cpp
-    ./src/TerrainBuilder.cpp
-    ./src/VMapExtensions.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/IntermediateValues.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/generator.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/MapBuilder.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/TerrainBuilder.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/VMapExtensions.cpp
 )
 
-add_executable( MoveMapGen ${SOURCES} )
+add_executable(${EXECUTABLE_NAME} ${SOURCES} ${EXECUTABLE_SRCS})
 
-target_link_libraries( MoveMapGen g3dlite vmap Detour Recast zlib )
+if(NOT ACE_USE_EXTERNAL)
+    target_link_libraries(${EXECUTABLE_NAME} ace)
+else()
+    target_link_libraries(${EXECUTABLE_NAME} ACE)
+endif()
+
+if(UNIX)
+    target_link_libraries(${EXECUTABLE_NAME} rt)
+endif()
+
+target_link_libraries(${EXECUTABLE_NAME} g3dlite vmap detour recast zlib shared)
+
+#Output the compiled exes to build/bin/$(Configuration)/tools directory on windows by default
+if(WIN32)
+    if ( MSVC )
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/Release/tools
+            RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/Debug/tools
+        )
+    elseif ( MINGW )
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/tools
+            RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/tools
+        )
+    endif()
+endif()
+
+install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_DIR}/${TOOLS_DIR}")
+if(WIN32 AND MSVC)
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}/${TOOLS_DIR}" CONFIGURATIONS Debug)
+endif()
diff --git a/src/tools/Movemap-Generator/src/TerrainBuilder.h b/src/tools/Movemap-Generator/src/TerrainBuilder.h
index 33b588872..2c99ccb69 100644
--- a/src/tools/Movemap-Generator/src/TerrainBuilder.h
+++ b/src/tools/Movemap-Generator/src/TerrainBuilder.h
@@ -27,7 +27,7 @@
 
 #include "MMapCommon.h"
 #include "MangosMap.h"
-#include "MoveMapSharedDefines.h"
+#include "../../src/game/MoveMapSharedDefines.h"
 
 #include "WorldModel.h"
 
diff --git a/src/tools/map-extractor/CMakeLists.txt b/src/tools/map-extractor/CMakeLists.txt
index c1b05a4bf..043989d22 100644
--- a/src/tools/map-extractor/CMakeLists.txt
+++ b/src/tools/map-extractor/CMakeLists.txt
@@ -1,30 +1,86 @@
-# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
 #
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
+# Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-cmake_minimum_required (VERSION 2.8)
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 project(MANGOS_MAP_EXTRACTOR)
 
 set(EXECUTABLE_NAME "map-extractor")
 
+if(WIN32)
+    # add resource file to windows build
+    set(EXECUTABLE_SRCS ${EXECUTABLE_SRCS} map-extractor.rc)
+endif()
+
 include_directories(
-	${CMAKE_SOURCE_DIR}/dep/StormLib/src
-	${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib
+    #${CMAKE_SOURCE_DIR}/dep/libmpq
+    ${CMAKE_SOURCE_DIR}/dep/StormLib/src
+    ${CMAKE_SOURCE_DIR}/dep/loadlib
 )
 
-link_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/dep/StormLib/src
-	${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib
+add_executable(${EXECUTABLE_NAME} dbcfile.cpp System.cpp ${EXECUTABLE_SRCS})
+
+target_link_libraries(${EXECUTABLE_NAME} StormLib loadlib)
+
+#Output the compiled exes to build/bin/$(Configuration)/tools directory on windows by default
+if(WIN32)
+    if ( MSVC )
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/Release/tools
+            RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/Debug/tools
+        )
+    elseif ( MINGW )
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/tools
+            RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/tools
+        )
+    endif()
+endif()
+
+install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_DIR}/${TOOLS_DIR}")
+if(WIN32 AND MSVC)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}/${TOOLS_DIR}" CONFIGURATIONS Debug)
+endif()
+
+#install documentation and generation scripts
+install(
+    FILES
+        "${CMAKE_CURRENT_SOURCE_DIR}/../Extractor_Binaries/ExtractResources.sh"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../Extractor_Binaries/make_vmaps.bat"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../Extractor_Binaries/mmap_excluded.txt"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../Extractor_Binaries/MoveMapGen.sh"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../Extractor_Binaries/offmesh.txt"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../Extractor_Binaries/README.txt"
+    DESTINATION
+        "${BIN_DIR}/${TOOLS_DIR}"
 )
 
-add_subdirectory (loadlib)
-
-add_executable (${EXECUTABLE_NAME} dbcfile.cpp System.cpp)
-target_link_libraries (${EXECUTABLE_NAME} StormLib loadlib)
\ No newline at end of file
+if( WIN32 )
+    if ( MSVC )
+        add_custom_command(TARGET ${EXECUTABLE_NAME}
+            POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/tools/"
+            COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/../Extractor_Binaries" "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/tools/"
+        )
+    elseif ( MINGW )
+        add_custom_command(TARGET ${EXECUTABLE_NAME}
+            POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin/tools/"
+            COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/../Extractor_Binaries" "${CMAKE_BINARY_DIR}/bin/tools/"
+        )
+    endif()
+endif()
\ No newline at end of file
diff --git a/src/tools/map-extractor/loadlib/CMakeLists.txt b/src/tools/map-extractor/loadlib/CMakeLists.txt
index 1e7f9c3c4..126a16aba 100644
--- a/src/tools/map-extractor/loadlib/CMakeLists.txt
+++ b/src/tools/map-extractor/loadlib/CMakeLists.txt
@@ -8,6 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-add_library(loadlib loadlib.cpp  adt.cpp  wdt.cpp)
+add_library (loadlib loadlib.cpp  adt.cpp  wdt.cpp)
 # link loadlib with zlib
-target_link_libraries (loadlib zlib)
\ No newline at end of file
+target_link_libraries (loadlib zlib)
diff --git a/src/tools/map-extractor/loadlib/loadlib.h b/src/tools/map-extractor/loadlib/loadlib.h
index df6622ab5..8c7f9d8f3 100644
--- a/src/tools/map-extractor/loadlib/loadlib.h
+++ b/src/tools/map-extractor/loadlib/loadlib.h
@@ -30,7 +30,7 @@
 #endif
 
 #include <string>
-#include "StormLib.h"
+#include "..\..\dep\StormLib\src\StormLib.h"
 #include <deque>
 
 #ifdef WIN32
diff --git a/src/tools/vmap-assembler/CMakeLists.txt b/src/tools/vmap-assembler/CMakeLists.txt
index 9602128e5..96e65f549 100644
--- a/src/tools/vmap-assembler/CMakeLists.txt
+++ b/src/tools/vmap-assembler/CMakeLists.txt
@@ -1,5 +1,7 @@
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
 #
-# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+# Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,58 +16,69 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
 
-cmake_minimum_required (VERSION 2.8)
-
-project (MANGOS_VMAP_ASSEMB_IO)
+project(MANGOS_VMAP_ASSEMB_IO)
 
 set(EXECUTABLE_NAME "vmap-assembler")
 
 # comment next line to disable debug mode
-#TODO: These should be general, not with the -D part for windows to work too?
 add_definitions("-DIOMAP_DEBUG")
 add_definitions("-DNO_CORE_FUNCS")
 
 include_directories(
-    "${CMAKE_SOURCE_DIR}/src/shared"
-    "${CMAKE_SOURCE_DIR}/src/game/vmap/"
-    "${CMAKE_SOURCE_DIR}/dep/include/g3dlite/"
-    "${CMAKE_SOURCE_DIR}/src/framework/"
-    "${ACE_INCLUDE_DIR}"
+    ${CMAKE_SOURCE_DIR}/src/shared
+    ${CMAKE_SOURCE_DIR}/src/game/vmap
+    ${CMAKE_SOURCE_DIR}/dep/g3dlite
+    ${CMAKE_SOURCE_DIR}/dep/g3dlite/G3D
+    ${CMAKE_SOURCE_DIR}/src/framework
+    ${ACE_INCLUDE_DIR}
 )
 
 if(WIN32)
-  # add resource file to windows build
-  set(EXECUTABLE_SRCS ${EXECUTABLE_SRCS} vmap-assembler.rc)
+    # add resource file to windows build
+    set(EXECUTABLE_SRCS ${EXECUTABLE_SRCS} vmap-assembler.rc)
 endif()
 
 add_executable(${EXECUTABLE_NAME} vmap_assembler.cpp ${EXECUTABLE_SRCS})
 
 if(NOT ACE_USE_EXTERNAL)
-  target_link_libraries(${EXECUTABLE_NAME} ace)
+    target_link_libraries(${EXECUTABLE_NAME} ace)
 else()
-  target_link_libraries(${EXECUTABLE_NAME} ACE)
+    target_link_libraries(${EXECUTABLE_NAME} ACE)
+endif()
+
+if(UNIX)
+    target_link_libraries(${EXECUTABLE_NAME} rt dl)
 endif()
 
 target_link_libraries(${EXECUTABLE_NAME} vmap g3dlite zlib)
 
+set(EXECUTABLE_LINK_FLAGS "")
+
+if(UNIX)
+    if(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+        set(EXECUTABLE_LINK_FLAGS "-pthread${EXECUTABLE_LINK_FLAGS}")
+    endif()
+endif()
+
+set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS "${EXECUTABLE_LINK_FLAGS}")
+
 #Output the compiled exes to build/bin/$(Configuration)/tools directory on windows by default
 if(WIN32)
-  if ( MSVC )
-    set_target_properties(${EXECUTABLE_NAME} PROPERTIES
-      RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/Release/tools
-      RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/Debug/tools
-    )
-  elseif ( MINGW )
-    set_target_properties(${EXECUTABLE_NAME} PROPERTIES
-      RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/tools
-      RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/tools
-    )
-  endif()
+    if ( MSVC )
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/Release/tools
+            RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/Debug/tools
+        )
+    elseif ( MINGW )
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/tools
+            RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/tools
+        )
+    endif()
 endif()
 
 install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_DIR}/${TOOLS_DIR}")
 if(WIN32 AND MSVC)
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}/${TOOLS_DIR}" CONFIGURATIONS Debug)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}/${TOOLS_DIR}" CONFIGURATIONS Debug)
 endif()
diff --git a/src/tools/vmap-extractor/CMakeLists.txt b/src/tools/vmap-extractor/CMakeLists.txt
index 4b8b58dbb..30df59573 100644
--- a/src/tools/vmap-extractor/CMakeLists.txt
+++ b/src/tools/vmap-extractor/CMakeLists.txt
@@ -1,5 +1,7 @@
+# MaNGOS is a full featured server for World of Warcraft, supporting
+# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8
 #
-# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
+# Copyright (C) 2005-2015  MaNGOS project <http://getmangos.eu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,24 +16,48 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-cmake_minimum_required (VERSION 2.8)
-
-project (MANGOS_VMAP_EXTRACT_IO)
 
 set(EXECUTABLE_NAME "vmap-extractor")
 
-# uncomment next line to disable debug mode
-ADD_DEFINITIONS("-DIOMAP_DEBUG")
-# build setup currently only supports libmpq 0.4.x
-ADD_DEFINITIONS("-DUSE_LIBMPQ04")
-ADD_DEFINITIONS("-Wall")
-ADD_DEFINITIONS("-ggdb")
-ADD_DEFINITIONS("-O3")
+if(WIN32)
+    # add resource file to windows build
+    set(EXECUTABLE_SRCS ${EXECUTABLE_SRCS} vmap-extractor.rc)
+endif()
 
 include_directories(
-    "${CMAKE_SOURCE_DIR}/dep/StormLib/src"
+    #${CMAKE_SOURCE_DIR}/dep/libmpq
+    ${CMAKE_SOURCE_DIR}/dep/StormLib/src
+    ${CMAKE_SOURCE_DIR}/dep/loadlib
 )
 
-add_subdirectory(vmapextract)
\ No newline at end of file
+add_executable(${EXECUTABLE_NAME} ${EXECUTABLE_SRCS}
+    adtfile.cpp
+    dbcfile.cpp
+    gameobject_extract.cpp
+    model.cpp
+    vmapexport.cpp
+    wdtfile.cpp
+    wmo.cpp
+)
+
+target_link_libraries(${EXECUTABLE_NAME} StormLib loadlib bzip2 zlib)
+
+#Output the compiled exes to build/bin/$(Configuration)/tools directory on windows by default
+if(WIN32)
+    if ( MSVC )
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/Release/tools
+            RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/Debug/tools
+        )
+    elseif ( MINGW )
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin/tools
+            RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin/tools
+        )
+    endif()
+endif()
+
+install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_DIR}/${TOOLS_DIR}")
+if(WIN32 AND MSVC)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}/${TOOLS_DIR}" CONFIGURATIONS Debug)
+endif()
diff --git a/src/tools/vmap-extractor/vmapextract/CMakeLists.txt b/src/tools/vmap-extractor/vmapextract/CMakeLists.txt
index 54bc3a2b5..f45371abc 100644
--- a/src/tools/vmap-extractor/vmapextract/CMakeLists.txt
+++ b/src/tools/vmap-extractor/vmapextract/CMakeLists.txt
@@ -12,5 +12,6 @@ cmake_minimum_required (VERSION 2.8)
 
 project (MANGOS_IOMAP_EXTRACTOR)
 
+LINK_DIRECTORIES( ${LINK_DIRECTORIES} ${CMAKE_SOURCE_DIR}/../../../dep/StormLib/src )
 add_executable(vmapextractor adtfile.cpp  dbcfile.cpp gameobject_extract.cpp model.cpp mpqfile.cpp vmapexport.cpp  wdtfile.cpp  wmo.cpp)
 target_link_libraries(vmapextractor StormLib bzip2 zlib)
diff --git a/win/.gitignore b/win/.gitignore
deleted file mode 100644
index 5614c136c..000000000
--- a/win/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git-ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# Special folder that is created by the ReSharper Visual Studio Addon
-#
-
-_ReSharper*
diff --git a/win/BuildEverything_vc120.sln b/win/BuildEverything_vc120.sln
deleted file mode 100644
index ae96ddb47..000000000
--- a/win/BuildEverything_vc120.sln
+++ /dev/null
@@ -1,438 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ace", "VC120\ace.vcxproj", "{D70895A7-4EA1-48BE-A557-834D4357BAD3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "VC120\bzip2.vcxproj", "{BC139E42-505E-430B-8610-6ED2B1E358E8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{78424708-1F6E-4D4B-920C-FB6D26847055} = {78424708-1F6E-4D4B-920C-FB6D26847055}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "detour", "VC120\detour.vcxproj", "{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "framework", "VC120\framework.vcxproj", "{915B99FF-5340-4BCE-AAE7-D3737443498B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3} = {D70895A7-4EA1-48BE-A557-834D4357BAD3}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC120\g3dlite.vcxproj", "{367CCE76-14A7-4871-93D6-579DA35FBEFD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3} = {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC120\game.vcxproj", "{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2} = {DA729B06-9097-4DA6-A86C-E97BC843B7C2}
-		{A2F9FB91-326B-4214-A988-AA1832D590CE} = {A2F9FB91-326B-4214-A988-AA1832D590CE}
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31} = {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3} = {D70895A7-4EA1-48BE-A557-834D4357BAD3}
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77} = {3FECACB6-BD35-4857-BF55-A56B5E6C6D77}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsoap", "VC120\gsoap.vcxproj", "{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loadlib", "VC120\loadlib.vcxproj", "{29E1FE24-1C69-4E6B-945D-02544988A5FA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3} = {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "VC120\mangosd.vcxproj", "{485F08B8-BAD4-47C1-8B49-17B9949B123E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2} = {DA729B06-9097-4DA6-A86C-E97BC843B7C2}
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD} = {367CCE76-14A7-4871-93D6-579DA35FBEFD}
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933} = {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31} = {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3} = {D70895A7-4EA1-48BE-A557-834D4357BAD3}
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77} = {3FECACB6-BD35-4857-BF55-A56B5E6C6D77}
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3} = {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6} = {53CF48ED-FEFE-4165-A9CA-F000ABC572B6}
-		{915B99FF-5340-4BCE-AAE7-D3737443498B} = {915B99FF-5340-4BCE-AAE7-D3737443498B}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosscript", "VC120\mangosscript.vcxproj", "{DA729B06-9097-4DA6-A86C-E97BC843B7C2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A2F9FB91-326B-4214-A988-AA1832D590CE} = {A2F9FB91-326B-4214-A988-AA1832D590CE}
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3} = {D70895A7-4EA1-48BE-A557-834D4357BAD3}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "realmd", "VC120\realmd.vcxproj", "{23AFA1F9-A301-4123-81D8-777D3DE349C4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A2F9FB91-326B-4214-A988-AA1832D590CE} = {A2F9FB91-326B-4214-A988-AA1832D590CE}
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31} = {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3} = {D70895A7-4EA1-48BE-A557-834D4357BAD3}
-		{915B99FF-5340-4BCE-AAE7-D3737443498B} = {915B99FF-5340-4BCE-AAE7-D3737443498B}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recast", "VC120\recast.vcxproj", "{467226FB-7838-43FF-8ECA-199FAEA760D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC120\shared.vcxproj", "{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3} = {D70895A7-4EA1-48BE-A557-834D4357BAD3}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap", "VC120\vmap.vcxproj", "{3C86FD37-9872-4302-A502-740E7D028D3A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD} = {367CCE76-14A7-4871-93D6-579DA35FBEFD}
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3} = {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "VC120\zlib.vcxproj", "{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopytoOutput", "VC120\CopytoOutput.vcxproj", "{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E} = {485F08B8-BAD4-47C1-8B49-17B9949B123E}
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4} = {23AFA1F9-A301-4123-81D8-777D3DE349C4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopySystemConfig", "VC120\CopySystemConfig.vcxproj", "{A2F9FB91-326B-4214-A988-AA1832D590CE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "VC120\StormLib.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		DebugAD|Win32 = DebugAD|Win32
-		DebugAD|x64 = DebugAD|x64
-		DebugAS|Win32 = DebugAS|Win32
-		DebugAS|x64 = DebugAS|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseAD|Win32 = ReleaseAD|Win32
-		ReleaseAD|x64 = ReleaseAD|x64
-		ReleaseAS|Win32 = ReleaseAS|Win32
-		ReleaseAS|x64 = ReleaseAS|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug|Win32.Build.0 = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug|x64.ActiveCfg = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.DebugAD|Win32.Build.0 = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.DebugAS|Win32.Build.0 = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Release|Win32.ActiveCfg = Release|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Release|Win32.Build.0 = Release|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Release|x64.ActiveCfg = Release|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.Debug|Win32.Build.0 = Debug|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.Debug|x64.ActiveCfg = Debug|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.DebugAD|Win32.Build.0 = Debug|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.DebugAS|Win32.Build.0 = Debug|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.Release|Win32.ActiveCfg = Release|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.Release|Win32.Build.0 = Release|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.Release|x64.ActiveCfg = Release|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.Debug|Win32.Build.0 = Debug|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.Debug|x64.ActiveCfg = Debug|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.DebugAD|Win32.Build.0 = Debug|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.DebugAS|Win32.Build.0 = Debug|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.Release|Win32.ActiveCfg = Release|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.Release|Win32.Build.0 = Release|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.Release|x64.ActiveCfg = Release|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug|Win32.Build.0 = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug|x64.ActiveCfg = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.DebugAD|Win32.Build.0 = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.DebugAS|Win32.Build.0 = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Release|Win32.ActiveCfg = Release|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Release|Win32.Build.0 = Release|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Release|x64.ActiveCfg = Release|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug|Win32.Build.0 = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug|x64.ActiveCfg = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.DebugAD|Win32.Build.0 = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.DebugAS|Win32.Build.0 = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Release|Win32.ActiveCfg = Release|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Release|Win32.Build.0 = Release|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Release|x64.ActiveCfg = Release|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug|Win32.Build.0 = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug|x64.ActiveCfg = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.DebugAD|Win32.Build.0 = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.DebugAS|Win32.Build.0 = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Release|Win32.ActiveCfg = Release|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Release|Win32.Build.0 = Release|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Release|x64.ActiveCfg = Release|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.Debug|Win32.Build.0 = Debug|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.Debug|x64.ActiveCfg = Debug|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.DebugAD|Win32.Build.0 = Debug|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.DebugAS|Win32.Build.0 = Debug|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.Release|Win32.ActiveCfg = Release|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.Release|Win32.Build.0 = Release|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.Release|x64.ActiveCfg = Release|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.Debug|Win32.Build.0 = Debug|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.Debug|x64.ActiveCfg = Debug|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.DebugAD|Win32.Build.0 = Debug|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.DebugAS|Win32.Build.0 = Debug|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.Release|Win32.ActiveCfg = Release|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.Release|Win32.Build.0 = Release|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.Release|x64.ActiveCfg = Release|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug|Win32.Build.0 = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug|x64.ActiveCfg = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.DebugAD|Win32.Build.0 = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.DebugAS|Win32.Build.0 = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Release|Win32.ActiveCfg = Release|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Release|Win32.Build.0 = Release|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Release|x64.ActiveCfg = Release|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.Debug|Win32.Build.0 = Debug|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.Debug|x64.ActiveCfg = Debug|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.DebugAD|Win32.Build.0 = Debug|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.DebugAS|Win32.Build.0 = Debug|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.Release|Win32.ActiveCfg = Release|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.Release|Win32.Build.0 = Release|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.Release|x64.ActiveCfg = Release|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{DA729B06-9097-4DA6-A86C-E97BC843B7C2}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug|Win32.Build.0 = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug|x64.ActiveCfg = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.DebugAD|Win32.Build.0 = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.DebugAS|Win32.Build.0 = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Release|Win32.ActiveCfg = Release|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Release|Win32.Build.0 = Release|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Release|x64.ActiveCfg = Release|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.Debug|Win32.Build.0 = Debug|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.Debug|x64.ActiveCfg = Debug|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.DebugAD|Win32.Build.0 = Debug|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.DebugAS|Win32.Build.0 = Debug|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.Release|Win32.ActiveCfg = Release|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.Release|Win32.Build.0 = Release|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.Release|x64.ActiveCfg = Release|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{467226FB-7838-43FF-8ECA-199FAEA760D6}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug|Win32.ActiveCfg = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug|Win32.Build.0 = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug|x64.ActiveCfg = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.DebugAD|Win32.Build.0 = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.DebugAS|Win32.Build.0 = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Release|Win32.ActiveCfg = Release|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Release|Win32.Build.0 = Release|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Release|x64.ActiveCfg = Release|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.Debug|Win32.Build.0 = Debug|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.Debug|x64.ActiveCfg = Debug|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.Release|Win32.ActiveCfg = Release|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.Release|Win32.Build.0 = Release|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.Release|x64.ActiveCfg = Release|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{3C86FD37-9872-4302-A502-740E7D028D3A}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug|Win32.Build.0 = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug|x64.ActiveCfg = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.DebugAD|Win32.Build.0 = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.DebugAS|Win32.Build.0 = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Release|Win32.ActiveCfg = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Release|Win32.Build.0 = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Release|x64.ActiveCfg = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.Debug|Win32.Build.0 = Debug|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.Debug|x64.ActiveCfg = Debug|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.DebugAD|Win32.Build.0 = Debug|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.DebugAS|Win32.Build.0 = Debug|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.Release|Win32.ActiveCfg = Release|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.Release|Win32.Build.0 = Release|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.Release|x64.ActiveCfg = Release|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.Debug|Win32.Build.0 = Debug|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.Debug|x64.ActiveCfg = Debug|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.DebugAD|Win32.ActiveCfg = Debug|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.DebugAD|Win32.Build.0 = Debug|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.DebugAD|x64.ActiveCfg = Debug|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.DebugAS|Win32.ActiveCfg = Debug|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.DebugAS|Win32.Build.0 = Debug|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.DebugAS|x64.ActiveCfg = Debug|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.Release|Win32.ActiveCfg = Release|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.Release|Win32.Build.0 = Release|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.Release|x64.ActiveCfg = Release|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.ReleaseAD|Win32.ActiveCfg = Release|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.ReleaseAD|Win32.Build.0 = Release|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.ReleaseAD|x64.ActiveCfg = Release|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.ReleaseAS|Win32.ActiveCfg = Release|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.ReleaseAS|Win32.Build.0 = Release|Win32
-		{A2F9FB91-326B-4214-A988-AA1832D590CE}.ReleaseAS|x64.ActiveCfg = Release|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.ActiveCfg = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.Build.0 = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.ActiveCfg = DebugAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.Build.0 = DebugAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.ActiveCfg = DebugAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.Build.0 = DebugAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.ActiveCfg = DebugAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.Build.0 = DebugAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.ActiveCfg = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.Build.0 = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.ActiveCfg = DebugAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.Build.0 = DebugAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.ActiveCfg = ReleaseAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.Build.0 = ReleaseAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.ActiveCfg = ReleaseAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.Build.0 = ReleaseAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.ActiveCfg = ReleaseAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.Build.0 = ReleaseAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.ActiveCfg = ReleaseAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.Build.0 = ReleaseAD|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.ActiveCfg = ReleaseAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.Build.0 = ReleaseAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.ActiveCfg = ReleaseAS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.Build.0 = ReleaseAS|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/win/MaNGOS_EasyBuild.exe b/win/MaNGOS_EasyBuild.exe
new file mode 100644
index 000000000..d31bafff2
Binary files /dev/null and b/win/MaNGOS_EasyBuild.exe differ
diff --git a/win/VC100/.gitignore b/win/VC100/.gitignore
deleted file mode 100644
index f1254be38..000000000
--- a/win/VC100/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git-ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# MaNGOS generated files at Windows build
-#
-
-*__Win32_Debug*
-*__x64_Debug*
-*__Win32_Release*
-*__x64_Release*
-*.log
diff --git a/win/VC100/CopySystemConfig.vcxproj b/win/VC100/CopySystemConfig.vcxproj
deleted file mode 100644
index e92f4e8cc..000000000
--- a/win/VC100/CopySystemConfig.vcxproj
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A2F9FB91-326B-4214-A988-AA1832D590CE}</ProjectGuid>
-    <RootNamespace>CopySystemconfig</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>$(Configuration)\_temp\</IntDir>
-    <OutDir>$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\_temp\CopySystemConfig\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PreBuildEvent>
-      <Command>copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h</Command>
-    </PreBuildEvent>
-    <PreBuildEvent>
-      <Message>Copying SystemConfig.h.in as systemConfig.h</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <PreBuildEvent>
-      <Command>copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h</Command>
-    </PreBuildEvent>
-    <PreBuildEvent>
-      <Message>Copying SystemConfig.h.in as systemConfig.h</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/CopytoOutput.vcxproj b/win/VC100/CopytoOutput.vcxproj
deleted file mode 100644
index da9891970..000000000
--- a/win/VC100/CopytoOutput.vcxproj
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}</ProjectGuid>
-    <RootNamespace>CopytoOutput</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>$(Configuration)\_temp\</IntDir>
-    <OutDir>$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\_temp\CopytoOutput\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\copyfiles.cmd "$(SolutionDir)VC100" ..\..\build\bin $(Configuration) $(Platform)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copy Files to output folder</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\copyfiles.cmd "$(SolutionDir)VC100" ..\..\build\bin $(Configuration) $(Platform)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copy Files to output folder</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/LuaEngine.vcxproj b/win/VC100/LuaEngine.vcxproj
deleted file mode 100644
index 05f306ec2..000000000
--- a/win/VC100/LuaEngine.vcxproj
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{61BCE72F-B726-48F3-9D02-7FD551F82DF8}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>LuaEngine</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\luaengine\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">LuaEngine</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\luaengine\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">LuaEngine</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\dep\zlib;..\..\dep\lualib;..\..\dep\acelite;..\..\dep\include\mysql;..\..\dep\include\openssl;..\..\src\shared;..\..\src\framework;..\..\src\framework\Platform;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\vmap;..\..\src\game\MotionGenerators;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\WorldHandlers;..\..\src\game\Object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\dep\zlib;..\..\dep\lualib;..\..\dep\acelite;..\..\dep\include\mysql;..\..\dep\include\openssl;..\..\src\shared;..\..\src\framework;..\..\src\framework\Platform;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\vmap;..\..\src\game\MotionGenerators;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\WorldHandlers;..\..\src\game\Object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\dep\zlib;..\..\dep\lualib;..\..\dep\acelite;..\..\dep\include\mysql;..\..\dep\include\openssl;..\..\src\shared;..\..\src\framework;..\..\src\framework\Platform;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\vmap;..\..\src\game\MotionGenerators;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\WorldHandlers;..\..\src\game\Object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\dep\zlib;..\..\dep\lualib;..\..\dep\acelite;..\..\dep\include\mysql;..\..\dep\include\openssl;..\..\src\shared;..\..\src\framework;..\..\src\framework\Platform;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\vmap;..\..\src\game\MotionGenerators;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\WorldHandlers;..\..\src\game\Object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\dep\zlib;..\..\dep\lualib;..\..\dep\acelite;..\..\dep\include\mysql;..\..\dep\include\openssl;..\..\src\shared;..\..\src\framework;..\..\src\framework\Platform;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\vmap;..\..\src\game\MotionGenerators;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\WorldHandlers;..\..\src\game\Object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\dep\zlib;..\..\dep\lualib;..\..\dep\acelite;..\..\dep\include\mysql;..\..\dep\include\openssl;..\..\src\shared;..\..\src\framework;..\..\src\framework\Platform;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\vmap;..\..\src\game\MotionGenerators;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\WorldHandlers;..\..\src\game\Object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\shared\Common.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\AuraMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\BattleGroundMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\CorpseMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\CreatureMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ElunaBinding.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ElunaEventMgr.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ElunaIncludes.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ElunaQueryMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ElunaTemplate.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ElunaUtility.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\GameObjectMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\GlobalMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\GroupMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\GuildMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\HookMgr.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ItemMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\LuaEngine.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\MapMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ObjectMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\PlayerMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\QuestMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\SpellMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\UnitMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\VehicleMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\WeatherMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\WorldObjectMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\WorldPacketMethods.h" />
-    <ClCompile Include="..\..\src\modules\Eluna\ElunaEventMgr.cpp" />
-    <ClCompile Include="..\..\src\modules\Eluna\ElunaUtility.cpp" />
-    <ClCompile Include="..\..\src\modules\Eluna\HookMgr.cpp" />
-    <ClCompile Include="..\..\src\modules\Eluna\LuaEngine.cpp" />
-    <ClCompile Include="..\..\src\modules\Eluna\LuaFunctions.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/StormLib.vcxproj b/win/VC100/StormLib.vcxproj
deleted file mode 100644
index 328b47398..000000000
--- a/win/VC100/StormLib.vcxproj
+++ /dev/null
@@ -1,688 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugAD|Win32">
-      <Configuration>DebugAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAD|x64">
-      <Configuration>DebugAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|Win32">
-      <Configuration>DebugAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|x64">
-      <Configuration>DebugAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|Win32">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|x64">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|Win32">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|x64">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>StormLib</ProjectName>
-    <ProjectGuid>{78424708-1F6E-4D4B-920C-FB6D26847055}</ProjectGuid>
-    <RootNamespace>StormLib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">$(ProjectName)RAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">$(ProjectName)RAS</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt" />
-    <None Include="doc\The MoPaQ File Format 0.9.txt" />
-    <None Include="doc\The MoPaQ File Format 1.0.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\StormCommon.h" />
-    <ClInclude Include="src\StormLib.h" />
-    <ClInclude Include="src\StormPort.h" />
-    <ClInclude Include="src\adpcm\adpcm.h" />
-    <ClInclude Include="src\huffman\huff.h" />
-    <ClInclude Include="src\pklib\pklib.h" />
-    <ClInclude Include="src\sparse\sparse.h" />
-    <ClInclude Include="src\jenkins\lookup.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\FileStream.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseCommon.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseFileTable.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SCompression.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAddFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAttributes.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCompactArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCreateArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileExtractFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileFindFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileListFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenFileEx.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFilePatchArchives.cpp" />
-    <ClCompile Include="src\SFileReadFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileVerify.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\adpcm\adpcm.cpp" />
-    <ClCompile Include="src\bzip2\blocksort.c" />
-    <ClCompile Include="src\bzip2\bzlib.c" />
-    <ClCompile Include="src\bzip2\compress.c" />
-    <ClCompile Include="src\bzip2\crctable.c" />
-    <ClCompile Include="src\bzip2\decompress.c" />
-    <ClCompile Include="src\bzip2\huffman.c" />
-    <ClCompile Include="src\bzip2\randtable.c" />
-    <ClCompile Include="src\huffman\huff.cpp" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="src\libtommath\bn_reverse.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bncore.c" />
-    <ClCompile Include="src\lzma\C\LzFind.c" />
-    <ClCompile Include="src\lzma\C\LzFindMt.c" />
-    <ClCompile Include="src\lzma\C\LzmaDec.c" />
-    <ClCompile Include="src\lzma\C\LzmaEnc.c" />
-    <ClCompile Include="src\lzma\C\Threads.c" />
-    <ClCompile Include="src\pklib\explode.c" />
-    <ClCompile Include="src\pklib\implode.c" />
-    <ClCompile Include="src\sparse\sparse.cpp" />
-    <ClCompile Include="src\zlib\adler32.c" />
-    <ClCompile Include="src\zlib\compress2.c" />
-    <ClCompile Include="src\zlib\crc32.c" />
-    <ClCompile Include="src\zlib\deflate.c" />
-    <ClCompile Include="src\zlib\inffast.c" />
-    <ClCompile Include="src\zlib\inflate.c" />
-    <ClCompile Include="src\zlib\inftrees.c" />
-    <ClCompile Include="src\zlib\trees.c" />
-    <ClCompile Include="src\zlib\zutil.c" />
-    <ClCompile Include="src\jenkins\lookup3.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/ace.vcxproj b/win/VC100/ace.vcxproj
deleted file mode 100644
index f1cdcc54b..000000000
--- a/win/VC100/ace.vcxproj
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{D70895A7-4EA1-48BE-A557-834D4357BAD3}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>ace</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\Ace\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ace</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\Ace\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ace</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\acelite;..\..\dep\acelite\ace\PrecompiledHeaders;..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;ACE_BUILD_DLL;CMAKE_INTDIR="Release";ace_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;ACE_BUILD_DLL;CMAKE_INTDIR=\"Release\";ace_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\acelite;..\..\dep\acelite\ace\PrecompiledHeaders;..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\acelite;..\..\dep\acelite\ace\PrecompiledHeaders;..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/ace.lib</ImportLibrary>
-      <ProgramDataBaseFile>$(Configuration)/ace.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\acelite;..\..\dep\acelite\ace\PrecompiledHeaders;..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;ACE_BUILD_DLL;CMAKE_INTDIR="Debug";ace_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;ACE_BUILD_DLL;CMAKE_INTDIR=\"Debug\";ace_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\acelite;..\..\dep\acelite\ace\PrecompiledHeaders;..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\acelite;..\..\dep\acelite\ace\PrecompiledHeaders;..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/ace.lib</ImportLibrary>
-      <ProgramDataBaseFile>$(Configuration)/ace.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\acelite\ace\ACE.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ACE_crc32.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ACE_crc_ccitt.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ace_wchar.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Activation_Queue.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Active_Map_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Argv_Type_Converter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Assert.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Asynch_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Asynch_IO_Impl.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Asynch_Pseudo_Task.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ATM_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ATM_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ATM_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ATM_Params.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ATM_QoS.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ATM_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Atomic_Op.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Atomic_Op_Sparc.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\acelite\ace\Auto_Event.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Barrier.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Base_Thread_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Based_Pointer_Repository.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Basic_Stats.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Basic_Types.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Capabilities.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\CDR_Base.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\CDR_Size.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\CDR_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Cleanup.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Codecs.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Codeset_IBM1047.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Codeset_Registry.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Codeset_Registry_db.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Condition_Attributes.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Condition_Recursive_Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Condition_Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Configuration.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Configuration_Import_Export.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Connection_Recycling_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Containers.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Copy_Disabled.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Date_Time.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\DEV.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\DEV_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\DEV_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\DEV_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dev_Poll_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dirent.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dirent_Selector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\DLL.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\DLL_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dump.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dynamic.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dynamic_Message_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dynamic_Service_Base.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dynamic_Service_Dependency.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Encoding_Converter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Encoding_Converter_Factory.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Event.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Event_Handler.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Event_Handler_Handle_Timeout_Upcall.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FIFO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FIFO_Recv.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FIFO_Recv_Msg.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FIFO_Send.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FIFO_Send_Msg.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FILE.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FILE_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FILE_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FILE_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\File_Lock.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Filecache.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Flag_Manip.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Framework_Component.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Functor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Functor_String.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Get_Opt.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Handle_Ops.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Handle_Set.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Hashable.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\High_Res_Timer.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ICMP_Socket.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\INET_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Init_ACE.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\IO_Cntl_Msg.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\IO_SAP.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\IOStream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\IPC_SAP.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Lib_Find.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Local_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Local_Name_Space.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Local_Tokens.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Lock.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Msg.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Msg_Backend.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Msg_Callback.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Msg_IPC.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Msg_NT_Event_Log.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Msg_UNIX_Syslog.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Record.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Logging_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\LSOCK.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\LSOCK_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\LSOCK_CODgram.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\LSOCK_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\LSOCK_Dgram.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\LSOCK_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Malloc.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Malloc_Allocator.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Manual_Event.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MEM_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MEM_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MEM_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MEM_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Mem_Map.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MEM_SAP.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MEM_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Message_Block.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Message_Queue.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Message_Queue_NT.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Message_Queue_Vx.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Method_Request.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MMAP_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Admin.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Admin_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Base.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Control_Action.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Control_Types.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Point_Registry.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Size.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Msg_WFMO_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Multihomed_INET_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Name_Proxy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Name_Request_Reply.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Name_Space.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Naming_Context.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Netlink_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Notification_Queue.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Notification_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\NT_Service.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Obchunk.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Object_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Object_Manager_Base.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_Errno.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_Log_Msg_Attributes.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_main.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_arpa_inet.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_ctype.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_dirent.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_dlfcn.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_errno.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_fcntl.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_math.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_netdb.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_poll.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_pwd.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_regex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_signal.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_stdio.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_stdlib.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_string.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_strings.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_stropts.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_mman.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_msg.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_resource.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_select.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_sendfile.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_shm.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_socket.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_stat.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_time.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_uio.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_utsname.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_wait.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_Thread.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_time.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_unistd.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_wchar.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_QoS.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_Thread_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_TLI.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Pagefile_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Parse_Node.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\PI_Malloc.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Ping_Socket.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Pipe.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\POSIX_Asynch_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\POSIX_CB_Proactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\POSIX_Proactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Priority_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Proactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Proactor_Impl.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Process.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Process_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Process_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Process_Semaphore.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Profile_Timer.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Reactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Reactor_Impl.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Reactor_Notification_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Reactor_Timer_Interface.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Read_Buffer.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Recursive_Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Recyclable.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Registry.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Registry_Name_Space.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Remote_Name_Space.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Remote_Tokens.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Rtems_init.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\acelite\ace\RW_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\RW_Process_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\RW_Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Sample_History.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Sbrk_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Sched_Params.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Select_Reactor_Base.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Semaphore.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Service_Config.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Service_Gestalt.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Service_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Service_Object.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Service_Repository.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Service_Types.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Shared_Memory.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Shared_Memory_MM.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Shared_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Shared_Memory_SV.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Shared_Object.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Sig_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Sig_Handler.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Signal.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_CODgram.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Sock_Connect.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Dgram.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Dgram_Bcast.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Dgram_Mcast.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Netlink.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_SEQPACK_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_SEQPACK_Association.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_SEQPACK_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SPIPE.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SPIPE_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SPIPE_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SPIPE_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SPIPE_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SString.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Stack_Trace.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Stats.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\String_Base_Const.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SUN_Proactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SV_Message.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SV_Message_Queue.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SV_Semaphore_Complex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SV_Semaphore_Simple.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SV_Shared_Memory.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Svc_Conf_Lexer.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Svc_Conf_y.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Synch_Options.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\System_Time.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Task.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Control.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Exit.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Hook.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Semaphore.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Throughput_Stats.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Time_Policy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Time_Value.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Timeprobe.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TLI.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TLI_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TLI_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TLI_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Token.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Token_Collection.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Token_Invariants.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Token_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Token_Request_Reply.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TP_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Trace.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TSS_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TTY_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UNIX_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UPIPE_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UPIPE_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UPIPE_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UTF16_Encoding_Converter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UTF32_Encoding_Converter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UTF8_Encoding_Converter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UUID.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\WFMO_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\WIN32_Asynch_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\WIN32_Proactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\XML_Svc_Conf.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\XTI_ATM_Mcast.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/bzip2.vcxproj b/win/VC100/bzip2.vcxproj
deleted file mode 100644
index 72fdf8429..000000000
--- a/win/VC100/bzip2.vcxproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B96F612A-C91D-43B3-A4C3-D4294817EC6C}</ProjectGuid>
-    <RootNamespace>bzip2</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\bzip2__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\bzip2__$(Platform)_$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\bzip2__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\bzip2__$(Platform)_$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\bzip2\blocksort.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\bzlib.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\compress.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\crctable.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\decompress.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\huffman.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\randtable.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\src\bzip2\bzlib.h" />
-    <ClInclude Include="..\..\dep\src\bzip2\bzlib_private.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win/VC100/detour.vcxproj b/win/VC100/detour.vcxproj
deleted file mode 100644
index bd99ec90a..000000000
--- a/win/VC100/detour.vcxproj
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>detour</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\detour\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">detour</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\detour\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">detour</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour\Source;..\..\dep\recastnavigation;..\..\dep\recastnavigation\Detour;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;DT_POLYREF64;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;DT_POLYREF64;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour\Source;..\..\dep\recastnavigation;..\..\dep\recastnavigation\Detour;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour\Source;..\..\dep\recastnavigation;..\..\dep\recastnavigation\Detour;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour\Source;..\..\dep\recastnavigation;..\..\dep\recastnavigation\Detour;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;DT_POLYREF64;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;DT_POLYREF64;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour\Source;..\..\dep\recastnavigation;..\..\dep\recastnavigation\Detour;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour\Source;..\..\dep\recastnavigation;..\..\dep\recastnavigation\Detour;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\recastnavigation\Detour\Source\DetourAlloc.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Detour\Source\DetourCommon.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Detour\Source\DetourNavMeshBuilder.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Detour\Source\DetourNavMesh.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Detour\Source\DetourNavMeshQuery.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Detour\Source\DetourNode.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/framework.vcxproj b/win/VC100/framework.vcxproj
deleted file mode 100644
index 4a7f00740..000000000
--- a/win/VC100/framework.vcxproj
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}</ProjectGUID>
-    <RootNamespace>framework</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\framework__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\framework__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\framework__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\framework__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\framework__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\framework__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\framework__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\framework__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\framework__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\framework__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\framework__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\framework__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.lib</TargetExt>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\framework__$(Platform)_$(Configuration)\framework.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\framework__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\framework__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\framework__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\framework__$(Platform)_$(Configuration)\framework.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\framework__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\framework__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\framework__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\framework__$(Platform)_$(Configuration)\framework.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\framework__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\framework__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\framework__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\framework__$(Platform)_$(Configuration)\framework.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\framework__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\framework__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\framework__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\framework__$(Platform)_$(Configuration)\framework.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\framework__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\framework__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\framework__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\framework__$(Platform)_$(Configuration)\framework.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\framework__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\framework__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\framework__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\framework\Dynamic\FactoryHolder.h" />
-    <ClInclude Include="..\..\src\framework\Dynamic\ObjectRegistry.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\Grid.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\GridLoader.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\GridReference.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\GridRefManager.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\NGrid.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainer.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainerFunctions.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainerVisitor.h" />
-    <ClInclude Include="..\..\src\framework\Platform\CompilerDefs.h" />
-    <ClInclude Include="..\..\src\framework\Platform\Define.h" />
-    <ClInclude Include="..\..\src\framework\Policies\CreationPolicy.h" />
-    <ClInclude Include="..\..\src\framework\Policies\ObjectLifeTime.h" />
-    <ClInclude Include="..\..\src\framework\Policies\Singleton.h" />
-    <ClInclude Include="..\..\src\framework\Policies\ThreadingModel.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\ByteConverter.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\Callback.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\EventProcessor.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedList.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\Reference.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\RefManager.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\TypeList.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\UnorderedMapSet.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\framework\Policies\ObjectLifeTime.cpp" />
-    <ClCompile Include="..\..\src\framework\Utilities\EventProcessor.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win/VC100/g3dlite.vcxproj b/win/VC100/g3dlite.vcxproj
deleted file mode 100644
index c91beabec..000000000
--- a/win/VC100/g3dlite.vcxproj
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{8072769E-CF10-48BF-B9E1-12752A5DAC6E}</ProjectGUID>
-    <RootNamespace>sockets</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.lib</TargetExt>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\g3dlite\AABox.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Box.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Crypto.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\format.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Matrix3.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Plane.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\RegistryUtil.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\System.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Triangle.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector3.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector4.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\debugAssert.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\fileutils.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\g3dmath.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\g3dfnmatch.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\prompt.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\stringutils.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Any.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryFormat.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryInput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryOutput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Capsule.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\CollisionDetection.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\CoordinateFrame.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Cylinder.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Line.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\LineSegment.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Log.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Matrix4.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\MemoryManager.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Quat.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Random.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Ray.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\ReferenceCount.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Sphere.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\TextInput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\TextOutput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\UprightFrame.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector2.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\PhysicsFrame.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\FileSystem.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\uint128.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\AABox.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Array.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Box.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\CollisionDetection.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\CoordinateFrame.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Crypto.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\debug.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\format.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\g3dmath.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\GCamera.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Line.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Matrix3.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Plane.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\platform.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Quat.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Ray.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\RegistryUtil.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Sphere.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\stringutils.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\System.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Table.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Triangle.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector2.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector2int16.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector3.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector3int16.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector4.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\PhysicsFrame.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\FileSystem.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\uint128.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win/VC100/game.vcxproj b/win/VC100/game.vcxproj
deleted file mode 100644
index b11ed5998..000000000
--- a/win/VC100/game.vcxproj
+++ /dev/null
@@ -1,707 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{1DC6C4DA-A028-41F3-877D-D5400C594F88}</ProjectGUID>
-    <RootNamespace>game</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="Precompiled Headers.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="Precompiled Headers.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="Precompiled Headers.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="Precompiled Headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">game</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/bigobj /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/bigobj /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/bigobj /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\game\AccountMgr.cpp" />
-    <ClCompile Include="..\..\src\game\AchievementMgr.cpp" />
-    <ClCompile Include="..\..\src\game\AggressorAI.cpp" />
-    <ClCompile Include="..\..\src\game\ArenaTeam.cpp" />
-    <ClCompile Include="..\..\src\game\ArenaTeamHandler.cpp" />
-    <ClCompile Include="..\..\src\game\AuctionHouseBot\AuctionHouseBot.cpp" />
-    <ClCompile Include="..\..\src\game\AuctionHouseHandler.cpp" />
-    <ClCompile Include="..\..\src\game\AuctionHouseMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Bag.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGround.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundAA.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundAB.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundRB.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundAV.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundBE.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundDS.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundEY.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundHandler.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundIC.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundMgr.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundNA.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundRL.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundRV.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundSA.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundWS.cpp" />
-    <ClCompile Include="..\..\src\game\Calendar.cpp" />
-    <ClCompile Include="..\..\src\game\CalendarHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Camera.cpp" />
-    <ClCompile Include="..\..\src\game\Channel.cpp" />
-    <ClCompile Include="..\..\src\game\ChannelHandler.cpp" />
-    <ClCompile Include="..\..\src\game\ChannelMgr.cpp" />
-    <ClCompile Include="..\..\src\game\CharacterDatabaseCleaner.cpp" />
-    <ClCompile Include="..\..\src\game\CharacterHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Chat.cpp" />
-    <ClCompile Include="..\..\src\game\ChatHandler.cpp" />
-    <ClCompile Include="..\..\src\game\CombatHandler.cpp" />
-    <ClCompile Include="..\..\src\game\ConfusedMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\Corpse.cpp" />
-    <ClCompile Include="..\..\src\game\Creature.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureAI.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureAIRegistry.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureAISelector.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureEventAI.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureEventAIMgr.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureLinkingMgr.cpp" />
-    <ClCompile Include="..\..\src\game\DB2Stores.cpp" />
-    <ClCompile Include="..\..\src\game\DBCStores.cpp" />
-    <ClCompile Include="..\..\src\game\DBCStructure.cpp" />
-    <ClCompile Include="..\..\src\game\debugcmds.cpp" />
-    <ClCompile Include="..\..\src\game\DuelHandler.cpp" />
-    <ClCompile Include="..\..\src\game\DynamicObject.cpp" />
-    <ClCompile Include="..\..\src\game\FleeingMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\FollowerReference.cpp" />
-    <ClCompile Include="..\..\src\game\GameEventMgr.cpp" />
-    <ClCompile Include="..\..\src\game\GameObject.cpp" />
-    <ClCompile Include="..\..\src\game\GMTicketHandler.cpp" />
-    <ClCompile Include="..\..\src\game\GMTicketMgr.cpp" />
-    <ClCompile Include="..\..\src\game\GossipDef.cpp" />
-    <ClCompile Include="..\..\src\game\GridMap.cpp" />
-    <ClCompile Include="..\..\src\game\GridNotifiers.cpp" />
-    <ClCompile Include="..\..\src\game\GridStates.cpp" />
-    <ClCompile Include="..\..\src\game\Group.cpp" />
-    <ClCompile Include="..\..\src\game\GroupHandler.cpp" />
-    <ClCompile Include="..\..\src\game\GroupReference.cpp" />
-    <ClCompile Include="..\..\src\game\GuardAI.cpp" />
-    <ClCompile Include="..\..\src\game\Guild.cpp" />
-    <ClCompile Include="..\..\src\game\GuildHandler.cpp" />
-    <ClCompile Include="..\..\src\game\GuildMgr.cpp" />
-    <ClCompile Include="..\..\src\game\HomeMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\HostileRefManager.cpp" />
-    <ClCompile Include="..\..\src\game\IdleMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\InstanceData.cpp" />
-    <ClCompile Include="..\..\src\game\Item.cpp" />
-    <ClCompile Include="..\..\src\game\ItemEnchantmentMgr.cpp" />
-    <ClCompile Include="..\..\src\game\ItemHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Level0.cpp" />
-    <ClCompile Include="..\..\src\game\Level1.cpp" />
-    <ClCompile Include="..\..\src\game\Level2.cpp" />
-    <ClCompile Include="..\..\src\game\Level3.cpp" />
-    <ClCompile Include="..\..\src\game\LFGHandler.cpp" />
-    <ClCompile Include="..\..\src\game\LootHandler.cpp" />
-    <ClCompile Include="..\..\src\game\LootMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Mail.cpp" />
-    <ClCompile Include="..\..\src\game\MailHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Map.cpp" />
-    <ClCompile Include="..\..\src\game\MapManager.cpp" />
-    <ClCompile Include="..\..\src\game\MapPersistentStateMgr.cpp" />
-    <ClCompile Include="..\..\src\game\MassMailMgr.cpp" />
-    <ClCompile Include="..\..\src\game\MiscHandler.cpp" />
-    <ClCompile Include="..\..\src\game\MotionMaster.cpp" />
-    <ClCompile Include="..\..\src\game\MoveMap.cpp" />
-    <ClCompile Include="..\..\src\game\MovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\MovementHandler.cpp" />
-    <ClCompile Include="..\..\src\game\movement\MoveSpline.cpp" />
-    <ClCompile Include="..\..\src\game\movement\MoveSplineInit.cpp" />
-    <ClCompile Include="..\..\src\game\movement\packet_builder.cpp" />
-    <ClCompile Include="..\..\src\game\movement\spline.cpp" />
-    <ClCompile Include="..\..\src\game\movement\util.cpp" />
-    <ClCompile Include="..\..\src\game\NPCHandler.cpp" />
-    <ClCompile Include="..\..\src\game\NullCreatureAI.cpp" />
-    <ClCompile Include="..\..\src\game\Object.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectAccessor.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectGridLoader.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectMgr.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectGuid.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectPosSelector.cpp" />
-    <ClCompile Include="..\..\src\game\Opcodes.cpp" />
-    <ClCompile Include="..\..\src\game\PathFinder.cpp" />
-    <ClCompile Include="..\..\src\game\pchdef.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Pet.cpp" />
-    <ClCompile Include="..\..\src\game\PetAI.cpp" />
-    <ClCompile Include="..\..\src\game\PetHandler.cpp" />
-    <ClCompile Include="..\..\src\game\PetitionsHandler.cpp" />
-    <ClCompile Include="..\..\src\game\PhaseMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Player.cpp" />
-    <ClCompile Include="..\..\src\game\PlayerDump.cpp" />
-    <ClCompile Include="..\..\src\game\PointMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\PoolManager.cpp" />
-    <ClCompile Include="..\..\src\game\QueryHandler.cpp" />
-    <ClCompile Include="..\..\src\game\QuestDef.cpp" />
-    <ClCompile Include="..\..\src\game\QuestHandler.cpp" />
-    <ClCompile Include="..\..\src\game\RandomMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\ReactorAI.cpp" />
-    <ClCompile Include="..\..\src\game\ReputationMgr.cpp" />
-    <ClCompile Include="..\..\src\game\ScriptMgr.cpp" />
-    <ClCompile Include="..\..\src\game\SkillDiscovery.cpp" />
-    <ClCompile Include="..\..\src\game\SkillExtraItems.cpp" />
-    <ClCompile Include="..\..\src\game\SkillHandler.cpp" />
-    <ClCompile Include="..\..\src\game\SocialMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Spell.cpp" />
-    <ClCompile Include="..\..\src\game\SpellAuras.cpp" />
-    <ClCompile Include="..\..\src\game\SQLStorages.cpp" />
-    <ClCompile Include="..\..\src\game\TransportSystem.cpp" />
-    <ClCompile Include="..\..\src\game\UnitAuraProcHandler.cpp" />
-    <ClCompile Include="..\..\src\game\SpellEffects.cpp" />
-    <ClCompile Include="..\..\src\game\SpellHandler.cpp" />
-    <ClCompile Include="..\..\src\game\SpellMgr.cpp" />
-    <ClCompile Include="..\..\src\game\StatSystem.cpp" />
-    <ClCompile Include="..\..\src\game\TargetedMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\TaxiHandler.cpp" />
-    <ClCompile Include="..\..\src\game\TemporarySummon.cpp" />
-    <ClCompile Include="..\..\src\game\ThreatManager.cpp" />
-    <ClCompile Include="..\..\src\game\Totem.cpp" />
-    <ClCompile Include="..\..\src\game\TotemAI.cpp" />
-    <ClCompile Include="..\..\src\game\TradeHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Transports.cpp" />
-    <ClCompile Include="..\..\src\game\Unit.cpp" />
-    <ClCompile Include="..\..\src\game\UpdateData.cpp" />
-    <ClCompile Include="..\..\src\game\Vehicle.cpp" />
-    <ClCompile Include="..\..\src\game\VehicleHandler.cpp" />
-    <ClCompile Include="..\..\src\game\VoiceChatHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WaypointManager.cpp" />
-    <ClCompile Include="..\..\src\game\WaypointMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\Weather.cpp" />
-    <ClCompile Include="..\..\src\game\World.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvP.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPEP.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPGH.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPHP.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPMgr.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPNA.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPSI.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPTF.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPZM.cpp" />
-    <ClCompile Include="..\..\src\game\WorldSession.cpp" />
-    <ClCompile Include="..\..\src\game\WorldSocket.cpp" />
-    <ClCompile Include="..\..\src\game\WorldSocketMgr.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\BIH.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\DynamicTree.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\GameObjectModel.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\MapTree.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\ModelInstance.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\TileAssembler.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\VMapFactory.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\VMapManager2.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\WorldModel.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\game\AccountMgr.h" />
-    <ClInclude Include="..\..\src\game\AchievementMgr.h" />
-    <ClInclude Include="..\..\src\game\AggressorAI.h" />
-    <ClInclude Include="..\..\src\game\ArenaTeam.h" />
-    <ClInclude Include="..\..\src\game\AuctionHouseBot\AuctionHouseBot.h" />
-    <ClInclude Include="..\..\src\game\AuctionHouseMgr.h" />
-    <ClInclude Include="..\..\src\game\Bag.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGround.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundAA.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundAB.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundRB.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundAV.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundBE.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundDS.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundEY.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundIC.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundMgr.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundNA.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundRL.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundRV.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundSA.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundWS.h" />
-    <ClInclude Include="..\..\src\game\Calendar.h" />
-    <ClInclude Include="..\..\src\game\Camera.h" />
-    <ClInclude Include="..\..\src\game\Cell.h" />
-    <ClInclude Include="..\..\src\game\CellImpl.h" />
-    <ClInclude Include="..\..\src\game\Channel.h" />
-    <ClInclude Include="..\..\src\game\ChannelMgr.h" />
-    <ClInclude Include="..\..\src\game\CharacterDatabaseCleaner.h" />
-    <ClInclude Include="..\..\src\game\Chat.h" />
-    <ClInclude Include="..\..\src\game\ConfusedMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\Corpse.h" />
-    <ClInclude Include="..\..\src\game\Creature.h" />
-    <ClInclude Include="..\..\src\game\CreatureAI.h" />
-    <ClInclude Include="..\..\src\game\CreatureAIImpl.h" />
-    <ClInclude Include="..\..\src\game\CreatureAIRegistry.h" />
-    <ClInclude Include="..\..\src\game\CreatureAISelector.h" />
-    <ClInclude Include="..\..\src\game\CreatureEventAI.h" />
-    <ClInclude Include="..\..\src\game\CreatureEventAIMgr.h" />
-    <ClInclude Include="..\..\src\game\CreatureLinkingMgr.h" />
-    <ClInclude Include="..\..\src\game\DB2fmt.h" />
-    <ClInclude Include="..\..\src\game\DB2Stores.h" />
-    <ClInclude Include="..\..\src\game\DB2Structure.h" />
-    <ClInclude Include="..\..\src\game\DBCEnums.h" />
-    <ClInclude Include="..\..\src\game\DBCfmt.h" />
-    <ClInclude Include="..\..\src\game\DBCStores.h" />
-    <ClInclude Include="..\..\src\game\DBCStructure.h" />
-    <ClInclude Include="..\..\src\game\DynamicObject.h" />
-    <ClInclude Include="..\..\src\game\FleeingMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\FollowerReference.h" />
-    <ClInclude Include="..\..\src\game\FollowerRefManager.h" />
-    <ClInclude Include="..\..\src\game\Formulas.h" />
-    <ClInclude Include="..\..\src\game\GameEventMgr.h" />
-    <ClInclude Include="..\..\src\game\GameObject.h" />
-    <ClInclude Include="..\..\src\game\GMTicketMgr.h" />
-    <ClInclude Include="..\..\src\game\GossipDef.h" />
-    <ClInclude Include="..\..\src\game\GridDefines.h" />
-    <ClInclude Include="..\..\src\game\GridMap.h" />
-    <ClInclude Include="..\..\src\game\GridNotifiers.h" />
-    <ClInclude Include="..\..\src\game\GridNotifiersImpl.h" />
-    <ClInclude Include="..\..\src\game\GridStates.h" />
-    <ClInclude Include="..\..\src\game\Group.h" />
-    <ClInclude Include="..\..\src\game\GroupReference.h" />
-    <ClInclude Include="..\..\src\game\GroupRefManager.h" />
-    <ClInclude Include="..\..\src\game\GuardAI.h" />
-    <ClInclude Include="..\..\src\game\Guild.h" />
-    <ClInclude Include="..\..\src\game\GuildMgr.h" />
-    <ClInclude Include="..\..\src\game\HomeMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\HostileRefManager.h" />
-    <ClInclude Include="..\..\src\game\IdleMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\InstanceData.h" />
-    <ClInclude Include="..\..\src\game\Item.h" />
-    <ClInclude Include="..\..\src\game\ItemEnchantmentMgr.h" />
-    <ClInclude Include="..\..\src\game\ItemPrototype.h" />
-    <ClInclude Include="..\..\src\game\Language.h" />
-    <ClInclude Include="..\..\src\game\LootMgr.h" />
-    <ClInclude Include="..\..\src\game\Mail.h" />
-    <ClInclude Include="..\..\src\game\Map.h" />
-    <ClInclude Include="..\..\src\game\MapManager.h" />
-    <ClInclude Include="..\..\src\game\MapPersistentStateMgr.h" />
-    <ClInclude Include="..\..\src\game\MapReference.h" />
-    <ClInclude Include="..\..\src\game\MapRefManager.h" />
-    <ClInclude Include="..\..\src\game\MassMailMgr.h" />
-    <ClInclude Include="..\..\src\game\MotionMaster.h" />
-    <ClInclude Include="..\..\src\game\MoveMap.h" />
-    <ClInclude Include="..\..\src\game\MoveMapSharedDefines.h" />
-    <ClInclude Include="..\..\src\game\MovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\movement\MovementStructures.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSpline.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSplineFlag.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSplineInit.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSplineInitArgs.h" />
-    <ClInclude Include="..\..\src\game\movement\packet_builder.h" />
-    <ClInclude Include="..\..\src\game\movement\spline.h" />
-    <ClInclude Include="..\..\src\game\movement\spline.impl.h" />
-    <ClInclude Include="..\..\src\game\movement\typedefs.h" />
-    <ClInclude Include="..\..\src\game\NPCHandler.h" />
-    <ClInclude Include="..\..\src\game\NullCreatureAI.h" />
-    <ClInclude Include="..\..\src\game\Object.h" />
-    <ClInclude Include="..\..\src\game\ObjectAccessor.h" />
-    <ClInclude Include="..\..\src\game\ObjectGuid.h" />
-    <ClInclude Include="..\..\src\game\ObjectGridLoader.h" />
-    <ClInclude Include="..\..\src\game\ObjectMgr.h" />
-    <ClInclude Include="..\..\src\game\ObjectPosSelector.h" />
-    <ClInclude Include="..\..\src\game\Opcodes.h" />
-    <ClInclude Include="..\..\src\game\Path.h" />
-    <ClInclude Include="..\..\src\game\PathFinder.h" />
-    <ClInclude Include="..\..\src\game\pchdef.h" />
-    <ClInclude Include="..\..\src\game\Pet.h" />
-    <ClInclude Include="..\..\src\game\PetAI.h" />
-    <ClInclude Include="..\..\src\game\PhaseMgr.h" />
-    <ClInclude Include="..\..\src\game\Player.h" />
-    <ClInclude Include="..\..\src\game\PlayerDump.h" />
-    <ClInclude Include="..\..\src\game\PointMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\PoolManager.h" />
-    <ClInclude Include="..\..\src\game\QuestDef.h" />
-    <ClInclude Include="..\..\src\game\RandomMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\ReactorAI.h" />
-    <ClInclude Include="..\..\src\game\ReputationMgr.h" />
-    <ClInclude Include="..\..\src\game\ScriptMgr.h" />
-    <ClInclude Include="..\..\src\game\SharedDefines.h" />
-    <ClInclude Include="..\..\src\game\SkillDiscovery.h" />
-    <ClInclude Include="..\..\src\game\SkillExtraItems.h" />
-    <ClInclude Include="..\..\src\game\SocialMgr.h" />
-    <ClInclude Include="..\..\src\game\Spell.h" />
-    <ClInclude Include="..\..\src\game\SpellAuraDefines.h" />
-    <ClInclude Include="..\..\src\game\SpellAuras.h" />
-    <ClInclude Include="..\..\src\game\SpellMgr.h" />
-    <ClInclude Include="..\..\src\game\SQLStorages.h" />
-    <ClInclude Include="..\..\src\game\TargetedMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\TemporarySummon.h" />
-    <ClInclude Include="..\..\src\game\ThreatManager.h" />
-    <ClInclude Include="..\..\src\game\Totem.h" />
-    <ClInclude Include="..\..\src\game\TotemAI.h" />
-    <ClInclude Include="..\..\src\game\Transports.h" />
-    <ClInclude Include="..\..\src\game\TransportSystem.h" />
-    <ClInclude Include="..\..\src\game\Unit.h" />
-    <ClInclude Include="..\..\src\game\UnitEvents.h" />
-    <ClInclude Include="..\..\src\game\UpdateData.h" />
-    <ClInclude Include="..\..\src\game\UpdateFields.h" />
-    <ClInclude Include="..\..\src\game\UpdateMask.h" />
-    <ClInclude Include="..\..\src\game\Vehicle.h" />
-    <ClInclude Include="..\..\src\game\WaypointManager.h" />
-    <ClInclude Include="..\..\src\game\WaypointMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\Weather.h" />
-    <ClInclude Include="..\..\src\game\World.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvP.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPEP.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPGH.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPHP.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPMgr.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPNA.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPSI.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPTF.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPZM.h" />
-    <ClInclude Include="..\..\src\game\WorldSession.h" />
-    <ClInclude Include="..\..\src\game\WorldSocket.h" />
-    <ClInclude Include="..\..\src\game\WorldSocketMgr.h" />
-    <ClInclude Include="..\..\src\game\vmap\BIH.h" />
-    <ClInclude Include="..\..\src\game\vmap\BIHWrap.h" />
-    <ClInclude Include="..\..\src\game\vmap\DynamicTree.h" />
-    <ClInclude Include="..\..\src\game\vmap\GameObjectModel.h" />
-    <ClInclude Include="..\..\src\game\vmap\IVMapManager.h" />
-    <ClInclude Include="..\..\src\game\vmap\MapTree.h" />
-    <ClInclude Include="..\..\src\game\vmap\ModelInstance.h" />
-    <ClInclude Include="..\..\src\game\vmap\RegularGrid.h" />
-    <ClInclude Include="..\..\src\game\vmap\TileAssembler.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapDefinitions.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapFactory.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapManager2.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapTools.h" />
-    <ClInclude Include="..\..\src\game\vmap\WorldModel.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dep\recastnavigation\Detour\win\VC100\Detour.vcxproj">
-      <Project>{72bdf975-4d4a-42c7-b2c4-f9ed90a2abb6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="shared.vcxproj">
-      <Project>{90297c34-f231-4df4-848e-a74bcc0e40ed}</Project>
-    </ProjectReference>
-    <ProjectReference Include="g3dlite.vcxproj">
-      <Project>{8072769E-CF10-48BF-B9E1-12752A5DAC6E}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win/VC100/genrev.vcxproj b/win/VC100/genrev.vcxproj
deleted file mode 100644
index ed96cdab0..000000000
--- a/win/VC100/genrev.vcxproj
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="MinSizeRel|Win32">
-      <Configuration>MinSizeRel</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="RelWithDebInfo|Win32">
-      <Configuration>RelWithDebInfo</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{304083A8-CF14-496E-BF87-F4007D677274}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>genrev</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\genrev\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">genrev</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\genrev\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">genrev</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Configuration)\_temp\genrev\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">genrev</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Configuration)\_temp\genrev\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">genrev</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">true</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>VC100\$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/genrev.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/genrev.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>VC100\$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/genrev.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/genrev.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>MinSizeRel/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <Optimization>MinSpace</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>VC100\$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/genrev.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/genrev.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>RelWithDebInfo/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>VC100\$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/genrev.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/genrev.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\tools\genrevision\genrevision.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/genrev.vcxproj.filters b/win/VC100/genrev.vcxproj.filters
deleted file mode 100644
index 10af9c6ef..000000000
--- a/win/VC100/genrev.vcxproj.filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\src\tools\genrevision\genrevision.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{2CC099F7-F112-43EF-8D5C-58BA8BA8D70A}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/gsoap.vcxproj b/win/VC100/gsoap.vcxproj
deleted file mode 100644
index 224467dde..000000000
--- a/win/VC100/gsoap.vcxproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>gsoap</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\gsoap\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gsoap</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\gsoap\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gsoap</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\src\gsoap;..\..\dep\include\gsoap;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\src\gsoap;..\..\dep\include\gsoap;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\src\gsoap;..\..\dep\include\gsoap;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\src\gsoap;..\..\dep\include\gsoap;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\src\gsoap;..\..\dep\include\gsoap;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\src\gsoap;..\..\dep\include\gsoap;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\gsoap\stdsoap2.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/libmpq.vcxproj b/win/VC100/libmpq.vcxproj
deleted file mode 100644
index c425ec12e..000000000
--- a/win/VC100/libmpq.vcxproj
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{449D15D0-B3B9-4195-AB9C-E205FF77ABBE}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>libmpq</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\libmpq\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libmpq</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\libmpq\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libmpq</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\libmpq;..\..\dep\libmpq\win;..\..\dep\src\zlib;..\..\dep\src\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\libmpq;..\..\dep\libmpq\win;..\..\dep\src\zlib;..\..\dep\src\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\libmpq;..\..\dep\libmpq\win;..\..\dep\src\zlib;..\..\dep\src\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\libmpq;..\..\dep\libmpq\win;..\..\dep\src\zlib;..\..\dep\src\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\libmpq;..\..\dep\libmpq\win;..\..\dep\src\zlib;..\..\dep\src\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\libmpq;..\..\dep\libmpq\win;..\..\dep\src\zlib;..\..\dep\src\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\libmpq\libmpq\common.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\crypt_buf.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\explode.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\extract.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\huffman.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\mpq-internal.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\mpq.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\platform.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\wave.h" />
-    <ClCompile Include="..\..\dep\libmpq\libmpq\common.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\libmpq\libmpq\explode.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\libmpq\libmpq\extract.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\libmpq\libmpq\huffman.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\libmpq\libmpq\mpq.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\libmpq\libmpq\wave.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="bzip2.vcxproj">
-      <Project>BC139E42-505E-430B-8610-6ED2B1E358E8</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/loadlib.vcxproj b/win/VC100/loadlib.vcxproj
deleted file mode 100644
index a66cb3063..000000000
--- a/win/VC100/loadlib.vcxproj
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{29E1FE24-1C69-4E6B-945D-02544988A5FA}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>loadlib</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\loadlib\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">loadlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\loadlib\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">loadlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\tools\map-extractor\loadlib\loadlib.cpp" />
-    <ClCompile Include="..\..\src\tools\map-extractor\loadlib\adt.cpp" />
-    <ClCompile Include="..\..\src\tools\map-extractor\loadlib\wdt.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlib.vcxproj">
-      <Project>8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/lualib.vcxproj b/win/VC100/lualib.vcxproj
deleted file mode 100644
index 68185039a..000000000
--- a/win/VC100/lualib.vcxproj
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{0AC3742A-F311-428C-8EF1-8D6B8627A8A2}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>lualib</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\lualib\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lualib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\lualib\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lualib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\dep\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsC</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\dep\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsC</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\lualib\lapi.c" />
-    <ClCompile Include="..\..\dep\lualib\lauxlib.c" />
-    <ClCompile Include="..\..\dep\lualib\lbaselib.c" />
-    <ClCompile Include="..\..\dep\lualib\lbitlib.c" />
-    <ClCompile Include="..\..\dep\lualib\lcode.c" />
-    <ClCompile Include="..\..\dep\lualib\lcorolib.c" />
-    <ClCompile Include="..\..\dep\lualib\lctype.c" />
-    <ClCompile Include="..\..\dep\lualib\ldblib.c" />
-    <ClCompile Include="..\..\dep\lualib\ldebug.c" />
-    <ClCompile Include="..\..\dep\lualib\ldo.c" />
-    <ClCompile Include="..\..\dep\lualib\ldump.c" />
-    <ClCompile Include="..\..\dep\lualib\lfunc.c" />
-    <ClCompile Include="..\..\dep\lualib\lgc.c" />
-    <ClCompile Include="..\..\dep\lualib\linit.c" />
-    <ClCompile Include="..\..\dep\lualib\liolib.c" />
-    <ClCompile Include="..\..\dep\lualib\llex.c" />
-    <ClCompile Include="..\..\dep\lualib\lmathlib.c" />
-    <ClCompile Include="..\..\dep\lualib\lmem.c" />
-    <ClCompile Include="..\..\dep\lualib\loadlib.c" />
-    <ClCompile Include="..\..\dep\lualib\lobject.c" />
-    <ClCompile Include="..\..\dep\lualib\lopcodes.c" />
-    <ClCompile Include="..\..\dep\lualib\loslib.c" />
-    <ClCompile Include="..\..\dep\lualib\lparser.c" />
-    <ClCompile Include="..\..\dep\lualib\lstate.c" />
-    <ClCompile Include="..\..\dep\lualib\lstring.c" />
-    <ClCompile Include="..\..\dep\lualib\lstrlib.c" />
-    <ClCompile Include="..\..\dep\lualib\ltable.c" />
-    <ClCompile Include="..\..\dep\lualib\ltablib.c" />
-    <ClCompile Include="..\..\dep\lualib\ltm.c" />
-    <ClCompile Include="..\..\dep\lualib\lundump.c" />
-    <ClCompile Include="..\..\dep\lualib\lvm.c" />
-    <ClCompile Include="..\..\dep\lualib\lzio.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/mangosd.vcxproj b/win/VC100/mangosd.vcxproj
deleted file mode 100644
index 826d70d87..000000000
--- a/win/VC100/mangosd.vcxproj
+++ /dev/null
@@ -1,498 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{A3A04E47-43A2-4C08-90B3-029CEF558594}</ProjectGUID>
-    <RootNamespace>mangosd</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\..\..\bin\Release\mangosd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\mangosd__$(Platform)_$(Configuration)\mangosd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\mangosd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\mangosd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\mangosd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LargeAddressAware>true</LargeAddressAware>
-      <LinkTimeCodeGeneration>
-      </LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\..\..\bin\Release\mangosd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\mangosd__$(Platform)_$(Configuration)\mangosd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\mangosd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\mangosd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\mangosd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LinkTimeCodeGeneration>
-      </LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\mangosd__$(Platform)_$(Configuration)\mangosd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\mangosd__$(Platform)_$(Configuration)\mangosd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\mangosd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\mangosd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\mangosd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\mangosd__$(Platform)_$(Configuration)\mangosd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\mangosd__$(Platform)_$(Configuration)\mangosd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\mangosd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\mangosd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\mangosd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <Midl>
-      <TypeLibraryName>.\mangosd__$(Platform)_$(Configuration)\mangosd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\mangosd__$(Platform)_$(Configuration)\mangosd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\mangosd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\mangosd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\mangosd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_debug ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\mangosd__$(Platform)_$(Configuration)\mangosd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\mangosd__$(Platform)_$(Configuration)\mangosd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\mangosd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\mangosd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\mangosd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_debug ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="..\..\AUTHORS" />
-    <None Include="..\..\ChangeLog" />
-    <None Include="..\..\COPYING" />
-    <None Include="..\..\INSTALL" />
-    <None Include="..\..\NEWS" />
-    <None Include="..\..\README" />
-    <None Include="..\..\THANKS" />
-    <None Include="..\..\WARNING" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\gsoap\stdsoap2.cpp" />
-    <ClCompile Include="..\..\src\mangosd\soapServer.cpp" />
-    <ClCompile Include="..\..\src\mangosd\soapC.cpp" />
-    <ClCompile Include="..\..\src\mangosd\MaNGOSsoap.cpp" />
-    <ClCompile Include="..\..\src\mangosd\CliRunnable.cpp" />
-    <ClCompile Include="..\..\src\mangosd\Main.cpp" />
-    <ClCompile Include="..\..\src\mangosd\Master.cpp" />
-    <ClCompile Include="..\..\src\mangosd\RASocket.cpp" />
-    <ClCompile Include="..\..\src\mangosd\WorldRunnable.cpp" />
-    <ClCompile Include="..\..\src\shared\WheatyExceptionReport.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\include\gsoap\stdsoap2.h" />
-    <ClInclude Include="..\..\src\mangosd\soapStub.h" />
-    <ClInclude Include="..\..\src\mangosd\soapH.h" />
-    <ClInclude Include="..\..\src\mangosd\MaNGOSsoap.h" />
-    <ClInclude Include="..\..\src\mangosd\CliRunnable.h" />
-    <ClInclude Include="..\..\src\mangosd\Master.h" />
-    <ClInclude Include="..\..\src\mangosd\RASocket.h" />
-    <ClInclude Include="..\..\src\mangosd\WorldRunnable.h" />
-    <ClInclude Include="..\..\src\shared\WheatyExceptionReport.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\src\mangosd\mangosd.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dep\recastnavigation\Detour\win\VC100\Detour.vcxproj">
-      <Project>{72bdf975-4d4a-42c7-b2c4-f9ed90a2abb6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="game.vcxproj">
-      <Project>{1dc6c4da-a028-41f3-877d-d5400c594f88}</Project>
-    </ProjectReference>
-    <ProjectReference Include="realmd.vcxproj">
-      <Project>{563e9905-3657-460c-ae63-0ac39d162e23}</Project>
-    </ProjectReference>
-    <ProjectReference Include="shared.vcxproj">
-      <Project>{90297c34-f231-4df4-848e-a74bcc0e40ed}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win/VC100/mangosscript.vcxproj b/win/VC100/mangosscript.vcxproj
deleted file mode 100644
index 3b88face8..000000000
--- a/win/VC100/mangosscript.vcxproj
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{DA729B06-9097-4DA6-A86C-E97BC843B7C2}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>mangosscript</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\mangosscript\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\mangosscript\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\modules\SD2\base;..\..\src\modules\SD2\include;..\..\src\shared;..\..\src\framework;..\..\src\game\Server;..\..\src\game\BattleGround;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\modules\SD2\base;..\..\src\modules\SD2\include;..\..\src\framework;..\..\src\game\Server;..\..\src\game\BattleGround;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\modules\SD2\base;..\..\src\modules\SD2\include;..\..\src\framework;..\..\src\game\Server;..\..\src\game\BattleGround;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\modules\SD2\base;..\..\src\modules\SD2\include;..\..\src\framework;..\..\src\game\Server;..\..\src\game\BattleGround;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\modules\SD2\base;..\..\src\modules\SD2\include;..\..\src\framework;..\..\src\game\Server;..\..\src\game\BattleGround;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\modules\SD2\base;..\..\src\modules\SD2\include;..\..\src\framework;..\..\src\game\Server;..\..\src\game\BattleGround;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\modules\SD2\sd2_revision_nr.h" />
-    <ClInclude Include="..\..\src\modules\SD2\sd2_revision_sql.h" />
-    <ClInclude Include="..\..\src\modules\SD2\ScriptDevMgr.h" />
-    <ClInclude Include="..\..\src\modules\SD2\base\escort_ai.h" />
-    <ClInclude Include="..\..\src\modules\SD2\base\follower_ai.h" />
-    <ClInclude Include="..\..\src\modules\SD2\base\guard_ai.h" />
-    <ClInclude Include="..\..\src\modules\SD2\base\pet_ai.h" />
-    <ClInclude Include="..\..\src\modules\SD2\include\precompiled.h" />
-    <ClInclude Include="..\..\src\modules\SD2\include\sc_creature.h" />
-    <ClInclude Include="..\..\src\modules\SD2\include\sc_grid_searchers.h" />
-    <ClInclude Include="..\..\src\modules\SD2\include\sc_instance.h" />
-    <ClInclude Include="..\..\src\modules\SD2\include\sc_gossip.h" />
-    <ClInclude Include="..\..\src\modules\SD2\system\ScriptLoader.h" />
-    <ClInclude Include="..\..\src\modules\SD2\system\system.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\world\world_map_scripts.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\blackrock_depths.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\blackrock_spire.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\deadmines\deadmines.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\gnomeregan\gnomeregan.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scarlet_monastery\scarlet_monastery.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scholomance\scholomance.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\uldaman\uldaman.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\sunken_temple\sunken_temple.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\stratholme.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\molten_core.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\blackwing_lair.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\naxxramas.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\zulgurub.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\blackfathom_deeps\blackfathom_deeps.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\dire_maul\dire_maul.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\maraudon\maraudon.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\razorfen_downs\razorfen_downs.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\razorfen_kraul\razorfen_kraul.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\wailing_caverns\wailing_caverns.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\zulfarrak\zulfarrak.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\onyxias_lair\onyxias_lair.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\ruins_of_ahnqiraj.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\temple_of_ahnqiraj.h" />
-    <ClCompile Include="..\..\src\modules\SD2\include\precompiled.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">precompiled.h</PrecompiledHeaderFile>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">precompiled.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\SD2\ScriptDevMgr.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\base\escort_ai.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\base\follower_ai.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\base\guard_ai.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\base\pet_ai.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\include\sc_creature.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\include\sc_grid_searchers.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\include\sc_instance.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\system\ScriptLoader.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\system\system.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\battlegrounds\battleground.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\areatrigger_scripts.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\bosses_emerald_dragons.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\go_scripts.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\guards.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\item_scripts.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\mob_generic_creature.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\npcs_special.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\npc_professions.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\spell_scripts.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\world_map_scripts.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\alterac_mountains.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\arathi_highlands.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blasted_lands.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\boss_kazzak.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\burning_steppes.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\dun_morogh.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\eastern_plaguelands.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\elwynn_forest.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\hinterlands.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\ironforge.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\loch_modan.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\redridge_mountains.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\searing_gorge.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\silverpine_forest.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stormwind_city.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stranglethorn_vale.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\swamp_of_sorrows.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\tirisfal_glades.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\undercity.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\western_plaguelands.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\westfall.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\wetlands.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ashenvale.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\azshara.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\boss_azuregos.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\darkshore.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\desolace.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\durotar.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\dustwallow_marsh.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\felwood.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\feralas.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\moonglade.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\mulgore.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\orgrimmar.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\silithus.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\stonetalon_mountains.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\tanaris.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\teldrassil.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\the_barrens.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\thousand_needles.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\thunder_bluff.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ungoro_crater.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\winterspring.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\blackrock_depths.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_ambassador_flamelash.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_emperor_dagran_thaurissan.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_general_angerforge.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_high_interrogator_gerstahn.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\instance_blackrock_depths.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\boss_gyth.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\boss_overlord_wyrmthalak.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\boss_pyroguard_emberseer.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\instance_blackrock_spire.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\deadmines\boss_mr_smite.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\deadmines\deadmines.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\deadmines\instance_deadmines.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\gnomeregan\boss_thermaplugg.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\gnomeregan\gnomeregan.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\gnomeregan\instance_gnomeregan.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scarlet_monastery\boss_arcanist_doan.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scarlet_monastery\boss_herod.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scarlet_monastery\boss_mograine_and_whitemane.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scarlet_monastery\instance_scarlet_monastery.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scholomance\boss_darkmaster_gandling.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scholomance\boss_jandice_barov.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scholomance\instance_scholomance.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\uldaman\boss_archaedas.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\uldaman\instance_uldaman.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\uldaman\uldaman.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\shadowfang_keep\instance_shadowfang_keep.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\sunken_temple\instance_sunken_temple.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\sunken_temple\sunken_temple.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\boss_baroness_anastari.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\boss_cannon_master_willey.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\boss_dathrohan_balnazzar.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\boss_maleki_the_pallid.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\instance_stratholme.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\stratholme.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_baron_geddon.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_garr.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_gehennas.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_golemagg.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_lucifron.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_magmadar.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_majordomo_executus.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_ragnaros.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_shazzrah.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_sulfuron_harbinger.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\instance_molten_core.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\molten_core.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_broodlord_lashlayer.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_chromaggus.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_ebonroc.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_firemaw.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_flamegor.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_nefarian.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_razorgore.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_vaelastrasz.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_victor_nefarius.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\instance_blackwing_lair.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_anubrekhan.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_faerlina.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_four_horsemen.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_gluth.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_gothik.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_grobbulus.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_heigan.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_kelthuzad.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_loatheb.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_maexxna.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_noth.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_patchwerk.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_razuvious.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_sapphiron.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\boss_thaddius.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\instance_naxxramas.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_arlokk.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_hakkar.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_hazzarah.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_jeklik.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_jindo.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_mandokir.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_marli.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_renataki.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_thekal.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_venoxis.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\instance_zulgurub.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\blackfathom_deeps\instance_blackfathom_deeps.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\dire_maul\dire_maul.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\dire_maul\instance_dire_maul.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\maraudon\boss_noxxion.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\maraudon\maraudon.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\razorfen_downs\razorfen_downs.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\razorfen_kraul\instance_razorfen_kraul.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\razorfen_kraul\razorfen_kraul.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\wailing_caverns\instance_wailing_caverns.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\wailing_caverns\wailing_caverns.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\zulfarrak\boss_zumrah.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\zulfarrak\instance_zulfarrak.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\zulfarrak\zulfarrak.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\onyxias_lair\boss_onyxia.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\onyxias_lair\instance_onyxias_lair.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\onyxias_lair\npc_onyxian_warder.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\boss_ayamiss.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\boss_buru.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\boss_kurinnaxx.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\boss_moam.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\boss_ossirian.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\boss_rajaxx.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\instance_ruins_of_ahnqiraj.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\ruins_of_ahnqiraj.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_bug_trio.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_cthun.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_fankriss.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_huhuran.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_ouro.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_sartura.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_skeram.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_twinemperors.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_viscidus.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\instance_temple_of_ahnqiraj.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\mob_anubisath_sentinel.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="ace.vcxproj">
-      <Project>D70895A7-4EA1-48BE-A557-834D4357BAD3</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/map-extractor.vcxproj b/win/VC100/map-extractor.vcxproj
deleted file mode 100644
index 92ea65ad9..000000000
--- a/win/VC100/map-extractor.vcxproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ad</ProjectName>
-    <ProjectGuid>{D7552D4F-408F-4F8E-859B-366659150CF4}</ProjectGuid>
-    <RootNamespace>ad</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\debug\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\release\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ad_debug</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./ad.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\StormLib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)ad.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <BrowseInformationFile>$(IntDir)</BrowseInformationFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>StormLibDAS.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\dep\StormLib\bin\StormLib\$(Platform)\$(Configuration)AS;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>ad_debug.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>./ad_debug.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./ad.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\StormLib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)ad.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>StormLibRAS.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\dep\StormLib\bin\StormLib\$(Platform)\$(Configuration)AS;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>./ad.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>./ad.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="loadlib\adt.cpp" />
-    <ClCompile Include="dbcfile.cpp" />
-    <ClCompile Include="loadlib\loadlib.cpp" />
-    <ClCompile Include="system.cpp" />
-    <ClCompile Include="loadlib\wdt.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="loadlib\adt.h" />
-    <ClInclude Include="dbcfile.h" />
-    <ClInclude Include="loadlib\loadlib.h" />
-    <ClInclude Include="loadlib\wdt.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/realmd.vcxproj b/win/VC100/realmd.vcxproj
deleted file mode 100644
index 73eb1ad95..000000000
--- a/win/VC100/realmd.vcxproj
+++ /dev/null
@@ -1,462 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{563E9905-3657-460C-AE63-0AC39D162E23}</ProjectGUID>
-    <RootNamespace>realmd</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\realmd__$(Platform)_$(Configuration)\realmd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\realmd__$(Platform)_$(Configuration)\realmd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\realmd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\realmd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\realmd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\realmd__$(Platform)_$(Configuration)\realmd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\realmd__$(Platform)_$(Configuration)\realmd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\realmd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\realmd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\realmd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\realmd__$(Platform)_$(Configuration)\realmd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\realmd__$(Platform)_$(Configuration)\realmd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\realmd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\realmd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\realmd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\realmd__$(Platform)_$(Configuration)\realmd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\realmd__$(Platform)_$(Configuration)\realmd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\realmd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\realmd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\realmd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <Midl>
-      <TypeLibraryName>.\realmd__$(Platform)_$(Configuration)\realmd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\realmd__$(Platform)_$(Configuration)\realmd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\realmd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\realmd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\realmd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\realmd__$(Platform)_$(Configuration)\realmd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\realmd__$(Platform)_$(Configuration)\realmd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\realmd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\realmd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\realmd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\realmd\AuthCodes.h" />
-    <ClInclude Include="..\..\src\realmd\AuthSocket.h" />
-    <ClInclude Include="..\..\src\realmd\BufferedSocket.h" />
-    <ClInclude Include="..\..\src\realmd\PatchHandler.h" />
-    <ClInclude Include="..\..\src\realmd\RealmList.h" />
-    <ClInclude Include="..\..\src\shared\WheatyExceptionReport.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\realmd\AuthSocket.cpp" />
-    <ClCompile Include="..\..\src\realmd\BufferedSocket.cpp" />
-    <ClCompile Include="..\..\src\realmd\Main.cpp" />
-    <ClCompile Include="..\..\src\realmd\PatchHandler.cpp" />
-    <ClCompile Include="..\..\src\realmd\RealmList.cpp" />
-    <ClCompile Include="..\..\src\shared\WheatyExceptionReport.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\src\realmd\realmd.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="shared.vcxproj">
-      <Project>{90297c34-f231-4df4-848e-a74bcc0e40ed}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win/VC100/script.vcxproj b/win/VC100/script.vcxproj
deleted file mode 100644
index 60b286254..000000000
--- a/win/VC100/script.vcxproj
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{4205C8A9-79B7-4354-8064-F05FB9CA0C96}</ProjectGUID>
-    <RootNamespace>script</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;aced.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_$(Configuration);.\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;aced.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_$(Configuration);.\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;ace.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;ace.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;aced.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;aced.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\bindings\universal\config.h" />
-    <ClInclude Include="..\..\src\bindings\universal\ScriptMgr.h" />
-    <ClInclude Include="..\..\src\bindings\universal\Scripts\sc_defines.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\bindings\universal\ScriptMgr.cpp" />
-    <ClCompile Include="..\..\src\bindings\universal\Scripts\sc_default.cpp" />
-    <ClCompile Include="..\..\src\bindings\universal\Scripts\sc_defines.cpp" />
-    <ClCompile Include="..\..\src\bindings\universal\system.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="mangosd.vcxproj">
-      <Project>{a3a04e47-43a2-4c08-90b3-029cef558594}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win/VC100/shared.vcxproj b/win/VC100/shared.vcxproj
deleted file mode 100644
index a8b44d3d3..000000000
--- a/win/VC100/shared.vcxproj
+++ /dev/null
@@ -1,512 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{90297C34-F231-4DF4-848E-A74BCC0E40ED}</ProjectGUID>
-    <RootNamespace>shared</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\shared__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\shared__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\shared__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\shared__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\shared__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\shared__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\shared__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\shared__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\shared__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\shared__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\shared__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\shared__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.lib</TargetExt>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\shared__$(Platform)_$(Configuration)/shared.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\shared__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\shared__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\shared__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\shared__$(Platform)_$(Configuration)/shared.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\shared__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\shared__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\shared__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\shared__$(Platform)_$(Configuration)\shared.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\shared__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\shared__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\shared__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\shared__$(Platform)_$(Configuration)\shared.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\shared__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\shared__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\shared__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\shared__$(Platform)_$(Configuration)\shared.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\shared__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\shared__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\shared__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\shared__$(Platform)_$(Configuration)\shared.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\shared__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\shared__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\shared__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\src\shared\revision.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Extract revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(SolutionDir)..\src\shared"
-"$(TargetDir)..\genrevision__$(Platform)_$(Configuration)\genrevision.exe" "..\.."
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Extract revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">cd "$(SolutionDir)..\src\shared"
-"$(TargetDir)..\genrevision__Win32_$(Configuration)\genrevision.exe" "..\.."
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Extract revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(SolutionDir)..\src\shared"
-"$(TargetDir)..\genrevision__$(Platform)_$(Configuration)\genrevision.exe" "..\.."
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Extract revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">cd "$(SolutionDir)..\src\shared"
-"$(TargetDir)..\genrevision__Win32_$(Configuration)\genrevision.exe" "..\.."
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">Extract revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">cd "$(SolutionDir)..\src\shared"
-"$(TargetDir)..\genrevision__$(Platform)_$(Configuration)\genrevision.exe" "..\.."
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">Extract revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">cd "$(SolutionDir)..\src\shared"
-"$(TargetDir)..\genrevision__Win32_$(Configuration)\genrevision.exe" "..\.."
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">revision.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\src\shared\SystemConfig.h.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\shared\Auth\AuthCrypt.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\BigNumber.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\HMACSHA1.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\md5.c" />
-    <ClCompile Include="..\..\src\shared\Auth\SARC4.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\Sha1.cpp" />
-    <ClCompile Include="..\..\src\shared\ByteBuffer.cpp" />
-    <ClCompile Include="..\..\src\shared\Common.cpp" />
-    <ClCompile Include="..\..\src\shared\Config\Config.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\Database.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\DatabaseMysql.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\DB2FileLoader.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\DBCFileLoader.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\Field.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\QueryResultMysql.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlDelayThread.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlOperations.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlPreparedStatement.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SQLStorage.cpp" />
-    <ClCompile Include="..\..\src\shared\Log.cpp" />
-    <ClCompile Include="..\..\src\shared\ProgressBar.cpp" />
-    <ClCompile Include="..\..\src\shared\ServiceWin32.cpp" />
-    <ClCompile Include="..\..\src\shared\Threading.cpp" />
-    <ClCompile Include="..\..\src\shared\Util.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\include\mersennetwister\MersenneTwister.h" />
-    <ClInclude Include="..\..\src\shared\Auth\AuthCrypt.h" />
-    <ClInclude Include="..\..\src\shared\Auth\BigNumber.h" />
-    <ClInclude Include="..\..\src\shared\Auth\HMACSHA1.h" />
-    <ClInclude Include="..\..\src\shared\Auth\md5.h" />
-    <ClInclude Include="..\..\src\shared\Auth\SARC4.h" />
-    <ClInclude Include="..\..\src\shared\Auth\Sha1.h" />
-    <ClInclude Include="..\..\src\shared\ByteBuffer.h" />
-    <ClInclude Include="..\..\src\shared\Database\DB2FileLoader.h" />
-    <ClInclude Include="..\..\src\shared\Database\DB2Store.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlPreparedStatement.h" />
-    <ClInclude Include="..\..\src\shared\WorldPacket.h" />
-    <ClInclude Include="..\..\src\shared\Common.h" />
-    <ClInclude Include="..\..\src\shared\Config\Config.h" />
-    <ClInclude Include="..\..\src\shared\Database\Database.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabaseEnv.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabaseImpl.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabaseMysql.h" />
-    <ClInclude Include="..\..\src\shared\Database\DBCFileLoader.h" />
-    <ClInclude Include="..\..\src\shared\Database\DBCStore.h" />
-    <ClInclude Include="..\..\src\shared\Database\Field.h" />
-    <ClInclude Include="..\..\src\shared\Database\QueryResult.h" />
-    <ClInclude Include="..\..\src\shared\Database\QueryResultMysql.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlDelayThread.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlOperations.h" />
-    <ClInclude Include="..\..\src\shared\Database\SQLStorage.h" />
-    <ClInclude Include="..\..\src\shared\Database\SQLStorageImpl.h" />
-    <ClInclude Include="..\..\src\shared\Errors.h" />
-    <ClInclude Include="..\..\src\shared\LockedQueue.h" />
-    <ClInclude Include="..\..\src\shared\Log.h" />
-    <ClInclude Include="..\..\src\shared\ProgressBar.h" />
-    <ClInclude Include="..\..\src\shared\revision_nr.h" />
-    <ClInclude Include="..\..\src\shared\revision_sql.h" />
-    <ClInclude Include="..\..\src\shared\ServiceWin32.h" />
-    <ClInclude Include="..\..\src\shared\Threading.h" />
-    <ClInclude Include="..\..\src\shared\Timer.h" />
-    <ClInclude Include="..\..\src\shared\Util.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="ACE_vc10.vcxproj">
-      <Project>{bd537c9a-feca-1bad-6757-8a6348ea12c8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="framework.vcxproj">
-      <Project>{bf6f5d0e-33a5-4e23-9e7d-dd481b7b5b9e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="genrevision.vcxproj">
-      <Project>{803f488e-4c5a-4866-8d5c-1e6c03c007c2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="zlib.vcxproj">
-      <Project>{8f1dea42-6a5b-4b62-839d-c141a7bfacf2}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC100/zlib.vcxproj b/win/VC100/zlib.vcxproj
deleted file mode 100644
index b81fe8996..000000000
--- a/win/VC100/zlib.vcxproj
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}</ProjectGUID>
-    <RootNamespace>zlib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\zlib__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\zlib__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\zlib__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\zlib__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\zlib__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\zlib__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\zlib__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\zlib__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\zlib__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\zlib__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\zlib__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\zlib__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.lib</TargetExt>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\zlib__$(Platform)_$(Configuration)\zlib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\zlib__$(Platform)_$(Configuration)\zlib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\zlib__$(Platform)_$(Configuration)\zlib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\zlib__$(Platform)_$(Configuration)\zlib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\zlib__$(Platform)_$(Configuration)\zlib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\zlib__$(Platform)_$(Configuration)\zlib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\src\zlib\crc32.h" />
-    <ClInclude Include="..\..\dep\src\zlib\deflate.h" />
-    <ClInclude Include="..\..\dep\src\zlib\inffast.h" />
-    <ClInclude Include="..\..\dep\src\zlib\inffixed.h" />
-    <ClInclude Include="..\..\dep\src\zlib\inflate.h" />
-    <ClInclude Include="..\..\dep\src\zlib\inftrees.h" />
-    <ClInclude Include="..\..\dep\src\zlib\trees.h" />
-    <ClInclude Include="..\..\dep\src\zlib\zconf.h" />
-    <ClInclude Include="..\..\dep\src\zlib\zlib.h" />
-    <ClInclude Include="..\..\dep\src\zlib\zutil.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\zlib\adler32.c" />
-    <ClCompile Include="..\..\dep\src\zlib\compress.c" />
-    <ClCompile Include="..\..\dep\src\zlib\crc32.c" />
-    <ClCompile Include="..\..\dep\src\zlib\deflate.c" />
-    <ClCompile Include="..\..\dep\src\zlib\example.c" />
-    <ClCompile Include="..\..\dep\src\zlib\gzio.c" />
-    <ClCompile Include="..\..\dep\src\zlib\infback.c" />
-    <ClCompile Include="..\..\dep\src\zlib\inffast.c" />
-    <ClCompile Include="..\..\dep\src\zlib\inflate.c" />
-    <ClCompile Include="..\..\dep\src\zlib\inftrees.c" />
-    <ClCompile Include="..\..\dep\src\zlib\trees.c" />
-    <ClCompile Include="..\..\dep\src\zlib\uncompr.c" />
-    <ClCompile Include="..\..\dep\src\zlib\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win/VC110/.gitignore b/win/VC110/.gitignore
deleted file mode 100644
index f1254be38..000000000
--- a/win/VC110/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git-ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# MaNGOS generated files at Windows build
-#
-
-*__Win32_Debug*
-*__x64_Debug*
-*__Win32_Release*
-*__x64_Release*
-*.log
diff --git a/win/VC110/ACE_vc11.vcxproj.filters b/win/VC110/ACE_vc11.vcxproj.filters
deleted file mode 100644
index d2639ac83..000000000
--- a/win/VC110/ACE_vc11.vcxproj.filters
+++ /dev/null
@@ -1,3586 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{a66bf1d2-c281-4638-8933-a40a40fe2606}</UniqueIdentifier>
-      <Extensions>cpp;cxx;cc;C;c</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{64d32856-a446-4163-9a21-cdc7761bdfd7}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hh</Extensions>
-    </Filter>
-    <Filter Include="Inline Files">
-      <UniqueIdentifier>{3e8e43bb-56ba-4fd1-9444-adf32d03f7c5}</UniqueIdentifier>
-      <Extensions>i;inl</Extensions>
-    </Filter>
-    <Filter Include="Documentation">
-      <UniqueIdentifier>{42f5d71a-c3e0-4761-b363-cb8f2d811e77}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{92603191-13a9-43e7-b4f7-76cc63b2911d}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ACE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ACE_crc32.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ACE_crc_ccitt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ace_wchar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Activation_Queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Argv_Type_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Assert.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Asynch_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Asynch_IO_Impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Asynch_Pseudo_Task.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Params.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_QoS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ATM_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Atomic_Op.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_Sparc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Auto_Event.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Barrier.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Base_Thread_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Based_Pointer_Repository.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Basic_Stats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Basic_Types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Capabilities.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\CDR_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\CDR_Size.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\CDR_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Cleanup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Codecs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Codeset_IBM1047.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Codeset_Registry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Codeset_Registry_db.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Condition_Recursive_Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Configuration.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Configuration_Import_Export.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Connection_Recycling_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Containers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Copy_Disabled.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Countdown_Time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Date_Time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DEV.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DEV_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DEV_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DEV_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dirent.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dirent_Selector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DLL.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\DLL_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dump.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dynamic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Dependency.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Encoding_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Encoding_Converter_Factory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Event.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Event_Handler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO_Send.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FIFO_Send_Msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FILE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FILE_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FILE_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\FILE_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\File_Lock.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Filecache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Flag_Manip.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Framework_Component.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Functor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Functor_String.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Get_Opt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\gethrtime.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Handle_Ops.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Handle_Set.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Hashable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\High_Res_Timer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\ICMP_Socket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\INET_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Init_ACE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\IO_Cntl_Msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\IO_SAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\IOStream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\IPC_SAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Lib_Find.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Local_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Local_Name_Space.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Local_Tokens.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Lock.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_Backend.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_Callback.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_IPC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_NT_Event_Log.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Msg_UNIX_Syslog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Log_Record.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Logging_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_CODgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_Dgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\LSOCK_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Malloc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Malloc_Allocator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Manual_Event.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Mem_Map.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_SAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MEM_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Message_Block.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Message_Queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Message_Queue_NT.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Method_Request.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Admin.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Admin_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Control_Action.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Control_Types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Point_Registry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Monitor_Size.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Name_Proxy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Name_Request_Reply.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Name_Space.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Naming_Context.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Netlink_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Notification_Queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Notification_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\NT_Service.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Obchunk.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Object_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Object_Manager_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_Errno.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_ctype.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_dirent.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_dlfcn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_errno.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_fcntl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_math.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_netdb.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_poll.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_pwd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_regex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_signal.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdio.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdlib.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_string.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_strings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_stropts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_mman.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_msg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_resource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_select.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_shm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_socket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_stat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_uio.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_utsname.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_wait.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_Thread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_unistd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_NS_wctype.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_QoS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_Thread_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\OS_TLI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Parse_Node.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\PI_Malloc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Ping_Socket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Pipe.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\POSIX_Asynch_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\POSIX_CB_Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\POSIX_Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Priority_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Proactor_Impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Process.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Process_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Process_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Process_Semaphore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Profile_Timer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Reactor_Impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Reactor_Timer_Interface.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Read_Buffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Recyclable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Registry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Registry_Name_Space.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Remote_Name_Space.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Remote_Tokens.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Rtems_init.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\RW_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\RW_Process_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\RW_Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sample_History.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sbrk_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sched_Params.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_Base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Semaphore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Config.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Gestalt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Object.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Repository.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Service_Types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Memory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_MM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_Pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_SV.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Shared_Object.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sig_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sig_Handler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Signal.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_CODgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Sock_Connect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Netlink.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SOCK_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SPIPE_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Stack_Trace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Stats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\String_Base_Const.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SUN_Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Message.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Message_Queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\SV_Shared_Memory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Lexer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_y.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Synch_Options.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\System_Time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Task.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Control.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Exit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Hook.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Mutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Thread_Semaphore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Throughput_Stats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Time_Value.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Timeprobe.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TLI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TLI_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TLI_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TLI_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token_Collection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token_Invariants.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token_Manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TP_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\Trace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TSS_Adapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\TTY_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UNIX_Addr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UPIPE_Acceptor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UPIPE_Connector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UPIPE_Stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UTF32_Encoding_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UTF8_Encoding_Converter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\UUID.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\WFMO_Reactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\WIN32_Asynch_IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\WIN32_Proactor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\XML_Svc_Conf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ACE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ACE_export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ace_wchar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Activation_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Arg_Shifter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ARGV.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Argv_Type_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Array_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Array_Map.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Assert.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_IO_Impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Asynch_Pseudo_Task.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Params.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_QoS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ATM_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Atomic_Op.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_GCC_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_Sparc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Auto_Event.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Auto_Functor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Auto_IncDec_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Auto_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Barrier.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Base_Thread_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Based_Pointer_Repository.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Based_Pointer_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Basic_Stats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Basic_Types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Bound_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Cache_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Cached_Connect_Strategy_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Caching_Strategies_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Caching_Utility_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Capabilities.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CDR_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CDR_Size.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CDR_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CE_Screen_Output.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\checked_iterator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Cleanup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Cleanup_Strategies_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Codecs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Codeset_IBM1047.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Codeset_Registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Codeset_Symbols.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Condition_Recursive_Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Condition_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-aix-5.x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-all.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-cygwin32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-doxygen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-freebsd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-g++-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-ghs-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-hpux-11.00.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-icc-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-integritySCA.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-linux-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-linux.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-lite.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-lynxos.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-iphone-hardware.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-iphone-simulator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-leopard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-panther.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-snowleopard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx-tiger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macosx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-minimal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-mvs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-netbsd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-openbsd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-openvms.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-pharlap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-posix-nonetworking.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-posix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-neutrino.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-rtp-62x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-rtp-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-rtp-pre62x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-qnx-rtp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-rtems.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-suncc-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.10.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.11.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.4-g++.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.4-sunc++-4.x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.6.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.7.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-sunos5.9.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-tandem-nsk-mips-v2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-tandem-nsk-mips-v3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-tandem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-visualage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.4.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.6.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.7.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-vxworks6.8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-borland.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-cegcc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-dmc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-interix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-mingw.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc-7.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc-8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc-9.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc-10.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32-msvc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-win32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\config-WinCE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Configuration.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Configuration_Import_Export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Connection_Recycling_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Containers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Containers_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Copy_Disabled.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\CORBA_macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Countdown_Time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Date_Time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Default_Constants.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DEV.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DEV_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DEV_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DEV_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dirent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dirent_Selector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DLL.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\DLL_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dump.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dump_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service_Dependency.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Encoding_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Encoding_Converter_Factory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Env_Value_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Event.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Event_Handler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Event_Handler_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO_Send.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FIFO_Send_Msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FILE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FILE_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FILE_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\FILE_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\File_Lock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Filecache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Flag_Manip.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Framework_Component.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Framework_Component_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Free_List.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Functor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Functor_String.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Functor_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Future.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Future_Set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Get_Opt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Global_Macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Guard_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Handle_Gobbler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Handle_Ops.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Handle_Set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Cache_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Map_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Map_With_Allocator_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hash_Multi_Map_Manager_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Hashable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\High_Res_Timer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\ICMP_Socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\If_Then_Else.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\INET_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Init_ACE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Intrusive_Auto_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Intrusive_List.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Intrusive_List_Node.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IO_Cntl_Msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IO_SAP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\iosfwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IOStream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IOStream_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\IPC_SAP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Lib_Find.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Local_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Local_Name_Space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Local_Name_Space_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Local_Tokens.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Lock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Lock_Adapter_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LOCK_SOCK_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_Backend.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_Callback.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_IPC.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_NT_Event_Log.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Msg_UNIX_Syslog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Priority.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Log_Record.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Logging_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_CODgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_Dgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\LSOCK_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Malloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Malloc_Allocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Malloc_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Malloc_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Managed_Object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Manual_Event.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Map_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Map_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Mem_Map.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_SAP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MEM_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Block.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Block_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Queue_NT.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Queue_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Method_Request.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Metrics_Cache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Metrics_Cache_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Min_Max.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Module.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Admin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Admin_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Control_Action.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Control_Types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Point_Registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Monitor_Size.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Name_Proxy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Name_Request_Reply.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Name_Space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Naming_Context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Netlink_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Node.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Notification_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Notification_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\NT_Service.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Null_Barrier.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Null_Condition.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Null_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Null_Semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Numeric_Limits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Obchunk.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Object_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Object_Manager_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Obstack.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Obstack_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_aio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_assert.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_byteswap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_complex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_cpio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ctype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_dirent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_dlfcn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_Errno.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_errno.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_fcntl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_fenv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_float.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_fmtmsg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_fnmatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ftw.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_glob.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_grp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_iconv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\net\os_if.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\netinet\os_in.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\arpa\os_inet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_intrin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_inttypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_ipc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_iso646.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_kstat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_langinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_libgen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_limits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_loadavg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_local.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_main.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_math.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_Memory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_mman.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_monetary.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_mqueue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ndbm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_netdb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_nl_types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_ctype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_dirent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_dlfcn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_errno.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_fcntl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_macros.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_math.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_netdb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_poll.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_pwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_regex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_signal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_strings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_stropts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_mman.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_msg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_select.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_shm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_stat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_uio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_utsname.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_wait.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_Thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_unistd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_NS_wctype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_pdh.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_pdhmsg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_poll.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_pstat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_pthread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_pwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_QoS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_regex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_sched.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_search.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_select.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_sem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_setjmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_shm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_signal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_spawn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_stat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_statvfs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdarg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdbool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stddef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stdlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_typeinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_strings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_stropts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_sysctl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_sysinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_syslog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_tar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\netinet\os_tcp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_termios.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_tgmath.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_Thread_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_timeb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_times.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\OS_TLI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_trace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ucontext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_uio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_ulimit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_un.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_unistd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_utime.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_utmpx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_utsname.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\sys\os_wait.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_wchar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_wctype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\os_include\os_wordexp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Pair_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Parse_Node.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\PI_Malloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Ping_Socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Pipe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\POSIX_Asynch_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\POSIX_CB_Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\POSIX_Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\post.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\pre.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Priority_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Proactor_Impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Process.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Process_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Process_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Process_Semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Profile_Timer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\RB_Tree.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor_Impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor_Timer_Interface.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reactor_Token_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Read_Buffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Recyclable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Refcountable_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Refcounted_Auto_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Registry_Name_Space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Remote_Name_Space.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Remote_Tokens.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Reverse_Lock_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\RW_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\RW_Process_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\RW_Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sample_History.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sbrk_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sched_Params.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Select_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Gestalt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Repository.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Service_Types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Memory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_MM.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_Pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_SV.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Shared_Object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sig_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sig_Handler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Signal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Singleton.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_CODgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Sock_Connect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Netlink.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SOCK_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SPIPE_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SString.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SStringfwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Stack_Trace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Static_Object_Lock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Stats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Strategies.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Strategies_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Stream_Modules.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\streams.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\String_Base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\String_Base_Const.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SUN_Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Message.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Message_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\SV_Shared_Memory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Lexer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Param.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Token_Table.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Conf_Tokens.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\svc_export.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Svc_Handler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Synch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Synch_Options.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Synch_Traits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\System_Time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Task.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Task_Ex_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Task_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Test_and_Set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Control.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Exit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Hook.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Thread_Semaphore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Throughput_Stats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Time_Value.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timeprobe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timeprobe_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Hash.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Hash_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Heap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Heap_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_List.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_List_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Queue_Adapters.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Queue_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Queuefwd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Wheel.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Timer_Wheel_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TLI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TLI_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TLI_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TLI_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token_Collection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token_Invariants.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token_Manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Tokenizer_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TP_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Trace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Truncate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TSS_Adapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TSS_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\TTY_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Typed_SV_Message.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Typed_SV_Message_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Unbounded_Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Unbounded_Set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Unbounded_Set_Ex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UNIX_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UPIPE_Acceptor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UPIPE_Addr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UPIPE_Connector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UPIPE_Stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UTF32_Encoding_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UTF8_Encoding_Converter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\UUID.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Value_Ptr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Vector_T.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\Versioned_Namespace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\WFMO_Reactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\WIN32_Asynch_IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\WIN32_Proactor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\XML_Svc_Conf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\dep\ACE_wrappers\ace\ACE.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ace_wchar.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Activation_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Active_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ARGV.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Argv_Type_Converter.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Array_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Array_Map.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Asynch_IO_Impl.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Params.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_QoS.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\ATM_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Atomic_Op.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_GCC_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Atomic_Op_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Auto_Event.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Auto_Functor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Auto_IncDec_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Auto_Ptr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Barrier.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Base_Thread_Adapter.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Based_Pointer_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Basic_Stats.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Basic_Types.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Bound_Ptr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Cache_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Caching_Strategies_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Capabilities.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\CDR_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\CDR_Size.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\CDR_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Cleanup.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Codeset_Registry.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Condition_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Condition_Thread_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Configuration.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Containers.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Containers_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Countdown_Time.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Date_Time.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\DEV.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\DEV_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\DEV_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\DEV_IO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Dev_Poll_Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Dirent.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Dirent_Selector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Dynamic.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Dynamic_Message_Strategy.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Dynamic_Service.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Env_Value_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Event.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Event_Handler.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Event_Handler_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO_Recv_Msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO_Send.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FIFO_Send_Msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FILE.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FILE_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FILE_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\FILE_IO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\File_Lock.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Flag_Manip.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Framework_Component.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Functor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Functor_String.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Functor_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Get_Opt.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Guard_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Handle_Gobbler.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Handle_Set.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Hash_Cache_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Hash_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Hash_Map_With_Allocator_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Hash_Multi_Map_Manager_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Hashable.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\High_Res_Timer.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\INET_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Intrusive_Auto_Ptr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Intrusive_List.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Intrusive_List_Node.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\IO_Cntl_Msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\IO_SAP.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\IOStream_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\IPC_SAP.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Local_Tokens.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Lock.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Lock_Adapter_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Log_Msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Log_Record.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK_CODgram.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK_Dgram.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\LSOCK_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Malloc.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Malloc_Allocator.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Malloc_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Managed_Object.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Manual_Event.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Map_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Map_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_IO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Mem_Map.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_SAP.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MEM_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Block.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Block_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Queue_NT.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Message_Queue_Vx.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Metrics_Cache_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\MMAP_Memory_Pool.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Module.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Monitor_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Msg_WFMO_Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Multihomed_INET_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Naming_Context.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Netlink_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Notification_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Notification_Strategy.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\NT_Service.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Obchunk.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Object_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Obstack_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_Errno.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_arpa_inet.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_ctype.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_dirent.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_dlfcn.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_errno.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_fcntl.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_math.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_netdb.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_poll.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_pwd.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_regex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_signal.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdio.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_stdlib.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_string.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_strings.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_stropts.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_mman.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_msg.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_resource.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_select.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_sendfile.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_shm.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_socket.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_stat.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_time.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_uio.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_sys_wait.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_Thread.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_time.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_unistd.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_NS_wctype.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\OS_TLI.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Pagefile_Memory_Pool.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Pair_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\PI_Malloc.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Ping_Socket.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Pipe.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\POSIX_Proactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Proactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Process.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Process_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Process_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Process_Semaphore.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Profile_Timer.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\RB_Tree.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Reactor_Notification_Strategy.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Read_Buffer.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Recursive_Thread_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Recyclable.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Refcountable_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Refcounted_Auto_Ptr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Remote_Tokens.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Reverse_Lock_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\RW_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\RW_Process_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\RW_Thread_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Sample_History.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Sched_Params.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Select_Reactor_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Semaphore.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Config.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Gestalt.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Object.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Repository.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Service_Types.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_MM.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Shared_Memory_SV.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Shared_Object.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Sig_Handler.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Signal.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Singleton.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_CODgram.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Bcast.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Dgram_Mcast.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_IO.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Netlink.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Association.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_SEQPACK_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SOCK_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SPIPE.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SPIPE_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SPIPE_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SPIPE_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SString.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Stats.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Strategies_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\String_Base.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Message.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Message_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Complex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Semaphore_Simple.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\SV_Shared_Memory.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Task.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Task_Ex_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Task_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Adapter.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Control.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Mutex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Thread_Semaphore.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Time_Value.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Timeprobe.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Timer_Queue_Adapters.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Timer_Queue_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\TLI.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\TLI_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\TLI_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Token.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Token_Collection.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Token_Manager.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\TP_Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\TSS_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Typed_SV_Message.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Typed_SV_Message_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Unbounded_Queue.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Unbounded_Set.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Unbounded_Set_Ex.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\UNIX_Addr.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\UPIPE_Acceptor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\UPIPE_Connector.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\UPIPE_Stream.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\UTF16_Encoding_Converter.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\UUID.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\Vector_T.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\WFMO_Reactor.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-    <None Include="..\..\dep\ACE_wrappers\ace\XTI_ATM_Mcast.inl">
-      <Filter>Inline Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\dep\ACE_wrappers\ace\ace.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\dep\ACE_wrappers\README">
-      <Filter>Documentation</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\dep\ACE_wrappers\VERSION">
-      <Filter>Documentation</Filter>
-    </CustomBuild>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC110/StormLib.vcxproj b/win/VC110/StormLib.vcxproj
deleted file mode 100644
index 328b47398..000000000
--- a/win/VC110/StormLib.vcxproj
+++ /dev/null
@@ -1,688 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugAD|Win32">
-      <Configuration>DebugAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAD|x64">
-      <Configuration>DebugAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|Win32">
-      <Configuration>DebugAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|x64">
-      <Configuration>DebugAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|Win32">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|x64">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|Win32">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|x64">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>StormLib</ProjectName>
-    <ProjectGuid>{78424708-1F6E-4D4B-920C-FB6D26847055}</ProjectGuid>
-    <RootNamespace>StormLib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">$(ProjectName)RAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">$(ProjectName)RAS</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt" />
-    <None Include="doc\The MoPaQ File Format 0.9.txt" />
-    <None Include="doc\The MoPaQ File Format 1.0.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\StormCommon.h" />
-    <ClInclude Include="src\StormLib.h" />
-    <ClInclude Include="src\StormPort.h" />
-    <ClInclude Include="src\adpcm\adpcm.h" />
-    <ClInclude Include="src\huffman\huff.h" />
-    <ClInclude Include="src\pklib\pklib.h" />
-    <ClInclude Include="src\sparse\sparse.h" />
-    <ClInclude Include="src\jenkins\lookup.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\FileStream.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseCommon.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SBaseFileTable.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SCompression.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAddFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileAttributes.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCompactArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileCreateArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileExtractFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileFindFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileListFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileOpenFileEx.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFilePatchArchives.cpp" />
-    <ClCompile Include="src\SFileReadFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\SFileVerify.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="src\adpcm\adpcm.cpp" />
-    <ClCompile Include="src\bzip2\blocksort.c" />
-    <ClCompile Include="src\bzip2\bzlib.c" />
-    <ClCompile Include="src\bzip2\compress.c" />
-    <ClCompile Include="src\bzip2\crctable.c" />
-    <ClCompile Include="src\bzip2\decompress.c" />
-    <ClCompile Include="src\bzip2\huffman.c" />
-    <ClCompile Include="src\bzip2\randtable.c" />
-    <ClCompile Include="src\huffman\huff.cpp" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="src\libtommath\bn_reverse.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="src\libtommath\bn_s_mp_sub.c" />
-    <ClCompile Include="src\libtommath\bncore.c" />
-    <ClCompile Include="src\lzma\C\LzFind.c" />
-    <ClCompile Include="src\lzma\C\LzFindMt.c" />
-    <ClCompile Include="src\lzma\C\LzmaDec.c" />
-    <ClCompile Include="src\lzma\C\LzmaEnc.c" />
-    <ClCompile Include="src\lzma\C\Threads.c" />
-    <ClCompile Include="src\pklib\explode.c" />
-    <ClCompile Include="src\pklib\implode.c" />
-    <ClCompile Include="src\sparse\sparse.cpp" />
-    <ClCompile Include="src\zlib\adler32.c" />
-    <ClCompile Include="src\zlib\compress2.c" />
-    <ClCompile Include="src\zlib\crc32.c" />
-    <ClCompile Include="src\zlib\deflate.c" />
-    <ClCompile Include="src\zlib\inffast.c" />
-    <ClCompile Include="src\zlib\inflate.c" />
-    <ClCompile Include="src\zlib\inftrees.c" />
-    <ClCompile Include="src\zlib\trees.c" />
-    <ClCompile Include="src\zlib\zutil.c" />
-    <ClCompile Include="src\jenkins\lookup3.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC110/bzip2.vcxproj b/win/VC110/bzip2.vcxproj
deleted file mode 100644
index 7bedf4730..000000000
--- a/win/VC110/bzip2.vcxproj
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B96F612A-C91D-43B3-A4C3-D4294817EC6C}</ProjectGuid>
-    <RootNamespace>bzip2</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\bzip2__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\bzip2__$(Platform)_$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\bzip2__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\bzip2__$(Platform)_$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\bzip2\blocksort.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\bzlib.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\compress.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\crctable.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\decompress.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\huffman.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\randtable.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\src\bzip2\bzlib.h" />
-    <ClInclude Include="..\..\dep\src\bzip2\bzlib_private.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC110/framework.vcxproj b/win/VC110/framework.vcxproj
deleted file mode 100644
index ad9cb1ac9..000000000
--- a/win/VC110/framework.vcxproj
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}</ProjectGUID>
-    <RootNamespace>framework</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>false</CLRSupport>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\framework__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\framework__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\framework__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\framework__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\framework__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\framework__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\framework__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\framework__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\framework__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\framework__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\framework__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\framework__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.lib</TargetExt>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\framework__$(Platform)_$(Configuration)\framework.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\framework__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\framework__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\framework__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\framework__$(Platform)_$(Configuration)\framework.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\framework__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\framework__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\framework__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\framework__$(Platform)_$(Configuration)\framework.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\framework__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\framework__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\framework__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\framework__$(Platform)_$(Configuration)\framework.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\framework__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\framework__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\framework__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\framework__$(Platform)_$(Configuration)\framework.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\framework__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\framework__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\framework__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zl /MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\framework;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\framework__$(Platform)_$(Configuration)\framework.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\framework__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\framework__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\framework__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\framework\Dynamic\FactoryHolder.h" />
-    <ClInclude Include="..\..\src\framework\Dynamic\ObjectRegistry.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\Grid.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\GridLoader.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\GridReference.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\GridRefManager.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\NGrid.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainer.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainerFunctions.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainerVisitor.h" />
-    <ClInclude Include="..\..\src\framework\Platform\CompilerDefs.h" />
-    <ClInclude Include="..\..\src\framework\Platform\Define.h" />
-    <ClInclude Include="..\..\src\framework\Policies\CreationPolicy.h" />
-    <ClInclude Include="..\..\src\framework\Policies\ObjectLifeTime.h" />
-    <ClInclude Include="..\..\src\framework\Policies\Singleton.h" />
-    <ClInclude Include="..\..\src\framework\Policies\ThreadingModel.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\ByteConverter.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\Callback.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\EventProcessor.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedList.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\Reference.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\RefManager.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\TypeList.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\UnorderedMapSet.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\framework\Policies\ObjectLifeTime.cpp" />
-    <ClCompile Include="..\..\src\framework\Utilities\EventProcessor.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win/VC110/g3dlite.vcxproj b/win/VC110/g3dlite.vcxproj
deleted file mode 100644
index 087120562..000000000
--- a/win/VC110/g3dlite.vcxproj
+++ /dev/null
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{8072769E-CF10-48BF-B9E1-12752A5DAC6E}</ProjectGUID>
-    <RootNamespace>sockets</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\g3dlite__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\g3dlite__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.lib</TargetExt>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>.\g3dlite__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\g3dlite__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\g3dlite__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Lib>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\g3dlite\AABox.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Box.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Crypto.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\format.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Matrix3.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Plane.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\RegistryUtil.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\System.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Triangle.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector3.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector4.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\debugAssert.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\fileutils.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\g3dmath.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\g3dfnmatch.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\prompt.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\stringutils.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Any.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryFormat.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryInput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryOutput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Capsule.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\CollisionDetection.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\CoordinateFrame.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Cylinder.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Line.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\LineSegment.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Log.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Matrix4.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\MemoryManager.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Quat.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Random.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Ray.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\ReferenceCount.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Sphere.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\TextInput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\TextOutput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\UprightFrame.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector2.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\PhysicsFrame.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\FileSystem.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\uint128.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\AABox.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Array.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Box.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\CollisionDetection.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\CoordinateFrame.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Crypto.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\debug.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\format.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\g3dmath.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\GCamera.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Line.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Matrix3.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Plane.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\platform.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Quat.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Ray.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\RegistryUtil.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Sphere.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\stringutils.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\System.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Table.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Triangle.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector2.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector2int16.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector3.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector3int16.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\Vector4.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\PhysicsFrame.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\FileSystem.h" />
-    <ClInclude Include="..\..\dep\include\g3dlite\G3D\uint128.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC110/game.vcxproj b/win/VC110/game.vcxproj
deleted file mode 100644
index f0d424a80..000000000
--- a/win/VC110/game.vcxproj
+++ /dev/null
@@ -1,713 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{1DC6C4DA-A028-41F3-877D-D5400C594F88}</ProjectGUID>
-    <RootNamespace>game</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="Precompiled Headers.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="Precompiled Headers.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="Precompiled Headers.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="Precompiled Headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">game</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\game__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\game__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">game</TargetName>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/bigobj /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/bigobj /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/bigobj /D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <AssemblerListingLocation>.\game__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\game__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\game__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalDependencies>.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies>.\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\game\AccountMgr.cpp" />
-    <ClCompile Include="..\..\src\game\AchievementMgr.cpp" />
-    <ClCompile Include="..\..\src\game\AggressorAI.cpp" />
-    <ClCompile Include="..\..\src\game\ArenaTeam.cpp" />
-    <ClCompile Include="..\..\src\game\ArenaTeamHandler.cpp" />
-    <ClCompile Include="..\..\src\game\AuctionHouseBot\AuctionHouseBot.cpp" />
-    <ClCompile Include="..\..\src\game\AuctionHouseHandler.cpp" />
-    <ClCompile Include="..\..\src\game\AuctionHouseMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Bag.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGround.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundAA.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundAB.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundRB.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundAV.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundBE.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundDS.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundEY.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundHandler.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundIC.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundMgr.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundNA.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundRL.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundRV.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundSA.cpp" />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundWS.cpp" />
-    <ClCompile Include="..\..\src\game\Calendar.cpp" />
-    <ClCompile Include="..\..\src\game\CalendarHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Camera.cpp" />
-    <ClCompile Include="..\..\src\game\Channel.cpp" />
-    <ClCompile Include="..\..\src\game\ChannelHandler.cpp" />
-    <ClCompile Include="..\..\src\game\ChannelMgr.cpp" />
-    <ClCompile Include="..\..\src\game\CharacterDatabaseCleaner.cpp" />
-    <ClCompile Include="..\..\src\game\CharacterHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Chat.cpp" />
-    <ClCompile Include="..\..\src\game\ChatHandler.cpp" />
-    <ClCompile Include="..\..\src\game\CombatHandler.cpp" />
-    <ClCompile Include="..\..\src\game\ConfusedMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\Corpse.cpp" />
-    <ClCompile Include="..\..\src\game\Creature.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureAI.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureAIRegistry.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureAISelector.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureEventAI.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureEventAIMgr.cpp" />
-    <ClCompile Include="..\..\src\game\CreatureLinkingMgr.cpp" />
-    <ClCompile Include="..\..\src\game\DB2Stores.cpp" />
-    <ClCompile Include="..\..\src\game\DBCStores.cpp" />
-    <ClCompile Include="..\..\src\game\DBCStructure.cpp" />
-    <ClCompile Include="..\..\src\game\debugcmds.cpp" />
-    <ClCompile Include="..\..\src\game\DuelHandler.cpp" />
-    <ClCompile Include="..\..\src\game\DynamicObject.cpp" />
-    <ClCompile Include="..\..\src\game\FleeingMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\FollowerReference.cpp" />
-    <ClCompile Include="..\..\src\game\GameEventMgr.cpp" />
-    <ClCompile Include="..\..\src\game\GameObject.cpp" />
-    <ClCompile Include="..\..\src\game\GMTicketHandler.cpp" />
-    <ClCompile Include="..\..\src\game\GMTicketMgr.cpp" />
-    <ClCompile Include="..\..\src\game\GossipDef.cpp" />
-    <ClCompile Include="..\..\src\game\GridMap.cpp" />
-    <ClCompile Include="..\..\src\game\GridNotifiers.cpp" />
-    <ClCompile Include="..\..\src\game\GridStates.cpp" />
-    <ClCompile Include="..\..\src\game\Group.cpp" />
-    <ClCompile Include="..\..\src\game\GroupHandler.cpp" />
-    <ClCompile Include="..\..\src\game\GroupReference.cpp" />
-    <ClCompile Include="..\..\src\game\GuardAI.cpp" />
-    <ClCompile Include="..\..\src\game\Guild.cpp" />
-    <ClCompile Include="..\..\src\game\GuildHandler.cpp" />
-    <ClCompile Include="..\..\src\game\GuildMgr.cpp" />
-    <ClCompile Include="..\..\src\game\HomeMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\HostileRefManager.cpp" />
-    <ClCompile Include="..\..\src\game\IdleMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\InstanceData.cpp" />
-    <ClCompile Include="..\..\src\game\Item.cpp" />
-    <ClCompile Include="..\..\src\game\ItemEnchantmentMgr.cpp" />
-    <ClCompile Include="..\..\src\game\ItemHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Level0.cpp" />
-    <ClCompile Include="..\..\src\game\Level1.cpp" />
-    <ClCompile Include="..\..\src\game\Level2.cpp" />
-    <ClCompile Include="..\..\src\game\Level3.cpp" />
-    <ClCompile Include="..\..\src\game\LFGHandler.cpp" />
-    <ClCompile Include="..\..\src\game\LootHandler.cpp" />
-    <ClCompile Include="..\..\src\game\LootMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Mail.cpp" />
-    <ClCompile Include="..\..\src\game\MailHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Map.cpp" />
-    <ClCompile Include="..\..\src\game\MapManager.cpp" />
-    <ClCompile Include="..\..\src\game\MapPersistentStateMgr.cpp" />
-    <ClCompile Include="..\..\src\game\MassMailMgr.cpp" />
-    <ClCompile Include="..\..\src\game\MiscHandler.cpp" />
-    <ClCompile Include="..\..\src\game\MotionMaster.cpp" />
-    <ClCompile Include="..\..\src\game\MoveMap.cpp" />
-    <ClCompile Include="..\..\src\game\MovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\MovementHandler.cpp" />
-    <ClCompile Include="..\..\src\game\movement\MoveSpline.cpp" />
-    <ClCompile Include="..\..\src\game\movement\MoveSplineInit.cpp" />
-    <ClCompile Include="..\..\src\game\movement\packet_builder.cpp" />
-    <ClCompile Include="..\..\src\game\movement\spline.cpp" />
-    <ClCompile Include="..\..\src\game\movement\util.cpp" />
-    <ClCompile Include="..\..\src\game\NPCHandler.cpp" />
-    <ClCompile Include="..\..\src\game\NullCreatureAI.cpp" />
-    <ClCompile Include="..\..\src\game\Object.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectAccessor.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectGridLoader.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectMgr.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectGuid.cpp" />
-    <ClCompile Include="..\..\src\game\ObjectPosSelector.cpp" />
-    <ClCompile Include="..\..\src\game\Opcodes.cpp" />
-    <ClCompile Include="..\..\src\game\PathFinder.cpp" />
-    <ClCompile Include="..\..\src\game\pchdef.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\src\game\Pet.cpp" />
-    <ClCompile Include="..\..\src\game\PetAI.cpp" />
-    <ClCompile Include="..\..\src\game\PetHandler.cpp" />
-    <ClCompile Include="..\..\src\game\PetitionsHandler.cpp" />
-    <ClCompile Include="..\..\src\game\PhaseMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Player.cpp" />
-    <ClCompile Include="..\..\src\game\PlayerDump.cpp" />
-    <ClCompile Include="..\..\src\game\PointMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\PoolManager.cpp" />
-    <ClCompile Include="..\..\src\game\QueryHandler.cpp" />
-    <ClCompile Include="..\..\src\game\QuestDef.cpp" />
-    <ClCompile Include="..\..\src\game\QuestHandler.cpp" />
-    <ClCompile Include="..\..\src\game\RandomMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\ReactorAI.cpp" />
-    <ClCompile Include="..\..\src\game\ReputationMgr.cpp" />
-    <ClCompile Include="..\..\src\game\ScriptMgr.cpp" />
-    <ClCompile Include="..\..\src\game\SkillDiscovery.cpp" />
-    <ClCompile Include="..\..\src\game\SkillExtraItems.cpp" />
-    <ClCompile Include="..\..\src\game\SkillHandler.cpp" />
-    <ClCompile Include="..\..\src\game\SocialMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Spell.cpp" />
-    <ClCompile Include="..\..\src\game\SpellAuras.cpp" />
-    <ClCompile Include="..\..\src\game\SQLStorages.cpp" />
-    <ClCompile Include="..\..\src\game\TransportSystem.cpp" />
-    <ClCompile Include="..\..\src\game\UnitAuraProcHandler.cpp" />
-    <ClCompile Include="..\..\src\game\SpellEffects.cpp" />
-    <ClCompile Include="..\..\src\game\SpellHandler.cpp" />
-    <ClCompile Include="..\..\src\game\SpellMgr.cpp" />
-    <ClCompile Include="..\..\src\game\StatSystem.cpp" />
-    <ClCompile Include="..\..\src\game\TargetedMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\TaxiHandler.cpp" />
-    <ClCompile Include="..\..\src\game\TemporarySummon.cpp" />
-    <ClCompile Include="..\..\src\game\ThreatManager.cpp" />
-    <ClCompile Include="..\..\src\game\Totem.cpp" />
-    <ClCompile Include="..\..\src\game\TotemAI.cpp" />
-    <ClCompile Include="..\..\src\game\TradeHandler.cpp" />
-    <ClCompile Include="..\..\src\game\Transports.cpp" />
-    <ClCompile Include="..\..\src\game\Unit.cpp" />
-    <ClCompile Include="..\..\src\game\UpdateData.cpp" />
-    <ClCompile Include="..\..\src\game\Vehicle.cpp" />
-    <ClCompile Include="..\..\src\game\VehicleHandler.cpp" />
-    <ClCompile Include="..\..\src\game\VoiceChatHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WaypointManager.cpp" />
-    <ClCompile Include="..\..\src\game\WaypointMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\Weather.cpp" />
-    <ClCompile Include="..\..\src\game\World.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvP.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPEP.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPGH.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPHP.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPMgr.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPNA.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPSI.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPTF.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPZM.cpp" />
-    <ClCompile Include="..\..\src\game\WorldSession.cpp" />
-    <ClCompile Include="..\..\src\game\WorldSocket.cpp" />
-    <ClCompile Include="..\..\src\game\WorldSocketMgr.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\BIH.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\DynamicTree.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\GameObjectModel.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\MapTree.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\ModelInstance.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\TileAssembler.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\VMapFactory.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\VMapManager2.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\WorldModel.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\game\AccountMgr.h" />
-    <ClInclude Include="..\..\src\game\AchievementMgr.h" />
-    <ClInclude Include="..\..\src\game\AggressorAI.h" />
-    <ClInclude Include="..\..\src\game\ArenaTeam.h" />
-    <ClInclude Include="..\..\src\game\AuctionHouseBot\AuctionHouseBot.h" />
-    <ClInclude Include="..\..\src\game\AuctionHouseMgr.h" />
-    <ClInclude Include="..\..\src\game\Bag.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGround.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundAA.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundAB.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundRB.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundAV.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundBE.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundDS.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundEY.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundIC.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundMgr.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundNA.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundRL.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundRV.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundSA.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundWS.h" />
-    <ClInclude Include="..\..\src\game\Calendar.h" />
-    <ClInclude Include="..\..\src\game\Camera.h" />
-    <ClInclude Include="..\..\src\game\Cell.h" />
-    <ClInclude Include="..\..\src\game\CellImpl.h" />
-    <ClInclude Include="..\..\src\game\Channel.h" />
-    <ClInclude Include="..\..\src\game\ChannelMgr.h" />
-    <ClInclude Include="..\..\src\game\CharacterDatabaseCleaner.h" />
-    <ClInclude Include="..\..\src\game\Chat.h" />
-    <ClInclude Include="..\..\src\game\ConfusedMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\Corpse.h" />
-    <ClInclude Include="..\..\src\game\Creature.h" />
-    <ClInclude Include="..\..\src\game\CreatureAI.h" />
-    <ClInclude Include="..\..\src\game\CreatureAIImpl.h" />
-    <ClInclude Include="..\..\src\game\CreatureAIRegistry.h" />
-    <ClInclude Include="..\..\src\game\CreatureAISelector.h" />
-    <ClInclude Include="..\..\src\game\CreatureEventAI.h" />
-    <ClInclude Include="..\..\src\game\CreatureEventAIMgr.h" />
-    <ClInclude Include="..\..\src\game\CreatureLinkingMgr.h" />
-    <ClInclude Include="..\..\src\game\DB2fmt.h" />
-    <ClInclude Include="..\..\src\game\DB2Stores.h" />
-    <ClInclude Include="..\..\src\game\DB2Structure.h" />
-    <ClInclude Include="..\..\src\game\DBCEnums.h" />
-    <ClInclude Include="..\..\src\game\DBCfmt.h" />
-    <ClInclude Include="..\..\src\game\DBCStores.h" />
-    <ClInclude Include="..\..\src\game\DBCStructure.h" />
-    <ClInclude Include="..\..\src\game\DynamicObject.h" />
-    <ClInclude Include="..\..\src\game\FleeingMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\FollowerReference.h" />
-    <ClInclude Include="..\..\src\game\FollowerRefManager.h" />
-    <ClInclude Include="..\..\src\game\Formulas.h" />
-    <ClInclude Include="..\..\src\game\GameEventMgr.h" />
-    <ClInclude Include="..\..\src\game\GameObject.h" />
-    <ClInclude Include="..\..\src\game\GMTicketMgr.h" />
-    <ClInclude Include="..\..\src\game\GossipDef.h" />
-    <ClInclude Include="..\..\src\game\GridDefines.h" />
-    <ClInclude Include="..\..\src\game\GridMap.h" />
-    <ClInclude Include="..\..\src\game\GridNotifiers.h" />
-    <ClInclude Include="..\..\src\game\GridNotifiersImpl.h" />
-    <ClInclude Include="..\..\src\game\GridStates.h" />
-    <ClInclude Include="..\..\src\game\Group.h" />
-    <ClInclude Include="..\..\src\game\GroupReference.h" />
-    <ClInclude Include="..\..\src\game\GroupRefManager.h" />
-    <ClInclude Include="..\..\src\game\GuardAI.h" />
-    <ClInclude Include="..\..\src\game\Guild.h" />
-    <ClInclude Include="..\..\src\game\GuildMgr.h" />
-    <ClInclude Include="..\..\src\game\HomeMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\HostileRefManager.h" />
-    <ClInclude Include="..\..\src\game\IdleMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\InstanceData.h" />
-    <ClInclude Include="..\..\src\game\Item.h" />
-    <ClInclude Include="..\..\src\game\ItemEnchantmentMgr.h" />
-    <ClInclude Include="..\..\src\game\ItemPrototype.h" />
-    <ClInclude Include="..\..\src\game\Language.h" />
-    <ClInclude Include="..\..\src\game\LootMgr.h" />
-    <ClInclude Include="..\..\src\game\Mail.h" />
-    <ClInclude Include="..\..\src\game\Map.h" />
-    <ClInclude Include="..\..\src\game\MapManager.h" />
-    <ClInclude Include="..\..\src\game\MapPersistentStateMgr.h" />
-    <ClInclude Include="..\..\src\game\MapReference.h" />
-    <ClInclude Include="..\..\src\game\MapRefManager.h" />
-    <ClInclude Include="..\..\src\game\MassMailMgr.h" />
-    <ClInclude Include="..\..\src\game\MotionMaster.h" />
-    <ClInclude Include="..\..\src\game\MoveMap.h" />
-    <ClInclude Include="..\..\src\game\MoveMapSharedDefines.h" />
-    <ClInclude Include="..\..\src\game\MovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\movement\MovementStructures.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSpline.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSplineFlag.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSplineInit.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSplineInitArgs.h" />
-    <ClInclude Include="..\..\src\game\movement\packet_builder.h" />
-    <ClInclude Include="..\..\src\game\movement\spline.h" />
-    <ClInclude Include="..\..\src\game\movement\spline.impl.h" />
-    <ClInclude Include="..\..\src\game\movement\typedefs.h" />
-    <ClInclude Include="..\..\src\game\NPCHandler.h" />
-    <ClInclude Include="..\..\src\game\NullCreatureAI.h" />
-    <ClInclude Include="..\..\src\game\Object.h" />
-    <ClInclude Include="..\..\src\game\ObjectAccessor.h" />
-    <ClInclude Include="..\..\src\game\ObjectGuid.h" />
-    <ClInclude Include="..\..\src\game\ObjectGridLoader.h" />
-    <ClInclude Include="..\..\src\game\ObjectMgr.h" />
-    <ClInclude Include="..\..\src\game\ObjectPosSelector.h" />
-    <ClInclude Include="..\..\src\game\Opcodes.h" />
-    <ClInclude Include="..\..\src\game\Path.h" />
-    <ClInclude Include="..\..\src\game\PathFinder.h" />
-    <ClInclude Include="..\..\src\game\pchdef.h" />
-    <ClInclude Include="..\..\src\game\Pet.h" />
-    <ClInclude Include="..\..\src\game\PetAI.h" />
-    <ClInclude Include="..\..\src\game\PhaseMgr.h" />
-    <ClInclude Include="..\..\src\game\Player.h" />
-    <ClInclude Include="..\..\src\game\PlayerDump.h" />
-    <ClInclude Include="..\..\src\game\PointMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\PoolManager.h" />
-    <ClInclude Include="..\..\src\game\QuestDef.h" />
-    <ClInclude Include="..\..\src\game\RandomMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\ReactorAI.h" />
-    <ClInclude Include="..\..\src\game\ReputationMgr.h" />
-    <ClInclude Include="..\..\src\game\ScriptMgr.h" />
-    <ClInclude Include="..\..\src\game\SharedDefines.h" />
-    <ClInclude Include="..\..\src\game\SkillDiscovery.h" />
-    <ClInclude Include="..\..\src\game\SkillExtraItems.h" />
-    <ClInclude Include="..\..\src\game\SocialMgr.h" />
-    <ClInclude Include="..\..\src\game\Spell.h" />
-    <ClInclude Include="..\..\src\game\SpellAuraDefines.h" />
-    <ClInclude Include="..\..\src\game\SpellAuras.h" />
-    <ClInclude Include="..\..\src\game\SpellMgr.h" />
-    <ClInclude Include="..\..\src\game\SQLStorages.h" />
-    <ClInclude Include="..\..\src\game\TargetedMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\TemporarySummon.h" />
-    <ClInclude Include="..\..\src\game\ThreatManager.h" />
-    <ClInclude Include="..\..\src\game\Totem.h" />
-    <ClInclude Include="..\..\src\game\TotemAI.h" />
-    <ClInclude Include="..\..\src\game\Transports.h" />
-    <ClInclude Include="..\..\src\game\TransportSystem.h" />
-    <ClInclude Include="..\..\src\game\Unit.h" />
-    <ClInclude Include="..\..\src\game\UnitEvents.h" />
-    <ClInclude Include="..\..\src\game\UpdateData.h" />
-    <ClInclude Include="..\..\src\game\UpdateFields.h" />
-    <ClInclude Include="..\..\src\game\UpdateMask.h" />
-    <ClInclude Include="..\..\src\game\Vehicle.h" />
-    <ClInclude Include="..\..\src\game\WaypointManager.h" />
-    <ClInclude Include="..\..\src\game\WaypointMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\Weather.h" />
-    <ClInclude Include="..\..\src\game\World.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvP.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPEP.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPGH.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPHP.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPMgr.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPNA.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPSI.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPTF.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPZM.h" />
-    <ClInclude Include="..\..\src\game\WorldSession.h" />
-    <ClInclude Include="..\..\src\game\WorldSocket.h" />
-    <ClInclude Include="..\..\src\game\WorldSocketMgr.h" />
-    <ClInclude Include="..\..\src\game\vmap\BIH.h" />
-    <ClInclude Include="..\..\src\game\vmap\BIHWrap.h" />
-    <ClInclude Include="..\..\src\game\vmap\DynamicTree.h" />
-    <ClInclude Include="..\..\src\game\vmap\GameObjectModel.h" />
-    <ClInclude Include="..\..\src\game\vmap\IVMapManager.h" />
-    <ClInclude Include="..\..\src\game\vmap\MapTree.h" />
-    <ClInclude Include="..\..\src\game\vmap\ModelInstance.h" />
-    <ClInclude Include="..\..\src\game\vmap\RegularGrid.h" />
-    <ClInclude Include="..\..\src\game\vmap\TileAssembler.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapDefinitions.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapFactory.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapManager2.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapTools.h" />
-    <ClInclude Include="..\..\src\game\vmap\WorldModel.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dep\recastnavigation\Detour\win\VC110\Detour.vcxproj">
-      <Project>{72bdf975-4d4a-42c7-b2c4-f9ed90a2abb6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="shared.vcxproj">
-      <Project>{90297c34-f231-4df4-848e-a74bcc0e40ed}</Project>
-    </ProjectReference>
-    <ProjectReference Include="g3dlite.vcxproj">
-      <Project>{8072769E-CF10-48BF-B9E1-12752A5DAC6E}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC110/mangosd.vcxproj b/win/VC110/mangosd.vcxproj
deleted file mode 100644
index 551d9d1db..000000000
--- a/win/VC110/mangosd.vcxproj
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{A3A04E47-43A2-4C08-90B3-029CEF558594}</ProjectGUID>
-    <RootNamespace>mangosd</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\mangosd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\..\..\bin\Release\mangosd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\mangosd__$(Platform)_$(Configuration)\mangosd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\mangosd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\mangosd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\mangosd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LargeAddressAware>true</LargeAddressAware>
-      <LinkTimeCodeGeneration>
-      </LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\..\..\bin\Release\mangosd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\mangosd__$(Platform)_$(Configuration)\mangosd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\mangosd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\mangosd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\mangosd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LinkTimeCodeGeneration>
-      </LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\mangosd__$(Platform)_$(Configuration)\mangosd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\mangosd__$(Platform)_$(Configuration)\mangosd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\mangosd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\mangosd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\mangosd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\mangosd__$(Platform)_$(Configuration)\mangosd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\mangosd__$(Platform)_$(Configuration)\mangosd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\mangosd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\mangosd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\mangosd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_$(Configuration) ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <Midl>
-      <TypeLibraryName>.\mangosd__$(Platform)_$(Configuration)\mangosd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\mangosd__$(Platform)_$(Configuration)\mangosd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\mangosd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\mangosd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\mangosd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_debug ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\mangosd__$(Platform)_$(Configuration)\mangosd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include\gsoap;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game;..\..\src\mangosd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\mangosd__$(Platform)_$(Configuration)\mangosd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\mangosd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\mangosd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\mangosd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosd.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\..\win\copyfiles.cmd ..\dep\lib\$(Platform)_debug ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="..\..\AUTHORS" />
-    <None Include="..\..\ChangeLog" />
-    <None Include="..\..\COPYING" />
-    <None Include="..\..\INSTALL" />
-    <None Include="..\..\NEWS" />
-    <None Include="..\..\README" />
-    <None Include="..\..\THANKS" />
-    <None Include="..\..\WARNING" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\gsoap\stdsoap2.cpp" />
-    <ClCompile Include="..\..\src\mangosd\soapServer.cpp" />
-    <ClCompile Include="..\..\src\mangosd\soapC.cpp" />
-    <ClCompile Include="..\..\src\mangosd\MaNGOSsoap.cpp" />
-    <ClCompile Include="..\..\src\mangosd\CliRunnable.cpp" />
-    <ClCompile Include="..\..\src\mangosd\Main.cpp" />
-    <ClCompile Include="..\..\src\mangosd\Master.cpp" />
-    <ClCompile Include="..\..\src\mangosd\RASocket.cpp" />
-    <ClCompile Include="..\..\src\mangosd\WorldRunnable.cpp" />
-    <ClCompile Include="..\..\src\shared\WheatyExceptionReport.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\include\gsoap\stdsoap2.h" />
-    <ClInclude Include="..\..\src\mangosd\soapStub.h" />
-    <ClInclude Include="..\..\src\mangosd\soapH.h" />
-    <ClInclude Include="..\..\src\mangosd\MaNGOSsoap.h" />
-    <ClInclude Include="..\..\src\mangosd\CliRunnable.h" />
-    <ClInclude Include="..\..\src\mangosd\Master.h" />
-    <ClInclude Include="..\..\src\mangosd\RASocket.h" />
-    <ClInclude Include="..\..\src\mangosd\WorldRunnable.h" />
-    <ClInclude Include="..\..\src\shared\WheatyExceptionReport.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\src\mangosd\mangosd.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\dep\recastnavigation\Detour\win\VC110\Detour.vcxproj">
-      <Project>{72bdf975-4d4a-42c7-b2c4-f9ed90a2abb6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="game.vcxproj">
-      <Project>{1dc6c4da-a028-41f3-877d-d5400c594f88}</Project>
-    </ProjectReference>
-    <ProjectReference Include="realmd.vcxproj">
-      <Project>{563e9905-3657-460c-ae63-0ac39d162e23}</Project>
-    </ProjectReference>
-    <ProjectReference Include="shared.vcxproj">
-      <Project>{90297c34-f231-4df4-848e-a74bcc0e40ed}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC110/map-extractor_VC110.vcxproj b/win/VC110/map-extractor_VC110.vcxproj
deleted file mode 100644
index de51e7235..000000000
--- a/win/VC110/map-extractor_VC110.vcxproj
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ad</ProjectName>
-    <ProjectGuid>{D7552D4F-408F-4F8E-859B-366659150CF4}</ProjectGuid>
-    <RootNamespace>ad</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\debug\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\release\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ad_debug</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./ad.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\StormLib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)ad.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <BrowseInformationFile>$(IntDir)</BrowseInformationFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>StormLibDAS.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\dep\StormLib\bin\StormLib\$(Platform)\$(Configuration)AS;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>ad_debug.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>./ad_debug.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>./ad.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\StormLib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)ad.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>StormLibRAS.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\dep\StormLib\bin\StormLib\$(Platform)\$(Configuration)AS;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>./ad.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>./ad.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="loadlib\adt.cpp" />
-    <ClCompile Include="dbcfile.cpp" />
-    <ClCompile Include="loadlib\loadlib.cpp" />
-    <ClCompile Include="system.cpp" />
-    <ClCompile Include="loadlib\wdt.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="loadlib\adt.h" />
-    <ClInclude Include="dbcfile.h" />
-    <ClInclude Include="loadlib\loadlib.h" />
-    <ClInclude Include="loadlib\wdt.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC110/map-extractor_VC110.vcxproj.filters b/win/VC110/map-extractor_VC110.vcxproj.filters
deleted file mode 100644
index a772a4e06..000000000
--- a/win/VC110/map-extractor_VC110.vcxproj.filters
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{7748a821-40c1-4432-a07e-ff4da1273091}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{bd48cc48-7a79-4088-9e3f-8bf123692891}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="loadlib\adt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dbcfile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="loadlib\loadlib.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="system.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="loadlib\wdt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="loadlib\adt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dbcfile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="loadlib\loadlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="loadlib\wdt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC110/realmd.vcxproj b/win/VC110/realmd.vcxproj
deleted file mode 100644
index d86dafc15..000000000
--- a/win/VC110/realmd.vcxproj
+++ /dev/null
@@ -1,468 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{563E9905-3657-460C-AE63-0AC39D162E23}</ProjectGUID>
-    <RootNamespace>realmd</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\realmd__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\realmd__$(Platform)_$(Configuration)\realmd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\realmd__$(Platform)_$(Configuration)\realmd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\realmd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\realmd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\realmd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\realmd__$(Platform)_$(Configuration)\realmd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\realmd__$(Platform)_$(Configuration)\realmd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\realmd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\realmd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\realmd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\realmd__$(Platform)_$(Configuration)\realmd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\realmd__$(Platform)_$(Configuration)\realmd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\realmd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\realmd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\realmd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\realmd__$(Platform)_$(Configuration)\realmd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\realmd__$(Platform)_$(Configuration)\realmd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\realmd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\realmd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\realmd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_$(Configuration);.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <Midl>
-      <TypeLibraryName>.\realmd__$(Platform)_$(Configuration)\realmd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\realmd__$(Platform)_$(Configuration)\realmd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\realmd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\realmd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\realmd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\realmd__$(Platform)_$(Configuration)\realmd.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>VERSION="0.18";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeaderOutputFile>.\realmd__$(Platform)_$(Configuration)\realmd.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\realmd__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\realmd__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\realmd__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;advapi32.lib;dbghelp.lib;framework.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Version>
-      </Version>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\dep\lib\$(Platform)_debug;.\framework__$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <MapFileName>$(TargetDir)$(TargetName).map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy ..\..\src\realmd\realmd.conf.dist.in ..\..\bin\$(Platform)_$(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\realmd\AuthCodes.h" />
-    <ClInclude Include="..\..\src\realmd\AuthSocket.h" />
-    <ClInclude Include="..\..\src\realmd\BufferedSocket.h" />
-    <ClInclude Include="..\..\src\realmd\PatchHandler.h" />
-    <ClInclude Include="..\..\src\realmd\RealmList.h" />
-    <ClInclude Include="..\..\src\shared\WheatyExceptionReport.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\realmd\AuthSocket.cpp" />
-    <ClCompile Include="..\..\src\realmd\BufferedSocket.cpp" />
-    <ClCompile Include="..\..\src\realmd\Main.cpp" />
-    <ClCompile Include="..\..\src\realmd\PatchHandler.cpp" />
-    <ClCompile Include="..\..\src\realmd\RealmList.cpp" />
-    <ClCompile Include="..\..\src\shared\WheatyExceptionReport.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\src\realmd\realmd.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="shared.vcxproj">
-      <Project>{90297c34-f231-4df4-848e-a74bcc0e40ed}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC110/script.vcxproj b/win/VC110/script.vcxproj
deleted file mode 100644
index 60b286254..000000000
--- a/win/VC110/script.vcxproj
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{4205C8A9-79B7-4354-8064-F05FB9CA0C96}</ProjectGUID>
-    <RootNamespace>script</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\bin\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\script__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;aced.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_$(Configuration);.\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;aced.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_$(Configuration);.\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;ace.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;ace.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;aced.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>mangosd.lib;zlib.lib;libmySQL.lib;libeay32.lib;ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;aced.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>.\mangosd__$(Platform)_$(Configuration);.\zlib__$(Platform)_$(Configuration);..\..\dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)mangosscript.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\bindings\universal\config.h" />
-    <ClInclude Include="..\..\src\bindings\universal\ScriptMgr.h" />
-    <ClInclude Include="..\..\src\bindings\universal\Scripts\sc_defines.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\bindings\universal\ScriptMgr.cpp" />
-    <ClCompile Include="..\..\src\bindings\universal\Scripts\sc_default.cpp" />
-    <ClCompile Include="..\..\src\bindings\universal\Scripts\sc_defines.cpp" />
-    <ClCompile Include="..\..\src\bindings\universal\system.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="mangosd.vcxproj">
-      <Project>{a3a04e47-43a2-4c08-90b3-029cef558594}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win/VC110/shared.vcxproj b/win/VC110/shared.vcxproj
deleted file mode 100644
index fce765a5d..000000000
--- a/win/VC110/shared.vcxproj
+++ /dev/null
@@ -1,518 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{90297C34-F231-4DF4-848E-A74BCC0E40ED}</ProjectGUID>
-    <RootNamespace>shared</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\shared__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\shared__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\shared__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\shared__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\shared__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\shared__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\shared__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\shared__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\shared__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\shared__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\shared__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\shared__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.lib</TargetExt>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\shared__$(Platform)_$(Configuration)/shared.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\shared__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\shared__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\shared__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\shared__$(Platform)_$(Configuration)/shared.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\shared__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\shared__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\shared__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\shared__$(Platform)_$(Configuration)\shared.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\shared__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\shared__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\shared__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\shared__$(Platform)_$(Configuration)\shared.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\shared__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\shared__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\shared__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\shared__$(Platform)_$(Configuration)\shared.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\shared__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\shared__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\shared__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\shared__$(Platform)_$(Configuration)\shared.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\shared__$(Platform)_$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\shared__$(Platform)_$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>.\shared__$(Platform)_$(Configuration)\</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\src\shared\revision.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Extract revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(SolutionDir)..\src\shared"
-"$(TargetDir)..\genrevision__$(Platform)_$(Configuration)\genrevision.exe" "..\.."
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Extract revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">cd "$(SolutionDir)..\src\shared"
-"$(TargetDir)..\genrevision__Win32_$(Configuration)\genrevision.exe" "..\.."
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Extract revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(SolutionDir)..\src\shared"
-"$(TargetDir)..\genrevision__$(Platform)_$(Configuration)\genrevision.exe" "..\.."
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Extract revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">cd "$(SolutionDir)..\src\shared"
-"$(TargetDir)..\genrevision__Win32_$(Configuration)\genrevision.exe" "..\.."
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">Extract revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">cd "$(SolutionDir)..\src\shared"
-"$(TargetDir)..\genrevision__$(Platform)_$(Configuration)\genrevision.exe" "..\.."
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">revision.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">Extract revision</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">cd "$(SolutionDir)..\src\shared"
-"$(TargetDir)..\genrevision__Win32_$(Configuration)\genrevision.exe" "..\.."
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">$(SolutionDir)../.svn/entries;$(SolutionDir)../_svn/entries;$(SolutionDir)../.git/FETCH_HEAD;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">revision.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\src\shared\SystemConfig.h.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|X64'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|X64'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">Performing Build SystemConfig.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">..\..\src\shared\SystemConfig.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\shared\Auth\AuthCrypt.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\BigNumber.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\HMACSHA1.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\md5.c" />
-    <ClCompile Include="..\..\src\shared\Auth\SARC4.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\Sha1.cpp" />
-    <ClCompile Include="..\..\src\shared\ByteBuffer.cpp" />
-    <ClCompile Include="..\..\src\shared\Common.cpp" />
-    <ClCompile Include="..\..\src\shared\Config\Config.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\Database.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\DatabaseMysql.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\DB2FileLoader.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\DBCFileLoader.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\Field.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\QueryResultMysql.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlDelayThread.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlOperations.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlPreparedStatement.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SQLStorage.cpp" />
-    <ClCompile Include="..\..\src\shared\Log.cpp" />
-    <ClCompile Include="..\..\src\shared\ProgressBar.cpp" />
-    <ClCompile Include="..\..\src\shared\ServiceWin32.cpp" />
-    <ClCompile Include="..\..\src\shared\Threading.cpp" />
-    <ClCompile Include="..\..\src\shared\Util.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\include\mersennetwister\MersenneTwister.h" />
-    <ClInclude Include="..\..\src\shared\Auth\AuthCrypt.h" />
-    <ClInclude Include="..\..\src\shared\Auth\BigNumber.h" />
-    <ClInclude Include="..\..\src\shared\Auth\HMACSHA1.h" />
-    <ClInclude Include="..\..\src\shared\Auth\md5.h" />
-    <ClInclude Include="..\..\src\shared\Auth\SARC4.h" />
-    <ClInclude Include="..\..\src\shared\Auth\Sha1.h" />
-    <ClInclude Include="..\..\src\shared\ByteBuffer.h" />
-    <ClInclude Include="..\..\src\shared\Database\DB2FileLoader.h" />
-    <ClInclude Include="..\..\src\shared\Database\DB2Store.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlPreparedStatement.h" />
-    <ClInclude Include="..\..\src\shared\WorldPacket.h" />
-    <ClInclude Include="..\..\src\shared\Common.h" />
-    <ClInclude Include="..\..\src\shared\Config\Config.h" />
-    <ClInclude Include="..\..\src\shared\Database\Database.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabaseEnv.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabaseImpl.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabaseMysql.h" />
-    <ClInclude Include="..\..\src\shared\Database\DBCFileLoader.h" />
-    <ClInclude Include="..\..\src\shared\Database\DBCStore.h" />
-    <ClInclude Include="..\..\src\shared\Database\Field.h" />
-    <ClInclude Include="..\..\src\shared\Database\QueryResult.h" />
-    <ClInclude Include="..\..\src\shared\Database\QueryResultMysql.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlDelayThread.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlOperations.h" />
-    <ClInclude Include="..\..\src\shared\Database\SQLStorage.h" />
-    <ClInclude Include="..\..\src\shared\Database\SQLStorageImpl.h" />
-    <ClInclude Include="..\..\src\shared\Errors.h" />
-    <ClInclude Include="..\..\src\shared\LockedQueue.h" />
-    <ClInclude Include="..\..\src\shared\Log.h" />
-    <ClInclude Include="..\..\src\shared\ProgressBar.h" />
-    <ClInclude Include="..\..\src\shared\revision_nr.h" />
-    <ClInclude Include="..\..\src\shared\revision_sql.h" />
-    <ClInclude Include="..\..\src\shared\ServiceWin32.h" />
-    <ClInclude Include="..\..\src\shared\Threading.h" />
-    <ClInclude Include="..\..\src\shared\Timer.h" />
-    <ClInclude Include="..\..\src\shared\Util.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="ACE_vc11.vcxproj">
-      <Project>{bd537c9a-feca-1bad-6757-8a6348ea12c8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="framework.vcxproj">
-      <Project>{bf6f5d0e-33a5-4e23-9e7d-dd481b7b5b9e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="genrevision.vcxproj">
-      <Project>{803f488e-4c5a-4866-8d5c-1e6c03c007c2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="zlib.vcxproj">
-      <Project>{8f1dea42-6a5b-4b62-839d-c141a7bfacf2}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC110/zlib.vcxproj b/win/VC110/zlib.vcxproj
deleted file mode 100644
index 0a84a3e1d..000000000
--- a/win/VC110/zlib.vcxproj
+++ /dev/null
@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|Win32">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_NoPCH|x64">
-      <Configuration>Debug_NoPCH</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}</ProjectGUID>
-    <RootNamespace>zlib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\zlib__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\zlib__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\zlib__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.\zlib__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\zlib__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\zlib__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\zlib__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.\zlib__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|X64'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|X64'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\zlib__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.\zlib__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\zlib__$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.\zlib__$(Platform)_$(Configuration)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">.lib</TargetExt>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\zlib__$(Platform)_$(Configuration)\zlib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\zlib__$(Platform)_$(Configuration)\zlib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\zlib__$(Platform)_$(Configuration)\zlib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\zlib__$(Platform)_$(Configuration)\zlib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\zlib__$(Platform)_$(Configuration)\zlib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|X64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\zlib__$(Platform)_$(Configuration)\zlib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\src\zlib\crc32.h" />
-    <ClInclude Include="..\..\dep\src\zlib\deflate.h" />
-    <ClInclude Include="..\..\dep\src\zlib\inffast.h" />
-    <ClInclude Include="..\..\dep\src\zlib\inffixed.h" />
-    <ClInclude Include="..\..\dep\src\zlib\inflate.h" />
-    <ClInclude Include="..\..\dep\src\zlib\inftrees.h" />
-    <ClInclude Include="..\..\dep\src\zlib\trees.h" />
-    <ClInclude Include="..\..\dep\src\zlib\zconf.h" />
-    <ClInclude Include="..\..\dep\src\zlib\zlib.h" />
-    <ClInclude Include="..\..\dep\src\zlib\zutil.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\zlib\adler32.c" />
-    <ClCompile Include="..\..\dep\src\zlib\compress.c" />
-    <ClCompile Include="..\..\dep\src\zlib\crc32.c" />
-    <ClCompile Include="..\..\dep\src\zlib\deflate.c" />
-    <ClCompile Include="..\..\dep\src\zlib\example.c" />
-    <ClCompile Include="..\..\dep\src\zlib\gzio.c" />
-    <ClCompile Include="..\..\dep\src\zlib\infback.c" />
-    <ClCompile Include="..\..\dep\src\zlib\inffast.c" />
-    <ClCompile Include="..\..\dep\src\zlib\inflate.c" />
-    <ClCompile Include="..\..\dep\src\zlib\inftrees.c" />
-    <ClCompile Include="..\..\dep\src\zlib\trees.c" />
-    <ClCompile Include="..\..\dep\src\zlib\uncompr.c" />
-    <ClCompile Include="..\..\dep\src\zlib\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/.gitignore b/win/VC120/.gitignore
deleted file mode 100644
index 05055642f..000000000
--- a/win/VC120/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git-ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# Special folder that is created by the ReSharper Visual Studio Addon
-#
-
-_ReSharper*
-*_dir
-Release
-Debug
\ No newline at end of file
diff --git a/win/VC120/CopySystemConfig.vcxproj b/win/VC120/CopySystemConfig.vcxproj
deleted file mode 100644
index 929c310a5..000000000
--- a/win/VC120/CopySystemConfig.vcxproj
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A2F9FB91-326B-4214-A988-AA1832D590CE}</ProjectGuid>
-    <RootNamespace>CopySystemconfig</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>$(Configuration)\_temp\</IntDir>
-    <OutDir>$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\_temp\CopySystemConfig\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PreBuildEvent>
-      <Command>copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h</Command>
-    </PreBuildEvent>
-    <PreBuildEvent>
-      <Message>Copying SystemConfig.h.in as systemConfig.h</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <PreBuildEvent>
-      <Command>copy ..\..\src\shared\SystemConfig.h.in ..\..\src\shared\SystemConfig.h</Command>
-    </PreBuildEvent>
-    <PreBuildEvent>
-      <Message>Copying SystemConfig.h.in as systemConfig.h</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/CopytoOutput.vcxproj b/win/VC120/CopytoOutput.vcxproj
deleted file mode 100644
index 8a830be78..000000000
--- a/win/VC120/CopytoOutput.vcxproj
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}</ProjectGuid>
-    <RootNamespace>CopytoOutput</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IntDir>$(Configuration)\_temp\</IntDir>
-    <OutDir>$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\_temp\CopytoOutput\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\copyfiles.cmd "$(SolutionDir)VC120" ..\..\build\bin $(Configuration) $(Platform)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copy Files to output folder</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <PostBuildEvent>
-      <Command>..\copyfiles.cmd "$(SolutionDir)VC120" ..\..\build\bin $(Configuration) $(Platform)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copy Files to output folder</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/LuaEngine.vcxproj b/win/VC120/LuaEngine.vcxproj
deleted file mode 100644
index 6dace124d..000000000
--- a/win/VC120/LuaEngine.vcxproj
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{61BCE72F-B726-48F3-9D02-7FD551F82DF8}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>LuaEngine</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\luaengine\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">LuaEngine</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\luaengine\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">LuaEngine</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\dep\zlib;..\..\dep\lualib;..\..\dep\acelite;..\..\dep\include\mysql;..\..\dep\include\openssl;..\..\src\shared;..\..\src\framework;..\..\src\framework\Platform;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\vmap;..\..\src\game\MotionGenerators;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\WorldHandlers;..\..\src\game\Object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\dep\zlib;..\..\dep\lualib;..\..\dep\acelite;..\..\dep\include\mysql;..\..\dep\include\openssl;..\..\src\shared;..\..\src\framework;..\..\src\framework\Platform;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\vmap;..\..\src\game\MotionGenerators;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\WorldHandlers;..\..\src\game\Object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\dep\zlib;..\..\dep\lualib;..\..\dep\acelite;..\..\dep\include\mysql;..\..\dep\include\openssl;..\..\src\shared;..\..\src\framework;..\..\src\framework\Platform;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\vmap;..\..\src\game\MotionGenerators;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\WorldHandlers;..\..\src\game\Object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\dep\zlib;..\..\dep\lualib;..\..\dep\acelite;..\..\dep\include\mysql;..\..\dep\include\openssl;..\..\src\shared;..\..\src\framework;..\..\src\framework\Platform;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\vmap;..\..\src\game\MotionGenerators;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\WorldHandlers;..\..\src\game\Object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\dep\zlib;..\..\dep\lualib;..\..\dep\acelite;..\..\dep\include\mysql;..\..\dep\include\openssl;..\..\src\shared;..\..\src\framework;..\..\src\framework\Platform;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\vmap;..\..\src\game\MotionGenerators;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\WorldHandlers;..\..\src\game\Object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\dep\zlib;..\..\dep\lualib;..\..\dep\acelite;..\..\dep\include\mysql;..\..\dep\include\openssl;..\..\src\shared;..\..\src\framework;..\..\src\framework\Platform;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\vmap;..\..\src\game\MotionGenerators;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\WorldHandlers;..\..\src\game\Object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\shared\Common.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\AuraMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\BattleGroundMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\CorpseMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\CreatureMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ElunaBinding.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ElunaEventMgr.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ElunaIncludes.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ElunaQueryMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ElunaTemplate.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ElunaUtility.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\GameObjectMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\GlobalMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\GroupMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\GuildMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\HookMgr.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ItemMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\LuaEngine.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\MapMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\ObjectMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\PlayerMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\QuestMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\SpellMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\UnitMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\VehicleMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\WeatherMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\WorldObjectMethods.h" />
-    <ClInclude Include="..\..\src\modules\Eluna\WorldPacketMethods.h" />
-    <ClCompile Include="..\..\src\modules\Eluna\ElunaEventMgr.cpp" />
-    <ClCompile Include="..\..\src\modules\Eluna\ElunaUtility.cpp" />
-    <ClCompile Include="..\..\src\modules\Eluna\HookMgr.cpp" />
-    <ClCompile Include="..\..\src\modules\Eluna\LuaEngine.cpp" />
-    <ClCompile Include="..\..\src\modules\Eluna\LuaFunctions.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/Release/_temp/Ace/ACE.obj b/win/VC120/Release/_temp/Ace/ACE.obj
deleted file mode 100644
index d7bc0ac49..000000000
Binary files a/win/VC120/Release/_temp/Ace/ACE.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/ACE_crc32.obj b/win/VC120/Release/_temp/Ace/ACE_crc32.obj
deleted file mode 100644
index 11c41d877..000000000
Binary files a/win/VC120/Release/_temp/Ace/ACE_crc32.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/ACE_crc_ccitt.obj b/win/VC120/Release/_temp/Ace/ACE_crc_ccitt.obj
deleted file mode 100644
index 5a008a5a6..000000000
Binary files a/win/VC120/Release/_temp/Ace/ACE_crc_ccitt.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/ATM_Acceptor.obj b/win/VC120/Release/_temp/Ace/ATM_Acceptor.obj
deleted file mode 100644
index 051d120d0..000000000
Binary files a/win/VC120/Release/_temp/Ace/ATM_Acceptor.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/ATM_Addr.obj b/win/VC120/Release/_temp/Ace/ATM_Addr.obj
deleted file mode 100644
index da9e589ae..000000000
Binary files a/win/VC120/Release/_temp/Ace/ATM_Addr.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/ATM_Connector.obj b/win/VC120/Release/_temp/Ace/ATM_Connector.obj
deleted file mode 100644
index a1b306c52..000000000
Binary files a/win/VC120/Release/_temp/Ace/ATM_Connector.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/ATM_Params.obj b/win/VC120/Release/_temp/Ace/ATM_Params.obj
deleted file mode 100644
index f0668c1f6..000000000
Binary files a/win/VC120/Release/_temp/Ace/ATM_Params.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/ATM_QoS.obj b/win/VC120/Release/_temp/Ace/ATM_QoS.obj
deleted file mode 100644
index 16636df85..000000000
Binary files a/win/VC120/Release/_temp/Ace/ATM_QoS.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/ATM_Stream.obj b/win/VC120/Release/_temp/Ace/ATM_Stream.obj
deleted file mode 100644
index 31431aa54..000000000
Binary files a/win/VC120/Release/_temp/Ace/ATM_Stream.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Activation_Queue.obj b/win/VC120/Release/_temp/Ace/Activation_Queue.obj
deleted file mode 100644
index 6ce546921..000000000
Binary files a/win/VC120/Release/_temp/Ace/Activation_Queue.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Active_Map_Manager.obj b/win/VC120/Release/_temp/Ace/Active_Map_Manager.obj
deleted file mode 100644
index eeb37685b..000000000
Binary files a/win/VC120/Release/_temp/Ace/Active_Map_Manager.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Addr.obj b/win/VC120/Release/_temp/Ace/Addr.obj
deleted file mode 100644
index 2b1afe411..000000000
Binary files a/win/VC120/Release/_temp/Ace/Addr.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Argv_Type_Converter.obj b/win/VC120/Release/_temp/Ace/Argv_Type_Converter.obj
deleted file mode 100644
index 79d130b24..000000000
Binary files a/win/VC120/Release/_temp/Ace/Argv_Type_Converter.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Assert.obj b/win/VC120/Release/_temp/Ace/Assert.obj
deleted file mode 100644
index 3b1eb97b8..000000000
Binary files a/win/VC120/Release/_temp/Ace/Assert.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Asynch_IO.obj b/win/VC120/Release/_temp/Ace/Asynch_IO.obj
deleted file mode 100644
index 3974ae698..000000000
Binary files a/win/VC120/Release/_temp/Ace/Asynch_IO.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Asynch_IO_Impl.obj b/win/VC120/Release/_temp/Ace/Asynch_IO_Impl.obj
deleted file mode 100644
index 349e42a17..000000000
Binary files a/win/VC120/Release/_temp/Ace/Asynch_IO_Impl.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Asynch_Pseudo_Task.obj b/win/VC120/Release/_temp/Ace/Asynch_Pseudo_Task.obj
deleted file mode 100644
index 571a5153a..000000000
Binary files a/win/VC120/Release/_temp/Ace/Asynch_Pseudo_Task.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Atomic_Op.obj b/win/VC120/Release/_temp/Ace/Atomic_Op.obj
deleted file mode 100644
index c21535500..000000000
Binary files a/win/VC120/Release/_temp/Ace/Atomic_Op.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Atomic_Op_Sparc.obj b/win/VC120/Release/_temp/Ace/Atomic_Op_Sparc.obj
deleted file mode 100644
index b412ad446..000000000
Binary files a/win/VC120/Release/_temp/Ace/Atomic_Op_Sparc.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Auto_Event.obj b/win/VC120/Release/_temp/Ace/Auto_Event.obj
deleted file mode 100644
index 6fb93fae5..000000000
Binary files a/win/VC120/Release/_temp/Ace/Auto_Event.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Barrier.obj b/win/VC120/Release/_temp/Ace/Barrier.obj
deleted file mode 100644
index cd1f73b27..000000000
Binary files a/win/VC120/Release/_temp/Ace/Barrier.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Base_Thread_Adapter.obj b/win/VC120/Release/_temp/Ace/Base_Thread_Adapter.obj
deleted file mode 100644
index 172fb18cc..000000000
Binary files a/win/VC120/Release/_temp/Ace/Base_Thread_Adapter.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Based_Pointer_Repository.obj b/win/VC120/Release/_temp/Ace/Based_Pointer_Repository.obj
deleted file mode 100644
index 3ee2166d6..000000000
Binary files a/win/VC120/Release/_temp/Ace/Based_Pointer_Repository.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Basic_Stats.obj b/win/VC120/Release/_temp/Ace/Basic_Stats.obj
deleted file mode 100644
index d1f6c7b42..000000000
Binary files a/win/VC120/Release/_temp/Ace/Basic_Stats.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Basic_Types.obj b/win/VC120/Release/_temp/Ace/Basic_Types.obj
deleted file mode 100644
index 59d2bc398..000000000
Binary files a/win/VC120/Release/_temp/Ace/Basic_Types.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/CDR_Base.obj b/win/VC120/Release/_temp/Ace/CDR_Base.obj
deleted file mode 100644
index 45c45d907..000000000
Binary files a/win/VC120/Release/_temp/Ace/CDR_Base.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/CDR_Size.obj b/win/VC120/Release/_temp/Ace/CDR_Size.obj
deleted file mode 100644
index 4eb3c1872..000000000
Binary files a/win/VC120/Release/_temp/Ace/CDR_Size.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/CDR_Stream.obj b/win/VC120/Release/_temp/Ace/CDR_Stream.obj
deleted file mode 100644
index 0ec83cdf4..000000000
Binary files a/win/VC120/Release/_temp/Ace/CDR_Stream.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Capabilities.obj b/win/VC120/Release/_temp/Ace/Capabilities.obj
deleted file mode 100644
index d0968c581..000000000
Binary files a/win/VC120/Release/_temp/Ace/Capabilities.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Cleanup.obj b/win/VC120/Release/_temp/Ace/Cleanup.obj
deleted file mode 100644
index 0f60e7c8e..000000000
Binary files a/win/VC120/Release/_temp/Ace/Cleanup.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Codecs.obj b/win/VC120/Release/_temp/Ace/Codecs.obj
deleted file mode 100644
index 4d26712d9..000000000
Binary files a/win/VC120/Release/_temp/Ace/Codecs.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Codeset_IBM1047.obj b/win/VC120/Release/_temp/Ace/Codeset_IBM1047.obj
deleted file mode 100644
index f8189ec8d..000000000
Binary files a/win/VC120/Release/_temp/Ace/Codeset_IBM1047.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Codeset_Registry.obj b/win/VC120/Release/_temp/Ace/Codeset_Registry.obj
deleted file mode 100644
index 84210b246..000000000
Binary files a/win/VC120/Release/_temp/Ace/Codeset_Registry.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Codeset_Registry_db.obj b/win/VC120/Release/_temp/Ace/Codeset_Registry_db.obj
deleted file mode 100644
index a76b78e32..000000000
Binary files a/win/VC120/Release/_temp/Ace/Codeset_Registry_db.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Condition_Attributes.obj b/win/VC120/Release/_temp/Ace/Condition_Attributes.obj
deleted file mode 100644
index 253be6a63..000000000
Binary files a/win/VC120/Release/_temp/Ace/Condition_Attributes.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Condition_Recursive_Thread_Mutex.obj b/win/VC120/Release/_temp/Ace/Condition_Recursive_Thread_Mutex.obj
deleted file mode 100644
index d1ef1f4b7..000000000
Binary files a/win/VC120/Release/_temp/Ace/Condition_Recursive_Thread_Mutex.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Condition_Thread_Mutex.obj b/win/VC120/Release/_temp/Ace/Condition_Thread_Mutex.obj
deleted file mode 100644
index f8e3db29d..000000000
Binary files a/win/VC120/Release/_temp/Ace/Condition_Thread_Mutex.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/Connection_Recycling_Strategy.obj b/win/VC120/Release/_temp/Ace/Connection_Recycling_Strategy.obj
deleted file mode 100644
index d67c4055a..000000000
Binary files a/win/VC120/Release/_temp/Ace/Connection_Recycling_Strategy.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/ace.tlog/CL.read.1.tlog b/win/VC120/Release/_temp/Ace/ace.tlog/CL.read.1.tlog
deleted file mode 100644
index 516ad7ec5..000000000
Binary files a/win/VC120/Release/_temp/Ace/ace.tlog/CL.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/ace.tlog/CL.write.1.tlog b/win/VC120/Release/_temp/Ace/ace.tlog/CL.write.1.tlog
deleted file mode 100644
index 43fc7dd92..000000000
Binary files a/win/VC120/Release/_temp/Ace/ace.tlog/CL.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/ace.tlog/ace.lastbuildstate b/win/VC120/Release/_temp/Ace/ace.tlog/ace.lastbuildstate
deleted file mode 100644
index c7eefe6db..000000000
--- a/win/VC120/Release/_temp/Ace/ace.tlog/ace.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|F:\Projects\@Mangos\Repos\serverThree\win\|
diff --git a/win/VC120/Release/_temp/Ace/ace.tlog/cl.command.1.tlog b/win/VC120/Release/_temp/Ace/ace.tlog/cl.command.1.tlog
deleted file mode 100644
index 418871ed7..000000000
Binary files a/win/VC120/Release/_temp/Ace/ace.tlog/cl.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/Ace/ace.tlog/unsuccessfulbuild b/win/VC120/Release/_temp/Ace/ace.tlog/unsuccessfulbuild
deleted file mode 100644
index e69de29bb..000000000
diff --git a/win/VC120/Release/_temp/Ace/ace_wchar.obj b/win/VC120/Release/_temp/Ace/ace_wchar.obj
deleted file mode 100644
index 037af8fd2..000000000
Binary files a/win/VC120/Release/_temp/Ace/ace_wchar.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/CopySystemConfig/CopySystemConfig.tlog/CopySystemConfig.lastbuildstate b/win/VC120/Release/_temp/CopySystemConfig/CopySystemConfig.tlog/CopySystemConfig.lastbuildstate
deleted file mode 100644
index c7eefe6db..000000000
--- a/win/VC120/Release/_temp/CopySystemConfig/CopySystemConfig.tlog/CopySystemConfig.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|F:\Projects\@Mangos\Repos\serverThree\win\|
diff --git a/win/VC120/Release/_temp/bzip2/bzip2.tlog/unsuccessfulbuild b/win/VC120/Release/_temp/bzip2/bzip2.tlog/unsuccessfulbuild
deleted file mode 100644
index e69de29bb..000000000
diff --git a/win/VC120/Release/_temp/detour/DetourAlloc.obj b/win/VC120/Release/_temp/detour/DetourAlloc.obj
deleted file mode 100644
index 540a1ea9e..000000000
Binary files a/win/VC120/Release/_temp/detour/DetourAlloc.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/detour/DetourCommon.obj b/win/VC120/Release/_temp/detour/DetourCommon.obj
deleted file mode 100644
index 8feef3ebe..000000000
Binary files a/win/VC120/Release/_temp/detour/DetourCommon.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/detour/DetourNavMesh.obj b/win/VC120/Release/_temp/detour/DetourNavMesh.obj
deleted file mode 100644
index e18fbcc23..000000000
Binary files a/win/VC120/Release/_temp/detour/DetourNavMesh.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/detour/DetourNavMeshBuilder.obj b/win/VC120/Release/_temp/detour/DetourNavMeshBuilder.obj
deleted file mode 100644
index 813cb209a..000000000
Binary files a/win/VC120/Release/_temp/detour/DetourNavMeshBuilder.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/detour/DetourNavMeshQuery.obj b/win/VC120/Release/_temp/detour/DetourNavMeshQuery.obj
deleted file mode 100644
index 8b036b46e..000000000
Binary files a/win/VC120/Release/_temp/detour/DetourNavMeshQuery.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/detour/DetourNode.obj b/win/VC120/Release/_temp/detour/DetourNode.obj
deleted file mode 100644
index 1805deabb..000000000
Binary files a/win/VC120/Release/_temp/detour/DetourNode.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/detour/detour.tlog/CL.read.1.tlog b/win/VC120/Release/_temp/detour/detour.tlog/CL.read.1.tlog
deleted file mode 100644
index f3db23322..000000000
Binary files a/win/VC120/Release/_temp/detour/detour.tlog/CL.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/detour/detour.tlog/CL.write.1.tlog b/win/VC120/Release/_temp/detour/detour.tlog/CL.write.1.tlog
deleted file mode 100644
index a6876830b..000000000
Binary files a/win/VC120/Release/_temp/detour/detour.tlog/CL.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/detour/detour.tlog/Lib-link.read.1.tlog b/win/VC120/Release/_temp/detour/detour.tlog/Lib-link.read.1.tlog
deleted file mode 100644
index 8a29a0a9e..000000000
Binary files a/win/VC120/Release/_temp/detour/detour.tlog/Lib-link.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/detour/detour.tlog/Lib-link.write.1.tlog b/win/VC120/Release/_temp/detour/detour.tlog/Lib-link.write.1.tlog
deleted file mode 100644
index a08bb89e4..000000000
Binary files a/win/VC120/Release/_temp/detour/detour.tlog/Lib-link.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/detour/detour.tlog/cl.command.1.tlog b/win/VC120/Release/_temp/detour/detour.tlog/cl.command.1.tlog
deleted file mode 100644
index bdccfcc18..000000000
Binary files a/win/VC120/Release/_temp/detour/detour.tlog/cl.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/detour/detour.tlog/detour.lastbuildstate b/win/VC120/Release/_temp/detour/detour.tlog/detour.lastbuildstate
deleted file mode 100644
index c7eefe6db..000000000
--- a/win/VC120/Release/_temp/detour/detour.tlog/detour.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|F:\Projects\@Mangos\Repos\serverThree\win\|
diff --git a/win/VC120/Release/_temp/detour/detour.tlog/lib.command.1.tlog b/win/VC120/Release/_temp/detour/detour.tlog/lib.command.1.tlog
deleted file mode 100644
index f79620646..000000000
Binary files a/win/VC120/Release/_temp/detour/detour.tlog/lib.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/g3dlite/AABox.obj b/win/VC120/Release/_temp/g3dlite/AABox.obj
deleted file mode 100644
index 7dfa3c525..000000000
Binary files a/win/VC120/Release/_temp/g3dlite/AABox.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/g3dlite/BinaryFormat.obj b/win/VC120/Release/_temp/g3dlite/BinaryFormat.obj
deleted file mode 100644
index 01e8a9c21..000000000
Binary files a/win/VC120/Release/_temp/g3dlite/BinaryFormat.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/CL.read.1.tlog b/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/CL.read.1.tlog
deleted file mode 100644
index 3ceef2a0b..000000000
Binary files a/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/CL.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/CL.write.1.tlog b/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/CL.write.1.tlog
deleted file mode 100644
index f95a7d6b9..000000000
Binary files a/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/CL.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/cl.command.1.tlog b/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/cl.command.1.tlog
deleted file mode 100644
index 37e7ef7ca..000000000
Binary files a/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/cl.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/g3dlite.lastbuildstate b/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/g3dlite.lastbuildstate
deleted file mode 100644
index c7eefe6db..000000000
--- a/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/g3dlite.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|F:\Projects\@Mangos\Repos\serverThree\win\|
diff --git a/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/unsuccessfulbuild b/win/VC120/Release/_temp/g3dlite/g3dlite.tlog/unsuccessfulbuild
deleted file mode 100644
index e69de29bb..000000000
diff --git a/win/VC120/Release/_temp/genrev/genrev.tlog/CL.read.1.tlog b/win/VC120/Release/_temp/genrev/genrev.tlog/CL.read.1.tlog
deleted file mode 100644
index f7143661f..000000000
Binary files a/win/VC120/Release/_temp/genrev/genrev.tlog/CL.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/genrev/genrev.tlog/CL.write.1.tlog b/win/VC120/Release/_temp/genrev/genrev.tlog/CL.write.1.tlog
deleted file mode 100644
index 486fe4fd4..000000000
Binary files a/win/VC120/Release/_temp/genrev/genrev.tlog/CL.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/genrev/genrev.tlog/cl.command.1.tlog b/win/VC120/Release/_temp/genrev/genrev.tlog/cl.command.1.tlog
deleted file mode 100644
index c71e272ae..000000000
Binary files a/win/VC120/Release/_temp/genrev/genrev.tlog/cl.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/genrev/genrev.tlog/genrev.lastbuildstate b/win/VC120/Release/_temp/genrev/genrev.tlog/genrev.lastbuildstate
deleted file mode 100644
index c7eefe6db..000000000
--- a/win/VC120/Release/_temp/genrev/genrev.tlog/genrev.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|F:\Projects\@Mangos\Repos\serverThree\win\|
diff --git a/win/VC120/Release/_temp/genrev/genrev.tlog/link.command.1.tlog b/win/VC120/Release/_temp/genrev/genrev.tlog/link.command.1.tlog
deleted file mode 100644
index 5f41df473..000000000
Binary files a/win/VC120/Release/_temp/genrev/genrev.tlog/link.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/genrev/genrev.tlog/link.read.1.tlog b/win/VC120/Release/_temp/genrev/genrev.tlog/link.read.1.tlog
deleted file mode 100644
index fd991a3be..000000000
Binary files a/win/VC120/Release/_temp/genrev/genrev.tlog/link.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/genrev/genrev.tlog/link.write.1.tlog b/win/VC120/Release/_temp/genrev/genrev.tlog/link.write.1.tlog
deleted file mode 100644
index 1cd878d4c..000000000
Binary files a/win/VC120/Release/_temp/genrev/genrev.tlog/link.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/genrev/genrevision.obj b/win/VC120/Release/_temp/genrev/genrevision.obj
deleted file mode 100644
index e1c0eac9d..000000000
Binary files a/win/VC120/Release/_temp/genrev/genrevision.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/gsoap/gsoap.tlog/CL.read.1.tlog b/win/VC120/Release/_temp/gsoap/gsoap.tlog/CL.read.1.tlog
deleted file mode 100644
index 03ce86ff1..000000000
Binary files a/win/VC120/Release/_temp/gsoap/gsoap.tlog/CL.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/gsoap/gsoap.tlog/CL.write.1.tlog b/win/VC120/Release/_temp/gsoap/gsoap.tlog/CL.write.1.tlog
deleted file mode 100644
index d0d650d2c..000000000
Binary files a/win/VC120/Release/_temp/gsoap/gsoap.tlog/CL.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/gsoap/gsoap.tlog/Lib-link.read.1.tlog b/win/VC120/Release/_temp/gsoap/gsoap.tlog/Lib-link.read.1.tlog
deleted file mode 100644
index 4297d04a4..000000000
Binary files a/win/VC120/Release/_temp/gsoap/gsoap.tlog/Lib-link.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/gsoap/gsoap.tlog/Lib-link.write.1.tlog b/win/VC120/Release/_temp/gsoap/gsoap.tlog/Lib-link.write.1.tlog
deleted file mode 100644
index d10b23d16..000000000
Binary files a/win/VC120/Release/_temp/gsoap/gsoap.tlog/Lib-link.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/gsoap/gsoap.tlog/cl.command.1.tlog b/win/VC120/Release/_temp/gsoap/gsoap.tlog/cl.command.1.tlog
deleted file mode 100644
index 6d5fed454..000000000
Binary files a/win/VC120/Release/_temp/gsoap/gsoap.tlog/cl.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/gsoap/gsoap.tlog/gsoap.lastbuildstate b/win/VC120/Release/_temp/gsoap/gsoap.tlog/gsoap.lastbuildstate
deleted file mode 100644
index c7eefe6db..000000000
--- a/win/VC120/Release/_temp/gsoap/gsoap.tlog/gsoap.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|F:\Projects\@Mangos\Repos\serverThree\win\|
diff --git a/win/VC120/Release/_temp/gsoap/gsoap.tlog/lib.command.1.tlog b/win/VC120/Release/_temp/gsoap/gsoap.tlog/lib.command.1.tlog
deleted file mode 100644
index c0c2ba7dd..000000000
Binary files a/win/VC120/Release/_temp/gsoap/gsoap.tlog/lib.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/gsoap/stdsoap2.obj b/win/VC120/Release/_temp/gsoap/stdsoap2.obj
deleted file mode 100644
index 07bb68490..000000000
Binary files a/win/VC120/Release/_temp/gsoap/stdsoap2.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/loadlib/loadlib.tlog/cl.command.1.tlog b/win/VC120/Release/_temp/loadlib/loadlib.tlog/cl.command.1.tlog
deleted file mode 100644
index e2d9a5d29..000000000
Binary files a/win/VC120/Release/_temp/loadlib/loadlib.tlog/cl.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/loadlib/loadlib.tlog/loadlib.lastbuildstate b/win/VC120/Release/_temp/loadlib/loadlib.tlog/loadlib.lastbuildstate
deleted file mode 100644
index c7eefe6db..000000000
--- a/win/VC120/Release/_temp/loadlib/loadlib.tlog/loadlib.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|F:\Projects\@Mangos\Repos\serverThree\win\|
diff --git a/win/VC120/Release/_temp/loadlib/loadlib.tlog/unsuccessfulbuild b/win/VC120/Release/_temp/loadlib/loadlib.tlog/unsuccessfulbuild
deleted file mode 100644
index e69de29bb..000000000
diff --git a/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/CL.read.1.tlog b/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/CL.read.1.tlog
deleted file mode 100644
index 5a4ee3e18..000000000
Binary files a/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/CL.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/CL.write.1.tlog b/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/CL.write.1.tlog
deleted file mode 100644
index a2291195b..000000000
Binary files a/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/CL.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/LuaEngine.lastbuildstate b/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/LuaEngine.lastbuildstate
deleted file mode 100644
index c7eefe6db..000000000
--- a/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/LuaEngine.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|F:\Projects\@Mangos\Repos\serverThree\win\|
diff --git a/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/cl.command.1.tlog b/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/cl.command.1.tlog
deleted file mode 100644
index 007ae7368..000000000
Binary files a/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/cl.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/unsuccessfulbuild b/win/VC120/Release/_temp/luaengine/LuaEngine.tlog/unsuccessfulbuild
deleted file mode 100644
index e69de29bb..000000000
diff --git a/win/VC120/Release/_temp/lualib/lualib.tlog/cl.command.1.tlog b/win/VC120/Release/_temp/lualib/lualib.tlog/cl.command.1.tlog
deleted file mode 100644
index 46b134b19..000000000
--- a/win/VC120/Release/_temp/lualib/lualib.tlog/cl.command.1.tlog
+++ /dev/null
@@ -1 +0,0 @@
-ÿþ
\ No newline at end of file
diff --git a/win/VC120/Release/_temp/lualib/lualib.tlog/lualib.lastbuildstate b/win/VC120/Release/_temp/lualib/lualib.tlog/lualib.lastbuildstate
deleted file mode 100644
index c7eefe6db..000000000
--- a/win/VC120/Release/_temp/lualib/lualib.tlog/lualib.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|F:\Projects\@Mangos\Repos\serverThree\win\|
diff --git a/win/VC120/Release/_temp/lualib/lualib.tlog/unsuccessfulbuild b/win/VC120/Release/_temp/lualib/lualib.tlog/unsuccessfulbuild
deleted file mode 100644
index e69de29bb..000000000
diff --git a/win/VC120/Release/_temp/mangosd/mangosd.tlog/unsuccessfulbuild b/win/VC120/Release/_temp/mangosd/mangosd.tlog/unsuccessfulbuild
deleted file mode 100644
index e69de29bb..000000000
diff --git a/win/VC120/Release/_temp/recast/Recast.obj b/win/VC120/Release/_temp/recast/Recast.obj
deleted file mode 100644
index aadd0b04b..000000000
Binary files a/win/VC120/Release/_temp/recast/Recast.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/RecastAlloc.obj b/win/VC120/Release/_temp/recast/RecastAlloc.obj
deleted file mode 100644
index 4e62f27ab..000000000
Binary files a/win/VC120/Release/_temp/recast/RecastAlloc.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/RecastArea.obj b/win/VC120/Release/_temp/recast/RecastArea.obj
deleted file mode 100644
index cf1326097..000000000
Binary files a/win/VC120/Release/_temp/recast/RecastArea.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/RecastContour.obj b/win/VC120/Release/_temp/recast/RecastContour.obj
deleted file mode 100644
index 76c737cae..000000000
Binary files a/win/VC120/Release/_temp/recast/RecastContour.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/RecastFilter.obj b/win/VC120/Release/_temp/recast/RecastFilter.obj
deleted file mode 100644
index ede20e01b..000000000
Binary files a/win/VC120/Release/_temp/recast/RecastFilter.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/RecastLayers.obj b/win/VC120/Release/_temp/recast/RecastLayers.obj
deleted file mode 100644
index 8dc9c0241..000000000
Binary files a/win/VC120/Release/_temp/recast/RecastLayers.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/RecastMesh.obj b/win/VC120/Release/_temp/recast/RecastMesh.obj
deleted file mode 100644
index eaf564ebe..000000000
Binary files a/win/VC120/Release/_temp/recast/RecastMesh.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/RecastMeshDetail.obj b/win/VC120/Release/_temp/recast/RecastMeshDetail.obj
deleted file mode 100644
index d0bb8a740..000000000
Binary files a/win/VC120/Release/_temp/recast/RecastMeshDetail.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/RecastRasterization.obj b/win/VC120/Release/_temp/recast/RecastRasterization.obj
deleted file mode 100644
index 2cc47b1c4..000000000
Binary files a/win/VC120/Release/_temp/recast/RecastRasterization.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/RecastRegion.obj b/win/VC120/Release/_temp/recast/RecastRegion.obj
deleted file mode 100644
index f3ffabed3..000000000
Binary files a/win/VC120/Release/_temp/recast/RecastRegion.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/recast.tlog/CL.read.1.tlog b/win/VC120/Release/_temp/recast/recast.tlog/CL.read.1.tlog
deleted file mode 100644
index dd1a52986..000000000
Binary files a/win/VC120/Release/_temp/recast/recast.tlog/CL.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/recast.tlog/CL.write.1.tlog b/win/VC120/Release/_temp/recast/recast.tlog/CL.write.1.tlog
deleted file mode 100644
index 95806156c..000000000
Binary files a/win/VC120/Release/_temp/recast/recast.tlog/CL.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/recast.tlog/Lib-link.read.1.tlog b/win/VC120/Release/_temp/recast/recast.tlog/Lib-link.read.1.tlog
deleted file mode 100644
index 746937861..000000000
Binary files a/win/VC120/Release/_temp/recast/recast.tlog/Lib-link.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/recast.tlog/Lib-link.write.1.tlog b/win/VC120/Release/_temp/recast/recast.tlog/Lib-link.write.1.tlog
deleted file mode 100644
index 627cc9ab5..000000000
Binary files a/win/VC120/Release/_temp/recast/recast.tlog/Lib-link.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/recast.tlog/cl.command.1.tlog b/win/VC120/Release/_temp/recast/recast.tlog/cl.command.1.tlog
deleted file mode 100644
index 8afd0218b..000000000
Binary files a/win/VC120/Release/_temp/recast/recast.tlog/cl.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/recast.tlog/lib.command.1.tlog b/win/VC120/Release/_temp/recast/recast.tlog/lib.command.1.tlog
deleted file mode 100644
index 75d08f7a4..000000000
Binary files a/win/VC120/Release/_temp/recast/recast.tlog/lib.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/recast/recast.tlog/recast.lastbuildstate b/win/VC120/Release/_temp/recast/recast.tlog/recast.lastbuildstate
deleted file mode 100644
index c7eefe6db..000000000
--- a/win/VC120/Release/_temp/recast/recast.tlog/recast.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|F:\Projects\@Mangos\Repos\serverThree\win\|
diff --git a/win/VC120/Release/_temp/vmap/vmap.tlog/unsuccessfulbuild b/win/VC120/Release/_temp/vmap/vmap.tlog/unsuccessfulbuild
deleted file mode 100644
index e69de29bb..000000000
diff --git a/win/VC120/Release/_temp/zlib/adler32.obj b/win/VC120/Release/_temp/zlib/adler32.obj
deleted file mode 100644
index 6a8bb5d53..000000000
Binary files a/win/VC120/Release/_temp/zlib/adler32.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/compress.obj b/win/VC120/Release/_temp/zlib/compress.obj
deleted file mode 100644
index 2ba873296..000000000
Binary files a/win/VC120/Release/_temp/zlib/compress.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/crc32.obj b/win/VC120/Release/_temp/zlib/crc32.obj
deleted file mode 100644
index 3ef7445e7..000000000
Binary files a/win/VC120/Release/_temp/zlib/crc32.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/deflate.obj b/win/VC120/Release/_temp/zlib/deflate.obj
deleted file mode 100644
index 2938af0bd..000000000
Binary files a/win/VC120/Release/_temp/zlib/deflate.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/example.obj b/win/VC120/Release/_temp/zlib/example.obj
deleted file mode 100644
index 56f060cb1..000000000
Binary files a/win/VC120/Release/_temp/zlib/example.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/infback.obj b/win/VC120/Release/_temp/zlib/infback.obj
deleted file mode 100644
index f0b7c6f1a..000000000
Binary files a/win/VC120/Release/_temp/zlib/infback.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/inffast.obj b/win/VC120/Release/_temp/zlib/inffast.obj
deleted file mode 100644
index 35332d7d5..000000000
Binary files a/win/VC120/Release/_temp/zlib/inffast.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/inflate.obj b/win/VC120/Release/_temp/zlib/inflate.obj
deleted file mode 100644
index f7656f3c4..000000000
Binary files a/win/VC120/Release/_temp/zlib/inflate.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/inftrees.obj b/win/VC120/Release/_temp/zlib/inftrees.obj
deleted file mode 100644
index 55e6c422a..000000000
Binary files a/win/VC120/Release/_temp/zlib/inftrees.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/trees.obj b/win/VC120/Release/_temp/zlib/trees.obj
deleted file mode 100644
index 531a37abf..000000000
Binary files a/win/VC120/Release/_temp/zlib/trees.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/uncompr.obj b/win/VC120/Release/_temp/zlib/uncompr.obj
deleted file mode 100644
index 11dc82383..000000000
Binary files a/win/VC120/Release/_temp/zlib/uncompr.obj and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/zlib.tlog/CL.read.1.tlog b/win/VC120/Release/_temp/zlib/zlib.tlog/CL.read.1.tlog
deleted file mode 100644
index 79adf042b..000000000
Binary files a/win/VC120/Release/_temp/zlib/zlib.tlog/CL.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/zlib.tlog/CL.write.1.tlog b/win/VC120/Release/_temp/zlib/zlib.tlog/CL.write.1.tlog
deleted file mode 100644
index 7c337f2e7..000000000
Binary files a/win/VC120/Release/_temp/zlib/zlib.tlog/CL.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/zlib.tlog/Lib-link.read.1.tlog b/win/VC120/Release/_temp/zlib/zlib.tlog/Lib-link.read.1.tlog
deleted file mode 100644
index f861d6085..000000000
Binary files a/win/VC120/Release/_temp/zlib/zlib.tlog/Lib-link.read.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/zlib.tlog/Lib-link.write.1.tlog b/win/VC120/Release/_temp/zlib/zlib.tlog/Lib-link.write.1.tlog
deleted file mode 100644
index c360260bc..000000000
Binary files a/win/VC120/Release/_temp/zlib/zlib.tlog/Lib-link.write.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/zlib.tlog/cl.command.1.tlog b/win/VC120/Release/_temp/zlib/zlib.tlog/cl.command.1.tlog
deleted file mode 100644
index 9978f4abb..000000000
Binary files a/win/VC120/Release/_temp/zlib/zlib.tlog/cl.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/zlib.tlog/lib.command.1.tlog b/win/VC120/Release/_temp/zlib/zlib.tlog/lib.command.1.tlog
deleted file mode 100644
index 6b0d3f782..000000000
Binary files a/win/VC120/Release/_temp/zlib/zlib.tlog/lib.command.1.tlog and /dev/null differ
diff --git a/win/VC120/Release/_temp/zlib/zlib.tlog/zlib.lastbuildstate b/win/VC120/Release/_temp/zlib/zlib.tlog/zlib.lastbuildstate
deleted file mode 100644
index c7eefe6db..000000000
--- a/win/VC120/Release/_temp/zlib/zlib.tlog/zlib.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Release|Win32|F:\Projects\@Mangos\Repos\serverThree\win\|
diff --git a/win/VC120/Release/_temp/zlib/zutil.obj b/win/VC120/Release/_temp/zlib/zutil.obj
deleted file mode 100644
index c86fe8365..000000000
Binary files a/win/VC120/Release/_temp/zlib/zutil.obj and /dev/null differ
diff --git a/win/VC120/Release/detour.lib b/win/VC120/Release/detour.lib
deleted file mode 100644
index ebd587d56..000000000
Binary files a/win/VC120/Release/detour.lib and /dev/null differ
diff --git a/win/VC120/Release/genrev.exe b/win/VC120/Release/genrev.exe
deleted file mode 100644
index 3e2da80fe..000000000
Binary files a/win/VC120/Release/genrev.exe and /dev/null differ
diff --git a/win/VC120/Release/gsoap.lib b/win/VC120/Release/gsoap.lib
deleted file mode 100644
index 58c545536..000000000
Binary files a/win/VC120/Release/gsoap.lib and /dev/null differ
diff --git a/win/VC120/Release/recast.lib b/win/VC120/Release/recast.lib
deleted file mode 100644
index 5e97a80dd..000000000
Binary files a/win/VC120/Release/recast.lib and /dev/null differ
diff --git a/win/VC120/Release/zlib.lib b/win/VC120/Release/zlib.lib
deleted file mode 100644
index 4fa83e387..000000000
Binary files a/win/VC120/Release/zlib.lib and /dev/null differ
diff --git a/win/VC120/StormLib.vcxproj b/win/VC120/StormLib.vcxproj
deleted file mode 100644
index 9f543eb14..000000000
--- a/win/VC120/StormLib.vcxproj
+++ /dev/null
@@ -1,696 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugAD|Win32">
-      <Configuration>DebugAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAD|x64">
-      <Configuration>DebugAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|Win32">
-      <Configuration>DebugAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugAS|x64">
-      <Configuration>DebugAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|Win32">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAD|x64">
-      <Configuration>ReleaseAD</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|Win32">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseAS|x64">
-      <Configuration>ReleaseAS</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>StormLib</ProjectName>
-    <ProjectGuid>{78424708-1F6E-4D4B-920C-FB6D26847055}</ProjectGuid>
-    <RootNamespace>StormLib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">$(ProjectName)RAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">$(ProjectName)DAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">$(ProjectName)DAS</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">$(ProjectName)RAD</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">$(ProjectName)RAS</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>..\..\dep\src\stormlib\StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>..\..\dep\src\stormlib\StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>..\..\dep\src\stormlib\StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)DAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>..\..\dep\src\stormlib\StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>..\..\dep\stormlib\StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAD.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>..\..\dep\src\stormlib\StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>..\..\dep\src\stormlib\StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level1</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName)RAS.lib</OutputFile>
-    </Lib>
-    <PostBuildEvent>
-      <Command>..\..\dep\src\stormlib\StormLib.bat $(Platform) $(Configuration)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="doc\History.txt" />
-    <None Include="doc\The MoPaQ File Format 0.9.txt" />
-    <None Include="doc\The MoPaQ File Format 1.0.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\StormLib\src\StormCommon.h" />
-    <ClInclude Include="..\..\dep\StormLib\src\StormLib.h" />
-    <ClInclude Include="..\..\dep\StormLib\src\StormPort.h" />
-    <ClInclude Include="..\..\dep\StormLib\src\adpcm\adpcm.h" />
-    <ClInclude Include="..\..\dep\StormLib\src\huffman\huff.h" />
-    <ClInclude Include="..\..\dep\StormLib\src\pklib\pklib.h" />
-    <ClInclude Include="..\..\dep\StormLib\src\sparse\sparse.h" />
-    <ClInclude Include="..\..\dep\StormLib\src\jenkins\lookup.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\StormLib\src\FileStream.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SBaseCommon.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SBaseFileTable.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SCompression.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SFileAddFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SFileAttributes.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SFileCompactArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SFileCreateArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SFileExtractFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SFileFindFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SFileListFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SFileOpenArchive.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SFileOpenFileEx.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SFilePatchArchives.cpp" />
-    <ClCompile Include="..\..\dep\StormLib\src\SFileReadFile.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\SFileVerify.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='DebugAS|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAD|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseAS|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\StormLib\src\adpcm\adpcm.cpp" />
-    <ClCompile Include="..\..\dep\StormLib\src\bzip2\blocksort.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\bzip2\bzlib.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\bzip2\compress.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\bzip2\crctable.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\bzip2\decompress.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\bzip2\huffman.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\bzip2\randtable.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\huffman\huff.cpp" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\hashes\hash_memory.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\hashes\md5.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\hashes\sha1.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\math\ltm_desc.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\math\multi.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\math\rand_prime.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\base64_decode.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\crypt_argchk.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\crypt_find_hash.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\crypt_find_prng.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\crypt_hash_descriptor.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\crypt_hash_is_valid.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\crypt_libc.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\crypt_ltc_mp_descriptor.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\crypt_prng_descriptor.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\crypt_prng_is_valid.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\crypt_register_hash.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\crypt_register_prng.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\misc\zeromem.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_bit_string.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_boolean.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_choice.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_ia5_string.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_integer.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_object_identifier.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_octet_string.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_printable_string.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_sequence_ex.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_sequence_flexi.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_sequence_multi.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_short_integer.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_utctime.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_length_bit_string.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_length_boolean.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_length_ia5_string.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_length_integer.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_length_object_identifier.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_length_octet_string.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_length_printable_string.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_length_sequence.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_length_short_integer.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_length_utctime.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_length_utf8_string.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\asn1\der_sequence_free.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\ecc\ltc_ecc_map.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\ecc\ltc_ecc_mul2add.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\ecc\ltc_ecc_mulmod.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\ecc\ltc_ecc_points.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_add_point.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\ecc\ltc_ecc_projective_dbl_point.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\pkcs1\pkcs_1_mgf1.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\pkcs1\pkcs_1_oaep_decode.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\rsa\rsa_exptmod.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\rsa\rsa_free.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\rsa\rsa_import.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\rsa\rsa_make_key.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtomcrypt\src\pk\rsa\rsa_verify_simple.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_fast_mp_invmod.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_fast_mp_montgomery_reduce.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_fast_s_mp_mul_digs.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_fast_s_mp_mul_high_digs.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_fast_s_mp_sqr.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_2expt.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_abs.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_add.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_add_d.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_addmod.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_and.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_clamp.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_clear.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_clear_multi.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_cmp.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_cmp_d.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_cmp_mag.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_cnt_lsb.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_copy.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_count_bits.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_div.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_div_2.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_div_2d.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_div_3.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_div_d.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_dr_is_modulus.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_dr_reduce.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_dr_setup.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_exch.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_expt_d.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_exptmod.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_exptmod_fast.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_exteuclid.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_fread.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_fwrite.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_gcd.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_get_int.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_grow.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_init.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_init_copy.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_init_multi.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_init_set.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_init_set_int.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_init_size.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_invmod.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_invmod_slow.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_is_square.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_jacobi.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_karatsuba_mul.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_karatsuba_sqr.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_lcm.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_lshd.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_mod.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_mod_2d.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_mod_d.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_montgomery_calc_normalization.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_montgomery_reduce.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_montgomery_setup.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_mul.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_mul_2.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_mul_2d.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_mul_d.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_mulmod.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_n_root.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_neg.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_or.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_prime_fermat.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_prime_is_divisible.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_prime_is_prime.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_prime_miller_rabin.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_prime_next_prime.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_prime_rabin_miller_trials.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_prime_random_ex.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_radix_size.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_radix_smap.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_rand.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_read_radix.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_read_signed_bin.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_read_unsigned_bin.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_reduce.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_reduce_2k.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_reduce_2k_l.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_reduce_2k_setup.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_reduce_2k_setup_l.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_reduce_is_2k.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_reduce_is_2k_l.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_reduce_setup.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_rshd.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_set.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_set_int.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_shrink.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_signed_bin_size.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_sqr.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_sqrmod.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_sqrt.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_sub.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_sub_d.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_submod.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_to_signed_bin.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_to_signed_bin_n.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_to_unsigned_bin.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_to_unsigned_bin_n.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_toom_mul.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_toom_sqr.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_toradix.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_toradix_n.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_unsigned_bin_size.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_xor.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_mp_zero.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_prime_tab.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_reverse.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_s_mp_add.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_s_mp_exptmod.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_s_mp_mul_digs.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_s_mp_mul_high_digs.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_s_mp_sqr.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bn_s_mp_sub.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\libtommath\bncore.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\lzma\C\LzFind.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\lzma\C\LzFindMt.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\lzma\C\LzmaDec.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\lzma\C\LzmaEnc.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\lzma\C\Threads.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\pklib\explode.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\pklib\implode.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\sparse\sparse.cpp" />
-    <ClCompile Include="..\..\dep\StormLib\src\zlib\adler32.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\zlib\compress2.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\zlib\crc32.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\zlib\deflate.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\zlib\inffast.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\zlib\inflate.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\zlib\inftrees.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\zlib\trees.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\zlib\zutil.c" />
-    <ClCompile Include="..\..\dep\StormLib\src\jenkins\lookup3.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/ace.vcxproj b/win/VC120/ace.vcxproj
deleted file mode 100644
index 439aec7c3..000000000
--- a/win/VC120/ace.vcxproj
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{D70895A7-4EA1-48BE-A557-834D4357BAD3}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>ace</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\Ace\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ace</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\Ace\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ace</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\acelite;..\..\dep\acelite\ace\PrecompiledHeaders;..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;ACE_BUILD_DLL;CMAKE_INTDIR="Release";ace_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;ACE_BUILD_DLL;CMAKE_INTDIR=\"Release\";ace_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\acelite;..\..\dep\acelite\ace\PrecompiledHeaders;..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\acelite;..\..\dep\acelite\ace\PrecompiledHeaders;..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/ace.lib</ImportLibrary>
-      <ProgramDataBaseFile>$(Configuration)/ace.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\acelite;..\..\dep\acelite\ace\PrecompiledHeaders;..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;ACE_BUILD_DLL;CMAKE_INTDIR="Debug";ace_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;ACE_BUILD_DLL;CMAKE_INTDIR=\"Debug\";ace_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\acelite;..\..\dep\acelite\ace\PrecompiledHeaders;..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\acelite;..\..\dep\acelite\ace\PrecompiledHeaders;..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/ace.lib</ImportLibrary>
-      <ProgramDataBaseFile>$(Configuration)/ace.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\acelite\ace\ACE.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ACE_crc32.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ACE_crc_ccitt.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ace_wchar.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Activation_Queue.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Active_Map_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Argv_Type_Converter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Assert.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Asynch_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Asynch_IO_Impl.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Asynch_Pseudo_Task.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ATM_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ATM_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ATM_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ATM_Params.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ATM_QoS.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ATM_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Atomic_Op.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Atomic_Op_Sparc.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\acelite\ace\Auto_Event.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Barrier.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Base_Thread_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Based_Pointer_Repository.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Basic_Stats.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Basic_Types.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Capabilities.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\CDR_Base.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\CDR_Size.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\CDR_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Cleanup.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Codecs.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Codeset_IBM1047.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Codeset_Registry.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Codeset_Registry_db.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Condition_Attributes.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Condition_Recursive_Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Condition_Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Configuration.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Configuration_Import_Export.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Connection_Recycling_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Containers.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Copy_Disabled.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Date_Time.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\DEV.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\DEV_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\DEV_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\DEV_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dev_Poll_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dirent.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dirent_Selector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\DLL.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\DLL_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dump.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dynamic.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dynamic_Message_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dynamic_Service_Base.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Dynamic_Service_Dependency.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Encoding_Converter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Encoding_Converter_Factory.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Event.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Event_Handler.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Event_Handler_Handle_Timeout_Upcall.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FIFO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FIFO_Recv.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FIFO_Recv_Msg.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FIFO_Send.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FIFO_Send_Msg.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FILE.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FILE_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FILE_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\FILE_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\File_Lock.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Filecache.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Flag_Manip.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Framework_Component.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Functor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Functor_String.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Get_Opt.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Handle_Ops.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Handle_Set.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Hashable.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\High_Res_Timer.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\ICMP_Socket.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\INET_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Init_ACE.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\IO_Cntl_Msg.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\IO_SAP.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\IOStream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\IPC_SAP.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Lib_Find.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Local_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Local_Name_Space.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Local_Tokens.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Lock.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Msg.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Msg_Backend.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Msg_Callback.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Msg_IPC.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Msg_NT_Event_Log.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Msg_UNIX_Syslog.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Log_Record.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Logging_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\LSOCK.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\LSOCK_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\LSOCK_CODgram.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\LSOCK_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\LSOCK_Dgram.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\LSOCK_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Malloc.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Malloc_Allocator.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Manual_Event.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MEM_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MEM_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MEM_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MEM_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Mem_Map.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MEM_SAP.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MEM_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Message_Block.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Message_Queue.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Message_Queue_NT.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Message_Queue_Vx.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Method_Request.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\MMAP_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Admin.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Admin_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Base.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Control_Action.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Control_Types.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Point_Registry.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Monitor_Size.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Msg_WFMO_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Multihomed_INET_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Name_Proxy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Name_Request_Reply.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Name_Space.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Naming_Context.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Netlink_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Notification_Queue.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Notification_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\NT_Service.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Obchunk.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Object_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Object_Manager_Base.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_Errno.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_Log_Msg_Attributes.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_main.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_arpa_inet.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_ctype.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_dirent.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_dlfcn.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_errno.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_fcntl.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_math.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_netdb.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_poll.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_pwd.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_regex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_signal.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_stdio.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_stdlib.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_string.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_strings.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_stropts.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_mman.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_msg.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_resource.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_select.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_sendfile.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_shm.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_socket.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_stat.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_time.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_uio.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_utsname.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_sys_wait.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_Thread.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_time.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_unistd.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_NS_wchar.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_QoS.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_Thread_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\OS_TLI.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Pagefile_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Parse_Node.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\PI_Malloc.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Ping_Socket.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Pipe.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\POSIX_Asynch_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\POSIX_CB_Proactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\POSIX_Proactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Priority_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Proactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Proactor_Impl.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Process.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Process_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Process_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Process_Semaphore.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Profile_Timer.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Reactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Reactor_Impl.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Reactor_Notification_Strategy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Reactor_Timer_Interface.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Read_Buffer.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Recursive_Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Recyclable.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Registry.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Registry_Name_Space.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Remote_Name_Space.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Remote_Tokens.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Rtems_init.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\acelite\ace\RW_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\RW_Process_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\RW_Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Sample_History.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Sbrk_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Sched_Params.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Select_Reactor_Base.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Semaphore.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Service_Config.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Service_Gestalt.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Service_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Service_Object.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Service_Repository.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Service_Types.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Shared_Memory.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Shared_Memory_MM.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Shared_Memory_Pool.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Shared_Memory_SV.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Shared_Object.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Sig_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Sig_Handler.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Signal.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_CODgram.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Sock_Connect.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Dgram.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Dgram_Bcast.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Dgram_Mcast.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Netlink.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_SEQPACK_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_SEQPACK_Association.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_SEQPACK_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SOCK_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SPIPE.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SPIPE_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SPIPE_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SPIPE_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SPIPE_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SString.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Stack_Trace.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Stats.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\String_Base_Const.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SUN_Proactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SV_Message.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SV_Message_Queue.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SV_Semaphore_Complex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SV_Semaphore_Simple.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\SV_Shared_Memory.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Svc_Conf_Lexer.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Svc_Conf_y.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Synch_Options.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\System_Time.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Task.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Control.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Exit.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Hook.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Mutex.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Thread_Semaphore.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Throughput_Stats.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Time_Policy.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Time_Value.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Timeprobe.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TLI.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TLI_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TLI_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TLI_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Token.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Token_Collection.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Token_Invariants.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Token_Manager.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Token_Request_Reply.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TP_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\Trace.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TSS_Adapter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\TTY_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UNIX_Addr.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UPIPE_Acceptor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UPIPE_Connector.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UPIPE_Stream.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UTF16_Encoding_Converter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UTF32_Encoding_Converter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UTF8_Encoding_Converter.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\UUID.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\WFMO_Reactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\WIN32_Asynch_IO.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\WIN32_Proactor.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\XML_Svc_Conf.cpp" />
-    <ClCompile Include="..\..\dep\acelite\ace\XTI_ATM_Mcast.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/bzip2.vcxproj b/win/VC120/bzip2.vcxproj
deleted file mode 100644
index c5d459437..000000000
--- a/win/VC120/bzip2.vcxproj
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{BC139E42-505E-430B-8610-6ED2B1E358E8}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>bzip2</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\bzip2\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bzip2</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\bzip2\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bzip2</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\dep\Stormlib</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsC</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\dep\Stormlib</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsC</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\dep\Stormlib</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\dep\Stormlib</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\Stormlib\src\Stormlib.h" />
-    <ClCompile Include="..\..\dep\src\bzip2\blocksort.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\bzlib.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\compress.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\crctable.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\decompress.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\huffman.c" />
-    <ClCompile Include="..\..\dep\src\bzip2\randtable.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/detour.vcxproj b/win/VC120/detour.vcxproj
deleted file mode 100644
index 647892cf3..000000000
--- a/win/VC120/detour.vcxproj
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{3FECACB6-BD35-4857-BF55-A56B5E6C6D77}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>detour</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\detour\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">detour</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\detour\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">detour</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour\Source;..\..\dep\recastnavigation;..\..\dep\recastnavigation\Detour;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;DT_POLYREF64;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;DT_POLYREF64;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour\Source;..\..\dep\recastnavigation;..\..\dep\recastnavigation\Detour;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour\Source;..\..\dep\recastnavigation;..\..\dep\recastnavigation\Detour;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour\Source;..\..\dep\recastnavigation;..\..\dep\recastnavigation\Detour;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;DT_POLYREF64;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;DT_POLYREF64;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour\Source;..\..\dep\recastnavigation;..\..\dep\recastnavigation\Detour;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour\Source;..\..\dep\recastnavigation;..\..\dep\recastnavigation\Detour;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\recastnavigation\Detour\Source\DetourAlloc.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Detour\Source\DetourCommon.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Detour\Source\DetourNavMeshBuilder.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Detour\Source\DetourNavMesh.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Detour\Source\DetourNavMeshQuery.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Detour\Source\DetourNode.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/framework.vcxproj b/win/VC120/framework.vcxproj
deleted file mode 100644
index e137ee9cc..000000000
--- a/win/VC120/framework.vcxproj
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{915B99FF-5340-4BCE-AAE7-D3737443498B}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>framework</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\framework\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\framework\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">framework</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\framework\Dynamic\FactoryHolder.h" />
-    <ClInclude Include="..\..\src\framework\Dynamic\ObjectRegistry.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\Grid.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\GridLoader.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\GridReference.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\GridRefManager.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\NGrid.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainer.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainerFunctions.h" />
-    <ClInclude Include="..\..\src\framework\GameSystem\TypeContainerVisitor.h" />
-    <ClInclude Include="..\..\src\framework\Platform\CompilerDefs.h" />
-    <ClInclude Include="..\..\src\framework\Platform\Define.h" />
-    <ClInclude Include="..\..\src\framework\Policies\CreationPolicy.h" />
-    <ClInclude Include="..\..\src\framework\Policies\ObjectLifeTime.h" />
-    <ClInclude Include="..\..\src\framework\Policies\Singleton.h" />
-    <ClInclude Include="..\..\src\framework\Policies\ThreadingModel.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\ByteConverter.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\Callback.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\EventProcessor.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedList.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\TypeList.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\UnorderedMapSet.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\Reference.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\RefManager.h" />
-    <ClCompile Include="..\..\src\framework\Policies\ObjectLifeTime.cpp" />
-    <ClCompile Include="..\..\src\framework\Utilities\EventProcessor.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="ace.vcxproj">
-      <Project>{d70895a7-4ea1-48be-a557-834d4357bad3}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/g3dlite.vcxproj b/win/VC120/g3dlite.vcxproj
deleted file mode 100644
index 0f3c1519b..000000000
--- a/win/VC120/g3dlite.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{367CCE76-14A7-4871-93D6-579DA35FBEFD}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>g3dlite</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\g3dlite\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\g3dlite\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">g3dlite</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\src\g3dlite;..\..\dep\include;..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\src\g3dlite;..\..\dep\include;..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\src\g3dlite;..\..\dep\include;..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\src\g3dlite;..\..\dep\include;..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\src\g3dlite;..\..\dep\include;..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\src\g3dlite;..\..\dep\include;..\..\dep\include\g3dlite;..\..\dep\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\g3dlite\AABox.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Any.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryFormat.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryInput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\BinaryOutput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Box.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Capsule.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\CollisionDetection.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\CoordinateFrame.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Crypto.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Cylinder.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\FileSystem.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Line.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\LineSegment.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Log.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Matrix3.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Matrix4.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\MemoryManager.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\PhysicsFrame.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Plane.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Quat.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Random.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Ray.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\ReferenceCount.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\RegistryUtil.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Sphere.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\System.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\TextInput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\TextOutput.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Triangle.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\UprightFrame.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector2.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector3.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\Vector4.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\debugAssert.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\fileutils.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\format.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\g3dfnmatch.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\g3dmath.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\prompt.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\stringutils.cpp" />
-    <ClCompile Include="..\..\dep\src\g3dlite\uint128.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlib.vcxproj">
-      <Project>{8d3cf9b7-05f2-4bcf-b833-27b279fdeaf3}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/game.vcxproj b/win/VC120/game.vcxproj
deleted file mode 100644
index ade737c0b..000000000
--- a/win/VC120/game.vcxproj
+++ /dev/null
@@ -1,523 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>game</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\game\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">game</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\game\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">game</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <CustomBuildBeforeTargets>
-    </CustomBuildBeforeTargets>
-    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\game;..\..\src\game\AuctionHouseBot;..\..\src\game\BattleGround;..\..\src\game\ChatCommands;..\..\src\game\MotionGenerators;..\..\src\game\Object;..\..\src\game\OutdoorPvP;..\..\src\game\References;..\..\src\game\Server;..\..\src\game\Tools;..\..\src\game\vmap;..\..\src\game\WorldHandlers;..\..\dep\include\g3dlite;..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour;..\..\dep\recastnavigation;..\..\src\shared;..\..\src\framework;..\..\src\shared;..\..\dep\include\mysql;..\..\dep\acelite;..\..\src\game;..\..\src\modules\SD2;..\..\dep\lualib;..\..\src\modules\Eluna;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <ForcedIncludeFiles>pchdef.h</ForcedIncludeFiles>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pchdef.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;DT_POLYREF64;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;DT_POLYREF64;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\game;..\..\src\game\AuctionHouseBot;..\..\src\game\BattleGround;..\..\src\game\ChatCommands;..\..\src\game\MotionGenerators;..\..\src\game\Object;..\..\src\game\OutdoorPvP;..\..\src\game\References;..\..\src\game\Server;..\..\src\game\Tools;..\..\src\game\vmap;..\..\src\game\WorldHandlers;..\..\dep\include\g3dlite;..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour;..\..\dep\recastnavigation;..\..\src\shared;..\..\src\framework;..\..\src\shared;..\..\dep\include\mysql;..\..\dep\acelite;..\..\src\game;..\..\src\modules\SD2;..\..\dep\lualib;..\..\src\modules\Eluna;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\game;..\..\src\game\AuctionHouseBot;..\..\src\game\BattleGround;..\..\src\game\ChatCommands;..\..\src\game\MotionGenerators;..\..\src\game\Object;..\..\src\game\OutdoorPvP;..\..\src\game\References;..\..\src\game\Server;..\..\src\game\Tools;..\..\src\game\vmap;..\..\src\game\WorldHandlers;..\..\dep\include\g3dlite;..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour;..\..\dep\recastnavigation;..\..\src\shared;..\..\src\framework;..\..\src\shared;..\..\dep\include\mysql;..\..\dep\acelite;..\..\src\game;..\..\src\modules\SD2;..\..\dep\lualib;..\..\src\modules\Eluna;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\game;..\..\src\game\AuctionHouseBot;..\..\src\game\BattleGround;..\..\src\game\ChatCommands;..\..\src\game\MotionGenerators;..\..\src\game\Object;..\..\src\game\OutdoorPvP;..\..\src\game\References;..\..\src\game\Server;..\..\src\game\Tools;..\..\src\game\vmap;..\..\src\game\WorldHandlers;..\..\dep\include\g3dlite;..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour;..\..\dep\recastnavigation;..\..\src\shared;..\..\src\framework;..\..\src\shared;..\..\dep\include\mysql;..\..\dep\acelite;..\..\src\game;..\..\src\modules\SD2;..\..\dep\lualib;..\..\src\modules\Eluna;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <ForcedIncludeFiles>pchdef.h</ForcedIncludeFiles>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pchdef.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;DT_POLYREF64;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;DT_POLYREF64;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\game;..\..\src\game\AuctionHouseBot;..\..\src\game\BattleGround;..\..\src\game\ChatCommands;..\..\src\game\MotionGenerators;..\..\src\game\Object;..\..\src\game\OutdoorPvP;..\..\src\game\References;..\..\src\game\Server;..\..\src\game\Tools;..\..\src\game\vmap;..\..\src\game\WorldHandlers;..\..\dep\include\g3dlite;..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour;..\..\dep\recastnavigation;..\..\src\shared;..\..\src\framework;..\..\src\shared;..\..\dep\include\mysql;..\..\dep\acelite;..\..\src\game;..\..\src\modules\SD2;..\..\dep\lualib;..\..\src\modules\Eluna;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\game;..\..\src\game\AuctionHouseBot;..\..\src\game\BattleGround;..\..\src\game\ChatCommands;..\..\src\game\MotionGenerators;..\..\src\game\Object;..\..\src\game\OutdoorPvP;..\..\src\game\References;..\..\src\game\Server;..\..\src\game\Tools;..\..\src\game\vmap;..\..\src\game\WorldHandlers;..\..\dep\include\g3dlite;..\..\dep\recastnavigation\Detour\Include;..\..\dep\recastnavigation\Detour;..\..\dep\recastnavigation;..\..\src\shared;..\..\src\framework;..\..\src\shared;..\..\dep\include\mysql;..\..\dep\acelite;..\..\src\game;..\..\src\modules\SD2;..\..\dep\lualib;..\..\src\modules\Eluna;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <CustomBuildStep>
-      <Command>
-      </Command>
-    </CustomBuildStep>
-    <CustomBuildStep>
-      <TreatOutputAsContent>false</TreatOutputAsContent>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PreBuildEvent>
-      <Message>
-      </Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\game\AuctionHouseBot\AuctionHouseBot.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGround.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundAA.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundAB.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundAV.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundBE.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundDS.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundEY.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundIC.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundMgr.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundNA.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundRB.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundRL.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundRV.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundSA.h" />
-    <ClInclude Include="..\..\src\game\BattleGround\BattleGroundWS.h" />
-    <ClInclude Include="..\..\src\game\MotionGenerators\ConfusedMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\MotionGenerators\FleeingMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\MotionGenerators\HomeMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\MotionGenerators\IdleMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\MotionGenerators\MotionMaster.h" />
-    <ClInclude Include="..\..\src\game\MotionGenerators\MovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\MotionGenerators\PathFinder.h" />
-    <ClInclude Include="..\..\src\game\MotionGenerators\PointMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\MotionGenerators\RandomMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\MotionGenerators\TargetedMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\MotionGenerators\WaypointMovementGenerator.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSpline.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSplineFlag.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSplineInit.h" />
-    <ClInclude Include="..\..\src\game\movement\MoveSplineInitArgs.h" />
-    <ClInclude Include="..\..\src\game\movement\packet_builder.h" />
-    <ClInclude Include="..\..\src\game\movement\spline.h" />
-    <ClInclude Include="..\..\src\game\movement\spline.impl.h" />
-    <ClInclude Include="..\..\src\game\movement\typedefs.h" />
-    <ClInclude Include="..\..\src\game\Object\AggressorAI.h" />
-    <ClInclude Include="..\..\src\game\Object\ArenaTeam.h" />
-    <ClInclude Include="..\..\src\game\Object\AuctionHouseMgr.h" />
-    <ClInclude Include="..\..\src\game\Object\Bag.h" />
-    <ClInclude Include="..\..\src\game\Object\Calendar.h" />
-    <ClInclude Include="..\..\src\game\Object\Camera.h" />
-    <ClInclude Include="..\..\src\game\Object\Corpse.h" />
-    <ClInclude Include="..\..\src\game\Object\Creature.h" />
-    <ClInclude Include="..\..\src\game\Object\CreatureAI.h" />
-    <ClInclude Include="..\..\src\game\Object\CreatureAIImpl.h" />
-    <ClInclude Include="..\..\src\game\Object\CreatureAIRegistry.h" />
-    <ClInclude Include="..\..\src\game\Object\CreatureAISelector.h" />
-    <ClInclude Include="..\..\src\game\Object\CreatureEventAI.h" />
-    <ClInclude Include="..\..\src\game\Object\CreatureEventAIMgr.h" />
-    <ClInclude Include="..\..\src\game\Object\DynamicObject.h" />
-    <ClInclude Include="..\..\src\game\Object\Formulas.h" />
-    <ClInclude Include="..\..\src\game\Object\GameObject.h" />
-    <ClInclude Include="..\..\src\game\Object\GMTicketMgr.h" />
-    <ClInclude Include="..\..\src\game\Object\GuardAI.h" />
-    <ClInclude Include="..\..\src\game\Object\Guild.h" />
-    <ClInclude Include="..\..\src\game\Object\Item.h" />
-    <ClInclude Include="..\..\src\game\Object\ItemEnchantmentMgr.h" />
-    <ClInclude Include="..\..\src\game\Object\ItemPrototype.h" />
-    <ClInclude Include="..\..\src\game\Object\LootMgr.h" />
-    <ClInclude Include="..\..\src\game\Object\NullCreatureAI.h" />
-    <ClInclude Include="..\..\src\game\Object\Object.h" />
-    <ClInclude Include="..\..\src\game\Object\ObjectAccessor.h" />
-    <ClInclude Include="..\..\src\game\Object\ObjectGuid.h" />
-    <ClInclude Include="..\..\src\game\Object\ObjectMgr.h" />
-    <ClInclude Include="..\..\src\game\Object\ObjectPosSelector.h" />
-    <ClInclude Include="..\..\src\game\Object\Pet.h" />
-    <ClInclude Include="..\..\src\game\Object\PetAI.h" />
-    <ClInclude Include="..\..\src\game\Object\Player.h" />
-    <ClInclude Include="..\..\src\game\Object\ReactorAI.h" />
-    <ClInclude Include="..\..\src\game\Object\ReputationMgr.h" />
-    <ClInclude Include="..\..\src\game\Object\SocialMgr.h" />
-    <ClInclude Include="..\..\src\game\Object\SpellMgr.h" />
-    <ClInclude Include="..\..\src\game\Object\TemporarySummon.h" />
-    <ClInclude Include="..\..\src\game\Object\Totem.h" />
-    <ClInclude Include="..\..\src\game\Object\TotemAI.h" />
-    <ClInclude Include="..\..\src\game\Object\Unit.h" />
-    <ClInclude Include="..\..\src\game\Object\UnitEvents.h" />
-    <ClInclude Include="..\..\src\game\Object\UpdateFields.h" />
-    <ClInclude Include="..\..\src\game\Object\UpdateMask.h" />
-    <ClInclude Include="..\..\src\game\Object\Vehicle.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvP.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPEP.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPGH.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPHP.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPMgr.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPNA.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPSI.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPTF.h" />
-    <ClInclude Include="..\..\src\game\OutdoorPvP\OutdoorPvPZM.h" />
-    <ClInclude Include="..\..\src\game\References\FollowerReference.h" />
-    <ClInclude Include="..\..\src\game\References\FollowerRefManager.h" />
-    <ClInclude Include="..\..\src\game\References\GroupReference.h" />
-    <ClInclude Include="..\..\src\game\References\GroupRefManager.h" />
-    <ClInclude Include="..\..\src\game\References\HostileRefManager.h" />
-    <ClInclude Include="..\..\src\game\References\MapReference.h" />
-    <ClInclude Include="..\..\src\game\References\MapRefManager.h" />
-    <ClInclude Include="..\..\src\game\References\ThreatManager.h" />
-    <ClInclude Include="..\..\src\game\Server\DBCEnums.h" />
-    <ClInclude Include="..\..\src\game\Server\DB2fmt.h" />
-    <ClInclude Include="..\..\src\game\Server\DBCfmt.h" />
-    <ClInclude Include="..\..\src\game\Server\DB2Stores.h" />
-    <ClInclude Include="..\..\src\game\Server\DBCStores.h" />
-    <ClInclude Include="..\..\src\game\Server\DB2Structure.h" />
-    <ClInclude Include="..\..\src\game\Server\DBCStructure.h" />
-    <ClInclude Include="..\..\src\game\Server\Opcodes.h" />
-    <ClInclude Include="..\..\src\game\Server\SharedDefines.h" />
-    <ClInclude Include="..\..\src\game\Server\SQLStorages.h" />
-    <ClInclude Include="..\..\src\game\Server\WorldSession.h" />
-    <ClInclude Include="..\..\src\game\Server\WorldSocket.h" />
-    <ClInclude Include="..\..\src\game\Server\WorldSocketMgr.h" />
-    <ClInclude Include="..\..\src\game\Tools\CharacterDatabaseCleaner.h" />
-    <ClInclude Include="..\..\src\game\Tools\Language.h" />
-    <ClInclude Include="..\..\src\game\Tools\PlayerDump.h" />
-    <ClInclude Include="..\..\src\game\vmap\BIH.h" />
-    <ClInclude Include="..\..\src\game\vmap\BIHWrap.h" />
-    <ClInclude Include="..\..\src\game\vmap\DynamicTree.h" />
-    <ClInclude Include="..\..\src\game\vmap\GameObjectModel.h" />
-    <ClInclude Include="..\..\src\game\vmap\IVMapManager.h" />
-    <ClInclude Include="..\..\src\game\vmap\MapTree.h" />
-    <ClInclude Include="..\..\src\game\vmap\ModelInstance.h" />
-    <ClInclude Include="..\..\src\game\vmap\RegularGrid.h" />
-    <ClInclude Include="..\..\src\game\vmap\TileAssembler.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapDefinitions.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapFactory.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapManager2.h" />
-    <ClInclude Include="..\..\src\game\vmap\VMapTools.h" />
-    <ClInclude Include="..\..\src\game\vmap\WorldModel.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\AccountMgr.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\AchievementMgr.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\Cell.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\CellImpl.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\Channel.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\ChannelMgr.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\Chat.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\CreatureLinkingMgr.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\GameEventMgr.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\GossipDef.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\GridDefines.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\GridMap.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\GridNotifiers.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\GridNotifiersImpl.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\GridStates.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\Group.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\GuildMgr.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\InstanceData.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\Mail.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\Map.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\MapManager.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\MapPersistentStateMgr.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\MassMailMgr.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\MoveMap.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\MoveMapSharedDefines.h" />
-    <ClInclude Include="..\..\src\game\movement\MovementStructures.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\NPCHandler.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\ObjectGridLoader.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\Path.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\PhaseMgr.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\PoolManager.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\QuestDef.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\ScriptMgr.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\SkillDiscovery.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\SkillExtraItems.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\Spell.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\SpellAuraDefines.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\SpellAuras.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\Transports.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\TransportSystem.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\UpdateData.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\WaypointManager.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\Weather.h" />
-    <ClInclude Include="..\..\src\game\WorldHandlers\World.h" />
-    <ClInclude Include="..\..\src\game\pchdef.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\game\AuctionHouseBot\AuctionHouseBot.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGround.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundAA.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundAB.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundAV.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundBE.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundDS.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundEY.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundHandler.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundIC.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundMgr.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundNA.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundRB.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundRL.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundRV.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundSA.cpp"  />
-    <ClCompile Include="..\..\src\game\BattleGround\BattleGroundWS.cpp" />
-    <ClCompile Include="..\..\src\game\ChatCommands\debugcmds.cpp" />
-    <ClCompile Include="..\..\src\game\ChatCommands\Level0.cpp" />
-    <ClCompile Include="..\..\src\game\ChatCommands\Level1.cpp" />
-    <ClCompile Include="..\..\src\game\ChatCommands\Level2.cpp" />
-    <ClCompile Include="..\..\src\game\ChatCommands\Level3.cpp" />
-    <ClCompile Include="..\..\src\game\MotionGenerators\ConfusedMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\MotionGenerators\FleeingMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\MotionGenerators\HomeMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\MotionGenerators\IdleMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\MotionGenerators\MotionMaster.cpp" />
-    <ClCompile Include="..\..\src\game\MotionGenerators\MovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\MotionGenerators\PathFinder.cpp" />
-    <ClCompile Include="..\..\src\game\MotionGenerators\PointMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\MotionGenerators\RandomMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\MotionGenerators\TargetedMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\MotionGenerators\WaypointMovementGenerator.cpp" />
-    <ClCompile Include="..\..\src\game\movement\MoveSpline.cpp" />
-    <ClCompile Include="..\..\src\game\movement\MoveSplineInit.cpp" />
-    <ClCompile Include="..\..\src\game\movement\packet_builder.cpp" />
-    <ClCompile Include="..\..\src\game\movement\spline.cpp" />
-    <ClCompile Include="..\..\src\game\movement\util.cpp" />
-    <ClCompile Include="..\..\src\game\Object\AggressorAI.cpp" />
-    <ClCompile Include="..\..\src\game\Object\ArenaTeam.cpp"  />
-    <ClCompile Include="..\..\src\game\Object\AuctionHouseMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Object\Bag.cpp" />
-    <ClCompile Include="..\..\src\game\Object\Calendar.cpp"  />
-    <ClCompile Include="..\..\src\game\Object\Camera.cpp" />
-    <ClCompile Include="..\..\src\game\Object\Corpse.cpp" />
-    <ClCompile Include="..\..\src\game\Object\Creature.cpp" />
-    <ClCompile Include="..\..\src\game\Object\CreatureAI.cpp" />
-    <ClCompile Include="..\..\src\game\Object\CreatureAIRegistry.cpp" />
-    <ClCompile Include="..\..\src\game\Object\CreatureAISelector.cpp" />
-    <ClCompile Include="..\..\src\game\Object\CreatureEventAI.cpp" />
-    <ClCompile Include="..\..\src\game\Object\CreatureEventAIMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Object\DynamicObject.cpp" />
-    <ClCompile Include="..\..\src\game\Object\GameObject.cpp" />
-    <ClCompile Include="..\..\src\game\Object\GMTicketMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Object\GuardAI.cpp" />
-    <ClCompile Include="..\..\src\game\Object\Guild.cpp" />
-    <ClCompile Include="..\..\src\game\Object\Item.cpp" />
-    <ClCompile Include="..\..\src\game\Object\ItemEnchantmentMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Object\LootMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Object\NullCreatureAI.cpp" />
-    <ClCompile Include="..\..\src\game\Object\Object.cpp" />
-    <ClCompile Include="..\..\src\game\Object\ObjectAccessor.cpp" />
-    <ClCompile Include="..\..\src\game\Object\ObjectGuid.cpp" />
-    <ClCompile Include="..\..\src\game\Object\ObjectMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Object\ObjectPosSelector.cpp" />
-    <ClCompile Include="..\..\src\game\Object\Pet.cpp" />
-    <ClCompile Include="..\..\src\game\Object\PetAI.cpp" />
-    <ClCompile Include="..\..\src\game\Object\Player.cpp" />
-    <ClCompile Include="..\..\src\game\Object\ReactorAI.cpp" />
-    <ClCompile Include="..\..\src\game\Object\ReputationMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Object\SocialMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Object\SpellMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Object\StatSystem.cpp" />
-    <ClCompile Include="..\..\src\game\Object\TemporarySummon.cpp" />
-    <ClCompile Include="..\..\src\game\Object\Totem.cpp" />
-    <ClCompile Include="..\..\src\game\Object\TotemAI.cpp" />
-    <ClCompile Include="..\..\src\game\Object\Unit.cpp" />
-    <ClCompile Include="..\..\src\game\Object\Vehicle.cpp"  />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvP.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPEP.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPGH.cpp"  />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPHP.cpp"  />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPMgr.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPNA.cpp"  />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPSI.cpp" />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPTF.cpp"  />
-    <ClCompile Include="..\..\src\game\OutdoorPvP\OutdoorPvPZM.cpp"  />
-    <ClCompile Include="..\..\src\game\References\FollowerReference.cpp" />
-    <ClCompile Include="..\..\src\game\References\GroupReference.cpp" />
-    <ClCompile Include="..\..\src\game\References\HostileRefManager.cpp" />
-    <ClCompile Include="..\..\src\game\References\ThreatManager.cpp" />
-    <ClCompile Include="..\..\src\game\Server\DB2Stores.cpp" />
-    <ClCompile Include="..\..\src\game\Server\DBCStores.cpp" />
-    <ClCompile Include="..\..\src\game\Server\DBCStructure.cpp" />
-    <ClCompile Include="..\..\src\game\Server\Opcodes.cpp" />
-    <ClCompile Include="..\..\src\game\Server\SQLStorages.cpp" />
-    <ClCompile Include="..\..\src\game\Server\WorldSession.cpp" />
-    <ClCompile Include="..\..\src\game\Server\WorldSocket.cpp" />
-    <ClCompile Include="..\..\src\game\Server\WorldSocketMgr.cpp" />
-    <ClCompile Include="..\..\src\game\Tools\CharacterDatabaseCleaner.cpp" />
-    <ClCompile Include="..\..\src\game\Tools\PlayerDump.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\BIH.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\DynamicTree.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\GameObjectModel.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\MapTree.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\ModelInstance.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\TileAssembler.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\VMapFactory.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\VMapManager2.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\WorldModel.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\AccountMgr.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\AchievementMgr.cpp"  />
-    <ClCompile Include="..\..\src\game\WorldHandlers\ArenaTeamHandler.cpp"  />
-    <ClCompile Include="..\..\src\game\WorldHandlers\AuctionHouseHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\CalendarHandler.cpp"  />
-    <ClCompile Include="..\..\src\game\WorldHandlers\Channel.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\ChannelHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\ChannelMgr.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\CharacterHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\Chat.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\ChatHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\CombatHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\CreatureLinkingMgr.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\DuelHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\GameEventMgr.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\GMTicketHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\GossipDef.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\GridMap.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\GridNotifiers.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\GridStates.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\Group.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\GroupHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\GuildHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\GuildMgr.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\InstanceData.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\ItemHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\LFGHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\LootHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\Mail.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\MailHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\Map.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\MapManager.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\MapPersistentStateMgr.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\MassMailMgr.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\MiscHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\MoveMap.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\MovementHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\NPCHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\ObjectGridLoader.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\PetHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\PetitionsHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\PhaseMgr.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\PoolManager.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\QueryHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\QuestDef.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\QuestHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\ScriptMgr.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\SkillDiscovery.cpp"  />
-    <ClCompile Include="..\..\src\game\WorldHandlers\SkillExtraItems.cpp"  />
-    <ClCompile Include="..\..\src\game\WorldHandlers\SkillHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\Spell.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\SpellAuras.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\SpellEffects.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\SpellHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\TaxiHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\TradeHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\Transports.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\TransportSystem.cpp"  />
-    <ClCompile Include="..\..\src\game\WorldHandlers\UnitAuraProcHandler.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\UpdateData.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\VehicleHandler.cpp"  />
-    <ClCompile Include="..\..\src\game\WorldHandlers\VoiceChatHandler.cpp"  />
-    <ClCompile Include="..\..\src\game\WorldHandlers\WaypointManager.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\Weather.cpp" />
-    <ClCompile Include="..\..\src\game\WorldHandlers\World.cpp" />
-    <ClCompile Include="..\..\src\game\pchdef.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pchdef.h</PrecompiledHeaderFile>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pchdef.h</PrecompiledHeaderFile>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="LuaEngine.vcxproj">
-      <Project>61BCE72F-B726-48F3-9D02-7FD551F82DF8</Project>
-    </ProjectReference>
-    <ProjectReference Include="ace.vcxproj">
-      <Project>D70895A7-4EA1-48BE-A557-834D4357BAD3</Project>
-    </ProjectReference>
-    <ProjectReference Include="detour.vcxproj">
-      <Project>3FECACB6-BD35-4857-BF55-A56B5E6C6D77</Project>
-    </ProjectReference>
-    <ProjectReference Include="lualib.vcxproj">
-      <Project>0AC3742A-F311-428C-8EF1-8D6B8627A8A2</Project>
-    </ProjectReference>
-    <ProjectReference Include="mangosscript.vcxproj">
-      <Project>DA729B06-9097-4DA6-A86C-E97BC843B7C2</Project>
-    </ProjectReference>
-    <ProjectReference Include="shared.vcxproj">
-      <Project>594C9AA1-A759-4DEB-A6E4-F079A5DFBA31</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/genrev.vcxproj b/win/VC120/genrev.vcxproj
deleted file mode 100644
index 791dac66f..000000000
--- a/win/VC120/genrev.vcxproj
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="MinSizeRel|Win32">
-      <Configuration>MinSizeRel</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="RelWithDebInfo|Win32">
-      <Configuration>RelWithDebInfo</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{304083A8-CF14-496E-BF87-F4007D677274}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>genrev</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\genrev\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">genrev</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\genrev\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">genrev</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">$(Configuration)\_temp\genrev\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">genrev</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(Configuration)\_temp\genrev\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">genrev</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">true</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>VC120\$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/genrev.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/genrev.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>VC120\$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/genrev.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/genrev.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>MinSizeRel/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <Optimization>MinSpace</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>VC120\$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/genrev.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/genrev.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>RelWithDebInfo/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>VC120\$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/genrev.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/genrev.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\tools\genrevision\genrevision.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/genrev.vcxproj.filters b/win/VC120/genrev.vcxproj.filters
deleted file mode 100644
index 2ba52022a..000000000
--- a/win/VC120/genrev.vcxproj.filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\src\tools\genrevision\genrevision.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{2CC099F7-F112-43EF-8D5C-58BA8BA8D70A}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/gsoap.vcxproj b/win/VC120/gsoap.vcxproj
deleted file mode 100644
index 15cdd0cb4..000000000
--- a/win/VC120/gsoap.vcxproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{53CF48ED-FEFE-4165-A9CA-F000ABC572B6}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>gsoap</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\gsoap\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gsoap</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\gsoap\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gsoap</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\src\gsoap;..\..\dep\include\gsoap;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\src\gsoap;..\..\dep\include\gsoap;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\src\gsoap;..\..\dep\include\gsoap;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\src\gsoap;..\..\dep\include\gsoap;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\src\gsoap;..\..\dep\include\gsoap;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\src\gsoap;..\..\dep\include\gsoap;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\gsoap\stdsoap2.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/libmpq.vcxproj b/win/VC120/libmpq.vcxproj
deleted file mode 100644
index b1bad44ff..000000000
--- a/win/VC120/libmpq.vcxproj
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{449D15D0-B3B9-4195-AB9C-E205FF77ABBE}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>libmpq</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\libmpq\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libmpq</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\libmpq\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libmpq</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\libmpq;..\..\dep\libmpq\win;..\..\dep\src\zlib;..\..\dep\src\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\libmpq;..\..\dep\libmpq\win;..\..\dep\src\zlib;..\..\dep\src\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\libmpq;..\..\dep\libmpq\win;..\..\dep\src\zlib;..\..\dep\src\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\libmpq;..\..\dep\libmpq\win;..\..\dep\src\zlib;..\..\dep\src\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\libmpq;..\..\dep\libmpq\win;..\..\dep\src\zlib;..\..\dep\src\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\libmpq;..\..\dep\libmpq\win;..\..\dep\src\zlib;..\..\dep\src\bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\libmpq\libmpq\common.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\crypt_buf.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\explode.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\extract.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\huffman.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\mpq-internal.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\mpq.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\platform.h" />
-    <ClInclude Include="..\..\dep\libmpq\libmpq\wave.h" />
-    <ClCompile Include="..\..\dep\libmpq\libmpq\common.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\libmpq\libmpq\explode.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\libmpq\libmpq\extract.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\libmpq\libmpq\huffman.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\libmpq\libmpq\mpq.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-    <ClCompile Include="..\..\dep\libmpq\libmpq\wave.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="bzip2.vcxproj">
-      <Project>BC139E42-505E-430B-8610-6ED2B1E358E8</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/loadlib.vcxproj b/win/VC120/loadlib.vcxproj
deleted file mode 100644
index 4dc1a0996..000000000
--- a/win/VC120/loadlib.vcxproj
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{29E1FE24-1C69-4E6B-945D-02544988A5FA}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>loadlib</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\loadlib\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">loadlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\loadlib\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">loadlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\dep\StormLib;\..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\dep\StormLib;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\dep\StormLib;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\dep\StormLib;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\dep\StormLib;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\dep\StormLib;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\tools\map-extractor\loadlib\loadlib.cpp" />
-    <ClCompile Include="..\..\src\tools\map-extractor\loadlib\adt.cpp" />
-    <ClCompile Include="..\..\src\tools\map-extractor\loadlib\wdt.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlib.vcxproj">
-      <Project>8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/lualib.vcxproj b/win/VC120/lualib.vcxproj
deleted file mode 100644
index c436f0aa4..000000000
--- a/win/VC120/lualib.vcxproj
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{0AC3742A-F311-428C-8EF1-8D6B8627A8A2}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>lualib</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\lualib\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lualib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\lualib\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lualib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\dep\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsC</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\dep\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsC</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\lualib\lapi.c" />
-    <ClCompile Include="..\..\dep\lualib\lauxlib.c" />
-    <ClCompile Include="..\..\dep\lualib\lbaselib.c" />
-    <ClCompile Include="..\..\dep\lualib\lbitlib.c" />
-    <ClCompile Include="..\..\dep\lualib\lcode.c" />
-    <ClCompile Include="..\..\dep\lualib\lcorolib.c" />
-    <ClCompile Include="..\..\dep\lualib\lctype.c" />
-    <ClCompile Include="..\..\dep\lualib\ldblib.c" />
-    <ClCompile Include="..\..\dep\lualib\ldebug.c" />
-    <ClCompile Include="..\..\dep\lualib\ldo.c" />
-    <ClCompile Include="..\..\dep\lualib\ldump.c" />
-    <ClCompile Include="..\..\dep\lualib\lfunc.c" />
-    <ClCompile Include="..\..\dep\lualib\lgc.c" />
-    <ClCompile Include="..\..\dep\lualib\linit.c" />
-    <ClCompile Include="..\..\dep\lualib\liolib.c" />
-    <ClCompile Include="..\..\dep\lualib\llex.c" />
-    <ClCompile Include="..\..\dep\lualib\lmathlib.c" />
-    <ClCompile Include="..\..\dep\lualib\lmem.c" />
-    <ClCompile Include="..\..\dep\lualib\loadlib.c" />
-    <ClCompile Include="..\..\dep\lualib\lobject.c" />
-    <ClCompile Include="..\..\dep\lualib\lopcodes.c" />
-    <ClCompile Include="..\..\dep\lualib\loslib.c" />
-    <ClCompile Include="..\..\dep\lualib\lparser.c" />
-    <ClCompile Include="..\..\dep\lualib\lstate.c" />
-    <ClCompile Include="..\..\dep\lualib\lstring.c" />
-    <ClCompile Include="..\..\dep\lualib\lstrlib.c" />
-    <ClCompile Include="..\..\dep\lualib\ltable.c" />
-    <ClCompile Include="..\..\dep\lualib\ltablib.c" />
-    <ClCompile Include="..\..\dep\lualib\ltm.c" />
-    <ClCompile Include="..\..\dep\lualib\lundump.c" />
-    <ClCompile Include="..\..\dep\lualib\lvm.c" />
-    <ClCompile Include="..\..\dep\lualib\lzio.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/mangosd.vcxproj b/win/VC120/mangosd.vcxproj
deleted file mode 100644
index 8b6becdf8..000000000
--- a/win/VC120/mangosd.vcxproj
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{485F08B8-BAD4-47C1-8B49-17B9949B123E}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>mangosd</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\mangosd\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\mangosd\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mangosd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\src\game\AuctionHouseBot;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\openssl;..\..\src\modules\Eluna;..\..\dep\lualib;..\..\src\modules\SD2;..\..\dep\include\gsoap;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;ENABLE_SOAP;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\src\game\AuctionHouseBot;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\openssl;..\..\src\modules\Eluna;..\..\dep\lualib;..\..\src\modules\SD2;..\..\dep\include\gsoap;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\src\game\AuctionHouseBot;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\openssl;..\..\src\modules\Eluna;..\..\dep\lualib;..\..\src\modules\SD2;..\..\dep\include\gsoap;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;$(Configuration)\game.lib;$(Configuration)\shared.lib;$(Configuration)\framework.lib;$(Configuration)\g3dlite.lib;$(Configuration)\ace.lib;$(Configuration)\gsoap.lib;$(Configuration)\zlib.lib;..\..\dep\lib\win32\libmySQL.lib;..\..\dep\lib\win32\libeay32.lib;$(Configuration)\detour.lib;$(Configuration)\mangosscript.lib;</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);;../../src/mangosd/$(Configuration);../../src/mangosd/$(Configuration)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/mangosd.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/mangosd.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\src\game\AuctionHouseBot;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\openssl;..\..\src\modules\Eluna;..\..\dep\lualib;..\..\src\modules\SD2;..\..\dep\include\gsoap;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;ENABLE_SOAP;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\src\game\AuctionHouseBot;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\openssl;..\..\src\modules\Eluna;..\..\dep\lualib;..\..\src\modules\SD2;..\..\dep\include\gsoap;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\src\game\AuctionHouseBot;..\..\src\game\BattleGround;..\..\src\game\Server;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\Tools;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\openssl;..\..\src\modules\Eluna;..\..\dep\lualib;..\..\src\modules\SD2;..\..\dep\include\gsoap;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(Configuration)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;$(Configuration)\game.lib;$(Configuration)\shared.lib;$(Configuration)\framework.lib;$(Configuration)\g3dlite.lib;$(Configuration)\ace.lib;$(Configuration)\gsoap.lib;$(Configuration)\zlib.lib;..\..\dep\lib\win32\libmySQL.lib;..\..\dep\lib\win32\libeay32.lib;$(Configuration)\detour.lib;$(Configuration)\mangosscript.lib;</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);;../../src/mangosd/$(Configuration);../../src/mangosd/$(Configuration)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/mangosd.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/mangosd.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\mangosd\CliRunnable.h" />
-    <ClInclude Include="..\..\src\mangosd\Master.h" />
-    <ClInclude Include="..\..\src\mangosd\RASocket.h" />
-    <ClInclude Include="..\..\src\mangosd\WorldRunnable.h" />
-    <ClInclude Include="..\..\src\mangosd\MaNGOSsoap.h" />
-    <ClInclude Include="..\..\src\mangosd\soapH.h" />
-    <ClInclude Include="..\..\src\mangosd\soapStub.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\mangosd\CliRunnable.cpp" />
-    <ClCompile Include="..\..\src\mangosd\Main.cpp" />
-    <ClCompile Include="..\..\src\mangosd\Master.cpp" />
-    <ClCompile Include="..\..\src\mangosd\RASocket.cpp" />
-    <ClCompile Include="..\..\src\mangosd\WorldRunnable.cpp" />
-    <ClCompile Include="..\..\src\mangosd\MaNGOSsoap.cpp" />
-    <ClCompile Include="..\..\src\mangosd\soapC.cpp" />
-    <ClCompile Include="..\..\src\mangosd\soapServer.cpp" />
-    <ResourceCompile Include="..\..\src\mangosd\mangosd.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="ace.vcxproj">
-      <Project>D70895A7-4EA1-48BE-A557-834D4357BAD3</Project>
-    </ProjectReference>
-    <ProjectReference Include="detour.vcxproj">
-      <Project>3FECACB6-BD35-4857-BF55-A56B5E6C6D77</Project>
-    </ProjectReference>
-    <ProjectReference Include="framework.vcxproj">
-      <Project>915B99FF-5340-4BCE-AAE7-D3737443498B</Project>
-    </ProjectReference>
-    <ProjectReference Include="g3dlite.vcxproj">
-      <Project>367CCE76-14A7-4871-93D6-579DA35FBEFD</Project>
-    </ProjectReference>
-    <ProjectReference Include="game.vcxproj">
-      <Project>C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933</Project>
-    </ProjectReference>
-    <ProjectReference Include="gsoap.vcxproj">
-      <Project>53CF48ED-FEFE-4165-A9CA-F000ABC572B6</Project>
-    </ProjectReference>
-    <ProjectReference Include="lualib.vcxproj">
-      <Project>0AC3742A-F311-428C-8EF1-8D6B8627A8A2</Project>
-    </ProjectReference>
-    <ProjectReference Include="mangosscript.vcxproj">
-      <Project>DA729B06-9097-4DA6-A86C-E97BC843B7C2</Project>
-    </ProjectReference>
-    <ProjectReference Include="shared.vcxproj">
-      <Project>594C9AA1-A759-4DEB-A6E4-F079A5DFBA31</Project>
-    </ProjectReference>
-    <ProjectReference Include="zlib.vcxproj">
-      <Project>8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/mangosscript.vcxproj b/win/VC120/mangosscript.vcxproj
deleted file mode 100644
index 417700380..000000000
--- a/win/VC120/mangosscript.vcxproj
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{DA729B06-9097-4DA6-A86C-E97BC843B7C2}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>mangosscript</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\mangosscript\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\mangosscript\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mangosscript</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\modules\SD2\base;..\..\src\modules\SD2\include;..\..\src\shared;..\..\src\framework;..\..\src\game\Server;..\..\src\game\BattleGround;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\modules\SD2\base;..\..\src\modules\SD2\include;..\..\src\framework;..\..\src\game\Server;..\..\src\game\BattleGround;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\modules\SD2\base;..\..\src\modules\SD2\include;..\..\src\framework;..\..\src\game\Server;..\..\src\game\BattleGround;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\modules\SD2\base;..\..\src\modules\SD2\include;..\..\src\framework;..\..\src\game\Server;..\..\src\game\BattleGround;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\modules\SD2\base;..\..\src\modules\SD2\include;..\..\src\framework;..\..\src\game\Server;..\..\src\game\BattleGround;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\modules\SD2\base;..\..\src\modules\SD2\include;..\..\src\framework;..\..\src\game\Server;..\..\src\game\BattleGround;..\..\src\game\WorldHandlers;..\..\src\game\Object;..\..\src\game\References;..\..\src\game\MotionGenerators;..\..\src\game\vmap;..\..\src\shared;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\modules\SD2\sd2_revision_nr.h" />
-    <ClInclude Include="..\..\src\modules\SD2\sd2_revision_sql.h" />
-    <ClInclude Include="..\..\src\modules\SD2\ScriptDevMgr.h" />
-    <ClInclude Include="..\..\src\modules\SD2\base\escort_ai.h" />
-    <ClInclude Include="..\..\src\modules\SD2\base\follower_ai.h" />
-    <ClInclude Include="..\..\src\modules\SD2\base\guard_ai.h" />
-    <ClInclude Include="..\..\src\modules\SD2\base\pet_ai.h" />
-    <ClInclude Include="..\..\src\modules\SD2\include\precompiled.h" />
-    <ClInclude Include="..\..\src\modules\SD2\include\sc_creature.h" />
-    <ClInclude Include="..\..\src\modules\SD2\include\sc_grid_searchers.h" />
-    <ClInclude Include="..\..\src\modules\SD2\include\sc_instance.h" />
-    <ClInclude Include="..\..\src\modules\SD2\include\sc_gossip.h" />
-    <ClInclude Include="..\..\src\modules\SD2\system\ScriptLoader.h" />
-    <ClInclude Include="..\..\src\modules\SD2\system\system.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\world\world_map_scripts.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\blackrock_depths.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\blackrock_spire.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\deadmines\deadmines.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\gnomeregan\gnomeregan.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scarlet_monastery\scarlet_monastery.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scholomance\scholomance.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\uldaman\uldaman.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\sunken_temple\sunken_temple.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\stratholme.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\molten_core.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\blackwing_lair.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\naxxramas\naxxramas.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\zulgurub.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\blackfathom_deeps\blackfathom_deeps.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\dire_maul\dire_maul.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\maraudon\maraudon.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\razorfen_downs\razorfen_downs.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\razorfen_kraul\razorfen_kraul.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\wailing_caverns\wailing_caverns.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\zulfarrak\zulfarrak.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\onyxias_lair\onyxias_lair.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\ruins_of_ahnqiraj.h" />
-    <ClInclude Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\temple_of_ahnqiraj.h" />
-    <ClCompile Include="..\..\src\modules\SD2\include\precompiled.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">precompiled.h</PrecompiledHeaderFile>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">precompiled.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="..\..\src\modules\SD2\ScriptDevMgr.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\base\escort_ai.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\base\follower_ai.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\base\guard_ai.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\base\pet_ai.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\include\sc_creature.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\include\sc_grid_searchers.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\include\sc_instance.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\system\ScriptLoader.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\system\system.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\battlegrounds\battleground.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\areatrigger_scripts.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\bosses_emerald_dragons.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\go_scripts.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\guards.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\item_scripts.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\mob_generic_creature.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\npcs_special.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\npc_professions.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\spell_scripts.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\world\world_map_scripts.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\alterac_mountains.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\arathi_highlands.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blasted_lands.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\burning_steppes.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\dun_morogh.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\eastern_plaguelands.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\elwynn_forest.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\hinterlands.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\ironforge.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\loch_modan.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\redridge_mountains.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\searing_gorge.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\silverpine_forest.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stormwind_city.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stranglethorn_vale.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\swamp_of_sorrows.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\tirisfal_glades.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\undercity.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\western_plaguelands.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\westfall.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\wetlands.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ashenvale.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\azshara.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\boss_azuregos.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\darkshore.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\desolace.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\durotar.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\dustwallow_marsh.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\felwood.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\feralas.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\moonglade.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\mulgore.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\orgrimmar.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\silithus.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\stonetalon_mountains.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\tanaris.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\teldrassil.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\the_barrens.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\thousand_needles.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\thunder_bluff.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ungoro_crater.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\winterspring.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\blackrock_depths.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_ambassador_flamelash.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_emperor_dagran_thaurissan.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_general_angerforge.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\boss_high_interrogator_gerstahn.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_depths\instance_blackrock_depths.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\boss_gyth.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\boss_overlord_wyrmthalak.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\boss_pyroguard_emberseer.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackrock_spire\instance_blackrock_spire.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\deadmines\boss_mr_smite.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\deadmines\deadmines.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\deadmines\instance_deadmines.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\gnomeregan\boss_thermaplugg.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\gnomeregan\gnomeregan.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\gnomeregan\instance_gnomeregan.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scarlet_monastery\boss_arcanist_doan.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scarlet_monastery\boss_herod.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scarlet_monastery\boss_mograine_and_whitemane.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scarlet_monastery\instance_scarlet_monastery.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scholomance\boss_darkmaster_gandling.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scholomance\boss_jandice_barov.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\scholomance\instance_scholomance.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\uldaman\boss_archaedas.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\uldaman\instance_uldaman.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\uldaman\uldaman.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\shadowfang_keep\instance_shadowfang_keep.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\sunken_temple\instance_sunken_temple.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\sunken_temple\sunken_temple.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\boss_baroness_anastari.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\boss_cannon_master_willey.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\boss_dathrohan_balnazzar.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\boss_maleki_the_pallid.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\instance_stratholme.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\stratholme\stratholme.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_baron_geddon.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_garr.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_gehennas.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_golemagg.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_lucifron.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_magmadar.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_majordomo_executus.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_ragnaros.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_shazzrah.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\boss_sulfuron_harbinger.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\instance_molten_core.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\molten_core\molten_core.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_broodlord_lashlayer.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_chromaggus.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_ebonroc.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_firemaw.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_flamegor.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_nefarian.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_razorgore.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_vaelastrasz.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\boss_victor_nefarius.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\blackrock_mountain\blackwing_lair\instance_blackwing_lair.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_arlokk.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_hakkar.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_hazzarah.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_jeklik.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_jindo.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_mandokir.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_marli.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_renataki.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_thekal.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\boss_venoxis.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\eastern_kingdoms\zulgurub\instance_zulgurub.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\blackfathom_deeps\instance_blackfathom_deeps.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\dire_maul\dire_maul.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\dire_maul\instance_dire_maul.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\maraudon\boss_noxxion.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\razorfen_downs\razorfen_downs.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\razorfen_kraul\instance_razorfen_kraul.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\razorfen_kraul\razorfen_kraul.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\wailing_caverns\instance_wailing_caverns.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\wailing_caverns\wailing_caverns.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\zulfarrak\boss_zumrah.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\zulfarrak\instance_zulfarrak.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\zulfarrak\zulfarrak.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\onyxias_lair\boss_onyxia.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\onyxias_lair\instance_onyxias_lair.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\boss_ayamiss.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\boss_buru.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\boss_kurinnaxx.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\boss_moam.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\boss_ossirian.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\boss_rajaxx.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\instance_ruins_of_ahnqiraj.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\ruins_of_ahnqiraj\ruins_of_ahnqiraj.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_bug_trio.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_cthun.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_huhuran.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_ouro.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_sartura.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_skeram.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_twinemperors.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\boss_viscidus.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\instance_temple_of_ahnqiraj.cpp" />
-    <ClCompile Include="..\..\src\modules\SD2\scripts\kalimdor\temple_of_ahnqiraj\mob_anubisath_sentinel.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="ace.vcxproj">
-      <Project>D70895A7-4EA1-48BE-A557-834D4357BAD3</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/map-extractor.vcxproj b/win/VC120/map-extractor.vcxproj
deleted file mode 100644
index 4cfb8dac9..000000000
--- a/win/VC120/map-extractor.vcxproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{356A660D-07F5-4744-A423-E0128E7874A3}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>map-extractor</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\mapextractor\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">map-extractor</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\mapextract\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">map-extractor</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;..\..\src\tools\map-extractor\loadlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;..\..\src\tools\map-extractor\loadlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;..\..\src\tools\map-extractor\loadlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;$(Configuration)\libmpq.lib;$(Configuration)\loadlib.lib;$(Configuration)\bzip2.lib;$(Configuration)\zlib.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);;../../src/mangosd/$(Configuration);../../src/mangosd/$(Configuration)/$(Configuration);;../../src/tools/map-extractor/loadlib;../../src/tools/map-extractor/loadlib/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/map-extractor.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/map-extractor.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;..\..\src\tools\map-extractor\loadlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;..\..\src\tools\map-extractor\loadlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;..\..\dep\libmpq;..\..\src\tools\map-extractor\loadlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;$(Configuration)\libmpq.lib;$(Configuration)\loadlib.lib;$(Configuration)\bzip2.lib;$(Configuration)\zlib.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/map-extractor.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/map-extractor.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\tools\map-extractor\dbcfile.cpp" />
-    <ClCompile Include="..\..\src\tools\map-extractor\mpq_libmpq.cpp" />
-    <ClCompile Include="..\..\src\tools\map-extractor\System.cpp" />
-    <ResourceCompile Include="..\..\src\tools\map-extractor\map-extractor.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="bzip2.vcxproj">
-      <Project>BC139E42-505E-430B-8610-6ED2B1E358E8</Project>
-    </ProjectReference>
-    <ProjectReference Include="libmpq.vcxproj">
-      <Project>449D15D0-B3B9-4195-AB9C-E205FF77ABBE</Project>
-    </ProjectReference>
-    <ProjectReference Include="loadlib.vcxproj">
-      <Project>29E1FE24-1C69-4E6B-945D-02544988A5FA</Project>
-    </ProjectReference>
-    <ProjectReference Include="zlib.vcxproj">
-      <Project>8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/realmd.vcxproj b/win/VC120/realmd.vcxproj
deleted file mode 100644
index 43c5db012..000000000
--- a/win/VC120/realmd.vcxproj
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{23AFA1F9-A301-4123-81D8-777D3DE349C4}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>realmd</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\realmd\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\realmd\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">realmd</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\src\shared;..\..\dep\include\mysql;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\src\shared;..\..\dep\include\mysql;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\src\shared;..\..\dep\include\mysql;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;$(Configuration)/shared.lib;$(Configuration)/framework.lib;$(Configuration)/ACE.lib;..\..\dep\lib\win32\libmySQL.lib;..\..\dep\lib\win32\libeay32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);../../src/mangosd/$(Configuration);../../src/mangosd/$(Configuration)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/realmd.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/realmd.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\src\shared;..\..\dep\include\mysql;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\src\shared;..\..\dep\include\mysql;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\src\shared;..\..\dep\include\mysql;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Link>
-      <AdditionalOptions> /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;$(Configuration)/shared.lib;$(Configuration)/framework.lib;$(Configuration)/ACE.lib;..\..\dep\lib\win32\libmySQL.lib;..\..\dep\lib\win32\libeay32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../dep/acelite/ace;../../dep/acelite/ace/$(Configuration);../../src/mangosd/$(Configuration);../../src/mangosd/$(Configuration)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(Configuration)/realmd.lib</ImportLibrary>
-      <LargeAddressAware>true</LargeAddressAware>
-      <ProgramDataBaseFile>$(Configuration)/realmd.pdb</ProgramDataBaseFile>
-      <SubSystem>Console</SubSystem>
-      <Version>
-      </Version>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\realmd\AuthCodes.h" />
-    <ClInclude Include="..\..\src\realmd\AuthSocket.h" />
-    <ClInclude Include="..\..\src\realmd\BufferedSocket.h" />
-    <ClInclude Include="..\..\src\realmd\PatchHandler.h" />
-    <ClInclude Include="..\..\src\realmd\RealmList.h" />
-    <ClCompile Include="..\..\src\realmd\AuthSocket.cpp" />
-    <ClCompile Include="..\..\src\realmd\BufferedSocket.cpp" />
-    <ClCompile Include="..\..\src\realmd\Main.cpp" />
-    <ClCompile Include="..\..\src\realmd\PatchHandler.cpp" />
-    <ClCompile Include="..\..\src\realmd\RealmList.cpp" />
-    <ResourceCompile Include="..\..\src\realmd\realmd.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="ace.vcxproj">
-      <Project>D70895A7-4EA1-48BE-A557-834D4357BAD3</Project>
-    </ProjectReference>
-    <ProjectReference Include="framework.vcxproj">
-      <Project>915B99FF-5340-4BCE-AAE7-D3737443498B</Project>
-    </ProjectReference>
-    <ProjectReference Include="shared.vcxproj">
-      <Project>594C9AA1-A759-4DEB-A6E4-F079A5DFBA31</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/recast.vcxproj b/win/VC120/recast.vcxproj
deleted file mode 100644
index cd03ef9eb..000000000
--- a/win/VC120/recast.vcxproj
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{467226FB-7838-43FF-8ECA-199FAEA760D6}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>recast</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\recast\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">recast</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\recast\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">recast</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Recast\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Recast\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Recast\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Recast\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Recast\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\recastnavigation\Recast\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\dep\recastnavigation\Recast\Include\Recast.h" />
-    <ClInclude Include="..\..\dep\recastnavigation\Recast\Include\RecastAlloc.h" />
-    <ClInclude Include="..\..\dep\recastnavigation\Recast\Include\RecastAssert.h" />
-    <ClCompile Include="..\..\dep\recastnavigation\Recast\Source\Recast.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Recast\Source\RecastAlloc.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Recast\Source\RecastArea.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Recast\Source\RecastContour.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Recast\Source\RecastFilter.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Recast\Source\RecastLayers.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Recast\Source\RecastMesh.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Recast\Source\RecastMeshDetail.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Recast\Source\RecastRasterization.cpp" />
-    <ClCompile Include="..\..\dep\recastnavigation\Recast\Source\RecastRegion.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/shared.vcxproj b/win/VC120/shared.vcxproj
deleted file mode 100644
index e139dd6ee..000000000
--- a/win/VC120/shared.vcxproj
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>shared</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\shared\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\shared\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">shared</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>.\;..\..\dep\include;..\..\src\shared;..\..\src\framework;..\..\dep\acelite;..\..\dep\include\mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\shared\Auth\AuthCrypt.h" />
-    <ClInclude Include="..\..\src\shared\Auth\BigNumber.h" />
-    <ClInclude Include="..\..\src\shared\Auth\Hmacsh1.h" />
-    <ClInclude Include="..\..\src\shared\Auth\md5.h" />
-    <ClInclude Include="..\..\src\shared\Auth\Sha1.h" />
-    <ClInclude Include="..\..\src\shared\Auth\SARC4.h" />
-    <ClInclude Include="..\..\src\shared\Config\Config.h" />
-    <ClInclude Include="..\..\src\shared\Database\Database.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabaseEnv.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabaseImpl.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabaseMysql.h" />
-    <ClInclude Include="..\..\src\shared\Database\DatabasePostgre.h" />
-    <ClInclude Include="..\..\src\shared\Database\Field.h" />
-    <ClInclude Include="..\..\src\shared\Database\PGSQLDelayThread.h" />
-    <ClInclude Include="..\..\src\shared\Database\QueryResult.h" />
-    <ClInclude Include="..\..\src\shared\Database\QueryResultMysql.h" />
-    <ClInclude Include="..\..\src\shared\Database\QueryResultPostgre.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlDelayThread.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlOperations.h" />
-    <ClInclude Include="..\..\src\shared\Database\SqlPreparedStatement.h" />
-    <ClInclude Include="..\..\src\shared\Database\SQLStorage.h" />
-    <ClInclude Include="..\..\src\shared\Database\SQLStorageImpl.h" />
-    <ClInclude Include="..\..\src\shared\Database\DBCFileLoader.h" />
-    <ClInclude Include="..\..\src\shared\Database\DBCStore.h" />
-    <ClInclude Include="..\..\src\shared\Log.h" />
-    <ClInclude Include="..\..\src\shared\ByteBuffer.h" />
-    <ClInclude Include="..\..\src\shared\Errors.h" />
-    <ClInclude Include="..\..\src\shared\ProgressBar.h" />
-    <ClInclude Include="..\..\src\shared\Timer.h" />
-    <ClInclude Include="..\..\src\shared\Util.h" />
-    <ClInclude Include="..\..\src\shared\WorldPacket.h" />
-    <ClInclude Include="..\..\src\shared\Common.h" />
-    <ClInclude Include="..\..\src\shared\LockedQueue.h" />
-    <ClInclude Include="..\..\src\shared\revision_nr.h" />
-    <ClInclude Include="..\..\src\shared\revision_sql.h" />
-    <ClInclude Include="..\..\src\shared\Threading.h" />
-    <ClInclude Include="..\..\src\shared\WheatyExceptionReport.h" />
-    <ClInclude Include="..\..\src\shared\ServiceWin32.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\shared\Auth\AuthCrypt.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\BigNumber.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\Hmacsha1.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\Sha1.cpp" />
-    <ClCompile Include="..\..\src\shared\Auth\SARC4.cpp" />
-    <ClCompile Include="..\..\src\shared\Config\Config.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\Database.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\DatabaseMysql.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\DatabasePostgre.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\Field.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\QueryResultMysql.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\QueryResultPostgre.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlDelayThread.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlOperations.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SqlPreparedStatement.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\SQLStorage.cpp" />
-    <ClCompile Include="..\..\src\shared\Database\DBCFileLoader.cpp" />
-    <ClCompile Include="..\..\src\shared\Log.cpp" />
-    <ClCompile Include="..\..\src\shared\ByteBuffer.cpp" />
-    <ClCompile Include="..\..\src\shared\ProgressBar.cpp" />
-    <ClCompile Include="..\..\src\shared\Util.cpp" />
-    <ClCompile Include="..\..\src\shared\Common.cpp" />
-    <ClCompile Include="..\..\src\shared\Threading.cpp" />
-    <ClCompile Include="..\..\src\shared\WheatyExceptionReport.cpp" />
-    <ClCompile Include="..\..\src\shared\ServiceWin32.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="ace.vcxproj">
-      <Project>{d70895a7-4ea1-48be-a557-834d4357bad3}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/vmap.vcxproj b/win/VC120/vmap.vcxproj
deleted file mode 100644
index 2701dbf76..000000000
--- a/win/VC120/vmap.vcxproj
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{3C86FD37-9872-4302-A502-740E7D028D3A}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>vmap</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\vmap\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vmap</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\vmap\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vmap</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <TreatWarningAsError>false</TreatWarningAsError>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;NDEBUG;_CRT_SECURE_NO_WARNINGS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions> /Zm500 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <TreatWarningAsError>true</TreatWarningAsError>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;HAVE_CONFIG_H;MANGOS;DO_MYSQL;WIN32;_WIN32;USE_STANDARD_MALLOC;MMAP_GENERATOR;NO_CORE_FUNCS;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\shared;..\..\src\game\vmap;..\..\dep\include\g3dlite;..\..\src\framework;..\..\dep\acelite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\game\vmap\BIH.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\VMapManager2.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\MapTree.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\TileAssembler.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\WorldModel.cpp" />
-    <ClCompile Include="..\..\src\game\vmap\ModelInstance.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="g3dlite.vcxproj">
-      <Project>{367cce76-14a7-4871-93d6-579da35fbefd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="zlib.vcxproj">
-      <Project>{8d3cf9b7-05f2-4bcf-b833-27b279fdeaf3}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/VC120/zlib.vcxproj b/win/VC120/zlib.vcxproj
deleted file mode 100644
index 42f57e86b..000000000
--- a/win/VC120/zlib.vcxproj
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}</ProjectGUID>
-    <Keyword>Win32Proj</Keyword>
-    <Platform>Win32</Platform>
-    <ProjectName>zlib</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\_temp\zlib\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\_temp\zlib\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlib</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Release/</AssemblerListingLocation>
-      <CompileAs>CompileAsC</CompileAs>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>Debug/</AssemblerListingLocation>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <CompileAs>CompileAsC</CompileAs>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;4355;4244;4985;4267</DisableSpecificWarnings>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PREPARED_SLN;WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>..\..\dep\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\dep\src\zlib\adler32.c" />
-    <ClCompile Include="..\..\dep\src\zlib\compress.c" />
-    <ClCompile Include="..\..\dep\src\zlib\crc32.c" />
-    <ClCompile Include="..\..\dep\src\zlib\deflate.c" />
-    <ClCompile Include="..\..\dep\src\zlib\example.c" />
-    <ClCompile Include="..\..\dep\src\zlib\infback.c" />
-    <ClCompile Include="..\..\dep\src\zlib\inffast.c" />
-    <ClCompile Include="..\..\dep\src\zlib\inflate.c" />
-    <ClCompile Include="..\..\dep\src\zlib\inftrees.c" />
-    <ClCompile Include="..\..\dep\src\zlib\trees.c" />
-    <ClCompile Include="..\..\dep\src\zlib\uncompr.c" />
-    <ClCompile Include="..\..\dep\src\zlib\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win/copyfiles.cmd b/win/copyfiles.cmd
deleted file mode 100644
index 3bf1803e6..000000000
--- a/win/copyfiles.cmd
+++ /dev/null
@@ -1,35 +0,0 @@
-echo ******************************************************
-echo ** COPY STEP                                        **
-echo ******************************************************
-echo .
-echo **********************
-echo ** Source Path      **
-echo **********************
-echo Source: %1
-echo .
-echo **********************
-echo ** Destination Path **
-echo **********************
-echo Destination: %2
-echo .
-echo **********************
-echo ** Current Path     **
-echo **********************
-cd
-echo .
-echo **********************
-echo ** DLL's            **
-echo **********************
-copy ..\%1\*.dll %2
-echo **********************
-echo ** mangosd.conf     **
-echo **********************
-copy ..\..\src\mangosd\mangosd.conf.dist.in %2
-echo **********************
-echo ** ahbot.conf       **
-echo **********************
-copy ..\..\src\game\AuctionHouseBot\ahbot.conf.dist.in %2
-rem echo **********************
-rem echo ** mods.conf        **
-rem echo **********************
-rem copy ..\..\src\game\extras\mods.conf.dist.in %2
diff --git a/win/mangosdVC100.sln b/win/mangosdVC100.sln
deleted file mode 100644
index 9ff2af543..000000000
--- a/win/mangosdVC100.sln
+++ /dev/null
@@ -1,206 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC100\game.vcxproj", "{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6} = {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC100\shared.vcxproj", "{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} = {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2}
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}
-		{F62787DD-1327-448B-9818-030062BCFAA5} = {F62787DD-1327-448B-9818-030062BCFAA5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "VC100\mangosd.vcxproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
-	ProjectSection(ProjectDependencies) = postProject
-		{563E9905-3657-460C-AE63-0AC39D162E23} = {563E9905-3657-460C-AE63-0AC39D162E23}
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "VC100\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "framework", "VC100\framework.vcxproj", "{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8} = {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "realmd", "VC100\realmd.vcxproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC100\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC100\genrevision.vcxproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "VC100\ACE_vc10.vcxproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "..\dep\recastnavigation\Detour\win\VC100\Detour.vcxproj", "{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_NoPCH|Win32 = Debug_NoPCH|Win32
-		Debug_NoPCH|x64 = Debug_NoPCH|x64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.Build.0 = Debug|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.ActiveCfg = Debug|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.Build.0 = Debug|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.ActiveCfg = Release|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.Build.0 = Release|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.ActiveCfg = Release|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.Build.0 = Release|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|Win32.ActiveCfg = Debug|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|Win32.Build.0 = Debug|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|x64.ActiveCfg = Debug|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|x64.Build.0 = Debug|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.ActiveCfg = Release|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.Build.0 = Release|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.ActiveCfg = Release|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.Build.0 = Release|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.Build.0 = Debug|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.ActiveCfg = Debug|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.Build.0 = Debug|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.ActiveCfg = Release|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.Build.0 = Release|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.ActiveCfg = Release|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.Build.0 = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|Win32.Build.0 = Debug|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|x64.ActiveCfg = Debug|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|x64.Build.0 = Debug|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|Win32.ActiveCfg = Release|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|Win32.Build.0 = Release|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|x64.ActiveCfg = Release|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|x64.Build.0 = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.ActiveCfg = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.Build.0 = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.Build.0 = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.ActiveCfg = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.Build.0 = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.ActiveCfg = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.Build.0 = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.Build.0 = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.ActiveCfg = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.Build.0 = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.ActiveCfg = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.Build.0 = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.ActiveCfg = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.Build.0 = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.ActiveCfg = Release|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.Build.0 = Release|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|Win32.Build.0 = Debug|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.ActiveCfg = Debug|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.Build.0 = Debug|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|Win32.ActiveCfg = Release|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|Win32.Build.0 = Release|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.ActiveCfg = Release|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.Build.0 = Release|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.Build.0 = Debug|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.ActiveCfg = Debug|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.Build.0 = Debug|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.ActiveCfg = Release|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.Build.0 = Release|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.ActiveCfg = Release|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.Build.0 = Release|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|x64.ActiveCfg = Debug|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.Build.0 = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.ActiveCfg = Debug|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.Build.0 = Debug|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.ActiveCfg = Release|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.Build.0 = Release|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.ActiveCfg = Release|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
-EndGlobal
diff --git a/win/mangosdVC110.sln b/win/mangosdVC110.sln
deleted file mode 100644
index 33528df6e..000000000
--- a/win/mangosdVC110.sln
+++ /dev/null
@@ -1,206 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC110\game.vcxproj", "{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6} = {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC110\shared.vcxproj", "{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} = {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2}
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}
-		{F62787DD-1327-448B-9818-030062BCFAA5} = {F62787DD-1327-448B-9818-030062BCFAA5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "VC110\mangosd.vcxproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
-	ProjectSection(ProjectDependencies) = postProject
-		{563E9905-3657-460C-AE63-0AC39D162E23} = {563E9905-3657-460C-AE63-0AC39D162E23}
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "VC110\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "framework", "VC110\framework.vcxproj", "{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8} = {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "realmd", "VC110\realmd.vcxproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC110\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC110\genrevision.vcxproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "VC110\ACE_vc11.vcxproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "..\dep\recastnavigation\Detour\win\VC110\Detour.vcxproj", "{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_NoPCH|Win32 = Debug_NoPCH|Win32
-		Debug_NoPCH|x64 = Debug_NoPCH|x64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.Build.0 = Debug|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.ActiveCfg = Debug|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.Build.0 = Debug|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.ActiveCfg = Release|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.Build.0 = Release|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.ActiveCfg = Release|x64
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.Build.0 = Release|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|Win32.ActiveCfg = Debug|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|Win32.Build.0 = Debug|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|x64.ActiveCfg = Debug|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Debug|x64.Build.0 = Debug|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.ActiveCfg = Release|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.Build.0 = Release|Win32
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.ActiveCfg = Release|x64
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.Build.0 = Release|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.Build.0 = Debug|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.ActiveCfg = Debug|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.Build.0 = Debug|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.ActiveCfg = Release|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.Build.0 = Release|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.ActiveCfg = Release|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.Build.0 = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|Win32.Build.0 = Debug|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|x64.ActiveCfg = Debug|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Debug|x64.Build.0 = Debug|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|Win32.ActiveCfg = Release|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|Win32.Build.0 = Release|Win32
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|x64.ActiveCfg = Release|x64
-		{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}.Release|x64.Build.0 = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.ActiveCfg = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.Build.0 = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.Build.0 = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.ActiveCfg = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.Build.0 = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.ActiveCfg = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.Build.0 = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.Build.0 = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.ActiveCfg = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.Build.0 = Debug|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.ActiveCfg = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.Build.0 = Debug|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.ActiveCfg = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.Build.0 = Release|Win32
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.ActiveCfg = Release|x64
-		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.Build.0 = Release|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|Win32.Build.0 = Debug|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.ActiveCfg = Debug|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.Build.0 = Debug|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|Win32.ActiveCfg = Release|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|Win32.Build.0 = Release|Win32
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.ActiveCfg = Release|x64
-		{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.Build.0 = Release|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|Win32.Build.0 = Debug|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.ActiveCfg = Debug|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.Build.0 = Debug|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.ActiveCfg = Release|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|Win32.Build.0 = Release|Win32
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.ActiveCfg = Release|x64
-		{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.Build.0 = Release|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|x64.ActiveCfg = Debug|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.Build.0 = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.ActiveCfg = Debug|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.Build.0 = Debug|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.ActiveCfg = Release|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.Build.0 = Release|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.ActiveCfg = Release|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
-EndGlobal
diff --git a/win/mangosdVC120.sln b/win/mangosdVC120.sln
deleted file mode 100644
index d2953c365..000000000
--- a/win/mangosdVC120.sln
+++ /dev/null
@@ -1,154 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ace", "VC120\ace.vcxproj", "{D70895A7-4EA1-48BE-A557-834D4357BAD3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC120\game.vcxproj", "{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}"
-	ProjectSection(ProjectDependencies) = postProject
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31} = {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6} = {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD} = {367CCE76-14A7-4871-93D6-579DA35FBEFD}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC120\shared.vcxproj", "{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}"
-	ProjectSection(ProjectDependencies) = postProject
-		{915B99FF-5340-4BCE-AAE7-D3737443498B} = {915B99FF-5340-4BCE-AAE7-D3737443498B}
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3} = {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "VC120\mangosd.vcxproj", "{485F08B8-BAD4-47C1-8B49-17B9949B123E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4} = {23AFA1F9-A301-4123-81D8-777D3DE349C4}
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31} = {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933} = {C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "VC120\zlib.vcxproj", "{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "framework", "VC120\framework.vcxproj", "{915B99FF-5340-4BCE-AAE7-D3737443498B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "realmd", "VC120\realmd.vcxproj", "{23AFA1F9-A301-4123-81D8-777D3DE349C4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31} = {594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC120\g3dlite.vcxproj", "{367CCE76-14A7-4871-93D6-579DA35FBEFD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrev", "VC120\genrev.vcxproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "..\dep\recastnavigation\Detour\win\VC120\Detour.vcxproj", "{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_NoPCH|Win32 = Debug_NoPCH|Win32
-		Debug_NoPCH|x64 = Debug_NoPCH|x64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug|Win32.Build.0 = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Debug|x64.ActiveCfg = Debug|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Release|Win32.ActiveCfg = Release|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Release|Win32.Build.0 = Release|Win32
-		{D70895A7-4EA1-48BE-A557-834D4357BAD3}.Release|x64.ActiveCfg = Release|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug|Win32.Build.0 = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Debug|x64.ActiveCfg = Debug|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Release|Win32.ActiveCfg = Release|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Release|Win32.Build.0 = Release|Win32
-		{C69C7C98-6E13-4A3A-BD7C-7BA82BAA1933}.Release|x64.ActiveCfg = Release|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug|Win32.ActiveCfg = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug|Win32.Build.0 = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Debug|x64.ActiveCfg = Debug|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Release|Win32.ActiveCfg = Release|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Release|Win32.Build.0 = Release|Win32
-		{594C9AA1-A759-4DEB-A6E4-F079A5DFBA31}.Release|x64.ActiveCfg = Release|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug|Win32.Build.0 = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Debug|x64.ActiveCfg = Debug|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Release|Win32.ActiveCfg = Release|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Release|Win32.Build.0 = Release|Win32
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E}.Release|x64.ActiveCfg = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug|Win32.Build.0 = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug|x64.ActiveCfg = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Release|Win32.ActiveCfg = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Release|Win32.Build.0 = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Release|x64.ActiveCfg = Release|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug|Win32.Build.0 = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Debug|x64.ActiveCfg = Debug|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Release|Win32.ActiveCfg = Release|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Release|Win32.Build.0 = Release|Win32
-		{915B99FF-5340-4BCE-AAE7-D3737443498B}.Release|x64.ActiveCfg = Release|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug|Win32.Build.0 = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Debug|x64.ActiveCfg = Debug|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Release|Win32.ActiveCfg = Release|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Release|Win32.Build.0 = Release|Win32
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4}.Release|x64.ActiveCfg = Release|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug|Win32.Build.0 = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Debug|x64.ActiveCfg = Debug|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Release|Win32.ActiveCfg = Release|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Release|Win32.Build.0 = Release|Win32
-		{367CCE76-14A7-4871-93D6-579DA35FBEFD}.Release|x64.ActiveCfg = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.Build.0 = Debug|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.ActiveCfg = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|Win32
-		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|x64.ActiveCfg = Debug|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.Build.0 = Debug|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.ActiveCfg = Debug|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.Build.0 = Debug|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.ActiveCfg = Release|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.Build.0 = Release|Win32
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.ActiveCfg = Release|x64
-		{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
-EndGlobal
diff --git a/win/map-extractor_VC100.sln b/win/map-extractor_VC100.sln
deleted file mode 100644
index 103d6400e..000000000
--- a/win/map-extractor_VC100.sln
+++ /dev/null
@@ -1,53 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "VC100\bzip2.vcxproj", "{BC139E42-505E-430B-8610-6ED2B1E358E8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "VC100\StormLib.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BC139E42-505E-430B-8610-6ED2B1E358E8} = {BC139E42-505E-430B-8610-6ED2B1E358E8}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loadlib", "VC100\loadlib.vcxproj", "{29E1FE24-1C69-4E6B-945D-02544988A5FA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3} = {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-extractor", "VC100\map-extractor.vcxproj", "{356A660D-07F5-4744-A423-E0128E7874A3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA} = {29E1FE24-1C69-4E6B-945D-02544988A5FA}
-		{BC139E42-505E-430B-8610-6ED2B1E358E8} = {BC139E42-505E-430B-8610-6ED2B1E358E8}
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3} = {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}
-		{449D15D0-B3B9-4195-AB9C-E205FF77ABBE} = {449D15D0-B3B9-4195-AB9C-E205FF77ABBE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "VC100\zlib.vcxproj", "{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopytoOutput", "VC100\CopytoOutput.vcxproj", "{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{356A660D-07F5-4744-A423-E0128E7874A3} = {356A660D-07F5-4744-A423-E0128E7874A3}
-		{9CF8718E-A789-4DFC-9317-701671EC620E} = {9CF8718E-A789-4DFC-9317-701671EC620E}
-		{485F08B8-BAD4-47C1-8B49-17B9949B123E} = {485F08B8-BAD4-47C1-8B49-17B9949B123E}
-		{D80713DC-AF9C-424D-AA8A-204090DA6E5B} = {D80713DC-AF9C-424D-AA8A-204090DA6E5B}
-		{DC1E54E3-D6B3-454F-B5BE-D7ACA2D13C0D} = {DC1E54E3-D6B3-454F-B5BE-D7ACA2D13C0D}
-		{23AFA1F9-A301-4123-81D8-777D3DE349C4} = {23AFA1F9-A301-4123-81D8-777D3DE349C4}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.ActiveCfg = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.Build.0 = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.ActiveCfg = ReleaseAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.Build.0 = ReleaseAS|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/win/map-extractor_VC110.sln b/win/map-extractor_VC110.sln
deleted file mode 100644
index 552550114..000000000
--- a/win/map-extractor_VC110.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "VC110_ad.vcxproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{78424708-1F6E-4D4B-920C-FB6D26847055} = {78424708-1F6E-4D4B-920C-FB6D26847055}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "..\..\dep\StormLib\StormLib_vc110.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.ActiveCfg = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.Build.0 = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.ActiveCfg = ReleaseAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.Build.0 = ReleaseAS|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/win/map-extractor_VC120.sln b/win/map-extractor_VC120.sln
deleted file mode 100644
index dd74645d5..000000000
--- a/win/map-extractor_VC120.sln
+++ /dev/null
@@ -1,63 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "VC120\bzip2.vcxproj", "{BC139E42-505E-430B-8610-6ED2B1E358E8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "VC120\StormLib.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BC139E42-505E-430B-8610-6ED2B1E358E8} = {BC139E42-505E-430B-8610-6ED2B1E358E8}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loadlib", "VC120\loadlib.vcxproj", "{29E1FE24-1C69-4E6B-945D-02544988A5FA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3} = {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-extractor", "VC120\map-extractor.vcxproj", "{356A660D-07F5-4744-A423-E0128E7874A3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA} = {29E1FE24-1C69-4E6B-945D-02544988A5FA}
-		{BC139E42-505E-430B-8610-6ED2B1E358E8} = {BC139E42-505E-430B-8610-6ED2B1E358E8}
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3} = {8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "VC120\zlib.vcxproj", "{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopytoOutput", "VC120\CopytoOutput.vcxproj", "{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{356A660D-07F5-4744-A423-E0128E7874A3} = {356A660D-07F5-4744-A423-E0128E7874A3}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.Debug|Win32.Build.0 = Debug|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.Release|Win32.ActiveCfg = Release|Win32
-		{BC139E42-505E-430B-8610-6ED2B1E358E8}.Release|Win32.Build.0 = Release|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.ActiveCfg = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.Build.0 = DebugAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.ActiveCfg = ReleaseAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.Build.0 = ReleaseAS|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.Debug|Win32.Build.0 = Debug|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.Release|Win32.ActiveCfg = Release|Win32
-		{29E1FE24-1C69-4E6B-945D-02544988A5FA}.Release|Win32.Build.0 = Release|Win32
-		{356A660D-07F5-4744-A423-E0128E7874A3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{356A660D-07F5-4744-A423-E0128E7874A3}.Debug|Win32.Build.0 = Debug|Win32
-		{356A660D-07F5-4744-A423-E0128E7874A3}.Release|Win32.ActiveCfg = Release|Win32
-		{356A660D-07F5-4744-A423-E0128E7874A3}.Release|Win32.Build.0 = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Debug|Win32.Build.0 = Debug|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Release|Win32.ActiveCfg = Release|Win32
-		{8D3CF9B7-05F2-4BCF-B833-27B279FDEAF3}.Release|Win32.Build.0 = Release|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.Debug|Win32.Build.0 = Debug|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.Release|Win32.ActiveCfg = Release|Win32
-		{8D43785F-8B15-42AA-A8D1-6DE482FC06B8}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal